diff --git a/include/dead.h b/include/dead.h
index 45fc474d16..a6fc6eab2c 100644
--- a/include/dead.h
+++ b/include/dead.h
@@ -10,7 +10,7 @@
 #define evt_get_float_variable dead_evt_get_float_variable
 #define cos_rad dead_cos_rad
 #define evt_set_float_variable dead_evt_set_float_variable
-#define playFX_11 dead_playFX_11
+#define fx_sparkles dead_fx_sparkles
 #define gPlayerStatusPtr dead_gPlayerStatusPtr
 #define set_main_pan_u dead_set_main_pan_u
 #define set_main_pan_v dead_set_main_pan_v
@@ -46,19 +46,19 @@
 #define gPartnerActionStatus dead_gPartnerActionStatus
 #define get_npc_safe dead_get_npc_safe
 #define sfx_adjust_env_sound_pos dead_sfx_adjust_env_sound_pos
-#define playFX_83 dead_playFX_83
+#define fx_star_spirits_energy dead_fx_star_spirits_energy
 #define heap_malloc dead_heap_malloc
 #define update_lerp dead_update_lerp
 #define create_shadow_type dead_create_shadow_type
-#define playFX_7B dead_playFX_7B
+#define fx_spirit_card dead_fx_spirit_card
 #define dist3D dead_dist3D
 #define subtract_hp dead_subtract_hp
 #define get_entity_by_index dead_get_entity_by_index
-#define playFX_52 dead_playFX_52
-#define playFX_33 dead_playFX_33
+#define fx_energy_orb_wave dead_fx_energy_orb_wave
+#define fx_radial_shimmer dead_fx_radial_shimmer
 #define set_screen_overlay_color dead_set_screen_overlay_color
 #define set_screen_overlay_params_front dead_set_screen_overlay_params_front
-#define playFX_82 dead_playFX_82
+#define fx_sun dead_fx_sun
 #define set_message_images dead_set_message_images
 #define general_heap_free dead_general_heap_free
 #define decode_yay0 dead_decode_yay0
diff --git a/include/effects.h b/include/effects.h
index 7ca105410d..981534a9bd 100644
--- a/include/effects.h
+++ b/include/effects.h
@@ -5,132 +5,141 @@
 #include "common_structs.h"
 
 enum EffectID {
-    EFFECT_ID_00 = 0x00,
-    EFFECT_ID_01,
-    EFFECT_ID_06 = 0x06,
-    EFFECT_ID_07,
-    EFFECT_ID_08,
-    EFFECT_ID_09,
-    EFFECT_ID_0A,
-    EFFECT_ID_0B,
-    EFFECT_ID_0C,
-    EFFECT_ID_0D,
-    EFFECT_ID_0E,
-    EFFECT_ID_0F,
-    EFFECT_ID_10,
-    EFFECT_ID_11,
-    EFFECT_ID_12,
-    EFFECT_ID_13,
-    EFFECT_ID_14,
-    EFFECT_ID_15,
-    EFFECT_ID_16,
-    EFFECT_ID_17,
-    EFFECT_ID_18,
-    EFFECT_ID_19,
-    EFFECT_ID_1A,
-    EFFECT_ID_1B,
-    EFFECT_ID_1C,
-    EFFECT_ID_1D,
-    EFFECT_ID_1E,
-    EFFECT_ID_1F,
-    EFFECT_ID_20,
-    EFFECT_ID_21,
-    EFFECT_ID_22,
-    EFFECT_ID_23,
-    EFFECT_ID_24,
-    EFFECT_ID_25,
-    EFFECT_ID_26,
-    EFFECT_ID_27,
-    EFFECT_ID_28,
-    EFFECT_ID_29,
-    EFFECT_ID_2B = 0x2B,
-    EFFECT_ID_2C,
-    EFFECT_ID_2D,
-    EFFECT_ID_2E,
-    EFFECT_ID_2F,
-    EFFECT_ID_30,
-    EFFECT_ID_31,
-    EFFECT_ID_32,
-    EFFECT_ID_33,
-    EFFECT_ID_34,
-    EFFECT_ID_35,
-    EFFECT_ID_36,
-    EFFECT_ID_37,
-    EFFECT_ID_38,
-    EFFECT_ID_39,
-    EFFECT_ID_3A,
-    EFFECT_ID_3B,
-    EFFECT_ID_3C,
-    EFFECT_ID_3D,
-    EFFECT_ID_3E,
-    EFFECT_ID_3F,
-    EFFECT_ID_40,
-    EFFECT_ID_41,
-    EFFECT_ID_42,
-    EFFECT_ID_43,
-    EFFECT_ID_44,
-    EFFECT_ID_45,
-    EFFECT_ID_46,
-    EFFECT_ID_47,
-    EFFECT_ID_48,
-    EFFECT_ID_49,
-    EFFECT_ID_4A,
-    EFFECT_ID_4B,
-    EFFECT_ID_4C,
-    EFFECT_ID_4D,
-    EFFECT_ID_4E,
-    EFFECT_ID_4F,
-    EFFECT_ID_51 = 0x51,
-    EFFECT_ID_52,
-    EFFECT_ID_53,
-    EFFECT_ID_55 = 0x55,
-    EFFECT_ID_56,
-    EFFECT_ID_57,
-    EFFECT_ID_58,
-    EFFECT_ID_59,
-    EFFECT_ID_5A,
-    EFFECT_ID_5B,
-    EFFECT_ID_5C,
-    EFFECT_ID_5D,
-    EFFECT_ID_5E,
-    EFFECT_ID_5F,
-    EFFECT_ID_60,
-    EFFECT_ID_61,
-    EFFECT_ID_62,
-    EFFECT_ID_63,
-    EFFECT_ID_64,
-    EFFECT_ID_65,
-    EFFECT_ID_66,
-    EFFECT_ID_67,
-    EFFECT_ID_68,
-    EFFECT_ID_69,
-    EFFECT_ID_6B = 0x6B,
-    EFFECT_ID_6C,
-    EFFECT_ID_6D,
-    EFFECT_ID_6E,
-    EFFECT_ID_6F,
-    EFFECT_ID_70,
-    EFFECT_ID_71,
-    EFFECT_ID_72,
-    EFFECT_ID_73,
-    EFFECT_ID_74,
-    EFFECT_ID_75,
-    EFFECT_ID_77 = 0x77,
-    EFFECT_ID_78,
-    EFFECT_ID_79,
-    EFFECT_ID_7A,
-    EFFECT_ID_7B,
-    EFFECT_ID_7C,
-    EFFECT_ID_7D,
-    EFFECT_ID_7E,
-    EFFECT_ID_7F,
-    EFFECT_ID_80,
-    EFFECT_ID_81,
-    EFFECT_ID_82,
-    EFFECT_ID_83,
-    EFFECT_ID_84,
-    EFFECT_ID_85,
-    EFFECT_ID_86,
+    EFFECT_00 = 0x00,
+    EFFECT_BIG_SMOKE_PUFF,
+    EFFECT_02, // unused
+    EFFECT_03, // unused
+    EFFECT_04, // unused
+    EFFECT_05, // unused
+    EFFECT_LANDING_DUST,
+    EFFECT_WALKING_DUST,
+    EFFECT_FLOWER_SPLASH,
+    EFFECT_FLOWER_TRAIL,
+    EFFECT_CLOUD_PUFF,
+    EFFECT_CLOUD_TRAIL,
+    EFFECT_FOOTPRINT,
+    EFFECT_FLOATING_FLOWER,
+    EFFECT_SNOWFLAKE,
+    EFFECT_STAR,
+    EFFECT_EMOTE,
+    EFFECT_SPARKLES,
+    EFFECT_SHAPE_SPELL,
+    EFFECT_GATHER_ENERGY_PINK,
+    EFFECT_DROP_LEAVES,
+    EFFECT_DUST,
+    EFFECT_SHATTERING_STONES,
+    EFFECT_SMOKE_RING,
+    EFFECT_DAMAGE_STARS,
+    EFFECT_EXPLOSION,
+    EFFECT_LENS_FLARE,
+    EFFECT_GOT_ITEM_OUTLINE,
+    EFFECT_SPIKY_WHITE_AURA,
+    EFFECT_SMOKE_IMPACT,
+    EFFECT_DAMAGE_INDICATOR,
+    EFFECT_PURPLE_RING,
+    EFFECT_FLAME,
+    EFFECT_STARS_BURST,
+    EFFECT_STARS_SHIMMER,
+    EFFECT_RISING_BUBBLE,
+    EFFECT_RING_BLAST,
+    EFFECT_SHOCKWAVE,
+    EFFECT_MUSIC_NOTE,
+    EFFECT_SMOKE_BURST,
+    EFFECT_SWEAT,
+    EFFECT_SLEEP_BUBBLE,
+    EFFECT_2A, // unused
+    EFFECT_WINDY_LEAVES,
+    EFFECT_FALLING_LEAVES,
+    EFFECT_STARS_SPREAD,
+    EFFECT_STEAM_BURST,
+    EFFECT_STARS_ORBITING,
+    EFFECT_BIG_SNOWFLAKES,
+    EFFECT_DEBUFF,
+    EFFECT_GREEN_IMPACT,
+    EFFECT_RADIAL_SHIMMER,
+    EFFECT_ENDING_DECALS,
+    EFFECT_LIGHT_RAYS,
+    EFFECT_LIGHTNING,
+    EFFECT_FIRE_BREATH,
+    EFFECT_SHIMMER_BURST,
+    EFFECT_ENERGY_SHOCKWAVE,
+    EFFECT_SHIMMER_WAVE,
+    EFFECT_AURA,
+    EFFECT_3C,
+    EFFECT_3D,
+    EFFECT_BLAST,
+    EFFECT_FIRE_FLOWER,
+    EFFECT_RECOVER,
+    EFFECT_DISABLE_X,
+    EFFECT_BOMBETTE_BREAKING,
+    EFFECT_FIREWORK,
+    EFFECT_CONFETTI,
+    EFFECT_SNOWFALL,
+    EFFECT_46,
+    EFFECT_GATHER_MAGIC,
+    EFFECT_ATTACK_RESULT_TEXT,
+    EFFECT_SMALL_GOLD_SPARKLE,
+    EFFECT_FLASHING_BOX_SHOCKWAVE,
+    EFFECT_BALLOON,
+    EFFECT_FLOATING_ROCK,
+    EFFECT_CHOMP_DROP,
+    EFFECT_QUIZMO_STAGE,
+    EFFECT_RADIATING_ENERGY_ORB,
+    EFFECT_QUIZMO_ANSWER, // unused
+    EFFECT_MOTION_BLUR_FLAME,
+    EFFECT_ENERGY_ORB_WAVE,
+    EFFECT_MERLIN_HOUSE_STARS,
+    EFFECT_QUIZMO_AUDIENCE, // unused
+    EFFECT_BUTTERFLIES,
+    EFFECT_STAT_CHANGE,
+    EFFECT_SNAKING_STATIC,
+    EFFECT_THUNDERBOLT_RING,
+    EFFECT_SQUIRT,
+    EFFECT_WATER_BLOCK,
+    EFFECT_WATERFALL,
+    EFFECT_WATER_FOUNTAIN,
+    EFFECT_UNDERWATER,
+    EFFECT_LIGHTNING_BOLT,
+    EFFECT_WATER_SPLASH,
+    EFFECT_SNOWMAN_DOLL,
+    EFFECT_FRIGHT_JAR,
+    EFFECT_STOP_WATCH,
+    EFFECT_63,
+    EFFECT_THROW_SPINY,
+    EFFECT_65,
+    EFFECT_TUBBA_HEART_ATTACK,
+    EFFECT_WHIRLWIND,
+    EFFECT_RED_IMPACT,
+    EFFECT_FLOATING_CLOUD_PUFF,
+    EFFECT_6A, // unused
+    EFFECT_ENERGY_IN_OUT,
+    EFFECT_TATTLE_WINDOW,
+    EFFECT_SHINY_FLARE,
+    EFFECT_HUFF_PUFF_BREATH,
+    EFFECT_COLD_BREATH,
+    EFFECT_EMBERS,
+    EFFECT_HIEROGLYPHS,
+    EFFECT_MISC_PARTICLES,
+    EFFECT_STATIC_STATUS,
+    EFFECT_MOVING_CLOUD,
+    EFFECT_75,
+    EFFECT_76, // unused
+    EFFECT_FIREWORK_ROCKET,
+    EFFECT_PEACH_STAR_BEAM,
+    EFFECT_CHAPTER_CHANGE,
+    EFFECT_ICE_SHARD,
+    EFFECT_SPIRIT_CARD,
+    EFFECT_LIL_OINK,
+    EFFECT_SOMETHING_ROTATING,
+    EFFECT_BREAKING_JUNK,
+    EFFECT_PARTNER_BUFF,
+    EFFECT_QUIZMO_ASSISTANT,
+    EFFECT_ICE_PILLAR,
+    EFFECT_SUN,
+    EFFECT_STAR_SPIRITS_ENERGY,
+    EFFECT_PINK_SPARKLES,
+    EFFECT_STAR_OUTLINE,
+    EFFECT_86,
 };
 
 typedef struct {
@@ -194,7 +203,7 @@ typedef struct StarSpiritEffect {
     /* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54;
 } StarSpiritEffect; // size = 0x58
 
-typedef struct Effect1 {
+typedef struct BigSmokePuffFXData {
     /* 0x00 */ s16 unk_00;
     /* 0x02 */ s16 unk_02;
     /* 0x04 */ s16 unk_04;
@@ -208,9 +217,9 @@ typedef struct Effect1 {
     /* 0x20 */ f32 unk_20;
     /* 0x24 */ f32 unk_24;
     /* 0x28 */ char unk_28[0x4];
-} Effect1; // size = 0x2C
+} BigSmokePuffFXData; // size = 0x2C
 
-typedef struct Effect6 {
+typedef struct LandingDustFXData {
     /* 0x00 */ u16 type;
     /* 0x02 */ char unk_02[0x2];
     /* 0x04 */ f32 x;
@@ -229,9 +238,9 @@ typedef struct Effect6 {
     /* 0x38 */ s32 unk_38;
     /* 0x3C */ s32 unk_3C;
     /* 0x40 */ s32 unk_40;
-} Effect6; // size = 0x44
+} LandingDustFXData; // size = 0x44
 
-typedef struct Effect7 {
+typedef struct WalkingDustFXData {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ u16 unk_04;
     /* 0x08 */ f32 unk_08;
@@ -246,10 +255,10 @@ typedef struct Effect7 {
     /* 0x6C */ s32 unk_6C;
     /* 0x70 */ s32 unk_70;
     /* 0x74 */ s32 unk_74;
-} Effect7; // size = 0x78
+} WalkingDustFXData; // size = 0x78
 
-// Used by effects 8 and 9 (TODO: better name)
-typedef struct Effect8 {
+// Used by both flower_splash and flower_trail
+typedef struct FlowerFXData {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ u16 unk_04;
     /* 0x06 */ s16 unk_06;
@@ -276,9 +285,9 @@ typedef struct Effect8 {
     /* 0x8C */ f32 unk_8C;
     /* 0x90 */ f32 unk_90;
     /* 0x94 */ f32 unk_94;
-} Effect8; // size = 0x98
+} FlowerFXData; // size = 0x98
 
-typedef struct Effect10 {
+typedef struct CloudPuffFXData {
     /* 0x00 */ s32 alive;
     /* 0x04 */ char unk_04[0x2];
     /* 0x06 */ s16 lifetime;
@@ -300,9 +309,9 @@ typedef struct Effect10 {
     /* 0x40 */ s32 unk_40;
     /* 0x44 */ f32 unk_44;
     /* 0x48 */ f32 unk_48;
-} Effect10; // size = 0x4C
+} CloudPuffFXData; // size = 0x4C
 
-typedef struct Effect11 {
+typedef struct CloudTrailFXData {
     /* 0x00 */ s32 alive;
     /* 0x04 */ u16 unk_04;
     /* 0x06 */ s16 lifetime;
@@ -324,9 +333,9 @@ typedef struct Effect11 {
     /* 0x40 */ f32 unk_40;
     /* 0x44 */ s32 unk_44;
     /* 0x48 */ char unk_48[0x8];
-} Effect11; // size = 0x50
+} CloudTrailFXData; // size = 0x50
 
-typedef struct Effect12 {
+typedef struct FootprintFXData {
     /* 0x00 */ s32 alive;
     /* 0x04 */ char unk_04[0x2];
     /* 0x06 */ s16 lifetime;
@@ -350,9 +359,9 @@ typedef struct Effect12 {
     /* 0x88 */ char unk_88[0x8];
     /* 0x90 */ f32 unk_90;
     /* 0x94 */ f32 unk_94;
-} Effect12; // size = 0x98
+} FootprintFXData; // size = 0x98
 
-typedef struct Effect13 {
+typedef struct FloatingFlowerFXData {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ f32 unk_04;
     /* 0x08 */ f32 unk_08;
@@ -371,9 +380,9 @@ typedef struct Effect13 {
     /* 0x3C */ s32 unk_3C;
     /* 0x40 */ s32 unk_40;
     /* 0x44 */ s32 unk_44;
-} Effect13; // size = 0x48
+} FloatingFlowerFXData; // size = 0x48
 
-typedef struct Effect14 {
+typedef struct SnowflakeFXData {
     /* 0x00 */ f32 xPos;
     /* 0x04 */ f32 yPos;
     /* 0x08 */ f32 zPos;
@@ -385,9 +394,9 @@ typedef struct Effect14 {
     /* 0x20 */ f32 unk_20;
     /* 0x24 */ f32 unk_24;
     /* 0x28 */ s32 unk_28;
-} Effect14; // size = 0x2C
+} SnowflakeFXData; // size = 0x2C
 
-typedef struct Effect15 {
+typedef struct StarFXData {
     /* 0x000 */ s32 unk_00;
     /* 0x004 */ f32 unk_04;
     /* 0x008 */ f32 unk_08;
@@ -409,9 +418,9 @@ typedef struct Effect15 {
     /* 0x244 */ s32 unk_244;
     /* 0x248 */ s32 unk_248;
     /* 0x24C */ s32 unk_24C;
-} Effect15; // size = 0x250
+} StarFXData; // size = 0x250
 
-typedef struct Effect16 {
+typedef struct EmoteFXData {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ f32 unk_04;
     /* 0x08 */ f32 unk_08;
@@ -428,9 +437,9 @@ typedef struct Effect16 {
     /* 0x34 */ s32 unk_34;
     /* 0x38 */ s32 unk_38;
     /* 0x3C */ s32 unk_3C;
-} Effect16; // size = 0x40
+} EmoteFXData; // size = 0x40
 
-typedef struct Effect73 {
+typedef struct SmallGoldSparkleFXData {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ s32 unk_04;
     /* 0x08 */ f32 unk_08;
@@ -440,9 +449,9 @@ typedef struct Effect73 {
     /* 0x18 */ s32 unk_18;
     /* 0x1C */ f32 unk_1C;
     /* 0x20 */ s32 unk_20;
-} Effect73; // size = 0x24
+} SmallGoldSparkleFXData; // size = 0x24
 
-typedef struct Effect75 {
+typedef struct BalloonFXData {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ f32 unk_04;
     /* 0x08 */ f32 unk_08;
@@ -452,7 +461,7 @@ typedef struct Effect75 {
     /* 0x18 */ f32 unk_18;
     /* 0x1C */ s32 unk_1C;
     /* 0x20 */ s32 unk_20;
-} Effect75; // size = 0x24
+} BalloonFXData; // size = 0x24
 
 typedef struct Effect134 {
     /* 0x00 */ s32 unk_00;
@@ -472,9 +481,9 @@ typedef struct Effect134 {
 } Effect134; // size = 0x38
 
 // TODO figure out what this actually is
-// playFX_4E invokes gEffectTable[78]'s entryPoint function
-// playFX_6F invokes gEffectTable[111]'s entryPoint function
-// playFX_83 invokes gEffectTable[131]'s entryPoint function
+// fx_quizmo_stage invokes gEffectTable[78]'s entryPoint function
+// fx_cold_breath invokes gEffectTable[111]'s entryPoint function
+// fx_star_spirits_energy invokes gEffectTable[131]'s entryPoint function
 // These functions are currently typed to return void
 // Assume they return an Effect*, and this struct is accessed at unk_0C,
 // but this struct differs from EffectInstanceData
@@ -607,140 +616,136 @@ EffectInstance* create_effect_instance(EffectBlueprint* effectBp);
 void remove_effect(EffectInstance*);
 s32 load_effect(s32 effectIndex);
 
-void playFX_00(s32, f32, f32, f32, s32);
-void playFX_01(f32, f32, f32);
-void playFX_02(s32, f32, f32, f32, s32);
-EffectInstance* playFX_03(s32, f32, f32, f32, s32);
-EffectInstance* playFX_04(s32, f32, f32, f32, s32);
-EffectInstance* playFX_05(s32, f32, f32, f32, s32);
-void fx_land(s32, f32, f32, f32, f32);
-void fx_walk(s32, f32, f32, f32, f32, f32);
-void playFX_08(f32, f32, f32, f32);
-void playFX_09(s32, f32, f32, f32, f32, f32);
-EffectInstance* playFX_0A(f32, f32, f32, f32);
-EffectInstance* playFX_0B(s32, f32, f32, f32);
-EffectInstance* playFX_0C(f32, f32, f32, f32, f32);
-EffectInstance* playFX_0D(s32, f32, f32, f32, s32);
-EffectInstance* playFX_0E(f32, f32, f32, s32);
-void playFX_0F(s32, f32, f32, f32, f32, f32, f32, f32);
+void fx_big_dust_puff(s32, f32, f32, f32, s32);
+void fx_big_smoke_puff(f32, f32, f32);
+void fx_landing_dust(s32, f32, f32, f32, f32);
+void fx_walking_dust(s32, f32, f32, f32, f32, f32);
+void fx_flower_splash(f32, f32, f32, f32);
+void fx_flower_trail(s32, f32, f32, f32, f32, f32);
+EffectInstance* fx_cloud_puff(f32, f32, f32, f32);
+EffectInstance* fx_cloud_trail(s32, f32, f32, f32);
+EffectInstance* fx_footprint(f32, f32, f32, f32, f32);
+EffectInstance* fx_floating_flower(s32, f32, f32, f32, s32);
+EffectInstance* fx_snowflake(f32, f32, f32, s32);
+void fx_star(s32, f32, f32, f32, f32, f32, f32, f32);
 void fx_emote(s32, Npc*, f32, f32, f32, f32, f32, s32, s32*);
-void playFX_11(s32, f32, f32, f32, f32);
-EffectInstance* playFX_12(s32, f32, f32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_13(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_14(s32, f32, f32, f32, s32);
-EffectInstance* playFX_15(s32, f32, f32, f32, s32);
-EffectInstance* playFX_16(s32, f32, f32, f32, f32);
-void playFX_17(s32, f32, f32, f32);
-void playFX_18(s32, f32, f32, f32, f32, f32, f32, s32);
-void playFX_19(s32, f32, f32, f32);
-EffectInstance* playFX_1A(s32, f32, f32, f32, s32);
-EffectInstance* playFX_1B(s32, f32, f32, f32, f32, s32*);
-EffectInstance* playFX_1C(s32, f32, f32, f32, s32);
-void playFX_1D(s32, f32, f32, f32, f32, s32, f32, s32);
-EffectInstance* playFX_1E(s32, f32, f32, f32, f32, f32, s32, s32*);
-EffectInstance* playFX_1F(s32, f32, f32, f32, f32, f32, f32, f32);
-EffectInstance* playFX_20(s32, f32, f32, f32, f32, EffectInstance**);
-EffectInstance* playFX_21(s32, f32, f32, f32, f32, f32, s32);
-void playFX_22(s32, f32, f32, f32, f32, f32, s32, s32);
-EffectInstance* playFX_23(u32, f32, f32, f32, f32);
-EffectInstance* playFX_24(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_25(s32, f32, f32, f32);
-void playFX_26(s32, f32, f32, f32);
-EffectInstance* playFX_27(s32, f32, f32, f32, f32, s32);
+void fx_sparkles(s32, f32, f32, f32, f32);
+EffectInstance* fx_shape_spell(s32, f32, f32, f32, f32, f32, f32, s32);
+EffectInstance* fx_gather_energy_pink(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_drop_leaves(s32, f32, f32, f32, s32);
+EffectInstance* fx_dust(s32, f32, f32, f32, s32);
+EffectInstance* fx_shattering_stones(s32, f32, f32, f32, f32);
+void fx_smoke_ring(s32, f32, f32, f32);
+void fx_damage_stars(s32, f32, f32, f32, f32, f32, f32, s32);
+void fx_explosion(s32, f32, f32, f32);
+EffectInstance* fx_lens_flare(s32, f32, f32, f32, s32);
+EffectInstance* fx_got_item_outline(s32, f32, f32, f32, f32, s32*);
+EffectInstance* fx_spiky_white_aura(s32, f32, f32, f32, s32);
+void fx_smoke_impact(s32, f32, f32, f32, f32, s32, f32, s32);
+EffectInstance* fx_damage_indicator(s32, f32, f32, f32, f32, f32, s32, s32*);
+EffectInstance* fx_purple_ring(s32, f32, f32, f32, f32, f32, f32, f32);
+EffectInstance* fx_flame(s32, f32, f32, f32, f32, EffectInstance**);
+EffectInstance* fx_stars_burst(s32, f32, f32, f32, f32, f32, s32);
+void fx_stars_shimmer(s32, f32, f32, f32, f32, f32, s32, s32);
+EffectInstance* fx_rising_bubble(u32, f32, f32, f32, f32);
+EffectInstance* fx_ring_blast(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_shockwave(s32, f32, f32, f32);
+void fx_music_note(s32, f32, f32, f32);
+EffectInstance* fx_smoke_burst(s32, f32, f32, f32, f32, s32);
 void fx_sweat(s32, f32 x, f32 y, f32 z, f32, f32, s32);
 void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, s32*);
-EffectInstance* playFX_2A(s32, f32, f32, f32);
-EffectInstance* playFX_2B(s32, f32, f32, f32);
-EffectInstance* playFX_2C(s32, f32, f32, f32);
-void playFX_2D(s32, f32, f32, f32, s32, s32);
-void playFX_2E(s32, f32, f32, f32, f32, s32);
-void playFX_2F(s32, f32, f32, f32, f32, s32, s32*);
-void playFX_30(s32, f32, f32, f32);
-void playFX_31(s32, f32, f32, f32);
-void playFX_32(s32, f32, f32, f32, f32);
-EffectInstance* playFX_33(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_34(s32, f32, f32, f32, f32, s32*);
-EffectInstance* playFX_35(s32, f32, f32, f32, f32, s32*);
-EffectInstance* playFX_36(s32, f32, f32, f32, f32, f32);
-EffectInstance* playFX_37(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32);
-EffectInstance* playFX_38(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_39(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_3A(s32, f32, f32, f32, f32, f32, s32, s32);
-void playFX_3B(s32, f32, f32, f32, f32, s32*);
-EffectInstance* playFX_3C(s32, f32, f32, f32, f32, s32*);
-void playFX_3D(s32, f32, f32, f32, f32, f32, f32, s32, s32*);
-EffectInstance* playFX_3E(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_3F(s32, f32, f32, f32, s32);
-EffectInstance* playFX_40(s32, f32, f32, f32, s32);
-EffectInstance* playFX_41(s32, f32, f32, f32, s32);
-EffectInstance* playFX_42(s32, s32, s32, f32, s32, s32);
-EffectInstance* playFX_43(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_44(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_45(s32, s32);
-EffectInstance* playFX_46_whirlwind(s32, EffectWhirlwind*, f32, s32);
-EffectInstance* playFX_47(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_48(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_49(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_4A(s32, f32, f32, f32, f32, f32);
-EffectInstance* playFX_4B(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_4C(s32, f32, f32, f32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_4D(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32);
-EffectInstance* playFX_4E(s32, f32, f32, f32);
-EffectInstance* playFX_4F(s32, f32, f32, f32, f32, s32);
-void playFX_50(s32, f32, f32, f32);
-EffectInstance* playFX_51(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_52(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_53(s32, f32, f32, f32);
-EffectInstance* playFX_54(s32, f32, f32, f32);
-EffectInstance* playFX_55(s32, f32, f32, f32);
-EffectInstance* playFX_56(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_57(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_58(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_59(s32, f32, f32, f32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_5A(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32);
-EffectInstance* playFX_5B(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_5C(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_5D(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_5E(s32, f32, f32, f32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_5F(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32);
-EffectInstance* playFX_60(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_61(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_62(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_63(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
-EffectInstance* playFX_64(s32, f32, f32, f32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_65(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_66(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_67(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_68(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_69(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_6A(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_6B(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_6C(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_6D(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_6E(s32, f32, f32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_6F(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_70(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32);
-EffectInstance* playFX_71(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_72(s32, f32, f32, f32, f32, f32, f32, s32, s32);
-EffectInstance* playFX_73(s32, f32, f32, f32, f32, s32, s32); //returns ptr to struct unk_802BE310* in watt.c
-EffectInstance* playFX_74(s32, f32, f32, f32, f32, f32, f32, f32, f32);
-EffectInstance* playFX_75(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_76(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_77(s32, f32, f32, f32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_78(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_79(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_7A(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_7B(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_7C(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_7D(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_7E(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_7F(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_80(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_81(s32, f32 x, f32 y, f32 z, f32, s32);
-EffectInstance* playFX_82(s32, f32, f32, f32, f32, s32 time);
-EffectInstance* playFX_83(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_84(s32, f32, f32, f32, f32, f32);
-EffectInstance* playFX_85(s32, f32, f32, f32, f32, s32);
-EffectInstance* playFX_86(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_2A(s32, f32, f32, f32);
+EffectInstance* fx_windy_leaves(s32, f32, f32, f32);
+EffectInstance* fx_falling_leaves(s32, f32, f32, f32);
+void fx_stars_spread(s32, f32, f32, f32, s32, s32);
+void fx_steam_burst(s32, f32, f32, f32, f32, s32);
+void fx_stars_orbiting(s32, f32, f32, f32, f32, s32, s32*);
+void fx_big_snowflakes(s32, f32, f32, f32);
+void fx_debuff(s32, f32, f32, f32);
+void fx_green_impact(s32, f32, f32, f32, f32);
+EffectInstance* fx_radial_shimmer(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_ending_decals(s32, f32, f32, f32, f32, s32*);
+EffectInstance* fx_light_rays(s32, f32, f32, f32, f32, s32*);
+EffectInstance* fx_lightning(s32, f32, f32, f32, f32, f32);
+EffectInstance* fx_fire_breath(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32);
+EffectInstance* fx_shimmer_burst(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_energy_shockwave(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_shimmer_wave(s32, f32, f32, f32, f32, f32, s32, s32);
+void fx_aura(s32, f32, f32, f32, f32, s32*);
+EffectInstance* fx_3C(s32, f32, f32, f32, f32, s32*);
+void fx_3D(s32, f32, f32, f32, f32, f32, f32, s32, s32*);
+EffectInstance* fx_blast(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_fire_flower(s32, f32, f32, f32, s32);
+EffectInstance* fx_recover(s32, f32, f32, f32, s32);
+EffectInstance* fx_disable_x(s32, f32, f32, f32, s32);
+EffectInstance* fx_bombette_breaking(s32, s32, s32, f32, s32, s32);
+EffectInstance* fx_firework(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_confetti(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_snowfall(s32, s32);
+EffectInstance* fx_46(s32, EffectWhirlwind*, f32, s32);
+EffectInstance* fx_gather_magic(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_attack_result_text(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_small_gold_sparkle(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_flashing_box_shockwave(s32, f32, f32, f32, f32, f32);
+EffectInstance* fx_balloon(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_floating_rock(s32, f32, f32, f32, f32, f32, f32, f32, s32);
+EffectInstance* fx_chomp_drop(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32);
+EffectInstance* fx_quizmo_stage(s32, f32, f32, f32);
+EffectInstance* fx_radiating_energy_orb(s32, f32, f32, f32, f32, s32);
+void fx_quizmo_answer(s32, f32, f32, f32);
+EffectInstance* fx_motion_blur_flame(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_energy_orb_wave(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_merlin_house_stars(s32, f32, f32, f32);
+EffectInstance* fx_quizmo_audience(s32, f32, f32, f32);
+EffectInstance* fx_butterflies(s32, f32, f32, f32);
+EffectInstance* fx_stat_change(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_snaking_static(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_thunderbolt_ring(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_squirt(s32, f32, f32, f32, f32, f32, f32, f32, s32);
+EffectInstance* fx_water_block(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32);
+EffectInstance* fx_waterfall(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_water_fountain(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_underwater(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_lightning_bolt(s32, f32, f32, f32, f32, f32, f32, f32, s32);
+EffectInstance* fx_water_splash(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32);
+EffectInstance* fx_snowman_doll(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_fright_jar(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_stop_watch(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_63(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
+EffectInstance* fx_throw_spiny(s32, f32, f32, f32, f32, f32, f32, f32, s32);
+EffectInstance* fx_65(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_tubba_heart_attack(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_whirlwind(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_red_impact(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_floating_cloud_puff(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_6A(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_energy_in_out(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_tattle_window(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_shiny_flare(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_huff_puff_breath(s32, f32, f32, f32, f32, f32, f32, s32);
+EffectInstance* fx_cold_breath(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_embers(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32);
+EffectInstance* fx_hieroglyphs(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_misc_particles(s32, f32, f32, f32, f32, f32, f32, s32, s32);
+EffectInstance* fx_static_status(s32, f32, f32, f32, f32, s32, s32); //returns ptr to struct unk_802BE310* in watt.c
+EffectInstance* fx_moving_cloud(s32, f32, f32, f32, f32, f32, f32, f32, f32);
+EffectInstance* fx_75(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_76(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_firework_rocket(s32, f32, f32, f32, f32, f32, f32, f32, s32);
+EffectInstance* fx_peach_star_beam(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_chapter_change(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_ice_shard(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_spirit_card(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_lil_oink(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_something_rotating(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_breaking_junk(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_partner_buff(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_quizmo_assistant(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_ice_pillar(s32, f32 x, f32 y, f32 z, f32, s32);
+EffectInstance* fx_sun(s32, f32, f32, f32, f32, s32 time);
+EffectInstance* fx_star_spirits_energy(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_pink_sparkles(s32, f32, f32, f32, f32, f32);
+EffectInstance* fx_star_outline(s32, f32, f32, f32, f32, s32);
+EffectInstance* fx_86(s32, f32, f32, f32, f32, s32);
 
 #endif
diff --git a/include/effects_internal.h b/include/effects_internal.h
index 4cddc4fa29..50f5a1f64c 100644
--- a/include/effects_internal.h
+++ b/include/effects_internal.h
@@ -6,6 +6,7 @@
 s32 func_E0200000(s32);
 
 EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp);
+s32 shim_load_effect(s32 effectIndex);
 void shim_remove_effect(EffectInstance*);
 s32 shim_rand_int(s32);
 void* shim_general_heap_malloc(s32 size);
@@ -25,12 +26,139 @@ void shim_guTranslateF(float mf[4][4], float x, float y, float z);
 void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z);
 void shim_mem_clear(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_load_effect(s32 effectIndex);
-
 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 fx_6_main(s32 type, f32 x, f32 y, f32 z, f32 arg4);
+// the actual signature is going to be wrong, but it doesn't matter
+// TODO remove when every effect's main is sorted out
+#define FX_MAIN(name) void name(void);
+
+void big_smoke_puff_main(f32 x, f32 y, f32 z);
+void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32);
+void walking_dust_main(s32, f32, f32, f32, f32, f32);
+void flower_splash_main(f32, f32, f32, f32);
+void flower_trail_main(s32, f32, f32, f32, f32, f32);
+void cloud_puff_main(f32, f32, f32, f32);
+void cloud_trail_main(s32, f32, f32, f32);
+void footprint_main(f32, f32, f32, f32, f32, f32, f32, f32);
+void floating_flower_main(s32, f32, f32, f32, s32);
+void snowflake_main(f32, f32, f32, s32, s32);
+EffectInstance* star_main(s32, f32, f32, f32, f32, f32, f32, f32);
+void emote_main(s32, s32, f32, f32, f32, f32, f32, s32, EffectInstance**);
+FX_MAIN(sparkles_main);
+FX_MAIN(shape_spell_main);
+FX_MAIN(gather_energy_pink_main);
+FX_MAIN(drop_leaves_main);
+FX_MAIN(dust_main);
+FX_MAIN(shattering_stones_main);
+FX_MAIN(smoke_ring_main);
+FX_MAIN(damage_stars_main);
+FX_MAIN(explosion_main);
+FX_MAIN(lens_flare_main);
+FX_MAIN(got_item_outline_main);
+FX_MAIN(spiky_white_aura_main);
+FX_MAIN(smoke_impact_main);
+FX_MAIN(damage_indicator_main);
+FX_MAIN(purple_ring_main);
+FX_MAIN(flame_main);
+FX_MAIN(stars_burst_main);
+FX_MAIN(stars_shimmer_main);
+FX_MAIN(rising_bubble_main);
+FX_MAIN(ring_blast_main);
+FX_MAIN(shockwave_main);
+FX_MAIN(music_note_main);
+FX_MAIN(smoke_burst_main);
+FX_MAIN(sweat_main);
+FX_MAIN(sleep_bubble_main);
+FX_MAIN(windy_leaves_main);
+FX_MAIN(falling_leaves_main);
+FX_MAIN(stars_spread_main);
+FX_MAIN(steam_burst_main);
+FX_MAIN(stars_orbiting_main);
+FX_MAIN(big_snowflakes_main);
+FX_MAIN(debuff_main);
+FX_MAIN(green_impact_main);
+FX_MAIN(radial_shimmer_main);
+FX_MAIN(ending_decals_main);
+FX_MAIN(light_rays_main);
+FX_MAIN(lightning_main);
+FX_MAIN(fire_breath_main);
+FX_MAIN(shimmer_burst_main);
+FX_MAIN(energy_shockwave_main);
+FX_MAIN(shimmer_wave_main);
+FX_MAIN(aura_main);
+FX_MAIN(fx_3C_main);
+FX_MAIN(fx_3D_main);
+FX_MAIN(blast_main);
+FX_MAIN(fire_flower_main);
+FX_MAIN(recover_main);
+FX_MAIN(disable_x_main);
+FX_MAIN(bombette_breaking_main);
+FX_MAIN(firework_main);
+FX_MAIN(confetti_main);
+FX_MAIN(snowfall_main);
+FX_MAIN(fx_46_main);
+FX_MAIN(gather_magic_main);
+EffectInstance* attack_result_text_main(s32, f32, f32, f32, f32, s32);
+EffectInstance* small_gold_sparkle_main(EffectInstanceDataThing*, f32, f32, f32, f32);
+FX_MAIN(flashing_box_shockwave_main);
+EffectInstance* balloon_main(s32, f32, f32, f32, f32, s32);
+FX_MAIN(floating_rock_main);
+FX_MAIN(chomp_drop_main);
+FX_MAIN(quizmo_stage_main);
+FX_MAIN(radiating_energy_orb_main);
+FX_MAIN(quizmo_answer_main);
+FX_MAIN(motion_blur_flame_main);
+FX_MAIN(energy_orb_wave_main);
+FX_MAIN(merlin_house_stars_main);
+FX_MAIN(quizmo_audience_main);
+FX_MAIN(butterflies_main);
+FX_MAIN(stat_change_main);
+FX_MAIN(snaking_static_main);
+FX_MAIN(thunderbolt_ring_main);
+FX_MAIN(squirt_main);
+FX_MAIN(water_block_main);
+FX_MAIN(waterfall_main);
+FX_MAIN(water_fountain_main);
+FX_MAIN(underwater_main);
+FX_MAIN(lightning_bolt_main);
+FX_MAIN(water_splash_main);
+FX_MAIN(snowman_doll_main);
+FX_MAIN(fright_jar_main);
+FX_MAIN(stop_watch_main);
+FX_MAIN(fx_63_main);
+FX_MAIN(throw_spiny_main);
+FX_MAIN(fx_65_main);
+FX_MAIN(tubba_heart_attack_main);
+FX_MAIN(whirlwind_main);
+FX_MAIN(red_impact_main);
+FX_MAIN(floating_cloud_puff_main);
+FX_MAIN(energy_in_out_main);
+FX_MAIN(tattle_window_main);
+FX_MAIN(shiny_flare_main);
+FX_MAIN(huff_puff_breath_main);
+FX_MAIN(cold_breath_main);
+FX_MAIN(embers_main);
+FX_MAIN(hieroglyphs_main);
+FX_MAIN(misc_particles_main);
+FX_MAIN(static_status_main);
+FX_MAIN(moving_cloud_main);
+FX_MAIN(fx_75_main);
+FX_MAIN(firework_rocket_main);
+FX_MAIN(peach_star_beam_main);
+FX_MAIN(chapter_change_main);
+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);
+FX_MAIN(partner_buff_main);
+FX_MAIN(quizmo_assistant_main);
+FX_MAIN(ice_pillar_main);
+FX_MAIN(sun_main);
+FX_MAIN(star_spirits_energy_main);
+FX_MAIN(pink_sparkles_main);
+FX_MAIN(star_outline_main);
+EffectInstance* fx_86_main(s32, f32, f32, f32, f32, s32);
 
 #endif
diff --git a/src/17FEB0.c b/src/17FEB0.c
index 7eb10b7519..9380ed8dee 100644
--- a/src/17FEB0.c
+++ b/src/17FEB0.c
@@ -91,7 +91,7 @@ s32 calc_item_damage_enemy(void) {
     }
     phi_a0_2 = 0;
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) {
-        playFX_24(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18);
+        fx_ring_blast(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18);
         isFireDamage = TRUE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) {
@@ -99,10 +99,10 @@ s32 calc_item_damage_enemy(void) {
         isElectricDamage = TRUE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) {
-        playFX_5F(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18);
+        fx_water_splash(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18);
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_ICE) {
-        playFX_30(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f);
+        fx_big_snowflakes(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f);
         isIceDamage = TRUE;
     }
     if ((battleStatus->currentAttackElement & DAMAGE_TYPE_REMOVE_BUFFS) == 0) {
diff --git a/src/18C790.c b/src/18C790.c
index 6cc18a637c..e6a973d432 100644
--- a/src/18C790.c
+++ b/src/18C790.c
@@ -46,7 +46,7 @@ ApiStatus func_8025E108(Evt* script, s32 isInitialCall) {
 }
 
 ApiStatus func_8025E14C(Evt* script, s32 isInitialCall) {
-    playFX_44(3, 0.0f, 100.0f, 0.0f, 1.0f, 0x78);
+    fx_confetti(3, 0.0f, 100.0f, 0.0f, 1.0f, 0x78);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/18F340.c b/src/18F340.c
index 38f995c089..1419a40a16 100644
--- a/src/18F340.c
+++ b/src/18F340.c
@@ -250,7 +250,7 @@ ApiStatus func_802613BC(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
 
-    playFX_6B(6, var1, var2 + 15, var3, 1.2f, 30);
+    fx_energy_in_out(6, var1, var2 + 15, var3, 1.2f, 30);
     return ApiStatus_DONE2;
 }
 
@@ -260,7 +260,7 @@ ApiStatus func_80261478(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
 
-    playFX_52(9, var1, var2 + 15, var3, 5.0f, 15);
+    fx_energy_orb_wave(9, var1, var2 + 15, var3, 5.0f, 15);
     return ApiStatus_DONE2;
 }
 
@@ -331,8 +331,8 @@ ApiStatus func_802616F4(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
         script->functionTemp[1] = 0;
         D_8029FB94 = merlee->pos.y;
-        D_8029FB98 = playFX_52(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
-        D_8029FB9C = playFX_52(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
+        D_8029FB98 = fx_energy_orb_wave(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
+        D_8029FB9C = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
         D_8029FBA4 = 0;
         D_8029FB90 = 12;
         sfx_play_sound(0x2074);
@@ -439,7 +439,7 @@ ApiStatus FXRecoverHP(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32 var4 = evt_get_variable(script, *args++);
 
-    playFX_40(0, var1, var2, var3, var4);
+    fx_recover(0, var1, var2, var3, var4);
     return ApiStatus_DONE2;
 }
 
@@ -450,7 +450,7 @@ ApiStatus FXRecoverFP(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32 var4 = evt_get_variable(script, *args++);
 
-    playFX_40(1, var1, var2, var3, var4);
+    fx_recover(1, var1, var2, var3, var4);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/190B20.c b/src/190B20.c
index 4e3c5bf57f..51385ca7a0 100644
--- a/src/190B20.c
+++ b/src/190B20.c
@@ -1825,7 +1825,7 @@ void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angl
     f32 temp_f20_2;
 
     if (var0 == 2) {
-        fx_land(0, xPos, yPos + 0.0f, zPos, D_802938A4);
+        fx_landing_dust(0, xPos, yPos + 0.0f, zPos, D_802938A4);
     } else if (var0 == 1) {
         D_802938A8 = 4;
     } else if (D_802938A8++ >= 4) {
@@ -1833,7 +1833,7 @@ void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angl
         temp_f20 = (clamp_angle(-angleDeg) * TAU) / 360.0f;
         temp_f20_2 = sin_rad(temp_f20);
         temp_f0 = cos_rad(temp_f20);
-        fx_walk(0, xPos + (temp_f20_2 * 24.0f * 0.2f), yPos + 1.5f, zPos + (temp_f0 * 24.0f * 0.2f), temp_f20_2, temp_f0);
+        fx_walking_dust(0, xPos + (temp_f20_2 * 24.0f * 0.2f), yPos + 1.5f, zPos + (temp_f0 * 24.0f * 0.2f), temp_f20_2, temp_f0);
     }
 }
 #else
@@ -2064,7 +2064,7 @@ void load_player_actor(void) {
     player->shadow.id = create_shadow_type(0, player->currentPos.x, player->currentPos.y, player->currentPos.z);
     player->shadowScale = player->size.x / 24.0;
     player->hudElementDataIndex = create_status_icon_set();
-    player->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0);
+    player->ptrDefuffIcon = fx_disable_x(0, -142.0f, 34.0f, 1.0f, 0);
     player->unk_228 = NULL;
 
     if (is_ability_active(ABILITY_ZAP_TAP)) {
@@ -2318,7 +2318,7 @@ void load_partner_actor(void) {
         partnerActor->shadow.id = create_shadow_type(0, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z);
         partnerActor->shadowScale = partnerActor->size.x / 24.0;
         partnerActor->hudElementDataIndex = create_status_icon_set();
-        partnerActor->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0);
+        partnerActor->ptrDefuffIcon = fx_disable_x(0, -142.0f, 34.0f, 1.0f, 0);
         partnerActor->unk_228 = NULL;
 
         takeTurnScript = start_script(partnerActor->takeTurnScriptSource, 10, 0);
@@ -2589,7 +2589,7 @@ Actor* create_actor(Formation formation) {
     takeTurnScript->owner1.enemyID = actor->enemyIndex | 0x200;
     actor->shadow.id = create_shadow_type(0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z);
     actor->shadowScale = actor->size.x / 24.0;
-    actor->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0);
+    actor->ptrDefuffIcon = fx_disable_x(0, -142.0f, 34.0f, 1.0f, 0);
     actor->unk_228 = NULL;
     actor->hudElementDataIndex = create_status_icon_set();
     return actor;
@@ -2768,7 +2768,7 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) {
                                 if (effect != NULL) {
                                     effect->flags |= EFFECT_INSTANCE_FLAGS_10;
                                 }
-                                target->unk_228 = playFX_81(0, target->currentPos.x, target->currentPos.y,
+                                target->unk_228 = fx_ice_pillar(0, target->currentPos.x, target->currentPos.y,
                                                             target->currentPos.z, 1.0f, 0);
                                 create_status_debuff(target->hudElementDataIndex, STATUS_FROZEN);
                             }
@@ -2985,7 +2985,7 @@ void func_802664DC(f32 x, f32 y, f32 z, s32 attack, s32 a) {
         a = 55;
     }
 
-    playFX_1E(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]);
+    fx_damage_indicator(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]);
     gDamageCountTimers[i] = 40;
 }
 
@@ -3011,7 +3011,7 @@ void show_damage_popup(f32 x, f32 y, f32 z, s32 attack, s32 a) {
         a = 55;
     }
 
-    playFX_1E(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]);
+    fx_damage_indicator(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]);
     gDamageCountTimers[i] = 40;
 }
 
@@ -3472,10 +3472,10 @@ void remove_player_buffs(s32 buffs) {
         battleStatus->unk_43C->unk_0C->unk_10 = 0;
         battleStatus->waterBlockEffect->flags |= 0x10;
 
-        playFX_5A(1, player->currentPos.x, player->currentPos.y + 18.0f, player->currentPos.z + 5.0f, 1.5f, 0xA);
-        playFX_5F(0, player->currentPos.x - 10.0f, player->currentPos.y + 5.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
-        playFX_5F(0, player->currentPos.x - 15.0f, player->currentPos.y + 32.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
-        playFX_5F(1, player->currentPos.x + 15.0f, player->currentPos.y + 22.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
+        fx_water_block(1, player->currentPos.x, player->currentPos.y + 18.0f, player->currentPos.z + 5.0f, 1.5f, 0xA);
+        fx_water_splash(0, player->currentPos.x - 10.0f, player->currentPos.y + 5.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
+        fx_water_splash(0, player->currentPos.x - 15.0f, player->currentPos.y + 32.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
+        fx_water_splash(1, player->currentPos.x + 15.0f, player->currentPos.y + 22.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
 
         battleStatus->waterBlockEffect = NULL;
         sfx_play_sound(SOUND_299);
diff --git a/src/19FAF0.c b/src/19FAF0.c
index 30efd73495..7ca5c7c12c 100644
--- a/src/19FAF0.c
+++ b/src/19FAF0.c
@@ -4,12 +4,12 @@
 #include "script_api/battle.h"
 
 ApiStatus func_80271210(Evt* script, s32 isInitialCall) {
-    playFX_31(0, script->varTable[0], script->varTable[1], script->varTable[2]);
+    fx_debuff(0, script->varTable[0], script->varTable[1], script->varTable[2]);
     return ApiStatus_DONE2;
 }
 
 ApiStatus func_80271258(Evt* script, s32 isInitialCall) {
-    playFX_31(1, script->varTable[0], script->varTable[1], script->varTable[2]);
+    fx_debuff(1, script->varTable[0], script->varTable[1], script->varTable[2]);
     return ApiStatus_DONE2;
 }
 
@@ -23,7 +23,7 @@ ApiStatus func_802713B0(Evt* script, s32 isInitialCall);
 INCLUDE_ASM(ApiStatus, "19FAF0", func_802713B0, Evt* script, s32 isInitialCall);
 
 ApiStatus func_8027143C(Evt* script, s32 isInitialCall) {
-    playFX_30(0, script->varTable[0], script->varTable[1], script->varTable[2]);
+    fx_big_snowflakes(0, script->varTable[0], script->varTable[1], script->varTable[2]);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/1A5830.c b/src/1A5830.c
index 2320e06e26..0354b19057 100644
--- a/src/1A5830.c
+++ b/src/1A5830.c
@@ -313,7 +313,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
         return HIT_RESULT_QUAKE_IMMUNE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) {
-        playFX_24(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
+        fx_ring_blast(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
         isFire = TRUE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) {
@@ -321,10 +321,10 @@ s32 calc_enemy_damage_target(Actor* attacker) {
         isElectric = TRUE;
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) {
-        playFX_5F(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
+        fx_water_splash(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
     }
     if (battleStatus->currentAttackElement & DAMAGE_TYPE_ICE) {
-        playFX_30(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f);
+        fx_big_snowflakes(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f);
     }
 
     if (!(attacker->staticStatus == STATUS_STATIC)) {
diff --git a/src/1AF120.c b/src/1AF120.c
index f593db254b..d2970912b1 100644
--- a/src/1AF120.c
+++ b/src/1AF120.c
@@ -393,7 +393,7 @@ EvtScript D_80296014 = {
     EVT_WAIT_FRAMES(8)
     EVT_LABEL(10)
     EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2))
-    EVT_CALL(PlayEffect, EFFECT_ID_06, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_RETURN
     EVT_END
 };
@@ -405,11 +405,11 @@ EvtScript D_8029621C = {
         EVT_ADD(LW(5), -5)
         EVT_ADD(LW(6), 18)
         EVT_ADD(LW(7), 5)
-        EVT_CALL(PlayEffect, EFFECT_ID_24, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(2)
         EVT_ADD(LW(5), 10)
         EVT_ADD(LW(6), -14)
-        EVT_CALL(PlayEffect, EFFECT_ID_24, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
     EVT_END_CHILD_THREAD
     EVT_CALL(GetDamageIntensity)
     EVT_SWITCH(LW(0))
@@ -1138,7 +1138,7 @@ EvtScript D_80298E20 = {
         EVT_SUB(LW(1), LW(7))
     EVT_END_IF
     EVT_SUB(LW(1), 3)
-    EVT_CALL(PlayEffect, EFFECT_ID_67, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_WHIRLWIND, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(func_80269E80, LW(0))
     EVT_SWITCH(LW(0))
         EVT_CASE_OR_EQ(14)
@@ -1511,7 +1511,7 @@ EvtScript DoBurnHit = {
                         EVT_SETF(LW(3), EVT_FLOAT(1.0))
                     EVT_END_IF
                 EVT_END_IF
-                EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
             EVT_END_IF
         EVT_CASE_EQ(EVENT_BURN_DEATH)
     EVT_END_SWITCH
@@ -1535,7 +1535,7 @@ EvtScript D_8029A76C = {
     EVT_SETF(LW(5), LW(3))
     EVT_DIVF(LW(5), EVT_FLOAT(20.0))
     EVT_ADDF(LW(1), LW(5))
-    EVT_CALL(PlayEffect, EFFECT_ID_4A, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK)
     EVT_CALL(func_8027D32C, ACTOR_SELF)
     EVT_CALL(HPBarToCurrent, ACTOR_SELF)
@@ -1678,7 +1678,7 @@ EvtScript D_8029AF08 = {
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 10)
     EVT_ADD(LW(2), 10)
-    EVT_CALL(PlayEffect, EFFECT_ID_01, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
     EVT_CALL(DropStarPoints, -127)
     EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
@@ -1989,7 +1989,7 @@ EvtScript DoAirLift = {
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
             EVT_CALL(GetActorSize, ACTOR_SELF, LW(6), LW(7))
             EVT_ADD(LW(4), LW(6))
-            EVT_CALL(PlayEffect, EFFECT_ID_28, 0, LW(3), LW(4), LW(5), 5, -45, 20, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SWEAT, 0, LW(3), LW(4), LW(5), 5, -45, 20, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(10)
         EVT_END_LOOP
         EVT_CALL(SetAnimationRate, ACTOR_SELF, LW(0), EVT_FLOAT(1.0))
diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c
index 5f12133222..4078ac118d 100644
--- a/src/1a1f0_len_5390.c
+++ b/src/1a1f0_len_5390.c
@@ -125,8 +125,8 @@ ApiStatus MerleeUpdateFX(Evt* script, s32 isInitialCall) {
     if (isInitialCall) {
         script->functionTemp[1] = 0;
         D_800A0BA4 = merlee->pos.y;
-        D_800A0BA8 = playFX_52(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
-        D_800A0BAC = playFX_52(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
+        D_800A0BA8 = fx_energy_orb_wave(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
+        D_800A0BAC = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
         D_800A0BB8 = 0;
         D_800A0BA0 = 12;
         sfx_play_sound(0x2074);
@@ -203,7 +203,7 @@ ApiStatus PlayMerleeGatherFX(Evt* script, s32 isInitialCall) {
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
 
-    playFX_6B(6, var0, var1, var2, 1.2f, 30);
+    fx_energy_in_out(6, var0, var1, var2, 1.2f, 30);
     return ApiStatus_DONE2;
 }
 
@@ -213,7 +213,7 @@ ApiStatus PlayMerleeOrbFX(Evt* script, s32 isInitialCall) {
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
 
-    playFX_52(9, var0, var1, var2, 5.0f, 15);
+    fx_energy_orb_wave(9, var0, var1, var2, 5.0f, 15);
     return ApiStatus_DONE2;
 }
 
@@ -235,12 +235,12 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) {
 
     if (script->functionTemp[1] == 15) {
         sfx_play_sound(SOUND_DEATH);
-        playFX_18(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0, -1.0f, 0, 10);
+        fx_damage_stars(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0, -1.0f, 0, 10);
     }
 
     temp1 = script->functionTemp[1];
     if (script->functionTemp[1] == 10) {
-        playFX_01(npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 10.0f);
+        fx_big_smoke_puff(npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 10.0f);
         if (script->functionTemp[1] == temp1) { // what? (never can be false, seemingly)
             spawn_drops(enemy);
         }
diff --git a/src/3251D0.c b/src/3251D0.c
index 9bacb4acc0..49464fae07 100644
--- a/src/3251D0.c
+++ b/src/3251D0.c
@@ -8,7 +8,7 @@ ApiStatus func_802C0000(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_11(0, a, b, c, 60.0f);
+    fx_sparkles(0, a, b, c, 60.0f);
     return ApiStatus_DONE2;
 }
 
@@ -19,7 +19,7 @@ ApiStatus func_802C00AC(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
     return ApiStatus_DONE2;
 }
 
@@ -30,7 +30,7 @@ ApiStatus func_802C016C(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(1, a, b, c, d);
+    fx_recover(1, a, b, c, d);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/EB8E50.c b/src/EB8E50.c
index e0f4443d6c..29f900585b 100644
--- a/src/EB8E50.c
+++ b/src/EB8E50.c
@@ -16,6 +16,6 @@ const char ascii_EC2030[] = "flo_08";
 static const f64 rodata_alignment = 0.0;
 
 ApiStatus func_80240000_EB8E50(void) {
-    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    dead_fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/ED8E20.c b/src/ED8E20.c
index 31c91021cd..7c43a4fc39 100644
--- a/src/ED8E20.c
+++ b/src/ED8E20.c
@@ -54,6 +54,6 @@ ApiStatus N(DeadGetEntryPos)(Evt* script, s32 isInitialCall) {
 #include "world/common/SomeXYZFunc2.inc.c"
 
 ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) {
-    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    dead_fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/EDBFE0.c b/src/EDBFE0.c
index e277d5c396..741f7edc57 100644
--- a/src/EDBFE0.c
+++ b/src/EDBFE0.c
@@ -4,6 +4,6 @@
 #define NAMESPACE ED8FE0
 
 ApiStatus func_80240000_EDBFE0(Evt *script, s32 isInitialCall) {
-    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    dead_fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/EDE9C0.c b/src/EDE9C0.c
index b3e7464924..03aad4155d 100644
--- a/src/EDE9C0.c
+++ b/src/EDE9C0.c
@@ -4,6 +4,6 @@
 #define NAMESPACE EDE9C0
 
 ApiStatus func_80240000_EDE9C0(Evt *script, s32 isInitialCall) {
-    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    dead_fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/EE65B0.c b/src/EE65B0.c
index 41437039d3..7b04e81039 100644
--- a/src/EE65B0.c
+++ b/src/EE65B0.c
@@ -10,7 +10,7 @@
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
 ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
-    dead_playFX_82(0, 0, 0, 0, 0, 0);
+    dead_fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/actor_api.c b/src/actor_api.c
index 1f1f8ff699..8446b5b2fb 100644
--- a/src/actor_api.c
+++ b/src/actor_api.c
@@ -3209,7 +3209,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
     switch (script->functionTemp[0]) {
         case 1:
             if (script->functionTemp[3] == 0) {
-                playFX_33(2, x1, y1, z1, 1.0f, 30);
+                fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30);
                 func_8024E3D8(0x13);
                 script->functionTemp[3] = 30;
                 script->functionTemp[0] = 2;
@@ -3228,7 +3228,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
                 if (actor->attackBoost > 20) {
                     actor->attackBoost = 20;
                 }
-                playFX_56(attackBoost - 1, x2, y2, z2, 1.0f, 60);
+                fx_stat_change(attackBoost - 1, x2, y2, z2, 1.0f, 60);
                 script->functionTemp[3] = 15;
                 script->functionTemp[0] = 3;
             } else {
@@ -3333,7 +3333,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
     switch (script->functionTemp[0]) {
         case 1:
             if (script->functionTemp[3] == 0) {
-                playFX_33(2, x1, y1, z1, 1.0f, 30);
+                fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30);
                 func_8024E3D8(0x13);
                 script->functionTemp[3] = 30;
                 script->functionTemp[0] = 2;
@@ -3352,7 +3352,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
                 if (actor->defenseBoost > 20) {
                     actor->defenseBoost = 20;
                 }
-                playFX_56(defenseBoost + 5, x2, y2, z2, 1.0f, 60);
+                fx_stat_change(defenseBoost + 5, x2, y2, z2, 1.0f, 60);
                 script->functionTemp[3] = 15;
                 script->functionTemp[0] = 3;
             } else {
@@ -3444,7 +3444,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
     switch (script->functionTemp[0]) {
         case 1:
             if (script->functionTemp[3] == 0) {
-                playFX_33(3, x, y, z, 1.0f, 30);
+                fx_radial_shimmer(3, x, y, z, 1.0f, 30);
                 func_8024E3D8(0x13);
                 script->functionTemp[3] = 0x1E;
                 script->functionTemp[0] = 2;
@@ -3550,7 +3550,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
     switch (script->functionTemp[0]) {
         case 1:
             if (script->functionTemp[3] == 0) {
-                playFX_57(8, x, y, z, 1.0f, 30);
+                fx_snaking_static(8, x, y, z, 1.0f, 30);
                 func_8024E3D8(0x13);
                 script->functionTemp[3] = 0x1E;
                 script->functionTemp[0] = 2;
@@ -3668,7 +3668,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
         case 1:
             if (script->functionTemp[3] == 0) {
                 dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
-                playFX_40(0, x2, y2, z2, hpBoost);
+                fx_recover(0, x2, y2, z2, hpBoost);
                 func_802D7460(x1, y1, z1, hpBoost);
                 script->functionTemp[3] = 30;
                 script->functionTemp[0] = 2;
diff --git a/src/battle/area_arn/actor/hyper_cleft.c b/src/battle/area_arn/actor/hyper_cleft.c
index 22590ed388..8b50f01f43 100644
--- a/src/battle/area_arn/actor/hyper_cleft.c
+++ b/src/battle/area_arn/actor/hyper_cleft.c
@@ -143,7 +143,7 @@ EvtScript N(80220DC0) = {
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_ADD(LW(1), 10)
-        EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_hyper_Anim_4)
         EVT_WAIT_FRAMES(30)
         EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
@@ -157,7 +157,7 @@ EvtScript N(80220DC0) = {
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5))
         EVT_END_THREAD
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2D9)
-        EVT_CALL(PlayEffect, EFFECT_ID_06, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
         EVT_THREAD
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
         EVT_END_THREAD
@@ -207,7 +207,7 @@ EvtScript N(80220DC0) = {
             EVT_THREAD
                 EVT_LOOP(30)
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                    EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(1)
                 EVT_END_LOOP
             EVT_END_THREAD
@@ -239,7 +239,7 @@ EvtScript N(80220DC0) = {
     EVT_THREAD
         EVT_LOOP(25)
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(1)
         EVT_END_LOOP
     EVT_END_THREAD
@@ -413,7 +413,7 @@ EvtScript N(80221DE0) = {
     EVT_THREAD
         EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
     EVT_END_THREAD
-    EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0)
     EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), 0, LW(2))
     EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
     EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
@@ -589,7 +589,7 @@ EvtScript N(handleEvent_80222140) = {
                 EVT_ADD(LW(0), -8)
                 EVT_ADD(LW(1), 27)
             EVT_END_IF
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(20)
         EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER)
         EVT_CASE_OR_EQ(EVENT_IMMUNE)
@@ -731,11 +731,11 @@ EvtScript N(80223310) = {
     EVT_CALL(MoveBattleCamOver, 30)
     EVT_THREAD
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(10)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(5)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
     EVT_END_THREAD
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_hyper_charge_still)
     EVT_WAIT_FRAMES(10)
diff --git a/src/battle/area_arn/actor/hyper_paragoomba.c b/src/battle/area_arn/actor/hyper_paragoomba.c
index 0f40626bfa..899f597c0d 100644
--- a/src/battle/area_arn/actor/hyper_paragoomba.c
+++ b/src/battle/area_arn/actor/hyper_paragoomba.c
@@ -210,7 +210,7 @@ EvtScript N(8021B678) = {
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_ADD(LW(1), 10)
-        EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
         EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_paragoomba_hyper_aim)
         EVT_WAIT_FRAMES(30)
         EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
@@ -797,7 +797,7 @@ EvtScript N(8021D9F4) = {
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
         EVT_ADD(LW(4), 10)
         EVT_ADD(LW(5), 5)
-        EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
     EVT_END_IF
     EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@@ -901,7 +901,7 @@ EvtScript N(8021E218) = {
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_ADD(LW(1), 10)
-        EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_goomba_hyper_run)
         EVT_WAIT_FRAMES(30)
         EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
diff --git a/src/battle/area_arn/actor/hypergoomba.c b/src/battle/area_arn/actor/hypergoomba.c
index 8c53941e12..aab472f2e1 100644
--- a/src/battle/area_arn/actor/hypergoomba.c
+++ b/src/battle/area_arn/actor/hypergoomba.c
@@ -135,7 +135,7 @@ EvtScript N(802189D4) = {
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_ADD(LW(1), 10)
-        EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_goomba_hyper_run)
         EVT_WAIT_FRAMES(30)
         EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
diff --git a/src/battle/area_arn/actor/tubba_blubba.c b/src/battle/area_arn/actor/tubba_blubba.c
index 6e8b301350..023afdad0e 100644
--- a/src/battle/area_arn/actor/tubba_blubba.c
+++ b/src/battle/area_arn/actor/tubba_blubba.c
@@ -291,7 +291,7 @@ EvtScript N(80226558) = {
     EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK)
         EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_SET(LW(1), 0)
-        EVT_CALL(PlayEffect, EFFECT_ID_06, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
         EVT_THREAD
             EVT_CALL(StartRumble, 1)
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0))
@@ -303,7 +303,7 @@ EvtScript N(80226558) = {
         EVT_CASE_OR_EQ(HIT_RESULT_MISS)
         EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
             EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(30)
             EVT_SET(LW(1), 7012353)
             EVT_EXEC_WAIT(N(80225F8C))
@@ -321,7 +321,7 @@ EvtScript N(80226558) = {
     EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
     EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
         EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-        EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_END_IF
     EVT_WAIT_FRAMES(2)
     EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@@ -386,11 +386,11 @@ EvtScript N(80226B88) = {
             EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
             EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE)
             EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20EA)
-            EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D)
             EVT_THREAD
                 EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_END_THREAD
             EVT_THREAD
                 EVT_CALL(StartRumble, 1)
@@ -407,7 +407,7 @@ EvtScript N(80226B88) = {
             EVT_CALL(StartRumble, 1)
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY)
                 EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
             EVT_END_IF
@@ -461,11 +461,11 @@ EvtScript N(80226B88) = {
             EVT_END_IF
             EVT_LABEL(0)
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D)
             EVT_THREAD
                 EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_END_THREAD
             EVT_THREAD
                 EVT_CALL(StartRumble, 1)
@@ -482,14 +482,14 @@ EvtScript N(80226B88) = {
             EVT_CALL(StartRumble, 1)
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_GOTO(2)
             EVT_LABEL(1)
             EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
             EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
                 EVT_WAIT_FRAMES(3)
                 EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_CALL(StartRumble, 1)
                 EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
             EVT_END_IF
@@ -507,7 +507,7 @@ EvtScript N(80226B88) = {
                 EVT_CALL(StartRumble, 1)
                 EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
                 EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
                 EVT_WAIT_FRAMES(8)
             EVT_END_IF
             EVT_LABEL(2)
diff --git a/src/battle/area_arn/actor/tubbas_heart.c b/src/battle/area_arn/actor/tubbas_heart.c
index d14dea6004..531e733c81 100644
--- a/src/battle/area_arn/actor/tubbas_heart.c
+++ b/src/battle/area_arn/actor/tubbas_heart.c
@@ -500,8 +500,8 @@ EvtScript N(80225258) = {
         EVT_ADD(LW(1), 6)
         EVT_SETF(LW(3), EVT_FLOAT(0.4))
     EVT_END_IF
-    EVT_CALL(PlayEffect, EFFECT_ID_47, 1, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0)
-    EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 1, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20F7)
     EVT_WAIT_FRAMES(60)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
@@ -520,7 +520,7 @@ EvtScript N(80225258) = {
         EVT_ADD(LW(1), 6)
         EVT_SETF(LW(3), EVT_FLOAT(0.4))
     EVT_END_IF
-    EVT_CALL(PlayEffect, EFFECT_ID_6B, 3, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 3, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(SetActorVar, ACTOR_SELF, 4, LW(15))
     EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE)
     EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_80223C1C)))
@@ -545,7 +545,7 @@ EvtScript N(802255D8) = {
     EVT_ELSE
         EVT_ADD(LW(1), 6)
     EVT_END_IF
-    EVT_CALL(PlayEffect, EFFECT_ID_13, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
     EVT_WAIT_FRAMES(60)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
     EVT_CALL(MoveBattleCamOver, 20)
@@ -574,7 +574,7 @@ EvtScript N(802255D8) = {
         EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
             EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
             EVT_ADD(LW(1), 5)
-            EVT_CALL(PlayEffect, EFFECT_ID_66, 1, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_TUBBA_HEART_ATTACK, 1, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(145)
             EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY)
                 EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@@ -585,7 +585,7 @@ EvtScript N(802255D8) = {
     EVT_END_SWITCH
     EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 5)
-    EVT_CALL(PlayEffect, EFFECT_ID_66, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_TUBBA_HEART_ATTACK, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0)
     EVT_THREAD
         EVT_WAIT_FRAMES(160)
         EVT_CALL(PlaySound, 0x20FC)
diff --git a/src/battle/area_dgb/actor/tubba_blubba.c b/src/battle/area_dgb/actor/tubba_blubba.c
index da27b44de8..2e013a56dd 100644
--- a/src/battle/area_dgb/actor/tubba_blubba.c
+++ b/src/battle/area_dgb/actor/tubba_blubba.c
@@ -323,7 +323,7 @@ EvtScript N(takeTurn_80219750) = {
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_2)
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_SET(LW(1), 80)
-        EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 30, 315, 30, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 30, 315, 30, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(40)
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_1)
         EVT_SET(LW(0), 0)
@@ -411,8 +411,8 @@ EvtScript N(80219D88) = {
     EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK)
         EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_SET(LW(1), 0)
-        EVT_CALL(PlayEffect, EFFECT_ID_06, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
-        EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
         EVT_THREAD
             EVT_CALL(StartRumble, 1)
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0))
@@ -439,7 +439,7 @@ EvtScript N(80219D88) = {
     EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
     EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
         EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-        EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_END_IF
     EVT_WAIT_FRAMES(2)
     EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@@ -507,7 +507,7 @@ EvtScript N(8021A36C) = {
             EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_12)
             EVT_THREAD
                 EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_END_THREAD
             EVT_THREAD
                 EVT_CALL(StartRumble, 1)
@@ -524,7 +524,7 @@ EvtScript N(8021A36C) = {
             EVT_CALL(StartRumble, 1)
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY)
                 EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
             EVT_END_IF
@@ -581,11 +581,11 @@ EvtScript N(8021A36C) = {
             EVT_END_IF
             EVT_LABEL(0)
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D)
             EVT_THREAD
                 EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_END_THREAD
             EVT_THREAD
                 EVT_CALL(StartRumble, 1)
@@ -602,14 +602,14 @@ EvtScript N(8021A36C) = {
             EVT_CALL(StartRumble, 1)
             EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
             EVT_GOTO(2)
             EVT_LABEL(1)
             EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
             EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
                 EVT_WAIT_FRAMES(3)
                 EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_CALL(StartRumble, 1)
                 EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
             EVT_END_IF
@@ -627,7 +627,7 @@ EvtScript N(8021A36C) = {
                 EVT_CALL(StartRumble, 1)
                 EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
                 EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
                 EVT_WAIT_FRAMES(8)
             EVT_END_IF
             EVT_LABEL(2)
diff --git a/src/battle/area_flo/5B28D0.c b/src/battle/area_flo/5B28D0.c
index ca3a20fb87..f23109b099 100644
--- a/src/battle/area_flo/5B28D0.c
+++ b/src/battle/area_flo/5B28D0.c
@@ -25,7 +25,7 @@ ApiStatus func_80219420_5B28D0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -41,7 +41,7 @@ ApiStatus func_802194E0_5B2990(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -57,7 +57,7 @@ ApiStatus func_802195A0_5B2A50(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -73,7 +73,7 @@ ApiStatus func_80219660_5B2B10(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -89,7 +89,7 @@ ApiStatus func_80219720_5B2BD0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -105,7 +105,7 @@ ApiStatus func_802197E0_5B2C90(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -121,7 +121,7 @@ ApiStatus func_802198A0_5B2D50(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -145,7 +145,7 @@ ApiStatus func_80219C80_5B3130(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -161,7 +161,7 @@ ApiStatus func_80219D40_5B31F0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -177,7 +177,7 @@ ApiStatus func_80219E00_5B32B0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/area_flo2/5CE690.c b/src/battle/area_flo2/5CE690.c
index eb647acb71..8add269260 100644
--- a/src/battle/area_flo2/5CE690.c
+++ b/src/battle/area_flo2/5CE690.c
@@ -98,7 +98,7 @@ ApiStatus func_80218774_5CEE04(Evt* script, s32 isInitialCall) {
     f32 var6 = evt_get_float_variable(script, *args++);
     f32 var7 = evt_get_float_variable(script, *args++);
     s32 var8 = evt_get_variable(script, *args++);
-    EffectInstance* effect = playFX_6E(var1, var2, var3, var4, var5, var6, var7, var8);
+    EffectInstance* effect = fx_huff_puff_breath(var1, var2, var3, var4, var5, var6, var7, var8);
 
     evt_set_variable(script, *args++, effect);
     return ApiStatus_DONE2;
@@ -115,7 +115,7 @@ ApiStatus func_80218924_5CEFB4(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     f32 var4 = evt_get_float_variable(script, *args++);
 
-    script->varTable[0] = playFX_57(0, var1, var2, var3, var4 * 2.5f, 0);
+    script->varTable[0] = fx_snaking_static(0, var1, var2, var3, var4 * 2.5f, 0);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_flo2/5CF2D0.c b/src/battle/area_flo2/5CF2D0.c
index eb49c9521c..52e5cbe553 100644
--- a/src/battle/area_flo2/5CF2D0.c
+++ b/src/battle/area_flo2/5CF2D0.c
@@ -29,7 +29,7 @@ ApiStatus func_80218DD0_5CF460(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -45,7 +45,7 @@ ApiStatus func_80218E90_5CF520(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -61,7 +61,7 @@ ApiStatus func_80218F50_5CF5E0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -77,7 +77,7 @@ ApiStatus func_80219010_5CF6A0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -93,7 +93,7 @@ ApiStatus func_802190D0_5CF760(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -109,7 +109,7 @@ ApiStatus func_80219190_5CF820(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -125,7 +125,7 @@ ApiStatus func_80219250_5CF8E0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -149,7 +149,7 @@ ApiStatus func_80219630_5CFCC0(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -165,7 +165,7 @@ ApiStatus func_802196F0_5CFD80(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
@@ -181,7 +181,7 @@ ApiStatus func_802197B0_5CFE40(Evt* script, s32 isInitialCall) {
         }
     }
 
-    playFX_82(var1, 0, 0, 0, 0, 0);
+    fx_sun(var1, 0, 0, 0, 0, 0);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/area_isk_part_1/actor/buzzy_beetle.c b/src/battle/area_isk_part_1/actor/buzzy_beetle.c
index 628e2a3413..963fe6d25e 100644
--- a/src/battle/area_isk_part_1/actor/buzzy_beetle.c
+++ b/src/battle/area_isk_part_1/actor/buzzy_beetle.c
@@ -456,7 +456,7 @@ EvtScript N(handleEvent_8021F228) = {
             EVT_ELSE
                 EVT_ADD(LW(1), 24)
             EVT_END_IF
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(20)
         EVT_CASE_EQ(EVENT_DEATH)
             EVT_SET_CONST(LW(0), 1)
@@ -729,11 +729,11 @@ EvtScript N(takeTurn_80220A44) = {
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_buzzy_beetle_Palette_00_Anim_6)
     EVT_THREAD
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(10)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(5)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
     EVT_END_THREAD
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_buzzy_beetle_Palette_00_Anim_5)
diff --git a/src/battle/area_isk_part_1/actor/pokey_mummy.c b/src/battle/area_isk_part_1/actor/pokey_mummy.c
index b3d2580044..479be5c38f 100644
--- a/src/battle/area_isk_part_1/actor/pokey_mummy.c
+++ b/src/battle/area_isk_part_1/actor/pokey_mummy.c
@@ -439,7 +439,7 @@ EvtScript N(handleEvent_80219050) = {
             EVT_END_IF
             EVT_ADDF(LW(3), LW(0))
             EVT_ADDF(LW(4), LW(1))
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(30)
         EVT_CASE_EQ(EVENT_RECOVER_STATUS)
             EVT_SET_CONST(LW(0), 1)
@@ -964,7 +964,7 @@ EvtScript N(8021BDE4) = {
             EVT_ADD(LW(1), LW(3))
             EVT_ADD(LW(2), 5)
             EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-            EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
         EVT_CASE_EQ(EVENT_BURN_DEATH)
             EVT_CALL(GetActorVar, ACTOR_SELF, 7, LW(1))
             EVT_CALL(SetAnimation, ACTOR_SELF, 1, LW(1))
diff --git a/src/battle/area_isk_part_1/stage/isk_04.c b/src/battle/area_isk_part_1/stage/isk_04.c
index ed01f894e3..219c61e622 100644
--- a/src/battle/area_isk_part_1/stage/isk_04.c
+++ b/src/battle/area_isk_part_1/stage/isk_04.c
@@ -9,8 +9,8 @@ BSS EffectInstance* N(D_80224D60);
 BSS EffectInstance* N(D_80224D64);
 
 ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -133.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D60));
-    playFX_20(1,  129.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D64));
+    fx_flame(1, -133.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D60));
+    fx_flame(1,  129.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D64));
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_1/stage/isk_05.c b/src/battle/area_isk_part_1/stage/isk_05.c
index f9c6d4099e..596e52505d 100644
--- a/src/battle/area_isk_part_1/stage/isk_05.c
+++ b/src/battle/area_isk_part_1/stage/isk_05.c
@@ -9,8 +9,8 @@ BSS EffectInstance* N(D_80224D70);
 BSS EffectInstance* N(D_80224D74);
 
 ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -90.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D70));
-    playFX_20(1, 80.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D74));
+    fx_flame(1, -90.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D70));
+    fx_flame(1, 80.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D74));
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_1/stage/isk_06.c b/src/battle/area_isk_part_1/stage/isk_06.c
index 39fbfb603d..96bacce064 100644
--- a/src/battle/area_isk_part_1/stage/isk_06.c
+++ b/src/battle/area_isk_part_1/stage/isk_06.c
@@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
 BSS EffectInstance* N(D_80224D80);
 
 ApiStatus func_80218A50_4E3190(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D80));
+    fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D80));
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_1/stage/isk_06b.c b/src/battle/area_isk_part_1/stage/isk_06b.c
index 0029f1137e..a425c73213 100644
--- a/src/battle/area_isk_part_1/stage/isk_06b.c
+++ b/src/battle/area_isk_part_1/stage/isk_06b.c
@@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
 BSS EffectInstance* N(D_80224DA0);
 
 ApiStatus func_80218B30_4E3270(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -110.0f, 80.0f, -146.0, 0.3f, &N(D_80224DA0));
+    fx_flame(1, -110.0f, 80.0f, -146.0, 0.3f, &N(D_80224DA0));
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_1/stage/isk_07.c b/src/battle/area_isk_part_1/stage/isk_07.c
index a97d24df61..41e88297d1 100644
--- a/src/battle/area_isk_part_1/stage/isk_07.c
+++ b/src/battle/area_isk_part_1/stage/isk_07.c
@@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
 BSS EffectInstance* N(D_80224D90);
 
 ApiStatus func_80218AC0_4E3200(Evt* script, s32 isInitialCall) {
-    playFX_20(1, 110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D90));
+    fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D90));
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_1/stage/isk_08.c b/src/battle/area_isk_part_1/stage/isk_08.c
index f4ee3b9cda..eefc9e79e0 100644
--- a/src/battle/area_isk_part_1/stage/isk_08.c
+++ b/src/battle/area_isk_part_1/stage/isk_08.c
@@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
 BSS EffectInstance* N(D_80224DB0);
 
 ApiStatus func_80218BA0_4E32E0(Evt* script, s32 isInitialCall) {
-    playFX_20(1, 0, 72.0f, -146.0, 0.3f, &N(D_80224DB0));
+    fx_flame(1, 0, 72.0f, -146.0, 0.3f, &N(D_80224DB0));
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_2/actor/tutankoopa.c b/src/battle/area_isk_part_2/actor/tutankoopa.c
index efd5778510..afa6d8083a 100644
--- a/src/battle/area_isk_part_2/actor/tutankoopa.c
+++ b/src/battle/area_isk_part_2/actor/tutankoopa.c
@@ -227,7 +227,7 @@ ApiStatus func_8021875C_4EFBFC(Evt* script, s32 isInitialCall) {
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
-    EffectInstance* effect = playFX_4C(2, var1, 150.0f, var3, var2, -0.5f, -0.9f, 0.5f, 60);
+    EffectInstance* effect = fx_floating_rock(2, var1, 150.0f, var3, var2, -0.5f, -0.9f, 0.5f, 60);
 
     ((EffectInstanceData*)effect->data)->unk_30 = 0;
     ((EffectInstanceData*)effect->data)->unk_38 = 0;
@@ -472,7 +472,7 @@ EvtScript N(8021C974) = {
     EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 40)
-    EVT_CALL(PlayEffect, EFFECT_ID_2F, 0, LW(0), LW(1), LW(2), 20, 4, LW(15), 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_STARS_ORBITING, 0, LW(0), LW(1), LW(2), 20, 4, LW(15), 0, 0, 0, 0, 0, 0)
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_A)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20E5)
     EVT_WAIT_FRAMES(30)
@@ -672,12 +672,12 @@ EvtScript N(8021D81C) = {
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_3)
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 20)
-    EVT_CALL(PlayEffect, EFFECT_ID_71, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_HIEROGLYPHS, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
     EVT_CALL(MoveBattleCamOver, 70)
     EVT_CALL(PlaySound, 0x20E7)
-    EVT_CALL(PlayEffect, EFFECT_ID_4D, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_CHOMP_DROP, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0, 0, 0)
     EVT_WAIT_FRAMES(15)
     EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LW(0))
     EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP | STATUS_FLAG_TRANSPARENT)
@@ -697,7 +697,7 @@ EvtScript N(8021D81C) = {
         EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_QUESTION)
         EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
         EVT_ADD(LW(1), 20)
-        EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 20, 315, 30, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 20, 315, 30, 0, 0, 0, 0, 0)
         EVT_CALL(PlaySound, 0x20E8)
     EVT_ELSE
         EVT_WAIT_FRAMES(50)
@@ -1102,7 +1102,7 @@ EvtScript N(8021F5E8) = {
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_8)
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 20)
-    EVT_CALL(PlayEffect, EFFECT_ID_71, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_HIEROGLYPHS, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
     EVT_WAIT_FRAMES(45)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
     EVT_CALL(MoveBattleCamOver, 60)
@@ -1185,7 +1185,7 @@ EvtScript N(8021FA54) = {
                 EVT_CALL(SetActorYaw, ACTOR_ENEMY1, 0)
                 EVT_CALL(GetActorPos, ACTOR_ENEMY1, LW(0), LW(1), LW(2))
                 EVT_ADD(LW(1), 10)
-                EVT_CALL(PlayEffect, EFFECT_ID_01, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_DEATH)
                 EVT_SET(LW(3), 0)
                 EVT_LOOP(12)
diff --git a/src/battle/area_isk_part_2/stage/isk_04.c b/src/battle/area_isk_part_2/stage/isk_04.c
index e5a2894531..84615e8493 100644
--- a/src/battle/area_isk_part_2/stage/isk_04.c
+++ b/src/battle/area_isk_part_2/stage/isk_04.c
@@ -8,8 +8,8 @@ BSS EffectInstance* D_80220740;
 BSS EffectInstance* D_80220744;
 
 ApiStatus func_80218850_4EFCF0(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -133.0f, 72.0f, -143.0f, 0.3f, &D_80220740);
-    playFX_20(1, 129.0f, 72.0f, -143.0f, 0.3f, &D_80220744);
+    fx_flame(1, -133.0f, 72.0f, -143.0f, 0.3f, &D_80220740);
+    fx_flame(1, 129.0f, 72.0f, -143.0f, 0.3f, &D_80220744);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_2/stage/isk_05.c b/src/battle/area_isk_part_2/stage/isk_05.c
index 2939da62d9..72232b88ef 100644
--- a/src/battle/area_isk_part_2/stage/isk_05.c
+++ b/src/battle/area_isk_part_2/stage/isk_05.c
@@ -8,8 +8,8 @@ BSS EffectInstance* D_80220750;
 BSS EffectInstance* D_80220754;
 
 ApiStatus func_80218920_4EFDC0(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -90.0f, 45.0f, -146.0f, 0.25f, &D_80220750);
-    playFX_20(1, 80.0f, 45.0f, -146.0f, 0.25f, &D_80220754);
+    fx_flame(1, -90.0f, 45.0f, -146.0f, 0.25f, &D_80220750);
+    fx_flame(1, 80.0f, 45.0f, -146.0f, 0.25f, &D_80220754);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_2/stage/isk_06.c b/src/battle/area_isk_part_2/stage/isk_06.c
index 1133c67155..dee7d2911c 100644
--- a/src/battle/area_isk_part_2/stage/isk_06.c
+++ b/src/battle/area_isk_part_2/stage/isk_06.c
@@ -7,7 +7,7 @@
 BSS EffectInstance* D_80220760;
 
 ApiStatus func_802189F0_4EFE90(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220760);
+    fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220760);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_2/stage/isk_06b.c b/src/battle/area_isk_part_2/stage/isk_06b.c
index 6388d21aa6..dac61565f1 100644
--- a/src/battle/area_isk_part_2/stage/isk_06b.c
+++ b/src/battle/area_isk_part_2/stage/isk_06b.c
@@ -7,7 +7,7 @@
 BSS EffectInstance* D_80220770;
 
 ApiStatus func_80218A60_4EFF00(Evt* script, s32 isInitialCall) {
-    playFX_20(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220770);
+    fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220770);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_isk_part_2/stage/isk_07.c b/src/battle/area_isk_part_2/stage/isk_07.c
index 6704088c3f..d8325e0cce 100644
--- a/src/battle/area_isk_part_2/stage/isk_07.c
+++ b/src/battle/area_isk_part_2/stage/isk_07.c
@@ -7,7 +7,7 @@
 BSS EffectInstance* D_80220780;
 
 ApiStatus func_80218AD0_4EFF70(Evt* script, s32 isInitialCall) {
-    playFX_20(1, 110.0f, 80.0f, -146.0f, 0.3f, &D_80220780);
+    fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &D_80220780);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_iwa/actor/buzzar.c b/src/battle/area_iwa/actor/buzzar.c
index c29fdee2b4..43a93ef701 100644
--- a/src/battle/area_iwa/actor/buzzar.c
+++ b/src/battle/area_iwa/actor/buzzar.c
@@ -345,7 +345,7 @@ EvtScript N(8021BEBC) = {
                             EVT_CALL(SetGoalToTarget, ACTOR_SELF)
                             EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                             EVT_ADD(LW(0), 10)
-                            EVT_CALL(PlayEffect, EFFECT_ID_2B, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+                            EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
                             EVT_WAIT_FRAMES(3)
                         EVT_END_LOOP
                     EVT_END_THREAD
@@ -383,7 +383,7 @@ EvtScript N(8021BEBC) = {
                             EVT_CALL(SetGoalToTarget, ACTOR_SELF)
                             EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                             EVT_ADD(LW(0), 10)
-                            EVT_CALL(PlayEffect, EFFECT_ID_2B, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+                            EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
                             EVT_WAIT_FRAMES(3)
                         EVT_END_LOOP
                     EVT_END_THREAD
@@ -448,7 +448,7 @@ EvtScript N(8021BEBC) = {
             EVT_CALL(SetGoalToTarget, ACTOR_SELF)
             EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
             EVT_ADD(LW(0), 10)
-            EVT_CALL(PlayEffect, EFFECT_ID_2B, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(3)
         EVT_END_LOOP
     EVT_END_THREAD
@@ -558,7 +558,7 @@ EvtScript N(8021CCE8) = {
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(0), 24)
     EVT_ADD(LW(1), 24)
-    EVT_CALL(PlayEffect, EFFECT_ID_6D, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.6), 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SHINY_FLARE, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.6), 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20F3)
     EVT_WAIT_FRAMES(10)
     EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 1, 0, 0)
diff --git a/src/battle/area_iwa/actor/cleft.c b/src/battle/area_iwa/actor/cleft.c
index ebc005104e..f5abf141ed 100644
--- a/src/battle/area_iwa/actor/cleft.c
+++ b/src/battle/area_iwa/actor/cleft.c
@@ -154,7 +154,7 @@ EvtScript N(80218944) = {
     EVT_THREAD
         EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
     EVT_END_THREAD
-    EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0)
     EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), 0, LW(2))
     EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
     EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
@@ -297,7 +297,7 @@ EvtScript N(handleEvent_80218C3C) = {
                 EVT_ADD(LW(0), -8)
                 EVT_ADD(LW(1), 27)
             EVT_END_IF
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(20)
         EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER)
         EVT_CASE_OR_EQ(EVENT_IMMUNE)
@@ -439,11 +439,11 @@ EvtScript N(80219BA0) = {
     EVT_CALL(MoveBattleCamOver, 30)
     EVT_THREAD
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(10)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(5)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
     EVT_END_THREAD
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_default_charge_still)
     EVT_WAIT_FRAMES(10)
diff --git a/src/battle/area_jan/actor/jungle_fuzzy.c b/src/battle/area_jan/actor/jungle_fuzzy.c
index be710d4f55..ca32a6e827 100644
--- a/src/battle/area_jan/actor/jungle_fuzzy.c
+++ b/src/battle/area_jan/actor/jungle_fuzzy.c
@@ -570,7 +570,7 @@ EvtScript N(leechAttack) = {
                 EVT_END_THREAD
                 EVT_ADD(LW(0), 20)
                 EVT_ADD(LW(1), 20)
-                EVT_CALL(PlayEffect, EFFECT_ID_40, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_CALL(GetActorHP, ACTOR_SELF, LW(0))
                 EVT_ADD(LW(0), LW(3))
                 EVT_CALL(SetEnemyHP, ACTOR_SELF, LW(0))
diff --git a/src/battle/area_jan/actor/spear_guy.c b/src/battle/area_jan/actor/spear_guy.c
index e8e2d7539e..8a2d097df8 100644
--- a/src/battle/area_jan/actor/spear_guy.c
+++ b/src/battle/area_jan/actor/spear_guy.c
@@ -499,7 +499,7 @@ EvtScript N(handleEvent_80218E3C) = {
                         EVT_ADD(LW(1), 38)
                     EVT_END_IF
             EVT_END_SWITCH
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(20)
         EVT_CASE_DEFAULT
     EVT_END_SWITCH
@@ -631,7 +631,7 @@ EvtScript N(summonBackup) = {
     EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 15)
-    EVT_CALL(PlayEffect, EFFECT_ID_11, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D)
     EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_jungle_guy_Palette_00_Anim_E)
     EVT_WAIT_FRAMES(20)
@@ -700,7 +700,7 @@ EvtScript N(summonBackup) = {
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D)
     EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 15)
-    EVT_CALL(PlayEffect, EFFECT_ID_11, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(SetAnimation, LW(11), 2, NPC_ANIM_jungle_guy_Palette_00_Anim_E)
     EVT_WAIT_FRAMES(20)
     EVT_IF_EQ(LF(0), 0)
@@ -764,7 +764,7 @@ EvtScript N(becomeShyGuy) = {
     EVT_THREAD
         EVT_LOOP(10)
             EVT_CALL(GetPartOffset, ACTOR_SELF, 4, LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_11, 3, LW(0), LW(1), LW(2), 5, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LW(0), LW(1), LW(2), 5, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(3)
         EVT_END_LOOP
     EVT_END_THREAD
diff --git a/src/battle/area_jan/stage/jan_00.c b/src/battle/area_jan/stage/jan_00.c
index c73a1b2d52..e12d32e693 100644
--- a/src/battle/area_jan/stage/jan_00.c
+++ b/src/battle/area_jan/stage/jan_00.c
@@ -110,7 +110,7 @@ EvtScript N(beforeBattle_802271C4) = {
     EVT_EXEC(N(80226B00))
     EVT_SET(LW(0), 53)
     EVT_EXEC(N(80226C18))
-    EVT_CALL(PlayEffect, EFFECT_ID_82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_jan2/stage/jan_00.c b/src/battle/area_jan2/stage/jan_00.c
index c2bea7ab55..b73bd5773e 100644
--- a/src/battle/area_jan2/stage/jan_00.c
+++ b/src/battle/area_jan2/stage/jan_00.c
@@ -110,7 +110,7 @@ EvtScript N(beforeBattle_8021E1F4) = {
     EVT_EXEC(N(8021DB30))
     EVT_SET(LW(0), 53)
     EVT_EXEC(N(8021DC48))
-    EVT_CALL(PlayEffect, EFFECT_ID_82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_kgr/actor/fuzzipede.c b/src/battle/area_kgr/actor/fuzzipede.c
index 5cfcd8dd96..182afb8d7d 100644
--- a/src/battle/area_kgr/actor/fuzzipede.c
+++ b/src/battle/area_kgr/actor/fuzzipede.c
@@ -875,7 +875,7 @@ EvtScript N(8021B22C) = {
                 EVT_END_LOOP
                 EVT_WAIT_FRAMES(10)
                 EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2)
-                EVT_CALL(PlayEffect, EFFECT_ID_43, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_CALL(N(StartRumbleWithParams), 200, 10)
                 EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20DC)
                 EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_fuzzipede_Palette_00_Anim_13)
diff --git a/src/battle/area_kmr_part_2/actor/goomba_king.c b/src/battle/area_kmr_part_2/actor/goomba_king.c
index c2f1f73d5c..b3647fd3b9 100644
--- a/src/battle/area_kmr_part_2/actor/goomba_king.c
+++ b/src/battle/area_kmr_part_2/actor/goomba_king.c
@@ -150,7 +150,7 @@ ApiStatus func_80218A60_43A4F0(Evt* script, s32 isInitialCall) {
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
 
-    fx_land(2, var1, var2, evt_get_variable(script, *args++), 0);
+    fx_landing_dust(2, var1, var2, evt_get_variable(script, *args++), 0);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/area_kzn/actor/red_magikoopa.c b/src/battle/area_kzn/actor/red_magikoopa.c
index 6a9dfb1ec6..f0fb26a457 100644
--- a/src/battle/area_kzn/actor/red_magikoopa.c
+++ b/src/battle/area_kzn/actor/red_magikoopa.c
@@ -382,7 +382,7 @@ EvtScript N(80221788) = {
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
         EVT_ADD(LW(4), 10)
         EVT_ADD(LW(5), 5)
-        EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
     EVT_END_IF
     EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@@ -550,7 +550,7 @@ EvtScript N(rMagikoopa_ShapeSpell) = {
         EVT_SUB(LW(0), 30)
         EVT_ADD(LW(1), 36)
     EVT_END_IF
-    EVT_CALL(PlayEffect, EFFECT_ID_47, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_flying_magikoopa_Palette_01_Anim_2)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), 0, 0, 1, BS_FLAGS1_10)
@@ -850,12 +850,12 @@ EvtScript N(takeTurn_802233E0) = {
             EVT_SUB(LW(0), 6)
             EVT_ADD(LW(1), 12)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_ELSE
             EVT_SUB(LW(0), 16)
             EVT_ADD(LW(1), 31)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_END_IF
     EVT_ELSE
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
@@ -864,12 +864,12 @@ EvtScript N(takeTurn_802233E0) = {
             EVT_SUB(LW(0), 12)
             EVT_ADD(LW(1), 14)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_ELSE
             EVT_SUB(LW(0), 30)
             EVT_ADD(LW(1), 36)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_END_IF
     EVT_END_IF
     EVT_WAIT_FRAMES(30)
diff --git a/src/battle/area_mim/actor/forest_fuzzy.c b/src/battle/area_mim/actor/forest_fuzzy.c
index 118b90be68..e7b3acec22 100644
--- a/src/battle/area_mim/actor/forest_fuzzy.c
+++ b/src/battle/area_mim/actor/forest_fuzzy.c
@@ -434,7 +434,7 @@ EvtScript N(80219054) = {
         EVT_END_THREAD
         EVT_ADD(LW(0), 20)
         EVT_ADD(LW(1), 20)
-        EVT_CALL(PlayEffect, EFFECT_ID_40, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
         EVT_CALL(GetActorHP, ACTOR_SELF, LW(0))
         EVT_ADD(LW(0), LW(3))
         EVT_CALL(SetEnemyHP, ACTOR_SELF, LW(0))
diff --git a/src/battle/area_mim/actor/piranha_plant.c b/src/battle/area_mim/actor/piranha_plant.c
index 5cfc841e6e..c8ff4d64a3 100644
--- a/src/battle/area_mim/actor/piranha_plant.c
+++ b/src/battle/area_mim/actor/piranha_plant.c
@@ -203,7 +203,7 @@ EvtScript N(handleEvent_8021D60C) = {
                     EVT_ADD(LW(0), 0)
                     EVT_ADD(LW(1), 35)
                 EVT_END_IF
-                EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_WAIT_FRAMES(20)
             EVT_END_THREAD
             EVT_LOOP(40)
diff --git a/src/battle/area_omo/actor/groove_guy.c b/src/battle/area_omo/actor/groove_guy.c
index 0e2c190b4b..5e3219f5f8 100644
--- a/src/battle/area_omo/actor/groove_guy.c
+++ b/src/battle/area_omo/actor/groove_guy.c
@@ -612,7 +612,7 @@ s32 func_8021878C_512D5C(Evt* script, s32 isInitialCall) {
     D_802310D0.unk_28 = x;
     D_802310D0.unk_2C = y;
     D_802310D0.unk_30 = z;
-    playFX_46_whirlwind(6, &D_802310D0, temp_f20, temp_v0);
+    fx_46(6, &D_802310D0, temp_f20, temp_v0);
 
     return ApiStatus_DONE2;
 }
@@ -692,7 +692,7 @@ EvtScript N(8022671C) = {
     EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 30)
-    EVT_CALL(PlayEffect, EFFECT_ID_11, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D)
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_groove_guy_Palette_00_Anim_A)
     EVT_WAIT_FRAMES(8)
@@ -764,7 +764,7 @@ EvtScript N(80226DEC) = {
     EVT_CALL(SetAnimation, LW(11), 1, NPC_ANIM_groove_guy_Palette_00_Anim_A)
     EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
     EVT_ADD(LW(1), 20)
-    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
     EVT_CALL(ForceHomePos, LW(11), LW(0), LW(1), LW(2))
     EVT_WAIT_FRAMES(25)
diff --git a/src/battle/area_omo/actor/sky_guy.c b/src/battle/area_omo/actor/sky_guy.c
index 3ca49bc717..c3dc44d871 100644
--- a/src/battle/area_omo/actor/sky_guy.c
+++ b/src/battle/area_omo/actor/sky_guy.c
@@ -273,12 +273,12 @@ EvtScript N(80229A34) = {
         EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1)
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(7), LW(8), LW(9))
         EVT_ADD(LW(8), 20)
-        EVT_CALL(PlayEffect, EFFECT_ID_4B, 2, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_BALLOON, 2, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
         EVT_SUB(LW(7), 14)
         EVT_SUB(LW(8), 4)
-        EVT_CALL(PlayEffect, EFFECT_ID_4B, 0, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_BALLOON, 0, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
         EVT_ADD(LW(7), 28)
-        EVT_CALL(PlayEffect, EFFECT_ID_4B, 1, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_BALLOON, 1, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
         EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2)
         EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1)
         EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1)
@@ -355,7 +355,7 @@ EvtScript N(80229F08) = {
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
         EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_sky_guy_Palette_00_Anim_0)
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x263)
-        EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 24, 0, 25, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 24, 0, 25, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(25)
         EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_sky_guy_Palette_00_Anim_6)
         EVT_WAIT_FRAMES(30)
@@ -376,7 +376,7 @@ EvtScript N(80229F08) = {
         EVT_CALL(SetPartFlags, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET)
         EVT_CALL(SetPartFlags, ACTOR_SELF, 1, ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_MULTI_TARGET)
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_shy_guy_Palette_00_Anim_12)
-        EVT_CALL(PlayEffect, EFFECT_ID_06, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(40)
         EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0)
         EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022CA9C)))
diff --git a/src/battle/area_omo/actor/spy_guy.c b/src/battle/area_omo/actor/spy_guy.c
index 0828c93987..b7e3d466d2 100644
--- a/src/battle/area_omo/actor/spy_guy.c
+++ b/src/battle/area_omo/actor/spy_guy.c
@@ -571,7 +571,7 @@ EvtScript N(hammerAttack) = {
                 EVT_WAIT_FRAMES(5)
                 EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2)
                 EVT_SUB(LW(1), 7)
-                EVT_CALL(PlayEffect, EFFECT_ID_43, 0, LW(1), LW(2), LW(3), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LW(1), LW(2), LW(3), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_WAIT_FRAMES(40)
             EVT_ELSE
                 EVT_WAIT_FRAMES(8)
@@ -585,7 +585,7 @@ EvtScript N(hammerAttack) = {
                 EVT_WAIT_FRAMES(10)
                 EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                 EVT_ADD(LW(1), 10)
-                EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 25, -45, 20, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 25, -45, 20, 0, 0, 0, 0, 0)
                 EVT_WAIT_FRAMES(20)
             EVT_END_IF
             EVT_LABEL(100)
diff --git a/src/battle/area_sbk/actor/bandit.c b/src/battle/area_sbk/actor/bandit.c
index 0b1eeb60f3..e1d568df49 100644
--- a/src/battle/area_sbk/actor/bandit.c
+++ b/src/battle/area_sbk/actor/bandit.c
@@ -286,7 +286,7 @@ EvtScript N(8021D820) = {
             EVT_CALL(SetGoalToTarget, LW(10))
             EVT_CALL(JumpToGoal, LW(10), 15, FALSE, FALSE, FALSE)
             EVT_CALL(GetGoalPos, LW(10), LW(0), LW(1), LW(2))
-            EVT_CALL(PlayEffect, EFFECT_ID_49, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMALL_GOLD_SPARKLE, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_CALL(PlaySoundAtActor, LW(10), 0x211)
             EVT_CALL(GetActorVar, LW(10), 1, LW(0))
             EVT_CALL(AddCoin, LW(0))
diff --git a/src/battle/area_sbk/actor/pokey.c b/src/battle/area_sbk/actor/pokey.c
index 87dc7120ab..a20495c60b 100644
--- a/src/battle/area_sbk/actor/pokey.c
+++ b/src/battle/area_sbk/actor/pokey.c
@@ -435,7 +435,7 @@ EvtScript N(handleEvent_802186C0) = {
             EVT_END_IF
             EVT_ADDF(LW(3), LW(0))
             EVT_ADDF(LW(4), LW(1))
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(30)
         EVT_CASE_EQ(EVENT_RECOVER_STATUS)
             EVT_SET_CONST(LW(0), 1)
@@ -934,7 +934,7 @@ EvtScript N(8021AE2C) = {
     EVT_SUB(LW(1), 80)
     EVT_CALL(SetActorPos, LW(11), LW(0), LW(1), LW(2))
     EVT_CHILD_THREAD
-        EVT_CALL(PlayEffect, EFFECT_ID_25, 2, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 2, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
         EVT_CALL(UseIdleAnimation, LW(11), FALSE)
         EVT_CALL(SetAnimation, LW(11), 1, NPC_ANIM_pokey_Palette_00_Anim_C)
         EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
@@ -1367,7 +1367,7 @@ EvtScript N(8021CCAC) = {
             EVT_ADD(LW(1), LW(3))
             EVT_ADD(LW(2), 5)
             EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-            EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
         EVT_CASE_EQ(EVENT_BURN_DEATH)
             EVT_CALL(GetActorVar, ACTOR_SELF, 7, LW(1))
             EVT_CALL(SetAnimation, ACTOR_SELF, 1, LW(1))
@@ -1414,7 +1414,7 @@ EvtScript N(8021D184) = {
     EVT_CHILD_THREAD
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(10), LW(11), LW(12))
         EVT_LOOP(LW(6))
-            EVT_CALL(PlayEffect, EFFECT_ID_25, 2, LW(10), 0, LW(12), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 2, LW(10), 0, LW(12), 0, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(10)
         EVT_END_LOOP
     EVT_END_CHILD_THREAD
diff --git a/src/battle/area_sbk/stage/sbk_02.c b/src/battle/area_sbk/stage/sbk_02.c
index b57d37e8c6..c9b31021a9 100644
--- a/src/battle/area_sbk/stage/sbk_02.c
+++ b/src/battle/area_sbk/stage/sbk_02.c
@@ -38,7 +38,7 @@ EvtScript N(beforeBattle_8021F800) = {
     EVT_SET(LW(0), 5)
     EVT_SET(LW(1), 240)
     EVT_EXEC(N(8021F720))
-    EVT_CALL(PlayEffect, EFFECT_ID_82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_RETURN
     EVT_END
 };
diff --git a/src/battle/area_trd_part_1/actor/bill_blaster.c b/src/battle/area_trd_part_1/actor/bill_blaster.c
index 810a7a48b0..e1778064b8 100644
--- a/src/battle/area_trd_part_1/actor/bill_blaster.c
+++ b/src/battle/area_trd_part_1/actor/bill_blaster.c
@@ -220,8 +220,8 @@ EvtScript N(8021A2BC) = {
     EVT_SUB(LW(0), 33)
     EVT_ADD(LW(1), 19)
     EVT_ADD(LW(2), 3)
-    EVT_CALL(PlayEffect, EFFECT_ID_00, LW(0), LW(1), LW(2), 2, 5, 0, 2, 0, 0, 0, 0, 0, 0)
-    EVT_CALL(PlayEffect, EFFECT_ID_00, LW(0), LW(1), LW(2), 2, 5, 2, 2, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_00, LW(0), LW(1), LW(2), 2, 5, 0, 2, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_00, LW(0), LW(1), LW(2), 2, 5, 2, 2, 0, 0, 0, 0, 0, 0)
     EVT_WAIT_FRAMES(2)
     EVT_CALL(func_80218000_4A10A0)
     EVT_CALL(SummonEnemy, EVT_ADDR(N(specialFormation_8021A4E8)), 0)
diff --git a/src/battle/area_trd_part_1/actor/bob_omb.c b/src/battle/area_trd_part_1/actor/bob_omb.c
index eac03fbbec..6bd9fe670f 100644
--- a/src/battle/area_trd_part_1/actor/bob_omb.c
+++ b/src/battle/area_trd_part_1/actor/bob_omb.c
@@ -182,7 +182,7 @@ EvtScript N(8021A9C8) = {
     EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_ADDR(N(statusTable_8021A5B4)))
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(2), 2)
-    EVT_CALL(PlayEffect, EFFECT_ID_06, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(StopLoopingSoundAtActor, ACTOR_SELF, 0)
     EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 0)
     EVT_RETURN
@@ -210,10 +210,10 @@ EvtScript N(8021AB54) = {
     EVT_END_THREAD
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(2), 2)
-    EVT_CALL(PlayEffect, EFFECT_ID_17, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_ADD(LW(1), 20)
     EVT_ADD(LW(2), 2)
-    EVT_CALL(PlayEffect, EFFECT_ID_19, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOMB_BLAST)
     EVT_RETURN
     EVT_END
@@ -567,7 +567,7 @@ EvtScript N(tackleAttack) = {
             EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_bob_omb_Palette_00_Anim_14)
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
             EVT_CALL(GetActorSize, ACTOR_SELF, LW(3), LW(4))
-            EVT_CALL(PlayEffect, EFFECT_ID_4A, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0)
             EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK)
             EVT_WAIT_FRAMES(20)
             EVT_EXEC_WAIT(N(8021AB54))
diff --git a/src/battle/area_trd_part_1/actor/bullet_bill.c b/src/battle/area_trd_part_1/actor/bullet_bill.c
index d70d78467f..ff091e6e34 100644
--- a/src/battle/area_trd_part_1/actor/bullet_bill.c
+++ b/src/battle/area_trd_part_1/actor/bullet_bill.c
@@ -291,10 +291,10 @@ EvtScript N(takeTurn_802197C0) = {
 EvtScript N(80219BE0) = {
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(2), 2)
-    EVT_CALL(PlayEffect, EFFECT_ID_17, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_ADD(LW(1), 16)
     EVT_ADD(LW(2), 2)
-    EVT_CALL(PlayEffect, EFFECT_ID_3E, 0, LW(0), LW(1), LW(2), EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_BLAST, 0, LW(0), LW(1), LW(2), EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2078)
     EVT_CALL(StartRumble, 11)
     EVT_THREAD
diff --git a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c
index 05cfa4eb23..38b5fcc78f 100644
--- a/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c
+++ b/src/battle/area_trd_part_2/actor/blue_ninja_koopa.c
@@ -322,7 +322,7 @@ EvtScript N(8022B6E8) = {
                     EVT_ADDF(LW(1), LW(3))
                     EVT_ADDF(LW(2), EVT_FLOAT(5.0))
                     EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-                    EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_C)
                     EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022B6DC)))
                     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@@ -500,7 +500,7 @@ EvtScript N(8022B6E8) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_4)
                     EVT_WAIT_FRAMES(20)
@@ -659,7 +659,7 @@ EvtScript N(8022B6E8) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_3)
                     EVT_CALL(SetGoalToHome, ACTOR_SELF)
diff --git a/src/battle/area_trd_part_2/actor/fake_bowser.c b/src/battle/area_trd_part_2/actor/fake_bowser.c
index 2be0815f58..67bde62944 100644
--- a/src/battle/area_trd_part_2/actor/fake_bowser.c
+++ b/src/battle/area_trd_part_2/actor/fake_bowser.c
@@ -1303,31 +1303,31 @@ EvtScript N(8021E3A0) = {
     EVT_WAIT_FRAMES(LW(3))
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(0), -8)
-    EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(RandInt, LW(10), LW(3))
     EVT_ADD(LW(3), 1)
     EVT_WAIT_FRAMES(LW(3))
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(0), -12)
-    EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(RandInt, LW(10), LW(3))
     EVT_ADD(LW(3), 1)
     EVT_WAIT_FRAMES(LW(3))
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(0), -47)
-    EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(RandInt, LW(10), LW(3))
     EVT_ADD(LW(3), 1)
     EVT_WAIT_FRAMES(LW(3))
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(0), 40)
-    EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(RandInt, LW(10), LW(3))
     EVT_ADD(LW(3), 1)
     EVT_WAIT_FRAMES(LW(3))
     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_ADD(LW(0), -19)
-    EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 59, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 59, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_RETURN
     EVT_END
 };
@@ -1368,9 +1368,9 @@ EvtScript N(handleEvent_8021E6F0) = {
                 EVT_ADDF(LW(1), LW(3))
                 EVT_ADDF(LW(2), EVT_FLOAT(5.0))
                 EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-                EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
                 EVT_WAIT_FRAMES(5)
-                EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
             EVT_END_IF
             EVT_CALL(ActorSpeak, MESSAGE_ID(0x0C, 0x0106), ACTOR_SELF, 1, -00001, -00001)
             EVT_WAIT_FRAMES(30)
@@ -1401,9 +1401,9 @@ EvtScript N(handleEvent_8021E6F0) = {
             EVT_ADDF(LW(1), LW(3))
             EVT_ADDF(LW(2), EVT_FLOAT(5.0))
             EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-            EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(5)
-            EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
         EVT_END_CASE_GROUP
         EVT_CASE_DEFAULT
     EVT_END_SWITCH
@@ -1701,7 +1701,7 @@ EvtScript N(8021F630) = {
     EVT_ADD(LW(0), 7)
     EVT_ADD(LW(1), 28)
     EVT_ADD(LW(2), 5)
-    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, 0x20F3)
     EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_1A)
     EVT_WAIT_FRAMES(5)
@@ -1709,7 +1709,7 @@ EvtScript N(8021F630) = {
     EVT_ADD(LW(0), 7)
     EVT_ADD(LW(1), 28)
     EVT_ADD(LW(2), 5)
-    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, 0x20F3)
     EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_1A)
     EVT_WAIT_FRAMES(5)
@@ -1717,7 +1717,7 @@ EvtScript N(8021F630) = {
     EVT_ADD(LW(0), 7)
     EVT_ADD(LW(1), 28)
     EVT_ADD(LW(2), 5)
-    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, 0x20F3)
     EVT_CALL(SetAnimation, ACTOR_ENEMY3, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_1A)
     EVT_WAIT_FRAMES(5)
@@ -1725,7 +1725,7 @@ EvtScript N(8021F630) = {
     EVT_ADD(LW(0), 7)
     EVT_ADD(LW(1), 28)
     EVT_ADD(LW(2), 5)
-    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, 0x20F3)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(func_80218350_4B1540)
@@ -1913,7 +1913,7 @@ EvtScript N(80220588) = {
             EVT_CALL(GetActorPos, LW(10), LW(0), LW(1), LW(2))
             EVT_SUB(LW(0), 22)
             EVT_ADD(LW(1), 19)
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(20)
             EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LW(0))
             EVT_IF_NOT_FLAG(LW(0), 2)
@@ -2255,7 +2255,7 @@ EvtScript N(80221DB4) = {
             EVT_CALL(GetActorPos, LW(10), LW(0), LW(1), LW(2))
             EVT_SUB(LW(0), 22)
             EVT_ADD(LW(1), 19)
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(30)
             EVT_CALL(SetActorFlagBits, LW(10), ACTOR_FLAG_40000, 1)
             EVT_CALL(SetPartFlagBits, LW(10), 1, ACTOR_PART_FLAG_NO_TARGET, 1)
diff --git a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c
index 78e8f15292..0d4398051c 100644
--- a/src/battle/area_trd_part_2/actor/green_ninja_koopa.c
+++ b/src/battle/area_trd_part_2/actor/green_ninja_koopa.c
@@ -322,7 +322,7 @@ EvtScript N(802257A8) = {
                     EVT_ADDF(LW(1), LW(3))
                     EVT_ADDF(LW(2), EVT_FLOAT(5.0))
                     EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-                    EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_C)
                     EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022579C)))
                     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@@ -500,7 +500,7 @@ EvtScript N(802257A8) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_4)
                     EVT_WAIT_FRAMES(20)
@@ -659,7 +659,7 @@ EvtScript N(802257A8) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_3)
                     EVT_CALL(SetGoalToHome, ACTOR_SELF)
diff --git a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c
index 559fec03d6..1f08a06adc 100644
--- a/src/battle/area_trd_part_2/actor/red_ninja_koopa.c
+++ b/src/battle/area_trd_part_2/actor/red_ninja_koopa.c
@@ -322,7 +322,7 @@ EvtScript N(80228748) = {
                     EVT_ADDF(LW(1), LW(3))
                     EVT_ADDF(LW(2), EVT_FLOAT(5.0))
                     EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-                    EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_C)
                     EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022873C)))
                     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@@ -500,7 +500,7 @@ EvtScript N(80228748) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_4)
                     EVT_WAIT_FRAMES(20)
@@ -659,7 +659,7 @@ EvtScript N(80228748) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_3)
                     EVT_CALL(SetGoalToHome, ACTOR_SELF)
diff --git a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c
index 8f301f8610..1ee0db2ad6 100644
--- a/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c
+++ b/src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c
@@ -322,7 +322,7 @@ EvtScript N(8022E688) = {
                     EVT_ADDF(LW(1), LW(3))
                     EVT_ADDF(LW(2), EVT_FLOAT(5.0))
                     EVT_DIVF(LW(3), EVT_FLOAT(10.0))
-                    EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_C)
                     EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022E67C)))
                     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@@ -500,7 +500,7 @@ EvtScript N(8022E688) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_4)
                     EVT_WAIT_FRAMES(20)
@@ -659,7 +659,7 @@ EvtScript N(8022E688) = {
                     EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
                     EVT_SUB(LW(0), 22)
                     EVT_ADD(LW(1), 19)
-                    EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
                     EVT_WAIT_FRAMES(30)
                     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_3)
                     EVT_CALL(SetGoalToHome, ACTOR_SELF)
diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c
index 3bcdcd8f35..728c09e65d 100644
--- a/src/battle/common/actor/koopa_troopa.inc.c
+++ b/src/battle/common/actor/koopa_troopa.inc.c
@@ -504,11 +504,11 @@ EvtScript N(takeTurn_8021DD9C) = {
         EVT_CHILD_THREAD
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
             EVT_ADD(LW(1), 4)
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(3)
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(2)
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_END_CHILD_THREAD
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_troopa_Palette_01_Anim_6)
diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c
index a8489bd4ac..d9fa4089ce 100644
--- a/src/battle/common/actor/medi_guy.inc.c
+++ b/src/battle/common/actor/medi_guy.inc.c
@@ -368,8 +368,8 @@ EvtScript N(healOneAlly) = {
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0)
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_medi_guy_Palette_00_Anim_5)
     EVT_ADD(LW(2), 50)
-    EVT_CALL(PlayEffect, EFFECT_ID_11, 1, LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0, 0)
-    EVT_CALL(PlayEffect, EFFECT_ID_40, 2, LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_SPARKLES, 1, LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_RECOVER, 2, LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0, 0)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_medi_guy_Palette_00_Anim_1)
     EVT_WAIT_FRAMES(10)
diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c
index cf729aefd0..a425b24726 100644
--- a/src/battle/common/actor/paragoomba.inc.c
+++ b/src/battle/common/actor/paragoomba.inc.c
@@ -515,7 +515,7 @@ EvtScript N(8021C574) = {
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
         EVT_ADD(LW(4), 10)
         EVT_ADD(LW(5), 5)
-        EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
     EVT_END_IF
     EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c
index fcf4d2cc60..2c4f6274f7 100644
--- a/src/battle/common/actor/paratroopa.inc.c
+++ b/src/battle/common/actor/paratroopa.inc.c
@@ -1058,11 +1058,11 @@ EvtScript N(takeTurn_80221DAC) = {
         EVT_CHILD_THREAD
             EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
             EVT_ADD(LW(1), 4)
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(3)
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(2)
-            EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_END_CHILD_THREAD
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
         EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_troopa_Palette_01_Anim_6)
diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c
index 80832ec324..9d6d916bdb 100644
--- a/src/battle/common/actor/spike_top.inc.c
+++ b/src/battle/common/actor/spike_top.inc.c
@@ -455,7 +455,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = {
             EVT_ELSE
                 EVT_ADD(LW(1), 24)
             EVT_END_IF
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(20)
         EVT_CASE_EQ(EVENT_DEATH)
             EVT_SET_CONST(LW(0), 1)
@@ -730,11 +730,11 @@ EvtScript N(spikeTop_TakeTurn_Floor) = {
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_spike_top_Palette_00_Anim_F)
     EVT_THREAD
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(10)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(5)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
     EVT_END_THREAD
     EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
     EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_spike_top_Palette_00_Anim_A)
diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c
index 35829197e3..2c673411f0 100644
--- a/src/battle/common/actor/spiked_goomba.inc.c
+++ b/src/battle/common/actor/spiked_goomba.inc.c
@@ -284,7 +284,7 @@ EvtScript N(handleEvent_8021E874) = {
             EVT_ELSE
                 EVT_ADD(LW(1), 26)
             EVT_END_IF
-            EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
             EVT_WAIT_FRAMES(20)
         EVT_CASE_DEFAULT
     EVT_END_SWITCH
diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c
index d0e5a40e13..ef2c72a29e 100644
--- a/src/battle/common/actor/white_magikoopa.inc.c
+++ b/src/battle/common/actor/white_magikoopa.inc.c
@@ -383,7 +383,7 @@ EvtScript N(80224448) = {
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
         EVT_ADD(LW(4), 10)
         EVT_ADD(LW(5), 5)
-        EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
     EVT_END_IF
     EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
     EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@@ -551,7 +551,7 @@ EvtScript N(wMagikoopa_ShapeSpell) = {
         EVT_SUB(LW(0), 30)
         EVT_ADD(LW(1), 36)
     EVT_END_IF
-    EVT_CALL(PlayEffect, EFFECT_ID_47, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0)
+    EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0)
     EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_flying_magikoopa_Palette_03_Anim_2)
     EVT_WAIT_FRAMES(30)
     EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), 0, 0, 1, BS_FLAGS1_10)
@@ -958,12 +958,12 @@ EvtScript N(healOne) = {
             EVT_SUB(LW(0), 6)
             EVT_ADD(LW(1), 12)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_ELSE
             EVT_SUB(LW(0), 16)
             EVT_ADD(LW(1), 31)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_END_IF
     EVT_ELSE
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
@@ -972,12 +972,12 @@ EvtScript N(healOne) = {
             EVT_SUB(LW(0), 12)
             EVT_ADD(LW(1), 14)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_ELSE
             EVT_SUB(LW(0), 30)
             EVT_ADD(LW(1), 36)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_END_IF
     EVT_END_IF
     EVT_WAIT_FRAMES(30)
@@ -1044,12 +1044,12 @@ EvtScript N(healAll) = {
             EVT_SUB(LW(0), 6)
             EVT_ADD(LW(1), 12)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_ELSE
             EVT_SUB(LW(0), 16)
             EVT_ADD(LW(1), 31)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_END_IF
     EVT_ELSE
         EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
@@ -1058,12 +1058,12 @@ EvtScript N(healAll) = {
             EVT_SUB(LW(0), 12)
             EVT_ADD(LW(1), 14)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_ELSE
             EVT_SUB(LW(0), 30)
             EVT_ADD(LW(1), 36)
             EVT_SUB(LW(2), 2)
-            EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
+            EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
         EVT_END_IF
     EVT_END_IF
     EVT_WAIT_FRAMES(30)
diff --git a/src/battle/item/dried_shroom.c b/src/battle/item/dried_shroom.c
index 432dcf8ff2..7b28b5bea8 100644
--- a/src/battle/item/dried_shroom.c
+++ b/src/battle/item/dried_shroom.c
@@ -10,7 +10,7 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/egg_missile.c b/src/battle/item/egg_missile.c
index 756ef9ab18..2f1583ae34 100644
--- a/src/battle/item/egg_missile.c
+++ b/src/battle/item/egg_missile.c
@@ -14,8 +14,8 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_17(0, a, b, c);
-    playFX_19(0, a, b + 20, c);
+    fx_smoke_ring(0, a, b, c);
+    fx_explosion(0, a, b + 20, c);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/electro_pop.c b/src/battle/item/electro_pop.c
index 8aa8b50f9f..513de52278 100644
--- a/src/battle/item/electro_pop.c
+++ b/src/battle/item/electro_pop.c
@@ -19,7 +19,7 @@ ApiStatus N(func_802A127C_73081C)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
@@ -31,7 +31,7 @@ ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(1, a, b, c, d);
+    fx_recover(1, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/fire_flower.c b/src/battle/item/fire_flower.c
index 27ae6d6a65..8a8fd691ba 100644
--- a/src/battle/item/fire_flower.c
+++ b/src/battle/item/fire_flower.c
@@ -9,7 +9,7 @@ ApiStatus N(func_802A123C_716E9C)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_3F(0, a, b, c, 0);
+    fx_fire_flower(0, a, b, c, 0);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/food.c b/src/battle/item/food.c
index fe76de7799..0ee503f5e1 100644
--- a/src/battle/item/food.c
+++ b/src/battle/item/food.c
@@ -48,7 +48,7 @@ ApiStatus N(func_802A1378_733448)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
@@ -60,7 +60,7 @@ ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(1, a, b, c, d);
+    fx_recover(1, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c
index 5d2ab518f6..486caf4787 100644
--- a/src/battle/item/insecticide_herb.c
+++ b/src/battle/item/insecticide_herb.c
@@ -41,7 +41,7 @@ ApiStatus N(func_802A12E0_72AA30)(Evt* script, s32 isInitialCall) {
     a += rand_int(20) - 10;
     b += rand_int(10) - 5;
 
-    effect = (struct N(temp)*)playFX_6F(0, a, b, c, 1.0f, 30);
+    effect = (struct N(temp)*)fx_cold_breath(0, a, b, c, 1.0f, 30);
 
     effect->unk_0C->unk_18 = 0xF4;
     effect->unk_0C->unk_1C = 0xF4;
diff --git a/src/battle/item/life_shroom.c b/src/battle/item/life_shroom.c
index c77eb47a51..52753fd7c6 100644
--- a/src/battle/item/life_shroom.c
+++ b/src/battle/item/life_shroom.c
@@ -48,7 +48,7 @@ ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/mushroom.c b/src/battle/item/mushroom.c
index c897bcab83..e3a4490664 100644
--- a/src/battle/item/mushroom.c
+++ b/src/battle/item/mushroom.c
@@ -48,7 +48,7 @@ ApiStatus N(func_802A1378_715BC8)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
@@ -60,7 +60,7 @@ ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(1, a, b, c, d);
+    fx_recover(1, a, b, c, d);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c
index 109570f525..1e2ecfaaa8 100644
--- a/src/battle/item/mystery.c
+++ b/src/battle/item/mystery.c
@@ -218,7 +218,7 @@ ApiStatus N(func_802A188C_72CE3C)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_18(2, a, b, c, 0, -1.0f, 0, 5);
+    fx_damage_stars(2, a, b, c, 0, -1.0f, 0, 5);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/shooting_star.c b/src/battle/item/shooting_star.c
index 9004a99090..0cc5c9c0b8 100644
--- a/src/battle/item/shooting_star.c
+++ b/src/battle/item/shooting_star.c
@@ -36,7 +36,7 @@ ApiStatus N(func_802A123C_71D9AC)(Evt* script, s32 isInitialCall) {
     }
 
     do {
-        playFX_0F(phi_a0, temp_s1, c8, temp_s0, temp_f22, 0, temp_f20, phi_v0 + 7);
+        fx_star(phi_a0, temp_s1, c8, temp_s0, temp_f22, 0, temp_f20, phi_v0 + 7);
         if (temp_f20) {
             temp_f20 -= rand;
         }
@@ -55,7 +55,7 @@ ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_18(2, a, b, c, 0, -1.0f, 0, 5);
+    fx_damage_stars(2, a, b, c, 0, -1.0f, 0, 5);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/sleepy_sheep.c b/src/battle/item/sleepy_sheep.c
index a30959dd28..9d0306e7ef 100644
--- a/src/battle/item/sleepy_sheep.c
+++ b/src/battle/item/sleepy_sheep.c
@@ -129,7 +129,7 @@ ApiStatus func_802A123C_71E88C(Evt* script, s32 isInitialCall) {
                         if (x > 40.0f) {
                             x2 = -(x - 40.0f);
                         }
-                        fx_land(3, x2, y2, z, 0);
+                        fx_landing_dust(3, x2, y2, z, 0);
                         flag = 1;
                     }
                 }
@@ -139,7 +139,7 @@ ApiStatus func_802A123C_71E88C(Evt* script, s32 isInitialCall) {
             }
             if (gGameStatusPtr->frameCounter & 1) {
                 s32 randIdx = rand_int(9);
-                fx_land(2, N(D_802A3E88_7214D8)[randIdx * 3 + 0] + D_802A3F88_ptr->x,
+                fx_landing_dust(2, N(D_802A3E88_7214D8)[randIdx * 3 + 0] + D_802A3F88_ptr->x,
                               N(D_802A3E88_7214D8)[randIdx * 3 + 1],
                               N(D_802A3E88_7214D8)[randIdx * 3 + 2] + D_802A3F88_ptr->z, 0);
             }
diff --git a/src/battle/item/snowman_doll.c b/src/battle/item/snowman_doll.c
index a1b91e86c9..2e4cbb77c2 100644
--- a/src/battle/item/snowman_doll.c
+++ b/src/battle/item/snowman_doll.c
@@ -9,8 +9,8 @@ ApiStatus N(func_802A123C_71C06C)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_11(2, a, b, c, 30.0f);
-    playFX_11(2, a, b, c, 30.0f);
+    fx_sparkles(2, a, b, c, 30.0f);
+    fx_sparkles(2, a, b, c, 30.0f);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/item/stone_cap.c b/src/battle/item/stone_cap.c
index 68eee23d82..160448942e 100644
--- a/src/battle/item/stone_cap.c
+++ b/src/battle/item/stone_cap.c
@@ -25,7 +25,7 @@ ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall) {
                 f32 x = player->currentPos.x + ((rand_int(20) - 10) * player->scalingFactor);
                 f32 y = player->currentPos.y + ((rand_int(20) + 10) * player->scalingFactor);
                 f32 z = player->currentPos.z + 5.0f;
-                playFX_69(0, x, y, z, 1.0f, 25);
+                fx_floating_cloud_puff(0, x, y, z, 1.0f, 25);
             }
 
             if (script->functionTemp[1] == 0) {
diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c
index d53e33e19a..12a48f9484 100644
--- a/src/battle/item/strange_cake.c
+++ b/src/battle/item/strange_cake.c
@@ -212,7 +212,7 @@ ApiStatus N(func_802A1818_731B18)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
     return ApiStatus_DONE2;
 }
 
@@ -223,7 +223,7 @@ ApiStatus N(func_802A18D8_731BD8)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(1, a, b, c, d);
+    fx_recover(1, a, b, c, d);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/item/super_soda.c b/src/battle/item/super_soda.c
index 0f0424a805..9fd6677bad 100644
--- a/src/battle/item/super_soda.c
+++ b/src/battle/item/super_soda.c
@@ -79,7 +79,7 @@ ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(1, a, b, c, d);
+    fx_recover(1, a, b, c, d);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/item/thunder_bolt.c b/src/battle/item/thunder_bolt.c
index 179faa7646..cc501f68a6 100644
--- a/src/battle/item/thunder_bolt.c
+++ b/src/battle/item/thunder_bolt.c
@@ -23,7 +23,7 @@ ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall) {
             posY -= actor->size.y / 2;
         }
 
-        playFX_36(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY);
+        fx_lightning(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY);
 
         return ApiStatus_DONE2;
     }
diff --git a/src/battle/item/thunder_rage.c b/src/battle/item/thunder_rage.c
index 40f81d6f0e..f5f7999131 100644
--- a/src/battle/item/thunder_rage.c
+++ b/src/battle/item/thunder_rage.c
@@ -41,7 +41,7 @@ ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) {
             posY -= actor->size.y / 2;
         }
 
-        playFX_36(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY);
+        fx_lightning(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY);
 
         return ApiStatus_DONE2;
     }
diff --git a/src/battle/item/ultra_shroom.c b/src/battle/item/ultra_shroom.c
index eae52bcb07..ffc3136cdd 100644
--- a/src/battle/item/ultra_shroom.c
+++ b/src/battle/item/ultra_shroom.c
@@ -10,7 +10,7 @@ ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/item/unknown_item.c b/src/battle/item/unknown_item.c
index 8f012be413..7237b105d2 100644
--- a/src/battle/item/unknown_item.c
+++ b/src/battle/item/unknown_item.c
@@ -10,7 +10,7 @@ ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall) {
     s32 c = evt_get_variable(script, *args++);
     s32 d = evt_get_variable(script, *args++);
 
-    playFX_40(0, a, b, c, d);
+    fx_recover(0, a, b, c, d);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/move/d_down_jump/781920.c b/src/battle/move/d_down_jump/781920.c
index 1fdf0c7410..18fc4b4eb9 100644
--- a/src/battle/move/d_down_jump/781920.c
+++ b/src/battle/move/d_down_jump/781920.c
@@ -12,9 +12,9 @@ ApiStatus func_802A10E4_781A04(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
 
     if (script->varTable[10] == 0) {
-        playFX_32(TRUE, var0, var1, var2, 0.0f);
+        fx_green_impact(TRUE, var0, var1, var2, 0.0f);
     } else {
-        playFX_32(FALSE, var0, var1, var2, 0.0f);
+        fx_green_impact(FALSE, var0, var1, var2, 0.0f);
     }
 
     return ApiStatus_DONE2;
diff --git a/src/battle/move/d_down_pound/74AD90.c b/src/battle/move/d_down_pound/74AD90.c
index 5cd1799ecf..72ffc78fde 100644
--- a/src/battle/move/d_down_pound/74AD90.c
+++ b/src/battle/move/d_down_pound/74AD90.c
@@ -14,9 +14,9 @@ ApiStatus func_802A10A4_74AE34(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
 
     if (script->varTable[10] == 0) {
-        playFX_32(TRUE, var0 + 30, var1 + 25, var2, 45.0f);
+        fx_green_impact(TRUE, var0 + 30, var1 + 25, var2, 45.0f);
     } else {
-        playFX_32(FALSE, var0 + 30, var1 + 25, var2, 45.0f);
+        fx_green_impact(FALSE, var0 + 30, var1 + 25, var2, 45.0f);
     }
 
     return ApiStatus_DONE2;
diff --git a/src/battle/move/hammer_charge_0/74F130.c b/src/battle/move/hammer_charge_0/74F130.c
index 1a8f96398f..e52539daa2 100644
--- a/src/battle/move/hammer_charge_0/74F130.c
+++ b/src/battle/move/hammer_charge_0/74F130.c
@@ -16,7 +16,7 @@ ApiStatus func_802A10C8_74F1F8(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
 
-    playFX_56(0, var1, var2, var3, 1.0f, 60);
+    fx_stat_change(0, var1, var2, var3, 1.0f, 60);
 
     battleStatus->hammerCharge++;
     if (battleStatus->hammerCharge > 99) {
@@ -37,7 +37,7 @@ ApiStatus func_802A11CC_74F2FC(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     f32 var3 = evt_get_float_variable(script, *args++);
 
-    playFX_6B(6, var0 + 10, var1 + 18, var2, var3, 45);
+    fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/move/hammer_charge_1/7595B0.c b/src/battle/move/hammer_charge_1/7595B0.c
index 073c2bd96d..0fe79e7975 100644
--- a/src/battle/move/hammer_charge_1/7595B0.c
+++ b/src/battle/move/hammer_charge_1/7595B0.c
@@ -19,7 +19,7 @@ ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32* var4;
 
-    playFX_56(1, var1, var2, var3, 1.0f, 60);
+    fx_stat_change(1, var1, var2, var3, 1.0f, 60);
     var4 = &D_802A43D0;
     *var4 = 0;
     if (battleStatus->hammerCharge > 0) {
diff --git a/src/battle/move/hammer_charge_2/75E5D0.c b/src/battle/move/hammer_charge_2/75E5D0.c
index 308c3d18ec..edaf0a2537 100644
--- a/src/battle/move/hammer_charge_2/75E5D0.c
+++ b/src/battle/move/hammer_charge_2/75E5D0.c
@@ -19,7 +19,7 @@ ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32* var4;
 
-    playFX_56(2, var1, var2, var3, 1.0f, 60);
+    fx_stat_change(2, var1, var2, var3, 1.0f, 60);
     var4 = &D_802A4350;
     *var4 = 0;
     if (battleStatus->hammerCharge > 0) {
diff --git a/src/battle/move/jump_charge_0/74D570.c b/src/battle/move/jump_charge_0/74D570.c
index a0bd541ba5..9a4fbaf2b2 100644
--- a/src/battle/move/jump_charge_0/74D570.c
+++ b/src/battle/move/jump_charge_0/74D570.c
@@ -14,7 +14,7 @@ ApiStatus func_802A1108_74D678(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
 
-    playFX_56(0, var1, var2, var3, 1.0f, 60);
+    fx_stat_change(0, var1, var2, var3, 1.0f, 60);
 
     battleStatus->jumpCharge++;
     if (battleStatus->jumpCharge > 99) {
@@ -35,7 +35,7 @@ ApiStatus func_802A120C_74D77C(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     f32 var3 = evt_get_float_variable(script, *args++);
 
-    playFX_6B(6, var0 + 10, var1 + 18, var2, var3, 45);
+    fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/move/jump_charge_1/75C980.c b/src/battle/move/jump_charge_1/75C980.c
index 9061b71e9e..e06e661913 100644
--- a/src/battle/move/jump_charge_1/75C980.c
+++ b/src/battle/move/jump_charge_1/75C980.c
@@ -17,7 +17,7 @@ ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32* var4;
 
-    playFX_56(1, var1, var2, var3, 1.0f, 60);
+    fx_stat_change(1, var1, var2, var3, 1.0f, 60);
     var4 = &D_802A2C50;
     *var4 = 0;
     if (battleStatus->jumpCharge > 0) {
diff --git a/src/battle/move/jump_charge_2/761920.c b/src/battle/move/jump_charge_2/761920.c
index 1caf9b630c..e8bd91b144 100644
--- a/src/battle/move/jump_charge_2/761920.c
+++ b/src/battle/move/jump_charge_2/761920.c
@@ -17,7 +17,7 @@ ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32* var4;
 
-    playFX_56(2, var1, var2, var3, 1.0f, 60);
+    fx_stat_change(2, var1, var2, var3, 1.0f, 60);
     var4 = &D_802A2C20;
     *var4 = 0;
     if (battleStatus->jumpCharge > 0) {
diff --git a/src/battle/move/quake_hammer/quake_hammer.c b/src/battle/move/quake_hammer/quake_hammer.c
index 6caa6ed6da..684e1d95c0 100644
--- a/src/battle/move/quake_hammer/quake_hammer.c
+++ b/src/battle/move/quake_hammer/quake_hammer.c
@@ -638,11 +638,11 @@ EvtScript D_802A3168_0073D038 = {
         EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
         EVT_ADD(LW(0), 24)
         EVT_ADD(LW(1), 10)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 60, 8, 0, 30, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 60, 8, 0, 30, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(2)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 60, 8, 33, 30, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 60, 8, 33, 30, 0, 0, 0, 0, 0)
         EVT_WAIT_FRAMES(2)
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 60, 8, 66, 30, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 60, 8, 66, 30, 0, 0, 0, 0, 0)
     EVT_END_CHILD_THREAD
     EVT_CALL(DidActionSucceed, LW(0))
     EVT_SWITCH(LW(0))
@@ -662,8 +662,8 @@ EvtScript D_802A3168_0073D038 = {
                 EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
                 EVT_ADD(LW(0), 24)
                 EVT_ADD(LW(1), 10)
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 72, 8, 0, 30, 0, 0, 0, 0, 0)
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 72, 8, 24, 30, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 72, 8, 0, 30, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 72, 8, 24, 30, 0, 0, 0, 0, 0)
             EVT_END_CHILD_THREAD
         EVT_CASE_DEFAULT
             EVT_CALL(StartRumble, 9)
diff --git a/src/battle/move/spin_smash/spin_smash.c b/src/battle/move/spin_smash/spin_smash.c
index beb403a914..48572159ac 100644
--- a/src/battle/move/spin_smash/spin_smash.c
+++ b/src/battle/move/spin_smash/spin_smash.c
@@ -16,7 +16,7 @@ ApiStatus func_802A1000_737890(Evt* script, s32 isInitialCall) {
     f32 yPos = playerActor->currentPos.y + 15.0f;
     f32 zPos = playerActor->currentPos.z + 5.0f;
 
-    playFX_2D(0, xPos, yPos, zPos, 6, 20);
+    fx_stars_spread(0, xPos, yPos, zPos, 6, 20);
 
     return ApiStatus_DONE2;
 }
@@ -28,7 +28,7 @@ ApiStatus func_802A1074_737904(Evt* script, s32 isInitialCall) {
     f32 yPos = playerActor->currentPos.y + 15.0f;
     f32 zPos = playerActor->currentPos.z + 5.0f;
 
-    playFX_2E(0, xPos, yPos, zPos, 1.0f, 20);
+    fx_steam_burst(0, xPos, yPos, zPos, 1.0f, 20);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c
index 8066cc4a1c..1123e9ce20 100644
--- a/src/battle/partner/bombette.c
+++ b/src/battle/partner/bombette.c
@@ -29,36 +29,36 @@ ApiStatus func_80238000_6FAD10(Evt* script, s32 isInitialCall) {
     s16 selectedMoveID;
     s32 soundID;
 
-    playFX_17(0, x, y, z);
+    fx_smoke_ring(0, x, y, z);
     selectedMoveID = battleStatus->selectedMoveID;
 
     switch (selectedMoveID) {
         case 146:
             if (script->varTable[10] > 0) {
-                playFX_19(1, x, y + 20, z);
+                fx_explosion(1, x, y + 20, z);
             } else {
-                playFX_19(0, x, y + 20, z);
+                fx_explosion(0, x, y + 20, z);
             }
             sfx_play_sound(8214);
             break;
         case 147:
             if (script->varTable[10] > 0) {
-                playFX_19(1, x, y + 20, z);
+                fx_explosion(1, x, y + 20, z);
             } else {
-                playFX_19(0, x, y + 20, z);
+                fx_explosion(0, x, y + 20, z);
             }
             sfx_play_sound(8215);
             break;
         case 148:
             if (script->varTable[10] > 0) {
-                playFX_19(2, x, y + 20, z);
+                fx_explosion(2, x, y + 20, z);
             } else {
-                playFX_19(1, x, y + 20, z);
+                fx_explosion(1, x, y + 20, z);
             }
             sfx_play_sound(8215);
             break;
         default:
-            playFX_19(0, x, y + 20, z);
+            fx_explosion(0, x, y + 20, z);
             sfx_play_sound(8214);
             break;
     }
@@ -1202,9 +1202,9 @@ EvtScript N(8023B228) = {
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2))
                 EVT_WAIT_FRAMES(8)
                 EVT_IF_GT(LW(10), 0)
-                    EVT_CALL(PlayEffect, EFFECT_ID_68, 0, LW(0), 0, LW(2), 1, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_RED_IMPACT, 0, LW(0), 0, LW(2), 1, 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_ELSE
-                    EVT_CALL(PlayEffect, EFFECT_ID_68, 1, LW(0), 0, LW(2), 1, 0, 0, 0, 0, 0, 0, 0, 0)
+                    EVT_CALL(PlayEffect, EFFECT_RED_IMPACT, 1, LW(0), 0, LW(2), 1, 0, 0, 0, 0, 0, 0, 0, 0)
                 EVT_END_IF
             EVT_CASE_EQ(148)
                 EVT_SET(LW(10), 0)
diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c
index 7e34772d54..e50ebbf79f 100644
--- a/src/battle/partner/goombario.c
+++ b/src/battle/partner/goombario.c
@@ -141,7 +141,7 @@ ApiStatus func_80238B60_6F1C40(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "battle/partner/goombario", func_80238BCC_6F1CAC);
 
 ApiStatus func_80238E04_6F1EE4(Evt* script, s32 isInitialCall) {
-    D_8023CDA0 = playFX_6C(0, 206, 144, 0, 1.0f, 0);
+    D_8023CDA0 = fx_tattle_window(0, 206, 144, 0, 1.0f, 0);
 
     return ApiStatus_DONE2;
 }
@@ -222,7 +222,7 @@ ApiStatus func_802390C8_6F21A8(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     f32 var4 = evt_get_float_variable(script, *args++);
 
-    playFX_6B(6, var1, var2, var3, var4, 45);
+    fx_energy_in_out(6, var1, var2, var3, var4, 45);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c
index df4237c6b5..6f5d1b233e 100644
--- a/src/battle/partner/kooper.c
+++ b/src/battle/partner/kooper.c
@@ -518,22 +518,22 @@ EvtScript N(80239384) = {
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_A)
             EVT_CASE_EQ(20)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_LT(30)
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_B)
             EVT_CASE_EQ(30)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_LT(40)
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_C)
             EVT_CASE_EQ(40)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_LT(50)
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_D)
             EVT_CASE_EQ(50)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_END_SWITCH
         EVT_ADD(LW(9), 1)
         EVT_CALL(GetActionResult, LW(0))
@@ -595,7 +595,7 @@ EvtScript N(80239384) = {
         EVT_END_LOOP
         EVT_WAIT_FRAMES(5)
         EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 16, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 16, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_LOOP(5)
             EVT_ADD(LW(0), 12)
             EVT_CALL(SetActorRotation, ACTOR_PARTNER, 0, 0, LW(0))
@@ -687,22 +687,22 @@ EvtScript N(80239E7C) = {
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_A)
             EVT_CASE_EQ(20)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_LT(30)
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_B)
             EVT_CASE_EQ(30)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_LT(40)
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_C)
             EVT_CASE_EQ(40)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_LT(50)
                 EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, NPC_ANIM_battle_kooper_Palette_00_Anim_D)
             EVT_CASE_EQ(50)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_END_SWITCH
         EVT_ADD(LW(9), 1)
         EVT_CALL(GetActionResult, LW(0))
@@ -870,16 +870,16 @@ EvtScript N(8023AA38) = {
         EVT_SWITCH(LW(13))
             EVT_CASE_EQ(10)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_EQ(20)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_EQ(40)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_EQ(60)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_END_SWITCH
     EVT_END_LOOP
     EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0x290)
@@ -1087,16 +1087,16 @@ EvtScript N(8023B660) = {
         EVT_SWITCH(LW(13))
             EVT_CASE_EQ(10)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(3), LW(4), LW(5))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_EQ(20)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(3), LW(4), LW(5))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_EQ(40)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(3), LW(4), LW(5))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
             EVT_CASE_EQ(60)
                 EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(3), LW(4), LW(5))
-                EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
+                EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(3), LW(4), LW(5), 32, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_END_SWITCH
     EVT_END_LOOP
     EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, 0x28F)
@@ -1251,7 +1251,7 @@ EvtScript N(8023C754) = {
         EVT_END_LOOP
         EVT_WAIT_FRAMES(5)
         EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(4), LW(5), LW(6))
-        EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(4), LW(5), LW(6), 16, 4, 0, 10, 0, 0, 0, 0, 0)
+        EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(4), LW(5), LW(6), 16, 4, 0, 10, 0, 0, 0, 0, 0)
         EVT_LOOP(5)
             EVT_ADD(LW(0), 12)
             EVT_CALL(SetActorRotation, ACTOR_PARTNER, 0, 0, LW(0))
diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c
index 08a76fe5dc..5d3419b1f5 100644
--- a/src/battle/partner/lakilester.c
+++ b/src/battle/partner/lakilester.c
@@ -29,7 +29,7 @@ ApiStatus func_80238A6C_70C77C(Evt* script, s32 isInitialCall) {
     f32 var = rand_int(140) + 10;
     f32 var2 = rand_int(80) + 10;
 
-    playFX_64(0, xPos, yPos, zPos, var, var2, 20, 1.5f, 30);
+    fx_throw_spiny(0, xPos, yPos, zPos, var, var2, 20, 1.5f, 30);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c
index 9d53763679..dabede442b 100644
--- a/src/battle/partner/sushie.c
+++ b/src/battle/partner/sushie.c
@@ -114,7 +114,7 @@ ApiStatus func_80238388_708028(Evt* script, s32 isInitialCall) {
     Actor* partnerActor = battleStatus->partnerActor;
     Actor* playerActor = battleStatus->playerActor;
 
-    D_8023C070 = playFX_59(1, partnerActor->currentPos.x - 5.5, partnerActor->currentPos.y + 15.5, partnerActor->currentPos.z + 5, playerActor->currentPos.x, playerActor->currentPos.y, playerActor->currentPos.z, rand_int(10) * D_8023C060_70BD00 + 1, 30);
+    D_8023C070 = fx_squirt(1, partnerActor->currentPos.x - 5.5, partnerActor->currentPos.y + 15.5, partnerActor->currentPos.z + 5, playerActor->currentPos.x, playerActor->currentPos.y, playerActor->currentPos.z, rand_int(10) * D_8023C060_70BD00 + 1, 30);
 
     return ApiStatus_DONE2;
 }
@@ -131,7 +131,7 @@ ApiStatus func_80238480_708120(Evt* script, s32 isInitialCall) {
         remove_effect(effect);
     }
 
-    battleStatus->waterBlockEffect = playFX_5A(0, posX, posY, posZ, 1.5f, 0);
+    battleStatus->waterBlockEffect = fx_water_block(0, posX, posY, posZ, 1.5f, 0);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c
index ebf9233589..46aae282c9 100644
--- a/src/battle/partner/watt.c
+++ b/src/battle/partner/watt.c
@@ -61,7 +61,7 @@ ApiStatus func_802384B0_703FA0(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
 
-    D_80239A0C_7054FC = playFX_33(8, var1, var2, var3, 1.3f, 55);
+    D_80239A0C_7054FC = fx_radial_shimmer(8, var1, var2, var3, 1.3f, 55);
 
     return ApiStatus_DONE2;
 }
@@ -86,7 +86,7 @@ ApiStatus func_8023859C_70408C(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     EffectInstanceDataThing* dataThing;
 
-    D_8023C1B4 = playFX_58(0, var1, var2, var3, 1.0f, 10);
+    D_8023C1B4 = fx_thunderbolt_ring(0, var1, var2, var3, 1.0f, 10);
     dataThing = D_8023C1B4->data;
     dataThing->unk_30 = 3;
 
@@ -125,7 +125,7 @@ ApiStatus func_80238B3C_70462C(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     EffectInstanceDataThing* temp_a0;
 
-    D_8023C1B4 = playFX_58(0, var1, var2, var3, 1.0f, 60);
+    D_8023C1B4 = fx_thunderbolt_ring(0, var1, var2, var3, 1.0f, 60);
     temp_a0 = D_8023C1B4->data;
     temp_a0->unk_30 = 2;
 
diff --git a/src/battle/star/chill_out/7900D0.c b/src/battle/star/chill_out/7900D0.c
index ea83d7ced6..aad0022cca 100644
--- a/src/battle/star/chill_out/7900D0.c
+++ b/src/battle/star/chill_out/7900D0.c
@@ -23,13 +23,13 @@ ApiStatus func_802A153C_79060C(Evt* script, s32 isInitialCall) {
     f32 b = rand_int(120) + 7;
     f32 c = rand_int(50) - 25;
 
-    playFX_6F(2, a, b, c, 2.0f, 20);
+    fx_cold_breath(2, a, b, c, 2.0f, 20);
 
     a = rand_int(200) - 25;
     b = rand_int(120) + 7;
     c = rand_int(50) - 25;
 
-    playFX_11(4, a, b, c, 40.0f);
+    fx_sparkles(4, a, b, c, 40.0f);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/battle/star/lullaby/78D150.c b/src/battle/star/lullaby/78D150.c
index 352c842954..9d39edc447 100644
--- a/src/battle/star/lullaby/78D150.c
+++ b/src/battle/star/lullaby/78D150.c
@@ -22,7 +22,7 @@ ApiStatus func_802A1518_78D668(Evt* script, s32 isInitialCall) {
         case 1:
             temp = script->functionTemp[2];
             temp2 = (sin_rad((script->functionTemp[1] * TAU) / 360.0f) * 30.0f) + 30.0f;
-            playFX_26(0, temp, temp2, 50.0f);
+            fx_music_note(0, temp, temp2, 50.0f);
 
             script->functionTemp[2] += 14;
             script->functionTemp[1] += 20;
diff --git a/src/battle/star/refresh/78B600.c b/src/battle/star/refresh/78B600.c
index d198e96dc3..260736f480 100644
--- a/src/battle/star/refresh/78B600.c
+++ b/src/battle/star/refresh/78B600.c
@@ -40,7 +40,7 @@ ApiStatus func_802A18E8_78BEE8(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32 var4 = evt_get_variable(script, *args++);
 
-    playFX_40(0, var1, var2, var3, var4);
+    fx_recover(0, var1, var2, var3, var4);
 
     return ApiStatus_DONE2;
 }
@@ -52,7 +52,7 @@ ApiStatus func_802A19A8_78BFA8(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32 var4 = evt_get_variable(script, *args++);
 
-    playFX_40(1, var1, var2, var3, var4);
+    fx_recover(1, var1, var2, var3, var4);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/star/smooch/791D90.c b/src/battle/star/smooch/791D90.c
index 633aad0955..f1560ce02c 100644
--- a/src/battle/star/smooch/791D90.c
+++ b/src/battle/star/smooch/791D90.c
@@ -15,7 +15,7 @@ ApiStatus func_802A156C_7922FC(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32 var4 = evt_get_variable(script, *args++);
 
-    playFX_40(0, var1, var2, var3, var4);
+    fx_recover(0, var1, var2, var3, var4);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/battle/star/star_storm/78E7D0.c b/src/battle/star/star_storm/78E7D0.c
index 2c4064590e..8569659cd8 100644
--- a/src/battle/star/star_storm/78E7D0.c
+++ b/src/battle/star/star_storm/78E7D0.c
@@ -14,10 +14,10 @@ ApiStatus func_802A1518_78ECE8(Evt* script, s32 isInitialCall) {
 
     if (script->varTable[0] % 4) {
         var4 = var1 + (rand_int(50) + var2);
-        playFX_0F(2, var1, var2, var3, var4, 0, var3, rand_int(10) + 7);
+        fx_star(2, var1, var2, var3, var4, 0, var3, rand_int(10) + 7);
     } else {
         var4 = var1 + (rand_int(50) + var2);
-        playFX_0F(3, var1, var2, var3, var4, 0, var3, rand_int(10) + 7);
+        fx_star(3, var1, var2, var3, var4, 0, var3, rand_int(10) + 7);
     }
 
     return ApiStatus_DONE2;
@@ -29,7 +29,7 @@ ApiStatus func_802A1628_78EDF8(Evt* script, s32 isInitialCall) {
     s32 var2 = evt_get_variable(script, *args++);
     s32 var3 = evt_get_variable(script, *args++);
 
-    playFX_18(2, var1, var2, var3, 0, -1.0f, 0, 5);
+    fx_damage_stars(2, var1, var2, var3, 0, -1.0f, 0, 5);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/common/Set80071270_0_16.inc.c b/src/common/Set80071270_0_16.inc.c
index 6a3bee51b7..483567c26e 100644
--- a/src/common/Set80071270_0_16.inc.c
+++ b/src/common/Set80071270_0_16.inc.c
@@ -2,6 +2,6 @@
 #include "effects.h"
 
 ApiStatus N(Set80071270_0_16)(Evt* script, s32 isInitialCall) {
-    playFX_45(0, 0x10);
+    fx_snowfall(0, 0x10);
     return ApiStatus_DONE2;
 }
diff --git a/src/common/ShrinkActor.inc.c b/src/common/ShrinkActor.inc.c
index 4d5df0f3c6..e74e292247 100644
--- a/src/common/ShrinkActor.inc.c
+++ b/src/common/ShrinkActor.inc.c
@@ -11,10 +11,10 @@ ApiStatus N(ShrinkActor)(Evt* script, s32 isInitialCall) {
     f32 var6 = evt_get_float_variable(script, *args++);
     s32 var7 = evt_get_variable(script, *args++);
     Actor* actor = get_actor(script->owner1.actorID);
-    EffectInstance* effect = playFX_12(0, var1, (f32) var2 + 5.0, var3, var4, var5, var6, var7);
+    EffectInstance* effect = fx_shape_spell(0, var1, (f32) var2 + 5.0, var3, var4, var5, var6, var7);
 
     if (actor->debuff == STATUS_SHRINK) {
-        ((Effect12*)effect->data)->unk_28 = 0.4f;
+        ((FootprintFXData*)effect->data)->unk_28 = 0.4f;
     }
 
     return ApiStatus_DONE2;
diff --git a/src/common/StarPower.inc.c b/src/common/StarPower.inc.c
index 1d77beb01a..15fa5b2f33 100644
--- a/src/common/StarPower.inc.c
+++ b/src/common/StarPower.inc.c
@@ -7,7 +7,7 @@ ApiStatus N(UnkStarFunc1)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_11(0, a, b, c, 40.0f);
+    fx_sparkles(0, a, b, c, 40.0f);
     return ApiStatus_DONE2;
 }
 
@@ -17,7 +17,7 @@ ApiStatus N(UnkStarFunc2)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_22(5, a, b, c, 50.0f, 50.0f, 40, 30);
+    fx_stars_shimmer(5, a, b, c, 50.0f, 50.0f, 40, 30);
     return ApiStatus_DONE2;
 }
 
@@ -27,7 +27,7 @@ ApiStatus N(UnkStarFunc3)(Evt* script, s32 isInitialCall) {
     s32 b = evt_get_variable(script, *args++);
     s32 c = evt_get_variable(script, *args++);
 
-    playFX_11(0, a, b, c, 30.0f);
+    fx_sparkles(0, a, b, c, 30.0f);
     return ApiStatus_DONE2;
 }
 
@@ -36,7 +36,7 @@ ApiStatus N(UnkStarFunc4)(Evt* script, s32 isInitialCall) {
     s32 var1 = evt_get_variable(script, *args++);
     s32 var2 = evt_get_variable(script, *args++);
 
-    playFX_72(4, var1, var2, evt_get_variable(script, *args++), 20.0f, 20.0f, 1.0f, 0xA, 0xF);
+    fx_misc_particles(4, var1, var2, evt_get_variable(script, *args++), 20.0f, 20.0f, 1.0f, 0xA, 0xF);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/common/UnkEffect0FFuncs.inc.c b/src/common/UnkEffect0FFuncs.inc.c
index 335c815846..7abdc02808 100644
--- a/src/common/UnkEffect0FFuncs.inc.c
+++ b/src/common/UnkEffect0FFuncs.inc.c
@@ -12,7 +12,7 @@ ApiStatus N(UnkEffect0FFunc2)(Evt* script, s32 isInitialCall) {
     f32 var6 = evt_get_float_variable(script, *args++);
     f32 var7 = evt_get_float_variable(script, *args++);
 
-    playFX_0F(var0, var1, var2, var3, var4, var5, var6, var7);
+    fx_star(var0, var1, var2, var3, var4, var5, var6, var7);
     return ApiStatus_DONE2;
 }
 
@@ -42,7 +42,7 @@ ApiStatus N(UnkEffect0FFunc)(Evt* script, s32 isInitialCall) {
     var5 = playerStatus->position.y;
     var6 = playerStatus->position.z - (rand3 * cos_rad(yaw));
     var6 = var6 - (rand2 * cos_rad(yawMinus));
-    playFX_0F(0, var1, var2, var3, var4, var5, var6, rand_int(10) + 10);
+    fx_star(0, var1, var2, var3, var4, var5, var6, rand_int(10) + 10);
     return ApiStatus_DONE2;
 }
 
@@ -77,7 +77,7 @@ ApiStatus N(UnkEffect0FFunc3)(Evt* script, s32 isInitialCall) {
     var5 = playerStatus->position.y;
     var6 = playerStatus->position.z + (rand3 * cos_rad(yaw));
     var6 = var6 - (rand2 * cos_rad(yawMinus));
-    playFX_0F(1, var1, var2, var3, var4, var5, var6, rand_int(10) + 10);
+    fx_star(1, var1, var2, var3, var4, var5, var6, rand_int(10) + 10);
     return ApiStatus_DONE2;
 }
 
@@ -114,6 +114,6 @@ ApiStatus N(UnkEffect0FFunc4)(Evt* script, s32 isInitialCall) {
     var5 = playerStatus->position.y;
     var6 = playerStatus->position.z + (rand3 * cos_rad(yaw));
     var6 = var6 - (rand2 * cos_rad(yawMinus));
-    playFX_0F(2, var1, var2, var3, var4, var5, var6, rand_int(4) + 10);
+    fx_star(2, var1, var2, var3, var4, var5, var6, rand_int(4) + 10);
     return ApiStatus_DONE2;
 }
diff --git a/src/common/UnkEffect6CFunc.inc.c b/src/common/UnkEffect6CFunc.inc.c
index 9c3a609626..837001caf9 100644
--- a/src/common/UnkEffect6CFunc.inc.c
+++ b/src/common/UnkEffect6CFunc.inc.c
@@ -4,6 +4,6 @@
 ApiStatus N(UnkEffect6CFunc)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    evt_set_variable(script, *args++, (s32) playFX_6C(0, 106.0f, 144.0f, 0, 1.0f, 0));
+    evt_set_variable(script, *args++, (s32) fx_tattle_window(0, 106.0f, 144.0f, 0, 1.0f, 0));
     return ApiStatus_DONE2;
 }
diff --git a/src/common/UnkEffect6FFunc.inc.c b/src/common/UnkEffect6FFunc.inc.c
index ee086591fd..bd26b1a622 100644
--- a/src/common/UnkEffect6FFunc.inc.c
+++ b/src/common/UnkEffect6FFunc.inc.c
@@ -14,7 +14,7 @@ ApiStatus N(UnkEffect6FFunc)(Evt* script, s32 isInitialCall) {
     s32 temp_s1 = evt_get_variable(script, *args++);
     s32 temp_s0_9 = evt_get_variable(script, *args++);
 
-    effect = (Effect6FInstance*)playFX_6F(1, temp_s6, temp_s5, temp_s4, temp_f20, temp_s2);
+    effect = (Effect6FInstance*)fx_cold_breath(1, temp_s6, temp_s5, temp_s4, temp_f20, temp_s2);
     effect->data->rotation.z = temp_s3;
     effect->data->scale.x = temp_s1;
     effect->data->scale.y = temp_s0_9;
diff --git a/src/common/UnkWhirlwindEffectFunc.inc.c b/src/common/UnkWhirlwindEffectFunc.inc.c
index d4e663155d..846bd61986 100644
--- a/src/common/UnkWhirlwindEffectFunc.inc.c
+++ b/src/common/UnkWhirlwindEffectFunc.inc.c
@@ -15,6 +15,6 @@ ApiStatus N(UnkWhirlwindEffectFunc)(Evt* script, s32 isInitialCall) {
     N(effectStruct).unk_2C = var2 - 10.0f;
     N(effectStruct).unk_30 = var3;
 
-    playFX_46_whirlwind(6, &N(effectStruct), 1.0f, var4);
+    fx_46(6, &N(effectStruct), 1.0f, var4);
     return ApiStatus_DONE2;
 }
diff --git a/src/effects.c b/src/effects.c
index 1ece64c606..f3f8f892c8 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "effects.h"
+#include "effects_internal.h"
 #include "ld_addrs.h"
 
 typedef s32 TlbEntry[0x1000 / 4];
@@ -13,274 +14,154 @@ extern EffectGraphics gEffectGraphicsData[15];
 extern EffectInstance* gEffectInstances[96];
 extern s32 D_801A6000;
 
-#define FX_MAIN(name) void name(s32); // the actual signature is going to be wrong but doesn't matter
-#define FX_ENTRY(name, gfx_name) { fx_##name##_main, effect_##name##_ROM_START, effect_##name##_ROM_END, \
-                                   effect_##name##_VRAM, gfx_name##_ROM_START, gfx_name##_ROM_END }
 
-FX_MAIN(fx_1_main);
-FX_MAIN(fx_6_main);
-FX_MAIN(fx_7_main);
-FX_MAIN(fx_8_main);
-FX_MAIN(fx_9_main);
-FX_MAIN(fx_10_main);
-FX_MAIN(fx_11_main);
-FX_MAIN(fx_12_main);
-FX_MAIN(fx_13_main);
-FX_MAIN(fx_14_main);
-FX_MAIN(fx_15_main);
-FX_MAIN(fx_16_main);
-FX_MAIN(fx_17_main);
-FX_MAIN(fx_18_main);
-FX_MAIN(fx_19_main);
-FX_MAIN(fx_20_main);
-FX_MAIN(fx_21_main);
-FX_MAIN(fx_22_main);
-FX_MAIN(fx_23_main);
-FX_MAIN(fx_24_main);
-FX_MAIN(fx_25_main);
-FX_MAIN(fx_26_main);
-FX_MAIN(fx_27_main);
-FX_MAIN(fx_28_main);
-FX_MAIN(fx_29_main);
-FX_MAIN(fx_30_main);
-FX_MAIN(fx_31_main);
-FX_MAIN(fx_32_main);
-FX_MAIN(fx_33_main);
-FX_MAIN(fx_34_main);
-FX_MAIN(fx_35_main);
-FX_MAIN(fx_36_main);
-FX_MAIN(fx_37_main);
-FX_MAIN(fx_38_main);
-FX_MAIN(fx_39_main);
-FX_MAIN(fx_40_main);
-FX_MAIN(fx_41_main);
-FX_MAIN(fx_43_main);
-FX_MAIN(fx_44_main);
-FX_MAIN(fx_45_main);
-FX_MAIN(fx_46_main);
-FX_MAIN(fx_47_main);
-FX_MAIN(fx_48_main);
-FX_MAIN(fx_49_main);
-FX_MAIN(fx_50_main);
-FX_MAIN(fx_51_main);
-FX_MAIN(fx_52_main);
-FX_MAIN(fx_53_main);
-FX_MAIN(fx_54_main);
-FX_MAIN(fx_55_main);
-FX_MAIN(fx_56_main);
-FX_MAIN(fx_57_main);
-FX_MAIN(fx_58_main);
-FX_MAIN(fx_59_main);
-FX_MAIN(fx_60_main);
-FX_MAIN(fx_61_main);
-FX_MAIN(fx_62_main);
-FX_MAIN(fx_63_main);
-FX_MAIN(fx_64_main);
-FX_MAIN(fx_65_main);
-FX_MAIN(fx_66_main);
-FX_MAIN(fx_67_main);
-FX_MAIN(fx_68_main);
-FX_MAIN(fx_69_main);
-FX_MAIN(fx_70_main);
-FX_MAIN(fx_71_main);
-FX_MAIN(fx_72_main);
-FX_MAIN(fx_73_main);
-FX_MAIN(fx_74_main);
-FX_MAIN(fx_75_main);
-FX_MAIN(fx_76_main);
-FX_MAIN(fx_77_main);
-FX_MAIN(fx_78_main);
-FX_MAIN(fx_79_main);
-FX_MAIN(fx_80_main);
-FX_MAIN(fx_81_main);
-FX_MAIN(fx_82_main);
-FX_MAIN(fx_83_main);
-FX_MAIN(fx_84_main);
-FX_MAIN(fx_85_main);
-FX_MAIN(fx_86_main);
-FX_MAIN(fx_87_main);
-FX_MAIN(fx_88_main);
-FX_MAIN(fx_89_main);
-FX_MAIN(fx_90_main);
-FX_MAIN(fx_91_main);
-FX_MAIN(fx_92_main);
-FX_MAIN(fx_93_main);
-FX_MAIN(fx_94_main);
-FX_MAIN(fx_95_main);
-FX_MAIN(fx_96_main);
-FX_MAIN(fx_97_main);
-FX_MAIN(fx_98_main);
-FX_MAIN(fx_99_main);
-FX_MAIN(fx_100_main);
-FX_MAIN(fx_101_main);
-FX_MAIN(fx_102_main);
-FX_MAIN(fx_103_main);
-FX_MAIN(fx_104_main);
-FX_MAIN(fx_105_main);
-FX_MAIN(fx_107_main);
-FX_MAIN(fx_108_main);
-FX_MAIN(fx_109_main);
-FX_MAIN(fx_110_main);
-FX_MAIN(fx_111_main);
-FX_MAIN(fx_112_main);
-FX_MAIN(fx_113_main);
-FX_MAIN(fx_114_main);
-FX_MAIN(fx_115_main);
-FX_MAIN(fx_116_main);
-FX_MAIN(fx_117_main);
-FX_MAIN(fx_119_main);
-FX_MAIN(fx_120_main);
-FX_MAIN(fx_121_main);
-FX_MAIN(fx_122_main);
-FX_MAIN(fx_123_main);
-FX_MAIN(fx_124_main);
-FX_MAIN(fx_125_main);
-FX_MAIN(fx_126_main);
-FX_MAIN(fx_127_main);
-FX_MAIN(fx_128_main);
-FX_MAIN(fx_129_main);
-FX_MAIN(fx_130_main);
-FX_MAIN(fx_131_main);
-FX_MAIN(fx_132_main);
-FX_MAIN(fx_133_main);
-FX_MAIN(fx_134_main);
+#define FX_ENTRY(name, gfx_name) { \
+    name##_main, effect_##name##_ROM_START, effect_##name##_ROM_END, effect_##name##_VRAM, gfx_name##_ROM_START, \
+    gfx_name##_ROM_END \
+}
+
+// TODO remove once everyone is named
+#define FX_ENTRY_NUMBERED(name, gfx_name) { \
+    fx_##name##_main, effect_effect_##name##_ROM_START, effect_effect_##name##_ROM_END, effect_effect_##name##_VRAM, \
+    gfx_name##_ROM_START, gfx_name##_ROM_END \
+} \
 
 EffectTableEntry gEffectTable[] = {
     /* 0x00 */ {},
-    /* 0x01 */ FX_ENTRY(1, _326410),
+    /* 0x01 */ FX_ENTRY(big_smoke_puff, _326410),
     /* 0x02 */ {},
     /* 0x03 */ {},
     /* 0x04 */ {},
     /* 0x05 */ {},
-    /* 0x06 */ FX_ENTRY(6, _328EA0),
-    /* 0x07 */ FX_ENTRY(7, _328EA0),
-    /* 0x08 */ FX_ENTRY(8, _32CEC0),
-    /* 0x09 */ FX_ENTRY(9, _32CEC0),
-    /* 0x0A */ FX_ENTRY(10, _32EC50),
-    /* 0x0B */ FX_ENTRY(11, _32EC50),
-    /* 0x0C */ FX_ENTRY(12, _32FB50),
-    /* 0x0D */ FX_ENTRY(13, _330460),
-    /* 0x0E */ FX_ENTRY(14, _330F00),
-    /* 0x0F */ FX_ENTRY(15, _3326A0),
-    /* 0x10 */ FX_ENTRY(16, _334C70),
-    /* 0x11 */ FX_ENTRY(17, _337FC0),
-    /* 0x12 */ FX_ENTRY(18, _339F60),
-    /* 0x13 */ FX_ENTRY(19, _33BBD0),
-    /* 0x14 */ FX_ENTRY(20, _33D610),
-    /* 0x15 */ FX_ENTRY(21, _33F000),
-    /* 0x16 */ FX_ENTRY(22, _340880),
-    /* 0x17 */ FX_ENTRY(23, _328EA0),
-    /* 0x18 */ FX_ENTRY(24, _343040),
-    /* 0x19 */ FX_ENTRY(25, _343F70),
-    /* 0x1A */ FX_ENTRY(26, _3451E0),
-    /* 0x1B */ FX_ENTRY(27, _345B40),
-    /* 0x1C */ FX_ENTRY(28, _34E770),
-    /* 0x1D */ FX_ENTRY(29, _328EA0),
-    /* 0x1E */ FX_ENTRY(30, _350220),
-    /* 0x1F */ FX_ENTRY(31, _352CE0),
-    /* 0x20 */ FX_ENTRY(32, _353BB0),
-    /* 0x21 */ FX_ENTRY(33, _343040),
-    /* 0x22 */ FX_ENTRY(34, _337FC0),
-    /* 0x23 */ FX_ENTRY(35, _356530),
-    /* 0x24 */ FX_ENTRY(36, _3573A0),
-    /* 0x25 */ FX_ENTRY(37, _3593B0),
-    /* 0x26 */ FX_ENTRY(38, _35A5E0),
-    /* 0x27 */ FX_ENTRY(39, _328EA0),
-    /* 0x28 */ FX_ENTRY(40, _35C550),
-    /* 0x29 */ FX_ENTRY(41, _35D510),
+    /* 0x06 */ FX_ENTRY(landing_dust, _328EA0),
+    /* 0x07 */ FX_ENTRY(walking_dust, _328EA0),
+    /* 0x08 */ FX_ENTRY(flower_splash, _32CEC0),
+    /* 0x09 */ FX_ENTRY(flower_trail, _32CEC0),
+    /* 0x0A */ FX_ENTRY(cloud_puff, _32EC50),
+    /* 0x0B */ FX_ENTRY(cloud_trail, _32EC50),
+    /* 0x0C */ FX_ENTRY(footprint, _32FB50),
+    /* 0x0D */ FX_ENTRY(floating_flower, _330460),
+    /* 0x0E */ FX_ENTRY(snowflake, _330F00),
+    /* 0x0F */ FX_ENTRY(star, _3326A0),
+    /* 0x10 */ FX_ENTRY(emote, _334C70),
+    /* 0x11 */ FX_ENTRY(sparkles, _337FC0),
+    /* 0x12 */ FX_ENTRY(shape_spell, _339F60),
+    /* 0x13 */ FX_ENTRY(gather_energy_pink, _33BBD0),
+    /* 0x14 */ FX_ENTRY(drop_leaves, _33D610),
+    /* 0x15 */ FX_ENTRY(dust, _33F000),
+    /* 0x16 */ FX_ENTRY(shattering_stones, _340880),
+    /* 0x17 */ FX_ENTRY(smoke_ring, _328EA0),
+    /* 0x18 */ FX_ENTRY(damage_stars, _343040),
+    /* 0x19 */ FX_ENTRY(explosion, _343F70),
+    /* 0x1A */ FX_ENTRY(lens_flare, _3451E0),
+    /* 0x1B */ FX_ENTRY(got_item_outline, _345B40),
+    /* 0x1C */ FX_ENTRY(spiky_white_aura, _34E770),
+    /* 0x1D */ FX_ENTRY(smoke_impact, _328EA0),
+    /* 0x1E */ FX_ENTRY(damage_indicator, _350220),
+    /* 0x1F */ FX_ENTRY(purple_ring, _352CE0),
+    /* 0x20 */ FX_ENTRY(flame, _353BB0),
+    /* 0x21 */ FX_ENTRY(stars_burst, _343040),
+    /* 0x22 */ FX_ENTRY(stars_shimmer, _337FC0),
+    /* 0x23 */ FX_ENTRY(rising_bubble, _356530),
+    /* 0x24 */ FX_ENTRY(ring_blast, _3573A0),
+    /* 0x25 */ FX_ENTRY(shockwave, _3593B0),
+    /* 0x26 */ FX_ENTRY(music_note, _35A5E0),
+    /* 0x27 */ FX_ENTRY(smoke_burst, _328EA0),
+    /* 0x28 */ FX_ENTRY(sweat, _35C550),
+    /* 0x29 */ FX_ENTRY(sleep_bubble, _35D510),
     /* 0x2A */ {},
-    /* 0x2B */ FX_ENTRY(43, _33D610),
-    /* 0x2C */ FX_ENTRY(44, _35F0E0),
-    /* 0x2D */ FX_ENTRY(45, _360A30),
-    /* 0x2E */ FX_ENTRY(46, _361670),
-    /* 0x2F */ FX_ENTRY(47, _362C50),
-    /* 0x30 */ FX_ENTRY(48, _3638C0),
-    /* 0x31 */ FX_ENTRY(49, _364C00),
-    /* 0x32 */ FX_ENTRY(50, _3659B0),
-    /* 0x33 */ FX_ENTRY(51, _366D60),
-    /* 0x34 */ FX_ENTRY(52, _36AEE0),
-    /* 0x35 */ FX_ENTRY(53, _36DF90),
-    /* 0x36 */ FX_ENTRY(54, _36ED60),
-    /* 0x37 */ FX_ENTRY(55, _3733E0),
-    /* 0x38 */ FX_ENTRY(56, _337FC0),
-    /* 0x39 */ FX_ENTRY(57, _375510),
-    /* 0x3A */ FX_ENTRY(58, _337FC0),
-    /* 0x3B */ FX_ENTRY(59, _377F80),
-    /* 0x3C */ FX_ENTRY(60, _37ADD0),
-    /* 0x3D */ FX_ENTRY(61, _37D180),
-    /* 0x3E */ FX_ENTRY(62, _37D9D0),
-    /* 0x3F */ FX_ENTRY(63, _3803A0),
-    /* 0x40 */ FX_ENTRY(64, _381E00),
-    /* 0x41 */ FX_ENTRY(65, _3863B0),
-    /* 0x42 */ FX_ENTRY(66, _37D9D0),
-    /* 0x43 */ FX_ENTRY(67, _38A350),
-    /* 0x44 */ FX_ENTRY(68, _38BBA0),
-    /* 0x45 */ FX_ENTRY(69, _38D070),
-    /* 0x46 */ FX_ENTRY(70, _38E990),
-    /* 0x47 */ FX_ENTRY(71, _38F710),
-    /* 0x48 */ FX_ENTRY(72, _3903D0),
-    /* 0x49 */ FX_ENTRY(73, _392440),
-    /* 0x4A */ FX_ENTRY(74, _3930A0),
-    /* 0x4B */ FX_ENTRY(75, _394670),
-    /* 0x4C */ FX_ENTRY(76, _3960F0),
-    /* 0x4D */ FX_ENTRY(77, _397040),
-    /* 0x4E */ FX_ENTRY(78, _398BC0),
-    /* 0x4F */ FX_ENTRY(79, _3A0D60),
-    /* 0x50 */ FX_ENTRY(80, _3A2440),
-    /* 0x51 */ FX_ENTRY(81, _3A33D0),
-    /* 0x52 */ FX_ENTRY(82, _3A4320),
-    /* 0x53 */ FX_ENTRY(83, _3A5BE0),
-    /* 0x54 */ FX_ENTRY(84, _3A77A0),
-    /* 0x55 */ FX_ENTRY(85, _3AB030),
-    /* 0x56 */ FX_ENTRY(86, _3AF700),
-    /* 0x57 */ FX_ENTRY(87, _3B2D90),
-    /* 0x58 */ FX_ENTRY(88, _3B46A0),
-    /* 0x59 */ FX_ENTRY(89, _3B5340),
-    /* 0x5A */ FX_ENTRY(90, _3B6BF0),
-    /* 0x5B */ FX_ENTRY(91, _3B78D0),
-    /* 0x5C */ FX_ENTRY(92, _3B8860),
-    /* 0x5D */ FX_ENTRY(93, _3B9A70),
-    /* 0x5E */ FX_ENTRY(94, _3BAEA0),
-    /* 0x5F */ FX_ENTRY(95, _3BCA90),
-    /* 0x60 */ FX_ENTRY(96, _3BD9A0),
-    /* 0x61 */ FX_ENTRY(97, _3C1BA0),
-    /* 0x62 */ FX_ENTRY(98, _3CB890),
-    /* 0x63 */ FX_ENTRY(99, _3CD6E0),
-    /* 0x64 */ FX_ENTRY(100, _3CFAF0),
-    /* 0x65 */ FX_ENTRY(101, _3D11E0),
-    /* 0x66 */ FX_ENTRY(102, _3D2580),
-    /* 0x67 */ FX_ENTRY(103, _3D3930),
-    /* 0x68 */ FX_ENTRY(104, _3593B0),
-    /* 0x69 */ FX_ENTRY(105, _3D4E90),
+    /* 0x2B */ FX_ENTRY(windy_leaves, _33D610),
+    /* 0x2C */ FX_ENTRY(falling_leaves, _35F0E0),
+    /* 0x2D */ FX_ENTRY(stars_spread, _360A30),
+    /* 0x2E */ FX_ENTRY(steam_burst, _361670),
+    /* 0x2F */ FX_ENTRY(stars_orbiting, _362C50),
+    /* 0x30 */ FX_ENTRY(big_snowflakes, _3638C0),
+    /* 0x31 */ FX_ENTRY(debuff, _364C00),
+    /* 0x32 */ FX_ENTRY(green_impact, _3659B0),
+    /* 0x33 */ FX_ENTRY(radial_shimmer, _366D60),
+    /* 0x34 */ FX_ENTRY(ending_decals, _36AEE0),
+    /* 0x35 */ FX_ENTRY(light_rays, _36DF90),
+    /* 0x36 */ FX_ENTRY(lightning, _36ED60),
+    /* 0x37 */ FX_ENTRY(fire_breath, _3733E0),
+    /* 0x38 */ FX_ENTRY(shimmer_burst, _337FC0),
+    /* 0x39 */ FX_ENTRY(energy_shockwave, _375510),
+    /* 0x3A */ FX_ENTRY(shimmer_wave, _337FC0),
+    /* 0x3B */ FX_ENTRY(aura, _377F80),
+    /* 0x3C */ FX_ENTRY_NUMBERED(3C, _37ADD0),
+    /* 0x3D */ FX_ENTRY_NUMBERED(3D, _37D180),
+    /* 0x3E */ FX_ENTRY(blast, _37D9D0),
+    /* 0x3F */ FX_ENTRY(fire_flower, _3803A0),
+    /* 0x40 */ FX_ENTRY(recover, _381E00),
+    /* 0x41 */ FX_ENTRY(disable_x, _3863B0),
+    /* 0x42 */ FX_ENTRY(bombette_breaking, _37D9D0),
+    /* 0x43 */ FX_ENTRY(firework, _38A350),
+    /* 0x44 */ FX_ENTRY(confetti, _38BBA0),
+    /* 0x45 */ FX_ENTRY(snowfall, _38D070),
+    /* 0x46 */ FX_ENTRY_NUMBERED(46, _38E990),
+    /* 0x47 */ FX_ENTRY(gather_magic, _38F710),
+    /* 0x48 */ FX_ENTRY(attack_result_text, _3903D0),
+    /* 0x49 */ FX_ENTRY(small_gold_sparkle, _392440),
+    /* 0x4A */ FX_ENTRY(flashing_box_shockwave, _3930A0),
+    /* 0x4B */ FX_ENTRY(balloon, _394670),
+    /* 0x4C */ FX_ENTRY(floating_rock, _3960F0),
+    /* 0x4D */ FX_ENTRY(chomp_drop, _397040),
+    /* 0x4E */ FX_ENTRY(quizmo_stage, _398BC0),
+    /* 0x4F */ FX_ENTRY(radiating_energy_orb, _3A0D60),
+    /* 0x50 */ FX_ENTRY(quizmo_answer, _3A2440),
+    /* 0x51 */ FX_ENTRY(motion_blur_flame, _3A33D0),
+    /* 0x52 */ FX_ENTRY(energy_orb_wave, _3A4320),
+    /* 0x53 */ FX_ENTRY(merlin_house_stars, _3A5BE0),
+    /* 0x54 */ FX_ENTRY(quizmo_audience, _3A77A0),
+    /* 0x55 */ FX_ENTRY(butterflies, _3AB030),
+    /* 0x56 */ FX_ENTRY(stat_change, _3AF700),
+    /* 0x57 */ FX_ENTRY(snaking_static, _3B2D90),
+    /* 0x58 */ FX_ENTRY(thunderbolt_ring, _3B46A0),
+    /* 0x59 */ FX_ENTRY(squirt, _3B5340),
+    /* 0x5A */ FX_ENTRY(water_block, _3B6BF0),
+    /* 0x5B */ FX_ENTRY(waterfall, _3B78D0),
+    /* 0x5C */ FX_ENTRY(water_fountain, _3B8860),
+    /* 0x5D */ FX_ENTRY(underwater, _3B9A70),
+    /* 0x5E */ FX_ENTRY(lightning_bolt, _3BAEA0),
+    /* 0x5F */ FX_ENTRY(water_splash, _3BCA90),
+    /* 0x60 */ FX_ENTRY(snowman_doll, _3BD9A0),
+    /* 0x61 */ FX_ENTRY(fright_jar, _3C1BA0),
+    /* 0x62 */ FX_ENTRY(stop_watch, _3CB890),
+    /* 0x63 */ FX_ENTRY_NUMBERED(63, _3CD6E0),
+    /* 0x64 */ FX_ENTRY(throw_spiny, _3CFAF0),
+    /* 0x65 */ FX_ENTRY_NUMBERED(65, _3D11E0),
+    /* 0x66 */ FX_ENTRY(tubba_heart_attack, _3D2580),
+    /* 0x67 */ FX_ENTRY(whirlwind, _3D3930),
+    /* 0x68 */ FX_ENTRY(red_impact, _3593B0),
+    /* 0x69 */ FX_ENTRY(floating_cloud_puff, _3D4E90),
     /* 0x6A */ {},
-    /* 0x6B */ FX_ENTRY(107, _3D5F30),
-    /* 0x6C */ FX_ENTRY(108, _3D7040),
-    /* 0x6D */ FX_ENTRY(109, _3D7770),
-    /* 0x6E */ FX_ENTRY(110, _3D80C0),
-    /* 0x6F */ FX_ENTRY(111, _3D9100),
-    /* 0x70 */ FX_ENTRY(112, _3DBF40),
-    /* 0x71 */ FX_ENTRY(113, _3DCD50),
-    /* 0x72 */ FX_ENTRY(114, _3DEE60),
-    /* 0x73 */ FX_ENTRY(115, _3E12D0),
-    /* 0x74 */ FX_ENTRY(116, _3E1CD0),
-    /* 0x75 */ FX_ENTRY(117, _3E2960),
+    /* 0x6B */ FX_ENTRY(energy_in_out, _3D5F30),
+    /* 0x6C */ FX_ENTRY(tattle_window, _3D7040),
+    /* 0x6D */ FX_ENTRY(shiny_flare, _3D7770),
+    /* 0x6E */ FX_ENTRY(huff_puff_breath, _3D80C0),
+    /* 0x6F */ FX_ENTRY(cold_breath, _3D9100),
+    /* 0x70 */ FX_ENTRY(embers, _3DBF40),
+    /* 0x71 */ FX_ENTRY(hieroglyphs, _3DCD50),
+    /* 0x72 */ FX_ENTRY(misc_particles, _3DEE60),
+    /* 0x73 */ FX_ENTRY(static_status, _3E12D0),
+    /* 0x74 */ FX_ENTRY(moving_cloud, _3E1CD0),
+    /* 0x75 */ FX_ENTRY_NUMBERED(75, _3E2960),
     /* 0x76 */ {},
-    /* 0x77 */ FX_ENTRY(119, _3E5350),
-    /* 0x78 */ FX_ENTRY(120, _3E5F30),
-    /* 0x79 */ FX_ENTRY(121, _3EBE60),
-    /* 0x7A */ FX_ENTRY(122, _3F8CC0),
-    /* 0x7B */ FX_ENTRY(123, _3FA4B0),
-    /* 0x7C */ FX_ENTRY(124, _3FF250),
-    /* 0x7D */ FX_ENTRY(125, _3FA4B0),
-    /* 0x7E */ FX_ENTRY(126, _403BF0),
-    /* 0x7F */ FX_ENTRY(127, _404F40),
-    /* 0x80 */ FX_ENTRY(128, _407080),
-    /* 0x81 */ FX_ENTRY(129, _40A1C0),
-    /* 0x82 */ FX_ENTRY(130, _40BBA0),
-    /* 0x83 */ FX_ENTRY(131, _40D290),
-    /* 0x84 */ FX_ENTRY(132, _337FC0),
-    /* 0x85 */ FX_ENTRY(133, _413FA0),
-    /* 0x86 */ FX_ENTRY(134, _415060),
+    /* 0x77 */ FX_ENTRY(firework_rocket, _3E5350),
+    /* 0x78 */ FX_ENTRY(peach_star_beam, _3E5F30),
+    /* 0x79 */ FX_ENTRY(chapter_change, _3EBE60),
+    /* 0x7A */ FX_ENTRY(ice_shard, _3F8CC0),
+    /* 0x7B */ FX_ENTRY(spirit_card, _3FA4B0),
+    /* 0x7C */ FX_ENTRY(lil_oink, _3FF250),
+    /* 0x7D */ FX_ENTRY(something_rotating, _3FA4B0),
+    /* 0x7E */ FX_ENTRY(breaking_junk, _403BF0),
+    /* 0x7F */ FX_ENTRY(partner_buff, _404F40),
+    /* 0x80 */ FX_ENTRY(quizmo_assistant, _407080),
+    /* 0x81 */ FX_ENTRY(ice_pillar, _40A1C0),
+    /* 0x82 */ FX_ENTRY(sun, _40BBA0),
+    /* 0x83 */ FX_ENTRY(star_spirits_energy, _40D290),
+    /* 0x84 */ FX_ENTRY(pink_sparkles, _337FC0),
+    /* 0x85 */ FX_ENTRY(star_outline, _413FA0),
+    /* 0x86 */ FX_ENTRY_NUMBERED(86, _415060),
 };
 
 s32 D_8007FEB8[] = {
diff --git a/src/effects/attack_result_text.c b/src/effects/attack_result_text.c
new file mode 100644
index 0000000000..df25ab2147
--- /dev/null
+++ b/src/effects/attack_result_text.c
@@ -0,0 +1,16 @@
+#include "common.h"
+#include "effects_internal.h"
+
+INCLUDE_ASM(s32, "effects/attack_result_text", attack_result_text_main);
+
+void attack_result_text_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/attack_result_text", attack_result_text_update);
+
+void attack_result_text_render(void) {
+}
+
+INCLUDE_ASM(s32, "effects/attack_result_text", func_E0090428);
+
+INCLUDE_ASM(s32, "effects/attack_result_text", func_E0090444);
diff --git a/src/effects/effect_59.c b/src/effects/aura.c
similarity index 55%
rename from src/effects/effect_59.c
rename to src/effects/aura.c
index cb8d779484..2a4db52c32 100644
--- a/src/effects/effect_59.c
+++ b/src/effects/aura.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_59_appendGfx(void* effect);
+void aura_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_59", fx_59_main);
+INCLUDE_ASM(s32, "effects/aura", aura_main);
 
-void fx_59_init(void) {
+void aura_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_59", fx_59_update);
+INCLUDE_ASM(s32, "effects/aura", aura_update);
 
-void fx_59_render(EffectInstance* effect) {
+void aura_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_59_appendGfx;
+    renderTask.appendGfx = aura_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -29,4 +29,4 @@ void func_E007684C(void) {
 void func_E0076854(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_59", fx_59_appendGfx);
+INCLUDE_ASM(s32, "effects/aura", aura_appendGfx);
diff --git a/src/effects/balloon.c b/src/effects/balloon.c
new file mode 100644
index 0000000000..eacb76c4c3
--- /dev/null
+++ b/src/effects/balloon.c
@@ -0,0 +1,108 @@
+#include "common.h"
+#include "effects_internal.h"
+
+extern Gfx D_09001280[];
+extern Gfx D_09001358[];
+extern Gfx D_09001430[];
+extern Gfx D_09001508[];
+
+Gfx* D_E00963E0[] = { D_09001280, D_09001358, D_09001430 };
+
+void balloon_init(EffectInstance* effect);
+void balloon_update(EffectInstance* effect);
+void balloon_render(EffectInstance* effect);
+void balloon_appendGfx(void* effect);
+
+EffectInstance* balloon_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
+    EffectBlueprint bp;
+    EffectInstance* effect;
+    BalloonFXData* data;
+    BalloonFXData* part;
+    s32 numParts = 1;
+
+    bp.init = balloon_init;
+    bp.update = balloon_update;
+    bp.renderWorld = balloon_render;
+    bp.unk_00 = 0;
+    bp.unk_14 = NULL;
+    bp.effectID = EFFECT_BALLOON;
+
+    effect = shim_create_effect_instance(&bp);
+    effect->numParts = numParts;
+
+    data = shim_general_heap_malloc(numParts * sizeof(*data));
+    effect->data = data;
+    part = data;
+
+    ASSERT(data != NULL);
+
+    part->unk_00 = arg0;
+    part->unk_04 = arg1;
+    part->unk_08 = arg2;
+    part->unk_0C = arg3;
+    part->unk_10 = 0.0f;
+    part->unk_1C = arg5;
+    part->unk_18 = 0.67f;
+    part->unk_20 = 0;
+    part->unk_14 = arg4;
+
+    return effect;
+}
+
+void balloon_init(EffectInstance* effect) {
+}
+
+void balloon_update(EffectInstance* effect) {
+    BalloonFXData* part = (BalloonFXData*)effect->data;
+
+    part->unk_1C--;
+    part->unk_20++;
+
+    if (part->unk_1C < 0) {
+        shim_remove_effect(effect);
+        return;
+    }
+
+    part->unk_10 += part->unk_14;
+    if (part->unk_10 > 2.0f) {
+        part->unk_10 = 2.0f;
+    }
+    part->unk_08 += part->unk_10;
+}
+
+void balloon_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = balloon_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void balloon_appendGfx(void* effect) {
+    Matrix4f sp18;
+    Matrix4f sp58;
+    BalloonFXData* part = ((EffectInstance*)effect)->data;
+    s32 idx = part->unk_00;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
+
+    shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C);
+    shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
+    shim_guMtxCatF(sp58, sp18, sp18);
+    shim_guScaleF(sp58, part->unk_18, part->unk_18, 1.0f);
+    shim_guMtxCatF(sp58, sp18, sp18);
+    shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]);
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    gSPDisplayList(gMasterGfxPos++, D_E00963E0[idx]);
+    gSPDisplayList(gMasterGfxPos++, D_09001508);
+    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+    gDPPipeSync(gMasterGfxPos++);
+}
diff --git a/src/effects/effect_1.c b/src/effects/big_smoke_puff.c
similarity index 57%
rename from src/effects/effect_1.c
rename to src/effects/big_smoke_puff.c
index c585edcf28..8db6b4b2e3 100644
--- a/src/effects/effect_1.c
+++ b/src/effects/big_smoke_puff.c
@@ -18,15 +18,15 @@ static Gfx* sDlists[7] = {
     D_09000FA0, D_09001060, D_09001120, D_090011E0, D_090012A0, D_09001360, D_09001420
 };
 
-void fx_1_init(EffectInstance* effect);
-void fx_1_update(EffectInstance* effect);
-void fx_1_render(EffectInstance* effect);
-void fx_1_appendGfx(void* effect);
+void big_smoke_puff_init(EffectInstance* effect);
+void big_smoke_puff_update(EffectInstance* effect);
+void big_smoke_puff_render(EffectInstance* effect);
+void big_smoke_puff_appendGfx(void* effect);
 
-void fx_1_main(f32 x, f32 y, f32 z) {
+void big_smoke_puff_main(f32 x, f32 y, f32 z) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect1* effectData;
+    BigSmokePuffFXData* data;
     f32 theta;
     f32 temp_f20;
     f32 cosTheta;
@@ -35,65 +35,65 @@ void fx_1_main(f32 x, f32 y, f32 z) {
     s32 i;
 
     bp.unk_00 = 0;
-    bp.init = fx_1_init;
-    bp.update = fx_1_update;
-    bp.renderWorld = fx_1_render;
+    bp.init = big_smoke_puff_init;
+    bp.update = big_smoke_puff_update;
+    bp.renderWorld = big_smoke_puff_render;
     bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_01;
+    bp.effectID = EFFECT_BIG_SMOKE_PUFF;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = numParts;
 
-    effectData = shim_general_heap_malloc(effect->numParts * sizeof(Effect1));
-    effect->data = effectData;
+    data = shim_general_heap_malloc(effect->numParts * sizeof(BigSmokePuffFXData));
+    effect->data = data;
 
-    ASSERT(effectData != NULL);
+    ASSERT(data != NULL);
 
-    for (i = 0; i < effect->numParts; i++, effectData++) {
-        effectData->unk_00 = 0;
-        effectData->unk_02 = effectData->unk_04 = func_E0200000(6) + 0x10;
-        effectData->unk_06 = 4;
-        effectData->unk_08 = 0;
-        effectData->x = x;
-        effectData->y = y;
-        effectData->z = z;
-        effectData->partX = 0;
-        effectData->partY = 0;
+    for (i = 0; i < effect->numParts; i++, data++) {
+        data->unk_00 = 0;
+        data->unk_02 = data->unk_04 = func_E0200000(6) + 0x10;
+        data->unk_06 = 4;
+        data->unk_08 = 0;
+        data->x = x;
+        data->y = y;
+        data->z = z;
+        data->partX = 0;
+        data->partY = 0;
 
         theta = D_E0002760[i] + 90.0f;
         temp_f20 = 2.0 * D_E0002788[i];
         sinTheta = shim_sin_deg(theta);
         cosTheta = shim_cos_deg(theta);
 
-        effectData->unk_20 = temp_f20 * sinTheta;
-        effectData->unk_24 = -temp_f20 * cosTheta;
+        data->unk_20 = temp_f20 * sinTheta;
+        data->unk_24 = -temp_f20 * cosTheta;
     }
 }
 
-void fx_1_init(EffectInstance* effect) {
+void big_smoke_puff_init(EffectInstance* effect) {
 }
 
-void fx_1_update(EffectInstance* effect) {
-    Effect1* effectData = effect->data;
+void big_smoke_puff_update(EffectInstance* effect) {
+    BigSmokePuffFXData* data = effect->data;
     s32 cond = FALSE;
     s32 i;
 
-    for (i = 0; i < effect->numParts; i++, effectData++) {
-        if (effectData->unk_02 >= 0) {
-            effectData->unk_08--;
+    for (i = 0; i < effect->numParts; i++, data++) {
+        if (data->unk_02 >= 0) {
+            data->unk_08--;
 
-            if (effectData->unk_08 < 0) {
-                effectData->partX += effectData->unk_20;
-                effectData->partY += effectData->unk_24;
-                effectData->unk_00++;
-                effectData->unk_02--;
+            if (data->unk_08 < 0) {
+                data->partX += data->unk_20;
+                data->partY += data->unk_24;
+                data->unk_00++;
+                data->unk_02--;
                 cond = TRUE;
 
-                if (effectData->unk_02 >= 0) {
-                    effectData->unk_06--;
-                    if (effectData->unk_06 < 0) {
-                        effectData->unk_20 /= 1.25;
-                        effectData->unk_24 /= 1.25;
+                if (data->unk_02 >= 0) {
+                    data->unk_06--;
+                    if (data->unk_06 < 0) {
+                        data->unk_20 /= 1.25;
+                        data->unk_24 /= 1.25;
                     }
                 }
             }
@@ -105,11 +105,11 @@ void fx_1_update(EffectInstance* effect) {
     }
 }
 
-void fx_1_render(EffectInstance* effect) {
+void big_smoke_puff_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_1_appendGfx;
+    renderTask.appendGfx = big_smoke_puff_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -118,25 +118,24 @@ void fx_1_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_1_appendGfx(void* effect) {
+void big_smoke_puff_appendGfx(void* effect) {
     EffectInstance* eff = (EffectInstance*)effect;
-    Effect1* effectData = ((EffectInstance*)effect)->data;
+    BigSmokePuffFXData* data = ((EffectInstance*)effect)->data;
     Matrix4f mtx;
     s32 i;
 
     gDPPipeSync(gMasterGfxPos++);
     gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
 
-    shim_guPositionF(mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, effectData->x, effectData->y,
-                     effectData->z);
+    shim_guPositionF(mtx, 0.0f, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, data->x, data->y, data->z);
     shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]);
 
     gSPMatrix(gMasterGfxPos++,
               &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
 
-    for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, effectData++) {
-        if (effectData->unk_02 >= 0 && effectData->unk_08 < 0) {
-            s32 primAlpha = effectData->unk_02;
+    for (i = 0; i < ((EffectInstance*)effect)->numParts; i++, data++) {
+        if (data->unk_02 >= 0 && data->unk_08 < 0) {
+            s32 primAlpha = data->unk_02;
             f32 temp_f12;
             s32 envAlpha;
             Gfx* dlist;
@@ -145,20 +144,20 @@ void fx_1_appendGfx(void* effect) {
                 primAlpha = 16;
             }
 
-            shim_guPositionF(mtx, 0.0f, 0.0f, sPartYaws[i], sPartScales[i], effectData->partX,
-                             effectData->partY, 0.0f);
+            shim_guPositionF(mtx, 0.0f, 0.0f, sPartYaws[i], sPartScales[i], data->partX,
+                             data->partY, 0.0f);
             shim_guMtxF2L(mtx, &gDisplayContext->matrixStack[gMatrixListPos]);
 
             gSPMatrix(gMasterGfxPos++,
                       &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
 
-            temp_f12 = effectData->unk_00 - 1;
+            temp_f12 = data->unk_00 - 1;
 
-            if (effectData->unk_04 <= temp_f12) {
+            if (data->unk_04 <= temp_f12) {
                 envAlpha = 255;
                 dlist = sDlists[ARRAY_COUNT(sDlists) - 1];
             } else {
-                f32 temp = shim_sin_deg((((temp_f12 * 7.0f) / effectData->unk_04) * 90.0f) / 7.0f) * 7.0f;
+                f32 temp = shim_sin_deg((((temp_f12 * 7.0f) / data->unk_04) * 90.0f) / 7.0f) * 7.0f;
 
                 envAlpha = (s32)(temp * 255.0f) % 256;
                 dlist = sDlists[(s32)temp];
diff --git a/src/effects/big_snowflakes.c b/src/effects/big_snowflakes.c
new file mode 100644
index 0000000000..8ce977eb46
--- /dev/null
+++ b/src/effects/big_snowflakes.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void big_snowflakes_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/big_snowflakes", big_snowflakes_main);
+
+void big_snowflakes_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/big_snowflakes", big_snowflakes_update);
+
+void big_snowflakes_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = big_snowflakes_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/big_snowflakes", big_snowflakes_appendGfx);
diff --git a/src/effects/effect_39.c b/src/effects/blast.c
similarity index 50%
rename from src/effects/effect_39.c
rename to src/effects/blast.c
index c80d6f4c6b..8d46d442a7 100644
--- a/src/effects/effect_39.c
+++ b/src/effects/blast.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_39_appendGfx(void* effect);
+void blast_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_39", fx_39_main);
+INCLUDE_ASM(s32, "effects/blast", blast_main);
 
-void fx_39_init(void) {
+void blast_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_39", fx_39_update);
+INCLUDE_ASM(s32, "effects/blast", blast_update);
 
-void fx_39_render(EffectInstance* effect) {
+void blast_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_39_appendGfx;
+    renderTask.appendGfx = blast_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -23,4 +23,4 @@ void fx_39_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_39", fx_39_appendGfx);
+INCLUDE_ASM(s32, "effects/blast", blast_appendGfx);
diff --git a/src/effects/bombette_breaking.c b/src/effects/bombette_breaking.c
new file mode 100644
index 0000000000..257f7de560
--- /dev/null
+++ b/src/effects/bombette_breaking.c
@@ -0,0 +1,32 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void bombette_breaking_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/bombette_breaking", func_E0084000);
+
+INCLUDE_ASM(s32, "effects/bombette_breaking", func_E008403C);
+
+INCLUDE_ASM(s32, "effects/bombette_breaking", func_E0084060);
+
+INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_main);
+
+void bombette_breaking_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_update);
+
+void bombette_breaking_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = bombette_breaking_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/bombette_breaking", bombette_breaking_appendGfx);
diff --git a/src/effects/breaking_junk.c b/src/effects/breaking_junk.c
new file mode 100644
index 0000000000..3042e8df63
--- /dev/null
+++ b/src/effects/breaking_junk.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void breaking_junk_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_main);
+
+void breaking_junk_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_update);
+
+void breaking_junk_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = breaking_junk_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/breaking_junk", breaking_junk_appendGfx);
diff --git a/src/effects/effect_85.c b/src/effects/butterflies.c
similarity index 66%
rename from src/effects/effect_85.c
rename to src/effects/butterflies.c
index 29fb8aad2d..820805c047 100644
--- a/src/effects/effect_85.c
+++ b/src/effects/butterflies.c
@@ -5,20 +5,20 @@ s32 D_E00AA6C0[] = { 0x090038F8, 0x09003968, 0x090039D8, 0x09003A48, 0x09003AB8,
 
 s8 D_E00AA6EC[] = { 0xFF, 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF9, 0xF8, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0, 0xEF, 0xEE, 0xED, 0xEF, 0xF1, 0xF3, 0xF5, 0xF7, 0xF9, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-void fx_85_appendGfx(void* effect);
+void butterflies_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_85", fx_85_main);
+INCLUDE_ASM(s32, "effects/butterflies", butterflies_main);
 
-void fx_85_init(void) {
+void butterflies_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_85", fx_85_update);
+INCLUDE_ASM(s32, "effects/butterflies", butterflies_update);
 
-void fx_85_render(EffectInstance* effect) {
+void butterflies_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_85_appendGfx;
+    renderTask.appendGfx = butterflies_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -27,4 +27,4 @@ void fx_85_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_85", fx_85_appendGfx);
+INCLUDE_ASM(s32, "effects/butterflies", butterflies_appendGfx);
diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c
new file mode 100644
index 0000000000..a2b757d6a3
--- /dev/null
+++ b/src/effects/chapter_change.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void chapter_change_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/chapter_change", func_E010E000);
+
+INCLUDE_ASM(s32, "effects/chapter_change", chapter_change_main);
+
+void chapter_change_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/chapter_change", chapter_change_update);
+
+void chapter_change_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = chapter_change_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/chapter_change", chapter_change_appendGfx);
diff --git a/src/effects/chomp_drop.c b/src/effects/chomp_drop.c
new file mode 100644
index 0000000000..99c586811a
--- /dev/null
+++ b/src/effects/chomp_drop.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void chomp_drop_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/chomp_drop", chomp_drop_main);
+
+void chomp_drop_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/chomp_drop", chomp_drop_update);
+
+void chomp_drop_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = chomp_drop_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = -10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/chomp_drop", chomp_drop_appendGfx);
diff --git a/src/effects/effect_10.c b/src/effects/cloud_puff.c
similarity index 83%
rename from src/effects/effect_10.c
rename to src/effects/cloud_puff.c
index da6ef8041a..7c9bc7ece0 100644
--- a/src/effects/effect_10.c
+++ b/src/effects/cloud_puff.c
@@ -4,25 +4,25 @@
 extern Gfx D_090000E0[];
 extern Gfx D_090001B8[];
 
-void fx_10_init(EffectInstance* effect);
-void fx_10_update(EffectInstance* effect);
-void fx_10_render(EffectInstance* effect);
-void fx_10_appendGfx(void* effect);
+void cloud_puff_init(EffectInstance* effect);
+void cloud_puff_update(EffectInstance* effect);
+void cloud_puff_render(EffectInstance* effect);
+void cloud_puff_appendGfx(void* effect);
 
-void fx_10_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+void cloud_puff_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     EffectBlueprint bp;
     EffectInstance* effect;
     f32 temp_f20;
-    Effect10* part;
+    CloudPuffFXData* part;
     s32 numParts = 8;
     s32 i;
 
     bp.unk_00 = 0;
-    bp.init = fx_10_init;
-    bp.update = fx_10_update;
-    bp.renderWorld = fx_10_render;
+    bp.init = cloud_puff_init;
+    bp.update = cloud_puff_update;
+    bp.renderWorld = cloud_puff_render;
     bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_0A;
+    bp.effectID = EFFECT_CLOUD_PUFF;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = numParts;
@@ -56,11 +56,11 @@ void fx_10_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     }
 }
 
-void fx_10_init(EffectInstance* effect) {
+void cloud_puff_init(EffectInstance* effect) {
 }
 
-void fx_10_update(EffectInstance* effect) {
-    Effect10* part = (Effect10*)effect->data;
+void cloud_puff_update(EffectInstance* effect) {
+    CloudPuffFXData* part = (CloudPuffFXData*)effect->data;
     s32 cond = FALSE;
     s32 i;
 
@@ -99,11 +99,11 @@ void fx_10_update(EffectInstance* effect) {
     }
 }
 
-void fx_10_render(EffectInstance* effect) {
+void cloud_puff_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_10_appendGfx;
+    renderTask.appendGfx = cloud_puff_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -112,9 +112,9 @@ void fx_10_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_10_appendGfx(void* effect) {
+void cloud_puff_appendGfx(void* effect) {
     EffectInstance* effectTemp = effect;
-    Effect10* part = effectTemp->data;
+    CloudPuffFXData* part = effectTemp->data;
     Matrix4f sp20;
     Matrix4f sp60;
     s32 i;
diff --git a/src/effects/effect_11.c b/src/effects/cloud_trail.c
similarity index 83%
rename from src/effects/effect_11.c
rename to src/effects/cloud_trail.c
index 917831d281..f478dc20ae 100644
--- a/src/effects/effect_11.c
+++ b/src/effects/cloud_trail.c
@@ -4,24 +4,24 @@
 extern Gfx D_090000E0[];
 extern Gfx D_090001B8[];
 
-void fx_11_init(EffectInstance* effect);
-void fx_11_update(EffectInstance* effect);
-void fx_11_render(EffectInstance* effect);
-void fx_11_appendGfx(void* effect);
+void cloud_trail_init(EffectInstance* effect);
+void cloud_trail_update(EffectInstance* effect);
+void cloud_trail_render(EffectInstance* effect);
+void cloud_trail_appendGfx(void* effect);
 
-void fx_11_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+void cloud_trail_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect11* part;
+    CloudTrailFXData* part;
     s32 numParts = 1;
     s32 i;
 
     bp.unk_00 = 0;
-    bp.init = fx_11_init;
-    bp.update = fx_11_update;
-    bp.renderWorld = fx_11_render;
+    bp.init = cloud_trail_init;
+    bp.update = cloud_trail_update;
+    bp.renderWorld = cloud_trail_render;
     bp.unk_14 = 0;
-    bp.effectID = EFFECT_ID_0B;
+    bp.effectID = EFFECT_CLOUD_TRAIL;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = 1;
@@ -56,11 +56,11 @@ void fx_11_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     }
 }
 
-void fx_11_init(EffectInstance* effect) {
+void cloud_trail_init(EffectInstance* effect) {
 }
 
-void fx_11_update(EffectInstance* effect) {
-    Effect11* part = (Effect11*)effect->data;
+void cloud_trail_update(EffectInstance* effect) {
+    CloudTrailFXData* part = (CloudTrailFXData*)effect->data;
     s32 cond = FALSE;
     s32 i;
 
@@ -100,11 +100,11 @@ void fx_11_update(EffectInstance* effect) {
     }
 }
 
-void fx_11_render(EffectInstance* effect) {
+void cloud_trail_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_11_appendGfx;
+    renderTask.appendGfx = cloud_trail_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -113,9 +113,9 @@ void fx_11_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_11_appendGfx(void* effect) {
+void cloud_trail_appendGfx(void* effect) {
     EffectInstance* effectTemp = effect;
-    Effect11* part = effectTemp->data;
+    CloudTrailFXData* part = effectTemp->data;
     Matrix4f sp20;
     Matrix4f sp60;
     s32 i;
diff --git a/src/effects/cold_breath.c b/src/effects/cold_breath.c
new file mode 100644
index 0000000000..df1859f8a1
--- /dev/null
+++ b/src/effects/cold_breath.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void cold_breath_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/cold_breath", cold_breath_main);
+
+void cold_breath_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/cold_breath", cold_breath_update);
+
+void cold_breath_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = cold_breath_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 6;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/cold_breath", cold_breath_appendGfx);
diff --git a/src/effects/confetti.c b/src/effects/confetti.c
new file mode 100644
index 0000000000..ee590f43dd
--- /dev/null
+++ b/src/effects/confetti.c
@@ -0,0 +1,27 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void confetti_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/confetti", func_E0088000);
+
+INCLUDE_ASM(s32, "effects/confetti", confetti_main);
+
+void confetti_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/confetti", confetti_update);
+
+void confetti_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = confetti_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/confetti", confetti_appendGfx);
diff --git a/src/effects/damage_indicator.c b/src/effects/damage_indicator.c
new file mode 100644
index 0000000000..dec547a395
--- /dev/null
+++ b/src/effects/damage_indicator.c
@@ -0,0 +1,16 @@
+#include "common.h"
+#include "effects_internal.h"
+
+INCLUDE_ASM(s32, "effects/damage_indicator", damage_indicator_main);
+
+void damage_indicator_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/damage_indicator", damage_indicator_update);
+
+void damage_indicator_render(void) {
+}
+
+INCLUDE_ASM(s32, "effects/damage_indicator", func_E003C47C);
+
+INCLUDE_ASM(s32, "effects/damage_indicator", func_E003C498);
diff --git a/src/effects/damage_stars.c b/src/effects/damage_stars.c
new file mode 100644
index 0000000000..c9cecc97ea
--- /dev/null
+++ b/src/effects/damage_stars.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void damage_stars_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/damage_stars", damage_stars_main);
+
+void damage_stars_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/damage_stars", damage_stars_update);
+
+void damage_stars_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = damage_stars_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/damage_stars", damage_stars_appendGfx);
diff --git a/src/effects/effect_37.c b/src/effects/debuff.c
similarity index 50%
rename from src/effects/effect_37.c
rename to src/effects/debuff.c
index a52946939d..dfd1acb3e4 100644
--- a/src/effects/effect_37.c
+++ b/src/effects/debuff.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_37_appendGfx(void* effect);
+void debuff_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_37", fx_37_main);
+INCLUDE_ASM(s32, "effects/debuff", debuff_main);
 
-void fx_37_init(void) {
+void debuff_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_37", fx_37_update);
+INCLUDE_ASM(s32, "effects/debuff", debuff_update);
 
-void fx_37_render(EffectInstance* effect) {
+void debuff_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_37_appendGfx;
+    renderTask.appendGfx = debuff_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -23,4 +23,4 @@ void fx_37_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_37", fx_37_appendGfx);
+INCLUDE_ASM(s32, "effects/debuff", debuff_appendGfx);
diff --git a/src/effects/disable_x.c b/src/effects/disable_x.c
new file mode 100644
index 0000000000..9f1f7400d4
--- /dev/null
+++ b/src/effects/disable_x.c
@@ -0,0 +1,22 @@
+#include "common.h"
+#include "effects_internal.h"
+
+INCLUDE_ASM(s32, "effects/disable_x", disable_x_main);
+
+void disable_x_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/disable_x", disable_x_update);
+
+void disable_x_render(void) {
+}
+
+INCLUDE_ASM(s32, "effects/disable_x", func_E0082528);
+
+INCLUDE_ASM(s32, "effects/disable_x", func_E0082580);
+
+INCLUDE_ASM(s32, "effects/disable_x", func_E00826C4);
+
+INCLUDE_ASM(s32, "effects/disable_x", func_E00828B4);
+
+INCLUDE_ASM(s32, "effects/disable_x", func_E0082A84);
diff --git a/src/effects/drop_leaves.c b/src/effects/drop_leaves.c
new file mode 100644
index 0000000000..e58a67da43
--- /dev/null
+++ b/src/effects/drop_leaves.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void drop_leaves_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/drop_leaves", drop_leaves_main);
+
+void drop_leaves_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/drop_leaves", drop_leaves_update);
+
+void drop_leaves_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = drop_leaves_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/drop_leaves", drop_leaves_appendGfx);
diff --git a/src/effects/effect_21.c b/src/effects/dust.c
similarity index 52%
rename from src/effects/effect_21.c
rename to src/effects/dust.c
index 0f700c45b3..e51e726855 100644
--- a/src/effects/effect_21.c
+++ b/src/effects/dust.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_21_appendGfx(void* effect);
+void dust_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_21", fx_21_main);
+INCLUDE_ASM(s32, "effects/dust", dust_main);
 
-void fx_21_init(void) {
+void dust_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_21", fx_21_update);
+INCLUDE_ASM(s32, "effects/dust", dust_update);
 
-void fx_21_render(EffectInstance* effect) {
+void dust_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_21_appendGfx;
+    renderTask.appendGfx = dust_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
@@ -23,4 +23,4 @@ void fx_21_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_21", fx_21_appendGfx);
+INCLUDE_ASM(s32, "effects/dust", dust_appendGfx);
diff --git a/src/effects/effect_100.c b/src/effects/effect_100.c
deleted file mode 100644
index a063bed5c9..0000000000
--- a/src/effects/effect_100.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_100_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_100", fx_100_main);
-
-void fx_100_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_100", fx_100_update);
-
-void fx_100_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_100_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00C844C(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_100", fx_100_appendGfx);
diff --git a/src/effects/effect_101.c b/src/effects/effect_101.c
deleted file mode 100644
index 0614733b66..0000000000
--- a/src/effects/effect_101.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_101_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_101", fx_101_main);
-
-void fx_101_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_101", fx_101_update);
-
-void fx_101_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_101_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_101", fx_101_appendGfx);
diff --git a/src/effects/effect_102.c b/src/effects/effect_102.c
deleted file mode 100644
index 695fd1133f..0000000000
--- a/src/effects/effect_102.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_102_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_102", fx_102_main);
-
-void fx_102_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_102", fx_102_update);
-
-void fx_102_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_102_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00CC9C8(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_102", fx_102_appendGfx);
diff --git a/src/effects/effect_104.c b/src/effects/effect_104.c
deleted file mode 100644
index 1dd636709c..0000000000
--- a/src/effects/effect_104.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_104_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_104", fx_104_main);
-
-void fx_104_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_104", fx_104_update);
-
-void fx_104_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_104_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_104", fx_104_appendGfx);
diff --git a/src/effects/effect_105.c b/src/effects/effect_105.c
deleted file mode 100644
index f1a298aa51..0000000000
--- a/src/effects/effect_105.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_105_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_105", fx_105_main);
-
-void fx_105_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_105", fx_105_update);
-
-void fx_105_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_105_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00D227C(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_105", fx_105_appendGfx);
diff --git a/src/effects/effect_107.c b/src/effects/effect_107.c
deleted file mode 100644
index a9fe6c0dd6..0000000000
--- a/src/effects/effect_107.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_107_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_107", fx_107_main);
-
-void fx_107_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_107", fx_107_update);
-
-void fx_107_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_107_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-void func_E00D6978(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_107", fx_107_appendGfx);
diff --git a/src/effects/effect_109.c b/src/effects/effect_109.c
deleted file mode 100644
index d44318326c..0000000000
--- a/src/effects/effect_109.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_109_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_109", fx_109_main);
-
-void fx_109_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_109", fx_109_update);
-
-void fx_109_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_109_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00DA228(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_109", fx_109_appendGfx);
diff --git a/src/effects/effect_110.c b/src/effects/effect_110.c
deleted file mode 100644
index b834e8e025..0000000000
--- a/src/effects/effect_110.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_110_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_110", fx_110_main);
-
-void fx_110_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_110", fx_110_update);
-
-void fx_110_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_110_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-void func_E00DC2FC(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_110", fx_110_appendGfx);
diff --git a/src/effects/effect_111.c b/src/effects/effect_111.c
deleted file mode 100644
index 88ec83e0ee..0000000000
--- a/src/effects/effect_111.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_111_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_111", fx_111_main);
-
-void fx_111_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_111", fx_111_update);
-
-void fx_111_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_111_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 6;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_111", fx_111_appendGfx);
diff --git a/src/effects/effect_113.c b/src/effects/effect_113.c
deleted file mode 100644
index 51e497165b..0000000000
--- a/src/effects/effect_113.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_113_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_113", fx_113_main);
-
-void fx_113_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_113", fx_113_update);
-
-void fx_113_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_113_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00E2210(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_113", fx_113_appendGfx);
diff --git a/src/effects/effect_114.c b/src/effects/effect_114.c
deleted file mode 100644
index f7b009ed9d..0000000000
--- a/src/effects/effect_114.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_114_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_114", fx_114_main);
-
-void fx_114_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_114", fx_114_update);
-
-void fx_114_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_114_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 7;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00E4954(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_114", fx_114_appendGfx);
diff --git a/src/effects/effect_115.c b/src/effects/effect_115.c
deleted file mode 100644
index 243c42d28b..0000000000
--- a/src/effects/effect_115.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_115_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_115", fx_115_main);
-
-void fx_115_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_115", fx_115_update);
-
-void fx_115_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_115_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00E651C(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_115", fx_115_appendGfx);
diff --git a/src/effects/effect_116.c b/src/effects/effect_116.c
deleted file mode 100644
index 7d3586b358..0000000000
--- a/src/effects/effect_116.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_116_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_116", fx_116_main);
-
-void fx_116_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_116", fx_116_update);
-
-void fx_116_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_116_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_116", fx_116_appendGfx);
diff --git a/src/effects/effect_117.c b/src/effects/effect_117.c
deleted file mode 100644
index fa83e9a058..0000000000
--- a/src/effects/effect_117.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-typedef struct Effect117 {
-    /* 0x00 */ s32 unk_00;
-    /* 0x04 */ f32 unk_04;
-    /* 0x08 */ f32 unk_08;
-    /* 0x0C */ f32 unk_0C;
-} Effect117; // size = 0x??
-
-void fx_117_appendGfx(void* effect);
-
-s32 D_E00EAA50[2] = { 0x09001A00, 0x09001A20 };
-
-s32 D_E00EAA58[2] = { 0x09001910, 0x00000000 };
-
-INCLUDE_ASM(s32, "effects/effect_117", fx_117_main);
-
-void fx_117_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_117", fx_117_update);
-
-void fx_117_render(EffectInstance* effect) {
-    Effect117* effect117 = effect->data;
-    RenderTask renderTask;
-    RenderTask* renderTaskPtr = &renderTask;
-    RenderTask* retTask;
-    s32 outDist;
-    f32 outX;
-    f32 outY;
-    f32 outZ;
-    f32 outS;
-
-    shim_transform_point(gCameras[gCurrentCameraID].perspectiveMatrix[0], effect117->unk_04, effect117->unk_08, effect117->unk_0C, 1.0f, &outX, &outY, &outZ, &outS);
-    
-    outDist = outZ + 5000;
-    if (outDist < 0) {
-        outDist = 0;
-    } else if (outDist > 10000) {
-        outDist = 10000;
-    }
-
-    if (outS < 0.01 && -0.01 < outS) {
-        outDist = 0;
-    }
-    
-    renderTaskPtr->appendGfx = fx_117_appendGfx;
-    renderTaskPtr->distance = -outDist;
-    renderTaskPtr->appendGfxArg = effect;
-    renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
-
-    retTask = shim_queue_render_task(renderTaskPtr);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00EA664(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_117", fx_117_appendGfx);
diff --git a/src/effects/effect_119.c b/src/effects/effect_119.c
deleted file mode 100644
index 1a3abbb655..0000000000
--- a/src/effects/effect_119.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_119_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_119", fx_119_main);
-
-void fx_119_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_119", fx_119_update);
-
-void fx_119_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_119_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 700;
-    renderTask.renderMode =  RENDER_MODE_SURFACE_OPA;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_119", fx_119_appendGfx);
diff --git a/src/effects/effect_120.c b/src/effects/effect_120.c
deleted file mode 100644
index 207065034d..0000000000
--- a/src/effects/effect_120.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_120_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_120", fx_120_main);
-
-void fx_120_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_120", fx_120_update);
-
-void fx_120_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_120_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_120", fx_120_appendGfx);
diff --git a/src/effects/effect_121.c b/src/effects/effect_121.c
deleted file mode 100644
index 5a7e31baae..0000000000
--- a/src/effects/effect_121.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_121_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_121", func_E010E000);
-
-INCLUDE_ASM(s32, "effects/effect_121", fx_121_main);
-
-void fx_121_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_121", fx_121_update);
-
-void fx_121_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_121_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_121", fx_121_appendGfx);
diff --git a/src/effects/effect_122.c b/src/effects/effect_122.c
deleted file mode 100644
index 8af95f0d5d..0000000000
--- a/src/effects/effect_122.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_122_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_122", fx_122_main);
-
-void fx_122_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_122", fx_122_update);
-
-void fx_122_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_122_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_122", fx_122_appendGfx);
diff --git a/src/effects/effect_123.c b/src/effects/effect_123.c
deleted file mode 100644
index fae939f977..0000000000
--- a/src/effects/effect_123.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_123_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_123", fx_123_main);
-
-void fx_123_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_123", fx_123_update);
-
-void fx_123_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_123_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_123", func_E0112330);
-
-INCLUDE_ASM(s32, "effects/effect_123", fx_123_appendGfx);
diff --git a/src/effects/effect_124.c b/src/effects/effect_124.c
deleted file mode 100644
index 5c3d6db666..0000000000
--- a/src/effects/effect_124.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_124_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_124", fx_124_main);
-
-void fx_124_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_124", fx_124_update);
-
-void fx_124_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_124_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_124", fx_124_appendGfx);
diff --git a/src/effects/effect_125.c b/src/effects/effect_125.c
deleted file mode 100644
index fdcf2c7d62..0000000000
--- a/src/effects/effect_125.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_125_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_125", fx_125_main);
-
-void fx_125_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_125", fx_125_update);
-
-void fx_125_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_125_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_125", func_E01166E8);
-
-INCLUDE_ASM(s32, "effects/effect_125", fx_125_appendGfx);
diff --git a/src/effects/effect_126.c b/src/effects/effect_126.c
deleted file mode 100644
index 86edd33397..0000000000
--- a/src/effects/effect_126.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_126_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_126", fx_126_main);
-
-void fx_126_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_126", fx_126_update);
-
-void fx_126_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_126_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_126", fx_126_appendGfx);
diff --git a/src/effects/effect_128.c b/src/effects/effect_128.c
deleted file mode 100644
index aea20fe072..0000000000
--- a/src/effects/effect_128.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_128_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_128", fx_128_main);
-
-void fx_128_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_128", fx_128_update);
-
-void fx_128_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_128_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_128", fx_128_appendGfx);
diff --git a/src/effects/effect_129.c b/src/effects/effect_129.c
deleted file mode 100644
index 4c23c67430..0000000000
--- a/src/effects/effect_129.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_129_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_129", fx_129_main);
-
-void fx_129_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_129", fx_129_update);
-
-void fx_129_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_129_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 5;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_129", fx_129_appendGfx);
diff --git a/src/effects/effect_130.c b/src/effects/effect_130.c
deleted file mode 100644
index 49ef832413..0000000000
--- a/src/effects/effect_130.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_130_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_130", fx_130_main);
-
-void fx_130_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_130", fx_130_update);
-
-void fx_130_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_130_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_130", fx_130_appendGfx);
diff --git a/src/effects/effect_131.c b/src/effects/effect_131.c
deleted file mode 100644
index a72328f749..0000000000
--- a/src/effects/effect_131.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_131_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_131", fx_131_main);
-
-void fx_131_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_131", fx_131_update);
-
-void fx_131_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_131_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_131", fx_131_appendGfx);
diff --git a/src/effects/effect_132.c b/src/effects/effect_132.c
deleted file mode 100644
index cc74f342ab..0000000000
--- a/src/effects/effect_132.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_132_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_132", fx_132_main);
-
-void fx_132_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_132", fx_132_update);
-
-void fx_132_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_132_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_132", fx_132_appendGfx);
diff --git a/src/effects/effect_133.c b/src/effects/effect_133.c
deleted file mode 100644
index 41e982369c..0000000000
--- a/src/effects/effect_133.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_133_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_133", fx_133_main);
-
-void fx_133_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_133", fx_133_update);
-
-void fx_133_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_133_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_133", fx_133_appendGfx);
diff --git a/src/effects/effect_134.c b/src/effects/effect_134.c
deleted file mode 100644
index c13b85ce9f..0000000000
--- a/src/effects/effect_134.c
+++ /dev/null
@@ -1,132 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-extern Gfx D_09000800[];
-extern Gfx D_09000BA8[];
-extern Gfx D_09000BC8[];
-extern Gfx D_09000BE8[];
-extern Gfx D_09000C08[];
-extern Gfx D_09000C28[];
-extern Gfx D_09000C48[];
-extern Gfx D_09000C68[];
-extern Gfx D_09000C88[];
-extern Gfx D_09000CA8[];
-extern Gfx D_09000CC8[];
-extern Gfx D_09000CE8[];
-extern Gfx D_09000D08[];
-
-Gfx* D_E0128480[12] = {
-    D_09000BA8, D_09000BC8, D_09000BE8, D_09000C08, D_09000C28, D_09000C48, D_09000C68, D_09000C88, D_09000CA8,
-    D_09000CC8, D_09000CE8, D_09000D08
-};
-
-Gfx* D_E01284B0[] = { D_09000800 };
-
-void fx_134_init(EffectInstance* effect);
-void fx_134_update(EffectInstance* effect);
-void fx_134_render(EffectInstance* effect);
-void fx_134_appendGfx(void* effect);
-
-EffectInstance* fx_134_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
-    EffectBlueprint bp;
-    EffectInstance* effect;
-    Effect134* data;
-    Effect134* part;
-    s32 numParts = 1;
-
-    bp.init = fx_134_init;
-    bp.update = fx_134_update;
-    bp.renderWorld = fx_134_render;
-    bp.unk_00 = 0;
-    bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_86;
-
-    effect = shim_create_effect_instance(&bp);
-    effect->numParts = numParts;
-
-    data = shim_general_heap_malloc(numParts * sizeof(*data));
-    effect->data = data;
-    part = data;
-
-    ASSERT(data != NULL);
-
-    part->unk_00 = arg0;
-    part->unk_14 = 0;
-    if (arg5 <= 0) {
-        part->unk_10 = 1000;
-    } else {
-        part->unk_10 = arg5;
-    }
-    part->unk_24 = 255;
-    part->unk_04 = arg1;
-    part->unk_08 = arg2;
-    part->unk_0C = arg3;
-    part->unk_34 = arg4;
-    part->unk_18 = 70;
-    part->unk_1C = 180;
-    part->unk_20 = 120;
-    part->unk_28 = 20;
-    part->unk_2C = 230;
-    part->unk_30 = 50;
-
-    return effect;
-}
-
-void fx_134_init(EffectInstance* effect) {
-}
-
-void fx_134_update(EffectInstance* effect) {
-    Effect134* data = effect->data;
-
-    if (effect->flags & 0x10) {
-        effect->flags &= ~0x10;
-        data->unk_10 = 0x10;
-    }
-
-    if (data->unk_10 < 1000) {
-        data->unk_10--;
-    }
-
-    data->unk_14++;
-    if (data->unk_10 < 0) {
-        shim_remove_effect(effect);
-    }
-}
-
-void fx_134_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_134_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void fx_134_appendGfx(void* effect) {
-    Matrix4f sp10;
-    Matrix4f sp50;
-    Effect134* part = ((EffectInstance*)effect)->data;
-    Camera* camera = &gCameras[gCurrentCameraID];
-    s32 primAlpha = part->unk_24;
-    s32 dlistIdx = part->unk_00;
-
-    gDPPipeSync(gMasterGfxPos++);
-    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
-
-    shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C);
-    shim_guScaleF(sp50, part->unk_34, part->unk_34, part->unk_34);
-    shim_guMtxCatF(sp50, sp10, sp10);
-    shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]);
-
-    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-    gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, primAlpha);
-    gDPSetEnvColor(gMasterGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0);
-    gSPDisplayList(gMasterGfxPos++, D_E01284B0[0]);
-    gSPDisplayList(gMasterGfxPos++, D_E0128480[dlistIdx % ARRAY_COUNT(D_E0128480)]);
-    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
-}
diff --git a/src/effects/effect_17.c b/src/effects/effect_17.c
deleted file mode 100644
index 402e716ea7..0000000000
--- a/src/effects/effect_17.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_17_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_17", fx_17_main);
-
-void fx_17_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_17", fx_17_update);
-
-void fx_17_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_17_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_17", fx_17_appendGfx);
diff --git a/src/effects/effect_18.c b/src/effects/effect_18.c
deleted file mode 100644
index 25b7ff0d78..0000000000
--- a/src/effects/effect_18.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_18_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_18", fx_18_main);
-
-void fx_18_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_18", fx_18_update);
-
-void fx_18_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_18_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_18", func_E0024324);
-
-INCLUDE_ASM(s32, "effects/effect_18", func_E00243BC);
-
-INCLUDE_ASM(s32, "effects/effect_18", fx_18_appendGfx);
diff --git a/src/effects/effect_19.c b/src/effects/effect_19.c
deleted file mode 100644
index f1dcd29fec..0000000000
--- a/src/effects/effect_19.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_19_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_19", fx_19_main);
-
-void fx_19_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_19", fx_19_update);
-
-void fx_19_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_19_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_19", fx_19_appendGfx);
diff --git a/src/effects/effect_20.c b/src/effects/effect_20.c
deleted file mode 100644
index 5bb0d03a74..0000000000
--- a/src/effects/effect_20.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_20_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_20", fx_20_main);
-
-void fx_20_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_20", fx_20_update);
-
-void fx_20_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_20_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_20", fx_20_appendGfx);
diff --git a/src/effects/effect_23.c b/src/effects/effect_23.c
deleted file mode 100644
index 93d2383889..0000000000
--- a/src/effects/effect_23.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_23_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_23", fx_23_main);
-
-void fx_23_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_23", fx_23_update);
-
-void fx_23_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_23_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_23", fx_23_appendGfx);
diff --git a/src/effects/effect_24.c b/src/effects/effect_24.c
deleted file mode 100644
index 4ae275832b..0000000000
--- a/src/effects/effect_24.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_24_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_24", fx_24_main);
-
-void fx_24_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_24", fx_24_update);
-
-void fx_24_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_24_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_24", fx_24_appendGfx);
diff --git a/src/effects/effect_25.c b/src/effects/effect_25.c
deleted file mode 100644
index c8e2894b08..0000000000
--- a/src/effects/effect_25.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_25_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_25", fx_25_main);
-
-void fx_25_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_25", fx_25_update);
-
-void fx_25_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_25_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_25", fx_25_appendGfx);
diff --git a/src/effects/effect_26.c b/src/effects/effect_26.c
deleted file mode 100644
index d5bc904d9b..0000000000
--- a/src/effects/effect_26.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_26_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_26", fx_26_main);
-
-void fx_26_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_26", fx_26_update);
-
-void fx_26_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_26_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 20;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_26", fx_26_appendGfx);
diff --git a/src/effects/effect_27.c b/src/effects/effect_27.c
deleted file mode 100644
index 1e20dfcde0..0000000000
--- a/src/effects/effect_27.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_27_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_27", fx_27_main);
-
-void fx_27_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_27", fx_27_update);
-
-void fx_27_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_27_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E003621C(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_27", fx_27_appendGfx);
diff --git a/src/effects/effect_28.c b/src/effects/effect_28.c
deleted file mode 100644
index 1b95fef88a..0000000000
--- a/src/effects/effect_28.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_28_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_28", fx_28_main);
-
-void fx_28_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_28", fx_28_update);
-
-void fx_28_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_28_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_28", fx_28_appendGfx);
diff --git a/src/effects/effect_29.c b/src/effects/effect_29.c
deleted file mode 100644
index a79e11a729..0000000000
--- a/src/effects/effect_29.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_29_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_29", fx_29_main);
-
-void fx_29_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_29", fx_29_update);
-
-void fx_29_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_29_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_29", fx_29_appendGfx);
diff --git a/src/effects/effect_30.c b/src/effects/effect_30.c
deleted file mode 100644
index f0e343c50d..0000000000
--- a/src/effects/effect_30.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-INCLUDE_ASM(s32, "effects/effect_30", fx_30_main);
-
-void fx_30_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_30", fx_30_update);
-
-void fx_30_render(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_30", func_E003C47C);
-
-INCLUDE_ASM(s32, "effects/effect_30", func_E003C498);
diff --git a/src/effects/effect_31.c b/src/effects/effect_31.c
deleted file mode 100644
index 2cdfdec29d..0000000000
--- a/src/effects/effect_31.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_31_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_31", fx_31_main);
-
-void fx_31_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_31", fx_31_update);
-
-void fx_31_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_31_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_31", fx_31_appendGfx);
diff --git a/src/effects/effect_33.c b/src/effects/effect_33.c
deleted file mode 100644
index c66bb8fdcb..0000000000
--- a/src/effects/effect_33.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_33_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_33", fx_33_main);
-
-void fx_33_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_33", fx_33_update);
-
-void fx_33_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_33_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_33", fx_33_appendGfx);
diff --git a/src/effects/effect_34.c b/src/effects/effect_34.c
deleted file mode 100644
index 445d3d10ce..0000000000
--- a/src/effects/effect_34.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_34_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_34", fx_34_main);
-
-void fx_34_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_34", fx_34_update);
-
-void fx_34_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_34_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_34", fx_34_appendGfx);
diff --git a/src/effects/effect_35.c b/src/effects/effect_35.c
deleted file mode 100644
index c53e30e3fa..0000000000
--- a/src/effects/effect_35.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_35_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_35", fx_35_main);
-
-void fx_35_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_35", fx_35_update);
-
-void fx_35_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_35_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_35", fx_35_appendGfx);
diff --git a/src/effects/effect_36.c b/src/effects/effect_36.c
deleted file mode 100644
index 1966f96e7c..0000000000
--- a/src/effects/effect_36.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_36_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_36", fx_36_main);
-
-void fx_36_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_36", fx_36_update);
-
-void fx_36_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_36_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_36", fx_36_appendGfx);
diff --git a/src/effects/effect_38.c b/src/effects/effect_38.c
deleted file mode 100644
index 9edb6efb3b..0000000000
--- a/src/effects/effect_38.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_38_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_38", fx_38_main);
-
-void fx_38_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_38", fx_38_update);
-
-void fx_38_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_38_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_38", fx_38_appendGfx);
diff --git a/src/effects/effect_60.c b/src/effects/effect_3C.c
similarity index 68%
rename from src/effects/effect_60.c
rename to src/effects/effect_3C.c
index dbe4620412..c100a47955 100644
--- a/src/effects/effect_60.c
+++ b/src/effects/effect_3C.c
@@ -5,23 +5,23 @@ typedef struct Effect60 {
     /* 0x00 */ s32 unk_00;
 } Effect60; // size = 0x??
 
-void fx_60_appendGfx(void* effect);
+void fx_3C_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_60", fx_60_main);
+INCLUDE_ASM(s32, "effects/effect_3C", fx_3C_main);
 
-void fx_60_init(void) {
+void fx_3C_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_60", fx_60_update);
+INCLUDE_ASM(s32, "effects/effect_3C", fx_3C_update);
 
-void fx_60_render(EffectInstance* effect) {
+void fx_3C_render(EffectInstance* effect) {
     Effect60* effect60 = effect->data;
     RenderTask renderTask;
     RenderTask* renderTaskPtr = &renderTask;
     RenderTask* retTask;
 
     renderTask.appendGfxArg = effect;
-    renderTask.appendGfx = fx_60_appendGfx;
+    renderTask.appendGfx = fx_3C_appendGfx;
     if (effect60->unk_00 == 5) {
         renderTask.distance = 0;
         renderTaskPtr->renderMode = RENDER_MODE_SURFACE_OPA;
@@ -29,7 +29,7 @@ void fx_60_render(EffectInstance* effect) {
         renderTask.distance = -100;
         renderTaskPtr->renderMode = RENDER_MODE_2D;
     }
-    
+
     retTask = shim_queue_render_task(renderTaskPtr);
     retTask->renderMode |= RENDER_MODE_2;
 }
@@ -37,4 +37,4 @@ void fx_60_render(EffectInstance* effect) {
 void func_E0078274(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_60", fx_60_appendGfx);
+INCLUDE_ASM(s32, "effects/effect_3C", fx_3C_appendGfx);
diff --git a/src/effects/effect_61.c b/src/effects/effect_3D.c
similarity index 53%
rename from src/effects/effect_61.c
rename to src/effects/effect_3D.c
index f1558bd856..b3efb46110 100644
--- a/src/effects/effect_61.c
+++ b/src/effects/effect_3D.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_61_appendGfx(void* effect);
+void fx_3D_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_61", fx_61_main);
+INCLUDE_ASM(s32, "effects/effect_3D", fx_3D_main);
 
-void fx_61_init(void) {
+void fx_3D_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_61", fx_61_update);
+INCLUDE_ASM(s32, "effects/effect_3D", fx_3D_update);
 
-void fx_61_render(EffectInstance* effect) {
+void fx_3D_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_61_appendGfx;
+    renderTask.appendGfx = fx_3D_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -26,4 +26,4 @@ void fx_61_render(EffectInstance* effect) {
 void func_E007A884(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_61", fx_61_appendGfx);
+INCLUDE_ASM(s32, "effects/effect_3D", fx_3D_appendGfx);
diff --git a/src/effects/effect_40.c b/src/effects/effect_40.c
deleted file mode 100644
index fe638a400b..0000000000
--- a/src/effects/effect_40.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_40_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_40", fx_40_main);
-
-void fx_40_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_40", fx_40_update);
-
-void fx_40_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_40_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_40", fx_40_appendGfx);
diff --git a/src/effects/effect_41.c b/src/effects/effect_41.c
deleted file mode 100644
index 81651ec0f3..0000000000
--- a/src/effects/effect_41.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_41_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_41", fx_41_main);
-
-void fx_41_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_41", fx_41_update);
-
-void fx_41_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_41_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_41", fx_41_appendGfx);
diff --git a/src/effects/effect_43.c b/src/effects/effect_43.c
deleted file mode 100644
index f288cb6a69..0000000000
--- a/src/effects/effect_43.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_43_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_43", fx_43_main);
-
-void fx_43_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_43", fx_43_update);
-
-void fx_43_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_43_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_43", fx_43_appendGfx);
diff --git a/src/effects/effect_44.c b/src/effects/effect_44.c
deleted file mode 100644
index e5037cd089..0000000000
--- a/src/effects/effect_44.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_44_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_44", fx_44_main);
-
-void fx_44_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_44", fx_44_update);
-
-void fx_44_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_44_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_44", fx_44_appendGfx);
diff --git a/src/effects/effect_45.c b/src/effects/effect_45.c
deleted file mode 100644
index 1edb323f18..0000000000
--- a/src/effects/effect_45.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_45_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_45", fx_45_main);
-
-void fx_45_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_45", fx_45_update);
-
-void fx_45_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_45_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_45", fx_45_appendGfx);
diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c
index 90a7e03623..99f6b88b89 100644
--- a/src/effects/effect_46.c
+++ b/src/effects/effect_46.c
@@ -17,7 +17,7 @@ void fx_46_render(EffectInstance* effect) {
     renderTask.appendGfx = fx_46_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
+    renderTask.renderMode = RENDER_MODE_2D;
 
     retTask = shim_queue_render_task(&renderTask);
     retTask->renderMode |= RENDER_MODE_2;
diff --git a/src/effects/effect_47.c b/src/effects/effect_47.c
deleted file mode 100644
index 25726c9cdf..0000000000
--- a/src/effects/effect_47.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-INCLUDE_ASM(s32, "effects/effect_47", fx_47_main);
-
-void fx_47_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_47", fx_47_update);
-
-void fx_47_render(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_47", func_E005E318);
-
-INCLUDE_ASM(s32, "effects/effect_47", func_E005E334);
diff --git a/src/effects/effect_48.c b/src/effects/effect_48.c
deleted file mode 100644
index 8ec8dba926..0000000000
--- a/src/effects/effect_48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_48_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_48", fx_48_main);
-
-void fx_48_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_48", fx_48_update);
-
-void fx_48_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_48_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_48", fx_48_appendGfx);
diff --git a/src/effects/effect_49.c b/src/effects/effect_49.c
deleted file mode 100644
index 062004fd26..0000000000
--- a/src/effects/effect_49.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_49_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_49", fx_49_main);
-
-void fx_49_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_49", fx_49_update);
-
-void fx_49_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_49_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_49", fx_49_appendGfx);
diff --git a/src/effects/effect_50.c b/src/effects/effect_50.c
deleted file mode 100644
index a4fd2dd132..0000000000
--- a/src/effects/effect_50.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_50_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_50", fx_50_main);
-
-void fx_50_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_50", fx_50_update);
-
-void fx_50_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_50_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_50", fx_50_appendGfx);
diff --git a/src/effects/effect_51.c b/src/effects/effect_51.c
deleted file mode 100644
index c0a555d59c..0000000000
--- a/src/effects/effect_51.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_51_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_51", fx_51_main);
-
-void fx_51_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_51", fx_51_update);
-
-void fx_51_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_51_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_51", fx_51_appendGfx);
diff --git a/src/effects/effect_53.c b/src/effects/effect_53.c
deleted file mode 100644
index 023d977db4..0000000000
--- a/src/effects/effect_53.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_53_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A000);
-
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A0BC);
-
-INCLUDE_ASM(s32, "effects/effect_53", fx_53_main);
-
-void fx_53_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A464);
-
-INCLUDE_ASM(s32, "effects/effect_53", fx_53_update);
-
-void fx_53_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_53_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_53", func_E006A85C);
-
-INCLUDE_ASM(s32, "effects/effect_53", fx_53_appendGfx);
diff --git a/src/effects/effect_54.c b/src/effects/effect_54.c
deleted file mode 100644
index ad023c2457..0000000000
--- a/src/effects/effect_54.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_54_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_54", fx_54_main);
-
-void fx_54_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_54", fx_54_update);
-
-void fx_54_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_54_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_54", fx_54_appendGfx);
diff --git a/src/effects/effect_56.c b/src/effects/effect_56.c
deleted file mode 100644
index d15c2fbd7b..0000000000
--- a/src/effects/effect_56.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_56_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_56", fx_56_main);
-
-void fx_56_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_56", fx_56_update);
-
-void fx_56_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_56_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E0070738(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_56", fx_56_appendGfx);
diff --git a/src/effects/effect_57.c b/src/effects/effect_57.c
deleted file mode 100644
index ada92ab6a8..0000000000
--- a/src/effects/effect_57.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_57_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_57", fx_57_main);
-
-void fx_57_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_57", fx_57_update);
-
-void fx_57_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_57_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_57", fx_57_appendGfx);
diff --git a/src/effects/effect_62.c b/src/effects/effect_62.c
deleted file mode 100644
index aef03b82a1..0000000000
--- a/src/effects/effect_62.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_62_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_62", fx_62_main);
-
-void fx_62_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_62", fx_62_update);
-
-void fx_62_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_62_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_62", fx_62_appendGfx);
diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c
index 869a02d1f0..12650e3f28 100644
--- a/src/effects/effect_63.c
+++ b/src/effects/effect_63.c
@@ -16,7 +16,7 @@ void fx_63_render(EffectInstance* effect) {
 
     renderTask.appendGfx = fx_63_appendGfx;
     renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
+    renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
 
     retTask = shim_queue_render_task(&renderTask);
diff --git a/src/effects/effect_64.c b/src/effects/effect_64.c
deleted file mode 100644
index dcd5e33d28..0000000000
--- a/src/effects/effect_64.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-INCLUDE_ASM(s32, "effects/effect_64", fx_64_main);
-
-void fx_64_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_64", fx_64_update);
-
-void fx_64_render(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_64", func_E008042C);
-
-INCLUDE_ASM(s32, "effects/effect_64", func_E0080448);
diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c
index ee371a6ab3..46a1fe4586 100644
--- a/src/effects/effect_65.c
+++ b/src/effects/effect_65.c
@@ -1,6 +1,8 @@
 #include "common.h"
 #include "effects_internal.h"
 
+void fx_65_appendGfx(void* effect);
+
 INCLUDE_ASM(s32, "effects/effect_65", fx_65_main);
 
 void fx_65_init(void) {
@@ -8,15 +10,17 @@ void fx_65_init(void) {
 
 INCLUDE_ASM(s32, "effects/effect_65", fx_65_update);
 
-void fx_65_render(void) {
+void fx_65_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_65_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_65", func_E0082528);
-
-INCLUDE_ASM(s32, "effects/effect_65", func_E0082580);
-
-INCLUDE_ASM(s32, "effects/effect_65", func_E00826C4);
-
-INCLUDE_ASM(s32, "effects/effect_65", func_E00828B4);
-
-INCLUDE_ASM(s32, "effects/effect_65", func_E0082A84);
+INCLUDE_ASM(s32, "effects/effect_65", fx_65_appendGfx);
diff --git a/src/effects/effect_66.c b/src/effects/effect_66.c
deleted file mode 100644
index 443a8c7dea..0000000000
--- a/src/effects/effect_66.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_66_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_66", func_E0084000);
-
-INCLUDE_ASM(s32, "effects/effect_66", func_E008403C);
-
-INCLUDE_ASM(s32, "effects/effect_66", func_E0084060);
-
-INCLUDE_ASM(s32, "effects/effect_66", fx_66_main);
-
-void fx_66_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_66", fx_66_update);
-
-void fx_66_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_66_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_66", fx_66_appendGfx);
diff --git a/src/effects/effect_67.c b/src/effects/effect_67.c
deleted file mode 100644
index da54b06666..0000000000
--- a/src/effects/effect_67.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-INCLUDE_ASM(s32, "effects/effect_67", fx_67_main);
-
-void fx_67_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_67", fx_67_update);
-
-void fx_67_render(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_67", func_E0086398);
-
-INCLUDE_ASM(s32, "effects/effect_67", func_E00863B4);
diff --git a/src/effects/effect_68.c b/src/effects/effect_68.c
deleted file mode 100644
index 1a523a6f61..0000000000
--- a/src/effects/effect_68.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_68_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_68", func_E0088000);
-
-INCLUDE_ASM(s32, "effects/effect_68", fx_68_main);
-
-void fx_68_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_68", fx_68_update);
-
-void fx_68_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_68_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_68", fx_68_appendGfx);
diff --git a/src/effects/effect_69.c b/src/effects/effect_69.c
deleted file mode 100644
index 5ff56d8d0d..0000000000
--- a/src/effects/effect_69.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_69_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_69", func_E008A000);
-
-INCLUDE_ASM(s32, "effects/effect_69", fx_69_main);
-
-void fx_69_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_69", func_E008A290);
-
-INCLUDE_ASM(s32, "effects/effect_69", fx_69_update);
-
-void fx_69_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_69_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_69", fx_69_appendGfx);
diff --git a/src/effects/effect_70.c b/src/effects/effect_70.c
deleted file mode 100644
index ea9b410804..0000000000
--- a/src/effects/effect_70.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_70_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_70", fx_70_main);
-
-void fx_70_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_70", fx_70_update);
-
-void fx_70_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_70_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_70", fx_70_appendGfx);
diff --git a/src/effects/effect_71.c b/src/effects/effect_71.c
deleted file mode 100644
index 2aafce3f66..0000000000
--- a/src/effects/effect_71.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_71_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_71", fx_71_main);
-
-void fx_71_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_71", fx_71_update);
-
-void fx_71_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_71_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_71", fx_71_appendGfx);
diff --git a/src/effects/effect_72.c b/src/effects/effect_72.c
deleted file mode 100644
index 1a0818e62c..0000000000
--- a/src/effects/effect_72.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-INCLUDE_ASM(s32, "effects/effect_72", fx_72_main);
-
-void fx_72_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_72", fx_72_update);
-
-void fx_72_render(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_72", func_E0090428);
-
-INCLUDE_ASM(s32, "effects/effect_72", func_E0090444);
diff --git a/src/effects/effect_74.c b/src/effects/effect_74.c
deleted file mode 100644
index 68e695153e..0000000000
--- a/src/effects/effect_74.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_74_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_74", fx_74_main);
-
-void fx_74_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_74", fx_74_update);
-
-void fx_74_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_74_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_74", fx_74_appendGfx);
diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c
index 004d5f538c..7042f6b588 100644
--- a/src/effects/effect_75.c
+++ b/src/effects/effect_75.c
@@ -1,108 +1,60 @@
 #include "common.h"
 #include "effects_internal.h"
 
-extern Gfx D_09001280[];
-extern Gfx D_09001358[];
-extern Gfx D_09001430[];
-extern Gfx D_09001508[];
+typedef struct Effect117 {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+} Effect117; // size = 0x??
 
-Gfx* D_E00963E0[] = { D_09001280, D_09001358, D_09001430 };
-
-void fx_75_init(EffectInstance* effect);
-void fx_75_update(EffectInstance* effect);
-void fx_75_render(EffectInstance* effect);
 void fx_75_appendGfx(void* effect);
 
-EffectInstance* fx_75_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
-    EffectBlueprint bp;
-    EffectInstance* effect;
-    Effect75* data;
-    Effect75* part;
-    s32 numParts = 1;
+s32 D_E00EAA50[2] = { 0x09001A00, 0x09001A20 };
 
-    bp.init = fx_75_init;
-    bp.update = fx_75_update;
-    bp.renderWorld = fx_75_render;
-    bp.unk_00 = 0;
-    bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_4B;
+s32 D_E00EAA58[2] = { 0x09001910, 0x00000000 };
 
-    effect = shim_create_effect_instance(&bp);
-    effect->numParts = numParts;
+INCLUDE_ASM(s32, "effects/effect_75", fx_75_main);
 
-    data = shim_general_heap_malloc(numParts * sizeof(*data));
-    effect->data = data;
-    part = data;
-
-    ASSERT(data != NULL);
-
-    part->unk_00 = arg0;
-    part->unk_04 = arg1;
-    part->unk_08 = arg2;
-    part->unk_0C = arg3;
-    part->unk_10 = 0.0f;
-    part->unk_1C = arg5;
-    part->unk_18 = 0.67f;
-    part->unk_20 = 0;
-    part->unk_14 = arg4;
-
-    return effect;
+void fx_75_init(void) {
 }
 
-void fx_75_init(EffectInstance* effect) {
-}
-
-void fx_75_update(EffectInstance* effect) {
-    Effect75* part = (Effect75*)effect->data;
-
-    part->unk_1C--;
-    part->unk_20++;
-
-    if (part->unk_1C < 0) {
-        shim_remove_effect(effect);
-        return;
-    }
-
-    part->unk_10 += part->unk_14;
-    if (part->unk_10 > 2.0f) {
-        part->unk_10 = 2.0f;
-    }
-    part->unk_08 += part->unk_10;
-}
+INCLUDE_ASM(s32, "effects/effect_75", fx_75_update);
 
 void fx_75_render(EffectInstance* effect) {
+    Effect117* effect117 = effect->data;
     RenderTask renderTask;
+    RenderTask* renderTaskPtr = &renderTask;
     RenderTask* retTask;
+    s32 outDist;
+    f32 outX;
+    f32 outY;
+    f32 outZ;
+    f32 outS;
 
-    renderTask.appendGfx = fx_75_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
+    shim_transform_point(gCameras[gCurrentCameraID].perspectiveMatrix[0], effect117->unk_04, effect117->unk_08, effect117->unk_0C, 1.0f, &outX, &outY, &outZ, &outS);
 
-    retTask = shim_queue_render_task(&renderTask);
+    outDist = outZ + 5000;
+    if (outDist < 0) {
+        outDist = 0;
+    } else if (outDist > 10000) {
+        outDist = 10000;
+    }
+
+    if (outS < 0.01 && -0.01 < outS) {
+        outDist = 0;
+    }
+
+    renderTaskPtr->appendGfx = fx_75_appendGfx;
+    renderTaskPtr->distance = -outDist;
+    renderTaskPtr->appendGfxArg = effect;
+    renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(renderTaskPtr);
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_75_appendGfx(void* effect) {
-    Matrix4f sp18;
-    Matrix4f sp58;
-    Effect75* part = ((EffectInstance*)effect)->data;
-    s32 idx = part->unk_00;
-
-    gDPPipeSync(gMasterGfxPos++);
-    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
-
-    shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C);
-    shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
-    shim_guMtxCatF(sp58, sp18, sp18);
-    shim_guScaleF(sp58, part->unk_18, part->unk_18, 1.0f);
-    shim_guMtxCatF(sp58, sp18, sp18);
-    shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]);
-
-    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
-              G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-    gSPDisplayList(gMasterGfxPos++, D_E00963E0[idx]);
-    gSPDisplayList(gMasterGfxPos++, D_09001508);
-    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
-    gDPPipeSync(gMasterGfxPos++);
+void func_E00EA664(void) {
 }
+
+INCLUDE_ASM(s32, "effects/effect_75", fx_75_appendGfx);
diff --git a/src/effects/effect_76.c b/src/effects/effect_76.c
deleted file mode 100644
index a87c9ea14f..0000000000
--- a/src/effects/effect_76.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-typedef struct Effect76 {
-    /* 0x00 */ char unk_00[0xC];
-    /* 0x0C */ f32 unk_0C;
-} Effect76; // size = 0x??
-
-void fx_76_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_76", fx_76_main);
-
-void fx_76_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_76", fx_76_update);
-
-void fx_76_render(EffectInstance *effect) {
-    Effect76* effect76 = effect->data;
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_76_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = effect76->unk_0C;
-    renderTask.renderMode = RENDER_MODE_2D;
-    
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_76", fx_76_appendGfx);
diff --git a/src/effects/effect_77.c b/src/effects/effect_77.c
deleted file mode 100644
index 41fa04acb2..0000000000
--- a/src/effects/effect_77.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_77_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_77", fx_77_main);
-
-void fx_77_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_77", fx_77_update);
-
-void fx_77_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_77_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = -10;
-    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_77", fx_77_appendGfx);
diff --git a/src/effects/effect_78.c b/src/effects/effect_78.c
deleted file mode 100644
index e5a87d9f63..0000000000
--- a/src/effects/effect_78.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_78_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_78", fx_78_main);
-
-void fx_78_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_78", fx_78_update);
-
-void fx_78_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_78_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_78", fx_78_appendGfx);
diff --git a/src/effects/effect_80.c b/src/effects/effect_80.c
deleted file mode 100644
index 9933bc8770..0000000000
--- a/src/effects/effect_80.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-INCLUDE_ASM(s32, "effects/effect_80", fx_80_main);
diff --git a/src/effects/effect_83.c b/src/effects/effect_83.c
deleted file mode 100644
index 8748e5ca8d..0000000000
--- a/src/effects/effect_83.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_83_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_83", fx_83_main);
-
-void fx_83_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_83", fx_83_update);
-
-void fx_83_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_83_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 0;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00A639C(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_83", fx_83_appendGfx);
diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c
index 4c16fb79b9..76c3f7c968 100644
--- a/src/effects/effect_86.c
+++ b/src/effects/effect_86.c
@@ -1,28 +1,132 @@
 #include "common.h"
 #include "effects_internal.h"
 
-s32 D_E00AC7B0[] = { 0x09002700, 0x09002700, 0x09002798 };
+extern Gfx D_09000800[];
+extern Gfx D_09000BA8[];
+extern Gfx D_09000BC8[];
+extern Gfx D_09000BE8[];
+extern Gfx D_09000C08[];
+extern Gfx D_09000C28[];
+extern Gfx D_09000C48[];
+extern Gfx D_09000C68[];
+extern Gfx D_09000C88[];
+extern Gfx D_09000CA8[];
+extern Gfx D_09000CC8[];
+extern Gfx D_09000CE8[];
+extern Gfx D_09000D08[];
 
-s32 D_E00AC7BC[] = { 0x09002860, 0x09002880, 0x09002860 };
+Gfx* D_E0128480[12] = {
+    D_09000BA8, D_09000BC8, D_09000BE8, D_09000C08, D_09000C28, D_09000C48, D_09000C68, D_09000C88, D_09000CA8,
+    D_09000CC8, D_09000CE8, D_09000D08
+};
 
-s32 D_E00AC7C8[] = { 0x09002950, 0x09002990, 0x090029D0, 0x09002A10, 0x09002A50, 0x09002A90, 0x09002AD0, 0x09002B10, 0x09002B50, 0x09002B90, 0x09002BD0, 0x09002C10 };
+Gfx* D_E01284B0[] = { D_09000800 };
 
-s32 D_E00AC7F8[] = { 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000 };
+void fx_86_init(EffectInstance* effect);
+void fx_86_update(EffectInstance* effect);
+void fx_86_render(EffectInstance* effect);
+void fx_86_appendGfx(void* effect);
 
-s32 D_E00AC83C[] = { 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000 };
+EffectInstance* fx_86_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) {
+    EffectBlueprint bp;
+    EffectInstance* effect;
+    Effect134* data;
+    Effect134* part;
+    s32 numParts = 1;
 
-s32 D_E00AC880[] = { 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFE, 0x00000001, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000000, 0x00000000 };
+    bp.init = fx_86_init;
+    bp.update = fx_86_update;
+    bp.renderWorld = fx_86_render;
+    bp.unk_00 = 0;
+    bp.unk_14 = NULL;
+    bp.effectID = EFFECT_86;
 
-INCLUDE_ASM(s32, "effects/effect_86", fx_86_main);
+    effect = shim_create_effect_instance(&bp);
+    effect->numParts = numParts;
 
-void fx_86_init(void) {
+    data = shim_general_heap_malloc(numParts * sizeof(*data));
+    effect->data = data;
+    part = data;
+
+    ASSERT(data != NULL);
+
+    part->unk_00 = arg0;
+    part->unk_14 = 0;
+    if (arg5 <= 0) {
+        part->unk_10 = 1000;
+    } else {
+        part->unk_10 = arg5;
+    }
+    part->unk_24 = 255;
+    part->unk_04 = arg1;
+    part->unk_08 = arg2;
+    part->unk_0C = arg3;
+    part->unk_34 = arg4;
+    part->unk_18 = 70;
+    part->unk_1C = 180;
+    part->unk_20 = 120;
+    part->unk_28 = 20;
+    part->unk_2C = 230;
+    part->unk_30 = 50;
+
+    return effect;
 }
 
-INCLUDE_ASM(s32, "effects/effect_86", fx_86_update);
-
-void fx_86_render(void) {
+void fx_86_init(EffectInstance* effect) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_86", func_E00AC288);
+void fx_86_update(EffectInstance* effect) {
+    Effect134* data = effect->data;
 
-INCLUDE_ASM(s32, "effects/effect_86", func_E00AC2A4);
+    if (effect->flags & 0x10) {
+        effect->flags &= ~0x10;
+        data->unk_10 = 0x10;
+    }
+
+    if (data->unk_10 < 1000) {
+        data->unk_10--;
+    }
+
+    data->unk_14++;
+    if (data->unk_10 < 0) {
+        shim_remove_effect(effect);
+    }
+}
+
+void fx_86_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fx_86_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void fx_86_appendGfx(void* effect) {
+    Matrix4f sp10;
+    Matrix4f sp50;
+    Effect134* part = ((EffectInstance*)effect)->data;
+    Camera* camera = &gCameras[gCurrentCameraID];
+    s32 primAlpha = part->unk_24;
+    s32 dlistIdx = part->unk_00;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
+
+    shim_guTranslateF(sp10, part->unk_04, part->unk_08, part->unk_0C);
+    shim_guScaleF(sp50, part->unk_34, part->unk_34, part->unk_34);
+    shim_guMtxCatF(sp50, sp10, sp10);
+    shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]);
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, primAlpha);
+    gDPSetEnvColor(gMasterGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0);
+    gSPDisplayList(gMasterGfxPos++, D_E01284B0[0]);
+    gSPDisplayList(gMasterGfxPos++, D_E0128480[dlistIdx % ARRAY_COUNT(D_E0128480)]);
+    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+}
diff --git a/src/effects/effect_87.c b/src/effects/effect_87.c
deleted file mode 100644
index 3bfe0b050d..0000000000
--- a/src/effects/effect_87.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_87_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_87", fx_87_main);
-
-void fx_87_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_87", fx_87_update);
-
-void fx_87_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_87_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00AE544(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_87", fx_87_appendGfx);
diff --git a/src/effects/effect_88.c b/src/effects/effect_88.c
deleted file mode 100644
index 278aa0f31c..0000000000
--- a/src/effects/effect_88.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_88_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_88", fx_88_main);
-
-void fx_88_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_88", fx_88_update);
-
-void fx_88_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_88_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-INCLUDE_ASM(s32, "effects/effect_88", fx_88_appendGfx);
diff --git a/src/effects/effect_91.c b/src/effects/effect_91.c
deleted file mode 100644
index 62cd5429b5..0000000000
--- a/src/effects/effect_91.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_91_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_91", fx_91_main);
-
-void fx_91_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_91", fx_91_update);
-
-void fx_91_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_91_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-void func_E00B62D8(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_91", fx_91_appendGfx);
diff --git a/src/effects/effect_93.c b/src/effects/effect_93.c
deleted file mode 100644
index 1de7534bd9..0000000000
--- a/src/effects/effect_93.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_93_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_93", fx_93_main);
-
-void fx_93_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_93", fx_93_update);
-
-void fx_93_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_93_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 100;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-void func_E00BA618(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_93", fx_93_appendGfx);
diff --git a/src/effects/effect_95.c b/src/effects/effect_95.c
deleted file mode 100644
index bdb9916023..0000000000
--- a/src/effects/effect_95.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_95_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_95", fx_95_main);
-
-void fx_95_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_95", fx_95_update);
-
-void fx_95_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_95_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-void func_E00BE5B4(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_95", fx_95_appendGfx);
diff --git a/src/effects/effect_96.c b/src/effects/effect_96.c
deleted file mode 100644
index f1fbbf47ca..0000000000
--- a/src/effects/effect_96.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_96_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_96", fx_96_main);
-
-void fx_96_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_96", fx_96_update);
-
-void fx_96_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_96_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = -10;
-    renderTask.renderMode = RENDER_MODE_28;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-void func_E00C0758(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_96", fx_96_appendGfx);
diff --git a/src/effects/effect_98.c b/src/effects/effect_98.c
deleted file mode 100644
index 258651eec9..0000000000
--- a/src/effects/effect_98.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_98_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_98", fx_98_main);
-
-void fx_98_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_98", fx_98_update);
-
-void fx_98_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_98_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-}
-
-void func_E00C4300(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_98", fx_98_appendGfx);
diff --git a/src/effects/effect_99.c b/src/effects/effect_99.c
deleted file mode 100644
index bb4da5ca30..0000000000
--- a/src/effects/effect_99.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "common.h"
-#include "effects_internal.h"
-
-void fx_99_appendGfx(void* effect);
-
-INCLUDE_ASM(s32, "effects/effect_99", fx_99_main);
-
-void fx_99_init(void) {
-}
-
-INCLUDE_ASM(s32, "effects/effect_99", fx_99_update);
-
-void fx_99_render(EffectInstance* effect) {
-    RenderTask renderTask;
-    RenderTask* retTask;
-
-    renderTask.appendGfx = fx_99_appendGfx;
-    renderTask.appendGfxArg = effect;
-    renderTask.distance = 10;
-    renderTask.renderMode = RENDER_MODE_2D;
-
-    retTask = shim_queue_render_task(&renderTask);
-    retTask->renderMode |= RENDER_MODE_2;
-}
-
-INCLUDE_ASM(s32, "effects/effect_99", fx_99_appendGfx);
diff --git a/src/effects/effect_112.c b/src/effects/embers.c
similarity index 52%
rename from src/effects/effect_112.c
rename to src/effects/embers.c
index 56995fdb96..4246467533 100644
--- a/src/effects/effect_112.c
+++ b/src/effects/embers.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_112_appendGfx(void* effect);
+void embers_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_112", fx_112_main);
+INCLUDE_ASM(s32, "effects/embers", embers_main);
 
-void fx_112_init(void) {
+void embers_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_112", fx_112_update);
+INCLUDE_ASM(s32, "effects/embers", embers_update);
 
-void fx_112_render(EffectInstance* effect) {
+void embers_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_112_appendGfx;
+    renderTask.appendGfx = embers_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -26,4 +26,4 @@ void fx_112_render(EffectInstance* effect) {
 void func_E00E05F8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_112", fx_112_appendGfx);
+INCLUDE_ASM(s32, "effects/embers", embers_appendGfx);
diff --git a/src/effects/effect_16.c b/src/effects/emote.c
similarity index 90%
rename from src/effects/effect_16.c
rename to src/effects/emote.c
index 2be5349065..1dfc8e1328 100644
--- a/src/effects/effect_16.c
+++ b/src/effects/emote.c
@@ -44,18 +44,18 @@ s8 D_E0020D94[] = {
     64, 0, 0, 32, 0, 32, 0, 0, 64, 0, 32, 32, 0, 64, 0, 32, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
-void func_E0020000(Effect16* part, s32 arg1);
-void fx_16_init(EffectInstance* effect);
-void fx_16_update(EffectInstance* effect);
-void fx_16_render(EffectInstance* effect);
-void fx_16_appendGfx(void* effect);
+void func_E0020000(EmoteFXData* part, s32 arg1);
+void emote_init(EffectInstance* effect);
+void emote_update(EffectInstance* effect);
+void emote_render(EffectInstance* effect);
+void emote_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_16", func_E0020000);
+INCLUDE_ASM(s32, "effects/emote", func_E0020000);
 
-void fx_16_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, EffectInstance** arg8) {
+void emote_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7, EffectInstance** arg8) {
     EffectBlueprint bp;
     EffectBlueprint* bpPtr = &bp;
-    Effect16* part;
+    EmoteFXData* part;
     EffectInstance* effect;
     s32 numParts;
 
@@ -66,11 +66,11 @@ void fx_16_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32
     }
 
     bp.unk_00 = 0;
-    bp.init = fx_16_init;
-    bp.update = fx_16_update;
-    bp.renderWorld = fx_16_render;
+    bp.init = emote_init;
+    bp.update = emote_update;
+    bp.renderWorld = emote_render;
     bp.unk_14 = 0;
-    bp.effectID = EFFECT_ID_10;
+    bp.effectID = EFFECT_EMOTE;
 
     effect = shim_create_effect_instance(bpPtr);
     effect->numParts = numParts;
@@ -111,11 +111,11 @@ void fx_16_main(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32
     *arg8 = effect;
 }
 
-void fx_16_init(EffectInstance* effect) {
+void emote_init(EffectInstance* effect) {
 }
 
-void fx_16_update(EffectInstance* effect) {
-    Effect16* part = effect->data;
+void emote_update(EffectInstance* effect) {
+    EmoteFXData* part = effect->data;
     s32 temp_a0 = D_E0020D80[part->unk_30][part->unk_34];
     s32 type = part->unk_00;
 
@@ -155,11 +155,11 @@ void fx_16_update(EffectInstance* effect) {
     }
 }
 
-void fx_16_render(EffectInstance* effect) {
+void emote_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_16_appendGfx;
+    renderTask.appendGfx = emote_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -170,11 +170,11 @@ void fx_16_render(EffectInstance* effect) {
 
 // lots of issues
 #ifdef NON_EQUIVALENT
-void fx_16_appendGfx(void* effect) {
+void emote_appendGfx(void* effect) {
     Matrix4f sp18;
     Matrix4f sp58;
     EffectInstance* effectTemp = effect;
-    Effect16* part = effectTemp->data;
+    EmoteFXData* part = effectTemp->data;
     s32 idx;
     s32 type;
     Gfx* temp_a3;
@@ -281,5 +281,5 @@ void fx_16_appendGfx(void* effect) {
     gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
 }
 #else
-INCLUDE_ASM(s32, "effects/effect_16", fx_16_appendGfx);
+INCLUDE_ASM(s32, "effects/emote", emote_appendGfx);
 #endif
diff --git a/src/effects/effect_52.c b/src/effects/ending_decals.c
similarity index 51%
rename from src/effects/effect_52.c
rename to src/effects/ending_decals.c
index f84e83d049..d9644443c3 100644
--- a/src/effects/effect_52.c
+++ b/src/effects/ending_decals.c
@@ -1,27 +1,27 @@
 #include "common.h"
 #include "effects_internal.h"
 
-typedef struct Effect52 {
+typedef struct EndingDecalsFXData {
     /* 0x00 */ s32 unk_00;
-} Effect52; // size = 0x??
+} EndingDecalsFXData; // size = 0x??
 
-void fx_52_appendGfx(void* effect);
+void ending_decals_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_52", fx_52_main);
+INCLUDE_ASM(s32, "effects/ending_decals", ending_decals_main);
 
-void fx_52_init(void) {
+void ending_decals_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_52", fx_52_update);
+INCLUDE_ASM(s32, "effects/ending_decals", ending_decals_update);
 
-void fx_52_render(EffectInstance* effect) {
-    Effect52* effect52 = effect->data;
+void ending_decals_render(EffectInstance* effect) {
+    EndingDecalsFXData* effect52 = effect->data;
     RenderTask renderTask;
     RenderTask* renderTaskPtr = &renderTask;
     RenderTask* retTask;
 
     renderTask.appendGfxArg = effect;
-    renderTask.appendGfx = fx_52_appendGfx;
+    renderTask.appendGfx = ending_decals_appendGfx;
     renderTask.distance = 10;
     if (effect52->unk_00 == 0) {
         renderTaskPtr->renderMode = RENDER_MODE_SURFACE_OPA;
@@ -33,4 +33,4 @@ void fx_52_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_52", fx_52_appendGfx);
+INCLUDE_ASM(s32, "effects/ending_decals", ending_decals_appendGfx);
diff --git a/src/effects/energy_in_out.c b/src/effects/energy_in_out.c
new file mode 100644
index 0000000000..3b3258b571
--- /dev/null
+++ b/src/effects/energy_in_out.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void energy_in_out_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/energy_in_out", energy_in_out_main);
+
+void energy_in_out_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/energy_in_out", energy_in_out_update);
+
+void energy_in_out_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = energy_in_out_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+void func_E00D6978(void) {
+}
+
+INCLUDE_ASM(s32, "effects/energy_in_out", energy_in_out_appendGfx);
diff --git a/src/effects/effect_82.c b/src/effects/energy_orb_wave.c
similarity index 50%
rename from src/effects/effect_82.c
rename to src/effects/energy_orb_wave.c
index 06861d0a07..e6e861d4f4 100644
--- a/src/effects/effect_82.c
+++ b/src/effects/energy_orb_wave.c
@@ -1,26 +1,26 @@
 #include "common.h"
 #include "effects_internal.h"
 
-typedef struct Effect82 {
+typedef struct EnergyOrbWaveFXData {
     /* 0x00 */ s32 unk_00;
-} Effect82; // size = ??
+} EnergyOrbWaveFXData; // size = ??
 
-void fx_82_appendGfx(void* effect);
+void energy_orb_wave_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_82", fx_82_main);
+INCLUDE_ASM(s32, "effects/energy_orb_wave", energy_orb_wave_main);
 
-void fx_82_init(void) {
+void energy_orb_wave_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_82", fx_82_update);
+INCLUDE_ASM(s32, "effects/energy_orb_wave", energy_orb_wave_update);
 
-void fx_82_render(EffectInstance* effect) {
-    Effect82* effect82 = effect->data;
+void energy_orb_wave_render(EffectInstance* effect) {
+    EnergyOrbWaveFXData* effect82 = effect->data;
     RenderTask renderTask;
     RenderTask* retTask;
     RenderTask* renderTaskPointer = &renderTask;
 
-    renderTask.appendGfx = fx_82_appendGfx;
+    renderTask.appendGfx = energy_orb_wave_appendGfx;
     renderTask.distance = 10;
     renderTask.appendGfxArg = effect;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -36,4 +36,4 @@ void fx_82_render(EffectInstance* effect) {
 void func_E00A4648(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_82", fx_82_appendGfx);
+INCLUDE_ASM(s32, "effects/energy_orb_wave", energy_orb_wave_appendGfx);
diff --git a/src/effects/energy_shockwave.c b/src/effects/energy_shockwave.c
new file mode 100644
index 0000000000..4dad7fa6aa
--- /dev/null
+++ b/src/effects/energy_shockwave.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void energy_shockwave_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/energy_shockwave", energy_shockwave_main);
+
+void energy_shockwave_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/energy_shockwave", energy_shockwave_update);
+
+void energy_shockwave_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = energy_shockwave_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/energy_shockwave", energy_shockwave_appendGfx);
diff --git a/src/effects/explosion.c b/src/effects/explosion.c
new file mode 100644
index 0000000000..1dcb5f9648
--- /dev/null
+++ b/src/effects/explosion.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void explosion_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/explosion", explosion_main);
+
+void explosion_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/explosion", explosion_update);
+
+void explosion_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = explosion_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/explosion", explosion_appendGfx);
diff --git a/src/effects/falling_leaves.c b/src/effects/falling_leaves.c
new file mode 100644
index 0000000000..212117ad79
--- /dev/null
+++ b/src/effects/falling_leaves.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void falling_leaves_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/falling_leaves", falling_leaves_main);
+
+void falling_leaves_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/falling_leaves", falling_leaves_update);
+
+void falling_leaves_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = falling_leaves_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/falling_leaves", falling_leaves_appendGfx);
diff --git a/src/effects/effect_55.c b/src/effects/fire_breath.c
similarity index 54%
rename from src/effects/effect_55.c
rename to src/effects/fire_breath.c
index b5362ff4e2..40452ceb53 100644
--- a/src/effects/effect_55.c
+++ b/src/effects/fire_breath.c
@@ -1,27 +1,27 @@
 #include "common.h"
 #include "effects_internal.h"
 
-typedef struct Effect55 {
+typedef struct FireBreathFXData {
     /* 0x00 */ char unk_00[0x14];
     /* 0x14 */ f32 unk_14;
-} Effect55; // size = 0x??
+} FireBreathFXData; // size = 0x??
 
-void fx_55_appendGfx(void* effect);
+void fire_breath_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_55", fx_55_main);
+INCLUDE_ASM(s32, "effects/fire_breath", fire_breath_main);
 
-void fx_55_init(void) {
+void fire_breath_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_55", fx_55_update);
+INCLUDE_ASM(s32, "effects/fire_breath", fire_breath_update);
 
-void fx_55_render(EffectInstance *effect) {
-    Effect55* effect55 = effect->data;
+void fire_breath_render(EffectInstance *effect) {
+    FireBreathFXData* effect55 = effect->data;
     RenderTask renderTask;
     RenderTask* retTask;
     RenderTask* renderTaskPointer = &renderTask;
 
-    renderTask.appendGfx = fx_55_appendGfx;
+    renderTask.appendGfx = fire_breath_appendGfx;
     renderTask.appendGfxArg = effect;
     if (gGameStatusPtr->isBattle == 1) {
         renderTask.distance = effect55->unk_14 + 1000.0f;
@@ -34,4 +34,4 @@ void fx_55_render(EffectInstance *effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_55", fx_55_appendGfx);
+INCLUDE_ASM(s32, "effects/fire_breath", fire_breath_appendGfx);
diff --git a/src/effects/fire_flower.c b/src/effects/fire_flower.c
new file mode 100644
index 0000000000..9d77e8022e
--- /dev/null
+++ b/src/effects/fire_flower.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void fire_flower_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/fire_flower", fire_flower_main);
+
+void fire_flower_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/fire_flower", fire_flower_update);
+
+void fire_flower_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = fire_flower_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/fire_flower", fire_flower_appendGfx);
diff --git a/src/effects/firework.c b/src/effects/firework.c
new file mode 100644
index 0000000000..f1fcb9951d
--- /dev/null
+++ b/src/effects/firework.c
@@ -0,0 +1,16 @@
+#include "common.h"
+#include "effects_internal.h"
+
+INCLUDE_ASM(s32, "effects/firework", firework_main);
+
+void firework_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/firework", firework_update);
+
+void firework_render(void) {
+}
+
+INCLUDE_ASM(s32, "effects/firework", func_E0086398);
+
+INCLUDE_ASM(s32, "effects/firework", func_E00863B4);
diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c
new file mode 100644
index 0000000000..9dda8a62af
--- /dev/null
+++ b/src/effects/firework_rocket.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void firework_rocket_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/firework_rocket", firework_rocket_main);
+
+void firework_rocket_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/firework_rocket", firework_rocket_update);
+
+void firework_rocket_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = firework_rocket_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 700;
+    renderTask.renderMode =  RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/firework_rocket", firework_rocket_appendGfx);
diff --git a/src/effects/effect_32.c b/src/effects/flame.c
similarity index 77%
rename from src/effects/effect_32.c
rename to src/effects/flame.c
index 61b4dd3f94..f887c1e181 100644
--- a/src/effects/effect_32.c
+++ b/src/effects/flame.c
@@ -1,14 +1,14 @@
 #include "common.h"
 #include "effects_internal.h"
 
-typedef struct Effect32 {
+typedef struct FlameFXData {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ f32 unk_04;
     /* 0x08 */ f32 unk_08;
     /* 0x0C */ f32 unk_0C;
-} Effect32; // size = 0x??
+} FlameFXData; // size = 0x??
 
-void fx_32_appendGfx(void* effect);
+void flame_appendGfx(void* effect);
 
 u32 D_E0040840[2] = { 0xFF6DFF5C, 0x66BFFF4B };
 
@@ -16,15 +16,15 @@ s8 D_E0040848[56] = { 0x32, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xFF, 0xFF
 
 s32 D_E0040880[4] = { 0, 0, 0, 0 };
 
-INCLUDE_ASM(s32, "effects/effect_32", fx_32_main);
+INCLUDE_ASM(s32, "effects/flame", flame_main);
 
-void fx_32_init(void) {
+void flame_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_32", fx_32_update);
+INCLUDE_ASM(s32, "effects/flame", flame_update);
 
-void fx_32_render(EffectInstance* effect) {
-    Effect32* effect32 = effect->data;
+void flame_render(EffectInstance* effect) {
+    FlameFXData* effect32 = effect->data;
     RenderTask renderTask;
     RenderTask* renderTaskPtr = &renderTask;
     RenderTask* retTask;
@@ -47,7 +47,7 @@ void fx_32_render(EffectInstance* effect) {
         outDist = 0;
     }
     
-    renderTaskPtr->appendGfx = fx_32_appendGfx;
+    renderTaskPtr->appendGfx = flame_appendGfx;
     renderTaskPtr->distance = -outDist;
     renderTaskPtr->appendGfxArg = effect;
     renderTaskPtr->renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
@@ -55,4 +55,4 @@ void fx_32_render(EffectInstance* effect) {
     shim_queue_render_task(renderTaskPtr);
 }
 
-INCLUDE_ASM(s32, "effects/effect_32", fx_32_appendGfx);
+INCLUDE_ASM(s32, "effects/flame", flame_appendGfx);
diff --git a/src/effects/flashing_box_shockwave.c b/src/effects/flashing_box_shockwave.c
new file mode 100644
index 0000000000..c19b4af4f1
--- /dev/null
+++ b/src/effects/flashing_box_shockwave.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void flashing_box_shockwave_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/flashing_box_shockwave", flashing_box_shockwave_main);
+
+void flashing_box_shockwave_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/flashing_box_shockwave", flashing_box_shockwave_update);
+
+void flashing_box_shockwave_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = flashing_box_shockwave_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/flashing_box_shockwave", flashing_box_shockwave_appendGfx);
diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c
new file mode 100644
index 0000000000..fe3271fe9a
--- /dev/null
+++ b/src/effects/floating_cloud_puff.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void floating_cloud_puff_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/floating_cloud_puff", floating_cloud_puff_main);
+
+void floating_cloud_puff_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/floating_cloud_puff", floating_cloud_puff_update);
+
+void floating_cloud_puff_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = floating_cloud_puff_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00D227C(void) {
+}
+
+INCLUDE_ASM(s32, "effects/floating_cloud_puff", floating_cloud_puff_appendGfx);
diff --git a/src/effects/effect_13.c b/src/effects/floating_flower.c
similarity index 82%
rename from src/effects/effect_13.c
rename to src/effects/floating_flower.c
index 9f750f3cbb..7571677426 100644
--- a/src/effects/effect_13.c
+++ b/src/effects/floating_flower.c
@@ -5,24 +5,24 @@ s32 D_E001A610 = 0;
 
 extern Gfx D_090002F0[];
 
-void fx_13_init(EffectInstance* effect);
-void fx_13_update(EffectInstance* effect);
-void fx_13_render(EffectInstance* effect);
-void fx_13_appendGfx(void* effect);
+void floating_flower_init(EffectInstance* effect);
+void floating_flower_update(EffectInstance* effect);
+void floating_flower_render(EffectInstance* effect);
+void floating_flower_appendGfx(void* effect);
 
-void fx_13_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) {
+void floating_flower_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect13* part;
+    FloatingFlowerFXData* part;
     s32 numParts = 1;
     f32 phi_f6;
 
     bp.unk_00 = 0;
-    bp.init = fx_13_init;
-    bp.update = fx_13_update;
-    bp.renderWorld = fx_13_render;
+    bp.init = floating_flower_init;
+    bp.update = floating_flower_update;
+    bp.renderWorld = floating_flower_render;
     bp.unk_14 = 0;
-    bp.effectID = EFFECT_ID_0D;
+    bp.effectID = EFFECT_FLOATING_FLOWER;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = 1;
@@ -72,11 +72,11 @@ void fx_13_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) {
     }
 }
 
-void fx_13_init(EffectInstance* effect) {
+void floating_flower_init(EffectInstance* effect) {
 }
 
-void fx_13_update(EffectInstance* effect) {
-    Effect13* data = effect->data;
+void floating_flower_update(EffectInstance* effect) {
+    FloatingFlowerFXData* data = effect->data;
     s32 unk_00 = data->unk_00;
 
     if (data->unk_34 < 150) {
@@ -127,11 +127,11 @@ void fx_13_update(EffectInstance* effect) {
     }
 }
 
-void fx_13_render(EffectInstance* effect) {
+void floating_flower_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_13_appendGfx;
+    renderTask.appendGfx = floating_flower_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -140,10 +140,10 @@ void fx_13_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_13_appendGfx(void* effect) {
+void floating_flower_appendGfx(void* effect) {
     Matrix4f sp20, other;
     EffectInstance* effectTemp = effect;
-    Effect13* part = effectTemp->data;
+    FloatingFlowerFXData* part = effectTemp->data;
     u32 alpha;
     u8 rgb, a;
 
diff --git a/src/effects/floating_rock.c b/src/effects/floating_rock.c
new file mode 100644
index 0000000000..f23a5461ea
--- /dev/null
+++ b/src/effects/floating_rock.c
@@ -0,0 +1,32 @@
+#include "common.h"
+#include "effects_internal.h"
+
+typedef struct FloatingRockFXData {
+    /* 0x00 */ char unk_00[0xC];
+    /* 0x0C */ f32 unk_0C;
+} FloatingRockFXData; // size = 0x??
+
+void floating_rock_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/floating_rock", floating_rock_main);
+
+void floating_rock_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/floating_rock", floating_rock_update);
+
+void floating_rock_render(EffectInstance *effect) {
+    FloatingRockFXData* effect76 = effect->data;
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = floating_rock_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = effect76->unk_0C;
+    renderTask.renderMode = RENDER_MODE_2D;
+    
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/floating_rock", floating_rock_appendGfx);
diff --git a/src/effects/effect_8.c b/src/effects/flower_splash.c
similarity index 53%
rename from src/effects/effect_8.c
rename to src/effects/flower_splash.c
index 444a5db3d2..b76dca3605 100644
--- a/src/effects/effect_8.c
+++ b/src/effects/flower_splash.c
@@ -3,12 +3,12 @@
 
 extern Gfx D_09000E08[];
 
-void fx_8_init(EffectInstance* effect);
-void fx_8_update(EffectInstance* effect);
-void fx_8_render(EffectInstance* effect);
-void fx_8_appendGfx(void* effect);
+void flower_splash_init(EffectInstance* effect);
+void flower_splash_update(EffectInstance* effect);
+void flower_splash_render(EffectInstance* effect);
+void flower_splash_appendGfx(void* effect);
 
-void func_E0010000(Effect8* effect) {
+void func_E0010000(FlowerFXData* effect) {
     Matrix4f sp18;
     Matrix4f sp58;
 
@@ -24,7 +24,7 @@ void func_E0010000(Effect8* effect) {
     shim_guMtxF2L(sp18, &effect->unk_30);
 }
 
-void func_E0010104(Effect8* effect) {
+void func_E0010104(FlowerFXData* effect) {
     effect->unk_70 *= 0.85;
     effect->unk_0C += effect->unk_70 * effect->unk_90;
     effect->unk_88 += effect->unk_8C;
@@ -43,74 +43,74 @@ void func_E0010104(Effect8* effect) {
     }
 }
 
-void fx_8_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+void flower_splash_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect8* part;
+    FlowerFXData* data;
     s32 numParts = 5;
     f32 angle;
     s32 i;
 
-    bp.init = fx_8_init;
-    bp.update = fx_8_update;
-    bp.renderWorld = fx_8_render;
+    bp.init = flower_splash_init;
+    bp.update = flower_splash_update;
+    bp.renderWorld = flower_splash_render;
     bp.unk_00 = 0;
     bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_08;
+    bp.effectID = EFFECT_FLOWER_SPLASH;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = numParts;
 
-    part = shim_general_heap_malloc(numParts * sizeof(*part));
-    effect->data = part;
+    data = shim_general_heap_malloc(numParts * sizeof(*data));
+    effect->data = data;
     ASSERT(effect->data != NULL);
 
-    shim_mem_clear(part, numParts * sizeof(*part));
+    shim_mem_clear(data, numParts * sizeof(*data));
 
-    for (i = 0; i < numParts; i++, part++) {
-        part->unk_00 = 1;
-        part->unk_28 = arg3 + (i * 72);
-        part->unk_74 = 0.29999998f;
-        part->unk_78 = 0.0f;
-        part->unk_7C = 0.0f;
-        part->unk_0C = arg0;
-        part->unk_10 = arg1;
-        part->unk_14 = arg2;
-        part->unk_18 = 1.0f;
-        part->unk_1C = 1.0f;
-        part->unk_20 = 1.0f;
-        part->primAlpha = 255;
-        part->unk_06 = 60;
-        part->unk_24 = 0.0f;
-        part->unk_2C = 0.0f;
-        part->unk_80 = 1.75f;
-        part->unk_84 = -0.08f;
-        part->unk_70 = -3.9f;
-        part->unk_88 = 0;
-        part->unk_8C = 0;
-        angle = shim_clamp_angle(part->unk_28);
-        part->unk_90 = shim_sin_deg(angle);
-        part->unk_94 = shim_cos_deg(angle);
+    for (i = 0; i < numParts; i++, data++) {
+        data->unk_00 = 1;
+        data->unk_28 = arg3 + (i * 72);
+        data->unk_74 = 0.29999998f;
+        data->unk_78 = 0.0f;
+        data->unk_7C = 0.0f;
+        data->unk_0C = arg0;
+        data->unk_10 = arg1;
+        data->unk_14 = arg2;
+        data->unk_18 = 1.0f;
+        data->unk_1C = 1.0f;
+        data->unk_20 = 1.0f;
+        data->primAlpha = 255;
+        data->unk_06 = 60;
+        data->unk_24 = 0.0f;
+        data->unk_2C = 0.0f;
+        data->unk_80 = 1.75f;
+        data->unk_84 = -0.08f;
+        data->unk_70 = -3.9f;
+        data->unk_88 = 0;
+        data->unk_8C = 0;
+        angle = shim_clamp_angle(data->unk_28);
+        data->unk_90 = shim_sin_deg(angle);
+        data->unk_94 = shim_cos_deg(angle);
     }
 }
 
-void fx_8_init(EffectInstance* effect) {
+void flower_splash_init(EffectInstance* effect) {
 }
 
-void fx_8_update(EffectInstance* effect) {
-    Effect8* part = (Effect8*)effect->data;
+void flower_splash_update(EffectInstance* effect) {
+    FlowerFXData* data = (FlowerFXData*)effect->data;
     s32 cond = FALSE;
     s32 i;
 
-    for (i = 0; i < effect->numParts; i++, part++) {
-        if (part->unk_00 != 0) {
-            part->unk_06--;
-            if (part->unk_06 <= 0) {
-                part->unk_00 = 0;
+    for (i = 0; i < effect->numParts; i++, data++) {
+        if (data->unk_00 != 0) {
+            data->unk_06--;
+            if (data->unk_06 <= 0) {
+                data->unk_00 = 0;
             } else {
                 cond = TRUE;
-                func_E0010104(part);
-                func_E0010000(part);
+                func_E0010104(data);
+                func_E0010000(data);
             }
         }
     }
@@ -120,11 +120,11 @@ void fx_8_update(EffectInstance* effect) {
     }
 }
 
-void fx_8_render(EffectInstance* effect) {
+void flower_splash_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_8_appendGfx;
+    renderTask.appendGfx = flower_splash_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -137,21 +137,21 @@ void func_E00104F4(EffectInstance* effect) {
     shim_remove_effect(effect);
 }
 
-void fx_8_appendGfx(void* effect) {
+void flower_splash_appendGfx(void* effect) {
     EffectInstance* effectTemp = effect;
-    Effect8* part = effectTemp->data;
+    FlowerFXData* data = effectTemp->data;
     s32 i;
 
     gDPPipeSync(gMasterGfxPos++);
     gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data));
 
-    for (i = 0; i < effectTemp->numParts; i++, part++) {
-        if (part->unk_00 != 0) {
+    for (i = 0; i < effectTemp->numParts; i++, data++) {
+        if (data->unk_00 != 0) {
             Gfx* dlist = D_09000E08;
 
-            gDisplayContext->matrixStack[gMatrixListPos] = part->unk_30;
+            gDisplayContext->matrixStack[gMatrixListPos] = data->unk_30;
 
-            gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, part->primAlpha);
+            gDPSetPrimColor(gMasterGfxPos++, 0, 0, 112, 96, 24, data->primAlpha);
             gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
                         G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
             gSPDisplayList(gMasterGfxPos++, dlist);
diff --git a/src/effects/effect_9.c b/src/effects/flower_trail.c
similarity index 83%
rename from src/effects/effect_9.c
rename to src/effects/flower_trail.c
index 63c0529289..ecb26546fc 100644
--- a/src/effects/effect_9.c
+++ b/src/effects/flower_trail.c
@@ -4,12 +4,12 @@
 extern Gfx D_09000E20[];
 extern Gfx D_09000E38[];
 
-void fx_9_init(EffectInstance* effect);
-void fx_9_update(EffectInstance* effect);
-void fx_9_render(EffectInstance* effect);
-void fx_9_appendGfx(void* effect);
+void flower_trail_init(EffectInstance* effect);
+void flower_trail_update(EffectInstance* effect);
+void flower_trail_render(EffectInstance* effect);
+void flower_trail_appendGfx(void* effect);
 
-void func_E0012000(Effect8* effect) {
+void func_E0012000(FlowerFXData* effect) {
     Matrix4f sp18;
     Matrix4f sp58;
 
@@ -25,7 +25,7 @@ void func_E0012000(Effect8* effect) {
     shim_guMtxF2L(sp18, &effect->unk_30);
 }
 
-void func_E0012104(Effect8* effect) {
+void func_E0012104(FlowerFXData* effect) {
     if (effect->unk_04 == 0 && effect->unk_78 != 0.0f && gPlayerActionState == ACTION_STATE_IDLE) {
         effect->unk_06++;
         return;
@@ -44,21 +44,21 @@ void func_E0012104(Effect8* effect) {
     }
 }
 
-void fx_9_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
+void flower_trail_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect8* part;
+    FlowerFXData* part;
     s32 numParts = 1;
     f32 angle;
     f32 temp;
     s32 i;
 
-    bp.init = fx_9_init;
-    bp.update = fx_9_update;
-    bp.renderWorld = fx_9_render;
+    bp.init = flower_trail_init;
+    bp.update = flower_trail_update;
+    bp.renderWorld = flower_trail_render;
     bp.unk_00 = 0;
     bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_09;
+    bp.effectID = EFFECT_FLOWER_TRAIL;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = numParts;
@@ -112,11 +112,11 @@ void fx_9_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
     }
 }
 
-void fx_9_init(EffectInstance* effect) {
+void flower_trail_init(EffectInstance* effect) {
 }
 
-void fx_9_update(EffectInstance* effect) {
-    Effect8* part = (Effect8*)effect->data;
+void flower_trail_update(EffectInstance* effect) {
+    FlowerFXData* part = (FlowerFXData*)effect->data;
     s32 cond = FALSE;
     s32 i;
 
@@ -138,11 +138,11 @@ void fx_9_update(EffectInstance* effect) {
     }
 }
 
-void fx_9_render(EffectInstance* effect) {
+void flower_trail_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_9_appendGfx;
+    renderTask.appendGfx = flower_trail_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -155,9 +155,9 @@ void func_E0012548(EffectInstance* effect) {
     shim_remove_effect(effect);
 }
 
-void fx_9_appendGfx(void* effect) {
+void flower_trail_appendGfx(void* effect) {
     EffectInstance* effectTemp = effect;
-    Effect8* part = effectTemp->data;
+    FlowerFXData* part = effectTemp->data;
     Gfx* dlist;
     s32 i;
 
diff --git a/src/effects/effect_12.c b/src/effects/footprint.c
similarity index 78%
rename from src/effects/effect_12.c
rename to src/effects/footprint.c
index ef090e5d1c..17d65e2791 100644
--- a/src/effects/effect_12.c
+++ b/src/effects/footprint.c
@@ -3,13 +3,13 @@
 
 extern Gfx D_09000240[];
 
-void func_E0018000(Effect12* part);
-void fx_12_init(EffectInstance* effect);
-void fx_12_update(EffectInstance* effect);
-void fx_12_render(EffectInstance* effect);
-void fx_12_appendGfx(void* effect);
+void func_E0018000(FootprintFXData* part);
+void footprint_init(EffectInstance* effect);
+void footprint_update(EffectInstance* effect);
+void footprint_render(EffectInstance* effect);
+void footprint_appendGfx(void* effect);
 
-void func_E0018000(Effect12* part) {
+void func_E0018000(FootprintFXData* part) {
     Matrix4f sp18;
     Matrix4f sp58;
 
@@ -19,21 +19,21 @@ void func_E0018000(Effect12* part) {
     shim_guMtxF2L(sp18, &part->mtx);
 }
 
-void fx_12_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) {
+void footprint_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect12* part;
+    FootprintFXData* part;
     s32 numParts = 1;
     s32 i;
     f32 temp_f20;
     f32 temp_f20_2;
 
     bp.unk_00 = 0;
-    bp.init = fx_12_init;
-    bp.update = fx_12_update;
-    bp.renderWorld = fx_12_render;
+    bp.init = footprint_init;
+    bp.update = footprint_update;
+    bp.renderWorld = footprint_render;
     bp.unk_14 = 0;
-    bp.effectID = EFFECT_ID_0C;
+    bp.effectID = EFFECT_FOOTPRINT;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = 1;
@@ -71,11 +71,11 @@ void fx_12_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32
     }
 }
 
-void fx_12_init(EffectInstance* effect) {
+void footprint_init(EffectInstance* effect) {
 }
 
-void fx_12_update(EffectInstance* effect) {
-    Effect12* part = (Effect12*)effect->data;
+void footprint_update(EffectInstance* effect) {
+    FootprintFXData* part = (FootprintFXData*)effect->data;
     s32 cond = FALSE;
     s32 i;
 
@@ -97,11 +97,11 @@ void fx_12_update(EffectInstance* effect) {
     }
 }
 
-void fx_12_render(EffectInstance* effect) {
+void footprint_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_12_appendGfx;
+    renderTask.appendGfx = footprint_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -114,9 +114,9 @@ void func_E00183BC(EffectInstance* effect) {
     shim_remove_effect(effect);
 }
 
-void fx_12_appendGfx(void* effect) {
+void footprint_appendGfx(void* effect) {
     EffectInstance* effectTemp = effect;
-    Effect12* part = effectTemp->data;
+    FootprintFXData* part = effectTemp->data;
     s32 i;
 
     gDPPipeSync(gMasterGfxPos++);
diff --git a/src/effects/effect_97.c b/src/effects/fright_jar.c
similarity index 50%
rename from src/effects/effect_97.c
rename to src/effects/fright_jar.c
index 95ba78acb3..6b5265bf4c 100644
--- a/src/effects/effect_97.c
+++ b/src/effects/fright_jar.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_97_appendGfx(void* effect);
+void fright_jar_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_97", fx_97_main);
+INCLUDE_ASM(s32, "effects/fright_jar", fright_jar_main);
 
-void fx_97_init(void) {
+void fright_jar_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_97", fx_97_update);
+INCLUDE_ASM(s32, "effects/fright_jar", fright_jar_update);
 
-void fx_97_render(EffectInstance* effect) {
+void fright_jar_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_97_appendGfx;
+    renderTask.appendGfx = fright_jar_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -26,4 +26,4 @@ void fx_97_render(EffectInstance* effect) {
 void func_E00C2214(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_97", fx_97_appendGfx);
+INCLUDE_ASM(s32, "effects/fright_jar", fright_jar_appendGfx);
diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c
new file mode 100644
index 0000000000..62cf2e7ef7
--- /dev/null
+++ b/src/effects/gather_energy_pink.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void gather_energy_pink_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/gather_energy_pink", gather_energy_pink_main);
+
+void gather_energy_pink_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/gather_energy_pink", gather_energy_pink_update);
+
+void gather_energy_pink_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = gather_energy_pink_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/gather_energy_pink", gather_energy_pink_appendGfx);
diff --git a/src/effects/gather_magic.c b/src/effects/gather_magic.c
new file mode 100644
index 0000000000..27e2a84b9e
--- /dev/null
+++ b/src/effects/gather_magic.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void gather_magic_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/gather_magic", gather_magic_main);
+
+void gather_magic_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/gather_magic", gather_magic_update);
+
+void gather_magic_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = gather_magic_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/gather_magic", gather_magic_appendGfx);
diff --git a/src/effects/got_item_outline.c b/src/effects/got_item_outline.c
new file mode 100644
index 0000000000..9699cbb5a2
--- /dev/null
+++ b/src/effects/got_item_outline.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void got_item_outline_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/got_item_outline", got_item_outline_main);
+
+void got_item_outline_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/got_item_outline", got_item_outline_update);
+
+void got_item_outline_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = got_item_outline_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E003621C(void) {
+}
+
+INCLUDE_ASM(s32, "effects/got_item_outline", got_item_outline_appendGfx);
diff --git a/src/effects/green_impact.c b/src/effects/green_impact.c
new file mode 100644
index 0000000000..774c7721ae
--- /dev/null
+++ b/src/effects/green_impact.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void green_impact_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/green_impact", green_impact_main);
+
+void green_impact_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/green_impact", green_impact_update);
+
+void green_impact_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = green_impact_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/green_impact", green_impact_appendGfx);
diff --git a/src/effects/hieroglyphs.c b/src/effects/hieroglyphs.c
new file mode 100644
index 0000000000..3229c0267d
--- /dev/null
+++ b/src/effects/hieroglyphs.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void hieroglyphs_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/hieroglyphs", hieroglyphs_main);
+
+void hieroglyphs_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/hieroglyphs", hieroglyphs_update);
+
+void hieroglyphs_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = hieroglyphs_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00E2210(void) {
+}
+
+INCLUDE_ASM(s32, "effects/hieroglyphs", hieroglyphs_appendGfx);
diff --git a/src/effects/huff_puff_breath.c b/src/effects/huff_puff_breath.c
new file mode 100644
index 0000000000..cd49d6756f
--- /dev/null
+++ b/src/effects/huff_puff_breath.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void huff_puff_breath_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/huff_puff_breath", huff_puff_breath_main);
+
+void huff_puff_breath_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/huff_puff_breath", huff_puff_breath_update);
+
+void huff_puff_breath_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = huff_puff_breath_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+void func_E00DC2FC(void) {
+}
+
+INCLUDE_ASM(s32, "effects/huff_puff_breath", huff_puff_breath_appendGfx);
diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c
new file mode 100644
index 0000000000..137a509679
--- /dev/null
+++ b/src/effects/ice_pillar.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void ice_pillar_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/ice_pillar", ice_pillar_main);
+
+void ice_pillar_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/ice_pillar", ice_pillar_update);
+
+void ice_pillar_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = ice_pillar_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 5;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/ice_pillar", ice_pillar_appendGfx);
diff --git a/src/effects/ice_shard.c b/src/effects/ice_shard.c
new file mode 100644
index 0000000000..756ba5c4b2
--- /dev/null
+++ b/src/effects/ice_shard.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void ice_shard_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/ice_shard", ice_shard_main);
+
+void ice_shard_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/ice_shard", ice_shard_update);
+
+void ice_shard_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = ice_shard_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/ice_shard", ice_shard_appendGfx);
diff --git a/src/effects/effect_6.c b/src/effects/landing_dust.c
similarity index 56%
rename from src/effects/effect_6.c
rename to src/effects/landing_dust.c
index db68be7cc3..eebc7d5c12 100644
--- a/src/effects/effect_6.c
+++ b/src/effects/landing_dust.c
@@ -18,15 +18,15 @@ static s8 D_E000CC38[] = { 0x00, 0x01, 0x02, 0x1A, 0x03, 0x1B, 0x04, 0x1C, 0x05,
 static s8 D_E000CC48[] = { 0x00, 0x01, 0x02, 0x1A, 0x03, 0x1B, 0x04, 0x1C, 0x05, 0x1D, 0x06, 0x16, 0x26, 0x47, 0x57,
                            0x67, 0xFF, 0x00, 0x00, 0x00 };
 
-static s8 D_E000CC5C[] = { 0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38, 0x01, 0x09, 0x11, 0x19, 0x21, 0x29, 0x31,
-                           0x39, 0x02, 0x02, 0x0A, 0x0A, 0x12, 0x12, 0x1A, 0x1A, 0x22, 0x22, 0x2A, 0x2A, 0x32, 0x32,
-                           0x3A, 0x3A, 0x03, 0x03, 0x0B, 0x0B, 0x13, 0x13, 0x1B, 0x1B, 0x23, 0x23, 0x2B, 0x2B, 0x33,
-                           0x33, 0x3B, 0x3B, 0x04, 0x04, 0x0C, 0x0C, 0x14, 0x14, 0x1C, 0x1C, 0x24, 0x24, 0x2C, 0x2C,
-                           0x34, 0x34, 0x3C, 0x3C, 0x05, 0x05, 0x0D, 0x0D, 0x15, 0x15, 0x1D, 0x1D, 0x25, 0x25, 0x2D,
-                           0x2D, 0x35, 0x35, 0x3D, 0x3D, 0x06, 0x06, 0x06, 0x0E, 0x0E, 0x0E, 0x16, 0x16, 0x16, 0x1E,
-                           0x1E, 0x1E, 0x26, 0x26, 0x26, 0x2E, 0x2E, 0x2E, 0x36, 0x36, 0x36, 0x3E, 0x3E, 0x3E, 0x47,
-                           0x47, 0x47, 0x4F, 0x4F, 0x4F, 0x57, 0x57, 0x57, 0x5F, 0x5F, 0x5F, 0x67, 0x67, 0x67, 0x6F,
-                           0x6F, 0x6F, 0x77, 0x77, 0x77, 0x7F, 0x7F, 0x7F, 0xFF, 0x00, 0x00, 0x00 };
+static s8 D_E000CC5C[] = {
+    0x00, 0x08, 0x10, 0x18, 0x20, 0x28, 0x30, 0x38, 0x01, 0x09, 0x11, 0x19, 0x21, 0x29, 0x31, 0x39, 0x02, 0x02, 0x0A,
+    0x0A, 0x12, 0x12, 0x1A, 0x1A, 0x22, 0x22, 0x2A, 0x2A, 0x32, 0x32, 0x3A, 0x3A, 0x03, 0x03, 0x0B, 0x0B, 0x13, 0x13,
+    0x1B, 0x1B, 0x23, 0x23, 0x2B, 0x2B, 0x33, 0x33, 0x3B, 0x3B, 0x04, 0x04, 0x0C, 0x0C, 0x14, 0x14, 0x1C, 0x1C, 0x24,
+    0x24, 0x2C, 0x2C, 0x34, 0x34, 0x3C, 0x3C, 0x05, 0x05, 0x0D, 0x0D, 0x15, 0x15, 0x1D, 0x1D, 0x25, 0x25, 0x2D, 0x2D,
+    0x35, 0x35, 0x3D, 0x3D, 0x06, 0x06, 0x06, 0x0E, 0x0E, 0x0E, 0x16, 0x16, 0x16, 0x1E, 0x1E, 0x1E, 0x26, 0x26, 0x26,
+    0x2E, 0x2E, 0x2E, 0x36, 0x36, 0x36, 0x3E, 0x3E, 0x3E, 0x47, 0x47, 0x47, 0x4F, 0x4F, 0x4F, 0x57, 0x57, 0x57, 0x5F,
+    0x5F, 0x5F, 0x67, 0x67, 0x67, 0x6F, 0x6F, 0x6F, 0x77, 0x77, 0x77, 0x7F, 0x7F, 0x7F, 0xFF, 0x00, 0x00, 0x00
+};
 
 static s8 D_E000CCE0[] = { 0x00, 0x10, 0x20, 0x30, 0x01, 0x11, 0x21, 0x31, 0x02, 0x0A, 0x12, 0x1A, 0x22, 0x2A, 0x32,
                            0x3A, 0x03, 0x0B, 0x13, 0x1B, 0x23, 0x2B, 0x33, 0x3B, 0x04, 0x0C, 0x14, 0x1C, 0x24, 0x2C,
@@ -36,12 +36,12 @@ static s8 D_E000CCE0[] = { 0x00, 0x10, 0x20, 0x30, 0x01, 0x11, 0x21, 0x31, 0x02,
 
 static s8* D_E000CD24[4] = { D_E000CC38, D_E000CC48, D_E000CC5C, D_E000CCE0 };
 
-void fx_6_init(EffectInstance* effect);
-void fx_6_update(EffectInstance* effect);
-void fx_6_render(EffectInstance* effect);
-void fx_6_appendGfx(void* effect);
+void landing_dust_init(EffectInstance* effect);
+void landing_dust_update(EffectInstance* effect);
+void landing_dust_render(EffectInstance* effect);
+void landing_dust_appendGfx(void* effect);
 
-void func_E000C000(Effect6* part) {
+void func_E000C000(LandingDustFXData* part) {
     part->unk_18 += part->unk_1C;
     part->unk_14 += part->unk_18;
     part->unk_10 += part->unk_14;
@@ -53,13 +53,13 @@ void func_E000C000(Effect6* part) {
     part->y += part->unk_20;
 }
 
-void func_E000C094(Effect6* part) {
+void func_E000C094(LandingDustFXData* part) {
     part->y += part->unk_20;
     part->unk_20 += part->unk_24;
     part->unk_24 *= part->unk_28;
 }
 
-void func_E000C0C8(Effect6* part) {
+void func_E000C0C8(LandingDustFXData* part) {
     part->x += part->unk_10 * part->unk_30;
     part->y += part->unk_20;
     part->z += part->unk_10 * part->unk_34;
@@ -69,11 +69,11 @@ void func_E000C0C8(Effect6* part) {
     part->unk_20 *= part->unk_2C;
 }
 
-void fx_6_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) {
+void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) {
     EffectBlueprint bp;
     EffectBlueprint* bpPtr = &bp;
     EffectInstance* effect;
-    Effect6* effectPart;
+    LandingDustFXData* data;
     f32 theta;
     f32 temp_f20_2;
     s32 numParts;
@@ -94,161 +94,161 @@ void fx_6_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) {
             break;
     }
 
-    bpPtr->init = fx_6_init;
-    bpPtr->update = fx_6_update;
-    bpPtr->renderWorld = fx_6_render;
+    bpPtr->init = landing_dust_init;
+    bpPtr->update = landing_dust_update;
+    bpPtr->renderWorld = landing_dust_render;
     bpPtr->unk_00 = 0;
     bpPtr->unk_14 = NULL;
-    bpPtr->effectID = EFFECT_ID_06;
+    bpPtr->effectID = EFFECT_LANDING_DUST;
 
     effect = shim_create_effect_instance(bpPtr);
     effect->numParts = numParts;
 
-    effectPart = shim_general_heap_malloc(numParts * sizeof(Effect6));
-    effect->data = effectPart;
+    data = shim_general_heap_malloc(numParts * sizeof(LandingDustFXData));
+    effect->data = data;
     ASSERT(effect->data != NULL);
 
-    shim_mem_clear(effectPart, numParts * sizeof(Effect6));
+    shim_mem_clear(data, numParts * sizeof(LandingDustFXData));
 
     switch (type) {
         case 0:
         case 1:
-            effectPart->unk_38 = 0;
+            data->unk_38 = 0;
             break;
         case 3:
-            effectPart->unk_38 = 2;
+            data->unk_38 = 2;
             break;
         case 2:
         case 4:
-            effectPart->unk_38 = 3;
+            data->unk_38 = 3;
             break;
     }
 
-    effectPart->unk_3C = 0;
-    effectPart->type = type;
-    effectPart->x = x;
-    effectPart->y = y;
-    effectPart->z = z;
+    data->unk_3C = 0;
+    data->type = type;
+    data->x = x;
+    data->y = y;
+    data->z = z;
 
-    effectPart++;
+    data++;
 
     switch (type) {
         case 0:
         case 1:
-            for (i = 1; i < numParts; i++, effectPart++) {
-                effectPart->unk_10 = -3.0f;
-                effectPart->unk_14 = 0.29999998f;
-                effectPart->unk_18 = 0;
-                effectPart->unk_1C = 0;
-                effectPart->unk_20 = 1.75f;
-                effectPart->unk_24 = -0.16f;
-                effectPart->unk_28 = 0.0f;
-                effectPart->unk_2C = 0.0f;
-                effectPart->x = 0.0f;
-                effectPart->y = 0.0f;
-                effectPart->z = 4.0f;
+            for (i = 1; i < numParts; i++, data++) {
+                data->unk_10 = -3.0f;
+                data->unk_14 = 0.29999998f;
+                data->unk_18 = 0;
+                data->unk_1C = 0;
+                data->unk_20 = 1.75f;
+                data->unk_24 = -0.16f;
+                data->unk_28 = 0.0f;
+                data->unk_2C = 0.0f;
+                data->x = 0.0f;
+                data->y = 0.0f;
+                data->z = 4.0f;
                 theta = shim_clamp_angle(90 + (180 * (i - 1)));
-                effectPart->unk_30 = shim_sin_deg(theta);
-                effectPart->unk_34 = shim_cos_deg(theta);
+                data->unk_30 = shim_sin_deg(theta);
+                data->unk_34 = shim_cos_deg(theta);
             }
             break;
         case 2:
             break;
         case 3:
-            for (i = 1; i < numParts; i++, effectPart++) {
+            for (i = 1; i < numParts; i++, data++) {
                 switch (i - 1) {
                     case 0:
                         theta = 135.0f;
-                        effectPart->x = -shim_sin_deg(theta) * 25.0f;
-                        effectPart->y = 0.0f;
-                        effectPart->z = -shim_cos_deg(theta) * 25.0f;
-                        effectPart->unk_24 = -0.04f;
-                        effectPart->unk_28 = 0.94f;
-                        effectPart->unk_20 = 0.95f;
+                        data->x = -shim_sin_deg(theta) * 25.0f;
+                        data->y = 0.0f;
+                        data->z = -shim_cos_deg(theta) * 25.0f;
+                        data->unk_24 = -0.04f;
+                        data->unk_28 = 0.94f;
+                        data->unk_20 = 0.95f;
                         break;
                     case 1:
                         theta = -135.0f;
-                        effectPart->x = -shim_sin_deg(theta) * 25.0f;
-                        effectPart->y = 4.0f;
-                        effectPart->z = -shim_cos_deg(theta) * 25.0f;
-                        effectPart->unk_24 = -0.04f;
-                        effectPart->unk_28 = 0.94f;
-                        effectPart->unk_20 = 0.84999996f;
+                        data->x = -shim_sin_deg(theta) * 25.0f;
+                        data->y = 4.0f;
+                        data->z = -shim_cos_deg(theta) * 25.0f;
+                        data->unk_24 = -0.04f;
+                        data->unk_28 = 0.94f;
+                        data->unk_20 = 0.84999996f;
                         break;
                     case 2:
                         theta = 20.0f;
-                        effectPart->x = -shim_sin_deg(theta) * 25.0f;
-                        effectPart->y = 10.0f;
-                        effectPart->z = -shim_cos_deg(theta) * 25.0f;
-                        effectPart->unk_24 = -0.04f;
-                        effectPart->unk_28 = 0.94f;
-                        effectPart->unk_20 = 0.75f;
+                        data->x = -shim_sin_deg(theta) * 25.0f;
+                        data->y = 10.0f;
+                        data->z = -shim_cos_deg(theta) * 25.0f;
+                        data->unk_24 = -0.04f;
+                        data->unk_28 = 0.94f;
+                        data->unk_20 = 0.75f;
                         break;
 
                 }
-                effectPart->unk_30 = 0.0f;
-                effectPart->unk_34 = 0.0f;
+                data->unk_30 = 0.0f;
+                data->unk_34 = 0.0f;
             }
             break;
         case 4:
-            for (i = 1; i < numParts; i++, effectPart++) {
-                effectPart->unk_10 = -3.0f;
-                effectPart->unk_14 = 0.93f;
-                effectPart->unk_20 = 0.0f;
-                effectPart->unk_24 = 0.099999994f;
-                effectPart->unk_28 = 0.94f;
-                effectPart->unk_2C = 0.94f;
+            for (i = 1; i < numParts; i++, data++) {
+                data->unk_10 = -3.0f;
+                data->unk_14 = 0.93f;
+                data->unk_20 = 0.0f;
+                data->unk_24 = 0.099999994f;
+                data->unk_28 = 0.94f;
+                data->unk_2C = 0.94f;
                 theta = arg4 + ((i - 1) * 360 / (numParts - 1));
-                effectPart->x = -shim_sin_deg(theta) * 10.0f;
-                effectPart->y = 0.0f;
-                effectPart->z = -shim_cos_deg(theta) * 10.0f;
-                effectPart->unk_30 = shim_sin_deg(theta);
-                effectPart->unk_34 = shim_cos_deg(theta);
+                data->x = -shim_sin_deg(theta) * 10.0f;
+                data->y = 0.0f;
+                data->z = -shim_cos_deg(theta) * 10.0f;
+                data->unk_30 = shim_sin_deg(theta);
+                data->unk_34 = shim_cos_deg(theta);
             }
             break;
     }
 }
 
-void fx_6_init(EffectInstance* effect) {
+void landing_dust_init(EffectInstance* effect) {
 }
 
-void fx_6_update(EffectInstance* effect) {
-    Effect6* effectPart = effect->data;
+void landing_dust_update(EffectInstance* effect) {
+    LandingDustFXData* data = effect->data;
 
-    effectPart->unk_40 = D_E000CD24[effectPart->unk_38][effectPart->unk_3C++];
+    data->unk_40 = D_E000CD24[data->unk_38][data->unk_3C++];
 
-    if (effectPart->unk_40 < 0) {
+    if (data->unk_40 < 0) {
         shim_remove_effect(effect);
     } else {
-        s32 type = effectPart->type;
+        s32 type = data->type;
         s32 i;
 
-        effectPart++;
+        data++;
 
-        for (i = 1; i < effect->numParts; i++, effectPart++) {
+        for (i = 1; i < effect->numParts; i++, data++) {
             switch (type) {
                 case 0:
                 case 1:
-                    func_E000C000(effectPart);
+                    func_E000C000(data);
                     break;
                 case 2:
                     break;
                 case 3:
-                    func_E000C094(effectPart);
+                    func_E000C094(data);
                     break;
                 case 4:
-                    func_E000C0C8(effectPart);
+                    func_E000C0C8(data);
                     break;
             }
         }
     }
 }
 
-void fx_6_render(EffectInstance* effect) {
+void landing_dust_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_6_appendGfx;
+    renderTask.appendGfx = landing_dust_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -257,8 +257,8 @@ void fx_6_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_6_appendGfx(void* effect) {
-    Effect6* part = ((EffectInstance*)effect)->data;
+void landing_dust_appendGfx(void* effect) {
+    LandingDustFXData* part = ((EffectInstance*)effect)->data;
     s32 type = part->type;
     s32 temp_t0 = part->unk_40;
     Matrix4f mtx1;
diff --git a/src/effects/lens_flare.c b/src/effects/lens_flare.c
new file mode 100644
index 0000000000..b05659705b
--- /dev/null
+++ b/src/effects/lens_flare.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void lens_flare_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/lens_flare", lens_flare_main);
+
+void lens_flare_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/lens_flare", lens_flare_update);
+
+void lens_flare_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = lens_flare_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 20;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/lens_flare", lens_flare_appendGfx);
diff --git a/src/effects/light_rays.c b/src/effects/light_rays.c
new file mode 100644
index 0000000000..383e929f90
--- /dev/null
+++ b/src/effects/light_rays.c
@@ -0,0 +1,34 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void light_rays_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/light_rays", func_E006A000);
+
+INCLUDE_ASM(s32, "effects/light_rays", func_E006A0BC);
+
+INCLUDE_ASM(s32, "effects/light_rays", light_rays_main);
+
+void light_rays_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/light_rays", func_E006A464);
+
+INCLUDE_ASM(s32, "effects/light_rays", light_rays_update);
+
+void light_rays_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = light_rays_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/light_rays", func_E006A85C);
+
+INCLUDE_ASM(s32, "effects/light_rays", light_rays_appendGfx);
diff --git a/src/effects/lightning.c b/src/effects/lightning.c
new file mode 100644
index 0000000000..1db1d1dc44
--- /dev/null
+++ b/src/effects/lightning.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void lightning_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/lightning", lightning_main);
+
+void lightning_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/lightning", lightning_update);
+
+void lightning_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = lightning_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/lightning", lightning_appendGfx);
diff --git a/src/effects/effect_94.c b/src/effects/lightning_bolt.c
similarity index 82%
rename from src/effects/effect_94.c
rename to src/effects/lightning_bolt.c
index 2252f0738f..7aa8aadeba 100644
--- a/src/effects/effect_94.c
+++ b/src/effects/lightning_bolt.c
@@ -1,10 +1,10 @@
 #include "common.h"
 #include "effects_internal.h"
 
-typedef struct Effect94 {
+typedef struct LightningBoltFXData {
     /* 0x00 */ char unk_00[0xC];
     /* 0x0C */ f32 unk_0C;
-} Effect94; // size = 0x??
+} LightningBoltFXData; // size = 0x??
 
 s32 D_E00BCC30[] = { 0x05050505, 0x05050505, 0x05050505, 0x0A090301, 0x00000000, 0x00000000, 0x05050505, 0x05050505, 0x05050505, 0x08070605, 0x04030201, 0x00000000, 0x23051905, 0x00192305, 0x0F000000, 0x0A0D0F0C, 0x0B0D0A0C, 0x05010000, 0x2D0F230F, 0x00232D37, 0x19050200, 0x0D0A0C0A, 0x0D0A0D0A, 0x0C090501, 0x0F0F0F0F, 0x0F0F000F, 0x0F050200, 0x0E0A0F0A, 0x0D1E201E, 0x1832283C, 0x01050F0F, 0x232D2823, 0x19050200, 0x04060A05, 0x080E060A, 0x0E233232, 0x010F190F, 0x19232D28, 0x230F0500, 0x0202170C, 0x080F0F05, 0x0612263C, 0x1E190F05, 0x0F0F191E, 0x23190500, 0x0303030B, 0x030C0405, 0x020C2A32, 0x2121140C, 0x19110F14, 0x16140500, 0x03030302, 0x0A02020C, 0x02020214, 0x1E1E1919, 0x23140F0A, 0x0F0F0500, 0x02020202, 0x02020602, 0x02020605, 0x1B1B1616, 0x20110C07, 0x0C0C0200, 0x02020202, 0x02020202, 0x02020200 };
 
@@ -12,26 +12,26 @@ s32 D_E00BCD38[] = { 0x19191905, 0x19051919, 0x05191919, 0x04030201, 0x00000000,
 
 s32 D_E00BCE40[] = { D_E00BCC30, D_E00BCD38, 0x00000000, 0x00000000 };
 
-void fx_94_appendGfx(void* effect);
+void lightning_bolt_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_94", fx_94_main);
+INCLUDE_ASM(s32, "effects/lightning_bolt", lightning_bolt_main);
 
-void fx_94_init(void) {
+void lightning_bolt_init(void) {
 }
 
 f32 func_E00BC1D8(f32 arg0) {
     return (f32)shim_rand_int((s32)arg0) - arg0 * 0.5;
 }
 
-INCLUDE_ASM(s32, "effects/effect_94", fx_94_update);
+INCLUDE_ASM(s32, "effects/lightning_bolt", lightning_bolt_update);
 
-void fx_94_render(EffectInstance *effect) {
-    Effect94* effect94 = effect->data;
+void lightning_bolt_render(EffectInstance *effect) {
+    LightningBoltFXData* effect94 = effect->data;
     RenderTask renderTask;
     RenderTask* retTask;
     RenderTask* renderTaskPointer = &renderTask;
 
-    renderTask.appendGfx = fx_94_appendGfx;
+    renderTask.appendGfx = lightning_bolt_appendGfx;
     renderTask.appendGfxArg = effect;
     if (gGameStatusPtr->isBattle == TRUE) {
         renderTask.distance = effect94->unk_0C + 1000.0f;
@@ -47,4 +47,4 @@ void fx_94_render(EffectInstance *effect) {
 void func_E00BC36C(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_94", fx_94_appendGfx);
+INCLUDE_ASM(s32, "effects/lightning_bolt", lightning_bolt_appendGfx);
diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c
new file mode 100644
index 0000000000..d4e30c8ad6
--- /dev/null
+++ b/src/effects/lil_oink.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void lil_oink_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/lil_oink", lil_oink_main);
+
+void lil_oink_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/lil_oink", lil_oink_update);
+
+void lil_oink_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = lil_oink_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/lil_oink", lil_oink_appendGfx);
diff --git a/src/effects/merlin_house_stars.c b/src/effects/merlin_house_stars.c
new file mode 100644
index 0000000000..bf797fd2f7
--- /dev/null
+++ b/src/effects/merlin_house_stars.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void merlin_house_stars_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/merlin_house_stars", merlin_house_stars_main);
+
+void merlin_house_stars_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/merlin_house_stars", merlin_house_stars_update);
+
+void merlin_house_stars_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = merlin_house_stars_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00A639C(void) {
+}
+
+INCLUDE_ASM(s32, "effects/merlin_house_stars", merlin_house_stars_appendGfx);
diff --git a/src/effects/misc_particles.c b/src/effects/misc_particles.c
new file mode 100644
index 0000000000..66ce8d62b7
--- /dev/null
+++ b/src/effects/misc_particles.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void misc_particles_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/misc_particles", misc_particles_main);
+
+void misc_particles_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/misc_particles", misc_particles_update);
+
+void misc_particles_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = misc_particles_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 7;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00E4954(void) {
+}
+
+INCLUDE_ASM(s32, "effects/misc_particles", misc_particles_appendGfx);
diff --git a/src/effects/effect_81.c b/src/effects/motion_blur_flame.c
similarity index 64%
rename from src/effects/effect_81.c
rename to src/effects/motion_blur_flame.c
index aa07bea10d..93a9d26a28 100644
--- a/src/effects/effect_81.c
+++ b/src/effects/motion_blur_flame.c
@@ -7,20 +7,20 @@ s32 D_E00A29DC[] = { 0x00000010, 0x00000010, 0x3F800000, 0x3F800000, 0x00000008,
 
 s32 D_E00A2A24[] = { 0x00000064, 0x0000003C, 0x0000001E, 0x0000000A, 0x00000000, 0x00000000, 0x00000000 };
 
-void fx_81_appendGfx(void* effect);
+void motion_blur_flame_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_81", fx_81_main);
+INCLUDE_ASM(s32, "effects/motion_blur_flame", motion_blur_flame_main);
 
-void fx_81_init(void) {
+void motion_blur_flame_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_81", fx_81_update);
+INCLUDE_ASM(s32, "effects/motion_blur_flame", motion_blur_flame_update);
 
-void fx_81_render(EffectInstance* effect) {
+void motion_blur_flame_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_81_appendGfx;
+    renderTask.appendGfx = motion_blur_flame_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 100;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -32,4 +32,4 @@ void fx_81_render(EffectInstance* effect) {
 void func_E00A2234(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_81", fx_81_appendGfx);
+INCLUDE_ASM(s32, "effects/motion_blur_flame", motion_blur_flame_appendGfx);
diff --git a/src/effects/moving_cloud.c b/src/effects/moving_cloud.c
new file mode 100644
index 0000000000..a67f27e020
--- /dev/null
+++ b/src/effects/moving_cloud.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void moving_cloud_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/moving_cloud", moving_cloud_main);
+
+void moving_cloud_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/moving_cloud", moving_cloud_update);
+
+void moving_cloud_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = moving_cloud_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/moving_cloud", moving_cloud_appendGfx);
diff --git a/src/effects/music_note.c b/src/effects/music_note.c
new file mode 100644
index 0000000000..efb5f52c49
--- /dev/null
+++ b/src/effects/music_note.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void music_note_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/music_note", music_note_main);
+
+void music_note_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/music_note", music_note_update);
+
+void music_note_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = music_note_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/music_note", music_note_appendGfx);
diff --git a/src/effects/effect_127.c b/src/effects/partner_buff.c
similarity index 69%
rename from src/effects/effect_127.c
rename to src/effects/partner_buff.c
index 8642305236..12c3f25ca7 100644
--- a/src/effects/effect_127.c
+++ b/src/effects/partner_buff.c
@@ -1,17 +1,17 @@
 #include "common.h"
 #include "effects_internal.h"
 
-INCLUDE_ASM(s32, "effects/effect_127", fx_127_main);
+INCLUDE_ASM(s32, "effects/partner_buff", partner_buff_main);
 
-void fx_127_init(void) {
+void partner_buff_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_127", fx_127_update);
+INCLUDE_ASM(s32, "effects/partner_buff", partner_buff_update);
 
-void fx_127_render(void) {
+void partner_buff_render(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_127", func_E011A3A0);
+INCLUDE_ASM(s32, "effects/partner_buff", func_E011A3A0);
 
 void func_E011A3BC(s16 alpha) {
     if (alpha == 255) {
@@ -26,6 +26,6 @@ void func_E011A3BC(s16 alpha) {
     }
 }
 
-INCLUDE_ASM(s32, "effects/effect_127", func_E011A48C);
+INCLUDE_ASM(s32, "effects/partner_buff", func_E011A48C);
 
-INCLUDE_ASM(s32, "effects/effect_127", func_E011A700);
+INCLUDE_ASM(s32, "effects/partner_buff", func_E011A700);
diff --git a/src/effects/peach_star_beam.c b/src/effects/peach_star_beam.c
new file mode 100644
index 0000000000..45a6533954
--- /dev/null
+++ b/src/effects/peach_star_beam.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void peach_star_beam_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/peach_star_beam", peach_star_beam_main);
+
+void peach_star_beam_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/peach_star_beam", peach_star_beam_update);
+
+void peach_star_beam_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = peach_star_beam_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/peach_star_beam", peach_star_beam_appendGfx);
diff --git a/src/effects/pink_sparkles.c b/src/effects/pink_sparkles.c
new file mode 100644
index 0000000000..d3e550f3c4
--- /dev/null
+++ b/src/effects/pink_sparkles.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void pink_sparkles_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/pink_sparkles", pink_sparkles_main);
+
+void pink_sparkles_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/pink_sparkles", pink_sparkles_update);
+
+void pink_sparkles_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = pink_sparkles_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/pink_sparkles", pink_sparkles_appendGfx);
diff --git a/src/effects/purple_ring.c b/src/effects/purple_ring.c
new file mode 100644
index 0000000000..6e4a2b4125
--- /dev/null
+++ b/src/effects/purple_ring.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void purple_ring_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/purple_ring", purple_ring_main);
+
+void purple_ring_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/purple_ring", purple_ring_update);
+
+void purple_ring_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = purple_ring_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/purple_ring", purple_ring_appendGfx);
diff --git a/src/effects/quizmo_answer.c b/src/effects/quizmo_answer.c
new file mode 100644
index 0000000000..df48fb1663
--- /dev/null
+++ b/src/effects/quizmo_answer.c
@@ -0,0 +1,4 @@
+#include "common.h"
+#include "effects_internal.h"
+
+INCLUDE_ASM(s32, "effects/quizmo_answer", quizmo_answer_main);
diff --git a/src/effects/quizmo_assistant.c b/src/effects/quizmo_assistant.c
new file mode 100644
index 0000000000..744fb9c43e
--- /dev/null
+++ b/src/effects/quizmo_assistant.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void quizmo_assistant_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/quizmo_assistant", quizmo_assistant_main);
+
+void quizmo_assistant_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/quizmo_assistant", quizmo_assistant_update);
+
+void quizmo_assistant_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = quizmo_assistant_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/quizmo_assistant", quizmo_assistant_appendGfx);
diff --git a/src/effects/effect_84.c b/src/effects/quizmo_audience.c
similarity index 67%
rename from src/effects/effect_84.c
rename to src/effects/quizmo_audience.c
index 7b652973cd..b8f869fefe 100644
--- a/src/effects/effect_84.c
+++ b/src/effects/quizmo_audience.c
@@ -9,20 +9,20 @@ s32 D_E00A8678[] = { 0x00000001, 0x00020002, 0x00030003, 0x00030002, 0x00020001,
 
 s32 D_E00A8690[] = { D_E00A8648, 0x18000000, D_E00A8678, 0x0C000000 };
 
-void fx_84_appendGfx(void* effect);
+void quizmo_audience_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_84", fx_84_main);
+INCLUDE_ASM(s32, "effects/quizmo_audience", quizmo_audience_main);
 
-void fx_84_init(void) {
+void quizmo_audience_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_84", fx_84_update);
+INCLUDE_ASM(s32, "effects/quizmo_audience", quizmo_audience_update);
 
-void fx_84_render(EffectInstance* effect) {
+void quizmo_audience_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_84_appendGfx;
+    renderTask.appendGfx = quizmo_audience_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -34,4 +34,4 @@ void fx_84_render(EffectInstance* effect) {
 void func_E00A8318(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_84", fx_84_appendGfx);
+INCLUDE_ASM(s32, "effects/quizmo_audience", quizmo_audience_appendGfx);
diff --git a/src/effects/quizmo_stage.c b/src/effects/quizmo_stage.c
new file mode 100644
index 0000000000..37117516c2
--- /dev/null
+++ b/src/effects/quizmo_stage.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void quizmo_stage_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/quizmo_stage", quizmo_stage_main);
+
+void quizmo_stage_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/quizmo_stage", quizmo_stage_update);
+
+void quizmo_stage_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = quizmo_stage_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/quizmo_stage", quizmo_stage_appendGfx);
diff --git a/src/effects/radial_shimmer.c b/src/effects/radial_shimmer.c
new file mode 100644
index 0000000000..340d653154
--- /dev/null
+++ b/src/effects/radial_shimmer.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void radial_shimmer_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/radial_shimmer", radial_shimmer_main);
+
+void radial_shimmer_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/radial_shimmer", radial_shimmer_update);
+
+void radial_shimmer_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = radial_shimmer_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/radial_shimmer", radial_shimmer_appendGfx);
diff --git a/src/effects/effect_79.c b/src/effects/radiating_energy_orb.c
similarity index 51%
rename from src/effects/effect_79.c
rename to src/effects/radiating_energy_orb.c
index b5def0cc33..c4512c0729 100644
--- a/src/effects/effect_79.c
+++ b/src/effects/radiating_energy_orb.c
@@ -9,20 +9,20 @@ s32 D_E009EDF8[] = { 0x090014D0 };
 
 s32 D_E009EDFC[] = { 0x090014F0 };
 
-void fx_79_appendGfx(void* effect);
+void radiating_energy_orb_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_79", fx_79_main);
+INCLUDE_ASM(s32, "effects/radiating_energy_orb", radiating_energy_orb_main);
 
-void fx_79_init(void) {
+void radiating_energy_orb_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_79", fx_79_update);
+INCLUDE_ASM(s32, "effects/radiating_energy_orb", radiating_energy_orb_update);
 
-void fx_79_render(EffectInstance* effect) {
+void radiating_energy_orb_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_79_appendGfx;
+    renderTask.appendGfx = radiating_energy_orb_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER3;
@@ -31,4 +31,4 @@ void fx_79_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_79", fx_79_appendGfx);
+INCLUDE_ASM(s32, "effects/radiating_energy_orb", radiating_energy_orb_appendGfx);
diff --git a/src/effects/recover.c b/src/effects/recover.c
new file mode 100644
index 0000000000..dd5012954c
--- /dev/null
+++ b/src/effects/recover.c
@@ -0,0 +1,16 @@
+#include "common.h"
+#include "effects_internal.h"
+
+INCLUDE_ASM(s32, "effects/recover", recover_main);
+
+void recover_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/recover", recover_update);
+
+void recover_render(void) {
+}
+
+INCLUDE_ASM(s32, "effects/recover", func_E008042C);
+
+INCLUDE_ASM(s32, "effects/recover", func_E0080448);
diff --git a/src/effects/red_impact.c b/src/effects/red_impact.c
new file mode 100644
index 0000000000..7a8bb58c7a
--- /dev/null
+++ b/src/effects/red_impact.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void red_impact_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/red_impact", red_impact_main);
+
+void red_impact_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/red_impact", red_impact_update);
+
+void red_impact_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = red_impact_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/red_impact", red_impact_appendGfx);
diff --git a/src/effects/ring_blast.c b/src/effects/ring_blast.c
new file mode 100644
index 0000000000..1e7cc0069a
--- /dev/null
+++ b/src/effects/ring_blast.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void ring_blast_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/ring_blast", ring_blast_main);
+
+void ring_blast_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/ring_blast", ring_blast_update);
+
+void ring_blast_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = ring_blast_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/ring_blast", ring_blast_appendGfx);
diff --git a/src/effects/rising_bubble.c b/src/effects/rising_bubble.c
new file mode 100644
index 0000000000..436e281c76
--- /dev/null
+++ b/src/effects/rising_bubble.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void rising_bubble_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/rising_bubble", rising_bubble_main);
+
+void rising_bubble_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/rising_bubble", rising_bubble_update);
+
+void rising_bubble_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = rising_bubble_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/rising_bubble", rising_bubble_appendGfx);
diff --git a/src/effects/shape_spell.c b/src/effects/shape_spell.c
new file mode 100644
index 0000000000..b21de6b0d7
--- /dev/null
+++ b/src/effects/shape_spell.c
@@ -0,0 +1,30 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void shape_spell_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/shape_spell", shape_spell_main);
+
+void shape_spell_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shape_spell", shape_spell_update);
+
+void shape_spell_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = shape_spell_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/shape_spell", func_E0024324);
+
+INCLUDE_ASM(s32, "effects/shape_spell", func_E00243BC);
+
+INCLUDE_ASM(s32, "effects/shape_spell", shape_spell_appendGfx);
diff --git a/src/effects/shattering_stones.c b/src/effects/shattering_stones.c
new file mode 100644
index 0000000000..98c6dde812
--- /dev/null
+++ b/src/effects/shattering_stones.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void shattering_stones_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/shattering_stones", shattering_stones_main);
+
+void shattering_stones_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shattering_stones", shattering_stones_update);
+
+void shattering_stones_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = shattering_stones_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/shattering_stones", shattering_stones_appendGfx);
diff --git a/src/effects/shimmer_burst.c b/src/effects/shimmer_burst.c
new file mode 100644
index 0000000000..bef5663763
--- /dev/null
+++ b/src/effects/shimmer_burst.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void shimmer_burst_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/shimmer_burst", shimmer_burst_main);
+
+void shimmer_burst_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shimmer_burst", shimmer_burst_update);
+
+void shimmer_burst_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = shimmer_burst_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E0070738(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shimmer_burst", shimmer_burst_appendGfx);
diff --git a/src/effects/shimmer_wave.c b/src/effects/shimmer_wave.c
new file mode 100644
index 0000000000..0900936b3d
--- /dev/null
+++ b/src/effects/shimmer_wave.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void shimmer_wave_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/shimmer_wave", shimmer_wave_main);
+
+void shimmer_wave_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shimmer_wave", shimmer_wave_update);
+
+void shimmer_wave_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = shimmer_wave_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/shimmer_wave", shimmer_wave_appendGfx);
diff --git a/src/effects/shiny_flare.c b/src/effects/shiny_flare.c
new file mode 100644
index 0000000000..af22728120
--- /dev/null
+++ b/src/effects/shiny_flare.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void shiny_flare_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/shiny_flare", shiny_flare_main);
+
+void shiny_flare_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shiny_flare", shiny_flare_update);
+
+void shiny_flare_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = shiny_flare_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00DA228(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shiny_flare", shiny_flare_appendGfx);
diff --git a/src/effects/shockwave.c b/src/effects/shockwave.c
new file mode 100644
index 0000000000..c3f541c69b
--- /dev/null
+++ b/src/effects/shockwave.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void shockwave_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/shockwave", shockwave_main);
+
+void shockwave_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/shockwave", shockwave_update);
+
+void shockwave_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = shockwave_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/shockwave", shockwave_appendGfx);
diff --git a/src/effects/sleep_bubble.c b/src/effects/sleep_bubble.c
new file mode 100644
index 0000000000..ce0c42bfcf
--- /dev/null
+++ b/src/effects/sleep_bubble.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void sleep_bubble_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/sleep_bubble", sleep_bubble_main);
+
+void sleep_bubble_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/sleep_bubble", sleep_bubble_update);
+
+void sleep_bubble_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = sleep_bubble_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/sleep_bubble", sleep_bubble_appendGfx);
diff --git a/src/effects/effect_73.c b/src/effects/small_gold_sparkle.c
similarity index 79%
rename from src/effects/effect_73.c
rename to src/effects/small_gold_sparkle.c
index 3b1538021b..42ef8fbe54 100644
--- a/src/effects/effect_73.c
+++ b/src/effects/small_gold_sparkle.c
@@ -18,25 +18,25 @@ static s32 sPartParams[4 * 5] = {
     4, 2, 4, 0, 40,
 };
 
-void fx_73_init(EffectInstance* effect);
-void fx_73_update(EffectInstance* effect);
-void fx_73_render(EffectInstance* effect);
-void fx_73_appendGfx(void* effect);
+void small_gold_sparkle_init(EffectInstance* effect);
+void small_gold_sparkle_update(EffectInstance* effect);
+void small_gold_sparkle_render(EffectInstance* effect);
+void small_gold_sparkle_appendGfx(void* effect);
 
-EffectInstance* fx_73_main(EffectInstanceDataThing* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
+EffectInstance* small_gold_sparkle_main(EffectInstanceDataThing* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect73* data;
-    Effect73* part;
+    SmallGoldSparkleFXData* data;
+    SmallGoldSparkleFXData* part;
     s32 numParts = 5;
     s32 i;
 
-    bp.init = fx_73_init;
-    bp.update = fx_73_update;
-    bp.renderWorld = fx_73_render;
+    bp.init = small_gold_sparkle_init;
+    bp.update = small_gold_sparkle_update;
+    bp.renderWorld = small_gold_sparkle_render;
     bp.unk_00 = 0;
     bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_49;
+    bp.effectID = EFFECT_SMALL_GOLD_SPARKLE;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = numParts;
@@ -66,11 +66,11 @@ EffectInstance* fx_73_main(EffectInstanceDataThing* arg0, f32 arg1, f32 arg2, f3
     return effect;
 }
 
-void fx_73_init(EffectInstance* effect) {
+void small_gold_sparkle_init(EffectInstance* effect) {
 }
 
-void fx_73_update(EffectInstance* effect) {
-    Effect73* part = (Effect73*) effect->data;
+void small_gold_sparkle_update(EffectInstance* effect) {
+    SmallGoldSparkleFXData* part = (SmallGoldSparkleFXData*) effect->data;
     s32 i;
 
     part->unk_14--;
@@ -96,11 +96,11 @@ void fx_73_update(EffectInstance* effect) {
     }
 }
 
-void fx_73_render(EffectInstance* effect) {
+void small_gold_sparkle_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_73_appendGfx;
+    renderTask.appendGfx = small_gold_sparkle_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -109,8 +109,8 @@ void fx_73_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_73_appendGfx(void* effect) {
-    Effect73* part = ((EffectInstance*)effect)->data;
+void small_gold_sparkle_appendGfx(void* effect) {
+    SmallGoldSparkleFXData* part = ((EffectInstance*)effect)->data;
     Matrix4f sp18;
     Matrix4f sp58;
     Matrix4f sp98;
diff --git a/src/effects/smoke_burst.c b/src/effects/smoke_burst.c
new file mode 100644
index 0000000000..4ee861cb52
--- /dev/null
+++ b/src/effects/smoke_burst.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void smoke_burst_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/smoke_burst", smoke_burst_main);
+
+void smoke_burst_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/smoke_burst", smoke_burst_update);
+
+void smoke_burst_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = smoke_burst_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/smoke_burst", smoke_burst_appendGfx);
diff --git a/src/effects/smoke_impact.c b/src/effects/smoke_impact.c
new file mode 100644
index 0000000000..fb9a9c496f
--- /dev/null
+++ b/src/effects/smoke_impact.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void smoke_impact_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/smoke_impact", smoke_impact_main);
+
+void smoke_impact_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/smoke_impact", smoke_impact_update);
+
+void smoke_impact_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = smoke_impact_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/smoke_impact", smoke_impact_appendGfx);
diff --git a/src/effects/smoke_ring.c b/src/effects/smoke_ring.c
new file mode 100644
index 0000000000..df5f1bb49b
--- /dev/null
+++ b/src/effects/smoke_ring.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void smoke_ring_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/smoke_ring", smoke_ring_main);
+
+void smoke_ring_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/smoke_ring", smoke_ring_update);
+
+void smoke_ring_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = smoke_ring_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/smoke_ring", smoke_ring_appendGfx);
diff --git a/src/effects/snaking_static.c b/src/effects/snaking_static.c
new file mode 100644
index 0000000000..8503f8b75d
--- /dev/null
+++ b/src/effects/snaking_static.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void snaking_static_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/snaking_static", snaking_static_main);
+
+void snaking_static_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/snaking_static", snaking_static_update);
+
+void snaking_static_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = snaking_static_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00AE544(void) {
+}
+
+INCLUDE_ASM(s32, "effects/snaking_static", snaking_static_appendGfx);
diff --git a/src/effects/snowfall.c b/src/effects/snowfall.c
new file mode 100644
index 0000000000..aa8ec577fe
--- /dev/null
+++ b/src/effects/snowfall.c
@@ -0,0 +1,30 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void snowfall_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/snowfall", func_E008A000);
+
+INCLUDE_ASM(s32, "effects/snowfall", snowfall_main);
+
+void snowfall_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/snowfall", func_E008A290);
+
+INCLUDE_ASM(s32, "effects/snowfall", snowfall_update);
+
+void snowfall_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = snowfall_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/snowfall", snowfall_appendGfx);
diff --git a/src/effects/effect_14.c b/src/effects/snowflake.c
similarity index 81%
rename from src/effects/effect_14.c
rename to src/effects/snowflake.c
index 94d8984510..cde2ea8f45 100644
--- a/src/effects/effect_14.c
+++ b/src/effects/snowflake.c
@@ -6,24 +6,24 @@ s32 D_E001C5E0 = 0;
 extern Gfx D_09000900[];
 extern Gfx D_090009E8[];
 
-void fx_14_init(EffectInstance* effect);
-void fx_14_update(EffectInstance* effect);
-void fx_14_render(EffectInstance* effect);
-void fx_14_appendGfx(void* effect);
+void snowflake_init(EffectInstance* effect);
+void snowflake_update(EffectInstance* effect);
+void snowflake_render(EffectInstance* effect);
+void snowflake_appendGfx(void* effect);
 
-void fx_14_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) {
+void snowflake_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect14* part;
+    SnowflakeFXData* part;
     s32 numParts = 1;
     f32 phi_f4;
 
     bp.unk_00 = 0;
-    bp.init = fx_14_init;
-    bp.update = fx_14_update;
-    bp.renderWorld = fx_14_render;
+    bp.init = snowflake_init;
+    bp.update = snowflake_update;
+    bp.renderWorld = snowflake_render;
     bp.unk_14 = 0;
-    bp.effectID = EFFECT_ID_0E;
+    bp.effectID = EFFECT_SNOWFLAKE;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = 1;
@@ -54,11 +54,11 @@ void fx_14_main(f32 arg0, f32 arg1, f32 arg2, s32 arg3, s32 arg4) {
     }
 }
 
-void fx_14_init(EffectInstance* effect) {
+void snowflake_init(EffectInstance* effect) {
 }
 
-void fx_14_update(EffectInstance* effect) {
-    Effect14* data = effect->data;
+void snowflake_update(EffectInstance* effect) {
+    SnowflakeFXData* data = effect->data;
 
     data->unk_28--;
     if (data->unk_28 < 0) {
@@ -81,9 +81,9 @@ void fx_14_update(EffectInstance* effect) {
     data->unk_1C += data->unk_24;
 }
 
-void fx_14_render(EffectInstance* effect) {
+void snowflake_render(EffectInstance* effect) {
     PlayerStatus* playerStatus = &gPlayerStatus;
-    Effect14* effect14 = effect->data;
+    SnowflakeFXData* effect14 = effect->data;
     RenderTask renderTask;
     RenderTask* renderTaskPtr = &renderTask;
     RenderTask* retTask;
@@ -108,7 +108,7 @@ void fx_14_render(EffectInstance* effect) {
         }
     }
 
-    renderTaskPtr->appendGfx = &fx_14_appendGfx;
+    renderTaskPtr->appendGfx = &snowflake_appendGfx;
     renderTaskPtr->appendGfxArg = effect;
     renderTaskPtr->distance = 0;
     renderTaskPtr->renderMode = RENDER_MODE_2D;
@@ -117,10 +117,10 @@ void fx_14_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_14_appendGfx(void* effect) {
+void snowflake_appendGfx(void* effect) {
     Matrix4f sp18, sp58, sp98, spD8, sp118;
     EffectInstance* effectTemp = effect;
-    Effect14* part = effectTemp->data;
+    SnowflakeFXData* part = effectTemp->data;
 
     gDPPipeSync(gMasterGfxPos++);
     gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data));
diff --git a/src/effects/snowman_doll.c b/src/effects/snowman_doll.c
new file mode 100644
index 0000000000..c345693090
--- /dev/null
+++ b/src/effects/snowman_doll.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void snowman_doll_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/snowman_doll", snowman_doll_main);
+
+void snowman_doll_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/snowman_doll", snowman_doll_update);
+
+void snowman_doll_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = snowman_doll_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = -10;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00C0758(void) {
+}
+
+INCLUDE_ASM(s32, "effects/snowman_doll", snowman_doll_appendGfx);
diff --git a/src/effects/something_rotating.c b/src/effects/something_rotating.c
new file mode 100644
index 0000000000..d86ad909b5
--- /dev/null
+++ b/src/effects/something_rotating.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void something_rotating_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/something_rotating", something_rotating_main);
+
+void something_rotating_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/something_rotating", something_rotating_update);
+
+void something_rotating_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = something_rotating_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/something_rotating", func_E01166E8);
+
+INCLUDE_ASM(s32, "effects/something_rotating", something_rotating_appendGfx);
diff --git a/src/effects/sparkles.c b/src/effects/sparkles.c
new file mode 100644
index 0000000000..2ddbd1d630
--- /dev/null
+++ b/src/effects/sparkles.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void sparkles_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/sparkles", sparkles_main);
+
+void sparkles_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/sparkles", sparkles_update);
+
+void sparkles_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = sparkles_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/sparkles", sparkles_appendGfx);
diff --git a/src/effects/spiky_white_aura.c b/src/effects/spiky_white_aura.c
new file mode 100644
index 0000000000..1e6839431b
--- /dev/null
+++ b/src/effects/spiky_white_aura.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void spiky_white_aura_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/spiky_white_aura", spiky_white_aura_main);
+
+void spiky_white_aura_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/spiky_white_aura", spiky_white_aura_update);
+
+void spiky_white_aura_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = spiky_white_aura_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/spiky_white_aura", spiky_white_aura_appendGfx);
diff --git a/src/effects/spirit_card.c b/src/effects/spirit_card.c
new file mode 100644
index 0000000000..0aeb3adbf1
--- /dev/null
+++ b/src/effects/spirit_card.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void spirit_card_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/spirit_card", spirit_card_main);
+
+void spirit_card_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/spirit_card", spirit_card_update);
+
+void spirit_card_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = spirit_card_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_XLU_LAYER1;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/spirit_card", func_E0112330);
+
+INCLUDE_ASM(s32, "effects/spirit_card", spirit_card_appendGfx);
diff --git a/src/effects/effect_89.c b/src/effects/squirt.c
similarity index 57%
rename from src/effects/effect_89.c
rename to src/effects/squirt.c
index 21627cc3fe..e2fa3589f2 100644
--- a/src/effects/effect_89.c
+++ b/src/effects/squirt.c
@@ -3,20 +3,20 @@
 
 s32 D_E00B2BA0[] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFC88020, 0x00000000 };
 
-void fx_89_appendGfx(void* effect);
+void squirt_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_89", fx_89_main);
+INCLUDE_ASM(s32, "effects/squirt", squirt_main);
 
-void fx_89_init(void) {
+void squirt_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_89", fx_89_update);
+INCLUDE_ASM(s32, "effects/squirt", squirt_update);
 
-void fx_89_render(EffectInstance* effect) {
+void squirt_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_89_appendGfx;
+    renderTask.appendGfx = squirt_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -28,4 +28,4 @@ void fx_89_render(EffectInstance* effect) {
 void func_E00B24A8(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_89", fx_89_appendGfx);
+INCLUDE_ASM(s32, "effects/squirt", squirt_appendGfx);
diff --git a/src/effects/effect_15.c b/src/effects/star.c
similarity index 84%
rename from src/effects/effect_15.c
rename to src/effects/star.c
index fc9191cc02..5b97f79503 100644
--- a/src/effects/effect_15.c
+++ b/src/effects/star.c
@@ -6,14 +6,14 @@ extern Gfx D_09001650[];
 extern Gfx D_09001780[];
 extern Gfx D_090017D0[];
 
-void fx_15_init(EffectInstance* effect);
-void fx_15_update(EffectInstance* effect);
-void fx_15_render(EffectInstance* effect);
-void fx_15_appendGfx(void* effect);
+void star_init(EffectInstance* effect);
+void star_update(EffectInstance* effect);
+void star_render(EffectInstance* effect);
+void star_appendGfx(void* effect);
 
-EffectInstance* fx_15_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) {
+EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) {
     EffectBlueprint bp;
-    Effect15* part;
+    StarFXData* part;
     EffectInstance* effect;
     s32 numParts = 1;
     s32 i;
@@ -32,11 +32,11 @@ EffectInstance* fx_15_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32
     f32 phi_f26;
 
     bp.unk_00 = 0;
-    bp.init = fx_15_init;
-    bp.update = fx_15_update;
-    bp.renderWorld = fx_15_render;
+    bp.init = star_init;
+    bp.update = star_update;
+    bp.renderWorld = star_render;
     bp.unk_14 = 0;
-    bp.effectID = EFFECT_ID_0F;
+    bp.effectID = EFFECT_STAR;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = 1;
@@ -112,12 +112,12 @@ EffectInstance* fx_15_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32
     return effect;
 }
 
-void fx_15_init(EffectInstance* effect) {
+void star_init(EffectInstance* effect) {
 }
 
-void fx_15_update(EffectInstance* effect) {
+void star_update(EffectInstance* effect) {
     PlayerStatus* playerStatus = &gPlayerStatus;
-    Effect15* data = effect->data;
+    StarFXData* data = effect->data;
     f32 x, y, z, length;
     f32 xTemp, yTemp, zTemp;
 
@@ -145,8 +145,8 @@ void fx_15_update(EffectInstance* effect) {
             data->unk_10 = data->unk_10 * 0.7;
             data->unk_34 = data->unk_34 * 0.7;
             data->unk_2C = data->unk_2C * 0.7;
-            shim_load_effect(6);
-            fx_6_main(0, data->unk_04, data->unk_08 - 5.0f, data->unk_0C, 0.0f);
+            shim_load_effect(EFFECT_LANDING_DUST);
+            landing_dust_main(0, data->unk_04, data->unk_08 - 5.0f, data->unk_0C, 0.0f);
 
             if (!gGameStatusPtr->isBattle) {
                 shim_sfx_play_sound_at_position(0xB0000016, 0, data->unk_04, data->unk_08, data->unk_0C);
@@ -178,15 +178,15 @@ void fx_15_update(EffectInstance* effect) {
     }
 }
 
-void fx_15_render(EffectInstance* effect) {
-    Effect15* effect15 = effect->data;
+void star_render(EffectInstance* effect) {
+    StarFXData* effect15 = effect->data;
     RenderTask renderTask;
     RenderTask* renderTaskPtr = &renderTask;
     RenderTask* retTask;
     s32 renderModeTemp;
 
     renderTask.appendGfxArg = effect;
-    renderTask.appendGfx = fx_15_appendGfx;
+    renderTask.appendGfx = star_appendGfx;
     renderTask.distance = 0;
     if (effect15->unk_38 != 0) {
         renderModeTemp = RENDER_MODE_2D;
@@ -198,4 +198,4 @@ void fx_15_render(EffectInstance* effect) {
     retTask = shim_queue_render_task(&renderTask);
 }
 
-INCLUDE_ASM(s32, "effects/effect_15", fx_15_appendGfx);
+INCLUDE_ASM(s32, "effects/star", star_appendGfx);
diff --git a/src/effects/star_outline.c b/src/effects/star_outline.c
new file mode 100644
index 0000000000..503b314420
--- /dev/null
+++ b/src/effects/star_outline.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void star_outline_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/star_outline", star_outline_main);
+
+void star_outline_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/star_outline", star_outline_update);
+
+void star_outline_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = star_outline_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/star_outline", star_outline_appendGfx);
diff --git a/src/effects/star_spirits_energy.c b/src/effects/star_spirits_energy.c
new file mode 100644
index 0000000000..b9ba3379a6
--- /dev/null
+++ b/src/effects/star_spirits_energy.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void star_spirits_energy_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/star_spirits_energy", star_spirits_energy_main);
+
+void star_spirits_energy_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/star_spirits_energy", star_spirits_energy_update);
+
+void star_spirits_energy_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = star_spirits_energy_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/star_spirits_energy", star_spirits_energy_appendGfx);
diff --git a/src/effects/stars_burst.c b/src/effects/stars_burst.c
new file mode 100644
index 0000000000..6349265157
--- /dev/null
+++ b/src/effects/stars_burst.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void stars_burst_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/stars_burst", stars_burst_main);
+
+void stars_burst_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stars_burst", stars_burst_update);
+
+void stars_burst_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = stars_burst_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/stars_burst", stars_burst_appendGfx);
diff --git a/src/effects/stars_orbiting.c b/src/effects/stars_orbiting.c
new file mode 100644
index 0000000000..acb0c71d72
--- /dev/null
+++ b/src/effects/stars_orbiting.c
@@ -0,0 +1,16 @@
+#include "common.h"
+#include "effects_internal.h"
+
+INCLUDE_ASM(s32, "effects/stars_orbiting", stars_orbiting_main);
+
+void stars_orbiting_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stars_orbiting", stars_orbiting_update);
+
+void stars_orbiting_render(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stars_orbiting", func_E005E318);
+
+INCLUDE_ASM(s32, "effects/stars_orbiting", func_E005E334);
diff --git a/src/effects/stars_shimmer.c b/src/effects/stars_shimmer.c
new file mode 100644
index 0000000000..b66467f996
--- /dev/null
+++ b/src/effects/stars_shimmer.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void stars_shimmer_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/stars_shimmer", stars_shimmer_main);
+
+void stars_shimmer_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stars_shimmer", stars_shimmer_update);
+
+void stars_shimmer_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = stars_shimmer_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/stars_shimmer", stars_shimmer_appendGfx);
diff --git a/src/effects/stars_spread.c b/src/effects/stars_spread.c
new file mode 100644
index 0000000000..972b1113d7
--- /dev/null
+++ b/src/effects/stars_spread.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void stars_spread_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/stars_spread", stars_spread_main);
+
+void stars_spread_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stars_spread", stars_spread_update);
+
+void stars_spread_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = stars_spread_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/stars_spread", stars_spread_appendGfx);
diff --git a/src/effects/stat_change.c b/src/effects/stat_change.c
new file mode 100644
index 0000000000..1679969d3e
--- /dev/null
+++ b/src/effects/stat_change.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+s32 D_E00AC7B0[] = { 0x09002700, 0x09002700, 0x09002798 };
+
+s32 D_E00AC7BC[] = { 0x09002860, 0x09002880, 0x09002860 };
+
+s32 D_E00AC7C8[] = { 0x09002950, 0x09002990, 0x090029D0, 0x09002A10, 0x09002A50, 0x09002A90, 0x09002AD0, 0x09002B10, 0x09002B50, 0x09002B90, 0x09002BD0, 0x09002C10 };
+
+s32 D_E00AC7F8[] = { 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000 };
+
+s32 D_E00AC83C[] = { 0xFF96FF82, 0xFF64FF46, 0xFF3CFF50, 0xFF6EFF73, 0xFF6BFF5C, 0xFF5AFF5E, 0xFF67FF68, 0xFF67FF64, 0xFF62FF63, 0xFF65FF64, 0xF064DC64, 0xC864B464, 0xA0648264, 0x64644664, 0x32642864, 0x1E641464, 0x0A640000 };
+
+s32 D_E00AC880[] = { 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0xFFFFFFFF, 0x00000001, 0xFFFFFFFE, 0x00000001, 0xFFFFFFFD, 0x00000002, 0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000003, 0x00000000, 0x00000000 };
+
+INCLUDE_ASM(s32, "effects/stat_change", stat_change_main);
+
+void stat_change_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stat_change", stat_change_update);
+
+void stat_change_render(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stat_change", func_E00AC288);
+
+INCLUDE_ASM(s32, "effects/stat_change", func_E00AC2A4);
diff --git a/src/effects/static_status.c b/src/effects/static_status.c
new file mode 100644
index 0000000000..2add0a3a60
--- /dev/null
+++ b/src/effects/static_status.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void static_status_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/static_status", static_status_main);
+
+void static_status_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/static_status", static_status_update);
+
+void static_status_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = static_status_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_SURFACE_OPA;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00E651C(void) {
+}
+
+INCLUDE_ASM(s32, "effects/static_status", static_status_appendGfx);
diff --git a/src/effects/steam_burst.c b/src/effects/steam_burst.c
new file mode 100644
index 0000000000..f66b70fcc3
--- /dev/null
+++ b/src/effects/steam_burst.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void steam_burst_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/steam_burst", steam_burst_main);
+
+void steam_burst_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/steam_burst", steam_burst_update);
+
+void steam_burst_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = steam_burst_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_28;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/steam_burst", steam_burst_appendGfx);
diff --git a/src/effects/stop_watch.c b/src/effects/stop_watch.c
new file mode 100644
index 0000000000..486c2bbcf8
--- /dev/null
+++ b/src/effects/stop_watch.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void stop_watch_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/stop_watch", stop_watch_main);
+
+void stop_watch_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stop_watch", stop_watch_update);
+
+void stop_watch_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = stop_watch_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+void func_E00C4300(void) {
+}
+
+INCLUDE_ASM(s32, "effects/stop_watch", stop_watch_appendGfx);
diff --git a/src/effects/effect_58.c b/src/effects/sun.c
similarity index 50%
rename from src/effects/effect_58.c
rename to src/effects/sun.c
index 6f6da412f1..e27049accb 100644
--- a/src/effects/effect_58.c
+++ b/src/effects/sun.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_58_appendGfx(void* effect);
+void sun_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_58", fx_58_main);
+INCLUDE_ASM(s32, "effects/sun", sun_main);
 
-void fx_58_init(void) {
+void sun_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_58", fx_58_update);
+INCLUDE_ASM(s32, "effects/sun", sun_update);
 
-void fx_58_render(EffectInstance* effect) {
+void sun_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_58_appendGfx;
+    renderTask.appendGfx = sun_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -23,4 +23,4 @@ void fx_58_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_58", fx_58_appendGfx);
+INCLUDE_ASM(s32, "effects/sun", sun_appendGfx);
diff --git a/src/effects/effect_22.c b/src/effects/sweat.c
similarity index 50%
rename from src/effects/effect_22.c
rename to src/effects/sweat.c
index 8a07961aa9..21dc37dd6f 100644
--- a/src/effects/effect_22.c
+++ b/src/effects/sweat.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_22_appendGfx(void* effect);
+void sweat_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_22", fx_22_main);
+INCLUDE_ASM(s32, "effects/sweat", sweat_main);
 
-void fx_22_init(void) {
+void sweat_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_22", fx_22_update);
+INCLUDE_ASM(s32, "effects/sweat", sweat_update);
 
-void fx_22_render(EffectInstance* effect) {
+void sweat_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_22_appendGfx;
+    renderTask.appendGfx = sweat_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -23,4 +23,4 @@ void fx_22_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-INCLUDE_ASM(s32, "effects/effect_22", fx_22_appendGfx);
+INCLUDE_ASM(s32, "effects/sweat", sweat_appendGfx);
diff --git a/src/effects/effect_108.c b/src/effects/tattle_window.c
similarity index 62%
rename from src/effects/effect_108.c
rename to src/effects/tattle_window.c
index 638228dc6b..e7a1abf6a3 100644
--- a/src/effects/effect_108.c
+++ b/src/effects/tattle_window.c
@@ -1,17 +1,17 @@
 #include "common.h"
 #include "effects_internal.h"
 
-INCLUDE_ASM(s32, "effects/effect_108", fx_108_main);
+INCLUDE_ASM(s32, "effects/tattle_window", tattle_window_main);
 
-void fx_108_init(void) {
+void tattle_window_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_108", fx_108_update);
+INCLUDE_ASM(s32, "effects/tattle_window", tattle_window_update);
 
-void fx_108_render(void) {
+void tattle_window_render(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_108", func_E00D8264);
+INCLUDE_ASM(s32, "effects/tattle_window", func_E00D8264);
 
 void func_E00D8280(void) {
 }
@@ -46,6 +46,6 @@ void func_E00D8288(s32 l, s32 r, s32 t, s32 b) {
     gDPFillRectangle(gMasterGfxPos++, l, r, t, b);
 }
 
-INCLUDE_ASM(s32, "effects/effect_108", func_E00D8334);
+INCLUDE_ASM(s32, "effects/tattle_window", func_E00D8334);
 
-INCLUDE_ASM(s32, "effects/effect_108", func_E00D8630);
+INCLUDE_ASM(s32, "effects/tattle_window", func_E00D8630);
diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c
new file mode 100644
index 0000000000..2b42c04551
--- /dev/null
+++ b/src/effects/throw_spiny.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void throw_spiny_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/throw_spiny", throw_spiny_main);
+
+void throw_spiny_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/throw_spiny", throw_spiny_update);
+
+void throw_spiny_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = throw_spiny_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00C844C(void) {
+}
+
+INCLUDE_ASM(s32, "effects/throw_spiny", throw_spiny_appendGfx);
diff --git a/src/effects/thunderbolt_ring.c b/src/effects/thunderbolt_ring.c
new file mode 100644
index 0000000000..283973f836
--- /dev/null
+++ b/src/effects/thunderbolt_ring.c
@@ -0,0 +1,25 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void thunderbolt_ring_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/thunderbolt_ring", thunderbolt_ring_main);
+
+void thunderbolt_ring_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/thunderbolt_ring", thunderbolt_ring_update);
+
+void thunderbolt_ring_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = thunderbolt_ring_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+INCLUDE_ASM(s32, "effects/thunderbolt_ring", thunderbolt_ring_appendGfx);
diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c
new file mode 100644
index 0000000000..a5a8e34e8b
--- /dev/null
+++ b/src/effects/tubba_heart_attack.c
@@ -0,0 +1,29 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void tubba_heart_attack_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/tubba_heart_attack", tubba_heart_attack_main);
+
+void tubba_heart_attack_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/tubba_heart_attack", tubba_heart_attack_update);
+
+void tubba_heart_attack_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = tubba_heart_attack_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+void func_E00CC9C8(void) {
+}
+
+INCLUDE_ASM(s32, "effects/tubba_heart_attack", tubba_heart_attack_appendGfx);
diff --git a/src/effects/underwater.c b/src/effects/underwater.c
new file mode 100644
index 0000000000..f8e787546a
--- /dev/null
+++ b/src/effects/underwater.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void underwater_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/underwater", underwater_main);
+
+void underwater_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/underwater", underwater_update);
+
+void underwater_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = underwater_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 100;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+void func_E00BA618(void) {
+}
+
+INCLUDE_ASM(s32, "effects/underwater", underwater_appendGfx);
diff --git a/src/effects/effect_7.c b/src/effects/walking_dust.c
similarity index 59%
rename from src/effects/effect_7.c
rename to src/effects/walking_dust.c
index 2f8ec752d5..69eb142292 100644
--- a/src/effects/effect_7.c
+++ b/src/effects/walking_dust.c
@@ -13,77 +13,77 @@ extern Gfx D_09002950[];
 extern Gfx D_09002B20[];
 extern Gfx D_09002B40[];
 
-void fx_7_init(EffectInstance* effect);
-void fx_7_update(EffectInstance* effect);
-void fx_7_render(EffectInstance* effect);
-void fx_7_appendGfx(void* effect);
+void walking_dust_init(EffectInstance* effect);
+void walking_dust_update(EffectInstance* effect);
+void walking_dust_render(EffectInstance* effect);
+void walking_dust_appendGfx(void* effect);
 
-void fx_7_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
+void walking_dust_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
     EffectBlueprint bp;
     EffectInstance* effect;
-    Effect7* effectPart;
+    WalkingDustFXData* data;
     s32 numParts = 1;
     s32 i;
 
     bp.unk_00 = 0;
-    bp.init = fx_7_init;
-    bp.update = fx_7_update;
-    bp.renderWorld = fx_7_render;
+    bp.init = walking_dust_init;
+    bp.update = walking_dust_update;
+    bp.renderWorld = walking_dust_render;
     bp.unk_14 = NULL;
-    bp.effectID = EFFECT_ID_07;
+    bp.effectID = EFFECT_WALKING_DUST;
 
     effect = shim_create_effect_instance(&bp);
     effect->numParts = numParts;
 
-    effectPart = shim_general_heap_malloc(numParts * sizeof(*effectPart));
-    effect->data = effectPart;
+    data = shim_general_heap_malloc(numParts * sizeof(*data));
+    effect->data = data;
     ASSERT(effect->data != NULL);
 
-    shim_mem_clear(effectPart, numParts * sizeof(*effectPart));
-    effectPart->unk_6C = arg0 == 2;
-    effectPart->unk_70 = 0;
-    effectPart->unk_04 = arg0;
+    shim_mem_clear(data, numParts * sizeof(*data));
+    data->unk_6C = arg0 == 2;
+    data->unk_70 = 0;
+    data->unk_04 = arg0;
 
-    for (i = 0; i < numParts; i++, effectPart++) {
-        effectPart->unk_00 = 1;
-        effectPart->unk_64 = arg4;
-        effectPart->unk_68 = arg5;
-        effectPart->unk_08 = arg1;
-        effectPart->unk_0C = arg2;
-        effectPart->unk_10 = arg3;
-        effectPart->unk_58 = 0.33333334f;
-        effectPart->unk_5C = 1.75f;
-        effectPart->unk_60 = -0.16f;
+    for (i = 0; i < numParts; i++, data++) {
+        data->unk_00 = 1;
+        data->unk_64 = arg4;
+        data->unk_68 = arg5;
+        data->unk_08 = arg1;
+        data->unk_0C = arg2;
+        data->unk_10 = arg3;
+        data->unk_58 = 0.33333334f;
+        data->unk_5C = 1.75f;
+        data->unk_60 = -0.16f;
     }
 }
 
-void fx_7_init(EffectInstance* effect) {
+void walking_dust_init(EffectInstance* effect) {
 }
 
-void fx_7_update(EffectInstance* effect) {
-    Effect7* part = (Effect7*)effect->data;
+void walking_dust_update(EffectInstance* effect) {
+    WalkingDustFXData* data = (WalkingDustFXData*)effect->data;
 
-    part->unk_74 = D_E000E684[part->unk_6C][part->unk_70++];
+    data->unk_74 = D_E000E684[data->unk_6C][data->unk_70++];
 
-    if (part->unk_74 < 0) {
+    if (data->unk_74 < 0) {
         shim_remove_effect(effect);
     } else {
         s32 i;
 
-        for (i = 0; i < effect->numParts; i++, part++) {
-            part->unk_08 += part->unk_58 * part->unk_64;
-            part->unk_10 += part->unk_58 * part->unk_68;
-            part->unk_5C = part->unk_5C + part->unk_60;
-            part->unk_0C += part->unk_5C;
+        for (i = 0; i < effect->numParts; i++, data++) {
+            data->unk_08 += data->unk_58 * data->unk_64;
+            data->unk_10 += data->unk_58 * data->unk_68;
+            data->unk_5C = data->unk_5C + data->unk_60;
+            data->unk_0C += data->unk_5C;
         }
     }
 }
 
-void fx_7_render(EffectInstance* effect) {
+void walking_dust_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_7_appendGfx;
+    renderTask.appendGfx = walking_dust_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 0;
     renderTask.renderMode = RENDER_MODE_28;
@@ -92,11 +92,11 @@ void fx_7_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_MODE_2;
 }
 
-void fx_7_appendGfx(void* effect) {
+void walking_dust_appendGfx(void* effect) {
     EffectInstance* effectTemp = effect;
-    Effect7* part = effectTemp->data;
-    s32 temp_t3 = part->unk_04;
-    s32 temp_t4 = part->unk_74;
+    WalkingDustFXData* data = effectTemp->data;
+    s32 temp_t3 = data->unk_04;
+    s32 temp_t4 = data->unk_74;
     s32 cond = FALSE;
     Matrix4f sp18;
     Matrix4f sp58;
@@ -126,7 +126,7 @@ void fx_7_appendGfx(void* effect) {
     }
 
 
-    if ((part->unk_6C == 0 && temp_t4 == 6) || (part->unk_6C == 1 && temp_t4 == 7)) {
+    if ((data->unk_6C == 0 && temp_t4 == 6) || (data->unk_6C == 1 && temp_t4 == 7)) {
         cond = TRUE;
     }
 
@@ -153,8 +153,8 @@ void fx_7_appendGfx(void* effect) {
         gDPSetTileSize(gMasterGfxPos++, 1, temp_a0 * 4, 0, ((temp_lo + (phi_t1 * 2)) - 1) * 4, (phi_t1 - 1) * 4);
     }
 
-    for (i = 0; i < effectTemp->numParts; i++, part++) {
-        shim_guTranslateF(sp18, part->unk_08, part->unk_0C, part->unk_10);
+    for (i = 0; i < effectTemp->numParts; i++, data++) {
+        shim_guTranslateF(sp18, data->unk_08, data->unk_0C, data->unk_10);
         shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f);
         shim_guMtxCatF(sp58, sp18, sp18);
         shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]);
diff --git a/src/effects/effect_90.c b/src/effects/water_block.c
similarity index 83%
rename from src/effects/effect_90.c
rename to src/effects/water_block.c
index 65c3f526e3..dbae2a2375 100644
--- a/src/effects/effect_90.c
+++ b/src/effects/water_block.c
@@ -3,20 +3,20 @@
 
 s32 D_E00B4CF0[] = { 0x1904E700, 0x04010048, 0xB0B0B000, 0x1600EA00, 0x03C30000, 0xB0B0B000, 0xEA00EA00, 0x003D0000, 0xB0B0B000, 0xE704E700, 0x00010048, 0xB0B0B000, 0x192EE700, 0x040103B7, 0xB0B0B000, 0xE72EE700, 0x000103B7, 0xB0B0B000, 0x1632EA00, 0x037A03E5, 0xAED0D800, 0xEA32EA00, 0x008503E5, 0xAED0D800, 0xEA321600, 0x008503E5, 0xAED0D800, 0x16321600, 0x037A03E5, 0xAED0D800, 0xEA00EA00, 0x00850019, 0x94A5B000, 0x1600EA00, 0x037A0019, 0x94A5B000, 0x16001600, 0x037A0019, 0x94A5B000, 0xEA001600, 0x00850019, 0x94A5B000, 0xEA321600, 0x03C303FD, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0x786E8800, 0xE72EE700, 0x000003B7, 0x786E8800, 0xE72E1900, 0x040003B7, 0x786E8800, 0xE704E700, 0x00000048, 0x786E8800, 0xE7041900, 0x04000048, 0x786E8800, 0xEA00EA00, 0x003D0000, 0x786E8800, 0xEA001600, 0x03C30000, 0x786E8800, 0xEA32EA00, 0x003D03FD, 0xB0B0B000, 0x1632EA00, 0x03C303FD, 0xB0B0B000, 0x16001600, 0x03C30000, 0x786E8800, 0x1600EA00, 0x003D0000, 0x786E8800, 0x1904E700, 0x00000048, 0x786E8800, 0x19041900, 0x04000048, 0x786E8800, 0x192EE700, 0x000003B7, 0x786E8800, 0x192E1900, 0x040003B7, 0x786E8800, 0x1632EA00, 0x003D03FD, 0x786E8800, 0xEA001600, 0x003D0000, 0xF0F0F000, 0x19041900, 0x04010048, 0xF0F0F000, 0x192E1900, 0x040103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0x786E8800, 0x16001600, 0x03C30000, 0xF0F0F000, 0xE7041900, 0x00010048, 0xF0F0F000, 0xE72E1900, 0x000103B7, 0xF0F0F000, 0x16321600, 0x03C303FD, 0xF0F0F000, 0xEA321600, 0x003D03FD, 0xF0F0F000 };
 
-void fx_90_appendGfx(void* effect);
+void water_block_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_90", fx_90_main);
+INCLUDE_ASM(s32, "effects/water_block", water_block_main);
 
-void fx_90_init(void) {
+void water_block_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_90", fx_90_update);
+INCLUDE_ASM(s32, "effects/water_block", water_block_update);
 
-void fx_90_render(EffectInstance* effect) {
+void water_block_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_90_appendGfx;
+    renderTask.appendGfx = water_block_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 20;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -28,4 +28,4 @@ void fx_90_render(EffectInstance* effect) {
 void func_E00B4574(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_90", fx_90_appendGfx);
+INCLUDE_ASM(s32, "effects/water_block", water_block_appendGfx);
diff --git a/src/effects/effect_92.c b/src/effects/water_fountain.c
similarity index 89%
rename from src/effects/effect_92.c
rename to src/effects/water_fountain.c
index c9aa475374..7fa37fcec6 100644
--- a/src/effects/effect_92.c
+++ b/src/effects/water_fountain.c
@@ -9,20 +9,20 @@ s32 D_E00B8B58[] = { 0x0000001E, 0x008C0000, 0xFF000006, 0x001E0078, 0x0000F000,
 
 s32 D_E00B8CA4[] = { 0x00000000, 0x00000028, 0x00000037, 0x000000BE, 0x00000014, 0x00000082, 0x0000010E, 0x0000012C, 0x00000000, 0x00000000, 0x00000000 };
 
-void fx_92_appendGfx(void* effect);
+void water_fountain_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_92", fx_92_main);
+INCLUDE_ASM(s32, "effects/water_fountain", water_fountain_main);
 
-void fx_92_init(void) {
+void water_fountain_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_92", fx_92_update);
+INCLUDE_ASM(s32, "effects/water_fountain", water_fountain_update);
 
-void fx_92_render(EffectInstance* effect) {
+void water_fountain_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_92_appendGfx;
+    renderTask.appendGfx = water_fountain_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -34,4 +34,4 @@ void fx_92_render(EffectInstance* effect) {
 void func_E00B8200(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_92", fx_92_appendGfx);
+INCLUDE_ASM(s32, "effects/water_fountain", water_fountain_appendGfx);
diff --git a/src/effects/water_splash.c b/src/effects/water_splash.c
new file mode 100644
index 0000000000..2b07b6abcf
--- /dev/null
+++ b/src/effects/water_splash.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void water_splash_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/water_splash", water_splash_main);
+
+void water_splash_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/water_splash", water_splash_update);
+
+void water_splash_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = water_splash_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+void func_E00BE5B4(void) {
+}
+
+INCLUDE_ASM(s32, "effects/water_splash", water_splash_appendGfx);
diff --git a/src/effects/waterfall.c b/src/effects/waterfall.c
new file mode 100644
index 0000000000..4ceccbb504
--- /dev/null
+++ b/src/effects/waterfall.c
@@ -0,0 +1,28 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void waterfall_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/waterfall", waterfall_main);
+
+void waterfall_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/waterfall", waterfall_update);
+
+void waterfall_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = waterfall_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 10;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+}
+
+void func_E00B62D8(void) {
+}
+
+INCLUDE_ASM(s32, "effects/waterfall", waterfall_appendGfx);
diff --git a/src/effects/effect_103.c b/src/effects/whirlwind.c
similarity index 50%
rename from src/effects/effect_103.c
rename to src/effects/whirlwind.c
index 85b2586449..5bf4bea41e 100644
--- a/src/effects/effect_103.c
+++ b/src/effects/whirlwind.c
@@ -1,20 +1,20 @@
 #include "common.h"
 #include "effects_internal.h"
 
-void fx_103_appendGfx(void* effect);
+void whirlwind_appendGfx(void* effect);
 
-INCLUDE_ASM(s32, "effects/effect_103", fx_103_main);
+INCLUDE_ASM(s32, "effects/whirlwind", whirlwind_main);
 
-void fx_103_init(void) {
+void whirlwind_init(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_103", fx_103_update);
+INCLUDE_ASM(s32, "effects/whirlwind", whirlwind_update);
 
-void fx_103_render(EffectInstance* effect) {
+void whirlwind_render(EffectInstance* effect) {
     RenderTask renderTask;
     RenderTask* retTask;
 
-    renderTask.appendGfx = fx_103_appendGfx;
+    renderTask.appendGfx = whirlwind_appendGfx;
     renderTask.appendGfxArg = effect;
     renderTask.distance = 10;
     renderTask.renderMode = RENDER_MODE_2D;
@@ -26,4 +26,4 @@ void fx_103_render(EffectInstance* effect) {
 void func_E00CE470(void) {
 }
 
-INCLUDE_ASM(s32, "effects/effect_103", fx_103_appendGfx);
+INCLUDE_ASM(s32, "effects/whirlwind", whirlwind_appendGfx);
diff --git a/src/effects/windy_leaves.c b/src/effects/windy_leaves.c
new file mode 100644
index 0000000000..5262a0eafa
--- /dev/null
+++ b/src/effects/windy_leaves.c
@@ -0,0 +1,26 @@
+#include "common.h"
+#include "effects_internal.h"
+
+void windy_leaves_appendGfx(void* effect);
+
+INCLUDE_ASM(s32, "effects/windy_leaves", windy_leaves_main);
+
+void windy_leaves_init(void) {
+}
+
+INCLUDE_ASM(s32, "effects/windy_leaves", windy_leaves_update);
+
+void windy_leaves_render(EffectInstance* effect) {
+    RenderTask renderTask;
+    RenderTask* retTask;
+
+    renderTask.appendGfx = windy_leaves_appendGfx;
+    renderTask.appendGfxArg = effect;
+    renderTask.distance = 0;
+    renderTask.renderMode = RENDER_MODE_2D;
+
+    retTask = shim_queue_render_task(&renderTask);
+    retTask->renderMode |= RENDER_MODE_2;
+}
+
+INCLUDE_ASM(s32, "effects/windy_leaves", windy_leaves_appendGfx);
diff --git a/src/entity/Block.c b/src/entity/Block.c
index 28e3bf5ecc..6795be66eb 100644
--- a/src/entity/Block.c
+++ b/src/entity/Block.c
@@ -22,7 +22,7 @@ void entity_base_block_setupGfx(s32 entityIndex) {
 }
 
 void entity_base_block_play_vanish_effect(Entity* entity) {
-    playFX_6F(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C);
+    fx_cold_breath(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C);
 }
 
 f32 entity_block_hit_init_scale(Entity* entity) {
diff --git a/src/entity/Chest.c b/src/entity/Chest.c
index 6225643e4f..58bae572fc 100644
--- a/src/entity/Chest.c
+++ b/src/entity/Chest.c
@@ -206,10 +206,10 @@ void entity_GiantChest_open(Entity* entity) {
                     horizontalOffset = 0.0f;
                     depthOffset = 4.0f;
                     //RadialFlowOut
-                    playFX_33(0, chest->itemEntityPos.x + horizontalOffset * sinRight - depthOffset * sinFwd,
+                    fx_radial_shimmer(0, chest->itemEntityPos.x + horizontalOffset * sinRight - depthOffset * sinFwd,
                               chest->itemEntityPos.y + 12.0f, chest->itemEntityPos.z - cosRight * horizontalOffset + cosFwd * depthOffset, 1.0f, 0x64);
                     //GotItemOutline
-                    playFX_1B(0, chest->itemEntityPos.x + horizontalOffset * sinRight - sinFwd * depthOffset,
+                    fx_got_item_outline(0, chest->itemEntityPos.x + horizontalOffset * sinRight - sinFwd * depthOffset,
                               chest->itemEntityPos.y + 12.0f, chest->itemEntityPos.z - cosRight * horizontalOffset + cosFwd * depthOffset, 1.0f, &chest->gotItemEffect);
                 }
             }
diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c
index 0d9807e23b..019cbb6ad3 100644
--- a/src/entity/HeartBlock.c
+++ b/src/entity/HeartBlock.c
@@ -92,7 +92,7 @@ void entity_HeartBlockContent_anim_idle(Entity* entity, s32 arg1) {
                 data->unk_02--;
                 if (data->unk_02 <= 0) {
                     data->unk_02 = 50;
-                    playFX_22(data->unk_0A, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20);
+                    fx_stars_shimmer(data->unk_0A, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20);
                 }
             }
             break;
@@ -125,7 +125,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) {
 
     switch (data->unk_01) {
         case 0:
-            playFX_11(0, entity->position.x, entity->position.y, entity->position.z, 2.0f);
+            fx_sparkles(0, entity->position.x, entity->position.y, entity->position.z, 2.0f);
             data->unk_20 = 0.0f;
             data->unk_01++;
             data->unk_14 = 6.0f;
@@ -181,7 +181,7 @@ void entity_HeartBlockContent__anim_heal(Entity* entity, s32 arg1) {
             data->unk_04 -= 0.7;
 
             if ((data->unk_03++ & 1) != 0) {
-                playFX_11(3, playerStatus->position.x + offsetX,
+                fx_sparkles(3, playerStatus->position.x + offsetX,
                         playerStatus->position.y + offsetY,
                         playerStatus->position.z - offsetZ,
                         8.0f
diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c
index 22cd132828..4977c53afb 100644
--- a/src/entity/ItemBlock.c
+++ b/src/entity/ItemBlock.c
@@ -32,7 +32,7 @@ void entity_TriggerBlock_start_bound_script_2(Entity* entity) {
 }
 
 void entity_TriggerBlock_play_vanish_effect(Entity* entity) {
-    TriggerBlockVanishEffect = playFX_6F(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C);
+    TriggerBlockVanishEffect = fx_cold_breath(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C);
 }
 
 void entity_HitItemBlock_play_anim(Entity* entity) {
diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c
index f6033182ee..d1654ac3cd 100644
--- a/src/entity/SuperBlock.c
+++ b/src/entity/SuperBlock.c
@@ -92,7 +92,7 @@ void entity_SuperBlockContent_idle(Entity* entity) {
     if (data->unk_0A == 0 && gOverrideFlags == 0) {
         if (--data->unk_02 <= 0) {
             data->unk_02 = 50;
-            playFX_22(3, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20);
+            fx_stars_shimmer(3, entity->position.x, entity->position.y, entity->position.z, 22.0f, 8.0f, 4, 20);
         }
     }
 }
diff --git a/src/entity/Switch.c b/src/entity/Switch.c
index 5848cd3799..bca49baf6a 100644
--- a/src/entity/Switch.c
+++ b/src/entity/Switch.c
@@ -452,7 +452,7 @@ void entity_base_switch_animate_scale(Entity* entity) {
 
     temp_s0->unk_24++;
     if ((temp_s0->unk_24 == 10) && (temp_s0->attachedEntity == NULL)) {
-        playFX_6F(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C);
+        fx_cold_breath(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C);
     }
 }
 
diff --git a/src/entity/default/E2C930.c b/src/entity/default/E2C930.c
index 5c31bbf823..c209915b0a 100644
--- a/src/entity/default/E2C930.c
+++ b/src/entity/default/E2C930.c
@@ -13,6 +13,6 @@ void func_802BCC80_E2D3B0(Entity* entity) {
     if (entity->collisionFlags & 0x80) {
         entity_start_script(entity);
         exec_entity_commandlist(entity);
-        playFX_01(entity->position.x, entity->position.y + 25.0f, entity->position.z);
+        fx_big_smoke_puff(entity->position.x, entity->position.y + 25.0f, entity->position.z);
     }
 }
diff --git a/src/entity/jan_iwa/E2E5F0.c b/src/entity/jan_iwa/E2E5F0.c
index f82cf5e736..e9727d48d2 100644
--- a/src/entity/jan_iwa/E2E5F0.c
+++ b/src/entity/jan_iwa/E2E5F0.c
@@ -30,7 +30,7 @@ void func_802BBD78_E2E6A8(Entity* entity) {
     angle = (clamp_angle(entity->rotation.y) * TAU) / 360.0f;
     xOffset = cos_rad(angle) * -26.0;
     zOffset = sin_rad(angle) * 6.0;
-    playFX_21(0, entity->position.x + xOffset, entity->position.y + 62.0f, entity->position.z + zOffset, clamp_angle(entity->rotation.y - 90.0), 54.0f, 2);
+    fx_stars_burst(0, entity->position.x + xOffset, entity->position.y + 62.0f, entity->position.z + zOffset, clamp_angle(entity->rotation.y - 90.0), 54.0f, 2);
 }
 
 INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBE8C_E2E7BC);
diff --git a/src/entity/sbk_omo/E307C0.c b/src/entity/sbk_omo/E307C0.c
index 69ea360fc1..07c074d52c 100644
--- a/src/entity/sbk_omo/E307C0.c
+++ b/src/entity/sbk_omo/E307C0.c
@@ -45,7 +45,7 @@ void func_802BC2BC_E30C0C(Entity* entity) {
 
     if (result != 0) {
         data->unk_02 &= ~1;
-        playFX_18(3, entity->position.x, entity->position.y + 35.0f, entity->position.z, 0, -1.0f, 0, 3);
+        fx_damage_stars(3, entity->position.x, entity->position.y + 35.0f, entity->position.z, 0, -1.0f, 0, 3);
         if (result > 0) {
             data->unk_02 |= 1;
         }
diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c
index 997b77ee5c..66ab95c975 100644
--- a/src/evt/fx_api.c
+++ b/src/evt/fx_api.c
@@ -192,394 +192,394 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) {
     iVar1 = new_var;
 
     switch (effectID) {
-        case EFFECT_ID_00:
-            playFX_3E(0, fVar1, fVar2, fVar3, 3.0f, iVar5);
+        case EFFECT_00:
+            fx_blast(0, fVar1, fVar2, fVar3, 3.0f, iVar5);
             break;
-        case EFFECT_ID_01:
-            playFX_01(fVar1, fVar2, fVar3);
+        case EFFECT_BIG_SMOKE_PUFF:
+            fx_big_smoke_puff(fVar1, fVar2, fVar3);
             break;
-        case EFFECT_ID_06:
-            fx_land(iVar1, fVar2, fVar3, fVar4, fVar5);
+        case EFFECT_LANDING_DUST:
+            fx_landing_dust(iVar1, fVar2, fVar3, fVar4, fVar5);
             break;
-        case EFFECT_ID_07:
-            fx_walk(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
+        case EFFECT_WALKING_DUST:
+            fx_walking_dust(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
             break;
-        case EFFECT_ID_08:
-            playFX_08(fVar1, fVar2, fVar3, fVar4);
+        case EFFECT_FLOWER_SPLASH:
+            fx_flower_splash(fVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_09:
-            playFX_09(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
+        case EFFECT_FLOWER_TRAIL:
+            fx_flower_trail(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
             break;
-        case EFFECT_ID_0A:
-            playFX_0A(fVar1, fVar2, fVar3, fVar4);
+        case EFFECT_CLOUD_PUFF:
+            fx_cloud_puff(fVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_0B:
-            playFX_0B(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_CLOUD_TRAIL:
+            fx_cloud_trail(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_0C:
-            playFX_0C(fVar1, fVar2, fVar3, fVar4, fVar5);
+        case EFFECT_FOOTPRINT:
+            fx_footprint(fVar1, fVar2, fVar3, fVar4, fVar5);
             break;
-        case EFFECT_ID_0D:
-            playFX_0D(0, fVar1, fVar2, fVar3, iVar4);
+        case EFFECT_FLOATING_FLOWER:
+            fx_floating_flower(0, fVar1, fVar2, fVar3, iVar4);
             break;
-        case EFFECT_ID_0E:
-            playFX_0E(fVar1, fVar2, fVar3, iVar4);
+        case EFFECT_SNOWFLAKE:
+            fx_snowflake(fVar1, fVar2, fVar3, iVar4);
             break;
-        case EFFECT_ID_0F:
-            playFX_0F(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8);
+        case EFFECT_STAR:
+            fx_star(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8);
             break;
-        case EFFECT_ID_10:
+        case EFFECT_EMOTE:
             fx_emote(iVar1, (Npc* ) a2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, &sp30);
             evt_set_variable(script, a8, sp30);
             break;
-        case EFFECT_ID_11:
-            playFX_11(iVar1, fVar2, fVar3, fVar4, fVar5);
+        case EFFECT_SPARKLES:
+            fx_sparkles(iVar1, fVar2, fVar3, fVar4, fVar5);
             break;
-        case EFFECT_ID_12:
-            playFX_12(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8);
+        case EFFECT_SHAPE_SPELL:
+            fx_shape_spell(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8);
             break;
-        case EFFECT_ID_13:
-            playFX_13(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_GATHER_ENERGY_PINK:
+            fx_gather_energy_pink(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_14:
-            playFX_14(iVar1, fVar2, fVar3, fVar4, iVar5);
+        case EFFECT_DROP_LEAVES:
+            fx_drop_leaves(iVar1, fVar2, fVar3, fVar4, iVar5);
             break;
-        case EFFECT_ID_15:
-            playFX_15(iVar1, fVar2, fVar3, fVar4, iVar5);
+        case EFFECT_DUST:
+            fx_dust(iVar1, fVar2, fVar3, fVar4, iVar5);
             break;
-        case EFFECT_ID_16:
-            playFX_16(iVar1, fVar2, fVar3, fVar4, fVar5);
+        case EFFECT_SHATTERING_STONES:
+            fx_shattering_stones(iVar1, fVar2, fVar3, fVar4, fVar5);
             break;
-        case EFFECT_ID_17:
-            playFX_17(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_SMOKE_RING:
+            fx_smoke_ring(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_18:
-            playFX_18(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8);
+        case EFFECT_DAMAGE_STARS:
+            fx_damage_stars(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8);
             break;
-        case EFFECT_ID_19:
-            playFX_19(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_EXPLOSION:
+            fx_explosion(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_1A:
-            playFX_1A(iVar1, fVar2, fVar3, fVar4, iVar5);
+        case EFFECT_LENS_FLARE:
+            fx_lens_flare(iVar1, fVar2, fVar3, fVar4, iVar5);
             break;
-        case EFFECT_ID_1B:
-            playFX_1B(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
+        case EFFECT_GOT_ITEM_OUTLINE:
+            fx_got_item_outline(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
             evt_set_variable(script, a6, sp34);
             break;
-        case EFFECT_ID_1C:
-            playFX_1C(iVar1, fVar2, fVar3, fVar4, iVar5);
+        case EFFECT_SPIKY_WHITE_AURA:
+            fx_spiky_white_aura(iVar1, fVar2, fVar3, fVar4, iVar5);
             break;
-        case EFFECT_ID_1D:
-            playFX_1D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, fVar7, iVar8);
+        case EFFECT_SMOKE_IMPACT:
+            fx_smoke_impact(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, fVar7, iVar8);
             break;
-        case EFFECT_ID_1E:
-            playFX_1E(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, &sp30);
+        case EFFECT_DAMAGE_INDICATOR:
+            fx_damage_indicator(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, &sp30);
             evt_set_variable(script, a8, sp30);
             break;
-        case EFFECT_ID_1F:
-            playFX_1F(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8);
+        case EFFECT_PURPLE_RING:
+            fx_purple_ring(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8);
             break;
-        case EFFECT_ID_21:
-            playFX_21(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7);
+        case EFFECT_STARS_BURST:
+            fx_stars_burst(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7);
             break;
-        case EFFECT_ID_22:
-            playFX_22(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, iVar8);
+        case EFFECT_STARS_SHIMMER:
+            fx_stars_shimmer(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, iVar8);
             break;
-        case EFFECT_ID_23:
-            playFX_23(iVar1, fVar2, fVar3, fVar4, fVar5);
+        case EFFECT_RISING_BUBBLE:
+            fx_rising_bubble(iVar1, fVar2, fVar3, fVar4, fVar5);
             break;
-        case EFFECT_ID_24:
-            playFX_24(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_RING_BLAST:
+            fx_ring_blast(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_25:
-            playFX_25(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_SHOCKWAVE:
+            fx_shockwave(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_26:
-            playFX_26(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_MUSIC_NOTE:
+            fx_music_note(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_27:
-            playFX_27(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SMOKE_BURST:
+            fx_smoke_burst(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_28:
+        case EFFECT_SWEAT:
             fx_sweat(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7);
             break;
-        case EFFECT_ID_29:
+        case EFFECT_SLEEP_BUBBLE:
             fx_sleep_bubble(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, &sp38);
             evt_set_variable(script, a7, sp38);
             break;
-        case EFFECT_ID_2B:
-            playFX_2B(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_WINDY_LEAVES:
+            fx_windy_leaves(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_20:
-            playFX_20(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
+        case EFFECT_FLAME:
+            fx_flame(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
             evt_set_variable(script, a6, sp34);
             break;
-        case EFFECT_ID_2C:
-            playFX_2C(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_FALLING_LEAVES:
+            fx_falling_leaves(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_2D:
-            playFX_2D(iVar1, fVar2, fVar3, fVar4, iVar5, iVar6);
+        case EFFECT_STARS_SPREAD:
+            fx_stars_spread(iVar1, fVar2, fVar3, fVar4, iVar5, iVar6);
             break;
-        case EFFECT_ID_2E:
-            playFX_2E(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_STEAM_BURST:
+            fx_steam_burst(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_2F:
-            playFX_2F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, &sp38);
+        case EFFECT_STARS_ORBITING:
+            fx_stars_orbiting(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, &sp38);
             evt_set_variable(script, a7, sp38);
             break;
-        case EFFECT_ID_30:
-            playFX_30(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_BIG_SNOWFLAKES:
+            fx_big_snowflakes(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_31:
-            playFX_31(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_DEBUFF:
+            fx_debuff(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_32:
-            playFX_32(iVar1, fVar2, fVar3, fVar4, fVar5);
+        case EFFECT_GREEN_IMPACT:
+            fx_green_impact(iVar1, fVar2, fVar3, fVar4, fVar5);
             break;
-        case EFFECT_ID_33:
-            playFX_33(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_RADIAL_SHIMMER:
+            fx_radial_shimmer(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_34:
-            playFX_34(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
+        case EFFECT_ENDING_DECALS:
+            fx_ending_decals(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
             evt_set_variable(script, a6, sp34);
             break;
-        case EFFECT_ID_35:
-            playFX_35(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
+        case EFFECT_LIGHT_RAYS:
+            fx_light_rays(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
             evt_set_variable(script, a6, sp34);
             break;
-        case EFFECT_ID_36:
-            effectRet = playFX_36(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
+        case EFFECT_LIGHTNING:
+            effectRet = fx_lightning(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
             break;
-        case EFFECT_ID_37:
-            effectRet = playFX_37(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9, iVar10);
+        case EFFECT_FIRE_BREATH:
+        effectRet = fx_fire_breath(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9, iVar10);
             break;
-        case EFFECT_ID_38:
-            playFX_38(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SHIMMER_BURST:
+            fx_shimmer_burst(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_39:
-            playFX_39(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_ENERGY_SHOCKWAVE:
+            fx_energy_shockwave(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_3A:
-            playFX_3A(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, iVar8);
+        case EFFECT_SHIMMER_WAVE:
+            fx_shimmer_wave(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, iVar7, iVar8);
             break;
-        case EFFECT_ID_3B:
-            playFX_3B(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
+        case EFFECT_AURA:
+            fx_aura(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
             evt_set_variable(script, a6, sp34);
             break;
-        case EFFECT_ID_3C:
-            playFX_3C(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
+        case EFFECT_3C:
+            fx_3C(iVar1, fVar2, fVar3, fVar4, fVar5, &sp34);
             evt_set_variable(script, a6, sp34);
             break;
-        case EFFECT_ID_3D:
-            playFX_3D(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, &sp3C);
+        case EFFECT_3D:
+            fx_3D(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, &sp3C);
             evt_set_variable(script, a9, sp3C);
             break;
-        case EFFECT_ID_3E:
-            playFX_3E(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_BLAST:
+            fx_blast(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_3F:
-            effectRet = playFX_3F(iVar1, fVar2, fVar3, fVar4, iVar5);
+        case EFFECT_FIRE_FLOWER:
+            effectRet = fx_fire_flower(iVar1, fVar2, fVar3, fVar4, iVar5);
             break;
-        case EFFECT_ID_40:
-            effectRet = playFX_40(iVar1, fVar2, fVar3, fVar4, iVar5);
+        case EFFECT_RECOVER:
+            effectRet = fx_recover(iVar1, fVar2, fVar3, fVar4, iVar5);
             break;
-        case EFFECT_ID_41:
-            effectRet = playFX_41(iVar1, fVar2, fVar3, fVar4, iVar5);
+        case EFFECT_DISABLE_X:
+            effectRet = fx_disable_x(iVar1, fVar2, fVar3, fVar4, iVar5);
             break;
-        case EFFECT_ID_42:
-            effectRet = playFX_42(iVar1, iVar2, iVar3, fVar4, iVar5, iVar6);
+        case EFFECT_BOMBETTE_BREAKING:
+            effectRet = fx_bombette_breaking(iVar1, iVar2, iVar3, fVar4, iVar5, iVar6);
             break;
-        case EFFECT_ID_43:
-            effectRet = playFX_43(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_FIREWORK:
+            effectRet = fx_firework(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_44:
-            effectRet = playFX_44(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_CONFETTI:
+            effectRet = fx_confetti(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_45:
-            effectRet = playFX_45(iVar1, iVar2);
+        case EFFECT_SNOWFALL:
+            effectRet = fx_snowfall(iVar1, iVar2);
             break;
-        case EFFECT_ID_46:
-            effectRet = playFX_46_whirlwind(iVar1, a2, fVar3, iVar4);
+        case EFFECT_46:
+            effectRet = fx_46(iVar1, a2, fVar3, iVar4);
             break;
-        case EFFECT_ID_47:
-            effectRet = playFX_47(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_GATHER_MAGIC:
+            effectRet = fx_gather_magic(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_48:
-            effectRet = playFX_48(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_ATTACK_RESULT_TEXT:
+            effectRet = fx_attack_result_text(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_49:
-            effectRet = playFX_49(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SMALL_GOLD_SPARKLE:
+            effectRet = fx_small_gold_sparkle(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_4A:
-            effectRet = playFX_4A(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
+        case EFFECT_FLASHING_BOX_SHOCKWAVE:
+            effectRet = fx_flashing_box_shockwave(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6);
             break;
-        case EFFECT_ID_4B:
-            effectRet = playFX_4B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_BALLOON:
+            effectRet = fx_balloon(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_4C:
-            effectRet = playFX_4C(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
+        case EFFECT_FLOATING_ROCK:
+            effectRet = fx_floating_rock(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
             break;
-        case EFFECT_ID_4D:
-            effectRet = playFX_4D(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, fVar9, iVar10);
+        case EFFECT_CHOMP_DROP:
+            effectRet = fx_chomp_drop(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, fVar9, iVar10);
             break;
-        case EFFECT_ID_4E:
-            effectRet = playFX_4E(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_QUIZMO_STAGE:
+            effectRet = fx_quizmo_stage(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_4F:
-            effectRet = playFX_4F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_RADIATING_ENERGY_ORB:
+            effectRet = fx_radiating_energy_orb(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_52:
-            effectRet = playFX_52(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_ENERGY_ORB_WAVE:
+            effectRet = fx_energy_orb_wave(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_53:
-            effectRet = playFX_53(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_MERLIN_HOUSE_STARS:
+            effectRet = fx_merlin_house_stars(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_51:
-            effectRet = playFX_51(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_MOTION_BLUR_FLAME:
+            effectRet = fx_motion_blur_flame(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_56:
-            effectRet = playFX_56(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_STAT_CHANGE:
+            effectRet = fx_stat_change(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_57:
-            effectRet = playFX_57(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SNAKING_STATIC:
+            effectRet = fx_snaking_static(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_58:
-            effectRet = playFX_58(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_THUNDERBOLT_RING:
+            effectRet = fx_thunderbolt_ring(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_59:
-            effectRet = playFX_59(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
+        case EFFECT_SQUIRT:
+            effectRet = fx_squirt(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
             break;
-        case EFFECT_ID_5A:
-            effectRet = playFX_5A(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_WATER_BLOCK:
+            effectRet = fx_water_block(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_5B:
-            effectRet = playFX_5B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_WATERFALL:
+            effectRet = fx_waterfall(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_5C:
-            effectRet = playFX_5C(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_WATER_FOUNTAIN:
+            effectRet = fx_water_fountain(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_5D:
-            effectRet = playFX_5D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_UNDERWATER:
+            effectRet = fx_underwater(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_5E:
-            effectRet = playFX_5E(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
+        case EFFECT_LIGHTNING_BOLT:
+            effectRet = fx_lightning_bolt(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
             break;
-        case EFFECT_ID_5F:
-            effectRet = playFX_5F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_WATER_SPLASH:
+            effectRet = fx_water_splash(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_60:
-            effectRet = playFX_60(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SNOWMAN_DOLL:
+            effectRet = fx_snowman_doll(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_61:
-            effectRet = playFX_61(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_FRIGHT_JAR:
+            effectRet = fx_fright_jar(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_62:
-            effectRet = playFX_62(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_STOP_WATCH:
+            effectRet = fx_stop_watch(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_63:
-            effectRet = playFX_63(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9, iVar10);
+        case EFFECT_63:
+            effectRet = fx_63(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9, iVar10);
             break;
-        case EFFECT_ID_64:
-            effectRet = playFX_64(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
+        case EFFECT_THROW_SPINY:
+            effectRet = fx_throw_spiny(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
             break;
-        case EFFECT_ID_65:
-            effectRet = playFX_65(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_65:
+            effectRet = fx_65(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_66:
-            effectRet = playFX_66(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_TUBBA_HEART_ATTACK:
+            effectRet = fx_tubba_heart_attack(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_67:
-            effectRet = playFX_67(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_WHIRLWIND:
+            effectRet = fx_whirlwind(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_68:
-            effectRet = playFX_68(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_RED_IMPACT:
+            effectRet = fx_red_impact(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_69:
-            effectRet = playFX_69(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_FLOATING_CLOUD_PUFF:
+            effectRet = fx_floating_cloud_puff(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_6B:
-            effectRet = playFX_6B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_ENERGY_IN_OUT:
+            effectRet = fx_energy_in_out(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_6C:
-            effectRet = playFX_6C(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_TATTLE_WINDOW:
+            effectRet = fx_tattle_window(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_6D:
-            effectRet = playFX_6D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SHINY_FLARE:
+            effectRet = fx_shiny_flare(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_6E:
-            effectRet = playFX_6E(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8);
+        case EFFECT_HUFF_PUFF_BREATH:
+            effectRet = fx_huff_puff_breath(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8);
             break;
-        case EFFECT_ID_6F:
-            effectRet = playFX_6F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_COLD_BREATH:
+            effectRet = fx_cold_breath(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_70:
-            effectRet = playFX_70(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9, fVar10, fVar11);
+        case EFFECT_EMBERS:
+            effectRet = fx_embers(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9, fVar10, fVar11);
             break;
-        case EFFECT_ID_71:
-            effectRet = playFX_71(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_HIEROGLYPHS:
+            effectRet = fx_hieroglyphs(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_72:
-            effectRet = playFX_72(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9);
+        case EFFECT_MISC_PARTICLES:
+            effectRet = fx_misc_particles(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, iVar8, iVar9);
             break;
-        case EFFECT_ID_73:
-            effectRet = playFX_73(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, iVar7);
+        case EFFECT_STATIC_STATUS:
+            effectRet = fx_static_status(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6, iVar7);
             break;
-        case EFFECT_ID_74:
-            effectRet = playFX_74(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, fVar9);
+        case EFFECT_MOVING_CLOUD:
+            effectRet = fx_moving_cloud(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, fVar9);
             break;
-        case EFFECT_ID_75:
-            effectRet = playFX_75(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_75:
+            effectRet = fx_75(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_77:
-            effectRet = playFX_77(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
+        case EFFECT_FIREWORK_ROCKET:
+            effectRet = fx_firework_rocket(iVar1, fVar2, fVar3, fVar4, fVar5, fVar6, fVar7, fVar8, iVar9);
             break;
-        case EFFECT_ID_78:
-            effectRet = playFX_78(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_PEACH_STAR_BEAM:
+            effectRet = fx_peach_star_beam(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_55:
-            effectRet = playFX_55(iVar1, fVar2, fVar3, fVar4);
+        case EFFECT_BUTTERFLIES:
+            effectRet = fx_butterflies(iVar1, fVar2, fVar3, fVar4);
             break;
-        case EFFECT_ID_79:
-            effectRet = playFX_79(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_CHAPTER_CHANGE:
+            effectRet = fx_chapter_change(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_7A:
-            effectRet = playFX_7A(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_ICE_SHARD:
+            effectRet = fx_ice_shard(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_7B:
-            effectRet = playFX_7B(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SPIRIT_CARD:
+            effectRet = fx_spirit_card(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_7C:
-            effectRet = playFX_7C(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_LIL_OINK:
+            effectRet = fx_lil_oink(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_7D:
-            effectRet = playFX_7D(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SOMETHING_ROTATING:
+            effectRet = fx_something_rotating(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_7E:
-            effectRet = playFX_7E(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_BREAKING_JUNK:
+            effectRet = fx_breaking_junk(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_7F:
-            effectRet = playFX_7F(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_PARTNER_BUFF:
+            effectRet = fx_partner_buff(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_80:
-            effectRet = playFX_80(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_QUIZMO_ASSISTANT:
+            effectRet = fx_quizmo_assistant(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_81:
-            effectRet = playFX_81(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_ICE_PILLAR:
+            effectRet = fx_ice_pillar(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_82:
-            effectRet = playFX_82(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_SUN:
+            effectRet = fx_sun(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_83:
-            effectRet = playFX_83(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_STAR_SPIRITS_ENERGY:
+            effectRet = fx_star_spirits_energy(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_84:
-            effectRet = playFX_84(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_PINK_SPARKLES:
+            effectRet = fx_pink_sparkles(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_85:
-            effectRet = playFX_85(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_STAR_OUTLINE:
+            effectRet = fx_star_outline(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
-        case EFFECT_ID_86:
-            effectRet = playFX_86(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
+        case EFFECT_86:
+            effectRet = fx_86(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6);
             break;
         default:
             PANIC();
diff --git a/src/npc.c b/src/npc.c
index 274a2bd9ff..799ce3e122 100644
--- a/src/npc.c
+++ b/src/npc.c
@@ -987,7 +987,7 @@ void npc_update_decoration_bowser_aura(Npc* npc, s32 idx) {
 
     switch (npc->decorationInitialised[idx]) {
         case 0:
-            playFX_3B(2, npc->pos.x, npc->pos.y, npc->pos.z, 1.0f, &npc->decorations[idx]);
+            fx_aura(2, npc->pos.x, npc->pos.y, npc->pos.z, 1.0f, &npc->decorations[idx]);
             npc->decorationInitialised[idx] = 1;
             break;
         case 1:
@@ -1038,7 +1038,7 @@ void npc_update_decoration_seeing_stars(Npc* npc, s32 idx) {
 
     switch (npc->decorationInitialised[idx]) {
         case 0:
-            playFX_2F(0, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, 20.0f, 3, &npc->decorations[idx]);
+            fx_stars_orbiting(0, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, 20.0f, 3, &npc->decorations[idx]);
             npc->decorationInitialised[idx] = 1;
             return;
         case 1:
@@ -1063,7 +1063,7 @@ void npc_update_decoration_glow_in_front(Npc* npc, s32 idx) {
 
     switch (npc->decorationInitialised[idx]) {
         case 0:
-            npc->decorations[idx] = playFX_52(2, npc->pos.x, npc->pos.y + npc->collisionHeight * 0.5, npc->pos.z,
+            npc->decorations[idx] = fx_energy_orb_wave(2, npc->pos.x, npc->pos.y + npc->collisionHeight * 0.5, npc->pos.z,
                                                   npc->scale.x * 0.8 + 0.2f, -1);
             npc->decorationInitialised[idx] = 1;
             break;
@@ -1086,7 +1086,7 @@ void npc_update_decoration_glow_behind(Npc* npc, s32 idx) {
 
     switch (npc->decorationInitialised[idx]) {
         case 0:
-            npc->decorations[idx] = playFX_52(2, npc->pos.x, npc->pos.y + npc->collisionHeight * 0.5, npc->pos.z - 5.0f, 1.0f,
+            npc->decorations[idx] = fx_energy_orb_wave(2, npc->pos.x, npc->pos.y + npc->collisionHeight * 0.5, npc->pos.z - 5.0f, 1.0f,
                                                   0);
             npc->decorationInitialised[idx] = 1;
             break;
@@ -1393,21 +1393,21 @@ void func_8003D788(Npc* npc, s32 arg1) {
         f32 z = npc->pos.z;
 
         if (phi_a2 == 0) {
-            fx_land(0, x, y, z, D_80077C10);
+            fx_landing_dust(0, x, y, z, D_80077C10);
             D_80077C10 = clamp_angle(D_80077C10 + 35.0f);
         } else {
-            playFX_72(3, x, y, z,  13.0f, 10.0f, 1.0f, 5, 30);
+            fx_misc_particles(3, x, y, z,  13.0f, 10.0f, 1.0f, 5, 30);
         }
     } else if (arg1 != 0) {
         if (D_80077C14++ >= 4) {
             D_80077C14 = 0;
             if (phi_a2 == 0) {
                 sin_cos_rad((clamp_angle(-npc->yaw) * TAU) / 360.0f, &subroutine_argA, &subroutine_argB);
-                fx_walk(0, npc->pos.x + (npc->collisionRadius * subroutine_argA * 0.2f), npc->pos.y + 1.5f,
+                fx_walking_dust(0, npc->pos.x + (npc->collisionRadius * subroutine_argA * 0.2f), npc->pos.y + 1.5f,
                                npc->pos.z + (npc->collisionRadius * subroutine_argB * 0.2f), subroutine_argA, subroutine_argB);
             } else {
                 sin_cos_rad((clamp_angle(npc->yaw) * TAU) / 360.0f, &subroutine_argA, &subroutine_argB);
-                playFX_72(3, npc->pos.x + (npc->collisionRadius * subroutine_argA), npc->pos.y + 1.5f,
+                fx_misc_particles(3, npc->pos.x + (npc->collisionRadius * subroutine_argA), npc->pos.y + 1.5f,
                               npc->pos.z + (npc->collisionRadius * subroutine_argB), 5.0f, 10.0f, 1.0f, 5, 30);
             }
         }
@@ -1428,7 +1428,7 @@ void func_8003DFA0(Npc* npc) {
         temp_f20 = (clamp_angle(-npc->yaw) * TAU) / 360.0f;
         x = sin_rad(temp_f20);
         z = cos_rad(temp_f20);
-        playFX_0C(npc->pos.x + (npc->collisionRadius * x * 0.2f), npc->pos.y + 1.5f,
+        fx_footprint(npc->pos.x + (npc->collisionRadius * x * 0.2f), npc->pos.y + 1.5f,
                   npc->pos.z + (npc->collisionRadius * z * 0.2f), -npc->yaw, D_80077C34);
         D_80077C34 = !D_80077C34;
     }
@@ -1444,7 +1444,7 @@ void func_8003E0D4(Npc* npc) {
         theta = (clamp_angle(-npc->yaw) * TAU) / 360.0f;
         sinTheta = sin_rad(theta);
         cosTheta = cos_rad(theta);
-        playFX_2C(1, npc->pos.x + (npc->collisionRadius * sinTheta * 0.2f),
+        fx_falling_leaves(1, npc->pos.x + (npc->collisionRadius * sinTheta * 0.2f),
                   40.0f, npc->pos.z + (npc->collisionRadius * cosTheta * 0.2f));
     }
 }
@@ -1459,7 +1459,7 @@ void func_8003E1D0(Npc* npc) {
         temp_f20 = (clamp_angle(-npc->yaw) * TAU) / 360.0f;
         x = sin_rad(temp_f20);
         z = cos_rad(temp_f20);
-        playFX_23(0, npc->pos.x + (npc->collisionRadius * x * 0.2f), npc->pos.y + 0.0f,
+        fx_rising_bubble(0, npc->pos.x + (npc->collisionRadius * x * 0.2f), npc->pos.y + 0.0f,
                   npc->pos.z + (npc->collisionRadius * z * 0.2f), 0.0f);
     }
 }
diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c
index 0343b986b5..3add102189 100644
--- a/src/world/action/hammer.c
+++ b/src/world/action/hammer.c
@@ -78,7 +78,7 @@ void func_802B6048_E24F18(s32 arg0) {
     }
 
     exec_ShakeCamX(0, 2, s2temp, phi_f24);
-    playFX_1D(0, xTemp, yTemp, zTemp, phi_s1, phi_s3, 0, (s2temp + 3) * 3);
+    fx_smoke_impact(0, xTemp, yTemp, zTemp, phi_s1, phi_s3, 0, (s2temp + 3) * 3);
 
     switch (is_ability_active(ABILITY_ATTACK_FX)) {
         case 1:
diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c
index fc79409a24..3f3707b1d7 100644
--- a/src/world/action/hit_lava.c
+++ b/src/world/action/hit_lava.c
@@ -55,7 +55,7 @@ void func_802B6000_E27F40(void) {
             break;
         case 0:
             if (playerStatus->unk_BF == 1) {
-                playFX_27(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 1.0f, 0x28);
+                fx_smoke_burst(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 1.0f, 0x28);
             }
             suggest_player_anim_setUnkFlag(0x80000 | 2);
             playerStatus->gravityIntegrator[1] = 0.0f;
@@ -78,7 +78,7 @@ void func_802B6000_E27F40(void) {
             break;
         case 2:
             if (playerStatus->unk_BF == 1 && !(playerStatus->decorationList & DECORATION_GOLDEN_FLAMES)) {
-                playFX_27(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 0.7f, 18);
+                fx_smoke_burst(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 0.7f, 18);
             }
             if (playerStatus->position.y < playerStatus->gravityIntegrator[3] + playerStatus->gravityIntegrator[2]) {
                 sin_cos_rad((D_802B68B4 * TAU) / 360.0f, &sp18, &sp1C);
@@ -100,7 +100,7 @@ void func_802B6000_E27F40(void) {
         case 3:
             if (playerStatus->unk_BF == 1) {
                 if (!(playerStatus->decorationList & DECORATION_GOLDEN_FLAMES)) {
-                    playFX_27(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 0.7f, 18);
+                    fx_smoke_burst(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 0.7f, 18);
                 }
             }
             if (get_lava_reset_pos(&sp20, &sp24, &sp28) == 0) {
@@ -157,7 +157,7 @@ void func_802B6000_E27F40(void) {
             break;
         case 6:
             if (playerStatus->unk_BF == 1 && (playerStatus->decorationList & DECORATION_GOLDEN_FLAMES) == 0) {
-                playFX_27(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 0.7f, 18);
+                fx_smoke_burst(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 0.7f, 18);
             }
             playerStatus->position.y = player_check_collision_below(func_800E34D8(), &sp2C);
             if (sp2C >= 0) {
diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c
index f6f20f4f48..c0d89d196d 100644
--- a/src/world/action/sneaky_parasol.c
+++ b/src/world/action/sneaky_parasol.c
@@ -333,7 +333,7 @@ void func_802B6120_E2A7D0(void) {
             parasolStruct->position.y = playerStatus->position.y - 20;
         }
         if (parasolStruct->unk_08 < 0xB && parasolStruct->unk_08 & 1) {
-            playFX_11(3, parasolStruct->position.x - 8, parasolStruct->position.y + 50, parasolStruct->position.z, 2);
+            fx_sparkles(3, parasolStruct->position.x - 8, parasolStruct->position.y + 50, parasolStruct->position.z, 2);
             temp_f22 = parasolStruct->position.x;
             tempX = (((cam->currentYaw + playerStatus->spriteFacingAngle) - 90) * TAU) / 360;
 
@@ -347,7 +347,7 @@ void func_802B6120_E2A7D0(void) {
     } else if (parasolStruct->unk_08 == 0) {
         parasolStruct->unk_08 = -1;
         if (parasolStruct->npc != NULL) {
-            playFX_84(playerStatus->unk_0D - 1, parasolStruct->npc->pos.x, parasolStruct->npc->pos.y, parasolStruct->npc->pos.z, 1, parasolStruct->npc->yawCamOffset);
+            fx_pink_sparkles(playerStatus->unk_0D - 1, parasolStruct->npc->pos.x, parasolStruct->npc->pos.y, parasolStruct->npc->pos.z, 1, parasolStruct->npc->yawCamOffset);
         }
     }
     if (parasolStruct->unk_0C != 0) {
@@ -356,7 +356,7 @@ void func_802B6120_E2A7D0(void) {
                 sfx_play_sound_at_player(0xFE, 0);
             }
             if ((parasolStruct->unk_0C & 3) == 0) {
-                playFX_22(4, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 50, 50, 0x28, 0x1E);
+                fx_stars_shimmer(4, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 50, 50, 0x28, 0x1E);
             }
         }
         parasolStruct->unk_0C--;
diff --git a/src/world/area_arn/arn_02/events.c b/src/world/area_arn/arn_02/events.c
index 605ee74a10..06f450ddbc 100644
--- a/src/world/area_arn/arn_02/events.c
+++ b/src/world/area_arn/arn_02/events.c
@@ -278,7 +278,7 @@ void N(func_80240694_BDD844)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit
 
     npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
     if (npc->duration % 3 == 0) {
-        fx_walk(2, npc->pos.x, npc->pos.y, npc->pos.z + 2.0f, 0, 0);
+        fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z + 2.0f, 0, 0);
     }
 
     npc->duration--;
diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c
index 43c4b0dcc9..6d7788d3a3 100644
--- a/src/world/area_arn/arn_04/events.c
+++ b/src/world/area_arn/arn_04/events.c
@@ -467,7 +467,7 @@ void N(func_80242A1C_BE61CC)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit
 
     npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
     if (npc->duration % 3 == 0) {
-        fx_walk(2, npc->pos.x, npc->pos.y, npc->pos.z + 2.0f, 0, 0);
+        fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z + 2.0f, 0, 0);
     }
 
     npc->duration--;
diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c
index ea35b0b07d..950dc60294 100644
--- a/src/world/area_dgb/dgb_04/C36530.c
+++ b/src/world/area_dgb/dgb_04/C36530.c
@@ -965,7 +965,7 @@ ApiStatus N(func_802429D0_C38F00)(Evt* script, s32 isInitialCall) {
         scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args));
 
         for (i = 0, userDataPtr = scriptPtr; i < 3; i++) {
-            userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f,
+            userDataPtr->unk_08[i] = fx_motion_blur_flame(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f,
                                                    scriptPtr->unk_5C->position.z, 1.0f, -1);
             save = 0.0f;
             userDataPtr->unk_2C[i] = save;
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 4a80f42c13..1748460145 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -3013,11 +3013,11 @@ ApiStatus N(func_80241BE0_95CDE0)(Evt* script, s32 isInitialCall) {
     EffectInstanceDataThing* effectPtr;
 
     if (isInitialCall) {
-        N(D_8024DFE0) = playFX_4E(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)),
+        N(D_8024DFE0) = fx_quizmo_stage(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)),
                                       evt_get_variable(script, EVT_ARRAY(3)));
-        N(D_8024DFE4) = playFX_54(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)),
+        N(D_8024DFE4) = fx_quizmo_audience(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)),
                                       evt_get_variable(script, EVT_ARRAY(3)));
-        N(D_8024DFE8) = playFX_80(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)),
+        N(D_8024DFE8) = fx_quizmo_assistant(0, evt_get_variable(script, EVT_ARRAY(1)), evt_get_variable(script, EVT_ARRAY(2)),
                                       evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
 
         effectPtr = N(D_8024DFE0)->unk_0C;
@@ -3126,9 +3126,9 @@ void N(func_80242468_95D668)(void) {
     s32 var = evt_get_variable(NULL, N(D_8024DFD8));
 
     if (var == 1) {
-        playFX_50(0, 0, 0, 0);
+        fx_quizmo_answer(0, 0, 0, 0);
     } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
+        fx_quizmo_answer(1, 0, 0, 0);
     }
 }
 
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index 1b6a43527e..83258d3695 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -3109,11 +3109,11 @@ ApiStatus N(func_80240A70_969C30)(Evt* script, s32 isInitialCall) {
     EffectInstanceDataThing* effectPtr;
 
     if (isInitialCall) {
-        N(D_8024EFC0) = playFX_4E(0, (f32) evt_get_variable(script, EVT_ARRAY(1)), (f32) evt_get_variable(script, EVT_ARRAY(2)),
+        N(D_8024EFC0) = fx_quizmo_stage(0, (f32) evt_get_variable(script, EVT_ARRAY(1)), (f32) evt_get_variable(script, EVT_ARRAY(2)),
                                       (f32) evt_get_variable(script, EVT_ARRAY(3)));
-        N(D_8024EFC4) = playFX_54(0, (f32) evt_get_variable(script, EVT_ARRAY(1)), (f32) evt_get_variable(script, EVT_ARRAY(2)),
+        N(D_8024EFC4) = fx_quizmo_audience(0, (f32) evt_get_variable(script, EVT_ARRAY(1)), (f32) evt_get_variable(script, EVT_ARRAY(2)),
                                       (f32) evt_get_variable(script, EVT_ARRAY(3)));
-        N(D_8024EFC8) = playFX_80(0, (f32) evt_get_variable(script, EVT_ARRAY(1)), (f32) evt_get_variable(script, EVT_ARRAY(2)),
+        N(D_8024EFC8) = fx_quizmo_assistant(0, (f32) evt_get_variable(script, EVT_ARRAY(1)), (f32) evt_get_variable(script, EVT_ARRAY(2)),
                                       (f32) evt_get_variable(script, EVT_ARRAY(3)), 1.0f, 0);
 
         effectPtr = (EffectInstanceDataThing*) N(D_8024EFC0)->data; // TODO this is wrong
@@ -3222,9 +3222,9 @@ void N(func_802412F8_96A4B8)(void) {
     s32 var = evt_get_variable(NULL, N(D_8024EFB8));
 
     if (var == 1) {
-        playFX_50(0, 0, 0, 0);
+        fx_quizmo_answer(0, 0, 0, 0);
     } else if (var == 2) {
-        playFX_50(1, 0, 0, 0);
+        fx_quizmo_answer(1, 0, 0, 0);
     }
 }
 
diff --git a/src/world/area_flo/flo_00/C9DF20.c b/src/world/area_flo/flo_00/C9DF20.c
index aa59a630d3..aa6f50c65a 100644
--- a/src/world/area_flo/flo_00/C9DF20.c
+++ b/src/world/area_flo/flo_00/C9DF20.c
@@ -1,9 +1,9 @@
 #include "flo_00.h"
 
 // Same as SpawnSunEffect, but doesn't touch float regs like SpawnSunEffect does
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_C9DF20)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0, 0, 0, 0, 0);
+    fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_03/CA72A0.c b/src/world/area_flo/flo_03/CA72A0.c
index 896ba2bc90..cfc76d89c4 100644
--- a/src/world/area_flo/flo_03/CA72A0.c
+++ b/src/world/area_flo/flo_03/CA72A0.c
@@ -1,8 +1,8 @@
 #include "flo_03.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CA72A0)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c
index f9e69c42e7..3b8d25347c 100644
--- a/src/world/area_flo/flo_07/CAC1F0.c
+++ b/src/world/area_flo/flo_07/CAC1F0.c
@@ -24,7 +24,7 @@ typedef struct N(temp) {
 } N(temp);
 
 ApiStatus N(func_80240344_CAC534)(Evt* script, s32 isInitialCall) {
-    N(temp)* effect = playFX_72(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0);
+    N(temp)* effect = fx_misc_particles(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0);
 
     effect->unk_0C->unk_38 = 0xF0;
     effect->unk_0C->unk_3C = 0xF0;
diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c
index 500c1cf540..6701ede395 100644
--- a/src/world/area_flo/flo_08/CAED40.c
+++ b/src/world/area_flo/flo_08/CAED40.c
@@ -158,7 +158,7 @@ ApiStatus N(func_80240600_CAF340)(Evt* script, s32 isInitialCall) {
         scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args));
 
         for (i = 0, userDataPtr = scriptPtr; i < 3; i++) {
-            userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f,
+            userDataPtr->unk_08[i] = fx_motion_blur_flame(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f,
                                                    scriptPtr->unk_5C->position.z, 1.0f, -1);
             save = 0.0f;
             userDataPtr->unk_2C[i] = save;
diff --git a/src/world/area_flo/flo_08/CAFA80.c b/src/world/area_flo/flo_08/CAFA80.c
index 32c6b05e84..cb336770cc 100644
--- a/src/world/area_flo/flo_08/CAFA80.c
+++ b/src/world/area_flo/flo_08/CAFA80.c
@@ -1,14 +1,14 @@
 #include "flo_08.h"
 
-// It seems like playFX_82 was not properly defined for this file. Having a proper
+// It seems like fx_sun was not properly defined for this file. Having a proper
 // declaration makes it not match.
 #ifdef AVOID_UB
-void playFX_82(s32, f32, f32, f32, f32, s32);
+void fx_sun(s32, f32, f32, f32, f32, s32);
 #else
-void playFX_82(s32, s32, s32, s32, s32, s32);
+void fx_sun(s32, s32, s32, s32, s32, s32);
 #endif
 
 ApiStatus N(func_80240D40_CAFA80)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_09/CB5000.c b/src/world/area_flo/flo_09/CB5000.c
index d31f37bb74..7978c6bb3e 100644
--- a/src/world/area_flo/flo_09/CB5000.c
+++ b/src/world/area_flo/flo_09/CB5000.c
@@ -1,8 +1,8 @@
 #include "flo_09.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CB5000)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_10/CB9240.c b/src/world/area_flo/flo_10/CB9240.c
index 0ac8af2249..f07a2d2fda 100644
--- a/src/world/area_flo/flo_10/CB9240.c
+++ b/src/world/area_flo/flo_10/CB9240.c
@@ -1,8 +1,8 @@
 #include "flo_10.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240040_CB9240)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_11/CBDCD0.c b/src/world/area_flo/flo_11/CBDCD0.c
index ddacfde3ae..afbdaca218 100644
--- a/src/world/area_flo/flo_11/CBDCD0.c
+++ b/src/world/area_flo/flo_11/CBDCD0.c
@@ -897,9 +897,9 @@ EvtScript N(makeEntities) = {
 
 #include "world/common/SomeXYZFunc2.inc.c"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_802402E0_CBDFB0)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0, 0, 0, 0, 0);
+    fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_12/CC0E30.c b/src/world/area_flo/flo_12/CC0E30.c
index bd863014e2..64260d8244 100644
--- a/src/world/area_flo/flo_12/CC0E30.c
+++ b/src/world/area_flo/flo_12/CC0E30.c
@@ -1,8 +1,8 @@
 #include "flo_12.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CC0E30)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0, 0, 0, 0, 0);
+    fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_13/CC3810.c b/src/world/area_flo/flo_13/CC3810.c
index b1ec4e55b1..09a3e3fc64 100644
--- a/src/world/area_flo/flo_13/CC3810.c
+++ b/src/world/area_flo/flo_13/CC3810.c
@@ -1,8 +1,8 @@
 #include "flo_13.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0, 0, 0, 0, 0);
+    fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c
index ad8a404e1d..5bdfe9a863 100644
--- a/src/world/area_flo/flo_14/CCB310.c
+++ b/src/world/area_flo/flo_14/CCB310.c
@@ -576,10 +576,10 @@ EvtScript N(80243E78) = {
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_8024030C_CCB61C)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0, 0, 0, 0, 0);
+    fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_flo/flo_16/CD1E30.c b/src/world/area_flo/flo_16/CD1E30.c
index e15adf62ba..bf9b83ff69 100644
--- a/src/world/area_flo/flo_16/CD1E30.c
+++ b/src/world/area_flo/flo_16/CD1E30.c
@@ -1,8 +1,8 @@
 #include "flo_16.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CD1E30)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c
index 7d1d1b4638..e46bad7fac 100644
--- a/src/world/area_flo/flo_16/CD1F10.c
+++ b/src/world/area_flo/flo_16/CD1F10.c
@@ -587,7 +587,7 @@ ApiStatus N(func_802406E0_CD2510)(Evt* script, s32 isInitialCall) {
         scriptPtr->unk_5C = get_entity_by_index(evt_get_variable(script, *args));
 
         for (i = 0, userDataPtr = scriptPtr; i < 3; i++) {
-            userDataPtr->unk_08[i] = playFX_51(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f,
+            userDataPtr->unk_08[i] = fx_motion_blur_flame(0, scriptPtr->unk_5C->position.x, scriptPtr->unk_5C->position.y + 12.5f,
                                                    scriptPtr->unk_5C->position.z, 1.0f, -1);
             save = 0.0f;
             userDataPtr->unk_2C[i] = save;
diff --git a/src/world/area_flo/flo_17/CD72E0.c b/src/world/area_flo/flo_17/CD72E0.c
index b1c51e5f83..931cab737f 100644
--- a/src/world/area_flo/flo_17/CD72E0.c
+++ b/src/world/area_flo/flo_17/CD72E0.c
@@ -1,8 +1,8 @@
 #include "flo_17.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CD72E0)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c
index eec8da6082..76a2691d9b 100644
--- a/src/world/area_flo/flo_18/CDC6A0.c
+++ b/src/world/area_flo/flo_18/CDC6A0.c
@@ -1736,16 +1736,16 @@ static s32 N(pad_66B4)[] = {
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-// It seems like playFX_82 was not properly defined for this file. Having a proper
+// It seems like fx_sun was not properly defined for this file. Having a proper
 // declaration makes it not match.
 #ifdef AVOID_UB
-void playFX_82(s32, f32, f32, f32, f32, s32);
+void fx_sun(s32, f32, f32, f32, f32, s32);
 #else
-void playFX_82(s32, s32, s32, s32, s32, s32);
+void fx_sun(s32, s32, s32, s32, s32, s32);
 #endif
 
 ApiStatus N(func_8024030C_CDC9AC)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c
index b9a420352a..0ebf0d9aa4 100644
--- a/src/world/area_flo/flo_19/CE36F0.c
+++ b/src/world/area_flo/flo_19/CE36F0.c
@@ -695,16 +695,16 @@ EvtScript N(80242FD0) = {
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-// It seems like playFX_82 was not properly defined for this file. Having a proper
+// It seems like fx_sun was not properly defined for this file. Having a proper
 // declaration makes it not match.
 #ifdef AVOID_UB
-void playFX_82(s32, f32, f32, f32, f32, s32);
+void fx_sun(s32, f32, f32, f32, f32, s32);
 #else
-void playFX_82(s32, s32, s32, s32, s32, s32);
+void fx_sun(s32, s32, s32, s32, s32, s32);
 #endif
 
 ApiStatus N(func_8024030C_CE39FC)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c
index 09cc1ac9a1..7710ab614b 100644
--- a/src/world/area_flo/flo_21/CE6700.c
+++ b/src/world/area_flo/flo_21/CE6700.c
@@ -1388,9 +1388,9 @@ NpcGroupList N(npcGroupList_80245AEC) = {
 
 #include "world/common/UnkTexturePanFunc2.inc.c"
 
-EffectInstance* playFX_82();
+EffectInstance* fx_sun();
 
 ApiStatus N(func_80240B00_CE7200)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_22/CEC240.c b/src/world/area_flo/flo_22/CEC240.c
index 2b9e6b1f2f..0543b68e64 100644
--- a/src/world/area_flo/flo_22/CEC240.c
+++ b/src/world/area_flo/flo_22/CEC240.c
@@ -381,9 +381,9 @@ static s32 N(pad_1594)[] = {
     0x00000000, 0x00000000, 0x00000000,
 };
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CEC240)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_23/CEE260.c b/src/world/area_flo/flo_23/CEE260.c
index 0b598a2533..6088a7e6b3 100644
--- a/src/world/area_flo/flo_23/CEE260.c
+++ b/src/world/area_flo/flo_23/CEE260.c
@@ -1,8 +1,8 @@
 #include "flo_23.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CEE260)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0, 0, 0, 0, 0);
+    fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_24/CF0940.c b/src/world/area_flo/flo_24/CF0940.c
index 705ac81bb5..a4d256fc80 100644
--- a/src/world/area_flo/flo_24/CF0940.c
+++ b/src/world/area_flo/flo_24/CF0940.c
@@ -1,8 +1,8 @@
 #include "flo_24.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CF0940)(Evt* script, s32 isInitialCall) {
-    playFX_82(1, 0, 0, 0, 0, 0);
+    fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_flo/flo_25/CF2BD0.c b/src/world/area_flo/flo_25/CF2BD0.c
index 8f5fe3f88c..033bf8225b 100644
--- a/src/world/area_flo/flo_25/CF2BD0.c
+++ b/src/world/area_flo/flo_25/CF2BD0.c
@@ -1,8 +1,8 @@
 #include "flo_25.h"
 
-void playFX_82();
+void fx_sun();
 
 ApiStatus N(func_80240000_CF2BD0)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0, 0, 0, 0, 0);
+    fx_sun(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c
index e88062bb52..2f7a06bf2c 100644
--- a/src/world/area_kmr/kmr_00/8ABF90.c
+++ b/src/world/area_kmr/kmr_00/8ABF90.c
@@ -16,12 +16,12 @@ ApiStatus func_802403B8_8AC348(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     s32 var4 = evt_get_variable(script, *args++);
 
-    playFX_11(var0, var1, var2, var3, var4);
+    fx_sparkles(var0, var1, var2, var3, var4);
     return ApiStatus_DONE2;
 }
 
 ApiStatus func_802404A0_8AC430(Evt* script, s32 isInitialCall) {
-    playFX_52(4, 0.0f, 0.0f, 0.0f, 0.3f, 30);
+    fx_energy_orb_wave(4, 0.0f, 0.0f, 0.0f, 0.3f, 30);
     return ApiStatus_DONE2;
 }
 
@@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8_8AC478);
 ApiStatus func_80240530_8AC4C0(Evt* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(evt_get_variable(script, *script->ptrReadPos));
 
-    playFX_11(3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f);
+    fx_sparkles(3, npc->pos.x, npc->pos.y + 10.0f, npc->pos.z, 10.0f);
     return ApiStatus_DONE2;
 }
 
@@ -59,7 +59,7 @@ ApiStatus func_80240BD8_8ACB68(Evt* script, s32 isInitialCall) {
         script->functionTemp[1] = evt_get_variable(script, *args);
         npc = get_npc_unsafe(script->functionTemp[1]);
         sfx_play_sound_at_position(0xB000001E, 0, npc->pos.x, npc->pos.y, npc->pos.z);
-        playFX_11(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f);
+        fx_sparkles(0, npc->pos.x, npc->pos.y + 20.0f, npc->pos.z, 10.0f);
         script->functionTemp[0] = 3;
     }
 
diff --git a/src/world/area_trd/trd_05/9AEE20.c b/src/world/area_trd/trd_05/9AEE20.c
index 25a0c2d90b..a076975a43 100644
--- a/src/world/area_trd/trd_05/9AEE20.c
+++ b/src/world/area_trd/trd_05/9AEE20.c
@@ -2,6 +2,6 @@
 #include "effects.h"
 
 ApiStatus func_80240720_9AEE20(Evt* script, s32 isInitialCall) {
-    fx_walk(2, script->varTable[0], script->varTable[1], script->varTable[2], 0, 0);
+    fx_walking_dust(2, script->varTable[0], script->varTable[1], script->varTable[2], 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/DeadUnkFunc1.inc.c b/src/world/common/DeadUnkFunc1.inc.c
index 264a7deeae..5b5a87fd2c 100644
--- a/src/world/common/DeadUnkFunc1.inc.c
+++ b/src/world/common/DeadUnkFunc1.inc.c
@@ -1,8 +1,8 @@
 #include "common.h"
 
-void dead_playFX_82(s32, s32, s32, s32, s32, s32);
+void dead_fx_sun(s32, s32, s32, s32, s32, s32);
 
 ApiStatus N(DeadUnkFunc1)(Evt* script, s32 isInitialCall) {
-    dead_playFX_82(1, 0, 0, 0, 0, 0);
+    dead_fx_sun(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/PlayFX3D.inc.c b/src/world/common/PlayFX3D.inc.c
index 7a40314635..4540ae8b16 100644
--- a/src/world/common/PlayFX3D.inc.c
+++ b/src/world/common/PlayFX3D.inc.c
@@ -13,7 +13,7 @@ ApiStatus N(PlayFX3D)(Evt* script, s32 isInitialStatus) {
     s32 var8 = evt_get_variable(script, *args++);
     s32 outVal;
 
-    playFX_3D(var1, var2, var3, var4, var5, var6, var7, var8, &outVal);
+    fx_3D(var1, var2, var3, var4, var5, var6, var7, var8, &outVal);
     script->varTable[0] = outVal;
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/SpawnSunEffect.inc.c b/src/world/common/SpawnSunEffect.inc.c
index 8716fdc2e1..cabb09900c 100644
--- a/src/world/common/SpawnSunEffect.inc.c
+++ b/src/world/common/SpawnSunEffect.inc.c
@@ -3,6 +3,6 @@
 #include "effects.h"
 
 ApiStatus N(SpawnSunEffect)(Evt* script, s32 isInitialCall) {
-    playFX_82(0, 0.0f, 0.0f, 0.0f, 0.0f, 0);
+    fx_sun(0, 0.0f, 0.0f, 0.0f, 0.0f, 0);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/StarSpiritEffectFunc.inc.c b/src/world/common/StarSpiritEffectFunc.inc.c
index a97e2e4328..709985803a 100644
--- a/src/world/common/StarSpiritEffectFunc.inc.c
+++ b/src/world/common/StarSpiritEffectFunc.inc.c
@@ -31,7 +31,7 @@ ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) {
         ptr->unk_20 = evt_get_float_variable(script, *args++);
         ptr->unk_24 = evt_get_float_variable(script, *args++);
         ptr->unk_28 = evt_get_float_variable(script, *args++);
-        ptr->unk_50 = (struct StarSpiritEffectUnkStruct*) playFX_83(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0);
+        ptr->unk_50 = (struct StarSpiritEffectUnkStruct*) fx_star_spirits_energy(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0);
         ptr->unk_4E = 0;
         ptr->unk_48 = 0;
         ptr->unk_4A = 0;
@@ -72,7 +72,7 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) {
         case 2:
             ptr->unk_46++;
             if (ptr->unk_46 >= 60) {
-                ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0);
+                ptr->unk_54 = fx_spirit_card(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0);
                 *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38;
                 ptr->unk_54->unk_0C->unk_20 = 0;
                 ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20);
@@ -154,7 +154,7 @@ ApiStatus N(StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall) {
         ptr->unk_24 = evt_get_float_variable(script, *args++);
         ptr->unk_20 = evt_get_float_variable(script, *args++);
         ptr->unk_28 = evt_get_float_variable(script, *args++);
-        ptr->unk_54 = playFX_7B(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0);
+        ptr->unk_54 = fx_spirit_card(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0);
         ptr->unk_54->unk_0C->unk_34 = ptr->unk_38;
         ptr->unk_54->unk_0C->unk_20 = 0;
         ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20);
diff --git a/src/world/common/UnkFunc20.inc.c b/src/world/common/UnkFunc20.inc.c
index 380a63233c..51833c8fe2 100644
--- a/src/world/common/UnkFunc20.inc.c
+++ b/src/world/common/UnkFunc20.inc.c
@@ -7,7 +7,7 @@ ApiStatus N(UnkFunc20)(Evt* script, s32 isInitialCall) {
     s32 entityIdx = evt_get_variable(script, *args++);
     Entity* entity = get_entity_by_index(entityIdx);
     s32 evt_var = *args++;
-    EffectInstance* effectInst = playFX_52(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f,
+    EffectInstance* effectInst = fx_energy_orb_wave(0, entity->position.x, entity->position.y + 12.5f, entity->position.z, 0.7f,
                                  0);
 
     evt_set_variable(script, evt_var, (s32) effectInst);
diff --git a/src/world/common/UnkFunc21.inc.c b/src/world/common/UnkFunc21.inc.c
index e398e70e01..2963c49b51 100644
--- a/src/world/common/UnkFunc21.inc.c
+++ b/src/world/common/UnkFunc21.inc.c
@@ -4,7 +4,7 @@
 ApiStatus N(UnkFunc21)(Evt* script, s32 isInitialCall) {
     Entity* entity = get_entity_by_index(evt_get_variable(script, *script->ptrReadPos));
 
-    playFX_33(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B);
+    fx_radial_shimmer(4, entity->position.x, entity->position.y + 12.5f, entity->position.z, 1.0f, 0x4B);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/UnkFunc22.inc.c b/src/world/common/UnkFunc22.inc.c
index eb64744c2a..cd268efff3 100644
--- a/src/world/common/UnkFunc22.inc.c
+++ b/src/world/common/UnkFunc22.inc.c
@@ -4,7 +4,7 @@
 ApiStatus N(UnkFunc22)(Evt* script, s32 isInitialCall) {
     Npc* npc = get_npc_safe(-4);
 
-    playFX_33(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 0x1E);
+    fx_radial_shimmer(9, npc->pos.x, npc->pos.y + 12.5f, npc->pos.z, 1.0f, 0x1E);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/UnkMoveFunc2.inc.c b/src/world/common/UnkMoveFunc2.inc.c
index e4d5cdd5af..fb69293d6e 100644
--- a/src/world/common/UnkMoveFunc2.inc.c
+++ b/src/world/common/UnkMoveFunc2.inc.c
@@ -8,8 +8,8 @@ ApiStatus N(UnkMoveFunc2)(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     f32 var4 = evt_get_float_variable(script, *args++);
 
-    playFX_6B(6, var1 + 10, var2 + 18, var3, var4, 45);
-    playFX_33(12, var1 + 10, var2 + 18, var3, var4, 30);
+    fx_energy_in_out(6, var1 + 10, var2 + 18, var3, var4, 45);
+    fx_radial_shimmer(12, var1 + 10, var2 + 18, var3, var4, 30);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/UnkMoveFunc3.inc.c b/src/world/common/UnkMoveFunc3.inc.c
index 3700064509..d18d48185c 100644
--- a/src/world/common/UnkMoveFunc3.inc.c
+++ b/src/world/common/UnkMoveFunc3.inc.c
@@ -8,8 +8,8 @@ ApiStatus N(UnkMoveFunc3)(Evt* script, s32 isInitialCall) {
     s32 var3 = evt_get_variable(script, *args++);
     f32 var4 = evt_get_float_variable(script, *args++);
 
-    playFX_6B(6, var1 + 10, var2 + 18, var3, var4, 45);
-    playFX_33(13, var1 + 10, var2 + 18, var3, var4, 30);
+    fx_energy_in_out(6, var1 + 10, var2 + 18, var3, var4, 45);
+    fx_radial_shimmer(13, var1 + 10, var2 + 18, var3, var4, 30);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/UnkNpcAIFunc39.inc.c b/src/world/common/UnkNpcAIFunc39.inc.c
index 9a9309a198..292d13d1dd 100644
--- a/src/world/common/UnkNpcAIFunc39.inc.c
+++ b/src/world/common/UnkNpcAIFunc39.inc.c
@@ -36,7 +36,7 @@ void N(UnkNpcAIFunc39)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThi
             npc->jumpVelocity = 0.0f;
             npc->pos.y = posY;
             npc->flags &= ~NPC_FLAG_NO_Y_MOVEMENT;
-            fx_walk(2, npc->pos.x, npc->pos.y, npc->pos.z, 0.0f, 0.0f);
+            fx_walking_dust(2, npc->pos.x, npc->pos.y, npc->pos.z, 0.0f, 0.0f);
             script->functionTemp[0] = 12;
 
             if (func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1) == 0) {
diff --git a/src/world/common/UnkPartnerPosFuncs.inc.c b/src/world/common/UnkPartnerPosFuncs.inc.c
index 32069f4369..f34e9336fd 100644
--- a/src/world/common/UnkPartnerPosFuncs.inc.c
+++ b/src/world/common/UnkPartnerPosFuncs.inc.c
@@ -3,13 +3,13 @@
 ApiStatus N(UnkPartnerPosFunc)(Evt* script, s32 isInitialCall) {
     Npc* partner = get_npc_safe(NPC_PARTNER);
 
-    playFX_11(2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f);
+    fx_sparkles(2, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f);
     return ApiStatus_DONE2;
 }
 
 ApiStatus N(UnkPartnerPosFunc2)(Evt* script, s32 isInitialCall) {
     Npc* partner = get_npc_safe(NPC_PARTNER);
 
-    playFX_11(4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f);
+    fx_sparkles(4, partner->pos.x, partner->pos.y + 30.0f, partner->pos.z, 30.0f);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c
index 6f92e29616..e68551d263 100644
--- a/src/world/partner/kooper.c
+++ b/src/world/partner/kooper.c
@@ -8,7 +8,7 @@ s32 test_item_entity_position(f32, f32, f32, f32);
 s32 npc_raycast_up_corner(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length);
 s32 npc_raycast_up(s32 ignoreFlags, f32* x, f32* y, f32* z, f32* length);
 void start_bounce_b(void);
-void playFX_18(s32, f32, f32, f32, f32, f32, f32, s32);
+void fx_damage_stars(s32, f32, f32, f32, f32, f32, f32, s32);
 void func_801341B0(Npc* npc);
 
 BSS s32 D_802BEC50;
@@ -357,7 +357,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                         kooper->currentAnim.w = 0x20009;
                         D_802BEB40_31CB60 = 1;
                         temp_f20_2 = sin_deg(playerStatus->targetYaw);
-                        playFX_18(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
+                        fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
                                 temp_f20_2, -1.0f, -cos_deg(playerStatus->targetYaw), 3);
                         start_bounce_b();
 
@@ -390,7 +390,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                         }
 
                         temp_f20_3 = sin_deg(kooper->yaw);
-                        playFX_18(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
+                        fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
                                 temp_f20_3, -1.0f, -cos_deg(kooper->yaw), 1);
                         sfx_play_sound_at_npc(0, 0, -4);
                         script->functionTemp[0] = 7;
@@ -431,7 +431,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                             if (func_802BD17C_31B19C(kooper) != 0) {
                                 sfx_play_sound_at_npc(0x286, 0, -4);
                                 temp_f20_4 = sin_deg(kooper->yaw);
-                                playFX_18(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
+                                fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
                                           temp_f20_4, -1.0f, -cos_deg(kooper->yaw), 1);
                                 sfx_play_sound_at_npc(0, 0, -4);
                                 script->functionTemp[0] = 4;
@@ -473,7 +473,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                         }
 
                         temp_f20_3 = sin_deg(kooper->yaw);
-                        playFX_18(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
+                        fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
                                 temp_f20_3, -1.0f, -cos_deg(kooper->yaw), 1);
                         sfx_play_sound_at_npc(0, 0, -4);
                         script->functionTemp[0] = 7;
@@ -550,7 +550,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) {
                     kooper->pos.z = sp28;
                     sfx_play_sound_at_npc(0x10C, 0, -4);
                     temp_f20_6 = sin_deg(kooper->yaw + 180.0f);
-                    playFX_18(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
+                    fx_damage_stars(3, kooper->pos.x, kooper->pos.y + kooper->collisionHeight, kooper->pos.z,
                             temp_f20_6, -1.0f, -cos_deg(kooper->yaw + 180.0f), 1);
                     script->functionTemp[0] = 0;
                 } else {
diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c
index adb9756b13..2925a0277b 100644
--- a/src/world/partner/sushie.c
+++ b/src/world/partner/sushie.c
@@ -339,7 +339,7 @@ s32 func_802BFAB8_320828(Evt* script, s32 isInitialCall) {
             func_802BD100_31DE70();
 
             if (!(script->functionTemp[1] & 3)) {
-                playFX_23(0, partnerNPC->pos.x, partnerNPC->moveToPos.y +
+                fx_rising_bubble(0, partnerNPC->pos.x, partnerNPC->moveToPos.y +
                         (partnerNPC->collisionHeight * 0.5f), partnerNPC->pos.z, 0);
             }
 
diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c
index 63faece2b2..3e32876a85 100644
--- a/src/world/partner/watt.c
+++ b/src/world/partner/watt.c
@@ -41,7 +41,7 @@ s32 D_802BE254_31DDC4 = 6;
 void func_802BD100_31CC70(Npc* npc) {
     if (!(npc->flags & NPC_FLAG_2)) {
         if (D_802BE310 == NULL) {
-            D_802BE310 = (unk_802BE310*)playFX_73(0, npc->pos.x, npc->pos.y + 13.0f, npc->pos.z, 0.9f, 5, 0);
+            D_802BE310 = (unk_802BE310*)fx_static_status(0, npc->pos.x, npc->pos.y + 13.0f, npc->pos.z, 0.9f, 5, 0);
         }
     }
 }
diff --git a/tools/gen_effect_renames.py b/tools/gen_effect_renames.py
new file mode 100755
index 0000000000..5984672bc2
--- /dev/null
+++ b/tools/gen_effect_renames.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python3
+
+import argparse
+import os
+
+def auto_int(x):
+    return int(x, 0)
+
+script_dir = os.path.dirname(os.path.realpath(__file__))
+
+parser = argparse.ArgumentParser(
+    description="Generate rename file for effects"
+)
+
+parser.add_argument(
+    "id",
+    help="Effect num to rename",
+    type=auto_int,
+)
+
+parser.add_argument(
+    "to",
+    help="Name (in snake case) to change the effect to",
+)
+
+def main(args):
+    id = args.id
+    to = args.to
+
+    to_write = []
+
+    hex_str = f"{id:02x}".upper()
+
+    struct_name = ''.join(word.title() for word in to.split('_'))
+    to_write.append(f"Effect{id} {struct_name}FXData")
+    to_write.append(f"playFX_{hex_str} fx_{to}")
+    to_write.append(f"FX_ENTRY_NUMBERED({id}, FX_ENTRY({to},")
+    to_write.append(f"effect_{id} {to}")
+    to_write.append(f"fx_{id}_main {to}_main")
+    to_write.append(f"fx_{id}_init {to}_init")
+    to_write.append(f"fx_{id}_update {to}_update")
+    to_write.append(f"fx_{id}_render {to}_render")
+    to_write.append(f"fx_{id}_appendGfx {to}_appendGfx")
+    to_write.append(f"EFFECT_ID_{hex_str} EFFECT_{to.upper()}")
+
+    with open(os.path.join(script_dir, "to_rename.txt"), "a") as f:
+        for line in to_write:
+            f.write(f"{line}\n")
+
+if __name__ == "__main__":
+    args = parser.parse_args()
+    main(args)
diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt
index 36ae55f134..1bbed95b97 100644
--- a/tools/ignored_funcs.txt
+++ b/tools/ignored_funcs.txt
@@ -1,4 +1,3 @@
-
 dead_set_main_pan_u = 0x80126064;
 dead_set_main_pan_v = 0x8012607C;
 dead_set_aux_pan_u = 0x80126094;
@@ -39,9 +38,9 @@ dead_cos_deg = 0x8002B640;
 dead_subtract_hp = 0x800F1EF8;
 dead_sfx_adjust_env_sound_pos = 0x8015704C;
 dead_evt_get_float_variable = 0x802D57FC;
-dead_playFX_83 = 0x80077C30;
+dead_fx_star_spirits_energy = 0x80077C30;
 dead_update_lerp = 0x8002B6A4;
-dead_playFX_7B = 0x80077930;
+dead_fx_spirit_card = 0x80077930;
 dead_create_shadow_type = 0x8011AAB4;
 dead_dist3D = 0x8002B21C;
 func_802E2A80 = 0x802E2A80;
@@ -52,7 +51,7 @@ func_8002AA2C = 0x8002AA2C;
 func_80059AC8 = 0x80059AC8;
 dead_get_entity_by_index = 0x80118BB0;
 dead_cos_rad = 0x8002B4C0;
-dead_playFX_82 = 0x80077BD0;
+dead_fx_sun = 0x80077BD0;
 func_80041080 = 0x80041080;
 dead_set_max_SP = 0x800F1D9C;
 dead_sync_status_menu = 0x800F1730;
@@ -70,14 +69,14 @@ func_800F9260 = 0x800F9260;
 func_800F93E8 = 0x800F93E8;
 dead_switch_to_partner = 0x800F2D5C;
 dead_set_message_msg = 0x80130C74;
-dead_playFX_52 = 0x800769D0;
-dead_playFX_33 = 0x80075E30;
+dead_fx_energy_orb_wave = 0x800769D0;
+dead_fx_radial_shimmer = 0x80075E30;
 func_8002B524 = 0x8002B524;
 func_8002BF18 = 0x8002BF18;
 func_80076970 = 0x80076970;
 dead_set_screen_overlay_color = 0x80144200;
 dead_set_screen_overlay_params_front = 0x80144178;
-dead_playFX_11 = 0x80075170;
+dead_fx_sparkles = 0x80075170;
 dead_npc_test_move_simple_without_slipping = 0x800E53AC;
 dead_get_item_entity = 0x8013CF98;
 func_80066FE0 = 0x80066FE0;
diff --git a/tools/rename.py b/tools/rename.py
index e9c47de827..c77d6df8e5 100755
--- a/tools/rename.py
+++ b/tools/rename.py
@@ -2,11 +2,13 @@
 
 import os
 import re
+from tqdm import tqdm
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
-root_dir = script_dir + "/../"
-src_dir = root_dir + "src/"
-asm_dir = root_dir + "ver/current/asm/"
+root_dir = os.path.join(script_dir, "..")
+src_dir = os.path.join(root_dir, "src")
+include_dir = os.path.join(root_dir, "include")
+asm_dir = os.path.join(root_dir, "ver", "us", "asm")
 
 renames = {}
 deletes = []
@@ -23,7 +25,10 @@ def handle_file(f_path, try_rename_file=False):
 
     f_text = f_text_orig
     for rename in renames:
-        f_text = re.sub(r"(?:\b)" + rename + r"(?:\b)", renames[rename], f_text)
+        if "(" in rename or "," in rename:
+            f_text = f_text.replace(rename, renames[rename])
+        else:
+            f_text = re.sub(r"(?:\b)" + re.escape(rename) + r"(?:\b)", renames[rename], f_text)
 
     with open(f_path, "w", newline="\n") as f:
         f.write(f_text)
@@ -40,35 +45,50 @@ for line in renames_text:
 
 # Walk through asm files and rename stuff
 print("Walking through asm files")
+asm_files = []
 for root, dirs, files in os.walk(asm_dir):
     for f_name in files:
-        if f_name.endswith(".s"):
-            f_path = os.path.join(root, f_name)
-
-            handle_file(f_path, True)
-
-# Delete old versions of newly saved asm files
-print("Deleting old asm files")
-for d in deletes:
-    os.remove(d)
+        asm_files.append(os.path.join(root, f_name))
+for f_path in tqdm(asm_files):
+    if f_path.endswith(".s"):
+        handle_file(f_path, True)
 
 # Walk through src files and rename stuff
 print("Walking through src files")
+c_files = []
 for root, dirs, files in os.walk(src_dir):
     for f_name in files:
-        if f_name.endswith(".c") or f_name.endswith(".h"):
-            f_path = os.path.join(root, f_name)
-
-            handle_file(f_path)
+        c_files.append(os.path.join(root, f_name))
+for f_path in tqdm(c_files):
+    if f_name.endswith(".c") or f_name.endswith(".h"):
+        handle_file(f_path, True)
 
 # Walk through include files and rename stuff
 print("Walking through include files")
-for root, dirs, files in os.walk(os.path.join(root_dir, "include")):
+for root, dirs, files in os.walk(include_dir):
     for f_name in files:
         f_path = os.path.join(root, f_name)
 
         handle_file(f_path)
 
+# Delete old versions of newly saved files
+print("Deleting old files")
+for d in deletes:
+    os.remove(d)
+
+# Walk through asm dirs and rename stuff
+print("Walking through asm dirs")
+for root, dirs, files in os.walk(asm_dir):
+    for dir_name in dirs:
+        for rename in renames:
+            if rename == dir_name:
+                os.rename(os.path.join(root, dir_name), os.path.join(root, renames[rename]))
+
 # Rename stuff in symbol_addrs.txt
 handle_file(os.path.join(root_dir, "ver", "current", "symbol_addrs.txt"))
 
+# splat.yaml
+handle_file(os.path.join(root_dir, "ver", "current", "splat.yaml"))
+
+# effects.yaml
+handle_file(os.path.join(root_dir, "ver", "current", "effects.yaml"))
diff --git a/tools/sortsymz.py b/tools/sortsymz.py
index f7d4faaac3..04d9c1b798 100755
--- a/tools/sortsymz.py
+++ b/tools/sortsymz.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import os
 import re
 
@@ -6,18 +8,19 @@ groups = {}
 
 with open("tools/symz.txt") as f:
     for line in f.readlines():
-        name, addr = line.strip().strip(";").split(" = ")
-        syms.append({"name": name, "address": int(addr, 0), "found_in": set(), "dead": False})
+        if line and not line.startswith("//"):
+            name, addr = line.strip().strip(";").split(" = ")
+            syms.append({"name": name, "address": int(addr, 0), "found_in": set(), "dead": False})
 
 # Search src for syms
 for root, dirs, files in os.walk("src"):
     for file in files:
-        if file.endswith(".c"):
+        if file.endswith(".c") and "bss" not in file:
             with open(os.path.join(root, file)) as f:
                 text = f.read()
                 for sym in syms:
                     if sym["name"] in text:
-                        sym["found_in"].add(os.path.join(root, file).replace("src/", "")[:-2])
+                        sym["found_in"].add(os.path.join(root, file).replace("src/", ""))
 
 # Search asm for syms
 for root, dirs, files in os.walk("ver/us/asm"):
@@ -28,7 +31,7 @@ for root, dirs, files in os.walk("ver/us/asm"):
                 for sym in syms:
                     if sym["name"] in text:
                         sym["found_in"].add(os.path.join(root, file).replace("ver/us/asm/nonmatchings/", ""))
-                        if re.match(r"E[0-9A-F]{5}", root.split("/")[-1]):
+                        if re.match(r"E[A-F][0-9A-F]{4}", root.split("/")[-1]):
                             sym["dead"] = True
                         else:
                             sym["dead"] = False
@@ -49,13 +52,13 @@ for sym in syms:
 
 for group in groups:
     if group == "":
-        print("The following symbols can be simply removed from undefined_syms:")
+        print("// The following symbols can be simply removed from undefined_syms:")
     elif group == "multig":
-        print("The following symbols are found in multiple locations:")
+        print("// The following symbols are found in multiple locations:")
     elif group == "dead":
-        print("The following symbols are dead:")
+        print("// The following symbols are dead:")
     else:
-        print(group + ":")
+        print("// " + group + ":")
 
     sorted_syms = sorted(groups[group], key=lambda tup: tup["address"])
 
diff --git a/tools/symz.txt b/tools/symz.txt
new file mode 100644
index 0000000000..10db8297f5
--- /dev/null
+++ b/tools/symz.txt
@@ -0,0 +1,886 @@
+gBackgroundImage = 0x80200000;
+func_80242040_8B20B0 = 0x80242040;
+spiked_goomba = 0x8021B0AC;
+paragoomba = 0x8021CD00;
+D_802C05CC = 0x802C05CC;
+gPauseMenuMsgs = 0x8026F778;
+D_802442D0 = 0x802442D0;
+D_802AB513 = 0x802AB513;
+D_802E99DC = 0x802E99DC;
+D_80247AF0_CCB300 = 0x80247AF0;
+D_802491C0_CA70E0 = 0x802491C0;
+D_80246568_C8C018 = 0x80246568;
+D_8024B9A8_B8FB28 = 0x8024B9A8;
+D_8038F800 = 0x8038F800;
+D_803B5000 = 0x803B5000;
+D_802EF0D0 = 0x802EF0D0;
+D_800FBB60 = 0x800FBB60;
+D_800FBBE0 = 0x800FBBE0;
+D_80200000 = 0x80200000;
+osTvType = 0x80000300;
+D_80000308 = 0x80000308;
+D_8000030C = 0x8000030C;
+osMemSize = 0x80000318;
+D_8000031C = 0x8000031C;
+D_800A08C0 = 0x800A08C0;
+D_80164000 = 0x80164000;
+D_80197000 = 0x80197000;
+D_801A6000 = 0x801A6000;
+D_801A7000 = 0x801A7000;
+D_801AA000 = 0x801AA000;
+D_80210000 = 0x80210000;
+D_8022AD80_4C3F70 = 0x8022AD80;
+D_8022ADD0 = 0x8022ADD0;
+D_8022B550 = 0x8022B550;
+D_80232C4C = 0x80232C4C;
+D_80235E00 = 0x80235E00;
+D_80235E6C_4CF05C = 0x80235E6C;
+D_80235F44_4CF134 = 0x80235F44;
+D_8023BD70 = 0x8023BD70;
+D_8023BD78 = 0x8023BD78;
+D_8023BD98 = 0x8023BD98;
+D_8023BDB4 = 0x8023BDB4;
+D_8023BDB8 = 0x8023BDB8;
+D_8023BDBC = 0x8023BDBC;
+D_8023BDC0 = 0x8023BDC0;
+D_8023BDC4 = 0x8023BDC4;
+D_8023BDC8 = 0x8023BDC8;
+D_8023C070 = 0x8023C070;
+D_8023C1B0 = 0x8023C1B0;
+D_8023C1B4 = 0x8023C1B4;
+D_8023C1B8 = 0x8023C1B8;
+D_8023C1BC = 0x8023C1BC;
+D_8023C1C0 = 0x8023C1C0;
+D_8023C1C4 = 0x8023C1C4;
+D_8023C1C8 = 0x8023C1C8;
+D_8023C1CC = 0x8023C1CC;
+D_8023C1D0 = 0x8023C1D0;
+D_8023CDA0 = 0x8023CDA0;
+D_8023CDA4 = 0x8023CDA4;
+D_8023D1E0 = 0x8023D1E0;
+D_8023D1E4 = 0x8023D1E4;
+D_8023D26C = 0x8023D26C;
+D_8023D270 = 0x8023D270;
+D_8023D274 = 0x8023D274;
+D_8023D278 = 0x8023D278;
+D_8023D27C = 0x8023D27C;
+D_8023D280 = 0x8023D280;
+D_8023D284 = 0x8023D284;
+D_8023D288 = 0x8023D288;
+D_8023D28C = 0x8023D28C;
+D_8023D290 = 0x8023D290;
+D_8023D294 = 0x8023D294;
+D_8023D298 = 0x8023D298;
+D_8023D29C = 0x8023D29C;
+D_8023D2A0 = 0x8023D2A0;
+D_8023D2A4 = 0x8023D2A4;
+D_8023D2A8 = 0x8023D2A8;
+D_8023D2AC = 0x8023D2AC;
+D_8023D2B0 = 0x8023D2B0;
+D_8023D2B4 = 0x8023D2B4;
+D_8023D2B8 = 0x8023D2B8;
+D_8023D2BC = 0x8023D2BC;
+D_8023D2C0 = 0x8023D2C0;
+D_8023D2C4 = 0x8023D2C4;
+D_8023D2C8 = 0x8023D2C8;
+D_8023D2D0 = 0x8023D2D0;
+D_8023D330 = 0x8023D330;
+D_8023D334 = 0x8023D334;
+D_8023D338 = 0x8023D338;
+D_80241ECC = 0x80241ECC;
+D_80242208 = 0x80242208;
+D_80242344 = 0x80242344;
+D_802423B0 = 0x802423B0;
+D_802429BC = 0x802429BC;
+D_802429E0 = 0x802429E0;
+D_80242FB0 = 0x80242FB0;
+D_80243190 = 0x80243190;
+D_80243374 = 0x80243374;
+D_80243720 = 0x80243720;
+D_80243BE0 = 0x80243BE0;
+D_802440E0 = 0x802440E0;
+D_802440E1 = 0x802440E1;
+D_802440E2 = 0x802440E2;
+D_802440E3 = 0x802440E3;
+D_802440E5 = 0x802440E5;
+D_802440EB = 0x802440EB;
+D_802440EF = 0x802440EF;
+D_802440F3 = 0x802440F3;
+D_802440F7 = 0x802440F7;
+D_802440F8 = 0x802440F8;
+D_802440FB = 0x802440FB;
+D_802440FF = 0x802440FF;
+D_80244104 = 0x80244104;
+D_802442D0 = 0x802442D0;
+D_80244494 = 0x80244494;
+D_802447C0 = 0x802447C0;
+D_80244A20 = 0x80244A20;
+D_80244C18 = 0x80244C18;
+D_80244D88 = 0x80244D88;
+D_802451F0 = 0x802451F0;
+D_80245230 = 0x80245230;
+D_802453D8 = 0x802453D8;
+D_80245430 = 0x80245430;
+D_80245600 = 0x80245600;
+D_80245601 = 0x80245601;
+D_80245602 = 0x80245602;
+D_80245603 = 0x80245603;
+D_80245604 = 0x80245604;
+D_80245605 = 0x80245605;
+D_80245608 = 0x80245608;
+D_8024560C = 0x8024560C;
+D_80245610 = 0x80245610;
+D_80245614 = 0x80245614;
+D_80245618 = 0x80245618;
+D_8024561C = 0x8024561C;
+D_80245620 = 0x80245620;
+D_80245650 = 0x80245650;
+D_80245928 = 0x80245928;
+D_8024592C = 0x8024592C;
+D_802459C0 = 0x802459C0;
+D_80245AB4 = 0x80245AB4;
+D_802461F0 = 0x802461F0;
+D_80246260 = 0x80246260;
+D_802462F0 = 0x802462F0;
+D_80246300 = 0x80246300;
+D_80246424 = 0x80246424;
+D_80246460_EC9D00 = 0x80246460;
+D_8024652C = 0x8024652C;
+D_80246530 = 0x80246530;
+D_80246534 = 0x80246534;
+D_80246554 = 0x80246554;
+D_8024655C = 0x8024655C;
+D_80246578 = 0x80246578;
+D_80246598 = 0x80246598;
+D_8024659C = 0x8024659C;
+D_802465A0 = 0x802465A0;
+D_802465CC = 0x802465CC;
+D_802465F0 = 0x802465F0;
+D_802466D0 = 0x802466D0;
+D_80246794 = 0x80246794;
+D_802467B4 = 0x802467B4;
+D_80246990 = 0x80246990;
+D_80246BE8 = 0x80246BE8;
+D_80247050 = 0x80247050;
+D_80247120 = 0x80247120;
+D_802474A0 = 0x802474A0;
+D_80247548 = 0x80247548;
+D_80247664 = 0x80247664;
+D_80247750 = 0x80247750;
+D_802479F0 = 0x802479F0;
+D_80247BF0 = 0x80247BF0;
+D_80247CA0 = 0x80247CA0;
+D_80247CB4 = 0x80247CB4;
+D_80247D00 = 0x80247D00;
+D_80247E68 = 0x80247E68;
+D_80248388 = 0x80248388;
+D_802483C0 = 0x802483C0;
+D_802483C4 = 0x802483C4;
+D_802483D0 = 0x802483D0;
+D_80248480 = 0x80248480;
+D_80248600 = 0x80248600;
+D_80248624 = 0x80248624;
+D_80248650 = 0x80248650;
+D_80248850 = 0x80248850;
+D_80248924 = 0x80248924;
+D_80248938 = 0x80248938;
+D_80248940 = 0x80248940;
+D_80248944 = 0x80248944;
+D_80248948 = 0x80248948;
+D_80248F90 = 0x80248F90;
+D_80249158 = 0x80249158;
+D_80249440 = 0x80249440;
+D_8024A290 = 0x8024A290;
+D_8024A2A0 = 0x8024A2A0;
+D_8024A2C4 = 0x8024A2C4;
+D_8024A2D0 = 0x8024A2D0;
+D_8024B990 = 0x8024B990;
+D_8024B9B4 = 0x8024B9B4;
+D_8024B9B8 = 0x8024B9B8;
+D_8024BA90 = 0x8024BA90;
+D_8024BDD0 = 0x8024BDD0;
+D_8024BDE8 = 0x8024BDE8;
+D_8024BDF0 = 0x8024BDF0;
+D_8024BDF4 = 0x8024BDF4;
+D_8024BDF8 = 0x8024BDF8;
+D_8024BEA0 = 0x8024BEA0;
+D_8024C068 = 0x8024C068;
+D_8024C088 = 0x8024C088;
+D_8024C090 = 0x8024C090;
+D_8024C098 = 0x8024C098;
+D_8024C108 = 0x8024C108;
+D_8024C110 = 0x8024C110;
+D_8024C117 = 0x8024C117;
+D_8024C1D8 = 0x8024C1D8;
+D_8024C5E0 = 0x8024C5E0;
+D_8024DBC0 = 0x8024DBC0;
+D_8024DD88 = 0x8024DD88;
+D_8024DF10 = 0x8024DF10;
+D_8024DF18 = 0x8024DF18;
+D_8024DF1C = 0x8024DF1C;
+D_8024DF20 = 0x8024DF20;
+D_8024DF24 = 0x8024DF24;
+D_8024DFC0 = 0x8024DFC0;
+D_8024DFD8 = 0x8024DFD8;
+D_8024DFE0 = 0x8024DFE0;
+D_8024DFE4 = 0x8024DFE4;
+D_8024DFE8 = 0x8024DFE8;
+D_8024DFF0 = 0x8024DFF0;
+D_8024E1B4 = 0x8024E1B4;
+D_8024E540 = 0x8024E540;
+D_8024E558 = 0x8024E558;
+D_8024E560 = 0x8024E560;
+D_8024E564 = 0x8024E564;
+D_8024E568 = 0x8024E568;
+D_8024E570 = 0x8024E570;
+D_8024E738 = 0x8024E738;
+D_8024E960 = 0x8024E960;
+D_8024EA10 = 0x8024EA10;
+D_8024EA14 = 0x8024EA14;
+D_8024EA18 = 0x8024EA18;
+gPauseMenuPanels = 0x8024EF80;
+D_8024EF84 = 0x8024EF84;
+D_8024EF88 = 0x8024EF88;
+D_8024EF90 = 0x8024EF90;
+gPauseMenuCursorPosY = 0x8024EFA0;
+D_8024EFB8 = 0x8024EFB8;
+D_8024EFC0 = 0x8024EFC0;
+D_8024EFC8 = 0x8024EFC8;
+D_8024F010 = 0x8024F010;
+D_8024F080 = 0x8024F080;
+D_8024F248 = 0x8024F248;
+D_8024F2A0 = 0x8024F2A0;
+D_8024F2A1 = 0x8024F2A1;
+D_8024F2A2 = 0x8024F2A2;
+D_8024F2A3 = 0x8024F2A3;
+D_8024F2A4 = 0x8024F2A4;
+D_8024F2A5 = 0x8024F2A5;
+D_8024F2A8 = 0x8024F2A8;
+D_8024F2AB = 0x8024F2AB;
+D_8024F2AC = 0x8024F2AC;
+D_8024F2AF = 0x8024F2AF;
+D_8024F2B0 = 0x8024F2B0;
+D_8024F2B3 = 0x8024F2B3;
+D_8024F2B4 = 0x8024F2B4;
+D_8024F2B7 = 0x8024F2B7;
+D_8024F2B8 = 0x8024F2B8;
+D_8024F2BB = 0x8024F2BB;
+D_8024F2BC = 0x8024F2BC;
+D_8024F2BF = 0x8024F2BF;
+D_8024F2C4 = 0x8024F2C4;
+D_8024F2C8 = 0x8024F2C8;
+D_8024F2CC = 0x8024F2CC;
+D_8024F2D8 = 0x8024F2D8;
+D_8024F2DC = 0x8024F2DC;
+D_8024F2E0 = 0x8024F2E0;
+D_8024F2EC = 0x8024F2EC;
+D_8024F2F4 = 0x8024F2F4;
+D_8024F2F8 = 0x8024F2F8;
+D_8024F2FC = 0x8024F2FC;
+D_8024F304 = 0x8024F304;
+D_8024F308 = 0x8024F308;
+D_8024F30C = 0x8024F30C;
+D_8024F318 = 0x8024F318;
+D_8024F338 = 0x8024F338;
+D_8024F358 = 0x8024F358;
+D_8024F374 = 0x8024F374;
+D_8024F378 = 0x8024F378;
+D_8024F3F8 = 0x8024F3F8;
+D_8024F448 = 0x8024F448;
+D_8024F498 = 0x8024F498;
+D_8024F4E8 = 0x8024F4E8;
+D_8024F581 = 0x8024F581;
+D_8024F582 = 0x8024F582;
+D_8024F583 = 0x8024F583;
+D_8024F584 = 0x8024F584;
+D_8024F585 = 0x8024F585;
+D_8024F588 = 0x8024F588;
+D_8024F58B = 0x8024F58B;
+D_8024F58C = 0x8024F58C;
+D_8024F58F = 0x8024F58F;
+D_8024F590 = 0x8024F590;
+D_8024F593 = 0x8024F593;
+D_8024F594 = 0x8024F594;
+D_8024F597 = 0x8024F597;
+D_8024F598 = 0x8024F598;
+D_8024F59B = 0x8024F59B;
+D_8024F59C = 0x8024F59C;
+D_8024F59F = 0x8024F59F;
+D_8024F5A0 = 0x8024F5A0;
+D_8024F5A4 = 0x8024F5A4;
+D_8024F5C4 = 0x8024F5C4;
+D_8024F5C8 = 0x8024F5C8;
+D_8024F5D0 = 0x8024F5D0;
+D_8024F7E4 = 0x8024F7E4;
+D_8024F7F0 = 0x8024F7F0;
+D_8024FBA0 = 0x8024FBA0;
+D_8024FD68 = 0x8024FD68;
+D_8024FED8 = 0x8024FED8;
+D_8024FEF0 = 0x8024FEF0;
+D_8024FEF8 = 0x8024FEF8;
+D_8024FEFC = 0x8024FEFC;
+D_8024FF00 = 0x8024FF00;
+D_8024FF04 = 0x8024FF04;
+D_80250EF0 = 0x80250EF0;
+D_802513D0 = 0x802513D0;
+D_802513E8 = 0x802513E8;
+D_802513F4 = 0x802513F4;
+D_802513F8 = 0x802513F8;
+D_80251400 = 0x80251400;
+D_80251450 = 0x80251450;
+D_80251468 = 0x80251468;
+D_80251470 = 0x80251470;
+D_80251478 = 0x80251478;
+D_802515C4 = 0x802515C4;
+D_80251C40 = 0x80251C40;
+D_80251C58 = 0x80251C58;
+D_80251C60 = 0x80251C60;
+D_80251C68 = 0x80251C68;
+D_80251C70 = 0x80251C70;
+D_80251E34 = 0x80251E34;
+D_802529D0 = 0x802529D0;
+D_802529E8 = 0x802529E8;
+D_802529F0 = 0x802529F0;
+D_802529F4 = 0x802529F4;
+D_80252A00 = 0x80252A00;
+D_80252BC8 = 0x80252BC8;
+D_80252D38 = 0x80252D38;
+D_80253060 = 0x80253060;
+D_80253378 = 0x80253378;
+D_80253384 = 0x80253384;
+D_8025338C = 0x8025338C;
+D_80253390 = 0x80253390;
+D_802547D0 = 0x802547D0;
+D_802549B8 = 0x802549B8;
+D_802549C4 = 0x802549C4;
+D_802549C8 = 0x802549C8;
+D_802549D0 = 0x802549D0;
+D_80254B94 = 0x80254B94;
+D_80254BA0 = 0x80254BA0;
+D_80254D68 = 0x80254D68;
+D_80255B70 = 0x80255B70;
+D_80255B88 = 0x80255B88;
+D_80255B90 = 0x80255B90;
+D_80255B94 = 0x80255B94;
+D_80255B98 = 0x80255B98;
+D_80255BA0 = 0x80255BA0;
+D_80255D68 = 0x80255D68;
+D_80255ED8 = 0x80255ED8;
+D_80255EE0 = 0x80255EE0;
+D_802560A4 = 0x802560A4;
+D_80257118 = 0x80257118;
+D_80257320 = 0x80257320;
+D_80257F20 = 0x80257F20;
+D_80257F21 = 0x80257F21;
+D_80257F22 = 0x80257F22;
+D_80257F23 = 0x80257F23;
+D_80257F24 = 0x80257F24;
+D_80257F25 = 0x80257F25;
+D_80257F26 = 0x80257F26;
+D_80257F27 = 0x80257F27;
+D_80257F28 = 0x80257F28;
+D_80257F29 = 0x80257F29;
+D_80257F2C = 0x80257F2C;
+D_80257F40 = 0x80257F40;
+D_80257F48 = 0x80257F48;
+D_80257F4C = 0x80257F4C;
+D_80257F50 = 0x80257F50;
+D_80257F58 = 0x80257F58;
+D_8025811C = 0x8025811C;
+D_80258120 = 0x80258120;
+D_80258140 = 0x80258140;
+D_80258340 = 0x80258340;
+D_8025B0A8 = 0x8025B0A8;
+D_8025B2A8 = 0x8025B2A8;
+D_8025B2AC = 0x8025B2AC;
+D_8025B2B0 = 0x8025B2B0;
+D_8025C0D0 = 0x8025C0D0;
+D_80262A40 = 0x80262A40;
+D_80262A58 = 0x80262A58;
+D_80262A60 = 0x80262A60;
+D_80262A64 = 0x80262A64;
+D_80262A68 = 0x80262A68;
+D_80262A70 = 0x80262A70;
+D_80262C34 = 0x80262C34;
+D_80262C38 = 0x80262C38;
+D_80262F68 = 0x80262F68;
+heap_collisionHead = 0x80268000;
+gPauseMenuCommonIconIDs = 0x802700E8;
+D_80270108 = 0x80270108;
+D_8027010C = 0x8027010C;
+D_80270110 = 0x80270110;
+D_80270114 = 0x80270114;
+D_80270118 = 0x80270118;
+D_8027011C = 0x8027011C;
+gPauseMenuTabIconIDs = 0x80270130;
+D_80270148 = 0x80270148;
+D_8027014C = 0x8027014C;
+gStatsMenuIconIDs = 0x80270150;
+gBadgeMenuItemIDs = 0x80270180;
+gBadgeMenuCurrentPage = 0x80270280;
+gBadgeMenuPages = 0x80270288;
+gBadgeMenuSelectedIndex = 0x80270378;
+D_8027037C = 0x8027037C;
+gBadgeMenuSelectedItemID = 0x80270380;
+gBadgeMenuNumItems = 0x80270384;
+D_80270388 = 0x80270388;
+gBadgeMenuCurrentScrollPos = 0x8027038C;
+gBadgeMenuTargetScrollPos = 0x80270390;
+D_80270394 = 0x80270394;
+gBadgeMenuLevel = 0x80270398;
+gBadgeMenuCurrentTab = 0x8027039C;
+gBadgeMenuBShowNotEnoughBP = 0x802703A0;
+gBadgeMenuIconIDs = 0x802703A8;
+D_802703FC = 0x802703FC;
+gItemMenuItemIDs = 0x80270400;
+gItemMenuCurrentPage = 0x802704C8;
+gItemMenuPages = 0x802704D0;
+D_802704D1 = 0x802704D1;
+D_802704D2 = 0x802704D2;
+gItemMenuSelectedIndex = 0x802705C0;
+D_802705C4 = 0x802705C4;
+gItemMenuSelectedItemID = 0x802705C8;
+gItemMenuNumItems = 0x802705CC;
+D_802705D0 = 0x802705D0;
+gItemMenuCurrentScrollPos = 0x802705D4;
+gItemMenuTargetScrollPos = 0x802705D8;
+D_802705DC = 0x802705DC;
+gItemMenuLevel = 0x802705E0;
+gItemMenuCurrentTab = 0x802705E4;
+gItemIcons = 0x802705E8;
+D_80270634 = 0x80270634;
+D_80270640 = 0x80270640;
+D_80270660 = 0x80270660;
+D_80270680 = 0x80270680;
+D_802706A0 = 0x802706A0;
+D_802706A4 = 0x802706A4;
+D_802706A8 = 0x802706A8;
+D_802706AC = 0x802706AC;
+D_802706B0 = 0x802706B0;
+D_802706C0 = 0x802706C0;
+D_802706E0 = 0x802706E0;
+D_802706FC = 0x802706FC;
+D_80270700 = 0x80270700;
+pause_map_cameraX = 0x80270704;
+pause_map_cameraY = 0x80270708;
+pause_map_marioX = 0x8027070C;
+pause_map_marioY = 0x80270710;
+pause_map_targetX = 0x80270714;
+pause_map_targetY = 0x80270718;
+pause_map_cursorCurrentOption = 0x8027071C;
+pause_map_cursorCurrentOptionCopy = 0x80270720;
+pause_map_spacesInSnapRange = 0x80270724;
+D_80282EE9 = 0x80282EE9;
+D_80282EEA = 0x80282EEA;
+bMarioHideAnims = 0x80283370;
+D_8029DA30 = 0x8029DA30;
+D_8029DA33 = 0x8029DA33;
+D_8029DA34 = 0x8029DA34;
+D_8029DA40 = 0x8029DA40;
+D_8029DA44 = 0x8029DA44;
+D_8029DA48 = 0x8029DA48;
+D_8029DA4C = 0x8029DA4C;
+D_8029DA50 = 0x8029DA50;
+D_8029EFB0 = 0x8029EFB0;
+D_8029EFB4 = 0x8029EFB4;
+D_8029EFB8 = 0x8029EFB8;
+D_8029EFBC = 0x8029EFBC;
+D_8029EFC0 = 0x8029EFC0;
+D_8029EFE8 = 0x8029EFE8;
+D_8029F010 = 0x8029F010;
+D_8029F038 = 0x8029F038;
+D_8029F236 = 0x8029F236;
+D_8029F240 = 0x8029F240;
+D_8029F244 = 0x8029F244;
+D_8029F248 = 0x8029F248;
+D_8029F24C = 0x8029F24C;
+D_8029F250 = 0x8029F250;
+D_8029F254 = 0x8029F254;
+D_8029F258 = 0x8029F258;
+D_8029F25C = 0x8029F25C;
+D_8029F260 = 0x8029F260;
+D_8029F264 = 0x8029F264;
+D_8029F270 = 0x8029F270;
+D_8029F274 = 0x8029F274;
+D_8029F278 = 0x8029F278;
+D_8029F27C = 0x8029F27C;
+D_8029F27E = 0x8029F27E;
+D_8029F280 = 0x8029F280;
+D_8029F282 = 0x8029F282;
+D_8029F284 = 0x8029F284;
+D_8029F286 = 0x8029F286;
+D_8029F288 = 0x8029F288;
+D_8029F28C = 0x8029F28C;
+D_8029F290 = 0x8029F290;
+D_8029F294 = 0x8029F294;
+D_8029F298 = 0x8029F298;
+D_8029F29C = 0x8029F29C;
+D_8029F29E = 0x8029F29E;
+D_8029F2A0 = 0x8029F2A0;
+D_8029F2A2 = 0x8029F2A2;
+D_8029F2A3 = 0x8029F2A3;
+D_8029F2A4 = 0x8029F2A4;
+D_8029F2A5 = 0x8029F2A5;
+D_8029F2A6 = 0x8029F2A6;
+D_8029F2A7 = 0x8029F2A7;
+D_8029F2A8 = 0x8029F2A8;
+D_8029F2AC = 0x8029F2AC;
+D_8029F2B0 = 0x8029F2B0;
+D_8029F2B4 = 0x8029F2B4;
+popupMessages = 0x8029F2C0;
+D_8029F640 = 0x8029F640;
+D_8029F642 = 0x8029F642;
+D_8029F644 = 0x8029F644;
+D_8029F646 = 0x8029F646;
+D_8029F648 = 0x8029F648;
+D_8029F64A = 0x8029F64A;
+D_8029F64C = 0x8029F64C;
+D_8029F64E = 0x8029F64E;
+D_8029F650 = 0x8029F650;
+gSpeakingActorPrintCtx = 0x8029FA60;
+D_8029FA64 = 0x8029FA64;
+gSpeakingActorPrintIsDone = 0x8029FA68;
+gSpeakingActorTalkAnim = 0x8029FA6C;
+gSpeakingActorIdleAnim = 0x8029FA70;
+gSpeakingActor = 0x8029FA74;
+gSpeakingActorPart = 0x8029FA78;
+D_8029FA80 = 0x8029FA80;
+D_8029FA88 = 0x8029FA88;
+D_8029FA90 = 0x8029FA90;
+D_8029FAA8 = 0x8029FAA8;
+D_8029FAC4 = 0x8029FAC4;
+D_8029FAE8 = 0x8029FAE8;
+D_8029FB48 = 0x8029FB48;
+D_8029FB4C = 0x8029FB4C;
+D_8029FB50 = 0x8029FB50;
+D_8029FB54 = 0x8029FB54;
+D_8029FB60 = 0x8029FB60;
+D_8029FB64 = 0x8029FB64;
+D_8029FB68 = 0x8029FB68;
+D_8029FB6C = 0x8029FB6C;
+D_8029FB70 = 0x8029FB70;
+D_8029FB74 = 0x8029FB74;
+D_8029FB78 = 0x8029FB78;
+D_8029FB7C = 0x8029FB7C;
+D_8029FB80 = 0x8029FB80;
+D_8029FB84 = 0x8029FB84;
+D_8029FB88 = 0x8029FB88;
+D_8029FB8C = 0x8029FB8C;
+D_8029FB90 = 0x8029FB90;
+D_8029FB94 = 0x8029FB94;
+D_8029FB98 = 0x8029FB98;
+D_8029FB9C = 0x8029FB9C;
+D_8029FBA0 = 0x8029FBA0;
+D_8029FBA4 = 0x8029FBA4;
+D_8029FBA8 = 0x8029FBA8;
+D_8029FBAC = 0x8029FBAC;
+D_8029FBB0 = 0x8029FBB0;
+D_8029FBC0 = 0x8029FBC0;
+D_8029FBD0 = 0x8029FBD0;
+D_8029FBD4 = 0x8029FBD4;
+gActionCommandStatus = 0x8029FBE0;
+D_8029FC2A = 0x8029FC2A;
+D_8029FC4C = 0x8029FC4C;
+D_802A19B0 = 0x802A19B0;
+D_802A19C0 = 0x802A19C0;
+D_802A1A90 = 0x802A1A90;
+D_802A1AC0 = 0x802A1AC0;
+D_802A1B40 = 0x802A1B40;
+D_802A1CD0 = 0x802A1CD0;
+D_802A1CD4 = 0x802A1CD4;
+D_802A21F0 = 0x802A21F0;
+D_802A25C8 = 0x802A25C8;
+D_802A25E4 = 0x802A25E4;
+D_802A25E8 = 0x802A25E8;
+D_802A25EC = 0x802A25EC;
+D_802A25F0 = 0x802A25F0;
+D_802A25F4 = 0x802A25F4;
+D_802A25F8 = 0x802A25F8;
+D_802A25FC = 0x802A25FC;
+D_802A2C20 = 0x802A2C20;
+D_802A2C50 = 0x802A2C50;
+D_802A2CC0 = 0x802A2CC0;
+D_802A2DD8 = 0x802A2DD8;
+D_802A2DEC = 0x802A2DEC;
+D_802A2DF0 = 0x802A2DF0;
+D_802A2DF4 = 0x802A2DF4;
+D_802A2DF8 = 0x802A2DF8;
+D_802A2DFC = 0x802A2DFC;
+D_802A2E00 = 0x802A2E00;
+D_802A37F0 = 0x802A37F0;
+D_802A37F8 = 0x802A37F8;
+D_802A3818 = 0x802A3818;
+D_802A3834 = 0x802A3834;
+D_802A3838 = 0x802A3838;
+D_802A3F58 = 0x802A3F58;
+D_802A3F88 = 0x802A3F88;
+D_802A4020 = 0x802A4020;
+D_802A4350 = 0x802A4350;
+D_802A43D0 = 0x802A43D0;
+D_802A9620 = 0x802A9620;
+D_802A98C0 = 0x802A98C0;
+D_802A9920 = 0x802A9920;
+D_802A9B00 = 0x802A9B00;
+D_802A9F0C = 0x802A9F0C;
+D_802A9F34 = 0x802A9F34;
+D_802A9F5C = 0x802A9F5C;
+D_802A9F84 = 0x802A9F84;
+D_802A9FAC = 0x802A9FAC;
+D_802AA320 = 0x802AA320;
+D_802AA694 = 0x802AA694;
+D_802AAA08 = 0x802AAA08;
+D_802AAA30 = 0x802AAA30;
+D_802ACC60 = 0x802ACC60;
+D_802ACC64 = 0x802ACC64;
+D_802ACC68 = 0x802ACC68;
+D_802ACC6C = 0x802ACC6C;
+D_802ACC70 = 0x802ACC70;
+D_802ACCD0 = 0x802ACCD0;
+D_802ACFE8 = 0x802ACFE8;
+D_802ACFEC = 0x802ACFEC;
+D_802ACFF0 = 0x802ACFF0;
+D_802ACFF4 = 0x802ACFF4;
+D_802ACFFC = 0x802ACFFC;
+D_802ACFFD = 0x802ACFFD;
+D_802AD000 = 0x802AD000;
+D_802AD001 = 0x802AD001;
+D_802AD002 = 0x802AD002;
+D_802AD003 = 0x802AD003;
+D_802AD004 = 0x802AD004;
+D_802AD006 = 0x802AD006;
+D_802AD008 = 0x802AD008;
+D_802AD00A = 0x802AD00A;
+D_802AD010 = 0x802AD010;
+D_802AD028 = 0x802AD028;
+D_802AD040 = 0x802AD040;
+D_802AD044 = 0x802AD044;
+D_802AD048 = 0x802AD048;
+D_802AD04C = 0x802AD04C;
+D_802AD050 = 0x802AD050;
+D_802AD054 = 0x802AD054;
+D_802AD058 = 0x802AD058;
+D_802AD05C = 0x802AD05C;
+D_802AD060 = 0x802AD060;
+D_802AD064 = 0x802AD064;
+D_802AD068 = 0x802AD068;
+D_802AD069 = 0x802AD069;
+D_802AD06A = 0x802AD06A;
+D_802AD06B = 0x802AD06B;
+D_802AD06C = 0x802AD06C;
+D_802AD070 = 0x802AD070;
+main_battle_menu_JumpHudScripts = 0x802AD078;
+battle_menu_messageIDs = 0x802AD090;
+D_802AD0A8 = 0x802AD0A8;
+main_menu_numOptions = 0x802AD0AC;
+D_802AD0B0 = 0x802AD0B0;
+D_802AD0B3 = 0x802AD0B3;
+battle_menu_submenuIDs = 0x802AD0B8;
+D_802AD0BB = 0x802AD0BB;
+D_802AD0BC = 0x802AD0BC;
+D_802AD0C0 = 0x802AD0C0;
+battle_menu_isEnabled = 0x802AD0D0;
+battle_menu_isMessageDisabled = 0x802AD0E8;
+D_802AD0EB = 0x802AD0EB;
+D_802AD100 = 0x802AD100;
+D_802AD104 = 0x802AD104;
+battle_menu_moveState = 0x802AD108;
+battle_menu_moveCursorPos = 0x802AD109;
+D_802AD10A = 0x802AD10A;
+D_802AD10B = 0x802AD10B;
+battle_menu_moveScrollLine = 0x802AD10C;
+D_802AD10D = 0x802AD10D;
+D_802AD10E = 0x802AD10E;
+D_802AD10F = 0x802AD10F;
+battle_menu_moveScrollOffset = 0x802AD110;
+D_802AD112 = 0x802AD112;
+battle_menu_moveTextColor = 0x802AD114;
+battle_menu_moveTextOpacity = 0x802AD116;
+battle_menu_moveCursorIcon = 0x802AD118;
+battle_menu_moveUpArrowIcon = 0x802AD11C;
+battle_menu_moveDownArrowIcon = 0x802AD120;
+battle_menu_moveOptionIconIDs = 0x802AD128;
+battle_menu_moveTitleIcon = 0x802AD188;
+battle_menu_moveOptionCostUnitIconIDs = 0x802AD190;
+battle_menu_moveX = 0x802AD1F0;
+battle_menu_moveY = 0x802AD1F2;
+battle_menu_moveOptionIndexMap = 0x802AD1F8;
+D_802AD258 = 0x802AD258;
+battle_menu_moveOptionIconScripts = 0x802AD260;
+battle_menu_moveOptionNames = 0x802AD2C0;
+battle_menu_moveOptionDisplayCosts = 0x802AD320;
+battle_menu_moveOptionDisplayCostReductions = 0x802AD380;
+battle_menu_moveOptionDisplayCostReductionColors = 0x802AD3E0;
+battle_menu_moveOptionBPCosts = 0x802AD440;
+battle_menu_hasSpiritsMenu = 0x802AD4A0;
+battle_menu_moveOptionCount = 0x802AD4A4;
+D_802AD4A7 = 0x802AD4A7;
+D_802AD4A8 = 0x802AD4A8;
+battle_menu_moveIndices = 0x802AD4B0;
+D_802AD4B2 = 0x802AD4B2;
+D_802AD4B3 = 0x802AD4B3;
+battle_menu_moveOptionsEnabled = 0x802AD510;
+battle_menu_moveOptionDescriptions = 0x802AD570;
+battle_menu_moveOptionSortPriorities = 0x802AD5D0;
+battle_menu_moveOptionCantUseTypes = 0x802AD5E8;
+battle_menu_moveOptionActive = 0x802AD600;
+D_802AD603 = 0x802AD603;
+D_802AD604 = 0x802AD604;
+D_802AD605 = 0x802AD605;
+D_802AD606 = 0x802AD606;
+D_802AD607 = 0x802AD607;
+D_802AD608 = 0x802AD608;
+D_802AD609 = 0x802AD609;
+D_802AD60A = 0x802AD60A;
+D_802AD60B = 0x802AD60B;
+D_802AD60C = 0x802AD60C;
+D_802AD60E = 0x802AD60E;
+D_802AD610 = 0x802AD610;
+D_802AD612 = 0x802AD612;
+D_802AD614 = 0x802AD614;
+D_802AD618 = 0x802AD618;
+D_802AD61C = 0x802AD61C;
+D_802AD620 = 0x802AD620;
+D_802AD624 = 0x802AD624;
+D_802AD628 = 0x802AD628;
+D_802AD63C = 0x802AD63C;
+D_802AD63E = 0x802AD63E;
+D_802AD640 = 0x802AD640;
+D_802AD658 = 0x802AD658;
+D_802AD66C = 0x802AD66C;
+D_802AD66F = 0x802AD66F;
+D_802AD670 = 0x802AD670;
+D_802AD673 = 0x802AD673;
+D_802AD678 = 0x802AD678;
+D_802AD67B = 0x802AD67B;
+D_802AD690 = 0x802AD690;
+D_802AD6A8 = 0x802AD6A8;
+D_802AD6AA = 0x802AD6AA;
+D_802AD6C0 = 0x802AD6C0;
+D_802AD6D4 = 0x802AD6D4;
+D_802B6240 = 0x802B6240;
+D_802B62B0 = 0x802B62B0;
+D_802B62D0 = 0x802B62D0;
+D_802B62D4 = 0x802B62D4;
+D_802B62D8 = 0x802B62D8;
+D_802B62DC = 0x802B62DC;
+D_802B62E0 = 0x802B62E0;
+D_802B6730 = 0x802B6730;
+D_802B6770_E27C80 = 0x802B6770;
+D_802B6780 = 0x802B6780;
+D_802B6784 = 0x802B6784;
+D_802B6788 = 0x802B6788;
+D_802B678C = 0x802B678C;
+D_802B6790 = 0x802B6790;
+D_802B6794 = 0x802B6794;
+D_802B6798 = 0x802B6798;
+D_802B679C = 0x802B679C;
+D_802B68B0 = 0x802B68B0;
+D_802B68B4 = 0x802B68B4;
+D_802B68B8 = 0x802B68B8;
+D_802B68BC = 0x802B68BC;
+D_802B6E80 = 0x802B6E80;
+D_802B6E90_E2A300 = 0x802B6E90;
+D_802B6ED0 = 0x802B6ED0;
+D_802B6ED4 = 0x802B6ED4;
+D_802B6ED8 = 0x802B6ED8;
+D_802B6EDC = 0x802B6EDC;
+D_802B6EE0 = 0x802B6EE0;
+D_802B6EE4 = 0x802B6EE4;
+D_802B6EE8 = 0x802B6EE8;
+D_802B6EEC = 0x802B6EEC;
+D_802B6EF0 = 0x802B6EF0;
+D_802B6EF4 = 0x802B6EF4;
+mdl_clearRenderTasks = 0x802B7E00;
+D_802C0000 = 0x802C0000;
+D_802C05CC = 0x802C05CC;
+gMapFlags = 0x802DA480;
+gMapVars = 0x802DA484;
+gNumScripts = 0x802DA488;
+gWorldScriptList = 0x802DA490;
+gBattleScriptList = 0x802DA690;
+gCurrentScriptListPtr = 0x802DA890;
+gScriptIndexList = 0x802DA898;
+gScriptIdList = 0x802DAA98;
+gScriptListCount = 0x802DAC98;
+evtDebugPrintBuffer = 0x802DACA0;
+gLavaResetList = 0x802DADA0;
+D_802DADA4 = 0x802DADA4;
+gBattleMeshAnimationList = 0x802DADB0;
+gWorldMeshAnimationList = 0x802DADF0;
+gCurrentMeshAnimationListPtr = 0x802DAE30;
+wExtraPartnerID = 0x802DAE40;
+wExtraPartnerNpcID = 0x802DAE44;
+D_802DAE50 = 0x802DAE50;
+D_802DAE54 = 0x802DAE54;
+gCurrentPrintContext = 0x802DB260;
+D_802DB264 = 0x802DB264;
+D_802DB268 = 0x802DB268;
+D_802DB5B0 = 0x802DB5B0;
+D_802DB5C0 = 0x802DB5C0;
+D_802DB6C0 = 0x802DB6C0;
+D_802DB7C0 = 0x802DB7C0;
+D_802DB7D0 = 0x802DB7D0;
+D_802DB7D8 = 0x802DB7D8;
+D_802DB800 = 0x802DB800;
+D_802DB830 = 0x802DB830;
+D_802DBB60 = 0x802DBB60;
+D_802DBB68 = 0x802DBB68;
+gWorldMapFlags = 0x802DBC70;
+D_802DBC7C = 0x802DBC7C;
+D_802DBC88 = 0x802DBC88;
+gWorldMapVars = 0x802DBCA8;
+gBattleMapVars = 0x802DBCE8;
+D_802DBD28 = 0x802DBD28;
+gBattleMapFlags = 0x802DBD34;
+spr_allocateBtlComponentsOnWorldHeap = 0x802DF524;
+D_802DF530 = 0x802DF530;
+D_802DF540 = 0x802DF540;
+spr_playerSprites = 0x802DF548;
+D_802DF57C = 0x802DF57C;
+spr_playerMaxComponents = 0x802DF580;
+spr_playerCurrentAnimInfo = 0x802DF588;
+D_802DF58C = 0x802DF58C;
+D_802DF590 = 0x802DF590;
+spr_npcSprites = 0x802DF5B0;
+spr_npcSpriteInstanceCount = 0x802DF958;
+D_802DFA48 = 0x802DFA48;
+D_802DFA4C = 0x802DFA4C;
+D_802DFA58 = 0x802DFA58;
+D_802DFE44 = 0x802DFE44;
+D_802DFE48 = 0x802DFE48;
+D_802DFE9C = 0x802DFE9C;
+D_802DFEA0 = 0x802DFEA0;
+D_802DFEAC = 0x802DFEAC;
+D_802DFEB0 = 0x802DFEB0;
+D_802DFEB8 = 0x802DFEB8;
+D_802E004C = 0x802E004C;
+D_802E0050 = 0x802E0050;
+D_802E0080 = 0x802E0080;
+D_802E0090 = 0x802E0090;
+D_802E0C10 = 0x802E0C10;
+D_802E0C14 = 0x802E0C14;
+D_802E0C20 = 0x802E0C20;
+D_802E0C58 = 0x802E0C58;
+D_802E0C5C = 0x802E0C5C;
+D_802E0C60 = 0x802E0C60;
+D_802E0C64 = 0x802E0C64;
+D_802E0C68 = 0x802E0C68;
+D_802E0C70 = 0x802E0C70;
+SaveBlockTutorialMessagePrinterClosed = 0x802EB390;
+SaveBlockResultMessagePrinterClosed = 0x802EB394;
+SaveBlockTutorialMessagePrinter = 0x802EB398;
+SaveBlockResultMessagePrinter = 0x802EB39C;
+D_802EB3A0 = 0x802EB3A0;
+TriggerBlockVanishEffect = 0x802EB3B0;
+D_802EB3C0 = 0x802EB3C0;
+D_802ED970 = 0x802ED970;
+D_802EE8D0 = 0x802EE8D0;
+D_802F39D0 = 0x802F39D0;
+D_802F4560 = 0x802F4560;
+heap_generalHead = 0x802FB800;
+gSpriteHeapPtr = 0x8034F800;
+heap_battleHead = 0x803DA800;
+D_802510B0 = 0x802510B0;
+D_8026A2B0 = 0x8026A2B0;
+D_80248380_kzn_19 = 0x80248380;
+D_8024854C_kzn_19 = 0x8024854C;
diff --git a/tools/to_rename.txt b/tools/to_rename.txt
deleted file mode 100644
index 10001214ed..0000000000
--- a/tools/to_rename.txt
+++ /dev/null
@@ -1 +0,0 @@
-nuGfxInit nuGfxInitEX2
diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s
index 568101dd7e..8592a4a973 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s
@@ -387,7 +387,7 @@ dlabel D_802481C4_8E22C4
 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80248090_8E2190, D_80248198_8E2298, 0x00000000, 0x00000000, 0x00000000
 
 dlabel D_802481F0_8E22F0
-.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802481C4_8E22C4, 0x00000000, 0x00000000, 0x00000000, D_802481F0_8E22F0, D_802481C4_8E22C4, D_80248198_8E2298, D_8024816C_8E226C, D_80248140_8E2240, D_80248114_8E2214, D_802480E8_8E21E8, D_802480BC_8E21BC, D_80248090_8E2190, D_80248064_8E2164, D_80248038_8E2138, D_8024800C_8E210C, D_80247FE0_8E20E0, D_80247FB4_8E20B4, D_80247F88_8E2088, D_80247F5C_8E205C, D_80247F30_8E2030, D_80247F04_8E2004, D_80247ED8_8E1FD8, D_80247EAC_8E1FAC, D_80247E80_8E1F80, D_80247E54_8E1F54, D_80247E28_8E1F28, D_80247DFC_8E1EFC, D_80247DD0_8E1ED0, D_80247DA4_8E1EA4, D_80247D78_8E1E78, D_80247D4C_8E1E4C, D_80247D20_8E1E20, D_80247CF4_8E1DF4, D_80247CC8_8E1DC8, D_80247C9C_8E1D9C, D_80247C70_8E1D70, D_80247C44_8E1D44, D_80247C18_8E1D18, D_80247BEC_8E1CEC, D_80247BC0_8E1CC0, D_80247B94_8E1C94, D_80247B68_8E1C68, D_80247B3C_8E1C3C, D_80247B10_8E1C10, D_80247AE4_8E1BE4, D_80247AB8_8E1BB8, D_80247A8C_8E1B8C, D_80247A60_8E1B60, D_80247A34_8E1B34, D_80247A08_8E1B08, D_802479DC_8E1ADC, D_802479B0_8E1AB0, D_80247984_8E1A84, D_80247958_8E1A58, D_8024792C_8E1A2C, D_80247900_8E1A00, D_802478D4_8E19D4, D_802478A8_8E19A8, D_8024787C_8E197C, D_80247850_8E1950, D_80247824_8E1924, D_802477F8_8E18F8, D_802477CC_8E18CC, D_802477A0_8E18A0, D_80247774_8E1874, D_80247748_8E1848, D_8024771C_8E181C, D_802476F0_8E17F0, D_802476C4_8E17C4, D_80247698_8E1798, D_8024766C_8E176C, D_80247640_8E1740, D_80247614_8E1714, D_802475E8_8E16E8, D_802475BC_8E16BC, D_80247590_8E1690, D_80247564_8E1664, D_80247538_8E1638, D_8024750C_8E160C, D_802474E0_8E15E0, D_802474B4_8E15B4, D_80247488_8E1588, D_8024745C_8E155C, D_80247430_8E1530, D_80247404_8E1504, D_802473D8_8E14D8, D_802473AC_8E14AC, D_80247380_8E1480, D_80247354_8E1454, D_80247328_8E1428, D_802472FC_8E13FC, D_802472D0_8E13D0, D_802472A4_8E13A4, D_80247278_8E1378, D_8024724C_8E134C, D_80247220_8E1320, D_802471F4_8E12F4, D_802471C8_8E12C8, D_8024719C_8E129C, D_80247170_8E1270, D_80247144_8E1244, D_80247118_8E1218, D_802470EC_8E11EC, D_802470C0_8E11C0, D_80247094_8E1194, D_80247068_8E1168, D_8024703C_8E113C, D_80247010_8E1110, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050001, 0x00000000, 0x00000008, 0x00010000, 0x00000000, 0x00110001, 0x00B600B6, 0x00B60005, 0x00020000, 0x00000000, 0x00080002, 0x00000000, 0x00000011, 0x000200B6, 0x00B600B6, 0x00050003, 0x00001FFF, 0x00000008, 0x0003FF04, 0x00D4FFB0, 0x00110003, 0x00B600B6, 0x00B60005, 0x00040000, func_E0010000, 0x00080004, 0x007AFF2C, 0x00EB0011, 0x000400B6, 0x00B600B6, 0x00050005, 0x0000CAAC, 0x00000008, 0x0005FE88, 0x00CEFFAE, 0x00110005, 0x00B600B6, 0x00B60005, 0x00060000, 0x35540000, 0x00080006, 0x00B0FF32, 0xFEAA0011, 0x000600B6, 0x00B600B6, 0x00050007, 0x0000F556, 0x00000008, 0x0007FEA9, 0x014FFFC8, 0x00110007, 0x00B600B6, 0x00B60005, 0x00080000, 0x0AAA0000, 0x00080008, 0x015AFEB1, 0xFFDE0011, 0x000800B6, 0x00B600B6, 0x00050009, 0x00000907, 0x00000008, 0x0009FEC9, 0x0176FF7F, 0x00110009, 0x00B600B6, 0x00B60005, 0x000A0000, 0x00000000, 0x0008000A, 0x00030000, 0x00570011, 0x000A00B6, 0x00B600B6, 0x0005000B, 0x00007E77, 0x00000008, 0x000B0000, 0x00000011, 0x0011000B, 0x00B600B6, 0x00B60005, 0x000C0000, 0x81890000, 0x0008000C, 0x0008001A, 0x00680011, 0x000C00B6, 0x00B600B6, 0x0005000D, 0x00000000, 0x00000008, 0x000D0000, 0x00000000, 0x0011000D, 0x00B600B6, 0x00B60005, 0x000E0000, 0xF6F90000, 0x0008000E, 0x0114FE6F, 0x00C20011, 0x000E00B6, 0x00B600B6, 0x0005000F, 0x00000000, 0x00000008, 0x000F0000, 0x00000000, 0x0011000F, 0x00B600B6, 0x00B60005, 0x00100000, 0x00000000, 0x00080010, 0x00000000, 0x00000011, 0x001000B6, 0x00B600B6, 0x00050011, 0x00000000, 0x00000008, 0x0011FEFD, 0x0177FF41, 0x00110011, 0x00B600B6, 0x00B60005, 0x00120000, 0x00000000, 0x00080012, 0x00000000, 0x00000011, 0x001200B6, 0x00B600B6, 0x00050013, 0x00000000, 0x00000008, 0x0013FEFD, 0x0177FF41, 0x00110013, 0x00B600B6, 0x00B60005, 0x00140000, 0x00000000, 0x00080014, 0x00000000, 0x00000011, 0x001400B6, 0x00B600B6, 0x00050015, 0x00000000, 0x00000008, 0x0015FF07, 0x0177FF41, 0x00110015, 0x00B600B6, 0x00B60005, 0x00160000, 0x00000000, 0x00080016, 0x00000000, 0x00000011, 0x001600B6, 0x00B600B6, 0x00050017, 0x00000000, 0x00000008, 0x0017FFE2, 0x0014FFE2, 0x00110017, 0x00B600B6, 0x00B60005, 0x00180000, 0xF1C80000, 0x00080018, 0xFEF10000, 0x00350011, 0x001800B6, 0x00B600B6, 0x00050019, 0x00000000, 0x00000008, 0x00190000, 0xFFEC0035, 0x00110019, 0x00B600B6, 0x00B60005, 0x001A0000, 0x00000000, 0x0008001A, 0x0000FFEC, 0x00000011, 0x001A00B6, 0x00B600B6, 0x0005001B, 0x0000238D, 0x00000008, 0x001BFEF1, 0x00000035, 0x0011001B, 0x00B600B6, 0x00B60005, 0x001C0000, 0x3FFF0000, 0x0008001C, 0x0000FFEC, 0x00350011, 0x001C00B6, 0x00B600B6, 0x0005001D, 0x00000000, 0x00000008, 0x001D0000, 0xFFEC0000, 0x0011001D, 0x00B600B6, 0x00B60005, 0x001E0000, 0x35540000, 0x0008001E, 0xFEF10000, 0x00350011, 0x001E00B6, 0x00B600B6, 0x0005001F, 0x00000000, 0x00000008, 0x001F0000, 0xFFEC0035, 0x0011001F, 0x00B600B6, 0x00B60005, 0x00200000, 0x00000000, 0x00080020, 0x0000FFEC, 0x00000011, 0x002000B6, 0x00B600B6, 0x00050021, 0x0000071C, 0x00000008, 0x0021FEF1, 0x00000035, 0x00110021, 0x00B600B6, 0x00B60005, 0x00220000, 0x00000000, 0x00080022, 0x0000FFEC, 0x00350011, 0x002200B6, 0x00B600B6, 0x00050023, 0x00000000, 0x00000008, 0x00230000, 0xFFEC0000, 0x00110023, 0x00B600B6, 0x00B60005, 0x00240000, 0x00000000, 0x00080024, 0xFEF10000, 0x00350011, 0x002400B6, 0x00B600B6, 0x00050025, 0x00000000, 0x00000008, 0x00250000, 0xFFEC0035, 0x00110025, 0x00B600B6, 0x00B60005, 0x00260000, 0x00000000, 0x00080026, 0x0000FFEC, 0x00000011, 0x002600B6, 0x00B600B6, 0x00050027, 0x00000000, 0x00000008, 0x00270000, 0x00000000, 0x00110027, 0x00B600B6, 0x00B60005, 0x00280000, 0xC0010000, 0x00080028, 0xFEF30000, 0x00BA0011, 0x002800B6, 0x00B600B6, 0x00050029, 0x00000000, 0x00000008, 0x0029FEFD, 0x01770000, 0x00110029, 0x00B600B6, 0x00B60005, 0x002A0000, 0x00000000, 0x0008002A, 0x00000000, 0x00000011, 0x002A00B6, 0x00B600B6, 0x0005002B, 0x0000C001, 0x00000008, 0x002BFED4, 0x000000C9, 0x0011002B, 0x00B600B6, 0x00B60005, 0x002C0000, 0x00000000, 0x0008002C, 0xFEFD0177, 0x00000011, 0x002C00B6, 0x00B600B6, 0x0005002D, 0x00000000, 0x00000008, 0x002D0000, 0x00000000, 0x0011002D, 0x00B600B6, 0x00B60005, 0x002E0000, 0xC0010000, 0x0008002E, 0xFEE00000, 0x00CC0011, 0x002E00B6, 0x00B600B6, 0x0005002F, 0x00000000, 0x00000008, 0x002FFEFD, 0x01770000, 0x0011002F, 0x00B600B6, 0x00B60005, 0x00300000, 0x00000000, 0x00080030, 0x00000000, 0x00000011, 0x003000B6, 0x00B600B6, 0x00050031, 0x00000000, 0x00000008, 0x00310000, 0x00000000, 0x00110031, 0x00B600B6, 0x00B60005, 0x00320000, func_E0010000, 0x00080032, 0xFFC60000, 0x00370011, 0x003200B6, 0x00B600B6, 0x00050033, 0x00000000, 0x00000008, 0x0033FEFD, 0x01770000, 0x00110033, 0x00B600B6, 0x00B60005, 0x00340000, 0x00000000, 0x00080034, 0x00000000, 0x00000011, 0x003400B6, 0x00B600B6, 0x00050035, 0x0000E001, 0x00000008, 0x0035FFCB, 0x00000048, 0x00110035, 0x00B600B6, 0x00B60005, 0x00360000, 0x00000000, 0x00080036, 0xFEFD0177, 0x00000011, 0x003600B6, 0x00B600B6, 0x00050037, 0x00000000, 0x00000008, 0x00370000, 0x00000000, 0x00110037, 0x00B600B6, 0x00B60005, 0x00380000, func_E0010000, 0x00080038, 0xFFBD0000, 0x00560011, 0x003800B6, 0x00B600B6, 0x00050039, 0x00000000, 0x00000008, 0x0039FEFD, 0x01770000, 0x00110039, 0x00B600B6, 0x00B60005, 0x003A0000, 0x00000000, 0x0008003A, 0x00000000, 0x00000011, 0x003A00B6, 0x00B600B6, 0x0005003B, 0x00000907, 0x00000008, 0x003BFEF6, 0x0000FF9D, 0x0011003B, 0x00B600B6, 0x00B60005, 0x003C0000, 0x00000000, 0x0008003C, 0x00000000, 0x00000011, 0x003C00B6, 0x00B600B6, 0x0005003D, 0x00000000, 0x00000008, 0x003D0000, 0x00000000, 0x0011003D, 0x00B600B6, 0x00B60005, 0x003E0000, 0x41990000, 0x0008003E, 0x0023006A, 0xFFD70011, 0x003E00B6, 0x00B600B6, 0x0005003F, 0x0000B560, 0x00000008, 0x003FFF33, 0xFF9600C2, 0x0011003F, 0x00B600B6, 0x00B60005, 0x00400000, 0x16EE0000, 0x00080040, 0x0001006A, 0x00170011, 0x004000B6, 0x00B600B6, 0x00050041, 0x0000E00A, 0x00000008, 0x00410081, 0xFF9600EE, 0x00110041, 0x00B600B6, 0x00B60005, 0x00420000, 0xEC450000, 0x00080042, 0xFFB9006A, 0x001A0011, 0x004200B6, 0x00B600B6, 0x00050043, 0x00000AB3, 0x00000008, 0x0043014E, 0xFF96FFE3, 0x00110043, 0x00B600B6, 0x00B60005, 0x00440000, 0xC19B0000, 0x00080044, 0xFF92006A, 0xFFDD0011, 0x004400B6, 0x00B600B6, 0x00050045, 0x0000355E, 0x00000008, 0x004500CD, 0xFF96FEAC, 0x00110045, 0x00B600B6, 0x00B60005, 0x00460000, 0x6C430000, 0x00080046, 0xFFFD006A, 0xFF990011, 0x004600B6, 0x00B600B6, 0x00050047, 0x00008AB5, 0x00000008, 0x0047FEB2, 0xFF96FF8C, 0x00110047, 0x00B600B6, 0x00B60005, 0x00480000, 0x96F00000, 0x00080048, 0xFFB4006A, 0xFF9C0011, 0x004800B6, 0x00B600B6, 0x00050049, 0x00006008, 0x00000008, 0x0049FF7F, 0xFF96FE80, 0x00110049, 0x00B600B6, 0x00B60005, 0x004A0000, 0x00000000, 0x0008004A, 0x00000000, 0x00000011, 0x004A00B6, 0x00B600B6, 0x0005004B, 0x00004199, 0x00000008, 0x004B0024, 0x00C4FFD7, 0x0011004B, 0x00B600B6, 0x00B60005, 0x004C0000, 0xB5600000, 0x0008004C, 0xFF33FF3C, 0x00C10011, 0x004C00B6, 0x00B600B6, 0x0005004D, 0x000016EE, 0x00000008, 0x004D0002, 0x00C40018, 0x0011004D, 0x00B600B6, 0x00B60005, 0x004E0000, fx_80_main, 0x0008004E, 0x0081FF3C, 0x00ED0011, 0x004E00B6, 0x00B600B6, 0x0005004F, 0x0000EC45, 0x00000008, 0x004FFFB9, 0x00C4001B, 0x0011004F, 0x00B600B6, 0x00B60005, 0x00500000, 0x0AB30000, 0x00080050, 0x014EFF3C, 0xFFE20011, 0x005000B6, 0x00B600B6, 0x00050051, 0x0000C19B, 0x00000008, 0x0051FF91, 0x00C4FFDD, 0x00110051, 0x00B600B6, 0x00B60005, 0x00520000, 0x355E0000, 0x00080052, 0x00CDFF3C, 0xFEAB0011, 0x005200B6, 0x00B600B6, 0x00050053, 0x000096F0, 0x00000008, 0x0053FFB3, 0x00C4FF9B, 0x00110053, 0x00B600B6, 0x00B60005, 0x00540000, 0x60080000, 0x00080054, 0xFF7FFF3C, 0xFE7F0011, 0x005400B6, 0x00B600B6, 0x00050055, 0x00006C43, 0x00000008, 0x0055FFFD, 0x00C4FF99, 0x00110055, 0x00B600B6, 0x00B60005, 0x00560000, 0x8AB50000, 0x00080056, 0xFEB2FF3C, 0xFF8B0011, 0x005600B6, 0x00B600B6, 0x00050057, 0x00000000, 0x00000008, 0x00570000, 0x00000000, 0x00110057, 0x00B600B6, 0x00B60005, 0x00580000, 0x41990000, 0x00080058, 0x002400C4, 0xFFD70011, 0x005800B6, 0x00B600B6, 0x00050059, 0x00000000, 0x00000008, 0x00590000, 0x00590000, 0x00110059, 0x00B600B6, 0x00B60005, 0x005A0000, 0xB5600000, 0x0008005A, 0xFF33FEE3, 0x00C00011, 0x005A00B6, 0x00B600B6, 0x0005005B, 0x000016EE, 0x00000008, 0x005B0002, 0x00C40018, 0x0011005B, 0x00B600B6, 0x00B60005, 0x005C0000, 0x00000000, 0x0008005C, 0x00000059, 0x00000011, 0x005C00B6, 0x00B600B6, 0x0005005D, 0x0000E00A, 0x00000008, 0x005D0081, 0xFEE300EC, 0x0011005D, 0x00B600B6, 0x00B60005, 0x005E0000, 0xEC450000, 0x0008005E, 0xFFB900C4, 0x001B0011, 0x005E00B6, 0x00B600B6, 0x0005005F, 0x00000000, 0x00000008, 0x005F0000, 0x00590000, 0x0011005F, 0x00B600B6, 0x00B60005, 0x00600000, 0x0AB30000, 0x00080060, 0x014EFEE3, 0xFFE10011, 0x006000B6, 0x00B600B6, 0x00050061, 0x0000C19B, 0x00000008, 0x0061FF91, 0x00C4FFDD, 0x00110061, 0x00B600B6, 0x00B60005, 0x00620000, 0x00000000, 0x00080062, 0x00000059, 0x00000011, 0x006200B6, 0x00B600B6, 0x00050063, 0x0000355E, 0x00000008, 0x006300CD, 0xFEE3FEAA, 0x00110063, 0x00B600B6, 0x00B60005, 0x00640000, 0x96F00000, 0x00080064, 0xFFB300C4, 0xFF9B0011, 0x006400B6, 0x00B600B6, 0x00050065, 0x00000000, 0x00000008, 0x00650000, 0x00590000, 0x00110065, 0x00B600B6, 0x00B60005, 0x00660000, 0x60080000, 0x00080066, 0xFF7FFEE3, 0xFE7E0011, 0x006600B6, 0x00B600B6, 0x00050067, 0x00006C43, 0x00000008, 0x0067FFFD, 0x00C4FF99, 0x00110067, 0x00B600B6, 0x00B60005, 0x00680000, 0x00000000, 0x00080068, 0x00000059, 0x00000011, 0x006800B6, 0x00B600B6, 0x00050069, 0x00008AB5, 0x00000008, 0x0069FEB2, 0xFEE3FF8A, 0x00110069, 0x00B600B6, 0x00B60001, 0x00010005, 0x000D0000, 0x00040000, 0x00080015, 0xFF090177, 0xFF410001, 0x00010005, 0x000D0000, 0x00100000, 0x00080015, 0xFF0A0177, 0xFF410001, 0x00010005, 0x000D0000, 0x00240000, 0x00080015, 0xFF0B0177, 0xFF410001, 0x00010005, 0x000D0000, 0x00400000, 0x00080015, 0xFF0C0177, 0xFF410001, 0x00010008, 0x000B0000, 0x00000012, 0x0005000D, 0x00000065, 0x00000008, 0x0015FF0D, 0x0177FF41, 0x00010001, 0x0005000D, 0x00000091, 0x00000001, 0x00010005, 0x000D0000, 0x00C50000, 0x00080015, 0xFF0E0177, 0xFF410001, 0x00010005, 0x000D0000, 0x01010000, 0x00080015, 0xFF0F0176, 0xFF410001, 0x00010008, 0x000B0000, 0x00000013, 0x0005000D, 0x00000145, 0x00000001, 0x00010005, 0x000D0000, 0x01910000, 0x00080011, 0xFF070177, 0xFF410008, 0x0015FF10, 0x0175FF41, 0x00010001, 0x0005000D, 0x000001E4, 0x00000008, 0x0011FF09, 0x0177FF41, 0x00080015, 0xFF100173, 0xFF410001, 0x00010008, 0x000B0000, 0x00000014, 0x0005000D, 0x0000023F, 0x00000008, 0x0011FF0A, 0x0177FF41, 0x00080015, 0xFF100171, 0xFF410001, 0x00010005, 0x000D0000, 0x02A10000, 0x00080011, 0xFF0B0177, 0xFF410008, 0x0015FF10, 0x016EFF41, 0x00010001, 0x0008000B, 0x00000000, 0x00150005, 0x000D0000, 0x030B0000, 0x00080011, 0xFF0C0177, 0xFF410008, 0x0015FF10, 0x016BFF41, 0x00010001, 0x0005000D, 0x0000037D, 0x00000008, 0x0011FF0D, 0x0177FF41, 0x00080013, 0xFF070177, 0xFF410008, 0x0015FF10, 0x0168FF41, 0x00010001, 0x0008000B, 0x00000000, 0x00160005, 0x000D0000, 0x03F60000, 0x00080013, 0xFF080177, 0xFF410008, 0x0015FF10, 0x0164FF41, 0x00010001, 0x0005000D, 0x00000476, 0x00000008, 0x0011FF0E, 0x0177FF41, 0x00080013, 0xFF090177, 0xFF410008, 0x0015FF10, 0x0160FF41, 0x00010001, 0x0008000B, 0x00000000, 0x00170005, 0x000D0000, 0x04FE0000, 0x00080011, 0xFF0F0176, 0xFF410008, 0x0013FF0A, 0x0177FF41, 0x00080015, 0xFF10015B, 0xFF410001, 0x00010008, 0x000B0000, 0x00000018, 0x0005000D, 0x0000058D, 0x00000008, 0x0013FF0B, 0x0177FF41, 0x00080015, 0xFF100156, 0xFF410001, 0x00010008, 0x000B0000, 0x00000019, 0x0005000D, 0x00000624, 0x00000008, 0x0011FF10, 0x0175FF41, 0x00080015, 0xFF0F0150, 0xFF410008, 0x0033FF07, 0x01770000, 0x00010001, 0x0005000D, 0x000006C1, 0x00000008, 0x0011FF10, 0x0173FF41, 0x00080013, 0xFF0C0177, 0xFF410008, 0x0015FF0F, 0x014AFF41, 0x00080033, 0xFF090177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001A, 0x0005000D, 0x00000766, 0x00000008, 0x0011FF10, 0x0171FF41, 0x00080013, 0xFF0D0177, 0xFF410008, 0x0015FF0E, 0x0144FF41, 0x00080033, 0xFF0B0177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001B, 0x0005000D, 0x00000812, 0x00000008, 0x0011FF10, 0x016EFF41, 0x00080013, 0xFF0E0176, 0xFF410008, 0x0015FF0E, 0x013DFF41, 0x00080033, 0xFF0D0177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001C, 0x0005000D, 0x000008C4, 0x00000008, 0x0011FF10, 0x016BFF41, 0x00080013, 0xFF0F0176, 0xFF410008, 0x0015FF0D, 0x0136FF41, 0x00080033, 0xFF0F0177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001D, 0x0005000D, 0x0000097E, 0x00000008, 0x0011FF10, 0x0168FF41, 0x00080013, 0xFF100175, 0xFF410008, 0x0015FF0C, 0x012EFF41, 0x00080033, 0xFF110177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001E, 0x0005000D, 0x00000A3F, 0x00000008, 0x0011FF10, 0x0164FF41, 0x00080013, 0xFF100173, 0xFF410008, 0x0015FF0B, 0x0126FF41, 0x00080033, 0xFF120177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001F, 0x0005000D, 0x00000B07, 0x00000008, 0x0011FF10, 0x0160FF41, 0x00080013, 0xFF110171, 0xFF410008, 0x0015FF0A, 0x011EFF41, 0x00080033, 0xFF130177, 0x00000001, 0x00010008, 0x000B0000, 0x00000020, 0x0005000D, 0x00000BD6, 0x00000008, 0x0011FF10, 0x015BFF41, 0x00080013, 0xFF12016F, 0xFF410008, 0x0015FF09, 0x0115FF41, 0x00080033, 0xFF140176, 0x00000001, 0x00010008, 0x000B0000, 0x00000021, 0x0005000D, 0x00000CAB, 0x00000008, 0x0011FF10, 0x0156FF41, 0x00080013, 0xFF13016C, 0xFF410008, 0x0015FF08, 0x010CFF41, 0x00080033, 0xFF150176, 0x00000001, 0x00010008, 0x000B0000, 0x00000022, 0x0005000D, 0x00000D87, 0x00000008, 0x0011FF0F, 0x0150FF41, 0x00080013, 0xFF140168, 0xFF410008, 0x0015FF07, 0x0102FF41, 0x00080033, 0xFF160175, 0x00000001, 0x00010008, 0x000B0000, 0x00000024, 0x0005000D, 0x00000E6A, 0x00000008, 0x0011FF0F, 0x014AFF41, 0x00080013, 0xFF140165, 0xFF410005, 0x00150000, 0x0000FBBC, 0x00080015, 0xFF1100F8, 0xFF410008, 0x0033FF16, 0x01730000, 0x00010001, 0x0008000B, 0x00000000, 0x00250005, 0x000D0000, 0x0F540000, 0x00080011, 0xFF0E0144, 0xFF410008, 0x0013FF15, 0x0160FF41, 0x00050015, 0x00000000, 0xF7780008, 0x0015FF1A, 0x00EEFF41, 0x00080033, 0xFF170171, 0x00000001, 0x00010008, 0x000B0000, 0x00000026, 0x0005000D, 0x00001044, 0x00000008, 0x0011FF0E, 0x013DFF41, 0x00080013, 0xFF16015C, 0xFF410005, 0x00150000, 0x0000F334, 0x00080015, 0xFF2200E3, 0xFF410008, 0x0033FF17, 0x016F0000, 0x00010001, 0x0008000B, 0x00000000, 0x00270005, 0x000D0000, 0x113B0000, 0x00080011, 0xFF0D0136, 0xFF410008, 0x0013FF17, 0x0157FF41, 0x00050015, 0x00000000, 0xEEF00008, 0x0015FF2A, 0x00D8FF41, 0x00080033, 0xFF17016C, 0x00000001, 0x00010008, 0x000B0000, 0x00000029, 0x0005000D, 0x00001238, 0x00000008, 0x0011FF0C, 0x012EFF41, 0x00080013, 0xFF180151, 0xFF410005, 0x00150000, 0x0000EAAB, 0x00080015, 0xFF3200CD, 0xFF410008, 0x0033FF17, 0x01680000, 0x00010001, 0x0008000B, 0x00000000, 0x002A0005, 0x000D0000, 0x133C0000, 0x00080011, 0xFF0B0126, 0xFF410008, 0x0013FF19, 0x014CFF41, 0x00050015, 0x00000000, 0xE6670008, 0x0015FF39, 0x00C1FF41, 0x00080033, 0xFF170165, 0x00000001, 0x00010008, 0x000B0000, 0x0000002C, 0x0005000D, 0x00001446, 0x00000008, 0x0011FF0A, 0x011EFF41, 0x00080013, 0xFF190145, 0xFF410005, 0x00150000, 0x0000E223, 0x00080015, 0xFF4000B5, 0xFF410008, 0x0033FF17, 0x01610000, 0x00010001, 0x0008000B, 0x00000000, 0x002D0005, 0x000D0000, 0x15560000, 0x00080011, 0xFF090115, 0xFF410008, 0x0013FF1A, 0x013FFF41, 0x00050015, 0x00000000, 0xDDDF0008, 0x0015FF46, 0x00A8FF41, 0x00080033, 0xFF16015C, 0x00000001, 0x00010008, 0x000B0000, 0x0000002F, 0x0005000D, 0x0000166D, 0x00000008, 0x0011FF08, 0x010CFF41, 0x00080013, 0xFF1B0138, 0xFF410005, 0x00150000, 0x0000D99A, 0x00080015, 0xFF4B009B, 0xFF410008, 0x0033FF16, 0x01570000, 0x00010001, 0x0008000B, 0x00000000, 0x00300005, 0x000D0000, 0x178A0000, 0x00080011, 0xFF070102, 0xFF410008, 0x0013FF1C, 0x0130FF41, 0x00050015, 0x00000000, 0xD5560008, 0x0015FF51, 0x008EFF41, 0x00080033, 0xFF150151, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000032, 0x0005000D, 0x000018AE, 0x00000005, 0x00110000, 0x0000DDDF, 0x00080011, 0xFF1100F8, 0xFF410008, 0x0013FF1D, 0x0128FF41, 0x00050015, 0x00000000, 0xD1120008, 0x0015FF56, 0x0080FF41, 0x00080033, 0xFF14014B, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000034, 0x0005000D, 0x000019D7, 0x00000005, 0x00110000, 0x0000BBBD, 0x00080011, 0xFF1A00EE, 0xFF410008, 0x0013FF1D, 0x0120FF41, 0x00050015, 0x00000000, 0xCCCE0008, 0x0015FF5A, 0x0072FF41, 0x00080033, 0xFF130145, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000036, 0x0005000D, 0x00001B07, 0x00000005, 0x00110000, 0x0000999B, 0x00080011, 0xFF2200E3, 0xFF410008, 0x0013FF1E, 0x0117FF41, 0x00050015, 0x00000000, 0xC8890008, 0x0015FF5E, 0x0064FF41, 0x00080033, 0xFF12013E, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000037, 0x0005000D, 0x00001C3D, 0x00000005, 0x00110000, 0x00007776, 0x00080011, 0xFF2A00D8, 0xFF410008, 0x0013FF1F, 0x010EFF41, 0x00050015, 0x00000000, 0xC4450008, 0x0015FF62, 0x0055FF41, 0x00080033, 0xFF110137, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000039, 0x0005000D, 0x00001D79, 0x00000005, 0x00110000, 0x00005554, 0x00080011, 0xFF3200CD, 0xFF410008, 0x0013FF20, 0x0105FF41, 0x00050015, 0x00000000, 0xC0010008, 0x0015FF65, 0x0046FF41, 0x00080033, 0xFF10012F, 0x00000008, 0x0039FF07, 0x01770000, 0x00010001, 0x0008000B, 0xFFFF0000, 0x003B0005, 0x000D0000, 0x1EBA0000, 0x00050011, 0x00000000, 0x33320008, 0x0011FF39, 0x00C1FF41, 0x00080013, 0xFF2100FB, 0xFF410005, 0x00150000, 0x0000BBBD, 0x00080015, 0xFF680037, 0xFF410008, 0x0033FF0E, 0x01270000, 0x00080039, 0xFF090177, 0x00000001, 0x00010008, 0x000BFFFF, 0x0000003D, 0x0005000D, 0x00002002, 0x00000005, 0x00110000, 0x00001110, 0x00080011, 0xFF4000B5, 0xFF410008, 0x0013FF22, 0x00F1FF41, 0x00050015, 0x00000000, 0xB7790008, 0x0015FF6B, 0x0028FF41, 0x00080033, 0xFF0D011F, 0x00000008, 0x0039FF0B, 0x01770000, 0x00010001, 0x0008000B, 0xFFFF0000, 0x003F0005, 0x000D0000, 0x21500000, 0x00050011, 0x00000000, 0xEEF00008, 0x0011FF46, 0x00A8FF41, 0x00080013, 0xFF2200E6, 0xFF410005, 0x00150000, 0x0000B334, 0x00080015, 0xFF6E0018, 0xFF410008, 0x0033FF0B, 0x01160000, 0x00080039, 0xFF0D0177, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000041, 0x0005000D, 0x000022A3, 0x00000005, 0x00110000, 0x0000CCCE, 0x00080011, 0xFF4B009B, 0xFF410008, 0x0013FF23, 0x00DBFF41, 0x00050015, 0x00000000, 0xAEF00008, 0x0015FF70, 0x0007FF41, 0x00080033, 0xFF09010D, 0x00000008, 0x0039FF0F, 0x01770000, 0x00010001, 0x0008000B, 0xFFFF0000, 0x00430005, 0x000D0000, 0x23FC0000, 0x00050011, 0x00000000, 0xAAAC0008, 0x0011FF51, 0x008EFF41, 0x00080013, 0xFF2400CF, 0xFF410005, 0x00150000, 0x0000AAAC, 0x00080015, 0xFF72FFF8, 0xFF410008, 0x0033FF07, 0x01030000, 0x00080039, 0xFF110177, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000046, 0x0005000D, 0x0000255B, 0x00000005, 0x00110000, 0x0000888A, 0x00080011, 0xFF560080, 0xFF410008, 0x0013FF25, 0x00C4FF41, 0x00050015, 0x00000000, 0xA6680008, 0x0015FF73, 0xFFE7FF41, 0x00050033, 0x00000000, 0xFDDE0008, 0x0033FF18, 0x00F90000, 0x00080039, 0xFF120177, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000048, 0x0005000D, 0x000026C0, 0x00000005, 0x00110000, 0x00006665, 0x00080011, 0xFF5A0072, 0xFF410008, 0x0013FF26, 0x00B8FF41, 0x00050015, 0x00000000, 0xA2230008, 0x0015FF75, 0xFFD6FF41, 0x00050033, 0x00000000, 0xFBBC0008, 0x0033FF28, 0x00EE0000, 0x00080039, 0xFF130177, 0x00000001, 0x00010008, 0x000BFFFF, 0x0000004A, 0x0005000D, 0x0000282A, 0x00000005, 0x00110000, 0x00004443, 0x00080011, 0xFF5E0064, 0xFF410008, 0x0013FF26, 0x00ABFF41, 0x00050015, 0x00000000, 0x9DDF0008, 0x0015FF76, 0xFFC4FF41, 0x00050033, 0x00000000, 0xF99A0008, 0x0033FF37, 0x00E30000, 0x00080039, 0xFF140176, 0x00000001, 0x00010008, 0x000BFFFF, 0x0000004C, 0x0005000D, 0x0000299A, 0x00000005, 0x00110000, 0x00002221, 0x00080011, 0xFF620055, 0xFF410008, 0x0013FF27, 0x009EFF41, 0x00050015, 0x00000000, 0x999B0008, 0x0015FF77, 0xFFB3FF41, 0x00050033, 0x00000000, 0xF7780008, 0x0033FF45, 0x00D80000, 0x00080039, 0xFF150176, 0x00000001, 0x00010008, 0x000BFFFE, 0x0000004F, 0x0005000D, 0x00002B10, 0x00000005, 0x00110000, 0x00000000, 0x00080011, 0xFF650046, 0xFF410008, 0x0013FF28, 0x0091FF41, 0x00050015, 0x00000000, 0x95570008, 0x0015FF78, 0xFFA0FF41, 0x00050033, 0x00000000, 0xF5560008, 0x0033FF52, 0x00CC0000, 0x00080039, 0xFF160175, 0x00000001, 0x00010008, 0x000BFFFE, 0x00000051, 0x0005000D, 0x00002C8A, 0x00000005, 0x00110000, 0x0000DDDF, 0x00080011, 0xFF680037, 0xFF410005, 0x00130000, 0x0000F8B0, 0x00080013, 0xFF2B009E, 0xFF410005, 0x00150000, 0x00009112, 0x00080015, 0xFF78FF8E, 0xFF410005, 0x00330000, 0x0000F334, 0x00080033, 0xFF5E00C0, 0x00000008, 0x0039FF16, 0x01730000, 0x00010001, 0x0008000B, 0xFFFE0000, 0x00540005, 0x000D0000, 0x2E0B0000, 0x00050011, 0x00000000, 0xBBBD0008, 0x0011FF6B, 0x0028FF41, 0x00050013, 0x00000000, 0xF1600008, 0x0013FF2F, 0x00A8FF41, 0x00050015, 0x00000000, 0x8CCE0008, 0x0015FF79, 0xFF7BFF41, 0x00050033, 0x00000000, 0xF1120008, 0x0033FF6A, 0x00B30000, 0x00080039, 0xFF170171, 0x00000001, 0x00010008, 0x000BFFFE, 0x00000056, 0x0005000D, 0x00002F91, 0x00000005, 0x00110000, 0x0000999B, 0x00080011, 0xFF6E0018, 0xFF410005, 0x00130000, 0x0000EA0F, 0x00080013, 0xFF3200AF, 0xFF410005, 0x00150000, 0x0000888A, 0x00080015, 0xFF79FF69, 0xFF410005, 0x00330000, 0x0000EEF0, 0x00080033, 0xFF7400A6, 0x00000008, 0x0039FF17, 0x016F0000, 0x00010001, 0x0008000B, 0xFFFE0000, 0x00590005, 0x000D0000, 0x311C0000, 0x00050011, 0x00000000, 0x77760008, 0x0011FF70, 0x0007FF41, 0x00050013, 0x00000000, 0xE2BF0008, 0x0013FF35, 0x00B3FF41, 0x00050015, 0x00000000, 0x84460008, 0x0015FF79, 0xFF55FF41, 0x00050033, 0x00000000, 0xECCD0008, 0x0033FF7E, 0x00980000, 0x00080039, 0xFF17016C, 0x00000001, 0x00010008, 0x000BFFFE, 0x0000005B, 0x0005000D, 0x000032AC, 0x00000005, 0x00110000, 0x00005554, 0x00080011, 0xFF72FFF8, 0xFF410005, 0x00130000, 0x0000DB6F, 0x00080013, 0xFF3900B4, 0xFF410005, 0x00150000, 0x00008001, 0x00080015, 0xFF79FF42, 0xFF410005, 0x00330000, 0x0000EAAB, 0x00080033, 0xFF87008A, 0x00000008, 0x0036FF07, 0x01770000, 0x00080039, 0xFF170168, 0x00000001, 0x00010005, 0x000A000C, 0x00000000, 0x0008000B, 0xFFFE0000, 0x005E0005, 0x000D0000, 0x34420000, 0x00050011, 0x00000000, 0x33320008, 0x0011FF73, 0xFFE7FF41, 0x00050013, 0x00000000, 0xD41E0008, 0x0013FF3C, 0x00B1FF41, 0x00080015, 0xFF79FF2E, 0xFF410005, 0x00330000, 0x0000E889, 0x00080033, 0xFF90007C, 0x00000008, 0x0036FF08, 0x01770000, 0x00080039, 0xFF170165, 0x00000001, 0x00010005, 0x000A0032, 0x00000000, 0x0008000B, 0xFFFE0000, 0x00610005, 0x000D0000, 0x35DC0000, 0x00050011, 0x00000000, 0x11100008, 0x0011FF75, 0xFFD6FF41, 0x00050013, 0x00000000, 0xCCCE0008, 0x0013FF3F, 0x00ABFF41, 0x00080015, 0xFF79FF1A, 0xFF410005, 0x00330000, 0x0000E667, 0x00080033, 0xFF98006D, 0x00000008, 0x0036FF09, 0x01770000, 0x00080039, 0xFF170161, 0x00000001, 0x00010005, 0x000A0071, 0x00000000, 0x0008000B, 0xFFFE0000, 0x00640005, 0x000D0000, 0x377C0000, 0x00050011, 0x00000000, 0xEEF00008, 0x0011FF76, 0xFFC4FF41, 0x00050013, 0x00000000, 0xC57D0008, 0x0013FF43, 0x00A1FF41, 0x00080015, 0xFF79FF06, 0xFF410005, 0x00330000, 0x0000E445, 0x00080033, 0xFF9F005E, 0x00000008, 0x0039FF16, 0x015C0000, 0x00010001, 0x0005000A, 0x00CA0000, 0x00000008, 0x000BFFFE, 0x00000066, 0x0005000D, 0x00003921, 0x00000005, 0x00110000, 0x0000CCCE, 0x00080011, 0xFF77FFB3, 0xFF410005, 0x00130000, 0x0000BE2D, 0x00080013, 0xFF460095, 0xFF410008, 0x0015FF79, 0xFEF1FF41, 0x00050033, 0x00000000, 0xE2230008, 0x0033FFA6, 0x004F0000, 0x00080036, 0xFF0A0177, 0x00000008, 0x0039FF16, 0x01570000, 0x00010001, 0x0005000A, 0x013D0000, 0x00000008, 0x000BFFFD, 0x00000069, 0x0005000D, 0x00003ACC, 0x00000005, 0x00110000, 0x0000AAAC, 0x00080011, 0xFF78FFA0, 0xFF410005, 0x00130000, 0x0000B6DC, 0x00080013, 0xFF490085, 0xFF410008, 0x0015FF79, 0xFEDCFF41, 0x00080029, 0xFF070177, 0x00000005, 0x00330000, 0x0000E001, 0x00080033, 0xFFAB003F, 0x00000008, 0x0036FF0B, 0x01770000, 0x00080039, 0xFF150151, 0x00000001, 0x00010005, 0x000A01CB, 0x00000000, 0x0008000B, 0xFFFD0000, 0x006C0005, 0x000D0000, 0x3C7B0000, 0x00050011, 0x00000000, 0x888A0008, 0x0011FF78, 0xFF8EFF41, 0x00050013, 0x00000000, 0xAF8C0008, 0x0013FF4D, 0x0071FF41, 0x00080015, 0xFF79FEC7, 0xFF410008, 0x0029FF09, 0x01770000, 0x00050033, 0x00000000, 0xDDDF0008, 0x0033FFB1, 0x002E0000, 0x00080036, 0xFF0C0177, 0x00000008, 0x0039FF14, 0x014B0000, 0x00010001, 0x0005000A, 0x02740000, 0x00000008, 0x000BFFFD, 0x0000006F, 0x0005000D, 0x00003E2F, 0x00000005, 0x00110000, 0x00006665, 0x00080011, 0xFF79FF7B, 0xFF410005, 0x00130000, 0x0000A83C, 0x00080013, 0xFF50005A, 0xFF410008, 0x0015FF79, 0xFEB2FF41, 0x00080029, 0xFF0B0177, 0x00000005, 0x00330000, 0x0000DBBD, 0x00080033, 0xFFB6001D, 0x00000008, 0x0039FF13, 0x01450000, 0x00010001, 0x0005000A, 0x03380000, 0x00000008, 0x000BFFFD, 0x00000072, 0x0005000D, 0x00003FE8, 0x00000005, 0x00110000, 0x00004443, 0x00080011, 0xFF79FF69, 0xFF410005, 0x00130000, 0x0000A0EB, 0x00080013, 0xFF53003F, 0xFF410008, 0x0015FF79, 0xFE9CFF41, 0x00080029, 0xFF0D0177, 0x00000005, 0x00330000, 0x0000D99A, 0x00080033, 0xFFBA000C, 0x00000008, 0x0036FF0D, 0x01760000, 0x00080039, 0xFF12013E, 0x00000001, 0x00010005, 0x000A0417, 0x00000000, 0x0008000B, 0xFFFD0000, 0x00760005, 0x000D0000, 0x41A60000, 0x00050011, 0x00000000, 0x22210008, 0x0011FF79, 0xFF55FF41, 0x00050013, 0x00000000, 0x999B0008, 0x0013FF57, 0x0021FF41, 0x00080015, 0xFF79FE87, 0xFF410008, 0x0029FF0F, 0x01770000, 0x00050033, 0x00000000, 0xD7780008, 0x0033FFBE, 0xFFFC0000, 0x00080036, 0xFF0E0176, 0x00000008, 0x0039FF11, 0x01370000, 0x00010001, 0x0005000A, 0x05120000, 0x00000008, 0x000BFFFD, 0x00000079, 0x0005000D, 0x00004368, 0x00000005, 0x00110000, 0x00000000, 0x00080011, 0xFF79FF42, 0xFF410005, 0x00130000, 0x0000924B, 0x00080013, 0xFF5A0000, 0xFF410008, 0x0015FF79, 0xFE70FF41, 0x00080029, 0xFF110177, 0x00000005, 0x00330000, 0x0000D556, 0x00080033, 0xFFC1FFEA, 0x00000008, 0x0036FF0F, 0x01750000, 0x00080039, 0xFF10012F, 0x00000001, 0x00010005, 0x000A0629, 0x00000000, 0x0008000B, 0xFFFD0000, 0x007C0005, 0x000D0000, 0x45300000, 0x00080011, 0xFF79FF2E, 0xFF410005, 0x00130000, 0x00008AFA, 0x00080013, 0xFF5D000D, 0xFF410008, 0x0029FF12, 0x01770000, 0x00050033, 0x00000000, 0xD3340008, 0x0033FFC4, 0xFFD70000, 0x00080036, 0xFF0F0173, 0x00000008, 0x0039FF0E, 0x01270000, 0x00010001, 0x0005000A, 0x075D0000, 0x00000008, 0x000BFFFD, 0x0000007F, 0x0005000D, 0x000046FC, 0x00000008, 0x0011FF79, 0xFF1AFF41, 0x00050013, 0x00000000, 0x83AA0008, 0x0013FF61, 0x0016FF41, 0x00080029, 0xFF130177, 0x00000005, 0x00330000, 0x0000D112, 0x00080033, 0xFFC6FFC4, 0x00000008, 0x0036FF10, 0x01710000, 0x00080039, 0xFF0D011F, 0x00000001, 0x00010005, 0x000A08AD, 0x00000000, 0x0008000B, 0xFFFC0000, 0x00830005, 0x000D0000, 0x48CC0000, 0x00080011, 0xFF79FF06, 0xFF410005, 0x00130000, 0x00007C56, 0x00080013, 0xFF64001C, 0xFF410008, 0x0029FF14, 0x01760000, 0x00050033, 0x00000000, 0xCEF00008, 0x0033FFC9, 0xFFB10000, 0x00080036, 0xFF11016F, 0x00000008, 0x0039FF0B, 0x01160000, 0x00010001, 0x0005000A, 0x0A1B0000, 0x00000008, 0x000BFFFC, 0x00000086, 0x0005000D, 0x00004AA2, 0x00000008, 0x0011FF79, 0xFEF1FF41, 0x00050013, 0x00000000, 0x75060008, 0x0013FF67, 0x001EFF41, 0x00080029, 0xFF150176, 0x00000005, 0x00330000, 0x0000CCCE, 0x00080033, 0xFFCAFF9E, 0x00000008, 0x0036FF12, 0x016C0000, 0x00080039, 0xFF09010D, 0x00000001, 0x00010005, 0x000A0BA5, 0x00000000, 0x0008000B, 0xFFFC0000, 0x008A0005, 0x000D0000, 0x4C7C0000, 0x00080011, 0xFF79FEDC, 0xFF410005, 0x00130000, 0x00006DB6, 0x00080013, 0xFF6A001B, 0xFF410008, 0x0029FF16, 0x01750000, 0x00050033, 0x00000000, 0xCAAC0008, 0x0033FFCC, 0xFF8A0000, 0x00080036, 0xFF120168, 0x00000008, 0x0039FF07, 0x01030000, 0x00010001, 0x0005000A, 0x0D450000, 0x00000008, 0x000BFFFC, 0x0000008D, 0x0005000D, 0x00004E5A, 0x00000008, 0x0011FF79, 0xFEC7FF41, 0x00050013, 0x00000000, 0x66650008, 0x0013FF6A, 0x0015FF41, 0x00080029, 0xFF160173, 0x00000005, 0x00330000, 0x0000C889, 0x00080033, 0xFFCDFF75, 0x00000008, 0x0036FF13, 0x01650000, 0x00050039, 0x00000000, 0xEEF00008, 0x0039FF18, 0x00F90000, 0x00010001, 0x0005000A, 0x0EF00000, 0x00000008, 0x000BFFFC, 0x00000091, 0x0005000D, 0x0000503D, 0x00000008, 0x0011FF79, 0xFEB2FF41, 0x00050013, 0x00000000, 0x5F150008, 0x0013FF6A, 0x000CFF41, 0x00080029, 0xFF170171, 0x00000005, 0x00330000, 0x0000C667, 0x00080033, 0xFFCEFF60, 0x00000008, 0x0036FF14, 0x01600000, 0x00050039, 0x00000000, 0xDDDF0008, 0x0039FF28, 0x00EE0000, 0x00010001, 0x0005000A, 0x10A60000, 0x00000008, 0x000BFFFC, 0x00000094, 0x0005000D, 0x00005224, 0x00000008, 0x0011FF79, 0xFE9CFF41, 0x00050013, 0x00000000, 0x57C40008, 0x0013FF6A, 0x0000FF41, 0x00080029, 0xFF17016F, 0x00000005, 0x00330000, 0x0000C445, 0x00080033, 0xFFCEFF4B, 0x00000008, 0x0036FF14, 0x015C0000, 0x00050039, 0x00000000, 0xCCCE0008, 0x0039FF37, 0x00E30000, 0x00010001, 0x0005000A, 0x12680000, 0x00000008, 0x000BFFFC, 0x00000098, 0x0005000D, 0x00005410, 0x00000008, 0x0011FF79, 0xFE87FF41, 0x00050013, 0x00000000, 0x50740008, 0x0013FF6A, 0xFFEFFF41, 0x00080029, 0xFF17016C, 0x00000005, 0x00330000, 0x0000C223, 0x00080033, 0xFFCEFF36, 0x00000008, 0x0036FF15, 0x01570000, 0x00050039, 0x00000000, 0xBBBD0008, 0x0039FF45, 0x00D80000, 0x00010001, 0x0005000A, 0x14340000, 0x00000008, 0x000BFFFB, 0x0000009C, 0x0005000D, 0x00005600, 0x00000008, 0x0011FF79, 0xFE70FF41, 0x00050013, 0x00000000, 0x49240008, 0x0013FF6A, 0xFFDCFF41, 0x00080029, 0xFF170168, 0x00000008, 0x002FFF07, 0x01770000, 0x00050033, 0x00000000, 0xC0010008, 0x0033FFCE, 0xFF200000, 0x00080036, 0xFF160151, 0x00000005, 0x00390000, 0x0000AAAC, 0x00080039, 0xFF5200CC, 0x00000001, 0x00010008, 0x0009FECA, 0x0176FF84, 0x0005000A, 0x160B0000, 0x00000008, 0x000BFFFB, 0x000000A0, 0x0005000D, 0x000057F4, 0x00000005, 0x00130000, 0x000041D3, 0x00080013, 0xFF6AFFC4, 0xFF410008, 0x0029FF17, 0x01650000, 0x0008002F, 0xFF090177, 0x00000008, 0x0036FF17, 0x014C0000, 0x00050039, 0x00000000, 0x999B0008, 0x0039FF5E, 0x00C00000, 0x00010001, 0x00080009, 0xFECC0175, 0xFF880005, 0x000A17ED, 0x00000000, 0x0008000B, 0xFFFB0000, 0x00A30005, 0x000D0000, 0x59ED0000, 0x00050013, 0x00000000, 0x3A830008, 0x0013FF6A, 0xFFAAFF41, 0x00080029, 0xFF170161, 0x00000008, 0x002FFF0B, 0x01770000, 0x00080036, 0xFF170145, 0x00000005, 0x00390000, 0x0000888A, 0x00080039, 0xFF6A00B3, 0x00000001, 0x00010008, 0x0009FECD, 0x0173FF8D, 0x0005000A, 0x19D90000, 0x00000008, 0x000BFFFB, 0x000000A7, 0x0005000D, 0x00005BE9, 0x00000005, 0x00130000, 0x00003332, 0x00080013, 0xFF6AFF8D, 0xFF410008, 0x0029FF16, 0x015C0000, 0x0008002F, 0xFF0D0177, 0x00000008, 0x0036FF18, 0x013F0000, 0x00050039, 0x00000000, 0x77760008, 0x0039FF74, 0x00A60000, 0x00010001, 0x00080009, 0xFECE0170, 0xFF910005, 0x000A1BCF, 0x00000000, 0x0008000B, 0xFFFB0000, 0x00AB0005, 0x000D0000, 0x5DEA0000, 0x00050013, 0x00000000, 0x2BE20008, 0x0013FF6A, 0xFF6CFF41, 0x00080029, 0xFF160157, 0x00000008, 0x002FFF0F, 0x01770000, 0x00080036, 0xFF190138, 0x00000005, 0x00390000, 0x00006665, 0x00080039, 0xFF7E0098, 0x00000001, 0x00010008, 0x0009FECF, 0x016DFF96, 0x0005000A, 0x1DD00000, 0x00000008, 0x000BFFFB, 0x000000B0, 0x0005000D, 0x00005FEF, 0x00000005, 0x00130000, 0x00002492, 0x00080013, 0xFF6AFF49, 0xFF410008, 0x0029FF15, 0x01510000, 0x0008002F, 0xFF110177, 0x00000008, 0x0036FF1A, 0x01300000, 0x00050039, 0x00000000, 0x55540008, 0x0039FF87, 0x008A0000, 0x00010001, 0x00080009, 0xFED00169, 0xFF9A0005, 0x000A1FDA, 0x00000000, 0x0008000B, 0xFFFA0000, 0x00B40005, 0x000D0000, 0x61F80000, 0x00050013, 0x00000000, 0x1D410008, 0x0013FF6A, 0xFF23FF41, 0x00080029, 0xFF14014B, 0x00000008, 0x002FFF12, 0x01770000, 0x00080036, 0xFF1A0128, 0x00000005, 0x00390000, 0x00004443, 0x00080039, 0xFF90007C, 0x00000001, 0x00010008, 0x0009FED2, 0x0163FF9F, 0x0005000A, 0x21EE0000, 0x00000008, 0x000BFFFA, 0x000000B8, 0x0005000D, 0x00006405, 0x00000005, 0x00130000, 0x000015F1, 0x00080013, 0xFF6AFEFA, 0xFF410008, 0x0029FF13, 0x01450000, 0x0008002F, 0xFF130177, 0x00000008, 0x0036FF1B, 0x01200000, 0x00050039, 0x00000000, 0x33320008, 0x0039FF98, 0x006D0000, 0x00010001, 0x00080009, 0xFED3015D, 0xFFA40005, 0x000A240B, 0x00000000, 0x0008000B, 0xFFFA0000, 0x00BC0005, 0x000D0000, 0x66150000, 0x00050013, 0x00000000, 0x0EA00008, 0x0013FF6A, 0xFECFFF41, 0x00080029, 0xFF12013E, 0x00000008, 0x002FFF14, 0x01760000, 0x00080036, 0xFF1C0117, 0x00000005, 0x00390000, 0x00002221, 0x00080039, 0xFF9F005E, 0x00000001, 0x00010008, 0x0009FED4, 0x0156FFA9, 0x0005000A, 0x26310000, 0x00000008, 0x000BFFFA, 0x000000C0, 0x0005000D, 0x0000682A, 0x00000005, 0x00130000, 0x00000750, 0x00080013, 0xFF6AFEA1, 0xFF410008, 0x0029FF11, 0x01370000, 0x0008002F, 0xFF150176, 0x00000008, 0x0036FF1C, 0x010E0000, 0x00050039, 0x00000000, 0x11100008, 0x0039FFA6, 0x004F0000, 0x00010001, 0x00080009, 0xFED5014F, 0xFFAD0005, 0x000A2860, 0x00000000, 0x0008000B, 0xFFFA0000, 0x00C50005, 0x000D0000, 0x6A420000, 0x00050013, 0x00000000, 0x00000008, 0x0013FF6A, 0xFE70FF41, 0x00080029, 0xFF10012F, 0x00000008, 0x002FFF16, 0x01750000, 0x00080036, 0xFF1D0105, 0x00000005, 0x00390000, 0x00000000, 0x00080039, 0xFFAB003F, 0x00000001, 0x00010008, 0x0009FED6, 0x0146FFB2, 0x0005000A, 0x2A980000, 0x00000005, 0x000D0000, 0x6C5F0000, 0x00080029, 0xFF0E0127, 0x00000008, 0x002FFF16, 0x01730000, 0x00080036, 0xFF1E00FB, 0x00000005, 0x00390000, 0x0000EEF0, 0x00080039, 0xFFB1002E, 0x00000001, 0x00010008, 0x0009FED8, 0x013CFFB7, 0x0005000A, 0x2CD90000, 0x00000005, 0x000D0000, 0x6E7F0000, 0x00080029, 0xFF0D011F, 0x00000008, 0x002FFF17, 0x01710000, 0x00080036, 0xFF1F00F1, 0x00000005, 0x00390000, 0x0000DDDF, 0x00080039, 0xFFB6001D, 0x00000001, 0x00010008, 0x0009FED9, 0x0131FFBC, 0x0005000A, 0x2F220000, 0x00000005, 0x000D0000, 0x70A20000, 0x00080029, 0xFF0B0116, 0x00000008, 0x002FFF17, 0x016F0000, 0x00080036, 0xFF1F00E6, 0x00000005, 0x00390000, 0x0000CCCE, 0x00080039, 0xFFBA000C, 0x00000001, 0x00010008, 0x0009FEDA, 0x0125FFC1, 0x0005000A, 0x31740000, 0x00000005, 0x000D0000, 0x72CA0000, 0x00080029, 0xFF09010D, 0x00000008, 0x002FFF17, 0x016C0000, 0x00080036, 0xFF2000DB, 0x00000005, 0x00390000, 0x0000BBBD, 0x00080039, 0xFFBEFFFC, 0x00000001, 0x00010008, 0x0009FEDB, 0x0118FFC6, 0x0005000A, 0x33CD0000, 0x00000005, 0x000D0000, 0x74F40000, 0x00080029, 0xFF070103, 0x00000008, 0x002CFF07, 0x01770000, 0x0008002F, 0xFF170168, 0x00000008, 0x0036FF21, 0x00CF0000, 0x00050039, 0x00000000, 0xAAAC0008, 0x0039FFC1, 0xFFEA0000, 0x00010001, 0x00080009, 0xFEDC010A, 0xFFCB0005, 0x000A362F, 0x00000000, 0x0005000D, 0x00007723, 0x00000005, 0x00290000, 0x0000FDDE, 0x00080029, 0xFF1800F9, 0x00000008, 0x002CFF08, 0x01770000, 0x0008002F, 0xFF170165, 0x00000008, 0x0036FF22, 0x00C40000, 0x00050039, 0x00000000, 0x999B0008, 0x0039FFC4, 0xFFD70000, 0x00010001, 0x00080009, 0xFEDE00FA, 0xFFD00005, 0x000A3898, 0x00000000, 0x0005000D, 0x00007955, 0x00000005, 0x00290000, 0x0000FBBC, 0x00080029, 0xFF2800EE, 0x00000008, 0x002CFF09, 0x01770000, 0x0008002F, 0xFF170161, 0x00000008, 0x0036FF22, 0x00B80000, 0x00050039, 0x00000000, 0x888A0008, 0x0039FFC6, 0xFFC40000, 0x00010001, 0x00080009, 0xFEDF00EA, 0xFFD50005, 0x000A3B08, 0x00000000, 0x0005000D, 0x00007B8A, 0x00000005, 0x00290000, 0x0000F99A, 0x00080029, 0xFF3700E3, 0x00000008, 0x002FFF16, 0x015C0000, 0x00080036, 0xFF2300AB, 0x00000005, 0x00390000, 0x00007776, 0x00080039, 0xFFC9FFB1, 0x00000001, 0x00010008, 0x0009FEE0, 0x00D8FFDA, 0x0005000A, 0x3D800000, 0x00000005, 0x000D0000, 0x7DC30000, 0x00050029, 0x00000000, 0xF7780008, 0x0029FF45, 0x00D80000, 0x0008002C, 0xFF0A0177, 0x00000008, 0x002FFF16, 0x01570000, 0x00080036, 0xFF24009E, 0x00000005, 0x00390000, 0x00006665, 0x00080039, 0xFFCAFF9E, 0x00000001, 0x00010008, 0x0009FEE1, 0x00C5FFDF, 0x0005000A, 0x3FFF0000, 0x00000005, 0x000D0000, 0x80010000, 0x00080025, 0x00000000, 0x00350005, 0x00290000, 0x0000F556, 0x00080029, 0xFF5200CC, 0x00000008, 0x002CFF0B, 0x01770000, 0x0008002F, 0xFF150151, 0x00000008, 0x0036FF24, 0x00910000, 0x00050039, 0x00000000, 0x55540008, 0x0039FFCC, 0xFF8A0000, 0x00010001, 0x00080009, 0xFEF000DB, 0xFFDC0005, 0x000D0000, 0x76B80000, 0x00080019, 0x00000000, 0x00350008, 0x001C0000, 0x00000035, 0x00080025, 0x00000006, 0x00370005, 0x00290000, 0x0000F334, 0x00080029, 0xFF5E00C0, 0x00000008, 0x002CFF0C, 0x01770000, 0x0008002F, 0xFF14014B, 0x00000005, 0x00360000, 0x0000FC58, 0x00080036, 0xFF2C009E, 0x00000005, 0x00390000, 0x00004443, 0x00080039, 0xFFCDFF75, 0x00000001, 0x00010008, 0x0009FEFE, 0x00EEFFDA, 0x0005000D, 0x00006D67, 0x00000008, 0x00190000, 0x00060037, 0x0008001C, 0x00000006, 0x00370008, 0x001F0000, 0x00000035, 0x00080025, 0x0000000C, 0x003A0005, 0x00290000, 0x0000F112, 0x00080029, 0xFF6A00B3, 0x00000008, 0x002FFF13, 0x01450000, 0x00050036, 0x00000000, 0xF8B00008, 0x0036FF33, 0x00A80000, 0x00050039, 0x00000000, 0x33320008, 0x0039FFCE, 0xFF600000, 0x00010001, 0x00080009, 0xFF0D00FE, 0xFFD70005, 0x000D0000, 0x640C0000, 0x00080019, 0x0000000C, 0x003A0008, 0x001C0000, 0x000C003A, 0x0008001F, 0x00000006, 0x00370008, 0x00220000, 0x00000035, 0x00080025, 0x00000011, 0x003C0005, 0x00290000, 0x0000EEF0, 0x00080029, 0xFF7400A6, 0x00000008, 0x002CFF0D, 0x01760000, 0x0008002F, 0xFF12013E, 0x00000005, 0x00360000, 0x0000F508, 0x00080036, 0xFF3A00AF, 0x00000005, 0x00390000, 0x00002221, 0x00080039, 0xFFCEFF4B, 0x00000001, 0x00010008, 0x0009FF1C, 0x010BFFD4, 0x0005000D, 0x00005AA8, 0x00000008, 0x00190000, 0x0011003C, 0x0008001C, 0x00000011, 0x003C0008, 0x001F0000, 0x000C003A, 0x00080022, 0x00000006, 0x00370008, 0x00250000, 0x0016003F, 0x00050029, 0x00000000, 0xECCD0008, 0x0029FF7E, 0x00980000, 0x0008002C, 0xFF0E0176, 0x00000008, 0x002FFF11, 0x01370000, 0x00050036, 0x00000000, 0xF1600008, 0x0036FF41, 0x00B30000, 0x00050039, 0x00000000, 0x11100008, 0x0039FFCE, 0xFF360000, 0x00010001, 0x00080009, 0xFF2B0115, 0xFFD10005, 0x000D0000, 0x513A0000, 0x00080019, 0x00000016, 0x003F0008, 0x001C0000, 0x0016003F, 0x0008001F, 0x00000011, 0x003C0008, 0x00220000, 0x000C003A, 0x00080025, 0x0000001B, 0x00410005, 0x00290000, 0x0000EAAB, 0x00080029, 0xFF87008A, 0x00000008, 0x002CFF0F, 0x01750000, 0x0008002F, 0xFF10012F, 0x00000005, 0x00360000, 0x0000EDB7, 0x00080036, 0xFF4900B4, 0x00000005, 0x00390000, 0x00000000, 0x00080039, 0xFFCEFF20, 0x00000001, 0x00010008, 0x0009FF39, 0x011DFFCE, 0x0005000D, 0x000047C4, 0x00000008, 0x00190000, 0x001B0041, 0x0008001C, 0x0000001B, 0x00410008, 0x001F0000, 0x0016003F, 0x00080022, 0x00000011, 0x003C0008, 0x00250000, 0x001F0044, 0x00050029, 0x00000000, 0xE8890008, 0x0029FF90, 0x007C0000, 0x0008002C, 0xFF0F0173, 0x00000008, 0x002FFF0E, 0x01270000, 0x00050036, 0x00000000, 0xEA0F0008, 0x0036FF50, 0x00B10000, 0x00010001, 0x00080009, 0xFF480123, 0xFFCB0005, 0x000D0000, 0x3E460000, 0x00080019, 0x0000001F, 0x00440008, 0x001C0000, 0x001F0044, 0x0008001F, 0x0000001B, 0x00410008, 0x00220000, 0x0016003F, 0x00080025, 0x00000023, 0x00460005, 0x00290000, 0x0000E667, 0x00080029, 0xFF98006D, 0x00000008, 0x002CFF10, 0x01710000, 0x0008002F, 0xFF0D011F, 0x00000005, 0x00360000, 0x0000E667, 0x00080036, 0xFF5700AB, 0x00000001, 0x00010008, 0x0009FF57, 0x0126FFC8, 0x0005000D, 0x000034C0, 0x00000008, 0x00190000, 0x00230046, 0x0008001C, 0x00000023, 0x00460008, 0x001F0000, 0x001F0044, 0x00080022, 0x0000001B, 0x00410008, 0x00250000, 0x00260049, 0x00050029, 0x00000000, 0xE4450008, 0x0029FF9F, 0x005E0000, 0x0008002C, 0xFF11016F, 0x00000008, 0x002FFF0B, 0x01160000, 0x00050036, 0x00000000, 0xE2BF0008, 0x0036FF5E, 0x00A10000, 0x00010001, 0x00080009, 0xFF650128, 0xFFC50005, 0x000D0000, 0x2B330000, 0x00080019, 0x00000026, 0x00490008, 0x001C0000, 0x00260049, 0x0008001F, 0x00000023, 0x00460008, 0x00220000, 0x001F0044, 0x00080025, 0x00000029, 0x004B0005, 0x00290000, 0x0000E223, 0x00080029, 0xFFA6004F, 0x00000008, 0x002CFF12, 0x016C0000, 0x0008002F, 0xFF09010D, 0x00000005, 0x00360000, 0x0000DF17, 0x00080036, 0xFF650095, 0x00000001, 0x00010008, 0x0009FF74, 0x0129FFC2, 0x0005000D, 0x0000219F, 0x00000008, 0x00190000, 0x0029004B, 0x0008001C, 0x00000029, 0x004B0008, 0x001F0000, 0x00260049, 0x00080022, 0x00000023, 0x00460008, 0x00250000, 0x002C004E, 0x00050029, 0x00000000, 0xE0010008, 0x0029FFAB, 0x003F0000, 0x0008002C, 0xFF120168, 0x00000008, 0x002FFF07, 0x01030000, 0x00050036, 0x00000000, 0xDB6E0008, 0x0036FF6D, 0x00850000, 0x00010001, 0x00080009, 0xFF830128, 0xFFBF0005, 0x000D0000, 0x18060000, 0x00080019, 0x0000002C, 0x004E0008, 0x001C0000, 0x002C004E, 0x0008001F, 0x00000029, 0x004B0008, 0x00220000, 0x00260049, 0x00080025, 0x0000002E, 0x00500005, 0x00290000, 0x0000DDDF, 0x00080029, 0xFFB1002E, 0x00000008, 0x002CFF13, 0x01650000, 0x0005002F, 0x00000000, 0xEEF00008, 0x002FFF18, 0x00F90000, 0x00050036, 0x00000000, 0xD7C60008, 0x0036FF74, 0x00710000, 0x00010001, 0x00080009, 0xFF910126, 0xFFBC0005, 0x000D0000, 0x0E660000, 0x00080019, 0x0000002E, 0x00500008, 0x001C0000, 0x002E0050, 0x0008001F, 0x0000002C, 0x004E0008, 0x00220000, 0x0029004B, 0x00080025, 0x0000002F, 0x00530005, 0x00290000, 0x0000DBBD, 0x00080029, 0xFFB6001D, 0x00000008, 0x002CFF14, 0x01600000, 0x0005002F, 0x00000000, 0xDDDF0008, 0x002FFF28, 0x00EE0000, 0x00050036, 0x00000000, 0xD41E0008, 0x0036FF7B, 0x005A0000, 0x00010001, 0x00080009, 0xFFA00121, 0xFFB90005, 0x000D0000, 0x04C20000, 0x00080019, 0x0000002F, 0x00530008, 0x001C0000, 0x002F0053, 0x0008001F, 0x0000002E, 0x00500008, 0x00220000, 0x002C004E, 0x00080025, 0x00000031, 0x00550005, 0x00290000, 0x0000D99A, 0x00080029, 0xFFBA000C, 0x00000008, 0x002CFF14, 0x015C0000, 0x0005002F, 0x00000000, 0xCCCE0008, 0x002FFF37, 0x00E30000, 0x00050036, 0x00000000, 0xD0760008, 0x0036FF82, 0x003F0000, 0x00010001, 0x00080009, 0xFFAF011B, 0xFFB60005, 0x000D0000, 0xFB1A0000, 0x00080019, 0x00000031, 0x00550008, 0x001C0000, 0x00310055, 0x0008001F, 0x0000002F, 0x00530008, 0x00220000, 0x002E0050, 0x00080025, 0x00000031, 0x00580005, 0x00290000, 0x0000D778, 0x00080029, 0xFFBEFFFC, 0x00000008, 0x002CFF15, 0x01570000, 0x0005002F, 0x00000000, 0xBBBD0008, 0x002FFF45, 0x00D80000, 0x00050036, 0x00000000, 0xCCCE0008, 0x0036FF89, 0x00210000, 0x00010001, 0x00080009, 0xFFBD0114, 0xFFB40005, 0x000D0000, 0xF16D0000, 0x00080019, 0x00000031, 0x00580008, 0x001C0000, 0x00310058, 0x0008001F, 0x00000031, 0x00550008, 0x00220000, 0x002F0053, 0x00080025, 0x00000032, 0x005A0005, 0x00290000, 0x0000D556, 0x00080029, 0xFFC1FFEA, 0x00000008, 0x002CFF16, 0x01510000, 0x0005002F, 0x00000000, 0xAAAC0008, 0x002FFF52, 0x00CC0000, 0x00050036, 0x00000000, 0xC9260008, 0x0036FF91, 0x00000000, 0x00010001, 0x00080009, 0xFFCC010A, 0xFFB10005, 0x000D0000, 0xE7BC0000, 0x00080019, 0x00000032, 0x005A0008, 0x001C0000, 0x0032005A, 0x0008001F, 0x00000031, 0x00580008, 0x00220000, 0x00310055, 0x00080025, 0x00000031, 0x005D0005, 0x00290000, 0x0000D334, 0x00080029, 0xFFC4FFD7, 0x00000008, 0x002CFF17, 0x014C0000, 0x0005002F, 0x00000000, 0x999B0008, 0x002FFF5E, 0x00C00000, 0x00050036, 0x00000000, 0xC57D0008, 0x0036FF98, 0x000D0000, 0x00010001, 0x00080009, 0xFFDB0100, 0xFFAE0005, 0x000D0000, 0xDE090000, 0x00080019, 0x00000031, 0x005D0008, 0x001C0000, 0x0031005D, 0x0008001F, 0x00000032, 0x005A0008, 0x00220000, 0x00310058, 0x00080025, 0x00000030, 0x005F0005, 0x00290000, 0x0000D112, 0x00080029, 0xFFC6FFC4, 0x00000008, 0x002CFF17, 0x01450000, 0x0005002F, 0x00000000, 0x888A0008, 0x002FFF6A, 0x00B30000, 0x00050036, 0x00000000, 0xC1D50008, 0x0036FF9F, 0x00160000, 0x00010001, 0x00080009, 0xFFE900F4, 0xFFAB0005, 0x000D0000, 0xD4520000, 0x00080019, 0x00000030, 0x005F0008, 0x001C0000, 0x0030005F, 0x0008001F, 0x00000031, 0x005D0008, 0x00220000, 0x0032005A, 0x00080025, 0x0000002E, 0x00620005, 0x00290000, 0x0000CEF0, 0x00080029, 0xFFC9FFB1, 0x00000008, 0x002CFF18, 0x013F0000, 0x0005002F, 0x00000000, 0x77760008, 0x002FFF74, 0x00A60000, 0x00050036, 0x00000000, 0xBE2D0008, 0x0036FFA6, 0x001C0000, 0x00010001, 0x00080009, 0xFFF800E6, 0xFFA80005, 0x000D0000, 0xCA9A0000, 0x00080019, 0x0000002E, 0x00620008, 0x001C0000, 0x002E0062, 0x0008001F, 0x00000030, 0x005F0008, 0x00220000, 0x0031005D, 0x00080025, 0x0000002C, 0x00640005, 0x00290000, 0x0000CCCE, 0x00080029, 0xFFCAFF9E, 0x00000008, 0x002CFF19, 0x01380000, 0x0005002F, 0x00000000, 0x66650008, 0x002FFF7E, 0x00980000, 0x00050036, 0x00000000, 0xBA850008, 0x0036FFAD, 0x001E0000, 0x00010001, 0x00080009, 0x000600D7, 0xFFA50005, 0x000D0000, 0xC0E00000, 0x00080019, 0x0000002C, 0x00640008, 0x001C0000, 0x002C0064, 0x0008001F, 0x0000002E, 0x00620008, 0x00220000, 0x0030005F, 0x00080025, 0x00000029, 0x00670005, 0x00290000, 0x0000CAAC, 0x00080029, 0xFFCCFF8A, 0x00000008, 0x002CFF1A, 0x01300000, 0x0005002F, 0x00000000, 0x55540008, 0x002FFF87, 0x008A0000, 0x00050036, 0x00000000, 0xB6DC0008, 0x0036FFB5, 0x001B0000, 0x00010001, 0x00080009, 0x001400C7, 0xFFA20005, 0x000D0000, 0xB7250000, 0x00080019, 0x00000029, 0x00670008, 0x001C0000, 0x00290067, 0x0008001F, 0x0000002C, 0x00640008, 0x00220000, 0x002E0062, 0x00080025, 0x00000026, 0x00690005, 0x00290000, 0x0000C889, 0x00080029, 0xFFCDFF75, 0x00000008, 0x002CFF1A, 0x01280000, 0x0005002F, 0x00000000, 0x44430008, 0x002FFF90, 0x007C0000, 0x00050036, 0x00000000, 0xB3340008, 0x0036FFB5, 0x00150000, 0x00010001, 0x00080009, 0x002300B6, 0xFF9F0005, 0x000D0000, 0xAD690000, 0x00080019, 0x00000026, 0x00690008, 0x001C0000, 0x00260069, 0x0008001F, 0x00000029, 0x00670008, 0x00220000, 0x002C0064, 0x00080025, 0x00000022, 0x006C0005, 0x00290000, 0x0000C667, 0x00080029, 0xFFCEFF60, 0x00000008, 0x002CFF1B, 0x01200000, 0x0005002F, 0x00000000, 0x33320008, 0x002FFF98, 0x006D0000, 0x00050036, 0x00000000, 0xAF8C0008, 0x0036FFB5, 0x000C0000, 0x00010001, 0x00080009, 0x003200A4, 0xFF9C0005, 0x000D0000, 0xA3AD0000, 0x00080019, 0x00000022, 0x006C0008, 0x001C0000, 0x0022006C, 0x0008001F, 0x00000026, 0x00690008, 0x00220000, 0x00290067, 0x00080025, 0x0000001D, 0x006E0005, 0x00290000, 0x0000C445, 0x00080029, 0xFFCEFF4B, 0x00000008, 0x002CFF1C, 0x01170000, 0x0005002F, 0x00000000, 0x22210008, 0x002FFF9F, 0x005E0000, 0x00050036, 0x00000000, 0xABE40008, 0x0036FFB5, 0x00000000, 0x00010001, 0x00080009, 0x00410091, 0xFF990005, 0x000D0000, 0x99F10000, 0x00080019, 0x0000001D, 0x006E0008, 0x001C0000, 0x001D006E, 0x0008001F, 0x00000022, 0x006C0008, 0x00220000, 0x00260069, 0x00080025, 0x00000018, 0x00710005, 0x00290000, 0x0000C223, 0x00080029, 0xFFCEFF36, 0x00000008, 0x002CFF1C, 0x010E0000, 0x0005002F, 0x00000000, 0x11100008, 0x002FFFA6, 0x004F0000, 0x00050036, 0x00000000, 0xA83C0008, 0x0036FFB5, 0xFFEF0000, 0x00010001, 0x00080009, 0x004F007D, 0xFF960005, 0x000D0000, 0x90370000, 0x00080019, 0x00000018, 0x00710008, 0x001C0000, 0x00180071, 0x0008001F, 0x0000001D, 0x006E0008, 0x00220000, 0x0022006C, 0x00080025, 0x00000012, 0x00730005, 0x00290000, 0x0000C001, 0x00080029, 0xFFCEFF20, 0x00000008, 0x002CFF1D, 0x01050000, 0x0005002F, 0x00000000, 0x00000008, 0x002FFFAB, 0x003F0000, 0x00050036, 0x00000000, 0xA4940008, 0x0036FFB5, 0xFFDC0000, 0x00010001, 0x00080009, 0x005E0068, 0xFF930005, 0x000D0000, 0x867E0000, 0x00080019, 0x00000012, 0x00730008, 0x001C0000, 0x00120073, 0x0008001F, 0x00000018, 0x00710008, 0x00220000, 0x001D006E, 0x00080025, 0x0000000B, 0x00760008, 0x002CFF1E, 0x00FB0000, 0x0005002F, 0x00000000, 0xEEF00008, 0x002FFFB1, 0x002E0000, 0x00050036, 0x00000000, 0xA0EB0008, 0x0036FFB5, 0xFFC40000, 0x00010001, 0x00080009, 0x006D0052, 0xFF900005, 0x000D0000, 0x7CC30000, 0x00080019, 0x0000000B, 0x00760008, 0x001C0000, 0x000B0076, 0x0008001F, 0x00000012, 0x00730008, 0x00220000, 0x00180071, 0x00080025, 0x00000004, 0x00780008, 0x002CFF1F, 0x00F10000, 0x0005002F, 0x00000000, 0xDDDF0008, 0x002FFFB6, 0x001D0000, 0x00050036, 0x00000000, 0x9D430008, 0x0036FFB5, 0xFFAA0000, 0x00010001, 0x00080009, 0x007B003B, 0xFF8E0005, 0x000D0000, 0x730E0000, 0x00080019, 0x00000004, 0x00780008, 0x001C0000, 0x00040078, 0x0008001F, 0x0000000B, 0x00760008, 0x00220000, 0x00120073, 0x00080025, 0x0000FFFE, 0x007B0008, 0x002CFF1F, 0x00E60000, 0x0005002F, 0x00000000, 0xCCCE0008, 0x002FFFBA, 0x000C0000, 0x00050036, 0x00000000, 0x999B0008, 0x0036FFB5, 0xFF8D0000, 0x00010001, 0x00080009, 0x008A0023, 0xFF8B0005, 0x000D0000, 0x695C0000, 0x00080019, 0x0000FFFE, 0x007B0008, 0x001C0000, 0xFFFE007B, 0x0008001F, 0x00000004, 0x00780008, 0x00220000, 0x000B0076, 0x00080025, 0x0000FFF6, 0x007D0008, 0x002CFF20, 0x00DB0000, 0x0005002F, 0x00000000, 0xBBBD0008, 0x002FFFBE, 0xFFFC0000, 0x00050036, 0x00000000, 0x95F30008, 0x0036FFB5, 0xFF6C0000, 0x00010001, 0x00080009, 0x0099000B, 0xFF880005, 0x000D0000, 0x5FAD0000, 0x00080019, 0x0000FFF6, 0x007D0008, 0x001C0000, 0xFFF6007D, 0x0008001F, 0x0000FFFE, 0x007B0008, 0x00220000, 0x00040078, 0x00080025, 0x0000FFEE, 0x00800008, 0x002CFF21, 0x00CF0000, 0x0005002F, 0x00000000, 0xAAAC0008, 0x002FFFC1, 0xFFEA0000, 0x00050036, 0x00000000, 0x924A0008, 0x0036FFB5, 0xFF490000, 0x00010001, 0x00080009, 0x00A7FFF4, 0xFF850005, 0x000D0000, 0x56020000, 0x00080019, 0x0000FFEE, 0x00800008, 0x001C0000, 0xFFEE0080, 0x0008001F, 0x0000FFF6, 0x007D0008, 0x00220000, 0xFFFE007B, 0x00080025, 0x0000FFE5, 0x00820008, 0x002CFF22, 0x00C40000, 0x0005002F, 0x00000000, 0x999B0008, 0x002FFFC4, 0xFFD70000, 0x00050036, 0x00000000, 0x8EA20008, 0x0036FFB5, 0xFF230000, 0x00010001, 0x00080009, 0x00B6FFDB, 0xFF820005, 0x000D0000, 0x4C5C0000, 0x00080019, 0x0000FFE5, 0x00820008, 0x001C0000, 0xFFE50082, 0x0008001F, 0x0000FFEE, 0x00800008, 0x00220000, 0xFFF6007D, 0x00080025, 0x0000FFDC, 0x00850008, 0x002CFF22, 0x00B80000, 0x0005002F, 0x00000000, 0x888A0008, 0x002FFFC6, 0xFFC40000, 0x00050036, 0x00000000, 0x8AFA0008, 0x0036FFB5, 0xFEFA0000, 0x00010001, 0x00080009, 0x00C5FFC1, 0xFF7F0005, 0x000D0000, 0x42BA0000, 0x00080019, 0x0000FFDC, 0x00850008, 0x001C0000, 0xFFDC0085, 0x0008001F, 0x0000FFE5, 0x00820008, 0x00220000, 0xFFEE0080, 0x00080025, 0x0000FFD3, 0x00870008, 0x002CFF23, 0x00AB0000, 0x0005002F, 0x00000000, 0x77760008, 0x002FFFC9, 0xFFB10000, 0x00050036, 0x00000000, 0x87520008, 0x0036FFB5, 0xFECF0000, 0x00010001, 0x00080009, 0x00D3FFA7, 0xFF7C0005, 0x000D0000, 0x391D0000, 0x00080019, 0x0000FFD3, 0x00870008, 0x001C0000, 0xFFD30087, 0x0008001F, 0x0000FFDC, 0x00850008, 0x00220000, 0xFFE50082, 0x00080025, 0x0000FFC9, 0x008A0008, 0x002CFF24, 0x009E0000, 0x0005002F, 0x00000000, 0x66650008, 0x002FFFCA, 0xFF9E0000, 0x00050036, 0x00000000, 0x83AA0008, 0x0036FFB5, 0xFEA10000, 0x00010001, 0x00080009, 0x00E2FF8D, 0xFF790005, 0x000D0000, 0x2F870000, 0x00080019, 0x0000FFC9, 0x008A0008, 0x001C0000, 0xFFC9008A, 0x0008001F, 0x0000FFD3, 0x00870008, 0x00220000, 0xFFDC0085, 0x00080025, 0x0000FFBE, 0x008C0008, 0x002CFF24, 0x00910000, 0x0005002F, 0x00000000, 0x55540008, 0x002FFFCC, 0xFF8A0000, 0x00050036, 0x00000000, 0x80010008, 0x0036FFB5, 0xFE700000, 0x00010001, 0x00080009, 0x00F1FF72, 0xFF760005, 0x000D0000, 0x25F70000, 0x00080019, 0x0000FFBE, 0x008C0008, 0x001C0000, 0xFFBE008C, 0x0008001F, 0x0000FFC9, 0x008A0008, 0x00220000, 0xFFD30087, 0x00080025, 0x0000FFB3, 0x008F0005, 0x002C0000, 0x0000FC58, 0x0008002C, 0xFF2C009E, 0x00000005, 0x002F0000, 0x00004443, 0x0008002F, 0xFFCDFF75, 0x00000001, 0x00010008, 0x000900FF, 0xFF57FF73, 0x0005000D, 0x00001C6D, 0x00000008, 0x00190000, 0xFFB3008F, 0x0008001C, 0x0000FFB3, 0x008F0008, 0x001F0000, 0xFFBE008C, 0x00080022, 0x0000FFC9, 0x008A0008, 0x00250000, 0xFFA80091, 0x0005002C, 0x00000000, 0xF8B00008, 0x002CFF33, 0x00A80000, 0x0005002F, 0x00000000, 0x33320008, 0x002FFFCE, 0xFF600000, 0x00010001, 0x00080009, 0x010EFF3C, 0xFF700005, 0x000D0000, 0x12EB0000, 0x00080019, 0x0000FFA8, 0x00910008, 0x001C0000, 0xFFA80091, 0x0008001F, 0x0000FFB3, 0x008F0008, 0x00220000, 0xFFBE008C, 0x00080025, 0x0000FF9D, 0x00940005, 0x002C0000, 0x0000F508, 0x0008002C, 0xFF3A00AF, 0x00000005, 0x002F0000, 0x00002221, 0x0008002F, 0xFFCEFF4B, 0x00000001, 0x00010008, 0x0009011D, 0xFF21FF6D, 0x0005000D, 0x00000971, 0x00000008, 0x00190000, 0xFF9D0094, 0x0008001C, 0x0000FF9D, 0x00940008, 0x001F0000, 0xFFA80091, 0x00080022, 0x0000FFB3, 0x008F0008, 0x00250000, 0xFF910096, 0x0005002C, 0x00000000, 0xF1600008, 0x002CFF41, 0x00B30000, 0x0005002F, 0x00000000, 0x11100008, 0x002FFFCE, 0xFF360000, 0x00010001, 0x00080009, 0x012CFF06, 0xFF6A0005, 0x000D0000, 0x00000000, 0x00080019, 0x0000FF91, 0x00960008, 0x001C0000, 0xFF910096, 0x0008001F, 0x0000FF9D, 0x00940008, 0x00220000, 0xFFA80091, 0x00080025, 0x0000FF85, 0x00990005, 0x002C0000, 0x0000EDB8, 0x0008002C, 0xFF4900B4, 0x00000005, 0x002F0000, 0x00000000, 0x0008002F, 0xFFCEFF20, 0x00000001, 0x00010008, 0x00190000, 0xFF850099, 0x0008001C, 0x0000FF85, 0x00990008, 0x001F0000, 0xFF910096, 0x00080022, 0x0000FF9D, 0x00940008, 0x00250000, 0xFF79009B, 0x0005002C, 0x00000000, 0xEA0F0008, 0x002CFF50, 0x00B10000, 0x00010001, 0x00080019, 0x0000FF79, 0x009B0008, 0x001C0000, 0xFF79009B, 0x0008001F, 0x0000FF85, 0x00990008, 0x00220000, 0xFF910096, 0x00080025, 0x0000FF6D, 0x009E0005, 0x002C0000, 0x0000E667, 0x0008002C, 0xFF5700AB, 0x00000001, 0x00010008, 0x00190000, 0xFF6D009E, 0x0008001C, 0x0000FF6D, 0x009E0008, 0x001F0000, 0xFF79009B, 0x00080022, 0x0000FF85, 0x00990008, 0x00250000, 0xFF6000A0, 0x0005002C, 0x00000000, 0xE2BF0008, 0x002CFF5E, 0x00A10000, 0x00010001, 0x00080019, 0x0000FF60, 0x00A00008, 0x001C0000, 0xFF6000A0, 0x0008001F, 0x0000FF6D, 0x009E0008, 0x00220000, 0xFF79009B, 0x00080025, 0x0000FF53, 0x00A30005, 0x002C0000, 0x0000DF17, 0x0008002C, 0xFF650095, 0x00000001, 0x00010008, 0x00190000, 0xFF5300A3, 0x0008001C, 0x0000FF53, 0x00A30008, 0x001F0000, 0xFF6000A0, 0x00080022, 0x0000FF6D, 0x009E0008, 0x00250000, 0xFF4500A5, 0x0005002C, 0x00000000, 0xDB6E0008, 0x002CFF6D, 0x00850000, 0x00010001, 0x00080019, 0x0000FF45, 0x00A50008, 0x001C0000, 0xFF4500A5, 0x0008001F, 0x0000FF53, 0x00A30008, 0x00220000, 0xFF6000A0, 0x00080025, 0x0000FF38, 0x00A80005, 0x002C0000, 0x0000D7C6, 0x0008002C, 0xFF740071, 0x00000001, 0x00010008, 0x00190000, 0xFF3800A8, 0x0008001C, 0x0000FF38, 0x00A80008, 0x001F0000, 0xFF4500A5, 0x00080022, 0x0000FF53, 0x00A30008, 0x00250000, 0xFF2A00AA, 0x0005002C, 0x00000000, 0xD41E0008, 0x002CFF7B, 0x005A0000, 0x00010001, 0x00080019, 0x0000FF2A, 0x00AA0008, 0x001C0000, 0xFF2A00AA, 0x0008001F, 0x0000FF38, 0x00A80008, 0x00220000, 0xFF4500A5, 0x00080025, 0x0000FF1D, 0x00AD0005, 0x002C0000, 0x0000D076, 0x0008002C, 0xFF82003F, 0x00000001, 0x00010008, 0x00190000, 0xFF1D00AD, 0x0008001C, 0x0000FF1D, 0x00AD0008, 0x001F0000, 0xFF2A00AA, 0x00080022, 0x0000FF38, 0x00A80008, 0x00250000, 0xFF0F00AF, 0x0005002C, 0x00000000, 0xCCCE0008, 0x002CFF89, 0x00210000, 0x00010001, 0x00080019, 0x0000FF0F, 0x00AF0008, 0x001C0000, 0xFF0F00AF, 0x0008001F, 0x0000FF1D, 0x00AD0008, 0x00220000, 0xFF2A00AA, 0x00080025, 0x0000FF01, 0x00B20005, 0x002C0000, 0x0000C925, 0x0008002C, 0xFF910000, 0x00000001, 0x00010005, 0x00070000, 0xF556FF98, 0x00080019, 0x0000FF01, 0x00B20008, 0x001C0000, 0xFF0100B2, 0x0008001F, 0x0000FF0F, 0x00AF0008, 0x00220000, 0xFF1D00AD, 0x00080025, 0x0000FEF3, 0x00B40005, 0x002C0000, 0x0000C57D, 0x0008002C, 0xFF98000D, 0x00000001, 0x00010005, 0x00070000, 0xF556FE72, 0x00080019, 0x0000FEF3, 0x00B40008, 0x001C0000, 0xFEF300B4, 0x0008001F, 0x0000FF01, 0x00B20008, 0x00220000, 0xFF0F00AF, 0x00080025, 0x0000FEE4, 0x00B70005, 0x002C0000, 0x0000C1D5, 0x0008002C, 0xFF9F0016, 0x00000001, 0x00010005, 0x00070000, 0xF556FCAD, 0x00080019, 0x0000FEE4, 0x00B70008, 0x001C0000, 0xFEE400B7, 0x0008001F, 0x0000FEF3, 0x00B40008, 0x00220000, 0xFF0100B2, 0x00080025, 0x0000FED6, 0x00B90005, 0x002C0000, 0x0000BE2D, 0x0008002C, 0xFFA6001C, 0x00000001, 0x00010005, 0x00070000, 0xF556FA64, 0x00080019, 0x0000FED6, 0x00B90008, 0x001C0000, 0xFED600B9, 0x0008001F, 0x0000FEE4, 0x00B70008, 0x00220000, 0xFEF300B4, 0x00080025, 0x0000FEC7, 0x00BC0005, 0x002C0000, 0x0000BA85, 0x0008002C, 0xFFAD001E, 0x00000001, 0x00010005, 0x00070000, 0xF556F7B5, 0x00080019, 0x0000FEC7, 0x00BC0008, 0x001C0000, 0xFEC700BC, 0x0008001F, 0x0000FED6, 0x00B90008, 0x00220000, 0xFEE400B7, 0x00080025, 0x0000FEB9, 0x00BE0005, 0x002C0000, 0x0000B6DD, 0x0008002C, 0xFFB5001B, 0x00000001, 0x00010005, 0x00070000, 0xF556F4BD, 0x00080019, 0x0000FEB9, 0x00BE0008, 0x001C0000, 0xFEB900BE, 0x0008001F, 0x0000FEC7, 0x00BC0008, 0x00220000, 0xFED600B9, 0x00080025, 0x0000FEAA, 0x00C10005, 0x002C0000, 0x0000B334, 0x0008002C, 0xFFB50015, 0x00000001, 0x00010005, 0x00070000, 0xF556F19A, 0x00080019, 0x0000FEAA, 0x00C10008, 0x001C0000, 0xFEAA00C1, 0x0008001F, 0x0000FEB9, 0x00BE0008, 0x00220000, 0xFEC700BC, 0x00080025, 0x0000FE9C, 0x00C30005, 0x002C0000, 0x0000AF8C, 0x0008002C, 0xFFB5000C, 0x00000001, 0x00010005, 0x00070000, 0xF556EE68, 0x00080019, 0x0000FE9C, 0x00C30008, 0x001C0000, 0xFE9C00C3, 0x0008001F, 0x0000FEAA, 0x00C10008, 0x00220000, 0xFEB900BE, 0x00080025, 0x0000FE8D, 0x00C60005, 0x002C0000, 0x0000ABE4, 0x0008002C, 0xFFB50000, 0x00000001, 0x00010005, 0x00070000, 0xF556EB44, 0x00080019, 0x0000FE8D, 0x00C60008, 0x001C0000, 0xFE8D00C6, 0x0008001F, 0x0000FE9C, 0x00C30008, 0x00220000, 0xFEAA00C1, 0x00080025, 0x0000FE7F, 0x00C80005, 0x002C0000, 0x0000A83C, 0x0008002C, 0xFFB5FFEF, 0x00000001, 0x00010005, 0x00070000, 0xF556E84D, 0x00080019, 0x0000FE7F, 0x00C80008, 0x001C0000, 0xFE7F00C8, 0x0008001F, 0x0000FE8D, 0x00C60008, 0x00220000, 0xFE9C00C3, 0x00080025, 0x0000FE70, 0x00CB0005, 0x002C0000, 0x0000A493, 0x0008002C, 0xFFB5FFDC, 0x00000001, 0x00010005, 0x00070000, 0xF556E59E, 0x00080019, 0x0000FE70, 0x00CB0008, 0x001C0000, 0xFE7000CB, 0x0008001F, 0x0000FE7F, 0x00C80008, 0x00220000, 0xFE8D00C6, 0x0005002C, 0x00000000, 0xA0EB0008, 0x002CFFB5, 0xFFC40000, 0x00010001, 0x00050007, 0x0000F556, 0xE3550008, 0x001F0000, 0xFE7000CB, 0x00080022, 0x0000FE7F, 0x00C80005, 0x002C0000, 0x00009D43, 0x0008002C, 0xFFB5FFAA, 0x00000001, 0x00010005, 0x00070000, 0xF556E18F, 0x00080022, 0x0000FE70, 0x00CB0005, 0x002C0000, 0x0000999B, 0x0008002C, 0xFFB5FF8D, 0x00000001, 0x00010005, 0x00070000, 0xF556E069, 0x0005002C, 0x00000000, 0x95F30008, 0x002CFFB5, 0xFF6C0000, 0x00010001, 0x00050007, 0x0000F556, 0xE0010005, 0x002C0000, 0x0000924A, 0x0008002C, 0xFFB5FF49, 0x00000001, 0x00010005, 0x00070000, 0xF556E04D, 0x0005002C, 0x00000000, 0x8EA20008, 0x002CFFB5, 0xFF230000, 0x00010001, 0x00050007, 0x0000F556, 0xE11D0005, 0x002C0000, 0x00008AFA, 0x0008002C, 0xFFB5FEFA, 0x00000001, 0x00010005, 0x00070000, 0xF556E24F, 0x0005002C, 0x00000000, 0x87520008, 0x002CFFB5, 0xFECF0000, 0x00010001, 0x00050007, 0x0000F556, 0xE3C20005, 0x002C0000, 0x000083AA, 0x0008002C, 0xFFB5FEA1, 0x00000001, 0x00010005, 0x00070000, 0xF556E556, 0x0005002C, 0x00000000, 0x80010008, 0x002CFFB5, 0xFE700000, 0x00010001, 0x00050007, 0x0000F556, 0xE6EA0001, 0x00010005, 0x00070000, 0xF556E85E, 0x00010001, 0x00050007, 0x0000F556, 0xE98F0001, 0x00010005, 0x00070000, 0xF556EA5F, 0x00010001, 0x00050007, 0x0000F556, 0xEAAB0001, 0x00010005, 0x00070000, 0xF556EA4D, 0x00010001, 0x00050007, 0x0000F556, 0xE96B0001, 0x00010005, 0x00070000, 0xF556E85E, 0x00010001, 0x00050007, 0x0000F556, 0xE77C0001, 0x00010005, 0x00070000, 0xF556E71D, 0x00010001, 0x00010001, 0x00080007, 0xFEA9014C, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0149FFC8, 0x00010001, 0x00080007, 0xFEA90143, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x013CFFC8, 0x00010001, 0x00080007, 0xFEA90133, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0128FFC8, 0x00010001, 0x00080007, 0xFEA9011B, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x010CFFC8, 0x00010001, 0x00080007, 0xFEA900FB, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x00E8FFC8, 0x00010001, 0x00080007, 0xFEA900D2, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x00BAFFC8, 0x00010001, 0x00080007, 0xFEA9009F, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0082FFC8, 0x00010001, 0x00080007, 0xFEA90063, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0040FFC8, 0x00010001, 0x00080007, 0xFEA9001B, 0xFFC80001, 0x00010008, 0x0007FEA9, 0xFFF4FFC8, 0x00010001, 0x00080007, 0xFEA9FFC9, 0xFFC80001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010005, 0x00030000, 0x1FFF0040, 0x00080003, 0xFF0400D3, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF00FB, 0x00080003, 0xFF0400D0, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF022A, 0x00080003, 0xFF0400CA, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF03C5, 0x00080003, 0xFF0400C3, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF05C6, 0x00080003, 0xFF0400B9, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF0825, 0x00080003, 0xFF0400AE, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF0ADB, 0x00080003, 0xFF0400A1, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF0DE0, 0x00080003, 0xFF040093, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF112E, 0x00080003, 0xFF040083, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF14BC, 0x00080003, 0xFF040072, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF1884, 0x00080003, 0xFF040060, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF1C7F, 0x00080003, 0xFF04004C, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF20A4, 0x00080003, 0xFF040038, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF24EE, 0x00080003, 0xFF040023, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF2954, 0x00080003, 0xFF04000D, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF2DCF, 0x00080003, 0xFF04FFF7, 0xFFB00005, 0x00050013, 0xCAAC0000, 0x00080005, 0xFE8800CD, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF3258, 0x00080003, 0xFF04FFE0, 0xFFB00005, 0x0005004E, 0xCAAC0000, 0x00080005, 0xFE8800C9, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF36E8, 0x00080003, 0xFF04FFC9, 0xFFB00005, 0x000500AD, 0xCAAC0000, 0x00080005, 0xFE8800C4, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF3B77, 0x00080003, 0xFF04FFB1, 0xFFB00005, 0x0005012E, 0xCAAC0000, 0x00080005, 0xFE8800BD, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF3FFF, 0x00080003, 0xFF04FF9A, 0xFFB00005, 0x000501D0, 0xCAAC0000, 0x00080005, 0xFE8800B4, 0xFFAE0001, 0x00010005, 0x00050291, 0xCAAC0000, 0x00080005, 0xFE8800A9, 0xFFAE0001, 0x00010005, 0x0005036E, 0xCAAC0000, 0x00080005, 0xFE88009C, 0xFFAE0001, 0x00010005, 0x00050466, 0xCAAC0000, 0x00080005, 0xFE88008E, 0xFFAE0001, 0x00010005, 0x00050577, 0xCAAC0000, 0x00080005, 0xFE88007F, 0xFFAE0001, 0x00010005, 0x0005069E, 0xCAAC0000, 0x00080005, 0xFE88006E, 0xFFAE0001, 0x00010005, 0x000507DA, 0xCAAC0000, 0x00080005, 0xFE88005C, 0xFFAE0001, 0x00010005, 0x00050929, 0xCAAC0000, 0x00080005, 0xFE880049, 0xFFAE0001, 0x00010005, 0x00050A88, 0xCAAC0000, 0x00080005, 0xFE880035, 0xFFAE0001, 0x00010005, 0x00050BF7, 0xCAAC0000, 0x00080005, 0xFE880020, 0xFFAE0001, 0x00010005, 0x00050D72, 0xCAAC0000, 0x00080005, 0xFE88000A, 0xFFAE0001, 0x00010005, 0x00050EF8, 0xCAAC0000, 0x00080005, 0xFE88FFF5, 0xFFAE0001, 0x00010005, 0x00051087, 0xCAAC0000, 0x00080005, 0xFE88FFDE, 0xFFAE0001, 0x00010005, 0x0005121C, 0xCAAC0000, 0x00080005, 0xFE88FFC6, 0xFFAE0001, 0x00010005, 0x000513B7, 0xCAAC0000, 0x00080005, 0xFE88FFAE, 0xFFAE0001, 0x00010005, 0x00051555, 0xCAAC0000, 0x00080005, 0xFE88FF96, 0xFFAE0001, 0x00010005, 0x005C0012, 0x00000000, 0x00010001, 0x0005005C, 0x004D0000, 0x00000001, 0x00010005, 0x005C00B4, 0x00000000, 0x00010001, 0x0005005C, 0x014A0000, 0x00000001, 0x00010005, 0x005C0212, 0x00000000, 0x00010001, 0x0005005C, 0x03120000, 0x00000001, 0x00010005, 0x005C044C, 0x00000000, 0x00010001, 0x0005005C, 0x05C30000, 0x00000001, 0x00010005, 0x005C077C, 0x00000000, 0x00010001, 0x0005005C, 0x097B0000, 0x00000001, 0x00010005, 0x005C0BC2, 0x00000000, 0x0005005F, 0x00120000, 0x00000001, 0x00010005, 0x005C0E55, 0x00000000, 0x0005005F, 0x004D0000, 0x00000001, 0x00010005, 0x005C1139, 0x00000000, 0x0005005F, 0x00B40000, 0x00000001, 0x00010005, 0x005C1470, 0x00000000, 0x0005005F, 0x014A0000, 0x00000001, 0x00010005, 0x005C17FF, 0x00000000, 0x0005005F, 0x02120000, 0x00000001, 0x00010005, 0x00590012, 0x00000000, 0x0005005C, 0x1BE90000, 0x00000005, 0x005F0312, 0x00000000, 0x00010001, 0x00050059, 0x004D0000, 0x00000005, 0x005C2032, 0x00000000, 0x0005005F, 0x044C0000, 0x00000001, 0x00010005, 0x005900B4, 0x00000000, 0x0005005C, 0x24DC0000, 0x00000005, 0x005F05C3, 0x00000000, 0x00010001, 0x00050059, 0x014A0000, 0x00000005, 0x005C29ED, 0x00000000, 0x0005005F, 0x077C0000, 0x00000001, 0x00010005, 0x00590212, 0x00000000, 0x0005005C, 0x2F670000, 0x00000005, 0x005F097B, 0x00000000, 0x00010001, 0x00050059, 0x03120000, 0x00000005, 0x005C354F, 0x00000000, 0x0005005F, 0x0BC20000, 0x00000001, 0x00010005, 0x0059044C, 0x00000000, 0x0005005C, 0x3BA70000, 0x00000005, 0x005F0E55, 0x00000000, 0x00010001, 0x00050059, 0x05C30000, 0x00000005, 0x005C4274, 0x00000000, 0x0005005F, 0x11390000, 0x00000001, 0x00010005, 0x0059077C, 0x00000000, 0x0005005C, 0x49B90000, 0x00000005, 0x005F1470, 0x00000000, 0x00010001, 0x00050059, 0x097B0000, 0x00000005, 0x005C517A, 0x00000000, 0x0005005F, 0x17FF0000, 0x00000001, 0x00010005, 0x00590BC2, 0x00000000, 0x0005005C, 0x59BA0000, 0x00000005, 0x005F1BE9, 0x00000000, 0x00010001, 0x00050059, 0x0E550000, 0x00000005, 0x005C627E, 0x00000000, 0x0005005F, 0x20320000, 0x00000001, 0x00010005, 0x00591139, 0x00000000, 0x0005005C, 0x6BC80000, 0x00000005, 0x005F24DC, 0x00000000, 0x00010001, 0x00050059, 0x14700000, 0x00000005, 0x005C759C, 0x00000000, 0x0005005F, 0x29ED0000, 0x00000001, 0x00010005, 0x005917FF, 0x00000000, 0x0005005C, 0x80010000, 0x00000005, 0x005F2F67, 0x00000000, 0x00010001, 0x00050059, 0x1BE90000, 0x00000005, 0x005B0888, 0x16EE0000, 0x0005005F, 0x354F0000, 0x00000005, 0x00620012, 0x00000000, 0x00010001, 0x00050059, 0x20320000, 0x00000005, 0x005B1110, 0x16EE0000, 0x0005005F, 0x3BA70000, 0x00000005, 0x0062004D, 0x00000000, 0x00010001, 0x00050059, 0x24DC0000, 0x00000005, 0x005B1999, 0x16EE0000, 0x0005005F, 0x42740000, 0x00000005, 0x006200B4, 0x00000000, 0x00010001, 0x00050059, 0x29ED0000, 0x00000005, 0x005B2221, 0x16EE0000, 0x0005005F, 0x49B90000, 0x00000005, 0x0062014A, 0x00000000, 0x00010001, 0x00050059, 0x2F670000, 0x00000005, 0x005B2AAA, 0x16EE0000, 0x0005005F, 0x517A0000, 0x00000005, 0x00620212, 0x00000000, 0x00010001, 0x00050059, 0x354F0000, 0x00000005, 0x005B3332, 0x16EE0000, 0x0005005F, 0x59BA0000, 0x00000005, 0x00620312, 0x00000000, 0x00010001, 0x00050059, 0x3BA70000, 0x00000005, 0x005B3BBB, 0x16EE0000, 0x0005005F, 0x627E0000, 0x00000005, 0x0062044C, 0x00000000, 0x00010001, 0x00050059, 0x42740000, 0x00000005, 0x005B4443, 0x16EE0000, 0x0005005F, 0x6BC80000, 0x00000005, 0x006205C3, 0x00000000, 0x00010001, 0x00050059, 0x49B90000, 0x00000005, 0x005B4CCC, 0x16EE0000, 0x0005005F, 0x759C0000, 0x00000005, 0x0062077C, 0x00000000, 0x00010001, 0x00050059, 0x517A0000, 0x00000005, 0x005B5554, 0x16EE0000, 0x0005005F, 0x80010000, 0x00000005, 0x0062097B, 0x00000000, 0x00010001, 0x00050059, 0x59BA0000, 0x00000005, 0x005B5DDD, 0x16EE0000, 0x0005005E, 0x0888EC45, 0x00000005, 0x00620BC2, 0x00000000, 0x00050068, 0x00120000, 0x00000001, 0x00010005, 0x0059627E, 0x00000000, 0x0005005B, 0x666516EE, 0x00000005, 0x005E1110, 0xEC450000, 0x00050062, 0x0E550000, 0x00000005, 0x0068004D, 0x00000000, 0x00010001, 0x00050059, 0x6BC80000, 0x00000005, 0x005B6EEE, 0x16EE0000, 0x0005005E, 0x1999EC45, 0x00000005, 0x00621139, 0x00000000, 0x00050068, 0x00B40000, 0x00000001, 0x00010005, 0x0059759C, 0x00000000, 0x0005005B, 0x777616EE, 0x00000005, 0x005E2221, 0xEC450000, 0x00050062, 0x14700000, 0x00000005, 0x0068014A, 0x00000000, 0x00010001, 0x00050059, 0x80010000, 0x00000005, 0x005B8001, 0x16EE0000, 0x0005005E, 0x2AAAEC45, 0x00000005, 0x006217FF, 0x00000000, 0x00050068, 0x02120000, 0x00000001, 0x00010005, 0x004D01A1, 0x16EE0000, 0x00050058, 0x08884199, 0x00000008, 0x005B0002, 0x00B50018, 0x0005005E, 0x3332EC45, 0x00000005, 0x00621BE9, 0x00000000, 0x00050068, 0x03120000, 0x00000001, 0x00010005, 0x004D0638, 0x16EE0000, 0x00050058, 0x11104199, 0x00000008, 0x005B0002, 0x00A70018, 0x0005005E, 0x3BBBEC45, 0x00000005, 0x00622032, 0x00000000, 0x00050068, 0x044C0000, 0x00000001, 0x00010005, 0x004D0D4F, 0x16EE0000, 0x00050058, 0x19994199, 0x00000008, 0x005B0002, 0x00980018, 0x0005005E, 0x4443EC45, 0x00000005, 0x006224DC, 0x00000000, 0x00050068, 0x05C30000, 0x00000001, 0x00010005, 0x004D1673, 0x16EE0000, 0x00050058, 0x22214199, 0x00000008, 0x005B0002, 0x008A0018, 0x0005005E, 0x4CCCEC45, 0x00000005, 0x006229ED, 0x00000000, 0x00050068, 0x077C0000, 0x00000001, 0x00010005, 0x004D212F, 0x16EE0000, 0x00050058, 0x2AAA4199, 0x00000008, 0x005B0002, 0x007C0018, 0x0005005E, 0x5554EC45, 0x00000005, 0x00622F67, 0x00000000, 0x00050068, 0x097B0000, 0x00000001, 0x00010005, 0x004D2D0D, 0x16EE0000, 0x00050058, 0x33324199, 0x00000008, 0x005B0002, 0x006D0018, 0x0005005E, 0x5DDDEC45, 0x00000005, 0x0062354F, 0x00000000, 0x00050068, 0x0BC20000, 0x00000001, 0x00010005, 0x004D399B, 0x16EE0000, 0x00050058, 0x3BBB4199, 0x00000008, 0x005B0002, 0x005F0018, 0x0005005E, 0x6665EC45, 0x00000005, 0x00623BA7, 0x00000000, 0x00050068, 0x0E550000, 0x00000001, 0x00010005, 0x004D4663, 0x16EE0000, 0x00050058, 0x44434199, 0x00000008, 0x005B0002, 0x00500018, 0x0005005E, 0x6EEEEC45, 0x00000005, 0x00624274, 0x00000000, 0x00050068, 0x11390000, 0x00000001, 0x00010005, 0x004D52F0, 0x16EE0000, 0x00050058, 0x4CCC4199, 0x00000008, 0x005B0002, 0x00420018, 0x0005005E, 0x7776EC45, 0x00000005, 0x006249B9, 0x00000000, 0x00050068, 0x14700000, 0x00000001, 0x00010005, 0x004D5ECF, 0x16EE0000, 0x00050058, 0x55544199, 0x00000008, 0x005B0002, 0x00340018, 0x0005005E, 0x8001EC45, 0x00000005, 0x0062517A, 0x00000000, 0x00050068, 0x17FF0000, 0x00000001, 0x00010005, 0x004D698B, 0x16EE0000, 0x0005004F, 0x01A1EC45, 0x00000005, 0x00585DDD, 0x41990000, 0x0008005B, 0x00020025, 0x00180008, 0x005EFFB9, 0x00B5001B, 0x00050062, 0x59BA0000, 0x00000005, 0x00650012, 0x00000000, 0x00050068, 0x1BE90000, 0x00000001, 0x00010005, 0x004D72AF, 0x16EE0000, 0x0005004F, 0x0638EC45, 0x00000005, 0x00586665, 0x41990000, 0x0008005B, 0x00020017, 0x00180008, 0x005EFFB9, 0x00A7001B, 0x00050062, 0x627E0000, 0x00000005, 0x0065004D, 0x00000000, 0x00050068, 0x20320000, 0x00000001, 0x00010005, 0x004D79C6, 0x16EE0000, 0x0005004F, 0x0D4FEC45, 0x00000005, 0x00586EEE, 0x41990000, 0x0008005B, 0x00020008, 0x00180008, 0x005EFFB9, 0x0098001B, 0x00050062, 0x6BC80000, 0x00000005, 0x006500B4, 0x00000000, 0x00050068, 0x24DC0000, 0x00000001, 0x00010005, 0x004D7E5D, 0x16EE0000, 0x0005004F, 0x1673EC45, 0x00000005, 0x00587776, 0x41990000, 0x0008005B, 0x0002FFFB, 0x00180008, 0x005EFFB9, 0x008A001B, 0x00050062, 0x759C0000, 0x00000005, 0x0065014A, 0x00000000, 0x00050068, 0x29ED0000, 0x00000001, 0x00010005, 0x004D8001, 0x16EE0000, 0x0005004F, 0x212FEC45, 0x00000005, 0x00588001, 0x41990000, 0x0008005B, 0x0002FFEC, 0x00180008, 0x005EFFB9, 0x007C001B, 0x00050062, 0x80010000, 0x00000005, 0x00650212, 0x00000000, 0x00050068, 0x2F670000, 0x00000001, 0x00010005, 0x004B01A1, 0x41990000, 0x0008004D, 0x000200C0, 0x00180005, 0x004F2D0D, 0xEC450000, 0x00080058, 0x002400B5, 0xFFD70008, 0x005EFFB9, 0x006D001B, 0x00050061, 0x0888C19B, 0x00000005, 0x00650312, 0x00000000, 0x00050068, 0x354F0000, 0x00000001, 0x00010005, 0x004B0638, 0x41990000, 0x0008004D, 0x000200B5, 0x00180005, 0x004F399B, 0xEC450000, 0x00080058, 0x002400A7, 0xFFD70008, 0x005EFFB9, 0x005F001B, 0x00050061, 0x1110C19B, 0x00000005, 0x0065044C, 0x00000000, 0x00050068, 0x3BA70000, 0x00000001, 0x00010005, 0x004B0D4F, 0x41990000, 0x0008004D, 0x000200A4, 0x00180005, 0x004F4663, 0xEC450000, 0x00080058, 0x00240098, 0xFFD70008, 0x005EFFB9, 0x0050001B, 0x00050061, 0x1999C19B, 0x00000005, 0x006505C3, 0x00000000, 0x00050068, 0x42740000, 0x00000001, 0x00010005, 0x004B1673, 0x41990000, 0x0008004D, 0x0002008E, 0x00180005, 0x004F52F1, 0xEC450000, 0x00080058, 0x0024008A, 0xFFD70008, 0x005EFFB9, 0x0042001B, 0x00050061, 0x2221C19B, 0x00000005, 0x0065077C, 0x00000000, 0x00050068, 0x49B90000, 0x00000001, 0x00010005, 0x004B212F, 0x41990000, 0x0008004D, 0x00020074, 0x00180005, 0x004F5ECF, 0xEC450000, 0x00080058, 0x0024007C, 0xFFD70008, 0x005EFFB9, 0x0034001B, 0x00050061, 0x2AAAC19B, 0x00000005, 0x0065097B, 0x00000000, 0x00050068, 0x517A0000, 0x00000001, 0x00010005, 0x004B2D0D, 0x41990000, 0x0008004D, 0x00020058, 0x00180005, 0x004F698B, 0xEC450000, 0x00080058, 0x0024006D, 0xFFD70008, 0x005EFFB9, 0x0025001B, 0x00050061, 0x3332C19B, 0x00000005, 0x00650BC2, 0x00000000, 0x00050068, 0x59BA0000, 0x00000001, 0x00010005, 0x004B399B, 0x41990000, 0x0008004D, 0x0002003A, 0x00180005, 0x004F72AF, 0xEC450000, 0x00080058, 0x0024005F, 0xFFD70008, 0x005EFFB9, 0x0017001B, 0x00050061, 0x3BBBC19B, 0x00000005, 0x00650E55, 0x00000000, 0x00050068, 0x627E0000, 0x00000001, 0x00010005, 0x004B4663, 0x41990000, 0x0008004D, 0x0002001C, 0x00180005, 0x004F79C6, 0xEC450000, 0x00080058, 0x00240050, 0xFFD70008, 0x005EFFB9, 0x0008001B, 0x00050061, 0x4443C19B, 0x00000005, 0x00651139, 0x00000000, 0x00050068, 0x6BC80000, 0x00000001, 0x00010005, 0x004B52F0, 0x41990000, 0x0008004D, 0x0002FFFF, 0x00180005, 0x004F7E5D, 0xEC450000, 0x00080058, 0x00240042, 0xFFD70008, 0x005EFFB9, 0xFFFB001B, 0x00050061, 0x4CCCC19B, 0x00000005, 0x00651470, 0x00000000, 0x00050068, 0x759C0000, 0x00000001, 0x00010005, 0x004B5ECF, 0x41990000, 0x0008004D, 0x0002FFE2, 0x00180005, 0x004F8001, 0xEC450000, 0x00080058, 0x00240034, 0xFFD70008, 0x005EFFB9, 0xFFEC001B, 0x00050061, 0x5554C19B, 0x00000005, 0x006517FF, 0x00000000, 0x00050068, 0x80010000, 0x00000001, 0x00010005, 0x004B698B, 0x41990000, 0x0008004D, 0x0002FFC9, 0x00180008, 0x004FFFB9, 0x00C0001B, 0x00080058, 0x00240025, 0xFFD70005, 0x00615DDD, 0xC19B0000, 0x00050065, 0x1BE90000, 0x00000005, 0x00670888, 0x6C430000, 0x00010001, 0x0005004B, 0x72AF4199, 0x00000008, 0x004D0002, 0xFFB30018, 0x0008004F, 0xFFB900B5, 0x001B0008, 0x00580024, 0x0017FFD7, 0x00050061, 0x6665C19B, 0x00000005, 0x00652032, 0x00000000, 0x00050067, 0x11106C43, 0x00000001, 0x00010005, 0x004B79C6, 0x41990000, 0x0008004D, 0x0002FFA2, 0x00180008, 0x004FFFB9, 0x00A4001B, 0x00080058, 0x00240008, 0xFFD70005, 0x00616EEE, 0xC19B0000, 0x00050065, 0x24DC0000, 0x00000005, 0x00671999, 0x6C430000, 0x00010001, 0x0005004B, 0x7E5D4199, 0x00000008, 0x004D0002, 0xFF970018, 0x0008004F, 0xFFB9008E, 0x001B0008, 0x00580024, 0xFFFBFFD7, 0x00050061, 0x7776C19B, 0x00000005, 0x006529ED, 0x00000000, 0x00050067, 0x22216C43, 0x00000001, 0x00010005, 0x004B8001, 0x41990000, 0x0008004D, 0x0002FF93, 0x00180008, 0x004FFFB9, 0x0074001B, 0x00080058, 0x0024FFEC, 0xFFD70005, 0x00618001, 0xC19B0000, 0x00050065, 0x2F670000, 0x00000005, 0x00672AAA, 0x6C430000, 0x00010001, 0x00080040, 0x00010067, 0x00170008, 0x004B0024, 0x00C0FFD7, 0x0008004F, 0xFFB90058, 0x001B0008, 0x0061FF91, 0x00B5FFDD, 0x00050065, 0x354F0000, 0x00000005, 0x00673332, 0x6C430000, 0x00010001, 0x00080040, 0x00010060, 0x00170008, 0x004B0024, 0x00B5FFD7, 0x0008004F, 0xFFB9003A, 0x001B0005, 0x005101A1, 0xC19B0000, 0x00080061, 0xFF9100A7, 0xFFDD0005, 0x00653BA7, 0x00000000, 0x00050067, 0x3BBB6C43, 0x00000001, 0x00010008, 0x00400001, 0x00540017, 0x0008004B, 0x002400A4, 0xFFD70008, 0x004FFFB9, 0x001C001B, 0x00050051, 0x0638C19B, 0x00000008, 0x0061FF91, 0x0098FFDD, 0x00050065, 0x42740000, 0x00000005, 0x00674443, 0x6C430000, 0x00010001, 0x00080040, 0x00010045, 0x00170008, 0x004B0024, 0x008EFFD7, 0x0008004F, 0xFFB9FFFF, 0x001B0005, 0x00510D4F, 0xC19B0000, 0x00080061, 0xFF91008A, 0xFFDD0005, 0x006549B9, 0x00000000, 0x00050067, 0x4CCC6C43, 0x00000001, 0x00010008, 0x00400001, 0x00330017, 0x0008004B, 0x00240074, 0xFFD70008, 0x004FFFB9, 0xFFE2001B, 0x00050051, 0x1673C19B, 0x00000008, 0x0061FF91, 0x007CFFDD, 0x00050065, 0x517A0000, 0x00000005, 0x00675554, 0x6C430000, 0x00010001, 0x00080040, 0x0001001F, 0x00170008, 0x004B0024, 0x0058FFD7, 0x0008004F, 0xFFB9FFC9, 0x001B0005, 0x0051212F, 0xC19B0000, 0x00080061, 0xFF91006D, 0xFFDD0005, 0x006559BA, 0x00000000, 0x00050067, 0x5DDD6C43, 0x00000001, 0x00010008, 0x00400001, 0x000A0017, 0x0008004B, 0x0024003A, 0xFFD70008, 0x004FFFB9, 0xFFB3001B, 0x00050051, 0x2D0DC19B, 0x00000008, 0x0061FF91, 0x005FFFDD, 0x00050065, 0x627E0000, 0x00000005, 0x00676665, 0x6C430000, 0x00010001, 0x00080040, 0x0001FFF6, 0x00170008, 0x004B0024, 0x001CFFD7, 0x0008004F, 0xFFB9FFA2, 0x001B0005, 0x0051399B, 0xC19B0000, 0x00080061, 0xFF910050, 0xFFDD0005, 0x00656BC8, 0x00000000, 0x00050067, 0x6EEE6C43, 0x00000001, 0x00010008, 0x00400001, 0xFFE10017, 0x0008004B, 0x0024FFFF, 0xFFD70008, 0x004FFFB9, 0xFF97001B, 0x00050051, 0x4663C19B, 0x00000008, 0x0061FF91, 0x0042FFDD, 0x00050065, 0x759C0000, 0x00000005, 0x00677776, 0x6C430000, 0x00010001, 0x00080040, 0x0001FFCD, 0x00170008, 0x004B0024, 0xFFE2FFD7, 0x0008004F, 0xFFB9FF93, 0x001B0005, 0x005152F1, 0xC19B0000, 0x00080061, 0xFF910034, 0xFFDD0005, 0x00658001, 0x00000000, 0x00050067, 0x80016C43, 0x00000001, 0x00010008, 0x00400001, 0xFFBB0017, 0x00080042, 0xFFB90067, 0x001A0008, 0x004B0024, 0xFFC9FFD7, 0x00050051, 0x5ECFC19B, 0x00000005, 0x005501A1, 0x6C430000, 0x00080061, 0xFF910025, 0xFFDD0005, 0x00640888, 0x96F00000, 0x00080067, 0xFFFD00B5, 0xFF990001, 0x00010008, 0x00400001, 0xFFAC0017, 0x00080042, 0xFFB90060, 0x001A0008, 0x004B0024, 0xFFB3FFD7, 0x00050051, 0x698BC19B, 0x00000005, 0x00550638, 0x6C430000, 0x00080061, 0xFF910017, 0xFFDD0005, 0x00641110, 0x96F00000, 0x00080067, 0xFFFD00A7, 0xFF990001, 0x00010008, 0x00400001, 0xFFA00017, 0x00080042, 0xFFB90054, 0x001A0008, 0x004B0024, 0xFFA2FFD7, 0x00050051, 0x72AFC19B, 0x00000005, 0x00550D4F, 0x6C430000, 0x00080061, 0xFF910008, 0xFFDD0005, 0x00641999, 0x96F00000, 0x00080067, 0xFFFD0098, 0xFF990001, 0x00010008, 0x00400001, 0xFF990017, 0x00080042, 0xFFB90045, 0x001A0008, 0x004B0024, 0xFF97FFD7, 0x00050051, 0x79C6C19B, 0x00000005, 0x00551673, 0x6C430000, 0x00080061, 0xFF91FFFB, 0xFFDD0005, 0x00642221, 0x96F00000, 0x00080067, 0xFFFD008A, 0xFF990001, 0x00010008, 0x00400001, 0xFF960017, 0x00080042, 0xFFB90033, 0x001A0008, 0x004B0024, 0xFF93FFD7, 0x00050051, 0x7E5DC19B, 0x00000005, 0x0055212F, 0x6C430000, 0x00080061, 0xFF91FFEC, 0xFFDD0005, 0x00642AAA, 0x96F00000, 0x00080067, 0xFFFD007C, 0xFF990001, 0x00010008, 0x003E0023, 0x0067FFD7, 0x00080042, 0xFFB9001F, 0x001A0005, 0x00518001, 0xC19B0000, 0x00050055, 0x2D0D6C43, 0x00000005, 0x00643332, 0x96F00000, 0x00080067, 0xFFFD006D, 0xFF990001, 0x00010008, 0x003E0023, 0x0060FFD7, 0x00080042, 0xFFB9000A, 0x001A0008, 0x0051FF91, 0x00C0FFDD, 0x00050055, 0x399B6C43, 0x00000005, 0x00643BBB, 0x96F00000, 0x00080067, 0xFFFD005F, 0xFF990001, 0x00010008, 0x003E0023, 0x0054FFD7, 0x00080042, 0xFFB9FFF6, 0x001A0008, 0x0051FF91, 0x00B5FFDD, 0x00050055, 0x46636C43, 0x00000005, 0x00644443, 0x96F00000, 0x00080067, 0xFFFD0050, 0xFF990001, 0x00010008, 0x003E0023, 0x0045FFD7, 0x00080042, 0xFFB9FFE1, 0x001A0008, 0x0051FF91, 0x00A4FFDD, 0x00050055, 0x52F16C43, 0x00000005, 0x00644CCC, 0x96F00000, 0x00080067, 0xFFFD0042, 0xFF990001, 0x00010008, 0x003E0023, 0x0033FFD7, 0x00080042, 0xFFB9FFCD, 0x001A0008, 0x0051FF91, 0x008EFFDD, 0x00050055, 0x5ECF6C43, 0x00000005, 0x00645554, 0x96F00000, 0x00080067, 0xFFFD0034, 0xFF990001, 0x00010008, 0x003E0023, 0x001FFFD7, 0x00080042, 0xFFB9FFBB, 0x001A0008, 0x0051FF91, 0x0074FFDD, 0x00050055, 0x698B6C43, 0x00000005, 0x00645DDD, 0x96F00000, 0x00080067, 0xFFFD0025, 0xFF990001, 0x00010008, 0x003E0023, 0x000AFFD7, 0x00080042, 0xFFB9FFAC, 0x001A0008, 0x0051FF91, 0x0058FFDD, 0x00050055, 0x72AF6C43, 0x00000005, 0x00646665, 0x96F00000, 0x00080067, 0xFFFD0017, 0xFF990001, 0x00010008, 0x003E0023, 0xFFF6FFD7, 0x00080042, 0xFFB9FFA0, 0x001A0008, 0x0051FF91, 0x003AFFDD, 0x00050055, 0x79C66C43, 0x00000005, 0x00646EEE, 0x96F00000, 0x00080067, 0xFFFD0008, 0xFF990001, 0x00010008, 0x003E0023, 0xFFE1FFD7, 0x00080042, 0xFFB9FF99, 0x001A0008, 0x0051FF91, 0x001CFFDD, 0x00050055, 0x7E5D6C43, 0x00000005, 0x00647776, 0x96F00000, 0x00080067, 0xFFFDFFFB, 0xFF990001, 0x00010008, 0x003E0023, 0xFFCDFFD7, 0x00080042, 0xFFB9FF96, 0x001A0008, 0x0051FF91, 0xFFFFFFDD, 0x00050055, 0x80016C43, 0x00000005, 0x00648001, 0x96F00000, 0x00080067, 0xFFFDFFEC, 0xFF990001, 0x00010008, 0x003E0023, 0xFFBBFFD7, 0x00080051, 0xFF91FFE2, 0xFFDD0005, 0x005301A1, 0x96F00000, 0x00080055, 0xFFFD00C0, 0xFF990008, 0x0064FFB3, 0x00B5FF9B, 0x00010001, 0x0008003E, 0x0023FFAC, 0xFFD70008, 0x0051FF91, 0xFFC9FFDD, 0x00050053, 0x063896F0, 0x00000008, 0x0055FFFD, 0x00B5FF99, 0x00080064, 0xFFB300A7, 0xFF9B0001, 0x00010008, 0x003E0023, 0xFFA0FFD7, 0x00080051, 0xFF91FFB3, 0xFFDD0005, 0x00530D4F, 0x96F00000, 0x00080055, 0xFFFD00A4, 0xFF990008, 0x0064FFB3, 0x0098FF9B, 0x00010001, 0x0008003E, 0x0023FF99, 0xFFD70008, 0x0051FF91, 0xFFA2FFDD, 0x00050053, 0x167396F0, 0x00000008, 0x0055FFFD, 0x008EFF99, 0x00080064, 0xFFB3008A, 0xFF9B0001, 0x00010008, 0x003E0023, 0xFF96FFD7, 0x00080051, 0xFF91FF97, 0xFFDD0005, 0x0053212F, 0x96F00000, 0x00080055, 0xFFFD0074, 0xFF990008, 0x0064FFB3, 0x007CFF9B, 0x00010001, 0x00080044, 0xFF920067, 0xFFDD0008, 0x0051FF91, 0xFF93FFDD, 0x00050053, 0x2D0D96F0, 0x00000008, 0x0055FFFD, 0x0058FF99, 0x00080064, 0xFFB3006D, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0060FFDD, 0x00050053, 0x399B96F0, 0x00000008, 0x0055FFFD, 0x003AFF99, 0x00080064, 0xFFB3005F, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0054FFDD, 0x00050053, 0x466396F0, 0x00000008, 0x0055FFFD, 0x001CFF99, 0x00080064, 0xFFB30050, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0045FFDD, 0x00050053, 0x52F196F0, 0x00000008, 0x0055FFFD, 0xFFFFFF99, 0x00080064, 0xFFB30042, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0033FFDD, 0x00050053, 0x5ECF96F0, 0x00000008, 0x0055FFFD, 0xFFE2FF99, 0x00080064, 0xFFB30034, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x001FFFDD, 0x00050053, 0x698B96F0, 0x00000008, 0x0055FFFD, 0xFFC9FF99, 0x00080064, 0xFFB30025, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x000AFFDD, 0x00050053, 0x72AF96F0, 0x00000008, 0x0055FFFD, 0xFFB3FF99, 0x00080064, 0xFFB30017, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFF6FFDD, 0x00050053, 0x79C696F0, 0x00000008, 0x0055FFFD, 0xFFA2FF99, 0x00080064, 0xFFB30008, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFE1FFDD, 0x00050053, 0x7E5D96F0, 0x00000008, 0x0055FFFD, 0xFF97FF99, 0x00080064, 0xFFB3FFFB, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFCDFFDD, 0x00050053, 0x800196F0, 0x00000008, 0x0055FFFD, 0xFF93FF99, 0x00080064, 0xFFB3FFEC, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFBBFFDD, 0x00080046, 0xFFFD0067, 0xFF990008, 0x0053FFB3, 0x00C0FF9B, 0x00010001, 0x00080044, 0xFF92FFAC, 0xFFDD0008, 0x0046FFFD, 0x0060FF99, 0x00080053, 0xFFB300B5, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFA0FFDD, 0x00080046, 0xFFFD0054, 0xFF990008, 0x0053FFB3, 0x00A4FF9B, 0x00010001, 0x00080044, 0xFF92FF99, 0xFFDD0008, 0x0046FFFD, 0x0045FF99, 0x00080053, 0xFFB3008E, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFF96FFDD, 0x00080046, 0xFFFD0033, 0xFF990008, 0x0053FFB3, 0x0074FF9B, 0x00010001, 0x00080046, 0xFFFD001F, 0xFF990008, 0x0053FFB3, 0x0058FF9B, 0x00010001, 0x00080046, 0xFFFD000A, 0xFF990008, 0x0053FFB3, 0x003AFF9B, 0x00010001, 0x00080046, 0xFFFDFFF6, 0xFF990008, 0x0053FFB3, 0x001CFF9B, 0x00010001, 0x00080046, 0xFFFDFFE1, 0xFF990008, 0x0053FFB3, 0xFFFFFF9B, 0x00010001, 0x00080046, 0xFFFDFFCD, 0xFF990008, 0x0053FFB3, 0xFFE2FF9B, 0x00010001, 0x00080046, 0xFFFDFFBB, 0xFF990008, 0x0053FFB3, 0xFFC9FF9B, 0x00010001, 0x00080046, 0xFFFDFFAC, 0xFF990008, 0x0053FFB3, 0xFFB3FF9B, 0x00010001, 0x00080046, 0xFFFDFFA0, 0xFF990008, 0x0053FFB3, 0xFFA2FF9B, 0x00010001, 0x00080046, 0xFFFDFF99, 0xFF990008, 0x0053FFB3, 0xFF97FF9B, 0x00010001, 0x00080046, 0xFFFDFF96, 0xFF990008, 0x0053FFB3, 0xFF93FF9B, 0x00010001, 0x00080048, 0xFFB40067, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0x0060FF9C, 0x00010001, 0x00080048, 0xFFB40054, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0x0045FF9C, 0x00010001, 0x00080048, 0xFFB40033, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0x001FFF9C, 0x00010001, 0x00080048, 0xFFB4000A, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFFF6FF9C, 0x00010001, 0x00080048, 0xFFB4FFE1, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFFCDFF9C, 0x00010001, 0x00080048, 0xFFB4FFBB, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFFACFF9C, 0x00010001, 0x00080048, 0xFFB4FFA0, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFF99FF9C, 0x00010001, 0x000A0008, 0x0048FFB4, 0xFF96FF9C, 0x00010001, 0x00030000, 0x00000000
+.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802481C4_8E22C4, 0x00000000, 0x00000000, 0x00000000, D_802481F0_8E22F0, D_802481C4_8E22C4, D_80248198_8E2298, D_8024816C_8E226C, D_80248140_8E2240, D_80248114_8E2214, D_802480E8_8E21E8, D_802480BC_8E21BC, D_80248090_8E2190, D_80248064_8E2164, D_80248038_8E2138, D_8024800C_8E210C, D_80247FE0_8E20E0, D_80247FB4_8E20B4, D_80247F88_8E2088, D_80247F5C_8E205C, D_80247F30_8E2030, D_80247F04_8E2004, D_80247ED8_8E1FD8, D_80247EAC_8E1FAC, D_80247E80_8E1F80, D_80247E54_8E1F54, D_80247E28_8E1F28, D_80247DFC_8E1EFC, D_80247DD0_8E1ED0, D_80247DA4_8E1EA4, D_80247D78_8E1E78, D_80247D4C_8E1E4C, D_80247D20_8E1E20, D_80247CF4_8E1DF4, D_80247CC8_8E1DC8, D_80247C9C_8E1D9C, D_80247C70_8E1D70, D_80247C44_8E1D44, D_80247C18_8E1D18, D_80247BEC_8E1CEC, D_80247BC0_8E1CC0, D_80247B94_8E1C94, D_80247B68_8E1C68, D_80247B3C_8E1C3C, D_80247B10_8E1C10, D_80247AE4_8E1BE4, D_80247AB8_8E1BB8, D_80247A8C_8E1B8C, D_80247A60_8E1B60, D_80247A34_8E1B34, D_80247A08_8E1B08, D_802479DC_8E1ADC, D_802479B0_8E1AB0, D_80247984_8E1A84, D_80247958_8E1A58, D_8024792C_8E1A2C, D_80247900_8E1A00, D_802478D4_8E19D4, D_802478A8_8E19A8, D_8024787C_8E197C, D_80247850_8E1950, D_80247824_8E1924, D_802477F8_8E18F8, D_802477CC_8E18CC, D_802477A0_8E18A0, D_80247774_8E1874, D_80247748_8E1848, D_8024771C_8E181C, D_802476F0_8E17F0, D_802476C4_8E17C4, D_80247698_8E1798, D_8024766C_8E176C, D_80247640_8E1740, D_80247614_8E1714, D_802475E8_8E16E8, D_802475BC_8E16BC, D_80247590_8E1690, D_80247564_8E1664, D_80247538_8E1638, D_8024750C_8E160C, D_802474E0_8E15E0, D_802474B4_8E15B4, D_80247488_8E1588, D_8024745C_8E155C, D_80247430_8E1530, D_80247404_8E1504, D_802473D8_8E14D8, D_802473AC_8E14AC, D_80247380_8E1480, D_80247354_8E1454, D_80247328_8E1428, D_802472FC_8E13FC, D_802472D0_8E13D0, D_802472A4_8E13A4, D_80247278_8E1378, D_8024724C_8E134C, D_80247220_8E1320, D_802471F4_8E12F4, D_802471C8_8E12C8, D_8024719C_8E129C, D_80247170_8E1270, D_80247144_8E1244, D_80247118_8E1218, D_802470EC_8E11EC, D_802470C0_8E11C0, D_80247094_8E1194, D_80247068_8E1168, D_8024703C_8E113C, D_80247010_8E1110, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050001, 0x00000000, 0x00000008, 0x00010000, 0x00000000, 0x00110001, 0x00B600B6, 0x00B60005, 0x00020000, 0x00000000, 0x00080002, 0x00000000, 0x00000011, 0x000200B6, 0x00B600B6, 0x00050003, 0x00001FFF, 0x00000008, 0x0003FF04, 0x00D4FFB0, 0x00110003, 0x00B600B6, 0x00B60005, 0x00040000, func_E0010000, 0x00080004, 0x007AFF2C, 0x00EB0011, 0x000400B6, 0x00B600B6, 0x00050005, 0x0000CAAC, 0x00000008, 0x0005FE88, 0x00CEFFAE, 0x00110005, 0x00B600B6, 0x00B60005, 0x00060000, 0x35540000, 0x00080006, 0x00B0FF32, 0xFEAA0011, 0x000600B6, 0x00B600B6, 0x00050007, 0x0000F556, 0x00000008, 0x0007FEA9, 0x014FFFC8, 0x00110007, 0x00B600B6, 0x00B60005, 0x00080000, 0x0AAA0000, 0x00080008, 0x015AFEB1, 0xFFDE0011, 0x000800B6, 0x00B600B6, 0x00050009, 0x00000907, 0x00000008, 0x0009FEC9, 0x0176FF7F, 0x00110009, 0x00B600B6, 0x00B60005, 0x000A0000, 0x00000000, 0x0008000A, 0x00030000, 0x00570011, 0x000A00B6, 0x00B600B6, 0x0005000B, 0x00007E77, 0x00000008, 0x000B0000, 0x00000011, 0x0011000B, 0x00B600B6, 0x00B60005, 0x000C0000, 0x81890000, 0x0008000C, 0x0008001A, 0x00680011, 0x000C00B6, 0x00B600B6, 0x0005000D, 0x00000000, 0x00000008, 0x000D0000, 0x00000000, 0x0011000D, 0x00B600B6, 0x00B60005, 0x000E0000, 0xF6F90000, 0x0008000E, 0x0114FE6F, 0x00C20011, 0x000E00B6, 0x00B600B6, 0x0005000F, 0x00000000, 0x00000008, 0x000F0000, 0x00000000, 0x0011000F, 0x00B600B6, 0x00B60005, 0x00100000, 0x00000000, 0x00080010, 0x00000000, 0x00000011, 0x001000B6, 0x00B600B6, 0x00050011, 0x00000000, 0x00000008, 0x0011FEFD, 0x0177FF41, 0x00110011, 0x00B600B6, 0x00B60005, 0x00120000, 0x00000000, 0x00080012, 0x00000000, 0x00000011, 0x001200B6, 0x00B600B6, 0x00050013, 0x00000000, 0x00000008, 0x0013FEFD, 0x0177FF41, 0x00110013, 0x00B600B6, 0x00B60005, 0x00140000, 0x00000000, 0x00080014, 0x00000000, 0x00000011, 0x001400B6, 0x00B600B6, 0x00050015, 0x00000000, 0x00000008, 0x0015FF07, 0x0177FF41, 0x00110015, 0x00B600B6, 0x00B60005, 0x00160000, 0x00000000, 0x00080016, 0x00000000, 0x00000011, 0x001600B6, 0x00B600B6, 0x00050017, 0x00000000, 0x00000008, 0x0017FFE2, 0x0014FFE2, 0x00110017, 0x00B600B6, 0x00B60005, 0x00180000, 0xF1C80000, 0x00080018, 0xFEF10000, 0x00350011, 0x001800B6, 0x00B600B6, 0x00050019, 0x00000000, 0x00000008, 0x00190000, 0xFFEC0035, 0x00110019, 0x00B600B6, 0x00B60005, 0x001A0000, 0x00000000, 0x0008001A, 0x0000FFEC, 0x00000011, 0x001A00B6, 0x00B600B6, 0x0005001B, 0x0000238D, 0x00000008, 0x001BFEF1, 0x00000035, 0x0011001B, 0x00B600B6, 0x00B60005, 0x001C0000, 0x3FFF0000, 0x0008001C, 0x0000FFEC, 0x00350011, 0x001C00B6, 0x00B600B6, 0x0005001D, 0x00000000, 0x00000008, 0x001D0000, 0xFFEC0000, 0x0011001D, 0x00B600B6, 0x00B60005, 0x001E0000, 0x35540000, 0x0008001E, 0xFEF10000, 0x00350011, 0x001E00B6, 0x00B600B6, 0x0005001F, 0x00000000, 0x00000008, 0x001F0000, 0xFFEC0035, 0x0011001F, 0x00B600B6, 0x00B60005, 0x00200000, 0x00000000, 0x00080020, 0x0000FFEC, 0x00000011, 0x002000B6, 0x00B600B6, 0x00050021, 0x0000071C, 0x00000008, 0x0021FEF1, 0x00000035, 0x00110021, 0x00B600B6, 0x00B60005, 0x00220000, 0x00000000, 0x00080022, 0x0000FFEC, 0x00350011, 0x002200B6, 0x00B600B6, 0x00050023, 0x00000000, 0x00000008, 0x00230000, 0xFFEC0000, 0x00110023, 0x00B600B6, 0x00B60005, 0x00240000, 0x00000000, 0x00080024, 0xFEF10000, 0x00350011, 0x002400B6, 0x00B600B6, 0x00050025, 0x00000000, 0x00000008, 0x00250000, 0xFFEC0035, 0x00110025, 0x00B600B6, 0x00B60005, 0x00260000, 0x00000000, 0x00080026, 0x0000FFEC, 0x00000011, 0x002600B6, 0x00B600B6, 0x00050027, 0x00000000, 0x00000008, 0x00270000, 0x00000000, 0x00110027, 0x00B600B6, 0x00B60005, 0x00280000, 0xC0010000, 0x00080028, 0xFEF30000, 0x00BA0011, 0x002800B6, 0x00B600B6, 0x00050029, 0x00000000, 0x00000008, 0x0029FEFD, 0x01770000, 0x00110029, 0x00B600B6, 0x00B60005, 0x002A0000, 0x00000000, 0x0008002A, 0x00000000, 0x00000011, 0x002A00B6, 0x00B600B6, 0x0005002B, 0x0000C001, 0x00000008, 0x002BFED4, 0x000000C9, 0x0011002B, 0x00B600B6, 0x00B60005, 0x002C0000, 0x00000000, 0x0008002C, 0xFEFD0177, 0x00000011, 0x002C00B6, 0x00B600B6, 0x0005002D, 0x00000000, 0x00000008, 0x002D0000, 0x00000000, 0x0011002D, 0x00B600B6, 0x00B60005, 0x002E0000, 0xC0010000, 0x0008002E, 0xFEE00000, 0x00CC0011, 0x002E00B6, 0x00B600B6, 0x0005002F, 0x00000000, 0x00000008, 0x002FFEFD, 0x01770000, 0x0011002F, 0x00B600B6, 0x00B60005, 0x00300000, 0x00000000, 0x00080030, 0x00000000, 0x00000011, 0x003000B6, 0x00B600B6, 0x00050031, 0x00000000, 0x00000008, 0x00310000, 0x00000000, 0x00110031, 0x00B600B6, 0x00B60005, 0x00320000, func_E0010000, 0x00080032, 0xFFC60000, 0x00370011, 0x003200B6, 0x00B600B6, 0x00050033, 0x00000000, 0x00000008, 0x0033FEFD, 0x01770000, 0x00110033, 0x00B600B6, 0x00B60005, 0x00340000, 0x00000000, 0x00080034, 0x00000000, 0x00000011, 0x003400B6, 0x00B600B6, 0x00050035, 0x0000E001, 0x00000008, 0x0035FFCB, 0x00000048, 0x00110035, 0x00B600B6, 0x00B60005, 0x00360000, 0x00000000, 0x00080036, 0xFEFD0177, 0x00000011, 0x003600B6, 0x00B600B6, 0x00050037, 0x00000000, 0x00000008, 0x00370000, 0x00000000, 0x00110037, 0x00B600B6, 0x00B60005, 0x00380000, func_E0010000, 0x00080038, 0xFFBD0000, 0x00560011, 0x003800B6, 0x00B600B6, 0x00050039, 0x00000000, 0x00000008, 0x0039FEFD, 0x01770000, 0x00110039, 0x00B600B6, 0x00B60005, 0x003A0000, 0x00000000, 0x0008003A, 0x00000000, 0x00000011, 0x003A00B6, 0x00B600B6, 0x0005003B, 0x00000907, 0x00000008, 0x003BFEF6, 0x0000FF9D, 0x0011003B, 0x00B600B6, 0x00B60005, 0x003C0000, 0x00000000, 0x0008003C, 0x00000000, 0x00000011, 0x003C00B6, 0x00B600B6, 0x0005003D, 0x00000000, 0x00000008, 0x003D0000, 0x00000000, 0x0011003D, 0x00B600B6, 0x00B60005, 0x003E0000, 0x41990000, 0x0008003E, 0x0023006A, 0xFFD70011, 0x003E00B6, 0x00B600B6, 0x0005003F, 0x0000B560, 0x00000008, 0x003FFF33, 0xFF9600C2, 0x0011003F, 0x00B600B6, 0x00B60005, 0x00400000, 0x16EE0000, 0x00080040, 0x0001006A, 0x00170011, 0x004000B6, 0x00B600B6, 0x00050041, 0x0000E00A, 0x00000008, 0x00410081, 0xFF9600EE, 0x00110041, 0x00B600B6, 0x00B60005, 0x00420000, 0xEC450000, 0x00080042, 0xFFB9006A, 0x001A0011, 0x004200B6, 0x00B600B6, 0x00050043, 0x00000AB3, 0x00000008, 0x0043014E, 0xFF96FFE3, 0x00110043, 0x00B600B6, 0x00B60005, 0x00440000, 0xC19B0000, 0x00080044, 0xFF92006A, 0xFFDD0011, 0x004400B6, 0x00B600B6, 0x00050045, 0x0000355E, 0x00000008, 0x004500CD, 0xFF96FEAC, 0x00110045, 0x00B600B6, 0x00B60005, 0x00460000, 0x6C430000, 0x00080046, 0xFFFD006A, 0xFF990011, 0x004600B6, 0x00B600B6, 0x00050047, 0x00008AB5, 0x00000008, 0x0047FEB2, 0xFF96FF8C, 0x00110047, 0x00B600B6, 0x00B60005, 0x00480000, 0x96F00000, 0x00080048, 0xFFB4006A, 0xFF9C0011, 0x004800B6, 0x00B600B6, 0x00050049, 0x00006008, 0x00000008, 0x0049FF7F, 0xFF96FE80, 0x00110049, 0x00B600B6, 0x00B60005, 0x004A0000, 0x00000000, 0x0008004A, 0x00000000, 0x00000011, 0x004A00B6, 0x00B600B6, 0x0005004B, 0x00004199, 0x00000008, 0x004B0024, 0x00C4FFD7, 0x0011004B, 0x00B600B6, 0x00B60005, 0x004C0000, 0xB5600000, 0x0008004C, 0xFF33FF3C, 0x00C10011, 0x004C00B6, 0x00B600B6, 0x0005004D, 0x000016EE, 0x00000008, 0x004D0002, 0x00C40018, 0x0011004D, 0x00B600B6, 0x00B60005, 0x004E0000, quizmo_answer_main, 0x0008004E, 0x0081FF3C, 0x00ED0011, 0x004E00B6, 0x00B600B6, 0x0005004F, 0x0000EC45, 0x00000008, 0x004FFFB9, 0x00C4001B, 0x0011004F, 0x00B600B6, 0x00B60005, 0x00500000, 0x0AB30000, 0x00080050, 0x014EFF3C, 0xFFE20011, 0x005000B6, 0x00B600B6, 0x00050051, 0x0000C19B, 0x00000008, 0x0051FF91, 0x00C4FFDD, 0x00110051, 0x00B600B6, 0x00B60005, 0x00520000, 0x355E0000, 0x00080052, 0x00CDFF3C, 0xFEAB0011, 0x005200B6, 0x00B600B6, 0x00050053, 0x000096F0, 0x00000008, 0x0053FFB3, 0x00C4FF9B, 0x00110053, 0x00B600B6, 0x00B60005, 0x00540000, 0x60080000, 0x00080054, 0xFF7FFF3C, 0xFE7F0011, 0x005400B6, 0x00B600B6, 0x00050055, 0x00006C43, 0x00000008, 0x0055FFFD, 0x00C4FF99, 0x00110055, 0x00B600B6, 0x00B60005, 0x00560000, 0x8AB50000, 0x00080056, 0xFEB2FF3C, 0xFF8B0011, 0x005600B6, 0x00B600B6, 0x00050057, 0x00000000, 0x00000008, 0x00570000, 0x00000000, 0x00110057, 0x00B600B6, 0x00B60005, 0x00580000, 0x41990000, 0x00080058, 0x002400C4, 0xFFD70011, 0x005800B6, 0x00B600B6, 0x00050059, 0x00000000, 0x00000008, 0x00590000, 0x00590000, 0x00110059, 0x00B600B6, 0x00B60005, 0x005A0000, 0xB5600000, 0x0008005A, 0xFF33FEE3, 0x00C00011, 0x005A00B6, 0x00B600B6, 0x0005005B, 0x000016EE, 0x00000008, 0x005B0002, 0x00C40018, 0x0011005B, 0x00B600B6, 0x00B60005, 0x005C0000, 0x00000000, 0x0008005C, 0x00000059, 0x00000011, 0x005C00B6, 0x00B600B6, 0x0005005D, 0x0000E00A, 0x00000008, 0x005D0081, 0xFEE300EC, 0x0011005D, 0x00B600B6, 0x00B60005, 0x005E0000, 0xEC450000, 0x0008005E, 0xFFB900C4, 0x001B0011, 0x005E00B6, 0x00B600B6, 0x0005005F, 0x00000000, 0x00000008, 0x005F0000, 0x00590000, 0x0011005F, 0x00B600B6, 0x00B60005, 0x00600000, 0x0AB30000, 0x00080060, 0x014EFEE3, 0xFFE10011, 0x006000B6, 0x00B600B6, 0x00050061, 0x0000C19B, 0x00000008, 0x0061FF91, 0x00C4FFDD, 0x00110061, 0x00B600B6, 0x00B60005, 0x00620000, 0x00000000, 0x00080062, 0x00000059, 0x00000011, 0x006200B6, 0x00B600B6, 0x00050063, 0x0000355E, 0x00000008, 0x006300CD, 0xFEE3FEAA, 0x00110063, 0x00B600B6, 0x00B60005, 0x00640000, 0x96F00000, 0x00080064, 0xFFB300C4, 0xFF9B0011, 0x006400B6, 0x00B600B6, 0x00050065, 0x00000000, 0x00000008, 0x00650000, 0x00590000, 0x00110065, 0x00B600B6, 0x00B60005, 0x00660000, 0x60080000, 0x00080066, 0xFF7FFEE3, 0xFE7E0011, 0x006600B6, 0x00B600B6, 0x00050067, 0x00006C43, 0x00000008, 0x0067FFFD, 0x00C4FF99, 0x00110067, 0x00B600B6, 0x00B60005, 0x00680000, 0x00000000, 0x00080068, 0x00000059, 0x00000011, 0x006800B6, 0x00B600B6, 0x00050069, 0x00008AB5, 0x00000008, 0x0069FEB2, 0xFEE3FF8A, 0x00110069, 0x00B600B6, 0x00B60001, 0x00010005, 0x000D0000, 0x00040000, 0x00080015, 0xFF090177, 0xFF410001, 0x00010005, 0x000D0000, 0x00100000, 0x00080015, 0xFF0A0177, 0xFF410001, 0x00010005, 0x000D0000, 0x00240000, 0x00080015, 0xFF0B0177, 0xFF410001, 0x00010005, 0x000D0000, 0x00400000, 0x00080015, 0xFF0C0177, 0xFF410001, 0x00010008, 0x000B0000, 0x00000012, 0x0005000D, 0x00000065, 0x00000008, 0x0015FF0D, 0x0177FF41, 0x00010001, 0x0005000D, 0x00000091, 0x00000001, 0x00010005, 0x000D0000, 0x00C50000, 0x00080015, 0xFF0E0177, 0xFF410001, 0x00010005, 0x000D0000, 0x01010000, 0x00080015, 0xFF0F0176, 0xFF410001, 0x00010008, 0x000B0000, 0x00000013, 0x0005000D, 0x00000145, 0x00000001, 0x00010005, 0x000D0000, 0x01910000, 0x00080011, 0xFF070177, 0xFF410008, 0x0015FF10, 0x0175FF41, 0x00010001, 0x0005000D, 0x000001E4, 0x00000008, 0x0011FF09, 0x0177FF41, 0x00080015, 0xFF100173, 0xFF410001, 0x00010008, 0x000B0000, 0x00000014, 0x0005000D, 0x0000023F, 0x00000008, 0x0011FF0A, 0x0177FF41, 0x00080015, 0xFF100171, 0xFF410001, 0x00010005, 0x000D0000, 0x02A10000, 0x00080011, 0xFF0B0177, 0xFF410008, 0x0015FF10, 0x016EFF41, 0x00010001, 0x0008000B, 0x00000000, 0x00150005, 0x000D0000, 0x030B0000, 0x00080011, 0xFF0C0177, 0xFF410008, 0x0015FF10, 0x016BFF41, 0x00010001, 0x0005000D, 0x0000037D, 0x00000008, 0x0011FF0D, 0x0177FF41, 0x00080013, 0xFF070177, 0xFF410008, 0x0015FF10, 0x0168FF41, 0x00010001, 0x0008000B, 0x00000000, 0x00160005, 0x000D0000, 0x03F60000, 0x00080013, 0xFF080177, 0xFF410008, 0x0015FF10, 0x0164FF41, 0x00010001, 0x0005000D, 0x00000476, 0x00000008, 0x0011FF0E, 0x0177FF41, 0x00080013, 0xFF090177, 0xFF410008, 0x0015FF10, 0x0160FF41, 0x00010001, 0x0008000B, 0x00000000, 0x00170005, 0x000D0000, 0x04FE0000, 0x00080011, 0xFF0F0176, 0xFF410008, 0x0013FF0A, 0x0177FF41, 0x00080015, 0xFF10015B, 0xFF410001, 0x00010008, 0x000B0000, 0x00000018, 0x0005000D, 0x0000058D, 0x00000008, 0x0013FF0B, 0x0177FF41, 0x00080015, 0xFF100156, 0xFF410001, 0x00010008, 0x000B0000, 0x00000019, 0x0005000D, 0x00000624, 0x00000008, 0x0011FF10, 0x0175FF41, 0x00080015, 0xFF0F0150, 0xFF410008, 0x0033FF07, 0x01770000, 0x00010001, 0x0005000D, 0x000006C1, 0x00000008, 0x0011FF10, 0x0173FF41, 0x00080013, 0xFF0C0177, 0xFF410008, 0x0015FF0F, 0x014AFF41, 0x00080033, 0xFF090177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001A, 0x0005000D, 0x00000766, 0x00000008, 0x0011FF10, 0x0171FF41, 0x00080013, 0xFF0D0177, 0xFF410008, 0x0015FF0E, 0x0144FF41, 0x00080033, 0xFF0B0177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001B, 0x0005000D, 0x00000812, 0x00000008, 0x0011FF10, 0x016EFF41, 0x00080013, 0xFF0E0176, 0xFF410008, 0x0015FF0E, 0x013DFF41, 0x00080033, 0xFF0D0177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001C, 0x0005000D, 0x000008C4, 0x00000008, 0x0011FF10, 0x016BFF41, 0x00080013, 0xFF0F0176, 0xFF410008, 0x0015FF0D, 0x0136FF41, 0x00080033, 0xFF0F0177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001D, 0x0005000D, 0x0000097E, 0x00000008, 0x0011FF10, 0x0168FF41, 0x00080013, 0xFF100175, 0xFF410008, 0x0015FF0C, 0x012EFF41, 0x00080033, 0xFF110177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001E, 0x0005000D, 0x00000A3F, 0x00000008, 0x0011FF10, 0x0164FF41, 0x00080013, 0xFF100173, 0xFF410008, 0x0015FF0B, 0x0126FF41, 0x00080033, 0xFF120177, 0x00000001, 0x00010008, 0x000B0000, 0x0000001F, 0x0005000D, 0x00000B07, 0x00000008, 0x0011FF10, 0x0160FF41, 0x00080013, 0xFF110171, 0xFF410008, 0x0015FF0A, 0x011EFF41, 0x00080033, 0xFF130177, 0x00000001, 0x00010008, 0x000B0000, 0x00000020, 0x0005000D, 0x00000BD6, 0x00000008, 0x0011FF10, 0x015BFF41, 0x00080013, 0xFF12016F, 0xFF410008, 0x0015FF09, 0x0115FF41, 0x00080033, 0xFF140176, 0x00000001, 0x00010008, 0x000B0000, 0x00000021, 0x0005000D, 0x00000CAB, 0x00000008, 0x0011FF10, 0x0156FF41, 0x00080013, 0xFF13016C, 0xFF410008, 0x0015FF08, 0x010CFF41, 0x00080033, 0xFF150176, 0x00000001, 0x00010008, 0x000B0000, 0x00000022, 0x0005000D, 0x00000D87, 0x00000008, 0x0011FF0F, 0x0150FF41, 0x00080013, 0xFF140168, 0xFF410008, 0x0015FF07, 0x0102FF41, 0x00080033, 0xFF160175, 0x00000001, 0x00010008, 0x000B0000, 0x00000024, 0x0005000D, 0x00000E6A, 0x00000008, 0x0011FF0F, 0x014AFF41, 0x00080013, 0xFF140165, 0xFF410005, 0x00150000, 0x0000FBBC, 0x00080015, 0xFF1100F8, 0xFF410008, 0x0033FF16, 0x01730000, 0x00010001, 0x0008000B, 0x00000000, 0x00250005, 0x000D0000, 0x0F540000, 0x00080011, 0xFF0E0144, 0xFF410008, 0x0013FF15, 0x0160FF41, 0x00050015, 0x00000000, 0xF7780008, 0x0015FF1A, 0x00EEFF41, 0x00080033, 0xFF170171, 0x00000001, 0x00010008, 0x000B0000, 0x00000026, 0x0005000D, 0x00001044, 0x00000008, 0x0011FF0E, 0x013DFF41, 0x00080013, 0xFF16015C, 0xFF410005, 0x00150000, 0x0000F334, 0x00080015, 0xFF2200E3, 0xFF410008, 0x0033FF17, 0x016F0000, 0x00010001, 0x0008000B, 0x00000000, 0x00270005, 0x000D0000, 0x113B0000, 0x00080011, 0xFF0D0136, 0xFF410008, 0x0013FF17, 0x0157FF41, 0x00050015, 0x00000000, 0xEEF00008, 0x0015FF2A, 0x00D8FF41, 0x00080033, 0xFF17016C, 0x00000001, 0x00010008, 0x000B0000, 0x00000029, 0x0005000D, 0x00001238, 0x00000008, 0x0011FF0C, 0x012EFF41, 0x00080013, 0xFF180151, 0xFF410005, 0x00150000, 0x0000EAAB, 0x00080015, 0xFF3200CD, 0xFF410008, 0x0033FF17, 0x01680000, 0x00010001, 0x0008000B, 0x00000000, 0x002A0005, 0x000D0000, 0x133C0000, 0x00080011, 0xFF0B0126, 0xFF410008, 0x0013FF19, 0x014CFF41, 0x00050015, 0x00000000, 0xE6670008, 0x0015FF39, 0x00C1FF41, 0x00080033, 0xFF170165, 0x00000001, 0x00010008, 0x000B0000, 0x0000002C, 0x0005000D, 0x00001446, 0x00000008, 0x0011FF0A, 0x011EFF41, 0x00080013, 0xFF190145, 0xFF410005, 0x00150000, 0x0000E223, 0x00080015, 0xFF4000B5, 0xFF410008, 0x0033FF17, 0x01610000, 0x00010001, 0x0008000B, 0x00000000, 0x002D0005, 0x000D0000, 0x15560000, 0x00080011, 0xFF090115, 0xFF410008, 0x0013FF1A, 0x013FFF41, 0x00050015, 0x00000000, 0xDDDF0008, 0x0015FF46, 0x00A8FF41, 0x00080033, 0xFF16015C, 0x00000001, 0x00010008, 0x000B0000, 0x0000002F, 0x0005000D, 0x0000166D, 0x00000008, 0x0011FF08, 0x010CFF41, 0x00080013, 0xFF1B0138, 0xFF410005, 0x00150000, 0x0000D99A, 0x00080015, 0xFF4B009B, 0xFF410008, 0x0033FF16, 0x01570000, 0x00010001, 0x0008000B, 0x00000000, 0x00300005, 0x000D0000, 0x178A0000, 0x00080011, 0xFF070102, 0xFF410008, 0x0013FF1C, 0x0130FF41, 0x00050015, 0x00000000, 0xD5560008, 0x0015FF51, 0x008EFF41, 0x00080033, 0xFF150151, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000032, 0x0005000D, 0x000018AE, 0x00000005, 0x00110000, 0x0000DDDF, 0x00080011, 0xFF1100F8, 0xFF410008, 0x0013FF1D, 0x0128FF41, 0x00050015, 0x00000000, 0xD1120008, 0x0015FF56, 0x0080FF41, 0x00080033, 0xFF14014B, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000034, 0x0005000D, 0x000019D7, 0x00000005, 0x00110000, 0x0000BBBD, 0x00080011, 0xFF1A00EE, 0xFF410008, 0x0013FF1D, 0x0120FF41, 0x00050015, 0x00000000, 0xCCCE0008, 0x0015FF5A, 0x0072FF41, 0x00080033, 0xFF130145, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000036, 0x0005000D, 0x00001B07, 0x00000005, 0x00110000, 0x0000999B, 0x00080011, 0xFF2200E3, 0xFF410008, 0x0013FF1E, 0x0117FF41, 0x00050015, 0x00000000, 0xC8890008, 0x0015FF5E, 0x0064FF41, 0x00080033, 0xFF12013E, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000037, 0x0005000D, 0x00001C3D, 0x00000005, 0x00110000, 0x00007776, 0x00080011, 0xFF2A00D8, 0xFF410008, 0x0013FF1F, 0x010EFF41, 0x00050015, 0x00000000, 0xC4450008, 0x0015FF62, 0x0055FF41, 0x00080033, 0xFF110137, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000039, 0x0005000D, 0x00001D79, 0x00000005, 0x00110000, 0x00005554, 0x00080011, 0xFF3200CD, 0xFF410008, 0x0013FF20, 0x0105FF41, 0x00050015, 0x00000000, 0xC0010008, 0x0015FF65, 0x0046FF41, 0x00080033, 0xFF10012F, 0x00000008, 0x0039FF07, 0x01770000, 0x00010001, 0x0008000B, 0xFFFF0000, 0x003B0005, 0x000D0000, 0x1EBA0000, 0x00050011, 0x00000000, 0x33320008, 0x0011FF39, 0x00C1FF41, 0x00080013, 0xFF2100FB, 0xFF410005, 0x00150000, 0x0000BBBD, 0x00080015, 0xFF680037, 0xFF410008, 0x0033FF0E, 0x01270000, 0x00080039, 0xFF090177, 0x00000001, 0x00010008, 0x000BFFFF, 0x0000003D, 0x0005000D, 0x00002002, 0x00000005, 0x00110000, 0x00001110, 0x00080011, 0xFF4000B5, 0xFF410008, 0x0013FF22, 0x00F1FF41, 0x00050015, 0x00000000, 0xB7790008, 0x0015FF6B, 0x0028FF41, 0x00080033, 0xFF0D011F, 0x00000008, 0x0039FF0B, 0x01770000, 0x00010001, 0x0008000B, 0xFFFF0000, 0x003F0005, 0x000D0000, 0x21500000, 0x00050011, 0x00000000, 0xEEF00008, 0x0011FF46, 0x00A8FF41, 0x00080013, 0xFF2200E6, 0xFF410005, 0x00150000, 0x0000B334, 0x00080015, 0xFF6E0018, 0xFF410008, 0x0033FF0B, 0x01160000, 0x00080039, 0xFF0D0177, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000041, 0x0005000D, 0x000022A3, 0x00000005, 0x00110000, 0x0000CCCE, 0x00080011, 0xFF4B009B, 0xFF410008, 0x0013FF23, 0x00DBFF41, 0x00050015, 0x00000000, 0xAEF00008, 0x0015FF70, 0x0007FF41, 0x00080033, 0xFF09010D, 0x00000008, 0x0039FF0F, 0x01770000, 0x00010001, 0x0008000B, 0xFFFF0000, 0x00430005, 0x000D0000, 0x23FC0000, 0x00050011, 0x00000000, 0xAAAC0008, 0x0011FF51, 0x008EFF41, 0x00080013, 0xFF2400CF, 0xFF410005, 0x00150000, 0x0000AAAC, 0x00080015, 0xFF72FFF8, 0xFF410008, 0x0033FF07, 0x01030000, 0x00080039, 0xFF110177, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000046, 0x0005000D, 0x0000255B, 0x00000005, 0x00110000, 0x0000888A, 0x00080011, 0xFF560080, 0xFF410008, 0x0013FF25, 0x00C4FF41, 0x00050015, 0x00000000, 0xA6680008, 0x0015FF73, 0xFFE7FF41, 0x00050033, 0x00000000, 0xFDDE0008, 0x0033FF18, 0x00F90000, 0x00080039, 0xFF120177, 0x00000001, 0x00010008, 0x000BFFFF, 0x00000048, 0x0005000D, 0x000026C0, 0x00000005, 0x00110000, 0x00006665, 0x00080011, 0xFF5A0072, 0xFF410008, 0x0013FF26, 0x00B8FF41, 0x00050015, 0x00000000, 0xA2230008, 0x0015FF75, 0xFFD6FF41, 0x00050033, 0x00000000, 0xFBBC0008, 0x0033FF28, 0x00EE0000, 0x00080039, 0xFF130177, 0x00000001, 0x00010008, 0x000BFFFF, 0x0000004A, 0x0005000D, 0x0000282A, 0x00000005, 0x00110000, 0x00004443, 0x00080011, 0xFF5E0064, 0xFF410008, 0x0013FF26, 0x00ABFF41, 0x00050015, 0x00000000, 0x9DDF0008, 0x0015FF76, 0xFFC4FF41, 0x00050033, 0x00000000, 0xF99A0008, 0x0033FF37, 0x00E30000, 0x00080039, 0xFF140176, 0x00000001, 0x00010008, 0x000BFFFF, 0x0000004C, 0x0005000D, 0x0000299A, 0x00000005, 0x00110000, 0x00002221, 0x00080011, 0xFF620055, 0xFF410008, 0x0013FF27, 0x009EFF41, 0x00050015, 0x00000000, 0x999B0008, 0x0015FF77, 0xFFB3FF41, 0x00050033, 0x00000000, 0xF7780008, 0x0033FF45, 0x00D80000, 0x00080039, 0xFF150176, 0x00000001, 0x00010008, 0x000BFFFE, 0x0000004F, 0x0005000D, 0x00002B10, 0x00000005, 0x00110000, 0x00000000, 0x00080011, 0xFF650046, 0xFF410008, 0x0013FF28, 0x0091FF41, 0x00050015, 0x00000000, 0x95570008, 0x0015FF78, 0xFFA0FF41, 0x00050033, 0x00000000, 0xF5560008, 0x0033FF52, 0x00CC0000, 0x00080039, 0xFF160175, 0x00000001, 0x00010008, 0x000BFFFE, 0x00000051, 0x0005000D, 0x00002C8A, 0x00000005, 0x00110000, 0x0000DDDF, 0x00080011, 0xFF680037, 0xFF410005, 0x00130000, 0x0000F8B0, 0x00080013, 0xFF2B009E, 0xFF410005, 0x00150000, 0x00009112, 0x00080015, 0xFF78FF8E, 0xFF410005, 0x00330000, 0x0000F334, 0x00080033, 0xFF5E00C0, 0x00000008, 0x0039FF16, 0x01730000, 0x00010001, 0x0008000B, 0xFFFE0000, 0x00540005, 0x000D0000, 0x2E0B0000, 0x00050011, 0x00000000, 0xBBBD0008, 0x0011FF6B, 0x0028FF41, 0x00050013, 0x00000000, 0xF1600008, 0x0013FF2F, 0x00A8FF41, 0x00050015, 0x00000000, 0x8CCE0008, 0x0015FF79, 0xFF7BFF41, 0x00050033, 0x00000000, 0xF1120008, 0x0033FF6A, 0x00B30000, 0x00080039, 0xFF170171, 0x00000001, 0x00010008, 0x000BFFFE, 0x00000056, 0x0005000D, 0x00002F91, 0x00000005, 0x00110000, 0x0000999B, 0x00080011, 0xFF6E0018, 0xFF410005, 0x00130000, 0x0000EA0F, 0x00080013, 0xFF3200AF, 0xFF410005, 0x00150000, 0x0000888A, 0x00080015, 0xFF79FF69, 0xFF410005, 0x00330000, 0x0000EEF0, 0x00080033, 0xFF7400A6, 0x00000008, 0x0039FF17, 0x016F0000, 0x00010001, 0x0008000B, 0xFFFE0000, 0x00590005, 0x000D0000, 0x311C0000, 0x00050011, 0x00000000, 0x77760008, 0x0011FF70, 0x0007FF41, 0x00050013, 0x00000000, 0xE2BF0008, 0x0013FF35, 0x00B3FF41, 0x00050015, 0x00000000, 0x84460008, 0x0015FF79, 0xFF55FF41, 0x00050033, 0x00000000, 0xECCD0008, 0x0033FF7E, 0x00980000, 0x00080039, 0xFF17016C, 0x00000001, 0x00010008, 0x000BFFFE, 0x0000005B, 0x0005000D, 0x000032AC, 0x00000005, 0x00110000, 0x00005554, 0x00080011, 0xFF72FFF8, 0xFF410005, 0x00130000, 0x0000DB6F, 0x00080013, 0xFF3900B4, 0xFF410005, 0x00150000, 0x00008001, 0x00080015, 0xFF79FF42, 0xFF410005, 0x00330000, 0x0000EAAB, 0x00080033, 0xFF87008A, 0x00000008, 0x0036FF07, 0x01770000, 0x00080039, 0xFF170168, 0x00000001, 0x00010005, 0x000A000C, 0x00000000, 0x0008000B, 0xFFFE0000, 0x005E0005, 0x000D0000, 0x34420000, 0x00050011, 0x00000000, 0x33320008, 0x0011FF73, 0xFFE7FF41, 0x00050013, 0x00000000, 0xD41E0008, 0x0013FF3C, 0x00B1FF41, 0x00080015, 0xFF79FF2E, 0xFF410005, 0x00330000, 0x0000E889, 0x00080033, 0xFF90007C, 0x00000008, 0x0036FF08, 0x01770000, 0x00080039, 0xFF170165, 0x00000001, 0x00010005, 0x000A0032, 0x00000000, 0x0008000B, 0xFFFE0000, 0x00610005, 0x000D0000, 0x35DC0000, 0x00050011, 0x00000000, 0x11100008, 0x0011FF75, 0xFFD6FF41, 0x00050013, 0x00000000, 0xCCCE0008, 0x0013FF3F, 0x00ABFF41, 0x00080015, 0xFF79FF1A, 0xFF410005, 0x00330000, 0x0000E667, 0x00080033, 0xFF98006D, 0x00000008, 0x0036FF09, 0x01770000, 0x00080039, 0xFF170161, 0x00000001, 0x00010005, 0x000A0071, 0x00000000, 0x0008000B, 0xFFFE0000, 0x00640005, 0x000D0000, 0x377C0000, 0x00050011, 0x00000000, 0xEEF00008, 0x0011FF76, 0xFFC4FF41, 0x00050013, 0x00000000, 0xC57D0008, 0x0013FF43, 0x00A1FF41, 0x00080015, 0xFF79FF06, 0xFF410005, 0x00330000, 0x0000E445, 0x00080033, 0xFF9F005E, 0x00000008, 0x0039FF16, 0x015C0000, 0x00010001, 0x0005000A, 0x00CA0000, 0x00000008, 0x000BFFFE, 0x00000066, 0x0005000D, 0x00003921, 0x00000005, 0x00110000, 0x0000CCCE, 0x00080011, 0xFF77FFB3, 0xFF410005, 0x00130000, 0x0000BE2D, 0x00080013, 0xFF460095, 0xFF410008, 0x0015FF79, 0xFEF1FF41, 0x00050033, 0x00000000, 0xE2230008, 0x0033FFA6, 0x004F0000, 0x00080036, 0xFF0A0177, 0x00000008, 0x0039FF16, 0x01570000, 0x00010001, 0x0005000A, 0x013D0000, 0x00000008, 0x000BFFFD, 0x00000069, 0x0005000D, 0x00003ACC, 0x00000005, 0x00110000, 0x0000AAAC, 0x00080011, 0xFF78FFA0, 0xFF410005, 0x00130000, 0x0000B6DC, 0x00080013, 0xFF490085, 0xFF410008, 0x0015FF79, 0xFEDCFF41, 0x00080029, 0xFF070177, 0x00000005, 0x00330000, 0x0000E001, 0x00080033, 0xFFAB003F, 0x00000008, 0x0036FF0B, 0x01770000, 0x00080039, 0xFF150151, 0x00000001, 0x00010005, 0x000A01CB, 0x00000000, 0x0008000B, 0xFFFD0000, 0x006C0005, 0x000D0000, 0x3C7B0000, 0x00050011, 0x00000000, 0x888A0008, 0x0011FF78, 0xFF8EFF41, 0x00050013, 0x00000000, 0xAF8C0008, 0x0013FF4D, 0x0071FF41, 0x00080015, 0xFF79FEC7, 0xFF410008, 0x0029FF09, 0x01770000, 0x00050033, 0x00000000, 0xDDDF0008, 0x0033FFB1, 0x002E0000, 0x00080036, 0xFF0C0177, 0x00000008, 0x0039FF14, 0x014B0000, 0x00010001, 0x0005000A, 0x02740000, 0x00000008, 0x000BFFFD, 0x0000006F, 0x0005000D, 0x00003E2F, 0x00000005, 0x00110000, 0x00006665, 0x00080011, 0xFF79FF7B, 0xFF410005, 0x00130000, 0x0000A83C, 0x00080013, 0xFF50005A, 0xFF410008, 0x0015FF79, 0xFEB2FF41, 0x00080029, 0xFF0B0177, 0x00000005, 0x00330000, 0x0000DBBD, 0x00080033, 0xFFB6001D, 0x00000008, 0x0039FF13, 0x01450000, 0x00010001, 0x0005000A, 0x03380000, 0x00000008, 0x000BFFFD, 0x00000072, 0x0005000D, 0x00003FE8, 0x00000005, 0x00110000, 0x00004443, 0x00080011, 0xFF79FF69, 0xFF410005, 0x00130000, 0x0000A0EB, 0x00080013, 0xFF53003F, 0xFF410008, 0x0015FF79, 0xFE9CFF41, 0x00080029, 0xFF0D0177, 0x00000005, 0x00330000, 0x0000D99A, 0x00080033, 0xFFBA000C, 0x00000008, 0x0036FF0D, 0x01760000, 0x00080039, 0xFF12013E, 0x00000001, 0x00010005, 0x000A0417, 0x00000000, 0x0008000B, 0xFFFD0000, 0x00760005, 0x000D0000, 0x41A60000, 0x00050011, 0x00000000, 0x22210008, 0x0011FF79, 0xFF55FF41, 0x00050013, 0x00000000, 0x999B0008, 0x0013FF57, 0x0021FF41, 0x00080015, 0xFF79FE87, 0xFF410008, 0x0029FF0F, 0x01770000, 0x00050033, 0x00000000, 0xD7780008, 0x0033FFBE, 0xFFFC0000, 0x00080036, 0xFF0E0176, 0x00000008, 0x0039FF11, 0x01370000, 0x00010001, 0x0005000A, 0x05120000, 0x00000008, 0x000BFFFD, 0x00000079, 0x0005000D, 0x00004368, 0x00000005, 0x00110000, 0x00000000, 0x00080011, 0xFF79FF42, 0xFF410005, 0x00130000, 0x0000924B, 0x00080013, 0xFF5A0000, 0xFF410008, 0x0015FF79, 0xFE70FF41, 0x00080029, 0xFF110177, 0x00000005, 0x00330000, 0x0000D556, 0x00080033, 0xFFC1FFEA, 0x00000008, 0x0036FF0F, 0x01750000, 0x00080039, 0xFF10012F, 0x00000001, 0x00010005, 0x000A0629, 0x00000000, 0x0008000B, 0xFFFD0000, 0x007C0005, 0x000D0000, 0x45300000, 0x00080011, 0xFF79FF2E, 0xFF410005, 0x00130000, 0x00008AFA, 0x00080013, 0xFF5D000D, 0xFF410008, 0x0029FF12, 0x01770000, 0x00050033, 0x00000000, 0xD3340008, 0x0033FFC4, 0xFFD70000, 0x00080036, 0xFF0F0173, 0x00000008, 0x0039FF0E, 0x01270000, 0x00010001, 0x0005000A, 0x075D0000, 0x00000008, 0x000BFFFD, 0x0000007F, 0x0005000D, 0x000046FC, 0x00000008, 0x0011FF79, 0xFF1AFF41, 0x00050013, 0x00000000, 0x83AA0008, 0x0013FF61, 0x0016FF41, 0x00080029, 0xFF130177, 0x00000005, 0x00330000, 0x0000D112, 0x00080033, 0xFFC6FFC4, 0x00000008, 0x0036FF10, 0x01710000, 0x00080039, 0xFF0D011F, 0x00000001, 0x00010005, 0x000A08AD, 0x00000000, 0x0008000B, 0xFFFC0000, 0x00830005, 0x000D0000, 0x48CC0000, 0x00080011, 0xFF79FF06, 0xFF410005, 0x00130000, 0x00007C56, 0x00080013, 0xFF64001C, 0xFF410008, 0x0029FF14, 0x01760000, 0x00050033, 0x00000000, 0xCEF00008, 0x0033FFC9, 0xFFB10000, 0x00080036, 0xFF11016F, 0x00000008, 0x0039FF0B, 0x01160000, 0x00010001, 0x0005000A, 0x0A1B0000, 0x00000008, 0x000BFFFC, 0x00000086, 0x0005000D, 0x00004AA2, 0x00000008, 0x0011FF79, 0xFEF1FF41, 0x00050013, 0x00000000, 0x75060008, 0x0013FF67, 0x001EFF41, 0x00080029, 0xFF150176, 0x00000005, 0x00330000, 0x0000CCCE, 0x00080033, 0xFFCAFF9E, 0x00000008, 0x0036FF12, 0x016C0000, 0x00080039, 0xFF09010D, 0x00000001, 0x00010005, 0x000A0BA5, 0x00000000, 0x0008000B, 0xFFFC0000, 0x008A0005, 0x000D0000, 0x4C7C0000, 0x00080011, 0xFF79FEDC, 0xFF410005, 0x00130000, 0x00006DB6, 0x00080013, 0xFF6A001B, 0xFF410008, 0x0029FF16, 0x01750000, 0x00050033, 0x00000000, 0xCAAC0008, 0x0033FFCC, 0xFF8A0000, 0x00080036, 0xFF120168, 0x00000008, 0x0039FF07, 0x01030000, 0x00010001, 0x0005000A, 0x0D450000, 0x00000008, 0x000BFFFC, 0x0000008D, 0x0005000D, 0x00004E5A, 0x00000008, 0x0011FF79, 0xFEC7FF41, 0x00050013, 0x00000000, 0x66650008, 0x0013FF6A, 0x0015FF41, 0x00080029, 0xFF160173, 0x00000005, 0x00330000, 0x0000C889, 0x00080033, 0xFFCDFF75, 0x00000008, 0x0036FF13, 0x01650000, 0x00050039, 0x00000000, 0xEEF00008, 0x0039FF18, 0x00F90000, 0x00010001, 0x0005000A, 0x0EF00000, 0x00000008, 0x000BFFFC, 0x00000091, 0x0005000D, 0x0000503D, 0x00000008, 0x0011FF79, 0xFEB2FF41, 0x00050013, 0x00000000, 0x5F150008, 0x0013FF6A, 0x000CFF41, 0x00080029, 0xFF170171, 0x00000005, 0x00330000, 0x0000C667, 0x00080033, 0xFFCEFF60, 0x00000008, 0x0036FF14, 0x01600000, 0x00050039, 0x00000000, 0xDDDF0008, 0x0039FF28, 0x00EE0000, 0x00010001, 0x0005000A, 0x10A60000, 0x00000008, 0x000BFFFC, 0x00000094, 0x0005000D, 0x00005224, 0x00000008, 0x0011FF79, 0xFE9CFF41, 0x00050013, 0x00000000, 0x57C40008, 0x0013FF6A, 0x0000FF41, 0x00080029, 0xFF17016F, 0x00000005, 0x00330000, 0x0000C445, 0x00080033, 0xFFCEFF4B, 0x00000008, 0x0036FF14, 0x015C0000, 0x00050039, 0x00000000, 0xCCCE0008, 0x0039FF37, 0x00E30000, 0x00010001, 0x0005000A, 0x12680000, 0x00000008, 0x000BFFFC, 0x00000098, 0x0005000D, 0x00005410, 0x00000008, 0x0011FF79, 0xFE87FF41, 0x00050013, 0x00000000, 0x50740008, 0x0013FF6A, 0xFFEFFF41, 0x00080029, 0xFF17016C, 0x00000005, 0x00330000, 0x0000C223, 0x00080033, 0xFFCEFF36, 0x00000008, 0x0036FF15, 0x01570000, 0x00050039, 0x00000000, 0xBBBD0008, 0x0039FF45, 0x00D80000, 0x00010001, 0x0005000A, 0x14340000, 0x00000008, 0x000BFFFB, 0x0000009C, 0x0005000D, 0x00005600, 0x00000008, 0x0011FF79, 0xFE70FF41, 0x00050013, 0x00000000, 0x49240008, 0x0013FF6A, 0xFFDCFF41, 0x00080029, 0xFF170168, 0x00000008, 0x002FFF07, 0x01770000, 0x00050033, 0x00000000, 0xC0010008, 0x0033FFCE, 0xFF200000, 0x00080036, 0xFF160151, 0x00000005, 0x00390000, 0x0000AAAC, 0x00080039, 0xFF5200CC, 0x00000001, 0x00010008, 0x0009FECA, 0x0176FF84, 0x0005000A, 0x160B0000, 0x00000008, 0x000BFFFB, 0x000000A0, 0x0005000D, 0x000057F4, 0x00000005, 0x00130000, 0x000041D3, 0x00080013, 0xFF6AFFC4, 0xFF410008, 0x0029FF17, 0x01650000, 0x0008002F, 0xFF090177, 0x00000008, 0x0036FF17, 0x014C0000, 0x00050039, 0x00000000, 0x999B0008, 0x0039FF5E, 0x00C00000, 0x00010001, 0x00080009, 0xFECC0175, 0xFF880005, 0x000A17ED, 0x00000000, 0x0008000B, 0xFFFB0000, 0x00A30005, 0x000D0000, 0x59ED0000, 0x00050013, 0x00000000, 0x3A830008, 0x0013FF6A, 0xFFAAFF41, 0x00080029, 0xFF170161, 0x00000008, 0x002FFF0B, 0x01770000, 0x00080036, 0xFF170145, 0x00000005, 0x00390000, 0x0000888A, 0x00080039, 0xFF6A00B3, 0x00000001, 0x00010008, 0x0009FECD, 0x0173FF8D, 0x0005000A, 0x19D90000, 0x00000008, 0x000BFFFB, 0x000000A7, 0x0005000D, 0x00005BE9, 0x00000005, 0x00130000, 0x00003332, 0x00080013, 0xFF6AFF8D, 0xFF410008, 0x0029FF16, 0x015C0000, 0x0008002F, 0xFF0D0177, 0x00000008, 0x0036FF18, 0x013F0000, 0x00050039, 0x00000000, 0x77760008, 0x0039FF74, 0x00A60000, 0x00010001, 0x00080009, 0xFECE0170, 0xFF910005, 0x000A1BCF, 0x00000000, 0x0008000B, 0xFFFB0000, 0x00AB0005, 0x000D0000, 0x5DEA0000, 0x00050013, 0x00000000, 0x2BE20008, 0x0013FF6A, 0xFF6CFF41, 0x00080029, 0xFF160157, 0x00000008, 0x002FFF0F, 0x01770000, 0x00080036, 0xFF190138, 0x00000005, 0x00390000, 0x00006665, 0x00080039, 0xFF7E0098, 0x00000001, 0x00010008, 0x0009FECF, 0x016DFF96, 0x0005000A, 0x1DD00000, 0x00000008, 0x000BFFFB, 0x000000B0, 0x0005000D, 0x00005FEF, 0x00000005, 0x00130000, 0x00002492, 0x00080013, 0xFF6AFF49, 0xFF410008, 0x0029FF15, 0x01510000, 0x0008002F, 0xFF110177, 0x00000008, 0x0036FF1A, 0x01300000, 0x00050039, 0x00000000, 0x55540008, 0x0039FF87, 0x008A0000, 0x00010001, 0x00080009, 0xFED00169, 0xFF9A0005, 0x000A1FDA, 0x00000000, 0x0008000B, 0xFFFA0000, 0x00B40005, 0x000D0000, 0x61F80000, 0x00050013, 0x00000000, 0x1D410008, 0x0013FF6A, 0xFF23FF41, 0x00080029, 0xFF14014B, 0x00000008, 0x002FFF12, 0x01770000, 0x00080036, 0xFF1A0128, 0x00000005, 0x00390000, 0x00004443, 0x00080039, 0xFF90007C, 0x00000001, 0x00010008, 0x0009FED2, 0x0163FF9F, 0x0005000A, 0x21EE0000, 0x00000008, 0x000BFFFA, 0x000000B8, 0x0005000D, 0x00006405, 0x00000005, 0x00130000, 0x000015F1, 0x00080013, 0xFF6AFEFA, 0xFF410008, 0x0029FF13, 0x01450000, 0x0008002F, 0xFF130177, 0x00000008, 0x0036FF1B, 0x01200000, 0x00050039, 0x00000000, 0x33320008, 0x0039FF98, 0x006D0000, 0x00010001, 0x00080009, 0xFED3015D, 0xFFA40005, 0x000A240B, 0x00000000, 0x0008000B, 0xFFFA0000, 0x00BC0005, 0x000D0000, 0x66150000, 0x00050013, 0x00000000, 0x0EA00008, 0x0013FF6A, 0xFECFFF41, 0x00080029, 0xFF12013E, 0x00000008, 0x002FFF14, 0x01760000, 0x00080036, 0xFF1C0117, 0x00000005, 0x00390000, 0x00002221, 0x00080039, 0xFF9F005E, 0x00000001, 0x00010008, 0x0009FED4, 0x0156FFA9, 0x0005000A, 0x26310000, 0x00000008, 0x000BFFFA, 0x000000C0, 0x0005000D, 0x0000682A, 0x00000005, 0x00130000, 0x00000750, 0x00080013, 0xFF6AFEA1, 0xFF410008, 0x0029FF11, 0x01370000, 0x0008002F, 0xFF150176, 0x00000008, 0x0036FF1C, 0x010E0000, 0x00050039, 0x00000000, 0x11100008, 0x0039FFA6, 0x004F0000, 0x00010001, 0x00080009, 0xFED5014F, 0xFFAD0005, 0x000A2860, 0x00000000, 0x0008000B, 0xFFFA0000, 0x00C50005, 0x000D0000, 0x6A420000, 0x00050013, 0x00000000, 0x00000008, 0x0013FF6A, 0xFE70FF41, 0x00080029, 0xFF10012F, 0x00000008, 0x002FFF16, 0x01750000, 0x00080036, 0xFF1D0105, 0x00000005, 0x00390000, 0x00000000, 0x00080039, 0xFFAB003F, 0x00000001, 0x00010008, 0x0009FED6, 0x0146FFB2, 0x0005000A, 0x2A980000, 0x00000005, 0x000D0000, 0x6C5F0000, 0x00080029, 0xFF0E0127, 0x00000008, 0x002FFF16, 0x01730000, 0x00080036, 0xFF1E00FB, 0x00000005, 0x00390000, 0x0000EEF0, 0x00080039, 0xFFB1002E, 0x00000001, 0x00010008, 0x0009FED8, 0x013CFFB7, 0x0005000A, 0x2CD90000, 0x00000005, 0x000D0000, 0x6E7F0000, 0x00080029, 0xFF0D011F, 0x00000008, 0x002FFF17, 0x01710000, 0x00080036, 0xFF1F00F1, 0x00000005, 0x00390000, 0x0000DDDF, 0x00080039, 0xFFB6001D, 0x00000001, 0x00010008, 0x0009FED9, 0x0131FFBC, 0x0005000A, 0x2F220000, 0x00000005, 0x000D0000, 0x70A20000, 0x00080029, 0xFF0B0116, 0x00000008, 0x002FFF17, 0x016F0000, 0x00080036, 0xFF1F00E6, 0x00000005, 0x00390000, 0x0000CCCE, 0x00080039, 0xFFBA000C, 0x00000001, 0x00010008, 0x0009FEDA, 0x0125FFC1, 0x0005000A, 0x31740000, 0x00000005, 0x000D0000, 0x72CA0000, 0x00080029, 0xFF09010D, 0x00000008, 0x002FFF17, 0x016C0000, 0x00080036, 0xFF2000DB, 0x00000005, 0x00390000, 0x0000BBBD, 0x00080039, 0xFFBEFFFC, 0x00000001, 0x00010008, 0x0009FEDB, 0x0118FFC6, 0x0005000A, 0x33CD0000, 0x00000005, 0x000D0000, 0x74F40000, 0x00080029, 0xFF070103, 0x00000008, 0x002CFF07, 0x01770000, 0x0008002F, 0xFF170168, 0x00000008, 0x0036FF21, 0x00CF0000, 0x00050039, 0x00000000, 0xAAAC0008, 0x0039FFC1, 0xFFEA0000, 0x00010001, 0x00080009, 0xFEDC010A, 0xFFCB0005, 0x000A362F, 0x00000000, 0x0005000D, 0x00007723, 0x00000005, 0x00290000, 0x0000FDDE, 0x00080029, 0xFF1800F9, 0x00000008, 0x002CFF08, 0x01770000, 0x0008002F, 0xFF170165, 0x00000008, 0x0036FF22, 0x00C40000, 0x00050039, 0x00000000, 0x999B0008, 0x0039FFC4, 0xFFD70000, 0x00010001, 0x00080009, 0xFEDE00FA, 0xFFD00005, 0x000A3898, 0x00000000, 0x0005000D, 0x00007955, 0x00000005, 0x00290000, 0x0000FBBC, 0x00080029, 0xFF2800EE, 0x00000008, 0x002CFF09, 0x01770000, 0x0008002F, 0xFF170161, 0x00000008, 0x0036FF22, 0x00B80000, 0x00050039, 0x00000000, 0x888A0008, 0x0039FFC6, 0xFFC40000, 0x00010001, 0x00080009, 0xFEDF00EA, 0xFFD50005, 0x000A3B08, 0x00000000, 0x0005000D, 0x00007B8A, 0x00000005, 0x00290000, 0x0000F99A, 0x00080029, 0xFF3700E3, 0x00000008, 0x002FFF16, 0x015C0000, 0x00080036, 0xFF2300AB, 0x00000005, 0x00390000, 0x00007776, 0x00080039, 0xFFC9FFB1, 0x00000001, 0x00010008, 0x0009FEE0, 0x00D8FFDA, 0x0005000A, 0x3D800000, 0x00000005, 0x000D0000, 0x7DC30000, 0x00050029, 0x00000000, 0xF7780008, 0x0029FF45, 0x00D80000, 0x0008002C, 0xFF0A0177, 0x00000008, 0x002FFF16, 0x01570000, 0x00080036, 0xFF24009E, 0x00000005, 0x00390000, 0x00006665, 0x00080039, 0xFFCAFF9E, 0x00000001, 0x00010008, 0x0009FEE1, 0x00C5FFDF, 0x0005000A, 0x3FFF0000, 0x00000005, 0x000D0000, 0x80010000, 0x00080025, 0x00000000, 0x00350005, 0x00290000, 0x0000F556, 0x00080029, 0xFF5200CC, 0x00000008, 0x002CFF0B, 0x01770000, 0x0008002F, 0xFF150151, 0x00000008, 0x0036FF24, 0x00910000, 0x00050039, 0x00000000, 0x55540008, 0x0039FFCC, 0xFF8A0000, 0x00010001, 0x00080009, 0xFEF000DB, 0xFFDC0005, 0x000D0000, 0x76B80000, 0x00080019, 0x00000000, 0x00350008, 0x001C0000, 0x00000035, 0x00080025, 0x00000006, 0x00370005, 0x00290000, 0x0000F334, 0x00080029, 0xFF5E00C0, 0x00000008, 0x002CFF0C, 0x01770000, 0x0008002F, 0xFF14014B, 0x00000005, 0x00360000, 0x0000FC58, 0x00080036, 0xFF2C009E, 0x00000005, 0x00390000, 0x00004443, 0x00080039, 0xFFCDFF75, 0x00000001, 0x00010008, 0x0009FEFE, 0x00EEFFDA, 0x0005000D, 0x00006D67, 0x00000008, 0x00190000, 0x00060037, 0x0008001C, 0x00000006, 0x00370008, 0x001F0000, 0x00000035, 0x00080025, 0x0000000C, 0x003A0005, 0x00290000, 0x0000F112, 0x00080029, 0xFF6A00B3, 0x00000008, 0x002FFF13, 0x01450000, 0x00050036, 0x00000000, 0xF8B00008, 0x0036FF33, 0x00A80000, 0x00050039, 0x00000000, 0x33320008, 0x0039FFCE, 0xFF600000, 0x00010001, 0x00080009, 0xFF0D00FE, 0xFFD70005, 0x000D0000, 0x640C0000, 0x00080019, 0x0000000C, 0x003A0008, 0x001C0000, 0x000C003A, 0x0008001F, 0x00000006, 0x00370008, 0x00220000, 0x00000035, 0x00080025, 0x00000011, 0x003C0005, 0x00290000, 0x0000EEF0, 0x00080029, 0xFF7400A6, 0x00000008, 0x002CFF0D, 0x01760000, 0x0008002F, 0xFF12013E, 0x00000005, 0x00360000, 0x0000F508, 0x00080036, 0xFF3A00AF, 0x00000005, 0x00390000, 0x00002221, 0x00080039, 0xFFCEFF4B, 0x00000001, 0x00010008, 0x0009FF1C, 0x010BFFD4, 0x0005000D, 0x00005AA8, 0x00000008, 0x00190000, 0x0011003C, 0x0008001C, 0x00000011, 0x003C0008, 0x001F0000, 0x000C003A, 0x00080022, 0x00000006, 0x00370008, 0x00250000, 0x0016003F, 0x00050029, 0x00000000, 0xECCD0008, 0x0029FF7E, 0x00980000, 0x0008002C, 0xFF0E0176, 0x00000008, 0x002FFF11, 0x01370000, 0x00050036, 0x00000000, 0xF1600008, 0x0036FF41, 0x00B30000, 0x00050039, 0x00000000, 0x11100008, 0x0039FFCE, 0xFF360000, 0x00010001, 0x00080009, 0xFF2B0115, 0xFFD10005, 0x000D0000, 0x513A0000, 0x00080019, 0x00000016, 0x003F0008, 0x001C0000, 0x0016003F, 0x0008001F, 0x00000011, 0x003C0008, 0x00220000, 0x000C003A, 0x00080025, 0x0000001B, 0x00410005, 0x00290000, 0x0000EAAB, 0x00080029, 0xFF87008A, 0x00000008, 0x002CFF0F, 0x01750000, 0x0008002F, 0xFF10012F, 0x00000005, 0x00360000, 0x0000EDB7, 0x00080036, 0xFF4900B4, 0x00000005, 0x00390000, 0x00000000, 0x00080039, 0xFFCEFF20, 0x00000001, 0x00010008, 0x0009FF39, 0x011DFFCE, 0x0005000D, 0x000047C4, 0x00000008, 0x00190000, 0x001B0041, 0x0008001C, 0x0000001B, 0x00410008, 0x001F0000, 0x0016003F, 0x00080022, 0x00000011, 0x003C0008, 0x00250000, 0x001F0044, 0x00050029, 0x00000000, 0xE8890008, 0x0029FF90, 0x007C0000, 0x0008002C, 0xFF0F0173, 0x00000008, 0x002FFF0E, 0x01270000, 0x00050036, 0x00000000, 0xEA0F0008, 0x0036FF50, 0x00B10000, 0x00010001, 0x00080009, 0xFF480123, 0xFFCB0005, 0x000D0000, 0x3E460000, 0x00080019, 0x0000001F, 0x00440008, 0x001C0000, 0x001F0044, 0x0008001F, 0x0000001B, 0x00410008, 0x00220000, 0x0016003F, 0x00080025, 0x00000023, 0x00460005, 0x00290000, 0x0000E667, 0x00080029, 0xFF98006D, 0x00000008, 0x002CFF10, 0x01710000, 0x0008002F, 0xFF0D011F, 0x00000005, 0x00360000, 0x0000E667, 0x00080036, 0xFF5700AB, 0x00000001, 0x00010008, 0x0009FF57, 0x0126FFC8, 0x0005000D, 0x000034C0, 0x00000008, 0x00190000, 0x00230046, 0x0008001C, 0x00000023, 0x00460008, 0x001F0000, 0x001F0044, 0x00080022, 0x0000001B, 0x00410008, 0x00250000, 0x00260049, 0x00050029, 0x00000000, 0xE4450008, 0x0029FF9F, 0x005E0000, 0x0008002C, 0xFF11016F, 0x00000008, 0x002FFF0B, 0x01160000, 0x00050036, 0x00000000, 0xE2BF0008, 0x0036FF5E, 0x00A10000, 0x00010001, 0x00080009, 0xFF650128, 0xFFC50005, 0x000D0000, 0x2B330000, 0x00080019, 0x00000026, 0x00490008, 0x001C0000, 0x00260049, 0x0008001F, 0x00000023, 0x00460008, 0x00220000, 0x001F0044, 0x00080025, 0x00000029, 0x004B0005, 0x00290000, 0x0000E223, 0x00080029, 0xFFA6004F, 0x00000008, 0x002CFF12, 0x016C0000, 0x0008002F, 0xFF09010D, 0x00000005, 0x00360000, 0x0000DF17, 0x00080036, 0xFF650095, 0x00000001, 0x00010008, 0x0009FF74, 0x0129FFC2, 0x0005000D, 0x0000219F, 0x00000008, 0x00190000, 0x0029004B, 0x0008001C, 0x00000029, 0x004B0008, 0x001F0000, 0x00260049, 0x00080022, 0x00000023, 0x00460008, 0x00250000, 0x002C004E, 0x00050029, 0x00000000, 0xE0010008, 0x0029FFAB, 0x003F0000, 0x0008002C, 0xFF120168, 0x00000008, 0x002FFF07, 0x01030000, 0x00050036, 0x00000000, 0xDB6E0008, 0x0036FF6D, 0x00850000, 0x00010001, 0x00080009, 0xFF830128, 0xFFBF0005, 0x000D0000, 0x18060000, 0x00080019, 0x0000002C, 0x004E0008, 0x001C0000, 0x002C004E, 0x0008001F, 0x00000029, 0x004B0008, 0x00220000, 0x00260049, 0x00080025, 0x0000002E, 0x00500005, 0x00290000, 0x0000DDDF, 0x00080029, 0xFFB1002E, 0x00000008, 0x002CFF13, 0x01650000, 0x0005002F, 0x00000000, 0xEEF00008, 0x002FFF18, 0x00F90000, 0x00050036, 0x00000000, 0xD7C60008, 0x0036FF74, 0x00710000, 0x00010001, 0x00080009, 0xFF910126, 0xFFBC0005, 0x000D0000, 0x0E660000, 0x00080019, 0x0000002E, 0x00500008, 0x001C0000, 0x002E0050, 0x0008001F, 0x0000002C, 0x004E0008, 0x00220000, 0x0029004B, 0x00080025, 0x0000002F, 0x00530005, 0x00290000, 0x0000DBBD, 0x00080029, 0xFFB6001D, 0x00000008, 0x002CFF14, 0x01600000, 0x0005002F, 0x00000000, 0xDDDF0008, 0x002FFF28, 0x00EE0000, 0x00050036, 0x00000000, 0xD41E0008, 0x0036FF7B, 0x005A0000, 0x00010001, 0x00080009, 0xFFA00121, 0xFFB90005, 0x000D0000, 0x04C20000, 0x00080019, 0x0000002F, 0x00530008, 0x001C0000, 0x002F0053, 0x0008001F, 0x0000002E, 0x00500008, 0x00220000, 0x002C004E, 0x00080025, 0x00000031, 0x00550005, 0x00290000, 0x0000D99A, 0x00080029, 0xFFBA000C, 0x00000008, 0x002CFF14, 0x015C0000, 0x0005002F, 0x00000000, 0xCCCE0008, 0x002FFF37, 0x00E30000, 0x00050036, 0x00000000, 0xD0760008, 0x0036FF82, 0x003F0000, 0x00010001, 0x00080009, 0xFFAF011B, 0xFFB60005, 0x000D0000, 0xFB1A0000, 0x00080019, 0x00000031, 0x00550008, 0x001C0000, 0x00310055, 0x0008001F, 0x0000002F, 0x00530008, 0x00220000, 0x002E0050, 0x00080025, 0x00000031, 0x00580005, 0x00290000, 0x0000D778, 0x00080029, 0xFFBEFFFC, 0x00000008, 0x002CFF15, 0x01570000, 0x0005002F, 0x00000000, 0xBBBD0008, 0x002FFF45, 0x00D80000, 0x00050036, 0x00000000, 0xCCCE0008, 0x0036FF89, 0x00210000, 0x00010001, 0x00080009, 0xFFBD0114, 0xFFB40005, 0x000D0000, 0xF16D0000, 0x00080019, 0x00000031, 0x00580008, 0x001C0000, 0x00310058, 0x0008001F, 0x00000031, 0x00550008, 0x00220000, 0x002F0053, 0x00080025, 0x00000032, 0x005A0005, 0x00290000, 0x0000D556, 0x00080029, 0xFFC1FFEA, 0x00000008, 0x002CFF16, 0x01510000, 0x0005002F, 0x00000000, 0xAAAC0008, 0x002FFF52, 0x00CC0000, 0x00050036, 0x00000000, 0xC9260008, 0x0036FF91, 0x00000000, 0x00010001, 0x00080009, 0xFFCC010A, 0xFFB10005, 0x000D0000, 0xE7BC0000, 0x00080019, 0x00000032, 0x005A0008, 0x001C0000, 0x0032005A, 0x0008001F, 0x00000031, 0x00580008, 0x00220000, 0x00310055, 0x00080025, 0x00000031, 0x005D0005, 0x00290000, 0x0000D334, 0x00080029, 0xFFC4FFD7, 0x00000008, 0x002CFF17, 0x014C0000, 0x0005002F, 0x00000000, 0x999B0008, 0x002FFF5E, 0x00C00000, 0x00050036, 0x00000000, 0xC57D0008, 0x0036FF98, 0x000D0000, 0x00010001, 0x00080009, 0xFFDB0100, 0xFFAE0005, 0x000D0000, 0xDE090000, 0x00080019, 0x00000031, 0x005D0008, 0x001C0000, 0x0031005D, 0x0008001F, 0x00000032, 0x005A0008, 0x00220000, 0x00310058, 0x00080025, 0x00000030, 0x005F0005, 0x00290000, 0x0000D112, 0x00080029, 0xFFC6FFC4, 0x00000008, 0x002CFF17, 0x01450000, 0x0005002F, 0x00000000, 0x888A0008, 0x002FFF6A, 0x00B30000, 0x00050036, 0x00000000, 0xC1D50008, 0x0036FF9F, 0x00160000, 0x00010001, 0x00080009, 0xFFE900F4, 0xFFAB0005, 0x000D0000, 0xD4520000, 0x00080019, 0x00000030, 0x005F0008, 0x001C0000, 0x0030005F, 0x0008001F, 0x00000031, 0x005D0008, 0x00220000, 0x0032005A, 0x00080025, 0x0000002E, 0x00620005, 0x00290000, 0x0000CEF0, 0x00080029, 0xFFC9FFB1, 0x00000008, 0x002CFF18, 0x013F0000, 0x0005002F, 0x00000000, 0x77760008, 0x002FFF74, 0x00A60000, 0x00050036, 0x00000000, 0xBE2D0008, 0x0036FFA6, 0x001C0000, 0x00010001, 0x00080009, 0xFFF800E6, 0xFFA80005, 0x000D0000, 0xCA9A0000, 0x00080019, 0x0000002E, 0x00620008, 0x001C0000, 0x002E0062, 0x0008001F, 0x00000030, 0x005F0008, 0x00220000, 0x0031005D, 0x00080025, 0x0000002C, 0x00640005, 0x00290000, 0x0000CCCE, 0x00080029, 0xFFCAFF9E, 0x00000008, 0x002CFF19, 0x01380000, 0x0005002F, 0x00000000, 0x66650008, 0x002FFF7E, 0x00980000, 0x00050036, 0x00000000, 0xBA850008, 0x0036FFAD, 0x001E0000, 0x00010001, 0x00080009, 0x000600D7, 0xFFA50005, 0x000D0000, 0xC0E00000, 0x00080019, 0x0000002C, 0x00640008, 0x001C0000, 0x002C0064, 0x0008001F, 0x0000002E, 0x00620008, 0x00220000, 0x0030005F, 0x00080025, 0x00000029, 0x00670005, 0x00290000, 0x0000CAAC, 0x00080029, 0xFFCCFF8A, 0x00000008, 0x002CFF1A, 0x01300000, 0x0005002F, 0x00000000, 0x55540008, 0x002FFF87, 0x008A0000, 0x00050036, 0x00000000, 0xB6DC0008, 0x0036FFB5, 0x001B0000, 0x00010001, 0x00080009, 0x001400C7, 0xFFA20005, 0x000D0000, 0xB7250000, 0x00080019, 0x00000029, 0x00670008, 0x001C0000, 0x00290067, 0x0008001F, 0x0000002C, 0x00640008, 0x00220000, 0x002E0062, 0x00080025, 0x00000026, 0x00690005, 0x00290000, 0x0000C889, 0x00080029, 0xFFCDFF75, 0x00000008, 0x002CFF1A, 0x01280000, 0x0005002F, 0x00000000, 0x44430008, 0x002FFF90, 0x007C0000, 0x00050036, 0x00000000, 0xB3340008, 0x0036FFB5, 0x00150000, 0x00010001, 0x00080009, 0x002300B6, 0xFF9F0005, 0x000D0000, 0xAD690000, 0x00080019, 0x00000026, 0x00690008, 0x001C0000, 0x00260069, 0x0008001F, 0x00000029, 0x00670008, 0x00220000, 0x002C0064, 0x00080025, 0x00000022, 0x006C0005, 0x00290000, 0x0000C667, 0x00080029, 0xFFCEFF60, 0x00000008, 0x002CFF1B, 0x01200000, 0x0005002F, 0x00000000, 0x33320008, 0x002FFF98, 0x006D0000, 0x00050036, 0x00000000, 0xAF8C0008, 0x0036FFB5, 0x000C0000, 0x00010001, 0x00080009, 0x003200A4, 0xFF9C0005, 0x000D0000, 0xA3AD0000, 0x00080019, 0x00000022, 0x006C0008, 0x001C0000, 0x0022006C, 0x0008001F, 0x00000026, 0x00690008, 0x00220000, 0x00290067, 0x00080025, 0x0000001D, 0x006E0005, 0x00290000, 0x0000C445, 0x00080029, 0xFFCEFF4B, 0x00000008, 0x002CFF1C, 0x01170000, 0x0005002F, 0x00000000, 0x22210008, 0x002FFF9F, 0x005E0000, 0x00050036, 0x00000000, 0xABE40008, 0x0036FFB5, 0x00000000, 0x00010001, 0x00080009, 0x00410091, 0xFF990005, 0x000D0000, 0x99F10000, 0x00080019, 0x0000001D, 0x006E0008, 0x001C0000, 0x001D006E, 0x0008001F, 0x00000022, 0x006C0008, 0x00220000, 0x00260069, 0x00080025, 0x00000018, 0x00710005, 0x00290000, 0x0000C223, 0x00080029, 0xFFCEFF36, 0x00000008, 0x002CFF1C, 0x010E0000, 0x0005002F, 0x00000000, 0x11100008, 0x002FFFA6, 0x004F0000, 0x00050036, 0x00000000, 0xA83C0008, 0x0036FFB5, 0xFFEF0000, 0x00010001, 0x00080009, 0x004F007D, 0xFF960005, 0x000D0000, 0x90370000, 0x00080019, 0x00000018, 0x00710008, 0x001C0000, 0x00180071, 0x0008001F, 0x0000001D, 0x006E0008, 0x00220000, 0x0022006C, 0x00080025, 0x00000012, 0x00730005, 0x00290000, 0x0000C001, 0x00080029, 0xFFCEFF20, 0x00000008, 0x002CFF1D, 0x01050000, 0x0005002F, 0x00000000, 0x00000008, 0x002FFFAB, 0x003F0000, 0x00050036, 0x00000000, 0xA4940008, 0x0036FFB5, 0xFFDC0000, 0x00010001, 0x00080009, 0x005E0068, 0xFF930005, 0x000D0000, 0x867E0000, 0x00080019, 0x00000012, 0x00730008, 0x001C0000, 0x00120073, 0x0008001F, 0x00000018, 0x00710008, 0x00220000, 0x001D006E, 0x00080025, 0x0000000B, 0x00760008, 0x002CFF1E, 0x00FB0000, 0x0005002F, 0x00000000, 0xEEF00008, 0x002FFFB1, 0x002E0000, 0x00050036, 0x00000000, 0xA0EB0008, 0x0036FFB5, 0xFFC40000, 0x00010001, 0x00080009, 0x006D0052, 0xFF900005, 0x000D0000, 0x7CC30000, 0x00080019, 0x0000000B, 0x00760008, 0x001C0000, 0x000B0076, 0x0008001F, 0x00000012, 0x00730008, 0x00220000, 0x00180071, 0x00080025, 0x00000004, 0x00780008, 0x002CFF1F, 0x00F10000, 0x0005002F, 0x00000000, 0xDDDF0008, 0x002FFFB6, 0x001D0000, 0x00050036, 0x00000000, 0x9D430008, 0x0036FFB5, 0xFFAA0000, 0x00010001, 0x00080009, 0x007B003B, 0xFF8E0005, 0x000D0000, 0x730E0000, 0x00080019, 0x00000004, 0x00780008, 0x001C0000, 0x00040078, 0x0008001F, 0x0000000B, 0x00760008, 0x00220000, 0x00120073, 0x00080025, 0x0000FFFE, 0x007B0008, 0x002CFF1F, 0x00E60000, 0x0005002F, 0x00000000, 0xCCCE0008, 0x002FFFBA, 0x000C0000, 0x00050036, 0x00000000, 0x999B0008, 0x0036FFB5, 0xFF8D0000, 0x00010001, 0x00080009, 0x008A0023, 0xFF8B0005, 0x000D0000, 0x695C0000, 0x00080019, 0x0000FFFE, 0x007B0008, 0x001C0000, 0xFFFE007B, 0x0008001F, 0x00000004, 0x00780008, 0x00220000, 0x000B0076, 0x00080025, 0x0000FFF6, 0x007D0008, 0x002CFF20, 0x00DB0000, 0x0005002F, 0x00000000, 0xBBBD0008, 0x002FFFBE, 0xFFFC0000, 0x00050036, 0x00000000, 0x95F30008, 0x0036FFB5, 0xFF6C0000, 0x00010001, 0x00080009, 0x0099000B, 0xFF880005, 0x000D0000, 0x5FAD0000, 0x00080019, 0x0000FFF6, 0x007D0008, 0x001C0000, 0xFFF6007D, 0x0008001F, 0x0000FFFE, 0x007B0008, 0x00220000, 0x00040078, 0x00080025, 0x0000FFEE, 0x00800008, 0x002CFF21, 0x00CF0000, 0x0005002F, 0x00000000, 0xAAAC0008, 0x002FFFC1, 0xFFEA0000, 0x00050036, 0x00000000, 0x924A0008, 0x0036FFB5, 0xFF490000, 0x00010001, 0x00080009, 0x00A7FFF4, 0xFF850005, 0x000D0000, 0x56020000, 0x00080019, 0x0000FFEE, 0x00800008, 0x001C0000, 0xFFEE0080, 0x0008001F, 0x0000FFF6, 0x007D0008, 0x00220000, 0xFFFE007B, 0x00080025, 0x0000FFE5, 0x00820008, 0x002CFF22, 0x00C40000, 0x0005002F, 0x00000000, 0x999B0008, 0x002FFFC4, 0xFFD70000, 0x00050036, 0x00000000, 0x8EA20008, 0x0036FFB5, 0xFF230000, 0x00010001, 0x00080009, 0x00B6FFDB, 0xFF820005, 0x000D0000, 0x4C5C0000, 0x00080019, 0x0000FFE5, 0x00820008, 0x001C0000, 0xFFE50082, 0x0008001F, 0x0000FFEE, 0x00800008, 0x00220000, 0xFFF6007D, 0x00080025, 0x0000FFDC, 0x00850008, 0x002CFF22, 0x00B80000, 0x0005002F, 0x00000000, 0x888A0008, 0x002FFFC6, 0xFFC40000, 0x00050036, 0x00000000, 0x8AFA0008, 0x0036FFB5, 0xFEFA0000, 0x00010001, 0x00080009, 0x00C5FFC1, 0xFF7F0005, 0x000D0000, 0x42BA0000, 0x00080019, 0x0000FFDC, 0x00850008, 0x001C0000, 0xFFDC0085, 0x0008001F, 0x0000FFE5, 0x00820008, 0x00220000, 0xFFEE0080, 0x00080025, 0x0000FFD3, 0x00870008, 0x002CFF23, 0x00AB0000, 0x0005002F, 0x00000000, 0x77760008, 0x002FFFC9, 0xFFB10000, 0x00050036, 0x00000000, 0x87520008, 0x0036FFB5, 0xFECF0000, 0x00010001, 0x00080009, 0x00D3FFA7, 0xFF7C0005, 0x000D0000, 0x391D0000, 0x00080019, 0x0000FFD3, 0x00870008, 0x001C0000, 0xFFD30087, 0x0008001F, 0x0000FFDC, 0x00850008, 0x00220000, 0xFFE50082, 0x00080025, 0x0000FFC9, 0x008A0008, 0x002CFF24, 0x009E0000, 0x0005002F, 0x00000000, 0x66650008, 0x002FFFCA, 0xFF9E0000, 0x00050036, 0x00000000, 0x83AA0008, 0x0036FFB5, 0xFEA10000, 0x00010001, 0x00080009, 0x00E2FF8D, 0xFF790005, 0x000D0000, 0x2F870000, 0x00080019, 0x0000FFC9, 0x008A0008, 0x001C0000, 0xFFC9008A, 0x0008001F, 0x0000FFD3, 0x00870008, 0x00220000, 0xFFDC0085, 0x00080025, 0x0000FFBE, 0x008C0008, 0x002CFF24, 0x00910000, 0x0005002F, 0x00000000, 0x55540008, 0x002FFFCC, 0xFF8A0000, 0x00050036, 0x00000000, 0x80010008, 0x0036FFB5, 0xFE700000, 0x00010001, 0x00080009, 0x00F1FF72, 0xFF760005, 0x000D0000, 0x25F70000, 0x00080019, 0x0000FFBE, 0x008C0008, 0x001C0000, 0xFFBE008C, 0x0008001F, 0x0000FFC9, 0x008A0008, 0x00220000, 0xFFD30087, 0x00080025, 0x0000FFB3, 0x008F0005, 0x002C0000, 0x0000FC58, 0x0008002C, 0xFF2C009E, 0x00000005, 0x002F0000, 0x00004443, 0x0008002F, 0xFFCDFF75, 0x00000001, 0x00010008, 0x000900FF, 0xFF57FF73, 0x0005000D, 0x00001C6D, 0x00000008, 0x00190000, 0xFFB3008F, 0x0008001C, 0x0000FFB3, 0x008F0008, 0x001F0000, 0xFFBE008C, 0x00080022, 0x0000FFC9, 0x008A0008, 0x00250000, 0xFFA80091, 0x0005002C, 0x00000000, 0xF8B00008, 0x002CFF33, 0x00A80000, 0x0005002F, 0x00000000, 0x33320008, 0x002FFFCE, 0xFF600000, 0x00010001, 0x00080009, 0x010EFF3C, 0xFF700005, 0x000D0000, 0x12EB0000, 0x00080019, 0x0000FFA8, 0x00910008, 0x001C0000, 0xFFA80091, 0x0008001F, 0x0000FFB3, 0x008F0008, 0x00220000, 0xFFBE008C, 0x00080025, 0x0000FF9D, 0x00940005, 0x002C0000, 0x0000F508, 0x0008002C, 0xFF3A00AF, 0x00000005, 0x002F0000, 0x00002221, 0x0008002F, 0xFFCEFF4B, 0x00000001, 0x00010008, 0x0009011D, 0xFF21FF6D, 0x0005000D, 0x00000971, 0x00000008, 0x00190000, 0xFF9D0094, 0x0008001C, 0x0000FF9D, 0x00940008, 0x001F0000, 0xFFA80091, 0x00080022, 0x0000FFB3, 0x008F0008, 0x00250000, 0xFF910096, 0x0005002C, 0x00000000, 0xF1600008, 0x002CFF41, 0x00B30000, 0x0005002F, 0x00000000, 0x11100008, 0x002FFFCE, 0xFF360000, 0x00010001, 0x00080009, 0x012CFF06, 0xFF6A0005, 0x000D0000, 0x00000000, 0x00080019, 0x0000FF91, 0x00960008, 0x001C0000, 0xFF910096, 0x0008001F, 0x0000FF9D, 0x00940008, 0x00220000, 0xFFA80091, 0x00080025, 0x0000FF85, 0x00990005, 0x002C0000, 0x0000EDB8, 0x0008002C, 0xFF4900B4, 0x00000005, 0x002F0000, 0x00000000, 0x0008002F, 0xFFCEFF20, 0x00000001, 0x00010008, 0x00190000, 0xFF850099, 0x0008001C, 0x0000FF85, 0x00990008, 0x001F0000, 0xFF910096, 0x00080022, 0x0000FF9D, 0x00940008, 0x00250000, 0xFF79009B, 0x0005002C, 0x00000000, 0xEA0F0008, 0x002CFF50, 0x00B10000, 0x00010001, 0x00080019, 0x0000FF79, 0x009B0008, 0x001C0000, 0xFF79009B, 0x0008001F, 0x0000FF85, 0x00990008, 0x00220000, 0xFF910096, 0x00080025, 0x0000FF6D, 0x009E0005, 0x002C0000, 0x0000E667, 0x0008002C, 0xFF5700AB, 0x00000001, 0x00010008, 0x00190000, 0xFF6D009E, 0x0008001C, 0x0000FF6D, 0x009E0008, 0x001F0000, 0xFF79009B, 0x00080022, 0x0000FF85, 0x00990008, 0x00250000, 0xFF6000A0, 0x0005002C, 0x00000000, 0xE2BF0008, 0x002CFF5E, 0x00A10000, 0x00010001, 0x00080019, 0x0000FF60, 0x00A00008, 0x001C0000, 0xFF6000A0, 0x0008001F, 0x0000FF6D, 0x009E0008, 0x00220000, 0xFF79009B, 0x00080025, 0x0000FF53, 0x00A30005, 0x002C0000, 0x0000DF17, 0x0008002C, 0xFF650095, 0x00000001, 0x00010008, 0x00190000, 0xFF5300A3, 0x0008001C, 0x0000FF53, 0x00A30008, 0x001F0000, 0xFF6000A0, 0x00080022, 0x0000FF6D, 0x009E0008, 0x00250000, 0xFF4500A5, 0x0005002C, 0x00000000, 0xDB6E0008, 0x002CFF6D, 0x00850000, 0x00010001, 0x00080019, 0x0000FF45, 0x00A50008, 0x001C0000, 0xFF4500A5, 0x0008001F, 0x0000FF53, 0x00A30008, 0x00220000, 0xFF6000A0, 0x00080025, 0x0000FF38, 0x00A80005, 0x002C0000, 0x0000D7C6, 0x0008002C, 0xFF740071, 0x00000001, 0x00010008, 0x00190000, 0xFF3800A8, 0x0008001C, 0x0000FF38, 0x00A80008, 0x001F0000, 0xFF4500A5, 0x00080022, 0x0000FF53, 0x00A30008, 0x00250000, 0xFF2A00AA, 0x0005002C, 0x00000000, 0xD41E0008, 0x002CFF7B, 0x005A0000, 0x00010001, 0x00080019, 0x0000FF2A, 0x00AA0008, 0x001C0000, 0xFF2A00AA, 0x0008001F, 0x0000FF38, 0x00A80008, 0x00220000, 0xFF4500A5, 0x00080025, 0x0000FF1D, 0x00AD0005, 0x002C0000, 0x0000D076, 0x0008002C, 0xFF82003F, 0x00000001, 0x00010008, 0x00190000, 0xFF1D00AD, 0x0008001C, 0x0000FF1D, 0x00AD0008, 0x001F0000, 0xFF2A00AA, 0x00080022, 0x0000FF38, 0x00A80008, 0x00250000, 0xFF0F00AF, 0x0005002C, 0x00000000, 0xCCCE0008, 0x002CFF89, 0x00210000, 0x00010001, 0x00080019, 0x0000FF0F, 0x00AF0008, 0x001C0000, 0xFF0F00AF, 0x0008001F, 0x0000FF1D, 0x00AD0008, 0x00220000, 0xFF2A00AA, 0x00080025, 0x0000FF01, 0x00B20005, 0x002C0000, 0x0000C925, 0x0008002C, 0xFF910000, 0x00000001, 0x00010005, 0x00070000, 0xF556FF98, 0x00080019, 0x0000FF01, 0x00B20008, 0x001C0000, 0xFF0100B2, 0x0008001F, 0x0000FF0F, 0x00AF0008, 0x00220000, 0xFF1D00AD, 0x00080025, 0x0000FEF3, 0x00B40005, 0x002C0000, 0x0000C57D, 0x0008002C, 0xFF98000D, 0x00000001, 0x00010005, 0x00070000, 0xF556FE72, 0x00080019, 0x0000FEF3, 0x00B40008, 0x001C0000, 0xFEF300B4, 0x0008001F, 0x0000FF01, 0x00B20008, 0x00220000, 0xFF0F00AF, 0x00080025, 0x0000FEE4, 0x00B70005, 0x002C0000, 0x0000C1D5, 0x0008002C, 0xFF9F0016, 0x00000001, 0x00010005, 0x00070000, 0xF556FCAD, 0x00080019, 0x0000FEE4, 0x00B70008, 0x001C0000, 0xFEE400B7, 0x0008001F, 0x0000FEF3, 0x00B40008, 0x00220000, 0xFF0100B2, 0x00080025, 0x0000FED6, 0x00B90005, 0x002C0000, 0x0000BE2D, 0x0008002C, 0xFFA6001C, 0x00000001, 0x00010005, 0x00070000, 0xF556FA64, 0x00080019, 0x0000FED6, 0x00B90008, 0x001C0000, 0xFED600B9, 0x0008001F, 0x0000FEE4, 0x00B70008, 0x00220000, 0xFEF300B4, 0x00080025, 0x0000FEC7, 0x00BC0005, 0x002C0000, 0x0000BA85, 0x0008002C, 0xFFAD001E, 0x00000001, 0x00010005, 0x00070000, 0xF556F7B5, 0x00080019, 0x0000FEC7, 0x00BC0008, 0x001C0000, 0xFEC700BC, 0x0008001F, 0x0000FED6, 0x00B90008, 0x00220000, 0xFEE400B7, 0x00080025, 0x0000FEB9, 0x00BE0005, 0x002C0000, 0x0000B6DD, 0x0008002C, 0xFFB5001B, 0x00000001, 0x00010005, 0x00070000, 0xF556F4BD, 0x00080019, 0x0000FEB9, 0x00BE0008, 0x001C0000, 0xFEB900BE, 0x0008001F, 0x0000FEC7, 0x00BC0008, 0x00220000, 0xFED600B9, 0x00080025, 0x0000FEAA, 0x00C10005, 0x002C0000, 0x0000B334, 0x0008002C, 0xFFB50015, 0x00000001, 0x00010005, 0x00070000, 0xF556F19A, 0x00080019, 0x0000FEAA, 0x00C10008, 0x001C0000, 0xFEAA00C1, 0x0008001F, 0x0000FEB9, 0x00BE0008, 0x00220000, 0xFEC700BC, 0x00080025, 0x0000FE9C, 0x00C30005, 0x002C0000, 0x0000AF8C, 0x0008002C, 0xFFB5000C, 0x00000001, 0x00010005, 0x00070000, 0xF556EE68, 0x00080019, 0x0000FE9C, 0x00C30008, 0x001C0000, 0xFE9C00C3, 0x0008001F, 0x0000FEAA, 0x00C10008, 0x00220000, 0xFEB900BE, 0x00080025, 0x0000FE8D, 0x00C60005, 0x002C0000, 0x0000ABE4, 0x0008002C, 0xFFB50000, 0x00000001, 0x00010005, 0x00070000, 0xF556EB44, 0x00080019, 0x0000FE8D, 0x00C60008, 0x001C0000, 0xFE8D00C6, 0x0008001F, 0x0000FE9C, 0x00C30008, 0x00220000, 0xFEAA00C1, 0x00080025, 0x0000FE7F, 0x00C80005, 0x002C0000, 0x0000A83C, 0x0008002C, 0xFFB5FFEF, 0x00000001, 0x00010005, 0x00070000, 0xF556E84D, 0x00080019, 0x0000FE7F, 0x00C80008, 0x001C0000, 0xFE7F00C8, 0x0008001F, 0x0000FE8D, 0x00C60008, 0x00220000, 0xFE9C00C3, 0x00080025, 0x0000FE70, 0x00CB0005, 0x002C0000, 0x0000A493, 0x0008002C, 0xFFB5FFDC, 0x00000001, 0x00010005, 0x00070000, 0xF556E59E, 0x00080019, 0x0000FE70, 0x00CB0008, 0x001C0000, 0xFE7000CB, 0x0008001F, 0x0000FE7F, 0x00C80008, 0x00220000, 0xFE8D00C6, 0x0005002C, 0x00000000, 0xA0EB0008, 0x002CFFB5, 0xFFC40000, 0x00010001, 0x00050007, 0x0000F556, 0xE3550008, 0x001F0000, 0xFE7000CB, 0x00080022, 0x0000FE7F, 0x00C80005, 0x002C0000, 0x00009D43, 0x0008002C, 0xFFB5FFAA, 0x00000001, 0x00010005, 0x00070000, 0xF556E18F, 0x00080022, 0x0000FE70, 0x00CB0005, 0x002C0000, 0x0000999B, 0x0008002C, 0xFFB5FF8D, 0x00000001, 0x00010005, 0x00070000, 0xF556E069, 0x0005002C, 0x00000000, 0x95F30008, 0x002CFFB5, 0xFF6C0000, 0x00010001, 0x00050007, 0x0000F556, 0xE0010005, 0x002C0000, 0x0000924A, 0x0008002C, 0xFFB5FF49, 0x00000001, 0x00010005, 0x00070000, 0xF556E04D, 0x0005002C, 0x00000000, 0x8EA20008, 0x002CFFB5, 0xFF230000, 0x00010001, 0x00050007, 0x0000F556, 0xE11D0005, 0x002C0000, 0x00008AFA, 0x0008002C, 0xFFB5FEFA, 0x00000001, 0x00010005, 0x00070000, 0xF556E24F, 0x0005002C, 0x00000000, 0x87520008, 0x002CFFB5, 0xFECF0000, 0x00010001, 0x00050007, 0x0000F556, 0xE3C20005, 0x002C0000, 0x000083AA, 0x0008002C, 0xFFB5FEA1, 0x00000001, 0x00010005, 0x00070000, 0xF556E556, 0x0005002C, 0x00000000, 0x80010008, 0x002CFFB5, 0xFE700000, 0x00010001, 0x00050007, 0x0000F556, 0xE6EA0001, 0x00010005, 0x00070000, 0xF556E85E, 0x00010001, 0x00050007, 0x0000F556, 0xE98F0001, 0x00010005, 0x00070000, 0xF556EA5F, 0x00010001, 0x00050007, 0x0000F556, 0xEAAB0001, 0x00010005, 0x00070000, 0xF556EA4D, 0x00010001, 0x00050007, 0x0000F556, 0xE96B0001, 0x00010005, 0x00070000, 0xF556E85E, 0x00010001, 0x00050007, 0x0000F556, 0xE77C0001, 0x00010005, 0x00070000, 0xF556E71D, 0x00010001, 0x00010001, 0x00080007, 0xFEA9014C, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0149FFC8, 0x00010001, 0x00080007, 0xFEA90143, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x013CFFC8, 0x00010001, 0x00080007, 0xFEA90133, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0128FFC8, 0x00010001, 0x00080007, 0xFEA9011B, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x010CFFC8, 0x00010001, 0x00080007, 0xFEA900FB, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x00E8FFC8, 0x00010001, 0x00080007, 0xFEA900D2, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x00BAFFC8, 0x00010001, 0x00080007, 0xFEA9009F, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0082FFC8, 0x00010001, 0x00080007, 0xFEA90063, 0xFFC80001, 0x00010008, 0x0007FEA9, 0x0040FFC8, 0x00010001, 0x00080007, 0xFEA9001B, 0xFFC80001, 0x00010008, 0x0007FEA9, 0xFFF4FFC8, 0x00010001, 0x00080007, 0xFEA9FFC9, 0xFFC80001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010005, 0x00030000, 0x1FFF0040, 0x00080003, 0xFF0400D3, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF00FB, 0x00080003, 0xFF0400D0, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF022A, 0x00080003, 0xFF0400CA, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF03C5, 0x00080003, 0xFF0400C3, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF05C6, 0x00080003, 0xFF0400B9, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF0825, 0x00080003, 0xFF0400AE, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF0ADB, 0x00080003, 0xFF0400A1, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF0DE0, 0x00080003, 0xFF040093, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF112E, 0x00080003, 0xFF040083, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF14BC, 0x00080003, 0xFF040072, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF1884, 0x00080003, 0xFF040060, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF1C7F, 0x00080003, 0xFF04004C, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF20A4, 0x00080003, 0xFF040038, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF24EE, 0x00080003, 0xFF040023, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF2954, 0x00080003, 0xFF04000D, 0xFFB00001, 0x00010005, 0x00030000, 0x1FFF2DCF, 0x00080003, 0xFF04FFF7, 0xFFB00005, 0x00050013, 0xCAAC0000, 0x00080005, 0xFE8800CD, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF3258, 0x00080003, 0xFF04FFE0, 0xFFB00005, 0x0005004E, 0xCAAC0000, 0x00080005, 0xFE8800C9, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF36E8, 0x00080003, 0xFF04FFC9, 0xFFB00005, 0x000500AD, 0xCAAC0000, 0x00080005, 0xFE8800C4, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF3B77, 0x00080003, 0xFF04FFB1, 0xFFB00005, 0x0005012E, 0xCAAC0000, 0x00080005, 0xFE8800BD, 0xFFAE0001, 0x00010005, 0x00030000, 0x1FFF3FFF, 0x00080003, 0xFF04FF9A, 0xFFB00005, 0x000501D0, 0xCAAC0000, 0x00080005, 0xFE8800B4, 0xFFAE0001, 0x00010005, 0x00050291, 0xCAAC0000, 0x00080005, 0xFE8800A9, 0xFFAE0001, 0x00010005, 0x0005036E, 0xCAAC0000, 0x00080005, 0xFE88009C, 0xFFAE0001, 0x00010005, 0x00050466, 0xCAAC0000, 0x00080005, 0xFE88008E, 0xFFAE0001, 0x00010005, 0x00050577, 0xCAAC0000, 0x00080005, 0xFE88007F, 0xFFAE0001, 0x00010005, 0x0005069E, 0xCAAC0000, 0x00080005, 0xFE88006E, 0xFFAE0001, 0x00010005, 0x000507DA, 0xCAAC0000, 0x00080005, 0xFE88005C, 0xFFAE0001, 0x00010005, 0x00050929, 0xCAAC0000, 0x00080005, 0xFE880049, 0xFFAE0001, 0x00010005, 0x00050A88, 0xCAAC0000, 0x00080005, 0xFE880035, 0xFFAE0001, 0x00010005, 0x00050BF7, 0xCAAC0000, 0x00080005, 0xFE880020, 0xFFAE0001, 0x00010005, 0x00050D72, 0xCAAC0000, 0x00080005, 0xFE88000A, 0xFFAE0001, 0x00010005, 0x00050EF8, 0xCAAC0000, 0x00080005, 0xFE88FFF5, 0xFFAE0001, 0x00010005, 0x00051087, 0xCAAC0000, 0x00080005, 0xFE88FFDE, 0xFFAE0001, 0x00010005, 0x0005121C, 0xCAAC0000, 0x00080005, 0xFE88FFC6, 0xFFAE0001, 0x00010005, 0x000513B7, 0xCAAC0000, 0x00080005, 0xFE88FFAE, 0xFFAE0001, 0x00010005, 0x00051555, 0xCAAC0000, 0x00080005, 0xFE88FF96, 0xFFAE0001, 0x00010005, 0x005C0012, 0x00000000, 0x00010001, 0x0005005C, 0x004D0000, 0x00000001, 0x00010005, 0x005C00B4, 0x00000000, 0x00010001, 0x0005005C, 0x014A0000, 0x00000001, 0x00010005, 0x005C0212, 0x00000000, 0x00010001, 0x0005005C, 0x03120000, 0x00000001, 0x00010005, 0x005C044C, 0x00000000, 0x00010001, 0x0005005C, 0x05C30000, 0x00000001, 0x00010005, 0x005C077C, 0x00000000, 0x00010001, 0x0005005C, 0x097B0000, 0x00000001, 0x00010005, 0x005C0BC2, 0x00000000, 0x0005005F, 0x00120000, 0x00000001, 0x00010005, 0x005C0E55, 0x00000000, 0x0005005F, 0x004D0000, 0x00000001, 0x00010005, 0x005C1139, 0x00000000, 0x0005005F, 0x00B40000, 0x00000001, 0x00010005, 0x005C1470, 0x00000000, 0x0005005F, 0x014A0000, 0x00000001, 0x00010005, 0x005C17FF, 0x00000000, 0x0005005F, 0x02120000, 0x00000001, 0x00010005, 0x00590012, 0x00000000, 0x0005005C, 0x1BE90000, 0x00000005, 0x005F0312, 0x00000000, 0x00010001, 0x00050059, 0x004D0000, 0x00000005, 0x005C2032, 0x00000000, 0x0005005F, 0x044C0000, 0x00000001, 0x00010005, 0x005900B4, 0x00000000, 0x0005005C, 0x24DC0000, 0x00000005, 0x005F05C3, 0x00000000, 0x00010001, 0x00050059, 0x014A0000, 0x00000005, 0x005C29ED, 0x00000000, 0x0005005F, 0x077C0000, 0x00000001, 0x00010005, 0x00590212, 0x00000000, 0x0005005C, 0x2F670000, 0x00000005, 0x005F097B, 0x00000000, 0x00010001, 0x00050059, 0x03120000, 0x00000005, 0x005C354F, 0x00000000, 0x0005005F, 0x0BC20000, 0x00000001, 0x00010005, 0x0059044C, 0x00000000, 0x0005005C, 0x3BA70000, 0x00000005, 0x005F0E55, 0x00000000, 0x00010001, 0x00050059, 0x05C30000, 0x00000005, 0x005C4274, 0x00000000, 0x0005005F, 0x11390000, 0x00000001, 0x00010005, 0x0059077C, 0x00000000, 0x0005005C, 0x49B90000, 0x00000005, 0x005F1470, 0x00000000, 0x00010001, 0x00050059, 0x097B0000, 0x00000005, 0x005C517A, 0x00000000, 0x0005005F, 0x17FF0000, 0x00000001, 0x00010005, 0x00590BC2, 0x00000000, 0x0005005C, 0x59BA0000, 0x00000005, 0x005F1BE9, 0x00000000, 0x00010001, 0x00050059, 0x0E550000, 0x00000005, 0x005C627E, 0x00000000, 0x0005005F, 0x20320000, 0x00000001, 0x00010005, 0x00591139, 0x00000000, 0x0005005C, 0x6BC80000, 0x00000005, 0x005F24DC, 0x00000000, 0x00010001, 0x00050059, 0x14700000, 0x00000005, 0x005C759C, 0x00000000, 0x0005005F, 0x29ED0000, 0x00000001, 0x00010005, 0x005917FF, 0x00000000, 0x0005005C, 0x80010000, 0x00000005, 0x005F2F67, 0x00000000, 0x00010001, 0x00050059, 0x1BE90000, 0x00000005, 0x005B0888, 0x16EE0000, 0x0005005F, 0x354F0000, 0x00000005, 0x00620012, 0x00000000, 0x00010001, 0x00050059, 0x20320000, 0x00000005, 0x005B1110, 0x16EE0000, 0x0005005F, 0x3BA70000, 0x00000005, 0x0062004D, 0x00000000, 0x00010001, 0x00050059, 0x24DC0000, 0x00000005, 0x005B1999, 0x16EE0000, 0x0005005F, 0x42740000, 0x00000005, 0x006200B4, 0x00000000, 0x00010001, 0x00050059, 0x29ED0000, 0x00000005, 0x005B2221, 0x16EE0000, 0x0005005F, 0x49B90000, 0x00000005, 0x0062014A, 0x00000000, 0x00010001, 0x00050059, 0x2F670000, 0x00000005, 0x005B2AAA, 0x16EE0000, 0x0005005F, 0x517A0000, 0x00000005, 0x00620212, 0x00000000, 0x00010001, 0x00050059, 0x354F0000, 0x00000005, 0x005B3332, 0x16EE0000, 0x0005005F, 0x59BA0000, 0x00000005, 0x00620312, 0x00000000, 0x00010001, 0x00050059, 0x3BA70000, 0x00000005, 0x005B3BBB, 0x16EE0000, 0x0005005F, 0x627E0000, 0x00000005, 0x0062044C, 0x00000000, 0x00010001, 0x00050059, 0x42740000, 0x00000005, 0x005B4443, 0x16EE0000, 0x0005005F, 0x6BC80000, 0x00000005, 0x006205C3, 0x00000000, 0x00010001, 0x00050059, 0x49B90000, 0x00000005, 0x005B4CCC, 0x16EE0000, 0x0005005F, 0x759C0000, 0x00000005, 0x0062077C, 0x00000000, 0x00010001, 0x00050059, 0x517A0000, 0x00000005, 0x005B5554, 0x16EE0000, 0x0005005F, 0x80010000, 0x00000005, 0x0062097B, 0x00000000, 0x00010001, 0x00050059, 0x59BA0000, 0x00000005, 0x005B5DDD, 0x16EE0000, 0x0005005E, 0x0888EC45, 0x00000005, 0x00620BC2, 0x00000000, 0x00050068, 0x00120000, 0x00000001, 0x00010005, 0x0059627E, 0x00000000, 0x0005005B, 0x666516EE, 0x00000005, 0x005E1110, 0xEC450000, 0x00050062, 0x0E550000, 0x00000005, 0x0068004D, 0x00000000, 0x00010001, 0x00050059, 0x6BC80000, 0x00000005, 0x005B6EEE, 0x16EE0000, 0x0005005E, 0x1999EC45, 0x00000005, 0x00621139, 0x00000000, 0x00050068, 0x00B40000, 0x00000001, 0x00010005, 0x0059759C, 0x00000000, 0x0005005B, 0x777616EE, 0x00000005, 0x005E2221, 0xEC450000, 0x00050062, 0x14700000, 0x00000005, 0x0068014A, 0x00000000, 0x00010001, 0x00050059, 0x80010000, 0x00000005, 0x005B8001, 0x16EE0000, 0x0005005E, 0x2AAAEC45, 0x00000005, 0x006217FF, 0x00000000, 0x00050068, 0x02120000, 0x00000001, 0x00010005, 0x004D01A1, 0x16EE0000, 0x00050058, 0x08884199, 0x00000008, 0x005B0002, 0x00B50018, 0x0005005E, 0x3332EC45, 0x00000005, 0x00621BE9, 0x00000000, 0x00050068, 0x03120000, 0x00000001, 0x00010005, 0x004D0638, 0x16EE0000, 0x00050058, 0x11104199, 0x00000008, 0x005B0002, 0x00A70018, 0x0005005E, 0x3BBBEC45, 0x00000005, 0x00622032, 0x00000000, 0x00050068, 0x044C0000, 0x00000001, 0x00010005, 0x004D0D4F, 0x16EE0000, 0x00050058, 0x19994199, 0x00000008, 0x005B0002, 0x00980018, 0x0005005E, 0x4443EC45, 0x00000005, 0x006224DC, 0x00000000, 0x00050068, 0x05C30000, 0x00000001, 0x00010005, 0x004D1673, 0x16EE0000, 0x00050058, 0x22214199, 0x00000008, 0x005B0002, 0x008A0018, 0x0005005E, 0x4CCCEC45, 0x00000005, 0x006229ED, 0x00000000, 0x00050068, 0x077C0000, 0x00000001, 0x00010005, 0x004D212F, 0x16EE0000, 0x00050058, 0x2AAA4199, 0x00000008, 0x005B0002, 0x007C0018, 0x0005005E, 0x5554EC45, 0x00000005, 0x00622F67, 0x00000000, 0x00050068, 0x097B0000, 0x00000001, 0x00010005, 0x004D2D0D, 0x16EE0000, 0x00050058, 0x33324199, 0x00000008, 0x005B0002, 0x006D0018, 0x0005005E, 0x5DDDEC45, 0x00000005, 0x0062354F, 0x00000000, 0x00050068, 0x0BC20000, 0x00000001, 0x00010005, 0x004D399B, 0x16EE0000, 0x00050058, 0x3BBB4199, 0x00000008, 0x005B0002, 0x005F0018, 0x0005005E, 0x6665EC45, 0x00000005, 0x00623BA7, 0x00000000, 0x00050068, 0x0E550000, 0x00000001, 0x00010005, 0x004D4663, 0x16EE0000, 0x00050058, 0x44434199, 0x00000008, 0x005B0002, 0x00500018, 0x0005005E, 0x6EEEEC45, 0x00000005, 0x00624274, 0x00000000, 0x00050068, 0x11390000, 0x00000001, 0x00010005, 0x004D52F0, 0x16EE0000, 0x00050058, 0x4CCC4199, 0x00000008, 0x005B0002, 0x00420018, 0x0005005E, 0x7776EC45, 0x00000005, 0x006249B9, 0x00000000, 0x00050068, 0x14700000, 0x00000001, 0x00010005, 0x004D5ECF, 0x16EE0000, 0x00050058, 0x55544199, 0x00000008, 0x005B0002, 0x00340018, 0x0005005E, 0x8001EC45, 0x00000005, 0x0062517A, 0x00000000, 0x00050068, 0x17FF0000, 0x00000001, 0x00010005, 0x004D698B, 0x16EE0000, 0x0005004F, 0x01A1EC45, 0x00000005, 0x00585DDD, 0x41990000, 0x0008005B, 0x00020025, 0x00180008, 0x005EFFB9, 0x00B5001B, 0x00050062, 0x59BA0000, 0x00000005, 0x00650012, 0x00000000, 0x00050068, 0x1BE90000, 0x00000001, 0x00010005, 0x004D72AF, 0x16EE0000, 0x0005004F, 0x0638EC45, 0x00000005, 0x00586665, 0x41990000, 0x0008005B, 0x00020017, 0x00180008, 0x005EFFB9, 0x00A7001B, 0x00050062, 0x627E0000, 0x00000005, 0x0065004D, 0x00000000, 0x00050068, 0x20320000, 0x00000001, 0x00010005, 0x004D79C6, 0x16EE0000, 0x0005004F, 0x0D4FEC45, 0x00000005, 0x00586EEE, 0x41990000, 0x0008005B, 0x00020008, 0x00180008, 0x005EFFB9, 0x0098001B, 0x00050062, 0x6BC80000, 0x00000005, 0x006500B4, 0x00000000, 0x00050068, 0x24DC0000, 0x00000001, 0x00010005, 0x004D7E5D, 0x16EE0000, 0x0005004F, 0x1673EC45, 0x00000005, 0x00587776, 0x41990000, 0x0008005B, 0x0002FFFB, 0x00180008, 0x005EFFB9, 0x008A001B, 0x00050062, 0x759C0000, 0x00000005, 0x0065014A, 0x00000000, 0x00050068, 0x29ED0000, 0x00000001, 0x00010005, 0x004D8001, 0x16EE0000, 0x0005004F, 0x212FEC45, 0x00000005, 0x00588001, 0x41990000, 0x0008005B, 0x0002FFEC, 0x00180008, 0x005EFFB9, 0x007C001B, 0x00050062, 0x80010000, 0x00000005, 0x00650212, 0x00000000, 0x00050068, 0x2F670000, 0x00000001, 0x00010005, 0x004B01A1, 0x41990000, 0x0008004D, 0x000200C0, 0x00180005, 0x004F2D0D, 0xEC450000, 0x00080058, 0x002400B5, 0xFFD70008, 0x005EFFB9, 0x006D001B, 0x00050061, 0x0888C19B, 0x00000005, 0x00650312, 0x00000000, 0x00050068, 0x354F0000, 0x00000001, 0x00010005, 0x004B0638, 0x41990000, 0x0008004D, 0x000200B5, 0x00180005, 0x004F399B, 0xEC450000, 0x00080058, 0x002400A7, 0xFFD70008, 0x005EFFB9, 0x005F001B, 0x00050061, 0x1110C19B, 0x00000005, 0x0065044C, 0x00000000, 0x00050068, 0x3BA70000, 0x00000001, 0x00010005, 0x004B0D4F, 0x41990000, 0x0008004D, 0x000200A4, 0x00180005, 0x004F4663, 0xEC450000, 0x00080058, 0x00240098, 0xFFD70008, 0x005EFFB9, 0x0050001B, 0x00050061, 0x1999C19B, 0x00000005, 0x006505C3, 0x00000000, 0x00050068, 0x42740000, 0x00000001, 0x00010005, 0x004B1673, 0x41990000, 0x0008004D, 0x0002008E, 0x00180005, 0x004F52F1, 0xEC450000, 0x00080058, 0x0024008A, 0xFFD70008, 0x005EFFB9, 0x0042001B, 0x00050061, 0x2221C19B, 0x00000005, 0x0065077C, 0x00000000, 0x00050068, 0x49B90000, 0x00000001, 0x00010005, 0x004B212F, 0x41990000, 0x0008004D, 0x00020074, 0x00180005, 0x004F5ECF, 0xEC450000, 0x00080058, 0x0024007C, 0xFFD70008, 0x005EFFB9, 0x0034001B, 0x00050061, 0x2AAAC19B, 0x00000005, 0x0065097B, 0x00000000, 0x00050068, 0x517A0000, 0x00000001, 0x00010005, 0x004B2D0D, 0x41990000, 0x0008004D, 0x00020058, 0x00180005, 0x004F698B, 0xEC450000, 0x00080058, 0x0024006D, 0xFFD70008, 0x005EFFB9, 0x0025001B, 0x00050061, 0x3332C19B, 0x00000005, 0x00650BC2, 0x00000000, 0x00050068, 0x59BA0000, 0x00000001, 0x00010005, 0x004B399B, 0x41990000, 0x0008004D, 0x0002003A, 0x00180005, 0x004F72AF, 0xEC450000, 0x00080058, 0x0024005F, 0xFFD70008, 0x005EFFB9, 0x0017001B, 0x00050061, 0x3BBBC19B, 0x00000005, 0x00650E55, 0x00000000, 0x00050068, 0x627E0000, 0x00000001, 0x00010005, 0x004B4663, 0x41990000, 0x0008004D, 0x0002001C, 0x00180005, 0x004F79C6, 0xEC450000, 0x00080058, 0x00240050, 0xFFD70008, 0x005EFFB9, 0x0008001B, 0x00050061, 0x4443C19B, 0x00000005, 0x00651139, 0x00000000, 0x00050068, 0x6BC80000, 0x00000001, 0x00010005, 0x004B52F0, 0x41990000, 0x0008004D, 0x0002FFFF, 0x00180005, 0x004F7E5D, 0xEC450000, 0x00080058, 0x00240042, 0xFFD70008, 0x005EFFB9, 0xFFFB001B, 0x00050061, 0x4CCCC19B, 0x00000005, 0x00651470, 0x00000000, 0x00050068, 0x759C0000, 0x00000001, 0x00010005, 0x004B5ECF, 0x41990000, 0x0008004D, 0x0002FFE2, 0x00180005, 0x004F8001, 0xEC450000, 0x00080058, 0x00240034, 0xFFD70008, 0x005EFFB9, 0xFFEC001B, 0x00050061, 0x5554C19B, 0x00000005, 0x006517FF, 0x00000000, 0x00050068, 0x80010000, 0x00000001, 0x00010005, 0x004B698B, 0x41990000, 0x0008004D, 0x0002FFC9, 0x00180008, 0x004FFFB9, 0x00C0001B, 0x00080058, 0x00240025, 0xFFD70005, 0x00615DDD, 0xC19B0000, 0x00050065, 0x1BE90000, 0x00000005, 0x00670888, 0x6C430000, 0x00010001, 0x0005004B, 0x72AF4199, 0x00000008, 0x004D0002, 0xFFB30018, 0x0008004F, 0xFFB900B5, 0x001B0008, 0x00580024, 0x0017FFD7, 0x00050061, 0x6665C19B, 0x00000005, 0x00652032, 0x00000000, 0x00050067, 0x11106C43, 0x00000001, 0x00010005, 0x004B79C6, 0x41990000, 0x0008004D, 0x0002FFA2, 0x00180008, 0x004FFFB9, 0x00A4001B, 0x00080058, 0x00240008, 0xFFD70005, 0x00616EEE, 0xC19B0000, 0x00050065, 0x24DC0000, 0x00000005, 0x00671999, 0x6C430000, 0x00010001, 0x0005004B, 0x7E5D4199, 0x00000008, 0x004D0002, 0xFF970018, 0x0008004F, 0xFFB9008E, 0x001B0008, 0x00580024, 0xFFFBFFD7, 0x00050061, 0x7776C19B, 0x00000005, 0x006529ED, 0x00000000, 0x00050067, 0x22216C43, 0x00000001, 0x00010005, 0x004B8001, 0x41990000, 0x0008004D, 0x0002FF93, 0x00180008, 0x004FFFB9, 0x0074001B, 0x00080058, 0x0024FFEC, 0xFFD70005, 0x00618001, 0xC19B0000, 0x00050065, 0x2F670000, 0x00000005, 0x00672AAA, 0x6C430000, 0x00010001, 0x00080040, 0x00010067, 0x00170008, 0x004B0024, 0x00C0FFD7, 0x0008004F, 0xFFB90058, 0x001B0008, 0x0061FF91, 0x00B5FFDD, 0x00050065, 0x354F0000, 0x00000005, 0x00673332, 0x6C430000, 0x00010001, 0x00080040, 0x00010060, 0x00170008, 0x004B0024, 0x00B5FFD7, 0x0008004F, 0xFFB9003A, 0x001B0005, 0x005101A1, 0xC19B0000, 0x00080061, 0xFF9100A7, 0xFFDD0005, 0x00653BA7, 0x00000000, 0x00050067, 0x3BBB6C43, 0x00000001, 0x00010008, 0x00400001, 0x00540017, 0x0008004B, 0x002400A4, 0xFFD70008, 0x004FFFB9, 0x001C001B, 0x00050051, 0x0638C19B, 0x00000008, 0x0061FF91, 0x0098FFDD, 0x00050065, 0x42740000, 0x00000005, 0x00674443, 0x6C430000, 0x00010001, 0x00080040, 0x00010045, 0x00170008, 0x004B0024, 0x008EFFD7, 0x0008004F, 0xFFB9FFFF, 0x001B0005, 0x00510D4F, 0xC19B0000, 0x00080061, 0xFF91008A, 0xFFDD0005, 0x006549B9, 0x00000000, 0x00050067, 0x4CCC6C43, 0x00000001, 0x00010008, 0x00400001, 0x00330017, 0x0008004B, 0x00240074, 0xFFD70008, 0x004FFFB9, 0xFFE2001B, 0x00050051, 0x1673C19B, 0x00000008, 0x0061FF91, 0x007CFFDD, 0x00050065, 0x517A0000, 0x00000005, 0x00675554, 0x6C430000, 0x00010001, 0x00080040, 0x0001001F, 0x00170008, 0x004B0024, 0x0058FFD7, 0x0008004F, 0xFFB9FFC9, 0x001B0005, 0x0051212F, 0xC19B0000, 0x00080061, 0xFF91006D, 0xFFDD0005, 0x006559BA, 0x00000000, 0x00050067, 0x5DDD6C43, 0x00000001, 0x00010008, 0x00400001, 0x000A0017, 0x0008004B, 0x0024003A, 0xFFD70008, 0x004FFFB9, 0xFFB3001B, 0x00050051, 0x2D0DC19B, 0x00000008, 0x0061FF91, 0x005FFFDD, 0x00050065, 0x627E0000, 0x00000005, 0x00676665, 0x6C430000, 0x00010001, 0x00080040, 0x0001FFF6, 0x00170008, 0x004B0024, 0x001CFFD7, 0x0008004F, 0xFFB9FFA2, 0x001B0005, 0x0051399B, 0xC19B0000, 0x00080061, 0xFF910050, 0xFFDD0005, 0x00656BC8, 0x00000000, 0x00050067, 0x6EEE6C43, 0x00000001, 0x00010008, 0x00400001, 0xFFE10017, 0x0008004B, 0x0024FFFF, 0xFFD70008, 0x004FFFB9, 0xFF97001B, 0x00050051, 0x4663C19B, 0x00000008, 0x0061FF91, 0x0042FFDD, 0x00050065, 0x759C0000, 0x00000005, 0x00677776, 0x6C430000, 0x00010001, 0x00080040, 0x0001FFCD, 0x00170008, 0x004B0024, 0xFFE2FFD7, 0x0008004F, 0xFFB9FF93, 0x001B0005, 0x005152F1, 0xC19B0000, 0x00080061, 0xFF910034, 0xFFDD0005, 0x00658001, 0x00000000, 0x00050067, 0x80016C43, 0x00000001, 0x00010008, 0x00400001, 0xFFBB0017, 0x00080042, 0xFFB90067, 0x001A0008, 0x004B0024, 0xFFC9FFD7, 0x00050051, 0x5ECFC19B, 0x00000005, 0x005501A1, 0x6C430000, 0x00080061, 0xFF910025, 0xFFDD0005, 0x00640888, 0x96F00000, 0x00080067, 0xFFFD00B5, 0xFF990001, 0x00010008, 0x00400001, 0xFFAC0017, 0x00080042, 0xFFB90060, 0x001A0008, 0x004B0024, 0xFFB3FFD7, 0x00050051, 0x698BC19B, 0x00000005, 0x00550638, 0x6C430000, 0x00080061, 0xFF910017, 0xFFDD0005, 0x00641110, 0x96F00000, 0x00080067, 0xFFFD00A7, 0xFF990001, 0x00010008, 0x00400001, 0xFFA00017, 0x00080042, 0xFFB90054, 0x001A0008, 0x004B0024, 0xFFA2FFD7, 0x00050051, 0x72AFC19B, 0x00000005, 0x00550D4F, 0x6C430000, 0x00080061, 0xFF910008, 0xFFDD0005, 0x00641999, 0x96F00000, 0x00080067, 0xFFFD0098, 0xFF990001, 0x00010008, 0x00400001, 0xFF990017, 0x00080042, 0xFFB90045, 0x001A0008, 0x004B0024, 0xFF97FFD7, 0x00050051, 0x79C6C19B, 0x00000005, 0x00551673, 0x6C430000, 0x00080061, 0xFF91FFFB, 0xFFDD0005, 0x00642221, 0x96F00000, 0x00080067, 0xFFFD008A, 0xFF990001, 0x00010008, 0x00400001, 0xFF960017, 0x00080042, 0xFFB90033, 0x001A0008, 0x004B0024, 0xFF93FFD7, 0x00050051, 0x7E5DC19B, 0x00000005, 0x0055212F, 0x6C430000, 0x00080061, 0xFF91FFEC, 0xFFDD0005, 0x00642AAA, 0x96F00000, 0x00080067, 0xFFFD007C, 0xFF990001, 0x00010008, 0x003E0023, 0x0067FFD7, 0x00080042, 0xFFB9001F, 0x001A0005, 0x00518001, 0xC19B0000, 0x00050055, 0x2D0D6C43, 0x00000005, 0x00643332, 0x96F00000, 0x00080067, 0xFFFD006D, 0xFF990001, 0x00010008, 0x003E0023, 0x0060FFD7, 0x00080042, 0xFFB9000A, 0x001A0008, 0x0051FF91, 0x00C0FFDD, 0x00050055, 0x399B6C43, 0x00000005, 0x00643BBB, 0x96F00000, 0x00080067, 0xFFFD005F, 0xFF990001, 0x00010008, 0x003E0023, 0x0054FFD7, 0x00080042, 0xFFB9FFF6, 0x001A0008, 0x0051FF91, 0x00B5FFDD, 0x00050055, 0x46636C43, 0x00000005, 0x00644443, 0x96F00000, 0x00080067, 0xFFFD0050, 0xFF990001, 0x00010008, 0x003E0023, 0x0045FFD7, 0x00080042, 0xFFB9FFE1, 0x001A0008, 0x0051FF91, 0x00A4FFDD, 0x00050055, 0x52F16C43, 0x00000005, 0x00644CCC, 0x96F00000, 0x00080067, 0xFFFD0042, 0xFF990001, 0x00010008, 0x003E0023, 0x0033FFD7, 0x00080042, 0xFFB9FFCD, 0x001A0008, 0x0051FF91, 0x008EFFDD, 0x00050055, 0x5ECF6C43, 0x00000005, 0x00645554, 0x96F00000, 0x00080067, 0xFFFD0034, 0xFF990001, 0x00010008, 0x003E0023, 0x001FFFD7, 0x00080042, 0xFFB9FFBB, 0x001A0008, 0x0051FF91, 0x0074FFDD, 0x00050055, 0x698B6C43, 0x00000005, 0x00645DDD, 0x96F00000, 0x00080067, 0xFFFD0025, 0xFF990001, 0x00010008, 0x003E0023, 0x000AFFD7, 0x00080042, 0xFFB9FFAC, 0x001A0008, 0x0051FF91, 0x0058FFDD, 0x00050055, 0x72AF6C43, 0x00000005, 0x00646665, 0x96F00000, 0x00080067, 0xFFFD0017, 0xFF990001, 0x00010008, 0x003E0023, 0xFFF6FFD7, 0x00080042, 0xFFB9FFA0, 0x001A0008, 0x0051FF91, 0x003AFFDD, 0x00050055, 0x79C66C43, 0x00000005, 0x00646EEE, 0x96F00000, 0x00080067, 0xFFFD0008, 0xFF990001, 0x00010008, 0x003E0023, 0xFFE1FFD7, 0x00080042, 0xFFB9FF99, 0x001A0008, 0x0051FF91, 0x001CFFDD, 0x00050055, 0x7E5D6C43, 0x00000005, 0x00647776, 0x96F00000, 0x00080067, 0xFFFDFFFB, 0xFF990001, 0x00010008, 0x003E0023, 0xFFCDFFD7, 0x00080042, 0xFFB9FF96, 0x001A0008, 0x0051FF91, 0xFFFFFFDD, 0x00050055, 0x80016C43, 0x00000005, 0x00648001, 0x96F00000, 0x00080067, 0xFFFDFFEC, 0xFF990001, 0x00010008, 0x003E0023, 0xFFBBFFD7, 0x00080051, 0xFF91FFE2, 0xFFDD0005, 0x005301A1, 0x96F00000, 0x00080055, 0xFFFD00C0, 0xFF990008, 0x0064FFB3, 0x00B5FF9B, 0x00010001, 0x0008003E, 0x0023FFAC, 0xFFD70008, 0x0051FF91, 0xFFC9FFDD, 0x00050053, 0x063896F0, 0x00000008, 0x0055FFFD, 0x00B5FF99, 0x00080064, 0xFFB300A7, 0xFF9B0001, 0x00010008, 0x003E0023, 0xFFA0FFD7, 0x00080051, 0xFF91FFB3, 0xFFDD0005, 0x00530D4F, 0x96F00000, 0x00080055, 0xFFFD00A4, 0xFF990008, 0x0064FFB3, 0x0098FF9B, 0x00010001, 0x0008003E, 0x0023FF99, 0xFFD70008, 0x0051FF91, 0xFFA2FFDD, 0x00050053, 0x167396F0, 0x00000008, 0x0055FFFD, 0x008EFF99, 0x00080064, 0xFFB3008A, 0xFF9B0001, 0x00010008, 0x003E0023, 0xFF96FFD7, 0x00080051, 0xFF91FF97, 0xFFDD0005, 0x0053212F, 0x96F00000, 0x00080055, 0xFFFD0074, 0xFF990008, 0x0064FFB3, 0x007CFF9B, 0x00010001, 0x00080044, 0xFF920067, 0xFFDD0008, 0x0051FF91, 0xFF93FFDD, 0x00050053, 0x2D0D96F0, 0x00000008, 0x0055FFFD, 0x0058FF99, 0x00080064, 0xFFB3006D, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0060FFDD, 0x00050053, 0x399B96F0, 0x00000008, 0x0055FFFD, 0x003AFF99, 0x00080064, 0xFFB3005F, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0054FFDD, 0x00050053, 0x466396F0, 0x00000008, 0x0055FFFD, 0x001CFF99, 0x00080064, 0xFFB30050, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0045FFDD, 0x00050053, 0x52F196F0, 0x00000008, 0x0055FFFD, 0xFFFFFF99, 0x00080064, 0xFFB30042, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x0033FFDD, 0x00050053, 0x5ECF96F0, 0x00000008, 0x0055FFFD, 0xFFE2FF99, 0x00080064, 0xFFB30034, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x001FFFDD, 0x00050053, 0x698B96F0, 0x00000008, 0x0055FFFD, 0xFFC9FF99, 0x00080064, 0xFFB30025, 0xFF9B0001, 0x00010008, 0x0044FF92, 0x000AFFDD, 0x00050053, 0x72AF96F0, 0x00000008, 0x0055FFFD, 0xFFB3FF99, 0x00080064, 0xFFB30017, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFF6FFDD, 0x00050053, 0x79C696F0, 0x00000008, 0x0055FFFD, 0xFFA2FF99, 0x00080064, 0xFFB30008, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFE1FFDD, 0x00050053, 0x7E5D96F0, 0x00000008, 0x0055FFFD, 0xFF97FF99, 0x00080064, 0xFFB3FFFB, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFCDFFDD, 0x00050053, 0x800196F0, 0x00000008, 0x0055FFFD, 0xFF93FF99, 0x00080064, 0xFFB3FFEC, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFBBFFDD, 0x00080046, 0xFFFD0067, 0xFF990008, 0x0053FFB3, 0x00C0FF9B, 0x00010001, 0x00080044, 0xFF92FFAC, 0xFFDD0008, 0x0046FFFD, 0x0060FF99, 0x00080053, 0xFFB300B5, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFFA0FFDD, 0x00080046, 0xFFFD0054, 0xFF990008, 0x0053FFB3, 0x00A4FF9B, 0x00010001, 0x00080044, 0xFF92FF99, 0xFFDD0008, 0x0046FFFD, 0x0045FF99, 0x00080053, 0xFFB3008E, 0xFF9B0001, 0x00010008, 0x0044FF92, 0xFF96FFDD, 0x00080046, 0xFFFD0033, 0xFF990008, 0x0053FFB3, 0x0074FF9B, 0x00010001, 0x00080046, 0xFFFD001F, 0xFF990008, 0x0053FFB3, 0x0058FF9B, 0x00010001, 0x00080046, 0xFFFD000A, 0xFF990008, 0x0053FFB3, 0x003AFF9B, 0x00010001, 0x00080046, 0xFFFDFFF6, 0xFF990008, 0x0053FFB3, 0x001CFF9B, 0x00010001, 0x00080046, 0xFFFDFFE1, 0xFF990008, 0x0053FFB3, 0xFFFFFF9B, 0x00010001, 0x00080046, 0xFFFDFFCD, 0xFF990008, 0x0053FFB3, 0xFFE2FF9B, 0x00010001, 0x00080046, 0xFFFDFFBB, 0xFF990008, 0x0053FFB3, 0xFFC9FF9B, 0x00010001, 0x00080046, 0xFFFDFFAC, 0xFF990008, 0x0053FFB3, 0xFFB3FF9B, 0x00010001, 0x00080046, 0xFFFDFFA0, 0xFF990008, 0x0053FFB3, 0xFFA2FF9B, 0x00010001, 0x00080046, 0xFFFDFF99, 0xFF990008, 0x0053FFB3, 0xFF97FF9B, 0x00010001, 0x00080046, 0xFFFDFF96, 0xFF990008, 0x0053FFB3, 0xFF93FF9B, 0x00010001, 0x00080048, 0xFFB40067, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0x0060FF9C, 0x00010001, 0x00080048, 0xFFB40054, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0x0045FF9C, 0x00010001, 0x00080048, 0xFFB40033, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0x001FFF9C, 0x00010001, 0x00080048, 0xFFB4000A, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFFF6FF9C, 0x00010001, 0x00080048, 0xFFB4FFE1, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFFCDFF9C, 0x00010001, 0x00080048, 0xFFB4FFBB, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFFACFF9C, 0x00010001, 0x00080048, 0xFFB4FFA0, 0xFF9C0001, 0x00010008, 0x0048FFB4, 0xFF99FF9C, 0x00010001, 0x000A0008, 0x0048FFB4, 0xFF96FF9C, 0x00010001, 0x00030000, 0x00000000
 
 dlabel D_8024EEF0_8E8FF0
 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000000, 0x00770000
diff --git a/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_player_turn.s b/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_player_turn.s
index 0578ee9a1a..339713162c 100644
--- a/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_player_turn.s
+++ b/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_player_turn.s
@@ -149,7 +149,7 @@ glabel btl_state_update_begin_player_turn
 /* 170B30 80242250 8E250144 */  lw        $a1, 0x144($s1)
 /* 170B34 80242254 44062000 */  mfc1      $a2, $f4
 /* 170B38 80242258 44073000 */  mfc1      $a3, $f6
-/* 170B3C 8024225C 0C01C694 */  jal       playFX_5A
+/* 170B3C 8024225C 0C01C694 */  jal       fx_water_block
 /* 170B40 80242260 24040001 */   addiu    $a0, $zero, 1
 /* 170B44 80242264 C6220144 */  lwc1      $f2, 0x144($s1)
 /* 170B48 80242268 3C014120 */  lui       $at, 0x4120
@@ -168,7 +168,7 @@ glabel btl_state_update_begin_player_turn
 /* 170B7C 8024229C 44070000 */  mfc1      $a3, $f0
 /* 170B80 802422A0 24100018 */  addiu     $s0, $zero, 0x18
 /* 170B84 802422A4 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 170B88 802422A8 0C01C70C */  jal       playFX_5F
+/* 170B88 802422A8 0C01C70C */  jal       fx_water_splash
 /* 170B8C 802422AC AFB00014 */   sw       $s0, 0x14($sp)
 /* 170B90 802422B0 C6200144 */  lwc1      $f0, 0x144($s1)
 /* 170B94 802422B4 3C014170 */  lui       $at, 0x4170
@@ -187,7 +187,7 @@ glabel btl_state_update_begin_player_turn
 /* 170BC8 802422E8 44070000 */  mfc1      $a3, $f0
 /* 170BCC 802422EC 0000202D */  daddu     $a0, $zero, $zero
 /* 170BD0 802422F0 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 170BD4 802422F4 0C01C70C */  jal       playFX_5F
+/* 170BD4 802422F4 0C01C70C */  jal       fx_water_splash
 /* 170BD8 802422F8 AFB00014 */   sw       $s0, 0x14($sp)
 /* 170BDC 802422FC C6200144 */  lwc1      $f0, 0x144($s1)
 /* 170BE0 80242300 46180000 */  add.s     $f0, $f0, $f24
@@ -203,7 +203,7 @@ glabel btl_state_update_begin_player_turn
 /* 170C08 80242328 44070000 */  mfc1      $a3, $f0
 /* 170C0C 8024232C 24040001 */  addiu     $a0, $zero, 1
 /* 170C10 80242330 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 170C14 80242334 0C01C70C */  jal       playFX_5F
+/* 170C14 80242334 0C01C70C */  jal       fx_water_splash
 /* 170C18 80242338 AFB00014 */   sw       $s0, 0x14($sp)
 /* 170C1C 8024233C 24040299 */  addiu     $a0, $zero, 0x299
 /* 170C20 80242340 0C05272D */  jal       sfx_play_sound
diff --git a/ver/us/asm/nonmatchings/16F740/btl_state_update_normal_start.s b/ver/us/asm/nonmatchings/16F740/btl_state_update_normal_start.s
index ff1def4473..8de03e6a24 100644
--- a/ver/us/asm/nonmatchings/16F740/btl_state_update_normal_start.s
+++ b/ver/us/asm/nonmatchings/16F740/btl_state_update_normal_start.s
@@ -224,7 +224,7 @@ glabel btl_state_update_normal_start
 /* 16FE18 80241538 AFA00014 */  sw        $zero, 0x14($sp)
 /* 16FE1C 8024153C 00A0302D */  daddu     $a2, $a1, $zero
 /* 16FE20 80241540 00A0382D */  daddu     $a3, $a1, $zero
-/* 16FE24 80241544 0C01CA0C */  jal       playFX_7F
+/* 16FE24 80241544 0C01CA0C */  jal       fx_partner_buff
 /* 16FE28 80241548 AFA50010 */   sw       $a1, 0x10($sp)
 /* 16FE2C 8024154C 0C03A604 */  jal       func_800E9810
 /* 16FE30 80241550 AE82043C */   sw       $v0, 0x43c($s4)
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_80251474.s b/ver/us/asm/nonmatchings/17D6A0/func_80251474.s
index a2d54b5594..cbd6f5b17d 100644
--- a/ver/us/asm/nonmatchings/17D6A0/func_80251474.s
+++ b/ver/us/asm/nonmatchings/17D6A0/func_80251474.s
@@ -76,7 +76,7 @@ glabel func_80251474
 /* 17FE68 80251588 44061000 */  mfc1      $a2, $f2
 /* 17FE6C 8025158C 44073000 */  mfc1      $a3, $f6
 /* 17FE70 80251590 0000202D */  daddu     $a0, $zero, $zero
-/* 17FE74 80251594 0C01C514 */  jal       playFX_4A
+/* 17FE74 80251594 0C01C514 */  jal       fx_flashing_box_shockwave
 /* 17FE78 80251598 E7A00014 */   swc1     $f0, 0x14($sp)
 .L8025159C:
 /* 17FE7C 8025159C 8E10000C */  lw        $s0, 0xc($s0)
diff --git a/ver/us/asm/nonmatchings/17FEB0/calc_item_damage_enemy.s b/ver/us/asm/nonmatchings/17FEB0/calc_item_damage_enemy.s
index 3370c4fd4f..53c011e53c 100644
--- a/ver/us/asm/nonmatchings/17FEB0/calc_item_damage_enemy.s
+++ b/ver/us/asm/nonmatchings/17FEB0/calc_item_damage_enemy.s
@@ -78,7 +78,7 @@ glabel calc_item_damage_enemy
 /* 1800D8 802517F8 8E260010 */  lw        $a2, 0x10($s1)
 /* 1800DC 802517FC 44072000 */  mfc1      $a3, $f4
 /* 1800E0 80251800 24080001 */  addiu     $t0, $zero, 1
-/* 1800E4 80251804 0C01C184 */  jal       playFX_24
+/* 1800E4 80251804 0C01C184 */  jal       fx_ring_blast
 /* 1800E8 80251808 AFA80024 */   sw       $t0, 0x24($sp)
 .L8025180C:
 /* 1800EC 8025180C 8E820188 */  lw        $v0, 0x188($s4)
@@ -105,7 +105,7 @@ glabel calc_item_damage_enemy
 /* 18013C 8025185C 8E25000C */  lw        $a1, 0xc($s1)
 /* 180140 80251860 8E260010 */  lw        $a2, 0x10($s1)
 /* 180144 80251864 44072000 */  mfc1      $a3, $f4
-/* 180148 80251868 0C01C70C */  jal       playFX_5F
+/* 180148 80251868 0C01C70C */  jal       fx_water_splash
 /* 18014C 8025186C 0000202D */   daddu    $a0, $zero, $zero
 .L80251870:
 /* 180150 80251870 8E820188 */  lw        $v0, 0x188($s4)
@@ -121,7 +121,7 @@ glabel calc_item_damage_enemy
 /* 180178 80251898 8E260010 */  lw        $a2, 0x10($s1)
 /* 18017C 8025189C 44071000 */  mfc1      $a3, $f2
 /* 180180 802518A0 24080001 */  addiu     $t0, $zero, 1
-/* 180184 802518A4 0C01C2A4 */  jal       playFX_30
+/* 180184 802518A4 0C01C2A4 */  jal       fx_big_snowflakes
 /* 180188 802518A8 AFA8002C */   sw       $t0, 0x2c($sp)
 .L802518AC:
 /* 18018C 802518AC 8E850188 */  lw        $a1, 0x188($s4)
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D160.s b/ver/us/asm/nonmatchings/182B30/func_8025D160.s
index 7a6c11ba17..28d2bfd064 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025D160.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025D160.s
@@ -30,7 +30,7 @@ glabel func_8025D160
 /* 18BAA0 8025D1C0 8CE50058 */  lw        $a1, 0x58($a3)
 /* 18BAA4 8025D1C4 8CE6005C */  lw        $a2, 0x5c($a3)
 /* 18BAA8 8025D1C8 8CE70060 */  lw        $a3, 0x60($a3)
-/* 18BAAC 8025D1CC 0C01C3AC */  jal       playFX_3B
+/* 18BAAC 8025D1CC 0C01C3AC */  jal       fx_aura
 /* 18BAB0 8025D1D0 24040003 */   addiu    $a0, $zero, 3
 /* 18BAB4 8025D1D4 24020001 */  addiu     $v0, $zero, 1
 /* 18BAB8 8025D1D8 A24208BC */  sb        $v0, 0x8bc($s2)
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D3CC.s b/ver/us/asm/nonmatchings/182B30/func_8025D3CC.s
index f8d3120232..c3007b78e5 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025D3CC.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025D3CC.s
@@ -33,7 +33,7 @@ glabel func_8025D3CC
 /* 18BD18 8025D438 8C850058 */  lw        $a1, 0x58($a0)
 /* 18BD1C 8025D43C 8C870060 */  lw        $a3, 0x60($a0)
 /* 18BD20 8025D440 44061000 */  mfc1      $a2, $f2
-/* 18BD24 8025D444 0C01C28C */  jal       playFX_2F
+/* 18BD24 8025D444 0C01C28C */  jal       fx_stars_orbiting
 /* 18BD28 8025D448 0000202D */   daddu    $a0, $zero, $zero
 /* 18BD2C 8025D44C 24020001 */  addiu     $v0, $zero, 1
 /* 18BD30 8025D450 08097524 */  j         .L8025D490
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D4C8.s b/ver/us/asm/nonmatchings/182B30/func_8025D4C8.s
index 8157d92d92..df9574952f 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025D4C8.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025D4C8.s
@@ -31,7 +31,7 @@ glabel func_8025D4C8
 /* 18BE0C 8025D52C 8E250058 */  lw        $a1, 0x58($s1)
 /* 18BE10 8025D530 8E26005C */  lw        $a2, 0x5c($s1)
 /* 18BE14 8025D534 8E270060 */  lw        $a3, 0x60($s1)
-/* 18BE18 8025D538 0C01C3AC */  jal       playFX_3B
+/* 18BE18 8025D538 0C01C3AC */  jal       fx_aura
 /* 18BE1C 8025D53C 24040001 */   addiu    $a0, $zero, 1
 /* 18BE20 8025D540 24020001 */  addiu     $v0, $zero, 1
 /* 18BE24 8025D544 A24208BC */  sb        $v0, 0x8bc($s2)
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D640.s b/ver/us/asm/nonmatchings/182B30/func_8025D640.s
index e45a4aaa68..f8b49394b6 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025D640.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025D640.s
@@ -25,7 +25,7 @@ glabel func_8025D640
 /* 18BF6C 8025D68C 8C850058 */  lw        $a1, 0x58($a0)
 /* 18BF70 8025D690 8C86005C */  lw        $a2, 0x5c($a0)
 /* 18BF74 8025D694 8C870060 */  lw        $a3, 0x60($a0)
-/* 18BF78 8025D698 0C01C79C */  jal       playFX_65
+/* 18BF78 8025D698 0C01C79C */  jal       fx_65
 /* 18BF7C 8025D69C 24040001 */   addiu    $a0, $zero, 1
 /* 18BF80 8025D6A0 00111880 */  sll       $v1, $s1, 2
 /* 18BF84 8025D6A4 02031821 */  addu      $v1, $s0, $v1
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D71C.s b/ver/us/asm/nonmatchings/182B30/func_8025D71C.s
index d00cd3a822..63defb0724 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025D71C.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025D71C.s
@@ -25,7 +25,7 @@ glabel func_8025D71C
 /* 18C048 8025D768 8C850058 */  lw        $a1, 0x58($a0)
 /* 18C04C 8025D76C 8C86005C */  lw        $a2, 0x5c($a0)
 /* 18C050 8025D770 8C870060 */  lw        $a3, 0x60($a0)
-/* 18C054 8025D774 0C01C79C */  jal       playFX_65
+/* 18C054 8025D774 0C01C79C */  jal       fx_65
 /* 18C058 8025D778 24040002 */   addiu    $a0, $zero, 2
 /* 18C05C 8025D77C 00111880 */  sll       $v1, $s1, 2
 /* 18C060 8025D780 02031821 */  addu      $v1, $s0, $v1
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D830.s b/ver/us/asm/nonmatchings/182B30/func_8025D830.s
index 75f346b801..dbdb8d590d 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025D830.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025D830.s
@@ -25,7 +25,7 @@ glabel func_8025D830
 /* 18C15C 8025D87C 8C850058 */  lw        $a1, 0x58($a0)
 /* 18C160 8025D880 8C86005C */  lw        $a2, 0x5c($a0)
 /* 18C164 8025D884 8C870060 */  lw        $a3, 0x60($a0)
-/* 18C168 8025D888 0C01C7CC */  jal       playFX_67
+/* 18C168 8025D888 0C01C7CC */  jal       fx_whirlwind
 /* 18C16C 8025D88C 24040002 */   addiu    $a0, $zero, 2
 /* 18C170 8025D890 00111880 */  sll       $v1, $s1, 2
 /* 18C174 8025D894 02031821 */  addu      $v1, $s0, $v1
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025D90C.s b/ver/us/asm/nonmatchings/182B30/func_8025D90C.s
index b12b310bae..5399eef043 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025D90C.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025D90C.s
@@ -82,7 +82,7 @@ glabel func_8025D90C
 /* 18C318 8025DA38 44064000 */  mfc1      $a2, $f8
 /* 18C31C 8025DA3C 0000202D */  daddu     $a0, $zero, $zero
 /* 18C320 8025DA40 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 18C324 8025DA44 0C01BECC */  jal       fx_walk
+/* 18C324 8025DA44 0C01BECC */  jal       fx_walking_dust
 /* 18C328 8025DA48 E7A00014 */   swc1     $f0, 0x14($sp)
 .L8025DA4C:
 /* 18C32C 8025DA4C 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025DA68.s b/ver/us/asm/nonmatchings/182B30/func_8025DA68.s
index 5468eb4b8e..604f423492 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025DA68.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025DA68.s
@@ -57,7 +57,7 @@ glabel func_8025DA68
 /* 18C410 8025DB30 3C014120 */  lui       $at, 0x4120
 /* 18C414 8025DB34 44810000 */  mtc1      $at, $f0
 /* 18C418 8025DB38 24040001 */  addiu     $a0, $zero, 1
-/* 18C41C 8025DB3C 0C01BFBC */  jal       playFX_11
+/* 18C41C 8025DB3C 0C01BFBC */  jal       fx_sparkles
 /* 18C420 8025DB40 E7A00010 */   swc1     $f0, 0x10($sp)
 .L8025DB44:
 /* 18C424 8025DB44 00111040 */  sll       $v0, $s1, 1
@@ -83,7 +83,7 @@ glabel func_8025DA68
 /* 18C474 8025DB94 3C0141A0 */  lui       $at, 0x41a0
 /* 18C478 8025DB98 44810000 */  mtc1      $at, $f0
 /* 18C47C 8025DB9C A50008BE */  sh        $zero, 0x8be($t0)
-/* 18C480 8025DBA0 0C01BFBC */  jal       playFX_11
+/* 18C480 8025DBA0 0C01BFBC */  jal       fx_sparkles
 /* 18C484 8025DBA4 E7A00010 */   swc1     $f0, 0x10($sp)
 .L8025DBA8:
 /* 18C488 8025DBA8 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025DBD0.s b/ver/us/asm/nonmatchings/182B30/func_8025DBD0.s
index faf1a902f5..aeed3ad158 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025DBD0.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025DBD0.s
@@ -38,7 +38,7 @@ glabel func_8025DBD0
 /* 18C514 8025DC34 8E250058 */  lw        $a1, 0x58($s1)
 /* 18C518 8025DC38 8E26005C */  lw        $a2, 0x5c($s1)
 /* 18C51C 8025DC3C 8E270060 */  lw        $a3, 0x60($s1)
-/* 18C520 8025DC40 0C01C3AC */  jal       playFX_3B
+/* 18C520 8025DC40 0C01C3AC */  jal       fx_aura
 /* 18C524 8025DC44 24040002 */   addiu    $a0, $zero, 2
 /* 18C528 8025DC48 24020001 */  addiu     $v0, $zero, 1
 /* 18C52C 8025DC4C A24208BC */  sb        $v0, 0x8bc($s2)
diff --git a/ver/us/asm/nonmatchings/182B30/func_8025DD60.s b/ver/us/asm/nonmatchings/182B30/func_8025DD60.s
index 18c042068b..e9b4a8832c 100644
--- a/ver/us/asm/nonmatchings/182B30/func_8025DD60.s
+++ b/ver/us/asm/nonmatchings/182B30/func_8025DD60.s
@@ -28,7 +28,7 @@ glabel func_8025DD60
 /* 18C698 8025DDB8 8E250058 */  lw        $a1, 0x58($s1)
 /* 18C69C 8025DDBC 8E26005C */  lw        $a2, 0x5c($s1)
 /* 18C6A0 8025DDC0 8E270060 */  lw        $a3, 0x60($s1)
-/* 18C6A4 8025DDC4 0C01C82C */  jal       playFX_6B
+/* 18C6A4 8025DDC4 0C01C82C */  jal       fx_energy_in_out
 /* 18C6A8 8025DDC8 24040004 */   addiu    $a0, $zero, 4
 /* 18C6AC 8025DDCC 00121880 */  sll       $v1, $s2, 2
 /* 18C6B0 8025DDD0 02031821 */  addu      $v1, $s0, $v1
diff --git a/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s b/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s
index bf562aca90..ea2c72e428 100644
--- a/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s
+++ b/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s
@@ -394,7 +394,7 @@ glabel btl_state_update_celebration
 /* 18D01C 8025E73C 44063000 */  mfc1      $a2, $f6
 /* 18D020 8025E740 AFA30028 */  sw        $v1, 0x28($sp)
 /* 18D024 8025E744 AFA2002C */  sw        $v0, 0x2c($sp)
-/* 18D028 8025E748 0C01C424 */  jal       playFX_40
+/* 18D028 8025E748 0C01C424 */  jal       fx_recover
 /* 18D02C 8025E74C AFA80010 */   sw       $t0, 0x10($sp)
 /* 18D030 8025E750 C6240144 */  lwc1      $f4, 0x144($s1)
 /* 18D034 8025E754 C620014C */  lwc1      $f0, 0x14c($s1)
@@ -430,7 +430,7 @@ glabel btl_state_update_celebration
 /* 18D0AC 8025E7CC 24040001 */  addiu     $a0, $zero, 1
 /* 18D0B0 8025E7D0 AFA30028 */  sw        $v1, 0x28($sp)
 /* 18D0B4 8025E7D4 AFA2002C */  sw        $v0, 0x2c($sp)
-/* 18D0B8 8025E7D8 0C01C424 */  jal       playFX_40
+/* 18D0B8 8025E7D8 0C01C424 */  jal       fx_recover
 /* 18D0BC 8025E7DC AFA80010 */   sw       $t0, 0x10($sp)
 /* 18D0C0 8025E7E0 82A2028E */  lb        $v0, 0x28e($s5)
 /* 18D0C4 8025E7E4 00021200 */  sll       $v0, $v0, 8
@@ -1566,7 +1566,7 @@ glabel btl_state_update_celebration
 /* 18E1E8 8025F908 3C013F80 */  lui       $at, 0x3f80
 /* 18E1EC 8025F90C 44810000 */  mtc1      $at, $f0
 /* 18E1F0 8025F910 00A0382D */  daddu     $a3, $a1, $zero
-/* 18E1F4 8025F914 0C01C484 */  jal       playFX_44
+/* 18E1F4 8025F914 0C01C484 */  jal       fx_confetti
 /* 18E1F8 8025F918 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 18E1FC 8025F91C 08097FD2 */  j         .L8025FF48_18E828
 /* 18E200 8025F920 AE000000 */   sw       $zero, ($s0)
diff --git a/ver/us/asm/nonmatchings/190B20/func_802666E4.s b/ver/us/asm/nonmatchings/190B20/func_802666E4.s
index 03752a89d8..bcbe215075 100644
--- a/ver/us/asm/nonmatchings/190B20/func_802666E4.s
+++ b/ver/us/asm/nonmatchings/190B20/func_802666E4.s
@@ -29,7 +29,7 @@ glabel func_802666E4
 /* 19501C 8026673C 44810000 */  mtc1      $at, $f0
 /* 195020 80266740 24020018 */  addiu     $v0, $zero, 0x18
 /* 195024 80266744 AFA20014 */  sw        $v0, 0x14($sp)
-/* 195028 80266748 0C01C184 */  jal       playFX_24
+/* 195028 80266748 0C01C184 */  jal       fx_ring_blast
 /* 19502C 8026674C E7A00010 */   swc1     $f0, 0x10($sp)
 /* 195030 80266750 080999F9 */  j         .L802667E4
 /* 195034 80266754 00000000 */   nop
@@ -46,7 +46,7 @@ glabel func_802666E4
 /* 195058 80266778 44810000 */  mtc1      $at, $f0
 /* 19505C 8026677C 24020018 */  addiu     $v0, $zero, 0x18
 /* 195060 80266780 AFA20014 */  sw        $v0, 0x14($sp)
-/* 195064 80266784 0C01C70C */  jal       playFX_5F
+/* 195064 80266784 0C01C70C */  jal       fx_water_splash
 /* 195068 80266788 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 19506C 8026678C 080999F9 */  j         .L802667E4
 /* 195070 80266790 00000000 */   nop
@@ -70,7 +70,7 @@ glabel func_802666E4
 /* 1950B0 802667D0 3C013F80 */  lui       $at, 0x3f80
 /* 1950B4 802667D4 44810000 */  mtc1      $at, $f0
 /* 1950B8 802667D8 AFA80014 */  sw        $t0, 0x14($sp)
-/* 1950BC 802667DC 0C01C46C */  jal       playFX_43
+/* 1950BC 802667DC 0C01C46C */  jal       fx_firework
 /* 1950C0 802667E0 E7A00010 */   swc1     $f0, 0x10($sp)
 .L802667E4:
 /* 1950C4 802667E4 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/190B20/func_802667F0.s b/ver/us/asm/nonmatchings/190B20/func_802667F0.s
index 09e86b0027..35db50fc21 100644
--- a/ver/us/asm/nonmatchings/190B20/func_802667F0.s
+++ b/ver/us/asm/nonmatchings/190B20/func_802667F0.s
@@ -112,7 +112,7 @@ glabel func_802667F0
 /* 195220 80266940 44072000 */  mfc1      $a3, $f4
 /* 195224 80266944 2402005A */  addiu     $v0, $zero, 0x5a
 /* 195228 80266948 AFA20014 */  sw        $v0, 0x14($sp)
-/* 19522C 8026694C 0C01C4E4 */  jal       playFX_48
+/* 19522C 8026694C 0C01C4E4 */  jal       fx_attack_result_text
 /* 195230 80266950 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 195234 80266954 AE020200 */  sw        $v0, 0x200($s0)
 /* 195238 80266958 24020050 */  addiu     $v0, $zero, 0x50
diff --git a/ver/us/asm/nonmatchings/190B20/play_movement_dust_effects.s b/ver/us/asm/nonmatchings/190B20/play_movement_dust_effects.s
index 76793738a4..04a5c04cc4 100644
--- a/ver/us/asm/nonmatchings/190B20/play_movement_dust_effects.s
+++ b/ver/us/asm/nonmatchings/190B20/play_movement_dust_effects.s
@@ -21,7 +21,7 @@ glabel play_movement_dust_effects
 /* 192C10 80264330 C42038A4 */  lwc1      $f0, %lo(D_802938A4)($at)
 /* 192C14 80264334 4406C000 */  mfc1      $a2, $f24
 /* 192C18 80264338 0000202D */  daddu     $a0, $zero, $zero
-/* 192C1C 8026433C 0C01BEB4 */  jal       fx_land
+/* 192C1C 8026433C 0C01BEB4 */  jal       fx_landing_dust
 /* 192C20 80264340 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 192C24 80264344 08099110 */  j         .L80264440
 /* 192C28 80264348 00000000 */   nop
@@ -86,7 +86,7 @@ glabel play_movement_dust_effects
 /* 192D0C 8026442C 4407D000 */  mfc1      $a3, $f26
 /* 192D10 80264430 0000202D */  daddu     $a0, $zero, $zero
 /* 192D14 80264434 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 192D18 80264438 0C01BECC */  jal       fx_walk
+/* 192D18 80264438 0C01BECC */  jal       fx_walking_dust
 /* 192D1C 8026443C E7A00014 */   swc1     $f0, 0x14($sp)
 .L80264440:
 /* 192D20 80264440 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/19FAF0/calc_player_damage_enemy.s b/ver/us/asm/nonmatchings/19FAF0/calc_player_damage_enemy.s
index 6e5dafb88d..50bed515bb 100644
--- a/ver/us/asm/nonmatchings/19FAF0/calc_player_damage_enemy.s
+++ b/ver/us/asm/nonmatchings/19FAF0/calc_player_damage_enemy.s
@@ -277,7 +277,7 @@ glabel calc_player_damage_enemy
 /* 1A0608 80271D28 8E460010 */  lw        $a2, 0x10($s2)
 /* 1A060C 80271D2C 44072000 */  mfc1      $a3, $f4
 /* 1A0610 80271D30 24080001 */  addiu     $t0, $zero, 1
-/* 1A0614 80271D34 0C01C184 */  jal       playFX_24
+/* 1A0614 80271D34 0C01C184 */  jal       fx_ring_blast
 /* 1A0618 80271D38 AFA80028 */   sw       $t0, 0x28($sp)
 .L80271D3C:
 /* 1A061C 80271D3C 8E820188 */  lw        $v0, 0x188($s4)
@@ -304,7 +304,7 @@ glabel calc_player_damage_enemy
 /* 1A066C 80271D8C 8E45000C */  lw        $a1, 0xc($s2)
 /* 1A0670 80271D90 8E460010 */  lw        $a2, 0x10($s2)
 /* 1A0674 80271D94 44072000 */  mfc1      $a3, $f4
-/* 1A0678 80271D98 0C01C70C */  jal       playFX_5F
+/* 1A0678 80271D98 0C01C70C */  jal       fx_water_splash
 /* 1A067C 80271D9C 0000202D */   daddu    $a0, $zero, $zero
 .L80271DA0:
 /* 1A0680 80271DA0 8E820188 */  lw        $v0, 0x188($s4)
@@ -320,7 +320,7 @@ glabel calc_player_damage_enemy
 /* 1A06A8 80271DC8 8E460010 */  lw        $a2, 0x10($s2)
 /* 1A06AC 80271DCC 44071000 */  mfc1      $a3, $f2
 /* 1A06B0 80271DD0 24080001 */  addiu     $t0, $zero, 1
-/* 1A06B4 80271DD4 0C01C2A4 */  jal       playFX_30
+/* 1A06B4 80271DD4 0C01C2A4 */  jal       fx_big_snowflakes
 /* 1A06B8 80271DD8 AFA80030 */   sw       $t0, 0x30($sp)
 .L80271DDC:
 /* 1A06BC 80271DDC 8FA40018 */  lw        $a0, 0x18($sp)
@@ -340,7 +340,7 @@ glabel calc_player_damage_enemy
 /* 1A06F4 80271E14 8E45000C */  lw        $a1, 0xc($s2)
 /* 1A06F8 80271E18 8E460010 */  lw        $a2, 0x10($s2)
 /* 1A06FC 80271E1C 44072000 */  mfc1      $a3, $f4
-/* 1A0700 80271E20 0C01C9F4 */  jal       playFX_7E
+/* 1A0700 80271E20 0C01C9F4 */  jal       fx_breaking_junk
 /* 1A0704 80271E24 0000202D */   daddu    $a0, $zero, $zero
 /* 1A0708 80271E28 2603FFFF */  addiu     $v1, $s0, -1
 /* 1A070C 80271E2C 2C620006 */  sltiu     $v0, $v1, 6
@@ -600,7 +600,7 @@ glabel calc_player_damage_enemy
 /* 1A0A94 802721B4 8E45000C */  lw        $a1, 0xc($s2)
 /* 1A0A98 802721B8 8E460010 */  lw        $a2, 0x10($s2)
 /* 1A0A9C 802721BC 8E470014 */  lw        $a3, 0x14($s2)
-/* 1A0AA0 802721C0 0C01C2EC */  jal       playFX_33
+/* 1A0AA0 802721C0 0C01C2EC */  jal       fx_radial_shimmer
 /* 1A0AA4 802721C4 24040009 */   addiu    $a0, $zero, 9
 .L802721C8:
 /* 1A0AA8 802721C8 3C11800E */  lui       $s1, %hi(gBattleStatus)
diff --git a/ver/us/asm/nonmatchings/19FAF0/func_802712A0.s b/ver/us/asm/nonmatchings/19FAF0/func_802712A0.s
index 6608053fc7..d13665aa5a 100644
--- a/ver/us/asm/nonmatchings/19FAF0/func_802712A0.s
+++ b/ver/us/asm/nonmatchings/19FAF0/func_802712A0.s
@@ -14,7 +14,7 @@ glabel func_802712A0
 /* 19FBA4 802712C4 C440008C */  lwc1      $f0, 0x8c($v0)
 /* 19FBA8 802712C8 46800020 */  cvt.s.w   $f0, $f0
 /* 19FBAC 802712CC 44070000 */  mfc1      $a3, $f0
-/* 19FBB0 802712D0 0C01C2BC */  jal       playFX_31
+/* 19FBB0 802712D0 0C01C2BC */  jal       fx_debuff
 /* 19FBB4 802712D4 24040002 */   addiu    $a0, $zero, 2
 /* 19FBB8 802712D8 8C44000C */  lw        $a0, 0xc($v0)
 /* 19FBBC 802712DC 240300C8 */  addiu     $v1, $zero, 0xc8
diff --git a/ver/us/asm/nonmatchings/19FAF0/func_80271328.s b/ver/us/asm/nonmatchings/19FAF0/func_80271328.s
index e397bc4b5f..ea2aa0b427 100644
--- a/ver/us/asm/nonmatchings/19FAF0/func_80271328.s
+++ b/ver/us/asm/nonmatchings/19FAF0/func_80271328.s
@@ -14,7 +14,7 @@ glabel func_80271328
 /* 19FC2C 8027134C C440008C */  lwc1      $f0, 0x8c($v0)
 /* 19FC30 80271350 46800020 */  cvt.s.w   $f0, $f0
 /* 19FC34 80271354 44070000 */  mfc1      $a3, $f0
-/* 19FC38 80271358 0C01C2BC */  jal       playFX_31
+/* 19FC38 80271358 0C01C2BC */  jal       fx_debuff
 /* 19FC3C 8027135C 24040002 */   addiu    $a0, $zero, 2
 /* 19FC40 80271360 8C44000C */  lw        $a0, 0xc($v0)
 /* 19FC44 80271364 2403003C */  addiu     $v1, $zero, 0x3c
diff --git a/ver/us/asm/nonmatchings/19FAF0/func_802713B0.s b/ver/us/asm/nonmatchings/19FAF0/func_802713B0.s
index f485405ce8..3d6ca89c37 100644
--- a/ver/us/asm/nonmatchings/19FAF0/func_802713B0.s
+++ b/ver/us/asm/nonmatchings/19FAF0/func_802713B0.s
@@ -14,7 +14,7 @@ glabel func_802713B0
 /* 19FCB4 802713D4 C440008C */  lwc1      $f0, 0x8c($v0)
 /* 19FCB8 802713D8 46800020 */  cvt.s.w   $f0, $f0
 /* 19FCBC 802713DC 44070000 */  mfc1      $a3, $f0
-/* 19FCC0 802713E0 0C01C2BC */  jal       playFX_31
+/* 19FCC0 802713E0 0C01C2BC */  jal       fx_debuff
 /* 19FCC4 802713E4 24040002 */   addiu    $a0, $zero, 2
 /* 19FCC8 802713E8 0040282D */  daddu     $a1, $v0, $zero
 /* 19FCCC 802713EC 8CA2000C */  lw        $v0, 0xc($a1)
diff --git a/ver/us/asm/nonmatchings/19FAF0/func_80271484.s b/ver/us/asm/nonmatchings/19FAF0/func_80271484.s
index 3cba3a9876..2c3635a979 100644
--- a/ver/us/asm/nonmatchings/19FAF0/func_80271484.s
+++ b/ver/us/asm/nonmatchings/19FAF0/func_80271484.s
@@ -39,7 +39,7 @@ glabel func_80271484
 /* 19FDEC 8027150C 00000000 */  nop
 /* 19FDF0 80271510 4680A520 */  cvt.s.w   $f20, $f20
 /* 19FDF4 80271514 E7B60010 */  swc1      $f22, 0x10($sp)
-/* 19FDF8 80271518 0C01C8D4 */  jal       playFX_72
+/* 19FDF8 80271518 0C01C8D4 */  jal       fx_misc_particles
 /* 19FDFC 8027151C E7B40014 */   swc1     $f20, 0x14($sp)
 /* 19FE00 80271520 C6000084 */  lwc1      $f0, 0x84($s0)
 /* 19FE04 80271524 46800020 */  cvt.s.w   $f0, $f0
@@ -55,7 +55,7 @@ glabel func_80271484
 /* 19FE2C 8027154C E7B40014 */  swc1      $f20, 0x14($sp)
 /* 19FE30 80271550 E7B80018 */  swc1      $f24, 0x18($sp)
 /* 19FE34 80271554 AFB2001C */  sw        $s2, 0x1c($sp)
-/* 19FE38 80271558 0C01C8D4 */  jal       playFX_72
+/* 19FE38 80271558 0C01C8D4 */  jal       fx_misc_particles
 /* 19FE3C 8027155C AFB10020 */   sw       $s1, 0x20($sp)
 /* 19FE40 80271560 8FBF0034 */  lw        $ra, 0x34($sp)
 /* 19FE44 80271564 8FB20030 */  lw        $s2, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/19FAF0/func_80271588.s b/ver/us/asm/nonmatchings/19FAF0/func_80271588.s
index 062dc4f6c7..5c2424f031 100644
--- a/ver/us/asm/nonmatchings/19FAF0/func_80271588.s
+++ b/ver/us/asm/nonmatchings/19FAF0/func_80271588.s
@@ -42,7 +42,7 @@ glabel func_80271588
 /* 19FEF8 80271618 44070000 */  mfc1      $a3, $f0
 /* 19FEFC 8027161C 0000202D */  daddu     $a0, $zero, $zero
 /* 19FF00 80271620 E7B60010 */  swc1      $f22, 0x10($sp)
-/* 19FF04 80271624 0C01C7FC */  jal       playFX_69
+/* 19FF04 80271624 0C01C7FC */  jal       fx_floating_cloud_puff
 /* 19FF08 80271628 AFB20014 */   sw       $s2, 0x14($sp)
 /* 19FF0C 8027162C 2A020014 */  slti      $v0, $s0, 0x14
 /* 19FF10 80271630 1440FFE1 */  bnez      $v0, .L802715B8
diff --git a/ver/us/asm/nonmatchings/1AC760/calc_partner_damage_enemy.s b/ver/us/asm/nonmatchings/1AC760/calc_partner_damage_enemy.s
index de1299d049..e97aa40f9c 100644
--- a/ver/us/asm/nonmatchings/1AC760/calc_partner_damage_enemy.s
+++ b/ver/us/asm/nonmatchings/1AC760/calc_partner_damage_enemy.s
@@ -355,7 +355,7 @@ glabel calc_partner_damage_enemy
 /* 1AD128 8027E848 8E460010 */  lw        $a2, 0x10($s2)
 /* 1AD12C 8027E84C 44072000 */  mfc1      $a3, $f4
 /* 1AD130 8027E850 24080001 */  addiu     $t0, $zero, 1
-/* 1AD134 8027E854 0C01C184 */  jal       playFX_24
+/* 1AD134 8027E854 0C01C184 */  jal       fx_ring_blast
 /* 1AD138 8027E858 AFA80024 */   sw       $t0, 0x24($sp)
 .L8027E85C:
 /* 1AD13C 8027E85C 8E820188 */  lw        $v0, 0x188($s4)
@@ -382,7 +382,7 @@ glabel calc_partner_damage_enemy
 /* 1AD18C 8027E8AC 8E45000C */  lw        $a1, 0xc($s2)
 /* 1AD190 8027E8B0 8E460010 */  lw        $a2, 0x10($s2)
 /* 1AD194 8027E8B4 44072000 */  mfc1      $a3, $f4
-/* 1AD198 8027E8B8 0C01C70C */  jal       playFX_5F
+/* 1AD198 8027E8B8 0C01C70C */  jal       fx_water_splash
 /* 1AD19C 8027E8BC 0000202D */   daddu    $a0, $zero, $zero
 .L8027E8C0:
 /* 1AD1A0 8027E8C0 8E820188 */  lw        $v0, 0x188($s4)
@@ -398,7 +398,7 @@ glabel calc_partner_damage_enemy
 /* 1AD1C8 8027E8E8 8E460010 */  lw        $a2, 0x10($s2)
 /* 1AD1CC 8027E8EC 44071000 */  mfc1      $a3, $f2
 /* 1AD1D0 8027E8F0 24080001 */  addiu     $t0, $zero, 1
-/* 1AD1D4 8027E8F4 0C01C2A4 */  jal       playFX_30
+/* 1AD1D4 8027E8F4 0C01C2A4 */  jal       fx_big_snowflakes
 /* 1AD1D8 8027E8F8 AFA8002C */   sw       $t0, 0x2c($sp)
 .L8027E8FC:
 /* 1AD1DC 8027E8FC 8FA80018 */  lw        $t0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s
index 45990675a3..65f30b4f91 100644
--- a/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s
+++ b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s
@@ -178,7 +178,7 @@ glabel update_encounters_neutral
 /* 1AE2C 8003FA2C AFA00010 */  sw        $zero, 0x10($sp)
 /* 1AE30 8003FA30 E7A00014 */  swc1      $f0, 0x14($sp)
 /* 1AE34 8003FA34 AFA00018 */  sw        $zero, 0x18($sp)
-/* 1AE38 8003FA38 0C01C064 */  jal       playFX_18
+/* 1AE38 8003FA38 0C01C064 */  jal       fx_damage_stars
 /* 1AE3C 8003FA3C AFB0001C */   sw       $s0, 0x1c($sp)
 /* 1AE40 8003FA40 A2700005 */  sb        $s0, 5($s3)
 /* 1AE44 8003FA44 8E820004 */  lw        $v0, 4($s4)
@@ -1132,7 +1132,7 @@ glabel update_encounters_neutral
 /* 1BC48 80040848 AFA00010 */  sw        $zero, 0x10($sp)
 /* 1BC4C 8004084C E7A00014 */  swc1      $f0, 0x14($sp)
 /* 1BC50 80040850 AFA00018 */  sw        $zero, 0x18($sp)
-/* 1BC54 80040854 0C01C064 */  jal       playFX_18
+/* 1BC54 80040854 0C01C064 */  jal       fx_damage_stars
 /* 1BC58 80040858 AFA2001C */   sw       $v0, 0x1c($sp)
 /* 1BC5C 8004085C 82220007 */  lb        $v0, 7($s1)
 /* 1BC60 80040860 10400005 */  beqz      $v0, .L80040878
@@ -1517,7 +1517,7 @@ glabel update_encounters_neutral
 /* 1C1CC 80040DCC AFA00010 */  sw        $zero, 0x10($sp)
 /* 1C1D0 80040DD0 E7B60014 */  swc1      $f22, 0x14($sp)
 /* 1C1D4 80040DD4 AFA00018 */  sw        $zero, 0x18($sp)
-/* 1C1D8 80040DD8 0C01C064 */  jal       playFX_18
+/* 1C1D8 80040DD8 0C01C064 */  jal       fx_damage_stars
 /* 1C1DC 80040DDC AFBE001C */   sw       $fp, 0x1c($sp)
 .L80040DE0:
 /* 1C1E0 80040DE0 8EC20000 */  lw        $v0, ($s6)
@@ -1704,7 +1704,7 @@ glabel update_encounters_neutral
 /* 1C490 80041090 8E470040 */  lw        $a3, 0x40($s2)
 /* 1C494 80041094 24040003 */  addiu     $a0, $zero, 3
 .L80041098:
-/* 1C498 80041098 0C01C064 */  jal       playFX_18
+/* 1C498 80041098 0C01C064 */  jal       fx_damage_stars
 /* 1C49C 8004109C 00000000 */   nop
 .L800410A0:
 /* 1C4A0 800410A0 8EC20000 */  lw        $v0, ($s6)
@@ -1846,7 +1846,7 @@ glabel update_encounters_neutral
 /* 1C694 80041294 AFA00010 */  sw        $zero, 0x10($sp)
 /* 1C698 80041298 E7B40014 */  swc1      $f20, 0x14($sp)
 /* 1C69C 8004129C AFA00018 */  sw        $zero, 0x18($sp)
-/* 1C6A0 800412A0 0C01C064 */  jal       playFX_18
+/* 1C6A0 800412A0 0C01C064 */  jal       fx_damage_stars
 /* 1C6A4 800412A4 AFBE001C */   sw       $fp, 0x1c($sp)
 .L800412A8:
 /* 1C6A8 800412A8 8EC20000 */  lw        $v0, ($s6)
diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s
index 1c13633cb2..9aa00333ec 100644
--- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s
+++ b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s
@@ -75,7 +75,7 @@ glabel func_800EFE2C
 /* 893E4 800EFF34 3C018011 */  lui       $at, %hi(D_80109484)
 /* 893E8 800EFF38 C4209484 */  lwc1      $f0, %lo(D_80109484)($at)
 /* 893EC 800EFF3C 0000202D */  daddu     $a0, $zero, $zero
-/* 893F0 800EFF40 0C01BEB4 */  jal       fx_land
+/* 893F0 800EFF40 0C01BEB4 */  jal       fx_landing_dust
 /* 893F4 800EFF44 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 893F8 800EFF48 0803C08E */  j         .L800F0238
 /* 893FC 800EFF4C 00000000 */   nop
@@ -217,7 +217,7 @@ glabel func_800EFE2C
 /* 89608 800F0158 44070000 */  mfc1      $a3, $f0
 /* 8960C 800F015C 0000202D */  daddu     $a0, $zero, $zero
 /* 89610 800F0160 E7AA0010 */  swc1      $f10, 0x10($sp)
-/* 89614 800F0164 0C01BECC */  jal       fx_walk
+/* 89614 800F0164 0C01BECC */  jal       fx_walking_dust
 /* 89618 800F0168 E7A80014 */   swc1     $f8, 0x14($sp)
 /* 8961C 800F016C 0803C08E */  j         .L800F0238
 /* 89620 800F0170 00000000 */   nop
@@ -271,7 +271,7 @@ glabel func_800EFE2C
 /* 896D8 800F0228 E7A40018 */  swc1      $f4, 0x18($sp)
 /* 896DC 800F022C E7A20014 */  swc1      $f2, 0x14($sp)
 .L800F0230:
-/* 896E0 800F0230 0C01C8D4 */  jal       playFX_72
+/* 896E0 800F0230 0C01C8D4 */  jal       fx_misc_particles
 /* 896E4 800F0234 00000000 */   nop
 .L800F0238:
 /* 896E8 800F0238 8FBF0034 */  lw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0248.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0248.s
index aeb1b76f19..f8bf6cd364 100644
--- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0248.s
+++ b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0248.s
@@ -31,7 +31,7 @@ glabel func_800F0248
 /* 89760 800F02B0 3C108011 */  lui       $s0, %hi(D_8010948C)
 /* 89764 800F02B4 2610948C */  addiu     $s0, $s0, %lo(D_8010948C)
 /* 89768 800F02B8 8E070000 */  lw        $a3, ($s0)
-/* 8976C 800F02BC 0C01BEE4 */  jal       playFX_08
+/* 8976C 800F02BC 0C01BEE4 */  jal       fx_flower_splash
 /* 89770 800F02C0 460E0380 */   add.s    $f14, $f0, $f14
 /* 89774 800F02C4 C6000000 */  lwc1      $f0, ($s0)
 /* 89778 800F02C8 3C01420C */  lui       $at, 0x420c
@@ -138,7 +138,7 @@ glabel func_800F0248
 /* 89900 800F0450 C6020000 */  lwc1      $f2, ($s0)
 /* 89904 800F0454 468010A0 */  cvt.s.w   $f2, $f2
 /* 89908 800F0458 E7A20014 */  swc1      $f2, 0x14($sp)
-/* 8990C 800F045C 0C01BEFC */  jal       playFX_09
+/* 8990C 800F045C 0C01BEFC */  jal       fx_flower_trail
 /* 89910 800F0460 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 89914 800F0464 8E020000 */  lw        $v0, ($s0)
 /* 89918 800F0468 2C420001 */  sltiu     $v0, $v0, 1
diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s
index d81346ebca..57d9ad0026 100644
--- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s
+++ b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s
@@ -57,7 +57,7 @@ glabel func_800F0490
 /* 89A04 800F0554 44810000 */  mtc1      $at, $f0
 /* 89A08 800F0558 8E260030 */  lw        $a2, 0x30($s1)
 /* 89A0C 800F055C 8E070000 */  lw        $a3, ($s0)
-/* 89A10 800F0560 0C01BF14 */  jal       playFX_0A
+/* 89A10 800F0560 0C01BF14 */  jal       fx_cloud_puff
 /* 89A14 800F0564 46007381 */   sub.s    $f14, $f14, $f0
 /* 89A18 800F0568 C6000000 */  lwc1      $f0, ($s0)
 /* 89A1C 800F056C 3C01420C */  lui       $at, 0x420c
@@ -145,7 +145,7 @@ glabel func_800F0490
 /* 89B60 800F06B0 2652005A */  addiu     $s2, $s2, 0x5a
 /* 89B64 800F06B4 26730001 */  addiu     $s3, $s3, 1
 /* 89B68 800F06B8 44070000 */  mfc1      $a3, $f0
-/* 89B6C 800F06BC 0C01BF2C */  jal       playFX_0B
+/* 89B6C 800F06BC 0C01BF2C */  jal       fx_cloud_trail
 /* 89B70 800F06C0 0000202D */   daddu    $a0, $zero, $zero
 /* 89B74 800F06C4 2A620004 */  slti      $v0, $s3, 4
 /* 89B78 800F06C8 1040005B */  beqz      $v0, .L800F0838
@@ -240,7 +240,7 @@ glabel func_800F0490
 /* 89CD4 800F0824 46040000 */  add.s     $f0, $f0, $f4
 /* 89CD8 800F0828 46160000 */  add.s     $f0, $f0, $f22
 /* 89CDC 800F082C 44070000 */  mfc1      $a3, $f0
-/* 89CE0 800F0830 0C01BF2C */  jal       playFX_0B
+/* 89CE0 800F0830 0C01BF2C */  jal       fx_cloud_trail
 /* 89CE4 800F0834 24040001 */   addiu    $a0, $zero, 1
 .L800F0838:
 /* 89CE8 800F0838 8FBF0028 */  lw        $ra, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0864.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0864.s
index c12843252e..960b482f81 100644
--- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0864.s
+++ b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0864.s
@@ -93,7 +93,7 @@ glabel func_800F0864
 /* 89E68 800F09B8 460E0380 */  add.s     $f14, $f0, $f14
 /* 89E6C 800F09BC C6000000 */  lwc1      $f0, ($s0)
 /* 89E70 800F09C0 46800020 */  cvt.s.w   $f0, $f0
-/* 89E74 800F09C4 0C01BF44 */  jal       playFX_0C
+/* 89E74 800F09C4 0C01BF44 */  jal       fx_footprint
 /* 89E78 800F09C8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 89E7C 800F09CC 8E020000 */  lw        $v0, ($s0)
 /* 89E80 800F09D0 2C420001 */  sltiu     $v0, $v0, 1
diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F09EC.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F09EC.s
index 3bbc068cbb..29aec7f8d5 100644
--- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F09EC.s
+++ b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F09EC.s
@@ -83,7 +83,7 @@ glabel func_800F09EC
 /* 89FC8 800F0B18 46020000 */  add.s     $f0, $f0, $f2
 /* 89FCC 800F0B1C 3C064220 */  lui       $a2, 0x4220
 /* 89FD0 800F0B20 44070000 */  mfc1      $a3, $f0
-/* 89FD4 800F0B24 0C01C244 */  jal       playFX_2C
+/* 89FD4 800F0B24 0C01C244 */  jal       fx_falling_leaves
 /* 89FD8 800F0B28 0000202D */   daddu    $a0, $zero, $zero
 .L800F0B2C:
 /* 89FDC 800F0B2C 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0B3C.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0B3C.s
index e23a6ef617..7e0bf032e9 100644
--- a/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0B3C.s
+++ b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0B3C.s
@@ -87,7 +87,7 @@ glabel func_800F0B3C
 /* 8A128 800F0C78 46020000 */  add.s     $f0, $f0, $f2
 /* 8A12C 800F0C7C 44070000 */  mfc1      $a3, $f0
 /* 8A130 800F0C80 0000202D */  daddu     $a0, $zero, $zero
-/* 8A134 800F0C84 0C01C16C */  jal       playFX_23
+/* 8A134 800F0C84 0C01C16C */  jal       fx_rising_bubble
 /* 8A138 800F0C88 E7A60010 */   swc1     $f6, 0x10($sp)
 .L800F0C8C:
 /* 8A13C 800F0C8C 8FBF0024 */  lw        $ra, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/C50A0/update_item_entity_collectable.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_collectable.s
index 908eec33ea..af7caabcf7 100644
--- a/ver/us/asm/nonmatchings/C50A0/update_item_entity_collectable.s
+++ b/ver/us/asm/nonmatchings/C50A0/update_item_entity_collectable.s
@@ -1058,7 +1058,7 @@ glabel update_item_entity_collectable
 /* CB894 80135194 8E450008 */  lw        $a1, 8($s2)
 /* CB898 80135198 8E470010 */  lw        $a3, 0x10($s2)
 /* CB89C 8013519C 44062000 */  mfc1      $a2, $f4
-/* CB8A0 801351A0 0C01C4FC */  jal       playFX_49
+/* CB8A0 801351A0 0C01C4FC */  jal       fx_small_gold_sparkle
 /* CB8A4 801351A4 0000202D */   daddu    $a0, $zero, $zero
 /* CB8A8 801351A8 96430018 */  lhu       $v1, 0x18($s2)
 /* CB8AC 801351AC 2462FFF0 */  addiu     $v0, $v1, -0x10
@@ -1132,7 +1132,7 @@ glabel update_item_entity_collectable
 /* CB9A4 801352A4 8E870030 */  lw        $a3, 0x30($s4)
 /* CB9A8 801352A8 44061000 */  mfc1      $a2, $f2
 /* CB9AC 801352AC 24020001 */  addiu     $v0, $zero, 1
-/* CB9B0 801352B0 0C01C424 */  jal       playFX_40
+/* CB9B0 801352B0 0C01C424 */  jal       fx_recover
 /* CB9B4 801352B4 AFA20010 */   sw       $v0, 0x10($sp)
 /* CB9B8 801352B8 C6400010 */  lwc1      $f0, 0x10($s2)
 /* CB9BC 801352BC 24042056 */  addiu     $a0, $zero, 0x2056
@@ -1172,7 +1172,7 @@ glabel update_item_entity_collectable
 /* CBA38 80135338 8E870030 */  lw        $a3, 0x30($s4)
 /* CBA3C 8013533C 44061000 */  mfc1      $a2, $f2
 /* CBA40 80135340 0080102D */  daddu     $v0, $a0, $zero
-/* CBA44 80135344 0C01C424 */  jal       playFX_40
+/* CBA44 80135344 0C01C424 */  jal       fx_recover
 /* CBA48 80135348 AFA20010 */   sw       $v0, 0x10($sp)
 /* CBA4C 8013534C C6400010 */  lwc1      $f0, 0x10($s2)
 /* CBA50 80135350 24042056 */  addiu     $a0, $zero, 0x2056
@@ -1213,7 +1213,7 @@ glabel update_item_entity_collectable
 /* CBAD0 801353D0 44810000 */  mtc1      $at, $f0
 /* CBAD4 801353D4 44061000 */  mfc1      $a2, $f2
 /* CBAD8 801353D8 24040004 */  addiu     $a0, $zero, 4
-/* CBADC 801353DC 0C01BFBC */  jal       playFX_11
+/* CBADC 801353DC 0C01BFBC */  jal       fx_sparkles
 /* CBAE0 801353E0 E7A00010 */   swc1     $f0, 0x10($sp)
 /* CBAE4 801353E4 0804D533 */  j         .L801354CC
 /* CBAE8 801353E8 0240202D */   daddu    $a0, $s2, $zero
diff --git a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s
index 25010e92c8..4de81b206f 100644
--- a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s
+++ b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s
@@ -376,7 +376,7 @@ glabel update_item_entity_temp
 /* CC310 80135C10 8E250008 */  lw        $a1, 8($s1)
 /* CC314 80135C14 8E270010 */  lw        $a3, 0x10($s1)
 /* CC318 80135C18 44062000 */  mfc1      $a2, $f4
-/* CC31C 80135C1C 0C01C0AC */  jal       playFX_1B
+/* CC31C 80135C1C 0C01C0AC */  jal       fx_got_item_outline
 /* CC320 80135C20 24040001 */   addiu    $a0, $zero, 1
 .L80135C24:
 /* CC324 80135C24 3C028015 */  lui       $v0, %hi(D_801568E4)
diff --git a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s
index ff09c0373c..005b5bd368 100644
--- a/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s
+++ b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s
@@ -46,7 +46,7 @@ glabel mdl_create_model
 /* AC9B0 801162B0 AFA20014 */  sw        $v0, 0x14($sp)
 /* AC9B4 801162B4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* AC9B8 801162B8 8E060014 */  lw        $a2, 0x14($s0)
-/* AC9BC 801162BC 0C01C124 */  jal       playFX_20
+/* AC9BC 801162BC 0C01C124 */  jal       fx_flame
 /* AC9C0 801162C0 2624FFFF */   addiu    $a0, $s1, -1
 /* AC9C4 801162C4 08045995 */  j         .L80116654
 /* AC9C8 801162C8 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s
index eb8ab79e11..871e341afb 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_802186D0_69F8D0.s
@@ -109,7 +109,7 @@ glabel func_802186D0_69F8D0
 /* 69FA64 80218864 8E05FFDC */  lw        $a1, -0x24($s0)
 /* 69FA68 80218868 8E06FFE0 */  lw        $a2, -0x20($s0)
 /* 69FA6C 8021886C 8E07FFE4 */  lw        $a3, -0x1c($s0)
-/* 69FA70 80218870 0C01CA9C */  jal       playFX_85
+/* 69FA70 80218870 0C01CA9C */  jal       fx_star_outline
 /* 69FA74 80218874 0000202D */   daddu    $a0, $zero, $zero
 /* 69FA78 80218878 AE220000 */  sw        $v0, ($s1)
 /* 69FA7C 8021887C 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s
index 8e69c0fd5f..33b86f1c2e 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s
@@ -106,7 +106,7 @@ glabel func_80218AA4_69FCA4
 /* 69FE28 80218C28 8E05FFD4 */  lw        $a1, -0x2c($s0)
 /* 69FE2C 80218C2C 8E06FFD8 */  lw        $a2, -0x28($s0)
 /* 69FE30 80218C30 8E07FFDC */  lw        $a3, -0x24($s0)
-/* 69FE34 80218C34 0C01CA9C */  jal       playFX_85
+/* 69FE34 80218C34 0C01CA9C */  jal       fx_star_outline
 /* 69FE38 80218C38 0000202D */   daddu    $a0, $zero, $zero
 /* 69FE3C 80218C3C AE220000 */  sw        $v0, ($s1)
 /* 69FE40 80218C40 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s
index 074393c9be..b7d522fe91 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219444_6A0644.s
@@ -109,7 +109,7 @@ glabel func_80219444_6A0644
 /* 6A07D8 802195D8 8E05FFDC */  lw        $a1, -0x24($s0)
 /* 6A07DC 802195DC 8E06FFE0 */  lw        $a2, -0x20($s0)
 /* 6A07E0 802195E0 8E07FFE4 */  lw        $a3, -0x1c($s0)
-/* 6A07E4 802195E4 0C01CA9C */  jal       playFX_85
+/* 6A07E4 802195E4 0C01CA9C */  jal       fx_star_outline
 /* 6A07E8 802195E8 0000202D */   daddu    $a0, $zero, $zero
 /* 6A07EC 802195EC AE220000 */  sw        $v0, ($s1)
 /* 6A07F0 802195F0 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s
index ea5d3dc49e..df4a2d5dc2 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s
@@ -106,7 +106,7 @@ glabel func_80219818_6A0A18
 /* 6A0B9C 8021999C 8E05FFD4 */  lw        $a1, -0x2c($s0)
 /* 6A0BA0 802199A0 8E06FFD8 */  lw        $a2, -0x28($s0)
 /* 6A0BA4 802199A4 8E07FFDC */  lw        $a3, -0x24($s0)
-/* 6A0BA8 802199A8 0C01CA9C */  jal       playFX_85
+/* 6A0BA8 802199A8 0C01CA9C */  jal       fx_star_outline
 /* 6A0BAC 802199AC 0000202D */   daddu    $a0, $zero, $zero
 /* 6A0BB0 802199B0 AE220000 */  sw        $v0, ($s1)
 /* 6A0BB4 802199B4 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s
index 65ce17a1c3..0984688b6f 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021A804_6A1A04.s
@@ -109,7 +109,7 @@ glabel func_8021A804_6A1A04
 /* 6A1B98 8021A998 8E05FFDC */  lw        $a1, -0x24($s0)
 /* 6A1B9C 8021A99C 8E06FFE0 */  lw        $a2, -0x20($s0)
 /* 6A1BA0 8021A9A0 8E07FFE4 */  lw        $a3, -0x1c($s0)
-/* 6A1BA4 8021A9A4 0C01CA9C */  jal       playFX_85
+/* 6A1BA4 8021A9A4 0C01CA9C */  jal       fx_star_outline
 /* 6A1BA8 8021A9A8 0000202D */   daddu    $a0, $zero, $zero
 /* 6A1BAC 8021A9AC AE220000 */  sw        $v0, ($s1)
 /* 6A1BB0 8021A9B0 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s
index 62a7f2d370..ca388d3adb 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s
@@ -106,7 +106,7 @@ glabel func_8021ABD8_6A1DD8
 /* 6A1F5C 8021AD5C 8E05FFD4 */  lw        $a1, -0x2c($s0)
 /* 6A1F60 8021AD60 8E06FFD8 */  lw        $a2, -0x28($s0)
 /* 6A1F64 8021AD64 8E07FFDC */  lw        $a3, -0x24($s0)
-/* 6A1F68 8021AD68 0C01CA9C */  jal       playFX_85
+/* 6A1F68 8021AD68 0C01CA9C */  jal       fx_star_outline
 /* 6A1F6C 8021AD6C 0000202D */   daddu    $a0, $zero, $zero
 /* 6A1F70 8021AD70 AE220000 */  sw        $v0, ($s1)
 /* 6A1F74 8021AD74 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s
index 378e45f787..ccea1a9751 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s
@@ -67,7 +67,7 @@ glabel func_8021B678_6A2878
 /* 6A296C 8021B76C AFA00014 */  sw        $zero, 0x14($sp)
 /* 6A2970 8021B770 E7B40018 */  swc1      $f20, 0x18($sp)
 /* 6A2974 8021B774 E7BC001C */  swc1      $f28, 0x1c($sp)
-/* 6A2978 8021B778 0C01C6F4 */  jal       playFX_5E
+/* 6A2978 8021B778 0C01C6F4 */  jal       fx_lightning_bolt
 /* 6A297C 8021B77C AFB70020 */   sw       $s7, 0x20($sp)
 /* 6A2980 8021B780 449E0000 */  mtc1      $fp, $f0
 /* 6A2984 8021B784 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s
index cbfc953d27..73b86ca61f 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s
@@ -141,7 +141,7 @@ glabel func_8021B9A8_6A2BA8
 /* 6A2DBC 8021BBBC 44820000 */  mtc1      $v0, $f0
 /* 6A2DC0 8021BBC0 00000000 */  nop
 /* 6A2DC4 8021BBC4 46800020 */  cvt.s.w   $f0, $f0
-/* 6A2DC8 8021BBC8 0C01C6F4 */  jal       playFX_5E
+/* 6A2DC8 8021BBC8 0C01C6F4 */  jal       fx_lightning_bolt
 /* 6A2DCC 8021BBCC E7A00014 */   swc1     $f0, 0x14($sp)
 /* 6A2DD0 8021BBD0 24040100 */  addiu     $a0, $zero, 0x100
 /* 6A2DD4 8021BBD4 0C00A67F */  jal       rand_int
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s
index 29b54085cf..d409451bc6 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C14C_6A334C.s
@@ -109,7 +109,7 @@ glabel func_8021C14C_6A334C
 /* 6A34E0 8021C2E0 8E05FFDC */  lw        $a1, -0x24($s0)
 /* 6A34E4 8021C2E4 8E06FFE0 */  lw        $a2, -0x20($s0)
 /* 6A34E8 8021C2E8 8E07FFE4 */  lw        $a3, -0x1c($s0)
-/* 6A34EC 8021C2EC 0C01CA9C */  jal       playFX_85
+/* 6A34EC 8021C2EC 0C01CA9C */  jal       fx_star_outline
 /* 6A34F0 8021C2F0 0000202D */   daddu    $a0, $zero, $zero
 /* 6A34F4 8021C2F4 AE220000 */  sw        $v0, ($s1)
 /* 6A34F8 8021C2F8 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s
index 00f5366e86..cc2ea0dbcc 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s
@@ -106,7 +106,7 @@ glabel func_8021C520_6A3720
 /* 6A38A4 8021C6A4 8E05FFD4 */  lw        $a1, -0x2c($s0)
 /* 6A38A8 8021C6A8 8E06FFD8 */  lw        $a2, -0x28($s0)
 /* 6A38AC 8021C6AC 8E07FFDC */  lw        $a3, -0x24($s0)
-/* 6A38B0 8021C6B0 0C01CA9C */  jal       playFX_85
+/* 6A38B0 8021C6B0 0C01CA9C */  jal       fx_star_outline
 /* 6A38B4 8021C6B4 0000202D */   daddu    $a0, $zero, $zero
 /* 6A38B8 8021C6B8 AE220000 */  sw        $v0, ($s1)
 /* 6A38BC 8021C6BC 8C42000C */  lw        $v0, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s
index 1f6963d7fb..e9f6e7ef34 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s
@@ -67,7 +67,7 @@ glabel func_8021CFC0_6A41C0
 /* 6A42B4 8021D0B4 AFA00014 */  sw        $zero, 0x14($sp)
 /* 6A42B8 8021D0B8 E7B40018 */  swc1      $f20, 0x18($sp)
 /* 6A42BC 8021D0BC E7BC001C */  swc1      $f28, 0x1c($sp)
-/* 6A42C0 8021D0C0 0C01C6F4 */  jal       playFX_5E
+/* 6A42C0 8021D0C0 0C01C6F4 */  jal       fx_lightning_bolt
 /* 6A42C4 8021D0C4 AFB70020 */   sw       $s7, 0x20($sp)
 /* 6A42C8 8021D0C8 449E0000 */  mtc1      $fp, $f0
 /* 6A42CC 8021D0CC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s
index 00f515a3dd..d123eb1bc1 100644
--- a/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s
+++ b/ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80218F58_6BCAE8.s
@@ -54,7 +54,7 @@ glabel func_80218F58_6BCAE8
 /* 6BCB8C 80218FFC 8CA50000 */  lw        $a1, ($a1)
 /* 6BCB90 80219000 8CC60000 */  lw        $a2, ($a2)
 /* 6BCB94 80219004 8CE70000 */  lw        $a3, ($a3)
-/* 6BCB98 80219008 0C01C8EC */  jal       playFX_73
+/* 6BCB98 80219008 0C01C8EC */  jal       fx_static_status
 /* 6BCB9C 8021900C 0000202D */   daddu    $a0, $zero, $zero
 /* 6BCBA0 80219010 26250144 */  addiu     $a1, $s1, 0x144
 /* 6BCBA4 80219014 AE020014 */  sw        $v0, 0x14($s0)
@@ -79,7 +79,7 @@ glabel func_80218F58_6BCAE8
 /* 6BCBE8 80219058 8CA50000 */  lw        $a1, ($a1)
 /* 6BCBEC 8021905C 3C06C47A */  lui       $a2, 0xc47a
 /* 6BCBF0 80219060 8CE70000 */  lw        $a3, ($a3)
-/* 6BCBF4 80219064 0C01C8EC */  jal       playFX_73
+/* 6BCBF4 80219064 0C01C8EC */  jal       fx_static_status
 /* 6BCBF8 80219068 24040001 */   addiu    $a0, $zero, 1
 /* 6BCBFC 8021906C AE020018 */  sw        $v0, 0x18($s0)
 /* 6BCC00 80219070 24020001 */  addiu     $v0, $zero, 1
@@ -198,7 +198,7 @@ glabel func_80218F58_6BCAE8
 /* 6BCDAC 8021921C 4407C000 */  mfc1      $a3, $f24
 /* 6BCDB0 80219220 24020005 */  addiu     $v0, $zero, 5
 /* 6BCDB4 80219224 AFA20014 */  sw        $v0, 0x14($sp)
-/* 6BCDB8 80219228 0C01C8EC */  jal       playFX_73
+/* 6BCDB8 80219228 0C01C8EC */  jal       fx_static_status
 /* 6BCDBC 8021922C AFA00018 */   sw       $zero, 0x18($sp)
 /* 6BCDC0 80219230 AE020014 */  sw        $v0, 0x14($s0)
 .L80219234:
@@ -251,7 +251,7 @@ glabel func_80218F58_6BCAE8
 /* 6BCE68 802192D8 4407C000 */  mfc1      $a3, $f24
 /* 6BCE6C 802192DC 24020005 */  addiu     $v0, $zero, 5
 /* 6BCE70 802192E0 AFA20014 */  sw        $v0, 0x14($sp)
-/* 6BCE74 802192E4 0C01C8EC */  jal       playFX_73
+/* 6BCE74 802192E4 0C01C8EC */  jal       fx_static_status
 /* 6BCE78 802192E8 AFA00018 */   sw       $zero, 0x18($sp)
 /* 6BCE7C 802192EC AE020018 */  sw        $v0, 0x18($s0)
 /* 6BCE80 802192F0 8E020018 */  lw        $v0, 0x18($s0)
diff --git a/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219188_465618.s b/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219188_465618.s
index 32c3c2a57d..5873eaf357 100644
--- a/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219188_465618.s
+++ b/ver/us/asm/nonmatchings/battle/area_mac/actor/lee/func_80219188_465618.s
@@ -55,7 +55,7 @@ glabel func_80219188_465618
 /* 4656BC 8021922C 8CA50000 */  lw        $a1, ($a1)
 /* 4656C0 80219230 8CC60000 */  lw        $a2, ($a2)
 /* 4656C4 80219234 8CE70000 */  lw        $a3, ($a3)
-/* 4656C8 80219238 0C01C8EC */  jal       playFX_73
+/* 4656C8 80219238 0C01C8EC */  jal       fx_static_status
 /* 4656CC 8021923C 0000202D */   daddu    $a0, $zero, $zero
 /* 4656D0 80219240 26250144 */  addiu     $a1, $s1, 0x144
 /* 4656D4 80219244 AE020014 */  sw        $v0, 0x14($s0)
@@ -80,7 +80,7 @@ glabel func_80219188_465618
 /* 465718 80219288 8CA50000 */  lw        $a1, ($a1)
 /* 46571C 8021928C 3C06C47A */  lui       $a2, 0xc47a
 /* 465720 80219290 8CE70000 */  lw        $a3, ($a3)
-/* 465724 80219294 0C01C8EC */  jal       playFX_73
+/* 465724 80219294 0C01C8EC */  jal       fx_static_status
 /* 465728 80219298 24040001 */   addiu    $a0, $zero, 1
 /* 46572C 8021929C AE020018 */  sw        $v0, 0x18($s0)
 /* 465730 802192A0 24020001 */  addiu     $v0, $zero, 1
@@ -199,7 +199,7 @@ glabel func_80219188_465618
 /* 4658DC 8021944C 4407C000 */  mfc1      $a3, $f24
 /* 4658E0 80219450 24020005 */  addiu     $v0, $zero, 5
 /* 4658E4 80219454 AFA20014 */  sw        $v0, 0x14($sp)
-/* 4658E8 80219458 0C01C8EC */  jal       playFX_73
+/* 4658E8 80219458 0C01C8EC */  jal       fx_static_status
 /* 4658EC 8021945C AFA00018 */   sw       $zero, 0x18($sp)
 /* 4658F0 80219460 AE020014 */  sw        $v0, 0x14($s0)
 .L80219464:
@@ -252,7 +252,7 @@ glabel func_80219188_465618
 /* 465998 80219508 4407C000 */  mfc1      $a3, $f24
 /* 46599C 8021950C 24020005 */  addiu     $v0, $zero, 5
 /* 4659A0 80219510 AFA20014 */  sw        $v0, 0x14($sp)
-/* 4659A4 80219514 0C01C8EC */  jal       playFX_73
+/* 4659A4 80219514 0C01C8EC */  jal       fx_static_status
 /* 4659A8 80219518 AFA00018 */   sw       $zero, 0x18($sp)
 /* 4659AC 8021951C AE020018 */  sw        $v0, 0x18($s0)
 /* 4659B0 80219520 8E020018 */  lw        $v0, 0x18($s0)
diff --git a/ver/us/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218250_52B8F0.s b/ver/us/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218250_52B8F0.s
index a0bf0f0dba..8d0cb08ded 100644
--- a/ver/us/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218250_52B8F0.s
+++ b/ver/us/asm/nonmatchings/battle/area_omo2/52B7C0/func_80218250_52B8F0.s
@@ -37,7 +37,7 @@ glabel func_80218250_52B8F0
 /* 52B968 802182C8 8E050004 */  lw        $a1, 4($s0)
 /* 52B96C 802182CC 8E060008 */  lw        $a2, 8($s0)
 /* 52B970 802182D0 8E07000C */  lw        $a3, 0xc($s0)
-/* 52B974 802182D4 0C01C994 */  jal       playFX_7A
+/* 52B974 802182D4 0C01C994 */  jal       fx_ice_shard
 /* 52B978 802182D8 26310001 */   addiu    $s1, $s1, 1
 /* 52B97C 802182DC 8C43000C */  lw        $v1, 0xc($v0)
 /* 52B980 802182E0 C6000018 */  lwc1      $f0, 0x18($s0)
diff --git a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s
index 2371cc38ca..2cb920bce7 100644
--- a/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s
+++ b/ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80218E88_66AC08.s
@@ -48,7 +48,7 @@ glabel func_80218E88_66AC08
 /* 66ACAC 80218F2C 8CA50000 */  lw        $a1, ($a1)
 /* 66ACB0 80218F30 8CC60000 */  lw        $a2, ($a2)
 /* 66ACB4 80218F34 8CE70000 */  lw        $a3, ($a3)
-/* 66ACB8 80218F38 0C01C8EC */  jal       playFX_73
+/* 66ACB8 80218F38 0C01C8EC */  jal       fx_static_status
 /* 66ACBC 80218F3C 0000202D */   daddu    $a0, $zero, $zero
 /* 66ACC0 80218F40 26250144 */  addiu     $a1, $s1, 0x144
 /* 66ACC4 80218F44 AE020014 */  sw        $v0, 0x14($s0)
@@ -73,7 +73,7 @@ glabel func_80218E88_66AC08
 /* 66AD08 80218F88 8CA50000 */  lw        $a1, ($a1)
 /* 66AD0C 80218F8C 3C06C47A */  lui       $a2, 0xc47a
 /* 66AD10 80218F90 8CE70000 */  lw        $a3, ($a3)
-/* 66AD14 80218F94 0C01C8EC */  jal       playFX_73
+/* 66AD14 80218F94 0C01C8EC */  jal       fx_static_status
 /* 66AD18 80218F98 24040001 */   addiu    $a0, $zero, 1
 /* 66AD1C 80218F9C AE020018 */  sw        $v0, 0x18($s0)
 /* 66AD20 80218FA0 24020001 */  addiu     $v0, $zero, 1
@@ -192,7 +192,7 @@ glabel func_80218E88_66AC08
 /* 66AECC 8021914C 4407C000 */  mfc1      $a3, $f24
 /* 66AED0 80219150 24020005 */  addiu     $v0, $zero, 5
 /* 66AED4 80219154 AFA20014 */  sw        $v0, 0x14($sp)
-/* 66AED8 80219158 0C01C8EC */  jal       playFX_73
+/* 66AED8 80219158 0C01C8EC */  jal       fx_static_status
 /* 66AEDC 8021915C AFA00018 */   sw       $zero, 0x18($sp)
 /* 66AEE0 80219160 AE020014 */  sw        $v0, 0x14($s0)
 .L80219164:
@@ -245,7 +245,7 @@ glabel func_80218E88_66AC08
 /* 66AF88 80219208 4407C000 */  mfc1      $a3, $f24
 /* 66AF8C 8021920C 24020005 */  addiu     $v0, $zero, 5
 /* 66AF90 80219210 AFA20014 */  sw        $v0, 0x14($sp)
-/* 66AF94 80219214 0C01C8EC */  jal       playFX_73
+/* 66AF94 80219214 0C01C8EC */  jal       fx_static_status
 /* 66AF98 80219218 AFA00018 */   sw       $zero, 0x18($sp)
 /* 66AF9C 8021921C AE020018 */  sw        $v0, 0x18($s0)
 /* 66AFA0 80219220 8E020018 */  lw        $v0, 0x18($s0)
diff --git a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s
index c494d23a5e..d06c17a386 100644
--- a/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s
+++ b/ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80218E88_624A28.s
@@ -48,7 +48,7 @@ glabel func_80218E88_624A28
 /* 624ACC 80218F2C 8CA50000 */  lw        $a1, ($a1)
 /* 624AD0 80218F30 8CC60000 */  lw        $a2, ($a2)
 /* 624AD4 80218F34 8CE70000 */  lw        $a3, ($a3)
-/* 624AD8 80218F38 0C01C8EC */  jal       playFX_73
+/* 624AD8 80218F38 0C01C8EC */  jal       fx_static_status
 /* 624ADC 80218F3C 0000202D */   daddu    $a0, $zero, $zero
 /* 624AE0 80218F40 26250144 */  addiu     $a1, $s1, 0x144
 /* 624AE4 80218F44 AE020014 */  sw        $v0, 0x14($s0)
@@ -73,7 +73,7 @@ glabel func_80218E88_624A28
 /* 624B28 80218F88 8CA50000 */  lw        $a1, ($a1)
 /* 624B2C 80218F8C 3C06C47A */  lui       $a2, 0xc47a
 /* 624B30 80218F90 8CE70000 */  lw        $a3, ($a3)
-/* 624B34 80218F94 0C01C8EC */  jal       playFX_73
+/* 624B34 80218F94 0C01C8EC */  jal       fx_static_status
 /* 624B38 80218F98 24040001 */   addiu    $a0, $zero, 1
 /* 624B3C 80218F9C AE020018 */  sw        $v0, 0x18($s0)
 /* 624B40 80218FA0 24020001 */  addiu     $v0, $zero, 1
@@ -192,7 +192,7 @@ glabel func_80218E88_624A28
 /* 624CEC 8021914C 4407C000 */  mfc1      $a3, $f24
 /* 624CF0 80219150 24020005 */  addiu     $v0, $zero, 5
 /* 624CF4 80219154 AFA20014 */  sw        $v0, 0x14($sp)
-/* 624CF8 80219158 0C01C8EC */  jal       playFX_73
+/* 624CF8 80219158 0C01C8EC */  jal       fx_static_status
 /* 624CFC 8021915C AFA00018 */   sw       $zero, 0x18($sp)
 /* 624D00 80219160 AE020014 */  sw        $v0, 0x14($s0)
 .L80219164:
@@ -245,7 +245,7 @@ glabel func_80218E88_624A28
 /* 624DA8 80219208 4407C000 */  mfc1      $a3, $f24
 /* 624DAC 8021920C 24020005 */  addiu     $v0, $zero, 5
 /* 624DB0 80219210 AFA20014 */  sw        $v0, 0x14($sp)
-/* 624DB4 80219214 0C01C8EC */  jal       playFX_73
+/* 624DB4 80219214 0C01C8EC */  jal       fx_static_status
 /* 624DB8 80219218 AFA00018 */   sw       $zero, 0x18($sp)
 /* 624DBC 8021921C AE020018 */  sw        $v0, 0x18($s0)
 /* 624DC0 80219220 8E020018 */  lw        $v0, 0x18($s0)
diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s b/ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s
index 2db08637b0..cec9df181e 100644
--- a/ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s
+++ b/ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s
@@ -76,7 +76,7 @@ glabel func_80218058_608B08
 /* 608C24 80218174 4405A000 */  mfc1      $a1, $f20
 /* 608C28 80218178 4406B000 */  mfc1      $a2, $f22
 /* 608C2C 8021817C 4407C000 */  mfc1      $a3, $f24
-/* 608C30 80218180 0C01C6C4 */  jal       playFX_5C
+/* 608C30 80218180 0C01C6C4 */  jal       fx_water_fountain
 /* 608C34 80218184 46000506 */   mov.s    $f20, $f0
 /* 608C38 80218188 8C43000C */  lw        $v1, 0xc($v0)
 /* 608C3C 8021818C E4740038 */  swc1      $f20, 0x38($v1)
diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s
index 379a3f007b..e31421faa7 100644
--- a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s
+++ b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s
@@ -76,7 +76,7 @@ glabel func_802184E4_608F94
 /* 6090B0 80218600 4405A000 */  mfc1      $a1, $f20
 /* 6090B4 80218604 4406B000 */  mfc1      $a2, $f22
 /* 6090B8 80218608 4407C000 */  mfc1      $a3, $f24
-/* 6090BC 8021860C 0C01C6C4 */  jal       playFX_5C
+/* 6090BC 8021860C 0C01C6C4 */  jal       fx_water_fountain
 /* 6090C0 80218610 46000506 */   mov.s    $f20, $f0
 /* 6090C4 80218614 8C43000C */  lw        $v1, 0xc($v0)
 /* 6090C8 80218618 E4740038 */  swc1      $f20, 0x38($v1)
diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s
index 828d84bbd5..601e6ba0c2 100644
--- a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s
+++ b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s
@@ -76,7 +76,7 @@ glabel func_80218884_609334
 /* 609450 802189A0 4405A000 */  mfc1      $a1, $f20
 /* 609454 802189A4 4406B000 */  mfc1      $a2, $f22
 /* 609458 802189A8 4407C000 */  mfc1      $a3, $f24
-/* 60945C 802189AC 0C01C6C4 */  jal       playFX_5C
+/* 60945C 802189AC 0C01C6C4 */  jal       fx_water_fountain
 /* 609460 802189B0 46000506 */   mov.s    $f20, $f0
 /* 609464 802189B4 8C43000C */  lw        $v1, 0xc($v0)
 /* 609468 802189B8 E4740038 */  swc1      $f20, 0x38($v1)
diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s b/ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s
index d882118c2c..1089bbb0c7 100644
--- a/ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s
+++ b/ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s
@@ -76,7 +76,7 @@ glabel battle_item_shooting_star_func_802A123C_71D9AC
 /* 71DAC0 802A1350 E7B60010 */  swc1      $f22, 0x10($sp)
 /* 71DAC4 802A1354 AFA00014 */  sw        $zero, 0x14($sp)
 /* 71DAC8 802A1358 E7B40018 */  swc1      $f20, 0x18($sp)
-/* 71DACC 802A135C 0C01BF8C */  jal       playFX_0F
+/* 71DACC 802A135C 0C01BF8C */  jal       fx_star
 /* 71DAD0 802A1360 E7A0001C */   swc1     $f0, 0x1c($sp)
 /* 71DAD4 802A1364 8FBF002C */  lw        $ra, 0x2c($sp)
 /* 71DAD8 802A1368 8FB20028 */  lw        $s2, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep/battle_item_sleepy_sheep_func_802A123C_71E88C.s b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep/battle_item_sleepy_sheep_func_802A123C_71E88C.s
index 1009dbb0d1..457de4cac3 100644
--- a/ver/us/asm/nonmatchings/battle/item/sleepy_sheep/battle_item_sleepy_sheep_func_802A123C_71E88C.s
+++ b/ver/us/asm/nonmatchings/battle/item/sleepy_sheep/battle_item_sleepy_sheep_func_802A123C_71E88C.s
@@ -260,7 +260,7 @@ glabel battle_item_sleepy_sheep_func_802A123C_71E88C
 /* 71EC2C 802A15DC 4406A000 */  mfc1      $a2, $f20
 /* 71EC30 802A15E0 4407C000 */  mfc1      $a3, $f24
 /* 71EC34 802A15E4 24150001 */  addiu     $s5, $zero, 1
-/* 71EC38 802A15E8 0C01BEB4 */  jal       fx_land
+/* 71EC38 802A15E8 0C01BEB4 */  jal       fx_landing_dust
 /* 71EC3C 802A15EC AFA00010 */   sw       $zero, 0x10($sp)
 /* 71EC40 802A15F0 2694000C */  addiu     $s4, $s4, 0xc
 .L802A15F4:
@@ -305,7 +305,7 @@ glabel battle_item_sleepy_sheep_func_802A123C_71E88C
 /* 71ECDC 802A168C 4406A000 */  mfc1      $a2, $f20
 /* 71ECE0 802A1690 44070000 */  mfc1      $a3, $f0
 /* 71ECE4 802A1694 24040002 */  addiu     $a0, $zero, 2
-/* 71ECE8 802A1698 0C01BEB4 */  jal       fx_land
+/* 71ECE8 802A1698 0C01BEB4 */  jal       fx_landing_dust
 /* 71ECEC 802A169C AFA00010 */   sw       $zero, 0x10($sp)
 .L802A16A0:
 /* 71ECF0 802A16A0 C7C20000 */  lwc1      $f2, ($fp)
diff --git a/ver/us/asm/nonmatchings/battle/move/shell_crack/77F240/func_802A10A4_77F2E4.s b/ver/us/asm/nonmatchings/battle/move/shell_crack/77F240/func_802A10A4_77F2E4.s
index 75b24439b7..079c2ae7db 100644
--- a/ver/us/asm/nonmatchings/battle/move/shell_crack/77F240/func_802A10A4_77F2E4.s
+++ b/ver/us/asm/nonmatchings/battle/move/shell_crack/77F240/func_802A10A4_77F2E4.s
@@ -47,7 +47,7 @@ glabel func_802A10A4_77F2E4
 /* 77F388 802A1148 44061000 */  mfc1      $a2, $f2
 /* 77F38C 802A114C 0000202D */  daddu     $a0, $zero, $zero
 /* 77F390 802A1150 E7B80010 */  swc1      $f24, 0x10($sp)
-/* 77F394 802A1154 0C01C7FC */  jal       playFX_69
+/* 77F394 802A1154 0C01C7FC */  jal       fx_floating_cloud_puff
 /* 77F398 802A1158 AFB20014 */   sw       $s2, 0x14($sp)
 /* 77F39C 802A115C 2A220014 */  slti      $v0, $s1, 0x14
 /* 77F3A0 802A1160 1440FFE4 */  bnez      $v0, .L802A10F4
diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s b/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s
index d90508645e..21c03bffb8 100644
--- a/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s
+++ b/ver/us/asm/nonmatchings/battle/partner/goombario/func_80238EDC_6F1FBC.s
@@ -78,7 +78,7 @@ glabel func_80238EDC_6F1FBC
 /* 6F20D0 80238FF0 44071000 */  mfc1      $a3, $f2
 /* 6F20D4 80238FF4 2403003C */  addiu     $v1, $zero, 0x3c
 /* 6F20D8 80238FF8 AFA30014 */  sw        $v1, 0x14($sp)
-/* 6F20DC 80238FFC 0C01C634 */  jal       playFX_56
+/* 6F20DC 80238FFC 0C01C634 */  jal       fx_stat_change
 /* 6F20E0 80239000 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 6F20E4 80239004 3C05800E */  lui       $a1, %hi(gBattleStatus)
 /* 6F20E8 80239008 24A5C070 */  addiu     $a1, $a1, %lo(gBattleStatus)
diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s
index 5d0daccc78..a192e76ffb 100644
--- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s
+++ b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80238C58_70C968.s
@@ -31,7 +31,7 @@ glabel func_80238C58_70C968
 /* 70C9C8 80238CB8 8C87014C */  lw        $a3, 0x14c($a0)
 /* 70C9CC 80238CBC 3C018024 */  lui       $at, %hi(D_8023D1E0)
 /* 70C9D0 80238CC0 E420D1E0 */  swc1      $f0, %lo(D_8023D1E0)($at)
-/* 70C9D4 80238CC4 0C01C304 */  jal       playFX_34
+/* 70C9D4 80238CC4 0C01C304 */  jal       fx_ending_decals
 /* 70C9D8 80238CC8 0000202D */   daddu    $a0, $zero, $zero
 /* 70C9DC 80238CCC 24020001 */  addiu     $v0, $zero, 1
 /* 70C9E0 80238CD0 0808E34D */  j         .L80238D34
diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s
index 419d9548e9..381f911798 100644
--- a/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s
+++ b/ver/us/asm/nonmatchings/battle/partner/lakilester/func_80239140_70CE50.s
@@ -53,7 +53,7 @@ glabel func_80239140_70CE50
 /* 70CF08 802391F8 E7A20018 */  swc1      $f2, 0x18($sp)
 /* 70CF0C 802391FC 00A0382D */  daddu     $a3, $a1, $zero
 /* 70CF10 80239200 AFA50010 */  sw        $a1, 0x10($sp)
-/* 70CF14 80239204 0C01C874 */  jal       playFX_6E
+/* 70CF14 80239204 0C01C874 */  jal       fx_huff_puff_breath
 /* 70CF18 80239208 E7A00014 */   swc1     $f0, 0x14($sp)
 /* 70CF1C 8023920C 8C44000C */  lw        $a0, 0xc($v0)
 /* 70CF20 80239210 24030014 */  addiu     $v1, $zero, 0x14
@@ -494,7 +494,7 @@ glabel func_80239140_70CE50
 /* 70D59C 8023988C 44052000 */  mfc1      $a1, $f4
 /* 70D5A0 80239890 44063000 */  mfc1      $a2, $f6
 /* 70D5A4 80239894 46201020 */  cvt.s.d   $f0, $f2
-/* 70D5A8 80239898 0C01C904 */  jal       playFX_74
+/* 70D5A8 80239898 0C01C904 */  jal       fx_moving_cloud
 /* 70D5AC 8023989C E7A0001C */   swc1     $f0, 0x1c($sp)
 .L802398A0:
 /* 70D5B0 802398A0 8E020000 */  lw        $v0, ($s0)
@@ -585,7 +585,7 @@ glabel func_80239140_70CE50
 /* 70D6FC 802399EC 44052000 */  mfc1      $a1, $f4
 /* 70D700 802399F0 44063000 */  mfc1      $a2, $f6
 /* 70D704 802399F4 46201020 */  cvt.s.d   $f0, $f2
-/* 70D708 802399F8 0C01C904 */  jal       playFX_74
+/* 70D708 802399F8 0C01C904 */  jal       fx_moving_cloud
 /* 70D70C 802399FC E7A0001C */   swc1     $f0, 0x1c($sp)
 .L80239A00:
 /* 70D710 80239A00 3C118024 */  lui       $s1, %hi(D_8023CCC0_7109D0)
diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_802390B4_700E34.s b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_802390B4_700E34.s
index 28eaf95d2c..8ef2072d75 100644
--- a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_802390B4_700E34.s
+++ b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_802390B4_700E34.s
@@ -53,7 +53,7 @@ glabel func_802390B4_700E34
 /* 700EEC 8023916C 8E25000C */  lw        $a1, 0xc($s1)
 /* 700EF0 80239170 8E260010 */  lw        $a2, 0x10($s1)
 /* 700EF4 80239174 8E270014 */  lw        $a3, 0x14($s1)
-/* 700EF8 80239178 0C01C79C */  jal       playFX_65
+/* 700EF8 80239178 0C01C79C */  jal       fx_65
 /* 700EFC 8023917C 0000202D */   daddu    $a0, $zero, $zero
 /* 700F00 80239180 3C018024 */  lui       $at, %hi(D_8023BD70)
 /* 700F04 80239184 AC22BD70 */  sw        $v0, %lo(D_8023BD70)($at)
diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie/func_80238540_7081E0.s b/ver/us/asm/nonmatchings/battle/partner/sushie/func_80238540_7081E0.s
index 783476ace9..21749a94ec 100644
--- a/ver/us/asm/nonmatchings/battle/partner/sushie/func_80238540_7081E0.s
+++ b/ver/us/asm/nonmatchings/battle/partner/sushie/func_80238540_7081E0.s
@@ -48,7 +48,7 @@ glabel func_80238540_7081E0
 /* 708284 802385E4 8E25000C */  lw        $a1, 0xc($s1)
 /* 708288 802385E8 8E260010 */  lw        $a2, 0x10($s1)
 /* 70828C 802385EC 8E270014 */  lw        $a3, 0x14($s1)
-/* 708290 802385F0 0C01C6C4 */  jal       playFX_5C
+/* 708290 802385F0 0C01C6C4 */  jal       fx_water_fountain
 /* 708294 802385F4 24040001 */   addiu    $a0, $zero, 1
 /* 708298 802385F8 8C43000C */  lw        $v1, 0xc($v0)
 /* 70829C 802385FC C6200054 */  lwc1      $f0, 0x54($s1)
@@ -523,7 +523,7 @@ glabel func_80238540_7081E0
 /* 70897C 80238CDC 44810000 */  mtc1      $at, $f0
 /* 708980 80238CE0 24020078 */  addiu     $v0, $zero, 0x78
 /* 708984 80238CE4 AFA20014 */  sw        $v0, 0x14($sp)
-/* 708988 80238CE8 0C01C6DC */  jal       playFX_5D
+/* 708988 80238CE8 0C01C6DC */  jal       fx_underwater
 /* 70898C 80238CEC E7A00010 */   swc1     $f0, 0x10($sp)
 .L80238CF0:
 /* 708990 80238CF0 86020064 */  lh        $v0, 0x64($s0)
@@ -603,7 +603,7 @@ glabel func_80238540_7081E0
 /* 708A9C 80238DFC 8E250144 */  lw        $a1, 0x144($s1)
 /* 708AA0 80238E00 8E260148 */  lw        $a2, 0x148($s1)
 /* 708AA4 80238E04 8E27014C */  lw        $a3, 0x14c($s1)
-/* 708AA8 80238E08 0C01C70C */  jal       playFX_5F
+/* 708AA8 80238E08 0C01C70C */  jal       fx_water_splash
 /* 708AAC 80238E0C 24040003 */   addiu    $a0, $zero, 3
 /* 708AB0 80238E10 0000102D */  daddu     $v0, $zero, $zero
 .L80238E14:
diff --git a/ver/us/asm/nonmatchings/battle/partner/watt/func_80238000_703AF0.s b/ver/us/asm/nonmatchings/battle/partner/watt/func_80238000_703AF0.s
index 34a5900b73..b0eaa80084 100644
--- a/ver/us/asm/nonmatchings/battle/partner/watt/func_80238000_703AF0.s
+++ b/ver/us/asm/nonmatchings/battle/partner/watt/func_80238000_703AF0.s
@@ -33,7 +33,7 @@ glabel func_80238000_703AF0
 /* 703B60 80238070 AC30C1C4 */  sw        $s0, %lo(D_8023C1C4)($at)
 /* 703B64 80238074 3C018024 */  lui       $at, %hi(D_8023C1C8)
 /* 703B68 80238078 AC20C1C8 */  sw        $zero, %lo(D_8023C1C8)($at)
-/* 703B6C 8023807C 0C01C8EC */  jal       playFX_73
+/* 703B6C 8023807C 0C01C8EC */  jal       fx_static_status
 /* 703B70 80238080 0000202D */   daddu    $a0, $zero, $zero
 /* 703B74 80238084 E7B40010 */  swc1      $f20, 0x10($sp)
 /* 703B78 80238088 AFB10014 */  sw        $s1, 0x14($sp)
@@ -43,7 +43,7 @@ glabel func_80238000_703AF0
 /* 703B88 80238098 8E47014C */  lw        $a3, 0x14c($s2)
 /* 703B8C 8023809C 3C018024 */  lui       $at, %hi(D_8023C1CC)
 /* 703B90 802380A0 AC22C1CC */  sw        $v0, %lo(D_8023C1CC)($at)
-/* 703B94 802380A4 0C01C8EC */  jal       playFX_73
+/* 703B94 802380A4 0C01C8EC */  jal       fx_static_status
 /* 703B98 802380A8 0200202D */   daddu    $a0, $s0, $zero
 /* 703B9C 802380AC 3C018024 */  lui       $at, %hi(D_8023C1D0)
 /* 703BA0 802380B0 AC22C1D0 */  sw        $v0, %lo(D_8023C1D0)($at)
@@ -151,7 +151,7 @@ glabel func_80238000_703AF0
 /* 703D28 80238238 24020005 */  addiu     $v0, $zero, 5
 /* 703D2C 8023823C AFA20014 */  sw        $v0, 0x14($sp)
 /* 703D30 80238240 AFA00018 */  sw        $zero, 0x18($sp)
-/* 703D34 80238244 0C01C8EC */  jal       playFX_73
+/* 703D34 80238244 0C01C8EC */  jal       fx_static_status
 /* 703D38 80238248 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 703D3C 8023824C AE020000 */  sw        $v0, ($s0)
 .L80238250:
@@ -189,7 +189,7 @@ glabel func_80238000_703AF0
 /* 703DB4 802382C4 24020005 */  addiu     $v0, $zero, 5
 /* 703DB8 802382C8 AFA20014 */  sw        $v0, 0x14($sp)
 /* 703DBC 802382CC AFA00018 */  sw        $zero, 0x18($sp)
-/* 703DC0 802382D0 0C01C8EC */  jal       playFX_73
+/* 703DC0 802382D0 0C01C8EC */  jal       fx_static_status
 /* 703DC4 802382D4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 703DC8 802382D8 AE020000 */  sw        $v0, ($s0)
 .L802382DC:
diff --git a/ver/us/asm/nonmatchings/battle/partner/watt/func_80238668_704158.s b/ver/us/asm/nonmatchings/battle/partner/watt/func_80238668_704158.s
index 49ac0585d8..1d17789db9 100644
--- a/ver/us/asm/nonmatchings/battle/partner/watt/func_80238668_704158.s
+++ b/ver/us/asm/nonmatchings/battle/partner/watt/func_80238668_704158.s
@@ -52,7 +52,7 @@ glabel func_80238668_704158
 /* 704214 80238724 3C028024 */  lui       $v0, %hi(D_8023C1B0)
 /* 704218 80238728 2442C1B0 */  addiu     $v0, $v0, %lo(D_8023C1B0)
 /* 70421C 8023872C AFA20014 */  sw        $v0, 0x14($sp)
-/* 704220 80238730 0C01C3C4 */  jal       playFX_3C
+/* 704220 80238730 0C01C3C4 */  jal       fx_3C
 /* 704224 80238734 E7A00010 */   swc1     $f0, 0x10($sp)
 .L80238738:
 /* 704228 80238738 8E020070 */  lw        $v0, 0x70($s0)
diff --git a/ver/us/asm/nonmatchings/battle/partner/watt/func_80238C84_704774.s b/ver/us/asm/nonmatchings/battle/partner/watt/func_80238C84_704774.s
index 5d2af9b67a..cfab56ec1a 100644
--- a/ver/us/asm/nonmatchings/battle/partner/watt/func_80238C84_704774.s
+++ b/ver/us/asm/nonmatchings/battle/partner/watt/func_80238C84_704774.s
@@ -60,7 +60,7 @@ glabel func_80238C84_704774
 /* 704848 80238D58 8E430078 */  lw        $v1, 0x78($s2)
 /* 70484C 80238D5C 44071000 */  mfc1      $a3, $f2
 /* 704850 80238D60 2463000A */  addiu     $v1, $v1, 0xa
-/* 704854 80238D64 0C01C664 */  jal       playFX_58
+/* 704854 80238D64 0C01C664 */  jal       fx_thunderbolt_ring
 /* 704858 80238D68 AFA30014 */   sw       $v1, 0x14($sp)
 /* 70485C 80238D6C 8C43000C */  lw        $v1, 0xc($v0)
 /* 704860 80238D70 3C018024 */  lui       $at, %hi(D_8023C1B4)
diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A16F4_7907C4.s b/ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A16F4_7907C4.s
index bc3c278604..3af147324f 100644
--- a/ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A16F4_7907C4.s
+++ b/ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A16F4_7907C4.s
@@ -119,7 +119,7 @@ glabel func_802A16F4_7907C4
 /* 79097C 802A18AC 44070000 */  mfc1      $a3, $f0
 /* 790980 802A18B0 2402003C */  addiu     $v0, $zero, 0x3c
 /* 790984 802A18B4 AFA20014 */  sw        $v0, 0x14($sp)
-/* 790988 802A18B8 0C01C634 */  jal       playFX_56
+/* 790988 802A18B8 0C01C634 */  jal       fx_stat_change
 /* 79098C 802A18BC E7A40010 */   swc1     $f4, 0x10($sp)
 /* 790990 802A18C0 0C05272D */  jal       sfx_play_sound
 /* 790994 802A18C4 24042106 */   addiu    $a0, $zero, 0x2106
diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s b/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s
index 8d04a3bec0..311bb98f12 100644
--- a/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s
+++ b/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s
@@ -177,7 +177,7 @@ glabel func_802A1518_799CC8
 /* 797748 802A1788 8E060008 */  lw        $a2, 8($s0)
 /* 79774C 802A178C 8E07000C */  lw        $a3, 0xc($s0)
 .L802A1790:
-/* 797750 802A1790 0C01C8D4 */  jal       playFX_72
+/* 797750 802A1790 0C01C8D4 */  jal       fx_misc_particles
 /* 797754 802A1794 24040004 */   addiu    $a0, $zero, 4
 .L802A1798:
 /* 797758 802A1798 26730004 */  addiu     $s3, $s3, 4
@@ -241,7 +241,7 @@ glabel func_802A1518_799CC8
 /* 797828 802A1868 8E060008 */  lw        $a2, 8($s0)
 /* 79782C 802A186C 8E07000C */  lw        $a3, 0xc($s0)
 .L802A1870:
-/* 797830 802A1870 0C01C8D4 */  jal       playFX_72
+/* 797830 802A1870 0C01C8D4 */  jal       fx_misc_particles
 /* 797834 802A1874 24040004 */   addiu    $a0, $zero, 4
 .L802A1878:
 /* 797838 802A1878 26730004 */  addiu     $s3, $s3, 4
@@ -301,7 +301,7 @@ glabel func_802A1518_799CC8
 /* 7978F8 802A1938 44810000 */  mtc1      $at, $f0
 .L802A193C:
 /* 7978FC 802A193C AFA00014 */  sw        $zero, 0x14($sp)
-/* 797900 802A1940 0C01C964 */  jal       playFX_78
+/* 797900 802A1940 0C01C964 */  jal       fx_peach_star_beam
 /* 797904 802A1944 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 797908 802A1948 3C01802A */  lui       $at, %hi(D_802A37F0)
 /* 79790C 802A194C AC2237F0 */  sw        $v0, %lo(D_802A37F0)($at)
diff --git a/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1518_78BB18.s b/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1518_78BB18.s
index fc92fbdf1a..bf3cff7fe5 100644
--- a/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1518_78BB18.s
+++ b/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1518_78BB18.s
@@ -152,7 +152,7 @@ glabel func_802A1518_78BB18
 /* 78BD44 802A1744 8E050038 */  lw        $a1, 0x38($s0)
 /* 78BD48 802A1748 8E06003C */  lw        $a2, 0x3c($s0)
 /* 78BD4C 802A174C 8E070040 */  lw        $a3, 0x40($s0)
-/* 78BD50 802A1750 0C01BFBC */  jal       playFX_11
+/* 78BD50 802A1750 0C01BFBC */  jal       fx_sparkles
 /* 78BD54 802A1754 0000202D */   daddu    $a0, $zero, $zero
 .L802A1758:
 /* 78BD58 802A1758 9602008E */  lhu       $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s b/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s
index 1604faa90a..9518f38f67 100644
--- a/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s
+++ b/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s
@@ -177,7 +177,7 @@ glabel func_802A1518_7974D8
 /* 797748 802A1788 8E060008 */  lw        $a2, 8($s0)
 /* 79774C 802A178C 8E07000C */  lw        $a3, 0xc($s0)
 .L802A1790:
-/* 797750 802A1790 0C01C8D4 */  jal       playFX_72
+/* 797750 802A1790 0C01C8D4 */  jal       fx_misc_particles
 /* 797754 802A1794 24040004 */   addiu    $a0, $zero, 4
 .L802A1798:
 /* 797758 802A1798 26730004 */  addiu     $s3, $s3, 4
@@ -241,7 +241,7 @@ glabel func_802A1518_7974D8
 /* 797828 802A1868 8E060008 */  lw        $a2, 8($s0)
 /* 79782C 802A186C 8E07000C */  lw        $a3, 0xc($s0)
 .L802A1870:
-/* 797830 802A1870 0C01C8D4 */  jal       playFX_72
+/* 797830 802A1870 0C01C8D4 */  jal       fx_misc_particles
 /* 797834 802A1874 24040004 */   addiu    $a0, $zero, 4
 .L802A1878:
 /* 797838 802A1878 26730004 */  addiu     $s3, $s3, 4
@@ -301,7 +301,7 @@ glabel func_802A1518_7974D8
 /* 7978F8 802A1938 44810000 */  mtc1      $at, $f0
 .L802A193C:
 /* 7978FC 802A193C AFA00014 */  sw        $zero, 0x14($sp)
-/* 797900 802A1940 0C01C964 */  jal       playFX_78
+/* 797900 802A1940 0C01C964 */  jal       fx_peach_star_beam
 /* 797904 802A1944 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 797908 802A1948 3C01802A */  lui       $at, %hi(D_802A37F0)
 /* 79790C 802A194C AC2237F0 */  sw        $v0, %lo(D_802A37F0)($at)
diff --git a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s b/ver/us/asm/nonmatchings/effects/attack_result_text/attack_result_text_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s
rename to ver/us/asm/nonmatchings/effects/attack_result_text/attack_result_text_main.s
index ceb2844d06..521a52484d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_main.s
+++ b/ver/us/asm/nonmatchings/effects/attack_result_text/attack_result_text_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_72_main
+glabel attack_result_text_main
 /* 38F900 E0090000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 38F904 E0090004 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 38F908 E0090008 4485C000 */  mtc1      $a1, $f24
@@ -16,14 +16,14 @@ glabel fx_72_main
 /* 38F92C E009002C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 38F930 E0090030 AFB30034 */  sw        $s3, 0x34($sp)
 /* 38F934 E0090034 8FB3007C */  lw        $s3, 0x7c($sp)
-/* 38F938 E0090038 3C02E009 */  lui       $v0, %hi(fx_72_init)
-/* 38F93C E009003C 244201C0 */  addiu     $v0, $v0, %lo(fx_72_init)
+/* 38F938 E0090038 3C02E009 */  lui       $v0, %hi(attack_result_text_init)
+/* 38F93C E009003C 244201C0 */  addiu     $v0, $v0, %lo(attack_result_text_init)
 /* 38F940 E0090040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38F944 E0090044 3C02E009 */  lui       $v0, %hi(fx_72_update)
-/* 38F948 E0090048 244201C8 */  addiu     $v0, $v0, %lo(fx_72_update)
+/* 38F944 E0090044 3C02E009 */  lui       $v0, %hi(attack_result_text_update)
+/* 38F948 E0090048 244201C8 */  addiu     $v0, $v0, %lo(attack_result_text_update)
 /* 38F94C E009004C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38F950 E0090050 3C02E009 */  lui       $v0, %hi(fx_72_render)
-/* 38F954 E0090054 24420420 */  addiu     $v0, $v0, %lo(fx_72_render)
+/* 38F950 E0090050 3C02E009 */  lui       $v0, %hi(attack_result_text_render)
+/* 38F954 E0090054 24420420 */  addiu     $v0, $v0, %lo(attack_result_text_render)
 /* 38F958 E0090058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 38F95C E009005C 3C02E009 */  lui       $v0, %hi(func_E0090428)
 /* 38F960 E0090060 24420428 */  addiu     $v0, $v0, %lo(func_E0090428)
diff --git a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_update.s b/ver/us/asm/nonmatchings/effects/attack_result_text/attack_result_text_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_72/fx_72_update.s
rename to ver/us/asm/nonmatchings/effects/attack_result_text/attack_result_text_update.s
index 237bb6b323..ac19f3964b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_72/fx_72_update.s
+++ b/ver/us/asm/nonmatchings/effects/attack_result_text/attack_result_text_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_72_update
+glabel attack_result_text_update
 /* 38FAC8 E00901C8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 38FACC E00901CC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 38FAD0 E00901D0 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_72/func_E0090428.s b/ver/us/asm/nonmatchings/effects/attack_result_text/func_E0090428.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_72/func_E0090428.s
rename to ver/us/asm/nonmatchings/effects/attack_result_text/func_E0090428.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_72/func_E0090444.s b/ver/us/asm/nonmatchings/effects/attack_result_text/func_E0090444.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_72/func_E0090444.s
rename to ver/us/asm/nonmatchings/effects/attack_result_text/func_E0090444.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_appendGfx.s b/ver/us/asm/nonmatchings/effects/aura/aura_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_59/fx_59_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/aura/aura_appendGfx.s
index 7bb86c0da1..bd44ce26e2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/aura/aura_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_59_appendGfx
+glabel aura_appendGfx
 /* 3778CC E007685C 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 3778D0 E0076860 3C02DB06 */  lui       $v0, 0xdb06
 /* 3778D4 E0076864 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s b/ver/us/asm/nonmatchings/effects/aura/aura_main.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s
rename to ver/us/asm/nonmatchings/effects/aura/aura_main.s
index 27414ed97d..06cf43d7a6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_main.s
+++ b/ver/us/asm/nonmatchings/effects/aura/aura_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_59_main
+glabel aura_main
 /* 377070 E0076000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 377074 E0076004 F7B60040 */  sdc1      $f22, 0x40($sp)
 /* 377078 E0076008 4485B000 */  mtc1      $a1, $f22
@@ -14,14 +14,14 @@ glabel fx_59_main
 /* 377094 E0076024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 377098 E0076028 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 37709C E007602C C7B40068 */  lwc1      $f20, 0x68($sp)
-/* 3770A0 E0076030 3C02E007 */  lui       $v0, %hi(fx_59_init)
-/* 3770A4 E0076034 24426370 */  addiu     $v0, $v0, %lo(fx_59_init)
+/* 3770A0 E0076030 3C02E007 */  lui       $v0, %hi(aura_init)
+/* 3770A4 E0076034 24426370 */  addiu     $v0, $v0, %lo(aura_init)
 /* 3770A8 E0076038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3770AC E007603C 3C02E007 */  lui       $v0, %hi(fx_59_update)
-/* 3770B0 E0076040 24426378 */  addiu     $v0, $v0, %lo(fx_59_update)
+/* 3770AC E007603C 3C02E007 */  lui       $v0, %hi(aura_update)
+/* 3770B0 E0076040 24426378 */  addiu     $v0, $v0, %lo(aura_update)
 /* 3770B4 E0076044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3770B8 E0076048 3C02E007 */  lui       $v0, %hi(fx_59_render)
-/* 3770BC E007604C 24426808 */  addiu     $v0, $v0, %lo(fx_59_render)
+/* 3770B8 E0076048 3C02E007 */  lui       $v0, %hi(aura_render)
+/* 3770BC E007604C 24426808 */  addiu     $v0, $v0, %lo(aura_render)
 /* 3770C0 E0076050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3770C4 E0076054 2402003B */  addiu     $v0, $zero, 0x3b
 /* 3770C8 E0076058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_update.s b/ver/us/asm/nonmatchings/effects/aura/aura_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_59/fx_59_update.s
rename to ver/us/asm/nonmatchings/effects/aura/aura_update.s
index 233c682ff7..691fa42739 100644
--- a/ver/us/asm/nonmatchings/effects/effect_59/fx_59_update.s
+++ b/ver/us/asm/nonmatchings/effects/aura/aura_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_59_update
+glabel aura_update
 /* 3773E8 E0076378 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3773EC E007637C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3773F0 E0076380 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_appendGfx.s b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_48/fx_48_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_appendGfx.s
index 7b797b7306..310d85a49f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_48_appendGfx
+glabel big_snowflakes_appendGfx
 /* 3635B0 E0060450 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 3635B4 E0060454 3C02DB06 */  lui       $v0, 0xdb06
 /* 3635B8 E0060458 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s
rename to ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_main.s
index 42606a1ed2..c2efc39c16 100644
--- a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_main.s
+++ b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_48_main
+glabel big_snowflakes_main
 /* 363160 E0060000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 363164 E0060004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 363168 E0060008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_48_main
 /* 36317C E006001C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 363180 E0060020 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 363184 E0060024 4487C000 */  mtc1      $a3, $f24
-/* 363188 E0060028 3C02E006 */  lui       $v0, %hi(fx_48_init)
-/* 36318C E006002C 244201D8 */  addiu     $v0, $v0, %lo(fx_48_init)
+/* 363188 E0060028 3C02E006 */  lui       $v0, %hi(big_snowflakes_init)
+/* 36318C E006002C 244201D8 */  addiu     $v0, $v0, %lo(big_snowflakes_init)
 /* 363190 E0060030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 363194 E0060034 3C02E006 */  lui       $v0, %hi(fx_48_update)
-/* 363198 E0060038 244201E0 */  addiu     $v0, $v0, %lo(fx_48_update)
+/* 363194 E0060034 3C02E006 */  lui       $v0, %hi(big_snowflakes_update)
+/* 363198 E0060038 244201E0 */  addiu     $v0, $v0, %lo(big_snowflakes_update)
 /* 36319C E006003C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3631A0 E0060040 3C02E006 */  lui       $v0, %hi(fx_48_render)
-/* 3631A4 E0060044 2442040C */  addiu     $v0, $v0, %lo(fx_48_render)
+/* 3631A0 E0060040 3C02E006 */  lui       $v0, %hi(big_snowflakes_render)
+/* 3631A4 E0060044 2442040C */  addiu     $v0, $v0, %lo(big_snowflakes_render)
 /* 3631A8 E0060048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3631AC E006004C 24020030 */  addiu     $v0, $zero, 0x30
 /* 3631B0 E0060050 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_update.s b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_48/fx_48_update.s
rename to ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_update.s
index 6e59ca2a7c..18727c240f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_48/fx_48_update.s
+++ b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_48_update
+glabel big_snowflakes_update
 /* 363340 E00601E0 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 363344 E00601E4 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 363348 E00601E8 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_appendGfx.s b/ver/us/asm/nonmatchings/effects/blast/blast_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_62/fx_62_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/blast/blast_appendGfx.s
index ac501e5917..338cbfeb9c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/blast/blast_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_62_appendGfx
+glabel blast_appendGfx
 /* 37D684 E007C1F4 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 37D688 E007C1F8 0080302D */  daddu     $a2, $a0, $zero
 /* 37D68C E007C1FC 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s b/ver/us/asm/nonmatchings/effects/blast/blast_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s
rename to ver/us/asm/nonmatchings/effects/blast/blast_main.s
index b14ba10c82..f95f034019 100644
--- a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_main.s
+++ b/ver/us/asm/nonmatchings/effects/blast/blast_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_62_main
+glabel blast_main
 /* 37D490 E007C000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 37D494 E007C004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 37D498 E007C008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_62_main
 /* 37D4B4 E007C024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 37D4B8 E007C028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 37D4BC E007C02C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 37D4C0 E007C030 3C02E008 */  lui       $v0, %hi(fx_62_init)
-/* 37D4C4 E007C034 2442C128 */  addiu     $v0, $v0, %lo(fx_62_init)
+/* 37D4C0 E007C030 3C02E008 */  lui       $v0, %hi(blast_init)
+/* 37D4C4 E007C034 2442C128 */  addiu     $v0, $v0, %lo(blast_init)
 /* 37D4C8 E007C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 37D4CC E007C03C 3C02E008 */  lui       $v0, %hi(fx_62_update)
-/* 37D4D0 E007C040 2442C130 */  addiu     $v0, $v0, %lo(fx_62_update)
+/* 37D4CC E007C03C 3C02E008 */  lui       $v0, %hi(blast_update)
+/* 37D4D0 E007C040 2442C130 */  addiu     $v0, $v0, %lo(blast_update)
 /* 37D4D4 E007C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 37D4D8 E007C048 3C02E008 */  lui       $v0, %hi(fx_62_render)
-/* 37D4DC E007C04C 2442C1B0 */  addiu     $v0, $v0, %lo(fx_62_render)
+/* 37D4D8 E007C048 3C02E008 */  lui       $v0, %hi(blast_render)
+/* 37D4DC E007C04C 2442C1B0 */  addiu     $v0, $v0, %lo(blast_render)
 /* 37D4E0 E007C050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 37D4E4 E007C054 2402003E */  addiu     $v0, $zero, 0x3e
 /* 37D4E8 E007C058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_update.s b/ver/us/asm/nonmatchings/effects/blast/blast_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_62/fx_62_update.s
rename to ver/us/asm/nonmatchings/effects/blast/blast_update.s
index 404b683f7b..d1e5566c75 100644
--- a/ver/us/asm/nonmatchings/effects/effect_62/fx_62_update.s
+++ b/ver/us/asm/nonmatchings/effects/blast/blast_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_62_update
+glabel blast_update
 /* 37D5C0 E007C130 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37D5C4 E007C134 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 37D5C8 E007C138 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_appendGfx.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_66/fx_66_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_appendGfx.s
index 1657abc05e..d035fe909c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_66_appendGfx
+glabel bombette_breaking_appendGfx
 /* 3892F8 E0084928 27BDFF58 */  addiu     $sp, $sp, -0xa8
 /* 3892FC E008492C 3C06DB06 */  lui       $a2, 0xdb06
 /* 389300 E0084930 AFA400A8 */  sw        $a0, 0xa8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_main.s
similarity index 97%
rename from ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s
rename to ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_main.s
index 1252a4a645..d59f54987f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_main.s
+++ b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_66_main
+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
@@ -91,15 +91,15 @@ glabel fx_66_main
 /* 388BA4 E00841D4 46201082 */  mul.d     $f2, $f2, $f0
 /* 388BA8 E00841D8 00000000 */  nop
 /* 388BAC E00841DC 0200202D */  daddu     $a0, $s0, $zero
-/* 388BB0 E00841E0 3C02E008 */  lui       $v0, %hi(fx_66_init)
-/* 388BB4 E00841E4 24424658 */  addiu     $v0, $v0, %lo(fx_66_init)
+/* 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(fx_66_update)
-/* 388BC4 E00841F4 24424660 */  addiu     $v0, $v0, %lo(fx_66_update)
+/* 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(fx_66_render)
-/* 388BD0 E0084200 244248E4 */  addiu     $v0, $v0, %lo(fx_66_render)
+/* 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
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_update.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_66/fx_66_update.s
rename to ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_update.s
index 949027b3f2..ecd6c37fb5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_66/fx_66_update.s
+++ b/ver/us/asm/nonmatchings/effects/bombette_breaking/bombette_breaking_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_66_update
+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)
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084000.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/func_E0084000.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_66/func_E0084000.s
rename to ver/us/asm/nonmatchings/effects/bombette_breaking/func_E0084000.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E008403C.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/func_E008403C.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_66/func_E008403C.s
rename to ver/us/asm/nonmatchings/effects/bombette_breaking/func_E008403C.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_66/func_E0084060.s b/ver/us/asm/nonmatchings/effects/bombette_breaking/func_E0084060.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_66/func_E0084060.s
rename to ver/us/asm/nonmatchings/effects/bombette_breaking/func_E0084060.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_appendGfx.s b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_126/fx_126_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_appendGfx.s
index ba01694092..e99a558d59 100644
--- a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_126_appendGfx
+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
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_main.s
similarity index 95%
rename from ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s
rename to ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_main.s
index 22e520283b..16c9aea295 100644
--- a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_main.s
+++ b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_126_main
+glabel breaking_junk_main
 /* 403400 E0118000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 403404 E0118004 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 403408 E0118008 4485C000 */  mtc1      $a1, $f24
@@ -16,14 +16,14 @@ glabel fx_126_main
 /* 40342C E011802C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 403430 E0118030 AFB00028 */  sw        $s0, 0x28($sp)
 /* 403434 E0118034 8FB00084 */  lw        $s0, 0x84($sp)
-/* 403438 E0118038 3C02E012 */  lui       $v0, %hi(fx_126_init)
-/* 40343C E011803C 244282EC */  addiu     $v0, $v0, %lo(fx_126_init)
+/* 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(fx_126_update)
-/* 403448 E0118048 244282F4 */  addiu     $v0, $v0, %lo(fx_126_update)
+/* 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(fx_126_render)
-/* 403454 E0118054 24428454 */  addiu     $v0, $v0, %lo(fx_126_render)
+/* 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)
diff --git a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_update.s b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_126/fx_126_update.s
rename to ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_update.s
index 4c92841252..7baa2c19a0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_126/fx_126_update.s
+++ b/ver/us/asm/nonmatchings/effects/breaking_junk/breaking_junk_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_126_update
+glabel breaking_junk_update
 /* 4036F4 E01182F4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 4036F8 E01182F8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 4036FC E01182FC 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_appendGfx.s b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_85/fx_85_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/butterflies/butterflies_appendGfx.s
index 85f6353e0d..0935375d78 100644
--- a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_85_appendGfx
+glabel butterflies_appendGfx
 /* 3AAD24 E00AA404 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3AAD28 E00AA408 3C03DB06 */  lui       $v1, 0xdb06
 /* 3AAD2C E00AA40C AFB1009C */  sw        $s1, 0x9c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_main.s
similarity index 88%
rename from ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s
rename to ver/us/asm/nonmatchings/effects/butterflies/butterflies_main.s
index f2d5af5c79..894e6259d9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_main.s
+++ b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_85_main
+glabel butterflies_main
 /* 3AA920 E00AA000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3AA924 E00AA004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3AA928 E00AA008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_85_main
 /* 3AA93C E00AA01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3AA940 E00AA020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3AA944 E00AA024 4487C000 */  mtc1      $a3, $f24
-/* 3AA948 E00AA028 3C02E00B */  lui       $v0, %hi(fx_85_init)
-/* 3AA94C E00AA02C 2442A104 */  addiu     $v0, $v0, %lo(fx_85_init)
+/* 3AA948 E00AA028 3C02E00B */  lui       $v0, %hi(butterflies_init)
+/* 3AA94C E00AA02C 2442A104 */  addiu     $v0, $v0, %lo(butterflies_init)
 /* 3AA950 E00AA030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3AA954 E00AA034 3C02E00B */  lui       $v0, %hi(fx_85_update)
-/* 3AA958 E00AA038 2442A10C */  addiu     $v0, $v0, %lo(fx_85_update)
+/* 3AA954 E00AA034 3C02E00B */  lui       $v0, %hi(butterflies_update)
+/* 3AA958 E00AA038 2442A10C */  addiu     $v0, $v0, %lo(butterflies_update)
 /* 3AA95C E00AA03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3AA960 E00AA040 3C02E00B */  lui       $v0, %hi(fx_85_render)
-/* 3AA964 E00AA044 2442A3C0 */  addiu     $v0, $v0, %lo(fx_85_render)
+/* 3AA960 E00AA040 3C02E00B */  lui       $v0, %hi(butterflies_render)
+/* 3AA964 E00AA044 2442A3C0 */  addiu     $v0, $v0, %lo(butterflies_render)
 /* 3AA968 E00AA048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3AA96C E00AA04C 24020055 */  addiu     $v0, $zero, 0x55
 /* 3AA970 E00AA050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_update.s b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_85/fx_85_update.s
rename to ver/us/asm/nonmatchings/effects/butterflies/butterflies_update.s
index d0ee56e215..778adaec35 100644
--- a/ver/us/asm/nonmatchings/effects/effect_85/fx_85_update.s
+++ b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_85_update
+glabel butterflies_update
 /* 3AAA2C E00AA10C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3AAA30 E00AA110 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 3AAA34 E00AA114 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_appendGfx.s b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_121/fx_121_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_appendGfx.s
index 48b3b1eabc..ba58216922 100644
--- a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_121_appendGfx
+glabel chapter_change_appendGfx
 /* 3EBA38 E010E558 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3EBA3C E010E55C 3C07DB06 */  lui       $a3, 0xdb06
 /* 3EBA40 E010E560 3C06800A */  lui       $a2, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s
rename to ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_main.s
index 7db3edba44..8266942d8f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_main.s
+++ b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_121_main
+glabel chapter_change_main
 /* 3EB80C E010E32C 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3EB810 E010E330 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3EB814 E010E334 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_121_main
 /* 3EB830 E010E350 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3EB834 E010E354 AFB30034 */  sw        $s3, 0x34($sp)
 /* 3EB838 E010E358 8FB3006C */  lw        $s3, 0x6c($sp)
-/* 3EB83C E010E35C 3C02E011 */  lui       $v0, %hi(fx_121_init)
-/* 3EB840 E010E360 2442E4A0 */  addiu     $v0, $v0, %lo(fx_121_init)
+/* 3EB83C E010E35C 3C02E011 */  lui       $v0, %hi(chapter_change_init)
+/* 3EB840 E010E360 2442E4A0 */  addiu     $v0, $v0, %lo(chapter_change_init)
 /* 3EB844 E010E364 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3EB848 E010E368 3C02E011 */  lui       $v0, %hi(fx_121_update)
-/* 3EB84C E010E36C 2442E4A8 */  addiu     $v0, $v0, %lo(fx_121_update)
+/* 3EB848 E010E368 3C02E011 */  lui       $v0, %hi(chapter_change_update)
+/* 3EB84C E010E36C 2442E4A8 */  addiu     $v0, $v0, %lo(chapter_change_update)
 /* 3EB850 E010E370 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3EB854 E010E374 3C02E011 */  lui       $v0, %hi(fx_121_render)
-/* 3EB858 E010E378 2442E510 */  addiu     $v0, $v0, %lo(fx_121_render)
+/* 3EB854 E010E374 3C02E011 */  lui       $v0, %hi(chapter_change_render)
+/* 3EB858 E010E378 2442E510 */  addiu     $v0, $v0, %lo(chapter_change_render)
 /* 3EB85C E010E37C AFA20020 */  sw        $v0, 0x20($sp)
 /* 3EB860 E010E380 24020079 */  addiu     $v0, $zero, 0x79
 /* 3EB864 E010E384 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_update.s b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_121/fx_121_update.s
rename to ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_update.s
index 78e6ebd405..151e9bdd20 100644
--- a/ver/us/asm/nonmatchings/effects/effect_121/fx_121_update.s
+++ b/ver/us/asm/nonmatchings/effects/chapter_change/chapter_change_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_121_update
+glabel chapter_change_update
 /* 3EB988 E010E4A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3EB98C E010E4AC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3EB990 E010E4B0 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_121/func_E010E000.s b/ver/us/asm/nonmatchings/effects/chapter_change/func_E010E000.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_121/func_E010E000.s
rename to ver/us/asm/nonmatchings/effects/chapter_change/func_E010E000.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_appendGfx.s b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_77/fx_77_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_appendGfx.s
index fb4f923c8e..743bb6a710 100644
--- a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_77_appendGfx
+glabel chomp_drop_appendGfx
 /* 396990 E009A3E0 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 396994 E009A3E4 0080482D */  daddu     $t1, $a0, $zero
 /* 396998 E009A3E8 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s
rename to ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_main.s
index e48274637f..928a317f91 100644
--- a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_main.s
+++ b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_77_main
+glabel chomp_drop_main
 /* 3965B0 E009A000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3965B4 E009A004 F7B60048 */  sdc1      $f22, 0x48($sp)
 /* 3965B8 E009A008 4485B000 */  mtc1      $a1, $f22
@@ -16,14 +16,14 @@ glabel fx_77_main
 /* 3965DC E009A02C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3965E0 E009A030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3965E4 E009A034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 3965E8 E009A038 3C02E00A */  lui       $v0, %hi(fx_77_init)
-/* 3965EC E009A03C 2442A138 */  addiu     $v0, $v0, %lo(fx_77_init)
+/* 3965E8 E009A038 3C02E00A */  lui       $v0, %hi(chomp_drop_init)
+/* 3965EC E009A03C 2442A138 */  addiu     $v0, $v0, %lo(chomp_drop_init)
 /* 3965F0 E009A040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3965F4 E009A044 3C02E00A */  lui       $v0, %hi(fx_77_update)
-/* 3965F8 E009A048 2442A140 */  addiu     $v0, $v0, %lo(fx_77_update)
+/* 3965F4 E009A044 3C02E00A */  lui       $v0, %hi(chomp_drop_update)
+/* 3965F8 E009A048 2442A140 */  addiu     $v0, $v0, %lo(chomp_drop_update)
 /* 3965FC E009A04C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 396600 E009A050 3C02E00A */  lui       $v0, %hi(fx_77_render)
-/* 396604 E009A054 2442A398 */  addiu     $v0, $v0, %lo(fx_77_render)
+/* 396600 E009A050 3C02E00A */  lui       $v0, %hi(chomp_drop_render)
+/* 396604 E009A054 2442A398 */  addiu     $v0, $v0, %lo(chomp_drop_render)
 /* 396608 E009A058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39660C E009A05C 2402004D */  addiu     $v0, $zero, 0x4d
 /* 396610 E009A060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_update.s b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_77/fx_77_update.s
rename to ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_update.s
index 543d5486e0..0bd596619a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_77/fx_77_update.s
+++ b/ver/us/asm/nonmatchings/effects/chomp_drop/chomp_drop_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_77_update
+glabel chomp_drop_update
 /* 3966F0 E009A140 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3966F4 E009A144 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 3966F8 E009A148 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -115,7 +115,7 @@ dlabel LE009A28C_39683C
 /* 396894 E009A2E4 8E260008 */  lw        $a2, 8($s1)
 /* 396898 E009A2E8 8E27000C */  lw        $a3, 0xc($s1)
 /* 39689C E009A2EC 44050000 */  mfc1      $a1, $f0
-/* 3968A0 E009A2F0 0C00A800 */  jal       fx_21_main
+/* 3968A0 E009A2F0 0C00A800 */  jal       dust_main
 /* 3968A4 E009A2F4 24040002 */   addiu    $a0, $zero, 2
 /* 3968A8 E009A2F8 C6200004 */  lwc1      $f0, 4($s1)
 /* 3968AC E009A2FC AFB00010 */  sw        $s0, 0x10($sp)
@@ -123,7 +123,7 @@ dlabel LE009A28C_39683C
 /* 3968B4 E009A304 8E260008 */  lw        $a2, 8($s1)
 /* 3968B8 E009A308 8E27000C */  lw        $a3, 0xc($s1)
 /* 3968BC E009A30C 44050000 */  mfc1      $a1, $f0
-/* 3968C0 E009A310 0C00A800 */  jal       fx_21_main
+/* 3968C0 E009A310 0C00A800 */  jal       dust_main
 /* 3968C4 E009A314 24040002 */   addiu    $a0, $zero, 2
 /* 3968C8 E009A318 24020004 */  addiu     $v0, $zero, 4
 /* 3968CC E009A31C AE22002C */  sw        $v0, 0x2c($s1)
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_appendGfx.s b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_111/fx_111_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_appendGfx.s
index f548e5764d..0c69bc664a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_111_appendGfx
+glabel cold_breath_appendGfx
 /* 3D89C8 E00DE2A8 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D89CC E00DE2AC 0080302D */  daddu     $a2, $a0, $zero
 /* 3D89D0 E00DE2B0 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_main.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s
rename to ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_main.s
index 638bccc550..61da04fb4b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_main.s
+++ b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_111_main
+glabel cold_breath_main
 /* 3D8720 E00DE000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3D8724 E00DE004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3D8728 E00DE008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_111_main
 /* 3D8744 E00DE024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D8748 E00DE028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3D874C E00DE02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3D8750 E00DE030 3C02E00E */  lui       $v0, %hi(fx_111_init)
-/* 3D8754 E00DE034 2442E11C */  addiu     $v0, $v0, %lo(fx_111_init)
+/* 3D8750 E00DE030 3C02E00E */  lui       $v0, %hi(cold_breath_init)
+/* 3D8754 E00DE034 2442E11C */  addiu     $v0, $v0, %lo(cold_breath_init)
 /* 3D8758 E00DE038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D875C E00DE03C 3C02E00E */  lui       $v0, %hi(fx_111_update)
-/* 3D8760 E00DE040 2442E124 */  addiu     $v0, $v0, %lo(fx_111_update)
+/* 3D875C E00DE03C 3C02E00E */  lui       $v0, %hi(cold_breath_update)
+/* 3D8760 E00DE040 2442E124 */  addiu     $v0, $v0, %lo(cold_breath_update)
 /* 3D8764 E00DE044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D8768 E00DE048 3C02E00E */  lui       $v0, %hi(fx_111_render)
-/* 3D876C E00DE04C 2442E260 */  addiu     $v0, $v0, %lo(fx_111_render)
+/* 3D8768 E00DE048 3C02E00E */  lui       $v0, %hi(cold_breath_render)
+/* 3D876C E00DE04C 2442E260 */  addiu     $v0, $v0, %lo(cold_breath_render)
 /* 3D8770 E00DE050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D8774 E00DE054 2402006F */  addiu     $v0, $zero, 0x6f
 /* 3D8778 E00DE058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_update.s b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_111/fx_111_update.s
rename to ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_update.s
index b0cf84654b..1bc6cd2d0c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_111/fx_111_update.s
+++ b/ver/us/asm/nonmatchings/effects/cold_breath/cold_breath_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_111_update
+glabel cold_breath_update
 /* 3D8844 E00DE124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D8848 E00DE128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D884C E00DE12C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_appendGfx.s b/ver/us/asm/nonmatchings/effects/confetti/confetti_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_68/fx_68_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/confetti/confetti_appendGfx.s
index 50b51ce6c4..10b0e8a379 100644
--- a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/confetti/confetti_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_68_appendGfx
+glabel confetti_appendGfx
 /* 38B5D0 E00887E0 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 38B5D4 E00887E4 0080382D */  daddu     $a3, $a0, $zero
 /* 38B5D8 E00887E8 3C08DB06 */  lui       $t0, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s b/ver/us/asm/nonmatchings/effects/confetti/confetti_main.s
similarity index 97%
rename from ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s
rename to ver/us/asm/nonmatchings/effects/confetti/confetti_main.s
index 78bfa86754..24f54e4b0c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_main.s
+++ b/ver/us/asm/nonmatchings/effects/confetti/confetti_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_68_main
+glabel confetti_main
 /* 38AF6C E008817C 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 38AF70 E0088180 F7B40058 */  sdc1      $f20, 0x58($sp)
 /* 38AF74 E0088184 4485A000 */  mtc1      $a1, $f20
@@ -68,14 +68,14 @@ dlabel LE0088250_38B040
 /* 38B048 E0088258 00000000 */  nop
 /* 38B04C E008825C E7B00028 */  swc1      $f16, 0x28($sp)
 .LE0088260:
-/* 38B050 E0088260 3C02E009 */  lui       $v0, %hi(fx_68_init)
-/* 38B054 E0088264 244285A0 */  addiu     $v0, $v0, %lo(fx_68_init)
+/* 38B050 E0088260 3C02E009 */  lui       $v0, %hi(confetti_init)
+/* 38B054 E0088264 244285A0 */  addiu     $v0, $v0, %lo(confetti_init)
 /* 38B058 E0088268 AC820008 */  sw        $v0, 8($a0)
-/* 38B05C E008826C 3C02E009 */  lui       $v0, %hi(fx_68_update)
-/* 38B060 E0088270 244285A8 */  addiu     $v0, $v0, %lo(fx_68_update)
+/* 38B05C E008826C 3C02E009 */  lui       $v0, %hi(confetti_update)
+/* 38B060 E0088270 244285A8 */  addiu     $v0, $v0, %lo(confetti_update)
 /* 38B064 E0088274 AC82000C */  sw        $v0, 0xc($a0)
-/* 38B068 E0088278 3C02E009 */  lui       $v0, %hi(fx_68_render)
-/* 38B06C E008827C 244287A8 */  addiu     $v0, $v0, %lo(fx_68_render)
+/* 38B068 E0088278 3C02E009 */  lui       $v0, %hi(confetti_render)
+/* 38B06C E008827C 244287A8 */  addiu     $v0, $v0, %lo(confetti_render)
 /* 38B070 E0088280 AC820010 */  sw        $v0, 0x10($a0)
 /* 38B074 E0088284 24020044 */  addiu     $v0, $zero, 0x44
 /* 38B078 E0088288 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_update.s b/ver/us/asm/nonmatchings/effects/confetti/confetti_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_68/fx_68_update.s
rename to ver/us/asm/nonmatchings/effects/confetti/confetti_update.s
index ce6ddd19bf..3187084cbb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_68/fx_68_update.s
+++ b/ver/us/asm/nonmatchings/effects/confetti/confetti_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_68_update
+glabel confetti_update
 /* 38B398 E00885A8 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 38B39C E00885AC AFBF0028 */  sw        $ra, 0x28($sp)
 /* 38B3A0 E00885B0 AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_68/func_E0088000.s b/ver/us/asm/nonmatchings/effects/confetti/func_E0088000.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_68/func_E0088000.s
rename to ver/us/asm/nonmatchings/effects/confetti/func_E0088000.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s b/ver/us/asm/nonmatchings/effects/damage_indicator/damage_indicator_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s
rename to ver/us/asm/nonmatchings/effects/damage_indicator/damage_indicator_main.s
index 75d2637ac6..07ad1b69fb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_main.s
+++ b/ver/us/asm/nonmatchings/effects/damage_indicator/damage_indicator_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_30_main
+glabel damage_indicator_main
 /* 34F4C0 E003C000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 34F4C4 E003C004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 34F4C8 E003C008 4485A000 */  mtc1      $a1, $f20
@@ -27,14 +27,14 @@ glabel fx_30_main
 /* 34F518 E003C058 24120014 */  addiu     $s2, $zero, 0x14
 .LE003C05C:
 /* 34F51C E003C05C 26520001 */  addiu     $s2, $s2, 1
-/* 34F520 E003C060 3C02E004 */  lui       $v0, %hi(fx_30_init)
-/* 34F524 E003C064 2442C23C */  addiu     $v0, $v0, %lo(fx_30_init)
+/* 34F520 E003C060 3C02E004 */  lui       $v0, %hi(damage_indicator_init)
+/* 34F524 E003C064 2442C23C */  addiu     $v0, $v0, %lo(damage_indicator_init)
 /* 34F528 E003C068 AFA20018 */  sw        $v0, 0x18($sp)
-/* 34F52C E003C06C 3C02E004 */  lui       $v0, %hi(fx_30_update)
-/* 34F530 E003C070 2442C244 */  addiu     $v0, $v0, %lo(fx_30_update)
+/* 34F52C E003C06C 3C02E004 */  lui       $v0, %hi(damage_indicator_update)
+/* 34F530 E003C070 2442C244 */  addiu     $v0, $v0, %lo(damage_indicator_update)
 /* 34F534 E003C074 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 34F538 E003C078 3C02E004 */  lui       $v0, %hi(fx_30_render)
-/* 34F53C E003C07C 2442C474 */  addiu     $v0, $v0, %lo(fx_30_render)
+/* 34F538 E003C078 3C02E004 */  lui       $v0, %hi(damage_indicator_render)
+/* 34F53C E003C07C 2442C474 */  addiu     $v0, $v0, %lo(damage_indicator_render)
 /* 34F540 E003C080 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34F544 E003C084 3C02E004 */  lui       $v0, %hi(func_E003C47C)
 /* 34F548 E003C088 2442C47C */  addiu     $v0, $v0, %lo(func_E003C47C)
diff --git a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_update.s b/ver/us/asm/nonmatchings/effects/damage_indicator/damage_indicator_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_30/fx_30_update.s
rename to ver/us/asm/nonmatchings/effects/damage_indicator/damage_indicator_update.s
index bab36d0244..5097d5c808 100644
--- a/ver/us/asm/nonmatchings/effects/effect_30/fx_30_update.s
+++ b/ver/us/asm/nonmatchings/effects/damage_indicator/damage_indicator_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_30_update
+glabel damage_indicator_update
 /* 34F704 E003C244 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 34F708 E003C248 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 34F70C E003C24C F7B40018 */  sdc1      $f20, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C47C.s b/ver/us/asm/nonmatchings/effects/damage_indicator/func_E003C47C.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_30/func_E003C47C.s
rename to ver/us/asm/nonmatchings/effects/damage_indicator/func_E003C47C.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_30/func_E003C498.s b/ver/us/asm/nonmatchings/effects/damage_indicator/func_E003C498.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_30/func_E003C498.s
rename to ver/us/asm/nonmatchings/effects/damage_indicator/func_E003C498.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_appendGfx.s b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_24/fx_24_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_appendGfx.s
index 294b7c40bf..c7b8f478d4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_24_appendGfx
+glabel damage_stars_appendGfx
 /* 342BA8 E0030A68 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 342BAC E0030A6C 3C05DB06 */  lui       $a1, 0xdb06
 /* 342BB0 E0030A70 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_main.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s
rename to ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_main.s
index df78148607..c89bb34884 100644
--- a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_main.s
+++ b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_24_main
+glabel damage_stars_main
 /* 342140 E0030000 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 342144 E0030004 F7B600A8 */  sdc1      $f22, 0xa8($sp)
 /* 342148 E0030008 C7B600E0 */  lwc1      $f22, 0xe0($sp)
@@ -123,16 +123,16 @@ glabel fx_24_main
 /* 34230C E00301CC 4600F782 */  mul.s     $f30, $f30, $f0
 /* 342310 E00301D0 00000000 */  nop
 /* 342314 E00301D4 0200202D */  daddu     $a0, $s0, $zero
-/* 342318 E00301D8 3C02E003 */  lui       $v0, %hi(fx_24_init)
-/* 34231C E00301DC 24420728 */  addiu     $v0, $v0, %lo(fx_24_init)
+/* 342318 E00301D8 3C02E003 */  lui       $v0, %hi(damage_stars_init)
+/* 34231C E00301DC 24420728 */  addiu     $v0, $v0, %lo(damage_stars_init)
 /* 342320 E00301E0 AC820008 */  sw        $v0, 8($a0)
 /* 342324 E00301E4 46004202 */  mul.s     $f8, $f8, $f0
 /* 342328 E00301E8 00000000 */  nop
-/* 34232C E00301EC 3C02E003 */  lui       $v0, %hi(fx_24_update)
-/* 342330 E00301F0 24420730 */  addiu     $v0, $v0, %lo(fx_24_update)
+/* 34232C E00301EC 3C02E003 */  lui       $v0, %hi(damage_stars_update)
+/* 342330 E00301F0 24420730 */  addiu     $v0, $v0, %lo(damage_stars_update)
 /* 342334 E00301F4 AC82000C */  sw        $v0, 0xc($a0)
-/* 342338 E00301F8 3C02E003 */  lui       $v0, %hi(fx_24_render)
-/* 34233C E00301FC 24420A24 */  addiu     $v0, $v0, %lo(fx_24_render)
+/* 342338 E00301F8 3C02E003 */  lui       $v0, %hi(damage_stars_render)
+/* 34233C E00301FC 24420A24 */  addiu     $v0, $v0, %lo(damage_stars_render)
 /* 342340 E0030200 AC800000 */  sw        $zero, ($a0)
 /* 342344 E0030204 4600E702 */  mul.s     $f28, $f28, $f0
 /* 342348 E0030208 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_update.s b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_24/fx_24_update.s
rename to ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_update.s
index a83e88d6d8..64e90cb959 100644
--- a/ver/us/asm/nonmatchings/effects/effect_24/fx_24_update.s
+++ b/ver/us/asm/nonmatchings/effects/damage_stars/damage_stars_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_24_update
+glabel damage_stars_update
 /* 342870 E0030730 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 342874 E0030734 AFB40020 */  sw        $s4, 0x20($sp)
 /* 342878 E0030738 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_appendGfx.s b/ver/us/asm/nonmatchings/effects/debuff/debuff_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_49/fx_49_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/debuff/debuff_appendGfx.s
index 973b1bf3d2..b4b272616b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/debuff/debuff_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_49_appendGfx
+glabel debuff_appendGfx
 /* 3647EC E00624EC 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 3647F0 E00624F0 AFBE0100 */  sw        $fp, 0x100($sp)
 /* 3647F4 E00624F4 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s b/ver/us/asm/nonmatchings/effects/debuff/debuff_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s
rename to ver/us/asm/nonmatchings/effects/debuff/debuff_main.s
index a19d454d1f..ffaf85efc6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_main.s
+++ b/ver/us/asm/nonmatchings/effects/debuff/debuff_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_49_main
+glabel debuff_main
 /* 364300 E0062000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 364304 E0062004 F7B40048 */  sdc1      $f20, 0x48($sp)
 /* 364308 E0062008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_49_main
 /* 36431C E006201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 364320 E0062020 F7B80058 */  sdc1      $f24, 0x58($sp)
 /* 364324 E0062024 4487C000 */  mtc1      $a3, $f24
-/* 364328 E0062028 3C02E006 */  lui       $v0, %hi(fx_49_init)
-/* 36432C E006202C 24422218 */  addiu     $v0, $v0, %lo(fx_49_init)
+/* 364328 E0062028 3C02E006 */  lui       $v0, %hi(debuff_init)
+/* 36432C E006202C 24422218 */  addiu     $v0, $v0, %lo(debuff_init)
 /* 364330 E0062030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 364334 E0062034 3C02E006 */  lui       $v0, %hi(fx_49_update)
-/* 364338 E0062038 24422220 */  addiu     $v0, $v0, %lo(fx_49_update)
+/* 364334 E0062034 3C02E006 */  lui       $v0, %hi(debuff_update)
+/* 364338 E0062038 24422220 */  addiu     $v0, $v0, %lo(debuff_update)
 /* 36433C E006203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 364340 E0062040 3C02E006 */  lui       $v0, %hi(fx_49_render)
-/* 364344 E0062044 244224A8 */  addiu     $v0, $v0, %lo(fx_49_render)
+/* 364340 E0062040 3C02E006 */  lui       $v0, %hi(debuff_render)
+/* 364344 E0062044 244224A8 */  addiu     $v0, $v0, %lo(debuff_render)
 /* 364348 E0062048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36434C E006204C 24020031 */  addiu     $v0, $zero, 0x31
 /* 364350 E0062050 AFBF0040 */  sw        $ra, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_update.s b/ver/us/asm/nonmatchings/effects/debuff/debuff_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_49/fx_49_update.s
rename to ver/us/asm/nonmatchings/effects/debuff/debuff_update.s
index 8f8e18b246..f39a9fe427 100644
--- a/ver/us/asm/nonmatchings/effects/effect_49/fx_49_update.s
+++ b/ver/us/asm/nonmatchings/effects/debuff/debuff_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_49_update
+glabel debuff_update
 /* 364520 E0062220 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 364524 E0062224 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 364528 E0062228 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/disable_x/disable_x_main.s b/ver/us/asm/nonmatchings/effects/disable_x/disable_x_main.s
new file mode 100644
index 0000000000..b24de8a85b
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/disable_x/disable_x_main.s
@@ -0,0 +1,124 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel disable_x_main
+/* 385640 E0082000 27BDFFB0 */  addiu     $sp, $sp, -0x50
+/* 385644 E0082004 F7B40038 */  sdc1      $f20, 0x38($sp)
+/* 385648 E0082008 4485A000 */  mtc1      $a1, $f20
+/* 38564C E008200C AFB00028 */  sw        $s0, 0x28($sp)
+/* 385650 E0082010 0080802D */  daddu     $s0, $a0, $zero
+/* 385654 E0082014 F7B60040 */  sdc1      $f22, 0x40($sp)
+/* 385658 E0082018 4486B000 */  mtc1      $a2, $f22
+/* 38565C E008201C 27A40010 */  addiu     $a0, $sp, 0x10
+/* 385660 E0082020 F7B80048 */  sdc1      $f24, 0x48($sp)
+/* 385664 E0082024 4487C000 */  mtc1      $a3, $f24
+/* 385668 E0082028 3C02E008 */  lui       $v0, %hi(disable_x_init)
+/* 38566C E008202C 244221B0 */  addiu     $v0, $v0, %lo(disable_x_init)
+/* 385670 E0082030 AFA20018 */  sw        $v0, 0x18($sp)
+/* 385674 E0082034 3C02E008 */  lui       $v0, %hi(disable_x_update)
+/* 385678 E0082038 244221B8 */  addiu     $v0, $v0, %lo(disable_x_update)
+/* 38567C E008203C AFA2001C */  sw        $v0, 0x1c($sp)
+/* 385680 E0082040 3C02E008 */  lui       $v0, %hi(disable_x_render)
+/* 385684 E0082044 24422520 */  addiu     $v0, $v0, %lo(disable_x_render)
+/* 385688 E0082048 AFA20020 */  sw        $v0, 0x20($sp)
+/* 38568C E008204C 3C02E008 */  lui       $v0, %hi(func_E0082528)
+/* 385690 E0082050 24422528 */  addiu     $v0, $v0, %lo(func_E0082528)
+/* 385694 E0082054 AFA20024 */  sw        $v0, 0x24($sp)
+/* 385698 E0082058 24020041 */  addiu     $v0, $zero, 0x41
+/* 38569C E008205C AFBF0034 */  sw        $ra, 0x34($sp)
+/* 3856A0 E0082060 AFB20030 */  sw        $s2, 0x30($sp)
+/* 3856A4 E0082064 AFB1002C */  sw        $s1, 0x2c($sp)
+/* 3856A8 E0082068 AFA00010 */  sw        $zero, 0x10($sp)
+/* 3856AC E008206C 0C080124 */  jal       shim_create_effect_instance
+/* 3856B0 E0082070 AFA20014 */   sw       $v0, 0x14($sp)
+/* 3856B4 E0082074 24040090 */  addiu     $a0, $zero, 0x90
+/* 3856B8 E0082078 24120002 */  addiu     $s2, $zero, 2
+/* 3856BC E008207C 0040882D */  daddu     $s1, $v0, $zero
+/* 3856C0 E0082080 0C08012C */  jal       shim_general_heap_malloc
+/* 3856C4 E0082084 AE320008 */   sw       $s2, 8($s1)
+/* 3856C8 E0082088 0040182D */  daddu     $v1, $v0, $zero
+/* 3856CC E008208C 14600003 */  bnez      $v1, .LE008209C
+/* 3856D0 E0082090 AE23000C */   sw       $v1, 0xc($s1)
+.LE0082094:
+/* 3856D4 E0082094 08020825 */  j         .LE0082094
+/* 3856D8 E0082098 00000000 */   nop
+.LE008209C:
+/* 3856DC E008209C 3C013F80 */  lui       $at, 0x3f80
+/* 3856E0 E00820A0 44810000 */  mtc1      $at, $f0
+/* 3856E4 E00820A4 24020001 */  addiu     $v0, $zero, 1
+/* 3856E8 E00820A8 AC700000 */  sw        $s0, ($v1)
+/* 3856EC E00820AC 16020004 */  bne       $s0, $v0, .LE00820C0
+/* 3856F0 E00820B0 E4600034 */   swc1     $f0, 0x34($v1)
+/* 3856F4 E00820B4 AC700038 */  sw        $s0, 0x38($v1)
+/* 3856F8 E00820B8 08020834 */  j         .LE00820D0
+/* 3856FC E00820BC AC60003C */   sw       $zero, 0x3c($v1)
+.LE00820C0:
+/* 385700 E00820C0 AC600038 */  sw        $zero, 0x38($v1)
+/* 385704 E00820C4 8FA20060 */  lw        $v0, 0x60($sp)
+/* 385708 E00820C8 AC62003C */  sw        $v0, 0x3c($v1)
+/* 38570C E00820CC 24020001 */  addiu     $v0, $zero, 1
+.LE00820D0:
+/* 385710 E00820D0 E4740008 */  swc1      $f20, 8($v1)
+/* 385714 E00820D4 E476000C */  swc1      $f22, 0xc($v1)
+/* 385718 E00820D8 1202000E */  beq       $s0, $v0, .LE0082114
+/* 38571C E00820DC E4780010 */   swc1     $f24, 0x10($v1)
+/* 385720 E00820E0 2A020002 */  slti      $v0, $s0, 2
+/* 385724 E00820E4 10400005 */  beqz      $v0, .LE00820FC
+/* 385728 E00820E8 2402000A */   addiu    $v0, $zero, 0xa
+/* 38572C E00820EC 12000007 */  beqz      $s0, .LE008210C
+/* 385730 E00820F0 24020001 */   addiu    $v0, $zero, 1
+/* 385734 E00820F4 0802084B */  j         .LE008212C
+/* 385738 E00820F8 AC60002C */   sw       $zero, 0x2c($v1)
+.LE00820FC:
+/* 38573C E00820FC 12020007 */  beq       $s0, $v0, .LE008211C
+/* 385740 E0082100 24020001 */   addiu    $v0, $zero, 1
+/* 385744 E0082104 0802084B */  j         .LE008212C
+/* 385748 E0082108 AC60002C */   sw       $zero, 0x2c($v1)
+.LE008210C:
+/* 38574C E008210C 08020848 */  j         .LE0082120
+/* 385750 E0082110 24020064 */   addiu    $v0, $zero, 0x64
+.LE0082114:
+/* 385754 E0082114 08020848 */  j         .LE0082120
+/* 385758 E0082118 24020064 */   addiu    $v0, $zero, 0x64
+.LE008211C:
+/* 38575C E008211C 24020015 */  addiu     $v0, $zero, 0x15
+.LE0082120:
+/* 385760 E0082120 AC620028 */  sw        $v0, 0x28($v1)
+/* 385764 E0082124 24020001 */  addiu     $v0, $zero, 1
+/* 385768 E0082128 AC60002C */  sw        $zero, 0x2c($v1)
+.LE008212C:
+/* 38576C E008212C AC600044 */  sw        $zero, 0x44($v1)
+/* 385770 E0082130 AC620004 */  sw        $v0, 4($v1)
+/* 385774 E0082134 0040202D */  daddu     $a0, $v0, $zero
+/* 385778 E0082138 0092102A */  slt       $v0, $a0, $s2
+/* 38577C E008213C 10400012 */  beqz      $v0, .LE0082188
+/* 385780 E0082140 24630048 */   addiu    $v1, $v1, 0x48
+/* 385784 E0082144 44800000 */  mtc1      $zero, $f0
+/* 385788 E0082148 240500FF */  addiu     $a1, $zero, 0xff
+/* 38578C E008214C 24630024 */  addiu     $v1, $v1, 0x24
+.LE0082150:
+/* 385790 E0082150 24840001 */  addiu     $a0, $a0, 1
+/* 385794 E0082154 E460FFEC */  swc1      $f0, -0x14($v1)
+/* 385798 E0082158 E460FFE8 */  swc1      $f0, -0x18($v1)
+/* 38579C E008215C E460FFE4 */  swc1      $f0, -0x1c($v1)
+/* 3857A0 E0082160 E460FFFC */  swc1      $f0, -4($v1)
+/* 3857A4 E0082164 E460FFF8 */  swc1      $f0, -8($v1)
+/* 3857A8 E0082168 E460FFF4 */  swc1      $f0, -0xc($v1)
+/* 3857AC E008216C E460FFF0 */  swc1      $f0, -0x10($v1)
+/* 3857B0 E0082170 E460001C */  swc1      $f0, 0x1c($v1)
+/* 3857B4 E0082174 AC600004 */  sw        $zero, 4($v1)
+/* 3857B8 E0082178 AC650000 */  sw        $a1, ($v1)
+/* 3857BC E008217C 0092102A */  slt       $v0, $a0, $s2
+/* 3857C0 E0082180 1440FFF3 */  bnez      $v0, .LE0082150
+/* 3857C4 E0082184 24630048 */   addiu    $v1, $v1, 0x48
+.LE0082188:
+/* 3857C8 E0082188 0220102D */  daddu     $v0, $s1, $zero
+/* 3857CC E008218C 8FBF0034 */  lw        $ra, 0x34($sp)
+/* 3857D0 E0082190 8FB20030 */  lw        $s2, 0x30($sp)
+/* 3857D4 E0082194 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 3857D8 E0082198 8FB00028 */  lw        $s0, 0x28($sp)
+/* 3857DC E008219C D7B80048 */  ldc1      $f24, 0x48($sp)
+/* 3857E0 E00821A0 D7B60040 */  ldc1      $f22, 0x40($sp)
+/* 3857E4 E00821A4 D7B40038 */  ldc1      $f20, 0x38($sp)
+/* 3857E8 E00821A8 03E00008 */  jr        $ra
+/* 3857EC E00821AC 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/effects/disable_x/disable_x_update.s b/ver/us/asm/nonmatchings/effects/disable_x/disable_x_update.s
new file mode 100644
index 0000000000..f921b05e91
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/disable_x/disable_x_update.s
@@ -0,0 +1,240 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel disable_x_update
+/* 3857F8 E00821B8 27BDFFB0 */  addiu     $sp, $sp, -0x50
+/* 3857FC E00821BC AFB40028 */  sw        $s4, 0x28($sp)
+/* 385800 E00821C0 0080A02D */  daddu     $s4, $a0, $zero
+/* 385804 E00821C4 AFBF0038 */  sw        $ra, 0x38($sp)
+/* 385808 E00821C8 AFB70034 */  sw        $s7, 0x34($sp)
+/* 38580C E00821CC AFB60030 */  sw        $s6, 0x30($sp)
+/* 385810 E00821D0 AFB5002C */  sw        $s5, 0x2c($sp)
+/* 385814 E00821D4 AFB30024 */  sw        $s3, 0x24($sp)
+/* 385818 E00821D8 AFB20020 */  sw        $s2, 0x20($sp)
+/* 38581C E00821DC AFB1001C */  sw        $s1, 0x1c($sp)
+/* 385820 E00821E0 AFB00018 */  sw        $s0, 0x18($sp)
+/* 385824 E00821E4 F7B60048 */  sdc1      $f22, 0x48($sp)
+/* 385828 E00821E8 F7B40040 */  sdc1      $f20, 0x40($sp)
+/* 38582C E00821EC 8E830000 */  lw        $v1, ($s4)
+/* 385830 E00821F0 8E90000C */  lw        $s0, 0xc($s4)
+/* 385834 E00821F4 30620010 */  andi      $v0, $v1, 0x10
+/* 385838 E00821F8 10400005 */  beqz      $v0, .LE0082210
+/* 38583C E00821FC 2402FFEF */   addiu    $v0, $zero, -0x11
+/* 385840 E0082200 00621024 */  and       $v0, $v1, $v0
+/* 385844 E0082204 AE820000 */  sw        $v0, ($s4)
+/* 385848 E0082208 24020015 */  addiu     $v0, $zero, 0x15
+/* 38584C E008220C AE020028 */  sw        $v0, 0x28($s0)
+.LE0082210:
+/* 385850 E0082210 8E030028 */  lw        $v1, 0x28($s0)
+/* 385854 E0082214 28620064 */  slti      $v0, $v1, 0x64
+/* 385858 E0082218 10400002 */  beqz      $v0, .LE0082224
+/* 38585C E008221C 2462FFFF */   addiu    $v0, $v1, -1
+/* 385860 E0082220 AE020028 */  sw        $v0, 0x28($s0)
+.LE0082224:
+/* 385864 E0082224 8E020028 */  lw        $v0, 0x28($s0)
+/* 385868 E0082228 04410005 */  bgez      $v0, .LE0082240
+/* 38586C E008222C 3C030004 */   lui      $v1, 4
+/* 385870 E0082230 0C080128 */  jal       shim_remove_effect
+/* 385874 E0082234 0280202D */   daddu    $a0, $s4, $zero
+/* 385878 E0082238 0802093B */  j         .LE00824EC
+/* 38587C E008223C 00000000 */   nop
+.LE0082240:
+/* 385880 E0082240 8E02002C */  lw        $v0, 0x2c($s0)
+/* 385884 E0082244 3463F1A0 */  ori       $v1, $v1, 0xf1a0
+/* 385888 E0082248 24420001 */  addiu     $v0, $v0, 1
+/* 38588C E008224C 0062182A */  slt       $v1, $v1, $v0
+/* 385890 E0082250 10600003 */  beqz      $v1, .LE0082260
+/* 385894 E0082254 AE02002C */   sw       $v0, 0x2c($s0)
+/* 385898 E0082258 24020100 */  addiu     $v0, $zero, 0x100
+/* 38589C E008225C AE02002C */  sw        $v0, 0x2c($s0)
+.LE0082260:
+/* 3858A0 E0082260 8E03003C */  lw        $v1, 0x3c($s0)
+/* 3858A4 E0082264 8E130000 */  lw        $s3, ($s0)
+/* 3858A8 E0082268 8E120028 */  lw        $s2, 0x28($s0)
+/* 3858AC E008226C 8E15002C */  lw        $s5, 0x2c($s0)
+/* 3858B0 E0082270 8E040038 */  lw        $a0, 0x38($s0)
+/* 3858B4 E0082274 16600034 */  bnez      $s3, .LE0082348
+/* 3858B8 E0082278 C6160034 */   lwc1     $f22, 0x34($s0)
+/* 3858BC E008227C 8E020044 */  lw        $v0, 0x44($s0)
+/* 3858C0 E0082280 1C400030 */  bgtz      $v0, .LE0082344
+/* 3858C4 E0082284 2442FFFF */   addiu    $v0, $v0, -1
+/* 3858C8 E0082288 1064002F */  beq       $v1, $a0, .LE0082348
+/* 3858CC E008228C 00000000 */   nop
+/* 3858D0 E0082290 04620001 */  bltzl     $v1, .LE0082298
+/* 3858D4 E0082294 0000182D */   daddu    $v1, $zero, $zero
+.LE0082298:
+/* 3858D8 E0082298 0083102A */  slt       $v0, $a0, $v1
+/* 3858DC E008229C 10400017 */  beqz      $v0, .LE00822FC
+/* 3858E0 E00822A0 24020064 */   addiu    $v0, $zero, 0x64
+/* 3858E4 E00822A4 AE020028 */  sw        $v0, 0x28($s0)
+/* 3858E8 E00822A8 24020001 */  addiu     $v0, $zero, 1
+/* 3858EC E00822AC AE02002C */  sw        $v0, 0x2c($s0)
+/* 3858F0 E00822B0 8E020038 */  lw        $v0, 0x38($s0)
+/* 3858F4 E00822B4 C602000C */  lwc1      $f2, 0xc($s0)
+/* 3858F8 E00822B8 3C01C3FA */  lui       $at, 0xc3fa
+/* 3858FC E00822BC 44810000 */  mtc1      $at, $f0
+/* 385900 E00822C0 AE000070 */  sw        $zero, 0x70($s0)
+/* 385904 E00822C4 24420001 */  addiu     $v0, $v0, 1
+/* 385908 E00822C8 4602003C */  c.lt.s    $f0, $f2
+/* 38590C E00822CC 00000000 */  nop
+/* 385910 E00822D0 4500001B */  bc1f      .LE0082340
+/* 385914 E00822D4 AE020038 */   sw       $v0, 0x38($s0)
+/* 385918 E00822D8 C6000010 */  lwc1      $f0, 0x10($s0)
+/* 38591C E00822DC 24042107 */  addiu     $a0, $zero, 0x2107
+/* 385920 E00822E0 E7A00010 */  swc1      $f0, 0x10($sp)
+/* 385924 E00822E4 8E060008 */  lw        $a2, 8($s0)
+/* 385928 E00822E8 8E07000C */  lw        $a3, 0xc($s0)
+/* 38592C E00822EC 0C0801A0 */  jal       shim_sfx_play_sound_at_position
+/* 385930 E00822F0 0000282D */   daddu    $a1, $zero, $zero
+/* 385934 E00822F4 080208D1 */  j         .LE0082344
+/* 385938 E00822F8 24020008 */   addiu    $v0, $zero, 8
+.LE00822FC:
+/* 38593C E00822FC 0064102A */  slt       $v0, $v1, $a0
+/* 385940 E0082300 10400010 */  beqz      $v0, .LE0082344
+/* 385944 E0082304 24020008 */   addiu    $v0, $zero, 8
+/* 385948 E0082308 0C080150 */  jal       shim_load_effect
+/* 38594C E008230C 24040041 */   addiu    $a0, $zero, 0x41
+/* 385950 E0082310 C602000C */  lwc1      $f2, 0xc($s0)
+/* 385954 E0082314 C6000068 */  lwc1      $f0, 0x68($s0)
+/* 385958 E0082318 AFA00010 */  sw        $zero, 0x10($sp)
+/* 38595C E008231C 46001080 */  add.s     $f2, $f2, $f0
+/* 385960 E0082320 8E050008 */  lw        $a1, 8($s0)
+/* 385964 E0082324 8E070010 */  lw        $a3, 0x10($s0)
+/* 385968 E0082328 44061000 */  mfc1      $a2, $f2
+/* 38596C E008232C 0C020800 */  jal       disable_x_main
+/* 385970 E0082330 2404000A */   addiu    $a0, $zero, 0xa
+/* 385974 E0082334 8E020038 */  lw        $v0, 0x38($s0)
+/* 385978 E0082338 2442FFFF */  addiu     $v0, $v0, -1
+/* 38597C E008233C AE020038 */  sw        $v0, 0x38($s0)
+.LE0082340:
+/* 385980 E0082340 24020008 */  addiu     $v0, $zero, 8
+.LE0082344:
+/* 385984 E0082344 AE020044 */  sw        $v0, 0x44($s0)
+.LE0082348:
+/* 385988 E0082348 8E820008 */  lw        $v0, 8($s4)
+/* 38598C E008234C 24110001 */  addiu     $s1, $zero, 1
+/* 385990 E0082350 0222102A */  slt       $v0, $s1, $v0
+/* 385994 E0082354 10400065 */  beqz      $v0, .LE00824EC
+/* 385998 E0082358 26100048 */   addiu    $s0, $s0, 0x48
+/* 38599C E008235C 3C17E008 */  lui       $s7, %hi(D_E0082D30)
+/* 3859A0 E0082360 26F72D30 */  addiu     $s7, $s7, %lo(D_E0082D30)
+/* 3859A4 E0082364 02351004 */  sllv      $v0, $s5, $s1
+/* 3859A8 E0082368 00551021 */  addu      $v0, $v0, $s5
+/* 3859AC E008236C 0002B080 */  sll       $s6, $v0, 2
+/* 3859B0 E0082370 3C014080 */  lui       $at, 0x4080
+/* 3859B4 E0082374 4481A000 */  mtc1      $at, $f20
+/* 3859B8 E0082378 02321004 */  sllv      $v0, $s2, $s1
+/* 3859BC E008237C 00521021 */  addu      $v0, $v0, $s2
+/* 3859C0 E0082380 000210C0 */  sll       $v0, $v0, 3
+/* 3859C4 E0082384 0052A821 */  addu      $s5, $v0, $s2
+/* 3859C8 E0082388 26100028 */  addiu     $s0, $s0, 0x28
+.LE008238C:
+/* 3859CC E008238C 8E030000 */  lw        $v1, ($s0)
+/* 3859D0 E0082390 28620009 */  slti      $v0, $v1, 9
+/* 3859D4 E0082394 10400007 */  beqz      $v0, .LE00823B4
+/* 3859D8 E0082398 2402000A */   addiu    $v0, $zero, 0xa
+/* 3859DC E008239C 12620005 */  beq       $s3, $v0, .LE00823B4
+/* 3859E0 E00823A0 00031080 */   sll      $v0, $v1, 2
+/* 3859E4 E00823A4 00571021 */  addu      $v0, $v0, $s7
+/* 3859E8 E00823A8 C4400000 */  lwc1      $f0, ($v0)
+/* 3859EC E00823AC 080208F1 */  j         .LE00823C4
+/* 3859F0 E00823B0 E6000008 */   swc1     $f0, 8($s0)
+.LE00823B4:
+/* 3859F4 E00823B4 3C013F80 */  lui       $at, 0x3f80
+/* 3859F8 E00823B8 44810000 */  mtc1      $at, $f0
+/* 3859FC E00823BC 00000000 */  nop
+/* 385A00 E00823C0 E6000008 */  swc1      $f0, 8($s0)
+.LE00823C4:
+/* 385A04 E00823C4 C6000008 */  lwc1      $f0, 8($s0)
+/* 385A08 E00823C8 46160002 */  mul.s     $f0, $f0, $f22
+/* 385A0C E00823CC 00000000 */  nop
+/* 385A10 E00823D0 2E620002 */  sltiu     $v0, $s3, 2
+/* 385A14 E00823D4 10400009 */  beqz      $v0, .LE00823FC
+/* 385A18 E00823D8 E6000008 */   swc1     $f0, 8($s0)
+/* 385A1C E00823DC 44966000 */  mtc1      $s6, $f12
+/* 385A20 E00823E0 00000000 */  nop
+/* 385A24 E00823E4 0C080144 */  jal       shim_cos_deg
+/* 385A28 E00823E8 46806320 */   cvt.s.w  $f12, $f12
+/* 385A2C E00823EC 46140002 */  mul.s     $f0, $f0, $f20
+/* 385A30 E00823F0 00000000 */  nop
+/* 385A34 E00823F4 08020900 */  j         .LE0082400
+/* 385A38 E00823F8 E600FFF8 */   swc1     $f0, -8($s0)
+.LE00823FC:
+/* 385A3C E00823FC AE00FFF8 */  sw        $zero, -8($s0)
+.LE0082400:
+/* 385A40 E0082400 C606FFE0 */  lwc1      $f6, -0x20($s0)
+/* 385A44 E0082404 C600FFEC */  lwc1      $f0, -0x14($s0)
+/* 385A48 E0082408 C604FFE4 */  lwc1      $f4, -0x1c($s0)
+/* 385A4C E008240C 46003180 */  add.s     $f6, $f6, $f0
+/* 385A50 E0082410 C600FFF0 */  lwc1      $f0, -0x10($s0)
+/* 385A54 E0082414 C602FFE8 */  lwc1      $f2, -0x18($s0)
+/* 385A58 E0082418 46002100 */  add.s     $f4, $f4, $f0
+/* 385A5C E008241C C600FFF4 */  lwc1      $f0, -0xc($s0)
+/* 385A60 E0082420 24020014 */  addiu     $v0, $zero, 0x14
+/* 385A64 E0082424 46001080 */  add.s     $f2, $f2, $f0
+/* 385A68 E0082428 E606FFE0 */  swc1      $f6, -0x20($s0)
+/* 385A6C E008242C E604FFE4 */  swc1      $f4, -0x1c($s0)
+/* 385A70 E0082430 16420005 */  bne       $s2, $v0, .LE0082448
+/* 385A74 E0082434 E602FFE8 */   swc1     $f2, -0x18($s0)
+/* 385A78 E0082438 3C01C000 */  lui       $at, 0xc000
+/* 385A7C E008243C 44810000 */  mtc1      $at, $f0
+/* 385A80 E0082440 E614FFF0 */  swc1      $f20, -0x10($s0)
+/* 385A84 E0082444 E600FFEC */  swc1      $f0, -0x14($s0)
+.LE0082448:
+/* 385A88 E0082448 2A420014 */  slti      $v0, $s2, 0x14
+/* 385A8C E008244C 1040001D */  beqz      $v0, .LE00824C4
+/* 385A90 E0082450 2A42000A */   slti     $v0, $s2, 0xa
+/* 385A94 E0082454 44920000 */  mtc1      $s2, $f0
+/* 385A98 E0082458 00000000 */  nop
+/* 385A9C E008245C 46800020 */  cvt.s.w   $f0, $f0
+/* 385AA0 E0082460 3C01E008 */  lui       $at, %hi(D_E0082D60)
+/* 385AA4 E0082464 D4222D60 */  ldc1      $f2, %lo(D_E0082D60)($at)
+/* 385AA8 E0082468 46000021 */  cvt.d.s   $f0, $f0
+/* 385AAC E008246C 46220002 */  mul.d     $f0, $f0, $f2
+/* 385AB0 E0082470 00000000 */  nop
+/* 385AB4 E0082474 C602FFF8 */  lwc1      $f2, -8($s0)
+/* 385AB8 E0082478 460010A1 */  cvt.d.s   $f2, $f2
+/* 385ABC E008247C 46201082 */  mul.d     $f2, $f2, $f0
+/* 385AC0 E0082480 00000000 */  nop
+/* 385AC4 E0082484 3C01BFE0 */  lui       $at, 0xbfe0
+/* 385AC8 E0082488 44812800 */  mtc1      $at, $f5
+/* 385ACC E008248C 44802000 */  mtc1      $zero, $f4
+/* 385AD0 E0082490 C600FFF0 */  lwc1      $f0, -0x10($s0)
+/* 385AD4 E0082494 C6060018 */  lwc1      $f6, 0x18($s0)
+/* 385AD8 E0082498 46000021 */  cvt.d.s   $f0, $f0
+/* 385ADC E008249C 46240000 */  add.d     $f0, $f0, $f4
+/* 385AE0 E00824A0 3C014120 */  lui       $at, 0x4120
+/* 385AE4 E00824A4 44812000 */  mtc1      $at, $f4
+/* 385AE8 E00824A8 00000000 */  nop
+/* 385AEC E00824AC 46043180 */  add.s     $f6, $f6, $f4
+/* 385AF0 E00824B0 46200020 */  cvt.s.d   $f0, $f0
+/* 385AF4 E00824B4 E600FFF0 */  swc1      $f0, -0x10($s0)
+/* 385AF8 E00824B8 E6060018 */  swc1      $f6, 0x18($s0)
+/* 385AFC E00824BC 462010A0 */  cvt.s.d   $f2, $f2
+/* 385B00 E00824C0 E602FFF8 */  swc1      $f2, -8($s0)
+.LE00824C4:
+/* 385B04 E00824C4 54400001 */  bnel      $v0, $zero, .LE00824CC
+/* 385B08 E00824C8 AE15FFFC */   sw       $s5, -4($s0)
+.LE00824CC:
+/* 385B0C E00824CC 8E020000 */  lw        $v0, ($s0)
+/* 385B10 E00824D0 26310001 */  addiu     $s1, $s1, 1
+/* 385B14 E00824D4 24420001 */  addiu     $v0, $v0, 1
+/* 385B18 E00824D8 AE020000 */  sw        $v0, ($s0)
+/* 385B1C E00824DC 8E820008 */  lw        $v0, 8($s4)
+/* 385B20 E00824E0 0222102A */  slt       $v0, $s1, $v0
+/* 385B24 E00824E4 1440FFA9 */  bnez      $v0, .LE008238C
+/* 385B28 E00824E8 26100048 */   addiu    $s0, $s0, 0x48
+.LE00824EC:
+/* 385B2C E00824EC 8FBF0038 */  lw        $ra, 0x38($sp)
+/* 385B30 E00824F0 8FB70034 */  lw        $s7, 0x34($sp)
+/* 385B34 E00824F4 8FB60030 */  lw        $s6, 0x30($sp)
+/* 385B38 E00824F8 8FB5002C */  lw        $s5, 0x2c($sp)
+/* 385B3C E00824FC 8FB40028 */  lw        $s4, 0x28($sp)
+/* 385B40 E0082500 8FB30024 */  lw        $s3, 0x24($sp)
+/* 385B44 E0082504 8FB20020 */  lw        $s2, 0x20($sp)
+/* 385B48 E0082508 8FB1001C */  lw        $s1, 0x1c($sp)
+/* 385B4C E008250C 8FB00018 */  lw        $s0, 0x18($sp)
+/* 385B50 E0082510 D7B60048 */  ldc1      $f22, 0x48($sp)
+/* 385B54 E0082514 D7B40040 */  ldc1      $f20, 0x40($sp)
+/* 385B58 E0082518 03E00008 */  jr        $ra
+/* 385B5C E008251C 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E0082528.s b/ver/us/asm/nonmatchings/effects/disable_x/func_E0082528.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_65/func_E0082528.s
rename to ver/us/asm/nonmatchings/effects/disable_x/func_E0082528.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E0082580.s b/ver/us/asm/nonmatchings/effects/disable_x/func_E0082580.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_65/func_E0082580.s
rename to ver/us/asm/nonmatchings/effects/disable_x/func_E0082580.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E00826C4.s b/ver/us/asm/nonmatchings/effects/disable_x/func_E00826C4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_65/func_E00826C4.s
rename to ver/us/asm/nonmatchings/effects/disable_x/func_E00826C4.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E00828B4.s b/ver/us/asm/nonmatchings/effects/disable_x/func_E00828B4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_65/func_E00828B4.s
rename to ver/us/asm/nonmatchings/effects/disable_x/func_E00828B4.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/func_E0082A84.s b/ver/us/asm/nonmatchings/effects/disable_x/func_E0082A84.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_65/func_E0082A84.s
rename to ver/us/asm/nonmatchings/effects/disable_x/func_E0082A84.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_appendGfx.s b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_20/fx_20_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_appendGfx.s
index eb21dc7bc3..4fec2b84ba 100644
--- a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_20_appendGfx
+glabel drop_leaves_appendGfx
 /* 33D31C E002852C 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 33D320 E0028530 AFB700F4 */  sw        $s7, 0xf4($sp)
 /* 33D324 E0028534 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s
rename to ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_main.s
index 970ee28fb5..3cc4827e90 100644
--- a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_main.s
+++ b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_20_main
+glabel drop_leaves_main
 /* 33CDF0 E0028000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 33CDF4 E0028004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 33CDF8 E0028008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_20_main
 /* 33CE0C E002801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33CE10 E0028020 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 33CE14 E0028024 4487C000 */  mtc1      $a3, $f24
-/* 33CE18 E0028028 3C02E003 */  lui       $v0, %hi(fx_20_init)
-/* 33CE1C E002802C 24428240 */  addiu     $v0, $v0, %lo(fx_20_init)
+/* 33CE18 E0028028 3C02E003 */  lui       $v0, %hi(drop_leaves_init)
+/* 33CE1C E002802C 24428240 */  addiu     $v0, $v0, %lo(drop_leaves_init)
 /* 33CE20 E0028030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33CE24 E0028034 3C02E003 */  lui       $v0, %hi(fx_20_update)
-/* 33CE28 E0028038 24428248 */  addiu     $v0, $v0, %lo(fx_20_update)
+/* 33CE24 E0028034 3C02E003 */  lui       $v0, %hi(drop_leaves_update)
+/* 33CE28 E0028038 24428248 */  addiu     $v0, $v0, %lo(drop_leaves_update)
 /* 33CE2C E002803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33CE30 E0028040 3C02E003 */  lui       $v0, %hi(fx_20_render)
-/* 33CE34 E0028044 244284E8 */  addiu     $v0, $v0, %lo(fx_20_render)
+/* 33CE30 E0028040 3C02E003 */  lui       $v0, %hi(drop_leaves_render)
+/* 33CE34 E0028044 244284E8 */  addiu     $v0, $v0, %lo(drop_leaves_render)
 /* 33CE38 E0028048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33CE3C E002804C 24020014 */  addiu     $v0, $zero, 0x14
 /* 33CE40 E0028050 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_update.s b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_20/fx_20_update.s
rename to ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_update.s
index 193559afee..9f822aada1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_20/fx_20_update.s
+++ b/ver/us/asm/nonmatchings/effects/drop_leaves/drop_leaves_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_20_update
+glabel drop_leaves_update
 /* 33D038 E0028248 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 33D03C E002824C AFB3001C */  sw        $s3, 0x1c($sp)
 /* 33D040 E0028250 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_appendGfx.s b/ver/us/asm/nonmatchings/effects/dust/dust_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_21/fx_21_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/dust/dust_appendGfx.s
index f2a5d0a9a3..7ef5477187 100644
--- a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/dust/dust_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_21_appendGfx
+glabel dust_appendGfx
 /* 33EC84 E002A3C4 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 33EC88 E002A3C8 3C02DB06 */  lui       $v0, 0xdb06
 /* 33EC8C E002A3CC 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s b/ver/us/asm/nonmatchings/effects/dust/dust_main.s
similarity index 95%
rename from ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s
rename to ver/us/asm/nonmatchings/effects/dust/dust_main.s
index fc67cbb1ef..05cfcfd292 100644
--- a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_main.s
+++ b/ver/us/asm/nonmatchings/effects/dust/dust_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_21_main
+glabel dust_main
 /* 33E8C0 E002A000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 33E8C4 E002A004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 33E8C8 E002A008 4485A000 */  mtc1      $a1, $f20
@@ -22,14 +22,14 @@ glabel fx_21_main
 /* 33E904 E002A044 AFB00028 */   sw       $s0, 0x28($sp)
 /* 33E908 E002A048 24120005 */  addiu     $s2, $zero, 5
 .LE002A04C:
-/* 33E90C E002A04C 3C02E003 */  lui       $v0, %hi(fx_21_init)
-/* 33E910 E002A050 2442A284 */  addiu     $v0, $v0, %lo(fx_21_init)
+/* 33E90C E002A04C 3C02E003 */  lui       $v0, %hi(dust_init)
+/* 33E910 E002A050 2442A284 */  addiu     $v0, $v0, %lo(dust_init)
 /* 33E914 E002A054 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33E918 E002A058 3C02E003 */  lui       $v0, %hi(fx_21_update)
-/* 33E91C E002A05C 2442A28C */  addiu     $v0, $v0, %lo(fx_21_update)
+/* 33E918 E002A058 3C02E003 */  lui       $v0, %hi(dust_update)
+/* 33E91C E002A05C 2442A28C */  addiu     $v0, $v0, %lo(dust_update)
 /* 33E920 E002A060 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33E924 E002A064 3C02E003 */  lui       $v0, %hi(fx_21_render)
-/* 33E928 E002A068 2442A380 */  addiu     $v0, $v0, %lo(fx_21_render)
+/* 33E924 E002A064 3C02E003 */  lui       $v0, %hi(dust_render)
+/* 33E928 E002A068 2442A380 */  addiu     $v0, $v0, %lo(dust_render)
 /* 33E92C E002A06C AFA20020 */  sw        $v0, 0x20($sp)
 /* 33E930 E002A070 24020015 */  addiu     $v0, $zero, 0x15
 /* 33E934 E002A074 AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_update.s b/ver/us/asm/nonmatchings/effects/dust/dust_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_21/fx_21_update.s
rename to ver/us/asm/nonmatchings/effects/dust/dust_update.s
index c8f062aa66..9c2e7881dc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_21/fx_21_update.s
+++ b/ver/us/asm/nonmatchings/effects/dust/dust_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_21_update
+glabel dust_update
 /* 33EB4C E002A28C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 33EB50 E002A290 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 33EB54 E002A294 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s
deleted file mode 100644
index e8c97c7dea..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_main.s
+++ /dev/null
@@ -1,162 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_101_main
-/* 3D0500 E00CA000 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* 3D0504 E00CA004 F7B40040 */  sdc1      $f20, 0x40($sp)
-/* 3D0508 E00CA008 4485A000 */  mtc1      $a1, $f20
-/* 3D050C E00CA00C F7B60048 */  sdc1      $f22, 0x48($sp)
-/* 3D0510 E00CA010 4486B000 */  mtc1      $a2, $f22
-/* 3D0514 E00CA014 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 3D0518 E00CA018 0080882D */  daddu     $s1, $a0, $zero
-/* 3D051C E00CA01C F7B80050 */  sdc1      $f24, 0x50($sp)
-/* 3D0520 E00CA020 4487C000 */  mtc1      $a3, $f24
-/* 3D0524 E00CA024 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3D0528 E00CA028 AFB30034 */  sw        $s3, 0x34($sp)
-/* 3D052C E00CA02C 8FB3006C */  lw        $s3, 0x6c($sp)
-/* 3D0530 E00CA030 3C02E00D */  lui       $v0, %hi(fx_101_init)
-/* 3D0534 E00CA034 2442A240 */  addiu     $v0, $v0, %lo(fx_101_init)
-/* 3D0538 E00CA038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D053C E00CA03C 3C02E00D */  lui       $v0, %hi(fx_101_update)
-/* 3D0540 E00CA040 2442A248 */  addiu     $v0, $v0, %lo(fx_101_update)
-/* 3D0544 E00CA044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D0548 E00CA048 3C02E00D */  lui       $v0, %hi(fx_101_render)
-/* 3D054C E00CA04C 2442A484 */  addiu     $v0, $v0, %lo(fx_101_render)
-/* 3D0550 E00CA050 AFA20020 */  sw        $v0, 0x20($sp)
-/* 3D0554 E00CA054 24020065 */  addiu     $v0, $zero, 0x65
-/* 3D0558 E00CA058 AFBF0038 */  sw        $ra, 0x38($sp)
-/* 3D055C E00CA05C AFB20030 */  sw        $s2, 0x30($sp)
-/* 3D0560 E00CA060 AFB00028 */  sw        $s0, 0x28($sp)
-/* 3D0564 E00CA064 AFA00010 */  sw        $zero, 0x10($sp)
-/* 3D0568 E00CA068 AFA00024 */  sw        $zero, 0x24($sp)
-/* 3D056C E00CA06C 0C080124 */  jal       shim_create_effect_instance
-/* 3D0570 E00CA070 AFA20014 */   sw       $v0, 0x14($sp)
-/* 3D0574 E00CA074 24040324 */  addiu     $a0, $zero, 0x324
-/* 3D0578 E00CA078 24030001 */  addiu     $v1, $zero, 1
-/* 3D057C E00CA07C 0040902D */  daddu     $s2, $v0, $zero
-/* 3D0580 E00CA080 0C08012C */  jal       shim_general_heap_malloc
-/* 3D0584 E00CA084 AE430008 */   sw       $v1, 8($s2)
-/* 3D0588 E00CA088 0040802D */  daddu     $s0, $v0, $zero
-/* 3D058C E00CA08C 16000003 */  bnez      $s0, .LE00CA09C
-/* 3D0590 E00CA090 AE42000C */   sw       $v0, 0xc($s2)
-.LE00CA094:
-/* 3D0594 E00CA094 08032825 */  j         .LE00CA094
-/* 3D0598 E00CA098 00000000 */   nop
-.LE00CA09C:
-/* 3D059C E00CA09C AE110000 */  sw        $s1, ($s0)
-/* 3D05A0 E00CA0A0 1E600004 */  bgtz      $s3, .LE00CA0B4
-/* 3D05A4 E00CA0A4 AE000014 */   sw       $zero, 0x14($s0)
-/* 3D05A8 E00CA0A8 240203E8 */  addiu     $v0, $zero, 0x3e8
-/* 3D05AC E00CA0AC 0803282E */  j         .LE00CA0B8
-/* 3D05B0 E00CA0B0 AE020010 */   sw       $v0, 0x10($s0)
-.LE00CA0B4:
-/* 3D05B4 E00CA0B4 AE130010 */  sw        $s3, 0x10($s0)
-.LE00CA0B8:
-/* 3D05B8 E00CA0B8 E6140004 */  swc1      $f20, 4($s0)
-/* 3D05BC E00CA0BC E6160008 */  swc1      $f22, 8($s0)
-/* 3D05C0 E00CA0C0 E618000C */  swc1      $f24, 0xc($s0)
-/* 3D05C4 E00CA0C4 C7A00068 */  lwc1      $f0, 0x68($sp)
-/* 3D05C8 E00CA0C8 24020001 */  addiu     $v0, $zero, 1
-/* 3D05CC E00CA0CC 12220017 */  beq       $s1, $v0, .LE00CA12C
-/* 3D05D0 E00CA0D0 E6000034 */   swc1     $f0, 0x34($s0)
-/* 3D05D4 E00CA0D4 2A220002 */  slti      $v0, $s1, 2
-/* 3D05D8 E00CA0D8 50400005 */  beql      $v0, $zero, .LE00CA0F0
-/* 3D05DC E00CA0DC 24020002 */   addiu    $v0, $zero, 2
-/* 3D05E0 E00CA0E0 1220000A */  beqz      $s1, .LE00CA10C
-/* 3D05E4 E00CA0E4 2403001D */   addiu    $v1, $zero, 0x1d
-/* 3D05E8 E00CA0E8 0803286D */  j         .LE00CA1B4
-/* 3D05EC E00CA0EC 26020074 */   addiu    $v0, $s0, 0x74
-.LE00CA0F0:
-/* 3D05F0 E00CA0F0 1222001C */  beq       $s1, $v0, .LE00CA164
-/* 3D05F4 E00CA0F4 240200FF */   addiu    $v0, $zero, 0xff
-/* 3D05F8 E00CA0F8 24020003 */  addiu     $v0, $zero, 3
-/* 3D05FC E00CA0FC 12220021 */  beq       $s1, $v0, .LE00CA184
-/* 3D0600 E00CA100 2403001D */   addiu    $v1, $zero, 0x1d
-/* 3D0604 E00CA104 0803286D */  j         .LE00CA1B4
-/* 3D0608 E00CA108 26020074 */   addiu    $v0, $s0, 0x74
-.LE00CA10C:
-/* 3D060C E00CA10C 240300FF */  addiu     $v1, $zero, 0xff
-/* 3D0610 E00CA110 240200E1 */  addiu     $v0, $zero, 0xe1
-/* 3D0614 E00CA114 AE030018 */  sw        $v1, 0x18($s0)
-/* 3D0618 E00CA118 AE03001C */  sw        $v1, 0x1c($s0)
-/* 3D061C E00CA11C AE030020 */  sw        $v1, 0x20($s0)
-/* 3D0620 E00CA120 AE020028 */  sw        $v0, 0x28($s0)
-/* 3D0624 E00CA124 08032856 */  j         .LE00CA158
-/* 3D0628 E00CA128 AE02002C */   sw       $v0, 0x2c($s0)
-.LE00CA12C:
-/* 3D062C E00CA12C 240300FF */  addiu     $v1, $zero, 0xff
-/* 3D0630 E00CA130 240200F5 */  addiu     $v0, $zero, 0xf5
-/* 3D0634 E00CA134 AE02001C */  sw        $v0, 0x1c($s0)
-/* 3D0638 E00CA138 240200E6 */  addiu     $v0, $zero, 0xe6
-/* 3D063C E00CA13C AE020020 */  sw        $v0, 0x20($s0)
-/* 3D0640 E00CA140 2402002D */  addiu     $v0, $zero, 0x2d
-/* 3D0644 E00CA144 AE020028 */  sw        $v0, 0x28($s0)
-/* 3D0648 E00CA148 24020023 */  addiu     $v0, $zero, 0x23
-/* 3D064C E00CA14C AE02002C */  sw        $v0, 0x2c($s0)
-/* 3D0650 E00CA150 2402000F */  addiu     $v0, $zero, 0xf
-/* 3D0654 E00CA154 AE030018 */  sw        $v1, 0x18($s0)
-.LE00CA158:
-/* 3D0658 E00CA158 AE020030 */  sw        $v0, 0x30($s0)
-/* 3D065C E00CA15C 0803286B */  j         .LE00CA1AC
-/* 3D0660 E00CA160 AE030024 */   sw       $v1, 0x24($s0)
-.LE00CA164:
-/* 3D0664 E00CA164 2403009B */  addiu     $v1, $zero, 0x9b
-/* 3D0668 E00CA168 AE030028 */  sw        $v1, 0x28($s0)
-/* 3D066C E00CA16C 2403007D */  addiu     $v1, $zero, 0x7d
-/* 3D0670 E00CA170 AE020018 */  sw        $v0, 0x18($s0)
-/* 3D0674 E00CA174 AE00001C */  sw        $zero, 0x1c($s0)
-/* 3D0678 E00CA178 AE000020 */  sw        $zero, 0x20($s0)
-/* 3D067C E00CA17C 08032869 */  j         .LE00CA1A4
-/* 3D0680 E00CA180 AE03002C */   sw       $v1, 0x2c($s0)
-.LE00CA184:
-/* 3D0684 E00CA184 240200FF */  addiu     $v0, $zero, 0xff
-/* 3D0688 E00CA188 24030041 */  addiu     $v1, $zero, 0x41
-/* 3D068C E00CA18C AE03002C */  sw        $v1, 0x2c($s0)
-/* 3D0690 E00CA190 24030014 */  addiu     $v1, $zero, 0x14
-/* 3D0694 E00CA194 AE020018 */  sw        $v0, 0x18($s0)
-/* 3D0698 E00CA198 AE02001C */  sw        $v0, 0x1c($s0)
-/* 3D069C E00CA19C AE020020 */  sw        $v0, 0x20($s0)
-/* 3D06A0 E00CA1A0 AE020028 */  sw        $v0, 0x28($s0)
-.LE00CA1A4:
-/* 3D06A4 E00CA1A4 AE030030 */  sw        $v1, 0x30($s0)
-/* 3D06A8 E00CA1A8 AE020024 */  sw        $v0, 0x24($s0)
-.LE00CA1AC:
-/* 3D06AC E00CA1AC 2403001D */  addiu     $v1, $zero, 0x1d
-/* 3D06B0 E00CA1B0 26020074 */  addiu     $v0, $s0, 0x74
-.LE00CA1B4:
-/* 3D06B4 E00CA1B4 E6140038 */  swc1      $f20, 0x38($s0)
-/* 3D06B8 E00CA1B8 E616003C */  swc1      $f22, 0x3c($s0)
-/* 3D06BC E00CA1BC E6180040 */  swc1      $f24, 0x40($s0)
-.LE00CA1C0:
-/* 3D06C0 E00CA1C0 AC400230 */  sw        $zero, 0x230($v0)
-/* 3D06C4 E00CA1C4 2463FFFF */  addiu     $v1, $v1, -1
-/* 3D06C8 E00CA1C8 0461FFFD */  bgez      $v1, .LE00CA1C0
-/* 3D06CC E00CA1CC 2442FFFC */   addiu    $v0, $v0, -4
-/* 3D06D0 E00CA1D0 2404001E */  addiu     $a0, $zero, 0x1e
-/* 3D06D4 E00CA1D4 24020001 */  addiu     $v0, $zero, 1
-/* 3D06D8 E00CA1D8 AE0002A8 */  sw        $zero, 0x2a8($s0)
-/* 3D06DC E00CA1DC E6140050 */  swc1      $f20, 0x50($s0)
-/* 3D06E0 E00CA1E0 E61600C8 */  swc1      $f22, 0xc8($s0)
-/* 3D06E4 E00CA1E4 E6180140 */  swc1      $f24, 0x140($s0)
-/* 3D06E8 E00CA1E8 AE020230 */  sw        $v0, 0x230($s0)
-/* 3D06EC E00CA1EC AE0001B8 */  sw        $zero, 0x1b8($s0)
-/* 3D06F0 E00CA1F0 0C080138 */  jal       shim_rand_int
-/* 3D06F4 E00CA1F4 AE0002AC */   sw       $zero, 0x2ac($s0)
-/* 3D06F8 E00CA1F8 2443000A */  addiu     $v1, $v0, 0xa
-/* 3D06FC E00CA1FC 0240102D */  daddu     $v0, $s2, $zero
-/* 3D0700 E00CA200 44830000 */  mtc1      $v1, $f0
-/* 3D0704 E00CA204 00000000 */  nop
-/* 3D0708 E00CA208 46800020 */  cvt.s.w   $f0, $f0
-/* 3D070C E00CA20C E6000044 */  swc1      $f0, 0x44($s0)
-/* 3D0710 E00CA210 AE000048 */  sw        $zero, 0x48($s0)
-/* 3D0714 E00CA214 AE00004C */  sw        $zero, 0x4c($s0)
-/* 3D0718 E00CA218 8FBF0038 */  lw        $ra, 0x38($sp)
-/* 3D071C E00CA21C 8FB30034 */  lw        $s3, 0x34($sp)
-/* 3D0720 E00CA220 8FB20030 */  lw        $s2, 0x30($sp)
-/* 3D0724 E00CA224 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 3D0728 E00CA228 8FB00028 */  lw        $s0, 0x28($sp)
-/* 3D072C E00CA22C D7B80050 */  ldc1      $f24, 0x50($sp)
-/* 3D0730 E00CA230 D7B60048 */  ldc1      $f22, 0x48($sp)
-/* 3D0734 E00CA234 D7B40040 */  ldc1      $f20, 0x40($sp)
-/* 3D0738 E00CA238 03E00008 */  jr        $ra
-/* 3D073C E00CA23C 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_update.s b/ver/us/asm/nonmatchings/effects/effect_101/fx_101_update.s
deleted file mode 100644
index 3c5b15df24..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_update.s
+++ /dev/null
@@ -1,156 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_101_update
-/* 3D0748 E00CA248 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 3D074C E00CA24C AFBF0018 */  sw        $ra, 0x18($sp)
-/* 3D0750 E00CA250 AFB10014 */  sw        $s1, 0x14($sp)
-/* 3D0754 E00CA254 AFB00010 */  sw        $s0, 0x10($sp)
-/* 3D0758 E00CA258 F7B40020 */  sdc1      $f20, 0x20($sp)
-/* 3D075C E00CA25C 8C830000 */  lw        $v1, ($a0)
-/* 3D0760 E00CA260 8C90000C */  lw        $s0, 0xc($a0)
-/* 3D0764 E00CA264 30620010 */  andi      $v0, $v1, 0x10
-/* 3D0768 E00CA268 8E050000 */  lw        $a1, ($s0)
-/* 3D076C E00CA26C 10400005 */  beqz      $v0, .LE00CA284
-/* 3D0770 E00CA270 2402FFEF */   addiu    $v0, $zero, -0x11
-/* 3D0774 E00CA274 00621024 */  and       $v0, $v1, $v0
-/* 3D0778 E00CA278 AC820000 */  sw        $v0, ($a0)
-/* 3D077C E00CA27C 24020010 */  addiu     $v0, $zero, 0x10
-/* 3D0780 E00CA280 AE020010 */  sw        $v0, 0x10($s0)
-.LE00CA284:
-/* 3D0784 E00CA284 8E030010 */  lw        $v1, 0x10($s0)
-/* 3D0788 E00CA288 286203E8 */  slti      $v0, $v1, 0x3e8
-/* 3D078C E00CA28C 10400002 */  beqz      $v0, .LE00CA298
-/* 3D0790 E00CA290 2462FFFF */   addiu    $v0, $v1, -1
-/* 3D0794 E00CA294 AE020010 */  sw        $v0, 0x10($s0)
-.LE00CA298:
-/* 3D0798 E00CA298 8E020014 */  lw        $v0, 0x14($s0)
-/* 3D079C E00CA29C 8E030010 */  lw        $v1, 0x10($s0)
-/* 3D07A0 E00CA2A0 24420001 */  addiu     $v0, $v0, 1
-/* 3D07A4 E00CA2A4 04610005 */  bgez      $v1, .LE00CA2BC
-/* 3D07A8 E00CA2A8 AE020014 */   sw       $v0, 0x14($s0)
-/* 3D07AC E00CA2AC 0C080128 */  jal       shim_remove_effect
-/* 3D07B0 E00CA2B0 00000000 */   nop
-/* 3D07B4 E00CA2B4 0803291B */  j         .LE00CA46C
-/* 3D07B8 E00CA2B8 00000000 */   nop
-.LE00CA2BC:
-/* 3D07BC E00CA2BC 0040882D */  daddu     $s1, $v0, $zero
-/* 3D07C0 E00CA2C0 28620010 */  slti      $v0, $v1, 0x10
-/* 3D07C4 E00CA2C4 10400002 */  beqz      $v0, .LE00CA2D0
-/* 3D07C8 E00CA2C8 00031100 */   sll      $v0, $v1, 4
-/* 3D07CC E00CA2CC AE020024 */  sw        $v0, 0x24($s0)
-.LE00CA2D0:
-/* 3D07D0 E00CA2D0 24020003 */  addiu     $v0, $zero, 3
-/* 3D07D4 E00CA2D4 14A20020 */  bne       $a1, $v0, .LE00CA358
-/* 3D07D8 E00CA2D8 3C028888 */   lui      $v0, %hi(D_8887FFFB)
-/* 3D07DC E00CA2DC 0C080138 */  jal       shim_rand_int
-/* 3D07E0 E00CA2E0 2404000A */   addiu    $a0, $zero, 0xa
-/* 3D07E4 E00CA2E4 2442FFFB */  addiu     $v0, $v0, %lo(D_8887FFFB)
-/* 3D07E8 E00CA2E8 C6000044 */  lwc1      $f0, 0x44($s0)
-/* 3D07EC E00CA2EC 44821000 */  mtc1      $v0, $f2
-/* 3D07F0 E00CA2F0 00000000 */  nop
-/* 3D07F4 E00CA2F4 468010A0 */  cvt.s.w   $f2, $f2
-/* 3D07F8 E00CA2F8 46020000 */  add.s     $f0, $f0, $f2
-/* 3D07FC E00CA2FC 2404000A */  addiu     $a0, $zero, 0xa
-/* 3D0800 E00CA300 0C080138 */  jal       shim_rand_int
-/* 3D0804 E00CA304 E6000044 */   swc1     $f0, 0x44($s0)
-/* 3D0808 E00CA308 2442FFFB */  addiu     $v0, $v0, -5
-/* 3D080C E00CA30C 44820000 */  mtc1      $v0, $f0
-/* 3D0810 E00CA310 00000000 */  nop
-/* 3D0814 E00CA314 46800020 */  cvt.s.w   $f0, $f0
-/* 3D0818 E00CA318 C6020048 */  lwc1      $f2, 0x48($s0)
-/* 3D081C E00CA31C C6060038 */  lwc1      $f6, 0x38($s0)
-/* 3D0820 E00CA320 46001080 */  add.s     $f2, $f2, $f0
-/* 3D0824 E00CA324 C6000044 */  lwc1      $f0, 0x44($s0)
-/* 3D0828 E00CA328 C6040040 */  lwc1      $f4, 0x40($s0)
-/* 3D082C E00CA32C 46003180 */  add.s     $f6, $f6, $f0
-/* 3D0830 E00CA330 C600004C */  lwc1      $f0, 0x4c($s0)
-/* 3D0834 E00CA334 46002100 */  add.s     $f4, $f4, $f0
-/* 3D0838 E00CA338 E6020048 */  swc1      $f2, 0x48($s0)
-/* 3D083C E00CA33C C602003C */  lwc1      $f2, 0x3c($s0)
-/* 3D0840 E00CA340 C6000048 */  lwc1      $f0, 0x48($s0)
-/* 3D0844 E00CA344 46001080 */  add.s     $f2, $f2, $f0
-/* 3D0848 E00CA348 E6060038 */  swc1      $f6, 0x38($s0)
-/* 3D084C E00CA34C E6040040 */  swc1      $f4, 0x40($s0)
-/* 3D0850 E00CA350 E602003C */  swc1      $f2, 0x3c($s0)
-/* 3D0854 E00CA354 3C028888 */  lui       $v0, 0x8888
-.LE00CA358:
-/* 3D0858 E00CA358 8E0402A8 */  lw        $a0, 0x2a8($s0)
-/* 3D085C E00CA35C 34428889 */  ori       $v0, $v0, 0x8889
-/* 3D0860 E00CA360 00820018 */  mult      $a0, $v0
-/* 3D0864 E00CA364 C6080038 */  lwc1      $f8, 0x38($s0)
-/* 3D0868 E00CA368 C606003C */  lwc1      $f6, 0x3c($s0)
-/* 3D086C E00CA36C C60A0040 */  lwc1      $f10, 0x40($s0)
-/* 3D0870 E00CA370 00041FC3 */  sra       $v1, $a0, 0x1f
-/* 3D0874 E00CA374 00003010 */  mfhi      $a2
-/* 3D0878 E00CA378 00C41021 */  addu      $v0, $a2, $a0
-/* 3D087C E00CA37C 00021103 */  sra       $v0, $v0, 4
-/* 3D0880 E00CA380 00431823 */  subu      $v1, $v0, $v1
-/* 3D0884 E00CA384 00031100 */  sll       $v0, $v1, 4
-/* 3D0888 E00CA388 00431023 */  subu      $v0, $v0, $v1
-/* 3D088C E00CA38C 00021040 */  sll       $v0, $v0, 1
-/* 3D0890 E00CA390 00821823 */  subu      $v1, $a0, $v0
-/* 3D0894 E00CA394 00031080 */  sll       $v0, $v1, 2
-/* 3D0898 E00CA398 02021021 */  addu      $v0, $s0, $v0
-/* 3D089C E00CA39C C4420050 */  lwc1      $f2, 0x50($v0)
-/* 3D08A0 E00CA3A0 C44000C8 */  lwc1      $f0, 0xc8($v0)
-/* 3D08A4 E00CA3A4 C44C0140 */  lwc1      $f12, 0x140($v0)
-/* 3D08A8 E00CA3A8 46024032 */  c.eq.s    $f8, $f2
-/* 3D08AC E00CA3AC 00000000 */  nop
-/* 3D08B0 E00CA3B0 45000009 */  bc1f      .LE00CA3D8
-/* 3D08B4 E00CA3B4 00031880 */   sll      $v1, $v1, 2
-/* 3D08B8 E00CA3B8 46003032 */  c.eq.s    $f6, $f0
-/* 3D08BC E00CA3BC 00000000 */  nop
-/* 3D08C0 E00CA3C0 45000005 */  bc1f      .LE00CA3D8
-/* 3D08C4 E00CA3C4 00000000 */   nop
-/* 3D08C8 E00CA3C8 460C5032 */  c.eq.s    $f10, $f12
-/* 3D08CC E00CA3CC 00000000 */  nop
-/* 3D08D0 E00CA3D0 45010026 */  bc1t      .LE00CA46C
-/* 3D08D4 E00CA3D4 00000000 */   nop
-.LE00CA3D8:
-/* 3D08D8 E00CA3D8 02031821 */  addu      $v1, $s0, $v1
-/* 3D08DC E00CA3DC 8E0202A8 */  lw        $v0, 0x2a8($s0)
-/* 3D08E0 E00CA3E0 C47402AC */  lwc1      $f20, 0x2ac($v1)
-/* 3D08E4 E00CA3E4 24420001 */  addiu     $v0, $v0, 1
-/* 3D08E8 E00CA3E8 AE0202A8 */  sw        $v0, 0x2a8($s0)
-/* 3D08EC E00CA3EC 2842001E */  slti      $v0, $v0, 0x1e
-/* 3D08F0 E00CA3F0 50400001 */  beql      $v0, $zero, .LE00CA3F8
-/* 3D08F4 E00CA3F4 AE0002A8 */   sw       $zero, 0x2a8($s0)
-.LE00CA3F8:
-/* 3D08F8 E00CA3F8 46024101 */  sub.s     $f4, $f8, $f2
-/* 3D08FC E00CA3FC 46042102 */  mul.s     $f4, $f4, $f4
-/* 3D0900 E00CA400 00000000 */  nop
-/* 3D0904 E00CA404 46003001 */  sub.s     $f0, $f6, $f0
-/* 3D0908 E00CA408 46000002 */  mul.s     $f0, $f0, $f0
-/* 3D090C E00CA40C 00000000 */  nop
-/* 3D0910 E00CA410 8E0302A8 */  lw        $v1, 0x2a8($s0)
-/* 3D0914 E00CA414 460C5081 */  sub.s     $f2, $f10, $f12
-/* 3D0918 E00CA418 00031080 */  sll       $v0, $v1, 2
-/* 3D091C E00CA41C 46021082 */  mul.s     $f2, $f2, $f2
-/* 3D0920 E00CA420 00000000 */  nop
-/* 3D0924 E00CA424 02028021 */  addu      $s0, $s0, $v0
-/* 3D0928 E00CA428 24020001 */  addiu     $v0, $zero, 1
-/* 3D092C E00CA42C AE020230 */  sw        $v0, 0x230($s0)
-/* 3D0930 E00CA430 E6080050 */  swc1      $f8, 0x50($s0)
-/* 3D0934 E00CA434 46002100 */  add.s     $f4, $f4, $f0
-/* 3D0938 E00CA438 E60600C8 */  swc1      $f6, 0xc8($s0)
-/* 3D093C E00CA43C 44800000 */  mtc1      $zero, $f0
-/* 3D0940 E00CA440 46022300 */  add.s     $f12, $f4, $f2
-/* 3D0944 E00CA444 E60A0140 */  swc1      $f10, 0x140($s0)
-/* 3D0948 E00CA448 46006032 */  c.eq.s    $f12, $f0
-/* 3D094C E00CA44C 00000000 */  nop
-/* 3D0950 E00CA450 45010004 */  bc1t      .LE00CA464
-/* 3D0954 E00CA454 AE1101B8 */   sw       $s1, 0x1b8($s0)
-/* 3D0958 E00CA458 0C080154 */  jal       shim_sqrtf
-/* 3D095C E00CA45C 00000000 */   nop
-/* 3D0960 E00CA460 46000306 */  mov.s     $f12, $f0
-.LE00CA464:
-/* 3D0964 E00CA464 460CA000 */  add.s     $f0, $f20, $f12
-/* 3D0968 E00CA468 E60002AC */  swc1      $f0, 0x2ac($s0)
-.LE00CA46C:
-/* 3D096C E00CA46C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 3D0970 E00CA470 8FB10014 */  lw        $s1, 0x14($sp)
-/* 3D0974 E00CA474 8FB00010 */  lw        $s0, 0x10($sp)
-/* 3D0978 E00CA478 D7B40020 */  ldc1      $f20, 0x20($sp)
-/* 3D097C E00CA47C 03E00008 */  jr        $ra
-/* 3D0980 E00CA480 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_60/fx_60_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_appendGfx.s
index 7236ac9667..3ddca0f19c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_60_appendGfx
+glabel fx_3C_appendGfx
 /* 37A66C E007827C 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 37A670 E0078280 0080302D */  daddu     $a2, $a0, $zero
 /* 37A674 E0078284 AFBF005C */  sw        $ra, 0x5c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s b/ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s
rename to ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_main.s
index 3f5457ff80..6e7ae3087c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_60_main
+glabel fx_3C_main
 /* 37A3F0 E0078000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 37A3F4 E0078004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 37A3F8 E0078008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_60_main
 /* 37A40C E007801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 37A410 E0078020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 37A414 E0078024 4487C000 */  mtc1      $a3, $f24
-/* 37A418 E0078028 3C02E008 */  lui       $v0, %hi(fx_60_init)
-/* 37A41C E007802C 24428124 */  addiu     $v0, $v0, %lo(fx_60_init)
+/* 37A418 E0078028 3C02E008 */  lui       $v0, %hi(fx_3C_init)
+/* 37A41C E007802C 24428124 */  addiu     $v0, $v0, %lo(fx_3C_init)
 /* 37A420 E0078030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 37A424 E0078034 3C02E008 */  lui       $v0, %hi(fx_60_update)
-/* 37A428 E0078038 2442812C */  addiu     $v0, $v0, %lo(fx_60_update)
+/* 37A424 E0078034 3C02E008 */  lui       $v0, %hi(fx_3C_update)
+/* 37A428 E0078038 2442812C */  addiu     $v0, $v0, %lo(fx_3C_update)
 /* 37A42C E007803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 37A430 E0078040 3C02E008 */  lui       $v0, %hi(fx_60_render)
-/* 37A434 E0078044 24428210 */  addiu     $v0, $v0, %lo(fx_60_render)
+/* 37A430 E0078040 3C02E008 */  lui       $v0, %hi(fx_3C_render)
+/* 37A434 E0078044 24428210 */  addiu     $v0, $v0, %lo(fx_3C_render)
 /* 37A438 E0078048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 37A43C E007804C 2402003C */  addiu     $v0, $zero, 0x3c
 /* 37A440 E0078050 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_update.s b/ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_60/fx_60_update.s
rename to ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_update.s
index 0c54566ef1..cc75cdb8b5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_60/fx_60_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3C/fx_3C_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_60_update
+glabel fx_3C_update
 /* 37A51C E007812C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37A520 E0078130 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 37A524 E0078134 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_61/fx_61_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_appendGfx.s
index 9dd738282f..667e49ca88 100644
--- a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_61_appendGfx
+glabel fx_3D_appendGfx
 /* 37CDCC E007A88C 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 37CDD0 E007A890 AFBE00B8 */  sw        $fp, 0xb8($sp)
 /* 37CDD4 E007A894 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_main.s
similarity index 97%
rename from ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s
rename to ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_main.s
index 3845863bd6..f9a3cf6566 100644
--- a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_61_main
+glabel fx_3D_main
 /* 37C540 E007A000 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 37C544 E007A004 F7B60098 */  sdc1      $f22, 0x98($sp)
 /* 37C548 E007A008 C7B600D0 */  lwc1      $f22, 0xd0($sp)
@@ -119,16 +119,16 @@ glabel fx_61_main
 /* 37C6FC E007A1BC 4600F782 */  mul.s     $f30, $f30, $f0
 /* 37C700 E007A1C0 00000000 */  nop
 /* 37C704 E007A1C4 0200202D */  daddu     $a0, $s0, $zero
-/* 37C708 E007A1C8 3C02E008 */  lui       $v0, %hi(fx_61_init)
-/* 37C70C E007A1CC 2442A504 */  addiu     $v0, $v0, %lo(fx_61_init)
+/* 37C708 E007A1C8 3C02E008 */  lui       $v0, %hi(fx_3D_init)
+/* 37C70C E007A1CC 2442A504 */  addiu     $v0, $v0, %lo(fx_3D_init)
 /* 37C710 E007A1D0 AC820008 */  sw        $v0, 8($a0)
 /* 37C714 E007A1D4 46008402 */  mul.s     $f16, $f16, $f0
 /* 37C718 E007A1D8 00000000 */  nop
-/* 37C71C E007A1DC 3C02E008 */  lui       $v0, %hi(fx_61_update)
-/* 37C720 E007A1E0 2442A50C */  addiu     $v0, $v0, %lo(fx_61_update)
+/* 37C71C E007A1DC 3C02E008 */  lui       $v0, %hi(fx_3D_update)
+/* 37C720 E007A1E0 2442A50C */  addiu     $v0, $v0, %lo(fx_3D_update)
 /* 37C724 E007A1E4 AC82000C */  sw        $v0, 0xc($a0)
-/* 37C728 E007A1E8 3C02E008 */  lui       $v0, %hi(fx_61_render)
-/* 37C72C E007A1EC 2442A840 */  addiu     $v0, $v0, %lo(fx_61_render)
+/* 37C728 E007A1E8 3C02E008 */  lui       $v0, %hi(fx_3D_render)
+/* 37C72C E007A1EC 2442A840 */  addiu     $v0, $v0, %lo(fx_3D_render)
 /* 37C730 E007A1F0 AC800000 */  sw        $zero, ($a0)
 /* 37C734 E007A1F4 4600E702 */  mul.s     $f28, $f28, $f0
 /* 37C738 E007A1F8 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_update.s b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_61/fx_61_update.s
rename to ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_update.s
index 1d3f751b30..f23af13c27 100644
--- a/ver/us/asm/nonmatchings/effects/effect_61/fx_61_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_3D/fx_3D_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_61_update
+glabel fx_3D_update
 /* 37CA4C E007A50C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 37CA50 E007A510 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 37CA54 E007A514 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_appendGfx.s
index 197fef57a2..9385c0a452 100644
--- a/ver/us/asm/nonmatchings/effects/effect_46/fx_46_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/effect_46/fx_46_appendGfx.s
@@ -2,265 +2,260 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_46_appendGfx
-/* 361238 E005C2F8 27BDFEF8 */  addiu     $sp, $sp, -0x108
-/* 36123C E005C2FC AFBE0100 */  sw        $fp, 0x100($sp)
-/* 361240 E005C300 0080F02D */  daddu     $fp, $a0, $zero
-/* 361244 E005C304 3C08DB06 */  lui       $t0, 0xdb06
-/* 361248 E005C308 35080024 */  ori       $t0, $t0, 0x24
-/* 36124C E005C30C 27A40018 */  addiu     $a0, $sp, 0x18
-/* 361250 E005C310 AFB500F4 */  sw        $s5, 0xf4($sp)
-/* 361254 E005C314 3C150001 */  lui       $s5, 1
-/* 361258 E005C318 AFB700FC */  sw        $s7, 0xfc($sp)
-/* 36125C E005C31C 3C17800A */  lui       $s7, %hi(gMasterGfxPos)
-/* 361260 E005C320 26F7A66C */  addiu     $s7, $s7, %lo(gMasterGfxPos)
-/* 361264 E005C324 AFBF0104 */  sw        $ra, 0x104($sp)
-/* 361268 E005C328 AFB600F8 */  sw        $s6, 0xf8($sp)
-/* 36126C E005C32C AFB400F0 */  sw        $s4, 0xf0($sp)
-/* 361270 E005C330 AFB300EC */  sw        $s3, 0xec($sp)
-/* 361274 E005C334 AFB200E8 */  sw        $s2, 0xe8($sp)
-/* 361278 E005C338 AFB100E4 */  sw        $s1, 0xe4($sp)
-/* 36127C E005C33C AFB000E0 */  sw        $s0, 0xe0($sp)
-/* 361280 E005C340 8EE50000 */  lw        $a1, ($s7)
-/* 361284 E005C344 8FD6000C */  lw        $s6, 0xc($fp)
-/* 361288 E005C348 00A0302D */  daddu     $a2, $a1, $zero
-/* 36128C E005C34C 24A50008 */  addiu     $a1, $a1, 8
-/* 361290 E005C350 AEE50000 */  sw        $a1, ($s7)
-/* 361294 E005C354 96C30000 */  lhu       $v1, ($s6)
-/* 361298 E005C358 24A20008 */  addiu     $v0, $a1, 8
-/* 36129C E005C35C AEE20000 */  sw        $v0, ($s7)
-/* 3612A0 E005C360 C6C20030 */  lwc1      $f2, 0x30($s6)
-/* 3612A4 E005C364 00031880 */  sll       $v1, $v1, 2
-/* 3612A8 E005C368 3C09E006 */  lui       $t1, %hi(D_E005C700)
-/* 3612AC E005C36C 01234821 */  addu      $t1, $t1, $v1
-/* 3612B0 E005C370 8D29C700 */  lw        $t1, %lo(D_E005C700)($t1)
-/* 3612B4 E005C374 36B51630 */  ori       $s5, $s5, 0x1630
-/* 3612B8 E005C378 AFA900D8 */  sw        $t1, 0xd8($sp)
-/* 3612BC E005C37C 3C07E006 */  lui       $a3, %hi(D_E005C704)
-/* 3612C0 E005C380 00E33821 */  addu      $a3, $a3, $v1
-/* 3612C4 E005C384 8CE7C704 */  lw        $a3, %lo(D_E005C704)($a3)
-/* 3612C8 E005C388 3C02E700 */  lui       $v0, 0xe700
-/* 3612CC E005C38C ACC20000 */  sw        $v0, ($a2)
-/* 3612D0 E005C390 ACC00004 */  sw        $zero, 4($a2)
-/* 3612D4 E005C394 ACA80000 */  sw        $t0, ($a1)
-/* 3612D8 E005C398 8FC30010 */  lw        $v1, 0x10($fp)
-/* 3612DC E005C39C 24A20010 */  addiu     $v0, $a1, 0x10
-/* 3612E0 E005C3A0 AEE20000 */  sw        $v0, ($s7)
-/* 3612E4 E005C3A4 3C02DE00 */  lui       $v0, 0xde00
-/* 3612E8 E005C3A8 4600110D */  trunc.w.s $f4, $f2
-/* 3612EC E005C3AC 44132000 */  mfc1      $s3, $f4
-/* 3612F0 E005C3B0 00000000 */  nop
-/* 3612F4 E005C3B4 44930000 */  mtc1      $s3, $f0
-/* 3612F8 E005C3B8 00000000 */  nop
-/* 3612FC E005C3BC 46800020 */  cvt.s.w   $f0, $f0
-/* 361300 E005C3C0 3A740006 */  xori      $s4, $s3, 6
-/* 361304 E005C3C4 46001081 */  sub.s     $f2, $f2, $f0
-/* 361308 E005C3C8 3C014380 */  lui       $at, 0x4380
-/* 36130C E005C3CC 44810000 */  mtc1      $at, $f0
-/* 361310 E005C3D0 8C63001C */  lw        $v1, 0x1c($v1)
-/* 361314 E005C3D4 ACA20008 */  sw        $v0, 8($a1)
-/* 361318 E005C3D8 3C028000 */  lui       $v0, 0x8000
-/* 36131C E005C3DC ACA7000C */  sw        $a3, 0xc($a1)
-/* 361320 E005C3E0 00621821 */  addu      $v1, $v1, $v0
-/* 361324 E005C3E4 46001082 */  mul.s     $f2, $f2, $f0
-/* 361328 E005C3E8 00000000 */  nop
-/* 36132C E005C3EC ACA30004 */  sw        $v1, 4($a1)
-/* 361330 E005C3F0 8EC50004 */  lw        $a1, 4($s6)
-/* 361334 E005C3F4 8EC60008 */  lw        $a2, 8($s6)
-/* 361338 E005C3F8 8EC7000C */  lw        $a3, 0xc($s6)
-/* 36133C E005C3FC 4600110D */  trunc.w.s $f4, $f2
-/* 361340 E005C400 44122000 */  mfc1      $s2, $f4
-/* 361344 E005C404 0C080108 */  jal       shim_guTranslateF
-/* 361348 E005C408 2E940001 */   sltiu    $s4, $s4, 1
-/* 36134C E005C40C 27B00058 */  addiu     $s0, $sp, 0x58
-/* 361350 E005C410 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 361354 E005C414 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 361358 E005C418 44800000 */  mtc1      $zero, $f0
-/* 36135C E005C41C 00031080 */  sll       $v0, $v1, 2
-/* 361360 E005C420 00431021 */  addu      $v0, $v0, $v1
-/* 361364 E005C424 00021080 */  sll       $v0, $v0, 2
-/* 361368 E005C428 00431023 */  subu      $v0, $v0, $v1
-/* 36136C E005C42C 000218C0 */  sll       $v1, $v0, 3
-/* 361370 E005C430 00431021 */  addu      $v0, $v0, $v1
-/* 361374 E005C434 000210C0 */  sll       $v0, $v0, 3
-/* 361378 E005C438 44060000 */  mfc1      $a2, $f0
-/* 36137C E005C43C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 361380 E005C440 00220821 */  addu      $at, $at, $v0
-/* 361384 E005C444 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
-/* 361388 E005C448 3C073F80 */  lui       $a3, 0x3f80
-/* 36138C E005C44C 46000007 */  neg.s     $f0, $f0
-/* 361390 E005C450 44050000 */  mfc1      $a1, $f0
-/* 361394 E005C454 0200202D */  daddu     $a0, $s0, $zero
-/* 361398 E005C458 0C080104 */  jal       shim_guRotateF
-/* 36139C E005C45C AFA60010 */   sw       $a2, 0x10($sp)
-/* 3613A0 E005C460 0200202D */  daddu     $a0, $s0, $zero
-/* 3613A4 E005C464 27A50018 */  addiu     $a1, $sp, 0x18
-/* 3613A8 E005C468 27B00098 */  addiu     $s0, $sp, 0x98
-/* 3613AC E005C46C 0C080114 */  jal       shim_guMtxCatF
-/* 3613B0 E005C470 0200302D */   daddu    $a2, $s0, $zero
-/* 3613B4 E005C474 0200202D */  daddu     $a0, $s0, $zero
-/* 3613B8 E005C478 3C108007 */  lui       $s0, %hi(gMatrixListPos)
-/* 3613BC E005C47C 261041F0 */  addiu     $s0, $s0, %lo(gMatrixListPos)
-/* 3613C0 E005C480 3C11800A */  lui       $s1, %hi(gDisplayContext)
-/* 3613C4 E005C484 2631A674 */  addiu     $s1, $s1, %lo(gDisplayContext)
-/* 3613C8 E005C488 96050000 */  lhu       $a1, ($s0)
-/* 3613CC E005C48C 8E220000 */  lw        $v0, ($s1)
-/* 3613D0 E005C490 00052980 */  sll       $a1, $a1, 6
-/* 3613D4 E005C494 00B52821 */  addu      $a1, $a1, $s5
-/* 3613D8 E005C498 0C080118 */  jal       shim_guMtxF2L
-/* 3613DC E005C49C 00452821 */   addu     $a1, $v0, $a1
-/* 3613E0 E005C4A0 3C05E6DE */  lui       $a1, 0xe6de
-/* 3613E4 E005C4A4 34A5DE82 */  ori       $a1, $a1, 0xde82
-/* 3613E8 E005C4A8 8EE60000 */  lw        $a2, ($s7)
-/* 3613EC E005C4AC 3C03DA38 */  lui       $v1, 0xda38
-/* 3613F0 E005C4B0 00C0202D */  daddu     $a0, $a2, $zero
-/* 3613F4 E005C4B4 24C60008 */  addiu     $a2, $a2, 8
-/* 3613F8 E005C4B8 AEE60000 */  sw        $a2, ($s7)
-/* 3613FC E005C4BC 96020000 */  lhu       $v0, ($s0)
-/* 361400 E005C4C0 325200FF */  andi      $s2, $s2, 0xff
-/* 361404 E005C4C4 AC830000 */  sw        $v1, ($a0)
-/* 361408 E005C4C8 24430001 */  addiu     $v1, $v0, 1
-/* 36140C E005C4CC 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 361410 E005C4D0 00021180 */  sll       $v0, $v0, 6
-/* 361414 E005C4D4 A6030000 */  sh        $v1, ($s0)
-/* 361418 E005C4D8 8E230000 */  lw        $v1, ($s1)
-/* 36141C E005C4DC 00551021 */  addu      $v0, $v0, $s5
-/* 361420 E005C4E0 00621821 */  addu      $v1, $v1, $v0
-/* 361424 E005C4E4 24C20008 */  addiu     $v0, $a2, 8
-/* 361428 E005C4E8 AC830004 */  sw        $v1, 4($a0)
-/* 36142C E005C4EC AEE20000 */  sw        $v0, ($s7)
-/* 361430 E005C4F0 3C02FA00 */  lui       $v0, 0xfa00
-/* 361434 E005C4F4 ACC20000 */  sw        $v0, ($a2)
-/* 361438 E005C4F8 24C20010 */  addiu     $v0, $a2, 0x10
-/* 36143C E005C4FC ACC50004 */  sw        $a1, 4($a2)
-/* 361440 E005C500 AEE20000 */  sw        $v0, ($s7)
-/* 361444 E005C504 3C02FB00 */  lui       $v0, 0xfb00
-/* 361448 E005C508 ACC20008 */  sw        $v0, 8($a2)
-/* 36144C E005C50C 24C20018 */  addiu     $v0, $a2, 0x18
-/* 361450 E005C510 ACD2000C */  sw        $s2, 0xc($a2)
-/* 361454 E005C514 AEE20000 */  sw        $v0, ($s7)
-/* 361458 E005C518 001311C0 */  sll       $v0, $s3, 7
-/* 36145C E005C51C 30420FFF */  andi      $v0, $v0, 0xfff
-/* 361460 E005C520 00021300 */  sll       $v0, $v0, 0xc
-/* 361464 E005C524 3C04F200 */  lui       $a0, 0xf200
-/* 361468 E005C528 00441025 */  or        $v0, $v0, $a0
-/* 36146C E005C52C 00139940 */  sll       $s3, $s3, 5
-/* 361470 E005C530 ACC20010 */  sw        $v0, 0x10($a2)
-/* 361474 E005C534 26620020 */  addiu     $v0, $s3, 0x20
-/* 361478 E005C538 00021080 */  sll       $v0, $v0, 2
-/* 36147C E005C53C 30420FFF */  andi      $v0, $v0, 0xfff
-/* 361480 E005C540 00022B00 */  sll       $a1, $v0, 0xc
-/* 361484 E005C544 34A20080 */  ori       $v0, $a1, 0x80
-/* 361488 E005C548 1280000F */  beqz      $s4, .LE005C588
-/* 36148C E005C54C ACC20014 */   sw       $v0, 0x14($a2)
-/* 361490 E005C550 0080182D */  daddu     $v1, $a0, $zero
-/* 361494 E005C554 34630080 */  ori       $v1, $v1, 0x80
-/* 361498 E005C558 3C040100 */  lui       $a0, 0x100
-/* 36149C E005C55C 34840100 */  ori       $a0, $a0, 0x100
-/* 3614A0 E005C560 24C20020 */  addiu     $v0, $a2, 0x20
-/* 3614A4 E005C564 00A31825 */  or        $v1, $a1, $v1
-/* 3614A8 E005C568 AEE20000 */  sw        $v0, ($s7)
-/* 3614AC E005C56C 26620040 */  addiu     $v0, $s3, 0x40
-/* 3614B0 E005C570 00021080 */  sll       $v0, $v0, 2
-/* 3614B4 E005C574 30420FFF */  andi      $v0, $v0, 0xfff
-/* 3614B8 E005C578 00021300 */  sll       $v0, $v0, 0xc
-/* 3614BC E005C57C 00441025 */  or        $v0, $v0, $a0
-/* 3614C0 E005C580 0801716D */  j         .LE005C5B4
-/* 3614C4 E005C584 ACC30018 */   sw       $v1, 0x18($a2)
-.LE005C588:
-/* 3614C8 E005C588 3C030100 */  lui       $v1, 0x100
-/* 3614CC E005C58C 34630080 */  ori       $v1, $v1, 0x80
-/* 3614D0 E005C590 24C20020 */  addiu     $v0, $a2, 0x20
-/* 3614D4 E005C594 AEE20000 */  sw        $v0, ($s7)
-/* 3614D8 E005C598 00A41025 */  or        $v0, $a1, $a0
-/* 3614DC E005C59C ACC20018 */  sw        $v0, 0x18($a2)
-/* 3614E0 E005C5A0 26620040 */  addiu     $v0, $s3, 0x40
-/* 3614E4 E005C5A4 00021080 */  sll       $v0, $v0, 2
-/* 3614E8 E005C5A8 30420FFF */  andi      $v0, $v0, 0xfff
-/* 3614EC E005C5AC 00021300 */  sll       $v0, $v0, 0xc
-/* 3614F0 E005C5B0 00431025 */  or        $v0, $v0, $v1
-.LE005C5B4:
-/* 3614F4 E005C5B4 ACC2001C */  sw        $v0, 0x1c($a2)
-/* 3614F8 E005C5B8 8FC20008 */  lw        $v0, 8($fp)
-/* 3614FC E005C5BC 24110001 */  addiu     $s1, $zero, 1
-/* 361500 E005C5C0 0222102A */  slt       $v0, $s1, $v0
-/* 361504 E005C5C4 10400037 */  beqz      $v0, .LE005C6A4
-/* 361508 E005C5C8 26D60034 */   addiu    $s6, $s6, 0x34
-/* 36150C E005C5CC 3C15800A */  lui       $s5, %hi(gDisplayContext)
-/* 361510 E005C5D0 26B5A674 */  addiu     $s5, $s5, %lo(gDisplayContext)
-/* 361514 E005C5D4 3C148007 */  lui       $s4, %hi(gMatrixListPos)
-/* 361518 E005C5D8 269441F0 */  addiu     $s4, $s4, %lo(gMatrixListPos)
-/* 36151C E005C5DC 3C130001 */  lui       $s3, 1
-/* 361520 E005C5E0 36731630 */  ori       $s3, $s3, 0x1630
-/* 361524 E005C5E4 3C12800A */  lui       $s2, %hi(gMasterGfxPos)
-/* 361528 E005C5E8 2652A66C */  addiu     $s2, $s2, %lo(gMasterGfxPos)
-/* 36152C E005C5EC 26D0000C */  addiu     $s0, $s6, 0xc
-.LE005C5F0:
-/* 361530 E005C5F0 27A40018 */  addiu     $a0, $sp, 0x18
-/* 361534 E005C5F4 26310001 */  addiu     $s1, $s1, 1
-/* 361538 E005C5F8 8E05FFF8 */  lw        $a1, -8($s0)
-/* 36153C E005C5FC 8E06FFFC */  lw        $a2, -4($s0)
-/* 361540 E005C600 8E070000 */  lw        $a3, ($s0)
-/* 361544 E005C604 0C080108 */  jal       shim_guTranslateF
-/* 361548 E005C608 26100034 */   addiu    $s0, $s0, 0x34
-/* 36154C E005C60C 27A40018 */  addiu     $a0, $sp, 0x18
-/* 361550 E005C610 96850000 */  lhu       $a1, ($s4)
-/* 361554 E005C614 8EA20000 */  lw        $v0, ($s5)
-/* 361558 E005C618 00052980 */  sll       $a1, $a1, 6
-/* 36155C E005C61C 00B32821 */  addu      $a1, $a1, $s3
-/* 361560 E005C620 0C080118 */  jal       shim_guMtxF2L
-/* 361564 E005C624 00452821 */   addu     $a1, $v0, $a1
-/* 361568 E005C628 3C06D838 */  lui       $a2, 0xd838
-/* 36156C E005C62C 8E440000 */  lw        $a0, ($s2)
-/* 361570 E005C630 34C60002 */  ori       $a2, $a2, 2
-/* 361574 E005C634 0080282D */  daddu     $a1, $a0, $zero
-/* 361578 E005C638 24840008 */  addiu     $a0, $a0, 8
-/* 36157C E005C63C AE440000 */  sw        $a0, ($s2)
-/* 361580 E005C640 96820000 */  lhu       $v0, ($s4)
-/* 361584 E005C644 3C03DA38 */  lui       $v1, 0xda38
-/* 361588 E005C648 ACA30000 */  sw        $v1, ($a1)
-/* 36158C E005C64C 24430001 */  addiu     $v1, $v0, 1
-/* 361590 E005C650 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 361594 E005C654 00021180 */  sll       $v0, $v0, 6
-/* 361598 E005C658 A6830000 */  sh        $v1, ($s4)
-/* 36159C E005C65C 8EA30000 */  lw        $v1, ($s5)
-/* 3615A0 E005C660 00531021 */  addu      $v0, $v0, $s3
-/* 3615A4 E005C664 00621821 */  addu      $v1, $v1, $v0
-/* 3615A8 E005C668 24820008 */  addiu     $v0, $a0, 8
-/* 3615AC E005C66C ACA30004 */  sw        $v1, 4($a1)
-/* 3615B0 E005C670 AE420000 */  sw        $v0, ($s2)
-/* 3615B4 E005C674 3C02DE00 */  lui       $v0, 0xde00
-/* 3615B8 E005C678 AC820000 */  sw        $v0, ($a0)
-/* 3615BC E005C67C 8FA900D8 */  lw        $t1, 0xd8($sp)
-/* 3615C0 E005C680 24020040 */  addiu     $v0, $zero, 0x40
-/* 3615C4 E005C684 AC860008 */  sw        $a2, 8($a0)
-/* 3615C8 E005C688 AC82000C */  sw        $v0, 0xc($a0)
-/* 3615CC E005C68C AC890004 */  sw        $t1, 4($a0)
-/* 3615D0 E005C690 8FC20008 */  lw        $v0, 8($fp)
-/* 3615D4 E005C694 24840010 */  addiu     $a0, $a0, 0x10
-/* 3615D8 E005C698 0222102A */  slt       $v0, $s1, $v0
-/* 3615DC E005C69C 1440FFD4 */  bnez      $v0, .LE005C5F0
-/* 3615E0 E005C6A0 AE440000 */   sw       $a0, ($s2)
-.LE005C6A4:
-/* 3615E4 E005C6A4 3C05D838 */  lui       $a1, 0xd838
-/* 3615E8 E005C6A8 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* 3615EC E005C6AC 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* 3615F0 E005C6B0 8C620000 */  lw        $v0, ($v1)
-/* 3615F4 E005C6B4 34A50002 */  ori       $a1, $a1, 2
-/* 3615F8 E005C6B8 0040202D */  daddu     $a0, $v0, $zero
-/* 3615FC E005C6BC 24420008 */  addiu     $v0, $v0, 8
-/* 361600 E005C6C0 AC620000 */  sw        $v0, ($v1)
-/* 361604 E005C6C4 24020040 */  addiu     $v0, $zero, 0x40
-/* 361608 E005C6C8 AC850000 */  sw        $a1, ($a0)
-/* 36160C E005C6CC AC820004 */  sw        $v0, 4($a0)
-/* 361610 E005C6D0 8FBF0104 */  lw        $ra, 0x104($sp)
-/* 361614 E005C6D4 8FBE0100 */  lw        $fp, 0x100($sp)
-/* 361618 E005C6D8 8FB700FC */  lw        $s7, 0xfc($sp)
-/* 36161C E005C6DC 8FB600F8 */  lw        $s6, 0xf8($sp)
-/* 361620 E005C6E0 8FB500F4 */  lw        $s5, 0xf4($sp)
-/* 361624 E005C6E4 8FB400F0 */  lw        $s4, 0xf0($sp)
-/* 361628 E005C6E8 8FB300EC */  lw        $s3, 0xec($sp)
-/* 36162C E005C6EC 8FB200E8 */  lw        $s2, 0xe8($sp)
-/* 361630 E005C6F0 8FB100E4 */  lw        $s1, 0xe4($sp)
-/* 361634 E005C6F4 8FB000E0 */  lw        $s0, 0xe0($sp)
-/* 361638 E005C6F8 03E00008 */  jr        $ra
-/* 36163C E005C6FC 27BD0108 */   addiu    $sp, $sp, 0x108
+/* 38E4FC E008C6FC 27BDFF10 */  addiu     $sp, $sp, -0xf0
+/* 38E500 E008C700 AFBE00C8 */  sw        $fp, 0xc8($sp)
+/* 38E504 E008C704 0080F02D */  daddu     $fp, $a0, $zero
+/* 38E508 E008C708 3C06DB06 */  lui       $a2, 0xdb06
+/* 38E50C E008C70C 34C60024 */  ori       $a2, $a2, 0x24
+/* 38E510 E008C710 27A40020 */  addiu     $a0, $sp, 0x20
+/* 38E514 E008C714 AFB000A8 */  sw        $s0, 0xa8($sp)
+/* 38E518 E008C718 3C100001 */  lui       $s0, 1
+/* 38E51C E008C71C 36101630 */  ori       $s0, $s0, 0x1630
+/* 38E520 E008C720 AFB300B4 */  sw        $s3, 0xb4($sp)
+/* 38E524 E008C724 3C13800A */  lui       $s3, %hi(gMasterGfxPos)
+/* 38E528 E008C728 2673A66C */  addiu     $s3, $s3, %lo(gMasterGfxPos)
+/* 38E52C E008C72C AFBF00CC */  sw        $ra, 0xcc($sp)
+/* 38E530 E008C730 AFB700C4 */  sw        $s7, 0xc4($sp)
+/* 38E534 E008C734 AFB600C0 */  sw        $s6, 0xc0($sp)
+/* 38E538 E008C738 AFB500BC */  sw        $s5, 0xbc($sp)
+/* 38E53C E008C73C AFB400B8 */  sw        $s4, 0xb8($sp)
+/* 38E540 E008C740 AFB200B0 */  sw        $s2, 0xb0($sp)
+/* 38E544 E008C744 AFB100AC */  sw        $s1, 0xac($sp)
+/* 38E548 E008C748 F7BA00E8 */  sdc1      $f26, 0xe8($sp)
+/* 38E54C E008C74C F7B800E0 */  sdc1      $f24, 0xe0($sp)
+/* 38E550 E008C750 F7B600D8 */  sdc1      $f22, 0xd8($sp)
+/* 38E554 E008C754 F7B400D0 */  sdc1      $f20, 0xd0($sp)
+/* 38E558 E008C758 8E630000 */  lw        $v1, ($s3)
+/* 38E55C E008C75C 8FD1000C */  lw        $s1, 0xc($fp)
+/* 38E560 E008C760 0060282D */  daddu     $a1, $v1, $zero
+/* 38E564 E008C764 24630008 */  addiu     $v1, $v1, 8
+/* 38E568 E008C768 AE630000 */  sw        $v1, ($s3)
+/* 38E56C E008C76C 8E28001C */  lw        $t0, 0x1c($s1)
+/* 38E570 E008C770 AFA800A4 */  sw        $t0, 0xa4($sp)
+/* 38E574 E008C774 C6380014 */  lwc1      $f24, 0x14($s1)
+/* 38E578 E008C778 C6360018 */  lwc1      $f22, 0x18($s1)
+/* 38E57C E008C77C 8E280000 */  lw        $t0, ($s1)
+/* 38E580 E008C780 3C02E700 */  lui       $v0, 0xe700
+/* 38E584 E008C784 AFA800A0 */  sw        $t0, 0xa0($sp)
+/* 38E588 E008C788 ACA20000 */  sw        $v0, ($a1)
+/* 38E58C E008C78C 24620008 */  addiu     $v0, $v1, 8
+/* 38E590 E008C790 ACA00004 */  sw        $zero, 4($a1)
+/* 38E594 E008C794 AE620000 */  sw        $v0, ($s3)
+/* 38E598 E008C798 AC660000 */  sw        $a2, ($v1)
+/* 38E59C E008C79C 8FC50010 */  lw        $a1, 0x10($fp)
+/* 38E5A0 E008C7A0 24620010 */  addiu     $v0, $v1, 0x10
+/* 38E5A4 E008C7A4 AE620000 */  sw        $v0, ($s3)
+/* 38E5A8 E008C7A8 8CA5001C */  lw        $a1, 0x1c($a1)
+/* 38E5AC E008C7AC 3C02DE00 */  lui       $v0, 0xde00
+/* 38E5B0 E008C7B0 AC620008 */  sw        $v0, 8($v1)
+/* 38E5B4 E008C7B4 3C020900 */  lui       $v0, 0x900
+/* 38E5B8 E008C7B8 24420420 */  addiu     $v0, $v0, 0x420
+/* 38E5BC E008C7BC AC62000C */  sw        $v0, 0xc($v1)
+/* 38E5C0 E008C7C0 3C028000 */  lui       $v0, 0x8000
+/* 38E5C4 E008C7C4 00A22821 */  addu      $a1, $a1, $v0
+/* 38E5C8 E008C7C8 AC650004 */  sw        $a1, 4($v1)
+/* 38E5CC E008C7CC 8E250008 */  lw        $a1, 8($s1)
+/* 38E5D0 E008C7D0 8E26000C */  lw        $a2, 0xc($s1)
+/* 38E5D4 E008C7D4 8E270010 */  lw        $a3, 0x10($s1)
+/* 38E5D8 E008C7D8 4480A000 */  mtc1      $zero, $f20
+/* 38E5DC E008C7DC 0C080108 */  jal       shim_guTranslateF
+/* 38E5E0 E008C7E0 24160001 */   addiu    $s6, $zero, 1
+/* 38E5E4 E008C7E4 27B20060 */  addiu     $s2, $sp, 0x60
+/* 38E5E8 E008C7E8 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
+/* 38E5EC E008C7EC 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
+/* 38E5F0 E008C7F0 4406A000 */  mfc1      $a2, $f20
+/* 38E5F4 E008C7F4 00031080 */  sll       $v0, $v1, 2
+/* 38E5F8 E008C7F8 00431021 */  addu      $v0, $v0, $v1
+/* 38E5FC E008C7FC 00021080 */  sll       $v0, $v0, 2
+/* 38E600 E008C800 00431023 */  subu      $v0, $v0, $v1
+/* 38E604 E008C804 000218C0 */  sll       $v1, $v0, 3
+/* 38E608 E008C808 00431021 */  addu      $v0, $v0, $v1
+/* 38E60C E008C80C 000210C0 */  sll       $v0, $v0, 3
+/* 38E610 E008C810 3C01800B */  lui       $at, %hi(gCameras+0x6C)
+/* 38E614 E008C814 00220821 */  addu      $at, $at, $v0
+/* 38E618 E008C818 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
+/* 38E61C E008C81C 3C073F80 */  lui       $a3, 0x3f80
+/* 38E620 E008C820 46000007 */  neg.s     $f0, $f0
+/* 38E624 E008C824 44050000 */  mfc1      $a1, $f0
+/* 38E628 E008C828 0240202D */  daddu     $a0, $s2, $zero
+/* 38E62C E008C82C 0C080104 */  jal       shim_guRotateF
+/* 38E630 E008C830 E7B40010 */   swc1     $f20, 0x10($sp)
+/* 38E634 E008C834 0240202D */  daddu     $a0, $s2, $zero
+/* 38E638 E008C838 27A50020 */  addiu     $a1, $sp, 0x20
+/* 38E63C E008C83C 0C080114 */  jal       shim_guMtxCatF
+/* 38E640 E008C840 00A0302D */   daddu    $a2, $a1, $zero
+/* 38E644 E008C844 27A40020 */  addiu     $a0, $sp, 0x20
+/* 38E648 E008C848 3C148007 */  lui       $s4, %hi(gMatrixListPos)
+/* 38E64C E008C84C 269441F0 */  addiu     $s4, $s4, %lo(gMatrixListPos)
+/* 38E650 E008C850 3C15800A */  lui       $s5, %hi(gDisplayContext)
+/* 38E654 E008C854 26B5A674 */  addiu     $s5, $s5, %lo(gDisplayContext)
+/* 38E658 E008C858 96850000 */  lhu       $a1, ($s4)
+/* 38E65C E008C85C 8EA20000 */  lw        $v0, ($s5)
+/* 38E660 E008C860 00052980 */  sll       $a1, $a1, 6
+/* 38E664 E008C864 00B02821 */  addu      $a1, $a1, $s0
+/* 38E668 E008C868 0C080118 */  jal       shim_guMtxF2L
+/* 38E66C E008C86C 00452821 */   addu     $a1, $v0, $a1
+/* 38E670 E008C870 8E620000 */  lw        $v0, ($s3)
+/* 38E674 E008C874 26310048 */  addiu     $s1, $s1, 0x48
+/* 38E678 E008C878 0040282D */  daddu     $a1, $v0, $zero
+/* 38E67C E008C87C 24420008 */  addiu     $v0, $v0, 8
+/* 38E680 E008C880 AE620000 */  sw        $v0, ($s3)
+/* 38E684 E008C884 96840000 */  lhu       $a0, ($s4)
+/* 38E688 E008C888 3C02DA38 */  lui       $v0, 0xda38
+/* 38E68C E008C88C ACA20000 */  sw        $v0, ($a1)
+/* 38E690 E008C890 8EA30000 */  lw        $v1, ($s5)
+/* 38E694 E008C894 3082FFFF */  andi      $v0, $a0, 0xffff
+/* 38E698 E008C898 00021180 */  sll       $v0, $v0, 6
+/* 38E69C E008C89C 00501021 */  addu      $v0, $v0, $s0
+/* 38E6A0 E008C8A0 00621821 */  addu      $v1, $v1, $v0
+/* 38E6A4 E008C8A4 ACA30004 */  sw        $v1, 4($a1)
+/* 38E6A8 E008C8A8 8FC20008 */  lw        $v0, 8($fp)
+/* 38E6AC E008C8AC 00962021 */  addu      $a0, $a0, $s6
+/* 38E6B0 E008C8B0 02C2102A */  slt       $v0, $s6, $v0
+/* 38E6B4 E008C8B4 10400073 */  beqz      $v0, .LE008CA84
+/* 38E6B8 E008C8B8 A6840000 */   sh       $a0, ($s4)
+/* 38E6BC E008C8BC 3C014040 */  lui       $at, 0x4040
+/* 38E6C0 E008C8C0 4481D000 */  mtc1      $at, $f26
+/* 38E6C4 E008C8C4 02A0B82D */  daddu     $s7, $s5, $zero
+/* 38E6C8 E008C8C8 0280A82D */  daddu     $s5, $s4, $zero
+/* 38E6CC E008C8CC 3C140001 */  lui       $s4, 1
+/* 38E6D0 E008C8D0 36941630 */  ori       $s4, $s4, 0x1630
+/* 38E6D4 E008C8D4 26300046 */  addiu     $s0, $s1, 0x46
+.LE008C8D8:
+/* 38E6D8 E008C8D8 C600FFCE */  lwc1      $f0, -0x32($s0)
+/* 38E6DC E008C8DC 4600C002 */  mul.s     $f0, $f24, $f0
+/* 38E6E0 E008C8E0 00000000 */  nop
+/* 38E6E4 E008C8E4 4406A000 */  mfc1      $a2, $f20
+/* 38E6E8 E008C8E8 E7A00010 */  swc1      $f0, 0x10($sp)
+/* 38E6EC E008C8EC C600FFC2 */  lwc1      $f0, -0x3e($s0)
+/* 38E6F0 E008C8F0 E7A00014 */  swc1      $f0, 0x14($sp)
+/* 38E6F4 E008C8F4 C600FFC6 */  lwc1      $f0, -0x3a($s0)
+/* 38E6F8 E008C8F8 E7A00018 */  swc1      $f0, 0x18($sp)
+/* 38E6FC E008C8FC C600FFCA */  lwc1      $f0, -0x36($s0)
+/* 38E700 E008C900 E7A0001C */  swc1      $f0, 0x1c($sp)
+/* 38E704 E008C904 8E05FFE6 */  lw        $a1, -0x1a($s0)
+/* 38E708 E008C908 8E07FFEE */  lw        $a3, -0x12($s0)
+/* 38E70C E008C90C 0C080180 */  jal       shim_guPositionF
+/* 38E710 E008C910 27A40020 */   addiu    $a0, $sp, 0x20
+/* 38E714 E008C914 E7B40010 */  swc1      $f20, 0x10($sp)
+/* 38E718 E008C918 8E05FFEA */  lw        $a1, -0x16($s0)
+/* 38E71C E008C91C 4406A000 */  mfc1      $a2, $f20
+/* 38E720 E008C920 3C073F80 */  lui       $a3, 0x3f80
+/* 38E724 E008C924 0C080104 */  jal       shim_guRotateF
+/* 38E728 E008C928 0240202D */   daddu    $a0, $s2, $zero
+/* 38E72C E008C92C 0240202D */  daddu     $a0, $s2, $zero
+/* 38E730 E008C930 27A50020 */  addiu     $a1, $sp, 0x20
+/* 38E734 E008C934 0C080114 */  jal       shim_guMtxCatF
+/* 38E738 E008C938 00A0302D */   daddu    $a2, $a1, $zero
+/* 38E73C E008C93C 8FA800A0 */  lw        $t0, 0xa0($sp)
+/* 38E740 E008C940 29020008 */  slti      $v0, $t0, 8
+/* 38E744 E008C944 1040000B */  beqz      $v0, .LE008C974
+/* 38E748 E008C948 00000000 */   nop
+/* 38E74C E008C94C 4616C001 */  sub.s     $f0, $f24, $f22
+/* 38E750 E008C950 461A0002 */  mul.s     $f0, $f0, $f26
+/* 38E754 E008C954 00000000 */  nop
+/* 38E758 E008C958 46160003 */  div.s     $f0, $f0, $f22
+/* 38E75C E008C95C 4600D001 */  sub.s     $f0, $f26, $f0
+/* 38E760 E008C960 4406A000 */  mfc1      $a2, $f20
+/* 38E764 E008C964 4407A000 */  mfc1      $a3, $f20
+/* 38E768 E008C968 44050000 */  mfc1      $a1, $f0
+/* 38E76C E008C96C 08023260 */  j         .LE008C980
+/* 38E770 E008C970 00000000 */   nop
+.LE008C974:
+/* 38E774 E008C974 3C054000 */  lui       $a1, 0x4000
+/* 38E778 E008C978 4406A000 */  mfc1      $a2, $f20
+/* 38E77C E008C97C 4407A000 */  mfc1      $a3, $f20
+.LE008C980:
+/* 38E780 E008C980 0C080108 */  jal       shim_guTranslateF
+/* 38E784 E008C984 0240202D */   daddu    $a0, $s2, $zero
+/* 38E788 E008C988 0240202D */  daddu     $a0, $s2, $zero
+/* 38E78C E008C98C 27A50020 */  addiu     $a1, $sp, 0x20
+/* 38E790 E008C990 0C080114 */  jal       shim_guMtxCatF
+/* 38E794 E008C994 00A0302D */   daddu    $a2, $a1, $zero
+/* 38E798 E008C998 27A40020 */  addiu     $a0, $sp, 0x20
+/* 38E79C E008C99C 26D60001 */  addiu     $s6, $s6, 1
+/* 38E7A0 E008C9A0 8E630000 */  lw        $v1, ($s3)
+/* 38E7A4 E008C9A4 96A50000 */  lhu       $a1, ($s5)
+/* 38E7A8 E008C9A8 8EE20000 */  lw        $v0, ($s7)
+/* 38E7AC E008C9AC 0060382D */  daddu     $a3, $v1, $zero
+/* 38E7B0 E008C9B0 24630008 */  addiu     $v1, $v1, 8
+/* 38E7B4 E008C9B4 00052980 */  sll       $a1, $a1, 6
+/* 38E7B8 E008C9B8 00B42821 */  addu      $a1, $a1, $s4
+/* 38E7BC E008C9BC 00452821 */  addu      $a1, $v0, $a1
+/* 38E7C0 E008C9C0 3C02FA00 */  lui       $v0, 0xfa00
+/* 38E7C4 E008C9C4 AE630000 */  sw        $v1, ($s3)
+/* 38E7C8 E008C9C8 ACE20000 */  sw        $v0, ($a3)
+/* 38E7CC E008C9CC 9203FFFE */  lbu       $v1, -2($s0)
+/* 38E7D0 E008C9D0 9202FFFF */  lbu       $v0, -1($s0)
+/* 38E7D4 E008C9D4 92060000 */  lbu       $a2, ($s0)
+/* 38E7D8 E008C9D8 26100048 */  addiu     $s0, $s0, 0x48
+/* 38E7DC E008C9DC 8FA800A4 */  lw        $t0, 0xa4($sp)
+/* 38E7E0 E008C9E0 00031E00 */  sll       $v1, $v1, 0x18
+/* 38E7E4 E008C9E4 00021400 */  sll       $v0, $v0, 0x10
+/* 38E7E8 E008C9E8 00621825 */  or        $v1, $v1, $v0
+/* 38E7EC E008C9EC 00063200 */  sll       $a2, $a2, 8
+/* 38E7F0 E008C9F0 00661825 */  or        $v1, $v1, $a2
+/* 38E7F4 E008C9F4 310200FF */  andi      $v0, $t0, 0xff
+/* 38E7F8 E008C9F8 00621825 */  or        $v1, $v1, $v0
+/* 38E7FC E008C9FC 0C080118 */  jal       shim_guMtxF2L
+/* 38E800 E008CA00 ACE30004 */   sw       $v1, 4($a3)
+/* 38E804 E008CA04 3C06D838 */  lui       $a2, 0xd838
+/* 38E808 E008CA08 8E640000 */  lw        $a0, ($s3)
+/* 38E80C E008CA0C 34C60002 */  ori       $a2, $a2, 2
+/* 38E810 E008CA10 0080282D */  daddu     $a1, $a0, $zero
+/* 38E814 E008CA14 24840008 */  addiu     $a0, $a0, 8
+/* 38E818 E008CA18 AE640000 */  sw        $a0, ($s3)
+/* 38E81C E008CA1C 96A20000 */  lhu       $v0, ($s5)
+/* 38E820 E008CA20 3C03DA38 */  lui       $v1, 0xda38
+/* 38E824 E008CA24 ACA30000 */  sw        $v1, ($a1)
+/* 38E828 E008CA28 24430001 */  addiu     $v1, $v0, 1
+/* 38E82C E008CA2C 3042FFFF */  andi      $v0, $v0, 0xffff
+/* 38E830 E008CA30 00021180 */  sll       $v0, $v0, 6
+/* 38E834 E008CA34 A6A30000 */  sh        $v1, ($s5)
+/* 38E838 E008CA38 8EE30000 */  lw        $v1, ($s7)
+/* 38E83C E008CA3C 00541021 */  addu      $v0, $v0, $s4
+/* 38E840 E008CA40 00621821 */  addu      $v1, $v1, $v0
+/* 38E844 E008CA44 24820008 */  addiu     $v0, $a0, 8
+/* 38E848 E008CA48 ACA30004 */  sw        $v1, 4($a1)
+/* 38E84C E008CA4C AE620000 */  sw        $v0, ($s3)
+/* 38E850 E008CA50 3C02DE00 */  lui       $v0, 0xde00
+/* 38E854 E008CA54 AC820000 */  sw        $v0, ($a0)
+/* 38E858 E008CA58 3C020900 */  lui       $v0, 0x900
+/* 38E85C E008CA5C 244203A0 */  addiu     $v0, $v0, 0x3a0
+/* 38E860 E008CA60 AC820004 */  sw        $v0, 4($a0)
+/* 38E864 E008CA64 24020040 */  addiu     $v0, $zero, 0x40
+/* 38E868 E008CA68 AC860008 */  sw        $a2, 8($a0)
+/* 38E86C E008CA6C AC82000C */  sw        $v0, 0xc($a0)
+/* 38E870 E008CA70 8FC20008 */  lw        $v0, 8($fp)
+/* 38E874 E008CA74 24840010 */  addiu     $a0, $a0, 0x10
+/* 38E878 E008CA78 02C2102A */  slt       $v0, $s6, $v0
+/* 38E87C E008CA7C 1440FF96 */  bnez      $v0, .LE008C8D8
+/* 38E880 E008CA80 AE640000 */   sw       $a0, ($s3)
+.LE008CA84:
+/* 38E884 E008CA84 3C05D838 */  lui       $a1, 0xd838
+/* 38E888 E008CA88 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
+/* 38E88C E008CA8C 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
+/* 38E890 E008CA90 8C620000 */  lw        $v0, ($v1)
+/* 38E894 E008CA94 34A50002 */  ori       $a1, $a1, 2
+/* 38E898 E008CA98 0040202D */  daddu     $a0, $v0, $zero
+/* 38E89C E008CA9C 24420008 */  addiu     $v0, $v0, 8
+/* 38E8A0 E008CAA0 AC620000 */  sw        $v0, ($v1)
+/* 38E8A4 E008CAA4 24020040 */  addiu     $v0, $zero, 0x40
+/* 38E8A8 E008CAA8 AC850000 */  sw        $a1, ($a0)
+/* 38E8AC E008CAAC AC820004 */  sw        $v0, 4($a0)
+/* 38E8B0 E008CAB0 8FBF00CC */  lw        $ra, 0xcc($sp)
+/* 38E8B4 E008CAB4 8FBE00C8 */  lw        $fp, 0xc8($sp)
+/* 38E8B8 E008CAB8 8FB700C4 */  lw        $s7, 0xc4($sp)
+/* 38E8BC E008CABC 8FB600C0 */  lw        $s6, 0xc0($sp)
+/* 38E8C0 E008CAC0 8FB500BC */  lw        $s5, 0xbc($sp)
+/* 38E8C4 E008CAC4 8FB400B8 */  lw        $s4, 0xb8($sp)
+/* 38E8C8 E008CAC8 8FB300B4 */  lw        $s3, 0xb4($sp)
+/* 38E8CC E008CACC 8FB200B0 */  lw        $s2, 0xb0($sp)
+/* 38E8D0 E008CAD0 8FB100AC */  lw        $s1, 0xac($sp)
+/* 38E8D4 E008CAD4 8FB000A8 */  lw        $s0, 0xa8($sp)
+/* 38E8D8 E008CAD8 D7BA00E8 */  ldc1      $f26, 0xe8($sp)
+/* 38E8DC E008CADC D7B800E0 */  ldc1      $f24, 0xe0($sp)
+/* 38E8E0 E008CAE0 D7B600D8 */  ldc1      $f22, 0xd8($sp)
+/* 38E8E4 E008CAE4 D7B400D0 */  ldc1      $f20, 0xd0($sp)
+/* 38E8E8 E008CAE8 03E00008 */  jr        $ra
+/* 38E8EC E008CAEC 27BD00F0 */   addiu    $sp, $sp, 0xf0
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 eca85a356e..e7fe7ce1ae 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
@@ -2,101 +2,265 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_46_main
-/* 360F40 E005C000 27BDFFA0 */  addiu     $sp, $sp, -0x60
-/* 360F44 E005C004 F7B40048 */  sdc1      $f20, 0x48($sp)
-/* 360F48 E005C008 4485A000 */  mtc1      $a1, $f20
-/* 360F4C E005C00C F7B60050 */  sdc1      $f22, 0x50($sp)
-/* 360F50 E005C010 4486B000 */  mtc1      $a2, $f22
-/* 360F54 E005C014 AFB5003C */  sw        $s5, 0x3c($sp)
-/* 360F58 E005C018 0080A82D */  daddu     $s5, $a0, $zero
-/* 360F5C E005C01C F7B80058 */  sdc1      $f24, 0x58($sp)
-/* 360F60 E005C020 4487C000 */  mtc1      $a3, $f24
-/* 360F64 E005C024 27A40010 */  addiu     $a0, $sp, 0x10
-/* 360F68 E005C028 AFB40038 */  sw        $s4, 0x38($sp)
-/* 360F6C E005C02C 8FB40074 */  lw        $s4, 0x74($sp)
-/* 360F70 E005C030 3C02E006 */  lui       $v0, %hi(fx_46_init)
-/* 360F74 E005C034 2442C178 */  addiu     $v0, $v0, %lo(fx_46_init)
-/* 360F78 E005C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 360F7C E005C03C 3C02E006 */  lui       $v0, %hi(fx_46_update)
-/* 360F80 E005C040 2442C180 */  addiu     $v0, $v0, %lo(fx_46_update)
-/* 360F84 E005C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 360F88 E005C048 3C02E006 */  lui       $v0, %hi(fx_46_render)
-/* 360F8C E005C04C 2442C2B4 */  addiu     $v0, $v0, %lo(fx_46_render)
-/* 360F90 E005C050 AFA20020 */  sw        $v0, 0x20($sp)
-/* 360F94 E005C054 2402002E */  addiu     $v0, $zero, 0x2e
-/* 360F98 E005C058 AFBF0040 */  sw        $ra, 0x40($sp)
-/* 360F9C E005C05C AFB30034 */  sw        $s3, 0x34($sp)
-/* 360FA0 E005C060 AFB20030 */  sw        $s2, 0x30($sp)
-/* 360FA4 E005C064 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 360FA8 E005C068 AFB00028 */  sw        $s0, 0x28($sp)
-/* 360FAC E005C06C AFA00010 */  sw        $zero, 0x10($sp)
-/* 360FB0 E005C070 AFA00024 */  sw        $zero, 0x24($sp)
-/* 360FB4 E005C074 0C080124 */  jal       shim_create_effect_instance
-/* 360FB8 E005C078 AFA20014 */   sw       $v0, 0x14($sp)
-/* 360FBC E005C07C 24040068 */  addiu     $a0, $zero, 0x68
-/* 360FC0 E005C080 24130002 */  addiu     $s3, $zero, 2
-/* 360FC4 E005C084 0040802D */  daddu     $s0, $v0, $zero
-/* 360FC8 E005C088 0C08012C */  jal       shim_general_heap_malloc
-/* 360FCC E005C08C AE130008 */   sw       $s3, 8($s0)
-/* 360FD0 E005C090 0040882D */  daddu     $s1, $v0, $zero
-/* 360FD4 E005C094 16200003 */  bnez      $s1, .LE005C0A4
-/* 360FD8 E005C098 AE11000C */   sw       $s1, 0xc($s0)
-.LE005C09C:
-/* 360FDC E005C09C 08017027 */  j         .LE005C09C
-/* 360FE0 E005C0A0 00000000 */   nop
-.LE005C0A4:
-/* 360FE4 E005C0A4 0220202D */  daddu     $a0, $s1, $zero
-/* 360FE8 E005C0A8 00132840 */  sll       $a1, $s3, 1
-/* 360FEC E005C0AC 00B32821 */  addu      $a1, $a1, $s3
-/* 360FF0 E005C0B0 00052880 */  sll       $a1, $a1, 2
-/* 360FF4 E005C0B4 00B32821 */  addu      $a1, $a1, $s3
-/* 360FF8 E005C0B8 0C080130 */  jal       shim_mem_clear
-/* 360FFC E005C0BC 00052880 */   sll      $a1, $a1, 2
-/* 361000 E005C0C0 24120001 */  addiu     $s2, $zero, 1
-/* 361004 E005C0C4 3C014120 */  lui       $at, 0x4120
-/* 361008 E005C0C8 44810000 */  mtc1      $at, $f0
-/* 36100C E005C0CC 3C0141F0 */  lui       $at, 0x41f0
-/* 361010 E005C0D0 44811000 */  mtc1      $at, $f2
-/* 361014 E005C0D4 0253102A */  slt       $v0, $s2, $s3
-/* 361018 E005C0D8 AE340024 */  sw        $s4, 0x24($s1)
-/* 36101C E005C0DC AE200028 */  sw        $zero, 0x28($s1)
-/* 361020 E005C0E0 AE34002C */  sw        $s4, 0x2c($s1)
-/* 361024 E005C0E4 AE200030 */  sw        $zero, 0x30($s1)
-/* 361028 E005C0E8 A6350000 */  sh        $s5, ($s1)
-/* 36102C E005C0EC E6340004 */  swc1      $f20, 4($s1)
-/* 361030 E005C0F0 E6360008 */  swc1      $f22, 8($s1)
-/* 361034 E005C0F4 E638000C */  swc1      $f24, 0xc($s1)
-/* 361038 E005C0F8 E620001C */  swc1      $f0, 0x1c($s1)
-/* 36103C E005C0FC E6220020 */  swc1      $f2, 0x20($s1)
-/* 361040 E005C100 10400011 */  beqz      $v0, .LE005C148
-/* 361044 E005C104 26310034 */   addiu    $s1, $s1, 0x34
-/* 361048 E005C108 4480A000 */  mtc1      $zero, $f20
-/* 36104C E005C10C 26300018 */  addiu     $s0, $s1, 0x18
-.LE005C110:
-/* 361050 E005C110 4600A306 */  mov.s     $f12, $f20
-/* 361054 E005C114 E614FFEC */  swc1      $f20, -0x14($s0)
-/* 361058 E005C118 E614FFF0 */  swc1      $f20, -0x10($s0)
-/* 36105C E005C11C 0C080140 */  jal       shim_sin_deg
-/* 361060 E005C120 E614FFF4 */   swc1     $f20, -0xc($s0)
-/* 361064 E005C124 4600A306 */  mov.s     $f12, $f20
-/* 361068 E005C128 E600FFF8 */  swc1      $f0, -8($s0)
-/* 36106C E005C12C 0C080144 */  jal       shim_cos_deg
-/* 361070 E005C130 E614FFFC */   swc1     $f20, -4($s0)
-/* 361074 E005C134 26520001 */  addiu     $s2, $s2, 1
-/* 361078 E005C138 E6000000 */  swc1      $f0, ($s0)
-/* 36107C E005C13C 0253102A */  slt       $v0, $s2, $s3
-/* 361080 E005C140 1440FFF3 */  bnez      $v0, .LE005C110
-/* 361084 E005C144 26100034 */   addiu    $s0, $s0, 0x34
-.LE005C148:
-/* 361088 E005C148 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 36108C E005C14C 8FB5003C */  lw        $s5, 0x3c($sp)
-/* 361090 E005C150 8FB40038 */  lw        $s4, 0x38($sp)
-/* 361094 E005C154 8FB30034 */  lw        $s3, 0x34($sp)
-/* 361098 E005C158 8FB20030 */  lw        $s2, 0x30($sp)
-/* 36109C E005C15C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 3610A0 E005C160 8FB00028 */  lw        $s0, 0x28($sp)
-/* 3610A4 E005C164 D7B80058 */  ldc1      $f24, 0x58($sp)
-/* 3610A8 E005C168 D7B60050 */  ldc1      $f22, 0x50($sp)
-/* 3610AC E005C16C D7B40048 */  ldc1      $f20, 0x48($sp)
-/* 3610B0 E005C170 03E00008 */  jr        $ra
-/* 3610B4 E005C174 27BD0060 */   addiu    $sp, $sp, 0x60
+/* 38DE00 E008C000 27BDFF90 */  addiu     $sp, $sp, -0x70
+/* 38DE04 E008C004 AFB00038 */  sw        $s0, 0x38($sp)
+/* 38DE08 E008C008 00E0802D */  daddu     $s0, $a3, $zero
+/* 38DE0C E008C00C AFA40070 */  sw        $a0, 0x70($sp)
+/* 38DE10 E008C010 27A40010 */  addiu     $a0, $sp, 0x10
+/* 38DE14 E008C014 F7B40060 */  sdc1      $f20, 0x60($sp)
+/* 38DE18 E008C018 4486A000 */  mtc1      $a2, $f20
+/* 38DE1C E008C01C 3C02E009 */  lui       $v0, %hi(fx_46_init)
+/* 38DE20 E008C020 2442C3F4 */  addiu     $v0, $v0, %lo(fx_46_init)
+/* 38DE24 E008C024 AFA20018 */  sw        $v0, 0x18($sp)
+/* 38DE28 E008C028 3C02E009 */  lui       $v0, %hi(fx_46_update)
+/* 38DE2C E008C02C 2442C3FC */  addiu     $v0, $v0, %lo(fx_46_update)
+/* 38DE30 E008C030 AFA2001C */  sw        $v0, 0x1c($sp)
+/* 38DE34 E008C034 3C02E009 */  lui       $v0, %hi(fx_46_render)
+/* 38DE38 E008C038 2442C6B8 */  addiu     $v0, $v0, %lo(fx_46_render)
+/* 38DE3C E008C03C AFA20020 */  sw        $v0, 0x20($sp)
+/* 38DE40 E008C040 24020046 */  addiu     $v0, $zero, 0x46
+/* 38DE44 E008C044 AFBF005C */  sw        $ra, 0x5c($sp)
+/* 38DE48 E008C048 AFBE0058 */  sw        $fp, 0x58($sp)
+/* 38DE4C E008C04C AFB70054 */  sw        $s7, 0x54($sp)
+/* 38DE50 E008C050 AFB60050 */  sw        $s6, 0x50($sp)
+/* 38DE54 E008C054 AFB5004C */  sw        $s5, 0x4c($sp)
+/* 38DE58 E008C058 AFB40048 */  sw        $s4, 0x48($sp)
+/* 38DE5C E008C05C AFB30044 */  sw        $s3, 0x44($sp)
+/* 38DE60 E008C060 AFB20040 */  sw        $s2, 0x40($sp)
+/* 38DE64 E008C064 AFB1003C */  sw        $s1, 0x3c($sp)
+/* 38DE68 E008C068 F7B60068 */  sdc1      $f22, 0x68($sp)
+/* 38DE6C E008C06C AFA50074 */  sw        $a1, 0x74($sp)
+/* 38DE70 E008C070 AFA00010 */  sw        $zero, 0x10($sp)
+/* 38DE74 E008C074 AFA00024 */  sw        $zero, 0x24($sp)
+/* 38DE78 E008C078 0C080124 */  jal       shim_create_effect_instance
+/* 38DE7C E008C07C AFA20014 */   sw       $v0, 0x14($sp)
+/* 38DE80 E008C080 24040168 */  addiu     $a0, $zero, 0x168
+/* 38DE84 E008C084 AFA20028 */  sw        $v0, 0x28($sp)
+/* 38DE88 E008C088 24080005 */  addiu     $t0, $zero, 5
+/* 38DE8C E008C08C 0C08012C */  jal       shim_general_heap_malloc
+/* 38DE90 E008C090 AC480008 */   sw       $t0, 8($v0)
+/* 38DE94 E008C094 8FA90028 */  lw        $t1, 0x28($sp)
+/* 38DE98 E008C098 0040202D */  daddu     $a0, $v0, $zero
+/* 38DE9C E008C09C 14800003 */  bnez      $a0, .LE008C0AC
+/* 38DEA0 E008C0A0 AD24000C */   sw       $a0, 0xc($t1)
+.LE008C0A4:
+/* 38DEA4 E008C0A4 08023029 */  j         .LE008C0A4
+/* 38DEA8 E008C0A8 00000000 */   nop
+.LE008C0AC:
+/* 38DEAC E008C0AC 4600A0A1 */  cvt.d.s   $f2, $f20
+/* 38DEB0 E008C0B0 24110001 */  addiu     $s1, $zero, 1
+/* 38DEB4 E008C0B4 3C01E009 */  lui       $at, %hi(D_E008CB20)
+/* 38DEB8 E008C0B8 D420CB20 */  ldc1      $f0, %lo(D_E008CB20)($at)
+/* 38DEBC E008C0BC 8FA80070 */  lw        $t0, 0x70($sp)
+/* 38DEC0 E008C0C0 46201082 */  mul.d     $f2, $f2, $f0
+/* 38DEC4 E008C0C4 00000000 */  nop
+/* 38DEC8 E008C0C8 AC880000 */  sw        $t0, ($a0)
+/* 38DECC E008C0CC 8FA90074 */  lw        $t1, 0x74($sp)
+/* 38DED0 E008C0D0 2A220005 */  slti      $v0, $s1, 5
+/* 38DED4 E008C0D4 AC900020 */  sw        $s0, 0x20($a0)
+/* 38DED8 E008C0D8 AC900024 */  sw        $s0, 0x24($a0)
+/* 38DEDC E008C0DC AC80001C */  sw        $zero, 0x1c($a0)
+/* 38DEE0 E008C0E0 AC800028 */  sw        $zero, 0x28($a0)
+/* 38DEE4 E008C0E4 AC890004 */  sw        $t1, 4($a0)
+/* 38DEE8 E008C0E8 462010A0 */  cvt.s.d   $f2, $f2
+/* 38DEEC E008C0EC E4820014 */  swc1      $f2, 0x14($a0)
+/* 38DEF0 E008C0F0 E4820018 */  swc1      $f2, 0x18($a0)
+/* 38DEF4 E008C0F4 104000B0 */  beqz      $v0, .LE008C3B8
+/* 38DEF8 E008C0F8 24840048 */   addiu    $a0, $a0, 0x48
+/* 38DEFC E008C0FC 3C03E009 */  lui       $v1, %hi(D_E008CB28)
+/* 38DF00 E008C100 2463CB28 */  addiu     $v1, $v1, %lo(D_E008CB28)
+/* 38DF04 E008C104 00081080 */  sll       $v0, $t0, 2
+/* 38DF08 E008C108 00431021 */  addu      $v0, $v0, $v1
+/* 38DF0C E008C10C 24080005 */  addiu     $t0, $zero, 5
+/* 38DF10 E008C110 2517FFFF */  addiu     $s7, $t0, -1
+/* 38DF14 E008C114 3C03E009 */  lui       $v1, %hi(D_E008CB48)
+/* 38DF18 E008C118 2463CB48 */  addiu     $v1, $v1, %lo(D_E008CB48)
+/* 38DF1C E008C11C 24900046 */  addiu     $s0, $a0, 0x46
+/* 38DF20 E008C120 24160026 */  addiu     $s6, $zero, 0x26
+/* 38DF24 E008C124 0000A02D */  daddu     $s4, $zero, $zero
+/* 38DF28 E008C128 24150019 */  addiu     $s5, $zero, 0x19
+/* 38DF2C E008C12C 24130078 */  addiu     $s3, $zero, 0x78
+/* 38DF30 E008C130 8FA90070 */  lw        $t1, 0x70($sp)
+/* 38DF34 E008C134 3C013F80 */  lui       $at, 0x3f80
+/* 38DF38 E008C138 4481B000 */  mtc1      $at, $f22
+/* 38DF3C E008C13C 3C013FE0 */  lui       $at, 0x3fe0
+/* 38DF40 E008C140 4481A800 */  mtc1      $at, $f21
+/* 38DF44 E008C144 4480A000 */  mtc1      $zero, $f20
+/* 38DF48 E008C148 2412000B */  addiu     $s2, $zero, 0xb
+/* 38DF4C E008C14C AFA2002C */  sw        $v0, 0x2c($sp)
+/* 38DF50 E008C150 253EFFFE */  addiu     $fp, $t1, -2
+/* 38DF54 E008C154 001E1080 */  sll       $v0, $fp, 2
+/* 38DF58 E008C158 00431021 */  addu      $v0, $v0, $v1
+/* 38DF5C E008C15C AFA20030 */  sw        $v0, 0x30($sp)
+.LE008C160:
+/* 38DF60 E008C160 8FA80070 */  lw        $t0, 0x70($sp)
+/* 38DF64 E008C164 2D020008 */  sltiu     $v0, $t0, 8
+/* 38DF68 E008C168 50400030 */  beql      $v0, $zero, .LE008C22C
+/* 38DF6C E008C16C AE00FFC2 */   sw       $zero, -0x3e($s0)
+/* 38DF70 E008C170 8FA9002C */  lw        $t1, 0x2c($sp)
+/* 38DF74 E008C174 8D220000 */  lw        $v0, ($t1)
+/* 38DF78 E008C178 00400008 */  jr        $v0
+/* 38DF7C E008C17C 00000000 */   nop
+/* 38DF80 E008C180 3C014270 */  lui       $at, 0x4270
+/* 38DF84 E008C184 44811000 */  mtc1      $at, $f2
+/* 38DF88 E008C188 44920000 */  mtc1      $s2, $f0
+/* 38DF8C E008C18C 00000000 */  nop
+/* 38DF90 E008C190 46800020 */  cvt.s.w   $f0, $f0
+/* 38DF94 E008C194 E600FFC6 */  swc1      $f0, -0x3a($s0)
+/* 38DF98 E008C198 44930000 */  mtc1      $s3, $f0
+/* 38DF9C E008C19C 00000000 */  nop
+/* 38DFA0 E008C1A0 46800020 */  cvt.s.w   $f0, $f0
+/* 38DFA4 E008C1A4 AE00FFC2 */  sw        $zero, -0x3e($s0)
+/* 38DFA8 E008C1A8 AE00FFCA */  sw        $zero, -0x36($s0)
+/* 38DFAC E008C1AC AE00FFF2 */  sw        $zero, -0xe($s0)
+/* 38DFB0 E008C1B0 AE00FFFA */  sw        $zero, -6($s0)
+/* 38DFB4 E008C1B4 AE00FFE6 */  sw        $zero, -0x1a($s0)
+/* 38DFB8 E008C1B8 E600FFEA */  swc1      $f0, -0x16($s0)
+/* 38DFBC E008C1BC AE00FFEE */  sw        $zero, -0x12($s0)
+/* 38DFC0 E008C1C0 E616FFCE */  swc1      $f22, -0x32($s0)
+/* 38DFC4 E008C1C4 080230CC */  j         .LE008C330
+/* 38DFC8 E008C1C8 E602FFF6 */   swc1     $f2, -0xa($s0)
+/* 38DFCC E008C1CC 44920000 */  mtc1      $s2, $f0
+/* 38DFD0 E008C1D0 00000000 */  nop
+/* 38DFD4 E008C1D4 46800020 */  cvt.s.w   $f0, $f0
+/* 38DFD8 E008C1D8 E600FFC6 */  swc1      $f0, -0x3a($s0)
+/* 38DFDC E008C1DC 44930000 */  mtc1      $s3, $f0
+/* 38DFE0 E008C1E0 00000000 */  nop
+/* 38DFE4 E008C1E4 46800020 */  cvt.s.w   $f0, $f0
+/* 38DFE8 E008C1E8 240800FF */  addiu     $t0, $zero, 0xff
+/* 38DFEC E008C1EC 3C01C270 */  lui       $at, 0xc270
+/* 38DFF0 E008C1F0 44811000 */  mtc1      $at, $f2
+/* 38DFF4 E008C1F4 0100482D */  daddu     $t1, $t0, $zero
+/* 38DFF8 E008C1F8 AE00FFC2 */  sw        $zero, -0x3e($s0)
+/* 38DFFC E008C1FC AE00FFCA */  sw        $zero, -0x36($s0)
+/* 38E000 E008C200 AE00FFF2 */  sw        $zero, -0xe($s0)
+/* 38E004 E008C204 AE00FFFA */  sw        $zero, -6($s0)
+/* 38E008 E008C208 AE00FFE6 */  sw        $zero, -0x1a($s0)
+/* 38E00C E008C20C E600FFEA */  swc1      $f0, -0x16($s0)
+/* 38E010 E008C210 AE00FFEE */  sw        $zero, -0x12($s0)
+/* 38E014 E008C214 E616FFCE */  swc1      $f22, -0x32($s0)
+/* 38E018 E008C218 A2080000 */  sb        $t0, ($s0)
+/* 38E01C E008C21C A209FFFF */  sb        $t1, -1($s0)
+/* 38E020 E008C220 A208FFFE */  sb        $t0, -2($s0)
+/* 38E024 E008C224 080230CC */  j         .LE008C330
+/* 38E028 E008C228 E602FFF6 */   swc1     $f2, -0xa($s0)
+.LE008C22C:
+/* 38E02C E008C22C 8FA90074 */  lw        $t1, 0x74($sp)
+/* 38E030 E008C230 852200B0 */  lh        $v0, 0xb0($t1)
+/* 38E034 E008C234 44820000 */  mtc1      $v0, $f0
+/* 38E038 E008C238 00000000 */  nop
+/* 38E03C E008C23C 46800021 */  cvt.d.w   $f0, $f0
+/* 38E040 E008C240 46340002 */  mul.d     $f0, $f0, $f20
+/* 38E044 E008C244 00000000 */  nop
+/* 38E048 E008C248 24040001 */  addiu     $a0, $zero, 1
+/* 38E04C E008C24C AE00FFCA */  sw        $zero, -0x36($s0)
+/* 38E050 E008C250 46200020 */  cvt.s.d   $f0, $f0
+/* 38E054 E008C254 0C080000 */  jal       func_E0200000
+/* 38E058 E008C258 E600FFC6 */   swc1     $f0, -0x3a($s0)
+/* 38E05C E008C25C 24040001 */  addiu     $a0, $zero, 1
+/* 38E060 E008C260 000210C0 */  sll       $v0, $v0, 3
+/* 38E064 E008C264 2442FFFC */  addiu     $v0, $v0, -4
+/* 38E068 E008C268 44820000 */  mtc1      $v0, $f0
+/* 38E06C E008C26C 00000000 */  nop
+/* 38E070 E008C270 46800020 */  cvt.s.w   $f0, $f0
+/* 38E074 E008C274 E600FFF2 */  swc1      $f0, -0xe($s0)
+/* 38E078 E008C278 0C080000 */  jal       func_E0200000
+/* 38E07C E008C27C AE00FFF6 */   sw       $zero, -0xa($s0)
+/* 38E080 E008C280 16E00002 */  bnez      $s7, .LE008C28C
+/* 38E084 E008C284 0297001A */   div      $zero, $s4, $s7
+/* 38E088 E008C288 0007000D */  break     7
+.LE008C28C:
+/* 38E08C E008C28C 2401FFFF */   addiu    $at, $zero, -1
+/* 38E090 E008C290 16E10004 */  bne       $s7, $at, .LE008C2A4
+/* 38E094 E008C294 3C018000 */   lui      $at, 0x8000
+/* 38E098 E008C298 16810002 */  bne       $s4, $at, .LE008C2A4
+/* 38E09C E008C29C 00000000 */   nop
+/* 38E0A0 E008C2A0 0006000D */  break     6
+.LE008C2A4:
+/* 38E0A4 E008C2A4 00002012 */   mflo     $a0
+/* 38E0A8 E008C2A8 000210C0 */  sll       $v0, $v0, 3
+/* 38E0AC E008C2AC 2623FFFF */  addiu     $v1, $s1, -1
+/* 38E0B0 E008C2B0 44830000 */  mtc1      $v1, $f0
+/* 38E0B4 E008C2B4 00000000 */  nop
+/* 38E0B8 E008C2B8 46800020 */  cvt.s.w   $f0, $f0
+/* 38E0BC E008C2BC 44971000 */  mtc1      $s7, $f2
+/* 38E0C0 E008C2C0 00000000 */  nop
+/* 38E0C4 E008C2C4 468010A0 */  cvt.s.w   $f2, $f2
+/* 38E0C8 E008C2C8 46020003 */  div.s     $f0, $f0, $f2
+/* 38E0CC E008C2CC 46000021 */  cvt.d.s   $f0, $f0
+/* 38E0D0 E008C2D0 46340002 */  mul.d     $f0, $f0, $f20
+/* 38E0D4 E008C2D4 00000000 */  nop
+/* 38E0D8 E008C2D8 2442FFFC */  addiu     $v0, $v0, -4
+/* 38E0DC E008C2DC 44821000 */  mtc1      $v0, $f2
+/* 38E0E0 E008C2E0 00000000 */  nop
+/* 38E0E4 E008C2E4 468010A0 */  cvt.s.w   $f2, $f2
+/* 38E0E8 E008C2E8 E602FFFA */  swc1      $f2, -6($s0)
+/* 38E0EC E008C2EC 44951000 */  mtc1      $s5, $f2
+/* 38E0F0 E008C2F0 00000000 */  nop
+/* 38E0F4 E008C2F4 468010A0 */  cvt.s.w   $f2, $f2
+/* 38E0F8 E008C2F8 24020168 */  addiu     $v0, $zero, 0x168
+/* 38E0FC E008C2FC 00561023 */  subu      $v0, $v0, $s6
+/* 38E100 E008C300 E602FFE6 */  swc1      $f2, -0x1a($s0)
+/* 38E104 E008C304 46340000 */  add.d     $f0, $f0, $f20
+/* 38E108 E008C308 44821000 */  mtc1      $v0, $f2
+/* 38E10C E008C30C 00000000 */  nop
+/* 38E110 E008C310 468010A0 */  cvt.s.w   $f2, $f2
+/* 38E114 E008C314 E602FFEE */  swc1      $f2, -0x12($s0)
+/* 38E118 E008C318 46200020 */  cvt.s.d   $f0, $f0
+/* 38E11C E008C31C E600FFCE */  swc1      $f0, -0x32($s0)
+/* 38E120 E008C320 44840000 */  mtc1      $a0, $f0
+/* 38E124 E008C324 00000000 */  nop
+/* 38E128 E008C328 46800020 */  cvt.s.w   $f0, $f0
+/* 38E12C E008C32C E600FFEA */  swc1      $f0, -0x16($s0)
+.LE008C330:
+/* 38E130 E008C330 2FC20006 */  sltiu     $v0, $fp, 6
+/* 38E134 E008C334 1040000B */  beqz      $v0, .LE008C364
+/* 38E138 E008C338 0000182D */   daddu    $v1, $zero, $zero
+/* 38E13C E008C33C 8FA80030 */  lw        $t0, 0x30($sp)
+/* 38E140 E008C340 8D020000 */  lw        $v0, ($t0)
+/* 38E144 E008C344 00400008 */  jr        $v0
+/* 38E148 E008C348 00000000 */   nop
+/* 38E14C E008C34C 080230D9 */  j         .LE008C364
+/* 38E150 E008C350 24030001 */   addiu    $v1, $zero, 1
+/* 38E154 E008C354 080230D9 */  j         .LE008C364
+/* 38E158 E008C358 24030002 */   addiu    $v1, $zero, 2
+/* 38E15C E008C35C 32220001 */  andi      $v0, $s1, 1
+/* 38E160 E008C360 24430001 */  addiu     $v1, $v0, 1
+.LE008C364:
+/* 38E164 E008C364 26D60026 */  addiu     $s6, $s6, 0x26
+/* 38E168 E008C368 26940168 */  addiu     $s4, $s4, 0x168
+/* 38E16C E008C36C 26B50019 */  addiu     $s5, $s5, 0x19
+/* 38E170 E008C370 3C02E009 */  lui       $v0, %hi(D_E008CB14)
+/* 38E174 E008C374 00431021 */  addu      $v0, $v0, $v1
+/* 38E178 E008C378 9042CB14 */  lbu       $v0, %lo(D_E008CB14)($v0)
+/* 38E17C E008C37C 26730078 */  addiu     $s3, $s3, 0x78
+/* 38E180 E008C380 A202FFFE */  sb        $v0, -2($s0)
+/* 38E184 E008C384 3C02E009 */  lui       $v0, %hi(D_E008CB18)
+/* 38E188 E008C388 00431021 */  addu      $v0, $v0, $v1
+/* 38E18C E008C38C 9042CB18 */  lbu       $v0, %lo(D_E008CB18)($v0)
+/* 38E190 E008C390 26520007 */  addiu     $s2, $s2, 7
+/* 38E194 E008C394 A202FFFF */  sb        $v0, -1($s0)
+/* 38E198 E008C398 3C02E009 */  lui       $v0, %hi(D_E008CB1C)
+/* 38E19C E008C39C 00431021 */  addu      $v0, $v0, $v1
+/* 38E1A0 E008C3A0 9042CB1C */  lbu       $v0, %lo(D_E008CB1C)($v0)
+/* 38E1A4 E008C3A4 26310001 */  addiu     $s1, $s1, 1
+/* 38E1A8 E008C3A8 A2020000 */  sb        $v0, ($s0)
+/* 38E1AC E008C3AC 2A220005 */  slti      $v0, $s1, 5
+/* 38E1B0 E008C3B0 1440FF6B */  bnez      $v0, .LE008C160
+/* 38E1B4 E008C3B4 26100048 */   addiu    $s0, $s0, 0x48
+.LE008C3B8:
+/* 38E1B8 E008C3B8 8FA20028 */  lw        $v0, 0x28($sp)
+/* 38E1BC E008C3BC 8FBF005C */  lw        $ra, 0x5c($sp)
+/* 38E1C0 E008C3C0 8FBE0058 */  lw        $fp, 0x58($sp)
+/* 38E1C4 E008C3C4 8FB70054 */  lw        $s7, 0x54($sp)
+/* 38E1C8 E008C3C8 8FB60050 */  lw        $s6, 0x50($sp)
+/* 38E1CC E008C3CC 8FB5004C */  lw        $s5, 0x4c($sp)
+/* 38E1D0 E008C3D0 8FB40048 */  lw        $s4, 0x48($sp)
+/* 38E1D4 E008C3D4 8FB30044 */  lw        $s3, 0x44($sp)
+/* 38E1D8 E008C3D8 8FB20040 */  lw        $s2, 0x40($sp)
+/* 38E1DC E008C3DC 8FB1003C */  lw        $s1, 0x3c($sp)
+/* 38E1E0 E008C3E0 8FB00038 */  lw        $s0, 0x38($sp)
+/* 38E1E4 E008C3E4 D7B60068 */  ldc1      $f22, 0x68($sp)
+/* 38E1E8 E008C3E8 D7B40060 */  ldc1      $f20, 0x60($sp)
+/* 38E1EC E008C3EC 03E00008 */  jr        $ra
+/* 38E1F0 E008C3F0 27BD0070 */   addiu    $sp, $sp, 0x70
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 a14e1f57c6..31f1252a4c 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
@@ -2,83 +2,190 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_46_update
-/* 3610C0 E005C180 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 3610C4 E005C184 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 3610C8 E005C188 8C85000C */  lw        $a1, 0xc($a0)
-/* 3610CC E005C18C 3C0140E0 */  lui       $at, 0x40e0
-/* 3610D0 E005C190 44810000 */  mtc1      $at, $f0
-/* 3610D4 E005C194 8CA20028 */  lw        $v0, 0x28($a1)
-/* 3610D8 E005C198 8CA30024 */  lw        $v1, 0x24($a1)
-/* 3610DC E005C19C 44821000 */  mtc1      $v0, $f2
-/* 3610E0 E005C1A0 00000000 */  nop
-/* 3610E4 E005C1A4 468010A0 */  cvt.s.w   $f2, $f2
-/* 3610E8 E005C1A8 24420001 */  addiu     $v0, $v0, 1
-/* 3610EC E005C1AC 46001082 */  mul.s     $f2, $f2, $f0
-/* 3610F0 E005C1B0 00000000 */  nop
-/* 3610F4 E005C1B4 2463FFFF */  addiu     $v1, $v1, -1
-/* 3610F8 E005C1B8 C4A0002C */  lwc1      $f0, 0x2c($a1)
-/* 3610FC E005C1BC 46800020 */  cvt.s.w   $f0, $f0
-/* 361100 E005C1C0 ACA20028 */  sw        $v0, 0x28($a1)
-/* 361104 E005C1C4 ACA30024 */  sw        $v1, 0x24($a1)
-/* 361108 E005C1C8 46001083 */  div.s     $f2, $f2, $f0
-/* 36110C E005C1CC 04610005 */  bgez      $v1, .LE005C1E4
-/* 361110 E005C1D0 E4A20030 */   swc1     $f2, 0x30($a1)
-/* 361114 E005C1D4 0C080128 */  jal       shim_remove_effect
-/* 361118 E005C1D8 00000000 */   nop
-/* 36111C E005C1DC 080170AA */  j         .LE005C2A8
-/* 361120 E005C1E0 00000000 */   nop
-.LE005C1E4:
-/* 361124 E005C1E4 C4A2001C */  lwc1      $f2, 0x1c($a1)
-/* 361128 E005C1E8 C4A00020 */  lwc1      $f0, 0x20($a1)
-/* 36112C E005C1EC 46020001 */  sub.s     $f0, $f0, $f2
-/* 361130 E005C1F0 3C01E006 */  lui       $at, %hi(D_E005C710)
-/* 361134 E005C1F4 D424C710 */  ldc1      $f4, %lo(D_E005C710)($at)
-/* 361138 E005C1F8 46000021 */  cvt.d.s   $f0, $f0
-/* 36113C E005C1FC 46240002 */  mul.d     $f0, $f0, $f4
-/* 361140 E005C200 00000000 */  nop
-/* 361144 E005C204 460010A1 */  cvt.d.s   $f2, $f2
-/* 361148 E005C208 46201080 */  add.d     $f2, $f2, $f0
-/* 36114C E005C20C 24060001 */  addiu     $a2, $zero, 1
-/* 361150 E005C210 462010A0 */  cvt.s.d   $f2, $f2
-/* 361154 E005C214 E4A2001C */  swc1      $f2, 0x1c($a1)
-/* 361158 E005C218 24A50034 */  addiu     $a1, $a1, 0x34
-/* 36115C E005C21C 8C820008 */  lw        $v0, 8($a0)
-/* 361160 E005C220 00C2102A */  slt       $v0, $a2, $v0
-/* 361164 E005C224 10400020 */  beqz      $v0, .LE005C2A8
-/* 361168 E005C228 46001206 */   mov.s    $f8, $f2
-/* 36116C E005C22C 24A3000C */  addiu     $v1, $a1, 0xc
-/* 361170 E005C230 3C01E006 */  lui       $at, %hi(D_E005C718)
-/* 361174 E005C234 D42CC718 */  ldc1      $f12, %lo(D_E005C718)($at)
-/* 361178 E005C238 3C01E006 */  lui       $at, %hi(D_E005C720)
-/* 36117C E005C23C D42AC720 */  ldc1      $f10, %lo(D_E005C720)($at)
-.LE005C240:
-/* 361180 E005C240 C4600008 */  lwc1      $f0, 8($v1)
-/* 361184 E005C244 46000021 */  cvt.d.s   $f0, $f0
-/* 361188 E005C248 462C0000 */  add.d     $f0, $f0, $f12
-/* 36118C E005C24C 46200020 */  cvt.s.d   $f0, $f0
-/* 361190 E005C250 46000021 */  cvt.d.s   $f0, $f0
-/* 361194 E005C254 462A0002 */  mul.d     $f0, $f0, $f10
-/* 361198 E005C258 00000000 */  nop
-/* 36119C E005C25C C4660004 */  lwc1      $f6, 4($v1)
-/* 3611A0 E005C260 46064182 */  mul.s     $f6, $f8, $f6
-/* 3611A4 E005C264 00000000 */  nop
-/* 3611A8 E005C268 C464000C */  lwc1      $f4, 0xc($v1)
-/* 3611AC E005C26C 46044102 */  mul.s     $f4, $f8, $f4
-/* 3611B0 E005C270 00000000 */  nop
-/* 3611B4 E005C274 46200020 */  cvt.s.d   $f0, $f0
-/* 3611B8 E005C278 E4600008 */  swc1      $f0, 8($v1)
-/* 3611BC E005C27C C460FFFC */  lwc1      $f0, -4($v1)
-/* 3611C0 E005C280 C4620008 */  lwc1      $f2, 8($v1)
-/* 3611C4 E005C284 24C60001 */  addiu     $a2, $a2, 1
-/* 3611C8 E005C288 46020000 */  add.s     $f0, $f0, $f2
-/* 3611CC E005C28C E466FFF8 */  swc1      $f6, -8($v1)
-/* 3611D0 E005C290 E4640000 */  swc1      $f4, ($v1)
-/* 3611D4 E005C294 E460FFFC */  swc1      $f0, -4($v1)
-/* 3611D8 E005C298 8C820008 */  lw        $v0, 8($a0)
-/* 3611DC E005C29C 00C2102A */  slt       $v0, $a2, $v0
-/* 3611E0 E005C2A0 1440FFE7 */  bnez      $v0, .LE005C240
-/* 3611E4 E005C2A4 24630034 */   addiu    $v1, $v1, 0x34
-.LE005C2A8:
-/* 3611E8 E005C2A8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 3611EC E005C2AC 03E00008 */  jr        $ra
-/* 3611F0 E005C2B0 27BD0018 */   addiu    $sp, $sp, 0x18
+/* 38E1FC E008C3FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 38E200 E008C400 AFBF0010 */  sw        $ra, 0x10($sp)
+/* 38E204 E008C404 8C85000C */  lw        $a1, 0xc($a0)
+/* 38E208 E008C408 8CA20024 */  lw        $v0, 0x24($a1)
+/* 38E20C E008C40C 2442FFFF */  addiu     $v0, $v0, -1
+/* 38E210 E008C410 ACA20024 */  sw        $v0, 0x24($a1)
+/* 38E214 E008C414 8CA20028 */  lw        $v0, 0x28($a1)
+/* 38E218 E008C418 8CA30024 */  lw        $v1, 0x24($a1)
+/* 38E21C E008C41C 24420001 */  addiu     $v0, $v0, 1
+/* 38E220 E008C420 04610005 */  bgez      $v1, .LE008C438
+/* 38E224 E008C424 ACA20028 */   sw       $v0, 0x28($a1)
+/* 38E228 E008C428 0C080128 */  jal       shim_remove_effect
+/* 38E22C E008C42C 00000000 */   nop
+/* 38E230 E008C430 080231AB */  j         .LE008C6AC
+/* 38E234 E008C434 00000000 */   nop
+.LE008C438:
+/* 38E238 E008C438 8CA80000 */  lw        $t0, ($a1)
+/* 38E23C E008C43C 24020008 */  addiu     $v0, $zero, 8
+/* 38E240 E008C440 15020025 */  bne       $t0, $v0, .LE008C4D8
+/* 38E244 E008C444 0060382D */   daddu    $a3, $v1, $zero
+/* 38E248 E008C448 28E20006 */  slti      $v0, $a3, 6
+/* 38E24C E008C44C 14400010 */  bnez      $v0, .LE008C490
+/* 38E250 E008C450 240200FF */   addiu    $v0, $zero, 0xff
+/* 38E254 E008C454 8CA3001C */  lw        $v1, 0x1c($a1)
+/* 38E258 E008C458 3C01E009 */  lui       $at, %hi(D_E008CB60)
+/* 38E25C E008C45C D420CB60 */  ldc1      $f0, %lo(D_E008CB60)($at)
+/* 38E260 E008C460 00431023 */  subu      $v0, $v0, $v1
+/* 38E264 E008C464 44821000 */  mtc1      $v0, $f2
+/* 38E268 E008C468 00000000 */  nop
+/* 38E26C E008C46C 468010A1 */  cvt.d.w   $f2, $f2
+/* 38E270 E008C470 46201082 */  mul.d     $f2, $f2, $f0
+/* 38E274 E008C474 00000000 */  nop
+/* 38E278 E008C478 44830000 */  mtc1      $v1, $f0
+/* 38E27C E008C47C 00000000 */  nop
+/* 38E280 E008C480 46800021 */  cvt.d.w   $f0, $f0
+/* 38E284 E008C484 46220000 */  add.d     $f0, $f0, $f2
+/* 38E288 E008C488 4620040D */  trunc.w.d $f16, $f0
+/* 38E28C E008C48C E4B0001C */  swc1      $f16, 0x1c($a1)
+.LE008C490:
+/* 38E290 E008C490 C4A00018 */  lwc1      $f0, 0x18($a1)
+/* 38E294 E008C494 44871000 */  mtc1      $a3, $f2
+/* 38E298 E008C498 00000000 */  nop
+/* 38E29C E008C49C 468010A0 */  cvt.s.w   $f2, $f2
+/* 38E2A0 E008C4A0 46020002 */  mul.s     $f0, $f0, $f2
+/* 38E2A4 E008C4A4 00000000 */  nop
+/* 38E2A8 E008C4A8 28E2000A */  slti      $v0, $a3, 0xa
+/* 38E2AC E008C4AC C4A20020 */  lwc1      $f2, 0x20($a1)
+/* 38E2B0 E008C4B0 468010A0 */  cvt.s.w   $f2, $f2
+/* 38E2B4 E008C4B4 46020003 */  div.s     $f0, $f0, $f2
+/* 38E2B8 E008C4B8 10400032 */  beqz      $v0, .LE008C584
+/* 38E2BC E008C4BC E4A00014 */   swc1     $f0, 0x14($a1)
+/* 38E2C0 E008C4C0 00071040 */  sll       $v0, $a3, 1
+/* 38E2C4 E008C4C4 00471021 */  addu      $v0, $v0, $a3
+/* 38E2C8 E008C4C8 000210C0 */  sll       $v0, $v0, 3
+/* 38E2CC E008C4CC 00471021 */  addu      $v0, $v0, $a3
+/* 38E2D0 E008C4D0 08023161 */  j         .LE008C584
+/* 38E2D4 E008C4D4 ACA2001C */   sw       $v0, 0x1c($a1)
+.LE008C4D8:
+/* 38E2D8 E008C4D8 28E20006 */  slti      $v0, $a3, 6
+/* 38E2DC E008C4DC 14400012 */  bnez      $v0, .LE008C528
+/* 38E2E0 E008C4E0 28E2000A */   slti     $v0, $a3, 0xa
+/* 38E2E4 E008C4E4 24020064 */  addiu     $v0, $zero, 0x64
+/* 38E2E8 E008C4E8 8CA3001C */  lw        $v1, 0x1c($a1)
+/* 38E2EC E008C4EC 3C01E009 */  lui       $at, %hi(D_E008CB68)
+/* 38E2F0 E008C4F0 D420CB68 */  ldc1      $f0, %lo(D_E008CB68)($at)
+/* 38E2F4 E008C4F4 00431023 */  subu      $v0, $v0, $v1
+/* 38E2F8 E008C4F8 44821000 */  mtc1      $v0, $f2
+/* 38E2FC E008C4FC 00000000 */  nop
+/* 38E300 E008C500 468010A1 */  cvt.d.w   $f2, $f2
+/* 38E304 E008C504 46201082 */  mul.d     $f2, $f2, $f0
+/* 38E308 E008C508 00000000 */  nop
+/* 38E30C E008C50C 44830000 */  mtc1      $v1, $f0
+/* 38E310 E008C510 00000000 */  nop
+/* 38E314 E008C514 46800021 */  cvt.d.w   $f0, $f0
+/* 38E318 E008C518 46220000 */  add.d     $f0, $f0, $f2
+/* 38E31C E008C51C 4620040D */  trunc.w.d $f16, $f0
+/* 38E320 E008C520 E4B0001C */  swc1      $f16, 0x1c($a1)
+/* 38E324 E008C524 28E2000A */  slti      $v0, $a3, 0xa
+.LE008C528:
+/* 38E328 E008C528 10400016 */  beqz      $v0, .LE008C584
+/* 38E32C E008C52C 00000000 */   nop
+/* 38E330 E008C530 3C01E009 */  lui       $at, %hi(D_E008CB70)
+/* 38E334 E008C534 D420CB70 */  ldc1      $f0, %lo(D_E008CB70)($at)
+/* 38E338 E008C538 C4A6001C */  lwc1      $f6, 0x1c($a1)
+/* 38E33C E008C53C 468031A1 */  cvt.d.w   $f6, $f6
+/* 38E340 E008C540 46203182 */  mul.d     $f6, $f6, $f0
+/* 38E344 E008C544 00000000 */  nop
+/* 38E348 E008C548 C4A00018 */  lwc1      $f0, 0x18($a1)
+/* 38E34C E008C54C 46000000 */  add.s     $f0, $f0, $f0
+/* 38E350 E008C550 C4A20014 */  lwc1      $f2, 0x14($a1)
+/* 38E354 E008C554 46020001 */  sub.s     $f0, $f0, $f2
+/* 38E358 E008C558 3C01E009 */  lui       $at, %hi(D_E008CB78)
+/* 38E35C E008C55C D424CB78 */  ldc1      $f4, %lo(D_E008CB78)($at)
+/* 38E360 E008C560 46000021 */  cvt.d.s   $f0, $f0
+/* 38E364 E008C564 46240002 */  mul.d     $f0, $f0, $f4
+/* 38E368 E008C568 00000000 */  nop
+/* 38E36C E008C56C 460010A1 */  cvt.d.s   $f2, $f2
+/* 38E370 E008C570 46201080 */  add.d     $f2, $f2, $f0
+/* 38E374 E008C574 4620340D */  trunc.w.d $f16, $f6
+/* 38E378 E008C578 E4B0001C */  swc1      $f16, 0x1c($a1)
+/* 38E37C E008C57C 462010A0 */  cvt.s.d   $f2, $f2
+/* 38E380 E008C580 E4A20014 */  swc1      $f2, 0x14($a1)
+.LE008C584:
+/* 38E384 E008C584 8CA20004 */  lw        $v0, 4($a1)
+/* 38E388 E008C588 C4400028 */  lwc1      $f0, 0x28($v0)
+/* 38E38C E008C58C E4A00008 */  swc1      $f0, 8($a1)
+/* 38E390 E008C590 C440002C */  lwc1      $f0, 0x2c($v0)
+/* 38E394 E008C594 E4A0000C */  swc1      $f0, 0xc($a1)
+/* 38E398 E008C598 C4400030 */  lwc1      $f0, 0x30($v0)
+/* 38E39C E008C59C 24060001 */  addiu     $a2, $zero, 1
+/* 38E3A0 E008C5A0 E4A00010 */  swc1      $f0, 0x10($a1)
+/* 38E3A4 E008C5A4 8C820008 */  lw        $v0, 8($a0)
+/* 38E3A8 E008C5A8 00C2102A */  slt       $v0, $a2, $v0
+/* 38E3AC E008C5AC 1040003F */  beqz      $v0, .LE008C6AC
+/* 38E3B0 E008C5B0 24A50048 */   addiu    $a1, $a1, 0x48
+/* 38E3B4 E008C5B4 240A0008 */  addiu     $t2, $zero, 8
+/* 38E3B8 E008C5B8 28E9000A */  slti      $t1, $a3, 0xa
+/* 38E3BC E008C5BC 24A30030 */  addiu     $v1, $a1, 0x30
+/* 38E3C0 E008C5C0 3C014220 */  lui       $at, 0x4220
+/* 38E3C4 E008C5C4 44817000 */  mtc1      $at, $f14
+/* 38E3C8 E008C5C8 3C01E009 */  lui       $at, %hi(D_E008CB80)
+/* 38E3CC E008C5CC D428CB80 */  ldc1      $f8, %lo(D_E008CB80)($at)
+/* 38E3D0 E008C5D0 3C01C220 */  lui       $at, 0xc220
+/* 38E3D4 E008C5D4 44816000 */  mtc1      $at, $f12
+/* 38E3D8 E008C5D8 3C014120 */  lui       $at, 0x4120
+/* 38E3DC E008C5DC 44815000 */  mtc1      $at, $f10
+.LE008C5E0:
+/* 38E3E0 E008C5E0 150A001C */  bne       $t0, $t2, .LE008C654
+/* 38E3E4 E008C5E4 30C20001 */   andi     $v0, $a2, 1
+/* 38E3E8 E008C5E8 10400004 */  beqz      $v0, .LE008C5FC
+/* 38E3EC E008C5EC 00000000 */   nop
+/* 38E3F0 E008C5F0 C460000C */  lwc1      $f0, 0xc($v1)
+/* 38E3F4 E008C5F4 08023181 */  j         .LE008C604
+/* 38E3F8 E008C5F8 46007081 */   sub.s    $f2, $f14, $f0
+.LE008C5FC:
+/* 38E3FC E008C5FC C460000C */  lwc1      $f0, 0xc($v1)
+/* 38E400 E008C600 46006081 */  sub.s     $f2, $f12, $f0
+.LE008C604:
+/* 38E404 E008C604 460010A1 */  cvt.d.s   $f2, $f2
+/* 38E408 E008C608 46281082 */  mul.d     $f2, $f2, $f8
+/* 38E40C E008C60C 00000000 */  nop
+/* 38E410 E008C610 46000021 */  cvt.d.s   $f0, $f0
+/* 38E414 E008C614 46220000 */  add.d     $f0, $f0, $f2
+/* 38E418 E008C618 46200020 */  cvt.s.d   $f0, $f0
+/* 38E41C E008C61C E460000C */  swc1      $f0, 0xc($v1)
+/* 38E420 E008C620 C466FFFC */  lwc1      $f6, -4($v1)
+/* 38E424 E008C624 C4600008 */  lwc1      $f0, 8($v1)
+/* 38E428 E008C628 C4640000 */  lwc1      $f4, ($v1)
+/* 38E42C E008C62C 46003180 */  add.s     $f6, $f6, $f0
+/* 38E430 E008C630 C460000C */  lwc1      $f0, 0xc($v1)
+/* 38E434 E008C634 C4620004 */  lwc1      $f2, 4($v1)
+/* 38E438 E008C638 46002100 */  add.s     $f4, $f4, $f0
+/* 38E43C E008C63C C4600010 */  lwc1      $f0, 0x10($v1)
+/* 38E440 E008C640 46001080 */  add.s     $f2, $f2, $f0
+/* 38E444 E008C644 E466FFFC */  swc1      $f6, -4($v1)
+/* 38E448 E008C648 E4640000 */  swc1      $f4, ($v1)
+/* 38E44C E008C64C 080231A6 */  j         .LE008C698
+/* 38E450 E008C650 E4620004 */   swc1     $f2, 4($v1)
+.LE008C654:
+/* 38E454 E008C654 1120000C */  beqz      $t1, .LE008C688
+/* 38E458 E008C658 00000000 */   nop
+/* 38E45C E008C65C C460000C */  lwc1      $f0, 0xc($v1)
+/* 38E460 E008C660 44871000 */  mtc1      $a3, $f2
+/* 38E464 E008C664 00000000 */  nop
+/* 38E468 E008C668 468010A0 */  cvt.s.w   $f2, $f2
+/* 38E46C E008C66C 46020002 */  mul.s     $f0, $f0, $f2
+/* 38E470 E008C670 00000000 */  nop
+/* 38E474 E008C674 C4620000 */  lwc1      $f2, ($v1)
+/* 38E478 E008C678 460A0003 */  div.s     $f0, $f0, $f10
+/* 38E47C E008C67C 46001080 */  add.s     $f2, $f2, $f0
+/* 38E480 E008C680 080231A6 */  j         .LE008C698
+/* 38E484 E008C684 E4620000 */   swc1     $f2, ($v1)
+.LE008C688:
+/* 38E488 E008C688 C4600000 */  lwc1      $f0, ($v1)
+/* 38E48C E008C68C C462000C */  lwc1      $f2, 0xc($v1)
+/* 38E490 E008C690 46020000 */  add.s     $f0, $f0, $f2
+/* 38E494 E008C694 E4600000 */  swc1      $f0, ($v1)
+.LE008C698:
+/* 38E498 E008C698 24C60001 */  addiu     $a2, $a2, 1
+/* 38E49C E008C69C 8C820008 */  lw        $v0, 8($a0)
+/* 38E4A0 E008C6A0 00C2102A */  slt       $v0, $a2, $v0
+/* 38E4A4 E008C6A4 1440FFCE */  bnez      $v0, .LE008C5E0
+/* 38E4A8 E008C6A8 24630048 */   addiu    $v1, $v1, 0x48
+.LE008C6AC:
+/* 38E4AC E008C6AC 8FBF0010 */  lw        $ra, 0x10($sp)
+/* 38E4B0 E008C6B0 03E00008 */  jr        $ra
+/* 38E4B4 E008C6B4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_appendGfx.s
index 19d249d04a..174eb269b3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_appendGfx.s
@@ -2,449 +2,319 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_63_appendGfx
-/* 37FC6C E007E54C 27BDFF18 */  addiu     $sp, $sp, -0xe8
-/* 37FC70 E007E550 3C06DB06 */  lui       $a2, 0xdb06
-/* 37FC74 E007E554 34C60024 */  ori       $a2, $a2, 0x24
-/* 37FC78 E007E558 AFA400E8 */  sw        $a0, 0xe8($sp)
-/* 37FC7C E007E55C 27A40018 */  addiu     $a0, $sp, 0x18
-/* 37FC80 E007E560 AFB600B8 */  sw        $s6, 0xb8($sp)
-/* 37FC84 E007E564 3C16800A */  lui       $s6, %hi(gMasterGfxPos)
-/* 37FC88 E007E568 26D6A66C */  addiu     $s6, $s6, %lo(gMasterGfxPos)
-/* 37FC8C E007E56C AFBF00C4 */  sw        $ra, 0xc4($sp)
-/* 37FC90 E007E570 AFBE00C0 */  sw        $fp, 0xc0($sp)
-/* 37FC94 E007E574 AFB700BC */  sw        $s7, 0xbc($sp)
-/* 37FC98 E007E578 AFB500B4 */  sw        $s5, 0xb4($sp)
-/* 37FC9C E007E57C AFB400B0 */  sw        $s4, 0xb0($sp)
-/* 37FCA0 E007E580 AFB300AC */  sw        $s3, 0xac($sp)
-/* 37FCA4 E007E584 AFB200A8 */  sw        $s2, 0xa8($sp)
-/* 37FCA8 E007E588 AFB100A4 */  sw        $s1, 0xa4($sp)
-/* 37FCAC E007E58C AFB000A0 */  sw        $s0, 0xa0($sp)
-/* 37FCB0 E007E590 F7BA00E0 */  sdc1      $f26, 0xe0($sp)
-/* 37FCB4 E007E594 F7B800D8 */  sdc1      $f24, 0xd8($sp)
-/* 37FCB8 E007E598 F7B600D0 */  sdc1      $f22, 0xd0($sp)
-/* 37FCBC E007E59C F7B400C8 */  sdc1      $f20, 0xc8($sp)
-/* 37FCC0 E007E5A0 8EC50000 */  lw        $a1, ($s6)
-/* 37FCC4 E007E5A4 8FB900E8 */  lw        $t9, 0xe8($sp)
-/* 37FCC8 E007E5A8 00A0182D */  daddu     $v1, $a1, $zero
-/* 37FCCC E007E5AC 8F31000C */  lw        $s1, 0xc($t9)
-/* 37FCD0 E007E5B0 24A50008 */  addiu     $a1, $a1, 8
-/* 37FCD4 E007E5B4 AEC50000 */  sw        $a1, ($s6)
-/* 37FCD8 E007E5B8 8E390034 */  lw        $t9, 0x34($s1)
-/* 37FCDC E007E5BC 3C140001 */  lui       $s4, 1
-/* 37FCE0 E007E5C0 AFB90098 */  sw        $t9, 0x98($sp)
-/* 37FCE4 E007E5C4 C6380030 */  lwc1      $f24, 0x30($s1)
-/* 37FCE8 E007E5C8 8E300004 */  lw        $s0, 4($s1)
-/* 37FCEC E007E5CC C63A0028 */  lwc1      $f26, 0x28($s1)
-/* 37FCF0 E007E5D0 C636002C */  lwc1      $f22, 0x2c($s1)
-/* 37FCF4 E007E5D4 3C02E700 */  lui       $v0, 0xe700
-/* 37FCF8 E007E5D8 AC620000 */  sw        $v0, ($v1)
-/* 37FCFC E007E5DC AC600004 */  sw        $zero, 4($v1)
-/* 37FD00 E007E5E0 ACA60000 */  sw        $a2, ($a1)
-/* 37FD04 E007E5E4 8FB900E8 */  lw        $t9, 0xe8($sp)
-/* 37FD08 E007E5E8 8F230010 */  lw        $v1, 0x10($t9)
-/* 37FD0C E007E5EC 24A20008 */  addiu     $v0, $a1, 8
-/* 37FD10 E007E5F0 AEC20000 */  sw        $v0, ($s6)
-/* 37FD14 E007E5F4 8C62001C */  lw        $v0, 0x1c($v1)
-/* 37FD18 E007E5F8 3C038000 */  lui       $v1, 0x8000
-/* 37FD1C E007E5FC 00431021 */  addu      $v0, $v0, $v1
-/* 37FD20 E007E600 ACA20004 */  sw        $v0, 4($a1)
-/* 37FD24 E007E604 8E250008 */  lw        $a1, 8($s1)
-/* 37FD28 E007E608 8E26000C */  lw        $a2, 0xc($s1)
-/* 37FD2C E007E60C 8E270010 */  lw        $a3, 0x10($s1)
-/* 37FD30 E007E610 4480A000 */  mtc1      $zero, $f20
-/* 37FD34 E007E614 0C080108 */  jal       shim_guTranslateF
-/* 37FD38 E007E618 36941630 */   ori      $s4, $s4, 0x1630
-/* 37FD3C E007E61C 27B50058 */  addiu     $s5, $sp, 0x58
-/* 37FD40 E007E620 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 37FD44 E007E624 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 37FD48 E007E628 4406A000 */  mfc1      $a2, $f20
-/* 37FD4C E007E62C 00031080 */  sll       $v0, $v1, 2
-/* 37FD50 E007E630 00431021 */  addu      $v0, $v0, $v1
-/* 37FD54 E007E634 00021080 */  sll       $v0, $v0, 2
-/* 37FD58 E007E638 00431023 */  subu      $v0, $v0, $v1
-/* 37FD5C E007E63C 000218C0 */  sll       $v1, $v0, 3
-/* 37FD60 E007E640 00431021 */  addu      $v0, $v0, $v1
-/* 37FD64 E007E644 000210C0 */  sll       $v0, $v0, 3
-/* 37FD68 E007E648 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 37FD6C E007E64C 00220821 */  addu      $at, $at, $v0
-/* 37FD70 E007E650 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
-/* 37FD74 E007E654 3C073F80 */  lui       $a3, 0x3f80
-/* 37FD78 E007E658 46000007 */  neg.s     $f0, $f0
-/* 37FD7C E007E65C 44050000 */  mfc1      $a1, $f0
-/* 37FD80 E007E660 02A0202D */  daddu     $a0, $s5, $zero
-/* 37FD84 E007E664 0C080104 */  jal       shim_guRotateF
-/* 37FD88 E007E668 E7B40010 */   swc1     $f20, 0x10($sp)
-/* 37FD8C E007E66C 02A0202D */  daddu     $a0, $s5, $zero
-/* 37FD90 E007E670 27A50018 */  addiu     $a1, $sp, 0x18
-/* 37FD94 E007E674 0C080114 */  jal       shim_guMtxCatF
-/* 37FD98 E007E678 00A0302D */   daddu    $a2, $a1, $zero
-/* 37FD9C E007E67C 27A40018 */  addiu     $a0, $sp, 0x18
-/* 37FDA0 E007E680 3C138007 */  lui       $s3, %hi(gMatrixListPos)
-/* 37FDA4 E007E684 267341F0 */  addiu     $s3, $s3, %lo(gMatrixListPos)
-/* 37FDA8 E007E688 3C17800A */  lui       $s7, %hi(gDisplayContext)
-/* 37FDAC E007E68C 26F7A674 */  addiu     $s7, $s7, %lo(gDisplayContext)
-/* 37FDB0 E007E690 96650000 */  lhu       $a1, ($s3)
-/* 37FDB4 E007E694 8EE20000 */  lw        $v0, ($s7)
-/* 37FDB8 E007E698 00052980 */  sll       $a1, $a1, 6
-/* 37FDBC E007E69C 00B42821 */  addu      $a1, $a1, $s4
-/* 37FDC0 E007E6A0 0C080118 */  jal       shim_guMtxF2L
-/* 37FDC4 E007E6A4 00452821 */   addu     $a1, $v0, $a1
-/* 37FDC8 E007E6A8 3C03DA38 */  lui       $v1, 0xda38
-/* 37FDCC E007E6AC 34630002 */  ori       $v1, $v1, 2
-/* 37FDD0 E007E6B0 2610FFFC */  addiu     $s0, $s0, -4
-/* 37FDD4 E007E6B4 8EC40000 */  lw        $a0, ($s6)
-/* 37FDD8 E007E6B8 96620000 */  lhu       $v0, ($s3)
-/* 37FDDC E007E6BC 0080282D */  daddu     $a1, $a0, $zero
-/* 37FDE0 E007E6C0 24840008 */  addiu     $a0, $a0, 8
-/* 37FDE4 E007E6C4 AEC40000 */  sw        $a0, ($s6)
-/* 37FDE8 E007E6C8 ACA30000 */  sw        $v1, ($a1)
-/* 37FDEC E007E6CC 24430001 */  addiu     $v1, $v0, 1
-/* 37FDF0 E007E6D0 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 37FDF4 E007E6D4 00021180 */  sll       $v0, $v0, 6
-/* 37FDF8 E007E6D8 A6630000 */  sh        $v1, ($s3)
-/* 37FDFC E007E6DC 8EE30000 */  lw        $v1, ($s7)
-/* 37FE00 E007E6E0 00541021 */  addu      $v0, $v0, $s4
-/* 37FE04 E007E6E4 00621821 */  addu      $v1, $v1, $v0
-/* 37FE08 E007E6E8 24820008 */  addiu     $v0, $a0, 8
-/* 37FE0C E007E6EC ACA30004 */  sw        $v1, 4($a1)
-/* 37FE10 E007E6F0 AEC20000 */  sw        $v0, ($s6)
-/* 37FE14 E007E6F4 3C02FA00 */  lui       $v0, 0xfa00
-/* 37FE18 E007E6F8 AC820000 */  sw        $v0, ($a0)
-/* 37FE1C E007E6FC 9223003F */  lbu       $v1, 0x3f($s1)
-/* 37FE20 E007E700 24820010 */  addiu     $v0, $a0, 0x10
-/* 37FE24 E007E704 AEC20000 */  sw        $v0, ($s6)
-/* 37FE28 E007E708 3C02FB00 */  lui       $v0, 0xfb00
-/* 37FE2C E007E70C 3C05FF00 */  lui       $a1, 0xff00
-/* 37FE30 E007E710 AC820008 */  sw        $v0, 8($a0)
-/* 37FE34 E007E714 00651825 */  or        $v1, $v1, $a1
-/* 37FE38 E007E718 AC830004 */  sw        $v1, 4($a0)
-/* 37FE3C E007E71C 9222003B */  lbu       $v0, 0x3b($s1)
-/* 37FE40 E007E720 2E100003 */  sltiu     $s0, $s0, 3
-/* 37FE44 E007E724 00451025 */  or        $v0, $v0, $a1
-/* 37FE48 E007E728 1200007F */  beqz      $s0, .LE007E928
-/* 37FE4C E007E72C AC82000C */   sw       $v0, 0xc($a0)
-/* 37FE50 E007E730 4405A000 */  mfc1      $a1, $f20
-/* 37FE54 E007E734 3C064180 */  lui       $a2, 0x4180
-/* 37FE58 E007E738 4407A000 */  mfc1      $a3, $f20
-/* 37FE5C E007E73C 0C080108 */  jal       shim_guTranslateF
-/* 37FE60 E007E740 27A40018 */   addiu    $a0, $sp, 0x18
-/* 37FE64 E007E744 27A40018 */  addiu     $a0, $sp, 0x18
-/* 37FE68 E007E748 96650000 */  lhu       $a1, ($s3)
-/* 37FE6C E007E74C 8EE20000 */  lw        $v0, ($s7)
-/* 37FE70 E007E750 00052980 */  sll       $a1, $a1, 6
-/* 37FE74 E007E754 00B42821 */  addu      $a1, $a1, $s4
-/* 37FE78 E007E758 0C080118 */  jal       shim_guMtxF2L
-/* 37FE7C E007E75C 00452821 */   addu     $a1, $v0, $a1
-/* 37FE80 E007E760 8EC40000 */  lw        $a0, ($s6)
-/* 37FE84 E007E764 24120001 */  addiu     $s2, $zero, 1
-/* 37FE88 E007E768 0080282D */  daddu     $a1, $a0, $zero
-/* 37FE8C E007E76C 24840008 */  addiu     $a0, $a0, 8
-/* 37FE90 E007E770 AEC40000 */  sw        $a0, ($s6)
-/* 37FE94 E007E774 96620000 */  lhu       $v0, ($s3)
-/* 37FE98 E007E778 3C03DA38 */  lui       $v1, 0xda38
-/* 37FE9C E007E77C ACA30000 */  sw        $v1, ($a1)
-/* 37FEA0 E007E780 00521821 */  addu      $v1, $v0, $s2
-/* 37FEA4 E007E784 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 37FEA8 E007E788 00021180 */  sll       $v0, $v0, 6
-/* 37FEAC E007E78C A6630000 */  sh        $v1, ($s3)
-/* 37FEB0 E007E790 8EE30000 */  lw        $v1, ($s7)
-/* 37FEB4 E007E794 00541021 */  addu      $v0, $v0, $s4
-/* 37FEB8 E007E798 00621821 */  addu      $v1, $v1, $v0
-/* 37FEBC E007E79C 3C02DE00 */  lui       $v0, 0xde00
-/* 37FEC0 E007E7A0 ACA30004 */  sw        $v1, 4($a1)
-/* 37FEC4 E007E7A4 AC820000 */  sw        $v0, ($a0)
-/* 37FEC8 E007E7A8 3C020900 */  lui       $v0, 0x900
-/* 37FECC E007E7AC 24420DE0 */  addiu     $v0, $v0, 0xde0
-/* 37FED0 E007E7B0 AC820004 */  sw        $v0, 4($a0)
-/* 37FED4 E007E7B4 8FB900E8 */  lw        $t9, 0xe8($sp)
-/* 37FED8 E007E7B8 2631004C */  addiu     $s1, $s1, 0x4c
-/* 37FEDC E007E7BC 8F220008 */  lw        $v0, 8($t9)
-/* 37FEE0 E007E7C0 24840008 */  addiu     $a0, $a0, 8
-/* 37FEE4 E007E7C4 0242102A */  slt       $v0, $s2, $v0
-/* 37FEE8 E007E7C8 1040004C */  beqz      $v0, .LE007E8FC
-/* 37FEEC E007E7CC AEC40000 */   sw       $a0, ($s6)
-/* 37FEF0 E007E7D0 02E0F02D */  daddu     $fp, $s7, $zero
-/* 37FEF4 E007E7D4 0260B82D */  daddu     $s7, $s3, $zero
-/* 37FEF8 E007E7D8 3C140001 */  lui       $s4, 1
-/* 37FEFC E007E7DC 36941630 */  ori       $s4, $s4, 0x1630
-/* 37FF00 E007E7E0 02C0982D */  daddu     $s3, $s6, $zero
-/* 37FF04 E007E7E4 26300010 */  addiu     $s0, $s1, 0x10
-.LE007E7E8:
-/* 37FF08 E007E7E8 8E020038 */  lw        $v0, 0x38($s0)
-/* 37FF0C E007E7EC 5440003D */  bnel      $v0, $zero, .LE007E8E4
-/* 37FF10 E007E7F0 26520001 */   addiu    $s2, $s2, 1
-/* 37FF14 E007E7F4 3C013F80 */  lui       $at, 0x3f80
-/* 37FF18 E007E7F8 44810000 */  mtc1      $at, $f0
-/* 37FF1C E007E7FC 4406A000 */  mfc1      $a2, $f20
-/* 37FF20 E007E800 4407A000 */  mfc1      $a3, $f20
-/* 37FF24 E007E804 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 37FF28 E007E808 8E050014 */  lw        $a1, 0x14($s0)
-/* 37FF2C E007E80C 0C080104 */  jal       shim_guRotateF
-/* 37FF30 E007E810 27A40018 */   addiu    $a0, $sp, 0x18
-/* 37FF34 E007E814 8E05FFF8 */  lw        $a1, -8($s0)
-/* 37FF38 E007E818 8E06FFFC */  lw        $a2, -4($s0)
-/* 37FF3C E007E81C 8E070000 */  lw        $a3, ($s0)
-/* 37FF40 E007E820 0C080108 */  jal       shim_guTranslateF
-/* 37FF44 E007E824 02A0202D */   daddu    $a0, $s5, $zero
-/* 37FF48 E007E828 02A0202D */  daddu     $a0, $s5, $zero
-/* 37FF4C E007E82C 27A50018 */  addiu     $a1, $sp, 0x18
-/* 37FF50 E007E830 0C080114 */  jal       shim_guMtxCatF
-/* 37FF54 E007E834 00A0302D */   daddu    $a2, $a1, $zero
-/* 37FF58 E007E838 27A40018 */  addiu     $a0, $sp, 0x18
-/* 37FF5C E007E83C 96E50000 */  lhu       $a1, ($s7)
-/* 37FF60 E007E840 8FC20000 */  lw        $v0, ($fp)
-/* 37FF64 E007E844 00052980 */  sll       $a1, $a1, 6
-/* 37FF68 E007E848 00B42821 */  addu      $a1, $a1, $s4
-/* 37FF6C E007E84C 0C080118 */  jal       shim_guMtxF2L
-/* 37FF70 E007E850 00452821 */   addu     $a1, $v0, $a1
-/* 37FF74 E007E854 8E650000 */  lw        $a1, ($s3)
-/* 37FF78 E007E858 3C060900 */  lui       $a2, 0x900
-/* 37FF7C E007E85C 24C60EB8 */  addiu     $a2, $a2, 0xeb8
-/* 37FF80 E007E860 00A0202D */  daddu     $a0, $a1, $zero
-/* 37FF84 E007E864 24A50008 */  addiu     $a1, $a1, 8
-/* 37FF88 E007E868 AE650000 */  sw        $a1, ($s3)
-/* 37FF8C E007E86C 96E20000 */  lhu       $v0, ($s7)
-/* 37FF90 E007E870 3C03DA38 */  lui       $v1, 0xda38
-/* 37FF94 E007E874 AC830000 */  sw        $v1, ($a0)
-/* 37FF98 E007E878 24430001 */  addiu     $v1, $v0, 1
-/* 37FF9C E007E87C 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 37FFA0 E007E880 00021180 */  sll       $v0, $v0, 6
-/* 37FFA4 E007E884 A6E30000 */  sh        $v1, ($s7)
-/* 37FFA8 E007E888 8FC30000 */  lw        $v1, ($fp)
-/* 37FFAC E007E88C 00541021 */  addu      $v0, $v0, $s4
-/* 37FFB0 E007E890 00621821 */  addu      $v1, $v1, $v0
-/* 37FFB4 E007E894 3C02DE00 */  lui       $v0, 0xde00
-/* 37FFB8 E007E898 AC830004 */  sw        $v1, 4($a0)
-/* 37FFBC E007E89C ACA20000 */  sw        $v0, ($a1)
-/* 37FFC0 E007E8A0 8E230000 */  lw        $v1, ($s1)
-/* 37FFC4 E007E8A4 24A20008 */  addiu     $v0, $a1, 8
-/* 37FFC8 E007E8A8 10600003 */  beqz      $v1, .LE007E8B8
-/* 37FFCC E007E8AC AE620000 */   sw       $v0, ($s3)
-/* 37FFD0 E007E8B0 3C060900 */  lui       $a2, 0x900
-/* 37FFD4 E007E8B4 24C60ED8 */  addiu     $a2, $a2, 0xed8
-.LE007E8B8:
-/* 37FFD8 E007E8B8 3C04D838 */  lui       $a0, 0xd838
-/* 37FFDC E007E8BC 8E620000 */  lw        $v0, ($s3)
-/* 37FFE0 E007E8C0 34840002 */  ori       $a0, $a0, 2
-/* 37FFE4 E007E8C4 ACA60004 */  sw        $a2, 4($a1)
-/* 37FFE8 E007E8C8 0040182D */  daddu     $v1, $v0, $zero
-/* 37FFEC E007E8CC 24420008 */  addiu     $v0, $v0, 8
-/* 37FFF0 E007E8D0 AE620000 */  sw        $v0, ($s3)
-/* 37FFF4 E007E8D4 24020040 */  addiu     $v0, $zero, 0x40
-/* 37FFF8 E007E8D8 AC640000 */  sw        $a0, ($v1)
-/* 37FFFC E007E8DC AC620004 */  sw        $v0, 4($v1)
-/* 380000 E007E8E0 26520001 */  addiu     $s2, $s2, 1
-.LE007E8E4:
-/* 380004 E007E8E4 8FB900E8 */  lw        $t9, 0xe8($sp)
-/* 380008 E007E8E8 2610004C */  addiu     $s0, $s0, 0x4c
-/* 38000C E007E8EC 8F220008 */  lw        $v0, 8($t9)
-/* 380010 E007E8F0 0242102A */  slt       $v0, $s2, $v0
-/* 380014 E007E8F4 1440FFBC */  bnez      $v0, .LE007E7E8
-/* 380018 E007E8F8 2631004C */   addiu    $s1, $s1, 0x4c
-.LE007E8FC:
-/* 38001C E007E8FC 3C05D838 */  lui       $a1, 0xd838
-/* 380020 E007E900 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* 380024 E007E904 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* 380028 E007E908 8C620000 */  lw        $v0, ($v1)
-/* 38002C E007E90C 34A50002 */  ori       $a1, $a1, 2
-/* 380030 E007E910 0040202D */  daddu     $a0, $v0, $zero
-/* 380034 E007E914 24420008 */  addiu     $v0, $v0, 8
-/* 380038 E007E918 AC620000 */  sw        $v0, ($v1)
-/* 38003C E007E91C 24020040 */  addiu     $v0, $zero, 0x40
-/* 380040 E007E920 AC850000 */  sw        $a1, ($a0)
-/* 380044 E007E924 AC820004 */  sw        $v0, 4($a0)
-.LE007E928:
-/* 380048 E007E928 3C0DFD48 */  lui       $t5, 0xfd48
-/* 38004C E007E92C 35AD000F */  ori       $t5, $t5, 0xf
-/* 380050 E007E930 3C09F548 */  lui       $t1, 0xf548
-/* 380054 E007E934 35290400 */  ori       $t1, $t1, 0x400
-/* 380058 E007E938 3C0E0705 */  lui       $t6, 0x705
-/* 38005C E007E93C 35CE4150 */  ori       $t6, $t6, 0x4150
-/* 380060 E007E940 3C0F0703 */  lui       $t7, 0x703
-/* 380064 E007E944 35EFE07C */  ori       $t7, $t7, 0xe07c
-/* 380068 E007E948 3C12F540 */  lui       $s2, 0xf540
-/* 38006C E007E94C 36520400 */  ori       $s2, $s2, 0x400
-/* 380070 E007E950 3C100005 */  lui       $s0, 5
-/* 380074 E007E954 36104150 */  ori       $s0, $s0, 0x4150
-/* 380078 E007E958 3C130007 */  lui       $s3, 7
-/* 38007C E007E95C 3673C07C */  ori       $s3, $s3, 0xc07c
-/* 380080 E007E960 3C14F548 */  lui       $s4, 0xf548
-/* 380084 E007E964 36940480 */  ori       $s4, $s4, 0x480
-/* 380088 E007E968 3C17F540 */  lui       $s7, 0xf540
-/* 38008C E007E96C 36F70480 */  ori       $s7, $s7, 0x480
-/* 380090 E007E970 3C160105 */  lui       $s6, 0x105
-/* 380094 E007E974 36D64150 */  ori       $s6, $s6, 0x4150
-/* 380098 E007E978 3C180107 */  lui       $t8, 0x107
-/* 38009C E007E97C 3718C07C */  ori       $t8, $t8, 0xc07c
-/* 3800A0 E007E980 27A40018 */  addiu     $a0, $sp, 0x18
-/* 3800A4 E007E984 3C1E0001 */  lui       $fp, 1
-/* 3800A8 E007E988 37DE1630 */  ori       $fp, $fp, 0x1630
-/* 3800AC E007E98C 3C11800A */  lui       $s1, %hi(gMasterGfxPos)
-/* 3800B0 E007E990 2631A66C */  addiu     $s1, $s1, %lo(gMasterGfxPos)
-/* 3800B4 E007E994 3C15DE00 */  lui       $s5, 0xde00
-/* 3800B8 E007E998 3C020900 */  lui       $v0, 0x900
-/* 3800BC E007E99C 24420D40 */  addiu     $v0, $v0, 0xd40
-/* 3800C0 E007E9A0 3C0C0900 */  lui       $t4, 0x900
-/* 3800C4 E007E9A4 258C0000 */  addiu     $t4, $t4, 0
-/* 3800C8 E007E9A8 3C0BE600 */  lui       $t3, 0xe600
-/* 3800CC E007E9AC 3C0AF400 */  lui       $t2, 0xf400
-/* 3800D0 E007E9B0 8E230000 */  lw        $v1, ($s1)
-/* 3800D4 E007E9B4 4480A000 */  mtc1      $zero, $f20
-/* 3800D8 E007E9B8 4405B000 */  mfc1      $a1, $f22
-/* 3800DC E007E9BC 0060402D */  daddu     $t0, $v1, $zero
-/* 3800E0 E007E9C0 24630008 */  addiu     $v1, $v1, 8
-/* 3800E4 E007E9C4 AE230000 */  sw        $v1, ($s1)
-/* 3800E8 E007E9C8 AD020004 */  sw        $v0, 4($t0)
-/* 3800EC E007E9CC 24620008 */  addiu     $v0, $v1, 8
-/* 3800F0 E007E9D0 AD150000 */  sw        $s5, ($t0)
-/* 3800F4 E007E9D4 AE220000 */  sw        $v0, ($s1)
-/* 3800F8 E007E9D8 24020003 */  addiu     $v0, $zero, 3
-/* 3800FC E007E9DC 4406A000 */  mfc1      $a2, $f20
-/* 380100 E007E9E0 3C08F200 */  lui       $t0, 0xf200
-/* 380104 E007E9E4 AC6D0000 */  sw        $t5, ($v1)
-/* 380108 E007E9E8 8FB90098 */  lw        $t9, 0x98($sp)
-/* 38010C E007E9EC 4407A000 */  mfc1      $a3, $f20
-/* 380110 E007E9F0 00591023 */  subu      $v0, $v0, $t9
-/* 380114 E007E9F4 00021240 */  sll       $v0, $v0, 9
-/* 380118 E007E9F8 004C1021 */  addu      $v0, $v0, $t4
-/* 38011C E007E9FC AC620004 */  sw        $v0, 4($v1)
-/* 380120 E007EA00 24620010 */  addiu     $v0, $v1, 0x10
-/* 380124 E007EA04 AE220000 */  sw        $v0, ($s1)
-/* 380128 E007EA08 24620018 */  addiu     $v0, $v1, 0x18
-/* 38012C E007EA0C AC690008 */  sw        $t1, 8($v1)
-/* 380130 E007EA10 AC6E000C */  sw        $t6, 0xc($v1)
-/* 380134 E007EA14 AE220000 */  sw        $v0, ($s1)
-/* 380138 E007EA18 24620020 */  addiu     $v0, $v1, 0x20
-/* 38013C E007EA1C AC6B0010 */  sw        $t3, 0x10($v1)
-/* 380140 E007EA20 AC600014 */  sw        $zero, 0x14($v1)
-/* 380144 E007EA24 AE220000 */  sw        $v0, ($s1)
-/* 380148 E007EA28 24620028 */  addiu     $v0, $v1, 0x28
-/* 38014C E007EA2C 3C09E700 */  lui       $t1, 0xe700
-/* 380150 E007EA30 AC6A0018 */  sw        $t2, 0x18($v1)
-/* 380154 E007EA34 AC6F001C */  sw        $t7, 0x1c($v1)
-/* 380158 E007EA38 AE220000 */  sw        $v0, ($s1)
-/* 38015C E007EA3C 24620030 */  addiu     $v0, $v1, 0x30
-/* 380160 E007EA40 AC690020 */  sw        $t1, 0x20($v1)
-/* 380164 E007EA44 AC600024 */  sw        $zero, 0x24($v1)
-/* 380168 E007EA48 AE220000 */  sw        $v0, ($s1)
-/* 38016C E007EA4C 24620038 */  addiu     $v0, $v1, 0x38
-/* 380170 E007EA50 AC720028 */  sw        $s2, 0x28($v1)
-/* 380174 E007EA54 AC70002C */  sw        $s0, 0x2c($v1)
-/* 380178 E007EA58 AE220000 */  sw        $v0, ($s1)
-/* 38017C E007EA5C 24620040 */  addiu     $v0, $v1, 0x40
-/* 380180 E007EA60 AC680030 */  sw        $t0, 0x30($v1)
-/* 380184 E007EA64 AC730034 */  sw        $s3, 0x34($v1)
-/* 380188 E007EA68 AE220000 */  sw        $v0, ($s1)
-/* 38018C E007EA6C 24020002 */  addiu     $v0, $zero, 2
-/* 380190 E007EA70 AC6D0038 */  sw        $t5, 0x38($v1)
-/* 380194 E007EA74 00591023 */  subu      $v0, $v0, $t9
-/* 380198 E007EA78 00021240 */  sll       $v0, $v0, 9
-/* 38019C E007EA7C 004C1021 */  addu      $v0, $v0, $t4
-/* 3801A0 E007EA80 AC62003C */  sw        $v0, 0x3c($v1)
-/* 3801A4 E007EA84 24620048 */  addiu     $v0, $v1, 0x48
-/* 3801A8 E007EA88 AE220000 */  sw        $v0, ($s1)
-/* 3801AC E007EA8C 24620050 */  addiu     $v0, $v1, 0x50
-/* 3801B0 E007EA90 AC740040 */  sw        $s4, 0x40($v1)
-/* 3801B4 E007EA94 AC6E0044 */  sw        $t6, 0x44($v1)
-/* 3801B8 E007EA98 AE220000 */  sw        $v0, ($s1)
-/* 3801BC E007EA9C 24620058 */  addiu     $v0, $v1, 0x58
-/* 3801C0 E007EAA0 AC6B0048 */  sw        $t3, 0x48($v1)
-/* 3801C4 E007EAA4 AC60004C */  sw        $zero, 0x4c($v1)
-/* 3801C8 E007EAA8 AE220000 */  sw        $v0, ($s1)
-/* 3801CC E007EAAC 24620060 */  addiu     $v0, $v1, 0x60
-/* 3801D0 E007EAB0 AC6A0050 */  sw        $t2, 0x50($v1)
-/* 3801D4 E007EAB4 AC6F0054 */  sw        $t7, 0x54($v1)
-/* 3801D8 E007EAB8 AE220000 */  sw        $v0, ($s1)
-/* 3801DC E007EABC 24620068 */  addiu     $v0, $v1, 0x68
-/* 3801E0 E007EAC0 AC690058 */  sw        $t1, 0x58($v1)
-/* 3801E4 E007EAC4 AC60005C */  sw        $zero, 0x5c($v1)
-/* 3801E8 E007EAC8 AE220000 */  sw        $v0, ($s1)
-/* 3801EC E007EACC 24620070 */  addiu     $v0, $v1, 0x70
-/* 3801F0 E007EAD0 AC770060 */  sw        $s7, 0x60($v1)
-/* 3801F4 E007EAD4 AC760064 */  sw        $s6, 0x64($v1)
-/* 3801F8 E007EAD8 AE220000 */  sw        $v0, ($s1)
-/* 3801FC E007EADC AC680068 */  sw        $t0, 0x68($v1)
-/* 380200 E007EAE0 0C080108 */  jal       shim_guTranslateF
-/* 380204 E007EAE4 AC78006C */   sw       $t8, 0x6c($v1)
-/* 380208 E007EAE8 27B00058 */  addiu     $s0, $sp, 0x58
-/* 38020C E007EAEC 4405C000 */  mfc1      $a1, $f24
-/* 380210 E007EAF0 0200202D */  daddu     $a0, $s0, $zero
-/* 380214 E007EAF4 00A0302D */  daddu     $a2, $a1, $zero
-/* 380218 E007EAF8 0C080110 */  jal       shim_guScaleF
-/* 38021C E007EAFC 00A0382D */   daddu    $a3, $a1, $zero
-/* 380220 E007EB00 0200202D */  daddu     $a0, $s0, $zero
-/* 380224 E007EB04 27A50018 */  addiu     $a1, $sp, 0x18
-/* 380228 E007EB08 0C080114 */  jal       shim_guMtxCatF
-/* 38022C E007EB0C 00A0302D */   daddu    $a2, $a1, $zero
-/* 380230 E007EB10 4405D000 */  mfc1      $a1, $f26
-/* 380234 E007EB14 4406A000 */  mfc1      $a2, $f20
-/* 380238 E007EB18 3C073F80 */  lui       $a3, 0x3f80
-/* 38023C E007EB1C 0200202D */  daddu     $a0, $s0, $zero
-/* 380240 E007EB20 0C080104 */  jal       shim_guRotateF
-/* 380244 E007EB24 AFA60010 */   sw       $a2, 0x10($sp)
-/* 380248 E007EB28 0200202D */  daddu     $a0, $s0, $zero
-/* 38024C E007EB2C 27A50018 */  addiu     $a1, $sp, 0x18
-/* 380250 E007EB30 0C080114 */  jal       shim_guMtxCatF
-/* 380254 E007EB34 00A0302D */   daddu    $a2, $a1, $zero
-/* 380258 E007EB38 27A40018 */  addiu     $a0, $sp, 0x18
-/* 38025C E007EB3C 3C108007 */  lui       $s0, %hi(gMatrixListPos)
-/* 380260 E007EB40 261041F0 */  addiu     $s0, $s0, %lo(gMatrixListPos)
-/* 380264 E007EB44 3C12800A */  lui       $s2, %hi(gDisplayContext)
-/* 380268 E007EB48 2652A674 */  addiu     $s2, $s2, %lo(gDisplayContext)
-/* 38026C E007EB4C 96050000 */  lhu       $a1, ($s0)
-/* 380270 E007EB50 8E420000 */  lw        $v0, ($s2)
-/* 380274 E007EB54 00052980 */  sll       $a1, $a1, 6
-/* 380278 E007EB58 00BE2821 */  addu      $a1, $a1, $fp
-/* 38027C E007EB5C 0C080118 */  jal       shim_guMtxF2L
-/* 380280 E007EB60 00452821 */   addu     $a1, $v0, $a1
-/* 380284 E007EB64 3C06D838 */  lui       $a2, 0xd838
-/* 380288 E007EB68 8E240000 */  lw        $a0, ($s1)
-/* 38028C E007EB6C 34C60002 */  ori       $a2, $a2, 2
-/* 380290 E007EB70 0080282D */  daddu     $a1, $a0, $zero
-/* 380294 E007EB74 24840008 */  addiu     $a0, $a0, 8
-/* 380298 E007EB78 AE240000 */  sw        $a0, ($s1)
-/* 38029C E007EB7C 96020000 */  lhu       $v0, ($s0)
-/* 3802A0 E007EB80 3C03DA38 */  lui       $v1, 0xda38
-/* 3802A4 E007EB84 ACA30000 */  sw        $v1, ($a1)
-/* 3802A8 E007EB88 24430001 */  addiu     $v1, $v0, 1
-/* 3802AC E007EB8C 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 3802B0 E007EB90 00021180 */  sll       $v0, $v0, 6
-/* 3802B4 E007EB94 A6030000 */  sh        $v1, ($s0)
-/* 3802B8 E007EB98 8E430000 */  lw        $v1, ($s2)
-/* 3802BC E007EB9C 005E1021 */  addu      $v0, $v0, $fp
-/* 3802C0 E007EBA0 00621821 */  addu      $v1, $v1, $v0
-/* 3802C4 E007EBA4 24820008 */  addiu     $v0, $a0, 8
-/* 3802C8 E007EBA8 ACA30004 */  sw        $v1, 4($a1)
-/* 3802CC E007EBAC AE220000 */  sw        $v0, ($s1)
-/* 3802D0 E007EBB0 3C020900 */  lui       $v0, 0x900
-/* 3802D4 E007EBB4 24420EF8 */  addiu     $v0, $v0, 0xef8
-/* 3802D8 E007EBB8 AC820004 */  sw        $v0, 4($a0)
-/* 3802DC E007EBBC 24820010 */  addiu     $v0, $a0, 0x10
-/* 3802E0 E007EBC0 24030040 */  addiu     $v1, $zero, 0x40
-/* 3802E4 E007EBC4 AC950000 */  sw        $s5, ($a0)
-/* 3802E8 E007EBC8 AE220000 */  sw        $v0, ($s1)
-/* 3802EC E007EBCC 24820018 */  addiu     $v0, $a0, 0x18
-/* 3802F0 E007EBD0 AC860008 */  sw        $a2, 8($a0)
-/* 3802F4 E007EBD4 AC83000C */  sw        $v1, 0xc($a0)
-/* 3802F8 E007EBD8 AE220000 */  sw        $v0, ($s1)
-/* 3802FC E007EBDC AC860010 */  sw        $a2, 0x10($a0)
-/* 380300 E007EBE0 AC830014 */  sw        $v1, 0x14($a0)
-/* 380304 E007EBE4 8FBF00C4 */  lw        $ra, 0xc4($sp)
-/* 380308 E007EBE8 8FBE00C0 */  lw        $fp, 0xc0($sp)
-/* 38030C E007EBEC 8FB700BC */  lw        $s7, 0xbc($sp)
-/* 380310 E007EBF0 8FB600B8 */  lw        $s6, 0xb8($sp)
-/* 380314 E007EBF4 8FB500B4 */  lw        $s5, 0xb4($sp)
-/* 380318 E007EBF8 8FB400B0 */  lw        $s4, 0xb0($sp)
-/* 38031C E007EBFC 8FB300AC */  lw        $s3, 0xac($sp)
-/* 380320 E007EC00 8FB200A8 */  lw        $s2, 0xa8($sp)
-/* 380324 E007EC04 8FB100A4 */  lw        $s1, 0xa4($sp)
-/* 380328 E007EC08 8FB000A0 */  lw        $s0, 0xa0($sp)
-/* 38032C E007EC0C D7BA00E0 */  ldc1      $f26, 0xe0($sp)
-/* 380330 E007EC10 D7B800D8 */  ldc1      $f24, 0xd8($sp)
-/* 380334 E007EC14 D7B600D0 */  ldc1      $f22, 0xd0($sp)
-/* 380338 E007EC18 D7B400C8 */  ldc1      $f20, 0xc8($sp)
-/* 38033C E007EC1C 03E00008 */  jr        $ra
-/* 380340 E007EC20 27BD00E8 */   addiu    $sp, $sp, 0xe8
-/* 380344 E007EC24 00000000 */  nop
-/* 380348 E007EC28 00000000 */  nop
-/* 38034C E007EC2C 00000000 */  nop
+/* 3CD190 E00C67B0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
+/* 3CD194 E00C67B4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
+/* 3CD198 E00C67B8 27BDFF00 */  addiu     $sp, $sp, -0x100
+/* 3CD19C E00C67BC AFA40100 */  sw        $a0, 0x100($sp)
+/* 3CD1A0 E00C67C0 8FAA0100 */  lw        $t2, 0x100($sp)
+/* 3CD1A4 E00C67C4 3C04800B */  lui       $a0, %hi(gCameras)
+/* 3CD1A8 E00C67C8 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
+/* 3CD1AC E00C67CC AFBF00CC */  sw        $ra, 0xcc($sp)
+/* 3CD1B0 E00C67D0 AFBE00C8 */  sw        $fp, 0xc8($sp)
+/* 3CD1B4 E00C67D4 AFB700C4 */  sw        $s7, 0xc4($sp)
+/* 3CD1B8 E00C67D8 AFB600C0 */  sw        $s6, 0xc0($sp)
+/* 3CD1BC E00C67DC AFB500BC */  sw        $s5, 0xbc($sp)
+/* 3CD1C0 E00C67E0 AFB400B8 */  sw        $s4, 0xb8($sp)
+/* 3CD1C4 E00C67E4 AFB300B4 */  sw        $s3, 0xb4($sp)
+/* 3CD1C8 E00C67E8 AFB200B0 */  sw        $s2, 0xb0($sp)
+/* 3CD1CC E00C67EC AFB100AC */  sw        $s1, 0xac($sp)
+/* 3CD1D0 E00C67F0 AFB000A8 */  sw        $s0, 0xa8($sp)
+/* 3CD1D4 E00C67F4 F7BE00F8 */  sdc1      $f30, 0xf8($sp)
+/* 3CD1D8 E00C67F8 F7BC00F0 */  sdc1      $f28, 0xf0($sp)
+/* 3CD1DC E00C67FC F7BA00E8 */  sdc1      $f26, 0xe8($sp)
+/* 3CD1E0 E00C6800 F7B800E0 */  sdc1      $f24, 0xe0($sp)
+/* 3CD1E4 E00C6804 F7B600D8 */  sdc1      $f22, 0xd8($sp)
+/* 3CD1E8 E00C6808 F7B400D0 */  sdc1      $f20, 0xd0($sp)
+/* 3CD1EC E00C680C 00031080 */  sll       $v0, $v1, 2
+/* 3CD1F0 E00C6810 00431021 */  addu      $v0, $v0, $v1
+/* 3CD1F4 E00C6814 00021080 */  sll       $v0, $v0, 2
+/* 3CD1F8 E00C6818 00431023 */  subu      $v0, $v0, $v1
+/* 3CD1FC E00C681C 000218C0 */  sll       $v1, $v0, 3
+/* 3CD200 E00C6820 00431021 */  addu      $v0, $v0, $v1
+/* 3CD204 E00C6824 000210C0 */  sll       $v0, $v0, 3
+/* 3CD208 E00C6828 8D49000C */  lw        $t1, 0xc($t2)
+/* 3CD20C E00C682C 00441021 */  addu      $v0, $v0, $a0
+/* 3CD210 E00C6830 AFA20098 */  sw        $v0, 0x98($sp)
+/* 3CD214 E00C6834 8D2A0000 */  lw        $t2, ($t1)
+/* 3CD218 E00C6838 8D270034 */  lw        $a3, 0x34($t1)
+/* 3CD21C E00C683C AFAA009C */  sw        $t2, 0x9c($sp)
+/* 3CD220 E00C6840 C5380048 */  lwc1      $f24, 0x48($t1)
+/* 3CD224 E00C6844 114000FD */  beqz      $t2, .LE00C6C3C
+/* 3CD228 E00C6848 3C02E700 */   lui      $v0, 0xe700
+/* 3CD22C E00C684C 3C05DB06 */  lui       $a1, 0xdb06
+/* 3CD230 E00C6850 3C08800A */  lui       $t0, %hi(gMasterGfxPos)
+/* 3CD234 E00C6854 2508A66C */  addiu     $t0, $t0, %lo(gMasterGfxPos)
+/* 3CD238 E00C6858 34A50024 */  ori       $a1, $a1, 0x24
+/* 3CD23C E00C685C 8D040000 */  lw        $a0, ($t0)
+/* 3CD240 E00C6860 0080182D */  daddu     $v1, $a0, $zero
+/* 3CD244 E00C6864 24840008 */  addiu     $a0, $a0, 8
+/* 3CD248 E00C6868 AD040000 */  sw        $a0, ($t0)
+/* 3CD24C E00C686C AC620000 */  sw        $v0, ($v1)
+/* 3CD250 E00C6870 24820008 */  addiu     $v0, $a0, 8
+/* 3CD254 E00C6874 AC600004 */  sw        $zero, 4($v1)
+/* 3CD258 E00C6878 AD020000 */  sw        $v0, ($t0)
+/* 3CD25C E00C687C AC850000 */  sw        $a1, ($a0)
+/* 3CD260 E00C6880 8FAA0100 */  lw        $t2, 0x100($sp)
+/* 3CD264 E00C6884 8D430010 */  lw        $v1, 0x10($t2)
+/* 3CD268 E00C6888 24820010 */  addiu     $v0, $a0, 0x10
+/* 3CD26C E00C688C AD020000 */  sw        $v0, ($t0)
+/* 3CD270 E00C6890 8C63001C */  lw        $v1, 0x1c($v1)
+/* 3CD274 E00C6894 3C02FA00 */  lui       $v0, 0xfa00
+/* 3CD278 E00C6898 AC820008 */  sw        $v0, 8($a0)
+/* 3CD27C E00C689C 3C028000 */  lui       $v0, 0x8000
+/* 3CD280 E00C68A0 00621821 */  addu      $v1, $v1, $v0
+/* 3CD284 E00C68A4 AC830004 */  sw        $v1, 4($a0)
+/* 3CD288 E00C68A8 9122002B */  lbu       $v0, 0x2b($t1)
+/* 3CD28C E00C68AC 9125002F */  lbu       $a1, 0x2f($t1)
+/* 3CD290 E00C68B0 91260033 */  lbu       $a2, 0x33($t1)
+/* 3CD294 E00C68B4 24830018 */  addiu     $v1, $a0, 0x18
+/* 3CD298 E00C68B8 AD030000 */  sw        $v1, ($t0)
+/* 3CD29C E00C68BC 3C03FB00 */  lui       $v1, 0xfb00
+/* 3CD2A0 E00C68C0 AC830010 */  sw        $v1, 0x10($a0)
+/* 3CD2A4 E00C68C4 30E300FF */  andi      $v1, $a3, 0xff
+/* 3CD2A8 E00C68C8 00021600 */  sll       $v0, $v0, 0x18
+/* 3CD2AC E00C68CC 00052C00 */  sll       $a1, $a1, 0x10
+/* 3CD2B0 E00C68D0 00451025 */  or        $v0, $v0, $a1
+/* 3CD2B4 E00C68D4 00063200 */  sll       $a2, $a2, 8
+/* 3CD2B8 E00C68D8 00461025 */  or        $v0, $v0, $a2
+/* 3CD2BC E00C68DC 00431025 */  or        $v0, $v0, $v1
+/* 3CD2C0 E00C68E0 AC82000C */  sw        $v0, 0xc($a0)
+/* 3CD2C4 E00C68E4 9122003B */  lbu       $v0, 0x3b($t1)
+/* 3CD2C8 E00C68E8 9125003F */  lbu       $a1, 0x3f($t1)
+/* 3CD2CC E00C68EC 91260043 */  lbu       $a2, 0x43($t1)
+/* 3CD2D0 E00C68F0 91270047 */  lbu       $a3, 0x47($t1)
+/* 3CD2D4 E00C68F4 3C03DE00 */  lui       $v1, 0xde00
+/* 3CD2D8 E00C68F8 AC830018 */  sw        $v1, 0x18($a0)
+/* 3CD2DC E00C68FC 00021600 */  sll       $v0, $v0, 0x18
+/* 3CD2E0 E00C6900 00052C00 */  sll       $a1, $a1, 0x10
+/* 3CD2E4 E00C6904 00451025 */  or        $v0, $v0, $a1
+/* 3CD2E8 E00C6908 00063200 */  sll       $a2, $a2, 8
+/* 3CD2EC E00C690C 00461025 */  or        $v0, $v0, $a2
+/* 3CD2F0 E00C6910 00471025 */  or        $v0, $v0, $a3
+/* 3CD2F4 E00C6914 AC820014 */  sw        $v0, 0x14($a0)
+/* 3CD2F8 E00C6918 8FAA009C */  lw        $t2, 0x9c($sp)
+/* 3CD2FC E00C691C 000A1080 */  sll       $v0, $t2, 2
+/* 3CD300 E00C6920 3C01E00C */  lui       $at, %hi(D_E00C6C9C)
+/* 3CD304 E00C6924 00220821 */  addu      $at, $at, $v0
+/* 3CD308 E00C6928 8C226C9C */  lw        $v0, %lo(D_E00C6C9C)($at)
+/* 3CD30C E00C692C AC82001C */  sw        $v0, 0x1c($a0)
+/* 3CD310 E00C6930 8FAA0100 */  lw        $t2, 0x100($sp)
+/* 3CD314 E00C6934 0000B02D */  daddu     $s6, $zero, $zero
+/* 3CD318 E00C6938 8D420008 */  lw        $v0, 8($t2)
+/* 3CD31C E00C693C 24840020 */  addiu     $a0, $a0, 0x20
+/* 3CD320 E00C6940 184000BE */  blez      $v0, .LE00C6C3C
+/* 3CD324 E00C6944 AD040000 */   sw       $a0, ($t0)
+/* 3CD328 E00C6948 27B50058 */  addiu     $s5, $sp, 0x58
+/* 3CD32C E00C694C 3C1E800A */  lui       $fp, %hi(gDisplayContext)
+/* 3CD330 E00C6950 27DEA674 */  addiu     $fp, $fp, %lo(gDisplayContext)
+/* 3CD334 E00C6954 3C178007 */  lui       $s7, %hi(gMatrixListPos)
+/* 3CD338 E00C6958 26F741F0 */  addiu     $s7, $s7, %lo(gMatrixListPos)
+/* 3CD33C E00C695C 3C140001 */  lui       $s4, 1
+/* 3CD340 E00C6960 36941630 */  ori       $s4, $s4, 0x1630
+/* 3CD344 E00C6964 0100982D */  daddu     $s3, $t0, $zero
+/* 3CD348 E00C6968 3C0ADA38 */  lui       $t2, 0xda38
+/* 3CD34C E00C696C 354A0001 */  ori       $t2, $t2, 1
+/* 3CD350 E00C6970 4480B000 */  mtc1      $zero, $f22
+/* 3CD354 E00C6974 3C014300 */  lui       $at, 0x4300
+/* 3CD358 E00C6978 4481D000 */  mtc1      $at, $f26
+/* 3CD35C E00C697C 3C014080 */  lui       $at, 0x4080
+/* 3CD360 E00C6980 4481F000 */  mtc1      $at, $f30
+/* 3CD364 E00C6984 3C013F80 */  lui       $at, 0x3f80
+/* 3CD368 E00C6988 4481E000 */  mtc1      $at, $f28
+/* 3CD36C E00C698C 25320074 */  addiu     $s2, $t1, 0x74
+/* 3CD370 E00C6990 AFAA00A0 */  sw        $t2, 0xa0($sp)
+.LE00C6994:
+/* 3CD374 E00C6994 4600B306 */  mov.s     $f12, $f22
+/* 3CD378 E00C6998 C644FFD8 */  lwc1      $f4, -0x28($s2)
+/* 3CD37C E00C699C C640FFE0 */  lwc1      $f0, -0x20($s2)
+/* 3CD380 E00C69A0 8E46FFEC */  lw        $a2, -0x14($s2)
+/* 3CD384 E00C69A4 C642FFE4 */  lwc1      $f2, -0x1c($s2)
+/* 3CD388 E00C69A8 46002100 */  add.s     $f4, $f4, $f0
+/* 3CD38C E00C69AC C640FFDC */  lwc1      $f0, -0x24($s2)
+/* 3CD390 E00C69B0 8E47FFF0 */  lw        $a3, -0x10($s2)
+/* 3CD394 E00C69B4 46020000 */  add.s     $f0, $f0, $f2
+/* 3CD398 E00C69B8 4600B386 */  mov.s     $f14, $f22
+/* 3CD39C E00C69BC E644FFD8 */  swc1      $f4, -0x28($s2)
+/* 3CD3A0 E00C69C0 0C080148 */  jal       shim_atan2
+/* 3CD3A4 E00C69C4 E640FFDC */   swc1     $f0, -0x24($s2)
+/* 3CD3A8 E00C69C8 C6420000 */  lwc1      $f2, ($s2)
+/* 3CD3AC E00C69CC 46000507 */  neg.s     $f20, $f0
+/* 3CD3B0 E00C69D0 4602A500 */  add.s     $f20, $f20, $f2
+/* 3CD3B4 E00C69D4 0C080140 */  jal       shim_sin_deg
+/* 3CD3B8 E00C69D8 4600A306 */   mov.s    $f12, $f20
+/* 3CD3BC E00C69DC 4600A306 */  mov.s     $f12, $f20
+/* 3CD3C0 E00C69E0 0C080144 */  jal       shim_cos_deg
+/* 3CD3C4 E00C69E4 E640FFE0 */   swc1     $f0, -0x20($s2)
+/* 3CD3C8 E00C69E8 C642FFD8 */  lwc1      $f2, -0x28($s2)
+/* 3CD3CC E00C69EC 4616103C */  c.lt.s    $f2, $f22
+/* 3CD3D0 E00C69F0 00000000 */  nop
+/* 3CD3D4 E00C69F4 45000003 */  bc1f      .LE00C6A04
+/* 3CD3D8 E00C69F8 E640FFE4 */   swc1     $f0, -0x1c($s2)
+/* 3CD3DC E00C69FC 461A1000 */  add.s     $f0, $f2, $f26
+/* 3CD3E0 E00C6A00 E640FFD8 */  swc1      $f0, -0x28($s2)
+.LE00C6A04:
+/* 3CD3E4 E00C6A04 C640FFDC */  lwc1      $f0, -0x24($s2)
+/* 3CD3E8 E00C6A08 4600D03C */  c.lt.s    $f26, $f0
+/* 3CD3EC E00C6A0C 00000000 */  nop
+/* 3CD3F0 E00C6A10 45000003 */  bc1f      .LE00C6A20
+/* 3CD3F4 E00C6A14 00000000 */   nop
+/* 3CD3F8 E00C6A18 461A0001 */  sub.s     $f0, $f0, $f26
+/* 3CD3FC E00C6A1C E640FFDC */  swc1      $f0, -0x24($s2)
+.LE00C6A20:
+/* 3CD400 E00C6A20 C642FFD8 */  lwc1      $f2, -0x28($s2)
+/* 3CD404 E00C6A24 461E1082 */  mul.s     $f2, $f2, $f30
+/* 3CD408 E00C6A28 00000000 */  nop
+/* 3CD40C E00C6A2C 27A40018 */  addiu     $a0, $sp, 0x18
+/* 3CD410 E00C6A30 C640FFDC */  lwc1      $f0, -0x24($s2)
+/* 3CD414 E00C6A34 461E0002 */  mul.s     $f0, $f0, $f30
+/* 3CD418 E00C6A38 00000000 */  nop
+/* 3CD41C E00C6A3C 8E45FF90 */  lw        $a1, -0x70($s2)
+/* 3CD420 E00C6A40 8E46FF94 */  lw        $a2, -0x6c($s2)
+/* 3CD424 E00C6A44 8E47FF98 */  lw        $a3, -0x68($s2)
+/* 3CD428 E00C6A48 4600118D */  trunc.w.s $f6, $f2
+/* 3CD42C E00C6A4C 44103000 */  mfc1      $s0, $f6
+/* 3CD430 E00C6A50 4600018D */  trunc.w.s $f6, $f0
+/* 3CD434 E00C6A54 44113000 */  mfc1      $s1, $f6
+/* 3CD438 E00C6A58 0C080108 */  jal       shim_guTranslateF
+/* 3CD43C E00C6A5C 26D60001 */   addiu    $s6, $s6, 1
+/* 3CD440 E00C6A60 4405C000 */  mfc1      $a1, $f24
+/* 3CD444 E00C6A64 4406C000 */  mfc1      $a2, $f24
+/* 3CD448 E00C6A68 4407C000 */  mfc1      $a3, $f24
+/* 3CD44C E00C6A6C 0C080110 */  jal       shim_guScaleF
+/* 3CD450 E00C6A70 02A0202D */   daddu    $a0, $s5, $zero
+/* 3CD454 E00C6A74 02A0202D */  daddu     $a0, $s5, $zero
+/* 3CD458 E00C6A78 27A50018 */  addiu     $a1, $sp, 0x18
+/* 3CD45C E00C6A7C 0C080114 */  jal       shim_guMtxCatF
+/* 3CD460 E00C6A80 00A0302D */   daddu    $a2, $a1, $zero
+/* 3CD464 E00C6A84 27A40018 */  addiu     $a0, $sp, 0x18
+/* 3CD468 E00C6A88 96E50000 */  lhu       $a1, ($s7)
+/* 3CD46C E00C6A8C 8FC20000 */  lw        $v0, ($fp)
+/* 3CD470 E00C6A90 00052980 */  sll       $a1, $a1, 6
+/* 3CD474 E00C6A94 00B42821 */  addu      $a1, $a1, $s4
+/* 3CD478 E00C6A98 0C080118 */  jal       shim_guMtxF2L
+/* 3CD47C E00C6A9C 00452821 */   addu     $a1, $v0, $a1
+/* 3CD480 E00C6AA0 3C02DA38 */  lui       $v0, 0xda38
+/* 3CD484 E00C6AA4 34420002 */  ori       $v0, $v0, 2
+/* 3CD488 E00C6AA8 8E680000 */  lw        $t0, ($s3)
+/* 3CD48C E00C6AAC 96E50000 */  lhu       $a1, ($s7)
+/* 3CD490 E00C6AB0 0100302D */  daddu     $a2, $t0, $zero
+/* 3CD494 E00C6AB4 25080008 */  addiu     $t0, $t0, 8
+/* 3CD498 E00C6AB8 AE680000 */  sw        $t0, ($s3)
+/* 3CD49C E00C6ABC ACC20000 */  sw        $v0, ($a2)
+/* 3CD4A0 E00C6AC0 30A2FFFF */  andi      $v0, $a1, 0xffff
+/* 3CD4A4 E00C6AC4 00021180 */  sll       $v0, $v0, 6
+/* 3CD4A8 E00C6AC8 8FC30000 */  lw        $v1, ($fp)
+/* 3CD4AC E00C6ACC 00541021 */  addu      $v0, $v0, $s4
+/* 3CD4B0 E00C6AD0 00621821 */  addu      $v1, $v1, $v0
+/* 3CD4B4 E00C6AD4 ACC30004 */  sw        $v1, 4($a2)
+/* 3CD4B8 E00C6AD8 8FAA00A0 */  lw        $t2, 0xa0($sp)
+/* 3CD4BC E00C6ADC 27A40018 */  addiu     $a0, $sp, 0x18
+/* 3CD4C0 E00C6AE0 AD0A0000 */  sw        $t2, ($t0)
+/* 3CD4C4 E00C6AE4 8FAA0098 */  lw        $t2, 0x98($sp)
+/* 3CD4C8 E00C6AE8 4407E000 */  mfc1      $a3, $f28
+/* 3CD4CC E00C6AEC 8D420204 */  lw        $v0, 0x204($t2)
+/* 3CD4D0 E00C6AF0 24A50001 */  addiu     $a1, $a1, 1
+/* 3CD4D4 E00C6AF4 A6E50000 */  sh        $a1, ($s7)
+/* 3CD4D8 E00C6AF8 AD020004 */  sw        $v0, 4($t0)
+/* 3CD4DC E00C6AFC 8E45FFFC */  lw        $a1, -4($s2)
+/* 3CD4E0 E00C6B00 8E46FFF8 */  lw        $a2, -8($s2)
+/* 3CD4E4 E00C6B04 25080008 */  addiu     $t0, $t0, 8
+/* 3CD4E8 E00C6B08 0C080110 */  jal       shim_guScaleF
+/* 3CD4EC E00C6B0C AE680000 */   sw       $t0, ($s3)
+/* 3CD4F0 E00C6B10 E7BC0010 */  swc1      $f28, 0x10($sp)
+/* 3CD4F4 E00C6B14 8E450000 */  lw        $a1, ($s2)
+/* 3CD4F8 E00C6B18 4406B000 */  mfc1      $a2, $f22
+/* 3CD4FC E00C6B1C 4407B000 */  mfc1      $a3, $f22
+/* 3CD500 E00C6B20 0C080104 */  jal       shim_guRotateF
+/* 3CD504 E00C6B24 02A0202D */   daddu    $a0, $s5, $zero
+/* 3CD508 E00C6B28 02A0202D */  daddu     $a0, $s5, $zero
+/* 3CD50C E00C6B2C 27A50018 */  addiu     $a1, $sp, 0x18
+/* 3CD510 E00C6B30 0C080114 */  jal       shim_guMtxCatF
+/* 3CD514 E00C6B34 00A0302D */   daddu    $a2, $a1, $zero
+/* 3CD518 E00C6B38 27A40018 */  addiu     $a0, $sp, 0x18
+/* 3CD51C E00C6B3C 96E50000 */  lhu       $a1, ($s7)
+/* 3CD520 E00C6B40 8FC20000 */  lw        $v0, ($fp)
+/* 3CD524 E00C6B44 00052980 */  sll       $a1, $a1, 6
+/* 3CD528 E00C6B48 00B42821 */  addu      $a1, $a1, $s4
+/* 3CD52C E00C6B4C 0C080118 */  jal       shim_guMtxF2L
+/* 3CD530 E00C6B50 00452821 */   addu     $a1, $v0, $a1
+/* 3CD534 E00C6B54 3C06D838 */  lui       $a2, 0xd838
+/* 3CD538 E00C6B58 8E650000 */  lw        $a1, ($s3)
+/* 3CD53C E00C6B5C 96E30000 */  lhu       $v1, ($s7)
+/* 3CD540 E00C6B60 00A0202D */  daddu     $a0, $a1, $zero
+/* 3CD544 E00C6B64 24A50008 */  addiu     $a1, $a1, 8
+/* 3CD548 E00C6B68 24620001 */  addiu     $v0, $v1, 1
+/* 3CD54C E00C6B6C 3063FFFF */  andi      $v1, $v1, 0xffff
+/* 3CD550 E00C6B70 AE650000 */  sw        $a1, ($s3)
+/* 3CD554 E00C6B74 8FAA00A0 */  lw        $t2, 0xa0($sp)
+/* 3CD558 E00C6B78 00031980 */  sll       $v1, $v1, 6
+/* 3CD55C E00C6B7C AC8A0000 */  sw        $t2, ($a0)
+/* 3CD560 E00C6B80 A6E20000 */  sh        $v0, ($s7)
+/* 3CD564 E00C6B84 8FC20000 */  lw        $v0, ($fp)
+/* 3CD568 E00C6B88 00741821 */  addu      $v1, $v1, $s4
+/* 3CD56C E00C6B8C 00431021 */  addu      $v0, $v0, $v1
+/* 3CD570 E00C6B90 AC820004 */  sw        $v0, 4($a0)
+/* 3CD574 E00C6B94 24A20008 */  addiu     $v0, $a1, 8
+/* 3CD578 E00C6B98 32040FFF */  andi      $a0, $s0, 0xfff
+/* 3CD57C E00C6B9C 00042300 */  sll       $a0, $a0, 0xc
+/* 3CD580 E00C6BA0 AE620000 */  sw        $v0, ($s3)
+/* 3CD584 E00C6BA4 32220FFF */  andi      $v0, $s1, 0xfff
+/* 3CD588 E00C6BA8 3C03F200 */  lui       $v1, 0xf200
+/* 3CD58C E00C6BAC 00431025 */  or        $v0, $v0, $v1
+/* 3CD590 E00C6BB0 00822025 */  or        $a0, $a0, $v0
+/* 3CD594 E00C6BB4 2610003F */  addiu     $s0, $s0, 0x3f
+/* 3CD598 E00C6BB8 00108080 */  sll       $s0, $s0, 2
+/* 3CD59C E00C6BBC 32100FFF */  andi      $s0, $s0, 0xfff
+/* 3CD5A0 E00C6BC0 00108300 */  sll       $s0, $s0, 0xc
+/* 3CD5A4 E00C6BC4 2631000F */  addiu     $s1, $s1, 0xf
+/* 3CD5A8 E00C6BC8 00118880 */  sll       $s1, $s1, 2
+/* 3CD5AC E00C6BCC 32310FFF */  andi      $s1, $s1, 0xfff
+/* 3CD5B0 E00C6BD0 3C020100 */  lui       $v0, 0x100
+/* 3CD5B4 E00C6BD4 02228825 */  or        $s1, $s1, $v0
+/* 3CD5B8 E00C6BD8 02118025 */  or        $s0, $s0, $s1
+/* 3CD5BC E00C6BDC 3C02DE00 */  lui       $v0, 0xde00
+/* 3CD5C0 E00C6BE0 ACA40000 */  sw        $a0, ($a1)
+/* 3CD5C4 E00C6BE4 ACB00004 */  sw        $s0, 4($a1)
+/* 3CD5C8 E00C6BE8 ACA20008 */  sw        $v0, 8($a1)
+/* 3CD5CC E00C6BEC 8FAA009C */  lw        $t2, 0x9c($sp)
+/* 3CD5D0 E00C6BF0 34C60002 */  ori       $a2, $a2, 2
+/* 3CD5D4 E00C6BF4 000A1080 */  sll       $v0, $t2, 2
+/* 3CD5D8 E00C6BF8 3C0AE00C */  lui       $t2, %hi(D_E00C6C90)
+/* 3CD5DC E00C6BFC 254A6C90 */  addiu     $t2, $t2, %lo(D_E00C6C90)
+/* 3CD5E0 E00C6C00 004A1021 */  addu      $v0, $v0, $t2
+/* 3CD5E4 E00C6C04 8C430000 */  lw        $v1, ($v0)
+/* 3CD5E8 E00C6C08 24A20010 */  addiu     $v0, $a1, 0x10
+/* 3CD5EC E00C6C0C AE620000 */  sw        $v0, ($s3)
+/* 3CD5F0 E00C6C10 24020040 */  addiu     $v0, $zero, 0x40
+/* 3CD5F4 E00C6C14 ACA60010 */  sw        $a2, 0x10($a1)
+/* 3CD5F8 E00C6C18 ACA20014 */  sw        $v0, 0x14($a1)
+/* 3CD5FC E00C6C1C ACA3000C */  sw        $v1, 0xc($a1)
+/* 3CD600 E00C6C20 8FAA0100 */  lw        $t2, 0x100($sp)
+/* 3CD604 E00C6C24 2652007C */  addiu     $s2, $s2, 0x7c
+/* 3CD608 E00C6C28 8D420008 */  lw        $v0, 8($t2)
+/* 3CD60C E00C6C2C 24A50018 */  addiu     $a1, $a1, 0x18
+/* 3CD610 E00C6C30 02C2102A */  slt       $v0, $s6, $v0
+/* 3CD614 E00C6C34 1440FF57 */  bnez      $v0, .LE00C6994
+/* 3CD618 E00C6C38 AE650000 */   sw       $a1, ($s3)
+.LE00C6C3C:
+/* 3CD61C E00C6C3C 8FBF00CC */  lw        $ra, 0xcc($sp)
+/* 3CD620 E00C6C40 8FBE00C8 */  lw        $fp, 0xc8($sp)
+/* 3CD624 E00C6C44 8FB700C4 */  lw        $s7, 0xc4($sp)
+/* 3CD628 E00C6C48 8FB600C0 */  lw        $s6, 0xc0($sp)
+/* 3CD62C E00C6C4C 8FB500BC */  lw        $s5, 0xbc($sp)
+/* 3CD630 E00C6C50 8FB400B8 */  lw        $s4, 0xb8($sp)
+/* 3CD634 E00C6C54 8FB300B4 */  lw        $s3, 0xb4($sp)
+/* 3CD638 E00C6C58 8FB200B0 */  lw        $s2, 0xb0($sp)
+/* 3CD63C E00C6C5C 8FB100AC */  lw        $s1, 0xac($sp)
+/* 3CD640 E00C6C60 8FB000A8 */  lw        $s0, 0xa8($sp)
+/* 3CD644 E00C6C64 D7BE00F8 */  ldc1      $f30, 0xf8($sp)
+/* 3CD648 E00C6C68 D7BC00F0 */  ldc1      $f28, 0xf0($sp)
+/* 3CD64C E00C6C6C D7BA00E8 */  ldc1      $f26, 0xe8($sp)
+/* 3CD650 E00C6C70 D7B800E0 */  ldc1      $f24, 0xe0($sp)
+/* 3CD654 E00C6C74 D7B600D8 */  ldc1      $f22, 0xd8($sp)
+/* 3CD658 E00C6C78 D7B400D0 */  ldc1      $f20, 0xd0($sp)
+/* 3CD65C E00C6C7C 03E00008 */  jr        $ra
+/* 3CD660 E00C6C80 27BD0100 */   addiu    $sp, $sp, 0x100
+/* 3CD664 E00C6C84 00000000 */  nop
+/* 3CD668 E00C6C88 00000000 */  nop
+/* 3CD66C E00C6C8C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s
index da8a0008b1..a3aaa34ca7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_63/fx_63_main.s
@@ -2,134 +2,239 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_63_main
-/* 37F720 E007E000 27BDFF98 */  addiu     $sp, $sp, -0x68
-/* 37F724 E007E004 F7B40050 */  sdc1      $f20, 0x50($sp)
-/* 37F728 E007E008 4485A000 */  mtc1      $a1, $f20
-/* 37F72C E007E00C AFB00028 */  sw        $s0, 0x28($sp)
-/* 37F730 E007E010 0080802D */  daddu     $s0, $a0, $zero
-/* 37F734 E007E014 F7B60058 */  sdc1      $f22, 0x58($sp)
-/* 37F738 E007E018 4486B000 */  mtc1      $a2, $f22
-/* 37F73C E007E01C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 37F740 E007E020 F7B80060 */  sdc1      $f24, 0x60($sp)
-/* 37F744 E007E024 4487C000 */  mtc1      $a3, $f24
-/* 37F748 E007E028 3C02E008 */  lui       $v0, %hi(fx_63_init)
-/* 37F74C E007E02C 2442E1FC */  addiu     $v0, $v0, %lo(fx_63_init)
-/* 37F750 E007E030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 37F754 E007E034 3C02E008 */  lui       $v0, %hi(fx_63_update)
-/* 37F758 E007E038 2442E204 */  addiu     $v0, $v0, %lo(fx_63_update)
-/* 37F75C E007E03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 37F760 E007E040 3C02E008 */  lui       $v0, %hi(fx_63_render)
-/* 37F764 E007E044 2442E508 */  addiu     $v0, $v0, %lo(fx_63_render)
-/* 37F768 E007E048 AFA20020 */  sw        $v0, 0x20($sp)
-/* 37F76C E007E04C 2402003F */  addiu     $v0, $zero, 0x3f
-/* 37F770 E007E050 AFBF0048 */  sw        $ra, 0x48($sp)
-/* 37F774 E007E054 AFB70044 */  sw        $s7, 0x44($sp)
-/* 37F778 E007E058 AFB60040 */  sw        $s6, 0x40($sp)
-/* 37F77C E007E05C AFB5003C */  sw        $s5, 0x3c($sp)
-/* 37F780 E007E060 AFB40038 */  sw        $s4, 0x38($sp)
-/* 37F784 E007E064 AFB30034 */  sw        $s3, 0x34($sp)
-/* 37F788 E007E068 AFB20030 */  sw        $s2, 0x30($sp)
-/* 37F78C E007E06C AFB1002C */  sw        $s1, 0x2c($sp)
-/* 37F790 E007E070 AFA00010 */  sw        $zero, 0x10($sp)
-/* 37F794 E007E074 AFA00024 */  sw        $zero, 0x24($sp)
-/* 37F798 E007E078 0C080124 */  jal       shim_create_effect_instance
-/* 37F79C E007E07C AFA20014 */   sw       $v0, 0x14($sp)
-/* 37F7A0 E007E080 24040934 */  addiu     $a0, $zero, 0x934
-/* 37F7A4 E007E084 2414001F */  addiu     $s4, $zero, 0x1f
-/* 37F7A8 E007E088 0040982D */  daddu     $s3, $v0, $zero
-/* 37F7AC E007E08C 0C08012C */  jal       shim_general_heap_malloc
-/* 37F7B0 E007E090 AE740008 */   sw       $s4, 8($s3)
-/* 37F7B4 E007E094 0040882D */  daddu     $s1, $v0, $zero
-/* 37F7B8 E007E098 16200003 */  bnez      $s1, .LE007E0A8
-/* 37F7BC E007E09C AE71000C */   sw       $s1, 0xc($s3)
-.LE007E0A0:
-/* 37F7C0 E007E0A0 0801F828 */  j         .LE007E0A0
-/* 37F7C4 E007E0A4 00000000 */   nop
-.LE007E0A8:
-/* 37F7C8 E007E0A8 AE200004 */  sw        $zero, 4($s1)
-/* 37F7CC E007E0AC AE300000 */  sw        $s0, ($s1)
-/* 37F7D0 E007E0B0 E6340008 */  swc1      $f20, 8($s1)
-/* 37F7D4 E007E0B4 E636000C */  swc1      $f22, 0xc($s1)
-/* 37F7D8 E007E0B8 E6380010 */  swc1      $f24, 0x10($s1)
-/* 37F7DC E007E0BC 8FA20078 */  lw        $v0, 0x78($sp)
-/* 37F7E0 E007E0C0 3C013F00 */  lui       $at, 0x3f00
-/* 37F7E4 E007E0C4 44810000 */  mtc1      $at, $f0
-/* 37F7E8 E007E0C8 3C01C120 */  lui       $at, 0xc120
-/* 37F7EC E007E0CC 44811000 */  mtc1      $at, $f2
-/* 37F7F0 E007E0D0 24120001 */  addiu     $s2, $zero, 1
-/* 37F7F4 E007E0D4 AE200044 */  sw        $zero, 0x44($s1)
-/* 37F7F8 E007E0D8 AE200034 */  sw        $zero, 0x34($s1)
-/* 37F7FC E007E0DC AE200038 */  sw        $zero, 0x38($s1)
-/* 37F800 E007E0E0 AE200028 */  sw        $zero, 0x28($s1)
-/* 37F804 E007E0E4 AE220040 */  sw        $v0, 0x40($s1)
-/* 37F808 E007E0E8 240200FF */  addiu     $v0, $zero, 0xff
-/* 37F80C E007E0EC AE22003C */  sw        $v0, 0x3c($s1)
-/* 37F810 E007E0F0 E6200030 */  swc1      $f0, 0x30($s1)
-/* 37F814 E007E0F4 E622002C */  swc1      $f2, 0x2c($s1)
-/* 37F818 E007E0F8 0254102A */  slt       $v0, $s2, $s4
-/* 37F81C E007E0FC 10400030 */  beqz      $v0, .LE007E1C0
-/* 37F820 E007E100 2631004C */   addiu    $s1, $s1, 0x4c
-/* 37F824 E007E104 0240B82D */  daddu     $s7, $s2, $zero
-/* 37F828 E007E108 241600FF */  addiu     $s6, $zero, 0xff
-/* 37F82C E007E10C 2415000A */  addiu     $s5, $zero, 0xa
-/* 37F830 E007E110 26300040 */  addiu     $s0, $s1, 0x40
-/* 37F834 E007E114 3C014100 */  lui       $at, 0x4100
-/* 37F838 E007E118 4481B000 */  mtc1      $at, $f22
-/* 37F83C E007E11C 3C01E008 */  lui       $at, %hi(D_E007EC40)
-/* 37F840 E007E120 D434EC40 */  ldc1      $f20, %lo(D_E007EC40)($at)
-.LE007E124:
-/* 37F844 E007E124 24040014 */  addiu     $a0, $zero, 0x14
-/* 37F848 E007E128 AE370000 */  sw        $s7, ($s1)
-/* 37F84C E007E12C AE00FFC8 */  sw        $zero, -0x38($s0)
-/* 37F850 E007E130 AE00FFCC */  sw        $zero, -0x34($s0)
-/* 37F854 E007E134 AE00FFD0 */  sw        $zero, -0x30($s0)
-/* 37F858 E007E138 E616FFD4 */  swc1      $f22, -0x2c($s0)
-/* 37F85C E007E13C 0C080000 */  jal       func_E0200000
-/* 37F860 E007E140 AE00FFD8 */   sw       $zero, -0x28($s0)
-/* 37F864 E007E144 2404000A */  addiu     $a0, $zero, 0xa
-/* 37F868 E007E148 2442FFF8 */  addiu     $v0, $v0, -8
-/* 37F86C E007E14C 44820000 */  mtc1      $v0, $f0
-/* 37F870 E007E150 00000000 */  nop
-/* 37F874 E007E154 46800020 */  cvt.s.w   $f0, $f0
-/* 37F878 E007E158 0C080000 */  jal       func_E0200000
-/* 37F87C E007E15C E600FFDC */   swc1     $f0, -0x24($s0)
-/* 37F880 E007E160 2442FFFB */  addiu     $v0, $v0, -5
-/* 37F884 E007E164 44820000 */  mtc1      $v0, $f0
-/* 37F888 E007E168 00000000 */  nop
-/* 37F88C E007E16C 46800021 */  cvt.d.w   $f0, $f0
-/* 37F890 E007E170 46340002 */  mul.d     $f0, $f0, $f20
-/* 37F894 E007E174 00000000 */  nop
-/* 37F898 E007E178 24040050 */  addiu     $a0, $zero, 0x50
-/* 37F89C E007E17C 2631004C */  addiu     $s1, $s1, 0x4c
-/* 37F8A0 E007E180 46200020 */  cvt.s.d   $f0, $f0
-/* 37F8A4 E007E184 0C080000 */  jal       func_E0200000
-/* 37F8A8 E007E188 E600FFE0 */   swc1     $f0, -0x20($s0)
-/* 37F8AC E007E18C 2643FFFF */  addiu     $v1, $s2, -1
-/* 37F8B0 E007E190 26520001 */  addiu     $s2, $s2, 1
-/* 37F8B4 E007E194 24420005 */  addiu     $v0, $v0, 5
-/* 37F8B8 E007E198 44820000 */  mtc1      $v0, $f0
-/* 37F8BC E007E19C 00000000 */  nop
-/* 37F8C0 E007E1A0 46800020 */  cvt.s.w   $f0, $f0
-/* 37F8C4 E007E1A4 E600FFE4 */  swc1      $f0, -0x1c($s0)
-/* 37F8C8 E007E1A8 AE16FFFC */  sw        $s6, -4($s0)
-/* 37F8CC E007E1AC AE030008 */  sw        $v1, 8($s0)
-/* 37F8D0 E007E1B0 AE150000 */  sw        $s5, ($s0)
-/* 37F8D4 E007E1B4 0254102A */  slt       $v0, $s2, $s4
-/* 37F8D8 E007E1B8 1440FFDA */  bnez      $v0, .LE007E124
-/* 37F8DC E007E1BC 2610004C */   addiu    $s0, $s0, 0x4c
-.LE007E1C0:
-/* 37F8E0 E007E1C0 0260102D */  daddu     $v0, $s3, $zero
-/* 37F8E4 E007E1C4 8FBF0048 */  lw        $ra, 0x48($sp)
-/* 37F8E8 E007E1C8 8FB70044 */  lw        $s7, 0x44($sp)
-/* 37F8EC E007E1CC 8FB60040 */  lw        $s6, 0x40($sp)
-/* 37F8F0 E007E1D0 8FB5003C */  lw        $s5, 0x3c($sp)
-/* 37F8F4 E007E1D4 8FB40038 */  lw        $s4, 0x38($sp)
-/* 37F8F8 E007E1D8 8FB30034 */  lw        $s3, 0x34($sp)
-/* 37F8FC E007E1DC 8FB20030 */  lw        $s2, 0x30($sp)
-/* 37F900 E007E1E0 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 37F904 E007E1E4 8FB00028 */  lw        $s0, 0x28($sp)
-/* 37F908 E007E1E8 D7B80060 */  ldc1      $f24, 0x60($sp)
-/* 37F90C E007E1EC D7B60058 */  ldc1      $f22, 0x58($sp)
-/* 37F910 E007E1F0 D7B40050 */  ldc1      $f20, 0x50($sp)
-/* 37F914 E007E1F4 03E00008 */  jr        $ra
-/* 37F918 E007E1F8 27BD0068 */   addiu    $sp, $sp, 0x68
+/* 3CC9E0 E00C6000 27BDFF88 */  addiu     $sp, $sp, -0x78
+/* 3CC9E4 E00C6004 AFB1002C */  sw        $s1, 0x2c($sp)
+/* 3CC9E8 E00C6008 0080882D */  daddu     $s1, $a0, $zero
+/* 3CC9EC E00C600C AFB30034 */  sw        $s3, 0x34($sp)
+/* 3CC9F0 E00C6010 24130001 */  addiu     $s3, $zero, 1
+/* 3CC9F4 E00C6014 AFB5003C */  sw        $s5, 0x3c($sp)
+/* 3CC9F8 E00C6018 8FB50098 */  lw        $s5, 0x98($sp)
+/* 3CC9FC E00C601C 27A40010 */  addiu     $a0, $sp, 0x10
+/* 3CCA00 E00C6020 AFB20030 */  sw        $s2, 0x30($sp)
+/* 3CCA04 E00C6024 8FB2009C */  lw        $s2, 0x9c($sp)
+/* 3CCA08 E00C6028 24020002 */  addiu     $v0, $zero, 2
+/* 3CCA0C E00C602C AFBF0040 */  sw        $ra, 0x40($sp)
+/* 3CCA10 E00C6030 AFB40038 */  sw        $s4, 0x38($sp)
+/* 3CCA14 E00C6034 AFB00028 */  sw        $s0, 0x28($sp)
+/* 3CCA18 E00C6038 F7BE0070 */  sdc1      $f30, 0x70($sp)
+/* 3CCA1C E00C603C F7BC0068 */  sdc1      $f28, 0x68($sp)
+/* 3CCA20 E00C6040 F7BA0060 */  sdc1      $f26, 0x60($sp)
+/* 3CCA24 E00C6044 F7B80058 */  sdc1      $f24, 0x58($sp)
+/* 3CCA28 E00C6048 F7B60050 */  sdc1      $f22, 0x50($sp)
+/* 3CCA2C E00C604C F7B40048 */  sdc1      $f20, 0x48($sp)
+/* 3CCA30 E00C6050 AFA5007C */  sw        $a1, 0x7c($sp)
+/* 3CCA34 E00C6054 AFA60080 */  sw        $a2, 0x80($sp)
+/* 3CCA38 E00C6058 16220002 */  bne       $s1, $v0, .LE00C6064
+/* 3CCA3C E00C605C AFA70084 */   sw       $a3, 0x84($sp)
+/* 3CCA40 E00C6060 24130008 */  addiu     $s3, $zero, 8
+.LE00C6064:
+/* 3CCA44 E00C6064 3C02E00C */  lui       $v0, %hi(fx_63_init)
+/* 3CCA48 E00C6068 24426394 */  addiu     $v0, $v0, %lo(fx_63_init)
+/* 3CCA4C E00C606C AFA20018 */  sw        $v0, 0x18($sp)
+/* 3CCA50 E00C6070 3C02E00C */  lui       $v0, %hi(fx_63_update)
+/* 3CCA54 E00C6074 2442639C */  addiu     $v0, $v0, %lo(fx_63_update)
+/* 3CCA58 E00C6078 AFA2001C */  sw        $v0, 0x1c($sp)
+/* 3CCA5C E00C607C 3C02E00C */  lui       $v0, %hi(fx_63_render)
+/* 3CCA60 E00C6080 24426768 */  addiu     $v0, $v0, %lo(fx_63_render)
+/* 3CCA64 E00C6084 AFA20020 */  sw        $v0, 0x20($sp)
+/* 3CCA68 E00C6088 24020063 */  addiu     $v0, $zero, 0x63
+/* 3CCA6C E00C608C AFA00010 */  sw        $zero, 0x10($sp)
+/* 3CCA70 E00C6090 AFA00024 */  sw        $zero, 0x24($sp)
+/* 3CCA74 E00C6094 0C080124 */  jal       shim_create_effect_instance
+/* 3CCA78 E00C6098 AFA20014 */   sw       $v0, 0x14($sp)
+/* 3CCA7C E00C609C 00132140 */  sll       $a0, $s3, 5
+/* 3CCA80 E00C60A0 00932023 */  subu      $a0, $a0, $s3
+/* 3CCA84 E00C60A4 00042080 */  sll       $a0, $a0, 2
+/* 3CCA88 E00C60A8 0040A02D */  daddu     $s4, $v0, $zero
+/* 3CCA8C E00C60AC 0C08012C */  jal       shim_general_heap_malloc
+/* 3CCA90 E00C60B0 AE930008 */   sw       $s3, 8($s4)
+/* 3CCA94 E00C60B4 0040802D */  daddu     $s0, $v0, $zero
+/* 3CCA98 E00C60B8 16000003 */  bnez      $s0, .LE00C60C8
+/* 3CCA9C E00C60BC AE82000C */   sw       $v0, 0xc($s4)
+.LE00C60C0:
+/* 3CCAA0 E00C60C0 08031830 */  j         .LE00C60C0
+/* 3CCAA4 E00C60C4 00000000 */   nop
+.LE00C60C8:
+/* 3CCAA8 E00C60C8 5E400003 */  bgtzl     $s2, .LE00C60D8
+/* 3CCAAC E00C60CC AE120020 */   sw       $s2, 0x20($s0)
+/* 3CCAB0 E00C60D0 240203E8 */  addiu     $v0, $zero, 0x3e8
+/* 3CCAB4 E00C60D4 AE020020 */  sw        $v0, 0x20($s0)
+.LE00C60D8:
+/* 3CCAB8 E00C60D8 C7AA007C */  lwc1      $f10, 0x7c($sp)
+/* 3CCABC E00C60DC E60A0004 */  swc1      $f10, 4($s0)
+/* 3CCAC0 E00C60E0 C7A00088 */  lwc1      $f0, 0x88($sp)
+/* 3CCAC4 E00C60E4 46005086 */  mov.s     $f2, $f10
+/* 3CCAC8 E00C60E8 AE110000 */  sw        $s1, ($s0)
+/* 3CCACC E00C60EC AE000024 */  sw        $zero, 0x24($s0)
+/* 3CCAD0 E00C60F0 AE15001C */  sw        $s5, 0x1c($s0)
+/* 3CCAD4 E00C60F4 AE000034 */  sw        $zero, 0x34($s0)
+/* 3CCAD8 E00C60F8 E6000010 */  swc1      $f0, 0x10($s0)
+/* 3CCADC E00C60FC C7AA0080 */  lwc1      $f10, 0x80($sp)
+/* 3CCAE0 E00C6100 E60A0008 */  swc1      $f10, 8($s0)
+/* 3CCAE4 E00C6104 C7AA0084 */  lwc1      $f10, 0x84($sp)
+/* 3CCAE8 E00C6108 46000206 */  mov.s     $f8, $f0
+/* 3CCAEC E00C610C E60A000C */  swc1      $f10, 0xc($s0)
+/* 3CCAF0 E00C6110 C7A0008C */  lwc1      $f0, 0x8c($sp)
+/* 3CCAF4 E00C6114 46024201 */  sub.s     $f8, $f8, $f2
+/* 3CCAF8 E00C6118 E6000014 */  swc1      $f0, 0x14($s0)
+/* 3CCAFC E00C611C C7A00090 */  lwc1      $f0, 0x90($sp)
+/* 3CCB00 E00C6120 C6020014 */  lwc1      $f2, 0x14($s0)
+/* 3CCB04 E00C6124 E6000018 */  swc1      $f0, 0x18($s0)
+/* 3CCB08 E00C6128 C7A00094 */  lwc1      $f0, 0x94($sp)
+/* 3CCB0C E00C612C 44952000 */  mtc1      $s5, $f4
+/* 3CCB10 E00C6130 00000000 */  nop
+/* 3CCB14 E00C6134 46802120 */  cvt.s.w   $f4, $f4
+/* 3CCB18 E00C6138 E6000048 */  swc1      $f0, 0x48($s0)
+/* 3CCB1C E00C613C C6000008 */  lwc1      $f0, 8($s0)
+/* 3CCB20 E00C6140 46005186 */  mov.s     $f6, $f10
+/* 3CCB24 E00C6144 46001081 */  sub.s     $f2, $f2, $f0
+/* 3CCB28 E00C6148 C6000018 */  lwc1      $f0, 0x18($s0)
+/* 3CCB2C E00C614C 46044203 */  div.s     $f8, $f8, $f4
+/* 3CCB30 E00C6150 E6080060 */  swc1      $f8, 0x60($s0)
+/* 3CCB34 E00C6154 46060001 */  sub.s     $f0, $f0, $f6
+/* 3CCB38 E00C6158 46041083 */  div.s     $f2, $f2, $f4
+/* 3CCB3C E00C615C E6020064 */  swc1      $f2, 0x64($s0)
+/* 3CCB40 E00C6160 46040003 */  div.s     $f0, $f0, $f4
+/* 3CCB44 E00C6164 1220007B */  beqz      $s1, .LE00C6354
+/* 3CCB48 E00C6168 E6000068 */   swc1     $f0, 0x68($s0)
+/* 3CCB4C E00C616C 24020001 */  addiu     $v0, $zero, 1
+/* 3CCB50 E00C6170 1622002B */  bne       $s1, $v0, .LE00C6220
+/* 3CCB54 E00C6174 24040168 */   addiu    $a0, $zero, 0x168
+/* 3CCB58 E00C6178 24040040 */  addiu     $a0, $zero, 0x40
+/* 3CCB5C E00C617C 240300FF */  addiu     $v1, $zero, 0xff
+/* 3CCB60 E00C6180 24020058 */  addiu     $v0, $zero, 0x58
+/* 3CCB64 E00C6184 AE02002C */  sw        $v0, 0x2c($s0)
+/* 3CCB68 E00C6188 24020046 */  addiu     $v0, $zero, 0x46
+/* 3CCB6C E00C618C AE020030 */  sw        $v0, 0x30($s0)
+/* 3CCB70 E00C6190 24020037 */  addiu     $v0, $zero, 0x37
+/* 3CCB74 E00C6194 AE020034 */  sw        $v0, 0x34($s0)
+/* 3CCB78 E00C6198 2402000B */  addiu     $v0, $zero, 0xb
+/* 3CCB7C E00C619C AE020038 */  sw        $v0, 0x38($s0)
+/* 3CCB80 E00C61A0 24020033 */  addiu     $v0, $zero, 0x33
+/* 3CCB84 E00C61A4 AE02003C */  sw        $v0, 0x3c($s0)
+/* 3CCB88 E00C61A8 2402007B */  addiu     $v0, $zero, 0x7b
+/* 3CCB8C E00C61AC AE030028 */  sw        $v1, 0x28($s0)
+/* 3CCB90 E00C61B0 AE020040 */  sw        $v0, 0x40($s0)
+/* 3CCB94 E00C61B4 0C080138 */  jal       shim_rand_int
+/* 3CCB98 E00C61B8 AE030044 */   sw       $v1, 0x44($s0)
+/* 3CCB9C E00C61BC 24040040 */  addiu     $a0, $zero, 0x40
+/* 3CCBA0 E00C61C0 44820000 */  mtc1      $v0, $f0
+/* 3CCBA4 E00C61C4 00000000 */  nop
+/* 3CCBA8 E00C61C8 46800020 */  cvt.s.w   $f0, $f0
+/* 3CCBAC E00C61CC 0C080138 */  jal       shim_rand_int
+/* 3CCBB0 E00C61D0 E600004C */   swc1     $f0, 0x4c($s0)
+/* 3CCBB4 E00C61D4 3C013E4C */  lui       $at, 0x3e4c
+/* 3CCBB8 E00C61D8 3421CCCD */  ori       $at, $at, 0xcccd
+/* 3CCBBC E00C61DC 44811000 */  mtc1      $at, $f2
+/* 3CCBC0 E00C61E0 3C013E99 */  lui       $at, 0x3e99
+/* 3CCBC4 E00C61E4 3421999A */  ori       $at, $at, 0x999a
+/* 3CCBC8 E00C61E8 44812000 */  mtc1      $at, $f4
+/* 3CCBCC E00C61EC 3C01C120 */  lui       $at, 0xc120
+/* 3CCBD0 E00C61F0 44813000 */  mtc1      $at, $f6
+/* 3CCBD4 E00C61F4 44820000 */  mtc1      $v0, $f0
+/* 3CCBD8 E00C61F8 00000000 */  nop
+/* 3CCBDC E00C61FC 46800020 */  cvt.s.w   $f0, $f0
+/* 3CCBE0 E00C6200 E6000050 */  swc1      $f0, 0x50($s0)
+/* 3CCBE4 E00C6204 AE000054 */  sw        $zero, 0x54($s0)
+/* 3CCBE8 E00C6208 AE000058 */  sw        $zero, 0x58($s0)
+/* 3CCBEC E00C620C AE000074 */  sw        $zero, 0x74($s0)
+/* 3CCBF0 E00C6210 E6020070 */  swc1      $f2, 0x70($s0)
+/* 3CCBF4 E00C6214 E604006C */  swc1      $f4, 0x6c($s0)
+/* 3CCBF8 E00C6218 080318D5 */  j         .LE00C6354
+/* 3CCBFC E00C621C E6060078 */   swc1     $f6, 0x78($s0)
+.LE00C6220:
+/* 3CCC00 E00C6220 240300FF */  addiu     $v1, $zero, 0xff
+/* 3CCC04 E00C6224 24020058 */  addiu     $v0, $zero, 0x58
+/* 3CCC08 E00C6228 AE02002C */  sw        $v0, 0x2c($s0)
+/* 3CCC0C E00C622C 24020046 */  addiu     $v0, $zero, 0x46
+/* 3CCC10 E00C6230 AE020030 */  sw        $v0, 0x30($s0)
+/* 3CCC14 E00C6234 24020037 */  addiu     $v0, $zero, 0x37
+/* 3CCC18 E00C6238 AE020034 */  sw        $v0, 0x34($s0)
+/* 3CCC1C E00C623C 2402000B */  addiu     $v0, $zero, 0xb
+/* 3CCC20 E00C6240 AE020038 */  sw        $v0, 0x38($s0)
+/* 3CCC24 E00C6244 24020033 */  addiu     $v0, $zero, 0x33
+/* 3CCC28 E00C6248 AE02003C */  sw        $v0, 0x3c($s0)
+/* 3CCC2C E00C624C 2402007B */  addiu     $v0, $zero, 0x7b
+/* 3CCC30 E00C6250 AE030028 */  sw        $v1, 0x28($s0)
+/* 3CCC34 E00C6254 AE020040 */  sw        $v0, 0x40($s0)
+/* 3CCC38 E00C6258 0C080138 */  jal       shim_rand_int
+/* 3CCC3C E00C625C AE030044 */   sw       $v1, 0x44($s0)
+/* 3CCC40 E00C6260 4482C000 */  mtc1      $v0, $f24
+/* 3CCC44 E00C6264 00000000 */  nop
+/* 3CCC48 E00C6268 4680C620 */  cvt.s.w   $f24, $f24
+/* 3CCC4C E00C626C 12600039 */  beqz      $s3, .LE00C6354
+/* 3CCC50 E00C6270 0000882D */   daddu    $s1, $zero, $zero
+/* 3CCC54 E00C6274 26100078 */  addiu     $s0, $s0, 0x78
+/* 3CCC58 E00C6278 0220902D */  daddu     $s2, $s1, $zero
+/* 3CCC5C E00C627C 3C014040 */  lui       $at, 0x4040
+/* 3CCC60 E00C6280 4481F000 */  mtc1      $at, $f30
+/* 3CCC64 E00C6284 3C013F80 */  lui       $at, 0x3f80
+/* 3CCC68 E00C6288 4481B000 */  mtc1      $at, $f22
+/* 3CCC6C E00C628C 3C01C234 */  lui       $at, 0xc234
+/* 3CCC70 E00C6290 4481E000 */  mtc1      $at, $f28
+/* 3CCC74 E00C6294 3C01C120 */  lui       $at, 0xc120
+/* 3CCC78 E00C6298 4481D000 */  mtc1      $at, $f26
+.LE00C629C:
+/* 3CCC7C E00C629C C7AA007C */  lwc1      $f10, 0x7c($sp)
+/* 3CCC80 E00C62A0 4492A000 */  mtc1      $s2, $f20
+/* 3CCC84 E00C62A4 00000000 */  nop
+/* 3CCC88 E00C62A8 4680A520 */  cvt.s.w   $f20, $f20
+/* 3CCC8C E00C62AC E60AFF8C */  swc1      $f10, -0x74($s0)
+/* 3CCC90 E00C62B0 C7AA0080 */  lwc1      $f10, 0x80($sp)
+/* 3CCC94 E00C62B4 4618A500 */  add.s     $f20, $f20, $f24
+/* 3CCC98 E00C62B8 E60AFF90 */  swc1      $f10, -0x70($s0)
+/* 3CCC9C E00C62BC C7AA0084 */  lwc1      $f10, 0x84($sp)
+/* 3CCCA0 E00C62C0 4600A306 */  mov.s     $f12, $f20
+/* 3CCCA4 E00C62C4 0C080140 */  jal       shim_sin_deg
+/* 3CCCA8 E00C62C8 E60AFF94 */   swc1     $f10, -0x6c($s0)
+/* 3CCCAC E00C62CC 3C0140A0 */  lui       $at, 0x40a0
+/* 3CCCB0 E00C62D0 44815000 */  mtc1      $at, $f10
+/* 3CCCB4 E00C62D4 00000000 */  nop
+/* 3CCCB8 E00C62D8 460A0002 */  mul.s     $f0, $f0, $f10
+/* 3CCCBC E00C62DC 00000000 */  nop
+/* 3CCCC0 E00C62E0 4600A306 */  mov.s     $f12, $f20
+/* 3CCCC4 E00C62E4 0C080144 */  jal       shim_cos_deg
+/* 3CCCC8 E00C62E8 E600FFE8 */   swc1     $f0, -0x18($s0)
+/* 3CCCCC E00C62EC 46000000 */  add.s     $f0, $f0, $f0
+/* 3CCCD0 E00C62F0 2652002D */  addiu     $s2, $s2, 0x2d
+/* 3CCCD4 E00C62F4 461E0000 */  add.s     $f0, $f0, $f30
+/* 3CCCD8 E00C62F8 26310001 */  addiu     $s1, $s1, 1
+/* 3CCCDC E00C62FC 24040040 */  addiu     $a0, $zero, 0x40
+/* 3CCCE0 E00C6300 0C080138 */  jal       shim_rand_int
+/* 3CCCE4 E00C6304 E600FFEC */   swc1     $f0, -0x14($s0)
+/* 3CCCE8 E00C6308 24040040 */  addiu     $a0, $zero, 0x40
+/* 3CCCEC E00C630C 44820000 */  mtc1      $v0, $f0
+/* 3CCCF0 E00C6310 00000000 */  nop
+/* 3CCCF4 E00C6314 46800020 */  cvt.s.w   $f0, $f0
+/* 3CCCF8 E00C6318 0C080138 */  jal       shim_rand_int
+/* 3CCCFC E00C631C E600FFD4 */   swc1     $f0, -0x2c($s0)
+/* 3CCD00 E00C6320 44820000 */  mtc1      $v0, $f0
+/* 3CCD04 E00C6324 00000000 */  nop
+/* 3CCD08 E00C6328 46800020 */  cvt.s.w   $f0, $f0
+/* 3CCD0C E00C632C E600FFD8 */  swc1      $f0, -0x28($s0)
+/* 3CCD10 E00C6330 E616FFF8 */  swc1      $f22, -8($s0)
+/* 3CCD14 E00C6334 E616FFF4 */  swc1      $f22, -0xc($s0)
+/* 3CCD18 E00C6338 AE00FFDC */  sw        $zero, -0x24($s0)
+/* 3CCD1C E00C633C AE00FFE0 */  sw        $zero, -0x20($s0)
+/* 3CCD20 E00C6340 E61CFFFC */  swc1      $f28, -4($s0)
+/* 3CCD24 E00C6344 E61A0000 */  swc1      $f26, ($s0)
+/* 3CCD28 E00C6348 0233102A */  slt       $v0, $s1, $s3
+/* 3CCD2C E00C634C 1440FFD3 */  bnez      $v0, .LE00C629C
+/* 3CCD30 E00C6350 2610007C */   addiu    $s0, $s0, 0x7c
+.LE00C6354:
+/* 3CCD34 E00C6354 0280102D */  daddu     $v0, $s4, $zero
+/* 3CCD38 E00C6358 8FBF0040 */  lw        $ra, 0x40($sp)
+/* 3CCD3C E00C635C 8FB5003C */  lw        $s5, 0x3c($sp)
+/* 3CCD40 E00C6360 8FB40038 */  lw        $s4, 0x38($sp)
+/* 3CCD44 E00C6364 8FB30034 */  lw        $s3, 0x34($sp)
+/* 3CCD48 E00C6368 8FB20030 */  lw        $s2, 0x30($sp)
+/* 3CCD4C E00C636C 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 3CCD50 E00C6370 8FB00028 */  lw        $s0, 0x28($sp)
+/* 3CCD54 E00C6374 D7BE0070 */  ldc1      $f30, 0x70($sp)
+/* 3CCD58 E00C6378 D7BC0068 */  ldc1      $f28, 0x68($sp)
+/* 3CCD5C E00C637C D7BA0060 */  ldc1      $f26, 0x60($sp)
+/* 3CCD60 E00C6380 D7B80058 */  ldc1      $f24, 0x58($sp)
+/* 3CCD64 E00C6384 D7B60050 */  ldc1      $f22, 0x50($sp)
+/* 3CCD68 E00C6388 D7B40048 */  ldc1      $f20, 0x48($sp)
+/* 3CCD6C E00C638C 03E00008 */  jr        $ra
+/* 3CCD70 E00C6390 27BD0078 */   addiu    $sp, $sp, 0x78
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 f437f911e7..473bfe88eb 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
@@ -2,217 +2,257 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_63_update
-/* 37F924 E007E204 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* 37F928 E007E208 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 37F92C E007E20C 0080882D */  daddu     $s1, $a0, $zero
-/* 37F930 E007E210 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 37F934 E007E214 AFB00018 */  sw        $s0, 0x18($sp)
-/* 37F938 E007E218 8E30000C */  lw        $s0, 0xc($s1)
-/* 37F93C E007E21C 8E050004 */  lw        $a1, 4($s0)
-/* 37F940 E007E220 8E020044 */  lw        $v0, 0x44($s0)
-/* 37F944 E007E224 8E030040 */  lw        $v1, 0x40($s0)
-/* 37F948 E007E228 24420001 */  addiu     $v0, $v0, 1
-/* 37F94C E007E22C 24630001 */  addiu     $v1, $v1, 1
-/* 37F950 E007E230 AE020044 */  sw        $v0, 0x44($s0)
-/* 37F954 E007E234 24020007 */  addiu     $v0, $zero, 7
-/* 37F958 E007E238 14A20005 */  bne       $a1, $v0, .LE007E250
-/* 37F95C E007E23C AE030040 */   sw       $v1, 0x40($s0)
-/* 37F960 E007E240 0C080128 */  jal       shim_remove_effect
-/* 37F964 E007E244 00000000 */   nop
-/* 37F968 E007E248 0801F93D */  j         .LE007E4F4
-/* 37F96C E007E24C 00000000 */   nop
-.LE007E250:
-/* 37F970 E007E250 2CA20007 */  sltiu     $v0, $a1, 7
-/* 37F974 E007E254 10400075 */  beqz      $v0, .LE007E42C
-/* 37F978 E007E258 00051080 */   sll      $v0, $a1, 2
-/* 37F97C E007E25C 3C01E008 */  lui       $at, %hi(jtbl_E007EC48)
-/* 37F980 E007E260 00220821 */  addu      $at, $at, $v0
-/* 37F984 E007E264 8C22EC48 */  lw        $v0, %lo(jtbl_E007EC48)($at)
-/* 37F988 E007E268 00400008 */  jr        $v0
-/* 37F98C E007E26C 00000000 */   nop
-dlabel LE007E270_37F990
-/* 37F990 E007E270 0C080150 */  jal       shim_load_effect
-/* 37F994 E007E274 2404002D */   addiu    $a0, $zero, 0x2d
-/* 37F998 E007E278 C6020008 */  lwc1      $f2, 8($s0)
-/* 37F99C E007E27C 3C014120 */  lui       $at, 0x4120
-/* 37F9A0 E007E280 44810000 */  mtc1      $at, $f0
-/* 37F9A4 E007E284 24020007 */  addiu     $v0, $zero, 7
-/* 37F9A8 E007E288 AFA20010 */  sw        $v0, 0x10($sp)
-/* 37F9AC E007E28C 24020014 */  addiu     $v0, $zero, 0x14
-/* 37F9B0 E007E290 AFA20014 */  sw        $v0, 0x14($sp)
-/* 37F9B4 E007E294 46001081 */  sub.s     $f2, $f2, $f0
-/* 37F9B8 E007E298 8E06000C */  lw        $a2, 0xc($s0)
-/* 37F9BC E007E29C 8E070010 */  lw        $a3, 0x10($s0)
-/* 37F9C0 E007E2A0 44051000 */  mfc1      $a1, $f2
-/* 37F9C4 E007E2A4 0C016800 */  jal       fx_45_main
-/* 37F9C8 E007E2A8 0000202D */   daddu    $a0, $zero, $zero
-/* 37F9CC E007E2AC 8E020004 */  lw        $v0, 4($s0)
-/* 37F9D0 E007E2B0 AE000034 */  sw        $zero, 0x34($s0)
-/* 37F9D4 E007E2B4 AE000038 */  sw        $zero, 0x38($s0)
-/* 37F9D8 E007E2B8 0801F909 */  j         .LE007E424
-/* 37F9DC E007E2BC AE000040 */   sw       $zero, 0x40($s0)
-dlabel LE007E2C0_37F9E0
-/* 37F9E0 E007E2C0 28620008 */  slti      $v0, $v1, 8
-/* 37F9E4 E007E2C4 14400004 */  bnez      $v0, .LE007E2D8
-/* 37F9E8 E007E2C8 00000000 */   nop
-/* 37F9EC E007E2CC 8E020004 */  lw        $v0, 4($s0)
-/* 37F9F0 E007E2D0 0801F909 */  j         .LE007E424
-/* 37F9F4 E007E2D4 AE000040 */   sw       $zero, 0x40($s0)
-.LE007E2D8:
-/* 37F9F8 E007E2D8 3C02E008 */  lui       $v0, %hi(D_E007EC2F)
-/* 37F9FC E007E2DC 00431021 */  addu      $v0, $v0, $v1
-/* 37FA00 E007E2E0 8042EC2F */  lb        $v0, %lo(D_E007EC2F)($v0)
-/* 37FA04 E007E2E4 3C01E008 */  lui       $at, %hi(D_E007EC68)
-/* 37FA08 E007E2E8 D422EC68 */  ldc1      $f2, %lo(D_E007EC68)($at)
-/* 37FA0C E007E2EC 44820000 */  mtc1      $v0, $f0
-/* 37FA10 E007E2F0 00000000 */  nop
-/* 37FA14 E007E2F4 46800021 */  cvt.d.w   $f0, $f0
-/* 37FA18 E007E2F8 46220002 */  mul.d     $f0, $f0, $f2
-/* 37FA1C E007E2FC 00000000 */  nop
-/* 37FA20 E007E300 AE000034 */  sw        $zero, 0x34($s0)
-/* 37FA24 E007E304 AE000038 */  sw        $zero, 0x38($s0)
-/* 37FA28 E007E308 46200020 */  cvt.s.d   $f0, $f0
-/* 37FA2C E007E30C 0801F90B */  j         .LE007E42C
-/* 37FA30 E007E310 E6000030 */   swc1     $f0, 0x30($s0)
-dlabel LE007E314_37FA34
-/* 37FA34 E007E314 28620002 */  slti      $v0, $v1, 2
-/* 37FA38 E007E318 14400004 */  bnez      $v0, .LE007E32C
-/* 37FA3C E007E31C 24020001 */   addiu    $v0, $zero, 1
-/* 37FA40 E007E320 8E020004 */  lw        $v0, 4($s0)
-/* 37FA44 E007E324 0801F909 */  j         .LE007E424
-/* 37FA48 E007E328 AE000040 */   sw       $zero, 0x40($s0)
-.LE007E32C:
-/* 37FA4C E007E32C 0801F90B */  j         .LE007E42C
-/* 37FA50 E007E330 AE020034 */   sw       $v0, 0x34($s0)
-dlabel LE007E334_37FA54
-/* 37FA54 E007E334 2862000F */  slti      $v0, $v1, 0xf
-/* 37FA58 E007E338 14400004 */  bnez      $v0, .LE007E34C
-/* 37FA5C E007E33C 24020002 */   addiu    $v0, $zero, 2
-/* 37FA60 E007E340 8E020004 */  lw        $v0, 4($s0)
-/* 37FA64 E007E344 0801F909 */  j         .LE007E424
-/* 37FA68 E007E348 AE000040 */   sw       $zero, 0x40($s0)
-.LE007E34C:
-/* 37FA6C E007E34C 0801F90B */  j         .LE007E42C
-/* 37FA70 E007E350 AE020034 */   sw       $v0, 0x34($s0)
-dlabel LE007E354_37FA74
-/* 37FA74 E007E354 2862002D */  slti      $v0, $v1, 0x2d
-/* 37FA78 E007E358 14400004 */  bnez      $v0, .LE007E36C
-/* 37FA7C E007E35C 24020003 */   addiu    $v0, $zero, 3
-/* 37FA80 E007E360 8E020004 */  lw        $v0, 4($s0)
-/* 37FA84 E007E364 0801F909 */  j         .LE007E424
-/* 37FA88 E007E368 AE000040 */   sw       $zero, 0x40($s0)
-.LE007E36C:
-/* 37FA8C E007E36C AE020034 */  sw        $v0, 0x34($s0)
-/* 37FA90 E007E370 30620001 */  andi      $v0, $v1, 1
-/* 37FA94 E007E374 10400005 */  beqz      $v0, .LE007E38C
-/* 37FA98 E007E378 AE00002C */   sw       $zero, 0x2c($s0)
-/* 37FA9C E007E37C 3C013F80 */  lui       $at, 0x3f80
-/* 37FAA0 E007E380 44810000 */  mtc1      $at, $f0
-/* 37FAA4 E007E384 0801F90B */  j         .LE007E42C
-/* 37FAA8 E007E388 E6000030 */   swc1     $f0, 0x30($s0)
-.LE007E38C:
-/* 37FAAC E007E38C 3C013F86 */  lui       $at, 0x3f86
-/* 37FAB0 E007E390 34216666 */  ori       $at, $at, 0x6666
-/* 37FAB4 E007E394 44810000 */  mtc1      $at, $f0
-/* 37FAB8 E007E398 0801F90B */  j         .LE007E42C
-/* 37FABC E007E39C E6000030 */   swc1     $f0, 0x30($s0)
-dlabel LE007E3A0_37FAC0
-/* 37FAC0 E007E3A0 2862000A */  slti      $v0, $v1, 0xa
-/* 37FAC4 E007E3A4 54400004 */  bnel      $v0, $zero, .LE007E3B8
-/* 37FAC8 E007E3A8 AE000034 */   sw       $zero, 0x34($s0)
-/* 37FACC E007E3AC 8E020004 */  lw        $v0, 4($s0)
-/* 37FAD0 E007E3B0 0801F909 */  j         .LE007E424
-/* 37FAD4 E007E3B4 AE000040 */   sw       $zero, 0x40($s0)
-.LE007E3B8:
-/* 37FAD8 E007E3B8 3C01C120 */  lui       $at, 0xc120
-/* 37FADC E007E3BC 44810000 */  mtc1      $at, $f0
-/* 37FAE0 E007E3C0 0801F90B */  j         .LE007E42C
-/* 37FAE4 E007E3C4 E600002C */   swc1     $f0, 0x2c($s0)
-dlabel LE007E3C8_37FAE8
-/* 37FAE8 E007E3C8 C6040028 */  lwc1      $f4, 0x28($s0)
-/* 37FAEC E007E3CC 3C014210 */  lui       $at, 0x4210
-/* 37FAF0 E007E3D0 44810000 */  mtc1      $at, $f0
-/* 37FAF4 E007E3D4 00000000 */  nop
-/* 37FAF8 E007E3D8 46002100 */  add.s     $f4, $f4, $f0
-/* 37FAFC E007E3DC 3C01E008 */  lui       $at, %hi(D_E007EC70)
-/* 37FB00 E007E3E0 D422EC70 */  ldc1      $f2, %lo(D_E007EC70)($at)
-/* 37FB04 E007E3E4 C600003C */  lwc1      $f0, 0x3c($s0)
-/* 37FB08 E007E3E8 46800021 */  cvt.d.w   $f0, $f0
-/* 37FB0C E007E3EC 46220002 */  mul.d     $f0, $f0, $f2
-/* 37FB10 E007E3F0 00000000 */  nop
-/* 37FB14 E007E3F4 E6040028 */  swc1      $f4, 0x28($s0)
-/* 37FB18 E007E3F8 46002086 */  mov.s     $f2, $f4
-/* 37FB1C E007E3FC 3C014434 */  lui       $at, 0x4434
-/* 37FB20 E007E400 44812000 */  mtc1      $at, $f4
-/* 37FB24 E007E404 AE000034 */  sw        $zero, 0x34($s0)
-/* 37FB28 E007E408 4602203E */  c.le.s    $f4, $f2
-/* 37FB2C E007E40C 4620028D */  trunc.w.d $f10, $f0
-/* 37FB30 E007E410 E60A003C */  swc1      $f10, 0x3c($s0)
-/* 37FB34 E007E414 45000005 */  bc1f      .LE007E42C
-/* 37FB38 E007E418 00000000 */   nop
-/* 37FB3C E007E41C 8E020004 */  lw        $v0, 4($s0)
-/* 37FB40 E007E420 E6040028 */  swc1      $f4, 0x28($s0)
-.LE007E424:
-/* 37FB44 E007E424 24420001 */  addiu     $v0, $v0, 1
-/* 37FB48 E007E428 AE020004 */  sw        $v0, 4($s0)
-.LE007E42C:
-/* 37FB4C E007E42C 8E050004 */  lw        $a1, 4($s0)
-/* 37FB50 E007E430 24A2FFFC */  addiu     $v0, $a1, -4
-/* 37FB54 E007E434 2C420003 */  sltiu     $v0, $v0, 3
-/* 37FB58 E007E438 1040002E */  beqz      $v0, .LE007E4F4
-/* 37FB5C E007E43C 2610004C */   addiu    $s0, $s0, 0x4c
-/* 37FB60 E007E440 8E220008 */  lw        $v0, 8($s1)
-/* 37FB64 E007E444 24040001 */  addiu     $a0, $zero, 1
-/* 37FB68 E007E448 0082102A */  slt       $v0, $a0, $v0
-/* 37FB6C E007E44C 10400029 */  beqz      $v0, .LE007E4F4
-/* 37FB70 E007E450 00000000 */   nop
-/* 37FB74 E007E454 24060004 */  addiu     $a2, $zero, 4
-/* 37FB78 E007E458 3C014348 */  lui       $at, 0x4348
-/* 37FB7C E007E45C 44814000 */  mtc1      $at, $f8
-/* 37FB80 E007E460 26030010 */  addiu     $v1, $s0, 0x10
-.LE007E464:
-/* 37FB84 E007E464 8C620038 */  lw        $v0, 0x38($v1)
-/* 37FB88 E007E468 18400003 */  blez      $v0, .LE007E478
-/* 37FB8C E007E46C 2442FFFF */   addiu    $v0, $v0, -1
-/* 37FB90 E007E470 1C40001B */  bgtz      $v0, .LE007E4E0
-/* 37FB94 E007E474 AC620038 */   sw       $v0, 0x38($v1)
-.LE007E478:
-/* 37FB98 E007E478 C4620008 */  lwc1      $f2, 8($v1)
-/* 37FB9C E007E47C C4600010 */  lwc1      $f0, 0x10($v1)
-/* 37FBA0 E007E480 C466FFF8 */  lwc1      $f6, -8($v1)
-/* 37FBA4 E007E484 46001080 */  add.s     $f2, $f2, $f0
-/* 37FBA8 E007E488 C4600004 */  lwc1      $f0, 4($v1)
-/* 37FBAC E007E48C C4640000 */  lwc1      $f4, ($v1)
-/* 37FBB0 E007E490 46003180 */  add.s     $f6, $f6, $f0
-/* 37FBB4 E007E494 C460000C */  lwc1      $f0, 0xc($v1)
-/* 37FBB8 E007E498 46002100 */  add.s     $f4, $f4, $f0
-/* 37FBBC E007E49C E4620008 */  swc1      $f2, 8($v1)
-/* 37FBC0 E007E4A0 C462FFFC */  lwc1      $f2, -4($v1)
-/* 37FBC4 E007E4A4 C4600008 */  lwc1      $f0, 8($v1)
-/* 37FBC8 E007E4A8 46001080 */  add.s     $f2, $f2, $f0
-/* 37FBCC E007E4AC E466FFF8 */  swc1      $f6, -8($v1)
-/* 37FBD0 E007E4B0 E4640000 */  swc1      $f4, ($v1)
-/* 37FBD4 E007E4B4 14A6000A */  bne       $a1, $a2, .LE007E4E0
-/* 37FBD8 E007E4B8 E462FFFC */   swc1     $f2, -4($v1)
-/* 37FBDC E007E4BC 46003006 */  mov.s     $f0, $f6
-/* 37FBE0 E007E4C0 4600403C */  c.lt.s    $f8, $f0
-/* 37FBE4 E007E4C4 00000000 */  nop
-/* 37FBE8 E007E4C8 45020006 */  bc1fl     .LE007E4E4
-/* 37FBEC E007E4CC 24840001 */   addiu    $a0, $a0, 1
-/* 37FBF0 E007E4D0 AC60FFF8 */  sw        $zero, -8($v1)
-/* 37FBF4 E007E4D4 AC60FFFC */  sw        $zero, -4($v1)
-/* 37FBF8 E007E4D8 AC600008 */  sw        $zero, 8($v1)
-/* 37FBFC E007E4DC AC600000 */  sw        $zero, ($v1)
-.LE007E4E0:
-/* 37FC00 E007E4E0 24840001 */  addiu     $a0, $a0, 1
-.LE007E4E4:
-/* 37FC04 E007E4E4 8E220008 */  lw        $v0, 8($s1)
-/* 37FC08 E007E4E8 0082102A */  slt       $v0, $a0, $v0
-/* 37FC0C E007E4EC 1440FFDD */  bnez      $v0, .LE007E464
-/* 37FC10 E007E4F0 2463004C */   addiu    $v1, $v1, 0x4c
-.LE007E4F4:
-/* 37FC14 E007E4F4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 37FC18 E007E4F8 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 37FC1C E007E4FC 8FB00018 */  lw        $s0, 0x18($sp)
-/* 37FC20 E007E500 03E00008 */  jr        $ra
-/* 37FC24 E007E504 27BD0028 */   addiu    $sp, $sp, 0x28
+/* 3CCD7C E00C639C 27BDFFB8 */  addiu     $sp, $sp, -0x48
+/* 3CCD80 E00C63A0 AFB20030 */  sw        $s2, 0x30($sp)
+/* 3CCD84 E00C63A4 0080902D */  daddu     $s2, $a0, $zero
+/* 3CCD88 E00C63A8 AFBF0034 */  sw        $ra, 0x34($sp)
+/* 3CCD8C E00C63AC AFB1002C */  sw        $s1, 0x2c($sp)
+/* 3CCD90 E00C63B0 AFB00028 */  sw        $s0, 0x28($sp)
+/* 3CCD94 E00C63B4 F7B60040 */  sdc1      $f22, 0x40($sp)
+/* 3CCD98 E00C63B8 F7B40038 */  sdc1      $f20, 0x38($sp)
+/* 3CCD9C E00C63BC 8E430000 */  lw        $v1, ($s2)
+/* 3CCDA0 E00C63C0 8E50000C */  lw        $s0, 0xc($s2)
+/* 3CCDA4 E00C63C4 30620010 */  andi      $v0, $v1, 0x10
+/* 3CCDA8 E00C63C8 8E110000 */  lw        $s1, ($s0)
+/* 3CCDAC E00C63CC 10400005 */  beqz      $v0, .LE00C63E4
+/* 3CCDB0 E00C63D0 2402FFEF */   addiu    $v0, $zero, -0x11
+/* 3CCDB4 E00C63D4 00621024 */  and       $v0, $v1, $v0
+/* 3CCDB8 E00C63D8 AE420000 */  sw        $v0, ($s2)
+/* 3CCDBC E00C63DC 24020010 */  addiu     $v0, $zero, 0x10
+/* 3CCDC0 E00C63E0 AE020020 */  sw        $v0, 0x20($s0)
+.LE00C63E4:
+/* 3CCDC4 E00C63E4 8E030020 */  lw        $v1, 0x20($s0)
+/* 3CCDC8 E00C63E8 286203E8 */  slti      $v0, $v1, 0x3e8
+/* 3CCDCC E00C63EC 10400002 */  beqz      $v0, .LE00C63F8
+/* 3CCDD0 E00C63F0 2462FFFF */   addiu    $v0, $v1, -1
+/* 3CCDD4 E00C63F4 AE020020 */  sw        $v0, 0x20($s0)
+.LE00C63F8:
+/* 3CCDD8 E00C63F8 8E020024 */  lw        $v0, 0x24($s0)
+/* 3CCDDC E00C63FC 8E030020 */  lw        $v1, 0x20($s0)
+/* 3CCDE0 E00C6400 24420001 */  addiu     $v0, $v0, 1
+/* 3CCDE4 E00C6404 AE020024 */  sw        $v0, 0x24($s0)
+/* 3CCDE8 E00C6408 24020001 */  addiu     $v0, $zero, 1
+/* 3CCDEC E00C640C 14620016 */  bne       $v1, $v0, .LE00C6468
+/* 3CCDF0 E00C6410 00000000 */   nop
+/* 3CCDF4 E00C6414 16230014 */  bne       $s1, $v1, .LE00C6468
+/* 3CCDF8 E00C6418 00000000 */   nop
+/* 3CCDFC E00C641C 0C080150 */  jal       shim_load_effect
+/* 3CCE00 E00C6420 24040063 */   addiu    $a0, $zero, 0x63
+/* 3CCE04 E00C6424 C6000010 */  lwc1      $f0, 0x10($s0)
+/* 3CCE08 E00C6428 E7A00010 */  swc1      $f0, 0x10($sp)
+/* 3CCE0C E00C642C C6000014 */  lwc1      $f0, 0x14($s0)
+/* 3CCE10 E00C6430 E7A00014 */  swc1      $f0, 0x14($sp)
+/* 3CCE14 E00C6434 3C013F80 */  lui       $at, 0x3f80
+/* 3CCE18 E00C6438 44810000 */  mtc1      $at, $f0
+/* 3CCE1C E00C643C C6020018 */  lwc1      $f2, 0x18($s0)
+/* 3CCE20 E00C6440 24020020 */  addiu     $v0, $zero, 0x20
+/* 3CCE24 E00C6444 AFA20020 */  sw        $v0, 0x20($sp)
+/* 3CCE28 E00C6448 AFA20024 */  sw        $v0, 0x24($sp)
+/* 3CCE2C E00C644C E7A0001C */  swc1      $f0, 0x1c($sp)
+/* 3CCE30 E00C6450 E7A20018 */  swc1      $f2, 0x18($sp)
+/* 3CCE34 E00C6454 8E050004 */  lw        $a1, 4($s0)
+/* 3CCE38 E00C6458 8E060008 */  lw        $a2, 8($s0)
+/* 3CCE3C E00C645C 8E07000C */  lw        $a3, 0xc($s0)
+/* 3CCE40 E00C6460 0C031800 */  jal       fx_63_main
+/* 3CCE44 E00C6464 24040002 */   addiu    $a0, $zero, 2
+.LE00C6468:
+/* 3CCE48 E00C6468 8E020020 */  lw        $v0, 0x20($s0)
+/* 3CCE4C E00C646C 04410005 */  bgez      $v0, .LE00C6484
+/* 3CCE50 E00C6470 24020001 */   addiu    $v0, $zero, 1
+/* 3CCE54 E00C6474 0C080128 */  jal       shim_remove_effect
+/* 3CCE58 E00C6478 0240202D */   daddu    $a0, $s2, $zero
+/* 3CCE5C E00C647C 080319D2 */  j         .LE00C6748
+/* 3CCE60 E00C6480 00000000 */   nop
+.LE00C6484:
+/* 3CCE64 E00C6484 8E030024 */  lw        $v1, 0x24($s0)
+/* 3CCE68 E00C6488 12220023 */  beq       $s1, $v0, .LE00C6518
+/* 3CCE6C E00C648C 2A220002 */   slti     $v0, $s1, 2
+/* 3CCE70 E00C6490 50400005 */  beql      $v0, $zero, .LE00C64A8
+/* 3CCE74 E00C6494 24020002 */   addiu    $v0, $zero, 2
+/* 3CCE78 E00C6498 12200007 */  beqz      $s1, .LE00C64B8
+/* 3CCE7C E00C649C 30620003 */   andi     $v0, $v1, 3
+/* 3CCE80 E00C64A0 080319D2 */  j         .LE00C6748
+/* 3CCE84 E00C64A4 00000000 */   nop
+.LE00C64A8:
+/* 3CCE88 E00C64A8 1222005F */  beq       $s1, $v0, .LE00C6628
+/* 3CCE8C E00C64AC 00000000 */   nop
+/* 3CCE90 E00C64B0 080319D2 */  j         .LE00C6748
+/* 3CCE94 E00C64B4 00000000 */   nop
+.LE00C64B8:
+/* 3CCE98 E00C64B8 144000A3 */  bnez      $v0, .LE00C6748
+/* 3CCE9C E00C64BC 00000000 */   nop
+/* 3CCEA0 E00C64C0 0C080150 */  jal       shim_load_effect
+/* 3CCEA4 E00C64C4 24040063 */   addiu    $a0, $zero, 0x63
+/* 3CCEA8 E00C64C8 C6000010 */  lwc1      $f0, 0x10($s0)
+/* 3CCEAC E00C64CC E7A00010 */  swc1      $f0, 0x10($sp)
+/* 3CCEB0 E00C64D0 C6000014 */  lwc1      $f0, 0x14($s0)
+/* 3CCEB4 E00C64D4 E7A00014 */  swc1      $f0, 0x14($sp)
+/* 3CCEB8 E00C64D8 3C013F80 */  lui       $at, 0x3f80
+/* 3CCEBC E00C64DC 44810000 */  mtc1      $at, $f0
+/* 3CCEC0 E00C64E0 C6020018 */  lwc1      $f2, 0x18($s0)
+/* 3CCEC4 E00C64E4 E7A0001C */  swc1      $f0, 0x1c($sp)
+/* 3CCEC8 E00C64E8 E7A20018 */  swc1      $f2, 0x18($sp)
+/* 3CCECC E00C64EC 8E02001C */  lw        $v0, 0x1c($s0)
+/* 3CCED0 E00C64F0 AFA20020 */  sw        $v0, 0x20($sp)
+/* 3CCED4 E00C64F4 8E02001C */  lw        $v0, 0x1c($s0)
+/* 3CCED8 E00C64F8 AFA20024 */  sw        $v0, 0x24($sp)
+/* 3CCEDC E00C64FC 8E050004 */  lw        $a1, 4($s0)
+/* 3CCEE0 E00C6500 8E060008 */  lw        $a2, 8($s0)
+/* 3CCEE4 E00C6504 8E07000C */  lw        $a3, 0xc($s0)
+/* 3CCEE8 E00C6508 0C031800 */  jal       fx_63_main
+/* 3CCEEC E00C650C 24040001 */   addiu    $a0, $zero, 1
+/* 3CCEF0 E00C6510 080319D2 */  j         .LE00C6748
+/* 3CCEF4 E00C6514 00000000 */   nop
+.LE00C6518:
+/* 3CCEF8 E00C6518 C6040060 */  lwc1      $f4, 0x60($s0)
+/* 3CCEFC E00C651C 3C01E00C */  lui       $at, %hi(D_E00C6CB0)
+/* 3CCF00 E00C6520 D4206CB0 */  ldc1      $f0, %lo(D_E00C6CB0)($at)
+/* 3CCF04 E00C6524 46002121 */  cvt.d.s   $f4, $f4
+/* 3CCF08 E00C6528 46202102 */  mul.d     $f4, $f4, $f0
+/* 3CCF0C E00C652C 00000000 */  nop
+/* 3CCF10 E00C6530 C6020068 */  lwc1      $f2, 0x68($s0)
+/* 3CCF14 E00C6534 460010A1 */  cvt.d.s   $f2, $f2
+/* 3CCF18 E00C6538 46201082 */  mul.d     $f2, $f2, $f0
+/* 3CCF1C E00C653C 00000000 */  nop
+/* 3CCF20 E00C6540 C60A0064 */  lwc1      $f10, 0x64($s0)
+/* 3CCF24 E00C6544 3C013F80 */  lui       $at, 0x3f80
+/* 3CCF28 E00C6548 44814000 */  mtc1      $at, $f8
+/* 3CCF2C E00C654C 00000000 */  nop
+/* 3CCF30 E00C6550 460A4201 */  sub.s     $f8, $f8, $f10
+/* 3CCF34 E00C6554 3C01E00C */  lui       $at, %hi(D_E00C6CB8)
+/* 3CCF38 E00C6558 D4206CB8 */  ldc1      $f0, %lo(D_E00C6CB8)($at)
+/* 3CCF3C E00C655C 46004221 */  cvt.d.s   $f8, $f8
+/* 3CCF40 E00C6560 46204202 */  mul.d     $f8, $f8, $f0
+/* 3CCF44 E00C6564 00000000 */  nop
+/* 3CCF48 E00C6568 C60C0070 */  lwc1      $f12, 0x70($s0)
+/* 3CCF4C E00C656C 3C013FF0 */  lui       $at, 0x3ff0
+/* 3CCF50 E00C6570 44817800 */  mtc1      $at, $f15
+/* 3CCF54 E00C6574 44807000 */  mtc1      $zero, $f14
+/* 3CCF58 E00C6578 46006321 */  cvt.d.s   $f12, $f12
+/* 3CCF5C E00C657C 462C7481 */  sub.d     $f18, $f14, $f12
+/* 3CCF60 E00C6580 3C01E00C */  lui       $at, %hi(D_E00C6CC0)
+/* 3CCF64 E00C6584 D4206CC0 */  ldc1      $f0, %lo(D_E00C6CC0)($at)
+/* 3CCF68 E00C6588 46209482 */  mul.d     $f18, $f18, $f0
+/* 3CCF6C E00C658C 00000000 */  nop
+/* 3CCF70 E00C6590 C606006C */  lwc1      $f6, 0x6c($s0)
+/* 3CCF74 E00C6594 460031A1 */  cvt.d.s   $f6, $f6
+/* 3CCF78 E00C6598 46267381 */  sub.d     $f14, $f14, $f6
+/* 3CCF7C E00C659C 3C01E00C */  lui       $at, %hi(D_E00C6CC8)
+/* 3CCF80 E00C65A0 D4206CC8 */  ldc1      $f0, %lo(D_E00C6CC8)($at)
+/* 3CCF84 E00C65A4 46207382 */  mul.d     $f14, $f14, $f0
+/* 3CCF88 E00C65A8 00000000 */  nop
+/* 3CCF8C E00C65AC C6100004 */  lwc1      $f16, 4($s0)
+/* 3CCF90 E00C65B0 46202120 */  cvt.s.d   $f4, $f4
+/* 3CCF94 E00C65B4 462010A0 */  cvt.s.d   $f2, $f2
+/* 3CCF98 E00C65B8 E6040060 */  swc1      $f4, 0x60($s0)
+/* 3CCF9C E00C65BC 46002006 */  mov.s     $f0, $f4
+/* 3CCFA0 E00C65C0 E6020068 */  swc1      $f2, 0x68($s0)
+/* 3CCFA4 E00C65C4 C6020074 */  lwc1      $f2, 0x74($s0)
+/* 3CCFA8 E00C65C8 46008400 */  add.s     $f16, $f16, $f0
+/* 3CCFAC E00C65CC C6000078 */  lwc1      $f0, 0x78($s0)
+/* 3CCFB0 E00C65D0 C604000C */  lwc1      $f4, 0xc($s0)
+/* 3CCFB4 E00C65D4 46001080 */  add.s     $f2, $f2, $f0
+/* 3CCFB8 E00C65D8 C6000068 */  lwc1      $f0, 0x68($s0)
+/* 3CCFBC E00C65DC 46002100 */  add.s     $f4, $f4, $f0
+/* 3CCFC0 E00C65E0 460052A1 */  cvt.d.s   $f10, $f10
+/* 3CCFC4 E00C65E4 C6000008 */  lwc1      $f0, 8($s0)
+/* 3CCFC8 E00C65E8 46285280 */  add.d     $f10, $f10, $f8
+/* 3CCFCC E00C65EC E6100004 */  swc1      $f16, 4($s0)
+/* 3CCFD0 E00C65F0 E6020074 */  swc1      $f2, 0x74($s0)
+/* 3CCFD4 E00C65F4 46326300 */  add.d     $f12, $f12, $f18
+/* 3CCFD8 E00C65F8 462052A0 */  cvt.s.d   $f10, $f10
+/* 3CCFDC E00C65FC E60A0064 */  swc1      $f10, 0x64($s0)
+/* 3CCFE0 E00C6600 462E3180 */  add.d     $f6, $f6, $f14
+/* 3CCFE4 E00C6604 46005086 */  mov.s     $f2, $f10
+/* 3CCFE8 E00C6608 E604000C */  swc1      $f4, 0xc($s0)
+/* 3CCFEC E00C660C 46020000 */  add.s     $f0, $f0, $f2
+/* 3CCFF0 E00C6610 46206320 */  cvt.s.d   $f12, $f12
+/* 3CCFF4 E00C6614 E60C0070 */  swc1      $f12, 0x70($s0)
+/* 3CCFF8 E00C6618 462031A0 */  cvt.s.d   $f6, $f6
+/* 3CCFFC E00C661C E606006C */  swc1      $f6, 0x6c($s0)
+/* 3CD000 E00C6620 080319D2 */  j         .LE00C6748
+/* 3CD004 E00C6624 E6000008 */   swc1     $f0, 8($s0)
+.LE00C6628:
+/* 3CD008 E00C6628 8E420008 */  lw        $v0, 8($s2)
+/* 3CD00C E00C662C 18400046 */  blez      $v0, .LE00C6748
+/* 3CD010 E00C6630 0000202D */   daddu    $a0, $zero, $zero
+/* 3CD014 E00C6634 26030074 */  addiu     $v1, $s0, 0x74
+/* 3CD018 E00C6638 3C01E00C */  lui       $at, %hi(D_E00C6CD0)
+/* 3CD01C E00C663C D4366CD0 */  ldc1      $f22, %lo(D_E00C6CD0)($at)
+/* 3CD020 E00C6640 3C01E00C */  lui       $at, %hi(D_E00C6CD8)
+/* 3CD024 E00C6644 D4346CD8 */  ldc1      $f20, %lo(D_E00C6CD8)($at)
+/* 3CD028 E00C6648 44806000 */  mtc1      $zero, $f12
+/* 3CD02C E00C664C 3C01E00C */  lui       $at, %hi(D_E00C6CE0)
+/* 3CD030 E00C6650 D4326CE0 */  ldc1      $f18, %lo(D_E00C6CE0)($at)
+/* 3CD034 E00C6654 3C01E00C */  lui       $at, %hi(D_E00C6CE8)
+/* 3CD038 E00C6658 D4306CE8 */  ldc1      $f16, %lo(D_E00C6CE8)($at)
+/* 3CD03C E00C665C 3C01E00C */  lui       $at, %hi(D_E00C6CF0)
+/* 3CD040 E00C6660 D42E6CF0 */  ldc1      $f14, %lo(D_E00C6CF0)($at)
+.LE00C6664:
+/* 3CD044 E00C6664 C462FFEC */  lwc1      $f2, -0x14($v1)
+/* 3CD048 E00C6668 460010A1 */  cvt.d.s   $f2, $f2
+/* 3CD04C E00C666C 46361082 */  mul.d     $f2, $f2, $f22
+/* 3CD050 E00C6670 00000000 */  nop
+/* 3CD054 E00C6674 C460FFF0 */  lwc1      $f0, -0x10($v1)
+/* 3CD058 E00C6678 46000021 */  cvt.d.s   $f0, $f0
+/* 3CD05C E00C667C 46340001 */  sub.d     $f0, $f0, $f20
+/* 3CD060 E00C6680 C464FF94 */  lwc1      $f4, -0x6c($v1)
+/* 3CD064 E00C6684 46200020 */  cvt.s.d   $f0, $f0
+/* 3CD068 E00C6688 46002100 */  add.s     $f4, $f4, $f0
+/* 3CD06C E00C668C E460FFF0 */  swc1      $f0, -0x10($v1)
+/* 3CD070 E00C6690 462010A0 */  cvt.s.d   $f2, $f2
+/* 3CD074 E00C6694 E462FFEC */  swc1      $f2, -0x14($v1)
+/* 3CD078 E00C6698 C462FF90 */  lwc1      $f2, -0x70($v1)
+/* 3CD07C E00C669C C460FFEC */  lwc1      $f0, -0x14($v1)
+/* 3CD080 E00C66A0 46001080 */  add.s     $f2, $f2, $f0
+/* 3CD084 E00C66A4 460C203C */  c.lt.s    $f4, $f12
+/* 3CD088 E00C66A8 E464FF94 */  swc1      $f4, -0x6c($v1)
+/* 3CD08C E00C66AC 4500000B */  bc1f      .LE00C66DC
+/* 3CD090 E00C66B0 E462FF90 */   swc1     $f2, -0x70($v1)
+/* 3CD094 E00C66B4 C460FFF0 */  lwc1      $f0, -0x10($v1)
+/* 3CD098 E00C66B8 460C003C */  c.lt.s    $f0, $f12
+/* 3CD09C E00C66BC 00000000 */  nop
+/* 3CD0A0 E00C66C0 45000006 */  bc1f      .LE00C66DC
+/* 3CD0A4 E00C66C4 E46CFF94 */   swc1     $f12, -0x6c($v1)
+/* 3CD0A8 E00C66C8 46000021 */  cvt.d.s   $f0, $f0
+/* 3CD0AC E00C66CC 46320002 */  mul.d     $f0, $f0, $f18
+/* 3CD0B0 E00C66D0 00000000 */  nop
+/* 3CD0B4 E00C66D4 46200020 */  cvt.s.d   $f0, $f0
+/* 3CD0B8 E00C66D8 E460FFF0 */  swc1      $f0, -0x10($v1)
+.LE00C66DC:
+/* 3CD0BC E00C66DC C462FFFC */  lwc1      $f2, -4($v1)
+/* 3CD0C0 E00C66E0 46026201 */  sub.s     $f8, $f12, $f2
+/* 3CD0C4 E00C66E4 46004221 */  cvt.d.s   $f8, $f8
+/* 3CD0C8 E00C66E8 46304202 */  mul.d     $f8, $f8, $f16
+/* 3CD0CC E00C66EC 00000000 */  nop
+/* 3CD0D0 E00C66F0 C460FFF8 */  lwc1      $f0, -8($v1)
+/* 3CD0D4 E00C66F4 46006181 */  sub.s     $f6, $f12, $f0
+/* 3CD0D8 E00C66F8 460031A1 */  cvt.d.s   $f6, $f6
+/* 3CD0DC E00C66FC 462E3182 */  mul.d     $f6, $f6, $f14
+/* 3CD0E0 E00C6700 00000000 */  nop
+/* 3CD0E4 E00C6704 C46A0000 */  lwc1      $f10, ($v1)
+/* 3CD0E8 E00C6708 C4640004 */  lwc1      $f4, 4($v1)
+/* 3CD0EC E00C670C 46045280 */  add.s     $f10, $f10, $f4
+/* 3CD0F0 E00C6710 460010A1 */  cvt.d.s   $f2, $f2
+/* 3CD0F4 E00C6714 46281080 */  add.d     $f2, $f2, $f8
+/* 3CD0F8 E00C6718 24840001 */  addiu     $a0, $a0, 1
+/* 3CD0FC E00C671C 46000021 */  cvt.d.s   $f0, $f0
+/* 3CD100 E00C6720 46260000 */  add.d     $f0, $f0, $f6
+/* 3CD104 E00C6724 E46A0000 */  swc1      $f10, ($v1)
+/* 3CD108 E00C6728 462010A0 */  cvt.s.d   $f2, $f2
+/* 3CD10C E00C672C 46200020 */  cvt.s.d   $f0, $f0
+/* 3CD110 E00C6730 E462FFFC */  swc1      $f2, -4($v1)
+/* 3CD114 E00C6734 E460FFF8 */  swc1      $f0, -8($v1)
+/* 3CD118 E00C6738 8E420008 */  lw        $v0, 8($s2)
+/* 3CD11C E00C673C 0082102A */  slt       $v0, $a0, $v0
+/* 3CD120 E00C6740 1440FFC8 */  bnez      $v0, .LE00C6664
+/* 3CD124 E00C6744 2463007C */   addiu    $v1, $v1, 0x7c
+.LE00C6748:
+/* 3CD128 E00C6748 8FBF0034 */  lw        $ra, 0x34($sp)
+/* 3CD12C E00C674C 8FB20030 */  lw        $s2, 0x30($sp)
+/* 3CD130 E00C6750 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 3CD134 E00C6754 8FB00028 */  lw        $s0, 0x28($sp)
+/* 3CD138 E00C6758 D7B60040 */  ldc1      $f22, 0x40($sp)
+/* 3CD13C E00C675C D7B40038 */  ldc1      $f20, 0x38($sp)
+/* 3CD140 E00C6760 03E00008 */  jr        $ra
+/* 3CD144 E00C6764 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_101/fx_101_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s
index b6b7e5810f..0eba45cd74 100644
--- a/ver/us/asm/nonmatchings/effects/effect_101/fx_101_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_101_appendGfx
+glabel fx_65_appendGfx
 /* 3D09CC E00CA4CC 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D09D0 E00CA4D0 0080482D */  daddu     $t1, $a0, $zero
 /* 3D09D4 E00CA4D4 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s
index 930effb1b8..8c566917f0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_main.s
@@ -2,123 +2,161 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_65_main
-/* 385640 E0082000 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* 385644 E0082004 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 385648 E0082008 4485A000 */  mtc1      $a1, $f20
-/* 38564C E008200C AFB00028 */  sw        $s0, 0x28($sp)
-/* 385650 E0082010 0080802D */  daddu     $s0, $a0, $zero
-/* 385654 E0082014 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 385658 E0082018 4486B000 */  mtc1      $a2, $f22
-/* 38565C E008201C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 385660 E0082020 F7B80048 */  sdc1      $f24, 0x48($sp)
-/* 385664 E0082024 4487C000 */  mtc1      $a3, $f24
-/* 385668 E0082028 3C02E008 */  lui       $v0, %hi(fx_65_init)
-/* 38566C E008202C 244221B0 */  addiu     $v0, $v0, %lo(fx_65_init)
-/* 385670 E0082030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 385674 E0082034 3C02E008 */  lui       $v0, %hi(fx_65_update)
-/* 385678 E0082038 244221B8 */  addiu     $v0, $v0, %lo(fx_65_update)
-/* 38567C E008203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 385680 E0082040 3C02E008 */  lui       $v0, %hi(fx_65_render)
-/* 385684 E0082044 24422520 */  addiu     $v0, $v0, %lo(fx_65_render)
-/* 385688 E0082048 AFA20020 */  sw        $v0, 0x20($sp)
-/* 38568C E008204C 3C02E008 */  lui       $v0, %hi(func_E0082528)
-/* 385690 E0082050 24422528 */  addiu     $v0, $v0, %lo(func_E0082528)
-/* 385694 E0082054 AFA20024 */  sw        $v0, 0x24($sp)
-/* 385698 E0082058 24020041 */  addiu     $v0, $zero, 0x41
-/* 38569C E008205C AFBF0034 */  sw        $ra, 0x34($sp)
-/* 3856A0 E0082060 AFB20030 */  sw        $s2, 0x30($sp)
-/* 3856A4 E0082064 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 3856A8 E0082068 AFA00010 */  sw        $zero, 0x10($sp)
-/* 3856AC E008206C 0C080124 */  jal       shim_create_effect_instance
-/* 3856B0 E0082070 AFA20014 */   sw       $v0, 0x14($sp)
-/* 3856B4 E0082074 24040090 */  addiu     $a0, $zero, 0x90
-/* 3856B8 E0082078 24120002 */  addiu     $s2, $zero, 2
-/* 3856BC E008207C 0040882D */  daddu     $s1, $v0, $zero
-/* 3856C0 E0082080 0C08012C */  jal       shim_general_heap_malloc
-/* 3856C4 E0082084 AE320008 */   sw       $s2, 8($s1)
-/* 3856C8 E0082088 0040182D */  daddu     $v1, $v0, $zero
-/* 3856CC E008208C 14600003 */  bnez      $v1, .LE008209C
-/* 3856D0 E0082090 AE23000C */   sw       $v1, 0xc($s1)
-.LE0082094:
-/* 3856D4 E0082094 08020825 */  j         .LE0082094
-/* 3856D8 E0082098 00000000 */   nop
-.LE008209C:
-/* 3856DC E008209C 3C013F80 */  lui       $at, 0x3f80
-/* 3856E0 E00820A0 44810000 */  mtc1      $at, $f0
-/* 3856E4 E00820A4 24020001 */  addiu     $v0, $zero, 1
-/* 3856E8 E00820A8 AC700000 */  sw        $s0, ($v1)
-/* 3856EC E00820AC 16020004 */  bne       $s0, $v0, .LE00820C0
-/* 3856F0 E00820B0 E4600034 */   swc1     $f0, 0x34($v1)
-/* 3856F4 E00820B4 AC700038 */  sw        $s0, 0x38($v1)
-/* 3856F8 E00820B8 08020834 */  j         .LE00820D0
-/* 3856FC E00820BC AC60003C */   sw       $zero, 0x3c($v1)
-.LE00820C0:
-/* 385700 E00820C0 AC600038 */  sw        $zero, 0x38($v1)
-/* 385704 E00820C4 8FA20060 */  lw        $v0, 0x60($sp)
-/* 385708 E00820C8 AC62003C */  sw        $v0, 0x3c($v1)
-/* 38570C E00820CC 24020001 */  addiu     $v0, $zero, 1
-.LE00820D0:
-/* 385710 E00820D0 E4740008 */  swc1      $f20, 8($v1)
-/* 385714 E00820D4 E476000C */  swc1      $f22, 0xc($v1)
-/* 385718 E00820D8 1202000E */  beq       $s0, $v0, .LE0082114
-/* 38571C E00820DC E4780010 */   swc1     $f24, 0x10($v1)
-/* 385720 E00820E0 2A020002 */  slti      $v0, $s0, 2
-/* 385724 E00820E4 10400005 */  beqz      $v0, .LE00820FC
-/* 385728 E00820E8 2402000A */   addiu    $v0, $zero, 0xa
-/* 38572C E00820EC 12000007 */  beqz      $s0, .LE008210C
-/* 385730 E00820F0 24020001 */   addiu    $v0, $zero, 1
-/* 385734 E00820F4 0802084B */  j         .LE008212C
-/* 385738 E00820F8 AC60002C */   sw       $zero, 0x2c($v1)
-.LE00820FC:
-/* 38573C E00820FC 12020007 */  beq       $s0, $v0, .LE008211C
-/* 385740 E0082100 24020001 */   addiu    $v0, $zero, 1
-/* 385744 E0082104 0802084B */  j         .LE008212C
-/* 385748 E0082108 AC60002C */   sw       $zero, 0x2c($v1)
-.LE008210C:
-/* 38574C E008210C 08020848 */  j         .LE0082120
-/* 385750 E0082110 24020064 */   addiu    $v0, $zero, 0x64
-.LE0082114:
-/* 385754 E0082114 08020848 */  j         .LE0082120
-/* 385758 E0082118 24020064 */   addiu    $v0, $zero, 0x64
-.LE008211C:
-/* 38575C E008211C 24020015 */  addiu     $v0, $zero, 0x15
-.LE0082120:
-/* 385760 E0082120 AC620028 */  sw        $v0, 0x28($v1)
-/* 385764 E0082124 24020001 */  addiu     $v0, $zero, 1
-/* 385768 E0082128 AC60002C */  sw        $zero, 0x2c($v1)
-.LE008212C:
-/* 38576C E008212C AC600044 */  sw        $zero, 0x44($v1)
-/* 385770 E0082130 AC620004 */  sw        $v0, 4($v1)
-/* 385774 E0082134 0040202D */  daddu     $a0, $v0, $zero
-/* 385778 E0082138 0092102A */  slt       $v0, $a0, $s2
-/* 38577C E008213C 10400012 */  beqz      $v0, .LE0082188
-/* 385780 E0082140 24630048 */   addiu    $v1, $v1, 0x48
-/* 385784 E0082144 44800000 */  mtc1      $zero, $f0
-/* 385788 E0082148 240500FF */  addiu     $a1, $zero, 0xff
-/* 38578C E008214C 24630024 */  addiu     $v1, $v1, 0x24
-.LE0082150:
-/* 385790 E0082150 24840001 */  addiu     $a0, $a0, 1
-/* 385794 E0082154 E460FFEC */  swc1      $f0, -0x14($v1)
-/* 385798 E0082158 E460FFE8 */  swc1      $f0, -0x18($v1)
-/* 38579C E008215C E460FFE4 */  swc1      $f0, -0x1c($v1)
-/* 3857A0 E0082160 E460FFFC */  swc1      $f0, -4($v1)
-/* 3857A4 E0082164 E460FFF8 */  swc1      $f0, -8($v1)
-/* 3857A8 E0082168 E460FFF4 */  swc1      $f0, -0xc($v1)
-/* 3857AC E008216C E460FFF0 */  swc1      $f0, -0x10($v1)
-/* 3857B0 E0082170 E460001C */  swc1      $f0, 0x1c($v1)
-/* 3857B4 E0082174 AC600004 */  sw        $zero, 4($v1)
-/* 3857B8 E0082178 AC650000 */  sw        $a1, ($v1)
-/* 3857BC E008217C 0092102A */  slt       $v0, $a0, $s2
-/* 3857C0 E0082180 1440FFF3 */  bnez      $v0, .LE0082150
-/* 3857C4 E0082184 24630048 */   addiu    $v1, $v1, 0x48
-.LE0082188:
-/* 3857C8 E0082188 0220102D */  daddu     $v0, $s1, $zero
-/* 3857CC E008218C 8FBF0034 */  lw        $ra, 0x34($sp)
-/* 3857D0 E0082190 8FB20030 */  lw        $s2, 0x30($sp)
-/* 3857D4 E0082194 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 3857D8 E0082198 8FB00028 */  lw        $s0, 0x28($sp)
-/* 3857DC E008219C D7B80048 */  ldc1      $f24, 0x48($sp)
-/* 3857E0 E00821A0 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 3857E4 E00821A4 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 3857E8 E00821A8 03E00008 */  jr        $ra
-/* 3857EC E00821AC 27BD0050 */   addiu    $sp, $sp, 0x50
+/* 3D0500 E00CA000 27BDFFA8 */  addiu     $sp, $sp, -0x58
+/* 3D0504 E00CA004 F7B40040 */  sdc1      $f20, 0x40($sp)
+/* 3D0508 E00CA008 4485A000 */  mtc1      $a1, $f20
+/* 3D050C E00CA00C F7B60048 */  sdc1      $f22, 0x48($sp)
+/* 3D0510 E00CA010 4486B000 */  mtc1      $a2, $f22
+/* 3D0514 E00CA014 AFB1002C */  sw        $s1, 0x2c($sp)
+/* 3D0518 E00CA018 0080882D */  daddu     $s1, $a0, $zero
+/* 3D051C E00CA01C F7B80050 */  sdc1      $f24, 0x50($sp)
+/* 3D0520 E00CA020 4487C000 */  mtc1      $a3, $f24
+/* 3D0524 E00CA024 27A40010 */  addiu     $a0, $sp, 0x10
+/* 3D0528 E00CA028 AFB30034 */  sw        $s3, 0x34($sp)
+/* 3D052C E00CA02C 8FB3006C */  lw        $s3, 0x6c($sp)
+/* 3D0530 E00CA030 3C02E00D */  lui       $v0, %hi(fx_65_init)
+/* 3D0534 E00CA034 2442A240 */  addiu     $v0, $v0, %lo(fx_65_init)
+/* 3D0538 E00CA038 AFA20018 */  sw        $v0, 0x18($sp)
+/* 3D053C E00CA03C 3C02E00D */  lui       $v0, %hi(fx_65_update)
+/* 3D0540 E00CA040 2442A248 */  addiu     $v0, $v0, %lo(fx_65_update)
+/* 3D0544 E00CA044 AFA2001C */  sw        $v0, 0x1c($sp)
+/* 3D0548 E00CA048 3C02E00D */  lui       $v0, %hi(fx_65_render)
+/* 3D054C E00CA04C 2442A484 */  addiu     $v0, $v0, %lo(fx_65_render)
+/* 3D0550 E00CA050 AFA20020 */  sw        $v0, 0x20($sp)
+/* 3D0554 E00CA054 24020065 */  addiu     $v0, $zero, 0x65
+/* 3D0558 E00CA058 AFBF0038 */  sw        $ra, 0x38($sp)
+/* 3D055C E00CA05C AFB20030 */  sw        $s2, 0x30($sp)
+/* 3D0560 E00CA060 AFB00028 */  sw        $s0, 0x28($sp)
+/* 3D0564 E00CA064 AFA00010 */  sw        $zero, 0x10($sp)
+/* 3D0568 E00CA068 AFA00024 */  sw        $zero, 0x24($sp)
+/* 3D056C E00CA06C 0C080124 */  jal       shim_create_effect_instance
+/* 3D0570 E00CA070 AFA20014 */   sw       $v0, 0x14($sp)
+/* 3D0574 E00CA074 24040324 */  addiu     $a0, $zero, 0x324
+/* 3D0578 E00CA078 24030001 */  addiu     $v1, $zero, 1
+/* 3D057C E00CA07C 0040902D */  daddu     $s2, $v0, $zero
+/* 3D0580 E00CA080 0C08012C */  jal       shim_general_heap_malloc
+/* 3D0584 E00CA084 AE430008 */   sw       $v1, 8($s2)
+/* 3D0588 E00CA088 0040802D */  daddu     $s0, $v0, $zero
+/* 3D058C E00CA08C 16000003 */  bnez      $s0, .LE00CA09C
+/* 3D0590 E00CA090 AE42000C */   sw       $v0, 0xc($s2)
+.LE00CA094:
+/* 3D0594 E00CA094 08032825 */  j         .LE00CA094
+/* 3D0598 E00CA098 00000000 */   nop
+.LE00CA09C:
+/* 3D059C E00CA09C AE110000 */  sw        $s1, ($s0)
+/* 3D05A0 E00CA0A0 1E600004 */  bgtz      $s3, .LE00CA0B4
+/* 3D05A4 E00CA0A4 AE000014 */   sw       $zero, 0x14($s0)
+/* 3D05A8 E00CA0A8 240203E8 */  addiu     $v0, $zero, 0x3e8
+/* 3D05AC E00CA0AC 0803282E */  j         .LE00CA0B8
+/* 3D05B0 E00CA0B0 AE020010 */   sw       $v0, 0x10($s0)
+.LE00CA0B4:
+/* 3D05B4 E00CA0B4 AE130010 */  sw        $s3, 0x10($s0)
+.LE00CA0B8:
+/* 3D05B8 E00CA0B8 E6140004 */  swc1      $f20, 4($s0)
+/* 3D05BC E00CA0BC E6160008 */  swc1      $f22, 8($s0)
+/* 3D05C0 E00CA0C0 E618000C */  swc1      $f24, 0xc($s0)
+/* 3D05C4 E00CA0C4 C7A00068 */  lwc1      $f0, 0x68($sp)
+/* 3D05C8 E00CA0C8 24020001 */  addiu     $v0, $zero, 1
+/* 3D05CC E00CA0CC 12220017 */  beq       $s1, $v0, .LE00CA12C
+/* 3D05D0 E00CA0D0 E6000034 */   swc1     $f0, 0x34($s0)
+/* 3D05D4 E00CA0D4 2A220002 */  slti      $v0, $s1, 2
+/* 3D05D8 E00CA0D8 50400005 */  beql      $v0, $zero, .LE00CA0F0
+/* 3D05DC E00CA0DC 24020002 */   addiu    $v0, $zero, 2
+/* 3D05E0 E00CA0E0 1220000A */  beqz      $s1, .LE00CA10C
+/* 3D05E4 E00CA0E4 2403001D */   addiu    $v1, $zero, 0x1d
+/* 3D05E8 E00CA0E8 0803286D */  j         .LE00CA1B4
+/* 3D05EC E00CA0EC 26020074 */   addiu    $v0, $s0, 0x74
+.LE00CA0F0:
+/* 3D05F0 E00CA0F0 1222001C */  beq       $s1, $v0, .LE00CA164
+/* 3D05F4 E00CA0F4 240200FF */   addiu    $v0, $zero, 0xff
+/* 3D05F8 E00CA0F8 24020003 */  addiu     $v0, $zero, 3
+/* 3D05FC E00CA0FC 12220021 */  beq       $s1, $v0, .LE00CA184
+/* 3D0600 E00CA100 2403001D */   addiu    $v1, $zero, 0x1d
+/* 3D0604 E00CA104 0803286D */  j         .LE00CA1B4
+/* 3D0608 E00CA108 26020074 */   addiu    $v0, $s0, 0x74
+.LE00CA10C:
+/* 3D060C E00CA10C 240300FF */  addiu     $v1, $zero, 0xff
+/* 3D0610 E00CA110 240200E1 */  addiu     $v0, $zero, 0xe1
+/* 3D0614 E00CA114 AE030018 */  sw        $v1, 0x18($s0)
+/* 3D0618 E00CA118 AE03001C */  sw        $v1, 0x1c($s0)
+/* 3D061C E00CA11C AE030020 */  sw        $v1, 0x20($s0)
+/* 3D0620 E00CA120 AE020028 */  sw        $v0, 0x28($s0)
+/* 3D0624 E00CA124 08032856 */  j         .LE00CA158
+/* 3D0628 E00CA128 AE02002C */   sw       $v0, 0x2c($s0)
+.LE00CA12C:
+/* 3D062C E00CA12C 240300FF */  addiu     $v1, $zero, 0xff
+/* 3D0630 E00CA130 240200F5 */  addiu     $v0, $zero, 0xf5
+/* 3D0634 E00CA134 AE02001C */  sw        $v0, 0x1c($s0)
+/* 3D0638 E00CA138 240200E6 */  addiu     $v0, $zero, 0xe6
+/* 3D063C E00CA13C AE020020 */  sw        $v0, 0x20($s0)
+/* 3D0640 E00CA140 2402002D */  addiu     $v0, $zero, 0x2d
+/* 3D0644 E00CA144 AE020028 */  sw        $v0, 0x28($s0)
+/* 3D0648 E00CA148 24020023 */  addiu     $v0, $zero, 0x23
+/* 3D064C E00CA14C AE02002C */  sw        $v0, 0x2c($s0)
+/* 3D0650 E00CA150 2402000F */  addiu     $v0, $zero, 0xf
+/* 3D0654 E00CA154 AE030018 */  sw        $v1, 0x18($s0)
+.LE00CA158:
+/* 3D0658 E00CA158 AE020030 */  sw        $v0, 0x30($s0)
+/* 3D065C E00CA15C 0803286B */  j         .LE00CA1AC
+/* 3D0660 E00CA160 AE030024 */   sw       $v1, 0x24($s0)
+.LE00CA164:
+/* 3D0664 E00CA164 2403009B */  addiu     $v1, $zero, 0x9b
+/* 3D0668 E00CA168 AE030028 */  sw        $v1, 0x28($s0)
+/* 3D066C E00CA16C 2403007D */  addiu     $v1, $zero, 0x7d
+/* 3D0670 E00CA170 AE020018 */  sw        $v0, 0x18($s0)
+/* 3D0674 E00CA174 AE00001C */  sw        $zero, 0x1c($s0)
+/* 3D0678 E00CA178 AE000020 */  sw        $zero, 0x20($s0)
+/* 3D067C E00CA17C 08032869 */  j         .LE00CA1A4
+/* 3D0680 E00CA180 AE03002C */   sw       $v1, 0x2c($s0)
+.LE00CA184:
+/* 3D0684 E00CA184 240200FF */  addiu     $v0, $zero, 0xff
+/* 3D0688 E00CA188 24030041 */  addiu     $v1, $zero, 0x41
+/* 3D068C E00CA18C AE03002C */  sw        $v1, 0x2c($s0)
+/* 3D0690 E00CA190 24030014 */  addiu     $v1, $zero, 0x14
+/* 3D0694 E00CA194 AE020018 */  sw        $v0, 0x18($s0)
+/* 3D0698 E00CA198 AE02001C */  sw        $v0, 0x1c($s0)
+/* 3D069C E00CA19C AE020020 */  sw        $v0, 0x20($s0)
+/* 3D06A0 E00CA1A0 AE020028 */  sw        $v0, 0x28($s0)
+.LE00CA1A4:
+/* 3D06A4 E00CA1A4 AE030030 */  sw        $v1, 0x30($s0)
+/* 3D06A8 E00CA1A8 AE020024 */  sw        $v0, 0x24($s0)
+.LE00CA1AC:
+/* 3D06AC E00CA1AC 2403001D */  addiu     $v1, $zero, 0x1d
+/* 3D06B0 E00CA1B0 26020074 */  addiu     $v0, $s0, 0x74
+.LE00CA1B4:
+/* 3D06B4 E00CA1B4 E6140038 */  swc1      $f20, 0x38($s0)
+/* 3D06B8 E00CA1B8 E616003C */  swc1      $f22, 0x3c($s0)
+/* 3D06BC E00CA1BC E6180040 */  swc1      $f24, 0x40($s0)
+.LE00CA1C0:
+/* 3D06C0 E00CA1C0 AC400230 */  sw        $zero, 0x230($v0)
+/* 3D06C4 E00CA1C4 2463FFFF */  addiu     $v1, $v1, -1
+/* 3D06C8 E00CA1C8 0461FFFD */  bgez      $v1, .LE00CA1C0
+/* 3D06CC E00CA1CC 2442FFFC */   addiu    $v0, $v0, -4
+/* 3D06D0 E00CA1D0 2404001E */  addiu     $a0, $zero, 0x1e
+/* 3D06D4 E00CA1D4 24020001 */  addiu     $v0, $zero, 1
+/* 3D06D8 E00CA1D8 AE0002A8 */  sw        $zero, 0x2a8($s0)
+/* 3D06DC E00CA1DC E6140050 */  swc1      $f20, 0x50($s0)
+/* 3D06E0 E00CA1E0 E61600C8 */  swc1      $f22, 0xc8($s0)
+/* 3D06E4 E00CA1E4 E6180140 */  swc1      $f24, 0x140($s0)
+/* 3D06E8 E00CA1E8 AE020230 */  sw        $v0, 0x230($s0)
+/* 3D06EC E00CA1EC AE0001B8 */  sw        $zero, 0x1b8($s0)
+/* 3D06F0 E00CA1F0 0C080138 */  jal       shim_rand_int
+/* 3D06F4 E00CA1F4 AE0002AC */   sw       $zero, 0x2ac($s0)
+/* 3D06F8 E00CA1F8 2443000A */  addiu     $v1, $v0, 0xa
+/* 3D06FC E00CA1FC 0240102D */  daddu     $v0, $s2, $zero
+/* 3D0700 E00CA200 44830000 */  mtc1      $v1, $f0
+/* 3D0704 E00CA204 00000000 */  nop
+/* 3D0708 E00CA208 46800020 */  cvt.s.w   $f0, $f0
+/* 3D070C E00CA20C E6000044 */  swc1      $f0, 0x44($s0)
+/* 3D0710 E00CA210 AE000048 */  sw        $zero, 0x48($s0)
+/* 3D0714 E00CA214 AE00004C */  sw        $zero, 0x4c($s0)
+/* 3D0718 E00CA218 8FBF0038 */  lw        $ra, 0x38($sp)
+/* 3D071C E00CA21C 8FB30034 */  lw        $s3, 0x34($sp)
+/* 3D0720 E00CA220 8FB20030 */  lw        $s2, 0x30($sp)
+/* 3D0724 E00CA224 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 3D0728 E00CA228 8FB00028 */  lw        $s0, 0x28($sp)
+/* 3D072C E00CA22C D7B80050 */  ldc1      $f24, 0x50($sp)
+/* 3D0730 E00CA230 D7B60048 */  ldc1      $f22, 0x48($sp)
+/* 3D0734 E00CA234 D7B40040 */  ldc1      $f20, 0x40($sp)
+/* 3D0738 E00CA238 03E00008 */  jr        $ra
+/* 3D073C E00CA23C 27BD0058 */   addiu    $sp, $sp, 0x58
diff --git a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_update.s b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_update.s
index cca746d8bd..5776f8a50e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_65/fx_65_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_65/fx_65_update.s
@@ -2,239 +2,155 @@
 .set noreorder # don't insert nops after branches
 
 glabel fx_65_update
-/* 3857F8 E00821B8 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* 3857FC E00821BC AFB40028 */  sw        $s4, 0x28($sp)
-/* 385800 E00821C0 0080A02D */  daddu     $s4, $a0, $zero
-/* 385804 E00821C4 AFBF0038 */  sw        $ra, 0x38($sp)
-/* 385808 E00821C8 AFB70034 */  sw        $s7, 0x34($sp)
-/* 38580C E00821CC AFB60030 */  sw        $s6, 0x30($sp)
-/* 385810 E00821D0 AFB5002C */  sw        $s5, 0x2c($sp)
-/* 385814 E00821D4 AFB30024 */  sw        $s3, 0x24($sp)
-/* 385818 E00821D8 AFB20020 */  sw        $s2, 0x20($sp)
-/* 38581C E00821DC AFB1001C */  sw        $s1, 0x1c($sp)
-/* 385820 E00821E0 AFB00018 */  sw        $s0, 0x18($sp)
-/* 385824 E00821E4 F7B60048 */  sdc1      $f22, 0x48($sp)
-/* 385828 E00821E8 F7B40040 */  sdc1      $f20, 0x40($sp)
-/* 38582C E00821EC 8E830000 */  lw        $v1, ($s4)
-/* 385830 E00821F0 8E90000C */  lw        $s0, 0xc($s4)
-/* 385834 E00821F4 30620010 */  andi      $v0, $v1, 0x10
-/* 385838 E00821F8 10400005 */  beqz      $v0, .LE0082210
-/* 38583C E00821FC 2402FFEF */   addiu    $v0, $zero, -0x11
-/* 385840 E0082200 00621024 */  and       $v0, $v1, $v0
-/* 385844 E0082204 AE820000 */  sw        $v0, ($s4)
-/* 385848 E0082208 24020015 */  addiu     $v0, $zero, 0x15
-/* 38584C E008220C AE020028 */  sw        $v0, 0x28($s0)
-.LE0082210:
-/* 385850 E0082210 8E030028 */  lw        $v1, 0x28($s0)
-/* 385854 E0082214 28620064 */  slti      $v0, $v1, 0x64
-/* 385858 E0082218 10400002 */  beqz      $v0, .LE0082224
-/* 38585C E008221C 2462FFFF */   addiu    $v0, $v1, -1
-/* 385860 E0082220 AE020028 */  sw        $v0, 0x28($s0)
-.LE0082224:
-/* 385864 E0082224 8E020028 */  lw        $v0, 0x28($s0)
-/* 385868 E0082228 04410005 */  bgez      $v0, .LE0082240
-/* 38586C E008222C 3C030004 */   lui      $v1, 4
-/* 385870 E0082230 0C080128 */  jal       shim_remove_effect
-/* 385874 E0082234 0280202D */   daddu    $a0, $s4, $zero
-/* 385878 E0082238 0802093B */  j         .LE00824EC
-/* 38587C E008223C 00000000 */   nop
-.LE0082240:
-/* 385880 E0082240 8E02002C */  lw        $v0, 0x2c($s0)
-/* 385884 E0082244 3463F1A0 */  ori       $v1, $v1, 0xf1a0
-/* 385888 E0082248 24420001 */  addiu     $v0, $v0, 1
-/* 38588C E008224C 0062182A */  slt       $v1, $v1, $v0
-/* 385890 E0082250 10600003 */  beqz      $v1, .LE0082260
-/* 385894 E0082254 AE02002C */   sw       $v0, 0x2c($s0)
-/* 385898 E0082258 24020100 */  addiu     $v0, $zero, 0x100
-/* 38589C E008225C AE02002C */  sw        $v0, 0x2c($s0)
-.LE0082260:
-/* 3858A0 E0082260 8E03003C */  lw        $v1, 0x3c($s0)
-/* 3858A4 E0082264 8E130000 */  lw        $s3, ($s0)
-/* 3858A8 E0082268 8E120028 */  lw        $s2, 0x28($s0)
-/* 3858AC E008226C 8E15002C */  lw        $s5, 0x2c($s0)
-/* 3858B0 E0082270 8E040038 */  lw        $a0, 0x38($s0)
-/* 3858B4 E0082274 16600034 */  bnez      $s3, .LE0082348
-/* 3858B8 E0082278 C6160034 */   lwc1     $f22, 0x34($s0)
-/* 3858BC E008227C 8E020044 */  lw        $v0, 0x44($s0)
-/* 3858C0 E0082280 1C400030 */  bgtz      $v0, .LE0082344
-/* 3858C4 E0082284 2442FFFF */   addiu    $v0, $v0, -1
-/* 3858C8 E0082288 1064002F */  beq       $v1, $a0, .LE0082348
-/* 3858CC E008228C 00000000 */   nop
-/* 3858D0 E0082290 04620001 */  bltzl     $v1, .LE0082298
-/* 3858D4 E0082294 0000182D */   daddu    $v1, $zero, $zero
-.LE0082298:
-/* 3858D8 E0082298 0083102A */  slt       $v0, $a0, $v1
-/* 3858DC E008229C 10400017 */  beqz      $v0, .LE00822FC
-/* 3858E0 E00822A0 24020064 */   addiu    $v0, $zero, 0x64
-/* 3858E4 E00822A4 AE020028 */  sw        $v0, 0x28($s0)
-/* 3858E8 E00822A8 24020001 */  addiu     $v0, $zero, 1
-/* 3858EC E00822AC AE02002C */  sw        $v0, 0x2c($s0)
-/* 3858F0 E00822B0 8E020038 */  lw        $v0, 0x38($s0)
-/* 3858F4 E00822B4 C602000C */  lwc1      $f2, 0xc($s0)
-/* 3858F8 E00822B8 3C01C3FA */  lui       $at, 0xc3fa
-/* 3858FC E00822BC 44810000 */  mtc1      $at, $f0
-/* 385900 E00822C0 AE000070 */  sw        $zero, 0x70($s0)
-/* 385904 E00822C4 24420001 */  addiu     $v0, $v0, 1
-/* 385908 E00822C8 4602003C */  c.lt.s    $f0, $f2
-/* 38590C E00822CC 00000000 */  nop
-/* 385910 E00822D0 4500001B */  bc1f      .LE0082340
-/* 385914 E00822D4 AE020038 */   sw       $v0, 0x38($s0)
-/* 385918 E00822D8 C6000010 */  lwc1      $f0, 0x10($s0)
-/* 38591C E00822DC 24042107 */  addiu     $a0, $zero, 0x2107
-/* 385920 E00822E0 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 385924 E00822E4 8E060008 */  lw        $a2, 8($s0)
-/* 385928 E00822E8 8E07000C */  lw        $a3, 0xc($s0)
-/* 38592C E00822EC 0C0801A0 */  jal       shim_sfx_play_sound_at_position
-/* 385930 E00822F0 0000282D */   daddu    $a1, $zero, $zero
-/* 385934 E00822F4 080208D1 */  j         .LE0082344
-/* 385938 E00822F8 24020008 */   addiu    $v0, $zero, 8
-.LE00822FC:
-/* 38593C E00822FC 0064102A */  slt       $v0, $v1, $a0
-/* 385940 E0082300 10400010 */  beqz      $v0, .LE0082344
-/* 385944 E0082304 24020008 */   addiu    $v0, $zero, 8
-/* 385948 E0082308 0C080150 */  jal       shim_load_effect
-/* 38594C E008230C 24040041 */   addiu    $a0, $zero, 0x41
-/* 385950 E0082310 C602000C */  lwc1      $f2, 0xc($s0)
-/* 385954 E0082314 C6000068 */  lwc1      $f0, 0x68($s0)
-/* 385958 E0082318 AFA00010 */  sw        $zero, 0x10($sp)
-/* 38595C E008231C 46001080 */  add.s     $f2, $f2, $f0
-/* 385960 E0082320 8E050008 */  lw        $a1, 8($s0)
-/* 385964 E0082324 8E070010 */  lw        $a3, 0x10($s0)
-/* 385968 E0082328 44061000 */  mfc1      $a2, $f2
-/* 38596C E008232C 0C020800 */  jal       fx_65_main
-/* 385970 E0082330 2404000A */   addiu    $a0, $zero, 0xa
-/* 385974 E0082334 8E020038 */  lw        $v0, 0x38($s0)
-/* 385978 E0082338 2442FFFF */  addiu     $v0, $v0, -1
-/* 38597C E008233C AE020038 */  sw        $v0, 0x38($s0)
-.LE0082340:
-/* 385980 E0082340 24020008 */  addiu     $v0, $zero, 8
-.LE0082344:
-/* 385984 E0082344 AE020044 */  sw        $v0, 0x44($s0)
-.LE0082348:
-/* 385988 E0082348 8E820008 */  lw        $v0, 8($s4)
-/* 38598C E008234C 24110001 */  addiu     $s1, $zero, 1
-/* 385990 E0082350 0222102A */  slt       $v0, $s1, $v0
-/* 385994 E0082354 10400065 */  beqz      $v0, .LE00824EC
-/* 385998 E0082358 26100048 */   addiu    $s0, $s0, 0x48
-/* 38599C E008235C 3C17E008 */  lui       $s7, %hi(D_E0082D30)
-/* 3859A0 E0082360 26F72D30 */  addiu     $s7, $s7, %lo(D_E0082D30)
-/* 3859A4 E0082364 02351004 */  sllv      $v0, $s5, $s1
-/* 3859A8 E0082368 00551021 */  addu      $v0, $v0, $s5
-/* 3859AC E008236C 0002B080 */  sll       $s6, $v0, 2
-/* 3859B0 E0082370 3C014080 */  lui       $at, 0x4080
-/* 3859B4 E0082374 4481A000 */  mtc1      $at, $f20
-/* 3859B8 E0082378 02321004 */  sllv      $v0, $s2, $s1
-/* 3859BC E008237C 00521021 */  addu      $v0, $v0, $s2
-/* 3859C0 E0082380 000210C0 */  sll       $v0, $v0, 3
-/* 3859C4 E0082384 0052A821 */  addu      $s5, $v0, $s2
-/* 3859C8 E0082388 26100028 */  addiu     $s0, $s0, 0x28
-.LE008238C:
-/* 3859CC E008238C 8E030000 */  lw        $v1, ($s0)
-/* 3859D0 E0082390 28620009 */  slti      $v0, $v1, 9
-/* 3859D4 E0082394 10400007 */  beqz      $v0, .LE00823B4
-/* 3859D8 E0082398 2402000A */   addiu    $v0, $zero, 0xa
-/* 3859DC E008239C 12620005 */  beq       $s3, $v0, .LE00823B4
-/* 3859E0 E00823A0 00031080 */   sll      $v0, $v1, 2
-/* 3859E4 E00823A4 00571021 */  addu      $v0, $v0, $s7
-/* 3859E8 E00823A8 C4400000 */  lwc1      $f0, ($v0)
-/* 3859EC E00823AC 080208F1 */  j         .LE00823C4
-/* 3859F0 E00823B0 E6000008 */   swc1     $f0, 8($s0)
-.LE00823B4:
-/* 3859F4 E00823B4 3C013F80 */  lui       $at, 0x3f80
-/* 3859F8 E00823B8 44810000 */  mtc1      $at, $f0
-/* 3859FC E00823BC 00000000 */  nop
-/* 385A00 E00823C0 E6000008 */  swc1      $f0, 8($s0)
-.LE00823C4:
-/* 385A04 E00823C4 C6000008 */  lwc1      $f0, 8($s0)
-/* 385A08 E00823C8 46160002 */  mul.s     $f0, $f0, $f22
-/* 385A0C E00823CC 00000000 */  nop
-/* 385A10 E00823D0 2E620002 */  sltiu     $v0, $s3, 2
-/* 385A14 E00823D4 10400009 */  beqz      $v0, .LE00823FC
-/* 385A18 E00823D8 E6000008 */   swc1     $f0, 8($s0)
-/* 385A1C E00823DC 44966000 */  mtc1      $s6, $f12
-/* 385A20 E00823E0 00000000 */  nop
-/* 385A24 E00823E4 0C080144 */  jal       shim_cos_deg
-/* 385A28 E00823E8 46806320 */   cvt.s.w  $f12, $f12
-/* 385A2C E00823EC 46140002 */  mul.s     $f0, $f0, $f20
-/* 385A30 E00823F0 00000000 */  nop
-/* 385A34 E00823F4 08020900 */  j         .LE0082400
-/* 385A38 E00823F8 E600FFF8 */   swc1     $f0, -8($s0)
-.LE00823FC:
-/* 385A3C E00823FC AE00FFF8 */  sw        $zero, -8($s0)
-.LE0082400:
-/* 385A40 E0082400 C606FFE0 */  lwc1      $f6, -0x20($s0)
-/* 385A44 E0082404 C600FFEC */  lwc1      $f0, -0x14($s0)
-/* 385A48 E0082408 C604FFE4 */  lwc1      $f4, -0x1c($s0)
-/* 385A4C E008240C 46003180 */  add.s     $f6, $f6, $f0
-/* 385A50 E0082410 C600FFF0 */  lwc1      $f0, -0x10($s0)
-/* 385A54 E0082414 C602FFE8 */  lwc1      $f2, -0x18($s0)
-/* 385A58 E0082418 46002100 */  add.s     $f4, $f4, $f0
-/* 385A5C E008241C C600FFF4 */  lwc1      $f0, -0xc($s0)
-/* 385A60 E0082420 24020014 */  addiu     $v0, $zero, 0x14
-/* 385A64 E0082424 46001080 */  add.s     $f2, $f2, $f0
-/* 385A68 E0082428 E606FFE0 */  swc1      $f6, -0x20($s0)
-/* 385A6C E008242C E604FFE4 */  swc1      $f4, -0x1c($s0)
-/* 385A70 E0082430 16420005 */  bne       $s2, $v0, .LE0082448
-/* 385A74 E0082434 E602FFE8 */   swc1     $f2, -0x18($s0)
-/* 385A78 E0082438 3C01C000 */  lui       $at, 0xc000
-/* 385A7C E008243C 44810000 */  mtc1      $at, $f0
-/* 385A80 E0082440 E614FFF0 */  swc1      $f20, -0x10($s0)
-/* 385A84 E0082444 E600FFEC */  swc1      $f0, -0x14($s0)
-.LE0082448:
-/* 385A88 E0082448 2A420014 */  slti      $v0, $s2, 0x14
-/* 385A8C E008244C 1040001D */  beqz      $v0, .LE00824C4
-/* 385A90 E0082450 2A42000A */   slti     $v0, $s2, 0xa
-/* 385A94 E0082454 44920000 */  mtc1      $s2, $f0
-/* 385A98 E0082458 00000000 */  nop
-/* 385A9C E008245C 46800020 */  cvt.s.w   $f0, $f0
-/* 385AA0 E0082460 3C01E008 */  lui       $at, %hi(D_E0082D60)
-/* 385AA4 E0082464 D4222D60 */  ldc1      $f2, %lo(D_E0082D60)($at)
-/* 385AA8 E0082468 46000021 */  cvt.d.s   $f0, $f0
-/* 385AAC E008246C 46220002 */  mul.d     $f0, $f0, $f2
-/* 385AB0 E0082470 00000000 */  nop
-/* 385AB4 E0082474 C602FFF8 */  lwc1      $f2, -8($s0)
-/* 385AB8 E0082478 460010A1 */  cvt.d.s   $f2, $f2
-/* 385ABC E008247C 46201082 */  mul.d     $f2, $f2, $f0
-/* 385AC0 E0082480 00000000 */  nop
-/* 385AC4 E0082484 3C01BFE0 */  lui       $at, 0xbfe0
-/* 385AC8 E0082488 44812800 */  mtc1      $at, $f5
-/* 385ACC E008248C 44802000 */  mtc1      $zero, $f4
-/* 385AD0 E0082490 C600FFF0 */  lwc1      $f0, -0x10($s0)
-/* 385AD4 E0082494 C6060018 */  lwc1      $f6, 0x18($s0)
-/* 385AD8 E0082498 46000021 */  cvt.d.s   $f0, $f0
-/* 385ADC E008249C 46240000 */  add.d     $f0, $f0, $f4
-/* 385AE0 E00824A0 3C014120 */  lui       $at, 0x4120
-/* 385AE4 E00824A4 44812000 */  mtc1      $at, $f4
-/* 385AE8 E00824A8 00000000 */  nop
-/* 385AEC E00824AC 46043180 */  add.s     $f6, $f6, $f4
-/* 385AF0 E00824B0 46200020 */  cvt.s.d   $f0, $f0
-/* 385AF4 E00824B4 E600FFF0 */  swc1      $f0, -0x10($s0)
-/* 385AF8 E00824B8 E6060018 */  swc1      $f6, 0x18($s0)
-/* 385AFC E00824BC 462010A0 */  cvt.s.d   $f2, $f2
-/* 385B00 E00824C0 E602FFF8 */  swc1      $f2, -8($s0)
-.LE00824C4:
-/* 385B04 E00824C4 54400001 */  bnel      $v0, $zero, .LE00824CC
-/* 385B08 E00824C8 AE15FFFC */   sw       $s5, -4($s0)
-.LE00824CC:
-/* 385B0C E00824CC 8E020000 */  lw        $v0, ($s0)
-/* 385B10 E00824D0 26310001 */  addiu     $s1, $s1, 1
-/* 385B14 E00824D4 24420001 */  addiu     $v0, $v0, 1
-/* 385B18 E00824D8 AE020000 */  sw        $v0, ($s0)
-/* 385B1C E00824DC 8E820008 */  lw        $v0, 8($s4)
-/* 385B20 E00824E0 0222102A */  slt       $v0, $s1, $v0
-/* 385B24 E00824E4 1440FFA9 */  bnez      $v0, .LE008238C
-/* 385B28 E00824E8 26100048 */   addiu    $s0, $s0, 0x48
-.LE00824EC:
-/* 385B2C E00824EC 8FBF0038 */  lw        $ra, 0x38($sp)
-/* 385B30 E00824F0 8FB70034 */  lw        $s7, 0x34($sp)
-/* 385B34 E00824F4 8FB60030 */  lw        $s6, 0x30($sp)
-/* 385B38 E00824F8 8FB5002C */  lw        $s5, 0x2c($sp)
-/* 385B3C E00824FC 8FB40028 */  lw        $s4, 0x28($sp)
-/* 385B40 E0082500 8FB30024 */  lw        $s3, 0x24($sp)
-/* 385B44 E0082504 8FB20020 */  lw        $s2, 0x20($sp)
-/* 385B48 E0082508 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 385B4C E008250C 8FB00018 */  lw        $s0, 0x18($sp)
-/* 385B50 E0082510 D7B60048 */  ldc1      $f22, 0x48($sp)
-/* 385B54 E0082514 D7B40040 */  ldc1      $f20, 0x40($sp)
-/* 385B58 E0082518 03E00008 */  jr        $ra
-/* 385B5C E008251C 27BD0050 */   addiu    $sp, $sp, 0x50
+/* 3D0748 E00CA248 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 3D074C E00CA24C AFBF0018 */  sw        $ra, 0x18($sp)
+/* 3D0750 E00CA250 AFB10014 */  sw        $s1, 0x14($sp)
+/* 3D0754 E00CA254 AFB00010 */  sw        $s0, 0x10($sp)
+/* 3D0758 E00CA258 F7B40020 */  sdc1      $f20, 0x20($sp)
+/* 3D075C E00CA25C 8C830000 */  lw        $v1, ($a0)
+/* 3D0760 E00CA260 8C90000C */  lw        $s0, 0xc($a0)
+/* 3D0764 E00CA264 30620010 */  andi      $v0, $v1, 0x10
+/* 3D0768 E00CA268 8E050000 */  lw        $a1, ($s0)
+/* 3D076C E00CA26C 10400005 */  beqz      $v0, .LE00CA284
+/* 3D0770 E00CA270 2402FFEF */   addiu    $v0, $zero, -0x11
+/* 3D0774 E00CA274 00621024 */  and       $v0, $v1, $v0
+/* 3D0778 E00CA278 AC820000 */  sw        $v0, ($a0)
+/* 3D077C E00CA27C 24020010 */  addiu     $v0, $zero, 0x10
+/* 3D0780 E00CA280 AE020010 */  sw        $v0, 0x10($s0)
+.LE00CA284:
+/* 3D0784 E00CA284 8E030010 */  lw        $v1, 0x10($s0)
+/* 3D0788 E00CA288 286203E8 */  slti      $v0, $v1, 0x3e8
+/* 3D078C E00CA28C 10400002 */  beqz      $v0, .LE00CA298
+/* 3D0790 E00CA290 2462FFFF */   addiu    $v0, $v1, -1
+/* 3D0794 E00CA294 AE020010 */  sw        $v0, 0x10($s0)
+.LE00CA298:
+/* 3D0798 E00CA298 8E020014 */  lw        $v0, 0x14($s0)
+/* 3D079C E00CA29C 8E030010 */  lw        $v1, 0x10($s0)
+/* 3D07A0 E00CA2A0 24420001 */  addiu     $v0, $v0, 1
+/* 3D07A4 E00CA2A4 04610005 */  bgez      $v1, .LE00CA2BC
+/* 3D07A8 E00CA2A8 AE020014 */   sw       $v0, 0x14($s0)
+/* 3D07AC E00CA2AC 0C080128 */  jal       shim_remove_effect
+/* 3D07B0 E00CA2B0 00000000 */   nop
+/* 3D07B4 E00CA2B4 0803291B */  j         .LE00CA46C
+/* 3D07B8 E00CA2B8 00000000 */   nop
+.LE00CA2BC:
+/* 3D07BC E00CA2BC 0040882D */  daddu     $s1, $v0, $zero
+/* 3D07C0 E00CA2C0 28620010 */  slti      $v0, $v1, 0x10
+/* 3D07C4 E00CA2C4 10400002 */  beqz      $v0, .LE00CA2D0
+/* 3D07C8 E00CA2C8 00031100 */   sll      $v0, $v1, 4
+/* 3D07CC E00CA2CC AE020024 */  sw        $v0, 0x24($s0)
+.LE00CA2D0:
+/* 3D07D0 E00CA2D0 24020003 */  addiu     $v0, $zero, 3
+/* 3D07D4 E00CA2D4 14A20020 */  bne       $a1, $v0, .LE00CA358
+/* 3D07D8 E00CA2D8 3C028888 */   lui      $v0, %hi(D_8887FFFB)
+/* 3D07DC E00CA2DC 0C080138 */  jal       shim_rand_int
+/* 3D07E0 E00CA2E0 2404000A */   addiu    $a0, $zero, 0xa
+/* 3D07E4 E00CA2E4 2442FFFB */  addiu     $v0, $v0, %lo(D_8887FFFB)
+/* 3D07E8 E00CA2E8 C6000044 */  lwc1      $f0, 0x44($s0)
+/* 3D07EC E00CA2EC 44821000 */  mtc1      $v0, $f2
+/* 3D07F0 E00CA2F0 00000000 */  nop
+/* 3D07F4 E00CA2F4 468010A0 */  cvt.s.w   $f2, $f2
+/* 3D07F8 E00CA2F8 46020000 */  add.s     $f0, $f0, $f2
+/* 3D07FC E00CA2FC 2404000A */  addiu     $a0, $zero, 0xa
+/* 3D0800 E00CA300 0C080138 */  jal       shim_rand_int
+/* 3D0804 E00CA304 E6000044 */   swc1     $f0, 0x44($s0)
+/* 3D0808 E00CA308 2442FFFB */  addiu     $v0, $v0, -5
+/* 3D080C E00CA30C 44820000 */  mtc1      $v0, $f0
+/* 3D0810 E00CA310 00000000 */  nop
+/* 3D0814 E00CA314 46800020 */  cvt.s.w   $f0, $f0
+/* 3D0818 E00CA318 C6020048 */  lwc1      $f2, 0x48($s0)
+/* 3D081C E00CA31C C6060038 */  lwc1      $f6, 0x38($s0)
+/* 3D0820 E00CA320 46001080 */  add.s     $f2, $f2, $f0
+/* 3D0824 E00CA324 C6000044 */  lwc1      $f0, 0x44($s0)
+/* 3D0828 E00CA328 C6040040 */  lwc1      $f4, 0x40($s0)
+/* 3D082C E00CA32C 46003180 */  add.s     $f6, $f6, $f0
+/* 3D0830 E00CA330 C600004C */  lwc1      $f0, 0x4c($s0)
+/* 3D0834 E00CA334 46002100 */  add.s     $f4, $f4, $f0
+/* 3D0838 E00CA338 E6020048 */  swc1      $f2, 0x48($s0)
+/* 3D083C E00CA33C C602003C */  lwc1      $f2, 0x3c($s0)
+/* 3D0840 E00CA340 C6000048 */  lwc1      $f0, 0x48($s0)
+/* 3D0844 E00CA344 46001080 */  add.s     $f2, $f2, $f0
+/* 3D0848 E00CA348 E6060038 */  swc1      $f6, 0x38($s0)
+/* 3D084C E00CA34C E6040040 */  swc1      $f4, 0x40($s0)
+/* 3D0850 E00CA350 E602003C */  swc1      $f2, 0x3c($s0)
+/* 3D0854 E00CA354 3C028888 */  lui       $v0, 0x8888
+.LE00CA358:
+/* 3D0858 E00CA358 8E0402A8 */  lw        $a0, 0x2a8($s0)
+/* 3D085C E00CA35C 34428889 */  ori       $v0, $v0, 0x8889
+/* 3D0860 E00CA360 00820018 */  mult      $a0, $v0
+/* 3D0864 E00CA364 C6080038 */  lwc1      $f8, 0x38($s0)
+/* 3D0868 E00CA368 C606003C */  lwc1      $f6, 0x3c($s0)
+/* 3D086C E00CA36C C60A0040 */  lwc1      $f10, 0x40($s0)
+/* 3D0870 E00CA370 00041FC3 */  sra       $v1, $a0, 0x1f
+/* 3D0874 E00CA374 00003010 */  mfhi      $a2
+/* 3D0878 E00CA378 00C41021 */  addu      $v0, $a2, $a0
+/* 3D087C E00CA37C 00021103 */  sra       $v0, $v0, 4
+/* 3D0880 E00CA380 00431823 */  subu      $v1, $v0, $v1
+/* 3D0884 E00CA384 00031100 */  sll       $v0, $v1, 4
+/* 3D0888 E00CA388 00431023 */  subu      $v0, $v0, $v1
+/* 3D088C E00CA38C 00021040 */  sll       $v0, $v0, 1
+/* 3D0890 E00CA390 00821823 */  subu      $v1, $a0, $v0
+/* 3D0894 E00CA394 00031080 */  sll       $v0, $v1, 2
+/* 3D0898 E00CA398 02021021 */  addu      $v0, $s0, $v0
+/* 3D089C E00CA39C C4420050 */  lwc1      $f2, 0x50($v0)
+/* 3D08A0 E00CA3A0 C44000C8 */  lwc1      $f0, 0xc8($v0)
+/* 3D08A4 E00CA3A4 C44C0140 */  lwc1      $f12, 0x140($v0)
+/* 3D08A8 E00CA3A8 46024032 */  c.eq.s    $f8, $f2
+/* 3D08AC E00CA3AC 00000000 */  nop
+/* 3D08B0 E00CA3B0 45000009 */  bc1f      .LE00CA3D8
+/* 3D08B4 E00CA3B4 00031880 */   sll      $v1, $v1, 2
+/* 3D08B8 E00CA3B8 46003032 */  c.eq.s    $f6, $f0
+/* 3D08BC E00CA3BC 00000000 */  nop
+/* 3D08C0 E00CA3C0 45000005 */  bc1f      .LE00CA3D8
+/* 3D08C4 E00CA3C4 00000000 */   nop
+/* 3D08C8 E00CA3C8 460C5032 */  c.eq.s    $f10, $f12
+/* 3D08CC E00CA3CC 00000000 */  nop
+/* 3D08D0 E00CA3D0 45010026 */  bc1t      .LE00CA46C
+/* 3D08D4 E00CA3D4 00000000 */   nop
+.LE00CA3D8:
+/* 3D08D8 E00CA3D8 02031821 */  addu      $v1, $s0, $v1
+/* 3D08DC E00CA3DC 8E0202A8 */  lw        $v0, 0x2a8($s0)
+/* 3D08E0 E00CA3E0 C47402AC */  lwc1      $f20, 0x2ac($v1)
+/* 3D08E4 E00CA3E4 24420001 */  addiu     $v0, $v0, 1
+/* 3D08E8 E00CA3E8 AE0202A8 */  sw        $v0, 0x2a8($s0)
+/* 3D08EC E00CA3EC 2842001E */  slti      $v0, $v0, 0x1e
+/* 3D08F0 E00CA3F0 50400001 */  beql      $v0, $zero, .LE00CA3F8
+/* 3D08F4 E00CA3F4 AE0002A8 */   sw       $zero, 0x2a8($s0)
+.LE00CA3F8:
+/* 3D08F8 E00CA3F8 46024101 */  sub.s     $f4, $f8, $f2
+/* 3D08FC E00CA3FC 46042102 */  mul.s     $f4, $f4, $f4
+/* 3D0900 E00CA400 00000000 */  nop
+/* 3D0904 E00CA404 46003001 */  sub.s     $f0, $f6, $f0
+/* 3D0908 E00CA408 46000002 */  mul.s     $f0, $f0, $f0
+/* 3D090C E00CA40C 00000000 */  nop
+/* 3D0910 E00CA410 8E0302A8 */  lw        $v1, 0x2a8($s0)
+/* 3D0914 E00CA414 460C5081 */  sub.s     $f2, $f10, $f12
+/* 3D0918 E00CA418 00031080 */  sll       $v0, $v1, 2
+/* 3D091C E00CA41C 46021082 */  mul.s     $f2, $f2, $f2
+/* 3D0920 E00CA420 00000000 */  nop
+/* 3D0924 E00CA424 02028021 */  addu      $s0, $s0, $v0
+/* 3D0928 E00CA428 24020001 */  addiu     $v0, $zero, 1
+/* 3D092C E00CA42C AE020230 */  sw        $v0, 0x230($s0)
+/* 3D0930 E00CA430 E6080050 */  swc1      $f8, 0x50($s0)
+/* 3D0934 E00CA434 46002100 */  add.s     $f4, $f4, $f0
+/* 3D0938 E00CA438 E60600C8 */  swc1      $f6, 0xc8($s0)
+/* 3D093C E00CA43C 44800000 */  mtc1      $zero, $f0
+/* 3D0940 E00CA440 46022300 */  add.s     $f12, $f4, $f2
+/* 3D0944 E00CA444 E60A0140 */  swc1      $f10, 0x140($s0)
+/* 3D0948 E00CA448 46006032 */  c.eq.s    $f12, $f0
+/* 3D094C E00CA44C 00000000 */  nop
+/* 3D0950 E00CA450 45010004 */  bc1t      .LE00CA464
+/* 3D0954 E00CA454 AE1101B8 */   sw       $s1, 0x1b8($s0)
+/* 3D0958 E00CA458 0C080154 */  jal       shim_sqrtf
+/* 3D095C E00CA45C 00000000 */   nop
+/* 3D0960 E00CA460 46000306 */  mov.s     $f12, $f0
+.LE00CA464:
+/* 3D0964 E00CA464 460CA000 */  add.s     $f0, $f20, $f12
+/* 3D0968 E00CA468 E60002AC */  swc1      $f0, 0x2ac($s0)
+.LE00CA46C:
+/* 3D096C E00CA46C 8FBF0018 */  lw        $ra, 0x18($sp)
+/* 3D0970 E00CA470 8FB10014 */  lw        $s1, 0x14($sp)
+/* 3D0974 E00CA474 8FB00010 */  lw        $s0, 0x10($sp)
+/* 3D0978 E00CA478 D7B40020 */  ldc1      $f20, 0x20($sp)
+/* 3D097C E00CA47C 03E00008 */  jr        $ra
+/* 3D0980 E00CA480 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_appendGfx.s
deleted file mode 100644
index 582e81c8c9..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_appendGfx.s
+++ /dev/null
@@ -1,261 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_70_appendGfx
-/* 38E4FC E008C6FC 27BDFF10 */  addiu     $sp, $sp, -0xf0
-/* 38E500 E008C700 AFBE00C8 */  sw        $fp, 0xc8($sp)
-/* 38E504 E008C704 0080F02D */  daddu     $fp, $a0, $zero
-/* 38E508 E008C708 3C06DB06 */  lui       $a2, 0xdb06
-/* 38E50C E008C70C 34C60024 */  ori       $a2, $a2, 0x24
-/* 38E510 E008C710 27A40020 */  addiu     $a0, $sp, 0x20
-/* 38E514 E008C714 AFB000A8 */  sw        $s0, 0xa8($sp)
-/* 38E518 E008C718 3C100001 */  lui       $s0, 1
-/* 38E51C E008C71C 36101630 */  ori       $s0, $s0, 0x1630
-/* 38E520 E008C720 AFB300B4 */  sw        $s3, 0xb4($sp)
-/* 38E524 E008C724 3C13800A */  lui       $s3, %hi(gMasterGfxPos)
-/* 38E528 E008C728 2673A66C */  addiu     $s3, $s3, %lo(gMasterGfxPos)
-/* 38E52C E008C72C AFBF00CC */  sw        $ra, 0xcc($sp)
-/* 38E530 E008C730 AFB700C4 */  sw        $s7, 0xc4($sp)
-/* 38E534 E008C734 AFB600C0 */  sw        $s6, 0xc0($sp)
-/* 38E538 E008C738 AFB500BC */  sw        $s5, 0xbc($sp)
-/* 38E53C E008C73C AFB400B8 */  sw        $s4, 0xb8($sp)
-/* 38E540 E008C740 AFB200B0 */  sw        $s2, 0xb0($sp)
-/* 38E544 E008C744 AFB100AC */  sw        $s1, 0xac($sp)
-/* 38E548 E008C748 F7BA00E8 */  sdc1      $f26, 0xe8($sp)
-/* 38E54C E008C74C F7B800E0 */  sdc1      $f24, 0xe0($sp)
-/* 38E550 E008C750 F7B600D8 */  sdc1      $f22, 0xd8($sp)
-/* 38E554 E008C754 F7B400D0 */  sdc1      $f20, 0xd0($sp)
-/* 38E558 E008C758 8E630000 */  lw        $v1, ($s3)
-/* 38E55C E008C75C 8FD1000C */  lw        $s1, 0xc($fp)
-/* 38E560 E008C760 0060282D */  daddu     $a1, $v1, $zero
-/* 38E564 E008C764 24630008 */  addiu     $v1, $v1, 8
-/* 38E568 E008C768 AE630000 */  sw        $v1, ($s3)
-/* 38E56C E008C76C 8E28001C */  lw        $t0, 0x1c($s1)
-/* 38E570 E008C770 AFA800A4 */  sw        $t0, 0xa4($sp)
-/* 38E574 E008C774 C6380014 */  lwc1      $f24, 0x14($s1)
-/* 38E578 E008C778 C6360018 */  lwc1      $f22, 0x18($s1)
-/* 38E57C E008C77C 8E280000 */  lw        $t0, ($s1)
-/* 38E580 E008C780 3C02E700 */  lui       $v0, 0xe700
-/* 38E584 E008C784 AFA800A0 */  sw        $t0, 0xa0($sp)
-/* 38E588 E008C788 ACA20000 */  sw        $v0, ($a1)
-/* 38E58C E008C78C 24620008 */  addiu     $v0, $v1, 8
-/* 38E590 E008C790 ACA00004 */  sw        $zero, 4($a1)
-/* 38E594 E008C794 AE620000 */  sw        $v0, ($s3)
-/* 38E598 E008C798 AC660000 */  sw        $a2, ($v1)
-/* 38E59C E008C79C 8FC50010 */  lw        $a1, 0x10($fp)
-/* 38E5A0 E008C7A0 24620010 */  addiu     $v0, $v1, 0x10
-/* 38E5A4 E008C7A4 AE620000 */  sw        $v0, ($s3)
-/* 38E5A8 E008C7A8 8CA5001C */  lw        $a1, 0x1c($a1)
-/* 38E5AC E008C7AC 3C02DE00 */  lui       $v0, 0xde00
-/* 38E5B0 E008C7B0 AC620008 */  sw        $v0, 8($v1)
-/* 38E5B4 E008C7B4 3C020900 */  lui       $v0, 0x900
-/* 38E5B8 E008C7B8 24420420 */  addiu     $v0, $v0, 0x420
-/* 38E5BC E008C7BC AC62000C */  sw        $v0, 0xc($v1)
-/* 38E5C0 E008C7C0 3C028000 */  lui       $v0, 0x8000
-/* 38E5C4 E008C7C4 00A22821 */  addu      $a1, $a1, $v0
-/* 38E5C8 E008C7C8 AC650004 */  sw        $a1, 4($v1)
-/* 38E5CC E008C7CC 8E250008 */  lw        $a1, 8($s1)
-/* 38E5D0 E008C7D0 8E26000C */  lw        $a2, 0xc($s1)
-/* 38E5D4 E008C7D4 8E270010 */  lw        $a3, 0x10($s1)
-/* 38E5D8 E008C7D8 4480A000 */  mtc1      $zero, $f20
-/* 38E5DC E008C7DC 0C080108 */  jal       shim_guTranslateF
-/* 38E5E0 E008C7E0 24160001 */   addiu    $s6, $zero, 1
-/* 38E5E4 E008C7E4 27B20060 */  addiu     $s2, $sp, 0x60
-/* 38E5E8 E008C7E8 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 38E5EC E008C7EC 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 38E5F0 E008C7F0 4406A000 */  mfc1      $a2, $f20
-/* 38E5F4 E008C7F4 00031080 */  sll       $v0, $v1, 2
-/* 38E5F8 E008C7F8 00431021 */  addu      $v0, $v0, $v1
-/* 38E5FC E008C7FC 00021080 */  sll       $v0, $v0, 2
-/* 38E600 E008C800 00431023 */  subu      $v0, $v0, $v1
-/* 38E604 E008C804 000218C0 */  sll       $v1, $v0, 3
-/* 38E608 E008C808 00431021 */  addu      $v0, $v0, $v1
-/* 38E60C E008C80C 000210C0 */  sll       $v0, $v0, 3
-/* 38E610 E008C810 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 38E614 E008C814 00220821 */  addu      $at, $at, $v0
-/* 38E618 E008C818 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
-/* 38E61C E008C81C 3C073F80 */  lui       $a3, 0x3f80
-/* 38E620 E008C820 46000007 */  neg.s     $f0, $f0
-/* 38E624 E008C824 44050000 */  mfc1      $a1, $f0
-/* 38E628 E008C828 0240202D */  daddu     $a0, $s2, $zero
-/* 38E62C E008C82C 0C080104 */  jal       shim_guRotateF
-/* 38E630 E008C830 E7B40010 */   swc1     $f20, 0x10($sp)
-/* 38E634 E008C834 0240202D */  daddu     $a0, $s2, $zero
-/* 38E638 E008C838 27A50020 */  addiu     $a1, $sp, 0x20
-/* 38E63C E008C83C 0C080114 */  jal       shim_guMtxCatF
-/* 38E640 E008C840 00A0302D */   daddu    $a2, $a1, $zero
-/* 38E644 E008C844 27A40020 */  addiu     $a0, $sp, 0x20
-/* 38E648 E008C848 3C148007 */  lui       $s4, %hi(gMatrixListPos)
-/* 38E64C E008C84C 269441F0 */  addiu     $s4, $s4, %lo(gMatrixListPos)
-/* 38E650 E008C850 3C15800A */  lui       $s5, %hi(gDisplayContext)
-/* 38E654 E008C854 26B5A674 */  addiu     $s5, $s5, %lo(gDisplayContext)
-/* 38E658 E008C858 96850000 */  lhu       $a1, ($s4)
-/* 38E65C E008C85C 8EA20000 */  lw        $v0, ($s5)
-/* 38E660 E008C860 00052980 */  sll       $a1, $a1, 6
-/* 38E664 E008C864 00B02821 */  addu      $a1, $a1, $s0
-/* 38E668 E008C868 0C080118 */  jal       shim_guMtxF2L
-/* 38E66C E008C86C 00452821 */   addu     $a1, $v0, $a1
-/* 38E670 E008C870 8E620000 */  lw        $v0, ($s3)
-/* 38E674 E008C874 26310048 */  addiu     $s1, $s1, 0x48
-/* 38E678 E008C878 0040282D */  daddu     $a1, $v0, $zero
-/* 38E67C E008C87C 24420008 */  addiu     $v0, $v0, 8
-/* 38E680 E008C880 AE620000 */  sw        $v0, ($s3)
-/* 38E684 E008C884 96840000 */  lhu       $a0, ($s4)
-/* 38E688 E008C888 3C02DA38 */  lui       $v0, 0xda38
-/* 38E68C E008C88C ACA20000 */  sw        $v0, ($a1)
-/* 38E690 E008C890 8EA30000 */  lw        $v1, ($s5)
-/* 38E694 E008C894 3082FFFF */  andi      $v0, $a0, 0xffff
-/* 38E698 E008C898 00021180 */  sll       $v0, $v0, 6
-/* 38E69C E008C89C 00501021 */  addu      $v0, $v0, $s0
-/* 38E6A0 E008C8A0 00621821 */  addu      $v1, $v1, $v0
-/* 38E6A4 E008C8A4 ACA30004 */  sw        $v1, 4($a1)
-/* 38E6A8 E008C8A8 8FC20008 */  lw        $v0, 8($fp)
-/* 38E6AC E008C8AC 00962021 */  addu      $a0, $a0, $s6
-/* 38E6B0 E008C8B0 02C2102A */  slt       $v0, $s6, $v0
-/* 38E6B4 E008C8B4 10400073 */  beqz      $v0, .LE008CA84
-/* 38E6B8 E008C8B8 A6840000 */   sh       $a0, ($s4)
-/* 38E6BC E008C8BC 3C014040 */  lui       $at, 0x4040
-/* 38E6C0 E008C8C0 4481D000 */  mtc1      $at, $f26
-/* 38E6C4 E008C8C4 02A0B82D */  daddu     $s7, $s5, $zero
-/* 38E6C8 E008C8C8 0280A82D */  daddu     $s5, $s4, $zero
-/* 38E6CC E008C8CC 3C140001 */  lui       $s4, 1
-/* 38E6D0 E008C8D0 36941630 */  ori       $s4, $s4, 0x1630
-/* 38E6D4 E008C8D4 26300046 */  addiu     $s0, $s1, 0x46
-.LE008C8D8:
-/* 38E6D8 E008C8D8 C600FFCE */  lwc1      $f0, -0x32($s0)
-/* 38E6DC E008C8DC 4600C002 */  mul.s     $f0, $f24, $f0
-/* 38E6E0 E008C8E0 00000000 */  nop
-/* 38E6E4 E008C8E4 4406A000 */  mfc1      $a2, $f20
-/* 38E6E8 E008C8E8 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 38E6EC E008C8EC C600FFC2 */  lwc1      $f0, -0x3e($s0)
-/* 38E6F0 E008C8F0 E7A00014 */  swc1      $f0, 0x14($sp)
-/* 38E6F4 E008C8F4 C600FFC6 */  lwc1      $f0, -0x3a($s0)
-/* 38E6F8 E008C8F8 E7A00018 */  swc1      $f0, 0x18($sp)
-/* 38E6FC E008C8FC C600FFCA */  lwc1      $f0, -0x36($s0)
-/* 38E700 E008C900 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* 38E704 E008C904 8E05FFE6 */  lw        $a1, -0x1a($s0)
-/* 38E708 E008C908 8E07FFEE */  lw        $a3, -0x12($s0)
-/* 38E70C E008C90C 0C080180 */  jal       shim_guPositionF
-/* 38E710 E008C910 27A40020 */   addiu    $a0, $sp, 0x20
-/* 38E714 E008C914 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 38E718 E008C918 8E05FFEA */  lw        $a1, -0x16($s0)
-/* 38E71C E008C91C 4406A000 */  mfc1      $a2, $f20
-/* 38E720 E008C920 3C073F80 */  lui       $a3, 0x3f80
-/* 38E724 E008C924 0C080104 */  jal       shim_guRotateF
-/* 38E728 E008C928 0240202D */   daddu    $a0, $s2, $zero
-/* 38E72C E008C92C 0240202D */  daddu     $a0, $s2, $zero
-/* 38E730 E008C930 27A50020 */  addiu     $a1, $sp, 0x20
-/* 38E734 E008C934 0C080114 */  jal       shim_guMtxCatF
-/* 38E738 E008C938 00A0302D */   daddu    $a2, $a1, $zero
-/* 38E73C E008C93C 8FA800A0 */  lw        $t0, 0xa0($sp)
-/* 38E740 E008C940 29020008 */  slti      $v0, $t0, 8
-/* 38E744 E008C944 1040000B */  beqz      $v0, .LE008C974
-/* 38E748 E008C948 00000000 */   nop
-/* 38E74C E008C94C 4616C001 */  sub.s     $f0, $f24, $f22
-/* 38E750 E008C950 461A0002 */  mul.s     $f0, $f0, $f26
-/* 38E754 E008C954 00000000 */  nop
-/* 38E758 E008C958 46160003 */  div.s     $f0, $f0, $f22
-/* 38E75C E008C95C 4600D001 */  sub.s     $f0, $f26, $f0
-/* 38E760 E008C960 4406A000 */  mfc1      $a2, $f20
-/* 38E764 E008C964 4407A000 */  mfc1      $a3, $f20
-/* 38E768 E008C968 44050000 */  mfc1      $a1, $f0
-/* 38E76C E008C96C 08023260 */  j         .LE008C980
-/* 38E770 E008C970 00000000 */   nop
-.LE008C974:
-/* 38E774 E008C974 3C054000 */  lui       $a1, 0x4000
-/* 38E778 E008C978 4406A000 */  mfc1      $a2, $f20
-/* 38E77C E008C97C 4407A000 */  mfc1      $a3, $f20
-.LE008C980:
-/* 38E780 E008C980 0C080108 */  jal       shim_guTranslateF
-/* 38E784 E008C984 0240202D */   daddu    $a0, $s2, $zero
-/* 38E788 E008C988 0240202D */  daddu     $a0, $s2, $zero
-/* 38E78C E008C98C 27A50020 */  addiu     $a1, $sp, 0x20
-/* 38E790 E008C990 0C080114 */  jal       shim_guMtxCatF
-/* 38E794 E008C994 00A0302D */   daddu    $a2, $a1, $zero
-/* 38E798 E008C998 27A40020 */  addiu     $a0, $sp, 0x20
-/* 38E79C E008C99C 26D60001 */  addiu     $s6, $s6, 1
-/* 38E7A0 E008C9A0 8E630000 */  lw        $v1, ($s3)
-/* 38E7A4 E008C9A4 96A50000 */  lhu       $a1, ($s5)
-/* 38E7A8 E008C9A8 8EE20000 */  lw        $v0, ($s7)
-/* 38E7AC E008C9AC 0060382D */  daddu     $a3, $v1, $zero
-/* 38E7B0 E008C9B0 24630008 */  addiu     $v1, $v1, 8
-/* 38E7B4 E008C9B4 00052980 */  sll       $a1, $a1, 6
-/* 38E7B8 E008C9B8 00B42821 */  addu      $a1, $a1, $s4
-/* 38E7BC E008C9BC 00452821 */  addu      $a1, $v0, $a1
-/* 38E7C0 E008C9C0 3C02FA00 */  lui       $v0, 0xfa00
-/* 38E7C4 E008C9C4 AE630000 */  sw        $v1, ($s3)
-/* 38E7C8 E008C9C8 ACE20000 */  sw        $v0, ($a3)
-/* 38E7CC E008C9CC 9203FFFE */  lbu       $v1, -2($s0)
-/* 38E7D0 E008C9D0 9202FFFF */  lbu       $v0, -1($s0)
-/* 38E7D4 E008C9D4 92060000 */  lbu       $a2, ($s0)
-/* 38E7D8 E008C9D8 26100048 */  addiu     $s0, $s0, 0x48
-/* 38E7DC E008C9DC 8FA800A4 */  lw        $t0, 0xa4($sp)
-/* 38E7E0 E008C9E0 00031E00 */  sll       $v1, $v1, 0x18
-/* 38E7E4 E008C9E4 00021400 */  sll       $v0, $v0, 0x10
-/* 38E7E8 E008C9E8 00621825 */  or        $v1, $v1, $v0
-/* 38E7EC E008C9EC 00063200 */  sll       $a2, $a2, 8
-/* 38E7F0 E008C9F0 00661825 */  or        $v1, $v1, $a2
-/* 38E7F4 E008C9F4 310200FF */  andi      $v0, $t0, 0xff
-/* 38E7F8 E008C9F8 00621825 */  or        $v1, $v1, $v0
-/* 38E7FC E008C9FC 0C080118 */  jal       shim_guMtxF2L
-/* 38E800 E008CA00 ACE30004 */   sw       $v1, 4($a3)
-/* 38E804 E008CA04 3C06D838 */  lui       $a2, 0xd838
-/* 38E808 E008CA08 8E640000 */  lw        $a0, ($s3)
-/* 38E80C E008CA0C 34C60002 */  ori       $a2, $a2, 2
-/* 38E810 E008CA10 0080282D */  daddu     $a1, $a0, $zero
-/* 38E814 E008CA14 24840008 */  addiu     $a0, $a0, 8
-/* 38E818 E008CA18 AE640000 */  sw        $a0, ($s3)
-/* 38E81C E008CA1C 96A20000 */  lhu       $v0, ($s5)
-/* 38E820 E008CA20 3C03DA38 */  lui       $v1, 0xda38
-/* 38E824 E008CA24 ACA30000 */  sw        $v1, ($a1)
-/* 38E828 E008CA28 24430001 */  addiu     $v1, $v0, 1
-/* 38E82C E008CA2C 3042FFFF */  andi      $v0, $v0, 0xffff
-/* 38E830 E008CA30 00021180 */  sll       $v0, $v0, 6
-/* 38E834 E008CA34 A6A30000 */  sh        $v1, ($s5)
-/* 38E838 E008CA38 8EE30000 */  lw        $v1, ($s7)
-/* 38E83C E008CA3C 00541021 */  addu      $v0, $v0, $s4
-/* 38E840 E008CA40 00621821 */  addu      $v1, $v1, $v0
-/* 38E844 E008CA44 24820008 */  addiu     $v0, $a0, 8
-/* 38E848 E008CA48 ACA30004 */  sw        $v1, 4($a1)
-/* 38E84C E008CA4C AE620000 */  sw        $v0, ($s3)
-/* 38E850 E008CA50 3C02DE00 */  lui       $v0, 0xde00
-/* 38E854 E008CA54 AC820000 */  sw        $v0, ($a0)
-/* 38E858 E008CA58 3C020900 */  lui       $v0, 0x900
-/* 38E85C E008CA5C 244203A0 */  addiu     $v0, $v0, 0x3a0
-/* 38E860 E008CA60 AC820004 */  sw        $v0, 4($a0)
-/* 38E864 E008CA64 24020040 */  addiu     $v0, $zero, 0x40
-/* 38E868 E008CA68 AC860008 */  sw        $a2, 8($a0)
-/* 38E86C E008CA6C AC82000C */  sw        $v0, 0xc($a0)
-/* 38E870 E008CA70 8FC20008 */  lw        $v0, 8($fp)
-/* 38E874 E008CA74 24840010 */  addiu     $a0, $a0, 0x10
-/* 38E878 E008CA78 02C2102A */  slt       $v0, $s6, $v0
-/* 38E87C E008CA7C 1440FF96 */  bnez      $v0, .LE008C8D8
-/* 38E880 E008CA80 AE640000 */   sw       $a0, ($s3)
-.LE008CA84:
-/* 38E884 E008CA84 3C05D838 */  lui       $a1, 0xd838
-/* 38E888 E008CA88 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
-/* 38E88C E008CA8C 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
-/* 38E890 E008CA90 8C620000 */  lw        $v0, ($v1)
-/* 38E894 E008CA94 34A50002 */  ori       $a1, $a1, 2
-/* 38E898 E008CA98 0040202D */  daddu     $a0, $v0, $zero
-/* 38E89C E008CA9C 24420008 */  addiu     $v0, $v0, 8
-/* 38E8A0 E008CAA0 AC620000 */  sw        $v0, ($v1)
-/* 38E8A4 E008CAA4 24020040 */  addiu     $v0, $zero, 0x40
-/* 38E8A8 E008CAA8 AC850000 */  sw        $a1, ($a0)
-/* 38E8AC E008CAAC AC820004 */  sw        $v0, 4($a0)
-/* 38E8B0 E008CAB0 8FBF00CC */  lw        $ra, 0xcc($sp)
-/* 38E8B4 E008CAB4 8FBE00C8 */  lw        $fp, 0xc8($sp)
-/* 38E8B8 E008CAB8 8FB700C4 */  lw        $s7, 0xc4($sp)
-/* 38E8BC E008CABC 8FB600C0 */  lw        $s6, 0xc0($sp)
-/* 38E8C0 E008CAC0 8FB500BC */  lw        $s5, 0xbc($sp)
-/* 38E8C4 E008CAC4 8FB400B8 */  lw        $s4, 0xb8($sp)
-/* 38E8C8 E008CAC8 8FB300B4 */  lw        $s3, 0xb4($sp)
-/* 38E8CC E008CACC 8FB200B0 */  lw        $s2, 0xb0($sp)
-/* 38E8D0 E008CAD0 8FB100AC */  lw        $s1, 0xac($sp)
-/* 38E8D4 E008CAD4 8FB000A8 */  lw        $s0, 0xa8($sp)
-/* 38E8D8 E008CAD8 D7BA00E8 */  ldc1      $f26, 0xe8($sp)
-/* 38E8DC E008CADC D7B800E0 */  ldc1      $f24, 0xe0($sp)
-/* 38E8E0 E008CAE0 D7B600D8 */  ldc1      $f22, 0xd8($sp)
-/* 38E8E4 E008CAE4 D7B400D0 */  ldc1      $f20, 0xd0($sp)
-/* 38E8E8 E008CAE8 03E00008 */  jr        $ra
-/* 38E8EC E008CAEC 27BD00F0 */   addiu    $sp, $sp, 0xf0
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s
deleted file mode 100644
index f299f63b6b..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_main.s
+++ /dev/null
@@ -1,266 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_70_main
-/* 38DE00 E008C000 27BDFF90 */  addiu     $sp, $sp, -0x70
-/* 38DE04 E008C004 AFB00038 */  sw        $s0, 0x38($sp)
-/* 38DE08 E008C008 00E0802D */  daddu     $s0, $a3, $zero
-/* 38DE0C E008C00C AFA40070 */  sw        $a0, 0x70($sp)
-/* 38DE10 E008C010 27A40010 */  addiu     $a0, $sp, 0x10
-/* 38DE14 E008C014 F7B40060 */  sdc1      $f20, 0x60($sp)
-/* 38DE18 E008C018 4486A000 */  mtc1      $a2, $f20
-/* 38DE1C E008C01C 3C02E009 */  lui       $v0, %hi(fx_70_init)
-/* 38DE20 E008C020 2442C3F4 */  addiu     $v0, $v0, %lo(fx_70_init)
-/* 38DE24 E008C024 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38DE28 E008C028 3C02E009 */  lui       $v0, %hi(fx_70_update)
-/* 38DE2C E008C02C 2442C3FC */  addiu     $v0, $v0, %lo(fx_70_update)
-/* 38DE30 E008C030 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38DE34 E008C034 3C02E009 */  lui       $v0, %hi(fx_70_render)
-/* 38DE38 E008C038 2442C6B8 */  addiu     $v0, $v0, %lo(fx_70_render)
-/* 38DE3C E008C03C AFA20020 */  sw        $v0, 0x20($sp)
-/* 38DE40 E008C040 24020046 */  addiu     $v0, $zero, 0x46
-/* 38DE44 E008C044 AFBF005C */  sw        $ra, 0x5c($sp)
-/* 38DE48 E008C048 AFBE0058 */  sw        $fp, 0x58($sp)
-/* 38DE4C E008C04C AFB70054 */  sw        $s7, 0x54($sp)
-/* 38DE50 E008C050 AFB60050 */  sw        $s6, 0x50($sp)
-/* 38DE54 E008C054 AFB5004C */  sw        $s5, 0x4c($sp)
-/* 38DE58 E008C058 AFB40048 */  sw        $s4, 0x48($sp)
-/* 38DE5C E008C05C AFB30044 */  sw        $s3, 0x44($sp)
-/* 38DE60 E008C060 AFB20040 */  sw        $s2, 0x40($sp)
-/* 38DE64 E008C064 AFB1003C */  sw        $s1, 0x3c($sp)
-/* 38DE68 E008C068 F7B60068 */  sdc1      $f22, 0x68($sp)
-/* 38DE6C E008C06C AFA50074 */  sw        $a1, 0x74($sp)
-/* 38DE70 E008C070 AFA00010 */  sw        $zero, 0x10($sp)
-/* 38DE74 E008C074 AFA00024 */  sw        $zero, 0x24($sp)
-/* 38DE78 E008C078 0C080124 */  jal       shim_create_effect_instance
-/* 38DE7C E008C07C AFA20014 */   sw       $v0, 0x14($sp)
-/* 38DE80 E008C080 24040168 */  addiu     $a0, $zero, 0x168
-/* 38DE84 E008C084 AFA20028 */  sw        $v0, 0x28($sp)
-/* 38DE88 E008C088 24080005 */  addiu     $t0, $zero, 5
-/* 38DE8C E008C08C 0C08012C */  jal       shim_general_heap_malloc
-/* 38DE90 E008C090 AC480008 */   sw       $t0, 8($v0)
-/* 38DE94 E008C094 8FA90028 */  lw        $t1, 0x28($sp)
-/* 38DE98 E008C098 0040202D */  daddu     $a0, $v0, $zero
-/* 38DE9C E008C09C 14800003 */  bnez      $a0, .LE008C0AC
-/* 38DEA0 E008C0A0 AD24000C */   sw       $a0, 0xc($t1)
-.LE008C0A4:
-/* 38DEA4 E008C0A4 08023029 */  j         .LE008C0A4
-/* 38DEA8 E008C0A8 00000000 */   nop
-.LE008C0AC:
-/* 38DEAC E008C0AC 4600A0A1 */  cvt.d.s   $f2, $f20
-/* 38DEB0 E008C0B0 24110001 */  addiu     $s1, $zero, 1
-/* 38DEB4 E008C0B4 3C01E009 */  lui       $at, %hi(D_E008CB20)
-/* 38DEB8 E008C0B8 D420CB20 */  ldc1      $f0, %lo(D_E008CB20)($at)
-/* 38DEBC E008C0BC 8FA80070 */  lw        $t0, 0x70($sp)
-/* 38DEC0 E008C0C0 46201082 */  mul.d     $f2, $f2, $f0
-/* 38DEC4 E008C0C4 00000000 */  nop
-/* 38DEC8 E008C0C8 AC880000 */  sw        $t0, ($a0)
-/* 38DECC E008C0CC 8FA90074 */  lw        $t1, 0x74($sp)
-/* 38DED0 E008C0D0 2A220005 */  slti      $v0, $s1, 5
-/* 38DED4 E008C0D4 AC900020 */  sw        $s0, 0x20($a0)
-/* 38DED8 E008C0D8 AC900024 */  sw        $s0, 0x24($a0)
-/* 38DEDC E008C0DC AC80001C */  sw        $zero, 0x1c($a0)
-/* 38DEE0 E008C0E0 AC800028 */  sw        $zero, 0x28($a0)
-/* 38DEE4 E008C0E4 AC890004 */  sw        $t1, 4($a0)
-/* 38DEE8 E008C0E8 462010A0 */  cvt.s.d   $f2, $f2
-/* 38DEEC E008C0EC E4820014 */  swc1      $f2, 0x14($a0)
-/* 38DEF0 E008C0F0 E4820018 */  swc1      $f2, 0x18($a0)
-/* 38DEF4 E008C0F4 104000B0 */  beqz      $v0, .LE008C3B8
-/* 38DEF8 E008C0F8 24840048 */   addiu    $a0, $a0, 0x48
-/* 38DEFC E008C0FC 3C03E009 */  lui       $v1, %hi(D_E008CB28)
-/* 38DF00 E008C100 2463CB28 */  addiu     $v1, $v1, %lo(D_E008CB28)
-/* 38DF04 E008C104 00081080 */  sll       $v0, $t0, 2
-/* 38DF08 E008C108 00431021 */  addu      $v0, $v0, $v1
-/* 38DF0C E008C10C 24080005 */  addiu     $t0, $zero, 5
-/* 38DF10 E008C110 2517FFFF */  addiu     $s7, $t0, -1
-/* 38DF14 E008C114 3C03E009 */  lui       $v1, %hi(D_E008CB48)
-/* 38DF18 E008C118 2463CB48 */  addiu     $v1, $v1, %lo(D_E008CB48)
-/* 38DF1C E008C11C 24900046 */  addiu     $s0, $a0, 0x46
-/* 38DF20 E008C120 24160026 */  addiu     $s6, $zero, 0x26
-/* 38DF24 E008C124 0000A02D */  daddu     $s4, $zero, $zero
-/* 38DF28 E008C128 24150019 */  addiu     $s5, $zero, 0x19
-/* 38DF2C E008C12C 24130078 */  addiu     $s3, $zero, 0x78
-/* 38DF30 E008C130 8FA90070 */  lw        $t1, 0x70($sp)
-/* 38DF34 E008C134 3C013F80 */  lui       $at, 0x3f80
-/* 38DF38 E008C138 4481B000 */  mtc1      $at, $f22
-/* 38DF3C E008C13C 3C013FE0 */  lui       $at, 0x3fe0
-/* 38DF40 E008C140 4481A800 */  mtc1      $at, $f21
-/* 38DF44 E008C144 4480A000 */  mtc1      $zero, $f20
-/* 38DF48 E008C148 2412000B */  addiu     $s2, $zero, 0xb
-/* 38DF4C E008C14C AFA2002C */  sw        $v0, 0x2c($sp)
-/* 38DF50 E008C150 253EFFFE */  addiu     $fp, $t1, -2
-/* 38DF54 E008C154 001E1080 */  sll       $v0, $fp, 2
-/* 38DF58 E008C158 00431021 */  addu      $v0, $v0, $v1
-/* 38DF5C E008C15C AFA20030 */  sw        $v0, 0x30($sp)
-.LE008C160:
-/* 38DF60 E008C160 8FA80070 */  lw        $t0, 0x70($sp)
-/* 38DF64 E008C164 2D020008 */  sltiu     $v0, $t0, 8
-/* 38DF68 E008C168 50400030 */  beql      $v0, $zero, .LE008C22C
-/* 38DF6C E008C16C AE00FFC2 */   sw       $zero, -0x3e($s0)
-/* 38DF70 E008C170 8FA9002C */  lw        $t1, 0x2c($sp)
-/* 38DF74 E008C174 8D220000 */  lw        $v0, ($t1)
-/* 38DF78 E008C178 00400008 */  jr        $v0
-/* 38DF7C E008C17C 00000000 */   nop
-/* 38DF80 E008C180 3C014270 */  lui       $at, 0x4270
-/* 38DF84 E008C184 44811000 */  mtc1      $at, $f2
-/* 38DF88 E008C188 44920000 */  mtc1      $s2, $f0
-/* 38DF8C E008C18C 00000000 */  nop
-/* 38DF90 E008C190 46800020 */  cvt.s.w   $f0, $f0
-/* 38DF94 E008C194 E600FFC6 */  swc1      $f0, -0x3a($s0)
-/* 38DF98 E008C198 44930000 */  mtc1      $s3, $f0
-/* 38DF9C E008C19C 00000000 */  nop
-/* 38DFA0 E008C1A0 46800020 */  cvt.s.w   $f0, $f0
-/* 38DFA4 E008C1A4 AE00FFC2 */  sw        $zero, -0x3e($s0)
-/* 38DFA8 E008C1A8 AE00FFCA */  sw        $zero, -0x36($s0)
-/* 38DFAC E008C1AC AE00FFF2 */  sw        $zero, -0xe($s0)
-/* 38DFB0 E008C1B0 AE00FFFA */  sw        $zero, -6($s0)
-/* 38DFB4 E008C1B4 AE00FFE6 */  sw        $zero, -0x1a($s0)
-/* 38DFB8 E008C1B8 E600FFEA */  swc1      $f0, -0x16($s0)
-/* 38DFBC E008C1BC AE00FFEE */  sw        $zero, -0x12($s0)
-/* 38DFC0 E008C1C0 E616FFCE */  swc1      $f22, -0x32($s0)
-/* 38DFC4 E008C1C4 080230CC */  j         .LE008C330
-/* 38DFC8 E008C1C8 E602FFF6 */   swc1     $f2, -0xa($s0)
-/* 38DFCC E008C1CC 44920000 */  mtc1      $s2, $f0
-/* 38DFD0 E008C1D0 00000000 */  nop
-/* 38DFD4 E008C1D4 46800020 */  cvt.s.w   $f0, $f0
-/* 38DFD8 E008C1D8 E600FFC6 */  swc1      $f0, -0x3a($s0)
-/* 38DFDC E008C1DC 44930000 */  mtc1      $s3, $f0
-/* 38DFE0 E008C1E0 00000000 */  nop
-/* 38DFE4 E008C1E4 46800020 */  cvt.s.w   $f0, $f0
-/* 38DFE8 E008C1E8 240800FF */  addiu     $t0, $zero, 0xff
-/* 38DFEC E008C1EC 3C01C270 */  lui       $at, 0xc270
-/* 38DFF0 E008C1F0 44811000 */  mtc1      $at, $f2
-/* 38DFF4 E008C1F4 0100482D */  daddu     $t1, $t0, $zero
-/* 38DFF8 E008C1F8 AE00FFC2 */  sw        $zero, -0x3e($s0)
-/* 38DFFC E008C1FC AE00FFCA */  sw        $zero, -0x36($s0)
-/* 38E000 E008C200 AE00FFF2 */  sw        $zero, -0xe($s0)
-/* 38E004 E008C204 AE00FFFA */  sw        $zero, -6($s0)
-/* 38E008 E008C208 AE00FFE6 */  sw        $zero, -0x1a($s0)
-/* 38E00C E008C20C E600FFEA */  swc1      $f0, -0x16($s0)
-/* 38E010 E008C210 AE00FFEE */  sw        $zero, -0x12($s0)
-/* 38E014 E008C214 E616FFCE */  swc1      $f22, -0x32($s0)
-/* 38E018 E008C218 A2080000 */  sb        $t0, ($s0)
-/* 38E01C E008C21C A209FFFF */  sb        $t1, -1($s0)
-/* 38E020 E008C220 A208FFFE */  sb        $t0, -2($s0)
-/* 38E024 E008C224 080230CC */  j         .LE008C330
-/* 38E028 E008C228 E602FFF6 */   swc1     $f2, -0xa($s0)
-.LE008C22C:
-/* 38E02C E008C22C 8FA90074 */  lw        $t1, 0x74($sp)
-/* 38E030 E008C230 852200B0 */  lh        $v0, 0xb0($t1)
-/* 38E034 E008C234 44820000 */  mtc1      $v0, $f0
-/* 38E038 E008C238 00000000 */  nop
-/* 38E03C E008C23C 46800021 */  cvt.d.w   $f0, $f0
-/* 38E040 E008C240 46340002 */  mul.d     $f0, $f0, $f20
-/* 38E044 E008C244 00000000 */  nop
-/* 38E048 E008C248 24040001 */  addiu     $a0, $zero, 1
-/* 38E04C E008C24C AE00FFCA */  sw        $zero, -0x36($s0)
-/* 38E050 E008C250 46200020 */  cvt.s.d   $f0, $f0
-/* 38E054 E008C254 0C080000 */  jal       func_E0200000
-/* 38E058 E008C258 E600FFC6 */   swc1     $f0, -0x3a($s0)
-/* 38E05C E008C25C 24040001 */  addiu     $a0, $zero, 1
-/* 38E060 E008C260 000210C0 */  sll       $v0, $v0, 3
-/* 38E064 E008C264 2442FFFC */  addiu     $v0, $v0, -4
-/* 38E068 E008C268 44820000 */  mtc1      $v0, $f0
-/* 38E06C E008C26C 00000000 */  nop
-/* 38E070 E008C270 46800020 */  cvt.s.w   $f0, $f0
-/* 38E074 E008C274 E600FFF2 */  swc1      $f0, -0xe($s0)
-/* 38E078 E008C278 0C080000 */  jal       func_E0200000
-/* 38E07C E008C27C AE00FFF6 */   sw       $zero, -0xa($s0)
-/* 38E080 E008C280 16E00002 */  bnez      $s7, .LE008C28C
-/* 38E084 E008C284 0297001A */   div      $zero, $s4, $s7
-/* 38E088 E008C288 0007000D */  break     7
-.LE008C28C:
-/* 38E08C E008C28C 2401FFFF */   addiu    $at, $zero, -1
-/* 38E090 E008C290 16E10004 */  bne       $s7, $at, .LE008C2A4
-/* 38E094 E008C294 3C018000 */   lui      $at, 0x8000
-/* 38E098 E008C298 16810002 */  bne       $s4, $at, .LE008C2A4
-/* 38E09C E008C29C 00000000 */   nop
-/* 38E0A0 E008C2A0 0006000D */  break     6
-.LE008C2A4:
-/* 38E0A4 E008C2A4 00002012 */   mflo     $a0
-/* 38E0A8 E008C2A8 000210C0 */  sll       $v0, $v0, 3
-/* 38E0AC E008C2AC 2623FFFF */  addiu     $v1, $s1, -1
-/* 38E0B0 E008C2B0 44830000 */  mtc1      $v1, $f0
-/* 38E0B4 E008C2B4 00000000 */  nop
-/* 38E0B8 E008C2B8 46800020 */  cvt.s.w   $f0, $f0
-/* 38E0BC E008C2BC 44971000 */  mtc1      $s7, $f2
-/* 38E0C0 E008C2C0 00000000 */  nop
-/* 38E0C4 E008C2C4 468010A0 */  cvt.s.w   $f2, $f2
-/* 38E0C8 E008C2C8 46020003 */  div.s     $f0, $f0, $f2
-/* 38E0CC E008C2CC 46000021 */  cvt.d.s   $f0, $f0
-/* 38E0D0 E008C2D0 46340002 */  mul.d     $f0, $f0, $f20
-/* 38E0D4 E008C2D4 00000000 */  nop
-/* 38E0D8 E008C2D8 2442FFFC */  addiu     $v0, $v0, -4
-/* 38E0DC E008C2DC 44821000 */  mtc1      $v0, $f2
-/* 38E0E0 E008C2E0 00000000 */  nop
-/* 38E0E4 E008C2E4 468010A0 */  cvt.s.w   $f2, $f2
-/* 38E0E8 E008C2E8 E602FFFA */  swc1      $f2, -6($s0)
-/* 38E0EC E008C2EC 44951000 */  mtc1      $s5, $f2
-/* 38E0F0 E008C2F0 00000000 */  nop
-/* 38E0F4 E008C2F4 468010A0 */  cvt.s.w   $f2, $f2
-/* 38E0F8 E008C2F8 24020168 */  addiu     $v0, $zero, 0x168
-/* 38E0FC E008C2FC 00561023 */  subu      $v0, $v0, $s6
-/* 38E100 E008C300 E602FFE6 */  swc1      $f2, -0x1a($s0)
-/* 38E104 E008C304 46340000 */  add.d     $f0, $f0, $f20
-/* 38E108 E008C308 44821000 */  mtc1      $v0, $f2
-/* 38E10C E008C30C 00000000 */  nop
-/* 38E110 E008C310 468010A0 */  cvt.s.w   $f2, $f2
-/* 38E114 E008C314 E602FFEE */  swc1      $f2, -0x12($s0)
-/* 38E118 E008C318 46200020 */  cvt.s.d   $f0, $f0
-/* 38E11C E008C31C E600FFCE */  swc1      $f0, -0x32($s0)
-/* 38E120 E008C320 44840000 */  mtc1      $a0, $f0
-/* 38E124 E008C324 00000000 */  nop
-/* 38E128 E008C328 46800020 */  cvt.s.w   $f0, $f0
-/* 38E12C E008C32C E600FFEA */  swc1      $f0, -0x16($s0)
-.LE008C330:
-/* 38E130 E008C330 2FC20006 */  sltiu     $v0, $fp, 6
-/* 38E134 E008C334 1040000B */  beqz      $v0, .LE008C364
-/* 38E138 E008C338 0000182D */   daddu    $v1, $zero, $zero
-/* 38E13C E008C33C 8FA80030 */  lw        $t0, 0x30($sp)
-/* 38E140 E008C340 8D020000 */  lw        $v0, ($t0)
-/* 38E144 E008C344 00400008 */  jr        $v0
-/* 38E148 E008C348 00000000 */   nop
-/* 38E14C E008C34C 080230D9 */  j         .LE008C364
-/* 38E150 E008C350 24030001 */   addiu    $v1, $zero, 1
-/* 38E154 E008C354 080230D9 */  j         .LE008C364
-/* 38E158 E008C358 24030002 */   addiu    $v1, $zero, 2
-/* 38E15C E008C35C 32220001 */  andi      $v0, $s1, 1
-/* 38E160 E008C360 24430001 */  addiu     $v1, $v0, 1
-.LE008C364:
-/* 38E164 E008C364 26D60026 */  addiu     $s6, $s6, 0x26
-/* 38E168 E008C368 26940168 */  addiu     $s4, $s4, 0x168
-/* 38E16C E008C36C 26B50019 */  addiu     $s5, $s5, 0x19
-/* 38E170 E008C370 3C02E009 */  lui       $v0, %hi(D_E008CB14)
-/* 38E174 E008C374 00431021 */  addu      $v0, $v0, $v1
-/* 38E178 E008C378 9042CB14 */  lbu       $v0, %lo(D_E008CB14)($v0)
-/* 38E17C E008C37C 26730078 */  addiu     $s3, $s3, 0x78
-/* 38E180 E008C380 A202FFFE */  sb        $v0, -2($s0)
-/* 38E184 E008C384 3C02E009 */  lui       $v0, %hi(D_E008CB18)
-/* 38E188 E008C388 00431021 */  addu      $v0, $v0, $v1
-/* 38E18C E008C38C 9042CB18 */  lbu       $v0, %lo(D_E008CB18)($v0)
-/* 38E190 E008C390 26520007 */  addiu     $s2, $s2, 7
-/* 38E194 E008C394 A202FFFF */  sb        $v0, -1($s0)
-/* 38E198 E008C398 3C02E009 */  lui       $v0, %hi(D_E008CB1C)
-/* 38E19C E008C39C 00431021 */  addu      $v0, $v0, $v1
-/* 38E1A0 E008C3A0 9042CB1C */  lbu       $v0, %lo(D_E008CB1C)($v0)
-/* 38E1A4 E008C3A4 26310001 */  addiu     $s1, $s1, 1
-/* 38E1A8 E008C3A8 A2020000 */  sb        $v0, ($s0)
-/* 38E1AC E008C3AC 2A220005 */  slti      $v0, $s1, 5
-/* 38E1B0 E008C3B0 1440FF6B */  bnez      $v0, .LE008C160
-/* 38E1B4 E008C3B4 26100048 */   addiu    $s0, $s0, 0x48
-.LE008C3B8:
-/* 38E1B8 E008C3B8 8FA20028 */  lw        $v0, 0x28($sp)
-/* 38E1BC E008C3BC 8FBF005C */  lw        $ra, 0x5c($sp)
-/* 38E1C0 E008C3C0 8FBE0058 */  lw        $fp, 0x58($sp)
-/* 38E1C4 E008C3C4 8FB70054 */  lw        $s7, 0x54($sp)
-/* 38E1C8 E008C3C8 8FB60050 */  lw        $s6, 0x50($sp)
-/* 38E1CC E008C3CC 8FB5004C */  lw        $s5, 0x4c($sp)
-/* 38E1D0 E008C3D0 8FB40048 */  lw        $s4, 0x48($sp)
-/* 38E1D4 E008C3D4 8FB30044 */  lw        $s3, 0x44($sp)
-/* 38E1D8 E008C3D8 8FB20040 */  lw        $s2, 0x40($sp)
-/* 38E1DC E008C3DC 8FB1003C */  lw        $s1, 0x3c($sp)
-/* 38E1E0 E008C3E0 8FB00038 */  lw        $s0, 0x38($sp)
-/* 38E1E4 E008C3E4 D7B60068 */  ldc1      $f22, 0x68($sp)
-/* 38E1E8 E008C3E8 D7B40060 */  ldc1      $f20, 0x60($sp)
-/* 38E1EC E008C3EC 03E00008 */  jr        $ra
-/* 38E1F0 E008C3F0 27BD0070 */   addiu    $sp, $sp, 0x70
diff --git a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_update.s b/ver/us/asm/nonmatchings/effects/effect_70/fx_70_update.s
deleted file mode 100644
index 5145a8afe3..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_70/fx_70_update.s
+++ /dev/null
@@ -1,191 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_70_update
-/* 38E1FC E008C3FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 38E200 E008C400 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 38E204 E008C404 8C85000C */  lw        $a1, 0xc($a0)
-/* 38E208 E008C408 8CA20024 */  lw        $v0, 0x24($a1)
-/* 38E20C E008C40C 2442FFFF */  addiu     $v0, $v0, -1
-/* 38E210 E008C410 ACA20024 */  sw        $v0, 0x24($a1)
-/* 38E214 E008C414 8CA20028 */  lw        $v0, 0x28($a1)
-/* 38E218 E008C418 8CA30024 */  lw        $v1, 0x24($a1)
-/* 38E21C E008C41C 24420001 */  addiu     $v0, $v0, 1
-/* 38E220 E008C420 04610005 */  bgez      $v1, .LE008C438
-/* 38E224 E008C424 ACA20028 */   sw       $v0, 0x28($a1)
-/* 38E228 E008C428 0C080128 */  jal       shim_remove_effect
-/* 38E22C E008C42C 00000000 */   nop
-/* 38E230 E008C430 080231AB */  j         .LE008C6AC
-/* 38E234 E008C434 00000000 */   nop
-.LE008C438:
-/* 38E238 E008C438 8CA80000 */  lw        $t0, ($a1)
-/* 38E23C E008C43C 24020008 */  addiu     $v0, $zero, 8
-/* 38E240 E008C440 15020025 */  bne       $t0, $v0, .LE008C4D8
-/* 38E244 E008C444 0060382D */   daddu    $a3, $v1, $zero
-/* 38E248 E008C448 28E20006 */  slti      $v0, $a3, 6
-/* 38E24C E008C44C 14400010 */  bnez      $v0, .LE008C490
-/* 38E250 E008C450 240200FF */   addiu    $v0, $zero, 0xff
-/* 38E254 E008C454 8CA3001C */  lw        $v1, 0x1c($a1)
-/* 38E258 E008C458 3C01E009 */  lui       $at, %hi(D_E008CB60)
-/* 38E25C E008C45C D420CB60 */  ldc1      $f0, %lo(D_E008CB60)($at)
-/* 38E260 E008C460 00431023 */  subu      $v0, $v0, $v1
-/* 38E264 E008C464 44821000 */  mtc1      $v0, $f2
-/* 38E268 E008C468 00000000 */  nop
-/* 38E26C E008C46C 468010A1 */  cvt.d.w   $f2, $f2
-/* 38E270 E008C470 46201082 */  mul.d     $f2, $f2, $f0
-/* 38E274 E008C474 00000000 */  nop
-/* 38E278 E008C478 44830000 */  mtc1      $v1, $f0
-/* 38E27C E008C47C 00000000 */  nop
-/* 38E280 E008C480 46800021 */  cvt.d.w   $f0, $f0
-/* 38E284 E008C484 46220000 */  add.d     $f0, $f0, $f2
-/* 38E288 E008C488 4620040D */  trunc.w.d $f16, $f0
-/* 38E28C E008C48C E4B0001C */  swc1      $f16, 0x1c($a1)
-.LE008C490:
-/* 38E290 E008C490 C4A00018 */  lwc1      $f0, 0x18($a1)
-/* 38E294 E008C494 44871000 */  mtc1      $a3, $f2
-/* 38E298 E008C498 00000000 */  nop
-/* 38E29C E008C49C 468010A0 */  cvt.s.w   $f2, $f2
-/* 38E2A0 E008C4A0 46020002 */  mul.s     $f0, $f0, $f2
-/* 38E2A4 E008C4A4 00000000 */  nop
-/* 38E2A8 E008C4A8 28E2000A */  slti      $v0, $a3, 0xa
-/* 38E2AC E008C4AC C4A20020 */  lwc1      $f2, 0x20($a1)
-/* 38E2B0 E008C4B0 468010A0 */  cvt.s.w   $f2, $f2
-/* 38E2B4 E008C4B4 46020003 */  div.s     $f0, $f0, $f2
-/* 38E2B8 E008C4B8 10400032 */  beqz      $v0, .LE008C584
-/* 38E2BC E008C4BC E4A00014 */   swc1     $f0, 0x14($a1)
-/* 38E2C0 E008C4C0 00071040 */  sll       $v0, $a3, 1
-/* 38E2C4 E008C4C4 00471021 */  addu      $v0, $v0, $a3
-/* 38E2C8 E008C4C8 000210C0 */  sll       $v0, $v0, 3
-/* 38E2CC E008C4CC 00471021 */  addu      $v0, $v0, $a3
-/* 38E2D0 E008C4D0 08023161 */  j         .LE008C584
-/* 38E2D4 E008C4D4 ACA2001C */   sw       $v0, 0x1c($a1)
-.LE008C4D8:
-/* 38E2D8 E008C4D8 28E20006 */  slti      $v0, $a3, 6
-/* 38E2DC E008C4DC 14400012 */  bnez      $v0, .LE008C528
-/* 38E2E0 E008C4E0 28E2000A */   slti     $v0, $a3, 0xa
-/* 38E2E4 E008C4E4 24020064 */  addiu     $v0, $zero, 0x64
-/* 38E2E8 E008C4E8 8CA3001C */  lw        $v1, 0x1c($a1)
-/* 38E2EC E008C4EC 3C01E009 */  lui       $at, %hi(D_E008CB68)
-/* 38E2F0 E008C4F0 D420CB68 */  ldc1      $f0, %lo(D_E008CB68)($at)
-/* 38E2F4 E008C4F4 00431023 */  subu      $v0, $v0, $v1
-/* 38E2F8 E008C4F8 44821000 */  mtc1      $v0, $f2
-/* 38E2FC E008C4FC 00000000 */  nop
-/* 38E300 E008C500 468010A1 */  cvt.d.w   $f2, $f2
-/* 38E304 E008C504 46201082 */  mul.d     $f2, $f2, $f0
-/* 38E308 E008C508 00000000 */  nop
-/* 38E30C E008C50C 44830000 */  mtc1      $v1, $f0
-/* 38E310 E008C510 00000000 */  nop
-/* 38E314 E008C514 46800021 */  cvt.d.w   $f0, $f0
-/* 38E318 E008C518 46220000 */  add.d     $f0, $f0, $f2
-/* 38E31C E008C51C 4620040D */  trunc.w.d $f16, $f0
-/* 38E320 E008C520 E4B0001C */  swc1      $f16, 0x1c($a1)
-/* 38E324 E008C524 28E2000A */  slti      $v0, $a3, 0xa
-.LE008C528:
-/* 38E328 E008C528 10400016 */  beqz      $v0, .LE008C584
-/* 38E32C E008C52C 00000000 */   nop
-/* 38E330 E008C530 3C01E009 */  lui       $at, %hi(D_E008CB70)
-/* 38E334 E008C534 D420CB70 */  ldc1      $f0, %lo(D_E008CB70)($at)
-/* 38E338 E008C538 C4A6001C */  lwc1      $f6, 0x1c($a1)
-/* 38E33C E008C53C 468031A1 */  cvt.d.w   $f6, $f6
-/* 38E340 E008C540 46203182 */  mul.d     $f6, $f6, $f0
-/* 38E344 E008C544 00000000 */  nop
-/* 38E348 E008C548 C4A00018 */  lwc1      $f0, 0x18($a1)
-/* 38E34C E008C54C 46000000 */  add.s     $f0, $f0, $f0
-/* 38E350 E008C550 C4A20014 */  lwc1      $f2, 0x14($a1)
-/* 38E354 E008C554 46020001 */  sub.s     $f0, $f0, $f2
-/* 38E358 E008C558 3C01E009 */  lui       $at, %hi(D_E008CB78)
-/* 38E35C E008C55C D424CB78 */  ldc1      $f4, %lo(D_E008CB78)($at)
-/* 38E360 E008C560 46000021 */  cvt.d.s   $f0, $f0
-/* 38E364 E008C564 46240002 */  mul.d     $f0, $f0, $f4
-/* 38E368 E008C568 00000000 */  nop
-/* 38E36C E008C56C 460010A1 */  cvt.d.s   $f2, $f2
-/* 38E370 E008C570 46201080 */  add.d     $f2, $f2, $f0
-/* 38E374 E008C574 4620340D */  trunc.w.d $f16, $f6
-/* 38E378 E008C578 E4B0001C */  swc1      $f16, 0x1c($a1)
-/* 38E37C E008C57C 462010A0 */  cvt.s.d   $f2, $f2
-/* 38E380 E008C580 E4A20014 */  swc1      $f2, 0x14($a1)
-.LE008C584:
-/* 38E384 E008C584 8CA20004 */  lw        $v0, 4($a1)
-/* 38E388 E008C588 C4400028 */  lwc1      $f0, 0x28($v0)
-/* 38E38C E008C58C E4A00008 */  swc1      $f0, 8($a1)
-/* 38E390 E008C590 C440002C */  lwc1      $f0, 0x2c($v0)
-/* 38E394 E008C594 E4A0000C */  swc1      $f0, 0xc($a1)
-/* 38E398 E008C598 C4400030 */  lwc1      $f0, 0x30($v0)
-/* 38E39C E008C59C 24060001 */  addiu     $a2, $zero, 1
-/* 38E3A0 E008C5A0 E4A00010 */  swc1      $f0, 0x10($a1)
-/* 38E3A4 E008C5A4 8C820008 */  lw        $v0, 8($a0)
-/* 38E3A8 E008C5A8 00C2102A */  slt       $v0, $a2, $v0
-/* 38E3AC E008C5AC 1040003F */  beqz      $v0, .LE008C6AC
-/* 38E3B0 E008C5B0 24A50048 */   addiu    $a1, $a1, 0x48
-/* 38E3B4 E008C5B4 240A0008 */  addiu     $t2, $zero, 8
-/* 38E3B8 E008C5B8 28E9000A */  slti      $t1, $a3, 0xa
-/* 38E3BC E008C5BC 24A30030 */  addiu     $v1, $a1, 0x30
-/* 38E3C0 E008C5C0 3C014220 */  lui       $at, 0x4220
-/* 38E3C4 E008C5C4 44817000 */  mtc1      $at, $f14
-/* 38E3C8 E008C5C8 3C01E009 */  lui       $at, %hi(D_E008CB80)
-/* 38E3CC E008C5CC D428CB80 */  ldc1      $f8, %lo(D_E008CB80)($at)
-/* 38E3D0 E008C5D0 3C01C220 */  lui       $at, 0xc220
-/* 38E3D4 E008C5D4 44816000 */  mtc1      $at, $f12
-/* 38E3D8 E008C5D8 3C014120 */  lui       $at, 0x4120
-/* 38E3DC E008C5DC 44815000 */  mtc1      $at, $f10
-.LE008C5E0:
-/* 38E3E0 E008C5E0 150A001C */  bne       $t0, $t2, .LE008C654
-/* 38E3E4 E008C5E4 30C20001 */   andi     $v0, $a2, 1
-/* 38E3E8 E008C5E8 10400004 */  beqz      $v0, .LE008C5FC
-/* 38E3EC E008C5EC 00000000 */   nop
-/* 38E3F0 E008C5F0 C460000C */  lwc1      $f0, 0xc($v1)
-/* 38E3F4 E008C5F4 08023181 */  j         .LE008C604
-/* 38E3F8 E008C5F8 46007081 */   sub.s    $f2, $f14, $f0
-.LE008C5FC:
-/* 38E3FC E008C5FC C460000C */  lwc1      $f0, 0xc($v1)
-/* 38E400 E008C600 46006081 */  sub.s     $f2, $f12, $f0
-.LE008C604:
-/* 38E404 E008C604 460010A1 */  cvt.d.s   $f2, $f2
-/* 38E408 E008C608 46281082 */  mul.d     $f2, $f2, $f8
-/* 38E40C E008C60C 00000000 */  nop
-/* 38E410 E008C610 46000021 */  cvt.d.s   $f0, $f0
-/* 38E414 E008C614 46220000 */  add.d     $f0, $f0, $f2
-/* 38E418 E008C618 46200020 */  cvt.s.d   $f0, $f0
-/* 38E41C E008C61C E460000C */  swc1      $f0, 0xc($v1)
-/* 38E420 E008C620 C466FFFC */  lwc1      $f6, -4($v1)
-/* 38E424 E008C624 C4600008 */  lwc1      $f0, 8($v1)
-/* 38E428 E008C628 C4640000 */  lwc1      $f4, ($v1)
-/* 38E42C E008C62C 46003180 */  add.s     $f6, $f6, $f0
-/* 38E430 E008C630 C460000C */  lwc1      $f0, 0xc($v1)
-/* 38E434 E008C634 C4620004 */  lwc1      $f2, 4($v1)
-/* 38E438 E008C638 46002100 */  add.s     $f4, $f4, $f0
-/* 38E43C E008C63C C4600010 */  lwc1      $f0, 0x10($v1)
-/* 38E440 E008C640 46001080 */  add.s     $f2, $f2, $f0
-/* 38E444 E008C644 E466FFFC */  swc1      $f6, -4($v1)
-/* 38E448 E008C648 E4640000 */  swc1      $f4, ($v1)
-/* 38E44C E008C64C 080231A6 */  j         .LE008C698
-/* 38E450 E008C650 E4620004 */   swc1     $f2, 4($v1)
-.LE008C654:
-/* 38E454 E008C654 1120000C */  beqz      $t1, .LE008C688
-/* 38E458 E008C658 00000000 */   nop
-/* 38E45C E008C65C C460000C */  lwc1      $f0, 0xc($v1)
-/* 38E460 E008C660 44871000 */  mtc1      $a3, $f2
-/* 38E464 E008C664 00000000 */  nop
-/* 38E468 E008C668 468010A0 */  cvt.s.w   $f2, $f2
-/* 38E46C E008C66C 46020002 */  mul.s     $f0, $f0, $f2
-/* 38E470 E008C670 00000000 */  nop
-/* 38E474 E008C674 C4620000 */  lwc1      $f2, ($v1)
-/* 38E478 E008C678 460A0003 */  div.s     $f0, $f0, $f10
-/* 38E47C E008C67C 46001080 */  add.s     $f2, $f2, $f0
-/* 38E480 E008C680 080231A6 */  j         .LE008C698
-/* 38E484 E008C684 E4620000 */   swc1     $f2, ($v1)
-.LE008C688:
-/* 38E488 E008C688 C4600000 */  lwc1      $f0, ($v1)
-/* 38E48C E008C68C C462000C */  lwc1      $f2, 0xc($v1)
-/* 38E490 E008C690 46020000 */  add.s     $f0, $f0, $f2
-/* 38E494 E008C694 E4600000 */  swc1      $f0, ($v1)
-.LE008C698:
-/* 38E498 E008C698 24C60001 */  addiu     $a2, $a2, 1
-/* 38E49C E008C69C 8C820008 */  lw        $v0, 8($a0)
-/* 38E4A0 E008C6A0 00C2102A */  slt       $v0, $a2, $v0
-/* 38E4A4 E008C6A4 1440FFCE */  bnez      $v0, .LE008C5E0
-/* 38E4A8 E008C6A8 24630048 */   addiu    $v1, $v1, 0x48
-.LE008C6AC:
-/* 38E4AC E008C6AC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 38E4B0 E008C6B0 03E00008 */  jr        $ra
-/* 38E4B4 E008C6B4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_117/fx_117_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/effect_75/fx_75_appendGfx.s
index 6126c706b5..c58f8fb550 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_117_appendGfx
+glabel fx_75_appendGfx
 /* 3E254C E00EA66C 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3E2550 E00EA670 0080302D */  daddu     $a2, $a0, $zero
 /* 3E2554 E00EA674 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s
rename to ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s
index 9219a730e6..00ddbc48c4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_main.s
+++ b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_117_main
+glabel fx_75_main
 /* 3E1EE0 E00EA000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3E1EE4 E00EA004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3E1EE8 E00EA008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_117_main
 /* 3E1F04 E00EA024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E1F08 E00EA028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3E1F0C E00EA02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3E1F10 E00EA030 3C02E00F */  lui       $v0, %hi(fx_117_init)
-/* 3E1F14 E00EA034 2442A190 */  addiu     $v0, $v0, %lo(fx_117_init)
+/* 3E1F10 E00EA030 3C02E00F */  lui       $v0, %hi(fx_75_init)
+/* 3E1F14 E00EA034 2442A190 */  addiu     $v0, $v0, %lo(fx_75_init)
 /* 3E1F18 E00EA038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E1F1C E00EA03C 3C02E00F */  lui       $v0, %hi(fx_117_update)
-/* 3E1F20 E00EA040 2442A198 */  addiu     $v0, $v0, %lo(fx_117_update)
+/* 3E1F1C E00EA03C 3C02E00F */  lui       $v0, %hi(fx_75_update)
+/* 3E1F20 E00EA040 2442A198 */  addiu     $v0, $v0, %lo(fx_75_update)
 /* 3E1F24 E00EA044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E1F28 E00EA048 3C02E00F */  lui       $v0, %hi(fx_117_render)
-/* 3E1F2C E00EA04C 2442A520 */  addiu     $v0, $v0, %lo(fx_117_render)
+/* 3E1F28 E00EA048 3C02E00F */  lui       $v0, %hi(fx_75_render)
+/* 3E1F2C E00EA04C 2442A520 */  addiu     $v0, $v0, %lo(fx_75_render)
 /* 3E1F30 E00EA050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E1F34 E00EA054 24020075 */  addiu     $v0, $zero, 0x75
 /* 3E1F38 E00EA058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
rename to ver/us/asm/nonmatchings/effects/effect_75/fx_75_update.s
index 0276edb265..5a45f11e51 100644
--- a/ver/us/asm/nonmatchings/effects/effect_117/fx_117_update.s
+++ b/ver/us/asm/nonmatchings/effects/effect_75/fx_75_update.s
@@ -6,7 +6,7 @@ dlabel D_E00EAA60
 .double 0.1
 
 .section .text
-glabel fx_117_update
+glabel fx_75_update
 /* 3E2078 E00EA198 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3E207C E00EA19C AFBF0014 */  sw        $ra, 0x14($sp)
 /* 3E2080 E00EA1A0 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_appendGfx.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_appendGfx.s
deleted file mode 100644
index 07f1c199d6..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_appendGfx.s
+++ /dev/null
@@ -1,320 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_99_appendGfx
-/* 3CD190 E00C67B0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* 3CD194 E00C67B4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* 3CD198 E00C67B8 27BDFF00 */  addiu     $sp, $sp, -0x100
-/* 3CD19C E00C67BC AFA40100 */  sw        $a0, 0x100($sp)
-/* 3CD1A0 E00C67C0 8FAA0100 */  lw        $t2, 0x100($sp)
-/* 3CD1A4 E00C67C4 3C04800B */  lui       $a0, %hi(gCameras)
-/* 3CD1A8 E00C67C8 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* 3CD1AC E00C67CC AFBF00CC */  sw        $ra, 0xcc($sp)
-/* 3CD1B0 E00C67D0 AFBE00C8 */  sw        $fp, 0xc8($sp)
-/* 3CD1B4 E00C67D4 AFB700C4 */  sw        $s7, 0xc4($sp)
-/* 3CD1B8 E00C67D8 AFB600C0 */  sw        $s6, 0xc0($sp)
-/* 3CD1BC E00C67DC AFB500BC */  sw        $s5, 0xbc($sp)
-/* 3CD1C0 E00C67E0 AFB400B8 */  sw        $s4, 0xb8($sp)
-/* 3CD1C4 E00C67E4 AFB300B4 */  sw        $s3, 0xb4($sp)
-/* 3CD1C8 E00C67E8 AFB200B0 */  sw        $s2, 0xb0($sp)
-/* 3CD1CC E00C67EC AFB100AC */  sw        $s1, 0xac($sp)
-/* 3CD1D0 E00C67F0 AFB000A8 */  sw        $s0, 0xa8($sp)
-/* 3CD1D4 E00C67F4 F7BE00F8 */  sdc1      $f30, 0xf8($sp)
-/* 3CD1D8 E00C67F8 F7BC00F0 */  sdc1      $f28, 0xf0($sp)
-/* 3CD1DC E00C67FC F7BA00E8 */  sdc1      $f26, 0xe8($sp)
-/* 3CD1E0 E00C6800 F7B800E0 */  sdc1      $f24, 0xe0($sp)
-/* 3CD1E4 E00C6804 F7B600D8 */  sdc1      $f22, 0xd8($sp)
-/* 3CD1E8 E00C6808 F7B400D0 */  sdc1      $f20, 0xd0($sp)
-/* 3CD1EC E00C680C 00031080 */  sll       $v0, $v1, 2
-/* 3CD1F0 E00C6810 00431021 */  addu      $v0, $v0, $v1
-/* 3CD1F4 E00C6814 00021080 */  sll       $v0, $v0, 2
-/* 3CD1F8 E00C6818 00431023 */  subu      $v0, $v0, $v1
-/* 3CD1FC E00C681C 000218C0 */  sll       $v1, $v0, 3
-/* 3CD200 E00C6820 00431021 */  addu      $v0, $v0, $v1
-/* 3CD204 E00C6824 000210C0 */  sll       $v0, $v0, 3
-/* 3CD208 E00C6828 8D49000C */  lw        $t1, 0xc($t2)
-/* 3CD20C E00C682C 00441021 */  addu      $v0, $v0, $a0
-/* 3CD210 E00C6830 AFA20098 */  sw        $v0, 0x98($sp)
-/* 3CD214 E00C6834 8D2A0000 */  lw        $t2, ($t1)
-/* 3CD218 E00C6838 8D270034 */  lw        $a3, 0x34($t1)
-/* 3CD21C E00C683C AFAA009C */  sw        $t2, 0x9c($sp)
-/* 3CD220 E00C6840 C5380048 */  lwc1      $f24, 0x48($t1)
-/* 3CD224 E00C6844 114000FD */  beqz      $t2, .LE00C6C3C
-/* 3CD228 E00C6848 3C02E700 */   lui      $v0, 0xe700
-/* 3CD22C E00C684C 3C05DB06 */  lui       $a1, 0xdb06
-/* 3CD230 E00C6850 3C08800A */  lui       $t0, %hi(gMasterGfxPos)
-/* 3CD234 E00C6854 2508A66C */  addiu     $t0, $t0, %lo(gMasterGfxPos)
-/* 3CD238 E00C6858 34A50024 */  ori       $a1, $a1, 0x24
-/* 3CD23C E00C685C 8D040000 */  lw        $a0, ($t0)
-/* 3CD240 E00C6860 0080182D */  daddu     $v1, $a0, $zero
-/* 3CD244 E00C6864 24840008 */  addiu     $a0, $a0, 8
-/* 3CD248 E00C6868 AD040000 */  sw        $a0, ($t0)
-/* 3CD24C E00C686C AC620000 */  sw        $v0, ($v1)
-/* 3CD250 E00C6870 24820008 */  addiu     $v0, $a0, 8
-/* 3CD254 E00C6874 AC600004 */  sw        $zero, 4($v1)
-/* 3CD258 E00C6878 AD020000 */  sw        $v0, ($t0)
-/* 3CD25C E00C687C AC850000 */  sw        $a1, ($a0)
-/* 3CD260 E00C6880 8FAA0100 */  lw        $t2, 0x100($sp)
-/* 3CD264 E00C6884 8D430010 */  lw        $v1, 0x10($t2)
-/* 3CD268 E00C6888 24820010 */  addiu     $v0, $a0, 0x10
-/* 3CD26C E00C688C AD020000 */  sw        $v0, ($t0)
-/* 3CD270 E00C6890 8C63001C */  lw        $v1, 0x1c($v1)
-/* 3CD274 E00C6894 3C02FA00 */  lui       $v0, 0xfa00
-/* 3CD278 E00C6898 AC820008 */  sw        $v0, 8($a0)
-/* 3CD27C E00C689C 3C028000 */  lui       $v0, 0x8000
-/* 3CD280 E00C68A0 00621821 */  addu      $v1, $v1, $v0
-/* 3CD284 E00C68A4 AC830004 */  sw        $v1, 4($a0)
-/* 3CD288 E00C68A8 9122002B */  lbu       $v0, 0x2b($t1)
-/* 3CD28C E00C68AC 9125002F */  lbu       $a1, 0x2f($t1)
-/* 3CD290 E00C68B0 91260033 */  lbu       $a2, 0x33($t1)
-/* 3CD294 E00C68B4 24830018 */  addiu     $v1, $a0, 0x18
-/* 3CD298 E00C68B8 AD030000 */  sw        $v1, ($t0)
-/* 3CD29C E00C68BC 3C03FB00 */  lui       $v1, 0xfb00
-/* 3CD2A0 E00C68C0 AC830010 */  sw        $v1, 0x10($a0)
-/* 3CD2A4 E00C68C4 30E300FF */  andi      $v1, $a3, 0xff
-/* 3CD2A8 E00C68C8 00021600 */  sll       $v0, $v0, 0x18
-/* 3CD2AC E00C68CC 00052C00 */  sll       $a1, $a1, 0x10
-/* 3CD2B0 E00C68D0 00451025 */  or        $v0, $v0, $a1
-/* 3CD2B4 E00C68D4 00063200 */  sll       $a2, $a2, 8
-/* 3CD2B8 E00C68D8 00461025 */  or        $v0, $v0, $a2
-/* 3CD2BC E00C68DC 00431025 */  or        $v0, $v0, $v1
-/* 3CD2C0 E00C68E0 AC82000C */  sw        $v0, 0xc($a0)
-/* 3CD2C4 E00C68E4 9122003B */  lbu       $v0, 0x3b($t1)
-/* 3CD2C8 E00C68E8 9125003F */  lbu       $a1, 0x3f($t1)
-/* 3CD2CC E00C68EC 91260043 */  lbu       $a2, 0x43($t1)
-/* 3CD2D0 E00C68F0 91270047 */  lbu       $a3, 0x47($t1)
-/* 3CD2D4 E00C68F4 3C03DE00 */  lui       $v1, 0xde00
-/* 3CD2D8 E00C68F8 AC830018 */  sw        $v1, 0x18($a0)
-/* 3CD2DC E00C68FC 00021600 */  sll       $v0, $v0, 0x18
-/* 3CD2E0 E00C6900 00052C00 */  sll       $a1, $a1, 0x10
-/* 3CD2E4 E00C6904 00451025 */  or        $v0, $v0, $a1
-/* 3CD2E8 E00C6908 00063200 */  sll       $a2, $a2, 8
-/* 3CD2EC E00C690C 00461025 */  or        $v0, $v0, $a2
-/* 3CD2F0 E00C6910 00471025 */  or        $v0, $v0, $a3
-/* 3CD2F4 E00C6914 AC820014 */  sw        $v0, 0x14($a0)
-/* 3CD2F8 E00C6918 8FAA009C */  lw        $t2, 0x9c($sp)
-/* 3CD2FC E00C691C 000A1080 */  sll       $v0, $t2, 2
-/* 3CD300 E00C6920 3C01E00C */  lui       $at, %hi(D_E00C6C9C)
-/* 3CD304 E00C6924 00220821 */  addu      $at, $at, $v0
-/* 3CD308 E00C6928 8C226C9C */  lw        $v0, %lo(D_E00C6C9C)($at)
-/* 3CD30C E00C692C AC82001C */  sw        $v0, 0x1c($a0)
-/* 3CD310 E00C6930 8FAA0100 */  lw        $t2, 0x100($sp)
-/* 3CD314 E00C6934 0000B02D */  daddu     $s6, $zero, $zero
-/* 3CD318 E00C6938 8D420008 */  lw        $v0, 8($t2)
-/* 3CD31C E00C693C 24840020 */  addiu     $a0, $a0, 0x20
-/* 3CD320 E00C6940 184000BE */  blez      $v0, .LE00C6C3C
-/* 3CD324 E00C6944 AD040000 */   sw       $a0, ($t0)
-/* 3CD328 E00C6948 27B50058 */  addiu     $s5, $sp, 0x58
-/* 3CD32C E00C694C 3C1E800A */  lui       $fp, %hi(gDisplayContext)
-/* 3CD330 E00C6950 27DEA674 */  addiu     $fp, $fp, %lo(gDisplayContext)
-/* 3CD334 E00C6954 3C178007 */  lui       $s7, %hi(gMatrixListPos)
-/* 3CD338 E00C6958 26F741F0 */  addiu     $s7, $s7, %lo(gMatrixListPos)
-/* 3CD33C E00C695C 3C140001 */  lui       $s4, 1
-/* 3CD340 E00C6960 36941630 */  ori       $s4, $s4, 0x1630
-/* 3CD344 E00C6964 0100982D */  daddu     $s3, $t0, $zero
-/* 3CD348 E00C6968 3C0ADA38 */  lui       $t2, 0xda38
-/* 3CD34C E00C696C 354A0001 */  ori       $t2, $t2, 1
-/* 3CD350 E00C6970 4480B000 */  mtc1      $zero, $f22
-/* 3CD354 E00C6974 3C014300 */  lui       $at, 0x4300
-/* 3CD358 E00C6978 4481D000 */  mtc1      $at, $f26
-/* 3CD35C E00C697C 3C014080 */  lui       $at, 0x4080
-/* 3CD360 E00C6980 4481F000 */  mtc1      $at, $f30
-/* 3CD364 E00C6984 3C013F80 */  lui       $at, 0x3f80
-/* 3CD368 E00C6988 4481E000 */  mtc1      $at, $f28
-/* 3CD36C E00C698C 25320074 */  addiu     $s2, $t1, 0x74
-/* 3CD370 E00C6990 AFAA00A0 */  sw        $t2, 0xa0($sp)
-.LE00C6994:
-/* 3CD374 E00C6994 4600B306 */  mov.s     $f12, $f22
-/* 3CD378 E00C6998 C644FFD8 */  lwc1      $f4, -0x28($s2)
-/* 3CD37C E00C699C C640FFE0 */  lwc1      $f0, -0x20($s2)
-/* 3CD380 E00C69A0 8E46FFEC */  lw        $a2, -0x14($s2)
-/* 3CD384 E00C69A4 C642FFE4 */  lwc1      $f2, -0x1c($s2)
-/* 3CD388 E00C69A8 46002100 */  add.s     $f4, $f4, $f0
-/* 3CD38C E00C69AC C640FFDC */  lwc1      $f0, -0x24($s2)
-/* 3CD390 E00C69B0 8E47FFF0 */  lw        $a3, -0x10($s2)
-/* 3CD394 E00C69B4 46020000 */  add.s     $f0, $f0, $f2
-/* 3CD398 E00C69B8 4600B386 */  mov.s     $f14, $f22
-/* 3CD39C E00C69BC E644FFD8 */  swc1      $f4, -0x28($s2)
-/* 3CD3A0 E00C69C0 0C080148 */  jal       shim_atan2
-/* 3CD3A4 E00C69C4 E640FFDC */   swc1     $f0, -0x24($s2)
-/* 3CD3A8 E00C69C8 C6420000 */  lwc1      $f2, ($s2)
-/* 3CD3AC E00C69CC 46000507 */  neg.s     $f20, $f0
-/* 3CD3B0 E00C69D0 4602A500 */  add.s     $f20, $f20, $f2
-/* 3CD3B4 E00C69D4 0C080140 */  jal       shim_sin_deg
-/* 3CD3B8 E00C69D8 4600A306 */   mov.s    $f12, $f20
-/* 3CD3BC E00C69DC 4600A306 */  mov.s     $f12, $f20
-/* 3CD3C0 E00C69E0 0C080144 */  jal       shim_cos_deg
-/* 3CD3C4 E00C69E4 E640FFE0 */   swc1     $f0, -0x20($s2)
-/* 3CD3C8 E00C69E8 C642FFD8 */  lwc1      $f2, -0x28($s2)
-/* 3CD3CC E00C69EC 4616103C */  c.lt.s    $f2, $f22
-/* 3CD3D0 E00C69F0 00000000 */  nop
-/* 3CD3D4 E00C69F4 45000003 */  bc1f      .LE00C6A04
-/* 3CD3D8 E00C69F8 E640FFE4 */   swc1     $f0, -0x1c($s2)
-/* 3CD3DC E00C69FC 461A1000 */  add.s     $f0, $f2, $f26
-/* 3CD3E0 E00C6A00 E640FFD8 */  swc1      $f0, -0x28($s2)
-.LE00C6A04:
-/* 3CD3E4 E00C6A04 C640FFDC */  lwc1      $f0, -0x24($s2)
-/* 3CD3E8 E00C6A08 4600D03C */  c.lt.s    $f26, $f0
-/* 3CD3EC E00C6A0C 00000000 */  nop
-/* 3CD3F0 E00C6A10 45000003 */  bc1f      .LE00C6A20
-/* 3CD3F4 E00C6A14 00000000 */   nop
-/* 3CD3F8 E00C6A18 461A0001 */  sub.s     $f0, $f0, $f26
-/* 3CD3FC E00C6A1C E640FFDC */  swc1      $f0, -0x24($s2)
-.LE00C6A20:
-/* 3CD400 E00C6A20 C642FFD8 */  lwc1      $f2, -0x28($s2)
-/* 3CD404 E00C6A24 461E1082 */  mul.s     $f2, $f2, $f30
-/* 3CD408 E00C6A28 00000000 */  nop
-/* 3CD40C E00C6A2C 27A40018 */  addiu     $a0, $sp, 0x18
-/* 3CD410 E00C6A30 C640FFDC */  lwc1      $f0, -0x24($s2)
-/* 3CD414 E00C6A34 461E0002 */  mul.s     $f0, $f0, $f30
-/* 3CD418 E00C6A38 00000000 */  nop
-/* 3CD41C E00C6A3C 8E45FF90 */  lw        $a1, -0x70($s2)
-/* 3CD420 E00C6A40 8E46FF94 */  lw        $a2, -0x6c($s2)
-/* 3CD424 E00C6A44 8E47FF98 */  lw        $a3, -0x68($s2)
-/* 3CD428 E00C6A48 4600118D */  trunc.w.s $f6, $f2
-/* 3CD42C E00C6A4C 44103000 */  mfc1      $s0, $f6
-/* 3CD430 E00C6A50 4600018D */  trunc.w.s $f6, $f0
-/* 3CD434 E00C6A54 44113000 */  mfc1      $s1, $f6
-/* 3CD438 E00C6A58 0C080108 */  jal       shim_guTranslateF
-/* 3CD43C E00C6A5C 26D60001 */   addiu    $s6, $s6, 1
-/* 3CD440 E00C6A60 4405C000 */  mfc1      $a1, $f24
-/* 3CD444 E00C6A64 4406C000 */  mfc1      $a2, $f24
-/* 3CD448 E00C6A68 4407C000 */  mfc1      $a3, $f24
-/* 3CD44C E00C6A6C 0C080110 */  jal       shim_guScaleF
-/* 3CD450 E00C6A70 02A0202D */   daddu    $a0, $s5, $zero
-/* 3CD454 E00C6A74 02A0202D */  daddu     $a0, $s5, $zero
-/* 3CD458 E00C6A78 27A50018 */  addiu     $a1, $sp, 0x18
-/* 3CD45C E00C6A7C 0C080114 */  jal       shim_guMtxCatF
-/* 3CD460 E00C6A80 00A0302D */   daddu    $a2, $a1, $zero
-/* 3CD464 E00C6A84 27A40018 */  addiu     $a0, $sp, 0x18
-/* 3CD468 E00C6A88 96E50000 */  lhu       $a1, ($s7)
-/* 3CD46C E00C6A8C 8FC20000 */  lw        $v0, ($fp)
-/* 3CD470 E00C6A90 00052980 */  sll       $a1, $a1, 6
-/* 3CD474 E00C6A94 00B42821 */  addu      $a1, $a1, $s4
-/* 3CD478 E00C6A98 0C080118 */  jal       shim_guMtxF2L
-/* 3CD47C E00C6A9C 00452821 */   addu     $a1, $v0, $a1
-/* 3CD480 E00C6AA0 3C02DA38 */  lui       $v0, 0xda38
-/* 3CD484 E00C6AA4 34420002 */  ori       $v0, $v0, 2
-/* 3CD488 E00C6AA8 8E680000 */  lw        $t0, ($s3)
-/* 3CD48C E00C6AAC 96E50000 */  lhu       $a1, ($s7)
-/* 3CD490 E00C6AB0 0100302D */  daddu     $a2, $t0, $zero
-/* 3CD494 E00C6AB4 25080008 */  addiu     $t0, $t0, 8
-/* 3CD498 E00C6AB8 AE680000 */  sw        $t0, ($s3)
-/* 3CD49C E00C6ABC ACC20000 */  sw        $v0, ($a2)
-/* 3CD4A0 E00C6AC0 30A2FFFF */  andi      $v0, $a1, 0xffff
-/* 3CD4A4 E00C6AC4 00021180 */  sll       $v0, $v0, 6
-/* 3CD4A8 E00C6AC8 8FC30000 */  lw        $v1, ($fp)
-/* 3CD4AC E00C6ACC 00541021 */  addu      $v0, $v0, $s4
-/* 3CD4B0 E00C6AD0 00621821 */  addu      $v1, $v1, $v0
-/* 3CD4B4 E00C6AD4 ACC30004 */  sw        $v1, 4($a2)
-/* 3CD4B8 E00C6AD8 8FAA00A0 */  lw        $t2, 0xa0($sp)
-/* 3CD4BC E00C6ADC 27A40018 */  addiu     $a0, $sp, 0x18
-/* 3CD4C0 E00C6AE0 AD0A0000 */  sw        $t2, ($t0)
-/* 3CD4C4 E00C6AE4 8FAA0098 */  lw        $t2, 0x98($sp)
-/* 3CD4C8 E00C6AE8 4407E000 */  mfc1      $a3, $f28
-/* 3CD4CC E00C6AEC 8D420204 */  lw        $v0, 0x204($t2)
-/* 3CD4D0 E00C6AF0 24A50001 */  addiu     $a1, $a1, 1
-/* 3CD4D4 E00C6AF4 A6E50000 */  sh        $a1, ($s7)
-/* 3CD4D8 E00C6AF8 AD020004 */  sw        $v0, 4($t0)
-/* 3CD4DC E00C6AFC 8E45FFFC */  lw        $a1, -4($s2)
-/* 3CD4E0 E00C6B00 8E46FFF8 */  lw        $a2, -8($s2)
-/* 3CD4E4 E00C6B04 25080008 */  addiu     $t0, $t0, 8
-/* 3CD4E8 E00C6B08 0C080110 */  jal       shim_guScaleF
-/* 3CD4EC E00C6B0C AE680000 */   sw       $t0, ($s3)
-/* 3CD4F0 E00C6B10 E7BC0010 */  swc1      $f28, 0x10($sp)
-/* 3CD4F4 E00C6B14 8E450000 */  lw        $a1, ($s2)
-/* 3CD4F8 E00C6B18 4406B000 */  mfc1      $a2, $f22
-/* 3CD4FC E00C6B1C 4407B000 */  mfc1      $a3, $f22
-/* 3CD500 E00C6B20 0C080104 */  jal       shim_guRotateF
-/* 3CD504 E00C6B24 02A0202D */   daddu    $a0, $s5, $zero
-/* 3CD508 E00C6B28 02A0202D */  daddu     $a0, $s5, $zero
-/* 3CD50C E00C6B2C 27A50018 */  addiu     $a1, $sp, 0x18
-/* 3CD510 E00C6B30 0C080114 */  jal       shim_guMtxCatF
-/* 3CD514 E00C6B34 00A0302D */   daddu    $a2, $a1, $zero
-/* 3CD518 E00C6B38 27A40018 */  addiu     $a0, $sp, 0x18
-/* 3CD51C E00C6B3C 96E50000 */  lhu       $a1, ($s7)
-/* 3CD520 E00C6B40 8FC20000 */  lw        $v0, ($fp)
-/* 3CD524 E00C6B44 00052980 */  sll       $a1, $a1, 6
-/* 3CD528 E00C6B48 00B42821 */  addu      $a1, $a1, $s4
-/* 3CD52C E00C6B4C 0C080118 */  jal       shim_guMtxF2L
-/* 3CD530 E00C6B50 00452821 */   addu     $a1, $v0, $a1
-/* 3CD534 E00C6B54 3C06D838 */  lui       $a2, 0xd838
-/* 3CD538 E00C6B58 8E650000 */  lw        $a1, ($s3)
-/* 3CD53C E00C6B5C 96E30000 */  lhu       $v1, ($s7)
-/* 3CD540 E00C6B60 00A0202D */  daddu     $a0, $a1, $zero
-/* 3CD544 E00C6B64 24A50008 */  addiu     $a1, $a1, 8
-/* 3CD548 E00C6B68 24620001 */  addiu     $v0, $v1, 1
-/* 3CD54C E00C6B6C 3063FFFF */  andi      $v1, $v1, 0xffff
-/* 3CD550 E00C6B70 AE650000 */  sw        $a1, ($s3)
-/* 3CD554 E00C6B74 8FAA00A0 */  lw        $t2, 0xa0($sp)
-/* 3CD558 E00C6B78 00031980 */  sll       $v1, $v1, 6
-/* 3CD55C E00C6B7C AC8A0000 */  sw        $t2, ($a0)
-/* 3CD560 E00C6B80 A6E20000 */  sh        $v0, ($s7)
-/* 3CD564 E00C6B84 8FC20000 */  lw        $v0, ($fp)
-/* 3CD568 E00C6B88 00741821 */  addu      $v1, $v1, $s4
-/* 3CD56C E00C6B8C 00431021 */  addu      $v0, $v0, $v1
-/* 3CD570 E00C6B90 AC820004 */  sw        $v0, 4($a0)
-/* 3CD574 E00C6B94 24A20008 */  addiu     $v0, $a1, 8
-/* 3CD578 E00C6B98 32040FFF */  andi      $a0, $s0, 0xfff
-/* 3CD57C E00C6B9C 00042300 */  sll       $a0, $a0, 0xc
-/* 3CD580 E00C6BA0 AE620000 */  sw        $v0, ($s3)
-/* 3CD584 E00C6BA4 32220FFF */  andi      $v0, $s1, 0xfff
-/* 3CD588 E00C6BA8 3C03F200 */  lui       $v1, 0xf200
-/* 3CD58C E00C6BAC 00431025 */  or        $v0, $v0, $v1
-/* 3CD590 E00C6BB0 00822025 */  or        $a0, $a0, $v0
-/* 3CD594 E00C6BB4 2610003F */  addiu     $s0, $s0, 0x3f
-/* 3CD598 E00C6BB8 00108080 */  sll       $s0, $s0, 2
-/* 3CD59C E00C6BBC 32100FFF */  andi      $s0, $s0, 0xfff
-/* 3CD5A0 E00C6BC0 00108300 */  sll       $s0, $s0, 0xc
-/* 3CD5A4 E00C6BC4 2631000F */  addiu     $s1, $s1, 0xf
-/* 3CD5A8 E00C6BC8 00118880 */  sll       $s1, $s1, 2
-/* 3CD5AC E00C6BCC 32310FFF */  andi      $s1, $s1, 0xfff
-/* 3CD5B0 E00C6BD0 3C020100 */  lui       $v0, 0x100
-/* 3CD5B4 E00C6BD4 02228825 */  or        $s1, $s1, $v0
-/* 3CD5B8 E00C6BD8 02118025 */  or        $s0, $s0, $s1
-/* 3CD5BC E00C6BDC 3C02DE00 */  lui       $v0, 0xde00
-/* 3CD5C0 E00C6BE0 ACA40000 */  sw        $a0, ($a1)
-/* 3CD5C4 E00C6BE4 ACB00004 */  sw        $s0, 4($a1)
-/* 3CD5C8 E00C6BE8 ACA20008 */  sw        $v0, 8($a1)
-/* 3CD5CC E00C6BEC 8FAA009C */  lw        $t2, 0x9c($sp)
-/* 3CD5D0 E00C6BF0 34C60002 */  ori       $a2, $a2, 2
-/* 3CD5D4 E00C6BF4 000A1080 */  sll       $v0, $t2, 2
-/* 3CD5D8 E00C6BF8 3C0AE00C */  lui       $t2, %hi(D_E00C6C90)
-/* 3CD5DC E00C6BFC 254A6C90 */  addiu     $t2, $t2, %lo(D_E00C6C90)
-/* 3CD5E0 E00C6C00 004A1021 */  addu      $v0, $v0, $t2
-/* 3CD5E4 E00C6C04 8C430000 */  lw        $v1, ($v0)
-/* 3CD5E8 E00C6C08 24A20010 */  addiu     $v0, $a1, 0x10
-/* 3CD5EC E00C6C0C AE620000 */  sw        $v0, ($s3)
-/* 3CD5F0 E00C6C10 24020040 */  addiu     $v0, $zero, 0x40
-/* 3CD5F4 E00C6C14 ACA60010 */  sw        $a2, 0x10($a1)
-/* 3CD5F8 E00C6C18 ACA20014 */  sw        $v0, 0x14($a1)
-/* 3CD5FC E00C6C1C ACA3000C */  sw        $v1, 0xc($a1)
-/* 3CD600 E00C6C20 8FAA0100 */  lw        $t2, 0x100($sp)
-/* 3CD604 E00C6C24 2652007C */  addiu     $s2, $s2, 0x7c
-/* 3CD608 E00C6C28 8D420008 */  lw        $v0, 8($t2)
-/* 3CD60C E00C6C2C 24A50018 */  addiu     $a1, $a1, 0x18
-/* 3CD610 E00C6C30 02C2102A */  slt       $v0, $s6, $v0
-/* 3CD614 E00C6C34 1440FF57 */  bnez      $v0, .LE00C6994
-/* 3CD618 E00C6C38 AE650000 */   sw       $a1, ($s3)
-.LE00C6C3C:
-/* 3CD61C E00C6C3C 8FBF00CC */  lw        $ra, 0xcc($sp)
-/* 3CD620 E00C6C40 8FBE00C8 */  lw        $fp, 0xc8($sp)
-/* 3CD624 E00C6C44 8FB700C4 */  lw        $s7, 0xc4($sp)
-/* 3CD628 E00C6C48 8FB600C0 */  lw        $s6, 0xc0($sp)
-/* 3CD62C E00C6C4C 8FB500BC */  lw        $s5, 0xbc($sp)
-/* 3CD630 E00C6C50 8FB400B8 */  lw        $s4, 0xb8($sp)
-/* 3CD634 E00C6C54 8FB300B4 */  lw        $s3, 0xb4($sp)
-/* 3CD638 E00C6C58 8FB200B0 */  lw        $s2, 0xb0($sp)
-/* 3CD63C E00C6C5C 8FB100AC */  lw        $s1, 0xac($sp)
-/* 3CD640 E00C6C60 8FB000A8 */  lw        $s0, 0xa8($sp)
-/* 3CD644 E00C6C64 D7BE00F8 */  ldc1      $f30, 0xf8($sp)
-/* 3CD648 E00C6C68 D7BC00F0 */  ldc1      $f28, 0xf0($sp)
-/* 3CD64C E00C6C6C D7BA00E8 */  ldc1      $f26, 0xe8($sp)
-/* 3CD650 E00C6C70 D7B800E0 */  ldc1      $f24, 0xe0($sp)
-/* 3CD654 E00C6C74 D7B600D8 */  ldc1      $f22, 0xd8($sp)
-/* 3CD658 E00C6C78 D7B400D0 */  ldc1      $f20, 0xd0($sp)
-/* 3CD65C E00C6C7C 03E00008 */  jr        $ra
-/* 3CD660 E00C6C80 27BD0100 */   addiu    $sp, $sp, 0x100
-/* 3CD664 E00C6C84 00000000 */  nop
-/* 3CD668 E00C6C88 00000000 */  nop
-/* 3CD66C E00C6C8C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s
deleted file mode 100644
index f9d8d7b263..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_main.s
+++ /dev/null
@@ -1,240 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_99_main
-/* 3CC9E0 E00C6000 27BDFF88 */  addiu     $sp, $sp, -0x78
-/* 3CC9E4 E00C6004 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 3CC9E8 E00C6008 0080882D */  daddu     $s1, $a0, $zero
-/* 3CC9EC E00C600C AFB30034 */  sw        $s3, 0x34($sp)
-/* 3CC9F0 E00C6010 24130001 */  addiu     $s3, $zero, 1
-/* 3CC9F4 E00C6014 AFB5003C */  sw        $s5, 0x3c($sp)
-/* 3CC9F8 E00C6018 8FB50098 */  lw        $s5, 0x98($sp)
-/* 3CC9FC E00C601C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3CCA00 E00C6020 AFB20030 */  sw        $s2, 0x30($sp)
-/* 3CCA04 E00C6024 8FB2009C */  lw        $s2, 0x9c($sp)
-/* 3CCA08 E00C6028 24020002 */  addiu     $v0, $zero, 2
-/* 3CCA0C E00C602C AFBF0040 */  sw        $ra, 0x40($sp)
-/* 3CCA10 E00C6030 AFB40038 */  sw        $s4, 0x38($sp)
-/* 3CCA14 E00C6034 AFB00028 */  sw        $s0, 0x28($sp)
-/* 3CCA18 E00C6038 F7BE0070 */  sdc1      $f30, 0x70($sp)
-/* 3CCA1C E00C603C F7BC0068 */  sdc1      $f28, 0x68($sp)
-/* 3CCA20 E00C6040 F7BA0060 */  sdc1      $f26, 0x60($sp)
-/* 3CCA24 E00C6044 F7B80058 */  sdc1      $f24, 0x58($sp)
-/* 3CCA28 E00C6048 F7B60050 */  sdc1      $f22, 0x50($sp)
-/* 3CCA2C E00C604C F7B40048 */  sdc1      $f20, 0x48($sp)
-/* 3CCA30 E00C6050 AFA5007C */  sw        $a1, 0x7c($sp)
-/* 3CCA34 E00C6054 AFA60080 */  sw        $a2, 0x80($sp)
-/* 3CCA38 E00C6058 16220002 */  bne       $s1, $v0, .LE00C6064
-/* 3CCA3C E00C605C AFA70084 */   sw       $a3, 0x84($sp)
-/* 3CCA40 E00C6060 24130008 */  addiu     $s3, $zero, 8
-.LE00C6064:
-/* 3CCA44 E00C6064 3C02E00C */  lui       $v0, %hi(fx_99_init)
-/* 3CCA48 E00C6068 24426394 */  addiu     $v0, $v0, %lo(fx_99_init)
-/* 3CCA4C E00C606C AFA20018 */  sw        $v0, 0x18($sp)
-/* 3CCA50 E00C6070 3C02E00C */  lui       $v0, %hi(fx_99_update)
-/* 3CCA54 E00C6074 2442639C */  addiu     $v0, $v0, %lo(fx_99_update)
-/* 3CCA58 E00C6078 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3CCA5C E00C607C 3C02E00C */  lui       $v0, %hi(fx_99_render)
-/* 3CCA60 E00C6080 24426768 */  addiu     $v0, $v0, %lo(fx_99_render)
-/* 3CCA64 E00C6084 AFA20020 */  sw        $v0, 0x20($sp)
-/* 3CCA68 E00C6088 24020063 */  addiu     $v0, $zero, 0x63
-/* 3CCA6C E00C608C AFA00010 */  sw        $zero, 0x10($sp)
-/* 3CCA70 E00C6090 AFA00024 */  sw        $zero, 0x24($sp)
-/* 3CCA74 E00C6094 0C080124 */  jal       shim_create_effect_instance
-/* 3CCA78 E00C6098 AFA20014 */   sw       $v0, 0x14($sp)
-/* 3CCA7C E00C609C 00132140 */  sll       $a0, $s3, 5
-/* 3CCA80 E00C60A0 00932023 */  subu      $a0, $a0, $s3
-/* 3CCA84 E00C60A4 00042080 */  sll       $a0, $a0, 2
-/* 3CCA88 E00C60A8 0040A02D */  daddu     $s4, $v0, $zero
-/* 3CCA8C E00C60AC 0C08012C */  jal       shim_general_heap_malloc
-/* 3CCA90 E00C60B0 AE930008 */   sw       $s3, 8($s4)
-/* 3CCA94 E00C60B4 0040802D */  daddu     $s0, $v0, $zero
-/* 3CCA98 E00C60B8 16000003 */  bnez      $s0, .LE00C60C8
-/* 3CCA9C E00C60BC AE82000C */   sw       $v0, 0xc($s4)
-.LE00C60C0:
-/* 3CCAA0 E00C60C0 08031830 */  j         .LE00C60C0
-/* 3CCAA4 E00C60C4 00000000 */   nop
-.LE00C60C8:
-/* 3CCAA8 E00C60C8 5E400003 */  bgtzl     $s2, .LE00C60D8
-/* 3CCAAC E00C60CC AE120020 */   sw       $s2, 0x20($s0)
-/* 3CCAB0 E00C60D0 240203E8 */  addiu     $v0, $zero, 0x3e8
-/* 3CCAB4 E00C60D4 AE020020 */  sw        $v0, 0x20($s0)
-.LE00C60D8:
-/* 3CCAB8 E00C60D8 C7AA007C */  lwc1      $f10, 0x7c($sp)
-/* 3CCABC E00C60DC E60A0004 */  swc1      $f10, 4($s0)
-/* 3CCAC0 E00C60E0 C7A00088 */  lwc1      $f0, 0x88($sp)
-/* 3CCAC4 E00C60E4 46005086 */  mov.s     $f2, $f10
-/* 3CCAC8 E00C60E8 AE110000 */  sw        $s1, ($s0)
-/* 3CCACC E00C60EC AE000024 */  sw        $zero, 0x24($s0)
-/* 3CCAD0 E00C60F0 AE15001C */  sw        $s5, 0x1c($s0)
-/* 3CCAD4 E00C60F4 AE000034 */  sw        $zero, 0x34($s0)
-/* 3CCAD8 E00C60F8 E6000010 */  swc1      $f0, 0x10($s0)
-/* 3CCADC E00C60FC C7AA0080 */  lwc1      $f10, 0x80($sp)
-/* 3CCAE0 E00C6100 E60A0008 */  swc1      $f10, 8($s0)
-/* 3CCAE4 E00C6104 C7AA0084 */  lwc1      $f10, 0x84($sp)
-/* 3CCAE8 E00C6108 46000206 */  mov.s     $f8, $f0
-/* 3CCAEC E00C610C E60A000C */  swc1      $f10, 0xc($s0)
-/* 3CCAF0 E00C6110 C7A0008C */  lwc1      $f0, 0x8c($sp)
-/* 3CCAF4 E00C6114 46024201 */  sub.s     $f8, $f8, $f2
-/* 3CCAF8 E00C6118 E6000014 */  swc1      $f0, 0x14($s0)
-/* 3CCAFC E00C611C C7A00090 */  lwc1      $f0, 0x90($sp)
-/* 3CCB00 E00C6120 C6020014 */  lwc1      $f2, 0x14($s0)
-/* 3CCB04 E00C6124 E6000018 */  swc1      $f0, 0x18($s0)
-/* 3CCB08 E00C6128 C7A00094 */  lwc1      $f0, 0x94($sp)
-/* 3CCB0C E00C612C 44952000 */  mtc1      $s5, $f4
-/* 3CCB10 E00C6130 00000000 */  nop
-/* 3CCB14 E00C6134 46802120 */  cvt.s.w   $f4, $f4
-/* 3CCB18 E00C6138 E6000048 */  swc1      $f0, 0x48($s0)
-/* 3CCB1C E00C613C C6000008 */  lwc1      $f0, 8($s0)
-/* 3CCB20 E00C6140 46005186 */  mov.s     $f6, $f10
-/* 3CCB24 E00C6144 46001081 */  sub.s     $f2, $f2, $f0
-/* 3CCB28 E00C6148 C6000018 */  lwc1      $f0, 0x18($s0)
-/* 3CCB2C E00C614C 46044203 */  div.s     $f8, $f8, $f4
-/* 3CCB30 E00C6150 E6080060 */  swc1      $f8, 0x60($s0)
-/* 3CCB34 E00C6154 46060001 */  sub.s     $f0, $f0, $f6
-/* 3CCB38 E00C6158 46041083 */  div.s     $f2, $f2, $f4
-/* 3CCB3C E00C615C E6020064 */  swc1      $f2, 0x64($s0)
-/* 3CCB40 E00C6160 46040003 */  div.s     $f0, $f0, $f4
-/* 3CCB44 E00C6164 1220007B */  beqz      $s1, .LE00C6354
-/* 3CCB48 E00C6168 E6000068 */   swc1     $f0, 0x68($s0)
-/* 3CCB4C E00C616C 24020001 */  addiu     $v0, $zero, 1
-/* 3CCB50 E00C6170 1622002B */  bne       $s1, $v0, .LE00C6220
-/* 3CCB54 E00C6174 24040168 */   addiu    $a0, $zero, 0x168
-/* 3CCB58 E00C6178 24040040 */  addiu     $a0, $zero, 0x40
-/* 3CCB5C E00C617C 240300FF */  addiu     $v1, $zero, 0xff
-/* 3CCB60 E00C6180 24020058 */  addiu     $v0, $zero, 0x58
-/* 3CCB64 E00C6184 AE02002C */  sw        $v0, 0x2c($s0)
-/* 3CCB68 E00C6188 24020046 */  addiu     $v0, $zero, 0x46
-/* 3CCB6C E00C618C AE020030 */  sw        $v0, 0x30($s0)
-/* 3CCB70 E00C6190 24020037 */  addiu     $v0, $zero, 0x37
-/* 3CCB74 E00C6194 AE020034 */  sw        $v0, 0x34($s0)
-/* 3CCB78 E00C6198 2402000B */  addiu     $v0, $zero, 0xb
-/* 3CCB7C E00C619C AE020038 */  sw        $v0, 0x38($s0)
-/* 3CCB80 E00C61A0 24020033 */  addiu     $v0, $zero, 0x33
-/* 3CCB84 E00C61A4 AE02003C */  sw        $v0, 0x3c($s0)
-/* 3CCB88 E00C61A8 2402007B */  addiu     $v0, $zero, 0x7b
-/* 3CCB8C E00C61AC AE030028 */  sw        $v1, 0x28($s0)
-/* 3CCB90 E00C61B0 AE020040 */  sw        $v0, 0x40($s0)
-/* 3CCB94 E00C61B4 0C080138 */  jal       shim_rand_int
-/* 3CCB98 E00C61B8 AE030044 */   sw       $v1, 0x44($s0)
-/* 3CCB9C E00C61BC 24040040 */  addiu     $a0, $zero, 0x40
-/* 3CCBA0 E00C61C0 44820000 */  mtc1      $v0, $f0
-/* 3CCBA4 E00C61C4 00000000 */  nop
-/* 3CCBA8 E00C61C8 46800020 */  cvt.s.w   $f0, $f0
-/* 3CCBAC E00C61CC 0C080138 */  jal       shim_rand_int
-/* 3CCBB0 E00C61D0 E600004C */   swc1     $f0, 0x4c($s0)
-/* 3CCBB4 E00C61D4 3C013E4C */  lui       $at, 0x3e4c
-/* 3CCBB8 E00C61D8 3421CCCD */  ori       $at, $at, 0xcccd
-/* 3CCBBC E00C61DC 44811000 */  mtc1      $at, $f2
-/* 3CCBC0 E00C61E0 3C013E99 */  lui       $at, 0x3e99
-/* 3CCBC4 E00C61E4 3421999A */  ori       $at, $at, 0x999a
-/* 3CCBC8 E00C61E8 44812000 */  mtc1      $at, $f4
-/* 3CCBCC E00C61EC 3C01C120 */  lui       $at, 0xc120
-/* 3CCBD0 E00C61F0 44813000 */  mtc1      $at, $f6
-/* 3CCBD4 E00C61F4 44820000 */  mtc1      $v0, $f0
-/* 3CCBD8 E00C61F8 00000000 */  nop
-/* 3CCBDC E00C61FC 46800020 */  cvt.s.w   $f0, $f0
-/* 3CCBE0 E00C6200 E6000050 */  swc1      $f0, 0x50($s0)
-/* 3CCBE4 E00C6204 AE000054 */  sw        $zero, 0x54($s0)
-/* 3CCBE8 E00C6208 AE000058 */  sw        $zero, 0x58($s0)
-/* 3CCBEC E00C620C AE000074 */  sw        $zero, 0x74($s0)
-/* 3CCBF0 E00C6210 E6020070 */  swc1      $f2, 0x70($s0)
-/* 3CCBF4 E00C6214 E604006C */  swc1      $f4, 0x6c($s0)
-/* 3CCBF8 E00C6218 080318D5 */  j         .LE00C6354
-/* 3CCBFC E00C621C E6060078 */   swc1     $f6, 0x78($s0)
-.LE00C6220:
-/* 3CCC00 E00C6220 240300FF */  addiu     $v1, $zero, 0xff
-/* 3CCC04 E00C6224 24020058 */  addiu     $v0, $zero, 0x58
-/* 3CCC08 E00C6228 AE02002C */  sw        $v0, 0x2c($s0)
-/* 3CCC0C E00C622C 24020046 */  addiu     $v0, $zero, 0x46
-/* 3CCC10 E00C6230 AE020030 */  sw        $v0, 0x30($s0)
-/* 3CCC14 E00C6234 24020037 */  addiu     $v0, $zero, 0x37
-/* 3CCC18 E00C6238 AE020034 */  sw        $v0, 0x34($s0)
-/* 3CCC1C E00C623C 2402000B */  addiu     $v0, $zero, 0xb
-/* 3CCC20 E00C6240 AE020038 */  sw        $v0, 0x38($s0)
-/* 3CCC24 E00C6244 24020033 */  addiu     $v0, $zero, 0x33
-/* 3CCC28 E00C6248 AE02003C */  sw        $v0, 0x3c($s0)
-/* 3CCC2C E00C624C 2402007B */  addiu     $v0, $zero, 0x7b
-/* 3CCC30 E00C6250 AE030028 */  sw        $v1, 0x28($s0)
-/* 3CCC34 E00C6254 AE020040 */  sw        $v0, 0x40($s0)
-/* 3CCC38 E00C6258 0C080138 */  jal       shim_rand_int
-/* 3CCC3C E00C625C AE030044 */   sw       $v1, 0x44($s0)
-/* 3CCC40 E00C6260 4482C000 */  mtc1      $v0, $f24
-/* 3CCC44 E00C6264 00000000 */  nop
-/* 3CCC48 E00C6268 4680C620 */  cvt.s.w   $f24, $f24
-/* 3CCC4C E00C626C 12600039 */  beqz      $s3, .LE00C6354
-/* 3CCC50 E00C6270 0000882D */   daddu    $s1, $zero, $zero
-/* 3CCC54 E00C6274 26100078 */  addiu     $s0, $s0, 0x78
-/* 3CCC58 E00C6278 0220902D */  daddu     $s2, $s1, $zero
-/* 3CCC5C E00C627C 3C014040 */  lui       $at, 0x4040
-/* 3CCC60 E00C6280 4481F000 */  mtc1      $at, $f30
-/* 3CCC64 E00C6284 3C013F80 */  lui       $at, 0x3f80
-/* 3CCC68 E00C6288 4481B000 */  mtc1      $at, $f22
-/* 3CCC6C E00C628C 3C01C234 */  lui       $at, 0xc234
-/* 3CCC70 E00C6290 4481E000 */  mtc1      $at, $f28
-/* 3CCC74 E00C6294 3C01C120 */  lui       $at, 0xc120
-/* 3CCC78 E00C6298 4481D000 */  mtc1      $at, $f26
-.LE00C629C:
-/* 3CCC7C E00C629C C7AA007C */  lwc1      $f10, 0x7c($sp)
-/* 3CCC80 E00C62A0 4492A000 */  mtc1      $s2, $f20
-/* 3CCC84 E00C62A4 00000000 */  nop
-/* 3CCC88 E00C62A8 4680A520 */  cvt.s.w   $f20, $f20
-/* 3CCC8C E00C62AC E60AFF8C */  swc1      $f10, -0x74($s0)
-/* 3CCC90 E00C62B0 C7AA0080 */  lwc1      $f10, 0x80($sp)
-/* 3CCC94 E00C62B4 4618A500 */  add.s     $f20, $f20, $f24
-/* 3CCC98 E00C62B8 E60AFF90 */  swc1      $f10, -0x70($s0)
-/* 3CCC9C E00C62BC C7AA0084 */  lwc1      $f10, 0x84($sp)
-/* 3CCCA0 E00C62C0 4600A306 */  mov.s     $f12, $f20
-/* 3CCCA4 E00C62C4 0C080140 */  jal       shim_sin_deg
-/* 3CCCA8 E00C62C8 E60AFF94 */   swc1     $f10, -0x6c($s0)
-/* 3CCCAC E00C62CC 3C0140A0 */  lui       $at, 0x40a0
-/* 3CCCB0 E00C62D0 44815000 */  mtc1      $at, $f10
-/* 3CCCB4 E00C62D4 00000000 */  nop
-/* 3CCCB8 E00C62D8 460A0002 */  mul.s     $f0, $f0, $f10
-/* 3CCCBC E00C62DC 00000000 */  nop
-/* 3CCCC0 E00C62E0 4600A306 */  mov.s     $f12, $f20
-/* 3CCCC4 E00C62E4 0C080144 */  jal       shim_cos_deg
-/* 3CCCC8 E00C62E8 E600FFE8 */   swc1     $f0, -0x18($s0)
-/* 3CCCCC E00C62EC 46000000 */  add.s     $f0, $f0, $f0
-/* 3CCCD0 E00C62F0 2652002D */  addiu     $s2, $s2, 0x2d
-/* 3CCCD4 E00C62F4 461E0000 */  add.s     $f0, $f0, $f30
-/* 3CCCD8 E00C62F8 26310001 */  addiu     $s1, $s1, 1
-/* 3CCCDC E00C62FC 24040040 */  addiu     $a0, $zero, 0x40
-/* 3CCCE0 E00C6300 0C080138 */  jal       shim_rand_int
-/* 3CCCE4 E00C6304 E600FFEC */   swc1     $f0, -0x14($s0)
-/* 3CCCE8 E00C6308 24040040 */  addiu     $a0, $zero, 0x40
-/* 3CCCEC E00C630C 44820000 */  mtc1      $v0, $f0
-/* 3CCCF0 E00C6310 00000000 */  nop
-/* 3CCCF4 E00C6314 46800020 */  cvt.s.w   $f0, $f0
-/* 3CCCF8 E00C6318 0C080138 */  jal       shim_rand_int
-/* 3CCCFC E00C631C E600FFD4 */   swc1     $f0, -0x2c($s0)
-/* 3CCD00 E00C6320 44820000 */  mtc1      $v0, $f0
-/* 3CCD04 E00C6324 00000000 */  nop
-/* 3CCD08 E00C6328 46800020 */  cvt.s.w   $f0, $f0
-/* 3CCD0C E00C632C E600FFD8 */  swc1      $f0, -0x28($s0)
-/* 3CCD10 E00C6330 E616FFF8 */  swc1      $f22, -8($s0)
-/* 3CCD14 E00C6334 E616FFF4 */  swc1      $f22, -0xc($s0)
-/* 3CCD18 E00C6338 AE00FFDC */  sw        $zero, -0x24($s0)
-/* 3CCD1C E00C633C AE00FFE0 */  sw        $zero, -0x20($s0)
-/* 3CCD20 E00C6340 E61CFFFC */  swc1      $f28, -4($s0)
-/* 3CCD24 E00C6344 E61A0000 */  swc1      $f26, ($s0)
-/* 3CCD28 E00C6348 0233102A */  slt       $v0, $s1, $s3
-/* 3CCD2C E00C634C 1440FFD3 */  bnez      $v0, .LE00C629C
-/* 3CCD30 E00C6350 2610007C */   addiu    $s0, $s0, 0x7c
-.LE00C6354:
-/* 3CCD34 E00C6354 0280102D */  daddu     $v0, $s4, $zero
-/* 3CCD38 E00C6358 8FBF0040 */  lw        $ra, 0x40($sp)
-/* 3CCD3C E00C635C 8FB5003C */  lw        $s5, 0x3c($sp)
-/* 3CCD40 E00C6360 8FB40038 */  lw        $s4, 0x38($sp)
-/* 3CCD44 E00C6364 8FB30034 */  lw        $s3, 0x34($sp)
-/* 3CCD48 E00C6368 8FB20030 */  lw        $s2, 0x30($sp)
-/* 3CCD4C E00C636C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 3CCD50 E00C6370 8FB00028 */  lw        $s0, 0x28($sp)
-/* 3CCD54 E00C6374 D7BE0070 */  ldc1      $f30, 0x70($sp)
-/* 3CCD58 E00C6378 D7BC0068 */  ldc1      $f28, 0x68($sp)
-/* 3CCD5C E00C637C D7BA0060 */  ldc1      $f26, 0x60($sp)
-/* 3CCD60 E00C6380 D7B80058 */  ldc1      $f24, 0x58($sp)
-/* 3CCD64 E00C6384 D7B60050 */  ldc1      $f22, 0x50($sp)
-/* 3CCD68 E00C6388 D7B40048 */  ldc1      $f20, 0x48($sp)
-/* 3CCD6C E00C638C 03E00008 */  jr        $ra
-/* 3CCD70 E00C6390 27BD0078 */   addiu    $sp, $sp, 0x78
diff --git a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_update.s b/ver/us/asm/nonmatchings/effects/effect_99/fx_99_update.s
deleted file mode 100644
index df463fa63d..0000000000
--- a/ver/us/asm/nonmatchings/effects/effect_99/fx_99_update.s
+++ /dev/null
@@ -1,258 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel fx_99_update
-/* 3CCD7C E00C639C 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* 3CCD80 E00C63A0 AFB20030 */  sw        $s2, 0x30($sp)
-/* 3CCD84 E00C63A4 0080902D */  daddu     $s2, $a0, $zero
-/* 3CCD88 E00C63A8 AFBF0034 */  sw        $ra, 0x34($sp)
-/* 3CCD8C E00C63AC AFB1002C */  sw        $s1, 0x2c($sp)
-/* 3CCD90 E00C63B0 AFB00028 */  sw        $s0, 0x28($sp)
-/* 3CCD94 E00C63B4 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* 3CCD98 E00C63B8 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* 3CCD9C E00C63BC 8E430000 */  lw        $v1, ($s2)
-/* 3CCDA0 E00C63C0 8E50000C */  lw        $s0, 0xc($s2)
-/* 3CCDA4 E00C63C4 30620010 */  andi      $v0, $v1, 0x10
-/* 3CCDA8 E00C63C8 8E110000 */  lw        $s1, ($s0)
-/* 3CCDAC E00C63CC 10400005 */  beqz      $v0, .LE00C63E4
-/* 3CCDB0 E00C63D0 2402FFEF */   addiu    $v0, $zero, -0x11
-/* 3CCDB4 E00C63D4 00621024 */  and       $v0, $v1, $v0
-/* 3CCDB8 E00C63D8 AE420000 */  sw        $v0, ($s2)
-/* 3CCDBC E00C63DC 24020010 */  addiu     $v0, $zero, 0x10
-/* 3CCDC0 E00C63E0 AE020020 */  sw        $v0, 0x20($s0)
-.LE00C63E4:
-/* 3CCDC4 E00C63E4 8E030020 */  lw        $v1, 0x20($s0)
-/* 3CCDC8 E00C63E8 286203E8 */  slti      $v0, $v1, 0x3e8
-/* 3CCDCC E00C63EC 10400002 */  beqz      $v0, .LE00C63F8
-/* 3CCDD0 E00C63F0 2462FFFF */   addiu    $v0, $v1, -1
-/* 3CCDD4 E00C63F4 AE020020 */  sw        $v0, 0x20($s0)
-.LE00C63F8:
-/* 3CCDD8 E00C63F8 8E020024 */  lw        $v0, 0x24($s0)
-/* 3CCDDC E00C63FC 8E030020 */  lw        $v1, 0x20($s0)
-/* 3CCDE0 E00C6400 24420001 */  addiu     $v0, $v0, 1
-/* 3CCDE4 E00C6404 AE020024 */  sw        $v0, 0x24($s0)
-/* 3CCDE8 E00C6408 24020001 */  addiu     $v0, $zero, 1
-/* 3CCDEC E00C640C 14620016 */  bne       $v1, $v0, .LE00C6468
-/* 3CCDF0 E00C6410 00000000 */   nop
-/* 3CCDF4 E00C6414 16230014 */  bne       $s1, $v1, .LE00C6468
-/* 3CCDF8 E00C6418 00000000 */   nop
-/* 3CCDFC E00C641C 0C080150 */  jal       shim_load_effect
-/* 3CCE00 E00C6420 24040063 */   addiu    $a0, $zero, 0x63
-/* 3CCE04 E00C6424 C6000010 */  lwc1      $f0, 0x10($s0)
-/* 3CCE08 E00C6428 E7A00010 */  swc1      $f0, 0x10($sp)
-/* 3CCE0C E00C642C C6000014 */  lwc1      $f0, 0x14($s0)
-/* 3CCE10 E00C6430 E7A00014 */  swc1      $f0, 0x14($sp)
-/* 3CCE14 E00C6434 3C013F80 */  lui       $at, 0x3f80
-/* 3CCE18 E00C6438 44810000 */  mtc1      $at, $f0
-/* 3CCE1C E00C643C C6020018 */  lwc1      $f2, 0x18($s0)
-/* 3CCE20 E00C6440 24020020 */  addiu     $v0, $zero, 0x20
-/* 3CCE24 E00C6444 AFA20020 */  sw        $v0, 0x20($sp)
-/* 3CCE28 E00C6448 AFA20024 */  sw        $v0, 0x24($sp)
-/* 3CCE2C E00C644C E7A0001C */  swc1      $f0, 0x1c($sp)
-/* 3CCE30 E00C6450 E7A20018 */  swc1      $f2, 0x18($sp)
-/* 3CCE34 E00C6454 8E050004 */  lw        $a1, 4($s0)
-/* 3CCE38 E00C6458 8E060008 */  lw        $a2, 8($s0)
-/* 3CCE3C E00C645C 8E07000C */  lw        $a3, 0xc($s0)
-/* 3CCE40 E00C6460 0C031800 */  jal       fx_99_main
-/* 3CCE44 E00C6464 24040002 */   addiu    $a0, $zero, 2
-.LE00C6468:
-/* 3CCE48 E00C6468 8E020020 */  lw        $v0, 0x20($s0)
-/* 3CCE4C E00C646C 04410005 */  bgez      $v0, .LE00C6484
-/* 3CCE50 E00C6470 24020001 */   addiu    $v0, $zero, 1
-/* 3CCE54 E00C6474 0C080128 */  jal       shim_remove_effect
-/* 3CCE58 E00C6478 0240202D */   daddu    $a0, $s2, $zero
-/* 3CCE5C E00C647C 080319D2 */  j         .LE00C6748
-/* 3CCE60 E00C6480 00000000 */   nop
-.LE00C6484:
-/* 3CCE64 E00C6484 8E030024 */  lw        $v1, 0x24($s0)
-/* 3CCE68 E00C6488 12220023 */  beq       $s1, $v0, .LE00C6518
-/* 3CCE6C E00C648C 2A220002 */   slti     $v0, $s1, 2
-/* 3CCE70 E00C6490 50400005 */  beql      $v0, $zero, .LE00C64A8
-/* 3CCE74 E00C6494 24020002 */   addiu    $v0, $zero, 2
-/* 3CCE78 E00C6498 12200007 */  beqz      $s1, .LE00C64B8
-/* 3CCE7C E00C649C 30620003 */   andi     $v0, $v1, 3
-/* 3CCE80 E00C64A0 080319D2 */  j         .LE00C6748
-/* 3CCE84 E00C64A4 00000000 */   nop
-.LE00C64A8:
-/* 3CCE88 E00C64A8 1222005F */  beq       $s1, $v0, .LE00C6628
-/* 3CCE8C E00C64AC 00000000 */   nop
-/* 3CCE90 E00C64B0 080319D2 */  j         .LE00C6748
-/* 3CCE94 E00C64B4 00000000 */   nop
-.LE00C64B8:
-/* 3CCE98 E00C64B8 144000A3 */  bnez      $v0, .LE00C6748
-/* 3CCE9C E00C64BC 00000000 */   nop
-/* 3CCEA0 E00C64C0 0C080150 */  jal       shim_load_effect
-/* 3CCEA4 E00C64C4 24040063 */   addiu    $a0, $zero, 0x63
-/* 3CCEA8 E00C64C8 C6000010 */  lwc1      $f0, 0x10($s0)
-/* 3CCEAC E00C64CC E7A00010 */  swc1      $f0, 0x10($sp)
-/* 3CCEB0 E00C64D0 C6000014 */  lwc1      $f0, 0x14($s0)
-/* 3CCEB4 E00C64D4 E7A00014 */  swc1      $f0, 0x14($sp)
-/* 3CCEB8 E00C64D8 3C013F80 */  lui       $at, 0x3f80
-/* 3CCEBC E00C64DC 44810000 */  mtc1      $at, $f0
-/* 3CCEC0 E00C64E0 C6020018 */  lwc1      $f2, 0x18($s0)
-/* 3CCEC4 E00C64E4 E7A0001C */  swc1      $f0, 0x1c($sp)
-/* 3CCEC8 E00C64E8 E7A20018 */  swc1      $f2, 0x18($sp)
-/* 3CCECC E00C64EC 8E02001C */  lw        $v0, 0x1c($s0)
-/* 3CCED0 E00C64F0 AFA20020 */  sw        $v0, 0x20($sp)
-/* 3CCED4 E00C64F4 8E02001C */  lw        $v0, 0x1c($s0)
-/* 3CCED8 E00C64F8 AFA20024 */  sw        $v0, 0x24($sp)
-/* 3CCEDC E00C64FC 8E050004 */  lw        $a1, 4($s0)
-/* 3CCEE0 E00C6500 8E060008 */  lw        $a2, 8($s0)
-/* 3CCEE4 E00C6504 8E07000C */  lw        $a3, 0xc($s0)
-/* 3CCEE8 E00C6508 0C031800 */  jal       fx_99_main
-/* 3CCEEC E00C650C 24040001 */   addiu    $a0, $zero, 1
-/* 3CCEF0 E00C6510 080319D2 */  j         .LE00C6748
-/* 3CCEF4 E00C6514 00000000 */   nop
-.LE00C6518:
-/* 3CCEF8 E00C6518 C6040060 */  lwc1      $f4, 0x60($s0)
-/* 3CCEFC E00C651C 3C01E00C */  lui       $at, %hi(D_E00C6CB0)
-/* 3CCF00 E00C6520 D4206CB0 */  ldc1      $f0, %lo(D_E00C6CB0)($at)
-/* 3CCF04 E00C6524 46002121 */  cvt.d.s   $f4, $f4
-/* 3CCF08 E00C6528 46202102 */  mul.d     $f4, $f4, $f0
-/* 3CCF0C E00C652C 00000000 */  nop
-/* 3CCF10 E00C6530 C6020068 */  lwc1      $f2, 0x68($s0)
-/* 3CCF14 E00C6534 460010A1 */  cvt.d.s   $f2, $f2
-/* 3CCF18 E00C6538 46201082 */  mul.d     $f2, $f2, $f0
-/* 3CCF1C E00C653C 00000000 */  nop
-/* 3CCF20 E00C6540 C60A0064 */  lwc1      $f10, 0x64($s0)
-/* 3CCF24 E00C6544 3C013F80 */  lui       $at, 0x3f80
-/* 3CCF28 E00C6548 44814000 */  mtc1      $at, $f8
-/* 3CCF2C E00C654C 00000000 */  nop
-/* 3CCF30 E00C6550 460A4201 */  sub.s     $f8, $f8, $f10
-/* 3CCF34 E00C6554 3C01E00C */  lui       $at, %hi(D_E00C6CB8)
-/* 3CCF38 E00C6558 D4206CB8 */  ldc1      $f0, %lo(D_E00C6CB8)($at)
-/* 3CCF3C E00C655C 46004221 */  cvt.d.s   $f8, $f8
-/* 3CCF40 E00C6560 46204202 */  mul.d     $f8, $f8, $f0
-/* 3CCF44 E00C6564 00000000 */  nop
-/* 3CCF48 E00C6568 C60C0070 */  lwc1      $f12, 0x70($s0)
-/* 3CCF4C E00C656C 3C013FF0 */  lui       $at, 0x3ff0
-/* 3CCF50 E00C6570 44817800 */  mtc1      $at, $f15
-/* 3CCF54 E00C6574 44807000 */  mtc1      $zero, $f14
-/* 3CCF58 E00C6578 46006321 */  cvt.d.s   $f12, $f12
-/* 3CCF5C E00C657C 462C7481 */  sub.d     $f18, $f14, $f12
-/* 3CCF60 E00C6580 3C01E00C */  lui       $at, %hi(D_E00C6CC0)
-/* 3CCF64 E00C6584 D4206CC0 */  ldc1      $f0, %lo(D_E00C6CC0)($at)
-/* 3CCF68 E00C6588 46209482 */  mul.d     $f18, $f18, $f0
-/* 3CCF6C E00C658C 00000000 */  nop
-/* 3CCF70 E00C6590 C606006C */  lwc1      $f6, 0x6c($s0)
-/* 3CCF74 E00C6594 460031A1 */  cvt.d.s   $f6, $f6
-/* 3CCF78 E00C6598 46267381 */  sub.d     $f14, $f14, $f6
-/* 3CCF7C E00C659C 3C01E00C */  lui       $at, %hi(D_E00C6CC8)
-/* 3CCF80 E00C65A0 D4206CC8 */  ldc1      $f0, %lo(D_E00C6CC8)($at)
-/* 3CCF84 E00C65A4 46207382 */  mul.d     $f14, $f14, $f0
-/* 3CCF88 E00C65A8 00000000 */  nop
-/* 3CCF8C E00C65AC C6100004 */  lwc1      $f16, 4($s0)
-/* 3CCF90 E00C65B0 46202120 */  cvt.s.d   $f4, $f4
-/* 3CCF94 E00C65B4 462010A0 */  cvt.s.d   $f2, $f2
-/* 3CCF98 E00C65B8 E6040060 */  swc1      $f4, 0x60($s0)
-/* 3CCF9C E00C65BC 46002006 */  mov.s     $f0, $f4
-/* 3CCFA0 E00C65C0 E6020068 */  swc1      $f2, 0x68($s0)
-/* 3CCFA4 E00C65C4 C6020074 */  lwc1      $f2, 0x74($s0)
-/* 3CCFA8 E00C65C8 46008400 */  add.s     $f16, $f16, $f0
-/* 3CCFAC E00C65CC C6000078 */  lwc1      $f0, 0x78($s0)
-/* 3CCFB0 E00C65D0 C604000C */  lwc1      $f4, 0xc($s0)
-/* 3CCFB4 E00C65D4 46001080 */  add.s     $f2, $f2, $f0
-/* 3CCFB8 E00C65D8 C6000068 */  lwc1      $f0, 0x68($s0)
-/* 3CCFBC E00C65DC 46002100 */  add.s     $f4, $f4, $f0
-/* 3CCFC0 E00C65E0 460052A1 */  cvt.d.s   $f10, $f10
-/* 3CCFC4 E00C65E4 C6000008 */  lwc1      $f0, 8($s0)
-/* 3CCFC8 E00C65E8 46285280 */  add.d     $f10, $f10, $f8
-/* 3CCFCC E00C65EC E6100004 */  swc1      $f16, 4($s0)
-/* 3CCFD0 E00C65F0 E6020074 */  swc1      $f2, 0x74($s0)
-/* 3CCFD4 E00C65F4 46326300 */  add.d     $f12, $f12, $f18
-/* 3CCFD8 E00C65F8 462052A0 */  cvt.s.d   $f10, $f10
-/* 3CCFDC E00C65FC E60A0064 */  swc1      $f10, 0x64($s0)
-/* 3CCFE0 E00C6600 462E3180 */  add.d     $f6, $f6, $f14
-/* 3CCFE4 E00C6604 46005086 */  mov.s     $f2, $f10
-/* 3CCFE8 E00C6608 E604000C */  swc1      $f4, 0xc($s0)
-/* 3CCFEC E00C660C 46020000 */  add.s     $f0, $f0, $f2
-/* 3CCFF0 E00C6610 46206320 */  cvt.s.d   $f12, $f12
-/* 3CCFF4 E00C6614 E60C0070 */  swc1      $f12, 0x70($s0)
-/* 3CCFF8 E00C6618 462031A0 */  cvt.s.d   $f6, $f6
-/* 3CCFFC E00C661C E606006C */  swc1      $f6, 0x6c($s0)
-/* 3CD000 E00C6620 080319D2 */  j         .LE00C6748
-/* 3CD004 E00C6624 E6000008 */   swc1     $f0, 8($s0)
-.LE00C6628:
-/* 3CD008 E00C6628 8E420008 */  lw        $v0, 8($s2)
-/* 3CD00C E00C662C 18400046 */  blez      $v0, .LE00C6748
-/* 3CD010 E00C6630 0000202D */   daddu    $a0, $zero, $zero
-/* 3CD014 E00C6634 26030074 */  addiu     $v1, $s0, 0x74
-/* 3CD018 E00C6638 3C01E00C */  lui       $at, %hi(D_E00C6CD0)
-/* 3CD01C E00C663C D4366CD0 */  ldc1      $f22, %lo(D_E00C6CD0)($at)
-/* 3CD020 E00C6640 3C01E00C */  lui       $at, %hi(D_E00C6CD8)
-/* 3CD024 E00C6644 D4346CD8 */  ldc1      $f20, %lo(D_E00C6CD8)($at)
-/* 3CD028 E00C6648 44806000 */  mtc1      $zero, $f12
-/* 3CD02C E00C664C 3C01E00C */  lui       $at, %hi(D_E00C6CE0)
-/* 3CD030 E00C6650 D4326CE0 */  ldc1      $f18, %lo(D_E00C6CE0)($at)
-/* 3CD034 E00C6654 3C01E00C */  lui       $at, %hi(D_E00C6CE8)
-/* 3CD038 E00C6658 D4306CE8 */  ldc1      $f16, %lo(D_E00C6CE8)($at)
-/* 3CD03C E00C665C 3C01E00C */  lui       $at, %hi(D_E00C6CF0)
-/* 3CD040 E00C6660 D42E6CF0 */  ldc1      $f14, %lo(D_E00C6CF0)($at)
-.LE00C6664:
-/* 3CD044 E00C6664 C462FFEC */  lwc1      $f2, -0x14($v1)
-/* 3CD048 E00C6668 460010A1 */  cvt.d.s   $f2, $f2
-/* 3CD04C E00C666C 46361082 */  mul.d     $f2, $f2, $f22
-/* 3CD050 E00C6670 00000000 */  nop
-/* 3CD054 E00C6674 C460FFF0 */  lwc1      $f0, -0x10($v1)
-/* 3CD058 E00C6678 46000021 */  cvt.d.s   $f0, $f0
-/* 3CD05C E00C667C 46340001 */  sub.d     $f0, $f0, $f20
-/* 3CD060 E00C6680 C464FF94 */  lwc1      $f4, -0x6c($v1)
-/* 3CD064 E00C6684 46200020 */  cvt.s.d   $f0, $f0
-/* 3CD068 E00C6688 46002100 */  add.s     $f4, $f4, $f0
-/* 3CD06C E00C668C E460FFF0 */  swc1      $f0, -0x10($v1)
-/* 3CD070 E00C6690 462010A0 */  cvt.s.d   $f2, $f2
-/* 3CD074 E00C6694 E462FFEC */  swc1      $f2, -0x14($v1)
-/* 3CD078 E00C6698 C462FF90 */  lwc1      $f2, -0x70($v1)
-/* 3CD07C E00C669C C460FFEC */  lwc1      $f0, -0x14($v1)
-/* 3CD080 E00C66A0 46001080 */  add.s     $f2, $f2, $f0
-/* 3CD084 E00C66A4 460C203C */  c.lt.s    $f4, $f12
-/* 3CD088 E00C66A8 E464FF94 */  swc1      $f4, -0x6c($v1)
-/* 3CD08C E00C66AC 4500000B */  bc1f      .LE00C66DC
-/* 3CD090 E00C66B0 E462FF90 */   swc1     $f2, -0x70($v1)
-/* 3CD094 E00C66B4 C460FFF0 */  lwc1      $f0, -0x10($v1)
-/* 3CD098 E00C66B8 460C003C */  c.lt.s    $f0, $f12
-/* 3CD09C E00C66BC 00000000 */  nop
-/* 3CD0A0 E00C66C0 45000006 */  bc1f      .LE00C66DC
-/* 3CD0A4 E00C66C4 E46CFF94 */   swc1     $f12, -0x6c($v1)
-/* 3CD0A8 E00C66C8 46000021 */  cvt.d.s   $f0, $f0
-/* 3CD0AC E00C66CC 46320002 */  mul.d     $f0, $f0, $f18
-/* 3CD0B0 E00C66D0 00000000 */  nop
-/* 3CD0B4 E00C66D4 46200020 */  cvt.s.d   $f0, $f0
-/* 3CD0B8 E00C66D8 E460FFF0 */  swc1      $f0, -0x10($v1)
-.LE00C66DC:
-/* 3CD0BC E00C66DC C462FFFC */  lwc1      $f2, -4($v1)
-/* 3CD0C0 E00C66E0 46026201 */  sub.s     $f8, $f12, $f2
-/* 3CD0C4 E00C66E4 46004221 */  cvt.d.s   $f8, $f8
-/* 3CD0C8 E00C66E8 46304202 */  mul.d     $f8, $f8, $f16
-/* 3CD0CC E00C66EC 00000000 */  nop
-/* 3CD0D0 E00C66F0 C460FFF8 */  lwc1      $f0, -8($v1)
-/* 3CD0D4 E00C66F4 46006181 */  sub.s     $f6, $f12, $f0
-/* 3CD0D8 E00C66F8 460031A1 */  cvt.d.s   $f6, $f6
-/* 3CD0DC E00C66FC 462E3182 */  mul.d     $f6, $f6, $f14
-/* 3CD0E0 E00C6700 00000000 */  nop
-/* 3CD0E4 E00C6704 C46A0000 */  lwc1      $f10, ($v1)
-/* 3CD0E8 E00C6708 C4640004 */  lwc1      $f4, 4($v1)
-/* 3CD0EC E00C670C 46045280 */  add.s     $f10, $f10, $f4
-/* 3CD0F0 E00C6710 460010A1 */  cvt.d.s   $f2, $f2
-/* 3CD0F4 E00C6714 46281080 */  add.d     $f2, $f2, $f8
-/* 3CD0F8 E00C6718 24840001 */  addiu     $a0, $a0, 1
-/* 3CD0FC E00C671C 46000021 */  cvt.d.s   $f0, $f0
-/* 3CD100 E00C6720 46260000 */  add.d     $f0, $f0, $f6
-/* 3CD104 E00C6724 E46A0000 */  swc1      $f10, ($v1)
-/* 3CD108 E00C6728 462010A0 */  cvt.s.d   $f2, $f2
-/* 3CD10C E00C672C 46200020 */  cvt.s.d   $f0, $f0
-/* 3CD110 E00C6730 E462FFFC */  swc1      $f2, -4($v1)
-/* 3CD114 E00C6734 E460FFF8 */  swc1      $f0, -8($v1)
-/* 3CD118 E00C6738 8E420008 */  lw        $v0, 8($s2)
-/* 3CD11C E00C673C 0082102A */  slt       $v0, $a0, $v0
-/* 3CD120 E00C6740 1440FFC8 */  bnez      $v0, .LE00C6664
-/* 3CD124 E00C6744 2463007C */   addiu    $v1, $v1, 0x7c
-.LE00C6748:
-/* 3CD128 E00C6748 8FBF0034 */  lw        $ra, 0x34($sp)
-/* 3CD12C E00C674C 8FB20030 */  lw        $s2, 0x30($sp)
-/* 3CD130 E00C6750 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 3CD134 E00C6754 8FB00028 */  lw        $s0, 0x28($sp)
-/* 3CD138 E00C6758 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* 3CD13C E00C675C D7B40038 */  ldc1      $f20, 0x38($sp)
-/* 3CD140 E00C6760 03E00008 */  jr        $ra
-/* 3CD144 E00C6764 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_appendGfx.s b/ver/us/asm/nonmatchings/effects/embers/embers_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_112/fx_112_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/embers/embers_appendGfx.s
index c87727628f..cb49c12967 100644
--- a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/embers/embers_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_112_appendGfx
+glabel embers_appendGfx
 /* 3DBA60 E00E0600 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3DBA64 E00E0604 AFBE00B0 */  sw        $fp, 0xb0($sp)
 /* 3DBA68 E00E0608 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s b/ver/us/asm/nonmatchings/effects/embers/embers_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s
rename to ver/us/asm/nonmatchings/effects/embers/embers_main.s
index 8902ff95bd..68bfc5d843 100644
--- a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_main.s
+++ b/ver/us/asm/nonmatchings/effects/embers/embers_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_112_main
+glabel embers_main
 /* 3DB460 E00E0000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3DB464 E00E0004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3DB468 E00E0008 4485A000 */  mtc1      $a1, $f20
@@ -16,14 +16,14 @@ glabel fx_112_main
 /* 3DB48C E00E002C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3DB490 E00E0030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3DB494 E00E0034 8FB20078 */  lw        $s2, 0x78($sp)
-/* 3DB498 E00E0038 3C02E00E */  lui       $v0, %hi(fx_112_init)
-/* 3DB49C E00E003C 244201D0 */  addiu     $v0, $v0, %lo(fx_112_init)
+/* 3DB498 E00E0038 3C02E00E */  lui       $v0, %hi(embers_init)
+/* 3DB49C E00E003C 244201D0 */  addiu     $v0, $v0, %lo(embers_init)
 /* 3DB4A0 E00E0040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3DB4A4 E00E0044 3C02E00E */  lui       $v0, %hi(fx_112_update)
-/* 3DB4A8 E00E0048 244201D8 */  addiu     $v0, $v0, %lo(fx_112_update)
+/* 3DB4A4 E00E0044 3C02E00E */  lui       $v0, %hi(embers_update)
+/* 3DB4A8 E00E0048 244201D8 */  addiu     $v0, $v0, %lo(embers_update)
 /* 3DB4AC E00E004C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3DB4B0 E00E0050 3C02E00E */  lui       $v0, %hi(fx_112_render)
-/* 3DB4B4 E00E0054 244205B0 */  addiu     $v0, $v0, %lo(fx_112_render)
+/* 3DB4B0 E00E0050 3C02E00E */  lui       $v0, %hi(embers_render)
+/* 3DB4B4 E00E0054 244205B0 */  addiu     $v0, $v0, %lo(embers_render)
 /* 3DB4B8 E00E0058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3DB4BC E00E005C 24020070 */  addiu     $v0, $zero, 0x70
 /* 3DB4C0 E00E0060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_update.s b/ver/us/asm/nonmatchings/effects/embers/embers_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_112/fx_112_update.s
rename to ver/us/asm/nonmatchings/effects/embers/embers_update.s
index 9c13868f2f..7f6109004c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_112/fx_112_update.s
+++ b/ver/us/asm/nonmatchings/effects/embers/embers_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_112_update
+glabel embers_update
 /* 3DB638 E00E01D8 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3DB63C E00E01DC AFB20020 */  sw        $s2, 0x20($sp)
 /* 3DB640 E00E01E0 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s b/ver/us/asm/nonmatchings/effects/emote/emote_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/emote/emote_appendGfx.s
index d2754e68a8..b96833573e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_16/fx_16_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/emote/emote_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_16_appendGfx
+glabel emote_appendGfx
 /* 334490 E00205D0 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 334494 E00205D4 3C06DB06 */  lui       $a2, 0xdb06
 /* 334498 E00205D8 AFB600C0 */  sw        $s6, 0xc0($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_16/func_E0020000.s b/ver/us/asm/nonmatchings/effects/emote/func_E0020000.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_16/func_E0020000.s
rename to ver/us/asm/nonmatchings/effects/emote/func_E0020000.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_appendGfx.s b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_52/fx_52_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_appendGfx.s
index 87b13efa11..0bc55ff80c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_52_appendGfx
+glabel ending_decals_appendGfx
 /* 36AB04 E0068234 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 36AB08 E0068238 3C07DB06 */  lui       $a3, 0xdb06
 /* 36AB0C E006823C AFB10064 */  sw        $s1, 0x64($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s
rename to ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_main.s
index 3147f09a85..7a53f1fa03 100644
--- a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_main.s
+++ b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_52_main
+glabel ending_decals_main
 /* 36A8D0 E0068000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 36A8D4 E0068004 F7B60040 */  sdc1      $f22, 0x40($sp)
 /* 36A8D8 E0068008 4485B000 */  mtc1      $a1, $f22
@@ -14,14 +14,14 @@ glabel fx_52_main
 /* 36A8F4 E0068024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 36A8F8 E0068028 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 36A8FC E006802C C7B40068 */  lwc1      $f20, 0x68($sp)
-/* 36A900 E0068030 3C02E007 */  lui       $v0, %hi(fx_52_init)
-/* 36A904 E0068034 24428140 */  addiu     $v0, $v0, %lo(fx_52_init)
+/* 36A900 E0068030 3C02E007 */  lui       $v0, %hi(ending_decals_init)
+/* 36A904 E0068034 24428140 */  addiu     $v0, $v0, %lo(ending_decals_init)
 /* 36A908 E0068038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 36A90C E006803C 3C02E007 */  lui       $v0, %hi(fx_52_update)
-/* 36A910 E0068040 24428148 */  addiu     $v0, $v0, %lo(fx_52_update)
+/* 36A90C E006803C 3C02E007 */  lui       $v0, %hi(ending_decals_update)
+/* 36A910 E0068040 24428148 */  addiu     $v0, $v0, %lo(ending_decals_update)
 /* 36A914 E0068044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 36A918 E0068048 3C02E007 */  lui       $v0, %hi(fx_52_render)
-/* 36A91C E006804C 244281D8 */  addiu     $v0, $v0, %lo(fx_52_render)
+/* 36A918 E0068048 3C02E007 */  lui       $v0, %hi(ending_decals_render)
+/* 36A91C E006804C 244281D8 */  addiu     $v0, $v0, %lo(ending_decals_render)
 /* 36A920 E0068050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36A924 E0068054 24020034 */  addiu     $v0, $zero, 0x34
 /* 36A928 E0068058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_update.s b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_52/fx_52_update.s
rename to ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_update.s
index abc7a18048..113b330e3e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_52/fx_52_update.s
+++ b/ver/us/asm/nonmatchings/effects/ending_decals/ending_decals_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_52_update
+glabel ending_decals_update
 /* 36AA18 E0068148 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 36AA1C E006814C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 36AA20 E0068150 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_appendGfx.s b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_107/fx_107_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_appendGfx.s
index 146bdfd8ba..944cb8c478 100644
--- a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_107_appendGfx
+glabel energy_in_out_appendGfx
 /* 3D59A0 E00D6980 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 3D59A4 E00D6984 3C08DB06 */  lui       $t0, 0xdb06
 /* 3D59A8 E00D6988 AFB200B8 */  sw        $s2, 0xb8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_main.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s
rename to ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_main.s
index a615edb962..e4e607cd19 100644
--- a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_main.s
+++ b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_107_main
+glabel energy_in_out_main
 /* 3D5020 E00D6000 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 3D5024 E00D6004 F7B40060 */  sdc1      $f20, 0x60($sp)
 /* 3D5028 E00D6008 4485A000 */  mtc1      $a1, $f20
@@ -27,14 +27,14 @@ glabel fx_107_main
 /* 3D5078 E00D6058 3C08E00D */  lui       $t0, %hi(D_E00D6E74)
 /* 3D507C E00D605C 01174021 */  addu      $t0, $t0, $s7
 /* 3D5080 E00D6060 91086E74 */  lbu       $t0, %lo(D_E00D6E74)($t0)
-/* 3D5084 E00D6064 3C02E00D */  lui       $v0, %hi(fx_107_init)
-/* 3D5088 E00D6068 24426718 */  addiu     $v0, $v0, %lo(fx_107_init)
+/* 3D5084 E00D6064 3C02E00D */  lui       $v0, %hi(energy_in_out_init)
+/* 3D5088 E00D6068 24426718 */  addiu     $v0, $v0, %lo(energy_in_out_init)
 /* 3D508C E00D606C AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D5090 E00D6070 3C02E00D */  lui       $v0, %hi(fx_107_update)
-/* 3D5094 E00D6074 24426720 */  addiu     $v0, $v0, %lo(fx_107_update)
+/* 3D5090 E00D6070 3C02E00D */  lui       $v0, %hi(energy_in_out_update)
+/* 3D5094 E00D6074 24426720 */  addiu     $v0, $v0, %lo(energy_in_out_update)
 /* 3D5098 E00D6078 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D509C E00D607C 3C02E00D */  lui       $v0, %hi(fx_107_render)
-/* 3D50A0 E00D6080 2442693C */  addiu     $v0, $v0, %lo(fx_107_render)
+/* 3D509C E00D607C 3C02E00D */  lui       $v0, %hi(energy_in_out_render)
+/* 3D50A0 E00D6080 2442693C */  addiu     $v0, $v0, %lo(energy_in_out_render)
 /* 3D50A4 E00D6084 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D50A8 E00D6088 2402006B */  addiu     $v0, $zero, 0x6b
 /* 3D50AC E00D608C AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_update.s b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_107/fx_107_update.s
rename to ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_update.s
index c6b559b651..02b66bf431 100644
--- a/ver/us/asm/nonmatchings/effects/effect_107/fx_107_update.s
+++ b/ver/us/asm/nonmatchings/effects/energy_in_out/energy_in_out_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_107_update
+glabel energy_in_out_update
 /* 3D5740 E00D6720 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3D5744 E00D6724 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3D5748 E00D6728 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_appendGfx.s b/ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_82/fx_82_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_appendGfx.s
index 7c8e4430f6..b83de89242 100644
--- a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_82_appendGfx
+glabel energy_orb_wave_appendGfx
 /* 3A3E30 E00A4650 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3A3E34 E00A4654 0080302D */  daddu     $a2, $a0, $zero
 /* 3A3E38 E00A4658 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s b/ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s
rename to ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_main.s
index 7d1f9531c5..8e573f42c9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_main.s
+++ b/ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_main.s
@@ -10,7 +10,7 @@ dlabel D_E00A4AF0
 .double 0.1
 
 .section .text
-glabel fx_82_main
+glabel energy_orb_wave_main
 /* 3A37E0 E00A4000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3A37E4 E00A4004 F7B60040 */  sdc1      $f22, 0x40($sp)
 /* 3A37E8 E00A4008 4485B000 */  mtc1      $a1, $f22
@@ -25,14 +25,14 @@ glabel fx_82_main
 /* 3A380C E00A402C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A3810 E00A4030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3A3814 E00A4034 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3A3818 E00A4038 3C02E00A */  lui       $v0, %hi(fx_82_init)
-/* 3A381C E00A403C 244241A4 */  addiu     $v0, $v0, %lo(fx_82_init)
+/* 3A3818 E00A4038 3C02E00A */  lui       $v0, %hi(energy_orb_wave_init)
+/* 3A381C E00A403C 244241A4 */  addiu     $v0, $v0, %lo(energy_orb_wave_init)
 /* 3A3820 E00A4040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A3824 E00A4044 3C02E00A */  lui       $v0, %hi(fx_82_update)
-/* 3A3828 E00A4048 244241AC */  addiu     $v0, $v0, %lo(fx_82_update)
+/* 3A3824 E00A4044 3C02E00A */  lui       $v0, %hi(energy_orb_wave_update)
+/* 3A3828 E00A4048 244241AC */  addiu     $v0, $v0, %lo(energy_orb_wave_update)
 /* 3A382C E00A404C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A3830 E00A4050 3C02E00A */  lui       $v0, %hi(fx_82_render)
-/* 3A3834 E00A4054 244245DC */  addiu     $v0, $v0, %lo(fx_82_render)
+/* 3A3830 E00A4050 3C02E00A */  lui       $v0, %hi(energy_orb_wave_render)
+/* 3A3834 E00A4054 244245DC */  addiu     $v0, $v0, %lo(energy_orb_wave_render)
 /* 3A3838 E00A4058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A383C E00A405C 24020052 */  addiu     $v0, $zero, 0x52
 /* 3A3840 E00A4060 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_update.s b/ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_82/fx_82_update.s
rename to ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_update.s
index 0d0c44cab7..28c07ede9a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_82/fx_82_update.s
+++ b/ver/us/asm/nonmatchings/effects/energy_orb_wave/energy_orb_wave_update.s
@@ -19,7 +19,7 @@ dlabel D_E00A4B38
 .double 1.1
 
 .section .text
-glabel fx_82_update
+glabel energy_orb_wave_update
 /* 3A398C E00A41AC 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 3A3990 E00A41B0 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 3A3994 E00A41B4 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_appendGfx.s b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_57/fx_57_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_appendGfx.s
index 155278ddb2..ad9c2d8f6e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_57_appendGfx
+glabel energy_shockwave_appendGfx
 /* 375224 E00723D4 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 375228 E00723D8 3C03DB06 */  lui       $v1, 0xdb06
 /* 37522C E00723DC 34630024 */  ori       $v1, $v1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_main.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s
rename to ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_main.s
index f9696a59b0..74b7395d8f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_main.s
+++ b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_57_main
+glabel energy_shockwave_main
 /* 374E50 E0072000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 374E54 E0072004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 374E58 E0072008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_57_main
 /* 374E6C E007201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 374E70 E0072020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 374E74 E0072024 4487C000 */  mtc1      $a3, $f24
-/* 374E78 E0072028 3C02E007 */  lui       $v0, %hi(fx_57_init)
-/* 374E7C E007202C 24422148 */  addiu     $v0, $v0, %lo(fx_57_init)
+/* 374E78 E0072028 3C02E007 */  lui       $v0, %hi(energy_shockwave_init)
+/* 374E7C E007202C 24422148 */  addiu     $v0, $v0, %lo(energy_shockwave_init)
 /* 374E80 E0072030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 374E84 E0072034 3C02E007 */  lui       $v0, %hi(fx_57_update)
-/* 374E88 E0072038 24422150 */  addiu     $v0, $v0, %lo(fx_57_update)
+/* 374E84 E0072034 3C02E007 */  lui       $v0, %hi(energy_shockwave_update)
+/* 374E88 E0072038 24422150 */  addiu     $v0, $v0, %lo(energy_shockwave_update)
 /* 374E8C E007203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 374E90 E0072040 3C02E007 */  lui       $v0, %hi(fx_57_render)
-/* 374E94 E0072044 2442238C */  addiu     $v0, $v0, %lo(fx_57_render)
+/* 374E90 E0072040 3C02E007 */  lui       $v0, %hi(energy_shockwave_render)
+/* 374E94 E0072044 2442238C */  addiu     $v0, $v0, %lo(energy_shockwave_render)
 /* 374E98 E0072048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 374E9C E007204C 24020039 */  addiu     $v0, $zero, 0x39
 /* 374EA0 E0072050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_update.s b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_57/fx_57_update.s
rename to ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_update.s
index b4ecb45d24..3a8399bc56 100644
--- a/ver/us/asm/nonmatchings/effects/effect_57/fx_57_update.s
+++ b/ver/us/asm/nonmatchings/effects/energy_shockwave/energy_shockwave_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_57_update
+glabel energy_shockwave_update
 /* 374FA0 E0072150 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 374FA4 E0072154 AFBF002C */  sw        $ra, 0x2c($sp)
 /* 374FA8 E0072158 AFB20028 */  sw        $s2, 0x28($sp)
@@ -52,7 +52,7 @@ glabel fx_57_update
 /* 375058 E0072208 8E050004 */  lw        $a1, 4($s0)
 /* 37505C E007220C 8E060008 */  lw        $a2, 8($s0)
 /* 375060 E0072210 8E07000C */  lw        $a3, 0xc($s0)
-/* 375064 E0072214 0C01D000 */  jal       fx_58_main
+/* 375064 E0072214 0C01D000 */  jal       shimmer_wave_main
 /* 375068 E0072218 0000202D */   daddu    $a0, $zero, $zero
 .LE007221C:
 /* 37506C E007221C C600001C */  lwc1      $f0, 0x1c($s0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_appendGfx.s b/ver/us/asm/nonmatchings/effects/explosion/explosion_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_25/fx_25_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/explosion/explosion_appendGfx.s
index 1c6183f489..6dc0b31069 100644
--- a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/explosion/explosion_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_25_appendGfx
+glabel explosion_appendGfx
 /* 343ADC E003245C 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 343AE0 E0032460 0080302D */  daddu     $a2, $a0, $zero
 /* 343AE4 E0032464 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s b/ver/us/asm/nonmatchings/effects/explosion/explosion_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s
rename to ver/us/asm/nonmatchings/effects/explosion/explosion_main.s
index 0c9a811067..4d2ed49ecf 100644
--- a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_main.s
+++ b/ver/us/asm/nonmatchings/effects/explosion/explosion_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_25_main
+glabel explosion_main
 /* 343680 E0032000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 343684 E0032004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 343688 E0032008 4485A000 */  mtc1      $a1, $f20
@@ -12,17 +12,17 @@ glabel fx_25_main
 /* 34369C E003201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3436A0 E0032020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3436A4 E0032024 4487C000 */  mtc1      $a3, $f24
-/* 3436A8 E0032028 3C02E003 */  lui       $v0, %hi(fx_25_init)
-/* 3436AC E003202C 244221D0 */  addiu     $v0, $v0, %lo(fx_25_init)
+/* 3436A8 E0032028 3C02E003 */  lui       $v0, %hi(explosion_init)
+/* 3436AC E003202C 244221D0 */  addiu     $v0, $v0, %lo(explosion_init)
 /* 3436B0 E0032030 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 3436B4 E0032034 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3436B8 E0032038 AFA00010 */  sw        $zero, 0x10($sp)
 /* 3436BC E003203C AC820008 */  sw        $v0, 8($a0)
-/* 3436C0 E0032040 3C02E003 */  lui       $v0, %hi(fx_25_update)
-/* 3436C4 E0032044 244221D8 */  addiu     $v0, $v0, %lo(fx_25_update)
+/* 3436C0 E0032040 3C02E003 */  lui       $v0, %hi(explosion_update)
+/* 3436C4 E0032044 244221D8 */  addiu     $v0, $v0, %lo(explosion_update)
 /* 3436C8 E0032048 AC82000C */  sw        $v0, 0xc($a0)
-/* 3436CC E003204C 3C02E003 */  lui       $v0, %hi(fx_25_render)
-/* 3436D0 E0032050 24422420 */  addiu     $v0, $v0, %lo(fx_25_render)
+/* 3436CC E003204C 3C02E003 */  lui       $v0, %hi(explosion_render)
+/* 3436D0 E0032050 24422420 */  addiu     $v0, $v0, %lo(explosion_render)
 /* 3436D4 E0032054 AC820010 */  sw        $v0, 0x10($a0)
 /* 3436D8 E0032058 24020019 */  addiu     $v0, $zero, 0x19
 /* 3436DC E003205C AC800014 */  sw        $zero, 0x14($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_update.s b/ver/us/asm/nonmatchings/effects/explosion/explosion_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_25/fx_25_update.s
rename to ver/us/asm/nonmatchings/effects/explosion/explosion_update.s
index a8135b7dc8..8a0b2f4636 100644
--- a/ver/us/asm/nonmatchings/effects/effect_25/fx_25_update.s
+++ b/ver/us/asm/nonmatchings/effects/explosion/explosion_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_25_update
+glabel explosion_update
 /* 343858 E00321D8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 34385C E00321DC AFBF0024 */  sw        $ra, 0x24($sp)
 /* 343860 E00321E0 AFB20020 */  sw        $s2, 0x20($sp)
@@ -30,7 +30,7 @@ glabel fx_25_update
 /* 3438B8 E0032238 8E050004 */  lw        $a1, 4($s0)
 /* 3438BC E003223C 8E060008 */  lw        $a2, 8($s0)
 /* 3438C0 E0032240 8E07000C */  lw        $a3, 0xc($s0)
-/* 3438C4 E0032244 0C00B800 */  jal       fx_23_main
+/* 3438C4 E0032244 0C00B800 */  jal       smoke_ring_main
 /* 3438C8 E0032248 0220202D */   daddu    $a0, $s1, $zero
 /* 3438CC E003224C 0800C8A4 */  j         .LE0032290
 /* 3438D0 E0032250 2610003C */   addiu    $s0, $s0, 0x3c
@@ -47,7 +47,7 @@ glabel fx_25_update
 /* 3438F8 E0032278 8E050004 */  lw        $a1, 4($s0)
 /* 3438FC E003227C 8E060008 */  lw        $a2, 8($s0)
 /* 343900 E0032280 8E07000C */  lw        $a3, 0xc($s0)
-/* 343904 E0032284 0C02205F */  jal       fx_68_main
+/* 343904 E0032284 0C02205F */  jal       confetti_main
 /* 343908 E0032288 26240004 */   addiu    $a0, $s1, 4
 /* 34390C E003228C 2610003C */  addiu     $s0, $s0, 0x3c
 .LE0032290:
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_appendGfx.s b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_44/fx_44_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_appendGfx.s
index 63523b69c6..3b1ee6d8a3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_44_appendGfx
+glabel falling_leaves_appendGfx
 /* 35EDF4 E00584D4 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 35EDF8 E00584D8 AFB700F4 */  sw        $s7, 0xf4($sp)
 /* 35EDFC E00584DC 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s
rename to ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_main.s
index 2a7cf4fbc8..fcd242d530 100644
--- a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_main.s
+++ b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_44_main
+glabel falling_leaves_main
 /* 35E920 E0058000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 35E924 E0058004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 35E928 E0058008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_44_main
 /* 35E93C E005801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35E940 E0058020 F7B80050 */  sdc1      $f24, 0x50($sp)
 /* 35E944 E0058024 4487C000 */  mtc1      $a3, $f24
-/* 35E948 E0058028 3C02E006 */  lui       $v0, %hi(fx_44_init)
-/* 35E94C E005802C 244281AC */  addiu     $v0, $v0, %lo(fx_44_init)
+/* 35E948 E0058028 3C02E006 */  lui       $v0, %hi(falling_leaves_init)
+/* 35E94C E005802C 244281AC */  addiu     $v0, $v0, %lo(falling_leaves_init)
 /* 35E950 E0058030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35E954 E0058034 3C02E006 */  lui       $v0, %hi(fx_44_update)
-/* 35E958 E0058038 244281B4 */  addiu     $v0, $v0, %lo(fx_44_update)
+/* 35E954 E0058034 3C02E006 */  lui       $v0, %hi(falling_leaves_update)
+/* 35E958 E0058038 244281B4 */  addiu     $v0, $v0, %lo(falling_leaves_update)
 /* 35E95C E005803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35E960 E0058040 3C02E006 */  lui       $v0, %hi(fx_44_render)
-/* 35E964 E0058044 24428490 */  addiu     $v0, $v0, %lo(fx_44_render)
+/* 35E960 E0058040 3C02E006 */  lui       $v0, %hi(falling_leaves_render)
+/* 35E964 E0058044 24428490 */  addiu     $v0, $v0, %lo(falling_leaves_render)
 /* 35E968 E0058048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35E96C E005804C 2402002C */  addiu     $v0, $zero, 0x2c
 /* 35E970 E0058050 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_update.s b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_44/fx_44_update.s
rename to ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_update.s
index cd782e6320..9110eb3fdc 100644
--- a/ver/us/asm/nonmatchings/effects/effect_44/fx_44_update.s
+++ b/ver/us/asm/nonmatchings/effects/falling_leaves/falling_leaves_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_44_update
+glabel falling_leaves_update
 /* 35EAD4 E00581B4 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 35EAD8 E00581B8 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 35EADC E00581BC 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_appendGfx.s b/ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_55/fx_55_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_appendGfx.s
index b8856fd581..df608c8f6f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_55_appendGfx
+glabel fire_breath_appendGfx
 /* 372EF4 E006E764 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 372EF8 E006E768 3C07DB06 */  lui       $a3, 0xdb06
 /* 372EFC E006E76C AFB500B4 */  sw        $s5, 0xb4($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s b/ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_main.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s
rename to ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_main.s
index 234c8370dd..545c03f178 100644
--- a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_main.s
+++ b/ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_55_main
+glabel fire_breath_main
 /* 372790 E006E000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 372794 E006E004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 372798 E006E008 4485A000 */  mtc1      $a1, $f20
@@ -22,14 +22,14 @@ glabel fx_55_main
 /* 3727D4 E006E044 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3727D8 E006E048 AFB40038 */  sw        $s4, 0x38($sp)
 /* 3727DC E006E04C 8FB40094 */  lw        $s4, 0x94($sp)
-/* 3727E0 E006E050 3C02E007 */  lui       $v0, %hi(fx_55_init)
-/* 3727E4 E006E054 2442E354 */  addiu     $v0, $v0, %lo(fx_55_init)
+/* 3727E0 E006E050 3C02E007 */  lui       $v0, %hi(fire_breath_init)
+/* 3727E4 E006E054 2442E354 */  addiu     $v0, $v0, %lo(fire_breath_init)
 /* 3727E8 E006E058 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3727EC E006E05C 3C02E007 */  lui       $v0, %hi(fx_55_update)
-/* 3727F0 E006E060 2442E35C */  addiu     $v0, $v0, %lo(fx_55_update)
+/* 3727EC E006E05C 3C02E007 */  lui       $v0, %hi(fire_breath_update)
+/* 3727F0 E006E060 2442E35C */  addiu     $v0, $v0, %lo(fire_breath_update)
 /* 3727F4 E006E064 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3727F8 E006E068 3C02E007 */  lui       $v0, %hi(fx_55_render)
-/* 3727FC E006E06C 2442E6E4 */  addiu     $v0, $v0, %lo(fx_55_render)
+/* 3727F8 E006E068 3C02E007 */  lui       $v0, %hi(fire_breath_render)
+/* 3727FC E006E06C 2442E6E4 */  addiu     $v0, $v0, %lo(fire_breath_render)
 /* 372800 E006E070 AFA20020 */  sw        $v0, 0x20($sp)
 /* 372804 E006E074 24020037 */  addiu     $v0, $zero, 0x37
 /* 372808 E006E078 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_update.s b/ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_55/fx_55_update.s
rename to ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_update.s
index 0d5876136b..64f6894a85 100644
--- a/ver/us/asm/nonmatchings/effects/effect_55/fx_55_update.s
+++ b/ver/us/asm/nonmatchings/effects/fire_breath/fire_breath_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_55_update
+glabel fire_breath_update
 /* 372AEC E006E35C 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 372AF0 E006E360 AFBF0034 */  sw        $ra, 0x34($sp)
 /* 372AF4 E006E364 AFB20030 */  sw        $s2, 0x30($sp)
@@ -130,7 +130,7 @@ glabel fx_55_update
 /* 372CD4 E006E544 8E040000 */  lw        $a0, ($s0)
 /* 372CD8 E006E548 8E050018 */  lw        $a1, 0x18($s0)
 /* 372CDC E006E54C 8E06001C */  lw        $a2, 0x1c($s0)
-/* 372CE0 E006E550 0C01B800 */  jal       fx_55_main
+/* 372CE0 E006E550 0C01B800 */  jal       fire_breath_main
 /* 372CE4 E006E554 8E070020 */   lw       $a3, 0x20($s0)
 /* 372CE8 E006E558 8C44000C */  lw        $a0, 0xc($v0)
 /* 372CEC E006E55C 8E030064 */  lw        $v1, 0x64($s0)
diff --git a/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_appendGfx.s b/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_appendGfx.s
new file mode 100644
index 0000000000..591e989689
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_appendGfx.s
@@ -0,0 +1,450 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel fire_flower_appendGfx
+/* 37FC6C E007E54C 27BDFF18 */  addiu     $sp, $sp, -0xe8
+/* 37FC70 E007E550 3C06DB06 */  lui       $a2, 0xdb06
+/* 37FC74 E007E554 34C60024 */  ori       $a2, $a2, 0x24
+/* 37FC78 E007E558 AFA400E8 */  sw        $a0, 0xe8($sp)
+/* 37FC7C E007E55C 27A40018 */  addiu     $a0, $sp, 0x18
+/* 37FC80 E007E560 AFB600B8 */  sw        $s6, 0xb8($sp)
+/* 37FC84 E007E564 3C16800A */  lui       $s6, %hi(gMasterGfxPos)
+/* 37FC88 E007E568 26D6A66C */  addiu     $s6, $s6, %lo(gMasterGfxPos)
+/* 37FC8C E007E56C AFBF00C4 */  sw        $ra, 0xc4($sp)
+/* 37FC90 E007E570 AFBE00C0 */  sw        $fp, 0xc0($sp)
+/* 37FC94 E007E574 AFB700BC */  sw        $s7, 0xbc($sp)
+/* 37FC98 E007E578 AFB500B4 */  sw        $s5, 0xb4($sp)
+/* 37FC9C E007E57C AFB400B0 */  sw        $s4, 0xb0($sp)
+/* 37FCA0 E007E580 AFB300AC */  sw        $s3, 0xac($sp)
+/* 37FCA4 E007E584 AFB200A8 */  sw        $s2, 0xa8($sp)
+/* 37FCA8 E007E588 AFB100A4 */  sw        $s1, 0xa4($sp)
+/* 37FCAC E007E58C AFB000A0 */  sw        $s0, 0xa0($sp)
+/* 37FCB0 E007E590 F7BA00E0 */  sdc1      $f26, 0xe0($sp)
+/* 37FCB4 E007E594 F7B800D8 */  sdc1      $f24, 0xd8($sp)
+/* 37FCB8 E007E598 F7B600D0 */  sdc1      $f22, 0xd0($sp)
+/* 37FCBC E007E59C F7B400C8 */  sdc1      $f20, 0xc8($sp)
+/* 37FCC0 E007E5A0 8EC50000 */  lw        $a1, ($s6)
+/* 37FCC4 E007E5A4 8FB900E8 */  lw        $t9, 0xe8($sp)
+/* 37FCC8 E007E5A8 00A0182D */  daddu     $v1, $a1, $zero
+/* 37FCCC E007E5AC 8F31000C */  lw        $s1, 0xc($t9)
+/* 37FCD0 E007E5B0 24A50008 */  addiu     $a1, $a1, 8
+/* 37FCD4 E007E5B4 AEC50000 */  sw        $a1, ($s6)
+/* 37FCD8 E007E5B8 8E390034 */  lw        $t9, 0x34($s1)
+/* 37FCDC E007E5BC 3C140001 */  lui       $s4, 1
+/* 37FCE0 E007E5C0 AFB90098 */  sw        $t9, 0x98($sp)
+/* 37FCE4 E007E5C4 C6380030 */  lwc1      $f24, 0x30($s1)
+/* 37FCE8 E007E5C8 8E300004 */  lw        $s0, 4($s1)
+/* 37FCEC E007E5CC C63A0028 */  lwc1      $f26, 0x28($s1)
+/* 37FCF0 E007E5D0 C636002C */  lwc1      $f22, 0x2c($s1)
+/* 37FCF4 E007E5D4 3C02E700 */  lui       $v0, 0xe700
+/* 37FCF8 E007E5D8 AC620000 */  sw        $v0, ($v1)
+/* 37FCFC E007E5DC AC600004 */  sw        $zero, 4($v1)
+/* 37FD00 E007E5E0 ACA60000 */  sw        $a2, ($a1)
+/* 37FD04 E007E5E4 8FB900E8 */  lw        $t9, 0xe8($sp)
+/* 37FD08 E007E5E8 8F230010 */  lw        $v1, 0x10($t9)
+/* 37FD0C E007E5EC 24A20008 */  addiu     $v0, $a1, 8
+/* 37FD10 E007E5F0 AEC20000 */  sw        $v0, ($s6)
+/* 37FD14 E007E5F4 8C62001C */  lw        $v0, 0x1c($v1)
+/* 37FD18 E007E5F8 3C038000 */  lui       $v1, 0x8000
+/* 37FD1C E007E5FC 00431021 */  addu      $v0, $v0, $v1
+/* 37FD20 E007E600 ACA20004 */  sw        $v0, 4($a1)
+/* 37FD24 E007E604 8E250008 */  lw        $a1, 8($s1)
+/* 37FD28 E007E608 8E26000C */  lw        $a2, 0xc($s1)
+/* 37FD2C E007E60C 8E270010 */  lw        $a3, 0x10($s1)
+/* 37FD30 E007E610 4480A000 */  mtc1      $zero, $f20
+/* 37FD34 E007E614 0C080108 */  jal       shim_guTranslateF
+/* 37FD38 E007E618 36941630 */   ori      $s4, $s4, 0x1630
+/* 37FD3C E007E61C 27B50058 */  addiu     $s5, $sp, 0x58
+/* 37FD40 E007E620 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
+/* 37FD44 E007E624 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
+/* 37FD48 E007E628 4406A000 */  mfc1      $a2, $f20
+/* 37FD4C E007E62C 00031080 */  sll       $v0, $v1, 2
+/* 37FD50 E007E630 00431021 */  addu      $v0, $v0, $v1
+/* 37FD54 E007E634 00021080 */  sll       $v0, $v0, 2
+/* 37FD58 E007E638 00431023 */  subu      $v0, $v0, $v1
+/* 37FD5C E007E63C 000218C0 */  sll       $v1, $v0, 3
+/* 37FD60 E007E640 00431021 */  addu      $v0, $v0, $v1
+/* 37FD64 E007E644 000210C0 */  sll       $v0, $v0, 3
+/* 37FD68 E007E648 3C01800B */  lui       $at, %hi(gCameras+0x6C)
+/* 37FD6C E007E64C 00220821 */  addu      $at, $at, $v0
+/* 37FD70 E007E650 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
+/* 37FD74 E007E654 3C073F80 */  lui       $a3, 0x3f80
+/* 37FD78 E007E658 46000007 */  neg.s     $f0, $f0
+/* 37FD7C E007E65C 44050000 */  mfc1      $a1, $f0
+/* 37FD80 E007E660 02A0202D */  daddu     $a0, $s5, $zero
+/* 37FD84 E007E664 0C080104 */  jal       shim_guRotateF
+/* 37FD88 E007E668 E7B40010 */   swc1     $f20, 0x10($sp)
+/* 37FD8C E007E66C 02A0202D */  daddu     $a0, $s5, $zero
+/* 37FD90 E007E670 27A50018 */  addiu     $a1, $sp, 0x18
+/* 37FD94 E007E674 0C080114 */  jal       shim_guMtxCatF
+/* 37FD98 E007E678 00A0302D */   daddu    $a2, $a1, $zero
+/* 37FD9C E007E67C 27A40018 */  addiu     $a0, $sp, 0x18
+/* 37FDA0 E007E680 3C138007 */  lui       $s3, %hi(gMatrixListPos)
+/* 37FDA4 E007E684 267341F0 */  addiu     $s3, $s3, %lo(gMatrixListPos)
+/* 37FDA8 E007E688 3C17800A */  lui       $s7, %hi(gDisplayContext)
+/* 37FDAC E007E68C 26F7A674 */  addiu     $s7, $s7, %lo(gDisplayContext)
+/* 37FDB0 E007E690 96650000 */  lhu       $a1, ($s3)
+/* 37FDB4 E007E694 8EE20000 */  lw        $v0, ($s7)
+/* 37FDB8 E007E698 00052980 */  sll       $a1, $a1, 6
+/* 37FDBC E007E69C 00B42821 */  addu      $a1, $a1, $s4
+/* 37FDC0 E007E6A0 0C080118 */  jal       shim_guMtxF2L
+/* 37FDC4 E007E6A4 00452821 */   addu     $a1, $v0, $a1
+/* 37FDC8 E007E6A8 3C03DA38 */  lui       $v1, 0xda38
+/* 37FDCC E007E6AC 34630002 */  ori       $v1, $v1, 2
+/* 37FDD0 E007E6B0 2610FFFC */  addiu     $s0, $s0, -4
+/* 37FDD4 E007E6B4 8EC40000 */  lw        $a0, ($s6)
+/* 37FDD8 E007E6B8 96620000 */  lhu       $v0, ($s3)
+/* 37FDDC E007E6BC 0080282D */  daddu     $a1, $a0, $zero
+/* 37FDE0 E007E6C0 24840008 */  addiu     $a0, $a0, 8
+/* 37FDE4 E007E6C4 AEC40000 */  sw        $a0, ($s6)
+/* 37FDE8 E007E6C8 ACA30000 */  sw        $v1, ($a1)
+/* 37FDEC E007E6CC 24430001 */  addiu     $v1, $v0, 1
+/* 37FDF0 E007E6D0 3042FFFF */  andi      $v0, $v0, 0xffff
+/* 37FDF4 E007E6D4 00021180 */  sll       $v0, $v0, 6
+/* 37FDF8 E007E6D8 A6630000 */  sh        $v1, ($s3)
+/* 37FDFC E007E6DC 8EE30000 */  lw        $v1, ($s7)
+/* 37FE00 E007E6E0 00541021 */  addu      $v0, $v0, $s4
+/* 37FE04 E007E6E4 00621821 */  addu      $v1, $v1, $v0
+/* 37FE08 E007E6E8 24820008 */  addiu     $v0, $a0, 8
+/* 37FE0C E007E6EC ACA30004 */  sw        $v1, 4($a1)
+/* 37FE10 E007E6F0 AEC20000 */  sw        $v0, ($s6)
+/* 37FE14 E007E6F4 3C02FA00 */  lui       $v0, 0xfa00
+/* 37FE18 E007E6F8 AC820000 */  sw        $v0, ($a0)
+/* 37FE1C E007E6FC 9223003F */  lbu       $v1, 0x3f($s1)
+/* 37FE20 E007E700 24820010 */  addiu     $v0, $a0, 0x10
+/* 37FE24 E007E704 AEC20000 */  sw        $v0, ($s6)
+/* 37FE28 E007E708 3C02FB00 */  lui       $v0, 0xfb00
+/* 37FE2C E007E70C 3C05FF00 */  lui       $a1, 0xff00
+/* 37FE30 E007E710 AC820008 */  sw        $v0, 8($a0)
+/* 37FE34 E007E714 00651825 */  or        $v1, $v1, $a1
+/* 37FE38 E007E718 AC830004 */  sw        $v1, 4($a0)
+/* 37FE3C E007E71C 9222003B */  lbu       $v0, 0x3b($s1)
+/* 37FE40 E007E720 2E100003 */  sltiu     $s0, $s0, 3
+/* 37FE44 E007E724 00451025 */  or        $v0, $v0, $a1
+/* 37FE48 E007E728 1200007F */  beqz      $s0, .LE007E928
+/* 37FE4C E007E72C AC82000C */   sw       $v0, 0xc($a0)
+/* 37FE50 E007E730 4405A000 */  mfc1      $a1, $f20
+/* 37FE54 E007E734 3C064180 */  lui       $a2, 0x4180
+/* 37FE58 E007E738 4407A000 */  mfc1      $a3, $f20
+/* 37FE5C E007E73C 0C080108 */  jal       shim_guTranslateF
+/* 37FE60 E007E740 27A40018 */   addiu    $a0, $sp, 0x18
+/* 37FE64 E007E744 27A40018 */  addiu     $a0, $sp, 0x18
+/* 37FE68 E007E748 96650000 */  lhu       $a1, ($s3)
+/* 37FE6C E007E74C 8EE20000 */  lw        $v0, ($s7)
+/* 37FE70 E007E750 00052980 */  sll       $a1, $a1, 6
+/* 37FE74 E007E754 00B42821 */  addu      $a1, $a1, $s4
+/* 37FE78 E007E758 0C080118 */  jal       shim_guMtxF2L
+/* 37FE7C E007E75C 00452821 */   addu     $a1, $v0, $a1
+/* 37FE80 E007E760 8EC40000 */  lw        $a0, ($s6)
+/* 37FE84 E007E764 24120001 */  addiu     $s2, $zero, 1
+/* 37FE88 E007E768 0080282D */  daddu     $a1, $a0, $zero
+/* 37FE8C E007E76C 24840008 */  addiu     $a0, $a0, 8
+/* 37FE90 E007E770 AEC40000 */  sw        $a0, ($s6)
+/* 37FE94 E007E774 96620000 */  lhu       $v0, ($s3)
+/* 37FE98 E007E778 3C03DA38 */  lui       $v1, 0xda38
+/* 37FE9C E007E77C ACA30000 */  sw        $v1, ($a1)
+/* 37FEA0 E007E780 00521821 */  addu      $v1, $v0, $s2
+/* 37FEA4 E007E784 3042FFFF */  andi      $v0, $v0, 0xffff
+/* 37FEA8 E007E788 00021180 */  sll       $v0, $v0, 6
+/* 37FEAC E007E78C A6630000 */  sh        $v1, ($s3)
+/* 37FEB0 E007E790 8EE30000 */  lw        $v1, ($s7)
+/* 37FEB4 E007E794 00541021 */  addu      $v0, $v0, $s4
+/* 37FEB8 E007E798 00621821 */  addu      $v1, $v1, $v0
+/* 37FEBC E007E79C 3C02DE00 */  lui       $v0, 0xde00
+/* 37FEC0 E007E7A0 ACA30004 */  sw        $v1, 4($a1)
+/* 37FEC4 E007E7A4 AC820000 */  sw        $v0, ($a0)
+/* 37FEC8 E007E7A8 3C020900 */  lui       $v0, 0x900
+/* 37FECC E007E7AC 24420DE0 */  addiu     $v0, $v0, 0xde0
+/* 37FED0 E007E7B0 AC820004 */  sw        $v0, 4($a0)
+/* 37FED4 E007E7B4 8FB900E8 */  lw        $t9, 0xe8($sp)
+/* 37FED8 E007E7B8 2631004C */  addiu     $s1, $s1, 0x4c
+/* 37FEDC E007E7BC 8F220008 */  lw        $v0, 8($t9)
+/* 37FEE0 E007E7C0 24840008 */  addiu     $a0, $a0, 8
+/* 37FEE4 E007E7C4 0242102A */  slt       $v0, $s2, $v0
+/* 37FEE8 E007E7C8 1040004C */  beqz      $v0, .LE007E8FC
+/* 37FEEC E007E7CC AEC40000 */   sw       $a0, ($s6)
+/* 37FEF0 E007E7D0 02E0F02D */  daddu     $fp, $s7, $zero
+/* 37FEF4 E007E7D4 0260B82D */  daddu     $s7, $s3, $zero
+/* 37FEF8 E007E7D8 3C140001 */  lui       $s4, 1
+/* 37FEFC E007E7DC 36941630 */  ori       $s4, $s4, 0x1630
+/* 37FF00 E007E7E0 02C0982D */  daddu     $s3, $s6, $zero
+/* 37FF04 E007E7E4 26300010 */  addiu     $s0, $s1, 0x10
+.LE007E7E8:
+/* 37FF08 E007E7E8 8E020038 */  lw        $v0, 0x38($s0)
+/* 37FF0C E007E7EC 5440003D */  bnel      $v0, $zero, .LE007E8E4
+/* 37FF10 E007E7F0 26520001 */   addiu    $s2, $s2, 1
+/* 37FF14 E007E7F4 3C013F80 */  lui       $at, 0x3f80
+/* 37FF18 E007E7F8 44810000 */  mtc1      $at, $f0
+/* 37FF1C E007E7FC 4406A000 */  mfc1      $a2, $f20
+/* 37FF20 E007E800 4407A000 */  mfc1      $a3, $f20
+/* 37FF24 E007E804 E7A00010 */  swc1      $f0, 0x10($sp)
+/* 37FF28 E007E808 8E050014 */  lw        $a1, 0x14($s0)
+/* 37FF2C E007E80C 0C080104 */  jal       shim_guRotateF
+/* 37FF30 E007E810 27A40018 */   addiu    $a0, $sp, 0x18
+/* 37FF34 E007E814 8E05FFF8 */  lw        $a1, -8($s0)
+/* 37FF38 E007E818 8E06FFFC */  lw        $a2, -4($s0)
+/* 37FF3C E007E81C 8E070000 */  lw        $a3, ($s0)
+/* 37FF40 E007E820 0C080108 */  jal       shim_guTranslateF
+/* 37FF44 E007E824 02A0202D */   daddu    $a0, $s5, $zero
+/* 37FF48 E007E828 02A0202D */  daddu     $a0, $s5, $zero
+/* 37FF4C E007E82C 27A50018 */  addiu     $a1, $sp, 0x18
+/* 37FF50 E007E830 0C080114 */  jal       shim_guMtxCatF
+/* 37FF54 E007E834 00A0302D */   daddu    $a2, $a1, $zero
+/* 37FF58 E007E838 27A40018 */  addiu     $a0, $sp, 0x18
+/* 37FF5C E007E83C 96E50000 */  lhu       $a1, ($s7)
+/* 37FF60 E007E840 8FC20000 */  lw        $v0, ($fp)
+/* 37FF64 E007E844 00052980 */  sll       $a1, $a1, 6
+/* 37FF68 E007E848 00B42821 */  addu      $a1, $a1, $s4
+/* 37FF6C E007E84C 0C080118 */  jal       shim_guMtxF2L
+/* 37FF70 E007E850 00452821 */   addu     $a1, $v0, $a1
+/* 37FF74 E007E854 8E650000 */  lw        $a1, ($s3)
+/* 37FF78 E007E858 3C060900 */  lui       $a2, 0x900
+/* 37FF7C E007E85C 24C60EB8 */  addiu     $a2, $a2, 0xeb8
+/* 37FF80 E007E860 00A0202D */  daddu     $a0, $a1, $zero
+/* 37FF84 E007E864 24A50008 */  addiu     $a1, $a1, 8
+/* 37FF88 E007E868 AE650000 */  sw        $a1, ($s3)
+/* 37FF8C E007E86C 96E20000 */  lhu       $v0, ($s7)
+/* 37FF90 E007E870 3C03DA38 */  lui       $v1, 0xda38
+/* 37FF94 E007E874 AC830000 */  sw        $v1, ($a0)
+/* 37FF98 E007E878 24430001 */  addiu     $v1, $v0, 1
+/* 37FF9C E007E87C 3042FFFF */  andi      $v0, $v0, 0xffff
+/* 37FFA0 E007E880 00021180 */  sll       $v0, $v0, 6
+/* 37FFA4 E007E884 A6E30000 */  sh        $v1, ($s7)
+/* 37FFA8 E007E888 8FC30000 */  lw        $v1, ($fp)
+/* 37FFAC E007E88C 00541021 */  addu      $v0, $v0, $s4
+/* 37FFB0 E007E890 00621821 */  addu      $v1, $v1, $v0
+/* 37FFB4 E007E894 3C02DE00 */  lui       $v0, 0xde00
+/* 37FFB8 E007E898 AC830004 */  sw        $v1, 4($a0)
+/* 37FFBC E007E89C ACA20000 */  sw        $v0, ($a1)
+/* 37FFC0 E007E8A0 8E230000 */  lw        $v1, ($s1)
+/* 37FFC4 E007E8A4 24A20008 */  addiu     $v0, $a1, 8
+/* 37FFC8 E007E8A8 10600003 */  beqz      $v1, .LE007E8B8
+/* 37FFCC E007E8AC AE620000 */   sw       $v0, ($s3)
+/* 37FFD0 E007E8B0 3C060900 */  lui       $a2, 0x900
+/* 37FFD4 E007E8B4 24C60ED8 */  addiu     $a2, $a2, 0xed8
+.LE007E8B8:
+/* 37FFD8 E007E8B8 3C04D838 */  lui       $a0, 0xd838
+/* 37FFDC E007E8BC 8E620000 */  lw        $v0, ($s3)
+/* 37FFE0 E007E8C0 34840002 */  ori       $a0, $a0, 2
+/* 37FFE4 E007E8C4 ACA60004 */  sw        $a2, 4($a1)
+/* 37FFE8 E007E8C8 0040182D */  daddu     $v1, $v0, $zero
+/* 37FFEC E007E8CC 24420008 */  addiu     $v0, $v0, 8
+/* 37FFF0 E007E8D0 AE620000 */  sw        $v0, ($s3)
+/* 37FFF4 E007E8D4 24020040 */  addiu     $v0, $zero, 0x40
+/* 37FFF8 E007E8D8 AC640000 */  sw        $a0, ($v1)
+/* 37FFFC E007E8DC AC620004 */  sw        $v0, 4($v1)
+/* 380000 E007E8E0 26520001 */  addiu     $s2, $s2, 1
+.LE007E8E4:
+/* 380004 E007E8E4 8FB900E8 */  lw        $t9, 0xe8($sp)
+/* 380008 E007E8E8 2610004C */  addiu     $s0, $s0, 0x4c
+/* 38000C E007E8EC 8F220008 */  lw        $v0, 8($t9)
+/* 380010 E007E8F0 0242102A */  slt       $v0, $s2, $v0
+/* 380014 E007E8F4 1440FFBC */  bnez      $v0, .LE007E7E8
+/* 380018 E007E8F8 2631004C */   addiu    $s1, $s1, 0x4c
+.LE007E8FC:
+/* 38001C E007E8FC 3C05D838 */  lui       $a1, 0xd838
+/* 380020 E007E900 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
+/* 380024 E007E904 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
+/* 380028 E007E908 8C620000 */  lw        $v0, ($v1)
+/* 38002C E007E90C 34A50002 */  ori       $a1, $a1, 2
+/* 380030 E007E910 0040202D */  daddu     $a0, $v0, $zero
+/* 380034 E007E914 24420008 */  addiu     $v0, $v0, 8
+/* 380038 E007E918 AC620000 */  sw        $v0, ($v1)
+/* 38003C E007E91C 24020040 */  addiu     $v0, $zero, 0x40
+/* 380040 E007E920 AC850000 */  sw        $a1, ($a0)
+/* 380044 E007E924 AC820004 */  sw        $v0, 4($a0)
+.LE007E928:
+/* 380048 E007E928 3C0DFD48 */  lui       $t5, 0xfd48
+/* 38004C E007E92C 35AD000F */  ori       $t5, $t5, 0xf
+/* 380050 E007E930 3C09F548 */  lui       $t1, 0xf548
+/* 380054 E007E934 35290400 */  ori       $t1, $t1, 0x400
+/* 380058 E007E938 3C0E0705 */  lui       $t6, 0x705
+/* 38005C E007E93C 35CE4150 */  ori       $t6, $t6, 0x4150
+/* 380060 E007E940 3C0F0703 */  lui       $t7, 0x703
+/* 380064 E007E944 35EFE07C */  ori       $t7, $t7, 0xe07c
+/* 380068 E007E948 3C12F540 */  lui       $s2, 0xf540
+/* 38006C E007E94C 36520400 */  ori       $s2, $s2, 0x400
+/* 380070 E007E950 3C100005 */  lui       $s0, 5
+/* 380074 E007E954 36104150 */  ori       $s0, $s0, 0x4150
+/* 380078 E007E958 3C130007 */  lui       $s3, 7
+/* 38007C E007E95C 3673C07C */  ori       $s3, $s3, 0xc07c
+/* 380080 E007E960 3C14F548 */  lui       $s4, 0xf548
+/* 380084 E007E964 36940480 */  ori       $s4, $s4, 0x480
+/* 380088 E007E968 3C17F540 */  lui       $s7, 0xf540
+/* 38008C E007E96C 36F70480 */  ori       $s7, $s7, 0x480
+/* 380090 E007E970 3C160105 */  lui       $s6, 0x105
+/* 380094 E007E974 36D64150 */  ori       $s6, $s6, 0x4150
+/* 380098 E007E978 3C180107 */  lui       $t8, 0x107
+/* 38009C E007E97C 3718C07C */  ori       $t8, $t8, 0xc07c
+/* 3800A0 E007E980 27A40018 */  addiu     $a0, $sp, 0x18
+/* 3800A4 E007E984 3C1E0001 */  lui       $fp, 1
+/* 3800A8 E007E988 37DE1630 */  ori       $fp, $fp, 0x1630
+/* 3800AC E007E98C 3C11800A */  lui       $s1, %hi(gMasterGfxPos)
+/* 3800B0 E007E990 2631A66C */  addiu     $s1, $s1, %lo(gMasterGfxPos)
+/* 3800B4 E007E994 3C15DE00 */  lui       $s5, 0xde00
+/* 3800B8 E007E998 3C020900 */  lui       $v0, 0x900
+/* 3800BC E007E99C 24420D40 */  addiu     $v0, $v0, 0xd40
+/* 3800C0 E007E9A0 3C0C0900 */  lui       $t4, 0x900
+/* 3800C4 E007E9A4 258C0000 */  addiu     $t4, $t4, 0
+/* 3800C8 E007E9A8 3C0BE600 */  lui       $t3, 0xe600
+/* 3800CC E007E9AC 3C0AF400 */  lui       $t2, 0xf400
+/* 3800D0 E007E9B0 8E230000 */  lw        $v1, ($s1)
+/* 3800D4 E007E9B4 4480A000 */  mtc1      $zero, $f20
+/* 3800D8 E007E9B8 4405B000 */  mfc1      $a1, $f22
+/* 3800DC E007E9BC 0060402D */  daddu     $t0, $v1, $zero
+/* 3800E0 E007E9C0 24630008 */  addiu     $v1, $v1, 8
+/* 3800E4 E007E9C4 AE230000 */  sw        $v1, ($s1)
+/* 3800E8 E007E9C8 AD020004 */  sw        $v0, 4($t0)
+/* 3800EC E007E9CC 24620008 */  addiu     $v0, $v1, 8
+/* 3800F0 E007E9D0 AD150000 */  sw        $s5, ($t0)
+/* 3800F4 E007E9D4 AE220000 */  sw        $v0, ($s1)
+/* 3800F8 E007E9D8 24020003 */  addiu     $v0, $zero, 3
+/* 3800FC E007E9DC 4406A000 */  mfc1      $a2, $f20
+/* 380100 E007E9E0 3C08F200 */  lui       $t0, 0xf200
+/* 380104 E007E9E4 AC6D0000 */  sw        $t5, ($v1)
+/* 380108 E007E9E8 8FB90098 */  lw        $t9, 0x98($sp)
+/* 38010C E007E9EC 4407A000 */  mfc1      $a3, $f20
+/* 380110 E007E9F0 00591023 */  subu      $v0, $v0, $t9
+/* 380114 E007E9F4 00021240 */  sll       $v0, $v0, 9
+/* 380118 E007E9F8 004C1021 */  addu      $v0, $v0, $t4
+/* 38011C E007E9FC AC620004 */  sw        $v0, 4($v1)
+/* 380120 E007EA00 24620010 */  addiu     $v0, $v1, 0x10
+/* 380124 E007EA04 AE220000 */  sw        $v0, ($s1)
+/* 380128 E007EA08 24620018 */  addiu     $v0, $v1, 0x18
+/* 38012C E007EA0C AC690008 */  sw        $t1, 8($v1)
+/* 380130 E007EA10 AC6E000C */  sw        $t6, 0xc($v1)
+/* 380134 E007EA14 AE220000 */  sw        $v0, ($s1)
+/* 380138 E007EA18 24620020 */  addiu     $v0, $v1, 0x20
+/* 38013C E007EA1C AC6B0010 */  sw        $t3, 0x10($v1)
+/* 380140 E007EA20 AC600014 */  sw        $zero, 0x14($v1)
+/* 380144 E007EA24 AE220000 */  sw        $v0, ($s1)
+/* 380148 E007EA28 24620028 */  addiu     $v0, $v1, 0x28
+/* 38014C E007EA2C 3C09E700 */  lui       $t1, 0xe700
+/* 380150 E007EA30 AC6A0018 */  sw        $t2, 0x18($v1)
+/* 380154 E007EA34 AC6F001C */  sw        $t7, 0x1c($v1)
+/* 380158 E007EA38 AE220000 */  sw        $v0, ($s1)
+/* 38015C E007EA3C 24620030 */  addiu     $v0, $v1, 0x30
+/* 380160 E007EA40 AC690020 */  sw        $t1, 0x20($v1)
+/* 380164 E007EA44 AC600024 */  sw        $zero, 0x24($v1)
+/* 380168 E007EA48 AE220000 */  sw        $v0, ($s1)
+/* 38016C E007EA4C 24620038 */  addiu     $v0, $v1, 0x38
+/* 380170 E007EA50 AC720028 */  sw        $s2, 0x28($v1)
+/* 380174 E007EA54 AC70002C */  sw        $s0, 0x2c($v1)
+/* 380178 E007EA58 AE220000 */  sw        $v0, ($s1)
+/* 38017C E007EA5C 24620040 */  addiu     $v0, $v1, 0x40
+/* 380180 E007EA60 AC680030 */  sw        $t0, 0x30($v1)
+/* 380184 E007EA64 AC730034 */  sw        $s3, 0x34($v1)
+/* 380188 E007EA68 AE220000 */  sw        $v0, ($s1)
+/* 38018C E007EA6C 24020002 */  addiu     $v0, $zero, 2
+/* 380190 E007EA70 AC6D0038 */  sw        $t5, 0x38($v1)
+/* 380194 E007EA74 00591023 */  subu      $v0, $v0, $t9
+/* 380198 E007EA78 00021240 */  sll       $v0, $v0, 9
+/* 38019C E007EA7C 004C1021 */  addu      $v0, $v0, $t4
+/* 3801A0 E007EA80 AC62003C */  sw        $v0, 0x3c($v1)
+/* 3801A4 E007EA84 24620048 */  addiu     $v0, $v1, 0x48
+/* 3801A8 E007EA88 AE220000 */  sw        $v0, ($s1)
+/* 3801AC E007EA8C 24620050 */  addiu     $v0, $v1, 0x50
+/* 3801B0 E007EA90 AC740040 */  sw        $s4, 0x40($v1)
+/* 3801B4 E007EA94 AC6E0044 */  sw        $t6, 0x44($v1)
+/* 3801B8 E007EA98 AE220000 */  sw        $v0, ($s1)
+/* 3801BC E007EA9C 24620058 */  addiu     $v0, $v1, 0x58
+/* 3801C0 E007EAA0 AC6B0048 */  sw        $t3, 0x48($v1)
+/* 3801C4 E007EAA4 AC60004C */  sw        $zero, 0x4c($v1)
+/* 3801C8 E007EAA8 AE220000 */  sw        $v0, ($s1)
+/* 3801CC E007EAAC 24620060 */  addiu     $v0, $v1, 0x60
+/* 3801D0 E007EAB0 AC6A0050 */  sw        $t2, 0x50($v1)
+/* 3801D4 E007EAB4 AC6F0054 */  sw        $t7, 0x54($v1)
+/* 3801D8 E007EAB8 AE220000 */  sw        $v0, ($s1)
+/* 3801DC E007EABC 24620068 */  addiu     $v0, $v1, 0x68
+/* 3801E0 E007EAC0 AC690058 */  sw        $t1, 0x58($v1)
+/* 3801E4 E007EAC4 AC60005C */  sw        $zero, 0x5c($v1)
+/* 3801E8 E007EAC8 AE220000 */  sw        $v0, ($s1)
+/* 3801EC E007EACC 24620070 */  addiu     $v0, $v1, 0x70
+/* 3801F0 E007EAD0 AC770060 */  sw        $s7, 0x60($v1)
+/* 3801F4 E007EAD4 AC760064 */  sw        $s6, 0x64($v1)
+/* 3801F8 E007EAD8 AE220000 */  sw        $v0, ($s1)
+/* 3801FC E007EADC AC680068 */  sw        $t0, 0x68($v1)
+/* 380200 E007EAE0 0C080108 */  jal       shim_guTranslateF
+/* 380204 E007EAE4 AC78006C */   sw       $t8, 0x6c($v1)
+/* 380208 E007EAE8 27B00058 */  addiu     $s0, $sp, 0x58
+/* 38020C E007EAEC 4405C000 */  mfc1      $a1, $f24
+/* 380210 E007EAF0 0200202D */  daddu     $a0, $s0, $zero
+/* 380214 E007EAF4 00A0302D */  daddu     $a2, $a1, $zero
+/* 380218 E007EAF8 0C080110 */  jal       shim_guScaleF
+/* 38021C E007EAFC 00A0382D */   daddu    $a3, $a1, $zero
+/* 380220 E007EB00 0200202D */  daddu     $a0, $s0, $zero
+/* 380224 E007EB04 27A50018 */  addiu     $a1, $sp, 0x18
+/* 380228 E007EB08 0C080114 */  jal       shim_guMtxCatF
+/* 38022C E007EB0C 00A0302D */   daddu    $a2, $a1, $zero
+/* 380230 E007EB10 4405D000 */  mfc1      $a1, $f26
+/* 380234 E007EB14 4406A000 */  mfc1      $a2, $f20
+/* 380238 E007EB18 3C073F80 */  lui       $a3, 0x3f80
+/* 38023C E007EB1C 0200202D */  daddu     $a0, $s0, $zero
+/* 380240 E007EB20 0C080104 */  jal       shim_guRotateF
+/* 380244 E007EB24 AFA60010 */   sw       $a2, 0x10($sp)
+/* 380248 E007EB28 0200202D */  daddu     $a0, $s0, $zero
+/* 38024C E007EB2C 27A50018 */  addiu     $a1, $sp, 0x18
+/* 380250 E007EB30 0C080114 */  jal       shim_guMtxCatF
+/* 380254 E007EB34 00A0302D */   daddu    $a2, $a1, $zero
+/* 380258 E007EB38 27A40018 */  addiu     $a0, $sp, 0x18
+/* 38025C E007EB3C 3C108007 */  lui       $s0, %hi(gMatrixListPos)
+/* 380260 E007EB40 261041F0 */  addiu     $s0, $s0, %lo(gMatrixListPos)
+/* 380264 E007EB44 3C12800A */  lui       $s2, %hi(gDisplayContext)
+/* 380268 E007EB48 2652A674 */  addiu     $s2, $s2, %lo(gDisplayContext)
+/* 38026C E007EB4C 96050000 */  lhu       $a1, ($s0)
+/* 380270 E007EB50 8E420000 */  lw        $v0, ($s2)
+/* 380274 E007EB54 00052980 */  sll       $a1, $a1, 6
+/* 380278 E007EB58 00BE2821 */  addu      $a1, $a1, $fp
+/* 38027C E007EB5C 0C080118 */  jal       shim_guMtxF2L
+/* 380280 E007EB60 00452821 */   addu     $a1, $v0, $a1
+/* 380284 E007EB64 3C06D838 */  lui       $a2, 0xd838
+/* 380288 E007EB68 8E240000 */  lw        $a0, ($s1)
+/* 38028C E007EB6C 34C60002 */  ori       $a2, $a2, 2
+/* 380290 E007EB70 0080282D */  daddu     $a1, $a0, $zero
+/* 380294 E007EB74 24840008 */  addiu     $a0, $a0, 8
+/* 380298 E007EB78 AE240000 */  sw        $a0, ($s1)
+/* 38029C E007EB7C 96020000 */  lhu       $v0, ($s0)
+/* 3802A0 E007EB80 3C03DA38 */  lui       $v1, 0xda38
+/* 3802A4 E007EB84 ACA30000 */  sw        $v1, ($a1)
+/* 3802A8 E007EB88 24430001 */  addiu     $v1, $v0, 1
+/* 3802AC E007EB8C 3042FFFF */  andi      $v0, $v0, 0xffff
+/* 3802B0 E007EB90 00021180 */  sll       $v0, $v0, 6
+/* 3802B4 E007EB94 A6030000 */  sh        $v1, ($s0)
+/* 3802B8 E007EB98 8E430000 */  lw        $v1, ($s2)
+/* 3802BC E007EB9C 005E1021 */  addu      $v0, $v0, $fp
+/* 3802C0 E007EBA0 00621821 */  addu      $v1, $v1, $v0
+/* 3802C4 E007EBA4 24820008 */  addiu     $v0, $a0, 8
+/* 3802C8 E007EBA8 ACA30004 */  sw        $v1, 4($a1)
+/* 3802CC E007EBAC AE220000 */  sw        $v0, ($s1)
+/* 3802D0 E007EBB0 3C020900 */  lui       $v0, 0x900
+/* 3802D4 E007EBB4 24420EF8 */  addiu     $v0, $v0, 0xef8
+/* 3802D8 E007EBB8 AC820004 */  sw        $v0, 4($a0)
+/* 3802DC E007EBBC 24820010 */  addiu     $v0, $a0, 0x10
+/* 3802E0 E007EBC0 24030040 */  addiu     $v1, $zero, 0x40
+/* 3802E4 E007EBC4 AC950000 */  sw        $s5, ($a0)
+/* 3802E8 E007EBC8 AE220000 */  sw        $v0, ($s1)
+/* 3802EC E007EBCC 24820018 */  addiu     $v0, $a0, 0x18
+/* 3802F0 E007EBD0 AC860008 */  sw        $a2, 8($a0)
+/* 3802F4 E007EBD4 AC83000C */  sw        $v1, 0xc($a0)
+/* 3802F8 E007EBD8 AE220000 */  sw        $v0, ($s1)
+/* 3802FC E007EBDC AC860010 */  sw        $a2, 0x10($a0)
+/* 380300 E007EBE0 AC830014 */  sw        $v1, 0x14($a0)
+/* 380304 E007EBE4 8FBF00C4 */  lw        $ra, 0xc4($sp)
+/* 380308 E007EBE8 8FBE00C0 */  lw        $fp, 0xc0($sp)
+/* 38030C E007EBEC 8FB700BC */  lw        $s7, 0xbc($sp)
+/* 380310 E007EBF0 8FB600B8 */  lw        $s6, 0xb8($sp)
+/* 380314 E007EBF4 8FB500B4 */  lw        $s5, 0xb4($sp)
+/* 380318 E007EBF8 8FB400B0 */  lw        $s4, 0xb0($sp)
+/* 38031C E007EBFC 8FB300AC */  lw        $s3, 0xac($sp)
+/* 380320 E007EC00 8FB200A8 */  lw        $s2, 0xa8($sp)
+/* 380324 E007EC04 8FB100A4 */  lw        $s1, 0xa4($sp)
+/* 380328 E007EC08 8FB000A0 */  lw        $s0, 0xa0($sp)
+/* 38032C E007EC0C D7BA00E0 */  ldc1      $f26, 0xe0($sp)
+/* 380330 E007EC10 D7B800D8 */  ldc1      $f24, 0xd8($sp)
+/* 380334 E007EC14 D7B600D0 */  ldc1      $f22, 0xd0($sp)
+/* 380338 E007EC18 D7B400C8 */  ldc1      $f20, 0xc8($sp)
+/* 38033C E007EC1C 03E00008 */  jr        $ra
+/* 380340 E007EC20 27BD00E8 */   addiu    $sp, $sp, 0xe8
+/* 380344 E007EC24 00000000 */  nop
+/* 380348 E007EC28 00000000 */  nop
+/* 38034C E007EC2C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_main.s b/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_main.s
new file mode 100644
index 0000000000..053022b2d6
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_main.s
@@ -0,0 +1,135 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel fire_flower_main
+/* 37F720 E007E000 27BDFF98 */  addiu     $sp, $sp, -0x68
+/* 37F724 E007E004 F7B40050 */  sdc1      $f20, 0x50($sp)
+/* 37F728 E007E008 4485A000 */  mtc1      $a1, $f20
+/* 37F72C E007E00C AFB00028 */  sw        $s0, 0x28($sp)
+/* 37F730 E007E010 0080802D */  daddu     $s0, $a0, $zero
+/* 37F734 E007E014 F7B60058 */  sdc1      $f22, 0x58($sp)
+/* 37F738 E007E018 4486B000 */  mtc1      $a2, $f22
+/* 37F73C E007E01C 27A40010 */  addiu     $a0, $sp, 0x10
+/* 37F740 E007E020 F7B80060 */  sdc1      $f24, 0x60($sp)
+/* 37F744 E007E024 4487C000 */  mtc1      $a3, $f24
+/* 37F748 E007E028 3C02E008 */  lui       $v0, %hi(fire_flower_init)
+/* 37F74C E007E02C 2442E1FC */  addiu     $v0, $v0, %lo(fire_flower_init)
+/* 37F750 E007E030 AFA20018 */  sw        $v0, 0x18($sp)
+/* 37F754 E007E034 3C02E008 */  lui       $v0, %hi(fire_flower_update)
+/* 37F758 E007E038 2442E204 */  addiu     $v0, $v0, %lo(fire_flower_update)
+/* 37F75C E007E03C AFA2001C */  sw        $v0, 0x1c($sp)
+/* 37F760 E007E040 3C02E008 */  lui       $v0, %hi(fire_flower_render)
+/* 37F764 E007E044 2442E508 */  addiu     $v0, $v0, %lo(fire_flower_render)
+/* 37F768 E007E048 AFA20020 */  sw        $v0, 0x20($sp)
+/* 37F76C E007E04C 2402003F */  addiu     $v0, $zero, 0x3f
+/* 37F770 E007E050 AFBF0048 */  sw        $ra, 0x48($sp)
+/* 37F774 E007E054 AFB70044 */  sw        $s7, 0x44($sp)
+/* 37F778 E007E058 AFB60040 */  sw        $s6, 0x40($sp)
+/* 37F77C E007E05C AFB5003C */  sw        $s5, 0x3c($sp)
+/* 37F780 E007E060 AFB40038 */  sw        $s4, 0x38($sp)
+/* 37F784 E007E064 AFB30034 */  sw        $s3, 0x34($sp)
+/* 37F788 E007E068 AFB20030 */  sw        $s2, 0x30($sp)
+/* 37F78C E007E06C AFB1002C */  sw        $s1, 0x2c($sp)
+/* 37F790 E007E070 AFA00010 */  sw        $zero, 0x10($sp)
+/* 37F794 E007E074 AFA00024 */  sw        $zero, 0x24($sp)
+/* 37F798 E007E078 0C080124 */  jal       shim_create_effect_instance
+/* 37F79C E007E07C AFA20014 */   sw       $v0, 0x14($sp)
+/* 37F7A0 E007E080 24040934 */  addiu     $a0, $zero, 0x934
+/* 37F7A4 E007E084 2414001F */  addiu     $s4, $zero, 0x1f
+/* 37F7A8 E007E088 0040982D */  daddu     $s3, $v0, $zero
+/* 37F7AC E007E08C 0C08012C */  jal       shim_general_heap_malloc
+/* 37F7B0 E007E090 AE740008 */   sw       $s4, 8($s3)
+/* 37F7B4 E007E094 0040882D */  daddu     $s1, $v0, $zero
+/* 37F7B8 E007E098 16200003 */  bnez      $s1, .LE007E0A8
+/* 37F7BC E007E09C AE71000C */   sw       $s1, 0xc($s3)
+.LE007E0A0:
+/* 37F7C0 E007E0A0 0801F828 */  j         .LE007E0A0
+/* 37F7C4 E007E0A4 00000000 */   nop
+.LE007E0A8:
+/* 37F7C8 E007E0A8 AE200004 */  sw        $zero, 4($s1)
+/* 37F7CC E007E0AC AE300000 */  sw        $s0, ($s1)
+/* 37F7D0 E007E0B0 E6340008 */  swc1      $f20, 8($s1)
+/* 37F7D4 E007E0B4 E636000C */  swc1      $f22, 0xc($s1)
+/* 37F7D8 E007E0B8 E6380010 */  swc1      $f24, 0x10($s1)
+/* 37F7DC E007E0BC 8FA20078 */  lw        $v0, 0x78($sp)
+/* 37F7E0 E007E0C0 3C013F00 */  lui       $at, 0x3f00
+/* 37F7E4 E007E0C4 44810000 */  mtc1      $at, $f0
+/* 37F7E8 E007E0C8 3C01C120 */  lui       $at, 0xc120
+/* 37F7EC E007E0CC 44811000 */  mtc1      $at, $f2
+/* 37F7F0 E007E0D0 24120001 */  addiu     $s2, $zero, 1
+/* 37F7F4 E007E0D4 AE200044 */  sw        $zero, 0x44($s1)
+/* 37F7F8 E007E0D8 AE200034 */  sw        $zero, 0x34($s1)
+/* 37F7FC E007E0DC AE200038 */  sw        $zero, 0x38($s1)
+/* 37F800 E007E0E0 AE200028 */  sw        $zero, 0x28($s1)
+/* 37F804 E007E0E4 AE220040 */  sw        $v0, 0x40($s1)
+/* 37F808 E007E0E8 240200FF */  addiu     $v0, $zero, 0xff
+/* 37F80C E007E0EC AE22003C */  sw        $v0, 0x3c($s1)
+/* 37F810 E007E0F0 E6200030 */  swc1      $f0, 0x30($s1)
+/* 37F814 E007E0F4 E622002C */  swc1      $f2, 0x2c($s1)
+/* 37F818 E007E0F8 0254102A */  slt       $v0, $s2, $s4
+/* 37F81C E007E0FC 10400030 */  beqz      $v0, .LE007E1C0
+/* 37F820 E007E100 2631004C */   addiu    $s1, $s1, 0x4c
+/* 37F824 E007E104 0240B82D */  daddu     $s7, $s2, $zero
+/* 37F828 E007E108 241600FF */  addiu     $s6, $zero, 0xff
+/* 37F82C E007E10C 2415000A */  addiu     $s5, $zero, 0xa
+/* 37F830 E007E110 26300040 */  addiu     $s0, $s1, 0x40
+/* 37F834 E007E114 3C014100 */  lui       $at, 0x4100
+/* 37F838 E007E118 4481B000 */  mtc1      $at, $f22
+/* 37F83C E007E11C 3C01E008 */  lui       $at, %hi(D_E007EC40)
+/* 37F840 E007E120 D434EC40 */  ldc1      $f20, %lo(D_E007EC40)($at)
+.LE007E124:
+/* 37F844 E007E124 24040014 */  addiu     $a0, $zero, 0x14
+/* 37F848 E007E128 AE370000 */  sw        $s7, ($s1)
+/* 37F84C E007E12C AE00FFC8 */  sw        $zero, -0x38($s0)
+/* 37F850 E007E130 AE00FFCC */  sw        $zero, -0x34($s0)
+/* 37F854 E007E134 AE00FFD0 */  sw        $zero, -0x30($s0)
+/* 37F858 E007E138 E616FFD4 */  swc1      $f22, -0x2c($s0)
+/* 37F85C E007E13C 0C080000 */  jal       func_E0200000
+/* 37F860 E007E140 AE00FFD8 */   sw       $zero, -0x28($s0)
+/* 37F864 E007E144 2404000A */  addiu     $a0, $zero, 0xa
+/* 37F868 E007E148 2442FFF8 */  addiu     $v0, $v0, -8
+/* 37F86C E007E14C 44820000 */  mtc1      $v0, $f0
+/* 37F870 E007E150 00000000 */  nop
+/* 37F874 E007E154 46800020 */  cvt.s.w   $f0, $f0
+/* 37F878 E007E158 0C080000 */  jal       func_E0200000
+/* 37F87C E007E15C E600FFDC */   swc1     $f0, -0x24($s0)
+/* 37F880 E007E160 2442FFFB */  addiu     $v0, $v0, -5
+/* 37F884 E007E164 44820000 */  mtc1      $v0, $f0
+/* 37F888 E007E168 00000000 */  nop
+/* 37F88C E007E16C 46800021 */  cvt.d.w   $f0, $f0
+/* 37F890 E007E170 46340002 */  mul.d     $f0, $f0, $f20
+/* 37F894 E007E174 00000000 */  nop
+/* 37F898 E007E178 24040050 */  addiu     $a0, $zero, 0x50
+/* 37F89C E007E17C 2631004C */  addiu     $s1, $s1, 0x4c
+/* 37F8A0 E007E180 46200020 */  cvt.s.d   $f0, $f0
+/* 37F8A4 E007E184 0C080000 */  jal       func_E0200000
+/* 37F8A8 E007E188 E600FFE0 */   swc1     $f0, -0x20($s0)
+/* 37F8AC E007E18C 2643FFFF */  addiu     $v1, $s2, -1
+/* 37F8B0 E007E190 26520001 */  addiu     $s2, $s2, 1
+/* 37F8B4 E007E194 24420005 */  addiu     $v0, $v0, 5
+/* 37F8B8 E007E198 44820000 */  mtc1      $v0, $f0
+/* 37F8BC E007E19C 00000000 */  nop
+/* 37F8C0 E007E1A0 46800020 */  cvt.s.w   $f0, $f0
+/* 37F8C4 E007E1A4 E600FFE4 */  swc1      $f0, -0x1c($s0)
+/* 37F8C8 E007E1A8 AE16FFFC */  sw        $s6, -4($s0)
+/* 37F8CC E007E1AC AE030008 */  sw        $v1, 8($s0)
+/* 37F8D0 E007E1B0 AE150000 */  sw        $s5, ($s0)
+/* 37F8D4 E007E1B4 0254102A */  slt       $v0, $s2, $s4
+/* 37F8D8 E007E1B8 1440FFDA */  bnez      $v0, .LE007E124
+/* 37F8DC E007E1BC 2610004C */   addiu    $s0, $s0, 0x4c
+.LE007E1C0:
+/* 37F8E0 E007E1C0 0260102D */  daddu     $v0, $s3, $zero
+/* 37F8E4 E007E1C4 8FBF0048 */  lw        $ra, 0x48($sp)
+/* 37F8E8 E007E1C8 8FB70044 */  lw        $s7, 0x44($sp)
+/* 37F8EC E007E1CC 8FB60040 */  lw        $s6, 0x40($sp)
+/* 37F8F0 E007E1D0 8FB5003C */  lw        $s5, 0x3c($sp)
+/* 37F8F4 E007E1D4 8FB40038 */  lw        $s4, 0x38($sp)
+/* 37F8F8 E007E1D8 8FB30034 */  lw        $s3, 0x34($sp)
+/* 37F8FC E007E1DC 8FB20030 */  lw        $s2, 0x30($sp)
+/* 37F900 E007E1E0 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 37F904 E007E1E4 8FB00028 */  lw        $s0, 0x28($sp)
+/* 37F908 E007E1E8 D7B80060 */  ldc1      $f24, 0x60($sp)
+/* 37F90C E007E1EC D7B60058 */  ldc1      $f22, 0x58($sp)
+/* 37F910 E007E1F0 D7B40050 */  ldc1      $f20, 0x50($sp)
+/* 37F914 E007E1F4 03E00008 */  jr        $ra
+/* 37F918 E007E1F8 27BD0068 */   addiu    $sp, $sp, 0x68
diff --git a/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_update.s b/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_update.s
new file mode 100644
index 0000000000..e9a2c2baf9
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/fire_flower/fire_flower_update.s
@@ -0,0 +1,218 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel fire_flower_update
+/* 37F924 E007E204 27BDFFD8 */  addiu     $sp, $sp, -0x28
+/* 37F928 E007E208 AFB1001C */  sw        $s1, 0x1c($sp)
+/* 37F92C E007E20C 0080882D */  daddu     $s1, $a0, $zero
+/* 37F930 E007E210 AFBF0020 */  sw        $ra, 0x20($sp)
+/* 37F934 E007E214 AFB00018 */  sw        $s0, 0x18($sp)
+/* 37F938 E007E218 8E30000C */  lw        $s0, 0xc($s1)
+/* 37F93C E007E21C 8E050004 */  lw        $a1, 4($s0)
+/* 37F940 E007E220 8E020044 */  lw        $v0, 0x44($s0)
+/* 37F944 E007E224 8E030040 */  lw        $v1, 0x40($s0)
+/* 37F948 E007E228 24420001 */  addiu     $v0, $v0, 1
+/* 37F94C E007E22C 24630001 */  addiu     $v1, $v1, 1
+/* 37F950 E007E230 AE020044 */  sw        $v0, 0x44($s0)
+/* 37F954 E007E234 24020007 */  addiu     $v0, $zero, 7
+/* 37F958 E007E238 14A20005 */  bne       $a1, $v0, .LE007E250
+/* 37F95C E007E23C AE030040 */   sw       $v1, 0x40($s0)
+/* 37F960 E007E240 0C080128 */  jal       shim_remove_effect
+/* 37F964 E007E244 00000000 */   nop
+/* 37F968 E007E248 0801F93D */  j         .LE007E4F4
+/* 37F96C E007E24C 00000000 */   nop
+.LE007E250:
+/* 37F970 E007E250 2CA20007 */  sltiu     $v0, $a1, 7
+/* 37F974 E007E254 10400075 */  beqz      $v0, .LE007E42C
+/* 37F978 E007E258 00051080 */   sll      $v0, $a1, 2
+/* 37F97C E007E25C 3C01E008 */  lui       $at, %hi(jtbl_E007EC48)
+/* 37F980 E007E260 00220821 */  addu      $at, $at, $v0
+/* 37F984 E007E264 8C22EC48 */  lw        $v0, %lo(jtbl_E007EC48)($at)
+/* 37F988 E007E268 00400008 */  jr        $v0
+/* 37F98C E007E26C 00000000 */   nop
+dlabel LE007E270_37F990
+/* 37F990 E007E270 0C080150 */  jal       shim_load_effect
+/* 37F994 E007E274 2404002D */   addiu    $a0, $zero, 0x2d
+/* 37F998 E007E278 C6020008 */  lwc1      $f2, 8($s0)
+/* 37F99C E007E27C 3C014120 */  lui       $at, 0x4120
+/* 37F9A0 E007E280 44810000 */  mtc1      $at, $f0
+/* 37F9A4 E007E284 24020007 */  addiu     $v0, $zero, 7
+/* 37F9A8 E007E288 AFA20010 */  sw        $v0, 0x10($sp)
+/* 37F9AC E007E28C 24020014 */  addiu     $v0, $zero, 0x14
+/* 37F9B0 E007E290 AFA20014 */  sw        $v0, 0x14($sp)
+/* 37F9B4 E007E294 46001081 */  sub.s     $f2, $f2, $f0
+/* 37F9B8 E007E298 8E06000C */  lw        $a2, 0xc($s0)
+/* 37F9BC E007E29C 8E070010 */  lw        $a3, 0x10($s0)
+/* 37F9C0 E007E2A0 44051000 */  mfc1      $a1, $f2
+/* 37F9C4 E007E2A4 0C016800 */  jal       stars_spread_main
+/* 37F9C8 E007E2A8 0000202D */   daddu    $a0, $zero, $zero
+/* 37F9CC E007E2AC 8E020004 */  lw        $v0, 4($s0)
+/* 37F9D0 E007E2B0 AE000034 */  sw        $zero, 0x34($s0)
+/* 37F9D4 E007E2B4 AE000038 */  sw        $zero, 0x38($s0)
+/* 37F9D8 E007E2B8 0801F909 */  j         .LE007E424
+/* 37F9DC E007E2BC AE000040 */   sw       $zero, 0x40($s0)
+dlabel LE007E2C0_37F9E0
+/* 37F9E0 E007E2C0 28620008 */  slti      $v0, $v1, 8
+/* 37F9E4 E007E2C4 14400004 */  bnez      $v0, .LE007E2D8
+/* 37F9E8 E007E2C8 00000000 */   nop
+/* 37F9EC E007E2CC 8E020004 */  lw        $v0, 4($s0)
+/* 37F9F0 E007E2D0 0801F909 */  j         .LE007E424
+/* 37F9F4 E007E2D4 AE000040 */   sw       $zero, 0x40($s0)
+.LE007E2D8:
+/* 37F9F8 E007E2D8 3C02E008 */  lui       $v0, %hi(D_E007EC2F)
+/* 37F9FC E007E2DC 00431021 */  addu      $v0, $v0, $v1
+/* 37FA00 E007E2E0 8042EC2F */  lb        $v0, %lo(D_E007EC2F)($v0)
+/* 37FA04 E007E2E4 3C01E008 */  lui       $at, %hi(D_E007EC68)
+/* 37FA08 E007E2E8 D422EC68 */  ldc1      $f2, %lo(D_E007EC68)($at)
+/* 37FA0C E007E2EC 44820000 */  mtc1      $v0, $f0
+/* 37FA10 E007E2F0 00000000 */  nop
+/* 37FA14 E007E2F4 46800021 */  cvt.d.w   $f0, $f0
+/* 37FA18 E007E2F8 46220002 */  mul.d     $f0, $f0, $f2
+/* 37FA1C E007E2FC 00000000 */  nop
+/* 37FA20 E007E300 AE000034 */  sw        $zero, 0x34($s0)
+/* 37FA24 E007E304 AE000038 */  sw        $zero, 0x38($s0)
+/* 37FA28 E007E308 46200020 */  cvt.s.d   $f0, $f0
+/* 37FA2C E007E30C 0801F90B */  j         .LE007E42C
+/* 37FA30 E007E310 E6000030 */   swc1     $f0, 0x30($s0)
+dlabel LE007E314_37FA34
+/* 37FA34 E007E314 28620002 */  slti      $v0, $v1, 2
+/* 37FA38 E007E318 14400004 */  bnez      $v0, .LE007E32C
+/* 37FA3C E007E31C 24020001 */   addiu    $v0, $zero, 1
+/* 37FA40 E007E320 8E020004 */  lw        $v0, 4($s0)
+/* 37FA44 E007E324 0801F909 */  j         .LE007E424
+/* 37FA48 E007E328 AE000040 */   sw       $zero, 0x40($s0)
+.LE007E32C:
+/* 37FA4C E007E32C 0801F90B */  j         .LE007E42C
+/* 37FA50 E007E330 AE020034 */   sw       $v0, 0x34($s0)
+dlabel LE007E334_37FA54
+/* 37FA54 E007E334 2862000F */  slti      $v0, $v1, 0xf
+/* 37FA58 E007E338 14400004 */  bnez      $v0, .LE007E34C
+/* 37FA5C E007E33C 24020002 */   addiu    $v0, $zero, 2
+/* 37FA60 E007E340 8E020004 */  lw        $v0, 4($s0)
+/* 37FA64 E007E344 0801F909 */  j         .LE007E424
+/* 37FA68 E007E348 AE000040 */   sw       $zero, 0x40($s0)
+.LE007E34C:
+/* 37FA6C E007E34C 0801F90B */  j         .LE007E42C
+/* 37FA70 E007E350 AE020034 */   sw       $v0, 0x34($s0)
+dlabel LE007E354_37FA74
+/* 37FA74 E007E354 2862002D */  slti      $v0, $v1, 0x2d
+/* 37FA78 E007E358 14400004 */  bnez      $v0, .LE007E36C
+/* 37FA7C E007E35C 24020003 */   addiu    $v0, $zero, 3
+/* 37FA80 E007E360 8E020004 */  lw        $v0, 4($s0)
+/* 37FA84 E007E364 0801F909 */  j         .LE007E424
+/* 37FA88 E007E368 AE000040 */   sw       $zero, 0x40($s0)
+.LE007E36C:
+/* 37FA8C E007E36C AE020034 */  sw        $v0, 0x34($s0)
+/* 37FA90 E007E370 30620001 */  andi      $v0, $v1, 1
+/* 37FA94 E007E374 10400005 */  beqz      $v0, .LE007E38C
+/* 37FA98 E007E378 AE00002C */   sw       $zero, 0x2c($s0)
+/* 37FA9C E007E37C 3C013F80 */  lui       $at, 0x3f80
+/* 37FAA0 E007E380 44810000 */  mtc1      $at, $f0
+/* 37FAA4 E007E384 0801F90B */  j         .LE007E42C
+/* 37FAA8 E007E388 E6000030 */   swc1     $f0, 0x30($s0)
+.LE007E38C:
+/* 37FAAC E007E38C 3C013F86 */  lui       $at, 0x3f86
+/* 37FAB0 E007E390 34216666 */  ori       $at, $at, 0x6666
+/* 37FAB4 E007E394 44810000 */  mtc1      $at, $f0
+/* 37FAB8 E007E398 0801F90B */  j         .LE007E42C
+/* 37FABC E007E39C E6000030 */   swc1     $f0, 0x30($s0)
+dlabel LE007E3A0_37FAC0
+/* 37FAC0 E007E3A0 2862000A */  slti      $v0, $v1, 0xa
+/* 37FAC4 E007E3A4 54400004 */  bnel      $v0, $zero, .LE007E3B8
+/* 37FAC8 E007E3A8 AE000034 */   sw       $zero, 0x34($s0)
+/* 37FACC E007E3AC 8E020004 */  lw        $v0, 4($s0)
+/* 37FAD0 E007E3B0 0801F909 */  j         .LE007E424
+/* 37FAD4 E007E3B4 AE000040 */   sw       $zero, 0x40($s0)
+.LE007E3B8:
+/* 37FAD8 E007E3B8 3C01C120 */  lui       $at, 0xc120
+/* 37FADC E007E3BC 44810000 */  mtc1      $at, $f0
+/* 37FAE0 E007E3C0 0801F90B */  j         .LE007E42C
+/* 37FAE4 E007E3C4 E600002C */   swc1     $f0, 0x2c($s0)
+dlabel LE007E3C8_37FAE8
+/* 37FAE8 E007E3C8 C6040028 */  lwc1      $f4, 0x28($s0)
+/* 37FAEC E007E3CC 3C014210 */  lui       $at, 0x4210
+/* 37FAF0 E007E3D0 44810000 */  mtc1      $at, $f0
+/* 37FAF4 E007E3D4 00000000 */  nop
+/* 37FAF8 E007E3D8 46002100 */  add.s     $f4, $f4, $f0
+/* 37FAFC E007E3DC 3C01E008 */  lui       $at, %hi(D_E007EC70)
+/* 37FB00 E007E3E0 D422EC70 */  ldc1      $f2, %lo(D_E007EC70)($at)
+/* 37FB04 E007E3E4 C600003C */  lwc1      $f0, 0x3c($s0)
+/* 37FB08 E007E3E8 46800021 */  cvt.d.w   $f0, $f0
+/* 37FB0C E007E3EC 46220002 */  mul.d     $f0, $f0, $f2
+/* 37FB10 E007E3F0 00000000 */  nop
+/* 37FB14 E007E3F4 E6040028 */  swc1      $f4, 0x28($s0)
+/* 37FB18 E007E3F8 46002086 */  mov.s     $f2, $f4
+/* 37FB1C E007E3FC 3C014434 */  lui       $at, 0x4434
+/* 37FB20 E007E400 44812000 */  mtc1      $at, $f4
+/* 37FB24 E007E404 AE000034 */  sw        $zero, 0x34($s0)
+/* 37FB28 E007E408 4602203E */  c.le.s    $f4, $f2
+/* 37FB2C E007E40C 4620028D */  trunc.w.d $f10, $f0
+/* 37FB30 E007E410 E60A003C */  swc1      $f10, 0x3c($s0)
+/* 37FB34 E007E414 45000005 */  bc1f      .LE007E42C
+/* 37FB38 E007E418 00000000 */   nop
+/* 37FB3C E007E41C 8E020004 */  lw        $v0, 4($s0)
+/* 37FB40 E007E420 E6040028 */  swc1      $f4, 0x28($s0)
+.LE007E424:
+/* 37FB44 E007E424 24420001 */  addiu     $v0, $v0, 1
+/* 37FB48 E007E428 AE020004 */  sw        $v0, 4($s0)
+.LE007E42C:
+/* 37FB4C E007E42C 8E050004 */  lw        $a1, 4($s0)
+/* 37FB50 E007E430 24A2FFFC */  addiu     $v0, $a1, -4
+/* 37FB54 E007E434 2C420003 */  sltiu     $v0, $v0, 3
+/* 37FB58 E007E438 1040002E */  beqz      $v0, .LE007E4F4
+/* 37FB5C E007E43C 2610004C */   addiu    $s0, $s0, 0x4c
+/* 37FB60 E007E440 8E220008 */  lw        $v0, 8($s1)
+/* 37FB64 E007E444 24040001 */  addiu     $a0, $zero, 1
+/* 37FB68 E007E448 0082102A */  slt       $v0, $a0, $v0
+/* 37FB6C E007E44C 10400029 */  beqz      $v0, .LE007E4F4
+/* 37FB70 E007E450 00000000 */   nop
+/* 37FB74 E007E454 24060004 */  addiu     $a2, $zero, 4
+/* 37FB78 E007E458 3C014348 */  lui       $at, 0x4348
+/* 37FB7C E007E45C 44814000 */  mtc1      $at, $f8
+/* 37FB80 E007E460 26030010 */  addiu     $v1, $s0, 0x10
+.LE007E464:
+/* 37FB84 E007E464 8C620038 */  lw        $v0, 0x38($v1)
+/* 37FB88 E007E468 18400003 */  blez      $v0, .LE007E478
+/* 37FB8C E007E46C 2442FFFF */   addiu    $v0, $v0, -1
+/* 37FB90 E007E470 1C40001B */  bgtz      $v0, .LE007E4E0
+/* 37FB94 E007E474 AC620038 */   sw       $v0, 0x38($v1)
+.LE007E478:
+/* 37FB98 E007E478 C4620008 */  lwc1      $f2, 8($v1)
+/* 37FB9C E007E47C C4600010 */  lwc1      $f0, 0x10($v1)
+/* 37FBA0 E007E480 C466FFF8 */  lwc1      $f6, -8($v1)
+/* 37FBA4 E007E484 46001080 */  add.s     $f2, $f2, $f0
+/* 37FBA8 E007E488 C4600004 */  lwc1      $f0, 4($v1)
+/* 37FBAC E007E48C C4640000 */  lwc1      $f4, ($v1)
+/* 37FBB0 E007E490 46003180 */  add.s     $f6, $f6, $f0
+/* 37FBB4 E007E494 C460000C */  lwc1      $f0, 0xc($v1)
+/* 37FBB8 E007E498 46002100 */  add.s     $f4, $f4, $f0
+/* 37FBBC E007E49C E4620008 */  swc1      $f2, 8($v1)
+/* 37FBC0 E007E4A0 C462FFFC */  lwc1      $f2, -4($v1)
+/* 37FBC4 E007E4A4 C4600008 */  lwc1      $f0, 8($v1)
+/* 37FBC8 E007E4A8 46001080 */  add.s     $f2, $f2, $f0
+/* 37FBCC E007E4AC E466FFF8 */  swc1      $f6, -8($v1)
+/* 37FBD0 E007E4B0 E4640000 */  swc1      $f4, ($v1)
+/* 37FBD4 E007E4B4 14A6000A */  bne       $a1, $a2, .LE007E4E0
+/* 37FBD8 E007E4B8 E462FFFC */   swc1     $f2, -4($v1)
+/* 37FBDC E007E4BC 46003006 */  mov.s     $f0, $f6
+/* 37FBE0 E007E4C0 4600403C */  c.lt.s    $f8, $f0
+/* 37FBE4 E007E4C4 00000000 */  nop
+/* 37FBE8 E007E4C8 45020006 */  bc1fl     .LE007E4E4
+/* 37FBEC E007E4CC 24840001 */   addiu    $a0, $a0, 1
+/* 37FBF0 E007E4D0 AC60FFF8 */  sw        $zero, -8($v1)
+/* 37FBF4 E007E4D4 AC60FFFC */  sw        $zero, -4($v1)
+/* 37FBF8 E007E4D8 AC600008 */  sw        $zero, 8($v1)
+/* 37FBFC E007E4DC AC600000 */  sw        $zero, ($v1)
+.LE007E4E0:
+/* 37FC00 E007E4E0 24840001 */  addiu     $a0, $a0, 1
+.LE007E4E4:
+/* 37FC04 E007E4E4 8E220008 */  lw        $v0, 8($s1)
+/* 37FC08 E007E4E8 0082102A */  slt       $v0, $a0, $v0
+/* 37FC0C E007E4EC 1440FFDD */  bnez      $v0, .LE007E464
+/* 37FC10 E007E4F0 2463004C */   addiu    $v1, $v1, 0x4c
+.LE007E4F4:
+/* 37FC14 E007E4F4 8FBF0020 */  lw        $ra, 0x20($sp)
+/* 37FC18 E007E4F8 8FB1001C */  lw        $s1, 0x1c($sp)
+/* 37FC1C E007E4FC 8FB00018 */  lw        $s0, 0x18($sp)
+/* 37FC20 E007E500 03E00008 */  jr        $ra
+/* 37FC24 E007E504 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s b/ver/us/asm/nonmatchings/effects/firework/firework_main.s
similarity index 95%
rename from ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s
rename to ver/us/asm/nonmatchings/effects/firework/firework_main.s
index 4270d0ac97..1856086446 100644
--- a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_main.s
+++ b/ver/us/asm/nonmatchings/effects/firework/firework_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_67_main
+glabel firework_main
 /* 389850 E0086000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 389854 E0086004 AFB00028 */  sw        $s0, 0x28($sp)
 /* 389858 E0086008 0080802D */  daddu     $s0, $a0, $zero
@@ -15,14 +15,14 @@ glabel fx_67_main
 /* 389878 E0086028 F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 38987C E008602C 4487C000 */  mtc1      $a3, $f24
 /* 389880 E0086030 8FA3007C */  lw        $v1, 0x7c($sp)
-/* 389884 E0086034 3C02E008 */  lui       $v0, %hi(fx_67_init)
-/* 389888 E0086038 24426270 */  addiu     $v0, $v0, %lo(fx_67_init)
+/* 389884 E0086034 3C02E008 */  lui       $v0, %hi(firework_init)
+/* 389888 E0086038 24426270 */  addiu     $v0, $v0, %lo(firework_init)
 /* 38988C E008603C AFA20018 */  sw        $v0, 0x18($sp)
-/* 389890 E0086040 3C02E008 */  lui       $v0, %hi(fx_67_update)
-/* 389894 E0086044 24426278 */  addiu     $v0, $v0, %lo(fx_67_update)
+/* 389890 E0086040 3C02E008 */  lui       $v0, %hi(firework_update)
+/* 389894 E0086044 24426278 */  addiu     $v0, $v0, %lo(firework_update)
 /* 389898 E0086048 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38989C E008604C 3C02E008 */  lui       $v0, %hi(fx_67_render)
-/* 3898A0 E0086050 24426390 */  addiu     $v0, $v0, %lo(fx_67_render)
+/* 38989C E008604C 3C02E008 */  lui       $v0, %hi(firework_render)
+/* 3898A0 E0086050 24426390 */  addiu     $v0, $v0, %lo(firework_render)
 /* 3898A4 E0086054 AFBF0048 */  sw        $ra, 0x48($sp)
 /* 3898A8 E0086058 AFB70044 */  sw        $s7, 0x44($sp)
 /* 3898AC E008605C AFB60040 */  sw        $s6, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_update.s b/ver/us/asm/nonmatchings/effects/firework/firework_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_67/fx_67_update.s
rename to ver/us/asm/nonmatchings/effects/firework/firework_update.s
index c86144f640..eae699205a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_67/fx_67_update.s
+++ b/ver/us/asm/nonmatchings/effects/firework/firework_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_67_update
+glabel firework_update
 /* 389AC8 E0086278 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 389ACC E008627C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 389AD0 E0086280 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_67/func_E0086398.s b/ver/us/asm/nonmatchings/effects/firework/func_E0086398.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_67/func_E0086398.s
rename to ver/us/asm/nonmatchings/effects/firework/func_E0086398.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_67/func_E00863B4.s b/ver/us/asm/nonmatchings/effects/firework/func_E00863B4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_67/func_E00863B4.s
rename to ver/us/asm/nonmatchings/effects/firework/func_E00863B4.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_appendGfx.s b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_119/fx_119_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_appendGfx.s
index 456aa08d8b..1fc116252d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_119_appendGfx
+glabel firework_rocket_appendGfx
 /* 3E4888 E010A4E8 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 3E488C E010A4EC AFB70094 */  sw        $s7, 0x94($sp)
 /* 3E4890 E010A4F0 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s
rename to ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_main.s
index 23434eeb92..2fcc6955b8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_main.s
+++ b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_119_main
+glabel firework_rocket_main
 /* 3E43A0 E010A000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3E43A4 E010A004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3E43A8 E010A008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_119_main
 /* 3E43C4 E010A024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E43C8 E010A028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3E43CC E010A02C 8FB10070 */  lw        $s1, 0x70($sp)
-/* 3E43D0 E010A030 3C02E011 */  lui       $v0, %hi(fx_119_init)
-/* 3E43D4 E010A034 2442A184 */  addiu     $v0, $v0, %lo(fx_119_init)
+/* 3E43D0 E010A030 3C02E011 */  lui       $v0, %hi(firework_rocket_init)
+/* 3E43D4 E010A034 2442A184 */  addiu     $v0, $v0, %lo(firework_rocket_init)
 /* 3E43D8 E010A038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E43DC E010A03C 3C02E011 */  lui       $v0, %hi(fx_119_update)
-/* 3E43E0 E010A040 2442A18C */  addiu     $v0, $v0, %lo(fx_119_update)
+/* 3E43DC E010A03C 3C02E011 */  lui       $v0, %hi(firework_rocket_update)
+/* 3E43E0 E010A040 2442A18C */  addiu     $v0, $v0, %lo(firework_rocket_update)
 /* 3E43E4 E010A044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E43E8 E010A048 3C02E011 */  lui       $v0, %hi(fx_119_render)
-/* 3E43EC E010A04C 2442A4A0 */  addiu     $v0, $v0, %lo(fx_119_render)
+/* 3E43E8 E010A048 3C02E011 */  lui       $v0, %hi(firework_rocket_render)
+/* 3E43EC E010A04C 2442A4A0 */  addiu     $v0, $v0, %lo(firework_rocket_render)
 /* 3E43F0 E010A050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E43F4 E010A054 24020077 */  addiu     $v0, $zero, 0x77
 /* 3E43F8 E010A058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_update.s b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_119/fx_119_update.s
rename to ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_update.s
index 9e0d3abf18..b5f15c08a9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_119/fx_119_update.s
+++ b/ver/us/asm/nonmatchings/effects/firework_rocket/firework_rocket_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_119_update
+glabel firework_rocket_update
 /* 3E452C E010A18C 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3E4530 E010A190 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 3E4534 E010A194 AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_appendGfx.s b/ver/us/asm/nonmatchings/effects/flame/flame_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_32/fx_32_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/flame/flame_appendGfx.s
index 631ae7fdc2..e1eea25d10 100644
--- a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/flame/flame_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_32_appendGfx
+glabel flame_appendGfx
 /* 353648 E0040348 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 35364C E004034C 3C03DB06 */  lui       $v1, 0xdb06
 /* 353650 E0040350 AFB400E8 */  sw        $s4, 0xe8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s b/ver/us/asm/nonmatchings/effects/flame/flame_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s
rename to ver/us/asm/nonmatchings/effects/flame/flame_main.s
index f3bbae73a2..c8059a4c40 100644
--- a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_main.s
+++ b/ver/us/asm/nonmatchings/effects/flame/flame_main.s
@@ -6,7 +6,7 @@ dlabel D_E0040890
 .double 0.01
 
 .section .text
-glabel fx_32_main
+glabel flame_main
 /* 353300 E0040000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 353304 E0040004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 353308 E0040008 4485A000 */  mtc1      $a1, $f20
@@ -25,14 +25,14 @@ glabel fx_32_main
 /* 35333C E004003C AFB1002C */   sw       $s1, 0x2c($sp)
 /* 353340 E0040040 24100003 */  addiu     $s0, $zero, 3
 .LE0040044:
-/* 353344 E0040044 3C02E004 */  lui       $v0, %hi(fx_32_init)
-/* 353348 E0040048 24420148 */  addiu     $v0, $v0, %lo(fx_32_init)
+/* 353344 E0040044 3C02E004 */  lui       $v0, %hi(flame_init)
+/* 353348 E0040048 24420148 */  addiu     $v0, $v0, %lo(flame_init)
 /* 35334C E004004C AFA20018 */  sw        $v0, 0x18($sp)
-/* 353350 E0040050 3C02E004 */  lui       $v0, %hi(fx_32_update)
-/* 353354 E0040054 24420150 */  addiu     $v0, $v0, %lo(fx_32_update)
+/* 353350 E0040050 3C02E004 */  lui       $v0, %hi(flame_update)
+/* 353354 E0040054 24420150 */  addiu     $v0, $v0, %lo(flame_update)
 /* 353358 E0040058 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35335C E004005C 3C02E004 */  lui       $v0, %hi(fx_32_render)
-/* 353360 E0040060 24420210 */  addiu     $v0, $v0, %lo(fx_32_render)
+/* 35335C E004005C 3C02E004 */  lui       $v0, %hi(flame_render)
+/* 353360 E0040060 24420210 */  addiu     $v0, $v0, %lo(flame_render)
 /* 353364 E0040064 AFA20020 */  sw        $v0, 0x20($sp)
 /* 353368 E0040068 24020020 */  addiu     $v0, $zero, 0x20
 /* 35336C E004006C AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_update.s b/ver/us/asm/nonmatchings/effects/flame/flame_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_32/fx_32_update.s
rename to ver/us/asm/nonmatchings/effects/flame/flame_update.s
index f205ba0b15..502fbecb16 100644
--- a/ver/us/asm/nonmatchings/effects/effect_32/fx_32_update.s
+++ b/ver/us/asm/nonmatchings/effects/flame/flame_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_32_update
+glabel flame_update
 /* 353450 E0040150 8C820008 */  lw        $v0, 8($a0)
 /* 353454 E0040154 8C83000C */  lw        $v1, 0xc($a0)
 /* 353458 E0040158 1840002B */  blez      $v0, .LE0040208
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_appendGfx.s b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_74/fx_74_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_appendGfx.s
index 5096706e28..b58065dd2c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_74_appendGfx
+glabel flashing_box_shockwave_appendGfx
 /* 392BCC E00942FC 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 392BD0 E0094300 AFB000D8 */  sw        $s0, 0xd8($sp)
 /* 392BD4 E0094304 0080802D */  daddu     $s0, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s
rename to ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_main.s
index 2812add5a9..132575dcc8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_main.s
+++ b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_74_main
+glabel flashing_box_shockwave_main
 /* 3928D0 E0094000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3928D4 E0094004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3928D8 E0094008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_74_main
 /* 3928EC E009401C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3928F0 E0094020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3928F4 E0094024 4487C000 */  mtc1      $a3, $f24
-/* 3928F8 E0094028 3C02E009 */  lui       $v0, %hi(fx_74_init)
-/* 3928FC E009402C 24424190 */  addiu     $v0, $v0, %lo(fx_74_init)
+/* 3928F8 E0094028 3C02E009 */  lui       $v0, %hi(flashing_box_shockwave_init)
+/* 3928FC E009402C 24424190 */  addiu     $v0, $v0, %lo(flashing_box_shockwave_init)
 /* 392900 E0094030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 392904 E0094034 3C02E009 */  lui       $v0, %hi(fx_74_update)
-/* 392908 E0094038 24424198 */  addiu     $v0, $v0, %lo(fx_74_update)
+/* 392904 E0094034 3C02E009 */  lui       $v0, %hi(flashing_box_shockwave_update)
+/* 392908 E0094038 24424198 */  addiu     $v0, $v0, %lo(flashing_box_shockwave_update)
 /* 39290C E009403C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 392910 E0094040 3C02E009 */  lui       $v0, %hi(fx_74_render)
-/* 392914 E0094044 244242C0 */  addiu     $v0, $v0, %lo(fx_74_render)
+/* 392910 E0094040 3C02E009 */  lui       $v0, %hi(flashing_box_shockwave_render)
+/* 392914 E0094044 244242C0 */  addiu     $v0, $v0, %lo(flashing_box_shockwave_render)
 /* 392918 E0094048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39291C E009404C 2402004A */  addiu     $v0, $zero, 0x4a
 /* 392920 E0094050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_update.s b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_74/fx_74_update.s
rename to ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_update.s
index 5bca92469b..9cd01906a8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_74/fx_74_update.s
+++ b/ver/us/asm/nonmatchings/effects/flashing_box_shockwave/flashing_box_shockwave_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_74_update
+glabel flashing_box_shockwave_update
 /* 392A68 E0094198 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 392A6C E009419C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 392A70 E00941A0 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_appendGfx.s b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_105/fx_105_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_appendGfx.s
index 26b5d1f3a8..e7b77d46e1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_105_appendGfx
+glabel floating_cloud_puff_appendGfx
 /* 3D4BF4 E00D2284 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3D4BF8 E00D2288 0080302D */  daddu     $a2, $a0, $zero
 /* 3D4BFC E00D228C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_main.s
similarity index 87%
rename from ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s
rename to ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_main.s
index bc809bffd7..ddb98bcf14 100644
--- a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_main.s
+++ b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_105_main
+glabel floating_cloud_puff_main
 /* 3D4970 E00D2000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3D4974 E00D2004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3D4978 E00D2008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_105_main
 /* 3D4994 E00D2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D4998 E00D2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3D499C E00D202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3D49A0 E00D2030 3C02E00D */  lui       $v0, %hi(fx_105_init)
-/* 3D49A4 E00D2034 24422118 */  addiu     $v0, $v0, %lo(fx_105_init)
+/* 3D49A0 E00D2030 3C02E00D */  lui       $v0, %hi(floating_cloud_puff_init)
+/* 3D49A4 E00D2034 24422118 */  addiu     $v0, $v0, %lo(floating_cloud_puff_init)
 /* 3D49A8 E00D2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D49AC E00D203C 3C02E00D */  lui       $v0, %hi(fx_105_update)
-/* 3D49B0 E00D2040 24422120 */  addiu     $v0, $v0, %lo(fx_105_update)
+/* 3D49AC E00D203C 3C02E00D */  lui       $v0, %hi(floating_cloud_puff_update)
+/* 3D49B0 E00D2040 24422120 */  addiu     $v0, $v0, %lo(floating_cloud_puff_update)
 /* 3D49B4 E00D2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D49B8 E00D2048 3C02E00D */  lui       $v0, %hi(fx_105_render)
-/* 3D49BC E00D204C 24422234 */  addiu     $v0, $v0, %lo(fx_105_render)
+/* 3D49B8 E00D2048 3C02E00D */  lui       $v0, %hi(floating_cloud_puff_render)
+/* 3D49BC E00D204C 24422234 */  addiu     $v0, $v0, %lo(floating_cloud_puff_render)
 /* 3D49C0 E00D2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D49C4 E00D2054 24020069 */  addiu     $v0, $zero, 0x69
 /* 3D49C8 E00D2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_update.s b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_105/fx_105_update.s
rename to ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_update.s
index 69d2c080ff..23f02e152c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_105/fx_105_update.s
+++ b/ver/us/asm/nonmatchings/effects/floating_cloud_puff/floating_cloud_puff_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_105_update
+glabel floating_cloud_puff_update
 /* 3D4A90 E00D2120 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D4A94 E00D2124 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D4A98 E00D2128 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_appendGfx.s b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_76/fx_76_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_appendGfx.s
index 2ed761b24d..ea961cef3f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_76_appendGfx
+glabel floating_rock_appendGfx
 /* 395E9C E00982EC 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 395EA0 E00982F0 3C05DB06 */  lui       $a1, 0xdb06
 /* 395EA4 E00982F4 AFB50074 */  sw        $s5, 0x74($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s
rename to ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_main.s
index 6937bd7d52..d47d6cb77d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_main.s
+++ b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_76_main
+glabel floating_rock_main
 /* 395BB0 E0098000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 395BB4 E0098004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 395BB8 E0098008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_76_main
 /* 395BD4 E0098024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 395BD8 E0098028 F7BA0050 */  sdc1      $f26, 0x50($sp)
 /* 395BDC E009802C C7BA0074 */  lwc1      $f26, 0x74($sp)
-/* 395BE0 E0098030 3C02E00A */  lui       $v0, %hi(fx_76_init)
-/* 395BE4 E0098034 24428168 */  addiu     $v0, $v0, %lo(fx_76_init)
+/* 395BE0 E0098030 3C02E00A */  lui       $v0, %hi(floating_rock_init)
+/* 395BE4 E0098034 24428168 */  addiu     $v0, $v0, %lo(floating_rock_init)
 /* 395BE8 E0098038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 395BEC E009803C 3C02E00A */  lui       $v0, %hi(fx_76_update)
-/* 395BF0 E0098040 24428170 */  addiu     $v0, $v0, %lo(fx_76_update)
+/* 395BEC E009803C 3C02E00A */  lui       $v0, %hi(floating_rock_update)
+/* 395BF0 E0098040 24428170 */  addiu     $v0, $v0, %lo(floating_rock_update)
 /* 395BF4 E0098044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 395BF8 E0098048 3C02E00A */  lui       $v0, %hi(fx_76_render)
-/* 395BFC E009804C 2442829C */  addiu     $v0, $v0, %lo(fx_76_render)
+/* 395BF8 E0098048 3C02E00A */  lui       $v0, %hi(floating_rock_render)
+/* 395BFC E009804C 2442829C */  addiu     $v0, $v0, %lo(floating_rock_render)
 /* 395C00 E0098050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 395C04 E0098054 2402004C */  addiu     $v0, $zero, 0x4c
 /* 395C08 E0098058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_update.s b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_76/fx_76_update.s
rename to ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_update.s
index f274b6205a..2e49e95bb5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_76/fx_76_update.s
+++ b/ver/us/asm/nonmatchings/effects/floating_rock/floating_rock_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_76_update
+glabel floating_rock_update
 /* 395D20 E0098170 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 395D24 E0098174 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 395D28 E0098178 AFB1001C */  sw        $s1, 0x1c($sp)
@@ -58,7 +58,7 @@ glabel fx_76_update
 /* 395DF0 E0098240 8E050004 */  lw        $a1, 4($s0)
 /* 395DF4 E0098244 8E060008 */  lw        $a2, 8($s0)
 /* 395DF8 E0098248 8E07000C */  lw        $a3, 0xc($s0)
-/* 395DFC E009824C 0C00A800 */  jal       fx_21_main
+/* 395DFC E009824C 0C00A800 */  jal       dust_main
 /* 395E00 E0098250 24040002 */   addiu    $a0, $zero, 2
 /* 395E04 E0098254 2402001E */  addiu     $v0, $zero, 0x1e
 /* 395E08 E0098258 AE020048 */  sw        $v0, 0x48($s0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_appendGfx.s b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_97/fx_97_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_appendGfx.s
index fc87c3d567..6a98bc3319 100644
--- a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_97_appendGfx
+glabel fright_jar_appendGfx
 /* 3C13EC E00C221C 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3C13F0 E00C2220 0080302D */  daddu     $a2, $a0, $zero
 /* 3C13F4 E00C2224 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s
rename to ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_main.s
index 353b7cf42e..6cea8d38f8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_main.s
+++ b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_97_main
+glabel fright_jar_main
 /* 3C11D0 E00C2000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3C11D4 E00C2004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3C11D8 E00C2008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_97_main
 /* 3C11F4 E00C2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3C11F8 E00C2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3C11FC E00C202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3C1200 E00C2030 3C02E00C */  lui       $v0, %hi(fx_97_init)
-/* 3C1204 E00C2034 24422124 */  addiu     $v0, $v0, %lo(fx_97_init)
+/* 3C1200 E00C2030 3C02E00C */  lui       $v0, %hi(fright_jar_init)
+/* 3C1204 E00C2034 24422124 */  addiu     $v0, $v0, %lo(fright_jar_init)
 /* 3C1208 E00C2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3C120C E00C203C 3C02E00C */  lui       $v0, %hi(fx_97_update)
-/* 3C1210 E00C2040 2442212C */  addiu     $v0, $v0, %lo(fx_97_update)
+/* 3C120C E00C203C 3C02E00C */  lui       $v0, %hi(fright_jar_update)
+/* 3C1210 E00C2040 2442212C */  addiu     $v0, $v0, %lo(fright_jar_update)
 /* 3C1214 E00C2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3C1218 E00C2048 3C02E00C */  lui       $v0, %hi(fx_97_render)
-/* 3C121C E00C204C 244221CC */  addiu     $v0, $v0, %lo(fx_97_render)
+/* 3C1218 E00C2048 3C02E00C */  lui       $v0, %hi(fright_jar_render)
+/* 3C121C E00C204C 244221CC */  addiu     $v0, $v0, %lo(fright_jar_render)
 /* 3C1220 E00C2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3C1224 E00C2054 24020061 */  addiu     $v0, $zero, 0x61
 /* 3C1228 E00C2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_update.s b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_97/fx_97_update.s
rename to ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_update.s
index bf5f6e407e..6d1bbb1c38 100644
--- a/ver/us/asm/nonmatchings/effects/effect_97/fx_97_update.s
+++ b/ver/us/asm/nonmatchings/effects/fright_jar/fright_jar_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_97_update
+glabel fright_jar_update
 /* 3C12FC E00C212C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3C1300 E00C2130 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3C1304 E00C2134 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_appendGfx.s b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_19/fx_19_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_appendGfx.s
index 5034114379..b32db5d39f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_19_appendGfx
+glabel gather_energy_pink_appendGfx
 /* 33B674 E00264F4 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 33B678 E00264F8 AFB70104 */  sw        $s7, 0x104($sp)
 /* 33B67C E00264FC 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s
rename to ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_main.s
index 1da9888c58..2b64c4bcae 100644
--- a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_main.s
+++ b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_19_main
+glabel gather_energy_pink_main
 /* 33B180 E0026000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 33B184 E0026004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 33B188 E0026008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_19_main
 /* 33B1A4 E0026024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33B1A8 E0026028 F7BA0050 */  sdc1      $f26, 0x50($sp)
 /* 33B1AC E002602C C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* 33B1B0 E0026030 3C02E002 */  lui       $v0, %hi(fx_19_init)
-/* 33B1B4 E0026034 24426184 */  addiu     $v0, $v0, %lo(fx_19_init)
+/* 33B1B0 E0026030 3C02E002 */  lui       $v0, %hi(gather_energy_pink_init)
+/* 33B1B4 E0026034 24426184 */  addiu     $v0, $v0, %lo(gather_energy_pink_init)
 /* 33B1B8 E0026038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33B1BC E002603C 3C02E002 */  lui       $v0, %hi(fx_19_update)
-/* 33B1C0 E0026040 2442618C */  addiu     $v0, $v0, %lo(fx_19_update)
+/* 33B1BC E002603C 3C02E002 */  lui       $v0, %hi(gather_energy_pink_update)
+/* 33B1C0 E0026040 2442618C */  addiu     $v0, $v0, %lo(gather_energy_pink_update)
 /* 33B1C4 E0026044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33B1C8 E0026048 3C02E002 */  lui       $v0, %hi(fx_19_render)
-/* 33B1CC E002604C 244264B0 */  addiu     $v0, $v0, %lo(fx_19_render)
+/* 33B1C8 E0026048 3C02E002 */  lui       $v0, %hi(gather_energy_pink_render)
+/* 33B1CC E002604C 244264B0 */  addiu     $v0, $v0, %lo(gather_energy_pink_render)
 /* 33B1D0 E0026050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33B1D4 E0026054 24020013 */  addiu     $v0, $zero, 0x13
 /* 33B1D8 E0026058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_update.s b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_19/fx_19_update.s
rename to ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_update.s
index 1e04457014..18edb61fd5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_19/fx_19_update.s
+++ b/ver/us/asm/nonmatchings/effects/gather_energy_pink/gather_energy_pink_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_19_update
+glabel gather_energy_pink_update
 /* 33B30C E002618C 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 33B310 E0026190 AFB1003C */  sw        $s1, 0x3c($sp)
 /* 33B314 E0026194 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_appendGfx.s b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_71/fx_71_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_appendGfx.s
index defa70d5fe..419a675071 100644
--- a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_71_appendGfx
+glabel gather_magic_appendGfx
 /* 38F340 E008E4E0 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 38F344 E008E4E4 3C05DB06 */  lui       $a1, 0xdb06
 /* 38F348 E008E4E8 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s
rename to ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_main.s
index 64805c47ce..f8493806f5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_main.s
+++ b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_71_main
+glabel gather_magic_main
 /* 38EE60 E008E000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 38EE64 E008E004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 38EE68 E008E008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_71_main
 /* 38EE84 E008E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 38EE88 E008E028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 38EE8C E008E02C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 38EE90 E008E030 3C02E009 */  lui       $v0, %hi(fx_71_init)
-/* 38EE94 E008E034 2442E1FC */  addiu     $v0, $v0, %lo(fx_71_init)
+/* 38EE90 E008E030 3C02E009 */  lui       $v0, %hi(gather_magic_init)
+/* 38EE94 E008E034 2442E1FC */  addiu     $v0, $v0, %lo(gather_magic_init)
 /* 38EE98 E008E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38EE9C E008E03C 3C02E009 */  lui       $v0, %hi(fx_71_update)
-/* 38EEA0 E008E040 2442E204 */  addiu     $v0, $v0, %lo(fx_71_update)
+/* 38EE9C E008E03C 3C02E009 */  lui       $v0, %hi(gather_magic_update)
+/* 38EEA0 E008E040 2442E204 */  addiu     $v0, $v0, %lo(gather_magic_update)
 /* 38EEA4 E008E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38EEA8 E008E048 3C02E009 */  lui       $v0, %hi(fx_71_render)
-/* 38EEAC E008E04C 2442E498 */  addiu     $v0, $v0, %lo(fx_71_render)
+/* 38EEA8 E008E048 3C02E009 */  lui       $v0, %hi(gather_magic_render)
+/* 38EEAC E008E04C 2442E498 */  addiu     $v0, $v0, %lo(gather_magic_render)
 /* 38EEB0 E008E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 38EEB4 E008E054 24020047 */  addiu     $v0, $zero, 0x47
 /* 38EEB8 E008E058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_update.s b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_71/fx_71_update.s
rename to ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_update.s
index a1baf0ab19..1819726587 100644
--- a/ver/us/asm/nonmatchings/effects/effect_71/fx_71_update.s
+++ b/ver/us/asm/nonmatchings/effects/gather_magic/gather_magic_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_71_update
+glabel gather_magic_update
 /* 38F064 E008E204 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 38F068 E008E208 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 38F06C E008E20C 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_appendGfx.s b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_27/fx_27_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_appendGfx.s
index 06a455b185..4989740fc6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_27_appendGfx
+glabel got_item_outline_appendGfx
 /* 345704 E0036224 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 345708 E0036228 0080402D */  daddu     $t0, $a0, $zero
 /* 34570C E003622C AFBF00B8 */  sw        $ra, 0xb8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_main.s
similarity index 85%
rename from ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s
rename to ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_main.s
index db016209ae..92063d19b7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_main.s
+++ b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_27_main
+glabel got_item_outline_main
 /* 3454E0 E0036000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3454E4 E0036004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3454E8 E0036008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_27_main
 /* 3454FC E003601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 345500 E0036020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 345504 E0036024 4487C000 */  mtc1      $a3, $f24
-/* 345508 E0036028 3C02E003 */  lui       $v0, %hi(fx_27_init)
-/* 34550C E003602C 244260DC */  addiu     $v0, $v0, %lo(fx_27_init)
+/* 345508 E0036028 3C02E003 */  lui       $v0, %hi(got_item_outline_init)
+/* 34550C E003602C 244260DC */  addiu     $v0, $v0, %lo(got_item_outline_init)
 /* 345510 E0036030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 345514 E0036034 3C02E003 */  lui       $v0, %hi(fx_27_update)
-/* 345518 E0036038 244260E4 */  addiu     $v0, $v0, %lo(fx_27_update)
+/* 345514 E0036034 3C02E003 */  lui       $v0, %hi(got_item_outline_update)
+/* 345518 E0036038 244260E4 */  addiu     $v0, $v0, %lo(got_item_outline_update)
 /* 34551C E003603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 345520 E0036040 3C02E003 */  lui       $v0, %hi(fx_27_render)
-/* 345524 E0036044 244261D8 */  addiu     $v0, $v0, %lo(fx_27_render)
+/* 345520 E0036040 3C02E003 */  lui       $v0, %hi(got_item_outline_render)
+/* 345524 E0036044 244261D8 */  addiu     $v0, $v0, %lo(got_item_outline_render)
 /* 345528 E0036048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34552C E003604C 2402001B */  addiu     $v0, $zero, 0x1b
 /* 345530 E0036050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_update.s b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_27/fx_27_update.s
rename to ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_update.s
index 8b00907d62..7cd599763c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_27/fx_27_update.s
+++ b/ver/us/asm/nonmatchings/effects/got_item_outline/got_item_outline_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_27_update
+glabel got_item_outline_update
 /* 3455C4 E00360E4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3455C8 E00360E8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3455CC E00360EC 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_appendGfx.s b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_50/fx_50_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/green_impact/green_impact_appendGfx.s
index e5f26473b8..7c817d89d7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_50_appendGfx
+glabel green_impact_appendGfx
 /* 365324 E0064414 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 365328 E0064418 AFB300E4 */  sw        $s3, 0xe4($sp)
 /* 36532C E006441C 3C13800A */  lui       $s3, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s
rename to ver/us/asm/nonmatchings/effects/green_impact/green_impact_main.s
index 30670e2d1f..da36c00dc8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_main.s
+++ b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_50_main
+glabel green_impact_main
 /* 364F10 E0064000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 364F14 E0064004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 364F18 E0064008 4485A000 */  mtc1      $a1, $f20
@@ -23,15 +23,15 @@ glabel fx_50_main
 /* 364F58 E0064048 24110004 */  addiu     $s1, $zero, 4
 .LE006404C:
 /* 364F5C E006404C 26310001 */  addiu     $s1, $s1, 1
-/* 364F60 E0064050 3C02E006 */  lui       $v0, %hi(fx_50_init)
-/* 364F64 E0064054 2442419C */  addiu     $v0, $v0, %lo(fx_50_init)
+/* 364F60 E0064050 3C02E006 */  lui       $v0, %hi(green_impact_init)
+/* 364F64 E0064054 2442419C */  addiu     $v0, $v0, %lo(green_impact_init)
 /* 364F68 E0064058 AFA00010 */  sw        $zero, 0x10($sp)
 /* 364F6C E006405C AC820008 */  sw        $v0, 8($a0)
-/* 364F70 E0064060 3C02E006 */  lui       $v0, %hi(fx_50_update)
-/* 364F74 E0064064 244241A4 */  addiu     $v0, $v0, %lo(fx_50_update)
+/* 364F70 E0064060 3C02E006 */  lui       $v0, %hi(green_impact_update)
+/* 364F74 E0064064 244241A4 */  addiu     $v0, $v0, %lo(green_impact_update)
 /* 364F78 E0064068 AC82000C */  sw        $v0, 0xc($a0)
-/* 364F7C E006406C 3C02E006 */  lui       $v0, %hi(fx_50_render)
-/* 364F80 E0064070 244243DC */  addiu     $v0, $v0, %lo(fx_50_render)
+/* 364F7C E006406C 3C02E006 */  lui       $v0, %hi(green_impact_render)
+/* 364F80 E0064070 244243DC */  addiu     $v0, $v0, %lo(green_impact_render)
 /* 364F84 E0064074 AC820010 */  sw        $v0, 0x10($a0)
 /* 364F88 E0064078 24020032 */  addiu     $v0, $zero, 0x32
 /* 364F8C E006407C AC800014 */  sw        $zero, 0x14($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_update.s b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_50/fx_50_update.s
rename to ver/us/asm/nonmatchings/effects/green_impact/green_impact_update.s
index 23b1905479..6aaed81162 100644
--- a/ver/us/asm/nonmatchings/effects/effect_50/fx_50_update.s
+++ b/ver/us/asm/nonmatchings/effects/green_impact/green_impact_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_50_update
+glabel green_impact_update
 /* 3650B4 E00641A4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3650B8 E00641A8 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3650BC E00641AC 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_appendGfx.s b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_113/fx_113_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_appendGfx.s
index cacb9cd8f1..e3f30a6696 100644
--- a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_113_appendGfx
+glabel hieroglyphs_appendGfx
 /* 3DC528 E00E2218 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 3DC52C E00E221C 0080302D */  daddu     $a2, $a0, $zero
 /* 3DC530 E00E2220 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s
rename to ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_main.s
index 52e572c5ff..d28190b57c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_main.s
+++ b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_113_main
+glabel hieroglyphs_main
 /* 3DC310 E00E2000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3DC314 E00E2004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3DC318 E00E2008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_113_main
 /* 3DC334 E00E2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3DC338 E00E2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3DC33C E00E202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3DC340 E00E2030 3C02E00E */  lui       $v0, %hi(fx_113_init)
-/* 3DC344 E00E2034 2442212C */  addiu     $v0, $v0, %lo(fx_113_init)
+/* 3DC340 E00E2030 3C02E00E */  lui       $v0, %hi(hieroglyphs_init)
+/* 3DC344 E00E2034 2442212C */  addiu     $v0, $v0, %lo(hieroglyphs_init)
 /* 3DC348 E00E2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3DC34C E00E203C 3C02E00E */  lui       $v0, %hi(fx_113_update)
-/* 3DC350 E00E2040 24422134 */  addiu     $v0, $v0, %lo(fx_113_update)
+/* 3DC34C E00E203C 3C02E00E */  lui       $v0, %hi(hieroglyphs_update)
+/* 3DC350 E00E2040 24422134 */  addiu     $v0, $v0, %lo(hieroglyphs_update)
 /* 3DC354 E00E2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3DC358 E00E2048 3C02E00E */  lui       $v0, %hi(fx_113_render)
-/* 3DC35C E00E204C 244221C8 */  addiu     $v0, $v0, %lo(fx_113_render)
+/* 3DC358 E00E2048 3C02E00E */  lui       $v0, %hi(hieroglyphs_render)
+/* 3DC35C E00E204C 244221C8 */  addiu     $v0, $v0, %lo(hieroglyphs_render)
 /* 3DC360 E00E2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3DC364 E00E2054 24020071 */  addiu     $v0, $zero, 0x71
 /* 3DC368 E00E2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_update.s b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_113/fx_113_update.s
rename to ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_update.s
index 831faf3798..a569f64608 100644
--- a/ver/us/asm/nonmatchings/effects/effect_113/fx_113_update.s
+++ b/ver/us/asm/nonmatchings/effects/hieroglyphs/hieroglyphs_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_113_update
+glabel hieroglyphs_update
 /* 3DC444 E00E2134 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3DC448 E00E2138 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3DC44C E00E213C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_appendGfx.s b/ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_110/fx_110_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_appendGfx.s
index d1abd62a07..acc9d73259 100644
--- a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_110_appendGfx
+glabel huff_puff_breath_appendGfx
 /* 3D7D74 E00DC304 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3D7D78 E00DC308 0080302D */  daddu     $a2, $a0, $zero
 /* 3D7D7C E00DC30C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s b/ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s
rename to ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_main.s
index 82335565f4..b2dc4fdde0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_main.s
+++ b/ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_110_main
+glabel huff_puff_breath_main
 /* 3D7A70 E00DC000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3D7A74 E00DC004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3D7A78 E00DC008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_110_main
 /* 3D7A94 E00DC024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D7A98 E00DC028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3D7A9C E00DC02C 8FB00074 */  lw        $s0, 0x74($sp)
-/* 3D7AA0 E00DC030 3C02E00E */  lui       $v0, %hi(fx_110_init)
-/* 3D7AA4 E00DC034 2442C190 */  addiu     $v0, $v0, %lo(fx_110_init)
+/* 3D7AA0 E00DC030 3C02E00E */  lui       $v0, %hi(huff_puff_breath_init)
+/* 3D7AA4 E00DC034 2442C190 */  addiu     $v0, $v0, %lo(huff_puff_breath_init)
 /* 3D7AA8 E00DC038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D7AAC E00DC03C 3C02E00E */  lui       $v0, %hi(fx_110_update)
-/* 3D7AB0 E00DC040 2442C198 */  addiu     $v0, $v0, %lo(fx_110_update)
+/* 3D7AAC E00DC03C 3C02E00E */  lui       $v0, %hi(huff_puff_breath_update)
+/* 3D7AB0 E00DC040 2442C198 */  addiu     $v0, $v0, %lo(huff_puff_breath_update)
 /* 3D7AB4 E00DC044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D7AB8 E00DC048 3C02E00E */  lui       $v0, %hi(fx_110_render)
-/* 3D7ABC E00DC04C 2442C2C0 */  addiu     $v0, $v0, %lo(fx_110_render)
+/* 3D7AB8 E00DC048 3C02E00E */  lui       $v0, %hi(huff_puff_breath_render)
+/* 3D7ABC E00DC04C 2442C2C0 */  addiu     $v0, $v0, %lo(huff_puff_breath_render)
 /* 3D7AC0 E00DC050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D7AC4 E00DC054 2402006E */  addiu     $v0, $zero, 0x6e
 /* 3D7AC8 E00DC058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_update.s b/ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_110/fx_110_update.s
rename to ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_update.s
index 420a41747c..59d12e1069 100644
--- a/ver/us/asm/nonmatchings/effects/effect_110/fx_110_update.s
+++ b/ver/us/asm/nonmatchings/effects/huff_puff_breath/huff_puff_breath_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_110_update
+glabel huff_puff_breath_update
 /* 3D7C08 E00DC198 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D7C0C E00DC19C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D7C10 E00DC1A0 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_appendGfx.s b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_129/fx_129_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_appendGfx.s
index 3f73324807..b5f94a815a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_129_appendGfx
+glabel ice_pillar_appendGfx
 /* 409F08 E011E578 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 409F0C E011E57C 0080302D */  daddu     $a2, $a0, $zero
 /* 409F10 E011E580 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s
rename to ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_main.s
index 3662096186..15c3f33b74 100644
--- a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_main.s
+++ b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_129_main
+glabel ice_pillar_main
 /* 409990 E011E000 27BDFF88 */  addiu     $sp, $sp, -0x78
 /* 409994 E011E004 F7B60060 */  sdc1      $f22, 0x60($sp)
 /* 409998 E011E008 4485B000 */  mtc1      $a1, $f22
@@ -16,14 +16,14 @@ glabel fx_129_main
 /* 4099BC E011E02C 27A40028 */  addiu     $a0, $sp, 0x28
 /* 4099C0 E011E030 AFB20048 */  sw        $s2, 0x48($sp)
 /* 4099C4 E011E034 8FB2008C */  lw        $s2, 0x8c($sp)
-/* 4099C8 E011E038 3C02E012 */  lui       $v0, %hi(fx_129_init)
-/* 4099CC E011E03C 2442E18C */  addiu     $v0, $v0, %lo(fx_129_init)
+/* 4099C8 E011E038 3C02E012 */  lui       $v0, %hi(ice_pillar_init)
+/* 4099CC E011E03C 2442E18C */  addiu     $v0, $v0, %lo(ice_pillar_init)
 /* 4099D0 E011E040 AFA20030 */  sw        $v0, 0x30($sp)
-/* 4099D4 E011E044 3C02E012 */  lui       $v0, %hi(fx_129_update)
-/* 4099D8 E011E048 2442E194 */  addiu     $v0, $v0, %lo(fx_129_update)
+/* 4099D4 E011E044 3C02E012 */  lui       $v0, %hi(ice_pillar_update)
+/* 4099D8 E011E048 2442E194 */  addiu     $v0, $v0, %lo(ice_pillar_update)
 /* 4099DC E011E04C AFA20034 */  sw        $v0, 0x34($sp)
-/* 4099E0 E011E050 3C02E012 */  lui       $v0, %hi(fx_129_render)
-/* 4099E4 E011E054 2442E530 */  addiu     $v0, $v0, %lo(fx_129_render)
+/* 4099E0 E011E050 3C02E012 */  lui       $v0, %hi(ice_pillar_render)
+/* 4099E4 E011E054 2442E530 */  addiu     $v0, $v0, %lo(ice_pillar_render)
 /* 4099E8 E011E058 AFA20038 */  sw        $v0, 0x38($sp)
 /* 4099EC E011E05C 24020081 */  addiu     $v0, $zero, 0x81
 /* 4099F0 E011E060 AFBF0050 */  sw        $ra, 0x50($sp)
@@ -88,7 +88,7 @@ glabel fx_129_main
 /* 409ACC E011E13C AFA2001C */  sw        $v0, 0x1c($sp)
 /* 409AD0 E011E140 AFA00020 */  sw        $zero, 0x20($sp)
 /* 409AD4 E011E144 E7A20010 */  swc1      $f2, 0x10($sp)
-/* 409AD8 E011E148 0C039000 */  jal       fx_114_main
+/* 409AD8 E011E148 0C039000 */  jal       misc_particles_main
 /* 409ADC E011E14C E7A40014 */   swc1     $f4, 0x14($sp)
 /* 409AE0 E011E150 2404006F */  addiu     $a0, $zero, 0x6f
 /* 409AE4 E011E154 0C080150 */  jal       shim_load_effect
diff --git a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_update.s b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_129/fx_129_update.s
rename to ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_update.s
index 7c2a7f82f6..904782b2b3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_129/fx_129_update.s
+++ b/ver/us/asm/nonmatchings/effects/ice_pillar/ice_pillar_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_129_update
+glabel ice_pillar_update
 /* 409B24 E011E194 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 409B28 E011E198 AFB30024 */  sw        $s3, 0x24($sp)
 /* 409B2C E011E19C 0080982D */  daddu     $s3, $a0, $zero
@@ -93,7 +93,7 @@ glabel fx_129_update
 /* 409C78 E011E2E8 AFA20014 */  sw        $v0, 0x14($sp)
 /* 409C7C E011E2EC 44071000 */  mfc1      $a3, $f2
 /* 409C80 E011E2F0 46202120 */  cvt.s.d   $f4, $f4
-/* 409C84 E011E2F4 0C044000 */  jal       fx_122_main
+/* 409C84 E011E2F4 0C044000 */  jal       ice_shard_main
 /* 409C88 E011E2F8 E7A40010 */   swc1     $f4, 0x10($sp)
 /* 409C8C E011E2FC 2404000A */  addiu     $a0, $zero, 0xa
 /* 409C90 E011E300 0C080138 */  jal       shim_rand_int
@@ -213,7 +213,7 @@ glabel fx_129_update
 /* 409E48 E011E4B8 8E250004 */  lw        $a1, 4($s1)
 /* 409E4C E011E4BC 8E27000C */  lw        $a3, 0xc($s1)
 /* 409E50 E011E4C0 44062000 */  mfc1      $a2, $f4
-/* 409E54 E011E4C4 0C037800 */  jal       fx_111_main
+/* 409E54 E011E4C4 0C037800 */  jal       cold_breath_main
 /* 409E58 E011E4C8 24040002 */   addiu    $a0, $zero, 2
 .LE011E4CC:
 /* 409E5C E011E4CC 8E220028 */  lw        $v0, 0x28($s1)
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_appendGfx.s b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_122/fx_122_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_appendGfx.s
index df901f6995..cab8314181 100644
--- a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_122_appendGfx
+glabel ice_shard_appendGfx
 /* 3F87DC E01103EC 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3F87E0 E01103F0 0080402D */  daddu     $t0, $a0, $zero
 /* 3F87E4 E01103F4 3C09DB06 */  lui       $t1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s
rename to ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_main.s
index 6c6a9acc1d..8419286922 100644
--- a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_main.s
+++ b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_122_main
+glabel ice_shard_main
 /* 3F83F0 E0110000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3F83F4 E0110004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3F83F8 E0110008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_122_main
 /* 3F8414 E0110024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3F8418 E0110028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3F841C E011002C 8FB0006C */  lw        $s0, 0x6c($sp)
-/* 3F8420 E0110030 3C02E011 */  lui       $v0, %hi(fx_122_init)
-/* 3F8424 E0110034 24420224 */  addiu     $v0, $v0, %lo(fx_122_init)
+/* 3F8420 E0110030 3C02E011 */  lui       $v0, %hi(ice_shard_init)
+/* 3F8424 E0110034 24420224 */  addiu     $v0, $v0, %lo(ice_shard_init)
 /* 3F8428 E0110038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3F842C E011003C 3C02E011 */  lui       $v0, %hi(fx_122_update)
-/* 3F8430 E0110040 2442022C */  addiu     $v0, $v0, %lo(fx_122_update)
+/* 3F842C E011003C 3C02E011 */  lui       $v0, %hi(ice_shard_update)
+/* 3F8430 E0110040 2442022C */  addiu     $v0, $v0, %lo(ice_shard_update)
 /* 3F8434 E0110044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3F8438 E0110048 3C02E011 */  lui       $v0, %hi(fx_122_render)
-/* 3F843C E011004C 244203A4 */  addiu     $v0, $v0, %lo(fx_122_render)
+/* 3F8438 E0110048 3C02E011 */  lui       $v0, %hi(ice_shard_render)
+/* 3F843C E011004C 244203A4 */  addiu     $v0, $v0, %lo(ice_shard_render)
 /* 3F8440 E0110050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3F8444 E0110054 2402007A */  addiu     $v0, $zero, 0x7a
 /* 3F8448 E0110058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_update.s b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_122/fx_122_update.s
rename to ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_update.s
index da2acbe03b..f3c42878e1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_122/fx_122_update.s
+++ b/ver/us/asm/nonmatchings/effects/ice_shard/ice_shard_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_122_update
+glabel ice_shard_update
 /* 3F861C E011022C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3F8620 E0110230 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3F8624 E0110234 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_appendGfx.s b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_26/fx_26_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_appendGfx.s
index 8ef4384777..4a9e1511e1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_26_appendGfx
+glabel lens_flare_appendGfx
 /* 344D20 E0034310 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 344D24 E0034314 3C03DB06 */  lui       $v1, 0xdb06
 /* 344D28 E0034318 AFB600F8 */  sw        $s6, 0xf8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_main.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s
rename to ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_main.s
index 93e9f8365e..4ea988ff58 100644
--- a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_main.s
+++ b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_26_main
+glabel lens_flare_main
 /* 344A10 E0034000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 344A14 E0034004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 344A18 E0034008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_26_main
 /* 344A2C E003401C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 344A30 E0034020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 344A34 E0034024 4487C000 */  mtc1      $a3, $f24
-/* 344A38 E0034028 3C02E003 */  lui       $v0, %hi(fx_26_init)
-/* 344A3C E003402C 24424108 */  addiu     $v0, $v0, %lo(fx_26_init)
+/* 344A38 E0034028 3C02E003 */  lui       $v0, %hi(lens_flare_init)
+/* 344A3C E003402C 24424108 */  addiu     $v0, $v0, %lo(lens_flare_init)
 /* 344A40 E0034030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 344A44 E0034034 3C02E003 */  lui       $v0, %hi(fx_26_update)
-/* 344A48 E0034038 24424110 */  addiu     $v0, $v0, %lo(fx_26_update)
+/* 344A44 E0034034 3C02E003 */  lui       $v0, %hi(lens_flare_update)
+/* 344A48 E0034038 24424110 */  addiu     $v0, $v0, %lo(lens_flare_update)
 /* 344A4C E003403C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 344A50 E0034040 3C02E003 */  lui       $v0, %hi(fx_26_render)
-/* 344A54 E0034044 244242C8 */  addiu     $v0, $v0, %lo(fx_26_render)
+/* 344A50 E0034040 3C02E003 */  lui       $v0, %hi(lens_flare_render)
+/* 344A54 E0034044 244242C8 */  addiu     $v0, $v0, %lo(lens_flare_render)
 /* 344A58 E0034048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 344A5C E003404C 2402001A */  addiu     $v0, $zero, 0x1a
 /* 344A60 E0034050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_update.s b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_26/fx_26_update.s
rename to ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_update.s
index 47805f8376..405423f854 100644
--- a/ver/us/asm/nonmatchings/effects/effect_26/fx_26_update.s
+++ b/ver/us/asm/nonmatchings/effects/lens_flare/lens_flare_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_26_update
+glabel lens_flare_update
 /* 344B20 E0034110 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 344B24 E0034114 AFBF0018 */  sw        $ra, 0x18($sp)
 /* 344B28 E0034118 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A000.s b/ver/us/asm/nonmatchings/effects/light_rays/func_E006A000.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_53/func_E006A000.s
rename to ver/us/asm/nonmatchings/effects/light_rays/func_E006A000.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A0BC.s b/ver/us/asm/nonmatchings/effects/light_rays/func_E006A0BC.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_53/func_E006A0BC.s
rename to ver/us/asm/nonmatchings/effects/light_rays/func_E006A0BC.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A464.s b/ver/us/asm/nonmatchings/effects/light_rays/func_E006A464.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_53/func_E006A464.s
rename to ver/us/asm/nonmatchings/effects/light_rays/func_E006A464.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/func_E006A85C.s b/ver/us/asm/nonmatchings/effects/light_rays/func_E006A85C.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_53/func_E006A85C.s
rename to ver/us/asm/nonmatchings/effects/light_rays/func_E006A85C.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_appendGfx.s b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_53/fx_53_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/light_rays/light_rays_appendGfx.s
index 0c1ec1810b..503e0de03d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_53_appendGfx
+glabel light_rays_appendGfx
 /* 36D96C E006A94C 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 36D970 E006A950 AFA40120 */  sw        $a0, 0x120($sp)
 /* 36D974 E006A954 8FA80120 */  lw        $t0, 0x120($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_main.s
similarity index 95%
rename from ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s
rename to ver/us/asm/nonmatchings/effects/light_rays/light_rays_main.s
index b8bafeedef..2b5c538cbf 100644
--- a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_main.s
+++ b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_53_main
+glabel light_rays_main
 /* 36D208 E006A1E8 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 36D20C E006A1EC F7B60058 */  sdc1      $f22, 0x58($sp)
 /* 36D210 E006A1F0 4485B000 */  mtc1      $a1, $f22
@@ -27,14 +27,14 @@ glabel fx_53_main
 /* 36D260 E006A240 AFB1002C */   sw       $s1, 0x2c($sp)
 /* 36D264 E006A244 24120009 */  addiu     $s2, $zero, 9
 .LE006A248:
-/* 36D268 E006A248 3C02E007 */  lui       $v0, %hi(fx_53_init)
-/* 36D26C E006A24C 2442A45C */  addiu     $v0, $v0, %lo(fx_53_init)
+/* 36D268 E006A248 3C02E007 */  lui       $v0, %hi(light_rays_init)
+/* 36D26C E006A24C 2442A45C */  addiu     $v0, $v0, %lo(light_rays_init)
 /* 36D270 E006A250 AFA20018 */  sw        $v0, 0x18($sp)
-/* 36D274 E006A254 3C02E007 */  lui       $v0, %hi(fx_53_update)
-/* 36D278 E006A258 2442A580 */  addiu     $v0, $v0, %lo(fx_53_update)
+/* 36D274 E006A254 3C02E007 */  lui       $v0, %hi(light_rays_update)
+/* 36D278 E006A258 2442A580 */  addiu     $v0, $v0, %lo(light_rays_update)
 /* 36D27C E006A25C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 36D280 E006A260 3C02E007 */  lui       $v0, %hi(fx_53_render)
-/* 36D284 E006A264 2442A814 */  addiu     $v0, $v0, %lo(fx_53_render)
+/* 36D280 E006A260 3C02E007 */  lui       $v0, %hi(light_rays_render)
+/* 36D284 E006A264 2442A814 */  addiu     $v0, $v0, %lo(light_rays_render)
 /* 36D288 E006A268 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36D28C E006A26C 24020035 */  addiu     $v0, $zero, 0x35
 /* 36D290 E006A270 AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_update.s b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_53/fx_53_update.s
rename to ver/us/asm/nonmatchings/effects/light_rays/light_rays_update.s
index 068f024f51..e2a248c39a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_53/fx_53_update.s
+++ b/ver/us/asm/nonmatchings/effects/light_rays/light_rays_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_53_update
+glabel light_rays_update
 /* 36D5A0 E006A580 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 36D5A4 E006A584 AFB40020 */  sw        $s4, 0x20($sp)
 /* 36D5A8 E006A588 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_appendGfx.s b/ver/us/asm/nonmatchings/effects/lightning/lightning_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_54/fx_54_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/lightning/lightning_appendGfx.s
index 98ab83dd2c..9157922afb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/lightning/lightning_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_54_appendGfx
+glabel lightning_appendGfx
 /* 36E7B8 E006C5E8 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 36E7BC E006C5EC 3C05DB06 */  lui       $a1, 0xdb06
 /* 36E7C0 E006C5F0 AFB400C0 */  sw        $s4, 0xc0($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s b/ver/us/asm/nonmatchings/effects/lightning/lightning_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s
rename to ver/us/asm/nonmatchings/effects/lightning/lightning_main.s
index 9dfd8c2034..80f71d671e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_main.s
+++ b/ver/us/asm/nonmatchings/effects/lightning/lightning_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_54_main
+glabel lightning_main
 /* 36E1D0 E006C000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 36E1D4 E006C004 F7B60050 */  sdc1      $f22, 0x50($sp)
 /* 36E1D8 E006C008 4485B000 */  mtc1      $a1, $f22
@@ -12,14 +12,14 @@ glabel fx_54_main
 /* 36E1EC E006C01C 27A40018 */  addiu     $a0, $sp, 0x18
 /* 36E1F0 E006C020 F7BA0060 */  sdc1      $f26, 0x60($sp)
 /* 36E1F4 E006C024 4487D000 */  mtc1      $a3, $f26
-/* 36E1F8 E006C028 3C02E007 */  lui       $v0, %hi(fx_54_init)
-/* 36E1FC E006C02C 2442C298 */  addiu     $v0, $v0, %lo(fx_54_init)
+/* 36E1F8 E006C028 3C02E007 */  lui       $v0, %hi(lightning_init)
+/* 36E1FC E006C02C 2442C298 */  addiu     $v0, $v0, %lo(lightning_init)
 /* 36E200 E006C030 AFA20020 */  sw        $v0, 0x20($sp)
-/* 36E204 E006C034 3C02E007 */  lui       $v0, %hi(fx_54_update)
-/* 36E208 E006C038 2442C2A0 */  addiu     $v0, $v0, %lo(fx_54_update)
+/* 36E204 E006C034 3C02E007 */  lui       $v0, %hi(lightning_update)
+/* 36E208 E006C038 2442C2A0 */  addiu     $v0, $v0, %lo(lightning_update)
 /* 36E20C E006C03C AFA20024 */  sw        $v0, 0x24($sp)
-/* 36E210 E006C040 3C02E007 */  lui       $v0, %hi(fx_54_render)
-/* 36E214 E006C044 2442C5A0 */  addiu     $v0, $v0, %lo(fx_54_render)
+/* 36E210 E006C040 3C02E007 */  lui       $v0, %hi(lightning_render)
+/* 36E214 E006C044 2442C5A0 */  addiu     $v0, $v0, %lo(lightning_render)
 /* 36E218 E006C048 AFA20028 */  sw        $v0, 0x28($sp)
 /* 36E21C E006C04C 24020036 */  addiu     $v0, $zero, 0x36
 /* 36E220 E006C050 AFBF0044 */  sw        $ra, 0x44($sp)
@@ -97,7 +97,7 @@ glabel fx_54_main
 /* 36E330 E006C160 4481A000 */  mtc1      $at, $f20
 /* 36E334 E006C164 2402FFFF */  addiu     $v0, $zero, -1
 /* 36E338 E006C168 AFA20014 */  sw        $v0, 0x14($sp)
-/* 36E33C E006C16C 0C023800 */  jal       fx_71_main
+/* 36E33C E006C16C 0C023800 */  jal       gather_magic_main
 /* 36E340 E006C170 E7B40010 */   swc1     $f20, 0x10($sp)
 /* 36E344 E006C174 2404003C */  addiu     $a0, $zero, 0x3c
 /* 36E348 E006C178 0C080150 */  jal       shim_load_effect
@@ -107,7 +107,7 @@ glabel fx_54_main
 /* 36E358 E006C188 3C07429A */  lui       $a3, 0x429a
 /* 36E35C E006C18C 0000202D */  daddu     $a0, $zero, $zero
 /* 36E360 E006C190 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 36E364 E006C194 0C01E000 */  jal       fx_60_main
+/* 36E364 E006C194 0C01E000 */  jal       fx_3C_main
 /* 36E368 E006C198 AFB20014 */   sw       $s2, 0x14($sp)
 /* 36E36C E006C19C 0801B087 */  j         .LE006C21C
 /* 36E370 E006C1A0 2A820003 */   slti     $v0, $s4, 3
@@ -121,7 +121,7 @@ glabel fx_54_main
 /* 36E38C E006C1BC 44810000 */  mtc1      $at, $f0
 /* 36E390 E006C1C0 0000202D */  daddu     $a0, $zero, $zero
 /* 36E394 E006C1C4 AFA00014 */  sw        $zero, 0x14($sp)
-/* 36E398 E006C1C8 0C02B800 */  jal       fx_87_main
+/* 36E398 E006C1C8 0C02B800 */  jal       snaking_static_main
 /* 36E39C E006C1CC E7A00010 */   swc1     $f0, 0x10($sp)
 /* 36E3A0 E006C1D0 AE020048 */  sw        $v0, 0x48($s0)
 /* 36E3A4 E006C1D4 8C42000C */  lw        $v0, 0xc($v0)
@@ -161,7 +161,7 @@ glabel fx_54_main
 /* 36E420 E006C250 4407D000 */  mfc1      $a3, $f26
 /* 36E424 E006C254 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 36E428 E006C258 C7A0007C */  lwc1      $f0, 0x7c($sp)
-/* 36E42C E006C25C 0C025000 */  jal       fx_74_main
+/* 36E42C E006C25C 0C025000 */  jal       flashing_box_shockwave_main
 /* 36E430 E006C260 E7A00014 */   swc1     $f0, 0x14($sp)
 /* 36E434 E006C264 0260102D */  daddu     $v0, $s3, $zero
 .LE006C268:
diff --git a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_update.s b/ver/us/asm/nonmatchings/effects/lightning/lightning_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_54/fx_54_update.s
rename to ver/us/asm/nonmatchings/effects/lightning/lightning_update.s
index dd2eddd1ea..53600f0ef3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_54/fx_54_update.s
+++ b/ver/us/asm/nonmatchings/effects/lightning/lightning_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_54_update
+glabel lightning_update
 /* 36E470 E006C2A0 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 36E474 E006C2A4 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 36E478 E006C2A8 AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_appendGfx.s b/ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_94/fx_94_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_appendGfx.s
index bef380f97f..e1c9ca3b73 100644
--- a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_appendGfx.s
@@ -13,7 +13,7 @@ dlabel D_E00BCE68
 .double 0.1
 
 .section .text
-glabel fx_94_appendGfx
+glabel lightning_bolt_appendGfx
 /* 3BA3A4 E00BC374 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 3BA3A8 E00BC378 0080482D */  daddu     $t1, $a0, $zero
 /* 3BA3AC E00BC37C 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s b/ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s
rename to ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_main.s
index d7ab9a9246..f95b7b6039 100644
--- a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_main.s
+++ b/ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_main.s
@@ -7,7 +7,7 @@ dlabel D_E00BCE50
 .double 0.005
 
 .section .text
-glabel fx_94_main
+glabel lightning_bolt_main
 /* 3BA030 E00BC000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3BA034 E00BC004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3BA038 E00BC008 4485A000 */  mtc1      $a1, $f20
@@ -26,14 +26,14 @@ glabel fx_94_main
 /* 3BA06C E00BC03C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3BA070 E00BC040 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3BA074 E00BC044 8FB10090 */  lw        $s1, 0x90($sp)
-/* 3BA078 E00BC048 3C02E00C */  lui       $v0, %hi(fx_94_init)
-/* 3BA07C E00BC04C 2442C1D0 */  addiu     $v0, $v0, %lo(fx_94_init)
+/* 3BA078 E00BC048 3C02E00C */  lui       $v0, %hi(lightning_bolt_init)
+/* 3BA07C E00BC04C 2442C1D0 */  addiu     $v0, $v0, %lo(lightning_bolt_init)
 /* 3BA080 E00BC050 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3BA084 E00BC054 3C02E00C */  lui       $v0, %hi(fx_94_update)
-/* 3BA088 E00BC058 2442C238 */  addiu     $v0, $v0, %lo(fx_94_update)
+/* 3BA084 E00BC054 3C02E00C */  lui       $v0, %hi(lightning_bolt_update)
+/* 3BA088 E00BC058 2442C238 */  addiu     $v0, $v0, %lo(lightning_bolt_update)
 /* 3BA08C E00BC05C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3BA090 E00BC060 3C02E00C */  lui       $v0, %hi(fx_94_render)
-/* 3BA094 E00BC064 2442C2E8 */  addiu     $v0, $v0, %lo(fx_94_render)
+/* 3BA090 E00BC060 3C02E00C */  lui       $v0, %hi(lightning_bolt_render)
+/* 3BA094 E00BC064 2442C2E8 */  addiu     $v0, $v0, %lo(lightning_bolt_render)
 /* 3BA098 E00BC068 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3BA09C E00BC06C 2402005E */  addiu     $v0, $zero, 0x5e
 /* 3BA0A0 E00BC070 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_update.s b/ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_94/fx_94_update.s
rename to ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_update.s
index 09db93580f..227a6e00ab 100644
--- a/ver/us/asm/nonmatchings/effects/effect_94/fx_94_update.s
+++ b/ver/us/asm/nonmatchings/effects/lightning_bolt/lightning_bolt_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_94_update
+glabel lightning_bolt_update
 /* 3BA268 E00BC238 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3BA26C E00BC23C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3BA270 E00BC240 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_appendGfx.s b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_124/fx_124_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_appendGfx.s
index 31e52a0931..c116983c2d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_124_appendGfx
+glabel lil_oink_appendGfx
 /* 3FEE68 E0114388 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 3FEE6C E011438C 3C07DB06 */  lui       $a3, 0xdb06
 /* 3FEE70 E0114390 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_main.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s
rename to ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_main.s
index ec8016b9b1..e0a2f5c97f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_main.s
+++ b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_main.s
@@ -1,17 +1,17 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_124_main
+glabel lil_oink_main
 /* 3FEAE0 E0114000 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3FEAE4 E0114004 27A40010 */  addiu     $a0, $sp, 0x10
-/* 3FEAE8 E0114008 3C02E011 */  lui       $v0, %hi(fx_124_init)
-/* 3FEAEC E011400C 244240D4 */  addiu     $v0, $v0, %lo(fx_124_init)
+/* 3FEAE8 E0114008 3C02E011 */  lui       $v0, %hi(lil_oink_init)
+/* 3FEAEC E011400C 244240D4 */  addiu     $v0, $v0, %lo(lil_oink_init)
 /* 3FEAF0 E0114010 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3FEAF4 E0114014 3C02E011 */  lui       $v0, %hi(fx_124_update)
-/* 3FEAF8 E0114018 244240DC */  addiu     $v0, $v0, %lo(fx_124_update)
+/* 3FEAF4 E0114014 3C02E011 */  lui       $v0, %hi(lil_oink_update)
+/* 3FEAF8 E0114018 244240DC */  addiu     $v0, $v0, %lo(lil_oink_update)
 /* 3FEAFC E011401C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3FEB00 E0114020 3C02E011 */  lui       $v0, %hi(fx_124_render)
-/* 3FEB04 E0114024 24424340 */  addiu     $v0, $v0, %lo(fx_124_render)
+/* 3FEB00 E0114020 3C02E011 */  lui       $v0, %hi(lil_oink_render)
+/* 3FEB04 E0114024 24424340 */  addiu     $v0, $v0, %lo(lil_oink_render)
 /* 3FEB08 E0114028 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3FEB0C E011402C 2402007C */  addiu     $v0, $zero, 0x7c
 /* 3FEB10 E0114030 AFBF002C */  sw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_update.s b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_124/fx_124_update.s
rename to ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_update.s
index bd8070360b..cd1d43900d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_124/fx_124_update.s
+++ b/ver/us/asm/nonmatchings/effects/lil_oink/lil_oink_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_124_update
+glabel lil_oink_update
 /* 3FEBBC E01140DC 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3FEBC0 E01140E0 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3FEBC4 E01140E4 AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_appendGfx.s b/ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_83/fx_83_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_appendGfx.s
index a88822fffe..a6745e7242 100644
--- a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_83_appendGfx
+glabel merlin_house_stars_appendGfx
 /* 3A58F4 E00A63A4 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 3A58F8 E00A63A8 0080182D */  daddu     $v1, $a0, $zero
 /* 3A58FC E00A63AC 3C05DB06 */  lui       $a1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s b/ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_main.s
similarity index 88%
rename from ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s
rename to ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_main.s
index bfd5f9b5d3..d6880030d7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_main.s
+++ b/ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_83_main
+glabel merlin_house_stars_main
 /* 3A5550 E00A6000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3A5554 E00A6004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3A5558 E00A6008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_83_main
 /* 3A556C E00A601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A5570 E00A6020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3A5574 E00A6024 4487C000 */  mtc1      $a3, $f24
-/* 3A5578 E00A6028 3C02E00A */  lui       $v0, %hi(fx_83_init)
-/* 3A557C E00A602C 2442611C */  addiu     $v0, $v0, %lo(fx_83_init)
+/* 3A5578 E00A6028 3C02E00A */  lui       $v0, %hi(merlin_house_stars_init)
+/* 3A557C E00A602C 2442611C */  addiu     $v0, $v0, %lo(merlin_house_stars_init)
 /* 3A5580 E00A6030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A5584 E00A6034 3C02E00A */  lui       $v0, %hi(fx_83_update)
-/* 3A5588 E00A6038 24426124 */  addiu     $v0, $v0, %lo(fx_83_update)
+/* 3A5584 E00A6034 3C02E00A */  lui       $v0, %hi(merlin_house_stars_update)
+/* 3A5588 E00A6038 24426124 */  addiu     $v0, $v0, %lo(merlin_house_stars_update)
 /* 3A558C E00A603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A5590 E00A6040 3C02E00A */  lui       $v0, %hi(fx_83_render)
-/* 3A5594 E00A6044 24426358 */  addiu     $v0, $v0, %lo(fx_83_render)
+/* 3A5590 E00A6040 3C02E00A */  lui       $v0, %hi(merlin_house_stars_render)
+/* 3A5594 E00A6044 24426358 */  addiu     $v0, $v0, %lo(merlin_house_stars_render)
 /* 3A5598 E00A6048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A559C E00A604C 24020053 */  addiu     $v0, $zero, 0x53
 /* 3A55A0 E00A6050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_update.s b/ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_83/fx_83_update.s
rename to ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_update.s
index 87a24b6bb1..60e6e4816e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_83/fx_83_update.s
+++ b/ver/us/asm/nonmatchings/effects/merlin_house_stars/merlin_house_stars_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_83_update
+glabel merlin_house_stars_update
 /* 3A5674 E00A6124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3A5678 E00A6128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3A567C E00A612C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_appendGfx.s b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_114/fx_114_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_appendGfx.s
index 1c95b28cda..d04c7d0ffb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_114_appendGfx
+glabel misc_particles_appendGfx
 /* 3DE95C E00E495C 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 3DE960 E00E4960 AFB700BC */  sw        $s7, 0xbc($sp)
 /* 3DE964 E00E4964 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s
rename to ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_main.s
index 6638f78efb..0f18002e7e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_main.s
+++ b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_114_main
+glabel misc_particles_main
 /* 3DE000 E00E4000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3DE004 E00E4004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3DE008 E00E4008 4485A000 */  mtc1      $a1, $f20
@@ -16,14 +16,14 @@ glabel fx_114_main
 /* 3DE02C E00E402C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3DE030 E00E4030 AFB40038 */  sw        $s4, 0x38($sp)
 /* 3DE034 E00E4034 8FB40078 */  lw        $s4, 0x78($sp)
-/* 3DE038 E00E4038 3C02E00E */  lui       $v0, %hi(fx_114_init)
-/* 3DE03C E00E403C 24424288 */  addiu     $v0, $v0, %lo(fx_114_init)
+/* 3DE038 E00E4038 3C02E00E */  lui       $v0, %hi(misc_particles_init)
+/* 3DE03C E00E403C 24424288 */  addiu     $v0, $v0, %lo(misc_particles_init)
 /* 3DE040 E00E4040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3DE044 E00E4044 3C02E00E */  lui       $v0, %hi(fx_114_update)
-/* 3DE048 E00E4048 24424290 */  addiu     $v0, $v0, %lo(fx_114_update)
+/* 3DE044 E00E4044 3C02E00E */  lui       $v0, %hi(misc_particles_update)
+/* 3DE048 E00E4048 24424290 */  addiu     $v0, $v0, %lo(misc_particles_update)
 /* 3DE04C E00E404C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3DE050 E00E4050 3C02E00E */  lui       $v0, %hi(fx_114_render)
-/* 3DE054 E00E4054 2442490C */  addiu     $v0, $v0, %lo(fx_114_render)
+/* 3DE050 E00E4050 3C02E00E */  lui       $v0, %hi(misc_particles_render)
+/* 3DE054 E00E4054 2442490C */  addiu     $v0, $v0, %lo(misc_particles_render)
 /* 3DE058 E00E4058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3DE05C E00E405C 24020072 */  addiu     $v0, $zero, 0x72
 /* 3DE060 E00E4060 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_update.s b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_114/fx_114_update.s
rename to ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_update.s
index aae009cb19..db221624a9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_114/fx_114_update.s
+++ b/ver/us/asm/nonmatchings/effects/misc_particles/misc_particles_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_114_update
+glabel misc_particles_update
 /* 3DE290 E00E4290 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 3DE294 E00E4294 AFB40038 */  sw        $s4, 0x38($sp)
 /* 3DE298 E00E4298 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_appendGfx.s b/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_81/fx_81_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_appendGfx.s
index f5146a02a7..6a6cffc7e1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_81_appendGfx
+glabel motion_blur_flame_appendGfx
 /* 3A2BCC E00A223C 27BDFF60 */  addiu     $sp, $sp, -0xa0
 /* 3A2BD0 E00A2240 3C07DB06 */  lui       $a3, 0xdb06
 /* 3A2BD4 E00A2244 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s b/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_main.s
similarity index 88%
rename from ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s
rename to ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_main.s
index 440cdfd0de..0270816368 100644
--- a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_main.s
+++ b/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_81_main
+glabel motion_blur_flame_main
 /* 3A2990 E00A2000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3A2994 E00A2004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3A2998 E00A2008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_81_main
 /* 3A29B4 E00A2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A29B8 E00A2028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3A29BC E00A202C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3A29C0 E00A2030 3C02E00A */  lui       $v0, %hi(fx_81_init)
-/* 3A29C4 E00A2034 24422118 */  addiu     $v0, $v0, %lo(fx_81_init)
+/* 3A29C0 E00A2030 3C02E00A */  lui       $v0, %hi(motion_blur_flame_init)
+/* 3A29C4 E00A2034 24422118 */  addiu     $v0, $v0, %lo(motion_blur_flame_init)
 /* 3A29C8 E00A2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A29CC E00A203C 3C02E00A */  lui       $v0, %hi(fx_81_update)
-/* 3A29D0 E00A2040 24422120 */  addiu     $v0, $v0, %lo(fx_81_update)
+/* 3A29CC E00A203C 3C02E00A */  lui       $v0, %hi(motion_blur_flame_update)
+/* 3A29D0 E00A2040 24422120 */  addiu     $v0, $v0, %lo(motion_blur_flame_update)
 /* 3A29D4 E00A2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A29D8 E00A2048 3C02E00A */  lui       $v0, %hi(fx_81_render)
-/* 3A29DC E00A204C 244221EC */  addiu     $v0, $v0, %lo(fx_81_render)
+/* 3A29D8 E00A2048 3C02E00A */  lui       $v0, %hi(motion_blur_flame_render)
+/* 3A29DC E00A204C 244221EC */  addiu     $v0, $v0, %lo(motion_blur_flame_render)
 /* 3A29E0 E00A2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A29E4 E00A2054 24020051 */  addiu     $v0, $zero, 0x51
 /* 3A29E8 E00A2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_update.s b/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_81/fx_81_update.s
rename to ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_update.s
index db4b054a45..56493577a5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_81/fx_81_update.s
+++ b/ver/us/asm/nonmatchings/effects/motion_blur_flame/motion_blur_flame_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_81_update
+glabel motion_blur_flame_update
 /* 3A2AB0 E00A2120 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3A2AB4 E00A2124 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3A2AB8 E00A2128 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_appendGfx.s b/ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_116/fx_116_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_appendGfx.s
index 63cca7426c..da0be16db8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_116_appendGfx
+glabel moving_cloud_appendGfx
 /* 3E1A4C E00E83BC 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 3E1A50 E00E83C0 0080302D */  daddu     $a2, $a0, $zero
 /* 3E1A54 E00E83C4 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s b/ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s
rename to ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_main.s
index 1466a3bff9..49b7c4f145 100644
--- a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_main.s
+++ b/ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_116_main
+glabel moving_cloud_main
 /* 3E1690 E00E8000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 3E1694 E00E8004 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3E1698 E00E8008 0080902D */  daddu     $s2, $a0, $zero
@@ -10,14 +10,14 @@ glabel fx_116_main
 /* 3E16A4 E00E8014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E16A8 E00E8018 F7BC0058 */  sdc1      $f28, 0x58($sp)
 /* 3E16AC E00E801C C7BC0084 */  lwc1      $f28, 0x84($sp)
-/* 3E16B0 E00E8020 3C02E00F */  lui       $v0, %hi(fx_116_init)
-/* 3E16B4 E00E8024 2442825C */  addiu     $v0, $v0, %lo(fx_116_init)
+/* 3E16B0 E00E8020 3C02E00F */  lui       $v0, %hi(moving_cloud_init)
+/* 3E16B4 E00E8024 2442825C */  addiu     $v0, $v0, %lo(moving_cloud_init)
 /* 3E16B8 E00E8028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E16BC E00E802C 3C02E00F */  lui       $v0, %hi(fx_116_update)
-/* 3E16C0 E00E8030 24428264 */  addiu     $v0, $v0, %lo(fx_116_update)
+/* 3E16BC E00E802C 3C02E00F */  lui       $v0, %hi(moving_cloud_update)
+/* 3E16C0 E00E8030 24428264 */  addiu     $v0, $v0, %lo(moving_cloud_update)
 /* 3E16C4 E00E8034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E16C8 E00E8038 3C02E00F */  lui       $v0, %hi(fx_116_render)
-/* 3E16CC E00E803C 24428374 */  addiu     $v0, $v0, %lo(fx_116_render)
+/* 3E16C8 E00E8038 3C02E00F */  lui       $v0, %hi(moving_cloud_render)
+/* 3E16CC E00E803C 24428374 */  addiu     $v0, $v0, %lo(moving_cloud_render)
 /* 3E16D0 E00E8040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E16D4 E00E8044 24020074 */  addiu     $v0, $zero, 0x74
 /* 3E16D8 E00E8048 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_update.s b/ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_116/fx_116_update.s
rename to ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_update.s
index b9d9f35b2a..d2b1591524 100644
--- a/ver/us/asm/nonmatchings/effects/effect_116/fx_116_update.s
+++ b/ver/us/asm/nonmatchings/effects/moving_cloud/moving_cloud_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_116_update
+glabel moving_cloud_update
 /* 3E18F4 E00E8264 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3E18F8 E00E8268 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3E18FC E00E826C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_appendGfx.s b/ver/us/asm/nonmatchings/effects/music_note/music_note_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_38/fx_38_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/music_note/music_note_appendGfx.s
index d4fc96ef94..d869e6fbe7 100644
--- a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/music_note/music_note_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_38_appendGfx
+glabel music_note_appendGfx
 /* 35A2C8 E004C3A8 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 35A2CC E004C3AC 0080182D */  daddu     $v1, $a0, $zero
 /* 35A2D0 E004C3B0 3C0838E3 */  lui       $t0, 0x38e3
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s b/ver/us/asm/nonmatchings/effects/music_note/music_note_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s
rename to ver/us/asm/nonmatchings/effects/music_note/music_note_main.s
index 960816dacf..28094a0a50 100644
--- a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_main.s
+++ b/ver/us/asm/nonmatchings/effects/music_note/music_note_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_38_main
+glabel music_note_main
 /* 359F20 E004C000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 359F24 E004C004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 359F28 E004C008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_38_main
 /* 359F3C E004C01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 359F40 E004C020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 359F44 E004C024 4487C000 */  mtc1      $a3, $f24
-/* 359F48 E004C028 3C02E005 */  lui       $v0, %hi(fx_38_init)
-/* 359F4C E004C02C 2442C204 */  addiu     $v0, $v0, %lo(fx_38_init)
+/* 359F48 E004C028 3C02E005 */  lui       $v0, %hi(music_note_init)
+/* 359F4C E004C02C 2442C204 */  addiu     $v0, $v0, %lo(music_note_init)
 /* 359F50 E004C030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 359F54 E004C034 3C02E005 */  lui       $v0, %hi(fx_38_update)
-/* 359F58 E004C038 2442C20C */  addiu     $v0, $v0, %lo(fx_38_update)
+/* 359F54 E004C034 3C02E005 */  lui       $v0, %hi(music_note_update)
+/* 359F58 E004C038 2442C20C */  addiu     $v0, $v0, %lo(music_note_update)
 /* 359F5C E004C03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 359F60 E004C040 3C02E005 */  lui       $v0, %hi(fx_38_render)
-/* 359F64 E004C044 2442C364 */  addiu     $v0, $v0, %lo(fx_38_render)
+/* 359F60 E004C040 3C02E005 */  lui       $v0, %hi(music_note_render)
+/* 359F64 E004C044 2442C364 */  addiu     $v0, $v0, %lo(music_note_render)
 /* 359F68 E004C048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 359F6C E004C04C 24020026 */  addiu     $v0, $zero, 0x26
 /* 359F70 E004C050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_update.s b/ver/us/asm/nonmatchings/effects/music_note/music_note_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_38/fx_38_update.s
rename to ver/us/asm/nonmatchings/effects/music_note/music_note_update.s
index 8b1a9ce5cd..ac7c877862 100644
--- a/ver/us/asm/nonmatchings/effects/effect_38/fx_38_update.s
+++ b/ver/us/asm/nonmatchings/effects/music_note/music_note_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_38_update
+glabel music_note_update
 /* 35A12C E004C20C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 35A130 E004C210 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 35A134 E004C214 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_127/func_E011A3A0.s b/ver/us/asm/nonmatchings/effects/partner_buff/func_E011A3A0.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_127/func_E011A3A0.s
rename to ver/us/asm/nonmatchings/effects/partner_buff/func_E011A3A0.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_127/func_E011A48C.s b/ver/us/asm/nonmatchings/effects/partner_buff/func_E011A48C.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_127/func_E011A48C.s
rename to ver/us/asm/nonmatchings/effects/partner_buff/func_E011A48C.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_127/func_E011A700.s b/ver/us/asm/nonmatchings/effects/partner_buff/func_E011A700.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_127/func_E011A700.s
rename to ver/us/asm/nonmatchings/effects/partner_buff/func_E011A700.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s b/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_main.s
similarity index 87%
rename from ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s
rename to ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_main.s
index 49b9e3bbd4..22ef3d0430 100644
--- a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_main.s
+++ b/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_main.s
@@ -1,21 +1,21 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_127_main
+glabel partner_buff_main
 /* 404220 E011A000 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 404224 E011A004 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 404228 E011A008 0080882D */  daddu     $s1, $a0, $zero
 /* 40422C E011A00C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 404230 E011A010 AFB20030 */  sw        $s2, 0x30($sp)
 /* 404234 E011A014 8FB2004C */  lw        $s2, 0x4c($sp)
-/* 404238 E011A018 3C02E012 */  lui       $v0, %hi(fx_127_init)
-/* 40423C E011A01C 2442A0FC */  addiu     $v0, $v0, %lo(fx_127_init)
+/* 404238 E011A018 3C02E012 */  lui       $v0, %hi(partner_buff_init)
+/* 40423C E011A01C 2442A0FC */  addiu     $v0, $v0, %lo(partner_buff_init)
 /* 404240 E011A020 AFA20018 */  sw        $v0, 0x18($sp)
-/* 404244 E011A024 3C02E012 */  lui       $v0, %hi(fx_127_update)
-/* 404248 E011A028 2442A104 */  addiu     $v0, $v0, %lo(fx_127_update)
+/* 404244 E011A024 3C02E012 */  lui       $v0, %hi(partner_buff_update)
+/* 404248 E011A028 2442A104 */  addiu     $v0, $v0, %lo(partner_buff_update)
 /* 40424C E011A02C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 404250 E011A030 3C02E012 */  lui       $v0, %hi(fx_127_render)
-/* 404254 E011A034 2442A398 */  addiu     $v0, $v0, %lo(fx_127_render)
+/* 404250 E011A030 3C02E012 */  lui       $v0, %hi(partner_buff_render)
+/* 404254 E011A034 2442A398 */  addiu     $v0, $v0, %lo(partner_buff_render)
 /* 404258 E011A038 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40425C E011A03C 3C02E012 */  lui       $v0, %hi(func_E011A3A0)
 /* 404260 E011A040 2442A3A0 */  addiu     $v0, $v0, %lo(func_E011A3A0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_update.s b/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_127/fx_127_update.s
rename to ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_update.s
index 7d8c96462d..747caca83f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_127/fx_127_update.s
+++ b/ver/us/asm/nonmatchings/effects/partner_buff/partner_buff_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_127_update
+glabel partner_buff_update
 /* 404324 E011A104 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 404328 E011A108 AFBF002C */  sw        $ra, 0x2c($sp)
 /* 40432C E011A10C AFB60028 */  sw        $s6, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_appendGfx.s b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_120/fx_120_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_appendGfx.s
index e6368e7762..d9d7c642bd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_120_appendGfx
+glabel peach_star_beam_appendGfx
 /* 3E585C E010C39C 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3E5860 E010C3A0 3C07DB06 */  lui       $a3, 0xdb06
 /* 3E5864 E010C3A4 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s
rename to ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_main.s
index 0a64d025d4..ee142b7eef 100644
--- a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_main.s
+++ b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_120_main
+glabel peach_star_beam_main
 /* 3E54C0 E010C000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3E54C4 E010C004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3E54C8 E010C008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_120_main
 /* 3E54E4 E010C024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E54E8 E010C028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3E54EC E010C02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3E54F0 E010C030 3C02E011 */  lui       $v0, %hi(fx_120_init)
-/* 3E54F4 E010C034 2442C190 */  addiu     $v0, $v0, %lo(fx_120_init)
+/* 3E54F0 E010C030 3C02E011 */  lui       $v0, %hi(peach_star_beam_init)
+/* 3E54F4 E010C034 2442C190 */  addiu     $v0, $v0, %lo(peach_star_beam_init)
 /* 3E54F8 E010C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E54FC E010C03C 3C02E011 */  lui       $v0, %hi(fx_120_update)
-/* 3E5500 E010C040 2442C198 */  addiu     $v0, $v0, %lo(fx_120_update)
+/* 3E54FC E010C03C 3C02E011 */  lui       $v0, %hi(peach_star_beam_update)
+/* 3E5500 E010C040 2442C198 */  addiu     $v0, $v0, %lo(peach_star_beam_update)
 /* 3E5504 E010C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E5508 E010C048 3C02E011 */  lui       $v0, %hi(fx_120_render)
-/* 3E550C E010C04C 2442C354 */  addiu     $v0, $v0, %lo(fx_120_render)
+/* 3E5508 E010C048 3C02E011 */  lui       $v0, %hi(peach_star_beam_render)
+/* 3E550C E010C04C 2442C354 */  addiu     $v0, $v0, %lo(peach_star_beam_render)
 /* 3E5510 E010C050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E5514 E010C054 24020078 */  addiu     $v0, $zero, 0x78
 /* 3E5518 E010C058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_update.s b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_120/fx_120_update.s
rename to ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_update.s
index 247c8895f5..baa96888ae 100644
--- a/ver/us/asm/nonmatchings/effects/effect_120/fx_120_update.s
+++ b/ver/us/asm/nonmatchings/effects/peach_star_beam/peach_star_beam_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_120_update
+glabel peach_star_beam_update
 /* 3E5658 E010C198 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3E565C E010C19C AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3E5660 E010C1A0 AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_appendGfx.s b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_132/fx_132_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_appendGfx.s
index 73b4af1742..d6b9b5c2b3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_132_appendGfx
+glabel pink_sparkles_appendGfx
 /* 412BF4 E01244C4 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 412BF8 E01244C8 3C06DB06 */  lui       $a2, 0xdb06
 /* 412BFC E01244CC 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_main.s
similarity index 95%
rename from ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s
rename to ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_main.s
index 0c02745d0b..37ac16c618 100644
--- a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_main.s
+++ b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_132_main
+glabel pink_sparkles_main
 /* 412730 E0124000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 412734 E0124004 F7B40050 */  sdc1      $f20, 0x50($sp)
 /* 412738 E0124008 4485A000 */  mtc1      $a1, $f20
@@ -11,14 +11,14 @@ glabel fx_132_main
 /* 412748 E0124018 27A40010 */  addiu     $a0, $sp, 0x10
 /* 41274C E012401C F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 412750 E0124020 4487C000 */  mtc1      $a3, $f24
-/* 412754 E0124024 3C02E012 */  lui       $v0, %hi(fx_132_init)
-/* 412758 E0124028 244242FC */  addiu     $v0, $v0, %lo(fx_132_init)
+/* 412754 E0124024 3C02E012 */  lui       $v0, %hi(pink_sparkles_init)
+/* 412758 E0124028 244242FC */  addiu     $v0, $v0, %lo(pink_sparkles_init)
 /* 41275C E012402C AFA20018 */  sw        $v0, 0x18($sp)
-/* 412760 E0124030 3C02E012 */  lui       $v0, %hi(fx_132_update)
-/* 412764 E0124034 24424304 */  addiu     $v0, $v0, %lo(fx_132_update)
+/* 412760 E0124030 3C02E012 */  lui       $v0, %hi(pink_sparkles_update)
+/* 412764 E0124034 24424304 */  addiu     $v0, $v0, %lo(pink_sparkles_update)
 /* 412768 E0124038 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 41276C E012403C 3C02E012 */  lui       $v0, %hi(fx_132_render)
-/* 412770 E0124040 2442448C */  addiu     $v0, $v0, %lo(fx_132_render)
+/* 41276C E012403C 3C02E012 */  lui       $v0, %hi(pink_sparkles_render)
+/* 412770 E0124040 2442448C */  addiu     $v0, $v0, %lo(pink_sparkles_render)
 /* 412774 E0124044 AFA20020 */  sw        $v0, 0x20($sp)
 /* 412778 E0124048 24020084 */  addiu     $v0, $zero, 0x84
 /* 41277C E012404C AFBF004C */  sw        $ra, 0x4c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_update.s b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_132/fx_132_update.s
rename to ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_update.s
index ec6ddcd99c..ab79c57c56 100644
--- a/ver/us/asm/nonmatchings/effects/effect_132/fx_132_update.s
+++ b/ver/us/asm/nonmatchings/effects/pink_sparkles/pink_sparkles_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_132_update
+glabel pink_sparkles_update
 /* 412A34 E0124304 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 412A38 E0124308 0000302D */  daddu     $a2, $zero, $zero
 /* 412A3C E012430C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_appendGfx.s b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_31/fx_31_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_appendGfx.s
index 048defa3d2..7e7fbf4f14 100644
--- a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_31_appendGfx
+glabel purple_ring_appendGfx
 /* 352A78 E003E638 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 352A7C E003E63C 0080182D */  daddu     $v1, $a0, $zero
 /* 352A80 E003E640 3C05DB06 */  lui       $a1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_main.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s
rename to ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_main.s
index 2ca369f4a3..544715d4a8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_main.s
+++ b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_31_main
+glabel purple_ring_main
 /* 352440 E003E000 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 352444 E003E004 F7BA00A0 */  sdc1      $f26, 0xa0($sp)
 /* 352448 E003E008 C7BA00C8 */  lwc1      $f26, 0xc8($sp)
@@ -152,16 +152,16 @@ glabel fx_31_main
 /* 352678 E003E238 460C8402 */  mul.s     $f16, $f16, $f12
 /* 35267C E003E23C 00000000 */  nop
 /* 352680 E003E240 0200202D */  daddu     $a0, $s0, $zero
-/* 352684 E003E244 3C02E004 */  lui       $v0, %hi(fx_31_init)
-/* 352688 E003E248 2442E3F8 */  addiu     $v0, $v0, %lo(fx_31_init)
+/* 352684 E003E244 3C02E004 */  lui       $v0, %hi(purple_ring_init)
+/* 352688 E003E248 2442E3F8 */  addiu     $v0, $v0, %lo(purple_ring_init)
 /* 35268C E003E24C E7B2006C */  swc1      $f18, 0x6c($sp)
 /* 352690 E003E250 E7B00070 */  swc1      $f16, 0x70($sp)
 /* 352694 E003E254 AC820008 */  sw        $v0, 8($a0)
-/* 352698 E003E258 3C02E004 */  lui       $v0, %hi(fx_31_update)
-/* 35269C E003E25C 2442E400 */  addiu     $v0, $v0, %lo(fx_31_update)
+/* 352698 E003E258 3C02E004 */  lui       $v0, %hi(purple_ring_update)
+/* 35269C E003E25C 2442E400 */  addiu     $v0, $v0, %lo(purple_ring_update)
 /* 3526A0 E003E260 AC82000C */  sw        $v0, 0xc($a0)
-/* 3526A4 E003E264 3C02E004 */  lui       $v0, %hi(fx_31_render)
-/* 3526A8 E003E268 2442E5F4 */  addiu     $v0, $v0, %lo(fx_31_render)
+/* 3526A4 E003E264 3C02E004 */  lui       $v0, %hi(purple_ring_render)
+/* 3526A8 E003E268 2442E5F4 */  addiu     $v0, $v0, %lo(purple_ring_render)
 /* 3526AC E003E26C AC820010 */  sw        $v0, 0x10($a0)
 /* 3526B0 E003E270 2402001F */  addiu     $v0, $zero, 0x1f
 /* 3526B4 E003E274 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_update.s b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_31/fx_31_update.s
rename to ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_update.s
index f04dcd7b47..4f18fef27a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_31/fx_31_update.s
+++ b/ver/us/asm/nonmatchings/effects/purple_ring/purple_ring_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_31_update
+glabel purple_ring_update
 /* 352840 E003E400 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 352844 E003E404 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 352848 E003E408 F7B60020 */  sdc1      $f22, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_80/fx_80_main.s b/ver/us/asm/nonmatchings/effects/quizmo_answer/quizmo_answer_main.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_80/fx_80_main.s
rename to ver/us/asm/nonmatchings/effects/quizmo_answer/quizmo_answer_main.s
index bc1064627a..041453bf3c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_80/fx_80_main.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_answer/quizmo_answer_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_80_main
+glabel quizmo_answer_main
 /* 3A2290 E00A0000 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3A2294 E00A0004 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3A2298 E00A0008 0080802D */  daddu     $s0, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_appendGfx.s b/ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_128/fx_128_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_appendGfx.s
index 5c568e15e2..275a011b08 100644
--- a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_128_appendGfx
+glabel quizmo_assistant_appendGfx
 /* 406D04 E011C1C4 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 406D08 E011C1C8 0080302D */  daddu     $a2, $a0, $zero
 /* 406D0C E011C1CC 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s b/ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_main.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s
rename to ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_main.s
index 3e9455d5f0..fa2d8e46cd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_main.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_128_main
+glabel quizmo_assistant_main
 /* 406B40 E011C000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 406B44 E011C004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 406B48 E011C008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_128_main
 /* 406B64 E011C024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 406B68 E011C028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 406B6C E011C02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 406B70 E011C030 3C02E012 */  lui       $v0, %hi(fx_128_init)
-/* 406B74 E011C034 2442C0F4 */  addiu     $v0, $v0, %lo(fx_128_init)
+/* 406B70 E011C030 3C02E012 */  lui       $v0, %hi(quizmo_assistant_init)
+/* 406B74 E011C034 2442C0F4 */  addiu     $v0, $v0, %lo(quizmo_assistant_init)
 /* 406B78 E011C038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 406B7C E011C03C 3C02E012 */  lui       $v0, %hi(fx_128_update)
-/* 406B80 E011C040 2442C0FC */  addiu     $v0, $v0, %lo(fx_128_update)
+/* 406B7C E011C03C 3C02E012 */  lui       $v0, %hi(quizmo_assistant_update)
+/* 406B80 E011C040 2442C0FC */  addiu     $v0, $v0, %lo(quizmo_assistant_update)
 /* 406B84 E011C044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 406B88 E011C048 3C02E012 */  lui       $v0, %hi(fx_128_render)
-/* 406B8C E011C04C 2442C17C */  addiu     $v0, $v0, %lo(fx_128_render)
+/* 406B88 E011C048 3C02E012 */  lui       $v0, %hi(quizmo_assistant_render)
+/* 406B8C E011C04C 2442C17C */  addiu     $v0, $v0, %lo(quizmo_assistant_render)
 /* 406B90 E011C050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 406B94 E011C054 24020080 */  addiu     $v0, $zero, 0x80
 /* 406B98 E011C058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_update.s b/ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_128/fx_128_update.s
rename to ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_update.s
index 7e6ca81636..fe6218aaad 100644
--- a/ver/us/asm/nonmatchings/effects/effect_128/fx_128_update.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_assistant/quizmo_assistant_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_128_update
+glabel quizmo_assistant_update
 /* 406C3C E011C0FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 406C40 E011C100 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 406C44 E011C104 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_appendGfx.s b/ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_84/fx_84_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_appendGfx.s
index 9185c8794c..88eb78ca2a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_84_appendGfx
+glabel quizmo_audience_appendGfx
 /* 3A7410 E00A8320 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3A7414 E00A8324 0080302D */  daddu     $a2, $a0, $zero
 /* 3A7418 E00A8328 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s b/ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_main.s
similarity index 87%
rename from ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s
rename to ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_main.s
index ae71afe519..5f3a7303df 100644
--- a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_main.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_84_main
+glabel quizmo_audience_main
 /* 3A70F0 E00A8000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3A70F4 E00A8004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3A70F8 E00A8008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_84_main
 /* 3A710C E00A801C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3A7110 E00A8020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3A7114 E00A8024 4487C000 */  mtc1      $a3, $f24
-/* 3A7118 E00A8028 3C02E00B */  lui       $v0, %hi(fx_84_init)
-/* 3A711C E00A802C 244280FC */  addiu     $v0, $v0, %lo(fx_84_init)
+/* 3A7118 E00A8028 3C02E00B */  lui       $v0, %hi(quizmo_audience_init)
+/* 3A711C E00A802C 244280FC */  addiu     $v0, $v0, %lo(quizmo_audience_init)
 /* 3A7120 E00A8030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3A7124 E00A8034 3C02E00B */  lui       $v0, %hi(fx_84_update)
-/* 3A7128 E00A8038 24428104 */  addiu     $v0, $v0, %lo(fx_84_update)
+/* 3A7124 E00A8034 3C02E00B */  lui       $v0, %hi(quizmo_audience_update)
+/* 3A7128 E00A8038 24428104 */  addiu     $v0, $v0, %lo(quizmo_audience_update)
 /* 3A712C E00A803C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3A7130 E00A8040 3C02E00B */  lui       $v0, %hi(fx_84_render)
-/* 3A7134 E00A8044 244282D4 */  addiu     $v0, $v0, %lo(fx_84_render)
+/* 3A7130 E00A8040 3C02E00B */  lui       $v0, %hi(quizmo_audience_render)
+/* 3A7134 E00A8044 244282D4 */  addiu     $v0, $v0, %lo(quizmo_audience_render)
 /* 3A7138 E00A8048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3A713C E00A804C 24020054 */  addiu     $v0, $zero, 0x54
 /* 3A7140 E00A8050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_update.s b/ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_84/fx_84_update.s
rename to ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_update.s
index 762ad25953..d77a9a4114 100644
--- a/ver/us/asm/nonmatchings/effects/effect_84/fx_84_update.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_audience/quizmo_audience_update.s
@@ -7,7 +7,7 @@ dlabel D_E00A86A0
 .double 0.01
 
 .section .text
-glabel fx_84_update
+glabel quizmo_audience_update
 /* 3A71F4 E00A8104 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3A71F8 E00A8108 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 3A71FC E00A810C AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_appendGfx.s b/ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_78/fx_78_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_appendGfx.s
index 8c5f4ef093..c9b018e325 100644
--- a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_78_appendGfx
+glabel quizmo_stage_appendGfx
 /* 398410 E009C220 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 398414 E009C224 0080182D */  daddu     $v1, $a0, $zero
 /* 398418 E009C228 3C05DB06 */  lui       $a1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s b/ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_main.s
similarity index 87%
rename from ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s
rename to ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_main.s
index 6d5b0d83da..a95bcf6e64 100644
--- a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_main.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_78_main
+glabel quizmo_stage_main
 /* 3981F0 E009C000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3981F4 E009C004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3981F8 E009C008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_78_main
 /* 39820C E009C01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 398210 E009C020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 398214 E009C024 4487C000 */  mtc1      $a3, $f24
-/* 398218 E009C028 3C02E00A */  lui       $v0, %hi(fx_78_init)
-/* 39821C E009C02C 2442C100 */  addiu     $v0, $v0, %lo(fx_78_init)
+/* 398218 E009C028 3C02E00A */  lui       $v0, %hi(quizmo_stage_init)
+/* 39821C E009C02C 2442C100 */  addiu     $v0, $v0, %lo(quizmo_stage_init)
 /* 398220 E009C030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 398224 E009C034 3C02E00A */  lui       $v0, %hi(fx_78_update)
-/* 398228 E009C038 2442C108 */  addiu     $v0, $v0, %lo(fx_78_update)
+/* 398224 E009C034 3C02E00A */  lui       $v0, %hi(quizmo_stage_update)
+/* 398228 E009C038 2442C108 */  addiu     $v0, $v0, %lo(quizmo_stage_update)
 /* 39822C E009C03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 398230 E009C040 3C02E00A */  lui       $v0, %hi(fx_78_render)
-/* 398234 E009C044 2442C1DC */  addiu     $v0, $v0, %lo(fx_78_render)
+/* 398230 E009C040 3C02E00A */  lui       $v0, %hi(quizmo_stage_render)
+/* 398234 E009C044 2442C1DC */  addiu     $v0, $v0, %lo(quizmo_stage_render)
 /* 398238 E009C048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39823C E009C04C 2402004E */  addiu     $v0, $zero, 0x4e
 /* 398240 E009C050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_update.s b/ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_78/fx_78_update.s
rename to ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_update.s
index 20a1f8fc53..b847ecdb5f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_78/fx_78_update.s
+++ b/ver/us/asm/nonmatchings/effects/quizmo_stage/quizmo_stage_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_78_update
+glabel quizmo_stage_update
 /* 3982F8 E009C108 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3982FC E009C10C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 398300 E009C110 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_appendGfx.s b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_51/fx_51_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_appendGfx.s
index f570855bf0..1e6fba4789 100644
--- a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_51_appendGfx
+glabel radial_shimmer_appendGfx
 /* 3667A0 E0066770 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3667A4 E0066774 AFB700C4 */  sw        $s7, 0xc4($sp)
 /* 3667A8 E0066778 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_main.s
similarity index 97%
rename from ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s
rename to ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_main.s
index ba169bed2f..fc0df5e18f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_main.s
+++ b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_51_main
+glabel radial_shimmer_main
 /* 366030 E0066000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 366034 E0066004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 366038 E0066008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_51_main
 /* 366054 E0066024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 366058 E0066028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 36605C E006602C 8FB00064 */  lw        $s0, 0x64($sp)
-/* 366060 E0066030 3C02E006 */  lui       $v0, %hi(fx_51_init)
-/* 366064 E0066034 24426490 */  addiu     $v0, $v0, %lo(fx_51_init)
+/* 366060 E0066030 3C02E006 */  lui       $v0, %hi(radial_shimmer_init)
+/* 366064 E0066034 24426490 */  addiu     $v0, $v0, %lo(radial_shimmer_init)
 /* 366068 E0066038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 36606C E006603C 3C02E006 */  lui       $v0, %hi(fx_51_update)
-/* 366070 E0066040 24426498 */  addiu     $v0, $v0, %lo(fx_51_update)
+/* 36606C E006603C 3C02E006 */  lui       $v0, %hi(radial_shimmer_update)
+/* 366070 E0066040 24426498 */  addiu     $v0, $v0, %lo(radial_shimmer_update)
 /* 366074 E0066044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 366078 E0066048 3C02E006 */  lui       $v0, %hi(fx_51_render)
-/* 36607C E006604C 2442672C */  addiu     $v0, $v0, %lo(fx_51_render)
+/* 366078 E0066048 3C02E006 */  lui       $v0, %hi(radial_shimmer_render)
+/* 36607C E006604C 2442672C */  addiu     $v0, $v0, %lo(radial_shimmer_render)
 /* 366080 E0066050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 366084 E0066054 24020033 */  addiu     $v0, $zero, 0x33
 /* 366088 E0066058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_update.s b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_51/fx_51_update.s
rename to ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_update.s
index 5aa8cbe597..a7468ffca0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_51/fx_51_update.s
+++ b/ver/us/asm/nonmatchings/effects/radial_shimmer/radial_shimmer_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_51_update
+glabel radial_shimmer_update
 /* 3664C8 E0066498 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3664CC E006649C AFB1003C */  sw        $s1, 0x3c($sp)
 /* 3664D0 E00664A0 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_appendGfx.s b/ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_79/fx_79_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_appendGfx.s
index 9079ebf89f..12707af514 100644
--- a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_appendGfx.s
@@ -16,7 +16,7 @@ dlabel D_E009EE38
 .double 0.1
 
 .section .text
-glabel fx_79_appendGfx
+glabel radiating_energy_orb_appendGfx
 /* 3A0344 E009E424 27BDFED0 */  addiu     $sp, $sp, -0x130
 /* 3A0348 E009E428 AFBF0104 */  sw        $ra, 0x104($sp)
 /* 3A034C E009E42C AFBE0100 */  sw        $fp, 0x100($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s b/ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s
rename to ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_main.s
index 9b942de950..1c8fc2aa7e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_main.s
+++ b/ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_main.s
@@ -10,7 +10,7 @@ dlabel D_E009EE08
 .double 0.4
 
 .section .text
-glabel fx_79_main
+glabel radiating_energy_orb_main
 /* 39FF20 E009E000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 39FF24 E009E004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 39FF28 E009E008 4485A000 */  mtc1      $a1, $f20
@@ -23,14 +23,14 @@ glabel fx_79_main
 /* 39FF44 E009E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 39FF48 E009E028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 39FF4C E009E02C 8FB0006C */  lw        $s0, 0x6c($sp)
-/* 39FF50 E009E030 3C02E00A */  lui       $v0, %hi(fx_79_init)
-/* 39FF54 E009E034 2442E1DC */  addiu     $v0, $v0, %lo(fx_79_init)
+/* 39FF50 E009E030 3C02E00A */  lui       $v0, %hi(radiating_energy_orb_init)
+/* 39FF54 E009E034 2442E1DC */  addiu     $v0, $v0, %lo(radiating_energy_orb_init)
 /* 39FF58 E009E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 39FF5C E009E03C 3C02E00A */  lui       $v0, %hi(fx_79_update)
-/* 39FF60 E009E040 2442E1E4 */  addiu     $v0, $v0, %lo(fx_79_update)
+/* 39FF5C E009E03C 3C02E00A */  lui       $v0, %hi(radiating_energy_orb_update)
+/* 39FF60 E009E040 2442E1E4 */  addiu     $v0, $v0, %lo(radiating_energy_orb_update)
 /* 39FF64 E009E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 39FF68 E009E048 3C02E00A */  lui       $v0, %hi(fx_79_render)
-/* 39FF6C E009E04C 2442E3DC */  addiu     $v0, $v0, %lo(fx_79_render)
+/* 39FF68 E009E048 3C02E00A */  lui       $v0, %hi(radiating_energy_orb_render)
+/* 39FF6C E009E04C 2442E3DC */  addiu     $v0, $v0, %lo(radiating_energy_orb_render)
 /* 39FF70 E009E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 39FF74 E009E054 2402004F */  addiu     $v0, $zero, 0x4f
 /* 39FF78 E009E058 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_update.s b/ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_79/fx_79_update.s
rename to ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_update.s
index f3b011d356..aed4b19fac 100644
--- a/ver/us/asm/nonmatchings/effects/effect_79/fx_79_update.s
+++ b/ver/us/asm/nonmatchings/effects/radiating_energy_orb/radiating_energy_orb_update.s
@@ -10,7 +10,7 @@ dlabel D_E009EE18
 .double 0.4
 
 .section .text
-glabel fx_79_update
+glabel radiating_energy_orb_update
 /* 3A0104 E009E1E4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3A0108 E009E1E8 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3A010C E009E1EC 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_64/func_E008042C.s b/ver/us/asm/nonmatchings/effects/recover/func_E008042C.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_64/func_E008042C.s
rename to ver/us/asm/nonmatchings/effects/recover/func_E008042C.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_64/func_E0080448.s b/ver/us/asm/nonmatchings/effects/recover/func_E0080448.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_64/func_E0080448.s
rename to ver/us/asm/nonmatchings/effects/recover/func_E0080448.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s b/ver/us/asm/nonmatchings/effects/recover/recover_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s
rename to ver/us/asm/nonmatchings/effects/recover/recover_main.s
index e70a19d6d3..a94a340164 100644
--- a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_main.s
+++ b/ver/us/asm/nonmatchings/effects/recover/recover_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_64_main
+glabel recover_main
 /* 3812C0 E0080000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3812C4 E0080004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3812C8 E0080008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_64_main
 /* 3812E4 E0080024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3812E8 E0080028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3812EC E008002C 8FB00068 */  lw        $s0, 0x68($sp)
-/* 3812F0 E0080030 3C02E008 */  lui       $v0, %hi(fx_64_init)
-/* 3812F4 E0080034 244201C8 */  addiu     $v0, $v0, %lo(fx_64_init)
+/* 3812F0 E0080030 3C02E008 */  lui       $v0, %hi(recover_init)
+/* 3812F4 E0080034 244201C8 */  addiu     $v0, $v0, %lo(recover_init)
 /* 3812F8 E0080038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3812FC E008003C 3C02E008 */  lui       $v0, %hi(fx_64_update)
-/* 381300 E0080040 244201D0 */  addiu     $v0, $v0, %lo(fx_64_update)
+/* 3812FC E008003C 3C02E008 */  lui       $v0, %hi(recover_update)
+/* 381300 E0080040 244201D0 */  addiu     $v0, $v0, %lo(recover_update)
 /* 381304 E0080044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 381308 E0080048 3C02E008 */  lui       $v0, %hi(fx_64_render)
-/* 38130C E008004C 24420424 */  addiu     $v0, $v0, %lo(fx_64_render)
+/* 381308 E0080048 3C02E008 */  lui       $v0, %hi(recover_render)
+/* 38130C E008004C 24420424 */  addiu     $v0, $v0, %lo(recover_render)
 /* 381310 E0080050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 381314 E0080054 3C02E008 */  lui       $v0, %hi(func_E008042C)
 /* 381318 E0080058 2442042C */  addiu     $v0, $v0, %lo(func_E008042C)
diff --git a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_update.s b/ver/us/asm/nonmatchings/effects/recover/recover_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_64/fx_64_update.s
rename to ver/us/asm/nonmatchings/effects/recover/recover_update.s
index 5cb1044606..8724598554 100644
--- a/ver/us/asm/nonmatchings/effects/effect_64/fx_64_update.s
+++ b/ver/us/asm/nonmatchings/effects/recover/recover_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_64_update
+glabel recover_update
 /* 381490 E00801D0 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 381494 E00801D4 AFB50024 */  sw        $s5, 0x24($sp)
 /* 381498 E00801D8 0080A82D */  daddu     $s5, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_appendGfx.s b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_104/fx_104_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/red_impact/red_impact_appendGfx.s
index 28796d73fc..a51b76d39e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_104_appendGfx
+glabel red_impact_appendGfx
 /* 3D42AC E00D048C 27BDFED8 */  addiu     $sp, $sp, -0x128
 /* 3D42B0 E00D0490 3C07DB06 */  lui       $a3, 0xdb06
 /* 3D42B4 E00D0494 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s
rename to ver/us/asm/nonmatchings/effects/red_impact/red_impact_main.s
index 12376bfd66..cd9bc67527 100644
--- a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_main.s
+++ b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_104_main
+glabel red_impact_main
 /* 3D3E20 E00D0000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3D3E24 E00D0004 F7B60040 */  sdc1      $f22, 0x40($sp)
 /* 3D3E28 E00D0008 4485B000 */  mtc1      $a1, $f22
@@ -24,15 +24,15 @@ glabel fx_104_main
 /* 3D3E6C E00D004C 24100007 */  addiu     $s0, $zero, 7
 .LE00D0050:
 /* 3D3E70 E00D0050 26100001 */  addiu     $s0, $s0, 1
-/* 3D3E74 E00D0054 3C02E00D */  lui       $v0, %hi(fx_104_init)
-/* 3D3E78 E00D0058 2442018C */  addiu     $v0, $v0, %lo(fx_104_init)
+/* 3D3E74 E00D0054 3C02E00D */  lui       $v0, %hi(red_impact_init)
+/* 3D3E78 E00D0058 2442018C */  addiu     $v0, $v0, %lo(red_impact_init)
 /* 3D3E7C E00D005C AFA00010 */  sw        $zero, 0x10($sp)
 /* 3D3E80 E00D0060 AC820008 */  sw        $v0, 8($a0)
-/* 3D3E84 E00D0064 3C02E00D */  lui       $v0, %hi(fx_104_update)
-/* 3D3E88 E00D0068 24420194 */  addiu     $v0, $v0, %lo(fx_104_update)
+/* 3D3E84 E00D0064 3C02E00D */  lui       $v0, %hi(red_impact_update)
+/* 3D3E88 E00D0068 24420194 */  addiu     $v0, $v0, %lo(red_impact_update)
 /* 3D3E8C E00D006C AC82000C */  sw        $v0, 0xc($a0)
-/* 3D3E90 E00D0070 3C02E00D */  lui       $v0, %hi(fx_104_render)
-/* 3D3E94 E00D0074 24420448 */  addiu     $v0, $v0, %lo(fx_104_render)
+/* 3D3E90 E00D0070 3C02E00D */  lui       $v0, %hi(red_impact_render)
+/* 3D3E94 E00D0074 24420448 */  addiu     $v0, $v0, %lo(red_impact_render)
 /* 3D3E98 E00D0078 AC820010 */  sw        $v0, 0x10($a0)
 /* 3D3E9C E00D007C 24020068 */  addiu     $v0, $zero, 0x68
 /* 3D3EA0 E00D0080 AC800014 */  sw        $zero, 0x14($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_update.s b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_104/fx_104_update.s
rename to ver/us/asm/nonmatchings/effects/red_impact/red_impact_update.s
index 42c2895314..c6f8bf146e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_104/fx_104_update.s
+++ b/ver/us/asm/nonmatchings/effects/red_impact/red_impact_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_104_update
+glabel red_impact_update
 /* 3D3FB4 E00D0194 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3D3FB8 E00D0198 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 3D3FBC E00D019C 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_appendGfx.s b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_36/fx_36_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_appendGfx.s
index 58bdf23c1e..e1920c0b07 100644
--- a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_36_appendGfx
+glabel ring_blast_appendGfx
 /* 356B98 E0048218 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 356B9C E004821C 0080302D */  daddu     $a2, $a0, $zero
 /* 356BA0 E0048220 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s
rename to ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_main.s
index 64654dc2a2..daca6297f9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_main.s
+++ b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_36_main
+glabel ring_blast_main
 /* 356980 E0048000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 356984 E0048004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 356988 E0048008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_36_main
 /* 3569A4 E0048024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3569A8 E0048028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3569AC E004802C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3569B0 E0048030 3C02E005 */  lui       $v0, %hi(fx_36_init)
-/* 3569B4 E0048034 24428128 */  addiu     $v0, $v0, %lo(fx_36_init)
+/* 3569B0 E0048030 3C02E005 */  lui       $v0, %hi(ring_blast_init)
+/* 3569B4 E0048034 24428128 */  addiu     $v0, $v0, %lo(ring_blast_init)
 /* 3569B8 E0048038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3569BC E004803C 3C02E005 */  lui       $v0, %hi(fx_36_update)
-/* 3569C0 E0048040 24428130 */  addiu     $v0, $v0, %lo(fx_36_update)
+/* 3569BC E004803C 3C02E005 */  lui       $v0, %hi(ring_blast_update)
+/* 3569C0 E0048040 24428130 */  addiu     $v0, $v0, %lo(ring_blast_update)
 /* 3569C4 E0048044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3569C8 E0048048 3C02E005 */  lui       $v0, %hi(fx_36_render)
-/* 3569CC E004804C 244281D4 */  addiu     $v0, $v0, %lo(fx_36_render)
+/* 3569C8 E0048048 3C02E005 */  lui       $v0, %hi(ring_blast_render)
+/* 3569CC E004804C 244281D4 */  addiu     $v0, $v0, %lo(ring_blast_render)
 /* 3569D0 E0048050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3569D4 E0048054 24020024 */  addiu     $v0, $zero, 0x24
 /* 3569D8 E0048058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_update.s b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_36/fx_36_update.s
rename to ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_update.s
index 46d4703ad2..7179f95428 100644
--- a/ver/us/asm/nonmatchings/effects/effect_36/fx_36_update.s
+++ b/ver/us/asm/nonmatchings/effects/ring_blast/ring_blast_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_36_update
+glabel ring_blast_update
 /* 356AB0 E0048130 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 356AB4 E0048134 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 356AB8 E0048138 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_appendGfx.s b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_35/fx_35_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_appendGfx.s
index fa66c6bb80..f16a2fbc65 100644
--- a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_35_appendGfx
+glabel rising_bubble_appendGfx
 /* 3561A0 E00462C0 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3561A4 E00462C4 3C05DB06 */  lui       $a1, 0xdb06
 /* 3561A8 E00462C8 3C09800A */  lui       $t1, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s
rename to ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_main.s
index e3c4b2048b..bc48f5cc38 100644
--- a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_main.s
+++ b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_35_main
+glabel rising_bubble_main
 /* 355EE0 E0046000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 355EE4 E0046004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 355EE8 E0046008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_35_main
 /* 355F04 E0046024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 355F08 E0046028 F7BA0050 */  sdc1      $f26, 0x50($sp)
 /* 355F0C E004602C C7BA0068 */  lwc1      $f26, 0x68($sp)
-/* 355F10 E0046030 3C02E004 */  lui       $v0, %hi(fx_35_init)
-/* 355F14 E0046034 24426158 */  addiu     $v0, $v0, %lo(fx_35_init)
+/* 355F10 E0046030 3C02E004 */  lui       $v0, %hi(rising_bubble_init)
+/* 355F14 E0046034 24426158 */  addiu     $v0, $v0, %lo(rising_bubble_init)
 /* 355F18 E0046038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 355F1C E004603C 3C02E004 */  lui       $v0, %hi(fx_35_update)
-/* 355F20 E0046040 24426160 */  addiu     $v0, $v0, %lo(fx_35_update)
+/* 355F1C E004603C 3C02E004 */  lui       $v0, %hi(rising_bubble_update)
+/* 355F20 E0046040 24426160 */  addiu     $v0, $v0, %lo(rising_bubble_update)
 /* 355F24 E0046044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 355F28 E0046048 3C02E004 */  lui       $v0, %hi(fx_35_render)
-/* 355F2C E004604C 2442627C */  addiu     $v0, $v0, %lo(fx_35_render)
+/* 355F28 E0046048 3C02E004 */  lui       $v0, %hi(rising_bubble_render)
+/* 355F2C E004604C 2442627C */  addiu     $v0, $v0, %lo(rising_bubble_render)
 /* 355F30 E0046050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 355F34 E0046054 24020023 */  addiu     $v0, $zero, 0x23
 /* 355F38 E0046058 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_update.s b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_35/fx_35_update.s
rename to ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s
index 6ab14fbbf5..22d63ef693 100644
--- a/ver/us/asm/nonmatchings/effects/effect_35/fx_35_update.s
+++ b/ver/us/asm/nonmatchings/effects/rising_bubble/rising_bubble_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_35_update
+glabel rising_bubble_update
 /* 356040 E0046160 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 356044 E0046164 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 356048 E0046168 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E0024324.s b/ver/us/asm/nonmatchings/effects/shape_spell/func_E0024324.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_18/func_E0024324.s
rename to ver/us/asm/nonmatchings/effects/shape_spell/func_E0024324.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/func_E00243BC.s b/ver/us/asm/nonmatchings/effects/shape_spell/func_E00243BC.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_18/func_E00243BC.s
rename to ver/us/asm/nonmatchings/effects/shape_spell/func_E00243BC.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_appendGfx.s b/ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_18/fx_18_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_appendGfx.s
index 04a871a8c0..dfdc24bbd3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_18_appendGfx
+glabel shape_spell_appendGfx
 /* 3396A4 E0024454 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 3396A8 E0024458 3C07DB06 */  lui       $a3, 0xdb06
 /* 3396AC E002445C 3C05800A */  lui       $a1, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s b/ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s
rename to ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_main.s
index 6bfbf79560..95144c2dae 100644
--- a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_main.s
+++ b/ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_18_main
+glabel shape_spell_main
 /* 339250 E0024000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 339254 E0024004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 339258 E0024008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_18_main
 /* 339274 E0024024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 339278 E0024028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 33927C E002402C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 339280 E0024030 3C02E002 */  lui       $v0, %hi(fx_18_init)
-/* 339284 E0024034 24424180 */  addiu     $v0, $v0, %lo(fx_18_init)
+/* 339280 E0024030 3C02E002 */  lui       $v0, %hi(shape_spell_init)
+/* 339284 E0024034 24424180 */  addiu     $v0, $v0, %lo(shape_spell_init)
 /* 339288 E0024038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33928C E002403C 3C02E002 */  lui       $v0, %hi(fx_18_update)
-/* 339290 E0024040 24424188 */  addiu     $v0, $v0, %lo(fx_18_update)
+/* 33928C E002403C 3C02E002 */  lui       $v0, %hi(shape_spell_update)
+/* 339290 E0024040 24424188 */  addiu     $v0, $v0, %lo(shape_spell_update)
 /* 339294 E0024044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 339298 E0024048 3C02E002 */  lui       $v0, %hi(fx_18_render)
-/* 33929C E002404C 244242E0 */  addiu     $v0, $v0, %lo(fx_18_render)
+/* 339298 E0024048 3C02E002 */  lui       $v0, %hi(shape_spell_render)
+/* 33929C E002404C 244242E0 */  addiu     $v0, $v0, %lo(shape_spell_render)
 /* 3392A0 E0024050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3392A4 E0024054 24020012 */  addiu     $v0, $zero, 0x12
 /* 3392A8 E0024058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_update.s b/ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_18/fx_18_update.s
rename to ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_update.s
index 77541dd564..26b6abf12d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_18/fx_18_update.s
+++ b/ver/us/asm/nonmatchings/effects/shape_spell/shape_spell_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_18_update
+glabel shape_spell_update
 /* 3393D8 E0024188 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 3393DC E002418C AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3393E0 E0024190 AFB10024 */  sw        $s1, 0x24($sp)
@@ -49,7 +49,7 @@ glabel fx_18_update
 /* 339480 E0024230 AFA00010 */  sw        $zero, 0x10($sp)
 /* 339484 E0024234 AFA00014 */  sw        $zero, 0x14($sp)
 /* 339488 E0024238 AFA00018 */  sw        $zero, 0x18($sp)
-/* 33948C E002423C 0C009000 */  jal       fx_18_main
+/* 33948C E002423C 0C009000 */  jal       shape_spell_main
 /* 339490 E0024240 AFA2001C */   sw       $v0, 0x1c($sp)
 /* 339494 E0024244 8C42000C */  lw        $v0, 0xc($v0)
 /* 339498 E0024248 C6000028 */  lwc1      $f0, 0x28($s0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_appendGfx.s b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_22/fx_22_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_appendGfx.s
index 3d1c90025e..1af39b391f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_22_appendGfx
+glabel shattering_stones_appendGfx
 /* 340294 E002C414 27BDFEA0 */  addiu     $sp, $sp, -0x160
 /* 340298 E002C418 3C02DB06 */  lui       $v0, 0xdb06
 /* 34029C E002C41C 34420024 */  ori       $v0, $v0, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s
rename to ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_main.s
index 53a747fd39..05aa9dc4cd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_main.s
+++ b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_22_main
+glabel shattering_stones_main
 /* 33FE80 E002C000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 33FE84 E002C004 F7B40050 */  sdc1      $f20, 0x50($sp)
 /* 33FE88 E002C008 4485A000 */  mtc1      $a1, $f20
@@ -10,14 +10,14 @@ glabel fx_22_main
 /* 33FE94 E002C014 27A40010 */  addiu     $a0, $sp, 0x10
 /* 33FE98 E002C018 F7B80060 */  sdc1      $f24, 0x60($sp)
 /* 33FE9C E002C01C 4487C000 */  mtc1      $a3, $f24
-/* 33FEA0 E002C020 3C02E003 */  lui       $v0, %hi(fx_22_init)
-/* 33FEA4 E002C024 2442C234 */  addiu     $v0, $v0, %lo(fx_22_init)
+/* 33FEA0 E002C020 3C02E003 */  lui       $v0, %hi(shattering_stones_init)
+/* 33FEA4 E002C024 2442C234 */  addiu     $v0, $v0, %lo(shattering_stones_init)
 /* 33FEA8 E002C028 AFA20018 */  sw        $v0, 0x18($sp)
-/* 33FEAC E002C02C 3C02E003 */  lui       $v0, %hi(fx_22_update)
-/* 33FEB0 E002C030 2442C23C */  addiu     $v0, $v0, %lo(fx_22_update)
+/* 33FEAC E002C02C 3C02E003 */  lui       $v0, %hi(shattering_stones_update)
+/* 33FEB0 E002C030 2442C23C */  addiu     $v0, $v0, %lo(shattering_stones_update)
 /* 33FEB4 E002C034 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 33FEB8 E002C038 3C02E003 */  lui       $v0, %hi(fx_22_render)
-/* 33FEBC E002C03C 2442C3D0 */  addiu     $v0, $v0, %lo(fx_22_render)
+/* 33FEB8 E002C038 3C02E003 */  lui       $v0, %hi(shattering_stones_render)
+/* 33FEBC E002C03C 2442C3D0 */  addiu     $v0, $v0, %lo(shattering_stones_render)
 /* 33FEC0 E002C040 AFA20020 */  sw        $v0, 0x20($sp)
 /* 33FEC4 E002C044 24020016 */  addiu     $v0, $zero, 0x16
 /* 33FEC8 E002C048 AFBF0048 */  sw        $ra, 0x48($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_update.s b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_22/fx_22_update.s
rename to ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_update.s
index bff4d2a209..e1f44dadd1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_22/fx_22_update.s
+++ b/ver/us/asm/nonmatchings/effects/shattering_stones/shattering_stones_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_22_update
+glabel shattering_stones_update
 /* 3400BC E002C23C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3400C0 E002C240 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3400C4 E002C244 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_appendGfx.s b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_56/fx_56_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_appendGfx.s
index d5263f99c2..747b3c6c28 100644
--- a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_56_appendGfx
+glabel shimmer_burst_appendGfx
 /* 3747F0 E0070740 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 3747F4 E0070744 3C06DB06 */  lui       $a2, 0xdb06
 /* 3747F8 E0070748 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s
rename to ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_main.s
index e0438e516b..003316b83e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_main.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_56_main
+glabel shimmer_burst_main
 /* 3740B0 E0070000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3740B4 E0070004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3740B8 E0070008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_56_main
 /* 3740D4 E0070024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3740D8 E0070028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3740DC E007002C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3740E0 E0070030 3C02E007 */  lui       $v0, %hi(fx_56_init)
-/* 3740E4 E0070034 244201EC */  addiu     $v0, $v0, %lo(fx_56_init)
+/* 3740E0 E0070030 3C02E007 */  lui       $v0, %hi(shimmer_burst_init)
+/* 3740E4 E0070034 244201EC */  addiu     $v0, $v0, %lo(shimmer_burst_init)
 /* 3740E8 E0070038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3740EC E007003C 3C02E007 */  lui       $v0, %hi(fx_56_update)
-/* 3740F0 E0070040 244201F4 */  addiu     $v0, $v0, %lo(fx_56_update)
+/* 3740EC E007003C 3C02E007 */  lui       $v0, %hi(shimmer_burst_update)
+/* 3740F0 E0070040 244201F4 */  addiu     $v0, $v0, %lo(shimmer_burst_update)
 /* 3740F4 E0070044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3740F8 E0070048 3C02E007 */  lui       $v0, %hi(fx_56_render)
-/* 3740FC E007004C 244206F0 */  addiu     $v0, $v0, %lo(fx_56_render)
+/* 3740F8 E0070048 3C02E007 */  lui       $v0, %hi(shimmer_burst_render)
+/* 3740FC E007004C 244206F0 */  addiu     $v0, $v0, %lo(shimmer_burst_render)
 /* 374100 E0070050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 374104 E0070054 24020038 */  addiu     $v0, $zero, 0x38
 /* 374108 E0070058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_update.s b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_56/fx_56_update.s
rename to ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_update.s
index 0a53230864..4ec305523f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_56/fx_56_update.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_burst/shimmer_burst_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_56_update
+glabel shimmer_burst_update
 /* 3742A4 E00701F4 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 3742A8 E00701F8 AFB20028 */  sw        $s2, 0x28($sp)
 /* 3742AC E00701FC 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_appendGfx.s b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_58/fx_58_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_appendGfx.s
index 434701bd52..1d08e145aa 100644
--- a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_58_appendGfx
+glabel shimmer_wave_appendGfx
 /* 376A40 E00745E0 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 376A44 E00745E4 3C06DB06 */  lui       $a2, 0xdb06
 /* 376A48 E00745E8 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s
rename to ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_main.s
index 8bb6135497..1432b851a5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_main.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_58_main
+glabel shimmer_wave_main
 /* 376460 E0074000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 376464 E0074004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 376468 E0074008 4485A000 */  mtc1      $a1, $f20
@@ -16,14 +16,14 @@ glabel fx_58_main
 /* 37648C E007402C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 376490 E0074030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 376494 E0074034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 376498 E0074038 3C02E007 */  lui       $v0, %hi(fx_58_init)
-/* 37649C E007403C 244241E0 */  addiu     $v0, $v0, %lo(fx_58_init)
+/* 376498 E0074038 3C02E007 */  lui       $v0, %hi(shimmer_wave_init)
+/* 37649C E007403C 244241E0 */  addiu     $v0, $v0, %lo(shimmer_wave_init)
 /* 3764A0 E0074040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3764A4 E0074044 3C02E007 */  lui       $v0, %hi(fx_58_update)
-/* 3764A8 E0074048 244241E8 */  addiu     $v0, $v0, %lo(fx_58_update)
+/* 3764A4 E0074044 3C02E007 */  lui       $v0, %hi(shimmer_wave_update)
+/* 3764A8 E0074048 244241E8 */  addiu     $v0, $v0, %lo(shimmer_wave_update)
 /* 3764AC E007404C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3764B0 E0074050 3C02E007 */  lui       $v0, %hi(fx_58_render)
-/* 3764B4 E0074054 24424598 */  addiu     $v0, $v0, %lo(fx_58_render)
+/* 3764B0 E0074050 3C02E007 */  lui       $v0, %hi(shimmer_wave_render)
+/* 3764B4 E0074054 24424598 */  addiu     $v0, $v0, %lo(shimmer_wave_render)
 /* 3764B8 E0074058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3764BC E007405C 2402003A */  addiu     $v0, $zero, 0x3a
 /* 3764C0 E0074060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_update.s b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_58/fx_58_update.s
rename to ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_update.s
index 878c8e0b1d..bf7f8a6105 100644
--- a/ver/us/asm/nonmatchings/effects/effect_58/fx_58_update.s
+++ b/ver/us/asm/nonmatchings/effects/shimmer_wave/shimmer_wave_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_58_update
+glabel shimmer_wave_update
 /* 376648 E00741E8 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 37664C E00741EC AFB20020 */  sw        $s2, 0x20($sp)
 /* 376650 E00741F0 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_appendGfx.s b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_109/fx_109_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_appendGfx.s
index d33681a52e..bcec908091 100644
--- a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_109_appendGfx
+glabel shiny_flare_appendGfx
 /* 3D7470 E00DA230 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3D7474 E00DA234 0080302D */  daddu     $a2, $a0, $zero
 /* 3D7478 E00DA238 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_main.s
similarity index 88%
rename from ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s
rename to ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_main.s
index ee5fb30458..22fd34445a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_main.s
+++ b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_109_main
+glabel shiny_flare_main
 /* 3D7240 E00DA000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3D7244 E00DA004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3D7248 E00DA008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_109_main
 /* 3D725C E00DA01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D7260 E00DA020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3D7264 E00DA024 4487C000 */  mtc1      $a3, $f24
-/* 3D7268 E00DA028 3C02E00E */  lui       $v0, %hi(fx_109_init)
-/* 3D726C E00DA02C 2442A0FC */  addiu     $v0, $v0, %lo(fx_109_init)
+/* 3D7268 E00DA028 3C02E00E */  lui       $v0, %hi(shiny_flare_init)
+/* 3D726C E00DA02C 2442A0FC */  addiu     $v0, $v0, %lo(shiny_flare_init)
 /* 3D7270 E00DA030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D7274 E00DA034 3C02E00E */  lui       $v0, %hi(fx_109_update)
-/* 3D7278 E00DA038 2442A104 */  addiu     $v0, $v0, %lo(fx_109_update)
+/* 3D7274 E00DA034 3C02E00E */  lui       $v0, %hi(shiny_flare_update)
+/* 3D7278 E00DA038 2442A104 */  addiu     $v0, $v0, %lo(shiny_flare_update)
 /* 3D727C E00DA03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D7280 E00DA040 3C02E00E */  lui       $v0, %hi(fx_109_render)
-/* 3D7284 E00DA044 2442A1E0 */  addiu     $v0, $v0, %lo(fx_109_render)
+/* 3D7280 E00DA040 3C02E00E */  lui       $v0, %hi(shiny_flare_render)
+/* 3D7284 E00DA044 2442A1E0 */  addiu     $v0, $v0, %lo(shiny_flare_render)
 /* 3D7288 E00DA048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D728C E00DA04C 2402006D */  addiu     $v0, $zero, 0x6d
 /* 3D7290 E00DA050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_update.s b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_109/fx_109_update.s
rename to ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_update.s
index 1efd35568f..0b156632b5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_109/fx_109_update.s
+++ b/ver/us/asm/nonmatchings/effects/shiny_flare/shiny_flare_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_109_update
+glabel shiny_flare_update
 /* 3D7344 E00DA104 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D7348 E00DA108 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D734C E00DA10C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_appendGfx.s b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_37/fx_37_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/shockwave/shockwave_appendGfx.s
index 016e49c6c2..e6b16281c2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_37_appendGfx
+glabel shockwave_appendGfx
 /* 358C4C E004A78C 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 358C50 E004A790 AFBF00FC */  sw        $ra, 0xfc($sp)
 /* 358C54 E004A794 AFBE00F8 */  sw        $fp, 0xf8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_main.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s
rename to ver/us/asm/nonmatchings/effects/shockwave/shockwave_main.s
index 24b4045289..2fb76e2074 100644
--- a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_main.s
+++ b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_37_main
+glabel shockwave_main
 /* 3584C0 E004A000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3584C4 E004A004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3584C8 E004A008 4485A000 */  mtc1      $a1, $f20
@@ -66,14 +66,14 @@ glabel fx_37_main
 .LE004A0D0:
 /* 358590 E004A0D0 26730001 */  addiu     $s3, $s3, 1
 .LE004A0D4:
-/* 358594 E004A0D4 3C02E005 */  lui       $v0, %hi(fx_37_init)
-/* 358598 E004A0D8 2442A328 */  addiu     $v0, $v0, %lo(fx_37_init)
+/* 358594 E004A0D4 3C02E005 */  lui       $v0, %hi(shockwave_init)
+/* 358598 E004A0D8 2442A328 */  addiu     $v0, $v0, %lo(shockwave_init)
 /* 35859C E004A0DC AC820008 */  sw        $v0, 8($a0)
-/* 3585A0 E004A0E0 3C02E005 */  lui       $v0, %hi(fx_37_update)
-/* 3585A4 E004A0E4 2442A330 */  addiu     $v0, $v0, %lo(fx_37_update)
+/* 3585A0 E004A0E0 3C02E005 */  lui       $v0, %hi(shockwave_update)
+/* 3585A4 E004A0E4 2442A330 */  addiu     $v0, $v0, %lo(shockwave_update)
 /* 3585A8 E004A0E8 AC82000C */  sw        $v0, 0xc($a0)
-/* 3585AC E004A0EC 3C02E005 */  lui       $v0, %hi(fx_37_render)
-/* 3585B0 E004A0F0 2442A748 */  addiu     $v0, $v0, %lo(fx_37_render)
+/* 3585AC E004A0EC 3C02E005 */  lui       $v0, %hi(shockwave_render)
+/* 3585B0 E004A0F0 2442A748 */  addiu     $v0, $v0, %lo(shockwave_render)
 /* 3585B4 E004A0F4 AC820010 */  sw        $v0, 0x10($a0)
 /* 3585B8 E004A0F8 24020025 */  addiu     $v0, $zero, 0x25
 /* 3585BC E004A0FC AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_update.s b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_37/fx_37_update.s
rename to ver/us/asm/nonmatchings/effects/shockwave/shockwave_update.s
index 2f67981666..0b15968548 100644
--- a/ver/us/asm/nonmatchings/effects/effect_37/fx_37_update.s
+++ b/ver/us/asm/nonmatchings/effects/shockwave/shockwave_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_37_update
+glabel shockwave_update
 /* 3587F0 E004A330 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3587F4 E004A334 AFB40020 */  sw        $s4, 0x20($sp)
 /* 3587F8 E004A338 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_appendGfx.s b/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_41/fx_41_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_appendGfx.s
index 3832a5d47b..063a848e65 100644
--- a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_41_appendGfx
+glabel sleep_bubble_appendGfx
 /* 35CEE0 E0052460 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 35CEE4 E0052464 3C05DB06 */  lui       $a1, 0xdb06
 /* 35CEE8 E0052468 3C07800A */  lui       $a3, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s b/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_main.s
similarity index 86%
rename from ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s
rename to ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_main.s
index 59409a69b4..c6e2346d0d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_main.s
+++ b/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_41_main
+glabel sleep_bubble_main
 /* 35CA80 E0052000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 35CA84 E0052004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 35CA88 E0052008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_41_main
 /* 35CA9C E005201C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35CAA0 E0052020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 35CAA4 E0052024 4487C000 */  mtc1      $a3, $f24
-/* 35CAA8 E0052028 3C02E005 */  lui       $v0, %hi(fx_41_init)
-/* 35CAAC E005202C 244220E8 */  addiu     $v0, $v0, %lo(fx_41_init)
+/* 35CAA8 E0052028 3C02E005 */  lui       $v0, %hi(sleep_bubble_init)
+/* 35CAAC E005202C 244220E8 */  addiu     $v0, $v0, %lo(sleep_bubble_init)
 /* 35CAB0 E0052030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35CAB4 E0052034 3C02E005 */  lui       $v0, %hi(fx_41_update)
-/* 35CAB8 E0052038 244220F0 */  addiu     $v0, $v0, %lo(fx_41_update)
+/* 35CAB4 E0052034 3C02E005 */  lui       $v0, %hi(sleep_bubble_update)
+/* 35CAB8 E0052038 244220F0 */  addiu     $v0, $v0, %lo(sleep_bubble_update)
 /* 35CABC E005203C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35CAC0 E0052040 3C02E005 */  lui       $v0, %hi(fx_41_render)
-/* 35CAC4 E0052044 2442241C */  addiu     $v0, $v0, %lo(fx_41_render)
+/* 35CAC0 E0052040 3C02E005 */  lui       $v0, %hi(sleep_bubble_render)
+/* 35CAC4 E0052044 2442241C */  addiu     $v0, $v0, %lo(sleep_bubble_render)
 /* 35CAC8 E0052048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35CACC E005204C 24020029 */  addiu     $v0, $zero, 0x29
 /* 35CAD0 E0052050 AFBF0030 */  sw        $ra, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_update.s b/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_41/fx_41_update.s
rename to ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_update.s
index 569b1fc135..2621f5e1ba 100644
--- a/ver/us/asm/nonmatchings/effects/effect_41/fx_41_update.s
+++ b/ver/us/asm/nonmatchings/effects/sleep_bubble/sleep_bubble_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_41_update
+glabel sleep_bubble_update
 /* 35CB70 E00520F0 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 35CB74 E00520F4 AFBF0030 */  sw        $ra, 0x30($sp)
 /* 35CB78 E00520F8 AFB7002C */  sw        $s7, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_appendGfx.s b/ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_39/fx_39_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_appendGfx.s
index d097fd0df7..c6fc9552b5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_39_appendGfx
+glabel smoke_burst_appendGfx
 /* 35BBE4 E004E214 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 35BBE8 E004E218 0080302D */  daddu     $a2, $a0, $zero
 /* 35BBEC E004E21C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s b/ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s
rename to ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_main.s
index 95c02b0538..fd5e78aac2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_main.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_39_main
+glabel smoke_burst_main
 /* 35B9D0 E004E000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 35B9D4 E004E004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 35B9D8 E004E008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_39_main
 /* 35B9F4 E004E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35B9F8 E004E028 AFB30034 */  sw        $s3, 0x34($sp)
 /* 35B9FC E004E02C 8FB3006C */  lw        $s3, 0x6c($sp)
-/* 35BA00 E004E030 3C02E005 */  lui       $v0, %hi(fx_39_init)
-/* 35BA04 E004E034 2442E15C */  addiu     $v0, $v0, %lo(fx_39_init)
+/* 35BA00 E004E030 3C02E005 */  lui       $v0, %hi(smoke_burst_init)
+/* 35BA04 E004E034 2442E15C */  addiu     $v0, $v0, %lo(smoke_burst_init)
 /* 35BA08 E004E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35BA0C E004E03C 3C02E005 */  lui       $v0, %hi(fx_39_update)
-/* 35BA10 E004E040 2442E164 */  addiu     $v0, $v0, %lo(fx_39_update)
+/* 35BA0C E004E03C 3C02E005 */  lui       $v0, %hi(smoke_burst_update)
+/* 35BA10 E004E040 2442E164 */  addiu     $v0, $v0, %lo(smoke_burst_update)
 /* 35BA14 E004E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35BA18 E004E048 3C02E005 */  lui       $v0, %hi(fx_39_render)
-/* 35BA1C E004E04C 2442E1D0 */  addiu     $v0, $v0, %lo(fx_39_render)
+/* 35BA18 E004E048 3C02E005 */  lui       $v0, %hi(smoke_burst_render)
+/* 35BA1C E004E04C 2442E1D0 */  addiu     $v0, $v0, %lo(smoke_burst_render)
 /* 35BA20 E004E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35BA24 E004E054 24020027 */  addiu     $v0, $zero, 0x27
 /* 35BA28 E004E058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_update.s b/ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_39/fx_39_update.s
rename to ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_update.s
index e72f1e1096..d224f84536 100644
--- a/ver/us/asm/nonmatchings/effects/effect_39/fx_39_update.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_burst/smoke_burst_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_39_update
+glabel smoke_burst_update
 /* 35BB34 E004E164 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 35BB38 E004E168 0080282D */  daddu     $a1, $a0, $zero
 /* 35BB3C E004E16C AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_appendGfx.s b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_29/fx_29_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_appendGfx.s
index 12800a08fc..7004f1ee87 100644
--- a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_29_appendGfx
+glabel smoke_impact_appendGfx
 /* 34EFD4 E003A354 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 34EFD8 E003A358 AFBE0100 */  sw        $fp, 0x100($sp)
 /* 34EFDC E003A35C 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s
rename to ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_main.s
index 8594c80419..230010a1e2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_main.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_29_main
+glabel smoke_impact_main
 /* 34EC80 E003A000 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 34EC84 E003A004 F7B40048 */  sdc1      $f20, 0x48($sp)
 /* 34EC88 E003A008 4485A000 */  mtc1      $a1, $f20
@@ -18,14 +18,14 @@ glabel fx_29_main
 /* 34ECB4 E003A034 27A40010 */  addiu     $a0, $sp, 0x10
 /* 34ECB8 E003A038 AFB40038 */  sw        $s4, 0x38($sp)
 /* 34ECBC E003A03C 8FB40084 */  lw        $s4, 0x84($sp)
-/* 34ECC0 E003A040 3C02E004 */  lui       $v0, %hi(fx_29_init)
-/* 34ECC4 E003A044 2442A1D4 */  addiu     $v0, $v0, %lo(fx_29_init)
+/* 34ECC0 E003A040 3C02E004 */  lui       $v0, %hi(smoke_impact_init)
+/* 34ECC4 E003A044 2442A1D4 */  addiu     $v0, $v0, %lo(smoke_impact_init)
 /* 34ECC8 E003A048 AFA20018 */  sw        $v0, 0x18($sp)
-/* 34ECCC E003A04C 3C02E004 */  lui       $v0, %hi(fx_29_update)
-/* 34ECD0 E003A050 2442A1DC */  addiu     $v0, $v0, %lo(fx_29_update)
+/* 34ECCC E003A04C 3C02E004 */  lui       $v0, %hi(smoke_impact_update)
+/* 34ECD0 E003A050 2442A1DC */  addiu     $v0, $v0, %lo(smoke_impact_update)
 /* 34ECD4 E003A054 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 34ECD8 E003A058 3C02E004 */  lui       $v0, %hi(fx_29_render)
-/* 34ECDC E003A05C 2442A310 */  addiu     $v0, $v0, %lo(fx_29_render)
+/* 34ECD8 E003A058 3C02E004 */  lui       $v0, %hi(smoke_impact_render)
+/* 34ECDC E003A05C 2442A310 */  addiu     $v0, $v0, %lo(smoke_impact_render)
 /* 34ECE0 E003A060 AFA20020 */  sw        $v0, 0x20($sp)
 /* 34ECE4 E003A064 2402001D */  addiu     $v0, $zero, 0x1d
 /* 34ECE8 E003A068 AFBF0040 */  sw        $ra, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_update.s b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_29/fx_29_update.s
rename to ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_update.s
index 56c082c933..8b39251ae8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_29/fx_29_update.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_impact/smoke_impact_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_29_update
+glabel smoke_impact_update
 /* 34EE5C E003A1DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 34EE60 E003A1E0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 34EE64 E003A1E4 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_appendGfx.s b/ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_23/fx_23_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_appendGfx.s
index 443ae07821..6ae0840f64 100644
--- a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_23_appendGfx
+glabel smoke_ring_appendGfx
 /* 341D48 E002E368 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 341D4C E002E36C AFBE0100 */  sw        $fp, 0x100($sp)
 /* 341D50 E002E370 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s b/ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s
rename to ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_main.s
index 44d0cd9f9d..d37fb869fe 100644
--- a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_main.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_23_main
+glabel smoke_ring_main
 /* 3419E0 E002E000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3419E4 E002E004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3419E8 E002E008 4485A000 */  mtc1      $a1, $f20
@@ -40,14 +40,14 @@ glabel fx_23_main
 /* 341A60 E002E080 3C014228 */  lui       $at, 0x4228
 /* 341A64 E002E084 4481B000 */  mtc1      $at, $f22
 .LE002E088:
-/* 341A68 E002E088 3C02E003 */  lui       $v0, %hi(fx_23_init)
-/* 341A6C E002E08C 2442E248 */  addiu     $v0, $v0, %lo(fx_23_init)
+/* 341A68 E002E088 3C02E003 */  lui       $v0, %hi(smoke_ring_init)
+/* 341A6C E002E08C 2442E248 */  addiu     $v0, $v0, %lo(smoke_ring_init)
 /* 341A70 E002E090 AC820008 */  sw        $v0, 8($a0)
-/* 341A74 E002E094 3C02E003 */  lui       $v0, %hi(fx_23_update)
-/* 341A78 E002E098 2442E250 */  addiu     $v0, $v0, %lo(fx_23_update)
+/* 341A74 E002E094 3C02E003 */  lui       $v0, %hi(smoke_ring_update)
+/* 341A78 E002E098 2442E250 */  addiu     $v0, $v0, %lo(smoke_ring_update)
 /* 341A7C E002E09C AC82000C */  sw        $v0, 0xc($a0)
-/* 341A80 E002E0A0 3C02E003 */  lui       $v0, %hi(fx_23_render)
-/* 341A84 E002E0A4 2442E330 */  addiu     $v0, $v0, %lo(fx_23_render)
+/* 341A80 E002E0A0 3C02E003 */  lui       $v0, %hi(smoke_ring_render)
+/* 341A84 E002E0A4 2442E330 */  addiu     $v0, $v0, %lo(smoke_ring_render)
 /* 341A88 E002E0A8 AC820010 */  sw        $v0, 0x10($a0)
 /* 341A8C E002E0AC 24020017 */  addiu     $v0, $zero, 0x17
 /* 341A90 E002E0B0 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_update.s b/ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_23/fx_23_update.s
rename to ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_update.s
index 5591b30766..c113ba97af 100644
--- a/ver/us/asm/nonmatchings/effects/effect_23/fx_23_update.s
+++ b/ver/us/asm/nonmatchings/effects/smoke_ring/smoke_ring_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_23_update
+glabel smoke_ring_update
 /* 341C30 E002E250 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 341C34 E002E254 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 341C38 E002E258 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_appendGfx.s b/ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_87/fx_87_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_appendGfx.s
index 9b80ecd488..f1e6a47fe9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_87_appendGfx
+glabel snaking_static_appendGfx
 /* 3B289C E00AE54C 27BDFF18 */  addiu     $sp, $sp, -0xe8
 /* 3B28A0 E00AE550 3C06DB06 */  lui       $a2, 0xdb06
 /* 3B28A4 E00AE554 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s b/ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s
rename to ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_main.s
index c922db1a4e..b50b7b4d1d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_main.s
+++ b/ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_87_main
+glabel snaking_static_main
 /* 3B2350 E00AE000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3B2354 E00AE004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3B2358 E00AE008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_87_main
 /* 3B2374 E00AE024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B2378 E00AE028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3B237C E00AE02C 8FB2006C */  lw        $s2, 0x6c($sp)
-/* 3B2380 E00AE030 3C02E00B */  lui       $v0, %hi(fx_87_init)
-/* 3B2384 E00AE034 2442E1AC */  addiu     $v0, $v0, %lo(fx_87_init)
+/* 3B2380 E00AE030 3C02E00B */  lui       $v0, %hi(snaking_static_init)
+/* 3B2384 E00AE034 2442E1AC */  addiu     $v0, $v0, %lo(snaking_static_init)
 /* 3B2388 E00AE038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B238C E00AE03C 3C02E00B */  lui       $v0, %hi(fx_87_update)
-/* 3B2390 E00AE040 2442E1B4 */  addiu     $v0, $v0, %lo(fx_87_update)
+/* 3B238C E00AE03C 3C02E00B */  lui       $v0, %hi(snaking_static_update)
+/* 3B2390 E00AE040 2442E1B4 */  addiu     $v0, $v0, %lo(snaking_static_update)
 /* 3B2394 E00AE044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B2398 E00AE048 3C02E00B */  lui       $v0, %hi(fx_87_render)
-/* 3B239C E00AE04C 2442E4FC */  addiu     $v0, $v0, %lo(fx_87_render)
+/* 3B2398 E00AE048 3C02E00B */  lui       $v0, %hi(snaking_static_render)
+/* 3B239C E00AE04C 2442E4FC */  addiu     $v0, $v0, %lo(snaking_static_render)
 /* 3B23A0 E00AE050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B23A4 E00AE054 24020057 */  addiu     $v0, $zero, 0x57
 /* 3B23A8 E00AE058 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_update.s b/ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_87/fx_87_update.s
rename to ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_update.s
index 48b13813e0..074abbc119 100644
--- a/ver/us/asm/nonmatchings/effects/effect_87/fx_87_update.s
+++ b/ver/us/asm/nonmatchings/effects/snaking_static/snaking_static_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_87_update
+glabel snaking_static_update
 /* 3B2504 E00AE1B4 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3B2508 E00AE1B8 AFB3001C */  sw        $s3, 0x1c($sp)
 /* 3B250C E00AE1BC 0080982D */  daddu     $s3, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A000.s b/ver/us/asm/nonmatchings/effects/snowfall/func_E008A000.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_69/func_E008A000.s
rename to ver/us/asm/nonmatchings/effects/snowfall/func_E008A000.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/func_E008A290.s b/ver/us/asm/nonmatchings/effects/snowfall/func_E008A290.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_69/func_E008A290.s
rename to ver/us/asm/nonmatchings/effects/snowfall/func_E008A290.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_appendGfx.s b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_69/fx_69_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/snowfall/snowfall_appendGfx.s
index 53b92c36d7..2a22961d8d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_69_appendGfx
+glabel snowfall_appendGfx
 /* 38CD18 E008A728 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 38CD1C E008A72C AFB1006C */  sw        $s1, 0x6c($sp)
 /* 38CD20 E008A730 0080882D */  daddu     $s1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_main.s
similarity index 88%
rename from ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s
rename to ver/us/asm/nonmatchings/effects/snowfall/snowfall_main.s
index 36b5159134..a7d47f40ea 100644
--- a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_main.s
+++ b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_main.s
@@ -1,21 +1,21 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_69_main
+glabel snowfall_main
 /* 38C778 E008A188 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 38C77C E008A18C AFB1002C */  sw        $s1, 0x2c($sp)
 /* 38C780 E008A190 0080882D */  daddu     $s1, $a0, $zero
 /* 38C784 E008A194 AFB30034 */  sw        $s3, 0x34($sp)
 /* 38C788 E008A198 00A0982D */  daddu     $s3, $a1, $zero
 /* 38C78C E008A19C 27A40010 */  addiu     $a0, $sp, 0x10
-/* 38C790 E008A1A0 3C02E009 */  lui       $v0, %hi(fx_69_init)
-/* 38C794 E008A1A4 2442A288 */  addiu     $v0, $v0, %lo(fx_69_init)
+/* 38C790 E008A1A0 3C02E009 */  lui       $v0, %hi(snowfall_init)
+/* 38C794 E008A1A4 2442A288 */  addiu     $v0, $v0, %lo(snowfall_init)
 /* 38C798 E008A1A8 AFA20018 */  sw        $v0, 0x18($sp)
-/* 38C79C E008A1AC 3C02E009 */  lui       $v0, %hi(fx_69_update)
-/* 38C7A0 E008A1B0 2442A53C */  addiu     $v0, $v0, %lo(fx_69_update)
+/* 38C79C E008A1AC 3C02E009 */  lui       $v0, %hi(snowfall_update)
+/* 38C7A0 E008A1B0 2442A53C */  addiu     $v0, $v0, %lo(snowfall_update)
 /* 38C7A4 E008A1B4 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 38C7A8 E008A1B8 3C02E009 */  lui       $v0, %hi(fx_69_render)
-/* 38C7AC E008A1BC 2442A6E4 */  addiu     $v0, $v0, %lo(fx_69_render)
+/* 38C7A8 E008A1B8 3C02E009 */  lui       $v0, %hi(snowfall_render)
+/* 38C7AC E008A1BC 2442A6E4 */  addiu     $v0, $v0, %lo(snowfall_render)
 /* 38C7B0 E008A1C0 AFA20020 */  sw        $v0, 0x20($sp)
 /* 38C7B4 E008A1C4 24020045 */  addiu     $v0, $zero, 0x45
 /* 38C7B8 E008A1C8 AFB00028 */  sw        $s0, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_update.s b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_69/fx_69_update.s
rename to ver/us/asm/nonmatchings/effects/snowfall/snowfall_update.s
index 6aaba6f1fb..3a27469918 100644
--- a/ver/us/asm/nonmatchings/effects/effect_69/fx_69_update.s
+++ b/ver/us/asm/nonmatchings/effects/snowfall/snowfall_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_69_update
+glabel snowfall_update
 /* 38CB2C E008A53C 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 38CB30 E008A540 0080282D */  daddu     $a1, $a0, $zero
 /* 38CB34 E008A544 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_appendGfx.s b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_96/fx_96_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_appendGfx.s
index 14c3dacca0..819c2040d9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_96_appendGfx
+glabel snowman_doll_appendGfx
 /* 3BD4C0 E00C0760 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3BD4C4 E00C0764 0080282D */  daddu     $a1, $a0, $zero
 /* 3BD4C8 E00C0768 3C06DB06 */  lui       $a2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s
rename to ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_main.s
index 4dcfe5a832..abc9f942b2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_main.s
+++ b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_96_main
+glabel snowman_doll_main
 /* 3BCD60 E00C0000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3BCD64 E00C0004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3BCD68 E00C0008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_96_main
 /* 3BCD84 E00C0024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3BCD88 E00C0028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3BCD8C E00C002C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3BCD90 E00C0030 3C02E00C */  lui       $v0, %hi(fx_96_init)
-/* 3BCD94 E00C0034 24420158 */  addiu     $v0, $v0, %lo(fx_96_init)
+/* 3BCD90 E00C0030 3C02E00C */  lui       $v0, %hi(snowman_doll_init)
+/* 3BCD94 E00C0034 24420158 */  addiu     $v0, $v0, %lo(snowman_doll_init)
 /* 3BCD98 E00C0038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3BCD9C E00C003C 3C02E00C */  lui       $v0, %hi(fx_96_update)
-/* 3BCDA0 E00C0040 24420160 */  addiu     $v0, $v0, %lo(fx_96_update)
+/* 3BCD9C E00C003C 3C02E00C */  lui       $v0, %hi(snowman_doll_update)
+/* 3BCDA0 E00C0040 24420160 */  addiu     $v0, $v0, %lo(snowman_doll_update)
 /* 3BCDA4 E00C0044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3BCDA8 E00C0048 3C02E00C */  lui       $v0, %hi(fx_96_render)
-/* 3BCDAC E00C004C 24420710 */  addiu     $v0, $v0, %lo(fx_96_render)
+/* 3BCDA8 E00C0048 3C02E00C */  lui       $v0, %hi(snowman_doll_render)
+/* 3BCDAC E00C004C 24420710 */  addiu     $v0, $v0, %lo(snowman_doll_render)
 /* 3BCDB0 E00C0050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3BCDB4 E00C0054 24020060 */  addiu     $v0, $zero, 0x60
 /* 3BCDB8 E00C0058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_update.s b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_96/fx_96_update.s
rename to ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_update.s
index 9dde796714..2512c53af3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_96/fx_96_update.s
+++ b/ver/us/asm/nonmatchings/effects/snowman_doll/snowman_doll_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_96_update
+glabel snowman_doll_update
 /* 3BCEC0 E00C0160 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3BCEC4 E00C0164 AFBF002C */  sw        $ra, 0x2c($sp)
 /* 3BCEC8 E00C0168 AFB00028 */  sw        $s0, 0x28($sp)
@@ -354,7 +354,7 @@ dlabel LE00C0570_3BD2D0
 /* 3BD3C4 E00C0664 44061000 */  mfc1      $a2, $f2
 /* 3BD3C8 E00C0668 24020028 */  addiu     $v0, $zero, 0x28
 /* 3BD3CC E00C066C AFA20014 */  sw        $v0, 0x14($sp)
-/* 3BD3D0 E00C0670 0C037800 */  jal       fx_111_main
+/* 3BD3D0 E00C0670 0C037800 */  jal       cold_breath_main
 /* 3BD3D4 E00C0674 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 3BD3D8 E00C0678 0C080150 */  jal       shim_load_effect
 /* 3BD3DC E00C067C 24040072 */   addiu    $a0, $zero, 0x72
@@ -387,7 +387,7 @@ dlabel LE00C0570_3BD2D0
 /* 3BD448 E00C06E8 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3BD44C E00C06EC E7A60010 */  swc1      $f6, 0x10($sp)
 /* 3BD450 E00C06F0 E7A40018 */  swc1      $f4, 0x18($sp)
-/* 3BD454 E00C06F4 0C039000 */  jal       fx_114_main
+/* 3BD454 E00C06F4 0C039000 */  jal       misc_particles_main
 /* 3BD458 E00C06F8 E7A20014 */   swc1     $f2, 0x14($sp)
 .LE00C06FC:
 /* 3BD45C E00C06FC 8FBF002C */  lw        $ra, 0x2c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/func_E01166E8.s b/ver/us/asm/nonmatchings/effects/something_rotating/func_E01166E8.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_125/func_E01166E8.s
rename to ver/us/asm/nonmatchings/effects/something_rotating/func_E01166E8.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_appendGfx.s b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_125/fx_125_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_appendGfx.s
index 3669da8a26..3658d507fe 100644
--- a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_125_appendGfx
+glabel something_rotating_appendGfx
 /* 402EC4 E0116884 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 402EC8 E0116888 AFB7002C */  sw        $s7, 0x2c($sp)
 /* 402ECC E011688C 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s
rename to ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_main.s
index fb92b2d9c7..3a2f7d9f41 100644
--- a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_main.s
+++ b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_125_main
+glabel something_rotating_main
 /* 402640 E0116000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 402644 E0116004 F7B60048 */  sdc1      $f22, 0x48($sp)
 /* 402648 E0116008 4485B000 */  mtc1      $a1, $f22
@@ -16,14 +16,14 @@ glabel fx_125_main
 /* 40266C E011602C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 402670 E0116030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 402674 E0116034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 402678 E0116038 3C02E011 */  lui       $v0, %hi(fx_125_init)
-/* 40267C E011603C 24426184 */  addiu     $v0, $v0, %lo(fx_125_init)
+/* 402678 E0116038 3C02E011 */  lui       $v0, %hi(something_rotating_init)
+/* 40267C E011603C 24426184 */  addiu     $v0, $v0, %lo(something_rotating_init)
 /* 402680 E0116040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 402684 E0116044 3C02E011 */  lui       $v0, %hi(fx_125_update)
-/* 402688 E0116048 2442618C */  addiu     $v0, $v0, %lo(fx_125_update)
+/* 402684 E0116044 3C02E011 */  lui       $v0, %hi(something_rotating_update)
+/* 402688 E0116048 2442618C */  addiu     $v0, $v0, %lo(something_rotating_update)
 /* 40268C E011604C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 402690 E0116050 3C02E011 */  lui       $v0, %hi(fx_125_render)
-/* 402694 E0116054 244266A0 */  addiu     $v0, $v0, %lo(fx_125_render)
+/* 402690 E0116050 3C02E011 */  lui       $v0, %hi(something_rotating_render)
+/* 402694 E0116054 244266A0 */  addiu     $v0, $v0, %lo(something_rotating_render)
 /* 402698 E0116058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40269C E011605C 2402007D */  addiu     $v0, $zero, 0x7d
 /* 4026A0 E0116060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_update.s b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_125/fx_125_update.s
rename to ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_update.s
index 7cc3c73626..766480f525 100644
--- a/ver/us/asm/nonmatchings/effects/effect_125/fx_125_update.s
+++ b/ver/us/asm/nonmatchings/effects/something_rotating/something_rotating_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_125_update
+glabel something_rotating_update
 /* 4027CC E011618C 27BDFF88 */  addiu     $sp, $sp, -0x78
 /* 4027D0 E0116190 AFB40030 */  sw        $s4, 0x30($sp)
 /* 4027D4 E0116194 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_appendGfx.s b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_17/fx_17_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/sparkles/sparkles_appendGfx.s
index 6dbcbd67ba..e7111d0918 100644
--- a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_17_appendGfx
+glabel sparkles_appendGfx
 /* 337BD8 E0022998 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 337BDC E002299C 3C06DB06 */  lui       $a2, 0xdb06
 /* 337BE0 E00229A0 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_main.s
similarity index 97%
rename from ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s
rename to ver/us/asm/nonmatchings/effects/sparkles/sparkles_main.s
index 96c32d1b73..e589c80823 100644
--- a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_main.s
+++ b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_17_main
+glabel sparkles_main
 /* 337240 E0022000 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 337244 E0022004 F7B40050 */  sdc1      $f20, 0x50($sp)
 /* 337248 E0022008 4485A000 */  mtc1      $a1, $f20
@@ -58,14 +58,14 @@ glabel fx_17_main
 /* 3372FC E00220BC 4481F000 */  mtc1      $at, $f30
 .LE00220C0:
 /* 337300 E00220C0 26520001 */  addiu     $s2, $s2, 1
-/* 337304 E00220C4 3C02E002 */  lui       $v0, %hi(fx_17_init)
-/* 337308 E00220C8 24422544 */  addiu     $v0, $v0, %lo(fx_17_init)
+/* 337304 E00220C4 3C02E002 */  lui       $v0, %hi(sparkles_init)
+/* 337308 E00220C8 24422544 */  addiu     $v0, $v0, %lo(sparkles_init)
 /* 33730C E00220CC AC820008 */  sw        $v0, 8($a0)
-/* 337310 E00220D0 3C02E002 */  lui       $v0, %hi(fx_17_update)
-/* 337314 E00220D4 2442254C */  addiu     $v0, $v0, %lo(fx_17_update)
+/* 337310 E00220D0 3C02E002 */  lui       $v0, %hi(sparkles_update)
+/* 337314 E00220D4 2442254C */  addiu     $v0, $v0, %lo(sparkles_update)
 /* 337318 E00220D8 AC82000C */  sw        $v0, 0xc($a0)
-/* 33731C E00220DC 3C02E002 */  lui       $v0, %hi(fx_17_render)
-/* 337320 E00220E0 24422960 */  addiu     $v0, $v0, %lo(fx_17_render)
+/* 33731C E00220DC 3C02E002 */  lui       $v0, %hi(sparkles_render)
+/* 337320 E00220E0 24422960 */  addiu     $v0, $v0, %lo(sparkles_render)
 /* 337324 E00220E4 AC820010 */  sw        $v0, 0x10($a0)
 /* 337328 E00220E8 24020011 */  addiu     $v0, $zero, 0x11
 /* 33732C E00220EC AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_update.s b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_17/fx_17_update.s
rename to ver/us/asm/nonmatchings/effects/sparkles/sparkles_update.s
index ed27c2f951..870ed5e348 100644
--- a/ver/us/asm/nonmatchings/effects/effect_17/fx_17_update.s
+++ b/ver/us/asm/nonmatchings/effects/sparkles/sparkles_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_17_update
+glabel sparkles_update
 /* 33778C E002254C 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 337790 E0022550 AFB50024 */  sw        $s5, 0x24($sp)
 /* 337794 E0022554 0080A82D */  daddu     $s5, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_appendGfx.s b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_28/fx_28_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_appendGfx.s
index 20c8b7dbef..08ea8cc895 100644
--- a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_28_appendGfx
+glabel spiky_white_aura_appendGfx
 /* 34E468 E0038748 27BDFF30 */  addiu     $sp, $sp, -0xd0
 /* 34E46C E003874C AFB700B4 */  sw        $s7, 0xb4($sp)
 /* 34E470 E0038750 0080B82D */  daddu     $s7, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_main.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s
rename to ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_main.s
index 3cffa7f90a..6fcbee2bda 100644
--- a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_main.s
+++ b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_28_main
+glabel spiky_white_aura_main
 /* 34DD20 E0038000 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 34DD24 E0038004 F7BE00C0 */  sdc1      $f30, 0xc0($sp)
 /* 34DD28 E0038008 4485F000 */  mtc1      $a1, $f30
@@ -78,16 +78,16 @@ glabel fx_28_main
 /* 34DE38 E0038118 0200202D */  daddu     $a0, $s0, $zero
 /* 34DE3C E003811C 3C014190 */  lui       $at, 0x4190
 /* 34DE40 E0038120 44810000 */  mtc1      $at, $f0
-/* 34DE44 E0038124 3C02E004 */  lui       $v0, %hi(fx_28_init)
-/* 34DE48 E0038128 2442841C */  addiu     $v0, $v0, %lo(fx_28_init)
+/* 34DE44 E0038124 3C02E004 */  lui       $v0, %hi(spiky_white_aura_init)
+/* 34DE48 E0038128 2442841C */  addiu     $v0, $v0, %lo(spiky_white_aura_init)
 /* 34DE4C E003812C AC820008 */  sw        $v0, 8($a0)
 /* 34DE50 E0038130 4600D682 */  mul.s     $f26, $f26, $f0
 /* 34DE54 E0038134 00000000 */  nop
-/* 34DE58 E0038138 3C02E004 */  lui       $v0, %hi(fx_28_update)
-/* 34DE5C E003813C 24428424 */  addiu     $v0, $v0, %lo(fx_28_update)
+/* 34DE58 E0038138 3C02E004 */  lui       $v0, %hi(spiky_white_aura_update)
+/* 34DE5C E003813C 24428424 */  addiu     $v0, $v0, %lo(spiky_white_aura_update)
 /* 34DE60 E0038140 AC82000C */  sw        $v0, 0xc($a0)
-/* 34DE64 E0038144 3C02E004 */  lui       $v0, %hi(fx_28_render)
-/* 34DE68 E0038148 24428704 */  addiu     $v0, $v0, %lo(fx_28_render)
+/* 34DE64 E0038144 3C02E004 */  lui       $v0, %hi(spiky_white_aura_render)
+/* 34DE68 E0038148 24428704 */  addiu     $v0, $v0, %lo(spiky_white_aura_render)
 /* 34DE6C E003814C AC820010 */  sw        $v0, 0x10($a0)
 /* 34DE70 E0038150 4600C602 */  mul.s     $f24, $f24, $f0
 /* 34DE74 E0038154 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_update.s b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_28/fx_28_update.s
rename to ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_update.s
index 3974bccb30..899a569df1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_28/fx_28_update.s
+++ b/ver/us/asm/nonmatchings/effects/spiky_white_aura/spiky_white_aura_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_28_update
+glabel spiky_white_aura_update
 /* 34E144 E0038424 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 34E148 E0038428 AFB40020 */  sw        $s4, 0x20($sp)
 /* 34E14C E003842C 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/func_E0112330.s b/ver/us/asm/nonmatchings/effects/spirit_card/func_E0112330.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_123/func_E0112330.s
rename to ver/us/asm/nonmatchings/effects/spirit_card/func_E0112330.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_appendGfx.s b/ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_123/fx_123_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_appendGfx.s
index a70894f13e..ee549e3ae2 100644
--- a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_123_appendGfx
+glabel spirit_card_appendGfx
 /* 3FA31C E01124CC 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 3FA320 E01124D0 3C06DB06 */  lui       $a2, 0xdb06
 /* 3FA324 E01124D4 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s b/ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s
rename to ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_main.s
index b68d991a09..9fc81ba5bd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_main.s
+++ b/ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_123_main
+glabel spirit_card_main
 /* 3F9E50 E0112000 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 3F9E54 E0112004 F7B80068 */  sdc1      $f24, 0x68($sp)
 /* 3F9E58 E0112008 4485C000 */  mtc1      $a1, $f24
@@ -16,14 +16,14 @@ glabel fx_123_main
 /* 3F9E7C E011202C 27A40028 */  addiu     $a0, $sp, 0x28
 /* 3F9E80 E0112030 AFB3004C */  sw        $s3, 0x4c($sp)
 /* 3F9E84 E0112034 8FB30094 */  lw        $s3, 0x94($sp)
-/* 3F9E88 E0112038 3C02E011 */  lui       $v0, %hi(fx_123_init)
-/* 3F9E8C E011203C 244221B8 */  addiu     $v0, $v0, %lo(fx_123_init)
+/* 3F9E88 E0112038 3C02E011 */  lui       $v0, %hi(spirit_card_init)
+/* 3F9E8C E011203C 244221B8 */  addiu     $v0, $v0, %lo(spirit_card_init)
 /* 3F9E90 E0112040 AFA20030 */  sw        $v0, 0x30($sp)
-/* 3F9E94 E0112044 3C02E011 */  lui       $v0, %hi(fx_123_update)
-/* 3F9E98 E0112048 244221C0 */  addiu     $v0, $v0, %lo(fx_123_update)
+/* 3F9E94 E0112044 3C02E011 */  lui       $v0, %hi(spirit_card_update)
+/* 3F9E98 E0112048 244221C0 */  addiu     $v0, $v0, %lo(spirit_card_update)
 /* 3F9E9C E011204C AFA20034 */  sw        $v0, 0x34($sp)
-/* 3F9EA0 E0112050 3C02E011 */  lui       $v0, %hi(fx_123_render)
-/* 3F9EA4 E0112054 244222E8 */  addiu     $v0, $v0, %lo(fx_123_render)
+/* 3F9EA0 E0112050 3C02E011 */  lui       $v0, %hi(spirit_card_render)
+/* 3F9EA4 E0112054 244222E8 */  addiu     $v0, $v0, %lo(spirit_card_render)
 /* 3F9EA8 E0112058 AFA20038 */  sw        $v0, 0x38($sp)
 /* 3F9EAC E011205C 2402007B */  addiu     $v0, $zero, 0x7b
 /* 3F9EB0 E0112060 AFBF0050 */  sw        $ra, 0x50($sp)
@@ -75,7 +75,7 @@ glabel fx_123_main
 /* 3F9F58 E0112108 8E050004 */  lw        $a1, 4($s0)
 /* 3F9F5C E011210C 8E060008 */  lw        $a2, 8($s0)
 /* 3F9F60 E0112110 8E07000C */  lw        $a3, 0xc($s0)
-/* 3F9F64 E0112114 0C012000 */  jal       fx_36_main
+/* 3F9F64 E0112114 0C012000 */  jal       ring_blast_main
 /* 3F9F68 E0112118 24040001 */   addiu    $a0, $zero, 1
 .LE011211C:
 /* 3F9F6C E011211C 2A420002 */  slti      $v0, $s2, 2
@@ -101,7 +101,7 @@ glabel fx_123_main
 /* 3F9FBC E011216C AFA00020 */  sw        $zero, 0x20($sp)
 /* 3F9FC0 E0112170 E7A20018 */  swc1      $f2, 0x18($sp)
 /* 3F9FC4 E0112174 E7A40010 */  swc1      $f4, 0x10($sp)
-/* 3F9FC8 E0112178 0C039000 */  jal       fx_114_main
+/* 3F9FC8 E0112178 0C039000 */  jal       misc_particles_main
 /* 3F9FCC E011217C E7A00014 */   swc1     $f0, 0x14($sp)
 /* 3F9FD0 E0112180 AE02001C */  sw        $v0, 0x1c($s0)
 .LE0112184:
diff --git a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_update.s b/ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_123/fx_123_update.s
rename to ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_update.s
index 3b660254bb..340d8ea5f4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_123/fx_123_update.s
+++ b/ver/us/asm/nonmatchings/effects/spirit_card/spirit_card_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_123_update
+glabel spirit_card_update
 /* 3FA010 E01121C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3FA014 E01121C4 AFBF0014 */  sw        $ra, 0x14($sp)
 /* 3FA018 E01121C8 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_appendGfx.s b/ver/us/asm/nonmatchings/effects/squirt/squirt_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_89/fx_89_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/squirt/squirt_appendGfx.s
index 3940a92f33..36b595e44f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/squirt/squirt_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_89_appendGfx
+glabel squirt_appendGfx
 /* 3B4C40 E00B24B0 27BDFF00 */  addiu     $sp, $sp, -0x100
 /* 3B4C44 E00B24B4 0080482D */  daddu     $t1, $a0, $zero
 /* 3B4C48 E00B24B8 3C0ADB06 */  lui       $t2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s b/ver/us/asm/nonmatchings/effects/squirt/squirt_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s
rename to ver/us/asm/nonmatchings/effects/squirt/squirt_main.s
index be9c15fde4..02ff027e54 100644
--- a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_main.s
+++ b/ver/us/asm/nonmatchings/effects/squirt/squirt_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_89_main
+glabel squirt_main
 /* 3B4790 E00B2000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3B4794 E00B2004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3B4798 E00B2008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_89_main
 /* 3B47B4 E00B2024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B47B8 E00B2028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3B47BC E00B202C 8FB00070 */  lw        $s0, 0x70($sp)
-/* 3B47C0 E00B2030 3C02E00B */  lui       $v0, %hi(fx_89_init)
-/* 3B47C4 E00B2034 244221DC */  addiu     $v0, $v0, %lo(fx_89_init)
+/* 3B47C0 E00B2030 3C02E00B */  lui       $v0, %hi(squirt_init)
+/* 3B47C4 E00B2034 244221DC */  addiu     $v0, $v0, %lo(squirt_init)
 /* 3B47C8 E00B2038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B47CC E00B203C 3C02E00B */  lui       $v0, %hi(fx_89_update)
-/* 3B47D0 E00B2040 244221E4 */  addiu     $v0, $v0, %lo(fx_89_update)
+/* 3B47CC E00B203C 3C02E00B */  lui       $v0, %hi(squirt_update)
+/* 3B47D0 E00B2040 244221E4 */  addiu     $v0, $v0, %lo(squirt_update)
 /* 3B47D4 E00B2044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B47D8 E00B2048 3C02E00B */  lui       $v0, %hi(fx_89_render)
-/* 3B47DC E00B204C 24422460 */  addiu     $v0, $v0, %lo(fx_89_render)
+/* 3B47D8 E00B2048 3C02E00B */  lui       $v0, %hi(squirt_render)
+/* 3B47DC E00B204C 24422460 */  addiu     $v0, $v0, %lo(squirt_render)
 /* 3B47E0 E00B2050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B47E4 E00B2054 24020059 */  addiu     $v0, $zero, 0x59
 /* 3B47E8 E00B2058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_update.s b/ver/us/asm/nonmatchings/effects/squirt/squirt_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_89/fx_89_update.s
rename to ver/us/asm/nonmatchings/effects/squirt/squirt_update.s
index 1932ccf0e2..506537719d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_89/fx_89_update.s
+++ b/ver/us/asm/nonmatchings/effects/squirt/squirt_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_89_update
+glabel squirt_update
 /* 3B4974 E00B21E4 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3B4978 E00B21E8 AFBF0028 */  sw        $ra, 0x28($sp)
 /* 3B497C E00B21EC AFB50024 */  sw        $s5, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_appendGfx.s b/ver/us/asm/nonmatchings/effects/star/star_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_15/fx_15_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/star/star_appendGfx.s
index b4dc45405a..ff265303fa 100644
--- a/ver/us/asm/nonmatchings/effects/effect_15/fx_15_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/star/star_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_15_appendGfx
+glabel star_appendGfx
 /* 332070 E001E730 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 332074 E001E734 3C03DB06 */  lui       $v1, 0xdb06
 /* 332078 E001E738 AFB700BC */  sw        $s7, 0xbc($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_appendGfx.s b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_133/fx_133_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/star_outline/star_outline_appendGfx.s
index 19ac3242a4..72771bc801 100644
--- a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_133_appendGfx
+glabel star_outline_appendGfx
 /* 41384C E01264EC 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 413850 E01264F0 0080302D */  daddu     $a2, $a0, $zero
 /* 413854 E01264F4 AFBF00D4 */  sw        $ra, 0xd4($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_main.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s
rename to ver/us/asm/nonmatchings/effects/star_outline/star_outline_main.s
index bc5cd7b660..2520c24592 100644
--- a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_main.s
+++ b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_133_main
+glabel star_outline_main
 /* 413360 E0126000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 413364 E0126004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 413368 E0126008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_133_main
 /* 413384 E0126024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 413388 E0126028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 41338C E012602C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 413390 E0126030 3C02E012 */  lui       $v0, %hi(fx_133_init)
-/* 413394 E0126034 2442612C */  addiu     $v0, $v0, %lo(fx_133_init)
+/* 413390 E0126030 3C02E012 */  lui       $v0, %hi(star_outline_init)
+/* 413394 E0126034 2442612C */  addiu     $v0, $v0, %lo(star_outline_init)
 /* 413398 E0126038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 41339C E012603C 3C02E012 */  lui       $v0, %hi(fx_133_update)
-/* 4133A0 E0126040 24426134 */  addiu     $v0, $v0, %lo(fx_133_update)
+/* 41339C E012603C 3C02E012 */  lui       $v0, %hi(star_outline_update)
+/* 4133A0 E0126040 24426134 */  addiu     $v0, $v0, %lo(star_outline_update)
 /* 4133A4 E0126044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 4133A8 E0126048 3C02E012 */  lui       $v0, %hi(fx_133_render)
-/* 4133AC E012604C 244264A4 */  addiu     $v0, $v0, %lo(fx_133_render)
+/* 4133A8 E0126048 3C02E012 */  lui       $v0, %hi(star_outline_render)
+/* 4133AC E012604C 244264A4 */  addiu     $v0, $v0, %lo(star_outline_render)
 /* 4133B0 E0126050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 4133B4 E0126054 24020085 */  addiu     $v0, $zero, 0x85
 /* 4133B8 E0126058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_update.s b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_133/fx_133_update.s
rename to ver/us/asm/nonmatchings/effects/star_outline/star_outline_update.s
index f888b646cd..3e8a0a4ad3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_133/fx_133_update.s
+++ b/ver/us/asm/nonmatchings/effects/star_outline/star_outline_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_133_update
+glabel star_outline_update
 /* 413494 E0126134 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 413498 E0126138 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 41349C E012613C AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_appendGfx.s b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_131/fx_131_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_appendGfx.s
index 55bb1d8d09..b25101e520 100644
--- a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_131_appendGfx
+glabel star_spirits_energy_appendGfx
 /* 40CCAC E012270C 27BDFF70 */  addiu     $sp, $sp, -0x90
 /* 40CCB0 E0122710 0080402D */  daddu     $t0, $a0, $zero
 /* 40CCB4 E0122714 3C09DB06 */  lui       $t1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s
rename to ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_main.s
index 8dc7c623ec..e80e91faad 100644
--- a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_main.s
+++ b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_131_main
+glabel star_spirits_energy_main
 /* 40C5A0 E0122000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 40C5A4 E0122004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 40C5A8 E0122008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_131_main
 /* 40C5C4 E0122024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 40C5C8 E0122028 AFB20030 */  sw        $s2, 0x30($sp)
 /* 40C5CC E012202C 8FB20064 */  lw        $s2, 0x64($sp)
-/* 40C5D0 E0122030 3C02E012 */  lui       $v0, %hi(fx_131_init)
-/* 40C5D4 E0122034 24422174 */  addiu     $v0, $v0, %lo(fx_131_init)
+/* 40C5D0 E0122030 3C02E012 */  lui       $v0, %hi(star_spirits_energy_init)
+/* 40C5D4 E0122034 24422174 */  addiu     $v0, $v0, %lo(star_spirits_energy_init)
 /* 40C5D8 E0122038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 40C5DC E012203C 3C02E012 */  lui       $v0, %hi(fx_131_update)
-/* 40C5E0 E0122040 2442217C */  addiu     $v0, $v0, %lo(fx_131_update)
+/* 40C5DC E012203C 3C02E012 */  lui       $v0, %hi(star_spirits_energy_update)
+/* 40C5E0 E0122040 2442217C */  addiu     $v0, $v0, %lo(star_spirits_energy_update)
 /* 40C5E4 E0122044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 40C5E8 E0122048 3C02E012 */  lui       $v0, %hi(fx_131_render)
-/* 40C5EC E012204C 244226C4 */  addiu     $v0, $v0, %lo(fx_131_render)
+/* 40C5E8 E0122048 3C02E012 */  lui       $v0, %hi(star_spirits_energy_render)
+/* 40C5EC E012204C 244226C4 */  addiu     $v0, $v0, %lo(star_spirits_energy_render)
 /* 40C5F0 E0122050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40C5F4 E0122054 24020083 */  addiu     $v0, $zero, 0x83
 /* 40C5F8 E0122058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_update.s b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_131/fx_131_update.s
rename to ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_update.s
index a4048faa6a..6586bcdc61 100644
--- a/ver/us/asm/nonmatchings/effects/effect_131/fx_131_update.s
+++ b/ver/us/asm/nonmatchings/effects/star_spirits_energy/star_spirits_energy_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_131_update
+glabel star_spirits_energy_update
 /* 40C71C E012217C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 40C720 E0122180 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 40C724 E0122184 AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_appendGfx.s b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_33/fx_33_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_appendGfx.s
index 76edfea111..71ec6c34ff 100644
--- a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_33_appendGfx
+glabel stars_burst_appendGfx
 /* 354B58 E00423B8 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 354B5C E00423BC 3C05DB06 */  lui       $a1, 0xdb06
 /* 354B60 E00423C0 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s
rename to ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_main.s
index 6f12c1ec52..75956458cb 100644
--- a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_main.s
+++ b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_33_main
+glabel stars_burst_main
 /* 3547A0 E0042000 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 3547A4 E0042004 F7BE00A8 */  sdc1      $f30, 0xa8($sp)
 /* 3547A8 E0042008 4485F000 */  mtc1      $a1, $f30
@@ -24,14 +24,14 @@ glabel fx_33_main
 /* 3547EC E004204C 12600069 */  beqz      $s3, .LE00421F4
 /* 3547F0 E0042050 AFA700BC */   sw       $a3, 0xbc($sp)
 /* 3547F4 E0042054 26730001 */  addiu     $s3, $s3, 1
-/* 3547F8 E0042058 3C02E004 */  lui       $v0, %hi(fx_33_init)
-/* 3547FC E004205C 2442222C */  addiu     $v0, $v0, %lo(fx_33_init)
+/* 3547F8 E0042058 3C02E004 */  lui       $v0, %hi(stars_burst_init)
+/* 3547FC E004205C 2442222C */  addiu     $v0, $v0, %lo(stars_burst_init)
 /* 354800 E0042060 AFA20018 */  sw        $v0, 0x18($sp)
-/* 354804 E0042064 3C02E004 */  lui       $v0, %hi(fx_33_update)
-/* 354808 E0042068 24422234 */  addiu     $v0, $v0, %lo(fx_33_update)
+/* 354804 E0042064 3C02E004 */  lui       $v0, %hi(stars_burst_update)
+/* 354808 E0042068 24422234 */  addiu     $v0, $v0, %lo(stars_burst_update)
 /* 35480C E004206C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 354810 E0042070 3C02E004 */  lui       $v0, %hi(fx_33_render)
-/* 354814 E0042074 24422374 */  addiu     $v0, $v0, %lo(fx_33_render)
+/* 354810 E0042070 3C02E004 */  lui       $v0, %hi(stars_burst_render)
+/* 354814 E0042074 24422374 */  addiu     $v0, $v0, %lo(stars_burst_render)
 /* 354818 E0042078 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35481C E004207C 24020021 */  addiu     $v0, $zero, 0x21
 /* 354820 E0042080 AFA00010 */  sw        $zero, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_update.s b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_33/fx_33_update.s
rename to ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s
index 19984e3c53..96f07af2e1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_33/fx_33_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_33_update
+glabel stars_burst_update
 /* 3549D4 E0042234 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3549D8 E0042238 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3549DC E004223C 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E318.s b/ver/us/asm/nonmatchings/effects/stars_orbiting/func_E005E318.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_47/func_E005E318.s
rename to ver/us/asm/nonmatchings/effects/stars_orbiting/func_E005E318.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_47/func_E005E334.s b/ver/us/asm/nonmatchings/effects/stars_orbiting/func_E005E334.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_47/func_E005E334.s
rename to ver/us/asm/nonmatchings/effects/stars_orbiting/func_E005E334.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s b/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s
rename to ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_main.s
index b919a119e1..fbdd983385 100644
--- a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_main.s
+++ b/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_47_main
+glabel stars_orbiting_main
 /* 3625C0 E005E000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3625C4 E005E004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3625C8 E005E008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_47_main
 /* 3625E4 E005E024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3625E8 E005E028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3625EC E005E02C 8FB1006C */  lw        $s1, 0x6c($sp)
-/* 3625F0 E005E030 3C02E006 */  lui       $v0, %hi(fx_47_init)
-/* 3625F4 E005E034 2442E1B0 */  addiu     $v0, $v0, %lo(fx_47_init)
+/* 3625F0 E005E030 3C02E006 */  lui       $v0, %hi(stars_orbiting_init)
+/* 3625F4 E005E034 2442E1B0 */  addiu     $v0, $v0, %lo(stars_orbiting_init)
 /* 3625F8 E005E038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3625FC E005E03C 3C02E006 */  lui       $v0, %hi(fx_47_update)
-/* 362600 E005E040 2442E1B8 */  addiu     $v0, $v0, %lo(fx_47_update)
+/* 3625FC E005E03C 3C02E006 */  lui       $v0, %hi(stars_orbiting_update)
+/* 362600 E005E040 2442E1B8 */  addiu     $v0, $v0, %lo(stars_orbiting_update)
 /* 362604 E005E044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 362608 E005E048 3C02E006 */  lui       $v0, %hi(fx_47_render)
-/* 36260C E005E04C 2442E310 */  addiu     $v0, $v0, %lo(fx_47_render)
+/* 362608 E005E048 3C02E006 */  lui       $v0, %hi(stars_orbiting_render)
+/* 36260C E005E04C 2442E310 */  addiu     $v0, $v0, %lo(stars_orbiting_render)
 /* 362610 E005E050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 362614 E005E054 3C02E006 */  lui       $v0, %hi(func_E005E318)
 /* 362618 E005E058 2442E318 */  addiu     $v0, $v0, %lo(func_E005E318)
diff --git a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_update.s b/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_47/fx_47_update.s
rename to ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_update.s
index ac36c90195..4d874961fd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_47/fx_47_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_orbiting/stars_orbiting_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_47_update
+glabel stars_orbiting_update
 /* 362778 E005E1B8 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 36277C E005E1BC AFB20018 */  sw        $s2, 0x18($sp)
 /* 362780 E005E1C0 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_appendGfx.s b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_34/fx_34_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_appendGfx.s
index 4527a483d2..6cb33a3810 100644
--- a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_34_appendGfx
+glabel stars_shimmer_appendGfx
 /* 35587C E004491C 27BDFEE8 */  addiu     $sp, $sp, -0x118
 /* 355880 E0044920 3C07DB06 */  lui       $a3, 0xdb06
 /* 355884 E0044924 34E70024 */  ori       $a3, $a3, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_main.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s
rename to ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_main.s
index c3870f396b..b11e0ad74a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_main.s
+++ b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_34_main
+glabel stars_shimmer_main
 /* 354F60 E0044000 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 354F64 E0044004 F7B40050 */  sdc1      $f20, 0x50($sp)
 /* 354F68 E0044008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_34_main
 /* 354F84 E0044024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 354F88 E0044028 AFB20038 */  sw        $s2, 0x38($sp)
 /* 354F8C E004402C 8FB20098 */  lw        $s2, 0x98($sp)
-/* 354F90 E0044030 3C02E004 */  lui       $v0, %hi(fx_34_init)
-/* 354F94 E0044034 2442441C */  addiu     $v0, $v0, %lo(fx_34_init)
+/* 354F90 E0044030 3C02E004 */  lui       $v0, %hi(stars_shimmer_init)
+/* 354F94 E0044034 2442441C */  addiu     $v0, $v0, %lo(stars_shimmer_init)
 /* 354F98 E0044038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 354F9C E004403C 3C02E004 */  lui       $v0, %hi(fx_34_update)
-/* 354FA0 E0044040 24424424 */  addiu     $v0, $v0, %lo(fx_34_update)
+/* 354F9C E004403C 3C02E004 */  lui       $v0, %hi(stars_shimmer_update)
+/* 354FA0 E0044040 24424424 */  addiu     $v0, $v0, %lo(stars_shimmer_update)
 /* 354FA4 E0044044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 354FA8 E0044048 3C02E004 */  lui       $v0, %hi(fx_34_render)
-/* 354FAC E004404C 244248E4 */  addiu     $v0, $v0, %lo(fx_34_render)
+/* 354FA8 E0044048 3C02E004 */  lui       $v0, %hi(stars_shimmer_render)
+/* 354FAC E004404C 244248E4 */  addiu     $v0, $v0, %lo(stars_shimmer_render)
 /* 354FB0 E0044050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 354FB4 E0044054 24020022 */  addiu     $v0, $zero, 0x22
 /* 354FB8 E0044058 AFBF0048 */  sw        $ra, 0x48($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_update.s b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_34/fx_34_update.s
rename to ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_update.s
index 148f2e5a5f..a354e21c61 100644
--- a/ver/us/asm/nonmatchings/effects/effect_34/fx_34_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_shimmer/stars_shimmer_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_34_update
+glabel stars_shimmer_update
 /* 355384 E0044424 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 355388 E0044428 AFB40020 */  sw        $s4, 0x20($sp)
 /* 35538C E004442C 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_appendGfx.s b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_45/fx_45_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_appendGfx.s
index c3f1ea5e02..78bbd67141 100644
--- a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_45_appendGfx
+glabel stars_spread_appendGfx
 /* 3606B4 E005A3F4 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3606B8 E005A3F8 AFBE00B8 */  sw        $fp, 0xb8($sp)
 /* 3606BC E005A3FC 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_main.s
similarity index 93%
rename from ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s
rename to ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_main.s
index 41c425194d..d89fe9ac19 100644
--- a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_main.s
+++ b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_45_main
+glabel stars_spread_main
 /* 3602C0 E005A000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3602C4 E005A004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3602C8 E005A008 4485A000 */  mtc1      $a1, $f20
@@ -16,14 +16,14 @@ glabel fx_45_main
 /* 3602EC E005A02C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3602F0 E005A030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3602F4 E005A034 8FB20074 */  lw        $s2, 0x74($sp)
-/* 3602F8 E005A038 3C02E006 */  lui       $v0, %hi(fx_45_init)
-/* 3602FC E005A03C 2442A1F4 */  addiu     $v0, $v0, %lo(fx_45_init)
+/* 3602F8 E005A038 3C02E006 */  lui       $v0, %hi(stars_spread_init)
+/* 3602FC E005A03C 2442A1F4 */  addiu     $v0, $v0, %lo(stars_spread_init)
 /* 360300 E005A040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 360304 E005A044 3C02E006 */  lui       $v0, %hi(fx_45_update)
-/* 360308 E005A048 2442A1FC */  addiu     $v0, $v0, %lo(fx_45_update)
+/* 360304 E005A044 3C02E006 */  lui       $v0, %hi(stars_spread_update)
+/* 360308 E005A048 2442A1FC */  addiu     $v0, $v0, %lo(stars_spread_update)
 /* 36030C E005A04C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 360310 E005A050 3C02E006 */  lui       $v0, %hi(fx_45_render)
-/* 360314 E005A054 2442A3B0 */  addiu     $v0, $v0, %lo(fx_45_render)
+/* 360310 E005A050 3C02E006 */  lui       $v0, %hi(stars_spread_render)
+/* 360314 E005A054 2442A3B0 */  addiu     $v0, $v0, %lo(stars_spread_render)
 /* 360318 E005A058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 36031C E005A05C 2402002D */  addiu     $v0, $zero, 0x2d
 /* 360320 E005A060 AFBF003C */  sw        $ra, 0x3c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_update.s b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_45/fx_45_update.s
rename to ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_update.s
index 8aaf3d2e48..c1c9571f0b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_45/fx_45_update.s
+++ b/ver/us/asm/nonmatchings/effects/stars_spread/stars_spread_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_45_update
+glabel stars_spread_update
 /* 3604BC E005A1FC 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3604C0 E005A200 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3604C4 E005A204 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC288.s b/ver/us/asm/nonmatchings/effects/stat_change/func_E00AC288.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_86/func_E00AC288.s
rename to ver/us/asm/nonmatchings/effects/stat_change/func_E00AC288.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_86/func_E00AC2A4.s b/ver/us/asm/nonmatchings/effects/stat_change/func_E00AC2A4.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_86/func_E00AC2A4.s
rename to ver/us/asm/nonmatchings/effects/stat_change/func_E00AC2A4.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s b/ver/us/asm/nonmatchings/effects/stat_change/stat_change_main.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s
rename to ver/us/asm/nonmatchings/effects/stat_change/stat_change_main.s
index bc05f98bc9..a95c59f23f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_main.s
+++ b/ver/us/asm/nonmatchings/effects/stat_change/stat_change_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_86_main
+glabel stat_change_main
 /* 3AEE20 E00AC000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3AEE24 E00AC004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3AEE28 E00AC008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_86_main
 /* 3AEE3C E00AC01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3AEE40 E00AC020 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3AEE44 E00AC024 4487C000 */  mtc1      $a3, $f24
-/* 3AEE48 E00AC028 3C02E00B */  lui       $v0, %hi(fx_86_init)
-/* 3AEE4C E00AC02C 2442C11C */  addiu     $v0, $v0, %lo(fx_86_init)
+/* 3AEE48 E00AC028 3C02E00B */  lui       $v0, %hi(stat_change_init)
+/* 3AEE4C E00AC02C 2442C11C */  addiu     $v0, $v0, %lo(stat_change_init)
 /* 3AEE50 E00AC030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3AEE54 E00AC034 3C02E00B */  lui       $v0, %hi(fx_86_update)
-/* 3AEE58 E00AC038 2442C124 */  addiu     $v0, $v0, %lo(fx_86_update)
+/* 3AEE54 E00AC034 3C02E00B */  lui       $v0, %hi(stat_change_update)
+/* 3AEE58 E00AC038 2442C124 */  addiu     $v0, $v0, %lo(stat_change_update)
 /* 3AEE5C E00AC03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3AEE60 E00AC040 3C02E00B */  lui       $v0, %hi(fx_86_render)
-/* 3AEE64 E00AC044 2442C280 */  addiu     $v0, $v0, %lo(fx_86_render)
+/* 3AEE60 E00AC040 3C02E00B */  lui       $v0, %hi(stat_change_render)
+/* 3AEE64 E00AC044 2442C280 */  addiu     $v0, $v0, %lo(stat_change_render)
 /* 3AEE68 E00AC048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3AEE6C E00AC04C 3C02E00B */  lui       $v0, %hi(func_E00AC288)
 /* 3AEE70 E00AC050 2442C288 */  addiu     $v0, $v0, %lo(func_E00AC288)
diff --git a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_update.s b/ver/us/asm/nonmatchings/effects/stat_change/stat_change_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_86/fx_86_update.s
rename to ver/us/asm/nonmatchings/effects/stat_change/stat_change_update.s
index 4ceaae0426..f8ce0d55f9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_86/fx_86_update.s
+++ b/ver/us/asm/nonmatchings/effects/stat_change/stat_change_update.s
@@ -10,7 +10,7 @@ dlabel D_E00AC8D8
 .double 0.01
 
 .section .text
-glabel fx_86_update
+glabel stat_change_update
 /* 3AEF44 E00AC124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3AEF48 E00AC128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3AEF4C E00AC12C 8C85000C */  lw        $a1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_appendGfx.s b/ver/us/asm/nonmatchings/effects/static_status/static_status_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_115/fx_115_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/static_status/static_status_appendGfx.s
index 1c3bb0b267..bbde48a9a0 100644
--- a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/static_status/static_status_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_115_appendGfx
+glabel static_status_appendGfx
 /* 3E0E54 E00E6524 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3E0E58 E00E6528 AFBE00C8 */  sw        $fp, 0xc8($sp)
 /* 3E0E5C E00E652C 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s b/ver/us/asm/nonmatchings/effects/static_status/static_status_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s
rename to ver/us/asm/nonmatchings/effects/static_status/static_status_main.s
index 53446d156d..31fd782455 100644
--- a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_main.s
+++ b/ver/us/asm/nonmatchings/effects/static_status/static_status_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_115_main
+glabel static_status_main
 /* 3E0930 E00E6000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3E0934 E00E6004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3E0938 E00E6008 4485A000 */  mtc1      $a1, $f20
@@ -16,14 +16,14 @@ glabel fx_115_main
 /* 3E095C E00E602C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3E0960 E00E6030 AFB20030 */  sw        $s2, 0x30($sp)
 /* 3E0964 E00E6034 8FB20070 */  lw        $s2, 0x70($sp)
-/* 3E0968 E00E6038 3C02E00E */  lui       $v0, %hi(fx_115_init)
-/* 3E096C E00E603C 2442617C */  addiu     $v0, $v0, %lo(fx_115_init)
+/* 3E0968 E00E6038 3C02E00E */  lui       $v0, %hi(static_status_init)
+/* 3E096C E00E603C 2442617C */  addiu     $v0, $v0, %lo(static_status_init)
 /* 3E0970 E00E6040 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3E0974 E00E6044 3C02E00E */  lui       $v0, %hi(fx_115_update)
-/* 3E0978 E00E6048 24426184 */  addiu     $v0, $v0, %lo(fx_115_update)
+/* 3E0974 E00E6044 3C02E00E */  lui       $v0, %hi(static_status_update)
+/* 3E0978 E00E6048 24426184 */  addiu     $v0, $v0, %lo(static_status_update)
 /* 3E097C E00E604C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3E0980 E00E6050 3C02E00E */  lui       $v0, %hi(fx_115_render)
-/* 3E0984 E00E6054 244264D4 */  addiu     $v0, $v0, %lo(fx_115_render)
+/* 3E0980 E00E6050 3C02E00E */  lui       $v0, %hi(static_status_render)
+/* 3E0984 E00E6054 244264D4 */  addiu     $v0, $v0, %lo(static_status_render)
 /* 3E0988 E00E6058 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3E098C E00E605C 24020073 */  addiu     $v0, $zero, 0x73
 /* 3E0990 E00E6060 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_update.s b/ver/us/asm/nonmatchings/effects/static_status/static_status_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_115/fx_115_update.s
rename to ver/us/asm/nonmatchings/effects/static_status/static_status_update.s
index 4cccad5e08..c8ec339a58 100644
--- a/ver/us/asm/nonmatchings/effects/effect_115/fx_115_update.s
+++ b/ver/us/asm/nonmatchings/effects/static_status/static_status_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_115_update
+glabel static_status_update
 /* 3E0AB4 E00E6184 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3E0AB8 E00E6188 AFB20018 */  sw        $s2, 0x18($sp)
 /* 3E0ABC E00E618C 0080902D */  daddu     $s2, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_appendGfx.s b/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_appendGfx.s
new file mode 100644
index 0000000000..de0b90f54a
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_appendGfx.s
@@ -0,0 +1,266 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel steam_burst_appendGfx
+/* 361238 E005C2F8 27BDFEF8 */  addiu     $sp, $sp, -0x108
+/* 36123C E005C2FC AFBE0100 */  sw        $fp, 0x100($sp)
+/* 361240 E005C300 0080F02D */  daddu     $fp, $a0, $zero
+/* 361244 E005C304 3C08DB06 */  lui       $t0, 0xdb06
+/* 361248 E005C308 35080024 */  ori       $t0, $t0, 0x24
+/* 36124C E005C30C 27A40018 */  addiu     $a0, $sp, 0x18
+/* 361250 E005C310 AFB500F4 */  sw        $s5, 0xf4($sp)
+/* 361254 E005C314 3C150001 */  lui       $s5, 1
+/* 361258 E005C318 AFB700FC */  sw        $s7, 0xfc($sp)
+/* 36125C E005C31C 3C17800A */  lui       $s7, %hi(gMasterGfxPos)
+/* 361260 E005C320 26F7A66C */  addiu     $s7, $s7, %lo(gMasterGfxPos)
+/* 361264 E005C324 AFBF0104 */  sw        $ra, 0x104($sp)
+/* 361268 E005C328 AFB600F8 */  sw        $s6, 0xf8($sp)
+/* 36126C E005C32C AFB400F0 */  sw        $s4, 0xf0($sp)
+/* 361270 E005C330 AFB300EC */  sw        $s3, 0xec($sp)
+/* 361274 E005C334 AFB200E8 */  sw        $s2, 0xe8($sp)
+/* 361278 E005C338 AFB100E4 */  sw        $s1, 0xe4($sp)
+/* 36127C E005C33C AFB000E0 */  sw        $s0, 0xe0($sp)
+/* 361280 E005C340 8EE50000 */  lw        $a1, ($s7)
+/* 361284 E005C344 8FD6000C */  lw        $s6, 0xc($fp)
+/* 361288 E005C348 00A0302D */  daddu     $a2, $a1, $zero
+/* 36128C E005C34C 24A50008 */  addiu     $a1, $a1, 8
+/* 361290 E005C350 AEE50000 */  sw        $a1, ($s7)
+/* 361294 E005C354 96C30000 */  lhu       $v1, ($s6)
+/* 361298 E005C358 24A20008 */  addiu     $v0, $a1, 8
+/* 36129C E005C35C AEE20000 */  sw        $v0, ($s7)
+/* 3612A0 E005C360 C6C20030 */  lwc1      $f2, 0x30($s6)
+/* 3612A4 E005C364 00031880 */  sll       $v1, $v1, 2
+/* 3612A8 E005C368 3C09E006 */  lui       $t1, %hi(D_E005C700)
+/* 3612AC E005C36C 01234821 */  addu      $t1, $t1, $v1
+/* 3612B0 E005C370 8D29C700 */  lw        $t1, %lo(D_E005C700)($t1)
+/* 3612B4 E005C374 36B51630 */  ori       $s5, $s5, 0x1630
+/* 3612B8 E005C378 AFA900D8 */  sw        $t1, 0xd8($sp)
+/* 3612BC E005C37C 3C07E006 */  lui       $a3, %hi(D_E005C704)
+/* 3612C0 E005C380 00E33821 */  addu      $a3, $a3, $v1
+/* 3612C4 E005C384 8CE7C704 */  lw        $a3, %lo(D_E005C704)($a3)
+/* 3612C8 E005C388 3C02E700 */  lui       $v0, 0xe700
+/* 3612CC E005C38C ACC20000 */  sw        $v0, ($a2)
+/* 3612D0 E005C390 ACC00004 */  sw        $zero, 4($a2)
+/* 3612D4 E005C394 ACA80000 */  sw        $t0, ($a1)
+/* 3612D8 E005C398 8FC30010 */  lw        $v1, 0x10($fp)
+/* 3612DC E005C39C 24A20010 */  addiu     $v0, $a1, 0x10
+/* 3612E0 E005C3A0 AEE20000 */  sw        $v0, ($s7)
+/* 3612E4 E005C3A4 3C02DE00 */  lui       $v0, 0xde00
+/* 3612E8 E005C3A8 4600110D */  trunc.w.s $f4, $f2
+/* 3612EC E005C3AC 44132000 */  mfc1      $s3, $f4
+/* 3612F0 E005C3B0 00000000 */  nop
+/* 3612F4 E005C3B4 44930000 */  mtc1      $s3, $f0
+/* 3612F8 E005C3B8 00000000 */  nop
+/* 3612FC E005C3BC 46800020 */  cvt.s.w   $f0, $f0
+/* 361300 E005C3C0 3A740006 */  xori      $s4, $s3, 6
+/* 361304 E005C3C4 46001081 */  sub.s     $f2, $f2, $f0
+/* 361308 E005C3C8 3C014380 */  lui       $at, 0x4380
+/* 36130C E005C3CC 44810000 */  mtc1      $at, $f0
+/* 361310 E005C3D0 8C63001C */  lw        $v1, 0x1c($v1)
+/* 361314 E005C3D4 ACA20008 */  sw        $v0, 8($a1)
+/* 361318 E005C3D8 3C028000 */  lui       $v0, 0x8000
+/* 36131C E005C3DC ACA7000C */  sw        $a3, 0xc($a1)
+/* 361320 E005C3E0 00621821 */  addu      $v1, $v1, $v0
+/* 361324 E005C3E4 46001082 */  mul.s     $f2, $f2, $f0
+/* 361328 E005C3E8 00000000 */  nop
+/* 36132C E005C3EC ACA30004 */  sw        $v1, 4($a1)
+/* 361330 E005C3F0 8EC50004 */  lw        $a1, 4($s6)
+/* 361334 E005C3F4 8EC60008 */  lw        $a2, 8($s6)
+/* 361338 E005C3F8 8EC7000C */  lw        $a3, 0xc($s6)
+/* 36133C E005C3FC 4600110D */  trunc.w.s $f4, $f2
+/* 361340 E005C400 44122000 */  mfc1      $s2, $f4
+/* 361344 E005C404 0C080108 */  jal       shim_guTranslateF
+/* 361348 E005C408 2E940001 */   sltiu    $s4, $s4, 1
+/* 36134C E005C40C 27B00058 */  addiu     $s0, $sp, 0x58
+/* 361350 E005C410 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
+/* 361354 E005C414 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
+/* 361358 E005C418 44800000 */  mtc1      $zero, $f0
+/* 36135C E005C41C 00031080 */  sll       $v0, $v1, 2
+/* 361360 E005C420 00431021 */  addu      $v0, $v0, $v1
+/* 361364 E005C424 00021080 */  sll       $v0, $v0, 2
+/* 361368 E005C428 00431023 */  subu      $v0, $v0, $v1
+/* 36136C E005C42C 000218C0 */  sll       $v1, $v0, 3
+/* 361370 E005C430 00431021 */  addu      $v0, $v0, $v1
+/* 361374 E005C434 000210C0 */  sll       $v0, $v0, 3
+/* 361378 E005C438 44060000 */  mfc1      $a2, $f0
+/* 36137C E005C43C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
+/* 361380 E005C440 00220821 */  addu      $at, $at, $v0
+/* 361384 E005C444 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
+/* 361388 E005C448 3C073F80 */  lui       $a3, 0x3f80
+/* 36138C E005C44C 46000007 */  neg.s     $f0, $f0
+/* 361390 E005C450 44050000 */  mfc1      $a1, $f0
+/* 361394 E005C454 0200202D */  daddu     $a0, $s0, $zero
+/* 361398 E005C458 0C080104 */  jal       shim_guRotateF
+/* 36139C E005C45C AFA60010 */   sw       $a2, 0x10($sp)
+/* 3613A0 E005C460 0200202D */  daddu     $a0, $s0, $zero
+/* 3613A4 E005C464 27A50018 */  addiu     $a1, $sp, 0x18
+/* 3613A8 E005C468 27B00098 */  addiu     $s0, $sp, 0x98
+/* 3613AC E005C46C 0C080114 */  jal       shim_guMtxCatF
+/* 3613B0 E005C470 0200302D */   daddu    $a2, $s0, $zero
+/* 3613B4 E005C474 0200202D */  daddu     $a0, $s0, $zero
+/* 3613B8 E005C478 3C108007 */  lui       $s0, %hi(gMatrixListPos)
+/* 3613BC E005C47C 261041F0 */  addiu     $s0, $s0, %lo(gMatrixListPos)
+/* 3613C0 E005C480 3C11800A */  lui       $s1, %hi(gDisplayContext)
+/* 3613C4 E005C484 2631A674 */  addiu     $s1, $s1, %lo(gDisplayContext)
+/* 3613C8 E005C488 96050000 */  lhu       $a1, ($s0)
+/* 3613CC E005C48C 8E220000 */  lw        $v0, ($s1)
+/* 3613D0 E005C490 00052980 */  sll       $a1, $a1, 6
+/* 3613D4 E005C494 00B52821 */  addu      $a1, $a1, $s5
+/* 3613D8 E005C498 0C080118 */  jal       shim_guMtxF2L
+/* 3613DC E005C49C 00452821 */   addu     $a1, $v0, $a1
+/* 3613E0 E005C4A0 3C05E6DE */  lui       $a1, 0xe6de
+/* 3613E4 E005C4A4 34A5DE82 */  ori       $a1, $a1, 0xde82
+/* 3613E8 E005C4A8 8EE60000 */  lw        $a2, ($s7)
+/* 3613EC E005C4AC 3C03DA38 */  lui       $v1, 0xda38
+/* 3613F0 E005C4B0 00C0202D */  daddu     $a0, $a2, $zero
+/* 3613F4 E005C4B4 24C60008 */  addiu     $a2, $a2, 8
+/* 3613F8 E005C4B8 AEE60000 */  sw        $a2, ($s7)
+/* 3613FC E005C4BC 96020000 */  lhu       $v0, ($s0)
+/* 361400 E005C4C0 325200FF */  andi      $s2, $s2, 0xff
+/* 361404 E005C4C4 AC830000 */  sw        $v1, ($a0)
+/* 361408 E005C4C8 24430001 */  addiu     $v1, $v0, 1
+/* 36140C E005C4CC 3042FFFF */  andi      $v0, $v0, 0xffff
+/* 361410 E005C4D0 00021180 */  sll       $v0, $v0, 6
+/* 361414 E005C4D4 A6030000 */  sh        $v1, ($s0)
+/* 361418 E005C4D8 8E230000 */  lw        $v1, ($s1)
+/* 36141C E005C4DC 00551021 */  addu      $v0, $v0, $s5
+/* 361420 E005C4E0 00621821 */  addu      $v1, $v1, $v0
+/* 361424 E005C4E4 24C20008 */  addiu     $v0, $a2, 8
+/* 361428 E005C4E8 AC830004 */  sw        $v1, 4($a0)
+/* 36142C E005C4EC AEE20000 */  sw        $v0, ($s7)
+/* 361430 E005C4F0 3C02FA00 */  lui       $v0, 0xfa00
+/* 361434 E005C4F4 ACC20000 */  sw        $v0, ($a2)
+/* 361438 E005C4F8 24C20010 */  addiu     $v0, $a2, 0x10
+/* 36143C E005C4FC ACC50004 */  sw        $a1, 4($a2)
+/* 361440 E005C500 AEE20000 */  sw        $v0, ($s7)
+/* 361444 E005C504 3C02FB00 */  lui       $v0, 0xfb00
+/* 361448 E005C508 ACC20008 */  sw        $v0, 8($a2)
+/* 36144C E005C50C 24C20018 */  addiu     $v0, $a2, 0x18
+/* 361450 E005C510 ACD2000C */  sw        $s2, 0xc($a2)
+/* 361454 E005C514 AEE20000 */  sw        $v0, ($s7)
+/* 361458 E005C518 001311C0 */  sll       $v0, $s3, 7
+/* 36145C E005C51C 30420FFF */  andi      $v0, $v0, 0xfff
+/* 361460 E005C520 00021300 */  sll       $v0, $v0, 0xc
+/* 361464 E005C524 3C04F200 */  lui       $a0, 0xf200
+/* 361468 E005C528 00441025 */  or        $v0, $v0, $a0
+/* 36146C E005C52C 00139940 */  sll       $s3, $s3, 5
+/* 361470 E005C530 ACC20010 */  sw        $v0, 0x10($a2)
+/* 361474 E005C534 26620020 */  addiu     $v0, $s3, 0x20
+/* 361478 E005C538 00021080 */  sll       $v0, $v0, 2
+/* 36147C E005C53C 30420FFF */  andi      $v0, $v0, 0xfff
+/* 361480 E005C540 00022B00 */  sll       $a1, $v0, 0xc
+/* 361484 E005C544 34A20080 */  ori       $v0, $a1, 0x80
+/* 361488 E005C548 1280000F */  beqz      $s4, .LE005C588
+/* 36148C E005C54C ACC20014 */   sw       $v0, 0x14($a2)
+/* 361490 E005C550 0080182D */  daddu     $v1, $a0, $zero
+/* 361494 E005C554 34630080 */  ori       $v1, $v1, 0x80
+/* 361498 E005C558 3C040100 */  lui       $a0, 0x100
+/* 36149C E005C55C 34840100 */  ori       $a0, $a0, 0x100
+/* 3614A0 E005C560 24C20020 */  addiu     $v0, $a2, 0x20
+/* 3614A4 E005C564 00A31825 */  or        $v1, $a1, $v1
+/* 3614A8 E005C568 AEE20000 */  sw        $v0, ($s7)
+/* 3614AC E005C56C 26620040 */  addiu     $v0, $s3, 0x40
+/* 3614B0 E005C570 00021080 */  sll       $v0, $v0, 2
+/* 3614B4 E005C574 30420FFF */  andi      $v0, $v0, 0xfff
+/* 3614B8 E005C578 00021300 */  sll       $v0, $v0, 0xc
+/* 3614BC E005C57C 00441025 */  or        $v0, $v0, $a0
+/* 3614C0 E005C580 0801716D */  j         .LE005C5B4
+/* 3614C4 E005C584 ACC30018 */   sw       $v1, 0x18($a2)
+.LE005C588:
+/* 3614C8 E005C588 3C030100 */  lui       $v1, 0x100
+/* 3614CC E005C58C 34630080 */  ori       $v1, $v1, 0x80
+/* 3614D0 E005C590 24C20020 */  addiu     $v0, $a2, 0x20
+/* 3614D4 E005C594 AEE20000 */  sw        $v0, ($s7)
+/* 3614D8 E005C598 00A41025 */  or        $v0, $a1, $a0
+/* 3614DC E005C59C ACC20018 */  sw        $v0, 0x18($a2)
+/* 3614E0 E005C5A0 26620040 */  addiu     $v0, $s3, 0x40
+/* 3614E4 E005C5A4 00021080 */  sll       $v0, $v0, 2
+/* 3614E8 E005C5A8 30420FFF */  andi      $v0, $v0, 0xfff
+/* 3614EC E005C5AC 00021300 */  sll       $v0, $v0, 0xc
+/* 3614F0 E005C5B0 00431025 */  or        $v0, $v0, $v1
+.LE005C5B4:
+/* 3614F4 E005C5B4 ACC2001C */  sw        $v0, 0x1c($a2)
+/* 3614F8 E005C5B8 8FC20008 */  lw        $v0, 8($fp)
+/* 3614FC E005C5BC 24110001 */  addiu     $s1, $zero, 1
+/* 361500 E005C5C0 0222102A */  slt       $v0, $s1, $v0
+/* 361504 E005C5C4 10400037 */  beqz      $v0, .LE005C6A4
+/* 361508 E005C5C8 26D60034 */   addiu    $s6, $s6, 0x34
+/* 36150C E005C5CC 3C15800A */  lui       $s5, %hi(gDisplayContext)
+/* 361510 E005C5D0 26B5A674 */  addiu     $s5, $s5, %lo(gDisplayContext)
+/* 361514 E005C5D4 3C148007 */  lui       $s4, %hi(gMatrixListPos)
+/* 361518 E005C5D8 269441F0 */  addiu     $s4, $s4, %lo(gMatrixListPos)
+/* 36151C E005C5DC 3C130001 */  lui       $s3, 1
+/* 361520 E005C5E0 36731630 */  ori       $s3, $s3, 0x1630
+/* 361524 E005C5E4 3C12800A */  lui       $s2, %hi(gMasterGfxPos)
+/* 361528 E005C5E8 2652A66C */  addiu     $s2, $s2, %lo(gMasterGfxPos)
+/* 36152C E005C5EC 26D0000C */  addiu     $s0, $s6, 0xc
+.LE005C5F0:
+/* 361530 E005C5F0 27A40018 */  addiu     $a0, $sp, 0x18
+/* 361534 E005C5F4 26310001 */  addiu     $s1, $s1, 1
+/* 361538 E005C5F8 8E05FFF8 */  lw        $a1, -8($s0)
+/* 36153C E005C5FC 8E06FFFC */  lw        $a2, -4($s0)
+/* 361540 E005C600 8E070000 */  lw        $a3, ($s0)
+/* 361544 E005C604 0C080108 */  jal       shim_guTranslateF
+/* 361548 E005C608 26100034 */   addiu    $s0, $s0, 0x34
+/* 36154C E005C60C 27A40018 */  addiu     $a0, $sp, 0x18
+/* 361550 E005C610 96850000 */  lhu       $a1, ($s4)
+/* 361554 E005C614 8EA20000 */  lw        $v0, ($s5)
+/* 361558 E005C618 00052980 */  sll       $a1, $a1, 6
+/* 36155C E005C61C 00B32821 */  addu      $a1, $a1, $s3
+/* 361560 E005C620 0C080118 */  jal       shim_guMtxF2L
+/* 361564 E005C624 00452821 */   addu     $a1, $v0, $a1
+/* 361568 E005C628 3C06D838 */  lui       $a2, 0xd838
+/* 36156C E005C62C 8E440000 */  lw        $a0, ($s2)
+/* 361570 E005C630 34C60002 */  ori       $a2, $a2, 2
+/* 361574 E005C634 0080282D */  daddu     $a1, $a0, $zero
+/* 361578 E005C638 24840008 */  addiu     $a0, $a0, 8
+/* 36157C E005C63C AE440000 */  sw        $a0, ($s2)
+/* 361580 E005C640 96820000 */  lhu       $v0, ($s4)
+/* 361584 E005C644 3C03DA38 */  lui       $v1, 0xda38
+/* 361588 E005C648 ACA30000 */  sw        $v1, ($a1)
+/* 36158C E005C64C 24430001 */  addiu     $v1, $v0, 1
+/* 361590 E005C650 3042FFFF */  andi      $v0, $v0, 0xffff
+/* 361594 E005C654 00021180 */  sll       $v0, $v0, 6
+/* 361598 E005C658 A6830000 */  sh        $v1, ($s4)
+/* 36159C E005C65C 8EA30000 */  lw        $v1, ($s5)
+/* 3615A0 E005C660 00531021 */  addu      $v0, $v0, $s3
+/* 3615A4 E005C664 00621821 */  addu      $v1, $v1, $v0
+/* 3615A8 E005C668 24820008 */  addiu     $v0, $a0, 8
+/* 3615AC E005C66C ACA30004 */  sw        $v1, 4($a1)
+/* 3615B0 E005C670 AE420000 */  sw        $v0, ($s2)
+/* 3615B4 E005C674 3C02DE00 */  lui       $v0, 0xde00
+/* 3615B8 E005C678 AC820000 */  sw        $v0, ($a0)
+/* 3615BC E005C67C 8FA900D8 */  lw        $t1, 0xd8($sp)
+/* 3615C0 E005C680 24020040 */  addiu     $v0, $zero, 0x40
+/* 3615C4 E005C684 AC860008 */  sw        $a2, 8($a0)
+/* 3615C8 E005C688 AC82000C */  sw        $v0, 0xc($a0)
+/* 3615CC E005C68C AC890004 */  sw        $t1, 4($a0)
+/* 3615D0 E005C690 8FC20008 */  lw        $v0, 8($fp)
+/* 3615D4 E005C694 24840010 */  addiu     $a0, $a0, 0x10
+/* 3615D8 E005C698 0222102A */  slt       $v0, $s1, $v0
+/* 3615DC E005C69C 1440FFD4 */  bnez      $v0, .LE005C5F0
+/* 3615E0 E005C6A0 AE440000 */   sw       $a0, ($s2)
+.LE005C6A4:
+/* 3615E4 E005C6A4 3C05D838 */  lui       $a1, 0xd838
+/* 3615E8 E005C6A8 3C03800A */  lui       $v1, %hi(gMasterGfxPos)
+/* 3615EC E005C6AC 2463A66C */  addiu     $v1, $v1, %lo(gMasterGfxPos)
+/* 3615F0 E005C6B0 8C620000 */  lw        $v0, ($v1)
+/* 3615F4 E005C6B4 34A50002 */  ori       $a1, $a1, 2
+/* 3615F8 E005C6B8 0040202D */  daddu     $a0, $v0, $zero
+/* 3615FC E005C6BC 24420008 */  addiu     $v0, $v0, 8
+/* 361600 E005C6C0 AC620000 */  sw        $v0, ($v1)
+/* 361604 E005C6C4 24020040 */  addiu     $v0, $zero, 0x40
+/* 361608 E005C6C8 AC850000 */  sw        $a1, ($a0)
+/* 36160C E005C6CC AC820004 */  sw        $v0, 4($a0)
+/* 361610 E005C6D0 8FBF0104 */  lw        $ra, 0x104($sp)
+/* 361614 E005C6D4 8FBE0100 */  lw        $fp, 0x100($sp)
+/* 361618 E005C6D8 8FB700FC */  lw        $s7, 0xfc($sp)
+/* 36161C E005C6DC 8FB600F8 */  lw        $s6, 0xf8($sp)
+/* 361620 E005C6E0 8FB500F4 */  lw        $s5, 0xf4($sp)
+/* 361624 E005C6E4 8FB400F0 */  lw        $s4, 0xf0($sp)
+/* 361628 E005C6E8 8FB300EC */  lw        $s3, 0xec($sp)
+/* 36162C E005C6EC 8FB200E8 */  lw        $s2, 0xe8($sp)
+/* 361630 E005C6F0 8FB100E4 */  lw        $s1, 0xe4($sp)
+/* 361634 E005C6F4 8FB000E0 */  lw        $s0, 0xe0($sp)
+/* 361638 E005C6F8 03E00008 */  jr        $ra
+/* 36163C E005C6FC 27BD0108 */   addiu    $sp, $sp, 0x108
diff --git a/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_main.s b/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_main.s
new file mode 100644
index 0000000000..565bb151f2
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_main.s
@@ -0,0 +1,102 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel steam_burst_main
+/* 360F40 E005C000 27BDFFA0 */  addiu     $sp, $sp, -0x60
+/* 360F44 E005C004 F7B40048 */  sdc1      $f20, 0x48($sp)
+/* 360F48 E005C008 4485A000 */  mtc1      $a1, $f20
+/* 360F4C E005C00C F7B60050 */  sdc1      $f22, 0x50($sp)
+/* 360F50 E005C010 4486B000 */  mtc1      $a2, $f22
+/* 360F54 E005C014 AFB5003C */  sw        $s5, 0x3c($sp)
+/* 360F58 E005C018 0080A82D */  daddu     $s5, $a0, $zero
+/* 360F5C E005C01C F7B80058 */  sdc1      $f24, 0x58($sp)
+/* 360F60 E005C020 4487C000 */  mtc1      $a3, $f24
+/* 360F64 E005C024 27A40010 */  addiu     $a0, $sp, 0x10
+/* 360F68 E005C028 AFB40038 */  sw        $s4, 0x38($sp)
+/* 360F6C E005C02C 8FB40074 */  lw        $s4, 0x74($sp)
+/* 360F70 E005C030 3C02E006 */  lui       $v0, %hi(steam_burst_init)
+/* 360F74 E005C034 2442C178 */  addiu     $v0, $v0, %lo(steam_burst_init)
+/* 360F78 E005C038 AFA20018 */  sw        $v0, 0x18($sp)
+/* 360F7C E005C03C 3C02E006 */  lui       $v0, %hi(steam_burst_update)
+/* 360F80 E005C040 2442C180 */  addiu     $v0, $v0, %lo(steam_burst_update)
+/* 360F84 E005C044 AFA2001C */  sw        $v0, 0x1c($sp)
+/* 360F88 E005C048 3C02E006 */  lui       $v0, %hi(steam_burst_render)
+/* 360F8C E005C04C 2442C2B4 */  addiu     $v0, $v0, %lo(steam_burst_render)
+/* 360F90 E005C050 AFA20020 */  sw        $v0, 0x20($sp)
+/* 360F94 E005C054 2402002E */  addiu     $v0, $zero, 0x2e
+/* 360F98 E005C058 AFBF0040 */  sw        $ra, 0x40($sp)
+/* 360F9C E005C05C AFB30034 */  sw        $s3, 0x34($sp)
+/* 360FA0 E005C060 AFB20030 */  sw        $s2, 0x30($sp)
+/* 360FA4 E005C064 AFB1002C */  sw        $s1, 0x2c($sp)
+/* 360FA8 E005C068 AFB00028 */  sw        $s0, 0x28($sp)
+/* 360FAC E005C06C AFA00010 */  sw        $zero, 0x10($sp)
+/* 360FB0 E005C070 AFA00024 */  sw        $zero, 0x24($sp)
+/* 360FB4 E005C074 0C080124 */  jal       shim_create_effect_instance
+/* 360FB8 E005C078 AFA20014 */   sw       $v0, 0x14($sp)
+/* 360FBC E005C07C 24040068 */  addiu     $a0, $zero, 0x68
+/* 360FC0 E005C080 24130002 */  addiu     $s3, $zero, 2
+/* 360FC4 E005C084 0040802D */  daddu     $s0, $v0, $zero
+/* 360FC8 E005C088 0C08012C */  jal       shim_general_heap_malloc
+/* 360FCC E005C08C AE130008 */   sw       $s3, 8($s0)
+/* 360FD0 E005C090 0040882D */  daddu     $s1, $v0, $zero
+/* 360FD4 E005C094 16200003 */  bnez      $s1, .LE005C0A4
+/* 360FD8 E005C098 AE11000C */   sw       $s1, 0xc($s0)
+.LE005C09C:
+/* 360FDC E005C09C 08017027 */  j         .LE005C09C
+/* 360FE0 E005C0A0 00000000 */   nop
+.LE005C0A4:
+/* 360FE4 E005C0A4 0220202D */  daddu     $a0, $s1, $zero
+/* 360FE8 E005C0A8 00132840 */  sll       $a1, $s3, 1
+/* 360FEC E005C0AC 00B32821 */  addu      $a1, $a1, $s3
+/* 360FF0 E005C0B0 00052880 */  sll       $a1, $a1, 2
+/* 360FF4 E005C0B4 00B32821 */  addu      $a1, $a1, $s3
+/* 360FF8 E005C0B8 0C080130 */  jal       shim_mem_clear
+/* 360FFC E005C0BC 00052880 */   sll      $a1, $a1, 2
+/* 361000 E005C0C0 24120001 */  addiu     $s2, $zero, 1
+/* 361004 E005C0C4 3C014120 */  lui       $at, 0x4120
+/* 361008 E005C0C8 44810000 */  mtc1      $at, $f0
+/* 36100C E005C0CC 3C0141F0 */  lui       $at, 0x41f0
+/* 361010 E005C0D0 44811000 */  mtc1      $at, $f2
+/* 361014 E005C0D4 0253102A */  slt       $v0, $s2, $s3
+/* 361018 E005C0D8 AE340024 */  sw        $s4, 0x24($s1)
+/* 36101C E005C0DC AE200028 */  sw        $zero, 0x28($s1)
+/* 361020 E005C0E0 AE34002C */  sw        $s4, 0x2c($s1)
+/* 361024 E005C0E4 AE200030 */  sw        $zero, 0x30($s1)
+/* 361028 E005C0E8 A6350000 */  sh        $s5, ($s1)
+/* 36102C E005C0EC E6340004 */  swc1      $f20, 4($s1)
+/* 361030 E005C0F0 E6360008 */  swc1      $f22, 8($s1)
+/* 361034 E005C0F4 E638000C */  swc1      $f24, 0xc($s1)
+/* 361038 E005C0F8 E620001C */  swc1      $f0, 0x1c($s1)
+/* 36103C E005C0FC E6220020 */  swc1      $f2, 0x20($s1)
+/* 361040 E005C100 10400011 */  beqz      $v0, .LE005C148
+/* 361044 E005C104 26310034 */   addiu    $s1, $s1, 0x34
+/* 361048 E005C108 4480A000 */  mtc1      $zero, $f20
+/* 36104C E005C10C 26300018 */  addiu     $s0, $s1, 0x18
+.LE005C110:
+/* 361050 E005C110 4600A306 */  mov.s     $f12, $f20
+/* 361054 E005C114 E614FFEC */  swc1      $f20, -0x14($s0)
+/* 361058 E005C118 E614FFF0 */  swc1      $f20, -0x10($s0)
+/* 36105C E005C11C 0C080140 */  jal       shim_sin_deg
+/* 361060 E005C120 E614FFF4 */   swc1     $f20, -0xc($s0)
+/* 361064 E005C124 4600A306 */  mov.s     $f12, $f20
+/* 361068 E005C128 E600FFF8 */  swc1      $f0, -8($s0)
+/* 36106C E005C12C 0C080144 */  jal       shim_cos_deg
+/* 361070 E005C130 E614FFFC */   swc1     $f20, -4($s0)
+/* 361074 E005C134 26520001 */  addiu     $s2, $s2, 1
+/* 361078 E005C138 E6000000 */  swc1      $f0, ($s0)
+/* 36107C E005C13C 0253102A */  slt       $v0, $s2, $s3
+/* 361080 E005C140 1440FFF3 */  bnez      $v0, .LE005C110
+/* 361084 E005C144 26100034 */   addiu    $s0, $s0, 0x34
+.LE005C148:
+/* 361088 E005C148 8FBF0040 */  lw        $ra, 0x40($sp)
+/* 36108C E005C14C 8FB5003C */  lw        $s5, 0x3c($sp)
+/* 361090 E005C150 8FB40038 */  lw        $s4, 0x38($sp)
+/* 361094 E005C154 8FB30034 */  lw        $s3, 0x34($sp)
+/* 361098 E005C158 8FB20030 */  lw        $s2, 0x30($sp)
+/* 36109C E005C15C 8FB1002C */  lw        $s1, 0x2c($sp)
+/* 3610A0 E005C160 8FB00028 */  lw        $s0, 0x28($sp)
+/* 3610A4 E005C164 D7B80058 */  ldc1      $f24, 0x58($sp)
+/* 3610A8 E005C168 D7B60050 */  ldc1      $f22, 0x50($sp)
+/* 3610AC E005C16C D7B40048 */  ldc1      $f20, 0x48($sp)
+/* 3610B0 E005C170 03E00008 */  jr        $ra
+/* 3610B4 E005C174 27BD0060 */   addiu    $sp, $sp, 0x60
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
new file mode 100644
index 0000000000..d6875e7f3b
--- /dev/null
+++ b/ver/us/asm/nonmatchings/effects/steam_burst/steam_burst_update.s
@@ -0,0 +1,84 @@
+.set noat      # allow manual use of $at
+.set noreorder # don't insert nops after branches
+
+glabel steam_burst_update
+/* 3610C0 E005C180 27BDFFE8 */  addiu     $sp, $sp, -0x18
+/* 3610C4 E005C184 AFBF0010 */  sw        $ra, 0x10($sp)
+/* 3610C8 E005C188 8C85000C */  lw        $a1, 0xc($a0)
+/* 3610CC E005C18C 3C0140E0 */  lui       $at, 0x40e0
+/* 3610D0 E005C190 44810000 */  mtc1      $at, $f0
+/* 3610D4 E005C194 8CA20028 */  lw        $v0, 0x28($a1)
+/* 3610D8 E005C198 8CA30024 */  lw        $v1, 0x24($a1)
+/* 3610DC E005C19C 44821000 */  mtc1      $v0, $f2
+/* 3610E0 E005C1A0 00000000 */  nop
+/* 3610E4 E005C1A4 468010A0 */  cvt.s.w   $f2, $f2
+/* 3610E8 E005C1A8 24420001 */  addiu     $v0, $v0, 1
+/* 3610EC E005C1AC 46001082 */  mul.s     $f2, $f2, $f0
+/* 3610F0 E005C1B0 00000000 */  nop
+/* 3610F4 E005C1B4 2463FFFF */  addiu     $v1, $v1, -1
+/* 3610F8 E005C1B8 C4A0002C */  lwc1      $f0, 0x2c($a1)
+/* 3610FC E005C1BC 46800020 */  cvt.s.w   $f0, $f0
+/* 361100 E005C1C0 ACA20028 */  sw        $v0, 0x28($a1)
+/* 361104 E005C1C4 ACA30024 */  sw        $v1, 0x24($a1)
+/* 361108 E005C1C8 46001083 */  div.s     $f2, $f2, $f0
+/* 36110C E005C1CC 04610005 */  bgez      $v1, .LE005C1E4
+/* 361110 E005C1D0 E4A20030 */   swc1     $f2, 0x30($a1)
+/* 361114 E005C1D4 0C080128 */  jal       shim_remove_effect
+/* 361118 E005C1D8 00000000 */   nop
+/* 36111C E005C1DC 080170AA */  j         .LE005C2A8
+/* 361120 E005C1E0 00000000 */   nop
+.LE005C1E4:
+/* 361124 E005C1E4 C4A2001C */  lwc1      $f2, 0x1c($a1)
+/* 361128 E005C1E8 C4A00020 */  lwc1      $f0, 0x20($a1)
+/* 36112C E005C1EC 46020001 */  sub.s     $f0, $f0, $f2
+/* 361130 E005C1F0 3C01E006 */  lui       $at, %hi(D_E005C710)
+/* 361134 E005C1F4 D424C710 */  ldc1      $f4, %lo(D_E005C710)($at)
+/* 361138 E005C1F8 46000021 */  cvt.d.s   $f0, $f0
+/* 36113C E005C1FC 46240002 */  mul.d     $f0, $f0, $f4
+/* 361140 E005C200 00000000 */  nop
+/* 361144 E005C204 460010A1 */  cvt.d.s   $f2, $f2
+/* 361148 E005C208 46201080 */  add.d     $f2, $f2, $f0
+/* 36114C E005C20C 24060001 */  addiu     $a2, $zero, 1
+/* 361150 E005C210 462010A0 */  cvt.s.d   $f2, $f2
+/* 361154 E005C214 E4A2001C */  swc1      $f2, 0x1c($a1)
+/* 361158 E005C218 24A50034 */  addiu     $a1, $a1, 0x34
+/* 36115C E005C21C 8C820008 */  lw        $v0, 8($a0)
+/* 361160 E005C220 00C2102A */  slt       $v0, $a2, $v0
+/* 361164 E005C224 10400020 */  beqz      $v0, .LE005C2A8
+/* 361168 E005C228 46001206 */   mov.s    $f8, $f2
+/* 36116C E005C22C 24A3000C */  addiu     $v1, $a1, 0xc
+/* 361170 E005C230 3C01E006 */  lui       $at, %hi(D_E005C718)
+/* 361174 E005C234 D42CC718 */  ldc1      $f12, %lo(D_E005C718)($at)
+/* 361178 E005C238 3C01E006 */  lui       $at, %hi(D_E005C720)
+/* 36117C E005C23C D42AC720 */  ldc1      $f10, %lo(D_E005C720)($at)
+.LE005C240:
+/* 361180 E005C240 C4600008 */  lwc1      $f0, 8($v1)
+/* 361184 E005C244 46000021 */  cvt.d.s   $f0, $f0
+/* 361188 E005C248 462C0000 */  add.d     $f0, $f0, $f12
+/* 36118C E005C24C 46200020 */  cvt.s.d   $f0, $f0
+/* 361190 E005C250 46000021 */  cvt.d.s   $f0, $f0
+/* 361194 E005C254 462A0002 */  mul.d     $f0, $f0, $f10
+/* 361198 E005C258 00000000 */  nop
+/* 36119C E005C25C C4660004 */  lwc1      $f6, 4($v1)
+/* 3611A0 E005C260 46064182 */  mul.s     $f6, $f8, $f6
+/* 3611A4 E005C264 00000000 */  nop
+/* 3611A8 E005C268 C464000C */  lwc1      $f4, 0xc($v1)
+/* 3611AC E005C26C 46044102 */  mul.s     $f4, $f8, $f4
+/* 3611B0 E005C270 00000000 */  nop
+/* 3611B4 E005C274 46200020 */  cvt.s.d   $f0, $f0
+/* 3611B8 E005C278 E4600008 */  swc1      $f0, 8($v1)
+/* 3611BC E005C27C C460FFFC */  lwc1      $f0, -4($v1)
+/* 3611C0 E005C280 C4620008 */  lwc1      $f2, 8($v1)
+/* 3611C4 E005C284 24C60001 */  addiu     $a2, $a2, 1
+/* 3611C8 E005C288 46020000 */  add.s     $f0, $f0, $f2
+/* 3611CC E005C28C E466FFF8 */  swc1      $f6, -8($v1)
+/* 3611D0 E005C290 E4640000 */  swc1      $f4, ($v1)
+/* 3611D4 E005C294 E460FFFC */  swc1      $f0, -4($v1)
+/* 3611D8 E005C298 8C820008 */  lw        $v0, 8($a0)
+/* 3611DC E005C29C 00C2102A */  slt       $v0, $a2, $v0
+/* 3611E0 E005C2A0 1440FFE7 */  bnez      $v0, .LE005C240
+/* 3611E4 E005C2A4 24630034 */   addiu    $v1, $v1, 0x34
+.LE005C2A8:
+/* 3611E8 E005C2A8 8FBF0010 */  lw        $ra, 0x10($sp)
+/* 3611EC E005C2AC 03E00008 */  jr        $ra
+/* 3611F0 E005C2B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_appendGfx.s b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_98/fx_98_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_appendGfx.s
index 93451670d9..f3e895b27d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_98_appendGfx
+glabel stop_watch_appendGfx
 /* 3CB0F8 E00C4308 27BDFF20 */  addiu     $sp, $sp, -0xe0
 /* 3CB0FC E00C430C 0080302D */  daddu     $a2, $a0, $zero
 /* 3CB100 E00C4310 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s
rename to ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_main.s
index 10e7d212ff..dab93b1595 100644
--- a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_main.s
+++ b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_98_main
+glabel stop_watch_main
 /* 3CADF0 E00C4000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3CADF4 E00C4004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3CADF8 E00C4008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_98_main
 /* 3CAE14 E00C4024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3CAE18 E00C4028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3CAE1C E00C402C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3CAE20 E00C4030 3C02E00C */  lui       $v0, %hi(fx_98_init)
-/* 3CAE24 E00C4034 24424170 */  addiu     $v0, $v0, %lo(fx_98_init)
+/* 3CAE20 E00C4030 3C02E00C */  lui       $v0, %hi(stop_watch_init)
+/* 3CAE24 E00C4034 24424170 */  addiu     $v0, $v0, %lo(stop_watch_init)
 /* 3CAE28 E00C4038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3CAE2C E00C403C 3C02E00C */  lui       $v0, %hi(fx_98_update)
-/* 3CAE30 E00C4040 24424178 */  addiu     $v0, $v0, %lo(fx_98_update)
+/* 3CAE2C E00C403C 3C02E00C */  lui       $v0, %hi(stop_watch_update)
+/* 3CAE30 E00C4040 24424178 */  addiu     $v0, $v0, %lo(stop_watch_update)
 /* 3CAE34 E00C4044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3CAE38 E00C4048 3C02E00C */  lui       $v0, %hi(fx_98_render)
-/* 3CAE3C E00C404C 244242C4 */  addiu     $v0, $v0, %lo(fx_98_render)
+/* 3CAE38 E00C4048 3C02E00C */  lui       $v0, %hi(stop_watch_render)
+/* 3CAE3C E00C404C 244242C4 */  addiu     $v0, $v0, %lo(stop_watch_render)
 /* 3CAE40 E00C4050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3CAE44 E00C4054 24020062 */  addiu     $v0, $zero, 0x62
 /* 3CAE48 E00C4058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_update.s b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_98/fx_98_update.s
rename to ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_update.s
index 9745ab37f0..8066d8bd9a 100644
--- a/ver/us/asm/nonmatchings/effects/effect_98/fx_98_update.s
+++ b/ver/us/asm/nonmatchings/effects/stop_watch/stop_watch_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_98_update
+glabel stop_watch_update
 /* 3CAF68 E00C4178 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3CAF6C E00C417C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3CAF70 E00C4180 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_appendGfx.s b/ver/us/asm/nonmatchings/effects/sun/sun_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_130/fx_130_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/sun/sun_appendGfx.s
index b465748896..0bd28318ee 100644
--- a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/sun/sun_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_130_appendGfx
+glabel sun_appendGfx
 /* 40B7D4 E01203E4 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 40B7D8 E01203E8 0080402D */  daddu     $t0, $a0, $zero
 /* 40B7DC E01203EC AFBF00B8 */  sw        $ra, 0xb8($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s b/ver/us/asm/nonmatchings/effects/sun/sun_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s
rename to ver/us/asm/nonmatchings/effects/sun/sun_main.s
index d588a45d48..43b7a59eab 100644
--- a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_main.s
+++ b/ver/us/asm/nonmatchings/effects/sun/sun_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_130_main
+glabel sun_main
 /* 40B3F0 E0120000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 40B3F4 E0120004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 40B3F8 E0120008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_130_main
 /* 40B414 E0120024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 40B418 E0120028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 40B41C E012002C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 40B420 E0120030 3C02E012 */  lui       $v0, %hi(fx_130_init)
-/* 40B424 E0120034 24420134 */  addiu     $v0, $v0, %lo(fx_130_init)
+/* 40B420 E0120030 3C02E012 */  lui       $v0, %hi(sun_init)
+/* 40B424 E0120034 24420134 */  addiu     $v0, $v0, %lo(sun_init)
 /* 40B428 E0120038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 40B42C E012003C 3C02E012 */  lui       $v0, %hi(fx_130_update)
-/* 40B430 E0120040 2442013C */  addiu     $v0, $v0, %lo(fx_130_update)
+/* 40B42C E012003C 3C02E012 */  lui       $v0, %hi(sun_update)
+/* 40B430 E0120040 2442013C */  addiu     $v0, $v0, %lo(sun_update)
 /* 40B434 E0120044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 40B438 E0120048 3C02E012 */  lui       $v0, %hi(fx_130_render)
-/* 40B43C E012004C 2442039C */  addiu     $v0, $v0, %lo(fx_130_render)
+/* 40B438 E0120048 3C02E012 */  lui       $v0, %hi(sun_render)
+/* 40B43C E012004C 2442039C */  addiu     $v0, $v0, %lo(sun_render)
 /* 40B440 E0120050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 40B444 E0120054 24020082 */  addiu     $v0, $zero, 0x82
 /* 40B448 E0120058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_update.s b/ver/us/asm/nonmatchings/effects/sun/sun_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_130/fx_130_update.s
rename to ver/us/asm/nonmatchings/effects/sun/sun_update.s
index 71a20f0dda..9fdd1b70e9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_130/fx_130_update.s
+++ b/ver/us/asm/nonmatchings/effects/sun/sun_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_130_update
+glabel sun_update
 /* 40B52C E012013C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 40B530 E0120140 AFBF0020 */  sw        $ra, 0x20($sp)
 /* 40B534 E0120144 AFB3001C */  sw        $s3, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_appendGfx.s b/ver/us/asm/nonmatchings/effects/sweat/sweat_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_40/fx_40_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/sweat/sweat_appendGfx.s
index 2b3a906997..5fad24bfd8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/sweat/sweat_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_40_appendGfx
+glabel sweat_appendGfx
 /* 35C2D8 E0050308 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 35C2DC E005030C 0080282D */  daddu     $a1, $a0, $zero
 /* 35C2E0 E0050310 3C06DB06 */  lui       $a2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s b/ver/us/asm/nonmatchings/effects/sweat/sweat_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s
rename to ver/us/asm/nonmatchings/effects/sweat/sweat_main.s
index c6b7158da8..7496bcf001 100644
--- a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_main.s
+++ b/ver/us/asm/nonmatchings/effects/sweat/sweat_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_40_main
+glabel sweat_main
 /* 35BFD0 E0050000 27BDFF58 */  addiu     $sp, $sp, -0xa8
 /* 35BFD4 E0050004 F7B80090 */  sdc1      $f24, 0x90($sp)
 /* 35BFD8 E0050008 4485C000 */  mtc1      $a1, $f24
@@ -14,14 +14,14 @@ glabel fx_40_main
 /* 35BFF4 E0050024 27A40018 */  addiu     $a0, $sp, 0x18
 /* 35BFF8 E0050028 F7B60088 */  sdc1      $f22, 0x88($sp)
 /* 35BFFC E005002C C7B600BC */  lwc1      $f22, 0xbc($sp)
-/* 35C000 E0050030 3C02E005 */  lui       $v0, %hi(fx_40_init)
-/* 35C004 E0050034 244201D0 */  addiu     $v0, $v0, %lo(fx_40_init)
+/* 35C000 E0050030 3C02E005 */  lui       $v0, %hi(sweat_init)
+/* 35C004 E0050034 244201D0 */  addiu     $v0, $v0, %lo(sweat_init)
 /* 35C008 E0050038 AFA20020 */  sw        $v0, 0x20($sp)
-/* 35C00C E005003C 3C02E005 */  lui       $v0, %hi(fx_40_update)
-/* 35C010 E0050040 244201D8 */  addiu     $v0, $v0, %lo(fx_40_update)
+/* 35C00C E005003C 3C02E005 */  lui       $v0, %hi(sweat_update)
+/* 35C010 E0050040 244201D8 */  addiu     $v0, $v0, %lo(sweat_update)
 /* 35C014 E0050044 AFA20024 */  sw        $v0, 0x24($sp)
-/* 35C018 E0050048 3C02E005 */  lui       $v0, %hi(fx_40_render)
-/* 35C01C E005004C 244202C4 */  addiu     $v0, $v0, %lo(fx_40_render)
+/* 35C018 E0050048 3C02E005 */  lui       $v0, %hi(sweat_render)
+/* 35C01C E005004C 244202C4 */  addiu     $v0, $v0, %lo(sweat_render)
 /* 35C020 E0050050 AFA20028 */  sw        $v0, 0x28($sp)
 /* 35C024 E0050054 24020028 */  addiu     $v0, $zero, 0x28
 /* 35C028 E0050058 AFBF007C */  sw        $ra, 0x7c($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_update.s b/ver/us/asm/nonmatchings/effects/sweat/sweat_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_40/fx_40_update.s
rename to ver/us/asm/nonmatchings/effects/sweat/sweat_update.s
index f8075dc1ab..de3209324f 100644
--- a/ver/us/asm/nonmatchings/effects/effect_40/fx_40_update.s
+++ b/ver/us/asm/nonmatchings/effects/sweat/sweat_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_40_update
+glabel sweat_update
 /* 35C1A8 E00501D8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 35C1AC E00501DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* 35C1B0 E00501E0 8C83000C */  lw        $v1, 0xc($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8264.s b/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8264.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_108/func_E00D8264.s
rename to ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8264.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8334.s b/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8334.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_108/func_E00D8334.s
rename to ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8334.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_108/func_E00D8630.s b/ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8630.s
similarity index 100%
rename from ver/us/asm/nonmatchings/effects/effect_108/func_E00D8630.s
rename to ver/us/asm/nonmatchings/effects/tattle_window/func_E00D8630.s
diff --git a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s b/ver/us/asm/nonmatchings/effects/tattle_window/tattle_window_main.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s
rename to ver/us/asm/nonmatchings/effects/tattle_window/tattle_window_main.s
index 11e277942a..2efc3b075d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_main.s
+++ b/ver/us/asm/nonmatchings/effects/tattle_window/tattle_window_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_108_main
+glabel tattle_window_main
 /* 3D67C0 E00D8000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3D67C4 E00D8004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3D67C8 E00D8008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_108_main
 /* 3D67E4 E00D8024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D67E8 E00D8028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3D67EC E00D802C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3D67F0 E00D8030 3C02E00E */  lui       $v0, %hi(fx_108_init)
-/* 3D67F4 E00D8034 24428120 */  addiu     $v0, $v0, %lo(fx_108_init)
+/* 3D67F0 E00D8030 3C02E00E */  lui       $v0, %hi(tattle_window_init)
+/* 3D67F4 E00D8034 24428120 */  addiu     $v0, $v0, %lo(tattle_window_init)
 /* 3D67F8 E00D8038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D67FC E00D803C 3C02E00E */  lui       $v0, %hi(fx_108_update)
-/* 3D6800 E00D8040 24428128 */  addiu     $v0, $v0, %lo(fx_108_update)
+/* 3D67FC E00D803C 3C02E00E */  lui       $v0, %hi(tattle_window_update)
+/* 3D6800 E00D8040 24428128 */  addiu     $v0, $v0, %lo(tattle_window_update)
 /* 3D6804 E00D8044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D6808 E00D8048 3C02E00E */  lui       $v0, %hi(fx_108_render)
-/* 3D680C E00D804C 2442825C */  addiu     $v0, $v0, %lo(fx_108_render)
+/* 3D6808 E00D8048 3C02E00E */  lui       $v0, %hi(tattle_window_render)
+/* 3D680C E00D804C 2442825C */  addiu     $v0, $v0, %lo(tattle_window_render)
 /* 3D6810 E00D8050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D6814 E00D8054 3C02E00E */  lui       $v0, %hi(func_E00D8264)
 /* 3D6818 E00D8058 24428264 */  addiu     $v0, $v0, %lo(func_E00D8264)
diff --git a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_update.s b/ver/us/asm/nonmatchings/effects/tattle_window/tattle_window_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_108/fx_108_update.s
rename to ver/us/asm/nonmatchings/effects/tattle_window/tattle_window_update.s
index 618bed4419..0e354e18f1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_108/fx_108_update.s
+++ b/ver/us/asm/nonmatchings/effects/tattle_window/tattle_window_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_108_update
+glabel tattle_window_update
 /* 3D68E8 E00D8128 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D68EC E00D812C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D68F0 E00D8130 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_appendGfx.s b/ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_100/fx_100_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_appendGfx.s
index e82326d935..77432fd9d1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_100_appendGfx
+glabel throw_spiny_appendGfx
 /* 3CF7F4 E00C8454 27BDFF38 */  addiu     $sp, $sp, -0xc8
 /* 3CF7F8 E00C8458 0080302D */  daddu     $a2, $a0, $zero
 /* 3CF7FC E00C845C 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s b/ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s
rename to ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_main.s
index dcc13a93bc..b22ca324e8 100644
--- a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_main.s
+++ b/ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_100_main
+glabel throw_spiny_main
 /* 3CF3A0 E00C8000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3CF3A4 E00C8004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3CF3A8 E00C8008 4485A000 */  mtc1      $a1, $f20
@@ -20,14 +20,14 @@ glabel fx_100_main
 /* 3CF3DC E00C803C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3CF3E0 E00C8040 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3CF3E4 E00C8044 8FB10090 */  lw        $s1, 0x90($sp)
-/* 3CF3E8 E00C8048 3C02E00D */  lui       $v0, %hi(fx_100_init)
-/* 3CF3EC E00C804C 24428218 */  addiu     $v0, $v0, %lo(fx_100_init)
+/* 3CF3E8 E00C8048 3C02E00D */  lui       $v0, %hi(throw_spiny_init)
+/* 3CF3EC E00C804C 24428218 */  addiu     $v0, $v0, %lo(throw_spiny_init)
 /* 3CF3F0 E00C8050 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3CF3F4 E00C8054 3C02E00D */  lui       $v0, %hi(fx_100_update)
-/* 3CF3F8 E00C8058 24428220 */  addiu     $v0, $v0, %lo(fx_100_update)
+/* 3CF3F4 E00C8054 3C02E00D */  lui       $v0, %hi(throw_spiny_update)
+/* 3CF3F8 E00C8058 24428220 */  addiu     $v0, $v0, %lo(throw_spiny_update)
 /* 3CF3FC E00C805C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3CF400 E00C8060 3C02E00D */  lui       $v0, %hi(fx_100_render)
-/* 3CF404 E00C8064 24428404 */  addiu     $v0, $v0, %lo(fx_100_render)
+/* 3CF400 E00C8060 3C02E00D */  lui       $v0, %hi(throw_spiny_render)
+/* 3CF404 E00C8064 24428404 */  addiu     $v0, $v0, %lo(throw_spiny_render)
 /* 3CF408 E00C8068 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3CF40C E00C806C 24020064 */  addiu     $v0, $zero, 0x64
 /* 3CF410 E00C8070 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_update.s b/ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_100/fx_100_update.s
rename to ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_update.s
index 4cc9a06929..c55dbafee9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_100/fx_100_update.s
+++ b/ver/us/asm/nonmatchings/effects/throw_spiny/throw_spiny_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_100_update
+glabel throw_spiny_update
 /* 3CF5C0 E00C8220 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3CF5C4 E00C8224 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3CF5C8 E00C8228 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_appendGfx.s b/ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_88/fx_88_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_appendGfx.s
index 4b9719027f..d5215419c4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_appendGfx.s
@@ -7,7 +7,7 @@ dlabel D_E00B07E8
 .double 0.1
 
 .section .text
-glabel fx_88_appendGfx
+glabel thunderbolt_ring_appendGfx
 /* 3B40E4 E00B0234 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 3B40E8 E00B0238 0080402D */  daddu     $t0, $a0, $zero
 /* 3B40EC E00B023C 3C09DB06 */  lui       $t1, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s b/ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_main.s
similarity index 88%
rename from ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s
rename to ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_main.s
index d852a58b43..79d2434213 100644
--- a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_main.s
+++ b/ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_88_main
+glabel thunderbolt_ring_main
 /* 3B3EB0 E00B0000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3B3EB4 E00B0004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3B3EB8 E00B0008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_88_main
 /* 3B3ED4 E00B0024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B3ED8 E00B0028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B3EDC E00B002C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B3EE0 E00B0030 3C02E00B */  lui       $v0, %hi(fx_88_init)
-/* 3B3EE4 E00B0034 2442011C */  addiu     $v0, $v0, %lo(fx_88_init)
+/* 3B3EE0 E00B0030 3C02E00B */  lui       $v0, %hi(thunderbolt_ring_init)
+/* 3B3EE4 E00B0034 2442011C */  addiu     $v0, $v0, %lo(thunderbolt_ring_init)
 /* 3B3EE8 E00B0038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B3EEC E00B003C 3C02E00B */  lui       $v0, %hi(fx_88_update)
-/* 3B3EF0 E00B0040 24420124 */  addiu     $v0, $v0, %lo(fx_88_update)
+/* 3B3EEC E00B003C 3C02E00B */  lui       $v0, %hi(thunderbolt_ring_update)
+/* 3B3EF0 E00B0040 24420124 */  addiu     $v0, $v0, %lo(thunderbolt_ring_update)
 /* 3B3EF4 E00B0044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B3EF8 E00B0048 3C02E00B */  lui       $v0, %hi(fx_88_render)
-/* 3B3EFC E00B004C 244201F8 */  addiu     $v0, $v0, %lo(fx_88_render)
+/* 3B3EF8 E00B0048 3C02E00B */  lui       $v0, %hi(thunderbolt_ring_render)
+/* 3B3EFC E00B004C 244201F8 */  addiu     $v0, $v0, %lo(thunderbolt_ring_render)
 /* 3B3F00 E00B0050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B3F04 E00B0054 24020058 */  addiu     $v0, $zero, 0x58
 /* 3B3F08 E00B0058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_update.s b/ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_88/fx_88_update.s
rename to ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_update.s
index 99afd36cf1..a1c155d486 100644
--- a/ver/us/asm/nonmatchings/effects/effect_88/fx_88_update.s
+++ b/ver/us/asm/nonmatchings/effects/thunderbolt_ring/thunderbolt_ring_update.s
@@ -7,7 +7,7 @@ dlabel D_E00B07E0
 .double 0.3
 
 .section .text
-glabel fx_88_update
+glabel thunderbolt_ring_update
 /* 3B3FD4 E00B0124 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3B3FD8 E00B0128 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3B3FDC E00B012C 8C850000 */  lw        $a1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_appendGfx.s b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_102/fx_102_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_appendGfx.s
index e5c8a9b687..7a4856803d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_102_appendGfx
+glabel tubba_heart_attack_appendGfx
 /* 3D2060 E00CC9D0 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3D2064 E00CC9D4 0080302D */  daddu     $a2, $a0, $zero
 /* 3D2068 E00CC9D8 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s
rename to ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_main.s
index 6db879eee5..a263f44fa4 100644
--- a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_main.s
+++ b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_102_main
+glabel tubba_heart_attack_main
 /* 3D1690 E00CC000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3D1694 E00CC004 F7B40048 */  sdc1      $f20, 0x48($sp)
 /* 3D1698 E00CC008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_102_main
 /* 3D16B4 E00CC024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D16B8 E00CC028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3D16BC E00CC02C 8FB00084 */  lw        $s0, 0x84($sp)
-/* 3D16C0 E00CC030 3C02E00D */  lui       $v0, %hi(fx_102_init)
-/* 3D16C4 E00CC034 2442C250 */  addiu     $v0, $v0, %lo(fx_102_init)
+/* 3D16C0 E00CC030 3C02E00D */  lui       $v0, %hi(tubba_heart_attack_init)
+/* 3D16C4 E00CC034 2442C250 */  addiu     $v0, $v0, %lo(tubba_heart_attack_init)
 /* 3D16C8 E00CC038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D16CC E00CC03C 3C02E00D */  lui       $v0, %hi(fx_102_update)
-/* 3D16D0 E00CC040 2442C258 */  addiu     $v0, $v0, %lo(fx_102_update)
+/* 3D16CC E00CC03C 3C02E00D */  lui       $v0, %hi(tubba_heart_attack_update)
+/* 3D16D0 E00CC040 2442C258 */  addiu     $v0, $v0, %lo(tubba_heart_attack_update)
 /* 3D16D4 E00CC044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D16D8 E00CC048 3C02E00D */  lui       $v0, %hi(fx_102_render)
-/* 3D16DC E00CC04C 2442C980 */  addiu     $v0, $v0, %lo(fx_102_render)
+/* 3D16D8 E00CC048 3C02E00D */  lui       $v0, %hi(tubba_heart_attack_render)
+/* 3D16DC E00CC04C 2442C980 */  addiu     $v0, $v0, %lo(tubba_heart_attack_render)
 /* 3D16E0 E00CC050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D16E4 E00CC054 24020066 */  addiu     $v0, $zero, 0x66
 /* 3D16E8 E00CC058 AFBF0040 */  sw        $ra, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_update.s b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_102/fx_102_update.s
rename to ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_update.s
index 2e8749e800..584fbbfbec 100644
--- a/ver/us/asm/nonmatchings/effects/effect_102/fx_102_update.s
+++ b/ver/us/asm/nonmatchings/effects/tubba_heart_attack/tubba_heart_attack_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_102_update
+glabel tubba_heart_attack_update
 /* 3D18E8 E00CC258 27BDFF10 */  addiu     $sp, $sp, -0xf0
 /* 3D18EC E00CC25C AFBF00BC */  sw        $ra, 0xbc($sp)
 /* 3D18F0 E00CC260 AFBE00B8 */  sw        $fp, 0xb8($sp)
@@ -442,7 +442,7 @@ dlabel LE00CC870_3D1F00
 /* 3D1F78 E00CC8E8 44071000 */  mfc1      $a3, $f2
 /* 3D1F7C E00CC8EC 24020010 */  addiu     $v0, $zero, 0x10
 /* 3D1F80 E00CC8F0 E7BC0010 */  swc1      $f28, 0x10($sp)
-/* 3D1F84 E00CC8F4 0C034800 */  jal       fx_105_main
+/* 3D1F84 E00CC8F4 0C034800 */  jal       floating_cloud_puff_main
 /* 3D1F88 E00CC8F8 AFA20014 */   sw       $v0, 0x14($sp)
 /* 3D1F8C E00CC8FC 8C44000C */  lw        $a0, 0xc($v0)
 /* 3D1F90 E00CC900 24030064 */  addiu     $v1, $zero, 0x64
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_appendGfx.s b/ver/us/asm/nonmatchings/effects/underwater/underwater_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_93/fx_93_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/underwater/underwater_appendGfx.s
index 270d4fd58f..61618469b3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/underwater/underwater_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_93_appendGfx
+glabel underwater_appendGfx
 /* 3B91F0 E00BA620 27BDFF28 */  addiu     $sp, $sp, -0xd8
 /* 3B91F4 E00BA624 3C06DB06 */  lui       $a2, 0xdb06
 /* 3B91F8 E00BA628 34C60024 */  ori       $a2, $a2, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s b/ver/us/asm/nonmatchings/effects/underwater/underwater_main.s
similarity index 91%
rename from ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s
rename to ver/us/asm/nonmatchings/effects/underwater/underwater_main.s
index 29fef03c89..9dca7bd7e6 100644
--- a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_main.s
+++ b/ver/us/asm/nonmatchings/effects/underwater/underwater_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_93_main
+glabel underwater_main
 /* 3B8BD0 E00BA000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3B8BD4 E00BA004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3B8BD8 E00BA008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_93_main
 /* 3B8BF4 E00BA024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B8BF8 E00BA028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B8BFC E00BA02C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B8C00 E00BA030 3C02E00C */  lui       $v0, %hi(fx_93_init)
-/* 3B8C04 E00BA034 2442A16C */  addiu     $v0, $v0, %lo(fx_93_init)
+/* 3B8C00 E00BA030 3C02E00C */  lui       $v0, %hi(underwater_init)
+/* 3B8C04 E00BA034 2442A16C */  addiu     $v0, $v0, %lo(underwater_init)
 /* 3B8C08 E00BA038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B8C0C E00BA03C 3C02E00C */  lui       $v0, %hi(fx_93_update)
-/* 3B8C10 E00BA040 2442A174 */  addiu     $v0, $v0, %lo(fx_93_update)
+/* 3B8C0C E00BA03C 3C02E00C */  lui       $v0, %hi(underwater_update)
+/* 3B8C10 E00BA040 2442A174 */  addiu     $v0, $v0, %lo(underwater_update)
 /* 3B8C14 E00BA044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B8C18 E00BA048 3C02E00C */  lui       $v0, %hi(fx_93_render)
-/* 3B8C1C E00BA04C 2442A5DC */  addiu     $v0, $v0, %lo(fx_93_render)
+/* 3B8C18 E00BA048 3C02E00C */  lui       $v0, %hi(underwater_render)
+/* 3B8C1C E00BA04C 2442A5DC */  addiu     $v0, $v0, %lo(underwater_render)
 /* 3B8C20 E00BA050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B8C24 E00BA054 2402005D */  addiu     $v0, $zero, 0x5d
 /* 3B8C28 E00BA058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_update.s b/ver/us/asm/nonmatchings/effects/underwater/underwater_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_93/fx_93_update.s
rename to ver/us/asm/nonmatchings/effects/underwater/underwater_update.s
index 27f9bf3c6c..b9d8f9a9e9 100644
--- a/ver/us/asm/nonmatchings/effects/effect_93/fx_93_update.s
+++ b/ver/us/asm/nonmatchings/effects/underwater/underwater_update.s
@@ -12,7 +12,7 @@ dlabel D_E00BAE90
 .double 0.02
 
 .section .text
-glabel fx_93_update
+glabel underwater_update
 /* 3B8D44 E00BA174 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 3B8D48 E00BA178 AFBF0024 */  sw        $ra, 0x24($sp)
 /* 3B8D4C E00BA17C AFB40020 */  sw        $s4, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_appendGfx.s b/ver/us/asm/nonmatchings/effects/water_block/water_block_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_90/fx_90_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/water_block/water_block_appendGfx.s
index 036299a0c9..91a86a9fc5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/water_block/water_block_appendGfx.s
@@ -7,7 +7,7 @@ dlabel D_E00B4EF8
 .double 0.3
 
 .section .text
-glabel fx_90_appendGfx
+glabel water_block_appendGfx
 /* 3B626C E00B457C 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 3B6270 E00B4580 0080282D */  daddu     $a1, $a0, $zero
 /* 3B6274 E00B4584 3C06DB06 */  lui       $a2, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s b/ver/us/asm/nonmatchings/effects/water_block/water_block_main.s
similarity index 90%
rename from ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s
rename to ver/us/asm/nonmatchings/effects/water_block/water_block_main.s
index 6cf6767132..c6e1221cdd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_main.s
+++ b/ver/us/asm/nonmatchings/effects/water_block/water_block_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_90_main
+glabel water_block_main
 /* 3B5CF0 E00B4000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3B5CF4 E00B4004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3B5CF8 E00B4008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_90_main
 /* 3B5D14 E00B4024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B5D18 E00B4028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B5D1C E00B402C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B5D20 E00B4030 3C02E00B */  lui       $v0, %hi(fx_90_init)
-/* 3B5D24 E00B4034 24424134 */  addiu     $v0, $v0, %lo(fx_90_init)
+/* 3B5D20 E00B4030 3C02E00B */  lui       $v0, %hi(water_block_init)
+/* 3B5D24 E00B4034 24424134 */  addiu     $v0, $v0, %lo(water_block_init)
 /* 3B5D28 E00B4038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B5D2C E00B403C 3C02E00B */  lui       $v0, %hi(fx_90_update)
-/* 3B5D30 E00B4040 2442413C */  addiu     $v0, $v0, %lo(fx_90_update)
+/* 3B5D2C E00B403C 3C02E00B */  lui       $v0, %hi(water_block_update)
+/* 3B5D30 E00B4040 2442413C */  addiu     $v0, $v0, %lo(water_block_update)
 /* 3B5D34 E00B4044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B5D38 E00B4048 3C02E00B */  lui       $v0, %hi(fx_90_render)
-/* 3B5D3C E00B404C 2442452C */  addiu     $v0, $v0, %lo(fx_90_render)
+/* 3B5D38 E00B4048 3C02E00B */  lui       $v0, %hi(water_block_render)
+/* 3B5D3C E00B404C 2442452C */  addiu     $v0, $v0, %lo(water_block_render)
 /* 3B5D40 E00B4050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B5D44 E00B4054 2402005A */  addiu     $v0, $zero, 0x5a
 /* 3B5D48 E00B4058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_update.s b/ver/us/asm/nonmatchings/effects/water_block/water_block_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_90/fx_90_update.s
rename to ver/us/asm/nonmatchings/effects/water_block/water_block_update.s
index b6e0987e98..c414f272ae 100644
--- a/ver/us/asm/nonmatchings/effects/effect_90/fx_90_update.s
+++ b/ver/us/asm/nonmatchings/effects/water_block/water_block_update.s
@@ -19,7 +19,7 @@ dlabel D_E00B4EF0
 .double 0.1
 
 .section .text
-glabel fx_90_update
+glabel water_block_update
 /* 3B5E2C E00B413C 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3B5E30 E00B4140 AFB20020 */  sw        $s2, 0x20($sp)
 /* 3B5E34 E00B4144 0080902D */  daddu     $s2, $a0, $zero
@@ -84,7 +84,7 @@ glabel fx_90_update
 /* 3B5F0C E00B421C 8E250004 */  lw        $a1, 4($s1)
 /* 3B5F10 E00B4220 8E27000C */  lw        $a3, 0xc($s1)
 /* 3B5F14 E00B4224 44060000 */  mfc1      $a2, $f0
-/* 3B5F18 E00B4228 0C02F800 */  jal       fx_95_main
+/* 3B5F18 E00B4228 0C02F800 */  jal       water_splash_main
 /* 3B5F1C E00B422C 0000202D */   daddu    $a0, $zero, $zero
 /* 3B5F20 E00B4230 C6200008 */  lwc1      $f0, 8($s1)
 /* 3B5F24 E00B4234 E7B40010 */  swc1      $f20, 0x10($sp)
@@ -93,7 +93,7 @@ glabel fx_90_update
 /* 3B5F30 E00B4240 8E250004 */  lw        $a1, 4($s1)
 /* 3B5F34 E00B4244 8E27000C */  lw        $a3, 0xc($s1)
 /* 3B5F38 E00B4248 44060000 */  mfc1      $a2, $f0
-/* 3B5F3C E00B424C 0C02F800 */  jal       fx_95_main
+/* 3B5F3C E00B424C 0C02F800 */  jal       water_splash_main
 /* 3B5F40 E00B4250 24040001 */   addiu    $a0, $zero, 1
 .LE00B4254:
 /* 3B5F44 E00B4254 0C080128 */  jal       shim_remove_effect
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_appendGfx.s b/ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_92/fx_92_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_appendGfx.s
index 9d1f68f38f..c06b7190bd 100644
--- a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_appendGfx.s
@@ -7,7 +7,7 @@ dlabel D_E00B8CD0
 .double 0.01
 
 .section .text
-glabel fx_92_appendGfx
+glabel water_fountain_appendGfx
 /* 3B7D88 E00B8208 27BDFEF8 */  addiu     $sp, $sp, -0x108
 /* 3B7D8C E00B820C 0080302D */  daddu     $a2, $a0, $zero
 /* 3B7D90 E00B8210 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s b/ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_main.s
similarity index 89%
rename from ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s
rename to ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_main.s
index 33d0f989b9..a303ffafc3 100644
--- a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_main.s
+++ b/ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_92_main
+glabel water_fountain_main
 /* 3B7B80 E00B8000 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3B7B84 E00B8004 F7B40038 */  sdc1      $f20, 0x38($sp)
 /* 3B7B88 E00B8008 4485A000 */  mtc1      $a1, $f20
@@ -14,14 +14,14 @@ glabel fx_92_main
 /* 3B7BA4 E00B8024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B7BA8 E00B8028 AFB1002C */  sw        $s1, 0x2c($sp)
 /* 3B7BAC E00B802C 8FB10064 */  lw        $s1, 0x64($sp)
-/* 3B7BB0 E00B8030 3C02E00C */  lui       $v0, %hi(fx_92_init)
-/* 3B7BB4 E00B8034 2442812C */  addiu     $v0, $v0, %lo(fx_92_init)
+/* 3B7BB0 E00B8030 3C02E00C */  lui       $v0, %hi(water_fountain_init)
+/* 3B7BB4 E00B8034 2442812C */  addiu     $v0, $v0, %lo(water_fountain_init)
 /* 3B7BB8 E00B8038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B7BBC E00B803C 3C02E00C */  lui       $v0, %hi(fx_92_update)
-/* 3B7BC0 E00B8040 24428134 */  addiu     $v0, $v0, %lo(fx_92_update)
+/* 3B7BBC E00B803C 3C02E00C */  lui       $v0, %hi(water_fountain_update)
+/* 3B7BC0 E00B8040 24428134 */  addiu     $v0, $v0, %lo(water_fountain_update)
 /* 3B7BC4 E00B8044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B7BC8 E00B8048 3C02E00C */  lui       $v0, %hi(fx_92_render)
-/* 3B7BCC E00B804C 244281B8 */  addiu     $v0, $v0, %lo(fx_92_render)
+/* 3B7BC8 E00B8048 3C02E00C */  lui       $v0, %hi(water_fountain_render)
+/* 3B7BCC E00B804C 244281B8 */  addiu     $v0, $v0, %lo(water_fountain_render)
 /* 3B7BD0 E00B8050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B7BD4 E00B8054 2402005C */  addiu     $v0, $zero, 0x5c
 /* 3B7BD8 E00B8058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_update.s b/ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_update.s
similarity index 98%
rename from ver/us/asm/nonmatchings/effects/effect_92/fx_92_update.s
rename to ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_update.s
index 5a8529fd43..6a4949cb0d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_92/fx_92_update.s
+++ b/ver/us/asm/nonmatchings/effects/water_fountain/water_fountain_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_92_update
+glabel water_fountain_update
 /* 3B7CB4 E00B8134 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3B7CB8 E00B8138 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3B7CBC E00B813C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_appendGfx.s b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_95/fx_95_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/water_splash/water_splash_appendGfx.s
index 7b930dad01..e8929bb944 100644
--- a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_95_appendGfx
+glabel water_splash_appendGfx
 /* 3BC51C E00BE5BC 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3BC520 E00BE5C0 3C05DB06 */  lui       $a1, 0xdb06
 /* 3BC524 E00BE5C4 34A50024 */  ori       $a1, $a1, 0x24
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_main.s
similarity index 96%
rename from ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s
rename to ver/us/asm/nonmatchings/effects/water_splash/water_splash_main.s
index 5be56a5806..f9b01e5237 100644
--- a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_main.s
+++ b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_95_main
+glabel water_splash_main
 /* 3BBF60 E00BE000 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 3BBF64 E00BE004 F7B40040 */  sdc1      $f20, 0x40($sp)
 /* 3BBF68 E00BE008 4485A000 */  mtc1      $a1, $f20
@@ -30,14 +30,14 @@ glabel fx_95_main
 .LE00BE064:
 /* 3BBFC4 E00BE064 2410000B */  addiu     $s0, $zero, 0xb
 .LE00BE068:
-/* 3BBFC8 E00BE068 3C02E00C */  lui       $v0, %hi(fx_95_init)
-/* 3BBFCC E00BE06C 2442E39C */  addiu     $v0, $v0, %lo(fx_95_init)
+/* 3BBFC8 E00BE068 3C02E00C */  lui       $v0, %hi(water_splash_init)
+/* 3BBFCC E00BE06C 2442E39C */  addiu     $v0, $v0, %lo(water_splash_init)
 /* 3BBFD0 E00BE070 AC820008 */  sw        $v0, 8($a0)
-/* 3BBFD4 E00BE074 3C02E00C */  lui       $v0, %hi(fx_95_update)
-/* 3BBFD8 E00BE078 2442E3A4 */  addiu     $v0, $v0, %lo(fx_95_update)
+/* 3BBFD4 E00BE074 3C02E00C */  lui       $v0, %hi(water_splash_update)
+/* 3BBFD8 E00BE078 2442E3A4 */  addiu     $v0, $v0, %lo(water_splash_update)
 /* 3BBFDC E00BE07C AC82000C */  sw        $v0, 0xc($a0)
-/* 3BBFE0 E00BE080 3C02E00C */  lui       $v0, %hi(fx_95_render)
-/* 3BBFE4 E00BE084 2442E578 */  addiu     $v0, $v0, %lo(fx_95_render)
+/* 3BBFE0 E00BE080 3C02E00C */  lui       $v0, %hi(water_splash_render)
+/* 3BBFE4 E00BE084 2442E578 */  addiu     $v0, $v0, %lo(water_splash_render)
 /* 3BBFE8 E00BE088 AC820010 */  sw        $v0, 0x10($a0)
 /* 3BBFEC E00BE08C 2402005F */  addiu     $v0, $zero, 0x5f
 /* 3BBFF0 E00BE090 AC800000 */  sw        $zero, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_update.s b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_95/fx_95_update.s
rename to ver/us/asm/nonmatchings/effects/water_splash/water_splash_update.s
index 027ac719b2..db132e104c 100644
--- a/ver/us/asm/nonmatchings/effects/effect_95/fx_95_update.s
+++ b/ver/us/asm/nonmatchings/effects/water_splash/water_splash_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_95_update
+glabel water_splash_update
 /* 3BC304 E00BE3A4 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 3BC308 E00BE3A8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3BC30C E00BE3AC F7B40018 */  sdc1      $f20, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_appendGfx.s b/ver/us/asm/nonmatchings/effects/waterfall/waterfall_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_91/fx_91_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/waterfall/waterfall_appendGfx.s
index 465342a124..7f1c46949b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/waterfall/waterfall_appendGfx.s
@@ -7,7 +7,7 @@ dlabel D_E00B6768
 .double 0.1
 
 .section .text
-glabel fx_91_appendGfx
+glabel waterfall_appendGfx
 /* 3B7440 E00B62E0 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 3B7444 E00B62E4 0080302D */  daddu     $a2, $a0, $zero
 /* 3B7448 E00B62E8 3C07DB06 */  lui       $a3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s b/ver/us/asm/nonmatchings/effects/waterfall/waterfall_main.s
similarity index 92%
rename from ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s
rename to ver/us/asm/nonmatchings/effects/waterfall/waterfall_main.s
index 2b076fd01d..09f98704ad 100644
--- a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_main.s
+++ b/ver/us/asm/nonmatchings/effects/waterfall/waterfall_main.s
@@ -7,7 +7,7 @@ dlabel D_E00B6750
 .double 0.01
 
 .section .text
-glabel fx_91_main
+glabel waterfall_main
 /* 3B7160 E00B6000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 3B7164 E00B6004 F7B80048 */  sdc1      $f24, 0x48($sp)
 /* 3B7168 E00B6008 4485C000 */  mtc1      $a1, $f24
@@ -20,14 +20,14 @@ glabel fx_91_main
 /* 3B7184 E00B6024 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3B7188 E00B6028 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3B718C E00B602C 8FB00074 */  lw        $s0, 0x74($sp)
-/* 3B7190 E00B6030 3C02E00B */  lui       $v0, %hi(fx_91_init)
-/* 3B7194 E00B6034 24426178 */  addiu     $v0, $v0, %lo(fx_91_init)
+/* 3B7190 E00B6030 3C02E00B */  lui       $v0, %hi(waterfall_init)
+/* 3B7194 E00B6034 24426178 */  addiu     $v0, $v0, %lo(waterfall_init)
 /* 3B7198 E00B6038 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3B719C E00B603C 3C02E00B */  lui       $v0, %hi(fx_91_update)
-/* 3B71A0 E00B6040 24426180 */  addiu     $v0, $v0, %lo(fx_91_update)
+/* 3B719C E00B603C 3C02E00B */  lui       $v0, %hi(waterfall_update)
+/* 3B71A0 E00B6040 24426180 */  addiu     $v0, $v0, %lo(waterfall_update)
 /* 3B71A4 E00B6044 AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3B71A8 E00B6048 3C02E00B */  lui       $v0, %hi(fx_91_render)
-/* 3B71AC E00B604C 2442629C */  addiu     $v0, $v0, %lo(fx_91_render)
+/* 3B71A8 E00B6048 3C02E00B */  lui       $v0, %hi(waterfall_render)
+/* 3B71AC E00B604C 2442629C */  addiu     $v0, $v0, %lo(waterfall_render)
 /* 3B71B0 E00B6050 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3B71B4 E00B6054 2402005B */  addiu     $v0, $zero, 0x5b
 /* 3B71B8 E00B6058 AFBF0034 */  sw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_update.s b/ver/us/asm/nonmatchings/effects/waterfall/waterfall_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_91/fx_91_update.s
rename to ver/us/asm/nonmatchings/effects/waterfall/waterfall_update.s
index 7d62721326..cf22dd5fd5 100644
--- a/ver/us/asm/nonmatchings/effects/effect_91/fx_91_update.s
+++ b/ver/us/asm/nonmatchings/effects/waterfall/waterfall_update.s
@@ -10,7 +10,7 @@ dlabel D_E00B6760
 .double 0.1
 
 .section .text
-glabel fx_91_update
+glabel waterfall_update
 /* 3B72E0 E00B6180 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3B72E4 E00B6184 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3B72E8 E00B6188 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_appendGfx.s b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_103/fx_103_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_appendGfx.s
index 4c1dcc6f58..706de8241e 100644
--- a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_103_appendGfx
+glabel whirlwind_appendGfx
 /* 3D2F38 E00CE478 27BDFEE0 */  addiu     $sp, $sp, -0x120
 /* 3D2F3C E00CE47C 0080502D */  daddu     $t2, $a0, $zero
 /* 3D2F40 E00CE480 3C0BDB06 */  lui       $t3, 0xdb06
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_main.s
similarity index 94%
rename from ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s
rename to ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_main.s
index 14e72fcc51..862e5038c1 100644
--- a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_main.s
+++ b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_103_main
+glabel whirlwind_main
 /* 3D2AC0 E00CE000 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3D2AC4 E00CE004 F7BC0060 */  sdc1      $f28, 0x60($sp)
 /* 3D2AC8 E00CE008 4485E000 */  mtc1      $a1, $f28
@@ -12,14 +12,14 @@ glabel fx_103_main
 /* 3D2ADC E00CE01C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 3D2AE0 E00CE020 AFB00028 */  sw        $s0, 0x28($sp)
 /* 3D2AE4 E00CE024 8FB00084 */  lw        $s0, 0x84($sp)
-/* 3D2AE8 E00CE028 3C02E00D */  lui       $v0, %hi(fx_103_init)
-/* 3D2AEC E00CE02C 2442E21C */  addiu     $v0, $v0, %lo(fx_103_init)
+/* 3D2AE8 E00CE028 3C02E00D */  lui       $v0, %hi(whirlwind_init)
+/* 3D2AEC E00CE02C 2442E21C */  addiu     $v0, $v0, %lo(whirlwind_init)
 /* 3D2AF0 E00CE030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 3D2AF4 E00CE034 3C02E00D */  lui       $v0, %hi(fx_103_update)
-/* 3D2AF8 E00CE038 2442E224 */  addiu     $v0, $v0, %lo(fx_103_update)
+/* 3D2AF4 E00CE034 3C02E00D */  lui       $v0, %hi(whirlwind_update)
+/* 3D2AF8 E00CE038 2442E224 */  addiu     $v0, $v0, %lo(whirlwind_update)
 /* 3D2AFC E00CE03C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 3D2B00 E00CE040 3C02E00D */  lui       $v0, %hi(fx_103_render)
-/* 3D2B04 E00CE044 2442E428 */  addiu     $v0, $v0, %lo(fx_103_render)
+/* 3D2B00 E00CE040 3C02E00D */  lui       $v0, %hi(whirlwind_render)
+/* 3D2B04 E00CE044 2442E428 */  addiu     $v0, $v0, %lo(whirlwind_render)
 /* 3D2B08 E00CE048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 3D2B0C E00CE04C 24020067 */  addiu     $v0, $zero, 0x67
 /* 3D2B10 E00CE050 AFBF0038 */  sw        $ra, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_update.s b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_103/fx_103_update.s
rename to ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_update.s
index cba763a1f5..e59345a42b 100644
--- a/ver/us/asm/nonmatchings/effects/effect_103/fx_103_update.s
+++ b/ver/us/asm/nonmatchings/effects/whirlwind/whirlwind_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_103_update
+glabel whirlwind_update
 /* 3D2CE4 E00CE224 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 3D2CE8 E00CE228 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 3D2CEC E00CE22C 8C830000 */  lw        $v1, ($a0)
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_appendGfx.s b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_appendGfx.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_43/fx_43_appendGfx.s
rename to ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_appendGfx.s
index 3736071eee..52d867b358 100644
--- a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_appendGfx.s
+++ b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_appendGfx.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_43_appendGfx
+glabel windy_leaves_appendGfx
 /* 35E5D0 E0056BD0 27BDFEF0 */  addiu     $sp, $sp, -0x110
 /* 35E5D4 E0056BD4 AFBE00F8 */  sw        $fp, 0xf8($sp)
 /* 35E5D8 E0056BD8 0080F02D */  daddu     $fp, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_main.s
similarity index 95%
rename from ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s
rename to ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_main.s
index 6b2a572bb1..a9e3a9dd1d 100644
--- a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_main.s
+++ b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_main.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_43_main
+glabel windy_leaves_main
 /* 35DA00 E0056000 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* 35DA04 E0056004 F7B40048 */  sdc1      $f20, 0x48($sp)
 /* 35DA08 E0056008 4485A000 */  mtc1      $a1, $f20
@@ -12,14 +12,14 @@ glabel fx_43_main
 /* 35DA1C E005601C 27A40010 */  addiu     $a0, $sp, 0x10
 /* 35DA20 E0056020 F7B80058 */  sdc1      $f24, 0x58($sp)
 /* 35DA24 E0056024 4487C000 */  mtc1      $a3, $f24
-/* 35DA28 E0056028 3C02E005 */  lui       $v0, %hi(fx_43_init)
-/* 35DA2C E005602C 24426304 */  addiu     $v0, $v0, %lo(fx_43_init)
+/* 35DA28 E0056028 3C02E005 */  lui       $v0, %hi(windy_leaves_init)
+/* 35DA2C E005602C 24426304 */  addiu     $v0, $v0, %lo(windy_leaves_init)
 /* 35DA30 E0056030 AFA20018 */  sw        $v0, 0x18($sp)
-/* 35DA34 E0056034 3C02E005 */  lui       $v0, %hi(fx_43_update)
-/* 35DA38 E0056038 2442630C */  addiu     $v0, $v0, %lo(fx_43_update)
+/* 35DA34 E0056034 3C02E005 */  lui       $v0, %hi(windy_leaves_update)
+/* 35DA38 E0056038 2442630C */  addiu     $v0, $v0, %lo(windy_leaves_update)
 /* 35DA3C E005603C AFA2001C */  sw        $v0, 0x1c($sp)
-/* 35DA40 E0056040 3C02E005 */  lui       $v0, %hi(fx_43_render)
-/* 35DA44 E0056044 24426B8C */  addiu     $v0, $v0, %lo(fx_43_render)
+/* 35DA40 E0056040 3C02E005 */  lui       $v0, %hi(windy_leaves_render)
+/* 35DA44 E0056044 24426B8C */  addiu     $v0, $v0, %lo(windy_leaves_render)
 /* 35DA48 E0056048 AFA20020 */  sw        $v0, 0x20($sp)
 /* 35DA4C E005604C 2402002B */  addiu     $v0, $zero, 0x2b
 /* 35DA50 E0056050 AFBF0044 */  sw        $ra, 0x44($sp)
diff --git a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_update.s b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_update.s
similarity index 99%
rename from ver/us/asm/nonmatchings/effects/effect_43/fx_43_update.s
rename to ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_update.s
index 66a6d8fdcc..740d2bd086 100644
--- a/ver/us/asm/nonmatchings/effects/effect_43/fx_43_update.s
+++ b/ver/us/asm/nonmatchings/effects/windy_leaves/windy_leaves_update.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel fx_43_update
+glabel windy_leaves_update
 /* 35DD0C E005630C 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 35DD10 E0056310 AFB40020 */  sw        $s4, 0x20($sp)
 /* 35DD14 E0056314 0080A02D */  daddu     $s4, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s
index 186ff5a06b..a8cc77b5b3 100644
--- a/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s
+++ b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s
@@ -126,7 +126,7 @@ glabel func_802BB1E8_E2B918
 /* E2BAA4 802BB374 8E250048 */  lw        $a1, 0x48($s1)
 /* E2BAA8 802BB378 8E270050 */  lw        $a3, 0x50($s1)
 /* E2BAAC 802BB37C 44062000 */  mfc1      $a2, $f4
-/* E2BAB0 802BB380 0C01BFBC */  jal       playFX_11
+/* E2BAB0 802BB380 0C01BFBC */  jal       fx_sparkles
 /* E2BAB4 802BB384 0000202D */   daddu    $a0, $zero, $zero
 /* E2BAB8 802BB388 8E220000 */  lw        $v0, ($s1)
 /* E2BABC 802BB38C 34420020 */  ori       $v0, $v0, 0x20
diff --git a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7460.s b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7460.s
index 22bbfb0d3c..73cc61dc3f 100644
--- a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7460.s
+++ b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7460.s
@@ -21,7 +21,7 @@ glabel func_802D7460
 /* FBE50 802D74A0 AFBF0020 */  sw        $ra, 0x20($sp)
 /* FBE54 802D74A4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* FBE58 802D74A8 E7A00014 */  swc1      $f0, 0x14($sp)
-/* FBE5C 802D74AC 0C01C154 */  jal       playFX_22
+/* FBE5C 802D74AC 0C01C154 */  jal       fx_stars_shimmer
 /* FBE60 802D74B0 AFA2001C */   sw       $v0, 0x1c($sp)
 /* FBE64 802D74B4 8FBF0020 */  lw        $ra, 0x20($sp)
 /* FBE68 802D74B8 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/evt/fx_api/func_802D74C0.s b/ver/us/asm/nonmatchings/evt/fx_api/func_802D74C0.s
index 8afb95fcc5..21c21fb936 100644
--- a/ver/us/asm/nonmatchings/evt/fx_api/func_802D74C0.s
+++ b/ver/us/asm/nonmatchings/evt/fx_api/func_802D74C0.s
@@ -21,7 +21,7 @@ glabel func_802D74C0
 /* FBEB0 802D7500 AFBF0020 */  sw        $ra, 0x20($sp)
 /* FBEB4 802D7504 E7A00010 */  swc1      $f0, 0x10($sp)
 /* FBEB8 802D7508 E7A00014 */  swc1      $f0, 0x14($sp)
-/* FBEBC 802D750C 0C01C154 */  jal       playFX_22
+/* FBEBC 802D750C 0C01C154 */  jal       fx_stars_shimmer
 /* FBEC0 802D7510 AFA2001C */   sw       $v0, 0x1c($sp)
 /* FBEC4 802D7514 8FBF0020 */  lw        $ra, 0x20($sp)
 /* FBEC8 802D7518 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s
index dd03bc8e2f..aa9afa7eed 100644
--- a/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s
+++ b/ver/us/asm/nonmatchings/evt/fx_api/func_802D7690.s
@@ -115,7 +115,7 @@ glabel func_802D7690
 /* FC1F4 802D7844 44060000 */  mfc1      $a2, $f0
 /* FC1F8 802D7848 4600A18D */  trunc.w.s $f6, $f20
 /* FC1FC 802D784C 44043000 */  mfc1      $a0, $f6
-/* FC200 802D7850 0C01BF2C */  jal       playFX_0B
+/* FC200 802D7850 0C01BF2C */  jal       fx_cloud_trail
 /* FC204 802D7854 0000382D */   daddu    $a3, $zero, $zero
 /* FC208 802D7858 8E430070 */  lw        $v1, 0x70($s2)
 /* FC20C 802D785C 24630001 */  addiu     $v1, $v1, 1
diff --git a/ver/us/asm/nonmatchings/npc/func_8003DA38.s b/ver/us/asm/nonmatchings/npc/func_8003DA38.s
index 3c98851391..93fb43e075 100644
--- a/ver/us/asm/nonmatchings/npc/func_8003DA38.s
+++ b/ver/us/asm/nonmatchings/npc/func_8003DA38.s
@@ -26,7 +26,7 @@ glabel func_8003DA38
 /* 18E8C 8003DA8C 3C108007 */  lui       $s0, %hi(D_80077C18)
 /* 18E90 8003DA90 26107C18 */  addiu     $s0, $s0, %lo(D_80077C18)
 /* 18E94 8003DA94 8E070000 */  lw        $a3, ($s0)
-/* 18E98 8003DA98 0C01BEE4 */  jal       playFX_08
+/* 18E98 8003DA98 0C01BEE4 */  jal       fx_flower_splash
 /* 18E9C 8003DA9C 460E0380 */   add.s    $f14, $f0, $f14
 /* 18EA0 8003DAA0 C6000000 */  lwc1      $f0, ($s0)
 /* 18EA4 8003DAA4 3C01420C */  lui       $at, 0x420c
@@ -119,7 +119,7 @@ glabel func_8003DA38
 /* 18FF8 8003DBF8 C6020000 */  lwc1      $f2, ($s0)
 /* 18FFC 8003DBFC 468010A0 */  cvt.s.w   $f2, $f2
 /* 19000 8003DC00 E7A20014 */  swc1      $f2, 0x14($sp)
-/* 19004 8003DC04 0C01BEFC */  jal       playFX_09
+/* 19004 8003DC04 0C01BEFC */  jal       fx_flower_trail
 /* 19008 8003DC08 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 1900C 8003DC0C 8E020000 */  lw        $v0, ($s0)
 /* 19010 8003DC10 2C420001 */  sltiu     $v0, $v0, 1
diff --git a/ver/us/asm/nonmatchings/npc/func_8003DC38.s b/ver/us/asm/nonmatchings/npc/func_8003DC38.s
index e7eb3094e8..b4960a9890 100644
--- a/ver/us/asm/nonmatchings/npc/func_8003DC38.s
+++ b/ver/us/asm/nonmatchings/npc/func_8003DC38.s
@@ -37,7 +37,7 @@ glabel func_8003DC38
 /* 190B8 8003DCB8 44810000 */  mtc1      $at, $f0
 /* 190BC 8003DCBC 8E260040 */  lw        $a2, 0x40($s1)
 /* 190C0 8003DCC0 8E070000 */  lw        $a3, ($s0)
-/* 190C4 8003DCC4 0C01BF14 */  jal       playFX_0A
+/* 190C4 8003DCC4 0C01BF14 */  jal       fx_cloud_puff
 /* 190C8 8003DCC8 46007381 */   sub.s    $f14, $f14, $f0
 /* 190CC 8003DCCC C6000000 */  lwc1      $f0, ($s0)
 /* 190D0 8003DCD0 3C01420C */  lui       $at, 0x420c
@@ -126,7 +126,7 @@ glabel func_8003DC38
 /* 19218 8003DE18 2652005A */  addiu     $s2, $s2, 0x5a
 /* 1921C 8003DE1C 26730001 */  addiu     $s3, $s3, 1
 /* 19220 8003DE20 44070000 */  mfc1      $a3, $f0
-/* 19224 8003DE24 0C01BF2C */  jal       playFX_0B
+/* 19224 8003DE24 0C01BF2C */  jal       fx_cloud_trail
 /* 19228 8003DE28 24040001 */   addiu    $a0, $zero, 1
 /* 1922C 8003DE2C 2A620004 */  slti      $v0, $s3, 4
 /* 19230 8003DE30 1040004E */  beqz      $v0, .L8003DF6C
@@ -207,7 +207,7 @@ glabel func_8003DC38
 /* 19358 8003DF58 46040000 */  add.s     $f0, $f0, $f4
 /* 1935C 8003DF5C 46160000 */  add.s     $f0, $f0, $f22
 /* 19360 8003DF60 44070000 */  mfc1      $a3, $f0
-/* 19364 8003DF64 0C01BF2C */  jal       playFX_0B
+/* 19364 8003DF64 0C01BF2C */  jal       fx_cloud_trail
 /* 19368 8003DF68 24040001 */   addiu    $a0, $zero, 1
 .L8003DF6C:
 /* 1936C 8003DF6C 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s b/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s
index d803df9ccc..07ec4e1478 100644
--- a/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s
+++ b/ver/us/asm/nonmatchings/world/action/spin/func_802B6000_E25D60.s
@@ -185,7 +185,7 @@ glabel func_802B6000_E25D60
 /* E25FDC 802B627C 0280202D */   daddu    $a0, $s4, $zero
 /* E25FE0 802B6280 0220282D */  daddu     $a1, $s1, $zero
 /* E25FE4 802B6284 3C063F80 */  lui       $a2, 0x3f80
-/* E25FE8 802B6288 0C01C4B4 */  jal       playFX_46_whirlwind
+/* E25FE8 802B6288 0C01C4B4 */  jal       fx_46
 /* E25FEC 802B628C 240703E8 */   addiu    $a3, $zero, 0x3e8
 /* E25FF0 802B6290 AE2200D8 */  sw        $v0, 0xd8($s1)
 .L802B6294:
diff --git a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s
index 9966f0bb04..2c922dd130 100644
--- a/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s
+++ b/ver/us/asm/nonmatchings/world/area_dro/dro_02/9694C0/dro_02_func_8024240C_96B5CC.s
@@ -253,7 +253,7 @@ glabel dro_02_func_8024240C_96B5CC
 /* 96B938 80242778 44810000 */  mtc1      $at, $f0
 /* 96B93C 8024277C 44071000 */  mfc1      $a3, $f2
 /* 96B940 80242780 0000202D */  daddu     $a0, $zero, $zero
-/* 96B944 80242784 0C01BFBC */  jal       playFX_11
+/* 96B944 80242784 0C01BFBC */  jal       fx_sparkles
 /* 96B948 80242788 E7A00010 */   swc1     $f0, 0x10($sp)
 .L8024278C:
 /* 96B94C 8024278C 8E030000 */  lw        $v1, ($s0)
@@ -309,7 +309,7 @@ glabel dro_02_func_8024240C_96B5CC
 /* 96BA10 80242850 44810000 */  mtc1      $at, $f0
 /* 96BA14 80242854 44071000 */  mfc1      $a3, $f2
 /* 96BA18 80242858 0000202D */  daddu     $a0, $zero, $zero
-/* 96BA1C 8024285C 0C01BFBC */  jal       playFX_11
+/* 96BA1C 8024285C 0C01BFBC */  jal       fx_sparkles
 /* 96BA20 80242860 E7A00010 */   swc1     $f0, 0x10($sp)
 .L80242864:
 /* 96BA24 80242864 8E030000 */  lw        $v1, ($s0)
@@ -369,7 +369,7 @@ glabel dro_02_func_8024240C_96B5CC
 /* 96BAF4 80242934 44810000 */  mtc1      $at, $f0
 /* 96BAF8 80242938 44071000 */  mfc1      $a3, $f2
 /* 96BAFC 8024293C 0000202D */  daddu     $a0, $zero, $zero
-/* 96BB00 80242940 0C01BFBC */  jal       playFX_11
+/* 96BB00 80242940 0C01BFBC */  jal       fx_sparkles
 /* 96BB04 80242944 E7A00010 */   swc1     $f0, 0x10($sp)
 .L80242948:
 /* 96BB08 80242948 8E030000 */  lw        $v1, ($s0)
@@ -520,7 +520,7 @@ glabel dro_02_func_8024240C_96B5CC
 /* 96BD34 80242B74 44071000 */  mfc1      $a3, $f2
 /* 96BD38 80242B78 2402FFFF */  addiu     $v0, $zero, -1
 /* 96BD3C 80242B7C AFA20014 */  sw        $v0, 0x14($sp)
-/* 96BD40 80242B80 0C01C82C */  jal       playFX_6B
+/* 96BD40 80242B80 0C01C82C */  jal       fx_energy_in_out
 /* 96BD44 80242B84 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 96BD48 80242B88 AE020000 */  sw        $v0, ($s0)
 /* 96BD4C 80242B8C 8C43000C */  lw        $v1, 0xc($v0)
@@ -709,7 +709,7 @@ glabel dro_02_func_8024240C_96B5CC
 /* 96C00C 80242E4C 44810000 */  mtc1      $at, $f0
 /* 96C010 80242E50 44071000 */  mfc1      $a3, $f2
 /* 96C014 80242E54 0000202D */  daddu     $a0, $zero, $zero
-/* 96C018 80242E58 0C01BFBC */  jal       playFX_11
+/* 96C018 80242E58 0C01BFBC */  jal       fx_sparkles
 /* 96C01C 80242E5C E7A00010 */   swc1     $f0, 0x10($sp)
 /* 96C020 80242E60 0C05272D */  jal       sfx_play_sound
 /* 96C024 80242E64 24040206 */   addiu    $a0, $zero, 0x206
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s
index e16ef8371e..a123eaac6f 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s
@@ -49,7 +49,7 @@ glabel func_80240CDC_A1155C
 /* A1160C 80240D8C 44820000 */  mtc1      $v0, $f0
 /* A11610 80240D90 00000000 */  nop
 /* A11614 80240D94 46800020 */  cvt.s.w   $f0, $f0
-/* A11618 80240D98 0C01BFBC */  jal       playFX_11
+/* A11618 80240D98 0C01BFBC */  jal       fx_sparkles
 /* A1161C 80240D9C E7A00010 */   swc1     $f0, 0x10($sp)
 /* A11620 80240DA0 8FBF002C */  lw        $ra, 0x2c($sp)
 /* A11624 80240DA4 8FB40028 */  lw        $s4, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s
index 73fdaea1d3..27c14d6f67 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s
@@ -33,7 +33,7 @@ glabel func_80242C14_A1DD14
 /* A1DD84 80242C84 4405B000 */  mfc1      $a1, $f22
 /* A1DD88 80242C88 4406A000 */  mfc1      $a2, $f20
 /* A1DD8C 80242C8C 44071000 */  mfc1      $a3, $f2
-/* A1DD90 80242C90 0C01C574 */  jal       playFX_4E
+/* A1DD90 80242C90 0C01C574 */  jal       fx_quizmo_stage
 /* A1DD94 80242C94 0000202D */   daddu    $a0, $zero, $zero
 /* A1DD98 80242C98 0220202D */  daddu     $a0, $s1, $zero
 /* A1DD9C 80242C9C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80242C14_A1DD14
 /* A1DDF8 80242CF8 4405B000 */  mfc1      $a1, $f22
 /* A1DDFC 80242CFC 4406A000 */  mfc1      $a2, $f20
 /* A1DE00 80242D00 44071000 */  mfc1      $a3, $f2
-/* A1DE04 80242D04 0C01C604 */  jal       playFX_54
+/* A1DE04 80242D04 0C01C604 */  jal       fx_quizmo_audience
 /* A1DE08 80242D08 0000202D */   daddu    $a0, $zero, $zero
 /* A1DE0C 80242D0C 0220202D */  daddu     $a0, $s1, $zero
 /* A1DE10 80242D10 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80242C14_A1DD14
 /* A1DE78 80242D78 44071000 */  mfc1      $a3, $f2
 /* A1DE7C 80242D7C 0000202D */  daddu     $a0, $zero, $zero
 /* A1DE80 80242D80 AFA00014 */  sw        $zero, 0x14($sp)
-/* A1DE84 80242D84 0C01CA24 */  jal       playFX_80
+/* A1DE84 80242D84 0C01CA24 */  jal       fx_quizmo_assistant
 /* A1DE88 80242D88 E7A00010 */   swc1     $f0, 0x10($sp)
 /* A1DE8C 80242D8C 8E030000 */  lw        $v1, ($s0)
 /* A1DE90 80242D90 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s
index e75aef4bdf..2d9bf9ba65 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s
@@ -26,7 +26,7 @@ glabel func_8024349C_A1E59C
 /* A1E5EC 802434EC 00000000 */  nop
 .L802434F0:
 /* A1E5F0 802434F0 00A0302D */  daddu     $a2, $a1, $zero
-/* A1E5F4 802434F4 0C01C5A4 */  jal       playFX_50
+/* A1E5F4 802434F4 0C01C5A4 */  jal       fx_quizmo_answer
 /* A1E5F8 802434F8 00A0382D */   daddu    $a3, $a1, $zero
 .L802434FC:
 /* A1E5FC 802434FC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
index 239664fade..1c92c01117 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
@@ -96,7 +96,7 @@ glabel update_heroes_start_turn_A2C264
 /* A2C3D0 80242190 44830000 */  mtc1      $v1, $f0
 /* A2C3D4 80242194 00000000 */  nop
 /* A2C3D8 80242198 46800020 */  cvt.s.w   $f0, $f0
-/* A2C3DC 8024219C 0C01C34C */  jal       playFX_37
+/* A2C3DC 8024219C 0C01C34C */  jal       fx_fire_breath
 /* A2C3E0 802421A0 E7A00018 */   swc1     $f0, 0x18($sp)
 .L802421A4:
 /* A2C3E4 802421A4 3C038025 */  lui       $v1, %hi(D_80249A70_A33CB0)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s
index f0d5d8ff4e..0e7205c119 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240404_A3FB44.s
@@ -17,7 +17,7 @@ glabel func_80240404_A3FB44
 /* A3FB74 80240434 AFA00018 */  sw        $zero, 0x18($sp)
 /* A3FB78 80240438 E7A00010 */  swc1      $f0, 0x10($sp)
 /* A3FB7C 8024043C E7A20014 */  swc1      $f2, 0x14($sp)
-/* A3FB80 80240440 0C01BF8C */  jal       playFX_0F
+/* A3FB80 80240440 0C01BF8C */  jal       fx_star
 /* A3FB84 80240444 E7A4001C */   swc1     $f4, 0x1c($sp)
 /* A3FB88 80240448 8FBF0020 */  lw        $ra, 0x20($sp)
 /* A3FB8C 8024044C 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s
index 2668eb623e..92d6b2b998 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240770_A3FEB0.s
@@ -99,7 +99,7 @@ glabel func_80240770_A3FEB0
 /* A40020 802408E0 8E050038 */  lw        $a1, 0x38($s0)
 /* A40024 802408E4 8E070040 */  lw        $a3, 0x40($s0)
 /* A40028 802408E8 44061000 */  mfc1      $a2, $f2
-/* A4002C 802408EC 0C01BFBC */  jal       playFX_11
+/* A4002C 802408EC 0C01BFBC */  jal       fx_sparkles
 /* A40030 802408F0 24040003 */   addiu    $a0, $zero, 3
 .L802408F4:
 /* A40034 802408F4 8E22007C */  lw        $v0, 0x7c($s1)
@@ -183,7 +183,7 @@ glabel func_80240770_A3FEB0
 /* A40168 80240A28 8E050038 */  lw        $a1, 0x38($s0)
 /* A4016C 80240A2C 8E070040 */  lw        $a3, 0x40($s0)
 /* A40170 80240A30 44061000 */  mfc1      $a2, $f2
-/* A40174 80240A34 0C01BFBC */  jal       playFX_11
+/* A40174 80240A34 0C01BFBC */  jal       fx_sparkles
 /* A40178 80240A38 24040003 */   addiu    $a0, $zero, 3
 .L80240A3C:
 /* A4017C 80240A3C 8E22007C */  lw        $v0, 0x7c($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s
index 4d19a5c20d..25075a3618 100644
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s
+++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s
@@ -32,7 +32,7 @@ glabel func_80241E24_97F8F4
 /* 97F960 80241E90 4406A000 */  mfc1      $a2, $f20
 /* 97F964 80241E94 44070000 */  mfc1      $a3, $f0
 /* 97F968 80241E98 0000202D */  daddu     $a0, $zero, $zero
-/* 97F96C 80241E9C 0C01BEB4 */  jal       fx_land
+/* 97F96C 80241E9C 0C01BEB4 */  jal       fx_landing_dust
 /* 97F970 80241EA0 AFA00010 */   sw       $zero, 0x10($sp)
 /* 97F974 80241EA4 8FBF001C */  lw        $ra, 0x1c($sp)
 /* 97F978 80241EA8 8FB00018 */  lw        $s0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s
index e80cc0730f..3aff6aca3e 100644
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s
+++ b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s
@@ -65,7 +65,7 @@ glabel func_80240600_989160
 /* 98924C 802406EC 8C450048 */  lw        $a1, 0x48($v0)
 /* 989250 802406F0 8C470050 */  lw        $a3, 0x50($v0)
 /* 989254 802406F4 44060000 */  mfc1      $a2, $f0
-/* 989258 802406F8 0C01C5BC */  jal       playFX_51
+/* 989258 802406F8 0C01C5BC */  jal       fx_motion_blur_flame
 /* 98925C 802406FC 26310001 */   addiu    $s1, $s1, 1
 /* 989260 80240700 AE020008 */  sw        $v0, 8($s0)
 /* 989264 80240704 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s b/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s
index e3dde63d2a..02f5420541 100644
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s
+++ b/ver/us/asm/nonmatchings/world/area_isk/isk_11/98AA10/func_80240000_98AA10.s
@@ -32,7 +32,7 @@ glabel func_80240000_98AA10
 /* 98AA7C 8024006C 4406B000 */  mfc1      $a2, $f22
 /* 98AA80 80240070 4407A000 */  mfc1      $a3, $f20
 /* 98AA84 80240074 0000202D */  daddu     $a0, $zero, $zero
-/* 98AA88 80240078 0C01C094 */  jal       playFX_1A
+/* 98AA88 80240078 0C01C094 */  jal       fx_lens_flare
 /* 98AA8C 8024007C AFA20010 */   sw       $v0, 0x10($sp)
 /* 98AA90 80240080 8FBF0020 */  lw        $ra, 0x20($sp)
 /* 98AA94 80240084 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s
index f5c09a0903..0c79c2185c 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_00/90CC40/func_80240118_90CD58.s
@@ -74,7 +74,7 @@ glabel func_80240118_90CD58
 /* 90CE60 80240220 8E250038 */  lw        $a1, 0x38($s1)
 /* 90CE64 80240224 8E270040 */  lw        $a3, 0x40($s1)
 /* 90CE68 80240228 44062000 */  mfc1      $a2, $f4
-/* 90CE6C 8024022C 0C01C064 */  jal       playFX_18
+/* 90CE6C 8024022C 0C01C064 */  jal       fx_damage_stars
 /* 90CE70 80240230 24040001 */   addiu    $a0, $zero, 1
 .L80240234:
 /* 90CE74 80240234 8E500074 */  lw        $s0, 0x74($s2)
@@ -88,7 +88,7 @@ glabel func_80240118_90CD58
 /* 90CE94 80240254 C62E003C */  lwc1      $f14, 0x3c($s1)
 /* 90CE98 80240258 C62C0038 */  lwc1      $f12, 0x38($s1)
 /* 90CE9C 8024025C 44060000 */  mfc1      $a2, $f0
-/* 90CEA0 80240260 0C01BE3C */  jal       playFX_01
+/* 90CEA0 80240260 0C01BE3C */  jal       fx_big_smoke_puff
 /* 90CEA4 80240264 46027380 */   add.s    $f14, $f14, $f2
 /* 90CEA8 80240268 8E420074 */  lw        $v0, 0x74($s2)
 /* 90CEAC 8024026C 14500003 */  bne       $v0, $s0, .L8024027C
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s
index e1aaf60ce7..15607b91d0 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240A7C_91012C.s
@@ -315,7 +315,7 @@ glabel func_80240A7C_91012C
 /* 9105D0 80240F20 8E450038 */  lw        $a1, 0x38($s2)
 /* 9105D4 80240F24 8E46003C */  lw        $a2, 0x3c($s2)
 /* 9105D8 80240F28 8E470040 */  lw        $a3, 0x40($s2)
-/* 9105DC 80240F2C 0C01BECC */  jal       fx_walk
+/* 9105DC 80240F2C 0C01BECC */  jal       fx_walking_dust
 /* 9105E0 80240F30 24040002 */   addiu    $a0, $zero, 2
 /* 9105E4 80240F34 3C01C47A */  lui       $at, 0xc47a
 /* 9105E8 80240F38 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s
index 5120c0cb58..33ef2affbd 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240FB8_910668.s
@@ -88,7 +88,7 @@ glabel func_80240FB8_910668
 /* 91076C 802410BC 8E050038 */  lw        $a1, 0x38($s0)
 /* 910770 802410C0 8E06003C */  lw        $a2, 0x3c($s0)
 /* 910774 802410C4 8E070040 */  lw        $a3, 0x40($s0)
-/* 910778 802410C8 0C01BECC */  jal       fx_walk
+/* 910778 802410C8 0C01BECC */  jal       fx_walking_dust
 /* 91077C 802410CC 24040002 */   addiu    $a0, $zero, 2
 /* 910780 802410D0 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* 910784 802410D4 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80240FB8_910668
 /* 9109E4 80241334 8E050038 */  lw        $a1, 0x38($s0)
 /* 9109E8 80241338 8E06003C */  lw        $a2, 0x3c($s0)
 /* 9109EC 8024133C 8E070040 */  lw        $a3, 0x40($s0)
-/* 9109F0 80241340 0C01BECC */  jal       fx_walk
+/* 9109F0 80241340 0C01BECC */  jal       fx_walking_dust
 /* 9109F4 80241344 24040002 */   addiu    $a0, $zero, 2
 /* 9109F8 80241348 3C01C47A */  lui       $at, 0xc47a
 /* 9109FC 8024134C 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s
index ca7c47ef25..f0183cc49a 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s
@@ -54,7 +54,7 @@ glabel func_80242958_912008
 /* 9120B0 80242A00 8E06003C */  lw        $a2, 0x3c($s0)
 /* 9120B4 80242A04 8E050038 */  lw        $a1, 0x38($s0)
 /* 9120B8 80242A08 44071000 */  mfc1      $a3, $f2
-/* 9120BC 80242A0C 0C01BECC */  jal       fx_walk
+/* 9120BC 80242A0C 0C01BECC */  jal       fx_walking_dust
 /* 9120C0 80242A10 24040002 */   addiu    $a0, $zero, 2
 .L80242A14:
 /* 9120C4 80242A14 9602008E */  lhu       $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s
index b473ee6263..c9fdd7c396 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s
@@ -54,7 +54,7 @@ glabel func_80240694_916404
 /* 9164AC 8024073C 8E06003C */  lw        $a2, 0x3c($s0)
 /* 9164B0 80240740 8E050038 */  lw        $a1, 0x38($s0)
 /* 9164B4 80240744 44071000 */  mfc1      $a3, $f2
-/* 9164B8 80240748 0C01BECC */  jal       fx_walk
+/* 9164B8 80240748 0C01BECC */  jal       fx_walking_dust
 /* 9164BC 8024074C 24040002 */   addiu    $a0, $zero, 2
 .L80240750:
 /* 9164C0 80240750 9602008E */  lhu       $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s
index 875a7538c7..83832c9619 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s
@@ -54,7 +54,7 @@ glabel func_802409D4_919584
 /* 91962C 80240A7C 8E06003C */  lw        $a2, 0x3c($s0)
 /* 919630 80240A80 8E050038 */  lw        $a1, 0x38($s0)
 /* 919634 80240A84 44071000 */  mfc1      $a3, $f2
-/* 919638 80240A88 0C01BECC */  jal       fx_walk
+/* 919638 80240A88 0C01BECC */  jal       fx_walking_dust
 /* 91963C 80240A8C 24040002 */   addiu    $a0, $zero, 2
 .L80240A90:
 /* 919640 80240A90 9602008E */  lhu       $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s
index df41833fbf..88bc2eb2b7 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s
@@ -54,7 +54,7 @@ glabel func_80240714_91BFF4
 /* 91C09C 802407BC 8E06003C */  lw        $a2, 0x3c($s0)
 /* 91C0A0 802407C0 8E050038 */  lw        $a1, 0x38($s0)
 /* 91C0A4 802407C4 44071000 */  mfc1      $a3, $f2
-/* 91C0A8 802407C8 0C01BECC */  jal       fx_walk
+/* 91C0A8 802407C8 0C01BECC */  jal       fx_walking_dust
 /* 91C0AC 802407CC 24040002 */   addiu    $a0, $zero, 2
 .L802407D0:
 /* 91C0B0 802407D0 9602008E */  lhu       $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s
index 78c738c68e..85fbeb0534 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802408F0_91EE60.s
@@ -65,7 +65,7 @@ glabel func_802408F0_91EE60
 /* 91EF4C 802409DC 8C450048 */  lw        $a1, 0x48($v0)
 /* 91EF50 802409E0 8C470050 */  lw        $a3, 0x50($v0)
 /* 91EF54 802409E4 44060000 */  mfc1      $a2, $f0
-/* 91EF58 802409E8 0C01C5BC */  jal       playFX_51
+/* 91EF58 802409E8 0C01C5BC */  jal       fx_motion_blur_flame
 /* 91EF5C 802409EC 26310001 */   addiu    $s1, $s1, 1
 /* 91EF60 802409F0 AE020008 */  sw        $v0, 8($s0)
 /* 91EF64 802409F4 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024030C_B2084C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024030C_B2084C.s
index 40c4fab994..a66a962a4a 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024030C_B2084C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024030C_B2084C.s
@@ -9,7 +9,7 @@ glabel func_8024030C_B2084C
 /* B2085C 8024031C 0080382D */  daddu     $a3, $a0, $zero
 /* B20860 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B20864 80240324 AFA00010 */  sw        $zero, 0x10($sp)
-/* B20868 80240328 0C01CA54 */  jal       playFX_82
+/* B20868 80240328 0C01CA54 */  jal       fx_sun
 /* B2086C 8024032C AFA00014 */   sw       $zero, 0x14($sp)
 /* B20870 80240330 8FBF0018 */  lw        $ra, 0x18($sp)
 /* B20874 80240334 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s
index 481d8fe4bb..25949593c0 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80241134_B21674.s
@@ -20,7 +20,7 @@ glabel func_80241134_B21674
 /* B216B0 80241170 44050000 */  mfc1      $a1, $f0
 /* B216B4 80241174 44062000 */  mfc1      $a2, $f4
 /* B216B8 80241178 44071000 */  mfc1      $a3, $f2
-/* B216BC 8024117C 0C01C16C */  jal       playFX_23
+/* B216BC 8024117C 0C01C16C */  jal       fx_rising_bubble
 /* B216C0 80241180 E7A60010 */   swc1     $f6, 0x10($sp)
 .L80241184:
 /* B216C4 80241184 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_8024030C_B2833C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_8024030C_B2833C.s
index 99bcbf6f49..bf7dea1d9e 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_8024030C_B2833C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_01/B28030/func_8024030C_B2833C.s
@@ -9,7 +9,7 @@ glabel func_8024030C_B2833C
 /* B2834C 8024031C 0080382D */  daddu     $a3, $a0, $zero
 /* B28350 80240320 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B28354 80240324 AFA00010 */  sw        $zero, 0x10($sp)
-/* B28358 80240328 0C01CA54 */  jal       playFX_82
+/* B28358 80240328 0C01CA54 */  jal       fx_sun
 /* B2835C 8024032C AFA00014 */   sw       $zero, 0x14($sp)
 /* B28360 80240330 8FBF0018 */  lw        $ra, 0x18($sp)
 /* B28364 80240334 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s
index 3c24d81f13..6f642b810b 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C4A0/func_802403F8_B2C868.s
@@ -9,7 +9,7 @@ glabel func_802403F8_B2C868
 /* B2C878 80240408 0080382D */  daddu     $a3, $a0, $zero
 /* B2C87C 8024040C AFBF0018 */  sw        $ra, 0x18($sp)
 /* B2C880 80240410 AFA00010 */  sw        $zero, 0x10($sp)
-/* B2C884 80240414 0C01CA54 */  jal       playFX_82
+/* B2C884 80240414 0C01CA54 */  jal       fx_sun
 /* B2C888 80240418 AFA00014 */   sw       $zero, 0x14($sp)
 /* B2C88C 8024041C 8FBF0018 */  lw        $ra, 0x18($sp)
 /* B2C890 80240420 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s
index ccc555d3bd..237c17bb65 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241D84_B2E1F4.s
@@ -33,7 +33,7 @@ glabel func_80241D84_B2E1F4
 /* B2E264 80241DF4 4405B000 */  mfc1      $a1, $f22
 /* B2E268 80241DF8 4406A000 */  mfc1      $a2, $f20
 /* B2E26C 80241DFC 44071000 */  mfc1      $a3, $f2
-/* B2E270 80241E00 0C01C574 */  jal       playFX_4E
+/* B2E270 80241E00 0C01C574 */  jal       fx_quizmo_stage
 /* B2E274 80241E04 0000202D */   daddu    $a0, $zero, $zero
 /* B2E278 80241E08 0220202D */  daddu     $a0, $s1, $zero
 /* B2E27C 80241E0C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80241D84_B2E1F4
 /* B2E2D8 80241E68 4405B000 */  mfc1      $a1, $f22
 /* B2E2DC 80241E6C 4406A000 */  mfc1      $a2, $f20
 /* B2E2E0 80241E70 44071000 */  mfc1      $a3, $f2
-/* B2E2E4 80241E74 0C01C604 */  jal       playFX_54
+/* B2E2E4 80241E74 0C01C604 */  jal       fx_quizmo_audience
 /* B2E2E8 80241E78 0000202D */   daddu    $a0, $zero, $zero
 /* B2E2EC 80241E7C 0220202D */  daddu     $a0, $s1, $zero
 /* B2E2F0 80241E80 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80241D84_B2E1F4
 /* B2E358 80241EE8 44071000 */  mfc1      $a3, $f2
 /* B2E35C 80241EEC 0000202D */  daddu     $a0, $zero, $zero
 /* B2E360 80241EF0 AFA00014 */  sw        $zero, 0x14($sp)
-/* B2E364 80241EF4 0C01CA24 */  jal       playFX_80
+/* B2E364 80241EF4 0C01CA24 */  jal       fx_quizmo_assistant
 /* B2E368 80241EF8 E7A00010 */   swc1     $f0, 0x10($sp)
 /* B2E36C 80241EFC 8E030000 */  lw        $v1, ($s0)
 /* B2E370 80241F00 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s
index ffdd2c51b3..4988b055dd 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s
@@ -26,7 +26,7 @@ glabel func_8024260C_B2EA7C
 /* B2EACC 8024265C 00000000 */  nop
 .L80242660:
 /* B2EAD0 80242660 00A0302D */  daddu     $a2, $a1, $zero
-/* B2EAD4 80242664 0C01C5A4 */  jal       playFX_50
+/* B2EAD4 80242664 0C01C5A4 */  jal       fx_quizmo_answer
 /* B2EAD8 80242668 00A0382D */   daddu    $a3, $a1, $zero
 .L8024266C:
 /* B2EADC 8024266C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802405EC_B351BC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802405EC_B351BC.s
index 229b48142e..8d3e3df6d1 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802405EC_B351BC.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802405EC_B351BC.s
@@ -9,7 +9,7 @@ glabel func_802405EC_B351BC
 /* B351CC 802405FC 0080382D */  daddu     $a3, $a0, $zero
 /* B351D0 80240600 AFBF0018 */  sw        $ra, 0x18($sp)
 /* B351D4 80240604 AFA00010 */  sw        $zero, 0x10($sp)
-/* B351D8 80240608 0C01CA54 */  jal       playFX_82
+/* B351D8 80240608 0C01CA54 */  jal       fx_sun
 /* B351DC 8024060C AFA00014 */   sw       $zero, 0x14($sp)
 /* B351E0 80240610 8FBF0018 */  lw        $ra, 0x18($sp)
 /* B351E4 80240614 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s
index 2bcada3111..7b287fa5d0 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s
@@ -33,7 +33,7 @@ glabel func_8024230C_B36EDC
 /* B36F4C 8024237C 4405B000 */  mfc1      $a1, $f22
 /* B36F50 80242380 4406A000 */  mfc1      $a2, $f20
 /* B36F54 80242384 44071000 */  mfc1      $a3, $f2
-/* B36F58 80242388 0C01C574 */  jal       playFX_4E
+/* B36F58 80242388 0C01C574 */  jal       fx_quizmo_stage
 /* B36F5C 8024238C 0000202D */   daddu    $a0, $zero, $zero
 /* B36F60 80242390 0220202D */  daddu     $a0, $s1, $zero
 /* B36F64 80242394 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_8024230C_B36EDC
 /* B36FC0 802423F0 4405B000 */  mfc1      $a1, $f22
 /* B36FC4 802423F4 4406A000 */  mfc1      $a2, $f20
 /* B36FC8 802423F8 44071000 */  mfc1      $a3, $f2
-/* B36FCC 802423FC 0C01C604 */  jal       playFX_54
+/* B36FCC 802423FC 0C01C604 */  jal       fx_quizmo_audience
 /* B36FD0 80242400 0000202D */   daddu    $a0, $zero, $zero
 /* B36FD4 80242404 0220202D */  daddu     $a0, $s1, $zero
 /* B36FD8 80242408 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_8024230C_B36EDC
 /* B37040 80242470 44071000 */  mfc1      $a3, $f2
 /* B37044 80242474 0000202D */  daddu     $a0, $zero, $zero
 /* B37048 80242478 AFA00014 */  sw        $zero, 0x14($sp)
-/* B3704C 8024247C 0C01CA24 */  jal       playFX_80
+/* B3704C 8024247C 0C01CA24 */  jal       fx_quizmo_assistant
 /* B37050 80242480 E7A00010 */   swc1     $f0, 0x10($sp)
 /* B37054 80242484 8E030000 */  lw        $v1, ($s0)
 /* B37058 80242488 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s
index 013eee4683..0d99ea1b96 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s
@@ -26,7 +26,7 @@ glabel func_80242B94_B37764
 /* B377B4 80242BE4 00000000 */  nop
 .L80242BE8:
 /* B377B8 80242BE8 00A0302D */  daddu     $a2, $a1, $zero
-/* B377BC 80242BEC 0C01C5A4 */  jal       playFX_50
+/* B377BC 80242BEC 0C01C5A4 */  jal       fx_quizmo_answer
 /* B377C0 80242BF0 00A0382D */   daddu    $a3, $a1, $zero
 .L80242BF4:
 /* B377C4 80242BF4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s
index c0e889608a..1bb78729d4 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240C60_B5EF10.s
@@ -65,7 +65,7 @@ glabel func_80240C60_B5EF10
 /* B5EFFC 80240D4C 8C450048 */  lw        $a1, 0x48($v0)
 /* B5F000 80240D50 8C470050 */  lw        $a3, 0x50($v0)
 /* B5F004 80240D54 44060000 */  mfc1      $a2, $f0
-/* B5F008 80240D58 0C01C5BC */  jal       playFX_51
+/* B5F008 80240D58 0C01C5BC */  jal       fx_motion_blur_flame
 /* B5F00C 80240D5C 26310001 */   addiu    $s1, $s1, 1
 /* B5F010 80240D60 AE020008 */  sw        $v0, 8($s0)
 /* B5F014 80240D64 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
index 18264ec78d..8a61d33845 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
@@ -116,7 +116,7 @@ glabel func_802404E0_AD63B0
 /* AD6528 80240658 2442001E */  addiu     $v0, $v0, 0x1e
 /* AD652C 8024065C AFA20014 */  sw        $v0, 0x14($sp)
 /* AD6530 80240660 462010A0 */  cvt.s.d   $f2, $f2
-/* AD6534 80240664 0C01C994 */  jal       playFX_7A
+/* AD6534 80240664 0C01C994 */  jal       fx_ice_shard
 /* AD6538 80240668 E7A20010 */   swc1     $f2, 0x10($sp)
 /* AD653C 8024066C 0040802D */  daddu     $s0, $v0, $zero
 /* AD6540 80240670 8E02000C */  lw        $v0, 0xc($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s
index ebb3666077..2924aa69e3 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s
@@ -32,7 +32,7 @@ glabel func_80240264_B06C64
 /* B06CD0 802402D0 4406B000 */  mfc1      $a2, $f22
 /* B06CD4 802402D4 4407A000 */  mfc1      $a3, $f20
 /* B06CD8 802402D8 0000202D */  daddu     $a0, $zero, $zero
-/* B06CDC 802402DC 0C01C094 */  jal       playFX_1A
+/* B06CDC 802402DC 0C01C094 */  jal       fx_lens_flare
 /* B06CE0 802402E0 AFA20010 */   sw       $v0, 0x10($sp)
 /* B06CE4 802402E4 8FBF0020 */  lw        $ra, 0x20($sp)
 /* B06CE8 802402E8 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18_B07518.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18_B07518.s
index 649bc89600..55e2a051b1 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18_B07518.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18_B07518.s
@@ -22,7 +22,7 @@ glabel func_80240B18_B07518
 /* B0755C 80240B5C 44073000 */  mfc1      $a3, $f6
 /* B07560 80240B60 0000202D */  daddu     $a0, $zero, $zero
 /* B07564 80240B64 AFA20018 */  sw        $v0, 0x18($sp)
-/* B07568 80240B68 0C01C28C */  jal       playFX_2F
+/* B07568 80240B68 0C01C28C */  jal       fx_stars_orbiting
 /* B0756C 80240B6C AFA30014 */   sw       $v1, 0x14($sp)
 /* B07570 80240B70 8FA20020 */  lw        $v0, 0x20($sp)
 /* B07574 80240B74 AE020084 */  sw        $v0, 0x84($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60_B07660.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60_B07660.s
index 392c599d6b..92c3c6c6c4 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60_B07660.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60_B07660.s
@@ -22,7 +22,7 @@ glabel func_80240C60_B07660
 /* B076A4 80240CA4 44073000 */  mfc1      $a3, $f6
 /* B076A8 80240CA8 0000202D */  daddu     $a0, $zero, $zero
 /* B076AC 80240CAC AFA20018 */  sw        $v0, 0x18($sp)
-/* B076B0 80240CB0 0C01C28C */  jal       playFX_2F
+/* B076B0 80240CB0 0C01C28C */  jal       fx_stars_orbiting
 /* B076B4 80240CB4 AFA30014 */   sw       $v1, 0x14($sp)
 /* B076B8 80240CB8 8FA20020 */  lw        $v0, 0x20($sp)
 /* B076BC 80240CBC AE020084 */  sw        $v0, 0x84($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8_B078B8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8_B078B8.s
index 6e5a0c35dd..b4a33dd2cf 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8_B078B8.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8_B078B8.s
@@ -22,7 +22,7 @@ glabel func_80240EB8_B078B8
 /* B078FC 80240EFC 44073000 */  mfc1      $a3, $f6
 /* B07900 80240F00 0000202D */  daddu     $a0, $zero, $zero
 /* B07904 80240F04 AFA20018 */  sw        $v0, 0x18($sp)
-/* B07908 80240F08 0C01C28C */  jal       playFX_2F
+/* B07908 80240F08 0C01C28C */  jal       fx_stars_orbiting
 /* B0790C 80240F0C AFA30014 */   sw       $v1, 0x14($sp)
 /* B07910 80240F10 8FA20020 */  lw        $v0, 0x20($sp)
 /* B07914 80240F14 AE020084 */  sw        $v0, 0x84($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s
index a227c1728d..15ea5c3262 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405F0_8AC580.s
@@ -126,7 +126,7 @@ glabel func_802405F0_8AC580
 /* 8AC758 802407C8 8E050038 */  lw        $a1, 0x38($s0)
 /* 8AC75C 802407CC 8E070040 */  lw        $a3, 0x40($s0)
 /* 8AC760 802407D0 44061000 */  mfc1      $a2, $f2
-/* 8AC764 802407D4 0C01BFBC */  jal       playFX_11
+/* 8AC764 802407D4 0C01BFBC */  jal       fx_sparkles
 /* 8AC768 802407D8 0000202D */   daddu    $a0, $zero, $zero
 /* 8AC76C 802407DC 080902E5 */  j         .L80240B94
 /* 8AC770 802407E0 AE320070 */   sw       $s2, 0x70($s1)
@@ -195,7 +195,7 @@ glabel func_802405F0_8AC580
 /* 8AC868 802408D8 8E050038 */  lw        $a1, 0x38($s0)
 /* 8AC86C 802408DC 8E070040 */  lw        $a3, 0x40($s0)
 /* 8AC870 802408E0 44061000 */  mfc1      $a2, $f2
-/* 8AC874 802408E4 0C01BFBC */  jal       playFX_11
+/* 8AC874 802408E4 0C01BFBC */  jal       fx_sparkles
 /* 8AC878 802408E8 24040003 */   addiu    $a0, $zero, 3
 .L802408EC:
 /* 8AC87C 802408EC 8E22007C */  lw        $v0, 0x7c($s1)
@@ -278,7 +278,7 @@ glabel func_802405F0_8AC580
 /* 8AC9AC 80240A1C 8E050038 */  lw        $a1, 0x38($s0)
 /* 8AC9B0 80240A20 8E070040 */  lw        $a3, 0x40($s0)
 /* 8AC9B4 80240A24 44061000 */  mfc1      $a2, $f2
-/* 8AC9B8 80240A28 0C01BFBC */  jal       playFX_11
+/* 8AC9B8 80240A28 0C01BFBC */  jal       fx_sparkles
 /* 8AC9BC 80240A2C 24040003 */   addiu    $a0, $zero, 3
 .L80240A30:
 /* 8AC9C0 80240A30 8E2200BC */  lw        $v0, 0xbc($s1)
@@ -363,7 +363,7 @@ glabel func_802405F0_8AC580
 /* 8ACAF4 80240B64 8E050038 */  lw        $a1, 0x38($s0)
 /* 8ACAF8 80240B68 8E070040 */  lw        $a3, 0x40($s0)
 /* 8ACAFC 80240B6C 44061000 */  mfc1      $a2, $f2
-/* 8ACB00 80240B70 0C01BFBC */  jal       playFX_11
+/* 8ACB00 80240B70 0C01BFBC */  jal       fx_sparkles
 /* 8ACB04 80240B74 24040003 */   addiu    $a0, $zero, 3
 .L80240B78:
 /* 8ACB08 80240B78 C6020064 */  lwc1      $f2, 0x64($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s
index 3b87801887..eab0fd6e92 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240B00_8B0B70.s
@@ -33,7 +33,7 @@ glabel func_80240B00_8B0B70
 /* 8B0BE0 80240B70 4405B000 */  mfc1      $a1, $f22
 /* 8B0BE4 80240B74 4406A000 */  mfc1      $a2, $f20
 /* 8B0BE8 80240B78 44071000 */  mfc1      $a3, $f2
-/* 8B0BEC 80240B7C 0C01C574 */  jal       playFX_4E
+/* 8B0BEC 80240B7C 0C01C574 */  jal       fx_quizmo_stage
 /* 8B0BF0 80240B80 0000202D */   daddu    $a0, $zero, $zero
 /* 8B0BF4 80240B84 0220202D */  daddu     $a0, $s1, $zero
 /* 8B0BF8 80240B88 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80240B00_8B0B70
 /* 8B0C54 80240BE4 4405B000 */  mfc1      $a1, $f22
 /* 8B0C58 80240BE8 4406A000 */  mfc1      $a2, $f20
 /* 8B0C5C 80240BEC 44071000 */  mfc1      $a3, $f2
-/* 8B0C60 80240BF0 0C01C604 */  jal       playFX_54
+/* 8B0C60 80240BF0 0C01C604 */  jal       fx_quizmo_audience
 /* 8B0C64 80240BF4 0000202D */   daddu    $a0, $zero, $zero
 /* 8B0C68 80240BF8 0220202D */  daddu     $a0, $s1, $zero
 /* 8B0C6C 80240BFC 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80240B00_8B0B70
 /* 8B0CD4 80240C64 44071000 */  mfc1      $a3, $f2
 /* 8B0CD8 80240C68 0000202D */  daddu     $a0, $zero, $zero
 /* 8B0CDC 80240C6C AFA00014 */  sw        $zero, 0x14($sp)
-/* 8B0CE0 80240C70 0C01CA24 */  jal       playFX_80
+/* 8B0CE0 80240C70 0C01CA24 */  jal       fx_quizmo_assistant
 /* 8B0CE4 80240C74 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 8B0CE8 80240C78 8E030000 */  lw        $v1, ($s0)
 /* 8B0CEC 80240C7C 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s
index b53024e382..0abd0a297b 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241388_8B13F8.s
@@ -26,7 +26,7 @@ glabel func_80241388_8B13F8
 /* 8B1448 802413D8 00000000 */  nop
 .L802413DC:
 /* 8B144C 802413DC 00A0302D */  daddu     $a2, $a1, $zero
-/* 8B1450 802413E0 0C01C5A4 */  jal       playFX_50
+/* 8B1450 802413E0 0C01C5A4 */  jal       fx_quizmo_answer
 /* 8B1454 802413E4 00A0382D */   daddu    $a3, $a1, $zero
 .L802413E8:
 /* 8B1458 802413E8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s
index f73326340f..70f88b8010 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s
@@ -32,7 +32,7 @@ glabel func_802402A0_8DA3A0
 /* 8DA40C 8024030C 4406B000 */  mfc1      $a2, $f22
 /* 8DA410 80240310 4407A000 */  mfc1      $a3, $f20
 /* 8DA414 80240314 0000202D */  daddu     $a0, $zero, $zero
-/* 8DA418 80240318 0C01C094 */  jal       playFX_1A
+/* 8DA418 80240318 0C01C094 */  jal       fx_lens_flare
 /* 8DA41C 8024031C AFA20010 */   sw       $v0, 0x10($sp)
 /* 8DA420 80240320 8FBF0020 */  lw        $ra, 0x20($sp)
 /* 8DA424 80240324 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
index f2135326a0..36fd43ea5b 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240010_8FF680.s
@@ -26,7 +26,7 @@ glabel func_80240010_8FF680
 /* 8FF6D0 80240060 0000382D */  daddu     $a3, $zero, $zero
 /* 8FF6D4 80240064 E7B40010 */  swc1      $f20, 0x10($sp)
 /* 8FF6D8 80240068 AFA00014 */  sw        $zero, 0x14($sp)
-/* 8FF6DC 8024006C 0C01C97C */  jal       playFX_79
+/* 8FF6DC 8024006C 0C01C97C */  jal       fx_chapter_change
 /* 8FF6E0 80240070 00A0302D */   daddu    $a2, $a1, $zero
 /* 8FF6E4 80240074 3C018025 */  lui       $at, %hi(D_802483C0)
 /* 8FF6E8 80240078 AC2283C0 */  sw        $v0, %lo(D_802483C0)($at)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s
index e65bd3a21c..b637b00cf0 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s
@@ -57,7 +57,7 @@ glabel func_80240040_907A70
 /* 907B40 80240110 8E050000 */  lw        $a1, ($s0)
 /* 907B44 80240114 8E060004 */  lw        $a2, 4($s0)
 /* 907B48 80240118 8E070008 */  lw        $a3, 8($s0)
-/* 907B4C 8024011C 0C01C9AC */  jal       playFX_7B
+/* 907B4C 8024011C 0C01C9AC */  jal       fx_spirit_card
 /* 907B50 80240120 24040001 */   addiu    $a0, $zero, 1
 /* 907B54 80240124 AE020028 */  sw        $v0, 0x28($s0)
 /* 907B58 80240128 8C43000C */  lw        $v1, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s
index d2378aaddc..75a529614c 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s
@@ -30,7 +30,7 @@ glabel func_80240494_907EC4
 /* 907F28 802404F8 8C450000 */  lw        $a1, ($v0)
 /* 907F2C 802404FC 8C470008 */  lw        $a3, 8($v0)
 /* 907F30 80240500 44061000 */  mfc1      $a2, $f2
-/* 907F34 80240504 0C01C2EC */  jal       playFX_33
+/* 907F34 80240504 0C01C2EC */  jal       fx_radial_shimmer
 /* 907F38 80240508 2404000E */   addiu    $a0, $zero, 0xe
 /* 907F3C 8024050C 8FBF0020 */  lw        $ra, 0x20($sp)
 /* 907F40 80240510 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s
index 06953754f7..0a2ae9e277 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_8024088C_9082BC.s
@@ -27,7 +27,7 @@ glabel func_8024088C_9082BC
 /* 908314 802408E4 AFA00014 */  sw        $zero, 0x14($sp)
 /* 908318 802408E8 00C0382D */  daddu     $a3, $a2, $zero
 /* 90831C 802408EC 2484000A */  addiu     $a0, $a0, 0xa
-/* 908320 802408F0 0C01C97C */  jal       playFX_79
+/* 908320 802408F0 0C01C97C */  jal       fx_chapter_change
 /* 908324 802408F4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 908328 802408F8 AE62002C */  sw        $v0, 0x2c($s3)
 /* 90832C 802408FC AE400070 */  sw        $zero, 0x70($s2)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240CA8_9086D8.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240CA8_9086D8.s
index a5ccdf973c..73dbc76075 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240CA8_9086D8.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240CA8_9086D8.s
@@ -23,7 +23,7 @@ glabel func_80240CA8_9086D8
 /* 908720 80240CF0 8C450000 */  lw        $a1, ($v0)
 /* 908724 80240CF4 8C460004 */  lw        $a2, 4($v0)
 /* 908728 80240CF8 8C470008 */  lw        $a3, 8($v0)
-/* 90872C 80240CFC 0C01C8D4 */  jal       playFX_72
+/* 90872C 80240CFC 0C01C8D4 */  jal       fx_misc_particles
 /* 908730 80240D00 24040002 */   addiu    $a0, $zero, 2
 /* 908734 80240D04 8FBF0028 */  lw        $ra, 0x28($sp)
 /* 908738 80240D08 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s
index 9ce85f8fb4..1c15f66f07 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s
@@ -223,7 +223,7 @@ glabel func_80240C18_A491D8
 /* A49504 80240F44 E7A00018 */  swc1      $f0, 0x18($sp)
 /* A49508 80240F48 8E250038 */  lw        $a1, 0x38($s1)
 /* A4950C 80240F4C 8E270040 */  lw        $a3, 0x40($s1)
-/* A49510 80240F50 0C01BFD4 */  jal       playFX_12
+/* A49510 80240F50 0C01BFD4 */  jal       fx_shape_spell
 /* A49514 80240F54 0000202D */   daddu    $a0, $zero, $zero
 /* A49518 80240F58 AE420078 */  sw        $v0, 0x78($s2)
 /* A4951C 80240F5C A630008E */  sh        $s0, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s
index bbb6d08a16..748826c2c5 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s
@@ -100,7 +100,7 @@ glabel func_802416EC_A49CAC
 /* A49E24 80241864 44810000 */  mtc1      $at, $f0
 /* A49E28 80241868 2402000D */  addiu     $v0, $zero, 0xd
 /* A49E2C 8024186C AFA20014 */  sw        $v0, 0x14($sp)
-/* A49E30 80241870 0C01BFEC */  jal       playFX_13
+/* A49E30 80241870 0C01BFEC */  jal       fx_gather_energy_pink
 /* A49E34 80241874 E7A00010 */   swc1     $f0, 0x10($sp)
 /* A49E38 80241878 2402000F */  addiu     $v0, $zero, 0xf
 /* A49E3C 8024187C A602008E */  sh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s
index e7523fd26c..7fd79bee7d 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s
@@ -223,7 +223,7 @@ glabel func_80240270_A4CC90
 /* A4CFBC 8024059C E7A00018 */  swc1      $f0, 0x18($sp)
 /* A4CFC0 802405A0 8E250038 */  lw        $a1, 0x38($s1)
 /* A4CFC4 802405A4 8E270040 */  lw        $a3, 0x40($s1)
-/* A4CFC8 802405A8 0C01BFD4 */  jal       playFX_12
+/* A4CFC8 802405A8 0C01BFD4 */  jal       fx_shape_spell
 /* A4CFCC 802405AC 0000202D */   daddu    $a0, $zero, $zero
 /* A4CFD0 802405B0 AE420078 */  sw        $v0, 0x78($s2)
 /* A4CFD4 802405B4 A630008E */  sh        $s0, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s
index f38450b436..22d526b637 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s
@@ -100,7 +100,7 @@ glabel func_80240D44_A4D764
 /* A4D8DC 80240EBC 44810000 */  mtc1      $at, $f0
 /* A4D8E0 80240EC0 2402000D */  addiu     $v0, $zero, 0xd
 /* A4D8E4 80240EC4 AFA20014 */  sw        $v0, 0x14($sp)
-/* A4D8E8 80240EC8 0C01BFEC */  jal       playFX_13
+/* A4D8E8 80240EC8 0C01BFEC */  jal       fx_gather_energy_pink
 /* A4D8EC 80240ECC E7A00010 */   swc1     $f0, 0x10($sp)
 /* A4D8F0 80240ED0 2402000F */  addiu     $v0, $zero, 0xf
 /* A4D8F4 80240ED4 A602008E */  sh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s
index a5f19d2267..c4eab62446 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405FC_A4F5FC.s
@@ -315,7 +315,7 @@ glabel func_802405FC_A4F5FC
 /* A4FAA0 80240AA0 8E450038 */  lw        $a1, 0x38($s2)
 /* A4FAA4 80240AA4 8E46003C */  lw        $a2, 0x3c($s2)
 /* A4FAA8 80240AA8 8E470040 */  lw        $a3, 0x40($s2)
-/* A4FAAC 80240AAC 0C01BECC */  jal       fx_walk
+/* A4FAAC 80240AAC 0C01BECC */  jal       fx_walking_dust
 /* A4FAB0 80240AB0 24040002 */   addiu    $a0, $zero, 2
 /* A4FAB4 80240AB4 3C01C47A */  lui       $at, 0xc47a
 /* A4FAB8 80240AB8 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s
index b53d7a0bf7..fafea7935d 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s
@@ -88,7 +88,7 @@ glabel func_80240B38_A4FB38
 /* A4FC3C 80240C3C 8E050038 */  lw        $a1, 0x38($s0)
 /* A4FC40 80240C40 8E06003C */  lw        $a2, 0x3c($s0)
 /* A4FC44 80240C44 8E070040 */  lw        $a3, 0x40($s0)
-/* A4FC48 80240C48 0C01BECC */  jal       fx_walk
+/* A4FC48 80240C48 0C01BECC */  jal       fx_walking_dust
 /* A4FC4C 80240C4C 24040002 */   addiu    $a0, $zero, 2
 /* A4FC50 80240C50 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A4FC54 80240C54 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80240B38_A4FB38
 /* A4FEB4 80240EB4 8E050038 */  lw        $a1, 0x38($s0)
 /* A4FEB8 80240EB8 8E06003C */  lw        $a2, 0x3c($s0)
 /* A4FEBC 80240EBC 8E070040 */  lw        $a3, 0x40($s0)
-/* A4FEC0 80240EC0 0C01BECC */  jal       fx_walk
+/* A4FEC0 80240EC0 0C01BECC */  jal       fx_walking_dust
 /* A4FEC4 80240EC4 24040002 */   addiu    $a0, $zero, 2
 /* A4FEC8 80240EC8 3C01C47A */  lui       $at, 0xc47a
 /* A4FECC 80240ECC 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s
index 290d54c607..b6c47387ab 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024086C_A93FAC.s
@@ -315,7 +315,7 @@ glabel func_8024086C_A93FAC
 /* A94450 80240D10 8E450038 */  lw        $a1, 0x38($s2)
 /* A94454 80240D14 8E46003C */  lw        $a2, 0x3c($s2)
 /* A94458 80240D18 8E470040 */  lw        $a3, 0x40($s2)
-/* A9445C 80240D1C 0C01BECC */  jal       fx_walk
+/* A9445C 80240D1C 0C01BECC */  jal       fx_walking_dust
 /* A94460 80240D20 24040002 */   addiu    $a0, $zero, 2
 /* A94464 80240D24 3C01C47A */  lui       $at, 0xc47a
 /* A94468 80240D28 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s
index ecfb6e9b9e..c5e92586a4 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s
@@ -88,7 +88,7 @@ glabel func_80240DA8_A944E8
 /* A945EC 80240EAC 8E050038 */  lw        $a1, 0x38($s0)
 /* A945F0 80240EB0 8E06003C */  lw        $a2, 0x3c($s0)
 /* A945F4 80240EB4 8E070040 */  lw        $a3, 0x40($s0)
-/* A945F8 80240EB8 0C01BECC */  jal       fx_walk
+/* A945F8 80240EB8 0C01BECC */  jal       fx_walking_dust
 /* A945FC 80240EBC 24040002 */   addiu    $a0, $zero, 2
 /* A94600 80240EC0 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A94604 80240EC4 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80240DA8_A944E8
 /* A94864 80241124 8E050038 */  lw        $a1, 0x38($s0)
 /* A94868 80241128 8E06003C */  lw        $a2, 0x3c($s0)
 /* A9486C 8024112C 8E070040 */  lw        $a3, 0x40($s0)
-/* A94870 80241130 0C01BECC */  jal       fx_walk
+/* A94870 80241130 0C01BECC */  jal       fx_walking_dust
 /* A94874 80241134 24040002 */   addiu    $a0, $zero, 2
 /* A94878 80241138 3C01C47A */  lui       $at, 0xc47a
 /* A9487C 8024113C 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s
index 22c537ca03..2f3e02fcdc 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241F00_A95640.s
@@ -223,7 +223,7 @@ glabel func_80241F00_A95640
 /* A9596C 8024222C E7A00018 */  swc1      $f0, 0x18($sp)
 /* A95970 80242230 8E250038 */  lw        $a1, 0x38($s1)
 /* A95974 80242234 8E270040 */  lw        $a3, 0x40($s1)
-/* A95978 80242238 0C01BFD4 */  jal       playFX_12
+/* A95978 80242238 0C01BFD4 */  jal       fx_shape_spell
 /* A9597C 8024223C 0000202D */   daddu    $a0, $zero, $zero
 /* A95980 80242240 AE420078 */  sw        $v0, 0x78($s2)
 /* A95984 80242244 A630008E */  sh        $s0, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s
index cb24a179ca..643a3aff47 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s
@@ -103,7 +103,7 @@ glabel func_80242D3C_A9647C
 /* A96600 80242EC0 44810000 */  mtc1      $at, $f0
 /* A96604 80242EC4 2402000D */  addiu     $v0, $zero, 0xd
 /* A96608 80242EC8 AFA20014 */  sw        $v0, 0x14($sp)
-/* A9660C 80242ECC 0C01BFEC */  jal       playFX_13
+/* A9660C 80242ECC 0C01BFEC */  jal       fx_gather_energy_pink
 /* A96610 80242ED0 E7A00010 */   swc1     $f0, 0x10($sp)
 /* A96614 80242ED4 2402000F */  addiu     $v0, $zero, 0xf
 /* A96618 80242ED8 A602008E */  sh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s
index 4032a2d72b..96b758ec39 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802406CC_A99C5C.s
@@ -315,7 +315,7 @@ glabel func_802406CC_A99C5C
 /* A9A100 80240B70 8E450038 */  lw        $a1, 0x38($s2)
 /* A9A104 80240B74 8E46003C */  lw        $a2, 0x3c($s2)
 /* A9A108 80240B78 8E470040 */  lw        $a3, 0x40($s2)
-/* A9A10C 80240B7C 0C01BECC */  jal       fx_walk
+/* A9A10C 80240B7C 0C01BECC */  jal       fx_walking_dust
 /* A9A110 80240B80 24040002 */   addiu    $a0, $zero, 2
 /* A9A114 80240B84 3C01C47A */  lui       $at, 0xc47a
 /* A9A118 80240B88 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s
index 0579787d6e..16aad79f8e 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240C08_A9A198.s
@@ -88,7 +88,7 @@ glabel func_80240C08_A9A198
 /* A9A29C 80240D0C 8E050038 */  lw        $a1, 0x38($s0)
 /* A9A2A0 80240D10 8E06003C */  lw        $a2, 0x3c($s0)
 /* A9A2A4 80240D14 8E070040 */  lw        $a3, 0x40($s0)
-/* A9A2A8 80240D18 0C01BECC */  jal       fx_walk
+/* A9A2A8 80240D18 0C01BECC */  jal       fx_walking_dust
 /* A9A2AC 80240D1C 24040002 */   addiu    $a0, $zero, 2
 /* A9A2B0 80240D20 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A9A2B4 80240D24 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80240C08_A9A198
 /* A9A514 80240F84 8E050038 */  lw        $a1, 0x38($s0)
 /* A9A518 80240F88 8E06003C */  lw        $a2, 0x3c($s0)
 /* A9A51C 80240F8C 8E070040 */  lw        $a3, 0x40($s0)
-/* A9A520 80240F90 0C01BECC */  jal       fx_walk
+/* A9A520 80240F90 0C01BECC */  jal       fx_walking_dust
 /* A9A524 80240F94 24040002 */   addiu    $a0, $zero, 2
 /* A9A528 80240F98 3C01C47A */  lui       $at, 0xc47a
 /* A9A52C 80240F9C 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s
index 8703be147d..b3e2fc57a6 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802406CC_A9F40C.s
@@ -315,7 +315,7 @@ glabel func_802406CC_A9F40C
 /* A9F8B0 80240B70 8E450038 */  lw        $a1, 0x38($s2)
 /* A9F8B4 80240B74 8E46003C */  lw        $a2, 0x3c($s2)
 /* A9F8B8 80240B78 8E470040 */  lw        $a3, 0x40($s2)
-/* A9F8BC 80240B7C 0C01BECC */  jal       fx_walk
+/* A9F8BC 80240B7C 0C01BECC */  jal       fx_walking_dust
 /* A9F8C0 80240B80 24040002 */   addiu    $a0, $zero, 2
 /* A9F8C4 80240B84 3C01C47A */  lui       $at, 0xc47a
 /* A9F8C8 80240B88 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s
index 3c9e6ac8af..c6c8cc965c 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s
@@ -88,7 +88,7 @@ glabel func_80240C08_A9F948
 /* A9FA4C 80240D0C 8E050038 */  lw        $a1, 0x38($s0)
 /* A9FA50 80240D10 8E06003C */  lw        $a2, 0x3c($s0)
 /* A9FA54 80240D14 8E070040 */  lw        $a3, 0x40($s0)
-/* A9FA58 80240D18 0C01BECC */  jal       fx_walk
+/* A9FA58 80240D18 0C01BECC */  jal       fx_walking_dust
 /* A9FA5C 80240D1C 24040002 */   addiu    $a0, $zero, 2
 /* A9FA60 80240D20 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A9FA64 80240D24 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80240C08_A9F948
 /* A9FCC4 80240F84 8E050038 */  lw        $a1, 0x38($s0)
 /* A9FCC8 80240F88 8E06003C */  lw        $a2, 0x3c($s0)
 /* A9FCCC 80240F8C 8E070040 */  lw        $a3, 0x40($s0)
-/* A9FCD0 80240F90 0C01BECC */  jal       fx_walk
+/* A9FCD0 80240F90 0C01BECC */  jal       fx_walking_dust
 /* A9FCD4 80240F94 24040002 */   addiu    $a0, $zero, 2
 /* A9FCD8 80240F98 3C01C47A */  lui       $at, 0xc47a
 /* A9FCDC 80240F9C 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s
index 5e8282e220..790e19ad1e 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_80240048_AA2D68.s
@@ -249,7 +249,7 @@ glabel func_80240048_AA2D68
 /* AA30F0 802403D0 E7A20010 */  swc1      $f2, 0x10($sp)
 /* AA30F4 802403D4 8E250038 */  lw        $a1, 0x38($s1)
 /* AA30F8 802403D8 44072000 */  mfc1      $a3, $f4
-/* AA30FC 802403DC 0C01C184 */  jal       playFX_24
+/* AA30FC 802403DC 0C01C184 */  jal       fx_ring_blast
 /* AA3100 802403E0 0000202D */   daddu    $a0, $zero, $zero
 /* AA3104 802403E4 C620003C */  lwc1      $f0, 0x3c($s1)
 /* AA3108 802403E8 46140000 */  add.s     $f0, $f0, $f20
@@ -265,7 +265,7 @@ glabel func_80240048_AA2D68
 /* AA3130 80240410 E7A20010 */  swc1      $f2, 0x10($sp)
 /* AA3134 80240414 8E250038 */  lw        $a1, 0x38($s1)
 /* AA3138 80240418 44072000 */  mfc1      $a3, $f4
-/* AA313C 8024041C 0C01C1CC */  jal       playFX_27
+/* AA313C 8024041C 0C01C1CC */  jal       fx_smoke_burst
 /* AA3140 80240420 0000202D */   daddu    $a0, $zero, $zero
 /* AA3144 80240424 24020001 */  addiu     $v0, $zero, 1
 /* AA3148 80240428 A622008E */  sh        $v0, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s
index 215a2ea717..ce75416145 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s
@@ -315,7 +315,7 @@ glabel func_8024055C_A60F2C
 /* A613D0 80240A00 8E450038 */  lw        $a1, 0x38($s2)
 /* A613D4 80240A04 8E46003C */  lw        $a2, 0x3c($s2)
 /* A613D8 80240A08 8E470040 */  lw        $a3, 0x40($s2)
-/* A613DC 80240A0C 0C01BECC */  jal       fx_walk
+/* A613DC 80240A0C 0C01BECC */  jal       fx_walking_dust
 /* A613E0 80240A10 24040002 */   addiu    $a0, $zero, 2
 /* A613E4 80240A14 3C01C47A */  lui       $at, 0xc47a
 /* A613E8 80240A18 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s
index 3a15011b03..17d6b09532 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s
@@ -88,7 +88,7 @@ glabel func_80240A98_A61468
 /* A6156C 80240B9C 8E050038 */  lw        $a1, 0x38($s0)
 /* A61570 80240BA0 8E06003C */  lw        $a2, 0x3c($s0)
 /* A61574 80240BA4 8E070040 */  lw        $a3, 0x40($s0)
-/* A61578 80240BA8 0C01BECC */  jal       fx_walk
+/* A61578 80240BA8 0C01BECC */  jal       fx_walking_dust
 /* A6157C 80240BAC 24040002 */   addiu    $a0, $zero, 2
 /* A61580 80240BB0 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A61584 80240BB4 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80240A98_A61468
 /* A617E4 80240E14 8E050038 */  lw        $a1, 0x38($s0)
 /* A617E8 80240E18 8E06003C */  lw        $a2, 0x3c($s0)
 /* A617EC 80240E1C 8E070040 */  lw        $a3, 0x40($s0)
-/* A617F0 80240E20 0C01BECC */  jal       fx_walk
+/* A617F0 80240E20 0C01BECC */  jal       fx_walking_dust
 /* A617F4 80240E24 24040002 */   addiu    $a0, $zero, 2
 /* A617F8 80240E28 3C01C47A */  lui       $at, 0xc47a
 /* A617FC 80240E2C 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s
index 7f79df9f02..fda784ae44 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240220_A642B0.s
@@ -223,7 +223,7 @@ glabel func_80240220_A642B0
 /* A645DC 8024054C E7A00018 */  swc1      $f0, 0x18($sp)
 /* A645E0 80240550 8E250038 */  lw        $a1, 0x38($s1)
 /* A645E4 80240554 8E270040 */  lw        $a3, 0x40($s1)
-/* A645E8 80240558 0C01BFD4 */  jal       playFX_12
+/* A645E8 80240558 0C01BFD4 */  jal       fx_shape_spell
 /* A645EC 8024055C 0000202D */   daddu    $a0, $zero, $zero
 /* A645F0 80240560 AE420078 */  sw        $v0, 0x78($s2)
 /* A645F4 80240564 A630008E */  sh        $s0, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s
index b7f113582d..fbc9912f80 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s
@@ -100,7 +100,7 @@ glabel func_80240CF4_A64D84
 /* A64EFC 80240E6C 44810000 */  mtc1      $at, $f0
 /* A64F00 80240E70 2402000D */  addiu     $v0, $zero, 0xd
 /* A64F04 80240E74 AFA20014 */  sw        $v0, 0x14($sp)
-/* A64F08 80240E78 0C01BFEC */  jal       playFX_13
+/* A64F08 80240E78 0C01BFEC */  jal       fx_gather_energy_pink
 /* A64F0C 80240E7C E7A00010 */   swc1     $f0, 0x10($sp)
 /* A64F10 80240E80 2402000F */  addiu     $v0, $zero, 0xf
 /* A64F14 80240E84 A602008E */  sh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s
index 0e5de87886..b59a3f74ee 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_8024063C_A6773C.s
@@ -315,7 +315,7 @@ glabel func_8024063C_A6773C
 /* A67BE0 80240AE0 8E450038 */  lw        $a1, 0x38($s2)
 /* A67BE4 80240AE4 8E46003C */  lw        $a2, 0x3c($s2)
 /* A67BE8 80240AE8 8E470040 */  lw        $a3, 0x40($s2)
-/* A67BEC 80240AEC 0C01BECC */  jal       fx_walk
+/* A67BEC 80240AEC 0C01BECC */  jal       fx_walking_dust
 /* A67BF0 80240AF0 24040002 */   addiu    $a0, $zero, 2
 /* A67BF4 80240AF4 3C01C47A */  lui       $at, 0xc47a
 /* A67BF8 80240AF8 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s
index f7fdb2414a..5ed0b534fe 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s
@@ -88,7 +88,7 @@ glabel func_80240B78_A67C78
 /* A67D7C 80240C7C 8E050038 */  lw        $a1, 0x38($s0)
 /* A67D80 80240C80 8E06003C */  lw        $a2, 0x3c($s0)
 /* A67D84 80240C84 8E070040 */  lw        $a3, 0x40($s0)
-/* A67D88 80240C88 0C01BECC */  jal       fx_walk
+/* A67D88 80240C88 0C01BECC */  jal       fx_walking_dust
 /* A67D8C 80240C8C 24040002 */   addiu    $a0, $zero, 2
 /* A67D90 80240C90 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* A67D94 80240C94 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80240B78_A67C78
 /* A67FF4 80240EF4 8E050038 */  lw        $a1, 0x38($s0)
 /* A67FF8 80240EF8 8E06003C */  lw        $a2, 0x3c($s0)
 /* A67FFC 80240EFC 8E070040 */  lw        $a3, 0x40($s0)
-/* A68000 80240F00 0C01BECC */  jal       fx_walk
+/* A68000 80240F00 0C01BECC */  jal       fx_walking_dust
 /* A68004 80240F04 24040002 */   addiu    $a0, $zero, 2
 /* A68008 80240F08 3C01C47A */  lui       $at, 0xc47a
 /* A6800C 80240F0C 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s
index 7e24c3ef94..7d560138f1 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240CB4_A6F094.s
@@ -223,7 +223,7 @@ glabel func_80240CB4_A6F094
 /* A6F3C0 80240FE0 E7A00018 */  swc1      $f0, 0x18($sp)
 /* A6F3C4 80240FE4 8E250038 */  lw        $a1, 0x38($s1)
 /* A6F3C8 80240FE8 8E270040 */  lw        $a3, 0x40($s1)
-/* A6F3CC 80240FEC 0C01BFD4 */  jal       playFX_12
+/* A6F3CC 80240FEC 0C01BFD4 */  jal       fx_shape_spell
 /* A6F3D0 80240FF0 0000202D */   daddu    $a0, $zero, $zero
 /* A6F3D4 80240FF4 AE420078 */  sw        $v0, 0x78($s2)
 /* A6F3D8 80240FF8 A630008E */  sh        $s0, 0x8e($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s
index b71a048045..e806d6193d 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s
@@ -103,7 +103,7 @@ glabel func_80241AF0_A6FED0
 /* A70054 80241C74 44810000 */  mtc1      $at, $f0
 /* A70058 80241C78 2402000D */  addiu     $v0, $zero, 0xd
 /* A7005C 80241C7C AFA20014 */  sw        $v0, 0x14($sp)
-/* A70060 80241C80 0C01BFEC */  jal       playFX_13
+/* A70060 80241C80 0C01BFEC */  jal       fx_gather_energy_pink
 /* A70064 80241C84 E7A00010 */   swc1     $f0, 0x10($sp)
 /* A70068 80241C88 2402000F */  addiu     $v0, $zero, 0xf
 /* A7006C 80241C8C A602008E */  sh        $v0, 0x8e($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s
index b7795d93a1..17852ce5e2 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240910_C68A40.s
@@ -65,7 +65,7 @@ glabel func_80240910_C68A40
 /* C68B2C 802409FC 8C450048 */  lw        $a1, 0x48($v0)
 /* C68B30 80240A00 8C470050 */  lw        $a3, 0x50($v0)
 /* C68B34 80240A04 44060000 */  mfc1      $a2, $f0
-/* C68B38 80240A08 0C01C5BC */  jal       playFX_51
+/* C68B38 80240A08 0C01C5BC */  jal       fx_motion_blur_flame
 /* C68B3C 80240A0C 26310001 */   addiu    $s1, $s1, 1
 /* C68B40 80240A10 AE020008 */  sw        $v0, 8($s0)
 /* C68B44 80240A14 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
index 6794058fbd..c047de5d31 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s
@@ -44,7 +44,7 @@ glabel func_80240310_C6CC30
 /* C6CCC8 802403A8 8E050048 */  lw        $a1, 0x48($s0)
 /* C6CCCC 802403AC 8E06004C */  lw        $a2, 0x4c($s0)
 /* C6CCD0 802403B0 8E070050 */  lw        $a3, 0x50($s0)
-/* C6CCD4 802403B4 0C01C1CC */  jal       playFX_27
+/* C6CCD4 802403B4 0C01C1CC */  jal       fx_smoke_burst
 /* C6CCD8 802403B8 24040001 */   addiu    $a0, $zero, 1
 .L802403BC:
 /* C6CCDC 802403BC 8E220070 */  lw        $v0, 0x70($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
index 59f0ab3892..fca5ec0030 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s
@@ -44,7 +44,7 @@ glabel func_80240720_C6EA50
 /* C6EAE8 802407B8 8E050048 */  lw        $a1, 0x48($s0)
 /* C6EAEC 802407BC 8E06004C */  lw        $a2, 0x4c($s0)
 /* C6EAF0 802407C0 8E070050 */  lw        $a3, 0x50($s0)
-/* C6EAF4 802407C4 0C01C1CC */  jal       playFX_27
+/* C6EAF4 802407C4 0C01C1CC */  jal       fx_smoke_burst
 /* C6EAF8 802407C8 24040001 */   addiu    $a0, $zero, 1
 .L802407CC:
 /* C6EAFC 802407CC 8E220070 */  lw        $v0, 0x70($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s
index 81c204419e..4b4d7588a7 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240600_C772E0.s
@@ -65,7 +65,7 @@ glabel func_80240600_C772E0
 /* C773CC 802406EC 8C450048 */  lw        $a1, 0x48($v0)
 /* C773D0 802406F0 8C470050 */  lw        $a3, 0x50($v0)
 /* C773D4 802406F4 44060000 */  mfc1      $a2, $f0
-/* C773D8 802406F8 0C01C5BC */  jal       playFX_51
+/* C773D8 802406F8 0C01C5BC */  jal       fx_motion_blur_flame
 /* C773DC 802406FC 26310001 */   addiu    $s1, $s1, 1
 /* C773E0 80240700 AE020008 */  sw        $v0, 8($s0)
 /* C773E4 80240704 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s
index 0f6dc966e9..19d4232412 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s
@@ -10,8 +10,8 @@ dlabel D_80248370_C95F20
 
 glabel func_80240E2C_C8E9DC
 /* C8E9DC 80240E2C 27BDFF70 */  addiu     $sp, $sp, -0x90
-/* C8E9E0 80240E30 3C038025 */  lui       $v1, %hi(D_80248380)
-/* C8E9E4 80240E34 8C638380 */  lw        $v1, %lo(D_80248380)($v1)
+/* C8E9E0 80240E30 3C038025 */  lui       $v1, %hi(D_80248380_kzn_19)
+/* C8E9E4 80240E34 8C638380 */  lw        $v1, %lo(D_80248380_kzn_19)($v1)
 /* C8E9E8 80240E38 2402FFFF */  addiu     $v0, $zero, -1
 /* C8E9EC 80240E3C AFBF005C */  sw        $ra, 0x5c($sp)
 /* C8E9F0 80240E40 AFBE0058 */  sw        $fp, 0x58($sp)
@@ -135,8 +135,8 @@ glabel func_80240E2C_C8E9DC
 /* C8EB94 80240FE4 1440FFB1 */  bnez      $v0, .L80240EAC
 /* C8EB98 80240FE8 261001E0 */   addiu    $s0, $s0, 0x1e0
 /* C8EB9C 80240FEC 24020001 */  addiu     $v0, $zero, 1
-/* C8EBA0 80240FF0 3C018025 */  lui       $at, %hi(D_80248380)
-/* C8EBA4 80240FF4 AC228380 */  sw        $v0, %lo(D_80248380)($at)
+/* C8EBA0 80240FF0 3C018025 */  lui       $at, %hi(D_80248380_kzn_19)
+/* C8EBA4 80240FF4 AC228380 */  sw        $v0, %lo(D_80248380_kzn_19)($at)
 /* C8EBA8 80240FF8 0000382D */  daddu     $a3, $zero, $zero
 .L80240FFC:
 /* C8EBAC 80240FFC 3C02800A */  lui       $v0, %hi(gMasterGfxPos)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s
index 2e9d9a9878..6b6cd3275b 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413FC_C8EFAC.s
@@ -2,7 +2,7 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802413FC_C8EFAC
-/* C8EFAC 802413FC 3C018025 */  lui       $at, %hi(D_80248380)
-/* C8EFB0 80241400 AC208380 */  sw        $zero, %lo(D_80248380)($at)
+/* C8EFAC 802413FC 3C018025 */  lui       $at, %hi(D_80248380_kzn_19)
+/* C8EFB0 80241400 AC208380 */  sw        $zero, %lo(D_80248380_kzn_19)($at)
 /* C8EFB4 80241404 03E00008 */  jr        $ra
 /* C8EFB8 80241408 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s
index 9c77cb9685..ccc5dbe0d1 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s
@@ -16,8 +16,8 @@ glabel func_8024140C_C8EFBC
 /* C8EFE8 80241438 2402FFFF */  addiu     $v0, $zero, -1
 /* C8EFEC 8024143C 3C058024 */  lui       $a1, %hi(func_802413C0_C8EF70)
 /* C8EFF0 80241440 24A513C0 */  addiu     $a1, $a1, %lo(func_802413C0_C8EF70)
-/* C8EFF4 80241444 3C018025 */  lui       $at, %hi(D_80248380)
-/* C8EFF8 80241448 AC228380 */  sw        $v0, %lo(D_80248380)($at)
+/* C8EFF4 80241444 3C018025 */  lui       $at, %hi(D_80248380_kzn_19)
+/* C8EFF8 80241448 AC228380 */  sw        $v0, %lo(D_80248380_kzn_19)($at)
 /* C8EFFC 8024144C 0C048C56 */  jal       create_generic_entity_world
 /* C8F000 80241450 0000202D */   daddu    $a0, $zero, $zero
 /* C8F004 80241454 8FBF0014 */  lw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s
index 89ae4ffe66..b048b12ef9 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B50_C8F700.s
@@ -15,7 +15,7 @@ glabel func_80241B50_C8F700
 /* C8F728 80241B78 8FBF0014 */  lw        $ra, 0x14($sp)
 /* C8F72C 80241B7C 8FB00010 */  lw        $s0, 0x10($sp)
 /* C8F730 80241B80 24020002 */  addiu     $v0, $zero, 2
-/* C8F734 80241B84 3C018025 */  lui       $at, %hi(D_8024854C)
-/* C8F738 80241B88 AC23854C */  sw        $v1, %lo(D_8024854C)($at)
+/* C8F734 80241B84 3C018025 */  lui       $at, %hi(D_8024854C_kzn_19)
+/* C8F738 80241B88 AC23854C */  sw        $v1, %lo(D_8024854C_kzn_19)($at)
 /* C8F73C 80241B8C 03E00008 */  jr        $ra
 /* C8F740 80241B90 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s
index c91a6d0731..0d59b04736 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s
@@ -6,8 +6,8 @@ glabel func_80241B94_C8F744
 /* C8F748 80241B98 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C8F74C 80241B9C 0C00EABB */  jal       get_npc_unsafe
 /* C8F750 80241BA0 8C84008C */   lw       $a0, 0x8c($a0)
-/* C8F754 80241BA4 3C038025 */  lui       $v1, %hi(D_8024854C)
-/* C8F758 80241BA8 8C63854C */  lw        $v1, %lo(D_8024854C)($v1)
+/* C8F754 80241BA4 3C038025 */  lui       $v1, %hi(D_8024854C_kzn_19)
+/* C8F758 80241BA8 8C63854C */  lw        $v1, %lo(D_8024854C_kzn_19)($v1)
 /* C8F75C 80241BAC AC430028 */  sw        $v1, 0x28($v0)
 /* C8F760 80241BB0 8FBF0010 */  lw        $ra, 0x10($sp)
 /* C8F764 80241BB4 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s
index 0f6b175109..31950d7b0d 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s
@@ -33,7 +33,7 @@ glabel func_80240DA0_7EBAB0
 /* 7EBB20 80240E10 4405B000 */  mfc1      $a1, $f22
 /* 7EBB24 80240E14 4406A000 */  mfc1      $a2, $f20
 /* 7EBB28 80240E18 44071000 */  mfc1      $a3, $f2
-/* 7EBB2C 80240E1C 0C01C574 */  jal       playFX_4E
+/* 7EBB2C 80240E1C 0C01C574 */  jal       fx_quizmo_stage
 /* 7EBB30 80240E20 0000202D */   daddu    $a0, $zero, $zero
 /* 7EBB34 80240E24 0220202D */  daddu     $a0, $s1, $zero
 /* 7EBB38 80240E28 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80240DA0_7EBAB0
 /* 7EBB94 80240E84 4405B000 */  mfc1      $a1, $f22
 /* 7EBB98 80240E88 4406A000 */  mfc1      $a2, $f20
 /* 7EBB9C 80240E8C 44071000 */  mfc1      $a3, $f2
-/* 7EBBA0 80240E90 0C01C604 */  jal       playFX_54
+/* 7EBBA0 80240E90 0C01C604 */  jal       fx_quizmo_audience
 /* 7EBBA4 80240E94 0000202D */   daddu    $a0, $zero, $zero
 /* 7EBBA8 80240E98 0220202D */  daddu     $a0, $s1, $zero
 /* 7EBBAC 80240E9C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80240DA0_7EBAB0
 /* 7EBC14 80240F04 44071000 */  mfc1      $a3, $f2
 /* 7EBC18 80240F08 0000202D */  daddu     $a0, $zero, $zero
 /* 7EBC1C 80240F0C AFA00014 */  sw        $zero, 0x14($sp)
-/* 7EBC20 80240F10 0C01CA24 */  jal       playFX_80
+/* 7EBC20 80240F10 0C01CA24 */  jal       fx_quizmo_assistant
 /* 7EBC24 80240F14 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 7EBC28 80240F18 8E030000 */  lw        $v1, ($s0)
 /* 7EBC2C 80240F1C 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s
index 15269772e2..8262859a9e 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s
@@ -26,7 +26,7 @@ glabel func_80241628_7EC338
 /* 7EC388 80241678 00000000 */  nop
 .L8024167C:
 /* 7EC38C 8024167C 00A0302D */  daddu     $a2, $a1, $zero
-/* 7EC390 80241680 0C01C5A4 */  jal       playFX_50
+/* 7EC390 80241680 0C01C5A4 */  jal       fx_quizmo_answer
 /* 7EC394 80241684 00A0382D */   daddu    $a3, $a1, $zero
 .L80241688:
 /* 7EC398 80241688 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s
index 18702117db..7987a29c0b 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s
@@ -33,7 +33,7 @@ glabel func_80242680_802F00
 /* 802F70 802426F0 4405B000 */  mfc1      $a1, $f22
 /* 802F74 802426F4 4406A000 */  mfc1      $a2, $f20
 /* 802F78 802426F8 44071000 */  mfc1      $a3, $f2
-/* 802F7C 802426FC 0C01C574 */  jal       playFX_4E
+/* 802F7C 802426FC 0C01C574 */  jal       fx_quizmo_stage
 /* 802F80 80242700 0000202D */   daddu    $a0, $zero, $zero
 /* 802F84 80242704 0220202D */  daddu     $a0, $s1, $zero
 /* 802F88 80242708 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80242680_802F00
 /* 802FE4 80242764 4405B000 */  mfc1      $a1, $f22
 /* 802FE8 80242768 4406A000 */  mfc1      $a2, $f20
 /* 802FEC 8024276C 44071000 */  mfc1      $a3, $f2
-/* 802FF0 80242770 0C01C604 */  jal       playFX_54
+/* 802FF0 80242770 0C01C604 */  jal       fx_quizmo_audience
 /* 802FF4 80242774 0000202D */   daddu    $a0, $zero, $zero
 /* 802FF8 80242778 0220202D */  daddu     $a0, $s1, $zero
 /* 802FFC 8024277C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80242680_802F00
 /* 803064 802427E4 44071000 */  mfc1      $a3, $f2
 /* 803068 802427E8 0000202D */  daddu     $a0, $zero, $zero
 /* 80306C 802427EC AFA00014 */  sw        $zero, 0x14($sp)
-/* 803070 802427F0 0C01CA24 */  jal       playFX_80
+/* 803070 802427F0 0C01CA24 */  jal       fx_quizmo_assistant
 /* 803074 802427F4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 803078 802427F8 8E030000 */  lw        $v1, ($s0)
 /* 80307C 802427FC 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s
index 0535d958c4..b74ba0c681 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s
@@ -26,7 +26,7 @@ glabel func_80242F08_803788
 /* 8037D8 80242F58 00000000 */  nop
 .L80242F5C:
 /* 8037DC 80242F5C 00A0302D */  daddu     $a2, $a1, $zero
-/* 8037E0 80242F60 0C01C5A4 */  jal       playFX_50
+/* 8037E0 80242F60 0C01C5A4 */  jal       fx_quizmo_answer
 /* 8037E4 80242F64 00A0382D */   daddu    $a3, $a1, $zero
 .L80242F68:
 /* 8037E8 80242F68 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s
index 4bc070c579..4dc02e4818 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s
@@ -33,7 +33,7 @@ glabel func_80241F30_8251F0
 /* 825260 80241FA0 4405B000 */  mfc1      $a1, $f22
 /* 825264 80241FA4 4406A000 */  mfc1      $a2, $f20
 /* 825268 80241FA8 44071000 */  mfc1      $a3, $f2
-/* 82526C 80241FAC 0C01C574 */  jal       playFX_4E
+/* 82526C 80241FAC 0C01C574 */  jal       fx_quizmo_stage
 /* 825270 80241FB0 0000202D */   daddu    $a0, $zero, $zero
 /* 825274 80241FB4 0220202D */  daddu     $a0, $s1, $zero
 /* 825278 80241FB8 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80241F30_8251F0
 /* 8252D4 80242014 4405B000 */  mfc1      $a1, $f22
 /* 8252D8 80242018 4406A000 */  mfc1      $a2, $f20
 /* 8252DC 8024201C 44071000 */  mfc1      $a3, $f2
-/* 8252E0 80242020 0C01C604 */  jal       playFX_54
+/* 8252E0 80242020 0C01C604 */  jal       fx_quizmo_audience
 /* 8252E4 80242024 0000202D */   daddu    $a0, $zero, $zero
 /* 8252E8 80242028 0220202D */  daddu     $a0, $s1, $zero
 /* 8252EC 8024202C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80241F30_8251F0
 /* 825354 80242094 44071000 */  mfc1      $a3, $f2
 /* 825358 80242098 0000202D */  daddu     $a0, $zero, $zero
 /* 82535C 8024209C AFA00014 */  sw        $zero, 0x14($sp)
-/* 825360 802420A0 0C01CA24 */  jal       playFX_80
+/* 825360 802420A0 0C01CA24 */  jal       fx_quizmo_assistant
 /* 825364 802420A4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 825368 802420A8 8E030000 */  lw        $v1, ($s0)
 /* 82536C 802420AC 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s
index 4e60fe351f..55dbaffb9a 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s
@@ -26,7 +26,7 @@ glabel func_802427B8_825A78
 /* 825AC8 80242808 00000000 */  nop
 .L8024280C:
 /* 825ACC 8024280C 00A0302D */  daddu     $a2, $a1, $zero
-/* 825AD0 80242810 0C01C5A4 */  jal       playFX_50
+/* 825AD0 80242810 0C01C5A4 */  jal       fx_quizmo_answer
 /* 825AD4 80242814 00A0382D */   daddu    $a3, $a1, $zero
 .L80242818:
 /* 825AD8 80242818 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s
index 84ea3ef9c9..61bbdf4141 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s
@@ -33,7 +33,7 @@ glabel func_80240C20_832420
 /* 832490 80240C90 4405B000 */  mfc1      $a1, $f22
 /* 832494 80240C94 4406A000 */  mfc1      $a2, $f20
 /* 832498 80240C98 44071000 */  mfc1      $a3, $f2
-/* 83249C 80240C9C 0C01C574 */  jal       playFX_4E
+/* 83249C 80240C9C 0C01C574 */  jal       fx_quizmo_stage
 /* 8324A0 80240CA0 0000202D */   daddu    $a0, $zero, $zero
 /* 8324A4 80240CA4 0220202D */  daddu     $a0, $s1, $zero
 /* 8324A8 80240CA8 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80240C20_832420
 /* 832504 80240D04 4405B000 */  mfc1      $a1, $f22
 /* 832508 80240D08 4406A000 */  mfc1      $a2, $f20
 /* 83250C 80240D0C 44071000 */  mfc1      $a3, $f2
-/* 832510 80240D10 0C01C604 */  jal       playFX_54
+/* 832510 80240D10 0C01C604 */  jal       fx_quizmo_audience
 /* 832514 80240D14 0000202D */   daddu    $a0, $zero, $zero
 /* 832518 80240D18 0220202D */  daddu     $a0, $s1, $zero
 /* 83251C 80240D1C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80240C20_832420
 /* 832584 80240D84 44071000 */  mfc1      $a3, $f2
 /* 832588 80240D88 0000202D */  daddu     $a0, $zero, $zero
 /* 83258C 80240D8C AFA00014 */  sw        $zero, 0x14($sp)
-/* 832590 80240D90 0C01CA24 */  jal       playFX_80
+/* 832590 80240D90 0C01CA24 */  jal       fx_quizmo_assistant
 /* 832594 80240D94 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 832598 80240D98 8E030000 */  lw        $v1, ($s0)
 /* 83259C 80240D9C 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s
index 71d431f1ff..2288182d11 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s
@@ -26,7 +26,7 @@ glabel func_802414A8_832CA8
 /* 832CF8 802414F8 00000000 */  nop
 .L802414FC:
 /* 832CFC 802414FC 00A0302D */  daddu     $a2, $a1, $zero
-/* 832D00 80241500 0C01C5A4 */  jal       playFX_50
+/* 832D00 80241500 0C01C5A4 */  jal       fx_quizmo_answer
 /* 832D04 80241504 00A0382D */   daddu    $a3, $a1, $zero
 .L80241508:
 /* 832D08 80241508 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s
index 999fe82eeb..d0256b55e8 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s
@@ -28,7 +28,7 @@ glabel func_8024206C_83386C
 /* 8338C8 802420C8 AFA00014 */  sw        $zero, 0x14($sp)
 /* 8338CC 802420CC 00A0302D */  daddu     $a2, $a1, $zero
 /* 8338D0 802420D0 00A0382D */  daddu     $a3, $a1, $zero
-/* 8338D4 802420D4 0C01C9C4 */  jal       playFX_7C
+/* 8338D4 802420D4 0C01C9C4 */  jal       fx_lil_oink
 /* 8338D8 802420D8 AFA50010 */   sw       $a1, 0x10($sp)
 /* 8338DC 802420DC 0200202D */  daddu     $a0, $s0, $zero
 /* 8338E0 802420E0 3C05FD05 */  lui       $a1, 0xfd05
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s
index c06ba4d6fc..d965b745d4 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s
@@ -33,7 +33,7 @@ glabel func_80240BD0_8437A0
 /* 843810 80240C40 4405B000 */  mfc1      $a1, $f22
 /* 843814 80240C44 4406A000 */  mfc1      $a2, $f20
 /* 843818 80240C48 44071000 */  mfc1      $a3, $f2
-/* 84381C 80240C4C 0C01C574 */  jal       playFX_4E
+/* 84381C 80240C4C 0C01C574 */  jal       fx_quizmo_stage
 /* 843820 80240C50 0000202D */   daddu    $a0, $zero, $zero
 /* 843824 80240C54 0220202D */  daddu     $a0, $s1, $zero
 /* 843828 80240C58 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80240BD0_8437A0
 /* 843884 80240CB4 4405B000 */  mfc1      $a1, $f22
 /* 843888 80240CB8 4406A000 */  mfc1      $a2, $f20
 /* 84388C 80240CBC 44071000 */  mfc1      $a3, $f2
-/* 843890 80240CC0 0C01C604 */  jal       playFX_54
+/* 843890 80240CC0 0C01C604 */  jal       fx_quizmo_audience
 /* 843894 80240CC4 0000202D */   daddu    $a0, $zero, $zero
 /* 843898 80240CC8 0220202D */  daddu     $a0, $s1, $zero
 /* 84389C 80240CCC 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80240BD0_8437A0
 /* 843904 80240D34 44071000 */  mfc1      $a3, $f2
 /* 843908 80240D38 0000202D */  daddu     $a0, $zero, $zero
 /* 84390C 80240D3C AFA00014 */  sw        $zero, 0x14($sp)
-/* 843910 80240D40 0C01CA24 */  jal       playFX_80
+/* 843910 80240D40 0C01CA24 */  jal       fx_quizmo_assistant
 /* 843914 80240D44 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 843918 80240D48 8E030000 */  lw        $v1, ($s0)
 /* 84391C 80240D4C 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s
index 700aed0e62..c5a1ee5dda 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s
@@ -26,7 +26,7 @@ glabel func_80241458_844028
 /* 844078 802414A8 00000000 */  nop
 .L802414AC:
 /* 84407C 802414AC 00A0302D */  daddu     $a2, $a1, $zero
-/* 844080 802414B0 0C01C5A4 */  jal       playFX_50
+/* 844080 802414B0 0C01C5A4 */  jal       fx_quizmo_answer
 /* 844084 802414B4 00A0382D */   daddu    $a3, $a1, $zero
 .L802414B8:
 /* 844088 802414B8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s
index 742a5cecb5..f5b3775914 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s
@@ -33,7 +33,7 @@ glabel func_80241A90_853C00
 /* 853C70 80241B00 4405B000 */  mfc1      $a1, $f22
 /* 853C74 80241B04 4406A000 */  mfc1      $a2, $f20
 /* 853C78 80241B08 44071000 */  mfc1      $a3, $f2
-/* 853C7C 80241B0C 0C01C574 */  jal       playFX_4E
+/* 853C7C 80241B0C 0C01C574 */  jal       fx_quizmo_stage
 /* 853C80 80241B10 0000202D */   daddu    $a0, $zero, $zero
 /* 853C84 80241B14 0220202D */  daddu     $a0, $s1, $zero
 /* 853C88 80241B18 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80241A90_853C00
 /* 853CE4 80241B74 4405B000 */  mfc1      $a1, $f22
 /* 853CE8 80241B78 4406A000 */  mfc1      $a2, $f20
 /* 853CEC 80241B7C 44071000 */  mfc1      $a3, $f2
-/* 853CF0 80241B80 0C01C604 */  jal       playFX_54
+/* 853CF0 80241B80 0C01C604 */  jal       fx_quizmo_audience
 /* 853CF4 80241B84 0000202D */   daddu    $a0, $zero, $zero
 /* 853CF8 80241B88 0220202D */  daddu     $a0, $s1, $zero
 /* 853CFC 80241B8C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80241A90_853C00
 /* 853D64 80241BF4 44071000 */  mfc1      $a3, $f2
 /* 853D68 80241BF8 0000202D */  daddu     $a0, $zero, $zero
 /* 853D6C 80241BFC AFA00014 */  sw        $zero, 0x14($sp)
-/* 853D70 80241C00 0C01CA24 */  jal       playFX_80
+/* 853D70 80241C00 0C01CA24 */  jal       fx_quizmo_assistant
 /* 853D74 80241C04 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 853D78 80241C08 8E030000 */  lw        $v1, ($s0)
 /* 853D7C 80241C0C 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s
index b9aa30a24a..85bbd48f2e 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s
@@ -26,7 +26,7 @@ glabel func_80242318_854488
 /* 8544D8 80242368 00000000 */  nop
 .L8024236C:
 /* 8544DC 8024236C 00A0302D */  daddu     $a2, $a1, $zero
-/* 8544E0 80242370 0C01C5A4 */  jal       playFX_50
+/* 8544E0 80242370 0C01C5A4 */  jal       fx_quizmo_answer
 /* 8544E4 80242374 00A0382D */   daddu    $a3, $a1, $zero
 .L80242378:
 /* 8544E8 80242378 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
index e2b255509e..805810dac5 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s
@@ -28,7 +28,7 @@ glabel func_802431B0_855320
 /* 85537C 8024320C 4405B000 */  mfc1      $a1, $f22
 /* 855380 80243210 4406A000 */  mfc1      $a2, $f20
 /* 855384 80243214 4407C000 */  mfc1      $a3, $f24
-/* 855388 80243218 0C01C16C */  jal       playFX_23
+/* 855388 80243218 0C01C16C */  jal       fx_rising_bubble
 /* 85538C 8024321C E7A00010 */   swc1     $f0, 0x10($sp)
 /* 855390 80243220 24040046 */  addiu     $a0, $zero, 0x46
 /* 855394 80243224 4406B000 */  mfc1      $a2, $f22
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s
index 0e175327b4..863cd73c81 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s
@@ -23,7 +23,7 @@ glabel func_802415FC_86613C
 /* 866184 80241644 4405C000 */  mfc1      $a1, $f24
 /* 866188 80241648 4406A000 */  mfc1      $a2, $f20
 /* 86618C 8024164C 4407B000 */  mfc1      $a3, $f22
-/* 866190 80241650 0C01C16C */  jal       playFX_23
+/* 866190 80241650 0C01C16C */  jal       fx_rising_bubble
 /* 866194 80241654 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 866198 80241658 24040046 */  addiu     $a0, $zero, 0x46
 /* 86619C 8024165C 4406C000 */  mfc1      $a2, $f24
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
index 6d79f35c00..b6ac0c024a 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s
@@ -44,7 +44,7 @@ glabel func_80240F90_E136F0
 /* E13788 80241028 44070000 */  mfc1      $a3, $f0
 /* E1378C 8024102C 24040001 */  addiu     $a0, $zero, 1
 /* E13790 80241030 AFA00010 */  sw        $zero, 0x10($sp)
-/* E13794 80241034 0C01BECC */  jal       fx_walk
+/* E13794 80241034 0C01BECC */  jal       fx_walking_dust
 /* E13798 80241038 AFA00014 */   sw       $zero, 0x14($sp)
 /* E1379C 8024103C 8E240088 */  lw        $a0, 0x88($s1)
 /* E137A0 80241040 0C0441B4 */  jal       delete_entity
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
index cecb6aa6e1..5316423198 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s
@@ -176,7 +176,7 @@ glabel func_80241234_E13994
 /* E13C0C 802414AC 468010A0 */  cvt.s.w   $f2, $f2
 /* E13C10 802414B0 44071000 */  mfc1      $a3, $f2
 /* E13C14 802414B4 24040003 */  addiu     $a0, $zero, 3
-/* E13C18 802414B8 0C01BFBC */  jal       playFX_11
+/* E13C18 802414B8 0C01BFBC */  jal       fx_sparkles
 /* E13C1C 802414BC E7A00010 */   swc1     $f0, 0x10($sp)
 /* E13C20 802414C0 0C05272D */  jal       sfx_play_sound
 /* E13C24 802414C4 24040213 */   addiu    $a0, $zero, 0x213
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
index e016c886b4..972b8b5ac5 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240BB0_E16930.s
@@ -506,7 +506,7 @@ glabel func_80240BB0_E16930
 /* E170B8 80241338 AFA00014 */  sw        $zero, 0x14($sp)
 /* E170BC 8024133C 8E650038 */  lw        $a1, 0x38($s3)
 /* E170C0 80241340 44071000 */  mfc1      $a3, $f2
-/* E170C4 80241344 0C01BECC */  jal       fx_walk
+/* E170C4 80241344 0C01BECC */  jal       fx_walking_dust
 /* E170C8 80241348 24040001 */   addiu    $a0, $zero, 1
 /* E170CC 8024134C 080906CF */  j         .L80241B3C
 /* E170D0 80241350 2694001C */   addiu    $s4, $s4, 0x1c
@@ -730,7 +730,7 @@ glabel func_80240BB0_E16930
 /* E1740C 8024168C 8E650038 */  lw        $a1, 0x38($s3)
 /* E17410 80241690 8E66003C */  lw        $a2, 0x3c($s3)
 /* E17414 80241694 44071000 */  mfc1      $a3, $f2
-/* E17418 80241698 0C01C07C */  jal       playFX_19
+/* E17418 80241698 0C01C07C */  jal       fx_explosion
 /* E1741C 8024169C 0000202D */   daddu    $a0, $zero, $zero
 /* E17420 802416A0 24042076 */  addiu     $a0, $zero, 0x2076
 /* E17424 802416A4 2402001E */  addiu     $v0, $zero, 0x1e
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s
index 6f9ccea0de..47ad53a637 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s
@@ -60,7 +60,7 @@ glabel func_80241FE4_E17D64
 /* E17E3C 802420BC 8E050038 */  lw        $a1, 0x38($s0)
 /* E17E40 802420C0 8E06003C */  lw        $a2, 0x3c($s0)
 /* E17E44 802420C4 8E070040 */  lw        $a3, 0x40($s0)
-/* E17E48 802420C8 0C01BECC */  jal       fx_walk
+/* E17E48 802420C8 0C01BECC */  jal       fx_walking_dust
 /* E17E4C 802420CC 24040001 */   addiu    $a0, $zero, 1
 /* E17E50 802420D0 0C05272D */  jal       sfx_play_sound
 /* E17E54 802420D4 24040283 */   addiu    $a0, $zero, 0x283
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s
index 1e271e72bb..c75ffdac62 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802414D8_9C68B8.s
@@ -33,7 +33,7 @@ glabel func_802414D8_9C68B8
 /* 9C6928 80241548 4405B000 */  mfc1      $a1, $f22
 /* 9C692C 8024154C 4406A000 */  mfc1      $a2, $f20
 /* 9C6930 80241550 44071000 */  mfc1      $a3, $f2
-/* 9C6934 80241554 0C01C574 */  jal       playFX_4E
+/* 9C6934 80241554 0C01C574 */  jal       fx_quizmo_stage
 /* 9C6938 80241558 0000202D */   daddu    $a0, $zero, $zero
 /* 9C693C 8024155C 0220202D */  daddu     $a0, $s1, $zero
 /* 9C6940 80241560 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_802414D8_9C68B8
 /* 9C699C 802415BC 4405B000 */  mfc1      $a1, $f22
 /* 9C69A0 802415C0 4406A000 */  mfc1      $a2, $f20
 /* 9C69A4 802415C4 44071000 */  mfc1      $a3, $f2
-/* 9C69A8 802415C8 0C01C604 */  jal       playFX_54
+/* 9C69A8 802415C8 0C01C604 */  jal       fx_quizmo_audience
 /* 9C69AC 802415CC 0000202D */   daddu    $a0, $zero, $zero
 /* 9C69B0 802415D0 0220202D */  daddu     $a0, $s1, $zero
 /* 9C69B4 802415D4 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_802414D8_9C68B8
 /* 9C6A1C 8024163C 44071000 */  mfc1      $a3, $f2
 /* 9C6A20 80241640 0000202D */  daddu     $a0, $zero, $zero
 /* 9C6A24 80241644 AFA00014 */  sw        $zero, 0x14($sp)
-/* 9C6A28 80241648 0C01CA24 */  jal       playFX_80
+/* 9C6A28 80241648 0C01CA24 */  jal       fx_quizmo_assistant
 /* 9C6A2C 8024164C E7A00010 */   swc1     $f0, 0x10($sp)
 /* 9C6A30 80241650 8E030000 */  lw        $v1, ($s0)
 /* 9C6A34 80241654 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s
index a955ef43c2..ff10d1a4a2 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s
@@ -26,7 +26,7 @@ glabel func_80241D60_9C7140
 /* 9C7190 80241DB0 00000000 */  nop
 .L80241DB4:
 /* 9C7194 80241DB4 00A0302D */  daddu     $a2, $a1, $zero
-/* 9C7198 80241DB8 0C01C5A4 */  jal       playFX_50
+/* 9C7198 80241DB8 0C01C5A4 */  jal       fx_quizmo_answer
 /* 9C719C 80241DBC 00A0382D */   daddu    $a3, $a1, $zero
 .L80241DC0:
 /* 9C71A0 80241DC0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s
index 8d5386692a..e1fd348335 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s
@@ -35,7 +35,7 @@ glabel func_802426A4_9C7A84
 /* 9C7AFC 8024271C 4405B000 */  mfc1      $a1, $f22
 /* 9C7B00 80242720 44071000 */  mfc1      $a3, $f2
 /* 9C7B04 80242724 4406A000 */  mfc1      $a2, $f20
-/* 9C7B08 80242728 0C01C07C */  jal       playFX_19
+/* 9C7B08 80242728 0C01C07C */  jal       fx_explosion
 /* 9C7B0C 8024272C 0000202D */   daddu    $a0, $zero, $zero
 /* 9C7B10 80242730 0000202D */  daddu     $a0, $zero, $zero
 /* 9C7B14 80242734 0080282D */  daddu     $a1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s
index 2078ff155f..a0433bacd0 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7990/func_80240970_9D7990.s
@@ -24,7 +24,7 @@ glabel func_80240970_9D7990
 /* 9D79DC 802409BC 4407B000 */  mfc1      $a3, $f22
 /* 9D79E0 802409C0 24040002 */  addiu     $a0, $zero, 2
 /* 9D79E4 802409C4 AFA00010 */  sw        $zero, 0x10($sp)
-/* 9D79E8 802409C8 0C01BECC */  jal       fx_walk
+/* 9D79E8 802409C8 0C01BECC */  jal       fx_walking_dust
 /* 9D79EC 802409CC AFA00014 */   sw       $zero, 0x14($sp)
 /* 9D79F0 802409D0 0C00A67F */  jal       rand_int
 /* 9D79F4 802409D4 240400C8 */   addiu    $a0, $zero, 0xc8
@@ -42,7 +42,7 @@ glabel func_80240970_9D7990
 /* 9D7A24 80240A04 44060000 */  mfc1      $a2, $f0
 /* 9D7A28 80240A08 24040002 */  addiu     $a0, $zero, 2
 /* 9D7A2C 80240A0C AFA00010 */  sw        $zero, 0x10($sp)
-/* 9D7A30 80240A10 0C01BECC */  jal       fx_walk
+/* 9D7A30 80240A10 0C01BECC */  jal       fx_walking_dust
 /* 9D7A34 80240A14 AFA00014 */   sw       $zero, 0x14($sp)
 /* 9D7A38 80240A18 0C00A67F */  jal       rand_int
 /* 9D7A3C 80240A1C 240400C8 */   addiu    $a0, $zero, 0xc8
@@ -60,7 +60,7 @@ glabel func_80240970_9D7990
 /* 9D7A6C 80240A4C 44060000 */  mfc1      $a2, $f0
 /* 9D7A70 80240A50 24040002 */  addiu     $a0, $zero, 2
 /* 9D7A74 80240A54 AFA00010 */  sw        $zero, 0x10($sp)
-/* 9D7A78 80240A58 0C01BECC */  jal       fx_walk
+/* 9D7A78 80240A58 0C01BECC */  jal       fx_walking_dust
 /* 9D7A7C 80240A5C AFA00014 */   sw       $zero, 0x14($sp)
 /* 9D7A80 80240A60 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 9D7A84 80240A64 D7B60028 */  ldc1      $f22, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s
index 76481bff0b..3d5ad5c2b9 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s
@@ -33,7 +33,7 @@ glabel func_80242080_9D90A0
 /* 9D9110 802420F0 4405B000 */  mfc1      $a1, $f22
 /* 9D9114 802420F4 4406A000 */  mfc1      $a2, $f20
 /* 9D9118 802420F8 44071000 */  mfc1      $a3, $f2
-/* 9D911C 802420FC 0C01C574 */  jal       playFX_4E
+/* 9D911C 802420FC 0C01C574 */  jal       fx_quizmo_stage
 /* 9D9120 80242100 0000202D */   daddu    $a0, $zero, $zero
 /* 9D9124 80242104 0220202D */  daddu     $a0, $s1, $zero
 /* 9D9128 80242108 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80242080_9D90A0
 /* 9D9184 80242164 4405B000 */  mfc1      $a1, $f22
 /* 9D9188 80242168 4406A000 */  mfc1      $a2, $f20
 /* 9D918C 8024216C 44071000 */  mfc1      $a3, $f2
-/* 9D9190 80242170 0C01C604 */  jal       playFX_54
+/* 9D9190 80242170 0C01C604 */  jal       fx_quizmo_audience
 /* 9D9194 80242174 0000202D */   daddu    $a0, $zero, $zero
 /* 9D9198 80242178 0220202D */  daddu     $a0, $s1, $zero
 /* 9D919C 8024217C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80242080_9D90A0
 /* 9D9204 802421E4 44071000 */  mfc1      $a3, $f2
 /* 9D9208 802421E8 0000202D */  daddu     $a0, $zero, $zero
 /* 9D920C 802421EC AFA00014 */  sw        $zero, 0x14($sp)
-/* 9D9210 802421F0 0C01CA24 */  jal       playFX_80
+/* 9D9210 802421F0 0C01CA24 */  jal       fx_quizmo_assistant
 /* 9D9214 802421F4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* 9D9218 802421F8 8E030000 */  lw        $v1, ($s0)
 /* 9D921C 802421FC 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s
index d9ef19736e..9c2708a600 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242908_9D9928.s
@@ -26,7 +26,7 @@ glabel func_80242908_9D9928
 /* 9D9978 80242958 00000000 */  nop
 .L8024295C:
 /* 9D997C 8024295C 00A0302D */  daddu     $a2, $a1, $zero
-/* 9D9980 80242960 0C01C5A4 */  jal       playFX_50
+/* 9D9980 80242960 0C01C5A4 */  jal       fx_quizmo_answer
 /* 9D9984 80242964 00A0382D */   daddu    $a3, $a1, $zero
 .L80242968:
 /* 9D9988 80242968 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s
index e210c8c368..1aa60a4790 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s
@@ -35,7 +35,7 @@ glabel func_80243010_9DA030
 /* 9DA0A8 80243088 4405B000 */  mfc1      $a1, $f22
 /* 9DA0AC 8024308C 44071000 */  mfc1      $a3, $f2
 /* 9DA0B0 80243090 4406A000 */  mfc1      $a2, $f20
-/* 9DA0B4 80243094 0C01C07C */  jal       playFX_19
+/* 9DA0B4 80243094 0C01C07C */  jal       fx_explosion
 /* 9DA0B8 80243098 0000202D */   daddu    $a0, $zero, $zero
 /* 9DA0BC 8024309C 0000202D */  daddu     $a0, $zero, $zero
 /* 9DA0C0 802430A0 0080282D */  daddu     $a1, $a0, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190_BDA940.s b/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190_BDA940.s
index 0247f2d1ea..f715e9516e 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190_BDA940.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190_BDA940.s
@@ -29,7 +29,7 @@ glabel func_80240190_BDA940
 /* BDA9A0 802401F0 8E050000 */  lw        $a1, ($s0)
 /* BDA9A4 802401F4 8E060004 */  lw        $a2, 4($s0)
 /* BDA9A8 802401F8 8E070008 */  lw        $a3, 8($s0)
-/* BDA9AC 802401FC 0C01C9AC */  jal       playFX_7B
+/* BDA9AC 802401FC 0C01C9AC */  jal       fx_spirit_card
 /* BDA9B0 80240200 24040001 */   addiu    $a0, $zero, 1
 /* BDA9B4 80240204 AE02001C */  sw        $v0, 0x1c($s0)
 /* BDA9B8 80240208 8C43000C */  lw        $v1, 0xc($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s
index 5a6001fe81..80ea264172 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s
@@ -315,7 +315,7 @@ glabel func_80241EA4_D9F374
 /* D9F818 80242348 8E450038 */  lw        $a1, 0x38($s2)
 /* D9F81C 8024234C 8E46003C */  lw        $a2, 0x3c($s2)
 /* D9F820 80242350 8E470040 */  lw        $a3, 0x40($s2)
-/* D9F824 80242354 0C01BECC */  jal       fx_walk
+/* D9F824 80242354 0C01BECC */  jal       fx_walking_dust
 /* D9F828 80242358 24040002 */   addiu    $a0, $zero, 2
 /* D9F82C 8024235C 3C01C47A */  lui       $at, 0xc47a
 /* D9F830 80242360 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s
index 56153d8a8c..c992049838 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s
@@ -88,7 +88,7 @@ glabel func_802423E0_D9F8B0
 /* D9F9B4 802424E4 8E050038 */  lw        $a1, 0x38($s0)
 /* D9F9B8 802424E8 8E06003C */  lw        $a2, 0x3c($s0)
 /* D9F9BC 802424EC 8E070040 */  lw        $a3, 0x40($s0)
-/* D9F9C0 802424F0 0C01BECC */  jal       fx_walk
+/* D9F9C0 802424F0 0C01BECC */  jal       fx_walking_dust
 /* D9F9C4 802424F4 24040002 */   addiu    $a0, $zero, 2
 /* D9F9C8 802424F8 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* D9F9CC 802424FC 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_802423E0_D9F8B0
 /* D9FC2C 8024275C 8E050038 */  lw        $a1, 0x38($s0)
 /* D9FC30 80242760 8E06003C */  lw        $a2, 0x3c($s0)
 /* D9FC34 80242764 8E070040 */  lw        $a3, 0x40($s0)
-/* D9FC38 80242768 0C01BECC */  jal       fx_walk
+/* D9FC38 80242768 0C01BECC */  jal       fx_walking_dust
 /* D9FC3C 8024276C 24040002 */   addiu    $a0, $zero, 2
 /* D9FC40 80242770 3C01C47A */  lui       $at, 0xc47a
 /* D9FC44 80242774 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s
index a1f77598a2..af0796deb3 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s
@@ -315,7 +315,7 @@ glabel func_802428B4_DCF584
 /* DCFA28 80242D58 8E450038 */  lw        $a1, 0x38($s2)
 /* DCFA2C 80242D5C 8E46003C */  lw        $a2, 0x3c($s2)
 /* DCFA30 80242D60 8E470040 */  lw        $a3, 0x40($s2)
-/* DCFA34 80242D64 0C01BECC */  jal       fx_walk
+/* DCFA34 80242D64 0C01BECC */  jal       fx_walking_dust
 /* DCFA38 80242D68 24040002 */   addiu    $a0, $zero, 2
 /* DCFA3C 80242D6C 3C01C47A */  lui       $at, 0xc47a
 /* DCFA40 80242D70 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s
index 0f835aaa64..dc945c4873 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s
@@ -88,7 +88,7 @@ glabel func_80242DF0_DCFAC0
 /* DCFBC4 80242EF4 8E050038 */  lw        $a1, 0x38($s0)
 /* DCFBC8 80242EF8 8E06003C */  lw        $a2, 0x3c($s0)
 /* DCFBCC 80242EFC 8E070040 */  lw        $a3, 0x40($s0)
-/* DCFBD0 80242F00 0C01BECC */  jal       fx_walk
+/* DCFBD0 80242F00 0C01BECC */  jal       fx_walking_dust
 /* DCFBD4 80242F04 24040002 */   addiu    $a0, $zero, 2
 /* DCFBD8 80242F08 C64C006C */  lwc1      $f12, 0x6c($s2)
 /* DCFBDC 80242F0C 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80242DF0_DCFAC0
 /* DCFE3C 8024316C 8E050038 */  lw        $a1, 0x38($s0)
 /* DCFE40 80243170 8E06003C */  lw        $a2, 0x3c($s0)
 /* DCFE44 80243174 8E070040 */  lw        $a3, 0x40($s0)
-/* DCFE48 80243178 0C01BECC */  jal       fx_walk
+/* DCFE48 80243178 0C01BECC */  jal       fx_walking_dust
 /* DCFE4C 8024317C 24040002 */   addiu    $a0, $zero, 2
 /* DCFE50 80243180 3C01C47A */  lui       $at, 0xc47a
 /* DCFE54 80243184 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s
index c4807556b8..db8d4a9e38 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s
@@ -65,7 +65,7 @@ glabel func_80240D90_DDD5C0
 /* DDD6AC 80240E7C 8C450048 */  lw        $a1, 0x48($v0)
 /* DDD6B0 80240E80 8C470050 */  lw        $a3, 0x50($v0)
 /* DDD6B4 80240E84 44060000 */  mfc1      $a2, $f0
-/* DDD6B8 80240E88 0C01C5BC */  jal       playFX_51
+/* DDD6B8 80240E88 0C01C5BC */  jal       fx_motion_blur_flame
 /* DDD6BC 80240E8C 26310001 */   addiu    $s1, $s1, 1
 /* DDD6C0 80240E90 AE020008 */  sw        $v0, 8($s0)
 /* DDD6C4 80240E94 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s
index 987dade879..9ea6cfd084 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242A08_DF18A8.s
@@ -315,7 +315,7 @@ glabel func_80242A08_DF18A8
 /* DF1D4C 80242EAC 8E450038 */  lw        $a1, 0x38($s2)
 /* DF1D50 80242EB0 8E46003C */  lw        $a2, 0x3c($s2)
 /* DF1D54 80242EB4 8E470040 */  lw        $a3, 0x40($s2)
-/* DF1D58 80242EB8 0C01BECC */  jal       fx_walk
+/* DF1D58 80242EB8 0C01BECC */  jal       fx_walking_dust
 /* DF1D5C 80242EBC 24040002 */   addiu    $a0, $zero, 2
 /* DF1D60 80242EC0 3C01C47A */  lui       $at, 0xc47a
 /* DF1D64 80242EC4 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s
index 9b1f9d8f81..17b242aa25 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s
@@ -88,7 +88,7 @@ glabel func_80242F44_DF1DE4
 /* DF1EE8 80243048 8E050038 */  lw        $a1, 0x38($s0)
 /* DF1EEC 8024304C 8E06003C */  lw        $a2, 0x3c($s0)
 /* DF1EF0 80243050 8E070040 */  lw        $a3, 0x40($s0)
-/* DF1EF4 80243054 0C01BECC */  jal       fx_walk
+/* DF1EF4 80243054 0C01BECC */  jal       fx_walking_dust
 /* DF1EF8 80243058 24040002 */   addiu    $a0, $zero, 2
 /* DF1EFC 8024305C C64C006C */  lwc1      $f12, 0x6c($s2)
 /* DF1F00 80243060 0C00A6C9 */  jal       clamp_angle
@@ -253,7 +253,7 @@ glabel func_80242F44_DF1DE4
 /* DF2160 802432C0 8E050038 */  lw        $a1, 0x38($s0)
 /* DF2164 802432C4 8E06003C */  lw        $a2, 0x3c($s0)
 /* DF2168 802432C8 8E070040 */  lw        $a3, 0x40($s0)
-/* DF216C 802432CC 0C01BECC */  jal       fx_walk
+/* DF216C 802432CC 0C01BECC */  jal       fx_walking_dust
 /* DF2170 802432D0 24040002 */   addiu    $a0, $zero, 2
 /* DF2174 802432D4 3C01C47A */  lui       $at, 0xc47a
 /* DF2178 802432D8 44810000 */  mtc1      $at, $f0
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_8024030C_AACB3C.s b/ver/us/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_8024030C_AACB3C.s
index 3b0c9d7290..8a04229c35 100644
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_8024030C_AACB3C.s
+++ b/ver/us/asm/nonmatchings/world/area_osr/osr_00/AAC830/func_8024030C_AACB3C.s
@@ -10,7 +10,7 @@ glabel func_8024030C_AACB3C
 /* AACB50 80240320 AFA00014 */  sw        $zero, 0x14($sp)
 /* AACB54 80240324 E7A00010 */  swc1      $f0, 0x10($sp)
 /* AACB58 80240328 00A0302D */  daddu     $a2, $a1, $zero
-/* AACB5C 8024032C 0C01CA54 */  jal       playFX_82
+/* AACB5C 8024032C 0C01CA54 */  jal       fx_sun
 /* AACB60 80240330 00A0382D */   daddu    $a3, $a1, $zero
 /* AACB64 80240334 8FBF0018 */  lw        $ra, 0x18($sp)
 /* AACB68 80240338 24020002 */  addiu     $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s
index 39774682a1..2da45c7f2e 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80241310_D59BA0.s
@@ -30,7 +30,7 @@ glabel func_80241310_D59BA0
 /* D59C04 80241374 44060000 */  mfc1      $a2, $f0
 /* D59C08 80241378 44907000 */  mtc1      $s0, $f14
 /* D59C0C 8024137C 00000000 */  nop
-/* D59C10 80241380 0C01BE3C */  jal       playFX_01
+/* D59C10 80241380 0C01BE3C */  jal       fx_big_smoke_puff
 /* D59C14 80241384 468073A0 */   cvt.s.w  $f14, $f14
 /* D59C18 80241388 8FBF001C */  lw        $ra, 0x1c($sp)
 /* D59C1C 8024138C 8FB20018 */  lw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s
index 1d319b4411..60c7cd17d4 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80241310_D658F0.s
@@ -30,7 +30,7 @@ glabel func_80241310_D658F0
 /* D65954 80241374 44060000 */  mfc1      $a2, $f0
 /* D65958 80241378 44907000 */  mtc1      $s0, $f14
 /* D6595C 8024137C 00000000 */  nop
-/* D65960 80241380 0C01BE3C */  jal       playFX_01
+/* D65960 80241380 0C01BE3C */  jal       fx_big_smoke_puff
 /* D65964 80241384 468073A0 */   cvt.s.w  $f14, $f14
 /* D65968 80241388 8FBF001C */  lw        $ra, 0x1c($sp)
 /* D6596C 8024138C 8FB20018 */  lw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s
index f9c18ac0d9..61b80cea76 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241310_D6FCC0.s
@@ -30,7 +30,7 @@ glabel func_80241310_D6FCC0
 /* D6FD24 80241374 44060000 */  mfc1      $a2, $f0
 /* D6FD28 80241378 44907000 */  mtc1      $s0, $f14
 /* D6FD2C 8024137C 00000000 */  nop
-/* D6FD30 80241380 0C01BE3C */  jal       playFX_01
+/* D6FD30 80241380 0C01BE3C */  jal       fx_big_smoke_puff
 /* D6FD34 80241384 468073A0 */   cvt.s.w  $f14, $f14
 /* D6FD38 80241388 8FBF001C */  lw        $ra, 0x1c($sp)
 /* D6FD3C 8024138C 8FB20018 */  lw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s b/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s
index 167401649d..bfb2f23e3b 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802411D4_D7DD24.s
@@ -34,7 +34,7 @@ glabel func_802411D4_D7DD24
 /* D7DD98 80241248 46800020 */  cvt.s.w   $f0, $f0
 /* D7DD9C 8024124C 44070000 */  mfc1      $a3, $f0
 /* D7DDA0 80241250 0000202D */  daddu     $a0, $zero, $zero
-/* D7DDA4 80241254 0C01C16C */  jal       playFX_23
+/* D7DDA4 80241254 0C01C16C */  jal       fx_rising_bubble
 /* D7DDA8 80241258 AFA00010 */   sw       $zero, 0x10($sp)
 /* D7DDAC 8024125C 8FBF0024 */  lw        $ra, 0x24($sp)
 /* D7DDB0 80241260 8FB20020 */  lw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s
index 7df6051346..39574822b8 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240E70_CF89E0.s
@@ -33,7 +33,7 @@ glabel func_80240E70_CF89E0
 /* CF8A50 80240EE0 4405B000 */  mfc1      $a1, $f22
 /* CF8A54 80240EE4 4406A000 */  mfc1      $a2, $f20
 /* CF8A58 80240EE8 44071000 */  mfc1      $a3, $f2
-/* CF8A5C 80240EEC 0C01C574 */  jal       playFX_4E
+/* CF8A5C 80240EEC 0C01C574 */  jal       fx_quizmo_stage
 /* CF8A60 80240EF0 0000202D */   daddu    $a0, $zero, $zero
 /* CF8A64 80240EF4 0220202D */  daddu     $a0, $s1, $zero
 /* CF8A68 80240EF8 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80240E70_CF89E0
 /* CF8AC4 80240F54 4405B000 */  mfc1      $a1, $f22
 /* CF8AC8 80240F58 4406A000 */  mfc1      $a2, $f20
 /* CF8ACC 80240F5C 44071000 */  mfc1      $a3, $f2
-/* CF8AD0 80240F60 0C01C604 */  jal       playFX_54
+/* CF8AD0 80240F60 0C01C604 */  jal       fx_quizmo_audience
 /* CF8AD4 80240F64 0000202D */   daddu    $a0, $zero, $zero
 /* CF8AD8 80240F68 0220202D */  daddu     $a0, $s1, $zero
 /* CF8ADC 80240F6C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80240E70_CF89E0
 /* CF8B44 80240FD4 44071000 */  mfc1      $a3, $f2
 /* CF8B48 80240FD8 0000202D */  daddu     $a0, $zero, $zero
 /* CF8B4C 80240FDC AFA00014 */  sw        $zero, 0x14($sp)
-/* CF8B50 80240FE0 0C01CA24 */  jal       playFX_80
+/* CF8B50 80240FE0 0C01CA24 */  jal       fx_quizmo_assistant
 /* CF8B54 80240FE4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* CF8B58 80240FE8 8E030000 */  lw        $v1, ($s0)
 /* CF8B5C 80240FEC 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s
index dfcf719d8b..b8918eb141 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802416F8_CF9268.s
@@ -26,7 +26,7 @@ glabel func_802416F8_CF9268
 /* CF92B8 80241748 00000000 */  nop
 .L8024174C:
 /* CF92BC 8024174C 00A0302D */  daddu     $a2, $a1, $zero
-/* CF92C0 80241750 0C01C5A4 */  jal       playFX_50
+/* CF92C0 80241750 0C01C5A4 */  jal       fx_quizmo_answer
 /* CF92C4 80241754 00A0382D */   daddu    $a3, $a1, $zero
 .L80241758:
 /* CF92C8 80241758 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s
index 429335578b..300f81d68b 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024129C_D069CC.s
@@ -33,7 +33,7 @@ glabel func_8024129C_D069CC
 /* D06A3C 8024130C 4405B000 */  mfc1      $a1, $f22
 /* D06A40 80241310 4406A000 */  mfc1      $a2, $f20
 /* D06A44 80241314 44071000 */  mfc1      $a3, $f2
-/* D06A48 80241318 0C01C574 */  jal       playFX_4E
+/* D06A48 80241318 0C01C574 */  jal       fx_quizmo_stage
 /* D06A4C 8024131C 0000202D */   daddu    $a0, $zero, $zero
 /* D06A50 80241320 0220202D */  daddu     $a0, $s1, $zero
 /* D06A54 80241324 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_8024129C_D069CC
 /* D06AB0 80241380 4405B000 */  mfc1      $a1, $f22
 /* D06AB4 80241384 4406A000 */  mfc1      $a2, $f20
 /* D06AB8 80241388 44071000 */  mfc1      $a3, $f2
-/* D06ABC 8024138C 0C01C604 */  jal       playFX_54
+/* D06ABC 8024138C 0C01C604 */  jal       fx_quizmo_audience
 /* D06AC0 80241390 0000202D */   daddu    $a0, $zero, $zero
 /* D06AC4 80241394 0220202D */  daddu     $a0, $s1, $zero
 /* D06AC8 80241398 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_8024129C_D069CC
 /* D06B30 80241400 44071000 */  mfc1      $a3, $f2
 /* D06B34 80241404 0000202D */  daddu     $a0, $zero, $zero
 /* D06B38 80241408 AFA00014 */  sw        $zero, 0x14($sp)
-/* D06B3C 8024140C 0C01CA24 */  jal       playFX_80
+/* D06B3C 8024140C 0C01CA24 */  jal       fx_quizmo_assistant
 /* D06B40 80241410 E7A00010 */   swc1     $f0, 0x10($sp)
 /* D06B44 80241414 8E030000 */  lw        $v1, ($s0)
 /* D06B48 80241418 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s
index fe16f535fc..d4f8c4fd89 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s
@@ -26,7 +26,7 @@ glabel func_80241B24_D07254
 /* D072A4 80241B74 00000000 */  nop
 .L80241B78:
 /* D072A8 80241B78 00A0302D */  daddu     $a2, $a1, $zero
-/* D072AC 80241B7C 0C01C5A4 */  jal       playFX_50
+/* D072AC 80241B7C 0C01C5A4 */  jal       fx_quizmo_answer
 /* D072B0 80241B80 00A0382D */   daddu    $a3, $a1, $zero
 .L80241B84:
 /* D072B4 80241B84 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s
index 80404bd214..27fb585297 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s
@@ -65,7 +65,7 @@ glabel func_80240600_D30280
 /* D3036C 802406EC 8C450048 */  lw        $a1, 0x48($v0)
 /* D30370 802406F0 8C470050 */  lw        $a3, 0x50($v0)
 /* D30374 802406F4 44060000 */  mfc1      $a2, $f0
-/* D30378 802406F8 0C01C5BC */  jal       playFX_51
+/* D30378 802406F8 0C01C5BC */  jal       fx_motion_blur_flame
 /* D3037C 802406FC 26310001 */   addiu    $s1, $s1, 1
 /* D30380 80240700 AE020008 */  sw        $v0, 8($s0)
 /* D30384 80240704 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s
index ebb1864680..5e4dc90d45 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80241610_D31290.s
@@ -30,7 +30,7 @@ glabel func_80241610_D31290
 /* D312F4 80241674 44060000 */  mfc1      $a2, $f0
 /* D312F8 80241678 44907000 */  mtc1      $s0, $f14
 /* D312FC 8024167C 00000000 */  nop
-/* D31300 80241680 0C01BE3C */  jal       playFX_01
+/* D31300 80241680 0C01BE3C */  jal       fx_big_smoke_puff
 /* D31304 80241684 468073A0 */   cvt.s.w  $f14, $f14
 /* D31308 80241688 8FBF001C */  lw        $ra, 0x1c($sp)
 /* D3130C 8024168C 8FB20018 */  lw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s
index e07a419eb9..104d4dd293 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s
@@ -33,7 +33,7 @@ glabel func_80240F40_D3B510
 /* D3B580 80240FB0 4405B000 */  mfc1      $a1, $f22
 /* D3B584 80240FB4 4406A000 */  mfc1      $a2, $f20
 /* D3B588 80240FB8 44071000 */  mfc1      $a3, $f2
-/* D3B58C 80240FBC 0C01C574 */  jal       playFX_4E
+/* D3B58C 80240FBC 0C01C574 */  jal       fx_quizmo_stage
 /* D3B590 80240FC0 0000202D */   daddu    $a0, $zero, $zero
 /* D3B594 80240FC4 0220202D */  daddu     $a0, $s1, $zero
 /* D3B598 80240FC8 3C05F4AC */  lui       $a1, 0xf4ac
@@ -62,7 +62,7 @@ glabel func_80240F40_D3B510
 /* D3B5F4 80241024 4405B000 */  mfc1      $a1, $f22
 /* D3B5F8 80241028 4406A000 */  mfc1      $a2, $f20
 /* D3B5FC 8024102C 44071000 */  mfc1      $a3, $f2
-/* D3B600 80241030 0C01C604 */  jal       playFX_54
+/* D3B600 80241030 0C01C604 */  jal       fx_quizmo_audience
 /* D3B604 80241034 0000202D */   daddu    $a0, $zero, $zero
 /* D3B608 80241038 0220202D */  daddu     $a0, $s1, $zero
 /* D3B60C 8024103C 3C05F4AC */  lui       $a1, 0xf4ac
@@ -94,7 +94,7 @@ glabel func_80240F40_D3B510
 /* D3B674 802410A4 44071000 */  mfc1      $a3, $f2
 /* D3B678 802410A8 0000202D */  daddu     $a0, $zero, $zero
 /* D3B67C 802410AC AFA00014 */  sw        $zero, 0x14($sp)
-/* D3B680 802410B0 0C01CA24 */  jal       playFX_80
+/* D3B680 802410B0 0C01CA24 */  jal       fx_quizmo_assistant
 /* D3B684 802410B4 E7A00010 */   swc1     $f0, 0x10($sp)
 /* D3B688 802410B8 8E030000 */  lw        $v1, ($s0)
 /* D3B68C 802410BC 8C64000C */  lw        $a0, 0xc($v1)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s
index 0a5a1248ff..a9bc3cf24f 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802417C8_D3BD98.s
@@ -26,7 +26,7 @@ glabel func_802417C8_D3BD98
 /* D3BDE8 80241818 00000000 */  nop
 .L8024181C:
 /* D3BDEC 8024181C 00A0302D */  daddu     $a2, $a1, $zero
-/* D3BDF0 80241820 0C01C5A4 */  jal       playFX_50
+/* D3BDF0 80241820 0C01C5A4 */  jal       fx_quizmo_answer
 /* D3BDF4 80241824 00A0382D */   daddu    $a3, $a1, $zero
 .L80241828:
 /* D3BDF8 80241828 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
index 300d6e1f5d..7ee060b8ef 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
@@ -82,7 +82,7 @@ glabel func_80241DAC_D3C37C
 /* D3C484 80241EB4 44051000 */  mfc1      $a1, $f2
 /* D3C488 80241EB8 46203620 */  cvt.s.d   $f24, $f6
 /* D3C48C 80241EBC 44070000 */  mfc1      $a3, $f0
-/* D3C490 80241EC0 0C01C994 */  jal       playFX_7A
+/* D3C490 80241EC0 0C01C994 */  jal       fx_ice_shard
 /* D3C494 80241EC4 462025A0 */   cvt.s.d  $f22, $f4
 /* D3C498 80241EC8 0040802D */  daddu     $s0, $v0, $zero
 /* D3C49C 80241ECC 8E02000C */  lw        $v0, 0xc($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s
index c2360b7fbc..c767cd109f 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_12/D4BAB0/func_80240194_D4BBB4.s
@@ -34,7 +34,7 @@ glabel func_80240194_D4BBB4
 /* D4BC28 80240208 46800020 */  cvt.s.w   $f0, $f0
 /* D4BC2C 8024020C 44070000 */  mfc1      $a3, $f0
 /* D4BC30 80240210 0000202D */  daddu     $a0, $zero, $zero
-/* D4BC34 80240214 0C01C16C */  jal       playFX_23
+/* D4BC34 80240214 0C01C16C */  jal       fx_rising_bubble
 /* D4BC38 80240218 AFA00010 */   sw       $zero, 0x10($sp)
 /* D4BC3C 8024021C 8FBF0024 */  lw        $ra, 0x24($sp)
 /* D4BC40 80240220 8FB20020 */  lw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s
index 4b27e30eab..04c766529a 100644
--- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s
+++ b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240680_954640.s
@@ -65,7 +65,7 @@ glabel func_80240680_954640
 /* 95472C 8024076C 8C450048 */  lw        $a1, 0x48($v0)
 /* 954730 80240770 8C470050 */  lw        $a3, 0x50($v0)
 /* 954734 80240774 44060000 */  mfc1      $a2, $f0
-/* 954738 80240778 0C01C5BC */  jal       playFX_51
+/* 954738 80240778 0C01C5BC */  jal       fx_motion_blur_flame
 /* 95473C 8024077C 26310001 */   addiu    $s1, $s1, 1
 /* 954740 80240780 AE020008 */  sw        $v0, 8($s0)
 /* 954744 80240784 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s
index bf75b2dc96..f1e142fb9e 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s
@@ -65,7 +65,7 @@ glabel func_802408E0_87A4C0
 /* 87A5AC 802409CC 8C450048 */  lw        $a1, 0x48($v0)
 /* 87A5B0 802409D0 8C470050 */  lw        $a3, 0x50($v0)
 /* 87A5B4 802409D4 44060000 */  mfc1      $a2, $f0
-/* 87A5B8 802409D8 0C01C5BC */  jal       playFX_51
+/* 87A5B8 802409D8 0C01C5BC */  jal       fx_motion_blur_flame
 /* 87A5BC 802409DC 26310001 */   addiu    $s1, $s1, 1
 /* 87A5C0 802409E0 AE020008 */  sw        $v0, 8($s0)
 /* 87A5C4 802409E4 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s
index 7c85659732..f7741a413d 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s
@@ -65,7 +65,7 @@ glabel func_80240C80_887040
 /* 88712C 80240D6C 8C450048 */  lw        $a1, 0x48($v0)
 /* 887130 80240D70 8C470050 */  lw        $a3, 0x50($v0)
 /* 887134 80240D74 44060000 */  mfc1      $a2, $f0
-/* 887138 80240D78 0C01C5BC */  jal       playFX_51
+/* 887138 80240D78 0C01C5BC */  jal       fx_motion_blur_flame
 /* 88713C 80240D7C 26310001 */   addiu    $s1, $s1, 1
 /* 887140 80240D80 AE020008 */  sw        $v0, 8($s0)
 /* 887144 80240D84 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s
index 5ecc806d90..5e39e0aa41 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s
@@ -65,7 +65,7 @@ glabel func_8024121C_889DEC
 /* 889ED8 80241308 8C450048 */  lw        $a1, 0x48($v0)
 /* 889EDC 8024130C 8C470050 */  lw        $a3, 0x50($v0)
 /* 889EE0 80241310 44060000 */  mfc1      $a2, $f0
-/* 889EE4 80241314 0C01C5BC */  jal       playFX_51
+/* 889EE4 80241314 0C01C5BC */  jal       fx_motion_blur_flame
 /* 889EE8 80241318 26310001 */   addiu    $s1, $s1, 1
 /* 889EEC 8024131C AE020008 */  sw        $v0, 8($s0)
 /* 889EF0 80241320 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s
index 9ee8b42c68..b5a40f2cd5 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240630_893050.s
@@ -65,7 +65,7 @@ glabel func_80240630_893050
 /* 89313C 8024071C 8C450048 */  lw        $a1, 0x48($v0)
 /* 893140 80240720 8C470050 */  lw        $a3, 0x50($v0)
 /* 893144 80240724 44060000 */  mfc1      $a2, $f0
-/* 893148 80240728 0C01C5BC */  jal       playFX_51
+/* 893148 80240728 0C01C5BC */  jal       fx_motion_blur_flame
 /* 89314C 8024072C 26310001 */   addiu    $s1, $s1, 1
 /* 893150 80240730 AE020008 */  sw        $v0, 8($s0)
 /* 893154 80240734 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s
index 4a26eafa48..3af7c7b449 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s
@@ -65,7 +65,7 @@ glabel func_80240BF0_8981D0
 /* 8982BC 80240CDC 8C450048 */  lw        $a1, 0x48($v0)
 /* 8982C0 80240CE0 8C470050 */  lw        $a3, 0x50($v0)
 /* 8982C4 80240CE4 44060000 */  mfc1      $a2, $f0
-/* 8982C8 80240CE8 0C01C5BC */  jal       playFX_51
+/* 8982C8 80240CE8 0C01C5BC */  jal       fx_motion_blur_flame
 /* 8982CC 80240CEC 26310001 */   addiu    $s1, $s1, 1
 /* 8982D0 80240CF0 AE020008 */  sw        $v0, 8($s0)
 /* 8982D4 80240CF4 E614002C */  swc1      $f20, 0x2c($s0)
diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s
index 327c7860a6..7bce15444e 100644
--- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s
+++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s
@@ -52,7 +52,7 @@ glabel func_802427FC_9B917C
 /* 9B9238 802428B8 44071000 */  mfc1      $a3, $f2
 /* 9B923C 802428BC 46000007 */  neg.s     $f0, $f0
 /* 9B9240 802428C0 E7B40010 */  swc1      $f20, 0x10($sp)
-/* 9B9244 802428C4 0C01BECC */  jal       fx_walk
+/* 9B9244 802428C4 0C01BECC */  jal       fx_walking_dust
 /* 9B9248 802428C8 E7A00014 */   swc1     $f0, 0x14($sp)
 /* 9B924C 802428CC 8FBF0028 */  lw        $ra, 0x28($sp)
 /* 9B9250 802428D0 8FB30024 */  lw        $s3, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s
index f618bb6444..f61aa34705 100644
--- a/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s
+++ b/ver/us/asm/nonmatchings/world/partner/bombette/func_802BD758_3184A8.s
@@ -505,7 +505,7 @@ glabel func_802BD758_3184A8
 /* 318BE8 802BDE98 00501021 */  addu      $v0, $v0, $s0
 /* 318BEC 802BDE9C 80440015 */  lb        $a0, 0x15($v0)
 /* 318BF0 802BDEA0 44061000 */  mfc1      $a2, $f2
-/* 318BF4 802BDEA4 0C01C07C */  jal       playFX_19
+/* 318BF4 802BDEA4 0C01C07C */  jal       fx_explosion
 /* 318BF8 802BDEA8 00000000 */   nop
 /* 318BFC 802BDEAC 82020012 */  lb        $v0, 0x12($s0)
 /* 318C00 802BDEB0 000210C0 */  sll       $v0, $v0, 3
diff --git a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
index d025f8c700..2ddce00e39 100644
--- a/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
+++ b/ver/us/asm/nonmatchings/world/partner/kooper/func_802BD638_31B658.s
@@ -461,7 +461,7 @@ glabel func_802BD638_31B658
 /* 31BCE8 802BDCC8 8E050038 */  lw        $a1, 0x38($s0)
 /* 31BCEC 802BDCCC 8E070040 */  lw        $a3, 0x40($s0)
 /* 31BCF0 802BDCD0 44062000 */  mfc1      $a2, $f4
-/* 31BCF4 802BDCD4 0C01C064 */  jal       playFX_18
+/* 31BCF4 802BDCD4 0C01C064 */  jal       fx_damage_stars
 /* 31BCF8 802BDCD8 0240202D */   daddu    $a0, $s2, $zero
 /* 31BCFC 802BDCDC 0C039823 */  jal       start_bounce_b
 /* 31BD00 802BDCE0 00000000 */   nop
@@ -568,7 +568,7 @@ glabel func_802BD638_31B658
 /* 31BE84 802BDE64 8E050038 */  lw        $a1, 0x38($s0)
 /* 31BE88 802BDE68 8E070040 */  lw        $a3, 0x40($s0)
 /* 31BE8C 802BDE6C 44062000 */  mfc1      $a2, $f4
-/* 31BE90 802BDE70 0C01C064 */  jal       playFX_18
+/* 31BE90 802BDE70 0C01C064 */  jal       fx_damage_stars
 /* 31BE94 802BDE74 24040003 */   addiu    $a0, $zero, 3
 /* 31BE98 802BDE78 0000202D */  daddu     $a0, $zero, $zero
 /* 31BE9C 802BDE7C 0080282D */  daddu     $a1, $a0, $zero
@@ -728,7 +728,7 @@ glabel func_802BD638_31B658
 /* 31C0F8 802BE0D8 8E050038 */  lw        $a1, 0x38($s0)
 /* 31C0FC 802BE0DC 8E070040 */  lw        $a3, 0x40($s0)
 /* 31C100 802BE0E0 44062000 */  mfc1      $a2, $f4
-/* 31C104 802BE0E4 0C01C064 */  jal       playFX_18
+/* 31C104 802BE0E4 0C01C064 */  jal       fx_damage_stars
 /* 31C108 802BE0E8 24040003 */   addiu    $a0, $zero, 3
 /* 31C10C 802BE0EC 0000202D */  daddu     $a0, $zero, $zero
 /* 31C110 802BE0F0 0080282D */  daddu     $a1, $a0, $zero
@@ -1056,7 +1056,7 @@ glabel func_802BD638_31B658
 /* 31C5E0 802BE5C0 8E050038 */  lw        $a1, 0x38($s0)
 /* 31C5E4 802BE5C4 8E070040 */  lw        $a3, 0x40($s0)
 /* 31C5E8 802BE5C8 44062000 */  mfc1      $a2, $f4
-/* 31C5EC 802BE5CC 0C01C064 */  jal       playFX_18
+/* 31C5EC 802BE5CC 0C01C064 */  jal       fx_damage_stars
 /* 31C5F0 802BE5D0 24040003 */   addiu    $a0, $zero, 3
 /* 31C5F4 802BE5D4 080AF9C0 */  j         .L802BE700
 /* 31C5F8 802BE5D8 AEA00070 */   sw       $zero, 0x70($s5)
diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
index 0130f5e3d5..c81d73ca7a 100644
--- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
+++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BD414_31E184.s
@@ -666,7 +666,7 @@ glabel func_802BD414_31E184
 /* 31EB44 802BDDD4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 31EB48 802BDDD8 8E050038 */  lw        $a1, 0x38($s0)
 /* 31EB4C 802BDDDC 8E070040 */  lw        $a3, 0x40($s0)
-/* 31EB50 802BDDE0 0C01C16C */  jal       playFX_23
+/* 31EB50 802BDDE0 0C01C16C */  jal       fx_rising_bubble
 /* 31EB54 802BDDE4 0000202D */   daddu    $a0, $zero, $zero
 .L802BDDE8:
 /* 31EB58 802BDDE8 8E220000 */  lw        $v0, ($s1)
@@ -836,7 +836,7 @@ glabel func_802BD414_31E184
 /* 31EDD8 802BE068 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 31EDDC 802BE06C 8E050038 */  lw        $a1, 0x38($s0)
 /* 31EDE0 802BE070 8E070040 */  lw        $a3, 0x40($s0)
-/* 31EDE4 802BE074 0C01C16C */  jal       playFX_23
+/* 31EDE4 802BE074 0C01C16C */  jal       fx_rising_bubble
 /* 31EDE8 802BE078 0000202D */   daddu    $a0, $zero, $zero
 /* 31EDEC 802BE07C 080AF893 */  j         .L802BE24C
 /* 31EDF0 802BE080 00000000 */   nop
@@ -898,7 +898,7 @@ glabel func_802BD414_31E184
 /* 31EEC8 802BE158 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 31EECC 802BE15C 8E050038 */  lw        $a1, 0x38($s0)
 /* 31EED0 802BE160 8E070040 */  lw        $a3, 0x40($s0)
-/* 31EED4 802BE164 0C01C16C */  jal       playFX_23
+/* 31EED4 802BE164 0C01C16C */  jal       fx_rising_bubble
 /* 31EED8 802BE168 0000202D */   daddu    $a0, $zero, $zero
 .L802BE16C:
 /* 31EEDC 802BE16C 860200A8 */  lh        $v0, 0xa8($s0)
diff --git a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
index e9f6be77d8..9c6d9d7625 100644
--- a/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
+++ b/ver/us/asm/nonmatchings/world/partner/sushie/func_802BE3A4_31F114.s
@@ -398,7 +398,7 @@ glabel func_802BE3A4_31F114
 /* 31F6EC 802BE97C 8E250038 */  lw        $a1, 0x38($s1)
 /* 31F6F0 802BE980 8E270040 */  lw        $a3, 0x40($s1)
 /* 31F6F4 802BE984 44061000 */  mfc1      $a2, $f2
-/* 31F6F8 802BE988 0C01C16C */  jal       playFX_23
+/* 31F6F8 802BE988 0C01C16C */  jal       fx_rising_bubble
 /* 31F6FC 802BE98C 0000202D */   daddu    $a0, $zero, $zero
 /* 31F700 802BE990 080AFD3D */  j         .L802BF4F4
 /* 31F704 802BE994 0000102D */   daddu    $v0, $zero, $zero
@@ -417,7 +417,7 @@ glabel func_802BE3A4_31F114
 /* 31F734 802BE9C4 8E250038 */  lw        $a1, 0x38($s1)
 /* 31F738 802BE9C8 8E270040 */  lw        $a3, 0x40($s1)
 /* 31F73C 802BE9CC 44061000 */  mfc1      $a2, $f2
-/* 31F740 802BE9D0 0C01C16C */  jal       playFX_23
+/* 31F740 802BE9D0 0C01C16C */  jal       fx_rising_bubble
 /* 31F744 802BE9D4 0000202D */   daddu    $a0, $zero, $zero
 .L802BE9D8_31F748:
 /* 31F748 802BE9D8 8EA20070 */  lw        $v0, 0x70($s5)
@@ -595,7 +595,7 @@ glabel func_802BE3A4_31F114
 /* 31F9DC 802BEC6C 8E250038 */  lw        $a1, 0x38($s1)
 /* 31F9E0 802BEC70 8E270040 */  lw        $a3, 0x40($s1)
 /* 31F9E4 802BEC74 44061000 */  mfc1      $a2, $f2
-/* 31F9E8 802BEC78 0C01C16C */  jal       playFX_23
+/* 31F9E8 802BEC78 0C01C16C */  jal       fx_rising_bubble
 /* 31F9EC 802BEC7C 0000202D */   daddu    $a0, $zero, $zero
 /* 31F9F0 802BEC80 080AFB24 */  j         .L802BEC90
 /* 31F9F4 802BEC84 00000000 */   nop
@@ -707,7 +707,7 @@ glabel func_802BE3A4_31F114
 /* 31FB84 802BEE14 44062000 */  mfc1      $a2, $f4
 /* 31FB88 802BEE18 8CE70000 */  lw        $a3, ($a3)
 .L802BEE1C:
-/* 31FB8C 802BEE1C 0C01C16C */  jal       playFX_23
+/* 31FB8C 802BEE1C 0C01C16C */  jal       fx_rising_bubble
 /* 31FB90 802BEE20 0000202D */   daddu    $a0, $zero, $zero
 .L802BEE24:
 /* 31FB94 802BEE24 C6200038 */  lwc1      $f0, 0x38($s1)
diff --git a/ver/us/effects.yaml b/ver/us/effects.yaml
index 6c7caf7f07..031251f626 100644
--- a/ver/us/effects.yaml
+++ b/ver/us/effects.yaml
@@ -1,135 +1,135 @@
-- playFX_00
-- playFX_01
-- playFX_02
-- playFX_03
-- playFX_04
-- playFX_05
-- fx_land
-- fx_walk
-- playFX_08
-- playFX_09
-- playFX_0A
-- playFX_0B
-- playFX_0C
-- playFX_0D
-- playFX_0E
-- playFX_0F
+- fx_big_dust_puff
+- fx_big_smoke_puff
+- fx_02
+- fx_03
+- fx_04
+- fx_05
+- fx_landing_dust
+- fx_walking_dust
+- fx_flower_splash
+- fx_flower_trail
+- fx_cloud_puff
+- fx_cloud_trail
+- fx_footprint
+- fx_floating_flower
+- fx_snowflake
+- fx_star
 - fx_emote
-- playFX_11
-- playFX_12
-- playFX_13
-- playFX_14
-- playFX_15
-- playFX_16
-- playFX_17
-- playFX_18
-- playFX_19
-- playFX_1A
-- playFX_1B
-- playFX_1C
-- playFX_1D
-- playFX_1E
-- playFX_1F
-- playFX_20
-- playFX_21
-- playFX_22
-- playFX_23
-- playFX_24
-- playFX_25
-- playFX_26
-- playFX_27
+- fx_sparkles
+- fx_shape_spell
+- fx_gather_energy_pink
+- fx_drop_leaves
+- fx_dust
+- fx_shattering_stones
+- fx_smoke_ring
+- fx_damage_stars
+- fx_explosion
+- fx_lens_flare
+- fx_got_item_outline
+- fx_spiky_white_aura
+- fx_smoke_impact
+- fx_damage_indicator
+- fx_purple_ring
+- fx_flame
+- fx_stars_burst
+- fx_stars_shimmer
+- fx_rising_bubble
+- fx_ring_blast
+- fx_shockwave
+- fx_music_note
+- fx_smoke_burst
 - fx_sweat
 - fx_sleep_bubble
-- playFX_2A
-- playFX_2B
-- playFX_2C
-- playFX_2D
-- playFX_2E
-- playFX_2F
-- playFX_30
-- playFX_31
-- playFX_32
-- playFX_33
-- playFX_34
-- playFX_35
-- playFX_36
-- playFX_37
-- playFX_38
-- playFX_39
-- playFX_3A
-- playFX_3B
-- playFX_3C
-- playFX_3D
-- playFX_3E
-- playFX_3F
-- playFX_40
-- playFX_41
-- playFX_42
-- playFX_43
-- playFX_44
-- playFX_45
-- playFX_46_whirlwind
-- playFX_47
-- playFX_48
-- playFX_49
-- playFX_4A
-- playFX_4B
-- playFX_4C
-- playFX_4D
-- playFX_4E
-- playFX_4F
-- playFX_50
-- playFX_51
-- playFX_52
-- playFX_53
-- playFX_54
-- playFX_55
-- playFX_56
-- playFX_57
-- playFX_58
-- playFX_59
-- playFX_5A
-- playFX_5B
-- playFX_5C
-- playFX_5D
-- playFX_5E
-- playFX_5F
-- playFX_60
-- playFX_61
-- playFX_62
-- playFX_63
-- playFX_64
-- playFX_65
-- playFX_66
-- playFX_67
-- playFX_68
-- playFX_69
-- playFX_6A
-- playFX_6B
-- playFX_6C
-- playFX_6D
-- playFX_6E
-- playFX_6F
-- playFX_70
-- playFX_71
-- playFX_72
-- playFX_73
-- playFX_74
-- playFX_75
-- playFX_76
-- playFX_77
-- playFX_78
-- playFX_79
-- playFX_7A
-- playFX_7B
-- playFX_7C
-- playFX_7D
-- playFX_7E
-- playFX_7F
-- playFX_80
-- playFX_81
-- playFX_82
-- playFX_83
-- playFX_84
-- playFX_85
-- playFX_86
+- fx_2A
+- fx_windy_leaves
+- fx_falling_leaves
+- fx_stars_spread
+- fx_steam_burst
+- fx_stars_orbiting
+- fx_big_snowflakes
+- fx_debuff
+- fx_green_impact
+- fx_radial_shimmer
+- fx_ending_decals
+- fx_light_rays
+- fx_lightning
+- fx_fire_breath
+- fx_shimmer_burst
+- fx_energy_shockwave
+- fx_shimmer_wave
+- fx_aura
+- fx_3C
+- fx_3D
+- fx_blast
+- fx_fire_flower
+- fx_recover
+- fx_disable_x
+- fx_bombette_breaking
+- fx_firework
+- fx_confetti
+- fx_snowfall
+- fx_46
+- fx_gather_magic
+- fx_attack_result_text
+- fx_small_gold_sparkle
+- fx_flashing_box_shockwave
+- fx_balloon
+- fx_floating_rock
+- fx_chomp_drop
+- fx_quizmo_stage
+- fx_radiating_energy_orb
+- fx_quizmo_answer
+- fx_motion_blur_flame
+- fx_energy_orb_wave
+- fx_merlin_house_stars
+- fx_quizmo_audience
+- fx_butterflies
+- fx_stat_change
+- fx_snaking_static
+- fx_thunderbolt_ring
+- fx_squirt
+- fx_water_block
+- fx_waterfall
+- fx_water_fountain
+- fx_underwater
+- fx_lightning_bolt
+- fx_water_splash
+- fx_snowman_doll
+- fx_fright_jar
+- fx_stop_watch
+- fx_63
+- fx_throw_spiny
+- fx_65
+- fx_tubba_heart_attack
+- fx_whirlwind
+- fx_red_impact
+- fx_floating_cloud_puff
+- fx_6A
+- fx_energy_in_out
+- fx_tattle_window
+- fx_shiny_flare
+- fx_huff_puff_breath
+- fx_cold_breath
+- fx_embers
+- fx_hieroglyphs
+- fx_misc_particles
+- fx_static_status
+- fx_moving_cloud
+- fx_75
+- fx_76
+- fx_firework_rocket
+- fx_peach_star_beam
+- fx_chapter_change
+- fx_ice_shard
+- fx_spirit_card
+- fx_lil_oink
+- fx_something_rotating
+- fx_breaking_junk
+- fx_partner_buff
+- fx_quizmo_assistant
+- fx_ice_pillar
+- fx_sun
+- fx_star_spirits_energy
+- fx_pink_sparkles
+- fx_star_outline
+- fx_86
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 255ffe108e..668d3347b4 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -2180,595 +2180,595 @@ segments:
     - [0x325AD0, c]
     - [0x325EE0, pm_effect_shims, effect_shims]
     - [0x326160, .data, 325AD0]
-  - [0x326410, bin] # effect 1 gfx
-  - name: effect_1
+  - [0x326410, bin] # big_smoke_puff gfx
+  - name: effect_big_smoke_puff
     dir: effects
     type: code
     start: 0x3278F0
     vram: 0xE0002000
     subsegments:
-    - [0x3278F0, c, effect_1]
+    - [0x3278F0, c, big_smoke_puff]
     - [0x328050]
-  - name: effect_6
+  - name: effect_landing_dust
     dir: effects
     type: code
     start: 0x328110
     vram: 0xE000C000
     subsegments:
-    - [0x328110, c, effect_6]
+    - [0x328110, c, landing_dust]
     - [0x328D20]
-  - [0x328EA0, bin] # effect 6,7,23,29,39 gfx
-  - name: effect_7
+  - [0x328EA0, bin] # landing_dust, walking_dust, smoke_ring, smoke_impact, smoke_burst gfx
+  - name: effect_walking_dust
     dir: effects
     type: code
     start: 0x32C110
     vram: 0xE000E000
     subsegments:
-    - [0x32C110, c, effect_7]
+    - [0x32C110, c, walking_dust]
     - [0x32C770]
-  - name: effect_8
+  - name: effect_flower_splash
     dir: effects
     type: code
     start: 0x32C7A0
     vram: 0xE0010000
     subsegments:
-    - [0x32C7A0, c, effect_8]
+    - [0x32C7A0, c, flower_splash]
     - [0x32CEB0]
-  - [0x32CEC0, bin] # effect 8,9 gfx
-  - name: effect_9
+  - [0x32CEC0, bin] # flower_splash, flower_trail gfx
+  - name: effect_flower_trail
     dir: effects
     type: code
     start: 0x32DD10
     vram: 0xE0012000
     subsegments:
-    - [0x32DD10, c, effect_9]
-  - name: effect_10
+    - [0x32DD10, c, flower_trail]
+  - name: effect_cloud_puff
     dir: effects
     type: code
     start: 0x32E490
     vram: 0xE0014000
     subsegments:
-    - [0x32E490, c, effect_10]
+    - [0x32E490, c, cloud_puff]
     - [0x32EC10]
-  - [0x32EC50, bin] # effect 10,11 gfx
-  - name: effect_11
+  - [0x32EC50, bin] # cloud_puff, cloud_trail gfx
+  - name: effect_cloud_trail
     dir: effects
     type: code
     start: 0x32EE30
     vram: 0xE0016000
     subsegments:
-    - [0x32EE30, c, effect_11]
+    - [0x32EE30, c, cloud_trail]
     - [0x32F550]
-  - name: effect_12
+  - name: effect_footprint
     dir: effects
     type: code
     start: 0x32F580
     vram: 0xE0018000
     subsegments:
-    - [0x32F580, c, effect_12]
-  - [0x32FB50, bin] # effect 12 gfx
-  - name: effect_13
+    - [0x32F580, c, footprint]
+  - [0x32FB50, bin] # footprint gfx
+  - name: effect_floating_flower
     dir: effects
     type: code
     start: 0x32FE30
     vram: 0xE001A000
     subsegments:
-    - [0x32FE30, c, effect_13]
+    - [0x32FE30, c, floating_flower]
     - [0x330440]
-  - [0x330460, bin] # effect 13 gfx
-  - name: effect_14
+  - [0x330460, bin] # floating_flower gfx
+  - name: effect_snowflake
     dir: effects
     type: code
     start: 0x330910
     vram: 0xE001C000
     subsegments:
-    - [0x330910, c, effect_14]
+    - [0x330910, c, snowflake]
     - [0x330EF0]
-  - [0x330F00, bin] # effect 14 gfx
-  - name: effect_15
+  - [0x330F00, bin] # snowflake gfx
+  - name: effect_star
     dir: effects
     type: code
     start: 0x331940
     vram: 0xE001E000
     subsegments:
-    - [0x331940, c, effect_15]
+    - [0x331940, c, star]
     - [0x332690]
-  - [0x3326A0, bin] # effect 15 gfx
-  - name: effect_16
+  - [0x3326A0, bin] # star gfx
+  - name: effect_emote
     dir: effects
     type: code
     start: 0x333EC0
     vram: 0xE0020000
     subsegments:
-    - [0x333EC0, c, effect_16]
+    - [0x333EC0, c, emote]
     - [0x334B50]
-  - [0x334C70, bin] # effect 16 gfx
-  - name: effect_17
+  - [0x334C70, bin] # emote gfx
+  - name: effect_sparkles
     dir: effects
     type: code
     start: 0x337240
     vram: 0xE0022000
     subsegments:
-    - [0x337240, c, effect_17]
+    - [0x337240, c, sparkles]
     - [0x337F10, data]
-  - [0x337FC0, bin] # effect 17,34,56,58,132 gfx
-  - name: effect_18
+  - [0x337FC0, bin] # sparkles, stars_shimmer, shimmer_burst, shimmer_wave, pink_sparkles gfx
+  - name: effect_shape_spell
     dir: effects
     type: code
     start: 0x339250
     vram: 0xE0024000
     subsegments:
-    - [0x339250, c, effect_18]
+    - [0x339250, c, shape_spell]
     - [0x339F10, data]
-  - [0x339F60, bin] # effect 18 gfx
-  - name: effect_19
+  - [0x339F60, bin] # shape_spell gfx
+  - name: effect_gather_energy_pink
     dir: effects
     type: code
     start: 0x33B180
     vram: 0xE0026000
     subsegments:
-    - [0x33B180, c, effect_19]
+    - [0x33B180, c, gather_energy_pink]
     - [0x33BB70, data]
-  - [0x33BBD0, bin] # effect 19 gfx
-  - name: effect_20
+  - [0x33BBD0, bin] # gather_energy_pink gfx
+  - name: effect_drop_leaves
     dir: effects
     type: code
     start: 0x33CDF0
     vram: 0xE0028000
     subsegments:
-    - [0x33CDF0, c, effect_20]
+    - [0x33CDF0, c, drop_leaves]
     - [0x33D5D0, data]
-  - [0x33D610, bin] # effect 20,43 gfx
-  - name: effect_21
+  - [0x33D610, bin] # drop_leaves, windy_leaves gfx
+  - name: effect_dust
     dir: effects
     type: code
     start: 0x33E8C0
     vram: 0xE002A000
     subsegments:
-    - [0x33E8C0, c, effect_21]
+    - [0x33E8C0, c, dust]
     - [0x33EFE0, data]
-  - [0x33F000, bin] # effect 21 gfx
-  - name: effect_22
+  - [0x33F000, bin] # dust gfx
+  - name: effect_shattering_stones
     dir: effects
     type: code
     start: 0x33FE80
     vram: 0xE002C000
     subsegments:
-    - [0x33FE80, c, effect_22]
+    - [0x33FE80, c, shattering_stones]
     - [0x3407C0, data]
-  - [0x340880, bin] # effect 22 gfx
-  - name: effect_23
+  - [0x340880, bin] # shattering_stones gfx
+  - name: effect_smoke_ring
     dir: effects
     type: code
     start: 0x3419E0
     vram: 0xE002E000
     subsegments:
-    - [0x3419E0, c, effect_23]
+    - [0x3419E0, c, smoke_ring]
     - [0x342120, data]
-  - name: effect_24
+  - name: effect_damage_stars
     dir: effects
     type: code
     start: 0x342140
     vram: 0xE0030000
     subsegments:
-    - [0x342140, c, effect_24]
+    - [0x342140, c, damage_stars]
     - [0x342FD0, data]
-  - [0x343040, bin] # effect 24,33 gfx
-  - name: effect_25
+  - [0x343040, bin] # damage_stars, stars_burst gfx
+  - name: effect_explosion
     dir: effects
     type: code
     start: 0x343680
     vram: 0xE0032000
     subsegments:
-    - [0x343680, c, effect_25]
+    - [0x343680, c, explosion]
     - [0x343F30, data]
-  - [0x343F70, bin] # effect 25 gfx
-  - name: effect_26
+  - [0x343F70, bin] # explosion gfx
+  - name: effect_lens_flare
     dir: effects
     type: code
     start: 0x344A10
     vram: 0xE0034000
     subsegments:
-    - [0x344A10, c, effect_26]
+    - [0x344A10, c, lens_flare]
     - [0x345190, data]
-  - [0x3451E0, bin] # effect 26 gfx
-  - name: effect_27
+  - [0x3451E0, bin] # lens_flare gfx
+  - name: effect_got_item_outline
     dir: effects
     type: code
     start: 0x3454E0
     vram: 0xE0036000
     subsegments:
-    - [0x3454E0, c, effect_27]
+    - [0x3454E0, c, got_item_outline]
     - [0x345B10, data]
-  - [0x345B40, bin] # effect 27 gfx
-  - name: effect_28
+  - [0x345B40, bin] # got_item_outline gfx
+  - name: effect_spiky_white_aura
     dir: effects
     type: code
     start: 0x34DD20
     vram: 0xE0038000
     subsegments:
-    - [0x34DD20, c, effect_28]
+    - [0x34DD20, c, spiky_white_aura]
     - [0x34E710, data]
-  - [0x34E770, bin] # effect 28 gfx
-  - name: effect_29
+  - [0x34E770, bin] # spiky_white_aura gfx
+  - name: effect_smoke_impact
     dir: effects
     type: code
     start: 0x34EC80
     vram: 0xE003A000
     subsegments:
-    - [0x34EC80, c, effect_29]
+    - [0x34EC80, c, smoke_impact]
     - [0x34F480, data]
-  - name: effect_30
+  - name: effect_damage_indicator
     dir: effects
     type: code
     start: 0x34F4C0
     vram: 0xE003C000
     subsegments:
-    - [0x34F4C0, c, effect_30]
+    - [0x34F4C0, c, damage_indicator]
     - [0x350160, data]
-  - [0x350220, bin] # effect 30 gfx
-  - name: effect_31
+  - [0x350220, bin] # damage_indicator gfx
+  - name: effect_purple_ring
     dir: effects
     type: code
     start: 0x352440
     vram: 0xE003E000
     subsegments:
-    - [0x352440, c, effect_31]
+    - [0x352440, c, purple_ring]
     - [0x352CB0, data]
-  - [0x352CE0, bin] # effect 31 gfx
-  - name: effect_32
+  - [0x352CE0, bin] # purple_ring gfx
+  - name: effect_flame
     dir: effects
     type: code
     start: 0x353300
     vram: 0xE0040000
     subsegments:
-    - [0x353300, c, effect_32]
+    - [0x353300, c, flame]
     - [0x353B40]
-  - [0x353BB0, bin] # effect 32 gfx
-  - name: effect_33
+  - [0x353BB0, bin] # flame gfx
+  - name: effect_stars_burst
     dir: effects
     type: code
     start: 0x3547A0
     vram: 0xE0042000
     subsegments:
-    - [0x3547A0, c, effect_33]
+    - [0x3547A0, c, stars_burst]
     - [0x354F20, data]
-  - name: effect_34
+  - name: effect_stars_shimmer
     dir: effects
     type: code
     start: 0x354F60
     vram: 0xE0044000
     subsegments:
-    - [0x354F60, c, effect_34]
+    - [0x354F60, c, stars_shimmer]
     - [0x355D10, data]
-  - name: effect_35
+  - name: effect_rising_bubble
     dir: effects
     type: code
     start: 0x355EE0
     vram: 0xE0046000
     subsegments:
-    - [0x355EE0, c, effect_35]
+    - [0x355EE0, c, rising_bubble]
     - [0x3564E0, data]
-  - [0x356530, bin] # effect 35 gfx
-  - name: effect_36
+  - [0x356530, bin] # rising_bubble gfx
+  - name: effect_ring_blast
     dir: effects
     type: code
     start: 0x356980
     vram: 0xE0048000
     subsegments:
-    - [0x356980, c, effect_36]
+    - [0x356980, c, ring_blast]
     - [0x357380, data]
-  - [0x3573A0, bin] # effect 36 gfx
-  - name: effect_37
+  - [0x3573A0, bin] # ring_blast gfx
+  - name: effect_shockwave
     dir: effects
     type: code
     start: 0x3584C0
     vram: 0xE004A000
     subsegments:
-    - [0x3584C0, c, effect_37]
+    - [0x3584C0, c, shockwave]
     - [0x359320, data]
-  - [0x3593B0, bin] # effect 37,104 gfx
-  - name: effect_38
+  - [0x3593B0, bin] # shockwave, red_impact gfx
+  - name: effect_music_note
     dir: effects
     type: code
     start: 0x359F20
     vram: 0xE004C000
     subsegments:
-    - [0x359F20, c, effect_38]
+    - [0x359F20, c, music_note]
     - [0x35A580, data]
-  - [0x35A5E0, bin] # effect 38 gfx
-  - name: effect_39
+  - [0x35A5E0, bin] # music_note gfx
+  - name: effect_smoke_burst
     dir: effects
     type: code
     start: 0x35B9D0
     vram: 0xE004E000
     subsegments:
-    - [0x35B9D0, c, effect_39]
+    - [0x35B9D0, c, smoke_burst]
     - [0x35BFB0, data]
-  - name: effect_40
+  - name: effect_sweat
     dir: effects
     type: code
     start: 0x35BFD0
     vram: 0xE0050000
     subsegments:
-    - [0x35BFD0, c, effect_40]
+    - [0x35BFD0, c, sweat]
     - [0x35C530, data]
-  - [0x35C550, bin] # effect 40 gfx
-  - name: effect_41
+  - [0x35C550, bin] # sweat gfx
+  - name: effect_sleep_bubble
     dir: effects
     type: code
     start: 0x35CA80
     vram: 0xE0052000
     subsegments:
-    - [0x35CA80, c, effect_41]
+    - [0x35CA80, c, sleep_bubble]
     - [0x35D460, data]
-  - [0x35D510, bin] # effect 41 gfx
-  - name: effect_43
+  - [0x35D510, bin] # sleep_bubble gfx
+  - name: effect_windy_leaves
     dir: effects
     type: code
     start: 0x35DA00
     vram: 0xE0056000
     subsegments:
-    - [0x35DA00, c, effect_43]
+    - [0x35DA00, c, windy_leaves]
     - [0x35E8A0, data]
-  - name: effect_44
+  - name: effect_falling_leaves
     dir: effects
     type: code
     start: 0x35E920
     vram: 0xE0058000
     subsegments:
-    - [0x35E920, c, effect_44]
+    - [0x35E920, c, falling_leaves]
     - [0x35F0A0, data]
-  - [0x35F0E0, bin] # effect 44 gfx
-  - name: effect_45
+  - [0x35F0E0, bin] # falling_leaves gfx
+  - name: effect_stars_spread
     dir: effects
     type: code
     start: 0x3602C0
     vram: 0xE005A000
     subsegments:
-    - [0x3602C0, c, effect_45]
+    - [0x3602C0, c, stars_spread]
     - [0x360A10, data]
-  - [0x360A30, bin] # effect 45 gfx
-  - name: effect_46
+  - [0x360A30, bin] # stars_spread gfx
+  - name: effect_steam_burst
     dir: effects
     type: code
     start: 0x360F40
     vram: 0xE005C000
     subsegments:
-    - [0x360F40, c, effect_46]
+    - [0x360F40, c, steam_burst]
     - [0x361640, data]
-  - [0x361670, bin] # effect 46 gfx
-  - name: effect_47
+  - [0x361670, bin] # steam_burst gfx
+  - name: effect_stars_orbiting
     dir: effects
     type: code
     start: 0x3625C0
     vram: 0xE005E000
     subsegments:
-    - [0x3625C0, c, effect_47]
+    - [0x3625C0, c, stars_orbiting]
     - [0x362C30, data]
-  - [0x362C50, bin] # effect 47 gfx
-  - name: effect_48
+  - [0x362C50, bin] # stars_orbiting gfx
+  - name: effect_big_snowflakes
     dir: effects
     type: code
     start: 0x363160
     vram: 0xE0060000
     subsegments:
-    - [0x363160, c, effect_48]
+    - [0x363160, c, big_snowflakes]
     - [0x363890, data]
-  - [0x3638C0, bin] # effect 48 gfx
-  - name: effect_49
+  - [0x3638C0, bin] # big_snowflakes gfx
+  - name: effect_debuff
     dir: effects
     type: code
     start: 0x364300
     vram: 0xE0062000
     subsegments:
-    - [0x364300, c, effect_49]
+    - [0x364300, c, debuff]
     - [0x364BC0, data]
-  - [0x364C00, bin] # effect 49 gfx
-  - name: effect_50
+  - [0x364C00, bin] # debuff gfx
+  - name: effect_green_impact
     dir: effects
     type: code
     start: 0x364F10
     vram: 0xE0064000
     subsegments:
-    - [0x364F10, c, effect_50]
+    - [0x364F10, c, green_impact]
     - [0x365970, data]
-  - [0x3659B0, bin] # effect 50 gfx
-  - name: effect_51
+  - [0x3659B0, bin] # green_impact gfx
+  - name: effect_radial_shimmer
     dir: effects
     type: code
     start: 0x366030
     vram: 0xE0066000
     subsegments:
-    - [0x366030, c, effect_51]
+    - [0x366030, c, radial_shimmer]
     - [0x366C80, data]
-  - [0x366D60, bin] # effect 51 gfx
-  - name: effect_52
+  - [0x366D60, bin] # radial_shimmer gfx
+  - name: effect_ending_decals
     dir: effects
     type: code
     start: 0x36A8D0
     vram: 0xE0068000
     subsegments:
-    - [0x36A8D0, c, effect_52]
+    - [0x36A8D0, c, ending_decals]
     - [0x36AE80, data]
-  - [0x36AEE0, bin] # effect 52 gfx
-  - name: effect_53
+  - [0x36AEE0, bin] # ending_decals gfx
+  - name: effect_light_rays
     dir: effects
     type: code
     start: 0x36D020
     vram: 0xE006A000
     subsegments:
-    - [0x36D020, c, effect_53]
+    - [0x36D020, c, light_rays]
     - [0x36DE10, data]
-  - [0x36DF90, bin] # effect 53 gfx
-  - name: effect_54
+  - [0x36DF90, bin] # light_rays gfx
+  - name: effect_lightning
     dir: effects
     type: code
     start: 0x36E1D0
     vram: 0xE006C000
     subsegments:
-    - [0x36E1D0, c, effect_54]
+    - [0x36E1D0, c, lightning]
     - [0x36ED30, data]
-  - [0x36ED60, bin] # effect 54 gfx
-  - name: effect_55
+  - [0x36ED60, bin] # lightning gfx
+  - name: effect_fire_breath
     dir: effects
     type: code
     start: 0x372790
     vram: 0xE006E000
     subsegments:
-    - [0x372790, c, effect_55]
+    - [0x372790, c, fire_breath]
     - [0x373390, data]
-  - [0x3733E0, bin] # effect 55 gfx
-  - name: effect_56
+  - [0x3733E0, bin] # fire_breath gfx
+  - name: effect_shimmer_burst
     dir: effects
     type: code
     start: 0x3740B0
     vram: 0xE0070000
     subsegments:
-    - [0x3740B0, c, effect_56]
+    - [0x3740B0, c, shimmer_burst]
     - [0x374D80, data]
-  - name: effect_57
+  - name: effect_energy_shockwave
     dir: effects
     type: code
     start: 0x374E50
     vram: 0xE0072000
     subsegments:
-    - [0x374E50, c, effect_57]
+    - [0x374E50, c, energy_shockwave]
     - [0x375500, data]
-  - [0x375510, bin] # effect 57 gfx
-  - name: effect_58
+  - [0x375510, bin] # energy_shockwave gfx
+  - name: effect_shimmer_wave
     dir: effects
     type: code
     start: 0x376460
     vram: 0xE0074000
     subsegments:
-    - [0x376460, c, effect_58]
+    - [0x376460, c, shimmer_wave]
     - [0x376FC0, data]
-  - name: effect_59
+  - name: effect_aura
     dir: effects
     type: code
     start: 0x377070
     vram: 0xE0076000
     subsegments:
-    - [0x377070, c, effect_59]
+    - [0x377070, c, aura]
     - [0x377F00, data]
-  - [0x377F80, bin] # effect 59 gfx
-  - name: effect_60
+  - [0x377F80, bin] # aura gfx
+  - name: effect_effect_3C
     dir: effects
     type: code
     start: 0x37A3F0
     vram: 0xE0078000
     subsegments:
-    - [0x37A3F0, c, effect_60]
+    - [0x37A3F0, c, effect_3C]
     - [0x37ACF0, data]
-  - [0x37ADD0, bin] # effect 60 gfx
-  - name: effect_61
+  - [0x37ADD0, bin] # effect_3C gfx
+  - name: effect_effect_3D
     dir: effects
     type: code
     start: 0x37C540
     vram: 0xE007A000
     subsegments:
-    - [0x37C540, c, effect_61]
+    - [0x37C540, c, effect_3D]
     - [0x37D140, data]
-  - [0x37D180, bin] # effect 61 gfx
-  - name: effect_62
+  - [0x37D180, bin] # effect_3D gfx
+  - name: effect_blast
     dir: effects
     type: code
     start: 0x37D490
     vram: 0xE007C000
     subsegments:
-    - [0x37D490, c, effect_62]
+    - [0x37D490, c, blast]
     - [0x37D9A0, data]
-  - [0x37D9D0, bin] # effect 62,66 gfx
-  - name: effect_63
+  - [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
     type: code
     start: 0x37F720
     vram: 0xE007E000
     subsegments:
-    - [0x37F720, c, effect_63]
+    - [0x37F720, c, fire_flower]
     - [0x380350, data]
-  - [0x3803A0, bin] # effect 63 gfx
-  - name: effect_64
+  - [0x3803A0, bin] # fire_flower gfx
+  - name: effect_recover
     dir: effects
     type: code
     start: 0x3812C0
     vram: 0xE0080000
     subsegments:
-    - [0x3812C0, c, effect_64]
+    - [0x3812C0, c, recover]
     - [0x381D80, data]
-  - [0x381E00, bin] # effect 64 gfx
-  - name: effect_65
+  - [0x381E00, bin] # recover gfx
+  - name: effect_disable_x
     dir: effects
     type: code
     start: 0x385640
     vram: 0xE0082000
     subsegments:
-    - [0x385640, c, effect_65]
+    - [0x385640, c, disable_x]
     - [0x386340, data]
-  - [0x3863B0, bin] # effect 65 gfx
-  - name: effect_66
+  - [0x3863B0, bin] # disable_x gfx
+  - name: effect_bombette_breaking
     dir: effects
     type: code
     start: 0x3889D0
     vram: 0xE0084000
     subsegments:
-    - [0x3889D0, c, effect_66]
+    - [0x3889D0, c, bombette_breaking]
     - [0x3897E0, data]
-  - name: effect_67
+  - name: effect_firework
     dir: effects
     type: code
     start: 0x389850
     vram: 0xE0086000
     subsegments:
-    - [0x389850, c, effect_67]
+    - [0x389850, c, firework]
     - [0x38A2F0, data]
-  - [0x38A350, bin] # effect 67 gfx
-  - name: effect_68
+  - [0x38A350, bin] # firework gfx
+  - name: effect_confetti
     dir: effects
     type: code
     start: 0x38ADF0
     vram: 0xE0088000
     subsegments:
-    - [0x38ADF0, c, effect_68]
+    - [0x38ADF0, c, confetti]
     - [0x38BAB0, data]
-  - [0x38BBA0, bin] # effect 68 gfx
-  - name: effect_69
+  - [0x38BBA0, bin] # confetti gfx
+  - name: effect_snowfall
     dir: effects
     type: code
     start: 0x38C5F0
     vram: 0xE008A000
     subsegments:
-    - [0x38C5F0, c, effect_69]
+    - [0x38C5F0, c, snowfall]
     - [0x38D040, data]
-  - [0x38D070, bin] # effect 69 gfx
-  - name: effect_70
+  - [0x38D070, bin] # snowfall gfx
+  - name: effect_effect_46
     dir: effects
     type: code
     start: 0x38DE00
     vram: 0xE008C000
     subsegments:
-    - [0x38DE00, c, effect_70]
+    - [0x38DE00, c, effect_46]
     - [0x38E8F0, data]
-  - [0x38E990, bin] # effect 70 gfx
-  - name: effect_71
+  - [0x38E990, bin] # effect_46 gfx
+  - name: effect_gather_magic
     dir: effects
     type: code
     start: 0x38EE60
     vram: 0xE008E000
     subsegments:
-    - [0x38EE60, c, effect_71]
+    - [0x38EE60, c, gather_magic]
     - [0x38F6F0, data]
-  - [0x38F710, bin] # effect 71 gfx
-  - name: effect_72
+  - [0x38F710, bin] # gather_magic gfx
+  - name: effect_attack_result_text
     dir: effects
     type: code
     start: 0x38F900
     vram: 0xE0090000
     subsegments:
-    - [0x38F900, c, effect_72]
+    - [0x38F900, c, attack_result_text]
     - [0x390340, data]
-  - type: group # effect 72 gfx
+  - type: group # attack_result_text gfx
     start: 0x3903D0
     subsegments:
     - [0x3903D0, ia4, battle/lucky, 64, 32]
@@ -2777,424 +2777,424 @@ segments:
     - [0x390FD0, ia4, battle/nice,  64, 32]
     - [0x3913D0, ia4, battle/super, 64, 32]
     - [0x3917D0, bin]
-  - name: effect_73
+  - name: effect_small_gold_sparkle
     dir: effects
     type: code
     start: 0x391D30
     vram: 0xE0092000
     subsegments:
-    - [0x391D30, c, effect_73]
+    - [0x391D30, c, small_gold_sparkle]
     - [0x3923C0]
-  - [0x392440, bin] # effect 73 gfx
-  - name: effect_74
+  - [0x392440, bin] # small_gold_sparkle gfx
+  - name: effect_flashing_box_shockwave
     dir: effects
     type: code
     start: 0x3928D0
     vram: 0xE0094000
     subsegments:
-    - [0x3928D0, c, effect_74]
+    - [0x3928D0, c, flashing_box_shockwave]
     - [0x393080, data]
-  - [0x3930A0, bin] # effect 74 gfx
-  - name: effect_75
+  - [0x3930A0, bin] # flashing_box_shockwave gfx
+  - name: effect_balloon
     dir: effects
     type: code
     start: 0x394280
     vram: 0xE0096000
     subsegments:
-    - [0x394280, c, effect_75]
+    - [0x394280, c, balloon]
     - [0x394660]
-  - [0x394670, bin] # effect 75 gfx
-  - name: effect_76
+  - [0x394670, bin] # balloon gfx
+  - name: effect_floating_rock
     dir: effects
     type: code
     start: 0x395BB0
     vram: 0xE0098000
     subsegments:
-    - [0x395BB0, c, effect_76]
+    - [0x395BB0, c, floating_rock]
     - [0x3960C0, data]
-  - [0x3960F0, bin] # effect 76 gfx
-  - name: effect_77
+  - [0x3960F0, bin] # floating_rock gfx
+  - name: effect_chomp_drop
     dir: effects
     type: code
     start: 0x3965B0
     vram: 0xE009A000
     subsegments:
-    - [0x3965B0, c, effect_77]
+    - [0x3965B0, c, chomp_drop]
     - [0x397010, data]
-  - [0x397040, bin] # effect 77 gfx
-  - name: effect_78
+  - [0x397040, bin] # chomp_drop gfx
+  - name: effect_quizmo_stage
     dir: effects
     type: code
     start: 0x3981F0
     vram: 0xE009C000
     subsegments:
-    - [0x3981F0, c, effect_78]
-  - [0x398BC0, bin] # effect 78 gfx
-  - name: effect_79
+    - [0x3981F0, c, quizmo_stage]
+  - [0x398BC0, bin] # quizmo_stage gfx
+  - name: effect_radiating_energy_orb
     dir: effects
     type: code
     start: 0x39FF20
     vram: 0xE009E000
     subsegments:
-    - [0x39FF20, c, effect_79]
+    - [0x39FF20, c, radiating_energy_orb]
     - [0x3A0D10]
-  - [0x3A0D60, bin] # effect 79 gfx
-  - name: effect_80
+  - [0x3A0D60, bin] # radiating_energy_orb gfx
+  - name: effect_quizmo_answer
     dir: effects
     type: code
     start: 0x3A2290
     vram: 0xE00A0000
     subsegments:
-    - [0x3A2290, c, effect_80]
-  - [0x3A2440, bin] # effect 80 gfx
-  - name: effect_81
+    - [0x3A2290, c, quizmo_answer]
+  - [0x3A2440, bin] # quizmo_answer gfx
+  - name: effect_motion_blur_flame
     dir: effects
     type: code
     start: 0x3A2990
     vram: 0xE00A2000
     subsegments:
-    - [0x3A2990, c, effect_81]
+    - [0x3A2990, c, motion_blur_flame]
     - [0x3A3360]
-  - [0x3A33D0, bin] # effect 81 gfx
-  - name: effect_82
+  - [0x3A33D0, bin] # motion_blur_flame gfx
+  - name: effect_energy_orb_wave
     dir: effects
     type: code
     start: 0x3A37E0
     vram: 0xE00A4000
     subsegments:
-    - [0x3A37E0, c, effect_82]
+    - [0x3A37E0, c, energy_orb_wave]
     - [0x3A42B0]
-  - [0x3A4320, bin] # effect 82 gfx
-  - name: effect_83
+  - [0x3A4320, bin] # energy_orb_wave gfx
+  - name: effect_merlin_house_stars
     dir: effects
     type: code
     start: 0x3A5550
     vram: 0xE00A6000
     subsegments:
-    - [0x3A5550, c, effect_83]
-  - [0x3A5BE0, bin] # effect 83 gfx
-  - name: effect_84
+    - [0x3A5550, c, merlin_house_stars]
+  - [0x3A5BE0, bin] # merlin_house_stars gfx
+  - name: effect_quizmo_audience
     dir: effects
     type: code
     start: 0x3A70F0
     vram: 0xE00A8000
     subsegments:
-    - [0x3A70F0, c, effect_84]
+    - [0x3A70F0, c, quizmo_audience]
     - [0x3A7710]
-  - [0x3A77A0, bin] # effect 84 gfx
-  - name: effect_85
+  - [0x3A77A0, bin] # quizmo_audience gfx
+  - name: effect_butterflies
     dir: effects
     type: code
     start: 0x3AA920
     vram: 0xE00AA000
     subsegments:
-    - [0x3AA920, c, effect_85]
+    - [0x3AA920, c, butterflies]
     - [0x3AAFE0]
-  - [0x3AB030, bin] # effect 85 gfx
-  - name: effect_86
+  - [0x3AB030, bin] # butterflies gfx
+  - name: effect_stat_change
     dir: effects
     type: code
     start: 0x3AEE20
     vram: 0xE00AC000
     subsegments:
-    - [0x3AEE20, c, effect_86]
+    - [0x3AEE20, c, stat_change]
     - [0x3AF5D0]
-  - [0x3AF700, bin] # effect 86 gfx
-  - name: effect_87
+  - [0x3AF700, bin] # stat_change gfx
+  - name: effect_snaking_static
     dir: effects
     type: code
     start: 0x3B2350
     vram: 0xE00AE000
     subsegments:
-    - [0x3B2350, c, effect_87]
-  - [0x3B2D90, bin] # effect 87 gfx
-  - name: effect_88
+    - [0x3B2350, c, snaking_static]
+  - [0x3B2D90, bin] # snaking_static gfx
+  - name: effect_thunderbolt_ring
     dir: effects
     type: code
     start: 0x3B3EB0
     vram: 0xE00B0000
     subsegments:
-    - [0x3B3EB0, c, effect_88]
+    - [0x3B3EB0, c, thunderbolt_ring]
     - [0x3B4690]
-  - [0x3B46A0, bin] # effect 88 gfx
-  - name: effect_89
+  - [0x3B46A0, bin] # thunderbolt_ring gfx
+  - name: effect_squirt
     dir: effects
     type: code
     start: 0x3B4790
     vram: 0xE00B2000
     subsegments:
-    - [0x3B4790, c, effect_89]
+    - [0x3B4790, c, squirt]
     - [0x3B5330]
-  - [0x3B5340, bin] # effect 89 gfx
-  - name: effect_90
+  - [0x3B5340, bin] # squirt gfx
+  - name: effect_water_block
     dir: effects
     type: code
     start: 0x3B5CF0
     vram: 0xE00B4000
     subsegments:
-    - [0x3B5CF0, c, effect_90]
+    - [0x3B5CF0, c, water_block]
     - [0x3B69E0]
-  - [0x3B6BF0, bin] # effect 90 gfx
-  - name: effect_91
+  - [0x3B6BF0, bin] # water_block gfx
+  - name: effect_waterfall
     dir: effects
     type: code
     start: 0x3B7160
     vram: 0xE00B6000
     subsegments:
-    - [0x3B7160, c, effect_91]
+    - [0x3B7160, c, waterfall]
     - [0x3B78B0]
-  - [0x3B78D0, bin] # effect 91 gfx
-  - name: effect_92
+  - [0x3B78D0, bin] # waterfall gfx
+  - name: effect_water_fountain
     dir: effects
     type: code
     start: 0x3B7B80
     vram: 0xE00B8000
     subsegments:
-    - [0x3B7B80, c, effect_92]
+    - [0x3B7B80, c, water_fountain]
     - [0x3B8470]
-  - [0x3B8860, bin] # effect 92 gfx
-  - name: effect_93
+  - [0x3B8860, bin] # water_fountain gfx
+  - name: effect_underwater
     dir: effects
     type: code
     start: 0x3B8BD0
     vram: 0xE00BA000
     subsegments:
-    - [0x3B8BD0, c, effect_93]
+    - [0x3B8BD0, c, underwater]
     - [0x3B9A50]
-  - [0x3B9A70, bin] # effect 93 gfx
-  - name: effect_94
+  - [0x3B9A70, bin] # underwater gfx
+  - name: effect_lightning_bolt
     dir: effects
     type: code
     start: 0x3BA030
     vram: 0xE00BC000
     subsegments:
-    - [0x3BA030, c, effect_94]
+    - [0x3BA030, c, lightning_bolt]
     - [0x3BAC60]
-  - [0x3BAEA0, bin] # effect 94 gfx
-  - name: effect_95
+  - [0x3BAEA0, bin] # lightning_bolt gfx
+  - name: effect_water_splash
     dir: effects
     type: code
     start: 0x3BBF60
     vram: 0xE00BE000
     subsegments:
-    - [0x3BBF60, c, effect_95]
+    - [0x3BBF60, c, water_splash]
     - [0x3BCA50, data]
-  - [0x3BCA90, bin] # effect 95 gfx
-  - name: effect_96
+  - [0x3BCA90, bin] # water_splash gfx
+  - name: effect_snowman_doll
     dir: effects
     type: code
     start: 0x3BCD60
     vram: 0xE00C0000
     subsegments:
-    - [0x3BCD60, c, effect_96]
+    - [0x3BCD60, c, snowman_doll]
     - [0x3BD770, data]
-  - [0x3BD9A0, bin] # effect 96 gfx
-  - name: effect_97
+  - [0x3BD9A0, bin] # snowman_doll gfx
+  - name: effect_fright_jar
     dir: effects
     type: code
     start: 0x3C11D0
     vram: 0xE00C2000
     subsegments:
-    - [0x3C11D0, c, effect_97]
+    - [0x3C11D0, c, fright_jar]
     - [0x3C1B60, data]
-  - [0x3C1BA0, bin] # effect 97 gfx
-  - name: effect_98
+  - [0x3C1BA0, bin] # fright_jar gfx
+  - name: effect_stop_watch
     dir: effects
     type: code
     start: 0x3CADF0
     vram: 0xE00C4000
     subsegments:
-    - [0x3CADF0, c, effect_98]
+    - [0x3CADF0, c, stop_watch]
     - [0x3CB7C0, data]
-  - [0x3CB890, bin] # effect 98 gfx
-  - name: effect_99
+  - [0x3CB890, bin] # stop_watch gfx
+  - name: effect_effect_63
     dir: effects
     type: code
     start: 0x3CC9E0
     vram: 0xE00C6000
     subsegments:
-    - [0x3CC9E0, c, effect_99]
+    - [0x3CC9E0, c, effect_63]
     - [0x3CD670, data]
-  - [0x3CD6E0, bin] # effect 99 gfx
-  - name: effect_100
+  - [0x3CD6E0, bin] # effect_63 gfx
+  - name: effect_throw_spiny
     dir: effects
     type: code
     start: 0x3CF3A0
     vram: 0xE00C8000
     subsegments:
-    - [0x3CF3A0, c, effect_100]
+    - [0x3CF3A0, c, throw_spiny]
     - [0x3CFAB0, data]
-  - [0x3CFAF0, bin] # effect 100 gfx
-  - name: effect_101
+  - [0x3CFAF0, bin] # throw_spiny gfx
+  - name: effect_effect_65
     dir: effects
     type: code
     start: 0x3D0500
     vram: 0xE00CA000
     subsegments:
-    - [0x3D0500, c, effect_101]
+    - [0x3D0500, c, effect_65]
     - [0x3D11B0, data]
-  - [0x3D11E0, bin] # effect 101 gfx
-  - name: effect_102
+  - [0x3D11E0, bin] # effect_65 gfx
+  - name: effect_tubba_heart_attack
     dir: effects
     type: code
     start: 0x3D1690
     vram: 0xE00CC000
     subsegments:
-    - [0x3D1690, c, effect_102]
+    - [0x3D1690, c, tubba_heart_attack]
     - [0x3D2460, data]
-  - [0x3D2580, bin] # effect 102 gfx
-  - name: effect_103
+  - [0x3D2580, bin] # tubba_heart_attack gfx
+  - name: effect_whirlwind
     dir: effects
     type: code
     start: 0x3D2AC0
     vram: 0xE00CE000
     subsegments:
-    - [0x3D2AC0, c, effect_103]
+    - [0x3D2AC0, c, whirlwind]
     - [0x3D3910, data]
-  - [0x3D3930, bin] # effect 103 gfx
-  - name: effect_104
+  - [0x3D3930, bin] # whirlwind gfx
+  - name: effect_red_impact
     dir: effects
     type: code
     start: 0x3D3E20
     vram: 0xE00D0000
     subsegments:
-    - [0x3D3E20, c, effect_104]
+    - [0x3D3E20, c, red_impact]
     - [0x3D4930, data]
-  - name: effect_105
+  - name: effect_floating_cloud_puff
     dir: effects
     type: code
     start: 0x3D4970
     vram: 0xE00D2000
     subsegments:
-    - [0x3D4970, c, effect_105]
+    - [0x3D4970, c, floating_cloud_puff]
     - [0x3D4E70, data]
-  - [0x3D4E90, bin] # effect 105 gfx
-  - name: effect_107
+  - [0x3D4E90, bin] # floating_cloud_puff gfx
+  - name: effect_energy_in_out
     dir: effects
     type: code
     start: 0x3D5020
     vram: 0xE00D6000
     subsegments:
-    - [0x3D5020, c, effect_107]
+    - [0x3D5020, c, energy_in_out]
     - [0x3D5E60, data]
-  - [0x3D5F30, bin] # effect 107 gfx
-  - name: effect_108
+  - [0x3D5F30, bin] # energy_in_out gfx
+  - name: effect_tattle_window
     dir: effects
     type: code
     start: 0x3D67C0
     vram: 0xE00D8000
     subsegments:
-    - [0x3D67C0, c, effect_108]
+    - [0x3D67C0, c, tattle_window]
     - [0x3D6FA0, data]
-  - [0x3D7040, bin] # effect 108 gfx
-  - name: effect_109
+  - [0x3D7040, bin] # tattle_window gfx
+  - name: effect_shiny_flare
     dir: effects
     type: code
     start: 0x3D7240
     vram: 0xE00DA000
     subsegments:
-    - [0x3D7240, c, effect_109]
+    - [0x3D7240, c, shiny_flare]
     - [0x3D7740, data]
-  - [0x3D7770, bin] # effect 109 gfx
-  - name: effect_110
+  - [0x3D7770, bin] # shiny_flare gfx
+  - name: effect_huff_puff_breath
     dir: effects
     type: code
     start: 0x3D7A70
     vram: 0xE00DC000
     subsegments:
-    - [0x3D7A70, c, effect_110]
+    - [0x3D7A70, c, huff_puff_breath]
     - [0x3D80B0, data]
-  - [0x3D80C0, bin] # effect 110 gfx
-  - name: effect_111
+  - [0x3D80C0, bin] # huff_puff_breath gfx
+  - name: effect_cold_breath
     dir: effects
     type: code
     start: 0x3D8720
     vram: 0xE00DE000
     subsegments:
-    - [0x3D8720, c, effect_111]
+    - [0x3D8720, c, cold_breath]
     - [0x3D8F30, data]
-  - [0x3D9100, bin] # effect 111 gfx
-  - name: effect_112
+  - [0x3D9100, bin] # ecold_breath gfx
+  - name: effect_embers
     dir: effects
     type: code
     start: 0x3DB460
     vram: 0xE00E0000
     subsegments:
-    - [0x3DB460, c, effect_112]
+    - [0x3DB460, c, embers]
     - [0x3DBEA0, data]
-  - [0x3DBF40, bin] # effect 112 gfx
-  - name: effect_113
+  - [0x3DBF40, bin] # embers gfx
+  - name: effect_hieroglyphs
     dir: effects
     type: code
     start: 0x3DC310
     vram: 0xE00E2000
     subsegments:
-    - [0x3DC310, c, effect_113]
+    - [0x3DC310, c, hieroglyphs]
     - [0x3DCD00, data]
-  - [0x3DCD50, bin] # effect 113 gfx
-  - name: effect_114
+  - [0x3DCD50, bin] # hieroglyphs gfx
+  - name: effect_misc_particles
     dir: effects
     type: code
     start: 0x3DE000
     vram: 0xE00E4000
     subsegments:
-    - [0x3DE000, c, effect_114]
+    - [0x3DE000, c, misc_particles]
     - [0x3DED90, data]
-  - [0x3DEE60, bin] # effect 114 gfx
-  - name: effect_115
+  - [0x3DEE60, bin] # misc_particles gfx
+  - name: effect_static_status
     dir: effects
     type: code
     start: 0x3E0930
     vram: 0xE00E6000
     subsegments:
-    - [0x3E0930, c, effect_115]
+    - [0x3E0930, c, static_status]
     - [0x3E11B0, data]
-  - [0x3E12D0, bin] # effect 115 gfx
-  - name: effect_116
+  - [0x3E12D0, bin] # static_status gfx
+  - name: effect_moving_cloud
     dir: effects
     type: code
     start: 0x3E1690
     vram: 0xE00E8000
     subsegments:
-    - [0x3E1690, c, effect_116]
+    - [0x3E1690, c, moving_cloud]
     - [0x3E1CC0, data]
-  - [0x3E1CD0, bin] # effect 116 gfx
-  - name: effect_117
+  - [0x3E1CD0, bin] # moving_cloud gfx
+  - name: effect_effect_75
     dir: effects
     type: code
     start: 0x3E1EE0
     vram: 0xE00EA000
     subsegments:
-    - [0x3E1EE0, c, effect_117]
+    - [0x3E1EE0, c, effect_75]
     - [0x3E2930]
-  - [0x3E2960, bin] # effect 117 gfx
-  - name: effect_119
+  - [0x3E2960, bin] # effect_75 gfx
+  - name: effect_firework_rocket
     dir: effects
     type: code
     start: 0x3E43A0
     vram: 0xE010A000
     subsegments:
-    - [0x3E43A0, c, effect_119]
+    - [0x3E43A0, c, firework_rocket]
     - [0x3E5060, data]
-  - [0x3E5350, bin] # effect 119 gfx
-  - name: effect_120
+  - [0x3E5350, bin] # firework_rocket gfx
+  - name: effect_peach_star_beam
     dir: effects
     type: code
     start: 0x3E54C0
     vram: 0xE010C000
     subsegments:
-    - [0x3E54C0, c, effect_120]
+    - [0x3E54C0, c, peach_star_beam]
     - [0x3E5ED0, data]
-  - [0x3E5F30, bin] # effect 120 gfx
-  - name: effect_121
+  - [0x3E5F30, bin] # peach_star_beam gfx
+  - name: effect_chapter_change
     dir: effects
     type: code
     start: 0x3EB4E0
     vram: 0xE010E000
     subsegments:
-    - [0x3EB4E0, c, effect_121]
+    - [0x3EB4E0, c, chapter_change]
     - [0x3EBC30, data]
-  - type: group # effect 121 gfx
+  - type: group # chapter_change gfx
     start: 0x3EBE60
     subsegments:
     - [0x3EBE60, ia8,    world/ch0,               144, 40]
@@ -3211,24 +3211,24 @@ segments:
     - [0x3F6BA0, ia8,    world/ch8,               64,  64]
     - [0x3F7BA0, rgba16, world/chapter_rainbow,   8,  16]
     - [0x3F7CA0, bin]
-  - name: effect_122
+  - name: effect_ice_shard
     dir: effects
     type: code
     start: 0x3F83F0
     vram: 0xE0110000
     subsegments:
-    - [0x3F83F0, c, effect_122]
+    - [0x3F83F0, c, ice_shard]
     - [0x3F8CA0, data]
-  - [0x3F8CC0, bin] # effect 122 gfx
-  - name: effect_123
+  - [0x3F8CC0, bin] # ice_shard gfx
+  - name: effect_spirit_card
     dir: effects
     type: code
     start: 0x3F9E50
     vram: 0xE0112000
     subsegments:
-    - [0x3F9E50, c, effect_123]
+    - [0x3F9E50, c, spirit_card]
     - [0x3FA480, data]
-  - type: group # effect 123,125 gfx
+  - type: group # effect spirit_card, something_rotating gfx
     start: 0x3FA4B0
     subsegments:
     - start: 0x3FA4B0
@@ -3311,41 +3311,41 @@ segments:
       height: 48
     - [0x3FE0B0, palette, star_cards/klevar]
     - [0x3FE0D0, bin]
-  - name: effect_124
+  - name: effect_lil_oink
     dir: effects
     type: code
     start: 0x3FEAE0
     vram: 0xE0114000
     subsegments:
-    - [0x3FEAE0, c, effect_124]
+    - [0x3FEAE0, c, lil_oink]
     - [0x3FF180, data]
-  - [0x3FF250, bin] # effect 124 gfx
-  - name: effect_125
+  - [0x3FF250, bin] # lil_oink gfx
+  - name: effect_something_rotating
     dir: effects
     type: code
     start: 0x402640
     vram: 0xE0116000
     subsegments:
-    - [0x402640, c, effect_125]
+    - [0x402640, c, something_rotating]
     - [0x4032A0, data]
-  - name: effect_126
+  - name: effect_breaking_junk
     dir: effects
     type: code
     start: 0x403400
     vram: 0xE0118000
     subsegments:
-    - [0x403400, c, effect_126]
+    - [0x403400, c, breaking_junk]
     - [0x403BB0, data]
-  - [0x403BF0, bin] # effect 126 gfx
-  - name: effect_127
+  - [0x403BF0, bin] # breaking_junk gfx
+  - name: effect_partner_buff
     dir: effects
     type: code
     start: 0x404220
     vram: 0xE011A000
     subsegments:
-    - [0x404220, c, effect_127]
+    - [0x404220, c, partner_buff]
     - [0x404E40, data]
-  - type: group # effect 127 gfx
+  - type: group # partner_buff gfx
     start: 0x404F40
     subsegments:
     - start: 0x404F40
@@ -3377,68 +3377,68 @@ segments:
       height: 160
     - [0x406540, palette, world/numbers]
     - [0x406740, bin]
-  - name: effect_128
+  - name: effect_quizmo_assistant
     dir: effects
     type: code
     start: 0x406B40
     vram: 0xE011C000
     subsegments:
-    - [0x406B40, c, effect_128]
+    - [0x406B40, c, quizmo_assistant]
     - [0x407040, data]
-  - [0x407080, bin] # effect 128 gfx
-  - name: effect_129
+  - [0x407080, bin] # quizmo_assistant gfx
+  - name: effect_ice_pillar
     dir: effects
     type: code
     start: 0x409990
     vram: 0xE011E000
     subsegments:
-    - [0x409990, c, effect_129]
+    - [0x409990, c, ice_pillar]
     - [0x40A180, data]
-  - [0x40A1C0, bin] # effect 129 gfx
-  - name: effect_130
+  - [0x40A1C0, bin] # ice_pillar gfx
+  - name: effect_sun
     dir: effects
     type: code
     start: 0x40B3F0
     vram: 0xE0120000
     subsegments:
-    - [0x40B3F0, c, effect_130]
+    - [0x40B3F0, c, sun]
     - [0x40BB70, data]
-  - [0x40BBA0, bin] # effect 130 gfx
-  - name: effect_131
+  - [0x40BBA0, bin] # sun gfx
+  - name: effect_star_spirits_energy
     dir: effects
     type: code
     start: 0x40C5A0
     vram: 0xE0122000
     subsegments:
-    - [0x40C5A0, c, effect_131]
+    - [0x40C5A0, c, star_spirits_energy]
     - [0x40D130, data]
-  - [0x40D290, bin] # effect 131 gfx
-  - name: effect_132
+  - [0x40D290, bin] # star_spirits_energy gfx
+  - name: effect_pink_sparkles
     dir: effects
     type: code
     start: 0x412730
     vram: 0xE0124000
     subsegments:
-    - [0x412730, c, effect_132]
+    - [0x412730, c, pink_sparkles]
     - [0x412FD0, data]
-  - name: effect_133
+  - name: effect_star_outline
     dir: effects
     type: code
     start: 0x413360
     vram: 0xE0126000
     subsegments:
-    - [0x413360, c, effect_133]
+    - [0x413360, c, star_outline]
     - [0x413F20, data]
-  - [0x413FA0, bin] # effect 133 gfx
-  - name: effect_134
+  - [0x413FA0, bin] # star_outline gfx
+  - name: effect_effect_86
     dir: effects
     type: code
     start: 0x414BA0
     vram: 0xE0128000
     subsegments:
-    - [0x414BA0, c, effect_134]
+    - [0x414BA0, c, effect_86]
     - [0x415020]
-  - [0x415060, bin] # effect 134 gfx
+  - [0x415060, bin] # effect_86 gfx
   - type: code
     start: 0x415D90
     vram: 0x802A1000
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 155b67175d..1631ee6f1e 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -1146,140 +1146,140 @@ osFlashSectorErase = 0x8006F424; // type:func rom:0x4A824
 osFlashWriteBuffer = 0x8006F550; // type:func rom:0x4A950
 osFlashWriteArray = 0x8006F61C; // type:func rom:0x4AA1C
 osFlashReadArray = 0x8006F75C; // type:func rom:0x4AB5C
-playFX_00 = 0x8006F890; // type:func rom:0x4AC90
-playFX_01 = 0x8006F8F0; // type:func rom:0x4ACF0
+fx_big_dust_puff = 0x8006F890; // type:func rom:0x4AC90
+fx_big_smoke_puff = 0x8006F8F0; // type:func rom:0x4ACF0
 playFX_02 = 0x8006F950; // type:func rom:0x4AD50
 playFX_03 = 0x8006F9B0; // type:func rom:0x4ADB0
 playFX_04 = 0x8006FA10; // type:func rom:0x4AE10
 playFX_05 = 0x8006FA70; // type:func rom:0x4AE70
-fx_land = 0x8006FAD0; // type:func rom:0x4AED0
-fx_walk = 0x8006FB30; // type:func rom:0x4AF30
-playFX_08 = 0x8006FB90; // type:func rom:0x4AF90
-playFX_09 = 0x8006FBF0; // type:func rom:0x4AFF0
-playFX_0A = 0x8006FC50; // type:func rom:0x4B050
-playFX_0B = 0x8006FCB0; // type:func rom:0x4B0B0
-playFX_0C = 0x8006FD10; // type:func rom:0x4B110
-playFX_0D = 0x8006FD70; // type:func rom:0x4B170
-playFX_0E = 0x8006FDD0; // type:func rom:0x4B1D0
-playFX_0F = 0x8006FE30; // type:func rom:0x4B230
+fx_landing_dust = 0x8006FAD0; // type:func rom:0x4AED0
+fx_walking_dust = 0x8006FB30; // type:func rom:0x4AF30
+fx_flower_splash = 0x8006FB90; // type:func rom:0x4AF90
+fx_flower = 0x8006FBF0; // type:func rom:0x4AFF0
+fx_cloud_puff = 0x8006FC50; // type:func rom:0x4B050
+fx_cloud_trail = 0x8006FCB0; // type:func rom:0x4B0B0
+fx_footprint = 0x8006FD10; // type:func rom:0x4B110
+fx_floating_flower = 0x8006FD70; // type:func rom:0x4B170
+fx_snowflake = 0x8006FDD0; // type:func rom:0x4B1D0
+fx_star = 0x8006FE30; // type:func rom:0x4B230
 fx_emote = 0x8006FE90; // type:func rom:0x4B290
-playFX_11 = 0x8006FEF0; // type:func rom:0x4B2F0
-playFX_12 = 0x8006FF50; // type:func rom:0x4B350
-playFX_13 = 0x8006FFB0; // type:func rom:0x4B3B0
-playFX_14 = 0x80070010; // type:func rom:0x4B410
-playFX_15 = 0x80070070; // type:func rom:0x4B470
-playFX_16 = 0x800700D0; // type:func rom:0x4B4D0
-playFX_17 = 0x80070130; // type:func rom:0x4B530
-playFX_18 = 0x80070190; // type:func rom:0x4B590
-playFX_19 = 0x800701F0; // type:func rom:0x4B5F0
-playFX_1A = 0x80070250; // type:func rom:0x4B650
-playFX_1B = 0x800702B0; // type:func rom:0x4B6B0
-playFX_1C = 0x80070310; // type:func rom:0x4B710
-playFX_1D = 0x80070370; // type:func rom:0x4B770
-playFX_1E = 0x800703D0; // type:func rom:0x4B7D0
-playFX_1F = 0x80070430; // type:func rom:0x4B830
-playFX_20 = 0x80070490; // type:func rom:0x4B890
-playFX_21 = 0x800704F0; // type:func rom:0x4B8F0
-playFX_22 = 0x80070550; // type:func rom:0x4B950
-playFX_23 = 0x800705B0; // type:func rom:0x4B9B0
-playFX_24 = 0x80070610; // type:func rom:0x4BA10
-playFX_25 = 0x80070670; // type:func rom:0x4BA70
-playFX_26 = 0x800706D0; // type:func rom:0x4BAD0
-playFX_27 = 0x80070730; // type:func rom:0x4BB30
+fx_sparkles = 0x8006FEF0; // type:func rom:0x4B2F0
+fx_shape_spell = 0x8006FF50; // type:func rom:0x4B350
+fx_gather_energy_pink = 0x8006FFB0; // type:func rom:0x4B3B0
+fx_drop_leaves = 0x80070010; // type:func rom:0x4B410
+fx_dust = 0x80070070; // type:func rom:0x4B470
+fx_shattering_stones = 0x800700D0; // type:func rom:0x4B4D0
+fx_smoke_ring = 0x80070130; // type:func rom:0x4B530
+fx_damage_stars = 0x80070190; // type:func rom:0x4B590
+fx_explosion = 0x800701F0; // type:func rom:0x4B5F0
+fx_lens_flare = 0x80070250; // type:func rom:0x4B650
+fx_got_item_outline = 0x800702B0; // type:func rom:0x4B6B0
+fx_spiky_white_aura = 0x80070310; // type:func rom:0x4B710
+fx_smoke_impact = 0x80070370; // type:func rom:0x4B770
+fx_damage_indicator = 0x800703D0; // type:func rom:0x4B7D0
+fx_purple_ring = 0x80070430; // type:func rom:0x4B830
+fx_flame = 0x80070490; // type:func rom:0x4B890
+fx_stars_burst = 0x800704F0; // type:func rom:0x4B8F0
+fx_stars_shimmer = 0x80070550; // type:func rom:0x4B950
+fx_rising_bubble = 0x800705B0; // type:func rom:0x4B9B0
+fx_ring_blast = 0x80070610; // type:func rom:0x4BA10
+fx_shockwave = 0x80070670; // type:func rom:0x4BA70
+fx_music_note = 0x800706D0; // type:func rom:0x4BAD0
+fx_smoke_burst = 0x80070730; // type:func rom:0x4BB30
 fx_sweat = 0x80070790; // type:func rom:0x4BB90
 fx_sleep_bubble = 0x800707F0; // type:func rom:0x4BBF0
 playFX_2A = 0x80070850; // type:func rom:0x4BC50
-playFX_2B = 0x800708B0; // type:func rom:0x4BCB0
-playFX_2C = 0x80070910; // type:func rom:0x4BD10
-playFX_2D = 0x80070970; // type:func rom:0x4BD70
-playFX_2E = 0x800709D0; // type:func rom:0x4BDD0
-playFX_2F = 0x80070A30; // type:func rom:0x4BE30
-playFX_30 = 0x80070A90; // type:func rom:0x4BE90
-playFX_31 = 0x80070AF0; // type:func rom:0x4BEF0
-playFX_32 = 0x80070B50; // type:func rom:0x4BF50
-playFX_33 = 0x80070BB0; // type:func rom:0x4BFB0
-playFX_34 = 0x80070C10; // type:func rom:0x4C010
-playFX_35 = 0x80070C70; // type:func rom:0x4C070
-playFX_36 = 0x80070CD0; // type:func rom:0x4C0D0
-playFX_37 = 0x80070D30; // type:func rom:0x4C130
-playFX_38 = 0x80070D90; // type:func rom:0x4C190
-playFX_39 = 0x80070DF0; // type:func rom:0x4C1F0
-playFX_3A = 0x80070E50; // type:func rom:0x4C250
-playFX_3B = 0x80070EB0; // type:func rom:0x4C2B0
+fx_windy_leaves = 0x800708B0; // type:func rom:0x4BCB0
+fx_falling_leaves = 0x80070910; // type:func rom:0x4BD10
+fx_stars_spread = 0x80070970; // type:func rom:0x4BD70
+fx_steam_burst = 0x800709D0; // type:func rom:0x4BDD0
+fx_stars_orbiting = 0x80070A30; // type:func rom:0x4BE30
+fx_big_snowflakes = 0x80070A90; // type:func rom:0x4BE90
+fx_debuff = 0x80070AF0; // type:func rom:0x4BEF0
+fx_green_impact = 0x80070B50; // type:func rom:0x4BF50
+fx_radial_shimmer = 0x80070BB0; // type:func rom:0x4BFB0
+fx_ending_decals = 0x80070C10; // type:func rom:0x4C010
+fx_light_rays = 0x80070C70; // type:func rom:0x4C070
+fx_lightning = 0x80070CD0; // type:func rom:0x4C0D0
+fx_fire_breath = 0x80070D30; // type:func rom:0x4C130
+fx_shimmer_burst = 0x80070D90; // type:func rom:0x4C190
+fx_energy_shockwave = 0x80070DF0; // type:func rom:0x4C1F0
+fx_shimmer_wave = 0x80070E50; // type:func rom:0x4C250
+fx_aura = 0x80070EB0; // type:func rom:0x4C2B0
 playFX_3C = 0x80070F10; // type:func rom:0x4C310
 playFX_3D = 0x80070F70; // type:func rom:0x4C370
-playFX_3E = 0x80070FD0; // type:func rom:0x4C3D0
-playFX_3F = 0x80071030; // type:func rom:0x4C430
-playFX_40 = 0x80071090; // type:func rom:0x4C490
-playFX_41 = 0x800710F0; // type:func rom:0x4C4F0
-playFX_42 = 0x80071150; // type:func rom:0x4C550
-playFX_43 = 0x800711B0; // type:func rom:0x4C5B0
-playFX_44 = 0x80071210; // type:func rom:0x4C610
-playFX_45 = 0x80071270; // type:func rom:0x4C670
+fx_blast = 0x80070FD0; // type:func rom:0x4C3D0
+fx_fire_flower = 0x80071030; // type:func rom:0x4C430
+fx_recover = 0x80071090; // type:func rom:0x4C490
+fx_disable_x = 0x800710F0; // type:func rom:0x4C4F0
+fx_bombette_breaking = 0x80071150; // type:func rom:0x4C550
+fx_firework = 0x800711B0; // type:func rom:0x4C5B0
+fx_confetti = 0x80071210; // type:func rom:0x4C610
+fx_snowfall = 0x80071270; // type:func rom:0x4C670
 playFX_46_whirlwind = 0x800712D0; // type:func rom:0x4C6D0
-playFX_47 = 0x80071330; // type:func rom:0x4C730
-playFX_48 = 0x80071390; // type:func rom:0x4C790
-playFX_49 = 0x800713F0; // type:func rom:0x4C7F0
-playFX_4A = 0x80071450; // type:func rom:0x4C850
-playFX_4B = 0x800714B0; // type:func rom:0x4C8B0
-playFX_4C = 0x80071510; // type:func rom:0x4C910
-playFX_4D = 0x80071570; // type:func rom:0x4C970
-playFX_4E = 0x800715D0; // type:func rom:0x4C9D0
-playFX_4F = 0x80071630; // type:func rom:0x4CA30
-playFX_50 = 0x80071690; // type:func rom:0x4CA90
-playFX_51 = 0x800716F0; // type:func rom:0x4CAF0
-playFX_52 = 0x80071750; // type:func rom:0x4CB50
-playFX_53 = 0x800717B0; // type:func rom:0x4CBB0
-playFX_54 = 0x80071810; // type:func rom:0x4CC10
-playFX_55 = 0x80071870; // type:func rom:0x4CC70
-playFX_56 = 0x800718D0; // type:func rom:0x4CCD0
-playFX_57 = 0x80071930; // type:func rom:0x4CD30
-playFX_58 = 0x80071990; // type:func rom:0x4CD90
-playFX_59 = 0x800719F0; // type:func rom:0x4CDF0
-playFX_5A = 0x80071A50; // type:func rom:0x4CE50
-playFX_5B = 0x80071AB0; // type:func rom:0x4CEB0
-playFX_5C = 0x80071B10; // type:func rom:0x4CF10
-playFX_5D = 0x80071B70; // type:func rom:0x4CF70
-playFX_5E = 0x80071BD0; // type:func rom:0x4CFD0
-playFX_5F = 0x80071C30; // type:func rom:0x4D030
-playFX_60 = 0x80071C90; // type:func rom:0x4D090
-playFX_61 = 0x80071CF0; // type:func rom:0x4D0F0
-playFX_62 = 0x80071D50; // type:func rom:0x4D150
+fx_gather_magic = 0x80071330; // type:func rom:0x4C730
+fx_attack_result_text = 0x80071390; // type:func rom:0x4C790
+fx_small_gold_sparkle = 0x800713F0; // type:func rom:0x4C7F0
+fx_flashing_box_shockwave = 0x80071450; // type:func rom:0x4C850
+fx_balloon = 0x800714B0; // type:func rom:0x4C8B0
+fx_floating_rock = 0x80071510; // type:func rom:0x4C910
+fx_chomp_drop = 0x80071570; // type:func rom:0x4C970
+fx_quizmo_stage = 0x800715D0; // type:func rom:0x4C9D0
+fx_radiating_energy_orb = 0x80071630; // type:func rom:0x4CA30
+fx_quizmo_answer = 0x80071690; // type:func rom:0x4CA90
+fx_motion_blur_flame = 0x800716F0; // type:func rom:0x4CAF0
+fx_energy_orb_wave = 0x80071750; // type:func rom:0x4CB50
+fx_merlin_house_stars = 0x800717B0; // type:func rom:0x4CBB0
+fx_quizmo_audience = 0x80071810; // type:func rom:0x4CC10
+fx_butterflies = 0x80071870; // type:func rom:0x4CC70
+fx_stat_change = 0x800718D0; // type:func rom:0x4CCD0
+fx_snaking_static = 0x80071930; // type:func rom:0x4CD30
+fx_thunderbolt_ring = 0x80071990; // type:func rom:0x4CD90
+fx_squirt = 0x800719F0; // type:func rom:0x4CDF0
+fx_water_block = 0x80071A50; // type:func rom:0x4CE50
+fx_waterfall = 0x80071AB0; // type:func rom:0x4CEB0
+fx_water_fountain = 0x80071B10; // type:func rom:0x4CF10
+fx_underwater = 0x80071B70; // type:func rom:0x4CF70
+fx_lightning_bolt = 0x80071BD0; // type:func rom:0x4CFD0
+fx_water_splash = 0x80071C30; // type:func rom:0x4D030
+fx_snowman_doll = 0x80071C90; // type:func rom:0x4D090
+fx_fright_jar = 0x80071CF0; // type:func rom:0x4D0F0
+fx_stop_watch = 0x80071D50; // type:func rom:0x4D150
 playFX_63 = 0x80071DB0; // type:func rom:0x4D1B0
-playFX_64 = 0x80071E10; // type:func rom:0x4D210
+fx_throw_spiny = 0x80071E10; // type:func rom:0x4D210
 playFX_65 = 0x80071E70; // type:func rom:0x4D270
-playFX_66 = 0x80071ED0; // type:func rom:0x4D2D0
-playFX_67 = 0x80071F30; // type:func rom:0x4D330
-playFX_68 = 0x80071F90; // type:func rom:0x4D390
-playFX_69 = 0x80071FF0; // type:func rom:0x4D3F0
+fx_tubba_heart_attack = 0x80071ED0; // type:func rom:0x4D2D0
+fx_whirlwind = 0x80071F30; // type:func rom:0x4D330
+fx_red_impact = 0x80071F90; // type:func rom:0x4D390
+fx_floating_cloud_puff = 0x80071FF0; // type:func rom:0x4D3F0
 playFX_6A = 0x80072050; // type:func rom:0x4D450
-playFX_6B = 0x800720B0; // type:func rom:0x4D4B0
-playFX_6C = 0x80072110; // type:func rom:0x4D510
-playFX_6D = 0x80072170; // type:func rom:0x4D570
-playFX_6E = 0x800721D0; // type:func rom:0x4D5D0
-playFX_6F = 0x80072230; // type:func rom:0x4D630
-playFX_70 = 0x80072290; // type:func rom:0x4D690
-playFX_71 = 0x800722F0; // type:func rom:0x4D6F0
-playFX_72 = 0x80072350; // type:func rom:0x4D750
-playFX_73 = 0x800723B0; // type:func rom:0x4D7B0
-playFX_74 = 0x80072410; // type:func rom:0x4D810
+fx_energy_in_out = 0x800720B0; // type:func rom:0x4D4B0
+fx_tattle_window = 0x80072110; // type:func rom:0x4D510
+fx_shiny_flare = 0x80072170; // type:func rom:0x4D570
+fx_huff_puff_breath = 0x800721D0; // type:func rom:0x4D5D0
+fx_cold_breath = 0x80072230; // type:func rom:0x4D630
+fx_embers = 0x80072290; // type:func rom:0x4D690
+fx_hieroglyphs = 0x800722F0; // type:func rom:0x4D6F0
+fx_misc_particles = 0x80072350; // type:func rom:0x4D750
+fx_static_status = 0x800723B0; // type:func rom:0x4D7B0
+fx_moving_cloud = 0x80072410; // type:func rom:0x4D810
 playFX_75 = 0x80072470; // type:func rom:0x4D870
 playFX_76 = 0x800724D0; // type:func rom:0x4D8D0
-playFX_77 = 0x80072530; // type:func rom:0x4D930
-playFX_78 = 0x80072590; // type:func rom:0x4D990
-playFX_79 = 0x800725F0; // type:func rom:0x4D9F0
-playFX_7A = 0x80072650; // type:func rom:0x4DA50
-playFX_7B = 0x800726B0; // type:func rom:0x4DAB0
-playFX_7C = 0x80072710; // type:func rom:0x4DB10
-playFX_7D = 0x80072770; // type:func rom:0x4DB70
-playFX_7E = 0x800727D0; // type:func rom:0x4DBD0
-playFX_7F = 0x80072830; // type:func rom:0x4DC30
-playFX_80 = 0x80072890; // type:func rom:0x4DC90
-playFX_81 = 0x800728F0; // type:func rom:0x4DCF0
-playFX_82 = 0x80072950; // type:func rom:0x4DD50
-playFX_83 = 0x800729B0; // type:func rom:0x4DDB0
-playFX_84 = 0x80072A10; // type:func rom:0x4DE10
-playFX_85 = 0x80072A70; // type:func rom:0x4DE70
+fx_firework_rocket = 0x80072530; // type:func rom:0x4D930
+fx_peach_star_beam = 0x80072590; // type:func rom:0x4D990
+fx_chapter_change = 0x800725F0; // type:func rom:0x4D9F0
+fx_ice_shard = 0x80072650; // type:func rom:0x4DA50
+fx_spirit_card = 0x800726B0; // type:func rom:0x4DAB0
+fx_lil_oink = 0x80072710; // type:func rom:0x4DB10
+fx_something_rotating = 0x80072770; // type:func rom:0x4DB70
+fx_breaking_junk = 0x800727D0; // type:func rom:0x4DBD0
+fx_partner_buff = 0x80072830; // type:func rom:0x4DC30
+fx_quizmo_assistant = 0x80072890; // type:func rom:0x4DC90
+fx_ice_pillar = 0x800728F0; // type:func rom:0x4DCF0
+fx_sun = 0x80072950; // type:func rom:0x4DD50
+fx_star_spirits_energy = 0x800729B0; // type:func rom:0x4DDB0
+fx_pink_sparkles = 0x80072A10; // type:func rom:0x4DE10
+fx_star_outline = 0x80072A70; // type:func rom:0x4DE70
 playFX_86 = 0x80072AD0; // type:func rom:0x4DED0
 reset_battle_status = 0x80072B30; // type:func rom:0x4DF30
 ALT_reset_battle_status = 0x80072BB0; // type:func rom:0x4DFB0
@@ -6000,16 +6000,16 @@ shim_sfx_play_sound_at_position = 0xE0200680; // type:func rom:0x326150
 D_E0200690 = 0xE0200690; // type:data rom:0x326160
 effectFuncs = 0xE0200694; // type:data rom:0x326164
 D_E0200734 = 0xE0200734; // type:data rom:0x326204
-fx_1_main = 0xE0002000; // type:func rom:0x3278F0
-fx_1_init = 0xE00021B4; // type:func rom:0x327AA4
-fx_1_update = 0xE00021BC; // type:func rom:0x327AAC
-fx_1_render = 0xE00022BC; // type:func rom:0x327BAC
-fx_1_appendGfx = 0xE0002300; // type:func rom:0x327BF0
+big_smoke_puff_main = 0xE0002000; // type:func rom:0x3278F0
+big_smoke_puff_init = 0xE00021B4; // type:func rom:0x327AA4
+big_smoke_puff_update = 0xE00021BC; // type:func rom:0x327AAC
+big_smoke_puff_render = 0xE00022BC; // type:func rom:0x327BAC
+big_smoke_puff_appendGfx = 0xE0002300; // type:func rom:0x327BF0
 func_E0002738 = 0xE0002738; // type:func rom:0x328028
 func_E000C000 = 0xE000C000; // type:func rom:0x328110
 func_E000C094 = 0xE000C094; // type:func rom:0x3281A4
 func_E000C0C8 = 0xE000C0C8; // type:func rom:0x3281D8
-fx_6_main = 0xE000C160; // type:func rom:0x328270
+landing_dust_main = 0xE000C160; // type:func rom:0x328270
 fx_6_init = 0xE000C64C; // type:func rom:0x32875C
 fx_6_update = 0xE000C654; // type:func rom:0x328764
 fx_6_render = 0xE000C754; // type:func rom:0x328864
@@ -6049,34 +6049,34 @@ fx_11_update = 0xE0016228; // type:func rom:0x32F058
 fx_11_render = 0xE0016410; // type:func rom:0x32F240
 fx_11_appendGfx = 0xE0016454; // type:func rom:0x32F284
 func_E0018000 = 0xE0018000; // type:func rom:0x32F580
-fx_12_main = 0xE0018078; // type:func rom:0x32F5F8
-fx_12_init = 0xE00182AC; // type:func rom:0x32F82C
-fx_12_update = 0xE00182B4; // type:func rom:0x32F834
-fx_12_render = 0xE0018378; // type:func rom:0x32F8F8
+footprint_main = 0xE0018078; // type:func rom:0x32F5F8
+footprint_init = 0xE00182AC; // type:func rom:0x32F82C
+footprint_update = 0xE00182B4; // type:func rom:0x32F834
+footprint_render = 0xE0018378; // type:func rom:0x32F8F8
 func_E00183BC = 0xE00183BC; // type:func rom:0x32F93C
-fx_12_appendGfx = 0xE00183D8; // type:func rom:0x32F958
-fx_13_main = 0xE001A000; // type:func rom:0x32FE30
-fx_13_init = 0xE001A21C; // type:func rom:0x33004C
-fx_13_update = 0xE001A224; // type:func rom:0x330054
-fx_13_render = 0xE001A3FC; // type:func rom:0x33022C
-fx_13_appendGfx = 0xE001A440; // type:func rom:0x330270
+footprint_appendGfx = 0xE00183D8; // type:func rom:0x32F958
+floating_flower_main = 0xE001A000; // type:func rom:0x32FE30
+floating_flower_init = 0xE001A21C; // type:func rom:0x33004C
+floating_flower_update = 0xE001A224; // type:func rom:0x330054
+floating_flower_render = 0xE001A3FC; // type:func rom:0x33022C
+floating_flower_appendGfx = 0xE001A440; // type:func rom:0x330270
 D_E001A610 = 0xE001A610; // type:data rom:0x330440
-fx_14_main = 0xE001C000; // type:func rom:0x330910
-fx_14_init = 0xE001C120; // type:func rom:0x330A30
-fx_14_update = 0xE001C128; // type:func rom:0x330A38
-fx_14_render = 0xE001C200; // type:func rom:0x330B10
-fx_14_appendGfx = 0xE001C30C; // type:func rom:0x330C1C
-fx_15_main = 0xE001E000; // type:func rom:0x331940
-fx_15_init = 0xE001E370; // type:func rom:0x331CB0
-fx_15_update = 0xE001E378; // type:func rom:0x331CB8
-fx_15_render = 0xE001E6E8; // type:func rom:0x332028
-fx_15_appendGfx = 0xE001E730; // type:func rom:0x332070
+snowflake_main = 0xE001C000; // type:func rom:0x330910
+snowflake_init = 0xE001C120; // type:func rom:0x330A30
+snowflake_update = 0xE001C128; // type:func rom:0x330A38
+snowflake_render = 0xE001C200; // type:func rom:0x330B10
+snowflake_appendGfx = 0xE001C30C; // type:func rom:0x330C1C
+star_main = 0xE001E000; // type:func rom:0x331940
+star_init = 0xE001E370; // type:func rom:0x331CB0
+star_update = 0xE001E378; // type:func rom:0x331CB8
+star_render = 0xE001E6E8; // type:func rom:0x332028
+star_appendGfx = 0xE001E730; // type:func rom:0x332070
 func_E0020000 = 0xE0020000; // type:func rom:0x333EC0
-fx_16_main = 0xE00202CC; // type:func rom:0x33418C
-fx_16_init = 0xE0020460; // type:func rom:0x334320
-fx_16_update = 0xE0020468; // type:func rom:0x334328
-fx_16_render = 0xE002058C; // type:func rom:0x33444C
-fx_16_appendGfx = 0xE00205D0; // type:func rom:0x334490
+emote_main = 0xE00202CC; // type:func rom:0x33418C
+emote_init = 0xE0020460; // type:func rom:0x334320
+emote_update = 0xE0020468; // type:func rom:0x334328
+emote_render = 0xE002058C; // type:func rom:0x33444C
+emote_appendGfx = 0xE00205D0; // type:func rom:0x334490
 D_E0020C90 = 0xE0020C90; // type:data rom:0x334B50
 D_E0020CA4 = 0xE0020CA4; // type:data rom:0x334B64
 D_E0020CB8 = 0xE0020CB8; // type:data rom:0x334B78
@@ -6086,264 +6086,264 @@ D_E0020D24 = 0xE0020D24; // type:data rom:0x334BE4
 D_E0020D30 = 0xE0020D30; // type:data rom:0x334BF0
 D_E0020D80 = 0xE0020D80; // type:data rom:0x334C40
 D_E0020D94 = 0xE0020D94; // type:data rom:0x334C54
-fx_17_main = 0xE0022000; // type:func rom:0x337240
-fx_17_init = 0xE0022544; // type:func rom:0x337784
-fx_17_update = 0xE002254C; // type:func rom:0x33778C
-fx_17_render = 0xE0022960; // type:func rom:0x337BA0
-fx_17_appendGfx = 0xE0022998; // type:func rom:0x337BD8
-fx_18_main = 0xE0024000; // type:func rom:0x339250
-fx_18_init = 0xE0024180; // type:func rom:0x3393D0
-fx_18_update = 0xE0024188; // type:func rom:0x3393D8
-fx_18_render = 0xE00242E0; // type:func rom:0x339530
+sparkles_main = 0xE0022000; // type:func rom:0x337240
+sparkles_init = 0xE0022544; // type:func rom:0x337784
+sparkles_update = 0xE002254C; // type:func rom:0x33778C
+sparkles_render = 0xE0022960; // type:func rom:0x337BA0
+sparkles_appendGfx = 0xE0022998; // type:func rom:0x337BD8
+shape_spell_main = 0xE0024000; // type:func rom:0x339250
+shape_spell_init = 0xE0024180; // type:func rom:0x3393D0
+shape_spell_update = 0xE0024188; // type:func rom:0x3393D8
+shape_spell_render = 0xE00242E0; // type:func rom:0x339530
 func_E0024324 = 0xE0024324; // type:func rom:0x339574
 func_E00243BC = 0xE00243BC; // type:func rom:0x33960C
-fx_18_appendGfx = 0xE0024454; // type:func rom:0x3396A4
-fx_19_main = 0xE0026000; // type:func rom:0x33B180
-fx_19_init = 0xE0026184; // type:func rom:0x33B304
-fx_19_update = 0xE002618C; // type:func rom:0x33B30C
-fx_19_render = 0xE00264B0; // type:func rom:0x33B630
-fx_19_appendGfx = 0xE00264F4; // type:func rom:0x33B674
-fx_20_main = 0xE0028000; // type:func rom:0x33CDF0
-fx_20_init = 0xE0028240; // type:func rom:0x33D030
-fx_20_update = 0xE0028248; // type:func rom:0x33D038
-fx_20_render = 0xE00284E8; // type:func rom:0x33D2D8
-fx_20_appendGfx = 0xE002852C; // type:func rom:0x33D31C
-fx_21_main = 0xE002A000; // type:func rom:0x33E8C0
-fx_21_init = 0xE002A284; // type:func rom:0x33EB44
-fx_21_update = 0xE002A28C; // type:func rom:0x33EB4C
-fx_21_render = 0xE002A380; // type:func rom:0x33EC40
-fx_21_appendGfx = 0xE002A3C4; // type:func rom:0x33EC84
-fx_22_main = 0xE002C000; // type:func rom:0x33FE80
-fx_22_init = 0xE002C234; // type:func rom:0x3400B4
-fx_22_update = 0xE002C23C; // type:func rom:0x3400BC
-fx_22_render = 0xE002C3D0; // type:func rom:0x340250
-fx_22_appendGfx = 0xE002C414; // type:func rom:0x340294
-fx_23_main = 0xE002E000; // type:func rom:0x3419E0
-fx_23_init = 0xE002E248; // type:func rom:0x341C28
-fx_23_update = 0xE002E250; // type:func rom:0x341C30
-fx_23_render = 0xE002E330; // type:func rom:0x341D10
-fx_23_appendGfx = 0xE002E368; // type:func rom:0x341D48
-fx_24_main = 0xE0030000; // type:func rom:0x342140
-fx_24_init = 0xE0030728; // type:func rom:0x342868
-fx_24_update = 0xE0030730; // type:func rom:0x342870
-fx_24_render = 0xE0030A24; // type:func rom:0x342B64
-fx_24_appendGfx = 0xE0030A68; // type:func rom:0x342BA8
-fx_25_main = 0xE0032000; // type:func rom:0x343680
-fx_25_init = 0xE00321D0; // type:func rom:0x343850
-fx_25_update = 0xE00321D8; // type:func rom:0x343858
-fx_25_render = 0xE0032420; // type:func rom:0x343AA0
-fx_25_appendGfx = 0xE003245C; // type:func rom:0x343ADC
-fx_26_main = 0xE0034000; // type:func rom:0x344A10
-fx_26_init = 0xE0034108; // type:func rom:0x344B18
-fx_26_update = 0xE0034110; // type:func rom:0x344B20
-fx_26_render = 0xE00342C8; // type:func rom:0x344CD8
-fx_26_appendGfx = 0xE0034310; // type:func rom:0x344D20
-fx_27_main = 0xE0036000; // type:func rom:0x3454E0
-fx_27_init = 0xE00360DC; // type:func rom:0x3455BC
-fx_27_update = 0xE00360E4; // type:func rom:0x3455C4
-fx_27_render = 0xE00361D8; // type:func rom:0x3456B8
+shape_spell_appendGfx = 0xE0024454; // type:func rom:0x3396A4
+gather_energy_pink_main = 0xE0026000; // type:func rom:0x33B180
+gather_energy_pink_init = 0xE0026184; // type:func rom:0x33B304
+gather_energy_pink_update = 0xE002618C; // type:func rom:0x33B30C
+gather_energy_pink_render = 0xE00264B0; // type:func rom:0x33B630
+gather_energy_pink_appendGfx = 0xE00264F4; // type:func rom:0x33B674
+drop_leaves_main = 0xE0028000; // type:func rom:0x33CDF0
+drop_leaves_init = 0xE0028240; // type:func rom:0x33D030
+drop_leaves_update = 0xE0028248; // type:func rom:0x33D038
+drop_leaves_render = 0xE00284E8; // type:func rom:0x33D2D8
+drop_leaves_appendGfx = 0xE002852C; // type:func rom:0x33D31C
+dust_main = 0xE002A000; // type:func rom:0x33E8C0
+dust_init = 0xE002A284; // type:func rom:0x33EB44
+dust_update = 0xE002A28C; // type:func rom:0x33EB4C
+dust_render = 0xE002A380; // type:func rom:0x33EC40
+dust_appendGfx = 0xE002A3C4; // type:func rom:0x33EC84
+shattering_stones_main = 0xE002C000; // type:func rom:0x33FE80
+shattering_stones_init = 0xE002C234; // type:func rom:0x3400B4
+shattering_stones_update = 0xE002C23C; // type:func rom:0x3400BC
+shattering_stones_render = 0xE002C3D0; // type:func rom:0x340250
+shattering_stones_appendGfx = 0xE002C414; // type:func rom:0x340294
+smoke_ring_main = 0xE002E000; // type:func rom:0x3419E0
+smoke_ring_init = 0xE002E248; // type:func rom:0x341C28
+smoke_ring_update = 0xE002E250; // type:func rom:0x341C30
+smoke_ring_render = 0xE002E330; // type:func rom:0x341D10
+smoke_ring_appendGfx = 0xE002E368; // type:func rom:0x341D48
+damage_stars_main = 0xE0030000; // type:func rom:0x342140
+damage_stars_init = 0xE0030728; // type:func rom:0x342868
+damage_stars_update = 0xE0030730; // type:func rom:0x342870
+damage_stars_render = 0xE0030A24; // type:func rom:0x342B64
+damage_stars_appendGfx = 0xE0030A68; // type:func rom:0x342BA8
+explosion_main = 0xE0032000; // type:func rom:0x343680
+explosion_init = 0xE00321D0; // type:func rom:0x343850
+explosion_update = 0xE00321D8; // type:func rom:0x343858
+explosion_render = 0xE0032420; // type:func rom:0x343AA0
+explosion_appendGfx = 0xE003245C; // type:func rom:0x343ADC
+lens_flare_main = 0xE0034000; // type:func rom:0x344A10
+lens_flare_init = 0xE0034108; // type:func rom:0x344B18
+lens_flare_update = 0xE0034110; // type:func rom:0x344B20
+lens_flare_render = 0xE00342C8; // type:func rom:0x344CD8
+lens_flare_appendGfx = 0xE0034310; // type:func rom:0x344D20
+got_item_outline_main = 0xE0036000; // type:func rom:0x3454E0
+got_item_outline_init = 0xE00360DC; // type:func rom:0x3455BC
+got_item_outline_update = 0xE00360E4; // type:func rom:0x3455C4
+got_item_outline_render = 0xE00361D8; // type:func rom:0x3456B8
 func_E003621C = 0xE003621C; // type:func rom:0x3456FC
-fx_27_appendGfx = 0xE0036224; // type:func rom:0x345704
-fx_28_main = 0xE0038000; // type:func rom:0x34DD20
-fx_28_init = 0xE003841C; // type:func rom:0x34E13C
-fx_28_update = 0xE0038424; // type:func rom:0x34E144
-fx_28_render = 0xE0038704; // type:func rom:0x34E424
-fx_28_appendGfx = 0xE0038748; // type:func rom:0x34E468
-fx_29_main = 0xE003A000; // type:func rom:0x34EC80
-fx_29_init = 0xE003A1D4; // type:func rom:0x34EE54
-fx_29_update = 0xE003A1DC; // type:func rom:0x34EE5C
-fx_29_render = 0xE003A310; // type:func rom:0x34EF90
-fx_29_appendGfx = 0xE003A354; // type:func rom:0x34EFD4
-fx_30_main = 0xE003C000; // type:func rom:0x34F4C0
-fx_30_init = 0xE003C23C; // type:func rom:0x34F6FC
-fx_30_update = 0xE003C244; // type:func rom:0x34F704
-fx_30_render = 0xE003C474; // type:func rom:0x34F934
+got_item_outline_appendGfx = 0xE0036224; // type:func rom:0x345704
+spiky_white_aura_main = 0xE0038000; // type:func rom:0x34DD20
+spiky_white_aura_init = 0xE003841C; // type:func rom:0x34E13C
+spiky_white_aura_update = 0xE0038424; // type:func rom:0x34E144
+spiky_white_aura_render = 0xE0038704; // type:func rom:0x34E424
+spiky_white_aura_appendGfx = 0xE0038748; // type:func rom:0x34E468
+smoke_impact_main = 0xE003A000; // type:func rom:0x34EC80
+smoke_impact_init = 0xE003A1D4; // type:func rom:0x34EE54
+smoke_impact_update = 0xE003A1DC; // type:func rom:0x34EE5C
+smoke_impact_render = 0xE003A310; // type:func rom:0x34EF90
+smoke_impact_appendGfx = 0xE003A354; // type:func rom:0x34EFD4
+damage_indicator_main = 0xE003C000; // type:func rom:0x34F4C0
+damage_indicator_init = 0xE003C23C; // type:func rom:0x34F6FC
+damage_indicator_update = 0xE003C244; // type:func rom:0x34F704
+damage_indicator_render = 0xE003C474; // type:func rom:0x34F934
 func_E003C47C = 0xE003C47C; // type:func rom:0x34F93C
 func_E003C498 = 0xE003C498; // type:func rom:0x34F958
-fx_31_main = 0xE003E000; // type:func rom:0x352440
-fx_31_init = 0xE003E3F8; // type:func rom:0x352838
-fx_31_update = 0xE003E400; // type:func rom:0x352840
-fx_31_render = 0xE003E5F4; // type:func rom:0x352A34
-fx_31_appendGfx = 0xE003E638; // type:func rom:0x352A78
-fx_32_main = 0xE0040000; // type:func rom:0x353300
-fx_32_init = 0xE0040148; // type:func rom:0x353448
-fx_32_update = 0xE0040150; // type:func rom:0x353450
-fx_32_render = 0xE0040210; // type:func rom:0x353510
-fx_32_appendGfx = 0xE0040348; // type:func rom:0x353648
+purple_ring_main = 0xE003E000; // type:func rom:0x352440
+purple_ring_init = 0xE003E3F8; // type:func rom:0x352838
+purple_ring_update = 0xE003E400; // type:func rom:0x352840
+purple_ring_render = 0xE003E5F4; // type:func rom:0x352A34
+purple_ring_appendGfx = 0xE003E638; // type:func rom:0x352A78
+flame_main = 0xE0040000; // type:func rom:0x353300
+flame_init = 0xE0040148; // type:func rom:0x353448
+flame_update = 0xE0040150; // type:func rom:0x353450
+flame_render = 0xE0040210; // type:func rom:0x353510
+flame_appendGfx = 0xE0040348; // type:func rom:0x353648
 D_E0040840 = 0xE0040840; // type:data rom:0x353B40
 D_E0040848 = 0xE0040848; // type:data rom:0x353B48
 D_E0040880 = 0xE0040880; // type:data rom:0x353B80
 D_E0040890 = 0xE0040890; // type:data rom:0x353B90
-fx_33_main = 0xE0042000; // type:func rom:0x3547A0
-fx_33_init = 0xE004222C; // type:func rom:0x3549CC
-fx_33_update = 0xE0042234; // type:func rom:0x3549D4
-fx_33_render = 0xE0042374; // type:func rom:0x354B14
-fx_33_appendGfx = 0xE00423B8; // type:func rom:0x354B58
-fx_34_main = 0xE0044000; // type:func rom:0x354F60
-fx_34_init = 0xE004441C; // type:func rom:0x35537C
-fx_34_update = 0xE0044424; // type:func rom:0x355384
-fx_34_render = 0xE00448E4; // type:func rom:0x355844
-fx_34_appendGfx = 0xE004491C; // type:func rom:0x35587C
-fx_35_main = 0xE0046000; // type:func rom:0x355EE0
-fx_35_init = 0xE0046158; // type:func rom:0x356038
-fx_35_update = 0xE0046160; // type:func rom:0x356040
-fx_35_render = 0xE004627C; // type:func rom:0x35615C
-fx_35_appendGfx = 0xE00462C0; // type:func rom:0x3561A0
-fx_36_main = 0xE0048000; // type:func rom:0x356980
-fx_36_init = 0xE0048128; // type:func rom:0x356AA8
-fx_36_update = 0xE0048130; // type:func rom:0x356AB0
-fx_36_render = 0xE00481D4; // type:func rom:0x356B54
-fx_36_appendGfx = 0xE0048218; // type:func rom:0x356B98
-fx_37_main = 0xE004A000; // type:func rom:0x3584C0
-fx_37_init = 0xE004A328; // type:func rom:0x3587E8
-fx_37_update = 0xE004A330; // type:func rom:0x3587F0
-fx_37_render = 0xE004A748; // type:func rom:0x358C08
-fx_37_appendGfx = 0xE004A78C; // type:func rom:0x358C4C
-fx_38_main = 0xE004C000; // type:func rom:0x359F20
-fx_38_init = 0xE004C204; // type:func rom:0x35A124
-fx_38_update = 0xE004C20C; // type:func rom:0x35A12C
-fx_38_render = 0xE004C364; // type:func rom:0x35A284
-fx_38_appendGfx = 0xE004C3A8; // type:func rom:0x35A2C8
-fx_39_main = 0xE004E000; // type:func rom:0x35B9D0
-fx_39_init = 0xE004E15C; // type:func rom:0x35BB2C
-fx_39_update = 0xE004E164; // type:func rom:0x35BB34
-fx_39_render = 0xE004E1D0; // type:func rom:0x35BBA0
-fx_39_appendGfx = 0xE004E214; // type:func rom:0x35BBE4
-fx_40_main = 0xE0050000; // type:func rom:0x35BFD0
-fx_40_init = 0xE00501D0; // type:func rom:0x35C1A0
-fx_40_update = 0xE00501D8; // type:func rom:0x35C1A8
-fx_40_render = 0xE00502C4; // type:func rom:0x35C294
-fx_40_appendGfx = 0xE0050308; // type:func rom:0x35C2D8
-fx_41_main = 0xE0052000; // type:func rom:0x35CA80
-fx_41_init = 0xE00520E8; // type:func rom:0x35CB68
-fx_41_update = 0xE00520F0; // type:func rom:0x35CB70
-fx_41_render = 0xE005241C; // type:func rom:0x35CE9C
-fx_41_appendGfx = 0xE0052460; // type:func rom:0x35CEE0
-fx_43_main = 0xE0056000; // type:func rom:0x35DA00
-fx_43_init = 0xE0056304; // type:func rom:0x35DD04
-fx_43_update = 0xE005630C; // type:func rom:0x35DD0C
-fx_43_render = 0xE0056B8C; // type:func rom:0x35E58C
-fx_43_appendGfx = 0xE0056BD0; // type:func rom:0x35E5D0
-fx_44_main = 0xE0058000; // type:func rom:0x35E920
-fx_44_init = 0xE00581AC; // type:func rom:0x35EACC
-fx_44_update = 0xE00581B4; // type:func rom:0x35EAD4
-fx_44_render = 0xE0058490; // type:func rom:0x35EDB0
-fx_44_appendGfx = 0xE00584D4; // type:func rom:0x35EDF4
-fx_45_main = 0xE005A000; // type:func rom:0x3602C0
-fx_45_init = 0xE005A1F4; // type:func rom:0x3604B4
-fx_45_update = 0xE005A1FC; // type:func rom:0x3604BC
-fx_45_render = 0xE005A3B0; // type:func rom:0x360670
-fx_45_appendGfx = 0xE005A3F4; // type:func rom:0x3606B4
-fx_46_main = 0xE005C000; // type:func rom:0x360F40
-fx_46_init = 0xE005C178; // type:func rom:0x3610B8
-fx_46_update = 0xE005C180; // type:func rom:0x3610C0
-fx_46_render = 0xE005C2B4; // type:func rom:0x3611F4
-fx_46_appendGfx = 0xE005C2F8; // type:func rom:0x361238
-fx_47_main = 0xE005E000; // type:func rom:0x3625C0
-fx_47_init = 0xE005E1B0; // type:func rom:0x362770
-fx_47_update = 0xE005E1B8; // type:func rom:0x362778
-fx_47_render = 0xE005E310; // type:func rom:0x3628D0
+stars_burst_main = 0xE0042000; // type:func rom:0x3547A0
+stars_burst_init = 0xE004222C; // type:func rom:0x3549CC
+stars_burst_update = 0xE0042234; // type:func rom:0x3549D4
+stars_burst_render = 0xE0042374; // type:func rom:0x354B14
+stars_burst_appendGfx = 0xE00423B8; // type:func rom:0x354B58
+stars_shimmer_main = 0xE0044000; // type:func rom:0x354F60
+stars_shimmer_init = 0xE004441C; // type:func rom:0x35537C
+stars_shimmer_update = 0xE0044424; // type:func rom:0x355384
+stars_shimmer_render = 0xE00448E4; // type:func rom:0x355844
+stars_shimmer_appendGfx = 0xE004491C; // type:func rom:0x35587C
+rising_bubble_main = 0xE0046000; // type:func rom:0x355EE0
+rising_bubble_init = 0xE0046158; // type:func rom:0x356038
+rising_bubble_update = 0xE0046160; // type:func rom:0x356040
+rising_bubble_render = 0xE004627C; // type:func rom:0x35615C
+rising_bubble_appendGfx = 0xE00462C0; // type:func rom:0x3561A0
+ring_blast_main = 0xE0048000; // type:func rom:0x356980
+ring_blast_init = 0xE0048128; // type:func rom:0x356AA8
+ring_blast_update = 0xE0048130; // type:func rom:0x356AB0
+ring_blast_render = 0xE00481D4; // type:func rom:0x356B54
+ring_blast_appendGfx = 0xE0048218; // type:func rom:0x356B98
+shockwave_main = 0xE004A000; // type:func rom:0x3584C0
+shockwave_init = 0xE004A328; // type:func rom:0x3587E8
+shockwave_update = 0xE004A330; // type:func rom:0x3587F0
+shockwave_render = 0xE004A748; // type:func rom:0x358C08
+shockwave_appendGfx = 0xE004A78C; // type:func rom:0x358C4C
+music_note_main = 0xE004C000; // type:func rom:0x359F20
+music_note_init = 0xE004C204; // type:func rom:0x35A124
+music_note_update = 0xE004C20C; // type:func rom:0x35A12C
+music_note_render = 0xE004C364; // type:func rom:0x35A284
+music_note_appendGfx = 0xE004C3A8; // type:func rom:0x35A2C8
+smoke_burst_main = 0xE004E000; // type:func rom:0x35B9D0
+smoke_burst_init = 0xE004E15C; // type:func rom:0x35BB2C
+smoke_burst_update = 0xE004E164; // type:func rom:0x35BB34
+smoke_burst_render = 0xE004E1D0; // type:func rom:0x35BBA0
+smoke_burst_appendGfx = 0xE004E214; // type:func rom:0x35BBE4
+sweat_main = 0xE0050000; // type:func rom:0x35BFD0
+sweat_init = 0xE00501D0; // type:func rom:0x35C1A0
+sweat_update = 0xE00501D8; // type:func rom:0x35C1A8
+sweat_render = 0xE00502C4; // type:func rom:0x35C294
+sweat_appendGfx = 0xE0050308; // type:func rom:0x35C2D8
+sleep_bubble_main = 0xE0052000; // type:func rom:0x35CA80
+sleep_bubble_init = 0xE00520E8; // type:func rom:0x35CB68
+sleep_bubble_update = 0xE00520F0; // type:func rom:0x35CB70
+sleep_bubble_render = 0xE005241C; // type:func rom:0x35CE9C
+sleep_bubble_appendGfx = 0xE0052460; // type:func rom:0x35CEE0
+windy_leaves_main = 0xE0056000; // type:func rom:0x35DA00
+windy_leaves_init = 0xE0056304; // type:func rom:0x35DD04
+windy_leaves_update = 0xE005630C; // type:func rom:0x35DD0C
+windy_leaves_render = 0xE0056B8C; // type:func rom:0x35E58C
+windy_leaves_appendGfx = 0xE0056BD0; // type:func rom:0x35E5D0
+falling_leaves_main = 0xE0058000; // type:func rom:0x35E920
+falling_leaves_init = 0xE00581AC; // type:func rom:0x35EACC
+falling_leaves_update = 0xE00581B4; // type:func rom:0x35EAD4
+falling_leaves_render = 0xE0058490; // type:func rom:0x35EDB0
+falling_leaves_appendGfx = 0xE00584D4; // type:func rom:0x35EDF4
+stars_spread_main = 0xE005A000; // type:func rom:0x3602C0
+stars_spread_init = 0xE005A1F4; // type:func rom:0x3604B4
+stars_spread_update = 0xE005A1FC; // type:func rom:0x3604BC
+stars_spread_render = 0xE005A3B0; // type:func rom:0x360670
+stars_spread_appendGfx = 0xE005A3F4; // type:func rom:0x3606B4
+steam_burst_main = 0xE005C000; // type:func rom:0x360F40
+steam_burst_init = 0xE005C178; // type:func rom:0x3610B8
+steam_burst_update = 0xE005C180; // type:func rom:0x3610C0
+steam_burst_render = 0xE005C2B4; // type:func rom:0x3611F4
+steam_burst_appendGfx = 0xE005C2F8; // type:func rom:0x361238
+stars_orbiting_main = 0xE005E000; // type:func rom:0x3625C0
+stars_orbiting_init = 0xE005E1B0; // type:func rom:0x362770
+stars_orbiting_update = 0xE005E1B8; // type:func rom:0x362778
+stars_orbiting_render = 0xE005E310; // type:func rom:0x3628D0
 func_E005E318 = 0xE005E318; // type:func rom:0x3628D8
 func_E005E334 = 0xE005E334; // type:func rom:0x3628F4
-fx_48_main = 0xE0060000; // type:func rom:0x363160
-fx_48_init = 0xE00601D8; // type:func rom:0x363338
-fx_48_update = 0xE00601E0; // type:func rom:0x363340
-fx_48_render = 0xE006040C; // type:func rom:0x36356C
-fx_48_appendGfx = 0xE0060450; // type:func rom:0x3635B0
-fx_49_main = 0xE0062000; // type:func rom:0x364300
-fx_49_init = 0xE0062218; // type:func rom:0x364518
-fx_49_update = 0xE0062220; // type:func rom:0x364520
-fx_49_render = 0xE00624A8; // type:func rom:0x3647A8
-fx_49_appendGfx = 0xE00624EC; // type:func rom:0x3647EC
-fx_50_main = 0xE0064000; // type:func rom:0x364F10
-fx_50_init = 0xE006419C; // type:func rom:0x3650AC
-fx_50_update = 0xE00641A4; // type:func rom:0x3650B4
-fx_50_render = 0xE00643DC; // type:func rom:0x3652EC
-fx_50_appendGfx = 0xE0064414; // type:func rom:0x365324
-fx_51_main = 0xE0066000; // type:func rom:0x366030
-fx_51_init = 0xE0066490; // type:func rom:0x3664C0
-fx_51_update = 0xE0066498; // type:func rom:0x3664C8
-fx_51_render = 0xE006672C; // type:func rom:0x36675C
-fx_51_appendGfx = 0xE0066770; // type:func rom:0x3667A0
-fx_52_main = 0xE0068000; // type:func rom:0x36A8D0
-fx_52_init = 0xE0068140; // type:func rom:0x36AA10
-fx_52_update = 0xE0068148; // type:func rom:0x36AA18
-fx_52_render = 0xE00681D8; // type:func rom:0x36AAA8
-fx_52_appendGfx = 0xE0068234; // type:func rom:0x36AB04
+big_snowflakes_main = 0xE0060000; // type:func rom:0x363160
+big_snowflakes_init = 0xE00601D8; // type:func rom:0x363338
+big_snowflakes_update = 0xE00601E0; // type:func rom:0x363340
+big_snowflakes_render = 0xE006040C; // type:func rom:0x36356C
+big_snowflakes_appendGfx = 0xE0060450; // type:func rom:0x3635B0
+debuff_main = 0xE0062000; // type:func rom:0x364300
+debuff_init = 0xE0062218; // type:func rom:0x364518
+debuff_update = 0xE0062220; // type:func rom:0x364520
+debuff_render = 0xE00624A8; // type:func rom:0x3647A8
+debuff_appendGfx = 0xE00624EC; // type:func rom:0x3647EC
+green_impact_main = 0xE0064000; // type:func rom:0x364F10
+green_impact_init = 0xE006419C; // type:func rom:0x3650AC
+green_impact_update = 0xE00641A4; // type:func rom:0x3650B4
+green_impact_render = 0xE00643DC; // type:func rom:0x3652EC
+green_impact_appendGfx = 0xE0064414; // type:func rom:0x365324
+radial_shimmer_main = 0xE0066000; // type:func rom:0x366030
+radial_shimmer_init = 0xE0066490; // type:func rom:0x3664C0
+radial_shimmer_update = 0xE0066498; // type:func rom:0x3664C8
+radial_shimmer_render = 0xE006672C; // type:func rom:0x36675C
+radial_shimmer_appendGfx = 0xE0066770; // type:func rom:0x3667A0
+ending_decals_main = 0xE0068000; // type:func rom:0x36A8D0
+ending_decals_init = 0xE0068140; // type:func rom:0x36AA10
+ending_decals_update = 0xE0068148; // type:func rom:0x36AA18
+ending_decals_render = 0xE00681D8; // type:func rom:0x36AAA8
+ending_decals_appendGfx = 0xE0068234; // type:func rom:0x36AB04
 func_E006A000 = 0xE006A000; // type:func rom:0x36D020
 func_E006A0BC = 0xE006A0BC; // type:func rom:0x36D0DC
-fx_53_main = 0xE006A1E8; // type:func rom:0x36D208
-fx_53_init = 0xE006A45C; // type:func rom:0x36D47C
+light_rays_main = 0xE006A1E8; // type:func rom:0x36D208
+light_rays_init = 0xE006A45C; // type:func rom:0x36D47C
 func_E006A464 = 0xE006A464; // type:func rom:0x36D484
-fx_53_update = 0xE006A580; // type:func rom:0x36D5A0
-fx_53_render = 0xE006A814; // type:func rom:0x36D834
+light_rays_update = 0xE006A580; // type:func rom:0x36D5A0
+light_rays_render = 0xE006A814; // type:func rom:0x36D834
 func_E006A85C = 0xE006A85C; // type:func rom:0x36D87C
-fx_53_appendGfx = 0xE006A94C; // type:func rom:0x36D96C
-fx_54_main = 0xE006C000; // type:func rom:0x36E1D0
-fx_54_init = 0xE006C298; // type:func rom:0x36E468
-fx_54_update = 0xE006C2A0; // type:func rom:0x36E470
-fx_54_render = 0xE006C5A0; // type:func rom:0x36E770
-fx_54_appendGfx = 0xE006C5E8; // type:func rom:0x36E7B8
-fx_55_main = 0xE006E000; // type:func rom:0x372790
-fx_55_init = 0xE006E354; // type:func rom:0x372AE4
-fx_55_update = 0xE006E35C; // type:func rom:0x372AEC
-fx_55_render = 0xE006E6E4; // type:func rom:0x372E74
-fx_55_appendGfx = 0xE006E764; // type:func rom:0x372EF4
-fx_56_main = 0xE0070000; // type:func rom:0x3740B0
-fx_56_init = 0xE00701EC; // type:func rom:0x37429C
-fx_56_update = 0xE00701F4; // type:func rom:0x3742A4
-fx_56_render = 0xE00706F0; // type:func rom:0x3747A0
+light_rays_appendGfx = 0xE006A94C; // type:func rom:0x36D96C
+lightning_main = 0xE006C000; // type:func rom:0x36E1D0
+lightning_init = 0xE006C298; // type:func rom:0x36E468
+lightning_update = 0xE006C2A0; // type:func rom:0x36E470
+lightning_render = 0xE006C5A0; // type:func rom:0x36E770
+lightning_appendGfx = 0xE006C5E8; // type:func rom:0x36E7B8
+fire_breath_main = 0xE006E000; // type:func rom:0x372790
+fire_breath_init = 0xE006E354; // type:func rom:0x372AE4
+fire_breath_update = 0xE006E35C; // type:func rom:0x372AEC
+fire_breath_render = 0xE006E6E4; // type:func rom:0x372E74
+fire_breath_appendGfx = 0xE006E764; // type:func rom:0x372EF4
+shimmer_burst_main = 0xE0070000; // type:func rom:0x3740B0
+shimmer_burst_init = 0xE00701EC; // type:func rom:0x37429C
+shimmer_burst_update = 0xE00701F4; // type:func rom:0x3742A4
+shimmer_burst_render = 0xE00706F0; // type:func rom:0x3747A0
 func_E0070738 = 0xE0070738; // type:func rom:0x3747E8
-fx_56_appendGfx = 0xE0070740; // type:func rom:0x3747F0
-fx_57_main = 0xE0072000; // type:func rom:0x374E50
-fx_57_init = 0xE0072148; // type:func rom:0x374F98
-fx_57_update = 0xE0072150; // type:func rom:0x374FA0
-fx_57_render = 0xE007238C; // type:func rom:0x3751DC
-fx_57_appendGfx = 0xE00723D4; // type:func rom:0x375224
-fx_58_main = 0xE0074000; // type:func rom:0x376460
-fx_58_init = 0xE00741E0; // type:func rom:0x376640
-fx_58_update = 0xE00741E8; // type:func rom:0x376648
-fx_58_render = 0xE0074598; // type:func rom:0x3769F8
-fx_58_appendGfx = 0xE00745E0; // type:func rom:0x376A40
-fx_59_main = 0xE0076000; // type:func rom:0x377070
-fx_59_init = 0xE0076370; // type:func rom:0x3773E0
-fx_59_update = 0xE0076378; // type:func rom:0x3773E8
-fx_59_render = 0xE0076808; // type:func rom:0x377878
+shimmer_burst_appendGfx = 0xE0070740; // type:func rom:0x3747F0
+energy_shockwave_main = 0xE0072000; // type:func rom:0x374E50
+energy_shockwave_init = 0xE0072148; // type:func rom:0x374F98
+energy_shockwave_update = 0xE0072150; // type:func rom:0x374FA0
+energy_shockwave_render = 0xE007238C; // type:func rom:0x3751DC
+energy_shockwave_appendGfx = 0xE00723D4; // type:func rom:0x375224
+shimmer_wave_main = 0xE0074000; // type:func rom:0x376460
+shimmer_wave_init = 0xE00741E0; // type:func rom:0x376640
+shimmer_wave_update = 0xE00741E8; // type:func rom:0x376648
+shimmer_wave_render = 0xE0074598; // type:func rom:0x3769F8
+shimmer_wave_appendGfx = 0xE00745E0; // type:func rom:0x376A40
+aura_main = 0xE0076000; // type:func rom:0x377070
+aura_init = 0xE0076370; // type:func rom:0x3773E0
+aura_update = 0xE0076378; // type:func rom:0x3773E8
+aura_render = 0xE0076808; // type:func rom:0x377878
 func_E007684C = 0xE007684C; // type:func rom:0x3778BC
 func_E0076854 = 0xE0076854; // type:func rom:0x3778C4
-fx_59_appendGfx = 0xE007685C; // type:func rom:0x3778CC
-fx_60_main = 0xE0078000; // type:func rom:0x37A3F0
-fx_60_init = 0xE0078124; // type:func rom:0x37A514
-fx_60_update = 0xE007812C; // type:func rom:0x37A51C
-fx_60_render = 0xE0078210; // type:func rom:0x37A600
+aura_appendGfx = 0xE007685C; // type:func rom:0x3778CC
+fx_3C_main = 0xE0078000; // type:func rom:0x37A3F0
+fx_3C_init = 0xE0078124; // type:func rom:0x37A514
+fx_3C_update = 0xE007812C; // type:func rom:0x37A51C
+fx_3C_render = 0xE0078210; // type:func rom:0x37A600
 func_E0078274 = 0xE0078274; // type:func rom:0x37A664
-fx_60_appendGfx = 0xE007827C; // type:func rom:0x37A66C
-fx_61_main = 0xE007A000; // type:func rom:0x37C540
-fx_61_init = 0xE007A504; // type:func rom:0x37CA44
-fx_61_update = 0xE007A50C; // type:func rom:0x37CA4C
-fx_61_render = 0xE007A840; // type:func rom:0x37CD80
+fx_3C_appendGfx = 0xE007827C; // type:func rom:0x37A66C
+fx_3D_main = 0xE007A000; // type:func rom:0x37C540
+fx_3D_init = 0xE007A504; // type:func rom:0x37CA44
+fx_3D_update = 0xE007A50C; // type:func rom:0x37CA4C
+fx_3D_render = 0xE007A840; // type:func rom:0x37CD80
 func_E007A884 = 0xE007A884; // type:func rom:0x37CDC4
-fx_61_appendGfx = 0xE007A88C; // type:func rom:0x37CDCC
-fx_62_main = 0xE007C000; // type:func rom:0x37D490
-fx_62_init = 0xE007C128; // type:func rom:0x37D5B8
-fx_62_update = 0xE007C130; // type:func rom:0x37D5C0
-fx_62_render = 0xE007C1B0; // type:func rom:0x37D640
-fx_62_appendGfx = 0xE007C1F4; // type:func rom:0x37D684
-fx_63_main = 0xE007E000; // type:func rom:0x37F720
-fx_63_init = 0xE007E1FC; // type:func rom:0x37F91C
-fx_63_update = 0xE007E204; // type:func rom:0x37F924
-fx_63_render = 0xE007E508; // type:func rom:0x37FC28
-fx_63_appendGfx = 0xE007E54C; // type:func rom:0x37FC6C
-fx_64_main = 0xE0080000; // type:func rom:0x3812C0
-fx_64_init = 0xE00801C8; // type:func rom:0x381488
-fx_64_update = 0xE00801D0; // type:func rom:0x381490
-fx_64_render = 0xE0080424; // type:func rom:0x3816E4
+fx_3D_appendGfx = 0xE007A88C; // type:func rom:0x37CDCC
+blast_main = 0xE007C000; // type:func rom:0x37D490
+blast_init = 0xE007C128; // type:func rom:0x37D5B8
+blast_update = 0xE007C130; // type:func rom:0x37D5C0
+blast_render = 0xE007C1B0; // type:func rom:0x37D640
+blast_appendGfx = 0xE007C1F4; // type:func rom:0x37D684
+fire_flower_main = 0xE007E000; // type:func rom:0x37F720
+fire_flower_init = 0xE007E1FC; // type:func rom:0x37F91C
+fire_flower_update = 0xE007E204; // type:func rom:0x37F924
+fire_flower_render = 0xE007E508; // type:func rom:0x37FC28
+fire_flower_appendGfx = 0xE007E54C; // type:func rom:0x37FC6C
+recover_main = 0xE0080000; // type:func rom:0x3812C0
+recover_init = 0xE00801C8; // type:func rom:0x381488
+recover_update = 0xE00801D0; // type:func rom:0x381490
+recover_render = 0xE0080424; // type:func rom:0x3816E4
 func_E008042C = 0xE008042C; // type:func rom:0x3816EC
 func_E0080448 = 0xE0080448; // type:func rom:0x381708
-fx_65_main = 0xE0082000; // type:func rom:0x385640
-fx_65_init = 0xE00821B0; // type:func rom:0x3857F0
-fx_65_update = 0xE00821B8; // type:func rom:0x3857F8
-fx_65_render = 0xE0082520; // type:func rom:0x385B60
+disable_x_main = 0xE0082000; // type:func rom:0x385640
+disable_x_init = 0xE00821B0; // type:func rom:0x3857F0
+disable_x_update = 0xE00821B8; // type:func rom:0x3857F8
+disable_x_render = 0xE0082520; // type:func rom:0x385B60
 func_E0082528 = 0xE0082528; // type:func rom:0x385B68
 func_E0082580 = 0xE0082580; // type:func rom:0x385BC0
 func_E00826C4 = 0xE00826C4; // type:func rom:0x385D04
@@ -6352,81 +6352,81 @@ func_E0082A84 = 0xE0082A84; // type:func rom:0x3860C4
 func_E0084000 = 0xE0084000; // type:func rom:0x3889D0
 func_E008403C = 0xE008403C; // type:func rom:0x388A0C
 func_E0084060 = 0xE0084060; // type:func rom:0x388A30
-fx_66_main = 0xE0084084; // type:func rom:0x388A54
-fx_66_init = 0xE0084658; // type:func rom:0x389028
-fx_66_update = 0xE0084660; // type:func rom:0x389030
-fx_66_render = 0xE00848E4; // type:func rom:0x3892B4
-fx_66_appendGfx = 0xE0084928; // type:func rom:0x3892F8
-fx_67_main = 0xE0086000; // type:func rom:0x389850
-fx_67_init = 0xE0086270; // type:func rom:0x389AC0
-fx_67_update = 0xE0086278; // type:func rom:0x389AC8
-fx_67_render = 0xE0086390; // type:func rom:0x389BE0
+bombette_breaking_main = 0xE0084084; // type:func rom:0x388A54
+bombette_breaking_init = 0xE0084658; // type:func rom:0x389028
+bombette_breaking_update = 0xE0084660; // type:func rom:0x389030
+bombette_breaking_render = 0xE00848E4; // type:func rom:0x3892B4
+bombette_breaking_appendGfx = 0xE0084928; // type:func rom:0x3892F8
+firework_main = 0xE0086000; // type:func rom:0x389850
+firework_init = 0xE0086270; // type:func rom:0x389AC0
+firework_update = 0xE0086278; // type:func rom:0x389AC8
+firework_render = 0xE0086390; // type:func rom:0x389BE0
 func_E0086398 = 0xE0086398; // type:func rom:0x389BE8
 func_E00863B4 = 0xE00863B4; // type:func rom:0x389C04
 func_E0088000 = 0xE0088000; // type:func rom:0x38ADF0
-fx_68_main = 0xE008817C; // type:func rom:0x38AF6C
-fx_68_init = 0xE00885A0; // type:func rom:0x38B390
-fx_68_update = 0xE00885A8; // type:func rom:0x38B398
-fx_68_render = 0xE00887A8; // type:func rom:0x38B598
-fx_68_appendGfx = 0xE00887E0; // type:func rom:0x38B5D0
+confetti_main = 0xE008817C; // type:func rom:0x38AF6C
+confetti_init = 0xE00885A0; // type:func rom:0x38B390
+confetti_update = 0xE00885A8; // type:func rom:0x38B398
+confetti_render = 0xE00887A8; // type:func rom:0x38B598
+confetti_appendGfx = 0xE00887E0; // type:func rom:0x38B5D0
 func_E008A000 = 0xE008A000; // type:func rom:0x38C5F0
-fx_69_main = 0xE008A188; // type:func rom:0x38C778
-fx_69_init = 0xE008A288; // type:func rom:0x38C878
+snowfall_main = 0xE008A188; // type:func rom:0x38C778
+snowfall_init = 0xE008A288; // type:func rom:0x38C878
 func_E008A290 = 0xE008A290; // type:func rom:0x38C880
-fx_69_update = 0xE008A53C; // type:func rom:0x38CB2C
-fx_69_render = 0xE008A6E4; // type:func rom:0x38CCD4
-fx_69_appendGfx = 0xE008A728; // type:func rom:0x38CD18
-fx_70_main = 0xE008C000; // type:func rom:0x38DE00
-fx_70_init = 0xE008C3F4; // type:func rom:0x38E1F4
-fx_70_update = 0xE008C3FC; // type:func rom:0x38E1FC
-fx_70_render = 0xE008C6B8; // type:func rom:0x38E4B8
-fx_70_appendGfx = 0xE008C6FC; // type:func rom:0x38E4FC
-fx_71_main = 0xE008E000; // type:func rom:0x38EE60
-fx_71_init = 0xE008E1FC; // type:func rom:0x38F05C
-fx_71_update = 0xE008E204; // type:func rom:0x38F064
-fx_71_render = 0xE008E498; // type:func rom:0x38F2F8
-fx_71_appendGfx = 0xE008E4E0; // type:func rom:0x38F340
-fx_72_main = 0xE0090000; // type:func rom:0x38F900
-fx_72_init = 0xE00901C0; // type:func rom:0x38FAC0
-fx_72_update = 0xE00901C8; // type:func rom:0x38FAC8
-fx_72_render = 0xE0090420; // type:func rom:0x38FD20
+snowfall_update = 0xE008A53C; // type:func rom:0x38CB2C
+snowfall_render = 0xE008A6E4; // type:func rom:0x38CCD4
+snowfall_appendGfx = 0xE008A728; // type:func rom:0x38CD18
+fx_46_main = 0xE008C000; // type:func rom:0x38DE00
+fx_46_init = 0xE008C3F4; // type:func rom:0x38E1F4
+fx_46_update = 0xE008C3FC; // type:func rom:0x38E1FC
+fx_46_render = 0xE008C6B8; // type:func rom:0x38E4B8
+fx_46_appendGfx = 0xE008C6FC; // type:func rom:0x38E4FC
+gather_magic_main = 0xE008E000; // type:func rom:0x38EE60
+gather_magic_init = 0xE008E1FC; // type:func rom:0x38F05C
+gather_magic_update = 0xE008E204; // type:func rom:0x38F064
+gather_magic_render = 0xE008E498; // type:func rom:0x38F2F8
+gather_magic_appendGfx = 0xE008E4E0; // type:func rom:0x38F340
+attack_result_text_main = 0xE0090000; // type:func rom:0x38F900
+attack_result_text_init = 0xE00901C0; // type:func rom:0x38FAC0
+attack_result_text_update = 0xE00901C8; // type:func rom:0x38FAC8
+attack_result_text_render = 0xE0090420; // type:func rom:0x38FD20
 func_E0090428 = 0xE0090428; // type:func rom:0x38FD28
 func_E0090444 = 0xE0090444; // type:func rom:0x38FD44
-fx_73_main = 0xE0092000; // type:func rom:0x391D30
-fx_73_init = 0xE00921AC; // type:func rom:0x391EDC
-fx_73_update = 0xE00921B4; // type:func rom:0x391EE4
-fx_73_render = 0xE0092258; // type:func rom:0x391F88
-fx_73_appendGfx = 0xE00922A0; // type:func rom:0x391FD0
-fx_74_main = 0xE0094000; // type:func rom:0x3928D0
-fx_74_init = 0xE0094190; // type:func rom:0x392A60
-fx_74_update = 0xE0094198; // type:func rom:0x392A68
-fx_74_render = 0xE00942C0; // type:func rom:0x392B90
-fx_74_appendGfx = 0xE00942FC; // type:func rom:0x392BCC
-fx_75_main = 0xE0096000; // type:func rom:0x394280
-fx_75_init = 0xE00960EC; // type:func rom:0x39436C
-fx_75_update = 0xE00960F4; // type:func rom:0x394374
-fx_75_render = 0xE0096178; // type:func rom:0x3943F8
-fx_75_appendGfx = 0xE00961BC; // type:func rom:0x39443C
-fx_76_main = 0xE0098000; // type:func rom:0x395BB0
-fx_76_init = 0xE0098168; // type:func rom:0x395D18
-fx_76_update = 0xE0098170; // type:func rom:0x395D20
-fx_76_render = 0xE009829C; // type:func rom:0x395E4C
-fx_76_appendGfx = 0xE00982EC; // type:func rom:0x395E9C
-fx_77_main = 0xE009A000; // type:func rom:0x3965B0
-fx_77_init = 0xE009A138; // type:func rom:0x3966E8
-fx_77_update = 0xE009A140; // type:func rom:0x3966F0
-fx_77_render = 0xE009A398; // type:func rom:0x396948
-fx_77_appendGfx = 0xE009A3E0; // type:func rom:0x396990
-fx_78_main = 0xE009C000; // type:func rom:0x3981F0
-fx_78_init = 0xE009C100; // type:func rom:0x3982F0
-fx_78_update = 0xE009C108; // type:func rom:0x3982F8
-fx_78_render = 0xE009C1DC; // type:func rom:0x3983CC
-fx_78_appendGfx = 0xE009C220; // type:func rom:0x398410
-fx_79_main = 0xE009E000; // type:func rom:0x39FF20
-fx_79_init = 0xE009E1DC; // type:func rom:0x3A00FC
-fx_79_update = 0xE009E1E4; // type:func rom:0x3A0104
-fx_79_render = 0xE009E3DC; // type:func rom:0x3A02FC
-fx_79_appendGfx = 0xE009E424; // type:func rom:0x3A0344
+small_gold_sparkle_main = 0xE0092000; // type:func rom:0x391D30
+small_gold_sparkle_init = 0xE00921AC; // type:func rom:0x391EDC
+small_gold_sparkle_update = 0xE00921B4; // type:func rom:0x391EE4
+small_gold_sparkle_render = 0xE0092258; // type:func rom:0x391F88
+small_gold_sparkle_appendGfx = 0xE00922A0; // type:func rom:0x391FD0
+flashing_box_shockwave_main = 0xE0094000; // type:func rom:0x3928D0
+flashing_box_shockwave_init = 0xE0094190; // type:func rom:0x392A60
+flashing_box_shockwave_update = 0xE0094198; // type:func rom:0x392A68
+flashing_box_shockwave_render = 0xE00942C0; // type:func rom:0x392B90
+flashing_box_shockwave_appendGfx = 0xE00942FC; // type:func rom:0x392BCC
+balloon_main = 0xE0096000; // type:func rom:0x394280
+balloon_init = 0xE00960EC; // type:func rom:0x39436C
+balloon_update = 0xE00960F4; // type:func rom:0x394374
+balloon_render = 0xE0096178; // type:func rom:0x3943F8
+balloon_appendGfx = 0xE00961BC; // type:func rom:0x39443C
+floating_rock_main = 0xE0098000; // type:func rom:0x395BB0
+floating_rock_init = 0xE0098168; // type:func rom:0x395D18
+floating_rock_update = 0xE0098170; // type:func rom:0x395D20
+floating_rock_render = 0xE009829C; // type:func rom:0x395E4C
+floating_rock_appendGfx = 0xE00982EC; // type:func rom:0x395E9C
+chomp_drop_main = 0xE009A000; // type:func rom:0x3965B0
+chomp_drop_init = 0xE009A138; // type:func rom:0x3966E8
+chomp_drop_update = 0xE009A140; // type:func rom:0x3966F0
+chomp_drop_render = 0xE009A398; // type:func rom:0x396948
+chomp_drop_appendGfx = 0xE009A3E0; // type:func rom:0x396990
+quizmo_stage_main = 0xE009C000; // type:func rom:0x3981F0
+quizmo_stage_init = 0xE009C100; // type:func rom:0x3982F0
+quizmo_stage_update = 0xE009C108; // type:func rom:0x3982F8
+quizmo_stage_render = 0xE009C1DC; // type:func rom:0x3983CC
+quizmo_stage_appendGfx = 0xE009C220; // type:func rom:0x398410
+radiating_energy_orb_main = 0xE009E000; // type:func rom:0x39FF20
+radiating_energy_orb_init = 0xE009E1DC; // type:func rom:0x3A00FC
+radiating_energy_orb_update = 0xE009E1E4; // type:func rom:0x3A0104
+radiating_energy_orb_render = 0xE009E3DC; // type:func rom:0x3A02FC
+radiating_energy_orb_appendGfx = 0xE009E424; // type:func rom:0x3A0344
 D_E009EDF0 = 0xE009EDF0; // type:data rom:0x3A0D10
 D_E009EDF4 = 0xE009EDF4; // type:data rom:0x3A0D14
 D_E009EDF8 = 0xE009EDF8; // type:data rom:0x3A0D18
@@ -6439,55 +6439,55 @@ D_E009EE20 = 0xE009EE20; // type:data rom:0x3A0D40
 D_E009EE28 = 0xE009EE28; // type:data rom:0x3A0D48
 D_E009EE30 = 0xE009EE30; // type:data rom:0x3A0D50
 D_E009EE38 = 0xE009EE38; // type:data rom:0x3A0D58
-fx_80_main = 0xE00A0000; // type:func rom:0x3A2290
-fx_81_main = 0xE00A2000; // type:func rom:0x3A2990
-fx_81_init = 0xE00A2118; // type:func rom:0x3A2AA8
-fx_81_update = 0xE00A2120; // type:func rom:0x3A2AB0
-fx_81_render = 0xE00A21EC; // type:func rom:0x3A2B7C
+quizmo_answer_main = 0xE00A0000; // type:func rom:0x3A2290
+motion_blur_flame_main = 0xE00A2000; // type:func rom:0x3A2990
+motion_blur_flame_init = 0xE00A2118; // type:func rom:0x3A2AA8
+motion_blur_flame_update = 0xE00A2120; // type:func rom:0x3A2AB0
+motion_blur_flame_render = 0xE00A21EC; // type:func rom:0x3A2B7C
 func_E00A2234 = 0xE00A2234; // type:func rom:0x3A2BC4
-fx_81_appendGfx = 0xE00A223C; // type:func rom:0x3A2BCC
+motion_blur_flame_appendGfx = 0xE00A223C; // type:func rom:0x3A2BCC
 D_E00A29D0 = 0xE00A29D0; // type:data rom:0x3A3360
 D_E00A29DC = 0xE00A29DC; // type:data rom:0x3A336C
 D_E00A2A24 = 0xE00A2A24; // type:data rom:0x3A33B4
-fx_82_main = 0xE00A4000; // type:func rom:0x3A37E0
-fx_82_init = 0xE00A41A4; // type:func rom:0x3A3984
-fx_82_update = 0xE00A41AC; // type:func rom:0x3A398C
-fx_82_render = 0xE00A45DC; // type:func rom:0x3A3DBC
+energy_orb_wave_main = 0xE00A4000; // type:func rom:0x3A37E0
+energy_orb_wave_init = 0xE00A41A4; // type:func rom:0x3A3984
+energy_orb_wave_update = 0xE00A41AC; // type:func rom:0x3A398C
+energy_orb_wave_render = 0xE00A45DC; // type:func rom:0x3A3DBC
 func_E00A4648 = 0xE00A4648; // type:func rom:0x3A3E28
-fx_82_appendGfx = 0xE00A4650; // type:func rom:0x3A3E30
+energy_orb_wave_appendGfx = 0xE00A4650; // type:func rom:0x3A3E30
 D_E00A4AF0 = 0xE00A4AF0; // type:data rom:0x3A42D0
 D_E00A4B20 = 0xE00A4B20; // type:data rom:0x3A4300
 D_E00A4B28 = 0xE00A4B28; // type:data rom:0x3A4308
 D_E00A4B30 = 0xE00A4B30; // type:data rom:0x3A4310
 D_E00A4B38 = 0xE00A4B38; // type:data rom:0x3A4318
-fx_83_main = 0xE00A6000; // type:func rom:0x3A5550
-fx_83_init = 0xE00A611C; // type:func rom:0x3A566C
-fx_83_update = 0xE00A6124; // type:func rom:0x3A5674
-fx_83_render = 0xE00A6358; // type:func rom:0x3A58A8
+merlin_house_stars_main = 0xE00A6000; // type:func rom:0x3A5550
+merlin_house_stars_init = 0xE00A611C; // type:func rom:0x3A566C
+merlin_house_stars_update = 0xE00A6124; // type:func rom:0x3A5674
+merlin_house_stars_render = 0xE00A6358; // type:func rom:0x3A58A8
 func_E00A639C = 0xE00A639C; // type:func rom:0x3A58EC
-fx_83_appendGfx = 0xE00A63A4; // type:func rom:0x3A58F4
-fx_84_main = 0xE00A8000; // type:func rom:0x3A70F0
-fx_84_init = 0xE00A80FC; // type:func rom:0x3A71EC
-fx_84_update = 0xE00A8104; // type:func rom:0x3A71F4
-fx_84_render = 0xE00A82D4; // type:func rom:0x3A73C4
+merlin_house_stars_appendGfx = 0xE00A63A4; // type:func rom:0x3A58F4
+quizmo_audience_main = 0xE00A8000; // type:func rom:0x3A70F0
+quizmo_audience_init = 0xE00A80FC; // type:func rom:0x3A71EC
+quizmo_audience_update = 0xE00A8104; // type:func rom:0x3A71F4
+quizmo_audience_render = 0xE00A82D4; // type:func rom:0x3A73C4
 func_E00A8318 = 0xE00A8318; // type:func rom:0x3A7408
-fx_84_appendGfx = 0xE00A8320; // type:func rom:0x3A7410
+quizmo_audience_appendGfx = 0xE00A8320; // type:func rom:0x3A7410
 D_E00A8620 = 0xE00A8620; // type:data rom:0x3A7710
 D_E00A8648 = 0xE00A8648; // type:data rom:0x3A7738
 D_E00A8678 = 0xE00A8678; // type:data rom:0x3A7768
 D_E00A8690 = 0xE00A8690; // type:data rom:0x3A7780
 D_E00A86A0 = 0xE00A86A0; // type:data rom:0x3A7790
-fx_85_main = 0xE00AA000; // type:func rom:0x3AA920
-fx_85_init = 0xE00AA104; // type:func rom:0x3AAA24
-fx_85_update = 0xE00AA10C; // type:func rom:0x3AAA2C
-fx_85_render = 0xE00AA3C0; // type:func rom:0x3AACE0
-fx_85_appendGfx = 0xE00AA404; // type:func rom:0x3AAD24
+butterflies_main = 0xE00AA000; // type:func rom:0x3AA920
+butterflies_init = 0xE00AA104; // type:func rom:0x3AAA24
+butterflies_update = 0xE00AA10C; // type:func rom:0x3AAA2C
+butterflies_render = 0xE00AA3C0; // type:func rom:0x3AACE0
+butterflies_appendGfx = 0xE00AA404; // type:func rom:0x3AAD24
 D_E00AA6C0 = 0xE00AA6C0; // type:data rom:0x3AAFE0
 D_E00AA6EC = 0xE00AA6EC; // type:data rom:0x3AB00C
-fx_86_main = 0xE00AC000; // type:func rom:0x3AEE20
-fx_86_init = 0xE00AC11C; // type:func rom:0x3AEF3C
-fx_86_update = 0xE00AC124; // type:func rom:0x3AEF44
-fx_86_render = 0xE00AC280; // type:func rom:0x3AF0A0
+stat_change_main = 0xE00AC000; // type:func rom:0x3AEE20
+stat_change_init = 0xE00AC11C; // type:func rom:0x3AEF3C
+stat_change_update = 0xE00AC124; // type:func rom:0x3AEF44
+stat_change_render = 0xE00AC280; // type:func rom:0x3AF0A0
 func_E00AC288 = 0xE00AC288; // type:func rom:0x3AF0A8
 func_E00AC2A4 = 0xE00AC2A4; // type:func rom:0x3AF0C4
 D_E00AC7B0 = 0xE00AC7B0; // type:data rom:0x3AF5D0
@@ -6498,32 +6498,32 @@ D_E00AC83C = 0xE00AC83C; // type:data rom:0x3AF65C
 D_E00AC880 = 0xE00AC880; // type:data rom:0x3AF6A0
 D_E00AC8D0 = 0xE00AC8D0; // type:data rom:0x3AF6F0
 D_E00AC8D8 = 0xE00AC8D8; // type:data rom:0x3AF6F8
-fx_87_main = 0xE00AE000; // type:func rom:0x3B2350
-fx_87_init = 0xE00AE1AC; // type:func rom:0x3B24FC
-fx_87_update = 0xE00AE1B4; // type:func rom:0x3B2504
-fx_87_render = 0xE00AE4FC; // type:func rom:0x3B284C
+snaking_static_main = 0xE00AE000; // type:func rom:0x3B2350
+snaking_static_init = 0xE00AE1AC; // type:func rom:0x3B24FC
+snaking_static_update = 0xE00AE1B4; // type:func rom:0x3B2504
+snaking_static_render = 0xE00AE4FC; // type:func rom:0x3B284C
 func_E00AE544 = 0xE00AE544; // type:func rom:0x3B2894
-fx_87_appendGfx = 0xE00AE54C; // type:func rom:0x3B289C
-fx_88_main = 0xE00B0000; // type:func rom:0x3B3EB0
-fx_88_init = 0xE00B011C; // type:func rom:0x3B3FCC
-fx_88_update = 0xE00B0124; // type:func rom:0x3B3FD4
-fx_88_render = 0xE00B01F8; // type:func rom:0x3B40A8
-fx_88_appendGfx = 0xE00B0234; // type:func rom:0x3B40E4
+snaking_static_appendGfx = 0xE00AE54C; // type:func rom:0x3B289C
+thunderbolt_ring_main = 0xE00B0000; // type:func rom:0x3B3EB0
+thunderbolt_ring_init = 0xE00B011C; // type:func rom:0x3B3FCC
+thunderbolt_ring_update = 0xE00B0124; // type:func rom:0x3B3FD4
+thunderbolt_ring_render = 0xE00B01F8; // type:func rom:0x3B40A8
+thunderbolt_ring_appendGfx = 0xE00B0234; // type:func rom:0x3B40E4
 D_E00B07E0 = 0xE00B07E0; // type:data rom:0x3B4690
 D_E00B07E8 = 0xE00B07E8; // type:data rom:0x3B4698
-fx_89_main = 0xE00B2000; // type:func rom:0x3B4790
-fx_89_init = 0xE00B21DC; // type:func rom:0x3B496C
-fx_89_update = 0xE00B21E4; // type:func rom:0x3B4974
-fx_89_render = 0xE00B2460; // type:func rom:0x3B4BF0
+squirt_main = 0xE00B2000; // type:func rom:0x3B4790
+squirt_init = 0xE00B21DC; // type:func rom:0x3B496C
+squirt_update = 0xE00B21E4; // type:func rom:0x3B4974
+squirt_render = 0xE00B2460; // type:func rom:0x3B4BF0
 func_E00B24A8 = 0xE00B24A8; // type:func rom:0x3B4C38
-fx_89_appendGfx = 0xE00B24B0; // type:func rom:0x3B4C40
+squirt_appendGfx = 0xE00B24B0; // type:func rom:0x3B4C40
 D_E00B2BA0 = 0xE00B2BA0; // type:data rom:0x3B5330
-fx_90_main = 0xE00B4000; // type:func rom:0x3B5CF0
-fx_90_init = 0xE00B4134; // type:func rom:0x3B5E24
-fx_90_update = 0xE00B413C; // type:func rom:0x3B5E2C
-fx_90_render = 0xE00B452C; // type:func rom:0x3B621C
+water_block_main = 0xE00B4000; // type:func rom:0x3B5CF0
+water_block_init = 0xE00B4134; // type:func rom:0x3B5E24
+water_block_update = 0xE00B413C; // type:func rom:0x3B5E2C
+water_block_render = 0xE00B452C; // type:func rom:0x3B621C
 func_E00B4574 = 0xE00B4574; // type:func rom:0x3B6264
-fx_90_appendGfx = 0xE00B457C; // type:func rom:0x3B626C
+water_block_appendGfx = 0xE00B457C; // type:func rom:0x3B626C
 D_E00B4CF0 = 0xE00B4CF0; // type:data rom:0x3B69E0
 D_E00B4ED0 = 0xE00B4ED0; // type:data rom:0x3B6BC0
 D_E00B4ED8 = 0xE00B4ED8; // type:data rom:0x3B6BC8
@@ -6531,43 +6531,43 @@ D_E00B4EE0 = 0xE00B4EE0; // type:data rom:0x3B6BD0
 D_E00B4EE8 = 0xE00B4EE8; // type:data rom:0x3B6BD8
 D_E00B4EF0 = 0xE00B4EF0; // type:data rom:0x3B6BE0
 D_E00B4EF8 = 0xE00B4EF8; // type:data rom:0x3B6BE8
-fx_91_main = 0xE00B6000; // type:func rom:0x3B7160
-fx_91_init = 0xE00B6178; // type:func rom:0x3B72D8
-fx_91_update = 0xE00B6180; // type:func rom:0x3B72E0
-fx_91_render = 0xE00B629C; // type:func rom:0x3B73FC
+waterfall_main = 0xE00B6000; // type:func rom:0x3B7160
+waterfall_init = 0xE00B6178; // type:func rom:0x3B72D8
+waterfall_update = 0xE00B6180; // type:func rom:0x3B72E0
+waterfall_render = 0xE00B629C; // type:func rom:0x3B73FC
 func_E00B62D8 = 0xE00B62D8; // type:func rom:0x3B7438
-fx_91_appendGfx = 0xE00B62E0; // type:func rom:0x3B7440
+waterfall_appendGfx = 0xE00B62E0; // type:func rom:0x3B7440
 D_E00B6750 = 0xE00B6750; // type:data rom:0x3B78B0
 D_E00B6758 = 0xE00B6758; // type:data rom:0x3B78B8
 D_E00B6760 = 0xE00B6760; // type:data rom:0x3B78C0
 D_E00B6768 = 0xE00B6768; // type:data rom:0x3B78C8
-fx_92_main = 0xE00B8000; // type:func rom:0x3B7B80
-fx_92_init = 0xE00B812C; // type:func rom:0x3B7CAC
-fx_92_update = 0xE00B8134; // type:func rom:0x3B7CB4
-fx_92_render = 0xE00B81B8; // type:func rom:0x3B7D38
+water_fountain_main = 0xE00B8000; // type:func rom:0x3B7B80
+water_fountain_init = 0xE00B812C; // type:func rom:0x3B7CAC
+water_fountain_update = 0xE00B8134; // type:func rom:0x3B7CB4
+water_fountain_render = 0xE00B81B8; // type:func rom:0x3B7D38
 func_E00B8200 = 0xE00B8200; // type:func rom:0x3B7D80
-fx_92_appendGfx = 0xE00B8208; // type:func rom:0x3B7D88
+water_fountain_appendGfx = 0xE00B8208; // type:func rom:0x3B7D88
 D_E00B88F0 = 0xE00B88F0; // type:data rom:0x3B8470
 D_E00B8900 = 0xE00B8900; // type:data rom:0x3B8480
 D_E00B8B58 = 0xE00B8B58; // type:data rom:0x3B86D8
 D_E00B8CA4 = 0xE00B8CA4; // type:data rom:0x3B8824
 D_E00B8CD0 = 0xE00B8CD0; // type:data rom:0x3B8850
-fx_93_main = 0xE00BA000; // type:func rom:0x3B8BD0
-fx_93_init = 0xE00BA16C; // type:func rom:0x3B8D3C
-fx_93_update = 0xE00BA174; // type:func rom:0x3B8D44
-fx_93_render = 0xE00BA5DC; // type:func rom:0x3B91AC
+underwater_main = 0xE00BA000; // type:func rom:0x3B8BD0
+underwater_init = 0xE00BA16C; // type:func rom:0x3B8D3C
+underwater_update = 0xE00BA174; // type:func rom:0x3B8D44
+underwater_render = 0xE00BA5DC; // type:func rom:0x3B91AC
 func_E00BA618 = 0xE00BA618; // type:func rom:0x3B91E8
-fx_93_appendGfx = 0xE00BA620; // type:func rom:0x3B91F0
+underwater_appendGfx = 0xE00BA620; // type:func rom:0x3B91F0
 D_E00BAE80 = 0xE00BAE80; // type:data rom:0x3B9A50
 D_E00BAE88 = 0xE00BAE88; // type:data rom:0x3B9A58
 D_E00BAE90 = 0xE00BAE90; // type:data rom:0x3B9A60
-fx_94_main = 0xE00BC000; // type:func rom:0x3BA030
-fx_94_init = 0xE00BC1D0; // type:func rom:0x3BA200
+lightning_bolt_main = 0xE00BC000; // type:func rom:0x3BA030
+lightning_bolt_init = 0xE00BC1D0; // type:func rom:0x3BA200
 func_E00BC1D8 = 0xE00BC1D8; // type:func rom:0x3BA208
-fx_94_update = 0xE00BC238; // type:func rom:0x3BA268
-fx_94_render = 0xE00BC2E8; // type:func rom:0x3BA318
+lightning_bolt_update = 0xE00BC238; // type:func rom:0x3BA268
+lightning_bolt_render = 0xE00BC2E8; // type:func rom:0x3BA318
 func_E00BC36C = 0xE00BC36C; // type:func rom:0x3BA39C
-fx_94_appendGfx = 0xE00BC374; // type:func rom:0x3BA3A4
+lightning_bolt_appendGfx = 0xE00BC374; // type:func rom:0x3BA3A4
 D_E00BCC30 = 0xE00BCC30; // type:data rom:0x3BAC60
 D_E00BCD38 = 0xE00BCD38; // type:data rom:0x3BAD68
 D_E00BCE40 = 0xE00BCE40; // type:data rom:0x3BAE70
@@ -6575,220 +6575,220 @@ D_E00BCE50 = 0xE00BCE50; // type:data rom:0x3BAE80
 D_E00BCE58 = 0xE00BCE58; // type:data rom:0x3BAE88
 D_E00BCE60 = 0xE00BCE60; // type:data rom:0x3BAE90
 D_E00BCE68 = 0xE00BCE68; // type:data rom:0x3BAE98
-fx_95_main = 0xE00BE000; // type:func rom:0x3BBF60
-fx_95_init = 0xE00BE39C; // type:func rom:0x3BC2FC
-fx_95_update = 0xE00BE3A4; // type:func rom:0x3BC304
-fx_95_render = 0xE00BE578; // type:func rom:0x3BC4D8
+water_splash_main = 0xE00BE000; // type:func rom:0x3BBF60
+water_splash_init = 0xE00BE39C; // type:func rom:0x3BC2FC
+water_splash_update = 0xE00BE3A4; // type:func rom:0x3BC304
+water_splash_render = 0xE00BE578; // type:func rom:0x3BC4D8
 func_E00BE5B4 = 0xE00BE5B4; // type:func rom:0x3BC514
-fx_95_appendGfx = 0xE00BE5BC; // type:func rom:0x3BC51C
-fx_96_main = 0xE00C0000; // type:func rom:0x3BCD60
-fx_96_init = 0xE00C0158; // type:func rom:0x3BCEB8
-fx_96_update = 0xE00C0160; // type:func rom:0x3BCEC0
-fx_96_render = 0xE00C0710; // type:func rom:0x3BD470
+water_splash_appendGfx = 0xE00BE5BC; // type:func rom:0x3BC51C
+snowman_doll_main = 0xE00C0000; // type:func rom:0x3BCD60
+snowman_doll_init = 0xE00C0158; // type:func rom:0x3BCEB8
+snowman_doll_update = 0xE00C0160; // type:func rom:0x3BCEC0
+snowman_doll_render = 0xE00C0710; // type:func rom:0x3BD470
 func_E00C0758 = 0xE00C0758; // type:func rom:0x3BD4B8
-fx_96_appendGfx = 0xE00C0760; // type:func rom:0x3BD4C0
-fx_97_main = 0xE00C2000; // type:func rom:0x3C11D0
-fx_97_init = 0xE00C2124; // type:func rom:0x3C12F4
-fx_97_update = 0xE00C212C; // type:func rom:0x3C12FC
-fx_97_render = 0xE00C21CC; // type:func rom:0x3C139C
+snowman_doll_appendGfx = 0xE00C0760; // type:func rom:0x3BD4C0
+fright_jar_main = 0xE00C2000; // type:func rom:0x3C11D0
+fright_jar_init = 0xE00C2124; // type:func rom:0x3C12F4
+fright_jar_update = 0xE00C212C; // type:func rom:0x3C12FC
+fright_jar_render = 0xE00C21CC; // type:func rom:0x3C139C
 func_E00C2214 = 0xE00C2214; // type:func rom:0x3C13E4
-fx_97_appendGfx = 0xE00C221C; // type:func rom:0x3C13EC
-fx_98_main = 0xE00C4000; // type:func rom:0x3CADF0
-fx_98_init = 0xE00C4170; // type:func rom:0x3CAF60
-fx_98_update = 0xE00C4178; // type:func rom:0x3CAF68
-fx_98_render = 0xE00C42C4; // type:func rom:0x3CB0B4
+fright_jar_appendGfx = 0xE00C221C; // type:func rom:0x3C13EC
+stop_watch_main = 0xE00C4000; // type:func rom:0x3CADF0
+stop_watch_init = 0xE00C4170; // type:func rom:0x3CAF60
+stop_watch_update = 0xE00C4178; // type:func rom:0x3CAF68
+stop_watch_render = 0xE00C42C4; // type:func rom:0x3CB0B4
 func_E00C4300 = 0xE00C4300; // type:func rom:0x3CB0F0
-fx_98_appendGfx = 0xE00C4308; // type:func rom:0x3CB0F8
-fx_99_main = 0xE00C6000; // type:func rom:0x3CC9E0
-fx_99_init = 0xE00C6394; // type:func rom:0x3CCD74
-fx_99_update = 0xE00C639C; // type:func rom:0x3CCD7C
-fx_99_render = 0xE00C6768; // type:func rom:0x3CD148
-fx_99_appendGfx = 0xE00C67B0; // type:func rom:0x3CD190
-fx_100_main = 0xE00C8000; // type:func rom:0x3CF3A0
-fx_100_init = 0xE00C8218; // type:func rom:0x3CF5B8
-fx_100_update = 0xE00C8220; // type:func rom:0x3CF5C0
-fx_100_render = 0xE00C8404; // type:func rom:0x3CF7A4
+stop_watch_appendGfx = 0xE00C4308; // type:func rom:0x3CB0F8
+fx_63_main = 0xE00C6000; // type:func rom:0x3CC9E0
+fx_63_init = 0xE00C6394; // type:func rom:0x3CCD74
+fx_63_update = 0xE00C639C; // type:func rom:0x3CCD7C
+fx_63_render = 0xE00C6768; // type:func rom:0x3CD148
+fx_63_appendGfx = 0xE00C67B0; // type:func rom:0x3CD190
+throw_spiny_main = 0xE00C8000; // type:func rom:0x3CF3A0
+throw_spiny_init = 0xE00C8218; // type:func rom:0x3CF5B8
+throw_spiny_update = 0xE00C8220; // type:func rom:0x3CF5C0
+throw_spiny_render = 0xE00C8404; // type:func rom:0x3CF7A4
 func_E00C844C = 0xE00C844C; // type:func rom:0x3CF7EC
-fx_100_appendGfx = 0xE00C8454; // type:func rom:0x3CF7F4
-fx_101_main = 0xE00CA000; // type:func rom:0x3D0500
-fx_101_init = 0xE00CA240; // type:func rom:0x3D0740
-fx_101_update = 0xE00CA248; // type:func rom:0x3D0748
-fx_101_render = 0xE00CA484; // type:func rom:0x3D0984
-fx_101_appendGfx = 0xE00CA4CC; // type:func rom:0x3D09CC
-fx_102_main = 0xE00CC000; // type:func rom:0x3D1690
-fx_102_init = 0xE00CC250; // type:func rom:0x3D18E0
-fx_102_update = 0xE00CC258; // type:func rom:0x3D18E8
-fx_102_render = 0xE00CC980; // type:func rom:0x3D2010
+throw_spiny_appendGfx = 0xE00C8454; // type:func rom:0x3CF7F4
+fx_65_main = 0xE00CA000; // type:func rom:0x3D0500
+fx_65_init = 0xE00CA240; // type:func rom:0x3D0740
+fx_65_update = 0xE00CA248; // type:func rom:0x3D0748
+fx_65_render = 0xE00CA484; // type:func rom:0x3D0984
+fx_65_appendGfx = 0xE00CA4CC; // type:func rom:0x3D09CC
+tubba_heart_attack_main = 0xE00CC000; // type:func rom:0x3D1690
+tubba_heart_attack_init = 0xE00CC250; // type:func rom:0x3D18E0
+tubba_heart_attack_update = 0xE00CC258; // type:func rom:0x3D18E8
+tubba_heart_attack_render = 0xE00CC980; // type:func rom:0x3D2010
 func_E00CC9C8 = 0xE00CC9C8; // type:func rom:0x3D2058
-fx_102_appendGfx = 0xE00CC9D0; // type:func rom:0x3D2060
-fx_103_main = 0xE00CE000; // type:func rom:0x3D2AC0
-fx_103_init = 0xE00CE21C; // type:func rom:0x3D2CDC
-fx_103_update = 0xE00CE224; // type:func rom:0x3D2CE4
-fx_103_render = 0xE00CE428; // type:func rom:0x3D2EE8
+tubba_heart_attack_appendGfx = 0xE00CC9D0; // type:func rom:0x3D2060
+whirlwind_main = 0xE00CE000; // type:func rom:0x3D2AC0
+whirlwind_init = 0xE00CE21C; // type:func rom:0x3D2CDC
+whirlwind_update = 0xE00CE224; // type:func rom:0x3D2CE4
+whirlwind_render = 0xE00CE428; // type:func rom:0x3D2EE8
 func_E00CE470 = 0xE00CE470; // type:func rom:0x3D2F30
-fx_103_appendGfx = 0xE00CE478; // type:func rom:0x3D2F38
-fx_104_main = 0xE00D0000; // type:func rom:0x3D3E20
-fx_104_init = 0xE00D018C; // type:func rom:0x3D3FAC
-fx_104_update = 0xE00D0194; // type:func rom:0x3D3FB4
-fx_104_render = 0xE00D0448; // type:func rom:0x3D4268
-fx_104_appendGfx = 0xE00D048C; // type:func rom:0x3D42AC
-fx_105_main = 0xE00D2000; // type:func rom:0x3D4970
-fx_105_init = 0xE00D2118; // type:func rom:0x3D4A88
-fx_105_update = 0xE00D2120; // type:func rom:0x3D4A90
-fx_105_render = 0xE00D2234; // type:func rom:0x3D4BA4
+whirlwind_appendGfx = 0xE00CE478; // type:func rom:0x3D2F38
+red_impact_main = 0xE00D0000; // type:func rom:0x3D3E20
+red_impact_init = 0xE00D018C; // type:func rom:0x3D3FAC
+red_impact_update = 0xE00D0194; // type:func rom:0x3D3FB4
+red_impact_render = 0xE00D0448; // type:func rom:0x3D4268
+red_impact_appendGfx = 0xE00D048C; // type:func rom:0x3D42AC
+floating_cloud_puff_main = 0xE00D2000; // type:func rom:0x3D4970
+floating_cloud_puff_init = 0xE00D2118; // type:func rom:0x3D4A88
+floating_cloud_puff_update = 0xE00D2120; // type:func rom:0x3D4A90
+floating_cloud_puff_render = 0xE00D2234; // type:func rom:0x3D4BA4
 func_E00D227C = 0xE00D227C; // type:func rom:0x3D4BEC
-fx_105_appendGfx = 0xE00D2284; // type:func rom:0x3D4BF4
-fx_107_main = 0xE00D6000; // type:func rom:0x3D5020
-fx_107_init = 0xE00D6718; // type:func rom:0x3D5738
-fx_107_update = 0xE00D6720; // type:func rom:0x3D5740
-fx_107_render = 0xE00D693C; // type:func rom:0x3D595C
+floating_cloud_puff_appendGfx = 0xE00D2284; // type:func rom:0x3D4BF4
+energy_in_out_main = 0xE00D6000; // type:func rom:0x3D5020
+energy_in_out_init = 0xE00D6718; // type:func rom:0x3D5738
+energy_in_out_update = 0xE00D6720; // type:func rom:0x3D5740
+energy_in_out_render = 0xE00D693C; // type:func rom:0x3D595C
 func_E00D6978 = 0xE00D6978; // type:func rom:0x3D5998
-fx_107_appendGfx = 0xE00D6980; // type:func rom:0x3D59A0
-fx_108_main = 0xE00D8000; // type:func rom:0x3D67C0
-fx_108_init = 0xE00D8120; // type:func rom:0x3D68E0
-fx_108_update = 0xE00D8128; // type:func rom:0x3D68E8
-fx_108_render = 0xE00D825C; // type:func rom:0x3D6A1C
+energy_in_out_appendGfx = 0xE00D6980; // type:func rom:0x3D59A0
+tattle_window_main = 0xE00D8000; // type:func rom:0x3D67C0
+tattle_window_init = 0xE00D8120; // type:func rom:0x3D68E0
+tattle_window_update = 0xE00D8128; // type:func rom:0x3D68E8
+tattle_window_render = 0xE00D825C; // type:func rom:0x3D6A1C
 func_E00D8264 = 0xE00D8264; // type:func rom:0x3D6A24
 func_E00D8280 = 0xE00D8280; // type:func rom:0x3D6A40
 func_E00D8288 = 0xE00D8288; // type:func rom:0x3D6A48
 func_E00D8334 = 0xE00D8334; // type:func rom:0x3D6AF4
 func_E00D8630 = 0xE00D8630; // type:func rom:0x3D6DF0
-fx_109_main = 0xE00DA000; // type:func rom:0x3D7240
-fx_109_init = 0xE00DA0FC; // type:func rom:0x3D733C
-fx_109_update = 0xE00DA104; // type:func rom:0x3D7344
-fx_109_render = 0xE00DA1E0; // type:func rom:0x3D7420
+shiny_flare_main = 0xE00DA000; // type:func rom:0x3D7240
+shiny_flare_init = 0xE00DA0FC; // type:func rom:0x3D733C
+shiny_flare_update = 0xE00DA104; // type:func rom:0x3D7344
+shiny_flare_render = 0xE00DA1E0; // type:func rom:0x3D7420
 func_E00DA228 = 0xE00DA228; // type:func rom:0x3D7468
-fx_109_appendGfx = 0xE00DA230; // type:func rom:0x3D7470
-fx_110_main = 0xE00DC000; // type:func rom:0x3D7A70
-fx_110_init = 0xE00DC190; // type:func rom:0x3D7C00
-fx_110_update = 0xE00DC198; // type:func rom:0x3D7C08
-fx_110_render = 0xE00DC2C0; // type:func rom:0x3D7D30
+shiny_flare_appendGfx = 0xE00DA230; // type:func rom:0x3D7470
+huff_puff_breath_main = 0xE00DC000; // type:func rom:0x3D7A70
+huff_puff_breath_init = 0xE00DC190; // type:func rom:0x3D7C00
+huff_puff_breath_update = 0xE00DC198; // type:func rom:0x3D7C08
+huff_puff_breath_render = 0xE00DC2C0; // type:func rom:0x3D7D30
 func_E00DC2FC = 0xE00DC2FC; // type:func rom:0x3D7D6C
-fx_110_appendGfx = 0xE00DC304; // type:func rom:0x3D7D74
-fx_111_main = 0xE00DE000; // type:func rom:0x3D8720
-fx_111_init = 0xE00DE11C; // type:func rom:0x3D883C
-fx_111_update = 0xE00DE124; // type:func rom:0x3D8844
-fx_111_render = 0xE00DE260; // type:func rom:0x3D8980
-fx_111_appendGfx = 0xE00DE2A8; // type:func rom:0x3D89C8
-fx_112_main = 0xE00E0000; // type:func rom:0x3DB460
-fx_112_init = 0xE00E01D0; // type:func rom:0x3DB630
-fx_112_update = 0xE00E01D8; // type:func rom:0x3DB638
-fx_112_render = 0xE00E05B0; // type:func rom:0x3DBA10
+huff_puff_breath_appendGfx = 0xE00DC304; // type:func rom:0x3D7D74
+cold_breath_main = 0xE00DE000; // type:func rom:0x3D8720
+cold_breath_init = 0xE00DE11C; // type:func rom:0x3D883C
+cold_breath_update = 0xE00DE124; // type:func rom:0x3D8844
+cold_breath_render = 0xE00DE260; // type:func rom:0x3D8980
+cold_breath_appendGfx = 0xE00DE2A8; // type:func rom:0x3D89C8
+embers_main = 0xE00E0000; // type:func rom:0x3DB460
+embers_init = 0xE00E01D0; // type:func rom:0x3DB630
+embers_update = 0xE00E01D8; // type:func rom:0x3DB638
+embers_render = 0xE00E05B0; // type:func rom:0x3DBA10
 func_E00E05F8 = 0xE00E05F8; // type:func rom:0x3DBA58
-fx_112_appendGfx = 0xE00E0600; // type:func rom:0x3DBA60
-fx_113_main = 0xE00E2000; // type:func rom:0x3DC310
-fx_113_init = 0xE00E212C; // type:func rom:0x3DC43C
-fx_113_update = 0xE00E2134; // type:func rom:0x3DC444
-fx_113_render = 0xE00E21C8; // type:func rom:0x3DC4D8
+embers_appendGfx = 0xE00E0600; // type:func rom:0x3DBA60
+hieroglyphs_main = 0xE00E2000; // type:func rom:0x3DC310
+hieroglyphs_init = 0xE00E212C; // type:func rom:0x3DC43C
+hieroglyphs_update = 0xE00E2134; // type:func rom:0x3DC444
+hieroglyphs_render = 0xE00E21C8; // type:func rom:0x3DC4D8
 func_E00E2210 = 0xE00E2210; // type:func rom:0x3DC520
-fx_113_appendGfx = 0xE00E2218; // type:func rom:0x3DC528
-fx_114_main = 0xE00E4000; // type:func rom:0x3DE000
-fx_114_init = 0xE00E4288; // type:func rom:0x3DE288
-fx_114_update = 0xE00E4290; // type:func rom:0x3DE290
-fx_114_render = 0xE00E490C; // type:func rom:0x3DE90C
+hieroglyphs_appendGfx = 0xE00E2218; // type:func rom:0x3DC528
+misc_particles_main = 0xE00E4000; // type:func rom:0x3DE000
+misc_particles_init = 0xE00E4288; // type:func rom:0x3DE288
+misc_particles_update = 0xE00E4290; // type:func rom:0x3DE290
+misc_particles_render = 0xE00E490C; // type:func rom:0x3DE90C
 func_E00E4954 = 0xE00E4954; // type:func rom:0x3DE954
-fx_114_appendGfx = 0xE00E495C; // type:func rom:0x3DE95C
-fx_115_main = 0xE00E6000; // type:func rom:0x3E0930
-fx_115_init = 0xE00E617C; // type:func rom:0x3E0AAC
-fx_115_update = 0xE00E6184; // type:func rom:0x3E0AB4
-fx_115_render = 0xE00E64D4; // type:func rom:0x3E0E04
+misc_particles_appendGfx = 0xE00E495C; // type:func rom:0x3DE95C
+static_status_main = 0xE00E6000; // type:func rom:0x3E0930
+static_status_init = 0xE00E617C; // type:func rom:0x3E0AAC
+static_status_update = 0xE00E6184; // type:func rom:0x3E0AB4
+static_status_render = 0xE00E64D4; // type:func rom:0x3E0E04
 func_E00E651C = 0xE00E651C; // type:func rom:0x3E0E4C
-fx_115_appendGfx = 0xE00E6524; // type:func rom:0x3E0E54
-fx_116_main = 0xE00E8000; // type:func rom:0x3E1690
-fx_116_init = 0xE00E825C; // type:func rom:0x3E18EC
-fx_116_update = 0xE00E8264; // type:func rom:0x3E18F4
-fx_116_render = 0xE00E8374; // type:func rom:0x3E1A04
-fx_116_appendGfx = 0xE00E83BC; // type:func rom:0x3E1A4C
-fx_117_main = 0xE00EA000; // type:func rom:0x3E1EE0
-fx_117_init = 0xE00EA190; // type:func rom:0x3E2070
-fx_117_update = 0xE00EA198; // type:func rom:0x3E2078
-fx_117_render = 0xE00EA520; // type:func rom:0x3E2400
+static_status_appendGfx = 0xE00E6524; // type:func rom:0x3E0E54
+moving_cloud_main = 0xE00E8000; // type:func rom:0x3E1690
+moving_cloud_init = 0xE00E825C; // type:func rom:0x3E18EC
+moving_cloud_update = 0xE00E8264; // type:func rom:0x3E18F4
+moving_cloud_render = 0xE00E8374; // type:func rom:0x3E1A04
+moving_cloud_appendGfx = 0xE00E83BC; // type:func rom:0x3E1A4C
+fx_75_main = 0xE00EA000; // type:func rom:0x3E1EE0
+fx_75_init = 0xE00EA190; // type:func rom:0x3E2070
+fx_75_update = 0xE00EA198; // type:func rom:0x3E2078
+fx_75_render = 0xE00EA520; // type:func rom:0x3E2400
 func_E00EA664 = 0xE00EA664; // type:func rom:0x3E2544
-fx_117_appendGfx = 0xE00EA66C; // type:func rom:0x3E254C
+fx_75_appendGfx = 0xE00EA66C; // type:func rom:0x3E254C
 D_E00EAA50 = 0xE00EAA50; // type:data rom:0x3E2930
 D_E00EAA58 = 0xE00EAA58; // type:data rom:0x3E2938
 D_E00EAA60 = 0xE00EAA60; // type:data rom:0x3E2940
-fx_119_main = 0xE010A000; // type:func rom:0x3E43A0
-fx_119_init = 0xE010A184; // type:func rom:0x3E4524
-fx_119_update = 0xE010A18C; // type:func rom:0x3E452C
-fx_119_render = 0xE010A4A0; // type:func rom:0x3E4840
-fx_119_appendGfx = 0xE010A4E8; // type:func rom:0x3E4888
-fx_120_main = 0xE010C000; // type:func rom:0x3E54C0
-fx_120_init = 0xE010C190; // type:func rom:0x3E5650
-fx_120_update = 0xE010C198; // type:func rom:0x3E5658
-fx_120_render = 0xE010C354; // type:func rom:0x3E5814
-fx_120_appendGfx = 0xE010C39C; // type:func rom:0x3E585C
+firework_rocket_main = 0xE010A000; // type:func rom:0x3E43A0
+firework_rocket_init = 0xE010A184; // type:func rom:0x3E4524
+firework_rocket_update = 0xE010A18C; // type:func rom:0x3E452C
+firework_rocket_render = 0xE010A4A0; // type:func rom:0x3E4840
+firework_rocket_appendGfx = 0xE010A4E8; // type:func rom:0x3E4888
+peach_star_beam_main = 0xE010C000; // type:func rom:0x3E54C0
+peach_star_beam_init = 0xE010C190; // type:func rom:0x3E5650
+peach_star_beam_update = 0xE010C198; // type:func rom:0x3E5658
+peach_star_beam_render = 0xE010C354; // type:func rom:0x3E5814
+peach_star_beam_appendGfx = 0xE010C39C; // type:func rom:0x3E585C
 func_E010E000 = 0xE010E000; // type:func rom:0x3EB4E0
-fx_121_main = 0xE010E32C; // type:func rom:0x3EB80C
-fx_121_init = 0xE010E4A0; // type:func rom:0x3EB980
-fx_121_update = 0xE010E4A8; // type:func rom:0x3EB988
-fx_121_render = 0xE010E510; // type:func rom:0x3EB9F0
-fx_121_appendGfx = 0xE010E558; // type:func rom:0x3EBA38
-fx_122_main = 0xE0110000; // type:func rom:0x3F83F0
-fx_122_init = 0xE0110224; // type:func rom:0x3F8614
-fx_122_update = 0xE011022C; // type:func rom:0x3F861C
-fx_122_render = 0xE01103A4; // type:func rom:0x3F8794
-fx_122_appendGfx = 0xE01103EC; // type:func rom:0x3F87DC
-fx_123_main = 0xE0112000; // type:func rom:0x3F9E50
-fx_123_init = 0xE01121B8; // type:func rom:0x3FA008
-fx_123_update = 0xE01121C0; // type:func rom:0x3FA010
-fx_123_render = 0xE01122E8; // type:func rom:0x3FA138
+chapter_change_main = 0xE010E32C; // type:func rom:0x3EB80C
+chapter_change_init = 0xE010E4A0; // type:func rom:0x3EB980
+chapter_change_update = 0xE010E4A8; // type:func rom:0x3EB988
+chapter_change_render = 0xE010E510; // type:func rom:0x3EB9F0
+chapter_change_appendGfx = 0xE010E558; // type:func rom:0x3EBA38
+ice_shard_main = 0xE0110000; // type:func rom:0x3F83F0
+ice_shard_init = 0xE0110224; // type:func rom:0x3F8614
+ice_shard_update = 0xE011022C; // type:func rom:0x3F861C
+ice_shard_render = 0xE01103A4; // type:func rom:0x3F8794
+ice_shard_appendGfx = 0xE01103EC; // type:func rom:0x3F87DC
+spirit_card_main = 0xE0112000; // type:func rom:0x3F9E50
+spirit_card_init = 0xE01121B8; // type:func rom:0x3FA008
+spirit_card_update = 0xE01121C0; // type:func rom:0x3FA010
+spirit_card_render = 0xE01122E8; // type:func rom:0x3FA138
 func_E0112330 = 0xE0112330; // type:func rom:0x3FA180
-fx_123_appendGfx = 0xE01124CC; // type:func rom:0x3FA31C
-fx_124_main = 0xE0114000; // type:func rom:0x3FEAE0
-fx_124_init = 0xE01140D4; // type:func rom:0x3FEBB4
-fx_124_update = 0xE01140DC; // type:func rom:0x3FEBBC
-fx_124_render = 0xE0114340; // type:func rom:0x3FEE20
-fx_124_appendGfx = 0xE0114388; // type:func rom:0x3FEE68
-fx_125_main = 0xE0116000; // type:func rom:0x402640
-fx_125_init = 0xE0116184; // type:func rom:0x4027C4
-fx_125_update = 0xE011618C; // type:func rom:0x4027CC
-fx_125_render = 0xE01166A0; // type:func rom:0x402CE0
+spirit_card_appendGfx = 0xE01124CC; // type:func rom:0x3FA31C
+lil_oink_main = 0xE0114000; // type:func rom:0x3FEAE0
+lil_oink_init = 0xE01140D4; // type:func rom:0x3FEBB4
+lil_oink_update = 0xE01140DC; // type:func rom:0x3FEBBC
+lil_oink_render = 0xE0114340; // type:func rom:0x3FEE20
+lil_oink_appendGfx = 0xE0114388; // type:func rom:0x3FEE68
+something_rotating_main = 0xE0116000; // type:func rom:0x402640
+something_rotating_init = 0xE0116184; // type:func rom:0x4027C4
+something_rotating_update = 0xE011618C; // type:func rom:0x4027CC
+something_rotating_render = 0xE01166A0; // type:func rom:0x402CE0
 func_E01166E8 = 0xE01166E8; // type:func rom:0x402D28
-fx_125_appendGfx = 0xE0116884; // type:func rom:0x402EC4
-fx_126_main = 0xE0118000; // type:func rom:0x403400
-fx_126_init = 0xE01182EC; // type:func rom:0x4036EC
-fx_126_update = 0xE01182F4; // type:func rom:0x4036F4
-fx_126_render = 0xE0118454; // type:func rom:0x403854
-fx_126_appendGfx = 0xE011849C; // type:func rom:0x40389C
-fx_127_main = 0xE011A000; // type:func rom:0x404220
-fx_127_init = 0xE011A0FC; // type:func rom:0x40431C
-fx_127_update = 0xE011A104; // type:func rom:0x404324
-fx_127_render = 0xE011A398; // type:func rom:0x4045B8
+something_rotating_appendGfx = 0xE0116884; // type:func rom:0x402EC4
+breaking_junk_main = 0xE0118000; // type:func rom:0x403400
+breaking_junk_init = 0xE01182EC; // type:func rom:0x4036EC
+breaking_junk_update = 0xE01182F4; // type:func rom:0x4036F4
+breaking_junk_render = 0xE0118454; // type:func rom:0x403854
+breaking_junk_appendGfx = 0xE011849C; // type:func rom:0x40389C
+partner_buff_main = 0xE011A000; // type:func rom:0x404220
+partner_buff_init = 0xE011A0FC; // type:func rom:0x40431C
+partner_buff_update = 0xE011A104; // type:func rom:0x404324
+partner_buff_render = 0xE011A398; // type:func rom:0x4045B8
 func_E011A3A0 = 0xE011A3A0; // type:func rom:0x4045C0
 func_E011A3BC = 0xE011A3BC; // type:func rom:0x4045DC
 func_E011A48C = 0xE011A48C; // type:func rom:0x4046AC
 func_E011A700 = 0xE011A700; // type:func rom:0x404920
-fx_128_main = 0xE011C000; // type:func rom:0x406B40
-fx_128_init = 0xE011C0F4; // type:func rom:0x406C34
-fx_128_update = 0xE011C0FC; // type:func rom:0x406C3C
-fx_128_render = 0xE011C17C; // type:func rom:0x406CBC
-fx_128_appendGfx = 0xE011C1C4; // type:func rom:0x406D04
-fx_129_main = 0xE011E000; // type:func rom:0x409990
-fx_129_init = 0xE011E18C; // type:func rom:0x409B1C
-fx_129_update = 0xE011E194; // type:func rom:0x409B24
-fx_129_render = 0xE011E530; // type:func rom:0x409EC0
-fx_129_appendGfx = 0xE011E578; // type:func rom:0x409F08
-fx_130_main = 0xE0120000; // type:func rom:0x40B3F0
-fx_130_init = 0xE0120134; // type:func rom:0x40B524
-fx_130_update = 0xE012013C; // type:func rom:0x40B52C
-fx_130_render = 0xE012039C; // type:func rom:0x40B78C
-fx_130_appendGfx = 0xE01203E4; // type:func rom:0x40B7D4
-fx_131_main = 0xE0122000; // type:func rom:0x40C5A0
-fx_131_init = 0xE0122174; // type:func rom:0x40C714
-fx_131_update = 0xE012217C; // type:func rom:0x40C71C
-fx_131_render = 0xE01226C4; // type:func rom:0x40CC64
-fx_131_appendGfx = 0xE012270C; // type:func rom:0x40CCAC
-fx_132_main = 0xE0124000; // type:func rom:0x412730
-fx_132_init = 0xE01242FC; // type:func rom:0x412A2C
-fx_132_update = 0xE0124304; // type:func rom:0x412A34
-fx_132_render = 0xE012448C; // type:func rom:0x412BBC
-fx_132_appendGfx = 0xE01244C4; // type:func rom:0x412BF4
-fx_133_main = 0xE0126000; // type:func rom:0x413360
-fx_133_init = 0xE012612C; // type:func rom:0x41348C
-fx_133_update = 0xE0126134; // type:func rom:0x413494
-fx_133_render = 0xE01264A4; // type:func rom:0x413804
-fx_133_appendGfx = 0xE01264EC; // type:func rom:0x41384C
+quizmo_assistant_main = 0xE011C000; // type:func rom:0x406B40
+quizmo_assistant_init = 0xE011C0F4; // type:func rom:0x406C34
+quizmo_assistant_update = 0xE011C0FC; // type:func rom:0x406C3C
+quizmo_assistant_render = 0xE011C17C; // type:func rom:0x406CBC
+quizmo_assistant_appendGfx = 0xE011C1C4; // type:func rom:0x406D04
+ice_pillar_main = 0xE011E000; // type:func rom:0x409990
+ice_pillar_init = 0xE011E18C; // type:func rom:0x409B1C
+ice_pillar_update = 0xE011E194; // type:func rom:0x409B24
+ice_pillar_render = 0xE011E530; // type:func rom:0x409EC0
+ice_pillar_appendGfx = 0xE011E578; // type:func rom:0x409F08
+sun_main = 0xE0120000; // type:func rom:0x40B3F0
+sun_init = 0xE0120134; // type:func rom:0x40B524
+sun_update = 0xE012013C; // type:func rom:0x40B52C
+sun_render = 0xE012039C; // type:func rom:0x40B78C
+sun_appendGfx = 0xE01203E4; // type:func rom:0x40B7D4
+star_spirits_energy_main = 0xE0122000; // type:func rom:0x40C5A0
+star_spirits_energy_init = 0xE0122174; // type:func rom:0x40C714
+star_spirits_energy_update = 0xE012217C; // type:func rom:0x40C71C
+star_spirits_energy_render = 0xE01226C4; // type:func rom:0x40CC64
+star_spirits_energy_appendGfx = 0xE012270C; // type:func rom:0x40CCAC
+pink_sparkles_main = 0xE0124000; // type:func rom:0x412730
+pink_sparkles_init = 0xE01242FC; // type:func rom:0x412A2C
+pink_sparkles_update = 0xE0124304; // type:func rom:0x412A34
+pink_sparkles_render = 0xE012448C; // type:func rom:0x412BBC
+pink_sparkles_appendGfx = 0xE01244C4; // type:func rom:0x412BF4
+star_outline_main = 0xE0126000; // type:func rom:0x413360
+star_outline_init = 0xE012612C; // type:func rom:0x41348C
+star_outline_update = 0xE0126134; // type:func rom:0x413494
+star_outline_render = 0xE01264A4; // type:func rom:0x413804
+star_outline_appendGfx = 0xE01264EC; // type:func rom:0x41384C
 fx_134_main = 0xE0128000; // type:func rom:0x414BA0
 fx_134_init = 0xE0128128; // type:func rom:0x414CC8
 fx_134_update = 0xE0128130; // type:func rom:0x414CD0
@@ -23226,7 +23226,6 @@ flo_13_D_80247D00 = 0x80247D00; // type:data
 raster.3 = 0x80247D00; // type:data
 D_80247DF0 = 0x80247DF0; // type:data
 D_80247E68 = 0x80247E68; // type:data
-D_80248380 = 0x80248380; // type:data
 D_80248388 = 0x80248388; // type:data
 D_802483C0 = 0x802483C0; // type:data
 D_802483C4 = 0x802483C4; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index 935de49b46..213d58db5e 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -71,6 +71,224 @@ D_8004AA85 = 0x8004AA85;
 dtor = 0x80093DC0;
 D_80093DD0 = 0x80093DD0;
 
+// effect_1
+D_09000FA0 = 0x09000FA0;
+D_09001060 = 0x09001060;
+D_09001120 = 0x09001120;
+D_090011E0 = 0x090011E0;
+D_090012A0 = 0x090012A0;
+D_09001360 = 0x09001360;
+D_09001420 = 0x09001420;
+
+// effect_6
+D_09002780 = 0x09002780;
+D_09002868 = 0x09002868;
+D_09002950 = 0x09002950;
+D_09002A38 = 0x09002A38;
+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_8
+D_09000E08 = 0x09000E08;
+
+// effect_9
+D_09000E20 = 0x09000E20;
+D_09000E38 = 0x09000E38;
+
+// effect_10, effect_11
+D_090000E0 = 0x090000E0;
+D_090001B8 = 0x090001B8;
+
+// effect_12
+D_09000240 = 0x09000240;
+
+// effect_13
+D_090002F0 = 0x090002F0;
+
+// effect_14
+D_09000900 = 0x09000900;
+D_090009E8 = 0x090009E8;
+
+// effect_16
+D_09002170 = 0x09002170;
+D_09002238 = 0x09002238;
+D_090022E0 = 0x090022E0;
+D_09002308 = 0x09002308;
+D_090023B0 = 0x090023B0;
+D_090023D8 = 0x090023D8;
+D_09002480 = 0x09002480;
+D_090024A8 = 0x090024A8;
+D_09002550 = 0x09002550;
+D_09002578 = 0x09002578;
+
+// effect_73
+D_090002C0 = 0x090002C0;
+D_09000330 = 0x09000330;
+D_09000370 = 0x09000370;
+D_090003B0 = 0x090003B0;
+D_090003F0 = 0x090003F0;
+D_09000430 = 0x09000430;
+D_09000470 = 0x09000470;
+
+// effect_75
+D_09001280 = 0x09001280;
+D_09001358 = 0x09001358;
+D_09001430 = 0x09001430;
+D_09001508 = 0x09001508;
+
+// effect_134
+D_09000800 = 0x09000800;
+D_09000BA8 = 0x09000BA8;
+D_09000BC8 = 0x09000BC8;
+D_09000BE8 = 0x09000BE8;
+D_09000C08 = 0x09000C08;
+D_09000C28 = 0x09000C28;
+D_09000C48 = 0x09000C48;
+D_09000C68 = 0x09000C68;
+D_09000C88 = 0x09000C88;
+D_09000CA8 = 0x09000CA8;
+D_09000CC8 = 0x09000CC8;
+D_09000CE8 = 0x09000CE8;
+D_09000D08 = 0x09000D08;
+
+// Invalid pointers from dead code
+dead_atan2 = 0x8002AF70;
+dead_gCurrentCamID = 0x800A158C;
+dead_gCameras = 0x800B8D80;
+D_80100060 = 0x80100060;
+D_801000A0 = 0x801000A0;
+dead_evt_get_variable = 0x802D4E8C;
+dead_evt_set_variable = 0x802D5468;
+dead_evt_get_float_variable = 0x802D57FC;
+dead_cos_rad = 0x8002B4C0;
+dead_evt_set_float_variable = 0x802D5A10;
+dead_fx_sparkles = 0x80075170;
+dead_gPlayerStatusPtr = 0x800FFC90;
+dead_set_main_pan_u = 0x80126064;
+dead_set_main_pan_v = 0x8012607C;
+dead_set_aux_pan_u = 0x80126094;
+dead_set_aux_pan_v = 0x801260AC;
+dead_get_npc_unsafe = 0x8003E4BC;
+dead_fx_emote = 0x80075110;
+dead_get_enemy = 0x80042AF4;
+dead_dist2D = 0x8002B1C4;
+dead_get_clamped_angle_diff = 0x8002AF18;
+dead_clamp_angle = 0x8002AE14;
+dead_add_vec2D_polar = 0x8002B28C;
+dead_ai_enemy_play_sound = 0x8004D800;
+func_8004D9C0 = 0x8004D9C0;
+func_8004DAD8 = 0x8004DAD8;
+func_8004DF64 = 0x8004DF64;
+func_8004E024 = 0x8004E024;
+func_8004E25C = 0x8004E25C;
+func_8004E2EC = 0x8004E2EC;
+func_8004E39C = 0x8004E39C;
+func_8004E544 = 0x8004E544;
+func_8004E808 = 0x8004E808;
+func_8004EB8C = 0x8004EB8C;
+func_8004D1A4 = 0x8004D1A4;
+dead_npc_move_heading = 0x8003E424;
+dead_sqrtf = 0x80067040;
+dead_npc_test_move_simple_with_slipping = 0x800E5304;
+dead_npc_raycast_down_sides = 0x800E423C;
+dead_is_point_within_region = 0x8004D0C4;
+func_8004D8E0 = 0x8004D8E0;
+dead_rand_int = 0x8002ACEC;
+dead_get_npc_safe = 0x8003E534;
+dead_heap_malloc = 0x8002BFD4;
+func_8002C01C = 0x8002C01C;
+dead_sin_deg = 0x8002B5DC;
+dead_cos_deg = 0x8002B640;
+dead_subtract_hp = 0x800F1EF8;
+dead_sfx_adjust_env_sound_pos = 0x8015704C;
+dead_fx_star_spirits_energy = 0x80077C30;
+dead_update_lerp = 0x8002B6A4;
+dead_fx_spirit_card = 0x80077930;
+dead_create_shadow_type = 0x8011AAB4;
+dead_dist3D = 0x8002B21C;
+func_802E2A80 = 0x802E2A80;
+func_802E2B74 = 0x802E2B74;
+func_80128510 = 0x80128510;
+func_8012DFE8 = 0x8012DFE8;
+func_8002AA2C = 0x8002AA2C;
+func_80059AC8 = 0x80059AC8;
+dead_get_entity_by_index = 0x80118BB0;
+dead_fx_sun = 0x80077BD0;
+func_80041080 = 0x80041080;
+dead_set_max_SP = 0x800F1D9C;
+dead_sync_status_menu = 0x800F1730;
+dead_get_npc_by_index = 0x8003C43C;
+dead_increment_status_menu_disabled = 0x800F1718;
+dead_decrement_status_menu_disabled = 0x800F16F4;
+dead_get_model_list_index_from_tree_index = 0x80125270;
+dead_get_model_from_list_index = 0x80124F44;
+dead_guTranslateF = 0x8006CAC0;
+func_800775D0 = 0x800775D0;
+func_802F3B00 = 0x802F3B00;
+func_800FCD0C = 0x800FCD0C;
+func_800F9260 = 0x800F9260;
+func_800F93E8 = 0x800F93E8;
+dead_switch_to_partner = 0x800F2D5C;
+dead_set_message_msg = 0x80130C74;
+dead_fx_energy_orb_wave = 0x800769D0;
+dead_fx_radial_shimmer = 0x80075E30;
+func_8002B524 = 0x8002B524;
+func_8002BF18 = 0x8002BF18;
+func_80076970 = 0x80076970;
+dead_set_screen_overlay_color = 0x80144200;
+dead_set_screen_overlay_params_front = 0x80144178;
+dead_npc_test_move_simple_without_slipping = 0x800E53AC;
+dead_get_item_entity = 0x8013CF98;
+func_80066FE0 = 0x80066FE0;
+func_8002A910 = 0x8002A910;
+dead_get_current_map_header = 0x8005F128;
+dead_partner_clear_player_tracking = 0x800F7278;
+func_800F2E98 = 0x800F2E98;
+dead_set_npc_yaw = 0x8003ED50;
+dead_disable_npc_shadow = 0x8003E5E8;
+dead_get_screen_coords = 0x8002FCBC;
+dead_sfx_get_spatialized_sound_params = 0x801574DC;
+dead_sfx_play_sound_with_params = 0x80157118;
+dead_load_asset_by_name = 0x8005F238;
+dead_decode_yay0 = 0x80074070;
+dead_general_heap_free = 0x8002BF68;
+dead_set_message_images = 0x80130C64;
+func_8002B45C = 0x8002B45C;
+func_801266F8 = 0x801266F8;
+func_80126734 = 0x80126734;
+dead_set_screen_overlay_params_back = 0x80144194;
+dead_gItemTable = 0x8008D2C0;
+dead_gPartnerActionStatus = 0x80117163;
+dead_gPlayerStatus = 0x80117578;
+dead_gPlayerActionState = 0x8011762C;
+dead_gPartnerActionStatus2 = 0x80117160;
+dead_gPlayerData = 0x80117840;
+dead_gCollisionStatus = 0x80169B12;
+dead_gOverrideFlags = 0x800A15A8;
+D_800A1530 = 0x800A1530;
+D_800A15A4 = 0x800A15A4;
+D_800A15C4 = 0x800A15C4;
+D_800A15CC = 0x800A15CC;
+dead_gCurrentEncounter = 0x800B7EF0;
+D_800B8DEC = 0x800B8DEC;
+dead_guMtxIdentF = 0x8006C660;
+dead_guMtxCatF = 0x8006C7C0;
+D_80169B16 = 0x80169B16;
+D_80248380 = 0x80248380;
+D_8024854C = 0x8024854C;
+D_80246894 = 0x80246894;
+
+// TODO below
+
+// misc unsorted
 gBackgroundImage = 0x80200000;
 func_80242040_8B20B0 = 0x80242040;
 spiked_goomba = 0x8021B0AC;
@@ -96,9 +314,7 @@ D_8000030C = 0x8000030C;
 osMemSize = 0x80000318;
 D_8000031C = 0x8000031C;
 D_800A08C0 = 0x800A08C0;
-
 D_80164000 = 0x80164000;
-D_80169B16 = 0x80169B16;
 D_80197000 = 0x80197000;
 D_801A6000 = 0x801A6000;
 D_801A7000 = 0x801A7000;
@@ -107,7 +323,6 @@ D_80210000 = 0x80210000;
 D_8022AD80_4C3F70 = 0x8022AD80;
 D_8022ADD0 = 0x8022ADD0;
 D_8022B550 = 0x8022B550;
-D_802310D0 = 0x802310D0;
 D_80232C4C = 0x80232C4C;
 D_80235E00 = 0x80235E00;
 D_80235E6C_4CF05C = 0x80235E6C;
@@ -235,7 +450,6 @@ D_802465F0 = 0x802465F0;
 D_802466D0 = 0x802466D0;
 D_80246794 = 0x80246794;
 D_802467B4 = 0x802467B4;
-D_80246894 = 0x80246894;
 D_80246990 = 0x80246990;
 D_80246BE8 = 0x80246BE8;
 D_80247050 = 0x80247050;
@@ -250,13 +464,11 @@ D_80247CA0 = 0x80247CA0;
 D_80247CB4 = 0x80247CB4;
 D_80247D00 = 0x80247D00;
 D_80247E68 = 0x80247E68;
-D_80248380 = 0x80248380;
 D_80248388 = 0x80248388;
 D_802483C0 = 0x802483C0;
 D_802483C4 = 0x802483C4;
 D_802483D0 = 0x802483D0;
 D_80248480 = 0x80248480;
-D_8024854C = 0x8024854C;
 D_80248600 = 0x80248600;
 D_80248624 = 0x80248624;
 D_80248650 = 0x80248650;
@@ -961,219 +1173,5 @@ gSpriteHeapPtr = 0x8034F800;
 heap_battleHead = 0x803DA800;
 D_802510B0 = 0x802510B0;
 D_8026A2B0 = 0x8026A2B0;
-
-// BSS syms
-#ifndef NON_MATCHING
-// todo add more here as we find them
-#endif
-
-// effect_1
-D_09000FA0 = 0x09000FA0;
-D_09001060 = 0x09001060;
-D_09001120 = 0x09001120;
-D_090011E0 = 0x090011E0;
-D_090012A0 = 0x090012A0;
-D_09001360 = 0x09001360;
-D_09001420 = 0x09001420;
-
-// effect_6
-D_09002780 = 0x09002780;
-D_09002868 = 0x09002868;
-D_09002950 = 0x09002950;
-D_09002A38 = 0x09002A38;
-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_8
-D_09000E08 = 0x09000E08;
-
-// effect_9
-D_09000E20 = 0x09000E20;
-D_09000E38 = 0x09000E38;
-
-// effect_10 / effect_11
-D_090000E0 = 0x090000E0;
-D_090001B8 = 0x090001B8;
-
-// effect_12
-D_09000240 = 0x09000240;
-
-// effect_13
-D_090002F0 = 0x090002F0;
-
-// effect_14
-D_09000900 = 0x09000900;
-D_090009E8 = 0x090009E8;
-
-// effect_16
-D_09002170 = 0x09002170;
-D_09002238 = 0x09002238;
-D_090022E0 = 0x090022E0;
-D_09002308 = 0x09002308;
-D_090023B0 = 0x090023B0;
-D_090023D8 = 0x090023D8;
-D_09002480 = 0x09002480;
-D_090024A8 = 0x090024A8;
-D_09002550 = 0x09002550;
-D_09002578 = 0x09002578;
-
-// effect_73
-D_090002C0 = 0x090002C0;
-D_09000330 = 0x09000330;
-D_09000370 = 0x09000370;
-D_090003B0 = 0x090003B0;
-D_090003F0 = 0x090003F0;
-D_09000430 = 0x09000430;
-D_09000470 = 0x09000470;
-
-// effect_75
-D_09001280 = 0x09001280;
-D_09001358 = 0x09001358;
-D_09001430 = 0x09001430;
-D_09001508 = 0x09001508;
-
-// effect_134
-D_09000800 = 0x09000800;
-D_09000BA8 = 0x09000BA8;
-D_09000BC8 = 0x09000BC8;
-D_09000BE8 = 0x09000BE8;
-D_09000C08 = 0x09000C08;
-D_09000C28 = 0x09000C28;
-D_09000C48 = 0x09000C48;
-D_09000C68 = 0x09000C68;
-D_09000C88 = 0x09000C88;
-D_09000CA8 = 0x09000CA8;
-D_09000CC8 = 0x09000CC8;
-D_09000CE8 = 0x09000CE8;
-D_09000D08 = 0x09000D08;
-
-// Invalid pointers from dead code
-dead_atan2 = 0x8002AF70;
-dead_gCurrentCamID = 0x800A158C;
-dead_gCameras = 0x800B8D80;
-D_80100060 = 0x80100060;
-D_801000A0 = 0x801000A0;
-dead_evt_get_variable = 0x802D4E8C;
-dead_evt_set_variable = 0x802D5468;
-dead_evt_get_float_variable = 0x802D57FC;
-dead_cos_rad = 0x8002B4C0;
-dead_evt_set_float_variable = 0x802D5A10;
-dead_playFX_11 = 0x80075170;
-dead_gPlayerStatusPtr = 0x800FFC90;
-dead_set_main_pan_u = 0x80126064;
-dead_set_main_pan_v = 0x8012607C;
-dead_set_aux_pan_u = 0x80126094;
-dead_set_aux_pan_v = 0x801260AC;
-dead_get_npc_unsafe = 0x8003E4BC;
-dead_fx_emote = 0x80075110;
-dead_get_enemy = 0x80042AF4;
-dead_dist2D = 0x8002B1C4;
-dead_get_clamped_angle_diff = 0x8002AF18;
-dead_clamp_angle = 0x8002AE14;
-dead_add_vec2D_polar = 0x8002B28C;
-dead_ai_enemy_play_sound = 0x8004D800;
-func_8004D9C0 = 0x8004D9C0;
-func_8004DAD8 = 0x8004DAD8;
-func_8004DF64 = 0x8004DF64;
-func_8004E024 = 0x8004E024;
-func_8004E25C = 0x8004E25C;
-func_8004E2EC = 0x8004E2EC;
-func_8004E39C = 0x8004E39C;
-func_8004E544 = 0x8004E544;
-func_8004E808 = 0x8004E808;
-func_8004EB8C = 0x8004EB8C;
-func_8004D1A4 = 0x8004D1A4;
-dead_npc_move_heading = 0x8003E424;
-dead_sqrtf = 0x80067040;
-dead_npc_test_move_simple_with_slipping = 0x800E5304;
-dead_npc_raycast_down_sides = 0x800E423C;
-dead_is_point_within_region = 0x8004D0C4;
-func_8004D8E0 = 0x8004D8E0;
-dead_rand_int = 0x8002ACEC;
-dead_get_npc_safe = 0x8003E534;
-dead_heap_malloc = 0x8002BFD4;
-func_8002C01C = 0x8002C01C;
-dead_sin_deg = 0x8002B5DC;
-dead_cos_deg = 0x8002B640;
-dead_subtract_hp = 0x800F1EF8;
-dead_sfx_adjust_env_sound_pos = 0x8015704C;
-dead_playFX_83 = 0x80077C30;
-dead_update_lerp = 0x8002B6A4;
-dead_playFX_7B = 0x80077930;
-dead_create_shadow_type = 0x8011AAB4;
-dead_dist3D = 0x8002B21C;
-func_802E2A80 = 0x802E2A80;
-func_802E2B74 = 0x802E2B74;
-func_80128510 = 0x80128510;
-func_8012DFE8 = 0x8012DFE8;
-func_8002AA2C = 0x8002AA2C;
-func_80059AC8 = 0x80059AC8;
-dead_get_entity_by_index = 0x80118BB0;
-dead_playFX_82 = 0x80077BD0;
-func_80041080 = 0x80041080;
-dead_set_max_SP = 0x800F1D9C;
-dead_sync_status_menu = 0x800F1730;
-dead_get_npc_by_index = 0x8003C43C;
-dead_increment_status_menu_disabled = 0x800F1718;
-dead_decrement_status_menu_disabled = 0x800F16F4;
-dead_get_model_list_index_from_tree_index = 0x80125270;
-dead_get_model_from_list_index = 0x80124F44;
-dead_guTranslateF = 0x8006CAC0;
-func_800775D0 = 0x800775D0;
-func_802F3B00 = 0x802F3B00;
-func_800FCD0C = 0x800FCD0C;
-func_800F9260 = 0x800F9260;
-func_800F93E8 = 0x800F93E8;
-dead_switch_to_partner = 0x800F2D5C;
-dead_set_message_msg = 0x80130C74;
-dead_playFX_52 = 0x800769D0;
-dead_playFX_33 = 0x80075E30;
-func_8002B524 = 0x8002B524;
-func_8002BF18 = 0x8002BF18;
-func_80076970 = 0x80076970;
-dead_set_screen_overlay_color = 0x80144200;
-dead_set_screen_overlay_params_front = 0x80144178;
-dead_npc_test_move_simple_without_slipping = 0x800E53AC;
-dead_get_item_entity = 0x8013CF98;
-func_80066FE0 = 0x80066FE0;
-func_8002A910 = 0x8002A910;
-dead_get_current_map_header = 0x8005F128;
-dead_partner_clear_player_tracking = 0x800F7278;
-func_800F2E98 = 0x800F2E98;
-dead_set_npc_yaw = 0x8003ED50;
-dead_disable_npc_shadow = 0x8003E5E8;
-dead_get_screen_coords = 0x8002FCBC;
-dead_sfx_get_spatialized_sound_params = 0x801574DC;
-dead_sfx_play_sound_with_params = 0x80157118;
-dead_load_asset_by_name = 0x8005F238;
-dead_decode_yay0 = 0x80074070;
-dead_general_heap_free = 0x8002BF68;
-dead_set_message_images = 0x80130C64;
-func_8002B45C = 0x8002B45C;
-func_801266F8 = 0x801266F8;
-func_80126734 = 0x80126734;
-dead_set_screen_overlay_params_back = 0x80144194;
-dead_gItemTable = 0x8008D2C0;
-dead_gPartnerActionStatus = 0x80117163;
-dead_gPlayerStatus = 0x80117578;
-dead_gPlayerActionState = 0x8011762C;
-dead_gPartnerActionStatus2 = 0x80117160;
-dead_gPlayerData = 0x80117840;
-dead_gCollisionStatus = 0x80169B12;
-dead_gOverrideFlags = 0x800A15A8;
-D_800A1530 = 0x800A1530;
-D_800A15A4 = 0x800A15A4;
-D_800A15C4 = 0x800A15C4;
-D_800A15CC = 0x800A15CC;
-dead_gCurrentEncounter = 0x800B7EF0;
-D_800B8DEC = 0x800B8DEC;
-dead_guMtxIdentF = 0x8006C660;
-dead_guMtxCatF = 0x8006C7C0;
+D_80248380_kzn_19 = 0x80248380;
+D_8024854C_kzn_19 = 0x8024854C;