From 24e32f8b488e295d9b1380ed9a90730a22e84a11 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 21 Jul 2021 10:46:58 -0400 Subject: [PATCH] Effect code generation (#338) * Update symbol_addrs * effects.h and cleanup * effect code generation! --- include/effects.h | 145 +++++++++ include/functions.h | 48 --- include/macros.h | 1 - src/18F340.c | 1 + src/190B20.c | 20 +- src/19FAF0.c | 1 + src/1a1f0_len_5390.c | 1 + src/3251D0.c | 1 + src/4ac90_len_3910.c | 280 ------------------ src/battle/area_flo/5B28D0.c | 1 + src/battle/area_flo2/5CF2D0.c | 1 + src/battle/area_kmr_part_2/439A90.c | 1 + src/battle/item/dried_shroom.c | 1 + src/battle/item/egg_missile.c | 1 + src/battle/item/electro_pop.c | 1 + src/battle/item/fire_flower.c | 1 + src/battle/item/food.c | 1 + src/battle/item/insecticide_herb.c | 1 + src/battle/item/life_shroom.c | 1 + src/battle/item/mushroom.c | 1 + src/battle/item/mystery.c | 1 + src/battle/item/shooting_star.c | 4 +- src/battle/item/snowman_doll.c | 1 + src/battle/item/stone_cap.c | 1 + src/battle/item/strange_cake.c | 1 + src/battle/item/super_soda.c | 1 + src/battle/item/thunder_bolt.c | 1 + src/battle/item/thunder_rage.c | 1 + src/battle/item/ultra_shroom.c | 1 + src/battle/item/unknown_item.c | 1 + src/battle/move/d_down_jump/781920.c | 1 + src/battle/move/d_down_pound/74AD90.c | 1 + src/battle/move/hammer_charge_0/74F130.c | 1 + src/battle/move/hammer_charge_1/7595B0.c | 1 + src/battle/move/hammer_charge_2/75E5D0.c | 1 + src/battle/move/jump_charge_0/74D570.c | 1 + src/battle/move/jump_charge_1/75C980.c | 1 + src/battle/move/jump_charge_2/761920.c | 1 + src/battle/move/spin_smash/737890.c | 1 + src/battle/partner/bombette.c | 1 + src/battle/partner/goombario.c | 1 + src/battle/partner/lakilester.c | 1 + src/battle/partner/sushie.c | 3 +- src/battle/partner/watt.c | 5 +- src/common/StarPower.inc.c | 1 + src/entity/Block.c | 1 + src/entity/ItemBlock.c | 1 + src/entity/SuperBlock.c | 1 + src/evt/fx_api.c | 87 ------ src/npc.c | 1 + src/world/action/hammer.c | 1 + src/world/area_arn/arn_07/BECDF0.c | 1 + src/world/area_dro/dro_01/95B7E0.c | 1 + src/world/area_dro/dro_02/9694C0.c | 1 + src/world/area_flo/flo_07/CAC1F0.c | 1 + src/world/area_flo/flo_21/CE6700.c | 1 + src/world/area_kmr/kmr_00/8ABF90.c | 1 + src/world/common/PlayFX3D.inc.c | 1 + src/world/common/SpawnSunEffect.inc.c | 3 +- src/world/common/UnkFunc20.inc.c | 1 + src/world/common/UnkFunc39.inc.c | 2 +- tools/build/configure.py | 5 +- tools/splat_ext/pm_effects.py | 76 +++++ .../nonmatchings/4ac90_len_3910/fx_emote.s | 28 -- .../asm/nonmatchings/4ac90_len_3910/fx_land.s | 28 -- .../4ac90_len_3910/fx_sleep_bubble.s | 28 -- .../nonmatchings/4ac90_len_3910/fx_sweat.s | 28 -- .../asm/nonmatchings/4ac90_len_3910/fx_walk.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_00.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_01.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_02.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_03.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_04.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_05.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_08.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_09.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_0A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_0B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_0C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_0D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_0E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_0F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_11.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_12.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_13.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_14.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_15.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_16.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_17.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_18.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_19.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_1A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_1B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_1C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_1D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_1E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_1F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_20.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_21.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_22.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_23.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_24.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_25.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_26.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_27.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_2A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_2B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_2C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_2D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_2E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_2F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_30.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_31.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_32.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_33.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_34.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_35.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_36.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_37.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_38.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_39.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_3A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_3B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_3C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_3D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_3E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_3F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_40.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_41.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_42.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_43.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_44.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_45.s | 28 -- .../4ac90_len_3910/playFX_46_whirlwind.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_47.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_48.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_49.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_4A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_4B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_4C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_4D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_4E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_4F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_50.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_51.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_52.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_53.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_54.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_55.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_56.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_57.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_58.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_59.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_5A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_5B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_5C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_5D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_5E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_5F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_60.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_61.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_62.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_63.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_64.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_65.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_66.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_67.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_68.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_69.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_6A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_6B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_6C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_6D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_6E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_6F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_70.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_71.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_72.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_73.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_74.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_75.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_76.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_77.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_78.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_79.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_7A.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_7B.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_7C.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_7D.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_7E.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_7F.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_80.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_81.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_82.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_83.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_84.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_85.s | 28 -- .../nonmatchings/4ac90_len_3910/playFX_86.s | 28 -- ver/us/effects.yaml | 135 +++++++++ ver/us/splat.yaml | 2 +- ver/us/symbol_addrs.txt | 6 +- 201 files changed, 431 insertions(+), 4221 deletions(-) create mode 100644 include/effects.h delete mode 100644 src/4ac90_len_3910.c create mode 100644 tools/splat_ext/pm_effects.py delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/fx_emote.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/fx_land.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/fx_sleep_bubble.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/fx_sweat.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_00.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_01.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_02.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_03.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_04.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_05.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_08.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_09.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_11.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_12.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_13.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_14.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_15.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_16.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_17.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_18.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_19.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_20.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_21.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_22.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_23.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_24.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_25.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_26.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_27.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_30.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_31.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_32.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_33.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_34.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_35.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_36.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_37.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_38.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_39.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_40.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_41.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_42.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_43.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_44.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_45.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_46_whirlwind.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_47.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_48.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_49.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_50.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_51.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_52.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_53.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_54.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_55.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_56.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_57.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_58.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_59.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_60.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_61.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_62.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_63.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_64.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_65.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_66.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_67.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_68.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_69.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_70.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_71.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_72.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_73.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_74.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_75.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_76.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_77.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_78.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_79.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7A.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7B.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7C.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7D.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7E.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7F.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_80.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_81.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_82.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_83.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_84.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_85.s delete mode 100644 ver/us/asm/nonmatchings/4ac90_len_3910/playFX_86.s create mode 100644 ver/us/effects.yaml diff --git a/include/effects.h b/include/effects.h new file mode 100644 index 0000000000..97196c0cb8 --- /dev/null +++ b/include/effects.h @@ -0,0 +1,145 @@ +#ifndef _EFFECTS_H_ +#define _EFFECTS_H_ + +#include "types.h" +#include "common_structs.h" + +extern EffectTableEntry gEffectTable[135]; + +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, s32, s32, 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, s32, s32, f32, s32); +void playFX_0F(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, EffectInstanceData**); +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, EffectInstanceData**); +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_sweat(s32, f32, f32, f32, f32, f32, s32); +void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, EffectInstanceData**); +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, EffectInstanceData**); +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, EffectInstanceData**); +EffectInstance* playFX_35(s32, f32, f32, f32, f32, EffectInstanceData**); +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, EffectInstanceData**); +EffectInstance* playFX_3C(s32, f32, f32, f32, f32, EffectInstanceData**); +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, s32, 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); +void 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); +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, f32, f32, f32, s32); +void 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); + +#endif diff --git a/include/functions.h b/include/functions.h index aad3f3d236..2805acbaac 100644 --- a/include/functions.h +++ b/include/functions.h @@ -19,8 +19,6 @@ void boot_main(void); void osCleanupThread(void); -void playFX_30(s32, f32, f32, f32); -void playFX_31(s32, f32, f32, f32); f32 signF(f32 val); void* heap_malloc(s32 size); @@ -44,7 +42,6 @@ void _render_transition_stencil(s32, f32, s32); u32 get_entity_type(s32 arg0); Entity* get_entity_by_index(s32 index); s32 create_entity(StaticEntityData*, s32, s32, s32, s32, s32); -void playFX_22(s32, f32, f32, f32, f32, f32, s32, s32); void entity_shattering_idle(Entity* entity); void func_802666E4(Actor* actor, f32 arg1, f32 arg2, f32 arg3, s16); @@ -392,51 +389,6 @@ void state_init_demo(void); void state_step_demo(void); void state_drawUI_demo(void); -// Effect funcs -void playFX_01(f32, f32, f32); -void playFX_11(s32, f32, f32, f32, f32); -void playFX_18(s32, f32, f32, f32, f32, f32, f32, s32); -void playFX_3D(s32 var1, f32 var2, f32 var3, f32 var4, f32 var5, f32 var6, f32 var7, s32 var8, s32* unk); -EffectInstance* playFX_40(s32, f32, f32, f32, s32); -EffectInstance* playFX_52(s32, f32, f32, f32, f32, s32); -EffectInstance* playFX_6B(s32, f32, f32, f32, f32, s32); -void playFX_82(s32, f32, f32, f32, f32, s32 time); -EffectInstance* playFX_4E(s32, f32, f32, f32); -EffectInstance* playFX_54(s32, f32, f32, f32); -EffectInstance* playFX_80(s32, f32, f32, f32, f32, s32); -EffectInstance* playFX_51(s32, f32, f32, f32, f32, s32); -void playFX_50(s32, f32, f32, f32); -EffectInstance* playFX_3F(s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); -EffectInstance* playFX_36(s32, f32, f32, f32, f32, f32); -EffectInstance* playFX_83(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -EffectInstance* playFX_7B(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -void playFX_32(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); -EffectInstance* playFX_56(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -EffectInstance* playFX_33(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -EffectInstance* playFX_69(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -void playFX_2D(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); -void playFX_2E(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -void playFX_17(s32 arg0, f32 arg1, f32 arg2, f32 arg3); -void playFX_19(s32 arg0, f32 arg1, f32 arg2, f32 arg3); -void playFX_1D(s32, f32, f32, f32, f32, s32, f32, s32); -void fx_sweat(s32, f32, f32, f32, f32, f32, s32); -void playFX_2F(s32, f32, f32, f32, f32, s32, EffectInstanceData**); -void playFX_3B(s32, f32, f32, f32, f32, EffectInstanceData**); -void fx_land(s32, f32, f32, f32, f32); -EffectInstance* playFX_6F(s32, f32, f32, f32, f32, s32); -EffectInstance* playFX_72(s32, f32, f32, f32, f32, f32, f32, s32, s32); -void playFX_26(s32, f32, f32, f32); -EffectInstance* playFX_64(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8); -void playFX_08(f32 arg0, f32 arg1, f32 arg2, f32 arg3); -void playFX_09(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); -EffectInstance* playFX_5A(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -EffectInstance* playFX_59(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, s32 arg8); -EffectInstance* playFX_58(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -EffectInstance* playFX_0C(f32, f32, f32, f32, f32); -EffectInstance* playFX_23(u32, f32, f32, f32, f32); -void playFX_0F(s32, f32, f32, f32, f32, f32, f32, f32); -EffectInstance* playFX_6C(s32, f32, f32, f32, f32, s32); - void func_802B2078(void); extern f32 gCurtainScale; extern f32 gCurtainScaleGoal; diff --git a/include/macros.h b/include/macros.h index a25e219ccd..3564708bc8 100644 --- a/include/macros.h +++ b/include/macros.h @@ -11,7 +11,6 @@ #define N(sym) NS(NAMESPACE, sym) #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) -#define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0])) #define PHYSICAL_TO_VIRTUAL(addr) (void*)((u32)(addr) + 0x80000000) #define VIRTUAL_TO_PHYSICAL(addr) (u32)((u8*)(addr) - 0x80000000) diff --git a/src/18F340.c b/src/18F340.c index cccab6d3d4..81ef636cd1 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern s32 D_80108AAC; extern s32 D_80108AD4; diff --git a/src/190B20.c b/src/190B20.c index 6ec487a335..286ad2468f 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #include "battle/battle.h" #include "message_ids.h" @@ -1434,9 +1435,6 @@ void create_part_shadow_by_ref(UNK_TYPE arg0, ActorPart* part) { part->shadowScale = part->size.x / 24.0; } -EffectInstance* playFX_5A(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); -void playFX_5F(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); - void remove_player_buffs(PlayerBuff buffs) { BattleStatus* battleStatus = &gBattleStatus; Actor* player = battleStatus->playerActor; @@ -1459,18 +1457,18 @@ void remove_player_buffs(PlayerBuff buffs) { battleStatus->hustleTurns = 0; battleStatus->flags1 &= ~0x04000000; } - if ((buffs & 0x20) && (player->staticStatus != 0)) { + if (buffs & 0x20 && (player->staticStatus != 0)) { player->staticDuration = 0; player->staticStatus = 0; remove_status_2(player->unk_436); } - if ((buffs & 0x40) && (player->transStatus != 0)) { + if (buffs & 0x40 && (player->transStatus != 0)) { player->transDuration = 0; player->transStatus = 0; playerPartsTable->flags &= ~0x100; remove_status_3(player->unk_436); } - if ((buffs & 0x200) && (battleStatus->waterBlockTurnsLeft != 0)) { + if (buffs & 0x200 && (battleStatus->waterBlockTurnsLeft != 0)) { battleStatus->waterBlockTurnsLeft = 0; battleStatus->unk_43C->unk_0C->unk_10 = 0; battleStatus->unk_A0[0] |= 0x10; @@ -1483,22 +1481,20 @@ void remove_player_buffs(PlayerBuff buffs) { battleStatus->unk_A0 = NULL; sfx_play_sound(0x299); } - if ((buffs & 0x100) && (battleStatus->turboChargeTurnsLeft != 0)) { + if (buffs & 0x100 && (battleStatus->turboChargeTurnsLeft != 0)) { battleStatus->turboChargeTurnsLeft = 0; battleStatus->unk_43C->unk_0C->unk_24 = 0; } - if ((buffs & 0x80) && (battleStatus->cloudNineTurnsLeft != 0)) { + if (buffs & 0x80 && (battleStatus->cloudNineTurnsLeft != 0)) { battleStatus->cloudNineTurnsLeft = 0; battleStatus->unk_43C->unk_0C->unk_1A = 0; remove_effect(battleStatus->cloudNineEffect); battleStatus->cloudNineEffect = 0; } - if ((partner != NULL) && (buffs & 0x10000)) { - BattleStatus* bs = &gBattleStatus; - + if (partner != NULL && (buffs & 0x10000)) { partner->isGlowing = FALSE; - bs->flags1 &= ~0x40000000; + gBattleStatus.flags1 &= ~0x40000000; } } diff --git a/src/19FAF0.c b/src/19FAF0.c index 34888c1f4c..dbc4986335 100644 --- a/src/19FAF0.c +++ b/src/19FAF0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #include "battle/battle.h" #include "script_api/battle.h" diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index ad8d1bd786..a358cac663 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -1,5 +1,6 @@ #include "common.h" #include "map.h" +#include "effects.h" extern s32 D_800A0BA0; extern f32 D_800A0BA4; diff --git a/src/3251D0.c b/src/3251D0.c index 4bb9db3856..9258dc41a9 100644 --- a/src/3251D0.c +++ b/src/3251D0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" ApiStatus func_802BD100_3251D0(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/4ac90_len_3910.c b/src/4ac90_len_3910.c deleted file mode 100644 index 6dc91dc4e1..0000000000 --- a/src/4ac90_len_3910.c +++ /dev/null @@ -1,280 +0,0 @@ -#include "common.h" - -extern EffectTableEntry gEffectTable[135]; - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_00); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_01, f32 arg0, f32 arg1, f32 arg2); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_02); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_03); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_04); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_05); - -INCLUDE_ASM(void, "4ac90_len_3910", fx_land, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); - -INCLUDE_ASM(void, "4ac90_len_3910", fx_walk, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_08, f32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_09, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_0A); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_0B); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_0C); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_0D); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_0E); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_0F, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - f32 arg6, f32 arg7); - -INCLUDE_ASM(void, "4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - f32 arg6, s32 arg7, s32* arg8); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_11, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_12); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_13); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_14); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_15); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_16); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_17, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_18, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - f32 arg6, s32 arg7); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_19, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_1A); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_1B); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_1C); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_1D, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, f32 arg6, s32 arg7); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_1E); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_1F); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_20); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_21); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_22, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - s32 arg6, s32 arg7); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_23); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_24); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_25); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_26, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_27); - -INCLUDE_ASM(void, "4ac90_len_3910", fx_sweat, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", fx_sleep_bubble); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_2A); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_2B); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_2C); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_2D, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_2E, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_2F, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, EffectInstanceData** arg6); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_30, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_31, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_32, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_33, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_34); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_35); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_36, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_37); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_38); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_39); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_3A); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_3B, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstanceData** arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_3C); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_3D, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, - s32 arg7, s32* arg8); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_3E); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_3F, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_40, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_41); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_42); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_43); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_44); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_45); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_46_whirlwind); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_47); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_48); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_49); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_4A); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_4B); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_4C); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_4D); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_4E, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_4F); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_50, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_51, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_52, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_53); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_54, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_55); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_56, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_57); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_58); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_59); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_5A); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_5B); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_5C); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_5D); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_5E); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_5F); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_60); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_61); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_62); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_63); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_64); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_65); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_66); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_67); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_68); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_69, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_6A); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_6B, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_6C); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_6D); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_6E); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_6F, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, - s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_70); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_71); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_72, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, - f32 arg5, f32 arg6, s32 arg7, s32 arg8); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_73); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_74); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_75); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_76); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_77); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_78); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_79); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_7A); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_7B, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_7C); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_7D); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_7E); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_7F); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_80, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_81); - -INCLUDE_ASM(void, "4ac90_len_3910", playFX_82, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 time); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_83, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_84); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_85); - -INCLUDE_ASM(EffectInstance*, "4ac90_len_3910", playFX_86); diff --git a/src/battle/area_flo/5B28D0.c b/src/battle/area_flo/5B28D0.c index 5c896832a0..c36346c937 100644 --- a/src/battle/area_flo/5B28D0.c +++ b/src/battle/area_flo/5B28D0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE b_area_flo diff --git a/src/battle/area_flo2/5CF2D0.c b/src/battle/area_flo2/5CF2D0.c index 0527a38a43..10cce3550d 100644 --- a/src/battle/area_flo2/5CF2D0.c +++ b/src/battle/area_flo2/5CF2D0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE b_area_flo2 diff --git a/src/battle/area_kmr_part_2/439A90.c b/src/battle/area_kmr_part_2/439A90.c index f5dcbdcf41..673add4334 100644 --- a/src/battle/area_kmr_part_2/439A90.c +++ b/src/battle/area_kmr_part_2/439A90.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE b_area_kmr_part_2 diff --git a/src/battle/item/dried_shroom.c b/src/battle/item/dried_shroom.c index a99a77ccb4..aeb39293c5 100644 --- a/src/battle/item/dried_shroom.c +++ b/src/battle/item/dried_shroom.c @@ -1,4 +1,5 @@ #include "dried_shroom.h" +#include "effects.h" static HudElement* D_802A1A90; diff --git a/src/battle/item/egg_missile.c b/src/battle/item/egg_missile.c index 258a8cee24..3f01851d26 100644 --- a/src/battle/item/egg_missile.c +++ b/src/battle/item/egg_missile.c @@ -1,4 +1,5 @@ #include "egg_missile.h" +#include "effects.h" #include "ld_addrs.h" #include "battle/item/egg_missile1.png.h" #include "battle/item/egg_missile2.png.h" diff --git a/src/battle/item/electro_pop.c b/src/battle/item/electro_pop.c index 7e5b3c5c51..c8ac5cd0f4 100644 --- a/src/battle/item/electro_pop.c +++ b/src/battle/item/electro_pop.c @@ -1,4 +1,5 @@ #include "electro_pop.h" +#include "effects.h" static HudElement* D_802A1D60; diff --git a/src/battle/item/fire_flower.c b/src/battle/item/fire_flower.c index 8aed985847..f0d0d918bf 100644 --- a/src/battle/item/fire_flower.c +++ b/src/battle/item/fire_flower.c @@ -1,4 +1,5 @@ #include "fire_flower.h" +#include "effects.h" static HudElement* D_802A1D70; diff --git a/src/battle/item/food.c b/src/battle/item/food.c index bd4c138f3e..5e9a9494a2 100644 --- a/src/battle/item/food.c +++ b/src/battle/item/food.c @@ -1,4 +1,5 @@ #include "food.h" +#include "effects.h" static HudElement* D_802A24D0; diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c index ad15a31ef4..34a7886801 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/item/insecticide_herb.c @@ -1,4 +1,5 @@ #include "insecticide_herb.h" +#include "effects.h" #include "ld_addrs.h" #include "battle/item/insecticide_herb.png.h" diff --git a/src/battle/item/life_shroom.c b/src/battle/item/life_shroom.c index 88294ae490..5fa1efbdda 100644 --- a/src/battle/item/life_shroom.c +++ b/src/battle/item/life_shroom.c @@ -1,4 +1,5 @@ #include "life_shroom.h" +#include "effects.h" static HudElement* D_802A21F0; diff --git a/src/battle/item/mushroom.c b/src/battle/item/mushroom.c index 8ec29189b4..a64256f7c3 100644 --- a/src/battle/item/mushroom.c +++ b/src/battle/item/mushroom.c @@ -1,4 +1,5 @@ #include "mushroom.h" +#include "effects.h" static HudElement* D_802A2410; diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 4e62f75ac1..80cbe91a17 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -1,4 +1,5 @@ #include "mystery.h" +#include "effects.h" #include "ld_addrs.h" #include "battle/item/mystery.png.h" diff --git a/src/battle/item/shooting_star.c b/src/battle/item/shooting_star.c index c330b4fe75..38fddb3fc1 100644 --- a/src/battle/item/shooting_star.c +++ b/src/battle/item/shooting_star.c @@ -1,4 +1,5 @@ #include "shooting_star.h" +#include "effects.h" static HudElement* D_802A1EE0; @@ -54,9 +55,6 @@ ApiStatus N(GiveRefundCleanup)(ScriptInstance* script, s32 isInitialCall) { } #ifdef NON_MATCHING - -void playFX_0F(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7); - ApiStatus N(func_802A123C_71D9AC)(ScriptInstance* script, s32 isInitialCall) { s32 c8 = 200; s32 temp_s1 = 100 + rand_int(c8); diff --git a/src/battle/item/snowman_doll.c b/src/battle/item/snowman_doll.c index 215471bc70..9740f5314e 100644 --- a/src/battle/item/snowman_doll.c +++ b/src/battle/item/snowman_doll.c @@ -1,4 +1,5 @@ #include "snowman_doll.h" +#include "effects.h" static HudElement* D_802A1EB0; diff --git a/src/battle/item/stone_cap.c b/src/battle/item/stone_cap.c index 6fa4c3f43a..10cdc410c1 100644 --- a/src/battle/item/stone_cap.c +++ b/src/battle/item/stone_cap.c @@ -1,4 +1,5 @@ #include "stone_cap.h" +#include "effects.h" static HudElement* D_802A1A60; diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index 1ebc0d66a4..9ad58ee68e 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -1,4 +1,5 @@ #include "strange_cake.h" +#include "effects.h" #include "battle/item/strange_cake1.png.h" #include "battle/item/strange_cake2.png.h" #include "battle/item/strange_cake3.png.h" diff --git a/src/battle/item/super_soda.c b/src/battle/item/super_soda.c index 4b028ba88f..8130128c47 100644 --- a/src/battle/item/super_soda.c +++ b/src/battle/item/super_soda.c @@ -1,4 +1,5 @@ #include "super_soda.h" +#include "effects.h" static HudElement* D_802A2280; diff --git a/src/battle/item/thunder_bolt.c b/src/battle/item/thunder_bolt.c index 86428f42bc..229431cf13 100644 --- a/src/battle/item/thunder_bolt.c +++ b/src/battle/item/thunder_bolt.c @@ -1,4 +1,5 @@ #include "thunder_bolt.h" +#include "effects.h" static HudElement* D_802A1C40; diff --git a/src/battle/item/thunder_rage.c b/src/battle/item/thunder_rage.c index db9c4bbd4b..7c6bffa671 100644 --- a/src/battle/item/thunder_rage.c +++ b/src/battle/item/thunder_rage.c @@ -1,4 +1,5 @@ #include "thunder_rage.h" +#include "effects.h" static HudElement* D_802A1C90; diff --git a/src/battle/item/ultra_shroom.c b/src/battle/item/ultra_shroom.c index b497a9dc1b..e1da225f82 100644 --- a/src/battle/item/ultra_shroom.c +++ b/src/battle/item/ultra_shroom.c @@ -1,4 +1,5 @@ #include "ultra_shroom.h" +#include "effects.h" static HudElement* D_802A1AC0; diff --git a/src/battle/item/unknown_item.c b/src/battle/item/unknown_item.c index c7a999f116..da5b68833e 100644 --- a/src/battle/item/unknown_item.c +++ b/src/battle/item/unknown_item.c @@ -1,4 +1,5 @@ #include "unknown_item.h" +#include "effects.h" static HudElement* D_802A1AA0; diff --git a/src/battle/move/d_down_jump/781920.c b/src/battle/move/d_down_jump/781920.c index 0db8202dd4..72f07895b5 100644 --- a/src/battle/move/d_down_jump/781920.c +++ b/src/battle/move/d_down_jump/781920.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE battle_move_d_down_jump diff --git a/src/battle/move/d_down_pound/74AD90.c b/src/battle/move/d_down_pound/74AD90.c index 6bcbde03dd..795731df5b 100644 --- a/src/battle/move/d_down_pound/74AD90.c +++ b/src/battle/move/d_down_pound/74AD90.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE battle_move_d_down_pound diff --git a/src/battle/move/hammer_charge_0/74F130.c b/src/battle/move/hammer_charge_0/74F130.c index 1bfb32b3a4..b520f18bf5 100644 --- a/src/battle/move/hammer_charge_0/74F130.c +++ b/src/battle/move/hammer_charge_0/74F130.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE battle_move_hammer_charge_0 diff --git a/src/battle/move/hammer_charge_1/7595B0.c b/src/battle/move/hammer_charge_1/7595B0.c index becf1058d4..3327adcf30 100644 --- a/src/battle/move/hammer_charge_1/7595B0.c +++ b/src/battle/move/hammer_charge_1/7595B0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern s32 D_802A43D0; diff --git a/src/battle/move/hammer_charge_2/75E5D0.c b/src/battle/move/hammer_charge_2/75E5D0.c index d8c0461729..5dc7b8af33 100644 --- a/src/battle/move/hammer_charge_2/75E5D0.c +++ b/src/battle/move/hammer_charge_2/75E5D0.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern s32 D_802A4350; diff --git a/src/battle/move/jump_charge_0/74D570.c b/src/battle/move/jump_charge_0/74D570.c index d45cefbe60..a3a65f51e2 100644 --- a/src/battle/move/jump_charge_0/74D570.c +++ b/src/battle/move/jump_charge_0/74D570.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE battle_move_jump_charge_0 diff --git a/src/battle/move/jump_charge_1/75C980.c b/src/battle/move/jump_charge_1/75C980.c index fe9cd1ca21..8245937e09 100644 --- a/src/battle/move/jump_charge_1/75C980.c +++ b/src/battle/move/jump_charge_1/75C980.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern s32 D_802A2C50; diff --git a/src/battle/move/jump_charge_2/761920.c b/src/battle/move/jump_charge_2/761920.c index a28486cbdd..850c8ba2ad 100644 --- a/src/battle/move/jump_charge_2/761920.c +++ b/src/battle/move/jump_charge_2/761920.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern s32 D_802A2C20; diff --git a/src/battle/move/spin_smash/737890.c b/src/battle/move/spin_smash/737890.c index df4cc6384e..6138783bf7 100644 --- a/src/battle/move/spin_smash/737890.c +++ b/src/battle/move/spin_smash/737890.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #define NAMESPACE battle_move_spin_smash diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index 58133f113f..82378b379a 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #include "battle/battle.h" ApiStatus func_80238000_6FAD10(ScriptInstance* script, s32 isInitialCall) { diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 663a8fea59..5b781ef543 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -1,6 +1,7 @@ #define NAMESPACE battle_partner_goombario #include "common.h" +#include "effects.h" #include "battle/battle.h" #include "script_api/battle.h" #include "message_ids.h" diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 5bfa96402f..bb91354889 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern s32 D_8023D2C8; extern s32 D_8023D330; diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index e9319415ad..0eab167488 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern f64 D_8023C060_70BD00; extern s32 D_8023C070; @@ -114,7 +115,7 @@ ApiStatus func_80238388_708028(ScriptInstance* script, s32 isInitialCall) { 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); - + return ApiStatus_DONE2; } diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 66258b7344..0a4938feb6 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -1,6 +1,7 @@ -#define NAMESPACE battle_partner_watt - #include "common.h" +#include "effects.h" + +#define NAMESPACE battle_partner_watt extern EffectInstance* D_8023C1B4; extern s32 D_8023C1B8; diff --git a/src/common/StarPower.inc.c b/src/common/StarPower.inc.c index 846dd2bd94..c1f979b6b6 100644 --- a/src/common/StarPower.inc.c +++ b/src/common/StarPower.inc.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" ApiStatus N(UnkStarFunc1)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/entity/Block.c b/src/entity/Block.c index 5361f4388b..ab49d58abf 100644 --- a/src/entity/Block.c +++ b/src/entity/Block.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" void entity_base_block_setupGfx(s32 entityIndex) { Gfx* gfx = gMasterGfxPos; diff --git a/src/entity/ItemBlock.c b/src/entity/ItemBlock.c index 13f1b3a480..f5a56eb746 100644 --- a/src/entity/ItemBlock.c +++ b/src/entity/ItemBlock.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" typedef struct struct802E3F0C { /* 0x00 */ char unk_00[10]; diff --git a/src/entity/SuperBlock.c b/src/entity/SuperBlock.c index cf334cee78..85a77ccf00 100644 --- a/src/entity/SuperBlock.c +++ b/src/entity/SuperBlock.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" extern StaticEntityData D_802EA934; diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 80d449244e..78ec72badb 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -126,93 +126,6 @@ INCLUDE_ASM(ApiStatus, "evt/fx_api", ShowSleepBubble, ScriptInstance* script, s3 INCLUDE_ASM(ApiStatus, "evt/fx_api", func_802D8248, ScriptInstance* script, s32 isInitialCall); -s32 fx_sleep_bubble(s32, f32, f32, f32, f32, f32, EffectInstanceData**); // extern -s32 playFX_0A(f32, f32, s32, s32, f32, f32); // extern -s32 playFX_0B(s32, f32, f32, f32); // extern -s32 playFX_0D(s32, f32, f32, f32, s32); // extern -s32 playFX_0E(f32, f32, s32, s32, f32, s32); // extern -//s32 playFX_0F(s32, f32, f32, f32, f32, f32, f32, f32); // extern -s32 playFX_12(s32, f32, f32, f32, f32, f32, f32, s32); // extern -s32 playFX_13(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_14(s32, f32, f32, f32, s32); // extern -s32 playFX_15(s32, f32, f32, f32, s32); // extern -s32 playFX_16(s32, f32, f32, f32, f32); // extern -s32 playFX_1A(s32, f32, f32, f32, s32); // extern -s32 playFX_1B(s32, f32, f32, f32, f32, EffectInstanceData**); // extern -s32 playFX_1C(s32, f32, f32, f32, s32); // extern -s32 playFX_1E(s32, f32, f32, f32, f32, f32, s32, s32*); // extern -s32 playFX_1F(s32, f32, f32, f32, f32, f32, f32, f32); // extern -s32 playFX_20(s32, f32, f32, f32, f32, EffectInstanceData**); // extern -s32 playFX_21(s32, f32, f32, f32, f32, f32, s32); // extern -s32 playFX_24(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_25(s32, f32, f32, f32); // extern -s32 playFX_27(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_2B(s32, f32, f32, f32); // extern -s32 playFX_2C(s32, f32, f32, f32); // extern -s32 playFX_34(s32, f32, f32, f32, f32, EffectInstanceData**); // extern -s32 playFX_35(s32, f32, f32, f32, f32, EffectInstanceData**); // extern -s32 playFX_37(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32); // extern -s32 playFX_38(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_39(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_3A(s32, f32, f32, f32, f32, f32, s32, s32); // extern -s32 playFX_3C(s32, f32, f32, f32, f32, EffectInstanceData**); // extern -s32 playFX_3E(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_41(s32, f32, f32, f32, s32); // extern -s32 playFX_42(s32, s32, s32, f32, s32, s32); // extern -s32 playFX_43(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_44(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_45(s32, s32); // extern -s32 playFX_46_whirlwind(s32, s32, f32, s32); // extern -s32 playFX_47(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_48(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_49(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_4A(s32, f32, f32, f32, f32, f32); // extern -s32 playFX_4B(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_4C(s32, f32, f32, f32, f32, f32, f32, f32, s32); // extern -s32 playFX_4D(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32); // extern -s32 playFX_4F(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_53(s32, f32, f32, f32); // extern -s32 playFX_55(s32, f32, f32, f32); // extern -s32 playFX_57(s32, f32, f32, f32, f32, s32); // extern -//s32 playFX_58(s32, f32, f32, f32, f32, s32); // extern -//s32 playFX_59(s32, f32, f32, f32, f32, f32, f32, f32, s32); // extern -//s32 playFX_5A(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_5B(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_5C(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_5D(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_5E(s32, f32, f32, f32, f32, f32, f32, f32, s32); // extern -s32 playFX_5F(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_60(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_61(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_62(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_63(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32); // extern -//s32 playFX_64(s32, f32, f32, f32, f32, f32, f32, f32, s32); // extern -s32 playFX_65(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_66(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_67(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_68(s32, f32, f32, f32, f32, s32); // extern -//s32 playFX_6C(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_6D(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_6E(s32, f32, f32, f32, f32, f32, f32, s32); // extern -s32 playFX_70(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32); // extern -s32 playFX_71(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_73(s32, f32, f32, f32, f32, s32, s32); // extern -s32 playFX_74(s32, f32, f32, f32, f32, f32, f32, f32, f32); // extern -s32 playFX_75(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_77(s32, f32, f32, f32, f32, f32, f32, f32, s32); // extern -s32 playFX_78(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_79(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_7A(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_7C(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_7D(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_7E(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_7F(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_81(s32, f32, f32, f32, f32, s32); // extern -//s32 playFX_82(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_84(s32, f32, f32, f32, f32, f32); // extern -s32 playFX_85(s32, f32, f32, f32, f32, s32); // extern -s32 playFX_86(s32, f32, f32, f32, f32, s32); // extern - #ifdef NON_MATCHING s32 PlayEffect(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/npc.c b/src/npc.c index 1a732bed99..3215251476 100644 --- a/src/npc.c +++ b/src/npc.c @@ -1,6 +1,7 @@ #include "common.h" #include "map.h" #include "npc.h" +#include "effects.h" extern s16 D_8010C97A; extern s32 D_8010C978; diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 779f892e25..3ba279c0ef 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" typedef struct HammerUnk { /* 0x00 */ Vec3f unk_00; diff --git a/src/world/area_arn/arn_07/BECDF0.c b/src/world/area_arn/arn_07/BECDF0.c index 4d51e1dc58..1a5e517e9e 100644 --- a/src/world/area_arn/arn_07/BECDF0.c +++ b/src/world/area_arn/arn_07/BECDF0.c @@ -1,4 +1,5 @@ #include "arn_07.h" +#include "effects.h" #include "sprite/npc/world_tubba.h" #include "sprite/npc/tubbas_heart.h" diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 178dcaf41d..fa0cd72bd6 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -1,4 +1,5 @@ #include "dro_01.h" +#include "effects.h" #include "script_api/battle.h" #include "message_ids.h" #include "sprite/npc/artist_toad.h" diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 719d86e030..9aa886c8ae 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -1,4 +1,5 @@ #include "dro_02.h" +#include "effects.h" #include "script_api/battle.h" #include "message_ids.h" #include "sprite/npc/archeologist.h" diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c index 42803eb2b7..34283f3ca5 100644 --- a/src/world/area_flo/flo_07/CAC1F0.c +++ b/src/world/area_flo/flo_07/CAC1F0.c @@ -1,4 +1,5 @@ #include "flo_07.h" +#include "effects.h" #include "world/common/UnkTexturePanFunc.inc.c" diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index 0d212da947..7f51bd04d3 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -1,4 +1,5 @@ #include "flo_21.h" +#include "effects.h" #include "message_ids.h" #include "sprite/npc/huff_n_puff.h" #include "sprite/npc/tuff_puff.h" diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c index dff55a03e1..74c4e4a201 100644 --- a/src/world/area_kmr/kmr_00/8ABF90.c +++ b/src/world/area_kmr/kmr_00/8ABF90.c @@ -1,4 +1,5 @@ #include "kmr_00.h" +#include "effects.h" static char* N(exit_str_0) = "kmr_02"; static char* N(exit_str_1) = "kmr_02\0"; diff --git a/src/world/common/PlayFX3D.inc.c b/src/world/common/PlayFX3D.inc.c index b817f6bce8..4c77464b9e 100644 --- a/src/world/common/PlayFX3D.inc.c +++ b/src/world/common/PlayFX3D.inc.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" ApiStatus N(PlayFX3D)(ScriptInstance* script, s32 isInitialStatus) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/SpawnSunEffect.inc.c b/src/world/common/SpawnSunEffect.inc.c index 590c87da02..804acf366d 100644 --- a/src/world/common/SpawnSunEffect.inc.c +++ b/src/world/common/SpawnSunEffect.inc.c @@ -1,7 +1,6 @@ #include "common.h" #include "map.h" - -void playFX_82(s32, f32, f32, f32, f32, s32); +#include "effects.h" ApiStatus N(SpawnSunEffect)(ScriptInstance* script, s32 isInitialCall) { playFX_82(0, 0.0f, 0.0f, 0.0f, 0.0f, 0); diff --git a/src/world/common/UnkFunc20.inc.c b/src/world/common/UnkFunc20.inc.c index dd547f0781..623d22dc86 100644 --- a/src/world/common/UnkFunc20.inc.c +++ b/src/world/common/UnkFunc20.inc.c @@ -1,5 +1,6 @@ #include "common.h" #include "map.h" +#include "effects.h" ApiStatus N(UnkFunc20)(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/world/common/UnkFunc39.inc.c b/src/world/common/UnkFunc39.inc.c index 5446b490c5..7bb9ff7248 100644 --- a/src/world/common/UnkFunc39.inc.c +++ b/src/world/common/UnkFunc39.inc.c @@ -2,7 +2,7 @@ #include "map.h" ApiStatus N(UnkFunc39)(ScriptInstance* script, s32 isInitialCall) { - Effect* effect = get_variable(script, *script->ptrReadPos); + Effect* effect = (Effect*)get_variable(script, *script->ptrReadPos); effect->flags |= 0x10; diff --git a/tools/build/configure.py b/tools/build/configure.py index ac65cca84f..0d26810954 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -199,7 +199,8 @@ class Configure: modes = ["ld"] if assets: - modes.extend(["bin", "Yay0", "img", "pm_map_data", "pm_msg", "pm_npc_sprites", "pm_charset", "pm_charset_palettes"]) + modes.extend(["bin", "Yay0", "img", "pm_map_data", "pm_msg", "pm_npc_sprites", "pm_charset", + "pm_charset_palettes", "pm_effects"]) if code: modes.extend(["code", "c", "data", "rodata"]) @@ -550,6 +551,8 @@ class Configure: build(entry.object_path.with_suffix(""), palettes, "pm_charset_palettes") build(entry.object_path, [entry.object_path.with_suffix("")], "bin") + elif seg.type == "pm_effects": + build(entry.object_path, entry.src_paths, "as") elif seg.type == "linker" or seg.type == "linker_offset": pass else: diff --git a/tools/splat_ext/pm_effects.py b/tools/splat_ext/pm_effects.py new file mode 100644 index 0000000000..2b2dd6f36b --- /dev/null +++ b/tools/splat_ext/pm_effects.py @@ -0,0 +1,76 @@ +from yaml.loader import Loader +from segtypes.n64.segment import N64Segment +from util import options +import yaml + +class N64SegPm_effects(N64Segment): + effects = [] + + @staticmethod + def get_effect_asm(index, name): + return f""".include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .text, "ax" + +glabel {name} +/* 00 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 04 AFA40010 */ sw $a0, 0x10($sp) +/* 08 AFA50014 */ sw $a1, 0x14($sp) +/* 0C AFA60018 */ sw $a2, 0x18($sp) +/* 10 AFA7001C */ sw $a3, 0x1c($sp) +/* 14 E7AC0020 */ swc1 $f12, 0x20($sp) +/* 18 E7AE0024 */ swc1 $f14, 0x24($sp) +/* 1C E7B00028 */ swc1 $f16, 0x28($sp) +/* 20 AFBF002C */ sw $ra, 0x2c($sp) +/* 24 0C016959 */ jal load_effect +/* 28 ???????? */ addiu $a0, $zero, 0x{index:X} +/* 2C 8FA40010 */ lw $a0, 0x10($sp) +/* 30 8FA50014 */ lw $a1, 0x14($sp) +/* 34 8FA60018 */ lw $a2, 0x18($sp) +/* 38 8FA7001C */ lw $a3, 0x1c($sp) +/* 3C C7AC0020 */ lwc1 $f12, 0x20($sp) +/* 40 C7AE0024 */ lwc1 $f14, 0x24($sp) +/* 44 C7B00028 */ lwc1 $f16, 0x28($sp) +/* 48 8FBF002C */ lw $ra, 0x2c($sp) +/* 4C 27BD0030 */ addiu $sp, $sp, 0x30 +/* 50 3C01???? */ lui $at, %hi(gEffectTable + 0x{index * 24:X}) +/* 54 8C21???? */ lw $at, %lo(gEffectTable + 0x{index * 24:X})($at) +/* 58 00200008 */ jr $at +/* 5C 00000000 */ nop +""" + + def effect_path(self, effect): + return options.get_build_path() / "asm" / "effects" / f"{effect}.s" + + def scan(self, rom_bytes): + with open(options.get_asm_path() / ".." / "effects.yaml") as f: + self.effects = yaml.load(f.read(), Loader=yaml.SafeLoader) + + def split(self, rom_bytes): + for i, effect in enumerate(self.effects): + effect_asm = N64SegPm_effects.get_effect_asm(i, effect) + + self.effect_path("").parent.mkdir(parents=True, exist_ok=True) + + with open(self.effect_path(effect), "w") as f: + f.write(effect_asm) + + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry + + ret = [] + + for effect in self.effects: + ret.append(LinkerEntry( + self, + [self.effect_path(effect)], + self.effect_path(effect), + ".text" + )) + + return ret diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_emote.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_emote.s deleted file mode 100644 index 29cd5debbe..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_emote.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_emote -/* 4B290 8006FE90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B294 8006FE94 AFA40010 */ sw $a0, 0x10($sp) -/* 4B298 8006FE98 AFA50014 */ sw $a1, 0x14($sp) -/* 4B29C 8006FE9C AFA60018 */ sw $a2, 0x18($sp) -/* 4B2A0 8006FEA0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B2A4 8006FEA4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B2A8 8006FEA8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B2AC 8006FEAC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B2B0 8006FEB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B2B4 8006FEB4 0C016959 */ jal load_effect -/* 4B2B8 8006FEB8 24040010 */ addiu $a0, $zero, 0x10 -/* 4B2BC 8006FEBC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B2C0 8006FEC0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B2C4 8006FEC4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B2C8 8006FEC8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B2CC 8006FECC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B2D0 8006FED0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B2D4 8006FED4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B2D8 8006FED8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B2DC 8006FEDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B2E0 8006FEE0 3C018008 */ lui $at, %hi(gEffectTable+0x180) -/* 4B2E4 8006FEE4 8C21F390 */ lw $at, %lo(gEffectTable+0x180)($at) -/* 4B2E8 8006FEE8 00200008 */ jr $at -/* 4B2EC 8006FEEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_land.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_land.s deleted file mode 100644 index 5bf6650d84..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_land.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_land -/* 4AED0 8006FAD0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AED4 8006FAD4 AFA40010 */ sw $a0, 0x10($sp) -/* 4AED8 8006FAD8 AFA50014 */ sw $a1, 0x14($sp) -/* 4AEDC 8006FADC AFA60018 */ sw $a2, 0x18($sp) -/* 4AEE0 8006FAE0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4AEE4 8006FAE4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4AEE8 8006FAE8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4AEEC 8006FAEC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4AEF0 8006FAF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AEF4 8006FAF4 0C016959 */ jal load_effect -/* 4AEF8 8006FAF8 24040006 */ addiu $a0, $zero, 6 -/* 4AEFC 8006FAFC 8FA40010 */ lw $a0, 0x10($sp) -/* 4AF00 8006FB00 8FA50014 */ lw $a1, 0x14($sp) -/* 4AF04 8006FB04 8FA60018 */ lw $a2, 0x18($sp) -/* 4AF08 8006FB08 8FA7001C */ lw $a3, 0x1c($sp) -/* 4AF0C 8006FB0C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4AF10 8006FB10 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4AF14 8006FB14 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4AF18 8006FB18 8FBF002C */ lw $ra, 0x2c($sp) -/* 4AF1C 8006FB1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AF20 8006FB20 3C018008 */ lui $at, %hi(gEffectTable+0x90) -/* 4AF24 8006FB24 8C21F2A0 */ lw $at, %lo(gEffectTable+0x90)($at) -/* 4AF28 8006FB28 00200008 */ jr $at -/* 4AF2C 8006FB2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sleep_bubble.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sleep_bubble.s deleted file mode 100644 index 289ced9351..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sleep_bubble.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_sleep_bubble -/* 4BBF0 800707F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BBF4 800707F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4BBF8 800707F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4BBFC 800707FC AFA60018 */ sw $a2, 0x18($sp) -/* 4BC00 80070800 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BC04 80070804 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BC08 80070808 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BC0C 8007080C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BC10 80070810 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BC14 80070814 0C016959 */ jal load_effect -/* 4BC18 80070818 24040029 */ addiu $a0, $zero, 0x29 -/* 4BC1C 8007081C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BC20 80070820 8FA50014 */ lw $a1, 0x14($sp) -/* 4BC24 80070824 8FA60018 */ lw $a2, 0x18($sp) -/* 4BC28 80070828 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BC2C 8007082C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BC30 80070830 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BC34 80070834 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BC38 80070838 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BC3C 8007083C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BC40 80070840 3C018008 */ lui $at, %hi(gEffectTable+0x3D8) -/* 4BC44 80070844 8C21F5E8 */ lw $at, %lo(gEffectTable+0x3D8)($at) -/* 4BC48 80070848 00200008 */ jr $at -/* 4BC4C 8007084C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sweat.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sweat.s deleted file mode 100644 index fca9b925b2..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sweat.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_sweat -/* 4BB90 80070790 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BB94 80070794 AFA40010 */ sw $a0, 0x10($sp) -/* 4BB98 80070798 AFA50014 */ sw $a1, 0x14($sp) -/* 4BB9C 8007079C AFA60018 */ sw $a2, 0x18($sp) -/* 4BBA0 800707A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BBA4 800707A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BBA8 800707A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BBAC 800707AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BBB0 800707B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BBB4 800707B4 0C016959 */ jal load_effect -/* 4BBB8 800707B8 24040028 */ addiu $a0, $zero, 0x28 -/* 4BBBC 800707BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4BBC0 800707C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4BBC4 800707C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4BBC8 800707C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BBCC 800707CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BBD0 800707D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BBD4 800707D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BBD8 800707D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BBDC 800707DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BBE0 800707E0 3C018008 */ lui $at, %hi(gEffectTable+0x3C0) -/* 4BBE4 800707E4 8C21F5D0 */ lw $at, %lo(gEffectTable+0x3C0)($at) -/* 4BBE8 800707E8 00200008 */ jr $at -/* 4BBEC 800707EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk.s deleted file mode 100644 index 4b2d76d43e..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel fx_walk -/* 4AF30 8006FB30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AF34 8006FB34 AFA40010 */ sw $a0, 0x10($sp) -/* 4AF38 8006FB38 AFA50014 */ sw $a1, 0x14($sp) -/* 4AF3C 8006FB3C AFA60018 */ sw $a2, 0x18($sp) -/* 4AF40 8006FB40 AFA7001C */ sw $a3, 0x1c($sp) -/* 4AF44 8006FB44 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4AF48 8006FB48 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4AF4C 8006FB4C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4AF50 8006FB50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AF54 8006FB54 0C016959 */ jal load_effect -/* 4AF58 8006FB58 24040007 */ addiu $a0, $zero, 7 -/* 4AF5C 8006FB5C 8FA40010 */ lw $a0, 0x10($sp) -/* 4AF60 8006FB60 8FA50014 */ lw $a1, 0x14($sp) -/* 4AF64 8006FB64 8FA60018 */ lw $a2, 0x18($sp) -/* 4AF68 8006FB68 8FA7001C */ lw $a3, 0x1c($sp) -/* 4AF6C 8006FB6C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4AF70 8006FB70 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4AF74 8006FB74 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4AF78 8006FB78 8FBF002C */ lw $ra, 0x2c($sp) -/* 4AF7C 8006FB7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AF80 8006FB80 3C018008 */ lui $at, %hi(gEffectTable+0xA8) -/* 4AF84 8006FB84 8C21F2B8 */ lw $at, %lo(gEffectTable+0xA8)($at) -/* 4AF88 8006FB88 00200008 */ jr $at -/* 4AF8C 8006FB8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_00.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_00.s deleted file mode 100644 index 39bf23a54d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_00.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_00 -/* 4AC90 8006F890 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AC94 8006F894 AFA40010 */ sw $a0, 0x10($sp) -/* 4AC98 8006F898 AFA50014 */ sw $a1, 0x14($sp) -/* 4AC9C 8006F89C AFA60018 */ sw $a2, 0x18($sp) -/* 4ACA0 8006F8A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4ACA4 8006F8A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4ACA8 8006F8A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4ACAC 8006F8AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4ACB0 8006F8B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4ACB4 8006F8B4 0C016959 */ jal load_effect -/* 4ACB8 8006F8B8 24040000 */ addiu $a0, $zero, 0 -/* 4ACBC 8006F8BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4ACC0 8006F8C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4ACC4 8006F8C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4ACC8 8006F8C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4ACCC 8006F8CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4ACD0 8006F8D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4ACD4 8006F8D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4ACD8 8006F8D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4ACDC 8006F8DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4ACE0 8006F8E0 3C018008 */ lui $at, %hi(gEffectTable) -/* 4ACE4 8006F8E4 8C21F210 */ lw $at, %lo(gEffectTable)($at) -/* 4ACE8 8006F8E8 00200008 */ jr $at -/* 4ACEC 8006F8EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_01.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_01.s deleted file mode 100644 index 84f85fd047..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_01.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_01 -/* 4ACF0 8006F8F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4ACF4 8006F8F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4ACF8 8006F8F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4ACFC 8006F8FC AFA60018 */ sw $a2, 0x18($sp) -/* 4AD00 8006F900 AFA7001C */ sw $a3, 0x1c($sp) -/* 4AD04 8006F904 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4AD08 8006F908 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4AD0C 8006F90C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4AD10 8006F910 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AD14 8006F914 0C016959 */ jal load_effect -/* 4AD18 8006F918 24040001 */ addiu $a0, $zero, 1 -/* 4AD1C 8006F91C 8FA40010 */ lw $a0, 0x10($sp) -/* 4AD20 8006F920 8FA50014 */ lw $a1, 0x14($sp) -/* 4AD24 8006F924 8FA60018 */ lw $a2, 0x18($sp) -/* 4AD28 8006F928 8FA7001C */ lw $a3, 0x1c($sp) -/* 4AD2C 8006F92C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4AD30 8006F930 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4AD34 8006F934 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4AD38 8006F938 8FBF002C */ lw $ra, 0x2c($sp) -/* 4AD3C 8006F93C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AD40 8006F940 3C018008 */ lui $at, %hi(gEffectTable+0x18) -/* 4AD44 8006F944 8C21F228 */ lw $at, %lo(gEffectTable+0x18)($at) -/* 4AD48 8006F948 00200008 */ jr $at -/* 4AD4C 8006F94C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_02.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_02.s deleted file mode 100644 index 6fea2865c6..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_02.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_02 -/* 4AD50 8006F950 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AD54 8006F954 AFA40010 */ sw $a0, 0x10($sp) -/* 4AD58 8006F958 AFA50014 */ sw $a1, 0x14($sp) -/* 4AD5C 8006F95C AFA60018 */ sw $a2, 0x18($sp) -/* 4AD60 8006F960 AFA7001C */ sw $a3, 0x1c($sp) -/* 4AD64 8006F964 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4AD68 8006F968 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4AD6C 8006F96C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4AD70 8006F970 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AD74 8006F974 0C016959 */ jal load_effect -/* 4AD78 8006F978 24040002 */ addiu $a0, $zero, 2 -/* 4AD7C 8006F97C 8FA40010 */ lw $a0, 0x10($sp) -/* 4AD80 8006F980 8FA50014 */ lw $a1, 0x14($sp) -/* 4AD84 8006F984 8FA60018 */ lw $a2, 0x18($sp) -/* 4AD88 8006F988 8FA7001C */ lw $a3, 0x1c($sp) -/* 4AD8C 8006F98C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4AD90 8006F990 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4AD94 8006F994 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4AD98 8006F998 8FBF002C */ lw $ra, 0x2c($sp) -/* 4AD9C 8006F99C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4ADA0 8006F9A0 3C018008 */ lui $at, %hi(gEffectTable+0x30) -/* 4ADA4 8006F9A4 8C21F240 */ lw $at, %lo(gEffectTable+0x30)($at) -/* 4ADA8 8006F9A8 00200008 */ jr $at -/* 4ADAC 8006F9AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_03.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_03.s deleted file mode 100644 index 2c0ea9b5de..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_03.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_03 -/* 4ADB0 8006F9B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4ADB4 8006F9B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4ADB8 8006F9B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4ADBC 8006F9BC AFA60018 */ sw $a2, 0x18($sp) -/* 4ADC0 8006F9C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4ADC4 8006F9C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4ADC8 8006F9C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4ADCC 8006F9CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4ADD0 8006F9D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4ADD4 8006F9D4 0C016959 */ jal load_effect -/* 4ADD8 8006F9D8 24040003 */ addiu $a0, $zero, 3 -/* 4ADDC 8006F9DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4ADE0 8006F9E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4ADE4 8006F9E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4ADE8 8006F9E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4ADEC 8006F9EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4ADF0 8006F9F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4ADF4 8006F9F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4ADF8 8006F9F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4ADFC 8006F9FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AE00 8006FA00 3C018008 */ lui $at, %hi(gEffectTable+0x48) -/* 4AE04 8006FA04 8C21F258 */ lw $at, %lo(gEffectTable+0x48)($at) -/* 4AE08 8006FA08 00200008 */ jr $at -/* 4AE0C 8006FA0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_04.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_04.s deleted file mode 100644 index ab0cd97a0d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_04.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_04 -/* 4AE10 8006FA10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AE14 8006FA14 AFA40010 */ sw $a0, 0x10($sp) -/* 4AE18 8006FA18 AFA50014 */ sw $a1, 0x14($sp) -/* 4AE1C 8006FA1C AFA60018 */ sw $a2, 0x18($sp) -/* 4AE20 8006FA20 AFA7001C */ sw $a3, 0x1c($sp) -/* 4AE24 8006FA24 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4AE28 8006FA28 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4AE2C 8006FA2C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4AE30 8006FA30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AE34 8006FA34 0C016959 */ jal load_effect -/* 4AE38 8006FA38 24040004 */ addiu $a0, $zero, 4 -/* 4AE3C 8006FA3C 8FA40010 */ lw $a0, 0x10($sp) -/* 4AE40 8006FA40 8FA50014 */ lw $a1, 0x14($sp) -/* 4AE44 8006FA44 8FA60018 */ lw $a2, 0x18($sp) -/* 4AE48 8006FA48 8FA7001C */ lw $a3, 0x1c($sp) -/* 4AE4C 8006FA4C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4AE50 8006FA50 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4AE54 8006FA54 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4AE58 8006FA58 8FBF002C */ lw $ra, 0x2c($sp) -/* 4AE5C 8006FA5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AE60 8006FA60 3C018008 */ lui $at, %hi(gEffectTable+0x60) -/* 4AE64 8006FA64 8C21F270 */ lw $at, %lo(gEffectTable+0x60)($at) -/* 4AE68 8006FA68 00200008 */ jr $at -/* 4AE6C 8006FA6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_05.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_05.s deleted file mode 100644 index 87bcf4d8ef..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_05.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_05 -/* 4AE70 8006FA70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AE74 8006FA74 AFA40010 */ sw $a0, 0x10($sp) -/* 4AE78 8006FA78 AFA50014 */ sw $a1, 0x14($sp) -/* 4AE7C 8006FA7C AFA60018 */ sw $a2, 0x18($sp) -/* 4AE80 8006FA80 AFA7001C */ sw $a3, 0x1c($sp) -/* 4AE84 8006FA84 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4AE88 8006FA88 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4AE8C 8006FA8C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4AE90 8006FA90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AE94 8006FA94 0C016959 */ jal load_effect -/* 4AE98 8006FA98 24040005 */ addiu $a0, $zero, 5 -/* 4AE9C 8006FA9C 8FA40010 */ lw $a0, 0x10($sp) -/* 4AEA0 8006FAA0 8FA50014 */ lw $a1, 0x14($sp) -/* 4AEA4 8006FAA4 8FA60018 */ lw $a2, 0x18($sp) -/* 4AEA8 8006FAA8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4AEAC 8006FAAC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4AEB0 8006FAB0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4AEB4 8006FAB4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4AEB8 8006FAB8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4AEBC 8006FABC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AEC0 8006FAC0 3C018008 */ lui $at, %hi(gEffectTable+0x78) -/* 4AEC4 8006FAC4 8C21F288 */ lw $at, %lo(gEffectTable+0x78)($at) -/* 4AEC8 8006FAC8 00200008 */ jr $at -/* 4AECC 8006FACC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_08.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_08.s deleted file mode 100644 index 7a82624f41..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_08.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_08 -/* 4AF90 8006FB90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AF94 8006FB94 AFA40010 */ sw $a0, 0x10($sp) -/* 4AF98 8006FB98 AFA50014 */ sw $a1, 0x14($sp) -/* 4AF9C 8006FB9C AFA60018 */ sw $a2, 0x18($sp) -/* 4AFA0 8006FBA0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4AFA4 8006FBA4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4AFA8 8006FBA8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4AFAC 8006FBAC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4AFB0 8006FBB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4AFB4 8006FBB4 0C016959 */ jal load_effect -/* 4AFB8 8006FBB8 24040008 */ addiu $a0, $zero, 8 -/* 4AFBC 8006FBBC 8FA40010 */ lw $a0, 0x10($sp) -/* 4AFC0 8006FBC0 8FA50014 */ lw $a1, 0x14($sp) -/* 4AFC4 8006FBC4 8FA60018 */ lw $a2, 0x18($sp) -/* 4AFC8 8006FBC8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4AFCC 8006FBCC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4AFD0 8006FBD0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4AFD4 8006FBD4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4AFD8 8006FBD8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4AFDC 8006FBDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4AFE0 8006FBE0 3C018008 */ lui $at, %hi(gEffectTable+0xC0) -/* 4AFE4 8006FBE4 8C21F2D0 */ lw $at, %lo(gEffectTable+0xC0)($at) -/* 4AFE8 8006FBE8 00200008 */ jr $at -/* 4AFEC 8006FBEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_09.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_09.s deleted file mode 100644 index 515b7a7cf3..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_09.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_09 -/* 4AFF0 8006FBF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4AFF4 8006FBF4 AFA40010 */ sw $a0, 0x10($sp) -/* 4AFF8 8006FBF8 AFA50014 */ sw $a1, 0x14($sp) -/* 4AFFC 8006FBFC AFA60018 */ sw $a2, 0x18($sp) -/* 4B000 8006FC00 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B004 8006FC04 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B008 8006FC08 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B00C 8006FC0C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B010 8006FC10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B014 8006FC14 0C016959 */ jal load_effect -/* 4B018 8006FC18 24040009 */ addiu $a0, $zero, 9 -/* 4B01C 8006FC1C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B020 8006FC20 8FA50014 */ lw $a1, 0x14($sp) -/* 4B024 8006FC24 8FA60018 */ lw $a2, 0x18($sp) -/* 4B028 8006FC28 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B02C 8006FC2C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B030 8006FC30 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B034 8006FC34 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B038 8006FC38 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B03C 8006FC3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B040 8006FC40 3C018008 */ lui $at, %hi(gEffectTable+0xD8) -/* 4B044 8006FC44 8C21F2E8 */ lw $at, %lo(gEffectTable+0xD8)($at) -/* 4B048 8006FC48 00200008 */ jr $at -/* 4B04C 8006FC4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0A.s deleted file mode 100644 index 1e825758ec..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_0A -/* 4B050 8006FC50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B054 8006FC54 AFA40010 */ sw $a0, 0x10($sp) -/* 4B058 8006FC58 AFA50014 */ sw $a1, 0x14($sp) -/* 4B05C 8006FC5C AFA60018 */ sw $a2, 0x18($sp) -/* 4B060 8006FC60 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B064 8006FC64 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B068 8006FC68 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B06C 8006FC6C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B070 8006FC70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B074 8006FC74 0C016959 */ jal load_effect -/* 4B078 8006FC78 2404000A */ addiu $a0, $zero, 0xa -/* 4B07C 8006FC7C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B080 8006FC80 8FA50014 */ lw $a1, 0x14($sp) -/* 4B084 8006FC84 8FA60018 */ lw $a2, 0x18($sp) -/* 4B088 8006FC88 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B08C 8006FC8C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B090 8006FC90 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B094 8006FC94 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B098 8006FC98 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B09C 8006FC9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B0A0 8006FCA0 3C018008 */ lui $at, %hi(gEffectTable+0xF0) -/* 4B0A4 8006FCA4 8C21F300 */ lw $at, %lo(gEffectTable+0xF0)($at) -/* 4B0A8 8006FCA8 00200008 */ jr $at -/* 4B0AC 8006FCAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0B.s deleted file mode 100644 index f0c7fb2528..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_0B -/* 4B0B0 8006FCB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B0B4 8006FCB4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B0B8 8006FCB8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B0BC 8006FCBC AFA60018 */ sw $a2, 0x18($sp) -/* 4B0C0 8006FCC0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B0C4 8006FCC4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B0C8 8006FCC8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B0CC 8006FCCC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B0D0 8006FCD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B0D4 8006FCD4 0C016959 */ jal load_effect -/* 4B0D8 8006FCD8 2404000B */ addiu $a0, $zero, 0xb -/* 4B0DC 8006FCDC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B0E0 8006FCE0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B0E4 8006FCE4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B0E8 8006FCE8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B0EC 8006FCEC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B0F0 8006FCF0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B0F4 8006FCF4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B0F8 8006FCF8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B0FC 8006FCFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B100 8006FD00 3C018008 */ lui $at, %hi(gEffectTable+0x108) -/* 4B104 8006FD04 8C21F318 */ lw $at, %lo(gEffectTable+0x108)($at) -/* 4B108 8006FD08 00200008 */ jr $at -/* 4B10C 8006FD0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0C.s deleted file mode 100644 index 1231618273..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_0C -/* 4B110 8006FD10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B114 8006FD14 AFA40010 */ sw $a0, 0x10($sp) -/* 4B118 8006FD18 AFA50014 */ sw $a1, 0x14($sp) -/* 4B11C 8006FD1C AFA60018 */ sw $a2, 0x18($sp) -/* 4B120 8006FD20 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B124 8006FD24 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B128 8006FD28 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B12C 8006FD2C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B130 8006FD30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B134 8006FD34 0C016959 */ jal load_effect -/* 4B138 8006FD38 2404000C */ addiu $a0, $zero, 0xc -/* 4B13C 8006FD3C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B140 8006FD40 8FA50014 */ lw $a1, 0x14($sp) -/* 4B144 8006FD44 8FA60018 */ lw $a2, 0x18($sp) -/* 4B148 8006FD48 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B14C 8006FD4C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B150 8006FD50 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B154 8006FD54 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B158 8006FD58 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B15C 8006FD5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B160 8006FD60 3C018008 */ lui $at, %hi(gEffectTable+0x120) -/* 4B164 8006FD64 8C21F330 */ lw $at, %lo(gEffectTable+0x120)($at) -/* 4B168 8006FD68 00200008 */ jr $at -/* 4B16C 8006FD6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0D.s deleted file mode 100644 index 828af3dada..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_0D -/* 4B170 8006FD70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B174 8006FD74 AFA40010 */ sw $a0, 0x10($sp) -/* 4B178 8006FD78 AFA50014 */ sw $a1, 0x14($sp) -/* 4B17C 8006FD7C AFA60018 */ sw $a2, 0x18($sp) -/* 4B180 8006FD80 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B184 8006FD84 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B188 8006FD88 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B18C 8006FD8C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B190 8006FD90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B194 8006FD94 0C016959 */ jal load_effect -/* 4B198 8006FD98 2404000D */ addiu $a0, $zero, 0xd -/* 4B19C 8006FD9C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B1A0 8006FDA0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B1A4 8006FDA4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B1A8 8006FDA8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B1AC 8006FDAC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B1B0 8006FDB0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B1B4 8006FDB4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B1B8 8006FDB8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B1BC 8006FDBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B1C0 8006FDC0 3C018008 */ lui $at, %hi(gEffectTable+0x138) -/* 4B1C4 8006FDC4 8C21F348 */ lw $at, %lo(gEffectTable+0x138)($at) -/* 4B1C8 8006FDC8 00200008 */ jr $at -/* 4B1CC 8006FDCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0E.s deleted file mode 100644 index d41047ded1..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_0E -/* 4B1D0 8006FDD0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B1D4 8006FDD4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B1D8 8006FDD8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B1DC 8006FDDC AFA60018 */ sw $a2, 0x18($sp) -/* 4B1E0 8006FDE0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B1E4 8006FDE4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B1E8 8006FDE8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B1EC 8006FDEC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B1F0 8006FDF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B1F4 8006FDF4 0C016959 */ jal load_effect -/* 4B1F8 8006FDF8 2404000E */ addiu $a0, $zero, 0xe -/* 4B1FC 8006FDFC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B200 8006FE00 8FA50014 */ lw $a1, 0x14($sp) -/* 4B204 8006FE04 8FA60018 */ lw $a2, 0x18($sp) -/* 4B208 8006FE08 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B20C 8006FE0C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B210 8006FE10 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B214 8006FE14 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B218 8006FE18 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B21C 8006FE1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B220 8006FE20 3C018008 */ lui $at, %hi(gEffectTable+0x150) -/* 4B224 8006FE24 8C21F360 */ lw $at, %lo(gEffectTable+0x150)($at) -/* 4B228 8006FE28 00200008 */ jr $at -/* 4B22C 8006FE2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0F.s deleted file mode 100644 index 13fd91c63f..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_0F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_0F -/* 4B230 8006FE30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B234 8006FE34 AFA40010 */ sw $a0, 0x10($sp) -/* 4B238 8006FE38 AFA50014 */ sw $a1, 0x14($sp) -/* 4B23C 8006FE3C AFA60018 */ sw $a2, 0x18($sp) -/* 4B240 8006FE40 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B244 8006FE44 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B248 8006FE48 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B24C 8006FE4C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B250 8006FE50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B254 8006FE54 0C016959 */ jal load_effect -/* 4B258 8006FE58 2404000F */ addiu $a0, $zero, 0xf -/* 4B25C 8006FE5C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B260 8006FE60 8FA50014 */ lw $a1, 0x14($sp) -/* 4B264 8006FE64 8FA60018 */ lw $a2, 0x18($sp) -/* 4B268 8006FE68 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B26C 8006FE6C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B270 8006FE70 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B274 8006FE74 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B278 8006FE78 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B27C 8006FE7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B280 8006FE80 3C018008 */ lui $at, %hi(gEffectTable+0x168) -/* 4B284 8006FE84 8C21F378 */ lw $at, %lo(gEffectTable+0x168)($at) -/* 4B288 8006FE88 00200008 */ jr $at -/* 4B28C 8006FE8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_11.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_11.s deleted file mode 100644 index 7d936d5a32..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_11.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_11 -/* 4B2F0 8006FEF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B2F4 8006FEF4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B2F8 8006FEF8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B2FC 8006FEFC AFA60018 */ sw $a2, 0x18($sp) -/* 4B300 8006FF00 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B304 8006FF04 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B308 8006FF08 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B30C 8006FF0C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B310 8006FF10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B314 8006FF14 0C016959 */ jal load_effect -/* 4B318 8006FF18 24040011 */ addiu $a0, $zero, 0x11 -/* 4B31C 8006FF1C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B320 8006FF20 8FA50014 */ lw $a1, 0x14($sp) -/* 4B324 8006FF24 8FA60018 */ lw $a2, 0x18($sp) -/* 4B328 8006FF28 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B32C 8006FF2C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B330 8006FF30 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B334 8006FF34 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B338 8006FF38 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B33C 8006FF3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B340 8006FF40 3C018008 */ lui $at, %hi(gEffectTable+0x198) -/* 4B344 8006FF44 8C21F3A8 */ lw $at, %lo(gEffectTable+0x198)($at) -/* 4B348 8006FF48 00200008 */ jr $at -/* 4B34C 8006FF4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_12.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_12.s deleted file mode 100644 index 1f74dae2ba..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_12.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_12 -/* 4B350 8006FF50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B354 8006FF54 AFA40010 */ sw $a0, 0x10($sp) -/* 4B358 8006FF58 AFA50014 */ sw $a1, 0x14($sp) -/* 4B35C 8006FF5C AFA60018 */ sw $a2, 0x18($sp) -/* 4B360 8006FF60 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B364 8006FF64 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B368 8006FF68 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B36C 8006FF6C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B370 8006FF70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B374 8006FF74 0C016959 */ jal load_effect -/* 4B378 8006FF78 24040012 */ addiu $a0, $zero, 0x12 -/* 4B37C 8006FF7C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B380 8006FF80 8FA50014 */ lw $a1, 0x14($sp) -/* 4B384 8006FF84 8FA60018 */ lw $a2, 0x18($sp) -/* 4B388 8006FF88 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B38C 8006FF8C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B390 8006FF90 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B394 8006FF94 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B398 8006FF98 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B39C 8006FF9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B3A0 8006FFA0 3C018008 */ lui $at, %hi(gEffectTable+0x1B0) -/* 4B3A4 8006FFA4 8C21F3C0 */ lw $at, %lo(gEffectTable+0x1B0)($at) -/* 4B3A8 8006FFA8 00200008 */ jr $at -/* 4B3AC 8006FFAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_13.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_13.s deleted file mode 100644 index 49dc57fc34..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_13.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_13 -/* 4B3B0 8006FFB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B3B4 8006FFB4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B3B8 8006FFB8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B3BC 8006FFBC AFA60018 */ sw $a2, 0x18($sp) -/* 4B3C0 8006FFC0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B3C4 8006FFC4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B3C8 8006FFC8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B3CC 8006FFCC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B3D0 8006FFD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B3D4 8006FFD4 0C016959 */ jal load_effect -/* 4B3D8 8006FFD8 24040013 */ addiu $a0, $zero, 0x13 -/* 4B3DC 8006FFDC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B3E0 8006FFE0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B3E4 8006FFE4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B3E8 8006FFE8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B3EC 8006FFEC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B3F0 8006FFF0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B3F4 8006FFF4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B3F8 8006FFF8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B3FC 8006FFFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B400 80070000 3C018008 */ lui $at, %hi(gEffectTable+0x1C8) -/* 4B404 80070004 8C21F3D8 */ lw $at, %lo(gEffectTable+0x1C8)($at) -/* 4B408 80070008 00200008 */ jr $at -/* 4B40C 8007000C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_14.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_14.s deleted file mode 100644 index a4fcd1e3cb..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_14.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_14 -/* 4B410 80070010 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B414 80070014 AFA40010 */ sw $a0, 0x10($sp) -/* 4B418 80070018 AFA50014 */ sw $a1, 0x14($sp) -/* 4B41C 8007001C AFA60018 */ sw $a2, 0x18($sp) -/* 4B420 80070020 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B424 80070024 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B428 80070028 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B42C 8007002C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B430 80070030 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B434 80070034 0C016959 */ jal load_effect -/* 4B438 80070038 24040014 */ addiu $a0, $zero, 0x14 -/* 4B43C 8007003C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B440 80070040 8FA50014 */ lw $a1, 0x14($sp) -/* 4B444 80070044 8FA60018 */ lw $a2, 0x18($sp) -/* 4B448 80070048 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B44C 8007004C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B450 80070050 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B454 80070054 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B458 80070058 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B45C 8007005C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B460 80070060 3C018008 */ lui $at, %hi(gEffectTable+0x1E0) -/* 4B464 80070064 8C21F3F0 */ lw $at, %lo(gEffectTable+0x1E0)($at) -/* 4B468 80070068 00200008 */ jr $at -/* 4B46C 8007006C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_15.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_15.s deleted file mode 100644 index e91979ab84..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_15.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_15 -/* 4B470 80070070 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B474 80070074 AFA40010 */ sw $a0, 0x10($sp) -/* 4B478 80070078 AFA50014 */ sw $a1, 0x14($sp) -/* 4B47C 8007007C AFA60018 */ sw $a2, 0x18($sp) -/* 4B480 80070080 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B484 80070084 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B488 80070088 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B48C 8007008C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B490 80070090 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B494 80070094 0C016959 */ jal load_effect -/* 4B498 80070098 24040015 */ addiu $a0, $zero, 0x15 -/* 4B49C 8007009C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B4A0 800700A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B4A4 800700A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B4A8 800700A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B4AC 800700AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B4B0 800700B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B4B4 800700B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B4B8 800700B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B4BC 800700BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B4C0 800700C0 3C018008 */ lui $at, %hi(gEffectTable+0x1F8) -/* 4B4C4 800700C4 8C21F408 */ lw $at, %lo(gEffectTable+0x1F8)($at) -/* 4B4C8 800700C8 00200008 */ jr $at -/* 4B4CC 800700CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_16.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_16.s deleted file mode 100644 index cd811d7e2a..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_16.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_16 -/* 4B4D0 800700D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B4D4 800700D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B4D8 800700D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B4DC 800700DC AFA60018 */ sw $a2, 0x18($sp) -/* 4B4E0 800700E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B4E4 800700E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B4E8 800700E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B4EC 800700EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B4F0 800700F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B4F4 800700F4 0C016959 */ jal load_effect -/* 4B4F8 800700F8 24040016 */ addiu $a0, $zero, 0x16 -/* 4B4FC 800700FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B500 80070100 8FA50014 */ lw $a1, 0x14($sp) -/* 4B504 80070104 8FA60018 */ lw $a2, 0x18($sp) -/* 4B508 80070108 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B50C 8007010C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B510 80070110 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B514 80070114 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B518 80070118 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B51C 8007011C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B520 80070120 3C018008 */ lui $at, %hi(gEffectTable+0x210) -/* 4B524 80070124 8C21F420 */ lw $at, %lo(gEffectTable+0x210)($at) -/* 4B528 80070128 00200008 */ jr $at -/* 4B52C 8007012C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_17.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_17.s deleted file mode 100644 index 1aca2c024d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_17.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_17 -/* 4B530 80070130 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B534 80070134 AFA40010 */ sw $a0, 0x10($sp) -/* 4B538 80070138 AFA50014 */ sw $a1, 0x14($sp) -/* 4B53C 8007013C AFA60018 */ sw $a2, 0x18($sp) -/* 4B540 80070140 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B544 80070144 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B548 80070148 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B54C 8007014C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B550 80070150 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B554 80070154 0C016959 */ jal load_effect -/* 4B558 80070158 24040017 */ addiu $a0, $zero, 0x17 -/* 4B55C 8007015C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B560 80070160 8FA50014 */ lw $a1, 0x14($sp) -/* 4B564 80070164 8FA60018 */ lw $a2, 0x18($sp) -/* 4B568 80070168 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B56C 8007016C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B570 80070170 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B574 80070174 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B578 80070178 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B57C 8007017C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B580 80070180 3C018008 */ lui $at, %hi(gEffectTable+0x228) -/* 4B584 80070184 8C21F438 */ lw $at, %lo(gEffectTable+0x228)($at) -/* 4B588 80070188 00200008 */ jr $at -/* 4B58C 8007018C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_18.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_18.s deleted file mode 100644 index d2f46b5788..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_18.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_18 -/* 4B590 80070190 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B594 80070194 AFA40010 */ sw $a0, 0x10($sp) -/* 4B598 80070198 AFA50014 */ sw $a1, 0x14($sp) -/* 4B59C 8007019C AFA60018 */ sw $a2, 0x18($sp) -/* 4B5A0 800701A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B5A4 800701A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B5A8 800701A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B5AC 800701AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B5B0 800701B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B5B4 800701B4 0C016959 */ jal load_effect -/* 4B5B8 800701B8 24040018 */ addiu $a0, $zero, 0x18 -/* 4B5BC 800701BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B5C0 800701C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B5C4 800701C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B5C8 800701C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B5CC 800701CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B5D0 800701D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B5D4 800701D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B5D8 800701D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B5DC 800701DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B5E0 800701E0 3C018008 */ lui $at, %hi(gEffectTable+0x240) -/* 4B5E4 800701E4 8C21F450 */ lw $at, %lo(gEffectTable+0x240)($at) -/* 4B5E8 800701E8 00200008 */ jr $at -/* 4B5EC 800701EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_19.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_19.s deleted file mode 100644 index 2a0b7bd77d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_19.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_19 -/* 4B5F0 800701F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B5F4 800701F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B5F8 800701F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B5FC 800701FC AFA60018 */ sw $a2, 0x18($sp) -/* 4B600 80070200 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B604 80070204 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B608 80070208 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B60C 8007020C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B610 80070210 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B614 80070214 0C016959 */ jal load_effect -/* 4B618 80070218 24040019 */ addiu $a0, $zero, 0x19 -/* 4B61C 8007021C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B620 80070220 8FA50014 */ lw $a1, 0x14($sp) -/* 4B624 80070224 8FA60018 */ lw $a2, 0x18($sp) -/* 4B628 80070228 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B62C 8007022C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B630 80070230 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B634 80070234 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B638 80070238 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B63C 8007023C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B640 80070240 3C018008 */ lui $at, %hi(gEffectTable+0x258) -/* 4B644 80070244 8C21F468 */ lw $at, %lo(gEffectTable+0x258)($at) -/* 4B648 80070248 00200008 */ jr $at -/* 4B64C 8007024C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1A.s deleted file mode 100644 index 8eb5c59f74..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_1A -/* 4B650 80070250 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B654 80070254 AFA40010 */ sw $a0, 0x10($sp) -/* 4B658 80070258 AFA50014 */ sw $a1, 0x14($sp) -/* 4B65C 8007025C AFA60018 */ sw $a2, 0x18($sp) -/* 4B660 80070260 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B664 80070264 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B668 80070268 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B66C 8007026C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B670 80070270 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B674 80070274 0C016959 */ jal load_effect -/* 4B678 80070278 2404001A */ addiu $a0, $zero, 0x1a -/* 4B67C 8007027C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B680 80070280 8FA50014 */ lw $a1, 0x14($sp) -/* 4B684 80070284 8FA60018 */ lw $a2, 0x18($sp) -/* 4B688 80070288 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B68C 8007028C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B690 80070290 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B694 80070294 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B698 80070298 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B69C 8007029C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B6A0 800702A0 3C018008 */ lui $at, %hi(gEffectTable+0x270) -/* 4B6A4 800702A4 8C21F480 */ lw $at, %lo(gEffectTable+0x270)($at) -/* 4B6A8 800702A8 00200008 */ jr $at -/* 4B6AC 800702AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1B.s deleted file mode 100644 index b1356022dc..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_1B -/* 4B6B0 800702B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B6B4 800702B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B6B8 800702B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B6BC 800702BC AFA60018 */ sw $a2, 0x18($sp) -/* 4B6C0 800702C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B6C4 800702C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B6C8 800702C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B6CC 800702CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B6D0 800702D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B6D4 800702D4 0C016959 */ jal load_effect -/* 4B6D8 800702D8 2404001B */ addiu $a0, $zero, 0x1b -/* 4B6DC 800702DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B6E0 800702E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B6E4 800702E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B6E8 800702E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B6EC 800702EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B6F0 800702F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B6F4 800702F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B6F8 800702F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B6FC 800702FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B700 80070300 3C018008 */ lui $at, %hi(gEffectTable+0x288) -/* 4B704 80070304 8C21F498 */ lw $at, %lo(gEffectTable+0x288)($at) -/* 4B708 80070308 00200008 */ jr $at -/* 4B70C 8007030C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1C.s deleted file mode 100644 index aa305f02e2..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_1C -/* 4B710 80070310 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B714 80070314 AFA40010 */ sw $a0, 0x10($sp) -/* 4B718 80070318 AFA50014 */ sw $a1, 0x14($sp) -/* 4B71C 8007031C AFA60018 */ sw $a2, 0x18($sp) -/* 4B720 80070320 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B724 80070324 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B728 80070328 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B72C 8007032C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B730 80070330 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B734 80070334 0C016959 */ jal load_effect -/* 4B738 80070338 2404001C */ addiu $a0, $zero, 0x1c -/* 4B73C 8007033C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B740 80070340 8FA50014 */ lw $a1, 0x14($sp) -/* 4B744 80070344 8FA60018 */ lw $a2, 0x18($sp) -/* 4B748 80070348 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B74C 8007034C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B750 80070350 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B754 80070354 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B758 80070358 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B75C 8007035C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B760 80070360 3C018008 */ lui $at, %hi(gEffectTable+0x2A0) -/* 4B764 80070364 8C21F4B0 */ lw $at, %lo(gEffectTable+0x2A0)($at) -/* 4B768 80070368 00200008 */ jr $at -/* 4B76C 8007036C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1D.s deleted file mode 100644 index fa9dc0d486..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_1D -/* 4B770 80070370 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B774 80070374 AFA40010 */ sw $a0, 0x10($sp) -/* 4B778 80070378 AFA50014 */ sw $a1, 0x14($sp) -/* 4B77C 8007037C AFA60018 */ sw $a2, 0x18($sp) -/* 4B780 80070380 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B784 80070384 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B788 80070388 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B78C 8007038C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B790 80070390 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B794 80070394 0C016959 */ jal load_effect -/* 4B798 80070398 2404001D */ addiu $a0, $zero, 0x1d -/* 4B79C 8007039C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B7A0 800703A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B7A4 800703A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B7A8 800703A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B7AC 800703AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B7B0 800703B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B7B4 800703B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B7B8 800703B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B7BC 800703BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B7C0 800703C0 3C018008 */ lui $at, %hi(gEffectTable+0x2B8) -/* 4B7C4 800703C4 8C21F4C8 */ lw $at, %lo(gEffectTable+0x2B8)($at) -/* 4B7C8 800703C8 00200008 */ jr $at -/* 4B7CC 800703CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1E.s deleted file mode 100644 index 33d83ffcc7..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_1E -/* 4B7D0 800703D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B7D4 800703D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B7D8 800703D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B7DC 800703DC AFA60018 */ sw $a2, 0x18($sp) -/* 4B7E0 800703E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B7E4 800703E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B7E8 800703E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B7EC 800703EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B7F0 800703F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B7F4 800703F4 0C016959 */ jal load_effect -/* 4B7F8 800703F8 2404001E */ addiu $a0, $zero, 0x1e -/* 4B7FC 800703FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B800 80070400 8FA50014 */ lw $a1, 0x14($sp) -/* 4B804 80070404 8FA60018 */ lw $a2, 0x18($sp) -/* 4B808 80070408 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B80C 8007040C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B810 80070410 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B814 80070414 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B818 80070418 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B81C 8007041C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B820 80070420 3C018008 */ lui $at, %hi(gEffectTable+0x2D0) -/* 4B824 80070424 8C21F4E0 */ lw $at, %lo(gEffectTable+0x2D0)($at) -/* 4B828 80070428 00200008 */ jr $at -/* 4B82C 8007042C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1F.s deleted file mode 100644 index 2a6354e7fd..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_1F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_1F -/* 4B830 80070430 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B834 80070434 AFA40010 */ sw $a0, 0x10($sp) -/* 4B838 80070438 AFA50014 */ sw $a1, 0x14($sp) -/* 4B83C 8007043C AFA60018 */ sw $a2, 0x18($sp) -/* 4B840 80070440 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B844 80070444 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B848 80070448 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B84C 8007044C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B850 80070450 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B854 80070454 0C016959 */ jal load_effect -/* 4B858 80070458 2404001F */ addiu $a0, $zero, 0x1f -/* 4B85C 8007045C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B860 80070460 8FA50014 */ lw $a1, 0x14($sp) -/* 4B864 80070464 8FA60018 */ lw $a2, 0x18($sp) -/* 4B868 80070468 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B86C 8007046C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B870 80070470 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B874 80070474 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B878 80070478 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B87C 8007047C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B880 80070480 3C018008 */ lui $at, %hi(gEffectTable+0x2E8) -/* 4B884 80070484 8C21F4F8 */ lw $at, %lo(gEffectTable+0x2E8)($at) -/* 4B888 80070488 00200008 */ jr $at -/* 4B88C 8007048C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_20.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_20.s deleted file mode 100644 index cef9ac184a..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_20.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_20 -/* 4B890 80070490 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B894 80070494 AFA40010 */ sw $a0, 0x10($sp) -/* 4B898 80070498 AFA50014 */ sw $a1, 0x14($sp) -/* 4B89C 8007049C AFA60018 */ sw $a2, 0x18($sp) -/* 4B8A0 800704A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B8A4 800704A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B8A8 800704A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B8AC 800704AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B8B0 800704B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B8B4 800704B4 0C016959 */ jal load_effect -/* 4B8B8 800704B8 24040020 */ addiu $a0, $zero, 0x20 -/* 4B8BC 800704BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B8C0 800704C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B8C4 800704C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B8C8 800704C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B8CC 800704CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B8D0 800704D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B8D4 800704D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B8D8 800704D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B8DC 800704DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B8E0 800704E0 3C018008 */ lui $at, %hi(gEffectTable+0x300) -/* 4B8E4 800704E4 8C21F510 */ lw $at, %lo(gEffectTable+0x300)($at) -/* 4B8E8 800704E8 00200008 */ jr $at -/* 4B8EC 800704EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_21.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_21.s deleted file mode 100644 index 9342e17ad5..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_21.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_21 -/* 4B8F0 800704F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B8F4 800704F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B8F8 800704F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B8FC 800704FC AFA60018 */ sw $a2, 0x18($sp) -/* 4B900 80070500 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B904 80070504 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B908 80070508 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B90C 8007050C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B910 80070510 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B914 80070514 0C016959 */ jal load_effect -/* 4B918 80070518 24040021 */ addiu $a0, $zero, 0x21 -/* 4B91C 8007051C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B920 80070520 8FA50014 */ lw $a1, 0x14($sp) -/* 4B924 80070524 8FA60018 */ lw $a2, 0x18($sp) -/* 4B928 80070528 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B92C 8007052C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B930 80070530 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B934 80070534 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B938 80070538 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B93C 8007053C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B940 80070540 3C018008 */ lui $at, %hi(gEffectTable+0x318) -/* 4B944 80070544 8C21F528 */ lw $at, %lo(gEffectTable+0x318)($at) -/* 4B948 80070548 00200008 */ jr $at -/* 4B94C 8007054C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_22.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_22.s deleted file mode 100644 index e326d82e30..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_22.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_22 -/* 4B950 80070550 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B954 80070554 AFA40010 */ sw $a0, 0x10($sp) -/* 4B958 80070558 AFA50014 */ sw $a1, 0x14($sp) -/* 4B95C 8007055C AFA60018 */ sw $a2, 0x18($sp) -/* 4B960 80070560 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B964 80070564 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B968 80070568 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B96C 8007056C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B970 80070570 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B974 80070574 0C016959 */ jal load_effect -/* 4B978 80070578 24040022 */ addiu $a0, $zero, 0x22 -/* 4B97C 8007057C 8FA40010 */ lw $a0, 0x10($sp) -/* 4B980 80070580 8FA50014 */ lw $a1, 0x14($sp) -/* 4B984 80070584 8FA60018 */ lw $a2, 0x18($sp) -/* 4B988 80070588 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B98C 8007058C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B990 80070590 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B994 80070594 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B998 80070598 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B99C 8007059C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4B9A0 800705A0 3C018008 */ lui $at, %hi(gEffectTable+0x330) -/* 4B9A4 800705A4 8C21F540 */ lw $at, %lo(gEffectTable+0x330)($at) -/* 4B9A8 800705A8 00200008 */ jr $at -/* 4B9AC 800705AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_23.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_23.s deleted file mode 100644 index ce5dfdfffd..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_23.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_23 -/* 4B9B0 800705B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4B9B4 800705B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4B9B8 800705B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4B9BC 800705BC AFA60018 */ sw $a2, 0x18($sp) -/* 4B9C0 800705C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4B9C4 800705C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4B9C8 800705C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4B9CC 800705CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4B9D0 800705D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4B9D4 800705D4 0C016959 */ jal load_effect -/* 4B9D8 800705D8 24040023 */ addiu $a0, $zero, 0x23 -/* 4B9DC 800705DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4B9E0 800705E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4B9E4 800705E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4B9E8 800705E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4B9EC 800705EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4B9F0 800705F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4B9F4 800705F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4B9F8 800705F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4B9FC 800705FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BA00 80070600 3C018008 */ lui $at, %hi(gEffectTable+0x348) -/* 4BA04 80070604 8C21F558 */ lw $at, %lo(gEffectTable+0x348)($at) -/* 4BA08 80070608 00200008 */ jr $at -/* 4BA0C 8007060C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_24.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_24.s deleted file mode 100644 index 9f50122152..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_24.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_24 -/* 4BA10 80070610 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BA14 80070614 AFA40010 */ sw $a0, 0x10($sp) -/* 4BA18 80070618 AFA50014 */ sw $a1, 0x14($sp) -/* 4BA1C 8007061C AFA60018 */ sw $a2, 0x18($sp) -/* 4BA20 80070620 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BA24 80070624 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BA28 80070628 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BA2C 8007062C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BA30 80070630 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BA34 80070634 0C016959 */ jal load_effect -/* 4BA38 80070638 24040024 */ addiu $a0, $zero, 0x24 -/* 4BA3C 8007063C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BA40 80070640 8FA50014 */ lw $a1, 0x14($sp) -/* 4BA44 80070644 8FA60018 */ lw $a2, 0x18($sp) -/* 4BA48 80070648 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BA4C 8007064C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BA50 80070650 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BA54 80070654 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BA58 80070658 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BA5C 8007065C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BA60 80070660 3C018008 */ lui $at, %hi(gEffectTable+0x360) -/* 4BA64 80070664 8C21F570 */ lw $at, %lo(gEffectTable+0x360)($at) -/* 4BA68 80070668 00200008 */ jr $at -/* 4BA6C 8007066C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_25.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_25.s deleted file mode 100644 index 62a1a6b770..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_25.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_25 -/* 4BA70 80070670 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BA74 80070674 AFA40010 */ sw $a0, 0x10($sp) -/* 4BA78 80070678 AFA50014 */ sw $a1, 0x14($sp) -/* 4BA7C 8007067C AFA60018 */ sw $a2, 0x18($sp) -/* 4BA80 80070680 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BA84 80070684 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BA88 80070688 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BA8C 8007068C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BA90 80070690 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BA94 80070694 0C016959 */ jal load_effect -/* 4BA98 80070698 24040025 */ addiu $a0, $zero, 0x25 -/* 4BA9C 8007069C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BAA0 800706A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4BAA4 800706A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4BAA8 800706A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BAAC 800706AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BAB0 800706B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BAB4 800706B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BAB8 800706B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BABC 800706BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BAC0 800706C0 3C018008 */ lui $at, %hi(gEffectTable+0x378) -/* 4BAC4 800706C4 8C21F588 */ lw $at, %lo(gEffectTable+0x378)($at) -/* 4BAC8 800706C8 00200008 */ jr $at -/* 4BACC 800706CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_26.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_26.s deleted file mode 100644 index 60cad287d1..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_26.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_26 -/* 4BAD0 800706D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BAD4 800706D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4BAD8 800706D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4BADC 800706DC AFA60018 */ sw $a2, 0x18($sp) -/* 4BAE0 800706E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BAE4 800706E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BAE8 800706E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BAEC 800706EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BAF0 800706F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BAF4 800706F4 0C016959 */ jal load_effect -/* 4BAF8 800706F8 24040026 */ addiu $a0, $zero, 0x26 -/* 4BAFC 800706FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4BB00 80070700 8FA50014 */ lw $a1, 0x14($sp) -/* 4BB04 80070704 8FA60018 */ lw $a2, 0x18($sp) -/* 4BB08 80070708 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BB0C 8007070C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BB10 80070710 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BB14 80070714 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BB18 80070718 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BB1C 8007071C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BB20 80070720 3C018008 */ lui $at, %hi(gEffectTable+0x390) -/* 4BB24 80070724 8C21F5A0 */ lw $at, %lo(gEffectTable+0x390)($at) -/* 4BB28 80070728 00200008 */ jr $at -/* 4BB2C 8007072C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_27.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_27.s deleted file mode 100644 index d5c2e8bbe9..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_27.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_27 -/* 4BB30 80070730 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BB34 80070734 AFA40010 */ sw $a0, 0x10($sp) -/* 4BB38 80070738 AFA50014 */ sw $a1, 0x14($sp) -/* 4BB3C 8007073C AFA60018 */ sw $a2, 0x18($sp) -/* 4BB40 80070740 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BB44 80070744 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BB48 80070748 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BB4C 8007074C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BB50 80070750 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BB54 80070754 0C016959 */ jal load_effect -/* 4BB58 80070758 24040027 */ addiu $a0, $zero, 0x27 -/* 4BB5C 8007075C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BB60 80070760 8FA50014 */ lw $a1, 0x14($sp) -/* 4BB64 80070764 8FA60018 */ lw $a2, 0x18($sp) -/* 4BB68 80070768 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BB6C 8007076C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BB70 80070770 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BB74 80070774 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BB78 80070778 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BB7C 8007077C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BB80 80070780 3C018008 */ lui $at, %hi(gEffectTable+0x3A8) -/* 4BB84 80070784 8C21F5B8 */ lw $at, %lo(gEffectTable+0x3A8)($at) -/* 4BB88 80070788 00200008 */ jr $at -/* 4BB8C 8007078C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2A.s deleted file mode 100644 index 663e3357db..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_2A -/* 4BC50 80070850 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BC54 80070854 AFA40010 */ sw $a0, 0x10($sp) -/* 4BC58 80070858 AFA50014 */ sw $a1, 0x14($sp) -/* 4BC5C 8007085C AFA60018 */ sw $a2, 0x18($sp) -/* 4BC60 80070860 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BC64 80070864 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BC68 80070868 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BC6C 8007086C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BC70 80070870 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BC74 80070874 0C016959 */ jal load_effect -/* 4BC78 80070878 2404002A */ addiu $a0, $zero, 0x2a -/* 4BC7C 8007087C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BC80 80070880 8FA50014 */ lw $a1, 0x14($sp) -/* 4BC84 80070884 8FA60018 */ lw $a2, 0x18($sp) -/* 4BC88 80070888 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BC8C 8007088C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BC90 80070890 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BC94 80070894 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BC98 80070898 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BC9C 8007089C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BCA0 800708A0 3C018008 */ lui $at, %hi(gEffectTable+0x3F0) -/* 4BCA4 800708A4 8C21F600 */ lw $at, %lo(gEffectTable+0x3F0)($at) -/* 4BCA8 800708A8 00200008 */ jr $at -/* 4BCAC 800708AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2B.s deleted file mode 100644 index cca0c5b1fc..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_2B -/* 4BCB0 800708B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BCB4 800708B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4BCB8 800708B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4BCBC 800708BC AFA60018 */ sw $a2, 0x18($sp) -/* 4BCC0 800708C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BCC4 800708C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BCC8 800708C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BCCC 800708CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BCD0 800708D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BCD4 800708D4 0C016959 */ jal load_effect -/* 4BCD8 800708D8 2404002B */ addiu $a0, $zero, 0x2b -/* 4BCDC 800708DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4BCE0 800708E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4BCE4 800708E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4BCE8 800708E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BCEC 800708EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BCF0 800708F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BCF4 800708F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BCF8 800708F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BCFC 800708FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BD00 80070900 3C018008 */ lui $at, %hi(gEffectTable+0x408) -/* 4BD04 80070904 8C21F618 */ lw $at, %lo(gEffectTable+0x408)($at) -/* 4BD08 80070908 00200008 */ jr $at -/* 4BD0C 8007090C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2C.s deleted file mode 100644 index 490351431c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_2C -/* 4BD10 80070910 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BD14 80070914 AFA40010 */ sw $a0, 0x10($sp) -/* 4BD18 80070918 AFA50014 */ sw $a1, 0x14($sp) -/* 4BD1C 8007091C AFA60018 */ sw $a2, 0x18($sp) -/* 4BD20 80070920 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BD24 80070924 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BD28 80070928 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BD2C 8007092C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BD30 80070930 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BD34 80070934 0C016959 */ jal load_effect -/* 4BD38 80070938 2404002C */ addiu $a0, $zero, 0x2c -/* 4BD3C 8007093C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BD40 80070940 8FA50014 */ lw $a1, 0x14($sp) -/* 4BD44 80070944 8FA60018 */ lw $a2, 0x18($sp) -/* 4BD48 80070948 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BD4C 8007094C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BD50 80070950 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BD54 80070954 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BD58 80070958 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BD5C 8007095C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BD60 80070960 3C018008 */ lui $at, %hi(gEffectTable+0x420) -/* 4BD64 80070964 8C21F630 */ lw $at, %lo(gEffectTable+0x420)($at) -/* 4BD68 80070968 00200008 */ jr $at -/* 4BD6C 8007096C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2D.s deleted file mode 100644 index 7daff36def..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_2D -/* 4BD70 80070970 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BD74 80070974 AFA40010 */ sw $a0, 0x10($sp) -/* 4BD78 80070978 AFA50014 */ sw $a1, 0x14($sp) -/* 4BD7C 8007097C AFA60018 */ sw $a2, 0x18($sp) -/* 4BD80 80070980 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BD84 80070984 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BD88 80070988 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BD8C 8007098C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BD90 80070990 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BD94 80070994 0C016959 */ jal load_effect -/* 4BD98 80070998 2404002D */ addiu $a0, $zero, 0x2d -/* 4BD9C 8007099C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BDA0 800709A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4BDA4 800709A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4BDA8 800709A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BDAC 800709AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BDB0 800709B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BDB4 800709B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BDB8 800709B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BDBC 800709BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BDC0 800709C0 3C018008 */ lui $at, %hi(gEffectTable+0x438) -/* 4BDC4 800709C4 8C21F648 */ lw $at, %lo(gEffectTable+0x438)($at) -/* 4BDC8 800709C8 00200008 */ jr $at -/* 4BDCC 800709CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2E.s deleted file mode 100644 index 866d4789cb..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_2E -/* 4BDD0 800709D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BDD4 800709D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4BDD8 800709D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4BDDC 800709DC AFA60018 */ sw $a2, 0x18($sp) -/* 4BDE0 800709E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BDE4 800709E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BDE8 800709E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BDEC 800709EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BDF0 800709F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BDF4 800709F4 0C016959 */ jal load_effect -/* 4BDF8 800709F8 2404002E */ addiu $a0, $zero, 0x2e -/* 4BDFC 800709FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4BE00 80070A00 8FA50014 */ lw $a1, 0x14($sp) -/* 4BE04 80070A04 8FA60018 */ lw $a2, 0x18($sp) -/* 4BE08 80070A08 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BE0C 80070A0C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BE10 80070A10 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BE14 80070A14 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BE18 80070A18 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BE1C 80070A1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BE20 80070A20 3C018008 */ lui $at, %hi(gEffectTable+0x450) -/* 4BE24 80070A24 8C21F660 */ lw $at, %lo(gEffectTable+0x450)($at) -/* 4BE28 80070A28 00200008 */ jr $at -/* 4BE2C 80070A2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2F.s deleted file mode 100644 index 4e9dd11150..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_2F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_2F -/* 4BE30 80070A30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BE34 80070A34 AFA40010 */ sw $a0, 0x10($sp) -/* 4BE38 80070A38 AFA50014 */ sw $a1, 0x14($sp) -/* 4BE3C 80070A3C AFA60018 */ sw $a2, 0x18($sp) -/* 4BE40 80070A40 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BE44 80070A44 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BE48 80070A48 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BE4C 80070A4C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BE50 80070A50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BE54 80070A54 0C016959 */ jal load_effect -/* 4BE58 80070A58 2404002F */ addiu $a0, $zero, 0x2f -/* 4BE5C 80070A5C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BE60 80070A60 8FA50014 */ lw $a1, 0x14($sp) -/* 4BE64 80070A64 8FA60018 */ lw $a2, 0x18($sp) -/* 4BE68 80070A68 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BE6C 80070A6C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BE70 80070A70 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BE74 80070A74 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BE78 80070A78 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BE7C 80070A7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BE80 80070A80 3C018008 */ lui $at, %hi(gEffectTable+0x468) -/* 4BE84 80070A84 8C21F678 */ lw $at, %lo(gEffectTable+0x468)($at) -/* 4BE88 80070A88 00200008 */ jr $at -/* 4BE8C 80070A8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_30.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_30.s deleted file mode 100644 index c65f984d93..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_30 -/* 4BE90 80070A90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BE94 80070A94 AFA40010 */ sw $a0, 0x10($sp) -/* 4BE98 80070A98 AFA50014 */ sw $a1, 0x14($sp) -/* 4BE9C 80070A9C AFA60018 */ sw $a2, 0x18($sp) -/* 4BEA0 80070AA0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BEA4 80070AA4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BEA8 80070AA8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BEAC 80070AAC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BEB0 80070AB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BEB4 80070AB4 0C016959 */ jal load_effect -/* 4BEB8 80070AB8 24040030 */ addiu $a0, $zero, 0x30 -/* 4BEBC 80070ABC 8FA40010 */ lw $a0, 0x10($sp) -/* 4BEC0 80070AC0 8FA50014 */ lw $a1, 0x14($sp) -/* 4BEC4 80070AC4 8FA60018 */ lw $a2, 0x18($sp) -/* 4BEC8 80070AC8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BECC 80070ACC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BED0 80070AD0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BED4 80070AD4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BED8 80070AD8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BEDC 80070ADC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BEE0 80070AE0 3C018008 */ lui $at, %hi(gEffectTable+0x480) -/* 4BEE4 80070AE4 8C21F690 */ lw $at, %lo(gEffectTable+0x480)($at) -/* 4BEE8 80070AE8 00200008 */ jr $at -/* 4BEEC 80070AEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_31.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_31.s deleted file mode 100644 index a9c1d059d6..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_31.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_31 -/* 4BEF0 80070AF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BEF4 80070AF4 AFA40010 */ sw $a0, 0x10($sp) -/* 4BEF8 80070AF8 AFA50014 */ sw $a1, 0x14($sp) -/* 4BEFC 80070AFC AFA60018 */ sw $a2, 0x18($sp) -/* 4BF00 80070B00 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BF04 80070B04 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BF08 80070B08 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BF0C 80070B0C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BF10 80070B10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BF14 80070B14 0C016959 */ jal load_effect -/* 4BF18 80070B18 24040031 */ addiu $a0, $zero, 0x31 -/* 4BF1C 80070B1C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BF20 80070B20 8FA50014 */ lw $a1, 0x14($sp) -/* 4BF24 80070B24 8FA60018 */ lw $a2, 0x18($sp) -/* 4BF28 80070B28 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BF2C 80070B2C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BF30 80070B30 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BF34 80070B34 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BF38 80070B38 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BF3C 80070B3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BF40 80070B40 3C018008 */ lui $at, %hi(gEffectTable+0x498) -/* 4BF44 80070B44 8C21F6A8 */ lw $at, %lo(gEffectTable+0x498)($at) -/* 4BF48 80070B48 00200008 */ jr $at -/* 4BF4C 80070B4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_32.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_32.s deleted file mode 100644 index 7817c91ad4..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_32.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_32 -/* 4BF50 80070B50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BF54 80070B54 AFA40010 */ sw $a0, 0x10($sp) -/* 4BF58 80070B58 AFA50014 */ sw $a1, 0x14($sp) -/* 4BF5C 80070B5C AFA60018 */ sw $a2, 0x18($sp) -/* 4BF60 80070B60 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BF64 80070B64 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BF68 80070B68 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BF6C 80070B6C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BF70 80070B70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BF74 80070B74 0C016959 */ jal load_effect -/* 4BF78 80070B78 24040032 */ addiu $a0, $zero, 0x32 -/* 4BF7C 80070B7C 8FA40010 */ lw $a0, 0x10($sp) -/* 4BF80 80070B80 8FA50014 */ lw $a1, 0x14($sp) -/* 4BF84 80070B84 8FA60018 */ lw $a2, 0x18($sp) -/* 4BF88 80070B88 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BF8C 80070B8C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BF90 80070B90 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BF94 80070B94 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BF98 80070B98 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BF9C 80070B9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4BFA0 80070BA0 3C018008 */ lui $at, %hi(gEffectTable+0x4B0) -/* 4BFA4 80070BA4 8C21F6C0 */ lw $at, %lo(gEffectTable+0x4B0)($at) -/* 4BFA8 80070BA8 00200008 */ jr $at -/* 4BFAC 80070BAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_33.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_33.s deleted file mode 100644 index 033c1f4639..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_33.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_33 -/* 4BFB0 80070BB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4BFB4 80070BB4 AFA40010 */ sw $a0, 0x10($sp) -/* 4BFB8 80070BB8 AFA50014 */ sw $a1, 0x14($sp) -/* 4BFBC 80070BBC AFA60018 */ sw $a2, 0x18($sp) -/* 4BFC0 80070BC0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4BFC4 80070BC4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4BFC8 80070BC8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4BFCC 80070BCC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4BFD0 80070BD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4BFD4 80070BD4 0C016959 */ jal load_effect -/* 4BFD8 80070BD8 24040033 */ addiu $a0, $zero, 0x33 -/* 4BFDC 80070BDC 8FA40010 */ lw $a0, 0x10($sp) -/* 4BFE0 80070BE0 8FA50014 */ lw $a1, 0x14($sp) -/* 4BFE4 80070BE4 8FA60018 */ lw $a2, 0x18($sp) -/* 4BFE8 80070BE8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4BFEC 80070BEC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4BFF0 80070BF0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4BFF4 80070BF4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4BFF8 80070BF8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4BFFC 80070BFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C000 80070C00 3C018008 */ lui $at, %hi(gEffectTable+0x4C8) -/* 4C004 80070C04 8C21F6D8 */ lw $at, %lo(gEffectTable+0x4C8)($at) -/* 4C008 80070C08 00200008 */ jr $at -/* 4C00C 80070C0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_34.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_34.s deleted file mode 100644 index 290fde2f92..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_34.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_34 -/* 4C010 80070C10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C014 80070C14 AFA40010 */ sw $a0, 0x10($sp) -/* 4C018 80070C18 AFA50014 */ sw $a1, 0x14($sp) -/* 4C01C 80070C1C AFA60018 */ sw $a2, 0x18($sp) -/* 4C020 80070C20 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C024 80070C24 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C028 80070C28 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C02C 80070C2C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C030 80070C30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C034 80070C34 0C016959 */ jal load_effect -/* 4C038 80070C38 24040034 */ addiu $a0, $zero, 0x34 -/* 4C03C 80070C3C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C040 80070C40 8FA50014 */ lw $a1, 0x14($sp) -/* 4C044 80070C44 8FA60018 */ lw $a2, 0x18($sp) -/* 4C048 80070C48 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C04C 80070C4C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C050 80070C50 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C054 80070C54 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C058 80070C58 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C05C 80070C5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C060 80070C60 3C018008 */ lui $at, %hi(gEffectTable+0x4E0) -/* 4C064 80070C64 8C21F6F0 */ lw $at, %lo(gEffectTable+0x4E0)($at) -/* 4C068 80070C68 00200008 */ jr $at -/* 4C06C 80070C6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_35.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_35.s deleted file mode 100644 index 616923e9ba..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_35.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_35 -/* 4C070 80070C70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C074 80070C74 AFA40010 */ sw $a0, 0x10($sp) -/* 4C078 80070C78 AFA50014 */ sw $a1, 0x14($sp) -/* 4C07C 80070C7C AFA60018 */ sw $a2, 0x18($sp) -/* 4C080 80070C80 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C084 80070C84 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C088 80070C88 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C08C 80070C8C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C090 80070C90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C094 80070C94 0C016959 */ jal load_effect -/* 4C098 80070C98 24040035 */ addiu $a0, $zero, 0x35 -/* 4C09C 80070C9C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C0A0 80070CA0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C0A4 80070CA4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C0A8 80070CA8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C0AC 80070CAC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C0B0 80070CB0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C0B4 80070CB4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C0B8 80070CB8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C0BC 80070CBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C0C0 80070CC0 3C018008 */ lui $at, %hi(gEffectTable+0x4F8) -/* 4C0C4 80070CC4 8C21F708 */ lw $at, %lo(gEffectTable+0x4F8)($at) -/* 4C0C8 80070CC8 00200008 */ jr $at -/* 4C0CC 80070CCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_36.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_36.s deleted file mode 100644 index 4e6f9eb2cb..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_36.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_36 -/* 4C0D0 80070CD0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C0D4 80070CD4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C0D8 80070CD8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C0DC 80070CDC AFA60018 */ sw $a2, 0x18($sp) -/* 4C0E0 80070CE0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C0E4 80070CE4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C0E8 80070CE8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C0EC 80070CEC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C0F0 80070CF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C0F4 80070CF4 0C016959 */ jal load_effect -/* 4C0F8 80070CF8 24040036 */ addiu $a0, $zero, 0x36 -/* 4C0FC 80070CFC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C100 80070D00 8FA50014 */ lw $a1, 0x14($sp) -/* 4C104 80070D04 8FA60018 */ lw $a2, 0x18($sp) -/* 4C108 80070D08 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C10C 80070D0C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C110 80070D10 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C114 80070D14 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C118 80070D18 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C11C 80070D1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C120 80070D20 3C018008 */ lui $at, %hi(gEffectTable+0x510) -/* 4C124 80070D24 8C21F720 */ lw $at, %lo(gEffectTable+0x510)($at) -/* 4C128 80070D28 00200008 */ jr $at -/* 4C12C 80070D2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_37.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_37.s deleted file mode 100644 index 6482321491..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_37.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_37 -/* 4C130 80070D30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C134 80070D34 AFA40010 */ sw $a0, 0x10($sp) -/* 4C138 80070D38 AFA50014 */ sw $a1, 0x14($sp) -/* 4C13C 80070D3C AFA60018 */ sw $a2, 0x18($sp) -/* 4C140 80070D40 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C144 80070D44 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C148 80070D48 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C14C 80070D4C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C150 80070D50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C154 80070D54 0C016959 */ jal load_effect -/* 4C158 80070D58 24040037 */ addiu $a0, $zero, 0x37 -/* 4C15C 80070D5C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C160 80070D60 8FA50014 */ lw $a1, 0x14($sp) -/* 4C164 80070D64 8FA60018 */ lw $a2, 0x18($sp) -/* 4C168 80070D68 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C16C 80070D6C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C170 80070D70 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C174 80070D74 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C178 80070D78 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C17C 80070D7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C180 80070D80 3C018008 */ lui $at, %hi(gEffectTable+0x528) -/* 4C184 80070D84 8C21F738 */ lw $at, %lo(gEffectTable+0x528)($at) -/* 4C188 80070D88 00200008 */ jr $at -/* 4C18C 80070D8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_38.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_38.s deleted file mode 100644 index 7b7ee73e5c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_38.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_38 -/* 4C190 80070D90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C194 80070D94 AFA40010 */ sw $a0, 0x10($sp) -/* 4C198 80070D98 AFA50014 */ sw $a1, 0x14($sp) -/* 4C19C 80070D9C AFA60018 */ sw $a2, 0x18($sp) -/* 4C1A0 80070DA0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C1A4 80070DA4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C1A8 80070DA8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C1AC 80070DAC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C1B0 80070DB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C1B4 80070DB4 0C016959 */ jal load_effect -/* 4C1B8 80070DB8 24040038 */ addiu $a0, $zero, 0x38 -/* 4C1BC 80070DBC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C1C0 80070DC0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C1C4 80070DC4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C1C8 80070DC8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C1CC 80070DCC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C1D0 80070DD0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C1D4 80070DD4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C1D8 80070DD8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C1DC 80070DDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C1E0 80070DE0 3C018008 */ lui $at, %hi(gEffectTable+0x540) -/* 4C1E4 80070DE4 8C21F750 */ lw $at, %lo(gEffectTable+0x540)($at) -/* 4C1E8 80070DE8 00200008 */ jr $at -/* 4C1EC 80070DEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_39.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_39.s deleted file mode 100644 index 9c6fc52138..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_39.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_39 -/* 4C1F0 80070DF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C1F4 80070DF4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C1F8 80070DF8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C1FC 80070DFC AFA60018 */ sw $a2, 0x18($sp) -/* 4C200 80070E00 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C204 80070E04 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C208 80070E08 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C20C 80070E0C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C210 80070E10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C214 80070E14 0C016959 */ jal load_effect -/* 4C218 80070E18 24040039 */ addiu $a0, $zero, 0x39 -/* 4C21C 80070E1C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C220 80070E20 8FA50014 */ lw $a1, 0x14($sp) -/* 4C224 80070E24 8FA60018 */ lw $a2, 0x18($sp) -/* 4C228 80070E28 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C22C 80070E2C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C230 80070E30 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C234 80070E34 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C238 80070E38 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C23C 80070E3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C240 80070E40 3C018008 */ lui $at, %hi(gEffectTable+0x558) -/* 4C244 80070E44 8C21F768 */ lw $at, %lo(gEffectTable+0x558)($at) -/* 4C248 80070E48 00200008 */ jr $at -/* 4C24C 80070E4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3A.s deleted file mode 100644 index d57d38cc1e..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_3A -/* 4C250 80070E50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C254 80070E54 AFA40010 */ sw $a0, 0x10($sp) -/* 4C258 80070E58 AFA50014 */ sw $a1, 0x14($sp) -/* 4C25C 80070E5C AFA60018 */ sw $a2, 0x18($sp) -/* 4C260 80070E60 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C264 80070E64 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C268 80070E68 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C26C 80070E6C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C270 80070E70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C274 80070E74 0C016959 */ jal load_effect -/* 4C278 80070E78 2404003A */ addiu $a0, $zero, 0x3a -/* 4C27C 80070E7C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C280 80070E80 8FA50014 */ lw $a1, 0x14($sp) -/* 4C284 80070E84 8FA60018 */ lw $a2, 0x18($sp) -/* 4C288 80070E88 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C28C 80070E8C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C290 80070E90 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C294 80070E94 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C298 80070E98 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C29C 80070E9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C2A0 80070EA0 3C018008 */ lui $at, %hi(gEffectTable+0x570) -/* 4C2A4 80070EA4 8C21F780 */ lw $at, %lo(gEffectTable+0x570)($at) -/* 4C2A8 80070EA8 00200008 */ jr $at -/* 4C2AC 80070EAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3B.s deleted file mode 100644 index 6746c3d0c7..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_3B -/* 4C2B0 80070EB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C2B4 80070EB4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C2B8 80070EB8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C2BC 80070EBC AFA60018 */ sw $a2, 0x18($sp) -/* 4C2C0 80070EC0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C2C4 80070EC4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C2C8 80070EC8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C2CC 80070ECC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C2D0 80070ED0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C2D4 80070ED4 0C016959 */ jal load_effect -/* 4C2D8 80070ED8 2404003B */ addiu $a0, $zero, 0x3b -/* 4C2DC 80070EDC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C2E0 80070EE0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C2E4 80070EE4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C2E8 80070EE8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C2EC 80070EEC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C2F0 80070EF0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C2F4 80070EF4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C2F8 80070EF8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C2FC 80070EFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C300 80070F00 3C018008 */ lui $at, %hi(gEffectTable+0x588) -/* 4C304 80070F04 8C21F798 */ lw $at, %lo(gEffectTable+0x588)($at) -/* 4C308 80070F08 00200008 */ jr $at -/* 4C30C 80070F0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3C.s deleted file mode 100644 index 8cf97559e1..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_3C -/* 4C310 80070F10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C314 80070F14 AFA40010 */ sw $a0, 0x10($sp) -/* 4C318 80070F18 AFA50014 */ sw $a1, 0x14($sp) -/* 4C31C 80070F1C AFA60018 */ sw $a2, 0x18($sp) -/* 4C320 80070F20 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C324 80070F24 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C328 80070F28 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C32C 80070F2C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C330 80070F30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C334 80070F34 0C016959 */ jal load_effect -/* 4C338 80070F38 2404003C */ addiu $a0, $zero, 0x3c -/* 4C33C 80070F3C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C340 80070F40 8FA50014 */ lw $a1, 0x14($sp) -/* 4C344 80070F44 8FA60018 */ lw $a2, 0x18($sp) -/* 4C348 80070F48 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C34C 80070F4C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C350 80070F50 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C354 80070F54 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C358 80070F58 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C35C 80070F5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C360 80070F60 3C018008 */ lui $at, %hi(gEffectTable+0x5A0) -/* 4C364 80070F64 8C21F7B0 */ lw $at, %lo(gEffectTable+0x5A0)($at) -/* 4C368 80070F68 00200008 */ jr $at -/* 4C36C 80070F6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3D.s deleted file mode 100644 index 2e7c978072..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_3D -/* 4C370 80070F70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C374 80070F74 AFA40010 */ sw $a0, 0x10($sp) -/* 4C378 80070F78 AFA50014 */ sw $a1, 0x14($sp) -/* 4C37C 80070F7C AFA60018 */ sw $a2, 0x18($sp) -/* 4C380 80070F80 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C384 80070F84 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C388 80070F88 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C38C 80070F8C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C390 80070F90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C394 80070F94 0C016959 */ jal load_effect -/* 4C398 80070F98 2404003D */ addiu $a0, $zero, 0x3d -/* 4C39C 80070F9C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C3A0 80070FA0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C3A4 80070FA4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C3A8 80070FA8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C3AC 80070FAC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C3B0 80070FB0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C3B4 80070FB4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C3B8 80070FB8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C3BC 80070FBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C3C0 80070FC0 3C018008 */ lui $at, %hi(gEffectTable+0x5B8) -/* 4C3C4 80070FC4 8C21F7C8 */ lw $at, %lo(gEffectTable+0x5B8)($at) -/* 4C3C8 80070FC8 00200008 */ jr $at -/* 4C3CC 80070FCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3E.s deleted file mode 100644 index e2878bd20a..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_3E -/* 4C3D0 80070FD0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C3D4 80070FD4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C3D8 80070FD8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C3DC 80070FDC AFA60018 */ sw $a2, 0x18($sp) -/* 4C3E0 80070FE0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C3E4 80070FE4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C3E8 80070FE8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C3EC 80070FEC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C3F0 80070FF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C3F4 80070FF4 0C016959 */ jal load_effect -/* 4C3F8 80070FF8 2404003E */ addiu $a0, $zero, 0x3e -/* 4C3FC 80070FFC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C400 80071000 8FA50014 */ lw $a1, 0x14($sp) -/* 4C404 80071004 8FA60018 */ lw $a2, 0x18($sp) -/* 4C408 80071008 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C40C 8007100C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C410 80071010 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C414 80071014 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C418 80071018 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C41C 8007101C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C420 80071020 3C018008 */ lui $at, %hi(gEffectTable+0x5D0) -/* 4C424 80071024 8C21F7E0 */ lw $at, %lo(gEffectTable+0x5D0)($at) -/* 4C428 80071028 00200008 */ jr $at -/* 4C42C 8007102C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3F.s deleted file mode 100644 index 7a32d73210..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_3F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_3F -/* 4C430 80071030 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C434 80071034 AFA40010 */ sw $a0, 0x10($sp) -/* 4C438 80071038 AFA50014 */ sw $a1, 0x14($sp) -/* 4C43C 8007103C AFA60018 */ sw $a2, 0x18($sp) -/* 4C440 80071040 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C444 80071044 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C448 80071048 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C44C 8007104C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C450 80071050 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C454 80071054 0C016959 */ jal load_effect -/* 4C458 80071058 2404003F */ addiu $a0, $zero, 0x3f -/* 4C45C 8007105C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C460 80071060 8FA50014 */ lw $a1, 0x14($sp) -/* 4C464 80071064 8FA60018 */ lw $a2, 0x18($sp) -/* 4C468 80071068 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C46C 8007106C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C470 80071070 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C474 80071074 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C478 80071078 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C47C 8007107C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C480 80071080 3C018008 */ lui $at, %hi(gEffectTable+0x5E8) -/* 4C484 80071084 8C21F7F8 */ lw $at, %lo(gEffectTable+0x5E8)($at) -/* 4C488 80071088 00200008 */ jr $at -/* 4C48C 8007108C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_40.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_40.s deleted file mode 100644 index 3444309e4b..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_40.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_40 -/* 4C490 80071090 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C494 80071094 AFA40010 */ sw $a0, 0x10($sp) -/* 4C498 80071098 AFA50014 */ sw $a1, 0x14($sp) -/* 4C49C 8007109C AFA60018 */ sw $a2, 0x18($sp) -/* 4C4A0 800710A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C4A4 800710A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C4A8 800710A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C4AC 800710AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C4B0 800710B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C4B4 800710B4 0C016959 */ jal load_effect -/* 4C4B8 800710B8 24040040 */ addiu $a0, $zero, 0x40 -/* 4C4BC 800710BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C4C0 800710C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C4C4 800710C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C4C8 800710C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C4CC 800710CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C4D0 800710D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C4D4 800710D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C4D8 800710D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C4DC 800710DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C4E0 800710E0 3C018008 */ lui $at, %hi(gEffectTable+0x600) -/* 4C4E4 800710E4 8C21F810 */ lw $at, %lo(gEffectTable+0x600)($at) -/* 4C4E8 800710E8 00200008 */ jr $at -/* 4C4EC 800710EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_41.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_41.s deleted file mode 100644 index 653b0dcdcc..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_41.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_41 -/* 4C4F0 800710F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C4F4 800710F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C4F8 800710F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C4FC 800710FC AFA60018 */ sw $a2, 0x18($sp) -/* 4C500 80071100 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C504 80071104 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C508 80071108 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C50C 8007110C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C510 80071110 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C514 80071114 0C016959 */ jal load_effect -/* 4C518 80071118 24040041 */ addiu $a0, $zero, 0x41 -/* 4C51C 8007111C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C520 80071120 8FA50014 */ lw $a1, 0x14($sp) -/* 4C524 80071124 8FA60018 */ lw $a2, 0x18($sp) -/* 4C528 80071128 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C52C 8007112C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C530 80071130 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C534 80071134 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C538 80071138 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C53C 8007113C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C540 80071140 3C018008 */ lui $at, %hi(gEffectTable+0x618) -/* 4C544 80071144 8C21F828 */ lw $at, %lo(gEffectTable+0x618)($at) -/* 4C548 80071148 00200008 */ jr $at -/* 4C54C 8007114C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_42.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_42.s deleted file mode 100644 index 4be51cb508..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_42.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_42 -/* 4C550 80071150 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C554 80071154 AFA40010 */ sw $a0, 0x10($sp) -/* 4C558 80071158 AFA50014 */ sw $a1, 0x14($sp) -/* 4C55C 8007115C AFA60018 */ sw $a2, 0x18($sp) -/* 4C560 80071160 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C564 80071164 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C568 80071168 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C56C 8007116C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C570 80071170 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C574 80071174 0C016959 */ jal load_effect -/* 4C578 80071178 24040042 */ addiu $a0, $zero, 0x42 -/* 4C57C 8007117C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C580 80071180 8FA50014 */ lw $a1, 0x14($sp) -/* 4C584 80071184 8FA60018 */ lw $a2, 0x18($sp) -/* 4C588 80071188 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C58C 8007118C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C590 80071190 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C594 80071194 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C598 80071198 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C59C 8007119C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C5A0 800711A0 3C018008 */ lui $at, %hi(gEffectTable+0x630) -/* 4C5A4 800711A4 8C21F840 */ lw $at, %lo(gEffectTable+0x630)($at) -/* 4C5A8 800711A8 00200008 */ jr $at -/* 4C5AC 800711AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_43.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_43.s deleted file mode 100644 index 985207dfe2..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_43.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_43 -/* 4C5B0 800711B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C5B4 800711B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C5B8 800711B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C5BC 800711BC AFA60018 */ sw $a2, 0x18($sp) -/* 4C5C0 800711C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C5C4 800711C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C5C8 800711C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C5CC 800711CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C5D0 800711D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C5D4 800711D4 0C016959 */ jal load_effect -/* 4C5D8 800711D8 24040043 */ addiu $a0, $zero, 0x43 -/* 4C5DC 800711DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C5E0 800711E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C5E4 800711E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C5E8 800711E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C5EC 800711EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C5F0 800711F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C5F4 800711F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C5F8 800711F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C5FC 800711FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C600 80071200 3C018008 */ lui $at, %hi(gEffectTable+0x648) -/* 4C604 80071204 8C21F858 */ lw $at, %lo(gEffectTable+0x648)($at) -/* 4C608 80071208 00200008 */ jr $at -/* 4C60C 8007120C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_44.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_44.s deleted file mode 100644 index 304457bbc8..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_44.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_44 -/* 4C610 80071210 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C614 80071214 AFA40010 */ sw $a0, 0x10($sp) -/* 4C618 80071218 AFA50014 */ sw $a1, 0x14($sp) -/* 4C61C 8007121C AFA60018 */ sw $a2, 0x18($sp) -/* 4C620 80071220 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C624 80071224 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C628 80071228 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C62C 8007122C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C630 80071230 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C634 80071234 0C016959 */ jal load_effect -/* 4C638 80071238 24040044 */ addiu $a0, $zero, 0x44 -/* 4C63C 8007123C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C640 80071240 8FA50014 */ lw $a1, 0x14($sp) -/* 4C644 80071244 8FA60018 */ lw $a2, 0x18($sp) -/* 4C648 80071248 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C64C 8007124C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C650 80071250 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C654 80071254 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C658 80071258 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C65C 8007125C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C660 80071260 3C018008 */ lui $at, %hi(gEffectTable+0x660) -/* 4C664 80071264 8C21F870 */ lw $at, %lo(gEffectTable+0x660)($at) -/* 4C668 80071268 00200008 */ jr $at -/* 4C66C 8007126C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_45.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_45.s deleted file mode 100644 index 99e53a5954..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_45.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_45 -/* 4C670 80071270 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C674 80071274 AFA40010 */ sw $a0, 0x10($sp) -/* 4C678 80071278 AFA50014 */ sw $a1, 0x14($sp) -/* 4C67C 8007127C AFA60018 */ sw $a2, 0x18($sp) -/* 4C680 80071280 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C684 80071284 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C688 80071288 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C68C 8007128C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C690 80071290 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C694 80071294 0C016959 */ jal load_effect -/* 4C698 80071298 24040045 */ addiu $a0, $zero, 0x45 -/* 4C69C 8007129C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C6A0 800712A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C6A4 800712A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C6A8 800712A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C6AC 800712AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C6B0 800712B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C6B4 800712B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C6B8 800712B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C6BC 800712BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C6C0 800712C0 3C018008 */ lui $at, %hi(gEffectTable+0x678) -/* 4C6C4 800712C4 8C21F888 */ lw $at, %lo(gEffectTable+0x678)($at) -/* 4C6C8 800712C8 00200008 */ jr $at -/* 4C6CC 800712CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_46_whirlwind.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_46_whirlwind.s deleted file mode 100644 index 86a376c690..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_46_whirlwind.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_46_whirlwind -/* 4C6D0 800712D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C6D4 800712D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C6D8 800712D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C6DC 800712DC AFA60018 */ sw $a2, 0x18($sp) -/* 4C6E0 800712E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C6E4 800712E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C6E8 800712E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C6EC 800712EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C6F0 800712F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C6F4 800712F4 0C016959 */ jal load_effect -/* 4C6F8 800712F8 24040046 */ addiu $a0, $zero, 0x46 -/* 4C6FC 800712FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C700 80071300 8FA50014 */ lw $a1, 0x14($sp) -/* 4C704 80071304 8FA60018 */ lw $a2, 0x18($sp) -/* 4C708 80071308 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C70C 8007130C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C710 80071310 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C714 80071314 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C718 80071318 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C71C 8007131C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C720 80071320 3C018008 */ lui $at, %hi(gEffectTable+0x690) -/* 4C724 80071324 8C21F8A0 */ lw $at, %lo(gEffectTable+0x690)($at) -/* 4C728 80071328 00200008 */ jr $at -/* 4C72C 8007132C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_47.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_47.s deleted file mode 100644 index 5de5e9e458..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_47.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_47 -/* 4C730 80071330 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C734 80071334 AFA40010 */ sw $a0, 0x10($sp) -/* 4C738 80071338 AFA50014 */ sw $a1, 0x14($sp) -/* 4C73C 8007133C AFA60018 */ sw $a2, 0x18($sp) -/* 4C740 80071340 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C744 80071344 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C748 80071348 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C74C 8007134C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C750 80071350 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C754 80071354 0C016959 */ jal load_effect -/* 4C758 80071358 24040047 */ addiu $a0, $zero, 0x47 -/* 4C75C 8007135C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C760 80071360 8FA50014 */ lw $a1, 0x14($sp) -/* 4C764 80071364 8FA60018 */ lw $a2, 0x18($sp) -/* 4C768 80071368 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C76C 8007136C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C770 80071370 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C774 80071374 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C778 80071378 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C77C 8007137C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C780 80071380 3C018008 */ lui $at, %hi(gEffectTable+0x6A8) -/* 4C784 80071384 8C21F8B8 */ lw $at, %lo(gEffectTable+0x6A8)($at) -/* 4C788 80071388 00200008 */ jr $at -/* 4C78C 8007138C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_48.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_48.s deleted file mode 100644 index 02e74525eb..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_48.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_48 -/* 4C790 80071390 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C794 80071394 AFA40010 */ sw $a0, 0x10($sp) -/* 4C798 80071398 AFA50014 */ sw $a1, 0x14($sp) -/* 4C79C 8007139C AFA60018 */ sw $a2, 0x18($sp) -/* 4C7A0 800713A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C7A4 800713A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C7A8 800713A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C7AC 800713AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C7B0 800713B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C7B4 800713B4 0C016959 */ jal load_effect -/* 4C7B8 800713B8 24040048 */ addiu $a0, $zero, 0x48 -/* 4C7BC 800713BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C7C0 800713C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C7C4 800713C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C7C8 800713C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C7CC 800713CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C7D0 800713D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C7D4 800713D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C7D8 800713D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C7DC 800713DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C7E0 800713E0 3C018008 */ lui $at, %hi(gEffectTable+0x6C0) -/* 4C7E4 800713E4 8C21F8D0 */ lw $at, %lo(gEffectTable+0x6C0)($at) -/* 4C7E8 800713E8 00200008 */ jr $at -/* 4C7EC 800713EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_49.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_49.s deleted file mode 100644 index 734153451d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_49.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_49 -/* 4C7F0 800713F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C7F4 800713F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C7F8 800713F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C7FC 800713FC AFA60018 */ sw $a2, 0x18($sp) -/* 4C800 80071400 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C804 80071404 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C808 80071408 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C80C 8007140C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C810 80071410 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C814 80071414 0C016959 */ jal load_effect -/* 4C818 80071418 24040049 */ addiu $a0, $zero, 0x49 -/* 4C81C 8007141C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C820 80071420 8FA50014 */ lw $a1, 0x14($sp) -/* 4C824 80071424 8FA60018 */ lw $a2, 0x18($sp) -/* 4C828 80071428 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C82C 8007142C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C830 80071430 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C834 80071434 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C838 80071438 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C83C 8007143C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C840 80071440 3C018008 */ lui $at, %hi(gEffectTable+0x6D8) -/* 4C844 80071444 8C21F8E8 */ lw $at, %lo(gEffectTable+0x6D8)($at) -/* 4C848 80071448 00200008 */ jr $at -/* 4C84C 8007144C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4A.s deleted file mode 100644 index 5954a3e03c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_4A -/* 4C850 80071450 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C854 80071454 AFA40010 */ sw $a0, 0x10($sp) -/* 4C858 80071458 AFA50014 */ sw $a1, 0x14($sp) -/* 4C85C 8007145C AFA60018 */ sw $a2, 0x18($sp) -/* 4C860 80071460 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C864 80071464 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C868 80071468 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C86C 8007146C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C870 80071470 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C874 80071474 0C016959 */ jal load_effect -/* 4C878 80071478 2404004A */ addiu $a0, $zero, 0x4a -/* 4C87C 8007147C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C880 80071480 8FA50014 */ lw $a1, 0x14($sp) -/* 4C884 80071484 8FA60018 */ lw $a2, 0x18($sp) -/* 4C888 80071488 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C88C 8007148C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C890 80071490 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C894 80071494 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C898 80071498 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C89C 8007149C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C8A0 800714A0 3C018008 */ lui $at, %hi(gEffectTable+0x6F0) -/* 4C8A4 800714A4 8C21F900 */ lw $at, %lo(gEffectTable+0x6F0)($at) -/* 4C8A8 800714A8 00200008 */ jr $at -/* 4C8AC 800714AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4B.s deleted file mode 100644 index f0bdff08c5..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_4B -/* 4C8B0 800714B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C8B4 800714B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C8B8 800714B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C8BC 800714BC AFA60018 */ sw $a2, 0x18($sp) -/* 4C8C0 800714C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C8C4 800714C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C8C8 800714C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C8CC 800714CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C8D0 800714D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C8D4 800714D4 0C016959 */ jal load_effect -/* 4C8D8 800714D8 2404004B */ addiu $a0, $zero, 0x4b -/* 4C8DC 800714DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4C8E0 800714E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C8E4 800714E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C8E8 800714E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C8EC 800714EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C8F0 800714F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C8F4 800714F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C8F8 800714F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C8FC 800714FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C900 80071500 3C018008 */ lui $at, %hi(gEffectTable+0x708) -/* 4C904 80071504 8C21F918 */ lw $at, %lo(gEffectTable+0x708)($at) -/* 4C908 80071508 00200008 */ jr $at -/* 4C90C 8007150C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4C.s deleted file mode 100644 index bd2282294c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_4C -/* 4C910 80071510 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C914 80071514 AFA40010 */ sw $a0, 0x10($sp) -/* 4C918 80071518 AFA50014 */ sw $a1, 0x14($sp) -/* 4C91C 8007151C AFA60018 */ sw $a2, 0x18($sp) -/* 4C920 80071520 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C924 80071524 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C928 80071528 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C92C 8007152C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C930 80071530 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C934 80071534 0C016959 */ jal load_effect -/* 4C938 80071538 2404004C */ addiu $a0, $zero, 0x4c -/* 4C93C 8007153C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C940 80071540 8FA50014 */ lw $a1, 0x14($sp) -/* 4C944 80071544 8FA60018 */ lw $a2, 0x18($sp) -/* 4C948 80071548 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C94C 8007154C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C950 80071550 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C954 80071554 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C958 80071558 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C95C 8007155C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C960 80071560 3C018008 */ lui $at, %hi(gEffectTable+0x720) -/* 4C964 80071564 8C21F930 */ lw $at, %lo(gEffectTable+0x720)($at) -/* 4C968 80071568 00200008 */ jr $at -/* 4C96C 8007156C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4D.s deleted file mode 100644 index 47154473b0..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_4D -/* 4C970 80071570 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C974 80071574 AFA40010 */ sw $a0, 0x10($sp) -/* 4C978 80071578 AFA50014 */ sw $a1, 0x14($sp) -/* 4C97C 8007157C AFA60018 */ sw $a2, 0x18($sp) -/* 4C980 80071580 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C984 80071584 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C988 80071588 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C98C 8007158C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C990 80071590 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C994 80071594 0C016959 */ jal load_effect -/* 4C998 80071598 2404004D */ addiu $a0, $zero, 0x4d -/* 4C99C 8007159C 8FA40010 */ lw $a0, 0x10($sp) -/* 4C9A0 800715A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4C9A4 800715A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4C9A8 800715A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4C9AC 800715AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4C9B0 800715B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4C9B4 800715B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4C9B8 800715B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4C9BC 800715BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4C9C0 800715C0 3C018008 */ lui $at, %hi(gEffectTable+0x738) -/* 4C9C4 800715C4 8C21F948 */ lw $at, %lo(gEffectTable+0x738)($at) -/* 4C9C8 800715C8 00200008 */ jr $at -/* 4C9CC 800715CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4E.s deleted file mode 100644 index e1eb0afc63..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_4E -/* 4C9D0 800715D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4C9D4 800715D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4C9D8 800715D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4C9DC 800715DC AFA60018 */ sw $a2, 0x18($sp) -/* 4C9E0 800715E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4C9E4 800715E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4C9E8 800715E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4C9EC 800715EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4C9F0 800715F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4C9F4 800715F4 0C016959 */ jal load_effect -/* 4C9F8 800715F8 2404004E */ addiu $a0, $zero, 0x4e -/* 4C9FC 800715FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4CA00 80071600 8FA50014 */ lw $a1, 0x14($sp) -/* 4CA04 80071604 8FA60018 */ lw $a2, 0x18($sp) -/* 4CA08 80071608 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CA0C 8007160C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CA10 80071610 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CA14 80071614 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CA18 80071618 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CA1C 8007161C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CA20 80071620 3C018008 */ lui $at, %hi(gEffectTable+0x750) -/* 4CA24 80071624 8C21F960 */ lw $at, %lo(gEffectTable+0x750)($at) -/* 4CA28 80071628 00200008 */ jr $at -/* 4CA2C 8007162C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4F.s deleted file mode 100644 index d61c947bb3..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_4F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_4F -/* 4CA30 80071630 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CA34 80071634 AFA40010 */ sw $a0, 0x10($sp) -/* 4CA38 80071638 AFA50014 */ sw $a1, 0x14($sp) -/* 4CA3C 8007163C AFA60018 */ sw $a2, 0x18($sp) -/* 4CA40 80071640 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CA44 80071644 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CA48 80071648 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CA4C 8007164C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CA50 80071650 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CA54 80071654 0C016959 */ jal load_effect -/* 4CA58 80071658 2404004F */ addiu $a0, $zero, 0x4f -/* 4CA5C 8007165C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CA60 80071660 8FA50014 */ lw $a1, 0x14($sp) -/* 4CA64 80071664 8FA60018 */ lw $a2, 0x18($sp) -/* 4CA68 80071668 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CA6C 8007166C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CA70 80071670 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CA74 80071674 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CA78 80071678 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CA7C 8007167C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CA80 80071680 3C018008 */ lui $at, %hi(gEffectTable+0x768) -/* 4CA84 80071684 8C21F978 */ lw $at, %lo(gEffectTable+0x768)($at) -/* 4CA88 80071688 00200008 */ jr $at -/* 4CA8C 8007168C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_50.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_50.s deleted file mode 100644 index 45be0bf2cb..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_50.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_50 -/* 4CA90 80071690 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CA94 80071694 AFA40010 */ sw $a0, 0x10($sp) -/* 4CA98 80071698 AFA50014 */ sw $a1, 0x14($sp) -/* 4CA9C 8007169C AFA60018 */ sw $a2, 0x18($sp) -/* 4CAA0 800716A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CAA4 800716A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CAA8 800716A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CAAC 800716AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CAB0 800716B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CAB4 800716B4 0C016959 */ jal load_effect -/* 4CAB8 800716B8 24040050 */ addiu $a0, $zero, 0x50 -/* 4CABC 800716BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4CAC0 800716C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4CAC4 800716C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4CAC8 800716C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CACC 800716CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CAD0 800716D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CAD4 800716D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CAD8 800716D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CADC 800716DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CAE0 800716E0 3C018008 */ lui $at, %hi(gEffectTable+0x780) -/* 4CAE4 800716E4 8C21F990 */ lw $at, %lo(gEffectTable+0x780)($at) -/* 4CAE8 800716E8 00200008 */ jr $at -/* 4CAEC 800716EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_51.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_51.s deleted file mode 100644 index 793d03864c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_51.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_51 -/* 4CAF0 800716F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CAF4 800716F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4CAF8 800716F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4CAFC 800716FC AFA60018 */ sw $a2, 0x18($sp) -/* 4CB00 80071700 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CB04 80071704 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CB08 80071708 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CB0C 8007170C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CB10 80071710 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CB14 80071714 0C016959 */ jal load_effect -/* 4CB18 80071718 24040051 */ addiu $a0, $zero, 0x51 -/* 4CB1C 8007171C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CB20 80071720 8FA50014 */ lw $a1, 0x14($sp) -/* 4CB24 80071724 8FA60018 */ lw $a2, 0x18($sp) -/* 4CB28 80071728 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CB2C 8007172C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CB30 80071730 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CB34 80071734 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CB38 80071738 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CB3C 8007173C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CB40 80071740 3C018008 */ lui $at, %hi(gEffectTable+0x798) -/* 4CB44 80071744 8C21F9A8 */ lw $at, %lo(gEffectTable+0x798)($at) -/* 4CB48 80071748 00200008 */ jr $at -/* 4CB4C 8007174C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_52.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_52.s deleted file mode 100644 index 65cceb7073..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_52.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_52 -/* 4CB50 80071750 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CB54 80071754 AFA40010 */ sw $a0, 0x10($sp) -/* 4CB58 80071758 AFA50014 */ sw $a1, 0x14($sp) -/* 4CB5C 8007175C AFA60018 */ sw $a2, 0x18($sp) -/* 4CB60 80071760 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CB64 80071764 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CB68 80071768 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CB6C 8007176C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CB70 80071770 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CB74 80071774 0C016959 */ jal load_effect -/* 4CB78 80071778 24040052 */ addiu $a0, $zero, 0x52 -/* 4CB7C 8007177C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CB80 80071780 8FA50014 */ lw $a1, 0x14($sp) -/* 4CB84 80071784 8FA60018 */ lw $a2, 0x18($sp) -/* 4CB88 80071788 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CB8C 8007178C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CB90 80071790 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CB94 80071794 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CB98 80071798 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CB9C 8007179C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CBA0 800717A0 3C018008 */ lui $at, %hi(gEffectTable+0x7B0) -/* 4CBA4 800717A4 8C21F9C0 */ lw $at, %lo(gEffectTable+0x7B0)($at) -/* 4CBA8 800717A8 00200008 */ jr $at -/* 4CBAC 800717AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_53.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_53.s deleted file mode 100644 index 4f3bb731d2..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_53.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_53 -/* 4CBB0 800717B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CBB4 800717B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4CBB8 800717B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4CBBC 800717BC AFA60018 */ sw $a2, 0x18($sp) -/* 4CBC0 800717C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CBC4 800717C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CBC8 800717C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CBCC 800717CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CBD0 800717D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CBD4 800717D4 0C016959 */ jal load_effect -/* 4CBD8 800717D8 24040053 */ addiu $a0, $zero, 0x53 -/* 4CBDC 800717DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4CBE0 800717E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4CBE4 800717E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4CBE8 800717E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CBEC 800717EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CBF0 800717F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CBF4 800717F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CBF8 800717F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CBFC 800717FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CC00 80071800 3C018008 */ lui $at, %hi(gEffectTable+0x7C8) -/* 4CC04 80071804 8C21F9D8 */ lw $at, %lo(gEffectTable+0x7C8)($at) -/* 4CC08 80071808 00200008 */ jr $at -/* 4CC0C 8007180C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_54.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_54.s deleted file mode 100644 index eb64c60152..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_54.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_54 -/* 4CC10 80071810 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CC14 80071814 AFA40010 */ sw $a0, 0x10($sp) -/* 4CC18 80071818 AFA50014 */ sw $a1, 0x14($sp) -/* 4CC1C 8007181C AFA60018 */ sw $a2, 0x18($sp) -/* 4CC20 80071820 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CC24 80071824 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CC28 80071828 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CC2C 8007182C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CC30 80071830 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CC34 80071834 0C016959 */ jal load_effect -/* 4CC38 80071838 24040054 */ addiu $a0, $zero, 0x54 -/* 4CC3C 8007183C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CC40 80071840 8FA50014 */ lw $a1, 0x14($sp) -/* 4CC44 80071844 8FA60018 */ lw $a2, 0x18($sp) -/* 4CC48 80071848 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CC4C 8007184C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CC50 80071850 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CC54 80071854 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CC58 80071858 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CC5C 8007185C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CC60 80071860 3C018008 */ lui $at, %hi(gEffectTable+0x7E0) -/* 4CC64 80071864 8C21F9F0 */ lw $at, %lo(gEffectTable+0x7E0)($at) -/* 4CC68 80071868 00200008 */ jr $at -/* 4CC6C 8007186C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_55.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_55.s deleted file mode 100644 index 80b2325d8f..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_55.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_55 -/* 4CC70 80071870 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CC74 80071874 AFA40010 */ sw $a0, 0x10($sp) -/* 4CC78 80071878 AFA50014 */ sw $a1, 0x14($sp) -/* 4CC7C 8007187C AFA60018 */ sw $a2, 0x18($sp) -/* 4CC80 80071880 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CC84 80071884 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CC88 80071888 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CC8C 8007188C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CC90 80071890 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CC94 80071894 0C016959 */ jal load_effect -/* 4CC98 80071898 24040055 */ addiu $a0, $zero, 0x55 -/* 4CC9C 8007189C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CCA0 800718A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4CCA4 800718A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4CCA8 800718A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CCAC 800718AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CCB0 800718B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CCB4 800718B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CCB8 800718B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CCBC 800718BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CCC0 800718C0 3C018008 */ lui $at, %hi(gEffectTable+0x7F8) -/* 4CCC4 800718C4 8C21FA08 */ lw $at, %lo(gEffectTable+0x7F8)($at) -/* 4CCC8 800718C8 00200008 */ jr $at -/* 4CCCC 800718CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_56.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_56.s deleted file mode 100644 index 7d28a9a04d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_56.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_56 -/* 4CCD0 800718D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CCD4 800718D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4CCD8 800718D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4CCDC 800718DC AFA60018 */ sw $a2, 0x18($sp) -/* 4CCE0 800718E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CCE4 800718E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CCE8 800718E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CCEC 800718EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CCF0 800718F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CCF4 800718F4 0C016959 */ jal load_effect -/* 4CCF8 800718F8 24040056 */ addiu $a0, $zero, 0x56 -/* 4CCFC 800718FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4CD00 80071900 8FA50014 */ lw $a1, 0x14($sp) -/* 4CD04 80071904 8FA60018 */ lw $a2, 0x18($sp) -/* 4CD08 80071908 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CD0C 8007190C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CD10 80071910 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CD14 80071914 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CD18 80071918 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CD1C 8007191C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CD20 80071920 3C018008 */ lui $at, %hi(gEffectTable+0x810) -/* 4CD24 80071924 8C21FA20 */ lw $at, %lo(gEffectTable+0x810)($at) -/* 4CD28 80071928 00200008 */ jr $at -/* 4CD2C 8007192C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_57.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_57.s deleted file mode 100644 index 0397bff991..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_57.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_57 -/* 4CD30 80071930 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CD34 80071934 AFA40010 */ sw $a0, 0x10($sp) -/* 4CD38 80071938 AFA50014 */ sw $a1, 0x14($sp) -/* 4CD3C 8007193C AFA60018 */ sw $a2, 0x18($sp) -/* 4CD40 80071940 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CD44 80071944 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CD48 80071948 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CD4C 8007194C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CD50 80071950 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CD54 80071954 0C016959 */ jal load_effect -/* 4CD58 80071958 24040057 */ addiu $a0, $zero, 0x57 -/* 4CD5C 8007195C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CD60 80071960 8FA50014 */ lw $a1, 0x14($sp) -/* 4CD64 80071964 8FA60018 */ lw $a2, 0x18($sp) -/* 4CD68 80071968 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CD6C 8007196C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CD70 80071970 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CD74 80071974 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CD78 80071978 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CD7C 8007197C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CD80 80071980 3C018008 */ lui $at, %hi(gEffectTable+0x828) -/* 4CD84 80071984 8C21FA38 */ lw $at, %lo(gEffectTable+0x828)($at) -/* 4CD88 80071988 00200008 */ jr $at -/* 4CD8C 8007198C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_58.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_58.s deleted file mode 100644 index b14212424e..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_58.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_58 -/* 4CD90 80071990 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CD94 80071994 AFA40010 */ sw $a0, 0x10($sp) -/* 4CD98 80071998 AFA50014 */ sw $a1, 0x14($sp) -/* 4CD9C 8007199C AFA60018 */ sw $a2, 0x18($sp) -/* 4CDA0 800719A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CDA4 800719A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CDA8 800719A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CDAC 800719AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CDB0 800719B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CDB4 800719B4 0C016959 */ jal load_effect -/* 4CDB8 800719B8 24040058 */ addiu $a0, $zero, 0x58 -/* 4CDBC 800719BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4CDC0 800719C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4CDC4 800719C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4CDC8 800719C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CDCC 800719CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CDD0 800719D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CDD4 800719D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CDD8 800719D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CDDC 800719DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CDE0 800719E0 3C018008 */ lui $at, %hi(gEffectTable+0x840) -/* 4CDE4 800719E4 8C21FA50 */ lw $at, %lo(gEffectTable+0x840)($at) -/* 4CDE8 800719E8 00200008 */ jr $at -/* 4CDEC 800719EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_59.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_59.s deleted file mode 100644 index 6c9bd2083f..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_59.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_59 -/* 4CDF0 800719F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CDF4 800719F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4CDF8 800719F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4CDFC 800719FC AFA60018 */ sw $a2, 0x18($sp) -/* 4CE00 80071A00 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CE04 80071A04 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CE08 80071A08 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CE0C 80071A0C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CE10 80071A10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CE14 80071A14 0C016959 */ jal load_effect -/* 4CE18 80071A18 24040059 */ addiu $a0, $zero, 0x59 -/* 4CE1C 80071A1C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CE20 80071A20 8FA50014 */ lw $a1, 0x14($sp) -/* 4CE24 80071A24 8FA60018 */ lw $a2, 0x18($sp) -/* 4CE28 80071A28 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CE2C 80071A2C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CE30 80071A30 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CE34 80071A34 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CE38 80071A38 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CE3C 80071A3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CE40 80071A40 3C018008 */ lui $at, %hi(gEffectTable+0x858) -/* 4CE44 80071A44 8C21FA68 */ lw $at, %lo(gEffectTable+0x858)($at) -/* 4CE48 80071A48 00200008 */ jr $at -/* 4CE4C 80071A4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5A.s deleted file mode 100644 index bc7d7b3234..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_5A -/* 4CE50 80071A50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CE54 80071A54 AFA40010 */ sw $a0, 0x10($sp) -/* 4CE58 80071A58 AFA50014 */ sw $a1, 0x14($sp) -/* 4CE5C 80071A5C AFA60018 */ sw $a2, 0x18($sp) -/* 4CE60 80071A60 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CE64 80071A64 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CE68 80071A68 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CE6C 80071A6C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CE70 80071A70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CE74 80071A74 0C016959 */ jal load_effect -/* 4CE78 80071A78 2404005A */ addiu $a0, $zero, 0x5a -/* 4CE7C 80071A7C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CE80 80071A80 8FA50014 */ lw $a1, 0x14($sp) -/* 4CE84 80071A84 8FA60018 */ lw $a2, 0x18($sp) -/* 4CE88 80071A88 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CE8C 80071A8C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CE90 80071A90 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CE94 80071A94 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CE98 80071A98 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CE9C 80071A9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CEA0 80071AA0 3C018008 */ lui $at, %hi(gEffectTable+0x870) -/* 4CEA4 80071AA4 8C21FA80 */ lw $at, %lo(gEffectTable+0x870)($at) -/* 4CEA8 80071AA8 00200008 */ jr $at -/* 4CEAC 80071AAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5B.s deleted file mode 100644 index 398a827d5a..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_5B -/* 4CEB0 80071AB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CEB4 80071AB4 AFA40010 */ sw $a0, 0x10($sp) -/* 4CEB8 80071AB8 AFA50014 */ sw $a1, 0x14($sp) -/* 4CEBC 80071ABC AFA60018 */ sw $a2, 0x18($sp) -/* 4CEC0 80071AC0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CEC4 80071AC4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CEC8 80071AC8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CECC 80071ACC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CED0 80071AD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CED4 80071AD4 0C016959 */ jal load_effect -/* 4CED8 80071AD8 2404005B */ addiu $a0, $zero, 0x5b -/* 4CEDC 80071ADC 8FA40010 */ lw $a0, 0x10($sp) -/* 4CEE0 80071AE0 8FA50014 */ lw $a1, 0x14($sp) -/* 4CEE4 80071AE4 8FA60018 */ lw $a2, 0x18($sp) -/* 4CEE8 80071AE8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CEEC 80071AEC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CEF0 80071AF0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CEF4 80071AF4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CEF8 80071AF8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CEFC 80071AFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CF00 80071B00 3C018008 */ lui $at, %hi(gEffectTable+0x888) -/* 4CF04 80071B04 8C21FA98 */ lw $at, %lo(gEffectTable+0x888)($at) -/* 4CF08 80071B08 00200008 */ jr $at -/* 4CF0C 80071B0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5C.s deleted file mode 100644 index 1bb78a2def..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_5C -/* 4CF10 80071B10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CF14 80071B14 AFA40010 */ sw $a0, 0x10($sp) -/* 4CF18 80071B18 AFA50014 */ sw $a1, 0x14($sp) -/* 4CF1C 80071B1C AFA60018 */ sw $a2, 0x18($sp) -/* 4CF20 80071B20 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CF24 80071B24 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CF28 80071B28 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CF2C 80071B2C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CF30 80071B30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CF34 80071B34 0C016959 */ jal load_effect -/* 4CF38 80071B38 2404005C */ addiu $a0, $zero, 0x5c -/* 4CF3C 80071B3C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CF40 80071B40 8FA50014 */ lw $a1, 0x14($sp) -/* 4CF44 80071B44 8FA60018 */ lw $a2, 0x18($sp) -/* 4CF48 80071B48 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CF4C 80071B4C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CF50 80071B50 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CF54 80071B54 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CF58 80071B58 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CF5C 80071B5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CF60 80071B60 3C018008 */ lui $at, %hi(gEffectTable+0x8A0) -/* 4CF64 80071B64 8C21FAB0 */ lw $at, %lo(gEffectTable+0x8A0)($at) -/* 4CF68 80071B68 00200008 */ jr $at -/* 4CF6C 80071B6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5D.s deleted file mode 100644 index 59f26dd40b..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_5D -/* 4CF70 80071B70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CF74 80071B74 AFA40010 */ sw $a0, 0x10($sp) -/* 4CF78 80071B78 AFA50014 */ sw $a1, 0x14($sp) -/* 4CF7C 80071B7C AFA60018 */ sw $a2, 0x18($sp) -/* 4CF80 80071B80 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CF84 80071B84 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CF88 80071B88 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CF8C 80071B8C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CF90 80071B90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CF94 80071B94 0C016959 */ jal load_effect -/* 4CF98 80071B98 2404005D */ addiu $a0, $zero, 0x5d -/* 4CF9C 80071B9C 8FA40010 */ lw $a0, 0x10($sp) -/* 4CFA0 80071BA0 8FA50014 */ lw $a1, 0x14($sp) -/* 4CFA4 80071BA4 8FA60018 */ lw $a2, 0x18($sp) -/* 4CFA8 80071BA8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4CFAC 80071BAC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4CFB0 80071BB0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4CFB4 80071BB4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4CFB8 80071BB8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4CFBC 80071BBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4CFC0 80071BC0 3C018008 */ lui $at, %hi(gEffectTable+0x8B8) -/* 4CFC4 80071BC4 8C21FAC8 */ lw $at, %lo(gEffectTable+0x8B8)($at) -/* 4CFC8 80071BC8 00200008 */ jr $at -/* 4CFCC 80071BCC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5E.s deleted file mode 100644 index 75c12c3c53..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_5E -/* 4CFD0 80071BD0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4CFD4 80071BD4 AFA40010 */ sw $a0, 0x10($sp) -/* 4CFD8 80071BD8 AFA50014 */ sw $a1, 0x14($sp) -/* 4CFDC 80071BDC AFA60018 */ sw $a2, 0x18($sp) -/* 4CFE0 80071BE0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4CFE4 80071BE4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4CFE8 80071BE8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4CFEC 80071BEC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4CFF0 80071BF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4CFF4 80071BF4 0C016959 */ jal load_effect -/* 4CFF8 80071BF8 2404005E */ addiu $a0, $zero, 0x5e -/* 4CFFC 80071BFC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D000 80071C00 8FA50014 */ lw $a1, 0x14($sp) -/* 4D004 80071C04 8FA60018 */ lw $a2, 0x18($sp) -/* 4D008 80071C08 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D00C 80071C0C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D010 80071C10 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D014 80071C14 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D018 80071C18 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D01C 80071C1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D020 80071C20 3C018008 */ lui $at, %hi(gEffectTable+0x8D0) -/* 4D024 80071C24 8C21FAE0 */ lw $at, %lo(gEffectTable+0x8D0)($at) -/* 4D028 80071C28 00200008 */ jr $at -/* 4D02C 80071C2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5F.s deleted file mode 100644 index 97a418bebf..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_5F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_5F -/* 4D030 80071C30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D034 80071C34 AFA40010 */ sw $a0, 0x10($sp) -/* 4D038 80071C38 AFA50014 */ sw $a1, 0x14($sp) -/* 4D03C 80071C3C AFA60018 */ sw $a2, 0x18($sp) -/* 4D040 80071C40 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D044 80071C44 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D048 80071C48 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D04C 80071C4C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D050 80071C50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D054 80071C54 0C016959 */ jal load_effect -/* 4D058 80071C58 2404005F */ addiu $a0, $zero, 0x5f -/* 4D05C 80071C5C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D060 80071C60 8FA50014 */ lw $a1, 0x14($sp) -/* 4D064 80071C64 8FA60018 */ lw $a2, 0x18($sp) -/* 4D068 80071C68 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D06C 80071C6C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D070 80071C70 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D074 80071C74 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D078 80071C78 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D07C 80071C7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D080 80071C80 3C018008 */ lui $at, %hi(gEffectTable+0x8E8) -/* 4D084 80071C84 8C21FAF8 */ lw $at, %lo(gEffectTable+0x8E8)($at) -/* 4D088 80071C88 00200008 */ jr $at -/* 4D08C 80071C8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_60.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_60.s deleted file mode 100644 index 896eda221c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_60.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_60 -/* 4D090 80071C90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D094 80071C94 AFA40010 */ sw $a0, 0x10($sp) -/* 4D098 80071C98 AFA50014 */ sw $a1, 0x14($sp) -/* 4D09C 80071C9C AFA60018 */ sw $a2, 0x18($sp) -/* 4D0A0 80071CA0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D0A4 80071CA4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D0A8 80071CA8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D0AC 80071CAC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D0B0 80071CB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D0B4 80071CB4 0C016959 */ jal load_effect -/* 4D0B8 80071CB8 24040060 */ addiu $a0, $zero, 0x60 -/* 4D0BC 80071CBC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D0C0 80071CC0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D0C4 80071CC4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D0C8 80071CC8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D0CC 80071CCC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D0D0 80071CD0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D0D4 80071CD4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D0D8 80071CD8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D0DC 80071CDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D0E0 80071CE0 3C018008 */ lui $at, %hi(gEffectTable+0x900) -/* 4D0E4 80071CE4 8C21FB10 */ lw $at, %lo(gEffectTable+0x900)($at) -/* 4D0E8 80071CE8 00200008 */ jr $at -/* 4D0EC 80071CEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_61.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_61.s deleted file mode 100644 index f13aaca097..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_61.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_61 -/* 4D0F0 80071CF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D0F4 80071CF4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D0F8 80071CF8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D0FC 80071CFC AFA60018 */ sw $a2, 0x18($sp) -/* 4D100 80071D00 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D104 80071D04 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D108 80071D08 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D10C 80071D0C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D110 80071D10 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D114 80071D14 0C016959 */ jal load_effect -/* 4D118 80071D18 24040061 */ addiu $a0, $zero, 0x61 -/* 4D11C 80071D1C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D120 80071D20 8FA50014 */ lw $a1, 0x14($sp) -/* 4D124 80071D24 8FA60018 */ lw $a2, 0x18($sp) -/* 4D128 80071D28 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D12C 80071D2C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D130 80071D30 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D134 80071D34 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D138 80071D38 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D13C 80071D3C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D140 80071D40 3C018008 */ lui $at, %hi(gEffectTable+0x918) -/* 4D144 80071D44 8C21FB28 */ lw $at, %lo(gEffectTable+0x918)($at) -/* 4D148 80071D48 00200008 */ jr $at -/* 4D14C 80071D4C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_62.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_62.s deleted file mode 100644 index 86b37fef5d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_62.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_62 -/* 4D150 80071D50 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D154 80071D54 AFA40010 */ sw $a0, 0x10($sp) -/* 4D158 80071D58 AFA50014 */ sw $a1, 0x14($sp) -/* 4D15C 80071D5C AFA60018 */ sw $a2, 0x18($sp) -/* 4D160 80071D60 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D164 80071D64 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D168 80071D68 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D16C 80071D6C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D170 80071D70 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D174 80071D74 0C016959 */ jal load_effect -/* 4D178 80071D78 24040062 */ addiu $a0, $zero, 0x62 -/* 4D17C 80071D7C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D180 80071D80 8FA50014 */ lw $a1, 0x14($sp) -/* 4D184 80071D84 8FA60018 */ lw $a2, 0x18($sp) -/* 4D188 80071D88 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D18C 80071D8C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D190 80071D90 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D194 80071D94 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D198 80071D98 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D19C 80071D9C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D1A0 80071DA0 3C018008 */ lui $at, %hi(gEffectTable+0x930) -/* 4D1A4 80071DA4 8C21FB40 */ lw $at, %lo(gEffectTable+0x930)($at) -/* 4D1A8 80071DA8 00200008 */ jr $at -/* 4D1AC 80071DAC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_63.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_63.s deleted file mode 100644 index fbe96a0d10..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_63.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_63 -/* 4D1B0 80071DB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D1B4 80071DB4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D1B8 80071DB8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D1BC 80071DBC AFA60018 */ sw $a2, 0x18($sp) -/* 4D1C0 80071DC0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D1C4 80071DC4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D1C8 80071DC8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D1CC 80071DCC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D1D0 80071DD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D1D4 80071DD4 0C016959 */ jal load_effect -/* 4D1D8 80071DD8 24040063 */ addiu $a0, $zero, 0x63 -/* 4D1DC 80071DDC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D1E0 80071DE0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D1E4 80071DE4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D1E8 80071DE8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D1EC 80071DEC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D1F0 80071DF0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D1F4 80071DF4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D1F8 80071DF8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D1FC 80071DFC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D200 80071E00 3C018008 */ lui $at, %hi(gEffectTable+0x948) -/* 4D204 80071E04 8C21FB58 */ lw $at, %lo(gEffectTable+0x948)($at) -/* 4D208 80071E08 00200008 */ jr $at -/* 4D20C 80071E0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_64.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_64.s deleted file mode 100644 index 9f98128c7e..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_64.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_64 -/* 4D210 80071E10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D214 80071E14 AFA40010 */ sw $a0, 0x10($sp) -/* 4D218 80071E18 AFA50014 */ sw $a1, 0x14($sp) -/* 4D21C 80071E1C AFA60018 */ sw $a2, 0x18($sp) -/* 4D220 80071E20 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D224 80071E24 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D228 80071E28 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D22C 80071E2C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D230 80071E30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D234 80071E34 0C016959 */ jal load_effect -/* 4D238 80071E38 24040064 */ addiu $a0, $zero, 0x64 -/* 4D23C 80071E3C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D240 80071E40 8FA50014 */ lw $a1, 0x14($sp) -/* 4D244 80071E44 8FA60018 */ lw $a2, 0x18($sp) -/* 4D248 80071E48 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D24C 80071E4C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D250 80071E50 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D254 80071E54 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D258 80071E58 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D25C 80071E5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D260 80071E60 3C018008 */ lui $at, %hi(gEffectTable+0x960) -/* 4D264 80071E64 8C21FB70 */ lw $at, %lo(gEffectTable+0x960)($at) -/* 4D268 80071E68 00200008 */ jr $at -/* 4D26C 80071E6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_65.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_65.s deleted file mode 100644 index ea7729c888..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_65.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_65 -/* 4D270 80071E70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D274 80071E74 AFA40010 */ sw $a0, 0x10($sp) -/* 4D278 80071E78 AFA50014 */ sw $a1, 0x14($sp) -/* 4D27C 80071E7C AFA60018 */ sw $a2, 0x18($sp) -/* 4D280 80071E80 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D284 80071E84 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D288 80071E88 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D28C 80071E8C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D290 80071E90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D294 80071E94 0C016959 */ jal load_effect -/* 4D298 80071E98 24040065 */ addiu $a0, $zero, 0x65 -/* 4D29C 80071E9C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D2A0 80071EA0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D2A4 80071EA4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D2A8 80071EA8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D2AC 80071EAC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D2B0 80071EB0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D2B4 80071EB4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D2B8 80071EB8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D2BC 80071EBC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D2C0 80071EC0 3C018008 */ lui $at, %hi(gEffectTable+0x978) -/* 4D2C4 80071EC4 8C21FB88 */ lw $at, %lo(gEffectTable+0x978)($at) -/* 4D2C8 80071EC8 00200008 */ jr $at -/* 4D2CC 80071ECC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_66.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_66.s deleted file mode 100644 index 80c5b44cab..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_66.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_66 -/* 4D2D0 80071ED0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D2D4 80071ED4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D2D8 80071ED8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D2DC 80071EDC AFA60018 */ sw $a2, 0x18($sp) -/* 4D2E0 80071EE0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D2E4 80071EE4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D2E8 80071EE8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D2EC 80071EEC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D2F0 80071EF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D2F4 80071EF4 0C016959 */ jal load_effect -/* 4D2F8 80071EF8 24040066 */ addiu $a0, $zero, 0x66 -/* 4D2FC 80071EFC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D300 80071F00 8FA50014 */ lw $a1, 0x14($sp) -/* 4D304 80071F04 8FA60018 */ lw $a2, 0x18($sp) -/* 4D308 80071F08 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D30C 80071F0C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D310 80071F10 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D314 80071F14 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D318 80071F18 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D31C 80071F1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D320 80071F20 3C018008 */ lui $at, %hi(gEffectTable+0x990) -/* 4D324 80071F24 8C21FBA0 */ lw $at, %lo(gEffectTable+0x990)($at) -/* 4D328 80071F28 00200008 */ jr $at -/* 4D32C 80071F2C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_67.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_67.s deleted file mode 100644 index 017158a27b..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_67.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_67 -/* 4D330 80071F30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D334 80071F34 AFA40010 */ sw $a0, 0x10($sp) -/* 4D338 80071F38 AFA50014 */ sw $a1, 0x14($sp) -/* 4D33C 80071F3C AFA60018 */ sw $a2, 0x18($sp) -/* 4D340 80071F40 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D344 80071F44 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D348 80071F48 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D34C 80071F4C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D350 80071F50 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D354 80071F54 0C016959 */ jal load_effect -/* 4D358 80071F58 24040067 */ addiu $a0, $zero, 0x67 -/* 4D35C 80071F5C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D360 80071F60 8FA50014 */ lw $a1, 0x14($sp) -/* 4D364 80071F64 8FA60018 */ lw $a2, 0x18($sp) -/* 4D368 80071F68 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D36C 80071F6C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D370 80071F70 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D374 80071F74 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D378 80071F78 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D37C 80071F7C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D380 80071F80 3C018008 */ lui $at, %hi(gEffectTable+0x9A8) -/* 4D384 80071F84 8C21FBB8 */ lw $at, %lo(gEffectTable+0x9A8)($at) -/* 4D388 80071F88 00200008 */ jr $at -/* 4D38C 80071F8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_68.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_68.s deleted file mode 100644 index 79e3427818..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_68.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_68 -/* 4D390 80071F90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D394 80071F94 AFA40010 */ sw $a0, 0x10($sp) -/* 4D398 80071F98 AFA50014 */ sw $a1, 0x14($sp) -/* 4D39C 80071F9C AFA60018 */ sw $a2, 0x18($sp) -/* 4D3A0 80071FA0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D3A4 80071FA4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D3A8 80071FA8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D3AC 80071FAC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D3B0 80071FB0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D3B4 80071FB4 0C016959 */ jal load_effect -/* 4D3B8 80071FB8 24040068 */ addiu $a0, $zero, 0x68 -/* 4D3BC 80071FBC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D3C0 80071FC0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D3C4 80071FC4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D3C8 80071FC8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D3CC 80071FCC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D3D0 80071FD0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D3D4 80071FD4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D3D8 80071FD8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D3DC 80071FDC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D3E0 80071FE0 3C018008 */ lui $at, %hi(gEffectTable+0x9C0) -/* 4D3E4 80071FE4 8C21FBD0 */ lw $at, %lo(gEffectTable+0x9C0)($at) -/* 4D3E8 80071FE8 00200008 */ jr $at -/* 4D3EC 80071FEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_69.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_69.s deleted file mode 100644 index 662492b63a..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_69.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_69 -/* 4D3F0 80071FF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D3F4 80071FF4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D3F8 80071FF8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D3FC 80071FFC AFA60018 */ sw $a2, 0x18($sp) -/* 4D400 80072000 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D404 80072004 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D408 80072008 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D40C 8007200C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D410 80072010 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D414 80072014 0C016959 */ jal load_effect -/* 4D418 80072018 24040069 */ addiu $a0, $zero, 0x69 -/* 4D41C 8007201C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D420 80072020 8FA50014 */ lw $a1, 0x14($sp) -/* 4D424 80072024 8FA60018 */ lw $a2, 0x18($sp) -/* 4D428 80072028 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D42C 8007202C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D430 80072030 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D434 80072034 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D438 80072038 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D43C 8007203C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D440 80072040 3C018008 */ lui $at, %hi(gEffectTable+0x9D8) -/* 4D444 80072044 8C21FBE8 */ lw $at, %lo(gEffectTable+0x9D8)($at) -/* 4D448 80072048 00200008 */ jr $at -/* 4D44C 8007204C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6A.s deleted file mode 100644 index 05db1a92c1..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_6A -/* 4D450 80072050 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D454 80072054 AFA40010 */ sw $a0, 0x10($sp) -/* 4D458 80072058 AFA50014 */ sw $a1, 0x14($sp) -/* 4D45C 8007205C AFA60018 */ sw $a2, 0x18($sp) -/* 4D460 80072060 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D464 80072064 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D468 80072068 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D46C 8007206C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D470 80072070 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D474 80072074 0C016959 */ jal load_effect -/* 4D478 80072078 2404006A */ addiu $a0, $zero, 0x6a -/* 4D47C 8007207C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D480 80072080 8FA50014 */ lw $a1, 0x14($sp) -/* 4D484 80072084 8FA60018 */ lw $a2, 0x18($sp) -/* 4D488 80072088 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D48C 8007208C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D490 80072090 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D494 80072094 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D498 80072098 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D49C 8007209C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D4A0 800720A0 3C018008 */ lui $at, %hi(gEffectTable+0x9F0) -/* 4D4A4 800720A4 8C21FC00 */ lw $at, %lo(gEffectTable+0x9F0)($at) -/* 4D4A8 800720A8 00200008 */ jr $at -/* 4D4AC 800720AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6B.s deleted file mode 100644 index 3bfd38dbb9..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_6B -/* 4D4B0 800720B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D4B4 800720B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D4B8 800720B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D4BC 800720BC AFA60018 */ sw $a2, 0x18($sp) -/* 4D4C0 800720C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D4C4 800720C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D4C8 800720C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D4CC 800720CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D4D0 800720D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D4D4 800720D4 0C016959 */ jal load_effect -/* 4D4D8 800720D8 2404006B */ addiu $a0, $zero, 0x6b -/* 4D4DC 800720DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D4E0 800720E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D4E4 800720E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D4E8 800720E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D4EC 800720EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D4F0 800720F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D4F4 800720F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D4F8 800720F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D4FC 800720FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D500 80072100 3C018008 */ lui $at, %hi(gEffectTable+0xA08) -/* 4D504 80072104 8C21FC18 */ lw $at, %lo(gEffectTable+0xA08)($at) -/* 4D508 80072108 00200008 */ jr $at -/* 4D50C 8007210C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6C.s deleted file mode 100644 index e0abe87f28..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_6C -/* 4D510 80072110 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D514 80072114 AFA40010 */ sw $a0, 0x10($sp) -/* 4D518 80072118 AFA50014 */ sw $a1, 0x14($sp) -/* 4D51C 8007211C AFA60018 */ sw $a2, 0x18($sp) -/* 4D520 80072120 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D524 80072124 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D528 80072128 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D52C 8007212C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D530 80072130 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D534 80072134 0C016959 */ jal load_effect -/* 4D538 80072138 2404006C */ addiu $a0, $zero, 0x6c -/* 4D53C 8007213C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D540 80072140 8FA50014 */ lw $a1, 0x14($sp) -/* 4D544 80072144 8FA60018 */ lw $a2, 0x18($sp) -/* 4D548 80072148 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D54C 8007214C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D550 80072150 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D554 80072154 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D558 80072158 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D55C 8007215C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D560 80072160 3C018008 */ lui $at, %hi(gEffectTable+0xA20) -/* 4D564 80072164 8C21FC30 */ lw $at, %lo(gEffectTable+0xA20)($at) -/* 4D568 80072168 00200008 */ jr $at -/* 4D56C 8007216C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6D.s deleted file mode 100644 index ff0b85014d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_6D -/* 4D570 80072170 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D574 80072174 AFA40010 */ sw $a0, 0x10($sp) -/* 4D578 80072178 AFA50014 */ sw $a1, 0x14($sp) -/* 4D57C 8007217C AFA60018 */ sw $a2, 0x18($sp) -/* 4D580 80072180 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D584 80072184 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D588 80072188 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D58C 8007218C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D590 80072190 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D594 80072194 0C016959 */ jal load_effect -/* 4D598 80072198 2404006D */ addiu $a0, $zero, 0x6d -/* 4D59C 8007219C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D5A0 800721A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D5A4 800721A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D5A8 800721A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D5AC 800721AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D5B0 800721B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D5B4 800721B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D5B8 800721B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D5BC 800721BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D5C0 800721C0 3C018008 */ lui $at, %hi(gEffectTable+0xA38) -/* 4D5C4 800721C4 8C21FC48 */ lw $at, %lo(gEffectTable+0xA38)($at) -/* 4D5C8 800721C8 00200008 */ jr $at -/* 4D5CC 800721CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6E.s deleted file mode 100644 index f546c28579..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_6E -/* 4D5D0 800721D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D5D4 800721D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D5D8 800721D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D5DC 800721DC AFA60018 */ sw $a2, 0x18($sp) -/* 4D5E0 800721E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D5E4 800721E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D5E8 800721E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D5EC 800721EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D5F0 800721F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D5F4 800721F4 0C016959 */ jal load_effect -/* 4D5F8 800721F8 2404006E */ addiu $a0, $zero, 0x6e -/* 4D5FC 800721FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D600 80072200 8FA50014 */ lw $a1, 0x14($sp) -/* 4D604 80072204 8FA60018 */ lw $a2, 0x18($sp) -/* 4D608 80072208 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D60C 8007220C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D610 80072210 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D614 80072214 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D618 80072218 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D61C 8007221C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D620 80072220 3C018008 */ lui $at, %hi(gEffectTable+0xA50) -/* 4D624 80072224 8C21FC60 */ lw $at, %lo(gEffectTable+0xA50)($at) -/* 4D628 80072228 00200008 */ jr $at -/* 4D62C 8007222C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6F.s deleted file mode 100644 index da26d00c7d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_6F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_6F -/* 4D630 80072230 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D634 80072234 AFA40010 */ sw $a0, 0x10($sp) -/* 4D638 80072238 AFA50014 */ sw $a1, 0x14($sp) -/* 4D63C 8007223C AFA60018 */ sw $a2, 0x18($sp) -/* 4D640 80072240 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D644 80072244 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D648 80072248 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D64C 8007224C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D650 80072250 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D654 80072254 0C016959 */ jal load_effect -/* 4D658 80072258 2404006F */ addiu $a0, $zero, 0x6f -/* 4D65C 8007225C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D660 80072260 8FA50014 */ lw $a1, 0x14($sp) -/* 4D664 80072264 8FA60018 */ lw $a2, 0x18($sp) -/* 4D668 80072268 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D66C 8007226C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D670 80072270 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D674 80072274 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D678 80072278 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D67C 8007227C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D680 80072280 3C018008 */ lui $at, %hi(gEffectTable+0xA68) -/* 4D684 80072284 8C21FC78 */ lw $at, %lo(gEffectTable+0xA68)($at) -/* 4D688 80072288 00200008 */ jr $at -/* 4D68C 8007228C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_70.s deleted file mode 100644 index e55b27fa0c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_70.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_70 -/* 4D690 80072290 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D694 80072294 AFA40010 */ sw $a0, 0x10($sp) -/* 4D698 80072298 AFA50014 */ sw $a1, 0x14($sp) -/* 4D69C 8007229C AFA60018 */ sw $a2, 0x18($sp) -/* 4D6A0 800722A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D6A4 800722A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D6A8 800722A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D6AC 800722AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D6B0 800722B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D6B4 800722B4 0C016959 */ jal load_effect -/* 4D6B8 800722B8 24040070 */ addiu $a0, $zero, 0x70 -/* 4D6BC 800722BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D6C0 800722C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D6C4 800722C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D6C8 800722C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D6CC 800722CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D6D0 800722D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D6D4 800722D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D6D8 800722D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D6DC 800722DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D6E0 800722E0 3C018008 */ lui $at, %hi(gEffectTable+0xA80) -/* 4D6E4 800722E4 8C21FC90 */ lw $at, %lo(gEffectTable+0xA80)($at) -/* 4D6E8 800722E8 00200008 */ jr $at -/* 4D6EC 800722EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_71.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_71.s deleted file mode 100644 index b822a02a9f..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_71.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_71 -/* 4D6F0 800722F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D6F4 800722F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D6F8 800722F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D6FC 800722FC AFA60018 */ sw $a2, 0x18($sp) -/* 4D700 80072300 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D704 80072304 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D708 80072308 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D70C 8007230C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D710 80072310 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D714 80072314 0C016959 */ jal load_effect -/* 4D718 80072318 24040071 */ addiu $a0, $zero, 0x71 -/* 4D71C 8007231C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D720 80072320 8FA50014 */ lw $a1, 0x14($sp) -/* 4D724 80072324 8FA60018 */ lw $a2, 0x18($sp) -/* 4D728 80072328 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D72C 8007232C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D730 80072330 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D734 80072334 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D738 80072338 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D73C 8007233C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D740 80072340 3C018008 */ lui $at, %hi(gEffectTable+0xA98) -/* 4D744 80072344 8C21FCA8 */ lw $at, %lo(gEffectTable+0xA98)($at) -/* 4D748 80072348 00200008 */ jr $at -/* 4D74C 8007234C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_72.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_72.s deleted file mode 100644 index d3243330ce..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_72.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_72 -/* 4D750 80072350 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D754 80072354 AFA40010 */ sw $a0, 0x10($sp) -/* 4D758 80072358 AFA50014 */ sw $a1, 0x14($sp) -/* 4D75C 8007235C AFA60018 */ sw $a2, 0x18($sp) -/* 4D760 80072360 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D764 80072364 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D768 80072368 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D76C 8007236C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D770 80072370 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D774 80072374 0C016959 */ jal load_effect -/* 4D778 80072378 24040072 */ addiu $a0, $zero, 0x72 -/* 4D77C 8007237C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D780 80072380 8FA50014 */ lw $a1, 0x14($sp) -/* 4D784 80072384 8FA60018 */ lw $a2, 0x18($sp) -/* 4D788 80072388 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D78C 8007238C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D790 80072390 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D794 80072394 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D798 80072398 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D79C 8007239C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D7A0 800723A0 3C018008 */ lui $at, %hi(gEffectTable+0xAB0) -/* 4D7A4 800723A4 8C21FCC0 */ lw $at, %lo(gEffectTable+0xAB0)($at) -/* 4D7A8 800723A8 00200008 */ jr $at -/* 4D7AC 800723AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_73.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_73.s deleted file mode 100644 index 512b114c4c..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_73.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_73 -/* 4D7B0 800723B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D7B4 800723B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D7B8 800723B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D7BC 800723BC AFA60018 */ sw $a2, 0x18($sp) -/* 4D7C0 800723C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D7C4 800723C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D7C8 800723C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D7CC 800723CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D7D0 800723D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D7D4 800723D4 0C016959 */ jal load_effect -/* 4D7D8 800723D8 24040073 */ addiu $a0, $zero, 0x73 -/* 4D7DC 800723DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D7E0 800723E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D7E4 800723E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D7E8 800723E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D7EC 800723EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D7F0 800723F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D7F4 800723F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D7F8 800723F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D7FC 800723FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D800 80072400 3C018008 */ lui $at, %hi(gEffectTable+0xAC8) -/* 4D804 80072404 8C21FCD8 */ lw $at, %lo(gEffectTable+0xAC8)($at) -/* 4D808 80072408 00200008 */ jr $at -/* 4D80C 8007240C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_74.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_74.s deleted file mode 100644 index 3830444236..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_74.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_74 -/* 4D810 80072410 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D814 80072414 AFA40010 */ sw $a0, 0x10($sp) -/* 4D818 80072418 AFA50014 */ sw $a1, 0x14($sp) -/* 4D81C 8007241C AFA60018 */ sw $a2, 0x18($sp) -/* 4D820 80072420 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D824 80072424 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D828 80072428 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D82C 8007242C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D830 80072430 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D834 80072434 0C016959 */ jal load_effect -/* 4D838 80072438 24040074 */ addiu $a0, $zero, 0x74 -/* 4D83C 8007243C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D840 80072440 8FA50014 */ lw $a1, 0x14($sp) -/* 4D844 80072444 8FA60018 */ lw $a2, 0x18($sp) -/* 4D848 80072448 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D84C 8007244C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D850 80072450 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D854 80072454 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D858 80072458 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D85C 8007245C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D860 80072460 3C018008 */ lui $at, %hi(gEffectTable+0xAE0) -/* 4D864 80072464 8C21FCF0 */ lw $at, %lo(gEffectTable+0xAE0)($at) -/* 4D868 80072468 00200008 */ jr $at -/* 4D86C 8007246C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_75.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_75.s deleted file mode 100644 index da0a9ebd79..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_75.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_75 -/* 4D870 80072470 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D874 80072474 AFA40010 */ sw $a0, 0x10($sp) -/* 4D878 80072478 AFA50014 */ sw $a1, 0x14($sp) -/* 4D87C 8007247C AFA60018 */ sw $a2, 0x18($sp) -/* 4D880 80072480 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D884 80072484 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D888 80072488 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D88C 8007248C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D890 80072490 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D894 80072494 0C016959 */ jal load_effect -/* 4D898 80072498 24040075 */ addiu $a0, $zero, 0x75 -/* 4D89C 8007249C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D8A0 800724A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D8A4 800724A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D8A8 800724A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D8AC 800724AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D8B0 800724B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D8B4 800724B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D8B8 800724B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D8BC 800724BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D8C0 800724C0 3C018008 */ lui $at, %hi(gEffectTable+0xAF8) -/* 4D8C4 800724C4 8C21FD08 */ lw $at, %lo(gEffectTable+0xAF8)($at) -/* 4D8C8 800724C8 00200008 */ jr $at -/* 4D8CC 800724CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_76.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_76.s deleted file mode 100644 index 6ef31b851f..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_76.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_76 -/* 4D8D0 800724D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D8D4 800724D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D8D8 800724D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D8DC 800724DC AFA60018 */ sw $a2, 0x18($sp) -/* 4D8E0 800724E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D8E4 800724E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D8E8 800724E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D8EC 800724EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D8F0 800724F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D8F4 800724F4 0C016959 */ jal load_effect -/* 4D8F8 800724F8 24040076 */ addiu $a0, $zero, 0x76 -/* 4D8FC 800724FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D900 80072500 8FA50014 */ lw $a1, 0x14($sp) -/* 4D904 80072504 8FA60018 */ lw $a2, 0x18($sp) -/* 4D908 80072508 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D90C 8007250C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D910 80072510 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D914 80072514 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D918 80072518 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D91C 8007251C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D920 80072520 3C018008 */ lui $at, %hi(gEffectTable+0xB10) -/* 4D924 80072524 8C21FD20 */ lw $at, %lo(gEffectTable+0xB10)($at) -/* 4D928 80072528 00200008 */ jr $at -/* 4D92C 8007252C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_77.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_77.s deleted file mode 100644 index 47270d2dc7..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_77.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_77 -/* 4D930 80072530 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D934 80072534 AFA40010 */ sw $a0, 0x10($sp) -/* 4D938 80072538 AFA50014 */ sw $a1, 0x14($sp) -/* 4D93C 8007253C AFA60018 */ sw $a2, 0x18($sp) -/* 4D940 80072540 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D944 80072544 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D948 80072548 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D94C 8007254C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D950 80072550 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D954 80072554 0C016959 */ jal load_effect -/* 4D958 80072558 24040077 */ addiu $a0, $zero, 0x77 -/* 4D95C 8007255C 8FA40010 */ lw $a0, 0x10($sp) -/* 4D960 80072560 8FA50014 */ lw $a1, 0x14($sp) -/* 4D964 80072564 8FA60018 */ lw $a2, 0x18($sp) -/* 4D968 80072568 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D96C 8007256C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D970 80072570 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D974 80072574 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D978 80072578 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D97C 8007257C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D980 80072580 3C018008 */ lui $at, %hi(gEffectTable+0xB28) -/* 4D984 80072584 8C21FD38 */ lw $at, %lo(gEffectTable+0xB28)($at) -/* 4D988 80072588 00200008 */ jr $at -/* 4D98C 8007258C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_78.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_78.s deleted file mode 100644 index 9cc941c54d..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_78.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_78 -/* 4D990 80072590 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D994 80072594 AFA40010 */ sw $a0, 0x10($sp) -/* 4D998 80072598 AFA50014 */ sw $a1, 0x14($sp) -/* 4D99C 8007259C AFA60018 */ sw $a2, 0x18($sp) -/* 4D9A0 800725A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4D9A4 800725A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4D9A8 800725A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4D9AC 800725AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4D9B0 800725B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4D9B4 800725B4 0C016959 */ jal load_effect -/* 4D9B8 800725B8 24040078 */ addiu $a0, $zero, 0x78 -/* 4D9BC 800725BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4D9C0 800725C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4D9C4 800725C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4D9C8 800725C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4D9CC 800725CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4D9D0 800725D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4D9D4 800725D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4D9D8 800725D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4D9DC 800725DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4D9E0 800725E0 3C018008 */ lui $at, %hi(gEffectTable+0xB40) -/* 4D9E4 800725E4 8C21FD50 */ lw $at, %lo(gEffectTable+0xB40)($at) -/* 4D9E8 800725E8 00200008 */ jr $at -/* 4D9EC 800725EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_79.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_79.s deleted file mode 100644 index 322b3184d7..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_79.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_79 -/* 4D9F0 800725F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4D9F4 800725F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4D9F8 800725F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4D9FC 800725FC AFA60018 */ sw $a2, 0x18($sp) -/* 4DA00 80072600 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DA04 80072604 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DA08 80072608 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DA0C 8007260C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DA10 80072610 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DA14 80072614 0C016959 */ jal load_effect -/* 4DA18 80072618 24040079 */ addiu $a0, $zero, 0x79 -/* 4DA1C 8007261C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DA20 80072620 8FA50014 */ lw $a1, 0x14($sp) -/* 4DA24 80072624 8FA60018 */ lw $a2, 0x18($sp) -/* 4DA28 80072628 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DA2C 8007262C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DA30 80072630 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DA34 80072634 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DA38 80072638 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DA3C 8007263C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DA40 80072640 3C018008 */ lui $at, %hi(gEffectTable+0xB58) -/* 4DA44 80072644 8C21FD68 */ lw $at, %lo(gEffectTable+0xB58)($at) -/* 4DA48 80072648 00200008 */ jr $at -/* 4DA4C 8007264C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7A.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7A.s deleted file mode 100644 index 7c98afd61a..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7A.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_7A -/* 4DA50 80072650 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DA54 80072654 AFA40010 */ sw $a0, 0x10($sp) -/* 4DA58 80072658 AFA50014 */ sw $a1, 0x14($sp) -/* 4DA5C 8007265C AFA60018 */ sw $a2, 0x18($sp) -/* 4DA60 80072660 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DA64 80072664 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DA68 80072668 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DA6C 8007266C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DA70 80072670 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DA74 80072674 0C016959 */ jal load_effect -/* 4DA78 80072678 2404007A */ addiu $a0, $zero, 0x7a -/* 4DA7C 8007267C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DA80 80072680 8FA50014 */ lw $a1, 0x14($sp) -/* 4DA84 80072684 8FA60018 */ lw $a2, 0x18($sp) -/* 4DA88 80072688 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DA8C 8007268C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DA90 80072690 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DA94 80072694 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DA98 80072698 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DA9C 8007269C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DAA0 800726A0 3C018008 */ lui $at, %hi(gEffectTable+0xB70) -/* 4DAA4 800726A4 8C21FD80 */ lw $at, %lo(gEffectTable+0xB70)($at) -/* 4DAA8 800726A8 00200008 */ jr $at -/* 4DAAC 800726AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7B.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7B.s deleted file mode 100644 index 8156024c53..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7B.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_7B -/* 4DAB0 800726B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DAB4 800726B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4DAB8 800726B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4DABC 800726BC AFA60018 */ sw $a2, 0x18($sp) -/* 4DAC0 800726C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DAC4 800726C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DAC8 800726C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DACC 800726CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DAD0 800726D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DAD4 800726D4 0C016959 */ jal load_effect -/* 4DAD8 800726D8 2404007B */ addiu $a0, $zero, 0x7b -/* 4DADC 800726DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4DAE0 800726E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4DAE4 800726E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4DAE8 800726E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DAEC 800726EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DAF0 800726F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DAF4 800726F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DAF8 800726F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DAFC 800726FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DB00 80072700 3C018008 */ lui $at, %hi(gEffectTable+0xB88) -/* 4DB04 80072704 8C21FD98 */ lw $at, %lo(gEffectTable+0xB88)($at) -/* 4DB08 80072708 00200008 */ jr $at -/* 4DB0C 8007270C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7C.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7C.s deleted file mode 100644 index 1f3b8e96e1..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_7C -/* 4DB10 80072710 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DB14 80072714 AFA40010 */ sw $a0, 0x10($sp) -/* 4DB18 80072718 AFA50014 */ sw $a1, 0x14($sp) -/* 4DB1C 8007271C AFA60018 */ sw $a2, 0x18($sp) -/* 4DB20 80072720 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DB24 80072724 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DB28 80072728 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DB2C 8007272C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DB30 80072730 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DB34 80072734 0C016959 */ jal load_effect -/* 4DB38 80072738 2404007C */ addiu $a0, $zero, 0x7c -/* 4DB3C 8007273C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DB40 80072740 8FA50014 */ lw $a1, 0x14($sp) -/* 4DB44 80072744 8FA60018 */ lw $a2, 0x18($sp) -/* 4DB48 80072748 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DB4C 8007274C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DB50 80072750 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DB54 80072754 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DB58 80072758 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DB5C 8007275C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DB60 80072760 3C018008 */ lui $at, %hi(gEffectTable+0xBA0) -/* 4DB64 80072764 8C21FDB0 */ lw $at, %lo(gEffectTable+0xBA0)($at) -/* 4DB68 80072768 00200008 */ jr $at -/* 4DB6C 8007276C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7D.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7D.s deleted file mode 100644 index 7c35235a43..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7D.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_7D -/* 4DB70 80072770 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DB74 80072774 AFA40010 */ sw $a0, 0x10($sp) -/* 4DB78 80072778 AFA50014 */ sw $a1, 0x14($sp) -/* 4DB7C 8007277C AFA60018 */ sw $a2, 0x18($sp) -/* 4DB80 80072780 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DB84 80072784 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DB88 80072788 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DB8C 8007278C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DB90 80072790 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DB94 80072794 0C016959 */ jal load_effect -/* 4DB98 80072798 2404007D */ addiu $a0, $zero, 0x7d -/* 4DB9C 8007279C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DBA0 800727A0 8FA50014 */ lw $a1, 0x14($sp) -/* 4DBA4 800727A4 8FA60018 */ lw $a2, 0x18($sp) -/* 4DBA8 800727A8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DBAC 800727AC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DBB0 800727B0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DBB4 800727B4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DBB8 800727B8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DBBC 800727BC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DBC0 800727C0 3C018008 */ lui $at, %hi(gEffectTable+0xBB8) -/* 4DBC4 800727C4 8C21FDC8 */ lw $at, %lo(gEffectTable+0xBB8)($at) -/* 4DBC8 800727C8 00200008 */ jr $at -/* 4DBCC 800727CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7E.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7E.s deleted file mode 100644 index 57eb3e5790..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7E.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_7E -/* 4DBD0 800727D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DBD4 800727D4 AFA40010 */ sw $a0, 0x10($sp) -/* 4DBD8 800727D8 AFA50014 */ sw $a1, 0x14($sp) -/* 4DBDC 800727DC AFA60018 */ sw $a2, 0x18($sp) -/* 4DBE0 800727E0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DBE4 800727E4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DBE8 800727E8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DBEC 800727EC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DBF0 800727F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DBF4 800727F4 0C016959 */ jal load_effect -/* 4DBF8 800727F8 2404007E */ addiu $a0, $zero, 0x7e -/* 4DBFC 800727FC 8FA40010 */ lw $a0, 0x10($sp) -/* 4DC00 80072800 8FA50014 */ lw $a1, 0x14($sp) -/* 4DC04 80072804 8FA60018 */ lw $a2, 0x18($sp) -/* 4DC08 80072808 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DC0C 8007280C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DC10 80072810 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DC14 80072814 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DC18 80072818 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DC1C 8007281C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DC20 80072820 3C018008 */ lui $at, %hi(gEffectTable+0xBD0) -/* 4DC24 80072824 8C21FDE0 */ lw $at, %lo(gEffectTable+0xBD0)($at) -/* 4DC28 80072828 00200008 */ jr $at -/* 4DC2C 8007282C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7F.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7F.s deleted file mode 100644 index 7ef63a3f75..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_7F.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_7F -/* 4DC30 80072830 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DC34 80072834 AFA40010 */ sw $a0, 0x10($sp) -/* 4DC38 80072838 AFA50014 */ sw $a1, 0x14($sp) -/* 4DC3C 8007283C AFA60018 */ sw $a2, 0x18($sp) -/* 4DC40 80072840 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DC44 80072844 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DC48 80072848 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DC4C 8007284C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DC50 80072850 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DC54 80072854 0C016959 */ jal load_effect -/* 4DC58 80072858 2404007F */ addiu $a0, $zero, 0x7f -/* 4DC5C 8007285C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DC60 80072860 8FA50014 */ lw $a1, 0x14($sp) -/* 4DC64 80072864 8FA60018 */ lw $a2, 0x18($sp) -/* 4DC68 80072868 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DC6C 8007286C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DC70 80072870 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DC74 80072874 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DC78 80072878 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DC7C 8007287C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DC80 80072880 3C018008 */ lui $at, %hi(gEffectTable+0xBE8) -/* 4DC84 80072884 8C21FDF8 */ lw $at, %lo(gEffectTable+0xBE8)($at) -/* 4DC88 80072888 00200008 */ jr $at -/* 4DC8C 8007288C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_80.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_80.s deleted file mode 100644 index 96ada19dcc..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_80.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_80 -/* 4DC90 80072890 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DC94 80072894 AFA40010 */ sw $a0, 0x10($sp) -/* 4DC98 80072898 AFA50014 */ sw $a1, 0x14($sp) -/* 4DC9C 8007289C AFA60018 */ sw $a2, 0x18($sp) -/* 4DCA0 800728A0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DCA4 800728A4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DCA8 800728A8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DCAC 800728AC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DCB0 800728B0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DCB4 800728B4 0C016959 */ jal load_effect -/* 4DCB8 800728B8 24040080 */ addiu $a0, $zero, 0x80 -/* 4DCBC 800728BC 8FA40010 */ lw $a0, 0x10($sp) -/* 4DCC0 800728C0 8FA50014 */ lw $a1, 0x14($sp) -/* 4DCC4 800728C4 8FA60018 */ lw $a2, 0x18($sp) -/* 4DCC8 800728C8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DCCC 800728CC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DCD0 800728D0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DCD4 800728D4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DCD8 800728D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DCDC 800728DC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DCE0 800728E0 3C018008 */ lui $at, %hi(gEffectTable+0xC00) -/* 4DCE4 800728E4 8C21FE10 */ lw $at, %lo(gEffectTable+0xC00)($at) -/* 4DCE8 800728E8 00200008 */ jr $at -/* 4DCEC 800728EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_81.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_81.s deleted file mode 100644 index eb01e41dce..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_81.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_81 -/* 4DCF0 800728F0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DCF4 800728F4 AFA40010 */ sw $a0, 0x10($sp) -/* 4DCF8 800728F8 AFA50014 */ sw $a1, 0x14($sp) -/* 4DCFC 800728FC AFA60018 */ sw $a2, 0x18($sp) -/* 4DD00 80072900 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DD04 80072904 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DD08 80072908 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DD0C 8007290C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DD10 80072910 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DD14 80072914 0C016959 */ jal load_effect -/* 4DD18 80072918 24040081 */ addiu $a0, $zero, 0x81 -/* 4DD1C 8007291C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DD20 80072920 8FA50014 */ lw $a1, 0x14($sp) -/* 4DD24 80072924 8FA60018 */ lw $a2, 0x18($sp) -/* 4DD28 80072928 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DD2C 8007292C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DD30 80072930 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DD34 80072934 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DD38 80072938 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DD3C 8007293C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DD40 80072940 3C018008 */ lui $at, %hi(gEffectTable+0xC18) -/* 4DD44 80072944 8C21FE28 */ lw $at, %lo(gEffectTable+0xC18)($at) -/* 4DD48 80072948 00200008 */ jr $at -/* 4DD4C 8007294C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_82.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_82.s deleted file mode 100644 index 90c963e536..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_82.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_82 -/* 4DD50 80072950 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DD54 80072954 AFA40010 */ sw $a0, 0x10($sp) -/* 4DD58 80072958 AFA50014 */ sw $a1, 0x14($sp) -/* 4DD5C 8007295C AFA60018 */ sw $a2, 0x18($sp) -/* 4DD60 80072960 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DD64 80072964 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DD68 80072968 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DD6C 8007296C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DD70 80072970 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DD74 80072974 0C016959 */ jal load_effect -/* 4DD78 80072978 24040082 */ addiu $a0, $zero, 0x82 -/* 4DD7C 8007297C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DD80 80072980 8FA50014 */ lw $a1, 0x14($sp) -/* 4DD84 80072984 8FA60018 */ lw $a2, 0x18($sp) -/* 4DD88 80072988 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DD8C 8007298C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DD90 80072990 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DD94 80072994 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DD98 80072998 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DD9C 8007299C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DDA0 800729A0 3C018008 */ lui $at, %hi(gEffectTable+0xC30) -/* 4DDA4 800729A4 8C21FE40 */ lw $at, %lo(gEffectTable+0xC30)($at) -/* 4DDA8 800729A8 00200008 */ jr $at -/* 4DDAC 800729AC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_83.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_83.s deleted file mode 100644 index 3e996c49e8..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_83.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_83 -/* 4DDB0 800729B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DDB4 800729B4 AFA40010 */ sw $a0, 0x10($sp) -/* 4DDB8 800729B8 AFA50014 */ sw $a1, 0x14($sp) -/* 4DDBC 800729BC AFA60018 */ sw $a2, 0x18($sp) -/* 4DDC0 800729C0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DDC4 800729C4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DDC8 800729C8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DDCC 800729CC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DDD0 800729D0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DDD4 800729D4 0C016959 */ jal load_effect -/* 4DDD8 800729D8 24040083 */ addiu $a0, $zero, 0x83 -/* 4DDDC 800729DC 8FA40010 */ lw $a0, 0x10($sp) -/* 4DDE0 800729E0 8FA50014 */ lw $a1, 0x14($sp) -/* 4DDE4 800729E4 8FA60018 */ lw $a2, 0x18($sp) -/* 4DDE8 800729E8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DDEC 800729EC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DDF0 800729F0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DDF4 800729F4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DDF8 800729F8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DDFC 800729FC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DE00 80072A00 3C018008 */ lui $at, %hi(gEffectTable+0xC48) -/* 4DE04 80072A04 8C21FE58 */ lw $at, %lo(gEffectTable+0xC48)($at) -/* 4DE08 80072A08 00200008 */ jr $at -/* 4DE0C 80072A0C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_84.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_84.s deleted file mode 100644 index 18cc26a220..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_84.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_84 -/* 4DE10 80072A10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DE14 80072A14 AFA40010 */ sw $a0, 0x10($sp) -/* 4DE18 80072A18 AFA50014 */ sw $a1, 0x14($sp) -/* 4DE1C 80072A1C AFA60018 */ sw $a2, 0x18($sp) -/* 4DE20 80072A20 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DE24 80072A24 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DE28 80072A28 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DE2C 80072A2C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DE30 80072A30 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DE34 80072A34 0C016959 */ jal load_effect -/* 4DE38 80072A38 24040084 */ addiu $a0, $zero, 0x84 -/* 4DE3C 80072A3C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DE40 80072A40 8FA50014 */ lw $a1, 0x14($sp) -/* 4DE44 80072A44 8FA60018 */ lw $a2, 0x18($sp) -/* 4DE48 80072A48 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DE4C 80072A4C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DE50 80072A50 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DE54 80072A54 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DE58 80072A58 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DE5C 80072A5C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DE60 80072A60 3C018008 */ lui $at, %hi(gEffectTable+0xC60) -/* 4DE64 80072A64 8C21FE70 */ lw $at, %lo(gEffectTable+0xC60)($at) -/* 4DE68 80072A68 00200008 */ jr $at -/* 4DE6C 80072A6C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_85.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_85.s deleted file mode 100644 index a7116f78b0..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_85.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_85 -/* 4DE70 80072A70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DE74 80072A74 AFA40010 */ sw $a0, 0x10($sp) -/* 4DE78 80072A78 AFA50014 */ sw $a1, 0x14($sp) -/* 4DE7C 80072A7C AFA60018 */ sw $a2, 0x18($sp) -/* 4DE80 80072A80 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DE84 80072A84 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DE88 80072A88 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DE8C 80072A8C E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DE90 80072A90 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DE94 80072A94 0C016959 */ jal load_effect -/* 4DE98 80072A98 24040085 */ addiu $a0, $zero, 0x85 -/* 4DE9C 80072A9C 8FA40010 */ lw $a0, 0x10($sp) -/* 4DEA0 80072AA0 8FA50014 */ lw $a1, 0x14($sp) -/* 4DEA4 80072AA4 8FA60018 */ lw $a2, 0x18($sp) -/* 4DEA8 80072AA8 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DEAC 80072AAC C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DEB0 80072AB0 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DEB4 80072AB4 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DEB8 80072AB8 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DEBC 80072ABC 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DEC0 80072AC0 3C018008 */ lui $at, %hi(gEffectTable+0xC78) -/* 4DEC4 80072AC4 8C21FE88 */ lw $at, %lo(gEffectTable+0xC78)($at) -/* 4DEC8 80072AC8 00200008 */ jr $at -/* 4DECC 80072ACC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_86.s b/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_86.s deleted file mode 100644 index c0c62d36b2..0000000000 --- a/ver/us/asm/nonmatchings/4ac90_len_3910/playFX_86.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel playFX_86 -/* 4DED0 80072AD0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4DED4 80072AD4 AFA40010 */ sw $a0, 0x10($sp) -/* 4DED8 80072AD8 AFA50014 */ sw $a1, 0x14($sp) -/* 4DEDC 80072ADC AFA60018 */ sw $a2, 0x18($sp) -/* 4DEE0 80072AE0 AFA7001C */ sw $a3, 0x1c($sp) -/* 4DEE4 80072AE4 E7AC0020 */ swc1 $f12, 0x20($sp) -/* 4DEE8 80072AE8 E7AE0024 */ swc1 $f14, 0x24($sp) -/* 4DEEC 80072AEC E7B00028 */ swc1 $f16, 0x28($sp) -/* 4DEF0 80072AF0 AFBF002C */ sw $ra, 0x2c($sp) -/* 4DEF4 80072AF4 0C016959 */ jal load_effect -/* 4DEF8 80072AF8 24040086 */ addiu $a0, $zero, 0x86 -/* 4DEFC 80072AFC 8FA40010 */ lw $a0, 0x10($sp) -/* 4DF00 80072B00 8FA50014 */ lw $a1, 0x14($sp) -/* 4DF04 80072B04 8FA60018 */ lw $a2, 0x18($sp) -/* 4DF08 80072B08 8FA7001C */ lw $a3, 0x1c($sp) -/* 4DF0C 80072B0C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* 4DF10 80072B10 C7AE0024 */ lwc1 $f14, 0x24($sp) -/* 4DF14 80072B14 C7B00028 */ lwc1 $f16, 0x28($sp) -/* 4DF18 80072B18 8FBF002C */ lw $ra, 0x2c($sp) -/* 4DF1C 80072B1C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 4DF20 80072B20 3C018008 */ lui $at, %hi(gEffectTable+0xC90) -/* 4DF24 80072B24 8C21FEA0 */ lw $at, %lo(gEffectTable+0xC90)($at) -/* 4DF28 80072B28 00200008 */ jr $at -/* 4DF2C 80072B2C 00000000 */ nop diff --git a/ver/us/effects.yaml b/ver/us/effects.yaml new file mode 100644 index 0000000000..6c7caf7f07 --- /dev/null +++ b/ver/us/effects.yaml @@ -0,0 +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_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_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 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 834c97f8dc..8e80bad4ce 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -244,7 +244,7 @@ segments: - [0x4a1b0, c, os/4a1b0_len_40] - [0x4a1f0, c, os/4a1f0_len_170] # yay0 decompression - some or all is hand-written - [0x4a360, c, os/4a360_len_930] # osFlash* - IDO O2 -g - - [0x4ac90, c, 4ac90_len_3910] + - [0x4ac90, pm_effects, effects] - [0x4DF30, c, battle/battle] - [0x4E5A0, data, 1000_len_60] - [0x4F410, .data, 1370_len_7d0] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 6fc2a8c875..0eaaa924fb 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -3244,6 +3244,10 @@ playerNpc = 0x802D9D20; // rom:0xFE6D0 D_802D9D30 = 0x802D9D30; // type:data rom:0xFE6E0 D_802D9D34 = 0x802D9D34; // type:data rom:0xFE6E4 D_802D9D50 = 0x802D9D50; // rom:0xFE700 +D_802D9D70 = 0x802D9D70; // type:data rom:0xFE720 +D_802D9D71 = 0x802D9D71; // type:data rom:0xFE721 +D_802D9D72 = 0x802D9D72; // type:data rom:0xFE722 +D_802D9D73 = 0x802D9D73; // type:data rom:0xFE723 D_802D9D98 = 0x802D9D98; // type:data rom:0xFE748 D_802D9DA8 = 0x802D9DA8; // type:data rom:0xFE758 D_802D9DBC = 0x802D9DBC; // type:data rom:0xFE76C @@ -20402,8 +20406,6 @@ D_802BFF24 = 0x802BFF24; // type:data D_802BFF28 = 0x802BFF28; // type:data D_802C0000 = 0x802C0000; // type:data D_802C05CC = 0x802C05CC; // type:data -D_802D9D72 = 0x802D9D72; // type:data -D_802D9D73 = 0x802D9D73; // type:data D_802D9D80 = 0x802D9D80; // type:data gMapFlags = 0x802DA480; // gMapVars = 0x802DA484; //