diff --git a/include/common_structs.h b/include/common_structs.h
index fe6fabcfe5..8f9fc6c609 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -511,7 +511,7 @@ typedef union {
     struct SpinningFlowerData* spinningFlower;
     struct TrumpetPlantData* trumpetPlant;
     struct MunchlesiaData* munchlesia;
-    struct ArrowSignData* arrowSign;    
+    struct ArrowSignData* arrowSign;
 } EntityData;
 
 typedef struct Entity {
diff --git a/include/effects.h b/include/effects.h
index bffd278318..3e38629f6c 100644
--- a/include/effects.h
+++ b/include/effects.h
@@ -239,7 +239,7 @@ typedef struct FlowerFXData {
 typedef struct CloudPuffFXData {
     /* 0x00 */ s32 alive;
     /* 0x04 */ char unk_04[0x2];
-    /* 0x06 */ s16 lifetime;
+    /* 0x06 */ s16 timeLeft;
     /* 0x08 */ u8 alpha;
     /* 0x09 */ char unk_09[0x3];
     /* 0x0C */ f32 unk_0C;
@@ -332,9 +332,7 @@ typedef struct FloatingFlowerFXData {
 } FloatingFlowerFXData; // size = 0x48
 
 typedef struct SnowflakeFXData {
-    /* 0x00 */ f32 xPos;
-    /* 0x04 */ f32 yPos;
-    /* 0x08 */ f32 zPos;
+    /* 0x00 */ Vec3f pos;
     /* 0x0C */ f32 unk_0C;
     /* 0x10 */ f32 unk_10;
     /* 0x14 */ f32 unk_14;
@@ -641,8 +639,8 @@ typedef struct FireBreathFXData {
     /* 0x38 */ f32 scale;
     /* 0x3C */ f32 scaleChangeFactor;
     /* 0x40 */ s32 alpha;
-    /* 0x44 */ s32 maxLifetime;
-    /* 0x48 */ s32 lifetime;
+    /* 0x44 */ s32 lifeTime;
+    /* 0x48 */ s32 timeLeft;
     /* 0x4C */ s32 spawnTimer;
     /* 0x50 */ Vec3f unk_50;
     /* 0x5C */ f32 unk_5C;
@@ -766,8 +764,20 @@ typedef struct DisableXFXData {
 } DisableXFXData; // size = 0x48
 
 typedef struct BombetteBreakingFXData {
-    /* 0x00 */ char todo[0];
-} BombetteBreakingFXData; // size = unknown
+    /* 0x00 */ s16 type;
+    /* 0x02 */ s16 treeIndex;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ Vec3f center;
+    /* 0x14 */ Vec3f unk_14;
+    /* 0x20 */ Vec3f unk_20;
+    /* 0x2C */ Vec3f unk_2C;
+    /* 0x38 */ f32 unk_38;
+    /* 0x3C */ f32 unk_3C;
+    /* 0x40 */ f32 unk_40;
+    /* 0x44 */ s32 timeLeft;
+    /* 0x48 */ s32 unk_48;
+    /* 0x4C */ s32 alpha;
+} BombetteBreakingFXData;
 
 typedef struct FireworkFXData {
     /* 0x00 */ char todo[0];
@@ -1240,7 +1250,21 @@ typedef struct SomethingRotatingFXData {
 } SomethingRotatingFXData; // size = unknown
 
 typedef struct BreakingJunkFXData {
-    /* 0x00 */ char todo[0];
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ Vec3f pos;
+    /* 0x10 */ Vec3f vel;
+    /* 0x1C */ s32 timeLeft;
+    /* 0x20 */ s32 lifeTime;
+    /* 0x24 */ f32 scale;
+    /* 0x28 */ f32 rot;
+    /* 0x2C */ s16 primR;
+    /* 0x2E */ s16 primG;
+    /* 0x30 */ s16 primB;
+    /* 0x32 */ s16 primA;
+    /* 0x34 */ s16 envR;
+    /* 0x36 */ s16 envG;
+    /* 0x38 */ s16 envB;
+    /* 0x3A */ s16 envA;
 } BreakingJunkFXData; // size = unknown
 
 typedef struct PartnerBuffFXData {
@@ -1470,8 +1494,8 @@ typedef struct WattEffectData {
     /* 0x08 */ s32 angle;
     /* 0x0C */ s32 unk_0C;
     /* 0x10 */ s32 unk_10;
-    /* 0x14 */ struct EffectInstance* effect1;
-    /* 0x18 */ struct EffectInstance* effect2;
+    /* 0x14 */ EffectInstance* effect1;
+    /* 0x18 */ EffectInstance* effect2;
     /* 0x1C */ s32 debuff;
 } WattEffectData;
 
diff --git a/include/effects_internal.h b/include/effects_internal.h
index 2138a54f86..3e505b2ce4 100644
--- a/include/effects_internal.h
+++ b/include/effects_internal.h
@@ -29,6 +29,7 @@ void shim_mem_clear(void* 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);
 s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*);
 void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
+void shim_mdl_draw_hidden_panel_surface(Gfx**, u16 treeIndex);
 
 // the actual signature is going to be wrong, but it doesn't matter
 // TODO remove when every effect's main is sorted out
@@ -94,7 +95,7 @@ void blast_main(s32, f32, f32, f32, f32, s32);
 EffectInstance* fire_flower_main(s32, f32, f32, f32, s32);
 FX_MAIN(recover_main);
 EffectInstance* disable_x_main(s32, f32, f32, f32, s32);
-FX_MAIN(bombette_breaking_main);
+EffectInstance* bombette_breaking_main(s32, s32, s32, f32, s32, s32);
 FX_MAIN(firework_main);
 FX_MAIN(confetti_main);
 FX_MAIN(snowfall_main);
@@ -152,7 +153,7 @@ FX_MAIN(ice_shard_main);
 FX_MAIN(spirit_card_main);
 FX_MAIN(lil_oink_main);
 FX_MAIN(something_rotating_main);
-FX_MAIN(breaking_junk_main);
+EffectInstance* breaking_junk_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5);
 FX_MAIN(partner_buff_main);
 FX_MAIN(quizmo_assistant_main);
 FX_MAIN(ice_pillar_main);
diff --git a/include/macros.h b/include/macros.h
index 101c6c6afd..2271973846 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -13,6 +13,7 @@
 #endif
 
 #define ALIGN16(val) (((val) + 0xF) & ~0xF)
+#define ALIGN8(val) (((val) + 0x7) & ~0x7)
 
 #define A(sym) NS(AREA, sym)
 #define N(sym) NS(NAMESPACE, sym)
diff --git a/src/101b90_len_8f0.c b/src/101b90_len_8f0.c
index c9fcd7284d..743427fa66 100644
--- a/src/101b90_len_8f0.c
+++ b/src/101b90_len_8f0.c
@@ -5,18 +5,98 @@
 // TODO generate this somehow, or prevent it from shifting. must be resolved at compile time
 #define SPRITE_ROM_START 0x1943000 + 0x10
 
+extern s32 spr_allocateBtlComponentsOnWorldHeap;
+extern s32 D_802DFEB0[];
+extern s32 D_802DFEB8[];
 extern s32 PlayerRasterSetsLoaded;
 extern s32 PlayerRasterBufferSetOffsets[13];
+extern s32 D_802E0090[];
 extern s32 PlayerRasterHeader;
+extern s32 D_802E0C14[];
 extern s32 D_802E0C20[];
 extern s32 PlayerRasterCacheSize;
 extern s32 PlayerRasterMaxSize;
 extern s32 SpriteDataHeader[];
+extern s32 D_802E0C64;
+extern s32 D_802E0C68;
 extern PlayerSpriteCacheEntry PlayerRasterCache[18];
 
 INCLUDE_ASM(s32, "101b90_len_8f0", spr_swizzle_anim_offsets);
 
+#ifdef NON_EQUIVALENT
+SpriteAnimData* spr_load_sprite(s32 idx, s32 arg1, s32 arg2) {
+    SpriteAnimData* animData;
+    s32 base;
+    s32 i;
+
+    s32 temp_s0;
+    s32 temp_s0_2;
+    s32 temp_v0_2;
+    s32 temp_v0_3;
+    s32* temp_a1_3;
+    s32** var_s2;
+    u16** var_v1;
+    s32* temp_v0;
+
+    if (arg1) {
+        base = D_802E0C64;
+    } else {
+        base = D_802E0C68;
+    }
+    nuPiReadRom(base + (idx * 4), &D_802DFEB0, 8U);
+
+    temp_s0 = ALIGN8(D_802DFEB0[1] - D_802DFEB0[0]);
+    temp_v0 = general_heap_malloc(temp_s0);
+    nuPiReadRom(base + D_802DFEB0[0], temp_v0, temp_s0);
+
+    if (arg2) {
+        temp_v0++;
+        animData = _heap_malloc_tail(&gSpriteHeapPtr, *temp_v0);
+    } else {
+        temp_v0++;
+        animData = _heap_malloc(&gSpriteHeapPtr, *temp_v0);
+    }
+
+    decode_yay0(temp_v0, animData);
+    general_heap_free(temp_v0);
+
+    temp_v0_2 = ((u32) animData / 4) * 4;
+    var_s2 = animData->rastersOffset + temp_v0_2;
+    animData->rastersOffset = var_s2;
+
+    while (*var_s2 != (s32* )-1) {
+        temp_a1_3 = *var_s2 + temp_v0_2;
+        *var_s2 = temp_a1_3;
+        var_s2++;
+        if (!arg1) {
+            *temp_a1_3 += temp_v0_2;
+        }
+    }
+
+    if (arg1) {
+        D_802E0050[idx] = D_802E004C;
+        temp_s0_2 = D_802E0C20[idx + 1] - D_802E0C20[idx];
+        nuPiReadRom(D_802E0C60[0] + D_802E0C14[0] + D_802E0C20[idx], &D_802DFEB8, 0x194);
+        for (i = 0; i < temp_s0_2; i++) {
+            D_802E0090[D_802E004C++] = D_802DFEB8[i];
+        }
+    }
+
+    temp_v0_3 = ((u32) animData / 4) * 4;
+    var_v1 = animData->palettesOffset + temp_v0_3;
+    animData->palettesOffset = var_v1;
+
+    while (*var_v1 != -1) {
+        *var_v1 += temp_v0_3;
+        var_v1++;
+    }
+
+    spr_swizzle_anim_offsets(0, 0, animData);
+    return animData;
+}
+#else
 INCLUDE_ASM(s32, "101b90_len_8f0", spr_load_sprite);
+#endif
 
 void spr_init_player_raster_cache(s32 cacheSize, s32 maxRasterSize) {
     void* raster;
@@ -46,7 +126,35 @@ void spr_init_player_raster_cache(s32 cacheSize, s32 maxRasterSize) {
     nuPiReadRom(SpriteDataHeader[0] + PlayerRasterHeader, D_802E0C20, 0x38);
 }
 
-INCLUDE_ASM(s32, "101b90_len_8f0", spr_get_player_raster);
+IMG_PTR spr_get_player_raster(s32 rasterIndex, s32 playerSpriteID) {
+    PlayerSpriteCacheEntry* temp_s0;
+    u32 temp_a2;
+    s32 idx = -1;
+    s32 i;
+
+    for (i = 0; i < PlayerRasterCacheSize; i++) {
+        if (PlayerRasterCache[i].lazyDeleteTime != 0) {
+            if (PlayerRasterCache[i].rasterIndex == rasterIndex && PlayerRasterCache[i].spriteIndex == playerSpriteID) {
+                PlayerRasterCache[i].lazyDeleteTime = 2;
+                return PlayerRasterCache[i].raster;
+            }
+        } else if (idx == -1) {
+            idx = i;
+        }
+    }
+
+    if (idx == -1) {
+        return NULL;
+    }
+
+    temp_s0 = &PlayerRasterCache[idx];
+    temp_s0->rasterIndex = rasterIndex;
+    temp_s0->spriteIndex = playerSpriteID;
+    temp_s0->lazyDeleteTime = 2;
+    temp_a2 = D_802E0090[PlayerRasterBufferSetOffsets[playerSpriteID] + rasterIndex];
+    nuPiReadRom(*SpriteDataHeader + (temp_a2 & 0xFFFFF), temp_s0->raster, (temp_a2 >> 0x10) & 0xFFF0);
+    return temp_s0->raster;
+}
 
 void spr_update_player_raster_cache(void) {
     s32 i;
@@ -62,4 +170,36 @@ void spr_update_player_raster_cache(void) {
 
 INCLUDE_ASM(s32, "101b90_len_8f0", spr_load_npc_extra_anims);
 
+#ifdef NON_MATCHING
+void** spr_allocate_components(s32 arg0) {
+    s32 temp_s1;
+    void** heap;
+    void* var_a0_2;
+    void** new_var;
+    u32 size;
+    s32 i;
+
+    temp_s1 = (arg0 + 1) * 4;
+    size = (arg0 * 0x50) + (temp_s1);
+
+    if (spr_allocateBtlComponentsOnWorldHeap) {
+        heap = _heap_malloc(&heap_generalHead, size);
+    } else {
+        heap = _heap_malloc(&gSpriteHeapPtr, size);
+    }
+
+    new_var = heap;
+
+    var_a0_2 = heap + (temp_s1 / 4);
+
+    for (i = 0; i < arg0; i++) {
+        *new_var = var_a0_2;
+        new_var++;
+        var_a0_2 += 0x50;
+    }
+    *new_var = (void* )-1;
+    return heap;
+}
+#else
 INCLUDE_ASM(s32, "101b90_len_8f0", spr_allocate_components);
+#endif
diff --git a/src/168590.c b/src/168590.c
index 037e58ccae..c5c40f9a56 100644
--- a/src/168590.c
+++ b/src/168590.c
@@ -2,8 +2,20 @@
 #include "filemenu.h"
 #include "hud_element.h"
 
+typedef struct UnkStruct8015A370 {
+    /* 0x00 */ u8 unk_00;
+    /* 0x01 */ char unk_01[0x3];
+    /* 0x04 */ void (*unk_04)(s32);
+    /* 0x08 */ char unk_08[0x14];
+    /* 0x1C */ u8 unk_1C;
+} UnkStruct8015A370;
+
+extern UnkStruct8015A370 D_8015A370;
+
 extern MenuWindowBP D_8024A134[1];
 extern HudScript* D_8024A180[3];
+extern s32 D_8024A18C;
+extern s32 D_8024C108;
 extern MenuWindowBP D_8024A190[2];
 extern s32 D_8024A1B4;
 extern s8 D_8024C090;
@@ -128,7 +140,149 @@ void filemenu_draw_contents_file_create_header(MenuPanel* menu, s32 baseX, s32 b
 }
 
 void filemenu_draw_contents_choose_name(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening);
+
+#ifdef NON_MATCHING
+void filemenu_draw_contents_choose_name(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity,
+                                        s32 darkening)
+{
+    s32 sp18;
+    s32 menuPage;
+    s32 pageNotOne;
+    s32 page;
+    s32 temp_s2;
+    s32 new_var;
+
+    s32 gridData;
+    s32 xOffset;
+    s32 yOffset;
+    s32 color;
+    s32 flags;
+    s32 i;
+    s32 r;
+    s32 c;
+
+    s32 new_var2;
+
+    if ((D_8015A370.unk_00 & 8) && D_8015A370.unk_04 == func_80248170) {
+        sp18 = D_8015A370.unk_1C * 2;
+        menuPage = menu->page;
+        pageNotOne = menu->page != 1;
+        if (sp18 > 0x10) {
+            sp18 = 0x10;
+        }
+
+        for (r = 0; r < menu->numRows; r++) {
+            temp_s2 = (r * 15); // ???
+
+            for (i = 0; i < 2; i++) {
+                if (i == 0) {
+                    temp_s2 += 4;
+                    page = menuPage;
+                    gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE,
+                                  baseX,
+                                  baseY + temp_s2,
+                                  baseX + width,
+                                  baseY + temp_s2 + sp18);
+                } else {
+                    temp_s2 += 4;
+                    page = pageNotOne;
+                    gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE,
+                                  baseX,
+                                  baseY + temp_s2 + sp18,
+                                  baseX + width,
+                                  baseY + temp_s2 + 0x10);
+                }
+
+                for (c = 0; c < menu->numCols; c++) {
+                    gridData = menu->gridData[(page * menu->numCols * menu->numRows) + (menu->numCols * r) + c];
+                    if (gridData != 0xF7) {
+                        if (r == menu->col && c == menu->row) {
+                            flags = 8;
+                            color = 0;
+                        } else {
+                            flags = 0;
+                            color = 10;
+                        }
+                        xOffset = (c * 19) + 12;
+                        yOffset = (r * 17) + 5;
+                        if ((u32) (gridData - 0xA2) < 0x4EU) {
+                            if (gridData >= 0xC6) {
+                                hud_element_set_render_pos(D_8024C108, baseX + xOffset + 22, baseY + yOffset + 8);
+                                hud_element_draw_without_clipping(D_8024C108);
+                                flags = 0;
+                            }
+                        }
+                        if (gridData == 0xC6) {
+                            xOffset -= 1;
+                        }
+                        if (gridData == 0xC9) {
+                            xOffset += 5;
+                        }
+                        if (gridData == 0xCA) {
+                            xOffset += 8;
+                        }
+                        if (gridData == 0xC6 || gridData == 0xCA || gridData == 0xC9) {
+                            yOffset -= 1;
+                        }
+                        filemenu_draw_message((Message* ) gridData, baseX + xOffset, baseY + yOffset, 255, color, flags);
+                    }
+                }
+            }
+        }
+        gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, baseX, baseY, baseX + width, baseY + height);
+    } else {
+        for (r = 0; r < menu->numCols; r++) {
+            for (c = 0; c < menu->numRows; c++) {
+                gridData = menu->gridData[(menu->page * menu->numCols * menu->numRows) + (menu->numCols * c) + r];
+                if (gridData != 0xF7) {
+                    if (r == menu->col && c == menu->row) {
+                        flags = 8;
+                        color = 0;
+                    } else {
+                        flags = 0;
+                        color = 10;
+                    }
+                    xOffset = (r * 19) + 12;
+                    yOffset = (c * 17) + 5;
+
+                    new_var2 = gridData; // ???
+
+                    if ((u32) (gridData - 0xA2) < 0x4EU) {
+                        if (gridData >= 0xC6) {
+                            hud_element_set_render_pos(D_8024C108, baseX + xOffset + 22, baseY + yOffset + 8);
+                            hud_element_draw_without_clipping(D_8024C108);
+                            flags = 0;
+                        }
+                    }
+                    if (gridData == 0xC6) {
+                        xOffset -= 1;
+                    }
+                    if (gridData == 0xC9) {
+                        xOffset += 5;
+                    }
+                    if (gridData == 0xCA) {
+                        xOffset += 8;
+                    }
+                    if (gridData == 0xC6 || gridData == 0xCA || gridData == 0xC9) {
+                        yOffset -= 1;
+                    }
+                    filemenu_draw_message((Message* ) new_var2, baseX + xOffset, baseY + yOffset, 255, color, flags);
+                }
+            }
+        }
+    }
+
+    if (filemenu_8024C098 == 3) {
+        if (filemenu_heldButtons & (BUTTON_STICK_RIGHT | BUTTON_STICK_LEFT | BUTTON_STICK_DOWN | BUTTON_STICK_UP)) {
+            D_8024A18C = -4;
+        }
+        D_8024A18C += 1;
+        filemenu_set_cursor_goal_pos(0x31, baseX + 2 + (menu->col * 19), baseY + 13 + (menu->row * 17));
+    }
+}
+#else
 INCLUDE_ASM(s32, "168590", filemenu_draw_contents_choose_name);
+#endif
 
 void filemenu_choose_name_init(MenuPanel* menu) {
     s32 i;
diff --git a/src/16F740.c b/src/16F740.c
index dc80cb8115..98c74999f8 100644
--- a/src/16F740.c
+++ b/src/16F740.c
@@ -184,7 +184,176 @@ void btl_state_draw_normal_start(void) {
     }
 }
 
-INCLUDE_ASM(s32, "16F740", btl_state_update_begin_turn);
+void btl_state_update_begin_turn(void) {
+    BattleStatus* battleStatus = &gBattleStatus;
+    PlayerData* playerData = &gPlayerData;
+    Actor* partner = battleStatus->partnerActor;
+    Actor* player = battleStatus->playerActor;
+    Actor* enemy;
+    Actor* enemy1;
+    Actor* enemy2;
+    Evt* script;
+    Evt* script2;
+    s32 cond;
+    u16 id1;
+    u16 id2;
+    s32 numEnemyActors;
+    s32 i;
+    s32 j;
+    s16* enemyIDs;
+
+    if (gBattleState2 == 0) {
+        battleStatus->flags2 &= ~BS_FLAGS2_2;
+        battleStatus->flags2 &= ~BS_FLAGS2_4;
+        battleStatus->flags2 &= ~BS_FLAGS2_8;
+        battleStatus->flags2 &= ~BS_FLAGS2_10;
+        battleStatus->merleeAttackBoost = 0;
+        battleStatus->merleeDefenseBoost = 0;
+        battleStatus->flags2 &= ~BS_FLAGS2_1000000;
+        player->unk_21D = 0;
+        player->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000;
+        if (partner != NULL) {
+            player->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000;
+            partner->unk_21D = 0;
+        }
+
+        if (battleStatus->hustleTurns != 0) {
+            battleStatus->flags1 |= BS_FLAGS1_4000000;
+        }
+
+        numEnemyActors = 0;
+        for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
+            enemy = battleStatus->enemyActors[i];
+            if (enemy != NULL) {
+                battleStatus->enemyIDs[numEnemyActors] = i | ACTOR_ENEMY0;
+                numEnemyActors++;
+            }
+        }
+
+        battleStatus->numEnemyActors = numEnemyActors;
+        enemyIDs = battleStatus->enemyIDs;
+        for (i = 0; i < numEnemyActors - 1; i++) {
+            for (j = i + 1; j < numEnemyActors; j++) {
+                id1 = enemyIDs[i];
+                id2 = enemyIDs[j];
+                enemy1 = battleStatus->enemyActors[id1 & 0xFF];
+                enemy2 = battleStatus->enemyActors[id2 & 0xFF];
+                if (gBattleStatus.flags1 & BS_FLAGS1_8000000) {
+                    if (enemy1->homePos.x > enemy2->homePos.x) {
+                        enemyIDs[i] = id2;
+                        enemyIDs[j] = id1;
+                    }
+                } else if (enemy1->turnPriority < enemy2->turnPriority) {
+                    enemyIDs[i] = id2;
+                    enemyIDs[j] = id1;
+                }
+            }
+        }
+
+        battleStatus->nextEnemyIndex = 0;
+        btl_merlee_on_start_turn();
+        battleStatus->rushFlags = 0;
+        gBattleStatus.flags2 &= ~BS_FLAGS2_8000000;
+
+        if (!(gBattleStatus.flags2 & BS_FLAGS2_40)) {
+            if (playerData->curHP < 2 && is_ability_active(ABILITY_MEGA_RUSH)) {
+                gBattleStatus.flags2 |= BS_FLAGS2_8000000;
+                battleStatus->rushFlags |= 1;
+            }
+            if (playerData->curHP < 6 && is_ability_active(ABILITY_POWER_RUSH) && !(battleStatus->rushFlags & 1)) {
+                gBattleStatus.flags2 |= BS_FLAGS2_8000000;
+                battleStatus->rushFlags |= 2;
+            }
+        }
+
+        if (!(gBattleStatus.flags1 & BS_FLAGS1_20000000)) {
+            battleStatus->jumpCharge = 0;
+        }
+
+        if (!(gBattleStatus.flags1 & BS_FLAGS1_10000000)) {
+            battleStatus->hammerCharge = 0;
+        }
+
+        if (gGameStatusPtr->debugEnemyContact == 4) {
+            btl_set_state(BATTLE_STATE_RUN_AWAY);
+            return;
+        }
+
+        if (gGameStatusPtr->debugEnemyContact == 3) {
+            for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
+                enemy = battleStatus->enemyActors[i];
+                if (enemy != NULL && enemy->onHitScriptSource != NULL) {
+                    Evt* script = start_script(enemy->onHitScriptSource, 0xA, 0);
+
+                    enemy->onHitScript = script;
+                    script->owner1.actorID = i | ACTOR_ENEMY0;
+                    enemy->onHitID = script->id;
+                    enemy->lastEventType = EVENT_DEATH;
+                }
+            }
+            gBattleState2 = BATTLE_STATE_SWITCH_TO_PLAYER;
+        } else {
+            for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
+                enemy = battleStatus->enemyActors[i];
+                if (enemy != NULL && enemy->onTurnChanceScriptSource != NULL) {
+                    battleStatus->battlePhase = PHASE_PLAYER_BEGIN;
+                    script = start_script(enemy->onTurnChanceScriptSource, 0xA, 0);
+                    enemy->onTurnChangeScript = script;
+                    enemy->onTurnChangeID = script->id;
+                    script->owner1.actorID = i | ACTOR_ENEMY0;
+                }
+            }
+
+            partner = battleStatus->partnerActor;
+            if (partner != NULL) {
+                if (partner->onTurnChanceScriptSource != NULL) {
+                    battleStatus->battlePhase = PHASE_PLAYER_BEGIN;
+                    script = start_script(partner->onTurnChanceScriptSource, 0xA, 0);
+                    partner->onTurnChangeScript = script;
+                    partner->onTurnChangeID = script->id;
+                    script->owner1.actorID = ACTOR_PARTNER;
+                }
+            }
+            gBattleState2 = BATTLE_STATE_BEGIN_TURN;
+        }
+    }
+
+    if (gBattleState2 == BATTLE_STATE_BEGIN_TURN) {
+        cond = FALSE;
+        for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
+            enemy = battleStatus->enemyActors[i];
+            if (enemy != NULL && enemy->onTurnChanceScriptSource != NULL && does_script_exist(enemy->onTurnChangeID)) {
+                cond = TRUE;
+            }
+        }
+        if (partner != NULL && partner->onTurnChanceScriptSource != NULL && does_script_exist(partner->onTurnChangeID)) {
+            cond = TRUE;
+        }
+
+        if (!cond) {
+            if (!btl_check_enemies_defeated()) {
+                btl_set_state(BATTLE_STATE_BEGIN_PLAYER_TURN);
+            }
+            return;
+        }
+    }
+
+    if (gBattleState2 == BATTLE_STATE_SWITCH_TO_PLAYER) {
+        cond = FALSE;
+        for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
+            enemy = battleStatus->enemyActors[i];
+            if (enemy != NULL && enemy->onHitScriptSource != NULL && does_script_exist(enemy->onHitID)) {
+                cond = TRUE;
+            }
+        }
+
+        if (!cond) {
+            if (!btl_check_enemies_defeated()) {
+                btl_set_state(BATTLE_STATE_BEGIN_PLAYER_TURN);
+            }
+        }
+    }
+}
 
 void btl_state_draw_begin_turn(void) {
 }
diff --git a/src/17D6A0.c b/src/17D6A0.c
index fabd8beefe..bcd3409efe 100644
--- a/src/17D6A0.c
+++ b/src/17D6A0.c
@@ -5,11 +5,46 @@
 #include "hud_element.h"
 
 s16 D_80280FC0[] = {
-    10, 90, 0, 50, 3, 11, 0, 50, 1, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50,
-    1, 49, 0, 50, 1, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 1, 50, 0, 50, 1,
-    50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 3, 10, 0, 50, 3, 10, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 3, 10, 0, 20, 3, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    10, 90, 0, 50,
+    3, 11, 0, 50,
+    1, 45, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 50,
+    1, 49, 0, 50,
+    1, 49, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 50,
+    1, 50, 0, 50,
+    1, 50, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 50,
+    3, 10, 0, 50,
+    3, 10, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 80,
+    3, 10, 0, 20,
+    3, 11, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0,
 };
 
 s32 bActorNames[ACTOR_TYPE_COUNT] = {
diff --git a/src/190B20.c b/src/190B20.c
index 80814b93e2..eb508034a2 100644
--- a/src/190B20.c
+++ b/src/190B20.c
@@ -220,7 +220,7 @@ s32 btl_are_all_enemies_defeated(void) {
 
 s32 btl_check_enemies_defeated(void) {
     if (btl_are_all_enemies_defeated()) {
-        btl_set_state(0x1A);
+        btl_set_state(BATTLE_STATE_VICTORY);
         return TRUE;
     }
     return FALSE;
diff --git a/src/effects.c b/src/effects.c
index 5f13841248..8619d63360 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -102,7 +102,7 @@ EffectTableEntry gEffectTable[] = {
     /* 0x48 */ FX_ENTRY(attack_result_text, _3903D0),
     /* 0x49 */ FX_ENTRY(small_gold_sparkle, effect_gfx_small_gold_sparkle),
     /* 0x4A */ FX_ENTRY(flashing_box_shockwave, _3930A0),
-    /* 0x4B */ FX_ENTRY(balloon, _394670),
+    /* 0x4B */ FX_ENTRY(balloon, effect_gfx_balloon),
     /* 0x4C */ FX_ENTRY(floating_rock, _3960F0),
     /* 0x4D */ FX_ENTRY(chomp_drop, _397040),
     /* 0x4E */ FX_ENTRY(quizmo_stage, _398BC0),
@@ -122,7 +122,7 @@ EffectTableEntry gEffectTable[] = {
     /* 0x5C */ FX_ENTRY(water_fountain, _3B8860),
     /* 0x5D */ FX_ENTRY(underwater, _3B9A70),
     /* 0x5E */ FX_ENTRY(lightning_bolt, _3BAEA0),
-    /* 0x5F */ FX_ENTRY(water_splash, _3BCA90),
+    /* 0x5F */ FX_ENTRY(water_splash, effect_gfx_water_splash),
     /* 0x60 */ FX_ENTRY(snowman_doll, _3BD9A0),
     /* 0x61 */ FX_ENTRY(fright_jar, _3C1BA0),
     /* 0x62 */ FX_ENTRY(stop_watch, _3CB890),
@@ -153,7 +153,7 @@ EffectTableEntry gEffectTable[] = {
     /* 0x7B */ FX_ENTRY(spirit_card, _3FA4B0),
     /* 0x7C */ FX_ENTRY(lil_oink, _3FF250),
     /* 0x7D */ FX_ENTRY(something_rotating, _3FA4B0),
-    /* 0x7E */ FX_ENTRY(breaking_junk, _403BF0),
+    /* 0x7E */ FX_ENTRY(breaking_junk, effect_gfx_breaking_junk),
     /* 0x7F */ FX_ENTRY(partner_buff, _404F40),
     /* 0x80 */ FX_ENTRY(quizmo_assistant, _407080),
     /* 0x81 */ FX_ENTRY(ice_pillar, _40A1C0),
diff --git a/src/effects/balloon.c b/src/effects/balloon.c
index 055706c116..3b1f4ffda6 100644
--- a/src/effects/balloon.c
+++ b/src/effects/balloon.c
@@ -1,12 +1,12 @@
 #include "common.h"
 #include "effects_internal.h"
 
-extern Gfx D_09001280[];
-extern Gfx D_09001358[];
-extern Gfx D_09001430[];
-extern Gfx D_09001508[];
+extern Gfx D_09001280_3958F0[];
+extern Gfx D_09001358_3959C8[];
+extern Gfx D_09001430_395AA0[];
+extern Gfx D_09001508_395B78[];
 
-Gfx* D_E00963E0[] = { D_09001280, D_09001358, D_09001430 };
+Gfx* D_E00963E0[] = { D_09001280_3958F0, D_09001358_3959C8, D_09001430_395AA0 };
 
 void balloon_init(EffectInstance* effect);
 void balloon_update(EffectInstance* effect);
@@ -102,7 +102,7 @@ void balloon_appendGfx(void* effect) {
     gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
               G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
     gSPDisplayList(gMasterGfxPos++, D_E00963E0[idx]);
-    gSPDisplayList(gMasterGfxPos++, D_09001508);
+    gSPDisplayList(gMasterGfxPos++, D_09001508_395B78);
     gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
     gDPPipeSync(gMasterGfxPos++);
 }
diff --git a/src/effects/blast.c b/src/effects/blast.c
index 5a1bdc553e..b6283a8cf3 100644
--- a/src/effects/blast.c
+++ b/src/effects/blast.c
@@ -1,12 +1,27 @@
 #include "common.h"
 #include "effects_internal.h"
 
-
 void blast_init(EffectInstance* effect);
 void blast_update(EffectInstance* effect);
 void blast_render(EffectInstance* effect);
 void blast_appendGfx(void* effect);
 
+extern Gfx D_09001300[];
+extern Gfx D_09001378[];
+extern Gfx D_090013F0[];
+extern Gfx D_09001468[];
+extern Gfx D_090014E0[];
+extern Gfx D_09001558[];
+extern Gfx D_090015D0[];
+extern Gfx D_09001648[];
+extern Gfx D_090016C0[];
+extern Gfx D_09001738[];
+extern Gfx D_090017B0[];
+
+Gfx* D_E007C510[] = {
+    D_09001378, D_090013F0, D_09001468, D_090014E0, D_09001558, D_090015D0, D_09001648, D_090016C0, D_09001738
+};
+
 void blast_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
     EffectBlueprint bp;
     EffectBlueprint* bpPtr = &bp;
@@ -75,4 +90,50 @@ void blast_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_TASK_FLAG_2;
 }
 
+#ifdef NON_MATCHING
+void blast_appendGfx(void* effect) {
+    Matrix4f sp18, sp58, sp98;
+    Gfx* dlist;
+    Gfx* dlist2;
+    BlastFXData* data = ((EffectInstance*)effect)->data;
+    f32 temp_f2;
+    s32 temp_f4;
+    s32 alpha;
+
+    dlist = D_090017B0;
+    dlist2 = D_09001300;
+
+    temp_f4 = data->unk_20;
+    temp_f2 = temp_f4;
+    alpha = (temp_f2 - temp_f4) * 256.0f;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
+    gSPDisplayList(gMasterGfxPos++, dlist2);
+    gSPDisplayList(gMasterGfxPos++, D_E007C510[temp_f4]);
+
+    shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z);
+    shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
+    shim_guMtxCatF(sp58, sp18, sp98);
+    shim_guScaleF(sp18, data->unk_10, data->unk_10, 1.0f);
+    shim_guMtxCatF(sp18, sp98, sp98);
+    shim_guRotateF(sp18, data->unk_24, 0.0f, 0.0f, 1.0f);
+    shim_guMtxCatF(sp18, sp98, sp98);
+    shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]);
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    if (data->unk_20 > 4.0f) {
+        gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, 127);
+    } else {
+        gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 128, 127);
+    }
+
+    gDPSetEnvColor(gMasterGfxPos++, 255, 255, 139, alpha);
+
+    gSPDisplayList(gMasterGfxPos++, dlist);
+    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+}
+#else
 INCLUDE_ASM(s32, "effects/blast", blast_appendGfx);
+#endif
diff --git a/src/effects/bombette_breaking.c b/src/effects/bombette_breaking.c
index 123cf4a457..83953ce4bd 100644
--- a/src/effects/bombette_breaking.c
+++ b/src/effects/bombette_breaking.c
@@ -2,10 +2,10 @@
 #include "model.h"
 #include "effects_internal.h"
 
-void bombette_breaking_appendGfx(void* effect);
 void bombette_breaking_init(EffectInstance* effect);
 void bombette_breaking_update(EffectInstance* effect);
 void bombette_breaking_render(EffectInstance* effect);
+void bombette_breaking_appendGfx(void* effect);
 
 extern Gfx D_090018C0[];
 extern Gfx D_09001D00[];
@@ -21,24 +21,173 @@ void (*D_E0084E34)(u16, f32*, f32*, f32*, f32*, f32*, f32*) = get_model_center_a
 Model* (*D_E0084E38)(s32) = get_model_from_list_index;
 s32 (*D_E0084E3C)(s32) = get_model_list_index_from_tree_index;
 
-void func_E0084000(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ) {
+void bombette_breaking_get_model_center_and_size(s32 modelID,
+                                                 f32* centerX, f32* centerY, f32* centerZ,
+                                                 f32* sizeX, f32* sizeY, f32* sizeZ)
+{
     D_E0084E34(modelID, centerX, centerY, centerZ, sizeX, sizeY, sizeZ);
 }
 
-Model* func_E008403C(s32 listIndex) {
+Model* bombette_breaking_get_model_from_list_index(s32 listIndex) {
     return D_E0084E38(listIndex);
 }
 
-s32 func_E0084060(s32 listIndex) {
+s32 bombette_breaking_get_model_list_index_from_tree_index(s32 listIndex) {
     return D_E0084E3C(listIndex);
 }
 
-INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_main);
+EffectInstance* bombette_breaking_main(s32 type, s32 modelID, s32 treeIndex, f32 arg3, s32 arg4, s32 time) {
+    EffectBlueprint bp;
+    EffectBlueprint* bpPtr = &bp;
+    EffectInstance* effect;
+    s32 numParts;
+    BombetteBreakingFXData* data;
+    f32 centerX, centerY, centerZ;
+    f32 sizeX, sizeY, sizeZ;
+    s32 xParts, yParts, zParts;
+    s32 iX, iY, iZ;
+    f32 f20, f30, f40;
+
+    bombette_breaking_get_model_center_and_size(modelID & 0xFFFF, &centerX, &centerY, &centerZ, &sizeX, &sizeY, &sizeZ);
+
+    xParts = (sizeX * 0.0625f) + 1.0f;
+    yParts = (sizeY * 0.0625f) + 1.0f;
+    zParts = (sizeZ * 0.0625f) + 1.0f;
+
+    f20 = (s32)sizeX % 16;
+    f30 = (s32)sizeY % 16;
+    f40 = (s32)sizeZ % 16;
+
+    bp.unk_00 = 0;
+    bp.init = bombette_breaking_init;
+    bp.update = bombette_breaking_update;
+    bp.renderWorld = bombette_breaking_render;
+    bp.unk_14 = 0;
+    bp.effectID = EFFECT_BOMBETTE_BREAKING;
+
+    f20 *= 0.5;
+    f30 *= 0.5;
+    f40 *= 0.5;
+
+    numParts = (xParts * yParts * zParts) + 1;
+    effect = shim_create_effect_instance(bpPtr);
+    effect->numParts = numParts;
+    effect->data.bombetteBreaking = data = shim_general_heap_malloc(numParts * sizeof(*data));
+    ASSERT(data != NULL);
+
+    data->unk_04 = -sizeY * 0.5;
+    data->timeLeft = time;
+    data->unk_48 = 0;
+    data->type = type;
+    data->unk_38 = arg3;
+    data->alpha = 255;
+    data->treeIndex = treeIndex;
+    data->unk_3C = 2.0f * arg3;
+    data->center.x = centerX;
+    data->center.y = centerY;
+    data->center.z = centerZ;
+    data->unk_40 = sizeY * 0.05;
+    if (data->unk_40 < 1.0f) {
+        data->unk_40 = 1.0f;
+    }
+
+    data++;
+    for (iX = 0; iX < xParts; iX++) {
+        centerX = f20 - (sizeX * 0.5) + (iX * 16.0f);
+        for (iY = 0; iY < yParts; iY++) {
+            centerY = f30 - (sizeY * 0.5) + (iY * 16.0f);
+            for (iZ = 0; iZ < zParts; iZ++) {
+                centerZ = f30 - (sizeZ * 0.5) + (iZ * 16.0f);
+
+                data->center.x = data->unk_14.x = centerX;
+                data->center.y = data->unk_14.y = centerY;
+                data->center.z = data->unk_14.z = centerZ;
+
+                if (sizeX < sizeZ) {
+                    if (xParts >= 2) {
+                        data->unk_20.x = 2.0 * (centerX / (sizeX * 0.5));
+                    } else {
+                        if (iZ & 1) {
+                            data->unk_20.x = 2.0f;
+                        } else {
+                            data->unk_20.x = -2.0f;
+                        }
+                    }
+                    data->unk_20.z = 0.0f;
+                } else {
+                    data->unk_20.x = 0.0f;
+                    if (zParts >= 2) {
+                        data->unk_20.z = 2.0 * (centerZ / (sizeZ * 0.5));
+                    } else {
+                        if (iX & 1) {
+                            data->unk_20.z = 2.0f;
+                        } else {
+                            data->unk_20.z = -2.0f;
+                        }
+                    }
+                }
+
+                data->unk_20.y = centerY * 0.2;
+                data->unk_2C.x = centerZ * 0.2 + (centerX < centerZ ? (centerZ < 0 ? -1.0 : (centerZ > 0 ? 1.0 : 0.0)) : 0.0);
+                data->unk_2C.y = centerY * 0.2;
+                data->unk_2C.z = centerX * 0.2 + (centerZ < centerX ? (centerX < 0 ? -1.0 : (centerX > 0 ? 1.0 : 0.0)) : 0.0);
+
+                data->alpha = 255;
+                data++;
+            }
+        }
+    }
+    return effect;
+}
 
 void bombette_breaking_init(EffectInstance* effect) {
 }
 
-INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_update);
+void bombette_breaking_update(EffectInstance* effect) {
+    BombetteBreakingFXData* data = effect->data.bombetteBreaking;
+    f32 unk_04;
+    s32 i;
+
+    data->unk_48++;
+    data->timeLeft--;
+
+    if (data->timeLeft < 0) {
+        shim_remove_effect(effect);
+        return;
+    }
+
+    unk_04 = data->unk_04;
+
+    if (data->timeLeft < 25.0f) {
+        data->alpha = data->timeLeft * 10.0f;
+    }
+    data->unk_38 += (data->unk_3C - data->unk_38) * 0.1;
+
+    data++;
+    for (i = 1; i < effect->numParts; i++, data++) {
+        data->unk_20.x *= 0.9;
+        data->unk_20.y *= 0.9;
+        data->unk_20.z *= 0.9;
+        data->center.x += data->unk_20.x;
+        data->center.y += data->unk_20.y;
+        data->center.z += data->unk_20.z;
+        if (data->center.y < unk_04 && data->unk_20.y < 0.0f) {
+            data->center.y = unk_04;
+            data->unk_20.y *= -0.7;
+        }
+
+        data->unk_2C.x *= 0.95;
+        data->unk_2C.y -= 0.4;
+        data->unk_2C.z *= 0.95;
+        data->unk_14.x += data->unk_2C.x;
+        data->unk_14.y += data->unk_2C.y;
+        data->unk_14.z += data->unk_2C.z;
+        if (data->unk_14.y < unk_04 && data->unk_2C.y < 0.0f) {
+            data->unk_14.y = unk_04;
+            data->unk_2C.y *= -0.4;
+        }
+    }
+}
 
 void bombette_breaking_render(EffectInstance* effect) {
     RenderTask renderTask;
@@ -53,4 +202,53 @@ void bombette_breaking_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_TASK_FLAG_2;
 }
 
-INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_appendGfx);
+void bombette_breaking_appendGfx(void* effect) {
+    Matrix4f sp20;
+    BombetteBreakingFXData* data = ((EffectInstance*)effect)->data.bombetteBreaking;
+    s32 timeLeft = data->timeLeft;
+    u16 type = data->type;
+    Gfx* sp60 = D_E0084E10[type];
+    Gfx* sp64 = D_E0084E28[type];
+    f32 unk_38 = data->unk_38;
+    f32 unk_40 = data->unk_40;
+    s32 mainAlpha = data->alpha;
+    s32 i;
+
+    timeLeft *= 4;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
+    shim_guTranslateF(sp20, data->center.x, data->center.y, data->center.z);
+    shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+
+    shim_mdl_draw_hidden_panel_surface(&gMasterGfxPos, data->treeIndex);
+
+    data++;
+    for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) {
+        shim_guPositionF(sp20, timeLeft + (130 * i), timeLeft - (40 * i), timeLeft + (80 * i), unk_40,
+                         data->unk_14.x, data->unk_14.y, data->unk_14.z);
+        shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
+        gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+                  G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+        gSPDisplayList(gMasterGfxPos++, D_E0084E1C[type]);
+        gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+    }
+
+    gSPDisplayList(gMasterGfxPos++, sp64);
+
+    data = ((EffectInstance*)effect)->data.bombetteBreaking;
+    data++;
+    for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) {
+        gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, (data->alpha * mainAlpha) / 255);
+        shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, unk_38,
+                         data->center.x, data->center.y, data->center.z);
+        shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
+        gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+                  G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+        gSPDisplayList(gMasterGfxPos++, sp60);
+        gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+    }
+
+    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+}
diff --git a/src/effects/breaking_junk.c b/src/effects/breaking_junk.c
index c24c1d2216..7a29e305c6 100644
--- a/src/effects/breaking_junk.c
+++ b/src/effects/breaking_junk.c
@@ -1,14 +1,122 @@
 #include "common.h"
 #include "effects_internal.h"
 
+void breaking_junk_init(EffectInstance* effect);
+void breaking_junk_update(EffectInstance* effect);
+void breaking_junk_render(EffectInstance* effect);
 void breaking_junk_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_main);
+extern Gfx D_09000400_403FF0[];
+extern Gfx D_090005A8_404198[];
+extern Gfx D_090005C8_4041B8[];
+extern Gfx D_090005E8_4041D8[];
+extern Gfx D_09000608_4041F8[];
 
-void breaking_junk_init(void) {
+Gfx* D_E01187B0[] = { D_090005A8_404198, D_090005C8_4041B8, D_090005E8_4041D8, D_09000608_4041F8 };
+
+Gfx* D_E01187C0[] = { D_09000400_403FF0 };
+
+EffectInstance* breaking_junk_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 time) {
+    EffectBlueprint bp;
+    EffectBlueprint* bpPtr = &bp;
+    EffectInstance* effect;
+    BreakingJunkFXData* data;
+    s32 numParts = 6;
+    u32 g;
+    s32 i;
+
+    bp.unk_00 = 0;
+    bp.init = breaking_junk_init;
+    bp.update = breaking_junk_update;
+    bp.renderWorld = breaking_junk_render;
+    bp.unk_14 = 0;
+    bp.effectID = EFFECT_BREAKING_JUNK;
+
+    effect = shim_create_effect_instance(bpPtr);
+    effect->numParts = numParts;
+
+    data = effect->data.breakingJunk = shim_general_heap_malloc(numParts * sizeof(*data));
+
+    ASSERT(effect->data.breakingJunk != NULL);
+
+    data->unk_00 = arg0;
+    data->lifeTime = 0;
+    if (time <= 0) {
+        data->timeLeft = 1000;
+    } else {
+        data->timeLeft = time;
+    }
+    data->primA = 255;
+
+    for (i = 0; i < effect->numParts; i++, data++) {
+        data->pos.x = x;
+        data->pos.y = y;
+        data->pos.z = z;
+        data->vel.x = (shim_rand_int(10) - 5) * 0.5;
+        data->vel.y = (shim_rand_int(5) + 1) * 0.8;
+        data->vel.z = (shim_rand_int(10) - 5) * 0.5;
+        data->scale = scale;
+        data->primR = data->envR = shim_rand_int(255);
+        g = shim_rand_int(255 - data->envR);
+        data->primG = data->envG = g;
+        data->primB = data->envB = (255 - g) - data->envR;
+        data->primR += 168;
+        data->primG += 168;
+        data->primB += 168;
+        if (data->primR > 255) {
+            data->primR = 255;
+        }
+        if (data->primG > 255) {
+            data->primG = 255;
+        }
+        if (data->primB > 255) {
+            data->primB = 255;
+        }
+        data->envR = data->envR * 0.6;
+        data->envG = data->envG * 0.6;
+        data->envB = data->envB * 0.6;
+        data->rot = shim_rand_int(359);
+    }
+    return effect;
 }
 
-INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_update);
+void breaking_junk_init(EffectInstance* effect) {
+}
+
+void breaking_junk_update(EffectInstance* effect) {
+    BreakingJunkFXData* data = effect->data.breakingJunk;
+    s32 i;
+
+    if (effect->flags & 0x10) {
+        effect->flags &= ~0x10;
+        data->timeLeft = 16;
+    }
+    if (data->timeLeft < 1000) {
+        data->timeLeft--;
+    }
+
+    data->lifeTime++;
+    if (data->timeLeft < 0) {
+        shim_remove_effect(effect);
+        return;
+    }
+
+    if (data->timeLeft < 8) {
+        data->primA = data->timeLeft * 32;
+    }
+
+    for (i = 0; i < effect->numParts; i++, data++) {
+        data->vel.y -= 0.5;
+        data->pos.x += data->vel.x;
+        data->pos.y += data->vel.y;
+        data->pos.z += data->vel.z;
+        if (data->pos.y < 0.0f && data->vel.y < 0.0f) {
+            data->pos.y = 0.0f;
+            data->vel.y *= -0.7;
+        }
+        data->rot += (((i & 1) * 2) - 1) * 14;
+    }
+}
 
 void breaking_junk_render(EffectInstance* effect) {
     RenderTask renderTask;
@@ -23,4 +131,27 @@ void breaking_junk_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_TASK_FLAG_2;
 }
 
-INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_appendGfx);
+void breaking_junk_appendGfx(void* effect) {
+    Matrix4f sp20, sp60;
+    BreakingJunkFXData* data = ((EffectInstance*)effect)->data.breakingJunk;
+    s32 alpha = data->primA;
+    s32 i;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
+    gSPDisplayList(gMasterGfxPos++, D_E01187C0[0]);
+
+    for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, data++) {
+        shim_guPositionF(sp20, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, data->scale * 0.5, data->pos.x, data->pos.y, data->pos.z);
+        shim_guRotateF(sp60, data->rot, 0.0f, 0.0f, 1.0f);
+        shim_guMtxCatF(sp60, sp20, sp20);
+        shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]);
+        gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, alpha);
+        gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->envB, data->envA);
+        gSPDisplayList(gMasterGfxPos++, D_E01187B0[(u32)i % ARRAY_COUNT(D_E01187B0)]);
+        gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+    }
+
+    gDPPipeSync(gMasterGfxPos++);
+}
diff --git a/src/effects/cloud_puff.c b/src/effects/cloud_puff.c
index d34afa842f..7f9e749559 100644
--- a/src/effects/cloud_puff.c
+++ b/src/effects/cloud_puff.c
@@ -45,7 +45,7 @@ void cloud_puff_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
         part->unk_24 = (shim_rand_int(10) * 0.03) + 1.0;
         part->unk_28 = (shim_rand_int(10) * 0.03) + 1.7;
         part->unk_2C = func_E0200000(60);
-        part->lifetime = 30;
+        part->timeLeft = 30;
         part->unk_34 = 0.5f;
         part->unk_38 = -0.02f;
         part->unk_3C = 0.00005f;
@@ -66,8 +66,8 @@ void cloud_puff_update(EffectInstance* effect) {
 
     for (i = 0; i < effect->numParts; i++, part++) {
         if (part->alive) {
-            part->lifetime--;
-            if (part->lifetime <= 0) {
+            part->timeLeft--;
+            if (part->timeLeft <= 0) {
                 part->alive = FALSE;
             } else {
                 cond = TRUE;
@@ -83,11 +83,11 @@ void cloud_puff_update(EffectInstance* effect) {
                 part->unk_10 += part->unk_34;
                 part->unk_28 *= 0.98;
 
-                if (part->lifetime < 10) {
+                if (part->timeLeft < 10) {
                     part->unk_28 *= 0.9;
                 }
 
-                if (part->lifetime < 15) {
+                if (part->timeLeft < 15) {
                     part->alpha -= 16;
                 }
             }
diff --git a/src/effects/fire_breath.c b/src/effects/fire_breath.c
index b7be42d602..bdbe9f6f91 100644
--- a/src/effects/fire_breath.c
+++ b/src/effects/fire_breath.c
@@ -59,8 +59,8 @@ EffectInstance* fire_breath_main(
     }
 
     data->unk_30 = data->scale;
-    data->maxLifetime = lifetime;
-    data->lifetime = lifetime;
+    data->lifeTime = lifetime;
+    data->timeLeft = lifetime;
     data->spawnTimer = 0;
     data->alpha = 255;
     data->unk_5C = 0.0f;
@@ -93,30 +93,30 @@ void fire_breath_init(EffectInstance* effect) {
 
 void fire_breath_update(EffectInstance* effect) {
     FireBreathFXData* data = effect->data.fireBreath;
-    s32 maxLifetime;
-    s32 lifetime;
+    s32 lifeTime;
+    s32 timeLeft;
     s32 spawnTimer;
 
-    data->lifetime--;
+    data->timeLeft--;
     data->unk_5C = (data->spawnTimer * 4.0f) / 10.0f;
     data->spawnTimer++;
 
-    if (data->lifetime < 0) {
+    if (data->timeLeft < 0) {
         shim_remove_effect(effect);
         return;
     }
 
-    lifetime = data->lifetime;
-    maxLifetime = data->maxLifetime;
+    timeLeft = data->timeLeft;
+    lifeTime = data->lifeTime;
     spawnTimer = data->spawnTimer;
 
-    if (lifetime >= 6 && data->type == FIRE_BREATH_LARGE) {
+    if (timeLeft >= 6 && data->type == FIRE_BREATH_LARGE) {
         data->scale += (2.5 - data->scale) * 0.05;
     }
 
-    data->pos.x = data->initPos.x + (((data->endPos.x - data->initPos.x + data->unk_50.x) * spawnTimer) / maxLifetime);
-    data->pos.y = data->initPos.y + (((data->endPos.y - data->initPos.y + data->unk_50.y) * spawnTimer) / maxLifetime);
-    data->pos.z = data->initPos.z + (((data->endPos.z - data->initPos.z + data->unk_50.z) * spawnTimer) / maxLifetime);
+    data->pos.x = data->initPos.x + (((data->endPos.x - data->initPos.x + data->unk_50.x) * spawnTimer) / lifeTime);
+    data->pos.y = data->initPos.y + (((data->endPos.y - data->initPos.y + data->unk_50.y) * spawnTimer) / lifeTime);
+    data->pos.z = data->initPos.z + (((data->endPos.z - data->initPos.z + data->unk_50.z) * spawnTimer) / lifeTime);
 
     if (data->type == FIRE_BREATH_SMALL) {
         data->unk_60 += (f32) spawnTimer * 0.01;
@@ -129,7 +129,7 @@ void fire_breath_update(EffectInstance* effect) {
         shim_load_effect(EFFECT_FIRE_BREATH);
         spawned = fire_breath_main(
             data->type, data->initPos.x, data->initPos.y, data->initPos.z, data->endPos.x, data->endPos.y,
-            data->endPos.z, data->numChildren - 1, data->spawnDelay, maxLifetime
+            data->endPos.z, data->numChildren - 1, data->spawnDelay, lifeTime
         );
 
         spawned->data.fireBreath->primR = data->primR;
@@ -143,18 +143,18 @@ void fire_breath_update(EffectInstance* effect) {
         spawned->data.fireBreath->scaleChangeFactor = data->scaleChangeFactor;
     }
 
-    if (lifetime < 10 && data->type == FIRE_BREATH_LARGE) {
-        data->alpha = lifetime * 25;
+    if (timeLeft < 10 && data->type == FIRE_BREATH_LARGE) {
+        data->alpha = timeLeft * 25;
     }
 
     if (data->type == FIRE_BREATH_SMALL) {
         data->scale += (0.3 - data->scale) * 0.008;
-        data->alpha = (lifetime * 224) / maxLifetime;
+        data->alpha = (timeLeft * 224) / lifeTime;
     }
 
     if (data->type == FIRE_BREATH_TINY) {
         data->scale += (data->unk_34 - data->scale) * data->scaleChangeFactor;
-        data->alpha = (lifetime * 224) / maxLifetime;
+        data->alpha = (timeLeft * 224) / lifeTime;
     }
 }
 
diff --git a/src/effects/gfx/balloon.c b/src/effects/gfx/balloon.c
new file mode 100644
index 0000000000..d55e77a32c
--- /dev/null
+++ b/src/effects/gfx/balloon.c
@@ -0,0 +1,31 @@
+#include "common.h"
+
+#include "effects/gfx/D_09000000_394670.png.inc.c"
+#include "effects/gfx/D_09000200_394870.png.inc.c"
+#include "effects/gfx/D_09000000_394670.pal.inc.c"
+
+u8 D_09000420_394A90[] = {
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+};
+
+#include "effects/gfx/D_09000600_394C70.png.inc.c"
+#include "effects/gfx/D_09000800_394E70.png.inc.c"
+#include "effects/gfx/D_09000600_394C70.pal.inc.c"
+
+u8 D_09000A20_395090[] = {
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+};
+
+#include "effects/gfx/D_09000C00_395270.png.inc.c"
+#include "effects/gfx/D_09000E00_395470.png.inc.c"
+#include "effects/gfx/D_09000C00_395270.pal.inc.c"
+
+u8 D_09001020_395690[] = {
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+};
+
+#include "effects/gfx/D_09001200_395870.vtx.inc.c"
+#include "effects/gfx/D_09001280_3958F0.gfx.inc.c"
+#include "effects/gfx/D_09001358_3959C8.gfx.inc.c"
+#include "effects/gfx/D_09001430_395AA0.gfx.inc.c"
+#include "effects/gfx/D_09001508_395B78.gfx.inc.c"
diff --git a/src/effects/gfx/breaking_junk.c b/src/effects/gfx/breaking_junk.c
new file mode 100644
index 0000000000..0ae2840741
--- /dev/null
+++ b/src/effects/gfx/breaking_junk.c
@@ -0,0 +1,16 @@
+#include "common.h"
+
+#include "effects/gfx/D_09000000_403BF0.png.inc.c"
+#include "effects/gfx/D_09000100_403CF0.png.inc.c"
+#include "effects/gfx/D_09000200_403DF0.png.inc.c"
+#include "effects/gfx/D_09000300_403EF0.png.inc.c"
+
+#include "effects/gfx/D_09000400_403FF0.gfx.inc.c"
+#include "effects/gfx/D_090004A8_404098.vtx.inc.c"
+#include "effects/gfx/D_090004E8_4040D8.vtx.inc.c"
+#include "effects/gfx/D_09000528_404118.vtx.inc.c"
+#include "effects/gfx/D_09000568_404158.vtx.inc.c"
+#include "effects/gfx/D_090005A8_404198.gfx.inc.c"
+#include "effects/gfx/D_090005C8_4041B8.gfx.inc.c"
+#include "effects/gfx/D_090005E8_4041D8.gfx.inc.c"
+#include "effects/gfx/D_09000608_4041F8.gfx.inc.c"
diff --git a/src/effects/gfx/water_splash.c b/src/effects/gfx/water_splash.c
new file mode 100644
index 0000000000..c9b05ed0ad
--- /dev/null
+++ b/src/effects/gfx/water_splash.c
@@ -0,0 +1,12 @@
+#include "common.h"
+
+#include "effects/gfx/D_09000000_3BCA90.png.inc.c"
+#include "effects/gfx/D_09000100_3BCB90.gfx.inc.c"
+
+#include "effects/gfx/D_090001A8_3BCC38.vtx.inc.c"
+#include "effects/gfx/D_090001E8_3BCC78.vtx.inc.c"
+#include "effects/gfx/D_09000228_3BCCB8.vtx.inc.c"
+
+#include "effects/gfx/D_09000268_3BCCF8.gfx.inc.c"
+#include "effects/gfx/D_09000288_3BCD18.gfx.inc.c"
+#include "effects/gfx/D_090002A8_3BCD38.gfx.inc.c"
diff --git a/src/effects/snowflake.c b/src/effects/snowflake.c
index 081004ec61..ded2fc9232 100644
--- a/src/effects/snowflake.c
+++ b/src/effects/snowflake.c
@@ -11,7 +11,7 @@ void snowflake_update(EffectInstance* effect);
 void snowflake_render(EffectInstance* effect);
 void snowflake_appendGfx(void* effect);
 
-void snowflake_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) {
+void snowflake_main(f32 x, f32 y, f32 z, s32 arg3, s32 arg4) {
     EffectBlueprint bp;
     EffectInstance* effect;
     SnowflakeFXData* part;
@@ -31,14 +31,14 @@ void snowflake_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) {
 
     ASSERT(effect->data.snowflake != NULL);
 
-    part->xPos = arg0;
-    part->yPos = arg1;
-    part->zPos = arg2;
+    part->pos.x = x;
+    part->pos.y = y;
+    part->pos.z = z;
     part->unk_0C = 0;
+    part->unk_10 = -3.0f;
     part->unk_14 = 0;
     part->unk_18 = 0;
     part->unk_1C = 0;
-    part->unk_10 = -3.0f;
     part->unk_20 = 3.0f;
     if (D_E001C5E0 != 0) {
         phi_f4 = -10.0f;
@@ -66,9 +66,9 @@ void snowflake_update(EffectInstance* effect) {
         return;
     }
 
-    data->xPos += data->unk_0C;
-    data->yPos += data->unk_10;
-    data->zPos += data->unk_14;
+    data->pos.x += data->unk_0C;
+    data->pos.y += data->unk_10;
+    data->pos.z += data->unk_14;
     data->unk_18 += data->unk_20;
     if (data->unk_18 < 10.0f) {
         data->unk_18 = 10.0f;
@@ -83,28 +83,28 @@ void snowflake_update(EffectInstance* effect) {
 
 void snowflake_render(EffectInstance* effect) {
     PlayerStatus* playerStatus = &gPlayerStatus;
-    SnowflakeFXData* effect14 = effect->data.snowflake;
+    SnowflakeFXData* data = effect->data.snowflake;
     RenderTask renderTask;
     RenderTask* renderTaskPtr = &renderTask;
     RenderTask* retTask;
-    f32 effectPos = effect14->xPos;
+    f32 effectPos = data->pos.x;
     f32 playerPos = playerStatus->position.x;
 
     if (effectPos - playerPos > 200) {
-        effect14->xPos = effectPos - 400;
+        data->pos.x = effectPos - 400;
     } else {
         if (playerPos - effectPos > 200) {
-            effect14->xPos = effectPos + 400;
+            data->pos.x = effectPos + 400;
         }
     }
 
-    effectPos = effect14->zPos;
+    effectPos = data->pos.z;
     playerPos = playerStatus->position.z;
     if (effectPos - playerPos > 200) {
-        effect14->zPos = effectPos - 400;
+        data->pos.z = effectPos - 400;
     } else {
         if (playerPos - effectPos > 200) {
-            effect14->zPos = effectPos + 400;
+            data->pos.z = effectPos + 400;
         }
     }
 
@@ -120,13 +120,13 @@ void snowflake_render(EffectInstance* effect) {
 void snowflake_appendGfx(void* effect) {
     Matrix4f sp18, sp58, sp98, spD8, sp118;
     EffectInstance* effectTemp = effect;
-    SnowflakeFXData* part = effectTemp->data.snowflake;
+    SnowflakeFXData* data = effectTemp->data.snowflake;
 
     gDPPipeSync(gMasterGfxPos++);
     gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data));
     gSPDisplayList(gMasterGfxPos++, D_09000900_331800);
 
-    shim_guTranslateF(sp18, part->xPos, part->yPos, part->zPos);
+    shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z);
     shim_guRotateF(spD8, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
     shim_guMtxCatF(spD8, sp18, sp118);
     shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]);
@@ -134,8 +134,8 @@ void snowflake_appendGfx(void* effect) {
     gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
     gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, 255);
 
-    shim_guRotateF(sp58, part->unk_18, 1.0f, 0.0f, 0.0f);
-    shim_guRotateF(sp98, part->unk_1C, 0.0f, 1.0f, 0.0f);
+    shim_guRotateF(sp58, data->unk_18, 1.0f, 0.0f, 0.0f);
+    shim_guRotateF(sp98, data->unk_1C, 0.0f, 1.0f, 0.0f);
     shim_guMtxCatF(sp58, sp98, sp118);
     shim_guMtxF2L(sp118, &gDisplayContext->matrixStack[gMatrixListPos]);
 
diff --git a/src/effects/water_splash.c b/src/effects/water_splash.c
index 2b07b6abcf..bd3ced647c 100644
--- a/src/effects/water_splash.c
+++ b/src/effects/water_splash.c
@@ -1,6 +1,14 @@
 #include "common.h"
 #include "effects_internal.h"
 
+extern Gfx D_09000268_3BCCF8[];
+extern Gfx D_09000288_3BCD18[];
+extern Gfx D_090002A8_3BCD38[];
+
+Gfx* D_E00BEAF0[] = {
+    D_09000268_3BCCF8, D_09000288_3BCD18, D_09000268_3BCCF8, D_090002A8_3BCD38
+};
+
 void water_splash_appendGfx(void* effect);
 
 INCLUDE_ASM(s32, "effects/water_splash", water_splash_main);
diff --git a/src/sprite.c b/src/sprite.c
index 7cbf11cc8a..b85fbaab59 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -92,15 +92,6 @@ PlayerSpriteSet spr_playerSpriteSets[] = {
     /* Peach */ {  6, 0x900, 0x00003C00 },
 };
 
-void spr_appendGfx_component_flat(
-    Quad* vertices,
-    IMG_PTR raster, PAL_PTR palette,
-    s32 width, s32 height,
-    f32 arg5,
-    Matrix4f mtx,
-    s32 alpha
-);
-
 void spr_init_quad_cache(void) {
     s32 i;
 
@@ -196,6 +187,16 @@ void spr_clear_quad_cache(void) {
     }
 }
 
+void spr_appendGfx_component_flat(
+    Quad* vertices,
+    IMG_PTR raster, PAL_PTR palette,
+    s32 width, s32 height,
+    f32 arg5,
+    Matrix4f mtx,
+    s32 alpha
+);
+
+
 INCLUDE_ASM(s32, "sprite", spr_appendGfx_component_flat);
 
 void spr_appendGfx_component(
diff --git a/src/sprite.h b/src/sprite.h
index 94b98541f1..7f12ea5eaa 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -32,7 +32,7 @@ typedef struct SpriteAnimComponent {
 
 // TODO: consider moving to 101b90_len_8f0 (sprite_cache)
 typedef struct SpriteRasterCacheEntry {
-    /* 0x00 */ void* image;
+    /* 0x00 */ IMG_PTR image;
     /* 0x04 */ u8 width;
     /* 0x05 */ u8 height;
     /* 0x06 */ s8 palette;
@@ -71,7 +71,7 @@ typedef struct PlayerSpriteCacheEntry {
     /* 0x00 */ s32 lazyDeleteTime;
     /* 0x04 */ s32 rasterIndex;
     /* 0x08 */ s32 spriteIndex;
-    /* 0x0C */ IMG_PTR* raster;
+    /* 0x0C */ IMG_PTR raster;
 } PlayerSpriteCacheEntry; // size = 0x10
 
 /// Sprite data header.
diff --git a/tools/migrate_effect_rodata.py b/tools/migrate_effect_rodata.py
new file mode 100755
index 0000000000..08480e3cf2
--- /dev/null
+++ b/tools/migrate_effect_rodata.py
@@ -0,0 +1,149 @@
+#!/usr/bin/python3
+
+import os
+from pathlib import Path
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = script_dir + "/../"
+asm_dir = root_dir + "ver/current/asm/"
+asm_effects_dir = asm_dir + "nonmatchings/effects/"
+asm_data_dir = asm_dir + "data/effects/"
+
+data_to_thing = {
+    "337F10": "sparkles",
+    "339F10": "shape_spell",
+    "33BB70": "gather_energy_pink",
+    "33D5D0": "drop_leaves",
+    "33EFE0": "dust",
+    "3407C0": "shattering_stones",
+    "342120": "smoke_ring",
+    "342FD0": "damage_stars",
+    "343F30": "explosion",
+    "345190": "lens_flare",
+    "345B10": "got_item_outline",
+    "34E710": "spiky_white_aura",
+    "34F480": "smoke_impact",
+    "352CB0": "purple_ring",
+    "354F20": "stars_burst",
+    "355D10": "stars_shimmer",
+    "3564E0": "rising_bubble",
+    "357380": "ring_blast",
+    "359320": "shockwave",
+    "35A580": "music_note",
+    "35BFB0": "smoke_burst",
+    "35C530": "sweat",
+    "35E8A0": "windy_leaves",
+    "35F0A0": "falling_leaves",
+    "360A10": "stars_spread",
+    "361640": "steam_burst",
+    "362C30": "stars_orbiting",
+    "365970": "green_impact",
+    "366C80": "radial_shimmer",
+    "36AE80": "ending_decals",
+    "36DE10": "light_rays",
+    "36ED30": "lightning",
+    "374D80": "shimmer_burst",
+    "375500": "energy_shockwave",
+    "376FC0": "shimmer_wave",
+    "37ACF0": "bulb_glow",
+    "37D140": "effect_3D",
+    "38A2F0": "firework",
+    "38BAB0": "confetti",
+    "38D040": "snowfall",
+    "38E8F0": "effect_46",
+    "38F6F0": "gather_magic",
+    "393080": "flashing_box_shockwave",
+    "3960C0": "floating_rock",
+    "397010": "chomp_drop",
+    "3BD770": "snowman_doll",
+    "3C1B60": "fright_jar",
+    "3CB7C0": "stop_watch",
+    "3CD670": "effect_63",
+    "3D11B0": "effect_65",
+    "3D2460": "tubba_heart_attack",
+    "3D3910": "whirlwind",
+    "3D4930": "red_impact",
+    "3D4E70": "floating_cloud_puff",
+    "3D5E60": "energy_in_out",
+    "3D7740": "shiny_flare",
+    "3D80B0": "huff_puff_breath",
+    "3D8F30": "cold_breath",
+    "3DBEA0": "embers",
+    "3DCD00": "hieroglyphs",
+    "3DED90": "misc_particles",
+    "3E11B0": "static_status",
+    "3E1CC0": "moving_cloud",
+    "3E5060": "firework_rocket",
+    "3E5ED0": "peach_star_beam",
+    "3EBC30": "chapter_change",
+    "3F8CA0": "ice_shard",
+    "3FA480": "spirit_card",
+    "3FF180": "lil_oink",
+    "4032A0": "something_rotating",
+    "403BB0": "breaking_junk",
+    "404E40": "partner_buff",
+    "407040": "quizmo_assistant",
+    "40A180": "ice_pillar",
+    "40BB70": "sun",
+    "40D130": "star_spirits_energy",
+    "412FD0": "pink_sparkles",
+    "413F20": "star_outline",
+}
+
+def handle_symbol(effect, symbol):
+    for root, dirs, files in os.walk(asm_effects_dir + effect + "/"):
+        for f_name in files:
+            if f_name.endswith(".s"):
+                f_path = os.path.join(root, f_name)
+
+                with open(f_path) as f:
+                    asm_lines = f.readlines()
+
+                has_rodata_section = False
+                for line in asm_lines:
+                    if ".section .rodata" in line:
+                        has_rodata_section = True
+                        continue
+                    if symbol[1] in line:
+                        if not has_rodata_section:
+                            asm_lines.insert(3, ".section .rodata\n")
+                            asm_lines.insert(4, "\n")
+                            asm_lines.insert(5, ".section .text\n")
+                            asm_lines.insert(6, "\n")
+                        asm_lines.insert(5, f"dlabel {symbol[1]}\n")
+                        asm_lines.insert(6, f"{symbol[2]}\n")
+                        asm_lines.insert(7, "\n")
+
+                        with open(f_path, "w", newline="\n") as f:
+                            f.write("".join(asm_lines))
+
+                        return True
+    return False
+
+
+def handle_file(f_path):
+    with open(f_path) as f:
+        rodata_lines = f.readlines()[4:]
+
+    effect = f_path.split("/")[-1].split(".")[0]
+
+    symbols = []
+    for i in range(0, len(rodata_lines), 3):
+        l1 = rodata_lines[i].strip()
+        l2 = rodata_lines[i + 1].strip()
+        symbols.append((i + 4, l1.split()[1], l2))
+
+    for symbol in reversed(symbols):
+        if symbol[2].startswith(".word") and not symbol[1].startswith("jtbl_"):
+            print("skipping" + str(symbol))
+            continue
+        migrated = handle_symbol(data_to_thing[effect], symbol)
+
+# Walk through asm files and rename stuff
+print("Walking through asm files")
+for root, dirs, files in os.walk(asm_data_dir):
+    for f_name in files:
+        if f_name.endswith(".data.s"):
+            f_path = os.path.join(root, f_name)
+
+            handle_file(f_path)
diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo
index a3d7f424b2..763bc0fe37 100644
--- a/tools/splat/.gitrepo
+++ b/tools/splat/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/ethteck/splat.git
 	branch = master
-	commit = fd9cbc3a16ce6e7a4ba81ca36c1ee35472d9c0c2
-	parent = 70aeffbdc06b9b84e4e848a412afc5c6e9cde4bd
+	commit = b681843a788a48824ca60d5063a8f6494e444ddc
+	parent = de8a76e84bb952636a1caee8408417bcedf4a326
 	method = merge
 	cmdver = 0.4.3
diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md
index e561dce15b..53e084737d 100644
--- a/tools/splat/CHANGELOG.md
+++ b/tools/splat/CHANGELOG.md
@@ -1,5 +1,8 @@
 # splat Release Notes
 
+### 0.9.2
+* Added "palette" argument to ci4/ci8 segments so that segments' palettes can be manually specified
+
 ### 0.9.1
 * Fixed a bug in which local labels and jump table labels could replace raw words in data blobs during data disassembly
 
@@ -22,11 +25,11 @@ We plan to roll this out in phases. Currently, it only handles actual code disas
 
 ### Global options changes
 
-The new `symbol_name_format` option allows specification of how symbols will be named. This can be set as a global option and also changed per-segment. `symbol_norom_name_format` is used when the symbol does not have a rom address (BSS).
+The new `symbol_name_format` option allows specification of how symbols will be named. This can be set as a global option and also changed per-segment. `symbol_name_format_no_rom` is used when the symbol does not have a rom address (BSS).
 
  The following substitutions are allowed:
 
-`$ROM` - the rom address of the symbol, hex-formatted and padded to 6 characters (ABCF10, 000030, 123456) (note: only for `symbol_name_format`, usage in `symbol_norom_name_format` will cause an error)
+`$ROM` - the rom address of the symbol, hex-formatted and padded to 6 characters (ABCF10, 000030, 123456) (note: only for `symbol_name_format`, usage in `symbol_name_format_no_rom` will cause an error)
 
 `$VRAM` - the vram address of the symbol, hex-formatted and padded to 8 characters (00030010, 00020015, ABCDEF10)
 
@@ -34,14 +37,14 @@ The new `symbol_name_format` option allows specification of how symbols will be
 
 The default values for these options are as follows
 
-`symbol_name_format` : `$VRAM_$ROM`
+`symbol_name_format` : `$VRAM`
 
-`symbol_noram_name_format` : `$VRAM_$SEG`
+`symbol_name_format_no_rom` : `$VRAM_$SEG`
 
 The appropriate prefix string will still automatically be applied depending on the type of the symbol: `D_` for data, `jtbl_` for jump tables, and `func_` for functions. This functionality may be customizable in the future.
 
 ----
-The `auto_all_section` option now should be a list of section names (`[".data", ".rodata", ".bss"]` by default) indicating the sections that should be linked from .o files built from source files (.c or asm/hasm .s files), when no subsegment explicitly indicates linking this type of section.
+The `auto_all_sections` option now should be a list of section names (`[".data", ".rodata", ".bss"]` by default) indicating the sections that should be linked from .o files built from source files (.c or asm/hasm .s files), when no subsegment explicitly indicates linking this type of section.
 
 For example, if any subsegment of a code segment is of segment type `data` or `.data`, the `.data` section from all `c`/`asm`/`hasm` subsegments will not be linked unless explicitly indicated with a relevant `.data` subsegment.
 
diff --git a/tools/splat/segtypes/n64/ci8.py b/tools/splat/segtypes/n64/ci8.py
index 1ad5bd04a8..6aa15bdb3a 100644
--- a/tools/splat/segtypes/n64/ci8.py
+++ b/tools/splat/segtypes/n64/ci8.py
@@ -43,7 +43,15 @@ class N64SegCi8(N64SegRgba16):
         )
 
         self.palette: "Optional[Palette]" = None
-        self.palette_name = self.name
+
+        palette_name = self.name
+        if isinstance(yaml, dict):
+            if "palette" in yaml:
+                palette_name = yaml["palette"]
+        elif len(args) > 2:
+            palette_name = args[2]
+
+        self.palette_name = palette_name
 
     def split(self, rom_bytes):
         path = options.get_asset_path() / self.dir / (self.name + ".png")
diff --git a/tools/splat/segtypes/n64/ia16.py b/tools/splat/segtypes/n64/ia16.py
index 8fd1e4c833..f4cbaf6fe6 100644
--- a/tools/splat/segtypes/n64/ia16.py
+++ b/tools/splat/segtypes/n64/ia16.py
@@ -3,16 +3,17 @@ from util import iter
 
 
 class N64SegIa16(N64SegIa4):
-    @staticmethod
-    def parse_image(data, width, height, flip_h=False, flip_v=False):
-        img = bytearray()
+    def split(self, rom_bytes):
+        path = self.out_path()
+        path.parent.mkdir(parents=True, exist_ok=True)
 
-        for x, y, i in iter.iter_image_indexes(width, height, 2, 1, flip_h, flip_v):
-            i1 = data[i]
-            a1 = data[i + 1]
-            img += bytes((i1, a1))
+        data = rom_bytes[self.rom_start : self.rom_end]
 
-        return img
+        w = self.__class__.get_writer(self.width, self.height)
+        with open(path, "wb") as f:
+            w.write_array(f, data)
+
+        self.log(f"Wrote {self.name} to {path}")
 
     def max_length(self):
         return self.width * self.height * 2
diff --git a/tools/splat/split.py b/tools/splat/split.py
index 7a6178da23..fbe8eb852b 100755
--- a/tools/splat/split.py
+++ b/tools/splat/split.py
@@ -20,7 +20,7 @@ from util.symbols import Symbol
 
 from intervaltree import Interval, IntervalTree
 
-VERSION = "0.9.0"
+VERSION = "0.9.2"
 
 parser = argparse.ArgumentParser(
     description="Split a rom given a rom, a config, and output directory"
diff --git a/tools/splat/util/palettes.py b/tools/splat/util/palettes.py
index 6e8ca910e2..7ab5e81cdb 100644
--- a/tools/splat/util/palettes.py
+++ b/tools/splat/util/palettes.py
@@ -1,21 +1,19 @@
-from typing import Dict
+from typing import Dict, Union
+from segtypes.n64.ci4 import N64SegCi4, N64SegCi8
 from segtypes.n64.palette import N64SegPalette as Palette
-from segtypes.n64.ci8 import N64SegCi8 as Raster
 from segtypes.common.group import CommonSegGroup
 
 # Resolve Raster#palette and Palette#raster links
 def initialize(all_segments):
-    global palettes_remaining
-
     def process(segments):
-        raster_map: Dict[str, Raster] = {}
+        raster_map: Dict[str, Union[N64SegCi4, N64SegCi8]] = {}
         palette_map: Dict[str, Palette] = {}
 
         for segment in segments:
             if isinstance(segment, Palette):
                 palette_map[segment.name] = segment
 
-            if isinstance(segment, Raster):
+            if isinstance(segment, N64SegCi4) or isinstance(segment, N64SegCi8):
                 raster_map[segment.name] = segment
 
             if isinstance(segment, CommonSegGroup):
diff --git a/ver/us/asm/data/effects/330440.data.s b/ver/us/asm/data/effects/330440.data.s
deleted file mode 100644
index 9595b41fc4..0000000000
--- a/ver/us/asm/data/effects/330440.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E001A610
-.word 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E001A620
-.double 0.001
-
-dlabel D_E001A628
-.double 0.0007
diff --git a/ver/us/asm/data/effects/337F10.data.s b/ver/us/asm/data/effects/337F10.data.s
index af046952bc..0fccc685f9 100644
--- a/ver/us/asm/data/effects/337F10.data.s
+++ b/ver/us/asm/data/effects/337F10.data.s
@@ -13,27 +13,3 @@ dlabel D_E0022D14
 
 dlabel D_E0022D1C
 .ascii "<Zdhjlm\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-dlabel D_E0022D30
-.word 0xE00221DC, 0xE0022318, 0xE0022318, 0xE00223EC, 0xE00223EC, 0x00000000
-
-dlabel D_E0022D48
-.double 0.05
-
-dlabel D_E0022D50
-.double 0.05
-
-dlabel D_E0022D58
-.double 0.01
-
-dlabel D_E0022D60
-.double 0.96
-
-dlabel D_E0022D68
-.double 0.1
-
-dlabel D_E0022D70
-.double -0.02
-
-dlabel D_E0022D78
-.double 0.9
diff --git a/ver/us/asm/data/effects/339F10.data.s b/ver/us/asm/data/effects/339F10.data.s
deleted file mode 100644
index 52664bb1c5..0000000000
--- a/ver/us/asm/data/effects/339F10.data.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0024CC0
-.word 0x00FFD01A, 0x09001128, 0x090011A0, 0x784DD0FE, 0x09001150, 0x090011C8, 0xF0FE4C6E, 0x09001178, 0x090011F0, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E0024CF0
-.double 0.9
-
-dlabel D_E0024CF8
-.double 0.83
-
-dlabel D_E0024D00
-.double 1.2048192771084338, 0.0
diff --git a/ver/us/asm/data/effects/33BB70.data.s b/ver/us/asm/data/effects/33BB70.data.s
index 450cd429ad..e2820087a7 100644
--- a/ver/us/asm/data/effects/33BB70.data.s
+++ b/ver/us/asm/data/effects/33BB70.data.s
@@ -10,21 +10,3 @@ dlabel D_E00269F8
 
 dlabel D_E0026A00
 .word 0xFFC59CFF, 0x9CFFFF73, 0xD6FF9CFF, 0xFFC57BFF, 0xB4FFDE73, 0xFFFF949C, 0x00000000, 0x00000000
-
-dlabel D_E0026A20
-.double 0.2
-
-dlabel D_E0026A28
-.double 0.7
-
-dlabel D_E0026A30
-.double 0.1
-
-dlabel D_E0026A38
-.double 0.4
-
-dlabel D_E0026A40
-.double 0.1
-
-dlabel D_E0026A48
-.double 0.3
diff --git a/ver/us/asm/data/effects/33D5D0.data.s b/ver/us/asm/data/effects/33D5D0.data.s
deleted file mode 100644
index d7ac393216..0000000000
--- a/ver/us/asm/data/effects/33D5D0.data.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00287E0
-.double 0.3
-
-dlabel D_E00287E8
-.double 0.8
-
-dlabel D_E00287F0
-.double 0.2
-
-dlabel D_E00287F8
-.double 0.94
-
-dlabel D_E0028800
-.double 0.05
-
-dlabel D_E0028808
-.double 0.95
-
-dlabel D_E0028810
-.double 0.92, 0.0
diff --git a/ver/us/asm/data/effects/33EFE0.data.s b/ver/us/asm/data/effects/33EFE0.data.s
deleted file mode 100644
index 1abc68c43e..0000000000
--- a/ver/us/asm/data/effects/33EFE0.data.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E002A720
-.double 0.1
-
-dlabel D_E002A728
-.double 0.2
-
-dlabel D_E002A730
-.double 0.9
-
-dlabel D_E002A738
-.double 0.005
diff --git a/ver/us/asm/data/effects/3407C0.data.s b/ver/us/asm/data/effects/3407C0.data.s
index fbac32c772..d5ce0ce738 100644
--- a/ver/us/asm/data/effects/3407C0.data.s
+++ b/ver/us/asm/data/effects/3407C0.data.s
@@ -13,18 +13,3 @@ dlabel D_E002C964
 
 dlabel D_E002C984
 .word 0xC0A00000, 0xC0800000, 0xC0400000, 0xC0000000, 0x40000000, 0xC0400000, 0x40A00000, 0xC0800000, 0xC0800000, 0x40000000, 0xBF800000, 0x40800000, 0x40400000, 0x40000000, 0x40A00000, 0x40800000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E002C9D0
-.double 0.1
-
-dlabel D_E002C9D8
-.double -0.1
-
-dlabel D_E002C9E0
-.double 0.8
-
-dlabel D_E002C9E8
-.double -0.2
-
-dlabel D_E002C9F0
-.double 0.9, 0.0
diff --git a/ver/us/asm/data/effects/342FD0.data.s b/ver/us/asm/data/effects/342FD0.data.s
index d96366cb8a..ed601d085e 100644
--- a/ver/us/asm/data/effects/342FD0.data.s
+++ b/ver/us/asm/data/effects/342FD0.data.s
@@ -7,18 +7,3 @@ dlabel D_E0030E90
 
 dlabel D_E0030EB4
 .word 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E0030EC0
-.word 0xE00305D0, 0xE00305DC, 0xE00305F4, 0xE0030660, 0xE0030660, 0x00000000
-
-dlabel D_E0030ED8
-.double 0.94
-
-dlabel D_E0030EE0
-.double 0.8
-
-dlabel D_E0030EE8
-.double 0.6
-
-dlabel D_E0030EF0
-.double 0.7, 0.0
diff --git a/ver/us/asm/data/effects/343F30.data.s b/ver/us/asm/data/effects/343F30.data.s
index 104ad9b989..b0139a3a21 100644
--- a/ver/us/asm/data/effects/343F30.data.s
+++ b/ver/us/asm/data/effects/343F30.data.s
@@ -4,21 +4,3 @@
 
 dlabel D_E00328B0
 .word 0x09000978, 0x090009D8, 0x09000A38, 0x00000000
-
-dlabel D_E00328C0
-.double 0.4
-
-dlabel D_E00328C8
-.double 0.6
-
-dlabel D_E00328D0
-.double 0.9
-
-dlabel D_E00328D8
-.double 0.6
-
-dlabel D_E00328E0
-.double 0.1
-
-dlabel D_E00328E8
-.double 0.9
diff --git a/ver/us/asm/data/effects/345190.data.s b/ver/us/asm/data/effects/345190.data.s
index 1600602225..454731ed72 100644
--- a/ver/us/asm/data/effects/345190.data.s
+++ b/ver/us/asm/data/effects/345190.data.s
@@ -16,15 +16,3 @@ dlabel D_E0034791
 
 dlabel D_E0034792
 .byte 0x52, 0xFF, 0xFF, 0x52, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0xFF, 0xFF, 0xD6, 0xFF, 0xFF, 0xD6, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E00347B0
-.double 0.78
-
-dlabel D_E00347B8
-.double 0.93
-
-dlabel D_E00347C0
-.double 0.29
-
-dlabel D_E00347C8
-.double 0.9
diff --git a/ver/us/asm/data/effects/345B10.data.s b/ver/us/asm/data/effects/345B10.data.s
index ef8c6dd2b6..1bdb37f6de 100644
--- a/ver/us/asm/data/effects/345B10.data.s
+++ b/ver/us/asm/data/effects/345B10.data.s
@@ -10,6 +10,3 @@ dlabel D_E0036640
 
 dlabel D_E0036648
 .byte 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x00, 0x00
-
-dlabel D_E0036650
-.double 0.6, 0.0
diff --git a/ver/us/asm/data/effects/34E710.data.s b/ver/us/asm/data/effects/34E710.data.s
index cea0444683..5ddd6bba9e 100644
--- a/ver/us/asm/data/effects/34E710.data.s
+++ b/ver/us/asm/data/effects/34E710.data.s
@@ -4,18 +4,3 @@
 
 dlabel D_E00389F0
 .word 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E0038A20
-.double 0.6
-
-dlabel D_E0038A28
-.double 0.8
-
-dlabel D_E0038A30
-.double 0.7
-
-dlabel D_E0038A38
-.double 0.4
-
-dlabel D_E0038A40
-.double 0.6, 0.0
diff --git a/ver/us/asm/data/effects/34F480.data.s b/ver/us/asm/data/effects/34F480.data.s
index 75a62a89bf..3e9eaa4149 100644
--- a/ver/us/asm/data/effects/34F480.data.s
+++ b/ver/us/asm/data/effects/34F480.data.s
@@ -8,11 +8,5 @@ dlabel D_E003A800
 dlabel D_E003A80C
 .word 0x09002A38, 0x09002A38, 0x09002A38, 0x00000000, 0x00000000
 
-dlabel D_E003A820
-.double 0.1
 
-dlabel D_E003A828
-.double 0.04
 
-dlabel D_E003A830
-.double 0.9, 0.0
diff --git a/ver/us/asm/data/effects/352CB0.data.s b/ver/us/asm/data/effects/352CB0.data.s
deleted file mode 100644
index 99f8bfb1ad..0000000000
--- a/ver/us/asm/data/effects/352CB0.data.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E003E870
-.double 0.1
-
-dlabel D_E003E878
-.double 0.3
-
-dlabel D_E003E880
-.double 0.8
-
-dlabel D_E003E888
-.double 0.6
-
-dlabel D_E003E890
-.double 0.7
-
-dlabel D_E003E898
-.double 1.05
diff --git a/ver/us/asm/data/effects/354F20.data.s b/ver/us/asm/data/effects/354F20.data.s
index 04fb60a9f5..993ab574b8 100644
--- a/ver/us/asm/data/effects/354F20.data.s
+++ b/ver/us/asm/data/effects/354F20.data.s
@@ -4,9 +4,3 @@
 
 dlabel D_E0042780
 .word 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E00427B0
-.double 0.8
-
-dlabel D_E00427B8
-.double 0.9
diff --git a/ver/us/asm/data/effects/355D10.data.s b/ver/us/asm/data/effects/355D10.data.s
index 7d37e02e7f..d676d64aec 100644
--- a/ver/us/asm/data/effects/355D10.data.s
+++ b/ver/us/asm/data/effects/355D10.data.s
@@ -13,39 +13,3 @@ dlabel D_E0044DF4
 
 dlabel D_E0044E04
 .ascii "<Zdhjlnpqqnkg\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-
-dlabel D_E0044E20
-.double 0.1
-
-dlabel D_E0044E28
-.double 0.005
-
-dlabel D_E0044E30
-.double 0.4
-
-dlabel D_E0044E38
-.double 0.4
-
-dlabel D_E0044E40
-.word 0xE0044284, 0xE0044284, 0xE0044344, 0xE00442A8, 0xE0044344, 0xE0044344
-
-dlabel D_E0044E58
-.double 0.01
-
-dlabel D_E0044E60
-.double 0.01
-
-dlabel D_E0044E68
-.double 0.96
-
-dlabel D_E0044E70
-.double 0.1
-
-dlabel D_E0044E78
-.word 0xE0044514, 0xE0044514, 0xE0044704, 0xE00446B0, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE004462C, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE004462C, 0x00000000
-
-dlabel D_E0044EF8
-.double -0.02
-
-dlabel jtbl_E0044F00
-.word LE0044A74_3559D4, LE0044A74_3559D4, LE0044A74_3559D4, LE0044A98_3559F8, LE0044B14_355A74, LE0044AF4_355A54, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044A74_3559D4, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044A98_3559F8, 0
diff --git a/ver/us/asm/data/effects/3564E0.data.s b/ver/us/asm/data/effects/3564E0.data.s
index 11b419c637..500a0e6972 100644
--- a/ver/us/asm/data/effects/3564E0.data.s
+++ b/ver/us/asm/data/effects/3564E0.data.s
@@ -13,18 +13,3 @@ dlabel D_E0046614
 
 dlabel D_E0046618
 .word 0x09000308, 0x00000000
-
-dlabel D_E0046620
-.double 0.1
-
-dlabel D_E0046628
-.double 0.7
-
-dlabel D_E0046630
-.double 0.4
-
-dlabel D_E0046638
-.double 0.3
-
-dlabel D_E0046640
-.double 0.1, 0.0
diff --git a/ver/us/asm/data/effects/357380.data.s b/ver/us/asm/data/effects/357380.data.s
index cfa71a97e1..762943090a 100644
--- a/ver/us/asm/data/effects/357380.data.s
+++ b/ver/us/asm/data/effects/357380.data.s
@@ -7,6 +7,3 @@ dlabel D_E0048A00
 
 dlabel D_E0048A08
 .word 0x09001040, 0x09001040
-
-dlabel D_E0048A10
-.double 0.1, 0.0
diff --git a/ver/us/asm/data/effects/359320.data.s b/ver/us/asm/data/effects/359320.data.s
index f76b63b3b4..c507b170a7 100644
--- a/ver/us/asm/data/effects/359320.data.s
+++ b/ver/us/asm/data/effects/359320.data.s
@@ -4,33 +4,3 @@
 
 dlabel D_E004AE60
 .word 0x090009A0, 0x090009A0, 0x09000A80, 0x09000A80, 0x09000A80, 0x09000A80, 0x00000000, 0x00000000
-
-dlabel jtbl_E004AE80
-.word LE004A1AC_35866C, LE004A1AC_35866C, LE004A1D4_358694, LE004A200_3586C0, LE004A25C_35871C, LE004A22C_3586EC
-
-dlabel D_E004AE98
-.double 0.8
-
-dlabel D_E004AEA0
-.double 0.94
-
-dlabel D_E004AEA8
-.double 1.002
-
-dlabel D_E004AEB0
-.word 0xE004A4F8, 0xE004A4F8, 0xE004A51C, 0xE004A548, 0xE004A584, 0xE004A51C
-
-dlabel D_E004AEC8
-.double 0.8
-
-dlabel D_E004AED0
-.double 0.9
-
-dlabel D_E004AED8
-.double 0.99
-
-dlabel D_E004AEE0
-.double 0.95
-
-dlabel D_E004AEE8
-.double 0.3
diff --git a/ver/us/asm/data/effects/35A580.data.s b/ver/us/asm/data/effects/35A580.data.s
deleted file mode 100644
index 5684682ed7..0000000000
--- a/ver/us/asm/data/effects/35A580.data.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E004C660
-.word 0x09001038, 0x090010C0, 0x09001148, 0x090011D0, 0x09001258, 0x090012E0, 0x09001368
-
-dlabel D_E004C67C
-.byte 0xFE
-
-dlabel D_E004C67D
-.byte 0xAC
-
-dlabel D_E004C67E
-.byte 0xAC, 0xFE, 0xAC, 0xD5, 0xFE, 0xB4, 0x9A, 0xD5, 0xB4, 0xFE, 0xB4, 0xB4, 0xFE, 0xB4, 0xDD, 0xFE, 0xB4, 0xFE, 0xFE, 0xB4, 0xFE, 0xD5, 0xB4, 0xFE, 0xB4, 0xD5, 0xFE, 0xB4, 0xFE, 0xFE, 0xB4, 0xFE, 0xD5, 0xAC
-
-dlabel D_E004C6A0
-.double 0.1
-
-dlabel D_E004C6A8
-.double 0.1
-
-dlabel D_E004C6B0
-.double 0.3
-
-dlabel D_E004C6B8
-.double 0.04
diff --git a/ver/us/asm/data/effects/35C530.data.s b/ver/us/asm/data/effects/35C530.data.s
deleted file mode 100644
index 3370d02afe..0000000000
--- a/ver/us/asm/data/effects/35C530.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0050560
-.double 0.94
-
-dlabel D_E0050568
-.double 0.05
-
-dlabel D_E0050570
-.double -0.1, 0.0
diff --git a/ver/us/asm/data/effects/35D460.data.s b/ver/us/asm/data/effects/35D460.data.s
deleted file mode 100644
index 2cee357a5d..0000000000
--- a/ver/us/asm/data/effects/35D460.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00529E0
-.word 0x408CCCCD, 0x404CCCCD, 0x40ACCCCD, 0x402CCCCD, 0x40C00000, 0x409CCCCD, 0x40A66666, 0x40466666, 0x4019999A, 0x40900000, 0x40266666, 0x40B66666, 0x40733333, 0x4039999A, 0x40466666, 0x40A66666, 0x40133333, 0x40ACCCCD, 0x40600000, 0x40266666, 0x4019999A, 0x40466666, 0x40A66666, 0x409CCCCD, 0x40C00000, 0x402CCCCD, 0x40ACCCCD, 0x404CCCCD, 0x408CCCCD, 0x40266666, 0x40600000, 0x40ACCCCD, 0x40133333, 0x40A66666, 0x40466666, 0x4039999A, 0x40733333, 0x40B66666, 0x40266666, 0x40900000
-
-dlabel D_E0052A80
-.double 0.1
-
-dlabel D_E0052A88
-.double 1.2
diff --git a/ver/us/asm/data/effects/35E8A0.data.s b/ver/us/asm/data/effects/35E8A0.data.s
deleted file mode 100644
index 72a3b5770e..0000000000
--- a/ver/us/asm/data/effects/35E8A0.data.s
+++ /dev/null
@@ -1,51 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0056EA0
-.double 0.1
-
-dlabel D_E0056EA8
-.double 0.008
-
-dlabel D_E0056EB0
-.double 0.05
-
-dlabel D_E0056EB8
-.double 0.3
-
-dlabel D_E0056EC0
-.double 0.8
-
-dlabel D_E0056EC8
-.double 0.4
-
-dlabel D_E0056ED0
-.double 0.98
-
-dlabel D_E0056ED8
-.double 0.2
-
-dlabel D_E0056EE0
-.double 0.94
-
-dlabel D_E0056EE8
-.double 0.05
-
-dlabel D_E0056EF0
-.double 0.95
-
-dlabel D_E0056EF8
-.double 0.92
-
-dlabel D_E0056F00
-.double 0.8
-
-dlabel D_E0056F08
-.double 0.9603999999999999
-
-dlabel D_E0056F10
-.double 0.2
-
-dlabel D_E0056F18
-.double 0.8464
diff --git a/ver/us/asm/data/effects/35F0A0.data.s b/ver/us/asm/data/effects/35F0A0.data.s
deleted file mode 100644
index 548180f226..0000000000
--- a/ver/us/asm/data/effects/35F0A0.data.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0058780
-.double 0.3
-
-dlabel D_E0058788
-.double 0.8
-
-dlabel D_E0058790
-.double 0.2
-
-dlabel D_E0058798
-.double 0.94
-
-dlabel D_E00587A0
-.double 0.05
-
-dlabel D_E00587A8
-.double 0.95
-
-dlabel D_E00587B0
-.double 0.92, 0.0
diff --git a/ver/us/asm/data/effects/360A10.data.s b/ver/us/asm/data/effects/360A10.data.s
deleted file mode 100644
index a8261fe1d6..0000000000
--- a/ver/us/asm/data/effects/360A10.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E005A750
-.double 0.8
-
-dlabel D_E005A758
-.double 0.7
-
-dlabel D_E005A760
-.double 0.2, 0.0
diff --git a/ver/us/asm/data/effects/361640.data.s b/ver/us/asm/data/effects/361640.data.s
index 4f52cc73e1..77c35dba92 100644
--- a/ver/us/asm/data/effects/361640.data.s
+++ b/ver/us/asm/data/effects/361640.data.s
@@ -7,12 +7,3 @@ dlabel D_E005C700
 
 dlabel D_E005C704
 .word 0x09000E00, 0x00000000, 0x00000000
-
-dlabel D_E005C710
-.double 0.1
-
-dlabel D_E005C718
-.double 0.04
-
-dlabel D_E005C720
-.double 0.9, 0.0
diff --git a/ver/us/asm/data/effects/362C30.data.s b/ver/us/asm/data/effects/362C30.data.s
index 333b252b06..0202344aed 100644
--- a/ver/us/asm/data/effects/362C30.data.s
+++ b/ver/us/asm/data/effects/362C30.data.s
@@ -7,6 +7,3 @@ dlabel D_E005E670
 
 dlabel D_E005E674
 .word 0x09000440, 0x00000000, 0x00000000
-
-dlabel D_E005E680
-.double 0.1, 0.0
diff --git a/ver/us/asm/data/effects/365970.data.s b/ver/us/asm/data/effects/365970.data.s
index 6c48341f8a..31310dbc42 100644
--- a/ver/us/asm/data/effects/365970.data.s
+++ b/ver/us/asm/data/effects/365970.data.s
@@ -4,18 +4,3 @@
 
 dlabel D_E0064A60
 .word 0x090005A0, 0x090005A0, 0x00000000, 0x00000000
-
-dlabel D_E0064A70
-.double 0.8
-
-dlabel D_E0064A78
-.double 0.2
-
-dlabel D_E0064A80
-.double 0.9
-
-dlabel D_E0064A88
-.double 0.1
-
-dlabel D_E0064A90
-.double 0.3, 0.0
diff --git a/ver/us/asm/data/effects/366C80.data.s b/ver/us/asm/data/effects/366C80.data.s
index b48ffe0f61..90cb6b4928 100644
--- a/ver/us/asm/data/effects/366C80.data.s
+++ b/ver/us/asm/data/effects/366C80.data.s
@@ -7,9 +7,3 @@ dlabel D_E0066C50
 
 dlabel D_E0066C8C
 .word 0x09003508, 0x090035E8, 0x09003428, 0x090039A8, 0x09003A88, 0x09003428, 0x090039A8, 0x09003A88, 0x090038B8, 0x09003508, 0x090038B8, 0x090038B8, 0x09003428, 0x09003A88, 0x090036C8, 0xFFC59CFF, 0x9CFFFF73, 0xD6FF9CFF, 0xFFC57BFF, 0xB4FFDE73, 0xFFFF949C
-
-dlabel jtbl_E0066CE0
-.word LE006615C_36618C, LE006615C_36618C, LE0066198_3661C8, LE00661C0_3661F0, LE006620C_36623C, LE0066240_366270, LE006626C_36629C, LE00662A0_3662D0, LE00662DC_36630C, LE0066318_366348, LE0066348_366378, LE00663AC_3663DC, LE00663F8_366428, LE00663F8_366428, LE006642C_36645C, 0
-
-dlabel D_E0066D20
-.double 0.7, 0.0
diff --git a/ver/us/asm/data/effects/36AE80.data.s b/ver/us/asm/data/effects/36AE80.data.s
index 216a4d1b57..46fc3573e4 100644
--- a/ver/us/asm/data/effects/36AE80.data.s
+++ b/ver/us/asm/data/effects/36AE80.data.s
@@ -11,5 +11,3 @@ dlabel D_E00685BC
 dlabel D_E00685F4
 .word 0x09001F78, 0x09001F78, 0x09002078
 
-dlabel D_E0068600
-.double 0.97, 0.0
diff --git a/ver/us/asm/data/effects/36DE10.data.s b/ver/us/asm/data/effects/36DE10.data.s
index fcd7e29617..fc5223fee1 100644
--- a/ver/us/asm/data/effects/36DE10.data.s
+++ b/ver/us/asm/data/effects/36DE10.data.s
@@ -11,11 +11,5 @@ dlabel D_E006AE00
 dlabel D_E006AE10
 .word 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000001, 0x00000012, 0xFFFFFFF6, 0xFFFFFFC4, 0x0000002D, 0xFFFFFFFF, 0x00000004, 0xFFFFFFEC, 0xFFFFFFEC, 0x0000005A, 0x00000001, 0x00000001, 0xFFFFFFF6, 0xFFFFFFC4, 0x00000087, 0x00000001, 0xFFFFFFFC, 0x00000000, 0xFFFFFFEC, 0x000000B4, 0xFFFFFFF8, 0x00000001, 0xFFFFFFF6, 0xFFFFFFC4, 0x000000E1, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFEC, 0xFFFFFFEC, 0x0000010E, 0x00000001, 0xFFFFFFF7, 0xFFFFFFF6, 0xFFFFFFC4, 0x0000013B, 0x00000004, 0x00000004, 0x00000000, 0x0000000A, 0x00000016, 0x00000004, 0x00000001, 0xFFFFFFF6, 0x00000014, 0x00000043, 0x00000001, 0xFFFFFFFF, 0xFFFFFFEC, 0x0000000A, 0x00000070, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF6, 0x00000014, 0x0000009D, 0xFFFFFFF8, 0x00000001, 0x00000000, 0x0000000A, 0x000000CA, 0x00000001, 0xFFFFFFFC, 0xFFFFFFF6, 0x00000014, 0x000000F7, 0x00000001, 0xFFFFFFEE, 0xFFFFFFEC, 0x0000000A, 0x00000124, 0xFFFFFFFF, 0x00000009, 0xFFFFFFF6, 0x00000014, 0x00000151, 0x00000001, 0x00000001
 
-dlabel D_E006AF50
-.double 0.1
 
-dlabel D_E006AF58
-.double 0.3
 
-dlabel D_E006AF60
-.double 0.9, 0.0
diff --git a/ver/us/asm/data/effects/374D80.data.s b/ver/us/asm/data/effects/374D80.data.s
index 74542a7ccd..f36f8f831c 100644
--- a/ver/us/asm/data/effects/374D80.data.s
+++ b/ver/us/asm/data/effects/374D80.data.s
@@ -7,24 +7,3 @@ dlabel D_E0070CD0
 
 dlabel D_E0070CF0
 .word 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0xC8FAFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFAC8, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E0070D60
-.double 0.02
-
-dlabel D_E0070D68
-.double 0.04
-
-dlabel D_E0070D70
-.double 0.4
-
-dlabel D_E0070D78
-.double 0.1
-
-dlabel D_E0070D80
-.double 0.3
-
-dlabel D_E0070D88
-.double 0.2
-
-dlabel D_E0070D90
-.double 0.6, 0.0
diff --git a/ver/us/asm/data/effects/375500.data.s b/ver/us/asm/data/effects/375500.data.s
deleted file mode 100644
index 5b413db1cb..0000000000
--- a/ver/us/asm/data/effects/375500.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00726B0
-.double 0.1, 0.0
diff --git a/ver/us/asm/data/effects/376FC0.data.s b/ver/us/asm/data/effects/376FC0.data.s
index 7d00561841..c7e389e7ae 100644
--- a/ver/us/asm/data/effects/376FC0.data.s
+++ b/ver/us/asm/data/effects/376FC0.data.s
@@ -7,15 +7,3 @@ dlabel D_E0074B60
 
 dlabel D_E0074B80
 .word 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0x3E4CCCCD, 0x3ECCCCCD, 0x3F4CCCCD, 0x3FA66666, 0x3FC00000, 0x3FA66666, 0x3F666666, 0x3F19999A, 0x3ECCCCCD, 0x3E99999A, 0xC8FAFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFAC8, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E0074BF0
-.double 0.04
-
-dlabel D_E0074BF8
-.double 0.4
-
-dlabel D_E0074C00
-.double 0.2
-
-dlabel D_E0074C08
-.double 0.6
diff --git a/ver/us/asm/data/effects/377F00.data.s b/ver/us/asm/data/effects/377F00.data.s
deleted file mode 100644
index 92512db2af..0000000000
--- a/ver/us/asm/data/effects/377F00.data.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0076E90
-.word 0x090023E0, 0x090023E0, 0x09002440, 0x09002440
-
-dlabel D_E0076EA0
-.word 0x090023F8, 0x090023F8, 0x09002458, 0x09002458
-
-dlabel D_E0076EB0
-.word 0x090023B0, 0x090023B0, 0x09002410, 0x09002410
-
-dlabel D_E0076EC0
-.word 0x090023C8, 0x090023C8, 0x09002428, 0x09002428
-
-dlabel D_E0076ED0
-.word 0x09002000, 0x09002000, 0x090020E8, 0x090021D0
-
-dlabel D_E0076EE0
-.double 0.6
-
-dlabel D_E0076EE8
-.double 0.02
-
-dlabel D_E0076EF0
-.double 0.04
-
-dlabel D_E0076EF8
-.double 0.02
-
-dlabel D_E0076F00
-.double 0.1, 0.0
diff --git a/ver/us/asm/data/effects/37ACF0.data.s b/ver/us/asm/data/effects/37ACF0.data.s
index 23915fcf80..90e87c2af3 100644
--- a/ver/us/asm/data/effects/37ACF0.data.s
+++ b/ver/us/asm/data/effects/37ACF0.data.s
@@ -13,6 +13,3 @@ dlabel D_E00789A8
 
 dlabel D_E00789AC
 .word 0xFFFFFFFF, 0xFF80FF80, 0xFF80FFFF, 0xFF808080, 0xFF808080, 0xFF000000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E00789D0
-.double 0.6, 0.0
diff --git a/ver/us/asm/data/effects/37D140.data.s b/ver/us/asm/data/effects/37D140.data.s
deleted file mode 100644
index b248b8bc28..0000000000
--- a/ver/us/asm/data/effects/37D140.data.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E007AC00
-.double 0.05
-
-dlabel D_E007AC08
-.double 0.1
-
-dlabel D_E007AC10
-.double 0.03
-
-dlabel D_E007AC18
-.double 0.225
-
-dlabel D_E007AC20
-.double 0.2
-
-dlabel D_E007AC28
-.double 0.45
-
-dlabel D_E007AC30
-.double 0.8, 0.0
diff --git a/ver/us/asm/data/effects/37D9A0.data.s b/ver/us/asm/data/effects/37D9A0.data.s
deleted file mode 100644
index 81c1c4095a..0000000000
--- a/ver/us/asm/data/effects/37D9A0.data.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E007C510
-.word 0x09001378, 0x090013F0, 0x09001468, 0x090014E0, 0x09001558, 0x090015D0, 0x09001648, 0x090016C0, 0x09001738, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/effects/380350.data.s b/ver/us/asm/data/effects/380350.data.s
deleted file mode 100644
index b7443d577c..0000000000
--- a/ver/us/asm/data/effects/380350.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E007EC30
-.word 0x323C4650, 0x5A646964, 0x00000000, 0x00000000
-
-dlabel D_E007EC40
-.double 0.05
-
-dlabel jtbl_E007EC48
-.word LE007E270_37F990, LE007E2C0_37F9E0, LE007E314_37FA34, LE007E334_37FA54, LE007E354_37FA74, LE007E3A0_37FAC0, LE007E3C8_37FAE8, 0
-
-dlabel D_E007EC68
-.double 0.01
-
-dlabel D_E007EC70
-.double 0.9, 0.0
diff --git a/ver/us/asm/data/effects/381D80.data.s b/ver/us/asm/data/effects/381D80.data.s
deleted file mode 100644
index c057ea1741..0000000000
--- a/ver/us/asm/data/effects/381D80.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0080AC0
-.word 0x09003540, 0x09003580, 0x090035C0, 0x09003600, 0x09003640, 0x09003680, 0x090036C0, 0x09003700, 0x09003740, 0x09003780, 0x090037C0, 0x09003800
-
-dlabel D_E0080AF0
-.word 0x3E800000, 0x3F000000, 0x3F400000, 0x3F800000, 0x3F666666, 0x3F8CCCCD, 0x3F800000
-
-dlabel D_E0080B0C
-.float 0.25, 0.5, 0.75, 1.0, 1.2, 0.9, 1.0, 0.0, 0.0
-
-dlabel D_E0080B30
-.double 0.05
-
-dlabel D_E0080B38
-.double 0.9
diff --git a/ver/us/asm/data/effects/3897E0.data.s b/ver/us/asm/data/effects/3897E0.data.s
deleted file mode 100644
index d05c11b88b..0000000000
--- a/ver/us/asm/data/effects/3897E0.data.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E0084E10
-.word 0x090018C0, 0x090018C0, 0x090018C0
-
-dlabel D_E0084E1C
-.word 0x09001D00, 0x09001CC8, 0x09001C80
-
-dlabel D_E0084E28
-.word 0x090017D0, 0x090017D0, 0x090017D0
-
-dlabel D_E0084E34
-.word get_model_center_and_size
-
-dlabel D_E0084E38
-.word get_model_from_list_index
-
-dlabel D_E0084E3C
-.word get_model_list_index_from_tree_index
-
-dlabel D_E0084E40
-.double 0.05
-
-dlabel D_E0084E48
-.double 0.2
-
-dlabel D_E0084E50
-.double 0.1
-
-dlabel D_E0084E58
-.double 0.9
-
-dlabel D_E0084E60
-.double -0.7
-
-dlabel D_E0084E68
-.double 0.95
-
-dlabel D_E0084E70
-.double 0.4
-
-dlabel D_E0084E78
-.double -0.4
diff --git a/ver/us/asm/data/effects/38BAB0.data.s b/ver/us/asm/data/effects/38BAB0.data.s
index a111c36e81..d433331fc6 100644
--- a/ver/us/asm/data/effects/38BAB0.data.s
+++ b/ver/us/asm/data/effects/38BAB0.data.s
@@ -13,33 +13,3 @@ dlabel D_E0088D00
 
 dlabel D_E0088D08
 .word 0x002D003C, 0x00000000
-
-dlabel D_E0088D10
-.double 0.03
-
-dlabel D_E0088D18
-.double 0.01
-
-dlabel D_E0088D20
-.double -1.7
-
-dlabel D_E0088D28
-.double 0.05
-
-dlabel jtbl_E0088D30
-.word LE00881F4_38AFE4, LE00881FC_38AFEC, LE0088204_38AFF4, LE008820C_38AFFC, LE00881F4_38AFE4, LE00881FC_38AFEC, LE0088204_38AFF4, 0
-
-dlabel jtbl_E0088D50
-.word LE0088230_38B020, LE0088240_38B030, LE0088250_38B040, LE0088250_38B040, LE0088230_38B020, LE0088240_38B030, LE0088250_38B040, 0
-
-dlabel D_E0088D70
-.word 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0x00000000
-
-dlabel D_E0088D90
-.double 0.02
-
-dlabel D_E0088D98
-.double -0.02
-
-dlabel D_E0088DA0
-.double 0.98, 0.0
diff --git a/ver/us/asm/data/effects/38D040.data.s b/ver/us/asm/data/effects/38D040.data.s
index 7571d4760f..87842297b7 100644
--- a/ver/us/asm/data/effects/38D040.data.s
+++ b/ver/us/asm/data/effects/38D040.data.s
@@ -4,15 +4,3 @@
 
 dlabel D_E008AA50
 .word 0x09000D50, 0x09000D50, 0x00000000, 0x00000000
-
-dlabel D_E008AA60
-.double 0.05
-
-dlabel D_E008AA68
-.double 0.01
-
-dlabel D_E008AA70
-.double -1.2
-
-dlabel D_E008AA78
-.double 0.3
diff --git a/ver/us/asm/data/effects/38E8F0.data.s b/ver/us/asm/data/effects/38E8F0.data.s
index 6a69608496..933acc7ff6 100644
--- a/ver/us/asm/data/effects/38E8F0.data.s
+++ b/ver/us/asm/data/effects/38E8F0.data.s
@@ -13,27 +13,3 @@ dlabel D_E008CB18
 
 dlabel D_E008CB1C
 .byte 0xFF, 0x40, 0xFF, 0x00
-
-dlabel D_E008CB20
-.double 1.2
-
-dlabel D_E008CB28
-.word 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC
-
-dlabel D_E008CB48
-.word 0xE008C34C, 0xE008C34C, 0xE008C354, 0xE008C354, 0xE008C35C, 0xE008C35C
-
-dlabel D_E008CB60
-.double 0.05
-
-dlabel D_E008CB68
-.double 0.3
-
-dlabel D_E008CB70
-.double 0.8
-
-dlabel D_E008CB78
-.double 0.1
-
-dlabel D_E008CB80
-.double 0.2, 0.0
diff --git a/ver/us/asm/data/effects/38F6F0.data.s b/ver/us/asm/data/effects/38F6F0.data.s
index 693ac7b446..90ba56888c 100644
--- a/ver/us/asm/data/effects/38F6F0.data.s
+++ b/ver/us/asm/data/effects/38F6F0.data.s
@@ -4,6 +4,3 @@
 
 dlabel D_E008E890
 .word 0x090001A8, 0x090001C8, 0x00000000, 0x00000000
-
-dlabel D_E008E8A0
-.double 0.2, 0.0
diff --git a/ver/us/asm/data/effects/393080.data.s b/ver/us/asm/data/effects/393080.data.s
deleted file mode 100644
index 4bc244c74b..0000000000
--- a/ver/us/asm/data/effects/393080.data.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00947B0
-.double 1.1
-
-dlabel D_E00947B8
-.double 0.05
-
-dlabel D_E00947C0
-.double 0.9
-
-dlabel D_E00947C8
-.double 0.8
diff --git a/ver/us/asm/data/effects/3960C0.data.s b/ver/us/asm/data/effects/3960C0.data.s
index a6ada7f564..88c9841e0b 100644
--- a/ver/us/asm/data/effects/3960C0.data.s
+++ b/ver/us/asm/data/effects/3960C0.data.s
@@ -4,6 +4,3 @@
 
 dlabel D_E0098510
 .word 0x090003A0, 0x090003E0, 0x09000410, 0x090003A0, 0x090003E0, 0x09000410, 0x00000000, 0x00000000
-
-dlabel D_E0098530
-.double 0.8, 0.0
diff --git a/ver/us/asm/data/effects/397010.data.s b/ver/us/asm/data/effects/397010.data.s
deleted file mode 100644
index c6e24b59cd..0000000000
--- a/ver/us/asm/data/effects/397010.data.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel jtbl_E009AA60
-.word LE009A1AC_39675C, LE009A24C_3967FC, LE009A270_396820, LE009A28C_39683C, LE009A32C_3968DC, LE009A348_3968F8
-
-dlabel D_E009AA78
-.double 0.02
-
-dlabel D_E009AA80
-.double 0.05, 0.0
diff --git a/ver/us/asm/data/effects/3BCA50.data.s b/ver/us/asm/data/effects/3BCA50.data.s
deleted file mode 100644
index d0b6544709..0000000000
--- a/ver/us/asm/data/effects/3BCA50.data.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00BEAF0
-.word 0x09000268, 0x09000288, 0x09000268, 0x090002A8
-
-dlabel D_E00BEB00
-.double 0.98
-
-dlabel D_E00BEB08
-.double -0.8
-
-dlabel D_E00BEB10
-.double -0.1
-
-dlabel D_E00BEB18
-.double 1.2
-
-dlabel D_E00BEB20
-.double 0.9, 0.0
diff --git a/ver/us/asm/data/effects/3BD770.data.s b/ver/us/asm/data/effects/3BD770.data.s
index 997c89102d..002590f596 100644
--- a/ver/us/asm/data/effects/3BD770.data.s
+++ b/ver/us/asm/data/effects/3BD770.data.s
@@ -16,18 +16,3 @@ dlabel D_E00C0A40
 
 dlabel D_E00C0A8C
 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x0A, 0x10, 0x16, 0x1C, 0x21, 0x26, 0x28, 0x29, 0x29, 0x28, 0x26, 0x21, 0x1C, 0x16, 0x10, 0x0A, 0x05, 0x01, 0x01, 0x05, 0x0A, 0x10, 0x16, 0x1C, 0x21, 0x26, 0x28, 0x29, 0x29, 0x28, 0x26, 0x21, 0x1C, 0x16, 0x10, 0x0A, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x38, 0x00, 0xC8, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x4C, 0x00, 0xB4, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x60, 0x00, 0xA0, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x74, 0x00, 0x8C, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x88, 0x00, 0x78, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0x9C, 0x00, 0x64, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xB0, 0x00, 0x50, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xC4, 0x00, 0x3C, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xD8, 0x00, 0x28, 0x1E, 0x64, 0x64, 0x00, 0xFF, 0xEC, 0x00, 0x14, 0x1E, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x78, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x82, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x87, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x8A, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x8C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x8A, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x87, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x82, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x78, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x01, 0xF4, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x03, 0xEE, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x05, 0xE6, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xDC, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xD0, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x14, 0xC2, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xB2, 0x64, 0x64, 0x00, 0x00, 0x05, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x08, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x0A, 0x00, 0x1E, 0xA0, 0x64, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E00C0C00
-.double 0.01
-
-dlabel D_E00C0C08
-.double 0.01
-
-dlabel D_E00C0C10
-.double 0.01
-
-dlabel D_E00C0C18
-.double 0.01
-
-dlabel jtbl_E00C0C20
-.word LE00C0500_3BD260, LE00C0508_3BD268, LE00C0518_3BD278, LE00C0548_3BD2A8, LE00C0570_3BD2D0, 0, 0, 0
diff --git a/ver/us/asm/data/effects/3C1B60.data.s b/ver/us/asm/data/effects/3C1B60.data.s
index 3cc8d1eec8..2f73943052 100644
--- a/ver/us/asm/data/effects/3C1B60.data.s
+++ b/ver/us/asm/data/effects/3C1B60.data.s
@@ -5,8 +5,4 @@
 dlabel D_E00C2990
 .word 0xFFFFDCBE, 0xA0785028, 0x00002850, 0x78A0BEDC
 
-dlabel D_E00C29A0
-.double 0.1
 
-dlabel jtbl_E00C29A8
-.word LE00C27F0_3C19C0, LE00C2818_3C19E8, LE00C2830_3C1A00, LE00C2848_3C1A18, LE00C2860_3C1A30, LE00C2878_3C1A48, LE00C2890_3C1A60, LE00C28A8_3C1A78, LE00C28C0_3C1A90, LE00C28D8_3C1AA8
diff --git a/ver/us/asm/data/effects/3CB7C0.data.s b/ver/us/asm/data/effects/3CB7C0.data.s
index dc83c056d6..9fa622d540 100644
--- a/ver/us/asm/data/effects/3CB7C0.data.s
+++ b/ver/us/asm/data/effects/3CB7C0.data.s
@@ -17,8 +17,4 @@ dlabel D_E00C49FC
 dlabel D_E00C4A10
 .word 0xFFFFFFCE, 0xFFFFFFBA, 0x00000005, 0x00000050, 0xFFFFFFA6, 0x00000014, 0x00000014, 0xFFFFFFCE, 0x0000002D, 0xFFFFFFB0, 0x0000001E, 0x0000000A, 0x0000001E, 0x00000000, 0x00000023, 0x00000078, 0xFFFFFFE2, 0x00000032, 0x0000000A, 0x00000032, 0x0000001E, 0x00000064, 0x0000001E, 0x0000000F, 0x00000028, 0x00000064, 0x00000028, 0x0000008C, 0x0000005A, 0x00000019, 0x00000000, 0x00000000
 
-dlabel D_E00C4A90
-.double 0.05
 
-dlabel D_E00C4A98
-.double 0.01
diff --git a/ver/us/asm/data/effects/3CD670.data.s b/ver/us/asm/data/effects/3CD670.data.s
index d18e478a1e..63e98b1344 100644
--- a/ver/us/asm/data/effects/3CD670.data.s
+++ b/ver/us/asm/data/effects/3CD670.data.s
@@ -7,30 +7,3 @@ dlabel D_E00C6C90
 
 dlabel D_E00C6C9C
 .word 0x09001B70, 0x09001B70, 0x09001B70, 0x00000000, 0x00000000
-
-dlabel D_E00C6CB0
-.double 0.97
-
-dlabel D_E00C6CB8
-.double 0.02
-
-dlabel D_E00C6CC0
-.double 0.05
-
-dlabel D_E00C6CC8
-.double 0.1
-
-dlabel D_E00C6CD0
-.double 0.9
-
-dlabel D_E00C6CD8
-.double 0.2
-
-dlabel D_E00C6CE0
-.double -0.6
-
-dlabel D_E00C6CE8
-.double 0.07
-
-dlabel D_E00C6CF0
-.double 0.05, 0.0
diff --git a/ver/us/asm/data/effects/3D11B0.data.s b/ver/us/asm/data/effects/3D11B0.data.s
index 1b0afa0009..8045107aee 100644
--- a/ver/us/asm/data/effects/3D11B0.data.s
+++ b/ver/us/asm/data/effects/3D11B0.data.s
@@ -4,15 +4,3 @@
 
 dlabel D_E00CACB0
 .word 0x09000400, 0x09000400, 0x09000400, 0x09000400
-
-dlabel D_E00CACC0
-.double 0.8
-
-dlabel D_E00CACC8
-.double 255.0
-
-dlabel D_E00CACD0
-.double 0.4
-
-dlabel D_E00CACD8
-.double 255.0
diff --git a/ver/us/asm/data/effects/3D2460.data.s b/ver/us/asm/data/effects/3D2460.data.s
index 771bbd8e38..39035e36a4 100644
--- a/ver/us/asm/data/effects/3D2460.data.s
+++ b/ver/us/asm/data/effects/3D2460.data.s
@@ -19,18 +19,3 @@ dlabel D_E00CCE04
 
 dlabel D_E00CCE4C
 .byte 0xFB, 0xFB, 0xFB, 0xFC, 0xFC, 0xFC, 0xFD, 0xFD, 0xFE, 0xFE, 0xFF, 0xFF, 0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E00CCE70
-.double 0.01
-
-dlabel jtbl_E00CCE78
-.word LE00CC3D8_3D1A68, LE00CC448_3D1AD8, LE00CC53C_3D1BCC, LE00CC5E4_3D1C74, LE00CC614_3D1CA4, LE00CC790_3D1E20, LE00CC870_3D1F00, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC4A4_3D1B34, 0
-
-dlabel D_E00CCED0
-.double 0.99
-
-dlabel D_E00CCED8
-.double -0.1
-
-dlabel D_E00CCEE0
-.double 0.9, 0.0
diff --git a/ver/us/asm/data/effects/3D3910.data.s b/ver/us/asm/data/effects/3D3910.data.s
deleted file mode 100644
index 238839b98c..0000000000
--- a/ver/us/asm/data/effects/3D3910.data.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00CEE50
-.double 0.2
-
-dlabel D_E00CEE58
-.double 0.1
-
-dlabel D_E00CEE60
-.double 12.96
-
-dlabel D_E00CEE68
-.double 17.28
diff --git a/ver/us/asm/data/effects/3D4930.data.s b/ver/us/asm/data/effects/3D4930.data.s
index 076bc95218..27573ea37c 100644
--- a/ver/us/asm/data/effects/3D4930.data.s
+++ b/ver/us/asm/data/effects/3D4930.data.s
@@ -4,18 +4,3 @@
 
 dlabel D_E00D0B10
 .word 0x090009A0, 0x090009A0, 0x00000000, 0x00000000
-
-dlabel D_E00D0B20
-.double 0.8
-
-dlabel D_E00D0B28
-.double 1.002
-
-dlabel D_E00D0B30
-.double 0.6
-
-dlabel D_E00D0B38
-.double 0.9
-
-dlabel D_E00D0B40
-.double 0.3, 0.0
diff --git a/ver/us/asm/data/effects/3D4E70.data.s b/ver/us/asm/data/effects/3D4E70.data.s
index aba8f898a3..980c4769a1 100644
--- a/ver/us/asm/data/effects/3D4E70.data.s
+++ b/ver/us/asm/data/effects/3D4E70.data.s
@@ -7,9 +7,3 @@ dlabel D_E00D2500
 
 dlabel D_E00D2508
 .byte 0x5E, 0x5C, 0x64, 0x69, 0x6B, 0x69, 0x64, 0x00
-
-dlabel D_E00D2510
-.double 0.6
-
-dlabel D_E00D2518
-.double 0.01
diff --git a/ver/us/asm/data/effects/3D5E60.data.s b/ver/us/asm/data/effects/3D5E60.data.s
index 755de31fd1..a22689c014 100644
--- a/ver/us/asm/data/effects/3D5E60.data.s
+++ b/ver/us/asm/data/effects/3D5E60.data.s
@@ -10,27 +10,3 @@ dlabel D_E00D6E74
 
 dlabel D_E00D6E84
 .byte 0x14, 0x05, 0x14, 0x14, 0x0A, 0x14, 0x14, 0x08, 0x08, 0x08, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E00D6EA0
-.double 0.2
-
-dlabel D_E00D6EA8
-.double 0.1
-
-dlabel D_E00D6EB0
-.double 0.3
-
-dlabel jtbl_E00D6EB8
-.word LE00D6204_3D5224, LE00D6204_3D5224, LE00D6204_3D5224, LE00D6264_3D5284, LE00D65A0_3D55C0, LE00D6264_3D5284, LE00D62C0_3D52E0, LE00D6320_3D5340, LE00D6380_3D53A0, LE00D63E4_3D5404, LE00D6494_3D54B4, LE00D652C_3D554C, LE00D65A0_3D55C0, 0
-
-dlabel D_E00D6EF0
-.double 0.6
-
-dlabel D_E00D6EF8
-.double 0.6
-
-dlabel D_E00D6F00
-.double 0.05
-
-dlabel D_E00D6F08
-.double 0.6
diff --git a/ver/us/asm/data/effects/3D6FA0.data.s b/ver/us/asm/data/effects/3D6FA0.data.s
deleted file mode 100644
index a331bc46ac..0000000000
--- a/ver/us/asm/data/effects/3D6FA0.data.s
+++ /dev/null
@@ -1,9 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E00D87E0
-.word 0x00000000, 0x00000000, 0x00000000, 0x09000000, 0x31100810, 0x08100810, 0x08000000, 0x00000000, 0xFC317FFF, 0x5FFEF438, 0xFC3135FF, 0x5FFEFE38, 0x3D4ABCFF, 0x00191CFF
-
-dlabel D_E00D8818
-.word 0xFF38FFFF, 0xFF60FFFF, 0xFF88FFFF, 0xFFABFFFF, 0xFFC9FFFF, 0xFFE2FFFF, 0xFFF0FFFF, 0xFFF8FFFF, 0xFFFCFFFF, 0xFFFEFFFF, 0xFFFFFFFF, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000FFFF, 0x0000E6FA, 0x000078F5, 0x000000F0, 0x000000D2, 0x000000AA, 0x00000078, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/effects/3D7740.data.s b/ver/us/asm/data/effects/3D7740.data.s
index 2581877c08..523dce44df 100644
--- a/ver/us/asm/data/effects/3D7740.data.s
+++ b/ver/us/asm/data/effects/3D7740.data.s
@@ -10,6 +10,3 @@ dlabel D_E00DA501
 
 dlabel D_E00DA502
 .byte 0x52, 0xFF, 0xFF, 0x52, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0xFF, 0xFF, 0xD6, 0xFF, 0xFF, 0xD6, 0xB5, 0x94, 0x00, 0xB5, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E00DA520
-.double 0.3, 0.0
diff --git a/ver/us/asm/data/effects/3D8F30.data.s b/ver/us/asm/data/effects/3D8F30.data.s
index 2f4abb47c0..5354bba726 100644
--- a/ver/us/asm/data/effects/3D8F30.data.s
+++ b/ver/us/asm/data/effects/3D8F30.data.s
@@ -19,6 +19,3 @@ dlabel D_E00DE910
 
 dlabel D_E00DE96C
 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E00DE9D0
-.double 0.02, 0.0
diff --git a/ver/us/asm/data/effects/3DBEA0.data.s b/ver/us/asm/data/effects/3DBEA0.data.s
index 77577964e3..3714f799fd 100644
--- a/ver/us/asm/data/effects/3DBEA0.data.s
+++ b/ver/us/asm/data/effects/3DBEA0.data.s
@@ -10,15 +10,3 @@ dlabel D_E00E0A44
 
 dlabel D_E00E0A48
 .word 0x3C23D70A, 0x3D4CCCCD, 0x3DCCCCCD, 0x3E4CCCCD, 0x3EB33333, 0x3F000000, 0x3F266666, 0x3F4CCCCD, 0x3F733333, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F800000, 0x3F733333, 0x3F4CCCCD, 0x3F266666, 0x3F000000, 0x3EB33333, 0x3E4CCCCD, 0x3DCCCCCD, 0x3D4CCCCD, 0x3C23D70A
-
-dlabel D_E00E0AC0
-.double 0.05
-
-dlabel D_E00E0AC8
-.double 0.04
-
-dlabel D_E00E0AD0
-.double 0.1
-
-dlabel D_E00E0AD8
-.double 0.3
diff --git a/ver/us/asm/data/effects/3DCD00.data.s b/ver/us/asm/data/effects/3DCD00.data.s
index b63acf23d1..29fc80e542 100644
--- a/ver/us/asm/data/effects/3DCD00.data.s
+++ b/ver/us/asm/data/effects/3DCD00.data.s
@@ -13,9 +13,3 @@ dlabel D_E00E2A08
 
 dlabel D_E00E2A1C
 .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00
-
-dlabel D_E00E2A30
-.double 78.75
-
-dlabel D_E00E2A38
-.double 0.01
diff --git a/ver/us/asm/data/effects/3DED90.data.s b/ver/us/asm/data/effects/3DED90.data.s
index 712aa30eb2..0480d3924b 100644
--- a/ver/us/asm/data/effects/3DED90.data.s
+++ b/ver/us/asm/data/effects/3DED90.data.s
@@ -16,27 +16,3 @@ dlabel D_E00E4DE0
 
 dlabel D_E00E4E00
 .byte 0xC8, 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xC8, 0x00, 0x00
-
-dlabel D_E00E4E20
-.double 0.05
-
-dlabel D_E00E4E28
-.double 0.04
-
-dlabel D_E00E4E30
-.double 0.2
-
-dlabel D_E00E4E38
-.double 0.6
-
-dlabel D_E00E4E40
-.double 0.1
-
-dlabel D_E00E4E48
-.double 0.2
-
-dlabel D_E00E4E50
-.double 0.6
-
-dlabel D_E00E4E58
-.double 0.01
diff --git a/ver/us/asm/data/effects/3E11B0.data.s b/ver/us/asm/data/effects/3E11B0.data.s
index 36a91ac4a4..c863e159c4 100644
--- a/ver/us/asm/data/effects/3E11B0.data.s
+++ b/ver/us/asm/data/effects/3E11B0.data.s
@@ -22,6 +22,3 @@ dlabel D_E00E6910
 
 dlabel D_E00E6970
 .byte 0xFA, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E00E6990
-.double 0.2, 0.0
diff --git a/ver/us/asm/data/effects/3E5060.data.s b/ver/us/asm/data/effects/3E5060.data.s
index 7e1bc88218..f26849d4c6 100644
--- a/ver/us/asm/data/effects/3E5060.data.s
+++ b/ver/us/asm/data/effects/3E5060.data.s
@@ -25,15 +25,3 @@ dlabel D_E010AF80
 
 dlabel D_E010AF84
 .word 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E010AF90
-.double 0.11
-
-dlabel D_E010AF98
-.double 0.15
-
-dlabel D_E010AFA0
-.double 0.15
-
-dlabel D_E010AFA8
-.double 0.8
diff --git a/ver/us/asm/data/effects/3E5ED0.data.s b/ver/us/asm/data/effects/3E5ED0.data.s
index 9cb3aee8f7..c91fb347a4 100644
--- a/ver/us/asm/data/effects/3E5ED0.data.s
+++ b/ver/us/asm/data/effects/3E5ED0.data.s
@@ -13,9 +13,3 @@ dlabel D_E010CA18
 
 dlabel D_E010CA38
 .word 0x090050F0, 0x09005168, 0x090051E0, 0x09005258, 0x090052D0, 0x09005348, 0x090053C0, 0x09005438, 0x00000000, 0x00000000
-
-dlabel D_E010CA60
-.double 255.0
-
-dlabel D_E010CA68
-.double 0.4
diff --git a/ver/us/asm/data/effects/3EBC30.data.s b/ver/us/asm/data/effects/3EBC30.data.s
index 5788e181b7..27cda7fc6f 100644
--- a/ver/us/asm/data/effects/3EBC30.data.s
+++ b/ver/us/asm/data/effects/3EBC30.data.s
@@ -19,6 +19,3 @@ dlabel D_E010E838
 
 dlabel D_E010E868
 .word 0x0900BE40, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BE88, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BED0, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BF18, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BF60, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BFA8, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900BFF0, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x0900C038, 0x0080FFDF, 0x00400040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel jtbl_E010E930
-.word LE010E61C_3EBAFC, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E60C_3EBAEC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, 0
diff --git a/ver/us/asm/data/effects/3F8CA0.data.s b/ver/us/asm/data/effects/3F8CA0.data.s
index 24e4524003..3009e31d27 100644
--- a/ver/us/asm/data/effects/3F8CA0.data.s
+++ b/ver/us/asm/data/effects/3F8CA0.data.s
@@ -7,9 +7,3 @@ dlabel D_E01108B0
 
 dlabel D_E01108B4
 .word 0x09001000, 0x00000000, 0x00000000
-
-dlabel D_E01108C0
-.double 0.1
-
-dlabel D_E01108C8
-.double -0.7
diff --git a/ver/us/asm/data/effects/3FF180.data.s b/ver/us/asm/data/effects/3FF180.data.s
index 6a367c55d1..bc00ca64fe 100644
--- a/ver/us/asm/data/effects/3FF180.data.s
+++ b/ver/us/asm/data/effects/3FF180.data.s
@@ -10,6 +10,3 @@ dlabel D_E0114718
 
 dlabel D_E0114740
 .word 0x01020100, 0x00000000, 0x00000000, 0x00000000
-
-dlabel jtbl_E0114750
-.word LE0114150_3FEC30, LE0114148_3FEC28, LE01141B4_3FEC94, LE0114158_3FEC38, LE0114210_3FECF0, LE011426C_3FED4C, 0, 0
diff --git a/ver/us/asm/data/effects/4032A0.data.s b/ver/us/asm/data/effects/4032A0.data.s
index d3b1cf4810..515e53800d 100644
--- a/ver/us/asm/data/effects/4032A0.data.s
+++ b/ver/us/asm/data/effects/4032A0.data.s
@@ -46,15 +46,3 @@ dlabel D_E0116D6C
 
 dlabel D_E0116D83
 .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-dlabel D_E0116D90
-.double 51.43
-
-dlabel jtbl_E0116D98
-.word LE0116370_4029B0, LE0116380_4029C0, LE0116598_402BD8, LE01165A8_402BE8, LE0116634_402C74, 0
-
-dlabel D_E0116DB0
-.double 0.0039215686
-
-dlabel D_E0116DB8
-.double 0.01
diff --git a/ver/us/asm/data/effects/403BB0.data.s b/ver/us/asm/data/effects/403BB0.data.s
deleted file mode 100644
index 33eb20d8af..0000000000
--- a/ver/us/asm/data/effects/403BB0.data.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel D_E01187B0
-.word 0x090005A8, 0x090005C8, 0x090005E8, 0x09000608
-
-dlabel D_E01187C0
-.word 0x09000400, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E01187D0
-.double 0.6
-
-dlabel D_E01187D8
-.double 0.8
-
-dlabel D_E01187E0
-.double -0.7, 0.0
diff --git a/ver/us/asm/data/effects/404E40.data.s b/ver/us/asm/data/effects/404E40.data.s
index a58d539cda..94f191895a 100644
--- a/ver/us/asm/data/effects/404E40.data.s
+++ b/ver/us/asm/data/effects/404E40.data.s
@@ -16,6 +16,3 @@ dlabel D_E011AC58
 
 dlabel D_E011AC64
 .byte 0x00, 0xFF, 0xFD, 0xFC, 0xFC, 0x04, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00
-
-dlabel jtbl_E011AC70
-.word LE011A214_404434, LE011A280_4044A0, LE011A2C4_4044E4, LE011A304_404524, LE011A324_404544, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A28C_4044AC, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A2D0_4044F0, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A334_404554, 0, 0, 0
diff --git a/ver/us/asm/data/effects/40A180.data.s b/ver/us/asm/data/effects/40A180.data.s
index 3b400bd423..f22cfe9d4d 100644
--- a/ver/us/asm/data/effects/40A180.data.s
+++ b/ver/us/asm/data/effects/40A180.data.s
@@ -7,15 +7,3 @@ dlabel D_E011E7F0
 
 dlabel D_E011E800
 .word 0x09001000, 0x00000000, 0x00000000, 0x00000000
-
-dlabel D_E011E810
-.double 0.1
-
-dlabel D_E011E818
-.double 0.7
-
-dlabel D_E011E820
-.double 0.3
-
-dlabel D_E011E828
-.double 0.01
diff --git a/ver/us/asm/data/effects/40BB70.data.s b/ver/us/asm/data/effects/40BB70.data.s
index a9d9f363a8..b2b679328c 100644
--- a/ver/us/asm/data/effects/40BB70.data.s
+++ b/ver/us/asm/data/effects/40BB70.data.s
@@ -7,9 +7,3 @@ dlabel D_E0120780
 
 dlabel D_E0120794
 .word 0x09000898, 0x00000000, 0x00000000
-
-dlabel D_E01207A0
-.double 0.01
-
-dlabel D_E01207A8
-.double 0.05
diff --git a/ver/us/asm/data/effects/40D130.data.s b/ver/us/asm/data/effects/40D130.data.s
index 77a076b8ba..3874c2752f 100644
--- a/ver/us/asm/data/effects/40D130.data.s
+++ b/ver/us/asm/data/effects/40D130.data.s
@@ -16,33 +16,3 @@ dlabel D_E0122BA8
 
 dlabel D_E0122C20
 .word 0x0BB80000, 0x0B540005, 0x0AF0000A, 0x0A8C0014, 0x0A28001E, 0x09C4002D, 0x09600037, 0x08FC0041, 0x0898004B, 0x08340055, 0x07D0005F, 0x076C0069, 0x07080073, 0x06A4007D, 0x06400087, 0x05DC0091, 0x0578009B, 0x051400A5, 0x04B000AF, 0x044C00B9, 0x03E800C3, 0x038400CD, 0x032000D7, 0x02BC00E1, 0x025800EB, 0x01F400F5, 0x019000FF, 0x012C00FF, 0x00C800FF, 0x006400FF, 0x00000000, 0x00000000
-
-dlabel D_E0122CA0
-.double 0.04
-
-dlabel D_E0122CA8
-.double 1.235631
-
-dlabel D_E0122CB0
-.double 0.01
-
-dlabel D_E0122CB8
-.double 0.3
-
-dlabel D_E0122CC0
-.double 0.01
-
-dlabel D_E0122CC8
-.double 0.3
-
-dlabel D_E0122CD0
-.double 0.6
-
-dlabel D_E0122CD8
-.double 0.01
-
-dlabel D_E0122CE0
-.double 1.2
-
-dlabel D_E0122CE8
-.double 0.01
diff --git a/ver/us/asm/data/effects/412FD0.data.s b/ver/us/asm/data/effects/412FD0.data.s
index ddc2b3687f..5044f1d1b8 100644
--- a/ver/us/asm/data/effects/412FD0.data.s
+++ b/ver/us/asm/data/effects/412FD0.data.s
@@ -13,21 +13,3 @@ dlabel D_E0124BC0
 
 dlabel D_E0124BE4
 .ascii "<Zdhjlnpqqnkgdhjlnpqqnkg\0\0\0"
-
-dlabel D_E0124C00
-.double 0.1
-
-dlabel D_E0124C08
-.double 0.04
-
-dlabel D_E0124C10
-.double 0.001
-
-dlabel D_E0124C18
-.double 0.01
-
-dlabel D_E0124C20
-.double 0.4
-
-dlabel D_E0124C28
-.double 0.1
diff --git a/ver/us/asm/data/effects/413F20.data.s b/ver/us/asm/data/effects/413F20.data.s
index a808f325c0..b7872785c2 100644
--- a/ver/us/asm/data/effects/413F20.data.s
+++ b/ver/us/asm/data/effects/413F20.data.s
@@ -10,45 +10,3 @@ dlabel D_E0126BC4
 
 dlabel D_E0126BC8
 .word 0x09000800, 0x00000000
-
-dlabel D_E0126BD0
-.double 7.12343
-
-dlabel D_E0126BD8
-.double 0.4953
-
-dlabel D_E0126BE0
-.double 0.2234
-
-dlabel D_E0126BE8
-.double 1.231
-
-dlabel D_E0126BF0
-.double 0.531
-
-dlabel D_E0126BF8
-.double 3.231
-
-dlabel D_E0126C00
-.double 0.298
-
-dlabel D_E0126C08
-.double 0.831
-
-dlabel D_E0126C10
-.double 2.231
-
-dlabel D_E0126C18
-.double 2.044
-
-dlabel D_E0126C20
-.double 0.3
-
-dlabel D_E0126C28
-.double 0.7
-
-dlabel D_E0126C30
-.double 0.4
-
-dlabel D_E0126C38
-.double 0.4
diff --git a/ver/us/asm/nonmatchings/101b90_len_8f0/spr_get_player_raster.s b/ver/us/asm/nonmatchings/101b90_len_8f0/spr_get_player_raster.s
deleted file mode 100644
index a960fe9a17..0000000000
--- a/ver/us/asm/nonmatchings/101b90_len_8f0/spr_get_player_raster.s
+++ /dev/null
@@ -1,81 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel spr_get_player_raster
-/* 101F90 802DEEA0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 101F94 802DEEA4 0080382D */  daddu     $a3, $a0, $zero
-/* 101F98 802DEEA8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 101F9C 802DEEAC 2410FFFF */  addiu     $s0, $zero, -1
-/* 101FA0 802DEEB0 3C02802E */  lui       $v0, %hi(PlayerRasterCacheSize)
-/* 101FA4 802DEEB4 8C420C58 */  lw        $v0, %lo(PlayerRasterCacheSize)($v0)
-/* 101FA8 802DEEB8 0000202D */  daddu     $a0, $zero, $zero
-/* 101FAC 802DEEBC 18400018 */  blez      $v0, .L802DEF20
-/* 101FB0 802DEEC0 AFBF0014 */   sw       $ra, 0x14($sp)
-/* 101FB4 802DEEC4 24090002 */  addiu     $t1, $zero, 2
-/* 101FB8 802DEEC8 0200402D */  daddu     $t0, $s0, $zero
-/* 101FBC 802DEECC 0040302D */  daddu     $a2, $v0, $zero
-/* 101FC0 802DEED0 3C03802E */  lui       $v1, %hi(PlayerRasterCache)
-/* 101FC4 802DEED4 24630C70 */  addiu     $v1, $v1, %lo(PlayerRasterCache)
-.L802DEED8:
-/* 101FC8 802DEED8 8C620000 */  lw        $v0, ($v1)
-/* 101FCC 802DEEDC 1040000A */  beqz      $v0, .L802DEF08
-/* 101FD0 802DEEE0 00000000 */   nop
-/* 101FD4 802DEEE4 8C620004 */  lw        $v0, 4($v1)
-/* 101FD8 802DEEE8 1447000A */  bne       $v0, $a3, .L802DEF14
-/* 101FDC 802DEEEC 24840001 */   addiu    $a0, $a0, 1
-/* 101FE0 802DEEF0 8C620008 */  lw        $v0, 8($v1)
-/* 101FE4 802DEEF4 14450008 */  bne       $v0, $a1, .L802DEF18
-/* 101FE8 802DEEF8 0086102A */   slt      $v0, $a0, $a2
-/* 101FEC 802DEEFC 8C62000C */  lw        $v0, 0xc($v1)
-/* 101FF0 802DEF00 080B7BE9 */  j         .L802DEFA4
-/* 101FF4 802DEF04 AC690000 */   sw       $t1, ($v1)
-.L802DEF08:
-/* 101FF8 802DEF08 52080001 */  beql      $s0, $t0, .L802DEF10
-/* 101FFC 802DEF0C 0080802D */   daddu    $s0, $a0, $zero
-.L802DEF10:
-/* 102000 802DEF10 24840001 */  addiu     $a0, $a0, 1
-.L802DEF14:
-/* 102004 802DEF14 0086102A */  slt       $v0, $a0, $a2
-.L802DEF18:
-/* 102008 802DEF18 1440FFEF */  bnez      $v0, .L802DEED8
-/* 10200C 802DEF1C 24630010 */   addiu    $v1, $v1, 0x10
-.L802DEF20:
-/* 102010 802DEF20 2402FFFF */  addiu     $v0, $zero, -1
-/* 102014 802DEF24 1202001E */  beq       $s0, $v0, .L802DEFA0
-/* 102018 802DEF28 00108100 */   sll      $s0, $s0, 4
-/* 10201C 802DEF2C 3C02802E */  lui       $v0, %hi(PlayerRasterCache)
-/* 102020 802DEF30 24420C70 */  addiu     $v0, $v0, %lo(PlayerRasterCache)
-/* 102024 802DEF34 02028021 */  addu      $s0, $s0, $v0
-/* 102028 802DEF38 24020002 */  addiu     $v0, $zero, 2
-/* 10202C 802DEF3C AE020000 */  sw        $v0, ($s0)
-/* 102030 802DEF40 00451004 */  sllv      $v0, $a1, $v0
-/* 102034 802DEF44 3C04000F */  lui       $a0, 0xf
-/* 102038 802DEF48 3484FFFF */  ori       $a0, $a0, 0xffff
-/* 10203C 802DEF4C AE070004 */  sw        $a3, 4($s0)
-/* 102040 802DEF50 AE050008 */  sw        $a1, 8($s0)
-/* 102044 802DEF54 3C01802E */  lui       $at, %hi(PlayerRasterBufferSetOffsets)
-/* 102048 802DEF58 00220821 */  addu      $at, $at, $v0
-/* 10204C 802DEF5C 8C220050 */  lw        $v0, %lo(PlayerRasterBufferSetOffsets)($at)
-/* 102050 802DEF60 8E05000C */  lw        $a1, 0xc($s0)
-/* 102054 802DEF64 00471021 */  addu      $v0, $v0, $a3
-/* 102058 802DEF68 00021080 */  sll       $v0, $v0, 2
-/* 10205C 802DEF6C 3C06802E */  lui       $a2, %hi(D_802E0090)
-/* 102060 802DEF70 00C23021 */  addu      $a2, $a2, $v0
-/* 102064 802DEF74 8CC60090 */  lw        $a2, %lo(D_802E0090)($a2)
-/* 102068 802DEF78 3C02802E */  lui       $v0, %hi(SpriteDataHeader)
-/* 10206C 802DEF7C 8C420C60 */  lw        $v0, %lo(SpriteDataHeader)($v0)
-/* 102070 802DEF80 00C42024 */  and       $a0, $a2, $a0
-/* 102074 802DEF84 00063402 */  srl       $a2, $a2, 0x10
-/* 102078 802DEF88 00442021 */  addu      $a0, $v0, $a0
-/* 10207C 802DEF8C 0C017D24 */  jal       nuPiReadRom
-/* 102080 802DEF90 30C6FFF0 */   andi     $a2, $a2, 0xfff0
-/* 102084 802DEF94 8E02000C */  lw        $v0, 0xc($s0)
-/* 102088 802DEF98 080B7BE9 */  j         .L802DEFA4
-/* 10208C 802DEF9C 00000000 */   nop
-.L802DEFA0:
-/* 102090 802DEFA0 0000102D */  daddu     $v0, $zero, $zero
-.L802DEFA4:
-/* 102094 802DEFA4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 102098 802DEFA8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 10209C 802DEFAC 03E00008 */  jr        $ra
-/* 1020A0 802DEFB0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_turn.s b/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_turn.s
deleted file mode 100644
index acdf47ee29..0000000000
--- a/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_turn.s
+++ /dev/null
@@ -1,361 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_state_update_begin_turn
-/* 1703F4 80241B14 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 1703F8 80241B18 AFB40020 */  sw        $s4, 0x20($sp)
-/* 1703FC 80241B1C 3C14800E */  lui       $s4, %hi(gBattleStatus)
-/* 170400 80241B20 2694C070 */  addiu     $s4, $s4, %lo(gBattleStatus)
-/* 170404 80241B24 AFB20018 */  sw        $s2, 0x18($sp)
-/* 170408 80241B28 3C128011 */  lui       $s2, %hi(gPlayerData)
-/* 17040C 80241B2C 2652F290 */  addiu     $s2, $s2, %lo(gPlayerData)
-/* 170410 80241B30 AFBF0028 */  sw        $ra, 0x28($sp)
-/* 170414 80241B34 AFB50024 */  sw        $s5, 0x24($sp)
-/* 170418 80241B38 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 17041C 80241B3C AFB10014 */  sw        $s1, 0x14($sp)
-/* 170420 80241B40 AFB00010 */  sw        $s0, 0x10($sp)
-/* 170424 80241B44 8E9500DC */  lw        $s5, 0xdc($s4)
-/* 170428 80241B48 3C02800E */  lui       $v0, %hi(gBattleState2)
-/* 17042C 80241B4C 8C42C4DC */  lw        $v0, %lo(gBattleState2)($v0)
-/* 170430 80241B50 8E8500D8 */  lw        $a1, 0xd8($s4)
-/* 170434 80241B54 144000E9 */  bnez      $v0, .L80241EFC
-/* 170438 80241B58 3C04FEFF */   lui      $a0, 0xfeff
-/* 17043C 80241B5C 3484FFFF */  ori       $a0, $a0, 0xffff
-/* 170440 80241B60 8E820004 */  lw        $v0, 4($s4)
-/* 170444 80241B64 2403FFFD */  addiu     $v1, $zero, -3
-/* 170448 80241B68 A28000AC */  sb        $zero, 0xac($s4)
-/* 17044C 80241B6C A28000AD */  sb        $zero, 0xad($s4)
-/* 170450 80241B70 00431024 */  and       $v0, $v0, $v1
-/* 170454 80241B74 2403FFFB */  addiu     $v1, $zero, -5
-/* 170458 80241B78 00431024 */  and       $v0, $v0, $v1
-/* 17045C 80241B7C 2403FFF7 */  addiu     $v1, $zero, -9
-/* 170460 80241B80 00431024 */  and       $v0, $v0, $v1
-/* 170464 80241B84 2403FFEF */  addiu     $v1, $zero, -0x11
-/* 170468 80241B88 00431024 */  and       $v0, $v0, $v1
-/* 17046C 80241B8C AE820004 */  sw        $v0, 4($s4)
-/* 170470 80241B90 00441024 */  and       $v0, $v0, $a0
-/* 170474 80241B94 AE820004 */  sw        $v0, 4($s4)
-/* 170478 80241B98 8CA20000 */  lw        $v0, ($a1)
-/* 17047C 80241B9C 3C030C00 */  lui       $v1, 0xc00
-/* 170480 80241BA0 A0A0021D */  sb        $zero, 0x21d($a1)
-/* 170484 80241BA4 00431025 */  or        $v0, $v0, $v1
-/* 170488 80241BA8 12A00004 */  beqz      $s5, .L80241BBC
-/* 17048C 80241BAC ACA20000 */   sw       $v0, ($a1)
-/* 170490 80241BB0 00431025 */  or        $v0, $v0, $v1
-/* 170494 80241BB4 ACA20000 */  sw        $v0, ($a1)
-/* 170498 80241BB8 A2A0021D */  sb        $zero, 0x21d($s5)
-.L80241BBC:
-/* 17049C 80241BBC 8282008B */  lb        $v0, 0x8b($s4)
-/* 1704A0 80241BC0 10400004 */  beqz      $v0, .L80241BD4
-/* 1704A4 80241BC4 3C030400 */   lui      $v1, 0x400
-/* 1704A8 80241BC8 8E820000 */  lw        $v0, ($s4)
-/* 1704AC 80241BCC 00431025 */  or        $v0, $v0, $v1
-/* 1704B0 80241BD0 AE820000 */  sw        $v0, ($s4)
-.L80241BD4:
-/* 1704B4 80241BD4 0000502D */  daddu     $t2, $zero, $zero
-/* 1704B8 80241BD8 0140882D */  daddu     $s1, $t2, $zero
-/* 1704BC 80241BDC 0280202D */  daddu     $a0, $s4, $zero
-/* 1704C0 80241BE0 0280182D */  daddu     $v1, $s4, $zero
-.L80241BE4:
-/* 1704C4 80241BE4 8C9000E0 */  lw        $s0, 0xe0($a0)
-/* 1704C8 80241BE8 52000006 */  beql      $s0, $zero, .L80241C04
-/* 1704CC 80241BEC 26310001 */   addiu    $s1, $s1, 1
-/* 1704D0 80241BF0 36220200 */  ori       $v0, $s1, 0x200
-/* 1704D4 80241BF4 A4620140 */  sh        $v0, 0x140($v1)
-/* 1704D8 80241BF8 24630002 */  addiu     $v1, $v1, 2
-/* 1704DC 80241BFC 254A0001 */  addiu     $t2, $t2, 1
-/* 1704E0 80241C00 26310001 */  addiu     $s1, $s1, 1
-.L80241C04:
-/* 1704E4 80241C04 2A220018 */  slti      $v0, $s1, 0x18
-/* 1704E8 80241C08 1440FFF6 */  bnez      $v0, .L80241BE4
-/* 1704EC 80241C0C 24840004 */   addiu    $a0, $a0, 4
-/* 1704F0 80241C10 A28A0171 */  sb        $t2, 0x171($s4)
-/* 1704F4 80241C14 0000882D */  daddu     $s1, $zero, $zero
-/* 1704F8 80241C18 2542FFFF */  addiu     $v0, $t2, -1
-/* 1704FC 80241C1C 18400031 */  blez      $v0, .L80241CE4
-/* 170500 80241C20 268C0140 */   addiu    $t4, $s4, 0x140
-/* 170504 80241C24 3C0E800E */  lui       $t6, %hi(gBattleStatus)
-/* 170508 80241C28 25CEC070 */  addiu     $t6, $t6, %lo(gBattleStatus)
-/* 17050C 80241C2C 3C0D0800 */  lui       $t5, 0x800
-/* 170510 80241C30 0180582D */  daddu     $t3, $t4, $zero
-.L80241C34:
-/* 170514 80241C34 26280001 */  addiu     $t0, $s1, 1
-/* 170518 80241C38 010A102A */  slt       $v0, $t0, $t2
-/* 17051C 80241C3C 50400025 */  beql      $v0, $zero, .L80241CD4
-/* 170520 80241C40 26310001 */   addiu    $s1, $s1, 1
-/* 170524 80241C44 0160482D */  daddu     $t1, $t3, $zero
-/* 170528 80241C48 00081040 */  sll       $v0, $t0, 1
-/* 17052C 80241C4C 004C2821 */  addu      $a1, $v0, $t4
-.L80241C50:
-/* 170530 80241C50 95270000 */  lhu       $a3, ($t1)
-/* 170534 80241C54 94A60000 */  lhu       $a2, ($a1)
-/* 170538 80241C58 8DC40000 */  lw        $a0, ($t6)
-/* 17053C 80241C5C 30E200FF */  andi      $v0, $a3, 0xff
-/* 170540 80241C60 00021080 */  sll       $v0, $v0, 2
-/* 170544 80241C64 02821021 */  addu      $v0, $s4, $v0
-/* 170548 80241C68 30C300FF */  andi      $v1, $a2, 0xff
-/* 17054C 80241C6C 00031880 */  sll       $v1, $v1, 2
-/* 170550 80241C70 02831821 */  addu      $v1, $s4, $v1
-/* 170554 80241C74 008D2024 */  and       $a0, $a0, $t5
-/* 170558 80241C78 8C4200E0 */  lw        $v0, 0xe0($v0)
-/* 17055C 80241C7C 10800009 */  beqz      $a0, .L80241CA4
-/* 170560 80241C80 8C6300E0 */   lw       $v1, 0xe0($v1)
-/* 170564 80241C84 C4420138 */  lwc1      $f2, 0x138($v0)
-/* 170568 80241C88 C4600138 */  lwc1      $f0, 0x138($v1)
-/* 17056C 80241C8C 4602003C */  c.lt.s    $f0, $f2
-/* 170570 80241C90 00000000 */  nop
-/* 170574 80241C94 4502000B */  bc1fl     .L80241CC4
-/* 170578 80241C98 25080001 */   addiu    $t0, $t0, 1
-/* 17057C 80241C9C 0809072F */  j         .L80241CBC
-/* 170580 80241CA0 A5260000 */   sh       $a2, ($t1)
-.L80241CA4:
-/* 170584 80241CA4 804201F1 */  lb        $v0, 0x1f1($v0)
-/* 170588 80241CA8 806301F1 */  lb        $v1, 0x1f1($v1)
-/* 17058C 80241CAC 0043102A */  slt       $v0, $v0, $v1
-/* 170590 80241CB0 50400004 */  beql      $v0, $zero, .L80241CC4
-/* 170594 80241CB4 25080001 */   addiu    $t0, $t0, 1
-/* 170598 80241CB8 A5260000 */  sh        $a2, ($t1)
-.L80241CBC:
-/* 17059C 80241CBC A4A70000 */  sh        $a3, ($a1)
-/* 1705A0 80241CC0 25080001 */  addiu     $t0, $t0, 1
-.L80241CC4:
-/* 1705A4 80241CC4 010A102A */  slt       $v0, $t0, $t2
-/* 1705A8 80241CC8 1440FFE1 */  bnez      $v0, .L80241C50
-/* 1705AC 80241CCC 24A50002 */   addiu    $a1, $a1, 2
-/* 1705B0 80241CD0 26310001 */  addiu     $s1, $s1, 1
-.L80241CD4:
-/* 1705B4 80241CD4 2542FFFF */  addiu     $v0, $t2, -1
-/* 1705B8 80241CD8 0222102A */  slt       $v0, $s1, $v0
-/* 1705BC 80241CDC 1440FFD5 */  bnez      $v0, .L80241C34
-/* 1705C0 80241CE0 256B0002 */   addiu    $t3, $t3, 2
-.L80241CE4:
-/* 1705C4 80241CE4 0C090398 */  jal       btl_merlee_on_start_turn
-/* 1705C8 80241CE8 A2800170 */   sb       $zero, 0x170($s4)
-/* 1705CC 80241CEC 3C03F7FF */  lui       $v1, 0xf7ff
-/* 1705D0 80241CF0 3C10800E */  lui       $s0, %hi(gBattleStatus)
-/* 1705D4 80241CF4 2610C070 */  addiu     $s0, $s0, %lo(gBattleStatus)
-/* 1705D8 80241CF8 8E020004 */  lw        $v0, 4($s0)
-/* 1705DC 80241CFC 3463FFFF */  ori       $v1, $v1, 0xffff
-/* 1705E0 80241D00 A2800099 */  sb        $zero, 0x99($s4)
-/* 1705E4 80241D04 00431824 */  and       $v1, $v0, $v1
-/* 1705E8 80241D08 30420040 */  andi      $v0, $v0, 0x40
-/* 1705EC 80241D0C 14400023 */  bnez      $v0, .L80241D9C
-/* 1705F0 80241D10 AE030004 */   sw       $v1, 4($s0)
-/* 1705F4 80241D14 82420002 */  lb        $v0, 2($s2)
-/* 1705F8 80241D18 28420002 */  slti      $v0, $v0, 2
-/* 1705FC 80241D1C 1040000B */  beqz      $v0, .L80241D4C
-/* 170600 80241D20 00000000 */   nop
-/* 170604 80241D24 0C03A752 */  jal       is_ability_active
-/* 170608 80241D28 24040014 */   addiu    $a0, $zero, 0x14
-/* 17060C 80241D2C 10400007 */  beqz      $v0, .L80241D4C
-/* 170610 80241D30 3C020800 */   lui      $v0, 0x800
-/* 170614 80241D34 8E030004 */  lw        $v1, 4($s0)
-/* 170618 80241D38 92840099 */  lbu       $a0, 0x99($s4)
-/* 17061C 80241D3C 00621825 */  or        $v1, $v1, $v0
-/* 170620 80241D40 34840001 */  ori       $a0, $a0, 1
-/* 170624 80241D44 AE030004 */  sw        $v1, 4($s0)
-/* 170628 80241D48 A2840099 */  sb        $a0, 0x99($s4)
-.L80241D4C:
-/* 17062C 80241D4C 82420002 */  lb        $v0, 2($s2)
-/* 170630 80241D50 28420006 */  slti      $v0, $v0, 6
-/* 170634 80241D54 10400011 */  beqz      $v0, .L80241D9C
-/* 170638 80241D58 00000000 */   nop
-/* 17063C 80241D5C 0C03A752 */  jal       is_ability_active
-/* 170640 80241D60 2404001E */   addiu    $a0, $zero, 0x1e
-/* 170644 80241D64 1040000D */  beqz      $v0, .L80241D9C
-/* 170648 80241D68 00000000 */   nop
-/* 17064C 80241D6C 92820099 */  lbu       $v0, 0x99($s4)
-/* 170650 80241D70 30420001 */  andi      $v0, $v0, 1
-/* 170654 80241D74 14400009 */  bnez      $v0, .L80241D9C
-/* 170658 80241D78 3C040800 */   lui      $a0, 0x800
-/* 17065C 80241D7C 3C05800E */  lui       $a1, %hi(gBattleStatus)
-/* 170660 80241D80 24A5C070 */  addiu     $a1, $a1, %lo(gBattleStatus)
-/* 170664 80241D84 8CA20004 */  lw        $v0, 4($a1)
-/* 170668 80241D88 92830099 */  lbu       $v1, 0x99($s4)
-/* 17066C 80241D8C 00441025 */  or        $v0, $v0, $a0
-/* 170670 80241D90 34630002 */  ori       $v1, $v1, 2
-/* 170674 80241D94 ACA20004 */  sw        $v0, 4($a1)
-/* 170678 80241D98 A2830099 */  sb        $v1, 0x99($s4)
-.L80241D9C:
-/* 17067C 80241D9C 3C04800E */  lui       $a0, %hi(gBattleStatus)
-/* 170680 80241DA0 2484C070 */  addiu     $a0, $a0, %lo(gBattleStatus)
-/* 170684 80241DA4 8C820000 */  lw        $v0, ($a0)
-/* 170688 80241DA8 3C032000 */  lui       $v1, 0x2000
-/* 17068C 80241DAC 00431024 */  and       $v0, $v0, $v1
-/* 170690 80241DB0 50400001 */  beql      $v0, $zero, .L80241DB8
-/* 170694 80241DB4 A2800097 */   sb       $zero, 0x97($s4)
-.L80241DB8:
-/* 170698 80241DB8 8C820000 */  lw        $v0, ($a0)
-/* 17069C 80241DBC 3C031000 */  lui       $v1, 0x1000
-/* 1706A0 80241DC0 00431024 */  and       $v0, $v0, $v1
-/* 1706A4 80241DC4 50400001 */  beql      $v0, $zero, .L80241DCC
-/* 1706A8 80241DC8 A2800096 */   sb       $zero, 0x96($s4)
-.L80241DCC:
-/* 1706AC 80241DCC 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 1706B0 80241DD0 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 1706B4 80241DD4 80430074 */  lb        $v1, 0x74($v0)
-/* 1706B8 80241DD8 24020004 */  addiu     $v0, $zero, 4
-/* 1706BC 80241DDC 14620003 */  bne       $v1, $v0, .L80241DEC
-/* 1706C0 80241DE0 24020003 */   addiu    $v0, $zero, 3
-/* 1706C4 80241DE4 080907FC */  j         .L80241FF0
-/* 1706C8 80241DE8 24040018 */   addiu    $a0, $zero, 0x18
-.L80241DEC:
-/* 1706CC 80241DEC 14620018 */  bne       $v1, $v0, .L80241E50
-/* 1706D0 80241DF0 0000882D */   daddu    $s1, $zero, $zero
-/* 1706D4 80241DF4 24130020 */  addiu     $s3, $zero, 0x20
-/* 1706D8 80241DF8 0280902D */  daddu     $s2, $s4, $zero
-.L80241DFC:
-/* 1706DC 80241DFC 8E5000E0 */  lw        $s0, 0xe0($s2)
-/* 1706E0 80241E00 5200000E */  beql      $s0, $zero, .L80241E3C
-/* 1706E4 80241E04 26310001 */   addiu    $s1, $s1, 1
-/* 1706E8 80241E08 8E0401C8 */  lw        $a0, 0x1c8($s0)
-/* 1706EC 80241E0C 5080000B */  beql      $a0, $zero, .L80241E3C
-/* 1706F0 80241E10 26310001 */   addiu    $s1, $s1, 1
-/* 1706F4 80241E14 2405000A */  addiu     $a1, $zero, 0xa
-/* 1706F8 80241E18 0C0B0CF8 */  jal       start_script
-/* 1706FC 80241E1C 0000302D */   daddu    $a2, $zero, $zero
-/* 170700 80241E20 AE0201D8 */  sw        $v0, 0x1d8($s0)
-/* 170704 80241E24 8C440144 */  lw        $a0, 0x144($v0)
-/* 170708 80241E28 36230200 */  ori       $v1, $s1, 0x200
-/* 17070C 80241E2C AC430148 */  sw        $v1, 0x148($v0)
-/* 170710 80241E30 A21301F0 */  sb        $s3, 0x1f0($s0)
-/* 170714 80241E34 AE0401E8 */  sw        $a0, 0x1e8($s0)
-/* 170718 80241E38 26310001 */  addiu     $s1, $s1, 1
-.L80241E3C:
-/* 17071C 80241E3C 2A220018 */  slti      $v0, $s1, 0x18
-/* 170720 80241E40 1440FFEE */  bnez      $v0, .L80241DFC
-/* 170724 80241E44 26520004 */   addiu    $s2, $s2, 4
-/* 170728 80241E48 080907BD */  j         .L80241EF4
-/* 17072C 80241E4C 2402000A */   addiu    $v0, $zero, 0xa
-.L80241E50:
-/* 170730 80241E50 2413000A */  addiu     $s3, $zero, 0xa
-/* 170734 80241E54 0280902D */  daddu     $s2, $s4, $zero
-.L80241E58:
-/* 170738 80241E58 8E5000E0 */  lw        $s0, 0xe0($s2)
-/* 17073C 80241E5C 52000010 */  beql      $s0, $zero, .L80241EA0
-/* 170740 80241E60 26310001 */   addiu    $s1, $s1, 1
-/* 170744 80241E64 8E0201CC */  lw        $v0, 0x1cc($s0)
-/* 170748 80241E68 5040000D */  beql      $v0, $zero, .L80241EA0
-/* 17074C 80241E6C 26310001 */   addiu    $s1, $s1, 1
-/* 170750 80241E70 2405000A */  addiu     $a1, $zero, 0xa
-/* 170754 80241E74 A29301A7 */  sb        $s3, 0x1a7($s4)
-/* 170758 80241E78 8E0401CC */  lw        $a0, 0x1cc($s0)
-/* 17075C 80241E7C 0C0B0CF8 */  jal       start_script
-/* 170760 80241E80 0000302D */   daddu    $a2, $zero, $zero
-/* 170764 80241E84 0040182D */  daddu     $v1, $v0, $zero
-/* 170768 80241E88 AE0301DC */  sw        $v1, 0x1dc($s0)
-/* 17076C 80241E8C 8C620144 */  lw        $v0, 0x144($v1)
-/* 170770 80241E90 AE0201EC */  sw        $v0, 0x1ec($s0)
-/* 170774 80241E94 36220200 */  ori       $v0, $s1, 0x200
-/* 170778 80241E98 AC620148 */  sw        $v0, 0x148($v1)
-/* 17077C 80241E9C 26310001 */  addiu     $s1, $s1, 1
-.L80241EA0:
-/* 170780 80241EA0 2A220018 */  slti      $v0, $s1, 0x18
-/* 170784 80241EA4 1440FFEC */  bnez      $v0, .L80241E58
-/* 170788 80241EA8 26520004 */   addiu    $s2, $s2, 4
-/* 17078C 80241EAC 8E9500DC */  lw        $s5, 0xdc($s4)
-/* 170790 80241EB0 12A00010 */  beqz      $s5, .L80241EF4
-/* 170794 80241EB4 24020005 */   addiu    $v0, $zero, 5
-/* 170798 80241EB8 8EA201CC */  lw        $v0, 0x1cc($s5)
-/* 17079C 80241EBC 1040000C */  beqz      $v0, .L80241EF0
-/* 1707A0 80241EC0 2405000A */   addiu    $a1, $zero, 0xa
-/* 1707A4 80241EC4 00A0102D */  daddu     $v0, $a1, $zero
-/* 1707A8 80241EC8 A28201A7 */  sb        $v0, 0x1a7($s4)
-/* 1707AC 80241ECC 8EA401CC */  lw        $a0, 0x1cc($s5)
-/* 1707B0 80241ED0 0C0B0CF8 */  jal       start_script
-/* 1707B4 80241ED4 0000302D */   daddu    $a2, $zero, $zero
-/* 1707B8 80241ED8 0040182D */  daddu     $v1, $v0, $zero
-/* 1707BC 80241EDC AEA301DC */  sw        $v1, 0x1dc($s5)
-/* 1707C0 80241EE0 8C620144 */  lw        $v0, 0x144($v1)
-/* 1707C4 80241EE4 AEA201EC */  sw        $v0, 0x1ec($s5)
-/* 1707C8 80241EE8 24020100 */  addiu     $v0, $zero, 0x100
-/* 1707CC 80241EEC AC620148 */  sw        $v0, 0x148($v1)
-.L80241EF0:
-/* 1707D0 80241EF0 24020005 */  addiu     $v0, $zero, 5
-.L80241EF4:
-/* 1707D4 80241EF4 3C01800E */  lui       $at, %hi(gBattleState2)
-/* 1707D8 80241EF8 AC22C4DC */  sw        $v0, %lo(gBattleState2)($at)
-.L80241EFC:
-/* 1707DC 80241EFC 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 1707E0 80241F00 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
-/* 1707E4 80241F04 24020005 */  addiu     $v0, $zero, 5
-/* 1707E8 80241F08 14620020 */  bne       $v1, $v0, .L80241F8C
-/* 1707EC 80241F0C 2402000A */   addiu    $v0, $zero, 0xa
-/* 1707F0 80241F10 0000982D */  daddu     $s3, $zero, $zero
-/* 1707F4 80241F14 0260882D */  daddu     $s1, $s3, $zero
-/* 1707F8 80241F18 0280902D */  daddu     $s2, $s4, $zero
-.L80241F1C:
-/* 1707FC 80241F1C 8E5000E0 */  lw        $s0, 0xe0($s2)
-/* 170800 80241F20 5200000A */  beql      $s0, $zero, .L80241F4C
-/* 170804 80241F24 26310001 */   addiu    $s1, $s1, 1
-/* 170808 80241F28 8E0201CC */  lw        $v0, 0x1cc($s0)
-/* 17080C 80241F2C 50400007 */  beql      $v0, $zero, .L80241F4C
-/* 170810 80241F30 26310001 */   addiu    $s1, $s1, 1
-/* 170814 80241F34 8E0401EC */  lw        $a0, 0x1ec($s0)
-/* 170818 80241F38 0C0B1059 */  jal       does_script_exist
-/* 17081C 80241F3C 00000000 */   nop
-/* 170820 80241F40 54400001 */  bnel      $v0, $zero, .L80241F48
-/* 170824 80241F44 24130001 */   addiu    $s3, $zero, 1
-.L80241F48:
-/* 170828 80241F48 26310001 */  addiu     $s1, $s1, 1
-.L80241F4C:
-/* 17082C 80241F4C 2A220018 */  slti      $v0, $s1, 0x18
-/* 170830 80241F50 1440FFF2 */  bnez      $v0, .L80241F1C
-/* 170834 80241F54 26520004 */   addiu    $s2, $s2, 4
-/* 170838 80241F58 12A00008 */  beqz      $s5, .L80241F7C
-/* 17083C 80241F5C 00000000 */   nop
-/* 170840 80241F60 8EA201CC */  lw        $v0, 0x1cc($s5)
-/* 170844 80241F64 10400005 */  beqz      $v0, .L80241F7C
-/* 170848 80241F68 00000000 */   nop
-/* 17084C 80241F6C 0C0B1059 */  jal       does_script_exist
-/* 170850 80241F70 8EA401EC */   lw       $a0, 0x1ec($s5)
-/* 170854 80241F74 54400001 */  bnel      $v0, $zero, .L80241F7C
-/* 170858 80241F78 24130001 */   addiu    $s3, $zero, 1
-.L80241F7C:
-/* 17085C 80241F7C 12600018 */  beqz      $s3, .L80241FE0
-/* 170860 80241F80 2402000A */   addiu    $v0, $zero, 0xa
-/* 170864 80241F84 3C03800E */  lui       $v1, %hi(gBattleState2)
-/* 170868 80241F88 8C63C4DC */  lw        $v1, %lo(gBattleState2)($v1)
-.L80241F8C:
-/* 17086C 80241F8C 1462001A */  bne       $v1, $v0, .L80241FF8
-/* 170870 80241F90 0000982D */   daddu    $s3, $zero, $zero
-/* 170874 80241F94 0260882D */  daddu     $s1, $s3, $zero
-/* 170878 80241F98 0280902D */  daddu     $s2, $s4, $zero
-.L80241F9C:
-/* 17087C 80241F9C 8E5000E0 */  lw        $s0, 0xe0($s2)
-/* 170880 80241FA0 5200000A */  beql      $s0, $zero, .L80241FCC
-/* 170884 80241FA4 26310001 */   addiu    $s1, $s1, 1
-/* 170888 80241FA8 8E0201C8 */  lw        $v0, 0x1c8($s0)
-/* 17088C 80241FAC 50400007 */  beql      $v0, $zero, .L80241FCC
-/* 170890 80241FB0 26310001 */   addiu    $s1, $s1, 1
-/* 170894 80241FB4 8E0401E8 */  lw        $a0, 0x1e8($s0)
-/* 170898 80241FB8 0C0B1059 */  jal       does_script_exist
-/* 17089C 80241FBC 00000000 */   nop
-/* 1708A0 80241FC0 54400001 */  bnel      $v0, $zero, .L80241FC8
-/* 1708A4 80241FC4 24130001 */   addiu    $s3, $zero, 1
-.L80241FC8:
-/* 1708A8 80241FC8 26310001 */  addiu     $s1, $s1, 1
-.L80241FCC:
-/* 1708AC 80241FCC 2A220018 */  slti      $v0, $s1, 0x18
-/* 1708B0 80241FD0 1440FFF2 */  bnez      $v0, .L80241F9C
-/* 1708B4 80241FD4 26520004 */   addiu    $s2, $s2, 4
-/* 1708B8 80241FD8 16600007 */  bnez      $s3, .L80241FF8
-/* 1708BC 80241FDC 00000000 */   nop
-.L80241FE0:
-/* 1708C0 80241FE0 0C098D0D */  jal       btl_check_enemies_defeated
-/* 1708C4 80241FE4 00000000 */   nop
-/* 1708C8 80241FE8 14400003 */  bnez      $v0, .L80241FF8
-/* 1708CC 80241FEC 24040007 */   addiu    $a0, $zero, 7
-.L80241FF0:
-/* 1708D0 80241FF0 0C090464 */  jal       btl_set_state
-/* 1708D4 80241FF4 00000000 */   nop
-.L80241FF8:
-/* 1708D8 80241FF8 8FBF0028 */  lw        $ra, 0x28($sp)
-/* 1708DC 80241FFC 8FB50024 */  lw        $s5, 0x24($sp)
-/* 1708E0 80242000 8FB40020 */  lw        $s4, 0x20($sp)
-/* 1708E4 80242004 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 1708E8 80242008 8FB20018 */  lw        $s2, 0x18($sp)
-/* 1708EC 8024200C 8FB10014 */  lw        $s1, 0x14($sp)
-/* 1708F0 80242010 8FB00010 */  lw        $s0, 0x10($sp)
-/* 1708F4 80242014 03E00008 */  jr        $ra
-/* 1708F8 80242018 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_appendGfx.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_appendGfx.s
deleted file mode 100644
index d035fe909c..0000000000
--- a/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_appendGfx.s
+++ /dev/null
@@ -1,322 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel bombette_breaking_appendGfx
-/* 3892F8 E0084928 27BDFF58 */  addiu     $sp, $sp, -0xa8
-/* 3892FC E008492C 3C06DB06 */  lui       $a2, 0xdb06
-/* 389300 E0084930 AFA400A8 */  sw        $a0, 0xa8($sp)
-/* 389304 E0084934 8FAA00A8 */  lw        $t2, 0xa8($sp)
-/* 389308 E0084938 34C60024 */  ori       $a2, $a2, 0x24
-/* 38930C E008493C AFB3007C */  sw        $s3, 0x7c($sp)
-/* 389310 E0084940 3C13800A */  lui       $s3, %hi(gMasterGfxPos)
-/* 389314 E0084944 2673A66C */  addiu     $s3, $s3, %lo(gMasterGfxPos)
-/* 389318 E0084948 AFBF0094 */  sw        $ra, 0x94($sp)
-/* 38931C E008494C AFBE0090 */  sw        $fp, 0x90($sp)
-/* 389320 E0084950 AFB7008C */  sw        $s7, 0x8c($sp)
-/* 389324 E0084954 AFB60088 */  sw        $s6, 0x88($sp)
-/* 389328 E0084958 AFB50084 */  sw        $s5, 0x84($sp)
-/* 38932C E008495C AFB40080 */  sw        $s4, 0x80($sp)
-/* 389330 E0084960 AFB20078 */  sw        $s2, 0x78($sp)
-/* 389334 E0084964 AFB10074 */  sw        $s1, 0x74($sp)
-/* 389338 E0084968 AFB00070 */  sw        $s0, 0x70($sp)
-/* 38933C E008496C F7B600A0 */  sdc1      $f22, 0xa0($sp)
-/* 389340 E0084970 F7B40098 */  sdc1      $f20, 0x98($sp)
-/* 389344 E0084974 8E650000 */  lw        $a1, ($s3)
-/* 389348 E0084978 8D51000C */  lw        $s1, 0xc($t2)
-/* 38934C E008497C 00A0182D */  daddu     $v1, $a1, $zero
-/* 389350 E0084980 8E360044 */  lw        $s6, 0x44($s1)
-/* 389354 E0084984 96220000 */  lhu       $v0, ($s1)
-/* 389358 E0084988 24A50008 */  addiu     $a1, $a1, 8
-/* 38935C E008498C AE650000 */  sw        $a1, ($s3)
-/* 389360 E0084990 0002F080 */  sll       $fp, $v0, 2
-/* 389364 E0084994 3C0AE008 */  lui       $t2, %hi(D_E0084E10)
-/* 389368 E0084998 015E5021 */  addu      $t2, $t2, $fp
-/* 38936C E008499C 8D4A4E10 */  lw        $t2, %lo(D_E0084E10)($t2)
-/* 389370 E00849A0 27A40020 */  addiu     $a0, $sp, 0x20
-/* 389374 E00849A4 AFAA0060 */  sw        $t2, 0x60($sp)
-/* 389378 E00849A8 3C0AE008 */  lui       $t2, %hi(D_E0084E28)
-/* 38937C E00849AC 015E5021 */  addu      $t2, $t2, $fp
-/* 389380 E00849B0 8D4A4E28 */  lw        $t2, %lo(D_E0084E28)($t2)
-/* 389384 E00849B4 3C100001 */  lui       $s0, 1
-/* 389388 E00849B8 AFAA0064 */  sw        $t2, 0x64($sp)
-/* 38938C E00849BC C6360038 */  lwc1      $f22, 0x38($s1)
-/* 389390 E00849C0 C6340040 */  lwc1      $f20, 0x40($s1)
-/* 389394 E00849C4 8E2A004C */  lw        $t2, 0x4c($s1)
-/* 389398 E00849C8 3C02E700 */  lui       $v0, 0xe700
-/* 38939C E00849CC AFAA0068 */  sw        $t2, 0x68($sp)
-/* 3893A0 E00849D0 AC620000 */  sw        $v0, ($v1)
-/* 3893A4 E00849D4 AC600004 */  sw        $zero, 4($v1)
-/* 3893A8 E00849D8 ACA60000 */  sw        $a2, ($a1)
-/* 3893AC E00849DC 8FAA00A8 */  lw        $t2, 0xa8($sp)
-/* 3893B0 E00849E0 36101630 */  ori       $s0, $s0, 0x1630
-/* 3893B4 E00849E4 8D430010 */  lw        $v1, 0x10($t2)
-/* 3893B8 E00849E8 24A20008 */  addiu     $v0, $a1, 8
-/* 3893BC E00849EC AE620000 */  sw        $v0, ($s3)
-/* 3893C0 E00849F0 8C62001C */  lw        $v0, 0x1c($v1)
-/* 3893C4 E00849F4 3C038000 */  lui       $v1, 0x8000
-/* 3893C8 E00849F8 00431021 */  addu      $v0, $v0, $v1
-/* 3893CC E00849FC ACA20004 */  sw        $v0, 4($a1)
-/* 3893D0 E0084A00 8E250008 */  lw        $a1, 8($s1)
-/* 3893D4 E0084A04 8E26000C */  lw        $a2, 0xc($s1)
-/* 3893D8 E0084A08 8E270010 */  lw        $a3, 0x10($s1)
-/* 3893DC E0084A0C 0C080108 */  jal       shim_guTranslateF
-/* 3893E0 E0084A10 24120001 */   addiu    $s2, $zero, 1
-/* 3893E4 E0084A14 27A40020 */  addiu     $a0, $sp, 0x20
-/* 3893E8 E0084A18 3C148007 */  lui       $s4, %hi(gMatrixListPos)
-/* 3893EC E0084A1C 269441F0 */  addiu     $s4, $s4, %lo(gMatrixListPos)
-/* 3893F0 E0084A20 3C15800A */  lui       $s5, %hi(gDisplayContext)
-/* 3893F4 E0084A24 26B5A674 */  addiu     $s5, $s5, %lo(gDisplayContext)
-/* 3893F8 E0084A28 96850000 */  lhu       $a1, ($s4)
-/* 3893FC E0084A2C 8EA20000 */  lw        $v0, ($s5)
-/* 389400 E0084A30 00052980 */  sll       $a1, $a1, 6
-/* 389404 E0084A34 00B02821 */  addu      $a1, $a1, $s0
-/* 389408 E0084A38 0C080118 */  jal       shim_guMtxF2L
-/* 38940C E0084A3C 00452821 */   addu     $a1, $v0, $a1
-/* 389410 E0084A40 0260202D */  daddu     $a0, $s3, $zero
-/* 389414 E0084A44 3C02DA38 */  lui       $v0, 0xda38
-/* 389418 E0084A48 8E670000 */  lw        $a3, ($s3)
-/* 38941C E0084A4C 96860000 */  lhu       $a2, ($s4)
-/* 389420 E0084A50 00E0282D */  daddu     $a1, $a3, $zero
-/* 389424 E0084A54 ACA20000 */  sw        $v0, ($a1)
-/* 389428 E0084A58 30C2FFFF */  andi      $v0, $a2, 0xffff
-/* 38942C E0084A5C 00021180 */  sll       $v0, $v0, 6
-/* 389430 E0084A60 00501021 */  addu      $v0, $v0, $s0
-/* 389434 E0084A64 8EA30000 */  lw        $v1, ($s5)
-/* 389438 E0084A68 24E70008 */  addiu     $a3, $a3, 8
-/* 38943C E0084A6C 00621821 */  addu      $v1, $v1, $v0
-/* 389440 E0084A70 ACA30004 */  sw        $v1, 4($a1)
-/* 389444 E0084A74 96250002 */  lhu       $a1, 2($s1)
-/* 389448 E0084A78 00D23021 */  addu      $a2, $a2, $s2
-/* 38944C E0084A7C AE670000 */  sw        $a3, ($s3)
-/* 389450 E0084A80 0C080158 */  jal       shim_mdl_draw_hidden_panel_surface
-/* 389454 E0084A84 A6860000 */   sh       $a2, ($s4)
-/* 389458 E0084A88 8FAA00A8 */  lw        $t2, 0xa8($sp)
-/* 38945C E0084A8C 0016B080 */  sll       $s6, $s6, 2
-/* 389460 E0084A90 8D420008 */  lw        $v0, 8($t2)
-/* 389464 E0084A94 0242102A */  slt       $v0, $s2, $v0
-/* 389468 E0084A98 10400051 */  beqz      $v0, .LE0084BE0
-/* 38946C E0084A9C 26310050 */   addiu    $s1, $s1, 0x50
-/* 389470 E0084AA0 3C170001 */  lui       $s7, 1
-/* 389474 E0084AA4 36F71630 */  ori       $s7, $s7, 0x1630
-/* 389478 E0084AA8 0260A82D */  daddu     $s5, $s3, $zero
-/* 38947C E0084AAC 3C02E008 */  lui       $v0, %hi(D_E0084E1C)
-/* 389480 E0084AB0 24424E1C */  addiu     $v0, $v0, %lo(D_E0084E1C)
-/* 389484 E0084AB4 03C2F021 */  addu      $fp, $fp, $v0
-/* 389488 E0084AB8 2630001C */  addiu     $s0, $s1, 0x1c
-/* 38948C E0084ABC 26D40050 */  addiu     $s4, $s6, 0x50
-/* 389490 E0084AC0 26D3FFD8 */  addiu     $s3, $s6, -0x28
-/* 389494 E0084AC4 26D10082 */  addiu     $s1, $s6, 0x82
-.LE0084AC8:
-/* 389498 E0084AC8 27A40020 */  addiu     $a0, $sp, 0x20
-/* 38949C E0084ACC 44912000 */  mtc1      $s1, $f4
-/* 3894A0 E0084AD0 00000000 */  nop
-/* 3894A4 E0084AD4 46802120 */  cvt.s.w   $f4, $f4
-/* 3894A8 E0084AD8 44052000 */  mfc1      $a1, $f4
-/* 3894AC E0084ADC 44932000 */  mtc1      $s3, $f4
-/* 3894B0 E0084AE0 00000000 */  nop
-/* 3894B4 E0084AE4 46802120 */  cvt.s.w   $f4, $f4
-/* 3894B8 E0084AE8 44062000 */  mfc1      $a2, $f4
-/* 3894BC E0084AEC 44942000 */  mtc1      $s4, $f4
-/* 3894C0 E0084AF0 00000000 */  nop
-/* 3894C4 E0084AF4 46802120 */  cvt.s.w   $f4, $f4
-/* 3894C8 E0084AF8 44072000 */  mfc1      $a3, $f4
-/* 3894CC E0084AFC 26940050 */  addiu     $s4, $s4, 0x50
-/* 3894D0 E0084B00 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 3894D4 E0084B04 C600FFF8 */  lwc1      $f0, -8($s0)
-/* 3894D8 E0084B08 2673FFD8 */  addiu     $s3, $s3, -0x28
-/* 3894DC E0084B0C E7A00014 */  swc1      $f0, 0x14($sp)
-/* 3894E0 E0084B10 C600FFFC */  lwc1      $f0, -4($s0)
-/* 3894E4 E0084B14 26310082 */  addiu     $s1, $s1, 0x82
-/* 3894E8 E0084B18 E7A00018 */  swc1      $f0, 0x18($sp)
-/* 3894EC E0084B1C C6000000 */  lwc1      $f0, ($s0)
-/* 3894F0 E0084B20 26520001 */  addiu     $s2, $s2, 1
-/* 3894F4 E0084B24 0C080180 */  jal       shim_guPositionF
-/* 3894F8 E0084B28 E7A0001C */   swc1     $f0, 0x1c($sp)
-/* 3894FC E0084B2C 27A40020 */  addiu     $a0, $sp, 0x20
-/* 389500 E0084B30 3C058007 */  lui       $a1, %hi(gMatrixListPos)
-/* 389504 E0084B34 94A541F0 */  lhu       $a1, %lo(gMatrixListPos)($a1)
-/* 389508 E0084B38 3C02800A */  lui       $v0, %hi(gDisplayContext)
-/* 38950C E0084B3C 8C42A674 */  lw        $v0, %lo(gDisplayContext)($v0)
-/* 389510 E0084B40 00052980 */  sll       $a1, $a1, 6
-/* 389514 E0084B44 00B72821 */  addu      $a1, $a1, $s7
-/* 389518 E0084B48 0C080118 */  jal       shim_guMtxF2L
-/* 38951C E0084B4C 00452821 */   addu     $a1, $v0, $a1
-/* 389520 E0084B50 3C06D838 */  lui       $a2, 0xd838
-/* 389524 E0084B54 8EA40000 */  lw        $a0, ($s5)
-/* 389528 E0084B58 34C60002 */  ori       $a2, $a2, 2
-/* 38952C E0084B5C 0080282D */  daddu     $a1, $a0, $zero
-/* 389530 E0084B60 24840008 */  addiu     $a0, $a0, 8
-/* 389534 E0084B64 AEA40000 */  sw        $a0, ($s5)
-/* 389538 E0084B68 3C028007 */  lui       $v0, %hi(gMatrixListPos)
-/* 38953C E0084B6C 944241F0 */  lhu       $v0, %lo(gMatrixListPos)($v0)
-/* 389540 E0084B70 3C03DA38 */  lui       $v1, 0xda38
-/* 389544 E0084B74 ACA30000 */  sw        $v1, ($a1)
-/* 389548 E0084B78 24430001 */  addiu     $v1, $v0, 1
-/* 38954C E0084B7C 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 389550 E0084B80 00021180 */  sll       $v0, $v0, 6
-/* 389554 E0084B84 3C018007 */  lui       $at, %hi(gMatrixListPos)
-/* 389558 E0084B88 A42341F0 */  sh        $v1, %lo(gMatrixListPos)($at)
-/* 38955C E0084B8C 3C03800A */  lui       $v1, %hi(gDisplayContext)
-/* 389560 E0084B90 8C63A674 */  lw        $v1, %lo(gDisplayContext)($v1)
-/* 389564 E0084B94 00571021 */  addu      $v0, $v0, $s7
-/* 389568 E0084B98 00621821 */  addu      $v1, $v1, $v0
-/* 38956C E0084B9C 3C02DE00 */  lui       $v0, 0xde00
-/* 389570 E0084BA0 ACA30004 */  sw        $v1, 4($a1)
-/* 389574 E0084BA4 AC820000 */  sw        $v0, ($a0)
-/* 389578 E0084BA8 8FC30000 */  lw        $v1, ($fp)
-/* 38957C E0084BAC 24820008 */  addiu     $v0, $a0, 8
-/* 389580 E0084BB0 AEA20000 */  sw        $v0, ($s5)
-/* 389584 E0084BB4 24020040 */  addiu     $v0, $zero, 0x40
-/* 389588 E0084BB8 AC860008 */  sw        $a2, 8($a0)
-/* 38958C E0084BBC AC82000C */  sw        $v0, 0xc($a0)
-/* 389590 E0084BC0 AC830004 */  sw        $v1, 4($a0)
-/* 389594 E0084BC4 8FAA00A8 */  lw        $t2, 0xa8($sp)
-/* 389598 E0084BC8 26100050 */  addiu     $s0, $s0, 0x50
-/* 38959C E0084BCC 8D420008 */  lw        $v0, 8($t2)
-/* 3895A0 E0084BD0 24840010 */  addiu     $a0, $a0, 0x10
-/* 3895A4 E0084BD4 0242102A */  slt       $v0, $s2, $v0
-/* 3895A8 E0084BD8 1440FFBB */  bnez      $v0, .LE0084AC8
-/* 3895AC E0084BDC AEA40000 */   sw       $a0, ($s5)
-.LE0084BE0:
-/* 3895B0 E0084BE0 3C08800A */  lui       $t0, %hi(gMasterGfxPos)
-/* 3895B4 E0084BE4 2508A66C */  addiu     $t0, $t0, %lo(gMasterGfxPos)
-/* 3895B8 E0084BE8 8D030000 */  lw        $v1, ($t0)
-/* 3895BC E0084BEC 3C02DE00 */  lui       $v0, 0xde00
-/* 3895C0 E0084BF0 0060202D */  daddu     $a0, $v1, $zero
-/* 3895C4 E0084BF4 AC820000 */  sw        $v0, ($a0)
-/* 3895C8 E0084BF8 8FAA0064 */  lw        $t2, 0x64($sp)
-/* 3895CC E0084BFC AC8A0004 */  sw        $t2, 4($a0)
-/* 3895D0 E0084C00 8FAA00A8 */  lw        $t2, 0xa8($sp)
-/* 3895D4 E0084C04 24120001 */  addiu     $s2, $zero, 1
-/* 3895D8 E0084C08 8D51000C */  lw        $s1, 0xc($t2)
-/* 3895DC E0084C0C 24630008 */  addiu     $v1, $v1, 8
-/* 3895E0 E0084C10 AD030000 */  sw        $v1, ($t0)
-/* 3895E4 E0084C14 8D420008 */  lw        $v0, 8($t2)
-/* 3895E8 E0084C18 0242102A */  slt       $v0, $s2, $v0
-/* 3895EC E0084C1C 10400062 */  beqz      $v0, .LE0084DA8
-/* 3895F0 E0084C20 26310050 */   addiu    $s1, $s1, 0x50
-/* 3895F4 E0084C24 0100982D */  daddu     $s3, $t0, $zero
-/* 3895F8 E0084C28 4480A000 */  mtc1      $zero, $f20
-/* 3895FC E0084C2C 3C17800B */  lui       $s7, %hi(gCameras)
-/* 389600 E0084C30 26F71D80 */  addiu     $s7, $s7, %lo(gCameras)
-/* 389604 E0084C34 3C16800A */  lui       $s6, %hi(gDisplayContext)
-/* 389608 E0084C38 26D6A674 */  addiu     $s6, $s6, %lo(gDisplayContext)
-/* 38960C E0084C3C 3C158007 */  lui       $s5, %hi(gMatrixListPos)
-/* 389610 E0084C40 26B541F0 */  addiu     $s5, $s5, %lo(gMatrixListPos)
-/* 389614 E0084C44 3C140001 */  lui       $s4, 1
-/* 389618 E0084C48 36941630 */  ori       $s4, $s4, 0x1630
-/* 38961C E0084C4C 26300010 */  addiu     $s0, $s1, 0x10
-.LE0084C50:
-/* 389620 E0084C50 8E680000 */  lw        $t0, ($s3)
-/* 389624 E0084C54 3C02FA00 */  lui       $v0, 0xfa00
-/* 389628 E0084C58 0100482D */  daddu     $t1, $t0, $zero
-/* 38962C E0084C5C AD220000 */  sw        $v0, ($t1)
-/* 389630 E0084C60 8E03003C */  lw        $v1, 0x3c($s0)
-/* 389634 E0084C64 8FAA0068 */  lw        $t2, 0x68($sp)
-/* 389638 E0084C68 006A0018 */  mult      $v1, $t2
-/* 38963C E0084C6C 00001812 */  mflo      $v1
-/* 389640 E0084C70 3C028080 */  lui       $v0, 0x8080
-/* 389644 E0084C74 34428081 */  ori       $v0, $v0, 0x8081
-/* 389648 E0084C78 00620018 */  mult      $v1, $v0
-/* 38964C E0084C7C 4405A000 */  mfc1      $a1, $f20
-/* 389650 E0084C80 4407A000 */  mfc1      $a3, $f20
-/* 389654 E0084C84 3C068007 */  lui       $a2, %hi(gCurrentCameraID)
-/* 389658 E0084C88 8CC67410 */  lw        $a2, %lo(gCurrentCameraID)($a2)
-/* 38965C E0084C8C 00001010 */  mfhi      $v0
-/* 389660 E0084C90 00431021 */  addu      $v0, $v0, $v1
-/* 389664 E0084C94 000211C3 */  sra       $v0, $v0, 7
-/* 389668 E0084C98 00031FC3 */  sra       $v1, $v1, 0x1f
-/* 38966C E0084C9C 00431023 */  subu      $v0, $v0, $v1
-/* 389670 E0084CA0 2403FF00 */  addiu     $v1, $zero, -0x100
-/* 389674 E0084CA4 00431025 */  or        $v0, $v0, $v1
-/* 389678 E0084CA8 AD220004 */  sw        $v0, 4($t1)
-/* 38967C E0084CAC 00061080 */  sll       $v0, $a2, 2
-/* 389680 E0084CB0 00461021 */  addu      $v0, $v0, $a2
-/* 389684 E0084CB4 00021080 */  sll       $v0, $v0, 2
-/* 389688 E0084CB8 00461023 */  subu      $v0, $v0, $a2
-/* 38968C E0084CBC 000218C0 */  sll       $v1, $v0, 3
-/* 389690 E0084CC0 00431021 */  addu      $v0, $v0, $v1
-/* 389694 E0084CC4 000210C0 */  sll       $v0, $v0, 3
-/* 389698 E0084CC8 00571021 */  addu      $v0, $v0, $s7
-/* 38969C E0084CCC C442006C */  lwc1      $f2, 0x6c($v0)
-/* 3896A0 E0084CD0 E7B60010 */  swc1      $f22, 0x10($sp)
-/* 3896A4 E0084CD4 C600FFF8 */  lwc1      $f0, -8($s0)
-/* 3896A8 E0084CD8 25080008 */  addiu     $t0, $t0, 8
-/* 3896AC E0084CDC AE680000 */  sw        $t0, ($s3)
-/* 3896B0 E0084CE0 46001087 */  neg.s     $f2, $f2
-/* 3896B4 E0084CE4 E7A00014 */  swc1      $f0, 0x14($sp)
-/* 3896B8 E0084CE8 C600FFFC */  lwc1      $f0, -4($s0)
-/* 3896BC E0084CEC 44061000 */  mfc1      $a2, $f2
-/* 3896C0 E0084CF0 27A40020 */  addiu     $a0, $sp, 0x20
-/* 3896C4 E0084CF4 E7A00018 */  swc1      $f0, 0x18($sp)
-/* 3896C8 E0084CF8 C6000000 */  lwc1      $f0, ($s0)
-/* 3896CC E0084CFC 26520001 */  addiu     $s2, $s2, 1
-/* 3896D0 E0084D00 0C080180 */  jal       shim_guPositionF
-/* 3896D4 E0084D04 E7A0001C */   swc1     $f0, 0x1c($sp)
-/* 3896D8 E0084D08 27A40020 */  addiu     $a0, $sp, 0x20
-/* 3896DC E0084D0C 96A50000 */  lhu       $a1, ($s5)
-/* 3896E0 E0084D10 8EC20000 */  lw        $v0, ($s6)
-/* 3896E4 E0084D14 00052980 */  sll       $a1, $a1, 6
-/* 3896E8 E0084D18 00B42821 */  addu      $a1, $a1, $s4
-/* 3896EC E0084D1C 0C080118 */  jal       shim_guMtxF2L
-/* 3896F0 E0084D20 00452821 */   addu     $a1, $v0, $a1
-/* 3896F4 E0084D24 3C06D838 */  lui       $a2, 0xd838
-/* 3896F8 E0084D28 8E640000 */  lw        $a0, ($s3)
-/* 3896FC E0084D2C 34C60002 */  ori       $a2, $a2, 2
-/* 389700 E0084D30 0080282D */  daddu     $a1, $a0, $zero
-/* 389704 E0084D34 24840008 */  addiu     $a0, $a0, 8
-/* 389708 E0084D38 AE640000 */  sw        $a0, ($s3)
-/* 38970C E0084D3C 96A20000 */  lhu       $v0, ($s5)
-/* 389710 E0084D40 3C03DA38 */  lui       $v1, 0xda38
-/* 389714 E0084D44 ACA30000 */  sw        $v1, ($a1)
-/* 389718 E0084D48 24430001 */  addiu     $v1, $v0, 1
-/* 38971C E0084D4C 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 389720 E0084D50 00021180 */  sll       $v0, $v0, 6
-/* 389724 E0084D54 A6A30000 */  sh        $v1, ($s5)
-/* 389728 E0084D58 8EC30000 */  lw        $v1, ($s6)
-/* 38972C E0084D5C 00541021 */  addu      $v0, $v0, $s4
-/* 389730 E0084D60 00621821 */  addu      $v1, $v1, $v0
-/* 389734 E0084D64 24820008 */  addiu     $v0, $a0, 8
-/* 389738 E0084D68 ACA30004 */  sw        $v1, 4($a1)
-/* 38973C E0084D6C AE620000 */  sw        $v0, ($s3)
-/* 389740 E0084D70 3C02DE00 */  lui       $v0, 0xde00
-/* 389744 E0084D74 AC820000 */  sw        $v0, ($a0)
-/* 389748 E0084D78 8FAA0060 */  lw        $t2, 0x60($sp)
-/* 38974C E0084D7C 24020040 */  addiu     $v0, $zero, 0x40
-/* 389750 E0084D80 AC860008 */  sw        $a2, 8($a0)
-/* 389754 E0084D84 AC82000C */  sw        $v0, 0xc($a0)
-/* 389758 E0084D88 AC8A0004 */  sw        $t2, 4($a0)
-/* 38975C E0084D8C 8FAA00A8 */  lw        $t2, 0xa8($sp)
-/* 389760 E0084D90 26100050 */  addiu     $s0, $s0, 0x50
-/* 389764 E0084D94 8D420008 */  lw        $v0, 8($t2)
-/* 389768 E0084D98 24840010 */  addiu     $a0, $a0, 0x10
-/* 38976C E0084D9C 0242102A */  slt       $v0, $s2, $v0
-/* 389770 E0084DA0 1440FFAB */  bnez      $v0, .LE0084C50
-/* 389774 E0084DA4 AE640000 */   sw       $a0, ($s3)
-.LE0084DA8:
-/* 389778 E0084DA8 3C05D838 */  lui       $a1, 0xd838
-/* 38977C E0084DAC 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* 389780 E0084DB0 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* 389784 E0084DB4 8C620000 */  lw        $v0, ($v1)
-/* 389788 E0084DB8 34A50002 */  ori       $a1, $a1, 2
-/* 38978C E0084DBC 0040202D */  daddu     $a0, $v0, $zero
-/* 389790 E0084DC0 24420008 */  addiu     $v0, $v0, 8
-/* 389794 E0084DC4 AC620000 */  sw        $v0, ($v1)
-/* 389798 E0084DC8 24020040 */  addiu     $v0, $zero, 0x40
-/* 38979C E0084DCC AC850000 */  sw        $a1, ($a0)
-/* 3897A0 E0084DD0 AC820004 */  sw        $v0, 4($a0)
-/* 3897A4 E0084DD4 8FBF0094 */  lw        $ra, 0x94($sp)
-/* 3897A8 E0084DD8 8FBE0090 */  lw        $fp, 0x90($sp)
-/* 3897AC E0084DDC 8FB7008C */  lw        $s7, 0x8c($sp)
-/* 3897B0 E0084DE0 8FB60088 */  lw        $s6, 0x88($sp)
-/* 3897B4 E0084DE4 8FB50084 */  lw        $s5, 0x84($sp)
-/* 3897B8 E0084DE8 8FB40080 */  lw        $s4, 0x80($sp)
-/* 3897BC E0084DEC 8FB3007C */  lw        $s3, 0x7c($sp)
-/* 3897C0 E0084DF0 8FB20078 */  lw        $s2, 0x78($sp)
-/* 3897C4 E0084DF4 8FB10074 */  lw        $s1, 0x74($sp)
-/* 3897C8 E0084DF8 8FB00070 */  lw        $s0, 0x70($sp)
-/* 3897CC E0084DFC D7B600A0 */  ldc1      $f22, 0xa0($sp)
-/* 3897D0 E0084E00 D7B40098 */  ldc1      $f20, 0x98($sp)
-/* 3897D4 E0084E04 03E00008 */  jr        $ra
-/* 3897D8 E0084E08 27BD00A8 */   addiu    $sp, $sp, 0xa8
-/* 3897DC E0084E0C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_main.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_main.s
deleted file mode 100644
index 8fc9fdaa5e..0000000000
--- a/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_main.s
+++ /dev/null
@@ -1,409 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_E0084E40
-.double 0.05
-
-dlabel D_E0084E48
-.double 0.2
-
-.section .text
-
-glabel bombette_breaking_main
-/* 388A54 E0084084 27BDFF48 */  addiu     $sp, $sp, -0xb8
-/* 388A58 E0084088 AFB5007C */  sw        $s5, 0x7c($sp)
-/* 388A5C E008408C 0080A82D */  daddu     $s5, $a0, $zero
-/* 388A60 E0084090 30A4FFFF */  andi      $a0, $a1, 0xffff
-/* 388A64 E0084094 27A20044 */  addiu     $v0, $sp, 0x44
-/* 388A68 E0084098 AFA20010 */  sw        $v0, 0x10($sp)
-/* 388A6C E008409C 27A20048 */  addiu     $v0, $sp, 0x48
-/* 388A70 E00840A0 AFA20014 */  sw        $v0, 0x14($sp)
-/* 388A74 E00840A4 27A2004C */  addiu     $v0, $sp, 0x4c
-/* 388A78 E00840A8 AFB60080 */  sw        $s6, 0x80($sp)
-/* 388A7C E00840AC 00C0B02D */  daddu     $s6, $a2, $zero
-/* 388A80 E00840B0 27A50038 */  addiu     $a1, $sp, 0x38
-/* 388A84 E00840B4 27A6003C */  addiu     $a2, $sp, 0x3c
-/* 388A88 E00840B8 F7B60090 */  sdc1      $f22, 0x90($sp)
-/* 388A8C E00840BC 4487B000 */  mtc1      $a3, $f22
-/* 388A90 E00840C0 27A70040 */  addiu     $a3, $sp, 0x40
-/* 388A94 E00840C4 AFBF0084 */  sw        $ra, 0x84($sp)
-/* 388A98 E00840C8 AFB40078 */  sw        $s4, 0x78($sp)
-/* 388A9C E00840CC AFB30074 */  sw        $s3, 0x74($sp)
-/* 388AA0 E00840D0 AFB20070 */  sw        $s2, 0x70($sp)
-/* 388AA4 E00840D4 AFB1006C */  sw        $s1, 0x6c($sp)
-/* 388AA8 E00840D8 AFB00068 */  sw        $s0, 0x68($sp)
-/* 388AAC E00840DC F7BE00B0 */  sdc1      $f30, 0xb0($sp)
-/* 388AB0 E00840E0 F7BC00A8 */  sdc1      $f28, 0xa8($sp)
-/* 388AB4 E00840E4 F7BA00A0 */  sdc1      $f26, 0xa0($sp)
-/* 388AB8 E00840E8 F7B80098 */  sdc1      $f24, 0x98($sp)
-/* 388ABC E00840EC F7B40088 */  sdc1      $f20, 0x88($sp)
-/* 388AC0 E00840F0 0C021000 */  jal       func_E0084000
-/* 388AC4 E00840F4 AFA20018 */   sw       $v0, 0x18($sp)
-/* 388AC8 E00840F8 C7A80044 */  lwc1      $f8, 0x44($sp)
-/* 388ACC E00840FC 3C013D80 */  lui       $at, 0x3d80
-/* 388AD0 E0084100 44810000 */  mtc1      $at, $f0
-/* 388AD4 E0084104 00000000 */  nop
-/* 388AD8 E0084108 46004182 */  mul.s     $f6, $f8, $f0
-/* 388ADC E008410C 00000000 */  nop
-/* 388AE0 E0084110 C7AA0048 */  lwc1      $f10, 0x48($sp)
-/* 388AE4 E0084114 46005102 */  mul.s     $f4, $f10, $f0
-/* 388AE8 E0084118 00000000 */  nop
-/* 388AEC E008411C C7AC004C */  lwc1      $f12, 0x4c($sp)
-/* 388AF0 E0084120 46006002 */  mul.s     $f0, $f12, $f0
-/* 388AF4 E0084124 00000000 */  nop
-/* 388AF8 E0084128 3C013F80 */  lui       $at, 0x3f80
-/* 388AFC E008412C 44811000 */  mtc1      $at, $f2
-/* 388B00 E0084130 00000000 */  nop
-/* 388B04 E0084134 46023180 */  add.s     $f6, $f6, $f2
-/* 388B08 E0084138 27B00020 */  addiu     $s0, $sp, 0x20
-/* 388B0C E008413C 46022100 */  add.s     $f4, $f4, $f2
-/* 388B10 E0084140 4600470D */  trunc.w.s $f28, $f8
-/* 388B14 E0084144 4403E000 */  mfc1      $v1, $f28
-/* 388B18 E0084148 46020000 */  add.s     $f0, $f0, $f2
-/* 388B1C E008414C 4600370D */  trunc.w.s $f28, $f6
-/* 388B20 E0084150 4412E000 */  mfc1      $s2, $f28
-/* 388B24 E0084154 4600270D */  trunc.w.s $f28, $f4
-/* 388B28 E0084158 4413E000 */  mfc1      $s3, $f28
-/* 388B2C E008415C 4600070D */  trunc.w.s $f28, $f0
-/* 388B30 E0084160 4411E000 */  mfc1      $s1, $f28
-/* 388B34 E0084164 04610002 */  bgez      $v1, .LE0084170
-/* 388B38 E0084168 0060102D */   daddu    $v0, $v1, $zero
-/* 388B3C E008416C 2462000F */  addiu     $v0, $v1, 0xf
-.LE0084170:
-/* 388B40 E0084170 00021103 */  sra       $v0, $v0, 4
-/* 388B44 E0084174 00021100 */  sll       $v0, $v0, 4
-/* 388B48 E0084178 00621023 */  subu      $v0, $v1, $v0
-/* 388B4C E008417C 4482A000 */  mtc1      $v0, $f20
-/* 388B50 E0084180 00000000 */  nop
-/* 388B54 E0084184 4680A520 */  cvt.s.w   $f20, $f20
-/* 388B58 E0084188 4600570D */  trunc.w.s $f28, $f10
-/* 388B5C E008418C 4403E000 */  mfc1      $v1, $f28
-/* 388B60 E0084190 00000000 */  nop
-/* 388B64 E0084194 04610002 */  bgez      $v1, .LE00841A0
-/* 388B68 E0084198 0060102D */   daddu    $v0, $v1, $zero
-/* 388B6C E008419C 2462000F */  addiu     $v0, $v1, 0xf
-.LE00841A0:
-/* 388B70 E00841A0 00021103 */  sra       $v0, $v0, 4
-/* 388B74 E00841A4 00021100 */  sll       $v0, $v0, 4
-/* 388B78 E00841A8 00621023 */  subu      $v0, $v1, $v0
-/* 388B7C E00841AC 4482F000 */  mtc1      $v0, $f30
-/* 388B80 E00841B0 00000000 */  nop
-/* 388B84 E00841B4 4680F7A0 */  cvt.s.w   $f30, $f30
-/* 388B88 E00841B8 3C013FE0 */  lui       $at, 0x3fe0
-/* 388B8C E00841BC 44810800 */  mtc1      $at, $f1
-/* 388B90 E00841C0 44800000 */  mtc1      $zero, $f0
-/* 388B94 E00841C4 4600A121 */  cvt.d.s   $f4, $f20
-/* 388B98 E00841C8 46202102 */  mul.d     $f4, $f4, $f0
-/* 388B9C E00841CC 00000000 */  nop
-/* 388BA0 E00841D0 4600F0A1 */  cvt.d.s   $f2, $f30
-/* 388BA4 E00841D4 46201082 */  mul.d     $f2, $f2, $f0
-/* 388BA8 E00841D8 00000000 */  nop
-/* 388BAC E00841DC 0200202D */  daddu     $a0, $s0, $zero
-/* 388BB0 E00841E0 3C02E008 */  lui       $v0, %hi(bombette_breaking_init)
-/* 388BB4 E00841E4 24424658 */  addiu     $v0, $v0, %lo(bombette_breaking_init)
-/* 388BB8 E00841E8 AFA20028 */  sw        $v0, 0x28($sp)
-/* 388BBC E00841EC 02530018 */  mult      $s2, $s3
-/* 388BC0 E00841F0 3C02E008 */  lui       $v0, %hi(bombette_breaking_update)
-/* 388BC4 E00841F4 24424660 */  addiu     $v0, $v0, %lo(bombette_breaking_update)
-/* 388BC8 E00841F8 AFA2002C */  sw        $v0, 0x2c($sp)
-/* 388BCC E00841FC 3C02E008 */  lui       $v0, %hi(bombette_breaking_render)
-/* 388BD0 E0084200 244248E4 */  addiu     $v0, $v0, %lo(bombette_breaking_render)
-/* 388BD4 E0084204 AFA20030 */  sw        $v0, 0x30($sp)
-/* 388BD8 E0084208 00004012 */  mflo      $t0
-/* 388BDC E008420C 24020042 */  addiu     $v0, $zero, 0x42
-/* 388BE0 E0084210 AFA00020 */  sw        $zero, 0x20($sp)
-/* 388BE4 E0084214 01110018 */  mult      $t0, $s1
-/* 388BE8 E0084218 AFA00034 */  sw        $zero, 0x34($sp)
-/* 388BEC E008421C AFA20024 */  sw        $v0, 0x24($sp)
-/* 388BF0 E0084220 46202520 */  cvt.s.d   $f20, $f4
-/* 388BF4 E0084224 462017A0 */  cvt.s.d   $f30, $f2
-/* 388BF8 E0084228 00004012 */  mflo      $t0
-/* 388BFC E008422C 0C080124 */  jal       shim_create_effect_instance
-/* 388C00 E0084230 25100001 */   addiu    $s0, $t0, 1
-/* 388C04 E0084234 00102080 */  sll       $a0, $s0, 2
-/* 388C08 E0084238 00902021 */  addu      $a0, $a0, $s0
-/* 388C0C E008423C 00042100 */  sll       $a0, $a0, 4
-/* 388C10 E0084240 0040A02D */  daddu     $s4, $v0, $zero
-/* 388C14 E0084244 0C08012C */  jal       shim_general_heap_malloc
-/* 388C18 E0084248 AE900008 */   sw       $s0, 8($s4)
-/* 388C1C E008424C 0040202D */  daddu     $a0, $v0, $zero
-/* 388C20 E0084250 14800003 */  bnez      $a0, .LE0084260
-/* 388C24 E0084254 AE84000C */   sw       $a0, 0xc($s4)
-.LE0084258:
-/* 388C28 E0084258 08021096 */  j         .LE0084258
-/* 388C2C E008425C 00000000 */   nop
-.LE0084260:
-/* 388C30 E0084260 C7A00048 */  lwc1      $f0, 0x48($sp)
-/* 388C34 E0084264 3C013FE0 */  lui       $at, 0x3fe0
-/* 388C38 E0084268 44815800 */  mtc1      $at, $f11
-/* 388C3C E008426C 44805000 */  mtc1      $zero, $f10
-/* 388C40 E0084270 46000107 */  neg.s     $f4, $f0
-/* 388C44 E0084274 46002121 */  cvt.d.s   $f4, $f4
-/* 388C48 E0084278 462A2102 */  mul.d     $f4, $f4, $f10
-/* 388C4C E008427C 00000000 */  nop
-/* 388C50 E0084280 8FA200CC */  lw        $v0, 0xcc($sp)
-/* 388C54 E0084284 3C01E008 */  lui       $at, %hi(D_E0084E40)
-/* 388C58 E0084288 D4224E40 */  ldc1      $f2, %lo(D_E0084E40)($at)
-/* 388C5C E008428C AC800048 */  sw        $zero, 0x48($a0)
-/* 388C60 E0084290 A4950000 */  sh        $s5, ($a0)
-/* 388C64 E0084294 E4960038 */  swc1      $f22, 0x38($a0)
-/* 388C68 E0084298 46000021 */  cvt.d.s   $f0, $f0
-/* 388C6C E008429C 46220002 */  mul.d     $f0, $f0, $f2
-/* 388C70 E00842A0 00000000 */  nop
-/* 388C74 E00842A4 AC820044 */  sw        $v0, 0x44($a0)
-/* 388C78 E00842A8 C7A20038 */  lwc1      $f2, 0x38($sp)
-/* 388C7C E00842AC 240200FF */  addiu     $v0, $zero, 0xff
-/* 388C80 E00842B0 AC82004C */  sw        $v0, 0x4c($a0)
-/* 388C84 E00842B4 A4960002 */  sh        $s6, 2($a0)
-/* 388C88 E00842B8 E4820008 */  swc1      $f2, 8($a0)
-/* 388C8C E00842BC C7A2003C */  lwc1      $f2, 0x3c($sp)
-/* 388C90 E00842C0 C7A60040 */  lwc1      $f6, 0x40($sp)
-/* 388C94 E00842C4 4616B200 */  add.s     $f8, $f22, $f22
-/* 388C98 E00842C8 E482000C */  swc1      $f2, 0xc($a0)
-/* 388C9C E00842CC 3C013F80 */  lui       $at, 0x3f80
-/* 388CA0 E00842D0 44811000 */  mtc1      $at, $f2
-/* 388CA4 E00842D4 E488003C */  swc1      $f8, 0x3c($a0)
-/* 388CA8 E00842D8 E4860010 */  swc1      $f6, 0x10($a0)
-/* 388CAC E00842DC 46200020 */  cvt.s.d   $f0, $f0
-/* 388CB0 E00842E0 46202120 */  cvt.s.d   $f4, $f4
-/* 388CB4 E00842E4 4602003C */  c.lt.s    $f0, $f2
-/* 388CB8 E00842E8 E4840004 */  swc1      $f4, 4($a0)
-/* 388CBC E00842EC 45000002 */  bc1f      .LE00842F8
-/* 388CC0 E00842F0 E4800040 */   swc1     $f0, 0x40($a0)
-/* 388CC4 E00842F4 E4820040 */  swc1      $f2, 0x40($a0)
-.LE00842F8:
-/* 388CC8 E00842F8 24840050 */  addiu     $a0, $a0, 0x50
-/* 388CCC E00842FC 1A4000C5 */  blez      $s2, .LE0084614
-/* 388CD0 E0084300 0000382D */   daddu    $a3, $zero, $zero
-/* 388CD4 E0084304 C7BA0044 */  lwc1      $f26, 0x44($sp)
-/* 388CD8 E0084308 46205486 */  mov.d     $f18, $f10
-/* 388CDC E008430C 4600D0A1 */  cvt.d.s   $f2, $f26
-/* 388CE0 E0084310 46321082 */  mul.d     $f2, $f2, $f18
-/* 388CE4 E0084314 00000000 */  nop
-/* 388CE8 E0084318 C7BC0048 */  lwc1      $f28, 0x48($sp)
-/* 388CEC E008431C C7B6004C */  lwc1      $f22, 0x4c($sp)
-/* 388CF0 E0084320 3C01E008 */  lui       $at, %hi(D_E0084E48)
-/* 388CF4 E0084324 D42C4E48 */  ldc1      $f12, %lo(D_E0084E48)($at)
-/* 388CF8 E0084328 4480C000 */  mtc1      $zero, $f24
-/* 388CFC E008432C 4600A021 */  cvt.d.s   $f0, $f20
-/* 388D00 E0084330 E7BC0058 */  swc1      $f28, 0x58($sp)
-/* 388D04 E0084334 46220001 */  sub.d     $f0, $f0, $f2
-/* 388D08 E0084338 F7A00050 */  sdc1      $f0, 0x50($sp)
-.LE008433C:
-/* 388D0C E008433C 3C014180 */  lui       $at, 0x4180
-/* 388D10 E0084340 4481E000 */  mtc1      $at, $f28
-/* 388D14 E0084344 44870000 */  mtc1      $a3, $f0
-/* 388D18 E0084348 00000000 */  nop
-/* 388D1C E008434C 46800020 */  cvt.s.w   $f0, $f0
-/* 388D20 E0084350 461C0002 */  mul.s     $f0, $f0, $f28
-/* 388D24 E0084354 00000000 */  nop
-/* 388D28 E0084358 D7BC0050 */  ldc1      $f28, 0x50($sp)
-/* 388D2C E008435C 46000021 */  cvt.d.s   $f0, $f0
-/* 388D30 E0084360 4620E000 */  add.d     $f0, $f28, $f0
-/* 388D34 E0084364 0000302D */  daddu     $a2, $zero, $zero
-/* 388D38 E0084368 46200020 */  cvt.s.d   $f0, $f0
-/* 388D3C E008436C 1A6000A5 */  blez      $s3, .LE0084604
-/* 388D40 E0084370 E7A00038 */   swc1     $f0, 0x38($sp)
-/* 388D44 E0084374 C7BC0058 */  lwc1      $f28, 0x58($sp)
-/* 388D48 E0084378 4600E0A1 */  cvt.d.s   $f2, $f28
-/* 388D4C E008437C 46321082 */  mul.d     $f2, $f2, $f18
-/* 388D50 E0084380 00000000 */  nop
-/* 388D54 E0084384 46000186 */  mov.s     $f6, $f0
-/* 388D58 E0084388 4600F021 */  cvt.d.s   $f0, $f30
-/* 388D5C E008438C 46220001 */  sub.d     $f0, $f0, $f2
-/* 388D60 E0084390 F7A00060 */  sdc1      $f0, 0x60($sp)
-.LE0084394:
-/* 388D64 E0084394 3C014180 */  lui       $at, 0x4180
-/* 388D68 E0084398 4481E000 */  mtc1      $at, $f28
-/* 388D6C E008439C 44860000 */  mtc1      $a2, $f0
-/* 388D70 E00843A0 00000000 */  nop
-/* 388D74 E00843A4 46800020 */  cvt.s.w   $f0, $f0
-/* 388D78 E00843A8 461C0002 */  mul.s     $f0, $f0, $f28
-/* 388D7C E00843AC 00000000 */  nop
-/* 388D80 E00843B0 D7BC0060 */  ldc1      $f28, 0x60($sp)
-/* 388D84 E00843B4 46000021 */  cvt.d.s   $f0, $f0
-/* 388D88 E00843B8 4620E000 */  add.d     $f0, $f28, $f0
-/* 388D8C E00843BC 0000282D */  daddu     $a1, $zero, $zero
-/* 388D90 E00843C0 46200020 */  cvt.s.d   $f0, $f0
-/* 388D94 E00843C4 1A20008B */  blez      $s1, .LE00845F4
-/* 388D98 E00843C8 E7A0003C */   swc1     $f0, 0x3c($sp)
-/* 388D9C E00843CC 4600B0A1 */  cvt.d.s   $f2, $f22
-/* 388DA0 E00843D0 46321082 */  mul.d     $f2, $f2, $f18
-/* 388DA4 E00843D4 00000000 */  nop
-/* 388DA8 E00843D8 46000286 */  mov.s     $f10, $f0
-/* 388DAC E00843DC 2483004C */  addiu     $v1, $a0, 0x4c
-/* 388DB0 E00843E0 4600F021 */  cvt.d.s   $f0, $f30
-/* 388DB4 E00843E4 3C01BFF0 */  lui       $at, 0xbff0
-/* 388DB8 E00843E8 44818800 */  mtc1      $at, $f17
-/* 388DBC E00843EC 44808000 */  mtc1      $zero, $f16
-/* 388DC0 E00843F0 3C013FF0 */  lui       $at, 0x3ff0
-/* 388DC4 E00843F4 44817800 */  mtc1      $at, $f15
-/* 388DC8 E00843F8 44807000 */  mtc1      $zero, $f14
-/* 388DCC E00843FC 44804000 */  mtc1      $zero, $f8
-/* 388DD0 E0084400 44804800 */  mtc1      $zero, $f9
-/* 388DD4 E0084404 46220501 */  sub.d     $f20, $f0, $f2
-.LE0084408:
-/* 388DD8 E0084408 3C014180 */  lui       $at, 0x4180
-/* 388DDC E008440C 4481E000 */  mtc1      $at, $f28
-/* 388DE0 E0084410 44850000 */  mtc1      $a1, $f0
-/* 388DE4 E0084414 00000000 */  nop
-/* 388DE8 E0084418 46800020 */  cvt.s.w   $f0, $f0
-/* 388DEC E008441C 461C0002 */  mul.s     $f0, $f0, $f28
-/* 388DF0 E0084420 00000000 */  nop
-/* 388DF4 E0084424 4616D03C */  c.lt.s    $f26, $f22
-/* 388DF8 E0084428 E466FFC8 */  swc1      $f6, -0x38($v1)
-/* 388DFC E008442C E466FFBC */  swc1      $f6, -0x44($v1)
-/* 388E00 E0084430 46000021 */  cvt.d.s   $f0, $f0
-/* 388E04 E0084434 4620A000 */  add.d     $f0, $f20, $f0
-/* 388E08 E0084438 E46AFFCC */  swc1      $f10, -0x34($v1)
-/* 388E0C E008443C E46AFFC0 */  swc1      $f10, -0x40($v1)
-/* 388E10 E0084440 46200020 */  cvt.s.d   $f0, $f0
-/* 388E14 E0084444 E7A00040 */  swc1      $f0, 0x40($sp)
-/* 388E18 E0084448 E460FFD0 */  swc1      $f0, -0x30($v1)
-/* 388E1C E008444C 45000017 */  bc1f      .LE00844AC
-/* 388E20 E0084450 E460FFC4 */   swc1     $f0, -0x3c($v1)
-/* 388E24 E0084454 2A420002 */  slti      $v0, $s2, 2
-/* 388E28 E0084458 5440000A */  bnel      $v0, $zero, .LE0084484
-/* 388E2C E008445C 30A20001 */   andi     $v0, $a1, 1
-/* 388E30 E0084460 4600D0A1 */  cvt.d.s   $f2, $f26
-/* 388E34 E0084464 46321082 */  mul.d     $f2, $f2, $f18
-/* 388E38 E0084468 00000000 */  nop
-/* 388E3C E008446C 46003021 */  cvt.d.s   $f0, $f6
-/* 388E40 E0084470 46220003 */  div.d     $f0, $f0, $f2
-/* 388E44 E0084474 46200000 */  add.d     $f0, $f0, $f0
-/* 388E48 E0084478 46200020 */  cvt.s.d   $f0, $f0
-/* 388E4C E008447C 08021129 */  j         .LE00844A4
-/* 388E50 E0084480 E460FFD4 */   swc1     $f0, -0x2c($v1)
-.LE0084484:
-/* 388E54 E0084484 3C01C000 */  lui       $at, 0xc000
-/* 388E58 E0084488 4481E000 */  mtc1      $at, $f28
-/* 388E5C E008448C 50400005 */  beql      $v0, $zero, .LE00844A4
-/* 388E60 E0084490 E47CFFD4 */   swc1     $f28, -0x2c($v1)
-/* 388E64 E0084494 3C014000 */  lui       $at, 0x4000
-/* 388E68 E0084498 4481E000 */  mtc1      $at, $f28
-/* 388E6C E008449C 00000000 */  nop
-/* 388E70 E00844A0 E47CFFD4 */  swc1      $f28, -0x2c($v1)
-.LE00844A4:
-/* 388E74 E00844A4 08021140 */  j         .LE0084500
-/* 388E78 E00844A8 AC60FFDC */   sw       $zero, -0x24($v1)
-.LE00844AC:
-/* 388E7C E00844AC 2A220002 */  slti      $v0, $s1, 2
-/* 388E80 E00844B0 1440000A */  bnez      $v0, .LE00844DC
-/* 388E84 E00844B4 AC60FFD4 */   sw       $zero, -0x2c($v1)
-/* 388E88 E00844B8 4600B0A1 */  cvt.d.s   $f2, $f22
-/* 388E8C E00844BC 46321082 */  mul.d     $f2, $f2, $f18
-/* 388E90 E00844C0 00000000 */  nop
-/* 388E94 E00844C4 46000021 */  cvt.d.s   $f0, $f0
-/* 388E98 E00844C8 46220003 */  div.d     $f0, $f0, $f2
-/* 388E9C E00844CC 46200000 */  add.d     $f0, $f0, $f0
-/* 388EA0 E00844D0 46200020 */  cvt.s.d   $f0, $f0
-/* 388EA4 E00844D4 08021140 */  j         .LE0084500
-/* 388EA8 E00844D8 E460FFDC */   swc1     $f0, -0x24($v1)
-.LE00844DC:
-/* 388EAC E00844DC 30E20001 */  andi      $v0, $a3, 1
-/* 388EB0 E00844E0 3C01C000 */  lui       $at, 0xc000
-/* 388EB4 E00844E4 4481E000 */  mtc1      $at, $f28
-/* 388EB8 E00844E8 50400005 */  beql      $v0, $zero, .LE0084500
-/* 388EBC E00844EC E47CFFDC */   swc1     $f28, -0x24($v1)
-/* 388EC0 E00844F0 3C014000 */  lui       $at, 0x4000
-/* 388EC4 E00844F4 4481E000 */  mtc1      $at, $f28
-/* 388EC8 E00844F8 00000000 */  nop
-/* 388ECC E00844FC E47CFFDC */  swc1      $f28, -0x24($v1)
-.LE0084500:
-/* 388ED0 E0084500 46005021 */  cvt.d.s   $f0, $f10
-/* 388ED4 E0084504 462C0002 */  mul.d     $f0, $f0, $f12
-/* 388ED8 E0084508 00000000 */  nop
-/* 388EDC E008450C C7A20040 */  lwc1      $f2, 0x40($sp)
-/* 388EE0 E0084510 4602303C */  c.lt.s    $f6, $f2
-/* 388EE4 E0084514 46200020 */  cvt.s.d   $f0, $f0
-/* 388EE8 E0084518 E460FFD8 */  swc1      $f0, -0x28($v1)
-/* 388EEC E008451C 46001021 */  cvt.d.s   $f0, $f2
-/* 388EF0 E0084520 462C0002 */  mul.d     $f0, $f0, $f12
-/* 388EF4 E0084524 00000000 */  nop
-/* 388EF8 E0084528 4500000D */  bc1f      .LE0084560
-/* 388EFC E008452C 2482002C */   addiu    $v0, $a0, 0x2c
-/* 388F00 E0084530 4618103C */  c.lt.s    $f2, $f24
-/* 388F04 E0084534 00000000 */  nop
-/* 388F08 E0084538 45000003 */  bc1f      .LE0084548
-/* 388F0C E008453C 00000000 */   nop
-/* 388F10 E0084540 08021159 */  j         .LE0084564
-/* 388F14 E0084544 46300080 */   add.d    $f2, $f0, $f16
-.LE0084548:
-/* 388F18 E0084548 4602C03C */  c.lt.s    $f24, $f2
-/* 388F1C E008454C 00000000 */  nop
-/* 388F20 E0084550 45020004 */  bc1fl     .LE0084564
-/* 388F24 E0084554 46280080 */   add.d    $f2, $f0, $f8
-/* 388F28 E0084558 08021159 */  j         .LE0084564
-/* 388F2C E008455C 462E0080 */   add.d    $f2, $f0, $f14
-.LE0084560:
-/* 388F30 E0084560 46280080 */  add.d     $f2, $f0, $f8
-.LE0084564:
-/* 388F34 E0084564 46005021 */  cvt.d.s   $f0, $f10
-/* 388F38 E0084568 462C0002 */  mul.d     $f0, $f0, $f12
-/* 388F3C E008456C 00000000 */  nop
-/* 388F40 E0084570 C7A40040 */  lwc1      $f4, 0x40($sp)
-/* 388F44 E0084574 462010A0 */  cvt.s.d   $f2, $f2
-/* 388F48 E0084578 E4420000 */  swc1      $f2, ($v0)
-/* 388F4C E008457C 4606203C */  c.lt.s    $f4, $f6
-/* 388F50 E0084580 46200020 */  cvt.s.d   $f0, $f0
-/* 388F54 E0084584 E460FFE4 */  swc1      $f0, -0x1c($v1)
-/* 388F58 E0084588 46003021 */  cvt.d.s   $f0, $f6
-/* 388F5C E008458C 462C0002 */  mul.d     $f0, $f0, $f12
-/* 388F60 E0084590 00000000 */  nop
-/* 388F64 E0084594 4500000D */  bc1f      .LE00845CC
-/* 388F68 E0084598 24820034 */   addiu    $v0, $a0, 0x34
-/* 388F6C E008459C 4618303C */  c.lt.s    $f6, $f24
-/* 388F70 E00845A0 00000000 */  nop
-/* 388F74 E00845A4 45000003 */  bc1f      .LE00845B4
-/* 388F78 E00845A8 00000000 */   nop
-/* 388F7C E00845AC 08021174 */  j         .LE00845D0
-/* 388F80 E00845B0 46300000 */   add.d    $f0, $f0, $f16
-.LE00845B4:
-/* 388F84 E00845B4 4606C03C */  c.lt.s    $f24, $f6
-/* 388F88 E00845B8 00000000 */  nop
-/* 388F8C E00845BC 45020004 */  bc1fl     .LE00845D0
-/* 388F90 E00845C0 46280000 */   add.d    $f0, $f0, $f8
-/* 388F94 E00845C4 08021174 */  j         .LE00845D0
-/* 388F98 E00845C8 462E0000 */   add.d    $f0, $f0, $f14
-.LE00845CC:
-/* 388F9C E00845CC 46280000 */  add.d     $f0, $f0, $f8
-.LE00845D0:
-/* 388FA0 E00845D0 46200020 */  cvt.s.d   $f0, $f0
-/* 388FA4 E00845D4 E4400000 */  swc1      $f0, ($v0)
-/* 388FA8 E00845D8 240200FF */  addiu     $v0, $zero, 0xff
-/* 388FAC E00845DC AC620000 */  sw        $v0, ($v1)
-/* 388FB0 E00845E0 24630050 */  addiu     $v1, $v1, 0x50
-/* 388FB4 E00845E4 24A50001 */  addiu     $a1, $a1, 1
-/* 388FB8 E00845E8 00B1102A */  slt       $v0, $a1, $s1
-/* 388FBC E00845EC 1440FF86 */  bnez      $v0, .LE0084408
-/* 388FC0 E00845F0 24840050 */   addiu    $a0, $a0, 0x50
-.LE00845F4:
-/* 388FC4 E00845F4 24C60001 */  addiu     $a2, $a2, 1
-/* 388FC8 E00845F8 00D3102A */  slt       $v0, $a2, $s3
-/* 388FCC E00845FC 1440FF65 */  bnez      $v0, .LE0084394
-/* 388FD0 E0084600 00000000 */   nop
-.LE0084604:
-/* 388FD4 E0084604 24E70001 */  addiu     $a3, $a3, 1
-/* 388FD8 E0084608 00F2102A */  slt       $v0, $a3, $s2
-/* 388FDC E008460C 1440FF4B */  bnez      $v0, .LE008433C
-/* 388FE0 E0084610 00000000 */   nop
-.LE0084614:
-/* 388FE4 E0084614 0280102D */  daddu     $v0, $s4, $zero
-/* 388FE8 E0084618 8FBF0084 */  lw        $ra, 0x84($sp)
-/* 388FEC E008461C 8FB60080 */  lw        $s6, 0x80($sp)
-/* 388FF0 E0084620 8FB5007C */  lw        $s5, 0x7c($sp)
-/* 388FF4 E0084624 8FB40078 */  lw        $s4, 0x78($sp)
-/* 388FF8 E0084628 8FB30074 */  lw        $s3, 0x74($sp)
-/* 388FFC E008462C 8FB20070 */  lw        $s2, 0x70($sp)
-/* 389000 E0084630 8FB1006C */  lw        $s1, 0x6c($sp)
-/* 389004 E0084634 8FB00068 */  lw        $s0, 0x68($sp)
-/* 389008 E0084638 D7BE00B0 */  ldc1      $f30, 0xb0($sp)
-/* 38900C E008463C D7BC00A8 */  ldc1      $f28, 0xa8($sp)
-/* 389010 E0084640 D7BA00A0 */  ldc1      $f26, 0xa0($sp)
-/* 389014 E0084644 D7B80098 */  ldc1      $f24, 0x98($sp)
-/* 389018 E0084648 D7B60090 */  ldc1      $f22, 0x90($sp)
-/* 38901C E008464C D7B40088 */  ldc1      $f20, 0x88($sp)
-/* 389020 E0084650 03E00008 */  jr        $ra
-/* 389024 E0084654 27BD00B8 */   addiu    $sp, $sp, 0xb8
diff --git a/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_update.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_update.s
deleted file mode 100644
index 1589a0e43b..0000000000
--- a/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_update.s
+++ /dev/null
@@ -1,194 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_E0084E50
-.double 0.1
-
-dlabel D_E0084E58
-.double 0.9
-
-dlabel D_E0084E60
-.double -0.7
-
-dlabel D_E0084E68
-.double 0.95
-
-dlabel D_E0084E70
-.double 0.4
-
-dlabel D_E0084E78
-.double -0.4
-
-.section .text
-
-glabel bombette_breaking_update
-/* 389030 E0084660 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 389034 E0084664 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 389038 E0084668 F7B80028 */  sdc1      $f24, 0x28($sp)
-/* 38903C E008466C F7B60020 */  sdc1      $f22, 0x20($sp)
-/* 389040 E0084670 F7B40018 */  sdc1      $f20, 0x18($sp)
-/* 389044 E0084674 8C85000C */  lw        $a1, 0xc($a0)
-/* 389048 E0084678 8CA20048 */  lw        $v0, 0x48($a1)
-/* 38904C E008467C 8CA30044 */  lw        $v1, 0x44($a1)
-/* 389050 E0084680 24420001 */  addiu     $v0, $v0, 1
-/* 389054 E0084684 2463FFFF */  addiu     $v1, $v1, -1
-/* 389058 E0084688 ACA20048 */  sw        $v0, 0x48($a1)
-/* 38905C E008468C 04610005 */  bgez      $v1, .LE00846A4
-/* 389060 E0084690 ACA30044 */   sw       $v1, 0x44($a1)
-/* 389064 E0084694 0C080128 */  jal       shim_remove_effect
-/* 389068 E0084698 00000000 */   nop
-/* 38906C E008469C 08021233 */  j         .LE00848CC
-/* 389070 E00846A0 00000000 */   nop
-.LE00846A4:
-/* 389074 E00846A4 44831000 */  mtc1      $v1, $f2
-/* 389078 E00846A8 00000000 */  nop
-/* 38907C E00846AC 468010A0 */  cvt.s.w   $f2, $f2
-/* 389080 E00846B0 3C0141C8 */  lui       $at, 0x41c8
-/* 389084 E00846B4 44810000 */  mtc1      $at, $f0
-/* 389088 E00846B8 C4AA0004 */  lwc1      $f10, 4($a1)
-/* 38908C E00846BC 4600103C */  c.lt.s    $f2, $f0
-/* 389090 E00846C0 00000000 */  nop
-/* 389094 E00846C4 45000008 */  bc1f      .LE00846E8
-/* 389098 E00846C8 00000000 */   nop
-/* 38909C E00846CC 3C014120 */  lui       $at, 0x4120
-/* 3890A0 E00846D0 44810000 */  mtc1      $at, $f0
-/* 3890A4 E00846D4 00000000 */  nop
-/* 3890A8 E00846D8 46001002 */  mul.s     $f0, $f2, $f0
-/* 3890AC E00846DC 00000000 */  nop
-/* 3890B0 E00846E0 4600060D */  trunc.w.s $f24, $f0
-/* 3890B4 E00846E4 E4B8004C */  swc1      $f24, 0x4c($a1)
-.LE00846E8:
-/* 3890B8 E00846E8 C4A20038 */  lwc1      $f2, 0x38($a1)
-/* 3890BC E00846EC C4A0003C */  lwc1      $f0, 0x3c($a1)
-/* 3890C0 E00846F0 46020001 */  sub.s     $f0, $f0, $f2
-/* 3890C4 E00846F4 3C01E008 */  lui       $at, %hi(D_E0084E50)
-/* 3890C8 E00846F8 D4244E50 */  ldc1      $f4, %lo(D_E0084E50)($at)
-/* 3890CC E00846FC 46000021 */  cvt.d.s   $f0, $f0
-/* 3890D0 E0084700 46240002 */  mul.d     $f0, $f0, $f4
-/* 3890D4 E0084704 00000000 */  nop
-/* 3890D8 E0084708 460010A1 */  cvt.d.s   $f2, $f2
-/* 3890DC E008470C 46201080 */  add.d     $f2, $f2, $f0
-/* 3890E0 E0084710 24060001 */  addiu     $a2, $zero, 1
-/* 3890E4 E0084714 462010A0 */  cvt.s.d   $f2, $f2
-/* 3890E8 E0084718 E4A20038 */  swc1      $f2, 0x38($a1)
-/* 3890EC E008471C 8C820008 */  lw        $v0, 8($a0)
-/* 3890F0 E0084720 00C2102A */  slt       $v0, $a2, $v0
-/* 3890F4 E0084724 10400069 */  beqz      $v0, .LE00848CC
-/* 3890F8 E0084728 24A50050 */   addiu    $a1, $a1, 0x50
-/* 3890FC E008472C 24A30030 */  addiu     $v1, $a1, 0x30
-/* 389100 E0084730 3C01E008 */  lui       $at, %hi(D_E0084E58)
-/* 389104 E0084734 D42C4E58 */  ldc1      $f12, %lo(D_E0084E58)($at)
-/* 389108 E0084738 44808000 */  mtc1      $zero, $f16
-/* 38910C E008473C 3C01E008 */  lui       $at, %hi(D_E0084E60)
-/* 389110 E0084740 D4364E60 */  ldc1      $f22, %lo(D_E0084E60)($at)
-/* 389114 E0084744 3C01E008 */  lui       $at, %hi(D_E0084E68)
-/* 389118 E0084748 D42E4E68 */  ldc1      $f14, %lo(D_E0084E68)($at)
-/* 38911C E008474C 3C01E008 */  lui       $at, %hi(D_E0084E70)
-/* 389120 E0084750 D4344E70 */  ldc1      $f20, %lo(D_E0084E70)($at)
-/* 389124 E0084754 3C01E008 */  lui       $at, %hi(D_E0084E78)
-/* 389128 E0084758 D4324E78 */  ldc1      $f18, %lo(D_E0084E78)($at)
-.LE008475C:
-/* 38912C E008475C C460FFF0 */  lwc1      $f0, -0x10($v1)
-/* 389130 E0084760 46000021 */  cvt.d.s   $f0, $f0
-/* 389134 E0084764 462C0002 */  mul.d     $f0, $f0, $f12
-/* 389138 E0084768 00000000 */  nop
-/* 38913C E008476C C462FFF4 */  lwc1      $f2, -0xc($v1)
-/* 389140 E0084770 460010A1 */  cvt.d.s   $f2, $f2
-/* 389144 E0084774 462C1082 */  mul.d     $f2, $f2, $f12
-/* 389148 E0084778 00000000 */  nop
-/* 38914C E008477C C464FFF8 */  lwc1      $f4, -8($v1)
-/* 389150 E0084780 46002121 */  cvt.d.s   $f4, $f4
-/* 389154 E0084784 462C2102 */  mul.d     $f4, $f4, $f12
-/* 389158 E0084788 00000000 */  nop
-/* 38915C E008478C C468FFD8 */  lwc1      $f8, -0x28($v1)
-/* 389160 E0084790 C466FFDC */  lwc1      $f6, -0x24($v1)
-/* 389164 E0084794 46200020 */  cvt.s.d   $f0, $f0
-/* 389168 E0084798 462010A0 */  cvt.s.d   $f2, $f2
-/* 38916C E008479C E460FFF0 */  swc1      $f0, -0x10($v1)
-/* 389170 E00847A0 46004200 */  add.s     $f8, $f8, $f0
-/* 389174 E00847A4 E462FFF4 */  swc1      $f2, -0xc($v1)
-/* 389178 E00847A8 46001006 */  mov.s     $f0, $f2
-/* 38917C E00847AC 46003180 */  add.s     $f6, $f6, $f0
-/* 389180 E00847B0 C460FFE0 */  lwc1      $f0, -0x20($v1)
-/* 389184 E00847B4 46202120 */  cvt.s.d   $f4, $f4
-/* 389188 E00847B8 E464FFF8 */  swc1      $f4, -8($v1)
-/* 38918C E00847BC 46002086 */  mov.s     $f2, $f4
-/* 389190 E00847C0 46020000 */  add.s     $f0, $f0, $f2
-/* 389194 E00847C4 E466FFDC */  swc1      $f6, -0x24($v1)
-/* 389198 E00847C8 46003086 */  mov.s     $f2, $f6
-/* 38919C E00847CC E468FFD8 */  swc1      $f8, -0x28($v1)
-/* 3891A0 E00847D0 460A103C */  c.lt.s    $f2, $f10
-/* 3891A4 E00847D4 00000000 */  nop
-/* 3891A8 E00847D8 4500000C */  bc1f      .LE008480C
-/* 3891AC E00847DC E460FFE0 */   swc1     $f0, -0x20($v1)
-/* 3891B0 E00847E0 C460FFF4 */  lwc1      $f0, -0xc($v1)
-/* 3891B4 E00847E4 4610003C */  c.lt.s    $f0, $f16
-/* 3891B8 E00847E8 00000000 */  nop
-/* 3891BC E00847EC 45000007 */  bc1f      .LE008480C
-/* 3891C0 E00847F0 00000000 */   nop
-/* 3891C4 E00847F4 46000021 */  cvt.d.s   $f0, $f0
-/* 3891C8 E00847F8 46360002 */  mul.d     $f0, $f0, $f22
-/* 3891CC E00847FC 00000000 */  nop
-/* 3891D0 E0084800 E46AFFDC */  swc1      $f10, -0x24($v1)
-/* 3891D4 E0084804 46200020 */  cvt.s.d   $f0, $f0
-/* 3891D8 E0084808 E460FFF4 */  swc1      $f0, -0xc($v1)
-.LE008480C:
-/* 3891DC E008480C C460FFFC */  lwc1      $f0, -4($v1)
-/* 3891E0 E0084810 46000021 */  cvt.d.s   $f0, $f0
-/* 3891E4 E0084814 462E0002 */  mul.d     $f0, $f0, $f14
-/* 3891E8 E0084818 00000000 */  nop
-/* 3891EC E008481C C4640004 */  lwc1      $f4, 4($v1)
-/* 3891F0 E0084820 46002121 */  cvt.d.s   $f4, $f4
-/* 3891F4 E0084824 462E2102 */  mul.d     $f4, $f4, $f14
-/* 3891F8 E0084828 00000000 */  nop
-/* 3891FC E008482C C4620000 */  lwc1      $f2, ($v1)
-/* 389200 E0084830 460010A1 */  cvt.d.s   $f2, $f2
-/* 389204 E0084834 46341081 */  sub.d     $f2, $f2, $f20
-/* 389208 E0084838 C466FFE4 */  lwc1      $f6, -0x1c($v1)
-/* 38920C E008483C 462010A0 */  cvt.s.d   $f2, $f2
-/* 389210 E0084840 E4620000 */  swc1      $f2, ($v1)
-/* 389214 E0084844 C462FFE8 */  lwc1      $f2, -0x18($v1)
-/* 389218 E0084848 46200020 */  cvt.s.d   $f0, $f0
-/* 38921C E008484C 46003180 */  add.s     $f6, $f6, $f0
-/* 389220 E0084850 E460FFFC */  swc1      $f0, -4($v1)
-/* 389224 E0084854 C4600000 */  lwc1      $f0, ($v1)
-/* 389228 E0084858 46202120 */  cvt.s.d   $f4, $f4
-/* 38922C E008485C E4640004 */  swc1      $f4, 4($v1)
-/* 389230 E0084860 C464FFEC */  lwc1      $f4, -0x14($v1)
-/* 389234 E0084864 46001080 */  add.s     $f2, $f2, $f0
-/* 389238 E0084868 C4600004 */  lwc1      $f0, 4($v1)
-/* 38923C E008486C 46002100 */  add.s     $f4, $f4, $f0
-/* 389240 E0084870 E466FFE4 */  swc1      $f6, -0x1c($v1)
-/* 389244 E0084874 E462FFE8 */  swc1      $f2, -0x18($v1)
-/* 389248 E0084878 46001006 */  mov.s     $f0, $f2
-/* 38924C E008487C 460A003C */  c.lt.s    $f0, $f10
-/* 389250 E0084880 00000000 */  nop
-/* 389254 E0084884 4500000C */  bc1f      .LE00848B8
-/* 389258 E0084888 E464FFEC */   swc1     $f4, -0x14($v1)
-/* 38925C E008488C C4600000 */  lwc1      $f0, ($v1)
-/* 389260 E0084890 4610003C */  c.lt.s    $f0, $f16
-/* 389264 E0084894 00000000 */  nop
-/* 389268 E0084898 45020008 */  bc1fl     .LE00848BC
-/* 38926C E008489C 24C60001 */   addiu    $a2, $a2, 1
-/* 389270 E00848A0 46000021 */  cvt.d.s   $f0, $f0
-/* 389274 E00848A4 46320002 */  mul.d     $f0, $f0, $f18
-/* 389278 E00848A8 00000000 */  nop
-/* 38927C E00848AC E46AFFE8 */  swc1      $f10, -0x18($v1)
-/* 389280 E00848B0 46200020 */  cvt.s.d   $f0, $f0
-/* 389284 E00848B4 E4600000 */  swc1      $f0, ($v1)
-.LE00848B8:
-/* 389288 E00848B8 24C60001 */  addiu     $a2, $a2, 1
-.LE00848BC:
-/* 38928C E00848BC 8C820008 */  lw        $v0, 8($a0)
-/* 389290 E00848C0 00C2102A */  slt       $v0, $a2, $v0
-/* 389294 E00848C4 1440FFA5 */  bnez      $v0, .LE008475C
-/* 389298 E00848C8 24630050 */   addiu    $v1, $v1, 0x50
-.LE00848CC:
-/* 38929C E00848CC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 3892A0 E00848D0 D7B80028 */  ldc1      $f24, 0x28($sp)
-/* 3892A4 E00848D4 D7B60020 */  ldc1      $f22, 0x20($sp)
-/* 3892A8 E00848D8 D7B40018 */  ldc1      $f20, 0x18($sp)
-/* 3892AC E00848DC 03E00008 */  jr        $ra
-/* 3892B0 E00848E0 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_appendGfx.s b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_appendGfx.s
deleted file mode 100644
index e99a558d59..0000000000
--- a/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_appendGfx.s
+++ /dev/null
@@ -1,203 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel breaking_junk_appendGfx
-/* 40389C E011849C 27BDFF30 */  addiu     $sp, $sp, -0xd0
-/* 4038A0 E01184A0 AFB700BC */  sw        $s7, 0xbc($sp)
-/* 4038A4 E01184A4 0080B82D */  daddu     $s7, $a0, $zero
-/* 4038A8 E01184A8 3C05DB06 */  lui       $a1, 0xdb06
-/* 4038AC E01184AC 3C06800A */  lui       $a2, %hi(gMasterGfxPos)
-/* 4038B0 E01184B0 24C6A66C */  addiu     $a2, $a2, %lo(gMasterGfxPos)
-/* 4038B4 E01184B4 34A50024 */  ori       $a1, $a1, 0x24
-/* 4038B8 E01184B8 3C02E700 */  lui       $v0, 0xe700
-/* 4038BC E01184BC AFBF00C4 */  sw        $ra, 0xc4($sp)
-/* 4038C0 E01184C0 AFBE00C0 */  sw        $fp, 0xc0($sp)
-/* 4038C4 E01184C4 AFB600B8 */  sw        $s6, 0xb8($sp)
-/* 4038C8 E01184C8 AFB500B4 */  sw        $s5, 0xb4($sp)
-/* 4038CC E01184CC AFB400B0 */  sw        $s4, 0xb0($sp)
-/* 4038D0 E01184D0 AFB300AC */  sw        $s3, 0xac($sp)
-/* 4038D4 E01184D4 AFB200A8 */  sw        $s2, 0xa8($sp)
-/* 4038D8 E01184D8 AFB100A4 */  sw        $s1, 0xa4($sp)
-/* 4038DC E01184DC AFB000A0 */  sw        $s0, 0xa0($sp)
-/* 4038E0 E01184E0 F7B400C8 */  sdc1      $f20, 0xc8($sp)
-/* 4038E4 E01184E4 8CC40000 */  lw        $a0, ($a2)
-/* 4038E8 E01184E8 8EE7000C */  lw        $a3, 0xc($s7)
-/* 4038EC E01184EC 0080182D */  daddu     $v1, $a0, $zero
-/* 4038F0 E01184F0 84FE0032 */  lh        $fp, 0x32($a3)
-/* 4038F4 E01184F4 24840008 */  addiu     $a0, $a0, 8
-/* 4038F8 E01184F8 AC620000 */  sw        $v0, ($v1)
-/* 4038FC E01184FC AC600004 */  sw        $zero, 4($v1)
-/* 403900 E0118500 AC850000 */  sw        $a1, ($a0)
-/* 403904 E0118504 8EE20010 */  lw        $v0, 0x10($s7)
-/* 403908 E0118508 0000882D */  daddu     $s1, $zero, $zero
-/* 40390C E011850C ACC40000 */  sw        $a0, ($a2)
-/* 403910 E0118510 8C43001C */  lw        $v1, 0x1c($v0)
-/* 403914 E0118514 3C02DE00 */  lui       $v0, 0xde00
-/* 403918 E0118518 AC820008 */  sw        $v0, 8($a0)
-/* 40391C E011851C 3C028000 */  lui       $v0, 0x8000
-/* 403920 E0118520 00621821 */  addu      $v1, $v1, $v0
-/* 403924 E0118524 AC830004 */  sw        $v1, 4($a0)
-/* 403928 E0118528 3C03E012 */  lui       $v1, %hi(D_E01187C0)
-/* 40392C E011852C 8C6387C0 */  lw        $v1, %lo(D_E01187C0)($v1)
-/* 403930 E0118530 24820008 */  addiu     $v0, $a0, 8
-/* 403934 E0118534 ACC20000 */  sw        $v0, ($a2)
-/* 403938 E0118538 AC83000C */  sw        $v1, 0xc($a0)
-/* 40393C E011853C 8EE20008 */  lw        $v0, 8($s7)
-/* 403940 E0118540 24840010 */  addiu     $a0, $a0, 0x10
-/* 403944 E0118544 18400084 */  blez      $v0, .LE0118758
-/* 403948 E0118548 ACC40000 */   sw       $a0, ($a2)
-/* 40394C E011854C 4480A000 */  mtc1      $zero, $f20
-/* 403950 E0118550 27B40060 */  addiu     $s4, $sp, 0x60
-/* 403954 E0118554 3C16800A */  lui       $s6, %hi(gDisplayContext)
-/* 403958 E0118558 26D6A674 */  addiu     $s6, $s6, %lo(gDisplayContext)
-/* 40395C E011855C 3C158007 */  lui       $s5, %hi(gMatrixListPos)
-/* 403960 E0118560 26B541F0 */  addiu     $s5, $s5, %lo(gMatrixListPos)
-/* 403964 E0118564 3C130001 */  lui       $s3, 1
-/* 403968 E0118568 36731630 */  ori       $s3, $s3, 0x1630
-/* 40396C E011856C 00C0902D */  daddu     $s2, $a2, $zero
-/* 403970 E0118570 24F0003A */  addiu     $s0, $a3, 0x3a
-.LE0118574:
-/* 403974 E0118574 3C0A800B */  lui       $t2, %hi(gCameras)
-/* 403978 E0118578 254A1D80 */  addiu     $t2, $t2, %lo(gCameras)
-/* 40397C E011857C 4405A000 */  mfc1      $a1, $f20
-/* 403980 E0118580 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 403984 E0118584 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 403988 E0118588 C600FFEA */  lwc1      $f0, -0x16($s0)
-/* 40398C E011858C 3C013FE0 */  lui       $at, 0x3fe0
-/* 403990 E0118590 44811800 */  mtc1      $at, $f3
-/* 403994 E0118594 44801000 */  mtc1      $zero, $f2
-/* 403998 E0118598 00031080 */  sll       $v0, $v1, 2
-/* 40399C E011859C 00431021 */  addu      $v0, $v0, $v1
-/* 4039A0 E01185A0 46000021 */  cvt.d.s   $f0, $f0
-/* 4039A4 E01185A4 00021080 */  sll       $v0, $v0, 2
-/* 4039A8 E01185A8 46220002 */  mul.d     $f0, $f0, $f2
-/* 4039AC E01185AC 00000000 */  nop
-/* 4039B0 E01185B0 00431023 */  subu      $v0, $v0, $v1
-/* 4039B4 E01185B4 000218C0 */  sll       $v1, $v0, 3
-/* 4039B8 E01185B8 00431021 */  addu      $v0, $v0, $v1
-/* 4039BC E01185BC 000210C0 */  sll       $v0, $v0, 3
-/* 4039C0 E01185C0 004A1021 */  addu      $v0, $v0, $t2
-/* 4039C4 E01185C4 C442006C */  lwc1      $f2, 0x6c($v0)
-/* 4039C8 E01185C8 4407A000 */  mfc1      $a3, $f20
-/* 4039CC E01185CC 46001087 */  neg.s     $f2, $f2
-/* 4039D0 E01185D0 44061000 */  mfc1      $a2, $f2
-/* 4039D4 E01185D4 46200020 */  cvt.s.d   $f0, $f0
-/* 4039D8 E01185D8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 4039DC E01185DC C600FFCA */  lwc1      $f0, -0x36($s0)
-/* 4039E0 E01185E0 E7A00014 */  swc1      $f0, 0x14($sp)
-/* 4039E4 E01185E4 C600FFCE */  lwc1      $f0, -0x32($s0)
-/* 4039E8 E01185E8 E7A00018 */  swc1      $f0, 0x18($sp)
-/* 4039EC E01185EC C600FFD2 */  lwc1      $f0, -0x2e($s0)
-/* 4039F0 E01185F0 27A40020 */  addiu     $a0, $sp, 0x20
-/* 4039F4 E01185F4 0C080180 */  jal       shim_guPositionF
-/* 4039F8 E01185F8 E7A0001C */   swc1     $f0, 0x1c($sp)
-/* 4039FC E01185FC 3C013F80 */  lui       $at, 0x3f80
-/* 403A00 E0118600 44810000 */  mtc1      $at, $f0
-/* 403A04 E0118604 4406A000 */  mfc1      $a2, $f20
-/* 403A08 E0118608 4407A000 */  mfc1      $a3, $f20
-/* 403A0C E011860C E7A00010 */  swc1      $f0, 0x10($sp)
-/* 403A10 E0118610 8E05FFEE */  lw        $a1, -0x12($s0)
-/* 403A14 E0118614 0C080104 */  jal       shim_guRotateF
-/* 403A18 E0118618 0280202D */   daddu    $a0, $s4, $zero
-/* 403A1C E011861C 0280202D */  daddu     $a0, $s4, $zero
-/* 403A20 E0118620 27A50020 */  addiu     $a1, $sp, 0x20
-/* 403A24 E0118624 0C080114 */  jal       shim_guMtxCatF
-/* 403A28 E0118628 00A0302D */   daddu    $a2, $a1, $zero
-/* 403A2C E011862C 27A40020 */  addiu     $a0, $sp, 0x20
-/* 403A30 E0118630 96A50000 */  lhu       $a1, ($s5)
-/* 403A34 E0118634 8EC20000 */  lw        $v0, ($s6)
-/* 403A38 E0118638 00052980 */  sll       $a1, $a1, 6
-/* 403A3C E011863C 00B32821 */  addu      $a1, $a1, $s3
-/* 403A40 E0118640 0C080118 */  jal       shim_guMtxF2L
-/* 403A44 E0118644 00452821 */   addu     $a1, $v0, $a1
-/* 403A48 E0118648 3C02DA38 */  lui       $v0, 0xda38
-/* 403A4C E011864C 34420002 */  ori       $v0, $v0, 2
-/* 403A50 E0118650 3C09D838 */  lui       $t1, 0xd838
-/* 403A54 E0118654 35290002 */  ori       $t1, $t1, 2
-/* 403A58 E0118658 32280003 */  andi      $t0, $s1, 3
-/* 403A5C E011865C 26310001 */  addiu     $s1, $s1, 1
-/* 403A60 E0118660 00084080 */  sll       $t0, $t0, 2
-/* 403A64 E0118664 8E440000 */  lw        $a0, ($s2)
-/* 403A68 E0118668 96A30000 */  lhu       $v1, ($s5)
-/* 403A6C E011866C 0080282D */  daddu     $a1, $a0, $zero
-/* 403A70 E0118670 24840008 */  addiu     $a0, $a0, 8
-/* 403A74 E0118674 AE440000 */  sw        $a0, ($s2)
-/* 403A78 E0118678 ACA20000 */  sw        $v0, ($a1)
-/* 403A7C E011867C 24620001 */  addiu     $v0, $v1, 1
-/* 403A80 E0118680 3063FFFF */  andi      $v1, $v1, 0xffff
-/* 403A84 E0118684 00031980 */  sll       $v1, $v1, 6
-/* 403A88 E0118688 A6A20000 */  sh        $v0, ($s5)
-/* 403A8C E011868C 8EC20000 */  lw        $v0, ($s6)
-/* 403A90 E0118690 00731821 */  addu      $v1, $v1, $s3
-/* 403A94 E0118694 00431021 */  addu      $v0, $v0, $v1
-/* 403A98 E0118698 ACA20004 */  sw        $v0, 4($a1)
-/* 403A9C E011869C 24820008 */  addiu     $v0, $a0, 8
-/* 403AA0 E01186A0 AE420000 */  sw        $v0, ($s2)
-/* 403AA4 E01186A4 3C02FA00 */  lui       $v0, 0xfa00
-/* 403AA8 E01186A8 AC820000 */  sw        $v0, ($a0)
-/* 403AAC E01186AC 9203FFF3 */  lbu       $v1, -0xd($s0)
-/* 403AB0 E01186B0 9205FFF5 */  lbu       $a1, -0xb($s0)
-/* 403AB4 E01186B4 9206FFF7 */  lbu       $a2, -9($s0)
-/* 403AB8 E01186B8 24820010 */  addiu     $v0, $a0, 0x10
-/* 403ABC E01186BC AE420000 */  sw        $v0, ($s2)
-/* 403AC0 E01186C0 3C02FB00 */  lui       $v0, 0xfb00
-/* 403AC4 E01186C4 AC820008 */  sw        $v0, 8($a0)
-/* 403AC8 E01186C8 33C200FF */  andi      $v0, $fp, 0xff
-/* 403ACC E01186CC 00031E00 */  sll       $v1, $v1, 0x18
-/* 403AD0 E01186D0 00052C00 */  sll       $a1, $a1, 0x10
-/* 403AD4 E01186D4 00651825 */  or        $v1, $v1, $a1
-/* 403AD8 E01186D8 00063200 */  sll       $a2, $a2, 8
-/* 403ADC E01186DC 00661825 */  or        $v1, $v1, $a2
-/* 403AE0 E01186E0 00621825 */  or        $v1, $v1, $v0
-/* 403AE4 E01186E4 AC830004 */  sw        $v1, 4($a0)
-/* 403AE8 E01186E8 9203FFFB */  lbu       $v1, -5($s0)
-/* 403AEC E01186EC 9205FFFD */  lbu       $a1, -3($s0)
-/* 403AF0 E01186F0 9206FFFF */  lbu       $a2, -1($s0)
-/* 403AF4 E01186F4 92070001 */  lbu       $a3, 1($s0)
-/* 403AF8 E01186F8 2610003C */  addiu     $s0, $s0, 0x3c
-/* 403AFC E01186FC 3C02DE00 */  lui       $v0, 0xde00
-/* 403B00 E0118700 AC820010 */  sw        $v0, 0x10($a0)
-/* 403B04 E0118704 00031E00 */  sll       $v1, $v1, 0x18
-/* 403B08 E0118708 00052C00 */  sll       $a1, $a1, 0x10
-/* 403B0C E011870C 00651825 */  or        $v1, $v1, $a1
-/* 403B10 E0118710 00063200 */  sll       $a2, $a2, 8
-/* 403B14 E0118714 00661825 */  or        $v1, $v1, $a2
-/* 403B18 E0118718 00671825 */  or        $v1, $v1, $a3
-/* 403B1C E011871C AC83000C */  sw        $v1, 0xc($a0)
-/* 403B20 E0118720 3C03E012 */  lui       $v1, %hi(D_E01187B0)
-/* 403B24 E0118724 00681821 */  addu      $v1, $v1, $t0
-/* 403B28 E0118728 8C6387B0 */  lw        $v1, %lo(D_E01187B0)($v1)
-/* 403B2C E011872C 24820018 */  addiu     $v0, $a0, 0x18
-/* 403B30 E0118730 AE420000 */  sw        $v0, ($s2)
-/* 403B34 E0118734 24020040 */  addiu     $v0, $zero, 0x40
-/* 403B38 E0118738 AC890018 */  sw        $t1, 0x18($a0)
-/* 403B3C E011873C AC82001C */  sw        $v0, 0x1c($a0)
-/* 403B40 E0118740 AC830014 */  sw        $v1, 0x14($a0)
-/* 403B44 E0118744 8EE20008 */  lw        $v0, 8($s7)
-/* 403B48 E0118748 24840020 */  addiu     $a0, $a0, 0x20
-/* 403B4C E011874C 0222102A */  slt       $v0, $s1, $v0
-/* 403B50 E0118750 1440FF88 */  bnez      $v0, .LE0118574
-/* 403B54 E0118754 AE440000 */   sw       $a0, ($s2)
-.LE0118758:
-/* 403B58 E0118758 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* 403B5C E011875C 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* 403B60 E0118760 8C620000 */  lw        $v0, ($v1)
-/* 403B64 E0118764 0040202D */  daddu     $a0, $v0, $zero
-/* 403B68 E0118768 24420008 */  addiu     $v0, $v0, 8
-/* 403B6C E011876C AC620000 */  sw        $v0, ($v1)
-/* 403B70 E0118770 3C02E700 */  lui       $v0, 0xe700
-/* 403B74 E0118774 AC820000 */  sw        $v0, ($a0)
-/* 403B78 E0118778 AC800004 */  sw        $zero, 4($a0)
-/* 403B7C E011877C 8FBF00C4 */  lw        $ra, 0xc4($sp)
-/* 403B80 E0118780 8FBE00C0 */  lw        $fp, 0xc0($sp)
-/* 403B84 E0118784 8FB700BC */  lw        $s7, 0xbc($sp)
-/* 403B88 E0118788 8FB600B8 */  lw        $s6, 0xb8($sp)
-/* 403B8C E011878C 8FB500B4 */  lw        $s5, 0xb4($sp)
-/* 403B90 E0118790 8FB400B0 */  lw        $s4, 0xb0($sp)
-/* 403B94 E0118794 8FB300AC */  lw        $s3, 0xac($sp)
-/* 403B98 E0118798 8FB200A8 */  lw        $s2, 0xa8($sp)
-/* 403B9C E011879C 8FB100A4 */  lw        $s1, 0xa4($sp)
-/* 403BA0 E01187A0 8FB000A0 */  lw        $s0, 0xa0($sp)
-/* 403BA4 E01187A4 D7B400C8 */  ldc1      $f20, 0xc8($sp)
-/* 403BA8 E01187A8 03E00008 */  jr        $ra
-/* 403BAC E01187AC 27BD00D0 */   addiu    $sp, $sp, 0xd0
diff --git a/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_main.s b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_main.s
deleted file mode 100644
index 16c9aea295..0000000000
--- a/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_main.s
+++ /dev/null
@@ -1,200 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel breaking_junk_main
-/* 403400 E0118000 27BDFF90 */  addiu     $sp, $sp, -0x70
-/* 403404 E0118004 F7B80050 */  sdc1      $f24, 0x50($sp)
-/* 403408 E0118008 4485C000 */  mtc1      $a1, $f24
-/* 40340C E011800C F7BA0058 */  sdc1      $f26, 0x58($sp)
-/* 403410 E0118010 4486D000 */  mtc1      $a2, $f26
-/* 403414 E0118014 F7BC0060 */  sdc1      $f28, 0x60($sp)
-/* 403418 E0118018 4487E000 */  mtc1      $a3, $f28
-/* 40341C E011801C AFB1002C */  sw        $s1, 0x2c($sp)
-/* 403420 E0118020 0080882D */  daddu     $s1, $a0, $zero
-/* 403424 E0118024 F7BE0068 */  sdc1      $f30, 0x68($sp)
-/* 403428 E0118028 C7BE0080 */  lwc1      $f30, 0x80($sp)
-/* 40342C E011802C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 403430 E0118030 AFB00028 */  sw        $s0, 0x28($sp)
-/* 403434 E0118034 8FB00084 */  lw        $s0, 0x84($sp)
-/* 403438 E0118038 3C02E012 */  lui       $v0, %hi(breaking_junk_init)
-/* 40343C E011803C 244282EC */  addiu     $v0, $v0, %lo(breaking_junk_init)
-/* 403440 E0118040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 403444 E0118044 3C02E012 */  lui       $v0, %hi(breaking_junk_update)
-/* 403448 E0118048 244282F4 */  addiu     $v0, $v0, %lo(breaking_junk_update)
-/* 40344C E011804C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 403450 E0118050 3C02E012 */  lui       $v0, %hi(breaking_junk_render)
-/* 403454 E0118054 24428454 */  addiu     $v0, $v0, %lo(breaking_junk_render)
-/* 403458 E0118058 AFA20020 */  sw        $v0, 0x20($sp)
-/* 40345C E011805C 2402007E */  addiu     $v0, $zero, 0x7e
-/* 403460 E0118060 AFBF0038 */  sw        $ra, 0x38($sp)
-/* 403464 E0118064 AFB30034 */  sw        $s3, 0x34($sp)
-/* 403468 E0118068 AFB20030 */  sw        $s2, 0x30($sp)
-/* 40346C E011806C F7B60048 */  sdc1      $f22, 0x48($sp)
-/* 403470 E0118070 F7B40040 */  sdc1      $f20, 0x40($sp)
-/* 403474 E0118074 AFA00010 */  sw        $zero, 0x10($sp)
-/* 403478 E0118078 AFA00024 */  sw        $zero, 0x24($sp)
-/* 40347C E011807C 0C080124 */  jal       shim_create_effect_instance
-/* 403480 E0118080 AFA20014 */   sw       $v0, 0x14($sp)
-/* 403484 E0118084 24040168 */  addiu     $a0, $zero, 0x168
-/* 403488 E0118088 24030006 */  addiu     $v1, $zero, 6
-/* 40348C E011808C 0040982D */  daddu     $s3, $v0, $zero
-/* 403490 E0118090 0C08012C */  jal       shim_general_heap_malloc
-/* 403494 E0118094 AE630008 */   sw       $v1, 8($s3)
-/* 403498 E0118098 0040182D */  daddu     $v1, $v0, $zero
-/* 40349C E011809C 14600003 */  bnez      $v1, .LE01180AC
-/* 4034A0 E01180A0 AE62000C */   sw       $v0, 0xc($s3)
-.LE01180A4:
-/* 4034A4 E01180A4 08046029 */  j         .LE01180A4
-/* 4034A8 E01180A8 00000000 */   nop
-.LE01180AC:
-/* 4034AC E01180AC AC710000 */  sw        $s1, ($v1)
-/* 4034B0 E01180B0 1E000004 */  bgtz      $s0, .LE01180C4
-/* 4034B4 E01180B4 AC600020 */   sw       $zero, 0x20($v1)
-/* 4034B8 E01180B8 240203E8 */  addiu     $v0, $zero, 0x3e8
-/* 4034BC E01180BC 08046032 */  j         .LE01180C8
-/* 4034C0 E01180C0 AC62001C */   sw       $v0, 0x1c($v1)
-.LE01180C4:
-/* 4034C4 E01180C4 AC70001C */  sw        $s0, 0x1c($v1)
-.LE01180C8:
-/* 4034C8 E01180C8 240200FF */  addiu     $v0, $zero, 0xff
-/* 4034CC E01180CC A4620032 */  sh        $v0, 0x32($v1)
-/* 4034D0 E01180D0 8E620008 */  lw        $v0, 8($s3)
-/* 4034D4 E01180D4 18400077 */  blez      $v0, .LE01182B4
-/* 4034D8 E01180D8 0000882D */   daddu    $s1, $zero, $zero
-/* 4034DC E01180DC 241200FF */  addiu     $s2, $zero, 0xff
-/* 4034E0 E01180E0 24700028 */  addiu     $s0, $v1, 0x28
-/* 4034E4 E01180E4 3C013FE0 */  lui       $at, 0x3fe0
-/* 4034E8 E01180E8 4481B800 */  mtc1      $at, $f23
-/* 4034EC E01180EC 4480B000 */  mtc1      $zero, $f22
-/* 4034F0 E01180F0 3C01E012 */  lui       $at, %hi(D_E01187D0)
-/* 4034F4 E01180F4 D43487D0 */  ldc1      $f20, %lo(D_E01187D0)($at)
-.LE01180F8:
-/* 4034F8 E01180F8 2404000A */  addiu     $a0, $zero, 0xa
-/* 4034FC E01180FC E618FFDC */  swc1      $f24, -0x24($s0)
-/* 403500 E0118100 E61AFFE0 */  swc1      $f26, -0x20($s0)
-/* 403504 E0118104 0C080138 */  jal       shim_rand_int
-/* 403508 E0118108 E61CFFE4 */   swc1     $f28, -0x1c($s0)
-/* 40350C E011810C 2442FFFB */  addiu     $v0, $v0, -5
-/* 403510 E0118110 44820000 */  mtc1      $v0, $f0
-/* 403514 E0118114 00000000 */  nop
-/* 403518 E0118118 46800021 */  cvt.d.w   $f0, $f0
-/* 40351C E011811C 46360002 */  mul.d     $f0, $f0, $f22
-/* 403520 E0118120 00000000 */  nop
-/* 403524 E0118124 24040005 */  addiu     $a0, $zero, 5
-/* 403528 E0118128 46200020 */  cvt.s.d   $f0, $f0
-/* 40352C E011812C 0C080138 */  jal       shim_rand_int
-/* 403530 E0118130 E600FFE8 */   swc1     $f0, -0x18($s0)
-/* 403534 E0118134 24420001 */  addiu     $v0, $v0, 1
-/* 403538 E0118138 3C01E012 */  lui       $at, %hi(D_E01187D8)
-/* 40353C E011813C D42287D8 */  ldc1      $f2, %lo(D_E01187D8)($at)
-/* 403540 E0118140 44820000 */  mtc1      $v0, $f0
-/* 403544 E0118144 00000000 */  nop
-/* 403548 E0118148 46800021 */  cvt.d.w   $f0, $f0
-/* 40354C E011814C 46220002 */  mul.d     $f0, $f0, $f2
-/* 403550 E0118150 00000000 */  nop
-/* 403554 E0118154 2404000A */  addiu     $a0, $zero, 0xa
-/* 403558 E0118158 46200020 */  cvt.s.d   $f0, $f0
-/* 40355C E011815C 0C080138 */  jal       shim_rand_int
-/* 403560 E0118160 E600FFEC */   swc1     $f0, -0x14($s0)
-/* 403564 E0118164 2442FFFB */  addiu     $v0, $v0, -5
-/* 403568 E0118168 44820000 */  mtc1      $v0, $f0
-/* 40356C E011816C 00000000 */  nop
-/* 403570 E0118170 46800021 */  cvt.d.w   $f0, $f0
-/* 403574 E0118174 46360002 */  mul.d     $f0, $f0, $f22
-/* 403578 E0118178 00000000 */  nop
-/* 40357C E011817C 240400FF */  addiu     $a0, $zero, 0xff
-/* 403580 E0118180 E61EFFFC */  swc1      $f30, -4($s0)
-/* 403584 E0118184 46200020 */  cvt.s.d   $f0, $f0
-/* 403588 E0118188 0C080138 */  jal       shim_rand_int
-/* 40358C E011818C E600FFF0 */   swc1     $f0, -0x10($s0)
-/* 403590 E0118190 A602000C */  sh        $v0, 0xc($s0)
-/* 403594 E0118194 8604000C */  lh        $a0, 0xc($s0)
-/* 403598 E0118198 A6020004 */  sh        $v0, 4($s0)
-/* 40359C E011819C 0C080138 */  jal       shim_rand_int
-/* 4035A0 E01181A0 02442023 */   subu     $a0, $s2, $a0
-/* 4035A4 E01181A4 9603000C */  lhu       $v1, 0xc($s0)
-/* 4035A8 E01181A8 A602000E */  sh        $v0, 0xe($s0)
-/* 4035AC E01181AC A6020006 */  sh        $v0, 6($s0)
-/* 4035B0 E01181B0 02421023 */  subu      $v0, $s2, $v0
-/* 4035B4 E01181B4 00431023 */  subu      $v0, $v0, $v1
-/* 4035B8 E01181B8 A6020010 */  sh        $v0, 0x10($s0)
-/* 4035BC E01181BC A6020008 */  sh        $v0, 8($s0)
-/* 4035C0 E01181C0 96020004 */  lhu       $v0, 4($s0)
-/* 4035C4 E01181C4 96030006 */  lhu       $v1, 6($s0)
-/* 4035C8 E01181C8 244200A8 */  addiu     $v0, $v0, 0xa8
-/* 4035CC E01181CC A6020004 */  sh        $v0, 4($s0)
-/* 4035D0 E01181D0 96020008 */  lhu       $v0, 8($s0)
-/* 4035D4 E01181D4 246300A8 */  addiu     $v1, $v1, 0xa8
-/* 4035D8 E01181D8 A6030006 */  sh        $v1, 6($s0)
-/* 4035DC E01181DC 86030004 */  lh        $v1, 4($s0)
-/* 4035E0 E01181E0 244200A8 */  addiu     $v0, $v0, 0xa8
-/* 4035E4 E01181E4 28630100 */  slti      $v1, $v1, 0x100
-/* 4035E8 E01181E8 14600002 */  bnez      $v1, .LE01181F4
-/* 4035EC E01181EC A6020008 */   sh       $v0, 8($s0)
-/* 4035F0 E01181F0 A6120004 */  sh        $s2, 4($s0)
-.LE01181F4:
-/* 4035F4 E01181F4 86020006 */  lh        $v0, 6($s0)
-/* 4035F8 E01181F8 28420100 */  slti      $v0, $v0, 0x100
-/* 4035FC E01181FC 50400001 */  beql      $v0, $zero, .LE0118204
-/* 403600 E0118200 A6120006 */   sh       $s2, 6($s0)
-.LE0118204:
-/* 403604 E0118204 86020008 */  lh        $v0, 8($s0)
-/* 403608 E0118208 28420100 */  slti      $v0, $v0, 0x100
-/* 40360C E011820C 50400001 */  beql      $v0, $zero, .LE0118214
-/* 403610 E0118210 A6120008 */   sh       $s2, 8($s0)
-.LE0118214:
-/* 403614 E0118214 8602000C */  lh        $v0, 0xc($s0)
-/* 403618 E0118218 44822000 */  mtc1      $v0, $f4
-/* 40361C E011821C 00000000 */  nop
-/* 403620 E0118220 46802121 */  cvt.d.w   $f4, $f4
-/* 403624 E0118224 46342102 */  mul.d     $f4, $f4, $f20
-/* 403628 E0118228 00000000 */  nop
-/* 40362C E011822C 8602000E */  lh        $v0, 0xe($s0)
-/* 403630 E0118230 44821000 */  mtc1      $v0, $f2
-/* 403634 E0118234 00000000 */  nop
-/* 403638 E0118238 468010A1 */  cvt.d.w   $f2, $f2
-/* 40363C E011823C 46341082 */  mul.d     $f2, $f2, $f20
-/* 403640 E0118240 00000000 */  nop
-/* 403644 E0118244 86020010 */  lh        $v0, 0x10($s0)
-/* 403648 E0118248 44820000 */  mtc1      $v0, $f0
-/* 40364C E011824C 00000000 */  nop
-/* 403650 E0118250 46800021 */  cvt.d.w   $f0, $f0
-/* 403654 E0118254 46340002 */  mul.d     $f0, $f0, $f20
-/* 403658 E0118258 00000000 */  nop
-/* 40365C E011825C 24040167 */  addiu     $a0, $zero, 0x167
-/* 403660 E0118260 26310001 */  addiu     $s1, $s1, 1
-/* 403664 E0118264 4620218D */  trunc.w.d $f6, $f4
-/* 403668 E0118268 44023000 */  mfc1      $v0, $f6
-/* 40366C E011826C 00000000 */  nop
-/* 403670 E0118270 A602000C */  sh        $v0, 0xc($s0)
-/* 403674 E0118274 4620118D */  trunc.w.d $f6, $f2
-/* 403678 E0118278 44023000 */  mfc1      $v0, $f6
-/* 40367C E011827C 00000000 */  nop
-/* 403680 E0118280 A602000E */  sh        $v0, 0xe($s0)
-/* 403684 E0118284 4620018D */  trunc.w.d $f6, $f0
-/* 403688 E0118288 44023000 */  mfc1      $v0, $f6
-/* 40368C E011828C 0C080138 */  jal       shim_rand_int
-/* 403690 E0118290 A6020010 */   sh       $v0, 0x10($s0)
-/* 403694 E0118294 44820000 */  mtc1      $v0, $f0
-/* 403698 E0118298 00000000 */  nop
-/* 40369C E011829C 46800020 */  cvt.s.w   $f0, $f0
-/* 4036A0 E01182A0 E6000000 */  swc1      $f0, ($s0)
-/* 4036A4 E01182A4 8E620008 */  lw        $v0, 8($s3)
-/* 4036A8 E01182A8 0222102A */  slt       $v0, $s1, $v0
-/* 4036AC E01182AC 1440FF92 */  bnez      $v0, .LE01180F8
-/* 4036B0 E01182B0 2610003C */   addiu    $s0, $s0, 0x3c
-.LE01182B4:
-/* 4036B4 E01182B4 0260102D */  daddu     $v0, $s3, $zero
-/* 4036B8 E01182B8 8FBF0038 */  lw        $ra, 0x38($sp)
-/* 4036BC E01182BC 8FB30034 */  lw        $s3, 0x34($sp)
-/* 4036C0 E01182C0 8FB20030 */  lw        $s2, 0x30($sp)
-/* 4036C4 E01182C4 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 4036C8 E01182C8 8FB00028 */  lw        $s0, 0x28($sp)
-/* 4036CC E01182CC D7BE0068 */  ldc1      $f30, 0x68($sp)
-/* 4036D0 E01182D0 D7BC0060 */  ldc1      $f28, 0x60($sp)
-/* 4036D4 E01182D4 D7BA0058 */  ldc1      $f26, 0x58($sp)
-/* 4036D8 E01182D8 D7B80050 */  ldc1      $f24, 0x50($sp)
-/* 4036DC E01182DC D7B60048 */  ldc1      $f22, 0x48($sp)
-/* 4036E0 E01182E0 D7B40040 */  ldc1      $f20, 0x40($sp)
-/* 4036E4 E01182E4 03E00008 */  jr        $ra
-/* 4036E8 E01182E8 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_update.s b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_update.s
deleted file mode 100644
index 7baa2c19a0..0000000000
--- a/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_update.s
+++ /dev/null
@@ -1,100 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel breaking_junk_update
-/* 4036F4 E01182F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 4036F8 E01182F8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 4036FC E01182FC 8C830000 */  lw        $v1, ($a0)
-/* 403700 E0118300 8C85000C */  lw        $a1, 0xc($a0)
-/* 403704 E0118304 30620010 */  andi      $v0, $v1, 0x10
-/* 403708 E0118308 10400005 */  beqz      $v0, .LE0118320
-/* 40370C E011830C 2402FFEF */   addiu    $v0, $zero, -0x11
-/* 403710 E0118310 00621024 */  and       $v0, $v1, $v0
-/* 403714 E0118314 AC820000 */  sw        $v0, ($a0)
-/* 403718 E0118318 24020010 */  addiu     $v0, $zero, 0x10
-/* 40371C E011831C ACA2001C */  sw        $v0, 0x1c($a1)
-.LE0118320:
-/* 403720 E0118320 8CA3001C */  lw        $v1, 0x1c($a1)
-/* 403724 E0118324 286203E8 */  slti      $v0, $v1, 0x3e8
-/* 403728 E0118328 10400002 */  beqz      $v0, .LE0118334
-/* 40372C E011832C 2462FFFF */   addiu    $v0, $v1, -1
-/* 403730 E0118330 ACA2001C */  sw        $v0, 0x1c($a1)
-.LE0118334:
-/* 403734 E0118334 8CA20020 */  lw        $v0, 0x20($a1)
-/* 403738 E0118338 8CA3001C */  lw        $v1, 0x1c($a1)
-/* 40373C E011833C 24420001 */  addiu     $v0, $v0, 1
-/* 403740 E0118340 04610005 */  bgez      $v1, .LE0118358
-/* 403744 E0118344 ACA20020 */   sw       $v0, 0x20($a1)
-/* 403748 E0118348 0C080128 */  jal       shim_remove_effect
-/* 40374C E011834C 00000000 */   nop
-/* 403750 E0118350 08046112 */  j         .LE0118448
-/* 403754 E0118354 00000000 */   nop
-.LE0118358:
-/* 403758 E0118358 28620008 */  slti      $v0, $v1, 8
-/* 40375C E011835C 10400002 */  beqz      $v0, .LE0118368
-/* 403760 E0118360 00031140 */   sll      $v0, $v1, 5
-/* 403764 E0118364 A4A20032 */  sh        $v0, 0x32($a1)
-.LE0118368:
-/* 403768 E0118368 8C820008 */  lw        $v0, 8($a0)
-/* 40376C E011836C 18400036 */  blez      $v0, .LE0118448
-/* 403770 E0118370 0000302D */   daddu    $a2, $zero, $zero
-/* 403774 E0118374 24A50028 */  addiu     $a1, $a1, 0x28
-/* 403778 E0118378 3C013FE0 */  lui       $at, 0x3fe0
-/* 40377C E011837C 44816800 */  mtc1      $at, $f13
-/* 403780 E0118380 44806000 */  mtc1      $zero, $f12
-/* 403784 E0118384 44804000 */  mtc1      $zero, $f8
-/* 403788 E0118388 3C01E012 */  lui       $at, %hi(D_E01187E0)
-/* 40378C E011838C D42A87E0 */  ldc1      $f10, %lo(D_E01187E0)($at)
-.LE0118390:
-/* 403790 E0118390 C4A0FFEC */  lwc1      $f0, -0x14($a1)
-/* 403794 E0118394 C4A6FFDC */  lwc1      $f6, -0x24($a1)
-/* 403798 E0118398 46000021 */  cvt.d.s   $f0, $f0
-/* 40379C E011839C 462C0001 */  sub.d     $f0, $f0, $f12
-/* 4037A0 E01183A0 C4A2FFE8 */  lwc1      $f2, -0x18($a1)
-/* 4037A4 E01183A4 C4A4FFF0 */  lwc1      $f4, -0x10($a1)
-/* 4037A8 E01183A8 46023180 */  add.s     $f6, $f6, $f2
-/* 4037AC E01183AC C4A2FFE0 */  lwc1      $f2, -0x20($a1)
-/* 4037B0 E01183B0 46200020 */  cvt.s.d   $f0, $f0
-/* 4037B4 E01183B4 46001080 */  add.s     $f2, $f2, $f0
-/* 4037B8 E01183B8 E4A0FFEC */  swc1      $f0, -0x14($a1)
-/* 4037BC E01183BC C4A0FFE4 */  lwc1      $f0, -0x1c($a1)
-/* 4037C0 E01183C0 46040000 */  add.s     $f0, $f0, $f4
-/* 4037C4 E01183C4 E4A6FFDC */  swc1      $f6, -0x24($a1)
-/* 4037C8 E01183C8 4608103C */  c.lt.s    $f2, $f8
-/* 4037CC E01183CC E4A2FFE0 */  swc1      $f2, -0x20($a1)
-/* 4037D0 E01183D0 4500000C */  bc1f      .LE0118404
-/* 4037D4 E01183D4 E4A0FFE4 */   swc1     $f0, -0x1c($a1)
-/* 4037D8 E01183D8 C4A0FFEC */  lwc1      $f0, -0x14($a1)
-/* 4037DC E01183DC 4608003C */  c.lt.s    $f0, $f8
-/* 4037E0 E01183E0 00000000 */  nop
-/* 4037E4 E01183E4 45000008 */  bc1f      .LE0118408
-/* 4037E8 E01183E8 30C20001 */   andi     $v0, $a2, 1
-/* 4037EC E01183EC 46000021 */  cvt.d.s   $f0, $f0
-/* 4037F0 E01183F0 462A0002 */  mul.d     $f0, $f0, $f10
-/* 4037F4 E01183F4 00000000 */  nop
-/* 4037F8 E01183F8 E4A8FFE0 */  swc1      $f8, -0x20($a1)
-/* 4037FC E01183FC 46200020 */  cvt.s.d   $f0, $f0
-/* 403800 E0118400 E4A0FFEC */  swc1      $f0, -0x14($a1)
-.LE0118404:
-/* 403804 E0118404 30C20001 */  andi      $v0, $a2, 1
-.LE0118408:
-/* 403808 E0118408 00021040 */  sll       $v0, $v0, 1
-/* 40380C E011840C 2442FFFF */  addiu     $v0, $v0, -1
-/* 403810 E0118410 000218C0 */  sll       $v1, $v0, 3
-/* 403814 E0118414 00621823 */  subu      $v1, $v1, $v0
-/* 403818 E0118418 00031840 */  sll       $v1, $v1, 1
-/* 40381C E011841C C4A20000 */  lwc1      $f2, ($a1)
-/* 403820 E0118420 44830000 */  mtc1      $v1, $f0
-/* 403824 E0118424 00000000 */  nop
-/* 403828 E0118428 46800020 */  cvt.s.w   $f0, $f0
-/* 40382C E011842C 46001080 */  add.s     $f2, $f2, $f0
-/* 403830 E0118430 24C60001 */  addiu     $a2, $a2, 1
-/* 403834 E0118434 E4A20000 */  swc1      $f2, ($a1)
-/* 403838 E0118438 8C820008 */  lw        $v0, 8($a0)
-/* 40383C E011843C 00C2102A */  slt       $v0, $a2, $v0
-/* 403840 E0118440 1440FFD3 */  bnez      $v0, .LE0118390
-/* 403844 E0118444 24A5003C */   addiu    $a1, $a1, 0x3c
-.LE0118448:
-/* 403848 E0118448 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 40384C E011844C 03E00008 */  jr        $ra
-/* 403850 E0118450 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_update.s b/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_update.s
index ae843c3d22..aa41341b53 100644
--- a/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_update.s
+++ b/ver/us/asm/nonmatchings/effects/bulb_glow/bulb_glow_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00789D0
+.double 0.6, 0.0
+
+.section .text
+
 glabel bulb_glow_update
 /* 37A51C E007812C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37A520 E0078130 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_appendGfx.s b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_appendGfx.s
index ba58216922..ea46810b1c 100644
--- a/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E010E930
+.word LE010E61C_3EBAFC, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E5E4_3EBAC4, LE010E60C_3EBAEC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, LE010E61C_3EBAFC, 0
+
+.section .text
+
 glabel chapter_change_appendGfx
 /* 3EBA38 E010E558 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3EBA3C E010E55C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_update.s b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_update.s
index 0bd596619a..8f335a413d 100644
--- a/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_update.s
+++ b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_update.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E009AA60
+.word LE009A1AC_39675C, LE009A24C_3967FC, LE009A270_396820, LE009A28C_39683C, LE009A32C_3968DC, LE009A348_3968F8
+
+dlabel D_E009AA78
+.double 0.02
+
+dlabel D_E009AA80
+.double 0.05, 0.0
+
+.section .text
+
 glabel chomp_drop_update
 /* 3966F0 E009A140 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3966F4 E009A144 AFBF0020 */  sw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_appendGfx.s b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_appendGfx.s
index 0c69bc664a..a15c365645 100644
--- a/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_appendGfx.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel cold_breath_appendGfx
 /* 3D89C8 E00DE2A8 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D89CC E00DE2AC 0080302D */  daddu     $a2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_update.s b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_update.s
index 1bc6cd2d0c..ef4fb80cbd 100644
--- a/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_update.s
+++ b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00DE9D0
+.double 0.02, 0.0
+
+.section .text
+
 glabel cold_breath_update
 /* 3D8844 E00DE124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D8848 E00DE128 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/confetti/confetti_main.s b/ver/us/asm/nonmatchings/effects/confetti/confetti_main.s
index 24f54e4b0c..297a0270f0 100644
--- a/ver/us/asm/nonmatchings/effects/confetti/confetti_main.s
+++ b/ver/us/asm/nonmatchings/effects/confetti/confetti_main.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E0088D30
+.word LE00881F4_38AFE4, LE00881FC_38AFEC, LE0088204_38AFF4, LE008820C_38AFFC, LE00881F4_38AFE4, LE00881FC_38AFEC, LE0088204_38AFF4, 0
+
+dlabel jtbl_E0088D50
+.word LE0088230_38B020, LE0088240_38B030, LE0088250_38B040, LE0088250_38B040, LE0088230_38B020, LE0088240_38B030, LE0088250_38B040, 0
+
+dlabel D_E0088D70
+.word 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0xE0088374, 0x00000000
+
+dlabel D_E0088D90
+.double 0.02
+
+dlabel D_E0088D98
+.double -0.02
+
+.section .text
+
 glabel confetti_main
 /* 38AF6C E008817C 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 38AF70 E0088180 F7B40058 */  sdc1      $f20, 0x58($sp)
diff --git a/ver/us/asm/nonmatchings/effects/confetti/confetti_update.s b/ver/us/asm/nonmatchings/effects/confetti/confetti_update.s
index 3187084cbb..d400ee1fd9 100644
--- a/ver/us/asm/nonmatchings/effects/confetti/confetti_update.s
+++ b/ver/us/asm/nonmatchings/effects/confetti/confetti_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0088DA0
+.double 0.98, 0.0
+
+.section .text
+
 glabel confetti_update
 /* 38B398 E00885A8 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 38B39C E00885AC AFBF0028 */  sw        $ra, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/confetti/func_E0088000.s b/ver/us/asm/nonmatchings/effects/confetti/func_E0088000.s
index 84cd9b7c6f..49ddb228c9 100644
--- a/ver/us/asm/nonmatchings/effects/confetti/func_E0088000.s
+++ b/ver/us/asm/nonmatchings/effects/confetti/func_E0088000.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0088D10
+.double 0.03
+
+dlabel D_E0088D18
+.double 0.01
+
+dlabel D_E0088D20
+.double -1.7
+
+dlabel D_E0088D28
+.double 0.05
+
+.section .text
+
 glabel func_E0088000
 /* 38ADF0 E0088000 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 38ADF4 E0088004 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_main.s b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_main.s
index c89bb34884..0b9ce19213 100644
--- a/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_main.s
+++ b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0030EC0
+.word 0xE00305D0, 0xE00305DC, 0xE00305F4, 0xE0030660, 0xE0030660, 0x00000000
+
+.section .text
+
 glabel damage_stars_main
 /* 342140 E0030000 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 342144 E0030004 F7B600A8 */  sdc1      $f22, 0xa8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_update.s b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_update.s
index 64e90cb959..cae06f11a2 100644
--- a/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_update.s
+++ b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0030ED8
+.double 0.94
+
+dlabel D_E0030EE0
+.double 0.8
+
+dlabel D_E0030EE8
+.double 0.6
+
+dlabel D_E0030EF0
+.double 0.7, 0.0
+
+.section .text
+
 glabel damage_stars_update
 /* 342870 E0030730 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 342874 E0030734 AFB40020 */  sw        $s4, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_update.s b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_update.s
index 9f822aada1..8ecb07ffab 100644
--- a/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_update.s
+++ b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_update.s
@@ -1,6 +1,31 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00287E0
+.double 0.3
+
+dlabel D_E00287E8
+.double 0.8
+
+dlabel D_E00287F0
+.double 0.2
+
+dlabel D_E00287F8
+.double 0.94
+
+dlabel D_E0028800
+.double 0.05
+
+dlabel D_E0028808
+.double 0.95
+
+dlabel D_E0028810
+.double 0.92, 0.0
+
+.section .text
+
 glabel drop_leaves_update
 /* 33D038 E0028248 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 33D03C E002824C AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/dust/dust_main.s b/ver/us/asm/nonmatchings/effects/dust/dust_main.s
index 05cfcfd292..7d18df55c4 100644
--- a/ver/us/asm/nonmatchings/effects/dust/dust_main.s
+++ b/ver/us/asm/nonmatchings/effects/dust/dust_main.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E002A720
+.double 0.1
+
+dlabel D_E002A728
+.double 0.2
+
+.section .text
+
 glabel dust_main
 /* 33E8C0 E002A000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 33E8C4 E002A004 F7B40040 */  sdc1      $f20, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/dust/dust_update.s b/ver/us/asm/nonmatchings/effects/dust/dust_update.s
index 9c2e7881dc..35cecb5184 100644
--- a/ver/us/asm/nonmatchings/effects/dust/dust_update.s
+++ b/ver/us/asm/nonmatchings/effects/dust/dust_update.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E002A730
+.double 0.9
+
+dlabel D_E002A738
+.double 0.005
+
+.section .text
+
 glabel dust_update
 /* 33EB4C E002A28C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 33EB50 E002A290 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_main.s b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_main.s
index f9a3cf6566..67ad1e8dbd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_main.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E007AC00
+.double 0.05
+
+dlabel D_E007AC08
+.double 0.1
+
+.section .text
+
 glabel fx_3D_main
 /* 37C540 E007A000 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 37C544 E007A004 F7B60098 */  sdc1      $f22, 0x98($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_update.s b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_update.s
index f23af13c27..dacf1428c3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E007AC10
+.double 0.03
+
+dlabel D_E007AC18
+.double 0.225
+
+dlabel D_E007AC20
+.double 0.2
+
+dlabel D_E007AC28
+.double 0.45
+
+dlabel D_E007AC30
+.double 0.8, 0.0
+
+.section .text
+
 glabel fx_3D_update
 /* 37CA4C E007A50C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37CA50 E007A510 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s
index e7fe7ce1ae..6a8fffd6f3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_main.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E008CB20
+.double 1.2
+
+dlabel D_E008CB28
+.word 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC, 0xE008C180, 0xE008C1CC
+
+dlabel D_E008CB48
+.word 0xE008C34C, 0xE008C34C, 0xE008C354, 0xE008C354, 0xE008C35C, 0xE008C35C
+
+.section .text
+
 glabel fx_46_main
 /* 38DE00 E008C000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 38DE04 E008C004 AFB00038 */  sw        $s0, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_update.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_update.s
index 31f1252a4c..bc54981de8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E008CB60
+.double 0.05
+
+dlabel D_E008CB68
+.double 0.3
+
+dlabel D_E008CB70
+.double 0.8
+
+dlabel D_E008CB78
+.double 0.1
+
+dlabel D_E008CB80
+.double 0.2, 0.0
+
+.section .text
+
 glabel fx_46_update
 /* 38E1FC E008C3FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 38E200 E008C400 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_update.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_update.s
index 473bfe88eb..fab63c83b9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_update.s
@@ -1,6 +1,37 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00C6CB0
+.double 0.97
+
+dlabel D_E00C6CB8
+.double 0.02
+
+dlabel D_E00C6CC0
+.double 0.05
+
+dlabel D_E00C6CC8
+.double 0.1
+
+dlabel D_E00C6CD0
+.double 0.9
+
+dlabel D_E00C6CD8
+.double 0.2
+
+dlabel D_E00C6CE0
+.double -0.6
+
+dlabel D_E00C6CE8
+.double 0.07
+
+dlabel D_E00C6CF0
+.double 0.05, 0.0
+
+.section .text
+
 glabel fx_63_update
 /* 3CCD7C E00C639C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3CCD80 E00C63A0 AFB20030 */  sw        $s2, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s
index 0eba45cd74..c87c473628 100644
--- a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00CACC0
+.double 0.8
+
+dlabel D_E00CACC8
+.double 255.0
+
+dlabel D_E00CACD0
+.double 0.4
+
+dlabel D_E00CACD8
+.double 255.0
+
+.section .text
+
 glabel fx_65_appendGfx
 /* 3D09CC E00CA4CC 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D09D0 E00CA4D0 0080482D */  daddu     $t1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/embers/embers_update.s b/ver/us/asm/nonmatchings/effects/embers/embers_update.s
index 7f6109004c..f36bb994b2 100644
--- a/ver/us/asm/nonmatchings/effects/embers/embers_update.s
+++ b/ver/us/asm/nonmatchings/effects/embers/embers_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00E0AC0
+.double 0.05
+
+dlabel D_E00E0AC8
+.double 0.04
+
+dlabel D_E00E0AD0
+.double 0.1
+
+dlabel D_E00E0AD8
+.double 0.3
+
+.section .text
+
 glabel embers_update
 /* 3DB638 E00E01D8 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3DB63C E00E01DC AFB20020 */  sw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_appendGfx.s b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_appendGfx.s
index 0bc55ff80c..893eb6aa57 100644
--- a/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0068600
+.double 0.97, 0.0
+
+.section .text
+
 glabel ending_decals_appendGfx
 /* 36AB04 E0068234 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 36AB08 E0068238 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_main.s b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_main.s
index e4e607cd19..81f26143e3 100644
--- a/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_main.s
+++ b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_main.s
@@ -1,6 +1,34 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00D6EA0
+.double 0.2
+
+dlabel D_E00D6EA8
+.double 0.1
+
+dlabel D_E00D6EB0
+.double 0.3
+
+dlabel jtbl_E00D6EB8
+.word LE00D6204_3D5224, LE00D6204_3D5224, LE00D6204_3D5224, LE00D6264_3D5284, LE00D65A0_3D55C0, LE00D6264_3D5284, LE00D62C0_3D52E0, LE00D6320_3D5340, LE00D6380_3D53A0, LE00D63E4_3D5404, LE00D6494_3D54B4, LE00D652C_3D554C, LE00D65A0_3D55C0, 0
+
+dlabel D_E00D6EF0
+.double 0.6
+
+dlabel D_E00D6EF8
+.double 0.6
+
+dlabel D_E00D6F00
+.double 0.05
+
+dlabel D_E00D6F08
+.double 0.6
+
+.section .text
+
 glabel energy_in_out_main
 /* 3D5020 E00D6000 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 3D5024 E00D6004 F7B40060 */  sdc1      $f20, 0x60($sp)
diff --git a/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_main.s b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_main.s
index 74b7395d8f..7ba5edfb7d 100644
--- a/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_main.s
+++ b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00726B0
+.double 0.1, 0.0
+
+.section .text
+
 glabel energy_shockwave_main
 /* 374E50 E0072000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 374E54 E0072004 F7B40038 */  sdc1      $f20, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/explosion/explosion_update.s b/ver/us/asm/nonmatchings/effects/explosion/explosion_update.s
index 8a0b2f4636..5266c18213 100644
--- a/ver/us/asm/nonmatchings/effects/explosion/explosion_update.s
+++ b/ver/us/asm/nonmatchings/effects/explosion/explosion_update.s
@@ -1,6 +1,28 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00328C0
+.double 0.4
+
+dlabel D_E00328C8
+.double 0.6
+
+dlabel D_E00328D0
+.double 0.9
+
+dlabel D_E00328D8
+.double 0.6
+
+dlabel D_E00328E0
+.double 0.1
+
+dlabel D_E00328E8
+.double 0.9
+
+.section .text
+
 glabel explosion_update
 /* 343858 E00321D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 34385C E00321DC AFBF0024 */  sw        $ra, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_update.s b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_update.s
index c6a0b8a8b2..3e1c274862 100644
--- a/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_update.s
+++ b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_update.s
@@ -1,6 +1,31 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0058780
+.double 0.3
+
+dlabel D_E0058788
+.double 0.8
+
+dlabel D_E0058790
+.double 0.2
+
+dlabel D_E0058798
+.double 0.94
+
+dlabel D_E00587A0
+.double 0.05
+
+dlabel D_E00587A8
+.double 0.95
+
+dlabel D_E00587B0
+.double 0.92, 0.0
+
+.section .text
+
 glabel falling_leaves_update
 /* 35EAD4 E00581B4 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 35EAD8 E00581B8 AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/firework/firework_main.s b/ver/us/asm/nonmatchings/effects/firework/firework_main.s
index 1856086446..1a679e8b6d 100644
--- a/ver/us/asm/nonmatchings/effects/firework/firework_main.s
+++ b/ver/us/asm/nonmatchings/effects/firework/firework_main.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel firework_main
 /* 389850 E0086000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 389854 E0086004 AFB00028 */  sw        $s0, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/firework/firework_update.s b/ver/us/asm/nonmatchings/effects/firework/firework_update.s
index eae699205a..00f8052073 100644
--- a/ver/us/asm/nonmatchings/effects/firework/firework_update.s
+++ b/ver/us/asm/nonmatchings/effects/firework/firework_update.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel firework_update
 /* 389AC8 E0086278 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 389ACC E008627C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/firework/func_E00863B4.s b/ver/us/asm/nonmatchings/effects/firework/func_E00863B4.s
index 78c911d857..c27b2a0dae 100644
--- a/ver/us/asm/nonmatchings/effects/firework/func_E00863B4.s
+++ b/ver/us/asm/nonmatchings/effects/firework/func_E00863B4.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel func_E00863B4
 /* 389C04 E00863B4 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 389C08 E00863B8 AFBF00EC */  sw        $ra, 0xec($sp)
diff --git a/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_appendGfx.s b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_appendGfx.s
index 1fc116252d..df21fd0a7e 100644
--- a/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E010AFA8
+.double 0.8
+
+.section .text
+
 glabel firework_rocket_appendGfx
 /* 3E4888 E010A4E8 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 3E488C E010A4EC AFB70094 */  sw        $s7, 0x94($sp)
diff --git a/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_update.s b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_update.s
index b5f15c08a9..121cda75ab 100644
--- a/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_update.s
+++ b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_update.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E010AF90
+.double 0.11
+
+dlabel D_E010AF98
+.double 0.15
+
+dlabel D_E010AFA0
+.double 0.15
+
+.section .text
+
 glabel firework_rocket_update
 /* 3E452C E010A18C 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3E4530 E010A190 AFBF001C */  sw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_update.s b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_update.s
index 9cd01906a8..d970b5cab5 100644
--- a/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_update.s
+++ b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00947B0
+.double 1.1
+
+dlabel D_E00947B8
+.double 0.05
+
+dlabel D_E00947C0
+.double 0.9
+
+dlabel D_E00947C8
+.double 0.8
+
+.section .text
+
 glabel flashing_box_shockwave_update
 /* 392A68 E0094198 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 392A6C E009419C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_update.s b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_update.s
index 23f02e152c..e8413c9552 100644
--- a/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_update.s
+++ b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_update.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00D2510
+.double 0.6
+
+dlabel D_E00D2518
+.double 0.01
+
+.section .text
+
 glabel floating_cloud_puff_update
 /* 3D4A90 E00D2120 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D4A94 E00D2124 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_update.s b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_update.s
index 2e49e95bb5..a5a911e898 100644
--- a/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_update.s
+++ b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0098530
+.double 0.8, 0.0
+
+.section .text
+
 glabel floating_rock_update
 /* 395D20 E0098170 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 395D24 E0098174 AFBF0020 */  sw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_appendGfx.s b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_appendGfx.s
index 6a98bc3319..7eb7191167 100644
--- a/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E00C29A8
+.word LE00C27F0_3C19C0, LE00C2818_3C19E8, LE00C2830_3C1A00, LE00C2848_3C1A18, LE00C2860_3C1A30, LE00C2878_3C1A48, LE00C2890_3C1A60, LE00C28A8_3C1A78, LE00C28C0_3C1A90, LE00C28D8_3C1AA8
+
+.section .text
+
 glabel fright_jar_appendGfx
 /* 3C13EC E00C221C 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3C13F0 E00C2220 0080302D */  daddu     $a2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_main.s b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_main.s
index 6cea8d38f8..010ae46ee3 100644
--- a/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_main.s
+++ b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00C29A0
+.double 0.1
+
+.section .text
+
 glabel fright_jar_main
 /* 3C11D0 E00C2000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3C11D4 E00C2004 F7B40038 */  sdc1      $f20, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_main.s b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_main.s
index 2b64c4bcae..32ba0916bc 100644
--- a/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_main.s
+++ b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0026A20
+.double 0.2
+
+.section .text
+
 glabel gather_energy_pink_main
 /* 33B180 E0026000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 33B184 E0026004 F7B40038 */  sdc1      $f20, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_update.s b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_update.s
index 18edb61fd5..3837cad0fe 100644
--- a/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_update.s
+++ b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0026A28
+.double 0.7
+
+dlabel D_E0026A30
+.double 0.1
+
+dlabel D_E0026A38
+.double 0.4
+
+dlabel D_E0026A40
+.double 0.1
+
+dlabel D_E0026A48
+.double 0.3
+
+.section .text
+
 glabel gather_energy_pink_update
 /* 33B30C E002618C 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 33B310 E0026190 AFB1003C */  sw        $s1, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_update.s b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_update.s
index 1819726587..c56396cabf 100644
--- a/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_update.s
+++ b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E008E8A0
+.double 0.2, 0.0
+
+.section .text
+
 glabel gather_magic_update
 /* 38F064 E008E204 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 38F068 E008E208 AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_appendGfx.s b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_appendGfx.s
index 4989740fc6..c793f6f64d 100644
--- a/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0036650
+.double 0.6, 0.0
+
+.section .text
+
 glabel got_item_outline_appendGfx
 /* 345704 E0036224 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 345708 E0036228 0080402D */  daddu     $t0, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_update.s b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_update.s
index 7cd599763c..ee02cc7be7 100644
--- a/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_update.s
+++ b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_update.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel got_item_outline_update
 /* 3455C4 E00360E4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3455C8 E00360E8 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/green_impact/green_impact_appendGfx.s b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_appendGfx.s
index 7c817d89d7..0cead3afbc 100644
--- a/ver/us/asm/nonmatchings/effects/green_impact/green_impact_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0064A90
+.double 0.3, 0.0
+
+.section .text
+
 glabel green_impact_appendGfx
 /* 365324 E0064414 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 365328 E0064418 AFB300E4 */  sw        $s3, 0xe4($sp)
diff --git a/ver/us/asm/nonmatchings/effects/green_impact/green_impact_update.s b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_update.s
index 6aaed81162..06bff785f9 100644
--- a/ver/us/asm/nonmatchings/effects/green_impact/green_impact_update.s
+++ b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0064A70
+.double 0.8
+
+dlabel D_E0064A78
+.double 0.2
+
+dlabel D_E0064A80
+.double 0.9
+
+dlabel D_E0064A88
+.double 0.1
+
+.section .text
+
 glabel green_impact_update
 /* 3650B4 E00641A4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3650B8 E00641A8 AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_appendGfx.s b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_appendGfx.s
index e3f30a6696..4040cd1bd3 100644
--- a/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_appendGfx.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00E2A30
+.double 78.75
+
+dlabel D_E00E2A38
+.double 0.01
+
+.section .text
+
 glabel hieroglyphs_appendGfx
 /* 3DC528 E00E2218 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 3DC52C E00E221C 0080302D */  daddu     $a2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_update.s b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_update.s
index 904782b2b3..5bea1646ba 100644
--- a/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_update.s
+++ b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E011E810
+.double 0.1
+
+dlabel D_E011E818
+.double 0.7
+
+dlabel D_E011E820
+.double 0.3
+
+dlabel D_E011E828
+.double 0.01
+
+.section .text
+
 glabel ice_pillar_update
 /* 409B24 E011E194 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 409B28 E011E198 AFB30024 */  sw        $s3, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_main.s b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_main.s
index 8419286922..d4e1d85580 100644
--- a/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_main.s
+++ b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E01108C0
+.double 0.1
+
+.section .text
+
 glabel ice_shard_main
 /* 3F83F0 E0110000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3F83F4 E0110004 F7B40040 */  sdc1      $f20, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_update.s b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_update.s
index f3c42878e1..da078514c1 100644
--- a/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_update.s
+++ b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E01108C8
+.double -0.7
+
+.section .text
+
 glabel ice_shard_update
 /* 3F861C E011022C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3F8620 E0110230 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_appendGfx.s b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_appendGfx.s
index 4a9e1511e1..95f72fb5c5 100644
--- a/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_appendGfx.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel lens_flare_appendGfx
 /* 344D20 E0034310 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 344D24 E0034314 3C03DB06 */  lui       $v1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_update.s b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_update.s
index 405423f854..8646519a8f 100644
--- a/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_update.s
+++ b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00347B0
+.double 0.78
+
+dlabel D_E00347B8
+.double 0.93
+
+dlabel D_E00347C0
+.double 0.29
+
+dlabel D_E00347C8
+.double 0.9
+
+.section .text
+
 glabel lens_flare_update
 /* 344B20 E0034110 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 344B24 E0034114 AFBF0018 */  sw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/light_rays/func_E006A0BC.s b/ver/us/asm/nonmatchings/effects/light_rays/func_E006A0BC.s
index 42e7f51569..c1e9a0e660 100644
--- a/ver/us/asm/nonmatchings/effects/light_rays/func_E006A0BC.s
+++ b/ver/us/asm/nonmatchings/effects/light_rays/func_E006A0BC.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E006AF50
+.double 0.1
+
+.section .text
+
 glabel func_E006A0BC
 /* 36D0DC E006A0BC 24A2FFFF */  addiu     $v0, $a1, -1
 /* 36D0E0 E006A0C0 00021880 */  sll       $v1, $v0, 2
diff --git a/ver/us/asm/nonmatchings/effects/light_rays/light_rays_appendGfx.s b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_appendGfx.s
index 503e0de03d..b9d6953c3e 100644
--- a/ver/us/asm/nonmatchings/effects/light_rays/light_rays_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_appendGfx.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E006AF58
+.double 0.3
+
+dlabel D_E006AF60
+.double 0.9, 0.0
+
+.section .text
+
 glabel light_rays_appendGfx
 /* 36D96C E006A94C 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 36D970 E006A950 AFA40120 */  sw        $a0, 0x120($sp)
diff --git a/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_update.s b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_update.s
index cd1d43900d..3db8222792 100644
--- a/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_update.s
+++ b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E0114750
+.word LE0114150_3FEC30, LE0114148_3FEC28, LE01141B4_3FEC94, LE0114158_3FEC38, LE0114210_3FECF0, LE011426C_3FED4C, 0, 0
+
+.section .text
+
 glabel lil_oink_update
 /* 3FEBBC E01140DC 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3FEBC0 E01140E0 AFBF0028 */  sw        $ra, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_update.s b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_update.s
index db221624a9..e940853329 100644
--- a/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_update.s
+++ b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_update.s
@@ -1,6 +1,34 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00E4E20
+.double 0.05
+
+dlabel D_E00E4E28
+.double 0.04
+
+dlabel D_E00E4E30
+.double 0.2
+
+dlabel D_E00E4E38
+.double 0.6
+
+dlabel D_E00E4E40
+.double 0.1
+
+dlabel D_E00E4E48
+.double 0.2
+
+dlabel D_E00E4E50
+.double 0.6
+
+dlabel D_E00E4E58
+.double 0.01
+
+.section .text
+
 glabel misc_particles_update
 /* 3DE290 E00E4290 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 3DE294 E00E4294 AFB40038 */  sw        $s4, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/partner_buff/func_E011A700.s b/ver/us/asm/nonmatchings/effects/partner_buff/func_E011A700.s
index 4b0ae8a795..1eb6e50656 100644
--- a/ver/us/asm/nonmatchings/effects/partner_buff/func_E011A700.s
+++ b/ver/us/asm/nonmatchings/effects/partner_buff/func_E011A700.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel func_E011A700
 /* 404920 E011A700 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 404924 E011A704 0080302D */  daddu     $a2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_update.s b/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_update.s
index 747caca83f..edbdcf6c4b 100644
--- a/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_update.s
+++ b/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E011AC70
+.word LE011A214_404434, LE011A280_4044A0, LE011A2C4_4044E4, LE011A304_404524, LE011A324_404544, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A28C_4044AC, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A2D0_4044F0, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A360_404580, LE011A334_404554, 0, 0, 0
+
+.section .text
+
 glabel partner_buff_update
 /* 404324 E011A104 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 404328 E011A108 AFBF002C */  sw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_appendGfx.s b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_appendGfx.s
index d9d7c642bd..09a095d652 100644
--- a/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_appendGfx.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E010CA60
+.double 255.0
+
+dlabel D_E010CA68
+.double 0.4
+
+.section .text
+
 glabel peach_star_beam_appendGfx
 /* 3E585C E010C39C 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3E5860 E010C3A0 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_main.s b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_main.s
index 37ac16c618..1676afa08e 100644
--- a/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_main.s
+++ b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_main.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0124C00
+.double 0.1
+
+dlabel D_E0124C08
+.double 0.04
+
+dlabel D_E0124C10
+.double 0.001
+
+.section .text
+
 glabel pink_sparkles_main
 /* 412730 E0124000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 412734 E0124004 F7B40050 */  sdc1      $f20, 0x50($sp)
diff --git a/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_update.s b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_update.s
index ab79c57c56..4a6ab9e697 100644
--- a/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_update.s
+++ b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_update.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0124C18
+.double 0.01
+
+dlabel D_E0124C20
+.double 0.4
+
+dlabel D_E0124C28
+.double 0.1
+
+.section .text
+
 glabel pink_sparkles_update
 /* 412A34 E0124304 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 412A38 E0124308 0000302D */  daddu     $a2, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_main.s b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_main.s
index 544715d4a8..04a32b631d 100644
--- a/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_main.s
+++ b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E003E870
+.double 0.1
+
+.section .text
+
 glabel purple_ring_main
 /* 352440 E003E000 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 352444 E003E004 F7BA00A0 */  sdc1      $f26, 0xa0($sp)
diff --git a/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_update.s b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_update.s
index 4f18fef27a..ee8e8a1038 100644
--- a/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_update.s
+++ b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E003E878
+.double 0.3
+
+dlabel D_E003E880
+.double 0.8
+
+dlabel D_E003E888
+.double 0.6
+
+dlabel D_E003E890
+.double 0.7
+
+dlabel D_E003E898
+.double 1.05
+
+.section .text
+
 glabel purple_ring_update
 /* 352840 E003E400 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 352844 E003E404 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_main.s b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_main.s
index fc0df5e18f..09f3f2859a 100644
--- a/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_main.s
+++ b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E0066CE0
+.word LE006615C_36618C, LE006615C_36618C, LE0066198_3661C8, LE00661C0_3661F0, LE006620C_36623C, LE0066240_366270, LE006626C_36629C, LE00662A0_3662D0, LE00662DC_36630C, LE0066318_366348, LE0066348_366378, LE00663AC_3663DC, LE00663F8_366428, LE00663F8_366428, LE006642C_36645C, 0
+
+.section .text
+
 glabel radial_shimmer_main
 /* 366030 E0066000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 366034 E0066004 F7B40038 */  sdc1      $f20, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_update.s b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_update.s
index a7468ffca0..b6e4565d7c 100644
--- a/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_update.s
+++ b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0066D20
+.double 0.7, 0.0
+
+.section .text
+
 glabel radial_shimmer_update
 /* 3664C8 E0066498 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3664CC E006649C AFB1003C */  sw        $s1, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/red_impact/red_impact_appendGfx.s b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_appendGfx.s
index a51b76d39e..8cd01d33f6 100644
--- a/ver/us/asm/nonmatchings/effects/red_impact/red_impact_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00D0B40
+.double 0.3, 0.0
+
+.section .text
+
 glabel red_impact_appendGfx
 /* 3D42AC E00D048C 27BDFED8 */  addiu     $sp, $sp, -0x128
 /* 3D42B0 E00D0490 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/red_impact/red_impact_update.s b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_update.s
index c6f8bf146e..d599bc930a 100644
--- a/ver/us/asm/nonmatchings/effects/red_impact/red_impact_update.s
+++ b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00D0B20
+.double 0.8
+
+dlabel D_E00D0B28
+.double 1.002
+
+dlabel D_E00D0B30
+.double 0.6
+
+dlabel D_E00D0B38
+.double 0.9
+
+.section .text
+
 glabel red_impact_update
 /* 3D3FB4 E00D0194 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3D3FB8 E00D0198 AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_update.s b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_update.s
index 7179f95428..273bed9add 100644
--- a/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_update.s
+++ b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0048A10
+.double 0.1, 0.0
+
+.section .text
+
 glabel ring_blast_update
 /* 356AB0 E0048130 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 356AB4 E0048134 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_main.s b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_main.s
index bc48f5cc38..8d111bf80d 100644
--- a/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_main.s
+++ b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_main.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0046620
+.double 0.1
+
+dlabel D_E0046628
+.double 0.7
+
+dlabel D_E0046630
+.double 0.4
+
+.section .text
+
 glabel rising_bubble_main
 /* 355EE0 E0046000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 355EE4 E0046004 F7B40038 */  sdc1      $f20, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s
index 22d63ef693..ebe13eff48 100644
--- a/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s
+++ b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0046638
+.double 0.3
+
+dlabel D_E0046640
+.double 0.1, 0.0
+
+.section .text
+
 glabel rising_bubble_update
 /* 356040 E0046160 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 356044 E0046164 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_main.s b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_main.s
index 05aa9dc4cd..6a5c7c45f9 100644
--- a/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_main.s
+++ b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E002C9D0
+.double 0.1
+
+.section .text
+
 glabel shattering_stones_main
 /* 33FE80 E002C000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 33FE84 E002C004 F7B40050 */  sdc1      $f20, 0x50($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_update.s b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_update.s
index e1f44dadd1..174610991a 100644
--- a/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_update.s
+++ b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E002C9D8
+.double -0.1
+
+dlabel D_E002C9E0
+.double 0.8
+
+dlabel D_E002C9E8
+.double -0.2
+
+dlabel D_E002C9F0
+.double 0.9, 0.0
+
+.section .text
+
 glabel shattering_stones_update
 /* 3400BC E002C23C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3400C0 E002C240 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_update.s b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_update.s
index 4ec305523f..44f3d1ed6e 100644
--- a/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_update.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_update.s
@@ -1,6 +1,31 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0070D60
+.double 0.02
+
+dlabel D_E0070D68
+.double 0.04
+
+dlabel D_E0070D70
+.double 0.4
+
+dlabel D_E0070D78
+.double 0.1
+
+dlabel D_E0070D80
+.double 0.3
+
+dlabel D_E0070D88
+.double 0.2
+
+dlabel D_E0070D90
+.double 0.6, 0.0
+
+.section .text
+
 glabel shimmer_burst_update
 /* 3742A4 E00701F4 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 3742A8 E00701F8 AFB20028 */  sw        $s2, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_update.s b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_update.s
index bf7f8a6105..65f9e7dadf 100644
--- a/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_update.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0074BF0
+.double 0.04
+
+dlabel D_E0074BF8
+.double 0.4
+
+dlabel D_E0074C00
+.double 0.2
+
+dlabel D_E0074C08
+.double 0.6
+
+.section .text
+
 glabel shimmer_wave_update
 /* 376648 E00741E8 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 37664C E00741EC AFB20020 */  sw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_appendGfx.s b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_appendGfx.s
index bcec908091..509e6bd3e7 100644
--- a/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_appendGfx.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel shiny_flare_appendGfx
 /* 3D7470 E00DA230 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3D7474 E00DA234 0080302D */  daddu     $a2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_update.s b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_update.s
index 0b156632b5..56a67d9e07 100644
--- a/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_update.s
+++ b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00DA520
+.double 0.3, 0.0
+
+.section .text
+
 glabel shiny_flare_update
 /* 3D7344 E00DA104 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D7348 E00DA108 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shockwave/shockwave_appendGfx.s b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_appendGfx.s
index e6b16281c2..5e7f9e7673 100644
--- a/ver/us/asm/nonmatchings/effects/shockwave/shockwave_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E004AEE8
+.double 0.3
+
+.section .text
+
 glabel shockwave_appendGfx
 /* 358C4C E004A78C 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 358C50 E004A790 AFBF00FC */  sw        $ra, 0xfc($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shockwave/shockwave_main.s b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_main.s
index 2fb76e2074..ce700b48b5 100644
--- a/ver/us/asm/nonmatchings/effects/shockwave/shockwave_main.s
+++ b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E004AE80
+.word LE004A1AC_35866C, LE004A1AC_35866C, LE004A1D4_358694, LE004A200_3586C0, LE004A25C_35871C, LE004A22C_3586EC
+
+.section .text
+
 glabel shockwave_main
 /* 3584C0 E004A000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3584C4 E004A004 F7B40040 */  sdc1      $f20, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/shockwave/shockwave_update.s b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_update.s
index 0b15968548..a3c68cfa20 100644
--- a/ver/us/asm/nonmatchings/effects/shockwave/shockwave_update.s
+++ b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_update.s
@@ -1,6 +1,34 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E004AE98
+.double 0.8
+
+dlabel D_E004AEA0
+.double 0.94
+
+dlabel D_E004AEA8
+.double 1.002
+
+dlabel D_E004AEB0
+.word 0xE004A4F8, 0xE004A4F8, 0xE004A51C, 0xE004A548, 0xE004A584, 0xE004A51C
+
+dlabel D_E004AEC8
+.double 0.8
+
+dlabel D_E004AED0
+.double 0.9
+
+dlabel D_E004AED8
+.double 0.99
+
+dlabel D_E004AEE0
+.double 0.95
+
+.section .text
+
 glabel shockwave_update
 /* 3587F0 E004A330 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3587F4 E004A334 AFB40020 */  sw        $s4, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_update.s b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_update.s
index 8b39251ae8..6941f06d87 100644
--- a/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_update.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_update.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E003A820
+.double 0.1
+
+dlabel D_E003A828
+.double 0.04
+
+dlabel D_E003A830
+.double 0.9, 0.0
+
+.section .text
+
 glabel smoke_impact_update
 /* 34EE5C E003A1DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 34EE60 E003A1E0 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/snowfall/func_E008A000.s b/ver/us/asm/nonmatchings/effects/snowfall/func_E008A000.s
index b2b8f75d19..03210fcaba 100644
--- a/ver/us/asm/nonmatchings/effects/snowfall/func_E008A000.s
+++ b/ver/us/asm/nonmatchings/effects/snowfall/func_E008A000.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E008AA60
+.double 0.05
+
+dlabel D_E008AA68
+.double 0.01
+
+dlabel D_E008AA70
+.double -1.2
+
+.section .text
+
 glabel func_E008A000
 /* 38C5F0 E008A000 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 38C5F4 E008A004 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/snowfall/snowfall_update.s b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_update.s
index 3a27469918..73402fc7af 100644
--- a/ver/us/asm/nonmatchings/effects/snowfall/snowfall_update.s
+++ b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E008AA78
+.double 0.3
+
+.section .text
+
 glabel snowfall_update
 /* 38CB2C E008A53C 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 38CB30 E008A540 0080282D */  daddu     $a1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_update.s b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_update.s
index 2512c53af3..71a89e54cd 100644
--- a/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_update.s
+++ b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00C0C00
+.double 0.01
+
+dlabel D_E00C0C08
+.double 0.01
+
+dlabel D_E00C0C10
+.double 0.01
+
+dlabel D_E00C0C18
+.double 0.01
+
+dlabel jtbl_E00C0C20
+.word LE00C0500_3BD260, LE00C0508_3BD268, LE00C0518_3BD278, LE00C0548_3BD2A8, LE00C0570_3BD2D0, 0, 0, 0
+
+.section .text
+
 glabel snowman_doll_update
 /* 3BCEC0 E00C0160 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3BCEC4 E00C0164 AFBF002C */  sw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_update.s b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_update.s
index 766480f525..e28b02c673 100644
--- a/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_update.s
+++ b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0116D90
+.double 51.43
+
+dlabel jtbl_E0116D98
+.word LE0116370_4029B0, LE0116380_4029C0, LE0116598_402BD8, LE01165A8_402BE8, LE0116634_402C74, 0
+
+dlabel D_E0116DB0
+.double 0.0039215686
+
+dlabel D_E0116DB8
+.double 0.01
+
+.section .text
+
 glabel something_rotating_update
 /* 4027CC E011618C 27BDFF88 */  addiu     $sp, $sp, -0x78
 /* 4027D0 E0116190 AFB40030 */  sw        $s4, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/sparkles/sparkles_main.s b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_main.s
index e589c80823..1934945be6 100644
--- a/ver/us/asm/nonmatchings/effects/sparkles/sparkles_main.s
+++ b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_main.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0022D30
+.word 0xE00221DC, 0xE0022318, 0xE0022318, 0xE00223EC, 0xE00223EC
+
+dlabel D_E0022D48
+.double 0.05
+
+dlabel D_E0022D50
+.double 0.05
+
+.section .text
+
 glabel sparkles_main
 /* 337240 E0022000 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 337244 E0022004 F7B40050 */  sdc1      $f20, 0x50($sp)
diff --git a/ver/us/asm/nonmatchings/effects/sparkles/sparkles_update.s b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_update.s
index 870ed5e348..3beacfacfd 100644
--- a/ver/us/asm/nonmatchings/effects/sparkles/sparkles_update.s
+++ b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0022D58
+.double 0.01
+
+dlabel D_E0022D60
+.double 0.96
+
+dlabel D_E0022D68
+.double 0.1
+
+dlabel D_E0022D70
+.double -0.02
+
+dlabel D_E0022D78
+.double 0.9
+
+.section .text
+
 glabel sparkles_update
 /* 33778C E002254C 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 337790 E0022550 AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_main.s b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_main.s
index 6fcbee2bda..b2d77089e5 100644
--- a/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_main.s
+++ b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_main.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0038A20
+.double 0.6
+
+.section .text
+
 glabel spiky_white_aura_main
 /* 34DD20 E0038000 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 34DD24 E0038004 F7BE00C0 */  sdc1      $f30, 0xc0($sp)
diff --git a/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_update.s b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_update.s
index 899a569df1..2559d07ddb 100644
--- a/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_update.s
+++ b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_update.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0038A28
+.double 0.8
+
+dlabel D_E0038A30
+.double 0.7
+
+dlabel D_E0038A38
+.double 0.4
+
+dlabel D_E0038A40
+.double 0.6, 0.0
+
+.section .text
+
 glabel spiky_white_aura_update
 /* 34E144 E0038424 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 34E148 E0038428 AFB40020 */  sw        $s4, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/star_outline/star_outline_appendGfx.s b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_appendGfx.s
index 72771bc801..ed510dc334 100644
--- a/ver/us/asm/nonmatchings/effects/star_outline/star_outline_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_appendGfx.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0126C30
+.double 0.4
+
+dlabel D_E0126C38
+.double 0.4
+
+.section .text
+
 glabel star_outline_appendGfx
 /* 41384C E01264EC 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 413850 E01264F0 0080302D */  daddu     $a2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/star_outline/star_outline_update.s b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_update.s
index 3e8a0a4ad3..4890353d1e 100644
--- a/ver/us/asm/nonmatchings/effects/star_outline/star_outline_update.s
+++ b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_update.s
@@ -1,6 +1,46 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0126BD0
+.double 7.12343
+
+dlabel D_E0126BD8
+.double 0.4953
+
+dlabel D_E0126BE0
+.double 0.2234
+
+dlabel D_E0126BE8
+.double 1.231
+
+dlabel D_E0126BF0
+.double 0.531
+
+dlabel D_E0126BF8
+.double 3.231
+
+dlabel D_E0126C00
+.double 0.298
+
+dlabel D_E0126C08
+.double 0.831
+
+dlabel D_E0126C10
+.double 2.231
+
+dlabel D_E0126C18
+.double 2.044
+
+dlabel D_E0126C20
+.double 0.3
+
+dlabel D_E0126C28
+.double 0.7
+
+.section .text
+
 glabel star_outline_update
 /* 413494 E0126134 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 413498 E0126138 AFBF001C */  sw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_update.s b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_update.s
index 6586bcdc61..1e9e1967bb 100644
--- a/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_update.s
+++ b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_update.s
@@ -1,6 +1,40 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0122CA0
+.double 0.04
+
+dlabel D_E0122CA8
+.double 1.235631
+
+dlabel D_E0122CB0
+.double 0.01
+
+dlabel D_E0122CB8
+.double 0.3
+
+dlabel D_E0122CC0
+.double 0.01
+
+dlabel D_E0122CC8
+.double 0.3
+
+dlabel D_E0122CD0
+.double 0.6
+
+dlabel D_E0122CD8
+.double 0.01
+
+dlabel D_E0122CE0
+.double 1.2
+
+dlabel D_E0122CE8
+.double 0.01
+
+.section .text
+
 glabel star_spirits_energy_update
 /* 40C71C E012217C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 40C720 E0122180 AFBF001C */  sw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s
index 96f07af2e1..c123297d9a 100644
--- a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00427B0
+.double 0.8
+
+dlabel D_E00427B8
+.double 0.9
+
+.section .text
+
 glabel stars_burst_update
 /* 3549D4 E0042234 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3549D8 E0042238 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_update.s b/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_update.s
index 4d874961fd..2f63dcae46 100644
--- a/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E005E680
+.double 0.1, 0.0
+
+.section .text
+
 glabel stars_orbiting_update
 /* 362778 E005E1B8 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 36277C E005E1BC AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_appendGfx.s b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_appendGfx.s
index 6cb33a3810..35d6fe0a54 100644
--- a/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel jtbl_E0044F00
+.word LE0044A74_3559D4, LE0044A74_3559D4, LE0044A74_3559D4, LE0044A98_3559F8, LE0044B14_355A74, LE0044AF4_355A54, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044A74_3559D4, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044B14_355A74, LE0044A98_3559F8, 0
+
+.section .text
+
 glabel stars_shimmer_appendGfx
 /* 35587C E004491C 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 355880 E0044920 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_main.s b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_main.s
index b11e0ad74a..99c0a9500e 100644
--- a/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_main.s
+++ b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_main.s
@@ -1,6 +1,28 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0044E20
+.double 0.1
+
+dlabel D_E0044E28
+.double 0.005
+
+dlabel D_E0044E30
+.double 0.4
+
+dlabel D_E0044E38
+.double 0.4
+
+dlabel D_E0044E40
+.word 0xE0044284, 0xE0044284, 0xE0044344, 0xE00442A8, 0xE0044344, 0xE0044344
+
+dlabel D_E0044E58
+.double 0.01
+
+.section .text
+
 glabel stars_shimmer_main
 /* 354F60 E0044000 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 354F64 E0044004 F7B40050 */  sdc1      $f20, 0x50($sp)
diff --git a/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_update.s b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_update.s
index a354e21c61..8f163fd15f 100644
--- a/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0044E60
+.double 0.01
+
+dlabel D_E0044E68
+.double 0.96
+
+dlabel D_E0044E70
+.double 0.1
+
+dlabel D_E0044E78
+.word 0xE0044514, 0xE0044514, 0xE0044704, 0xE00446B0, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE004462C, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE0044704, 0xE004462C, 0x00000000
+
+dlabel D_E0044EF8
+.double -0.02
+
+.section .text
+
 glabel stars_shimmer_update
 /* 355384 E0044424 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 355388 E0044428 AFB40020 */  sw        $s4, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_update.s b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_update.s
index c1c9571f0b..f5a966bfc0 100644
--- a/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_update.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E005A750
+.double 0.8
+
+dlabel D_E005A758
+.double 0.7
+
+dlabel D_E005A760
+.double 0.2, 0.0
+
+.section .text
+
 glabel stars_spread_update
 /* 3604BC E005A1FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3604C0 E005A200 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/static_status/static_status_update.s b/ver/us/asm/nonmatchings/effects/static_status/static_status_update.s
index c8ec339a58..3817dc924b 100644
--- a/ver/us/asm/nonmatchings/effects/static_status/static_status_update.s
+++ b/ver/us/asm/nonmatchings/effects/static_status/static_status_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00E6990
+.double 0.2, 0.0
+
+.section .text
+
 glabel static_status_update
 /* 3E0AB4 E00E6184 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3E0AB8 E00E6188 AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_update.s b/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_update.s
index d6875e7f3b..26775e89ce 100644
--- a/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_update.s
+++ b/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_update.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E005C710
+.double 0.1
+
+dlabel D_E005C718
+.double 0.04
+
+dlabel D_E005C720
+.double 0.9, 0.0
+
+.section .text
+
 glabel steam_burst_update
 /* 3610C0 E005C180 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3610C4 E005C184 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_appendGfx.s b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_appendGfx.s
index f3e895b27d..73686be808 100644
--- a/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_appendGfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00C4A98
+.double 0.01
+
+.section .text
+
 glabel stop_watch_appendGfx
 /* 3CB0F8 E00C4308 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 3CB0FC E00C430C 0080302D */  daddu     $a2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_update.s b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_update.s
index 8066d8bd9a..5ab1ee8599 100644
--- a/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_update.s
+++ b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_update.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00C4A90
+.double 0.05
+
+.section .text
+
 glabel stop_watch_update
 /* 3CAF68 E00C4178 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3CAF6C E00C417C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/sun/sun_update.s b/ver/us/asm/nonmatchings/effects/sun/sun_update.s
index 9fdd1b70e9..6a608a359b 100644
--- a/ver/us/asm/nonmatchings/effects/sun/sun_update.s
+++ b/ver/us/asm/nonmatchings/effects/sun/sun_update.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E01207A0
+.double 0.01
+
+dlabel D_E01207A8
+.double 0.05
+
+.section .text
+
 glabel sun_update
 /* 40B52C E012013C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 40B530 E0120140 AFBF0020 */  sw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/sweat/sweat_update.s b/ver/us/asm/nonmatchings/effects/sweat/sweat_update.s
index de3209324f..97981974e8 100644
--- a/ver/us/asm/nonmatchings/effects/sweat/sweat_update.s
+++ b/ver/us/asm/nonmatchings/effects/sweat/sweat_update.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0050560
+.double 0.94
+
+dlabel D_E0050568
+.double 0.05
+
+dlabel D_E0050570
+.double -0.1, 0.0
+
+.section .text
+
 glabel sweat_update
 /* 35C1A8 E00501D8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 35C1AC E00501DC AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_main.s b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_main.s
index a263f44fa4..cb70e9d327 100644
--- a/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_main.s
+++ b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_main.s
@@ -1,6 +1,8 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .text
+
 glabel tubba_heart_attack_main
 /* 3D1690 E00CC000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3D1694 E00CC004 F7B40048 */  sdc1      $f20, 0x48($sp)
diff --git a/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_update.s b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_update.s
index 584fbbfbec..15d819c855 100644
--- a/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_update.s
+++ b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00CCE70
+.double 0.01
+
+dlabel jtbl_E00CCE78
+.word LE00CC3D8_3D1A68, LE00CC448_3D1AD8, LE00CC53C_3D1BCC, LE00CC5E4_3D1C74, LE00CC614_3D1CA4, LE00CC790_3D1E20, LE00CC870_3D1F00, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC920_3D1FB0, LE00CC4A4_3D1B34, 0
+
+dlabel D_E00CCED0
+.double 0.99
+
+dlabel D_E00CCED8
+.double -0.1
+
+dlabel D_E00CCEE0
+.double 0.9, 0.0
+
+.section .text
+
 glabel tubba_heart_attack_update
 /* 3D18E8 E00CC258 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 3D18EC E00CC25C AFBF00BC */  sw        $ra, 0xbc($sp)
diff --git a/ver/us/asm/nonmatchings/effects/water_splash/water_splash_update.s b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_update.s
index db132e104c..f9233237a3 100644
--- a/ver/us/asm/nonmatchings/effects/water_splash/water_splash_update.s
+++ b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_update.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00BEB00
+.double 0.98
+
+dlabel D_E00BEB08
+.double -0.8
+
+dlabel D_E00BEB10
+.double -0.1
+
+dlabel D_E00BEB18
+.double 1.2
+
+dlabel D_E00BEB20
+.double 0.9, 0.0
+
+.section .text
+
 glabel water_splash_update
 /* 3BC304 E00BE3A4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 3BC308 E00BE3A8 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_main.s b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_main.s
index 862e5038c1..b5cb610230 100644
--- a/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_main.s
+++ b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_main.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00CEE50
+.double 0.2
+
+dlabel D_E00CEE58
+.double 0.1
+
+.section .text
+
 glabel whirlwind_main
 /* 3D2AC0 E00CE000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3D2AC4 E00CE004 F7BC0060 */  sdc1      $f28, 0x60($sp)
diff --git a/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_update.s b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_update.s
index e59345a42b..bea7169b2c 100644
--- a/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_update.s
+++ b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_update.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E00CEE60
+.double 12.96
+
+dlabel D_E00CEE68
+.double 17.28
+
+.section .text
+
 glabel whirlwind_update
 /* 3D2CE4 E00CE224 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D2CE8 E00CE228 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_main.s b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_main.s
index a9e3a9dd1d..7e68f1bdbc 100644
--- a/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_main.s
+++ b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_main.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0056EA0
+.double 0.1
+
+dlabel D_E0056EA8
+.double 0.008
+
+dlabel D_E0056EB0
+.double 0.05
+
+.section .text
+
 glabel windy_leaves_main
 /* 35DA00 E0056000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 35DA04 E0056004 F7B40048 */  sdc1      $f20, 0x48($sp)
diff --git a/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_update.s b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_update.s
index 740d2bd086..de7843735a 100644
--- a/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_update.s
+++ b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_update.s
@@ -1,6 +1,49 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+dlabel D_E0056EB8
+.double 0.3
+
+dlabel D_E0056EC0
+.double 0.8
+
+dlabel D_E0056EC8
+.double 0.4
+
+dlabel D_E0056ED0
+.double 0.98
+
+dlabel D_E0056ED8
+.double 0.2
+
+dlabel D_E0056EE0
+.double 0.94
+
+dlabel D_E0056EE8
+.double 0.05
+
+dlabel D_E0056EF0
+.double 0.95
+
+dlabel D_E0056EF8
+.double 0.92
+
+dlabel D_E0056F00
+.double 0.8
+
+dlabel D_E0056F08
+.double 0.9603999999999999
+
+dlabel D_E0056F10
+.double 0.2
+
+dlabel D_E0056F18
+.double 0.8464
+
+.section .text
+
 glabel windy_leaves_update
 /* 35DD0C E005630C 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 35DD10 E0056310 AFB40020 */  sw        $s4, 0x20($sp)
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 8155410492..2bf76dae54 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -1144,9 +1144,7 @@ segments:
     - [0x169BE0, c]
     - [0x16A3E0, .data, 163400]
     - [0x16A680, data]
-    - [0x16C7D0, .rodata, 165490]
-    - [0x16C848, .rodata, 167570]
-    - [0x16C8C0, .rodata, 168590]
+    - [0x16C7D0]
   - type: code
     start: 0x16C8E0
     vram: 0x8023E000
@@ -1338,18 +1336,7 @@ segments:
     - [0x1C2FC0, .data, 1A5830]
     - [0x1C3000, .data, 1AF120]
     - [0x1CB0B0, .data, 1AF230]
-    - [0x1CB240, .rodata, 16c8e0]
-    - [0x1CB368, .rodata, 16F740]
-    - [0x1CB4E0, .rodata, battle_cam]
-    - [0x1CB670, .rodata, 17D6A0]
-    - [0x1CBC30, .rodata, 182B30]
-    - [0x1CBDD0, .rodata, 18C790]
-    - [0x1CBE70, .rodata, 18F340]
-    - [0x1CBE80, .rodata, 190B20]
-    - [0x1CBF80, .rodata, 196AA0]
-    - [0x1CC0A0, .rodata, actor_api]
-    - [0x1CC160, .rodata, 19FAF0]
-    - [0x1CC270, .rodata, 1A5830]
+    - [0x1CB240]
   - [0x1CC310, ci4,     icon/present, 32, 32]
   - [0x1CC510, palette, icon/present]
   - [0x1CC530, ci4,     icon/cake/finished_cake, 32, 32]
@@ -2515,7 +2502,7 @@ segments:
     subsegments:
     - [0x325AD0, c]
     - [0x325EE0, pm_effect_shims, effect_shims]
-    - [0x326160, .data, 325AD0]
+    - [0x326160]
   - name: effect_gfx_big_smoke_puff
     dir: effects/gfx
     type: code
@@ -2788,7 +2775,7 @@ segments:
     vram: 0xE0028000
     subsegments:
     - [0x33CDF0, c, drop_leaves]
-    - [0x33D5D0, data]
+    - [0x33D5D0]
   - [0x33D610, bin] # drop_leaves, windy_leaves gfx
   - name: effect_dust
     dir: effects
@@ -2797,7 +2784,7 @@ segments:
     vram: 0xE002A000
     subsegments:
     - [0x33E8C0, c, dust]
-    - [0x33EFE0, data]
+    - [0x33EFE0]
   - [0x33F000, bin] # dust gfx
   - name: effect_shattering_stones
     dir: effects
@@ -2876,8 +2863,7 @@ segments:
     vram: 0xE003C000
     subsegments:
     - [0x34F4C0, c, damage_indicator]
-    - [0x350160, .data, damage_indicator]
-    - [0x350200, .rodata, damage_indicator]
+    - [0x350160]
   - name: effect_gfx_damage_indicator
     dir: effects/gfx
     type: code
@@ -2941,7 +2927,7 @@ segments:
     vram: 0xE003E000
     subsegments:
     - [0x352440, c, purple_ring]
-    - [0x352CB0, data]
+    - [0x352CB0]
   - [0x352CE0, bin] # purple_ring gfx
   - name: effect_flame
     dir: effects
@@ -3019,7 +3005,7 @@ segments:
     vram: 0xE0050000
     subsegments:
     - [0x35BFD0, c, sweat]
-    - [0x35C530, data]
+    - [0x35C530]
   - [0x35C550, bin] # sweat gfx
   - name: effect_sleep_bubble
     dir: effects
@@ -3037,7 +3023,7 @@ segments:
     vram: 0xE0056000
     subsegments:
     - [0x35DA00, c, windy_leaves]
-    - [0x35E8A0, data]
+    - [0x35E8A0]
   - name: effect_falling_leaves
     dir: effects
     type: code
@@ -3045,7 +3031,7 @@ segments:
     vram: 0xE0058000
     subsegments:
     - [0x35E920, c, falling_leaves]
-    - [0x35F0A0, data]
+    - [0x35F0A0]
   - [0x35F0E0, bin] # falling_leaves gfx
   - name: effect_stars_spread
     dir: effects
@@ -3054,7 +3040,7 @@ segments:
     vram: 0xE005A000
     subsegments:
     - [0x3602C0, c, stars_spread]
-    - [0x360A10, data]
+    - [0x360A10]
   - [0x360A30, bin] # stars_spread gfx
   - name: effect_steam_burst
     dir: effects
@@ -3196,7 +3182,7 @@ segments:
     vram: 0xE0072000
     subsegments:
     - [0x374E50, c, energy_shockwave]
-    - [0x375500, data]
+    - [0x375500]
   - [0x375510, bin] # energy_shockwave gfx
   - name: effect_shimmer_wave
     dir: effects
@@ -3231,7 +3217,7 @@ segments:
     vram: 0xE007A000
     subsegments:
     - [0x37C540, c, effect_3D]
-    - [0x37D140, data]
+    - [0x37D140]
   - [0x37D180, bin] # effect_3D gfx
   - name: effect_blast
     dir: effects
@@ -3240,7 +3226,7 @@ segments:
     vram: 0xE007C000
     subsegments:
     - [0x37D490, c, blast]
-    - [0x37D9A0, data]
+    - [0x37D9A0]
   - [0x37D9D0, bin] # blast, bombette_breaking gfx
   - name: effect_fire_flower # should be called fire_flower but we already have a segment with that name TODO rename
     dir: effects
@@ -3426,7 +3412,7 @@ segments:
     vram: 0xE0094000
     subsegments:
     - [0x3928D0, c, flashing_box_shockwave]
-    - [0x393080, data]
+    - [0x393080]
   - [0x3930A0, bin] # flashing_box_shockwave gfx
   - name: effect_balloon
     dir: effects
@@ -3436,7 +3422,35 @@ segments:
     subsegments:
     - [0x394280, c, balloon]
     - [0x394660]
-  - [0x394670, bin] # balloon gfx
+  - name: effect_gfx_balloon
+    dir: effects/gfx
+    type: code
+    start: 0x394670
+    vram: 0x09000000
+    symbol_name_format: $VRAM_$ROM
+    subsegments:
+    - [0x394670, c, balloon]
+    - start: 0x394670
+      type: .data
+      name: balloon
+      subsegments:
+      - [0x394670, ci4, D_09000000_394670, 32, 32]
+      - [0x394870, ci4, D_09000200_394870, 32, 32, D_09000000_394670]
+      - [0x394A70, palette, D_09000000_394670]
+      - [0x394A90] # padding
+      - [0x394C70, ci4, D_09000600_394C70, 32, 32]
+      - [0x394E70, ci4, D_09000800_394E70, 32, 32, D_09000600_394C70]
+      - [0x395070, palette, D_09000600_394C70]
+      - [0x395090] # padding
+      - [0x395270, ci4, D_09000C00_395270, 32, 32]
+      - [0x395470, ci4, D_09000E00_395470, 32, 32, D_09000C00_395270]
+      - [0x395670, palette, D_09000C00_395270]
+      - [0x395690] # padding
+      - [0x395870, vtx, D_09001200_395870]
+      - [0x3958F0, gfx, D_09001280_3958F0]
+      - [0x3959C8, gfx, D_09001358_3959C8]
+      - [0x395AA0, gfx, D_09001430_395AA0]
+      - [0x395B78, gfx, D_09001508_395B78]
   - name: effect_floating_rock
     dir: effects
     type: code
@@ -3453,7 +3467,7 @@ segments:
     vram: 0xE009A000
     subsegments:
     - [0x3965B0, c, chomp_drop]
-    - [0x397010, data]
+    - [0x397010]
   - [0x397040, bin] # chomp_drop gfx
   - name: effect_quizmo_stage
     dir: effects
@@ -3659,8 +3673,28 @@ segments:
     vram: 0xE00BE000
     subsegments:
     - [0x3BBF60, c, water_splash]
-    - [0x3BCA50, data]
-  - [0x3BCA90, bin] # water_splash gfx
+    - [0x3BCA50]
+  - name: effect_gfx_water_splash
+    dir: effects/gfx
+    type: code
+    start: 0x3BCA90
+    vram: 0x09000000
+    symbol_name_format: $VRAM_$ROM
+    subsegments:
+    - [0x3BCA90, c, water_splash]
+    - start: 0x3BCA90
+      type: .data
+      name: water_splash
+      subsegments:
+      - [0x3BCA90, ia8, D_09000000_3BCA90, 16, 16]
+      - [0x3BCB90, gfx, D_09000100_3BCB90]
+      - [0x3BCC38, vtx, D_090001A8_3BCC38]
+      - [0x3BCC78, vtx, D_090001E8_3BCC78]
+      - [0x3BCCB8, vtx, D_09000228_3BCCB8]
+      - [0x3BCCF8, gfx, D_09000268_3BCCF8]
+      - [0x3BCD18, gfx, D_09000288_3BCD18]
+      - [0x3BCD38, gfx, D_090002A8_3BCD38]
+      - [0x3BCD58]
   - name: effect_snowman_doll
     dir: effects
     type: code
@@ -3752,7 +3786,7 @@ segments:
     vram: 0xE00CE000
     subsegments:
     - [0x3D2AC0, c, whirlwind]
-    - [0x3D3910, data]
+    - [0x3D3910]
   - [0x3D3930, bin] # whirlwind gfx
   - name: effect_red_impact
     dir: effects
@@ -4037,8 +4071,33 @@ segments:
     vram: 0xE0118000
     subsegments:
     - [0x403400, c, breaking_junk]
-    - [0x403BB0, data]
-  - [0x403BF0, bin] # breaking_junk gfx
+    - [0x403BB0]
+  - name: effect_gfx_breaking_junk
+    dir: effects/gfx
+    type: code
+    start: 0x403BF0
+    vram: 0x09000000
+    symbol_name_format: $VRAM_$ROM
+    subsegments:
+    - [0x403BF0, c, breaking_junk]
+    - start: 0x403BF0
+      type: .data
+      name: breaking_junk
+      subsegments:
+      - [0x403BF0, ia8, D_09000000_403BF0, 16, 16]
+      - [0x403CF0, ia8, D_09000100_403CF0, 16, 16]
+      - [0x403DF0, ia8, D_09000200_403DF0, 16, 16]
+      - [0x403EF0, ia8, D_09000300_403EF0, 16, 16]
+      - [0x403FF0, gfx, D_09000400_403FF0]
+      - [0x404098, vtx, D_090004A8_404098]
+      - [0x4040D8, vtx, D_090004E8_4040D8]
+      - [0x404118, vtx, D_09000528_404118]
+      - [0x404158, vtx, D_09000568_404158]
+      - [0x404198, gfx, D_090005A8_404198]
+      - [0x4041B8, gfx, D_090005C8_4041B8]
+      - [0x4041D8, gfx, D_090005E8_4041D8]
+      - [0x4041F8, gfx, D_09000608_4041F8]
+      - [0x404218]
   - name: effect_partner_buff
     dir: effects
     type: code
@@ -5941,8 +6000,7 @@ segments:
     - [0x7E7A30, data]
     - [0x7E8470, data]
     - [0x7EA340, data]
-    - [0x7EAA50, .rodata, 7E73A0]
-    - [0x7EAD00, .rodata, 7E7850]
+    - [0x7EAA50]
   - name: mac_00
     dir: world/area_mac/mac_00
     type: code
@@ -6466,12 +6524,7 @@ segments:
     - [0x8C82B0, c]
     - [0x8C83A0, c]
     - [0x8C85E0, c]
-    - [0x8C85E0, .data, 8C7F90]
-    - [0x8C8680, .data, 8C8140]
-    - [0x8C88E0, .data, 8C82B0]
-    - [0x8C9780, .data, 8C83A0]
-    - [0x8CA2D0, .data, 8C85E0]
-    - [0x8CA8F0]
+    - [0x8C85E0]
   - name: kmr_04
     dir: world/area_kmr/kmr_04
     type: code
@@ -6578,9 +6631,7 @@ segments:
     subsegments:
     - [0x8EB360, c, header]
     - [0x8EB390, c, events]
-    - [0x8EB390, .data, header]
-    - [0x8EB420, .data, events]
-    - [0x8EBE10]
+    - [0x8EB390]
   - name: kmr_20
     dir: world/area_kmr/kmr_20
     type: code
@@ -6774,9 +6825,7 @@ segments:
     subsegments:
     - [0x929270, c]
     - [0x9292B0, c]
-    - [0x9292D0, .data, 929270]
-    - [0x929A00, .data, 9292B0]
-    - [0x929A80]
+    - [0x9292D0]
   - name: sbk_01
     dir: world/area_sbk/sbk_01
     type: code
@@ -6786,9 +6835,7 @@ segments:
     subsegments:
     - [0x929A90, c]
     - [0x929AD0, c]
-    - [0x929AF0, .data, 929A90]
-    - [0x929E00, .data, 929AD0]
-    - [0x92A290]
+    - [0x929AF0]
   - name: sbk_02
     dir: world/area_sbk/sbk_02
     type: code
@@ -7375,9 +7422,7 @@ segments:
     - [0x95B7E0,       c, 95B7E0]
     - [0x95E660,       c, 95E660]
     - [0x95E7A0,       c, 95E7A0]
-    - [0x95ECC0,   .data, 95B7E0]
-    - [0x9685C0,   .data, 95E7A0]
-    - [0x968FD0]
+    - [0x95ECC0]
   - name: dro_02
     dir: world/area_dro/dro_02
     type: code
@@ -9940,9 +9985,7 @@ segments:
     subsegments:
     - [0xBF6A00, c, header]
     - [0xBF6A00, c, events]
-    - [0xBF6A00,   .data, header]
-    - [0xBF6B00,   .data, events]
-    - [0xBF7670]
+    - [0xBF6A00]
   - name: arn_11
     dir: world/area_arn/arn_11
     type: code
@@ -9952,9 +9995,7 @@ segments:
     subsegments:
     - [0xBF7680, c, header]
     - [0xBF7680, c, events]
-    - [0xBF7680,   .data, header]
-    - [0xBF7770,   .data, events]
-    - [0xBF8780]
+    - [0xBF7680]
   - name: arn_12
     dir: world/area_arn/arn_12
     type: code
@@ -9964,9 +10005,7 @@ segments:
     subsegments:
     - [0xBF8790, c, header]
     - [0xBF8790, c, events]
-    - [0xBF8790,   .data, header]
-    - [0xBF8890,   .data, events]
-    - [0xBF9400]
+    - [0xBF8790]
   - name: arn_13
     dir: world/area_arn/arn_13
     type: code
@@ -9976,9 +10015,7 @@ segments:
     subsegments:
     - [0xBF9410, c, header]
     - [0xBF9410, c, events]
-    - [0xBF9410,   .data, header]
-    - [0xBF9510,   .data, events]
-    - [0xBFA090]
+    - [0xBF9410]
   - name: dgb_00
     dir: world/area_dgb/dgb_00
     type: code
@@ -9988,9 +10025,7 @@ segments:
     subsegments:
     - [0xBFA0A0,       c, BFA0A0]
     - [0xBFA100,       c, BFA100]
-    - [0xBFA150,   .data, BFA0A0]
-    - [0xBFA260,   .data, BFA100]
-    - [0xBFD840]
+    - [0xBFA150]
   - name: dgb_01
     dir: world/area_dgb/dgb_01
     type: code
@@ -10020,10 +10055,6 @@ segments:
     - [0xC08F70,    .data, data7]
     - [0xC08FF0,    .data, data]
     - [0xC20C70]
-    # rodata seemingly in 3 different parts:
-    # dgb_00-18, 1x 32767.0, 2 jump tables
-    # dgb_00, 2x 32767.0, jump table
-    # dgb_08 only
   - name: C20F40 # DMAd at the beginning of tubba blubba's castle (bridge cutscene)
     type: code
     dir: world/area_dgb
@@ -10333,8 +10364,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC2EBA0,       c, C2EBA0]
-    - [0xC2FFD0,   .data, C2EBA0]
-    - [0xC31190]
+    - [0xC2FFD0]
   - name: dgb_03
     dir: world/area_dgb/dgb_03
     type: code
@@ -10344,8 +10374,7 @@ segments:
     subsegments:
     - [0xC314E0,       c, C314E0]
     - [0xC31730,       c, C31730]
-    - [0xC33CB0,   .data, C31730]
-    - [0xC35EA0]
+    - [0xC33CB0]
   - name: dgb_04
     dir: world/area_dgb/dgb_04
     type: code
@@ -10354,8 +10383,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC36530,       c, C36530]
-    - [0xC39640,   .data, C36530]
-    - [0xC3A910]
+    - [0xC39640]
   - name: dgb_05
     dir: world/area_dgb/dgb_05
     type: code
@@ -10364,8 +10392,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC3AA10,       c, C3AA10]
-    - [0xC3BEA0,   .data, C3AA10]
-    - [0xC3CD40]
+    - [0xC3BEA0]
   - name: dgb_06
     dir: world/area_dgb/dgb_06
     type: code
@@ -10374,8 +10401,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC3D080,       c, C3D080]
-    - [0xC3D340,   .data, C3D080]
-    - [0xC3DBE0]
+    - [0xC3D340]
   - name: dgb_07
     dir: world/area_dgb/dgb_07
     type: code
@@ -10384,8 +10410,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC3DBF0,       c, C3DBF0]
-    - [0xC3F020,   .data, C3DBF0]
-    - [0xC3FA70]
+    - [0xC3F020]
   - name: dgb_08
     dir: world/area_dgb/dgb_08
     type: code
@@ -10394,8 +10419,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC3FDB0,       c, C3FDB0]
-    - [0xC43A40,   .data, C3FDB0]
-    - [0xC467A0]
+    - [0xC43A40]
   - name: dgb_09
     dir: world/area_dgb/dgb_09
     type: code
@@ -10404,8 +10428,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC46BE0,       c, C46BE0]
-    - [0xC4A3E0,   .data, C46BE0]
-    - [0xC4BF50]
+    - [0xC4A3E0]
   - name: dgb_10
     dir: world/area_dgb/dgb_10
     type: code
@@ -10414,8 +10437,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC4C390,       c, C4C390]
-    - [0xC4C580,   .data, C4C390]
-    - [0xC4D3D0]
+    - [0xC4C580]
   - name: dgb_11
     dir: world/area_dgb/dgb_11
     type: code
@@ -10424,8 +10446,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC4D3E0,       c, C4D3E0]
-    - [0xC4D430,   .data, C4D3E0]
-    - [0xC4DEE0]
+    - [0xC4D430]
   - name: dgb_12
     dir: world/area_dgb/dgb_12
     type: code
@@ -10434,8 +10455,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC4DEF0,       c, C4DEF0]
-    - [0xC4E1B0,   .data, C4DEF0]
-    - [0xC4E950]
+    - [0xC4E1B0]
   - name: dgb_13
     dir: world/area_dgb/dgb_13
     type: code
@@ -10444,8 +10464,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC4E960, c, C4E960]
-    - [0xC4E960,   .data, C4E960]
-    - [0xC4F020]
+    - [0xC4E960]
   - name: dgb_14
     dir: world/area_dgb/dgb_14
     type: code
@@ -10454,8 +10473,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC4F030, c, C4F030]
-    - [0xC4F030,   .data, C4F030]
-    - [0xC4F500]
+    - [0xC4F030]
   - name: dgb_15
     dir: world/area_dgb/dgb_15
     type: code
@@ -10465,8 +10483,7 @@ segments:
     subsegments:
     - [0xC4F510,       c, C4F510]
     - [0xC50CA0,       c, C50CA0]
-    - [0xC50D80,   .data, C4F510]
-    - [0xC521E0]
+    - [0xC50D80]
   - name: dgb_16
     dir: world/area_dgb/dgb_16
     type: code
@@ -10475,8 +10492,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC52540,       c, C52540]
-    - [0xC53970,   .data, C52540]
-    - [0xC55720]
+    - [0xC53970]
   - name: dgb_17
     dir: world/area_dgb/dgb_17
     type: code
@@ -10485,8 +10501,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xC55A60,       c, C55A60]
-    - [0xC55A60,   .data, C55A60]
-    - [0xC55F30]
+    - [0xC55A60]
   - name: dgb_18
     dir: world/area_dgb/dgb_18
     type: code
@@ -10496,8 +10511,7 @@ segments:
     subsegments:
     - [0xC55F40,       c, C55F40]
     - [0xC56EF0,       c, C56EF0]
-    - [0xC571B0,   .data, C55F40]
-    - [0xC59810]
+    - [0xC571B0]
   - name: kzn_01
     dir: world/area_kzn/kzn_01
     type: code
@@ -10729,8 +10743,7 @@ segments:
     - [0xC9DF20,       c, C9DF20]
     - [0xC9DF60,       c, C9DF60]
     - [0xC9EE30,       c, C9EE30]
-    - [0xC9F300,   .data, C9DF60]
-    - [0xCA70A0]
+    - [0xC9F300]
   - name: flo_03
     dir: world/area_flo/flo_03
     type: code
@@ -10740,8 +10753,7 @@ segments:
     subsegments:
     - [0xCA72A0,       c, CA72A0]
     - [0xCA72E0,       c, CA72E0]
-    - [0xCA78D0,   .data, CA72E0]
-    - [0xCAC1D0]
+    - [0xCA78D0]
   - name: flo_07
     dir: world/area_flo/flo_07
     type: code
@@ -10751,8 +10763,7 @@ segments:
     subsegments:
     - [0xCAC1F0,       c, CAC1F0]
     - [0xCAC5D0,       c, CAC5D0]
-    - [0xCAC930,   .data, CAC5D0]
-    - [0xCAED20]
+    - [0xCAC930]
   - name: flo_08
     dir: world/area_flo/flo_08
     type: code
@@ -10764,8 +10775,7 @@ segments:
     - [0xCAFA80,       c, CAFA80]
     - [0xCAFAC0,       c, CAFAC0]
     - [0xCB0B80,       c, CB0B80]
-    - [0xCB0C20,   .data, CAFAC0]
-    - [0xCB4E60]
+    - [0xCB0C20]
   - name: flo_09
     dir: world/area_flo/flo_09
     type: code
@@ -10777,8 +10787,7 @@ segments:
     - [0xCB5040,       c, CB5040]
     - [0xCB50E0,       c, CB50E0]
     - [0xCB5320,       c, CB5320]
-    - [0xCB6820,   .data, CB50E0]
-    - [0xCB9190]
+    - [0xCB6820]
   - name: flo_10
     dir: world/area_flo/flo_10
     type: code
@@ -10791,9 +10800,7 @@ segments:
     - [0xCB9280,       c, CB9280]
     - [0xCB96B0,       c, CB96B0]
     - [0xCBA430,       c, CBA430]
-    - [0xCBA670,   .data, CB9280]
-    - [0xCBD290,   .data, CBA430]
-    - [0xCBDCB0]
+    - [0xCBA670]
   - name: flo_11
     dir: world/area_flo/flo_11
     type: code
@@ -10802,8 +10809,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xCBDCD0,       c, CBDCD0]
-    - [0xCBDFF0,   .data, CBDCD0]
-    - [0xCC0E10]
+    - [0xCBDFF0]
   - name: flo_12
     dir: world/area_flo/flo_12
     type: code
@@ -10813,8 +10819,7 @@ segments:
     subsegments:
     - [0xCC0E30,       c, CC0E30]
     - [0xCC0E70,       c, CC0E70]
-    - [0xCC1520,   .data, CC0E70]
-    - [0xCC3800]
+    - [0xCC1520]
   - name: flo_13
     dir: world/area_flo/flo_13
     type: code
@@ -10825,8 +10830,7 @@ segments:
     - [0xCC3810,       c, CC3810]
     - [0xCC3850,       c, CC3850]
     - [0xCC6DE0,       c, CC6DE0]
-    - [0xCC6E80,   .data, CC3850]
-    - [0xCCB230]
+    - [0xCC6E80]
   - name: flo_14
     dir: world/area_flo/flo_14
     type: code
@@ -10837,9 +10841,7 @@ segments:
     - [0xCCB310,       c, CCB310]
     - [0xCCBE20,       c, CCBE20]
     - [0xCCD670,       c, CCD670]
-    - [0xCCD6A0,   .data, CCB310]
-    - [0xCCF7D0,   .data, CCBE20]
-    - [0xCD0620]
+    - [0xCCD6A0]
   - name: flo_15
     dir: world/area_flo/flo_15
     type: code
@@ -10848,8 +10850,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xCD06C0,       c, CD06C0]
-    - [0xCD06C0,   .data, CD06C0]
-    - [0xCD1E20]
+    - [0xCD06C0]
   - name: flo_16
     dir: world/area_flo/flo_16
     type: code
@@ -10862,9 +10863,7 @@ segments:
     - [0xCD1F10,       c, CD1F10]
     - [0xCD2C80,       c, CD2C80]
     - [0xCD4770,       c, CD4770]
-    - [0xCD47A0,   .data, CD1F10]
-    - [0xCD5E40,   .data, CD2C80]
-    - [0xCD7210]
+    - [0xCD47A0]
   - name: flo_17
     dir: world/area_flo/flo_17
     type: code
@@ -10875,8 +10874,7 @@ segments:
     - [0xCD72E0,       c, CD72E0]
     - [0xCD7320,       c, CD7320]
     - [0xCD7350,       c, CD7350]
-    - [0xCDA500,   .data, CD7350]
-    - [0xCDC5D0]
+    - [0xCDA500]
   - name: flo_18
     dir: world/area_flo/flo_18
     type: code
@@ -10887,9 +10885,7 @@ segments:
     - [0xCDC6A0,       c, CDC6A0]
     - [0xCDCBD0,       c, CDCBD0]
     - [0xCDCC30,       c, CDCC30]
-    - [0xCDCE70,   .data, CDC6A0]
-    - [0xCE2D60,   .data, CDCC30]
-    - [0xCE36E0]
+    - [0xCDCE70]
   - name: flo_19
     dir: world/area_flo/flo_19
     type: code
@@ -10898,8 +10894,7 @@ segments:
     vram: 0x80240000
     subsegments:
     - [0xCE36F0,       c, CE36F0]
-    - [0xCE4030,   .data, CE36F0]
-    - [0xCE66F0]
+    - [0xCE4030]
   - name: flo_21
     dir: world/area_flo/flo_21
     type: code
@@ -10909,9 +10904,7 @@ segments:
     subsegments:
     - [0xCE6700,       c, CE6700]
     - [0xCE7240,       c, CE7240]
-    - [0xCE73F0,   .data, CE6700]
-    - [0xCE7440,   .data, CE7240]
-    - [0xCEC210]
+    - [0xCE73F0]
   - name: flo_22
     dir: world/area_flo/flo_22
     type: code
@@ -10922,9 +10915,7 @@ segments:
     - [0xCEC240,       c, CEC240]
     - [0xCEC280,       c, CEC280]
     - [0xCEC290,       c, CEC290]
-    - [0xCEC4D0,   .data, CEC240]
-    - [0xCED7E0,   .data, CEC290]
-    - [0xCEE250]
+    - [0xCEC4D0]
   - name: flo_23
     dir: world/area_flo/flo_23
     type: code
@@ -10934,8 +10925,7 @@ segments:
     subsegments:
     - [0xCEE260,       c, CEE260]
     - [0xCEE2A0,       c, CEE2A0]
-    - [0xCEEF30,   .data, CEE2A0]
-    - [0xCF08D0]
+    - [0xCEEF30]
   - name: flo_24
     dir: world/area_flo/flo_24
     type: code
@@ -10946,8 +10936,7 @@ segments:
     - [0xCF0940,       c, CF0940]
     - [0xCF0980,       c, CF0980]
     - [0xCF0BC0,       c, CF0BC0]
-    - [0xCF0ED0,   .data, CF0980]
-    - [0xCF2BB0]
+    - [0xCF0ED0]
   - name: flo_25
     dir: world/area_flo/flo_25
     type: code
@@ -10959,9 +10948,7 @@ segments:
     - [0xCF2C10,       c, CF2C10]
     - [0xCF4BC0,       c, CF4BC0]
     - [0xCF4E00,       c, CF4E00]
-    - [0xCF4EA0,   .data, CF2C10]
-    - [0xCF68B0,   .data, CF4BC0]
-    - [0xCF7AA0]
+    - [0xCF4EA0]
   - name: sam_01
     dir: world/area_sam/sam_01
     type: code
@@ -11908,7 +11895,7 @@ segments:
     overlay: True
     subsegments:
     - [0xE23260, c, idle]
-    - [0xE23690, .data, idle]
+    - [0xE23690]
   - type: code
     name: world_action_walk
     dir: world/action
@@ -11934,7 +11921,7 @@ segments:
     overlay: True
     subsegments:
     - [0xE245D0, c, 18]
-    - [0xE248D0, .data, 18]
+    - [0xE248D0]
   - type: code
     name: world_action_land
     dir: world/action
@@ -12070,10 +12057,7 @@ segments:
     - [0xE2B530, c, Padlock]
     - [0xE2BE40, c, BoardedFloor]
     - [0xE2C930, c, BombableRock]
-    - [0xE2D410, .data, Padlock]
-    - [0xE2D530, .data, BoardedFloor]
-    - [0xE2D5E0, .data, BombableRock]
-    - [0xE2D680]
+    - [0xE2D410]
   - type: code
     dir: entity/jan_iwa
     start: 0xE2D730
@@ -12083,10 +12067,7 @@ segments:
     - [0xE2D730, c, Plants1]
     - [0xE2E5F0, c, Plants2]
     - [0xE2EDE0, c, ArrowSign]
-    - [0xE2EFD0, .data, Plants1]
-    - [0xE2F150, .data, Plants2]
-    - [0xE2F6A0, .data, ArrowSign]
-    - [0xE2F6F0]
+    - [0xE2EFD0]
   - type: code
     dir: entity/sbk_omo
     start: 0xE2F750
@@ -12095,9 +12076,7 @@ segments:
     subsegments:
     - [0xE2F750, c, Tweester]
     - [0xE307C0, c, StarBoxLauncher]
-    - [0xE31380, .data, Tweester]
-    - [0xE313F0, .data, StarBoxLauncher]
-    - [0xE314C0]
+    - [0xE31380]
   - name: entity_model_Hammer1Block
     dir: entity/model
     type: code
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 12f4975c6f..4e619f1702 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -8502,9 +8502,9 @@ D_09002520_3888D0 = 0x9002520; // type:data rom:0x3888D0
 D_09002560_388910 = 0x9002560; // type:data rom:0x388910
 D_090025A0_388950 = 0x90025A0; // type:data rom:0x388950
 D_090025E0_388990 = 0x90025E0; // type:data rom:0x388990
-func_E0084000 = 0xE0084000; // type:func rom:0x3889D0
-func_E008403C = 0xE008403C; // type:func rom:0x388A0C
-func_E0084060 = 0xE0084060; // type:func rom:0x388A30
+bombette_breaking_get_model_center_and_size = 0xE0084000; // type:func rom:0x3889D0
+bombette_breaking_get_model_from_list_index = 0xE008403C; // type:func rom:0x388A0C
+bombette_breaking_get_model_list_index_from_tree_index = 0xE0084060; // type:func rom:0x388A30
 bombette_breaking_main = 0xE0084084; // type:func rom:0x388A54
 bombette_breaking_init = 0xE0084658; // type:func rom:0x389028
 bombette_breaking_update = 0xE0084660; // type:func rom:0x389030
@@ -25729,90 +25729,6 @@ kmr_20_config = 0x2800380; // type:data
 battle_item_insecticide_herb_temp = 0x28003C0; // type:data
 battle_item_insecticide_herb_temp2 = 0x28003D0; // type:data
 battle_item_mystery_tempStc = 0x2800410; // type:data
-D_09000800 = 0x9000800; // type:data
-D_09000A00 = 0x9000A00; // type:data
-D_09000B88 = 0x9000B88; // type:data
-D_09000BA8 = 0x9000BA8; // type:data
-D_09000BC8 = 0x9000BC8; // type:data
-D_09000BE8 = 0x9000BE8; // type:data
-D_09000C00 = 0x9000C00; // type:data
-D_09000C08 = 0x9000C08; // type:data
-D_09000C20 = 0x9000C20; // type:data
-D_09000C28 = 0x9000C28; // type:data
-D_09000C48 = 0x9000C48; // type:data
-D_09000C68 = 0x9000C68; // type:data
-D_09000C88 = 0x9000C88; // type:data
-D_09000CA8 = 0x9000CA8; // type:data
-D_09000CC8 = 0x9000CC8; // type:data
-D_09000CE8 = 0x9000CE8; // type:data
-D_09000D08 = 0x9000D08; // type:data
-D_09001038 = 0x9001038; // type:data
-D_090010C0 = 0x90010C0; // type:data
-D_09001148 = 0x9001148; // type:data
-D_090011D0 = 0x90011D0; // type:data
-D_09001258 = 0x9001258; // type:data
-D_09001280 = 0x9001280; // type:data
-D_090012E0 = 0x90012E0; // type:data
-D_09001358 = 0x9001358; // type:data
-D_09001368 = 0x9001368; // type:data
-D_09001430 = 0x9001430; // type:data
-D_09001500 = 0x9001500; // type:data
-D_09001508 = 0x9001508; // type:data
-D_090015A8 = 0x90015A8; // type:data
-D_09001610 = 0x9001610; // type:data
-D_09001658 = 0x9001658; // type:data
-D_090016A0 = 0x90016A0; // type:data
-D_090016E8 = 0x90016E8; // type:data
-D_09001730 = 0x9001730; // type:data
-D_090017D0 = 0x90017D0; // type:data
-D_090018B8 = 0x90018B8; // type:data
-D_090018C0 = 0x90018C0; // type:data
-D_090018D8 = 0x90018D8; // type:data
-D_090018F8 = 0x90018F8; // type:data
-D_09001918 = 0x9001918; // type:data
-D_09001938 = 0x9001938; // type:data
-D_09001C80 = 0x9001C80; // type:data
-D_09001CC8 = 0x9001CC8; // type:data
-D_09001D00 = 0x9001D00; // type:data
-D_09002000 = 0x9002000; // type:data
-D_090020E8 = 0x90020E8; // type:data
-D_09002170 = 0x9002170; // type:data
-D_090021D0 = 0x90021D0; // type:data
-D_09002238 = 0x9002238; // type:data
-D_090022E0 = 0x90022E0; // type:data
-D_09002308 = 0x9002308; // type:data
-D_090023B0 = 0x90023B0; // type:data
-D_090023C8 = 0x90023C8; // type:data
-D_090023D8 = 0x90023D8; // type:data
-D_090023E0 = 0x90023E0; // type:data
-D_090023F8 = 0x90023F8; // type:data
-D_09002410 = 0x9002410; // type:data
-D_09002428 = 0x9002428; // type:data
-D_09002440 = 0x9002440; // type:data
-D_09002458 = 0x9002458; // type:data
-D_09002480 = 0x9002480; // type:data
-D_090024A8 = 0x90024A8; // type:data
-D_09002550 = 0x9002550; // type:data
-D_09002578 = 0x9002578; // type:data
-D_09002780 = 0x9002780; // type:data
-D_09002868 = 0x9002868; // type:data
-D_09002950 = 0x9002950; // type:data
-D_09002A38 = 0x9002A38; // type:data
-D_09002B20 = 0x9002B20; // type:data
-D_09002B40 = 0x9002B40; // type:data
-D_09002B60 = 0x9002B60; // type:data
-D_09003540 = 0x9003540; // type:data
-D_09003580 = 0x9003580; // type:data
-D_090035C0 = 0x90035C0; // type:data
-D_09003600 = 0x9003600; // type:data
-D_09003640 = 0x9003640; // type:data
-D_09003680 = 0x9003680; // type:data
-D_090036C0 = 0x90036C0; // type:data
-D_09003700 = 0x9003700; // type:data
-D_09003740 = 0x9003740; // type:data
-D_09003780 = 0x9003780; // type:data
-D_090037C0 = 0x90037C0; // type:data
-D_09003800 = 0x9003800; // type:data
 obfuscated_battle_heap_create = 0x7012ACA1; // type:data
 obfuscated_general_heap_create = 0x7012BC11; // type:data
 D_7599F6D8 = 0x7599F6D8; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index b10d660d92..35f73e7966 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -44,7 +44,7 @@ fx_sun_undeclared = fx_sun;
 
 D_E007EC2F = 0xE007EC2F;
 
-// effect_6
+// effect_landing_dust effect_walking_dust
 D_09002780 = 0x09002780;
 D_09002868 = 0x09002868;
 D_09002950 = 0x09002950;
@@ -53,30 +53,14 @@ D_09002B20 = 0x09002B20;
 D_09002B40 = 0x09002B40;
 D_09002B60 = 0x09002B60;
 
-// effect_7
-D_09002780 = 0x09002780;
-D_09002868 = 0x09002868;
-D_09002950 = 0x09002950;
-D_09002B20 = 0x09002B20;
-D_09002B40 = 0x09002B40;
-
-// effect_16
-D_09002170 = 0x09002170;
-D_09002238 = 0x09002238;
+// emote
 D_090022E0 = 0x090022E0;
+D_09002238 = 0x09002238;
 D_09002308 = 0x09002308;
-D_090023B0 = 0x090023B0;
 D_090023D8 = 0x090023D8;
 D_09002480 = 0x09002480;
 D_090024A8 = 0x090024A8;
 D_09002550 = 0x09002550;
-D_09002578 = 0x09002578;
-
-// effect_75
-D_09001280 = 0x09001280;
-D_09001358 = 0x09001358;
-D_09001430 = 0x09001430;
-D_09001508 = 0x09001508;
 
 // effect_attack_result_text
 D_09001500 = 0x09001500;
@@ -156,6 +140,19 @@ D_09000B88 = 0x09000B88;
 D_09000C00 = 0x09000C00;
 D_09000C20 = 0x09000C20;
 
+// effect_blast
+D_09001300 = 0x09001300;
+D_09001378 = 0x09001378;
+D_090013F0 = 0x090013F0;
+D_09001468 = 0x09001468;
+D_090014E0 = 0x090014E0;
+D_09001558 = 0x09001558;
+D_090015D0 = 0x090015D0;
+D_09001648 = 0x09001648;
+D_090016C0 = 0x090016C0;
+D_09001738 = 0x09001738;
+D_090017B0 = 0x090017B0;
+
 // Invalid pointers from dead code
 dead_atan2 = 0x8002AF70;
 dead_gCurrentCamID = 0x800A158C;