From 021592d2192675357d3e9fcfa7d1718bfe6142e2 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 27 May 2022 09:03:19 -0400 Subject: [PATCH] Misc decomp 70 (#716) * aura_appendGfx * 3 more action commands * fire_shell * hammer, hurricane * spiny_surge * data stuff, cleanup, whirlwind * warnings * water_block data and func * water_block * effect stuff cleanup * big_snowflakes effect * data cleanup, fpr abi regs * 2 battle item funcs + data * 2 mo * shooting_star func * 3 16F740 funcs * btl_state_update_end_battle * map funcs * more dedupe * cleanin * draw_entity_model_C/D * effect butterflies, btl state funcs * it is done * it is done * PR comments, some cleanup --- diff_settings.py | 1 + include/common_structs.h | 10 +- include/effects.h | 377 +++--- include/effects_internal.h | 6 +- include/enums.h | 6 +- include/functions.h | 18 +- include/gcc/memory.h | 23 + include/gcc/string.h | 42 + include/model.h | 1 + include/xstdio.h | 37 + src/16F740.c | 873 +++++++++++- src/5B320.c | 10 +- src/7E9D0.c | 5 +- src/C50A0.c | 14 +- src/battle/action_cmd/body_slam.c | 159 ++- src/battle/action_cmd/bomb.c | 18 +- src/battle/action_cmd/break_free.c | 176 ++- src/battle/action_cmd/dizzy_shell.c | 173 ++- src/battle/action_cmd/fire_shell.c | 190 ++- src/battle/action_cmd/hammer.c | 289 +++- src/battle/action_cmd/hurricane.c | 275 +++- src/battle/action_cmd/mega_shock.c | 24 +- src/battle/action_cmd/power_shock.c | 164 +-- src/battle/action_cmd/smack.c | 2 - src/battle/action_cmd/spiny_surge.c | 185 ++- src/battle/action_cmd/spook.c | 203 ++- src/battle/action_cmd/squirt.c | 163 ++- src/battle/action_cmd/tidal_wave.c | 74 +- src/battle/action_cmd/water_block.c | 586 +++++++- src/battle/action_cmd/whirlwind.c | 346 ++++- src/battle/area_arn/actor/tubbas_heart.c | 10 +- src/battle/area_kpa2/69F320.c | 9 +- src/battle/area_kpa2/6A2B50.c | 40 +- src/battle/area_omo/actor/groove_guy.c | 4 +- src/battle/area_tik2/608AB0.c | 2 +- src/battle/area_tik2/608CB0.c | 8 +- src/battle/item/insecticide_herb.c | 29 +- src/battle/item/mystery.c | 253 ++-- src/battle/item/shooting_star.c | 50 +- src/battle/item/strange_cake.c | 278 ++-- src/battle/partner/watt.c | 22 +- src/common/UnkEffect6FFunc.inc.c | 16 +- src/common/UnkWaterFountainFunc.inc.c | 31 + src/common/UnkWhirlwindEffectFunc.inc.c | 10 +- src/effects/aura.c | 146 +- src/effects/big_snowflakes.c | 127 +- src/effects/butterflies.c | 172 ++- src/effects/small_gold_sparkle.c | 2 +- src/entity.c | 67 +- src/evt/fx_api.c | 2 +- src/hud_element.h | 1 - src/os/3FEA0.c | 9 - src/os/xprintf.c | 242 ++++ src/world/action/spin.c | 54 +- src/world/area_dro/dro_02/9694C0.c | 9 +- src/world/area_flo/flo_07/CAC1F0.c | 30 +- src/world/area_flo/flo_14/CCB310.c | 2 - src/world/area_flo/flo_18/CDC6A0.c | 40 +- src/world/area_jan/jan_00/B216E0.c | 29 +- src/world/area_kgr/kgr_01/8A9B70.c | 13 +- src/world/area_kmr/kmr_02/8B0070.c | 3 +- src/world/area_kmr/kmr_11/8DA3A0.c | 3 +- src/world/area_kzn/kzn_06/C6CD10.c | 1 + src/world/area_mac/mac_05/852170.c | 4 +- src/world/area_mac/mac_05/855560.c | 18 +- src/world/area_mac/mac_06/864B40.c | 4 +- src/world/area_mac/mac_06/865000.c | 18 +- src/world/area_obk/obk_02/BC2A90.c | 2 +- src/world/area_obk/obk_05/BCD7D0.c | 34 +- src/world/area_obk/obk_07/BCEEB0.c | 2 +- src/world/area_obk/obk_08/BD4110.c | 34 +- src/world/area_omo/omo_04/DAF240.c | 3 +- src/world/area_omo/omo_07/DC04D0.c | 3 +- src/world/area_omo/omo_09/DD02E0.c | 3 +- src/world/area_osr/osr_03/AB62B0.c | 10 +- src/world/common/StarSpiritEffectFunc.inc.c | 56 +- src/world/common/UnkAngleFunc001.inc.c | 35 + src/world/common/UnkAngleFunc004.inc.c | 36 + src/world/common/UnkAngleFunc005.inc.c | 36 + src/world/common/UnkFloatFunc001.inc.c | 24 + src/world/common/UnkNpcPosFunc.inc.c | 16 + src/world/common/UnkPlayerPosFunc.inc.c | 15 + src/world/common/UnkVtxFunc.inc.c | 7 + src/world/common/resolve_npc.inc.c | 11 + src/world/common/unkAngleFuncs023.inc.c | 36 + tools/sortsymz.py | 2 +- ver/us/asm/data/1AF2D0.data.s | 5 +- .../asm/data/battle/action_cmd/422A90.data.s | 6 - .../asm/data/battle/action_cmd/423C30.data.s | 6 - .../asm/data/battle/action_cmd/424550.data.s | 93 -- .../asm/data/battle/action_cmd/426970.data.s | 12 - .../asm/data/battle/action_cmd/427320.data.s | 21 - .../asm/data/battle/action_cmd/428280.data.s | 12 - .../asm/data/battle/action_cmd/4292C0.data.s | 9 - .../asm/data/battle/action_cmd/42A480.data.s | 15 - .../asm/data/battle/action_cmd/42B650.data.s | 84 -- .../asm/data/battle/action_cmd/42CEB0.data.s | 9 - .../asm/data/battle/action_cmd/42D9B0.data.s | 9 - .../asm/data/battle/action_cmd/42F680.data.s | 12 - .../asm/data/battle/action_cmd/42FFC0.data.s | 12 - .../asm/data/battle/action_cmd/430940.data.s | 12 - .../asm/data/battle/area_kpa2/6A44E0.data.s | 159 --- .../asm/data/battle/area_tik2/60ABD0.data.s | 6 +- ver/us/asm/data/effects/363890.data.s | 21 - .../data/world/area_jan/jan_00/B25E90.data.s | 24 +- .../data/world/area_kmr/kmr_02/8B5640.data.s | 2 +- .../data/world/area_kmr/kmr_11/8DE400.data.s | 2 +- .../data/world/area_mac/mac_05/856650.data.s | 2 +- .../data/world/area_mac/mac_05/862BC0.data.s | 24 +- .../data/world/area_mac/mac_06/8661D0.data.s | 2 +- .../data/world/area_mac/mac_06/8666A0.data.s | 24 +- .../data/world/area_obk/obk_02/BC3720.data.s | 2 +- .../data/world/area_obk/obk_07/BD14F0.data.s | 2 +- .../data/world/area_omo/omo_04/DAF3E0.data.s | 2 +- .../data/world/area_omo/omo_07/DC3730.data.s | 2 +- .../data/world/area_omo/omo_09/DD6BB0.data.s | 2 +- .../16F740/btl_merlee_on_first_strike.s | 125 -- .../16F740/btl_merlee_on_start_turn.s | 109 -- .../btl_state_update_begin_partner_turn.s | 234 ---- .../16F740/btl_state_update_end_battle.s | 242 ---- .../btl_state_update_partner_striking_first.s | 316 ----- .../16F740/btl_state_update_run_away.s | 366 ----- .../body_slam/func_802A92D4_4285B4.s | 258 ---- .../break_free/func_802A92DC_4236CC.s | 278 ---- .../dizzy_shell/func_802A928C_4263FC.s | 307 ----- .../fire_shell/func_802A9294_426C64.s | 394 ------ .../action_cmd/hammer/func_802A936C_42236C.s | 451 ------- .../hurricane/func_802A92A0_42F980.s | 363 ----- .../power_shock/func_802A9310_42D220.s | 4 +- .../spiny_surge/func_802A9254_42F074.s | 345 ----- .../action_cmd/spook/func_802A9298_4302B8.s | 381 ------ .../action_cmd/squirt/func_802A9208_429F28.s | 295 ---- .../water_block/func_802A9000_42A4F0.s | 242 ---- .../water_block/func_802A948C_42A97C.s | 830 ------------ .../whirlwind/func_802A9000_423C70.s | 128 -- .../whirlwind/func_802A91E0_423E50.s | 76 -- .../whirlwind/func_802A92F0_423F60.s | 309 ----- .../area_kpa2/69F320/func_80218AA4_69FCA4.s | 25 + .../area_kpa2/69F320/func_80219818_6A0A18.s | 25 + .../area_kpa2/69F320/func_8021ABD8_6A1DD8.s | 28 + .../area_kpa2/69F320/func_8021B678_6A2878.s | 7 + .../area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s | 10 + .../area_kpa2/6A2B50/func_8021C520_6A3720.s | 28 + .../area_kpa2/6A2B50/func_8021CFC0_6A41C0.s | 7 + .../area_kpa2/6A2B50/func_8021D290_6A4490.s | 61 + .../area_tik2/608AB0/func_80218058_608B08.s | 110 -- .../area_tik2/608CB0/func_802184E4_608F94.s | 107 -- .../area_tik2/608CB0/func_80218884_609334.s | 107 -- ...battle_item_mystery_func_802A123C_72C7EC.s | 112 -- ...battle_item_mystery_func_802A13E4_72C994.s | 334 ----- ..._item_shooting_star_func_802A123C_71D9AC.s | 89 -- ...e_item_strange_cake_func_802A123C_73153C.s | 112 -- ...e_item_strange_cake_func_802A13E4_7316E4.s | 303 ----- .../effects/aura/aura_appendGfx.s | 407 ------ .../big_snowflakes/big_snowflakes_appendGfx.s | 191 --- .../big_snowflakes/big_snowflakes_main.s | 126 -- .../big_snowflakes/big_snowflakes_update.s | 148 -- .../butterflies/butterflies_appendGfx.s | 179 --- .../effects/butterflies/butterflies_main.s | 71 - .../effects/butterflies/butterflies_update.s | 186 --- .../nonmatchings/entity/draw_entity_model_C.s | 71 - .../nonmatchings/entity/draw_entity_model_D.s | 71 - ver/us/asm/nonmatchings/os/3FEA0/_Printf.s | 411 ------ ver/us/asm/nonmatchings/os/3FEA0/_Putfld.s | 348 ----- .../jan_00/B216E0/func_802411A0_B216E0.s | 26 - .../jan_00/B216E0/func_802411EC_B2172C.s | 92 -- .../jan_00/B216E0/func_802415B0_B21AF0.s | 47 - .../jan_00/B216E0/func_80241654_B21B94.s | 47 - .../jan_00/B216E0/func_802416F8_B21C38.s | 97 -- .../jan_00/B216E0/func_80241868_B21DA8.s | 66 - ...241338_B21878.s => jan_00_unkVtxFunc001.s} | 2 +- .../kmr_02/8B0070/func_80242860_8B28D0.s | 59 - .../kmr_11/8DA3A0/func_80240DDC_8DAEDC.s | 61 - .../mac_05/852170/func_8024030C_85247C.s | 97 -- .../mac_05/855560/func_802433F0_855560.s | 26 - .../mac_05/855560/func_8024343C_8555AC.s | 92 -- .../mac_05/855560/func_80243800_855970.s | 47 - .../mac_05/855560/func_802438A4_855A14.s | 47 - .../mac_05/855560/func_80243948_855AB8.s | 97 -- .../mac_05/855560/func_80243AB8_855C28.s | 63 - ...243588_8556F8.s => mac_05_unkVtxFunc001.s} | 2 +- .../mac_06/864B40/func_8024030C_864E4C.s | 97 -- .../mac_06/865000/func_802404C0_865000.s | 26 - .../mac_06/865000/func_8024050C_86504C.s | 92 -- .../mac_06/865000/func_802408D0_865410.s | 47 - .../mac_06/865000/func_80240974_8654B4.s | 47 - .../mac_06/865000/func_80240A18_865558.s | 97 -- .../mac_06/865000/func_80240B88_8656C8.s | 63 - ...240658_865198.s => mac_06_unkVtxFunc001.s} | 2 +- .../obk_02/BC2A90/func_8024000C_BC2A9C.s | 109 -- .../obk_05/BCD7D0/func_802407AC_BCD80C.s | 109 -- .../obk_07/BCEEB0/func_802402CC_BCEEBC.s | 109 -- .../obk_08/BD4110/func_80240FE4_BD4854.s | 109 -- .../omo_04/DAF240/func_80241E40_DAF240.s | 60 - .../omo_07/DC04D0/func_80243220_DC04D0.s | 60 - .../omo_09/DD02E0/func_80243610_DD02E0.s | 60 - .../osr_03/AB62B0/func_802400C4_AB6354.s | 59 - ver/us/splat.yaml | 79 +- ver/us/symbol_addrs.txt | 1187 +++++++++++++++-- ver/us/undefined_syms.txt | 28 +- 200 files changed, 6745 insertions(+), 13556 deletions(-) create mode 100644 include/gcc/memory.h create mode 100755 include/gcc/string.h create mode 100755 include/xstdio.h create mode 100644 src/common/UnkWaterFountainFunc.inc.c delete mode 100644 src/os/3FEA0.c create mode 100644 src/os/xprintf.c create mode 100644 src/world/common/UnkAngleFunc001.inc.c create mode 100644 src/world/common/UnkAngleFunc004.inc.c create mode 100644 src/world/common/UnkAngleFunc005.inc.c create mode 100644 src/world/common/UnkFloatFunc001.inc.c create mode 100644 src/world/common/UnkNpcPosFunc.inc.c create mode 100644 src/world/common/UnkPlayerPosFunc.inc.c create mode 100644 src/world/common/UnkVtxFunc.inc.c create mode 100644 src/world/common/resolve_npc.inc.c create mode 100644 src/world/common/unkAngleFuncs023.inc.c delete mode 100644 ver/us/asm/data/battle/action_cmd/422A90.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/423C30.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/424550.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/426970.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/427320.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/428280.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/4292C0.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/42A480.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/42B650.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/42CEB0.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/42D9B0.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/42F680.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/42FFC0.data.s delete mode 100644 ver/us/asm/data/battle/action_cmd/430940.data.s delete mode 100644 ver/us/asm/data/effects/363890.data.s delete mode 100644 ver/us/asm/nonmatchings/16F740/btl_merlee_on_first_strike.s delete mode 100644 ver/us/asm/nonmatchings/16F740/btl_merlee_on_start_turn.s delete mode 100644 ver/us/asm/nonmatchings/16F740/btl_state_update_begin_partner_turn.s delete mode 100644 ver/us/asm/nonmatchings/16F740/btl_state_update_end_battle.s delete mode 100644 ver/us/asm/nonmatchings/16F740/btl_state_update_partner_striking_first.s delete mode 100644 ver/us/asm/nonmatchings/16F740/btl_state_update_run_away.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s delete mode 100644 ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s delete mode 100644 ver/us/asm/nonmatchings/effects/aura/aura_appendGfx.s delete mode 100644 ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_appendGfx.s delete mode 100644 ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_main.s delete mode 100644 ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_update.s delete mode 100644 ver/us/asm/nonmatchings/effects/butterflies/butterflies_appendGfx.s delete mode 100644 ver/us/asm/nonmatchings/effects/butterflies/butterflies_main.s delete mode 100644 ver/us/asm/nonmatchings/effects/butterflies/butterflies_update.s delete mode 100644 ver/us/asm/nonmatchings/entity/draw_entity_model_C.s delete mode 100644 ver/us/asm/nonmatchings/entity/draw_entity_model_D.s delete mode 100644 ver/us/asm/nonmatchings/os/3FEA0/_Printf.s delete mode 100644 ver/us/asm/nonmatchings/os/3FEA0/_Putfld.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s rename ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/{func_80241338_B21878.s => jan_00_unkVtxFunc001.s} (99%) delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s rename ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/{func_80243588_8556F8.s => mac_05_unkVtxFunc001.s} (99%) delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s rename ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/{func_80240658_865198.s => mac_06_unkVtxFunc001.s} (99%) delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s diff --git a/diff_settings.py b/diff_settings.py index 34c3e65606..48aad93d95 100644 --- a/diff_settings.py +++ b/diff_settings.py @@ -7,3 +7,4 @@ def apply(config, args): config['mapfile'] = f'{ver_dir}build/papermario.map' config['source_directories'] = ['src', f'{ver_dir}asm', 'include', f'{ver_dir}assets'] config['make_command'] = ['ninja'] + config['objdump_flags'] = ['-M','reg-names=32'] diff --git a/include/common_structs.h b/include/common_structs.h index 46dcbb558b..652c22f1a5 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -245,7 +245,7 @@ typedef struct PlayerData { /* 0x1C8 */ s16 storedItems[32]; /* 0x208 */ s16 equippedBadges[64]; /* 0x288 */ char unk_288; - /* 0x289 */ u8 merleeSpellType; + /* 0x289 */ s8 merleeSpellType; /* 0x28A */ s8 merleeCastsLeft; /* 0x28B */ char unk_28B; /* 0x28C */ s16 merleeTurnCount; @@ -1616,7 +1616,7 @@ typedef struct ActorPartBlueprint { /* 0x14 */ s32 eventFlags; /* 0x18 */ s32 elementImmunityFlags; /* 0x1C */ s8 unk_1C; - /* 0x1C */ s8 unk_1D; + /* 0x1D */ s8 unk_1D; /* 0x1E */ char unk_1E[2]; /* 0x20 */ s32 unk_20; } ActorPartBlueprint; // size = 0x24 @@ -2048,7 +2048,7 @@ typedef struct PlayerStatus { /* 0x0CC */ s32 shadowID; /* 0x0D0 */ f32* unk_D0; /* 0x0D4 */ f32 spinRate; - /* 0x0D8 */ UNK_PTR** unk_D8; + /* 0x0D8 */ struct EffectInstance* unk_D8; // effect 46 /* 0x0DC */ s32 currentButtons; /* 0x0E0 */ s32 pressedButtons; /* 0x0E4 */ s32 heldButtons; @@ -2283,7 +2283,7 @@ typedef struct PartnerActionStatus { typedef struct EntityModel { /* 0x00 */ s32 flags; - /* 0x04 */ u8 renderMode; + /* 0x04 */ s8 renderMode; /* 0x05 */ u8 unk_05; /* 0x06 */ u8 unk_06; /* 0x07 */ u8 unk_07; @@ -2291,7 +2291,7 @@ typedef struct EntityModel { /* 0x0C */ f32 timeScale; ///< Default is 1.0 /* 0x10 */ s32* cmdListReadPos; /* 0x14 */ Gfx* displayList; - /* 0x18 */ Matrix4s transform; + /* 0x18 */ Mtx transform; /* 0x58 */ s32* cmdListSavedPos; /* 0x5C */ Vtx* vertexArray; /* 0x60 */ UNK_FUN_PTR(fpSetupGfxCallback); diff --git a/include/effects.h b/include/effects.h index 804f520812..1f2c776671 100644 --- a/include/effects.h +++ b/include/effects.h @@ -142,66 +142,29 @@ enum EffectID { EFFECT_86, }; -typedef struct { - char unk_00[0x38]; - f32 unk_38[4]; -} EffectUnkStruct1; - -typedef struct EffectStruct { - char unk_00[0x4]; - f32 unk_04; - f32 unk_08; - f32 unk_0C; - f32 unk_10; - char unk_14[0x4]; - s32 unk_18; - s32 unk_1C; - s32 unk_20; - X32 unk_24; - s32 unk_28; - s32 unk_2C; - s32 unk_30; - u8 unk_34; - s32 unk_38; - char unk_3C[0xC]; - EffectUnkStruct1* unk_48; - char unk_4C[0x24]; - s32 unk_70; - s32 unk_74; -} EffectStruct; - -typedef struct StarSpiritEffectUnkStruct { - char unk_00[0xC]; - EffectStruct* unk_0C; -} StarSpiritEffectUnkStruct; - -typedef struct StarSpiritEffect { - /* 0x00 */ f32 unk_00; - /* 0x04 */ f32 unk_04; +typedef struct StarSpiritsEnergyFXData { + /* 0x00 */ char unk_00[0x8]; /* 0x08 */ f32 unk_08; /* 0x0C */ f32 unk_0C; /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; + /* 0x14 */ char unk_14[0x20]; + /* 0x34 */ s32 unk_34; + /* 0x38 */ char unk_38[0x38]; + /* 0x70 */ s32 unk_70; + /* 0x74 */ s32 unk_74; +} StarSpiritsEnergyFXData; // size = ? + +typedef struct SpiritCardFXData { + /* 0x00 */ char unk_00[0x4]; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ char unk_10[0x10]; + /* 0x20 */ s32 unk_20; /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ s32 unk_40; // a shadowID - /* 0x44 */ s16 unk_44; - /* 0x46 */ s16 unk_46; - /* 0x48 */ s16 unk_48; - /* 0x4A */ s16 unk_4A; - /* 0x4C */ s16 unk_4C; - /* 0x4E */ s16 unk_4E; - /* 0x50 */ struct StarSpiritEffectUnkStruct* unk_50; - /* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54; -} StarSpiritEffect; // size = 0x58 + /* 0x28 */ char unk_28[0xC]; + /* 0x34 */ s8 unk_34; +} SpiritCardFXData; // ? typedef struct BigSmokePuffFXData { /* 0x00 */ s16 unk_00; @@ -219,6 +182,21 @@ typedef struct BigSmokePuffFXData { /* 0x28 */ char unk_28[0x4]; } BigSmokePuffFXData; // size = 0x2C +typedef struct BigSnowflakeFXData { + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ s32 unk_24; + /* 0x28 */ s32 unk_28; + /* 0x2C */ s32 unk_2C; +} BigSnowflakeFXData; // size = 0x30 + typedef struct LandingDustFXData { /* 0x00 */ u16 type; /* 0x02 */ char unk_02[0x2]; @@ -535,6 +513,19 @@ typedef struct SleepBubbleFXData { /* 0xC8 */ f32 unk_C8; } SleepBubbleFXData; // size = 0xCC +typedef struct WaterFountainFXData { + /* 0x00 */ char unk_00[0x18]; + /* 0x18 */ s32 unk_18; + /* 0x1C */ s32 unk_1C; + /* 0x20 */ s32 unk_20; + /* 0x24 */ char unk_24[0x4]; + /* 0x28 */ s32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ s32 unk_30; + /* 0x34 */ char unk_34[0x4]; + /* 0x38 */ f32 unk_38; +} WaterFountainFXData; // size = ? + typedef struct AuraFXData { /* 0x00 */ s32 type; /* 0x04 */ Vec3f pos; @@ -544,7 +535,7 @@ typedef struct AuraFXData { /* 0x1C */ f32 unk_1C; /* 0x20 */ f32 unk_20; /* 0x24 */ f32 unk_24; - /* 0x28 */ s32 unk_28; + /* 0x28 */ s32 primA; /* 0x2C */ s32 unk_2C; /* 0x30 */ s32 unk_30; /* 0x34 */ f32 unk_34; @@ -563,13 +554,13 @@ typedef struct AuraFXData { s32 s; f32 f; } unk_64; - /* 0x68 */ u8 unk_68; - /* 0x69 */ u8 unk_69; - /* 0x6A */ u8 unk_6A; - /* 0x6B */ u8 unk_6B; - /* 0x6C */ u8 unk_6C; - /* 0x6D */ u8 unk_6D; - /* 0x6E */ u8 unk_6E; + /* 0x68 */ u8 primR; + /* 0x69 */ u8 primG; + /* 0x6A */ u8 primB; + /* 0x6B */ u8 envR; + /* 0x6C */ u8 envG; + /* 0x6D */ u8 engB; + /* 0x6E */ u8 engA; } AuraFXData; // size = 0x70 typedef struct BlastFXData { @@ -660,98 +651,15 @@ typedef struct DamageIndicatorFXData { /* 0x3C */ s32 numParts; } DamageIndicatorFXData; // size = 0x40 -// TODO figure out what this actually is -// fx_quizmo_stage invokes gEffectTable[78]'s entryPoint function -// fx_cold_breath invokes gEffectTable[111]'s entryPoint function -// fx_star_spirits_energy invokes gEffectTable[131]'s entryPoint function -// These functions are currently typed to return void -// Assume they return an Effect*, and this struct is accessed at unk_0C, -// but this struct differs from EffectInstanceData -// Search for "struct N(temp)" for examples -typedef struct EffectInstanceDataThing { - char unk_00[0x4]; - f32 unk_04; - f32 unk_08; - f32 unk_0C; - f32 unk_10; - char unk_14[0x4]; - s32 unk_18; - s32 unk_1C; - s32 unk_20; - X32 unk_24; - s32 unk_28; - s32 unk_2C; - s32 unk_30; - s32 unk_34; - s32 unk_38; - char unk_3C[0xC]; - EffectUnkStruct1* unk_48; - char unk_4C[0x24]; - s32 unk_70; - s32 unk_74; -} EffectInstanceDataThing; // TODO remove / convert to appropriate effect data struct - -typedef struct EffectInstanceData { - /* 0x00 */ EffectInstanceDataThing* unk_00; - /* 0x04 */ Vec3f pos; - /* 0x10 */ Vec3f rotation; - /* 0x1C */ Vec3f scale; - /* 0x28 */ f32 unk_28; - /* 0x2C */ s32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ f32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ char unk_40[0x24]; - /* 0x64 */ f32 unk_64; - /* 0x68 */ char unk_68[0x18]; -} EffectInstanceData; // size = 0x80 - -typedef struct EffectInstance { - /* 0x00 */ s32 flags; - /* 0x04 */ s32 effectIndex; - /* 0x08 */ s32 numParts; - /* 0x0C */ void* data; - /* 0x10 */ struct EffectGraphics* graphics; -} EffectInstance; // size = 0x14 - -typedef struct EffectBlueprint { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 effectID; - /* 0x08 */ void (*init)(EffectInstance* effectInst); - /* 0x0C */ void (*update)(EffectInstance* effectInst); - /* 0x10 */ void (*renderWorld)(EffectInstance* effectInst); - /* 0x14 */ void (*unk_14)(EffectInstance* effectInst); -} EffectBlueprint; // size = 0x18 - -typedef struct EffectGraphics { - /* 0x00 */ s32 flags; - /* 0x04 */ s32 effectIndex; - /* 0x08 */ s32 instanceCounter; - /* 0x0C */ s32 freeDelay; - /* 0x10 */ void (*update)(EffectInstance* effectInst); - /* 0x14 */ void (*renderWorld)(EffectInstance* effectInst); - /* 0x18 */ void (*renderUI)(EffectInstance* effectInst); - /* 0x1C */ s32* data; -} EffectGraphics; // size = 0x20 - -typedef struct EffectTableEntry { - /* 0x00 */ void (*entryPoint); - /* 0x04 */ void* dmaStart; - /* 0x08 */ void* dmaEnd; - /* 0x0C */ void* dmaDest; - /* 0x10 */ void* graphicsDmaStart; - /* 0x14 */ void* graphicsDmaEnd; -} EffectTableEntry; // size = 0x18 - -typedef struct EffectWhirlwind { - /* 0x00 */ char unk_00[40]; +// seems to actually be PlayerStatus, but it's too large seemingly given the bss padding in UnkWhirlwindEffectFunc.inc.c +typedef struct EffectWhirlwindUnk { + /* 0x00 */ char unk_00[0x28]; /* 0x28 */ f32 unk_28; /* 0x2C */ f32 unk_2C; /* 0x30 */ f32 unk_30; -} EffectWhirlwind; +} EffectWhirlwindUnk; -typedef struct Effect6BData { +typedef struct Effect6BFXData { /* 0x00 */ s32 unk_00; /* 0x04 */ Vec3f pos; /* 0x10 */ char unk_10[12]; @@ -764,16 +672,32 @@ typedef struct Effect6BData { /* 0x38 */ f32 unk_38; /* 0x3C */ s32 unk_3C; /* 0x40 */ char unk_40[0x4]; -} Effect6BData; // size = 0x44 +} Effect6BFXData; // size = 0x44 -typedef struct Effect6BInstance { - /* 0x00 */ s32 unk_00; - /* 0x04 */ char unk_04[8]; - /* 0x0C */ Effect6BData* data; -} Effect6BInstance; +typedef struct ColdBreathFXData { + /* 0x00 */ char unk_00[0x18]; + /* 0x18 */ s32 unk_18; + /* 0x1C */ s32 unk_1C; + /* 0x20 */ s32 unk_20; + /* 0x24 */ char unk_24[0x4]; + /* 0x28 */ s32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ s32 unk_30; +} ColdBreathFXData; // size = ? -typedef struct Effect6FData { - /* 0x00 */ EffectInstanceDataThing* unk_00; +typedef struct LightningFXData { + /* 0x00 */ char unk_00[0x30]; + /* 0x30 */ s32 unk_30; + /* 0x34 */ s32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ char unk_3C[0x4]; + /* 0x40 */ s32 unk_40; + /* 0x44 */ s32 unk_44; + /* 0x48 */ s32 unk_48; +} LightningFXData; // size = ? + +typedef struct Effect6FFXData { + /* 0x00 */ char unk_00[0x4]; /* 0x04 */ Vec3f pos; /* 0x10 */ Vec3i rotation; /* 0x1C */ Vec3i scale; @@ -782,15 +706,49 @@ typedef struct Effect6FData { /* 0x38 */ f32 unk_38; /* 0x3C */ s32 unk_3C; /* 0x40 */ char unk_40[0x4]; -} Effect6FData; // size = 0x44 +} Effect6FFXData; // size = 0x44 -typedef struct Effect6FInstance { - /* 0x00 */ s32 flags; - /* 0x04 */ s32 effectIndex; - /* 0x08 */ s32 numParts; - /* 0x0C */ Effect6FData* data; - /* 0x10 */ struct EffectGraphics* effect; -} Effect6FInstance; +typedef struct MiscParticlesFXData { + char unk_00[0x38]; + s32 unk_38; + s32 unk_3C; + s32 unk_40; + char unk_44[0x4]; + s32 unk_48; + s32 unk_4C; + s32 unk_50; +} MiscParticlesFXData; // size = ? + +typedef struct ButterflyFXData { + /* 0x00 */ s32 unk_00; + /* 0x04 */ s32 unk_04; + /* 0x08 */ s32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ s32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ s32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ f32 unk_38; + /* 0x3C */ f32 unk_3C; + /* 0x40 */ f32 unk_40; + /* 0x44 */ f32 unk_44; +} ButterflyFXData; // size = 0x48 + +typedef struct Effect46FXData { + /* 0x00 */ char unk_00[0x24]; + /* 0x04 */ s32 unk_24; +} Effect46FXData; // size = 0x44 + +typedef struct ThunderboltRingFXData { + /* 0x00 */ char unk_00[0x30]; + /* 0x30 */ s32 unk_30; +} ThunderboltRingFXData; // size = ? // fx_quizmo_stage typedef struct EffectDataQuizStage { @@ -821,6 +779,87 @@ typedef struct EffectDataQuizVannaT { /* 0x1C */ s32 anim; } EffectDataQuizVannaT; // size = 0x20 +typedef struct EffectInstanceData { + /* 0x00 */ s32 unk_00; + /* 0x04 */ Vec3f pos; + /* 0x10 */ Vec3f rotation; + /* 0x1C */ Vec3f scale; + /* 0x28 */ f32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ f32 unk_38; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ char unk_40[0x24]; + /* 0x64 */ f32 unk_64; + /* 0x68 */ char unk_68[0x18]; +} EffectInstanceData; // size = 0x80 + +typedef struct EffectInstance { + /* 0x00 */ s32 flags; + /* 0x04 */ s32 effectIndex; + /* 0x08 */ s32 numParts; + /* 0x0C */ void* data; + /* 0x10 */ struct EffectGraphics* graphics; +} EffectInstance; // size = 0x14 + +typedef struct StarSpiritData { + /* 0x00 */ f32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ f32 unk_30; + /* 0x34 */ f32 unk_34; + /* 0x38 */ s32 unk_38; + /* 0x3C */ s32 unk_3C; + /* 0x40 */ s32 unk_40; // a shadowID + /* 0x44 */ s16 unk_44; + /* 0x46 */ s16 unk_46; + /* 0x48 */ s16 unk_48; + /* 0x4A */ s16 unk_4A; + /* 0x4C */ s16 unk_4C; + /* 0x4E */ s16 unk_4E; + /* 0x50 */ EffectInstance* unk_50; + /* 0x54 */ EffectInstance* unk_54; +} StarSpiritData; // size = 0x58 + +typedef struct EffectBlueprint { + /* 0x00 */ s32 unk_00; + /* 0x04 */ s32 effectID; + /* 0x08 */ void (*init)(EffectInstance* effectInst); + /* 0x0C */ void (*update)(EffectInstance* effectInst); + /* 0x10 */ void (*renderWorld)(EffectInstance* effectInst); + /* 0x14 */ void (*unk_14)(EffectInstance* effectInst); +} EffectBlueprint; // size = 0x18 + +typedef struct EffectGraphics { + /* 0x00 */ s32 flags; + /* 0x04 */ s32 effectIndex; + /* 0x08 */ s32 instanceCounter; + /* 0x0C */ s32 freeDelay; + /* 0x10 */ void (*update)(EffectInstance* effectInst); + /* 0x14 */ void (*renderWorld)(EffectInstance* effectInst); + /* 0x18 */ void (*renderUI)(EffectInstance* effectInst); + /* 0x1C */ s32* data; +} EffectGraphics; // size = 0x20 + +typedef struct EffectTableEntry { + /* 0x00 */ void (*entryPoint); + /* 0x04 */ void* dmaStart; + /* 0x08 */ void* dmaEnd; + /* 0x0C */ void* dmaDest; + /* 0x10 */ void* graphicsDmaStart; + /* 0x14 */ void* graphicsDmaEnd; +} EffectTableEntry; // size = 0x18 + enum FireBreathType { FIRE_BREATH_LARGE = 0, FIRE_BREATH_SMALL = 1, @@ -897,7 +936,7 @@ EffectInstance* fx_bombette_breaking(s32, s32, s32, f32, s32, s32); EffectInstance* fx_firework(s32, f32, f32, f32, f32, s32); EffectInstance* fx_confetti(s32, f32, f32, f32, f32, s32); EffectInstance* fx_snowfall(s32, s32); -EffectInstance* fx_46(s32, EffectWhirlwind*, f32, s32); +EffectInstance* fx_46(s32, EffectWhirlwindUnk*, f32, s32); EffectInstance* fx_gather_magic(s32, f32, f32, f32, f32, s32); EffectInstance* fx_attack_result_text(s32, f32, f32, f32, f32, s32); EffectInstance* fx_small_gold_sparkle(s32, f32, f32, f32, f32, s32); diff --git a/include/effects_internal.h b/include/effects_internal.h index be34447f88..b78c34d7d0 100644 --- a/include/effects_internal.h +++ b/include/effects_internal.h @@ -76,7 +76,7 @@ FX_MAIN(falling_leaves_main); FX_MAIN(stars_spread_main); FX_MAIN(steam_burst_main); FX_MAIN(stars_orbiting_main); -FX_MAIN(big_snowflakes_main); +void big_snowflakes_main(s32, f32, f32, f32); EffectInstance* debuff_main(s32, f32, f32, f32); FX_MAIN(green_impact_main); FX_MAIN(radial_shimmer_main); @@ -101,7 +101,7 @@ FX_MAIN(snowfall_main); FX_MAIN(fx_46_main); FX_MAIN(gather_magic_main); EffectInstance* attack_result_text_main(s32, f32, f32, f32, f32, s32); -EffectInstance* small_gold_sparkle_main(EffectInstanceDataThing*, f32, f32, f32, f32); +EffectInstance* small_gold_sparkle_main(s32, f32, f32, f32, f32); FX_MAIN(flashing_box_shockwave_main); EffectInstance* balloon_main(s32, f32, f32, f32, f32, s32); FX_MAIN(floating_rock_main); @@ -113,7 +113,7 @@ FX_MAIN(motion_blur_flame_main); FX_MAIN(energy_orb_wave_main); FX_MAIN(merlin_house_stars_main); FX_MAIN(quizmo_audience_main); -FX_MAIN(butterflies_main); +EffectInstance* butterflies_main(s32, f32, f32, f32); EffectInstance* stat_change_main(s32, f32, f32, f32, f32, s32); FX_MAIN(snaking_static_main); FX_MAIN(thunderbolt_ring_main); diff --git a/include/enums.h b/include/enums.h index 14e0d42d7b..191e88b426 100644 --- a/include/enums.h +++ b/include/enums.h @@ -574,6 +574,8 @@ enum SoundIDs { SOUND_21C = 0x0000021C, SOUND_MENU_ERROR = 0x0000021D, SOUND_231 = 0x00000231, + SOUND_233 = 0x00000233, + SOUND_234 = 0x00000234, SOUND_246 = 0x00000246, SOUND_259 = 0x00000259, SOUND_25A = 0x0000025A, @@ -2585,7 +2587,7 @@ enum BattleStatusFlags1 { BS_FLAGS1_400 = 0x00000400, BS_FLAGS1_800 = 0x00000800, BS_FLAGS1_1000 = 0x00001000, - BS_FLAGS1_2000 = 0x08002000, + BS_FLAGS1_2000 = 0x00002000, BS_FLAGS1_4000 = 0x00004000, BS_FLAGS1_8000 = 0x00008000, BS_FLAGS1_10000 = 0x00010000, @@ -2620,10 +2622,12 @@ enum BattleStatusFlags2 { BS_FLAGS2_800 = 0x00000800, BS_FLAGS2_NO_TARGET_AVAILABLE = 0x00001000, BS_FLAGS2_10000 = 0x00010000, + BS_FLAGS2_100000 = 0x00100000, BS_FLAGS2_1000000 = 0x01000000, BS_FLAGS2_2000000 = 0x02000000, BS_FLAGS2_4000000 = 0x04000000, BS_FLAGS2_8000000 = 0x08000000, + BS_FLAGS2_10000000 = 0x10000000, }; enum BattleStates { diff --git a/include/functions.h b/include/functions.h index e3aaaaa762..02b07a666c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -6,6 +6,7 @@ #include "map.h" #include "enums.h" #include "stdlib/stdarg.h" +#include "xstdio.h" f32 fabsf(f32 f); f64 fabs(f64 f); @@ -33,8 +34,6 @@ s32 dma_copy(Addr romStart, Addr romEnd, void* vramDest); f32 rand_float(void); void copy_matrix(Matrix4f src, Matrix4f dest); -s32 _Printf(PrintCallback pfn, char* arg, const char* fmt, va_list ap); - s32 get_global_byte(s32 index); s32 get_global_flag(s32 index); s32 get_area_byte(s32 index); @@ -256,6 +255,7 @@ f32 clamp_angle(f32 theta); s32 sign(s32 value); s32 func_80055448(s32); s32 func_80055464(s32, s32); +s32 func_80055618(s32, s32); s32 func_800E0208(void); s32 battle_heap_create(void); @@ -432,7 +432,7 @@ ModelAnimator* get_animator_by_index(s32 arg0); void set_screen_overlay_params_front(u8, f32); void set_screen_overlay_params_back(u8, f32); void set_screen_overlay_alpha(s32, f32); -void get_screen_overlay_params(s32, u8*, f32*); +void get_screen_overlay_params(s32, u8* type, f32* zoom); void set_screen_overlay_color(s32, u8, u8, u8); void set_screen_overlay_center(s32, s32, s32, s32); s32 rand_int(s32); @@ -722,6 +722,8 @@ void load_font(s32 font); void* load_asset_by_name(const char* assetName, u32* decompressedSize); +Gfx* mdl_get_copied_gfx(s32 copyIndex); +void mdl_get_copied_vertices(s32 copyIndex, Vtx** firstVertex, Vtx** copiedVertices, s32* numCopied); void mdl_draw_hidden_panel_surface(Gfx** arg0, u16 treeIndex); s32 func_8011CFBC(void); void set_screen_overlay_center_worldpos(s32 idx, s32 posIdx, s32 x, s32 y, s32 z); @@ -769,8 +771,11 @@ void hide_foreground_models_unchecked(void); void show_foreground_models(void); void hide_foreground_models(void); void btl_set_state(s32 battleState); -void draw_entity_model_E(s32, Mtx*); void draw_entity_model_A(s32, Mtx*); +void draw_entity_model_B(s32, Mtx*, s32, s32); +void draw_entity_model_C(s32, Mtx*); +void draw_entity_model_D(s32, Mtx*, s32, Vtx*); +void draw_entity_model_E(s32, Mtx*); void free_entity_model_by_index(s32 idx); void btl_cam_use_preset(s32); void btl_cam_set_params(s16, s16, s16, s16, s32, s32, s32, s32); @@ -879,6 +884,9 @@ void func_80254950(void); void func_802549A0(void); void func_802549C0(void); +void func_8023E104(void); +void func_8023E11C(void); + void set_goal_pos_to_part(ActorState* state, s32 actorID, s32 partIndex); void init_encounters_ui(void); @@ -891,6 +899,8 @@ s32 get_asset_offset(char*, s32*); void initialize_status_menu(void); void status_menu_start_blinking_fp(void); s32 is_status_menu_visible(void); +void status_menu_start_blinking_starpoints(void); +void status_menu_stop_blinking_starpoints(void); void status_menu_start_blinking_hp(void); void status_menu_start_blinking_sp(void); void status_menu_stop_blinking_fp(void); diff --git a/include/gcc/memory.h b/include/gcc/memory.h new file mode 100644 index 0000000000..edfff5e7bb --- /dev/null +++ b/include/gcc/memory.h @@ -0,0 +1,23 @@ +#ifndef _MEMORY_H +#define _MEMORY_H +/* + memory.h +*/ + +#ifndef _SIZE_T_DEF +#define _SIZE_T_DEF +typedef unsigned size_t; +#endif + +void *memccpy(void *,void *,int,size_t); +void *memchr(void *,int,size_t); +int memcmp(const void *,const void *,size_t); +void *memcpy(void *,const void *,size_t); +int memicmp(void *,void *,size_t); +void *memmove(void *,void *,size_t); +void *memset(void *,int,size_t); + +void movmem(void *,void *,unsigned); +void setmem(void *,unsigned,int); + +#endif diff --git a/include/gcc/string.h b/include/gcc/string.h new file mode 100755 index 0000000000..d82e1f100c --- /dev/null +++ b/include/gcc/string.h @@ -0,0 +1,42 @@ +#ifndef _STRING_H +#define _STRING_H +/* + string.h +*/ + +#ifndef _SIZE_T_DEF +#define _SIZE_T_DEF +typedef unsigned size_t; +#endif + +#include "memory.h" + +char *stpcpy(char *,const char *); +char *strcat(char *,const char *); +char *strchr(const char *,int); +int strcmp(const char *,const char *); +char *strcpy(char *,const char *); +size_t strcspn(const char *,const char *); +char *strdup(const char *); +char *strerror(int); +int stricmp(const char *,const char *); +size_t strlen(const char *); +char *strlwr(char *); +char *strncat(char *,const char *,size_t); +int strncmp(const char *,const char *,size_t); +char *strncpy(char *,const char *,size_t); +int strnicmp(const char *,const char *,size_t); +char *strnset(char *,int,size_t); +char *strpbrk(const char *,const char *); +char *strrchr(const char *,int); +char *strrev(char *); +char *strset(char *,int); +size_t strspn(const char *,const char *); +char *strstr(const char *,const char *); +char *strtok(char *,const char *); +char *strupr(char *); + +#define strcmpi(s1,s2) stricmp(s1,s2) +#define strncmpi(s1,s2,n) strnicmp(s1,s2,n) + +#endif diff --git a/include/model.h b/include/model.h index 150cdd2543..fae282c69a 100644 --- a/include/model.h +++ b/include/model.h @@ -152,6 +152,7 @@ typedef enum ShapeTypes { typedef ModelTreeInfo ModelTreeInfoList[0x200]; extern ModelTreeInfoList* mdl_currentModelTreeNodeInfo; +extern ModelList* gCurrentModels; void update_model_animator(s32); void update_model_animator_with_transform(s32 animatorID, Mtx* mtx); diff --git a/include/xstdio.h b/include/xstdio.h new file mode 100755 index 0000000000..8a0b84bcb5 --- /dev/null +++ b/include/xstdio.h @@ -0,0 +1,37 @@ +#ifndef _XSTDIO_H +#define _XSTDIO_H +#include "PR/ultratypes.h" +//#include "stdlib.h" +//#include "stdarg.h" + +typedef struct { + /* 0x0 */ union { + /* 0x0 */ long long ll; + /* 0x0 */ double ld; + } v; + /* 0x8 */ unsigned char* s; + /* 0xC */ int n0; + /* 0x10 */ int nz0; + /* 0x14 */ int n1; + /* 0x18 */ int nz1; + /* 0x1C */ int n2; + /* 0x20 */ int nz2; + /* 0x24 */ int prec; + /* 0x28 */ int width; + /* 0x2C */ size_t nchar; + /* 0x30 */ unsigned int flags; + /* 0x34 */ char qual; +} _Pft; + +#define FLAGS_SPACE 1 +#define FLAGS_PLUS 2 +#define FLAGS_MINUS 4 +#define FLAGS_HASH 8 +#define FLAGS_ZERO 16 +typedef char *outfun(char*,const char*,size_t); + +int _Printf(outfun prout, char *arg, const char *fmt, va_list args); +void _Litob(_Pft *args, char type); +void _Ldtob(_Pft* args, char type); + +#endif diff --git a/src/16F740.c b/src/16F740.c index 46d9d77714..2f2b743402 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -10,66 +10,141 @@ extern s32* D_800DC064; extern s16 D_802809F6; extern s16 D_802809F8; extern s32 D_80280A30; -extern s32 D_8029F254; extern u8 D_8029F244; extern s32 D_8029F248; +extern s32 D_8029F24C; +extern s32 D_8029F250; +extern s32 D_8029F254; extern s32 D_8029F258; +extern s32 D_8029F25C; +extern s32 D_8029F260; +extern s32 D_8029F264; -// Almost good but some reorderings at the beginning -#ifdef NON_EQUIVALENT void btl_merlee_on_start_turn(void) { - PlayerData* playerData = &gPlayerData; BattleStatus* battleStatus = &gBattleStatus; EncounterStatus* currentEncounter = &gCurrentEncounter; + PlayerData* playerData = &gPlayerData; - if (!(gBattleStatus.flags2 & 0x40) && battleStatus->unk_8A != 3 && battleStatus->unk_8A != 4 && playerData->merleeCastsLeft > 0) { - if (playerData->merleeTurnCount <= 0) { - s32 d100 = rand_int(100); + do { + if (!(gBattleStatus.flags2 & BS_FLAGS2_40) && + battleStatus->nextMerleeSpellType != 3 && + battleStatus->nextMerleeSpellType != 4 && + playerData->merleeCastsLeft > 0) + { + if (playerData->merleeTurnCount <= 0) { + s32 temp = rand_int(100); - if (currentEncounter->currentEnemy != NULL) { - if (currentEncounter->currentEnemy->flags & 0x40000) { - if (d100 <= 45) { + if (currentEncounter->currentEnemy != NULL) { + if (currentEncounter->currentEnemy->flags & ENEMY_FLAGS_40000) { + if (temp <= 45) { + playerData->merleeSpellType = 1; + } else if (temp <= 90) { + playerData->merleeSpellType = 2; + } else { + playerData->merleeSpellType = 3; + } + } else if (temp <= 30) { playerData->merleeSpellType = 1; - } else if (d100 <= 90) { + } else if (temp <= 60) { playerData->merleeSpellType = 2; - } else { + } else if (temp <= 80) { playerData->merleeSpellType = 3; + } else { + playerData->merleeSpellType = 4; } - } else if (d100 <= 30) { + } else if (temp <= 30) { playerData->merleeSpellType = 1; - } else if (d100 <= 60) { + } else if (temp <= 60) { playerData->merleeSpellType = 2; - } else if (d100 <= 80) { + } else if (temp <= 80) { playerData->merleeSpellType = 3; } else { playerData->merleeSpellType = 4; } - } else if (d100 <= 30) { - playerData->merleeSpellType = 1; - } else if (d100 <= 60) { - playerData->merleeSpellType = 2; - } else if (d100 <= 80) { - playerData->merleeSpellType = 3; - } else { - playerData->merleeSpellType = 4; + + temp = rand_int(10) + 6; + playerData->merleeTurnCount = temp; } - playerData->merleeTurnCount = rand_int(10) + 6; - } - if (playerData->merleeTurnCount >= 2) { - playerData->merleeTurnCount--; - } else { - playerData->merleeTurnCount = 0; - battleStatus->unk_8A = playerData->merleeSpellType; - playerData->merleeCastsLeft--; + if (playerData->merleeTurnCount >= 2) { + playerData->merleeTurnCount--; + } else { + playerData->merleeTurnCount = 0; + battleStatus->nextMerleeSpellType = playerData->merleeSpellType; + playerData->merleeCastsLeft--; + } } - } + } while (0); // TODO: required to match } -#else -INCLUDE_ASM(s32, "16F740", btl_merlee_on_start_turn); -#endif -INCLUDE_ASM(s32, "16F740", btl_merlee_on_first_strike); +void btl_merlee_on_first_strike(void) { + BattleStatus* battleStatus = &gBattleStatus; + EncounterStatus* currentEncounter = &gCurrentEncounter; + PlayerData* playerData = &gPlayerData; + + do { + if (!(gBattleStatus.flags2 & BS_FLAGS2_40) && + battleStatus->nextMerleeSpellType != 3 && + battleStatus->nextMerleeSpellType != 4 && + playerData->merleeCastsLeft > 0) + { + if (playerData->merleeTurnCount <= 0) { + s32 temp = rand_int(100); + + if (currentEncounter->currentEnemy != NULL) { + if (currentEncounter->currentEnemy->flags & ENEMY_FLAGS_40000) { + if (temp <= 45) { + playerData->merleeSpellType = 1; + } else if (temp <= 90) { + playerData->merleeSpellType = 2; + } else { + playerData->merleeSpellType = 3; + } + } else if (temp <= 30) { + playerData->merleeSpellType = 1; + } else if (temp <= 60) { + playerData->merleeSpellType = 2; + } else if (temp <= 80) { + playerData->merleeSpellType = 3; + } else { + playerData->merleeSpellType = 4; + } + } else if (temp <= 30) { + playerData->merleeSpellType = 1; + } else if (temp <= 60) { + playerData->merleeSpellType = 2; + } else if (temp <= 80) { + playerData->merleeSpellType = 3; + } else { + playerData->merleeSpellType = 4; + } + + if (playerData->merleeSpellType != 4) { + // same outcome either way. has to be written like this, and the check does exist in the code. bug? + if (playerData->merleeTurnCount == -1) { + temp = rand_int(5) + 5; + } else { + temp = rand_int(5) + 5; + + } + } else { + temp = rand_int(8) + 5; + } + playerData->merleeTurnCount = temp; + } + + if (playerData->merleeSpellType == 3 || playerData->merleeSpellType == 4) { + if (playerData->merleeTurnCount >= 2) { + playerData->merleeTurnCount--; + } else { + battleStatus->nextMerleeSpellType = playerData->merleeSpellType; + playerData->merleeTurnCount = 0; + playerData->merleeCastsLeft--; + } + } + } + } while (0); // TODO: required to match +} void btl_set_state(s32 battleState) { s32 flags = gBattleStatus.flags2; @@ -441,9 +516,9 @@ void btl_state_update_begin_player_turn(void) { } if (D_8029F254 == 0) { - btl_set_state(BATTLE_STATE2_PLAYER_DEFEATED); + btl_set_state(BATTLE_STATE_SWITCH_TO_PLAYER); } else{ - btl_set_state(BATTLE_STATE2_UNK_8); + btl_set_state(BATTLE_STATE_BEGIN_PARTNER_TURN); gBattleStatus.flags2 |= 2; } } @@ -489,7 +564,121 @@ void btl_state_update_switch_to_player(void) { void btl_state_draw_switch_to_player(void) { } -INCLUDE_ASM(s32, "16F740", btl_state_update_begin_partner_turn); +void btl_state_update_begin_partner_turn(void) { + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + Actor* enemy; + s32 i; + + if (gBattleState2 == BATTLE_STATE2_UNK_0) { + if (partner == NULL) { + D_8029F254 = 1; + gBattleState2 = BATTLE_STATE2_PLAYER_DEFEATED; + } else if ((battleStatus->flags2 & (BS_FLAGS2_4 | BS_FLAGS2_2)) != (BS_FLAGS2_4 | BS_FLAGS2_2)) { + if (!(partner->flags & ACTOR_FLAG_NO_ATTACK)) { + btl_cam_use_preset(2); + btl_cam_move(5); + gBattleState2 = BATTLE_STATE2_UNK_64; + } else { + btl_set_state(BATTLE_STATE_9); + return; + } + } else { + btl_set_state(BATTLE_STATE_9); + return; + } + } + + if (gBattleState2 == BATTLE_STATE2_UNK_64) { + if (btl_cam_is_moving_done()) { + D_8029F258 = 0; + reset_actor_turn_info(); + partner = battleStatus->partnerActor; + battleStatus->unk_86 = 0x7F; + battleStatus->blockResult = 0x7F; + D_8029F254 = 0; + gBattleStatus.flags1 |= BS_FLAGS1_80000; + gBattleStatus.flags2 |= BS_FLAGS1_100000; + partner->flags |= ACTOR_FLAG_8000000; + + if (partner->koStatus != 0) { + partner->koDuration--; + D_8029F254 = 1; + D_8029F258 = 20; + if (partner->koDuration > 0) { + // TODO: We believe these are DebuffFXData*, + // but unk_3C is a u8 for these and we need it to be an s32... + ((s32*)(partner->debuffEffect->data))[15] = partner->koDuration; + } else { + partner->koStatus = 0; + dispatch_event_partner(EVENT_34); + // TODO: We believe these are DebuffFXData*, + // but unk_3C is a u8 for these and we need it to be an s32... + ((s32*)(partner->debuffEffect->data))[15] = 0; + gBattleStatus.flags2 |= BS_FLAGS2_8; + } + } + + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + enemy = battleStatus->enemyActors[i]; + if (enemy != NULL) { + enemy->flags |= ACTOR_FLAG_8000000 | ACTOR_FLAG_4000000; + } + } + gBattleState2 = BATTLE_STATE2_UNK_1; + } + } + + if (gBattleState2 == BATTLE_STATE2_UNK_1) { + if (partner != NULL) { + if (partner->onHitScript == NULL || !does_script_exist(partner->onHitID)) { + partner->onHitScript = NULL; + } else { + goto block_27; // TODO find a way to remove + } + } + + gBattleStatus.flags2 &= ~BS_FLAGS2_8; + if (btl_check_player_defeated() || btl_check_enemies_defeated()) { + return; + } + gBattleState2 = BATTLE_STATE2_UNK_8; + } + +block_27: + if (gBattleState2 == BATTLE_STATE2_UNK_8) { + if (partner->onTurnChanceScriptSource != NULL) { + Evt* script; + + battleStatus->battlePhase = 0xC; + script = start_script(partner->onTurnChanceScriptSource, 0xA, 0); + partner->onTurnChangeScript = script; + partner->onTurnChangeID = script->id; + script->owner1.actorID = ACTOR_PARTNER; + } + gBattleState2 = BATTLE_STATE2_UNK_9; + } + + if (gBattleState2 == BATTLE_STATE2_UNK_9 && + (partner->onTurnChanceScriptSource == NULL || !does_script_exist(partner->onTurnChangeID))) + { + gBattleState2 = BATTLE_STATE2_PLAYER_DEFEATED; + } + + if (gBattleState2 == BATTLE_STATE2_PLAYER_DEFEATED) { + if (D_8029F258 != 0) { + D_8029F258--; + return; + } + gBattleStatus.flags2 &= ~BS_FLAGS2_100000; + if (D_8029F254 == 0) { + btl_set_state(BATTLE_STATE_SWITCH_TO_PARTNER); + } else { + gBattleStatus.flags2 |= BS_FLAGS2_4; + btl_set_state(BATTLE_STATE_9); + } + } +} void btl_state_draw_begin_partner_turn(void) { } @@ -889,7 +1078,115 @@ void btl_state_update_end_training_battle(void) { void btl_state_draw_end_training_battle(void) { } -INCLUDE_ASM(s32, "16F740", btl_state_update_end_battle); +void btl_state_update_end_battle(void) { + Battle* blah = (*D_800DC4FC); + EncounterStatus* encounterStatus = &gCurrentEncounter; + BattleStatus* battleStatus = &gBattleStatus; + Stage* stage; + Evt* script; + s32 i; + + switch (gBattleState2) { + case BATTLE_STATE2_UNK_0: + D_80280A30 = 0; + if (gGameStatusPtr->debugEnemyContact == 2) { + D_80280A30 = 255; + } + if (encounterStatus->battleOutcome == 1 && !(gBattleStatus.flags1 & BS_FLAGS1_800000)) { + btl_cam_unfreeze(); + btl_cam_use_preset(BTL_CAM_PRESET_B); + set_screen_overlay_color(0, 0, 0, 0); + set_screen_overlay_center(0, 0, 160, 120); + } + gBattleState2 = BATTLE_STATE2_UNK_1; + break; + case BATTLE_STATE2_UNK_1: + if (D_80280A30 == 255) { + gBattleState2 = BATTLE_STATE2_UNK_2; + break; + } + D_80280A30 += battleStatus->unk_8D; + if (D_80280A30 > 255) { + D_80280A30 = 255; + } + break; + case BATTLE_STATE2_UNK_2: + D_80280A30 = 255; + gBattleStatus.flags1 &= ~BS_FLAGS1_1; + if (D_800DC064 == NULL) { + stage = blah->stage; + } else { + stage = D_800DC064[1]; + } + if (stage->postBattle == NULL) { + gBattleState2 = BATTLE_STATE2_UNK_4; + return; + } + script = start_script(stage->postBattle, 0xA, 0); + battleStatus->controlScript = script; + gBattleState2 = BATTLE_STATE2_UNK_3; + battleStatus->controlScriptID = script->id; + break; + case BATTLE_STATE2_UNK_3: + if (!does_script_exist(battleStatus->controlScriptID)) { + gBattleState2 = BATTLE_STATE2_UNK_4; + // fallthrough + } else { + break; + } + case BATTLE_STATE2_UNK_4: + kill_all_scripts(); + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + if (battleStatus->enemyActors[i] != NULL) { + btl_delete_actor(battleStatus->enemyActors[i]); + } + } + if (battleStatus->partnerActor != NULL) { + btl_delete_actor(battleStatus->partnerActor); + } + + btl_delete_player_actor(battleStatus->playerActor); + + if (battleStatus->nextMerleeSpellType == 4) { + encounterStatus->merleeCoinBonus = 1; + battleStatus->nextMerleeSpellType = 0; + } + + encounterStatus->damageTaken = battleStatus->damageTaken; + + if (gBattleStatus.flags2 & BS_FLAGS2_10000000) { + encounterStatus->dropWhackaBump = 1; + } + + remove_all_effects(); + set_windows_visible(0); + + if (gBattleStatus.flags2 & BS_FLAGS2_40) { + decrement_status_menu_disabled(); + } + + if (encounterStatus->battleOutcome == OUTCOME_PLAYER_LOST && + !(gBattleStatus.flags1 & BS_FLAGS1_800000)) + { + s16 areaID; + s16 mapID; + + btl_set_state(BATTLE_STATE_0); + D_800DC4D0 = gBattleState; + get_map_IDs_by_name("gv_01", &areaID, &mapID); + gGameStatusPtr->areaID = areaID; + gGameStatusPtr->mapID = mapID; + gGameStatusPtr->entryID = 0; + set_game_mode(GAME_MODE_ENTER_WORLD); + } else { + btl_set_state(BATTLE_STATE_0); + D_800DC4D0 = gBattleState; + func_8003E514(1); + set_game_mode(GAME_MODE_END_BATTLE); + } + break; + } +} void btl_state_draw_end_battle(void) { Camera* camera = &gCameras[gCurrentCameraID]; @@ -926,7 +1223,162 @@ void btl_state_update_defend(void) { void btl_state_draw_defend(void) { } -INCLUDE_ASM(s32, "16F740", btl_state_update_run_away); +void btl_state_update_run_away(void) { + BattleStatus* battleStatus = &gBattleStatus; + PlayerData* playerData = &gPlayerData; + EncounterStatus* currentEncounter = &gCurrentEncounter; + Actor* player = battleStatus->playerActor; + Actor* partner = battleStatus->partnerActor; + Actor* enemy; + s32 var_s0; + f32 var_f2; + Evt* script; + s32 i; + + switch (gBattleState2) { + case BATTLE_STATE2_UNK_0: + battleStatus->unk_8C = 0; + gBattleStatus.flags1 &= ~BS_FLAGS1_40000; + gBattleStatus.flags2 |= BS_FLAGS2_10 | BS_FLAGS2_8 | BS_FLAGS2_4 | BS_FLAGS2_2; + playerData->unk_2A6++; + btl_cam_use_preset(BTL_CAM_PRESET_25); + var_s0 = 0; + btl_cam_target_actor(ACTOR_PLAYER); + var_f2 = 0.0f; + + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + enemy = battleStatus->enemyActors[i]; + if (enemy != NULL) { + if (!(enemy->flags & ACTOR_FLAG_TARGET_ONLY)) { + if (!(enemy->flags & ACTOR_FLAG_NO_DMG_APPLY)) { + f32 escapeChance = enemy->actorBlueprint->escapeChance; + + var_s0 += 1; + if (enemy->debuff == 3 || + enemy->debuff == 4 || + enemy->debuff == 5 || + enemy->debuff == 6 || + enemy->debuff == 7 || + enemy->debuff == 8) + { + escapeChance = 100.0f; + } + var_f2 += escapeChance; + } + } + } + } + + player->state.varTable[0] = var_f2 / var_s0; + if (gGameStatusPtr->debugEnemyContact == 4) { + player->state.varTable[0] = 100; + } + battleStatus->battlePhase = 3; + script = start_script(PlayerScriptDispatcher, 0xA, 0); + player->takeTurnScript = script; + player->takeTurnID = script->id; + script->owner1.actorID = ACTOR_PLAYER; + if (partner != NULL && partner->koStatus == 0) { + script = start_script(partner->takeTurnScriptSource, 0xA, 0); + partner->takeTurnScript = script; + partner->takeTurnID = script->id; + script->owner1.actorID = ACTOR_PARTNER; + } + gBattleState2 = BATTLE_STATE2_UNK_2; + break; + case 2: + if (!does_script_exist(player->takeTurnID) && battleStatus->unk_8C == 0) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_40000)) { + gBattleState2 = BATTLE_STATE2_UNK_3; + } else { + currentEncounter->battleOutcome = 2; + if (is_ability_active(ABILITY_RUNAWAY_PAY) == 0) { + gBattleState2 = BATTLE_STATE2_UNK_B; + } else { + status_menu_start_blinking_starpoints(); + func_8023E104(); + D_8029F264 = 0; + D_8029F24C = 0; + D_80280A30 = 0; + D_8029F25C = battleStatus->totalStarPoints * 100; + D_8029F250 = 20; + D_8029F260 = D_8029F25C / D_8029F250; + gBattleState2 = BATTLE_STATE2_PLAYER_DEFEATED; + } + } + } + break; + } + + if (gBattleState2 == BATTLE_STATE2_PLAYER_DEFEATED) { + if (battleStatus->totalStarPoints != 0) { + s8 temp_v1_4; + + D_8029F25C -= D_8029F260; + temp_v1_4 = D_8029F25C / 100; + var_s0 = battleStatus->totalStarPoints - temp_v1_4; + battleStatus->totalStarPoints = temp_v1_4; + + if (var_s0 > 0) { + sfx_play_sound(SOUND_211); + } + playerData->starPoints += var_s0; + D_80280A30 += 1; + if (D_8029F250 == 0 && battleStatus->totalStarPoints != 0) { + playerData->starPoints++; + } + } + if (playerData->starPoints >= 99) { + playerData->starPoints = 99; + } + if (battleStatus->totalStarPoints == 0) { + if (D_8029F250 != 0) { + D_8029F250--; + } else { + status_menu_stop_blinking_starpoints(); + func_8023E11C(); + gBattleState2 = BATTLE_STATE2_UNK_B; + } + } + } + + if (gBattleState2 == BATTLE_STATE2_UNK_B) { + playerData->battlesFled++; + if (!(gBattleStatus.flags2 & 0x02000000)) { + bgm_set_song(0, -1, 0, 1500, 8); + } + btl_set_state(BATTLE_STATE_END_BATTLE); + } + + switch (gBattleState2) { + case BATTLE_STATE2_UNK_3: + battleStatus->battlePhase = 7; + script = start_script(PlayerScriptDispatcher, 0xA, 0); + player->takeTurnScript = script; + player->takeTurnID = script->id; + script->owner1.actorID = ACTOR_PLAYER; + if (partner != NULL && partner->koStatus == 0) { + script = start_script(partner->takeTurnScriptSource, 0xA, 0); + partner->takeTurnScript = script; + partner->takeTurnID = script->id; + script->owner1.actorID = ACTOR_PARTNER; + } + gBattleState2 = BATTLE_STATE2_UNK_4; + break; + case BATTLE_STATE2_UNK_4: + if (D_8029F248 != 0) { + D_8029F248--; + return; + } + if (!does_script_exist(player->takeTurnID) && + (partner == NULL || !does_script_exist(partner->takeTurnID)) && + battleStatus->unk_8C == 0) + { + btl_set_state(BATTLE_STATE_9); + } + break; + } +} void btl_state_draw_run_away(void) { } @@ -1586,7 +2038,156 @@ void btl_state_draw_first_stike(void) { } } -INCLUDE_ASM(s32, "16F740", btl_state_update_partner_striking_first); +void btl_state_update_partner_striking_first(void) { + PlayerData* playerData = &gPlayerData; + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + Actor* partner = battleStatus->partnerActor; + Actor* actor; + s32 found; + SelectableTarget* target; + Evt* script; + s32 level; + s32 i; + + switch (gBattleState2) { + case BATTLE_STATE2_UNK_0: + D_8029F254 = 0; + level = partner->actorBlueprint->level; + switch (playerData->currentPartner) { + case PARTNER_KOOPER: + battleStatus->moveCategory = 5; + battleStatus->selectedItemID = ITEM_NONE; + battleStatus->selectedMoveID = level + MOVE_SHELL_TOSS1; + battleStatus->currentTargetListFlags = gMoveTable[battleStatus->selectedMoveID].flags; + break; + case PARTNER_BOMBETTE: + battleStatus->moveCategory = 5; + battleStatus->selectedItemID = ITEM_NONE; + battleStatus->selectedMoveID = level + MOVE_BODY_SLAM1; + battleStatus->currentTargetListFlags = gMoveTable[battleStatus->selectedMoveID].flags; + break; + } + actor = get_actor(ACTOR_ENEMY0); + if (actor->onHitScriptSource != NULL) { + actor->lastEventType = EVENT_BEGIN_FIRST_STRIKE; + script = start_script(actor->onHitScriptSource, 0xA, 0x20); + actor->onHitScript = script; + actor->onHitID = script->id; + script->owner1.actorID = actor->actorID; + } + gBattleState2 = BATTLE_STATE2_UNK_1; + break; + case BATTLE_STATE2_UNK_1: + player_create_target_list(partner); + target = &partner->targetData[partner->targetIndexList[0]]; + partner->targetActorID = target->actorID; + partner->targetPartIndex = target->partID; + battleStatus->unk_8C = 0; + battleStatus->lastAttackDamage = 0; + battleStatus->unk_19A = 0; + gBattleStatus.flags1 &= ~BS_FLAGS1_2; + gBattleStatus.flags2 |= BS_FLAGS2_1000000; + gBattleStatus.flags1 |= BS_FLAGS1_80000; + increment_status_menu_disabled(); + btl_cam_use_preset(BTL_CAM_PRESET_10); + btl_cam_target_actor(ACTOR_PARTNER); + reset_actor_turn_info(); + battleStatus->battlePhase = PHASE_FIRST_STRIKE; + script = start_script(partner->takeTurnScriptSource, 0xA, 0); + partner->takeTurnScript = script; + D_8029F248 = 3; + gBattleState2 = BATTLE_STATE2_UNK_2; + partner->takeTurnID = script->id; + script->owner1.actorID = ACTOR_PARTNER; + break; + case BATTLE_STATE2_UNK_2: + if (D_8029F248 != 0) { + D_8029F248--; + } else { + D_8029F254 = 1; + } + + if (partner->takeTurnScript == NULL || !does_script_exist(partner->takeTurnID)) { + partner->takeTurnScript = NULL; + if (partner->onHitScript == NULL || !does_script_exist(partner->onHitID)) { + partner->onHitScript = NULL; + if (player->onHitScript == NULL || !does_script_exist(player->onHitID)) { + player->onHitScript = NULL; + found = FALSE; + + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + actor = battleStatus->enemyActors[i]; + if (actor != NULL && actor->takeTurnScript != NULL) { + if (does_script_exist(actor->takeTurnID)) { + found = TRUE; + } else { + actor->takeTurnScript = NULL; + } + } + } + + if (!found) { + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + actor = battleStatus->enemyActors[i]; + if (actor != NULL && actor->onHitScript != NULL) { + if (does_script_exist(actor->onHitID)) { + found = TRUE; + } else { + actor->onHitScript = NULL; + } + } + } + + if (!found) { + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + actor = battleStatus->enemyActors[i]; + if (actor != NULL) { + actor->flags &= ~ACTOR_FLAG_80000; + } + } + + if (battleStatus->unk_8C == 0) { + decrement_status_menu_disabled(); + if (!btl_check_player_defeated() && !btl_check_enemies_defeated()) { + actor = get_actor(partner->targetActorID); + if (actor != NULL) { + if (actor->onHitScriptSource != NULL) { + actor->lastEventType = EVENT_END_FIRST_STRIKE; + script = start_script(actor->onHitScriptSource, 0xA, 0x20); + actor->onHitScript = script; + actor->onHitID = script->id; + script->owner1.actorID = actor->actorID; + } + } + gBattleState2 = BATTLE_STATE2_UNK_3; + } + } + } + } + } + } + } + break; + case BATTLE_STATE2_UNK_3: + found = FALSE; + + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + actor = battleStatus->enemyActors[i]; + if (actor != NULL && actor->onHitScript != NULL) { + if (does_script_exist(actor->onHitID)) { + found = TRUE; + } else { + actor->onHitScript = NULL; + } + } + } + if (!found) { + btl_set_state(BATTLE_STATE_BEGIN_TURN); + } + break; + } +} void btl_state_draw_partner_striking_first(void) { if (D_8029F254 != 0) { @@ -1603,7 +2204,195 @@ void btl_state_draw_partner_striking_first(void) { } } +// ugly loops and such +#ifdef NON_EQUIVALENT +void btl_state_update_enemy_striking_first(void) { + PlayerData* playerData = &gPlayerData; + BattleStatus* battleStatus = &gBattleStatus; + Actor* player = battleStatus->playerActor; + Actor* partner = battleStatus->partnerActor; + Evt* script; + Actor* enemy; + s32 cond; + s32 i; + s32 j; + + Actor* temp_s0; + s32 temp_t0; + s32 temp_a1; + s16* temp_t4; + s16* var_a2; + s16* var_t3; + s32 temp_v0; + s32 var_a3; + s32 var_t2; + + s32 nextEnemyIdx; + s32 count; + + switch (gBattleState2) { + case 0: + battleStatus->unk_8C = 0; + battleStatus->lastAttackDamage = 0; + battleStatus->unk_19A = 0; + playerData->enemyFirstStrikes++; + battleStatus->flags1 &= ~2; + D_8029F254 = 0; + player->flags &= ~ACTOR_FLAG_8000000; + if (partner != NULL) { + partner->flags &= ~ACTOR_FLAG_8000000; + } + battleStatus->flags2 |= 0x01000000 | 0x4000; + count = 0; + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + if (battleStatus->enemyActors[i] != NULL) { + battleStatus->enemyIDs[i] = i | 0x200; + count++; + } + } + + battleStatus->numEnemyActors = count; + // for (i = 0; i < count - 1; i++) { + // for (j = i + 1; j < count; j++) { + // s32 temp_t0; + // s32 temp_a1; + + // temp_t0 = battleStatus->enemyActors[battleStatus->enemyIDs[i]]->turnPriority; + // temp_a1 = battleStatus->enemyActors[battleStatus->enemyIDs[j]]->turnPriority; + // if (temp_t0 < temp_a1) { + // battleStatus->enemyActors[battleStatus->enemyIDs[i]]->turnPriority = temp_a1; + // battleStatus->enemyActors[battleStatus->enemyIDs[j]]->turnPriority = temp_t0; + // } + // } + // } + + i = 0; + temp_v0 = var_t2 - 1; + temp_t4 = battleStatus->enemyIDs; + if (temp_v0 > 0) { + var_t3 = temp_t4; + do { + var_a3 = i + 1; + if (var_a3 < var_t2) { + var_a2 = &temp_t4[var_a3]; + do { + temp_t0 = (u16) *var_t3; + temp_a1 = (u16) *var_a2; + var_a3 += 1; + if (battleStatus->enemyActors[temp_t0 & 0xFF]->turnPriority < battleStatus->enemyActors[temp_a1 & 0xFF]->turnPriority) { + *var_t3 = temp_a1; + *var_a2 = temp_t0; + } + var_a2 += 2; + } while (var_a3 < var_t2); + } + i++; + var_t3 += 2; + } while (i < temp_v0); + } + + battleStatus->nextEnemyIndex = 0; + i = 0; + loop_18: + loop_19: + temp_s0 = battleStatus->enemyActors[battleStatus->enemyIDs[i]]; + if (temp_s0 == NULL) { + block_21: + i++; + if (i >= battleStatus->numEnemyActors) { + i = 0; + goto loop_18; + } + goto loop_19; + } + if (temp_s0->flags & 0x204000) { + goto block_21; + } + + nextEnemyIdx = i + 1; + battleStatus->currentTurnEnemy = enemy; + battleStatus->activeEnemyActorID = battleStatus->enemyIDs[i]; + if (nextEnemyIdx >= battleStatus->numEnemyActors) { + nextEnemyIdx = 0; + } + battleStatus->nextEnemyIndex = nextEnemyIdx; + btl_cam_target_actor(battleStatus->activeEnemyActorID); + enemy = battleStatus->currentTurnEnemy; + reset_actor_turn_info(); + battleStatus->battlePhase = 1; + script = start_script(enemy->takeTurnScriptSource, 0xA, 0); + enemy->takeTurnScript = script; + D_8029F248 = 3; + enemy->takeTurnID = script->id; + gBattleState2 = 2; + script->owner1.enemyID = battleStatus->activeEnemyActorID; + break; + case 2: + if (D_8029F248 != 0) { + D_8029F248--; + } else { + D_8029F254 = 1; + } + + enemy = battleStatus->currentTurnEnemy; + if ((enemy->takeTurnScript == NULL || !does_script_exist(enemy->takeTurnID)) && + ((enemy->takeTurnScript = NULL, (player->onHitScript == NULL)) || !does_script_exist(player->onHitID))) { + player->onHitScript = NULL; + if (partner != NULL) { + if (partner->onHitScript == NULL || !does_script_exist(partner->onHitID)) { + partner->onHitScript = NULL; + goto block_39; + } + } else { + block_39: + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + enemy = battleStatus->enemyActors[i]; + if (enemy != NULL && enemy->takeTurnScript != NULL) { + if (does_script_exist(enemy->takeTurnID)) { + cond = TRUE; + } else { + enemy->takeTurnScript = NULL; + } + } + } + + if (!cond) { + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + enemy = battleStatus->enemyActors[i]; + if (enemy != NULL && enemy->onHitScript != NULL) { + if (does_script_exist(enemy->onHitID)) { + cond = TRUE; + } else { + enemy->onHitScript = NULL; + } + } + } + + if (!cond) { + gBattleStatus.flags2 &= ~0x4000; + for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) { + enemy = battleStatus->enemyActors[i]; + if (enemy != NULL) { + enemy->flags &= 0xFFF7FFFF; + } + } + + if (battleStatus->unk_8C == 0 && + !btl_check_player_defeated() && + !btl_check_enemies_defeated()) + { + btl_set_state(5); + } + } + } + } + } + break; + } +} +#else INCLUDE_ASM(s32, "16F740", btl_state_update_enemy_striking_first); +#endif void btl_state_draw_enemy_striking_first(void) { if (D_8029F254 != 0) { diff --git a/src/5B320.c b/src/5B320.c index fb6f008b4f..7065ea4155 100644 --- a/src/5B320.c +++ b/src/5B320.c @@ -191,8 +191,10 @@ extern HudScript HudScript_Parakarry; extern HudScript HudScript_Watt; extern HudScript HudScript_Sushie; extern HudScript HudScript_Lakilester; +extern HudScript HudScript_Partner9; extern HudScript HudScript_Bow; extern HudScript HudScript_PartnerA; +extern HudScript HudScript_PartnerB; extern HudScript HudScript_Partner0Disabled; extern HudScript HudScript_GoombarioDisabled; extern HudScript HudScript_KooperDisabled; @@ -201,8 +203,10 @@ extern HudScript HudScript_ParakarryDisabled; extern HudScript HudScript_WattDisabled; extern HudScript HudScript_SushieDisabled; extern HudScript HudScript_LakilesterDisabled; +extern HudScript HudScript_Partner9Disabled; extern HudScript HudScript_BowDisabled; extern HudScript HudScript_PartnerADisabled; +extern HudScript HudScript_PartnerBDisabled; IconHudScriptPair gPartnerIconHudScripts[] = { { .enabled = &HudScript_Partner0, .disabled = &HudScript_Partner0Disabled, }, @@ -214,10 +218,10 @@ IconHudScriptPair gPartnerIconHudScripts[] = { { .enabled = &HudScript_Watt, .disabled = &HudScript_WattDisabled, }, { .enabled = &HudScript_Sushie, .disabled = &HudScript_SushieDisabled, }, { .enabled = &HudScript_Lakilester, .disabled = &HudScript_LakilesterDisabled, }, - { .enabled = (HudScript*)0x80107F78, .disabled = (HudScript*)0x80107FA0, }, + { .enabled = &HudScript_Partner9, .disabled = &HudScript_Partner9Disabled, }, { .enabled = &HudScript_PartnerA, .disabled = &HudScript_PartnerADisabled, }, - { .enabled = (HudScript*)0x80108018, .disabled = (HudScript*)0x80108040, }, - { .enabled = (HudScript*)0x80108018, .disabled = (HudScript*)0x80108040 }, + { .enabled = &HudScript_PartnerB, .disabled = &HudScript_PartnerBDisabled, }, + { .enabled = &HudScript_PartnerB, .disabled = &HudScript_PartnerBDisabled }, }; #include "move_table.inc.c" diff --git a/src/7E9D0.c b/src/7E9D0.c index 6965cad2cf..44d4827bf9 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -4,6 +4,7 @@ #include "world/partners.h" #include "world/actions.h" #include "npc.h" +#include "effects.h" extern void* D_8010C924; extern s32 D_8010C964; @@ -390,8 +391,8 @@ void set_action_state(s32 actionState) { sfx_stop_sound(spinState->spinSoundID); } - if (playerStatus->unk_D8) { - playerStatus->unk_D8[3][9] = 0xA; // TODO: Substruct? Currently UB. + if (playerStatus->unk_D8 != NULL) { + ((Effect46FXData*)playerStatus->unk_D8->data)->unk_24 = 10; playerStatus->unk_D8 = NULL; } } diff --git a/src/C50A0.c b/src/C50A0.c index 73d8972c5b..f89488c0a1 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -192,7 +192,7 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { f32 posZ; f32 depth; s32 id; - + for (i = 0; i < MAX_ITEM_ENTITIES; i++) { if (gCurrentItemEntities[i] == NULL) { break; @@ -200,11 +200,11 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { } ASSERT(i < MAX_ITEM_ENTITIES); id = i; - + gCurrentItemEntities[id] = item = heap_malloc(sizeof(*item)); ItemEntitiesCreated++; ASSERT(item != NULL); - + itemID &= 0xFFFF; item->renderGroup = -1; item->flags = (ITEM_ENTITY_FLAGS_CAM0 | ITEM_ENTITY_FLAGS_CAM1 | ITEM_ENTITY_FLAGS_CAM2 | ITEM_ENTITY_FLAGS_10 | ITEM_ENTITY_FLAGS_2000000); @@ -218,7 +218,7 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { item->position.x = playerStatus->position.x; item->position.y = playerStatus->position.y; item->position.z = playerStatus->position.z; - + item->shadowIndex = -1; item->nextUpdate = 1; item->unk_34.x = -9999; @@ -238,7 +238,7 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { item->flags |= ITEM_ENTITY_FLAGS_20000; } ItemEntityAlternatingSpawn = 1 - ItemEntityAlternatingSpawn; - + item->shadowIndex = create_shadow_type(0, item->position.x, item->position.y, item->position.z); shadow = get_shadow_by_index(item->shadowIndex); shadow->flags |= 1; @@ -251,12 +251,12 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { shadow->position.x = posX; shadow->position.y = posY; shadow->position.z = posZ; - + shadow->rotation.x = gGameStatusPtr->playerGroundTraceAngles.x; shadow->rotation.y = 0.0f; shadow->rotation.z = gGameStatusPtr->playerGroundTraceAngles.z; set_standard_shadow_scale(shadow, depth * 0.5f); - + item_entity_load(item); if (item->itemID == ITEM_COIN) { sparkle_script_init(item, &SparkleScript_Coin); diff --git a/src/battle/action_cmd/body_slam.c b/src/battle/action_cmd/body_slam.c index adc69a4487..95f9c1b113 100644 --- a/src/battle/action_cmd/body_slam.c +++ b/src/battle/action_cmd/body_slam.c @@ -5,14 +5,16 @@ extern HudScript HudScript_BlueMeter; extern HudScript HudScript_AButton; +extern HudScript HudScript_AButtonDown; extern HudScript HudScript_TimingWait; +extern HudScript HudScript_TimingReady; extern HudScript HudScript_FillGaugeResult; extern s32 D_80294320; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 100; battleStatus->unk_434 = &D_80294320; @@ -34,35 +36,148 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_FillGaugeResult); - actionCommandStatus->hudElements[3] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_FillGaugeResult); + actionCommandStatus->hudElements[3] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_TimingWait); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 22); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80); + id = hud_element_create(&HudScript_TimingWait); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 22); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); return ApiStatus_DONE2; } #include "common/MashActionCommandInit.inc.c" -INCLUDE_ASM(s32, "battle/action_cmd/body_slam", func_802A92D4_4285B4); +void func_802A92D4_4285B4(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 id; + s32 phi_v0; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[2]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[3]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 22); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX + 42, actionCommandStatus->hudElementY + 24); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButtonDown); + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_46 = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + sfx_play_sound_with_params(0x80000041, 0, 0, 0); + actionCommandStatus->state = 11; + case 11: + btl_set_popup_duration(99); + + if (battleStatus->currentButtonsDown & BUTTON_A) { + actionCommandStatus->barFillLevel += 154; + actionCommandStatus->unk_46 += 154; + } else { + actionCommandStatus->unk_54 = 0; + } + + if (actionCommandStatus->barFillLevel >= 10000) { + actionCommandStatus->barFillLevel = 10000; + hud_element_set_script(actionCommandStatus->hudElements[2], &HudScript_TimingReady); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButton); + if (actionCommandStatus->unk_68 == 0) { + sfx_play_sound(SOUND_234); + actionCommandStatus->unk_68 = 1; + } + } + + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; + sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + + do { + if (actionCommandStatus->unk_46 < 10000) { + battleStatus->actionSuccess = -1; + } else if (actionCommandStatus->unk_46 - (battleStatus->unk_434[actionCommandStatus->unk_50] * 154) >= 10309) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = 1; + } + } while (0); // required to match + + battleStatus->unk_86 = 0; + if (battleStatus->actionSuccess == 1) { + func_80269160(); + } + btl_set_popup_duration(0); + sfx_stop_sound(0x80000041); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} void N(draw_hud_elements)(void) { s32 x, y; diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index f0e3e978a6..defa46da20 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -10,21 +10,7 @@ extern s32 D_80294300; extern HudScript HudScript_MashAButton; -typedef struct UnkVec2s { - /* 0x00 */ s16 unk_0; - /* 0x02 */ s16 unk_2; -} UnkVec2s; - -UnkVec2s D_802A9812_428280[] = { - { 0x0, 0x00 }, - { 0x0, 0x19 }, - { 0x0, 0x32 }, - { 0x0, 0x4B }, - { 0x0, 0x4B }, - { 0x0, 0x00 }, - { 0x0, 0x00 }, - { 0x0, 0x00 }, -}; +s32 D_802A9810_428280[] = { 0, 25, 50, 75, 75, 0, 0, 0 }; ApiStatus func_802A9000_427A70(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -132,7 +118,7 @@ void func_802A928C_427CFC(void) { if (!actionCommandStatus->unk_68) { mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; actionCommandStatus->barFillLevel -= - D_802A9812_428280[actionCommandStatus->barFillLevel / mashMeterCutoff / 20].unk_2; + D_802A9810_428280[actionCommandStatus->barFillLevel / mashMeterCutoff / 20]; if (actionCommandStatus->barFillLevel < 0) { actionCommandStatus->barFillLevel = 0; diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 09f19f32ea..2db9060b66 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -5,6 +5,7 @@ extern s32 D_80294220; extern HudScript HudScript_AButton; +extern HudScript HudScript_MashAButton; extern HudScript HudScript_BlueMeter; extern HudScript HudScript_RunningAway; extern HudScript HudScript_RunAwayOK; @@ -12,7 +13,7 @@ extern HudScript HudScript_RunAwayOK; ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 0; battleStatus->unk_434 = &D_80294220; @@ -35,29 +36,29 @@ ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_RunningAway); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_RunningAway); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_RunAwayOK); - actionCommandStatus->hudElements[3] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_RunAwayOK); + actionCommandStatus->hudElements[3] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -96,14 +97,137 @@ ApiStatus func_802A91B0_4235A0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/break_free", func_802A92DC_4236CC); + +void func_802A92DC_4236CC(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 id; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[2]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[3]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 31, actionCommandStatus->hudElementY - 1); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX + 31, actionCommandStatus->hudElementY + 17); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_MashAButton); + actionCommandStatus->state = 11; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + case 11: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_5C == 0) { + actionCommandStatus->unk_46++; + if (actionCommandStatus->unk_46 >= actionCommandStatus->unk_5A) { + actionCommandStatus->unk_46 = actionCommandStatus->unk_5A; + actionCommandStatus->unk_5C = 1; + } + } else { + actionCommandStatus->unk_46--; + if (actionCommandStatus->unk_46 <= 0) { + actionCommandStatus->unk_46 = 0; + actionCommandStatus->unk_5C = 0; + } + } + + if (actionCommandStatus->unk_6A == 0) { + s32 inputBufPos = battleStatus->inputBufferPos; + s32 temp_a2 = actionCommandStatus->unk_52 - actionCommandStatus->unk_54; + s32 i; + + actionCommandStatus->barFillLevel = 0; + + inputBufPos -= temp_a2; + if (inputBufPos < 0) { + inputBufPos += ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + for (i = 0; i < temp_a2; i++, inputBufPos++) { + if (inputBufPos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + inputBufPos -= ARRAY_COUNT(battleStatus->pushInputBuffer); + } + if (battleStatus->pushInputBuffer[inputBufPos] & BUTTON_A) { + actionCommandStatus->barFillLevel += battleStatus->unk_434[actionCommandStatus->unk_50]; + } + } + } else { + actionCommandStatus->barFillLevel += (battleStatus->unk_434[actionCommandStatus->unk_50]) / 4; + actionCommandStatus->barFillLevel += rand_int(battleStatus->unk_434[actionCommandStatus->unk_50] / 4); + } + + battleStatus->actionSuccess = actionCommandStatus->barFillLevel / 100; + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + + if (battleStatus->actionSuccess >= actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals] - actionCommandStatus->unk_46) { + battleStatus->unk_86 = 1; + battleStatus->actionSuccess = 1; + } else { + battleStatus->unk_86 = -2; + battleStatus->actionSuccess = -1; + } + + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 20; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} void func_802A96B8_423AA8(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32* hudElements = actionCommandStatus->hudElements; s32 hudX; s32 hudY; - s32 hudElement; + s32 id; s16 mashMeterCutoff; s32 thirtyOne; @@ -121,9 +245,9 @@ void func_802A96B8_423AA8(void) { hud_element_draw_clipped(hudElements[0]); } - hudElement = hudElements[1]; - hud_element_draw_clipped(hudElement); - hud_element_get_render_pos(hudElement, &hudX, &hudY); + id = hudElements[1]; + hud_element_draw_clipped(id); + hud_element_get_render_pos(id, &hudX, &hudY); func_80268770(hudX, hudY, actionCommandStatus->barFillLevel / 100); hud_element_draw_clipped(hudElements[2]); diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 787cde244a..2177e55f59 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -6,12 +6,15 @@ extern s32 D_802942A0; extern HudScript HudScript_BlueMeter; extern HudScript HudScript_AButton; +extern HudScript HudScript_MashAButton; extern HudScript HudScript_100pct; +s32 D_802A9800_426970[8] = { 0, 25, 50, 75, 75, 0, 0, 0 }; + ApiStatus func_802A9000_426170(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 100; battleStatus->unk_434 = &D_802942A0; @@ -34,30 +37,166 @@ ApiStatus func_802A9000_426170(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_100pct); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_100pct); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } #include "common/MashActionCommandInit.inc.c" -INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A928C_4263FC); +void func_802A928C_4263FC(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 id; + s32 cutoff; + s32 fillLevel; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_MashAButton); + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + sfx_play_sound_with_params(0x80000041, 0, 0, 0); + actionCommandStatus->state = 11; + case 11: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_68 == 0) { + if (actionCommandStatus->unk_64 != 0) { + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + + actionCommandStatus->barFillLevel -= D_802A9800_426970[actionCommandStatus->barFillLevel / cutoff / 20]; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } else { + actionCommandStatus->barFillLevel -= 10; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } + } + + if (battleStatus->currentButtonsPressed & A_BUTTON) { + s32 a = battleStatus->unk_434[actionCommandStatus->unk_50]; + s32 b = actionCommandStatus->unk_64 * 850; + s32 temp_v1_2 = (a * b) / 10000; + + if (temp_v1_2 != 0) { + actionCommandStatus->barFillLevel += temp_v1_2; + } else { + actionCommandStatus->barFillLevel += 100; + if (actionCommandStatus->barFillLevel >= 500) { + actionCommandStatus->barFillLevel = 500; + } + } + } + + if (actionCommandStatus->barFillLevel >= 10000) { + id = actionCommandStatus->hudElements[2]; + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_68 = 1; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); + hud_element_clear_flags(id, 2); + } + + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; + sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + + fillLevel = actionCommandStatus->barFillLevel; + if (actionCommandStatus->unk_64 == 0) { + fillLevel = 0; + } + + if (fillLevel == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = fillLevel / 100; + + } + + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + if (battleStatus->actionSuccess >= cutoff) { + battleStatus->unk_86 = 1; + } else { + battleStatus->unk_86 = -2; + } + + if (battleStatus->actionSuccess == 100) { + func_80269160(); + } + sfx_stop_sound(0x80000041); + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_64 == 0) { + actionCommandStatus->barFillLevel -= 100; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} #include "common/UnkActionCommandFunc1.inc.c" diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index ed3fd974eb..ac1803142b 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -1,17 +1,24 @@ #include "common.h" #include "hud_element.h" +#include "battle/battle.h" #define NAMESPACE action_command_fire_shell extern s32 D_802942C0; +extern HudScript HudScript_StickMashLeft; extern HudScript HudScript_StickNeutral; extern HudScript HudScript_BlueMeter; extern HudScript HudScript_100pct; +s32 D_802A9950_427320[5] = { 0, 25, 50, 75, 75 }; +s32 D_802A9964_427334[4] = { 40, 70, 99, 200 }; +s32 D_802A9974_427344[5] = { 35, 60, 80, 99, 200 }; +s32 D_802A9988_427358[6] = { 35, 35, 60, 80, 99, 200 }; + ApiStatus func_802A9000_4269D0(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 100; battleStatus->unk_434 = &D_802942C0; @@ -35,31 +42,178 @@ ApiStatus func_802A9000_4269D0(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_StickNeutral); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_StickNeutral); + actionCommandStatus->hudElements[0] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_100pct); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_100pct); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } - #include "common/MashActionCommandInit.inc.c" -INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9294_426C64); +void func_802A9294_426C64(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + s32 id; + s32 cutoff; + s32 fillLevel; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_StickMashLeft); + actionCommandStatus->barFillLevel = 0; + battleStatus->unk_85 = 0; + actionCommandStatus->unk_5C = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + sfx_play_sound_with_params(0x80000041, 0, 0, 0); + actionCommandStatus->state = 11; + case 11: + btl_set_popup_duration(99); + + if (actionCommandStatus->unk_68 == 0) { + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + actionCommandStatus->barFillLevel -= D_802A9950_427320[actionCommandStatus->barFillLevel / cutoff / 20]; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + if (actionCommandStatus->unk_68 == 0) { + if (battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) { + actionCommandStatus->unk_5C = 1; + } + + if (!(battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) && (actionCommandStatus->unk_5C != 0)) { + actionCommandStatus->barFillLevel += (battleStatus->unk_434[actionCommandStatus->unk_50] * 950) / 100; + actionCommandStatus->unk_5C = 0; + } + + if (battleStatus->currentButtonsPressed & BUTTON_STICK_RIGHT) { + actionCommandStatus->barFillLevel -= (battleStatus->unk_434[actionCommandStatus->unk_50] * 950) / 100; + } + } + } + + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + + if (actionCommandStatus->barFillLevel > 10000) { + id = actionCommandStatus->hudElements[2]; + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_68 = 1; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); + hud_element_clear_flags(id, 2); + } + + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; + sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); + switch (partner->actorBlueprint->level) { + case 0: + if (battleStatus->unk_84 >= D_802A9964_427334[battleStatus->unk_85]) { + battleStatus->unk_85++; + } + if (battleStatus->unk_85 > 0 && (battleStatus->unk_84 < D_802A9964_427334[battleStatus->unk_85 - 1])) { + battleStatus->unk_85--; + } + break; + case 1: + if (battleStatus->unk_84 >= D_802A9974_427344[battleStatus->unk_85]) { + battleStatus->unk_85++; + } + if (battleStatus->unk_85 > 0 && (battleStatus->unk_84 < D_802A9974_427344[battleStatus->unk_85 - 1])) { + battleStatus->unk_85--; + } + break; + case 2: + if (battleStatus->unk_84 >= D_802A9988_427358[battleStatus->unk_85]) { + battleStatus->unk_85++; + } + if (battleStatus->unk_85 > 0 && (battleStatus->unk_84 < D_802A9988_427358[battleStatus->unk_85 - 1])) { + battleStatus->unk_85--; + } + break; + } + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + + if (actionCommandStatus->barFillLevel == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = actionCommandStatus->barFillLevel / 100; + } + + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + if (cutoff >= battleStatus->actionSuccess) { + battleStatus->unk_86 = -2; + } else { + battleStatus->unk_86 = 1; + } + + if (battleStatus->actionSuccess == 100) { + func_80269160(); + } + sfx_stop_sound(0x80000041); + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} #include "common/UnkActionCommandFunc1.inc.c" diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 2ddd39ff9b..8cbbbfe1b0 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -6,18 +6,23 @@ // icon indexes for hud elements extern HudScript HudScript_TimingBar1Chance; extern HudScript HudScript_TimingWait; +extern HudScript HudScript_TimingCharge1; +extern HudScript HudScript_TimingCharge2; +extern HudScript HudScript_TimingCharge3; extern HudScript HudScript_TimingCharge4a; extern HudScript HudScript_TimingCharge4b; extern HudScript HudScript_TimingCharge4c; extern HudScript HudScript_StickHoldLeft; +extern HudScript HudScript_StickTapNeutral; extern HudScript HudScript_RightOn; +extern HudScript HudScript_TimingReady; extern s32 D_802941E0; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 1; battleStatus->unk_434 = &D_802941E0; @@ -36,48 +41,48 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->unk_60 = 0; actionCommandStatus->hudElementY = 96; - hudElement = hud_element_create(&HudScript_TimingBar1Chance); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 10); + id = hud_element_create(&HudScript_TimingBar1Chance); + actionCommandStatus->hudElements[0] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 10); - hudElement = hud_element_create(&HudScript_TimingWait); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_TimingWait); + actionCommandStatus->hudElements[1] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_TimingCharge4a); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_TimingCharge4a); + actionCommandStatus->hudElements[2] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_TimingCharge4b); - actionCommandStatus->hudElements[3] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_TimingCharge4b); + actionCommandStatus->hudElements[3] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_TimingCharge4c); - actionCommandStatus->hudElements[4] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_TimingCharge4c); + actionCommandStatus->hudElements[4] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_StickHoldLeft); - actionCommandStatus->hudElements[5] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_StickHoldLeft); + actionCommandStatus->hudElements[5] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_RightOn); - actionCommandStatus->hudElements[6] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_alpha(hudElement, 0xFF); + id = hud_element_create(&HudScript_RightOn); + actionCommandStatus->hudElements[6] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_alpha(id, 0xFF); return ApiStatus_DONE2; } @@ -115,7 +120,215 @@ ApiStatus func_802A9258_422258(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A936C_42236C); +void func_802A936C_42236C(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Actor* partner = battleStatus->partnerActor; + s32 id; + f32 temp_f20; + s32 phi_s0; + s32 new_var; + s32 a; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + + id = actionCommandStatus->hudElements[1]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + + id = actionCommandStatus->hudElements[2]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + + id = actionCommandStatus->hudElements[3]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + + id = actionCommandStatus->hudElements[4]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + + id = actionCommandStatus->hudElements[5]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX + 21, actionCommandStatus->hudElementY - 3); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 5, actionCommandStatus->hudElementY + 1); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - 7, actionCommandStatus->hudElementY + 1); + hud_element_set_render_pos(actionCommandStatus->hudElements[4], actionCommandStatus->hudElementX - 19, actionCommandStatus->hudElementY + 1); + hud_element_set_render_pos(actionCommandStatus->hudElements[5], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY - 23); + if (actionCommandStatus->autoSucceed != 0) { + id = actionCommandStatus->hudElements[6]; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + break; + } + } + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E < 15) { + hud_element_set_alpha(actionCommandStatus->hudElements[0], 255); + hud_element_set_alpha(actionCommandStatus->hudElements[1], 255); + hud_element_set_alpha(actionCommandStatus->hudElements[2], 255); + hud_element_set_alpha(actionCommandStatus->hudElements[3], 255); + hud_element_set_alpha(actionCommandStatus->hudElements[4], 255); + hud_element_set_alpha(actionCommandStatus->hudElements[5], 255); + } + + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + + actionCommandStatus->unk_54 = 0; + if (!(battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) && battleStatus->unk_83 < 2) { + actionCommandStatus->unk_5F = 1; + } + actionCommandStatus->state = 11; + case 11: + btl_set_popup_duration(99); + + if (battleStatus->unk_83 < 0) { + return; + } + + phi_s0 = battleStatus->unk_434[actionCommandStatus->unk_50]; + new_var = phi_s0 + 2; + temp_f20 = (actionCommandStatus->unk_52 - new_var) / 3; + + if (actionCommandStatus->unk_54 < temp_f20) { + hud_element_set_script(actionCommandStatus->hudElements[4], &HudScript_TimingCharge3); + battleStatus->unk_84 = 0; + if (actionCommandStatus->unk_54 == 0 && actionCommandStatus->unk_62 != 0) { + sfx_play_sound(SOUND_233); + } + } else if (actionCommandStatus->unk_54 < temp_f20 * 2) { + hud_element_set_script(actionCommandStatus->hudElements[3], &HudScript_TimingCharge2); + battleStatus->unk_84 = 1; + if (actionCommandStatus->unk_54 == temp_f20) { + if (actionCommandStatus->unk_62 != 0) { + sfx_play_sound(SOUND_233); + } + } + } else if (actionCommandStatus->unk_54 < temp_f20 * 3.0f) { + hud_element_set_script(actionCommandStatus->hudElements[2], &HudScript_TimingCharge1); + battleStatus->unk_84 = 2; + if (actionCommandStatus->unk_54 == temp_f20 * 2) { + if (actionCommandStatus->unk_62 != 0) { + sfx_play_sound(SOUND_233); + } + } + } + + if (actionCommandStatus->unk_54 == (~phi_s0 + actionCommandStatus->unk_52)) { + battleStatus->unk_84 = 3; + hud_element_set_script(actionCommandStatus->hudElements[1], &HudScript_TimingReady); + hud_element_set_script(actionCommandStatus->hudElements[5], &HudScript_StickTapNeutral); + if (actionCommandStatus->unk_62 != 0) { + sfx_play_sound(SOUND_234); + } + if (actionCommandStatus->autoSucceed != 0 && actionCommandStatus->autoSucceed != 2) { + actionCommandStatus->autoSucceed = 2; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52 - 4; + } + } + + a = actionCommandStatus->unk_52 - actionCommandStatus->unk_54; + phi_s0 = battleStatus->unk_434[actionCommandStatus->unk_50] - a + 3; + if (phi_s0 < 0) { + phi_s0 = 0; + } + + if (!(battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) && + phi_s0 == 0 && + actionCommandStatus->autoSucceed == 0 && + battleStatus->unk_83 < 2) + { + battleStatus->actionSuccess = -1; + battleStatus->unk_86 = -1; + func_80268C9C(); + } else { + s32 i; + s32 bufferPos; + + bufferPos = battleStatus->inputBufferPos; + bufferPos -= phi_s0; + if (bufferPos < 0) { + bufferPos += ARRAY_COUNT(battleStatus->holdInputBuffer); + } + + if (battleStatus->actionSuccess == 0) { + for (i = 0; i < phi_s0; i++, bufferPos++) { + if (bufferPos >= ARRAY_COUNT(battleStatus->holdInputBuffer)) { + bufferPos -= ARRAY_COUNT(battleStatus->holdInputBuffer); + } + + if (!(battleStatus->holdInputBuffer[bufferPos] & BUTTON_STICK_LEFT) || + actionCommandStatus->autoSucceed != 0) + { + battleStatus->actionSuccess = 1; + battleStatus->unk_86 = 1; + gBattleStatus.flags1 |= BS_FLAGS1_2000; + } + } + } + + if (battleStatus->unk_83 < 2 || actionCommandStatus->unk_54 != actionCommandStatus->unk_52) { + actionCommandStatus->unk_54++; + if (actionCommandStatus->unk_52 < actionCommandStatus->unk_54) { + if (battleStatus->actionSuccess == 0) { + battleStatus->actionSuccess = -1; + } + + if (battleStatus->actionSuccess == 1) { + func_80269160(); + } + + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + } + } + } + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} void N(draw_hud_elements)(void) { hud_element_draw_clipped(gActionCommandStatus.hudElements[0]); diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 58db12a289..99c6564047 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -6,13 +6,17 @@ extern s32 D_80294420; extern HudScript HudScript_BlueMeter; extern HudScript HudScript_AButton; +extern HudScript HudScript_MashAButton; extern HudScript HudScript_BButton; +extern HudScript HudScript_MashBButton1; extern HudScript HudScript_100pct; +s32 D_802A98E0_42FFC0[8] = { 0, 25, 50, 75, 75, 0, 0, 0 }; + ApiStatus func_802A9000_42F6E0(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 5; battleStatus->unk_434 = &D_80294420; @@ -33,29 +37,29 @@ ApiStatus func_802A9000_42F6E0(void) { actionCommandStatus->unk_68 = 0; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_BButton); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_BButton); + actionCommandStatus->hudElements[2] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_100pct); - actionCommandStatus->hudElements[4] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_100pct); + actionCommandStatus->hudElements[4] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -63,7 +67,7 @@ ApiStatus func_802A9000_42F6E0(void) { ApiStatus func_802A91A0_42F880(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32* args = script->ptrReadPos; + Bytecode* args = script->ptrReadPos; if (battleStatus->unk_83 == 0) { battleStatus->actionSuccess = 0; @@ -91,20 +95,237 @@ ApiStatus func_802A91A0_42F880(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A92A0_42F980); +// Almost identical to func_802A92A0_42DCB0 (mega_shock) +void func_802A92A0_42F980(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + + s32 buttonsPushed; + s32 frameCount; + s32 buttonsAB; + s32 bufferPos; + s32 hudElement; + s32 mashMeterIndex; + s32 mashMeterCutoff; + s8 adjustedFillLevel; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + hudElement = actionCommandStatus->hudElements[0]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + } + hud_element_set_alpha(hudElement, 255); + + hudElement = actionCommandStatus->hudElements[2]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + } + hud_element_set_alpha(hudElement, 255); + + hudElement = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(hudElement, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_6C != 0) { + actionCommandStatus->unk_6C--; + break; + } + + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX - 17, + actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 23, + actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY + 28); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + break; + } + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_MashAButton); + hud_element_set_script(actionCommandStatus->hudElements[2], &HudScript_MashBButton1); + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_5C = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + actionCommandStatus->state = 11; + // fallthrough + case 11: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_68 == 0) { + s16 newFillLevel; + + if (actionCommandStatus->unk_64 != 0) { + s8 mashMeterIntervals = actionCommandStatus->mashMeterIntervals; + s16* mashMeterCutoffs = actionCommandStatus->mashMeterCutoffs; + s32 index; + + mashMeterCutoff = mashMeterCutoffs[mashMeterIntervals]; + index = actionCommandStatus->barFillLevel / mashMeterCutoff / 20; + newFillLevel = actionCommandStatus->barFillLevel - D_802A98E0_42FFC0[index]; + } else { + newFillLevel = actionCommandStatus->barFillLevel - 10; + } + + actionCommandStatus->barFillLevel = newFillLevel; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } + + bufferPos = battleStatus->inputBufferPos; + bufferPos -= 2; + if (bufferPos < 0) { + bufferPos += ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + buttonsPushed = 0; + frameCount = 1; + + while(frameCount >= 0) { + if (bufferPos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + bufferPos -= ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + buttonsPushed |= battleStatus->pushInputBuffer[bufferPos++]; + frameCount--; + } + + buttonsAB = BUTTON_A | BUTTON_B; + if ((buttonsPushed & buttonsAB) == buttonsAB) { + if (actionCommandStatus->unk_64 != 0) { + s32 fillLevel; + + fillLevel = actionCommandStatus->unk_64 * 650; + fillLevel = fillLevel / 100 * battleStatus->unk_434[actionCommandStatus->unk_50]; + + // Perplexing reuse of buttonsPushed here, but it fixes register allocation. Likely another + // subexpression from above can be put into a variable and reused instead. + // + // TODO: Find a way to avoid reusing buttonsPushed. + buttonsPushed = fillLevel / 100; + + actionCommandStatus->barFillLevel += buttonsPushed; + } else { + actionCommandStatus->barFillLevel += 100; + + if (actionCommandStatus->barFillLevel >= 500) { + actionCommandStatus->barFillLevel = 500; + } + } + + bufferPos = battleStatus->inputBufferPos; + bufferPos -= 2; + if (bufferPos < 0) { + bufferPos += ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + frameCount = 1; + while (frameCount >= 0) { + if (bufferPos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + bufferPos -= ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + battleStatus->pushInputBuffer[bufferPos++] = 0; + frameCount--; + } + } + + if (actionCommandStatus->barFillLevel > 10000) { + hudElement = actionCommandStatus->hudElements[4]; + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_68 = 1; + hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 50, + actionCommandStatus->hudElementY + 28); + hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + } + + adjustedFillLevel = actionCommandStatus->barFillLevel / 100; + + battleStatus->unk_84 = adjustedFillLevel; + + if (actionCommandStatus->unk_54 == 0) { + s16 threshold; + + // Again, reusing buttonsPushed specifically for reg-alloc. See above. + // + // TODO: Find a way to avoid reusing buttonsPushed. + buttonsPushed = actionCommandStatus->barFillLevel; + if (actionCommandStatus->unk_64 == 0) { + buttonsPushed = 0; + } + + if (buttonsPushed == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = buttonsPushed / 100; + } + + mashMeterIndex = actionCommandStatus->mashMeterIntervals - 1; + mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[mashMeterIndex]; + threshold = mashMeterCutoff / 2; + + if (battleStatus->unk_84 <= threshold) { + battleStatus->unk_86 = -4; + } else { + battleStatus->unk_86 = 1; + } + + if (battleStatus->actionSuccess == 100) { + func_80269160(); + } + + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + } else { + actionCommandStatus->unk_54 -= 1; + } + break; + case 12: + if (actionCommandStatus->unk_64 == 0) { + actionCommandStatus->barFillLevel -= 100; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54 -= 1; + } else { + func_80268C9C(); + } + break; + } +} void func_802A97AC_42FE8C(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 hudY; s32 hudX; - s32 hudElement; + s32 id; hud_element_draw_clipped(actionCommandStatus->hudElements[0]); hud_element_draw_clipped(actionCommandStatus->hudElements[2]); - hudElement = actionCommandStatus->hudElements[1]; - hud_element_draw_clipped(hudElement); - hud_element_get_render_pos(hudElement, &hudX, &hudY); + id = actionCommandStatus->hudElements[1]; + hud_element_draw_clipped(id); + hud_element_get_render_pos(id, &hudX, &hudY); if (actionCommandStatus->unk_68 == 0) { func_80268770(hudX, hudY, actionCommandStatus->barFillLevel / 100); diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 7db3aae63b..2a63a75069 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -9,22 +9,10 @@ extern HudScript HudScript_BButton; extern HudScript HudScript_100pct; extern s32 D_802943C0; -extern HudScript HudScript_MashAButton; -extern HudScript HudScript_MashBButton1; +extern HudScript HudScript_MashAButton[]; +extern HudScript HudScript_MashBButton1[]; -typedef struct structD_802A9930_42E340 { - /* 0x00 */ s16 unk_0; - /* 0x08 */ u16 unk_8; -} structD_802A9930_42E340; - -structD_802A9930_42E340 D_802A9930_42E340[] = { - { 0, 0, }, - { 0, 0x19 }, - { 0, 0x32 }, - { 0, 0x4B }, - { 0, 0x4B }, - { 0, 0 }, -}; +s32 D_802A9930_42E340[] = { 0, 25, 50, 75, 75, 0, 0, 0 }; ApiStatus func_802A9000_42DA10(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -175,8 +163,8 @@ void func_802A92A0_42DCB0(void) { actionCommandStatus->unk_4E--; break; } - hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_MashAButton); - hud_element_set_script(actionCommandStatus->hudElements[2], &HudScript_MashBButton1); + hud_element_set_script(actionCommandStatus->hudElements[0], HudScript_MashAButton); + hud_element_set_script(actionCommandStatus->hudElements[2], HudScript_MashBButton1); actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_5C = 0; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; @@ -194,7 +182,7 @@ void func_802A92A0_42DCB0(void) { mashMeterCutoff = mashMeterCutoffs[mashMeterIntervals]; index = actionCommandStatus->barFillLevel / mashMeterCutoff / 20; - newFillLevel = actionCommandStatus->barFillLevel - D_802A9930_42E340[index].unk_8; + newFillLevel = actionCommandStatus->barFillLevel - D_802A9930_42E340[index]; } else { newFillLevel = actionCommandStatus->barFillLevel - 10; } diff --git a/src/battle/action_cmd/power_shock.c b/src/battle/action_cmd/power_shock.c index 34c2fac240..e8440239b5 100644 --- a/src/battle/action_cmd/power_shock.c +++ b/src/battle/action_cmd/power_shock.c @@ -9,7 +9,7 @@ extern HudScript HudScript_MashAButton; extern HudScript HudScript_RunAwayOK; extern HudScript HudScript_100pct; extern s32 D_802943A0[]; -extern s16 D_802A9AA2_42D9B2[]; +s32 D_802A9AA0_42D9B0[] = { 0, 25, 50, 75, 75, 0, 0, 0}; extern s32 D_802A9B00; void func_80268834(s32, s32, s32, s32); @@ -17,10 +17,10 @@ void func_80268834(s32, s32, s32, s32); ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; s32 temp_v1; - battleStatus->unk_82 = 0x64; + battleStatus->unk_82 = 100; battleStatus->unk_434 = D_802943A0; if (battleStatus->unk_83 == 0) { @@ -42,29 +42,29 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { D_802A9B00 = 0; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_100pct); - actionCommandStatus->hudElements[3] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_100pct); + actionCommandStatus->hudElements[3] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_RunAwayOK); - actionCommandStatus->hudElements[4] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_RunAwayOK); + actionCommandStatus->hudElements[4] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); temp_v1 = (100 - actionCommandStatus->unk_46) * 60; temp_v1 /= 100; @@ -104,29 +104,28 @@ ApiStatus func_802A9210_42D120(Evt* script, s32 isInitialCall) { void func_802A9310_42D220(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; - s32 temp_lo; + s32 id; s32 temp_v0_2; - s16 phi_v0; s32 phi_a1; + s32 cutoff; switch (actionCommandStatus->state) { case 0: btl_set_popup_duration(99); - hudElement = actionCommandStatus->hudElements[0]; + id = actionCommandStatus->hudElements[0]; if (actionCommandStatus->unk_61 != 0) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - hud_element_set_alpha(hudElement, 0xFF); - hudElement = actionCommandStatus->hudElements[1]; - hud_element_set_alpha(hudElement, 0xFF); + hud_element_set_alpha(id, 255); + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); if (actionCommandStatus->unk_61 != 0) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - hudElement = actionCommandStatus->hudElements[4]; - hud_element_set_alpha(hudElement, 0xFF); + id = actionCommandStatus->hudElements[4]; + hud_element_set_alpha(id, 255); if (actionCommandStatus->unk_61 != 0) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } actionCommandStatus->state = 1; break; @@ -148,8 +147,9 @@ void func_802A9310_42D220(void) { actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - temp_v0_2 = (((100 - actionCommandStatus->unk_46) * 60) / 100); - temp_v0_2 = 29 - temp_v0_2; + cutoff = 100 - actionCommandStatus->unk_46; + cutoff = (cutoff * 60) / 100; + temp_v0_2 = 29 - cutoff; hud_element_set_render_pos( actionCommandStatus->hudElements[4], actionCommandStatus->hudElementX - temp_v0_2, @@ -167,7 +167,7 @@ void func_802A9310_42D220(void) { actionCommandStatus->unk_5C = 0; D_802A9B00 = 1; actionCommandStatus->unk_54 = actionCommandStatus->unk_52; - sfx_play_sound_with_params(0x80000041, 0U, 0U, 0U); + sfx_play_sound_with_params(0x80000041, 0, 0, 0); actionCommandStatus->state = 11; // fallthrough case 11: @@ -175,47 +175,50 @@ void func_802A9310_42D220(void) { if (actionCommandStatus->unk_68 == 0) { if (actionCommandStatus->unk_64 != 0) { - temp_lo = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; - temp_lo = actionCommandStatus->unk_44 / temp_lo; - phi_v0 = actionCommandStatus->unk_44 - D_802A9AA2_42D9B2[temp_lo / 20 * 2]; + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + actionCommandStatus->barFillLevel -= D_802A9AA0_42D9B0[actionCommandStatus->barFillLevel / cutoff / 20]; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } } else { - phi_v0 = actionCommandStatus->unk_44 - 10; - } - actionCommandStatus->unk_44 = phi_v0; - if (actionCommandStatus->unk_44 < 0) { - actionCommandStatus->unk_44 = 0; - } - } - - if ((battleStatus->currentButtonsPressed & 0x8000) != 0) { - if (actionCommandStatus->unk_64 != 0) { - // unk_434 = array of scaling values based on attack difficulty (unk_50). - actionCommandStatus->unk_44 += - battleStatus->unk_434[actionCommandStatus->unk_50] * 850 / 100 * actionCommandStatus->unk_64 / 100; - } else { - actionCommandStatus->unk_44 += 100; - if (actionCommandStatus->unk_44 >= 500) { - actionCommandStatus->unk_44 = 500; + actionCommandStatus->barFillLevel -= 10; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; } } } - if (actionCommandStatus->unk_44 > 10000) { - hudElement = actionCommandStatus->hudElements[3]; - actionCommandStatus->unk_44 = 10000; - actionCommandStatus->unk_68 = 1; - hud_element_set_render_pos( - hudElement, - actionCommandStatus->hudElementX + 50, - actionCommandStatus->hudElementY + 28); - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + if (battleStatus->currentButtonsPressed & BUTTON_A) { + phi_a1 = actionCommandStatus->unk_64; + // unk_434 = array of scaling values based on attack difficulty (unk_50). + if (phi_a1 != 0) { + s32 a; + a = battleStatus->unk_434[actionCommandStatus->unk_50]; + actionCommandStatus->barFillLevel += a * 850 / 100 * phi_a1 / 100; + } else { + actionCommandStatus->barFillLevel += 100; + if (actionCommandStatus->barFillLevel >= 500) { + actionCommandStatus->barFillLevel = 500; + } + } } - battleStatus->unk_84 = actionCommandStatus->unk_44 / 100; + if (actionCommandStatus->barFillLevel > 10000) { + id = actionCommandStatus->hudElements[3]; + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_68 = 1; + hud_element_set_render_pos( + id, + actionCommandStatus->hudElementX + 50, + actionCommandStatus->hudElementY + 28); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + } + + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); if (actionCommandStatus->unk_54 == 0) { - phi_a1 = actionCommandStatus->unk_44; + phi_a1 = actionCommandStatus->barFillLevel; if (actionCommandStatus->unk_64 == 0) { phi_a1 = 0; } @@ -229,7 +232,8 @@ void func_802A9310_42D220(void) { battleStatus->actionSuccess = 0; } - if ((actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1] / 2) < battleStatus->unk_84) { + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + if (cutoff / 2 < battleStatus->unk_84) { battleStatus->unk_86 = 1; } else { battleStatus->unk_86 = -4; @@ -249,9 +253,9 @@ void func_802A9310_42D220(void) { break; case 12: if (actionCommandStatus->unk_64 == 0) { - actionCommandStatus->unk_44 -= 100; - if (actionCommandStatus->unk_44 < 0) { - actionCommandStatus->unk_44 = 0; + actionCommandStatus->barFillLevel -= 100; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; } } if (actionCommandStatus->unk_54 != 0) { @@ -291,7 +295,7 @@ void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 y; s32 x; - s32 hudElement; + s32 id; s32 temp_a1; s32 temp_v0; @@ -301,11 +305,11 @@ void N(draw_hud_elements)(void) { hud_element_set_render_pos(actionCommandStatus->hudElements[4], actionCommandStatus->hudElementX - temp_a1, actionCommandStatus->hudElementY + 17); hud_element_draw_clipped(actionCommandStatus->hudElements[0]); - hudElement = actionCommandStatus->hudElements[1]; - hud_element_draw_clipped(hudElement); - hud_element_get_render_pos(hudElement, &x, &y); + id = actionCommandStatus->hudElements[1]; + hud_element_draw_clipped(id); + hud_element_get_render_pos(id, &x, &y); // Redundant call, but needed to match. - hud_element_get_render_pos(hudElement, &x, &y); + hud_element_get_render_pos(id, &x, &y); if (D_802A9B00 == 0) { func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 1); @@ -314,8 +318,8 @@ void N(draw_hud_elements)(void) { } else { func_80268834(x, y, actionCommandStatus->barFillLevel / 100, 4); } - hudElement = actionCommandStatus->hudElements[3]; - hud_element_draw_clipped(hudElement); + id = actionCommandStatus->hudElements[3]; + hud_element_draw_clipped(id); } void N(free_hud_elements)(void) { diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index f400dd1a0c..dd065f81a4 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -156,13 +156,11 @@ void func_802A9298_42E638(void) { } if (actionCommandStatus->unk_68 == 0) { - if (battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) { actionCommandStatus->unk_5C = TRUE; } if (!(battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) && actionCommandStatus->unk_5C) { - s16 phi_v1; if (actionCommandStatus->unk_64 == 0) { actionCommandStatus->barFillLevel += battleStatus->unk_434[actionCommandStatus->unk_50] * 13; } else { diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index b26badbd9f..781c54fdd9 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -6,12 +6,16 @@ extern s32 D_80294400; extern HudScript HudScript_BlueMeter; extern HudScript HudScript_StickNeutral; +extern HudScript HudScript_StickMashLeft; extern HudScript HudScript_100pct; +s32 D_802A9860_42F680[8] = { 0, 25, 50, 75, 75, 0, 0, 0 }; +extern s32 D_802A98C0; // bss? + ApiStatus func_802A9000_42EE20(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 0x10; battleStatus->unk_434 = &D_80294400; @@ -35,23 +39,23 @@ ApiStatus func_802A9000_42EE20(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_StickNeutral); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_StickNeutral); + actionCommandStatus->hudElements[0] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_100pct); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_100pct); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -59,7 +63,7 @@ ApiStatus func_802A9000_42EE20(void) { ApiStatus func_802A916C_42EF8C(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32* args = script->ptrReadPos; + Bytecode* args = script->ptrReadPos; if (battleStatus->unk_83 == 0) { battleStatus->actionSuccess = 0; @@ -85,7 +89,152 @@ ApiStatus func_802A916C_42EF8C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A9254_42F074); +void func_802A9254_42F074(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 id; + s32 cutoff; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61) { + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + } + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61) { + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + + if (actionCommandStatus->unk_6C != 0) { + actionCommandStatus->unk_6C--; + break; + } + + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY + 28); + break; + case 10: + btl_set_popup_duration(99); + + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + break; + } + + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_StickMashLeft); + actionCommandStatus->unk_5C = 0; + D_802A98C0 = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + sfx_play_sound_with_params(0x80000041, 0, 0, 0); + actionCommandStatus->state = 11; + + // fallthrough + case 11: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_68 == 0) { + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + actionCommandStatus->barFillLevel -= + D_802A9860_42F680[actionCommandStatus->barFillLevel / cutoff / 20]; + + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + + if (actionCommandStatus->unk_68 == 0) { + if (battleStatus->currentButtonsPressed & BUTTON_STICK_LEFT) { + actionCommandStatus->barFillLevel += (battleStatus->unk_434[actionCommandStatus->unk_50] * 1250) / 100; + } + if (battleStatus->currentButtonsPressed & BUTTON_STICK_RIGHT) { + actionCommandStatus->barFillLevel -= (battleStatus->unk_434[actionCommandStatus->unk_50] * 1250) / 100; + } + } + } + + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + + if (actionCommandStatus->barFillLevel > 10000) { + id = actionCommandStatus->hudElements[2]; + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_68 = 1; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); + hud_element_clear_flags(id, 2); + } + + if (D_802A98C0 & BUTTON_STICK_LEFT) { + actionCommandStatus->unk_5C = 1; + } + if (D_802A98C0 & BUTTON_STICK_RIGHT) { + actionCommandStatus->unk_5C = -1; + } + + if (!(D_802A98C0 & BUTTON_STICK_LEFT) && + !(battleStatus->currentButtonsDown & BUTTON_STICK_RIGHT) && + actionCommandStatus->unk_5C == 1) + { + actionCommandStatus->unk_5C = 2; + } + battleStatus->actionSuccess = actionCommandStatus->barFillLevel / 100; + D_802A98C0 = battleStatus->currentButtonsDown; + battleStatus->unk_84 = actionCommandStatus->unk_5C; + + sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->actionSuccess * 12); + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + + if (actionCommandStatus->barFillLevel == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = actionCommandStatus->barFillLevel / 100; + } + + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + if (cutoff >= battleStatus->actionSuccess) { + battleStatus->unk_86 = -2; + } else { + battleStatus->unk_86 = 1; + } + + if (battleStatus->actionSuccess == 100) { + func_80269160(); + } + + btl_set_popup_duration(0); + sfx_stop_sound(0x80000041); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + } else { + func_80268C9C(); + } + break; + } +} #include "common/UnkActionCommandFunc1.inc.c" diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 25845f6970..54a88dc5ae 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -5,13 +5,16 @@ extern HudScript HudScript_BlueMeter; extern HudScript HudScript_StickNeutral; +extern HudScript HudScript_StickMashLeft; extern HudScript HudScript_100pct; extern s32 D_80294440; +s32 D_802A9920_430940[8] = { 0, 25, 50, 75, 75, 0, 0, 0 }; + ApiStatus func_802A9000_430020(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 100; battleStatus->unk_434 = &D_80294440; @@ -34,30 +37,196 @@ ApiStatus func_802A9000_430020(void) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_StickNeutral); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_StickNeutral); + actionCommandStatus->hudElements[0] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&HudScript_100pct); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_100pct); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } #include "common/MashActionCommandInit.inc.c" -INCLUDE_ASM(s32, "battle/action_cmd/spook", func_802A9298_4302B8); +void func_802A9298_4302B8(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 id; + s32 cutoff; + s32 fillLevel; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_StickMashLeft); + actionCommandStatus->barFillLevel = 0; + battleStatus->unk_84 = 0; + actionCommandStatus->unk_5C = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + sfx_play_sound_with_params(0x80000041, 0, 0, 0); + actionCommandStatus->state = 11; + case 11: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_68 == 0) { + if (actionCommandStatus->unk_64 != 0) { + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + + actionCommandStatus->barFillLevel -= D_802A9920_430940[actionCommandStatus->barFillLevel / cutoff / 20]; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } else { + actionCommandStatus->barFillLevel -= 10; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } + + if (actionCommandStatus->unk_68 == 0) { + if (actionCommandStatus->unk_64 != 0) { + + if (battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) { + actionCommandStatus->unk_5C = TRUE; + } + + if (!(battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) && actionCommandStatus->unk_5C) { + s32 a = battleStatus->unk_434[actionCommandStatus->unk_50]; + s32 b = actionCommandStatus->unk_64 * 850; + + actionCommandStatus->barFillLevel += (a * b) / 10000; + actionCommandStatus->unk_5C = 0; + } + + if (battleStatus->currentButtonsPressed & BUTTON_STICK_RIGHT) { + s32 a = battleStatus->unk_434[actionCommandStatus->unk_50]; + s32 b = actionCommandStatus->unk_64 * 850; + + actionCommandStatus->barFillLevel -= (a * b) / 10000; + } + } else { + if (battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) { + actionCommandStatus->unk_5C = TRUE; + } + + if (!(battleStatus->currentButtonsDown & BUTTON_STICK_LEFT) && actionCommandStatus->unk_5C) { + actionCommandStatus->barFillLevel += 100; + if (actionCommandStatus->barFillLevel >= 500) { + actionCommandStatus->barFillLevel = 500; + } + actionCommandStatus->unk_5C = 0; + } + + if (battleStatus->currentButtonsPressed & BUTTON_STICK_RIGHT) { + actionCommandStatus->barFillLevel -= 100; + } + } + } + } + + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + if (actionCommandStatus->barFillLevel > 10000) { + id = actionCommandStatus->hudElements[2]; + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_68 = 1; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 50, actionCommandStatus->hudElementY + 28); + hud_element_clear_flags(id, 2); + } + + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; + sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + + fillLevel = actionCommandStatus->barFillLevel; + if (actionCommandStatus->unk_64 == 0) { + fillLevel = 0; + } + + if (fillLevel == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = fillLevel / 100; + + } + + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + if (battleStatus->actionSuccess > cutoff) { + battleStatus->unk_86 = 1; + } else { + battleStatus->unk_86 = -2; + } + + if (battleStatus->actionSuccess == 100) { + func_80269160(); + } + btl_set_popup_duration(0); + sfx_stop_sound(0x80000041); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_64 == 0) { + actionCommandStatus->barFillLevel -= 100; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} #include "common/UnkActionCommandFunc1.inc.c" diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index dd95fa386d..2130e8f6c2 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -5,12 +5,17 @@ extern HudScript HudScript_BlueMeter; extern HudScript HudScript_AButton; +extern HudScript HudScript_AButtonDown; +extern HudScript HudScript_PressAButton; extern s32 D_80294380; +s32 D_802A9760_42A480[] = { 300, 300, 265, 220, 175, 175, }; +s32 D_802A9778_42A498[] = { 300, 300, 265, 220, 175, 175, }; + ApiStatus func_802A9000_429D20(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; battleStatus->unk_82 = 5; battleStatus->unk_434 = &D_80294380; @@ -30,17 +35,17 @@ ApiStatus func_802A9000_429D20(void) { actionCommandStatus->unk_5C = 0; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } @@ -71,17 +76,143 @@ ApiStatus func_802A911C_429E3C(Evt* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/squirt", func_802A9208_429F28); +void func_802A9208_429F28(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 id; + s32 mashMeterCutoff; + s32 cutoff; + s32 temp; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + if (actionCommandStatus->unk_61) { + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + } + hud_element_set_alpha(id, 255); + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61) { + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY + 28); + break; + case 10: + btl_set_popup_duration(99); + + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + break; + } + + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButtonDown); + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_5C = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + sfx_play_sound_with_params(0x80000041, 0, 0, 0); + actionCommandStatus->state = 11; + // fallthrough + case 11: + btl_set_popup_duration(99); + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + temp = actionCommandStatus->barFillLevel / cutoff; + if (actionCommandStatus->unk_5C == 0) { + if (!(battleStatus->currentButtonsDown & BUTTON_A)) { + actionCommandStatus->barFillLevel -= D_802A9760_42A480[temp / 20]; + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } else { + actionCommandStatus->barFillLevel += D_802A9778_42A498[temp / 20] * battleStatus->unk_434[actionCommandStatus->unk_50] / 100; + if (actionCommandStatus->barFillLevel > 10000) { + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_5C = 1; + } + } + } else { + actionCommandStatus->barFillLevel -= 250; + if (actionCommandStatus->barFillLevel <= 0) { + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_5C = 0; + } + } + + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; + sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); + id = actionCommandStatus->hudElements[0]; + if (temp < 80) { + if (hud_element_get_script(id) != &HudScript_AButtonDown) { + hud_element_set_script(id, &HudScript_AButtonDown); + } + } else { + if (hud_element_get_script(id) != &HudScript_PressAButton) { + hud_element_set_script(id, &HudScript_PressAButton); + } + } + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + + if (actionCommandStatus->barFillLevel == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = battleStatus->unk_84; + } + + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + if (cutoff / 2 < battleStatus->unk_84) { + battleStatus->unk_86 = 1; + } else { + battleStatus->unk_86 = -4; + } + + if (battleStatus->actionSuccess == 100) { + func_80269160(); + } + btl_set_popup_duration(0); + sfx_stop_sound(0x80000041); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + } else { + func_80268C9C(); + } + break; + } +} void func_802A9634_42A354(void) { s32 x, y; - s32 hudElement; + s32 id; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; hud_element_draw_clipped(actionCommandStatus->hudElements[0]); - hudElement = actionCommandStatus->hudElements[1]; - hud_element_draw_clipped(hudElement); - hud_element_get_render_pos(hudElement, &x, &y); + id = actionCommandStatus->hudElements[1]; + hud_element_draw_clipped(id); + hud_element_get_render_pos(id, &x, &y); if (actionCommandStatus->unk_5C == 0) { func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 1); } else { diff --git a/src/battle/action_cmd/tidal_wave.c b/src/battle/action_cmd/tidal_wave.c index de1b2b80b1..7cd1d29d7f 100644 --- a/src/battle/action_cmd/tidal_wave.c +++ b/src/battle/action_cmd/tidal_wave.c @@ -4,16 +4,22 @@ #define NAMESPACE action_command_tidal_wave extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_PressAButton; +extern HudScript HudScript_PressBButton; +extern HudScript HudScript_BButtonHeld; +extern HudScript HudScript_8029265C; +extern HudScript HudScript_PressCDownButton; extern HudScript HudScript_AButton; +extern HudScript HudScript_AButtonDown; extern s32 D_802944A0; -extern HudScript* D_802A97C0_42CEB0[]; -extern HudScript* D_802A97CC_42CEBC[]; +HudScript* D_802A97C0_42CEB0[3] = { &HudScript_PressAButton, &HudScript_PressBButton, &HudScript_PressCDownButton }; +HudScript* D_802A97CC_42CEBC[3] = { &HudScript_AButtonDown, &HudScript_BButtonHeld, &HudScript_8029265C }; ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; s32 i; battleStatus->unk_82 = 5; @@ -33,18 +39,18 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[0] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); for (i = 1; i < ARRAY_COUNT(actionCommandStatus->hudElements); i++) { - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[i] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[i] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); } return ApiStatus_DONE2; @@ -81,7 +87,7 @@ ApiStatus func_802A9138_42C828(Evt* script, s32 isInitialCall) { void N(update)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - s32 hudElement; + s32 id; s8 oldButton; s8 newButton; s32 numLookbackFrames; @@ -93,11 +99,11 @@ void N(update)(void) { switch (actionCommandStatus->state) { case 0: btl_set_popup_duration(99); - hudElement = actionCommandStatus->hudElements[0]; + id = actionCommandStatus->hudElements[0]; if (actionCommandStatus->unk_61 != 0) { - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); } - hud_element_set_alpha(hudElement, 0xFF); + hud_element_set_alpha(id, 255); actionCommandStatus->state = 1; break; case 1: @@ -121,7 +127,7 @@ void N(update)(void) { actionCommandStatus->unk_54 = actionCommandStatus->unk_52; actionCommandStatus->unk_5C = rand_int(2); actionCommandStatus->state = 11; - actionCommandStatus->unk_72 = 0U; + actionCommandStatus->unk_72 = 0; // fallthrough case 11: btl_set_popup_duration(99); @@ -133,14 +139,14 @@ void N(update)(void) { actionCommandStatus->unk_5C = newButton; } while (oldButton == newButton); - hudElement = actionCommandStatus->hudElements[actionCommandStatus->unk_5D]; + id = actionCommandStatus->hudElements[actionCommandStatus->unk_5D]; hud_element_set_script( - hudElement, D_802A97C0_42CEB0[newButton]); + id, D_802A97C0_42CEB0[newButton]); hud_element_set_render_pos( - hudElement, + id, actionCommandStatus->hudElementX + ((actionCommandStatus->unk_5D - 1) * 20) + 16, actionCommandStatus->hudElementY); - hud_element_clear_flags(hudElement, HUD_ELEMENT_FLAGS_DISABLED); + hud_element_clear_flags(id, HUD_ELEMENT_FLAGS_DISABLED); sfx_play_sound(0x233); actionCommandStatus->unk_70 = 1; actionCommandStatus->state = 12; @@ -173,7 +179,7 @@ void N(update)(void) { // Determine starting point in input buffer. bufferPos = battleStatus->inputBufferPos - numLookbackFrames; if (bufferPos < 0) { - bufferPos += 0x40; + bufferPos += ARRAY_COUNT(battleStatus->pushInputBuffer); } // If determined that 0 frames should be searched, search a minimum of 1. @@ -183,8 +189,8 @@ void N(update)(void) { // Check buffer for past N frames' worth of button presses. for (i = 0; i < numLookbackFrames; i++) { - if (bufferPos >= 0x40) { - bufferPos -= 0x40; + if (bufferPos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + bufferPos -= ARRAY_COUNT(battleStatus->pushInputBuffer); } // If not locked out from previous wrong press... @@ -203,7 +209,7 @@ void N(update)(void) { } else { buttonsPressed = battleStatus->pushInputBuffer[bufferPos]; if (buttonsPressed != 0) { - if (buttonsPressed & ~0x8000) { + if (buttonsPressed & ~BUTTON_A) { actionCommandStatus->unk_60 = TRUE; } else { success = TRUE; @@ -217,7 +223,7 @@ void N(update)(void) { } else { buttonsPressed = battleStatus->pushInputBuffer[bufferPos]; if (buttonsPressed != 0) { - if (buttonsPressed & ~0x4000) { + if (buttonsPressed & ~BUTTON_B) { actionCommandStatus->unk_60 = TRUE; } else { success = TRUE; @@ -231,7 +237,7 @@ void N(update)(void) { } else { buttonsPressed = battleStatus->pushInputBuffer[bufferPos]; if (buttonsPressed != 0) { - if (buttonsPressed & ~0x4) { + if (buttonsPressed & ~BUTTON_C_DOWN) { actionCommandStatus->unk_60 = TRUE; } else { success = TRUE; @@ -244,17 +250,17 @@ void N(update)(void) { if (actionCommandStatus->unk_60) { // Wrong; prevent successful inputs for 10 frames. actionCommandStatus->unk_72 = 10; - sfx_play_sound(0x21D); + sfx_play_sound(SOUND_MENU_ERROR); actionCommandStatus->unk_70 = 0; } if (success) { // Correct; shrink button, set up next button press, etc. - hudElement = actionCommandStatus->hudElements[actionCommandStatus->unk_5D]; - hud_element_set_script(hudElement, D_802A97CC_42CEBC[actionCommandStatus->unk_5C]); - hud_element_set_scale(hudElement, 0.5f); + id = actionCommandStatus->hudElements[actionCommandStatus->unk_5D]; + hud_element_set_script(id, D_802A97CC_42CEBC[actionCommandStatus->unk_5C]); + hud_element_set_scale(id, 0.5f); hud_element_set_render_pos( - hudElement, + id, actionCommandStatus->hudElementX + ((actionCommandStatus->unk_5D - 1) * 20), actionCommandStatus->hudElementY + 7); actionCommandStatus->unk_5D++; @@ -265,7 +271,7 @@ void N(update)(void) { } actionCommandStatus->state = 11; battleStatus->unk_84++; - sfx_play_sound(0x21C); + sfx_play_sound(SOUND_21C); return; } diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 0b6f130410..475858491a 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -3,8 +3,228 @@ #define NAMESPACE action_command_water_block -// requires .data migration -INCLUDE_ASM(s32, "battle/action_cmd/water_block", func_802A9000_42A4F0); +#include "battle/action_cmd/water_block_1.png.inc.c" +#include "battle/action_cmd/water_block_1.pal.inc.c" + +#include "battle/action_cmd/water_block_2.png.inc.c" +#include "battle/action_cmd/water_block_2.pal.inc.c" + +#include "battle/action_cmd/water_block_3.png.inc.c" +#include "battle/action_cmd/water_block_3.pal.inc.c" + +#include "battle/action_cmd/water_block_0.png.inc.c" +#include "battle/action_cmd/water_block_0.pal.inc.c" + +#include "battle/action_cmd/water_block_block.png.inc.c" +#include "battle/action_cmd/water_block_block.pal.inc.c" + +#include "battle/action_cmd/water_block_circle.png.inc.c" +#include "battle/action_cmd/water_block_circle.pal.inc.c" + +#include "battle/action_cmd/water_block_cloud.png.inc.c" +#include "battle/action_cmd/water_block_cloud.pal.inc.c" + +#include "battle/action_cmd/water_block_4.png.inc.c" +#include "battle/action_cmd/water_block_4.pal.inc.c" + +HudScript HudScript_WaterBlock1 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_1_png, (s32)battle_action_cmd_water_block_1_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WaterBlock2 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_2_png, (s32)battle_action_cmd_water_block_2_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WaterBlock3 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_3_png, (s32)battle_action_cmd_water_block_3_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WaterBlock0 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_0_png, (s32)battle_action_cmd_water_block_0_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WaterBlock4 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_4_png, (s32)battle_action_cmd_water_block_4_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WaterBlockBlock = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_32x32, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_block_png, (s32)battle_action_cmd_water_block_block_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WaterBlockCircle = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_40x40, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_circle_png, (s32)battle_action_cmd_water_block_circle_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WaterBlockCloud = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_40x40, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_water_block_cloud_png, (s32)battle_action_cmd_water_block_cloud_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript* D_802AB180_42C670[] = { + &HudScript_WaterBlock0 +}; + +HudScript* D_802AB184_42C674[] = { + &HudScript_WaterBlock1, &HudScript_WaterBlock2, &HudScript_WaterBlock3, &HudScript_WaterBlock4, &HudScript_WaterBlock4, &HudScript_WaterBlock4, &HudScript_WaterBlock4, &HudScript_WaterBlock4, &HudScript_WaterBlock4, 0, 0 +}; + +extern s32 D_80294460; + +extern HudScript HudScript_AButton; +extern HudScript HudScript_AButtonDown; +extern HudScript HudScript_TimingBar3Chances; +extern HudScript HudScript_TimingCharge2; +extern HudScript HudScript_TimingCharge3; +extern HudScript HudScript_TimingCharge4b; +extern HudScript HudScript_TimingCharge4c; +extern HudScript HudScript_TimingOK; +extern HudScript HudScript_TimingMiss; +extern HudScript HudScript_TimingWait; +extern HudScript HudScript_TimingReady; + +ApiStatus func_802A9000_42A4F0(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Bytecode* args = script->ptrReadPos; + s32 id; + + battleStatus->unk_82 = 5; + battleStatus->unk_434 = &D_80294460; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + actionCommandStatus->actionCommandID = ACTION_COMMAND_WATER_BLOCK; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_64 = evt_get_variable(script, *args++); + battleStatus->unk_84 = 1; + actionCommandStatus->unk_6C = 30; + actionCommandStatus->hudElementX = -48; + actionCommandStatus->hudElementY = 80; + + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + + id = hud_element_create(&HudScript_TimingBar3Chances); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + id = hud_element_create(&HudScript_TimingWait); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + id = hud_element_create(&HudScript_TimingWait); + actionCommandStatus->hudElements[3] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + id = hud_element_create(&HudScript_TimingWait); + actionCommandStatus->hudElements[4] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + id = hud_element_create(&HudScript_TimingOK); + actionCommandStatus->hudElements[6] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + id = hud_element_create(&HudScript_TimingOK); + actionCommandStatus->hudElements[7] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + id = hud_element_create(&HudScript_TimingOK); + actionCommandStatus->hudElements[8] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + + actionCommandStatus->hudElements[10] = hud_element_create(D_802AB184_42C674[0]); + hud_element_set_render_pos(actionCommandStatus->hudElements[10], + actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + + actionCommandStatus->hudElements[11] = hud_element_create(&HudScript_TimingCharge4c); + hud_element_set_render_pos(actionCommandStatus->hudElements[11], + actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + + id = hud_element_create(&HudScript_TimingCharge4b); + actionCommandStatus->hudElements[12] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + + switch (actionCommandStatus->unk_64) { + case 0: + actionCommandStatus->hudElements[13] = hud_element_create(&HudScript_WaterBlockBlock); + id = actionCommandStatus->hudElements[13]; + break; + case 1: + actionCommandStatus->hudElements[13] = hud_element_create(&HudScript_WaterBlockCircle); + id = actionCommandStatus->hudElements[13]; + break; + case 2: + actionCommandStatus->hudElements[13] = hud_element_create(&HudScript_WaterBlockCloud); + id = actionCommandStatus->hudElements[13]; + break; + } + + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + return ApiStatus_DONE2; +} ApiStatus func_802A9398_42A888(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -28,14 +248,370 @@ ApiStatus func_802A9398_42A888(Evt* script, s32 isInitialCall) { battleStatus->actionSuccess = 0; battleStatus->unk_86 = 0; actionCommandStatus->state = 10; - battleStatus->flags1 &= ~0x8000; + battleStatus->flags1 &= ~BS_FLAGS1_8000; func_80269118(); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/water_block", func_802A948C_42A97C); +void func_802A948C_42A97C(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 pos; + s32 i; + s32 limit; + s32 id; -extern HudScript* D_802AB180_42C670[]; + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + id = actionCommandStatus->hudElements[0]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + id = actionCommandStatus->hudElements[2]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + id = actionCommandStatus->hudElements[3]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + id = actionCommandStatus->hudElements[4]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + id = actionCommandStatus->hudElements[10]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + id = actionCommandStatus->hudElements[11]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + id = actionCommandStatus->hudElements[12]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + id = actionCommandStatus->hudElements[13]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_6C != 0) { + actionCommandStatus->unk_6C--; + return; + } + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX + 28, actionCommandStatus->hudElementY + 28); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 21, actionCommandStatus->hudElementY + 24); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 24); + hud_element_set_render_pos(actionCommandStatus->hudElements[4], actionCommandStatus->hudElementX + 61, actionCommandStatus->hudElementY + 24); + + id = actionCommandStatus->hudElements[10]; + switch (actionCommandStatus->unk_64) { + case 0: + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 91, actionCommandStatus->hudElementY + 7); + break; + case 1: + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 91, actionCommandStatus->hudElementY + 13); + break; + case 2: + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 91, actionCommandStatus->hudElementY + 13); + break; + } + + hud_element_set_render_pos(actionCommandStatus->hudElements[11], actionCommandStatus->hudElementX - 5, actionCommandStatus->hudElementY + 29); + hud_element_set_render_pos(actionCommandStatus->hudElements[12], actionCommandStatus->hudElementX + 7, actionCommandStatus->hudElementY + 29); + hud_element_set_render_pos(actionCommandStatus->hudElements[13], actionCommandStatus->hudElementX + 92, actionCommandStatus->hudElementY + 23); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + + actionCommandStatus->unk_54 = actionCommandStatus->unk_52 - 60; + if (actionCommandStatus->unk_54 < 42) { + actionCommandStatus->unk_54 = 42; + } + actionCommandStatus->state = 11; + // fallthrough + case 11: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_54 == 42) { + hud_element_set_script(actionCommandStatus->hudElements[11], &HudScript_TimingCharge3); + sfx_play_sound(SOUND_233); + } + if (actionCommandStatus->unk_54 == 22) { + hud_element_set_script(actionCommandStatus->hudElements[12], &HudScript_TimingCharge2); + sfx_play_sound(SOUND_233); + } + if (actionCommandStatus->unk_54 == 2) { + hud_element_set_script(actionCommandStatus->hudElements[2], &HudScript_TimingReady); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButtonDown); + sfx_play_sound(SOUND_234); + } + actionCommandStatus->unk_54--; + if (actionCommandStatus->unk_54 == 0) { + actionCommandStatus->unk_54 = 20; + actionCommandStatus->unk_5D = 0; + actionCommandStatus->state = 12; + actionCommandStatus->unk_5C = 0; + actionCommandStatus->unk_60 = 0; + } + break; + case 12: + btl_set_popup_duration(99); + if ((actionCommandStatus->unk_60 == 0) && (actionCommandStatus->unk_5C == 0) && (actionCommandStatus->unk_5D >= -5)) { + limit = battleStatus->unk_434[actionCommandStatus->unk_50 * 2] + + battleStatus->unk_434[actionCommandStatus->unk_50 * 2 + 1] + + 5; + pos = battleStatus->inputBufferPos; + pos -= limit; + if (pos < 0) { + pos += ARRAY_COUNT(battleStatus->pushInputBuffer); + } + if (limit == 0) { + limit = 1; + } + + for (i = 0; i < limit; pos++, i++) { + if (pos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + pos -= ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + if (i < 5 && (battleStatus->pushInputBuffer[pos] & BUTTON_A)) { + actionCommandStatus->unk_60 = 1; + } + + if (((battleStatus->pushInputBuffer[pos] & BUTTON_A) && !(actionCommandStatus->unk_60 != 0)) || + (actionCommandStatus->autoSucceed != 0)) { + actionCommandStatus->unk_5C = 1; + battleStatus->unk_84++; + break; + } + } + } + + if ((actionCommandStatus->unk_5D >= -4) && ((actionCommandStatus->unk_60 != 0) || (actionCommandStatus->unk_5C != 0))) { + id = actionCommandStatus->hudElements[6]; + if (actionCommandStatus->unk_5C != 0) { + hud_element_set_script(id, &HudScript_TimingOK); + } else { + hud_element_set_script(id, &HudScript_TimingMiss); + } + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 28, actionCommandStatus->hudElementY + 38); + hud_element_clear_flags(id, 2); + } + + if (actionCommandStatus->unk_5D == -5) { + id = actionCommandStatus->hudElements[6]; + if (actionCommandStatus->unk_5C != 0) { + hud_element_set_script(id, &HudScript_TimingOK); + } else { + hud_element_set_script(id, &HudScript_TimingMiss); + } + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 28, actionCommandStatus->hudElementY + 38); + hud_element_clear_flags(id, 2); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButton); + } + actionCommandStatus->unk_5D--; + if (actionCommandStatus->unk_54 == 2) { + hud_element_set_script(actionCommandStatus->hudElements[3], &HudScript_TimingReady); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButtonDown); + sfx_play_sound(SOUND_234); + } + actionCommandStatus->unk_54--; + if (actionCommandStatus->unk_54 == 0) { + actionCommandStatus->unk_54 = 20; + actionCommandStatus->unk_5D = 0; + actionCommandStatus->state = 13; + actionCommandStatus->unk_5C = 0; + actionCommandStatus->unk_60 = 0; + } + break; + case 13: + btl_set_popup_duration(99); + if ((actionCommandStatus->unk_60 == 0) && (actionCommandStatus->unk_5C == 0) && (actionCommandStatus->unk_5D >= -5)) { + limit = battleStatus->unk_434[actionCommandStatus->unk_50 * 2] + + battleStatus->unk_434[actionCommandStatus->unk_50 * 2 + 1] + + 4; + if (limit < 6) { + limit = 6; + } + pos = battleStatus->inputBufferPos; + pos -= limit; + if (pos < 0) { + pos += ARRAY_COUNT(battleStatus->pushInputBuffer); + } + if (limit == 0) { + limit = 1; + } + + for (i = 0; i < limit; pos++, i++) { + if (pos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + pos -= ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + if (i < 5) { + if (battleStatus->pushInputBuffer[pos] & BUTTON_A) { + actionCommandStatus->unk_60 = 1; + } + } + + if (((battleStatus->pushInputBuffer[pos] & BUTTON_A) && !(actionCommandStatus->unk_60 != 0)) || + (actionCommandStatus->autoSucceed != 0)) { + actionCommandStatus->unk_5C = 1; + battleStatus->unk_84++; + break; + } + } + } + + if ((actionCommandStatus->unk_5D >= -4) && ((actionCommandStatus->unk_60 != 0) || (actionCommandStatus->unk_5C != 0))) { + id = actionCommandStatus->hudElements[7]; + if (actionCommandStatus->unk_5C != 0) { + hud_element_set_script(id, &HudScript_TimingOK); + } else { + hud_element_set_script(id, &HudScript_TimingMiss); + } + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 48, actionCommandStatus->hudElementY + 38); + hud_element_clear_flags(id, 2); + } + if (actionCommandStatus->unk_5D == -5) { + id = actionCommandStatus->hudElements[7]; + if (actionCommandStatus->unk_5C != 0) { + hud_element_set_script(id, &HudScript_TimingOK); + } else { + hud_element_set_script(id, &HudScript_TimingMiss); + } + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 48, actionCommandStatus->hudElementY + 38); + hud_element_clear_flags(id, 2); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButton); + } + actionCommandStatus->unk_5D--; + if (actionCommandStatus->unk_54 == 2) { + hud_element_set_script(actionCommandStatus->hudElements[4], &HudScript_TimingReady); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButtonDown); + sfx_play_sound(SOUND_234); + } + actionCommandStatus->unk_54--; + if (actionCommandStatus->unk_54 == 0) { + actionCommandStatus->unk_54 = 20; + actionCommandStatus->unk_5D = 0; + actionCommandStatus->state = 14; + actionCommandStatus->unk_5C = 0; + actionCommandStatus->unk_60 = 0; + } + break; + case 14: + btl_set_popup_duration(99); + if ((actionCommandStatus->unk_60 == 0) && (actionCommandStatus->unk_5C == 0) && (actionCommandStatus->unk_5D >= -5)) { + limit = battleStatus->unk_434[actionCommandStatus->unk_50 * 2] + + battleStatus->unk_434[actionCommandStatus->unk_50 * 2 + 1] + + 3; + if (limit < 6) { + limit = 6; + } + pos = battleStatus->inputBufferPos; + pos -= limit; + if (pos < 0) { + pos += ARRAY_COUNT(battleStatus->pushInputBuffer); + } + if (limit == 0) { + limit = 1; + } + + for (i = 0; i < limit; pos++, i++) { + if (pos >= ARRAY_COUNT(battleStatus->pushInputBuffer)) { + pos -= ARRAY_COUNT(battleStatus->pushInputBuffer); + } + + if (i < 5) { + if (battleStatus->pushInputBuffer[pos] & BUTTON_A) { + actionCommandStatus->unk_60 = 1; + } + } + + if (((battleStatus->pushInputBuffer[pos] & BUTTON_A) && !(actionCommandStatus->unk_60 != 0)) || + (actionCommandStatus->autoSucceed != 0)) { + actionCommandStatus->unk_5C = 1; + battleStatus->unk_84++; + break; + } + } + } + if (actionCommandStatus->unk_5D >= -4) { + if ((actionCommandStatus->unk_60 != 0) || (actionCommandStatus->unk_5C != 0)) { + id = actionCommandStatus->hudElements[8]; + if (actionCommandStatus->unk_5C != 0) { + hud_element_set_script(id, &HudScript_TimingOK); + } else { + hud_element_set_script(id, &HudScript_TimingMiss); + } + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 68, actionCommandStatus->hudElementY + 38); + hud_element_clear_flags(id, 2); + } + } + if (actionCommandStatus->unk_5D == -5) { + id = actionCommandStatus->hudElements[8]; + if (actionCommandStatus->unk_5C != 0) { + hud_element_set_script(id, &HudScript_TimingOK); + } else { + hud_element_set_script(id, &HudScript_TimingMiss); + } + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 68, actionCommandStatus->hudElementY + 38); + hud_element_clear_flags(id, 2); + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_AButton); + actionCommandStatus->state = 16; + return; + } + actionCommandStatus->unk_5D--; + break; + case 16: + if (battleStatus->unk_84 == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = battleStatus->unk_84; + } + battleStatus->unk_86 = 1; + if (battleStatus->actionSuccess == 3) { + func_80269160(); + } + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 17; + break; + case 17: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} void func_802AA014_42B504(void) { s32 hudElement; diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 9d2dae4f2a..7a99df8421 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -1,16 +1,136 @@ #include "common.h" #include "hud_element.h" +#include "battle/action_cmd/whirlwind_bubble.png.h" #define NAMESPACE action_command_whirlwind -// requires .data migration -#ifdef NON_MATCHING +extern HudScript HudScript_BlueMeter; +extern HudScript HudScript_MashAButton; +extern HudScript HudScript_AButton; + +extern s32 D_80294240; + +#include "battle/action_cmd/whirlwind_1.png.inc.c" +#include "battle/action_cmd/whirlwind_1.pal.inc.c" + +#include "battle/action_cmd/whirlwind_2.png.inc.c" +#include "battle/action_cmd/whirlwind_2.pal.inc.c" + +#include "battle/action_cmd/whirlwind_3.png.inc.c" +#include "battle/action_cmd/whirlwind_3.pal.inc.c" + +#include "battle/action_cmd/whirlwind_4.png.inc.c" +#include "battle/action_cmd/whirlwind_4.pal.inc.c" + +#include "battle/action_cmd/whirlwind_5.png.inc.c" +#include "battle/action_cmd/whirlwind_5.pal.inc.c" + +#include "battle/action_cmd/whirlwind_6.png.inc.c" +#include "battle/action_cmd/whirlwind_6.pal.inc.c" + +#include "battle/action_cmd/whirlwind_7.png.inc.c" +#include "battle/action_cmd/whirlwind_7.pal.inc.c" + +#include "battle/action_cmd/whirlwind_bubble.png.inc.c" +#include "battle/action_cmd/whirlwind_bubble.pal.inc.c" + +HudScript HudScript_Whirlwind1 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_whirlwind_1_png, (s32)battle_action_cmd_whirlwind_1_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_Whirlwind2 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_whirlwind_2_png, (s32)battle_action_cmd_whirlwind_2_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_Whirlwind3 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, + 60, (s32)battle_action_cmd_whirlwind_3_png, (s32)battle_action_cmd_whirlwind_3_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_Whirlwind4 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, + 60, (s32)battle_action_cmd_whirlwind_4_png, (s32)battle_action_cmd_whirlwind_4_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_Whirlwind5 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, + 60, (s32)battle_action_cmd_whirlwind_5_png, (s32)battle_action_cmd_whirlwind_5_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_Whirlwind6 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, + 60, (s32)battle_action_cmd_whirlwind_6_png, (s32)battle_action_cmd_whirlwind_6_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_Whirlwind7 = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_24x24, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, + 60, (s32)battle_action_cmd_whirlwind_7_png, (s32)battle_action_cmd_whirlwind_7_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript HudScript_WhirlwindBubble = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetCustomSize, battle_action_cmd_whirlwind_bubble_png_width, battle_action_cmd_whirlwind_bubble_png_height, + 0x00000004, + HUD_ELEMENT_OP_SetCI, 60, (s32)battle_action_cmd_whirlwind_bubble_png, (s32)battle_action_cmd_whirlwind_bubble_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +s32 D_802AA844_4254B4[] = { 0, 25, 50, 75, 100, 100 }; + +s32 D_802AA85C_4254CC[] = { 50, 50, 50, 50, 75, 75, 75, 100, 100, 100, 100 }; + +HudScript* D_802AA888_4254F8[] = { + &HudScript_Whirlwind7, &HudScript_Whirlwind6, &HudScript_Whirlwind5, &HudScript_Whirlwind4, &HudScript_Whirlwind3, &HudScript_Whirlwind2 +}; + +HudScript* D_802AA8A0_425510[] = { + &HudScript_Whirlwind1, &HudScript_Whirlwind1, &HudScript_Whirlwind2, &HudScript_Whirlwind3, &HudScript_Whirlwind3 +}; + +s32 D_802AA8B4_425524[] = { 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 1 }; + ApiStatus func_802A9000_423C70(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; Bytecode* args = script->ptrReadPos; s16 temp_v0; - HudElement* hudElement; + s32 id; battleStatus->unk_82 = 5; battleStatus->unk_434 = &D_80294240; @@ -20,12 +140,12 @@ ApiStatus func_802A9000_423C70(Evt* script, s32 isInitialCall) { } func_80268858(); - temp_v0 = evt_get_variable(script, *args); + temp_v0 = evt_get_variable(script, *args++); actionCommandStatus->unk_64 = temp_v0; actionCommandStatus->actionCommandID = ACTION_COMMAND_WHIRLWIND; actionCommandStatus->state = 0; actionCommandStatus->unk_60 = 0; - actionCommandStatus->unk_44 = 0; + actionCommandStatus->barFillLevel = 0; actionCommandStatus->unk_48 = 0; if (temp_v0 == 0) { battleStatus->unk_84 = 0; @@ -35,70 +155,208 @@ ApiStatus func_802A9000_423C70(Evt* script, s32 isInitialCall) { actionCommandStatus->hudElementX = -48; actionCommandStatus->hudElementY = 80; - hudElement = hud_element_create(&HudScript_AButton); - actionCommandStatus->hudElements[0] = hudElement; - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); - hud_element_set_render_depth(hudElement, 0); + id = hud_element_create(&HudScript_AButton); + actionCommandStatus->hudElements[0] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_depth(id, 0); - hudElement = hud_element_create(&HudScript_BlueMeter); - actionCommandStatus->hudElements[1] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_BlueMeter); + actionCommandStatus->hudElements[1] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&D_802AA7F0_425460); - actionCommandStatus->hudElements[2] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 54, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_Whirlwind7); + actionCommandStatus->hudElements[2] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 54, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); - hudElement = hud_element_create(&D_802AA818_425488); - actionCommandStatus->hudElements[3] = hudElement; - hud_element_set_render_pos(hudElement, actionCommandStatus->hudElementX + 60, actionCommandStatus->hudElementY + 28); - hud_element_set_render_depth(hudElement, 0); - hud_element_set_flags(hudElement, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); + id = hud_element_create(&HudScript_WhirlwindBubble); + actionCommandStatus->hudElements[3] = id; + hud_element_set_render_pos(id, actionCommandStatus->hudElementX + 60, actionCommandStatus->hudElementY + 28); + hud_element_set_render_depth(id, 0); + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80 | HUD_ELEMENT_FLAGS_DISABLED); return ApiStatus_DONE2; } -#else -INCLUDE_ASM(s32, "battle/action_cmd/whirlwind", func_802A9000_423C70); -#endif -INCLUDE_ASM(s32, "battle/action_cmd/whirlwind", func_802A91E0_423E50); +ApiStatus func_802A91E0_423E50(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Bytecode* args = script->ptrReadPos; -INCLUDE_ASM(s32, "battle/action_cmd/whirlwind", func_802A92F0_423F60); + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } -// hud element scripts -extern HudScript* D_802AA888_4254F8[]; -extern HudScript* D_802AA8A0_425510[]; + func_80268858(); + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + battleStatus->actionSuccess = 0; + battleStatus->unk_86 = 0; + if (actionCommandStatus->unk_64 == 0) { + battleStatus->unk_84 = 0; + } else { + battleStatus->unk_84 = 3; + } + actionCommandStatus->state = 10; + gBattleStatus.flags1 &= ~BS_FLAGS1_8000; + return ApiStatus_DONE2; +} + +void func_802A92F0_423F60(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 id; + s32 cutoff; + s32 temp; + s32 amt; + + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + + id = actionCommandStatus->hudElements[0]; + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + hud_element_set_alpha(id, 255); + + id = actionCommandStatus->hudElements[1]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[2]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + id = actionCommandStatus->hudElements[3]; + hud_element_set_alpha(id, 255); + if (actionCommandStatus->unk_61 != 0) { + hud_element_clear_flags(id, 2); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + hud_element_set_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + hud_element_set_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + hud_element_set_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX + 54, actionCommandStatus->hudElementY + 23); + hud_element_set_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX + 60, actionCommandStatus->hudElementY + 23); + break; + case 10: + btl_set_popup_duration(99); + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + return; + } + hud_element_set_script(actionCommandStatus->hudElements[0], &HudScript_MashAButton); + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->state = 11; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + case 11: + btl_set_popup_duration(99); + cutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + temp = actionCommandStatus->barFillLevel / cutoff; + if (actionCommandStatus->unk_64 == 0) { + amt = D_802AA844_4254B4[temp / 20]; + } else { + amt = D_802AA85C_4254CC[temp / 10]; + } + actionCommandStatus->barFillLevel -= amt; + + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + + if (actionCommandStatus->unk_6A == 0) { + if (battleStatus->currentButtonsPressed & BUTTON_A) { + s32 amt; + + if (actionCommandStatus->unk_64 == 0) { + amt = battleStatus->unk_434[actionCommandStatus->unk_50] * 5; + } else { + amt = battleStatus->unk_434[actionCommandStatus->unk_50] * 6; + } + actionCommandStatus->barFillLevel += amt; + } + } else { + actionCommandStatus->barFillLevel += battleStatus->unk_434[actionCommandStatus->unk_50] / 4; + actionCommandStatus->barFillLevel += rand_int(battleStatus->unk_434[actionCommandStatus->unk_50] / 4); + } + + if (actionCommandStatus->barFillLevel > cutoff * 100) { + actionCommandStatus->barFillLevel = cutoff * 100; + } + if (actionCommandStatus->unk_64 == 0) { + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 2000; + } else { + battleStatus->unk_84 = D_802AA8B4_425524[actionCommandStatus->barFillLevel / 1000]; + } + + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + battleStatus->unk_86 = 127; + battleStatus->actionSuccess = battleStatus->unk_84; + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + return; + } + func_80268C9C(); + break; + } +} void func_802A9744_4243B4(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 x, y; - s32 hudElement; + s32 id; if (actionCommandStatus->unk_6A == 0) { hud_element_draw_clipped(actionCommandStatus->hudElements[0]); } - hudElement = actionCommandStatus->hudElements[1]; - hud_element_draw_clipped(hudElement); - hud_element_get_render_pos(hudElement, &x, &y); + id = actionCommandStatus->hudElements[1]; + hud_element_draw_clipped(id); + hud_element_get_render_pos(id, &x, &y); - func_80268798(x, y, (s16) actionCommandStatus->barFillLevel / 100, 1); + func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 1); hud_element_draw_clipped(actionCommandStatus->hudElements[3]); - hudElement = actionCommandStatus->hudElements[2]; + id = actionCommandStatus->hudElements[2]; if (actionCommandStatus->unk_64 == 0) { - if (D_802AA888_4254F8[battleStatus->unk_84] != hud_element_get_script(hudElement)) { - hud_element_set_script(hudElement, D_802AA888_4254F8[battleStatus->unk_84]); + if (D_802AA888_4254F8[battleStatus->unk_84] != hud_element_get_script(id)) { + hud_element_set_script(id, D_802AA888_4254F8[battleStatus->unk_84]); } } else { - if (D_802AA8A0_425510[battleStatus->unk_84] != hud_element_get_script(hudElement)) { - hud_element_set_script(hudElement, D_802AA8A0_425510[battleStatus->unk_84]); + if (D_802AA8A0_425510[battleStatus->unk_84] != hud_element_get_script(id)) { + hud_element_set_script(id, D_802AA8A0_425510[battleStatus->unk_84]); } } - hud_element_draw_clipped(hudElement); + hud_element_draw_clipped(id); } void func_802A9898_424508(void) { diff --git a/src/battle/area_arn/actor/tubbas_heart.c b/src/battle/area_arn/actor/tubbas_heart.c index 06642d4a56..8762db6213 100644 --- a/src/battle/area_arn/actor/tubbas_heart.c +++ b/src/battle/area_arn/actor/tubbas_heart.c @@ -144,17 +144,17 @@ EvtScript N(init_80223DA0) = { ApiStatus func_80218680_4FF0D0(Evt* script, s32 isInitialCall) { Bytecode *args = script->ptrReadPos; - Effect6BInstance* effect = (Effect6BInstance*) evt_get_variable(script, *args++); + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++); s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); s32 z = evt_get_variable(script, *args++); f32 scale = evt_get_float_variable(script, *args++); - effect->data->pos.x = x; - effect->data->pos.y = y; - effect->data->pos.z = z; - effect->data->scale = scale; + ((Effect6BFXData*)effect->data)->pos.x = x; + ((Effect6BFXData*)effect->data)->pos.y = y; + ((Effect6BFXData*)effect->data)->pos.z = z; + ((Effect6BFXData*)effect->data)->scale = scale; return ApiStatus_DONE2; } diff --git a/src/battle/area_kpa2/69F320.c b/src/battle/area_kpa2/69F320.c index 0041c121db..444424a09d 100644 --- a/src/battle/area_kpa2/69F320.c +++ b/src/battle/area_kpa2/69F320.c @@ -1,4 +1,9 @@ #include "common.h" +#include "sprite/npc/battle_bowser.h" +#include "sprite/npc/parade_peach.h" +#include "battle/battle.h" +#include "script_api/battle.h" +#include "effects.h" #define NAMESPACE b_area_kpa2 @@ -64,8 +69,10 @@ INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_80219818_6A0A18); #include "common/GetItemEntityPosition.inc.c" #define NAMESPACE b_area_kpa2 -//#include "common/DisableRandomAbility.inc.c" INCLUDE_ASM(s32, "battle/area_kpa2/69F320", func_80219FFC_6A11FC); +// #define NAMESPACE dup_b_area_kpa2 +// #include "common/DisableRandomAbility.inc.c" +// #define NAMESPACE dup_b_area_kpa2 #define NAMESPACE dup_b_area_kpa2 #include "common/CanPlayerLoseAction.inc.c" diff --git a/src/battle/area_kpa2/6A2B50.c b/src/battle/area_kpa2/6A2B50.c index dceb5993f2..833b7d0fe5 100644 --- a/src/battle/area_kpa2/6A2B50.c +++ b/src/battle/area_kpa2/6A2B50.c @@ -1,19 +1,19 @@ #include "common.h" #include "effects.h" +#include "sprite.h" #define NAMESPACE b_area_kpa2 -typedef struct KpaStruct { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s32 unk_08; - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; -} KpaStruct; // size = 0x14 +// typedef struct KpaStruct { +// /* 0x00 */ s32 unk_00; +// /* 0x04 */ s32 unk_04; +// /* 0x08 */ s32 unk_08; +// /* 0x0C */ s32 unk_0C; +// /* 0x10 */ s32 unk_10; +// /* 0x14 */ s32 unk_14; +// } KpaStruct; // size = 0x14 -extern f32 D_80234828_6BBA28; //f64? -extern KpaStruct D_80234810_6BBA10; +// extern KpaStruct D_80234810_6BBA10; #include "common/StartRumbleWithParams.inc.c" @@ -51,3 +51,23 @@ INCLUDE_ASM(s32, "battle/area_kpa2/6A2B50", func_8021CF54_6A4154); INCLUDE_ASM(s32, "battle/area_kpa2/6A2B50", func_8021CFC0_6A41C0); INCLUDE_ASM(s32, "battle/area_kpa2/6A2B50", func_8021D290_6A4490); + +// const char* D_80234880_6BBA80 = "kpa_bt01_hit"; +// const char* D_80234890_6BBA90 = "kpa_bt01_shape"; +// const char* D_802348A0_6BBAA0 = "kpa_tex"; +// const char* D_802348A8_6BBAA8 = "kpa_bg"; +// const char* D_802348B0_6BBAB0 = "kkj_bt01_hit"; +// const char* D_802348C0_6BBAC0 = "kkj_bt01_shape"; +// const char* D_802348D0_6BBAD0 = "kkj_tex"; +// const char* D_802348D8_6BBAD8 = "kpa_bg"; +// const char* D_802348E0_6BBAE0 = "kkj_bt02_hit"; +// const char* D_802348F0_6BBAF0 = "kkj_bt02_shape"; +// const char* D_80234900_6BBB00 = "kkj_tex"; +// const char* D_80234908_6BBB08 = "クッパ(ラストバトル３)"; +// const char* D_80234920_6BBB20 = "クッパ(ラストバトル２)"; +// const char* D_80234938_6BBB38 = "クッパ(ラストバトル１)"; +// const char* D_80234950_6BBB50 = "クッパ(オープニング)"; +// const char* D_80234968_6BBB68 = "クッパ"; +// const char* D_80234970_6BBB70 = "kpa_03"; +// const char* D_80234978_6BBB78 = "kpa_02"; +// const char* D_80234980_6BBB80 = "kpa_01"; diff --git a/src/battle/area_omo/actor/groove_guy.c b/src/battle/area_omo/actor/groove_guy.c index bc88d29ce1..37c75d0b2c 100644 --- a/src/battle/area_omo/actor/groove_guy.c +++ b/src/battle/area_omo/actor/groove_guy.c @@ -65,6 +65,8 @@ s32 N(statusTable_80224A40)[] = { STATUS_END, }; +BSS EffectWhirlwindUnk D_802310D0; + ActorPartBlueprint N(partsTable_80224AEC)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, @@ -595,8 +597,6 @@ EvtScript N(randomSummon) = { EVT_END }; -BSS EffectWhirlwind D_802310D0; - s32 func_8021878C_512D5C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 x, y, z; diff --git a/src/battle/area_tik2/608AB0.c b/src/battle/area_tik2/608AB0.c index 33cebcd31a..03dcfe48ed 100644 --- a/src/battle/area_tik2/608AB0.c +++ b/src/battle/area_tik2/608AB0.c @@ -4,4 +4,4 @@ #include "common/StartRumbleWithParams.inc.c" -INCLUDE_ASM(s32, "battle/area_tik2/608AB0", func_80218058_608B08); +#include "common/UnkWaterFountainFunc.inc.c" diff --git a/src/battle/area_tik2/608CB0.c b/src/battle/area_tik2/608CB0.c index 6c7305f884..0856f25e98 100644 --- a/src/battle/area_tik2/608CB0.c +++ b/src/battle/area_tik2/608CB0.c @@ -14,7 +14,9 @@ INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218258_608D08); INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218404_608EB4); -INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_802184E4_608F94); +#define NAMESPACE dup_b_area_tik2 +#include "common/UnkWaterFountainFunc.inc.c" +#define NAMESPACE b_area_tik2 #define NAMESPACE dup2_b_area_tik2 #include "common/StartRumbleWithParams.inc.c" @@ -30,7 +32,9 @@ INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_802186D8_609188); #include "common/UnfadeBackgroundToBlack.inc.c" #define NAMESPACE b_area_tik2 -INCLUDE_ASM(s32, "battle/area_tik2/608CB0", func_80218884_609334); +#define NAMESPACE dup2_b_area_tik2 +#include "common/UnkWaterFountainFunc.inc.c" +#define NAMESPACE b_area_tik2 #define NAMESPACE dup3_b_area_tik2 #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c index 2a422493da..f19cb56109 100644 --- a/src/battle/item/insecticide_herb.c +++ b/src/battle/item/insecticide_herb.c @@ -26,29 +26,24 @@ ApiStatus N(func_802A1280_72A9D0)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -typedef struct N(temp) { - char unk_00[0xC]; - EffectInstanceDataThing* unk_0C; -} N(temp); - ApiStatus N(func_802A12E0_72AA30)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; f32 a = evt_get_variable(script, *args++); f32 b = evt_get_variable(script, *args++); f32 c = evt_get_variable(script, *args++); - struct N(temp)* effect; + EffectInstance* effect; a += rand_int(20) - 10; b += rand_int(10) - 5; - effect = (struct N(temp)*)fx_cold_breath(0, a, b, c, 1.0f, 30); + effect = fx_cold_breath(0, a, b, c, 1.0f, 30); - effect->unk_0C->unk_18 = 0xF4; - effect->unk_0C->unk_1C = 0xF4; - effect->unk_0C->unk_20 = 0xDC; - effect->unk_0C->unk_28 = 0xD2; - effect->unk_0C->unk_2C = 0xD2; - effect->unk_0C->unk_30 = 0xBE; + ((ColdBreathFXData*)effect->data)->unk_18 = 244; + ((ColdBreathFXData*)effect->data)->unk_1C = 244; + ((ColdBreathFXData*)effect->data)->unk_20 = 220; + ((ColdBreathFXData*)effect->data)->unk_28 = 210; + ((ColdBreathFXData*)effect->data)->unk_2C = 210; + ((ColdBreathFXData*)effect->data)->unk_30 = 190; return ApiStatus_DONE2; } @@ -61,10 +56,10 @@ static s32 _pad = 0; // XXX #include "battle/item/insecticide_herb.pal.inc.c" Vtx N(model)[] = { - { .v = { -16, -16, 0, FALSE, 0, 0, 0, 0, 0, 255 } }, - { .v = { 15, -16, 0, FALSE, 1024, 0, 0, 0, 0, 255 } }, - { .v = { 15, 15, 0, FALSE, 1024, 1024, 0, 0, 0, 255 } }, - { .v = { -16, 15, 0, FALSE, 0, 1024, 0, 0, 0, 255 } }, + { .v = { .ob = {-16, -16, 0}, FALSE, .tc = {0, 0}, .cn = {0, 0, 0, 255} } }, + { .v = { .ob = {15, -16, 0}, FALSE, .tc = {1024, 0}, .cn = {0, 0, 0, 255} } }, + { .v = { .ob = {15, 15, 0}, FALSE, .tc = {1024, 1024}, .cn = {0, 0, 0, 255} } }, + { .v = { .ob = {-16, 15, 0}, FALSE, .tc = {0, 1024}, .cn = {0, 0, 0, 255} } }, }; Gfx N(displayList)[] = { diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c index 833bd80826..f52d3a8a2d 100644 --- a/src/battle/item/mystery.c +++ b/src/battle/item/mystery.c @@ -2,215 +2,162 @@ #include "effects.h" #include "ld_addrs.h" #include "battle/item/mystery.png.h" +#include "pause/pause_common.h" + +BSS s32 D_802A25B8[2]; #include "ItemRefund.inc.c" -#ifdef NON_EQUIVALENT - -extern s32 D_802A25E4; -extern HudElement* D_802A25C8; -extern s32 D_802A25EC; - -void N(func_802A123C_72C7EC)(void) { - s32 i; - HudElement** ptr; - s32 var; - s32* var2; - - if (D_802A25E4 < 6) { - if (D_802A25E4 > 0) { - draw_box(0, 7, 0x6A, 0x56, 0, 0x24, 0x24, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x140, 0xF0, 0); - - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); - - ptr = &D_802A25C8; - for (i = 0; i < 7; i++) { - var2 = *ptr; - var = (D_802A25EC / 100) - 0x68; - ptr++; - hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); - hud_element_draw_without_clipping(var2); - } - - var2 = D_802A25C8; - var = (D_802A25EC / 100) - 0x68; - hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); - hud_element_draw_without_clipping(var2); - } - } -} -#else -INCLUDE_ASM(ApiStatus, "battle/item/mystery", battle_item_mystery_func_802A123C_72C7EC, Evt* script, - s32 isInitialCall); -#endif - -#ifdef NON_EQUIVALENT - +extern s32 D_802A25C8[7]; extern s32 D_802A25E4; extern s32 D_802A25E8; extern s32 D_802A25EC; extern s32 D_802A25F0; extern s32 D_802A25F4; extern s32 D_802A25F8; -extern s16** D_802A25FC; -extern HudElement** D_802A25C8; -extern struct N(tempStc) gItemHudScripts[100]; +extern s32* D_802A25FC; -ApiStatus N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { +void N(func_802A123C_72C7EC(void)) { + s32 var_s3; + s32 id; + s32 i; + + if (D_802A25E4 < 6) { + if (D_802A25E4 > 0) { + draw_box(0, 7, 106, 86, 0, 36, 36, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); + + for (i = 0; i < ARRAY_COUNT(D_802A25C8); i++) { + id = D_802A25C8[i]; + hud_element_set_render_pos(id, 124, (i * 26) + 104 - (D_802A25EC / 100)); + hud_element_draw_without_clipping(id); + } + id = D_802A25C8[0]; + hud_element_set_render_pos(id, 124, (i * 26) + 104 - (D_802A25EC / 100)); + hud_element_draw_without_clipping(id); + } + } +} + +s32 N(func_802A13E4_72C994)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; + s32 temp_a0_4; + s32 temp_v1_3; + s32 var_v0_2; + s32 var_v0_3; + s32 id; + s32 i; if (isInitialCall) { D_802A25E4 = 0; } switch (D_802A25E4) { - case 0: { - s32* tablePtr; - s32 i; - f32 t0; - f32 t1; - HudElement* icon; - HudElement** iconPtr; - struct N(tempStc)* ic; - ItemData* itemTable; - - D_802A25F8 = create_generic_entity_frontUI(NULL, func_802A123C_72C7EC); + case 0: + D_802A25F8 = create_generic_entity_frontUI(NULL, N(func_802A123C_72C7EC)); D_802A25EC = rand_int(18200); D_802A25F0 = 1000; - tablePtr = &D_802A25FC; - *tablePtr = N(D_802A227C_72D82C); + D_802A25FC = N(D_802A227C_72D82C); if (battleStatus->unk_432 > 0) { - get_screen_overlay_params(1, &t0, &t1); - if (t1 >= 215.0f) { - *tablePtr = N(D_802A229C_72D84C); + u8 type; + f32 zoom; + + get_screen_overlay_params(1, &type, &zoom); + if (zoom >= 215.0f) { + D_802A25FC = N(D_802A229C_72D84C); } } - i = 0; - ic = &gItemHudScripts; - itemTable = gItemTable; - iconPtr = &D_802A25C8; - for (; i < 7; i++, iconPtr++) { - icon = hud_element_create(ic[itemTable[D_802A25FC[i]].iconID].iconId); - *iconPtr = icon; - hud_element_set_flags(icon, HUD_ELEMENT_FLAGS_80); + for (i = 0; i < ARRAY_COUNT(D_802A25C8); i++) { + id = hud_element_create(gItemHudScripts[gItemTable[D_802A25FC[i]].hudElemID].enabled); + D_802A25C8[i] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); } D_802A25E4 = 1; - } - break; - - case 1: { - s32* ECptr = &D_802A25EC; - s32* F0ptr = &D_802A25F0; - - *ECptr += *F0ptr; - if (*ECptr / 100 > 181) { - s32* test = ECptr; - *test -= 0x4718; + return ApiStatus_BLOCK; + case 1: + D_802A25EC += D_802A25F0; + if (D_802A25EC / 100 >= 182) { + D_802A25EC -= 18200; } - if (*F0ptr > 400) { - *F0ptr -= 10; - } else if (*F0ptr > 100) { - *F0ptr -= 5; + if (D_802A25F0 > 400) { + D_802A25F0 -= 10; + } else if (D_802A25F0 > 100) { + D_802A25F0 -= 5; } else { - *F0ptr -= 1; + D_802A25F0 -= 1; } if (D_802A25F0 < 10) { D_802A25E8 = D_802A25EC / 100; - if (D_802A25E8 % 26 < 13) { + + if (((D_802A25EC / 100) % 26) < 13) { if (rand_int(100) < 80) { D_802A25E4 = 2; } else { D_802A25E4 = 3; } - } else if (rand_int(100) < 60) { + break; + } + + if (rand_int(100) < 60) { D_802A25E4 = 3; } else { D_802A25E4 = 2; } } - } - break; - - case 2: { - s32* E8ptr = &D_802A25E8; - s32 a, b, c, d; - - d = *E8ptr % 26; - a = d; - c = a + 3; - if (c < 0) { - c = a + 6; + break; + case 2: + temp_a0_4 = D_802A25E8 % 26; + var_v0_2 = temp_a0_4 + 3; + if (var_v0_2 < 0) { + var_v0_2 += 3; } - d = c >> 2; - *E8ptr -= d; - D_802A25EC = *E8ptr * 100; - if (d == 0) { + temp_a0_4 = var_v0_2 >> 2; + D_802A25E8 -= temp_a0_4; + D_802A25EC = D_802A25E8 * 100; + if (temp_a0_4 == 0) { D_802A25E4 = 4; } - } - break; - - case 3: { - s32* E8ptr = &D_802A25E8; - s32 a, b, c, d; - - d = *E8ptr % 26; - if (d == 0) { + break; + case 3: + temp_v1_3 = D_802A25E8 % 26; + if (temp_v1_3 == 0) { D_802A25E4 = 4; break; } - a = d; - b = 26; - b -= a; - c = b + 3; - if (c < 0) { - c = b + 6; + temp_a0_4 = 26 - temp_v1_3; + var_v0_3 = temp_a0_4 + 3; + if (var_v0_3 < 0) { + var_v0_3 += 3; } - c = c >> 2; - *E8ptr += c; - D_802A25EC = *E8ptr * 100; - } - break; - - case 4: { + temp_a0_4 = var_v0_3 >> 2; + D_802A25E8 += temp_a0_4; + D_802A25EC = D_802A25E8 * 100; + break; + case 4: D_802A25F4 = 20; D_802A25E4 = 5; - } - break; - - case 5: { - s32* F4ptr = &D_802A25F4; - s32 i; - s16 g; - HudElement** iconPtr; - - if (*F4ptr != 0) { - *F4ptr -= 1; + break; + case 5: + if (D_802A25F4 != 0) { + D_802A25F4--; break; } - iconPtr = &D_802A25C8; - i = D_802A25E8 / 26; - g = D_802A25FC[i]; - battleStatus->selectedItemID = g; - script->varTable[0] = g; - free_generic_entity(D_802A25F8); - for (i = 0; i < 7; i++) { - hud_element_free(*iconPtr++); - } - } - return ApiStatus_DONE2; - } + var_v0_3 = i = D_802A25E8 / 26; // use of i required to match + battleStatus->selectedItemID = D_802A25FC[D_802A25E8 / 26]; + script->varTable[0] = battleStatus->selectedItemID; + free_generic_entity(D_802A25F8); + for (i = 0; i < ARRAY_COUNT(D_802A25C8); i++) { + hud_element_free(D_802A25C8[i]); + } + return ApiStatus_DONE2; + } return ApiStatus_BLOCK; } -#else -INCLUDE_ASM(ApiStatus, "battle/item/mystery", battle_item_mystery_func_802A13E4_72C994, Evt* script, - s32 isInitialCall); -#endif ApiStatus N(func_802A188C_72CE3C)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -260,7 +207,7 @@ Gfx N(displayList)[] = { }; s32 N(modelCommandList)[] = { - 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000, + 0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), (s32) &N(displayList), 0x00000002, 0x00000000, }; s32 N(D_802A227C_72D82C)[8] = { diff --git a/src/battle/item/shooting_star.c b/src/battle/item/shooting_star.c index b4e7469bde..a856750ca5 100644 --- a/src/battle/item/shooting_star.c +++ b/src/battle/item/shooting_star.c @@ -3,51 +3,21 @@ #include "ItemRefund.inc.c" -#ifdef NON_EQUIVALENT -ApiStatus N(func_802A123C_71D9AC)(Evt* script, s32 isInitialCall) { - s32 c8 = 200; - s32 temp_s1 = 100 + rand_int(c8); - s32 temp_s0 = rand_int(40); - s32 phi_a0; - s32 phi_v0; - s32 rand; - f32 temp_f20; - f32 temp_f22; - f32 test; +ApiStatus battle_item_shooting_star_func_802A123C_71D9AC(Evt* script, s32 isInitialCall) { + s32 t1 = 200; + s32 r1 = rand_int(t1) + 100; // 100-299 + s32 r2 = rand_int(40); // 0-39 + f32 var_f22; - if (script->varTable[0] & 3) { - rand = rand_int(100); - rand += c8; - temp_f22 = temp_s1 - rand; - rand = rand_int(100); - rand -= 50; - temp_f20 = temp_s0 - rand; - phi_v0 = rand_int(10); - phi_a0 = 2; + if ((script->varTable[0] % 4) != 0) { + var_f22 = r1 - (rand_int(100) + t1); + fx_star(2, r1, t1, r2, var_f22, 0.0f, r2 + 50 - rand_int(100), rand_int(10) + 7); } else { - rand = rand_int(100); - rand += 200; - temp_f22 = temp_s1 - rand; - rand = rand_int(100); - rand -= 50; - temp_f20 = temp_s0 - rand; - phi_v0 = rand_int(10); - phi_a0 = 3; + var_f22 = r1 - (rand_int(100) + t1); + fx_star(3, r1, t1, r2, var_f22, 0.0f, r2 + 50 - rand_int(100), rand_int(10) + 7); } - - do { - fx_star(phi_a0, temp_s1, c8, temp_s0, temp_f22, 0, temp_f20, phi_v0 + 7); - if (temp_f20) { - temp_f20 -= rand; - } - } while (0); - return ApiStatus_DONE2; } -#else -INCLUDE_ASM(ApiStatus, "battle/item/shooting_star", battle_item_shooting_star_func_802A123C_71D9AC, - Evt* script, s32 isInitialCall); -#endif ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/battle/item/strange_cake.c b/src/battle/item/strange_cake.c index d2ddb6db42..01264edac7 100644 --- a/src/battle/item/strange_cake.c +++ b/src/battle/item/strange_cake.c @@ -1,209 +1,158 @@ #include "strange_cake.h" #include "effects.h" +#include "pause/pause_common.h" +#include "hud_element.h" #include "battle/item/strange_cake1.png.h" #include "battle/item/strange_cake2.png.h" #include "battle/item/strange_cake3.png.h" +BSS s32 D_802A2DC8[2]; + #include "ItemRefund.inc.c" -#ifdef NON_EQUIVALENT - -extern s32 D_802A25E4; -extern HudElement* D_802A2DF4; -extern s32 D_802A2DD8; - -ApiStatus N(func_802A123C_73153C)(Evt* script, s32 isInitialCall) { - s32 i; - HudElement** ptr; - s32 var; - s32* var2; - - if (D_802A25E4 < 6) { - if (D_802A25E4 > 0) { - draw_box(0, 7, 0x6A, 0x56, 0, 0x24, 0x24, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x140, 0xF0, 0); - - gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); - - ptr = &D_802A2DF4; - for (i = 0; i < 7; i++) { - var2 = *ptr; - var = (D_802A2DD8 / 100) - 0x68; - ptr++; - hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); - hud_element_draw_without_clipping(var2); - } - - var2 = D_802A2DF4; - var = (D_802A2DD8 / 100) - 0x68; - hud_element_set_render_pos(var2, 0x7C, (i * 0x1A) - var); - hud_element_draw_without_clipping(var2); - } - } -} -#else -INCLUDE_ASM(ApiStatus, "battle/item/strange_cake", battle_item_strange_cake_func_802A123C_73153C); -#endif - -#ifdef NON_EQUIVALENT +extern HudScript* N(D_802A2848_732B48)[]; +extern s32 N(D_802A2858_732B58)[]; +extern s32 D_802A2DD8[5]; +extern s32 D_802A2DE4; extern s32 D_802A2DEC; extern s32 D_802A2DF0; extern s32 D_802A2DF4; extern s32 D_802A2DF8; extern s32 D_802A2DFC; extern s32 D_802A2E00; -extern s32* D_802A2DD8; -extern HudElement** D_802A25C8; -s32 N(D_802A2848_732B48)[] = { - 0x802A27F8, 0x802A2820, 0x802A27D0, 0x802A27F8 -}; +void N(func_802A123C_73153C(void)) { + s32 var_s3; + s32 id; + s32 i; -s32 N(D_802A2858_732B58)[] = { - 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001 -}; + if (D_802A2DEC < 6) { + if (D_802A2DEC > 0) { + draw_box(0, 7, 106, 86, 0, 36, 36, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, NULL, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL); + gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, 108, 90, 139, 118); -ApiStatus N(func_802A13E4_7316E4)(Evt* script, s32 isInitialCall) { + for (i = 0; i < ARRAY_COUNT(D_802A2DD8); i++) { + id = D_802A2DD8[i]; + hud_element_set_render_pos(id, 124, (i * 26) + 104 - (D_802A2DF4 / 100)); + hud_element_draw_without_clipping(id); + } + id = D_802A2DD8[0]; + hud_element_set_render_pos(id, 124, (i * 26) + 104 - (D_802A2DF4 / 100)); + hud_element_draw_without_clipping(id); + } + } +} + +s32 N(func_802A13E4_7316E4)(Evt* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; + s32 temp_a0_4; + s32 temp_v1_3; + s32 var_v0_2; + s32 var_v0_3; + s32 id; + s32 i; if (isInitialCall) { D_802A2DEC = 0; } switch (D_802A2DEC) { - case 0: { - s32 i; - HudElement** iconPtr; - - D_802A2E00 = create_generic_entity_frontUI(NULL, func_802A123C_73153C); - i = rand_int(13000); - D_802A2DF4 = i; - + case 0: + D_802A2E00 = create_generic_entity_frontUI(NULL, N(func_802A123C_73153C)); + D_802A2DF4 = rand_int(13000); D_802A2DF8 = 1000; - for (i = 0; i < 5; i++) { - s32* B48Ptr = &N(D_802A2848_732B48); - s32* B58Ptr = &N(D_802A2858_732B58); - HudElement* icon = hud_element_create(*(B48Ptr + * (B58Ptr + i))); - - *(&D_802A2DD8 + i) = icon; - hud_element_set_flags(icon, HUD_ELEMENT_FLAGS_80); + for (i = 0; i < ARRAY_COUNT(D_802A2DD8); i++) { + id = hud_element_create(N(D_802A2848_732B48)[N(D_802A2858_732B58)[i]]); + D_802A2DD8[i] = id; + hud_element_set_flags(id, HUD_ELEMENT_FLAGS_80); } D_802A2DEC = 1; - } - break; - case 1: { - s32* ECptr = &D_802A2DF4; - s32* F0ptr = &D_802A2DF8; - - *ECptr += *F0ptr; - if (*ECptr / 100 >= 130) { - s32* test = ECptr; - *test -= 0x32C8; + return ApiStatus_BLOCK; + case 1: + D_802A2DF4 += D_802A2DF8; + if (D_802A2DF4 / 100 >= 130) { + D_802A2DF4 -= 13000; } - if (*F0ptr > 400) { - *F0ptr -= 10; - } else if (*F0ptr > 100) { - *F0ptr -= 5; + if (D_802A2DF8 > 400) { + D_802A2DF8 -= 10; + } else if (D_802A2DF8 > 100) { + D_802A2DF8 -= 5; } else { - *F0ptr -= 1; + D_802A2DF8 -= 1; } if (D_802A2DF8 < 10) { D_802A2DF0 = D_802A2DF4 / 100; - if (D_802A2DF0 % 26 < 13) { + + if (((D_802A2DF4 / 100) % 26) < 13) { if (rand_int(100) < 80) { D_802A2DEC = 2; } else { D_802A2DEC = 3; } - } else if (rand_int(100) < 60) { + break; + } + + if (rand_int(100) < 60) { D_802A2DEC = 3; } else { D_802A2DEC = 2; } } - } - break; - - case 2: { - s32* E8ptr = &D_802A2DF0; - s32 a, b, c, d; - - d = *E8ptr % 26; - a = d; - c = a + 3; - if (c < 0) { - c = a + 6; + break; + case 2: + temp_a0_4 = D_802A2DF0 % 26; + var_v0_2 = temp_a0_4 + 3; + if (var_v0_2 < 0) { + var_v0_2 += 3; } - d = c >> 2; - *E8ptr -= d; - D_802A2DF4 = *E8ptr * 100; - if (d == 0) { + temp_a0_4 = var_v0_2 >> 2; + D_802A2DF0 -= temp_a0_4; + D_802A2DF4 = D_802A2DF0 * 100; + if (temp_a0_4 == 0) { D_802A2DEC = 4; } - } - break; - - case 3: { - s32* E8ptr = &D_802A2DF0; - s32 a, b, c, d; - - d = *E8ptr % 26; - if (d == 0) { + break; + case 3: + temp_v1_3 = D_802A2DF0 % 26; + if (temp_v1_3 == 0) { D_802A2DEC = 4; break; } - a = d; - b = 26; - b -= a; - c = b + 3; - if (c < 0) { - c = b + 6; + temp_a0_4 = 26 - temp_v1_3; + var_v0_3 = temp_a0_4 + 3; + if (var_v0_3 < 0) { + var_v0_3 += 3; } - c = c >> 2; - *E8ptr += c; - D_802A2DF4 = *E8ptr * 100; - } - break; - - case 4: { + temp_a0_4 = var_v0_3 >> 2; + D_802A2DF0 += temp_a0_4; + D_802A2DF4 = D_802A2DF0 * 100; + break; + case 4: D_802A2DFC = 20; D_802A2DEC = 5; - } - break; - - case 5: { - s32* F4ptr = &D_802A2DFC; - s32 i; - s16 g; - HudElement** iconPtr; - - if (*F4ptr != 0) { - *F4ptr -= 1; + break; + case 5: + if (D_802A2DFC != 0) { + D_802A2DFC--; break; } - iconPtr = &D_802A25C8; - i = D_802A2DF0 / 26; - g = N(D_802A2858_732B58)[i]; - battleStatus->selectedItemID = g; - script->varTable[0] = g; - free_generic_entity(D_802A2E00); - for (i = 0; i < 5; i++) { - hud_element_free(*iconPtr++); - } - } - return ApiStatus_DONE2; - } + var_v0_3 = i = D_802A2DF0 / 26; // use of i required to match + battleStatus->selectedItemID = N(D_802A2858_732B58)[var_v0_3]; + script->varTable[0] = battleStatus->selectedItemID; + free_generic_entity(D_802A2E00); + for (i = 0; i < ARRAY_COUNT(D_802A2DD8); i++) { + hud_element_free(D_802A2DD8[i]); + } + return ApiStatus_DONE2; + } return ApiStatus_BLOCK; } -#else -INCLUDE_ASM(ApiStatus, "battle/item/strange_cake", battle_item_strange_cake_func_802A13E4_7316E4, - Evt* script, s32 isInitialCall); -#endif ApiStatus N(func_802A1818_731B18)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -302,23 +251,38 @@ static s32 _pad = 0; // XXX #include "battle/item/strange_cake3.png.inc.c" #include "battle/item/strange_cake3.pal.inc.c" -s32 N(data)[] = { - 0x00000008, 0x00000005, 0x00000003, 0x00000004, - 0x00000002, 0x0000003C, 0x802A2170, 0x802A2370, - 0x00000003, 0x00000000, 0x00000008, 0x00000005, - 0x00000003, 0x00000004, 0x00000002, 0x0000003C, - 0x802A2390, 0x802A2590, 0x00000003, 0x00000000, - 0x00000008, 0x00000005, 0x00000003, 0x00000004, - 0x00000002, 0x0000003C, 0x802A25B0, 0x802A27B0, - 0x00000003, 0x00000000 +HudScript N(D_802A27D0) = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_32x32, HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32) battle_item_strange_cake1_png, (s32) battle_item_strange_cake1_pal, + 0x00000003, + HUD_ELEMENT_OP_End, }; -s32 N(D_802A2848_732B48)[] = { - 0x802A27F8, 0x802A2820, 0x802A27D0, 0x802A27F8 +HudScript N(D_802A27F8) = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_32x32, HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32) battle_item_strange_cake2_png, (s32) battle_item_strange_cake2_pal, + 0x00000003, + HUD_ELEMENT_OP_End, }; +HudScript N(D_802A2820) = { + HUD_ELEMENT_OP_SetVisible, + HUD_ELEMENT_OP_SetTileSize, HUD_ELEMENT_SIZE_32x32, + HUD_ELEMENT_OP_Loop, + HUD_ELEMENT_OP_SetCI, 60, (s32) battle_item_strange_cake3_png, (s32) battle_item_strange_cake3_pal, + 0x00000003, + HUD_ELEMENT_OP_End +}; + +HudScript* N(D_802A2848_732B48)[] = { + &N(D_802A27F8), &N(D_802A2820), &N(D_802A27D0), &N(D_802A27F8) +}; + +// indexes into D_802A2848_732B48 s32 N(D_802A2858_732B58)[] = { - 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x000000000 + 0, 1, 2, 0, 1, 0 }; EvtScript N(script6) = { diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 46aae282c9..5be7dcec09 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -67,28 +67,26 @@ ApiStatus func_802384B0_703FA0(Evt* script, s32 isInitialCall) { } ApiStatus func_80238570_704060(Evt* script, s32 isInitialCall) { - s32* var = D_80239A0C_7054FC; + EffectInstance* effect = D_80239A0C_7054FC; - if (var != NULL) { - *var |= 0x10; + if (effect != NULL) { + effect->flags |= 0x10; } D_80239A0C_7054FC = NULL; return ApiStatus_DONE2; } -// Beware this demon because "EffectInstanceDataThing" is one hell of a -// janky solution, but this does match. ApiStatus func_8023859C_70408C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++); - EffectInstanceDataThing* dataThing; + ThunderboltRingFXData* data; D_8023C1B4 = fx_thunderbolt_ring(0, var1, var2, var3, 1.0f, 10); - dataThing = D_8023C1B4->data; - dataThing->unk_30 = 3; + data = D_8023C1B4->data; + data->unk_30 = 3; return ApiStatus_DONE2; } @@ -116,18 +114,16 @@ ApiStatus func_80238784_704274(Evt* script, s32 isInitialCall) { INCLUDE_ASM(s32, "battle/partner/watt", func_80238810_704300); -// Beware this demon because "EffectInstanceDataThing" is one hell of a -// janky solution, but this does match. ApiStatus func_80238B3C_70462C(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 var1 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++); - EffectInstanceDataThing* temp_a0; + ThunderboltRingFXData* data; D_8023C1B4 = fx_thunderbolt_ring(0, var1, var2, var3, 1.0f, 60); - temp_a0 = D_8023C1B4->data; - temp_a0->unk_30 = 2; + data = D_8023C1B4->data; + data->unk_30 = 2; return ApiStatus_DONE2; } diff --git a/src/common/UnkEffect6FFunc.inc.c b/src/common/UnkEffect6FFunc.inc.c index bd26b1a622..08629fcc43 100644 --- a/src/common/UnkEffect6FFunc.inc.c +++ b/src/common/UnkEffect6FFunc.inc.c @@ -3,7 +3,7 @@ ApiStatus N(UnkEffect6FFunc)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - Effect6FInstance* effect; + EffectInstance* effect; s32 unused_var = evt_get_variable(script, *args++); s32 temp_s6 = evt_get_variable(script, *args++); s32 temp_s5 = evt_get_variable(script, *args++); @@ -14,13 +14,13 @@ ApiStatus N(UnkEffect6FFunc)(Evt* script, s32 isInitialCall) { s32 temp_s1 = evt_get_variable(script, *args++); s32 temp_s0_9 = evt_get_variable(script, *args++); - effect = (Effect6FInstance*)fx_cold_breath(1, temp_s6, temp_s5, temp_s4, temp_f20, temp_s2); - effect->data->rotation.z = temp_s3; - effect->data->scale.x = temp_s1; - effect->data->scale.y = temp_s0_9; - effect->data->color.x = 255; - effect->data->color.y = 255; - effect->data->color.z = 255; + effect = fx_cold_breath(1, temp_s6, temp_s5, temp_s4, temp_f20, temp_s2); + ((Effect6FFXData*)effect->data)->rotation.z = temp_s3; + ((Effect6FFXData*)effect->data)->scale.x = temp_s1; + ((Effect6FFXData*)effect->data)->scale.y = temp_s0_9; + ((Effect6FFXData*)effect->data)->color.x = 255; + ((Effect6FFXData*)effect->data)->color.y = 255; + ((Effect6FFXData*)effect->data)->color.z = 255; return ApiStatus_DONE2; } diff --git a/src/common/UnkWaterFountainFunc.inc.c b/src/common/UnkWaterFountainFunc.inc.c new file mode 100644 index 0000000000..ebabb38847 --- /dev/null +++ b/src/common/UnkWaterFountainFunc.inc.c @@ -0,0 +1,31 @@ +#include "common.h" +#include "effects.h" + +ApiStatus N(UnkWaterFountainFunc)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + EffectInstance* effect; + f32 temp_f28; + f32 temp_f26; + f32 temp_f20; + f32 temp_f22; + f32 temp_f24; + f32 temp_f20_2; + + temp_f28 = evt_get_variable(script, *args++); + temp_f26 = evt_get_variable(script, *args++); + evt_get_variable(script, *args++); + temp_f20 = evt_get_variable(script, *args++); + temp_f22 = evt_get_variable(script, *args++); + temp_f24 = evt_get_variable(script, *args++); + temp_f20_2 = atan2(temp_f28, temp_f26, temp_f20, temp_f22 + 40.0f); + + effect = fx_water_fountain(0, temp_f20 - 10.0f, temp_f22 + 60.0f, temp_f24 + 20.0f, 2.5f, 40); + ((WaterFountainFXData*)effect->data)->unk_38 = temp_f20_2; + ((WaterFountainFXData*)effect->data)->unk_18 = 2; + ((WaterFountainFXData*)effect->data)->unk_1C = 2; + ((WaterFountainFXData*)effect->data)->unk_20 = 2; + ((WaterFountainFXData*)effect->data)->unk_28 = 80; + ((WaterFountainFXData*)effect->data)->unk_2C = 80; + ((WaterFountainFXData*)effect->data)->unk_30 = 80; + return ApiStatus_DONE2; +} diff --git a/src/common/UnkWhirlwindEffectFunc.inc.c b/src/common/UnkWhirlwindEffectFunc.inc.c index 846bd61986..ee5e53f369 100644 --- a/src/common/UnkWhirlwindEffectFunc.inc.c +++ b/src/common/UnkWhirlwindEffectFunc.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects.h" -BSS EffectWhirlwind N(effectStruct); +BSS EffectWhirlwindUnk N(effectUnk); BSS static s32 padding[0x94]; ApiStatus N(UnkWhirlwindEffectFunc)(Evt* script, s32 isInitialCall) { @@ -11,10 +11,10 @@ ApiStatus N(UnkWhirlwindEffectFunc)(Evt* script, s32 isInitialCall) { s32 var3 = evt_get_variable(script, *args++); s32 var4 = evt_get_variable(script, *args++); - N(effectStruct).unk_28 = var1; - N(effectStruct).unk_2C = var2 - 10.0f; - N(effectStruct).unk_30 = var3; + N(effectUnk).unk_28 = var1; + N(effectUnk).unk_2C = var2 - 10.0f; + N(effectUnk).unk_30 = var3; - fx_46(6, &N(effectStruct), 1.0f, var4); + fx_46(6, &N(effectUnk), 1.0f, var4); return ApiStatus_DONE2; } diff --git a/src/effects/aura.c b/src/effects/aura.c index 4ac661eb96..193f1c9a66 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -1,17 +1,17 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_090023E0[]; -extern Gfx D_09002440[]; -extern Gfx D_090023F8[]; -extern Gfx D_09002458[]; -extern Gfx D_090023B0[]; -extern Gfx D_09002410[]; -extern Gfx D_090023C8[]; -extern Gfx D_09002428[]; extern Gfx D_09002000[]; extern Gfx D_090020E8[]; extern Gfx D_090021D0[]; +extern Gfx D_090023B0[]; +extern Gfx D_090023C8[]; +extern Gfx D_090023E0[]; +extern Gfx D_090023F8[]; +extern Gfx D_09002410[]; +extern Gfx D_09002428[]; +extern Gfx D_09002440[]; +extern Gfx D_09002458[]; Gfx* D_E0076E90[] = { D_090023E0, D_090023E0, D_09002440, D_09002440 }; Gfx* D_E0076EA0[] = { D_090023F8, D_090023F8, D_09002458, D_09002458 }; @@ -57,20 +57,20 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* part->unk_2C = 100; part->type = arg0; part->unk_30 = 0; - part->unk_28 = 0; + part->primA = 0; part->pos.x = arg1; part->pos.y = arg2; part->pos.z = arg3; switch (arg0) { case 0: - part->unk_68 = 75; - part->unk_69 = 75; - part->unk_6A = 75; - part->unk_6B = 255; - part->unk_6C = 247; - part->unk_6D = 155; - part->unk_6E = 0; + part->primR = 75; + part->primG = 75; + part->primB = 75; + part->envR = 255; + part->envG = 247; + part->engB = 155; + part->engA = 0; part->unk_24 = arg4; part->unk_20 = arg4 * 0.6; part->unk_1C = arg4 * 2.0; @@ -84,13 +84,13 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* part->unk_60 = 0.9f; break; case 1: - part->unk_68 = 75; - part->unk_69 = 75; - part->unk_6A = 75; - part->unk_6B = 255; - part->unk_6C = 0; - part->unk_6D = 0; - part->unk_6E = 0; + part->primR = 75; + part->primG = 75; + part->primB = 75; + part->envR = 255; + part->envG = 0; + part->engB = 0; + part->engA = 0; part->unk_1C = arg4; part->unk_20 = arg4; part->unk_24 = arg4; @@ -104,13 +104,13 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* part->unk_60 = 0.9f; break; case 2: - part->unk_68 = 25; - part->unk_69 = 121; - part->unk_6A = 142; - part->unk_6B = 34; - part->unk_6D = 255; - part->unk_6C = 0; - part->unk_6E = 81; + part->primR = 25; + part->primG = 121; + part->primB = 142; + part->envR = 34; + part->engB = 255; + part->envG = 0; + part->engA = 81; part->unk_1C = arg4; part->unk_20 = arg4; part->unk_24 = arg4; @@ -124,13 +124,13 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* part->unk_60 = 1.04f; break; default: - part->unk_68 = 179; - part->unk_69 = 169; - part->unk_6A = 85; - part->unk_6B = 34; - part->unk_6D = 255; - part->unk_6C = 0; - part->unk_6E = 63; + part->primR = 179; + part->primG = 169; + part->primB = 85; + part->envR = 34; + part->engB = 255; + part->envG = 0; + part->engA = 63; part->unk_1C = arg4; part->unk_20 = arg4; part->unk_24 = arg4; @@ -187,16 +187,16 @@ void aura_update(EffectInstance* effect) { if (type < 2) { if (unk_30 <= 10) { - data->unk_28 += (128 - data->unk_28) * 0.5; + data->primA += (128 - data->primA) * 0.5; } } else { if (unk_30 <= 10) { - data->unk_28 = (unk_30 * 0xFF) / 10; + data->primA = (unk_30 * 0xFF) / 10; } } if (unk_2C < 10) { - data->unk_28 *= 0.5; + data->primA *= 0.5; } if (type == 0) { @@ -263,4 +263,68 @@ void func_E007684C(void) { void func_E0076854(void) { } -INCLUDE_ASM(s32, "effects/aura", aura_appendGfx); +void aura_appendGfx(void* effect) { + Matrix4f sp18, sp58, sp98; + EffectInstance* eff = (EffectInstance*)effect; + AuraFXData* data = ((EffectInstance*)effect)->data; + s32 type = data->type; + s32 primA = data->primA; + s32 v1, v2; + + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMasterGfxPos++, D_E0076ED0[type]); + + shim_guTranslateF(sp18, data->unk_10, data->unk_14, data->unk_18); + if (type == 2) { + shim_guRotateF(sp58, data->unk_64.f, 0.0f, 1.0f, 0.0f); + } else { + shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + } + shim_guMtxCatF(sp58, sp18, sp98); + shim_guScaleF(sp58, data->unk_1C, data->unk_20, 1.0f); + shim_guMtxCatF(sp58, sp98, sp98); + if (type == 0) { + shim_guTranslateF(sp58, (-(data->unk_1C - data->unk_24) / data->unk_24) * 10.0f, 0.0f, 0.0f); + shim_guMtxCatF(sp58, sp98, sp98); + } + shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, D_E0076EC0[type]); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + + shim_guTranslateF(sp18, data->pos.x, data->pos.y, data->pos.z); + if (type == 2) { + shim_guRotateF(sp58, data->unk_64.f, 0.0f, 1.0f, 0.0f); + } else { + shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + } + shim_guMtxCatF(sp58, sp18, sp98); + shim_guScaleF(sp58, data->unk_1C, data->unk_20, 1.0f); + shim_guMtxCatF(sp58, sp98, sp98); + if (type == 0) { + shim_guTranslateF(sp58, (-(data->unk_1C - data->unk_24) / data->unk_24) * 10.0f, 0.0f, 0.0f); + shim_guMtxCatF(sp58, sp98, sp98); + } + shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, D_E0076EB0[type]); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + + gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->primR, data->primG, data->primB, primA); + gDPSetEnvColor(gMasterGfxPos++, data->envR, data->envG, data->engB, data->engA); + + v1 = data->unk_34 * 4.0f; + v2 = data->unk_40 * 4.0f; + + gDPSetTileSize(gMasterGfxPos++, 1, v1, v2, v1 + 124, v2 + 508); + gSPDisplayList(gMasterGfxPos++, D_E0076E90[type]); + + v1 = data->unk_4C * 4.0f; + v2 = data->unk_58 * 4.0f; + + gDPSetTileSize(gMasterGfxPos++, 1, v1 + 30, v2 + 30, v1 + 282, v2 + 538); + gSPDisplayList(gMasterGfxPos++, D_E0076EA0[type]); + gDPPipeSync(gMasterGfxPos++); +} diff --git a/src/effects/big_snowflakes.c b/src/effects/big_snowflakes.c index 8ce977eb46..a4f35e0c9a 100644 --- a/src/effects/big_snowflakes.c +++ b/src/effects/big_snowflakes.c @@ -1,14 +1,98 @@ #include "common.h" #include "effects_internal.h" +extern Gfx D_09000900[]; +extern Gfx D_090009E8[]; +extern Gfx D_09000A10[]; + +Gfx* D_E0060730[] = { D_090009E8, D_09000A10 }; +Gfx* D_E0060738[] = { D_09000900, D_09000900 }; + +void big_snowflakes_init(EffectInstance* effect); +void big_snowflakes_update(EffectInstance* effect); +void big_snowflakes_render(EffectInstance* effect); void big_snowflakes_appendGfx(void* effect); -INCLUDE_ASM(s32, "effects/big_snowflakes", big_snowflakes_main); +void big_snowflakes_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { + EffectBlueprint bp; + EffectInstance* effect; + BigSnowflakeFXData* data; + s32 numParts = 9; + s32 i; -void big_snowflakes_init(void) { + bp.unk_00 = 0; + bp.init = big_snowflakes_init; + bp.update = big_snowflakes_update; + bp.renderWorld = big_snowflakes_render; + bp.unk_14 = 0; + bp.effectID = EFFECT_BIG_SNOWFLAKES; + + effect = shim_create_effect_instance(&bp); + effect->numParts = numParts; + + data = shim_general_heap_malloc(effect->numParts * sizeof(*data)); + effect->data = data; + + ASSERT(data != NULL); + + shim_mem_clear(data, numParts * sizeof(*data)); + data->unk_00 = arg0; + data->unk_04 = arg1; + data->unk_08 = arg2; + data->unk_0C = arg3; + data->unk_28 = 30; + data->unk_2C = 0; + data->unk_24 = 0; + + data++; + for (i = 1; i < numParts; i++, data++) { + data->unk_04 = func_E0200000(10) - 5; + data->unk_08 = func_E0200000(10) + 5; + data->unk_0C = 10.0f; + data->unk_18 = func_E0200000(360); + data->unk_20 = func_E0200000(360); + data->unk_1C = func_E0200000(100) / 10; + data->unk_10 = 0; + data->unk_14 = 2.0f; + } } -INCLUDE_ASM(s32, "effects/big_snowflakes", big_snowflakes_update); +void big_snowflakes_init(EffectInstance* effect) { +} + +void big_snowflakes_update(EffectInstance* effect) { + BigSnowflakeFXData* data = effect->data; + s32 unk_28; + s32 i; + + data->unk_28--; + data->unk_2C++; + if (data->unk_28 < 0) { + shim_remove_effect(effect); + return; + } + + unk_28 = data->unk_28; + if (data->unk_2C < 10) { + data->unk_24 += (255 - data->unk_24) * 0.3; + } + if (unk_28 < 10) { + data->unk_24 *= 0.8; + } + + data++; + for (i = 1; i < effect->numParts; i++, data++) { + data->unk_10 += (f32) (shim_sin_deg(2.0f * data->unk_18) * 0.2); + data->unk_14 += -0.05f; + data->unk_10 *= 0.92; + data->unk_14 += -0.05f; + data->unk_1C += func_E0200044(50, unk_28 + (i * 20)) - 25; + data->unk_18 += shim_sin_deg(data->unk_1C) * 10.0f; + data->unk_20 += shim_cos_deg(data->unk_1C * 0.5f) * 10.0f; + data->unk_04 += data->unk_10; + data->unk_08 += data->unk_14; + } +} void big_snowflakes_render(EffectInstance* effect) { RenderTask renderTask; @@ -23,4 +107,39 @@ void big_snowflakes_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -INCLUDE_ASM(s32, "effects/big_snowflakes", big_snowflakes_appendGfx); +void big_snowflakes_appendGfx(void* effect) { + BigSnowflakeFXData* data = ((EffectInstance*)effect)->data; + Matrix4f sp18; + Matrix4f sp58; + Matrix4f sp98; + Gfx* dlist = D_E0060738[0]; + s32 i; + + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMasterGfxPos++, dlist); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 20, 100, 20, data->unk_24); + + shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); + shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp18, sp98); + + data++; + for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, data++) { + Gfx* dlist2 = D_E0060730[i & 1]; // should be able to be i % 2 (ARRAY_COUNT(D_E0060730)) + + shim_guTranslateF(sp58, data->unk_04, data->unk_08, data->unk_0C); + shim_guMtxCatF(sp58, sp98, sp18); + + if (!(i & 1)) { + shim_guRotateF(sp58, data->unk_18, 0.0f, 0.0f, 1.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guRotateF(sp58, data->unk_20, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp18, sp18); + } + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, dlist2); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } +} diff --git a/src/effects/butterflies.c b/src/effects/butterflies.c index 820805c047..0c4ee78798 100644 --- a/src/effects/butterflies.c +++ b/src/effects/butterflies.c @@ -1,18 +1,150 @@ #include "common.h" #include "effects_internal.h" -s32 D_E00AA6C0[] = { 0x090038F8, 0x09003968, 0x090039D8, 0x09003A48, 0x09003AB8, 0x09003B28, 0x09003B98, 0x09003C08, 0x09003C78, 0x09003CE8, 0x09003D58 }; +extern Vtx D_09002D40[][6]; // TODO confirm this type is correct +extern Gfx D_09003880[]; +extern Gfx D_090038F8[]; +extern Gfx D_09003968[]; +extern Gfx D_090039D8[]; +extern Gfx D_09003A48[]; +extern Gfx D_09003AB8[]; +extern Gfx D_09003B28[]; +extern Gfx D_09003B98[]; +extern Gfx D_09003C08[]; +extern Gfx D_09003C78[]; +extern Gfx D_09003CE8[]; +extern Gfx D_09003D58[]; +extern Gfx D_09003DC8[]; -s8 D_E00AA6EC[] = { 0xFF, 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF9, 0xF8, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3, 0xF2, 0xF1, 0xF0, 0xEF, 0xEE, 0xED, 0xEF, 0xF1, 0xF3, 0xF5, 0xF7, 0xF9, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +Gfx* D_E00AA6C0[11] = { + D_090038F8, D_09003968, D_090039D8, D_09003A48, D_09003AB8, D_09003B28, D_09003B98, D_09003C08, D_09003C78, D_09003CE8, D_09003D58 +}; +s8 D_E00AA6EC[] = { + -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16, -17, -18, -19, -17, -15, -13, -11, -9, -7, -5, -3, -1, 0, 0, 0, 0, 0, 0, 0, 0 }; + +void butterflies_init(EffectInstance* effect); +void butterflies_update(EffectInstance* effect); +void butterflies_render(EffectInstance* effect); void butterflies_appendGfx(void* effect); -INCLUDE_ASM(s32, "effects/butterflies", butterflies_main); +EffectInstance* butterflies_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { + EffectBlueprint bp; + EffectInstance* effect; + ButterflyFXData* part; + s32 numParts = 1; + s32 i; -void butterflies_init(void) { + bp.unk_00 = 0; + bp.init = butterflies_init; + bp.update = butterflies_update; + bp.renderWorld = butterflies_render; + bp.unk_14 = NULL; + bp.effectID = EFFECT_BUTTERFLIES; + + effect = shim_create_effect_instance(&bp); + effect->numParts = numParts; + part = effect->data = shim_general_heap_malloc(numParts * sizeof(*part)); + ASSERT(effect->data != NULL); + + part->unk_04 = 1000; + part->unk_00 = arg0; + part->unk_24 = 255; + part->unk_0C = arg1; + part->unk_18 = arg1; + part->unk_10 = arg2; + part->unk_1C = arg2; + part->unk_14 = arg3; + part->unk_20 = arg3; + part->unk_08 = 0; + part->unk_2C = 0; + part->unk_30 = 0; + part->unk_34 = 50.0f; + part->unk_38 = 30.0f; + return effect; } -INCLUDE_ASM(s32, "effects/butterflies", butterflies_update); +void butterflies_init(EffectInstance* effect) { +} + +void butterflies_update(EffectInstance* effect) { + ButterflyFXData* temp_s0; + f32 temp_f20; + f32 temp_f20_2; + f32 temp_f22; + f32 temp_f24; + f32 temp_f4; + f32 temp_f6; + f32 temp_f8; + f32 var_f12; + f32 var_f20; + f32 var_f22; + f32 var_f24; + + temp_s0 = effect->data; + if (effect->flags & 0x10) { + effect->flags &= ~0x10; + temp_s0->unk_04 = 900; + } + + if (temp_s0->unk_04 < 1000) { + temp_s0->unk_04--; + } + temp_s0->unk_08 += 1; + if (temp_s0->unk_04 < 0) { + shim_remove_effect(effect); + return; + } + if (temp_s0->unk_04 < 0x10) { + temp_s0->unk_24 = temp_s0->unk_04 * 0x10; + } + + temp_s0->unk_30--; + if (temp_s0->unk_30 <= 0) { + s32 t; + + temp_f20 = shim_rand_int(359); + temp_f24 = temp_s0->unk_18 + (temp_s0->unk_34 * shim_sin_deg(temp_f20)); + temp_f22 = temp_s0->unk_1C + shim_rand_int(temp_s0->unk_38); + temp_f20_2 = temp_s0->unk_20 + (temp_s0->unk_34 * shim_cos_deg(temp_f20)); + t = shim_rand_int(100) + 10; + temp_f4 = temp_s0->unk_0C; + temp_f6 = temp_s0->unk_10; + temp_f8 = temp_s0->unk_14; + var_f24 = temp_f24 - temp_f4; + var_f22 = temp_f22 - temp_f6; + var_f20 = temp_f20_2 - temp_f8; + temp_s0->unk_30 = t; + if (var_f24 == 0.0f && var_f22 == 0.0f && var_f20 == 0.0f) { + var_f24 = temp_s0->unk_18 - temp_f4; + var_f22 = temp_s0->unk_1C - temp_f6; + var_f20 = temp_s0->unk_20 - temp_f8; + if (var_f24 == 0.0f && var_f22 == 0.0f && var_f20 == 0.0f) { + var_f24 = 1.0f; + var_f20 = 0.0f; + var_f22 = 0.0f; + } + } + var_f12 = SQ(var_f24) + SQ(var_f22) + SQ(var_f20); + if (var_f12 != 0.0f) { + var_f12 = 1.0f / shim_sqrtf(var_f12); + } + var_f24 *= var_f12; + var_f22 *= var_f12; + var_f20 *= var_f12; + temp_s0->unk_3C = var_f24; + temp_s0->unk_40 = var_f22; + temp_s0->unk_44 = var_f20; + temp_s0->unk_28 = shim_atan2(0.0f, 0.0f, -temp_s0->unk_3C, temp_s0->unk_44); + } + temp_s0->unk_2C += 3; + if (temp_s0->unk_2C >= 30) { + temp_s0->unk_2C -= 30; + } + temp_s0->unk_0C += temp_s0->unk_3C; + temp_s0->unk_10 += temp_s0->unk_40; + temp_s0->unk_14 += temp_s0->unk_44; +} void butterflies_render(EffectInstance* effect) { RenderTask renderTask; @@ -27,4 +159,32 @@ void butterflies_render(EffectInstance* effect) { retTask->renderMode |= RENDER_MODE_2; } -INCLUDE_ASM(s32, "effects/butterflies", butterflies_appendGfx); + +void butterflies_appendGfx(void* effect) { + EffectInstance* effectTemp = effect; + ButterflyFXData* data = effectTemp->data; + Matrix4f sp18; + Matrix4f sp58; + + s32 primColor = data->unk_24; + s32 type = data->unk_00; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(effectTemp->graphics->data)); + + shim_guTranslateF(sp18, data->unk_0C, data->unk_10 + D_E00AA6EC[data->unk_2C] * 0.3f, data->unk_14); + shim_guRotateF(sp58, data->unk_28, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guScaleF(sp58, 0.02f, 0.02f, 0.02f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, primColor, primColor, primColor, 255); + gSPDisplayList(gMasterGfxPos++, D_09003880); + gSPDisplayList(gMasterGfxPos++, D_E00AA6C0[type]); + gSPVertex(gMasterGfxPos++, &D_09002D40[data->unk_2C], 6, 0); + gSPDisplayList(gMasterGfxPos++, D_09003DC8); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + gDPPipeSync(gMasterGfxPos++); +} diff --git a/src/effects/small_gold_sparkle.c b/src/effects/small_gold_sparkle.c index 42ef8fbe54..e9fb2142ae 100644 --- a/src/effects/small_gold_sparkle.c +++ b/src/effects/small_gold_sparkle.c @@ -23,7 +23,7 @@ void small_gold_sparkle_update(EffectInstance* effect); void small_gold_sparkle_render(EffectInstance* effect); void small_gold_sparkle_appendGfx(void* effect); -EffectInstance* small_gold_sparkle_main(EffectInstanceDataThing* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { +EffectInstance* small_gold_sparkle_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { EffectBlueprint bp; EffectInstance* effect; SmallGoldSparkleFXData* data; diff --git a/src/entity.c b/src/entity.c index e6345bb6df..edcbf3fa9d 100644 --- a/src/entity.c +++ b/src/entity.c @@ -8,6 +8,8 @@ extern EntityModelList gWorldEntityModelList; extern EntityModelList gBattleEntityModelList; extern EntityModelList* gCurrentEntityModelList; extern s32 gEntityModelCount; + +extern s32 D_80154374; extern s32 entity_fog_enabled; extern s32 entity_fog_red; extern s32 entity_fog_green; @@ -16,6 +18,7 @@ extern s32 entity_fog_alpha; extern s32 entity_fog_dist_min; extern s32 entity_fog_dist_max; + s32 step_entity_model_commandlist(EntityModel* entityModel); void free_entity_model_by_ref(EntityModel* entityModel); @@ -214,15 +217,73 @@ void make_entity_model_mtx_flipZ(Matrix4f mtx) { mtx[3][3] = 1.0f; } +void appendGfx_entity_model(void* data); INCLUDE_ASM(s32, "entity", appendGfx_entity_model); INCLUDE_ASM(s32, "entity", draw_entity_model_A); INCLUDE_ASM(s32, "entity", draw_entity_model_B); -INCLUDE_ASM(s32, "entity", draw_entity_model_C); +void draw_entity_model_C(s32 modelIdx, Mtx* transformMtx) { + EntityModel* model; + RenderTask rt; + RenderTask* rtPtr = &rt; -INCLUDE_ASM(s32, "entity", draw_entity_model_D); + if ((gGameStatusPtr->isBattle == 0) || (modelIdx & 0x800)) { + modelIdx &= ~0x800; + model = (*gCurrentEntityModelList)[modelIdx]; + + if (model != NULL) { + if (model->flags != 0) { + if (!(model->flags & MODEL_FLAGS_USE_CAMERA_UNK_MATRIX)) { + if (!(model->flags & MODEL_FLAGS_FLAG_20)) { + if (!(model->flags & MODEL_FLAGS_FLAG_40) && (model->flags & (1 << gCurrentCamID))) { + model->flags |= MODEL_FLAGS_FLAG_200; + model->transform = *transformMtx; + model->vertexArray = NULL; + rtPtr->renderMode = model->renderMode; + rtPtr->appendGfxArg = model; + rtPtr->appendGfx = appendGfx_entity_model; + rtPtr->distance = (u32)(model->flags & 0xF000) >> 8; + queue_render_task(rtPtr); + } + } + } + } + } + } +} + +void draw_entity_model_D(s32 modelIdx, Mtx* transformMtx, s32 arg2, Vtx* vertexArray) { + EntityModel* model; + RenderTask rt; + RenderTask* rtPtr = &rt; + + if ((gGameStatusPtr->isBattle == 0) || (modelIdx & 0x800)) { + modelIdx &= ~0x800; + model = (*gCurrentEntityModelList)[modelIdx]; + + if (model != NULL) { + if (model->flags != 0) { + if (!(model->flags & MODEL_FLAGS_USE_CAMERA_UNK_MATRIX)) { + if (!(model->flags & MODEL_FLAGS_FLAG_20)) { + if (model->flags & (1 << gCurrentCamID)) { + model->flags |= MODEL_FLAGS_FLAG_200; + model->transform = *transformMtx; + D_80154374 = arg2; + model->vertexArray = vertexArray; + rtPtr->renderMode = model->renderMode; + rtPtr->appendGfxArg = model; + rtPtr->appendGfx = appendGfx_entity_model; + rtPtr->distance = (u32)(model->flags & 0xF000) >> 8; + queue_render_task(rtPtr); + } + } + } + } + } + } +} INCLUDE_ASM(s32, "entity", draw_entity_model_E); @@ -373,7 +434,7 @@ void init_generic_entity_list(void) { } } -s32 create_generic_entity_world(void (*updateFunc)(Evt*, s32), void (*drawFunc)(Evt*, s32)) { +s32 create_generic_entity_world(void (*updateFunc)(void), void (*drawFunc)(void)) { s32 i; DynamicEntity* newDynEntity; diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index a9b382a924..18fcd1fc58 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -399,7 +399,7 @@ ApiStatus PlayEffect(Evt* script, s32 isInitialCall) { effectRet = fx_snowfall(iVar1, iVar2); break; case EFFECT_46: - effectRet = fx_46(iVar1, (EffectWhirlwind*)a2, fVar3, iVar4); + effectRet = fx_46(iVar1, (EffectWhirlwindUnk*)a2, fVar3, iVar4); break; case EFFECT_GATHER_MAGIC: effectRet = fx_gather_magic(iVar1, fVar2, fVar3, fVar4, fVar5, iVar6); diff --git a/src/hud_element.h b/src/hud_element.h index 23357816d8..89907535d2 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -332,7 +332,6 @@ void copy_world_hud_element_ref_to_battle(s32 worldID, s32 battleID); void hud_element_set_aux_cache(void* base, s32 size); - void create_popup_menu(PopupMenu*); #endif diff --git a/src/os/3FEA0.c b/src/os/3FEA0.c deleted file mode 100644 index 27af5b70c7..0000000000 --- a/src/os/3FEA0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" -#include "stdlib/stdarg.h" - -char spaces[] = " "; -char zeroes[] = "00000000000000000000000000000000"; - -INCLUDE_ASM(s32, "os/3FEA0", _Printf); - -INCLUDE_ASM(s32, "os/3FEA0", _Putfld); diff --git a/src/os/xprintf.c b/src/os/xprintf.c new file mode 100644 index 0000000000..8ebc6abcb2 --- /dev/null +++ b/src/os/xprintf.c @@ -0,0 +1,242 @@ +#include "stdlib/stdarg.h" +#include "xstdio.h" +#include "gcc/string.h" + +#define isdigit(x) ((x >= '0' && x <= '9')) +#define LDSIGN(x) (((unsigned short *)&(x))[0] & 0x8000) + +#define ATOI(dst, src) \ + for (dst = 0; isdigit(*src); ++src) \ + { \ + if (dst < 999) \ + dst = dst * 10 + *src - '0'; \ + } + +#define MAX_PAD ((sizeof(spaces) - 1)) +#define PAD(s, n) \ + if (0 < (n)) \ + { \ + int i, j = (n); \ + for (; 0 < j; j -= i) \ + { \ + i = MAX_PAD < (unsigned int)j ? (int)MAX_PAD : j; \ + PUT(s, i); \ + } \ + } +#define PUT(s, n) \ + if (0 < (n)) \ + { \ + if ((arg = (*prout)(arg, s, n)) != NULL) \ + x.nchar += (n); \ + else \ + return x.nchar; \ + } + +char spaces[] = " "; +char zeroes[] = "00000000000000000000000000000000"; + +// INCLUDE_ASM(s32, "os/3FEA0", _Printf); + +// INCLUDE_ASM(s32, "os/3FEA0", _Putfld); + +static void _Putfld(_Pft *pf, va_list *pap, char code, char *ac); + +int _Printf(outfun prout, char *arg, const char *fmt, va_list args) { + _Pft x; + const char *s; + char c; + const char *t; + static const char fchar[] = {' ', '+', '-', '#', '0', '\0'}; + static const int fbit[] = {FLAGS_SPACE, FLAGS_PLUS, FLAGS_MINUS, FLAGS_HASH, FLAGS_ZERO, 0}; + char ac[32]; + + x.nchar = 0; + + for (;;) { + s = fmt; + + for (c = *s; c != 0 && c != '%';) { + c = *++s; + } + + PUT(fmt, s - fmt); + + if (c == 0) { + return x.nchar; + } + + fmt = ++s; + + for (x.flags = 0; (t = strchr(fchar, *s)) != NULL; s++) { + x.flags |= fbit[t - fchar]; + } + + if (*s == '*') { + x.width = va_arg(args, int); + + if (x.width < 0) { + x.width = -x.width; + x.flags |= FLAGS_MINUS; + } + s++; + } else { + ATOI(x.width, s); + } + + if (*s != '.') { + x.prec = -1; + } else if (*++s == '*') { + x.prec = va_arg(args, int); + ++s; + } else { + ATOI(x.prec, s); + } + + x.qual = strchr("hlL", *s) ? *s++ : '\0'; + + if (x.qual == 'l' && *s == 'l') { + x.qual = 'L'; + ++s; + } + + _Putfld(&x, &args, *s, ac); + x.width -= x.n0 + x.nz0 + x.n1 + x.nz1 + x.n2 + x.nz2; + + if (!(x.flags & FLAGS_MINUS)) { + PAD(spaces, x.width); + } + + PUT(ac, x.n0); + PAD(zeroes, x.nz0); + PUT(x.s, x.n1); + PAD(zeroes, x.nz1); + PUT(x.s + x.n1, x.n2); + PAD(zeroes, x.nz2); + + if (x.flags & FLAGS_MINUS) { + PAD(spaces, x.width); + } + + fmt = s + 1; + } + return 0; +} + +static void _Putfld(_Pft *x, va_list *args, char type, char *buff) { + x->n0 = x->nz0 = x->n1 = x->nz1 = x->n2 = + x->nz2 = 0; + + switch (type) { + case 'c': + buff[x->n0++] = va_arg(*args, int); + break; + case 'd': + case 'i': + if (x->qual == 'l') { + x->v.ll = va_arg(*args, int); + } else if (x->qual == 'L') { + x->v.ll = va_arg(*args, s64); + } else { + x->v.ll = va_arg(*args, int); + } + + if (x->qual == 'h') { + x->v.ll = (s16)x->v.ll; + } + + if (x->v.ll < 0) { + buff[x->n0++] = '-'; + } else if (x->flags & FLAGS_PLUS) { + buff[x->n0++] = '+'; + } else if (x->flags & FLAGS_SPACE) { + buff[x->n0++] = ' '; + } + + x->s = (char *)&buff[x->n0]; + + _Litob(x, type); + break; + case 'x': + case 'X': + case 'u': + case 'o': + if (x->qual == 'l') { + x->v.ll = va_arg(*args, int); + } else if (x->qual == 'L') { + x->v.ll = va_arg(*args, s64); + } else { + x->v.ll = va_arg(*args, int); + } + + if (x->qual == 'h') { + x->v.ll = (u16)x->v.ll; + } else if (x->qual == 0) { + x->v.ll = (unsigned int)x->v.ll; + } + + if (x->flags & FLAGS_HASH) { + buff[x->n0++] = '0'; + + if (type == 'x' || type == 'X') { + buff[x->n0++] = type; + } + } + + x->s = (char *)&buff[x->n0]; + _Litob(x, type); + break; + case 'e': + case 'f': + case 'g': + case 'E': + case 'G': + //... okay? + x->v.ld = x->qual == 'L' ? va_arg(*args, f64) : va_arg(*args, f64); + + if (LDSIGN(x->v.ld)) + buff[x->n0++] = '-'; + else if (x->flags & FLAGS_PLUS) + buff[x->n0++] = '+'; + else if (x->flags & FLAGS_SPACE) + buff[x->n0++] = ' '; + + x->s = (char *)&buff[x->n0]; + _Ldtob(x, type); + break; + + case 'n': + if (x->qual == 'h') { + *(va_arg(*args, u16 *)) = x->nchar; + } else if (x->qual == 'l') { + *va_arg(*args, unsigned int *) = x->nchar; + } else if (x->qual == 'L') { + *va_arg(*args, u64 *) = x->nchar; + } else { + *va_arg(*args, unsigned int *) = x->nchar; + } + + break; + case 'p': + x->v.ll = (long)va_arg(*args, void *); + x->s = (char *)&buff[x->n0]; + _Litob(x, 'x'); + break; + case 's': + x->s = va_arg(*args, char *); + x->n1 = strlen(x->s); + + if (x->prec >= 0 && x->n1 > x->prec) { + x->n1 = x->prec; + } + + break; + case '%': + buff[x->n0++] = '%'; + break; + default: + buff[x->n0++] = type; + break; + } +} + +static const f32 padding = 0.0f; diff --git a/src/world/action/spin.c b/src/world/action/spin.c index 7e24275909..3a329db373 100644 --- a/src/world/action/spin.c +++ b/src/world/action/spin.c @@ -15,7 +15,7 @@ void func_802B6000_E25D60(void) { s32 phi_s2, phi_s3, phi_s4; s32 temp_v1_2; s32 phi_s5 = 0; - + if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) { playerStatus->flags &= ~(PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED | PLAYER_STATUS_FLAGS_80000); playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_40000; @@ -50,7 +50,7 @@ void func_802B6000_E25D60(void) { if (is_ability_active(ABILITY_DIZZY_ATTACK)) { phi_s2 = phi_s2 | 2; } - + if (is_ability_active(ABILITY_SPEEDY_SPIN)) { playerSpinState->initialSpinTime = 30; playerSpinState->spinRate = 40.0f; @@ -60,10 +60,10 @@ void func_802B6000_E25D60(void) { playerSpinState->frictionScale = 0.9f; phi_s2 |= 1; } - + phi_s4 = -1; phi_s3 = 0x10010; - + if (phi_s2) { if (phi_s2 & 4) { phi_s4 = 2; @@ -75,10 +75,10 @@ void func_802B6000_E25D60(void) { phi_s3 = 0x10011; } } - + playerSpinState->spinSoundID = SOUND_2111; temp_v1_2 = phi_s2 & ~2; - + if (temp_v1_2 == 4) { playerSpinState->spinSoundID = SOUND_2113; } @@ -88,10 +88,10 @@ void func_802B6000_E25D60(void) { if (temp_v1_2 == 5) { playerSpinState->spinSoundID = SOUND_2114; } - + sfx_play_sound_at_player(playerSpinState->spinSoundID, 0); suggest_player_anim_setUnkFlag(phi_s3); - + if ((clamp_angle(playerStatus->targetYaw - gCameras[gCurrentCameraID].currentYaw) <= 180.0f)) { playerStatus->spinRate = playerSpinState->spinRate; } else { @@ -99,31 +99,31 @@ void func_802B6000_E25D60(void) { playerStatus->spinRate = -playerSpinState->spinRate; } if (phi_s2 != 0) { - playerStatus->unk_D8 = (void*)fx_46(phi_s4, (EffectWhirlwind* ) playerStatus, 1.0f, 1000); + playerStatus->unk_D8 = fx_46(phi_s4, playerStatus, 1.0f, 1000); } - + phys_clear_spin_history(); player_input_to_move_vector(&sp10, &sp14); playerStatus->targetYaw = sp10; playerSpinState->inputMagnitude = sp14; } - + gSpinHistoryPosAngle[gSpinHistoryBufferPos++] = playerStatus->spriteFacingAngle; - + if (gSpinHistoryBufferPos >= 6) { gSpinHistoryBufferPos = 0; } - + gSpinHistoryPosX[gSpinHistoryBufferPos] = playerStatus->position.x; gSpinHistoryPosY[gSpinHistoryBufferPos] = playerStatus->position.y; gSpinHistoryPosZ[gSpinHistoryBufferPos] = playerStatus->position.z; gSpinHistoryPosAngle[gSpinHistoryBufferPos] = playerStatus->spriteFacingAngle; gSpinHistoryBufferPos++; - + if (gSpinHistoryBufferPos >= 6) { gSpinHistoryBufferPos = 0; } - + if (phi_s5 == 0 && (check_input_hammer() || check_input_jump())) { playerStatus->animFlags &= ~PLAYER_STATUS_ANIM_FLAGS_SPINNING; playerStatus->flags &= ~PLAYER_STATUS_FLAGS_20000; @@ -132,20 +132,20 @@ void func_802B6000_E25D60(void) { playerStatus->targetYaw = sp10; return; } - + if (playerSpinState->spinCountdown < 11 && playerStatus->pressedButtons & Z_TRIG) { playerSpinState->hasBufferedSpin = 1; playerSpinState->prevActionState = playerStatus->prevActionState; playerSpinState->bufferedStickAxis.x = playerStatus->stickAxis[0]; playerSpinState->bufferedStickAxis.y = playerStatus->stickAxis[1]; } - + if (playerStatus->fallState >= 2) { playerSpinState->spinDirectionMagnitude = playerSpinState->spinDirectionMagnitude - 1.0f;; if (playerSpinState->spinDirectionMagnitude < 0.0f) { playerSpinState->spinDirectionMagnitude = 0.0f; } - + sp10 = clamp_angle(playerStatus->targetYaw - gCameras[gCurrentCameraID].currentYaw); playerSpinState->spinDirection.x = sin_rad(sp10 * TAU / 360.0f) * playerSpinState->spinDirectionMagnitude; playerSpinState->spinDirection.y = -cos_rad((sp10 * TAU) / 360.0f) * playerSpinState->spinDirectionMagnitude; @@ -160,7 +160,7 @@ void func_802B6000_E25D60(void) { playerStatus->currentSpeed = 0.0f; return; } - + if (playerStatus->fallState == 0) { if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_40000) { playerStatus->fallState = 1; @@ -171,15 +171,15 @@ void func_802B6000_E25D60(void) { } } } - + if (!(playerStatus->currentStateTime > playerSpinState->fullSpeedSpinTime)) { temp_f24 = (playerSpinState->inputMagnitude) ? playerSpinState->speedScale : 0.0f; playerSpinState->spinDirectionMagnitude = playerSpinState->spinDirectionMagnitude + 0.9; - + if (playerSpinState->spinDirectionMagnitude > 9.0f) { playerSpinState->spinDirectionMagnitude = 9.0f; } - + sp10 = clamp_angle(playerStatus->targetYaw - gCameras[gCurrentCameraID].currentYaw); playerSpinState->spinDirection.x = sin_rad(sp10 * TAU / 360.0f) * playerSpinState->spinDirectionMagnitude; playerSpinState->spinDirection.y = -cos_rad(sp10 * TAU / 360.0f) * playerSpinState->spinDirectionMagnitude; @@ -188,19 +188,19 @@ void func_802B6000_E25D60(void) { if (temp_f24 < 0.1) { temp_f24 = 0.1f; } - + if (playerSpinState->inputMagnitude == 0.0f) { temp_f24 = 0.0f; } - playerSpinState->spinDirectionMagnitude -= 1.0f; + playerSpinState->spinDirectionMagnitude -= 1.0f; if (playerSpinState->spinDirectionMagnitude < 0.0f) { playerSpinState->spinDirectionMagnitude = 0.0f; } } playerStatus->currentStateTime++; - + switch (playerStatus->prevActionState) { case 0: player_input_to_move_vector(&sp10, &sp14); @@ -228,11 +228,11 @@ void func_802B6000_E25D60(void) { playerStatus->fallState = 1; } } - + if (playerStatus->fallState == 1) { sp10 = playerStatus->spriteFacingAngle; playerStatus->spriteFacingAngle = sp10 + playerStatus->spinRate; - + if (playerSpinState->hasBufferedSpin != 0) { playerStatus->currentStateTime = 2; playerStatus->fallState = 2; diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 009b85d56c..8ec8bb038b 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -34,13 +34,6 @@ enum { // BSS -typedef struct { - s32 flags; - char unk_04[0x4]; - s32 unk_08; - EffectInstanceDataThing* unk_0C; -} N(temp); - typedef struct { s32 unk_00; f32 unk_04; @@ -57,7 +50,7 @@ static s8 N(pad_D_8024EF80)[0x4]; static f32 N(D_8024EF84); static s32 N(D_8024EF88); static s8 N(pad_D_8024EF8C)[0x4]; -static N(temp)* N(D_8024EF90)[4]; // possibly bigger? +static EffectInstance* N(D_8024EF90)[4]; // possibly bigger? static s32 N(Quizmo_Worker); static s32 N(pad_D_8024EFA4); static s32 N(Quizmo_ScriptArray)[4]; diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c index 3ca219a69f..178fe93116 100644 --- a/src/world/area_flo/flo_07/CAC1F0.c +++ b/src/world/area_flo/flo_07/CAC1F0.c @@ -5,30 +5,14 @@ #include "world/common/SpawnSunEffect.inc.c" -typedef struct N(unk_effect) { - char unk_00[0x38]; - s32 unk_38; - s32 unk_3C; - s32 unk_40; - char unk_44[0x4]; - s32 unk_48; - s32 unk_4C; - s32 unk_50; -} N(unk_effect); - -typedef struct N(temp) { - char unk_00[0xC]; - N(unk_effect)* unk_0C; -} N(temp); - ApiStatus N(func_80240344_CAC534)(Evt* script, s32 isInitialCall) { - N(temp)* effect = fx_misc_particles(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0); + EffectInstance* effect = fx_misc_particles(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0); - effect->unk_0C->unk_38 = 0xF0; - effect->unk_0C->unk_3C = 0xF0; - effect->unk_0C->unk_40 = 0xF0; - effect->unk_0C->unk_48 = 0xE6; - effect->unk_0C->unk_4C = 0xE6; - effect->unk_0C->unk_50 = 0xF0; + ((MiscParticlesFXData*)effect->data)->unk_38 = 240; + ((MiscParticlesFXData*)effect->data)->unk_3C = 240; + ((MiscParticlesFXData*)effect->data)->unk_40 = 240; + ((MiscParticlesFXData*)effect->data)->unk_48 = 230; + ((MiscParticlesFXData*)effect->data)->unk_4C = 230; + ((MiscParticlesFXData*)effect->data)->unk_50 = 240; return ApiStatus_DONE2; } diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index 815b77d100..635dc1ef81 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -613,8 +613,6 @@ ApiStatus N(func_8024046C_CCB77C)(Evt* script, s32 isInitialCall) { // graphics macros #ifdef NON_EQUIVALENT -s32 mdl_get_copied_gfx(s32); -void mdl_get_copied_vertices(s32, s32*, s32*, s32*); void guMtxF2L(Matrix4f, Mtx* m); void guMtxIdentF(Matrix4f); diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 80bcc63df5..0a77cd133c 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -4,6 +4,7 @@ #include "sprite/npc/lakitu.h" #include "sprite/npc/magikoopa.h" #include "sprite/npc/world_lakilester.h" +#include "effects.h" enum { NPC_LAKITU0, @@ -964,7 +965,7 @@ NpcSettings N(npcSettings_80243F10) = { .onHit = &EnemyNpcHit, .onDefeat = &EnemyNpcDefeat, .level = 20, -}; +}; NpcSettings N(npcSettings_80243F3C) = { .height = 34, @@ -1736,42 +1737,27 @@ static s32 N(pad_66B4)[] = { // It seems like fx_sun was not properly defined for this file. Having a proper // declaration makes it not match. + #ifdef AVOID_UB -void fx_sun(s32, f32, f32, f32, f32, s32); +void fx_sun_undeclared(s32, f32, f32, f32, f32, s32); #else -void fx_sun(s32, s32, s32, s32, s32, s32); +void fx_sun_undeclared(s32, s32, s32, s32, s32, s32); #endif ApiStatus N(func_8024030C_CDC9AC)(Evt* script, s32 isInitialCall) { - fx_sun(1, 0, 0, 0, 0, 0); + fx_sun_undeclared(1, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } -typedef struct N(unk_effect) { - char unk_00[0x30]; - s32 unk_30; - s32 unk_34; - s32 unk_38; - char unk_3C[0x4]; - s32 unk_40; - s32 unk_44; - s32 unk_48; -} N(unk_effect); - -typedef struct N(temp) { - char unk_00[0xC]; - N(unk_effect)* unk_0C; -} N(temp); - ApiStatus N(func_80240340_CDC9E0)(Evt* script, s32 isInitialCall) { - N(temp)* ptr = (N(temp)*) script->varTable[15]; + EffectInstance* effect = (EffectInstance*) script->varTable[15]; - ptr->unk_0C->unk_30 = 69; - ptr->unk_0C->unk_34 = 255; - ptr->unk_0C->unk_38 = 217; - ptr->unk_0C->unk_40 = 176; - ptr->unk_0C->unk_44 = 254; - ptr->unk_0C->unk_48 = 124; + ((LightningFXData*)effect->data)->unk_30 = 69; + ((LightningFXData*)effect->data)->unk_34 = 255; + ((LightningFXData*)effect->data)->unk_38 = 217; + ((LightningFXData*)effect->data)->unk_40 = 176; + ((LightningFXData*)effect->data)->unk_44 = 254; + ((LightningFXData*)effect->data)->unk_48 = 124; return ApiStatus_DONE2; } diff --git a/src/world/area_jan/jan_00/B216E0.c b/src/world/area_jan/jan_00/B216E0.c index 60cb9faa99..f848dcb9ff 100644 --- a/src/world/area_jan/jan_00/B216E0.c +++ b/src/world/area_jan/jan_00/B216E0.c @@ -4,16 +4,31 @@ static char* N(exit_str_0) = "jan_01"; static char* N(exit_str_1) = "jan_08"; static char* N(exit_str_2) = "mac_06"; -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802411A0_B216E0); +extern u32 N(unkAngle1); +extern s32 N(unkAngle2); +extern s32 N(unkAngle3); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802411EC_B2172C); +void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s32* arg3); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241338_B21878); +#include "world/common/resolve_npc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802415B0_B21AF0); +#include "world/common/UnkAngleFunc001.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241654_B21B94); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", jan_00_unkVtxFunc001); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802416F8_B21C38); +#include "world/common/unkAngleFuncs023.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241868_B21DA8); +#include "world/common/UnkFloatFunc001.inc.c" + +ApiStatus func_80241868_B21DA8(Evt* script, s32 isInitialCall) { + Npc* player = get_npc_safe(ACTOR_PLAYER); + f32 yaw = -player->yaw; + f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 170.0f); + f32 z = player->pos.z + (cos_deg(yaw) * 170.0f); + f32 y = player->pos.y + 50.0f; + + evt_set_float_variable(script, EVT_VAR(0), x); + evt_set_float_variable(script, EVT_VAR(1), y); + evt_set_float_variable(script, EVT_VAR(2), z); + return ApiStatus_DONE2; +} diff --git a/src/world/area_kgr/kgr_01/8A9B70.c b/src/world/area_kgr/kgr_01/8A9B70.c index f8a287cb33..c945c2d9b6 100644 --- a/src/world/area_kgr/kgr_01/8A9B70.c +++ b/src/world/area_kgr/kgr_01/8A9B70.c @@ -1,8 +1,5 @@ #include "kgr_01.h" -void mdl_get_copied_vertices(s32 copyIndex, Vtx** firstVertex, Vtx** copiedVertices, s32* numCopied); -Gfx* mdl_get_copied_gfx(s32 copyIndex); - #define TONGUE_WIGGLE_RATE 10 extern u16 N(TongueWiggleTime); // tongue wiggle rate @@ -16,7 +13,7 @@ void N(add_tongue_deformation)(Vtx* src, Vtx* dest, s32 numVertices, s32 time) { s32 offset; s32 pct; s32 i; - + for (i = 0; i < numVertices; i++) { vs = &src[i].v; vd = &dest[i].v; @@ -61,7 +58,7 @@ void N(make_tongue_gfx)(s32 index) { Vtx* vtxSrc; Vtx* vtxCopy; s32 numCopied; - + mdl_get_copied_vertices(1, &vtxSrc, &vtxCopy, &numCopied); N(add_tongue_deformation)(vtxSrc, vtxCopy, numCopied, N(TongueWiggleTime)); gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(1)); @@ -74,10 +71,10 @@ void N(make_tongue_gfx)(s32 index) { // ignoring minor undulations and deformation imposed by the player. ApiStatus N(GetEffectiveTongueOffset)(Evt* script, s32 isInitialCall) { f32 amplitude = 2.0f * sin_rad( - (f32)script->varTable[0] * 0.06 + - (f32)script->varTable[2] * 0.03f + + (f32)script->varTable[0] * 0.06 + + (f32)script->varTable[2] * 0.03f + (f32)N(TongueWiggleTime) * 0.01f); - + f32 percent = 200.0f - (f32)script->varTable[0]; if (percent < 0.0f){ percent = 0.0f; diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 112d1bd7f3..ca7aab9948 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -61,7 +61,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427EC_8B285C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024280C_8B287C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242860_8B28D0); +#define UNK_NPC_POS_FUNC_NUM 7 +#include "world/common/UnkNpcPosFunc.inc.c" #include "world/common/SyncStatusMenu.inc.c" diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index 51fcd1274c..3a8fe50f47 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -6,4 +6,5 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240344_8DA444); #include "world/common/enemy/StationaryAI.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240DDC_8DAEDC); +#define UNK_NPC_POS_FUNC_NUM 4 +#include "world/common/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_kzn/kzn_06/C6CD10.c b/src/world/area_kzn/kzn_06/C6CD10.c index 5fb3201e15..f271a655c4 100644 --- a/src/world/area_kzn/kzn_06/C6CD10.c +++ b/src/world/area_kzn/kzn_06/C6CD10.c @@ -1,4 +1,5 @@ #include "kzn_06.h" +#include "model.h" INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6CD10", func_802403F0_C6CD10); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index bf69594009..1360ae07dc 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -7,7 +7,9 @@ static char* N(exit_str_1) = "kgr_01"; #include "world/common/atomic/TexturePan.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C); +#define NAMESPACE dup_mac_05 +#include "world/common/UnkFloatFunc001.inc.c" +#define NAMESPACE mac_05 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC); diff --git a/src/world/area_mac/mac_05/855560.c b/src/world/area_mac/mac_05/855560.c index 52faf81070..846d1bd645 100644 --- a/src/world/area_mac/mac_05/855560.c +++ b/src/world/area_mac/mac_05/855560.c @@ -1,18 +1,22 @@ #include "mac_05.h" -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_802433F0_855560); +extern u32 N(unkAngle1); +extern s32 N(unkAngle2); +extern s32 N(unkAngle3); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_8024343C_8555AC); +void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s32* arg3); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243588_8556F8); +#include "world/common/resolve_npc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243800_855970); +#include "world/common/UnkAngleFunc001.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_802438A4_855A14); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", mac_05_unkVtxFunc001); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243948_855AB8); +#include "world/common/unkAngleFuncs023.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243AB8_855C28); +#include "world/common/UnkFloatFunc001.inc.c" + +#include "world/common/UnkPlayerPosFunc.inc.c" #include "world/common/PlayFX3D.inc.c" diff --git a/src/world/area_mac/mac_06/864B40.c b/src/world/area_mac/mac_06/864B40.c index fd3f8dbfcc..dbdb1b18a1 100644 --- a/src/world/area_mac/mac_06/864B40.c +++ b/src/world/area_mac/mac_06/864B40.c @@ -2,6 +2,8 @@ #include "world/common/atomic/TexturePan.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_8024030C_864E4C); +#define NAMESPACE dup_mac_06 +#include "world/common/UnkFloatFunc001.inc.c" +#define NAMESPACE mac_06 #include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_mac/mac_06/865000.c b/src/world/area_mac/mac_06/865000.c index 50be7c58d0..153611d5b7 100644 --- a/src/world/area_mac/mac_06/865000.c +++ b/src/world/area_mac/mac_06/865000.c @@ -1,18 +1,22 @@ #include "mac_06.h" -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_802404C0_865000); +extern u32 N(unkAngle1); +extern s32 N(unkAngle2); +extern s32 N(unkAngle3); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_8024050C_86504C); +void N(unkVtxFunc001)(Vtx* firstVertex, Vtx* copiedVertices, s32 numVertices, s32* arg3); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240658_865198); +#include "world/common/resolve_npc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_802408D0_865410); +#include "world/common/UnkAngleFunc001.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240974_8654B4); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", mac_06_unkVtxFunc001); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240A18_865558); +#include "world/common/unkAngleFuncs023.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240B88_8656C8); +#include "world/common/UnkFloatFunc001.inc.c" + +#include "world/common/UnkPlayerPosFunc.inc.c" #include "world/common/PlayFX3D.inc.c" diff --git a/src/world/area_obk/obk_02/BC2A90.c b/src/world/area_obk/obk_02/BC2A90.c index e3a46eaaca..7e79efaa6a 100644 --- a/src/world/area_obk/obk_02/BC2A90.c +++ b/src/world/area_obk/obk_02/BC2A90.c @@ -7,6 +7,6 @@ static char* N(exit_str_3) = ""; INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240000_BC2A90); -INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_8024000C_BC2A9C); +#include "world/common/UnkAngleFunc004.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240194_BC2C24); diff --git a/src/world/area_obk/obk_05/BCD7D0.c b/src/world/area_obk/obk_05/BCD7D0.c index f91f5bb445..30bf54043e 100644 --- a/src/world/area_obk/obk_05/BCD7D0.c +++ b/src/world/area_obk/obk_05/BCD7D0.c @@ -4,6 +4,38 @@ INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_80240770_BCD7D0); INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_802407A0_BCD800); -INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_802407AC_BCD80C); +ApiStatus func_802407AC_BCD80C(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_safe(script->owner2.npcID); + + switch (script->functionTemp[1]) { + case 0: + npc->duration = rand_int(180) + 30; + npc->pos.z = -430.0f; + npc->pos.y = rand_int(50) + 40.0f; + npc->moveSpeed = (2.0f * rand_float()) + 2.0f; + if (rand_int(100) < 50) { + npc->pos.x = 270.0f; + npc->yaw = 270.0f; + } else { + npc->pos.x = -270.0f; + npc->yaw = 90.0f; + } + script->functionTemp[1] = 1; + break; + case 1: + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[1] = 2; + } + break; + case 2: + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->pos.x < -280.0f || npc->pos.x > 280.0f) { + script->functionTemp[1] = 0; + } + break; + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_80240934_BCD994); diff --git a/src/world/area_obk/obk_07/BCEEB0.c b/src/world/area_obk/obk_07/BCEEB0.c index b18e947100..7c031deee0 100644 --- a/src/world/area_obk/obk_07/BCEEB0.c +++ b/src/world/area_obk/obk_07/BCEEB0.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_802402C0_BCEEB0); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_802402CC_BCEEBC); +#include "world/common/UnkAngleFunc004.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_80240454_BCF044); diff --git a/src/world/area_obk/obk_08/BD4110.c b/src/world/area_obk/obk_08/BD4110.c index 8f2c6ad32b..29f46d3658 100644 --- a/src/world/area_obk/obk_08/BD4110.c +++ b/src/world/area_obk/obk_08/BD4110.c @@ -18,6 +18,38 @@ INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240D10_BD4580); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240FD8_BD4848); -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240FE4_BD4854); +ApiStatus func_80240FE4_BD4854(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_safe(script->owner2.npcID); + + switch (script->functionTemp[1]) { + case 0: + npc->duration = rand_int(180) + 30; + npc->pos.z = -430.0f; + npc->pos.y = rand_int(50) + 40.0f; + npc->moveSpeed = (2.0f * rand_float()) + 2.0f; + if (rand_int(100) < 50) { + npc->pos.x = 270.0f; + npc->yaw = 270.0f; + } else { + npc->pos.x = -270.0f; + npc->yaw = 90.0f; + } + script->functionTemp[1] = 1; + break; + case 1: + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[1] = 2; + } + break; + case 2: + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->pos.x < -280.0f || npc->pos.x > 280.0f) { + script->functionTemp[1] = 0; + } + break; + } + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_8024116C_BD49DC); diff --git a/src/world/area_omo/omo_04/DAF240.c b/src/world/area_omo/omo_04/DAF240.c index 69ff847be0..d4a0b807fd 100644 --- a/src/world/area_omo/omo_04/DAF240.c +++ b/src/world/area_omo/omo_04/DAF240.c @@ -1,3 +1,4 @@ #include "omo_04.h" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAF240", func_80241E40_DAF240); +#define UNK_NPC_POS_FUNC_NUM 2 +#include "world/common/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_omo/omo_07/DC04D0.c b/src/world/area_omo/omo_07/DC04D0.c index 7007be655b..d5747baa3e 100644 --- a/src/world/area_omo/omo_07/DC04D0.c +++ b/src/world/area_omo/omo_07/DC04D0.c @@ -1,3 +1,4 @@ #include "omo_07.h" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC04D0", func_80243220_DC04D0); +#define UNK_NPC_POS_FUNC_NUM 7 +#include "world/common/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_omo/omo_09/DD02E0.c b/src/world/area_omo/omo_09/DD02E0.c index 599d986aca..c81d996609 100644 --- a/src/world/area_omo/omo_09/DD02E0.c +++ b/src/world/area_omo/omo_09/DD02E0.c @@ -2,4 +2,5 @@ static char* N(exit_str_0) = "omo_09"; -INCLUDE_ASM(s32, "world/area_omo/omo_09/DD02E0", func_80243610_DD02E0); +#define UNK_NPC_POS_FUNC_NUM 7 +#include "world/common/UnkNpcPosFunc.inc.c" diff --git a/src/world/area_osr/osr_03/AB62B0.c b/src/world/area_osr/osr_03/AB62B0.c index 3d8f711a28..8c00e8fd46 100644 --- a/src/world/area_osr/osr_03/AB62B0.c +++ b/src/world/area_osr/osr_03/AB62B0.c @@ -4,7 +4,15 @@ INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240020_AB62B0); INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240090_AB6320); -INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_802400C4_AB6354); +ApiStatus func_802400C4_AB6354(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(0); + + script->varTable[0] = npc->pos.x + (sin_deg(npc->yaw + gCameras[CAM_DEFAULT].currentYaw + 180.0f) * 20.0f); + script->varTable[1] = npc->pos.y + 18.0f; + script->varTable[2] = npc->pos.z - (cos_deg(npc->yaw + gCameras[CAM_DEFAULT].currentYaw + 180.0f) * 20.0f); + return ApiStatus_DONE2; +} + INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_802401A0_AB6430); diff --git a/src/world/common/StarSpiritEffectFunc.inc.c b/src/world/common/StarSpiritEffectFunc.inc.c index cd9072e96e..4e49b5fb8f 100644 --- a/src/world/common/StarSpiritEffectFunc.inc.c +++ b/src/world/common/StarSpiritEffectFunc.inc.c @@ -3,7 +3,7 @@ #include "effects.h" ApiStatus N(StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall) { - StarSpiritEffect* ptr = (StarSpiritEffect*)script->varTable[0]; + StarSpiritData* ptr = script->varTablePtr[0]; sfx_adjust_env_sound_pos(SOUND_A2, 0, ptr->unk_00, ptr->unk_04, ptr->unk_08); @@ -18,8 +18,9 @@ ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { - StarSpiritEffect* ptr = heap_malloc(sizeof(*ptr)); - script->varTable[0] = (s32) ptr; + StarSpiritData* ptr = heap_malloc(sizeof(*ptr)); + + script->varTablePtr[0] = ptr; evt_set_variable(NULL, EVT_MAP_VAR(1), script->varTable[0]); ptr->unk_38 = evt_get_variable(script, *args++); ptr->unk_3C = evt_get_variable(script, *args++); @@ -31,7 +32,7 @@ ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) { ptr->unk_20 = evt_get_float_variable(script, *args++); ptr->unk_24 = evt_get_float_variable(script, *args++); ptr->unk_28 = evt_get_float_variable(script, *args++); - ptr->unk_50 = (struct StarSpiritEffectUnkStruct*) fx_star_spirits_energy(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); + ptr->unk_50 = fx_star_spirits_energy(2, ptr->unk_0C, ptr->unk_10, ptr->unk_14, 1.0f, 0); ptr->unk_4E = 0; ptr->unk_48 = 0; ptr->unk_4A = 0; @@ -44,16 +45,16 @@ ApiStatus N(StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall) { ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - StarSpiritEffect* ptr = (StarSpiritEffect*)script->varTable[0]; + StarSpiritData* ptr = script->varTablePtr[0]; switch (ptr->unk_44) { case 0: ptr->unk_04 = update_lerp(5, ptr->unk_10, ptr->unk_1C, ptr->unk_46, ptr->unk_3C); ptr->unk_00 = update_lerp(0, ptr->unk_0C, ptr->unk_18, ptr->unk_46, ptr->unk_3C); ptr->unk_08 = update_lerp(0, ptr->unk_14, ptr->unk_20, ptr->unk_46, ptr->unk_3C); - ptr->unk_50->unk_0C->unk_08 = ptr->unk_00; - ptr->unk_50->unk_0C->unk_0C = ptr->unk_04; - ptr->unk_50->unk_0C->unk_10 = ptr->unk_08; + ((StarSpiritsEnergyFXData*)ptr->unk_50->data)->unk_08 = ptr->unk_00; + ((StarSpiritsEnergyFXData*)ptr->unk_50->data)->unk_0C = ptr->unk_04; + ((StarSpiritsEnergyFXData*)ptr->unk_50->data)->unk_10 = ptr->unk_08; ptr->unk_46++; if (ptr->unk_46 >= ptr->unk_3C) { ptr->unk_44 = 1; @@ -65,16 +66,16 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { if (ptr->unk_46 >= 60) { ptr->unk_44 = 2; ptr->unk_46 = 0; - ptr->unk_50->unk_0C->unk_70 = 1; - ptr->unk_50->unk_0C->unk_74 = 0; + ((StarSpiritsEnergyFXData*)ptr->unk_50->data)->unk_70 = 1; + ((StarSpiritsEnergyFXData*)ptr->unk_50->data)->unk_74 = 0; } break; case 2: ptr->unk_46++; if (ptr->unk_46 >= 60) { ptr->unk_54 = fx_spirit_card(1, ptr->unk_18, ptr->unk_1C, ptr->unk_20, 1.0f, 0); - *((s8*)ptr->unk_54->unk_0C + 0x34) = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_34 = ptr->unk_38; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_20 = 0; ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); ptr->unk_44 = 3; ptr->unk_46 = 0; @@ -96,7 +97,6 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { ptr->unk_34 = ptr->unk_2C; } break; - case 4: break; } @@ -107,7 +107,7 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { ptr->unk_04 = update_lerp(0xA, ptr->unk_1C, ptr->unk_24, ptr->unk_4C, 120); ptr->unk_4C++; if (ptr->unk_4C >= 120) { - ptr->unk_4C = 0x10E; + ptr->unk_4C = 270; ptr->unk_4A = 2; ptr->unk_4E = 2; } @@ -126,10 +126,10 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { case 1: ptr->unk_2C = clamp_angle(ptr->unk_2C + ptr->unk_30); case 2: - ptr->unk_54->unk_0C->unk_24.f = ptr->unk_2C; - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_24 = ptr->unk_2C; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_04 = ptr->unk_18; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_08 = ptr->unk_04; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_0C = ptr->unk_20; break; } @@ -138,7 +138,7 @@ ApiStatus N(StarSpiritEffectFunc3)(Evt* script, s32 isInitialCall) { ApiStatus N(StarSpiritEffectFunc4)(Evt* script, s32 isInitialCall) { s32 var = evt_get_variable(script, *script->ptrReadPos); - StarSpiritEffect* ptr = (StarSpiritEffect*) script->varTable[0]; + StarSpiritData* ptr = script->varTablePtr[0]; return (ptr->unk_4E == var) * ApiStatus_DONE2; } @@ -147,18 +147,18 @@ ApiStatus N(StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { - StarSpiritEffect* ptr = (StarSpiritEffect*) heap_malloc(sizeof(*ptr)); - script->varTable[0] = (s32) ptr; + StarSpiritData* ptr = heap_malloc(sizeof(*ptr)); + script->varTablePtr[0] = ptr; ptr->unk_38 = evt_get_variable(script, *args++); ptr->unk_18 = evt_get_float_variable(script, *args++); ptr->unk_24 = evt_get_float_variable(script, *args++); ptr->unk_20 = evt_get_float_variable(script, *args++); ptr->unk_28 = evt_get_float_variable(script, *args++); ptr->unk_54 = fx_spirit_card(1, ptr->unk_18, ptr->unk_24, ptr->unk_20, 1.0f, 0); - ptr->unk_54->unk_0C->unk_34 = ptr->unk_38; - ptr->unk_54->unk_0C->unk_20 = 0; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_34 = ptr->unk_38; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_20 = 0; ptr->unk_40 = create_shadow_type(0, ptr->unk_18, ptr->unk_28, ptr->unk_20); - ptr->unk_4C = 0x10E; + ptr->unk_4C = 270; } return ApiStatus_DONE2; @@ -166,7 +166,7 @@ ApiStatus N(StarSpiritEffectFunc5)(Evt* script, s32 isInitialCall) { ApiStatus N(StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; - StarSpiritEffect* ptr = (StarSpiritEffect*) script->varTable[0]; + StarSpiritData* ptr = script->varTablePtr[0]; ptr->unk_04 = ptr->unk_24 + (2.0f * (sin_deg(ptr->unk_4C) + 1.0f)); ptr->unk_4C = clamp_angle(ptr->unk_4C + 8); @@ -174,9 +174,9 @@ ApiStatus N(StarSpiritEffectFunc6)(Evt* script, s32 isInitialCall) { ptr->unk_18, ptr->unk_20) <= 30.0f) { ptr->unk_4E = 3; } - ptr->unk_54->unk_0C->unk_04 = ptr->unk_18; - ptr->unk_54->unk_0C->unk_08 = ptr->unk_04; - ptr->unk_54->unk_0C->unk_0C = ptr->unk_20; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_04 = ptr->unk_18; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_08 = ptr->unk_04; + ((SpiritCardFXData*)ptr->unk_54->data)->unk_0C = ptr->unk_20; return ApiStatus_BLOCK; } diff --git a/src/world/common/UnkAngleFunc001.inc.c b/src/world/common/UnkAngleFunc001.inc.c new file mode 100644 index 0000000000..3ac9da7649 --- /dev/null +++ b/src/world/common/UnkAngleFunc001.inc.c @@ -0,0 +1,35 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkAngleFunc001)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + s32 outX = *args++; + s32 outY = *args++; + s32 outZ = *args++; + Npc* npc = N(resolve_npc)(script, npcID); + f32 y; + + if (npc == NULL) { + return ApiStatus_DONE2; + } + + N(unkAngle1) += 4; + if (N(unkAngle1) >= 360) { + N(unkAngle1) -= 360; + } + + y = npc->pos.y; + if (npc->currentAnim.w == 0xB60000 || + npc->currentAnim.w == 0xB60004 || + npc->currentAnim.w == 0xB60008 || + npc->currentAnim.w == 0xB6000C) + { + y += 2.0f * sin_deg(N(unkAngle1)); + } + + evt_set_float_variable(script, outX, npc->pos.x); + evt_set_float_variable(script, outY, y); + evt_set_float_variable(script, outZ, npc->pos.z); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkAngleFunc004.inc.c b/src/world/common/UnkAngleFunc004.inc.c new file mode 100644 index 0000000000..5a109066ff --- /dev/null +++ b/src/world/common/UnkAngleFunc004.inc.c @@ -0,0 +1,36 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkAngleFunc004)(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_safe(script->owner2.npcID); + + switch (script->functionTemp[1]) { + case 0: + npc->duration = rand_int(180) + 30; + npc->pos.z = -300.0f; + npc->pos.y = rand_int(50) + 80.0f; + npc->moveSpeed = (2.0f * rand_float()) + 2.0f; + if (rand_int(100) < 50) { + npc->pos.x = 270.0f; + npc->yaw = 270.0f; + } else { + npc->pos.x = -270.0f; + npc->yaw = 90.0f; + } + script->functionTemp[1] = 1; + break; + case 1: + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[1] = 2; + } + break; + case 2: + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->pos.x < -280.0f || npc->pos.x > 280.0f) { + script->functionTemp[1] = 0; + } + break; + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkAngleFunc005.inc.c b/src/world/common/UnkAngleFunc005.inc.c new file mode 100644 index 0000000000..06666ce48a --- /dev/null +++ b/src/world/common/UnkAngleFunc005.inc.c @@ -0,0 +1,36 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkAngleFunc005)(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_safe(script->owner2.npcID); + + switch (script->functionTemp[1]) { + case 0: + npc->duration = rand_int(180) + 30; + npc->pos.z = -430.0f; + npc->pos.y = rand_int(50) + 40.0f; + npc->moveSpeed = (2.0f * rand_float()) + 2.0f; + if (rand_int(100) < 50) { + npc->pos.x = 270.0f; + npc->yaw = 270.0f; + } else { + npc->pos.x = -270.0f; + npc->yaw = 90.0f; + } + script->functionTemp[1] = 1; + break; + case 1: + npc->duration--; + if (npc->duration == 0) { + script->functionTemp[1] = 2; + } + break; + case 2: + npc_move_heading(npc, npc->moveSpeed, npc->yaw); + if (npc->pos.x < -280.0f || npc->pos.x > 280.0f) { + script->functionTemp[1] = 0; + } + break; + } + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkFloatFunc001.inc.c b/src/world/common/UnkFloatFunc001.inc.c new file mode 100644 index 0000000000..11a88dae2c --- /dev/null +++ b/src/world/common/UnkFloatFunc001.inc.c @@ -0,0 +1,24 @@ +#include "common.h" +#include "npc.h" + +// Similar to UnkFloatFunc +ApiStatus N(UnkFloatFunc001)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 a1 = *args++; + s32 var0 = evt_get_variable(script, a1); + s32 a2 = *args++; + f32 var1 = evt_get_float_variable(script, *args++); + f32 var2 = evt_get_float_variable(script, *args++); + s32 var3 = evt_get_variable(script, *args++); + s32 var4 = evt_get_variable(script, *args++); + f32 temp = evt_get_float_variable(script, *args++); + f32 diff = (var2 - var1) / 2; + + if (var4 != 0 && var3 < var0) { + var0 = var3; + evt_set_variable(script, a1, var3); + } + + evt_set_float_variable(script, a2, (var1 + diff) - (diff * cos_deg(((var0 * 180.0f) / var3) + temp))); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkNpcPosFunc.inc.c b/src/world/common/UnkNpcPosFunc.inc.c new file mode 100644 index 0000000000..d9a17f5976 --- /dev/null +++ b/src/world/common/UnkNpcPosFunc.inc.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "npc.h" + +#ifndef UNK_NPC_POS_FUNC_NUM +#error UNK_NPC_POS_FUNC_NUM must be defined +#define UNK_NPC_POS_FUNC_NUM 0 +#endif + +ApiStatus N(UnkNpcPosFunc)(Evt* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(UNK_NPC_POS_FUNC_NUM); + + script->varTable[0] = npc->pos.x + (sin_deg(npc->yaw + gCameras[CAM_DEFAULT].currentYaw + 180.0f) * 40.0f); + script->varTable[1] = npc->pos.y + 8.0f; + script->varTable[2] = npc->pos.z - (cos_deg(npc->yaw + gCameras[CAM_DEFAULT].currentYaw + 180.0f) * 40.0f); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkPlayerPosFunc.inc.c b/src/world/common/UnkPlayerPosFunc.inc.c new file mode 100644 index 0000000000..e3c20982d9 --- /dev/null +++ b/src/world/common/UnkPlayerPosFunc.inc.c @@ -0,0 +1,15 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(UnkPlayerPosFunc)(Evt* script, s32 isInitialCall) { + Npc* player = get_npc_safe(ACTOR_PLAYER); + f32 yaw = -player->yaw; + f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 70.0f); + f32 z = player->pos.z + (cos_deg(yaw) * 70.0f); + f32 y = player->pos.y + 50.0f; + + evt_set_float_variable(script, EVT_VAR(0), x); + evt_set_float_variable(script, EVT_VAR(1), y); + evt_set_float_variable(script, EVT_VAR(2), z); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkVtxFunc.inc.c b/src/world/common/UnkVtxFunc.inc.c new file mode 100644 index 0000000000..63e7e83a98 --- /dev/null +++ b/src/world/common/UnkVtxFunc.inc.c @@ -0,0 +1,7 @@ +#include "common.h" +#include "npc.h" + +void N(SomeVtxFunc)(void) { + script->varTable[0] = gPlayerData.coins; + return ApiStatus_DONE2; +} diff --git a/src/world/common/resolve_npc.inc.c b/src/world/common/resolve_npc.inc.c new file mode 100644 index 0000000000..0e2078e78b --- /dev/null +++ b/src/world/common/resolve_npc.inc.c @@ -0,0 +1,11 @@ +#include "npc.h" + +Npc* N(resolve_npc)(Evt* script, s32 npcIdOrPtr) { + if (npcIdOrPtr == NPC_SELF) { + return get_npc_safe(script->owner2.npcID); + } else if (npcIdOrPtr >= -270000000) { + return get_npc_safe(npcIdOrPtr); + } else { + return (Npc*) npcIdOrPtr; + } +} diff --git a/src/world/common/unkAngleFuncs023.inc.c b/src/world/common/unkAngleFuncs023.inc.c new file mode 100644 index 0000000000..bc35dddb61 --- /dev/null +++ b/src/world/common/unkAngleFuncs023.inc.c @@ -0,0 +1,36 @@ +#include "common.h" +#include "npc.h" + +void N(unkAngleFunc002)(void) { + Vtx* firstVertex; + Vtx* copiedVertices; + s32 numVertices; + + mdl_get_copied_vertices(1, &firstVertex, &copiedVertices, &numVertices); + N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle2)); + + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(1)); + if (N(unkAngle2) >= 0) { + N(unkAngle2) += 4; + } + if (N(unkAngle2) >= 360) { + N(unkAngle2) = -1; + } +} + +void N(unkAngleFunc003)(void) { + Vtx* firstVertex; + Vtx* copiedVertices; + s32 numVertices; + + mdl_get_copied_vertices(2, &firstVertex, &copiedVertices, &numVertices); + N(unkVtxFunc001)(firstVertex, copiedVertices, numVertices, &N(unkAngle3)); + + gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(2)); + if (N(unkAngle3) >= 0) { + N(unkAngle3) += 4; + } + if (N(unkAngle3) >= 360) { + N(unkAngle3) = -1; + } +} diff --git a/tools/sortsymz.py b/tools/sortsymz.py index 04d9c1b798..0a34d3d803 100755 --- a/tools/sortsymz.py +++ b/tools/sortsymz.py @@ -8,7 +8,7 @@ groups = {} with open("tools/symz.txt") as f: for line in f.readlines(): - if line and not line.startswith("//"): + if line.strip() and not line.startswith("//"): name, addr = line.strip().strip(";").split(" = ") syms.append({"name": name, "address": int(addr, 0), "found_in": set(), "dead": False}) diff --git a/ver/us/asm/data/1AF2D0.data.s b/ver/us/asm/data/1AF2D0.data.s index 1501736d42..a1d30e4651 100644 --- a/ver/us/asm/data/1AF2D0.data.s +++ b/ver/us/asm/data/1AF2D0.data.s @@ -780,7 +780,10 @@ dlabel HudScript_MashCUpButton .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000002, D_8028BEC0, D_8028C168, 0x00000002, 0x00000002, D_8028C188, D_8028C430, 0x00000003, 0x00000000 dlabel HudScript_CDownButton -.word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028C450, D_8028C6F8, 0x00000003, 0x00000000, 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028C718, D_8028C9C0, 0x00000003, 0x00000000 +.word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028C450, D_8028C6F8, 0x00000003, 0x00000000 + +dlabel HudScript_8029265C +.word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x0000003C, D_8028C718, D_8028C9C0, 0x00000003, 0x00000000 dlabel HudScript_MashCDownButton1 .word 0x00000008, 0x00000013, 0x00000028, 0x00000022, 0x00000004, 0x00000002, 0x00000002, D_8028C450, D_8028C6F8, 0x00000002, 0x00000002, D_8028C718, D_8028C9C0, 0x00000003, 0x00000000 diff --git a/ver/us/asm/data/battle/action_cmd/422A90.data.s b/ver/us/asm/data/battle/action_cmd/422A90.data.s deleted file mode 100644 index ab5365cd4f..0000000000 --- a/ver/us/asm/data/battle/action_cmd/422A90.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel jtbl_802A9A90_422A90 -.word L802A93BC_4223BC, L802A94A8_4224A8, L802A99B4_4229B4, L802A99B4_4229B4, L802A99B4_4229B4, L802A99B4_4229B4, L802A99B4_4229B4, L802A99B4_4229B4, L802A99B4_4229B4, L802A99B4_4229B4, L802A9598_422598, L802A9644_422644, L802A9994_422994, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/423C30.data.s b/ver/us/asm/data/battle/action_cmd/423C30.data.s deleted file mode 100644 index d37f2d81b7..0000000000 --- a/ver/us/asm/data/battle/action_cmd/423C30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel jtbl_802A9840_423C30 -.word L802A9320_423710, L802A93C4_4237B4, L802A96A4_423A94, L802A96A4_423A94, L802A96A4_423A94, L802A96A4_423A94, L802A96A4_423A94, L802A96A4_423A94, L802A96A4_423A94, L802A96A4_423A94, L802A944C_42383C, L802A9490_423880, L802A9684_423A74, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/424550.data.s b/ver/us/asm/data/battle/action_cmd/424550.data.s deleted file mode 100644 index c202209e1b..0000000000 --- a/ver/us/asm/data/battle/action_cmd/424550.data.s +++ /dev/null @@ -1,93 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A98E0_424550 -.word 0x00000000, 0x00007770, 0x00000000, 0x00000000, 0x00777777, 0x00000000, 0x00000000, 0x0778D1D7, 0x70000000, 0x00000007, 0x77B1111D, 0x77000000, 0x00000777, 0x91111111, 0xB7700000, 0x0000777E, 0x11111111, 0xB7700000, 0x00007711, 0x11111111, 0xA7700000, 0x00007711, 0x11111111, 0x77000000, 0x000077A2, 0x222B222D, 0x77000000, 0x00000779, 0x2B77222B, 0x77000000, 0x00000087, 0x777B333A, 0x70000000, 0x00000007, 0x77733337, 0x70000000, 0x00000000, 0x77A444D7, 0x70000000, 0x00000000, 0x774444C7, 0x70000000, 0x00000007, 0x775555A7, 0x00000000, 0x00000007, 0x7D555577, 0x00000000, 0x00000077, 0x76666D77, 0x00000000, 0x00000077, 0x66666A77, 0x00000000, 0x00000078, 0x66666770, 0x00000000, 0x00000078, 0x6666D770, 0x00000000, 0x00000077, 0xD666C770, 0x00000000, 0x00000077, 0x7D667700, 0x00000000, 0x00000007, 0x77777700, 0x00000000, 0x00000000, 0x77777000, 0x00000000 - -dlabel D_802A9A00_424670 -.word 0xBDE0FC05, 0xFD81FE41, 0xC081E143, 0xFA033843, 0x58C17141, 0x8983A203, 0xBA43D2C5, 0xEB05FFFF - -dlabel D_802A9A20_424690 -.word 0x00000000, 0x07777770, 0x00000000, 0x00000007, 0x77777777, 0x70000000, 0x00000087, 0xA111111D, 0x77000000, 0x0000777B, 0x11111111, 0xD7700000, 0x000777D1, 0x11111111, 0x11870000, 0x00777111, 0x11111111, 0x11B70000, 0x07771111, 0x11DD1111, 0x11B70000, 0x077E1111, 0x1777A111, 0x11B70000, 0x07772222, 0x77778222, 0x22770000, 0x00787227, 0x70772222, 0x27700000, 0x00078777, 0x07733333, 0x87000000, 0x00007870, 0x78333337, 0x80000000, 0x00000007, 0x74444477, 0x77700000, 0x00000078, 0x44444777, 0x77770000, 0x00000785, 0x5555777A, 0x55A77000, 0x00007855, 0x55577AD5, 0x555D7800, 0x00078666, 0x667AD666, 0x66667700, 0x00776666, 0x66DE6666, 0x666D7700, 0x00776666, 0x66666666, 0x6D777000, 0x0077C666, 0x6666666C, 0x77770000, 0x00077A66, 0x6666DA77, 0x87000000, 0x00007776, 0x66C77777, 0x00000000, 0x00000777, 0x77777700, 0x00000000, 0x00000007, 0x77700000, 0x00000000 - -dlabel D_802A9B40_4247B0 -.word 0xBDE0FC05, 0xFD81FE41, 0xC081E143, 0xFA033843, 0x58C17141, 0x8983A203, 0xBA43D2C5, 0xEB05FFFF - -dlabel D_802A9B60_4247D0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00888888, 0x00000000, 0x00000000, 0x77787788, 0x77000000, 0x00000077, 0x7B111111, 0xD7700000, 0x00007779, 0x11111111, 0x1D770000, 0x000777D1, 0x11111111, 0x11D77000, 0x00077111, 0x111A7C11, 0x11177000, 0x00077111, 0x11777711, 0x11177000, 0x00077222, 0x27707722, 0x22D77000, 0x0000772D, 0x77077222, 0x2D770000, 0x00000777, 0x70873333, 0xA7700000, 0x00000000, 0x0773333A, 0x77000000, 0x00000000, 0x07744449, 0x77000000, 0x00000000, 0x00774444, 0xA7700000, 0x00000787, 0x77077555, 0x5D770000, 0x000077D5, 0x57707755, 0x55D77000, 0x00077D66, 0x66977796, 0x66667700, 0x00078666, 0x666B7776, 0x66667700, 0x00077966, 0x6666DCD6, 0x66667700, 0x0000777D, 0x66666666, 0x66D77000, 0x00000777, 0xA6666666, 0x6A770000, 0x00000077, 0x7766666D, 0x77700000, 0x00000000, 0x77777777, 0x77000000, 0x00000000, 0x00777777, 0x00000000 - -dlabel D_802A9C80_4248F0 -.word 0xBDE0FC05, 0xFD81FE41, 0xC081E143, 0xFA033843, 0x58C17141, 0x8983A203, 0xBA43D2C5, 0xEB05FFFF - -dlabel D_802A9CA0_424910 -.word 0x00000000, 0x00077777, 0x00000000, 0x00000000, 0x00777777, 0x70000000, 0x00000000, 0x07771111, 0x77000000, 0x00000000, 0x07711111, 0x17000000, 0x00000000, 0x77B11111, 0xC7000000, 0x00000000, 0x7911111C, 0x77000000, 0x00000007, 0x7D1111B7, 0x70000000, 0x00000077, 0xB1111B77, 0x70000000, 0x00000077, 0x22222227, 0x77000000, 0x0000077D, 0x22222222, 0x77000000, 0x00007793, 0x33373333, 0x77700000, 0x00007733, 0x33B77333, 0x77700000, 0x00077D44, 0xED777444, 0x77770000, 0x00079444, 0xD7777444, 0x44770000, 0x00775555, 0xC777B555, 0x55B77000, 0x00775555, 0x55555555, 0x55D77000, 0x0077D666, 0x66666666, 0x66677000, 0x00777D66, 0x66666669, 0x77777000, 0x00077777, 0x77766667, 0x77770000, 0x00000777, 0x77766667, 0x70000000, 0x00000000, 0x077666C7, 0x70000000, 0x00000000, 0x0776C977, 0x70000000, 0x00000000, 0x07777770, 0x00000000, 0x00000000, 0x00777000, 0x00000000 - -dlabel D_802A9DC0_424A30 -.word 0xBDE0FC05, 0xFD81FE41, 0xC081E143, 0xFA033843, 0x58C17141, 0x8983A203, 0xBA43D2C5, 0xEB05FFFF - -dlabel D_802A9DE0_424A50 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x88777777, 0x78700000, 0x00000007, 0x77777777, 0x77770000, 0x00000077, 0xA1111111, 0x11780000, 0x00000077, 0xD1111111, 0x11780000, 0x0000077A, 0x11111111, 0x11780000, 0x00000771, 0x111D7777, 0x77770000, 0x000077B1, 0x11177000, 0x00000000, 0x00007722, 0x22A77778, 0x80000000, 0x00077D22, 0x2B77D22D, 0x77000000, 0x00077333, 0x37D33333, 0xD7700000, 0x0077D333, 0x33333333, 0x3D770000, 0x00774444, 0x4444A7B4, 0x44D77000, 0x00077444, 0x4DB77778, 0x44477000, 0x00007755, 0xB7770777, 0x55577000, 0x00000778, 0x770077A5, 0x55D77000, 0x00000077, 0x00778666, 0x6D770000, 0x00000000, 0x877D6666, 0xD7700000, 0x00000077, 0x7B666666, 0x77000000, 0x00000078, 0xD6666667, 0x70000000, 0x00000087, 0xB6666677, 0x00000000, 0x00000008, 0x7B666770, 0x00000000, 0x00000000, 0x87777700, 0x00000000, 0x00000000, 0x08888000, 0x00000000 - -dlabel D_802A9F00_424B70 -.word 0xBDE0FC05, 0xFD81FE41, 0xC081E143, 0xFA033843, 0x58C17141, 0x8983A203, 0xBA43D2C5, 0xEB05FFFF - -dlabel D_802A9F20_424B90 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x07777770, 0x00000000, 0x00000000, 0x778BBB77, 0x00000000, 0x00000007, 0x78E111C7, 0x70000000, 0x00000007, 0x7C1111E7, 0x70000000, 0x00000077, 0xB11111E7, 0x70000000, 0x00000077, 0xE11111B7, 0x70000000, 0x0000077B, 0x11111977, 0x00000000, 0x0000078E, 0x222C8770, 0x00000000, 0x000077A2, 0x2222DC77, 0x70000000, 0x000078D3, 0x3333333C, 0x77700000, 0x00077B33, 0x33C9C333, 0x3C777000, 0x00078444, 0x44777C44, 0x44497700, 0x0077B444, 0xC77077C4, 0x444B7700, 0x0077D555, 0x97000795, 0x555C7700, 0x00775555, 0x77000775, 0x555C7700, 0x00776666, 0x97707796, 0x666B7000, 0x0077C666, 0x69777966, 0x66C77000, 0x00077B66, 0x6D979666, 0x6D770000, 0x00007796, 0x66666666, 0xD7700000, 0x00000779, 0x6666666D, 0x77000000, 0x00000077, 0x8D6666D7, 0x70000000, 0x00000007, 0x77777777, 0x00000000, 0x00000000, 0x77777770, 0x00000000 - -dlabel D_802AA040_424CB0 -.word 0xBDE0FC05, 0xFD81FE41, 0xC081E143, 0xFA033843, 0x58C17141, 0x8983A203, 0xBA43D2C5, 0xEB05FFFF - -dlabel D_802AA060_424CD0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x77777777, 0x77000000, 0x00000007, 0x77777777, 0x77700000, 0x00000077, 0xA1111111, 0x11770000, 0x00000779, 0x11111111, 0x11E77000, 0x00000771, 0x11111111, 0x11177000, 0x000077D1, 0x11111111, 0x11E77000, 0x00007911, 0x1D777779, 0x11C77000, 0x00077E22, 0x2B777782, 0x22770000, 0x00077222, 0x277778D2, 0x2C770000, 0x00077C33, 0x97777C33, 0xE7700000, 0x00007777, 0x7777C333, 0x97700000, 0x00000777, 0x777C444C, 0x77000000, 0x00000000, 0x07744449, 0x77000000, 0x00000000, 0x77D555C7, 0x70000000, 0x00000000, 0x77555597, 0x70000000, 0x00000007, 0x7B666677, 0x00000000, 0x00000007, 0x76666677, 0x00000000, 0x00000007, 0x76666677, 0x00000000, 0x00000007, 0x76666677, 0x00000000, 0x00000007, 0x76666677, 0x00000000, 0x00000007, 0x7C666C77, 0x00000000, 0x00000000, 0x77777770, 0x00000000, 0x00000000, 0x07777700, 0x00000000 - -dlabel D_802AA180_424DF0 -.word 0xBDE0FC05, 0xFD81FE41, 0xC081E143, 0xFA033843, 0x58C17141, 0x8983A203, 0xBA43D2C5, 0xEB05FFFF - -dlabel D_802AA1A0_424E10 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000055, 0x55555555, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00055555, 0x55555555, 0x66000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x55555543, 0x22111234, 0x66660000, 0x00000000, 0x00000000, 0x00000000, 0x00000055, 0x55543211, 0x11111111, 0x24666000, 0x00000000, 0x00000000, 0x00000000, 0x00000555, 0x53211111, 0x11111111, 0x11266600, 0x00000000, 0x00000000, 0x00000000, 0x00055553, 0x21111111, 0x11111111, 0x11126660, 0x00000000, 0x00000000, 0x00000000, 0x00555421, 0x11111111, 0x11111111, 0x11112666, 0x00000000, 0x00000000, 0x00000000, 0x05553111, 0x11111111, 0x11111111, 0x11111266, 0x00000000, 0x00000000, 0x00000000, 0x55521111, 0x11111111, 0x11111111, 0x11111146, 0x60000000, 0x00000000, 0x00000005, 0x55211111, 0x11111111, 0x11111111, 0x11111126, 0x60000000, 0x00000000, 0x00000055, 0x52111111, 0x11111111, 0x11111111, 0x11111114, 0x66000000, 0x00000000, 0x00000555, 0x31111111, 0x11111111, 0x11111111, 0x11111113, 0x66000000, 0x00000000, 0x00000554, 0x11111111, 0x11111111, 0x11111111, 0x11111112, 0x66000000, 0x00000000, 0x00005541, 0x11111111, 0x11111111, 0x11111111, 0x11111112, 0x66000000, 0x00000000, 0x00005521, 0x11111111, 0x11111111, 0x11111111, 0x11111112, 0x66000000, 0x00000000, 0x00055411, 0x11111111, 0x11111111, 0x11111111, 0x11111112, 0x66000000, 0x00000000, 0x00055211, 0x11111111, 0x11111111, 0x11111111, 0x11111113, 0x66000000, 0x00000000, 0x00554111, 0x11111111, 0x11111111, 0x11111111, 0x11111114, 0x66000000, 0x00000000, 0x00553111, 0x11111111, 0x11111111, 0x11111111, 0x11111126, 0x66000000, 0x00000000, 0x00552111, 0x11111111, 0x11111111, 0x11111111, 0x11111136, 0x60000000, 0x00000000, 0x05541111, 0x11111111, 0x11111111, 0x11111111, 0x11111246, 0x60000666, 0x66000000, 0x05531111, 0x11111111, 0x11111111, 0x11111111, 0x11111366, 0x00666666, 0x66000000, 0x05521111, 0x11111111, 0x11111111, 0x11111111, 0x11112466, 0x66664222, 0x66000000, 0x05511111, 0x11111111, 0x11111111, 0x11111111, 0x11113666, 0x64211126, 0x60000000, 0x05511111, 0x11111111, 0x11111111, 0x11111111, 0x11125542, 0x11111266, 0x60000000, 0x05611111, 0x11111111, 0x11111111, 0x11111111, 0x11152111, 0x11112666, 0x00000000, 0x05611111, 0x11111111, 0x11111111, 0x11111111, 0x11411111, 0x11126660, 0x00000000, 0x05621111, 0x11111111, 0x11111111, 0x11111111, 0x13111111, 0x11266600, 0x00000000, 0x05631111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x13666000, 0x00000000, 0x05641111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x46660000, 0x00000000, 0x05661111, 0x11111111, 0x11111111, 0x11111111, 0x11111126, 0x66600000, 0x00000000, 0x00663111, 0x11111111, 0x11111111, 0x11111111, 0x11112466, 0x60000000, 0x00000000, 0x00664111, 0x11111111, 0x11111111, 0x11111111, 0x11246666, 0x00000000, 0x00000000, 0x00066311, 0x11111111, 0x11111111, 0x11111111, 0x24666600, 0x00000000, 0x00000000, 0x00066621, 0x11111111, 0x11111111, 0x11111124, 0x66660000, 0x00000000, 0x00000000, 0x00006662, 0x11111111, 0x11111111, 0x11112466, 0x66000000, 0x00000000, 0x00000000, 0x00000666, 0x42111111, 0x11111111, 0x22466666, 0x00000000, 0x00000000, 0x00000000, 0x00000066, 0x66422111, 0x11112246, 0x66666600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x66666666, 0x66666666, 0x66600000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00666666, 0x66666666, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802AA6E0_425350 -.word 0x294CD6B5, 0xB5B18C69, 0x6B614215, 0x294D0001, 0x00010001, 0x00010001, 0x00010001, 0xFFEBAAC9 - -dlabel D_802AA700_425370 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802A98E0_424550, D_802A9A00_424670, 0x00000003, 0x00000000 - -dlabel D_802AA728_425398 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802A9A20_424690, D_802A9B40_4247B0, 0x00000003, 0x00000000 - -dlabel D_802AA750_4253C0 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802A9B60_4247D0, D_802A9C80_4248F0, 0x00000003, 0x00000000 - -dlabel D_802AA778_4253E8 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802A9CA0_424910, D_802A9DC0_424A30, 0x00000003, 0x00000000 - -dlabel D_802AA7A0_425410 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802A9DE0_424A50, D_802A9F00_424B70, 0x00000003, 0x00000000 - -dlabel D_802AA7C8_425438 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802A9F20_424B90, D_802AA040_424CB0, 0x00000003, 0x00000000 - -dlabel D_802AA7F0_425460 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802AA060_424CD0, D_802AA180_424DF0, 0x00000003, 0x00000000 - -dlabel D_802AA818_425488 -.word 0x00000008, 0x00000013, 0x00000038, 0x00000030, 0x00000004, 0x00000002, 0x0000003C, D_802AA1A0_424E10, D_802AA6E0_425350, 0x00000003, 0x00000000 - -dlabel D_802AA844_4254B4 -.word 0x00000000, 0x00000019, 0x00000032, 0x0000004B, 0x00000064, 0x00000064 - -dlabel D_802AA85C_4254CC -.word 0x00000032, 0x00000032, 0x00000032, 0x00000032, 0x0000004B, 0x0000004B, 0x0000004B, 0x00000064, 0x00000064, 0x00000064, 0x00000064 - -dlabel D_802AA888_4254F8 -.word D_802AA7F0_425460, D_802AA7C8_425438, D_802AA7A0_425410, D_802AA778_4253E8, D_802AA750_4253C0, D_802AA728_425398 - -dlabel D_802AA8A0_425510 -.byte 0x80, 0x2A, 0xA7, 0x00, 0x80, 0x2A, 0xA7, 0x00, 0x80, 0x2A, 0xA7, 0x28, 0x80, 0x2A, 0xA7, 0x50, 0x80, 0x2A, 0xA7, 0x50, 0x00, 0x00, 0x00 - -dlabel D_802AA8B7_425527 -.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01 - -dlabel jtbl_802AA8E0_425550 -.word L802A9338_423FA8, L802A93DC_42404C, L802A972C_42439C, L802A972C_42439C, L802A972C_42439C, L802A972C_42439C, L802A972C_42439C, L802A972C_42439C, L802A972C_42439C, L802A972C_42439C, L802A9464_4240D4, L802A94AC_42411C, L802A970C_42437C, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/426970.data.s b/ver/us/asm/data/battle/action_cmd/426970.data.s deleted file mode 100644 index cf42c0f35c..0000000000 --- a/ver/us/asm/data/battle/action_cmd/426970.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9800_426970 -.short 0x0000 - -dlabel D_802A9802_426972 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - -dlabel jtbl_802A9820_426990 -.word L802A92D4_426444, L802A9330_4264A0, L802A96C4_426834, L802A96C4_426834, L802A96C4_426834, L802A96C4_426834, L802A96C4_426834, L802A96C4_426834, L802A96C4_426834, L802A96C4_426834, L802A9388_4264F8, L802A93E8_426558, L802A9680_4267F0, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/427320.data.s b/ver/us/asm/data/battle/action_cmd/427320.data.s deleted file mode 100644 index dfe077dc6a..0000000000 --- a/ver/us/asm/data/battle/action_cmd/427320.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9950_427320 -.short 0x0000 - -dlabel D_802A9952_427322 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B - -dlabel D_802A9964_427334 -.word 0x00000028, 0x00000046, 0x00000063, 0x000000C8 - -dlabel D_802A9974_427344 -.word 0x00000023, 0x0000003C, 0x00000050, 0x00000063, 0x000000C8 - -dlabel D_802A9988_427358 -.word 0x00000023, 0x00000023, 0x0000003C, 0x00000050, 0x00000063, 0x000000C8 - -dlabel jtbl_802A99A0_427370 -.word L802A92E4_426CB4, L802A9340_426D10, L802A9818_4271E8, L802A9818_4271E8, L802A9818_4271E8, L802A9818_4271E8, L802A9818_4271E8, L802A9818_4271E8, L802A9818_4271E8, L802A9818_4271E8, L802A9398_426D68, L802A9400_426DD0, L802A97F8_4271C8, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/428280.data.s b/ver/us/asm/data/battle/action_cmd/428280.data.s deleted file mode 100644 index ae59a88016..0000000000 --- a/ver/us/asm/data/battle/action_cmd/428280.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9810_428280 -.short 0x0000 - -dlabel D_802A9812_428282 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - -dlabel jtbl_802A9830_4282A0 -.word L802A92D4_427D44, L802A9330_427DA0, L802A96D4_428144, L802A96D4_428144, L802A96D4_428144, L802A96D4_428144, L802A96D4_428144, L802A96D4_428144, L802A96D4_428144, L802A96D4_428144, L802A9388_427DF8, L802A93E8_427E58, L802A96B4_428124, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/4292C0.data.s b/ver/us/asm/data/battle/action_cmd/4292C0.data.s deleted file mode 100644 index ffb716964b..0000000000 --- a/ver/us/asm/data/battle/action_cmd/4292C0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9850_4292C0 -.short 0x0000 - -dlabel D_802A9852_4292C2 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 diff --git a/ver/us/asm/data/battle/action_cmd/42A480.data.s b/ver/us/asm/data/battle/action_cmd/42A480.data.s deleted file mode 100644 index 3481aaf77b..0000000000 --- a/ver/us/asm/data/battle/action_cmd/42A480.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9760_42A480 -.short 0x0000 - -dlabel D_802A9762_42A482 -.short 0x012C, 0x0000, 0x012C, 0x0000, 0x0109, 0x0000, 0x00DC, 0x0000, 0x00AF, 0x0000, 0x00AF - -dlabel D_802A9778_42A498 -.word 0x0000012C, 0x0000012C, 0x00000109, 0x000000DC, 0x000000AF, 0x000000AF - -dlabel jtbl_802A9790_42A4B0 -.word L802A9254_429F74, L802A92B0_429FD0, L802A9618_42A338, L802A9618_42A338, L802A9618_42A338, L802A9618_42A338, L802A9618_42A338, L802A9618_42A338, L802A9618_42A338, L802A9618_42A338, L802A9308_42A028, L802A936C_42A08C, L802A95F8_42A318, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/42B650.data.s b/ver/us/asm/data/battle/action_cmd/42B650.data.s deleted file mode 100644 index d3eeb2208a..0000000000 --- a/ver/us/asm/data/battle/action_cmd/42B650.data.s +++ /dev/null @@ -1,84 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802AA160_42B650 -.word 0x00000000, 0x00007770, 0x00000000, 0x00000000, 0x00777777, 0x00000000, 0x00000000, 0x0778D1D7, 0x70000000, 0x00000007, 0x77B1111D, 0x77000000, 0x00000777, 0x91111111, 0xB7700000, 0x0000777E, 0x11111111, 0xB7700000, 0x00007711, 0x11111111, 0xA7700000, 0x00007711, 0x11111111, 0x77000000, 0x000077A2, 0x222B222D, 0x77000000, 0x00000779, 0x2B77222B, 0x77000000, 0x00000087, 0x777B333A, 0x70000000, 0x00000007, 0x77733337, 0x70000000, 0x00000000, 0x77A444D7, 0x70000000, 0x00000000, 0x774444C7, 0x70000000, 0x00000007, 0x775555A7, 0x00000000, 0x00000007, 0x7D555577, 0x00000000, 0x00000077, 0x76666D77, 0x00000000, 0x00000077, 0x66666A77, 0x00000000, 0x00000078, 0x66666770, 0x00000000, 0x00000078, 0x6666D770, 0x00000000, 0x00000077, 0xD666C770, 0x00000000, 0x00000077, 0x7D667700, 0x00000000, 0x00000007, 0x77777700, 0x00000000, 0x00000000, 0x77777000, 0x00000000 - -dlabel D_802AA280_42B770 -.word 0xBDE0FEED, 0xFEE9FFAB, 0xCBD9E4DB, 0xFDDF288F, 0x294F498D, 0x62537B19, 0x93DFB4E5, 0xDE2FFFFF - -dlabel D_802AA2A0_42B790 -.word 0x00000000, 0x07777770, 0x00000000, 0x00000007, 0x77777777, 0x70000000, 0x00000087, 0xA111111D, 0x77000000, 0x0000777B, 0x11111111, 0xD7700000, 0x000777D1, 0x11111111, 0x11870000, 0x00777111, 0x11111111, 0x11B70000, 0x07771111, 0x11DD1111, 0x11B70000, 0x077E1111, 0x1777A111, 0x11B70000, 0x07772222, 0x77778222, 0x22770000, 0x00787227, 0x70772222, 0x27700000, 0x00078777, 0x07733333, 0x87000000, 0x00007870, 0x78333337, 0x80000000, 0x00000007, 0x74444477, 0x77700000, 0x00000078, 0x44444777, 0x77770000, 0x00000785, 0x5555777A, 0x55A77000, 0x00007855, 0x55577AD5, 0x555D7800, 0x00078666, 0x667AD666, 0x66667700, 0x00776666, 0x66DE6666, 0x666D7700, 0x00776666, 0x66666666, 0x6D777000, 0x0077C666, 0x6666666C, 0x77770000, 0x00077A66, 0x6666DA77, 0x87000000, 0x00007776, 0x66C77777, 0x00000000, 0x00000777, 0x77777700, 0x00000000, 0x00000007, 0x77700000, 0x00000000 - -dlabel D_802AA3C0_42B8B0 -.word 0xBDE0FEED, 0xFEE9FFAB, 0xCBD9E4DB, 0xFDDF288F, 0x294F498D, 0x62537B19, 0x93DFB4E5, 0xDE2FFFFF - -dlabel D_802AA3E0_42B8D0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00888888, 0x00000000, 0x00000000, 0x77787788, 0x77000000, 0x00000077, 0x7B111111, 0xD7700000, 0x00007779, 0x11111111, 0x1D770000, 0x000777D1, 0x11111111, 0x11D77000, 0x00077111, 0x111A7C11, 0x11177000, 0x00077111, 0x11777711, 0x11177000, 0x00077222, 0x27707722, 0x22D77000, 0x0000772D, 0x77077222, 0x2D770000, 0x00000777, 0x70873333, 0xA7700000, 0x00000000, 0x0773333A, 0x77000000, 0x00000000, 0x07744449, 0x77000000, 0x00000000, 0x00774444, 0xA7700000, 0x00000787, 0x77077555, 0x5D770000, 0x000077D5, 0x57707755, 0x55D77000, 0x00077D66, 0x66977796, 0x66667700, 0x00078666, 0x666B7776, 0x66667700, 0x00077966, 0x6666DCD6, 0x66667700, 0x0000777D, 0x66666666, 0x66D77000, 0x00000777, 0xA6666666, 0x6A770000, 0x00000077, 0x7766666D, 0x77700000, 0x00000000, 0x77777777, 0x77000000, 0x00000000, 0x00777777, 0x00000000 - -dlabel D_802AA500_42B9F0 -.word 0xBDE0FEED, 0xFEE9FFAB, 0xCBD9E4DB, 0xFDDF288F, 0x294F498D, 0x62537B19, 0x93DFB4E5, 0xDE2FFFFF - -dlabel D_802AA520_42BA10 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x07777770, 0x00000000, 0x00000000, 0x77777777, 0x70000000, 0x00000007, 0x771111D7, 0x77000000, 0x00000007, 0x7D111111, 0x77700000, 0x00000077, 0xB1111111, 0xB7700000, 0x00000077, 0x11111111, 0x1B770000, 0x0000077D, 0x111E77D1, 0x11877000, 0x00007782, 0x222B7772, 0x22277000, 0x000077D2, 0x22E77072, 0x222B7700, 0x00077833, 0x33B78073, 0x33337700, 0x00077D33, 0x3E770073, 0x33337700, 0x00778444, 0x4B780074, 0x44447700, 0x0077D444, 0x47700074, 0x44447700, 0x00775555, 0x58780775, 0x55557700, 0x00775555, 0x558777B5, 0x555D7700, 0x0077D666, 0x66687B66, 0x66677000, 0x00077666, 0x66666666, 0x66777000, 0x00077766, 0x66666666, 0xD7770000, 0x00007776, 0x6666666D, 0x77700000, 0x00000777, 0x666666D7, 0x77000000, 0x00000077, 0x7D666D77, 0x70000000, 0x00000007, 0x77777777, 0x00000000, 0x00000000, 0x07777700, 0x00000000 - -dlabel D_802AA640_42BB30 -.word 0xBDE0FEED, 0xFEE9FFAB, 0xCBD9E4DB, 0xFDDF288F, 0x294F498D, 0x62537B19, 0x93DFB4E5, 0xDE2FFFFF - -dlabel D_802AA660_42BB50 -.word 0x000000BD, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEED00, 0x000DDE77, 0x77777777, 0x77777777, 0x777777C0, 0x0DEE78F8, 0xF8F8F8F8, 0xF8F8F8F8, 0xF8F87DB0, 0xE7FFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFEDCB0, 0xEEEEEEEE, 0x66666777, 0x8888FFFF, 0xFFDDCCB0, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEDDDCB0, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEDDCCB0, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEDDDCB0, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEDDCCB0, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEDDDCB0, 0xEEEEEEEE, 0xCCCEEEEE, 0xCCCEEEEE, 0xEEDDCCB0, 0xEEEEEEEE, 0xCAAEEEEE, 0xCAAEEEEE, 0xEEDDDCB0, 0xDEEEEEEE, 0xAAAEEEEE, 0xAAAEEEEE, 0xEEDDCCB0, 0xDEEEEEEE, 0xAAAEEEEE, 0xAAAEEEEE, 0xEEDDDCB0, 0xDEEEEEEE, 0xAAAEEEEE, 0xAAAEEEEE, 0xEEDDCCB0, 0xDEEEEEEE, 0xAAAEEEEE, 0xAAAEEEEE, 0xEEEDDCB0, 0xDEEEEEEE, 0xAAAEEEEE, 0xAAAEEEEE, 0xEEEDCCB0, 0xCEEEEEEE, 0xAAAEEEEE, 0xAAAEEEEE, 0xEEEDDCB0, 0xCEEEEEEE, 0xCCCEEEEE, 0xCCCEEEEE, 0xEEEDCCB0, 0xCEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDDCD0, 0xBEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDCCD0, 0xBEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDDCD0, 0xBEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDCCC0, 0xBDEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDDCB0, 0x0DEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDCC00, 0x0DEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDDC00, 0x0BEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDCC00, 0x0BEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDD000, 0x00BEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEDC000, 0x000BBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBB0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802AA860_42BD50 -.word 0xBDE0FFC1, 0xFFC1FFC1, 0xFFC1FFC1, 0x1AB122F3, 0x2B35FFC1, 0x005300D9, 0x016101A7, 0x0A2D3377 - -dlabel D_802AA880_42BD70 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x11111111, 0x10000000, 0x00000000, 0x00000000, 0x00001111, 0x11111111, 0x11100000, 0x00000000, 0x00000000, 0x0011118A, 0xDFFFFFDA, 0x81111000, 0x00000000, 0x00000000, 0x1112AFFF, 0xFFFFFFFF, 0xFFA21110, 0x00000000, 0x00000001, 0x11AFFFFF, 0xFFFFFFFF, 0xFFFFA111, 0x00000000, 0x00000011, 0x2DFFFFFF, 0xFFFFFFFF, 0xFFFFFD21, 0x10000000, 0x00000112, 0xDFFFFFFF, 0xDDCBCDDF, 0xFFFFFFD2, 0x11000000, 0x0000112D, 0xFFFFFFD7, 0x65555567, 0xDFFFFFFD, 0x21100000, 0x000011DF, 0xFFFFD955, 0x55555555, 0x59DFFFFF, 0xD1100000, 0x00011AFF, 0xFFFB6555, 0x55555555, 0x556BFFFF, 0xFA110000, 0x00012FFF, 0xFFB65555, 0x67999765, 0x5556BFFF, 0xFF210000, 0x0011AFFF, 0xFD655557, 0x9BCCCB97, 0x55556DFF, 0xFFA11000, 0x0011FFFF, 0xF955559B, 0xCCCCCCCB, 0x955559FF, 0xFFF11000, 0x0118FFFF, 0xD55559CC, 0xCCCCCCCC, 0xC95555DF, 0xFFF81100, 0x011AFFFF, 0x75557BCC, 0xCCCCCCCC, 0xCB75557F, 0xFFFA1100, 0x011DFFFD, 0x65569CCC, 0xCCCCCCCC, 0xCC96556D, 0xFFFD1100, 0x011FFFFD, 0x6557BCCC, 0xCCCCCCCC, 0xCCB7555D, 0xFFFF1100, 0x011FFFFC, 0x5559CCCC, 0xCCCCCCCC, 0xCCC9555C, 0xFFFF1100, 0x011FFFFB, 0x5559CCCC, 0xCCCCCCCC, 0xCCC9555B, 0xFFFF1100, 0x011FFFFC, 0x5559CCCC, 0xCCCCCCCC, 0xCCC9555C, 0xFFFF1100, 0x011FFFFD, 0x6557BCCC, 0xCCCCCCCC, 0xCCB7555D, 0xFFFF1100, 0x011DFFFD, 0x65569CCC, 0xCCCCCCCC, 0xCC96556D, 0xFFFD1100, 0x011AFFFF, 0x95557BCC, 0xCCCCCCCC, 0xCB75559F, 0xFFFA1100, 0x0118FFFF, 0xD55559CC, 0xCCCCCCCC, 0xC95555DF, 0xFFF81100, 0x0011FFFF, 0xF755559B, 0xCCCCCCCB, 0x955557FF, 0xFFF11000, 0x0011AFFF, 0xFD655557, 0x9BCCCB97, 0x55556DFF, 0xFFA11000, 0x00012FFF, 0xFFB65555, 0x67999765, 0x5556BFFF, 0xFF210000, 0x00011AFF, 0xFFFB6555, 0x55555555, 0x556BFFFF, 0xFA110000, 0x000011DF, 0xFFFFD955, 0x55555555, 0x59DFFFFF, 0xD1100000, 0x0000112D, 0xFFFFFFD7, 0x65555569, 0xDFFFFFFD, 0x21100000, 0x00000112, 0xDFFFFFFF, 0xDDCBCDDF, 0xFFFFFFD2, 0x11000000, 0x00000011, 0x2DFFFFFF, 0xFFFFFFFF, 0xFFFFFD21, 0x10000000, 0x00000001, 0x11AFFFFF, 0xFFFFFFFF, 0xFFFFA111, 0x00000000, 0x00000000, 0x1112AFFF, 0xFFFFFFFF, 0xFFA21110, 0x00000000, 0x00000000, 0x0011118A, 0xDFFFFFDA, 0x81111000, 0x00000000, 0x00000000, 0x00001111, 0x11111111, 0x11100000, 0x00000000, 0x00000000, 0x00000011, 0x11111111, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802AABA0_42C090 -.word 0x52924101, 0x6A41318D, 0x294BA941, 0xBA01C281, 0xA3C1CB81, 0xBC81E481, 0xFD01E5C1, 0x294BFE81 - -dlabel D_802AABC0_42C0B0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x22111122, 0x00000000, 0x00000000, 0x00000000, 0x00000211, 0x11111111, 0x11000000, 0x00000000, 0x00000000, 0x00001112, 0x7ACEDCA5, 0x21120000, 0x00000000, 0x00000000, 0x0001139C, 0xEFFFFFFE, 0xC7212000, 0x00000000, 0x00000000, 0x00115CDE, 0xFFFFFFFF, 0xEEA21200, 0x00000000, 0x00000000, 0x0115CCEF, 0xFFFFFFFF, 0xFEDA2100, 0x00000000, 0x00000000, 0x012CCDEF, 0xFFFFFFFF, 0xFFDC7110, 0x00000000, 0x00000011, 0x116CDEFF, 0xFFFFFFFF, 0xFFEDA212, 0x20000000, 0x00002112, 0x44ADEEFF, 0xFFFFFFFF, 0xFFEDC511, 0x11100000, 0x0002129C, 0xFEEEEFFF, 0xFFFFFFFF, 0xFFFEDB9A, 0x83110000, 0x00212CEF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFEEFF, 0xFD811000, 0x0011AEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFE81100, 0x0214EEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFEE5120, 0x0119EEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFEEB110, 0x011DEEEF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFEED210, 0x012CDEEE, 0xEFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEEEC210, 0x011BCDDE, 0xEEFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xEEDDC110, 0x0216CDDD, 0xEEEEEEFF, 0xFFFFFFFF, 0xFFFEEEEE, 0xEDCC6110, 0x00117BCD, 0xDEEEEEEF, 0xFFFFFFFF, 0xFEEEEEDD, 0xDCCA1100, 0x000117BC, 0xDDEEEEEE, 0xEFFFFFEE, 0xEEEEEEDD, 0xCCB31200, 0x000015BB, 0xCDDDDDEE, 0xEEEEEEEE, 0xEDDDDDDC, 0xC9211000, 0x000015BB, 0xCCCDDDDD, 0xEEEEEEEE, 0xDDDDDCCC, 0xC5110000, 0x000017BB, 0xBCCCCCCD, 0xDDDEEEED, 0xDDCCCCCC, 0xC7100000, 0x000016BB, 0xBBCCCCCC, 0xCDDDDDDD, 0xCCBBBCCC, 0xC7100000, 0x000014BB, 0xBBBBBBCC, 0xCCCCCCCC, 0xCBBBBBBB, 0xB5100000, 0x0000119B, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xB2100000, 0x0000212A, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0x61100000, 0x00000112, 0x69ABBBBB, 0xBBBBBBBB, 0xBBBBBA96, 0x11000000, 0x00000011, 0x11444ABB, 0xBBBBBBBB, 0xBB688741, 0x10000000, 0x00000000, 0x111114AB, 0xBBBBBBBB, 0xB9111111, 0x00000000, 0x00000000, 0x00021126, 0x9BBBBBB9, 0x72122000, 0x00000000, 0x00000000, 0x00001111, 0x14677631, 0x11200000, 0x00000000, 0x00000000, 0x00000011, 0x11111111, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x02222220, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802AAEE0_42C3D0 -.word 0x84202991, 0x31D34257, 0x4A995B1D, 0x635F73E3, 0x7C258CA9, 0x9D2BADAF, 0xBDF1CE75, 0xDEF7EF7B - -dlabel D_802AAF00_42C3F0 -.word 0x00000000, 0x00077777, 0x00000000, 0x00000000, 0x00777777, 0x70000000, 0x00000000, 0x07771111, 0x77000000, 0x00000000, 0x07711111, 0x17000000, 0x00000000, 0x77B11111, 0xC7000000, 0x00000000, 0x7911111C, 0x77000000, 0x00000007, 0x7D1111B7, 0x70000000, 0x00000077, 0xB1111B77, 0x70000000, 0x00000077, 0x22222227, 0x77000000, 0x0000077D, 0x22222222, 0x77000000, 0x00007793, 0x33373333, 0x77700000, 0x00007733, 0x33B77333, 0x78700000, 0x00077D44, 0xED777444, 0x77770000, 0x00079444, 0xD7777444, 0x44770000, 0x00775555, 0xC777B555, 0x55B77000, 0x00775555, 0x55555555, 0x55D77000, 0x0077D666, 0x66666666, 0x66677000, 0x00777D66, 0x66666669, 0x77777000, 0x00077777, 0x77766667, 0x77770000, 0x00000777, 0x77766667, 0x70000000, 0x00000000, 0x077666C7, 0x70000000, 0x00000000, 0x0776C977, 0x70000000, 0x00000000, 0x07777770, 0x00000000, 0x00000000, 0x00777000, 0x00000000 - -dlabel D_802AB020_42C510 -.word 0xBDE0FEED, 0xFEE9FFAB, 0xCBD9E4DB, 0xFDDF288F, 0x294F498D, 0x62537B19, 0x93DFB4E5, 0xDE2FFFFF - -dlabel D_802AB040_42C530 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802AA160_42B650, D_802AA280_42B770, 0x00000003, 0x00000000 - -dlabel D_802AB068_42C558 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802AA2A0_42B790, D_802AA3C0_42B8B0, 0x00000003, 0x00000000 - -dlabel D_802AB090_42C580 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802AA3E0_42B8D0, D_802AA500_42B9F0, 0x00000003, 0x00000000 - -dlabel D_802AB0B8_42C5A8 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802AA520_42BA10, D_802AA640_42BB30, 0x00000003, 0x00000000 - -dlabel D_802AB0E0_42C5D0 -.word 0x00000008, 0x00000005, 0x00000002, 0x00000004, 0x00000002, 0x0000003C, D_802AAF00_42C3F0, D_802AB020_42C510, 0x00000003, 0x00000000 - -dlabel D_802AB108_42C5F8 -.word 0x00000008, 0x00000005, 0x00000003, 0x00000004, 0x00000002, 0x0000003C, D_802AA660_42BB50, D_802AA860_42BD50, 0x00000003, 0x00000000 - -dlabel D_802AB130_42C620 -.word 0x00000008, 0x00000005, 0x00000013, 0x00000004, 0x00000002, 0x0000003C, D_802AA880_42BD70, D_802AABA0_42C090, 0x00000003, 0x00000000 - -dlabel D_802AB158_42C648 -.word 0x00000008, 0x00000005, 0x00000013, 0x00000004, 0x00000002, 0x0000003C, D_802AABC0_42C0B0, D_802AAEE0_42C3D0, 0x00000003, 0x00000000 - -dlabel D_802AB180_42C670 -.word D_802AB0B8_42C5A8 - -dlabel D_802AB184_42C674 -.word D_802AB040_42C530, D_802AB068_42C558, D_802AB090_42C580, D_802AB0E0_42C5D0, D_802AB0E0_42C5D0, D_802AB0E0_42C5D0, D_802AB0E0_42C5D0, D_802AB0E0_42C5D0, D_802AB0E0_42C5D0, 0x00000000, 0x00000000 - -dlabel jtbl_802AB1B0_42C6A0 -.word L802A94D0_42A9C0, L802A9628_42AB18, L802AA000_42B4F0, L802AA000_42B4F0, L802AA000_42B4F0, L802AA000_42B4F0, L802AA000_42B4F0, L802AA000_42B4F0, L802AA000_42B4F0, L802AA000_42B4F0, L802A9798_42AC88, L802A97E4_42ACD4, L802A98A8_42AD98, L802A9B04_42AFF4, L802A9D7C_42B26C, L802AA000_42B4F0, L802A9F8C_42B47C, L802A9FE0_42B4D0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/42CEB0.data.s b/ver/us/asm/data/battle/action_cmd/42CEB0.data.s deleted file mode 100644 index 0a54cebf9d..0000000000 --- a/ver/us/asm/data/battle/action_cmd/42CEB0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A97C0_42CEB0 -.word HudScript_PressAButton, HudScript_PressBButton, HudScript_PressCDownButton - -dlabel D_802A97CC_42CEBC -.word HudScript_AButtonDown, 0x80292348, 0x8029265C, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/action_cmd/42D9B0.data.s b/ver/us/asm/data/battle/action_cmd/42D9B0.data.s deleted file mode 100644 index 43bed3b8ac..0000000000 --- a/ver/us/asm/data/battle/action_cmd/42D9B0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9AA0_42D9B0 -.short 0x0000 - -dlabel D_802A9AA2_42D9B2 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 diff --git a/ver/us/asm/data/battle/action_cmd/42F680.data.s b/ver/us/asm/data/battle/action_cmd/42F680.data.s deleted file mode 100644 index a810e7f415..0000000000 --- a/ver/us/asm/data/battle/action_cmd/42F680.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9860_42F680 -.short 0x0000 - -dlabel D_802A9862_42F682 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - -dlabel jtbl_802A9880_42F6A0 -.word L802A929C_42F0BC, L802A92F8_42F118, L802A9724_42F544, L802A9724_42F544, L802A9724_42F544, L802A9724_42F544, L802A9724_42F544, L802A9724_42F544, L802A9724_42F544, L802A9724_42F544, L802A9368_42F188, L802A93D0_42F1F0, L802A9704_42F524, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/42FFC0.data.s b/ver/us/asm/data/battle/action_cmd/42FFC0.data.s deleted file mode 100644 index 94c9a60852..0000000000 --- a/ver/us/asm/data/battle/action_cmd/42FFC0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A98E0_42FFC0 -.short 0x0000 - -dlabel D_802A98E2_42FFC2 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - -dlabel jtbl_802A9900_42FFE0 -.word L802A92E8_42F9C8, L802A9368_42FA48, L802A9794_42FE74, L802A9794_42FE74, L802A9794_42FE74, L802A9794_42FE74, L802A9794_42FE74, L802A9794_42FE74, L802A9794_42FE74, L802A9794_42FE74, L802A93F0_42FAD0, L802A9450_42FB30, L802A9750_42FE30, 0, 0, 0 diff --git a/ver/us/asm/data/battle/action_cmd/430940.data.s b/ver/us/asm/data/battle/action_cmd/430940.data.s deleted file mode 100644 index e7f9736441..0000000000 --- a/ver/us/asm/data/battle/action_cmd/430940.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802A9920_430940 -.short 0x0000 - -dlabel D_802A9922_430942 -.short 0x0000, 0x0000, 0x0019, 0x0000, 0x0032, 0x0000, 0x004B, 0x0000, 0x004B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 - -dlabel jtbl_802A9940_430960 -.word L802A92E0_430300, L802A933C_43035C, L802A97E4_430804, L802A97E4_430804, L802A97E4_430804, L802A97E4_430804, L802A97E4_430804, L802A97E4_430804, L802A97E4_430804, L802A97E4_430804, L802A9394_4303B4, L802A93FC_43041C, L802A97A0_4307C0, 0, 0, 0 diff --git a/ver/us/asm/data/battle/area_kpa2/6A44E0.data.s b/ver/us/asm/data/battle/area_kpa2/6A44E0.data.s index d6b5ce447b..31958a0475 100644 --- a/ver/us/asm/data/battle/area_kpa2/6A44E0.data.s +++ b/ver/us/asm/data/battle/area_kpa2/6A44E0.data.s @@ -517,162 +517,3 @@ dlabel D_80234670_6BB870 dlabel D_8023468C_6BB88C .word D_8022D678_6B4878, D_80234610_6BB810, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80234968_6BBB68, 0x00000001, D_8023461C_6BB81C, D_80234274_6BB474, 0x00000000, D_80234950_6BBB50, 0x00000001, D_80234638_6BB838, D_802342E0_6BB4E0, 0x00000000, D_80234938_6BBB38, 0x00000001, D_80234654_6BB854, D_802342E0_6BB4E0, 0x00000000, D_80234920_6BBB20, 0x00000001, D_80234670_6BB870, D_802345E8_6BB7E8, 0x00000000, D_80234908_6BBB08, 0x00000001, D_8023468C_6BB88C, D_802345E8_6BB7E8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80234980_6BBB80, D_80234274_6BB474, D_80234978_6BBB78, D_802342E0_6BB4E0, D_80234970_6BBB70, D_802345E8_6BB7E8, 0x00000000, 0x00000000 - -dlabel D_80234740_6BB940 -.double 0.4 - -dlabel D_80234748_6BB948 -.double 2.4000000953674316 - -dlabel D_80234750_6BB950 -.double 1.600000023841858 - -dlabel D_80234758_6BB958 -.double 1.2000000000000002 - -dlabel D_80234760_6BB960 -.double 0.9600000381469727 - -dlabel D_80234768_6BB968 -.double 0.4 - -dlabel D_80234770_6BB970 -.double 0.6400000095367432, 0.0 - -dlabel D_80234780_6BB980 -.double 0.4 - -dlabel D_80234788_6BB988 -.double 2.4000000953674316 - -dlabel D_80234790_6BB990 -.double 1.600000023841858 - -dlabel D_80234798_6BB998 -.double 1.2000000000000002 - -dlabel D_802347A0_6BB9A0 -.double 0.9600000381469727 - -dlabel D_802347A8_6BB9A8 -.double 0.4 - -dlabel D_802347B0_6BB9B0 -.double 0.6400000095367432, 0.0 - -dlabel D_802347C0_6BB9C0 -.double 0.4 - -dlabel D_802347C8_6BB9C8 -.double 90.0 - -dlabel D_802347D0_6BB9D0 -.double 3.6000001430511475 - -dlabel D_802347D8_6BB9D8 -.double 2.400000035762787 - -dlabel D_802347E0_6BB9E0 -.double 1.8 - -dlabel D_802347E8_6BB9E8 -.double 1.440000057220459 - -dlabel D_802347F0_6BB9F0 -.double 0.6000000000000001 - -dlabel D_802347F8_6BB9F8 -.double 0.9600000143051148 - -dlabel D_80234800_6BBA00 -.double 0.3, 0.0 - -dlabel D_80234810_6BBA10 -.word 0x0000005A, 0x00000087, 0x000000E1, 0x0000010E, 0x0000013B, 0x00000195 - -dlabel D_80234828_6BBA28 -.double 14.4 - -dlabel D_80234830_6BBA30 -.double 0.4 - -dlabel D_80234838_6BBA38 -.double 90.0 - -dlabel D_80234840_6BBA40 -.double 3.6000001430511475 - -dlabel D_80234848_6BBA48 -.double 2.400000035762787 - -dlabel D_80234850_6BBA50 -.double 1.8 - -dlabel D_80234858_6BBA58 -.double 1.440000057220459 - -dlabel D_80234860_6BBA60 -.double 0.6000000000000001 - -dlabel D_80234868_6BBA68 -.double 0.9600000143051148 - -dlabel D_80234870_6BBA70 -.double 0.3, 0.0 - -dlabel D_80234880_6BBA80 -.word 0x6B70615F, 0x62743031, 0x5F686974, 0x00000000 - -dlabel D_80234890_6BBA90 -.word 0x6B70615F, 0x62743031, 0x5F736861, 0x70650000 - -dlabel D_802348A0_6BBAA0 -.word 0x6B70615F, 0x74657800 - -dlabel D_802348A8_6BBAA8 -.word 0x6B70615F, 0x62670000 - -dlabel D_802348B0_6BBAB0 -.word 0x6B6B6A5F, 0x62743031, 0x5F686974, 0x00000000 - -dlabel D_802348C0_6BBAC0 -.word 0x6B6B6A5F, 0x62743031, 0x5F736861, 0x70650000 - -dlabel D_802348D0_6BBAD0 -.word 0x6B6B6A5F, 0x74657800 - -dlabel D_802348D8_6BBAD8 -.word 0x6B70615F, 0x62670000 - -dlabel D_802348E0_6BBAE0 -.word 0x6B6B6A5F, 0x62743032, 0x5F686974, 0x00000000 - -dlabel D_802348F0_6BBAF0 -.word 0x6B6B6A5F, 0x62743032, 0x5F736861, 0x70650000 - -dlabel D_80234900_6BBB00 -.word 0x6B6B6A5F, 0x74657800 - -dlabel D_80234908_6BBB08 -.word 0x834E8362, 0x83702883, 0x89835883, 0x67836F83, 0x67838B82, 0x52290000 - -dlabel D_80234920_6BBB20 -.word 0x834E8362, 0x83702883, 0x89835883, 0x67836F83, 0x67838B82, 0x51290000 - -dlabel D_80234938_6BBB38 -.word 0x834E8362, 0x83702883, 0x89835883, 0x67836F83, 0x67838B82, 0x50290000 - -dlabel D_80234950_6BBB50 -.word 0x834E8362, 0x83702883, 0x49815B83, 0x76836A83, 0x93834F29, 0x00000000 - -dlabel D_80234968_6BBB68 -.word 0x834E8362, 0x83700000 - -dlabel D_80234970_6BBB70 -.word 0x6B70615F, 0x30330000 - -dlabel D_80234978_6BBB78 -.word 0x6B70615F, 0x30320000 - -dlabel D_80234980_6BBB80 -.word 0x6B70615F, 0x30310000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/battle/area_tik2/60ABD0.data.s b/ver/us/asm/data/battle/area_tik2/60ABD0.data.s index f9fe9d6788..b040ccd582 100644 --- a/ver/us/asm/data/battle/area_tik2/60ABD0.data.s +++ b/ver/us/asm/data/battle/area_tik2/60ABD0.data.s @@ -48,7 +48,7 @@ dlabel D_8021B204_60BCB4 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C80, 0x00000011, 0x00000002, 0xFE363C80, 0x00080000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000005F, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000190, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000082, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000048, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000154, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000082, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000046, 0x00000001, D_8021A120_60ABD0, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DD, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000024, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000D, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A8080, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000C, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000008, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8021A5FC_60B0AC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000010, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000D, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A8080, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000003, GetStatusFlags, 0x00000000, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x00100000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500004, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7F4D, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8021A5FC_60B0AC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021B8D0_60C380 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000055, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x0000015E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7C80, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500003, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7B4D, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000028, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DE, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000028, 0x00000002, 0xFE363C85, 0x00000003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_80218058_608B08, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021A5FC_60B0AC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000002, func_80269EAC, 0x0000001A, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021A5FC_60B0AC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000055, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x0000015E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000032, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7C80, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500003, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7B4D, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000028, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DE, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000028, 0x00000002, 0xFE363C85, 0x00000003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, b_area_tik2_UnkWaterFountainFunc, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021A5FC_60B0AC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000002, func_80269EAC, 0x0000001A, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000000, 0x00000003, 0x00000020, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021A5FC_60B0AC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_8021C070_60CB20 .word 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7BD2, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7BD2, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7BD2, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0xFE363C83, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C84, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7BD2, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7BD2, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C86, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7BD2, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0xFE363C83, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0xFE363C83, 0xFFFFFFFE, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -108,7 +108,7 @@ dlabel D_8021DE18_60E8C8 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C80, 0x00000011, 0x00000002, 0xFE363C80, 0x00080000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000070, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000001F4, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000082, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000052, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000181, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000082, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000046, 0x00000001, D_8021C070_60CB20, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x00000020, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000024, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000D, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A8080, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000C, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000008, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8021C54C_60CFFC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000010, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000D, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A8080, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000020, 0x00000008, 0x00000000, 0x00000006, 0x00000020, 0x0000000B, 0x00000002, 0xFE363C8F, 0x00000007, 0x00000046, 0x00000001, D_8021EE44_60F8F4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000003, GetStatusFlags, 0x00000000, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x00100000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500004, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7F4D, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8021C54C_60CFFC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021E4F4_60EFA4 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000055, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x0000015E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000050, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7C80, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500003, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7B4D, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000028, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DE, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000028, 0x00000002, 0xFE363C85, 0x00000003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_802184E4_608F94, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021C54C_60CFFC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000002, func_80269EAC, 0x0000001A, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000000, 0x00000004, 0x00000020, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021C54C_60CFFC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000055, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000013, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, SetBattleCamTarget, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetBattleCamZoom, 0x0000015E, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000050, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7C80, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500003, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7B4D, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000A, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000028, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DE, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x0000001C, 0x00000028, 0x00000002, 0xFE363C85, 0x00000003, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, dup_b_area_tik2_UnkWaterFountainFunc, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021C54C_60CFFC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000002, func_80269EAC, 0x0000001A, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000000, 0x00000004, 0x00000020, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021C54C_60CFFC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8021EC88_60F738 .word 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000001, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C83, 0x00000011, 0x00000002, 0xFE363C83, 0x00080000, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A80E7, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000012, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7D10, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000057, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C8F, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x0000035C, 0x00000043, 0x00000004, SetPartEventFlags, 0xFFFFFF81, 0x00000002, 0x00400080, 0x00000043, 0x00000004, func_8026ED20, 0xFFFFFF81, 0x00000001, 0x00000001, 0x00000043, 0x00000004, func_8026EA7C, 0xFFFFFF81, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetStatusTable, 0xFFFFFF81, D_8021C710_60D1C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -165,7 +165,7 @@ dlabel D_802203FC_610EAC .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000046, 0x00000001, D_8021EF60_60FA10, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DD, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000024, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000D, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A8080, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000C, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000008, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8021F43C_60FEEC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000010, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000D, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A8080, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000020, 0x00000043, 0x00000003, GetStatusFlags, 0x00000000, 0xFE363C80, 0x00000010, 0x00000002, 0xFE363C80, 0x00100000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500004, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7F4D, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8021F43C_60FEEC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8022096C_61141C -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000055, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7C80, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500003, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7B4D, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000028, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DE, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, func_80218884_609334, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021F43C_60FEEC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000002, func_80269EAC, 0x0000001A, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000000, 0x00000005, 0x00000020, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021F43C_60FEEC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000055, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000D, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C88, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7C80, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7C80, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7BB4, 0x00000043, 0x00000003, FallToGoal, 0xFFFFFF81, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DC, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8680, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x0000000F, 0xFFFFFFFE, 0x00000005, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500003, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7B4D, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000028, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003DE, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, dup2_b_area_tik2_UnkWaterFountainFunc, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8F, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8F, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021F43C_60FEEC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000002, func_80269EAC, 0x0000001A, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C8F, 0x10000000, 0x00000000, 0x00000000, 0x00000005, 0x00000020, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8021F43C_60FEEC, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80221068_611B18 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000007, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000032, 0x00000043, 0x00000002, SetBattleCamZoom, 0x0000014A, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003E6, 0x00000043, 0x00000001, dup_b_area_tik2_FadeBackgroundToBlack, 0x00000043, 0x00000003, dup2_b_area_tik2_StartRumbleWithParams, 0x00000032, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7BB4, 0x00000057, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000007, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000041, 0x00000043, 0x00000002, SetBattleCamZoom, 0x000000F0, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000F, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500009, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, dup2_b_area_tik2_StartRumbleWithParams, 0x00000064, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7C1A, 0x00000057, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000007, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x00000050, 0x00000043, 0x00000002, SetBattleCamZoom, 0x00000096, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000F, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, dup2_b_area_tik2_StartRumbleWithParams, 0x00000096, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000007, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000002, SetBattleCamOffsetZ, 0x0000005F, 0x00000043, 0x00000002, SetBattleCamZoom, 0x0000003C, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000000F, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000002, MoveBattleCamOver, 0x00000014, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00500003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ActorExists, 0x00000201, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003D9, 0x00000043, 0x00000003, SummonEnemy, D_80221EFC_6129AC, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ActorExists, 0x00000202, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000003D9, 0x00000043, 0x00000003, SummonEnemy, D_80221F18_6129C8, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x0050000C, 0x00000043, 0x00000001, dup_b_area_tik2_UnfadeBackgroundToBlack, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0xFFFFFFFF, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/effects/363890.data.s b/ver/us/asm/data/effects/363890.data.s deleted file mode 100644 index a1f61c02fe..0000000000 --- a/ver/us/asm/data/effects/363890.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_E0060730 -.word 0x090009E8, 0x09000A10 - -dlabel D_E0060738 -.word 0x09000900, 0x09000900 - -dlabel D_E0060740 -.double 0.3 - -dlabel D_E0060748 -.double 0.8 - -dlabel D_E0060750 -.double 0.2 - -dlabel D_E0060758 -.double 0.92 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s b/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s index e92e7928d8..09c368b001 100644 --- a/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s +++ b/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s @@ -2,29 +2,29 @@ .section .data -dlabel D_80245950_B25E90 +dlabel jan_00_unkAngle1 .word 0x00000000 -dlabel D_80245954_B25E94 +dlabel jan_00_unkAngle2 .word 0xFFFFFFFF -dlabel D_80245958_B25E98 +dlabel jan_00_unkAngle3 .word 0xFFFFFFFF dlabel D_8024595C_B25E9C -.word 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802459D4_B25F14 -.word 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245C10_B26150 -.word 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245E5C_B2639C .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245E6C_B263AC -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8C, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, func_80241868_B21DA8, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8C, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, func_80241868_B21DA8, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245F6C_B264AC .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -33,16 +33,16 @@ dlabel D_80245F7C_B264BC .word 0x0000000F, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802460A4_B265E4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024620C_B2674C -.word 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024634C_B2688C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802464B4_B269F4 -.word 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024652C_B26A6C -.word 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, func_802416F8_B21C38, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000056, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_802415B0_B21AF0, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000056, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x00000055, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, func_80241654_B21B94, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000055, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, func_802411EC_B2172C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000037, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000024, 0x00000002, 0xFE363C8D, D_80245C10_B26150, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_8024595C_B25E9C, 0x00000016, 0x00000001, 0x00B60002, 0x00000024, 0x00000002, 0xFE363C8D, D_802459D4_B25F14, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_802464B4_B269F4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_8024652C_B26A6C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80245E5C_B2639C, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_802460A4_B265E4, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_8024620C_B2674C, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_8024634C_B2688C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80245E6C_B263AC, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_80245F6C_B264AC, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_80245F7C_B264BC, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000056, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, jan_00_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000056, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x00000055, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, jan_00_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000055, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, jan_00_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000037, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000024, 0x00000002, 0xFE363C8D, D_80245C10_B26150, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_8024595C_B25E9C, 0x00000016, 0x00000001, 0x00B60002, 0x00000024, 0x00000002, 0xFE363C8D, D_802459D4_B25F14, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_802464B4_B269F4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_8024652C_B26A6C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80245E5C_B2639C, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_802460A4_B265E4, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_8024620C_B2674C, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_8024634C_B2688C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80245E6C_B263AC, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_80245F6C_B264AC, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_80245F7C_B264BC, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s index f79f7d28a9..acad759a40 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s @@ -261,7 +261,7 @@ dlabel D_8024D134_8BD1A4 .word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024CDAC_8BCE1C, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024CE80_8BCEF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024D16C_8BD1DC -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80242860_8B28D0, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_02_UnkNpcPosFunc, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024D2E8_8BD358 .word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s b/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s index 4e393acfad..c91b8587f6 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_11/8DE400.data.s @@ -36,7 +36,7 @@ dlabel D_80244CF4_8DEDF4 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF94, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244D2C_8DEE2C -.word 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240DDC_8DAEDC, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_11_UnkNpcPosFunc, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244F4C_8DF04C .word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_mac/mac_05/856650.data.s b/ver/us/asm/data/world/area_mac/mac_05/856650.data.s index b8fa1cbc52..71a9be522b 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/856650.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/856650.data.s @@ -6,7 +6,7 @@ dlabel D_802444E0_856650 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024457C_8566EC -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_8024030C_85247C, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000063, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, dup_mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000063, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244648_8567B8 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000258, 0xFFFFFF10, 0x00000140, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFE363C80, 0xFFFFFFE7, 0xFFFFFFB5, 0x00000043, 0x00000006, RotateModel, 0x00000061, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF10, 0x00000258, 0x00000140, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFE363C80, 0xFFFFFFE7, 0xFFFFFFB5, 0x00000043, 0x00000006, RotateModel, 0x00000061, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s b/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s index 0ae353f50a..21406cbc00 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/862BC0.data.s @@ -2,29 +2,29 @@ .section .data -dlabel D_80250A50_862BC0 +dlabel mac_05_unkAngle1 .word 0x00000000 -dlabel D_80250A54_862BC4 +dlabel mac_05_unkAngle2 .word 0xFFFFFFFF -dlabel D_80250A58_862BC8 +dlabel mac_05_unkAngle3 .word 0xFFFFFFFF dlabel D_80250A5C_862BCC -.word 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80250AD4_862C44 -.word 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000010, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000010, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80250D58_862EC8 -.word 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80250FA4_863114 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80250FB4_863124 -.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_80243AB8_855C28, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_05_PlayFX3D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, func_80243AB8_855C28, 0x00000043, 0x00000005, func_80243CD4_855E44, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_05_PlayFX3D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, mac_05_UnkPlayerPosFunc, 0x00000043, 0x00000005, func_80243CD4_855E44, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8025110C_86327C .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -33,16 +33,16 @@ dlabel D_8025111C_86328C .word 0x0000000F, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80251244_8633B4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802513AC_86351C -.word 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802514EC_86365C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80251654_8637C4 -.word 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802516CC_86383C -.word 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, func_80243948_855AB8, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80243800_855970, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000005B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, func_802438A4_855A14, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005B, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, func_8024343C_8555AC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, func_80243D78_855EE8, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250D58_862EC8, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250A5C_862BCC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250AD4_862C44, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_80251654_8637C4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_802516CC_86383C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FA4_863114, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_80251244_8633B4, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_802513AC_86351C, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802514EC_86365C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FB4_863124, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_8025110C_86327C, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_8025111C_86328C, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, mac_05_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, mac_05_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000005B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, mac_05_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000005B, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, mac_05_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000005D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000054, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000005D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, func_80243D78_855EE8, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250D58_862EC8, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250A5C_862BCC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80250AD4_862C44, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_80251654_8637C4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_802516CC_86383C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FA4_863114, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_80251244_8633B4, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_802513AC_86351C, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802514EC_86365C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80250FB4_863124, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_8025110C_86327C, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_8025111C_86328C, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s b/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s index d5632fe30e..0688d604d5 100644 --- a/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s @@ -9,7 +9,7 @@ dlabel D_802416E0_866220 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024177C_8662BC -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_8024030C_864E4C, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x00000014, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, dup_mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x00000014, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241848_866388 .word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000001, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802448D8, 0x00000044, 0x00000001, 0x80243AEC, 0x00000044, 0x00000001, 0x80242A14, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000081, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000002, 0x00000044, 0x00000001, D_8024177C_8662BC, 0x00000043, 0x00000003, SetTexPanner, 0x00000013, 0x00000001, 0x00000043, 0x00000001, mac_06_SpawnSunEffect, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000190, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416E0_866220, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF6A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416E0_866220, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_06/8666A0.data.s b/ver/us/asm/data/world/area_mac/mac_06/8666A0.data.s index a0cc7edfa5..932e679245 100644 --- a/ver/us/asm/data/world/area_mac/mac_06/8666A0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_06/8666A0.data.s @@ -2,29 +2,29 @@ .section .data -dlabel D_80241B60_8666A0 +dlabel mac_06_unkAngle1 .word 0x00000000 -dlabel D_80241B64_8666A4 +dlabel mac_06_unkAngle2 .word 0xFFFFFFFF -dlabel D_80241B68_8666A8 +dlabel mac_06_unkAngle3 .word 0xFFFFFFFF dlabel D_80241B6C_8666AC -.word 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241BE4_866724 -.word 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E20_866960 -.word 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024206C_866BAC .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024207C_866BBC -.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_80240B88_8656C8, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_06_PlayFX3D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, func_80240B88_8656C8, 0x00000043, 0x00000005, func_80240DA4_8658E4, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000019, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, mac_06_UnkPlayerPosFunc, 0x00000043, 0x00000006, PlaySoundAt, 0x8000004F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, mac_06_PlayFX3D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C83, 0x00000043, 0x00000001, mac_06_UnkPlayerPosFunc, 0x00000043, 0x00000005, func_80240DA4_8658E4, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000019, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802421D4_866D14 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -33,16 +33,16 @@ dlabel D_802421E4_866D24 .word 0x0000000F, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024230C_866E4C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242474_866FB4 -.word 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802425B4_8670F4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024271C_86725C -.word 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242794_8672D4 -.word 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, func_80240A18_865558, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000000A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_802408D0_865410, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000000A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000000B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, func_80240974_8654B4, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000000B, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, func_8024050C_86504C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, func_80240E48_865988, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241E20_866960, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241B6C_8666AC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241BE4_866724, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_8024271C_86725C, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_80242794_8672D4, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_8024206C_866BAC, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_8024230C_866E4C, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_80242474_866FB4, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802425B4_8670F4, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_8024207C_866BBC, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_802421D4_866D14, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_802421E4_866D24, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, mac_06_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x0000000A, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, mac_06_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000000A, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x0000000B, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, mac_06_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000000B, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, mac_06_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000000E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000002, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000008, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000006, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000000D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000008, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000006, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000004, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000000D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00B60009, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000443, 0x00000043, 0x00000002, func_802D62E4, 0x00000043, 0x00000043, 0x00000002, func_80240E48_865988, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002037, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241E20_866960, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241B6C_8666AC, 0x00000016, 0x00000001, 0x00B60002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002036, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, D_80241BE4_866724, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_8024271C_86725C, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_80242794_8672D4, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_8024206C_866BAC, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_8024230C_866E4C, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_80242474_866FB4, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_802425B4_8670F4, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_8024207C_866BBC, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_802421D4_866D14, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_802421E4_866D24, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_02/BC3720.data.s b/ver/us/asm/data/world/area_obk/obk_02/BC3720.data.s index 958be273cb..6df695bd88 100644 --- a/ver/us/asm/data/world/area_obk/obk_02/BC3720.data.s +++ b/ver/us/asm/data/world/area_obk/obk_02/BC3720.data.s @@ -9,7 +9,7 @@ dlabel D_80240CBC_BC374C .short 0x0032, 0x003C, 0x00C8, 0x00F0 dlabel D_80240CC4_BC3754 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, func_80240000_BC2A90, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_8024000C_BC2A9C, 0x00000043, 0x00000001, func_80240194_BC2C24, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcRenderMode, 0xFFFFFFFF, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, func_80240000_BC2A90, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, obk_02_UnkAngleFunc004, 0x00000043, 0x00000001, func_80240194_BC2C24, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcRenderMode, 0xFFFFFFFF, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D70_BC3800 .word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80240CC4_BC3754, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_07/BD14F0.data.s b/ver/us/asm/data/world/area_obk/obk_07/BD14F0.data.s index 20a5cf64d3..58b1fe80dc 100644 --- a/ver/us/asm/data/world/area_obk/obk_07/BD14F0.data.s +++ b/ver/us/asm/data/world/area_obk/obk_07/BD14F0.data.s @@ -9,7 +9,7 @@ dlabel D_8024292C_BD151C .short 0x0032, 0x003C, 0x00C8, 0x00F0 dlabel D_80242934_BD1524 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, func_802402C0_BCEEB0, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802402CC_BCEEBC, 0x00000043, 0x00000001, func_80240454_BCF044, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcRenderMode, 0xFFFFFFFF, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, func_802402C0_BCEEB0, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, obk_07_UnkAngleFunc004, 0x00000043, 0x00000001, func_80240454_BCF044, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcRenderMode, 0xFFFFFFFF, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802429E0_BD15D0 .word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242934_BD1524, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s index 39c340c4cf..e7ada5b748 100644 --- a/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_04/DAF3E0.data.s @@ -144,7 +144,7 @@ dlabel D_80243E88_DB1288 .word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80243E60_DB1260, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C85, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000014, 0x00000001, 0xFE363C86, 0x00000018, 0x00000001, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000019, 0x00000001, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244000_DB1400 -.word 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241E40_DAF240, 0xFAA2B58A, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, omo_04_UnkNpcPosFunc, 0xFAA2B58A, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024418C_DB158C .word 0x44480000, 0x430C0000, 0xC1A00000, 0x44834000, 0x42F00000, 0xC28C0000, 0x448FC000, 0x42BE0000, 0xC2C80000, 0x44960000, 0x429A0000, 0xC1F00000, 0x448FC000, 0x42780000, 0x42AA0000, 0x44834000, 0x42480000, 0x43020000, 0x44480000, 0x42200000, 0x42480000, 0x447A0000, 0x41A00000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_07/DC3730.data.s b/ver/us/asm/data/world/area_omo/omo_07/DC3730.data.s index 57b17466de..cc4a16577b 100644 --- a/ver/us/asm/data/world/area_omo/omo_07/DC3730.data.s +++ b/ver/us/asm/data/world/area_omo/omo_07/DC3730.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80246480_DC3730 -.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80246480_DC3730, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C85, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243220_DC04D0, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF4, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E84, 0xF5DE0259, 0x00000014, 0x00000001, 0xF70F2E84, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000006, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000082, 0x00000023, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000003E8, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000007, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000424, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000424, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000027, 0x00000002, 0xFE363C81, 0x00000026, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000043, 0x00000006, PlaySoundAt, 0x00002098, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000F, 0x00000003, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F8A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFD050F8A, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFD050F8A, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80247110, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80246480_DC3730, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C85, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, omo_07_UnkNpcPosFunc, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405FF4, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E84, 0xF5DE0259, 0x00000014, 0x00000001, 0xF70F2E84, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000006, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000082, 0x00000023, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000003E8, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000007, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000424, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000424, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000027, 0x00000002, 0xFE363C81, 0x00000026, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000043, 0x00000006, PlaySoundAt, 0x00002098, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000F, 0x00000003, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F8A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFD050F8A, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFD050F8A, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80247110, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD6BB0.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD6BB0.data.s index 7ffac0b498..c476ed67ef 100644 --- a/ver/us/asm/data/world/area_omo/omo_09/DD6BB0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_09/DD6BB0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80249EE0_DD6BB0 -.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80249EE0_DD6BB0, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C85, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243610_DD02E0, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFA, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E84, 0xF5DE025A, 0x00000014, 0x00000001, 0xF70F2E84, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000006, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F8A, 0x0000009B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x0000071C, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000007, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000076C, 0x00000096, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000076C, 0x00000096, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000027, 0x00000002, 0xFE363C81, 0x00000026, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000043, 0x00000006, PlaySoundAt, 0x00002098, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0x00000096, 0x00000000, 0x00000001, 0x0000000F, 0x00000003, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0xFE363C80, 0x00000096, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F8A, 0xFE363C80, 0x00000096, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFD050F8A, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFD050F8A, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024ACD0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80249EE0_DD6BB0, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C85, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, omo_09_UnkNpcPosFunc, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405FFA, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E84, 0xF5DE025A, 0x00000014, 0x00000001, 0xF70F2E84, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000006, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F8A, 0x0000009B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x0000071C, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000007, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000076C, 0x00000096, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000076C, 0x00000096, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000027, 0x00000002, 0xFE363C81, 0x00000026, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7E80, 0x0000004B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000004B, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000043, 0x00000006, PlaySoundAt, 0x00002098, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0x00000096, 0x00000000, 0x00000001, 0x0000000F, 0x00000003, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFD050F8A, 0xFE363C80, 0x00000096, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F8A, 0xFE363C80, 0x00000096, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xF70F2E84, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFD050F8A, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFD050F8A, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024ACD0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/16F740/btl_merlee_on_first_strike.s b/ver/us/asm/nonmatchings/16F740/btl_merlee_on_first_strike.s deleted file mode 100644 index 67b69ac08b..0000000000 --- a/ver/us/asm/nonmatchings/16F740/btl_merlee_on_first_strike.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_merlee_on_first_strike -/* 16F8BC 80240FDC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 16F8C0 80240FE0 AFB40020 */ sw $s4, 0x20($sp) -/* 16F8C4 80240FE4 3C14800E */ lui $s4, %hi(gBattleStatus) -/* 16F8C8 80240FE8 2694C070 */ addiu $s4, $s4, %lo(gBattleStatus) -/* 16F8CC 80240FEC AFB3001C */ sw $s3, 0x1c($sp) -/* 16F8D0 80240FF0 3C13800B */ lui $s3, %hi(gCurrentEncounter) -/* 16F8D4 80240FF4 26730F10 */ addiu $s3, $s3, %lo(gCurrentEncounter) -/* 16F8D8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* 16F8DC 80240FFC 3C108011 */ lui $s0, %hi(gPlayerData) -/* 16F8E0 80241000 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 16F8E4 80241004 AFBF0024 */ sw $ra, 0x24($sp) -/* 16F8E8 80241008 AFB20018 */ sw $s2, 0x18($sp) -/* 16F8EC 8024100C AFB10014 */ sw $s1, 0x14($sp) -/* 16F8F0 80241010 8E820004 */ lw $v0, 4($s4) -/* 16F8F4 80241014 30420040 */ andi $v0, $v0, 0x40 -/* 16F8F8 80241018 14400055 */ bnez $v0, .L80241170 -/* 16F8FC 8024101C 24110003 */ addiu $s1, $zero, 3 -/* 16F900 80241020 8282008A */ lb $v0, 0x8a($s4) -/* 16F904 80241024 10510052 */ beq $v0, $s1, .L80241170 -/* 16F908 80241028 24120004 */ addiu $s2, $zero, 4 -/* 16F90C 8024102C 10520050 */ beq $v0, $s2, .L80241170 -/* 16F910 80241030 00000000 */ nop -/* 16F914 80241034 8202028A */ lb $v0, 0x28a($s0) -/* 16F918 80241038 1840004D */ blez $v0, .L80241170 -/* 16F91C 8024103C 00000000 */ nop -/* 16F920 80241040 8602028C */ lh $v0, 0x28c($s0) -/* 16F924 80241044 1C400039 */ bgtz $v0, .L8024112C -/* 16F928 80241048 00000000 */ nop -/* 16F92C 8024104C 0C00A67F */ jal rand_int -/* 16F930 80241050 24040064 */ addiu $a0, $zero, 0x64 -/* 16F934 80241054 8E63008C */ lw $v1, 0x8c($s3) -/* 16F938 80241058 10600018 */ beqz $v1, .L802410BC -/* 16F93C 8024105C 0040202D */ daddu $a0, $v0, $zero -/* 16F940 80241060 8C620000 */ lw $v0, ($v1) -/* 16F944 80241064 3C030004 */ lui $v1, 4 -/* 16F948 80241068 00431024 */ and $v0, $v0, $v1 -/* 16F94C 8024106C 10400008 */ beqz $v0, .L80241090 -/* 16F950 80241070 2882002E */ slti $v0, $a0, 0x2e -/* 16F954 80241074 14400014 */ bnez $v0, .L802410C8 -/* 16F958 80241078 24020001 */ addiu $v0, $zero, 1 -/* 16F95C 8024107C 2882005B */ slti $v0, $a0, 0x5b -/* 16F960 80241080 14400016 */ bnez $v0, .L802410DC -/* 16F964 80241084 24020002 */ addiu $v0, $zero, 2 -/* 16F968 80241088 0809043D */ j .L802410F4 -/* 16F96C 8024108C A2110289 */ sb $s1, 0x289($s0) -.L80241090: -/* 16F970 80241090 2882001F */ slti $v0, $a0, 0x1f -/* 16F974 80241094 1440000C */ bnez $v0, .L802410C8 -/* 16F978 80241098 24020001 */ addiu $v0, $zero, 1 -/* 16F97C 8024109C 2882003D */ slti $v0, $a0, 0x3d -/* 16F980 802410A0 1440000E */ bnez $v0, .L802410DC -/* 16F984 802410A4 24020002 */ addiu $v0, $zero, 2 -/* 16F988 802410A8 28820051 */ slti $v0, $a0, 0x51 -/* 16F98C 802410AC 54400011 */ bnel $v0, $zero, .L802410F4 -/* 16F990 802410B0 A2110289 */ sb $s1, 0x289($s0) -/* 16F994 802410B4 0809043D */ j .L802410F4 -/* 16F998 802410B8 A2120289 */ sb $s2, 0x289($s0) -.L802410BC: -/* 16F99C 802410BC 2882001F */ slti $v0, $a0, 0x1f -/* 16F9A0 802410C0 10400003 */ beqz $v0, .L802410D0 -/* 16F9A4 802410C4 24020001 */ addiu $v0, $zero, 1 -.L802410C8: -/* 16F9A8 802410C8 0809043D */ j .L802410F4 -/* 16F9AC 802410CC A2020289 */ sb $v0, 0x289($s0) -.L802410D0: -/* 16F9B0 802410D0 2882003D */ slti $v0, $a0, 0x3d -/* 16F9B4 802410D4 10400003 */ beqz $v0, .L802410E4 -/* 16F9B8 802410D8 24020002 */ addiu $v0, $zero, 2 -.L802410DC: -/* 16F9BC 802410DC 0809043D */ j .L802410F4 -/* 16F9C0 802410E0 A2020289 */ sb $v0, 0x289($s0) -.L802410E4: -/* 16F9C4 802410E4 28820051 */ slti $v0, $a0, 0x51 -/* 16F9C8 802410E8 50400002 */ beql $v0, $zero, .L802410F4 -/* 16F9CC 802410EC A2120289 */ sb $s2, 0x289($s0) -/* 16F9D0 802410F0 A2110289 */ sb $s1, 0x289($s0) -.L802410F4: -/* 16F9D4 802410F4 82030289 */ lb $v1, 0x289($s0) -/* 16F9D8 802410F8 24020004 */ addiu $v0, $zero, 4 -/* 16F9DC 802410FC 10620006 */ beq $v1, $v0, .L80241118 -/* 16F9E0 80241100 2402FFFF */ addiu $v0, $zero, -1 -/* 16F9E4 80241104 8603028C */ lh $v1, 0x28c($s0) -/* 16F9E8 80241108 10620004 */ beq $v1, $v0, .L8024111C -/* 16F9EC 8024110C 24040005 */ addiu $a0, $zero, 5 -/* 16F9F0 80241110 08090447 */ j .L8024111C -/* 16F9F4 80241114 00000000 */ nop -.L80241118: -/* 16F9F8 80241118 24040008 */ addiu $a0, $zero, 8 -.L8024111C: -/* 16F9FC 8024111C 0C00A67F */ jal rand_int -/* 16FA00 80241120 00000000 */ nop -/* 16FA04 80241124 24440005 */ addiu $a0, $v0, 5 -/* 16FA08 80241128 A604028C */ sh $a0, 0x28c($s0) -.L8024112C: -/* 16FA0C 8024112C 92040289 */ lbu $a0, 0x289($s0) -/* 16FA10 80241130 2482FFFD */ addiu $v0, $a0, -3 -/* 16FA14 80241134 2C420002 */ sltiu $v0, $v0, 2 -/* 16FA18 80241138 1040000D */ beqz $v0, .L80241170 -/* 16FA1C 8024113C 00000000 */ nop -/* 16FA20 80241140 8602028C */ lh $v0, 0x28c($s0) -/* 16FA24 80241144 9603028C */ lhu $v1, 0x28c($s0) -/* 16FA28 80241148 28420002 */ slti $v0, $v0, 2 -/* 16FA2C 8024114C 14400003 */ bnez $v0, .L8024115C -/* 16FA30 80241150 2462FFFF */ addiu $v0, $v1, -1 -/* 16FA34 80241154 0809045C */ j .L80241170 -/* 16FA38 80241158 A602028C */ sh $v0, 0x28c($s0) -.L8024115C: -/* 16FA3C 8024115C 9202028A */ lbu $v0, 0x28a($s0) -/* 16FA40 80241160 A284008A */ sb $a0, 0x8a($s4) -/* 16FA44 80241164 A600028C */ sh $zero, 0x28c($s0) -/* 16FA48 80241168 2442FFFF */ addiu $v0, $v0, -1 -/* 16FA4C 8024116C A202028A */ sb $v0, 0x28a($s0) -.L80241170: -/* 16FA50 80241170 8FBF0024 */ lw $ra, 0x24($sp) -/* 16FA54 80241174 8FB40020 */ lw $s4, 0x20($sp) -/* 16FA58 80241178 8FB3001C */ lw $s3, 0x1c($sp) -/* 16FA5C 8024117C 8FB20018 */ lw $s2, 0x18($sp) -/* 16FA60 80241180 8FB10014 */ lw $s1, 0x14($sp) -/* 16FA64 80241184 8FB00010 */ lw $s0, 0x10($sp) -/* 16FA68 80241188 03E00008 */ jr $ra -/* 16FA6C 8024118C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/16F740/btl_merlee_on_start_turn.s b/ver/us/asm/nonmatchings/16F740/btl_merlee_on_start_turn.s deleted file mode 100644 index f689f98501..0000000000 --- a/ver/us/asm/nonmatchings/16F740/btl_merlee_on_start_turn.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_merlee_on_start_turn -/* 16F740 80240E60 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 16F744 80240E64 AFB40020 */ sw $s4, 0x20($sp) -/* 16F748 80240E68 3C14800E */ lui $s4, %hi(gBattleStatus) -/* 16F74C 80240E6C 2694C070 */ addiu $s4, $s4, %lo(gBattleStatus) -/* 16F750 80240E70 AFB3001C */ sw $s3, 0x1c($sp) -/* 16F754 80240E74 3C13800B */ lui $s3, %hi(gCurrentEncounter) -/* 16F758 80240E78 26730F10 */ addiu $s3, $s3, %lo(gCurrentEncounter) -/* 16F75C 80240E7C AFB00010 */ sw $s0, 0x10($sp) -/* 16F760 80240E80 3C108011 */ lui $s0, %hi(gPlayerData) -/* 16F764 80240E84 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 16F768 80240E88 AFBF0024 */ sw $ra, 0x24($sp) -/* 16F76C 80240E8C AFB20018 */ sw $s2, 0x18($sp) -/* 16F770 80240E90 AFB10014 */ sw $s1, 0x14($sp) -/* 16F774 80240E94 8E820004 */ lw $v0, 4($s4) -/* 16F778 80240E98 30420040 */ andi $v0, $v0, 0x40 -/* 16F77C 80240E9C 14400047 */ bnez $v0, .L80240FBC -/* 16F780 80240EA0 24110003 */ addiu $s1, $zero, 3 -/* 16F784 80240EA4 8282008A */ lb $v0, 0x8a($s4) -/* 16F788 80240EA8 10510044 */ beq $v0, $s1, .L80240FBC -/* 16F78C 80240EAC 24120004 */ addiu $s2, $zero, 4 -/* 16F790 80240EB0 10520042 */ beq $v0, $s2, .L80240FBC -/* 16F794 80240EB4 00000000 */ nop -/* 16F798 80240EB8 8202028A */ lb $v0, 0x28a($s0) -/* 16F79C 80240EBC 1840003F */ blez $v0, .L80240FBC -/* 16F7A0 80240EC0 00000000 */ nop -/* 16F7A4 80240EC4 8602028C */ lh $v0, 0x28c($s0) -/* 16F7A8 80240EC8 1C400030 */ bgtz $v0, .L80240F8C -/* 16F7AC 80240ECC 00000000 */ nop -/* 16F7B0 80240ED0 0C00A67F */ jal rand_int -/* 16F7B4 80240ED4 24040064 */ addiu $a0, $zero, 0x64 -/* 16F7B8 80240ED8 8E63008C */ lw $v1, 0x8c($s3) -/* 16F7BC 80240EDC 10600018 */ beqz $v1, .L80240F40 -/* 16F7C0 80240EE0 0040202D */ daddu $a0, $v0, $zero -/* 16F7C4 80240EE4 8C620000 */ lw $v0, ($v1) -/* 16F7C8 80240EE8 3C030004 */ lui $v1, 4 -/* 16F7CC 80240EEC 00431024 */ and $v0, $v0, $v1 -/* 16F7D0 80240EF0 10400008 */ beqz $v0, .L80240F14 -/* 16F7D4 80240EF4 2882002E */ slti $v0, $a0, 0x2e -/* 16F7D8 80240EF8 14400014 */ bnez $v0, .L80240F4C -/* 16F7DC 80240EFC 24020001 */ addiu $v0, $zero, 1 -/* 16F7E0 80240F00 2882005B */ slti $v0, $a0, 0x5b -/* 16F7E4 80240F04 14400016 */ bnez $v0, .L80240F60 -/* 16F7E8 80240F08 24020002 */ addiu $v0, $zero, 2 -/* 16F7EC 80240F0C 080903DE */ j .L80240F78 -/* 16F7F0 80240F10 A2110289 */ sb $s1, 0x289($s0) -.L80240F14: -/* 16F7F4 80240F14 2882001F */ slti $v0, $a0, 0x1f -/* 16F7F8 80240F18 1440000C */ bnez $v0, .L80240F4C -/* 16F7FC 80240F1C 24020001 */ addiu $v0, $zero, 1 -/* 16F800 80240F20 2882003D */ slti $v0, $a0, 0x3d -/* 16F804 80240F24 1440000E */ bnez $v0, .L80240F60 -/* 16F808 80240F28 24020002 */ addiu $v0, $zero, 2 -/* 16F80C 80240F2C 28820051 */ slti $v0, $a0, 0x51 -/* 16F810 80240F30 54400011 */ bnel $v0, $zero, .L80240F78 -/* 16F814 80240F34 A2110289 */ sb $s1, 0x289($s0) -/* 16F818 80240F38 080903DE */ j .L80240F78 -/* 16F81C 80240F3C A2120289 */ sb $s2, 0x289($s0) -.L80240F40: -/* 16F820 80240F40 2882001F */ slti $v0, $a0, 0x1f -/* 16F824 80240F44 10400003 */ beqz $v0, .L80240F54 -/* 16F828 80240F48 24020001 */ addiu $v0, $zero, 1 -.L80240F4C: -/* 16F82C 80240F4C 080903DE */ j .L80240F78 -/* 16F830 80240F50 A2020289 */ sb $v0, 0x289($s0) -.L80240F54: -/* 16F834 80240F54 2882003D */ slti $v0, $a0, 0x3d -/* 16F838 80240F58 10400003 */ beqz $v0, .L80240F68 -/* 16F83C 80240F5C 24020002 */ addiu $v0, $zero, 2 -.L80240F60: -/* 16F840 80240F60 080903DE */ j .L80240F78 -/* 16F844 80240F64 A2020289 */ sb $v0, 0x289($s0) -.L80240F68: -/* 16F848 80240F68 28820051 */ slti $v0, $a0, 0x51 -/* 16F84C 80240F6C 50400002 */ beql $v0, $zero, .L80240F78 -/* 16F850 80240F70 A2120289 */ sb $s2, 0x289($s0) -/* 16F854 80240F74 A2110289 */ sb $s1, 0x289($s0) -.L80240F78: -/* 16F858 80240F78 0C00A67F */ jal rand_int -/* 16F85C 80240F7C 2404000A */ addiu $a0, $zero, 0xa -/* 16F860 80240F80 24440006 */ addiu $a0, $v0, 6 -/* 16F864 80240F84 A604028C */ sh $a0, 0x28c($s0) -/* 16F868 80240F88 8602028C */ lh $v0, 0x28c($s0) -.L80240F8C: -/* 16F86C 80240F8C 9603028C */ lhu $v1, 0x28c($s0) -/* 16F870 80240F90 28420002 */ slti $v0, $v0, 2 -/* 16F874 80240F94 14400003 */ bnez $v0, .L80240FA4 -/* 16F878 80240F98 2462FFFF */ addiu $v0, $v1, -1 -/* 16F87C 80240F9C 080903EF */ j .L80240FBC -/* 16F880 80240FA0 A602028C */ sh $v0, 0x28c($s0) -.L80240FA4: -/* 16F884 80240FA4 92030289 */ lbu $v1, 0x289($s0) -/* 16F888 80240FA8 9202028A */ lbu $v0, 0x28a($s0) -/* 16F88C 80240FAC A600028C */ sh $zero, 0x28c($s0) -/* 16F890 80240FB0 2442FFFF */ addiu $v0, $v0, -1 -/* 16F894 80240FB4 A283008A */ sb $v1, 0x8a($s4) -/* 16F898 80240FB8 A202028A */ sb $v0, 0x28a($s0) -.L80240FBC: -/* 16F89C 80240FBC 8FBF0024 */ lw $ra, 0x24($sp) -/* 16F8A0 80240FC0 8FB40020 */ lw $s4, 0x20($sp) -/* 16F8A4 80240FC4 8FB3001C */ lw $s3, 0x1c($sp) -/* 16F8A8 80240FC8 8FB20018 */ lw $s2, 0x18($sp) -/* 16F8AC 80240FCC 8FB10014 */ lw $s1, 0x14($sp) -/* 16F8B0 80240FD0 8FB00010 */ lw $s0, 0x10($sp) -/* 16F8B4 80240FD4 03E00008 */ jr $ra -/* 16F8B8 80240FD8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_partner_turn.s b/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_partner_turn.s deleted file mode 100644 index cf99f6be7f..0000000000 --- a/ver/us/asm/nonmatchings/16F740/btl_state_update_begin_partner_turn.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_state_update_begin_partner_turn -/* 171490 80242BB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 171494 80242BB4 AFB20018 */ sw $s2, 0x18($sp) -/* 171498 80242BB8 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 17149C 80242BBC 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 1714A0 80242BC0 AFB10014 */ sw $s1, 0x14($sp) -/* 1714A4 80242BC4 3C11800E */ lui $s1, %hi(gBattleState2) -/* 1714A8 80242BC8 2631C4DC */ addiu $s1, $s1, %lo(gBattleState2) -/* 1714AC 80242BCC AFBF0020 */ sw $ra, 0x20($sp) -/* 1714B0 80242BD0 AFB3001C */ sw $s3, 0x1c($sp) -/* 1714B4 80242BD4 AFB00010 */ sw $s0, 0x10($sp) -/* 1714B8 80242BD8 8E220000 */ lw $v0, ($s1) -/* 1714BC 80242BDC 14400016 */ bnez $v0, .L80242C38 -/* 1714C0 80242BE0 8E5000DC */ lw $s0, 0xdc($s2) -/* 1714C4 80242BE4 16000006 */ bnez $s0, .L80242C00 -/* 1714C8 80242BE8 24030006 */ addiu $v1, $zero, 6 -/* 1714CC 80242BEC 24020001 */ addiu $v0, $zero, 1 -/* 1714D0 80242BF0 3C01802A */ lui $at, %hi(D_8029F254) -/* 1714D4 80242BF4 AC22F254 */ sw $v0, %lo(D_8029F254)($at) -/* 1714D8 80242BF8 08090B0D */ j .L80242C34 -/* 1714DC 80242BFC 2402000A */ addiu $v0, $zero, 0xa -.L80242C00: -/* 1714E0 80242C00 8E420004 */ lw $v0, 4($s2) -/* 1714E4 80242C04 30420006 */ andi $v0, $v0, 6 -/* 1714E8 80242C08 104300B1 */ beq $v0, $v1, .L80242ED0 -/* 1714EC 80242C0C 3C030020 */ lui $v1, 0x20 -/* 1714F0 80242C10 8E020000 */ lw $v0, ($s0) -/* 1714F4 80242C14 00431024 */ and $v0, $v0, $v1 -/* 1714F8 80242C18 144000AE */ bnez $v0, .L80242ED4 -/* 1714FC 80242C1C 24040009 */ addiu $a0, $zero, 9 -/* 171500 80242C20 0C093903 */ jal btl_cam_use_preset -/* 171504 80242C24 24040002 */ addiu $a0, $zero, 2 -/* 171508 80242C28 0C093936 */ jal btl_cam_move -/* 17150C 80242C2C 24040005 */ addiu $a0, $zero, 5 -/* 171510 80242C30 24020064 */ addiu $v0, $zero, 0x64 -.L80242C34: -/* 171514 80242C34 AE220000 */ sw $v0, ($s1) -.L80242C38: -/* 171518 80242C38 3C03800E */ lui $v1, %hi(gBattleState2) -/* 17151C 80242C3C 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) -/* 171520 80242C40 24020064 */ addiu $v0, $zero, 0x64 -/* 171524 80242C44 14620048 */ bne $v1, $v0, .L80242D68 -/* 171528 80242C48 24020001 */ addiu $v0, $zero, 1 -/* 17152C 80242C4C 0C093961 */ jal btl_cam_is_moving_done -/* 171530 80242C50 00000000 */ nop -/* 171534 80242C54 10400041 */ beqz $v0, .L80242D5C -/* 171538 80242C58 00000000 */ nop -/* 17153C 80242C5C 3C13802A */ lui $s3, %hi(D_8029F258) -/* 171540 80242C60 2673F258 */ addiu $s3, $s3, %lo(D_8029F258) -/* 171544 80242C64 0C098F18 */ jal reset_actor_turn_info -/* 171548 80242C68 AE600000 */ sw $zero, ($s3) -/* 17154C 80242C6C 2402007F */ addiu $v0, $zero, 0x7f -/* 171550 80242C70 3C05802A */ lui $a1, %hi(D_8029F254) -/* 171554 80242C74 24A5F254 */ addiu $a1, $a1, %lo(D_8029F254) -/* 171558 80242C78 8E5000DC */ lw $s0, 0xdc($s2) -/* 17155C 80242C7C 3C11800E */ lui $s1, %hi(gBattleStatus) -/* 171560 80242C80 2631C070 */ addiu $s1, $s1, %lo(gBattleStatus) -/* 171564 80242C84 A2420086 */ sb $v0, 0x86($s2) -/* 171568 80242C88 A2420087 */ sb $v0, 0x87($s2) -/* 17156C 80242C8C ACA00000 */ sw $zero, ($a1) -/* 171570 80242C90 8E220000 */ lw $v0, ($s1) -/* 171574 80242C94 3C030008 */ lui $v1, 8 -/* 171578 80242C98 00431025 */ or $v0, $v0, $v1 -/* 17157C 80242C9C AE220000 */ sw $v0, ($s1) -/* 171580 80242CA0 8E220004 */ lw $v0, 4($s1) -/* 171584 80242CA4 3C030010 */ lui $v1, 0x10 -/* 171588 80242CA8 00431025 */ or $v0, $v0, $v1 -/* 17158C 80242CAC 3C030800 */ lui $v1, 0x800 -/* 171590 80242CB0 AE220004 */ sw $v0, 4($s1) -/* 171594 80242CB4 8E020000 */ lw $v0, ($s0) -/* 171598 80242CB8 82040216 */ lb $a0, 0x216($s0) -/* 17159C 80242CBC 00431025 */ or $v0, $v0, $v1 -/* 1715A0 80242CC0 10800017 */ beqz $a0, .L80242D20 -/* 1715A4 80242CC4 AE020000 */ sw $v0, ($s0) -/* 1715A8 80242CC8 92020217 */ lbu $v0, 0x217($s0) -/* 1715AC 80242CCC 2442FFFF */ addiu $v0, $v0, -1 -/* 1715B0 80242CD0 A2020217 */ sb $v0, 0x217($s0) -/* 1715B4 80242CD4 24020001 */ addiu $v0, $zero, 1 -/* 1715B8 80242CD8 ACA20000 */ sw $v0, ($a1) -/* 1715BC 80242CDC 24020014 */ addiu $v0, $zero, 0x14 -/* 1715C0 80242CE0 AE620000 */ sw $v0, ($s3) -/* 1715C4 80242CE4 82030217 */ lb $v1, 0x217($s0) -/* 1715C8 80242CE8 18600005 */ blez $v1, .L80242D00 -/* 1715CC 80242CEC 24040034 */ addiu $a0, $zero, 0x34 -/* 1715D0 80242CF0 8E020440 */ lw $v0, 0x440($s0) -/* 1715D4 80242CF4 8C42000C */ lw $v0, 0xc($v0) -/* 1715D8 80242CF8 08090B48 */ j .L80242D20 -/* 1715DC 80242CFC AC43003C */ sw $v1, 0x3c($v0) -.L80242D00: -/* 1715E0 80242D00 0C09F7A0 */ jal dispatch_event_partner -/* 1715E4 80242D04 A2000216 */ sb $zero, 0x216($s0) -/* 1715E8 80242D08 8E020440 */ lw $v0, 0x440($s0) -/* 1715EC 80242D0C 8C42000C */ lw $v0, 0xc($v0) -/* 1715F0 80242D10 AC40003C */ sw $zero, 0x3c($v0) -/* 1715F4 80242D14 8E220004 */ lw $v0, 4($s1) -/* 1715F8 80242D18 34420008 */ ori $v0, $v0, 8 -/* 1715FC 80242D1C AE220004 */ sw $v0, 4($s1) -.L80242D20: -/* 171600 80242D20 0000282D */ daddu $a1, $zero, $zero -/* 171604 80242D24 3C060C00 */ lui $a2, 0xc00 -/* 171608 80242D28 0240202D */ daddu $a0, $s2, $zero -.L80242D2C: -/* 17160C 80242D2C 8C8300E0 */ lw $v1, 0xe0($a0) -/* 171610 80242D30 10600004 */ beqz $v1, .L80242D44 -/* 171614 80242D34 24A50001 */ addiu $a1, $a1, 1 -/* 171618 80242D38 8C620000 */ lw $v0, ($v1) -/* 17161C 80242D3C 00461025 */ or $v0, $v0, $a2 -/* 171620 80242D40 AC620000 */ sw $v0, ($v1) -.L80242D44: -/* 171624 80242D44 28A20018 */ slti $v0, $a1, 0x18 -/* 171628 80242D48 1440FFF8 */ bnez $v0, .L80242D2C -/* 17162C 80242D4C 24840004 */ addiu $a0, $a0, 4 -/* 171630 80242D50 24020001 */ addiu $v0, $zero, 1 -/* 171634 80242D54 3C01800E */ lui $at, %hi(gBattleState2) -/* 171638 80242D58 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -.L80242D5C: -/* 17163C 80242D5C 3C03800E */ lui $v1, %hi(gBattleState2) -/* 171640 80242D60 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) -/* 171644 80242D64 24020001 */ addiu $v0, $zero, 1 -.L80242D68: -/* 171648 80242D68 1462001B */ bne $v1, $v0, .L80242DD8 -/* 17164C 80242D6C 00000000 */ nop -/* 171650 80242D70 1200000A */ beqz $s0, .L80242D9C -/* 171654 80242D74 00000000 */ nop -/* 171658 80242D78 8E0201D8 */ lw $v0, 0x1d8($s0) -/* 17165C 80242D7C 50400007 */ beql $v0, $zero, .L80242D9C -/* 171660 80242D80 AE0001D8 */ sw $zero, 0x1d8($s0) -/* 171664 80242D84 8E0401E8 */ lw $a0, 0x1e8($s0) -/* 171668 80242D88 0C0B1059 */ jal does_script_exist -/* 17166C 80242D8C 00000000 */ nop -/* 171670 80242D90 14400011 */ bnez $v0, .L80242DD8 -/* 171674 80242D94 00000000 */ nop -/* 171678 80242D98 AE0001D8 */ sw $zero, 0x1d8($s0) -.L80242D9C: -/* 17167C 80242D9C 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 171680 80242DA0 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus) -/* 171684 80242DA4 8C430004 */ lw $v1, 4($v0) -/* 171688 80242DA8 2404FFF7 */ addiu $a0, $zero, -9 -/* 17168C 80242DAC 00641824 */ and $v1, $v1, $a0 -/* 171690 80242DB0 0C098D19 */ jal btl_check_player_defeated -/* 171694 80242DB4 AC430004 */ sw $v1, 4($v0) -/* 171698 80242DB8 14400048 */ bnez $v0, .L80242EDC -/* 17169C 80242DBC 00000000 */ nop -/* 1716A0 80242DC0 0C098D0D */ jal btl_check_enemies_defeated -/* 1716A4 80242DC4 00000000 */ nop -/* 1716A8 80242DC8 14400044 */ bnez $v0, .L80242EDC -/* 1716AC 80242DCC 24020008 */ addiu $v0, $zero, 8 -/* 1716B0 80242DD0 3C01800E */ lui $at, %hi(gBattleState2) -/* 1716B4 80242DD4 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -.L80242DD8: -/* 1716B8 80242DD8 3C11800E */ lui $s1, %hi(gBattleState2) -/* 1716BC 80242DDC 2631C4DC */ addiu $s1, $s1, %lo(gBattleState2) -/* 1716C0 80242DE0 8E230000 */ lw $v1, ($s1) -/* 1716C4 80242DE4 24020008 */ addiu $v0, $zero, 8 -/* 1716C8 80242DE8 14620014 */ bne $v1, $v0, .L80242E3C -/* 1716CC 80242DEC 24020009 */ addiu $v0, $zero, 9 -/* 1716D0 80242DF0 8E0201CC */ lw $v0, 0x1cc($s0) -/* 1716D4 80242DF4 1040000B */ beqz $v0, .L80242E24 -/* 1716D8 80242DF8 2402000C */ addiu $v0, $zero, 0xc -/* 1716DC 80242DFC 2405000A */ addiu $a1, $zero, 0xa -/* 1716E0 80242E00 A24201A7 */ sb $v0, 0x1a7($s2) -/* 1716E4 80242E04 8E0401CC */ lw $a0, 0x1cc($s0) -/* 1716E8 80242E08 0C0B0CF8 */ jal start_script -/* 1716EC 80242E0C 0000302D */ daddu $a2, $zero, $zero -/* 1716F0 80242E10 AE0201DC */ sw $v0, 0x1dc($s0) -/* 1716F4 80242E14 8C430144 */ lw $v1, 0x144($v0) -/* 1716F8 80242E18 AE0301EC */ sw $v1, 0x1ec($s0) -/* 1716FC 80242E1C 24030100 */ addiu $v1, $zero, 0x100 -/* 171700 80242E20 AC430148 */ sw $v1, 0x148($v0) -.L80242E24: -/* 171704 80242E24 24020009 */ addiu $v0, $zero, 9 -/* 171708 80242E28 AE220000 */ sw $v0, ($s1) -/* 17170C 80242E2C 3C11800E */ lui $s1, %hi(gBattleState2) -/* 171710 80242E30 2631C4DC */ addiu $s1, $s1, %lo(gBattleState2) -/* 171714 80242E34 8E230000 */ lw $v1, ($s1) -/* 171718 80242E38 24020009 */ addiu $v0, $zero, 9 -.L80242E3C: -/* 17171C 80242E3C 1462000A */ bne $v1, $v0, .L80242E68 -/* 171720 80242E40 00000000 */ nop -/* 171724 80242E44 8E0201CC */ lw $v0, 0x1cc($s0) -/* 171728 80242E48 10400006 */ beqz $v0, .L80242E64 -/* 17172C 80242E4C 2402000A */ addiu $v0, $zero, 0xa -/* 171730 80242E50 8E0401EC */ lw $a0, 0x1ec($s0) -/* 171734 80242E54 0C0B1059 */ jal does_script_exist -/* 171738 80242E58 00000000 */ nop -/* 17173C 80242E5C 14400002 */ bnez $v0, .L80242E68 -/* 171740 80242E60 2402000A */ addiu $v0, $zero, 0xa -.L80242E64: -/* 171744 80242E64 AE220000 */ sw $v0, ($s1) -.L80242E68: -/* 171748 80242E68 3C03800E */ lui $v1, %hi(gBattleState2) -/* 17174C 80242E6C 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) -/* 171750 80242E70 2402000A */ addiu $v0, $zero, 0xa -/* 171754 80242E74 14620019 */ bne $v1, $v0, .L80242EDC -/* 171758 80242E78 00000000 */ nop -/* 17175C 80242E7C 3C03802A */ lui $v1, %hi(D_8029F258) -/* 171760 80242E80 2463F258 */ addiu $v1, $v1, %lo(D_8029F258) -/* 171764 80242E84 8C620000 */ lw $v0, ($v1) -/* 171768 80242E88 10400003 */ beqz $v0, .L80242E98 -/* 17176C 80242E8C 2442FFFF */ addiu $v0, $v0, -1 -/* 171770 80242E90 08090BB7 */ j .L80242EDC -/* 171774 80242E94 AC620000 */ sw $v0, ($v1) -.L80242E98: -/* 171778 80242E98 3C02FFEF */ lui $v0, 0xffef -/* 17177C 80242E9C 3442FFFF */ ori $v0, $v0, 0xffff -/* 171780 80242EA0 3C05800E */ lui $a1, %hi(gBattleStatus) -/* 171784 80242EA4 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus) -/* 171788 80242EA8 8CA30004 */ lw $v1, 4($a1) -/* 17178C 80242EAC 3C04802A */ lui $a0, %hi(D_8029F254) -/* 171790 80242EB0 8C84F254 */ lw $a0, %lo(D_8029F254)($a0) -/* 171794 80242EB4 00621024 */ and $v0, $v1, $v0 -/* 171798 80242EB8 14800003 */ bnez $a0, .L80242EC8 -/* 17179C 80242EBC ACA20004 */ sw $v0, 4($a1) -/* 1717A0 80242EC0 08090BB5 */ j .L80242ED4 -/* 1717A4 80242EC4 2404000B */ addiu $a0, $zero, 0xb -.L80242EC8: -/* 1717A8 80242EC8 34420004 */ ori $v0, $v0, 4 -/* 1717AC 80242ECC ACA20004 */ sw $v0, 4($a1) -.L80242ED0: -/* 1717B0 80242ED0 24040009 */ addiu $a0, $zero, 9 -.L80242ED4: -/* 1717B4 80242ED4 0C090464 */ jal btl_set_state -/* 1717B8 80242ED8 00000000 */ nop -.L80242EDC: -/* 1717BC 80242EDC 8FBF0020 */ lw $ra, 0x20($sp) -/* 1717C0 80242EE0 8FB3001C */ lw $s3, 0x1c($sp) -/* 1717C4 80242EE4 8FB20018 */ lw $s2, 0x18($sp) -/* 1717C8 80242EE8 8FB10014 */ lw $s1, 0x14($sp) -/* 1717CC 80242EEC 8FB00010 */ lw $s0, 0x10($sp) -/* 1717D0 80242EF0 03E00008 */ jr $ra -/* 1717D4 80242EF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/16F740/btl_state_update_end_battle.s b/ver/us/asm/nonmatchings/16F740/btl_state_update_end_battle.s deleted file mode 100644 index 3a0409bcbf..0000000000 --- a/ver/us/asm/nonmatchings/16F740/btl_state_update_end_battle.s +++ /dev/null @@ -1,242 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_8029CAAC -.ascii "gv_01\0\0\0\0\0\0\0" - -dlabel jtbl_8029CAB8 -.word .L80244AA8_173388, .L80244B40_173420, .L80244B88_173468, .L80244C0C_1734EC, .L80244C28_173508, 0 - -.section .text - -glabel btl_state_update_end_battle -/* 173330 80244A50 3C03800E */ lui $v1, %hi(gBattleState2) -/* 173334 80244A54 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) -/* 173338 80244A58 3C06800E */ lui $a2, %hi(D_800DC4FC) -/* 17333C 80244A5C 8CC6C4FC */ lw $a2, %lo(D_800DC4FC)($a2) -/* 173340 80244A60 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 173344 80244A64 AFB30024 */ sw $s3, 0x24($sp) -/* 173348 80244A68 3C13800B */ lui $s3, %hi(gCurrentEncounter) -/* 17334C 80244A6C 26730F10 */ addiu $s3, $s3, %lo(gCurrentEncounter) -/* 173350 80244A70 AFB20020 */ sw $s2, 0x20($sp) -/* 173354 80244A74 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 173358 80244A78 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 17335C 80244A7C AFBF0028 */ sw $ra, 0x28($sp) -/* 173360 80244A80 AFB1001C */ sw $s1, 0x1c($sp) -/* 173364 80244A84 2C620005 */ sltiu $v0, $v1, 5 -/* 173368 80244A88 104000BA */ beqz $v0, .L80244D74 -/* 17336C 80244A8C AFB00018 */ sw $s0, 0x18($sp) -/* 173370 80244A90 00031080 */ sll $v0, $v1, 2 -/* 173374 80244A94 3C01802A */ lui $at, %hi(jtbl_8029CAB8) -/* 173378 80244A98 00220821 */ addu $at, $at, $v0 -/* 17337C 80244A9C 8C22CAB8 */ lw $v0, %lo(jtbl_8029CAB8)($at) -/* 173380 80244AA0 00400008 */ jr $v0 -/* 173384 80244AA4 00000000 */ nop -.L80244AA8_173388: -/* 173388 80244AA8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 17338C 80244AAC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 173390 80244AB0 3C048028 */ lui $a0, %hi(D_80280A30) -/* 173394 80244AB4 24840A30 */ addiu $a0, $a0, %lo(D_80280A30) -/* 173398 80244AB8 AC800000 */ sw $zero, ($a0) -/* 17339C 80244ABC 80430074 */ lb $v1, 0x74($v0) -/* 1733A0 80244AC0 24020002 */ addiu $v0, $zero, 2 -/* 1733A4 80244AC4 14620002 */ bne $v1, $v0, .L80244AD0 -/* 1733A8 80244AC8 240200FF */ addiu $v0, $zero, 0xff -/* 1733AC 80244ACC AC820000 */ sw $v0, ($a0) -.L80244AD0: -/* 1733B0 80244AD0 82630009 */ lb $v1, 9($s3) -/* 1733B4 80244AD4 24020001 */ addiu $v0, $zero, 1 -/* 1733B8 80244AD8 14620015 */ bne $v1, $v0, .L80244B30 -/* 1733BC 80244ADC 3C030080 */ lui $v1, 0x80 -/* 1733C0 80244AE0 3C02800E */ lui $v0, %hi(gBattleStatus) -/* 1733C4 80244AE4 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) -/* 1733C8 80244AE8 00431024 */ and $v0, $v0, $v1 -/* 1733CC 80244AEC 14400010 */ bnez $v0, .L80244B30 -/* 1733D0 80244AF0 24020001 */ addiu $v0, $zero, 1 -/* 1733D4 80244AF4 0C093980 */ jal btl_cam_unfreeze -/* 1733D8 80244AF8 00000000 */ nop -/* 1733DC 80244AFC 0C093903 */ jal btl_cam_use_preset -/* 1733E0 80244B00 24040001 */ addiu $a0, $zero, 1 -/* 1733E4 80244B04 0000202D */ daddu $a0, $zero, $zero -/* 1733E8 80244B08 0080282D */ daddu $a1, $a0, $zero -/* 1733EC 80244B0C 0080302D */ daddu $a2, $a0, $zero -/* 1733F0 80244B10 0C04DF84 */ jal set_screen_overlay_color -/* 1733F4 80244B14 0080382D */ daddu $a3, $a0, $zero -/* 1733F8 80244B18 0000202D */ daddu $a0, $zero, $zero -/* 1733FC 80244B1C 0080282D */ daddu $a1, $a0, $zero -/* 173400 80244B20 240600A0 */ addiu $a2, $zero, 0xa0 -/* 173404 80244B24 0C04DF93 */ jal set_screen_overlay_center -/* 173408 80244B28 24070078 */ addiu $a3, $zero, 0x78 -/* 17340C 80244B2C 24020001 */ addiu $v0, $zero, 1 -.L80244B30: -/* 173410 80244B30 3C01800E */ lui $at, %hi(gBattleState2) -/* 173414 80244B34 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 173418 80244B38 0809135D */ j .L80244D74 -/* 17341C 80244B3C 00000000 */ nop -.L80244B40_173420: -/* 173420 80244B40 3C048028 */ lui $a0, %hi(D_80280A30) -/* 173424 80244B44 24840A30 */ addiu $a0, $a0, %lo(D_80280A30) -/* 173428 80244B48 8C830000 */ lw $v1, ($a0) -/* 17342C 80244B4C 240500FF */ addiu $a1, $zero, 0xff -/* 173430 80244B50 14650005 */ bne $v1, $a1, .L80244B68 -/* 173434 80244B54 24020002 */ addiu $v0, $zero, 2 -/* 173438 80244B58 3C01800E */ lui $at, %hi(gBattleState2) -/* 17343C 80244B5C AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 173440 80244B60 0809135D */ j .L80244D74 -/* 173444 80244B64 00000000 */ nop -.L80244B68: -/* 173448 80244B68 8242008D */ lb $v0, 0x8d($s2) -/* 17344C 80244B6C 00621021 */ addu $v0, $v1, $v0 -/* 173450 80244B70 AC820000 */ sw $v0, ($a0) -/* 173454 80244B74 28420100 */ slti $v0, $v0, 0x100 -/* 173458 80244B78 5040007E */ beql $v0, $zero, .L80244D74 -/* 17345C 80244B7C AC850000 */ sw $a1, ($a0) -/* 173460 80244B80 0809135D */ j .L80244D74 -/* 173464 80244B84 00000000 */ nop -.L80244B88_173468: -/* 173468 80244B88 240200FF */ addiu $v0, $zero, 0xff -/* 17346C 80244B8C 3C04800E */ lui $a0, %hi(gBattleStatus) -/* 173470 80244B90 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) -/* 173474 80244B94 2403FFFE */ addiu $v1, $zero, -2 -/* 173478 80244B98 3C018028 */ lui $at, %hi(D_80280A30) -/* 17347C 80244B9C AC220A30 */ sw $v0, %lo(D_80280A30)($at) -/* 173480 80244BA0 8C820000 */ lw $v0, ($a0) -/* 173484 80244BA4 3C05800E */ lui $a1, %hi(D_800DC064) -/* 173488 80244BA8 8CA5C064 */ lw $a1, %lo(D_800DC064)($a1) -/* 17348C 80244BAC 00431024 */ and $v0, $v0, $v1 -/* 173490 80244BB0 14A00004 */ bnez $a1, .L80244BC4 -/* 173494 80244BB4 AC820000 */ sw $v0, ($a0) -/* 173498 80244BB8 8CC4000C */ lw $a0, 0xc($a2) -/* 17349C 80244BBC 080912F2 */ j .L80244BC8 -/* 1734A0 80244BC0 00000000 */ nop -.L80244BC4: -/* 1734A4 80244BC4 8CA40004 */ lw $a0, 4($a1) -.L80244BC8: -/* 1734A8 80244BC8 8C840010 */ lw $a0, 0x10($a0) -/* 1734AC 80244BCC 14800006 */ bnez $a0, .L80244BE8 -/* 1734B0 80244BD0 2405000A */ addiu $a1, $zero, 0xa -/* 1734B4 80244BD4 24020004 */ addiu $v0, $zero, 4 -/* 1734B8 80244BD8 3C01800E */ lui $at, %hi(gBattleState2) -/* 1734BC 80244BDC AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 1734C0 80244BE0 0809135D */ j .L80244D74 -/* 1734C4 80244BE4 00000000 */ nop -.L80244BE8: -/* 1734C8 80244BE8 0C0B0CF8 */ jal start_script -/* 1734CC 80244BEC 0000302D */ daddu $a2, $zero, $zero -/* 1734D0 80244BF0 AE4200BC */ sw $v0, 0xbc($s2) -/* 1734D4 80244BF4 8C430144 */ lw $v1, 0x144($v0) -/* 1734D8 80244BF8 24020003 */ addiu $v0, $zero, 3 -/* 1734DC 80244BFC 3C01800E */ lui $at, %hi(gBattleState2) -/* 1734E0 80244C00 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 1734E4 80244C04 0809135D */ j .L80244D74 -/* 1734E8 80244C08 AE4300C0 */ sw $v1, 0xc0($s2) -.L80244C0C_1734EC: -/* 1734EC 80244C0C 8E4400C0 */ lw $a0, 0xc0($s2) -/* 1734F0 80244C10 0C0B1059 */ jal does_script_exist -/* 1734F4 80244C14 00000000 */ nop -/* 1734F8 80244C18 14400056 */ bnez $v0, .L80244D74 -/* 1734FC 80244C1C 24020004 */ addiu $v0, $zero, 4 -/* 173500 80244C20 3C01800E */ lui $at, %hi(gBattleState2) -/* 173504 80244C24 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -.L80244C28_173508: -/* 173508 80244C28 0C0B1045 */ jal kill_all_scripts -/* 17350C 80244C2C 0000882D */ daddu $s1, $zero, $zero -/* 173510 80244C30 0240802D */ daddu $s0, $s2, $zero -.L80244C34: -/* 173514 80244C34 8E0400E0 */ lw $a0, 0xe0($s0) -/* 173518 80244C38 10800003 */ beqz $a0, .L80244C48 -/* 17351C 80244C3C 26310001 */ addiu $s1, $s1, 1 -/* 173520 80244C40 0C0902EF */ jal btl_delete_actor -/* 173524 80244C44 00000000 */ nop -.L80244C48: -/* 173528 80244C48 2A220018 */ slti $v0, $s1, 0x18 -/* 17352C 80244C4C 1440FFF9 */ bnez $v0, .L80244C34 -/* 173530 80244C50 26100004 */ addiu $s0, $s0, 4 -/* 173534 80244C54 8E4400DC */ lw $a0, 0xdc($s2) -/* 173538 80244C58 10800003 */ beqz $a0, .L80244C68 -/* 17353C 80244C5C 00000000 */ nop -/* 173540 80244C60 0C0902EF */ jal btl_delete_actor -/* 173544 80244C64 00000000 */ nop -.L80244C68: -/* 173548 80244C68 0C09035A */ jal btl_delete_player_actor -/* 17354C 80244C6C 8E4400D8 */ lw $a0, 0xd8($s2) -/* 173550 80244C70 8243008A */ lb $v1, 0x8a($s2) -/* 173554 80244C74 24020004 */ addiu $v0, $zero, 4 -/* 173558 80244C78 14620003 */ bne $v1, $v0, .L80244C88 -/* 17355C 80244C7C 24020001 */ addiu $v0, $zero, 1 -/* 173560 80244C80 A262000B */ sb $v0, 0xb($s3) -/* 173564 80244C84 A240008A */ sb $zero, 0x8a($s2) -.L80244C88: -/* 173568 80244C88 9242007B */ lbu $v0, 0x7b($s2) -/* 17356C 80244C8C 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 173570 80244C90 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 173574 80244C94 A262000C */ sb $v0, 0xc($s3) -/* 173578 80244C98 8E020004 */ lw $v0, 4($s0) -/* 17357C 80244C9C 3C031000 */ lui $v1, 0x1000 -/* 173580 80244CA0 00431024 */ and $v0, $v0, $v1 -/* 173584 80244CA4 10400002 */ beqz $v0, .L80244CB0 -/* 173588 80244CA8 24020001 */ addiu $v0, $zero, 1 -/* 17358C 80244CAC A2620013 */ sb $v0, 0x13($s3) -.L80244CB0: -/* 173590 80244CB0 0C016938 */ jal remove_all_effects -/* 173594 80244CB4 00000000 */ nop -/* 173598 80244CB8 0C051FB1 */ jal set_windows_visible -/* 17359C 80244CBC 0000202D */ daddu $a0, $zero, $zero -/* 1735A0 80244CC0 8E020004 */ lw $v0, 4($s0) -/* 1735A4 80244CC4 30420040 */ andi $v0, $v0, 0x40 -/* 1735A8 80244CC8 10400003 */ beqz $v0, .L80244CD8 -/* 1735AC 80244CCC 00000000 */ nop -/* 1735B0 80244CD0 0C03A6CC */ jal decrement_status_menu_disabled -/* 1735B4 80244CD4 00000000 */ nop -.L80244CD8: -/* 1735B8 80244CD8 82630009 */ lb $v1, 9($s3) -/* 1735BC 80244CDC 24020001 */ addiu $v0, $zero, 1 -/* 1735C0 80244CE0 14620019 */ bne $v1, $v0, .L80244D48 -/* 1735C4 80244CE4 3C030080 */ lui $v1, 0x80 -/* 1735C8 80244CE8 8E020000 */ lw $v0, ($s0) -/* 1735CC 80244CEC 00431024 */ and $v0, $v0, $v1 -/* 1735D0 80244CF0 14400015 */ bnez $v0, .L80244D48 -/* 1735D4 80244CF4 00000000 */ nop -/* 1735D8 80244CF8 0C090464 */ jal btl_set_state -/* 1735DC 80244CFC 0000202D */ daddu $a0, $zero, $zero -/* 1735E0 80244D00 3C04802A */ lui $a0, %hi(D_8029CAAC) -/* 1735E4 80244D04 2484CAAC */ addiu $a0, $a0, %lo(D_8029CAAC) -/* 1735E8 80244D08 27A50010 */ addiu $a1, $sp, 0x10 -/* 1735EC 80244D0C 3C02800E */ lui $v0, %hi(gBattleState) -/* 1735F0 80244D10 8C42C068 */ lw $v0, %lo(gBattleState)($v0) -/* 1735F4 80244D14 3C01800E */ lui $at, %hi(D_800DC4D0) -/* 1735F8 80244D18 AC22C4D0 */ sw $v0, %lo(D_800DC4D0)($at) -/* 1735FC 80244D1C 0C016AFE */ jal get_map_IDs_by_name -/* 173600 80244D20 27A60012 */ addiu $a2, $sp, 0x12 -/* 173604 80244D24 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 173608 80244D28 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 17360C 80244D2C 97A30010 */ lhu $v1, 0x10($sp) -/* 173610 80244D30 97A50012 */ lhu $a1, 0x12($sp) -/* 173614 80244D34 24040006 */ addiu $a0, $zero, 6 -/* 173618 80244D38 A4430086 */ sh $v1, 0x86($v0) -/* 17361C 80244D3C A445008C */ sh $a1, 0x8c($v0) -/* 173620 80244D40 0809135B */ j .L80244D6C -/* 173624 80244D44 A440008E */ sh $zero, 0x8e($v0) -.L80244D48: -/* 173628 80244D48 0C090464 */ jal btl_set_state -/* 17362C 80244D4C 0000202D */ daddu $a0, $zero, $zero -/* 173630 80244D50 3C02800E */ lui $v0, %hi(gBattleState) -/* 173634 80244D54 8C42C068 */ lw $v0, %lo(gBattleState)($v0) -/* 173638 80244D58 3C01800E */ lui $at, %hi(D_800DC4D0) -/* 17363C 80244D5C AC22C4D0 */ sw $v0, %lo(D_800DC4D0)($at) -/* 173640 80244D60 0C00F945 */ jal func_8003E514 -/* 173644 80244D64 24040001 */ addiu $a0, $zero, 1 -/* 173648 80244D68 24040009 */ addiu $a0, $zero, 9 -.L80244D6C: -/* 17364C 80244D6C 0C00CD3C */ jal set_game_mode -/* 173650 80244D70 00000000 */ nop -.L80244D74: -/* 173654 80244D74 8FBF0028 */ lw $ra, 0x28($sp) -/* 173658 80244D78 8FB30024 */ lw $s3, 0x24($sp) -/* 17365C 80244D7C 8FB20020 */ lw $s2, 0x20($sp) -/* 173660 80244D80 8FB1001C */ lw $s1, 0x1c($sp) -/* 173664 80244D84 8FB00018 */ lw $s0, 0x18($sp) -/* 173668 80244D88 03E00008 */ jr $ra -/* 17366C 80244D8C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/16F740/btl_state_update_partner_striking_first.s b/ver/us/asm/nonmatchings/16F740/btl_state_update_partner_striking_first.s deleted file mode 100644 index e5f55e3889..0000000000 --- a/ver/us/asm/nonmatchings/16F740/btl_state_update_partner_striking_first.s +++ /dev/null @@ -1,316 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_state_update_partner_striking_first -/* 176A70 80248190 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 176A74 80248194 AFB50024 */ sw $s5, 0x24($sp) -/* 176A78 80248198 3C15800E */ lui $s5, %hi(gBattleStatus) -/* 176A7C 8024819C 26B5C070 */ addiu $s5, $s5, %lo(gBattleStatus) -/* 176A80 802481A0 AFB20018 */ sw $s2, 0x18($sp) -/* 176A84 802481A4 3C12800E */ lui $s2, %hi(gBattleState2) -/* 176A88 802481A8 2652C4DC */ addiu $s2, $s2, %lo(gBattleState2) -/* 176A8C 802481AC AFB10014 */ sw $s1, 0x14($sp) -/* 176A90 802481B0 24110001 */ addiu $s1, $zero, 1 -/* 176A94 802481B4 AFBF0028 */ sw $ra, 0x28($sp) -/* 176A98 802481B8 AFB40020 */ sw $s4, 0x20($sp) -/* 176A9C 802481BC AFB3001C */ sw $s3, 0x1c($sp) -/* 176AA0 802481C0 AFB00010 */ sw $s0, 0x10($sp) -/* 176AA4 802481C4 8EB000D8 */ lw $s0, 0xd8($s5) -/* 176AA8 802481C8 8E430000 */ lw $v1, ($s2) -/* 176AAC 802481CC 8EB400DC */ lw $s4, 0xdc($s5) -/* 176AB0 802481D0 1071003E */ beq $v1, $s1, .L802482CC -/* 176AB4 802481D4 28620002 */ slti $v0, $v1, 2 -/* 176AB8 802481D8 50400005 */ beql $v0, $zero, .L802481F0 -/* 176ABC 802481DC 24020002 */ addiu $v0, $zero, 2 -/* 176AC0 802481E0 10600009 */ beqz $v1, .L80248208 -/* 176AC4 802481E4 24040002 */ addiu $a0, $zero, 2 -/* 176AC8 802481E8 08092176 */ j .L802485D8 -/* 176ACC 802481EC 00000000 */ nop -.L802481F0: -/* 176AD0 802481F0 10620068 */ beq $v1, $v0, .L80248394 -/* 176AD4 802481F4 24020003 */ addiu $v0, $zero, 3 -/* 176AD8 802481F8 106200E1 */ beq $v1, $v0, .L80248580 -/* 176ADC 802481FC 0000982D */ daddu $s3, $zero, $zero -/* 176AE0 80248200 08092176 */ j .L802485D8 -/* 176AE4 80248204 00000000 */ nop -.L80248208: -/* 176AE8 80248208 8E830008 */ lw $v1, 8($s4) -/* 176AEC 8024820C 3C028011 */ lui $v0, %hi(gPlayerData) -/* 176AF0 80248210 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 176AF4 80248214 3C01802A */ lui $at, %hi(D_8029F254) -/* 176AF8 80248218 AC20F254 */ sw $zero, %lo(D_8029F254)($at) -/* 176AFC 8024821C 80450012 */ lb $a1, 0x12($v0) -/* 176B00 80248220 90630006 */ lbu $v1, 6($v1) -/* 176B04 80248224 10A40005 */ beq $a1, $a0, .L8024823C -/* 176B08 80248228 24020003 */ addiu $v0, $zero, 3 -/* 176B0C 8024822C 10A20006 */ beq $a1, $v0, .L80248248 -/* 176B10 80248230 24020005 */ addiu $v0, $zero, 5 -/* 176B14 80248234 0809209D */ j .L80248274 -/* 176B18 80248238 00000000 */ nop -.L8024823C: -/* 176B1C 8024823C 24020005 */ addiu $v0, $zero, 5 -/* 176B20 80248240 08092093 */ j .L8024824C -/* 176B24 80248244 24630089 */ addiu $v1, $v1, 0x89 -.L80248248: -/* 176B28 80248248 2463008F */ addiu $v1, $v1, 0x8f -.L8024824C: -/* 176B2C 8024824C A2A20178 */ sb $v0, 0x178($s5) -/* 176B30 80248250 00031080 */ sll $v0, $v1, 2 -/* 176B34 80248254 00431021 */ addu $v0, $v0, $v1 -/* 176B38 80248258 00021080 */ sll $v0, $v0, 2 -/* 176B3C 8024825C A6A0017A */ sh $zero, 0x17a($s5) -/* 176B40 80248260 A6A3017C */ sh $v1, 0x17c($s5) -/* 176B44 80248264 3C018009 */ lui $at, %hi(gMoveTable + 0x4) -/* 176B48 80248268 00220821 */ addu $at, $at, $v0 -/* 176B4C 8024826C 8C22F064 */ lw $v0, %lo(gMoveTable + 0x4)($at) -/* 176B50 80248270 AEA20184 */ sw $v0, 0x184($s5) -.L80248274: -/* 176B54 80248274 0C09A75B */ jal get_actor -/* 176B58 80248278 24040200 */ addiu $a0, $zero, 0x200 -/* 176B5C 8024827C 0040802D */ daddu $s0, $v0, $zero -/* 176B60 80248280 8E0201C8 */ lw $v0, 0x1c8($s0) -/* 176B64 80248284 1040000C */ beqz $v0, .L802482B8 -/* 176B68 80248288 2405000A */ addiu $a1, $zero, 0xa -/* 176B6C 8024828C 24060020 */ addiu $a2, $zero, 0x20 -/* 176B70 80248290 0040202D */ daddu $a0, $v0, $zero -/* 176B74 80248294 24020038 */ addiu $v0, $zero, 0x38 -/* 176B78 80248298 0C0B0CF8 */ jal start_script -/* 176B7C 8024829C A20201F0 */ sb $v0, 0x1f0($s0) -/* 176B80 802482A0 0040202D */ daddu $a0, $v0, $zero -/* 176B84 802482A4 AE0401D8 */ sw $a0, 0x1d8($s0) -/* 176B88 802482A8 8C820144 */ lw $v0, 0x144($a0) -/* 176B8C 802482AC 86030192 */ lh $v1, 0x192($s0) -/* 176B90 802482B0 AE0201E8 */ sw $v0, 0x1e8($s0) -/* 176B94 802482B4 AC830148 */ sw $v1, 0x148($a0) -.L802482B8: -/* 176B98 802482B8 24020001 */ addiu $v0, $zero, 1 -/* 176B9C 802482BC 3C01800E */ lui $at, %hi(gBattleState2) -/* 176BA0 802482C0 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 176BA4 802482C4 08092176 */ j .L802485D8 -/* 176BA8 802482C8 00000000 */ nop -.L802482CC: -/* 176BAC 802482CC 0C098C0B */ jal player_create_target_list -/* 176BB0 802482D0 0280202D */ daddu $a0, $s4, $zero -/* 176BB4 802482D4 8283040D */ lb $v1, 0x40d($s4) -/* 176BB8 802482D8 00031080 */ sll $v0, $v1, 2 -/* 176BBC 802482DC 00431021 */ addu $v0, $v0, $v1 -/* 176BC0 802482E0 00021080 */ sll $v0, $v0, 2 -/* 176BC4 802482E4 2442022C */ addiu $v0, $v0, 0x22c -/* 176BC8 802482E8 02821021 */ addu $v0, $s4, $v0 -/* 176BCC 802482EC 94430000 */ lhu $v1, ($v0) -/* 176BD0 802482F0 A6830428 */ sh $v1, 0x428($s4) -/* 176BD4 802482F4 90420003 */ lbu $v0, 3($v0) -/* 176BD8 802482F8 A2820426 */ sb $v0, 0x426($s4) -/* 176BDC 802482FC 8EA40000 */ lw $a0, ($s5) -/* 176BE0 80248300 2402FFFD */ addiu $v0, $zero, -3 -/* 176BE4 80248304 00822024 */ and $a0, $a0, $v0 -/* 176BE8 80248308 8EA20004 */ lw $v0, 4($s5) -/* 176BEC 8024830C 3C030100 */ lui $v1, 0x100 -/* 176BF0 80248310 A2A0008C */ sb $zero, 0x8c($s5) -/* 176BF4 80248314 A6A00180 */ sh $zero, 0x180($s5) -/* 176BF8 80248318 A2A0019A */ sb $zero, 0x19a($s5) -/* 176BFC 8024831C AEA40000 */ sw $a0, ($s5) -/* 176C00 80248320 00431025 */ or $v0, $v0, $v1 -/* 176C04 80248324 AEA20004 */ sw $v0, 4($s5) -/* 176C08 80248328 3C020008 */ lui $v0, 8 -/* 176C0C 8024832C 00822025 */ or $a0, $a0, $v0 -/* 176C10 80248330 0C03A6D5 */ jal increment_status_menu_disabled -/* 176C14 80248334 AEA40000 */ sw $a0, ($s5) -/* 176C18 80248338 0C093903 */ jal btl_cam_use_preset -/* 176C1C 8024833C 2404000A */ addiu $a0, $zero, 0xa -/* 176C20 80248340 0C09390F */ jal btl_cam_target_actor -/* 176C24 80248344 24040100 */ addiu $a0, $zero, 0x100 -/* 176C28 80248348 0C098F18 */ jal reset_actor_turn_info -/* 176C2C 8024834C 00000000 */ nop -/* 176C30 80248350 2405000A */ addiu $a1, $zero, 0xa -/* 176C34 80248354 A2B101A7 */ sb $s1, 0x1a7($s5) -/* 176C38 80248358 8E8401C4 */ lw $a0, 0x1c4($s4) -/* 176C3C 8024835C 0C0B0CF8 */ jal start_script -/* 176C40 80248360 0000302D */ daddu $a2, $zero, $zero -/* 176C44 80248364 0040202D */ daddu $a0, $v0, $zero -/* 176C48 80248368 AE8401D4 */ sw $a0, 0x1d4($s4) -/* 176C4C 8024836C 8C830144 */ lw $v1, 0x144($a0) -/* 176C50 80248370 24020003 */ addiu $v0, $zero, 3 -/* 176C54 80248374 3C01802A */ lui $at, %hi(D_8029F248) -/* 176C58 80248378 AC22F248 */ sw $v0, %lo(D_8029F248)($at) -/* 176C5C 8024837C 24020002 */ addiu $v0, $zero, 2 -/* 176C60 80248380 AE420000 */ sw $v0, ($s2) -/* 176C64 80248384 24020100 */ addiu $v0, $zero, 0x100 -/* 176C68 80248388 AE8301E4 */ sw $v1, 0x1e4($s4) -/* 176C6C 8024838C 08092176 */ j .L802485D8 -/* 176C70 80248390 AC820148 */ sw $v0, 0x148($a0) -.L80248394: -/* 176C74 80248394 3C03802A */ lui $v1, %hi(D_8029F248) -/* 176C78 80248398 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) -/* 176C7C 8024839C 8C620000 */ lw $v0, ($v1) -/* 176C80 802483A0 10400003 */ beqz $v0, .L802483B0 -/* 176C84 802483A4 2442FFFF */ addiu $v0, $v0, -1 -/* 176C88 802483A8 080920EE */ j .L802483B8 -/* 176C8C 802483AC AC620000 */ sw $v0, ($v1) -.L802483B0: -/* 176C90 802483B0 3C01802A */ lui $at, %hi(D_8029F254) -/* 176C94 802483B4 AC31F254 */ sw $s1, %lo(D_8029F254)($at) -.L802483B8: -/* 176C98 802483B8 8E8201D4 */ lw $v0, 0x1d4($s4) -/* 176C9C 802483BC 10400005 */ beqz $v0, .L802483D4 -/* 176CA0 802483C0 00000000 */ nop -/* 176CA4 802483C4 0C0B1059 */ jal does_script_exist -/* 176CA8 802483C8 8E8401E4 */ lw $a0, 0x1e4($s4) -/* 176CAC 802483CC 14400082 */ bnez $v0, .L802485D8 -/* 176CB0 802483D0 00000000 */ nop -.L802483D4: -/* 176CB4 802483D4 8E8201D8 */ lw $v0, 0x1d8($s4) -/* 176CB8 802483D8 10400006 */ beqz $v0, .L802483F4 -/* 176CBC 802483DC AE8001D4 */ sw $zero, 0x1d4($s4) -/* 176CC0 802483E0 8E8401E8 */ lw $a0, 0x1e8($s4) -/* 176CC4 802483E4 0C0B1059 */ jal does_script_exist -/* 176CC8 802483E8 00000000 */ nop -/* 176CCC 802483EC 1440007A */ bnez $v0, .L802485D8 -/* 176CD0 802483F0 00000000 */ nop -.L802483F4: -/* 176CD4 802483F4 AE8001D8 */ sw $zero, 0x1d8($s4) -/* 176CD8 802483F8 8E0201D8 */ lw $v0, 0x1d8($s0) -/* 176CDC 802483FC 50400007 */ beql $v0, $zero, .L8024841C -/* 176CE0 80248400 AE0001D8 */ sw $zero, 0x1d8($s0) -/* 176CE4 80248404 8E0401E8 */ lw $a0, 0x1e8($s0) -/* 176CE8 80248408 0C0B1059 */ jal does_script_exist -/* 176CEC 8024840C 00000000 */ nop -/* 176CF0 80248410 14400071 */ bnez $v0, .L802485D8 -/* 176CF4 80248414 00000000 */ nop -/* 176CF8 80248418 AE0001D8 */ sw $zero, 0x1d8($s0) -.L8024841C: -/* 176CFC 8024841C 0000982D */ daddu $s3, $zero, $zero -/* 176D00 80248420 0260882D */ daddu $s1, $s3, $zero -/* 176D04 80248424 02A0902D */ daddu $s2, $s5, $zero -.L80248428: -/* 176D08 80248428 8E5000E0 */ lw $s0, 0xe0($s2) -/* 176D0C 8024842C 5200000B */ beql $s0, $zero, .L8024845C -/* 176D10 80248430 26310001 */ addiu $s1, $s1, 1 -/* 176D14 80248434 8E0201D4 */ lw $v0, 0x1d4($s0) -/* 176D18 80248438 50400008 */ beql $v0, $zero, .L8024845C -/* 176D1C 8024843C 26310001 */ addiu $s1, $s1, 1 -/* 176D20 80248440 8E0401E4 */ lw $a0, 0x1e4($s0) -/* 176D24 80248444 0C0B1059 */ jal does_script_exist -/* 176D28 80248448 00000000 */ nop -/* 176D2C 8024844C 50400002 */ beql $v0, $zero, .L80248458 -/* 176D30 80248450 AE0001D4 */ sw $zero, 0x1d4($s0) -/* 176D34 80248454 24130001 */ addiu $s3, $zero, 1 -.L80248458: -/* 176D38 80248458 26310001 */ addiu $s1, $s1, 1 -.L8024845C: -/* 176D3C 8024845C 2A220018 */ slti $v0, $s1, 0x18 -/* 176D40 80248460 1440FFF1 */ bnez $v0, .L80248428 -/* 176D44 80248464 26520004 */ addiu $s2, $s2, 4 -/* 176D48 80248468 1660005B */ bnez $s3, .L802485D8 -/* 176D4C 8024846C 0000882D */ daddu $s1, $zero, $zero -/* 176D50 80248470 02A0902D */ daddu $s2, $s5, $zero -.L80248474: -/* 176D54 80248474 8E5000E0 */ lw $s0, 0xe0($s2) -/* 176D58 80248478 5200000B */ beql $s0, $zero, .L802484A8 -/* 176D5C 8024847C 26310001 */ addiu $s1, $s1, 1 -/* 176D60 80248480 8E0201D8 */ lw $v0, 0x1d8($s0) -/* 176D64 80248484 50400008 */ beql $v0, $zero, .L802484A8 -/* 176D68 80248488 26310001 */ addiu $s1, $s1, 1 -/* 176D6C 8024848C 8E0401E8 */ lw $a0, 0x1e8($s0) -/* 176D70 80248490 0C0B1059 */ jal does_script_exist -/* 176D74 80248494 00000000 */ nop -/* 176D78 80248498 50400002 */ beql $v0, $zero, .L802484A4 -/* 176D7C 8024849C AE0001D8 */ sw $zero, 0x1d8($s0) -/* 176D80 802484A0 24130001 */ addiu $s3, $zero, 1 -.L802484A4: -/* 176D84 802484A4 26310001 */ addiu $s1, $s1, 1 -.L802484A8: -/* 176D88 802484A8 2A220018 */ slti $v0, $s1, 0x18 -/* 176D8C 802484AC 1440FFF1 */ bnez $v0, .L80248474 -/* 176D90 802484B0 26520004 */ addiu $s2, $s2, 4 -/* 176D94 802484B4 16600048 */ bnez $s3, .L802485D8 -/* 176D98 802484B8 0000882D */ daddu $s1, $zero, $zero -/* 176D9C 802484BC 3C04FFF7 */ lui $a0, 0xfff7 -/* 176DA0 802484C0 3484FFFF */ ori $a0, $a0, 0xffff -/* 176DA4 802484C4 02A0182D */ daddu $v1, $s5, $zero -.L802484C8: -/* 176DA8 802484C8 8C7000E0 */ lw $s0, 0xe0($v1) -/* 176DAC 802484CC 12000004 */ beqz $s0, .L802484E0 -/* 176DB0 802484D0 26310001 */ addiu $s1, $s1, 1 -/* 176DB4 802484D4 8E020000 */ lw $v0, ($s0) -/* 176DB8 802484D8 00441024 */ and $v0, $v0, $a0 -/* 176DBC 802484DC AE020000 */ sw $v0, ($s0) -.L802484E0: -/* 176DC0 802484E0 2A220018 */ slti $v0, $s1, 0x18 -/* 176DC4 802484E4 1440FFF8 */ bnez $v0, .L802484C8 -/* 176DC8 802484E8 24630004 */ addiu $v1, $v1, 4 -/* 176DCC 802484EC 82A2008C */ lb $v0, 0x8c($s5) -/* 176DD0 802484F0 14400039 */ bnez $v0, .L802485D8 -/* 176DD4 802484F4 00000000 */ nop -/* 176DD8 802484F8 0C03A6CC */ jal decrement_status_menu_disabled -/* 176DDC 802484FC 00000000 */ nop -/* 176DE0 80248500 0C098D19 */ jal btl_check_player_defeated -/* 176DE4 80248504 00000000 */ nop -/* 176DE8 80248508 14400033 */ bnez $v0, .L802485D8 -/* 176DEC 8024850C 00000000 */ nop -/* 176DF0 80248510 0C098D0D */ jal btl_check_enemies_defeated -/* 176DF4 80248514 00000000 */ nop -/* 176DF8 80248518 1440002F */ bnez $v0, .L802485D8 -/* 176DFC 8024851C 00000000 */ nop -/* 176E00 80248520 0C09A75B */ jal get_actor -/* 176E04 80248524 86840428 */ lh $a0, 0x428($s4) -/* 176E08 80248528 0040802D */ daddu $s0, $v0, $zero -/* 176E0C 8024852C 12000010 */ beqz $s0, .L80248570 -/* 176E10 80248530 24020003 */ addiu $v0, $zero, 3 -/* 176E14 80248534 8E0201C8 */ lw $v0, 0x1c8($s0) -/* 176E18 80248538 1040000C */ beqz $v0, .L8024856C -/* 176E1C 8024853C 2405000A */ addiu $a1, $zero, 0xa -/* 176E20 80248540 24060020 */ addiu $a2, $zero, 0x20 -/* 176E24 80248544 0040202D */ daddu $a0, $v0, $zero -/* 176E28 80248548 24020035 */ addiu $v0, $zero, 0x35 -/* 176E2C 8024854C 0C0B0CF8 */ jal start_script -/* 176E30 80248550 A20201F0 */ sb $v0, 0x1f0($s0) -/* 176E34 80248554 0040202D */ daddu $a0, $v0, $zero -/* 176E38 80248558 AE0401D8 */ sw $a0, 0x1d8($s0) -/* 176E3C 8024855C 8C820144 */ lw $v0, 0x144($a0) -/* 176E40 80248560 86030192 */ lh $v1, 0x192($s0) -/* 176E44 80248564 AE0201E8 */ sw $v0, 0x1e8($s0) -/* 176E48 80248568 AC830148 */ sw $v1, 0x148($a0) -.L8024856C: -/* 176E4C 8024856C 24020003 */ addiu $v0, $zero, 3 -.L80248570: -/* 176E50 80248570 3C01800E */ lui $at, %hi(gBattleState2) -/* 176E54 80248574 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 176E58 80248578 08092176 */ j .L802485D8 -/* 176E5C 8024857C 00000000 */ nop -.L80248580: -/* 176E60 80248580 0260882D */ daddu $s1, $s3, $zero -/* 176E64 80248584 02A0902D */ daddu $s2, $s5, $zero -.L80248588: -/* 176E68 80248588 8E5000E0 */ lw $s0, 0xe0($s2) -/* 176E6C 8024858C 5200000B */ beql $s0, $zero, .L802485BC -/* 176E70 80248590 26310001 */ addiu $s1, $s1, 1 -/* 176E74 80248594 8E0201D8 */ lw $v0, 0x1d8($s0) -/* 176E78 80248598 50400008 */ beql $v0, $zero, .L802485BC -/* 176E7C 8024859C 26310001 */ addiu $s1, $s1, 1 -/* 176E80 802485A0 8E0401E8 */ lw $a0, 0x1e8($s0) -/* 176E84 802485A4 0C0B1059 */ jal does_script_exist -/* 176E88 802485A8 00000000 */ nop -/* 176E8C 802485AC 50400002 */ beql $v0, $zero, .L802485B8 -/* 176E90 802485B0 AE0001D8 */ sw $zero, 0x1d8($s0) -/* 176E94 802485B4 24130001 */ addiu $s3, $zero, 1 -.L802485B8: -/* 176E98 802485B8 26310001 */ addiu $s1, $s1, 1 -.L802485BC: -/* 176E9C 802485BC 2A220018 */ slti $v0, $s1, 0x18 -/* 176EA0 802485C0 1440FFF1 */ bnez $v0, .L80248588 -/* 176EA4 802485C4 26520004 */ addiu $s2, $s2, 4 -/* 176EA8 802485C8 16600003 */ bnez $s3, .L802485D8 -/* 176EAC 802485CC 00000000 */ nop -/* 176EB0 802485D0 0C090464 */ jal btl_set_state -/* 176EB4 802485D4 24040005 */ addiu $a0, $zero, 5 -.L802485D8: -/* 176EB8 802485D8 8FBF0028 */ lw $ra, 0x28($sp) -/* 176EBC 802485DC 8FB50024 */ lw $s5, 0x24($sp) -/* 176EC0 802485E0 8FB40020 */ lw $s4, 0x20($sp) -/* 176EC4 802485E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 176EC8 802485E8 8FB20018 */ lw $s2, 0x18($sp) -/* 176ECC 802485EC 8FB10014 */ lw $s1, 0x14($sp) -/* 176ED0 802485F0 8FB00010 */ lw $s0, 0x10($sp) -/* 176ED4 802485F4 03E00008 */ jr $ra -/* 176ED8 802485F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/16F740/btl_state_update_run_away.s b/ver/us/asm/nonmatchings/16F740/btl_state_update_run_away.s deleted file mode 100644 index 115445a05e..0000000000 --- a/ver/us/asm/nonmatchings/16F740/btl_state_update_run_away.s +++ /dev/null @@ -1,366 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel btl_state_update_run_away -/* 1737E0 80244F00 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 1737E4 80244F04 AFB1001C */ sw $s1, 0x1c($sp) -/* 1737E8 80244F08 3C11800E */ lui $s1, %hi(gBattleStatus) -/* 1737EC 80244F0C 2631C070 */ addiu $s1, $s1, %lo(gBattleStatus) -/* 1737F0 80244F10 AFB5002C */ sw $s5, 0x2c($sp) -/* 1737F4 80244F14 3C158011 */ lui $s5, %hi(gPlayerData) -/* 1737F8 80244F18 26B5F290 */ addiu $s5, $s5, %lo(gPlayerData) -/* 1737FC 80244F1C AFB40028 */ sw $s4, 0x28($sp) -/* 173800 80244F20 3C14800E */ lui $s4, %hi(gBattleState2) -/* 173804 80244F24 2694C4DC */ addiu $s4, $s4, %lo(gBattleState2) -/* 173808 80244F28 AFBF0030 */ sw $ra, 0x30($sp) -/* 17380C 80244F2C AFB30024 */ sw $s3, 0x24($sp) -/* 173810 80244F30 AFB20020 */ sw $s2, 0x20($sp) -/* 173814 80244F34 AFB00018 */ sw $s0, 0x18($sp) -/* 173818 80244F38 8E3300D8 */ lw $s3, 0xd8($s1) -/* 17381C 80244F3C 8E900000 */ lw $s0, ($s4) -/* 173820 80244F40 8E3200DC */ lw $s2, 0xdc($s1) -/* 173824 80244F44 12000005 */ beqz $s0, .L80244F5C -/* 173828 80244F48 24020002 */ addiu $v0, $zero, 2 -/* 17382C 80244F4C 12020060 */ beq $s0, $v0, .L802450D0 -/* 173830 80244F50 00000000 */ nop -/* 173834 80244F54 0809146D */ j .L802451B4 -/* 173838 80244F58 00000000 */ nop -.L80244F5C: -/* 17383C 80244F5C 3C03FFFB */ lui $v1, 0xfffb -/* 173840 80244F60 3463FFFF */ ori $v1, $v1, 0xffff -/* 173844 80244F64 24040019 */ addiu $a0, $zero, 0x19 -/* 173848 80244F68 8E220000 */ lw $v0, ($s1) -/* 17384C 80244F6C 0000802D */ daddu $s0, $zero, $zero -/* 173850 80244F70 A220008C */ sb $zero, 0x8c($s1) -/* 173854 80244F74 00431024 */ and $v0, $v0, $v1 -/* 173858 80244F78 AE220000 */ sw $v0, ($s1) -/* 17385C 80244F7C 8E220004 */ lw $v0, 4($s1) -/* 173860 80244F80 96A302A6 */ lhu $v1, 0x2a6($s5) -/* 173864 80244F84 3442001E */ ori $v0, $v0, 0x1e -/* 173868 80244F88 24630001 */ addiu $v1, $v1, 1 -/* 17386C 80244F8C AE220004 */ sw $v0, 4($s1) -/* 173870 80244F90 0C093903 */ jal btl_cam_use_preset -/* 173874 80244F94 A6A302A6 */ sh $v1, 0x2a6($s5) -/* 173878 80244F98 0C09390F */ jal btl_cam_target_actor -/* 17387C 80244F9C 0200202D */ daddu $a0, $s0, $zero -/* 173880 80244FA0 0200302D */ daddu $a2, $s0, $zero -/* 173884 80244FA4 3C070040 */ lui $a3, 0x40 -/* 173888 80244FA8 0220282D */ daddu $a1, $s1, $zero -/* 17388C 80244FAC 44801000 */ mtc1 $zero, $f2 -.L80244FB0: -/* 173890 80244FB0 8CA400E0 */ lw $a0, 0xe0($a1) -/* 173894 80244FB4 50800017 */ beql $a0, $zero, .L80245014 -/* 173898 80244FB8 24C60001 */ addiu $a2, $a2, 1 -/* 17389C 80244FBC 8C830000 */ lw $v1, ($a0) -/* 1738A0 80244FC0 30624000 */ andi $v0, $v1, 0x4000 -/* 1738A4 80244FC4 54400013 */ bnel $v0, $zero, .L80245014 -/* 1738A8 80244FC8 24C60001 */ addiu $a2, $a2, 1 -/* 1738AC 80244FCC 00671024 */ and $v0, $v1, $a3 -/* 1738B0 80244FD0 54400010 */ bnel $v0, $zero, .L80245014 -/* 1738B4 80244FD4 24C60001 */ addiu $a2, $a2, 1 -/* 1738B8 80244FD8 8C820008 */ lw $v0, 8($a0) -/* 1738BC 80244FDC 90430018 */ lbu $v1, 0x18($v0) -/* 1738C0 80244FE0 90820210 */ lbu $v0, 0x210($a0) -/* 1738C4 80244FE4 44830000 */ mtc1 $v1, $f0 -/* 1738C8 80244FE8 00000000 */ nop -/* 1738CC 80244FEC 46800020 */ cvt.s.w $f0, $f0 -/* 1738D0 80244FF0 2442FFFD */ addiu $v0, $v0, -3 -/* 1738D4 80244FF4 2C420006 */ sltiu $v0, $v0, 6 -/* 1738D8 80244FF8 10400004 */ beqz $v0, .L8024500C -/* 1738DC 80244FFC 26100001 */ addiu $s0, $s0, 1 -/* 1738E0 80245000 3C0142C8 */ lui $at, 0x42c8 -/* 1738E4 80245004 44810000 */ mtc1 $at, $f0 -/* 1738E8 80245008 00000000 */ nop -.L8024500C: -/* 1738EC 8024500C 46001080 */ add.s $f2, $f2, $f0 -/* 1738F0 80245010 24C60001 */ addiu $a2, $a2, 1 -.L80245014: -/* 1738F4 80245014 28C20018 */ slti $v0, $a2, 0x18 -/* 1738F8 80245018 1440FFE5 */ bnez $v0, .L80244FB0 -/* 1738FC 8024501C 24A50004 */ addiu $a1, $a1, 4 -/* 173900 80245020 44900000 */ mtc1 $s0, $f0 -/* 173904 80245024 00000000 */ nop -/* 173908 80245028 46800020 */ cvt.s.w $f0, $f0 -/* 17390C 8024502C 46001003 */ div.s $f0, $f2, $f0 -/* 173910 80245030 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 173914 80245034 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 173918 80245038 4600010D */ trunc.w.s $f4, $f0 -/* 17391C 8024503C E6640088 */ swc1 $f4, 0x88($s3) -/* 173920 80245040 80430074 */ lb $v1, 0x74($v0) -/* 173924 80245044 24020004 */ addiu $v0, $zero, 4 -/* 173928 80245048 14620002 */ bne $v1, $v0, .L80245054 -/* 17392C 8024504C 24020064 */ addiu $v0, $zero, 0x64 -/* 173930 80245050 AE620088 */ sw $v0, 0x88($s3) -.L80245054: -/* 173934 80245054 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) -/* 173938 80245058 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) -/* 17393C 8024505C 2405000A */ addiu $a1, $zero, 0xa -/* 173940 80245060 0000302D */ daddu $a2, $zero, $zero -/* 173944 80245064 24020003 */ addiu $v0, $zero, 3 -/* 173948 80245068 0C0B0CF8 */ jal start_script -/* 17394C 8024506C A22201A7 */ sb $v0, 0x1a7($s1) -/* 173950 80245070 0040182D */ daddu $v1, $v0, $zero -/* 173954 80245074 AE6301D4 */ sw $v1, 0x1d4($s3) -/* 173958 80245078 8C620144 */ lw $v0, 0x144($v1) -/* 17395C 8024507C AE6201E4 */ sw $v0, 0x1e4($s3) -/* 173960 80245080 1240000E */ beqz $s2, .L802450BC -/* 173964 80245084 AC600148 */ sw $zero, 0x148($v1) -/* 173968 80245088 82420216 */ lb $v0, 0x216($s2) -/* 17396C 8024508C 1440000C */ bnez $v0, .L802450C0 -/* 173970 80245090 24020002 */ addiu $v0, $zero, 2 -/* 173974 80245094 2405000A */ addiu $a1, $zero, 0xa -/* 173978 80245098 8E4401C4 */ lw $a0, 0x1c4($s2) -/* 17397C 8024509C 0C0B0CF8 */ jal start_script -/* 173980 802450A0 0000302D */ daddu $a2, $zero, $zero -/* 173984 802450A4 0040182D */ daddu $v1, $v0, $zero -/* 173988 802450A8 AE4301D4 */ sw $v1, 0x1d4($s2) -/* 17398C 802450AC 8C620144 */ lw $v0, 0x144($v1) -/* 173990 802450B0 AE4201E4 */ sw $v0, 0x1e4($s2) -/* 173994 802450B4 24020100 */ addiu $v0, $zero, 0x100 -/* 173998 802450B8 AC620148 */ sw $v0, 0x148($v1) -.L802450BC: -/* 17399C 802450BC 24020002 */ addiu $v0, $zero, 2 -.L802450C0: -/* 1739A0 802450C0 3C01800E */ lui $at, %hi(gBattleState2) -/* 1739A4 802450C4 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 1739A8 802450C8 0809146D */ j .L802451B4 -/* 1739AC 802450CC 00000000 */ nop -.L802450D0: -/* 1739B0 802450D0 0C0B1059 */ jal does_script_exist -/* 1739B4 802450D4 8E6401E4 */ lw $a0, 0x1e4($s3) -/* 1739B8 802450D8 14400036 */ bnez $v0, .L802451B4 -/* 1739BC 802450DC 00000000 */ nop -/* 1739C0 802450E0 8222008C */ lb $v0, 0x8c($s1) -/* 1739C4 802450E4 14400033 */ bnez $v0, .L802451B4 -/* 1739C8 802450E8 3C030004 */ lui $v1, 4 -/* 1739CC 802450EC 8E220000 */ lw $v0, ($s1) -/* 1739D0 802450F0 00431024 */ and $v0, $v0, $v1 -/* 1739D4 802450F4 14400003 */ bnez $v0, .L80245104 -/* 1739D8 802450F8 24020003 */ addiu $v0, $zero, 3 -/* 1739DC 802450FC 0809146D */ j .L802451B4 -/* 1739E0 80245100 AE820000 */ sw $v0, ($s4) -.L80245104: -/* 1739E4 80245104 3C02800B */ lui $v0, %hi(gCurrentEncounter) -/* 1739E8 80245108 24420F10 */ addiu $v0, $v0, %lo(gCurrentEncounter) -/* 1739EC 8024510C A0500009 */ sb $s0, 9($v0) -/* 1739F0 80245110 0C03A752 */ jal is_ability_active -/* 1739F4 80245114 24040017 */ addiu $a0, $zero, 0x17 -/* 1739F8 80245118 14400003 */ bnez $v0, .L80245128 -/* 1739FC 8024511C 2402000B */ addiu $v0, $zero, 0xb -/* 173A00 80245120 0809146D */ j .L802451B4 -/* 173A04 80245124 AE820000 */ sw $v0, ($s4) -.L80245128: -/* 173A08 80245128 0C03A6B9 */ jal status_menu_start_blinking_starpoints -/* 173A0C 8024512C 00000000 */ nop -/* 173A10 80245130 0C08F841 */ jal func_8023E104 -/* 173A14 80245134 00000000 */ nop -/* 173A18 80245138 82230078 */ lb $v1, 0x78($s1) -/* 173A1C 8024513C 00031040 */ sll $v0, $v1, 1 -/* 173A20 80245140 00431021 */ addu $v0, $v0, $v1 -/* 173A24 80245144 000210C0 */ sll $v0, $v0, 3 -/* 173A28 80245148 00431021 */ addu $v0, $v0, $v1 -/* 173A2C 8024514C 00021080 */ sll $v0, $v0, 2 -/* 173A30 80245150 24030014 */ addiu $v1, $zero, 0x14 -/* 173A34 80245154 14600002 */ bnez $v1, .L80245160 -/* 173A38 80245158 0043001A */ div $zero, $v0, $v1 -/* 173A3C 8024515C 0007000D */ break 7 -.L80245160: -/* 173A40 80245160 2401FFFF */ addiu $at, $zero, -1 -/* 173A44 80245164 14610004 */ bne $v1, $at, .L80245178 -/* 173A48 80245168 3C018000 */ lui $at, 0x8000 -/* 173A4C 8024516C 14410002 */ bne $v0, $at, .L80245178 -/* 173A50 80245170 00000000 */ nop -/* 173A54 80245174 0006000D */ break 6 -.L80245178: -/* 173A58 80245178 00002012 */ mflo $a0 -/* 173A5C 8024517C 3C01802A */ lui $at, %hi(D_8029F264) -/* 173A60 80245180 AC20F264 */ sw $zero, %lo(D_8029F264)($at) -/* 173A64 80245184 3C01802A */ lui $at, %hi(D_8029F24C) -/* 173A68 80245188 AC20F24C */ sw $zero, %lo(D_8029F24C)($at) -/* 173A6C 8024518C 3C018028 */ lui $at, %hi(D_80280A30) -/* 173A70 80245190 AC200A30 */ sw $zero, %lo(D_80280A30)($at) -/* 173A74 80245194 3C01802A */ lui $at, %hi(D_8029F250) -/* 173A78 80245198 AC23F250 */ sw $v1, %lo(D_8029F250)($at) -/* 173A7C 8024519C 2403000A */ addiu $v1, $zero, 0xa -/* 173A80 802451A0 AE830000 */ sw $v1, ($s4) -/* 173A84 802451A4 3C01802A */ lui $at, %hi(D_8029F25C) -/* 173A88 802451A8 AC22F25C */ sw $v0, %lo(D_8029F25C)($at) -/* 173A8C 802451AC 3C01802A */ lui $at, %hi(D_8029F260) -/* 173A90 802451B0 AC24F260 */ sw $a0, %lo(D_8029F260)($at) -.L802451B4: -/* 173A94 802451B4 3C03800E */ lui $v1, %hi(gBattleState2) -/* 173A98 802451B8 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) -/* 173A9C 802451BC 2402000A */ addiu $v0, $zero, 0xa -/* 173AA0 802451C0 14620043 */ bne $v1, $v0, .L802452D0 -/* 173AA4 802451C4 2402000B */ addiu $v0, $zero, 0xb -/* 173AA8 802451C8 82220078 */ lb $v0, 0x78($s1) -/* 173AAC 802451CC 10400027 */ beqz $v0, .L8024526C -/* 173AB0 802451D0 3C0551EB */ lui $a1, 0x51eb -/* 173AB4 802451D4 3C04802A */ lui $a0, %hi(D_8029F25C) -/* 173AB8 802451D8 2484F25C */ addiu $a0, $a0, %lo(D_8029F25C) -/* 173ABC 802451DC 8C820000 */ lw $v0, ($a0) -/* 173AC0 802451E0 3C03802A */ lui $v1, %hi(D_8029F260) -/* 173AC4 802451E4 8C63F260 */ lw $v1, %lo(D_8029F260)($v1) -/* 173AC8 802451E8 34A5851F */ ori $a1, $a1, 0x851f -/* 173ACC 802451EC 00431023 */ subu $v0, $v0, $v1 -/* 173AD0 802451F0 00450018 */ mult $v0, $a1 -/* 173AD4 802451F4 AC820000 */ sw $v0, ($a0) -/* 173AD8 802451F8 000217C3 */ sra $v0, $v0, 0x1f -/* 173ADC 802451FC 82240078 */ lb $a0, 0x78($s1) -/* 173AE0 80245200 00004010 */ mfhi $t0 -/* 173AE4 80245204 00081943 */ sra $v1, $t0, 5 -/* 173AE8 80245208 00621823 */ subu $v1, $v1, $v0 -/* 173AEC 8024520C 00031600 */ sll $v0, $v1, 0x18 -/* 173AF0 80245210 00021603 */ sra $v0, $v0, 0x18 -/* 173AF4 80245214 00828023 */ subu $s0, $a0, $v0 -/* 173AF8 80245218 1A000003 */ blez $s0, .L80245228 -/* 173AFC 8024521C A2230078 */ sb $v1, 0x78($s1) -/* 173B00 80245220 0C05272D */ jal sfx_play_sound -/* 173B04 80245224 24040211 */ addiu $a0, $zero, 0x211 -.L80245228: -/* 173B08 80245228 92A20010 */ lbu $v0, 0x10($s5) -/* 173B0C 8024522C 3C038028 */ lui $v1, %hi(D_80280A30) -/* 173B10 80245230 24630A30 */ addiu $v1, $v1, %lo(D_80280A30) -/* 173B14 80245234 00501021 */ addu $v0, $v0, $s0 -/* 173B18 80245238 A2A20010 */ sb $v0, 0x10($s5) -/* 173B1C 8024523C 8C620000 */ lw $v0, ($v1) -/* 173B20 80245240 3C04802A */ lui $a0, %hi(D_8029F250) -/* 173B24 80245244 8C84F250 */ lw $a0, %lo(D_8029F250)($a0) -/* 173B28 80245248 24420001 */ addiu $v0, $v0, 1 -/* 173B2C 8024524C 14800007 */ bnez $a0, .L8024526C -/* 173B30 80245250 AC620000 */ sw $v0, ($v1) -/* 173B34 80245254 82220078 */ lb $v0, 0x78($s1) -/* 173B38 80245258 10400004 */ beqz $v0, .L8024526C -/* 173B3C 8024525C 00000000 */ nop -/* 173B40 80245260 92A20010 */ lbu $v0, 0x10($s5) -/* 173B44 80245264 24420001 */ addiu $v0, $v0, 1 -/* 173B48 80245268 A2A20010 */ sb $v0, 0x10($s5) -.L8024526C: -/* 173B4C 8024526C 82A20010 */ lb $v0, 0x10($s5) -/* 173B50 80245270 28420063 */ slti $v0, $v0, 0x63 -/* 173B54 80245274 14400002 */ bnez $v0, .L80245280 -/* 173B58 80245278 24020063 */ addiu $v0, $zero, 0x63 -/* 173B5C 8024527C A2A20010 */ sb $v0, 0x10($s5) -.L80245280: -/* 173B60 80245280 82220078 */ lb $v0, 0x78($s1) -/* 173B64 80245284 1440000F */ bnez $v0, .L802452C4 -/* 173B68 80245288 00000000 */ nop -/* 173B6C 8024528C 3C03802A */ lui $v1, %hi(D_8029F250) -/* 173B70 80245290 2463F250 */ addiu $v1, $v1, %lo(D_8029F250) -/* 173B74 80245294 8C620000 */ lw $v0, ($v1) -/* 173B78 80245298 10400003 */ beqz $v0, .L802452A8 -/* 173B7C 8024529C 2442FFFF */ addiu $v0, $v0, -1 -/* 173B80 802452A0 080914B1 */ j .L802452C4 -/* 173B84 802452A4 AC620000 */ sw $v0, ($v1) -.L802452A8: -/* 173B88 802452A8 0C03A6C3 */ jal status_menu_stop_blinking_starpoints -/* 173B8C 802452AC 00000000 */ nop -/* 173B90 802452B0 0C08F847 */ jal func_8023E11C -/* 173B94 802452B4 00000000 */ nop -/* 173B98 802452B8 2402000B */ addiu $v0, $zero, 0xb -/* 173B9C 802452BC 3C01800E */ lui $at, %hi(gBattleState2) -/* 173BA0 802452C0 AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -.L802452C4: -/* 173BA4 802452C4 3C03800E */ lui $v1, %hi(gBattleState2) -/* 173BA8 802452C8 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) -/* 173BAC 802452CC 2402000B */ addiu $v0, $zero, 0xb -.L802452D0: -/* 173BB0 802452D0 14620011 */ bne $v1, $v0, .L80245318 -/* 173BB4 802452D4 3C030200 */ lui $v1, 0x200 -/* 173BB8 802452D8 96A202A8 */ lhu $v0, 0x2a8($s5) -/* 173BBC 802452DC 24420001 */ addiu $v0, $v0, 1 -/* 173BC0 802452E0 A6A202A8 */ sh $v0, 0x2a8($s5) -/* 173BC4 802452E4 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) -/* 173BC8 802452E8 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) -/* 173BCC 802452EC 00431024 */ and $v0, $v0, $v1 -/* 173BD0 802452F0 14400007 */ bnez $v0, .L80245310 -/* 173BD4 802452F4 24020008 */ addiu $v0, $zero, 8 -/* 173BD8 802452F8 AFA20010 */ sw $v0, 0x10($sp) -/* 173BDC 802452FC 0000202D */ daddu $a0, $zero, $zero -/* 173BE0 80245300 2405FFFF */ addiu $a1, $zero, -1 -/* 173BE4 80245304 0080302D */ daddu $a2, $a0, $zero -/* 173BE8 80245308 0C052A46 */ jal bgm_set_song -/* 173BEC 8024530C 240705DC */ addiu $a3, $zero, 0x5dc -.L80245310: -/* 173BF0 80245310 0C090464 */ jal btl_set_state -/* 173BF4 80245314 24040020 */ addiu $a0, $zero, 0x20 -.L80245318: -/* 173BF8 80245318 3C03800E */ lui $v1, %hi(gBattleState2) -/* 173BFC 8024531C 8C63C4DC */ lw $v1, %lo(gBattleState2)($v1) -/* 173C00 80245320 24020003 */ addiu $v0, $zero, 3 -/* 173C04 80245324 10620005 */ beq $v1, $v0, .L8024533C -/* 173C08 80245328 24020004 */ addiu $v0, $zero, 4 -/* 173C0C 8024532C 10620022 */ beq $v1, $v0, .L802453B8 -/* 173C10 80245330 00000000 */ nop -/* 173C14 80245334 08091505 */ j .L80245414 -/* 173C18 80245338 00000000 */ nop -.L8024533C: -/* 173C1C 8024533C 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) -/* 173C20 80245340 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) -/* 173C24 80245344 2405000A */ addiu $a1, $zero, 0xa -/* 173C28 80245348 0000302D */ daddu $a2, $zero, $zero -/* 173C2C 8024534C 24020007 */ addiu $v0, $zero, 7 -/* 173C30 80245350 0C0B0CF8 */ jal start_script -/* 173C34 80245354 A22201A7 */ sb $v0, 0x1a7($s1) -/* 173C38 80245358 0040182D */ daddu $v1, $v0, $zero -/* 173C3C 8024535C AE6301D4 */ sw $v1, 0x1d4($s3) -/* 173C40 80245360 8C620144 */ lw $v0, 0x144($v1) -/* 173C44 80245364 AE6201E4 */ sw $v0, 0x1e4($s3) -/* 173C48 80245368 1240000E */ beqz $s2, .L802453A4 -/* 173C4C 8024536C AC600148 */ sw $zero, 0x148($v1) -/* 173C50 80245370 82420216 */ lb $v0, 0x216($s2) -/* 173C54 80245374 1440000C */ bnez $v0, .L802453A8 -/* 173C58 80245378 24020004 */ addiu $v0, $zero, 4 -/* 173C5C 8024537C 2405000A */ addiu $a1, $zero, 0xa -/* 173C60 80245380 8E4401C4 */ lw $a0, 0x1c4($s2) -/* 173C64 80245384 0C0B0CF8 */ jal start_script -/* 173C68 80245388 0000302D */ daddu $a2, $zero, $zero -/* 173C6C 8024538C 0040182D */ daddu $v1, $v0, $zero -/* 173C70 80245390 AE4301D4 */ sw $v1, 0x1d4($s2) -/* 173C74 80245394 8C620144 */ lw $v0, 0x144($v1) -/* 173C78 80245398 AE4201E4 */ sw $v0, 0x1e4($s2) -/* 173C7C 8024539C 24020100 */ addiu $v0, $zero, 0x100 -/* 173C80 802453A0 AC620148 */ sw $v0, 0x148($v1) -.L802453A4: -/* 173C84 802453A4 24020004 */ addiu $v0, $zero, 4 -.L802453A8: -/* 173C88 802453A8 3C01800E */ lui $at, %hi(gBattleState2) -/* 173C8C 802453AC AC22C4DC */ sw $v0, %lo(gBattleState2)($at) -/* 173C90 802453B0 08091505 */ j .L80245414 -/* 173C94 802453B4 00000000 */ nop -.L802453B8: -/* 173C98 802453B8 3C03802A */ lui $v1, %hi(D_8029F248) -/* 173C9C 802453BC 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) -/* 173CA0 802453C0 8C620000 */ lw $v0, ($v1) -/* 173CA4 802453C4 10400003 */ beqz $v0, .L802453D4 -/* 173CA8 802453C8 2442FFFF */ addiu $v0, $v0, -1 -/* 173CAC 802453CC 08091505 */ j .L80245414 -/* 173CB0 802453D0 AC620000 */ sw $v0, ($v1) -.L802453D4: -/* 173CB4 802453D4 8E6401E4 */ lw $a0, 0x1e4($s3) -/* 173CB8 802453D8 0C0B1059 */ jal does_script_exist -/* 173CBC 802453DC 00000000 */ nop -/* 173CC0 802453E0 1440000C */ bnez $v0, .L80245414 -/* 173CC4 802453E4 00000000 */ nop -/* 173CC8 802453E8 12400005 */ beqz $s2, .L80245400 -/* 173CCC 802453EC 00000000 */ nop -/* 173CD0 802453F0 0C0B1059 */ jal does_script_exist -/* 173CD4 802453F4 8E4401E4 */ lw $a0, 0x1e4($s2) -/* 173CD8 802453F8 14400006 */ bnez $v0, .L80245414 -/* 173CDC 802453FC 00000000 */ nop -.L80245400: -/* 173CE0 80245400 8222008C */ lb $v0, 0x8c($s1) -/* 173CE4 80245404 14400003 */ bnez $v0, .L80245414 -/* 173CE8 80245408 00000000 */ nop -/* 173CEC 8024540C 0C090464 */ jal btl_set_state -/* 173CF0 80245410 24040009 */ addiu $a0, $zero, 9 -.L80245414: -/* 173CF4 80245414 8FBF0030 */ lw $ra, 0x30($sp) -/* 173CF8 80245418 8FB5002C */ lw $s5, 0x2c($sp) -/* 173CFC 8024541C 8FB40028 */ lw $s4, 0x28($sp) -/* 173D00 80245420 8FB30024 */ lw $s3, 0x24($sp) -/* 173D04 80245424 8FB20020 */ lw $s2, 0x20($sp) -/* 173D08 80245428 8FB1001C */ lw $s1, 0x1c($sp) -/* 173D0C 8024542C 8FB00018 */ lw $s0, 0x18($sp) -/* 173D10 80245430 03E00008 */ jr $ra -/* 173D14 80245434 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s deleted file mode 100644 index 352d784584..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s +++ /dev/null @@ -1,258 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802A9750_428A30 -.word .L802A9318_4285F8, .L802A93BC_42869C, .L802A9650_428930, .L802A9650_428930, .L802A9650_428930, .L802A9650_428930, .L802A9650_428930, .L802A9650_428930, .L802A9650_428930, .L802A9650_428930, .L802A9444_428724, .L802A94A8_428788, .L802A9630_428910, 0, 0, 0 - -.section .text - -glabel func_802A92D4_4285B4 -/* 4285B4 802A92D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 4285B8 802A92D8 AFB10014 */ sw $s1, 0x14($sp) -/* 4285BC 802A92DC 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 4285C0 802A92E0 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 4285C4 802A92E4 AFBF0018 */ sw $ra, 0x18($sp) -/* 4285C8 802A92E8 AFB00010 */ sw $s0, 0x10($sp) -/* 4285CC 802A92EC 8623004C */ lh $v1, 0x4c($s1) -/* 4285D0 802A92F0 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 4285D4 802A92F4 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 4285D8 802A92F8 2C62000D */ sltiu $v0, $v1, 0xd -/* 4285DC 802A92FC 104000D4 */ beqz $v0, .L802A9650_428930 -/* 4285E0 802A9300 00031080 */ sll $v0, $v1, 2 -/* 4285E4 802A9304 3C01802B */ lui $at, %hi(jtbl_802A9750_428A30) -/* 4285E8 802A9308 00220821 */ addu $at, $at, $v0 -/* 4285EC 802A930C 8C229750 */ lw $v0, %lo(jtbl_802A9750_428A30)($at) -/* 4285F0 802A9310 00400008 */ jr $v0 -/* 4285F4 802A9314 00000000 */ nop -.L802A9318_4285F8: -/* 4285F8 802A9318 0C093EB1 */ jal btl_set_popup_duration -/* 4285FC 802A931C 24040063 */ addiu $a0, $zero, 0x63 -/* 428600 802A9320 8E300004 */ lw $s0, 4($s1) -/* 428604 802A9324 240500FF */ addiu $a1, $zero, 0xff -/* 428608 802A9328 0C0513AC */ jal hud_element_set_alpha -/* 42860C 802A932C 0200202D */ daddu $a0, $s0, $zero -/* 428610 802A9330 82220061 */ lb $v0, 0x61($s1) -/* 428614 802A9334 10400003 */ beqz $v0, .L802A9344 -/* 428618 802A9338 0200202D */ daddu $a0, $s0, $zero -/* 42861C 802A933C 0C05128B */ jal hud_element_clear_flags -/* 428620 802A9340 24050002 */ addiu $a1, $zero, 2 -.L802A9344: -/* 428624 802A9344 8E300008 */ lw $s0, 8($s1) -/* 428628 802A9348 240500FF */ addiu $a1, $zero, 0xff -/* 42862C 802A934C 0C0513AC */ jal hud_element_set_alpha -/* 428630 802A9350 0200202D */ daddu $a0, $s0, $zero -/* 428634 802A9354 82220061 */ lb $v0, 0x61($s1) -/* 428638 802A9358 10400003 */ beqz $v0, .L802A9368 -/* 42863C 802A935C 0200202D */ daddu $a0, $s0, $zero -/* 428640 802A9360 0C05128B */ jal hud_element_clear_flags -/* 428644 802A9364 24050002 */ addiu $a1, $zero, 2 -.L802A9368: -/* 428648 802A9368 8E30000C */ lw $s0, 0xc($s1) -/* 42864C 802A936C 240500FF */ addiu $a1, $zero, 0xff -/* 428650 802A9370 0C0513AC */ jal hud_element_set_alpha -/* 428654 802A9374 0200202D */ daddu $a0, $s0, $zero -/* 428658 802A9378 82220061 */ lb $v0, 0x61($s1) -/* 42865C 802A937C 10400003 */ beqz $v0, .L802A938C -/* 428660 802A9380 0200202D */ daddu $a0, $s0, $zero -/* 428664 802A9384 0C05128B */ jal hud_element_clear_flags -/* 428668 802A9388 24050002 */ addiu $a1, $zero, 2 -.L802A938C: -/* 42866C 802A938C 8E300010 */ lw $s0, 0x10($s1) -/* 428670 802A9390 240500FF */ addiu $a1, $zero, 0xff -/* 428674 802A9394 0C0513AC */ jal hud_element_set_alpha -/* 428678 802A9398 0200202D */ daddu $a0, $s0, $zero -/* 42867C 802A939C 82220061 */ lb $v0, 0x61($s1) -/* 428680 802A93A0 10400003 */ beqz $v0, .L802A93B0 -/* 428684 802A93A4 0200202D */ daddu $a0, $s0, $zero -/* 428688 802A93A8 0C05128B */ jal hud_element_clear_flags -/* 42868C 802A93AC 24050002 */ addiu $a1, $zero, 2 -.L802A93B0: -/* 428690 802A93B0 24020001 */ addiu $v0, $zero, 1 -/* 428694 802A93B4 080AA594 */ j .L802A9650_428930 -/* 428698 802A93B8 A622004C */ sh $v0, 0x4c($s1) -.L802A93BC_42869C: -/* 42869C 802A93BC 0C093EB1 */ jal btl_set_popup_duration -/* 4286A0 802A93C0 24040063 */ addiu $a0, $zero, 0x63 -/* 4286A4 802A93C4 96220056 */ lhu $v0, 0x56($s1) -/* 4286A8 802A93C8 24420014 */ addiu $v0, $v0, 0x14 -/* 4286AC 802A93CC A6220056 */ sh $v0, 0x56($s1) -/* 4286B0 802A93D0 00021400 */ sll $v0, $v0, 0x10 -/* 4286B4 802A93D4 00021403 */ sra $v0, $v0, 0x10 -/* 4286B8 802A93D8 28420033 */ slti $v0, $v0, 0x33 -/* 4286BC 802A93DC 14400002 */ bnez $v0, .L802A93E8 -/* 4286C0 802A93E0 24020032 */ addiu $v0, $zero, 0x32 -/* 4286C4 802A93E4 A6220056 */ sh $v0, 0x56($s1) -.L802A93E8: -/* 4286C8 802A93E8 8E240004 */ lw $a0, 4($s1) -/* 4286CC 802A93EC 86250056 */ lh $a1, 0x56($s1) -/* 4286D0 802A93F0 0C051261 */ jal hud_element_set_render_pos -/* 4286D4 802A93F4 86260058 */ lh $a2, 0x58($s1) -/* 4286D8 802A93F8 8E240008 */ lw $a0, 8($s1) -/* 4286DC 802A93FC 86260058 */ lh $a2, 0x58($s1) -/* 4286E0 802A9400 86250056 */ lh $a1, 0x56($s1) -/* 4286E4 802A9404 0C051261 */ jal hud_element_set_render_pos -/* 4286E8 802A9408 24C6001C */ addiu $a2, $a2, 0x1c -/* 4286EC 802A940C 8E24000C */ lw $a0, 0xc($s1) -/* 4286F0 802A9410 86250056 */ lh $a1, 0x56($s1) -/* 4286F4 802A9414 86260058 */ lh $a2, 0x58($s1) -/* 4286F8 802A9418 24A50029 */ addiu $a1, $a1, 0x29 -/* 4286FC 802A941C 0C051261 */ jal hud_element_set_render_pos -/* 428700 802A9420 24C60016 */ addiu $a2, $a2, 0x16 -/* 428704 802A9424 8E240010 */ lw $a0, 0x10($s1) -/* 428708 802A9428 86250056 */ lh $a1, 0x56($s1) -/* 42870C 802A942C 86260058 */ lh $a2, 0x58($s1) -/* 428710 802A9430 24A5002A */ addiu $a1, $a1, 0x2a -/* 428714 802A9434 0C051261 */ jal hud_element_set_render_pos -/* 428718 802A9438 24C60018 */ addiu $a2, $a2, 0x18 -/* 42871C 802A943C 080AA594 */ j .L802A9650_428930 -/* 428720 802A9440 00000000 */ nop -.L802A9444_428724: -/* 428724 802A9444 0C093EB1 */ jal btl_set_popup_duration -/* 428728 802A9448 24040063 */ addiu $a0, $zero, 0x63 -/* 42872C 802A944C 8622004E */ lh $v0, 0x4e($s1) -/* 428730 802A9450 9623004E */ lhu $v1, 0x4e($s1) -/* 428734 802A9454 10400003 */ beqz $v0, .L802A9464 -/* 428738 802A9458 2462FFFF */ addiu $v0, $v1, -1 -/* 42873C 802A945C 080AA594 */ j .L802A9650_428930 -/* 428740 802A9460 A622004E */ sh $v0, 0x4e($s1) -.L802A9464: -/* 428744 802A9464 8E240004 */ lw $a0, 4($s1) -/* 428748 802A9468 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) -/* 42874C 802A946C 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 428750 802A9470 0C0511FF */ jal hud_element_set_script -/* 428754 802A9474 00000000 */ nop -/* 428758 802A9478 3C048000 */ lui $a0, 0x8000 -/* 42875C 802A947C 34840041 */ ori $a0, $a0, 0x41 -/* 428760 802A9480 0000282D */ daddu $a1, $zero, $zero -/* 428764 802A9484 00A0302D */ daddu $a2, $a1, $zero -/* 428768 802A9488 96220052 */ lhu $v0, 0x52($s1) -/* 42876C 802A948C 00A0382D */ daddu $a3, $a1, $zero -/* 428770 802A9490 A6200044 */ sh $zero, 0x44($s1) -/* 428774 802A9494 A6200046 */ sh $zero, 0x46($s1) -/* 428778 802A9498 0C0526AE */ jal sfx_play_sound_with_params -/* 42877C 802A949C A6220054 */ sh $v0, 0x54($s1) -/* 428780 802A94A0 2402000B */ addiu $v0, $zero, 0xb -/* 428784 802A94A4 A622004C */ sh $v0, 0x4c($s1) -.L802A94A8_428788: -/* 428788 802A94A8 0C093EB1 */ jal btl_set_popup_duration -/* 42878C 802A94AC 24040063 */ addiu $a0, $zero, 0x63 -/* 428790 802A94B0 8E020210 */ lw $v0, 0x210($s0) -/* 428794 802A94B4 30428000 */ andi $v0, $v0, 0x8000 -/* 428798 802A94B8 50400007 */ beql $v0, $zero, .L802A94D8 -/* 42879C 802A94BC A6200054 */ sh $zero, 0x54($s1) -/* 4287A0 802A94C0 96220044 */ lhu $v0, 0x44($s1) -/* 4287A4 802A94C4 96230046 */ lhu $v1, 0x46($s1) -/* 4287A8 802A94C8 2442009A */ addiu $v0, $v0, 0x9a -/* 4287AC 802A94CC 2463009A */ addiu $v1, $v1, 0x9a -/* 4287B0 802A94D0 A6220044 */ sh $v0, 0x44($s1) -/* 4287B4 802A94D4 A6230046 */ sh $v1, 0x46($s1) -.L802A94D8: -/* 4287B8 802A94D8 86220044 */ lh $v0, 0x44($s1) -/* 4287BC 802A94DC 28422710 */ slti $v0, $v0, 0x2710 -/* 4287C0 802A94E0 14400014 */ bnez $v0, .L802A9534 -/* 4287C4 802A94E4 3C0451EB */ lui $a0, 0x51eb -/* 4287C8 802A94E8 3C058029 */ lui $a1, %hi(HudScript_TimingReady) -/* 4287CC 802A94EC 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 4287D0 802A94F0 8E24000C */ lw $a0, 0xc($s1) -/* 4287D4 802A94F4 24022710 */ addiu $v0, $zero, 0x2710 -/* 4287D8 802A94F8 0C0511FF */ jal hud_element_set_script -/* 4287DC 802A94FC A6220044 */ sh $v0, 0x44($s1) -/* 4287E0 802A9500 8E240004 */ lw $a0, 4($s1) -/* 4287E4 802A9504 3C058011 */ lui $a1, %hi(HudScript_AButton) -/* 4287E8 802A9508 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 4287EC 802A950C 0C0511FF */ jal hud_element_set_script -/* 4287F0 802A9510 00000000 */ nop -/* 4287F4 802A9514 86220068 */ lh $v0, 0x68($s1) -/* 4287F8 802A9518 14400006 */ bnez $v0, .L802A9534 -/* 4287FC 802A951C 3C0451EB */ lui $a0, 0x51eb -/* 428800 802A9520 0C05272D */ jal sfx_play_sound -/* 428804 802A9524 24040234 */ addiu $a0, $zero, 0x234 -/* 428808 802A9528 24020001 */ addiu $v0, $zero, 1 -/* 42880C 802A952C A6220068 */ sh $v0, 0x68($s1) -/* 428810 802A9530 3C0451EB */ lui $a0, 0x51eb -.L802A9534: -/* 428814 802A9534 3484851F */ ori $a0, $a0, 0x851f -/* 428818 802A9538 96230044 */ lhu $v1, 0x44($s1) -/* 42881C 802A953C 0000282D */ daddu $a1, $zero, $zero -/* 428820 802A9540 00031C00 */ sll $v1, $v1, 0x10 -/* 428824 802A9544 00031403 */ sra $v0, $v1, 0x10 -/* 428828 802A9548 00440018 */ mult $v0, $a0 -/* 42882C 802A954C 00A0302D */ daddu $a2, $a1, $zero -/* 428830 802A9550 3C048000 */ lui $a0, 0x8000 -/* 428834 802A9554 34840041 */ ori $a0, $a0, 0x41 -/* 428838 802A9558 00031FC3 */ sra $v1, $v1, 0x1f -/* 42883C 802A955C 00004810 */ mfhi $t1 -/* 428840 802A9560 00094143 */ sra $t0, $t1, 5 -/* 428844 802A9564 01034023 */ subu $t0, $t0, $v1 -/* 428848 802A9568 00081600 */ sll $v0, $t0, 0x18 -/* 42884C 802A956C 00021603 */ sra $v0, $v0, 0x18 -/* 428850 802A9570 00023840 */ sll $a3, $v0, 1 -/* 428854 802A9574 00E23821 */ addu $a3, $a3, $v0 -/* 428858 802A9578 00073880 */ sll $a3, $a3, 2 -/* 42885C 802A957C 0C0526F9 */ jal sfx_adjust_env_sound_params -/* 428860 802A9580 A2080084 */ sb $t0, 0x84($s0) -/* 428864 802A9584 86220054 */ lh $v0, 0x54($s1) -/* 428868 802A9588 96230054 */ lhu $v1, 0x54($s1) -/* 42886C 802A958C 10400005 */ beqz $v0, .L802A95A4 -/* 428870 802A9590 2462FFFF */ addiu $v0, $v1, -1 -/* 428874 802A9594 080AA594 */ j .L802A9650_428930 -/* 428878 802A9598 A6220054 */ sh $v0, 0x54($s1) -.L802A959C: -/* 42887C 802A959C 080AA57B */ j .L802A95EC -/* 428880 802A95A0 2402FFFF */ addiu $v0, $zero, -1 -.L802A95A4: -/* 428884 802A95A4 86250046 */ lh $a1, 0x46($s1) -/* 428888 802A95A8 28A22710 */ slti $v0, $a1, 0x2710 -/* 42888C 802A95AC 1440000F */ bnez $v0, .L802A95EC -/* 428890 802A95B0 2402FFFF */ addiu $v0, $zero, -1 -/* 428894 802A95B4 86220050 */ lh $v0, 0x50($s1) -/* 428898 802A95B8 8E030434 */ lw $v1, 0x434($s0) -/* 42889C 802A95BC 00021080 */ sll $v0, $v0, 2 -/* 4288A0 802A95C0 00431021 */ addu $v0, $v0, $v1 -/* 4288A4 802A95C4 8C440000 */ lw $a0, ($v0) -/* 4288A8 802A95C8 000410C0 */ sll $v0, $a0, 3 -/* 4288AC 802A95CC 00441021 */ addu $v0, $v0, $a0 -/* 4288B0 802A95D0 00021900 */ sll $v1, $v0, 4 -/* 4288B4 802A95D4 00431021 */ addu $v0, $v0, $v1 -/* 4288B8 802A95D8 00441021 */ addu $v0, $v0, $a0 -/* 4288BC 802A95DC 00A21023 */ subu $v0, $a1, $v0 -/* 4288C0 802A95E0 28422845 */ slti $v0, $v0, 0x2845 -/* 4288C4 802A95E4 1040FFED */ beqz $v0, .L802A959C -/* 4288C8 802A95E8 24020001 */ addiu $v0, $zero, 1 -.L802A95EC: -/* 4288CC 802A95EC A2020081 */ sb $v0, 0x81($s0) -/* 4288D0 802A95F0 82030081 */ lb $v1, 0x81($s0) -/* 4288D4 802A95F4 24020001 */ addiu $v0, $zero, 1 -/* 4288D8 802A95F8 14620003 */ bne $v1, $v0, .L802A9608 -/* 4288DC 802A95FC A2000086 */ sb $zero, 0x86($s0) -/* 4288E0 802A9600 0C09A458 */ jal func_80269160 -/* 4288E4 802A9604 00000000 */ nop -.L802A9608: -/* 4288E8 802A9608 0C093EB1 */ jal btl_set_popup_duration -/* 4288EC 802A960C 0000202D */ daddu $a0, $zero, $zero -/* 4288F0 802A9610 3C048000 */ lui $a0, 0x8000 -/* 4288F4 802A9614 0C05271B */ jal sfx_stop_sound -/* 4288F8 802A9618 34840041 */ ori $a0, $a0, 0x41 -/* 4288FC 802A961C 24020005 */ addiu $v0, $zero, 5 -/* 428900 802A9620 A6220054 */ sh $v0, 0x54($s1) -/* 428904 802A9624 2402000C */ addiu $v0, $zero, 0xc -/* 428908 802A9628 080AA594 */ j .L802A9650_428930 -/* 42890C 802A962C A622004C */ sh $v0, 0x4c($s1) -.L802A9630_428910: -/* 428910 802A9630 86220054 */ lh $v0, 0x54($s1) -/* 428914 802A9634 96230054 */ lhu $v1, 0x54($s1) -/* 428918 802A9638 10400003 */ beqz $v0, .L802A9648 -/* 42891C 802A963C 2462FFFF */ addiu $v0, $v1, -1 -/* 428920 802A9640 080AA594 */ j .L802A9650_428930 -/* 428924 802A9644 A6220054 */ sh $v0, 0x54($s1) -.L802A9648: -/* 428928 802A9648 0C09A327 */ jal func_80268C9C -/* 42892C 802A964C 00000000 */ nop -.L802A9650_428930: -/* 428930 802A9650 8FBF0018 */ lw $ra, 0x18($sp) -/* 428934 802A9654 8FB10014 */ lw $s1, 0x14($sp) -/* 428938 802A9658 8FB00010 */ lw $s0, 0x10($sp) -/* 42893C 802A965C 03E00008 */ jr $ra -/* 428940 802A9660 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s deleted file mode 100644 index 3c5ae7ef37..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s +++ /dev/null @@ -1,278 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A92DC_4236CC -/* 4236CC 802A92DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 4236D0 802A92E0 AFB10014 */ sw $s1, 0x14($sp) -/* 4236D4 802A92E4 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 4236D8 802A92E8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 4236DC 802A92EC AFBF0018 */ sw $ra, 0x18($sp) -/* 4236E0 802A92F0 AFB00010 */ sw $s0, 0x10($sp) -/* 4236E4 802A92F4 8623004C */ lh $v1, 0x4c($s1) -/* 4236E8 802A92F8 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 4236EC 802A92FC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 4236F0 802A9300 2C62000D */ sltiu $v0, $v1, 0xd -/* 4236F4 802A9304 104000E7 */ beqz $v0, L802A96A4_423A94 -/* 4236F8 802A9308 00031080 */ sll $v0, $v1, 2 -/* 4236FC 802A930C 3C01802B */ lui $at, %hi(jtbl_802A9840_423C30) -/* 423700 802A9310 00220821 */ addu $at, $at, $v0 -/* 423704 802A9314 8C229840 */ lw $v0, %lo(jtbl_802A9840_423C30)($at) -/* 423708 802A9318 00400008 */ jr $v0 -/* 42370C 802A931C 00000000 */ nop -dlabel L802A9320_423710 -/* 423710 802A9320 0C093EB1 */ jal btl_set_popup_duration -/* 423714 802A9324 24040063 */ addiu $a0, $zero, 0x63 -/* 423718 802A9328 8E300004 */ lw $s0, 4($s1) -/* 42371C 802A932C 240500FF */ addiu $a1, $zero, 0xff -/* 423720 802A9330 0C0513AC */ jal hud_element_set_alpha -/* 423724 802A9334 0200202D */ daddu $a0, $s0, $zero -/* 423728 802A9338 82220061 */ lb $v0, 0x61($s1) -/* 42372C 802A933C 10400003 */ beqz $v0, .L802A934C -/* 423730 802A9340 0200202D */ daddu $a0, $s0, $zero -/* 423734 802A9344 0C05128B */ jal hud_element_clear_flags -/* 423738 802A9348 24050002 */ addiu $a1, $zero, 2 -.L802A934C: -/* 42373C 802A934C 8E300008 */ lw $s0, 8($s1) -/* 423740 802A9350 240500FF */ addiu $a1, $zero, 0xff -/* 423744 802A9354 0C0513AC */ jal hud_element_set_alpha -/* 423748 802A9358 0200202D */ daddu $a0, $s0, $zero -/* 42374C 802A935C 82220061 */ lb $v0, 0x61($s1) -/* 423750 802A9360 10400003 */ beqz $v0, .L802A9370 -/* 423754 802A9364 0200202D */ daddu $a0, $s0, $zero -/* 423758 802A9368 0C05128B */ jal hud_element_clear_flags -/* 42375C 802A936C 24050002 */ addiu $a1, $zero, 2 -.L802A9370: -/* 423760 802A9370 8E30000C */ lw $s0, 0xc($s1) -/* 423764 802A9374 240500FF */ addiu $a1, $zero, 0xff -/* 423768 802A9378 0C0513AC */ jal hud_element_set_alpha -/* 42376C 802A937C 0200202D */ daddu $a0, $s0, $zero -/* 423770 802A9380 82220061 */ lb $v0, 0x61($s1) -/* 423774 802A9384 10400003 */ beqz $v0, .L802A9394 -/* 423778 802A9388 0200202D */ daddu $a0, $s0, $zero -/* 42377C 802A938C 0C05128B */ jal hud_element_clear_flags -/* 423780 802A9390 24050002 */ addiu $a1, $zero, 2 -.L802A9394: -/* 423784 802A9394 8E300010 */ lw $s0, 0x10($s1) -/* 423788 802A9398 240500FF */ addiu $a1, $zero, 0xff -/* 42378C 802A939C 0C0513AC */ jal hud_element_set_alpha -/* 423790 802A93A0 0200202D */ daddu $a0, $s0, $zero -/* 423794 802A93A4 82220061 */ lb $v0, 0x61($s1) -/* 423798 802A93A8 10400003 */ beqz $v0, .L802A93B8 -/* 42379C 802A93AC 0200202D */ daddu $a0, $s0, $zero -/* 4237A0 802A93B0 0C05128B */ jal hud_element_clear_flags -/* 4237A4 802A93B4 24050002 */ addiu $a1, $zero, 2 -.L802A93B8: -/* 4237A8 802A93B8 24020001 */ addiu $v0, $zero, 1 -/* 4237AC 802A93BC 080AA5A9 */ j L802A96A4_423A94 -/* 4237B0 802A93C0 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A93C4_4237B4 -/* 4237B4 802A93C4 0C093EB1 */ jal btl_set_popup_duration -/* 4237B8 802A93C8 24040063 */ addiu $a0, $zero, 0x63 -/* 4237BC 802A93CC 96220056 */ lhu $v0, 0x56($s1) -/* 4237C0 802A93D0 24420014 */ addiu $v0, $v0, 0x14 -/* 4237C4 802A93D4 A6220056 */ sh $v0, 0x56($s1) -/* 4237C8 802A93D8 00021400 */ sll $v0, $v0, 0x10 -/* 4237CC 802A93DC 00021403 */ sra $v0, $v0, 0x10 -/* 4237D0 802A93E0 28420033 */ slti $v0, $v0, 0x33 -/* 4237D4 802A93E4 14400002 */ bnez $v0, .L802A93F0 -/* 4237D8 802A93E8 24020032 */ addiu $v0, $zero, 0x32 -/* 4237DC 802A93EC A6220056 */ sh $v0, 0x56($s1) -.L802A93F0: -/* 4237E0 802A93F0 8E240004 */ lw $a0, 4($s1) -/* 4237E4 802A93F4 86250056 */ lh $a1, 0x56($s1) -/* 4237E8 802A93F8 0C051261 */ jal hud_element_set_render_pos -/* 4237EC 802A93FC 86260058 */ lh $a2, 0x58($s1) -/* 4237F0 802A9400 8E240008 */ lw $a0, 8($s1) -/* 4237F4 802A9404 86260058 */ lh $a2, 0x58($s1) -/* 4237F8 802A9408 86250056 */ lh $a1, 0x56($s1) -/* 4237FC 802A940C 0C051261 */ jal hud_element_set_render_pos -/* 423800 802A9410 24C6001C */ addiu $a2, $a2, 0x1c -/* 423804 802A9414 8E24000C */ lw $a0, 0xc($s1) -/* 423808 802A9418 86250056 */ lh $a1, 0x56($s1) -/* 42380C 802A941C 86260058 */ lh $a2, 0x58($s1) -/* 423810 802A9420 24A5001F */ addiu $a1, $a1, 0x1f -/* 423814 802A9424 0C051261 */ jal hud_element_set_render_pos -/* 423818 802A9428 24C6FFFF */ addiu $a2, $a2, -1 -/* 42381C 802A942C 8E240010 */ lw $a0, 0x10($s1) -/* 423820 802A9430 86250056 */ lh $a1, 0x56($s1) -/* 423824 802A9434 86260058 */ lh $a2, 0x58($s1) -/* 423828 802A9438 24A5001F */ addiu $a1, $a1, 0x1f -/* 42382C 802A943C 0C051261 */ jal hud_element_set_render_pos -/* 423830 802A9440 24C60011 */ addiu $a2, $a2, 0x11 -/* 423834 802A9444 080AA5A9 */ j L802A96A4_423A94 -/* 423838 802A9448 00000000 */ nop -dlabel L802A944C_42383C -/* 42383C 802A944C 0C093EB1 */ jal btl_set_popup_duration -/* 423840 802A9450 24040063 */ addiu $a0, $zero, 0x63 -/* 423844 802A9454 8622004E */ lh $v0, 0x4e($s1) -/* 423848 802A9458 9623004E */ lhu $v1, 0x4e($s1) -/* 42384C 802A945C 10400003 */ beqz $v0, .L802A946C -/* 423850 802A9460 2462FFFF */ addiu $v0, $v1, -1 -/* 423854 802A9464 080AA5A9 */ j L802A96A4_423A94 -/* 423858 802A9468 A622004E */ sh $v0, 0x4e($s1) -.L802A946C: -/* 42385C 802A946C 8E240004 */ lw $a0, 4($s1) -/* 423860 802A9470 3C058011 */ lui $a1, %hi(HudScript_MashAButton) -/* 423864 802A9474 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 423868 802A9478 0C0511FF */ jal hud_element_set_script -/* 42386C 802A947C 00000000 */ nop -/* 423870 802A9480 96230052 */ lhu $v1, 0x52($s1) -/* 423874 802A9484 2402000B */ addiu $v0, $zero, 0xb -/* 423878 802A9488 A622004C */ sh $v0, 0x4c($s1) -/* 42387C 802A948C A6230054 */ sh $v1, 0x54($s1) -dlabel L802A9490_423880 -/* 423880 802A9490 0C093EB1 */ jal btl_set_popup_duration -/* 423884 802A9494 24040063 */ addiu $a0, $zero, 0x63 -/* 423888 802A9498 8222005C */ lb $v0, 0x5c($s1) -/* 42388C 802A949C 1440000E */ bnez $v0, .L802A94D8 -/* 423890 802A94A0 00000000 */ nop -/* 423894 802A94A4 96220046 */ lhu $v0, 0x46($s1) -/* 423898 802A94A8 8623005A */ lh $v1, 0x5a($s1) -/* 42389C 802A94AC 24420001 */ addiu $v0, $v0, 1 -/* 4238A0 802A94B0 A6220046 */ sh $v0, 0x46($s1) -/* 4238A4 802A94B4 00021400 */ sll $v0, $v0, 0x10 -/* 4238A8 802A94B8 00021403 */ sra $v0, $v0, 0x10 -/* 4238AC 802A94BC 0043102A */ slt $v0, $v0, $v1 -/* 4238B0 802A94C0 9623005A */ lhu $v1, 0x5a($s1) -/* 4238B4 802A94C4 1440000C */ bnez $v0, .L802A94F8 -/* 4238B8 802A94C8 24020001 */ addiu $v0, $zero, 1 -/* 4238BC 802A94CC A6230046 */ sh $v1, 0x46($s1) -/* 4238C0 802A94D0 080AA53E */ j .L802A94F8 -/* 4238C4 802A94D4 A222005C */ sb $v0, 0x5c($s1) -.L802A94D8: -/* 4238C8 802A94D8 96220046 */ lhu $v0, 0x46($s1) -/* 4238CC 802A94DC 2442FFFF */ addiu $v0, $v0, -1 -/* 4238D0 802A94E0 A6220046 */ sh $v0, 0x46($s1) -/* 4238D4 802A94E4 00021400 */ sll $v0, $v0, 0x10 -/* 4238D8 802A94E8 1C400003 */ bgtz $v0, .L802A94F8 -/* 4238DC 802A94EC 00000000 */ nop -/* 4238E0 802A94F0 A6200046 */ sh $zero, 0x46($s1) -/* 4238E4 802A94F4 A220005C */ sb $zero, 0x5c($s1) -.L802A94F8: -/* 4238E8 802A94F8 8622006A */ lh $v0, 0x6a($s1) -/* 4238EC 802A94FC 14400021 */ bnez $v0, .L802A9584 -/* 4238F0 802A9500 00000000 */ nop -/* 4238F4 802A9504 82040431 */ lb $a0, 0x431($s0) -/* 4238F8 802A9508 86230052 */ lh $v1, 0x52($s1) -/* 4238FC 802A950C 86220054 */ lh $v0, 0x54($s1) -/* 423900 802A9510 00623023 */ subu $a2, $v1, $v0 -/* 423904 802A9514 00862023 */ subu $a0, $a0, $a2 -/* 423908 802A9518 04810002 */ bgez $a0, .L802A9524 -/* 42390C 802A951C A6200044 */ sh $zero, 0x44($s1) -/* 423910 802A9520 24840040 */ addiu $a0, $a0, 0x40 -.L802A9524: -/* 423914 802A9524 18C0002E */ blez $a2, .L802A95E0 -/* 423918 802A9528 0000282D */ daddu $a1, $zero, $zero -.L802A952C: -/* 42391C 802A952C 28820040 */ slti $v0, $a0, 0x40 -/* 423920 802A9530 50400001 */ beql $v0, $zero, .L802A9538 -/* 423924 802A9534 2484FFC0 */ addiu $a0, $a0, -0x40 -.L802A9538: -/* 423928 802A9538 00041080 */ sll $v0, $a0, 2 -/* 42392C 802A953C 02021021 */ addu $v0, $s0, $v0 -/* 423930 802A9540 8C420330 */ lw $v0, 0x330($v0) -/* 423934 802A9544 30428000 */ andi $v0, $v0, 0x8000 -/* 423938 802A9548 10400009 */ beqz $v0, .L802A9570 -/* 42393C 802A954C 24A50001 */ addiu $a1, $a1, 1 -/* 423940 802A9550 86230050 */ lh $v1, 0x50($s1) -/* 423944 802A9554 8E020434 */ lw $v0, 0x434($s0) -/* 423948 802A9558 00031880 */ sll $v1, $v1, 2 -/* 42394C 802A955C 00621821 */ addu $v1, $v1, $v0 -/* 423950 802A9560 96220044 */ lhu $v0, 0x44($s1) -/* 423954 802A9564 94630002 */ lhu $v1, 2($v1) -/* 423958 802A9568 00431021 */ addu $v0, $v0, $v1 -/* 42395C 802A956C A6220044 */ sh $v0, 0x44($s1) -.L802A9570: -/* 423960 802A9570 00A6102A */ slt $v0, $a1, $a2 -/* 423964 802A9574 1440FFED */ bnez $v0, .L802A952C -/* 423968 802A9578 24840001 */ addiu $a0, $a0, 1 -/* 42396C 802A957C 080AA579 */ j .L802A95E4 -/* 423970 802A9580 3C0451EB */ lui $a0, 0x51eb -.L802A9584: -/* 423974 802A9584 86220050 */ lh $v0, 0x50($s1) -/* 423978 802A9588 8E030434 */ lw $v1, 0x434($s0) -/* 42397C 802A958C 00021080 */ sll $v0, $v0, 2 -/* 423980 802A9590 00431021 */ addu $v0, $v0, $v1 -/* 423984 802A9594 8C430000 */ lw $v1, ($v0) -/* 423988 802A9598 04620001 */ bltzl $v1, .L802A95A0 -/* 42398C 802A959C 24630003 */ addiu $v1, $v1, 3 -.L802A95A0: -/* 423990 802A95A0 96220044 */ lhu $v0, 0x44($s1) -/* 423994 802A95A4 00031883 */ sra $v1, $v1, 2 -/* 423998 802A95A8 00431021 */ addu $v0, $v0, $v1 -/* 42399C 802A95AC A6220044 */ sh $v0, 0x44($s1) -/* 4239A0 802A95B0 86220050 */ lh $v0, 0x50($s1) -/* 4239A4 802A95B4 8E030434 */ lw $v1, 0x434($s0) -/* 4239A8 802A95B8 00021080 */ sll $v0, $v0, 2 -/* 4239AC 802A95BC 00431021 */ addu $v0, $v0, $v1 -/* 4239B0 802A95C0 8C420000 */ lw $v0, ($v0) -/* 4239B4 802A95C4 04420001 */ bltzl $v0, .L802A95CC -/* 4239B8 802A95C8 24420003 */ addiu $v0, $v0, 3 -.L802A95CC: -/* 4239BC 802A95CC 0C00A67F */ jal rand_int -/* 4239C0 802A95D0 00022083 */ sra $a0, $v0, 2 -/* 4239C4 802A95D4 96230044 */ lhu $v1, 0x44($s1) -/* 4239C8 802A95D8 00621821 */ addu $v1, $v1, $v0 -/* 4239CC 802A95DC A6230044 */ sh $v1, 0x44($s1) -.L802A95E0: -/* 4239D0 802A95E0 3C0451EB */ lui $a0, 0x51eb -.L802A95E4: -/* 4239D4 802A95E4 96230044 */ lhu $v1, 0x44($s1) -/* 4239D8 802A95E8 3484851F */ ori $a0, $a0, 0x851f -/* 4239DC 802A95EC 00031C00 */ sll $v1, $v1, 0x10 -/* 4239E0 802A95F0 00031403 */ sra $v0, $v1, 0x10 -/* 4239E4 802A95F4 00440018 */ mult $v0, $a0 -/* 4239E8 802A95F8 00031FC3 */ sra $v1, $v1, 0x1f -/* 4239EC 802A95FC 00003810 */ mfhi $a3 -/* 4239F0 802A9600 00071143 */ sra $v0, $a3, 5 -/* 4239F4 802A9604 00431823 */ subu $v1, $v0, $v1 -/* 4239F8 802A9608 A2030081 */ sb $v1, 0x81($s0) -/* 4239FC 802A960C 86220054 */ lh $v0, 0x54($s1) -/* 423A00 802A9610 96240054 */ lhu $a0, 0x54($s1) -/* 423A04 802A9614 10400003 */ beqz $v0, .L802A9624 -/* 423A08 802A9618 2482FFFF */ addiu $v0, $a0, -1 -/* 423A0C 802A961C 080AA5A9 */ j L802A96A4_423A94 -/* 423A10 802A9620 A6220054 */ sh $v0, 0x54($s1) -.L802A9624: -/* 423A14 802A9624 00031E00 */ sll $v1, $v1, 0x18 -/* 423A18 802A9628 82220080 */ lb $v0, 0x80($s1) -/* 423A1C 802A962C 86240046 */ lh $a0, 0x46($s1) -/* 423A20 802A9630 00021040 */ sll $v0, $v0, 1 -/* 423A24 802A9634 02221021 */ addu $v0, $s1, $v0 -/* 423A28 802A9638 84420074 */ lh $v0, 0x74($v0) -/* 423A2C 802A963C 00031E03 */ sra $v1, $v1, 0x18 -/* 423A30 802A9640 00441023 */ subu $v0, $v0, $a0 -/* 423A34 802A9644 0062182A */ slt $v1, $v1, $v0 -/* 423A38 802A9648 14600004 */ bnez $v1, .L802A965C -/* 423A3C 802A964C 2402FFFE */ addiu $v0, $zero, -2 -/* 423A40 802A9650 24020001 */ addiu $v0, $zero, 1 -/* 423A44 802A9654 080AA599 */ j .L802A9664 -/* 423A48 802A9658 A2020086 */ sb $v0, 0x86($s0) -.L802A965C: -/* 423A4C 802A965C A2020086 */ sb $v0, 0x86($s0) -/* 423A50 802A9660 2402FFFF */ addiu $v0, $zero, -1 -.L802A9664: -/* 423A54 802A9664 A2020081 */ sb $v0, 0x81($s0) -/* 423A58 802A9668 0C093EB1 */ jal btl_set_popup_duration -/* 423A5C 802A966C 0000202D */ daddu $a0, $zero, $zero -/* 423A60 802A9670 24020014 */ addiu $v0, $zero, 0x14 -/* 423A64 802A9674 A6220054 */ sh $v0, 0x54($s1) -/* 423A68 802A9678 2402000C */ addiu $v0, $zero, 0xc -/* 423A6C 802A967C 080AA5A9 */ j L802A96A4_423A94 -/* 423A70 802A9680 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9684_423A74 -/* 423A74 802A9684 86220054 */ lh $v0, 0x54($s1) -/* 423A78 802A9688 96230054 */ lhu $v1, 0x54($s1) -/* 423A7C 802A968C 10400003 */ beqz $v0, .L802A969C -/* 423A80 802A9690 2462FFFF */ addiu $v0, $v1, -1 -/* 423A84 802A9694 080AA5A9 */ j L802A96A4_423A94 -/* 423A88 802A9698 A6220054 */ sh $v0, 0x54($s1) -.L802A969C: -/* 423A8C 802A969C 0C09A327 */ jal func_80268C9C -/* 423A90 802A96A0 00000000 */ nop -dlabel L802A96A4_423A94 -/* 423A94 802A96A4 8FBF0018 */ lw $ra, 0x18($sp) -/* 423A98 802A96A8 8FB10014 */ lw $s1, 0x14($sp) -/* 423A9C 802A96AC 8FB00010 */ lw $s0, 0x10($sp) -/* 423AA0 802A96B0 03E00008 */ jr $ra -/* 423AA4 802A96B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s deleted file mode 100644 index 6a3d38673a..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s +++ /dev/null @@ -1,307 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A928C_4263FC -/* 4263FC 802A928C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 426400 802A9290 AFB10014 */ sw $s1, 0x14($sp) -/* 426404 802A9294 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 426408 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42640C 802A929C AFBF001C */ sw $ra, 0x1c($sp) -/* 426410 802A92A0 AFB20018 */ sw $s2, 0x18($sp) -/* 426414 802A92A4 AFB00010 */ sw $s0, 0x10($sp) -/* 426418 802A92A8 8623004C */ lh $v1, 0x4c($s1) -/* 42641C 802A92AC 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 426420 802A92B0 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 426424 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd -/* 426428 802A92B8 10400102 */ beqz $v0, L802A96C4_426834 -/* 42642C 802A92BC 00031080 */ sll $v0, $v1, 2 -/* 426430 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9820_426990) -/* 426434 802A92C4 00220821 */ addu $at, $at, $v0 -/* 426438 802A92C8 8C229820 */ lw $v0, %lo(jtbl_802A9820_426990)($at) -/* 42643C 802A92CC 00400008 */ jr $v0 -/* 426440 802A92D0 00000000 */ nop -dlabel L802A92D4_426444 -/* 426444 802A92D4 0C093EB1 */ jal btl_set_popup_duration -/* 426448 802A92D8 24040063 */ addiu $a0, $zero, 0x63 -/* 42644C 802A92DC 8E300004 */ lw $s0, 4($s1) -/* 426450 802A92E0 240500FF */ addiu $a1, $zero, 0xff -/* 426454 802A92E4 0C0513AC */ jal hud_element_set_alpha -/* 426458 802A92E8 0200202D */ daddu $a0, $s0, $zero -/* 42645C 802A92EC 82220061 */ lb $v0, 0x61($s1) -/* 426460 802A92F0 10400003 */ beqz $v0, .L802A9300 -/* 426464 802A92F4 0200202D */ daddu $a0, $s0, $zero -/* 426468 802A92F8 0C05128B */ jal hud_element_clear_flags -/* 42646C 802A92FC 24050002 */ addiu $a1, $zero, 2 -.L802A9300: -/* 426470 802A9300 8E300008 */ lw $s0, 8($s1) -/* 426474 802A9304 240500FF */ addiu $a1, $zero, 0xff -/* 426478 802A9308 0C0513AC */ jal hud_element_set_alpha -/* 42647C 802A930C 0200202D */ daddu $a0, $s0, $zero -/* 426480 802A9310 82220061 */ lb $v0, 0x61($s1) -/* 426484 802A9314 10400003 */ beqz $v0, .L802A9324 -/* 426488 802A9318 0200202D */ daddu $a0, $s0, $zero -/* 42648C 802A931C 0C05128B */ jal hud_element_clear_flags -/* 426490 802A9320 24050002 */ addiu $a1, $zero, 2 -.L802A9324: -/* 426494 802A9324 24020001 */ addiu $v0, $zero, 1 -/* 426498 802A9328 080AA5B1 */ j L802A96C4_426834 -/* 42649C 802A932C A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9330_4264A0 -/* 4264A0 802A9330 0C093EB1 */ jal btl_set_popup_duration -/* 4264A4 802A9334 24040063 */ addiu $a0, $zero, 0x63 -/* 4264A8 802A9338 96220056 */ lhu $v0, 0x56($s1) -/* 4264AC 802A933C 24420014 */ addiu $v0, $v0, 0x14 -/* 4264B0 802A9340 A6220056 */ sh $v0, 0x56($s1) -/* 4264B4 802A9344 00021400 */ sll $v0, $v0, 0x10 -/* 4264B8 802A9348 00021403 */ sra $v0, $v0, 0x10 -/* 4264BC 802A934C 28420033 */ slti $v0, $v0, 0x33 -/* 4264C0 802A9350 14400002 */ bnez $v0, .L802A935C -/* 4264C4 802A9354 24020032 */ addiu $v0, $zero, 0x32 -/* 4264C8 802A9358 A6220056 */ sh $v0, 0x56($s1) -.L802A935C: -/* 4264CC 802A935C 8E240004 */ lw $a0, 4($s1) -/* 4264D0 802A9360 86250056 */ lh $a1, 0x56($s1) -/* 4264D4 802A9364 0C051261 */ jal hud_element_set_render_pos -/* 4264D8 802A9368 86260058 */ lh $a2, 0x58($s1) -/* 4264DC 802A936C 8E240008 */ lw $a0, 8($s1) -/* 4264E0 802A9370 86260058 */ lh $a2, 0x58($s1) -/* 4264E4 802A9374 86250056 */ lh $a1, 0x56($s1) -/* 4264E8 802A9378 0C051261 */ jal hud_element_set_render_pos -/* 4264EC 802A937C 24C6001C */ addiu $a2, $a2, 0x1c -/* 4264F0 802A9380 080AA5B1 */ j L802A96C4_426834 -/* 4264F4 802A9384 00000000 */ nop -dlabel L802A9388_4264F8 -/* 4264F8 802A9388 0C093EB1 */ jal btl_set_popup_duration -/* 4264FC 802A938C 24040063 */ addiu $a0, $zero, 0x63 -/* 426500 802A9390 8622004E */ lh $v0, 0x4e($s1) -/* 426504 802A9394 9623004E */ lhu $v1, 0x4e($s1) -/* 426508 802A9398 10400003 */ beqz $v0, .L802A93A8 -/* 42650C 802A939C 2462FFFF */ addiu $v0, $v1, -1 -/* 426510 802A93A0 080AA5B1 */ j L802A96C4_426834 -/* 426514 802A93A4 A622004E */ sh $v0, 0x4e($s1) -.L802A93A8: -/* 426518 802A93A8 8E240004 */ lw $a0, 4($s1) -/* 42651C 802A93AC 3C058011 */ lui $a1, %hi(HudScript_MashAButton) -/* 426520 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 426524 802A93B4 0C0511FF */ jal hud_element_set_script -/* 426528 802A93B8 00000000 */ nop -/* 42652C 802A93BC 3C048000 */ lui $a0, 0x8000 -/* 426530 802A93C0 34840041 */ ori $a0, $a0, 0x41 -/* 426534 802A93C4 0000282D */ daddu $a1, $zero, $zero -/* 426538 802A93C8 00A0302D */ daddu $a2, $a1, $zero -/* 42653C 802A93CC 96220052 */ lhu $v0, 0x52($s1) -/* 426540 802A93D0 00A0382D */ daddu $a3, $a1, $zero -/* 426544 802A93D4 A6200044 */ sh $zero, 0x44($s1) -/* 426548 802A93D8 0C0526AE */ jal sfx_play_sound_with_params -/* 42654C 802A93DC A6220054 */ sh $v0, 0x54($s1) -/* 426550 802A93E0 2402000B */ addiu $v0, $zero, 0xb -/* 426554 802A93E4 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A93E8_426558 -/* 426558 802A93E8 0C093EB1 */ jal btl_set_popup_duration -/* 42655C 802A93EC 24040063 */ addiu $a0, $zero, 0x63 -/* 426560 802A93F0 86220068 */ lh $v0, 0x68($s1) -/* 426564 802A93F4 14400027 */ bnez $v0, .L802A9494 -/* 426568 802A93F8 00000000 */ nop -/* 42656C 802A93FC 86220064 */ lh $v0, 0x64($s1) -/* 426570 802A9400 1040001E */ beqz $v0, .L802A947C -/* 426574 802A9404 00000000 */ nop -/* 426578 802A9408 82220080 */ lb $v0, 0x80($s1) -/* 42657C 802A940C 00021040 */ sll $v0, $v0, 1 -/* 426580 802A9410 02221021 */ addu $v0, $s1, $v0 -/* 426584 802A9414 84430074 */ lh $v1, 0x74($v0) -/* 426588 802A9418 86220044 */ lh $v0, 0x44($s1) -/* 42658C 802A941C 14600002 */ bnez $v1, .L802A9428 -/* 426590 802A9420 0043001A */ div $zero, $v0, $v1 -/* 426594 802A9424 0007000D */ break 7 -.L802A9428: -/* 426598 802A9428 2401FFFF */ addiu $at, $zero, -1 -/* 42659C 802A942C 14610004 */ bne $v1, $at, .L802A9440 -/* 4265A0 802A9430 3C018000 */ lui $at, 0x8000 -/* 4265A4 802A9434 14410002 */ bne $v0, $at, .L802A9440 -/* 4265A8 802A9438 00000000 */ nop -/* 4265AC 802A943C 0006000D */ break 6 -.L802A9440: -/* 4265B0 802A9440 00001012 */ mflo $v0 -/* 4265B4 802A9444 3C036666 */ lui $v1, 0x6666 -/* 4265B8 802A9448 34636667 */ ori $v1, $v1, 0x6667 -/* 4265BC 802A944C 00430018 */ mult $v0, $v1 -/* 4265C0 802A9450 000217C3 */ sra $v0, $v0, 0x1f -/* 4265C4 802A9454 00001810 */ mfhi $v1 -/* 4265C8 802A9458 000318C3 */ sra $v1, $v1, 3 -/* 4265CC 802A945C 00621823 */ subu $v1, $v1, $v0 -/* 4265D0 802A9460 00031880 */ sll $v1, $v1, 2 -/* 4265D4 802A9464 96220044 */ lhu $v0, 0x44($s1) -/* 4265D8 802A9468 3C01802B */ lui $at, %hi(D_802A9802_426972) -/* 4265DC 802A946C 00230821 */ addu $at, $at, $v1 -/* 4265E0 802A9470 94239802 */ lhu $v1, %lo(D_802A9802_426972)($at) -/* 4265E4 802A9474 080AA521 */ j .L802A9484 -/* 4265E8 802A9478 00431023 */ subu $v0, $v0, $v1 -.L802A947C: -/* 4265EC 802A947C 96220044 */ lhu $v0, 0x44($s1) -/* 4265F0 802A9480 2442FFF6 */ addiu $v0, $v0, -0xa -.L802A9484: -/* 4265F4 802A9484 A6220044 */ sh $v0, 0x44($s1) -/* 4265F8 802A9488 00021400 */ sll $v0, $v0, 0x10 -/* 4265FC 802A948C 04420001 */ bltzl $v0, .L802A9494 -/* 426600 802A9490 A6200044 */ sh $zero, 0x44($s1) -.L802A9494: -/* 426604 802A9494 8E420214 */ lw $v0, 0x214($s2) -/* 426608 802A9498 30428000 */ andi $v0, $v0, 0x8000 -/* 42660C 802A949C 10400025 */ beqz $v0, .L802A9534 -/* 426610 802A94A0 00000000 */ nop -/* 426614 802A94A4 86240050 */ lh $a0, 0x50($s1) -/* 426618 802A94A8 8E420434 */ lw $v0, 0x434($s2) -/* 42661C 802A94AC 86230064 */ lh $v1, 0x64($s1) -/* 426620 802A94B0 00042080 */ sll $a0, $a0, 2 -/* 426624 802A94B4 00822021 */ addu $a0, $a0, $v0 -/* 426628 802A94B8 00031040 */ sll $v0, $v1, 1 -/* 42662C 802A94BC 00431021 */ addu $v0, $v0, $v1 -/* 426630 802A94C0 000210C0 */ sll $v0, $v0, 3 -/* 426634 802A94C4 00431021 */ addu $v0, $v0, $v1 -/* 426638 802A94C8 00021900 */ sll $v1, $v0, 4 -/* 42663C 802A94CC 00431021 */ addu $v0, $v0, $v1 -/* 426640 802A94D0 8C830000 */ lw $v1, ($a0) -/* 426644 802A94D4 00021040 */ sll $v0, $v0, 1 -/* 426648 802A94D8 00620018 */ mult $v1, $v0 -/* 42664C 802A94DC 00001812 */ mflo $v1 -/* 426650 802A94E0 3C0268DB */ lui $v0, 0x68db -/* 426654 802A94E4 34428BAD */ ori $v0, $v0, 0x8bad -/* 426658 802A94E8 00620018 */ mult $v1, $v0 -/* 42665C 802A94EC 00031FC3 */ sra $v1, $v1, 0x1f -/* 426660 802A94F0 00001010 */ mfhi $v0 -/* 426664 802A94F4 00021303 */ sra $v0, $v0, 0xc -/* 426668 802A94F8 00431823 */ subu $v1, $v0, $v1 -/* 42666C 802A94FC 10600004 */ beqz $v1, .L802A9510 -/* 426670 802A9500 00000000 */ nop -/* 426674 802A9504 96220044 */ lhu $v0, 0x44($s1) -/* 426678 802A9508 080AA54C */ j .L802A9530 -/* 42667C 802A950C 00431021 */ addu $v0, $v0, $v1 -.L802A9510: -/* 426680 802A9510 96220044 */ lhu $v0, 0x44($s1) -/* 426684 802A9514 24420064 */ addiu $v0, $v0, 0x64 -/* 426688 802A9518 A6220044 */ sh $v0, 0x44($s1) -/* 42668C 802A951C 00021400 */ sll $v0, $v0, 0x10 -/* 426690 802A9520 00021403 */ sra $v0, $v0, 0x10 -/* 426694 802A9524 284201F4 */ slti $v0, $v0, 0x1f4 -/* 426698 802A9528 14400002 */ bnez $v0, .L802A9534 -/* 42669C 802A952C 240201F4 */ addiu $v0, $zero, 0x1f4 -.L802A9530: -/* 4266A0 802A9530 A6220044 */ sh $v0, 0x44($s1) -.L802A9534: -/* 4266A4 802A9534 86220044 */ lh $v0, 0x44($s1) -/* 4266A8 802A9538 28422710 */ slti $v0, $v0, 0x2710 -/* 4266AC 802A953C 14400010 */ bnez $v0, .L802A9580 -/* 4266B0 802A9540 3C1051EB */ lui $s0, 0x51eb -/* 4266B4 802A9544 8E30000C */ lw $s0, 0xc($s1) -/* 4266B8 802A9548 86250056 */ lh $a1, 0x56($s1) -/* 4266BC 802A954C 86260058 */ lh $a2, 0x58($s1) -/* 4266C0 802A9550 24022710 */ addiu $v0, $zero, 0x2710 -/* 4266C4 802A9554 A6220044 */ sh $v0, 0x44($s1) -/* 4266C8 802A9558 24020001 */ addiu $v0, $zero, 1 -/* 4266CC 802A955C A6220068 */ sh $v0, 0x68($s1) -/* 4266D0 802A9560 0200202D */ daddu $a0, $s0, $zero -/* 4266D4 802A9564 24A50032 */ addiu $a1, $a1, 0x32 -/* 4266D8 802A9568 0C051261 */ jal hud_element_set_render_pos -/* 4266DC 802A956C 24C6001C */ addiu $a2, $a2, 0x1c -/* 4266E0 802A9570 0200202D */ daddu $a0, $s0, $zero -/* 4266E4 802A9574 0C05128B */ jal hud_element_clear_flags -/* 4266E8 802A9578 24050002 */ addiu $a1, $zero, 2 -/* 4266EC 802A957C 3C1051EB */ lui $s0, 0x51eb -.L802A9580: -/* 4266F0 802A9580 3610851F */ ori $s0, $s0, 0x851f -/* 4266F4 802A9584 96230044 */ lhu $v1, 0x44($s1) -/* 4266F8 802A9588 3C048000 */ lui $a0, 0x8000 -/* 4266FC 802A958C 00031C00 */ sll $v1, $v1, 0x10 -/* 426700 802A9590 00031403 */ sra $v0, $v1, 0x10 -/* 426704 802A9594 00500018 */ mult $v0, $s0 -/* 426708 802A9598 34840041 */ ori $a0, $a0, 0x41 -/* 42670C 802A959C 0000282D */ daddu $a1, $zero, $zero -/* 426710 802A95A0 00A0302D */ daddu $a2, $a1, $zero -/* 426714 802A95A4 00031FC3 */ sra $v1, $v1, 0x1f -/* 426718 802A95A8 00004810 */ mfhi $t1 -/* 42671C 802A95AC 00094143 */ sra $t0, $t1, 5 -/* 426720 802A95B0 01034023 */ subu $t0, $t0, $v1 -/* 426724 802A95B4 00081600 */ sll $v0, $t0, 0x18 -/* 426728 802A95B8 00021603 */ sra $v0, $v0, 0x18 -/* 42672C 802A95BC 00023840 */ sll $a3, $v0, 1 -/* 426730 802A95C0 00E23821 */ addu $a3, $a3, $v0 -/* 426734 802A95C4 00073880 */ sll $a3, $a3, 2 -/* 426738 802A95C8 0C0526F9 */ jal sfx_adjust_env_sound_params -/* 42673C 802A95CC A2480084 */ sb $t0, 0x84($s2) -/* 426740 802A95D0 86220054 */ lh $v0, 0x54($s1) -/* 426744 802A95D4 96230054 */ lhu $v1, 0x54($s1) -/* 426748 802A95D8 14400036 */ bnez $v0, .L802A96B4 -/* 42674C 802A95DC 2462FFFF */ addiu $v0, $v1, -1 -/* 426750 802A95E0 86220064 */ lh $v0, 0x64($s1) -/* 426754 802A95E4 86230044 */ lh $v1, 0x44($s1) -/* 426758 802A95E8 50400001 */ beql $v0, $zero, .L802A95F0 -/* 42675C 802A95EC 0000182D */ daddu $v1, $zero, $zero -.L802A95F0: -/* 426760 802A95F0 14600003 */ bnez $v1, .L802A9600 -/* 426764 802A95F4 00700018 */ mult $v1, $s0 -/* 426768 802A95F8 080AA584 */ j .L802A9610 -/* 42676C 802A95FC 2402FFFF */ addiu $v0, $zero, -1 -.L802A9600: -/* 426770 802A9600 00031FC3 */ sra $v1, $v1, 0x1f -/* 426774 802A9604 00004810 */ mfhi $t1 -/* 426778 802A9608 00091143 */ sra $v0, $t1, 5 -/* 42677C 802A960C 00431023 */ subu $v0, $v0, $v1 -.L802A9610: -/* 426780 802A9610 A2420081 */ sb $v0, 0x81($s2) -/* 426784 802A9614 82220080 */ lb $v0, 0x80($s1) -/* 426788 802A9618 2442FFFF */ addiu $v0, $v0, -1 -/* 42678C 802A961C 00021040 */ sll $v0, $v0, 1 -/* 426790 802A9620 02221021 */ addu $v0, $s1, $v0 -/* 426794 802A9624 84430074 */ lh $v1, 0x74($v0) -/* 426798 802A9628 82420081 */ lb $v0, 0x81($s2) -/* 42679C 802A962C 0043102A */ slt $v0, $v0, $v1 -/* 4267A0 802A9630 14400002 */ bnez $v0, .L802A963C -/* 4267A4 802A9634 2402FFFE */ addiu $v0, $zero, -2 -/* 4267A8 802A9638 24020001 */ addiu $v0, $zero, 1 -.L802A963C: -/* 4267AC 802A963C A2420086 */ sb $v0, 0x86($s2) -/* 4267B0 802A9640 82430081 */ lb $v1, 0x81($s2) -/* 4267B4 802A9644 24020064 */ addiu $v0, $zero, 0x64 -/* 4267B8 802A9648 14620004 */ bne $v1, $v0, .L802A965C -/* 4267BC 802A964C 3C048000 */ lui $a0, 0x8000 -/* 4267C0 802A9650 0C09A458 */ jal func_80269160 -/* 4267C4 802A9654 00000000 */ nop -/* 4267C8 802A9658 3C048000 */ lui $a0, 0x8000 -.L802A965C: -/* 4267CC 802A965C 0C05271B */ jal sfx_stop_sound -/* 4267D0 802A9660 34840041 */ ori $a0, $a0, 0x41 -/* 4267D4 802A9664 0C093EB1 */ jal btl_set_popup_duration -/* 4267D8 802A9668 0000202D */ daddu $a0, $zero, $zero -/* 4267DC 802A966C 24020005 */ addiu $v0, $zero, 5 -/* 4267E0 802A9670 A6220054 */ sh $v0, 0x54($s1) -/* 4267E4 802A9674 2402000C */ addiu $v0, $zero, 0xc -/* 4267E8 802A9678 080AA5B1 */ j L802A96C4_426834 -/* 4267EC 802A967C A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9680_4267F0 -/* 4267F0 802A9680 86220064 */ lh $v0, 0x64($s1) -/* 4267F4 802A9684 14400007 */ bnez $v0, .L802A96A4 -/* 4267F8 802A9688 00000000 */ nop -/* 4267FC 802A968C 96220044 */ lhu $v0, 0x44($s1) -/* 426800 802A9690 2442FF9C */ addiu $v0, $v0, -0x64 -/* 426804 802A9694 A6220044 */ sh $v0, 0x44($s1) -/* 426808 802A9698 00021400 */ sll $v0, $v0, 0x10 -/* 42680C 802A969C 04420001 */ bltzl $v0, .L802A96A4 -/* 426810 802A96A0 A6200044 */ sh $zero, 0x44($s1) -.L802A96A4: -/* 426814 802A96A4 86220054 */ lh $v0, 0x54($s1) -/* 426818 802A96A8 96230054 */ lhu $v1, 0x54($s1) -/* 42681C 802A96AC 10400003 */ beqz $v0, .L802A96BC -/* 426820 802A96B0 2462FFFF */ addiu $v0, $v1, -1 -.L802A96B4: -/* 426824 802A96B4 080AA5B1 */ j L802A96C4_426834 -/* 426828 802A96B8 A6220054 */ sh $v0, 0x54($s1) -.L802A96BC: -/* 42682C 802A96BC 0C09A327 */ jal func_80268C9C -/* 426830 802A96C0 00000000 */ nop -dlabel L802A96C4_426834 -/* 426834 802A96C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 426838 802A96C8 8FB20018 */ lw $s2, 0x18($sp) -/* 42683C 802A96CC 8FB10014 */ lw $s1, 0x14($sp) -/* 426840 802A96D0 8FB00010 */ lw $s0, 0x10($sp) -/* 426844 802A96D4 03E00008 */ jr $ra -/* 426848 802A96D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s deleted file mode 100644 index a3d3e3abe5..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s +++ /dev/null @@ -1,394 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9294_426C64 -/* 426C64 802A9294 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 426C68 802A9298 AFB10014 */ sw $s1, 0x14($sp) -/* 426C6C 802A929C 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 426C70 802A92A0 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 426C74 802A92A4 AFB20018 */ sw $s2, 0x18($sp) -/* 426C78 802A92A8 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 426C7C 802A92AC 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 426C80 802A92B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 426C84 802A92B4 AFB3001C */ sw $s3, 0x1c($sp) -/* 426C88 802A92B8 AFB00010 */ sw $s0, 0x10($sp) -/* 426C8C 802A92BC 8623004C */ lh $v1, 0x4c($s1) -/* 426C90 802A92C0 8E5300DC */ lw $s3, 0xdc($s2) -/* 426C94 802A92C4 2C62000D */ sltiu $v0, $v1, 0xd -/* 426C98 802A92C8 10400153 */ beqz $v0, L802A9818_4271E8 -/* 426C9C 802A92CC 00031080 */ sll $v0, $v1, 2 -/* 426CA0 802A92D0 3C01802B */ lui $at, %hi(jtbl_802A99A0_427370) -/* 426CA4 802A92D4 00220821 */ addu $at, $at, $v0 -/* 426CA8 802A92D8 8C2299A0 */ lw $v0, %lo(jtbl_802A99A0_427370)($at) -/* 426CAC 802A92DC 00400008 */ jr $v0 -/* 426CB0 802A92E0 00000000 */ nop -dlabel L802A92E4_426CB4 -/* 426CB4 802A92E4 0C093EB1 */ jal btl_set_popup_duration -/* 426CB8 802A92E8 24040063 */ addiu $a0, $zero, 0x63 -/* 426CBC 802A92EC 8E300004 */ lw $s0, 4($s1) -/* 426CC0 802A92F0 240500FF */ addiu $a1, $zero, 0xff -/* 426CC4 802A92F4 0C0513AC */ jal hud_element_set_alpha -/* 426CC8 802A92F8 0200202D */ daddu $a0, $s0, $zero -/* 426CCC 802A92FC 82220061 */ lb $v0, 0x61($s1) -/* 426CD0 802A9300 10400003 */ beqz $v0, .L802A9310 -/* 426CD4 802A9304 0200202D */ daddu $a0, $s0, $zero -/* 426CD8 802A9308 0C05128B */ jal hud_element_clear_flags -/* 426CDC 802A930C 24050002 */ addiu $a1, $zero, 2 -.L802A9310: -/* 426CE0 802A9310 8E300008 */ lw $s0, 8($s1) -/* 426CE4 802A9314 240500FF */ addiu $a1, $zero, 0xff -/* 426CE8 802A9318 0C0513AC */ jal hud_element_set_alpha -/* 426CEC 802A931C 0200202D */ daddu $a0, $s0, $zero -/* 426CF0 802A9320 82220061 */ lb $v0, 0x61($s1) -/* 426CF4 802A9324 10400003 */ beqz $v0, .L802A9334 -/* 426CF8 802A9328 0200202D */ daddu $a0, $s0, $zero -/* 426CFC 802A932C 0C05128B */ jal hud_element_clear_flags -/* 426D00 802A9330 24050002 */ addiu $a1, $zero, 2 -.L802A9334: -/* 426D04 802A9334 24020001 */ addiu $v0, $zero, 1 -/* 426D08 802A9338 080AA606 */ j L802A9818_4271E8 -/* 426D0C 802A933C A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9340_426D10 -/* 426D10 802A9340 0C093EB1 */ jal btl_set_popup_duration -/* 426D14 802A9344 24040063 */ addiu $a0, $zero, 0x63 -/* 426D18 802A9348 96220056 */ lhu $v0, 0x56($s1) -/* 426D1C 802A934C 24420014 */ addiu $v0, $v0, 0x14 -/* 426D20 802A9350 A6220056 */ sh $v0, 0x56($s1) -/* 426D24 802A9354 00021400 */ sll $v0, $v0, 0x10 -/* 426D28 802A9358 00021403 */ sra $v0, $v0, 0x10 -/* 426D2C 802A935C 28420033 */ slti $v0, $v0, 0x33 -/* 426D30 802A9360 14400002 */ bnez $v0, .L802A936C -/* 426D34 802A9364 24020032 */ addiu $v0, $zero, 0x32 -/* 426D38 802A9368 A6220056 */ sh $v0, 0x56($s1) -.L802A936C: -/* 426D3C 802A936C 8E240004 */ lw $a0, 4($s1) -/* 426D40 802A9370 86250056 */ lh $a1, 0x56($s1) -/* 426D44 802A9374 0C051261 */ jal hud_element_set_render_pos -/* 426D48 802A9378 86260058 */ lh $a2, 0x58($s1) -/* 426D4C 802A937C 8E240008 */ lw $a0, 8($s1) -/* 426D50 802A9380 86260058 */ lh $a2, 0x58($s1) -/* 426D54 802A9384 86250056 */ lh $a1, 0x56($s1) -/* 426D58 802A9388 0C051261 */ jal hud_element_set_render_pos -/* 426D5C 802A938C 24C6001C */ addiu $a2, $a2, 0x1c -/* 426D60 802A9390 080AA606 */ j L802A9818_4271E8 -/* 426D64 802A9394 00000000 */ nop -dlabel L802A9398_426D68 -/* 426D68 802A9398 0C093EB1 */ jal btl_set_popup_duration -/* 426D6C 802A939C 24040063 */ addiu $a0, $zero, 0x63 -/* 426D70 802A93A0 8622004E */ lh $v0, 0x4e($s1) -/* 426D74 802A93A4 9623004E */ lhu $v1, 0x4e($s1) -/* 426D78 802A93A8 10400003 */ beqz $v0, .L802A93B8 -/* 426D7C 802A93AC 2462FFFF */ addiu $v0, $v1, -1 -/* 426D80 802A93B0 080AA606 */ j L802A9818_4271E8 -/* 426D84 802A93B4 A622004E */ sh $v0, 0x4e($s1) -.L802A93B8: -/* 426D88 802A93B8 8E240004 */ lw $a0, 4($s1) -/* 426D8C 802A93BC 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) -/* 426D90 802A93C0 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) -/* 426D94 802A93C4 0C0511FF */ jal hud_element_set_script -/* 426D98 802A93C8 00000000 */ nop -/* 426D9C 802A93CC 3C048000 */ lui $a0, 0x8000 -/* 426DA0 802A93D0 34840041 */ ori $a0, $a0, 0x41 -/* 426DA4 802A93D4 0000282D */ daddu $a1, $zero, $zero -/* 426DA8 802A93D8 00A0302D */ daddu $a2, $a1, $zero -/* 426DAC 802A93DC 96220052 */ lhu $v0, 0x52($s1) -/* 426DB0 802A93E0 00A0382D */ daddu $a3, $a1, $zero -/* 426DB4 802A93E4 A6200044 */ sh $zero, 0x44($s1) -/* 426DB8 802A93E8 A2400085 */ sb $zero, 0x85($s2) -/* 426DBC 802A93EC A220005C */ sb $zero, 0x5c($s1) -/* 426DC0 802A93F0 0C0526AE */ jal sfx_play_sound_with_params -/* 426DC4 802A93F4 A6220054 */ sh $v0, 0x54($s1) -/* 426DC8 802A93F8 2402000B */ addiu $v0, $zero, 0xb -/* 426DCC 802A93FC A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9400_426DD0 -/* 426DD0 802A9400 0C093EB1 */ jal btl_set_popup_duration -/* 426DD4 802A9404 24040063 */ addiu $a0, $zero, 0x63 -/* 426DD8 802A9408 86220068 */ lh $v0, 0x68($s1) -/* 426DDC 802A940C 1440005F */ bnez $v0, .L802A958C -/* 426DE0 802A9410 00000000 */ nop -/* 426DE4 802A9414 82220080 */ lb $v0, 0x80($s1) -/* 426DE8 802A9418 00021040 */ sll $v0, $v0, 1 -/* 426DEC 802A941C 02221021 */ addu $v0, $s1, $v0 -/* 426DF0 802A9420 84430074 */ lh $v1, 0x74($v0) -/* 426DF4 802A9424 86220044 */ lh $v0, 0x44($s1) -/* 426DF8 802A9428 14600002 */ bnez $v1, .L802A9434 -/* 426DFC 802A942C 0043001A */ div $zero, $v0, $v1 -/* 426E00 802A9430 0007000D */ break 7 -.L802A9434: -/* 426E04 802A9434 2401FFFF */ addiu $at, $zero, -1 -/* 426E08 802A9438 14610004 */ bne $v1, $at, .L802A944C -/* 426E0C 802A943C 3C018000 */ lui $at, 0x8000 -/* 426E10 802A9440 14410002 */ bne $v0, $at, .L802A944C -/* 426E14 802A9444 00000000 */ nop -/* 426E18 802A9448 0006000D */ break 6 -.L802A944C: -/* 426E1C 802A944C 00001012 */ mflo $v0 -/* 426E20 802A9450 3C036666 */ lui $v1, 0x6666 -/* 426E24 802A9454 34636667 */ ori $v1, $v1, 0x6667 -/* 426E28 802A9458 00430018 */ mult $v0, $v1 -/* 426E2C 802A945C 000217C3 */ sra $v0, $v0, 0x1f -/* 426E30 802A9460 00001810 */ mfhi $v1 -/* 426E34 802A9464 000318C3 */ sra $v1, $v1, 3 -/* 426E38 802A9468 00621823 */ subu $v1, $v1, $v0 -/* 426E3C 802A946C 00031880 */ sll $v1, $v1, 2 -/* 426E40 802A9470 96220044 */ lhu $v0, 0x44($s1) -/* 426E44 802A9474 3C01802B */ lui $at, %hi(D_802A9952_427322) -/* 426E48 802A9478 00230821 */ addu $at, $at, $v1 -/* 426E4C 802A947C 94239952 */ lhu $v1, %lo(D_802A9952_427322)($at) -/* 426E50 802A9480 00431023 */ subu $v0, $v0, $v1 -/* 426E54 802A9484 A6220044 */ sh $v0, 0x44($s1) -/* 426E58 802A9488 00021400 */ sll $v0, $v0, 0x10 -/* 426E5C 802A948C 04420001 */ bltzl $v0, .L802A9494 -/* 426E60 802A9490 A6200044 */ sh $zero, 0x44($s1) -.L802A9494: -/* 426E64 802A9494 86220068 */ lh $v0, 0x68($s1) -/* 426E68 802A9498 1440003C */ bnez $v0, .L802A958C -/* 426E6C 802A949C 3C040004 */ lui $a0, 4 -/* 426E70 802A94A0 8E420210 */ lw $v0, 0x210($s2) -/* 426E74 802A94A4 00441024 */ and $v0, $v0, $a0 -/* 426E78 802A94A8 10400005 */ beqz $v0, .L802A94C0 -/* 426E7C 802A94AC 24030001 */ addiu $v1, $zero, 1 -/* 426E80 802A94B0 8E420210 */ lw $v0, 0x210($s2) -/* 426E84 802A94B4 00441024 */ and $v0, $v0, $a0 -/* 426E88 802A94B8 1440001A */ bnez $v0, .L802A9524 -/* 426E8C 802A94BC A223005C */ sb $v1, 0x5c($s1) -.L802A94C0: -/* 426E90 802A94C0 8222005C */ lb $v0, 0x5c($s1) -/* 426E94 802A94C4 10400017 */ beqz $v0, .L802A9524 -/* 426E98 802A94C8 3C0451EB */ lui $a0, 0x51eb -/* 426E9C 802A94CC 86220050 */ lh $v0, 0x50($s1) -/* 426EA0 802A94D0 8E430434 */ lw $v1, 0x434($s2) -/* 426EA4 802A94D4 00021080 */ sll $v0, $v0, 2 -/* 426EA8 802A94D8 00431021 */ addu $v0, $v0, $v1 -/* 426EAC 802A94DC 8C430000 */ lw $v1, ($v0) -/* 426EB0 802A94E0 3484851F */ ori $a0, $a0, 0x851f -/* 426EB4 802A94E4 00031100 */ sll $v0, $v1, 4 -/* 426EB8 802A94E8 00431023 */ subu $v0, $v0, $v1 -/* 426EBC 802A94EC 000210C0 */ sll $v0, $v0, 3 -/* 426EC0 802A94F0 00431023 */ subu $v0, $v0, $v1 -/* 426EC4 802A94F4 00021080 */ sll $v0, $v0, 2 -/* 426EC8 802A94F8 00431023 */ subu $v0, $v0, $v1 -/* 426ECC 802A94FC 00021040 */ sll $v0, $v0, 1 -/* 426ED0 802A9500 00440018 */ mult $v0, $a0 -/* 426ED4 802A9504 A220005C */ sb $zero, 0x5c($s1) -/* 426ED8 802A9508 000217C3 */ sra $v0, $v0, 0x1f -/* 426EDC 802A950C 96230044 */ lhu $v1, 0x44($s1) -/* 426EE0 802A9510 00004810 */ mfhi $t1 -/* 426EE4 802A9514 00092143 */ sra $a0, $t1, 5 -/* 426EE8 802A9518 00822023 */ subu $a0, $a0, $v0 -/* 426EEC 802A951C 00641821 */ addu $v1, $v1, $a0 -/* 426EF0 802A9520 A6230044 */ sh $v1, 0x44($s1) -.L802A9524: -/* 426EF4 802A9524 8E420214 */ lw $v0, 0x214($s2) -/* 426EF8 802A9528 3C030008 */ lui $v1, 8 -/* 426EFC 802A952C 00431024 */ and $v0, $v0, $v1 -/* 426F00 802A9530 10400016 */ beqz $v0, .L802A958C -/* 426F04 802A9534 3C0451EB */ lui $a0, 0x51eb -/* 426F08 802A9538 86220050 */ lh $v0, 0x50($s1) -/* 426F0C 802A953C 8E430434 */ lw $v1, 0x434($s2) -/* 426F10 802A9540 00021080 */ sll $v0, $v0, 2 -/* 426F14 802A9544 00431021 */ addu $v0, $v0, $v1 -/* 426F18 802A9548 8C430000 */ lw $v1, ($v0) -/* 426F1C 802A954C 3484851F */ ori $a0, $a0, 0x851f -/* 426F20 802A9550 00031100 */ sll $v0, $v1, 4 -/* 426F24 802A9554 00431023 */ subu $v0, $v0, $v1 -/* 426F28 802A9558 000210C0 */ sll $v0, $v0, 3 -/* 426F2C 802A955C 00431023 */ subu $v0, $v0, $v1 -/* 426F30 802A9560 00021080 */ sll $v0, $v0, 2 -/* 426F34 802A9564 00431023 */ subu $v0, $v0, $v1 -/* 426F38 802A9568 00021040 */ sll $v0, $v0, 1 -/* 426F3C 802A956C 00440018 */ mult $v0, $a0 -/* 426F40 802A9570 000217C3 */ sra $v0, $v0, 0x1f -/* 426F44 802A9574 96230044 */ lhu $v1, 0x44($s1) -/* 426F48 802A9578 00004810 */ mfhi $t1 -/* 426F4C 802A957C 00092143 */ sra $a0, $t1, 5 -/* 426F50 802A9580 00822023 */ subu $a0, $a0, $v0 -/* 426F54 802A9584 00641823 */ subu $v1, $v1, $a0 -/* 426F58 802A9588 A6230044 */ sh $v1, 0x44($s1) -.L802A958C: -/* 426F5C 802A958C 86220044 */ lh $v0, 0x44($s1) -/* 426F60 802A9590 04420001 */ bltzl $v0, .L802A9598 -/* 426F64 802A9594 A6200044 */ sh $zero, 0x44($s1) -.L802A9598: -/* 426F68 802A9598 86220044 */ lh $v0, 0x44($s1) -/* 426F6C 802A959C 28422711 */ slti $v0, $v0, 0x2711 -/* 426F70 802A95A0 14400010 */ bnez $v0, .L802A95E4 -/* 426F74 802A95A4 3C0451EB */ lui $a0, 0x51eb -/* 426F78 802A95A8 8E30000C */ lw $s0, 0xc($s1) -/* 426F7C 802A95AC 86250056 */ lh $a1, 0x56($s1) -/* 426F80 802A95B0 86260058 */ lh $a2, 0x58($s1) -/* 426F84 802A95B4 24022710 */ addiu $v0, $zero, 0x2710 -/* 426F88 802A95B8 A6220044 */ sh $v0, 0x44($s1) -/* 426F8C 802A95BC 24020001 */ addiu $v0, $zero, 1 -/* 426F90 802A95C0 A6220068 */ sh $v0, 0x68($s1) -/* 426F94 802A95C4 0200202D */ daddu $a0, $s0, $zero -/* 426F98 802A95C8 24A50032 */ addiu $a1, $a1, 0x32 -/* 426F9C 802A95CC 0C051261 */ jal hud_element_set_render_pos -/* 426FA0 802A95D0 24C6001C */ addiu $a2, $a2, 0x1c -/* 426FA4 802A95D4 0200202D */ daddu $a0, $s0, $zero -/* 426FA8 802A95D8 0C05128B */ jal hud_element_clear_flags -/* 426FAC 802A95DC 24050002 */ addiu $a1, $zero, 2 -/* 426FB0 802A95E0 3C0451EB */ lui $a0, 0x51eb -.L802A95E4: -/* 426FB4 802A95E4 3484851F */ ori $a0, $a0, 0x851f -/* 426FB8 802A95E8 96230044 */ lhu $v1, 0x44($s1) -/* 426FBC 802A95EC 0000282D */ daddu $a1, $zero, $zero -/* 426FC0 802A95F0 00031C00 */ sll $v1, $v1, 0x10 -/* 426FC4 802A95F4 00031403 */ sra $v0, $v1, 0x10 -/* 426FC8 802A95F8 00440018 */ mult $v0, $a0 -/* 426FCC 802A95FC 00A0302D */ daddu $a2, $a1, $zero -/* 426FD0 802A9600 3C048000 */ lui $a0, 0x8000 -/* 426FD4 802A9604 34840041 */ ori $a0, $a0, 0x41 -/* 426FD8 802A9608 00031FC3 */ sra $v1, $v1, 0x1f -/* 426FDC 802A960C 00004810 */ mfhi $t1 -/* 426FE0 802A9610 00094143 */ sra $t0, $t1, 5 -/* 426FE4 802A9614 01034023 */ subu $t0, $t0, $v1 -/* 426FE8 802A9618 00081600 */ sll $v0, $t0, 0x18 -/* 426FEC 802A961C 00021603 */ sra $v0, $v0, 0x18 -/* 426FF0 802A9620 00023840 */ sll $a3, $v0, 1 -/* 426FF4 802A9624 00E23821 */ addu $a3, $a3, $v0 -/* 426FF8 802A9628 00073880 */ sll $a3, $a3, 2 -/* 426FFC 802A962C 0C0526F9 */ jal sfx_adjust_env_sound_params -/* 427000 802A9630 A2480084 */ sb $t0, 0x84($s2) -/* 427004 802A9634 8E620008 */ lw $v0, 8($s3) -/* 427008 802A9638 90430006 */ lbu $v1, 6($v0) -/* 42700C 802A963C 24020001 */ addiu $v0, $zero, 1 -/* 427010 802A9640 10620019 */ beq $v1, $v0, .L802A96A8 -/* 427014 802A9644 28620002 */ slti $v0, $v1, 2 -/* 427018 802A9648 10400005 */ beqz $v0, .L802A9660 -/* 42701C 802A964C 24020002 */ addiu $v0, $zero, 2 -/* 427020 802A9650 10600007 */ beqz $v1, .L802A9670 -/* 427024 802A9654 00000000 */ nop -/* 427028 802A9658 080AA5D1 */ j .L802A9744 -/* 42702C 802A965C 00000000 */ nop -.L802A9660: -/* 427030 802A9660 1062001F */ beq $v1, $v0, .L802A96E0 -/* 427034 802A9664 00000000 */ nop -/* 427038 802A9668 080AA5D1 */ j .L802A9744 -/* 42703C 802A966C 00000000 */ nop -.L802A9670: -/* 427040 802A9670 82420085 */ lb $v0, 0x85($s2) -/* 427044 802A9674 82430084 */ lb $v1, 0x84($s2) -/* 427048 802A9678 00021080 */ sll $v0, $v0, 2 -/* 42704C 802A967C 3C01802B */ lui $at, %hi(D_802A9964_427334) -/* 427050 802A9680 00220821 */ addu $at, $at, $v0 -/* 427054 802A9684 8C229964 */ lw $v0, %lo(D_802A9964_427334)($at) -/* 427058 802A9688 3C05802B */ lui $a1, %hi(D_802A9964_427334) -/* 42705C 802A968C 24A59964 */ addiu $a1, $a1, %lo(D_802A9964_427334) -/* 427060 802A9690 0062182A */ slt $v1, $v1, $v0 -/* 427064 802A9694 92420085 */ lbu $v0, 0x85($s2) -/* 427068 802A9698 1460001E */ bnez $v1, .L802A9714 -/* 42706C 802A969C 24420001 */ addiu $v0, $v0, 1 -/* 427070 802A96A0 080AA5C5 */ j .L802A9714 -/* 427074 802A96A4 A2420085 */ sb $v0, 0x85($s2) -.L802A96A8: -/* 427078 802A96A8 82420085 */ lb $v0, 0x85($s2) -/* 42707C 802A96AC 82430084 */ lb $v1, 0x84($s2) -/* 427080 802A96B0 00021080 */ sll $v0, $v0, 2 -/* 427084 802A96B4 3C01802B */ lui $at, %hi(D_802A9974_427344) -/* 427088 802A96B8 00220821 */ addu $at, $at, $v0 -/* 42708C 802A96BC 8C229974 */ lw $v0, %lo(D_802A9974_427344)($at) -/* 427090 802A96C0 3C05802B */ lui $a1, %hi(D_802A9974_427344) -/* 427094 802A96C4 24A59974 */ addiu $a1, $a1, %lo(D_802A9974_427344) -/* 427098 802A96C8 0062182A */ slt $v1, $v1, $v0 -/* 42709C 802A96CC 92420085 */ lbu $v0, 0x85($s2) -/* 4270A0 802A96D0 14600010 */ bnez $v1, .L802A9714 -/* 4270A4 802A96D4 24420001 */ addiu $v0, $v0, 1 -/* 4270A8 802A96D8 080AA5C5 */ j .L802A9714 -/* 4270AC 802A96DC A2420085 */ sb $v0, 0x85($s2) -.L802A96E0: -/* 4270B0 802A96E0 82420085 */ lb $v0, 0x85($s2) -/* 4270B4 802A96E4 82430084 */ lb $v1, 0x84($s2) -/* 4270B8 802A96E8 00021080 */ sll $v0, $v0, 2 -/* 4270BC 802A96EC 3C01802B */ lui $at, %hi(D_802A9988_427358) -/* 4270C0 802A96F0 00220821 */ addu $at, $at, $v0 -/* 4270C4 802A96F4 8C229988 */ lw $v0, %lo(D_802A9988_427358)($at) -/* 4270C8 802A96F8 3C05802B */ lui $a1, %hi(D_802A9988_427358) -/* 4270CC 802A96FC 24A59988 */ addiu $a1, $a1, %lo(D_802A9988_427358) -/* 4270D0 802A9700 0062182A */ slt $v1, $v1, $v0 -/* 4270D4 802A9704 92420085 */ lbu $v0, 0x85($s2) -/* 4270D8 802A9708 14600002 */ bnez $v1, .L802A9714 -/* 4270DC 802A970C 24420001 */ addiu $v0, $v0, 1 -/* 4270E0 802A9710 A2420085 */ sb $v0, 0x85($s2) -.L802A9714: -/* 4270E4 802A9714 82420085 */ lb $v0, 0x85($s2) -/* 4270E8 802A9718 92440085 */ lbu $a0, 0x85($s2) -/* 4270EC 802A971C 18400009 */ blez $v0, .L802A9744 -/* 4270F0 802A9720 2442FFFF */ addiu $v0, $v0, -1 -/* 4270F4 802A9724 00021080 */ sll $v0, $v0, 2 -/* 4270F8 802A9728 00451021 */ addu $v0, $v0, $a1 -/* 4270FC 802A972C 82430084 */ lb $v1, 0x84($s2) -/* 427100 802A9730 8C420000 */ lw $v0, ($v0) -/* 427104 802A9734 0062182A */ slt $v1, $v1, $v0 -/* 427108 802A9738 10600002 */ beqz $v1, .L802A9744 -/* 42710C 802A973C 2482FFFF */ addiu $v0, $a0, -1 -/* 427110 802A9740 A2420085 */ sb $v0, 0x85($s2) -.L802A9744: -/* 427114 802A9744 86220054 */ lh $v0, 0x54($s1) -/* 427118 802A9748 96230054 */ lhu $v1, 0x54($s1) -/* 42711C 802A974C 1440002E */ bnez $v0, .L802A9808 -/* 427120 802A9750 2462FFFF */ addiu $v0, $v1, -1 -/* 427124 802A9754 96220044 */ lhu $v0, 0x44($s1) -/* 427128 802A9758 00021C00 */ sll $v1, $v0, 0x10 -/* 42712C 802A975C 00032403 */ sra $a0, $v1, 0x10 -/* 427130 802A9760 14800003 */ bnez $a0, .L802A9770 -/* 427134 802A9764 3C0251EB */ lui $v0, 0x51eb -/* 427138 802A9768 080AA5E2 */ j .L802A9788 -/* 42713C 802A976C 2402FFFF */ addiu $v0, $zero, -1 -.L802A9770: -/* 427140 802A9770 3442851F */ ori $v0, $v0, 0x851f -/* 427144 802A9774 00820018 */ mult $a0, $v0 -/* 427148 802A9778 00031FC3 */ sra $v1, $v1, 0x1f -/* 42714C 802A977C 00004810 */ mfhi $t1 -/* 427150 802A9780 00091143 */ sra $v0, $t1, 5 -/* 427154 802A9784 00431023 */ subu $v0, $v0, $v1 -.L802A9788: -/* 427158 802A9788 A2420081 */ sb $v0, 0x81($s2) -/* 42715C 802A978C 82220080 */ lb $v0, 0x80($s1) -/* 427160 802A9790 2442FFFF */ addiu $v0, $v0, -1 -/* 427164 802A9794 00021040 */ sll $v0, $v0, 1 -/* 427168 802A9798 02221021 */ addu $v0, $s1, $v0 -/* 42716C 802A979C 84430074 */ lh $v1, 0x74($v0) -/* 427170 802A97A0 82420081 */ lb $v0, 0x81($s2) -/* 427174 802A97A4 0062102A */ slt $v0, $v1, $v0 -/* 427178 802A97A8 14400002 */ bnez $v0, .L802A97B4 -/* 42717C 802A97AC 24020001 */ addiu $v0, $zero, 1 -/* 427180 802A97B0 2402FFFE */ addiu $v0, $zero, -2 -.L802A97B4: -/* 427184 802A97B4 A2420086 */ sb $v0, 0x86($s2) -/* 427188 802A97B8 82430081 */ lb $v1, 0x81($s2) -/* 42718C 802A97BC 24020064 */ addiu $v0, $zero, 0x64 -/* 427190 802A97C0 14620004 */ bne $v1, $v0, .L802A97D4 -/* 427194 802A97C4 3C048000 */ lui $a0, 0x8000 -/* 427198 802A97C8 0C09A458 */ jal func_80269160 -/* 42719C 802A97CC 00000000 */ nop -/* 4271A0 802A97D0 3C048000 */ lui $a0, 0x8000 -.L802A97D4: -/* 4271A4 802A97D4 0C05271B */ jal sfx_stop_sound -/* 4271A8 802A97D8 34840041 */ ori $a0, $a0, 0x41 -/* 4271AC 802A97DC 0C093EB1 */ jal btl_set_popup_duration -/* 4271B0 802A97E0 0000202D */ daddu $a0, $zero, $zero -/* 4271B4 802A97E4 24020005 */ addiu $v0, $zero, 5 -/* 4271B8 802A97E8 A6220054 */ sh $v0, 0x54($s1) -/* 4271BC 802A97EC 2402000C */ addiu $v0, $zero, 0xc -/* 4271C0 802A97F0 080AA606 */ j L802A9818_4271E8 -/* 4271C4 802A97F4 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A97F8_4271C8 -/* 4271C8 802A97F8 86220054 */ lh $v0, 0x54($s1) -/* 4271CC 802A97FC 96230054 */ lhu $v1, 0x54($s1) -/* 4271D0 802A9800 10400003 */ beqz $v0, .L802A9810 -/* 4271D4 802A9804 2462FFFF */ addiu $v0, $v1, -1 -.L802A9808: -/* 4271D8 802A9808 080AA606 */ j L802A9818_4271E8 -/* 4271DC 802A980C A6220054 */ sh $v0, 0x54($s1) -.L802A9810: -/* 4271E0 802A9810 0C09A327 */ jal func_80268C9C -/* 4271E4 802A9814 00000000 */ nop -dlabel L802A9818_4271E8 -/* 4271E8 802A9818 8FBF0020 */ lw $ra, 0x20($sp) -/* 4271EC 802A981C 8FB3001C */ lw $s3, 0x1c($sp) -/* 4271F0 802A9820 8FB20018 */ lw $s2, 0x18($sp) -/* 4271F4 802A9824 8FB10014 */ lw $s1, 0x14($sp) -/* 4271F8 802A9828 8FB00010 */ lw $s0, 0x10($sp) -/* 4271FC 802A982C 03E00008 */ jr $ra -/* 427200 802A9830 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s deleted file mode 100644 index 50024b3d9a..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s +++ /dev/null @@ -1,451 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A936C_42236C -/* 42236C 802A936C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 422370 802A9370 AFB10014 */ sw $s1, 0x14($sp) -/* 422374 802A9374 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 422378 802A9378 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42237C 802A937C AFBF001C */ sw $ra, 0x1c($sp) -/* 422380 802A9380 AFB20018 */ sw $s2, 0x18($sp) -/* 422384 802A9384 AFB00010 */ sw $s0, 0x10($sp) -/* 422388 802A9388 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 42238C 802A938C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 422390 802A9390 8623004C */ lh $v1, 0x4c($s1) -/* 422394 802A9394 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 422398 802A9398 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 42239C 802A939C 2C62000D */ sltiu $v0, $v1, 0xd -/* 4223A0 802A93A0 10400184 */ beqz $v0, L802A99B4_4229B4 -/* 4223A4 802A93A4 00031080 */ sll $v0, $v1, 2 -/* 4223A8 802A93A8 3C01802B */ lui $at, %hi(jtbl_802A9A90_422A90) -/* 4223AC 802A93AC 00220821 */ addu $at, $at, $v0 -/* 4223B0 802A93B0 8C229A90 */ lw $v0, %lo(jtbl_802A9A90_422A90)($at) -/* 4223B4 802A93B4 00400008 */ jr $v0 -/* 4223B8 802A93B8 00000000 */ nop -dlabel L802A93BC_4223BC -/* 4223BC 802A93BC 0C093EB1 */ jal btl_set_popup_duration -/* 4223C0 802A93C0 24040063 */ addiu $a0, $zero, 0x63 -/* 4223C4 802A93C4 82220061 */ lb $v0, 0x61($s1) -/* 4223C8 802A93C8 8E300004 */ lw $s0, 4($s1) -/* 4223CC 802A93CC 10400003 */ beqz $v0, .L802A93DC -/* 4223D0 802A93D0 0200202D */ daddu $a0, $s0, $zero -/* 4223D4 802A93D4 0C05128B */ jal hud_element_clear_flags -/* 4223D8 802A93D8 24050002 */ addiu $a1, $zero, 2 -.L802A93DC: -/* 4223DC 802A93DC 0200202D */ daddu $a0, $s0, $zero -/* 4223E0 802A93E0 0C0513AC */ jal hud_element_set_alpha -/* 4223E4 802A93E4 240500FF */ addiu $a1, $zero, 0xff -/* 4223E8 802A93E8 82220061 */ lb $v0, 0x61($s1) -/* 4223EC 802A93EC 8E300008 */ lw $s0, 8($s1) -/* 4223F0 802A93F0 10400003 */ beqz $v0, .L802A9400 -/* 4223F4 802A93F4 0200202D */ daddu $a0, $s0, $zero -/* 4223F8 802A93F8 0C05128B */ jal hud_element_clear_flags -/* 4223FC 802A93FC 24050002 */ addiu $a1, $zero, 2 -.L802A9400: -/* 422400 802A9400 0200202D */ daddu $a0, $s0, $zero -/* 422404 802A9404 0C0513AC */ jal hud_element_set_alpha -/* 422408 802A9408 240500FF */ addiu $a1, $zero, 0xff -/* 42240C 802A940C 82220061 */ lb $v0, 0x61($s1) -/* 422410 802A9410 8E30000C */ lw $s0, 0xc($s1) -/* 422414 802A9414 10400003 */ beqz $v0, .L802A9424 -/* 422418 802A9418 0200202D */ daddu $a0, $s0, $zero -/* 42241C 802A941C 0C05128B */ jal hud_element_clear_flags -/* 422420 802A9420 24050002 */ addiu $a1, $zero, 2 -.L802A9424: -/* 422424 802A9424 0200202D */ daddu $a0, $s0, $zero -/* 422428 802A9428 0C0513AC */ jal hud_element_set_alpha -/* 42242C 802A942C 240500FF */ addiu $a1, $zero, 0xff -/* 422430 802A9430 82220061 */ lb $v0, 0x61($s1) -/* 422434 802A9434 8E300010 */ lw $s0, 0x10($s1) -/* 422438 802A9438 10400003 */ beqz $v0, .L802A9448 -/* 42243C 802A943C 0200202D */ daddu $a0, $s0, $zero -/* 422440 802A9440 0C05128B */ jal hud_element_clear_flags -/* 422444 802A9444 24050002 */ addiu $a1, $zero, 2 -.L802A9448: -/* 422448 802A9448 0200202D */ daddu $a0, $s0, $zero -/* 42244C 802A944C 0C0513AC */ jal hud_element_set_alpha -/* 422450 802A9450 240500FF */ addiu $a1, $zero, 0xff -/* 422454 802A9454 82220061 */ lb $v0, 0x61($s1) -/* 422458 802A9458 8E300014 */ lw $s0, 0x14($s1) -/* 42245C 802A945C 10400003 */ beqz $v0, .L802A946C -/* 422460 802A9460 0200202D */ daddu $a0, $s0, $zero -/* 422464 802A9464 0C05128B */ jal hud_element_clear_flags -/* 422468 802A9468 24050002 */ addiu $a1, $zero, 2 -.L802A946C: -/* 42246C 802A946C 0200202D */ daddu $a0, $s0, $zero -/* 422470 802A9470 0C0513AC */ jal hud_element_set_alpha -/* 422474 802A9474 240500FF */ addiu $a1, $zero, 0xff -/* 422478 802A9478 82220061 */ lb $v0, 0x61($s1) -/* 42247C 802A947C 8E300018 */ lw $s0, 0x18($s1) -/* 422480 802A9480 10400003 */ beqz $v0, .L802A9490 -/* 422484 802A9484 0200202D */ daddu $a0, $s0, $zero -/* 422488 802A9488 0C05128B */ jal hud_element_clear_flags -/* 42248C 802A948C 24050002 */ addiu $a1, $zero, 2 -.L802A9490: -/* 422490 802A9490 0200202D */ daddu $a0, $s0, $zero -/* 422494 802A9494 0C0513AC */ jal hud_element_set_alpha -/* 422498 802A9498 240500FF */ addiu $a1, $zero, 0xff -/* 42249C 802A949C 24020001 */ addiu $v0, $zero, 1 -/* 4224A0 802A94A0 080AA66D */ j L802A99B4_4229B4 -/* 4224A4 802A94A4 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A94A8_4224A8 -/* 4224A8 802A94A8 0C093EB1 */ jal btl_set_popup_duration -/* 4224AC 802A94AC 24040063 */ addiu $a0, $zero, 0x63 -/* 4224B0 802A94B0 96220056 */ lhu $v0, 0x56($s1) -/* 4224B4 802A94B4 24420014 */ addiu $v0, $v0, 0x14 -/* 4224B8 802A94B8 A6220056 */ sh $v0, 0x56($s1) -/* 4224BC 802A94BC 00021400 */ sll $v0, $v0, 0x10 -/* 4224C0 802A94C0 00021403 */ sra $v0, $v0, 0x10 -/* 4224C4 802A94C4 28420033 */ slti $v0, $v0, 0x33 -/* 4224C8 802A94C8 14400002 */ bnez $v0, .L802A94D4 -/* 4224CC 802A94CC 24020032 */ addiu $v0, $zero, 0x32 -/* 4224D0 802A94D0 A6220056 */ sh $v0, 0x56($s1) -.L802A94D4: -/* 4224D4 802A94D4 8E240004 */ lw $a0, 4($s1) -/* 4224D8 802A94D8 86250056 */ lh $a1, 0x56($s1) -/* 4224DC 802A94DC 0C051261 */ jal hud_element_set_render_pos -/* 4224E0 802A94E0 86260058 */ lh $a2, 0x58($s1) -/* 4224E4 802A94E4 8E240008 */ lw $a0, 8($s1) -/* 4224E8 802A94E8 86250056 */ lh $a1, 0x56($s1) -/* 4224EC 802A94EC 86260058 */ lh $a2, 0x58($s1) -/* 4224F0 802A94F0 24A50015 */ addiu $a1, $a1, 0x15 -/* 4224F4 802A94F4 0C051261 */ jal hud_element_set_render_pos -/* 4224F8 802A94F8 24C6FFFD */ addiu $a2, $a2, -3 -/* 4224FC 802A94FC 8E24000C */ lw $a0, 0xc($s1) -/* 422500 802A9500 86250056 */ lh $a1, 0x56($s1) -/* 422504 802A9504 86260058 */ lh $a2, 0x58($s1) -/* 422508 802A9508 24A50005 */ addiu $a1, $a1, 5 -/* 42250C 802A950C 0C051261 */ jal hud_element_set_render_pos -/* 422510 802A9510 24C60001 */ addiu $a2, $a2, 1 -/* 422514 802A9514 8E240010 */ lw $a0, 0x10($s1) -/* 422518 802A9518 86250056 */ lh $a1, 0x56($s1) -/* 42251C 802A951C 86260058 */ lh $a2, 0x58($s1) -/* 422520 802A9520 24A5FFF9 */ addiu $a1, $a1, -7 -/* 422524 802A9524 0C051261 */ jal hud_element_set_render_pos -/* 422528 802A9528 24C60001 */ addiu $a2, $a2, 1 -/* 42252C 802A952C 8E240014 */ lw $a0, 0x14($s1) -/* 422530 802A9530 86250056 */ lh $a1, 0x56($s1) -/* 422534 802A9534 86260058 */ lh $a2, 0x58($s1) -/* 422538 802A9538 24A5FFED */ addiu $a1, $a1, -0x13 -/* 42253C 802A953C 0C051261 */ jal hud_element_set_render_pos -/* 422540 802A9540 24C60001 */ addiu $a2, $a2, 1 -/* 422544 802A9544 8E240018 */ lw $a0, 0x18($s1) -/* 422548 802A9548 86260058 */ lh $a2, 0x58($s1) -/* 42254C 802A954C 86250056 */ lh $a1, 0x56($s1) -/* 422550 802A9550 0C051261 */ jal hud_element_set_render_pos -/* 422554 802A9554 24C6FFE9 */ addiu $a2, $a2, -0x17 -/* 422558 802A9558 8222005E */ lb $v0, 0x5e($s1) -/* 42255C 802A955C 10400115 */ beqz $v0, L802A99B4_4229B4 -/* 422560 802A9560 00000000 */ nop -/* 422564 802A9564 8E30001C */ lw $s0, 0x1c($s1) -/* 422568 802A9568 86260058 */ lh $a2, 0x58($s1) -/* 42256C 802A956C 86250056 */ lh $a1, 0x56($s1) -/* 422570 802A9570 0200202D */ daddu $a0, $s0, $zero -/* 422574 802A9574 0C051261 */ jal hud_element_set_render_pos -/* 422578 802A9578 24A50032 */ addiu $a1, $a1, 0x32 -/* 42257C 802A957C 82220061 */ lb $v0, 0x61($s1) -/* 422580 802A9580 1040010C */ beqz $v0, L802A99B4_4229B4 -/* 422584 802A9584 0200202D */ daddu $a0, $s0, $zero -/* 422588 802A9588 0C05128B */ jal hud_element_clear_flags -/* 42258C 802A958C 24050002 */ addiu $a1, $zero, 2 -/* 422590 802A9590 080AA66D */ j L802A99B4_4229B4 -/* 422594 802A9594 00000000 */ nop -dlabel L802A9598_422598 -/* 422598 802A9598 0C093EB1 */ jal btl_set_popup_duration -/* 42259C 802A959C 24040063 */ addiu $a0, $zero, 0x63 -/* 4225A0 802A95A0 8622004E */ lh $v0, 0x4e($s1) -/* 4225A4 802A95A4 2842000F */ slti $v0, $v0, 0xf -/* 4225A8 802A95A8 10400013 */ beqz $v0, .L802A95F8 -/* 4225AC 802A95AC 00000000 */ nop -/* 4225B0 802A95B0 8E240004 */ lw $a0, 4($s1) -/* 4225B4 802A95B4 0C0513AC */ jal hud_element_set_alpha -/* 4225B8 802A95B8 240500FF */ addiu $a1, $zero, 0xff -/* 4225BC 802A95BC 8E240008 */ lw $a0, 8($s1) -/* 4225C0 802A95C0 0C0513AC */ jal hud_element_set_alpha -/* 4225C4 802A95C4 240500FF */ addiu $a1, $zero, 0xff -/* 4225C8 802A95C8 8E24000C */ lw $a0, 0xc($s1) -/* 4225CC 802A95CC 0C0513AC */ jal hud_element_set_alpha -/* 4225D0 802A95D0 240500FF */ addiu $a1, $zero, 0xff -/* 4225D4 802A95D4 8E240010 */ lw $a0, 0x10($s1) -/* 4225D8 802A95D8 0C0513AC */ jal hud_element_set_alpha -/* 4225DC 802A95DC 240500FF */ addiu $a1, $zero, 0xff -/* 4225E0 802A95E0 8E240014 */ lw $a0, 0x14($s1) -/* 4225E4 802A95E4 0C0513AC */ jal hud_element_set_alpha -/* 4225E8 802A95E8 240500FF */ addiu $a1, $zero, 0xff -/* 4225EC 802A95EC 8E240018 */ lw $a0, 0x18($s1) -/* 4225F0 802A95F0 0C0513AC */ jal hud_element_set_alpha -/* 4225F4 802A95F4 240500FF */ addiu $a1, $zero, 0xff -.L802A95F8: -/* 4225F8 802A95F8 8622004E */ lh $v0, 0x4e($s1) -/* 4225FC 802A95FC 9623004E */ lhu $v1, 0x4e($s1) -/* 422600 802A9600 10400003 */ beqz $v0, .L802A9610 -/* 422604 802A9604 2462FFFF */ addiu $v0, $v1, -1 -/* 422608 802A9608 080AA66D */ j L802A99B4_4229B4 -/* 42260C 802A960C A622004E */ sh $v0, 0x4e($s1) -.L802A9610: -/* 422610 802A9610 A6200054 */ sh $zero, 0x54($s1) -/* 422614 802A9614 8E420210 */ lw $v0, 0x210($s2) -/* 422618 802A9618 3C030004 */ lui $v1, 4 -/* 42261C 802A961C 00431024 */ and $v0, $v0, $v1 -/* 422620 802A9620 14400007 */ bnez $v0, .L802A9640 -/* 422624 802A9624 2402000B */ addiu $v0, $zero, 0xb -/* 422628 802A9628 82420083 */ lb $v0, 0x83($s2) -/* 42262C 802A962C 28420002 */ slti $v0, $v0, 2 -/* 422630 802A9630 10400002 */ beqz $v0, .L802A963C -/* 422634 802A9634 24020001 */ addiu $v0, $zero, 1 -/* 422638 802A9638 A222005F */ sb $v0, 0x5f($s1) -.L802A963C: -/* 42263C 802A963C 2402000B */ addiu $v0, $zero, 0xb -.L802A9640: -/* 422640 802A9640 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9644_422644 -/* 422644 802A9644 0C093EB1 */ jal btl_set_popup_duration -/* 422648 802A9648 24040063 */ addiu $a0, $zero, 0x63 -/* 42264C 802A964C 82420083 */ lb $v0, 0x83($s2) -/* 422650 802A9650 044000D8 */ bltz $v0, L802A99B4_4229B4 -/* 422654 802A9654 3C045555 */ lui $a0, 0x5555 -/* 422658 802A9658 34845556 */ ori $a0, $a0, 0x5556 -/* 42265C 802A965C 86220050 */ lh $v0, 0x50($s1) -/* 422660 802A9660 8E430434 */ lw $v1, 0x434($s2) -/* 422664 802A9664 00021080 */ sll $v0, $v0, 2 -/* 422668 802A9668 00431021 */ addu $v0, $v0, $v1 -/* 42266C 802A966C 8C500000 */ lw $s0, ($v0) -/* 422670 802A9670 86220052 */ lh $v0, 0x52($s1) -/* 422674 802A9674 26030002 */ addiu $v1, $s0, 2 -/* 422678 802A9678 00431023 */ subu $v0, $v0, $v1 -/* 42267C 802A967C 00440018 */ mult $v0, $a0 -/* 422680 802A9680 86230054 */ lh $v1, 0x54($s1) -/* 422684 802A9684 000217C3 */ sra $v0, $v0, 0x1f -/* 422688 802A9688 44831000 */ mtc1 $v1, $f2 -/* 42268C 802A968C 00000000 */ nop -/* 422690 802A9690 468010A0 */ cvt.s.w $f2, $f2 -/* 422694 802A9694 00004010 */ mfhi $t0 -/* 422698 802A9698 01021023 */ subu $v0, $t0, $v0 -/* 42269C 802A969C 4482A000 */ mtc1 $v0, $f20 -/* 4226A0 802A96A0 00000000 */ nop -/* 4226A4 802A96A4 4680A520 */ cvt.s.w $f20, $f20 -/* 4226A8 802A96A8 4614103C */ c.lt.s $f2, $f20 -/* 4226AC 802A96AC 00000000 */ nop -/* 4226B0 802A96B0 4502000B */ bc1fl .L802A96E0 -/* 4226B4 802A96B4 4614A580 */ add.s $f22, $f20, $f20 -/* 4226B8 802A96B8 8E240014 */ lw $a0, 0x14($s1) -/* 4226BC 802A96BC 3C058029 */ lui $a1, %hi(HudScript_TimingCharge3) -/* 4226C0 802A96C0 24A528CC */ addiu $a1, $a1, %lo(HudScript_TimingCharge3) -/* 4226C4 802A96C4 0C0511FF */ jal hud_element_set_script -/* 4226C8 802A96C8 00000000 */ nop -/* 4226CC 802A96CC 86220054 */ lh $v0, 0x54($s1) -/* 4226D0 802A96D0 14400031 */ bnez $v0, .L802A9798 -/* 4226D4 802A96D4 A2400084 */ sb $zero, 0x84($s2) -/* 4226D8 802A96D8 080AA5E1 */ j .L802A9784 -/* 4226DC 802A96DC 00000000 */ nop -.L802A96E0: -/* 4226E0 802A96E0 4616103C */ c.lt.s $f2, $f22 -/* 4226E4 802A96E4 00000000 */ nop -/* 4226E8 802A96E8 4500000E */ bc1f .L802A9724 -/* 4226EC 802A96EC 00000000 */ nop -/* 4226F0 802A96F0 8E240010 */ lw $a0, 0x10($s1) -/* 4226F4 802A96F4 3C058029 */ lui $a1, %hi(HudScript_TimingCharge2) -/* 4226F8 802A96F8 24A52874 */ addiu $a1, $a1, %lo(HudScript_TimingCharge2) -/* 4226FC 802A96FC 0C0511FF */ jal hud_element_set_script -/* 422700 802A9700 00000000 */ nop -/* 422704 802A9704 86220054 */ lh $v0, 0x54($s1) -/* 422708 802A9708 24030001 */ addiu $v1, $zero, 1 -/* 42270C 802A970C 44820000 */ mtc1 $v0, $f0 -/* 422710 802A9710 00000000 */ nop -/* 422714 802A9714 46800020 */ cvt.s.w $f0, $f0 -/* 422718 802A9718 46140032 */ c.eq.s $f0, $f20 -/* 42271C 802A971C 080AA5DF */ j .L802A977C -/* 422720 802A9720 A2430084 */ sb $v1, 0x84($s2) -.L802A9724: -/* 422724 802A9724 3C014040 */ lui $at, 0x4040 -/* 422728 802A9728 44810000 */ mtc1 $at, $f0 -/* 42272C 802A972C 00000000 */ nop -/* 422730 802A9730 4600A002 */ mul.s $f0, $f20, $f0 -/* 422734 802A9734 00000000 */ nop -/* 422738 802A9738 4600103C */ c.lt.s $f2, $f0 -/* 42273C 802A973C 00000000 */ nop -/* 422740 802A9740 45000016 */ bc1f .L802A979C -/* 422744 802A9744 00101027 */ nor $v0, $zero, $s0 -/* 422748 802A9748 8E24000C */ lw $a0, 0xc($s1) -/* 42274C 802A974C 3C058029 */ lui $a1, %hi(HudScript_TimingCharge1) -/* 422750 802A9750 24A5281C */ addiu $a1, $a1, %lo(HudScript_TimingCharge1) -/* 422754 802A9754 0C0511FF */ jal hud_element_set_script -/* 422758 802A9758 00000000 */ nop -/* 42275C 802A975C 86220054 */ lh $v0, 0x54($s1) -/* 422760 802A9760 24030002 */ addiu $v1, $zero, 2 -/* 422764 802A9764 A2430084 */ sb $v1, 0x84($s2) -/* 422768 802A9768 44820000 */ mtc1 $v0, $f0 -/* 42276C 802A976C 00000000 */ nop -/* 422770 802A9770 46800020 */ cvt.s.w $f0, $f0 -/* 422774 802A9774 46160032 */ c.eq.s $f0, $f22 -/* 422778 802A9778 00000000 */ nop -.L802A977C: -/* 42277C 802A977C 45000007 */ bc1f .L802A979C -/* 422780 802A9780 00101027 */ nor $v0, $zero, $s0 -.L802A9784: -/* 422784 802A9784 82220062 */ lb $v0, 0x62($s1) -/* 422788 802A9788 10400004 */ beqz $v0, .L802A979C -/* 42278C 802A978C 00101027 */ nor $v0, $zero, $s0 -/* 422790 802A9790 0C05272D */ jal sfx_play_sound -/* 422794 802A9794 24040233 */ addiu $a0, $zero, 0x233 -.L802A9798: -/* 422798 802A9798 00101027 */ nor $v0, $zero, $s0 -.L802A979C: -/* 42279C 802A979C 86230052 */ lh $v1, 0x52($s1) -/* 4227A0 802A97A0 86240054 */ lh $a0, 0x54($s1) -/* 4227A4 802A97A4 00431021 */ addu $v0, $v0, $v1 -/* 4227A8 802A97A8 14820019 */ bne $a0, $v0, .L802A9810 -/* 4227AC 802A97AC 24020003 */ addiu $v0, $zero, 3 -/* 4227B0 802A97B0 3C058029 */ lui $a1, %hi(HudScript_TimingReady) -/* 4227B4 802A97B4 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 4227B8 802A97B8 8E240008 */ lw $a0, 8($s1) -/* 4227BC 802A97BC 0C0511FF */ jal hud_element_set_script -/* 4227C0 802A97C0 A2420084 */ sb $v0, 0x84($s2) -/* 4227C4 802A97C4 8E240018 */ lw $a0, 0x18($s1) -/* 4227C8 802A97C8 3C058011 */ lui $a1, %hi(HudScript_StickTapNeutral) -/* 4227CC 802A97CC 24A58FF0 */ addiu $a1, $a1, %lo(HudScript_StickTapNeutral) -/* 4227D0 802A97D0 0C0511FF */ jal hud_element_set_script -/* 4227D4 802A97D4 00000000 */ nop -/* 4227D8 802A97D8 82220062 */ lb $v0, 0x62($s1) -/* 4227DC 802A97DC 10400003 */ beqz $v0, .L802A97EC -/* 4227E0 802A97E0 00000000 */ nop -/* 4227E4 802A97E4 0C05272D */ jal sfx_play_sound -/* 4227E8 802A97E8 24040234 */ addiu $a0, $zero, 0x234 -.L802A97EC: -/* 4227EC 802A97EC 8222005E */ lb $v0, 0x5e($s1) -/* 4227F0 802A97F0 10400007 */ beqz $v0, .L802A9810 -/* 4227F4 802A97F4 24030002 */ addiu $v1, $zero, 2 -/* 4227F8 802A97F8 10430005 */ beq $v0, $v1, .L802A9810 -/* 4227FC 802A97FC 00000000 */ nop -/* 422800 802A9800 96220052 */ lhu $v0, 0x52($s1) -/* 422804 802A9804 A223005E */ sb $v1, 0x5e($s1) -/* 422808 802A9808 2442FFFC */ addiu $v0, $v0, -4 -/* 42280C 802A980C A6220054 */ sh $v0, 0x54($s1) -.L802A9810: -/* 422810 802A9810 86220050 */ lh $v0, 0x50($s1) -/* 422814 802A9814 8E430434 */ lw $v1, 0x434($s2) -/* 422818 802A9818 86240054 */ lh $a0, 0x54($s1) -/* 42281C 802A981C 00021080 */ sll $v0, $v0, 2 -/* 422820 802A9820 00431021 */ addu $v0, $v0, $v1 -/* 422824 802A9824 86230052 */ lh $v1, 0x52($s1) -/* 422828 802A9828 8C420000 */ lw $v0, ($v0) -/* 42282C 802A982C 00641823 */ subu $v1, $v1, $a0 -/* 422830 802A9830 00431023 */ subu $v0, $v0, $v1 -/* 422834 802A9834 24500003 */ addiu $s0, $v0, 3 -/* 422838 802A9838 06020001 */ bltzl $s0, .L802A9840 -/* 42283C 802A983C 0000802D */ daddu $s0, $zero, $zero -.L802A9840: -/* 422840 802A9840 8E420210 */ lw $v0, 0x210($s2) -/* 422844 802A9844 3C030004 */ lui $v1, 4 -/* 422848 802A9848 00431024 */ and $v0, $v0, $v1 -/* 42284C 802A984C 1440000D */ bnez $v0, .L802A9884 -/* 422850 802A9850 00000000 */ nop -/* 422854 802A9854 1600000B */ bnez $s0, .L802A9884 -/* 422858 802A9858 00000000 */ nop -/* 42285C 802A985C 8222005E */ lb $v0, 0x5e($s1) -/* 422860 802A9860 14400008 */ bnez $v0, .L802A9884 -/* 422864 802A9864 00000000 */ nop -/* 422868 802A9868 82420083 */ lb $v0, 0x83($s2) -/* 42286C 802A986C 28420002 */ slti $v0, $v0, 2 -/* 422870 802A9870 10400004 */ beqz $v0, .L802A9884 -/* 422874 802A9874 2402FFFF */ addiu $v0, $zero, -1 -/* 422878 802A9878 A2420081 */ sb $v0, 0x81($s2) -/* 42287C 802A987C 080AA66B */ j .L802A99AC -/* 422880 802A9880 A2420086 */ sb $v0, 0x86($s2) -.L802A9884: -/* 422884 802A9884 82430431 */ lb $v1, 0x431($s2) -/* 422888 802A9888 00701823 */ subu $v1, $v1, $s0 -/* 42288C 802A988C 04620001 */ bltzl $v1, .L802A9894 -/* 422890 802A9890 24630040 */ addiu $v1, $v1, 0x40 -.L802A9894: -/* 422894 802A9894 82420081 */ lb $v0, 0x81($s2) -/* 422898 802A9898 1440001C */ bnez $v0, .L802A990C -/* 42289C 802A989C 00000000 */ nop -/* 4228A0 802A98A0 1A00001A */ blez $s0, .L802A990C -/* 4228A4 802A98A4 0000202D */ daddu $a0, $zero, $zero -/* 4228A8 802A98A8 3C070004 */ lui $a3, 4 -/* 4228AC 802A98AC 24060001 */ addiu $a2, $zero, 1 -/* 4228B0 802A98B0 3C05800E */ lui $a1, %hi(gBattleStatus) -/* 4228B4 802A98B4 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus) -.L802A98B8: -/* 4228B8 802A98B8 28620040 */ slti $v0, $v1, 0x40 -/* 4228BC 802A98BC 50400001 */ beql $v0, $zero, .L802A98C4 -/* 4228C0 802A98C0 2463FFC0 */ addiu $v1, $v1, -0x40 -.L802A98C4: -/* 4228C4 802A98C4 00031080 */ sll $v0, $v1, 2 -/* 4228C8 802A98C8 02421021 */ addu $v0, $s2, $v0 -/* 4228CC 802A98CC 8C420230 */ lw $v0, 0x230($v0) -/* 4228D0 802A98D0 00471024 */ and $v0, $v0, $a3 -/* 4228D4 802A98D4 10400004 */ beqz $v0, .L802A98E8 -/* 4228D8 802A98D8 00000000 */ nop -/* 4228DC 802A98DC 8222005E */ lb $v0, 0x5e($s1) -/* 4228E0 802A98E0 50400007 */ beql $v0, $zero, .L802A9900 -/* 4228E4 802A98E4 24840001 */ addiu $a0, $a0, 1 -.L802A98E8: -/* 4228E8 802A98E8 8CA20000 */ lw $v0, ($a1) -/* 4228EC 802A98EC A2460081 */ sb $a2, 0x81($s2) -/* 4228F0 802A98F0 A2460086 */ sb $a2, 0x86($s2) -/* 4228F4 802A98F4 34422000 */ ori $v0, $v0, 0x2000 -/* 4228F8 802A98F8 ACA20000 */ sw $v0, ($a1) -/* 4228FC 802A98FC 24840001 */ addiu $a0, $a0, 1 -.L802A9900: -/* 422900 802A9900 0090102A */ slt $v0, $a0, $s0 -/* 422904 802A9904 1440FFEC */ bnez $v0, .L802A98B8 -/* 422908 802A9908 24630001 */ addiu $v1, $v1, 1 -.L802A990C: -/* 42290C 802A990C 82420083 */ lb $v0, 0x83($s2) -/* 422910 802A9910 28420002 */ slti $v0, $v0, 2 -/* 422914 802A9914 14400005 */ bnez $v0, .L802A992C -/* 422918 802A9918 00000000 */ nop -/* 42291C 802A991C 86230054 */ lh $v1, 0x54($s1) -/* 422920 802A9920 86220052 */ lh $v0, 0x52($s1) -/* 422924 802A9924 10620023 */ beq $v1, $v0, L802A99B4_4229B4 -/* 422928 802A9928 00000000 */ nop -.L802A992C: -/* 42292C 802A992C 96220054 */ lhu $v0, 0x54($s1) -/* 422930 802A9930 86230052 */ lh $v1, 0x52($s1) -/* 422934 802A9934 24420001 */ addiu $v0, $v0, 1 -/* 422938 802A9938 A6220054 */ sh $v0, 0x54($s1) -/* 42293C 802A993C 00021400 */ sll $v0, $v0, 0x10 -/* 422940 802A9940 00021403 */ sra $v0, $v0, 0x10 -/* 422944 802A9944 0062182A */ slt $v1, $v1, $v0 -/* 422948 802A9948 1060001A */ beqz $v1, L802A99B4_4229B4 -/* 42294C 802A994C 00000000 */ nop -/* 422950 802A9950 82420081 */ lb $v0, 0x81($s2) -/* 422954 802A9954 14400002 */ bnez $v0, .L802A9960 -/* 422958 802A9958 2402FFFF */ addiu $v0, $zero, -1 -/* 42295C 802A995C A2420081 */ sb $v0, 0x81($s2) -.L802A9960: -/* 422960 802A9960 82430081 */ lb $v1, 0x81($s2) -/* 422964 802A9964 24020001 */ addiu $v0, $zero, 1 -/* 422968 802A9968 14620003 */ bne $v1, $v0, .L802A9978 -/* 42296C 802A996C 00000000 */ nop -/* 422970 802A9970 0C09A458 */ jal func_80269160 -/* 422974 802A9974 00000000 */ nop -.L802A9978: -/* 422978 802A9978 0C093EB1 */ jal btl_set_popup_duration -/* 42297C 802A997C 0000202D */ daddu $a0, $zero, $zero -/* 422980 802A9980 24020005 */ addiu $v0, $zero, 5 -/* 422984 802A9984 A6220054 */ sh $v0, 0x54($s1) -/* 422988 802A9988 2402000C */ addiu $v0, $zero, 0xc -/* 42298C 802A998C 080AA66D */ j L802A99B4_4229B4 -/* 422990 802A9990 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9994_422994 -/* 422994 802A9994 86220054 */ lh $v0, 0x54($s1) -/* 422998 802A9998 96230054 */ lhu $v1, 0x54($s1) -/* 42299C 802A999C 10400003 */ beqz $v0, .L802A99AC -/* 4229A0 802A99A0 2462FFFF */ addiu $v0, $v1, -1 -/* 4229A4 802A99A4 080AA66D */ j L802A99B4_4229B4 -/* 4229A8 802A99A8 A6220054 */ sh $v0, 0x54($s1) -.L802A99AC: -/* 4229AC 802A99AC 0C09A327 */ jal func_80268C9C -/* 4229B0 802A99B0 00000000 */ nop -dlabel L802A99B4_4229B4 -/* 4229B4 802A99B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 4229B8 802A99B8 8FB20018 */ lw $s2, 0x18($sp) -/* 4229BC 802A99BC 8FB10014 */ lw $s1, 0x14($sp) -/* 4229C0 802A99C0 8FB00010 */ lw $s0, 0x10($sp) -/* 4229C4 802A99C4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 4229C8 802A99C8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 4229CC 802A99CC 03E00008 */ jr $ra -/* 4229D0 802A99D0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s deleted file mode 100644 index 60db7f34de..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s +++ /dev/null @@ -1,363 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A92A0_42F980 -/* 42F980 802A92A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 42F984 802A92A4 AFB10014 */ sw $s1, 0x14($sp) -/* 42F988 802A92A8 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 42F98C 802A92AC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42F990 802A92B0 AFBF001C */ sw $ra, 0x1c($sp) -/* 42F994 802A92B4 AFB20018 */ sw $s2, 0x18($sp) -/* 42F998 802A92B8 AFB00010 */ sw $s0, 0x10($sp) -/* 42F99C 802A92BC 8623004C */ lh $v1, 0x4c($s1) -/* 42F9A0 802A92C0 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 42F9A4 802A92C4 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 42F9A8 802A92C8 2C62000D */ sltiu $v0, $v1, 0xd -/* 42F9AC 802A92CC 10400131 */ beqz $v0, L802A9794_42FE74 -/* 42F9B0 802A92D0 00031080 */ sll $v0, $v1, 2 -/* 42F9B4 802A92D4 3C01802B */ lui $at, %hi(jtbl_802A9900_42FFE0) -/* 42F9B8 802A92D8 00220821 */ addu $at, $at, $v0 -/* 42F9BC 802A92DC 8C229900 */ lw $v0, %lo(jtbl_802A9900_42FFE0)($at) -/* 42F9C0 802A92E0 00400008 */ jr $v0 -/* 42F9C4 802A92E4 00000000 */ nop -dlabel L802A92E8_42F9C8 -/* 42F9C8 802A92E8 0C093EB1 */ jal btl_set_popup_duration -/* 42F9CC 802A92EC 24040063 */ addiu $a0, $zero, 0x63 -/* 42F9D0 802A92F0 82220061 */ lb $v0, 0x61($s1) -/* 42F9D4 802A92F4 8E300004 */ lw $s0, 4($s1) -/* 42F9D8 802A92F8 10400003 */ beqz $v0, .L802A9308 -/* 42F9DC 802A92FC 0200202D */ daddu $a0, $s0, $zero -/* 42F9E0 802A9300 0C05128B */ jal hud_element_clear_flags -/* 42F9E4 802A9304 24050002 */ addiu $a1, $zero, 2 -.L802A9308: -/* 42F9E8 802A9308 0200202D */ daddu $a0, $s0, $zero -/* 42F9EC 802A930C 0C0513AC */ jal hud_element_set_alpha -/* 42F9F0 802A9310 240500FF */ addiu $a1, $zero, 0xff -/* 42F9F4 802A9314 82220061 */ lb $v0, 0x61($s1) -/* 42F9F8 802A9318 8E30000C */ lw $s0, 0xc($s1) -/* 42F9FC 802A931C 10400004 */ beqz $v0, .L802A9330 -/* 42FA00 802A9320 0200202D */ daddu $a0, $s0, $zero -/* 42FA04 802A9324 0C05128B */ jal hud_element_clear_flags -/* 42FA08 802A9328 24050002 */ addiu $a1, $zero, 2 -/* 42FA0C 802A932C 0200202D */ daddu $a0, $s0, $zero -.L802A9330: -/* 42FA10 802A9330 0C0513AC */ jal hud_element_set_alpha -/* 42FA14 802A9334 240500FF */ addiu $a1, $zero, 0xff -/* 42FA18 802A9338 8E300008 */ lw $s0, 8($s1) -/* 42FA1C 802A933C 240500FF */ addiu $a1, $zero, 0xff -/* 42FA20 802A9340 0C0513AC */ jal hud_element_set_alpha -/* 42FA24 802A9344 0200202D */ daddu $a0, $s0, $zero -/* 42FA28 802A9348 82220061 */ lb $v0, 0x61($s1) -/* 42FA2C 802A934C 10400003 */ beqz $v0, .L802A935C -/* 42FA30 802A9350 0200202D */ daddu $a0, $s0, $zero -/* 42FA34 802A9354 0C05128B */ jal hud_element_clear_flags -/* 42FA38 802A9358 24050002 */ addiu $a1, $zero, 2 -.L802A935C: -/* 42FA3C 802A935C 24020001 */ addiu $v0, $zero, 1 -/* 42FA40 802A9360 080AA5E5 */ j L802A9794_42FE74 -/* 42FA44 802A9364 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9368_42FA48 -/* 42FA48 802A9368 0C093EB1 */ jal btl_set_popup_duration -/* 42FA4C 802A936C 24040063 */ addiu $a0, $zero, 0x63 -/* 42FA50 802A9370 8622006C */ lh $v0, 0x6c($s1) -/* 42FA54 802A9374 9623006C */ lhu $v1, 0x6c($s1) -/* 42FA58 802A9378 10400003 */ beqz $v0, .L802A9388 -/* 42FA5C 802A937C 2462FFFF */ addiu $v0, $v1, -1 -/* 42FA60 802A9380 080AA5E5 */ j L802A9794_42FE74 -/* 42FA64 802A9384 A622006C */ sh $v0, 0x6c($s1) -.L802A9388: -/* 42FA68 802A9388 96220056 */ lhu $v0, 0x56($s1) -/* 42FA6C 802A938C 24420014 */ addiu $v0, $v0, 0x14 -/* 42FA70 802A9390 A6220056 */ sh $v0, 0x56($s1) -/* 42FA74 802A9394 00021400 */ sll $v0, $v0, 0x10 -/* 42FA78 802A9398 00021403 */ sra $v0, $v0, 0x10 -/* 42FA7C 802A939C 28420033 */ slti $v0, $v0, 0x33 -/* 42FA80 802A93A0 14400002 */ bnez $v0, .L802A93AC -/* 42FA84 802A93A4 24020032 */ addiu $v0, $zero, 0x32 -/* 42FA88 802A93A8 A6220056 */ sh $v0, 0x56($s1) -.L802A93AC: -/* 42FA8C 802A93AC 8E240004 */ lw $a0, 4($s1) -/* 42FA90 802A93B0 86250056 */ lh $a1, 0x56($s1) -/* 42FA94 802A93B4 86260058 */ lh $a2, 0x58($s1) -/* 42FA98 802A93B8 0C051261 */ jal hud_element_set_render_pos -/* 42FA9C 802A93BC 24A5FFEF */ addiu $a1, $a1, -0x11 -/* 42FAA0 802A93C0 8E24000C */ lw $a0, 0xc($s1) -/* 42FAA4 802A93C4 86250056 */ lh $a1, 0x56($s1) -/* 42FAA8 802A93C8 86260058 */ lh $a2, 0x58($s1) -/* 42FAAC 802A93CC 0C051261 */ jal hud_element_set_render_pos -/* 42FAB0 802A93D0 24A50017 */ addiu $a1, $a1, 0x17 -/* 42FAB4 802A93D4 8E240008 */ lw $a0, 8($s1) -/* 42FAB8 802A93D8 86260058 */ lh $a2, 0x58($s1) -/* 42FABC 802A93DC 86250056 */ lh $a1, 0x56($s1) -/* 42FAC0 802A93E0 0C051261 */ jal hud_element_set_render_pos -/* 42FAC4 802A93E4 24C6001C */ addiu $a2, $a2, 0x1c -/* 42FAC8 802A93E8 080AA5E5 */ j L802A9794_42FE74 -/* 42FACC 802A93EC 00000000 */ nop -dlabel L802A93F0_42FAD0 -/* 42FAD0 802A93F0 0C093EB1 */ jal btl_set_popup_duration -/* 42FAD4 802A93F4 24040063 */ addiu $a0, $zero, 0x63 -/* 42FAD8 802A93F8 8622004E */ lh $v0, 0x4e($s1) -/* 42FADC 802A93FC 9623004E */ lhu $v1, 0x4e($s1) -/* 42FAE0 802A9400 10400003 */ beqz $v0, .L802A9410 -/* 42FAE4 802A9404 2462FFFF */ addiu $v0, $v1, -1 -/* 42FAE8 802A9408 080AA5E5 */ j L802A9794_42FE74 -/* 42FAEC 802A940C A622004E */ sh $v0, 0x4e($s1) -.L802A9410: -/* 42FAF0 802A9410 8E240004 */ lw $a0, 4($s1) -/* 42FAF4 802A9414 3C058011 */ lui $a1, %hi(HudScript_MashAButton) -/* 42FAF8 802A9418 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 42FAFC 802A941C 0C0511FF */ jal hud_element_set_script -/* 42FB00 802A9420 00000000 */ nop -/* 42FB04 802A9424 8E24000C */ lw $a0, 0xc($s1) -/* 42FB08 802A9428 3C058029 */ lui $a1, %hi(HudScript_MashBButton1) -/* 42FB0C 802A942C 24A52374 */ addiu $a1, $a1, %lo(HudScript_MashBButton1) -/* 42FB10 802A9430 0C0511FF */ jal hud_element_set_script -/* 42FB14 802A9434 00000000 */ nop -/* 42FB18 802A9438 96230052 */ lhu $v1, 0x52($s1) -/* 42FB1C 802A943C 2402000B */ addiu $v0, $zero, 0xb -/* 42FB20 802A9440 A6200044 */ sh $zero, 0x44($s1) -/* 42FB24 802A9444 A220005C */ sb $zero, 0x5c($s1) -/* 42FB28 802A9448 A622004C */ sh $v0, 0x4c($s1) -/* 42FB2C 802A944C A6230054 */ sh $v1, 0x54($s1) -dlabel L802A9450_42FB30 -/* 42FB30 802A9450 0C093EB1 */ jal btl_set_popup_duration -/* 42FB34 802A9454 24040063 */ addiu $a0, $zero, 0x63 -/* 42FB38 802A9458 86220068 */ lh $v0, 0x68($s1) -/* 42FB3C 802A945C 14400027 */ bnez $v0, .L802A94FC -/* 42FB40 802A9460 00000000 */ nop -/* 42FB44 802A9464 86220064 */ lh $v0, 0x64($s1) -/* 42FB48 802A9468 1040001E */ beqz $v0, .L802A94E4 -/* 42FB4C 802A946C 00000000 */ nop -/* 42FB50 802A9470 82220080 */ lb $v0, 0x80($s1) -/* 42FB54 802A9474 00021040 */ sll $v0, $v0, 1 -/* 42FB58 802A9478 02221021 */ addu $v0, $s1, $v0 -/* 42FB5C 802A947C 84430074 */ lh $v1, 0x74($v0) -/* 42FB60 802A9480 86220044 */ lh $v0, 0x44($s1) -/* 42FB64 802A9484 14600002 */ bnez $v1, .L802A9490 -/* 42FB68 802A9488 0043001A */ div $zero, $v0, $v1 -/* 42FB6C 802A948C 0007000D */ break 7 -.L802A9490: -/* 42FB70 802A9490 2401FFFF */ addiu $at, $zero, -1 -/* 42FB74 802A9494 14610004 */ bne $v1, $at, .L802A94A8 -/* 42FB78 802A9498 3C018000 */ lui $at, 0x8000 -/* 42FB7C 802A949C 14410002 */ bne $v0, $at, .L802A94A8 -/* 42FB80 802A94A0 00000000 */ nop -/* 42FB84 802A94A4 0006000D */ break 6 -.L802A94A8: -/* 42FB88 802A94A8 00001012 */ mflo $v0 -/* 42FB8C 802A94AC 3C036666 */ lui $v1, 0x6666 -/* 42FB90 802A94B0 34636667 */ ori $v1, $v1, 0x6667 -/* 42FB94 802A94B4 00430018 */ mult $v0, $v1 -/* 42FB98 802A94B8 000217C3 */ sra $v0, $v0, 0x1f -/* 42FB9C 802A94BC 00001810 */ mfhi $v1 -/* 42FBA0 802A94C0 000318C3 */ sra $v1, $v1, 3 -/* 42FBA4 802A94C4 00621823 */ subu $v1, $v1, $v0 -/* 42FBA8 802A94C8 00031880 */ sll $v1, $v1, 2 -/* 42FBAC 802A94CC 96220044 */ lhu $v0, 0x44($s1) -/* 42FBB0 802A94D0 3C01802B */ lui $at, %hi(D_802A98E2_42FFC2) -/* 42FBB4 802A94D4 00230821 */ addu $at, $at, $v1 -/* 42FBB8 802A94D8 942398E2 */ lhu $v1, %lo(D_802A98E2_42FFC2)($at) -/* 42FBBC 802A94DC 080AA53B */ j .L802A94EC -/* 42FBC0 802A94E0 00431023 */ subu $v0, $v0, $v1 -.L802A94E4: -/* 42FBC4 802A94E4 96220044 */ lhu $v0, 0x44($s1) -/* 42FBC8 802A94E8 2442FFF6 */ addiu $v0, $v0, -0xa -.L802A94EC: -/* 42FBCC 802A94EC A6220044 */ sh $v0, 0x44($s1) -/* 42FBD0 802A94F0 00021400 */ sll $v0, $v0, 0x10 -/* 42FBD4 802A94F4 04420001 */ bltzl $v0, .L802A94FC -/* 42FBD8 802A94F8 A6200044 */ sh $zero, 0x44($s1) -.L802A94FC: -/* 42FBDC 802A94FC 82430431 */ lb $v1, 0x431($s2) -/* 42FBE0 802A9500 2463FFFE */ addiu $v1, $v1, -2 -/* 42FBE4 802A9504 04620001 */ bltzl $v1, .L802A950C -/* 42FBE8 802A9508 24630040 */ addiu $v1, $v1, 0x40 -.L802A950C: -/* 42FBEC 802A950C 0000282D */ daddu $a1, $zero, $zero -/* 42FBF0 802A9510 24040001 */ addiu $a0, $zero, 1 -.L802A9514: -/* 42FBF4 802A9514 28620040 */ slti $v0, $v1, 0x40 -/* 42FBF8 802A9518 50400001 */ beql $v0, $zero, .L802A9520 -/* 42FBFC 802A951C 2463FFC0 */ addiu $v1, $v1, -0x40 -.L802A9520: -/* 42FC00 802A9520 00031080 */ sll $v0, $v1, 2 -/* 42FC04 802A9524 24630001 */ addiu $v1, $v1, 1 -/* 42FC08 802A9528 02421021 */ addu $v0, $s2, $v0 -/* 42FC0C 802A952C 8C420330 */ lw $v0, 0x330($v0) -/* 42FC10 802A9530 2484FFFF */ addiu $a0, $a0, -1 -/* 42FC14 802A9534 0481FFF7 */ bgez $a0, .L802A9514 -/* 42FC18 802A9538 00A22825 */ or $a1, $a1, $v0 -/* 42FC1C 802A953C 3403C000 */ ori $v1, $zero, 0xc000 -/* 42FC20 802A9540 00A31024 */ and $v0, $a1, $v1 -/* 42FC24 802A9544 14430037 */ bne $v0, $v1, .L802A9624 -/* 42FC28 802A9548 00000000 */ nop -/* 42FC2C 802A954C 86220064 */ lh $v0, 0x64($s1) -/* 42FC30 802A9550 1040001D */ beqz $v0, .L802A95C8 -/* 42FC34 802A9554 3C0651EB */ lui $a2, 0x51eb -/* 42FC38 802A9558 34C6851F */ ori $a2, $a2, 0x851f -/* 42FC3C 802A955C 00021880 */ sll $v1, $v0, 2 -/* 42FC40 802A9560 00621821 */ addu $v1, $v1, $v0 -/* 42FC44 802A9564 00031180 */ sll $v0, $v1, 6 -/* 42FC48 802A9568 00621821 */ addu $v1, $v1, $v0 -/* 42FC4C 802A956C 00031840 */ sll $v1, $v1, 1 -/* 42FC50 802A9570 00660018 */ mult $v1, $a2 -/* 42FC54 802A9574 00031FC3 */ sra $v1, $v1, 0x1f -/* 42FC58 802A9578 00001010 */ mfhi $v0 -/* 42FC5C 802A957C 00022143 */ sra $a0, $v0, 5 -/* 42FC60 802A9580 86220050 */ lh $v0, 0x50($s1) -/* 42FC64 802A9584 8E450434 */ lw $a1, 0x434($s2) -/* 42FC68 802A9588 00021080 */ sll $v0, $v0, 2 -/* 42FC6C 802A958C 00451021 */ addu $v0, $v0, $a1 -/* 42FC70 802A9590 8C420000 */ lw $v0, ($v0) -/* 42FC74 802A9594 00832023 */ subu $a0, $a0, $v1 -/* 42FC78 802A9598 00820018 */ mult $a0, $v0 -/* 42FC7C 802A959C 00002012 */ mflo $a0 -/* 42FC80 802A95A0 00000000 */ nop -/* 42FC84 802A95A4 00000000 */ nop -/* 42FC88 802A95A8 00860018 */ mult $a0, $a2 -/* 42FC8C 802A95AC 000427C3 */ sra $a0, $a0, 0x1f -/* 42FC90 802A95B0 00001010 */ mfhi $v0 -/* 42FC94 802A95B4 00021943 */ sra $v1, $v0, 5 -/* 42FC98 802A95B8 96220044 */ lhu $v0, 0x44($s1) -/* 42FC9C 802A95BC 00642823 */ subu $a1, $v1, $a0 -/* 42FCA0 802A95C0 080AA57A */ j .L802A95E8 -/* 42FCA4 802A95C4 00451021 */ addu $v0, $v0, $a1 -.L802A95C8: -/* 42FCA8 802A95C8 96220044 */ lhu $v0, 0x44($s1) -/* 42FCAC 802A95CC 24420064 */ addiu $v0, $v0, 0x64 -/* 42FCB0 802A95D0 A6220044 */ sh $v0, 0x44($s1) -/* 42FCB4 802A95D4 00021400 */ sll $v0, $v0, 0x10 -/* 42FCB8 802A95D8 00021403 */ sra $v0, $v0, 0x10 -/* 42FCBC 802A95DC 284201F4 */ slti $v0, $v0, 0x1f4 -/* 42FCC0 802A95E0 14400002 */ bnez $v0, .L802A95EC -/* 42FCC4 802A95E4 240201F4 */ addiu $v0, $zero, 0x1f4 -.L802A95E8: -/* 42FCC8 802A95E8 A6220044 */ sh $v0, 0x44($s1) -.L802A95EC: -/* 42FCCC 802A95EC 82430431 */ lb $v1, 0x431($s2) -/* 42FCD0 802A95F0 2463FFFE */ addiu $v1, $v1, -2 -/* 42FCD4 802A95F4 04620001 */ bltzl $v1, .L802A95FC -/* 42FCD8 802A95F8 24630040 */ addiu $v1, $v1, 0x40 -.L802A95FC: -/* 42FCDC 802A95FC 24040001 */ addiu $a0, $zero, 1 -.L802A9600: -/* 42FCE0 802A9600 28620040 */ slti $v0, $v1, 0x40 -/* 42FCE4 802A9604 50400001 */ beql $v0, $zero, .L802A960C -/* 42FCE8 802A9608 2463FFC0 */ addiu $v1, $v1, -0x40 -.L802A960C: -/* 42FCEC 802A960C 00031080 */ sll $v0, $v1, 2 -/* 42FCF0 802A9610 02421021 */ addu $v0, $s2, $v0 -/* 42FCF4 802A9614 AC400330 */ sw $zero, 0x330($v0) -/* 42FCF8 802A9618 2484FFFF */ addiu $a0, $a0, -1 -/* 42FCFC 802A961C 0481FFF8 */ bgez $a0, .L802A9600 -/* 42FD00 802A9620 24630001 */ addiu $v1, $v1, 1 -.L802A9624: -/* 42FD04 802A9624 86220044 */ lh $v0, 0x44($s1) -/* 42FD08 802A9628 28422711 */ slti $v0, $v0, 0x2711 -/* 42FD0C 802A962C 14400010 */ bnez $v0, .L802A9670 -/* 42FD10 802A9630 3C0451EB */ lui $a0, 0x51eb -/* 42FD14 802A9634 8E300014 */ lw $s0, 0x14($s1) -/* 42FD18 802A9638 86250056 */ lh $a1, 0x56($s1) -/* 42FD1C 802A963C 86260058 */ lh $a2, 0x58($s1) -/* 42FD20 802A9640 24022710 */ addiu $v0, $zero, 0x2710 -/* 42FD24 802A9644 A6220044 */ sh $v0, 0x44($s1) -/* 42FD28 802A9648 24020001 */ addiu $v0, $zero, 1 -/* 42FD2C 802A964C A6220068 */ sh $v0, 0x68($s1) -/* 42FD30 802A9650 0200202D */ daddu $a0, $s0, $zero -/* 42FD34 802A9654 24A50032 */ addiu $a1, $a1, 0x32 -/* 42FD38 802A9658 0C051261 */ jal hud_element_set_render_pos -/* 42FD3C 802A965C 24C6001C */ addiu $a2, $a2, 0x1c -/* 42FD40 802A9660 0200202D */ daddu $a0, $s0, $zero -/* 42FD44 802A9664 0C05128B */ jal hud_element_clear_flags -/* 42FD48 802A9668 24050002 */ addiu $a1, $zero, 2 -/* 42FD4C 802A966C 3C0451EB */ lui $a0, 0x51eb -.L802A9670: -/* 42FD50 802A9670 96230044 */ lhu $v1, 0x44($s1) -/* 42FD54 802A9674 3484851F */ ori $a0, $a0, 0x851f -/* 42FD58 802A9678 00031C00 */ sll $v1, $v1, 0x10 -/* 42FD5C 802A967C 00031403 */ sra $v0, $v1, 0x10 -/* 42FD60 802A9680 00440018 */ mult $v0, $a0 -/* 42FD64 802A9684 00031FC3 */ sra $v1, $v1, 0x1f -/* 42FD68 802A9688 00003810 */ mfhi $a3 -/* 42FD6C 802A968C 00071143 */ sra $v0, $a3, 5 -/* 42FD70 802A9690 00431023 */ subu $v0, $v0, $v1 -/* 42FD74 802A9694 A2420084 */ sb $v0, 0x84($s2) -/* 42FD78 802A9698 86220054 */ lh $v0, 0x54($s1) -/* 42FD7C 802A969C 96230054 */ lhu $v1, 0x54($s1) -/* 42FD80 802A96A0 14400038 */ bnez $v0, .L802A9784 -/* 42FD84 802A96A4 2462FFFF */ addiu $v0, $v1, -1 -/* 42FD88 802A96A8 86220064 */ lh $v0, 0x64($s1) -/* 42FD8C 802A96AC 86250044 */ lh $a1, 0x44($s1) -/* 42FD90 802A96B0 50400001 */ beql $v0, $zero, .L802A96B8 -/* 42FD94 802A96B4 0000282D */ daddu $a1, $zero, $zero -.L802A96B8: -/* 42FD98 802A96B8 14A00003 */ bnez $a1, .L802A96C8 -/* 42FD9C 802A96BC 00A40018 */ mult $a1, $a0 -/* 42FDA0 802A96C0 080AA5B6 */ j .L802A96D8 -/* 42FDA4 802A96C4 2402FFFF */ addiu $v0, $zero, -1 -.L802A96C8: -/* 42FDA8 802A96C8 00051FC3 */ sra $v1, $a1, 0x1f -/* 42FDAC 802A96CC 00003810 */ mfhi $a3 -/* 42FDB0 802A96D0 00071143 */ sra $v0, $a3, 5 -/* 42FDB4 802A96D4 00431023 */ subu $v0, $v0, $v1 -.L802A96D8: -/* 42FDB8 802A96D8 A2420081 */ sb $v0, 0x81($s2) -/* 42FDBC 802A96DC 82220080 */ lb $v0, 0x80($s1) -/* 42FDC0 802A96E0 2442FFFF */ addiu $v0, $v0, -1 -/* 42FDC4 802A96E4 00021040 */ sll $v0, $v0, 1 -/* 42FDC8 802A96E8 02221021 */ addu $v0, $s1, $v0 -/* 42FDCC 802A96EC 94420074 */ lhu $v0, 0x74($v0) -/* 42FDD0 802A96F0 00021400 */ sll $v0, $v0, 0x10 -/* 42FDD4 802A96F4 00021C03 */ sra $v1, $v0, 0x10 -/* 42FDD8 802A96F8 000217C2 */ srl $v0, $v0, 0x1f -/* 42FDDC 802A96FC 00621021 */ addu $v0, $v1, $v0 -/* 42FDE0 802A9700 82430084 */ lb $v1, 0x84($s2) -/* 42FDE4 802A9704 00021043 */ sra $v0, $v0, 1 -/* 42FDE8 802A9708 0043102A */ slt $v0, $v0, $v1 -/* 42FDEC 802A970C 14400002 */ bnez $v0, .L802A9718 -/* 42FDF0 802A9710 24020001 */ addiu $v0, $zero, 1 -/* 42FDF4 802A9714 2402FFFC */ addiu $v0, $zero, -4 -.L802A9718: -/* 42FDF8 802A9718 A2420086 */ sb $v0, 0x86($s2) -/* 42FDFC 802A971C 82430081 */ lb $v1, 0x81($s2) -/* 42FE00 802A9720 24020064 */ addiu $v0, $zero, 0x64 -/* 42FE04 802A9724 14620003 */ bne $v1, $v0, .L802A9734 -/* 42FE08 802A9728 00000000 */ nop -/* 42FE0C 802A972C 0C09A458 */ jal func_80269160 -/* 42FE10 802A9730 00000000 */ nop -.L802A9734: -/* 42FE14 802A9734 0C093EB1 */ jal btl_set_popup_duration -/* 42FE18 802A9738 0000202D */ daddu $a0, $zero, $zero -/* 42FE1C 802A973C 24020005 */ addiu $v0, $zero, 5 -/* 42FE20 802A9740 A6220054 */ sh $v0, 0x54($s1) -/* 42FE24 802A9744 2402000C */ addiu $v0, $zero, 0xc -/* 42FE28 802A9748 080AA5E5 */ j L802A9794_42FE74 -/* 42FE2C 802A974C A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9750_42FE30 -/* 42FE30 802A9750 86220064 */ lh $v0, 0x64($s1) -/* 42FE34 802A9754 14400007 */ bnez $v0, .L802A9774 -/* 42FE38 802A9758 00000000 */ nop -/* 42FE3C 802A975C 96220044 */ lhu $v0, 0x44($s1) -/* 42FE40 802A9760 2442FF9C */ addiu $v0, $v0, -0x64 -/* 42FE44 802A9764 A6220044 */ sh $v0, 0x44($s1) -/* 42FE48 802A9768 00021400 */ sll $v0, $v0, 0x10 -/* 42FE4C 802A976C 04420001 */ bltzl $v0, .L802A9774 -/* 42FE50 802A9770 A6200044 */ sh $zero, 0x44($s1) -.L802A9774: -/* 42FE54 802A9774 86220054 */ lh $v0, 0x54($s1) -/* 42FE58 802A9778 96230054 */ lhu $v1, 0x54($s1) -/* 42FE5C 802A977C 10400003 */ beqz $v0, .L802A978C -/* 42FE60 802A9780 2462FFFF */ addiu $v0, $v1, -1 -.L802A9784: -/* 42FE64 802A9784 080AA5E5 */ j L802A9794_42FE74 -/* 42FE68 802A9788 A6220054 */ sh $v0, 0x54($s1) -.L802A978C: -/* 42FE6C 802A978C 0C09A327 */ jal func_80268C9C -/* 42FE70 802A9790 00000000 */ nop -dlabel L802A9794_42FE74 -/* 42FE74 802A9794 8FBF001C */ lw $ra, 0x1c($sp) -/* 42FE78 802A9798 8FB20018 */ lw $s2, 0x18($sp) -/* 42FE7C 802A979C 8FB10014 */ lw $s1, 0x14($sp) -/* 42FE80 802A97A0 8FB00010 */ lw $s0, 0x10($sp) -/* 42FE84 802A97A4 03E00008 */ jr $ra -/* 42FE88 802A97A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s index ac82a6f59e..49fae592dc 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s @@ -180,9 +180,9 @@ glabel func_802A9310_42D220 /* 42D490 802A9580 00621823 */ subu $v1, $v1, $v0 /* 42D494 802A9584 00031880 */ sll $v1, $v1, 2 /* 42D498 802A9588 96220044 */ lhu $v0, 0x44($s1) -/* 42D49C 802A958C 3C01802B */ lui $at, %hi(D_802A9AA2_42D9B2) +/* 42D49C 802A958C 3C01802B */ lui $at, %hi(D_802A9AA0_42D9B0 + 0x2) /* 42D4A0 802A9590 00230821 */ addu $at, $at, $v1 -/* 42D4A4 802A9594 94239AA2 */ lhu $v1, %lo(D_802A9AA2_42D9B2)($at) +/* 42D4A4 802A9594 94239AA2 */ lhu $v1, %lo(D_802A9AA0_42D9B0 + 0x2)($at) /* 42D4A8 802A9598 080AA56A */ j .L802A95A8 /* 42D4AC 802A959C 00431023 */ subu $v0, $v0, $v1 .L802A95A0: diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s deleted file mode 100644 index 61b208c9ba..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s +++ /dev/null @@ -1,345 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9254_42F074 -/* 42F074 802A9254 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 42F078 802A9258 AFB10014 */ sw $s1, 0x14($sp) -/* 42F07C 802A925C 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 42F080 802A9260 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42F084 802A9264 AFBF001C */ sw $ra, 0x1c($sp) -/* 42F088 802A9268 AFB20018 */ sw $s2, 0x18($sp) -/* 42F08C 802A926C AFB00010 */ sw $s0, 0x10($sp) -/* 42F090 802A9270 8623004C */ lh $v1, 0x4c($s1) -/* 42F094 802A9274 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 42F098 802A9278 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 42F09C 802A927C 2C62000D */ sltiu $v0, $v1, 0xd -/* 42F0A0 802A9280 10400128 */ beqz $v0, L802A9724_42F544 -/* 42F0A4 802A9284 00031080 */ sll $v0, $v1, 2 -/* 42F0A8 802A9288 3C01802B */ lui $at, %hi(jtbl_802A9880_42F6A0) -/* 42F0AC 802A928C 00220821 */ addu $at, $at, $v0 -/* 42F0B0 802A9290 8C229880 */ lw $v0, %lo(jtbl_802A9880_42F6A0)($at) -/* 42F0B4 802A9294 00400008 */ jr $v0 -/* 42F0B8 802A9298 00000000 */ nop -dlabel L802A929C_42F0BC -/* 42F0BC 802A929C 0C093EB1 */ jal btl_set_popup_duration -/* 42F0C0 802A92A0 24040063 */ addiu $a0, $zero, 0x63 -/* 42F0C4 802A92A4 8E300004 */ lw $s0, 4($s1) -/* 42F0C8 802A92A8 240500FF */ addiu $a1, $zero, 0xff -/* 42F0CC 802A92AC 0C0513AC */ jal hud_element_set_alpha -/* 42F0D0 802A92B0 0200202D */ daddu $a0, $s0, $zero -/* 42F0D4 802A92B4 82220061 */ lb $v0, 0x61($s1) -/* 42F0D8 802A92B8 10400003 */ beqz $v0, .L802A92C8 -/* 42F0DC 802A92BC 0200202D */ daddu $a0, $s0, $zero -/* 42F0E0 802A92C0 0C05128B */ jal hud_element_clear_flags -/* 42F0E4 802A92C4 24050002 */ addiu $a1, $zero, 2 -.L802A92C8: -/* 42F0E8 802A92C8 8E300008 */ lw $s0, 8($s1) -/* 42F0EC 802A92CC 240500FF */ addiu $a1, $zero, 0xff -/* 42F0F0 802A92D0 0C0513AC */ jal hud_element_set_alpha -/* 42F0F4 802A92D4 0200202D */ daddu $a0, $s0, $zero -/* 42F0F8 802A92D8 82220061 */ lb $v0, 0x61($s1) -/* 42F0FC 802A92DC 10400003 */ beqz $v0, .L802A92EC -/* 42F100 802A92E0 0200202D */ daddu $a0, $s0, $zero -/* 42F104 802A92E4 0C05128B */ jal hud_element_clear_flags -/* 42F108 802A92E8 24050002 */ addiu $a1, $zero, 2 -.L802A92EC: -/* 42F10C 802A92EC 24020001 */ addiu $v0, $zero, 1 -/* 42F110 802A92F0 080AA5C9 */ j L802A9724_42F544 -/* 42F114 802A92F4 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A92F8_42F118 -/* 42F118 802A92F8 0C093EB1 */ jal btl_set_popup_duration -/* 42F11C 802A92FC 24040063 */ addiu $a0, $zero, 0x63 -/* 42F120 802A9300 8622006C */ lh $v0, 0x6c($s1) -/* 42F124 802A9304 9623006C */ lhu $v1, 0x6c($s1) -/* 42F128 802A9308 10400003 */ beqz $v0, .L802A9318 -/* 42F12C 802A930C 2462FFFF */ addiu $v0, $v1, -1 -/* 42F130 802A9310 080AA5C9 */ j L802A9724_42F544 -/* 42F134 802A9314 A622006C */ sh $v0, 0x6c($s1) -.L802A9318: -/* 42F138 802A9318 96220056 */ lhu $v0, 0x56($s1) -/* 42F13C 802A931C 24420014 */ addiu $v0, $v0, 0x14 -/* 42F140 802A9320 A6220056 */ sh $v0, 0x56($s1) -/* 42F144 802A9324 00021400 */ sll $v0, $v0, 0x10 -/* 42F148 802A9328 00021403 */ sra $v0, $v0, 0x10 -/* 42F14C 802A932C 28420033 */ slti $v0, $v0, 0x33 -/* 42F150 802A9330 14400002 */ bnez $v0, .L802A933C -/* 42F154 802A9334 24020032 */ addiu $v0, $zero, 0x32 -/* 42F158 802A9338 A6220056 */ sh $v0, 0x56($s1) -.L802A933C: -/* 42F15C 802A933C 8E240004 */ lw $a0, 4($s1) -/* 42F160 802A9340 86250056 */ lh $a1, 0x56($s1) -/* 42F164 802A9344 0C051261 */ jal hud_element_set_render_pos -/* 42F168 802A9348 86260058 */ lh $a2, 0x58($s1) -/* 42F16C 802A934C 8E240008 */ lw $a0, 8($s1) -/* 42F170 802A9350 86260058 */ lh $a2, 0x58($s1) -/* 42F174 802A9354 86250056 */ lh $a1, 0x56($s1) -/* 42F178 802A9358 0C051261 */ jal hud_element_set_render_pos -/* 42F17C 802A935C 24C6001C */ addiu $a2, $a2, 0x1c -/* 42F180 802A9360 080AA5C9 */ j L802A9724_42F544 -/* 42F184 802A9364 00000000 */ nop -dlabel L802A9368_42F188 -/* 42F188 802A9368 0C093EB1 */ jal btl_set_popup_duration -/* 42F18C 802A936C 24040063 */ addiu $a0, $zero, 0x63 -/* 42F190 802A9370 8622004E */ lh $v0, 0x4e($s1) -/* 42F194 802A9374 9623004E */ lhu $v1, 0x4e($s1) -/* 42F198 802A9378 10400003 */ beqz $v0, .L802A9388 -/* 42F19C 802A937C 2462FFFF */ addiu $v0, $v1, -1 -/* 42F1A0 802A9380 080AA5C9 */ j L802A9724_42F544 -/* 42F1A4 802A9384 A622004E */ sh $v0, 0x4e($s1) -.L802A9388: -/* 42F1A8 802A9388 8E240004 */ lw $a0, 4($s1) -/* 42F1AC 802A938C 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) -/* 42F1B0 802A9390 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) -/* 42F1B4 802A9394 0C0511FF */ jal hud_element_set_script -/* 42F1B8 802A9398 00000000 */ nop -/* 42F1BC 802A939C 3C048000 */ lui $a0, 0x8000 -/* 42F1C0 802A93A0 34840041 */ ori $a0, $a0, 0x41 -/* 42F1C4 802A93A4 0000282D */ daddu $a1, $zero, $zero -/* 42F1C8 802A93A8 00A0302D */ daddu $a2, $a1, $zero -/* 42F1CC 802A93AC 96220052 */ lhu $v0, 0x52($s1) -/* 42F1D0 802A93B0 00A0382D */ daddu $a3, $a1, $zero -/* 42F1D4 802A93B4 A220005C */ sb $zero, 0x5c($s1) -/* 42F1D8 802A93B8 3C01802B */ lui $at, %hi(D_802A98C0) -/* 42F1DC 802A93BC AC2098C0 */ sw $zero, %lo(D_802A98C0)($at) -/* 42F1E0 802A93C0 0C0526AE */ jal sfx_play_sound_with_params -/* 42F1E4 802A93C4 A6220054 */ sh $v0, 0x54($s1) -/* 42F1E8 802A93C8 2402000B */ addiu $v0, $zero, 0xb -/* 42F1EC 802A93CC A622004C */ sh $v0, 0x4c($s1) -dlabel L802A93D0_42F1F0 -/* 42F1F0 802A93D0 0C093EB1 */ jal btl_set_popup_duration -/* 42F1F4 802A93D4 24040063 */ addiu $a0, $zero, 0x63 -/* 42F1F8 802A93D8 86220068 */ lh $v0, 0x68($s1) -/* 42F1FC 802A93DC 14400057 */ bnez $v0, .L802A953C -/* 42F200 802A93E0 00000000 */ nop -/* 42F204 802A93E4 82220080 */ lb $v0, 0x80($s1) -/* 42F208 802A93E8 00021040 */ sll $v0, $v0, 1 -/* 42F20C 802A93EC 02221021 */ addu $v0, $s1, $v0 -/* 42F210 802A93F0 84430074 */ lh $v1, 0x74($v0) -/* 42F214 802A93F4 86220044 */ lh $v0, 0x44($s1) -/* 42F218 802A93F8 14600002 */ bnez $v1, .L802A9404 -/* 42F21C 802A93FC 0043001A */ div $zero, $v0, $v1 -/* 42F220 802A9400 0007000D */ break 7 -.L802A9404: -/* 42F224 802A9404 2401FFFF */ addiu $at, $zero, -1 -/* 42F228 802A9408 14610004 */ bne $v1, $at, .L802A941C -/* 42F22C 802A940C 3C018000 */ lui $at, 0x8000 -/* 42F230 802A9410 14410002 */ bne $v0, $at, .L802A941C -/* 42F234 802A9414 00000000 */ nop -/* 42F238 802A9418 0006000D */ break 6 -.L802A941C: -/* 42F23C 802A941C 00001012 */ mflo $v0 -/* 42F240 802A9420 3C036666 */ lui $v1, 0x6666 -/* 42F244 802A9424 34636667 */ ori $v1, $v1, 0x6667 -/* 42F248 802A9428 00430018 */ mult $v0, $v1 -/* 42F24C 802A942C 000217C3 */ sra $v0, $v0, 0x1f -/* 42F250 802A9430 00001810 */ mfhi $v1 -/* 42F254 802A9434 000318C3 */ sra $v1, $v1, 3 -/* 42F258 802A9438 00621823 */ subu $v1, $v1, $v0 -/* 42F25C 802A943C 00031880 */ sll $v1, $v1, 2 -/* 42F260 802A9440 96220044 */ lhu $v0, 0x44($s1) -/* 42F264 802A9444 3C01802B */ lui $at, %hi(D_802A9862_42F682) -/* 42F268 802A9448 00230821 */ addu $at, $at, $v1 -/* 42F26C 802A944C 94239862 */ lhu $v1, %lo(D_802A9862_42F682)($at) -/* 42F270 802A9450 00431023 */ subu $v0, $v0, $v1 -/* 42F274 802A9454 A6220044 */ sh $v0, 0x44($s1) -/* 42F278 802A9458 00021400 */ sll $v0, $v0, 0x10 -/* 42F27C 802A945C 04420001 */ bltzl $v0, .L802A9464 -/* 42F280 802A9460 A6200044 */ sh $zero, 0x44($s1) -.L802A9464: -/* 42F284 802A9464 86220068 */ lh $v0, 0x68($s1) -/* 42F288 802A9468 14400034 */ bnez $v0, .L802A953C -/* 42F28C 802A946C 3C030004 */ lui $v1, 4 -/* 42F290 802A9470 8E420214 */ lw $v0, 0x214($s2) -/* 42F294 802A9474 00431024 */ and $v0, $v0, $v1 -/* 42F298 802A9478 10400016 */ beqz $v0, .L802A94D4 -/* 42F29C 802A947C 3C0451EB */ lui $a0, 0x51eb -/* 42F2A0 802A9480 86220050 */ lh $v0, 0x50($s1) -/* 42F2A4 802A9484 8E430434 */ lw $v1, 0x434($s2) -/* 42F2A8 802A9488 00021080 */ sll $v0, $v0, 2 -/* 42F2AC 802A948C 00431021 */ addu $v0, $v0, $v1 -/* 42F2B0 802A9490 8C430000 */ lw $v1, ($v0) -/* 42F2B4 802A9494 3484851F */ ori $a0, $a0, 0x851f -/* 42F2B8 802A9498 00031080 */ sll $v0, $v1, 2 -/* 42F2BC 802A949C 00431021 */ addu $v0, $v0, $v1 -/* 42F2C0 802A94A0 000210C0 */ sll $v0, $v0, 3 -/* 42F2C4 802A94A4 00431023 */ subu $v0, $v0, $v1 -/* 42F2C8 802A94A8 00021100 */ sll $v0, $v0, 4 -/* 42F2CC 802A94AC 00431021 */ addu $v0, $v0, $v1 -/* 42F2D0 802A94B0 00021040 */ sll $v0, $v0, 1 -/* 42F2D4 802A94B4 00440018 */ mult $v0, $a0 -/* 42F2D8 802A94B8 000217C3 */ sra $v0, $v0, 0x1f -/* 42F2DC 802A94BC 96230044 */ lhu $v1, 0x44($s1) -/* 42F2E0 802A94C0 00004010 */ mfhi $t0 -/* 42F2E4 802A94C4 00082143 */ sra $a0, $t0, 5 -/* 42F2E8 802A94C8 00822023 */ subu $a0, $a0, $v0 -/* 42F2EC 802A94CC 00641821 */ addu $v1, $v1, $a0 -/* 42F2F0 802A94D0 A6230044 */ sh $v1, 0x44($s1) -.L802A94D4: -/* 42F2F4 802A94D4 8E420214 */ lw $v0, 0x214($s2) -/* 42F2F8 802A94D8 3C030008 */ lui $v1, 8 -/* 42F2FC 802A94DC 00431024 */ and $v0, $v0, $v1 -/* 42F300 802A94E0 10400016 */ beqz $v0, .L802A953C -/* 42F304 802A94E4 3C0451EB */ lui $a0, 0x51eb -/* 42F308 802A94E8 86220050 */ lh $v0, 0x50($s1) -/* 42F30C 802A94EC 8E430434 */ lw $v1, 0x434($s2) -/* 42F310 802A94F0 00021080 */ sll $v0, $v0, 2 -/* 42F314 802A94F4 00431021 */ addu $v0, $v0, $v1 -/* 42F318 802A94F8 8C430000 */ lw $v1, ($v0) -/* 42F31C 802A94FC 3484851F */ ori $a0, $a0, 0x851f -/* 42F320 802A9500 00031080 */ sll $v0, $v1, 2 -/* 42F324 802A9504 00431021 */ addu $v0, $v0, $v1 -/* 42F328 802A9508 000210C0 */ sll $v0, $v0, 3 -/* 42F32C 802A950C 00431023 */ subu $v0, $v0, $v1 -/* 42F330 802A9510 00021100 */ sll $v0, $v0, 4 -/* 42F334 802A9514 00431021 */ addu $v0, $v0, $v1 -/* 42F338 802A9518 00021040 */ sll $v0, $v0, 1 -/* 42F33C 802A951C 00440018 */ mult $v0, $a0 -/* 42F340 802A9520 000217C3 */ sra $v0, $v0, 0x1f -/* 42F344 802A9524 96230044 */ lhu $v1, 0x44($s1) -/* 42F348 802A9528 00004010 */ mfhi $t0 -/* 42F34C 802A952C 00082143 */ sra $a0, $t0, 5 -/* 42F350 802A9530 00822023 */ subu $a0, $a0, $v0 -/* 42F354 802A9534 00641823 */ subu $v1, $v1, $a0 -/* 42F358 802A9538 A6230044 */ sh $v1, 0x44($s1) -.L802A953C: -/* 42F35C 802A953C 86220044 */ lh $v0, 0x44($s1) -/* 42F360 802A9540 04420001 */ bltzl $v0, .L802A9548 -/* 42F364 802A9544 A6200044 */ sh $zero, 0x44($s1) -.L802A9548: -/* 42F368 802A9548 86220044 */ lh $v0, 0x44($s1) -/* 42F36C 802A954C 28422711 */ slti $v0, $v0, 0x2711 -/* 42F370 802A9550 1440000E */ bnez $v0, .L802A958C -/* 42F374 802A9554 24022710 */ addiu $v0, $zero, 0x2710 -/* 42F378 802A9558 8E30000C */ lw $s0, 0xc($s1) -/* 42F37C 802A955C 86250056 */ lh $a1, 0x56($s1) -/* 42F380 802A9560 86260058 */ lh $a2, 0x58($s1) -/* 42F384 802A9564 A6220044 */ sh $v0, 0x44($s1) -/* 42F388 802A9568 24020001 */ addiu $v0, $zero, 1 -/* 42F38C 802A956C A6220068 */ sh $v0, 0x68($s1) -/* 42F390 802A9570 0200202D */ daddu $a0, $s0, $zero -/* 42F394 802A9574 24A50032 */ addiu $a1, $a1, 0x32 -/* 42F398 802A9578 0C051261 */ jal hud_element_set_render_pos -/* 42F39C 802A957C 24C6001C */ addiu $a2, $a2, 0x1c -/* 42F3A0 802A9580 0200202D */ daddu $a0, $s0, $zero -/* 42F3A4 802A9584 0C05128B */ jal hud_element_clear_flags -/* 42F3A8 802A9588 24050002 */ addiu $a1, $zero, 2 -.L802A958C: -/* 42F3AC 802A958C 3C03802B */ lui $v1, %hi(D_802A98C0) -/* 42F3B0 802A9590 246398C0 */ addiu $v1, $v1, %lo(D_802A98C0) -/* 42F3B4 802A9594 8C620000 */ lw $v0, ($v1) -/* 42F3B8 802A9598 3C050004 */ lui $a1, 4 -/* 42F3BC 802A959C 00451024 */ and $v0, $v0, $a1 -/* 42F3C0 802A95A0 10400002 */ beqz $v0, .L802A95AC -/* 42F3C4 802A95A4 24020001 */ addiu $v0, $zero, 1 -/* 42F3C8 802A95A8 A222005C */ sb $v0, 0x5c($s1) -.L802A95AC: -/* 42F3CC 802A95AC 8C620000 */ lw $v0, ($v1) -/* 42F3D0 802A95B0 3C040008 */ lui $a0, 8 -/* 42F3D4 802A95B4 00441024 */ and $v0, $v0, $a0 -/* 42F3D8 802A95B8 10400002 */ beqz $v0, .L802A95C4 -/* 42F3DC 802A95BC 2402FFFF */ addiu $v0, $zero, -1 -/* 42F3E0 802A95C0 A222005C */ sb $v0, 0x5c($s1) -.L802A95C4: -/* 42F3E4 802A95C4 8C620000 */ lw $v0, ($v1) -/* 42F3E8 802A95C8 00451024 */ and $v0, $v0, $a1 -/* 42F3EC 802A95CC 1440000A */ bnez $v0, .L802A95F8 -/* 42F3F0 802A95D0 3C1051EB */ lui $s0, 0x51eb -/* 42F3F4 802A95D4 8E420210 */ lw $v0, 0x210($s2) -/* 42F3F8 802A95D8 00441024 */ and $v0, $v0, $a0 -/* 42F3FC 802A95DC 14400006 */ bnez $v0, .L802A95F8 -/* 42F400 802A95E0 24020001 */ addiu $v0, $zero, 1 -/* 42F404 802A95E4 8223005C */ lb $v1, 0x5c($s1) -/* 42F408 802A95E8 14620003 */ bne $v1, $v0, .L802A95F8 -/* 42F40C 802A95EC 24020002 */ addiu $v0, $zero, 2 -/* 42F410 802A95F0 A222005C */ sb $v0, 0x5c($s1) -/* 42F414 802A95F4 3C1051EB */ lui $s0, 0x51eb -.L802A95F8: -/* 42F418 802A95F8 96230044 */ lhu $v1, 0x44($s1) -/* 42F41C 802A95FC 3610851F */ ori $s0, $s0, 0x851f -/* 42F420 802A9600 00031C00 */ sll $v1, $v1, 0x10 -/* 42F424 802A9604 00031403 */ sra $v0, $v1, 0x10 -/* 42F428 802A9608 00500018 */ mult $v0, $s0 -/* 42F42C 802A960C 3C048000 */ lui $a0, 0x8000 -/* 42F430 802A9610 34840041 */ ori $a0, $a0, 0x41 -/* 42F434 802A9614 00031FC3 */ sra $v1, $v1, 0x1f -/* 42F438 802A9618 00004010 */ mfhi $t0 -/* 42F43C 802A961C 00081143 */ sra $v0, $t0, 5 -/* 42F440 802A9620 00431023 */ subu $v0, $v0, $v1 -/* 42F444 802A9624 8E430210 */ lw $v1, 0x210($s2) -/* 42F448 802A9628 0000282D */ daddu $a1, $zero, $zero -/* 42F44C 802A962C A2420081 */ sb $v0, 0x81($s2) -/* 42F450 802A9630 9227005C */ lbu $a3, 0x5c($s1) -/* 42F454 802A9634 82420081 */ lb $v0, 0x81($s2) -/* 42F458 802A9638 00A0302D */ daddu $a2, $a1, $zero -/* 42F45C 802A963C 3C01802B */ lui $at, %hi(D_802A98C0) -/* 42F460 802A9640 AC2398C0 */ sw $v1, %lo(D_802A98C0)($at) -/* 42F464 802A9644 A2470084 */ sb $a3, 0x84($s2) -/* 42F468 802A9648 00023840 */ sll $a3, $v0, 1 -/* 42F46C 802A964C 00E23821 */ addu $a3, $a3, $v0 -/* 42F470 802A9650 0C0526F9 */ jal sfx_adjust_env_sound_params -/* 42F474 802A9654 00073880 */ sll $a3, $a3, 2 -/* 42F478 802A9658 86220054 */ lh $v0, 0x54($s1) -/* 42F47C 802A965C 96230054 */ lhu $v1, 0x54($s1) -/* 42F480 802A9660 1440002C */ bnez $v0, .L802A9714 -/* 42F484 802A9664 2462FFFF */ addiu $v0, $v1, -1 -/* 42F488 802A9668 96220044 */ lhu $v0, 0x44($s1) -/* 42F48C 802A966C 00021C00 */ sll $v1, $v0, 0x10 -/* 42F490 802A9670 00031403 */ sra $v0, $v1, 0x10 -/* 42F494 802A9674 14400003 */ bnez $v0, .L802A9684 -/* 42F498 802A9678 00500018 */ mult $v0, $s0 -/* 42F49C 802A967C 080AA5A5 */ j .L802A9694 -/* 42F4A0 802A9680 2402FFFF */ addiu $v0, $zero, -1 -.L802A9684: -/* 42F4A4 802A9684 00031FC3 */ sra $v1, $v1, 0x1f -/* 42F4A8 802A9688 00004010 */ mfhi $t0 -/* 42F4AC 802A968C 00081143 */ sra $v0, $t0, 5 -/* 42F4B0 802A9690 00431023 */ subu $v0, $v0, $v1 -.L802A9694: -/* 42F4B4 802A9694 A2420081 */ sb $v0, 0x81($s2) -/* 42F4B8 802A9698 82220080 */ lb $v0, 0x80($s1) -/* 42F4BC 802A969C 2442FFFF */ addiu $v0, $v0, -1 -/* 42F4C0 802A96A0 00021040 */ sll $v0, $v0, 1 -/* 42F4C4 802A96A4 02221021 */ addu $v0, $s1, $v0 -/* 42F4C8 802A96A8 84430074 */ lh $v1, 0x74($v0) -/* 42F4CC 802A96AC 82420081 */ lb $v0, 0x81($s2) -/* 42F4D0 802A96B0 0062102A */ slt $v0, $v1, $v0 -/* 42F4D4 802A96B4 14400002 */ bnez $v0, .L802A96C0 -/* 42F4D8 802A96B8 24020001 */ addiu $v0, $zero, 1 -/* 42F4DC 802A96BC 2402FFFE */ addiu $v0, $zero, -2 -.L802A96C0: -/* 42F4E0 802A96C0 A2420086 */ sb $v0, 0x86($s2) -/* 42F4E4 802A96C4 82430081 */ lb $v1, 0x81($s2) -/* 42F4E8 802A96C8 24020064 */ addiu $v0, $zero, 0x64 -/* 42F4EC 802A96CC 14620003 */ bne $v1, $v0, .L802A96DC -/* 42F4F0 802A96D0 00000000 */ nop -/* 42F4F4 802A96D4 0C09A458 */ jal func_80269160 -/* 42F4F8 802A96D8 00000000 */ nop -.L802A96DC: -/* 42F4FC 802A96DC 0C093EB1 */ jal btl_set_popup_duration -/* 42F500 802A96E0 0000202D */ daddu $a0, $zero, $zero -/* 42F504 802A96E4 3C048000 */ lui $a0, 0x8000 -/* 42F508 802A96E8 0C05271B */ jal sfx_stop_sound -/* 42F50C 802A96EC 34840041 */ ori $a0, $a0, 0x41 -/* 42F510 802A96F0 24020005 */ addiu $v0, $zero, 5 -/* 42F514 802A96F4 A6220054 */ sh $v0, 0x54($s1) -/* 42F518 802A96F8 2402000C */ addiu $v0, $zero, 0xc -/* 42F51C 802A96FC 080AA5C9 */ j L802A9724_42F544 -/* 42F520 802A9700 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9704_42F524 -/* 42F524 802A9704 86220054 */ lh $v0, 0x54($s1) -/* 42F528 802A9708 96230054 */ lhu $v1, 0x54($s1) -/* 42F52C 802A970C 10400003 */ beqz $v0, .L802A971C -/* 42F530 802A9710 2462FFFF */ addiu $v0, $v1, -1 -.L802A9714: -/* 42F534 802A9714 080AA5C9 */ j L802A9724_42F544 -/* 42F538 802A9718 A6220054 */ sh $v0, 0x54($s1) -.L802A971C: -/* 42F53C 802A971C 0C09A327 */ jal func_80268C9C -/* 42F540 802A9720 00000000 */ nop -dlabel L802A9724_42F544 -/* 42F544 802A9724 8FBF001C */ lw $ra, 0x1c($sp) -/* 42F548 802A9728 8FB20018 */ lw $s2, 0x18($sp) -/* 42F54C 802A972C 8FB10014 */ lw $s1, 0x14($sp) -/* 42F550 802A9730 8FB00010 */ lw $s0, 0x10($sp) -/* 42F554 802A9734 03E00008 */ jr $ra -/* 42F558 802A9738 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s deleted file mode 100644 index 0bcc77fdc8..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s +++ /dev/null @@ -1,381 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9298_4302B8 -/* 4302B8 802A9298 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 4302BC 802A929C AFB10014 */ sw $s1, 0x14($sp) -/* 4302C0 802A92A0 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 4302C4 802A92A4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 4302C8 802A92A8 AFBF001C */ sw $ra, 0x1c($sp) -/* 4302CC 802A92AC AFB20018 */ sw $s2, 0x18($sp) -/* 4302D0 802A92B0 AFB00010 */ sw $s0, 0x10($sp) -/* 4302D4 802A92B4 8623004C */ lh $v1, 0x4c($s1) -/* 4302D8 802A92B8 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 4302DC 802A92BC 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 4302E0 802A92C0 2C62000D */ sltiu $v0, $v1, 0xd -/* 4302E4 802A92C4 10400147 */ beqz $v0, L802A97E4_430804 -/* 4302E8 802A92C8 00031080 */ sll $v0, $v1, 2 -/* 4302EC 802A92CC 3C01802B */ lui $at, %hi(jtbl_802A9940_430960) -/* 4302F0 802A92D0 00220821 */ addu $at, $at, $v0 -/* 4302F4 802A92D4 8C229940 */ lw $v0, %lo(jtbl_802A9940_430960)($at) -/* 4302F8 802A92D8 00400008 */ jr $v0 -/* 4302FC 802A92DC 00000000 */ nop -dlabel L802A92E0_430300 -/* 430300 802A92E0 0C093EB1 */ jal btl_set_popup_duration -/* 430304 802A92E4 24040063 */ addiu $a0, $zero, 0x63 -/* 430308 802A92E8 8E300004 */ lw $s0, 4($s1) -/* 43030C 802A92EC 240500FF */ addiu $a1, $zero, 0xff -/* 430310 802A92F0 0C0513AC */ jal hud_element_set_alpha -/* 430314 802A92F4 0200202D */ daddu $a0, $s0, $zero -/* 430318 802A92F8 82220061 */ lb $v0, 0x61($s1) -/* 43031C 802A92FC 10400003 */ beqz $v0, .L802A930C -/* 430320 802A9300 0200202D */ daddu $a0, $s0, $zero -/* 430324 802A9304 0C05128B */ jal hud_element_clear_flags -/* 430328 802A9308 24050002 */ addiu $a1, $zero, 2 -.L802A930C: -/* 43032C 802A930C 8E300008 */ lw $s0, 8($s1) -/* 430330 802A9310 240500FF */ addiu $a1, $zero, 0xff -/* 430334 802A9314 0C0513AC */ jal hud_element_set_alpha -/* 430338 802A9318 0200202D */ daddu $a0, $s0, $zero -/* 43033C 802A931C 82220061 */ lb $v0, 0x61($s1) -/* 430340 802A9320 10400003 */ beqz $v0, .L802A9330 -/* 430344 802A9324 0200202D */ daddu $a0, $s0, $zero -/* 430348 802A9328 0C05128B */ jal hud_element_clear_flags -/* 43034C 802A932C 24050002 */ addiu $a1, $zero, 2 -.L802A9330: -/* 430350 802A9330 24020001 */ addiu $v0, $zero, 1 -/* 430354 802A9334 080AA5F9 */ j L802A97E4_430804 -/* 430358 802A9338 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A933C_43035C -/* 43035C 802A933C 0C093EB1 */ jal btl_set_popup_duration -/* 430360 802A9340 24040063 */ addiu $a0, $zero, 0x63 -/* 430364 802A9344 96220056 */ lhu $v0, 0x56($s1) -/* 430368 802A9348 24420014 */ addiu $v0, $v0, 0x14 -/* 43036C 802A934C A6220056 */ sh $v0, 0x56($s1) -/* 430370 802A9350 00021400 */ sll $v0, $v0, 0x10 -/* 430374 802A9354 00021403 */ sra $v0, $v0, 0x10 -/* 430378 802A9358 28420033 */ slti $v0, $v0, 0x33 -/* 43037C 802A935C 14400002 */ bnez $v0, .L802A9368 -/* 430380 802A9360 24020032 */ addiu $v0, $zero, 0x32 -/* 430384 802A9364 A6220056 */ sh $v0, 0x56($s1) -.L802A9368: -/* 430388 802A9368 8E240004 */ lw $a0, 4($s1) -/* 43038C 802A936C 86250056 */ lh $a1, 0x56($s1) -/* 430390 802A9370 0C051261 */ jal hud_element_set_render_pos -/* 430394 802A9374 86260058 */ lh $a2, 0x58($s1) -/* 430398 802A9378 8E240008 */ lw $a0, 8($s1) -/* 43039C 802A937C 86260058 */ lh $a2, 0x58($s1) -/* 4303A0 802A9380 86250056 */ lh $a1, 0x56($s1) -/* 4303A4 802A9384 0C051261 */ jal hud_element_set_render_pos -/* 4303A8 802A9388 24C6001C */ addiu $a2, $a2, 0x1c -/* 4303AC 802A938C 080AA5F9 */ j L802A97E4_430804 -/* 4303B0 802A9390 00000000 */ nop -dlabel L802A9394_4303B4 -/* 4303B4 802A9394 0C093EB1 */ jal btl_set_popup_duration -/* 4303B8 802A9398 24040063 */ addiu $a0, $zero, 0x63 -/* 4303BC 802A939C 8622004E */ lh $v0, 0x4e($s1) -/* 4303C0 802A93A0 9623004E */ lhu $v1, 0x4e($s1) -/* 4303C4 802A93A4 10400003 */ beqz $v0, .L802A93B4 -/* 4303C8 802A93A8 2462FFFF */ addiu $v0, $v1, -1 -/* 4303CC 802A93AC 080AA5F9 */ j L802A97E4_430804 -/* 4303D0 802A93B0 A622004E */ sh $v0, 0x4e($s1) -.L802A93B4: -/* 4303D4 802A93B4 8E240004 */ lw $a0, 4($s1) -/* 4303D8 802A93B8 3C058011 */ lui $a1, %hi(HudScript_StickMashLeft) -/* 4303DC 802A93BC 24A58F30 */ addiu $a1, $a1, %lo(HudScript_StickMashLeft) -/* 4303E0 802A93C0 0C0511FF */ jal hud_element_set_script -/* 4303E4 802A93C4 00000000 */ nop -/* 4303E8 802A93C8 3C048000 */ lui $a0, 0x8000 -/* 4303EC 802A93CC 34840041 */ ori $a0, $a0, 0x41 -/* 4303F0 802A93D0 0000282D */ daddu $a1, $zero, $zero -/* 4303F4 802A93D4 00A0302D */ daddu $a2, $a1, $zero -/* 4303F8 802A93D8 96220052 */ lhu $v0, 0x52($s1) -/* 4303FC 802A93DC 00A0382D */ daddu $a3, $a1, $zero -/* 430400 802A93E0 A6200044 */ sh $zero, 0x44($s1) -/* 430404 802A93E4 A2400084 */ sb $zero, 0x84($s2) -/* 430408 802A93E8 A220005C */ sb $zero, 0x5c($s1) -/* 43040C 802A93EC 0C0526AE */ jal sfx_play_sound_with_params -/* 430410 802A93F0 A6220054 */ sh $v0, 0x54($s1) -/* 430414 802A93F4 2402000B */ addiu $v0, $zero, 0xb -/* 430418 802A93F8 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A93FC_43041C -/* 43041C 802A93FC 0C093EB1 */ jal btl_set_popup_duration -/* 430420 802A9400 24040063 */ addiu $a0, $zero, 0x63 -/* 430424 802A9404 86220068 */ lh $v0, 0x68($s1) -/* 430428 802A9408 1440008F */ bnez $v0, .L802A9648 -/* 43042C 802A940C 00000000 */ nop -/* 430430 802A9410 86220064 */ lh $v0, 0x64($s1) -/* 430434 802A9414 1040001E */ beqz $v0, .L802A9490 -/* 430438 802A9418 00000000 */ nop -/* 43043C 802A941C 82220080 */ lb $v0, 0x80($s1) -/* 430440 802A9420 00021040 */ sll $v0, $v0, 1 -/* 430444 802A9424 02221021 */ addu $v0, $s1, $v0 -/* 430448 802A9428 84430074 */ lh $v1, 0x74($v0) -/* 43044C 802A942C 86220044 */ lh $v0, 0x44($s1) -/* 430450 802A9430 14600002 */ bnez $v1, .L802A943C -/* 430454 802A9434 0043001A */ div $zero, $v0, $v1 -/* 430458 802A9438 0007000D */ break 7 -.L802A943C: -/* 43045C 802A943C 2401FFFF */ addiu $at, $zero, -1 -/* 430460 802A9440 14610004 */ bne $v1, $at, .L802A9454 -/* 430464 802A9444 3C018000 */ lui $at, 0x8000 -/* 430468 802A9448 14410002 */ bne $v0, $at, .L802A9454 -/* 43046C 802A944C 00000000 */ nop -/* 430470 802A9450 0006000D */ break 6 -.L802A9454: -/* 430474 802A9454 00001012 */ mflo $v0 -/* 430478 802A9458 3C036666 */ lui $v1, 0x6666 -/* 43047C 802A945C 34636667 */ ori $v1, $v1, 0x6667 -/* 430480 802A9460 00430018 */ mult $v0, $v1 -/* 430484 802A9464 000217C3 */ sra $v0, $v0, 0x1f -/* 430488 802A9468 00001810 */ mfhi $v1 -/* 43048C 802A946C 000318C3 */ sra $v1, $v1, 3 -/* 430490 802A9470 00621823 */ subu $v1, $v1, $v0 -/* 430494 802A9474 00031880 */ sll $v1, $v1, 2 -/* 430498 802A9478 96220044 */ lhu $v0, 0x44($s1) -/* 43049C 802A947C 3C01802B */ lui $at, %hi(D_802A9922_430942) -/* 4304A0 802A9480 00230821 */ addu $at, $at, $v1 -/* 4304A4 802A9484 94239922 */ lhu $v1, %lo(D_802A9922_430942)($at) -/* 4304A8 802A9488 080AA526 */ j .L802A9498 -/* 4304AC 802A948C 00431023 */ subu $v0, $v0, $v1 -.L802A9490: -/* 4304B0 802A9490 96220044 */ lhu $v0, 0x44($s1) -/* 4304B4 802A9494 2442FFF6 */ addiu $v0, $v0, -0xa -.L802A9498: -/* 4304B8 802A9498 A6220044 */ sh $v0, 0x44($s1) -/* 4304BC 802A949C 00021400 */ sll $v0, $v0, 0x10 -/* 4304C0 802A94A0 04420001 */ bltzl $v0, .L802A94A8 -/* 4304C4 802A94A4 A6200044 */ sh $zero, 0x44($s1) -.L802A94A8: -/* 4304C8 802A94A8 86220068 */ lh $v0, 0x68($s1) -/* 4304CC 802A94AC 14400066 */ bnez $v0, .L802A9648 -/* 4304D0 802A94B0 00000000 */ nop -/* 4304D4 802A94B4 86220064 */ lh $v0, 0x64($s1) -/* 4304D8 802A94B8 10400044 */ beqz $v0, .L802A95CC -/* 4304DC 802A94BC 3C040004 */ lui $a0, 4 -/* 4304E0 802A94C0 8E420210 */ lw $v0, 0x210($s2) -/* 4304E4 802A94C4 00441024 */ and $v0, $v0, $a0 -/* 4304E8 802A94C8 10400005 */ beqz $v0, .L802A94E0 -/* 4304EC 802A94CC 24030001 */ addiu $v1, $zero, 1 -/* 4304F0 802A94D0 8E420210 */ lw $v0, 0x210($s2) -/* 4304F4 802A94D4 00441024 */ and $v0, $v0, $a0 -/* 4304F8 802A94D8 1440001E */ bnez $v0, .L802A9554 -/* 4304FC 802A94DC A223005C */ sb $v1, 0x5c($s1) -.L802A94E0: -/* 430500 802A94E0 8222005C */ lb $v0, 0x5c($s1) -/* 430504 802A94E4 1040001B */ beqz $v0, .L802A9554 -/* 430508 802A94E8 00000000 */ nop -/* 43050C 802A94EC 86240050 */ lh $a0, 0x50($s1) -/* 430510 802A94F0 8E420434 */ lw $v0, 0x434($s2) -/* 430514 802A94F4 86230064 */ lh $v1, 0x64($s1) -/* 430518 802A94F8 00042080 */ sll $a0, $a0, 2 -/* 43051C 802A94FC 00822021 */ addu $a0, $a0, $v0 -/* 430520 802A9500 00031040 */ sll $v0, $v1, 1 -/* 430524 802A9504 00431021 */ addu $v0, $v0, $v1 -/* 430528 802A9508 000210C0 */ sll $v0, $v0, 3 -/* 43052C 802A950C 00431021 */ addu $v0, $v0, $v1 -/* 430530 802A9510 00021900 */ sll $v1, $v0, 4 -/* 430534 802A9514 00431021 */ addu $v0, $v0, $v1 -/* 430538 802A9518 8C840000 */ lw $a0, ($a0) -/* 43053C 802A951C 00021040 */ sll $v0, $v0, 1 -/* 430540 802A9520 00820018 */ mult $a0, $v0 -/* 430544 802A9524 00002012 */ mflo $a0 -/* 430548 802A9528 3C0268DB */ lui $v0, 0x68db -/* 43054C 802A952C 34428BAD */ ori $v0, $v0, 0x8bad -/* 430550 802A9530 00820018 */ mult $a0, $v0 -/* 430554 802A9534 A220005C */ sb $zero, 0x5c($s1) -/* 430558 802A9538 000427C3 */ sra $a0, $a0, 0x1f -/* 43055C 802A953C 00001010 */ mfhi $v0 -/* 430560 802A9540 00021B03 */ sra $v1, $v0, 0xc -/* 430564 802A9544 96220044 */ lhu $v0, 0x44($s1) -/* 430568 802A9548 00641823 */ subu $v1, $v1, $a0 -/* 43056C 802A954C 00431021 */ addu $v0, $v0, $v1 -/* 430570 802A9550 A6220044 */ sh $v0, 0x44($s1) -.L802A9554: -/* 430574 802A9554 8E420214 */ lw $v0, 0x214($s2) -/* 430578 802A9558 3C030008 */ lui $v1, 8 -/* 43057C 802A955C 00431024 */ and $v0, $v0, $v1 -/* 430580 802A9560 10400039 */ beqz $v0, .L802A9648 -/* 430584 802A9564 00000000 */ nop -/* 430588 802A9568 86240050 */ lh $a0, 0x50($s1) -/* 43058C 802A956C 8E420434 */ lw $v0, 0x434($s2) -/* 430590 802A9570 86230064 */ lh $v1, 0x64($s1) -/* 430594 802A9574 00042080 */ sll $a0, $a0, 2 -/* 430598 802A9578 00822021 */ addu $a0, $a0, $v0 -/* 43059C 802A957C 00031040 */ sll $v0, $v1, 1 -/* 4305A0 802A9580 00431021 */ addu $v0, $v0, $v1 -/* 4305A4 802A9584 000210C0 */ sll $v0, $v0, 3 -/* 4305A8 802A9588 00431021 */ addu $v0, $v0, $v1 -/* 4305AC 802A958C 00021900 */ sll $v1, $v0, 4 -/* 4305B0 802A9590 00431021 */ addu $v0, $v0, $v1 -/* 4305B4 802A9594 8C840000 */ lw $a0, ($a0) -/* 4305B8 802A9598 00021040 */ sll $v0, $v0, 1 -/* 4305BC 802A959C 00820018 */ mult $a0, $v0 -/* 4305C0 802A95A0 00002012 */ mflo $a0 -/* 4305C4 802A95A4 3C0268DB */ lui $v0, 0x68db -/* 4305C8 802A95A8 34428BAD */ ori $v0, $v0, 0x8bad -/* 4305CC 802A95AC 00820018 */ mult $a0, $v0 -/* 4305D0 802A95B0 000427C3 */ sra $a0, $a0, 0x1f -/* 4305D4 802A95B4 00001010 */ mfhi $v0 -/* 4305D8 802A95B8 00021B03 */ sra $v1, $v0, 0xc -/* 4305DC 802A95BC 96220044 */ lhu $v0, 0x44($s1) -/* 4305E0 802A95C0 00641823 */ subu $v1, $v1, $a0 -/* 4305E4 802A95C4 080AA591 */ j .L802A9644 -/* 4305E8 802A95C8 00431023 */ subu $v0, $v0, $v1 -.L802A95CC: -/* 4305EC 802A95CC 8E420210 */ lw $v0, 0x210($s2) -/* 4305F0 802A95D0 00441024 */ and $v0, $v0, $a0 -/* 4305F4 802A95D4 10400006 */ beqz $v0, .L802A95F0 -/* 4305F8 802A95D8 00000000 */ nop -/* 4305FC 802A95DC 8E420210 */ lw $v0, 0x210($s2) -/* 430600 802A95E0 24030001 */ addiu $v1, $zero, 1 -/* 430604 802A95E4 00441024 */ and $v0, $v0, $a0 -/* 430608 802A95E8 1440000F */ bnez $v0, .L802A9628 -/* 43060C 802A95EC A223005C */ sb $v1, 0x5c($s1) -.L802A95F0: -/* 430610 802A95F0 8222005C */ lb $v0, 0x5c($s1) -/* 430614 802A95F4 1040000C */ beqz $v0, .L802A9628 -/* 430618 802A95F8 00000000 */ nop -/* 43061C 802A95FC 96220044 */ lhu $v0, 0x44($s1) -/* 430620 802A9600 24420064 */ addiu $v0, $v0, 0x64 -/* 430624 802A9604 A6220044 */ sh $v0, 0x44($s1) -/* 430628 802A9608 00021400 */ sll $v0, $v0, 0x10 -/* 43062C 802A960C 00021403 */ sra $v0, $v0, 0x10 -/* 430630 802A9610 284201F4 */ slti $v0, $v0, 0x1f4 -/* 430634 802A9614 54400004 */ bnel $v0, $zero, .L802A9628 -/* 430638 802A9618 A220005C */ sb $zero, 0x5c($s1) -/* 43063C 802A961C 240201F4 */ addiu $v0, $zero, 0x1f4 -/* 430640 802A9620 A6220044 */ sh $v0, 0x44($s1) -/* 430644 802A9624 A220005C */ sb $zero, 0x5c($s1) -.L802A9628: -/* 430648 802A9628 8E420214 */ lw $v0, 0x214($s2) -/* 43064C 802A962C 3C030008 */ lui $v1, 8 -/* 430650 802A9630 00431024 */ and $v0, $v0, $v1 -/* 430654 802A9634 10400004 */ beqz $v0, .L802A9648 -/* 430658 802A9638 00000000 */ nop -/* 43065C 802A963C 96220044 */ lhu $v0, 0x44($s1) -/* 430660 802A9640 2442FF9C */ addiu $v0, $v0, -0x64 -.L802A9644: -/* 430664 802A9644 A6220044 */ sh $v0, 0x44($s1) -.L802A9648: -/* 430668 802A9648 86220044 */ lh $v0, 0x44($s1) -/* 43066C 802A964C 04420001 */ bltzl $v0, .L802A9654 -/* 430670 802A9650 A6200044 */ sh $zero, 0x44($s1) -.L802A9654: -/* 430674 802A9654 86220044 */ lh $v0, 0x44($s1) -/* 430678 802A9658 28422711 */ slti $v0, $v0, 0x2711 -/* 43067C 802A965C 14400010 */ bnez $v0, .L802A96A0 -/* 430680 802A9660 3C1051EB */ lui $s0, 0x51eb -/* 430684 802A9664 8E30000C */ lw $s0, 0xc($s1) -/* 430688 802A9668 86250056 */ lh $a1, 0x56($s1) -/* 43068C 802A966C 86260058 */ lh $a2, 0x58($s1) -/* 430690 802A9670 24022710 */ addiu $v0, $zero, 0x2710 -/* 430694 802A9674 A6220044 */ sh $v0, 0x44($s1) -/* 430698 802A9678 24020001 */ addiu $v0, $zero, 1 -/* 43069C 802A967C A6220068 */ sh $v0, 0x68($s1) -/* 4306A0 802A9680 0200202D */ daddu $a0, $s0, $zero -/* 4306A4 802A9684 24A50032 */ addiu $a1, $a1, 0x32 -/* 4306A8 802A9688 0C051261 */ jal hud_element_set_render_pos -/* 4306AC 802A968C 24C6001C */ addiu $a2, $a2, 0x1c -/* 4306B0 802A9690 0200202D */ daddu $a0, $s0, $zero -/* 4306B4 802A9694 0C05128B */ jal hud_element_clear_flags -/* 4306B8 802A9698 24050002 */ addiu $a1, $zero, 2 -/* 4306BC 802A969C 3C1051EB */ lui $s0, 0x51eb -.L802A96A0: -/* 4306C0 802A96A0 3610851F */ ori $s0, $s0, 0x851f -/* 4306C4 802A96A4 96230044 */ lhu $v1, 0x44($s1) -/* 4306C8 802A96A8 3C048000 */ lui $a0, 0x8000 -/* 4306CC 802A96AC 00031C00 */ sll $v1, $v1, 0x10 -/* 4306D0 802A96B0 00031403 */ sra $v0, $v1, 0x10 -/* 4306D4 802A96B4 00500018 */ mult $v0, $s0 -/* 4306D8 802A96B8 34840041 */ ori $a0, $a0, 0x41 -/* 4306DC 802A96BC 0000282D */ daddu $a1, $zero, $zero -/* 4306E0 802A96C0 00A0302D */ daddu $a2, $a1, $zero -/* 4306E4 802A96C4 00031FC3 */ sra $v1, $v1, 0x1f -/* 4306E8 802A96C8 00004810 */ mfhi $t1 -/* 4306EC 802A96CC 00094143 */ sra $t0, $t1, 5 -/* 4306F0 802A96D0 01034023 */ subu $t0, $t0, $v1 -/* 4306F4 802A96D4 00081600 */ sll $v0, $t0, 0x18 -/* 4306F8 802A96D8 00021603 */ sra $v0, $v0, 0x18 -/* 4306FC 802A96DC 00023840 */ sll $a3, $v0, 1 -/* 430700 802A96E0 00E23821 */ addu $a3, $a3, $v0 -/* 430704 802A96E4 00073880 */ sll $a3, $a3, 2 -/* 430708 802A96E8 0C0526F9 */ jal sfx_adjust_env_sound_params -/* 43070C 802A96EC A2480084 */ sb $t0, 0x84($s2) -/* 430710 802A96F0 86220054 */ lh $v0, 0x54($s1) -/* 430714 802A96F4 96230054 */ lhu $v1, 0x54($s1) -/* 430718 802A96F8 14400036 */ bnez $v0, .L802A97D4 -/* 43071C 802A96FC 2462FFFF */ addiu $v0, $v1, -1 -/* 430720 802A9700 86220064 */ lh $v0, 0x64($s1) -/* 430724 802A9704 86230044 */ lh $v1, 0x44($s1) -/* 430728 802A9708 50400001 */ beql $v0, $zero, .L802A9710 -/* 43072C 802A970C 0000182D */ daddu $v1, $zero, $zero -.L802A9710: -/* 430730 802A9710 14600003 */ bnez $v1, .L802A9720 -/* 430734 802A9714 00700018 */ mult $v1, $s0 -/* 430738 802A9718 080AA5CC */ j .L802A9730 -/* 43073C 802A971C 2402FFFF */ addiu $v0, $zero, -1 -.L802A9720: -/* 430740 802A9720 00031FC3 */ sra $v1, $v1, 0x1f -/* 430744 802A9724 00004810 */ mfhi $t1 -/* 430748 802A9728 00091143 */ sra $v0, $t1, 5 -/* 43074C 802A972C 00431023 */ subu $v0, $v0, $v1 -.L802A9730: -/* 430750 802A9730 A2420081 */ sb $v0, 0x81($s2) -/* 430754 802A9734 82220080 */ lb $v0, 0x80($s1) -/* 430758 802A9738 2442FFFF */ addiu $v0, $v0, -1 -/* 43075C 802A973C 00021040 */ sll $v0, $v0, 1 -/* 430760 802A9740 02221021 */ addu $v0, $s1, $v0 -/* 430764 802A9744 84430074 */ lh $v1, 0x74($v0) -/* 430768 802A9748 82420081 */ lb $v0, 0x81($s2) -/* 43076C 802A974C 0062102A */ slt $v0, $v1, $v0 -/* 430770 802A9750 14400002 */ bnez $v0, .L802A975C -/* 430774 802A9754 24020001 */ addiu $v0, $zero, 1 -/* 430778 802A9758 2402FFFE */ addiu $v0, $zero, -2 -.L802A975C: -/* 43077C 802A975C A2420086 */ sb $v0, 0x86($s2) -/* 430780 802A9760 82430081 */ lb $v1, 0x81($s2) -/* 430784 802A9764 24020064 */ addiu $v0, $zero, 0x64 -/* 430788 802A9768 14620003 */ bne $v1, $v0, .L802A9778 -/* 43078C 802A976C 00000000 */ nop -/* 430790 802A9770 0C09A458 */ jal func_80269160 -/* 430794 802A9774 00000000 */ nop -.L802A9778: -/* 430798 802A9778 0C093EB1 */ jal btl_set_popup_duration -/* 43079C 802A977C 0000202D */ daddu $a0, $zero, $zero -/* 4307A0 802A9780 3C048000 */ lui $a0, 0x8000 -/* 4307A4 802A9784 0C05271B */ jal sfx_stop_sound -/* 4307A8 802A9788 34840041 */ ori $a0, $a0, 0x41 -/* 4307AC 802A978C 24020005 */ addiu $v0, $zero, 5 -/* 4307B0 802A9790 A6220054 */ sh $v0, 0x54($s1) -/* 4307B4 802A9794 2402000C */ addiu $v0, $zero, 0xc -/* 4307B8 802A9798 080AA5F9 */ j L802A97E4_430804 -/* 4307BC 802A979C A622004C */ sh $v0, 0x4c($s1) -dlabel L802A97A0_4307C0 -/* 4307C0 802A97A0 86220064 */ lh $v0, 0x64($s1) -/* 4307C4 802A97A4 14400007 */ bnez $v0, .L802A97C4 -/* 4307C8 802A97A8 00000000 */ nop -/* 4307CC 802A97AC 96220044 */ lhu $v0, 0x44($s1) -/* 4307D0 802A97B0 2442FF9C */ addiu $v0, $v0, -0x64 -/* 4307D4 802A97B4 A6220044 */ sh $v0, 0x44($s1) -/* 4307D8 802A97B8 00021400 */ sll $v0, $v0, 0x10 -/* 4307DC 802A97BC 04420001 */ bltzl $v0, .L802A97C4 -/* 4307E0 802A97C0 A6200044 */ sh $zero, 0x44($s1) -.L802A97C4: -/* 4307E4 802A97C4 86220054 */ lh $v0, 0x54($s1) -/* 4307E8 802A97C8 96230054 */ lhu $v1, 0x54($s1) -/* 4307EC 802A97CC 10400003 */ beqz $v0, .L802A97DC -/* 4307F0 802A97D0 2462FFFF */ addiu $v0, $v1, -1 -.L802A97D4: -/* 4307F4 802A97D4 080AA5F9 */ j L802A97E4_430804 -/* 4307F8 802A97D8 A6220054 */ sh $v0, 0x54($s1) -.L802A97DC: -/* 4307FC 802A97DC 0C09A327 */ jal func_80268C9C -/* 430800 802A97E0 00000000 */ nop -dlabel L802A97E4_430804 -/* 430804 802A97E4 8FBF001C */ lw $ra, 0x1c($sp) -/* 430808 802A97E8 8FB20018 */ lw $s2, 0x18($sp) -/* 43080C 802A97EC 8FB10014 */ lw $s1, 0x14($sp) -/* 430810 802A97F0 8FB00010 */ lw $s0, 0x10($sp) -/* 430814 802A97F4 03E00008 */ jr $ra -/* 430818 802A97F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s deleted file mode 100644 index f6ab3069b6..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s +++ /dev/null @@ -1,295 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9208_429F28 -/* 429F28 802A9208 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 429F2C 802A920C AFB10014 */ sw $s1, 0x14($sp) -/* 429F30 802A9210 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 429F34 802A9214 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 429F38 802A9218 AFBF0020 */ sw $ra, 0x20($sp) -/* 429F3C 802A921C AFB3001C */ sw $s3, 0x1c($sp) -/* 429F40 802A9220 AFB20018 */ sw $s2, 0x18($sp) -/* 429F44 802A9224 AFB00010 */ sw $s0, 0x10($sp) -/* 429F48 802A9228 8623004C */ lh $v1, 0x4c($s1) -/* 429F4C 802A922C 3C13800E */ lui $s3, %hi(gBattleStatus) -/* 429F50 802A9230 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) -/* 429F54 802A9234 2C62000D */ sltiu $v0, $v1, 0xd -/* 429F58 802A9238 104000F7 */ beqz $v0, L802A9618_42A338 -/* 429F5C 802A923C 00031080 */ sll $v0, $v1, 2 -/* 429F60 802A9240 3C01802B */ lui $at, %hi(jtbl_802A9790_42A4B0) -/* 429F64 802A9244 00220821 */ addu $at, $at, $v0 -/* 429F68 802A9248 8C229790 */ lw $v0, %lo(jtbl_802A9790_42A4B0)($at) -/* 429F6C 802A924C 00400008 */ jr $v0 -/* 429F70 802A9250 00000000 */ nop -dlabel L802A9254_429F74 -/* 429F74 802A9254 0C093EB1 */ jal btl_set_popup_duration -/* 429F78 802A9258 24040063 */ addiu $a0, $zero, 0x63 -/* 429F7C 802A925C 82220061 */ lb $v0, 0x61($s1) -/* 429F80 802A9260 8E300004 */ lw $s0, 4($s1) -/* 429F84 802A9264 10400004 */ beqz $v0, .L802A9278 -/* 429F88 802A9268 0200202D */ daddu $a0, $s0, $zero -/* 429F8C 802A926C 0C05128B */ jal hud_element_clear_flags -/* 429F90 802A9270 24050002 */ addiu $a1, $zero, 2 -/* 429F94 802A9274 0200202D */ daddu $a0, $s0, $zero -.L802A9278: -/* 429F98 802A9278 0C0513AC */ jal hud_element_set_alpha -/* 429F9C 802A927C 240500FF */ addiu $a1, $zero, 0xff -/* 429FA0 802A9280 8E300008 */ lw $s0, 8($s1) -/* 429FA4 802A9284 240500FF */ addiu $a1, $zero, 0xff -/* 429FA8 802A9288 0C0513AC */ jal hud_element_set_alpha -/* 429FAC 802A928C 0200202D */ daddu $a0, $s0, $zero -/* 429FB0 802A9290 82220061 */ lb $v0, 0x61($s1) -/* 429FB4 802A9294 10400003 */ beqz $v0, .L802A92A4 -/* 429FB8 802A9298 0200202D */ daddu $a0, $s0, $zero -/* 429FBC 802A929C 0C05128B */ jal hud_element_clear_flags -/* 429FC0 802A92A0 24050002 */ addiu $a1, $zero, 2 -.L802A92A4: -/* 429FC4 802A92A4 24020001 */ addiu $v0, $zero, 1 -/* 429FC8 802A92A8 080AA586 */ j L802A9618_42A338 -/* 429FCC 802A92AC A622004C */ sh $v0, 0x4c($s1) -dlabel L802A92B0_429FD0 -/* 429FD0 802A92B0 0C093EB1 */ jal btl_set_popup_duration -/* 429FD4 802A92B4 24040063 */ addiu $a0, $zero, 0x63 -/* 429FD8 802A92B8 96220056 */ lhu $v0, 0x56($s1) -/* 429FDC 802A92BC 24420014 */ addiu $v0, $v0, 0x14 -/* 429FE0 802A92C0 A6220056 */ sh $v0, 0x56($s1) -/* 429FE4 802A92C4 00021400 */ sll $v0, $v0, 0x10 -/* 429FE8 802A92C8 00021403 */ sra $v0, $v0, 0x10 -/* 429FEC 802A92CC 28420033 */ slti $v0, $v0, 0x33 -/* 429FF0 802A92D0 14400002 */ bnez $v0, .L802A92DC -/* 429FF4 802A92D4 24020032 */ addiu $v0, $zero, 0x32 -/* 429FF8 802A92D8 A6220056 */ sh $v0, 0x56($s1) -.L802A92DC: -/* 429FFC 802A92DC 8E240004 */ lw $a0, 4($s1) -/* 42A000 802A92E0 86250056 */ lh $a1, 0x56($s1) -/* 42A004 802A92E4 0C051261 */ jal hud_element_set_render_pos -/* 42A008 802A92E8 86260058 */ lh $a2, 0x58($s1) -/* 42A00C 802A92EC 8E240008 */ lw $a0, 8($s1) -/* 42A010 802A92F0 86260058 */ lh $a2, 0x58($s1) -/* 42A014 802A92F4 86250056 */ lh $a1, 0x56($s1) -/* 42A018 802A92F8 0C051261 */ jal hud_element_set_render_pos -/* 42A01C 802A92FC 24C6001C */ addiu $a2, $a2, 0x1c -/* 42A020 802A9300 080AA586 */ j L802A9618_42A338 -/* 42A024 802A9304 00000000 */ nop -dlabel L802A9308_42A028 -/* 42A028 802A9308 0C093EB1 */ jal btl_set_popup_duration -/* 42A02C 802A930C 24040063 */ addiu $a0, $zero, 0x63 -/* 42A030 802A9310 8622004E */ lh $v0, 0x4e($s1) -/* 42A034 802A9314 9623004E */ lhu $v1, 0x4e($s1) -/* 42A038 802A9318 10400003 */ beqz $v0, .L802A9328 -/* 42A03C 802A931C 2462FFFF */ addiu $v0, $v1, -1 -/* 42A040 802A9320 080AA586 */ j L802A9618_42A338 -/* 42A044 802A9324 A622004E */ sh $v0, 0x4e($s1) -.L802A9328: -/* 42A048 802A9328 8E240004 */ lw $a0, 4($s1) -/* 42A04C 802A932C 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) -/* 42A050 802A9330 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42A054 802A9334 0C0511FF */ jal hud_element_set_script -/* 42A058 802A9338 00000000 */ nop -/* 42A05C 802A933C 3C048000 */ lui $a0, 0x8000 -/* 42A060 802A9340 34840041 */ ori $a0, $a0, 0x41 -/* 42A064 802A9344 0000282D */ daddu $a1, $zero, $zero -/* 42A068 802A9348 00A0302D */ daddu $a2, $a1, $zero -/* 42A06C 802A934C 96220052 */ lhu $v0, 0x52($s1) -/* 42A070 802A9350 00A0382D */ daddu $a3, $a1, $zero -/* 42A074 802A9354 A6200044 */ sh $zero, 0x44($s1) -/* 42A078 802A9358 A220005C */ sb $zero, 0x5c($s1) -/* 42A07C 802A935C 0C0526AE */ jal sfx_play_sound_with_params -/* 42A080 802A9360 A6220054 */ sh $v0, 0x54($s1) -/* 42A084 802A9364 2402000B */ addiu $v0, $zero, 0xb -/* 42A088 802A9368 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A936C_42A08C -/* 42A08C 802A936C 0C093EB1 */ jal btl_set_popup_duration -/* 42A090 802A9370 24040063 */ addiu $a0, $zero, 0x63 -/* 42A094 802A9374 82220080 */ lb $v0, 0x80($s1) -/* 42A098 802A9378 00021040 */ sll $v0, $v0, 1 -/* 42A09C 802A937C 02221021 */ addu $v0, $s1, $v0 -/* 42A0A0 802A9380 84430074 */ lh $v1, 0x74($v0) -/* 42A0A4 802A9384 86220044 */ lh $v0, 0x44($s1) -/* 42A0A8 802A9388 14600002 */ bnez $v1, .L802A9394 -/* 42A0AC 802A938C 0043001A */ div $zero, $v0, $v1 -/* 42A0B0 802A9390 0007000D */ break 7 -.L802A9394: -/* 42A0B4 802A9394 2401FFFF */ addiu $at, $zero, -1 -/* 42A0B8 802A9398 14610004 */ bne $v1, $at, .L802A93AC -/* 42A0BC 802A939C 3C018000 */ lui $at, 0x8000 -/* 42A0C0 802A93A0 14410002 */ bne $v0, $at, .L802A93AC -/* 42A0C4 802A93A4 00000000 */ nop -/* 42A0C8 802A93A8 0006000D */ break 6 -.L802A93AC: -/* 42A0CC 802A93AC 00009012 */ mflo $s2 -/* 42A0D0 802A93B0 8222005C */ lb $v0, 0x5c($s1) -/* 42A0D4 802A93B4 96250044 */ lhu $a1, 0x44($s1) -/* 42A0D8 802A93B8 1440003A */ bnez $v0, .L802A94A4 -/* 42A0DC 802A93BC 24A2FF06 */ addiu $v0, $a1, -0xfa -/* 42A0E0 802A93C0 8E620210 */ lw $v0, 0x210($s3) -/* 42A0E4 802A93C4 30428000 */ andi $v0, $v0, 0x8000 -/* 42A0E8 802A93C8 14400012 */ bnez $v0, .L802A9414 -/* 42A0EC 802A93CC 3C026666 */ lui $v0, 0x6666 -/* 42A0F0 802A93D0 34426667 */ ori $v0, $v0, 0x6667 -/* 42A0F4 802A93D4 02420018 */ mult $s2, $v0 -/* 42A0F8 802A93D8 00121FC3 */ sra $v1, $s2, 0x1f -/* 42A0FC 802A93DC 00004810 */ mfhi $t1 -/* 42A100 802A93E0 000910C3 */ sra $v0, $t1, 3 -/* 42A104 802A93E4 00431023 */ subu $v0, $v0, $v1 -/* 42A108 802A93E8 00021080 */ sll $v0, $v0, 2 -/* 42A10C 802A93EC 3C01802B */ lui $at, %hi(D_802A9762_42A482) -/* 42A110 802A93F0 00220821 */ addu $at, $at, $v0 -/* 42A114 802A93F4 94229762 */ lhu $v0, %lo(D_802A9762_42A482)($at) -/* 42A118 802A93F8 00A21023 */ subu $v0, $a1, $v0 -/* 42A11C 802A93FC A6220044 */ sh $v0, 0x44($s1) -/* 42A120 802A9400 00021400 */ sll $v0, $v0, 0x10 -/* 42A124 802A9404 0442002D */ bltzl $v0, .L802A94BC -/* 42A128 802A9408 A6200044 */ sh $zero, 0x44($s1) -/* 42A12C 802A940C 080AA530 */ j .L802A94C0 -/* 42A130 802A9410 3C0451EB */ lui $a0, 0x51eb -.L802A9414: -/* 42A134 802A9414 34426667 */ ori $v0, $v0, 0x6667 -/* 42A138 802A9418 02420018 */ mult $s2, $v0 -/* 42A13C 802A941C 001217C3 */ sra $v0, $s2, 0x1f -/* 42A140 802A9420 8E640434 */ lw $a0, 0x434($s3) -/* 42A144 802A9424 00001810 */ mfhi $v1 -/* 42A148 802A9428 000318C3 */ sra $v1, $v1, 3 -/* 42A14C 802A942C 00621823 */ subu $v1, $v1, $v0 -/* 42A150 802A9430 00031880 */ sll $v1, $v1, 2 -/* 42A154 802A9434 86220050 */ lh $v0, 0x50($s1) -/* 42A158 802A9438 3C01802B */ lui $at, %hi(D_802A9778_42A498) -/* 42A15C 802A943C 00230821 */ addu $at, $at, $v1 -/* 42A160 802A9440 8C239778 */ lw $v1, %lo(D_802A9778_42A498)($at) -/* 42A164 802A9444 00021080 */ sll $v0, $v0, 2 -/* 42A168 802A9448 00441021 */ addu $v0, $v0, $a0 -/* 42A16C 802A944C 8C420000 */ lw $v0, ($v0) -/* 42A170 802A9450 00620018 */ mult $v1, $v0 -/* 42A174 802A9454 00001812 */ mflo $v1 -/* 42A178 802A9458 3C0251EB */ lui $v0, 0x51eb -/* 42A17C 802A945C 3442851F */ ori $v0, $v0, 0x851f -/* 42A180 802A9460 00620018 */ mult $v1, $v0 -/* 42A184 802A9464 00031FC3 */ sra $v1, $v1, 0x1f -/* 42A188 802A9468 00004010 */ mfhi $t0 -/* 42A18C 802A946C 00081143 */ sra $v0, $t0, 5 -/* 42A190 802A9470 00431023 */ subu $v0, $v0, $v1 -/* 42A194 802A9474 00A21021 */ addu $v0, $a1, $v0 -/* 42A198 802A9478 A6220044 */ sh $v0, 0x44($s1) -/* 42A19C 802A947C 00021400 */ sll $v0, $v0, 0x10 -/* 42A1A0 802A9480 00021403 */ sra $v0, $v0, 0x10 -/* 42A1A4 802A9484 28422711 */ slti $v0, $v0, 0x2711 -/* 42A1A8 802A9488 1440000D */ bnez $v0, .L802A94C0 -/* 42A1AC 802A948C 3C0451EB */ lui $a0, 0x51eb -/* 42A1B0 802A9490 24022710 */ addiu $v0, $zero, 0x2710 -/* 42A1B4 802A9494 A6220044 */ sh $v0, 0x44($s1) -/* 42A1B8 802A9498 24020001 */ addiu $v0, $zero, 1 -/* 42A1BC 802A949C 080AA530 */ j .L802A94C0 -/* 42A1C0 802A94A0 A222005C */ sb $v0, 0x5c($s1) -.L802A94A4: -/* 42A1C4 802A94A4 A6220044 */ sh $v0, 0x44($s1) -/* 42A1C8 802A94A8 00021400 */ sll $v0, $v0, 0x10 -/* 42A1CC 802A94AC 1C400004 */ bgtz $v0, .L802A94C0 -/* 42A1D0 802A94B0 3C0451EB */ lui $a0, 0x51eb -/* 42A1D4 802A94B4 A6200044 */ sh $zero, 0x44($s1) -/* 42A1D8 802A94B8 A220005C */ sb $zero, 0x5c($s1) -.L802A94BC: -/* 42A1DC 802A94BC 3C0451EB */ lui $a0, 0x51eb -.L802A94C0: -/* 42A1E0 802A94C0 3484851F */ ori $a0, $a0, 0x851f -/* 42A1E4 802A94C4 96230044 */ lhu $v1, 0x44($s1) -/* 42A1E8 802A94C8 0000282D */ daddu $a1, $zero, $zero -/* 42A1EC 802A94CC 00031C00 */ sll $v1, $v1, 0x10 -/* 42A1F0 802A94D0 00031403 */ sra $v0, $v1, 0x10 -/* 42A1F4 802A94D4 00440018 */ mult $v0, $a0 -/* 42A1F8 802A94D8 00A0302D */ daddu $a2, $a1, $zero -/* 42A1FC 802A94DC 3C048000 */ lui $a0, 0x8000 -/* 42A200 802A94E0 34840041 */ ori $a0, $a0, 0x41 -/* 42A204 802A94E4 00031FC3 */ sra $v1, $v1, 0x1f -/* 42A208 802A94E8 00004810 */ mfhi $t1 -/* 42A20C 802A94EC 00094143 */ sra $t0, $t1, 5 -/* 42A210 802A94F0 01034023 */ subu $t0, $t0, $v1 -/* 42A214 802A94F4 00081600 */ sll $v0, $t0, 0x18 -/* 42A218 802A94F8 00021603 */ sra $v0, $v0, 0x18 -/* 42A21C 802A94FC 00023840 */ sll $a3, $v0, 1 -/* 42A220 802A9500 00E23821 */ addu $a3, $a3, $v0 -/* 42A224 802A9504 00073880 */ sll $a3, $a3, 2 -/* 42A228 802A9508 0C0526F9 */ jal sfx_adjust_env_sound_params -/* 42A22C 802A950C A2680084 */ sb $t0, 0x84($s3) -/* 42A230 802A9510 2A420050 */ slti $v0, $s2, 0x50 -/* 42A234 802A9514 10400007 */ beqz $v0, .L802A9534 -/* 42A238 802A9518 8E300004 */ lw $s0, 4($s1) -/* 42A23C 802A951C 0C05122C */ jal hud_element_get_script -/* 42A240 802A9520 0200202D */ daddu $a0, $s0, $zero -/* 42A244 802A9524 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) -/* 42A248 802A9528 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42A24C 802A952C 080AA551 */ j .L802A9544 -/* 42A250 802A9530 00000000 */ nop -.L802A9534: -/* 42A254 802A9534 0C05122C */ jal hud_element_get_script -/* 42A258 802A9538 0200202D */ daddu $a0, $s0, $zero -/* 42A25C 802A953C 3C058011 */ lui $a1, %hi(HudScript_PressAButton) -/* 42A260 802A9540 24A58BBC */ addiu $a1, $a1, %lo(HudScript_PressAButton) -.L802A9544: -/* 42A264 802A9544 10450003 */ beq $v0, $a1, .L802A9554 -/* 42A268 802A9548 00000000 */ nop -/* 42A26C 802A954C 0C0511FF */ jal hud_element_set_script -/* 42A270 802A9550 0200202D */ daddu $a0, $s0, $zero -.L802A9554: -/* 42A274 802A9554 86220054 */ lh $v0, 0x54($s1) -/* 42A278 802A9558 96230054 */ lhu $v1, 0x54($s1) -/* 42A27C 802A955C 1440002A */ bnez $v0, .L802A9608 -/* 42A280 802A9560 2462FFFF */ addiu $v0, $v1, -1 -/* 42A284 802A9564 86220044 */ lh $v0, 0x44($s1) -/* 42A288 802A9568 10400002 */ beqz $v0, .L802A9574 -/* 42A28C 802A956C 2402FFFF */ addiu $v0, $zero, -1 -/* 42A290 802A9570 92620084 */ lbu $v0, 0x84($s3) -.L802A9574: -/* 42A294 802A9574 A2620081 */ sb $v0, 0x81($s3) -/* 42A298 802A9578 82220080 */ lb $v0, 0x80($s1) -/* 42A29C 802A957C 2442FFFF */ addiu $v0, $v0, -1 -/* 42A2A0 802A9580 00021040 */ sll $v0, $v0, 1 -/* 42A2A4 802A9584 02221021 */ addu $v0, $s1, $v0 -/* 42A2A8 802A9588 94420074 */ lhu $v0, 0x74($v0) -/* 42A2AC 802A958C 00021400 */ sll $v0, $v0, 0x10 -/* 42A2B0 802A9590 00021C03 */ sra $v1, $v0, 0x10 -/* 42A2B4 802A9594 000217C2 */ srl $v0, $v0, 0x1f -/* 42A2B8 802A9598 00621021 */ addu $v0, $v1, $v0 -/* 42A2BC 802A959C 82630084 */ lb $v1, 0x84($s3) -/* 42A2C0 802A95A0 00021043 */ sra $v0, $v0, 1 -/* 42A2C4 802A95A4 0043102A */ slt $v0, $v0, $v1 -/* 42A2C8 802A95A8 14400002 */ bnez $v0, .L802A95B4 -/* 42A2CC 802A95AC 24020001 */ addiu $v0, $zero, 1 -/* 42A2D0 802A95B0 2402FFFC */ addiu $v0, $zero, -4 -.L802A95B4: -/* 42A2D4 802A95B4 A2620086 */ sb $v0, 0x86($s3) -/* 42A2D8 802A95B8 82630081 */ lb $v1, 0x81($s3) -/* 42A2DC 802A95BC 24020064 */ addiu $v0, $zero, 0x64 -/* 42A2E0 802A95C0 14620003 */ bne $v1, $v0, .L802A95D0 -/* 42A2E4 802A95C4 00000000 */ nop -/* 42A2E8 802A95C8 0C09A458 */ jal func_80269160 -/* 42A2EC 802A95CC 00000000 */ nop -.L802A95D0: -/* 42A2F0 802A95D0 0C093EB1 */ jal btl_set_popup_duration -/* 42A2F4 802A95D4 0000202D */ daddu $a0, $zero, $zero -/* 42A2F8 802A95D8 3C048000 */ lui $a0, 0x8000 -/* 42A2FC 802A95DC 0C05271B */ jal sfx_stop_sound -/* 42A300 802A95E0 34840041 */ ori $a0, $a0, 0x41 -/* 42A304 802A95E4 24020005 */ addiu $v0, $zero, 5 -/* 42A308 802A95E8 A6220054 */ sh $v0, 0x54($s1) -/* 42A30C 802A95EC 2402000C */ addiu $v0, $zero, 0xc -/* 42A310 802A95F0 080AA586 */ j L802A9618_42A338 -/* 42A314 802A95F4 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A95F8_42A318 -/* 42A318 802A95F8 86220054 */ lh $v0, 0x54($s1) -/* 42A31C 802A95FC 96230054 */ lhu $v1, 0x54($s1) -/* 42A320 802A9600 10400003 */ beqz $v0, .L802A9610 -/* 42A324 802A9604 2462FFFF */ addiu $v0, $v1, -1 -.L802A9608: -/* 42A328 802A9608 080AA586 */ j L802A9618_42A338 -/* 42A32C 802A960C A6220054 */ sh $v0, 0x54($s1) -.L802A9610: -/* 42A330 802A9610 0C09A327 */ jal func_80268C9C -/* 42A334 802A9614 00000000 */ nop -dlabel L802A9618_42A338 -/* 42A338 802A9618 8FBF0020 */ lw $ra, 0x20($sp) -/* 42A33C 802A961C 8FB3001C */ lw $s3, 0x1c($sp) -/* 42A340 802A9620 8FB20018 */ lw $s2, 0x18($sp) -/* 42A344 802A9624 8FB10014 */ lw $s1, 0x14($sp) -/* 42A348 802A9628 8FB00010 */ lw $s0, 0x10($sp) -/* 42A34C 802A962C 03E00008 */ jr $ra -/* 42A350 802A9630 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s deleted file mode 100644 index 5872192120..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s +++ /dev/null @@ -1,242 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_42A4F0 -/* 42A4F0 802A9000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 42A4F4 802A9004 AFB10014 */ sw $s1, 0x14($sp) -/* 42A4F8 802A9008 0080882D */ daddu $s1, $a0, $zero -/* 42A4FC 802A900C 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 42A500 802A9010 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 42A504 802A9014 AFBF0020 */ sw $ra, 0x20($sp) -/* 42A508 802A9018 AFB3001C */ sw $s3, 0x1c($sp) -/* 42A50C 802A901C AFB20018 */ sw $s2, 0x18($sp) -/* 42A510 802A9020 AFB00010 */ sw $s0, 0x10($sp) -/* 42A514 802A9024 8E30000C */ lw $s0, 0xc($s1) -/* 42A518 802A9028 24020005 */ addiu $v0, $zero, 5 -/* 42A51C 802A902C A0620082 */ sb $v0, 0x82($v1) -/* 42A520 802A9030 3C028029 */ lui $v0, %hi(D_80294460) -/* 42A524 802A9034 24424460 */ addiu $v0, $v0, %lo(D_80294460) -/* 42A528 802A9038 3C12802A */ lui $s2, %hi(gActionCommandStatus) -/* 42A52C 802A903C 2652FBE0 */ addiu $s2, $s2, %lo(gActionCommandStatus) -/* 42A530 802A9040 AC620434 */ sw $v0, 0x434($v1) -/* 42A534 802A9044 80620083 */ lb $v0, 0x83($v1) -/* 42A538 802A9048 14400003 */ bnez $v0, .L802A9058 -/* 42A53C 802A904C 0060982D */ daddu $s3, $v1, $zero -/* 42A540 802A9050 080AA4DE */ j .L802A9378 -/* 42A544 802A9054 A0600081 */ sb $zero, 0x81($v1) -.L802A9058: -/* 42A548 802A9058 0C09A216 */ jal func_80268858 -/* 42A54C 802A905C 00000000 */ nop -/* 42A550 802A9060 24020016 */ addiu $v0, $zero, 0x16 -/* 42A554 802A9064 A642004A */ sh $v0, 0x4a($s2) -/* 42A558 802A9068 A640004C */ sh $zero, 0x4c($s2) -/* 42A55C 802A906C A2400060 */ sb $zero, 0x60($s2) -/* 42A560 802A9070 A6400044 */ sh $zero, 0x44($s2) -/* 42A564 802A9074 A6400048 */ sh $zero, 0x48($s2) -/* 42A568 802A9078 8E050000 */ lw $a1, ($s0) -/* 42A56C 802A907C 0C0B1EAF */ jal evt_get_variable -/* 42A570 802A9080 0220202D */ daddu $a0, $s1, $zero -/* 42A574 802A9084 3C048011 */ lui $a0, %hi(HudScript_AButton) -/* 42A578 802A9088 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* 42A57C 802A908C A6420064 */ sh $v0, 0x64($s2) -/* 42A580 802A9090 24020001 */ addiu $v0, $zero, 1 -/* 42A584 802A9094 A2620084 */ sb $v0, 0x84($s3) -/* 42A588 802A9098 2402001E */ addiu $v0, $zero, 0x1e -/* 42A58C 802A909C A642006C */ sh $v0, 0x6c($s2) -/* 42A590 802A90A0 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 42A594 802A90A4 A6420056 */ sh $v0, 0x56($s2) -/* 42A598 802A90A8 24020050 */ addiu $v0, $zero, 0x50 -/* 42A59C 802A90AC 0C050529 */ jal hud_element_create -/* 42A5A0 802A90B0 A6420058 */ sh $v0, 0x58($s2) -/* 42A5A4 802A90B4 0040882D */ daddu $s1, $v0, $zero -/* 42A5A8 802A90B8 0220202D */ daddu $a0, $s1, $zero -/* 42A5AC 802A90BC 24050082 */ addiu $a1, $zero, 0x82 -/* 42A5B0 802A90C0 0C051280 */ jal hud_element_set_flags -/* 42A5B4 802A90C4 AE510004 */ sw $s1, 4($s2) -/* 42A5B8 802A90C8 86450056 */ lh $a1, 0x56($s2) -/* 42A5BC 802A90CC 86460058 */ lh $a2, 0x58($s2) -/* 42A5C0 802A90D0 0C051261 */ jal hud_element_set_render_pos -/* 42A5C4 802A90D4 0220202D */ daddu $a0, $s1, $zero -/* 42A5C8 802A90D8 0220202D */ daddu $a0, $s1, $zero -/* 42A5CC 802A90DC 0C051277 */ jal hud_element_set_render_depth -/* 42A5D0 802A90E0 0000282D */ daddu $a1, $zero, $zero -/* 42A5D4 802A90E4 3C048029 */ lui $a0, %hi(HudScript_TimingBar3Chances) -/* 42A5D8 802A90E8 24842AFC */ addiu $a0, $a0, %lo(HudScript_TimingBar3Chances) -/* 42A5DC 802A90EC 0C050529 */ jal hud_element_create -/* 42A5E0 802A90F0 00000000 */ nop -/* 42A5E4 802A90F4 0040882D */ daddu $s1, $v0, $zero -/* 42A5E8 802A90F8 86450056 */ lh $a1, 0x56($s2) -/* 42A5EC 802A90FC 86460058 */ lh $a2, 0x58($s2) -/* 42A5F0 802A9100 0220202D */ daddu $a0, $s1, $zero -/* 42A5F4 802A9104 AE510008 */ sw $s1, 8($s2) -/* 42A5F8 802A9108 0C051261 */ jal hud_element_set_render_pos -/* 42A5FC 802A910C 24C6001C */ addiu $a2, $a2, 0x1c -/* 42A600 802A9110 0220202D */ daddu $a0, $s1, $zero -/* 42A604 802A9114 0C051277 */ jal hud_element_set_render_depth -/* 42A608 802A9118 0000282D */ daddu $a1, $zero, $zero -/* 42A60C 802A911C 0220202D */ daddu $a0, $s1, $zero -/* 42A610 802A9120 0C051280 */ jal hud_element_set_flags -/* 42A614 802A9124 24050082 */ addiu $a1, $zero, 0x82 -/* 42A618 802A9128 3C108029 */ lui $s0, %hi(HudScript_TimingWait) -/* 42A61C 802A912C 2610275C */ addiu $s0, $s0, %lo(HudScript_TimingWait) -/* 42A620 802A9130 0C050529 */ jal hud_element_create -/* 42A624 802A9134 0200202D */ daddu $a0, $s0, $zero -/* 42A628 802A9138 0040882D */ daddu $s1, $v0, $zero -/* 42A62C 802A913C 86450056 */ lh $a1, 0x56($s2) -/* 42A630 802A9140 86460058 */ lh $a2, 0x58($s2) -/* 42A634 802A9144 0220202D */ daddu $a0, $s1, $zero -/* 42A638 802A9148 AE51000C */ sw $s1, 0xc($s2) -/* 42A63C 802A914C 0C051261 */ jal hud_element_set_render_pos -/* 42A640 802A9150 24C6001C */ addiu $a2, $a2, 0x1c -/* 42A644 802A9154 0220202D */ daddu $a0, $s1, $zero -/* 42A648 802A9158 0C051277 */ jal hud_element_set_render_depth -/* 42A64C 802A915C 0000282D */ daddu $a1, $zero, $zero -/* 42A650 802A9160 0220202D */ daddu $a0, $s1, $zero -/* 42A654 802A9164 0C051280 */ jal hud_element_set_flags -/* 42A658 802A9168 24050082 */ addiu $a1, $zero, 0x82 -/* 42A65C 802A916C 0C050529 */ jal hud_element_create -/* 42A660 802A9170 0200202D */ daddu $a0, $s0, $zero -/* 42A664 802A9174 0040882D */ daddu $s1, $v0, $zero -/* 42A668 802A9178 86450056 */ lh $a1, 0x56($s2) -/* 42A66C 802A917C 86460058 */ lh $a2, 0x58($s2) -/* 42A670 802A9180 0220202D */ daddu $a0, $s1, $zero -/* 42A674 802A9184 AE510010 */ sw $s1, 0x10($s2) -/* 42A678 802A9188 0C051261 */ jal hud_element_set_render_pos -/* 42A67C 802A918C 24C6001C */ addiu $a2, $a2, 0x1c -/* 42A680 802A9190 0220202D */ daddu $a0, $s1, $zero -/* 42A684 802A9194 0C051277 */ jal hud_element_set_render_depth -/* 42A688 802A9198 0000282D */ daddu $a1, $zero, $zero -/* 42A68C 802A919C 0220202D */ daddu $a0, $s1, $zero -/* 42A690 802A91A0 0C051280 */ jal hud_element_set_flags -/* 42A694 802A91A4 24050082 */ addiu $a1, $zero, 0x82 -/* 42A698 802A91A8 0C050529 */ jal hud_element_create -/* 42A69C 802A91AC 0200202D */ daddu $a0, $s0, $zero -/* 42A6A0 802A91B0 0040882D */ daddu $s1, $v0, $zero -/* 42A6A4 802A91B4 86450056 */ lh $a1, 0x56($s2) -/* 42A6A8 802A91B8 86460058 */ lh $a2, 0x58($s2) -/* 42A6AC 802A91BC 0220202D */ daddu $a0, $s1, $zero -/* 42A6B0 802A91C0 AE510014 */ sw $s1, 0x14($s2) -/* 42A6B4 802A91C4 0C051261 */ jal hud_element_set_render_pos -/* 42A6B8 802A91C8 24C6001C */ addiu $a2, $a2, 0x1c -/* 42A6BC 802A91CC 0220202D */ daddu $a0, $s1, $zero -/* 42A6C0 802A91D0 0C051277 */ jal hud_element_set_render_depth -/* 42A6C4 802A91D4 0000282D */ daddu $a1, $zero, $zero -/* 42A6C8 802A91D8 0220202D */ daddu $a0, $s1, $zero -/* 42A6CC 802A91DC 0C051280 */ jal hud_element_set_flags -/* 42A6D0 802A91E0 24050082 */ addiu $a1, $zero, 0x82 -/* 42A6D4 802A91E4 3C108029 */ lui $s0, %hi(HudScript_TimingOK) -/* 42A6D8 802A91E8 26102B54 */ addiu $s0, $s0, %lo(HudScript_TimingOK) -/* 42A6DC 802A91EC 0C050529 */ jal hud_element_create -/* 42A6E0 802A91F0 0200202D */ daddu $a0, $s0, $zero -/* 42A6E4 802A91F4 0040882D */ daddu $s1, $v0, $zero -/* 42A6E8 802A91F8 86450056 */ lh $a1, 0x56($s2) -/* 42A6EC 802A91FC 86460058 */ lh $a2, 0x58($s2) -/* 42A6F0 802A9200 0220202D */ daddu $a0, $s1, $zero -/* 42A6F4 802A9204 0C051261 */ jal hud_element_set_render_pos -/* 42A6F8 802A9208 AE51001C */ sw $s1, 0x1c($s2) -/* 42A6FC 802A920C 0220202D */ daddu $a0, $s1, $zero -/* 42A700 802A9210 0C051277 */ jal hud_element_set_render_depth -/* 42A704 802A9214 0000282D */ daddu $a1, $zero, $zero -/* 42A708 802A9218 0220202D */ daddu $a0, $s1, $zero -/* 42A70C 802A921C 0C051280 */ jal hud_element_set_flags -/* 42A710 802A9220 24050082 */ addiu $a1, $zero, 0x82 -/* 42A714 802A9224 0C050529 */ jal hud_element_create -/* 42A718 802A9228 0200202D */ daddu $a0, $s0, $zero -/* 42A71C 802A922C 0040882D */ daddu $s1, $v0, $zero -/* 42A720 802A9230 86450056 */ lh $a1, 0x56($s2) -/* 42A724 802A9234 86460058 */ lh $a2, 0x58($s2) -/* 42A728 802A9238 0220202D */ daddu $a0, $s1, $zero -/* 42A72C 802A923C 0C051261 */ jal hud_element_set_render_pos -/* 42A730 802A9240 AE510020 */ sw $s1, 0x20($s2) -/* 42A734 802A9244 0220202D */ daddu $a0, $s1, $zero -/* 42A738 802A9248 0C051277 */ jal hud_element_set_render_depth -/* 42A73C 802A924C 0000282D */ daddu $a1, $zero, $zero -/* 42A740 802A9250 0220202D */ daddu $a0, $s1, $zero -/* 42A744 802A9254 0C051280 */ jal hud_element_set_flags -/* 42A748 802A9258 24050082 */ addiu $a1, $zero, 0x82 -/* 42A74C 802A925C 0C050529 */ jal hud_element_create -/* 42A750 802A9260 0200202D */ daddu $a0, $s0, $zero -/* 42A754 802A9264 0040882D */ daddu $s1, $v0, $zero -/* 42A758 802A9268 86450056 */ lh $a1, 0x56($s2) -/* 42A75C 802A926C 86460058 */ lh $a2, 0x58($s2) -/* 42A760 802A9270 0220202D */ daddu $a0, $s1, $zero -/* 42A764 802A9274 0C051261 */ jal hud_element_set_render_pos -/* 42A768 802A9278 AE510024 */ sw $s1, 0x24($s2) -/* 42A76C 802A927C 0220202D */ daddu $a0, $s1, $zero -/* 42A770 802A9280 0C051277 */ jal hud_element_set_render_depth -/* 42A774 802A9284 0000282D */ daddu $a1, $zero, $zero -/* 42A778 802A9288 0220202D */ daddu $a0, $s1, $zero -/* 42A77C 802A928C 0C051280 */ jal hud_element_set_flags -/* 42A780 802A9290 24050082 */ addiu $a1, $zero, 0x82 -/* 42A784 802A9294 3C04802B */ lui $a0, %hi(D_802AB184_42C674) -/* 42A788 802A9298 0C050529 */ jal hud_element_create -/* 42A78C 802A929C 8C84B184 */ lw $a0, %lo(D_802AB184_42C674)($a0) -/* 42A790 802A92A0 86450056 */ lh $a1, 0x56($s2) -/* 42A794 802A92A4 86460058 */ lh $a2, 0x58($s2) -/* 42A798 802A92A8 0040202D */ daddu $a0, $v0, $zero -/* 42A79C 802A92AC 0C051261 */ jal hud_element_set_render_pos -/* 42A7A0 802A92B0 AE44002C */ sw $a0, 0x2c($s2) -/* 42A7A4 802A92B4 3C048029 */ lui $a0, %hi(HudScript_TimingCharge4c) -/* 42A7A8 802A92B8 248428A0 */ addiu $a0, $a0, %lo(HudScript_TimingCharge4c) -/* 42A7AC 802A92BC 0C050529 */ jal hud_element_create -/* 42A7B0 802A92C0 00000000 */ nop -/* 42A7B4 802A92C4 86450056 */ lh $a1, 0x56($s2) -/* 42A7B8 802A92C8 86460058 */ lh $a2, 0x58($s2) -/* 42A7BC 802A92CC 0040202D */ daddu $a0, $v0, $zero -/* 42A7C0 802A92D0 0C051261 */ jal hud_element_set_render_pos -/* 42A7C4 802A92D4 AE440030 */ sw $a0, 0x30($s2) -/* 42A7C8 802A92D8 3C048029 */ lui $a0, %hi(HudScript_TimingCharge4b) -/* 42A7CC 802A92DC 24842848 */ addiu $a0, $a0, %lo(HudScript_TimingCharge4b) -/* 42A7D0 802A92E0 0C050529 */ jal hud_element_create -/* 42A7D4 802A92E4 00000000 */ nop -/* 42A7D8 802A92E8 0040882D */ daddu $s1, $v0, $zero -/* 42A7DC 802A92EC 86450056 */ lh $a1, 0x56($s2) -/* 42A7E0 802A92F0 86460058 */ lh $a2, 0x58($s2) -/* 42A7E4 802A92F4 0220202D */ daddu $a0, $s1, $zero -/* 42A7E8 802A92F8 0C051261 */ jal hud_element_set_render_pos -/* 42A7EC 802A92FC AE510034 */ sw $s1, 0x34($s2) -/* 42A7F0 802A9300 86430064 */ lh $v1, 0x64($s2) -/* 42A7F4 802A9304 24020001 */ addiu $v0, $zero, 1 -/* 42A7F8 802A9308 1062000E */ beq $v1, $v0, .L802A9344 -/* 42A7FC 802A930C 28620002 */ slti $v0, $v1, 2 -/* 42A800 802A9310 10400005 */ beqz $v0, .L802A9328 -/* 42A804 802A9314 24020002 */ addiu $v0, $zero, 2 -/* 42A808 802A9318 10600007 */ beqz $v1, .L802A9338 -/* 42A80C 802A931C 00000000 */ nop -/* 42A810 802A9320 080AA4DA */ j .L802A9368 -/* 42A814 802A9324 00000000 */ nop -.L802A9328: -/* 42A818 802A9328 10620009 */ beq $v1, $v0, .L802A9350 -/* 42A81C 802A932C 00000000 */ nop -/* 42A820 802A9330 080AA4DA */ j .L802A9368 -/* 42A824 802A9334 00000000 */ nop -.L802A9338: -/* 42A828 802A9338 3C04802B */ lui $a0, %hi(D_802AB108_42C5F8) -/* 42A82C 802A933C 080AA4D6 */ j .L802A9358 -/* 42A830 802A9340 2484B108 */ addiu $a0, $a0, %lo(D_802AB108_42C5F8) -.L802A9344: -/* 42A834 802A9344 3C04802B */ lui $a0, %hi(D_802AB130_42C620) -/* 42A838 802A9348 080AA4D6 */ j .L802A9358 -/* 42A83C 802A934C 2484B130 */ addiu $a0, $a0, %lo(D_802AB130_42C620) -.L802A9350: -/* 42A840 802A9350 3C04802B */ lui $a0, %hi(D_802AB158_42C648) -/* 42A844 802A9354 2484B158 */ addiu $a0, $a0, %lo(D_802AB158_42C648) -.L802A9358: -/* 42A848 802A9358 0C050529 */ jal hud_element_create -/* 42A84C 802A935C 00000000 */ nop -/* 42A850 802A9360 AE420038 */ sw $v0, 0x38($s2) -/* 42A854 802A9364 0040882D */ daddu $s1, $v0, $zero -.L802A9368: -/* 42A858 802A9368 86450056 */ lh $a1, 0x56($s2) -/* 42A85C 802A936C 86460058 */ lh $a2, 0x58($s2) -/* 42A860 802A9370 0C051261 */ jal hud_element_set_render_pos -/* 42A864 802A9374 0220202D */ daddu $a0, $s1, $zero -.L802A9378: -/* 42A868 802A9378 24020002 */ addiu $v0, $zero, 2 -/* 42A86C 802A937C 8FBF0020 */ lw $ra, 0x20($sp) -/* 42A870 802A9380 8FB3001C */ lw $s3, 0x1c($sp) -/* 42A874 802A9384 8FB20018 */ lw $s2, 0x18($sp) -/* 42A878 802A9388 8FB10014 */ lw $s1, 0x14($sp) -/* 42A87C 802A938C 8FB00010 */ lw $s0, 0x10($sp) -/* 42A880 802A9390 03E00008 */ jr $ra -/* 42A884 802A9394 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s deleted file mode 100644 index 9a71e73291..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s +++ /dev/null @@ -1,830 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A948C_42A97C -/* 42A97C 802A948C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 42A980 802A9490 AFB10014 */ sw $s1, 0x14($sp) -/* 42A984 802A9494 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 42A988 802A9498 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42A98C 802A949C AFBF0018 */ sw $ra, 0x18($sp) -/* 42A990 802A94A0 AFB00010 */ sw $s0, 0x10($sp) -/* 42A994 802A94A4 8623004C */ lh $v1, 0x4c($s1) -/* 42A998 802A94A8 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 42A99C 802A94AC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 42A9A0 802A94B0 2C620012 */ sltiu $v0, $v1, 0x12 -/* 42A9A4 802A94B4 104002D2 */ beqz $v0, L802AA000_42B4F0 -/* 42A9A8 802A94B8 00031080 */ sll $v0, $v1, 2 -/* 42A9AC 802A94BC 3C01802B */ lui $at, %hi(jtbl_802AB1B0_42C6A0) -/* 42A9B0 802A94C0 00220821 */ addu $at, $at, $v0 -/* 42A9B4 802A94C4 8C22B1B0 */ lw $v0, %lo(jtbl_802AB1B0_42C6A0)($at) -/* 42A9B8 802A94C8 00400008 */ jr $v0 -/* 42A9BC 802A94CC 00000000 */ nop -dlabel L802A94D0_42A9C0 -/* 42A9C0 802A94D0 0C093EB1 */ jal btl_set_popup_duration -/* 42A9C4 802A94D4 24040063 */ addiu $a0, $zero, 0x63 -/* 42A9C8 802A94D8 82220061 */ lb $v0, 0x61($s1) -/* 42A9CC 802A94DC 8E300004 */ lw $s0, 4($s1) -/* 42A9D0 802A94E0 10400004 */ beqz $v0, .L802A94F4 -/* 42A9D4 802A94E4 0200202D */ daddu $a0, $s0, $zero -/* 42A9D8 802A94E8 0C05128B */ jal hud_element_clear_flags -/* 42A9DC 802A94EC 24050002 */ addiu $a1, $zero, 2 -/* 42A9E0 802A94F0 0200202D */ daddu $a0, $s0, $zero -.L802A94F4: -/* 42A9E4 802A94F4 0C0513AC */ jal hud_element_set_alpha -/* 42A9E8 802A94F8 240500FF */ addiu $a1, $zero, 0xff -/* 42A9EC 802A94FC 8E300008 */ lw $s0, 8($s1) -/* 42A9F0 802A9500 240500FF */ addiu $a1, $zero, 0xff -/* 42A9F4 802A9504 0C0513AC */ jal hud_element_set_alpha -/* 42A9F8 802A9508 0200202D */ daddu $a0, $s0, $zero -/* 42A9FC 802A950C 82220061 */ lb $v0, 0x61($s1) -/* 42AA00 802A9510 10400003 */ beqz $v0, .L802A9520 -/* 42AA04 802A9514 0200202D */ daddu $a0, $s0, $zero -/* 42AA08 802A9518 0C05128B */ jal hud_element_clear_flags -/* 42AA0C 802A951C 24050002 */ addiu $a1, $zero, 2 -.L802A9520: -/* 42AA10 802A9520 8E30000C */ lw $s0, 0xc($s1) -/* 42AA14 802A9524 240500FF */ addiu $a1, $zero, 0xff -/* 42AA18 802A9528 0C0513AC */ jal hud_element_set_alpha -/* 42AA1C 802A952C 0200202D */ daddu $a0, $s0, $zero -/* 42AA20 802A9530 82220061 */ lb $v0, 0x61($s1) -/* 42AA24 802A9534 10400003 */ beqz $v0, .L802A9544 -/* 42AA28 802A9538 0200202D */ daddu $a0, $s0, $zero -/* 42AA2C 802A953C 0C05128B */ jal hud_element_clear_flags -/* 42AA30 802A9540 24050002 */ addiu $a1, $zero, 2 -.L802A9544: -/* 42AA34 802A9544 8E300010 */ lw $s0, 0x10($s1) -/* 42AA38 802A9548 240500FF */ addiu $a1, $zero, 0xff -/* 42AA3C 802A954C 0C0513AC */ jal hud_element_set_alpha -/* 42AA40 802A9550 0200202D */ daddu $a0, $s0, $zero -/* 42AA44 802A9554 82220061 */ lb $v0, 0x61($s1) -/* 42AA48 802A9558 10400003 */ beqz $v0, .L802A9568 -/* 42AA4C 802A955C 0200202D */ daddu $a0, $s0, $zero -/* 42AA50 802A9560 0C05128B */ jal hud_element_clear_flags -/* 42AA54 802A9564 24050002 */ addiu $a1, $zero, 2 -.L802A9568: -/* 42AA58 802A9568 8E300014 */ lw $s0, 0x14($s1) -/* 42AA5C 802A956C 240500FF */ addiu $a1, $zero, 0xff -/* 42AA60 802A9570 0C0513AC */ jal hud_element_set_alpha -/* 42AA64 802A9574 0200202D */ daddu $a0, $s0, $zero -/* 42AA68 802A9578 82220061 */ lb $v0, 0x61($s1) -/* 42AA6C 802A957C 10400003 */ beqz $v0, .L802A958C -/* 42AA70 802A9580 0200202D */ daddu $a0, $s0, $zero -/* 42AA74 802A9584 0C05128B */ jal hud_element_clear_flags -/* 42AA78 802A9588 24050002 */ addiu $a1, $zero, 2 -.L802A958C: -/* 42AA7C 802A958C 8E30002C */ lw $s0, 0x2c($s1) -/* 42AA80 802A9590 240500FF */ addiu $a1, $zero, 0xff -/* 42AA84 802A9594 0C0513AC */ jal hud_element_set_alpha -/* 42AA88 802A9598 0200202D */ daddu $a0, $s0, $zero -/* 42AA8C 802A959C 82220061 */ lb $v0, 0x61($s1) -/* 42AA90 802A95A0 10400003 */ beqz $v0, .L802A95B0 -/* 42AA94 802A95A4 0200202D */ daddu $a0, $s0, $zero -/* 42AA98 802A95A8 0C05128B */ jal hud_element_clear_flags -/* 42AA9C 802A95AC 24050002 */ addiu $a1, $zero, 2 -.L802A95B0: -/* 42AAA0 802A95B0 8E300030 */ lw $s0, 0x30($s1) -/* 42AAA4 802A95B4 240500FF */ addiu $a1, $zero, 0xff -/* 42AAA8 802A95B8 0C0513AC */ jal hud_element_set_alpha -/* 42AAAC 802A95BC 0200202D */ daddu $a0, $s0, $zero -/* 42AAB0 802A95C0 82220061 */ lb $v0, 0x61($s1) -/* 42AAB4 802A95C4 10400003 */ beqz $v0, .L802A95D4 -/* 42AAB8 802A95C8 0200202D */ daddu $a0, $s0, $zero -/* 42AABC 802A95CC 0C05128B */ jal hud_element_clear_flags -/* 42AAC0 802A95D0 24050002 */ addiu $a1, $zero, 2 -.L802A95D4: -/* 42AAC4 802A95D4 8E300034 */ lw $s0, 0x34($s1) -/* 42AAC8 802A95D8 240500FF */ addiu $a1, $zero, 0xff -/* 42AACC 802A95DC 0C0513AC */ jal hud_element_set_alpha -/* 42AAD0 802A95E0 0200202D */ daddu $a0, $s0, $zero -/* 42AAD4 802A95E4 82220061 */ lb $v0, 0x61($s1) -/* 42AAD8 802A95E8 10400003 */ beqz $v0, .L802A95F8 -/* 42AADC 802A95EC 0200202D */ daddu $a0, $s0, $zero -/* 42AAE0 802A95F0 0C05128B */ jal hud_element_clear_flags -/* 42AAE4 802A95F4 24050002 */ addiu $a1, $zero, 2 -.L802A95F8: -/* 42AAE8 802A95F8 8E300038 */ lw $s0, 0x38($s1) -/* 42AAEC 802A95FC 240500FF */ addiu $a1, $zero, 0xff -/* 42AAF0 802A9600 0C0513AC */ jal hud_element_set_alpha -/* 42AAF4 802A9604 0200202D */ daddu $a0, $s0, $zero -/* 42AAF8 802A9608 82220061 */ lb $v0, 0x61($s1) -/* 42AAFC 802A960C 10400003 */ beqz $v0, .L802A961C -/* 42AB00 802A9610 0200202D */ daddu $a0, $s0, $zero -/* 42AB04 802A9614 0C05128B */ jal hud_element_clear_flags -/* 42AB08 802A9618 24050002 */ addiu $a1, $zero, 2 -.L802A961C: -/* 42AB0C 802A961C 24020001 */ addiu $v0, $zero, 1 -/* 42AB10 802A9620 080AA800 */ j L802AA000_42B4F0 -/* 42AB14 802A9624 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9628_42AB18 -/* 42AB18 802A9628 0C093EB1 */ jal btl_set_popup_duration -/* 42AB1C 802A962C 24040063 */ addiu $a0, $zero, 0x63 -/* 42AB20 802A9630 8622006C */ lh $v0, 0x6c($s1) -/* 42AB24 802A9634 9623006C */ lhu $v1, 0x6c($s1) -/* 42AB28 802A9638 10400003 */ beqz $v0, .L802A9648 -/* 42AB2C 802A963C 2462FFFF */ addiu $v0, $v1, -1 -/* 42AB30 802A9640 080AA800 */ j L802AA000_42B4F0 -/* 42AB34 802A9644 A622006C */ sh $v0, 0x6c($s1) -.L802A9648: -/* 42AB38 802A9648 96220056 */ lhu $v0, 0x56($s1) -/* 42AB3C 802A964C 24420014 */ addiu $v0, $v0, 0x14 -/* 42AB40 802A9650 A6220056 */ sh $v0, 0x56($s1) -/* 42AB44 802A9654 00021400 */ sll $v0, $v0, 0x10 -/* 42AB48 802A9658 00021403 */ sra $v0, $v0, 0x10 -/* 42AB4C 802A965C 28420033 */ slti $v0, $v0, 0x33 -/* 42AB50 802A9660 14400002 */ bnez $v0, .L802A966C -/* 42AB54 802A9664 24020032 */ addiu $v0, $zero, 0x32 -/* 42AB58 802A9668 A6220056 */ sh $v0, 0x56($s1) -.L802A966C: -/* 42AB5C 802A966C 8E240004 */ lw $a0, 4($s1) -/* 42AB60 802A9670 86250056 */ lh $a1, 0x56($s1) -/* 42AB64 802A9674 0C051261 */ jal hud_element_set_render_pos -/* 42AB68 802A9678 86260058 */ lh $a2, 0x58($s1) -/* 42AB6C 802A967C 8E240008 */ lw $a0, 8($s1) -/* 42AB70 802A9680 86250056 */ lh $a1, 0x56($s1) -/* 42AB74 802A9684 86260058 */ lh $a2, 0x58($s1) -/* 42AB78 802A9688 24A5001C */ addiu $a1, $a1, 0x1c -/* 42AB7C 802A968C 0C051261 */ jal hud_element_set_render_pos -/* 42AB80 802A9690 24C6001C */ addiu $a2, $a2, 0x1c -/* 42AB84 802A9694 8E24000C */ lw $a0, 0xc($s1) -/* 42AB88 802A9698 86250056 */ lh $a1, 0x56($s1) -/* 42AB8C 802A969C 86260058 */ lh $a2, 0x58($s1) -/* 42AB90 802A96A0 24A50015 */ addiu $a1, $a1, 0x15 -/* 42AB94 802A96A4 0C051261 */ jal hud_element_set_render_pos -/* 42AB98 802A96A8 24C60018 */ addiu $a2, $a2, 0x18 -/* 42AB9C 802A96AC 8E240010 */ lw $a0, 0x10($s1) -/* 42ABA0 802A96B0 86250056 */ lh $a1, 0x56($s1) -/* 42ABA4 802A96B4 86260058 */ lh $a2, 0x58($s1) -/* 42ABA8 802A96B8 24A50029 */ addiu $a1, $a1, 0x29 -/* 42ABAC 802A96BC 0C051261 */ jal hud_element_set_render_pos -/* 42ABB0 802A96C0 24C60018 */ addiu $a2, $a2, 0x18 -/* 42ABB4 802A96C4 8E240014 */ lw $a0, 0x14($s1) -/* 42ABB8 802A96C8 86250056 */ lh $a1, 0x56($s1) -/* 42ABBC 802A96CC 86260058 */ lh $a2, 0x58($s1) -/* 42ABC0 802A96D0 24A5003D */ addiu $a1, $a1, 0x3d -/* 42ABC4 802A96D4 0C051261 */ jal hud_element_set_render_pos -/* 42ABC8 802A96D8 24C60018 */ addiu $a2, $a2, 0x18 -/* 42ABCC 802A96DC 24020001 */ addiu $v0, $zero, 1 -/* 42ABD0 802A96E0 86230064 */ lh $v1, 0x64($s1) -/* 42ABD4 802A96E4 8E30002C */ lw $s0, 0x2c($s1) -/* 42ABD8 802A96E8 10620010 */ beq $v1, $v0, .L802A972C -/* 42ABDC 802A96EC 28620002 */ slti $v0, $v1, 2 -/* 42ABE0 802A96F0 10400005 */ beqz $v0, .L802A9708 -/* 42ABE4 802A96F4 24020002 */ addiu $v0, $zero, 2 -/* 42ABE8 802A96F8 10600007 */ beqz $v1, .L802A9718 -/* 42ABEC 802A96FC 0200202D */ daddu $a0, $s0, $zero -/* 42ABF0 802A9700 080AA5D2 */ j .L802A9748 -/* 42ABF4 802A9704 00000000 */ nop -.L802A9708: -/* 42ABF8 802A9708 10620009 */ beq $v1, $v0, .L802A9730 -/* 42ABFC 802A970C 0200202D */ daddu $a0, $s0, $zero -/* 42AC00 802A9710 080AA5D2 */ j .L802A9748 -/* 42AC04 802A9714 00000000 */ nop -.L802A9718: -/* 42AC08 802A9718 86250056 */ lh $a1, 0x56($s1) -/* 42AC0C 802A971C 86260058 */ lh $a2, 0x58($s1) -/* 42AC10 802A9720 24A5005B */ addiu $a1, $a1, 0x5b -/* 42AC14 802A9724 080AA5D0 */ j .L802A9740 -/* 42AC18 802A9728 24C60007 */ addiu $a2, $a2, 7 -.L802A972C: -/* 42AC1C 802A972C 0200202D */ daddu $a0, $s0, $zero -.L802A9730: -/* 42AC20 802A9730 86250056 */ lh $a1, 0x56($s1) -/* 42AC24 802A9734 86260058 */ lh $a2, 0x58($s1) -/* 42AC28 802A9738 24A5005B */ addiu $a1, $a1, 0x5b -/* 42AC2C 802A973C 24C6000D */ addiu $a2, $a2, 0xd -.L802A9740: -/* 42AC30 802A9740 0C051261 */ jal hud_element_set_render_pos -/* 42AC34 802A9744 00000000 */ nop -.L802A9748: -/* 42AC38 802A9748 8E240030 */ lw $a0, 0x30($s1) -/* 42AC3C 802A974C 86250056 */ lh $a1, 0x56($s1) -/* 42AC40 802A9750 86260058 */ lh $a2, 0x58($s1) -/* 42AC44 802A9754 24A5FFFB */ addiu $a1, $a1, -5 -/* 42AC48 802A9758 0C051261 */ jal hud_element_set_render_pos -/* 42AC4C 802A975C 24C6001D */ addiu $a2, $a2, 0x1d -/* 42AC50 802A9760 8E240034 */ lw $a0, 0x34($s1) -/* 42AC54 802A9764 86250056 */ lh $a1, 0x56($s1) -/* 42AC58 802A9768 86260058 */ lh $a2, 0x58($s1) -/* 42AC5C 802A976C 24A50007 */ addiu $a1, $a1, 7 -/* 42AC60 802A9770 0C051261 */ jal hud_element_set_render_pos -/* 42AC64 802A9774 24C6001D */ addiu $a2, $a2, 0x1d -/* 42AC68 802A9778 8E240038 */ lw $a0, 0x38($s1) -/* 42AC6C 802A977C 86250056 */ lh $a1, 0x56($s1) -/* 42AC70 802A9780 86260058 */ lh $a2, 0x58($s1) -/* 42AC74 802A9784 24A5005C */ addiu $a1, $a1, 0x5c -/* 42AC78 802A9788 0C051261 */ jal hud_element_set_render_pos -/* 42AC7C 802A978C 24C60017 */ addiu $a2, $a2, 0x17 -/* 42AC80 802A9790 080AA800 */ j L802AA000_42B4F0 -/* 42AC84 802A9794 00000000 */ nop -dlabel L802A9798_42AC88 -/* 42AC88 802A9798 0C093EB1 */ jal btl_set_popup_duration -/* 42AC8C 802A979C 24040063 */ addiu $a0, $zero, 0x63 -/* 42AC90 802A97A0 8622004E */ lh $v0, 0x4e($s1) -/* 42AC94 802A97A4 9623004E */ lhu $v1, 0x4e($s1) -/* 42AC98 802A97A8 10400003 */ beqz $v0, .L802A97B8 -/* 42AC9C 802A97AC 2462FFFF */ addiu $v0, $v1, -1 -/* 42ACA0 802A97B0 080AA800 */ j L802AA000_42B4F0 -/* 42ACA4 802A97B4 A622004E */ sh $v0, 0x4e($s1) -.L802A97B8: -/* 42ACA8 802A97B8 96220052 */ lhu $v0, 0x52($s1) -/* 42ACAC 802A97BC 2442FFC4 */ addiu $v0, $v0, -0x3c -/* 42ACB0 802A97C0 A6220054 */ sh $v0, 0x54($s1) -/* 42ACB4 802A97C4 00021400 */ sll $v0, $v0, 0x10 -/* 42ACB8 802A97C8 00021403 */ sra $v0, $v0, 0x10 -/* 42ACBC 802A97CC 2842002A */ slti $v0, $v0, 0x2a -/* 42ACC0 802A97D0 10400002 */ beqz $v0, .L802A97DC -/* 42ACC4 802A97D4 2402002A */ addiu $v0, $zero, 0x2a -/* 42ACC8 802A97D8 A6220054 */ sh $v0, 0x54($s1) -.L802A97DC: -/* 42ACCC 802A97DC 2402000B */ addiu $v0, $zero, 0xb -/* 42ACD0 802A97E0 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A97E4_42ACD4 -/* 42ACD4 802A97E4 0C093EB1 */ jal btl_set_popup_duration -/* 42ACD8 802A97E8 24040063 */ addiu $a0, $zero, 0x63 -/* 42ACDC 802A97EC 86230054 */ lh $v1, 0x54($s1) -/* 42ACE0 802A97F0 2402002A */ addiu $v0, $zero, 0x2a -/* 42ACE4 802A97F4 1462000A */ bne $v1, $v0, .L802A9820 -/* 42ACE8 802A97F8 24020016 */ addiu $v0, $zero, 0x16 -/* 42ACEC 802A97FC 8E240030 */ lw $a0, 0x30($s1) -/* 42ACF0 802A9800 3C058029 */ lui $a1, %hi(HudScript_TimingCharge3) -/* 42ACF4 802A9804 24A528CC */ addiu $a1, $a1, %lo(HudScript_TimingCharge3) -/* 42ACF8 802A9808 0C0511FF */ jal hud_element_set_script -/* 42ACFC 802A980C 00000000 */ nop -/* 42AD00 802A9810 0C05272D */ jal sfx_play_sound -/* 42AD04 802A9814 24040233 */ addiu $a0, $zero, 0x233 -/* 42AD08 802A9818 86230054 */ lh $v1, 0x54($s1) -/* 42AD0C 802A981C 24020016 */ addiu $v0, $zero, 0x16 -.L802A9820: -/* 42AD10 802A9820 14620008 */ bne $v1, $v0, .L802A9844 -/* 42AD14 802A9824 00000000 */ nop -/* 42AD18 802A9828 8E240034 */ lw $a0, 0x34($s1) -/* 42AD1C 802A982C 3C058029 */ lui $a1, %hi(HudScript_TimingCharge2) -/* 42AD20 802A9830 24A52874 */ addiu $a1, $a1, %lo(HudScript_TimingCharge2) -/* 42AD24 802A9834 0C0511FF */ jal hud_element_set_script -/* 42AD28 802A9838 00000000 */ nop -/* 42AD2C 802A983C 0C05272D */ jal sfx_play_sound -/* 42AD30 802A9840 24040233 */ addiu $a0, $zero, 0x233 -.L802A9844: -/* 42AD34 802A9844 86230054 */ lh $v1, 0x54($s1) -/* 42AD38 802A9848 24020002 */ addiu $v0, $zero, 2 -/* 42AD3C 802A984C 1462000D */ bne $v1, $v0, .L802A9884 -/* 42AD40 802A9850 00000000 */ nop -/* 42AD44 802A9854 8E24000C */ lw $a0, 0xc($s1) -/* 42AD48 802A9858 3C058029 */ lui $a1, %hi(HudScript_TimingReady) -/* 42AD4C 802A985C 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 42AD50 802A9860 0C0511FF */ jal hud_element_set_script -/* 42AD54 802A9864 00000000 */ nop -/* 42AD58 802A9868 8E240004 */ lw $a0, 4($s1) -/* 42AD5C 802A986C 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) -/* 42AD60 802A9870 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42AD64 802A9874 0C0511FF */ jal hud_element_set_script -/* 42AD68 802A9878 00000000 */ nop -/* 42AD6C 802A987C 0C05272D */ jal sfx_play_sound -/* 42AD70 802A9880 24040234 */ addiu $a0, $zero, 0x234 -.L802A9884: -/* 42AD74 802A9884 96220054 */ lhu $v0, 0x54($s1) -/* 42AD78 802A9888 2442FFFF */ addiu $v0, $v0, -1 -/* 42AD7C 802A988C A6220054 */ sh $v0, 0x54($s1) -/* 42AD80 802A9890 00021400 */ sll $v0, $v0, 0x10 -/* 42AD84 802A9894 144001DA */ bnez $v0, L802AA000_42B4F0 -/* 42AD88 802A9898 24020014 */ addiu $v0, $zero, 0x14 -/* 42AD8C 802A989C A6220054 */ sh $v0, 0x54($s1) -/* 42AD90 802A98A0 080AA75A */ j .L802A9D68 -/* 42AD94 802A98A4 2402000C */ addiu $v0, $zero, 0xc -dlabel L802A98A8_42AD98 -/* 42AD98 802A98A8 0C093EB1 */ jal btl_set_popup_duration -/* 42AD9C 802A98AC 24040063 */ addiu $a0, $zero, 0x63 -/* 42ADA0 802A98B0 82220060 */ lb $v0, 0x60($s1) -/* 42ADA4 802A98B4 1440003A */ bnez $v0, .L802A99A0 -/* 42ADA8 802A98B8 00000000 */ nop -/* 42ADAC 802A98BC 8222005C */ lb $v0, 0x5c($s1) -/* 42ADB0 802A98C0 14400037 */ bnez $v0, .L802A99A0 -/* 42ADB4 802A98C4 00000000 */ nop -/* 42ADB8 802A98C8 8222005D */ lb $v0, 0x5d($s1) -/* 42ADBC 802A98CC 2842FFFB */ slti $v0, $v0, -5 -/* 42ADC0 802A98D0 14400033 */ bnez $v0, .L802A99A0 -/* 42ADC4 802A98D4 00000000 */ nop -/* 42ADC8 802A98D8 86220050 */ lh $v0, 0x50($s1) -/* 42ADCC 802A98DC 8E030434 */ lw $v1, 0x434($s0) -/* 42ADD0 802A98E0 000210C0 */ sll $v0, $v0, 3 -/* 42ADD4 802A98E4 00431021 */ addu $v0, $v0, $v1 -/* 42ADD8 802A98E8 8C430000 */ lw $v1, ($v0) -/* 42ADDC 802A98EC 8C420004 */ lw $v0, 4($v0) -/* 42ADE0 802A98F0 82040431 */ lb $a0, 0x431($s0) -/* 42ADE4 802A98F4 00621821 */ addu $v1, $v1, $v0 -/* 42ADE8 802A98F8 24630005 */ addiu $v1, $v1, 5 -/* 42ADEC 802A98FC 00832023 */ subu $a0, $a0, $v1 -/* 42ADF0 802A9900 04820001 */ bltzl $a0, .L802A9908 -/* 42ADF4 802A9904 24840040 */ addiu $a0, $a0, 0x40 -.L802A9908: -/* 42ADF8 802A9908 50600001 */ beql $v1, $zero, .L802A9910 -/* 42ADFC 802A990C 24030001 */ addiu $v1, $zero, 1 -.L802A9910: -/* 42AE00 802A9910 18600023 */ blez $v1, .L802A99A0 -/* 42AE04 802A9914 0000302D */ daddu $a2, $zero, $zero -/* 42AE08 802A9918 24070001 */ addiu $a3, $zero, 1 -/* 42AE0C 802A991C 00041080 */ sll $v0, $a0, 2 -/* 42AE10 802A9920 00502821 */ addu $a1, $v0, $s0 -.L802A9924: -/* 42AE14 802A9924 28820040 */ slti $v0, $a0, 0x40 -/* 42AE18 802A9928 14400003 */ bnez $v0, .L802A9938 -/* 42AE1C 802A992C 28C20005 */ slti $v0, $a2, 5 -/* 42AE20 802A9930 24A5FF00 */ addiu $a1, $a1, -0x100 -/* 42AE24 802A9934 2484FFC0 */ addiu $a0, $a0, -0x40 -.L802A9938: -/* 42AE28 802A9938 10400006 */ beqz $v0, .L802A9954 -/* 42AE2C 802A993C 00000000 */ nop -/* 42AE30 802A9940 8CA20330 */ lw $v0, 0x330($a1) -/* 42AE34 802A9944 30428000 */ andi $v0, $v0, 0x8000 -/* 42AE38 802A9948 10400009 */ beqz $v0, .L802A9970 -/* 42AE3C 802A994C 00000000 */ nop -/* 42AE40 802A9950 A2270060 */ sb $a3, 0x60($s1) -.L802A9954: -/* 42AE44 802A9954 8CA20330 */ lw $v0, 0x330($a1) -/* 42AE48 802A9958 30428000 */ andi $v0, $v0, 0x8000 -/* 42AE4C 802A995C 10400004 */ beqz $v0, .L802A9970 -/* 42AE50 802A9960 00000000 */ nop -/* 42AE54 802A9964 82220060 */ lb $v0, 0x60($s1) -/* 42AE58 802A9968 10400004 */ beqz $v0, .L802A997C -/* 42AE5C 802A996C 00000000 */ nop -.L802A9970: -/* 42AE60 802A9970 8222005E */ lb $v0, 0x5e($s1) -/* 42AE64 802A9974 50400006 */ beql $v0, $zero, .L802A9990 -/* 42AE68 802A9978 24A50004 */ addiu $a1, $a1, 4 -.L802A997C: -/* 42AE6C 802A997C 92020084 */ lbu $v0, 0x84($s0) -/* 42AE70 802A9980 A227005C */ sb $a3, 0x5c($s1) -/* 42AE74 802A9984 24420001 */ addiu $v0, $v0, 1 -/* 42AE78 802A9988 080AA668 */ j .L802A99A0 -/* 42AE7C 802A998C A2020084 */ sb $v0, 0x84($s0) -.L802A9990: -/* 42AE80 802A9990 24C60001 */ addiu $a2, $a2, 1 -/* 42AE84 802A9994 00C3102A */ slt $v0, $a2, $v1 -/* 42AE88 802A9998 1440FFE2 */ bnez $v0, .L802A9924 -/* 42AE8C 802A999C 24840001 */ addiu $a0, $a0, 1 -.L802A99A0: -/* 42AE90 802A99A0 8222005D */ lb $v0, 0x5d($s1) -/* 42AE94 802A99A4 2842FFFC */ slti $v0, $v0, -4 -/* 42AE98 802A99A8 1440001C */ bnez $v0, .L802A9A1C -/* 42AE9C 802A99AC 00000000 */ nop -/* 42AEA0 802A99B0 82220060 */ lb $v0, 0x60($s1) -/* 42AEA4 802A99B4 14400004 */ bnez $v0, .L802A99C8 -/* 42AEA8 802A99B8 00000000 */ nop -/* 42AEAC 802A99BC 8222005C */ lb $v0, 0x5c($s1) -/* 42AEB0 802A99C0 10400016 */ beqz $v0, .L802A9A1C -/* 42AEB4 802A99C4 00000000 */ nop -.L802A99C8: -/* 42AEB8 802A99C8 8222005C */ lb $v0, 0x5c($s1) -/* 42AEBC 802A99CC 8E30001C */ lw $s0, 0x1c($s1) -/* 42AEC0 802A99D0 10400005 */ beqz $v0, .L802A99E8 -/* 42AEC4 802A99D4 0200202D */ daddu $a0, $s0, $zero -/* 42AEC8 802A99D8 3C058029 */ lui $a1, %hi(HudScript_TimingOK) -/* 42AECC 802A99DC 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) -/* 42AED0 802A99E0 080AA67C */ j .L802A99F0 -/* 42AED4 802A99E4 00000000 */ nop -.L802A99E8: -/* 42AED8 802A99E8 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) -/* 42AEDC 802A99EC 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) -.L802A99F0: -/* 42AEE0 802A99F0 0C0511FF */ jal hud_element_set_script -/* 42AEE4 802A99F4 00000000 */ nop -/* 42AEE8 802A99F8 0200202D */ daddu $a0, $s0, $zero -/* 42AEEC 802A99FC 86250056 */ lh $a1, 0x56($s1) -/* 42AEF0 802A9A00 86260058 */ lh $a2, 0x58($s1) -/* 42AEF4 802A9A04 24A5001C */ addiu $a1, $a1, 0x1c -/* 42AEF8 802A9A08 0C051261 */ jal hud_element_set_render_pos -/* 42AEFC 802A9A0C 24C60026 */ addiu $a2, $a2, 0x26 -/* 42AF00 802A9A10 0200202D */ daddu $a0, $s0, $zero -/* 42AF04 802A9A14 0C05128B */ jal hud_element_clear_flags -/* 42AF08 802A9A18 24050002 */ addiu $a1, $zero, 2 -.L802A9A1C: -/* 42AF0C 802A9A1C 8223005D */ lb $v1, 0x5d($s1) -/* 42AF10 802A9A20 2402FFFB */ addiu $v0, $zero, -5 -/* 42AF14 802A9A24 1462001B */ bne $v1, $v0, .L802A9A94 -/* 42AF18 802A9A28 00000000 */ nop -/* 42AF1C 802A9A2C 8222005C */ lb $v0, 0x5c($s1) -/* 42AF20 802A9A30 8E30001C */ lw $s0, 0x1c($s1) -/* 42AF24 802A9A34 10400005 */ beqz $v0, .L802A9A4C -/* 42AF28 802A9A38 0200202D */ daddu $a0, $s0, $zero -/* 42AF2C 802A9A3C 3C058029 */ lui $a1, %hi(HudScript_TimingOK) -/* 42AF30 802A9A40 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) -/* 42AF34 802A9A44 080AA695 */ j .L802A9A54 -/* 42AF38 802A9A48 00000000 */ nop -.L802A9A4C: -/* 42AF3C 802A9A4C 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) -/* 42AF40 802A9A50 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) -.L802A9A54: -/* 42AF44 802A9A54 0C0511FF */ jal hud_element_set_script -/* 42AF48 802A9A58 00000000 */ nop -/* 42AF4C 802A9A5C 0200202D */ daddu $a0, $s0, $zero -/* 42AF50 802A9A60 86250056 */ lh $a1, 0x56($s1) -/* 42AF54 802A9A64 86260058 */ lh $a2, 0x58($s1) -/* 42AF58 802A9A68 24A5001C */ addiu $a1, $a1, 0x1c -/* 42AF5C 802A9A6C 0C051261 */ jal hud_element_set_render_pos -/* 42AF60 802A9A70 24C60026 */ addiu $a2, $a2, 0x26 -/* 42AF64 802A9A74 0200202D */ daddu $a0, $s0, $zero -/* 42AF68 802A9A78 0C05128B */ jal hud_element_clear_flags -/* 42AF6C 802A9A7C 24050002 */ addiu $a1, $zero, 2 -/* 42AF70 802A9A80 8E240004 */ lw $a0, 4($s1) -/* 42AF74 802A9A84 3C058011 */ lui $a1, %hi(HudScript_AButton) -/* 42AF78 802A9A88 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 42AF7C 802A9A8C 0C0511FF */ jal hud_element_set_script -/* 42AF80 802A9A90 00000000 */ nop -.L802A9A94: -/* 42AF84 802A9A94 9222005D */ lbu $v0, 0x5d($s1) -/* 42AF88 802A9A98 86230054 */ lh $v1, 0x54($s1) -/* 42AF8C 802A9A9C 2442FFFF */ addiu $v0, $v0, -1 -/* 42AF90 802A9AA0 A222005D */ sb $v0, 0x5d($s1) -/* 42AF94 802A9AA4 24020002 */ addiu $v0, $zero, 2 -/* 42AF98 802A9AA8 1462000D */ bne $v1, $v0, .L802A9AE0 -/* 42AF9C 802A9AAC 00000000 */ nop -/* 42AFA0 802A9AB0 8E240010 */ lw $a0, 0x10($s1) -/* 42AFA4 802A9AB4 3C058029 */ lui $a1, %hi(HudScript_TimingReady) -/* 42AFA8 802A9AB8 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 42AFAC 802A9ABC 0C0511FF */ jal hud_element_set_script -/* 42AFB0 802A9AC0 00000000 */ nop -/* 42AFB4 802A9AC4 8E240004 */ lw $a0, 4($s1) -/* 42AFB8 802A9AC8 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) -/* 42AFBC 802A9ACC 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42AFC0 802A9AD0 0C0511FF */ jal hud_element_set_script -/* 42AFC4 802A9AD4 00000000 */ nop -/* 42AFC8 802A9AD8 0C05272D */ jal sfx_play_sound -/* 42AFCC 802A9ADC 24040234 */ addiu $a0, $zero, 0x234 -.L802A9AE0: -/* 42AFD0 802A9AE0 96220054 */ lhu $v0, 0x54($s1) -/* 42AFD4 802A9AE4 2442FFFF */ addiu $v0, $v0, -1 -/* 42AFD8 802A9AE8 A6220054 */ sh $v0, 0x54($s1) -/* 42AFDC 802A9AEC 00021400 */ sll $v0, $v0, 0x10 -/* 42AFE0 802A9AF0 14400143 */ bnez $v0, L802AA000_42B4F0 -/* 42AFE4 802A9AF4 24020014 */ addiu $v0, $zero, 0x14 -/* 42AFE8 802A9AF8 A6220054 */ sh $v0, 0x54($s1) -/* 42AFEC 802A9AFC 080AA75A */ j .L802A9D68 -/* 42AFF0 802A9B00 2402000D */ addiu $v0, $zero, 0xd -dlabel L802A9B04_42AFF4 -/* 42AFF4 802A9B04 0C093EB1 */ jal btl_set_popup_duration -/* 42AFF8 802A9B08 24040063 */ addiu $a0, $zero, 0x63 -/* 42AFFC 802A9B0C 82220060 */ lb $v0, 0x60($s1) -/* 42B000 802A9B10 1440003D */ bnez $v0, .L802A9C08 -/* 42B004 802A9B14 00000000 */ nop -/* 42B008 802A9B18 8222005C */ lb $v0, 0x5c($s1) -/* 42B00C 802A9B1C 1440003A */ bnez $v0, .L802A9C08 -/* 42B010 802A9B20 00000000 */ nop -/* 42B014 802A9B24 8222005D */ lb $v0, 0x5d($s1) -/* 42B018 802A9B28 2842FFFB */ slti $v0, $v0, -5 -/* 42B01C 802A9B2C 14400036 */ bnez $v0, .L802A9C08 -/* 42B020 802A9B30 00000000 */ nop -/* 42B024 802A9B34 86220050 */ lh $v0, 0x50($s1) -/* 42B028 802A9B38 8E030434 */ lw $v1, 0x434($s0) -/* 42B02C 802A9B3C 000210C0 */ sll $v0, $v0, 3 -/* 42B030 802A9B40 00431021 */ addu $v0, $v0, $v1 -/* 42B034 802A9B44 8C430000 */ lw $v1, ($v0) -/* 42B038 802A9B48 8C420004 */ lw $v0, 4($v0) -/* 42B03C 802A9B4C 00621821 */ addu $v1, $v1, $v0 -/* 42B040 802A9B50 24630004 */ addiu $v1, $v1, 4 -/* 42B044 802A9B54 28620006 */ slti $v0, $v1, 6 -/* 42B048 802A9B58 54400001 */ bnel $v0, $zero, .L802A9B60 -/* 42B04C 802A9B5C 24030006 */ addiu $v1, $zero, 6 -.L802A9B60: -/* 42B050 802A9B60 82040431 */ lb $a0, 0x431($s0) -/* 42B054 802A9B64 00832023 */ subu $a0, $a0, $v1 -/* 42B058 802A9B68 04820001 */ bltzl $a0, .L802A9B70 -/* 42B05C 802A9B6C 24840040 */ addiu $a0, $a0, 0x40 -.L802A9B70: -/* 42B060 802A9B70 50600001 */ beql $v1, $zero, .L802A9B78 -/* 42B064 802A9B74 24030001 */ addiu $v1, $zero, 1 -.L802A9B78: -/* 42B068 802A9B78 18600023 */ blez $v1, .L802A9C08 -/* 42B06C 802A9B7C 0000302D */ daddu $a2, $zero, $zero -/* 42B070 802A9B80 24070001 */ addiu $a3, $zero, 1 -/* 42B074 802A9B84 00041080 */ sll $v0, $a0, 2 -/* 42B078 802A9B88 00502821 */ addu $a1, $v0, $s0 -.L802A9B8C: -/* 42B07C 802A9B8C 28820040 */ slti $v0, $a0, 0x40 -/* 42B080 802A9B90 14400003 */ bnez $v0, .L802A9BA0 -/* 42B084 802A9B94 28C20005 */ slti $v0, $a2, 5 -/* 42B088 802A9B98 24A5FF00 */ addiu $a1, $a1, -0x100 -/* 42B08C 802A9B9C 2484FFC0 */ addiu $a0, $a0, -0x40 -.L802A9BA0: -/* 42B090 802A9BA0 10400006 */ beqz $v0, .L802A9BBC -/* 42B094 802A9BA4 00000000 */ nop -/* 42B098 802A9BA8 8CA20330 */ lw $v0, 0x330($a1) -/* 42B09C 802A9BAC 30428000 */ andi $v0, $v0, 0x8000 -/* 42B0A0 802A9BB0 10400009 */ beqz $v0, .L802A9BD8 -/* 42B0A4 802A9BB4 00000000 */ nop -/* 42B0A8 802A9BB8 A2270060 */ sb $a3, 0x60($s1) -.L802A9BBC: -/* 42B0AC 802A9BBC 8CA20330 */ lw $v0, 0x330($a1) -/* 42B0B0 802A9BC0 30428000 */ andi $v0, $v0, 0x8000 -/* 42B0B4 802A9BC4 10400004 */ beqz $v0, .L802A9BD8 -/* 42B0B8 802A9BC8 00000000 */ nop -/* 42B0BC 802A9BCC 82220060 */ lb $v0, 0x60($s1) -/* 42B0C0 802A9BD0 10400004 */ beqz $v0, .L802A9BE4 -/* 42B0C4 802A9BD4 00000000 */ nop -.L802A9BD8: -/* 42B0C8 802A9BD8 8222005E */ lb $v0, 0x5e($s1) -/* 42B0CC 802A9BDC 50400006 */ beql $v0, $zero, .L802A9BF8 -/* 42B0D0 802A9BE0 24A50004 */ addiu $a1, $a1, 4 -.L802A9BE4: -/* 42B0D4 802A9BE4 92020084 */ lbu $v0, 0x84($s0) -/* 42B0D8 802A9BE8 A227005C */ sb $a3, 0x5c($s1) -/* 42B0DC 802A9BEC 24420001 */ addiu $v0, $v0, 1 -/* 42B0E0 802A9BF0 080AA702 */ j .L802A9C08 -/* 42B0E4 802A9BF4 A2020084 */ sb $v0, 0x84($s0) -.L802A9BF8: -/* 42B0E8 802A9BF8 24C60001 */ addiu $a2, $a2, 1 -/* 42B0EC 802A9BFC 00C3102A */ slt $v0, $a2, $v1 -/* 42B0F0 802A9C00 1440FFE2 */ bnez $v0, .L802A9B8C -/* 42B0F4 802A9C04 24840001 */ addiu $a0, $a0, 1 -.L802A9C08: -/* 42B0F8 802A9C08 8222005D */ lb $v0, 0x5d($s1) -/* 42B0FC 802A9C0C 2842FFFC */ slti $v0, $v0, -4 -/* 42B100 802A9C10 1440001C */ bnez $v0, .L802A9C84 -/* 42B104 802A9C14 00000000 */ nop -/* 42B108 802A9C18 82220060 */ lb $v0, 0x60($s1) -/* 42B10C 802A9C1C 14400004 */ bnez $v0, .L802A9C30 -/* 42B110 802A9C20 00000000 */ nop -/* 42B114 802A9C24 8222005C */ lb $v0, 0x5c($s1) -/* 42B118 802A9C28 10400016 */ beqz $v0, .L802A9C84 -/* 42B11C 802A9C2C 00000000 */ nop -.L802A9C30: -/* 42B120 802A9C30 8222005C */ lb $v0, 0x5c($s1) -/* 42B124 802A9C34 8E300020 */ lw $s0, 0x20($s1) -/* 42B128 802A9C38 10400005 */ beqz $v0, .L802A9C50 -/* 42B12C 802A9C3C 0200202D */ daddu $a0, $s0, $zero -/* 42B130 802A9C40 3C058029 */ lui $a1, %hi(HudScript_TimingOK) -/* 42B134 802A9C44 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) -/* 42B138 802A9C48 080AA716 */ j .L802A9C58 -/* 42B13C 802A9C4C 00000000 */ nop -.L802A9C50: -/* 42B140 802A9C50 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) -/* 42B144 802A9C54 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) -.L802A9C58: -/* 42B148 802A9C58 0C0511FF */ jal hud_element_set_script -/* 42B14C 802A9C5C 00000000 */ nop -/* 42B150 802A9C60 0200202D */ daddu $a0, $s0, $zero -/* 42B154 802A9C64 86250056 */ lh $a1, 0x56($s1) -/* 42B158 802A9C68 86260058 */ lh $a2, 0x58($s1) -/* 42B15C 802A9C6C 24A50030 */ addiu $a1, $a1, 0x30 -/* 42B160 802A9C70 0C051261 */ jal hud_element_set_render_pos -/* 42B164 802A9C74 24C60026 */ addiu $a2, $a2, 0x26 -/* 42B168 802A9C78 0200202D */ daddu $a0, $s0, $zero -/* 42B16C 802A9C7C 0C05128B */ jal hud_element_clear_flags -/* 42B170 802A9C80 24050002 */ addiu $a1, $zero, 2 -.L802A9C84: -/* 42B174 802A9C84 8223005D */ lb $v1, 0x5d($s1) -/* 42B178 802A9C88 2402FFFB */ addiu $v0, $zero, -5 -/* 42B17C 802A9C8C 1462001B */ bne $v1, $v0, .L802A9CFC -/* 42B180 802A9C90 00000000 */ nop -/* 42B184 802A9C94 8222005C */ lb $v0, 0x5c($s1) -/* 42B188 802A9C98 8E300020 */ lw $s0, 0x20($s1) -/* 42B18C 802A9C9C 10400005 */ beqz $v0, .L802A9CB4 -/* 42B190 802A9CA0 0200202D */ daddu $a0, $s0, $zero -/* 42B194 802A9CA4 3C058029 */ lui $a1, %hi(HudScript_TimingOK) -/* 42B198 802A9CA8 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) -/* 42B19C 802A9CAC 080AA72F */ j .L802A9CBC -/* 42B1A0 802A9CB0 00000000 */ nop -.L802A9CB4: -/* 42B1A4 802A9CB4 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) -/* 42B1A8 802A9CB8 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) -.L802A9CBC: -/* 42B1AC 802A9CBC 0C0511FF */ jal hud_element_set_script -/* 42B1B0 802A9CC0 00000000 */ nop -/* 42B1B4 802A9CC4 0200202D */ daddu $a0, $s0, $zero -/* 42B1B8 802A9CC8 86250056 */ lh $a1, 0x56($s1) -/* 42B1BC 802A9CCC 86260058 */ lh $a2, 0x58($s1) -/* 42B1C0 802A9CD0 24A50030 */ addiu $a1, $a1, 0x30 -/* 42B1C4 802A9CD4 0C051261 */ jal hud_element_set_render_pos -/* 42B1C8 802A9CD8 24C60026 */ addiu $a2, $a2, 0x26 -/* 42B1CC 802A9CDC 0200202D */ daddu $a0, $s0, $zero -/* 42B1D0 802A9CE0 0C05128B */ jal hud_element_clear_flags -/* 42B1D4 802A9CE4 24050002 */ addiu $a1, $zero, 2 -/* 42B1D8 802A9CE8 8E240004 */ lw $a0, 4($s1) -/* 42B1DC 802A9CEC 3C058011 */ lui $a1, %hi(HudScript_AButton) -/* 42B1E0 802A9CF0 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 42B1E4 802A9CF4 0C0511FF */ jal hud_element_set_script -/* 42B1E8 802A9CF8 00000000 */ nop -.L802A9CFC: -/* 42B1EC 802A9CFC 9222005D */ lbu $v0, 0x5d($s1) -/* 42B1F0 802A9D00 86230054 */ lh $v1, 0x54($s1) -/* 42B1F4 802A9D04 2442FFFF */ addiu $v0, $v0, -1 -/* 42B1F8 802A9D08 A222005D */ sb $v0, 0x5d($s1) -/* 42B1FC 802A9D0C 24020002 */ addiu $v0, $zero, 2 -/* 42B200 802A9D10 1462000D */ bne $v1, $v0, .L802A9D48 -/* 42B204 802A9D14 00000000 */ nop -/* 42B208 802A9D18 8E240014 */ lw $a0, 0x14($s1) -/* 42B20C 802A9D1C 3C058029 */ lui $a1, %hi(HudScript_TimingReady) -/* 42B210 802A9D20 24A52788 */ addiu $a1, $a1, %lo(HudScript_TimingReady) -/* 42B214 802A9D24 0C0511FF */ jal hud_element_set_script -/* 42B218 802A9D28 00000000 */ nop -/* 42B21C 802A9D2C 8E240004 */ lw $a0, 4($s1) -/* 42B220 802A9D30 3C058011 */ lui $a1, %hi(HudScript_AButtonDown) -/* 42B224 802A9D34 24A58B54 */ addiu $a1, $a1, %lo(HudScript_AButtonDown) -/* 42B228 802A9D38 0C0511FF */ jal hud_element_set_script -/* 42B22C 802A9D3C 00000000 */ nop -/* 42B230 802A9D40 0C05272D */ jal sfx_play_sound -/* 42B234 802A9D44 24040234 */ addiu $a0, $zero, 0x234 -.L802A9D48: -/* 42B238 802A9D48 96220054 */ lhu $v0, 0x54($s1) -/* 42B23C 802A9D4C 2442FFFF */ addiu $v0, $v0, -1 -/* 42B240 802A9D50 A6220054 */ sh $v0, 0x54($s1) -/* 42B244 802A9D54 00021400 */ sll $v0, $v0, 0x10 -/* 42B248 802A9D58 144000A9 */ bnez $v0, L802AA000_42B4F0 -/* 42B24C 802A9D5C 24020014 */ addiu $v0, $zero, 0x14 -/* 42B250 802A9D60 A6220054 */ sh $v0, 0x54($s1) -/* 42B254 802A9D64 2402000E */ addiu $v0, $zero, 0xe -.L802A9D68: -/* 42B258 802A9D68 A220005D */ sb $zero, 0x5d($s1) -/* 42B25C 802A9D6C A622004C */ sh $v0, 0x4c($s1) -/* 42B260 802A9D70 A220005C */ sb $zero, 0x5c($s1) -/* 42B264 802A9D74 080AA800 */ j L802AA000_42B4F0 -/* 42B268 802A9D78 A2200060 */ sb $zero, 0x60($s1) -dlabel L802A9D7C_42B26C -/* 42B26C 802A9D7C 0C093EB1 */ jal btl_set_popup_duration -/* 42B270 802A9D80 24040063 */ addiu $a0, $zero, 0x63 -/* 42B274 802A9D84 82220060 */ lb $v0, 0x60($s1) -/* 42B278 802A9D88 1440003D */ bnez $v0, .L802A9E80 -/* 42B27C 802A9D8C 00000000 */ nop -/* 42B280 802A9D90 8222005C */ lb $v0, 0x5c($s1) -/* 42B284 802A9D94 1440003A */ bnez $v0, .L802A9E80 -/* 42B288 802A9D98 00000000 */ nop -/* 42B28C 802A9D9C 8222005D */ lb $v0, 0x5d($s1) -/* 42B290 802A9DA0 2842FFFB */ slti $v0, $v0, -5 -/* 42B294 802A9DA4 14400036 */ bnez $v0, .L802A9E80 -/* 42B298 802A9DA8 00000000 */ nop -/* 42B29C 802A9DAC 86220050 */ lh $v0, 0x50($s1) -/* 42B2A0 802A9DB0 8E030434 */ lw $v1, 0x434($s0) -/* 42B2A4 802A9DB4 000210C0 */ sll $v0, $v0, 3 -/* 42B2A8 802A9DB8 00431021 */ addu $v0, $v0, $v1 -/* 42B2AC 802A9DBC 8C430000 */ lw $v1, ($v0) -/* 42B2B0 802A9DC0 8C420004 */ lw $v0, 4($v0) -/* 42B2B4 802A9DC4 00621821 */ addu $v1, $v1, $v0 -/* 42B2B8 802A9DC8 24630003 */ addiu $v1, $v1, 3 -/* 42B2BC 802A9DCC 28620006 */ slti $v0, $v1, 6 -/* 42B2C0 802A9DD0 54400001 */ bnel $v0, $zero, .L802A9DD8 -/* 42B2C4 802A9DD4 24030006 */ addiu $v1, $zero, 6 -.L802A9DD8: -/* 42B2C8 802A9DD8 82040431 */ lb $a0, 0x431($s0) -/* 42B2CC 802A9DDC 00832023 */ subu $a0, $a0, $v1 -/* 42B2D0 802A9DE0 04820001 */ bltzl $a0, .L802A9DE8 -/* 42B2D4 802A9DE4 24840040 */ addiu $a0, $a0, 0x40 -.L802A9DE8: -/* 42B2D8 802A9DE8 50600001 */ beql $v1, $zero, .L802A9DF0 -/* 42B2DC 802A9DEC 24030001 */ addiu $v1, $zero, 1 -.L802A9DF0: -/* 42B2E0 802A9DF0 18600023 */ blez $v1, .L802A9E80 -/* 42B2E4 802A9DF4 0000302D */ daddu $a2, $zero, $zero -/* 42B2E8 802A9DF8 24070001 */ addiu $a3, $zero, 1 -/* 42B2EC 802A9DFC 00041080 */ sll $v0, $a0, 2 -/* 42B2F0 802A9E00 00502821 */ addu $a1, $v0, $s0 -.L802A9E04: -/* 42B2F4 802A9E04 28820040 */ slti $v0, $a0, 0x40 -/* 42B2F8 802A9E08 14400003 */ bnez $v0, .L802A9E18 -/* 42B2FC 802A9E0C 28C20005 */ slti $v0, $a2, 5 -/* 42B300 802A9E10 24A5FF00 */ addiu $a1, $a1, -0x100 -/* 42B304 802A9E14 2484FFC0 */ addiu $a0, $a0, -0x40 -.L802A9E18: -/* 42B308 802A9E18 10400006 */ beqz $v0, .L802A9E34 -/* 42B30C 802A9E1C 00000000 */ nop -/* 42B310 802A9E20 8CA20330 */ lw $v0, 0x330($a1) -/* 42B314 802A9E24 30428000 */ andi $v0, $v0, 0x8000 -/* 42B318 802A9E28 10400009 */ beqz $v0, .L802A9E50 -/* 42B31C 802A9E2C 00000000 */ nop -/* 42B320 802A9E30 A2270060 */ sb $a3, 0x60($s1) -.L802A9E34: -/* 42B324 802A9E34 8CA20330 */ lw $v0, 0x330($a1) -/* 42B328 802A9E38 30428000 */ andi $v0, $v0, 0x8000 -/* 42B32C 802A9E3C 10400004 */ beqz $v0, .L802A9E50 -/* 42B330 802A9E40 00000000 */ nop -/* 42B334 802A9E44 82220060 */ lb $v0, 0x60($s1) -/* 42B338 802A9E48 10400004 */ beqz $v0, .L802A9E5C -/* 42B33C 802A9E4C 00000000 */ nop -.L802A9E50: -/* 42B340 802A9E50 8222005E */ lb $v0, 0x5e($s1) -/* 42B344 802A9E54 50400006 */ beql $v0, $zero, .L802A9E70 -/* 42B348 802A9E58 24A50004 */ addiu $a1, $a1, 4 -.L802A9E5C: -/* 42B34C 802A9E5C 92020084 */ lbu $v0, 0x84($s0) -/* 42B350 802A9E60 A227005C */ sb $a3, 0x5c($s1) -/* 42B354 802A9E64 24420001 */ addiu $v0, $v0, 1 -/* 42B358 802A9E68 080AA7A0 */ j .L802A9E80 -/* 42B35C 802A9E6C A2020084 */ sb $v0, 0x84($s0) -.L802A9E70: -/* 42B360 802A9E70 24C60001 */ addiu $a2, $a2, 1 -/* 42B364 802A9E74 00C3102A */ slt $v0, $a2, $v1 -/* 42B368 802A9E78 1440FFE2 */ bnez $v0, .L802A9E04 -/* 42B36C 802A9E7C 24840001 */ addiu $a0, $a0, 1 -.L802A9E80: -/* 42B370 802A9E80 8222005D */ lb $v0, 0x5d($s1) -/* 42B374 802A9E84 2842FFFC */ slti $v0, $v0, -4 -/* 42B378 802A9E88 5440001D */ bnel $v0, $zero, .L802A9F00 -/* 42B37C 802A9E8C 2403FFFB */ addiu $v1, $zero, -5 -/* 42B380 802A9E90 82220060 */ lb $v0, 0x60($s1) -/* 42B384 802A9E94 14400004 */ bnez $v0, .L802A9EA8 -/* 42B388 802A9E98 00000000 */ nop -/* 42B38C 802A9E9C 8222005C */ lb $v0, 0x5c($s1) -/* 42B390 802A9EA0 10400017 */ beqz $v0, .L802A9F00 -/* 42B394 802A9EA4 2403FFFB */ addiu $v1, $zero, -5 -.L802A9EA8: -/* 42B398 802A9EA8 8222005C */ lb $v0, 0x5c($s1) -/* 42B39C 802A9EAC 8E300024 */ lw $s0, 0x24($s1) -/* 42B3A0 802A9EB0 10400005 */ beqz $v0, .L802A9EC8 -/* 42B3A4 802A9EB4 0200202D */ daddu $a0, $s0, $zero -/* 42B3A8 802A9EB8 3C058029 */ lui $a1, %hi(HudScript_TimingOK) -/* 42B3AC 802A9EBC 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) -/* 42B3B0 802A9EC0 080AA7B4 */ j .L802A9ED0 -/* 42B3B4 802A9EC4 00000000 */ nop -.L802A9EC8: -/* 42B3B8 802A9EC8 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) -/* 42B3BC 802A9ECC 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) -.L802A9ED0: -/* 42B3C0 802A9ED0 0C0511FF */ jal hud_element_set_script -/* 42B3C4 802A9ED4 00000000 */ nop -/* 42B3C8 802A9ED8 0200202D */ daddu $a0, $s0, $zero -/* 42B3CC 802A9EDC 86250056 */ lh $a1, 0x56($s1) -/* 42B3D0 802A9EE0 86260058 */ lh $a2, 0x58($s1) -/* 42B3D4 802A9EE4 24A50044 */ addiu $a1, $a1, 0x44 -/* 42B3D8 802A9EE8 0C051261 */ jal hud_element_set_render_pos -/* 42B3DC 802A9EEC 24C60026 */ addiu $a2, $a2, 0x26 -/* 42B3E0 802A9EF0 0200202D */ daddu $a0, $s0, $zero -/* 42B3E4 802A9EF4 0C05128B */ jal hud_element_clear_flags -/* 42B3E8 802A9EF8 24050002 */ addiu $a1, $zero, 2 -/* 42B3EC 802A9EFC 2403FFFB */ addiu $v1, $zero, -5 -.L802A9F00: -/* 42B3F0 802A9F00 8222005D */ lb $v0, 0x5d($s1) -/* 42B3F4 802A9F04 9224005D */ lbu $a0, 0x5d($s1) -/* 42B3F8 802A9F08 1443001E */ bne $v0, $v1, .L802A9F84 -/* 42B3FC 802A9F0C 2482FFFF */ addiu $v0, $a0, -1 -/* 42B400 802A9F10 8222005C */ lb $v0, 0x5c($s1) -/* 42B404 802A9F14 8E300024 */ lw $s0, 0x24($s1) -/* 42B408 802A9F18 10400005 */ beqz $v0, .L802A9F30 -/* 42B40C 802A9F1C 0200202D */ daddu $a0, $s0, $zero -/* 42B410 802A9F20 3C058029 */ lui $a1, %hi(HudScript_TimingOK) -/* 42B414 802A9F24 24A52B54 */ addiu $a1, $a1, %lo(HudScript_TimingOK) -/* 42B418 802A9F28 080AA7CE */ j .L802A9F38 -/* 42B41C 802A9F2C 00000000 */ nop -.L802A9F30: -/* 42B420 802A9F30 3C058029 */ lui $a1, %hi(HudScript_TimingMiss) -/* 42B424 802A9F34 24A52B80 */ addiu $a1, $a1, %lo(HudScript_TimingMiss) -.L802A9F38: -/* 42B428 802A9F38 0C0511FF */ jal hud_element_set_script -/* 42B42C 802A9F3C 00000000 */ nop -/* 42B430 802A9F40 0200202D */ daddu $a0, $s0, $zero -/* 42B434 802A9F44 86250056 */ lh $a1, 0x56($s1) -/* 42B438 802A9F48 86260058 */ lh $a2, 0x58($s1) -/* 42B43C 802A9F4C 24A50044 */ addiu $a1, $a1, 0x44 -/* 42B440 802A9F50 0C051261 */ jal hud_element_set_render_pos -/* 42B444 802A9F54 24C60026 */ addiu $a2, $a2, 0x26 -/* 42B448 802A9F58 0200202D */ daddu $a0, $s0, $zero -/* 42B44C 802A9F5C 0C05128B */ jal hud_element_clear_flags -/* 42B450 802A9F60 24050002 */ addiu $a1, $zero, 2 -/* 42B454 802A9F64 8E240004 */ lw $a0, 4($s1) -/* 42B458 802A9F68 3C058011 */ lui $a1, %hi(HudScript_AButton) -/* 42B45C 802A9F6C 24A58B28 */ addiu $a1, $a1, %lo(HudScript_AButton) -/* 42B460 802A9F70 0C0511FF */ jal hud_element_set_script -/* 42B464 802A9F74 00000000 */ nop -/* 42B468 802A9F78 24020010 */ addiu $v0, $zero, 0x10 -/* 42B46C 802A9F7C 080AA800 */ j L802AA000_42B4F0 -/* 42B470 802A9F80 A622004C */ sh $v0, 0x4c($s1) -.L802A9F84: -/* 42B474 802A9F84 080AA800 */ j L802AA000_42B4F0 -/* 42B478 802A9F88 A222005D */ sb $v0, 0x5d($s1) -dlabel L802A9F8C_42B47C -/* 42B47C 802A9F8C 82020084 */ lb $v0, 0x84($s0) -/* 42B480 802A9F90 92030084 */ lbu $v1, 0x84($s0) -/* 42B484 802A9F94 54400003 */ bnel $v0, $zero, .L802A9FA4 -/* 42B488 802A9F98 A2030081 */ sb $v1, 0x81($s0) -/* 42B48C 802A9F9C 2402FFFF */ addiu $v0, $zero, -1 -/* 42B490 802A9FA0 A2020081 */ sb $v0, 0x81($s0) -.L802A9FA4: -/* 42B494 802A9FA4 82030081 */ lb $v1, 0x81($s0) -/* 42B498 802A9FA8 24020001 */ addiu $v0, $zero, 1 -/* 42B49C 802A9FAC A2020086 */ sb $v0, 0x86($s0) -/* 42B4A0 802A9FB0 24020003 */ addiu $v0, $zero, 3 -/* 42B4A4 802A9FB4 14620003 */ bne $v1, $v0, .L802A9FC4 -/* 42B4A8 802A9FB8 00000000 */ nop -/* 42B4AC 802A9FBC 0C09A458 */ jal func_80269160 -/* 42B4B0 802A9FC0 00000000 */ nop -.L802A9FC4: -/* 42B4B4 802A9FC4 0C093EB1 */ jal btl_set_popup_duration -/* 42B4B8 802A9FC8 0000202D */ daddu $a0, $zero, $zero -/* 42B4BC 802A9FCC 24020005 */ addiu $v0, $zero, 5 -/* 42B4C0 802A9FD0 A6220054 */ sh $v0, 0x54($s1) -/* 42B4C4 802A9FD4 24020011 */ addiu $v0, $zero, 0x11 -/* 42B4C8 802A9FD8 080AA800 */ j L802AA000_42B4F0 -/* 42B4CC 802A9FDC A622004C */ sh $v0, 0x4c($s1) -dlabel L802A9FE0_42B4D0 -/* 42B4D0 802A9FE0 86220054 */ lh $v0, 0x54($s1) -/* 42B4D4 802A9FE4 96230054 */ lhu $v1, 0x54($s1) -/* 42B4D8 802A9FE8 10400003 */ beqz $v0, .L802A9FF8 -/* 42B4DC 802A9FEC 2462FFFF */ addiu $v0, $v1, -1 -/* 42B4E0 802A9FF0 080AA800 */ j L802AA000_42B4F0 -/* 42B4E4 802A9FF4 A6220054 */ sh $v0, 0x54($s1) -.L802A9FF8: -/* 42B4E8 802A9FF8 0C09A327 */ jal func_80268C9C -/* 42B4EC 802A9FFC 00000000 */ nop -dlabel L802AA000_42B4F0 -/* 42B4F0 802AA000 8FBF0018 */ lw $ra, 0x18($sp) -/* 42B4F4 802AA004 8FB10014 */ lw $s1, 0x14($sp) -/* 42B4F8 802AA008 8FB00010 */ lw $s0, 0x10($sp) -/* 42B4FC 802AA00C 03E00008 */ jr $ra -/* 42B500 802AA010 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s deleted file mode 100644 index d77a3222f1..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_423C70 -/* 423C70 802A9000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 423C74 802A9004 AFB3001C */ sw $s3, 0x1c($sp) -/* 423C78 802A9008 0080982D */ daddu $s3, $a0, $zero -/* 423C7C 802A900C AFB00010 */ sw $s0, 0x10($sp) -/* 423C80 802A9010 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 423C84 802A9014 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 423C88 802A9018 AFBF0024 */ sw $ra, 0x24($sp) -/* 423C8C 802A901C AFB40020 */ sw $s4, 0x20($sp) -/* 423C90 802A9020 AFB20018 */ sw $s2, 0x18($sp) -/* 423C94 802A9024 AFB10014 */ sw $s1, 0x14($sp) -/* 423C98 802A9028 8E72000C */ lw $s2, 0xc($s3) -/* 423C9C 802A902C 24020005 */ addiu $v0, $zero, 5 -/* 423CA0 802A9030 A2020082 */ sb $v0, 0x82($s0) -/* 423CA4 802A9034 3C028029 */ lui $v0, %hi(D_80294240) -/* 423CA8 802A9038 24424240 */ addiu $v0, $v0, %lo(D_80294240) -/* 423CAC 802A903C 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 423CB0 802A9040 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 423CB4 802A9044 AE020434 */ sw $v0, 0x434($s0) -/* 423CB8 802A9048 82020083 */ lb $v0, 0x83($s0) -/* 423CBC 802A904C 14400003 */ bnez $v0, .L802A905C -/* 423CC0 802A9050 0200A02D */ daddu $s4, $s0, $zero -/* 423CC4 802A9054 080AA46F */ j .L802A91BC -/* 423CC8 802A9058 A2000081 */ sb $zero, 0x81($s0) -.L802A905C: -/* 423CCC 802A905C 0C09A216 */ jal func_80268858 -/* 423CD0 802A9060 00000000 */ nop -/* 423CD4 802A9064 8E450000 */ lw $a1, ($s2) -/* 423CD8 802A9068 0C0B1EAF */ jal evt_get_variable -/* 423CDC 802A906C 0260202D */ daddu $a0, $s3, $zero -/* 423CE0 802A9070 24030005 */ addiu $v1, $zero, 5 -/* 423CE4 802A9074 A6220064 */ sh $v0, 0x64($s1) -/* 423CE8 802A9078 00021400 */ sll $v0, $v0, 0x10 -/* 423CEC 802A907C A623004A */ sh $v1, 0x4a($s1) -/* 423CF0 802A9080 A620004C */ sh $zero, 0x4c($s1) -/* 423CF4 802A9084 A2200060 */ sb $zero, 0x60($s1) -/* 423CF8 802A9088 A6200044 */ sh $zero, 0x44($s1) -/* 423CFC 802A908C 14400003 */ bnez $v0, .L802A909C -/* 423D00 802A9090 A6200048 */ sh $zero, 0x48($s1) -/* 423D04 802A9094 080AA429 */ j .L802A90A4 -/* 423D08 802A9098 A2000084 */ sb $zero, 0x84($s0) -.L802A909C: -/* 423D0C 802A909C 24020003 */ addiu $v0, $zero, 3 -/* 423D10 802A90A0 A2820084 */ sb $v0, 0x84($s4) -.L802A90A4: -/* 423D14 802A90A4 3C048011 */ lui $a0, %hi(HudScript_AButton) -/* 423D18 802A90A8 24848B28 */ addiu $a0, $a0, %lo(HudScript_AButton) -/* 423D1C 802A90AC 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 423D20 802A90B0 A6220056 */ sh $v0, 0x56($s1) -/* 423D24 802A90B4 24020050 */ addiu $v0, $zero, 0x50 -/* 423D28 802A90B8 0C050529 */ jal hud_element_create -/* 423D2C 802A90BC A6220058 */ sh $v0, 0x58($s1) -/* 423D30 802A90C0 0040802D */ daddu $s0, $v0, $zero -/* 423D34 802A90C4 0200202D */ daddu $a0, $s0, $zero -/* 423D38 802A90C8 24050082 */ addiu $a1, $zero, 0x82 -/* 423D3C 802A90CC 0C051280 */ jal hud_element_set_flags -/* 423D40 802A90D0 AE300004 */ sw $s0, 4($s1) -/* 423D44 802A90D4 86250056 */ lh $a1, 0x56($s1) -/* 423D48 802A90D8 86260058 */ lh $a2, 0x58($s1) -/* 423D4C 802A90DC 0C051261 */ jal hud_element_set_render_pos -/* 423D50 802A90E0 0200202D */ daddu $a0, $s0, $zero -/* 423D54 802A90E4 0200202D */ daddu $a0, $s0, $zero -/* 423D58 802A90E8 0C051277 */ jal hud_element_set_render_depth -/* 423D5C 802A90EC 0000282D */ daddu $a1, $zero, $zero -/* 423D60 802A90F0 3C048011 */ lui $a0, %hi(HudScript_BlueMeter) -/* 423D64 802A90F4 24848AFC */ addiu $a0, $a0, %lo(HudScript_BlueMeter) -/* 423D68 802A90F8 0C050529 */ jal hud_element_create -/* 423D6C 802A90FC 00000000 */ nop -/* 423D70 802A9100 0040802D */ daddu $s0, $v0, $zero -/* 423D74 802A9104 86250056 */ lh $a1, 0x56($s1) -/* 423D78 802A9108 86260058 */ lh $a2, 0x58($s1) -/* 423D7C 802A910C 0200202D */ daddu $a0, $s0, $zero -/* 423D80 802A9110 AE300008 */ sw $s0, 8($s1) -/* 423D84 802A9114 0C051261 */ jal hud_element_set_render_pos -/* 423D88 802A9118 24C6001C */ addiu $a2, $a2, 0x1c -/* 423D8C 802A911C 0200202D */ daddu $a0, $s0, $zero -/* 423D90 802A9120 0C051277 */ jal hud_element_set_render_depth -/* 423D94 802A9124 0000282D */ daddu $a1, $zero, $zero -/* 423D98 802A9128 0200202D */ daddu $a0, $s0, $zero -/* 423D9C 802A912C 0C051280 */ jal hud_element_set_flags -/* 423DA0 802A9130 24050082 */ addiu $a1, $zero, 0x82 -/* 423DA4 802A9134 3C04802B */ lui $a0, %hi(D_802AA7F0_425460) -/* 423DA8 802A9138 0C050529 */ jal hud_element_create -/* 423DAC 802A913C 2484A7F0 */ addiu $a0, $a0, %lo(D_802AA7F0_425460) -/* 423DB0 802A9140 0040802D */ daddu $s0, $v0, $zero -/* 423DB4 802A9144 86250056 */ lh $a1, 0x56($s1) -/* 423DB8 802A9148 86260058 */ lh $a2, 0x58($s1) -/* 423DBC 802A914C 0200202D */ daddu $a0, $s0, $zero -/* 423DC0 802A9150 AE30000C */ sw $s0, 0xc($s1) -/* 423DC4 802A9154 24A50036 */ addiu $a1, $a1, 0x36 -/* 423DC8 802A9158 0C051261 */ jal hud_element_set_render_pos -/* 423DCC 802A915C 24C6001C */ addiu $a2, $a2, 0x1c -/* 423DD0 802A9160 0200202D */ daddu $a0, $s0, $zero -/* 423DD4 802A9164 0C051277 */ jal hud_element_set_render_depth -/* 423DD8 802A9168 0000282D */ daddu $a1, $zero, $zero -/* 423DDC 802A916C 0200202D */ daddu $a0, $s0, $zero -/* 423DE0 802A9170 0C051280 */ jal hud_element_set_flags -/* 423DE4 802A9174 24050082 */ addiu $a1, $zero, 0x82 -/* 423DE8 802A9178 3C04802B */ lui $a0, %hi(D_802AA818_425488) -/* 423DEC 802A917C 0C050529 */ jal hud_element_create -/* 423DF0 802A9180 2484A818 */ addiu $a0, $a0, %lo(D_802AA818_425488) -/* 423DF4 802A9184 0040802D */ daddu $s0, $v0, $zero -/* 423DF8 802A9188 86250056 */ lh $a1, 0x56($s1) -/* 423DFC 802A918C 86260058 */ lh $a2, 0x58($s1) -/* 423E00 802A9190 0200202D */ daddu $a0, $s0, $zero -/* 423E04 802A9194 AE300010 */ sw $s0, 0x10($s1) -/* 423E08 802A9198 24A5003C */ addiu $a1, $a1, 0x3c -/* 423E0C 802A919C 0C051261 */ jal hud_element_set_render_pos -/* 423E10 802A91A0 24C6001C */ addiu $a2, $a2, 0x1c -/* 423E14 802A91A4 0200202D */ daddu $a0, $s0, $zero -/* 423E18 802A91A8 0C051277 */ jal hud_element_set_render_depth -/* 423E1C 802A91AC 0000282D */ daddu $a1, $zero, $zero -/* 423E20 802A91B0 0200202D */ daddu $a0, $s0, $zero -/* 423E24 802A91B4 0C051280 */ jal hud_element_set_flags -/* 423E28 802A91B8 24050082 */ addiu $a1, $zero, 0x82 -.L802A91BC: -/* 423E2C 802A91BC 24020002 */ addiu $v0, $zero, 2 -/* 423E30 802A91C0 8FBF0024 */ lw $ra, 0x24($sp) -/* 423E34 802A91C4 8FB40020 */ lw $s4, 0x20($sp) -/* 423E38 802A91C8 8FB3001C */ lw $s3, 0x1c($sp) -/* 423E3C 802A91CC 8FB20018 */ lw $s2, 0x18($sp) -/* 423E40 802A91D0 8FB10014 */ lw $s1, 0x14($sp) -/* 423E44 802A91D4 8FB00010 */ lw $s0, 0x10($sp) -/* 423E48 802A91D8 03E00008 */ jr $ra -/* 423E4C 802A91DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s deleted file mode 100644 index b8ff9f7275..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A91E0_423E50 -/* 423E50 802A91E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 423E54 802A91E4 AFB20018 */ sw $s2, 0x18($sp) -/* 423E58 802A91E8 0080902D */ daddu $s2, $a0, $zero -/* 423E5C 802A91EC AFB10014 */ sw $s1, 0x14($sp) -/* 423E60 802A91F0 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 423E64 802A91F4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 423E68 802A91F8 AFB3001C */ sw $s3, 0x1c($sp) -/* 423E6C 802A91FC 3C13800E */ lui $s3, %hi(gBattleStatus) -/* 423E70 802A9200 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) -/* 423E74 802A9204 AFB40020 */ sw $s4, 0x20($sp) -/* 423E78 802A9208 AFBF0024 */ sw $ra, 0x24($sp) -/* 423E7C 802A920C AFB00010 */ sw $s0, 0x10($sp) -/* 423E80 802A9210 82620083 */ lb $v0, 0x83($s3) -/* 423E84 802A9214 8E50000C */ lw $s0, 0xc($s2) -/* 423E88 802A9218 14400004 */ bnez $v0, .L802A922C -/* 423E8C 802A921C 0260A02D */ daddu $s4, $s3, $zero -/* 423E90 802A9220 A2600081 */ sb $zero, 0x81($s3) -/* 423E94 802A9224 080AA4B4 */ j .L802A92D0 -/* 423E98 802A9228 24020002 */ addiu $v0, $zero, 2 -.L802A922C: -/* 423E9C 802A922C 0C09A216 */ jal func_80268858 -/* 423EA0 802A9230 00000000 */ nop -/* 423EA4 802A9234 8E050000 */ lw $a1, ($s0) -/* 423EA8 802A9238 26100004 */ addiu $s0, $s0, 4 -/* 423EAC 802A923C 0C0B1EAF */ jal evt_get_variable -/* 423EB0 802A9240 0240202D */ daddu $a0, $s2, $zero -/* 423EB4 802A9244 A622004E */ sh $v0, 0x4e($s1) -/* 423EB8 802A9248 8E050000 */ lw $a1, ($s0) -/* 423EBC 802A924C 26100004 */ addiu $s0, $s0, 4 -/* 423EC0 802A9250 0C0B1EAF */ jal evt_get_variable -/* 423EC4 802A9254 0240202D */ daddu $a0, $s2, $zero -/* 423EC8 802A9258 A6220052 */ sh $v0, 0x52($s1) -/* 423ECC 802A925C 8E050000 */ lw $a1, ($s0) -/* 423ED0 802A9260 0C0B1EAF */ jal evt_get_variable -/* 423ED4 802A9264 0240202D */ daddu $a0, $s2, $zero -/* 423ED8 802A9268 00022400 */ sll $a0, $v0, 0x10 -/* 423EDC 802A926C 00042403 */ sra $a0, $a0, 0x10 -/* 423EE0 802A9270 0C09A089 */ jal func_80268224 -/* 423EE4 802A9274 A6220050 */ sh $v0, 0x50($s1) -/* 423EE8 802A9278 86230064 */ lh $v1, 0x64($s1) -/* 423EEC 802A927C A6220050 */ sh $v0, 0x50($s1) -/* 423EF0 802A9280 A2200060 */ sb $zero, 0x60($s1) -/* 423EF4 802A9284 A6200044 */ sh $zero, 0x44($s1) -/* 423EF8 802A9288 A6200048 */ sh $zero, 0x48($s1) -/* 423EFC 802A928C A2600081 */ sb $zero, 0x81($s3) -/* 423F00 802A9290 14600003 */ bnez $v1, .L802A92A0 -/* 423F04 802A9294 A2600086 */ sb $zero, 0x86($s3) -/* 423F08 802A9298 080AA4AA */ j .L802A92A8 -/* 423F0C 802A929C A2600084 */ sb $zero, 0x84($s3) -.L802A92A0: -/* 423F10 802A92A0 24020003 */ addiu $v0, $zero, 3 -/* 423F14 802A92A4 A2820084 */ sb $v0, 0x84($s4) -.L802A92A8: -/* 423F18 802A92A8 3C06FFFF */ lui $a2, 0xffff -/* 423F1C 802A92AC 34C67FFF */ ori $a2, $a2, 0x7fff -/* 423F20 802A92B0 24020002 */ addiu $v0, $zero, 2 -/* 423F24 802A92B4 3C05800E */ lui $a1, %hi(gBattleStatus) -/* 423F28 802A92B8 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus) -/* 423F2C 802A92BC 8CA30000 */ lw $v1, ($a1) -/* 423F30 802A92C0 2404000A */ addiu $a0, $zero, 0xa -/* 423F34 802A92C4 A624004C */ sh $a0, 0x4c($s1) -/* 423F38 802A92C8 00661824 */ and $v1, $v1, $a2 -/* 423F3C 802A92CC ACA30000 */ sw $v1, ($a1) -.L802A92D0: -/* 423F40 802A92D0 8FBF0024 */ lw $ra, 0x24($sp) -/* 423F44 802A92D4 8FB40020 */ lw $s4, 0x20($sp) -/* 423F48 802A92D8 8FB3001C */ lw $s3, 0x1c($sp) -/* 423F4C 802A92DC 8FB20018 */ lw $s2, 0x18($sp) -/* 423F50 802A92E0 8FB10014 */ lw $s1, 0x14($sp) -/* 423F54 802A92E4 8FB00010 */ lw $s0, 0x10($sp) -/* 423F58 802A92E8 03E00008 */ jr $ra -/* 423F5C 802A92EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s deleted file mode 100644 index 1756b3431c..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s +++ /dev/null @@ -1,309 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A92F0_423F60 -/* 423F60 802A92F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 423F64 802A92F4 AFB10014 */ sw $s1, 0x14($sp) -/* 423F68 802A92F8 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 423F6C 802A92FC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 423F70 802A9300 AFBF001C */ sw $ra, 0x1c($sp) -/* 423F74 802A9304 AFB20018 */ sw $s2, 0x18($sp) -/* 423F78 802A9308 AFB00010 */ sw $s0, 0x10($sp) -/* 423F7C 802A930C 8623004C */ lh $v1, 0x4c($s1) -/* 423F80 802A9310 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 423F84 802A9314 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 423F88 802A9318 2C62000D */ sltiu $v0, $v1, 0xd -/* 423F8C 802A931C 10400103 */ beqz $v0, L802A972C_42439C -/* 423F90 802A9320 00031080 */ sll $v0, $v1, 2 -/* 423F94 802A9324 3C01802B */ lui $at, %hi(jtbl_802AA8E0_425550) -/* 423F98 802A9328 00220821 */ addu $at, $at, $v0 -/* 423F9C 802A932C 8C22A8E0 */ lw $v0, %lo(jtbl_802AA8E0_425550)($at) -/* 423FA0 802A9330 00400008 */ jr $v0 -/* 423FA4 802A9334 00000000 */ nop -dlabel L802A9338_423FA8 -/* 423FA8 802A9338 0C093EB1 */ jal btl_set_popup_duration -/* 423FAC 802A933C 24040063 */ addiu $a0, $zero, 0x63 -/* 423FB0 802A9340 82220061 */ lb $v0, 0x61($s1) -/* 423FB4 802A9344 8E300004 */ lw $s0, 4($s1) -/* 423FB8 802A9348 10400004 */ beqz $v0, .L802A935C -/* 423FBC 802A934C 0200202D */ daddu $a0, $s0, $zero -/* 423FC0 802A9350 0C05128B */ jal hud_element_clear_flags -/* 423FC4 802A9354 24050002 */ addiu $a1, $zero, 2 -/* 423FC8 802A9358 0200202D */ daddu $a0, $s0, $zero -.L802A935C: -/* 423FCC 802A935C 0C0513AC */ jal hud_element_set_alpha -/* 423FD0 802A9360 240500FF */ addiu $a1, $zero, 0xff -/* 423FD4 802A9364 8E300008 */ lw $s0, 8($s1) -/* 423FD8 802A9368 240500FF */ addiu $a1, $zero, 0xff -/* 423FDC 802A936C 0C0513AC */ jal hud_element_set_alpha -/* 423FE0 802A9370 0200202D */ daddu $a0, $s0, $zero -/* 423FE4 802A9374 82220061 */ lb $v0, 0x61($s1) -/* 423FE8 802A9378 10400003 */ beqz $v0, .L802A9388 -/* 423FEC 802A937C 0200202D */ daddu $a0, $s0, $zero -/* 423FF0 802A9380 0C05128B */ jal hud_element_clear_flags -/* 423FF4 802A9384 24050002 */ addiu $a1, $zero, 2 -.L802A9388: -/* 423FF8 802A9388 8E30000C */ lw $s0, 0xc($s1) -/* 423FFC 802A938C 240500FF */ addiu $a1, $zero, 0xff -/* 424000 802A9390 0C0513AC */ jal hud_element_set_alpha -/* 424004 802A9394 0200202D */ daddu $a0, $s0, $zero -/* 424008 802A9398 82220061 */ lb $v0, 0x61($s1) -/* 42400C 802A939C 10400003 */ beqz $v0, .L802A93AC -/* 424010 802A93A0 0200202D */ daddu $a0, $s0, $zero -/* 424014 802A93A4 0C05128B */ jal hud_element_clear_flags -/* 424018 802A93A8 24050002 */ addiu $a1, $zero, 2 -.L802A93AC: -/* 42401C 802A93AC 8E300010 */ lw $s0, 0x10($s1) -/* 424020 802A93B0 240500FF */ addiu $a1, $zero, 0xff -/* 424024 802A93B4 0C0513AC */ jal hud_element_set_alpha -/* 424028 802A93B8 0200202D */ daddu $a0, $s0, $zero -/* 42402C 802A93BC 82220061 */ lb $v0, 0x61($s1) -/* 424030 802A93C0 10400003 */ beqz $v0, .L802A93D0 -/* 424034 802A93C4 0200202D */ daddu $a0, $s0, $zero -/* 424038 802A93C8 0C05128B */ jal hud_element_clear_flags -/* 42403C 802A93CC 24050002 */ addiu $a1, $zero, 2 -.L802A93D0: -/* 424040 802A93D0 24020001 */ addiu $v0, $zero, 1 -/* 424044 802A93D4 080AA5CB */ j L802A972C_42439C -/* 424048 802A93D8 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A93DC_42404C -/* 42404C 802A93DC 0C093EB1 */ jal btl_set_popup_duration -/* 424050 802A93E0 24040063 */ addiu $a0, $zero, 0x63 -/* 424054 802A93E4 96220056 */ lhu $v0, 0x56($s1) -/* 424058 802A93E8 24420014 */ addiu $v0, $v0, 0x14 -/* 42405C 802A93EC A6220056 */ sh $v0, 0x56($s1) -/* 424060 802A93F0 00021400 */ sll $v0, $v0, 0x10 -/* 424064 802A93F4 00021403 */ sra $v0, $v0, 0x10 -/* 424068 802A93F8 28420033 */ slti $v0, $v0, 0x33 -/* 42406C 802A93FC 14400002 */ bnez $v0, .L802A9408 -/* 424070 802A9400 24020032 */ addiu $v0, $zero, 0x32 -/* 424074 802A9404 A6220056 */ sh $v0, 0x56($s1) -.L802A9408: -/* 424078 802A9408 8E240004 */ lw $a0, 4($s1) -/* 42407C 802A940C 86250056 */ lh $a1, 0x56($s1) -/* 424080 802A9410 0C051261 */ jal hud_element_set_render_pos -/* 424084 802A9414 86260058 */ lh $a2, 0x58($s1) -/* 424088 802A9418 8E240008 */ lw $a0, 8($s1) -/* 42408C 802A941C 86260058 */ lh $a2, 0x58($s1) -/* 424090 802A9420 86250056 */ lh $a1, 0x56($s1) -/* 424094 802A9424 0C051261 */ jal hud_element_set_render_pos -/* 424098 802A9428 24C6001C */ addiu $a2, $a2, 0x1c -/* 42409C 802A942C 8E24000C */ lw $a0, 0xc($s1) -/* 4240A0 802A9430 86250056 */ lh $a1, 0x56($s1) -/* 4240A4 802A9434 86260058 */ lh $a2, 0x58($s1) -/* 4240A8 802A9438 24A50036 */ addiu $a1, $a1, 0x36 -/* 4240AC 802A943C 0C051261 */ jal hud_element_set_render_pos -/* 4240B0 802A9440 24C60017 */ addiu $a2, $a2, 0x17 -/* 4240B4 802A9444 8E240010 */ lw $a0, 0x10($s1) -/* 4240B8 802A9448 86250056 */ lh $a1, 0x56($s1) -/* 4240BC 802A944C 86260058 */ lh $a2, 0x58($s1) -/* 4240C0 802A9450 24A5003C */ addiu $a1, $a1, 0x3c -/* 4240C4 802A9454 0C051261 */ jal hud_element_set_render_pos -/* 4240C8 802A9458 24C60017 */ addiu $a2, $a2, 0x17 -/* 4240CC 802A945C 080AA5CB */ j L802A972C_42439C -/* 4240D0 802A9460 00000000 */ nop -dlabel L802A9464_4240D4 -/* 4240D4 802A9464 0C093EB1 */ jal btl_set_popup_duration -/* 4240D8 802A9468 24040063 */ addiu $a0, $zero, 0x63 -/* 4240DC 802A946C 8622004E */ lh $v0, 0x4e($s1) -/* 4240E0 802A9470 9623004E */ lhu $v1, 0x4e($s1) -/* 4240E4 802A9474 10400003 */ beqz $v0, .L802A9484 -/* 4240E8 802A9478 2462FFFF */ addiu $v0, $v1, -1 -/* 4240EC 802A947C 080AA5CB */ j L802A972C_42439C -/* 4240F0 802A9480 A622004E */ sh $v0, 0x4e($s1) -.L802A9484: -/* 4240F4 802A9484 8E240004 */ lw $a0, 4($s1) -/* 4240F8 802A9488 3C058011 */ lui $a1, %hi(HudScript_MashAButton) -/* 4240FC 802A948C 24A58B80 */ addiu $a1, $a1, %lo(HudScript_MashAButton) -/* 424100 802A9490 0C0511FF */ jal hud_element_set_script -/* 424104 802A9494 00000000 */ nop -/* 424108 802A9498 96230052 */ lhu $v1, 0x52($s1) -/* 42410C 802A949C 2402000B */ addiu $v0, $zero, 0xb -/* 424110 802A94A0 A6200044 */ sh $zero, 0x44($s1) -/* 424114 802A94A4 A622004C */ sh $v0, 0x4c($s1) -/* 424118 802A94A8 A6230054 */ sh $v1, 0x54($s1) -dlabel L802A94AC_42411C -/* 42411C 802A94AC 0C093EB1 */ jal btl_set_popup_duration -/* 424120 802A94B0 24040063 */ addiu $a0, $zero, 0x63 -/* 424124 802A94B4 82220080 */ lb $v0, 0x80($s1) -/* 424128 802A94B8 00021040 */ sll $v0, $v0, 1 -/* 42412C 802A94BC 02221021 */ addu $v0, $s1, $v0 -/* 424130 802A94C0 84500074 */ lh $s0, 0x74($v0) -/* 424134 802A94C4 86220044 */ lh $v0, 0x44($s1) -/* 424138 802A94C8 86230064 */ lh $v1, 0x64($s1) -/* 42413C 802A94CC 16000002 */ bnez $s0, .L802A94D8 -/* 424140 802A94D0 0050001A */ div $zero, $v0, $s0 -/* 424144 802A94D4 0007000D */ break 7 -.L802A94D8: -/* 424148 802A94D8 2401FFFF */ addiu $at, $zero, -1 -/* 42414C 802A94DC 16010004 */ bne $s0, $at, .L802A94F0 -/* 424150 802A94E0 3C018000 */ lui $at, 0x8000 -/* 424154 802A94E4 14410002 */ bne $v0, $at, .L802A94F0 -/* 424158 802A94E8 00000000 */ nop -/* 42415C 802A94EC 0006000D */ break 6 -.L802A94F0: -/* 424160 802A94F0 00002012 */ mflo $a0 -/* 424164 802A94F4 1460000C */ bnez $v1, .L802A9528 -/* 424168 802A94F8 3C026666 */ lui $v0, 0x6666 -/* 42416C 802A94FC 34426667 */ ori $v0, $v0, 0x6667 -/* 424170 802A9500 00820018 */ mult $a0, $v0 -/* 424174 802A9504 00041FC3 */ sra $v1, $a0, 0x1f -/* 424178 802A9508 00003810 */ mfhi $a3 -/* 42417C 802A950C 000710C3 */ sra $v0, $a3, 3 -/* 424180 802A9510 00431023 */ subu $v0, $v0, $v1 -/* 424184 802A9514 00021080 */ sll $v0, $v0, 2 -/* 424188 802A9518 3C03802B */ lui $v1, %hi(D_802AA844_4254B4) -/* 42418C 802A951C 00621821 */ addu $v1, $v1, $v0 -/* 424190 802A9520 080AA554 */ j .L802A9550 -/* 424194 802A9524 8C63A844 */ lw $v1, %lo(D_802AA844_4254B4)($v1) -.L802A9528: -/* 424198 802A9528 34426667 */ ori $v0, $v0, 0x6667 -/* 42419C 802A952C 00820018 */ mult $a0, $v0 -/* 4241A0 802A9530 00041FC3 */ sra $v1, $a0, 0x1f -/* 4241A4 802A9534 00003810 */ mfhi $a3 -/* 4241A8 802A9538 00071083 */ sra $v0, $a3, 2 -/* 4241AC 802A953C 00431023 */ subu $v0, $v0, $v1 -/* 4241B0 802A9540 00021080 */ sll $v0, $v0, 2 -/* 4241B4 802A9544 3C03802B */ lui $v1, %hi(D_802AA85C_4254CC) -/* 4241B8 802A9548 00621821 */ addu $v1, $v1, $v0 -/* 4241BC 802A954C 8C63A85C */ lw $v1, %lo(D_802AA85C_4254CC)($v1) -.L802A9550: -/* 4241C0 802A9550 96220044 */ lhu $v0, 0x44($s1) -/* 4241C4 802A9554 00431023 */ subu $v0, $v0, $v1 -/* 4241C8 802A9558 A6220044 */ sh $v0, 0x44($s1) -/* 4241CC 802A955C 00021400 */ sll $v0, $v0, 0x10 -/* 4241D0 802A9560 04420001 */ bltzl $v0, .L802A9568 -/* 4241D4 802A9564 A6200044 */ sh $zero, 0x44($s1) -.L802A9568: -/* 4241D8 802A9568 8622006A */ lh $v0, 0x6a($s1) -/* 4241DC 802A956C 1440001C */ bnez $v0, .L802A95E0 -/* 4241E0 802A9570 00000000 */ nop -/* 4241E4 802A9574 8E420214 */ lw $v0, 0x214($s2) -/* 4241E8 802A9578 30428000 */ andi $v0, $v0, 0x8000 -/* 4241EC 802A957C 1040002F */ beqz $v0, .L802A963C -/* 4241F0 802A9580 00000000 */ nop -/* 4241F4 802A9584 86220064 */ lh $v0, 0x64($s1) -/* 4241F8 802A9588 14400009 */ bnez $v0, .L802A95B0 -/* 4241FC 802A958C 00000000 */ nop -/* 424200 802A9590 86220050 */ lh $v0, 0x50($s1) -/* 424204 802A9594 8E430434 */ lw $v1, 0x434($s2) -/* 424208 802A9598 00021080 */ sll $v0, $v0, 2 -/* 42420C 802A959C 00431021 */ addu $v0, $v0, $v1 -/* 424210 802A95A0 8C430000 */ lw $v1, ($v0) -/* 424214 802A95A4 00031080 */ sll $v0, $v1, 2 -/* 424218 802A95A8 080AA574 */ j .L802A95D0 -/* 42421C 802A95AC 00431821 */ addu $v1, $v0, $v1 -.L802A95B0: -/* 424220 802A95B0 86220050 */ lh $v0, 0x50($s1) -/* 424224 802A95B4 8E430434 */ lw $v1, 0x434($s2) -/* 424228 802A95B8 00021080 */ sll $v0, $v0, 2 -/* 42422C 802A95BC 00431021 */ addu $v0, $v0, $v1 -/* 424230 802A95C0 8C430000 */ lw $v1, ($v0) -/* 424234 802A95C4 00031040 */ sll $v0, $v1, 1 -/* 424238 802A95C8 00431021 */ addu $v0, $v0, $v1 -/* 42423C 802A95CC 00021840 */ sll $v1, $v0, 1 -.L802A95D0: -/* 424240 802A95D0 96220044 */ lhu $v0, 0x44($s1) -/* 424244 802A95D4 00431021 */ addu $v0, $v0, $v1 -/* 424248 802A95D8 080AA58F */ j .L802A963C -/* 42424C 802A95DC A6220044 */ sh $v0, 0x44($s1) -.L802A95E0: -/* 424250 802A95E0 86220050 */ lh $v0, 0x50($s1) -/* 424254 802A95E4 8E430434 */ lw $v1, 0x434($s2) -/* 424258 802A95E8 00021080 */ sll $v0, $v0, 2 -/* 42425C 802A95EC 00431021 */ addu $v0, $v0, $v1 -/* 424260 802A95F0 8C430000 */ lw $v1, ($v0) -/* 424264 802A95F4 04620001 */ bltzl $v1, .L802A95FC -/* 424268 802A95F8 24630003 */ addiu $v1, $v1, 3 -.L802A95FC: -/* 42426C 802A95FC 96220044 */ lhu $v0, 0x44($s1) -/* 424270 802A9600 00031883 */ sra $v1, $v1, 2 -/* 424274 802A9604 00431021 */ addu $v0, $v0, $v1 -/* 424278 802A9608 A6220044 */ sh $v0, 0x44($s1) -/* 42427C 802A960C 86220050 */ lh $v0, 0x50($s1) -/* 424280 802A9610 8E430434 */ lw $v1, 0x434($s2) -/* 424284 802A9614 00021080 */ sll $v0, $v0, 2 -/* 424288 802A9618 00431021 */ addu $v0, $v0, $v1 -/* 42428C 802A961C 8C420000 */ lw $v0, ($v0) -/* 424290 802A9620 04420001 */ bltzl $v0, .L802A9628 -/* 424294 802A9624 24420003 */ addiu $v0, $v0, 3 -.L802A9628: -/* 424298 802A9628 0C00A67F */ jal rand_int -/* 42429C 802A962C 00022083 */ sra $a0, $v0, 2 -/* 4242A0 802A9630 96230044 */ lhu $v1, 0x44($s1) -/* 4242A4 802A9634 00621821 */ addu $v1, $v1, $v0 -/* 4242A8 802A9638 A6230044 */ sh $v1, 0x44($s1) -.L802A963C: -/* 4242AC 802A963C 86230044 */ lh $v1, 0x44($s1) -/* 4242B0 802A9640 00101040 */ sll $v0, $s0, 1 -/* 4242B4 802A9644 00501021 */ addu $v0, $v0, $s0 -/* 4242B8 802A9648 000210C0 */ sll $v0, $v0, 3 -/* 4242BC 802A964C 00501021 */ addu $v0, $v0, $s0 -/* 4242C0 802A9650 00021080 */ sll $v0, $v0, 2 -/* 4242C4 802A9654 0043182A */ slt $v1, $v0, $v1 -/* 4242C8 802A9658 54600001 */ bnel $v1, $zero, .L802A9660 -/* 4242CC 802A965C A6220044 */ sh $v0, 0x44($s1) -.L802A9660: -/* 4242D0 802A9660 86220064 */ lh $v0, 0x64($s1) -/* 4242D4 802A9664 1440000B */ bnez $v0, .L802A9694 -/* 4242D8 802A9668 3C041062 */ lui $a0, 0x1062 -/* 4242DC 802A966C 96230044 */ lhu $v1, 0x44($s1) -/* 4242E0 802A9670 34844DD3 */ ori $a0, $a0, 0x4dd3 -/* 4242E4 802A9674 00031C00 */ sll $v1, $v1, 0x10 -/* 4242E8 802A9678 00031403 */ sra $v0, $v1, 0x10 -/* 4242EC 802A967C 00440018 */ mult $v0, $a0 -/* 4242F0 802A9680 00031FC3 */ sra $v1, $v1, 0x1f -/* 4242F4 802A9684 00003810 */ mfhi $a3 -/* 4242F8 802A9688 000711C3 */ sra $v0, $a3, 7 -/* 4242FC 802A968C 080AA5B3 */ j .L802A96CC -/* 424300 802A9690 00431023 */ subu $v0, $v0, $v1 -.L802A9694: -/* 424304 802A9694 96230044 */ lhu $v1, 0x44($s1) -/* 424308 802A9698 34844DD3 */ ori $a0, $a0, 0x4dd3 -/* 42430C 802A969C 00031C00 */ sll $v1, $v1, 0x10 -/* 424310 802A96A0 00031403 */ sra $v0, $v1, 0x10 -/* 424314 802A96A4 00440018 */ mult $v0, $a0 -/* 424318 802A96A8 00031FC3 */ sra $v1, $v1, 0x1f -/* 42431C 802A96AC 00003810 */ mfhi $a3 -/* 424320 802A96B0 00071183 */ sra $v0, $a3, 6 -/* 424324 802A96B4 00431023 */ subu $v0, $v0, $v1 -/* 424328 802A96B8 00021400 */ sll $v0, $v0, 0x10 -/* 42432C 802A96BC 00021383 */ sra $v0, $v0, 0xe -/* 424330 802A96C0 3C01802B */ lui $at, %hi(D_802AA8B7_425527) -/* 424334 802A96C4 00220821 */ addu $at, $at, $v0 -/* 424338 802A96C8 9022A8B7 */ lbu $v0, %lo(D_802AA8B7_425527)($at) -.L802A96CC: -/* 42433C 802A96CC A2420084 */ sb $v0, 0x84($s2) -/* 424340 802A96D0 86220054 */ lh $v0, 0x54($s1) -/* 424344 802A96D4 96230054 */ lhu $v1, 0x54($s1) -/* 424348 802A96D8 14400010 */ bnez $v0, .L802A971C -/* 42434C 802A96DC 2462FFFF */ addiu $v0, $v1, -1 -/* 424350 802A96E0 0000202D */ daddu $a0, $zero, $zero -/* 424354 802A96E4 92430084 */ lbu $v1, 0x84($s2) -/* 424358 802A96E8 2402007F */ addiu $v0, $zero, 0x7f -/* 42435C 802A96EC A2420086 */ sb $v0, 0x86($s2) -/* 424360 802A96F0 0C093EB1 */ jal btl_set_popup_duration -/* 424364 802A96F4 A2430081 */ sb $v1, 0x81($s2) -/* 424368 802A96F8 24020005 */ addiu $v0, $zero, 5 -/* 42436C 802A96FC A6220054 */ sh $v0, 0x54($s1) -/* 424370 802A9700 2402000C */ addiu $v0, $zero, 0xc -/* 424374 802A9704 080AA5CB */ j L802A972C_42439C -/* 424378 802A9708 A622004C */ sh $v0, 0x4c($s1) -dlabel L802A970C_42437C -/* 42437C 802A970C 86220054 */ lh $v0, 0x54($s1) -/* 424380 802A9710 96230054 */ lhu $v1, 0x54($s1) -/* 424384 802A9714 10400003 */ beqz $v0, .L802A9724 -/* 424388 802A9718 2462FFFF */ addiu $v0, $v1, -1 -.L802A971C: -/* 42438C 802A971C 080AA5CB */ j L802A972C_42439C -/* 424390 802A9720 A6220054 */ sh $v0, 0x54($s1) -.L802A9724: -/* 424394 802A9724 0C09A327 */ jal func_80268C9C -/* 424398 802A9728 00000000 */ nop -dlabel L802A972C_42439C -/* 42439C 802A972C 8FBF001C */ lw $ra, 0x1c($sp) -/* 4243A0 802A9730 8FB20018 */ lw $s2, 0x18($sp) -/* 4243A4 802A9734 8FB10014 */ lw $s1, 0x14($sp) -/* 4243A8 802A9738 8FB00010 */ lw $s0, 0x10($sp) -/* 4243AC 802A973C 03E00008 */ jr $ra -/* 4243B0 802A9740 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s index 33b86f1c2e..d471bb2974 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80218AA4_69FCA4.s @@ -1,6 +1,31 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80234740_6BB940 +.double 0.4 + +dlabel D_80234748_6BB948 +.double 2.4000000953674316 + +dlabel D_80234750_6BB950 +.double 1.600000023841858 + +dlabel D_80234758_6BB958 +.double 1.2000000000000002 + +dlabel D_80234760_6BB960 +.double 0.9600000381469727 + +dlabel D_80234768_6BB968 +.double 0.4 + +dlabel D_80234770_6BB970 +.double 0.6400000095367432, 0.0 + +.section .text + glabel func_80218AA4_69FCA4 /* 69FCA4 80218AA4 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 69FCA8 80218AA8 AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s index df4a2d5dc2..633caa9586 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_80219818_6A0A18.s @@ -1,6 +1,31 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80234780_6BB980 +.double 0.4 + +dlabel D_80234788_6BB988 +.double 2.4000000953674316 + +dlabel D_80234790_6BB990 +.double 1.600000023841858 + +dlabel D_80234798_6BB998 +.double 1.2000000000000002 + +dlabel D_802347A0_6BB9A0 +.double 0.9600000381469727 + +dlabel D_802347A8_6BB9A8 +.double 0.4 + +dlabel D_802347B0_6BB9B0 +.double 0.6400000095367432, 0.0 + +.section .text + glabel func_80219818_6A0A18 /* 6A0A18 80219818 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 6A0A1C 8021981C AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s index ca388d3adb..e2fc0b0940 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021ABD8_6A1DD8.s @@ -1,6 +1,34 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_802347C0_6BB9C0 +.double 0.4 + +dlabel D_802347C8_6BB9C8 +.double 90.0 + +dlabel D_802347D0_6BB9D0 +.double 3.6000001430511475 + +dlabel D_802347D8_6BB9D8 +.double 2.400000035762787 + +dlabel D_802347E0_6BB9E0 +.double 1.8 + +dlabel D_802347E8_6BB9E8 +.double 1.440000057220459 + +dlabel D_802347F0_6BB9F0 +.double 0.6000000000000001 + +dlabel D_802347F8_6BB9F8 +.double 0.9600000143051148 + +.section .text + glabel func_8021ABD8_6A1DD8 /* 6A1DD8 8021ABD8 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 6A1DDC 8021ABDC AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s index ccea1a9751..3fcd8993a2 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/69F320/func_8021B678_6A2878.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80234800_6BBA00 +.double 0.3, 0.0 + +.section .text + glabel func_8021B678_6A2878 /* 6A2878 8021B678 27BDFF88 */ addiu $sp, $sp, -0x78 /* 6A287C 8021B67C AFB5003C */ sw $s5, 0x3c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s index 73b86ca61f..f15751a6d0 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021B9A8_6A2BA8.s @@ -1,6 +1,16 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80234810_6BBA10 +.word 0x0000005A, 0x00000087, 0x000000E1, 0x0000010E, 0x0000013B, 0x00000195 + +dlabel D_80234828_6BBA28 +.double 14.4 + +.section .text + glabel func_8021B9A8_6A2BA8 /* 6A2BA8 8021B9A8 27BDFF78 */ addiu $sp, $sp, -0x88 /* 6A2BAC 8021B9AC AFB10044 */ sw $s1, 0x44($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s index cc2ea0dbcc..c7fe8b795b 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021C520_6A3720.s @@ -1,6 +1,34 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80234830_6BBA30 +.double 0.4 + +dlabel D_80234838_6BBA38 +.double 90.0 + +dlabel D_80234840_6BBA40 +.double 3.6000001430511475 + +dlabel D_80234848_6BBA48 +.double 2.400000035762787 + +dlabel D_80234850_6BBA50 +.double 1.8 + +dlabel D_80234858_6BBA58 +.double 1.440000057220459 + +dlabel D_80234860_6BBA60 +.double 0.6000000000000001 + +dlabel D_80234868_6BBA68 +.double 0.9600000143051148 + +.section .text + glabel func_8021C520_6A3720 /* 6A3720 8021C520 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 6A3724 8021C524 AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s index e9f6e7ef34..9759b0bed8 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021CFC0_6A41C0.s @@ -1,6 +1,13 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80234870_6BBA70 +.double 0.3, 0.0 + +.section .text + glabel func_8021CFC0_6A41C0 /* 6A41C0 8021CFC0 27BDFF88 */ addiu $sp, $sp, -0x78 /* 6A41C4 8021CFC4 AFB5003C */ sw $s5, 0x3c($sp) diff --git a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021D290_6A4490.s b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021D290_6A4490.s index 8dc25c1fc0..67a9e577f6 100644 --- a/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021D290_6A4490.s +++ b/ver/us/asm/nonmatchings/battle/area_kpa2/6A2B50/func_8021D290_6A4490.s @@ -1,6 +1,67 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches +.section .rodata + +dlabel D_80234880_6BBA80 +.word 0x6B70615F, 0x62743031, 0x5F686974, 0x00000000 + +dlabel D_80234890_6BBA90 +.word 0x6B70615F, 0x62743031, 0x5F736861, 0x70650000 + +dlabel D_802348A0_6BBAA0 +.word 0x6B70615F, 0x74657800 + +dlabel D_802348A8_6BBAA8 +.word 0x6B70615F, 0x62670000 + +dlabel D_802348B0_6BBAB0 +.word 0x6B6B6A5F, 0x62743031, 0x5F686974, 0x00000000 + +dlabel D_802348C0_6BBAC0 +.word 0x6B6B6A5F, 0x62743031, 0x5F736861, 0x70650000 + +dlabel D_802348D0_6BBAD0 +.word 0x6B6B6A5F, 0x74657800 + +dlabel D_802348D8_6BBAD8 +.word 0x6B70615F, 0x62670000 + +dlabel D_802348E0_6BBAE0 +.word 0x6B6B6A5F, 0x62743032, 0x5F686974, 0x00000000 + +dlabel D_802348F0_6BBAF0 +.word 0x6B6B6A5F, 0x62743032, 0x5F736861, 0x70650000 + +dlabel D_80234900_6BBB00 +.word 0x6B6B6A5F, 0x74657800 + +dlabel D_80234908_6BBB08 +.word 0x834E8362, 0x83702883, 0x89835883, 0x67836F83, 0x67838B82, 0x52290000 + +dlabel D_80234920_6BBB20 +.word 0x834E8362, 0x83702883, 0x89835883, 0x67836F83, 0x67838B82, 0x51290000 + +dlabel D_80234938_6BBB38 +.word 0x834E8362, 0x83702883, 0x89835883, 0x67836F83, 0x67838B82, 0x50290000 + +dlabel D_80234950_6BBB50 +.word 0x834E8362, 0x83702883, 0x49815B83, 0x76836A83, 0x93834F29, 0x00000000 + +dlabel D_80234968_6BBB68 +.word 0x834E8362, 0x83700000 + +dlabel D_80234970_6BBB70 +.word 0x6B70615F, 0x30330000 + +dlabel D_80234978_6BBB78 +.word 0x6B70615F, 0x30320000 + +dlabel D_80234980_6BBB80 +.word 0x6B70615F, 0x30310000, 0x00000000, 0x00000000 + +.section .text + glabel func_8021D290_6A4490 /* 6A4490 8021D290 8C8400C0 */ lw $a0, 0xc0($a0) /* 6A4494 8021D294 8C83000C */ lw $v1, 0xc($a0) diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s b/ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s deleted file mode 100644 index cec9df181e..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_tik2/608AB0/func_80218058_608B08.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218058_608B08 -/* 608B08 80218058 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 608B0C 8021805C AFB1001C */ sw $s1, 0x1c($sp) -/* 608B10 80218060 0080882D */ daddu $s1, $a0, $zero -/* 608B14 80218064 AFBF0020 */ sw $ra, 0x20($sp) -/* 608B18 80218068 AFB00018 */ sw $s0, 0x18($sp) -/* 608B1C 8021806C F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 608B20 80218070 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 608B24 80218074 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 608B28 80218078 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 608B2C 8021807C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 608B30 80218080 8E30000C */ lw $s0, 0xc($s1) -/* 608B34 80218084 8E050000 */ lw $a1, ($s0) -/* 608B38 80218088 0C0B1EAF */ jal evt_get_variable -/* 608B3C 8021808C 26100004 */ addiu $s0, $s0, 4 -/* 608B40 80218090 8E050000 */ lw $a1, ($s0) -/* 608B44 80218094 26100004 */ addiu $s0, $s0, 4 -/* 608B48 80218098 4482E000 */ mtc1 $v0, $f28 -/* 608B4C 8021809C 00000000 */ nop -/* 608B50 802180A0 4680E720 */ cvt.s.w $f28, $f28 -/* 608B54 802180A4 0C0B1EAF */ jal evt_get_variable -/* 608B58 802180A8 0220202D */ daddu $a0, $s1, $zero -/* 608B5C 802180AC 8E050000 */ lw $a1, ($s0) -/* 608B60 802180B0 26100004 */ addiu $s0, $s0, 4 -/* 608B64 802180B4 4482D000 */ mtc1 $v0, $f26 -/* 608B68 802180B8 00000000 */ nop -/* 608B6C 802180BC 4680D6A0 */ cvt.s.w $f26, $f26 -/* 608B70 802180C0 0C0B1EAF */ jal evt_get_variable -/* 608B74 802180C4 0220202D */ daddu $a0, $s1, $zero -/* 608B78 802180C8 8E050000 */ lw $a1, ($s0) -/* 608B7C 802180CC 26100004 */ addiu $s0, $s0, 4 -/* 608B80 802180D0 0C0B1EAF */ jal evt_get_variable -/* 608B84 802180D4 0220202D */ daddu $a0, $s1, $zero -/* 608B88 802180D8 8E050000 */ lw $a1, ($s0) -/* 608B8C 802180DC 26100004 */ addiu $s0, $s0, 4 -/* 608B90 802180E0 4482A000 */ mtc1 $v0, $f20 -/* 608B94 802180E4 00000000 */ nop -/* 608B98 802180E8 4680A520 */ cvt.s.w $f20, $f20 -/* 608B9C 802180EC 0C0B1EAF */ jal evt_get_variable -/* 608BA0 802180F0 0220202D */ daddu $a0, $s1, $zero -/* 608BA4 802180F4 8E050000 */ lw $a1, ($s0) -/* 608BA8 802180F8 4482B000 */ mtc1 $v0, $f22 -/* 608BAC 802180FC 00000000 */ nop -/* 608BB0 80218100 4680B5A0 */ cvt.s.w $f22, $f22 -/* 608BB4 80218104 0C0B1EAF */ jal evt_get_variable -/* 608BB8 80218108 0220202D */ daddu $a0, $s1, $zero -/* 608BBC 8021810C 3C014220 */ lui $at, 0x4220 -/* 608BC0 80218110 44810000 */ mtc1 $at, $f0 -/* 608BC4 80218114 4482C000 */ mtc1 $v0, $f24 -/* 608BC8 80218118 00000000 */ nop -/* 608BCC 8021811C 4680C620 */ cvt.s.w $f24, $f24 -/* 608BD0 80218120 4600B000 */ add.s $f0, $f22, $f0 -/* 608BD4 80218124 4600E306 */ mov.s $f12, $f28 -/* 608BD8 80218128 4406A000 */ mfc1 $a2, $f20 -/* 608BDC 8021812C 44070000 */ mfc1 $a3, $f0 -/* 608BE0 80218130 0C00A720 */ jal atan2 -/* 608BE4 80218134 4600D386 */ mov.s $f14, $f26 -/* 608BE8 80218138 3C014120 */ lui $at, 0x4120 -/* 608BEC 8021813C 44811000 */ mtc1 $at, $f2 -/* 608BF0 80218140 0000202D */ daddu $a0, $zero, $zero -/* 608BF4 80218144 4602A501 */ sub.s $f20, $f20, $f2 -/* 608BF8 80218148 3C014270 */ lui $at, 0x4270 -/* 608BFC 8021814C 44811000 */ mtc1 $at, $f2 -/* 608C00 80218150 3C014020 */ lui $at, 0x4020 -/* 608C04 80218154 44812000 */ mtc1 $at, $f4 -/* 608C08 80218158 4602B580 */ add.s $f22, $f22, $f2 -/* 608C0C 8021815C 3C0141A0 */ lui $at, 0x41a0 -/* 608C10 80218160 44811000 */ mtc1 $at, $f2 -/* 608C14 80218164 24020028 */ addiu $v0, $zero, 0x28 -/* 608C18 80218168 AFA20014 */ sw $v0, 0x14($sp) -/* 608C1C 8021816C E7A40010 */ swc1 $f4, 0x10($sp) -/* 608C20 80218170 4602C600 */ add.s $f24, $f24, $f2 -/* 608C24 80218174 4405A000 */ mfc1 $a1, $f20 -/* 608C28 80218178 4406B000 */ mfc1 $a2, $f22 -/* 608C2C 8021817C 4407C000 */ mfc1 $a3, $f24 -/* 608C30 80218180 0C01C6C4 */ jal fx_water_fountain -/* 608C34 80218184 46000506 */ mov.s $f20, $f0 -/* 608C38 80218188 8C43000C */ lw $v1, 0xc($v0) -/* 608C3C 8021818C E4740038 */ swc1 $f20, 0x38($v1) -/* 608C40 80218190 8C43000C */ lw $v1, 0xc($v0) -/* 608C44 80218194 24040002 */ addiu $a0, $zero, 2 -/* 608C48 80218198 AC640018 */ sw $a0, 0x18($v1) -/* 608C4C 8021819C 8C43000C */ lw $v1, 0xc($v0) -/* 608C50 802181A0 AC64001C */ sw $a0, 0x1c($v1) -/* 608C54 802181A4 8C43000C */ lw $v1, 0xc($v0) -/* 608C58 802181A8 AC640020 */ sw $a0, 0x20($v1) -/* 608C5C 802181AC 8C43000C */ lw $v1, 0xc($v0) -/* 608C60 802181B0 24040050 */ addiu $a0, $zero, 0x50 -/* 608C64 802181B4 AC640028 */ sw $a0, 0x28($v1) -/* 608C68 802181B8 8C43000C */ lw $v1, 0xc($v0) -/* 608C6C 802181BC AC64002C */ sw $a0, 0x2c($v1) -/* 608C70 802181C0 8C43000C */ lw $v1, 0xc($v0) -/* 608C74 802181C4 AC640030 */ sw $a0, 0x30($v1) -/* 608C78 802181C8 8FBF0020 */ lw $ra, 0x20($sp) -/* 608C7C 802181CC 8FB1001C */ lw $s1, 0x1c($sp) -/* 608C80 802181D0 8FB00018 */ lw $s0, 0x18($sp) -/* 608C84 802181D4 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 608C88 802181D8 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 608C8C 802181DC D7B80038 */ ldc1 $f24, 0x38($sp) -/* 608C90 802181E0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 608C94 802181E4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 608C98 802181E8 24020002 */ addiu $v0, $zero, 2 -/* 608C9C 802181EC 03E00008 */ jr $ra -/* 608CA0 802181F0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 608CA4 802181F4 00000000 */ nop -/* 608CA8 802181F8 00000000 */ nop -/* 608CAC 802181FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s deleted file mode 100644 index e31421faa7..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_802184E4_608F94.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802184E4_608F94 -/* 608F94 802184E4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 608F98 802184E8 AFB1001C */ sw $s1, 0x1c($sp) -/* 608F9C 802184EC 0080882D */ daddu $s1, $a0, $zero -/* 608FA0 802184F0 AFBF0020 */ sw $ra, 0x20($sp) -/* 608FA4 802184F4 AFB00018 */ sw $s0, 0x18($sp) -/* 608FA8 802184F8 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 608FAC 802184FC F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 608FB0 80218500 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 608FB4 80218504 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 608FB8 80218508 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 608FBC 8021850C 8E30000C */ lw $s0, 0xc($s1) -/* 608FC0 80218510 8E050000 */ lw $a1, ($s0) -/* 608FC4 80218514 0C0B1EAF */ jal evt_get_variable -/* 608FC8 80218518 26100004 */ addiu $s0, $s0, 4 -/* 608FCC 8021851C 8E050000 */ lw $a1, ($s0) -/* 608FD0 80218520 26100004 */ addiu $s0, $s0, 4 -/* 608FD4 80218524 4482E000 */ mtc1 $v0, $f28 -/* 608FD8 80218528 00000000 */ nop -/* 608FDC 8021852C 4680E720 */ cvt.s.w $f28, $f28 -/* 608FE0 80218530 0C0B1EAF */ jal evt_get_variable -/* 608FE4 80218534 0220202D */ daddu $a0, $s1, $zero -/* 608FE8 80218538 8E050000 */ lw $a1, ($s0) -/* 608FEC 8021853C 26100004 */ addiu $s0, $s0, 4 -/* 608FF0 80218540 4482D000 */ mtc1 $v0, $f26 -/* 608FF4 80218544 00000000 */ nop -/* 608FF8 80218548 4680D6A0 */ cvt.s.w $f26, $f26 -/* 608FFC 8021854C 0C0B1EAF */ jal evt_get_variable -/* 609000 80218550 0220202D */ daddu $a0, $s1, $zero -/* 609004 80218554 8E050000 */ lw $a1, ($s0) -/* 609008 80218558 26100004 */ addiu $s0, $s0, 4 -/* 60900C 8021855C 0C0B1EAF */ jal evt_get_variable -/* 609010 80218560 0220202D */ daddu $a0, $s1, $zero -/* 609014 80218564 8E050000 */ lw $a1, ($s0) -/* 609018 80218568 26100004 */ addiu $s0, $s0, 4 -/* 60901C 8021856C 4482A000 */ mtc1 $v0, $f20 -/* 609020 80218570 00000000 */ nop -/* 609024 80218574 4680A520 */ cvt.s.w $f20, $f20 -/* 609028 80218578 0C0B1EAF */ jal evt_get_variable -/* 60902C 8021857C 0220202D */ daddu $a0, $s1, $zero -/* 609030 80218580 8E050000 */ lw $a1, ($s0) -/* 609034 80218584 4482B000 */ mtc1 $v0, $f22 -/* 609038 80218588 00000000 */ nop -/* 60903C 8021858C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 609040 80218590 0C0B1EAF */ jal evt_get_variable -/* 609044 80218594 0220202D */ daddu $a0, $s1, $zero -/* 609048 80218598 3C014220 */ lui $at, 0x4220 -/* 60904C 8021859C 44810000 */ mtc1 $at, $f0 -/* 609050 802185A0 4482C000 */ mtc1 $v0, $f24 -/* 609054 802185A4 00000000 */ nop -/* 609058 802185A8 4680C620 */ cvt.s.w $f24, $f24 -/* 60905C 802185AC 4600B000 */ add.s $f0, $f22, $f0 -/* 609060 802185B0 4600E306 */ mov.s $f12, $f28 -/* 609064 802185B4 4406A000 */ mfc1 $a2, $f20 -/* 609068 802185B8 44070000 */ mfc1 $a3, $f0 -/* 60906C 802185BC 0C00A720 */ jal atan2 -/* 609070 802185C0 4600D386 */ mov.s $f14, $f26 -/* 609074 802185C4 3C014120 */ lui $at, 0x4120 -/* 609078 802185C8 44811000 */ mtc1 $at, $f2 -/* 60907C 802185CC 0000202D */ daddu $a0, $zero, $zero -/* 609080 802185D0 4602A501 */ sub.s $f20, $f20, $f2 -/* 609084 802185D4 3C014270 */ lui $at, 0x4270 -/* 609088 802185D8 44811000 */ mtc1 $at, $f2 -/* 60908C 802185DC 3C014020 */ lui $at, 0x4020 -/* 609090 802185E0 44812000 */ mtc1 $at, $f4 -/* 609094 802185E4 4602B580 */ add.s $f22, $f22, $f2 -/* 609098 802185E8 3C0141A0 */ lui $at, 0x41a0 -/* 60909C 802185EC 44811000 */ mtc1 $at, $f2 -/* 6090A0 802185F0 24020028 */ addiu $v0, $zero, 0x28 -/* 6090A4 802185F4 AFA20014 */ sw $v0, 0x14($sp) -/* 6090A8 802185F8 E7A40010 */ swc1 $f4, 0x10($sp) -/* 6090AC 802185FC 4602C600 */ add.s $f24, $f24, $f2 -/* 6090B0 80218600 4405A000 */ mfc1 $a1, $f20 -/* 6090B4 80218604 4406B000 */ mfc1 $a2, $f22 -/* 6090B8 80218608 4407C000 */ mfc1 $a3, $f24 -/* 6090BC 8021860C 0C01C6C4 */ jal fx_water_fountain -/* 6090C0 80218610 46000506 */ mov.s $f20, $f0 -/* 6090C4 80218614 8C43000C */ lw $v1, 0xc($v0) -/* 6090C8 80218618 E4740038 */ swc1 $f20, 0x38($v1) -/* 6090CC 8021861C 8C43000C */ lw $v1, 0xc($v0) -/* 6090D0 80218620 24040002 */ addiu $a0, $zero, 2 -/* 6090D4 80218624 AC640018 */ sw $a0, 0x18($v1) -/* 6090D8 80218628 8C43000C */ lw $v1, 0xc($v0) -/* 6090DC 8021862C AC64001C */ sw $a0, 0x1c($v1) -/* 6090E0 80218630 8C43000C */ lw $v1, 0xc($v0) -/* 6090E4 80218634 AC640020 */ sw $a0, 0x20($v1) -/* 6090E8 80218638 8C43000C */ lw $v1, 0xc($v0) -/* 6090EC 8021863C 24040050 */ addiu $a0, $zero, 0x50 -/* 6090F0 80218640 AC640028 */ sw $a0, 0x28($v1) -/* 6090F4 80218644 8C43000C */ lw $v1, 0xc($v0) -/* 6090F8 80218648 AC64002C */ sw $a0, 0x2c($v1) -/* 6090FC 8021864C 8C43000C */ lw $v1, 0xc($v0) -/* 609100 80218650 AC640030 */ sw $a0, 0x30($v1) -/* 609104 80218654 8FBF0020 */ lw $ra, 0x20($sp) -/* 609108 80218658 8FB1001C */ lw $s1, 0x1c($sp) -/* 60910C 8021865C 8FB00018 */ lw $s0, 0x18($sp) -/* 609110 80218660 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 609114 80218664 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 609118 80218668 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 60911C 8021866C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 609120 80218670 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 609124 80218674 24020002 */ addiu $v0, $zero, 2 -/* 609128 80218678 03E00008 */ jr $ra -/* 60912C 8021867C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s b/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s deleted file mode 100644 index 601e6ba0c2..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_tik2/608CB0/func_80218884_609334.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218884_609334 -/* 609334 80218884 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 609338 80218888 AFB1001C */ sw $s1, 0x1c($sp) -/* 60933C 8021888C 0080882D */ daddu $s1, $a0, $zero -/* 609340 80218890 AFBF0020 */ sw $ra, 0x20($sp) -/* 609344 80218894 AFB00018 */ sw $s0, 0x18($sp) -/* 609348 80218898 F7BC0048 */ sdc1 $f28, 0x48($sp) -/* 60934C 8021889C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 609350 802188A0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 609354 802188A4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 609358 802188A8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 60935C 802188AC 8E30000C */ lw $s0, 0xc($s1) -/* 609360 802188B0 8E050000 */ lw $a1, ($s0) -/* 609364 802188B4 0C0B1EAF */ jal evt_get_variable -/* 609368 802188B8 26100004 */ addiu $s0, $s0, 4 -/* 60936C 802188BC 8E050000 */ lw $a1, ($s0) -/* 609370 802188C0 26100004 */ addiu $s0, $s0, 4 -/* 609374 802188C4 4482E000 */ mtc1 $v0, $f28 -/* 609378 802188C8 00000000 */ nop -/* 60937C 802188CC 4680E720 */ cvt.s.w $f28, $f28 -/* 609380 802188D0 0C0B1EAF */ jal evt_get_variable -/* 609384 802188D4 0220202D */ daddu $a0, $s1, $zero -/* 609388 802188D8 8E050000 */ lw $a1, ($s0) -/* 60938C 802188DC 26100004 */ addiu $s0, $s0, 4 -/* 609390 802188E0 4482D000 */ mtc1 $v0, $f26 -/* 609394 802188E4 00000000 */ nop -/* 609398 802188E8 4680D6A0 */ cvt.s.w $f26, $f26 -/* 60939C 802188EC 0C0B1EAF */ jal evt_get_variable -/* 6093A0 802188F0 0220202D */ daddu $a0, $s1, $zero -/* 6093A4 802188F4 8E050000 */ lw $a1, ($s0) -/* 6093A8 802188F8 26100004 */ addiu $s0, $s0, 4 -/* 6093AC 802188FC 0C0B1EAF */ jal evt_get_variable -/* 6093B0 80218900 0220202D */ daddu $a0, $s1, $zero -/* 6093B4 80218904 8E050000 */ lw $a1, ($s0) -/* 6093B8 80218908 26100004 */ addiu $s0, $s0, 4 -/* 6093BC 8021890C 4482A000 */ mtc1 $v0, $f20 -/* 6093C0 80218910 00000000 */ nop -/* 6093C4 80218914 4680A520 */ cvt.s.w $f20, $f20 -/* 6093C8 80218918 0C0B1EAF */ jal evt_get_variable -/* 6093CC 8021891C 0220202D */ daddu $a0, $s1, $zero -/* 6093D0 80218920 8E050000 */ lw $a1, ($s0) -/* 6093D4 80218924 4482B000 */ mtc1 $v0, $f22 -/* 6093D8 80218928 00000000 */ nop -/* 6093DC 8021892C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 6093E0 80218930 0C0B1EAF */ jal evt_get_variable -/* 6093E4 80218934 0220202D */ daddu $a0, $s1, $zero -/* 6093E8 80218938 3C014220 */ lui $at, 0x4220 -/* 6093EC 8021893C 44810000 */ mtc1 $at, $f0 -/* 6093F0 80218940 4482C000 */ mtc1 $v0, $f24 -/* 6093F4 80218944 00000000 */ nop -/* 6093F8 80218948 4680C620 */ cvt.s.w $f24, $f24 -/* 6093FC 8021894C 4600B000 */ add.s $f0, $f22, $f0 -/* 609400 80218950 4600E306 */ mov.s $f12, $f28 -/* 609404 80218954 4406A000 */ mfc1 $a2, $f20 -/* 609408 80218958 44070000 */ mfc1 $a3, $f0 -/* 60940C 8021895C 0C00A720 */ jal atan2 -/* 609410 80218960 4600D386 */ mov.s $f14, $f26 -/* 609414 80218964 3C014120 */ lui $at, 0x4120 -/* 609418 80218968 44811000 */ mtc1 $at, $f2 -/* 60941C 8021896C 0000202D */ daddu $a0, $zero, $zero -/* 609420 80218970 4602A501 */ sub.s $f20, $f20, $f2 -/* 609424 80218974 3C014270 */ lui $at, 0x4270 -/* 609428 80218978 44811000 */ mtc1 $at, $f2 -/* 60942C 8021897C 3C014020 */ lui $at, 0x4020 -/* 609430 80218980 44812000 */ mtc1 $at, $f4 -/* 609434 80218984 4602B580 */ add.s $f22, $f22, $f2 -/* 609438 80218988 3C0141A0 */ lui $at, 0x41a0 -/* 60943C 8021898C 44811000 */ mtc1 $at, $f2 -/* 609440 80218990 24020028 */ addiu $v0, $zero, 0x28 -/* 609444 80218994 AFA20014 */ sw $v0, 0x14($sp) -/* 609448 80218998 E7A40010 */ swc1 $f4, 0x10($sp) -/* 60944C 8021899C 4602C600 */ add.s $f24, $f24, $f2 -/* 609450 802189A0 4405A000 */ mfc1 $a1, $f20 -/* 609454 802189A4 4406B000 */ mfc1 $a2, $f22 -/* 609458 802189A8 4407C000 */ mfc1 $a3, $f24 -/* 60945C 802189AC 0C01C6C4 */ jal fx_water_fountain -/* 609460 802189B0 46000506 */ mov.s $f20, $f0 -/* 609464 802189B4 8C43000C */ lw $v1, 0xc($v0) -/* 609468 802189B8 E4740038 */ swc1 $f20, 0x38($v1) -/* 60946C 802189BC 8C43000C */ lw $v1, 0xc($v0) -/* 609470 802189C0 24040002 */ addiu $a0, $zero, 2 -/* 609474 802189C4 AC640018 */ sw $a0, 0x18($v1) -/* 609478 802189C8 8C43000C */ lw $v1, 0xc($v0) -/* 60947C 802189CC AC64001C */ sw $a0, 0x1c($v1) -/* 609480 802189D0 8C43000C */ lw $v1, 0xc($v0) -/* 609484 802189D4 AC640020 */ sw $a0, 0x20($v1) -/* 609488 802189D8 8C43000C */ lw $v1, 0xc($v0) -/* 60948C 802189DC 24040050 */ addiu $a0, $zero, 0x50 -/* 609490 802189E0 AC640028 */ sw $a0, 0x28($v1) -/* 609494 802189E4 8C43000C */ lw $v1, 0xc($v0) -/* 609498 802189E8 AC64002C */ sw $a0, 0x2c($v1) -/* 60949C 802189EC 8C43000C */ lw $v1, 0xc($v0) -/* 6094A0 802189F0 AC640030 */ sw $a0, 0x30($v1) -/* 6094A4 802189F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 6094A8 802189F8 8FB1001C */ lw $s1, 0x1c($sp) -/* 6094AC 802189FC 8FB00018 */ lw $s0, 0x18($sp) -/* 6094B0 80218A00 D7BC0048 */ ldc1 $f28, 0x48($sp) -/* 6094B4 80218A04 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 6094B8 80218A08 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 6094BC 80218A0C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 6094C0 80218A10 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 6094C4 80218A14 24020002 */ addiu $v0, $zero, 2 -/* 6094C8 80218A18 03E00008 */ jr $ra -/* 6094CC 80218A1C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s deleted file mode 100644 index 84be3b2c37..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A123C_72C7EC.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel battle_item_mystery_func_802A123C_72C7EC -/* 72C7EC 802A123C 3C03802A */ lui $v1, %hi(D_802A25E4) -/* 72C7F0 802A1240 8C6325E4 */ lw $v1, %lo(D_802A25E4)($v1) -/* 72C7F4 802A1244 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 72C7F8 802A1248 AFBF0064 */ sw $ra, 0x64($sp) -/* 72C7FC 802A124C AFB40060 */ sw $s4, 0x60($sp) -/* 72C800 802A1250 AFB3005C */ sw $s3, 0x5c($sp) -/* 72C804 802A1254 AFB20058 */ sw $s2, 0x58($sp) -/* 72C808 802A1258 AFB10054 */ sw $s1, 0x54($sp) -/* 72C80C 802A125C 28620006 */ slti $v0, $v1, 6 -/* 72C810 802A1260 10400058 */ beqz $v0, .L802A13C4 -/* 72C814 802A1264 AFB00050 */ sw $s0, 0x50($sp) -/* 72C818 802A1268 18600056 */ blez $v1, .L802A13C4 -/* 72C81C 802A126C 24050007 */ addiu $a1, $zero, 7 -/* 72C820 802A1270 0000202D */ daddu $a0, $zero, $zero -/* 72C824 802A1274 2406006A */ addiu $a2, $zero, 0x6a -/* 72C828 802A1278 24020024 */ addiu $v0, $zero, 0x24 -/* 72C82C 802A127C AFA20014 */ sw $v0, 0x14($sp) -/* 72C830 802A1280 AFA20018 */ sw $v0, 0x18($sp) -/* 72C834 802A1284 240200FF */ addiu $v0, $zero, 0xff -/* 72C838 802A1288 AFA2001C */ sw $v0, 0x1c($sp) -/* 72C83C 802A128C 24020140 */ addiu $v0, $zero, 0x140 -/* 72C840 802A1290 AFA20044 */ sw $v0, 0x44($sp) -/* 72C844 802A1294 240200F0 */ addiu $v0, $zero, 0xf0 -/* 72C848 802A1298 24070056 */ addiu $a3, $zero, 0x56 -/* 72C84C 802A129C AFA00010 */ sw $zero, 0x10($sp) -/* 72C850 802A12A0 AFA00020 */ sw $zero, 0x20($sp) -/* 72C854 802A12A4 AFA00024 */ sw $zero, 0x24($sp) -/* 72C858 802A12A8 AFA00028 */ sw $zero, 0x28($sp) -/* 72C85C 802A12AC AFA0002C */ sw $zero, 0x2c($sp) -/* 72C860 802A12B0 AFA00030 */ sw $zero, 0x30($sp) -/* 72C864 802A12B4 AFA00034 */ sw $zero, 0x34($sp) -/* 72C868 802A12B8 AFA00038 */ sw $zero, 0x38($sp) -/* 72C86C 802A12BC AFA0003C */ sw $zero, 0x3c($sp) -/* 72C870 802A12C0 AFA00040 */ sw $zero, 0x40($sp) -/* 72C874 802A12C4 AFA20048 */ sw $v0, 0x48($sp) -/* 72C878 802A12C8 0C03D4B8 */ jal draw_box -/* 72C87C 802A12CC AFA0004C */ sw $zero, 0x4c($sp) -/* 72C880 802A12D0 3C06ED1B */ lui $a2, 0xed1b -/* 72C884 802A12D4 34C60168 */ ori $a2, $a2, 0x168 -/* 72C888 802A12D8 3C050022 */ lui $a1, 0x22 -/* 72C88C 802A12DC 34A5C1D8 */ ori $a1, $a1, 0xc1d8 -/* 72C890 802A12E0 0000882D */ daddu $s1, $zero, $zero -/* 72C894 802A12E4 3C1451EB */ lui $s4, 0x51eb -/* 72C898 802A12E8 3694851F */ ori $s4, $s4, 0x851f -/* 72C89C 802A12EC 0220982D */ daddu $s3, $s1, $zero -/* 72C8A0 802A12F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* 72C8A4 802A12F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* 72C8A8 802A12F8 8C820000 */ lw $v0, ($a0) -/* 72C8AC 802A12FC 3C12802A */ lui $s2, %hi(D_802A25C8) -/* 72C8B0 802A1300 265225C8 */ addiu $s2, $s2, %lo(D_802A25C8) -/* 72C8B4 802A1304 0040182D */ daddu $v1, $v0, $zero -/* 72C8B8 802A1308 24420008 */ addiu $v0, $v0, 8 -/* 72C8BC 802A130C AC820000 */ sw $v0, ($a0) -/* 72C8C0 802A1310 AC660000 */ sw $a2, ($v1) -/* 72C8C4 802A1314 AC650004 */ sw $a1, 4($v1) -.L802A1318: -/* 72C8C8 802A1318 2405007C */ addiu $a1, $zero, 0x7c -/* 72C8CC 802A131C 3C02802A */ lui $v0, %hi(D_802A25EC) -/* 72C8D0 802A1320 8C4225EC */ lw $v0, %lo(D_802A25EC)($v0) -/* 72C8D4 802A1324 8E500000 */ lw $s0, ($s2) -/* 72C8D8 802A1328 00540018 */ mult $v0, $s4 -/* 72C8DC 802A132C 26520004 */ addiu $s2, $s2, 4 -/* 72C8E0 802A1330 26310001 */ addiu $s1, $s1, 1 -/* 72C8E4 802A1334 0200202D */ daddu $a0, $s0, $zero -/* 72C8E8 802A1338 000217C3 */ sra $v0, $v0, 0x1f -/* 72C8EC 802A133C 00004010 */ mfhi $t0 -/* 72C8F0 802A1340 00083143 */ sra $a2, $t0, 5 -/* 72C8F4 802A1344 00C23023 */ subu $a2, $a2, $v0 -/* 72C8F8 802A1348 24C6FF98 */ addiu $a2, $a2, -0x68 -/* 72C8FC 802A134C 0C051261 */ jal hud_element_set_render_pos -/* 72C900 802A1350 02663023 */ subu $a2, $s3, $a2 -/* 72C904 802A1354 0C0511F8 */ jal hud_element_draw_without_clipping -/* 72C908 802A1358 0200202D */ daddu $a0, $s0, $zero -/* 72C90C 802A135C 2A220007 */ slti $v0, $s1, 7 -/* 72C910 802A1360 1440FFED */ bnez $v0, .L802A1318 -/* 72C914 802A1364 2673001A */ addiu $s3, $s3, 0x1a -/* 72C918 802A1368 3C0251EB */ lui $v0, 0x51eb -/* 72C91C 802A136C 3442851F */ ori $v0, $v0, 0x851f -/* 72C920 802A1370 2405007C */ addiu $a1, $zero, 0x7c -/* 72C924 802A1374 00113040 */ sll $a2, $s1, 1 -/* 72C928 802A1378 00D13021 */ addu $a2, $a2, $s1 -/* 72C92C 802A137C 00063080 */ sll $a2, $a2, 2 -/* 72C930 802A1380 3C03802A */ lui $v1, %hi(D_802A25EC) -/* 72C934 802A1384 8C6325EC */ lw $v1, %lo(D_802A25EC)($v1) -/* 72C938 802A1388 00D13021 */ addu $a2, $a2, $s1 -/* 72C93C 802A138C 00620018 */ mult $v1, $v0 -/* 72C940 802A1390 3C10802A */ lui $s0, %hi(D_802A25C8) -/* 72C944 802A1394 8E1025C8 */ lw $s0, %lo(D_802A25C8)($s0) -/* 72C948 802A1398 00063040 */ sll $a2, $a2, 1 -/* 72C94C 802A139C 0200202D */ daddu $a0, $s0, $zero -/* 72C950 802A13A0 00031FC3 */ sra $v1, $v1, 0x1f -/* 72C954 802A13A4 00004010 */ mfhi $t0 -/* 72C958 802A13A8 00081143 */ sra $v0, $t0, 5 -/* 72C95C 802A13AC 00431023 */ subu $v0, $v0, $v1 -/* 72C960 802A13B0 2442FF98 */ addiu $v0, $v0, -0x68 -/* 72C964 802A13B4 0C051261 */ jal hud_element_set_render_pos -/* 72C968 802A13B8 00C23023 */ subu $a2, $a2, $v0 -/* 72C96C 802A13BC 0C0511F8 */ jal hud_element_draw_without_clipping -/* 72C970 802A13C0 0200202D */ daddu $a0, $s0, $zero -.L802A13C4: -/* 72C974 802A13C4 8FBF0064 */ lw $ra, 0x64($sp) -/* 72C978 802A13C8 8FB40060 */ lw $s4, 0x60($sp) -/* 72C97C 802A13CC 8FB3005C */ lw $s3, 0x5c($sp) -/* 72C980 802A13D0 8FB20058 */ lw $s2, 0x58($sp) -/* 72C984 802A13D4 8FB10054 */ lw $s1, 0x54($sp) -/* 72C988 802A13D8 8FB00050 */ lw $s0, 0x50($sp) -/* 72C98C 802A13DC 03E00008 */ jr $ra -/* 72C990 802A13E0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s b/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s deleted file mode 100644 index 3ff92dd526..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/mystery/battle_item_mystery_func_802A13E4_72C994.s +++ /dev/null @@ -1,334 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802A25A0_72DB50 -.word .L802A143C_72C9EC, .L802A1548_72CAF8, .L802A168C_72CC3C, .L802A1710_72CCC0, .L802A17AC_72CD5C, .L802A17CC_72CD7C, 0, 0 - -.section .text - -glabel battle_item_mystery_func_802A13E4_72C994 -/* 72C994 802A13E4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 72C998 802A13E8 0080302D */ daddu $a2, $a0, $zero -/* 72C99C 802A13EC AFB20020 */ sw $s2, 0x20($sp) -/* 72C9A0 802A13F0 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 72C9A4 802A13F4 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 72C9A8 802A13F8 AFBF0028 */ sw $ra, 0x28($sp) -/* 72C9AC 802A13FC AFB30024 */ sw $s3, 0x24($sp) -/* 72C9B0 802A1400 AFB1001C */ sw $s1, 0x1c($sp) -/* 72C9B4 802A1404 10A00003 */ beqz $a1, .L802A1414 -/* 72C9B8 802A1408 AFB00018 */ sw $s0, 0x18($sp) -/* 72C9BC 802A140C 3C01802A */ lui $at, %hi(D_802A25E4) -/* 72C9C0 802A1410 AC2025E4 */ sw $zero, %lo(D_802A25E4)($at) -.L802A1414: -/* 72C9C4 802A1414 3C03802A */ lui $v1, %hi(D_802A25E4) -/* 72C9C8 802A1418 8C6325E4 */ lw $v1, %lo(D_802A25E4)($v1) -/* 72C9CC 802A141C 2C620006 */ sltiu $v0, $v1, 6 -/* 72C9D0 802A1420 10400112 */ beqz $v0, .L802A186C -/* 72C9D4 802A1424 00031080 */ sll $v0, $v1, 2 -/* 72C9D8 802A1428 3C01802A */ lui $at, %hi(jtbl_802A25A0_72DB50) -/* 72C9DC 802A142C 00220821 */ addu $at, $at, $v0 -/* 72C9E0 802A1430 8C2225A0 */ lw $v0, %lo(jtbl_802A25A0_72DB50)($at) -/* 72C9E4 802A1434 00400008 */ jr $v0 -/* 72C9E8 802A1438 00000000 */ nop -.L802A143C_72C9EC: -/* 72C9EC 802A143C 3C05802A */ lui $a1, %hi(battle_item_mystery_func_802A123C_72C7EC) -/* 72C9F0 802A1440 24A5123C */ addiu $a1, $a1, %lo(battle_item_mystery_func_802A123C_72C7EC) -/* 72C9F4 802A1444 0C048C8F */ jal create_generic_entity_frontUI -/* 72C9F8 802A1448 0000202D */ daddu $a0, $zero, $zero -/* 72C9FC 802A144C 3C01802A */ lui $at, %hi(D_802A25F8) -/* 72CA00 802A1450 AC2225F8 */ sw $v0, %lo(D_802A25F8)($at) -/* 72CA04 802A1454 0C00A67F */ jal rand_int -/* 72CA08 802A1458 24044718 */ addiu $a0, $zero, 0x4718 -/* 72CA0C 802A145C 3C01802A */ lui $at, %hi(D_802A25EC) -/* 72CA10 802A1460 AC2225EC */ sw $v0, %lo(D_802A25EC)($at) -/* 72CA14 802A1464 240203E8 */ addiu $v0, $zero, 0x3e8 -/* 72CA18 802A1468 3C10802A */ lui $s0, %hi(D_802A25FC) -/* 72CA1C 802A146C 261025FC */ addiu $s0, $s0, %lo(D_802A25FC) -/* 72CA20 802A1470 3C01802A */ lui $at, %hi(D_802A25F0) -/* 72CA24 802A1474 AC2225F0 */ sw $v0, %lo(D_802A25F0)($at) -/* 72CA28 802A1478 82430432 */ lb $v1, 0x432($s2) -/* 72CA2C 802A147C 3C02802A */ lui $v0, %hi(battle_item_mystery_D_802A227C_72D82C) -/* 72CA30 802A1480 2442227C */ addiu $v0, $v0, %lo(battle_item_mystery_D_802A227C_72D82C) -/* 72CA34 802A1484 18600010 */ blez $v1, .L802A14C8 -/* 72CA38 802A1488 AE020000 */ sw $v0, ($s0) -/* 72CA3C 802A148C 24040001 */ addiu $a0, $zero, 1 -/* 72CA40 802A1490 27A50010 */ addiu $a1, $sp, 0x10 -/* 72CA44 802A1494 0C04DF70 */ jal get_screen_overlay_params -/* 72CA48 802A1498 27A60014 */ addiu $a2, $sp, 0x14 -/* 72CA4C 802A149C C7A20014 */ lwc1 $f2, 0x14($sp) -/* 72CA50 802A14A0 3C014357 */ lui $at, 0x4357 -/* 72CA54 802A14A4 44810000 */ mtc1 $at, $f0 -/* 72CA58 802A14A8 00000000 */ nop -/* 72CA5C 802A14AC 4602003E */ c.le.s $f0, $f2 -/* 72CA60 802A14B0 00000000 */ nop -/* 72CA64 802A14B4 45020005 */ bc1fl .L802A14CC -/* 72CA68 802A14B8 0000802D */ daddu $s0, $zero, $zero -/* 72CA6C 802A14BC 3C02802A */ lui $v0, %hi(battle_item_mystery_D_802A229C_72D84C) -/* 72CA70 802A14C0 2442229C */ addiu $v0, $v0, %lo(battle_item_mystery_D_802A229C_72D84C) -/* 72CA74 802A14C4 AE020000 */ sw $v0, ($s0) -.L802A14C8: -/* 72CA78 802A14C8 0000802D */ daddu $s0, $zero, $zero -.L802A14CC: -/* 72CA7C 802A14CC 3C138009 */ lui $s3, %hi(gItemHudScripts) -/* 72CA80 802A14D0 2673A680 */ addiu $s3, $s3, %lo(gItemHudScripts) -/* 72CA84 802A14D4 3C128008 */ lui $s2, %hi(gItemTable) -/* 72CA88 802A14D8 265278E0 */ addiu $s2, $s2, %lo(gItemTable) -/* 72CA8C 802A14DC 3C11802A */ lui $s1, %hi(D_802A25C8) -/* 72CA90 802A14E0 263125C8 */ addiu $s1, $s1, %lo(D_802A25C8) -.L802A14E4: -/* 72CA94 802A14E4 3C03802A */ lui $v1, %hi(D_802A25FC) -/* 72CA98 802A14E8 8C6325FC */ lw $v1, %lo(D_802A25FC)($v1) -/* 72CA9C 802A14EC 00101080 */ sll $v0, $s0, 2 -/* 72CAA0 802A14F0 00431021 */ addu $v0, $v0, $v1 -/* 72CAA4 802A14F4 8C420000 */ lw $v0, ($v0) -/* 72CAA8 802A14F8 00021140 */ sll $v0, $v0, 5 -/* 72CAAC 802A14FC 00521021 */ addu $v0, $v0, $s2 -/* 72CAB0 802A1500 84420004 */ lh $v0, 4($v0) -/* 72CAB4 802A1504 000210C0 */ sll $v0, $v0, 3 -/* 72CAB8 802A1508 00531021 */ addu $v0, $v0, $s3 -/* 72CABC 802A150C 8C440000 */ lw $a0, ($v0) -/* 72CAC0 802A1510 0C050529 */ jal hud_element_create -/* 72CAC4 802A1514 26100001 */ addiu $s0, $s0, 1 -/* 72CAC8 802A1518 0040202D */ daddu $a0, $v0, $zero -/* 72CACC 802A151C 24050080 */ addiu $a1, $zero, 0x80 -/* 72CAD0 802A1520 0C051280 */ jal hud_element_set_flags -/* 72CAD4 802A1524 AE240000 */ sw $a0, ($s1) -/* 72CAD8 802A1528 2A020007 */ slti $v0, $s0, 7 -/* 72CADC 802A152C 1440FFED */ bnez $v0, .L802A14E4 -/* 72CAE0 802A1530 26310004 */ addiu $s1, $s1, 4 -/* 72CAE4 802A1534 24020001 */ addiu $v0, $zero, 1 -/* 72CAE8 802A1538 3C01802A */ lui $at, %hi(D_802A25E4) -/* 72CAEC 802A153C AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) -/* 72CAF0 802A1540 080A861C */ j .L802A1870 -/* 72CAF4 802A1544 0000102D */ daddu $v0, $zero, $zero -.L802A1548_72CAF8: -/* 72CAF8 802A1548 3C0351EB */ lui $v1, 0x51eb -/* 72CAFC 802A154C 3C06802A */ lui $a2, %hi(D_802A25EC) -/* 72CB00 802A1550 24C625EC */ addiu $a2, $a2, %lo(D_802A25EC) -/* 72CB04 802A1554 3C07802A */ lui $a3, %hi(D_802A25F0) -/* 72CB08 802A1558 24E725F0 */ addiu $a3, $a3, %lo(D_802A25F0) -/* 72CB0C 802A155C 8CC20000 */ lw $v0, ($a2) -/* 72CB10 802A1560 8CE50000 */ lw $a1, ($a3) -/* 72CB14 802A1564 3463851F */ ori $v1, $v1, 0x851f -/* 72CB18 802A1568 00452021 */ addu $a0, $v0, $a1 -/* 72CB1C 802A156C 00830018 */ mult $a0, $v1 -/* 72CB20 802A1570 00041FC3 */ sra $v1, $a0, 0x1f -/* 72CB24 802A1574 00004010 */ mfhi $t0 -/* 72CB28 802A1578 00081143 */ sra $v0, $t0, 5 -/* 72CB2C 802A157C 00431023 */ subu $v0, $v0, $v1 -/* 72CB30 802A1580 284200B6 */ slti $v0, $v0, 0xb6 -/* 72CB34 802A1584 14400003 */ bnez $v0, .L802A1594 -/* 72CB38 802A1588 ACC40000 */ sw $a0, ($a2) -/* 72CB3C 802A158C 2482B8E8 */ addiu $v0, $a0, -0x4718 -/* 72CB40 802A1590 ACC20000 */ sw $v0, ($a2) -.L802A1594: -/* 72CB44 802A1594 00A0182D */ daddu $v1, $a1, $zero -/* 72CB48 802A1598 28620191 */ slti $v0, $v1, 0x191 -/* 72CB4C 802A159C 14400003 */ bnez $v0, .L802A15AC -/* 72CB50 802A15A0 28620065 */ slti $v0, $v1, 0x65 -/* 72CB54 802A15A4 080A856E */ j .L802A15B8 -/* 72CB58 802A15A8 2462FFF6 */ addiu $v0, $v1, -0xa -.L802A15AC: -/* 72CB5C 802A15AC 14400002 */ bnez $v0, .L802A15B8 -/* 72CB60 802A15B0 24A2FFFF */ addiu $v0, $a1, -1 -/* 72CB64 802A15B4 2462FFFB */ addiu $v0, $v1, -5 -.L802A15B8: -/* 72CB68 802A15B8 ACE20000 */ sw $v0, ($a3) -/* 72CB6C 802A15BC 3C02802A */ lui $v0, %hi(D_802A25F0) -/* 72CB70 802A15C0 8C4225F0 */ lw $v0, %lo(D_802A25F0)($v0) -/* 72CB74 802A15C4 2842000A */ slti $v0, $v0, 0xa -/* 72CB78 802A15C8 104000A8 */ beqz $v0, .L802A186C -/* 72CB7C 802A15CC 3C0351EB */ lui $v1, 0x51eb -/* 72CB80 802A15D0 3C02802A */ lui $v0, %hi(D_802A25EC) -/* 72CB84 802A15D4 8C4225EC */ lw $v0, %lo(D_802A25EC)($v0) -/* 72CB88 802A15D8 3463851F */ ori $v1, $v1, 0x851f -/* 72CB8C 802A15DC 00430018 */ mult $v0, $v1 -/* 72CB90 802A15E0 3C044EC4 */ lui $a0, 0x4ec4 -/* 72CB94 802A15E4 3484EC4F */ ori $a0, $a0, 0xec4f -/* 72CB98 802A15E8 000217C3 */ sra $v0, $v0, 0x1f -/* 72CB9C 802A15EC 00004010 */ mfhi $t0 -/* 72CBA0 802A15F0 00081943 */ sra $v1, $t0, 5 -/* 72CBA4 802A15F4 00621823 */ subu $v1, $v1, $v0 -/* 72CBA8 802A15F8 00640018 */ mult $v1, $a0 -/* 72CBAC 802A15FC 000317C3 */ sra $v0, $v1, 0x1f -/* 72CBB0 802A1600 3C01802A */ lui $at, %hi(D_802A25E8) -/* 72CBB4 802A1604 AC2325E8 */ sw $v1, %lo(D_802A25E8)($at) -/* 72CBB8 802A1608 00004010 */ mfhi $t0 -/* 72CBBC 802A160C 000820C3 */ sra $a0, $t0, 3 -/* 72CBC0 802A1610 00822023 */ subu $a0, $a0, $v0 -/* 72CBC4 802A1614 00041040 */ sll $v0, $a0, 1 -/* 72CBC8 802A1618 00441021 */ addu $v0, $v0, $a0 -/* 72CBCC 802A161C 00021080 */ sll $v0, $v0, 2 -/* 72CBD0 802A1620 00441021 */ addu $v0, $v0, $a0 -/* 72CBD4 802A1624 00021040 */ sll $v0, $v0, 1 -/* 72CBD8 802A1628 00621823 */ subu $v1, $v1, $v0 -/* 72CBDC 802A162C 2863000D */ slti $v1, $v1, 0xd -/* 72CBE0 802A1630 10600008 */ beqz $v1, .L802A1654 -/* 72CBE4 802A1634 00000000 */ nop -/* 72CBE8 802A1638 0C00A67F */ jal rand_int -/* 72CBEC 802A163C 24040064 */ addiu $a0, $zero, 0x64 -/* 72CBF0 802A1640 28420050 */ slti $v0, $v0, 0x50 -/* 72CBF4 802A1644 1440000D */ bnez $v0, .L802A167C -/* 72CBF8 802A1648 24020002 */ addiu $v0, $zero, 2 -/* 72CBFC 802A164C 080A859A */ j .L802A1668 -/* 72CC00 802A1650 24020003 */ addiu $v0, $zero, 3 -.L802A1654: -/* 72CC04 802A1654 0C00A67F */ jal rand_int -/* 72CC08 802A1658 24040064 */ addiu $a0, $zero, 0x64 -/* 72CC0C 802A165C 2842003C */ slti $v0, $v0, 0x3c -/* 72CC10 802A1660 10400005 */ beqz $v0, .L802A1678 -/* 72CC14 802A1664 24020003 */ addiu $v0, $zero, 3 -.L802A1668: -/* 72CC18 802A1668 3C01802A */ lui $at, %hi(D_802A25E4) -/* 72CC1C 802A166C AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) -/* 72CC20 802A1670 080A861C */ j .L802A1870 -/* 72CC24 802A1674 0000102D */ daddu $v0, $zero, $zero -.L802A1678: -/* 72CC28 802A1678 24020002 */ addiu $v0, $zero, 2 -.L802A167C: -/* 72CC2C 802A167C 3C01802A */ lui $at, %hi(D_802A25E4) -/* 72CC30 802A1680 AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) -/* 72CC34 802A1684 080A861C */ j .L802A1870 -/* 72CC38 802A1688 0000102D */ daddu $v0, $zero, $zero -.L802A168C_72CC3C: -/* 72CC3C 802A168C 3C024EC4 */ lui $v0, 0x4ec4 -/* 72CC40 802A1690 3C06802A */ lui $a2, %hi(D_802A25E8) -/* 72CC44 802A1694 24C625E8 */ addiu $a2, $a2, %lo(D_802A25E8) -/* 72CC48 802A1698 8CC50000 */ lw $a1, ($a2) -/* 72CC4C 802A169C 3442EC4F */ ori $v0, $v0, 0xec4f -/* 72CC50 802A16A0 00A20018 */ mult $a1, $v0 -/* 72CC54 802A16A4 000517C3 */ sra $v0, $a1, 0x1f -/* 72CC58 802A16A8 00004010 */ mfhi $t0 -/* 72CC5C 802A16AC 000818C3 */ sra $v1, $t0, 3 -/* 72CC60 802A16B0 00622023 */ subu $a0, $v1, $v0 -/* 72CC64 802A16B4 00041040 */ sll $v0, $a0, 1 -/* 72CC68 802A16B8 00441021 */ addu $v0, $v0, $a0 -/* 72CC6C 802A16BC 00021080 */ sll $v0, $v0, 2 -/* 72CC70 802A16C0 00441021 */ addu $v0, $v0, $a0 -/* 72CC74 802A16C4 00021040 */ sll $v0, $v0, 1 -/* 72CC78 802A16C8 00A22023 */ subu $a0, $a1, $v0 -/* 72CC7C 802A16CC 24820003 */ addiu $v0, $a0, 3 -/* 72CC80 802A16D0 04420001 */ bltzl $v0, .L802A16D8 -/* 72CC84 802A16D4 24820006 */ addiu $v0, $a0, 6 -.L802A16D8: -/* 72CC88 802A16D8 00022083 */ sra $a0, $v0, 2 -/* 72CC8C 802A16DC 00A41823 */ subu $v1, $a1, $a0 -/* 72CC90 802A16E0 00031040 */ sll $v0, $v1, 1 -/* 72CC94 802A16E4 00431021 */ addu $v0, $v0, $v1 -/* 72CC98 802A16E8 000210C0 */ sll $v0, $v0, 3 -/* 72CC9C 802A16EC 00431021 */ addu $v0, $v0, $v1 -/* 72CCA0 802A16F0 00021080 */ sll $v0, $v0, 2 -/* 72CCA4 802A16F4 ACC30000 */ sw $v1, ($a2) -/* 72CCA8 802A16F8 3C01802A */ lui $at, %hi(D_802A25EC) -/* 72CCAC 802A16FC AC2225EC */ sw $v0, %lo(D_802A25EC)($at) -/* 72CCB0 802A1700 1480005B */ bnez $a0, .L802A1870 -/* 72CCB4 802A1704 0000102D */ daddu $v0, $zero, $zero -/* 72CCB8 802A1708 080A85D7 */ j .L802A175C -/* 72CCBC 802A170C 24020004 */ addiu $v0, $zero, 4 -.L802A1710_72CCC0: -/* 72CCC0 802A1710 3C024EC4 */ lui $v0, 0x4ec4 -/* 72CCC4 802A1714 3C06802A */ lui $a2, %hi(D_802A25E8) -/* 72CCC8 802A1718 24C625E8 */ addiu $a2, $a2, %lo(D_802A25E8) -/* 72CCCC 802A171C 8CC50000 */ lw $a1, ($a2) -/* 72CCD0 802A1720 3442EC4F */ ori $v0, $v0, 0xec4f -/* 72CCD4 802A1724 00A20018 */ mult $a1, $v0 -/* 72CCD8 802A1728 000517C3 */ sra $v0, $a1, 0x1f -/* 72CCDC 802A172C 00004010 */ mfhi $t0 -/* 72CCE0 802A1730 000818C3 */ sra $v1, $t0, 3 -/* 72CCE4 802A1734 00621823 */ subu $v1, $v1, $v0 -/* 72CCE8 802A1738 00031040 */ sll $v0, $v1, 1 -/* 72CCEC 802A173C 00431021 */ addu $v0, $v0, $v1 -/* 72CCF0 802A1740 00021080 */ sll $v0, $v0, 2 -/* 72CCF4 802A1744 00431021 */ addu $v0, $v0, $v1 -/* 72CCF8 802A1748 00021040 */ sll $v0, $v0, 1 -/* 72CCFC 802A174C 00A21823 */ subu $v1, $a1, $v0 -/* 72CD00 802A1750 14600006 */ bnez $v1, .L802A176C -/* 72CD04 802A1754 2402001A */ addiu $v0, $zero, 0x1a -/* 72CD08 802A1758 24020004 */ addiu $v0, $zero, 4 -.L802A175C: -/* 72CD0C 802A175C 3C01802A */ lui $at, %hi(D_802A25E4) -/* 72CD10 802A1760 AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) -/* 72CD14 802A1764 080A861C */ j .L802A1870 -/* 72CD18 802A1768 0000102D */ daddu $v0, $zero, $zero -.L802A176C: -/* 72CD1C 802A176C 00432023 */ subu $a0, $v0, $v1 -/* 72CD20 802A1770 24820003 */ addiu $v0, $a0, 3 -/* 72CD24 802A1774 04420001 */ bltzl $v0, .L802A177C -/* 72CD28 802A1778 24820006 */ addiu $v0, $a0, 6 -.L802A177C: -/* 72CD2C 802A177C 00022083 */ sra $a0, $v0, 2 -/* 72CD30 802A1780 00A41821 */ addu $v1, $a1, $a0 -/* 72CD34 802A1784 00031040 */ sll $v0, $v1, 1 -/* 72CD38 802A1788 00431021 */ addu $v0, $v0, $v1 -/* 72CD3C 802A178C 000210C0 */ sll $v0, $v0, 3 -/* 72CD40 802A1790 00431021 */ addu $v0, $v0, $v1 -/* 72CD44 802A1794 00021080 */ sll $v0, $v0, 2 -/* 72CD48 802A1798 ACC30000 */ sw $v1, ($a2) -/* 72CD4C 802A179C 3C01802A */ lui $at, %hi(D_802A25EC) -/* 72CD50 802A17A0 AC2225EC */ sw $v0, %lo(D_802A25EC)($at) -/* 72CD54 802A17A4 080A861C */ j .L802A1870 -/* 72CD58 802A17A8 0000102D */ daddu $v0, $zero, $zero -.L802A17AC_72CD5C: -/* 72CD5C 802A17AC 24020014 */ addiu $v0, $zero, 0x14 -/* 72CD60 802A17B0 3C01802A */ lui $at, %hi(D_802A25F4) -/* 72CD64 802A17B4 AC2225F4 */ sw $v0, %lo(D_802A25F4)($at) -/* 72CD68 802A17B8 24020005 */ addiu $v0, $zero, 5 -/* 72CD6C 802A17BC 3C01802A */ lui $at, %hi(D_802A25E4) -/* 72CD70 802A17C0 AC2225E4 */ sw $v0, %lo(D_802A25E4)($at) -/* 72CD74 802A17C4 080A861C */ j .L802A1870 -/* 72CD78 802A17C8 0000102D */ daddu $v0, $zero, $zero -.L802A17CC_72CD7C: -/* 72CD7C 802A17CC 3C03802A */ lui $v1, %hi(D_802A25F4) -/* 72CD80 802A17D0 246325F4 */ addiu $v1, $v1, %lo(D_802A25F4) -/* 72CD84 802A17D4 8C620000 */ lw $v0, ($v1) -/* 72CD88 802A17D8 10400003 */ beqz $v0, .L802A17E8 -/* 72CD8C 802A17DC 2442FFFF */ addiu $v0, $v0, -1 -/* 72CD90 802A17E0 080A861B */ j .L802A186C -/* 72CD94 802A17E4 AC620000 */ sw $v0, ($v1) -.L802A17E8: -/* 72CD98 802A17E8 3C034EC4 */ lui $v1, 0x4ec4 -/* 72CD9C 802A17EC 3C02802A */ lui $v0, %hi(D_802A25E8) -/* 72CDA0 802A17F0 8C4225E8 */ lw $v0, %lo(D_802A25E8)($v0) -/* 72CDA4 802A17F4 3463EC4F */ ori $v1, $v1, 0xec4f -/* 72CDA8 802A17F8 00430018 */ mult $v0, $v1 -/* 72CDAC 802A17FC 3C11802A */ lui $s1, %hi(D_802A25C8) -/* 72CDB0 802A1800 263125C8 */ addiu $s1, $s1, %lo(D_802A25C8) -/* 72CDB4 802A1804 3C04802A */ lui $a0, %hi(D_802A25F8) -/* 72CDB8 802A1808 8C8425F8 */ lw $a0, %lo(D_802A25F8)($a0) -/* 72CDBC 802A180C 000217C3 */ sra $v0, $v0, 0x1f -/* 72CDC0 802A1810 00004010 */ mfhi $t0 -/* 72CDC4 802A1814 000818C3 */ sra $v1, $t0, 3 -/* 72CDC8 802A1818 00628023 */ subu $s0, $v1, $v0 -/* 72CDCC 802A181C 3C03802A */ lui $v1, %hi(D_802A25FC) -/* 72CDD0 802A1820 8C6325FC */ lw $v1, %lo(D_802A25FC)($v1) -/* 72CDD4 802A1824 00101080 */ sll $v0, $s0, 2 -/* 72CDD8 802A1828 00431021 */ addu $v0, $v0, $v1 -/* 72CDDC 802A182C 94420002 */ lhu $v0, 2($v0) -/* 72CDE0 802A1830 0000802D */ daddu $s0, $zero, $zero -/* 72CDE4 802A1834 A642017A */ sh $v0, 0x17a($s2) -/* 72CDE8 802A1838 00021400 */ sll $v0, $v0, 0x10 -/* 72CDEC 802A183C 00021403 */ sra $v0, $v0, 0x10 -/* 72CDF0 802A1840 0C048D70 */ jal free_generic_entity -/* 72CDF4 802A1844 ACC20084 */ sw $v0, 0x84($a2) -.L802A1848: -/* 72CDF8 802A1848 8E240000 */ lw $a0, ($s1) -/* 72CDFC 802A184C 26310004 */ addiu $s1, $s1, 4 -/* 72CE00 802A1850 0C05123D */ jal hud_element_free -/* 72CE04 802A1854 26100001 */ addiu $s0, $s0, 1 -/* 72CE08 802A1858 2A020007 */ slti $v0, $s0, 7 -/* 72CE0C 802A185C 1440FFFA */ bnez $v0, .L802A1848 -/* 72CE10 802A1860 24020002 */ addiu $v0, $zero, 2 -/* 72CE14 802A1864 080A861C */ j .L802A1870 -/* 72CE18 802A1868 00000000 */ nop -.L802A186C: -/* 72CE1C 802A186C 0000102D */ daddu $v0, $zero, $zero -.L802A1870: -/* 72CE20 802A1870 8FBF0028 */ lw $ra, 0x28($sp) -/* 72CE24 802A1874 8FB30024 */ lw $s3, 0x24($sp) -/* 72CE28 802A1878 8FB20020 */ lw $s2, 0x20($sp) -/* 72CE2C 802A187C 8FB1001C */ lw $s1, 0x1c($sp) -/* 72CE30 802A1880 8FB00018 */ lw $s0, 0x18($sp) -/* 72CE34 802A1884 03E00008 */ jr $ra -/* 72CE38 802A1888 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s b/ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s deleted file mode 100644 index 1089bbb0c7..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/shooting_star/battle_item_shooting_star_func_802A123C_71D9AC.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel battle_item_shooting_star_func_802A123C_71D9AC -/* 71D9AC 802A123C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 71D9B0 802A1240 AFB00020 */ sw $s0, 0x20($sp) -/* 71D9B4 802A1244 0080802D */ daddu $s0, $a0, $zero -/* 71D9B8 802A1248 AFBF002C */ sw $ra, 0x2c($sp) -/* 71D9BC 802A124C AFB20028 */ sw $s2, 0x28($sp) -/* 71D9C0 802A1250 AFB10024 */ sw $s1, 0x24($sp) -/* 71D9C4 802A1254 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 71D9C8 802A1258 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 71D9CC 802A125C 0C00A67F */ jal rand_int -/* 71D9D0 802A1260 240400C8 */ addiu $a0, $zero, 0xc8 -/* 71D9D4 802A1264 24040028 */ addiu $a0, $zero, 0x28 -/* 71D9D8 802A1268 0C00A67F */ jal rand_int -/* 71D9DC 802A126C 24510064 */ addiu $s1, $v0, 0x64 -/* 71D9E0 802A1270 241200C8 */ addiu $s2, $zero, 0xc8 -/* 71D9E4 802A1274 8E030084 */ lw $v1, 0x84($s0) -/* 71D9E8 802A1278 30630003 */ andi $v1, $v1, 3 -/* 71D9EC 802A127C 10600013 */ beqz $v1, .L802A12CC -/* 71D9F0 802A1280 0040802D */ daddu $s0, $v0, $zero -/* 71D9F4 802A1284 0C00A67F */ jal rand_int -/* 71D9F8 802A1288 24040064 */ addiu $a0, $zero, 0x64 -/* 71D9FC 802A128C 00521021 */ addu $v0, $v0, $s2 -/* 71DA00 802A1290 02221023 */ subu $v0, $s1, $v0 -/* 71DA04 802A1294 4482B000 */ mtc1 $v0, $f22 -/* 71DA08 802A1298 00000000 */ nop -/* 71DA0C 802A129C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 71DA10 802A12A0 0C00A67F */ jal rand_int -/* 71DA14 802A12A4 24040064 */ addiu $a0, $zero, 0x64 -/* 71DA18 802A12A8 2442FFCE */ addiu $v0, $v0, -0x32 -/* 71DA1C 802A12AC 02021023 */ subu $v0, $s0, $v0 -/* 71DA20 802A12B0 4482A000 */ mtc1 $v0, $f20 -/* 71DA24 802A12B4 00000000 */ nop -/* 71DA28 802A12B8 4680A520 */ cvt.s.w $f20, $f20 -/* 71DA2C 802A12BC 0C00A67F */ jal rand_int -/* 71DA30 802A12C0 2404000A */ addiu $a0, $zero, 0xa -/* 71DA34 802A12C4 080A84C4 */ j .L802A1310 -/* 71DA38 802A12C8 24040002 */ addiu $a0, $zero, 2 -.L802A12CC: -/* 71DA3C 802A12CC 0C00A67F */ jal rand_int -/* 71DA40 802A12D0 24040064 */ addiu $a0, $zero, 0x64 -/* 71DA44 802A12D4 244200C8 */ addiu $v0, $v0, 0xc8 -/* 71DA48 802A12D8 02221023 */ subu $v0, $s1, $v0 -/* 71DA4C 802A12DC 4482B000 */ mtc1 $v0, $f22 -/* 71DA50 802A12E0 00000000 */ nop -/* 71DA54 802A12E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 71DA58 802A12E8 0C00A67F */ jal rand_int -/* 71DA5C 802A12EC 24040064 */ addiu $a0, $zero, 0x64 -/* 71DA60 802A12F0 2442FFCE */ addiu $v0, $v0, -0x32 -/* 71DA64 802A12F4 02021023 */ subu $v0, $s0, $v0 -/* 71DA68 802A12F8 4482A000 */ mtc1 $v0, $f20 -/* 71DA6C 802A12FC 00000000 */ nop -/* 71DA70 802A1300 4680A520 */ cvt.s.w $f20, $f20 -/* 71DA74 802A1304 0C00A67F */ jal rand_int -/* 71DA78 802A1308 2404000A */ addiu $a0, $zero, 0xa -/* 71DA7C 802A130C 24040003 */ addiu $a0, $zero, 3 -.L802A1310: -/* 71DA80 802A1310 44911000 */ mtc1 $s1, $f2 -/* 71DA84 802A1314 00000000 */ nop -/* 71DA88 802A1318 468010A0 */ cvt.s.w $f2, $f2 -/* 71DA8C 802A131C 44051000 */ mfc1 $a1, $f2 -/* 71DA90 802A1320 44921000 */ mtc1 $s2, $f2 -/* 71DA94 802A1324 00000000 */ nop -/* 71DA98 802A1328 468010A0 */ cvt.s.w $f2, $f2 -/* 71DA9C 802A132C 44061000 */ mfc1 $a2, $f2 -/* 71DAA0 802A1330 44901000 */ mtc1 $s0, $f2 -/* 71DAA4 802A1334 00000000 */ nop -/* 71DAA8 802A1338 468010A0 */ cvt.s.w $f2, $f2 -/* 71DAAC 802A133C 24420007 */ addiu $v0, $v0, 7 -/* 71DAB0 802A1340 44071000 */ mfc1 $a3, $f2 -/* 71DAB4 802A1344 44820000 */ mtc1 $v0, $f0 -/* 71DAB8 802A1348 00000000 */ nop -/* 71DABC 802A134C 46800020 */ cvt.s.w $f0, $f0 -/* 71DAC0 802A1350 E7B60010 */ swc1 $f22, 0x10($sp) -/* 71DAC4 802A1354 AFA00014 */ sw $zero, 0x14($sp) -/* 71DAC8 802A1358 E7B40018 */ swc1 $f20, 0x18($sp) -/* 71DACC 802A135C 0C01BF8C */ jal fx_star -/* 71DAD0 802A1360 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 71DAD4 802A1364 8FBF002C */ lw $ra, 0x2c($sp) -/* 71DAD8 802A1368 8FB20028 */ lw $s2, 0x28($sp) -/* 71DADC 802A136C 8FB10024 */ lw $s1, 0x24($sp) -/* 71DAE0 802A1370 8FB00020 */ lw $s0, 0x20($sp) -/* 71DAE4 802A1374 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 71DAE8 802A1378 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 71DAEC 802A137C 24020002 */ addiu $v0, $zero, 2 -/* 71DAF0 802A1380 03E00008 */ jr $ra -/* 71DAF4 802A1384 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s b/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s deleted file mode 100644 index d3de0b8158..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A123C_73153C.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel battle_item_strange_cake_func_802A123C_73153C -/* 73153C 802A123C 3C03802A */ lui $v1, %hi(D_802A2DEC) -/* 731540 802A1240 8C632DEC */ lw $v1, %lo(D_802A2DEC)($v1) -/* 731544 802A1244 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 731548 802A1248 AFBF0064 */ sw $ra, 0x64($sp) -/* 73154C 802A124C AFB40060 */ sw $s4, 0x60($sp) -/* 731550 802A1250 AFB3005C */ sw $s3, 0x5c($sp) -/* 731554 802A1254 AFB20058 */ sw $s2, 0x58($sp) -/* 731558 802A1258 AFB10054 */ sw $s1, 0x54($sp) -/* 73155C 802A125C 28620006 */ slti $v0, $v1, 6 -/* 731560 802A1260 10400058 */ beqz $v0, .L802A13C4 -/* 731564 802A1264 AFB00050 */ sw $s0, 0x50($sp) -/* 731568 802A1268 18600056 */ blez $v1, .L802A13C4 -/* 73156C 802A126C 24050007 */ addiu $a1, $zero, 7 -/* 731570 802A1270 0000202D */ daddu $a0, $zero, $zero -/* 731574 802A1274 2406006A */ addiu $a2, $zero, 0x6a -/* 731578 802A1278 24020024 */ addiu $v0, $zero, 0x24 -/* 73157C 802A127C AFA20014 */ sw $v0, 0x14($sp) -/* 731580 802A1280 AFA20018 */ sw $v0, 0x18($sp) -/* 731584 802A1284 240200FF */ addiu $v0, $zero, 0xff -/* 731588 802A1288 AFA2001C */ sw $v0, 0x1c($sp) -/* 73158C 802A128C 24020140 */ addiu $v0, $zero, 0x140 -/* 731590 802A1290 AFA20044 */ sw $v0, 0x44($sp) -/* 731594 802A1294 240200F0 */ addiu $v0, $zero, 0xf0 -/* 731598 802A1298 24070056 */ addiu $a3, $zero, 0x56 -/* 73159C 802A129C AFA00010 */ sw $zero, 0x10($sp) -/* 7315A0 802A12A0 AFA00020 */ sw $zero, 0x20($sp) -/* 7315A4 802A12A4 AFA00024 */ sw $zero, 0x24($sp) -/* 7315A8 802A12A8 AFA00028 */ sw $zero, 0x28($sp) -/* 7315AC 802A12AC AFA0002C */ sw $zero, 0x2c($sp) -/* 7315B0 802A12B0 AFA00030 */ sw $zero, 0x30($sp) -/* 7315B4 802A12B4 AFA00034 */ sw $zero, 0x34($sp) -/* 7315B8 802A12B8 AFA00038 */ sw $zero, 0x38($sp) -/* 7315BC 802A12BC AFA0003C */ sw $zero, 0x3c($sp) -/* 7315C0 802A12C0 AFA00040 */ sw $zero, 0x40($sp) -/* 7315C4 802A12C4 AFA20048 */ sw $v0, 0x48($sp) -/* 7315C8 802A12C8 0C03D4B8 */ jal draw_box -/* 7315CC 802A12CC AFA0004C */ sw $zero, 0x4c($sp) -/* 7315D0 802A12D0 3C06ED1B */ lui $a2, 0xed1b -/* 7315D4 802A12D4 34C60168 */ ori $a2, $a2, 0x168 -/* 7315D8 802A12D8 3C050022 */ lui $a1, 0x22 -/* 7315DC 802A12DC 34A5C1D8 */ ori $a1, $a1, 0xc1d8 -/* 7315E0 802A12E0 0000882D */ daddu $s1, $zero, $zero -/* 7315E4 802A12E4 3C1451EB */ lui $s4, 0x51eb -/* 7315E8 802A12E8 3694851F */ ori $s4, $s4, 0x851f -/* 7315EC 802A12EC 0220982D */ daddu $s3, $s1, $zero -/* 7315F0 802A12F0 3C04800A */ lui $a0, %hi(gMasterGfxPos) -/* 7315F4 802A12F4 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) -/* 7315F8 802A12F8 8C820000 */ lw $v0, ($a0) -/* 7315FC 802A12FC 3C12802A */ lui $s2, %hi(D_802A2DD8) -/* 731600 802A1300 26522DD8 */ addiu $s2, $s2, %lo(D_802A2DD8) -/* 731604 802A1304 0040182D */ daddu $v1, $v0, $zero -/* 731608 802A1308 24420008 */ addiu $v0, $v0, 8 -/* 73160C 802A130C AC820000 */ sw $v0, ($a0) -/* 731610 802A1310 AC660000 */ sw $a2, ($v1) -/* 731614 802A1314 AC650004 */ sw $a1, 4($v1) -.L802A1318: -/* 731618 802A1318 2405007C */ addiu $a1, $zero, 0x7c -/* 73161C 802A131C 3C02802A */ lui $v0, %hi(D_802A2DF4) -/* 731620 802A1320 8C422DF4 */ lw $v0, %lo(D_802A2DF4)($v0) -/* 731624 802A1324 8E500000 */ lw $s0, ($s2) -/* 731628 802A1328 00540018 */ mult $v0, $s4 -/* 73162C 802A132C 26520004 */ addiu $s2, $s2, 4 -/* 731630 802A1330 26310001 */ addiu $s1, $s1, 1 -/* 731634 802A1334 0200202D */ daddu $a0, $s0, $zero -/* 731638 802A1338 000217C3 */ sra $v0, $v0, 0x1f -/* 73163C 802A133C 00004010 */ mfhi $t0 -/* 731640 802A1340 00083143 */ sra $a2, $t0, 5 -/* 731644 802A1344 00C23023 */ subu $a2, $a2, $v0 -/* 731648 802A1348 24C6FF98 */ addiu $a2, $a2, -0x68 -/* 73164C 802A134C 0C051261 */ jal hud_element_set_render_pos -/* 731650 802A1350 02663023 */ subu $a2, $s3, $a2 -/* 731654 802A1354 0C0511F8 */ jal hud_element_draw_without_clipping -/* 731658 802A1358 0200202D */ daddu $a0, $s0, $zero -/* 73165C 802A135C 2A220005 */ slti $v0, $s1, 5 -/* 731660 802A1360 1440FFED */ bnez $v0, .L802A1318 -/* 731664 802A1364 2673001A */ addiu $s3, $s3, 0x1a -/* 731668 802A1368 3C0251EB */ lui $v0, 0x51eb -/* 73166C 802A136C 3442851F */ ori $v0, $v0, 0x851f -/* 731670 802A1370 2405007C */ addiu $a1, $zero, 0x7c -/* 731674 802A1374 00113040 */ sll $a2, $s1, 1 -/* 731678 802A1378 00D13021 */ addu $a2, $a2, $s1 -/* 73167C 802A137C 00063080 */ sll $a2, $a2, 2 -/* 731680 802A1380 3C03802A */ lui $v1, %hi(D_802A2DF4) -/* 731684 802A1384 8C632DF4 */ lw $v1, %lo(D_802A2DF4)($v1) -/* 731688 802A1388 00D13021 */ addu $a2, $a2, $s1 -/* 73168C 802A138C 00620018 */ mult $v1, $v0 -/* 731690 802A1390 3C10802A */ lui $s0, %hi(D_802A2DD8) -/* 731694 802A1394 8E102DD8 */ lw $s0, %lo(D_802A2DD8)($s0) -/* 731698 802A1398 00063040 */ sll $a2, $a2, 1 -/* 73169C 802A139C 0200202D */ daddu $a0, $s0, $zero -/* 7316A0 802A13A0 00031FC3 */ sra $v1, $v1, 0x1f -/* 7316A4 802A13A4 00004010 */ mfhi $t0 -/* 7316A8 802A13A8 00081143 */ sra $v0, $t0, 5 -/* 7316AC 802A13AC 00431023 */ subu $v0, $v0, $v1 -/* 7316B0 802A13B0 2442FF98 */ addiu $v0, $v0, -0x68 -/* 7316B4 802A13B4 0C051261 */ jal hud_element_set_render_pos -/* 7316B8 802A13B8 00C23023 */ subu $a2, $a2, $v0 -/* 7316BC 802A13BC 0C0511F8 */ jal hud_element_draw_without_clipping -/* 7316C0 802A13C0 0200202D */ daddu $a0, $s0, $zero -.L802A13C4: -/* 7316C4 802A13C4 8FBF0064 */ lw $ra, 0x64($sp) -/* 7316C8 802A13C8 8FB40060 */ lw $s4, 0x60($sp) -/* 7316CC 802A13CC 8FB3005C */ lw $s3, 0x5c($sp) -/* 7316D0 802A13D0 8FB20058 */ lw $s2, 0x58($sp) -/* 7316D4 802A13D4 8FB10054 */ lw $s1, 0x54($sp) -/* 7316D8 802A13D8 8FB00050 */ lw $s0, 0x50($sp) -/* 7316DC 802A13DC 03E00008 */ jr $ra -/* 7316E0 802A13E0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s b/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s deleted file mode 100644 index c1d7ec4446..0000000000 --- a/ver/us/asm/nonmatchings/battle/item/strange_cake/battle_item_strange_cake_func_802A13E4_7316E4.s +++ /dev/null @@ -1,303 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_802A2DB0_7330B0 -.word .L802A1434_731734, .L802A14D0_7317D0, .L802A1614_731914, .L802A1698_731998, .L802A1734_731A34, .L802A1754_731A54, 0, 0 - -.section .text - -glabel battle_item_strange_cake_func_802A13E4_7316E4 -/* 7316E4 802A13E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7316E8 802A13E8 0080302D */ daddu $a2, $a0, $zero -/* 7316EC 802A13EC AFBF0020 */ sw $ra, 0x20($sp) -/* 7316F0 802A13F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 7316F4 802A13F4 AFB20018 */ sw $s2, 0x18($sp) -/* 7316F8 802A13F8 AFB10014 */ sw $s1, 0x14($sp) -/* 7316FC 802A13FC 10A00003 */ beqz $a1, .L802A140C -/* 731700 802A1400 AFB00010 */ sw $s0, 0x10($sp) -/* 731704 802A1404 3C01802A */ lui $at, %hi(D_802A2DEC) -/* 731708 802A1408 AC202DEC */ sw $zero, %lo(D_802A2DEC)($at) -.L802A140C: -/* 73170C 802A140C 3C03802A */ lui $v1, %hi(D_802A2DEC) -/* 731710 802A1410 8C632DEC */ lw $v1, %lo(D_802A2DEC)($v1) -/* 731714 802A1414 2C620006 */ sltiu $v0, $v1, 6 -/* 731718 802A1418 104000F7 */ beqz $v0, .L802A17F8 -/* 73171C 802A141C 00031080 */ sll $v0, $v1, 2 -/* 731720 802A1420 3C01802A */ lui $at, %hi(jtbl_802A2DB0_7330B0) -/* 731724 802A1424 00220821 */ addu $at, $at, $v0 -/* 731728 802A1428 8C222DB0 */ lw $v0, %lo(jtbl_802A2DB0_7330B0)($at) -/* 73172C 802A142C 00400008 */ jr $v0 -/* 731730 802A1430 00000000 */ nop -.L802A1434_731734: -/* 731734 802A1434 3C05802A */ lui $a1, %hi(battle_item_strange_cake_func_802A123C_73153C) -/* 731738 802A1438 24A5123C */ addiu $a1, $a1, %lo(battle_item_strange_cake_func_802A123C_73153C) -/* 73173C 802A143C 0C048C8F */ jal create_generic_entity_frontUI -/* 731740 802A1440 0000202D */ daddu $a0, $zero, $zero -/* 731744 802A1444 3C01802A */ lui $at, %hi(D_802A2E00) -/* 731748 802A1448 AC222E00 */ sw $v0, %lo(D_802A2E00)($at) -/* 73174C 802A144C 0C00A67F */ jal rand_int -/* 731750 802A1450 240432C8 */ addiu $a0, $zero, 0x32c8 -/* 731754 802A1454 0000802D */ daddu $s0, $zero, $zero -/* 731758 802A1458 3C13802A */ lui $s3, %hi(battle_item_strange_cake_D_802A2848_732B48) -/* 73175C 802A145C 26732848 */ addiu $s3, $s3, %lo(battle_item_strange_cake_D_802A2848_732B48) -/* 731760 802A1460 3C12802A */ lui $s2, %hi(D_802A2DD8) -/* 731764 802A1464 26522DD8 */ addiu $s2, $s2, %lo(D_802A2DD8) -/* 731768 802A1468 3C11802A */ lui $s1, %hi(battle_item_strange_cake_D_802A2858_732B58) -/* 73176C 802A146C 26312858 */ addiu $s1, $s1, %lo(battle_item_strange_cake_D_802A2858_732B58) -/* 731770 802A1470 3C01802A */ lui $at, %hi(D_802A2DF4) -/* 731774 802A1474 AC222DF4 */ sw $v0, %lo(D_802A2DF4)($at) -/* 731778 802A1478 240203E8 */ addiu $v0, $zero, 0x3e8 -/* 73177C 802A147C 3C01802A */ lui $at, %hi(D_802A2DF8) -/* 731780 802A1480 AC222DF8 */ sw $v0, %lo(D_802A2DF8)($at) -.L802A1484: -/* 731784 802A1484 8E220000 */ lw $v0, ($s1) -/* 731788 802A1488 26310004 */ addiu $s1, $s1, 4 -/* 73178C 802A148C 00021080 */ sll $v0, $v0, 2 -/* 731790 802A1490 00531021 */ addu $v0, $v0, $s3 -/* 731794 802A1494 8C440000 */ lw $a0, ($v0) -/* 731798 802A1498 0C050529 */ jal hud_element_create -/* 73179C 802A149C 26100001 */ addiu $s0, $s0, 1 -/* 7317A0 802A14A0 0040202D */ daddu $a0, $v0, $zero -/* 7317A4 802A14A4 24050080 */ addiu $a1, $zero, 0x80 -/* 7317A8 802A14A8 0C051280 */ jal hud_element_set_flags -/* 7317AC 802A14AC AE440000 */ sw $a0, ($s2) -/* 7317B0 802A14B0 2A020005 */ slti $v0, $s0, 5 -/* 7317B4 802A14B4 1440FFF3 */ bnez $v0, .L802A1484 -/* 7317B8 802A14B8 26520004 */ addiu $s2, $s2, 4 -/* 7317BC 802A14BC 24020001 */ addiu $v0, $zero, 1 -/* 7317C0 802A14C0 3C01802A */ lui $at, %hi(D_802A2DEC) -/* 7317C4 802A14C4 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) -/* 7317C8 802A14C8 080A85FF */ j .L802A17FC -/* 7317CC 802A14CC 0000102D */ daddu $v0, $zero, $zero -.L802A14D0_7317D0: -/* 7317D0 802A14D0 3C0351EB */ lui $v1, 0x51eb -/* 7317D4 802A14D4 3C06802A */ lui $a2, %hi(D_802A2DF4) -/* 7317D8 802A14D8 24C62DF4 */ addiu $a2, $a2, %lo(D_802A2DF4) -/* 7317DC 802A14DC 3C07802A */ lui $a3, %hi(D_802A2DF8) -/* 7317E0 802A14E0 24E72DF8 */ addiu $a3, $a3, %lo(D_802A2DF8) -/* 7317E4 802A14E4 8CC20000 */ lw $v0, ($a2) -/* 7317E8 802A14E8 8CE50000 */ lw $a1, ($a3) -/* 7317EC 802A14EC 3463851F */ ori $v1, $v1, 0x851f -/* 7317F0 802A14F0 00452021 */ addu $a0, $v0, $a1 -/* 7317F4 802A14F4 00830018 */ mult $a0, $v1 -/* 7317F8 802A14F8 00041FC3 */ sra $v1, $a0, 0x1f -/* 7317FC 802A14FC 00004010 */ mfhi $t0 -/* 731800 802A1500 00081143 */ sra $v0, $t0, 5 -/* 731804 802A1504 00431023 */ subu $v0, $v0, $v1 -/* 731808 802A1508 28420082 */ slti $v0, $v0, 0x82 -/* 73180C 802A150C 14400003 */ bnez $v0, .L802A151C -/* 731810 802A1510 ACC40000 */ sw $a0, ($a2) -/* 731814 802A1514 2482CD38 */ addiu $v0, $a0, -0x32c8 -/* 731818 802A1518 ACC20000 */ sw $v0, ($a2) -.L802A151C: -/* 73181C 802A151C 00A0182D */ daddu $v1, $a1, $zero -/* 731820 802A1520 28620191 */ slti $v0, $v1, 0x191 -/* 731824 802A1524 14400003 */ bnez $v0, .L802A1534 -/* 731828 802A1528 28620065 */ slti $v0, $v1, 0x65 -/* 73182C 802A152C 080A8550 */ j .L802A1540 -/* 731830 802A1530 2462FFF6 */ addiu $v0, $v1, -0xa -.L802A1534: -/* 731834 802A1534 14400002 */ bnez $v0, .L802A1540 -/* 731838 802A1538 24A2FFFF */ addiu $v0, $a1, -1 -/* 73183C 802A153C 2462FFFB */ addiu $v0, $v1, -5 -.L802A1540: -/* 731840 802A1540 ACE20000 */ sw $v0, ($a3) -/* 731844 802A1544 3C02802A */ lui $v0, %hi(D_802A2DF8) -/* 731848 802A1548 8C422DF8 */ lw $v0, %lo(D_802A2DF8)($v0) -/* 73184C 802A154C 2842000A */ slti $v0, $v0, 0xa -/* 731850 802A1550 104000A9 */ beqz $v0, .L802A17F8 -/* 731854 802A1554 3C0351EB */ lui $v1, 0x51eb -/* 731858 802A1558 3C02802A */ lui $v0, %hi(D_802A2DF4) -/* 73185C 802A155C 8C422DF4 */ lw $v0, %lo(D_802A2DF4)($v0) -/* 731860 802A1560 3463851F */ ori $v1, $v1, 0x851f -/* 731864 802A1564 00430018 */ mult $v0, $v1 -/* 731868 802A1568 3C044EC4 */ lui $a0, 0x4ec4 -/* 73186C 802A156C 3484EC4F */ ori $a0, $a0, 0xec4f -/* 731870 802A1570 000217C3 */ sra $v0, $v0, 0x1f -/* 731874 802A1574 00004010 */ mfhi $t0 -/* 731878 802A1578 00081943 */ sra $v1, $t0, 5 -/* 73187C 802A157C 00621823 */ subu $v1, $v1, $v0 -/* 731880 802A1580 00640018 */ mult $v1, $a0 -/* 731884 802A1584 000317C3 */ sra $v0, $v1, 0x1f -/* 731888 802A1588 3C01802A */ lui $at, %hi(D_802A2DF0) -/* 73188C 802A158C AC232DF0 */ sw $v1, %lo(D_802A2DF0)($at) -/* 731890 802A1590 00004010 */ mfhi $t0 -/* 731894 802A1594 000820C3 */ sra $a0, $t0, 3 -/* 731898 802A1598 00822023 */ subu $a0, $a0, $v0 -/* 73189C 802A159C 00041040 */ sll $v0, $a0, 1 -/* 7318A0 802A15A0 00441021 */ addu $v0, $v0, $a0 -/* 7318A4 802A15A4 00021080 */ sll $v0, $v0, 2 -/* 7318A8 802A15A8 00441021 */ addu $v0, $v0, $a0 -/* 7318AC 802A15AC 00021040 */ sll $v0, $v0, 1 -/* 7318B0 802A15B0 00621823 */ subu $v1, $v1, $v0 -/* 7318B4 802A15B4 2863000D */ slti $v1, $v1, 0xd -/* 7318B8 802A15B8 10600008 */ beqz $v1, .L802A15DC -/* 7318BC 802A15BC 00000000 */ nop -/* 7318C0 802A15C0 0C00A67F */ jal rand_int -/* 7318C4 802A15C4 24040064 */ addiu $a0, $zero, 0x64 -/* 7318C8 802A15C8 28420050 */ slti $v0, $v0, 0x50 -/* 7318CC 802A15CC 1440000D */ bnez $v0, .L802A1604 -/* 7318D0 802A15D0 24020002 */ addiu $v0, $zero, 2 -/* 7318D4 802A15D4 080A857C */ j .L802A15F0 -/* 7318D8 802A15D8 24020003 */ addiu $v0, $zero, 3 -.L802A15DC: -/* 7318DC 802A15DC 0C00A67F */ jal rand_int -/* 7318E0 802A15E0 24040064 */ addiu $a0, $zero, 0x64 -/* 7318E4 802A15E4 2842003C */ slti $v0, $v0, 0x3c -/* 7318E8 802A15E8 10400005 */ beqz $v0, .L802A1600 -/* 7318EC 802A15EC 24020003 */ addiu $v0, $zero, 3 -.L802A15F0: -/* 7318F0 802A15F0 3C01802A */ lui $at, %hi(D_802A2DEC) -/* 7318F4 802A15F4 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) -/* 7318F8 802A15F8 080A85FF */ j .L802A17FC -/* 7318FC 802A15FC 0000102D */ daddu $v0, $zero, $zero -.L802A1600: -/* 731900 802A1600 24020002 */ addiu $v0, $zero, 2 -.L802A1604: -/* 731904 802A1604 3C01802A */ lui $at, %hi(D_802A2DEC) -/* 731908 802A1608 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) -/* 73190C 802A160C 080A85FF */ j .L802A17FC -/* 731910 802A1610 0000102D */ daddu $v0, $zero, $zero -.L802A1614_731914: -/* 731914 802A1614 3C024EC4 */ lui $v0, 0x4ec4 -/* 731918 802A1618 3C06802A */ lui $a2, %hi(D_802A2DF0) -/* 73191C 802A161C 24C62DF0 */ addiu $a2, $a2, %lo(D_802A2DF0) -/* 731920 802A1620 8CC50000 */ lw $a1, ($a2) -/* 731924 802A1624 3442EC4F */ ori $v0, $v0, 0xec4f -/* 731928 802A1628 00A20018 */ mult $a1, $v0 -/* 73192C 802A162C 000517C3 */ sra $v0, $a1, 0x1f -/* 731930 802A1630 00004010 */ mfhi $t0 -/* 731934 802A1634 000818C3 */ sra $v1, $t0, 3 -/* 731938 802A1638 00622023 */ subu $a0, $v1, $v0 -/* 73193C 802A163C 00041040 */ sll $v0, $a0, 1 -/* 731940 802A1640 00441021 */ addu $v0, $v0, $a0 -/* 731944 802A1644 00021080 */ sll $v0, $v0, 2 -/* 731948 802A1648 00441021 */ addu $v0, $v0, $a0 -/* 73194C 802A164C 00021040 */ sll $v0, $v0, 1 -/* 731950 802A1650 00A22023 */ subu $a0, $a1, $v0 -/* 731954 802A1654 24820003 */ addiu $v0, $a0, 3 -/* 731958 802A1658 04420001 */ bltzl $v0, .L802A1660 -/* 73195C 802A165C 24820006 */ addiu $v0, $a0, 6 -.L802A1660: -/* 731960 802A1660 00022083 */ sra $a0, $v0, 2 -/* 731964 802A1664 00A41823 */ subu $v1, $a1, $a0 -/* 731968 802A1668 00031040 */ sll $v0, $v1, 1 -/* 73196C 802A166C 00431021 */ addu $v0, $v0, $v1 -/* 731970 802A1670 000210C0 */ sll $v0, $v0, 3 -/* 731974 802A1674 00431021 */ addu $v0, $v0, $v1 -/* 731978 802A1678 00021080 */ sll $v0, $v0, 2 -/* 73197C 802A167C ACC30000 */ sw $v1, ($a2) -/* 731980 802A1680 3C01802A */ lui $at, %hi(D_802A2DF4) -/* 731984 802A1684 AC222DF4 */ sw $v0, %lo(D_802A2DF4)($at) -/* 731988 802A1688 1480005C */ bnez $a0, .L802A17FC -/* 73198C 802A168C 0000102D */ daddu $v0, $zero, $zero -/* 731990 802A1690 080A85B9 */ j .L802A16E4 -/* 731994 802A1694 24020004 */ addiu $v0, $zero, 4 -.L802A1698_731998: -/* 731998 802A1698 3C024EC4 */ lui $v0, 0x4ec4 -/* 73199C 802A169C 3C06802A */ lui $a2, %hi(D_802A2DF0) -/* 7319A0 802A16A0 24C62DF0 */ addiu $a2, $a2, %lo(D_802A2DF0) -/* 7319A4 802A16A4 8CC50000 */ lw $a1, ($a2) -/* 7319A8 802A16A8 3442EC4F */ ori $v0, $v0, 0xec4f -/* 7319AC 802A16AC 00A20018 */ mult $a1, $v0 -/* 7319B0 802A16B0 000517C3 */ sra $v0, $a1, 0x1f -/* 7319B4 802A16B4 00004010 */ mfhi $t0 -/* 7319B8 802A16B8 000818C3 */ sra $v1, $t0, 3 -/* 7319BC 802A16BC 00621823 */ subu $v1, $v1, $v0 -/* 7319C0 802A16C0 00031040 */ sll $v0, $v1, 1 -/* 7319C4 802A16C4 00431021 */ addu $v0, $v0, $v1 -/* 7319C8 802A16C8 00021080 */ sll $v0, $v0, 2 -/* 7319CC 802A16CC 00431021 */ addu $v0, $v0, $v1 -/* 7319D0 802A16D0 00021040 */ sll $v0, $v0, 1 -/* 7319D4 802A16D4 00A21823 */ subu $v1, $a1, $v0 -/* 7319D8 802A16D8 14600006 */ bnez $v1, .L802A16F4 -/* 7319DC 802A16DC 2402001A */ addiu $v0, $zero, 0x1a -/* 7319E0 802A16E0 24020004 */ addiu $v0, $zero, 4 -.L802A16E4: -/* 7319E4 802A16E4 3C01802A */ lui $at, %hi(D_802A2DEC) -/* 7319E8 802A16E8 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) -/* 7319EC 802A16EC 080A85FF */ j .L802A17FC -/* 7319F0 802A16F0 0000102D */ daddu $v0, $zero, $zero -.L802A16F4: -/* 7319F4 802A16F4 00432023 */ subu $a0, $v0, $v1 -/* 7319F8 802A16F8 24820003 */ addiu $v0, $a0, 3 -/* 7319FC 802A16FC 04420001 */ bltzl $v0, .L802A1704 -/* 731A00 802A1700 24820006 */ addiu $v0, $a0, 6 -.L802A1704: -/* 731A04 802A1704 00022083 */ sra $a0, $v0, 2 -/* 731A08 802A1708 00A41821 */ addu $v1, $a1, $a0 -/* 731A0C 802A170C 00031040 */ sll $v0, $v1, 1 -/* 731A10 802A1710 00431021 */ addu $v0, $v0, $v1 -/* 731A14 802A1714 000210C0 */ sll $v0, $v0, 3 -/* 731A18 802A1718 00431021 */ addu $v0, $v0, $v1 -/* 731A1C 802A171C 00021080 */ sll $v0, $v0, 2 -/* 731A20 802A1720 ACC30000 */ sw $v1, ($a2) -/* 731A24 802A1724 3C01802A */ lui $at, %hi(D_802A2DF4) -/* 731A28 802A1728 AC222DF4 */ sw $v0, %lo(D_802A2DF4)($at) -/* 731A2C 802A172C 080A85FF */ j .L802A17FC -/* 731A30 802A1730 0000102D */ daddu $v0, $zero, $zero -.L802A1734_731A34: -/* 731A34 802A1734 24020014 */ addiu $v0, $zero, 0x14 -/* 731A38 802A1738 3C01802A */ lui $at, %hi(D_802A2DFC) -/* 731A3C 802A173C AC222DFC */ sw $v0, %lo(D_802A2DFC)($at) -/* 731A40 802A1740 24020005 */ addiu $v0, $zero, 5 -/* 731A44 802A1744 3C01802A */ lui $at, %hi(D_802A2DEC) -/* 731A48 802A1748 AC222DEC */ sw $v0, %lo(D_802A2DEC)($at) -/* 731A4C 802A174C 080A85FF */ j .L802A17FC -/* 731A50 802A1750 0000102D */ daddu $v0, $zero, $zero -.L802A1754_731A54: -/* 731A54 802A1754 3C03802A */ lui $v1, %hi(D_802A2DFC) -/* 731A58 802A1758 24632DFC */ addiu $v1, $v1, %lo(D_802A2DFC) -/* 731A5C 802A175C 8C620000 */ lw $v0, ($v1) -/* 731A60 802A1760 10400003 */ beqz $v0, .L802A1770 -/* 731A64 802A1764 2442FFFF */ addiu $v0, $v0, -1 -/* 731A68 802A1768 080A85FE */ j .L802A17F8 -/* 731A6C 802A176C AC620000 */ sw $v0, ($v1) -.L802A1770: -/* 731A70 802A1770 3C034EC4 */ lui $v1, 0x4ec4 -/* 731A74 802A1774 3C02802A */ lui $v0, %hi(D_802A2DF0) -/* 731A78 802A1778 8C422DF0 */ lw $v0, %lo(D_802A2DF0)($v0) -/* 731A7C 802A177C 3463EC4F */ ori $v1, $v1, 0xec4f -/* 731A80 802A1780 00430018 */ mult $v0, $v1 -/* 731A84 802A1784 3C11802A */ lui $s1, %hi(D_802A2DD8) -/* 731A88 802A1788 26312DD8 */ addiu $s1, $s1, %lo(D_802A2DD8) -/* 731A8C 802A178C 3C04802A */ lui $a0, %hi(D_802A2E00) -/* 731A90 802A1790 8C842E00 */ lw $a0, %lo(D_802A2E00)($a0) -/* 731A94 802A1794 000217C3 */ sra $v0, $v0, 0x1f -/* 731A98 802A1798 00004010 */ mfhi $t0 -/* 731A9C 802A179C 000818C3 */ sra $v1, $t0, 3 -/* 731AA0 802A17A0 00628023 */ subu $s0, $v1, $v0 -/* 731AA4 802A17A4 00101080 */ sll $v0, $s0, 2 -/* 731AA8 802A17A8 0000802D */ daddu $s0, $zero, $zero -/* 731AAC 802A17AC 3C01802A */ lui $at, %hi(battle_item_strange_cake_D_802A2858_732B58+2) -/* 731AB0 802A17B0 00220821 */ addu $at, $at, $v0 -/* 731AB4 802A17B4 9422285A */ lhu $v0, %lo(battle_item_strange_cake_D_802A2858_732B58+2)($at) -/* 731AB8 802A17B8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 731ABC 802A17BC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 731AC0 802A17C0 A462017A */ sh $v0, 0x17a($v1) -/* 731AC4 802A17C4 00021400 */ sll $v0, $v0, 0x10 -/* 731AC8 802A17C8 00021403 */ sra $v0, $v0, 0x10 -/* 731ACC 802A17CC 0C048D70 */ jal free_generic_entity -/* 731AD0 802A17D0 ACC20084 */ sw $v0, 0x84($a2) -.L802A17D4: -/* 731AD4 802A17D4 8E240000 */ lw $a0, ($s1) -/* 731AD8 802A17D8 26310004 */ addiu $s1, $s1, 4 -/* 731ADC 802A17DC 0C05123D */ jal hud_element_free -/* 731AE0 802A17E0 26100001 */ addiu $s0, $s0, 1 -/* 731AE4 802A17E4 2A020005 */ slti $v0, $s0, 5 -/* 731AE8 802A17E8 1440FFFA */ bnez $v0, .L802A17D4 -/* 731AEC 802A17EC 24020002 */ addiu $v0, $zero, 2 -/* 731AF0 802A17F0 080A85FF */ j .L802A17FC -/* 731AF4 802A17F4 00000000 */ nop -.L802A17F8: -/* 731AF8 802A17F8 0000102D */ daddu $v0, $zero, $zero -.L802A17FC: -/* 731AFC 802A17FC 8FBF0020 */ lw $ra, 0x20($sp) -/* 731B00 802A1800 8FB3001C */ lw $s3, 0x1c($sp) -/* 731B04 802A1804 8FB20018 */ lw $s2, 0x18($sp) -/* 731B08 802A1808 8FB10014 */ lw $s1, 0x14($sp) -/* 731B0C 802A180C 8FB00010 */ lw $s0, 0x10($sp) -/* 731B10 802A1810 03E00008 */ jr $ra -/* 731B14 802A1814 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/effects/aura/aura_appendGfx.s b/ver/us/asm/nonmatchings/effects/aura/aura_appendGfx.s deleted file mode 100644 index bd44ce26e2..0000000000 --- a/ver/us/asm/nonmatchings/effects/aura/aura_appendGfx.s +++ /dev/null @@ -1,407 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel aura_appendGfx -/* 3778CC E007685C 27BDFF00 */ addiu $sp, $sp, -0x100 -/* 3778D0 E0076860 3C02DB06 */ lui $v0, 0xdb06 -/* 3778D4 E0076864 34420024 */ ori $v0, $v0, 0x24 -/* 3778D8 E0076868 3C09800A */ lui $t1, %hi(gMasterGfxPos) -/* 3778DC E007686C 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) -/* 3778E0 E0076870 AFBF00F4 */ sw $ra, 0xf4($sp) -/* 3778E4 E0076874 AFB600F0 */ sw $s6, 0xf0($sp) -/* 3778E8 E0076878 AFB500EC */ sw $s5, 0xec($sp) -/* 3778EC E007687C AFB400E8 */ sw $s4, 0xe8($sp) -/* 3778F0 E0076880 AFB300E4 */ sw $s3, 0xe4($sp) -/* 3778F4 E0076884 AFB200E0 */ sw $s2, 0xe0($sp) -/* 3778F8 E0076888 AFB100DC */ sw $s1, 0xdc($sp) -/* 3778FC E007688C AFB000D8 */ sw $s0, 0xd8($sp) -/* 377900 E0076890 F7B400F8 */ sdc1 $f20, 0xf8($sp) -/* 377904 E0076894 8C93000C */ lw $s3, 0xc($a0) -/* 377908 E0076898 8D280000 */ lw $t0, ($t1) -/* 37790C E007689C 8E750000 */ lw $s5, ($s3) -/* 377910 E00768A0 8E760028 */ lw $s6, 0x28($s3) -/* 377914 E00768A4 0100282D */ daddu $a1, $t0, $zero -/* 377918 E00768A8 ACA20000 */ sw $v0, ($a1) -/* 37791C E00768AC 8C820010 */ lw $v0, 0x10($a0) -/* 377920 E00768B0 3C038000 */ lui $v1, 0x8000 -/* 377924 E00768B4 8C42001C */ lw $v0, 0x1c($v0) -/* 377928 E00768B8 25080008 */ addiu $t0, $t0, 8 -/* 37792C E00768BC 00431021 */ addu $v0, $v0, $v1 -/* 377930 E00768C0 ACA20004 */ sw $v0, 4($a1) -/* 377934 E00768C4 3C02DE00 */ lui $v0, 0xde00 -/* 377938 E00768C8 AD020000 */ sw $v0, ($t0) -/* 37793C E00768CC 00151080 */ sll $v0, $s5, 2 -/* 377940 E00768D0 3C01E007 */ lui $at, %hi(D_E0076ED0) -/* 377944 E00768D4 00220821 */ addu $at, $at, $v0 -/* 377948 E00768D8 8C226ED0 */ lw $v0, %lo(D_E0076ED0)($at) -/* 37794C E00768DC 27A40018 */ addiu $a0, $sp, 0x18 -/* 377950 E00768E0 AD280000 */ sw $t0, ($t1) -/* 377954 E00768E4 AD020004 */ sw $v0, 4($t0) -/* 377958 E00768E8 8E650010 */ lw $a1, 0x10($s3) -/* 37795C E00768EC 8E660014 */ lw $a2, 0x14($s3) -/* 377960 E00768F0 8E670018 */ lw $a3, 0x18($s3) -/* 377964 E00768F4 25080008 */ addiu $t0, $t0, 8 -/* 377968 E00768F8 0C080108 */ jal shim_guTranslateF -/* 37796C E00768FC AD280000 */ sw $t0, ($t1) -/* 377970 E0076900 24020002 */ addiu $v0, $zero, 2 -/* 377974 E0076904 16A20008 */ bne $s5, $v0, .LE0076928 -/* 377978 E0076908 27A40058 */ addiu $a0, $sp, 0x58 -/* 37797C E007690C 44800000 */ mtc1 $zero, $f0 -/* 377980 E0076910 3C073F80 */ lui $a3, 0x3f80 -/* 377984 E0076914 E7A00010 */ swc1 $f0, 0x10($sp) -/* 377988 E0076918 8E650064 */ lw $a1, 0x64($s3) -/* 37798C E007691C 44060000 */ mfc1 $a2, $f0 -/* 377990 E0076920 0801DA5C */ j .LE0076970 -/* 377994 E0076924 00000000 */ nop -.LE0076928: -/* 377998 E0076928 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 37799C E007692C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 3779A0 E0076930 44800000 */ mtc1 $zero, $f0 -/* 3779A4 E0076934 00031080 */ sll $v0, $v1, 2 -/* 3779A8 E0076938 00431021 */ addu $v0, $v0, $v1 -/* 3779AC E007693C 00021080 */ sll $v0, $v0, 2 -/* 3779B0 E0076940 00431023 */ subu $v0, $v0, $v1 -/* 3779B4 E0076944 000218C0 */ sll $v1, $v0, 3 -/* 3779B8 E0076948 00431021 */ addu $v0, $v0, $v1 -/* 3779BC E007694C 000210C0 */ sll $v0, $v0, 3 -/* 3779C0 E0076950 44060000 */ mfc1 $a2, $f0 -/* 3779C4 E0076954 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 3779C8 E0076958 00220821 */ addu $at, $at, $v0 -/* 3779CC E007695C C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* 3779D0 E0076960 3C073F80 */ lui $a3, 0x3f80 -/* 3779D4 E0076964 46000007 */ neg.s $f0, $f0 -/* 3779D8 E0076968 44050000 */ mfc1 $a1, $f0 -/* 3779DC E007696C AFA60010 */ sw $a2, 0x10($sp) -.LE0076970: -/* 3779E0 E0076970 0C080104 */ jal shim_guRotateF -/* 3779E4 E0076974 00000000 */ nop -/* 3779E8 E0076978 27B40058 */ addiu $s4, $sp, 0x58 -/* 3779EC E007697C 0280202D */ daddu $a0, $s4, $zero -/* 3779F0 E0076980 27A50018 */ addiu $a1, $sp, 0x18 -/* 3779F4 E0076984 27B00098 */ addiu $s0, $sp, 0x98 -/* 3779F8 E0076988 0C080114 */ jal shim_guMtxCatF -/* 3779FC E007698C 0200302D */ daddu $a2, $s0, $zero -/* 377A00 E0076990 8E65001C */ lw $a1, 0x1c($s3) -/* 377A04 E0076994 3C013F80 */ lui $at, 0x3f80 -/* 377A08 E0076998 4481A000 */ mtc1 $at, $f20 -/* 377A0C E007699C 8E660020 */ lw $a2, 0x20($s3) -/* 377A10 E00769A0 4407A000 */ mfc1 $a3, $f20 -/* 377A14 E00769A4 0C080110 */ jal shim_guScaleF -/* 377A18 E00769A8 0280202D */ daddu $a0, $s4, $zero -/* 377A1C E00769AC 0280202D */ daddu $a0, $s4, $zero -/* 377A20 E00769B0 0200282D */ daddu $a1, $s0, $zero -/* 377A24 E00769B4 0C080114 */ jal shim_guMtxCatF -/* 377A28 E00769B8 0200302D */ daddu $a2, $s0, $zero -/* 377A2C E00769BC 16A00016 */ bnez $s5, .LE0076A18 -/* 377A30 E00769C0 3C120001 */ lui $s2, 1 -/* 377A34 E00769C4 C660001C */ lwc1 $f0, 0x1c($s3) -/* 377A38 E00769C8 C6640024 */ lwc1 $f4, 0x24($s3) -/* 377A3C E00769CC 46040001 */ sub.s $f0, $f0, $f4 -/* 377A40 E00769D0 3C014120 */ lui $at, 0x4120 -/* 377A44 E00769D4 44811000 */ mtc1 $at, $f2 -/* 377A48 E00769D8 46000007 */ neg.s $f0, $f0 -/* 377A4C E00769DC 46040003 */ div.s $f0, $f0, $f4 -/* 377A50 E00769E0 46020002 */ mul.s $f0, $f0, $f2 -/* 377A54 E00769E4 00000000 */ nop -/* 377A58 E00769E8 44050000 */ mfc1 $a1, $f0 -/* 377A5C E00769EC 44800000 */ mtc1 $zero, $f0 -/* 377A60 E00769F0 00000000 */ nop -/* 377A64 E00769F4 44060000 */ mfc1 $a2, $f0 -/* 377A68 E00769F8 0280202D */ daddu $a0, $s4, $zero -/* 377A6C E00769FC 0C080108 */ jal shim_guTranslateF -/* 377A70 E0076A00 00C0382D */ daddu $a3, $a2, $zero -/* 377A74 E0076A04 0280202D */ daddu $a0, $s4, $zero -/* 377A78 E0076A08 0200282D */ daddu $a1, $s0, $zero -/* 377A7C E0076A0C 0C080114 */ jal shim_guMtxCatF -/* 377A80 E0076A10 0200302D */ daddu $a2, $s0, $zero -/* 377A84 E0076A14 3C120001 */ lui $s2, 1 -.LE0076A18: -/* 377A88 E0076A18 36521630 */ ori $s2, $s2, 0x1630 -/* 377A8C E0076A1C 0200202D */ daddu $a0, $s0, $zero -/* 377A90 E0076A20 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 377A94 E0076A24 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 377A98 E0076A28 3C11800A */ lui $s1, %hi(gDisplayContext) -/* 377A9C E0076A2C 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* 377AA0 E0076A30 96050000 */ lhu $a1, ($s0) -/* 377AA4 E0076A34 8E220000 */ lw $v0, ($s1) -/* 377AA8 E0076A38 00052980 */ sll $a1, $a1, 6 -/* 377AAC E0076A3C 00B22821 */ addu $a1, $a1, $s2 -/* 377AB0 E0076A40 0C080118 */ jal shim_guMtxF2L -/* 377AB4 E0076A44 00452821 */ addu $a1, $v0, $a1 -/* 377AB8 E0076A48 3C03DA38 */ lui $v1, 0xda38 -/* 377ABC E0076A4C 34630002 */ ori $v1, $v1, 2 -/* 377AC0 E0076A50 3C06D838 */ lui $a2, 0xd838 -/* 377AC4 E0076A54 34C60002 */ ori $a2, $a2, 2 -/* 377AC8 E0076A58 3C09800A */ lui $t1, %hi(gMasterGfxPos) -/* 377ACC E0076A5C 2529A66C */ addiu $t1, $t1, %lo(gMasterGfxPos) -/* 377AD0 E0076A60 27A40018 */ addiu $a0, $sp, 0x18 -/* 377AD4 E0076A64 8D280000 */ lw $t0, ($t1) -/* 377AD8 E0076A68 96020000 */ lhu $v0, ($s0) -/* 377ADC E0076A6C 0100282D */ daddu $a1, $t0, $zero -/* 377AE0 E0076A70 25080008 */ addiu $t0, $t0, 8 -/* 377AE4 E0076A74 AD280000 */ sw $t0, ($t1) -/* 377AE8 E0076A78 ACA30000 */ sw $v1, ($a1) -/* 377AEC E0076A7C 24430001 */ addiu $v1, $v0, 1 -/* 377AF0 E0076A80 3042FFFF */ andi $v0, $v0, 0xffff -/* 377AF4 E0076A84 00021180 */ sll $v0, $v0, 6 -/* 377AF8 E0076A88 A6030000 */ sh $v1, ($s0) -/* 377AFC E0076A8C 8E230000 */ lw $v1, ($s1) -/* 377B00 E0076A90 00521021 */ addu $v0, $v0, $s2 -/* 377B04 E0076A94 00621821 */ addu $v1, $v1, $v0 -/* 377B08 E0076A98 3C02DE00 */ lui $v0, 0xde00 -/* 377B0C E0076A9C ACA30004 */ sw $v1, 4($a1) -/* 377B10 E0076AA0 AD020000 */ sw $v0, ($t0) -/* 377B14 E0076AA4 00151080 */ sll $v0, $s5, 2 -/* 377B18 E0076AA8 3C03E007 */ lui $v1, %hi(D_E0076EC0) -/* 377B1C E0076AAC 00621821 */ addu $v1, $v1, $v0 -/* 377B20 E0076AB0 8C636EC0 */ lw $v1, %lo(D_E0076EC0)($v1) -/* 377B24 E0076AB4 25020008 */ addiu $v0, $t0, 8 -/* 377B28 E0076AB8 AD220000 */ sw $v0, ($t1) -/* 377B2C E0076ABC 24020040 */ addiu $v0, $zero, 0x40 -/* 377B30 E0076AC0 AD060008 */ sw $a2, 8($t0) -/* 377B34 E0076AC4 AD02000C */ sw $v0, 0xc($t0) -/* 377B38 E0076AC8 AD030004 */ sw $v1, 4($t0) -/* 377B3C E0076ACC 8E650004 */ lw $a1, 4($s3) -/* 377B40 E0076AD0 8E660008 */ lw $a2, 8($s3) -/* 377B44 E0076AD4 8E67000C */ lw $a3, 0xc($s3) -/* 377B48 E0076AD8 25080010 */ addiu $t0, $t0, 0x10 -/* 377B4C E0076ADC 0C080108 */ jal shim_guTranslateF -/* 377B50 E0076AE0 AD280000 */ sw $t0, ($t1) -/* 377B54 E0076AE4 24020002 */ addiu $v0, $zero, 2 -/* 377B58 E0076AE8 16A20008 */ bne $s5, $v0, .LE0076B0C -/* 377B5C E0076AEC 0280202D */ daddu $a0, $s4, $zero -/* 377B60 E0076AF0 44800000 */ mtc1 $zero, $f0 -/* 377B64 E0076AF4 4407A000 */ mfc1 $a3, $f20 -/* 377B68 E0076AF8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 377B6C E0076AFC 8E650064 */ lw $a1, 0x64($s3) -/* 377B70 E0076B00 44060000 */ mfc1 $a2, $f0 -/* 377B74 E0076B04 0801DAD5 */ j .LE0076B54 -/* 377B78 E0076B08 00000000 */ nop -.LE0076B0C: -/* 377B7C E0076B0C 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 377B80 E0076B10 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 377B84 E0076B14 44800000 */ mtc1 $zero, $f0 -/* 377B88 E0076B18 00031080 */ sll $v0, $v1, 2 -/* 377B8C E0076B1C 00431021 */ addu $v0, $v0, $v1 -/* 377B90 E0076B20 00021080 */ sll $v0, $v0, 2 -/* 377B94 E0076B24 00431023 */ subu $v0, $v0, $v1 -/* 377B98 E0076B28 000218C0 */ sll $v1, $v0, 3 -/* 377B9C E0076B2C 00431021 */ addu $v0, $v0, $v1 -/* 377BA0 E0076B30 000210C0 */ sll $v0, $v0, 3 -/* 377BA4 E0076B34 44060000 */ mfc1 $a2, $f0 -/* 377BA8 E0076B38 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 377BAC E0076B3C 00220821 */ addu $at, $at, $v0 -/* 377BB0 E0076B40 C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* 377BB4 E0076B44 4407A000 */ mfc1 $a3, $f20 -/* 377BB8 E0076B48 46000007 */ neg.s $f0, $f0 -/* 377BBC E0076B4C 44050000 */ mfc1 $a1, $f0 -/* 377BC0 E0076B50 AFA60010 */ sw $a2, 0x10($sp) -.LE0076B54: -/* 377BC4 E0076B54 0C080104 */ jal shim_guRotateF -/* 377BC8 E0076B58 00000000 */ nop -/* 377BCC E0076B5C 27B10058 */ addiu $s1, $sp, 0x58 -/* 377BD0 E0076B60 0220202D */ daddu $a0, $s1, $zero -/* 377BD4 E0076B64 27A50018 */ addiu $a1, $sp, 0x18 -/* 377BD8 E0076B68 27B00098 */ addiu $s0, $sp, 0x98 -/* 377BDC E0076B6C 0C080114 */ jal shim_guMtxCatF -/* 377BE0 E0076B70 0200302D */ daddu $a2, $s0, $zero -/* 377BE4 E0076B74 8E65001C */ lw $a1, 0x1c($s3) -/* 377BE8 E0076B78 8E660020 */ lw $a2, 0x20($s3) -/* 377BEC E0076B7C 3C073F80 */ lui $a3, 0x3f80 -/* 377BF0 E0076B80 0C080110 */ jal shim_guScaleF -/* 377BF4 E0076B84 0220202D */ daddu $a0, $s1, $zero -/* 377BF8 E0076B88 0220202D */ daddu $a0, $s1, $zero -/* 377BFC E0076B8C 0200282D */ daddu $a1, $s0, $zero -/* 377C00 E0076B90 0C080114 */ jal shim_guMtxCatF -/* 377C04 E0076B94 0200302D */ daddu $a2, $s0, $zero -/* 377C08 E0076B98 16A00016 */ bnez $s5, .LE0076BF4 -/* 377C0C E0076B9C 3C120001 */ lui $s2, 1 -/* 377C10 E0076BA0 C660001C */ lwc1 $f0, 0x1c($s3) -/* 377C14 E0076BA4 C6640024 */ lwc1 $f4, 0x24($s3) -/* 377C18 E0076BA8 46040001 */ sub.s $f0, $f0, $f4 -/* 377C1C E0076BAC 3C014120 */ lui $at, 0x4120 -/* 377C20 E0076BB0 44811000 */ mtc1 $at, $f2 -/* 377C24 E0076BB4 46000007 */ neg.s $f0, $f0 -/* 377C28 E0076BB8 46040003 */ div.s $f0, $f0, $f4 -/* 377C2C E0076BBC 46020002 */ mul.s $f0, $f0, $f2 -/* 377C30 E0076BC0 00000000 */ nop -/* 377C34 E0076BC4 44050000 */ mfc1 $a1, $f0 -/* 377C38 E0076BC8 44800000 */ mtc1 $zero, $f0 -/* 377C3C E0076BCC 00000000 */ nop -/* 377C40 E0076BD0 44060000 */ mfc1 $a2, $f0 -/* 377C44 E0076BD4 0220202D */ daddu $a0, $s1, $zero -/* 377C48 E0076BD8 0C080108 */ jal shim_guTranslateF -/* 377C4C E0076BDC 00C0382D */ daddu $a3, $a2, $zero -/* 377C50 E0076BE0 0220202D */ daddu $a0, $s1, $zero -/* 377C54 E0076BE4 0200282D */ daddu $a1, $s0, $zero -/* 377C58 E0076BE8 0C080114 */ jal shim_guMtxCatF -/* 377C5C E0076BEC 0200302D */ daddu $a2, $s0, $zero -/* 377C60 E0076BF0 3C120001 */ lui $s2, 1 -.LE0076BF4: -/* 377C64 E0076BF4 36521630 */ ori $s2, $s2, 0x1630 -/* 377C68 E0076BF8 0200202D */ daddu $a0, $s0, $zero -/* 377C6C E0076BFC 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 377C70 E0076C00 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 377C74 E0076C04 3C11800A */ lui $s1, %hi(gDisplayContext) -/* 377C78 E0076C08 2631A674 */ addiu $s1, $s1, %lo(gDisplayContext) -/* 377C7C E0076C0C 96050000 */ lhu $a1, ($s0) -/* 377C80 E0076C10 8E220000 */ lw $v0, ($s1) -/* 377C84 E0076C14 00052980 */ sll $a1, $a1, 6 -/* 377C88 E0076C18 00B22821 */ addu $a1, $a1, $s2 -/* 377C8C E0076C1C 0C080118 */ jal shim_guMtxF2L -/* 377C90 E0076C20 00452821 */ addu $a1, $v0, $a1 -/* 377C94 E0076C24 3C03DA38 */ lui $v1, 0xda38 -/* 377C98 E0076C28 34630002 */ ori $v1, $v1, 2 -/* 377C9C E0076C2C 3C06D838 */ lui $a2, 0xd838 -/* 377CA0 E0076C30 3C07800A */ lui $a3, %hi(gMasterGfxPos) -/* 377CA4 E0076C34 24E7A66C */ addiu $a3, $a3, %lo(gMasterGfxPos) -/* 377CA8 E0076C38 34C60002 */ ori $a2, $a2, 2 -/* 377CAC E0076C3C 3C08DE00 */ lui $t0, 0xde00 -/* 377CB0 E0076C40 00154880 */ sll $t1, $s5, 2 -/* 377CB4 E0076C44 8CE50000 */ lw $a1, ($a3) -/* 377CB8 E0076C48 96020000 */ lhu $v0, ($s0) -/* 377CBC E0076C4C 3C014080 */ lui $at, 0x4080 -/* 377CC0 E0076C50 44812000 */ mtc1 $at, $f4 -/* 377CC4 E0076C54 00A0202D */ daddu $a0, $a1, $zero -/* 377CC8 E0076C58 24A50008 */ addiu $a1, $a1, 8 -/* 377CCC E0076C5C ACE50000 */ sw $a1, ($a3) -/* 377CD0 E0076C60 AC830000 */ sw $v1, ($a0) -/* 377CD4 E0076C64 24430001 */ addiu $v1, $v0, 1 -/* 377CD8 E0076C68 3042FFFF */ andi $v0, $v0, 0xffff -/* 377CDC E0076C6C 00021180 */ sll $v0, $v0, 6 -/* 377CE0 E0076C70 A6030000 */ sh $v1, ($s0) -/* 377CE4 E0076C74 8E230000 */ lw $v1, ($s1) -/* 377CE8 E0076C78 00521021 */ addu $v0, $v0, $s2 -/* 377CEC E0076C7C 00621821 */ addu $v1, $v1, $v0 -/* 377CF0 E0076C80 24A20008 */ addiu $v0, $a1, 8 -/* 377CF4 E0076C84 AC830004 */ sw $v1, 4($a0) -/* 377CF8 E0076C88 ACE20000 */ sw $v0, ($a3) -/* 377CFC E0076C8C ACA80000 */ sw $t0, ($a1) -/* 377D00 E0076C90 3C03E007 */ lui $v1, %hi(D_E0076EB0) -/* 377D04 E0076C94 00691821 */ addu $v1, $v1, $t1 -/* 377D08 E0076C98 8C636EB0 */ lw $v1, %lo(D_E0076EB0)($v1) -/* 377D0C E0076C9C 24A20010 */ addiu $v0, $a1, 0x10 -/* 377D10 E0076CA0 ACE20000 */ sw $v0, ($a3) -/* 377D14 E0076CA4 24020040 */ addiu $v0, $zero, 0x40 -/* 377D18 E0076CA8 ACA2000C */ sw $v0, 0xc($a1) -/* 377D1C E0076CAC 24A20018 */ addiu $v0, $a1, 0x18 -/* 377D20 E0076CB0 ACA60008 */ sw $a2, 8($a1) -/* 377D24 E0076CB4 ACE20000 */ sw $v0, ($a3) -/* 377D28 E0076CB8 3C02FA00 */ lui $v0, 0xfa00 -/* 377D2C E0076CBC ACA20010 */ sw $v0, 0x10($a1) -/* 377D30 E0076CC0 ACA30004 */ sw $v1, 4($a1) -/* 377D34 E0076CC4 92620068 */ lbu $v0, 0x68($s3) -/* 377D38 E0076CC8 92640069 */ lbu $a0, 0x69($s3) -/* 377D3C E0076CCC 9266006A */ lbu $a2, 0x6a($s3) -/* 377D40 E0076CD0 24A30020 */ addiu $v1, $a1, 0x20 -/* 377D44 E0076CD4 ACE30000 */ sw $v1, ($a3) -/* 377D48 E0076CD8 3C03FB00 */ lui $v1, 0xfb00 -/* 377D4C E0076CDC ACA30018 */ sw $v1, 0x18($a1) -/* 377D50 E0076CE0 32C300FF */ andi $v1, $s6, 0xff -/* 377D54 E0076CE4 00021600 */ sll $v0, $v0, 0x18 -/* 377D58 E0076CE8 00042400 */ sll $a0, $a0, 0x10 -/* 377D5C E0076CEC 00441025 */ or $v0, $v0, $a0 -/* 377D60 E0076CF0 00063200 */ sll $a2, $a2, 8 -/* 377D64 E0076CF4 00461025 */ or $v0, $v0, $a2 -/* 377D68 E0076CF8 00431025 */ or $v0, $v0, $v1 -/* 377D6C E0076CFC ACA20014 */ sw $v0, 0x14($a1) -/* 377D70 E0076D00 9262006B */ lbu $v0, 0x6b($s3) -/* 377D74 E0076D04 9263006C */ lbu $v1, 0x6c($s3) -/* 377D78 E0076D08 9264006D */ lbu $a0, 0x6d($s3) -/* 377D7C E0076D0C 00021600 */ sll $v0, $v0, 0x18 -/* 377D80 E0076D10 00031C00 */ sll $v1, $v1, 0x10 -/* 377D84 E0076D14 00431025 */ or $v0, $v0, $v1 -/* 377D88 E0076D18 00042200 */ sll $a0, $a0, 8 -/* 377D8C E0076D1C 9263006E */ lbu $v1, 0x6e($s3) -/* 377D90 E0076D20 00441025 */ or $v0, $v0, $a0 -/* 377D94 E0076D24 00431025 */ or $v0, $v0, $v1 -/* 377D98 E0076D28 ACA2001C */ sw $v0, 0x1c($a1) -/* 377D9C E0076D2C C6620034 */ lwc1 $f2, 0x34($s3) -/* 377DA0 E0076D30 46041082 */ mul.s $f2, $f2, $f4 -/* 377DA4 E0076D34 00000000 */ nop -/* 377DA8 E0076D38 3C06F200 */ lui $a2, 0xf200 -/* 377DAC E0076D3C 3C040100 */ lui $a0, 0x100 -/* 377DB0 E0076D40 C6600040 */ lwc1 $f0, 0x40($s3) -/* 377DB4 E0076D44 24A20028 */ addiu $v0, $a1, 0x28 -/* 377DB8 E0076D48 46040002 */ mul.s $f0, $f0, $f4 -/* 377DBC E0076D4C 00000000 */ nop -/* 377DC0 E0076D50 ACE20000 */ sw $v0, ($a3) -/* 377DC4 E0076D54 24A20030 */ addiu $v0, $a1, 0x30 -/* 377DC8 E0076D58 ACE20000 */ sw $v0, ($a3) -/* 377DCC E0076D5C 4600118D */ trunc.w.s $f6, $f2 -/* 377DD0 E0076D60 440A3000 */ mfc1 $t2, $f6 -/* 377DD4 E0076D64 4600018D */ trunc.w.s $f6, $f0 -/* 377DD8 E0076D68 440B3000 */ mfc1 $t3, $f6 -/* 377DDC E0076D6C 31430FFF */ andi $v1, $t2, 0xfff -/* 377DE0 E0076D70 00031B00 */ sll $v1, $v1, 0xc -/* 377DE4 E0076D74 31620FFF */ andi $v0, $t3, 0xfff -/* 377DE8 E0076D78 00461025 */ or $v0, $v0, $a2 -/* 377DEC E0076D7C 00621825 */ or $v1, $v1, $v0 -/* 377DF0 E0076D80 2542007C */ addiu $v0, $t2, 0x7c -/* 377DF4 E0076D84 30420FFF */ andi $v0, $v0, 0xfff -/* 377DF8 E0076D88 00021300 */ sll $v0, $v0, 0xc -/* 377DFC E0076D8C ACA30020 */ sw $v1, 0x20($a1) -/* 377E00 E0076D90 256301FC */ addiu $v1, $t3, 0x1fc -/* 377E04 E0076D94 30630FFF */ andi $v1, $v1, 0xfff -/* 377E08 E0076D98 00641825 */ or $v1, $v1, $a0 -/* 377E0C E0076D9C 00431025 */ or $v0, $v0, $v1 -/* 377E10 E0076DA0 ACA20024 */ sw $v0, 0x24($a1) -/* 377E14 E0076DA4 ACA80028 */ sw $t0, 0x28($a1) -/* 377E18 E0076DA8 3C02E007 */ lui $v0, %hi(D_E0076E90) -/* 377E1C E0076DAC 00491021 */ addu $v0, $v0, $t1 -/* 377E20 E0076DB0 8C426E90 */ lw $v0, %lo(D_E0076E90)($v0) -/* 377E24 E0076DB4 ACA2002C */ sw $v0, 0x2c($a1) -/* 377E28 E0076DB8 C662004C */ lwc1 $f2, 0x4c($s3) -/* 377E2C E0076DBC 24A20038 */ addiu $v0, $a1, 0x38 -/* 377E30 E0076DC0 46041082 */ mul.s $f2, $f2, $f4 -/* 377E34 E0076DC4 00000000 */ nop -/* 377E38 E0076DC8 ACE20000 */ sw $v0, ($a3) -/* 377E3C E0076DCC C6600058 */ lwc1 $f0, 0x58($s3) -/* 377E40 E0076DD0 24A20040 */ addiu $v0, $a1, 0x40 -/* 377E44 E0076DD4 ACE20000 */ sw $v0, ($a3) -/* 377E48 E0076DD8 46040002 */ mul.s $f0, $f0, $f4 -/* 377E4C E0076DDC 00000000 */ nop -/* 377E50 E0076DE0 24A20048 */ addiu $v0, $a1, 0x48 -/* 377E54 E0076DE4 ACE20000 */ sw $v0, ($a3) -/* 377E58 E0076DE8 ACA80038 */ sw $t0, 0x38($a1) -/* 377E5C E0076DEC 4600118D */ trunc.w.s $f6, $f2 -/* 377E60 E0076DF0 440A3000 */ mfc1 $t2, $f6 -/* 377E64 E0076DF4 4600018D */ trunc.w.s $f6, $f0 -/* 377E68 E0076DF8 440B3000 */ mfc1 $t3, $f6 -/* 377E6C E0076DFC 2543001E */ addiu $v1, $t2, 0x1e -/* 377E70 E0076E00 30630FFF */ andi $v1, $v1, 0xfff -/* 377E74 E0076E04 00031B00 */ sll $v1, $v1, 0xc -/* 377E78 E0076E08 2562001E */ addiu $v0, $t3, 0x1e -/* 377E7C E0076E0C 30420FFF */ andi $v0, $v0, 0xfff -/* 377E80 E0076E10 00461025 */ or $v0, $v0, $a2 -/* 377E84 E0076E14 00621825 */ or $v1, $v1, $v0 -/* 377E88 E0076E18 ACA30030 */ sw $v1, 0x30($a1) -/* 377E8C E0076E1C 2543011A */ addiu $v1, $t2, 0x11a -/* 377E90 E0076E20 30630FFF */ andi $v1, $v1, 0xfff -/* 377E94 E0076E24 00031B00 */ sll $v1, $v1, 0xc -/* 377E98 E0076E28 2562021A */ addiu $v0, $t3, 0x21a -/* 377E9C E0076E2C 30420FFF */ andi $v0, $v0, 0xfff -/* 377EA0 E0076E30 00441025 */ or $v0, $v0, $a0 -/* 377EA4 E0076E34 00621825 */ or $v1, $v1, $v0 -/* 377EA8 E0076E38 ACA30034 */ sw $v1, 0x34($a1) -/* 377EAC E0076E3C 3C03E007 */ lui $v1, %hi(D_E0076EA0) -/* 377EB0 E0076E40 00691821 */ addu $v1, $v1, $t1 -/* 377EB4 E0076E44 8C636EA0 */ lw $v1, %lo(D_E0076EA0)($v1) -/* 377EB8 E0076E48 3C02E700 */ lui $v0, 0xe700 -/* 377EBC E0076E4C ACA20040 */ sw $v0, 0x40($a1) -/* 377EC0 E0076E50 ACA00044 */ sw $zero, 0x44($a1) -/* 377EC4 E0076E54 ACA3003C */ sw $v1, 0x3c($a1) -/* 377EC8 E0076E58 8FBF00F4 */ lw $ra, 0xf4($sp) -/* 377ECC E0076E5C 8FB600F0 */ lw $s6, 0xf0($sp) -/* 377ED0 E0076E60 8FB500EC */ lw $s5, 0xec($sp) -/* 377ED4 E0076E64 8FB400E8 */ lw $s4, 0xe8($sp) -/* 377ED8 E0076E68 8FB300E4 */ lw $s3, 0xe4($sp) -/* 377EDC E0076E6C 8FB200E0 */ lw $s2, 0xe0($sp) -/* 377EE0 E0076E70 8FB100DC */ lw $s1, 0xdc($sp) -/* 377EE4 E0076E74 8FB000D8 */ lw $s0, 0xd8($sp) -/* 377EE8 E0076E78 D7B400F8 */ ldc1 $f20, 0xf8($sp) -/* 377EEC E0076E7C 03E00008 */ jr $ra -/* 377EF0 E0076E80 27BD0100 */ addiu $sp, $sp, 0x100 -/* 377EF4 E0076E84 00000000 */ nop -/* 377EF8 E0076E88 00000000 */ nop -/* 377EFC E0076E8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_appendGfx.s b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_appendGfx.s deleted file mode 100644 index 310d85a49f..0000000000 --- a/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_appendGfx.s +++ /dev/null @@ -1,191 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel big_snowflakes_appendGfx -/* 3635B0 E0060450 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* 3635B4 E0060454 3C02DB06 */ lui $v0, 0xdb06 -/* 3635B8 E0060458 34420024 */ ori $v0, $v0, 0x24 -/* 3635BC E006045C AFB400E8 */ sw $s4, 0xe8($sp) -/* 3635C0 E0060460 3C14800A */ lui $s4, %hi(gMasterGfxPos) -/* 3635C4 E0060464 2694A66C */ addiu $s4, $s4, %lo(gMasterGfxPos) -/* 3635C8 E0060468 AFBF00FC */ sw $ra, 0xfc($sp) -/* 3635CC E006046C AFBE00F8 */ sw $fp, 0xf8($sp) -/* 3635D0 E0060470 AFB700F4 */ sw $s7, 0xf4($sp) -/* 3635D4 E0060474 AFB600F0 */ sw $s6, 0xf0($sp) -/* 3635D8 E0060478 AFB500EC */ sw $s5, 0xec($sp) -/* 3635DC E006047C AFB300E4 */ sw $s3, 0xe4($sp) -/* 3635E0 E0060480 AFB200E0 */ sw $s2, 0xe0($sp) -/* 3635E4 E0060484 AFB100DC */ sw $s1, 0xdc($sp) -/* 3635E8 E0060488 AFB000D8 */ sw $s0, 0xd8($sp) -/* 3635EC E006048C F7B60108 */ sdc1 $f22, 0x108($sp) -/* 3635F0 E0060490 F7B40100 */ sdc1 $f20, 0x100($sp) -/* 3635F4 E0060494 AFA40110 */ sw $a0, 0x110($sp) -/* 3635F8 E0060498 8E850000 */ lw $a1, ($s4) -/* 3635FC E006049C 8C90000C */ lw $s0, 0xc($a0) -/* 363600 E00604A0 3C06E006 */ lui $a2, %hi(D_E0060738) -/* 363604 E00604A4 8CC60738 */ lw $a2, %lo(D_E0060738)($a2) -/* 363608 E00604A8 00A0202D */ daddu $a0, $a1, $zero -/* 36360C E00604AC 24A50008 */ addiu $a1, $a1, 8 -/* 363610 E00604B0 AE850000 */ sw $a1, ($s4) -/* 363614 E00604B4 AC820000 */ sw $v0, ($a0) -/* 363618 E00604B8 24A20008 */ addiu $v0, $a1, 8 -/* 36361C E00604BC AE820000 */ sw $v0, ($s4) -/* 363620 E00604C0 8FA80110 */ lw $t0, 0x110($sp) -/* 363624 E00604C4 3C071464 */ lui $a3, 0x1464 -/* 363628 E00604C8 8D030010 */ lw $v1, 0x10($t0) -/* 36362C E00604CC 24A20010 */ addiu $v0, $a1, 0x10 -/* 363630 E00604D0 AE820000 */ sw $v0, ($s4) -/* 363634 E00604D4 8C62001C */ lw $v0, 0x1c($v1) -/* 363638 E00604D8 3C038000 */ lui $v1, 0x8000 -/* 36363C E00604DC 00431021 */ addu $v0, $v0, $v1 -/* 363640 E00604E0 AC820004 */ sw $v0, 4($a0) -/* 363644 E00604E4 3C02DE00 */ lui $v0, 0xde00 -/* 363648 E00604E8 ACA20000 */ sw $v0, ($a1) -/* 36364C E00604EC 3C02FA00 */ lui $v0, 0xfa00 -/* 363650 E00604F0 ACA60004 */ sw $a2, 4($a1) -/* 363654 E00604F4 ACA20008 */ sw $v0, 8($a1) -/* 363658 E00604F8 92020027 */ lbu $v0, 0x27($s0) -/* 36365C E00604FC 34E71400 */ ori $a3, $a3, 0x1400 -/* 363660 E0060500 00471025 */ or $v0, $v0, $a3 -/* 363664 E0060504 ACA2000C */ sw $v0, 0xc($a1) -/* 363668 E0060508 8E050004 */ lw $a1, 4($s0) -/* 36366C E006050C 8E060008 */ lw $a2, 8($s0) -/* 363670 E0060510 8E07000C */ lw $a3, 0xc($s0) -/* 363674 E0060514 0C080108 */ jal shim_guTranslateF -/* 363678 E0060518 27A40018 */ addiu $a0, $sp, 0x18 -/* 36367C E006051C 27B10058 */ addiu $s1, $sp, 0x58 -/* 363680 E0060520 4480A000 */ mtc1 $zero, $f20 -/* 363684 E0060524 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 363688 E0060528 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 36368C E006052C 3C013F80 */ lui $at, 0x3f80 -/* 363690 E0060530 4481B000 */ mtc1 $at, $f22 -/* 363694 E0060534 00031080 */ sll $v0, $v1, 2 -/* 363698 E0060538 00431021 */ addu $v0, $v0, $v1 -/* 36369C E006053C 00021080 */ sll $v0, $v0, 2 -/* 3636A0 E0060540 00431023 */ subu $v0, $v0, $v1 -/* 3636A4 E0060544 000218C0 */ sll $v1, $v0, 3 -/* 3636A8 E0060548 00431021 */ addu $v0, $v0, $v1 -/* 3636AC E006054C 000210C0 */ sll $v0, $v0, 3 -/* 3636B0 E0060550 4406A000 */ mfc1 $a2, $f20 -/* 3636B4 E0060554 3C01800B */ lui $at, %hi(gCameras+0x6C) -/* 3636B8 E0060558 00220821 */ addu $at, $at, $v0 -/* 3636BC E006055C C4201DEC */ lwc1 $f0, %lo(gCameras+0x6C)($at) -/* 3636C0 E0060560 4407B000 */ mfc1 $a3, $f22 -/* 3636C4 E0060564 46000007 */ neg.s $f0, $f0 -/* 3636C8 E0060568 44050000 */ mfc1 $a1, $f0 -/* 3636CC E006056C 0220202D */ daddu $a0, $s1, $zero -/* 3636D0 E0060570 0C080104 */ jal shim_guRotateF -/* 3636D4 E0060574 E7B40010 */ swc1 $f20, 0x10($sp) -/* 3636D8 E0060578 0220202D */ daddu $a0, $s1, $zero -/* 3636DC E006057C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3636E0 E0060580 0C080114 */ jal shim_guMtxCatF -/* 3636E4 E0060584 27A60098 */ addiu $a2, $sp, 0x98 -/* 3636E8 E0060588 8FA80110 */ lw $t0, 0x110($sp) -/* 3636EC E006058C 24130001 */ addiu $s3, $zero, 1 -/* 3636F0 E0060590 8D020008 */ lw $v0, 8($t0) -/* 3636F4 E0060594 0262102A */ slt $v0, $s3, $v0 -/* 3636F8 E0060598 10400056 */ beqz $v0, .LE00606F4 -/* 3636FC E006059C 26100030 */ addiu $s0, $s0, 0x30 -/* 363700 E00605A0 0220902D */ daddu $s2, $s1, $zero -/* 363704 E00605A4 3C1E800A */ lui $fp, %hi(gDisplayContext) -/* 363708 E00605A8 27DEA674 */ addiu $fp, $fp, %lo(gDisplayContext) -/* 36370C E00605AC 3C178007 */ lui $s7, %hi(gMatrixListPos) -/* 363710 E00605B0 26F741F0 */ addiu $s7, $s7, %lo(gMatrixListPos) -/* 363714 E00605B4 3C160001 */ lui $s6, 1 -/* 363718 E00605B8 36D61630 */ ori $s6, $s6, 0x1630 -/* 36371C E00605BC 26110020 */ addiu $s1, $s0, 0x20 -.LE00605C0: -/* 363720 E00605C0 32700001 */ andi $s0, $s3, 1 -/* 363724 E00605C4 00101080 */ sll $v0, $s0, 2 -/* 363728 E00605C8 3C08E006 */ lui $t0, %hi(D_E0060730) -/* 36372C E00605CC 25080730 */ addiu $t0, $t0, %lo(D_E0060730) -/* 363730 E00605D0 00481021 */ addu $v0, $v0, $t0 -/* 363734 E00605D4 8E25FFE4 */ lw $a1, -0x1c($s1) -/* 363738 E00605D8 8E26FFE8 */ lw $a2, -0x18($s1) -/* 36373C E00605DC 8E27FFEC */ lw $a3, -0x14($s1) -/* 363740 E00605E0 8C550000 */ lw $s5, ($v0) -/* 363744 E00605E4 0C080108 */ jal shim_guTranslateF -/* 363748 E00605E8 0240202D */ daddu $a0, $s2, $zero -/* 36374C E00605EC 0240202D */ daddu $a0, $s2, $zero -/* 363750 E00605F0 27A50098 */ addiu $a1, $sp, 0x98 -/* 363754 E00605F4 0C080114 */ jal shim_guMtxCatF -/* 363758 E00605F8 27A60018 */ addiu $a2, $sp, 0x18 -/* 36375C E00605FC 56000016 */ bnel $s0, $zero, .LE0060658 -/* 363760 E0060600 27A40018 */ addiu $a0, $sp, 0x18 -/* 363764 E0060604 E7B60010 */ swc1 $f22, 0x10($sp) -/* 363768 E0060608 8E25FFF8 */ lw $a1, -8($s1) -/* 36376C E006060C 4406A000 */ mfc1 $a2, $f20 -/* 363770 E0060610 4407A000 */ mfc1 $a3, $f20 -/* 363774 E0060614 0C080104 */ jal shim_guRotateF -/* 363778 E0060618 0240202D */ daddu $a0, $s2, $zero -/* 36377C E006061C 0240202D */ daddu $a0, $s2, $zero -/* 363780 E0060620 27A50018 */ addiu $a1, $sp, 0x18 -/* 363784 E0060624 0C080114 */ jal shim_guMtxCatF -/* 363788 E0060628 00A0302D */ daddu $a2, $a1, $zero -/* 36378C E006062C E7B40010 */ swc1 $f20, 0x10($sp) -/* 363790 E0060630 8E250000 */ lw $a1, ($s1) -/* 363794 E0060634 4406A000 */ mfc1 $a2, $f20 -/* 363798 E0060638 4407B000 */ mfc1 $a3, $f22 -/* 36379C E006063C 0C080104 */ jal shim_guRotateF -/* 3637A0 E0060640 0240202D */ daddu $a0, $s2, $zero -/* 3637A4 E0060644 0240202D */ daddu $a0, $s2, $zero -/* 3637A8 E0060648 27A50018 */ addiu $a1, $sp, 0x18 -/* 3637AC E006064C 0C080114 */ jal shim_guMtxCatF -/* 3637B0 E0060650 00A0302D */ daddu $a2, $a1, $zero -/* 3637B4 E0060654 27A40018 */ addiu $a0, $sp, 0x18 -.LE0060658: -/* 3637B8 E0060658 26730001 */ addiu $s3, $s3, 1 -/* 3637BC E006065C 96E50000 */ lhu $a1, ($s7) -/* 3637C0 E0060660 8FC20000 */ lw $v0, ($fp) -/* 3637C4 E0060664 00052980 */ sll $a1, $a1, 6 -/* 3637C8 E0060668 00B62821 */ addu $a1, $a1, $s6 -/* 3637CC E006066C 0C080118 */ jal shim_guMtxF2L -/* 3637D0 E0060670 00452821 */ addu $a1, $v0, $a1 -/* 3637D4 E0060674 3C06D838 */ lui $a2, 0xd838 -/* 3637D8 E0060678 8E840000 */ lw $a0, ($s4) -/* 3637DC E006067C 34C60002 */ ori $a2, $a2, 2 -/* 3637E0 E0060680 0080282D */ daddu $a1, $a0, $zero -/* 3637E4 E0060684 24840008 */ addiu $a0, $a0, 8 -/* 3637E8 E0060688 AE840000 */ sw $a0, ($s4) -/* 3637EC E006068C 96E20000 */ lhu $v0, ($s7) -/* 3637F0 E0060690 3C03DA38 */ lui $v1, 0xda38 -/* 3637F4 E0060694 ACA30000 */ sw $v1, ($a1) -/* 3637F8 E0060698 24430001 */ addiu $v1, $v0, 1 -/* 3637FC E006069C 3042FFFF */ andi $v0, $v0, 0xffff -/* 363800 E00606A0 00021180 */ sll $v0, $v0, 6 -/* 363804 E00606A4 A6E30000 */ sh $v1, ($s7) -/* 363808 E00606A8 8FC30000 */ lw $v1, ($fp) -/* 36380C E00606AC 00561021 */ addu $v0, $v0, $s6 -/* 363810 E00606B0 00621821 */ addu $v1, $v1, $v0 -/* 363814 E00606B4 24820008 */ addiu $v0, $a0, 8 -/* 363818 E00606B8 ACA30004 */ sw $v1, 4($a1) -/* 36381C E00606BC AE820000 */ sw $v0, ($s4) -/* 363820 E00606C0 3C02DE00 */ lui $v0, 0xde00 -/* 363824 E00606C4 AC820000 */ sw $v0, ($a0) -/* 363828 E00606C8 24020040 */ addiu $v0, $zero, 0x40 -/* 36382C E00606CC AC950004 */ sw $s5, 4($a0) -/* 363830 E00606D0 AC860008 */ sw $a2, 8($a0) -/* 363834 E00606D4 AC82000C */ sw $v0, 0xc($a0) -/* 363838 E00606D8 8FA80110 */ lw $t0, 0x110($sp) -/* 36383C E00606DC 26310030 */ addiu $s1, $s1, 0x30 -/* 363840 E00606E0 8D020008 */ lw $v0, 8($t0) -/* 363844 E00606E4 24840010 */ addiu $a0, $a0, 0x10 -/* 363848 E00606E8 0262102A */ slt $v0, $s3, $v0 -/* 36384C E00606EC 1440FFB4 */ bnez $v0, .LE00605C0 -/* 363850 E00606F0 AE840000 */ sw $a0, ($s4) -.LE00606F4: -/* 363854 E00606F4 8FBF00FC */ lw $ra, 0xfc($sp) -/* 363858 E00606F8 8FBE00F8 */ lw $fp, 0xf8($sp) -/* 36385C E00606FC 8FB700F4 */ lw $s7, 0xf4($sp) -/* 363860 E0060700 8FB600F0 */ lw $s6, 0xf0($sp) -/* 363864 E0060704 8FB500EC */ lw $s5, 0xec($sp) -/* 363868 E0060708 8FB400E8 */ lw $s4, 0xe8($sp) -/* 36386C E006070C 8FB300E4 */ lw $s3, 0xe4($sp) -/* 363870 E0060710 8FB200E0 */ lw $s2, 0xe0($sp) -/* 363874 E0060714 8FB100DC */ lw $s1, 0xdc($sp) -/* 363878 E0060718 8FB000D8 */ lw $s0, 0xd8($sp) -/* 36387C E006071C D7B60108 */ ldc1 $f22, 0x108($sp) -/* 363880 E0060720 D7B40100 */ ldc1 $f20, 0x100($sp) -/* 363884 E0060724 03E00008 */ jr $ra -/* 363888 E0060728 27BD0110 */ addiu $sp, $sp, 0x110 -/* 36388C E006072C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_main.s b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_main.s deleted file mode 100644 index c2efc39c16..0000000000 --- a/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_main.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel big_snowflakes_main -/* 363160 E0060000 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 363164 E0060004 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 363168 E0060008 4485A000 */ mtc1 $a1, $f20 -/* 36316C E006000C AFB20030 */ sw $s2, 0x30($sp) -/* 363170 E0060010 0080902D */ daddu $s2, $a0, $zero -/* 363174 E0060014 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 363178 E0060018 4486B000 */ mtc1 $a2, $f22 -/* 36317C E006001C 27A40010 */ addiu $a0, $sp, 0x10 -/* 363180 E0060020 F7B80050 */ sdc1 $f24, 0x50($sp) -/* 363184 E0060024 4487C000 */ mtc1 $a3, $f24 -/* 363188 E0060028 3C02E006 */ lui $v0, %hi(big_snowflakes_init) -/* 36318C E006002C 244201D8 */ addiu $v0, $v0, %lo(big_snowflakes_init) -/* 363190 E0060030 AFA20018 */ sw $v0, 0x18($sp) -/* 363194 E0060034 3C02E006 */ lui $v0, %hi(big_snowflakes_update) -/* 363198 E0060038 244201E0 */ addiu $v0, $v0, %lo(big_snowflakes_update) -/* 36319C E006003C AFA2001C */ sw $v0, 0x1c($sp) -/* 3631A0 E0060040 3C02E006 */ lui $v0, %hi(big_snowflakes_render) -/* 3631A4 E0060044 2442040C */ addiu $v0, $v0, %lo(big_snowflakes_render) -/* 3631A8 E0060048 AFA20020 */ sw $v0, 0x20($sp) -/* 3631AC E006004C 24020030 */ addiu $v0, $zero, 0x30 -/* 3631B0 E0060050 AFBF003C */ sw $ra, 0x3c($sp) -/* 3631B4 E0060054 AFB40038 */ sw $s4, 0x38($sp) -/* 3631B8 E0060058 AFB30034 */ sw $s3, 0x34($sp) -/* 3631BC E006005C AFB1002C */ sw $s1, 0x2c($sp) -/* 3631C0 E0060060 AFB00028 */ sw $s0, 0x28($sp) -/* 3631C4 E0060064 AFA00010 */ sw $zero, 0x10($sp) -/* 3631C8 E0060068 AFA00024 */ sw $zero, 0x24($sp) -/* 3631CC E006006C 0C080124 */ jal shim_create_effect_instance -/* 3631D0 E0060070 AFA20014 */ sw $v0, 0x14($sp) -/* 3631D4 E0060074 240401B0 */ addiu $a0, $zero, 0x1b0 -/* 3631D8 E0060078 24130009 */ addiu $s3, $zero, 9 -/* 3631DC E006007C 0040802D */ daddu $s0, $v0, $zero -/* 3631E0 E0060080 0C08012C */ jal shim_general_heap_malloc -/* 3631E4 E0060084 AE130008 */ sw $s3, 8($s0) -/* 3631E8 E0060088 0040882D */ daddu $s1, $v0, $zero -/* 3631EC E006008C 16200003 */ bnez $s1, .LE006009C -/* 3631F0 E0060090 AE11000C */ sw $s1, 0xc($s0) -.LE0060094: -/* 3631F4 E0060094 08018025 */ j .LE0060094 -/* 3631F8 E0060098 00000000 */ nop -.LE006009C: -/* 3631FC E006009C 0220202D */ daddu $a0, $s1, $zero -/* 363200 E00600A0 00132840 */ sll $a1, $s3, 1 -/* 363204 E00600A4 00B32821 */ addu $a1, $a1, $s3 -/* 363208 E00600A8 0C080130 */ jal shim_mem_clear -/* 36320C E00600AC 00052900 */ sll $a1, $a1, 4 -/* 363210 E00600B0 2402001E */ addiu $v0, $zero, 0x1e -/* 363214 E00600B4 AE320000 */ sw $s2, ($s1) -/* 363218 E00600B8 E6340004 */ swc1 $f20, 4($s1) -/* 36321C E00600BC E6360008 */ swc1 $f22, 8($s1) -/* 363220 E00600C0 E638000C */ swc1 $f24, 0xc($s1) -/* 363224 E00600C4 AE220028 */ sw $v0, 0x28($s1) -/* 363228 E00600C8 AE20002C */ sw $zero, 0x2c($s1) -/* 36322C E00600CC AE200024 */ sw $zero, 0x24($s1) -/* 363230 E00600D0 24120001 */ addiu $s2, $zero, 1 -/* 363234 E00600D4 0253102A */ slt $v0, $s2, $s3 -/* 363238 E00600D8 10400034 */ beqz $v0, .LE00601AC -/* 36323C E00600DC 26310030 */ addiu $s1, $s1, 0x30 -/* 363240 E00600E0 3C146666 */ lui $s4, 0x6666 -/* 363244 E00600E4 36946667 */ ori $s4, $s4, 0x6667 -/* 363248 E00600E8 26300014 */ addiu $s0, $s1, 0x14 -/* 36324C E00600EC 3C014120 */ lui $at, 0x4120 -/* 363250 E00600F0 4481B000 */ mtc1 $at, $f22 -/* 363254 E00600F4 3C014000 */ lui $at, 0x4000 -/* 363258 E00600F8 4481A000 */ mtc1 $at, $f20 -.LE00600FC: -/* 36325C E00600FC 0C080000 */ jal func_E0200000 -/* 363260 E0060100 2404000A */ addiu $a0, $zero, 0xa -/* 363264 E0060104 2404000A */ addiu $a0, $zero, 0xa -/* 363268 E0060108 2442FFFB */ addiu $v0, $v0, -5 -/* 36326C E006010C 44820000 */ mtc1 $v0, $f0 -/* 363270 E0060110 00000000 */ nop -/* 363274 E0060114 46800020 */ cvt.s.w $f0, $f0 -/* 363278 E0060118 0C080000 */ jal func_E0200000 -/* 36327C E006011C E600FFF0 */ swc1 $f0, -0x10($s0) -/* 363280 E0060120 24040168 */ addiu $a0, $zero, 0x168 -/* 363284 E0060124 24420005 */ addiu $v0, $v0, 5 -/* 363288 E0060128 44820000 */ mtc1 $v0, $f0 -/* 36328C E006012C 00000000 */ nop -/* 363290 E0060130 46800020 */ cvt.s.w $f0, $f0 -/* 363294 E0060134 E600FFF4 */ swc1 $f0, -0xc($s0) -/* 363298 E0060138 0C080000 */ jal func_E0200000 -/* 36329C E006013C E616FFF8 */ swc1 $f22, -8($s0) -/* 3632A0 E0060140 24040168 */ addiu $a0, $zero, 0x168 -/* 3632A4 E0060144 44820000 */ mtc1 $v0, $f0 -/* 3632A8 E0060148 00000000 */ nop -/* 3632AC E006014C 46800020 */ cvt.s.w $f0, $f0 -/* 3632B0 E0060150 0C080000 */ jal func_E0200000 -/* 3632B4 E0060154 E6000004 */ swc1 $f0, 4($s0) -/* 3632B8 E0060158 24040064 */ addiu $a0, $zero, 0x64 -/* 3632BC E006015C 44820000 */ mtc1 $v0, $f0 -/* 3632C0 E0060160 00000000 */ nop -/* 3632C4 E0060164 46800020 */ cvt.s.w $f0, $f0 -/* 3632C8 E0060168 0C080000 */ jal func_E0200000 -/* 3632CC E006016C E600000C */ swc1 $f0, 0xc($s0) -/* 3632D0 E0060170 00540018 */ mult $v0, $s4 -/* 3632D4 E0060174 26520001 */ addiu $s2, $s2, 1 -/* 3632D8 E0060178 000217C3 */ sra $v0, $v0, 0x1f -/* 3632DC E006017C AE00FFFC */ sw $zero, -4($s0) -/* 3632E0 E0060180 E6140000 */ swc1 $f20, ($s0) -/* 3632E4 E0060184 00004010 */ mfhi $t0 -/* 3632E8 E0060188 00081883 */ sra $v1, $t0, 2 -/* 3632EC E006018C 00621823 */ subu $v1, $v1, $v0 -/* 3632F0 E0060190 44830000 */ mtc1 $v1, $f0 -/* 3632F4 E0060194 00000000 */ nop -/* 3632F8 E0060198 46800020 */ cvt.s.w $f0, $f0 -/* 3632FC E006019C E6000008 */ swc1 $f0, 8($s0) -/* 363300 E00601A0 0253102A */ slt $v0, $s2, $s3 -/* 363304 E00601A4 1440FFD5 */ bnez $v0, .LE00600FC -/* 363308 E00601A8 26100030 */ addiu $s0, $s0, 0x30 -.LE00601AC: -/* 36330C E00601AC 8FBF003C */ lw $ra, 0x3c($sp) -/* 363310 E00601B0 8FB40038 */ lw $s4, 0x38($sp) -/* 363314 E00601B4 8FB30034 */ lw $s3, 0x34($sp) -/* 363318 E00601B8 8FB20030 */ lw $s2, 0x30($sp) -/* 36331C E00601BC 8FB1002C */ lw $s1, 0x2c($sp) -/* 363320 E00601C0 8FB00028 */ lw $s0, 0x28($sp) -/* 363324 E00601C4 D7B80050 */ ldc1 $f24, 0x50($sp) -/* 363328 E00601C8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 36332C E00601CC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 363330 E00601D0 03E00008 */ jr $ra -/* 363334 E00601D4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_update.s b/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_update.s deleted file mode 100644 index 18727c240f..0000000000 --- a/ver/us/asm/nonmatchings/effects/big_snowflakes/big_snowflakes_update.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel big_snowflakes_update -/* 363340 E00601E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 363344 E00601E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 363348 E00601E8 0080982D */ daddu $s3, $a0, $zero -/* 36334C E00601EC AFBF0020 */ sw $ra, 0x20($sp) -/* 363350 E00601F0 AFB20018 */ sw $s2, 0x18($sp) -/* 363354 E00601F4 AFB10014 */ sw $s1, 0x14($sp) -/* 363358 E00601F8 AFB00010 */ sw $s0, 0x10($sp) -/* 36335C E00601FC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 363360 E0060200 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 363364 E0060204 8E64000C */ lw $a0, 0xc($s3) -/* 363368 E0060208 8C820028 */ lw $v0, 0x28($a0) -/* 36336C E006020C 2442FFFF */ addiu $v0, $v0, -1 -/* 363370 E0060210 AC820028 */ sw $v0, 0x28($a0) -/* 363374 E0060214 8C82002C */ lw $v0, 0x2c($a0) -/* 363378 E0060218 8C850028 */ lw $a1, 0x28($a0) -/* 36337C E006021C 24420001 */ addiu $v0, $v0, 1 -/* 363380 E0060220 04A10005 */ bgez $a1, .LE0060238 -/* 363384 E0060224 AC82002C */ sw $v0, 0x2c($a0) -/* 363388 E0060228 0C080128 */ jal shim_remove_effect -/* 36338C E006022C 0260202D */ daddu $a0, $s3, $zero -/* 363390 E0060230 080180FA */ j .LE00603E8 -/* 363394 E0060234 00000000 */ nop -.LE0060238: -/* 363398 E0060238 2842000A */ slti $v0, $v0, 0xa -/* 36339C E006023C 10400011 */ beqz $v0, .LE0060284 -/* 3633A0 E0060240 00A0302D */ daddu $a2, $a1, $zero -/* 3633A4 E0060244 240200FF */ addiu $v0, $zero, 0xff -/* 3633A8 E0060248 8C830024 */ lw $v1, 0x24($a0) -/* 3633AC E006024C 3C01E006 */ lui $at, %hi(D_E0060740) -/* 3633B0 E0060250 D4200740 */ ldc1 $f0, %lo(D_E0060740)($at) -/* 3633B4 E0060254 00431023 */ subu $v0, $v0, $v1 -/* 3633B8 E0060258 44821000 */ mtc1 $v0, $f2 -/* 3633BC E006025C 00000000 */ nop -/* 3633C0 E0060260 468010A1 */ cvt.d.w $f2, $f2 -/* 3633C4 E0060264 46201082 */ mul.d $f2, $f2, $f0 -/* 3633C8 E0060268 00000000 */ nop -/* 3633CC E006026C 44830000 */ mtc1 $v1, $f0 -/* 3633D0 E0060270 00000000 */ nop -/* 3633D4 E0060274 46800021 */ cvt.d.w $f0, $f0 -/* 3633D8 E0060278 46220000 */ add.d $f0, $f0, $f2 -/* 3633DC E006027C 4620020D */ trunc.w.d $f8, $f0 -/* 3633E0 E0060280 E4880024 */ swc1 $f8, 0x24($a0) -.LE0060284: -/* 3633E4 E0060284 28C2000A */ slti $v0, $a2, 0xa -/* 3633E8 E0060288 10400009 */ beqz $v0, .LE00602B0 -/* 3633EC E006028C 00000000 */ nop -/* 3633F0 E0060290 3C01E006 */ lui $at, %hi(D_E0060748) -/* 3633F4 E0060294 D4220748 */ ldc1 $f2, %lo(D_E0060748)($at) -/* 3633F8 E0060298 C4800024 */ lwc1 $f0, 0x24($a0) -/* 3633FC E006029C 46800021 */ cvt.d.w $f0, $f0 -/* 363400 E00602A0 46220002 */ mul.d $f0, $f0, $f2 -/* 363404 E00602A4 00000000 */ nop -/* 363408 E00602A8 4620020D */ trunc.w.d $f8, $f0 -/* 36340C E00602AC E4880024 */ swc1 $f8, 0x24($a0) -.LE00602B0: -/* 363410 E00602B0 8E620008 */ lw $v0, 8($s3) -/* 363414 E00602B4 24110001 */ addiu $s1, $zero, 1 -/* 363418 E00602B8 0222102A */ slt $v0, $s1, $v0 -/* 36341C E00602BC 1040004A */ beqz $v0, .LE00603E8 -/* 363420 E00602C0 24840030 */ addiu $a0, $a0, 0x30 -/* 363424 E00602C4 24900008 */ addiu $s0, $a0, 8 -/* 363428 E00602C8 24B20014 */ addiu $s2, $a1, 0x14 -/* 36342C E00602CC 3C01BD4C */ lui $at, 0xbd4c -/* 363430 E00602D0 3421CCCD */ ori $at, $at, 0xcccd -/* 363434 E00602D4 4481B000 */ mtc1 $at, $f22 -/* 363438 E00602D8 3C014120 */ lui $at, 0x4120 -/* 36343C E00602DC 4481A000 */ mtc1 $at, $f20 -.LE00602E0: -/* 363440 E00602E0 C60C0010 */ lwc1 $f12, 0x10($s0) -/* 363444 E00602E4 0C080140 */ jal shim_sin_deg -/* 363448 E00602E8 460C6300 */ add.s $f12, $f12, $f12 -/* 36344C E00602EC 3C01E006 */ lui $at, %hi(D_E0060750) -/* 363450 E00602F0 D4220750 */ ldc1 $f2, %lo(D_E0060750)($at) -/* 363454 E00602F4 46000021 */ cvt.d.s $f0, $f0 -/* 363458 E00602F8 46220002 */ mul.d $f0, $f0, $f2 -/* 36345C E00602FC 00000000 */ nop -/* 363460 E0060300 C6020008 */ lwc1 $f2, 8($s0) -/* 363464 E0060304 46200020 */ cvt.s.d $f0, $f0 -/* 363468 E0060308 46001080 */ add.s $f2, $f2, $f0 -/* 36346C E006030C 3C01E006 */ lui $at, %hi(D_E0060758) -/* 363470 E0060310 D4200758 */ ldc1 $f0, %lo(D_E0060758)($at) -/* 363474 E0060314 E6020008 */ swc1 $f2, 8($s0) -/* 363478 E0060318 460010A1 */ cvt.d.s $f2, $f2 -/* 36347C E006031C 46201082 */ mul.d $f2, $f2, $f0 -/* 363480 E0060320 00000000 */ nop -/* 363484 E0060324 C600000C */ lwc1 $f0, 0xc($s0) -/* 363488 E0060328 46160000 */ add.s $f0, $f0, $f22 -/* 36348C E006032C E600000C */ swc1 $f0, 0xc($s0) -/* 363490 E0060330 46160000 */ add.s $f0, $f0, $f22 -/* 363494 E0060334 24040032 */ addiu $a0, $zero, 0x32 -/* 363498 E0060338 0240282D */ daddu $a1, $s2, $zero -/* 36349C E006033C E600000C */ swc1 $f0, 0xc($s0) -/* 3634A0 E0060340 462010A0 */ cvt.s.d $f2, $f2 -/* 3634A4 E0060344 0C080011 */ jal func_E0200044 -/* 3634A8 E0060348 E6020008 */ swc1 $f2, 8($s0) -/* 3634AC E006034C 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 3634B0 E0060350 C60C0014 */ lwc1 $f12, 0x14($s0) -/* 3634B4 E0060354 44820000 */ mtc1 $v0, $f0 -/* 3634B8 E0060358 00000000 */ nop -/* 3634BC E006035C 46800020 */ cvt.s.w $f0, $f0 -/* 3634C0 E0060360 46006300 */ add.s $f12, $f12, $f0 -/* 3634C4 E0060364 0C080140 */ jal shim_sin_deg -/* 3634C8 E0060368 E60C0014 */ swc1 $f12, 0x14($s0) -/* 3634CC E006036C 46140002 */ mul.s $f0, $f0, $f20 -/* 3634D0 E0060370 00000000 */ nop -/* 3634D4 E0060374 C6020014 */ lwc1 $f2, 0x14($s0) -/* 3634D8 E0060378 3C013F00 */ lui $at, 0x3f00 -/* 3634DC E006037C 44816000 */ mtc1 $at, $f12 -/* 3634E0 E0060380 00000000 */ nop -/* 3634E4 E0060384 460C1302 */ mul.s $f12, $f2, $f12 -/* 3634E8 E0060388 00000000 */ nop -/* 3634EC E006038C C6020010 */ lwc1 $f2, 0x10($s0) -/* 3634F0 E0060390 46001080 */ add.s $f2, $f2, $f0 -/* 3634F4 E0060394 0C080144 */ jal shim_cos_deg -/* 3634F8 E0060398 E6020010 */ swc1 $f2, 0x10($s0) -/* 3634FC E006039C 46140002 */ mul.s $f0, $f0, $f20 -/* 363500 E00603A0 00000000 */ nop -/* 363504 E00603A4 C606FFFC */ lwc1 $f6, -4($s0) -/* 363508 E00603A8 C6020008 */ lwc1 $f2, 8($s0) -/* 36350C E00603AC C6040000 */ lwc1 $f4, ($s0) -/* 363510 E00603B0 46023180 */ add.s $f6, $f6, $f2 -/* 363514 E00603B4 C602000C */ lwc1 $f2, 0xc($s0) -/* 363518 E00603B8 26310001 */ addiu $s1, $s1, 1 -/* 36351C E00603BC 46022100 */ add.s $f4, $f4, $f2 -/* 363520 E00603C0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 363524 E00603C4 26520014 */ addiu $s2, $s2, 0x14 -/* 363528 E00603C8 46001080 */ add.s $f2, $f2, $f0 -/* 36352C E00603CC E606FFFC */ swc1 $f6, -4($s0) -/* 363530 E00603D0 E6040000 */ swc1 $f4, ($s0) -/* 363534 E00603D4 E6020018 */ swc1 $f2, 0x18($s0) -/* 363538 E00603D8 8E620008 */ lw $v0, 8($s3) -/* 36353C E00603DC 0222102A */ slt $v0, $s1, $v0 -/* 363540 E00603E0 1440FFBF */ bnez $v0, .LE00602E0 -/* 363544 E00603E4 26100030 */ addiu $s0, $s0, 0x30 -.LE00603E8: -/* 363548 E00603E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 36354C E00603EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 363550 E00603F0 8FB20018 */ lw $s2, 0x18($sp) -/* 363554 E00603F4 8FB10014 */ lw $s1, 0x14($sp) -/* 363558 E00603F8 8FB00010 */ lw $s0, 0x10($sp) -/* 36355C E00603FC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 363560 E0060400 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 363564 E0060404 03E00008 */ jr $ra -/* 363568 E0060408 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/effects/butterflies/butterflies_appendGfx.s b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_appendGfx.s deleted file mode 100644 index 0935375d78..0000000000 --- a/ver/us/asm/nonmatchings/effects/butterflies/butterflies_appendGfx.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel butterflies_appendGfx -/* 3AAD24 E00AA404 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* 3AAD28 E00AA408 3C03DB06 */ lui $v1, 0xdb06 -/* 3AAD2C E00AA40C AFB1009C */ sw $s1, 0x9c($sp) -/* 3AAD30 E00AA410 3C11800A */ lui $s1, %hi(gMasterGfxPos) -/* 3AAD34 E00AA414 2631A66C */ addiu $s1, $s1, %lo(gMasterGfxPos) -/* 3AAD38 E00AA418 34630024 */ ori $v1, $v1, 0x24 -/* 3AAD3C E00AA41C AFB700B4 */ sw $s7, 0xb4($sp) -/* 3AAD40 E00AA420 3C17E700 */ lui $s7, 0xe700 -/* 3AAD44 E00AA424 AFBF00B8 */ sw $ra, 0xb8($sp) -/* 3AAD48 E00AA428 AFB600B0 */ sw $s6, 0xb0($sp) -/* 3AAD4C E00AA42C AFB500AC */ sw $s5, 0xac($sp) -/* 3AAD50 E00AA430 AFB400A8 */ sw $s4, 0xa8($sp) -/* 3AAD54 E00AA434 AFB300A4 */ sw $s3, 0xa4($sp) -/* 3AAD58 E00AA438 AFB200A0 */ sw $s2, 0xa0($sp) -/* 3AAD5C E00AA43C AFB00098 */ sw $s0, 0x98($sp) -/* 3AAD60 E00AA440 8E250000 */ lw $a1, ($s1) -/* 3AAD64 E00AA444 8C93000C */ lw $s3, 0xc($a0) -/* 3AAD68 E00AA448 00A0102D */ daddu $v0, $a1, $zero -/* 3AAD6C E00AA44C 8E720024 */ lw $s2, 0x24($s3) -/* 3AAD70 E00AA450 8E750000 */ lw $s5, ($s3) -/* 3AAD74 E00AA454 24A50008 */ addiu $a1, $a1, 8 -/* 3AAD78 E00AA458 AC570000 */ sw $s7, ($v0) -/* 3AAD7C E00AA45C AC400004 */ sw $zero, 4($v0) -/* 3AAD80 E00AA460 ACA30000 */ sw $v1, ($a1) -/* 3AAD84 E00AA464 8C820010 */ lw $v0, 0x10($a0) -/* 3AAD88 E00AA468 AE250000 */ sw $a1, ($s1) -/* 3AAD8C E00AA46C 8C42001C */ lw $v0, 0x1c($v0) -/* 3AAD90 E00AA470 3C038000 */ lui $v1, 0x8000 -/* 3AAD94 E00AA474 00431021 */ addu $v0, $v0, $v1 -/* 3AAD98 E00AA478 ACA20004 */ sw $v0, 4($a1) -/* 3AAD9C E00AA47C 8E62002C */ lw $v0, 0x2c($s3) -/* 3AADA0 E00AA480 24A50008 */ addiu $a1, $a1, 8 -/* 3AADA4 E00AA484 AE250000 */ sw $a1, ($s1) -/* 3AADA8 E00AA488 3C01E00B */ lui $at, %hi(D_E00AA6EC) -/* 3AADAC E00AA48C 00220821 */ addu $at, $at, $v0 -/* 3AADB0 E00AA490 8022A6EC */ lb $v0, %lo(D_E00AA6EC)($at) -/* 3AADB4 E00AA494 3C013E99 */ lui $at, 0x3e99 -/* 3AADB8 E00AA498 3421999A */ ori $at, $at, 0x999a -/* 3AADBC E00AA49C 44811000 */ mtc1 $at, $f2 -/* 3AADC0 E00AA4A0 44820000 */ mtc1 $v0, $f0 -/* 3AADC4 E00AA4A4 00000000 */ nop -/* 3AADC8 E00AA4A8 46800020 */ cvt.s.w $f0, $f0 -/* 3AADCC E00AA4AC 46020002 */ mul.s $f0, $f0, $f2 -/* 3AADD0 E00AA4B0 00000000 */ nop -/* 3AADD4 E00AA4B4 C6620010 */ lwc1 $f2, 0x10($s3) -/* 3AADD8 E00AA4B8 46001080 */ add.s $f2, $f2, $f0 -/* 3AADDC E00AA4BC 8E65000C */ lw $a1, 0xc($s3) -/* 3AADE0 E00AA4C0 8E670014 */ lw $a3, 0x14($s3) -/* 3AADE4 E00AA4C4 44061000 */ mfc1 $a2, $f2 -/* 3AADE8 E00AA4C8 0C080108 */ jal shim_guTranslateF -/* 3AADEC E00AA4CC 27A40018 */ addiu $a0, $sp, 0x18 -/* 3AADF0 E00AA4D0 3C160001 */ lui $s6, 1 -/* 3AADF4 E00AA4D4 3C073F80 */ lui $a3, 0x3f80 -/* 3AADF8 E00AA4D8 44800000 */ mtc1 $zero, $f0 -/* 3AADFC E00AA4DC 27B00058 */ addiu $s0, $sp, 0x58 -/* 3AAE00 E00AA4E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 3AAE04 E00AA4E4 8E650028 */ lw $a1, 0x28($s3) -/* 3AAE08 E00AA4E8 44060000 */ mfc1 $a2, $f0 -/* 3AAE0C E00AA4EC 0C080104 */ jal shim_guRotateF -/* 3AAE10 E00AA4F0 0200202D */ daddu $a0, $s0, $zero -/* 3AAE14 E00AA4F4 0200202D */ daddu $a0, $s0, $zero -/* 3AAE18 E00AA4F8 27A50018 */ addiu $a1, $sp, 0x18 -/* 3AAE1C E00AA4FC 0C080114 */ jal shim_guMtxCatF -/* 3AAE20 E00AA500 00A0302D */ daddu $a2, $a1, $zero -/* 3AAE24 E00AA504 3C013CA3 */ lui $at, 0x3ca3 -/* 3AAE28 E00AA508 3421D70A */ ori $at, $at, 0xd70a -/* 3AAE2C E00AA50C 44810000 */ mtc1 $at, $f0 -/* 3AAE30 E00AA510 36D61630 */ ori $s6, $s6, 0x1630 -/* 3AAE34 E00AA514 44050000 */ mfc1 $a1, $f0 -/* 3AAE38 E00AA518 0200202D */ daddu $a0, $s0, $zero -/* 3AAE3C E00AA51C 00A0302D */ daddu $a2, $a1, $zero -/* 3AAE40 E00AA520 0C080110 */ jal shim_guScaleF -/* 3AAE44 E00AA524 00A0382D */ daddu $a3, $a1, $zero -/* 3AAE48 E00AA528 0200202D */ daddu $a0, $s0, $zero -/* 3AAE4C E00AA52C 27A50018 */ addiu $a1, $sp, 0x18 -/* 3AAE50 E00AA530 0C080114 */ jal shim_guMtxCatF -/* 3AAE54 E00AA534 00A0302D */ daddu $a2, $a1, $zero -/* 3AAE58 E00AA538 27A40018 */ addiu $a0, $sp, 0x18 -/* 3AAE5C E00AA53C 3C108007 */ lui $s0, %hi(gMatrixListPos) -/* 3AAE60 E00AA540 261041F0 */ addiu $s0, $s0, %lo(gMatrixListPos) -/* 3AAE64 E00AA544 3C14800A */ lui $s4, %hi(gDisplayContext) -/* 3AAE68 E00AA548 2694A674 */ addiu $s4, $s4, %lo(gDisplayContext) -/* 3AAE6C E00AA54C 96050000 */ lhu $a1, ($s0) -/* 3AAE70 E00AA550 8E820000 */ lw $v0, ($s4) -/* 3AAE74 E00AA554 00052980 */ sll $a1, $a1, 6 -/* 3AAE78 E00AA558 00B62821 */ addu $a1, $a1, $s6 -/* 3AAE7C E00AA55C 0C080118 */ jal shim_guMtxF2L -/* 3AAE80 E00AA560 00452821 */ addu $a1, $v0, $a1 -/* 3AAE84 E00AA564 3C03DA38 */ lui $v1, 0xda38 -/* 3AAE88 E00AA568 34630002 */ ori $v1, $v1, 2 -/* 3AAE8C E00AA56C 3C060100 */ lui $a2, 0x100 -/* 3AAE90 E00AA570 34C6600C */ ori $a2, $a2, 0x600c -/* 3AAE94 E00AA574 3C07D838 */ lui $a3, 0xd838 -/* 3AAE98 E00AA578 34E70002 */ ori $a3, $a3, 2 -/* 3AAE9C E00AA57C 325200FF */ andi $s2, $s2, 0xff -/* 3AAEA0 E00AA580 0015A880 */ sll $s5, $s5, 2 -/* 3AAEA4 E00AA584 8E240000 */ lw $a0, ($s1) -/* 3AAEA8 E00AA588 96020000 */ lhu $v0, ($s0) -/* 3AAEAC E00AA58C 0080282D */ daddu $a1, $a0, $zero -/* 3AAEB0 E00AA590 24840008 */ addiu $a0, $a0, 8 -/* 3AAEB4 E00AA594 AE240000 */ sw $a0, ($s1) -/* 3AAEB8 E00AA598 ACA30000 */ sw $v1, ($a1) -/* 3AAEBC E00AA59C 24430001 */ addiu $v1, $v0, 1 -/* 3AAEC0 E00AA5A0 3042FFFF */ andi $v0, $v0, 0xffff -/* 3AAEC4 E00AA5A4 00021180 */ sll $v0, $v0, 6 -/* 3AAEC8 E00AA5A8 A6030000 */ sh $v1, ($s0) -/* 3AAECC E00AA5AC 8E830000 */ lw $v1, ($s4) -/* 3AAED0 E00AA5B0 00561021 */ addu $v0, $v0, $s6 -/* 3AAED4 E00AA5B4 00621821 */ addu $v1, $v1, $v0 -/* 3AAED8 E00AA5B8 24820008 */ addiu $v0, $a0, 8 -/* 3AAEDC E00AA5BC ACA30004 */ sw $v1, 4($a1) -/* 3AAEE0 E00AA5C0 AE220000 */ sw $v0, ($s1) -/* 3AAEE4 E00AA5C4 3C02FA00 */ lui $v0, 0xfa00 -/* 3AAEE8 E00AA5C8 AC820000 */ sw $v0, ($a0) -/* 3AAEEC E00AA5CC 00121600 */ sll $v0, $s2, 0x18 -/* 3AAEF0 E00AA5D0 00121C00 */ sll $v1, $s2, 0x10 -/* 3AAEF4 E00AA5D4 00431025 */ or $v0, $v0, $v1 -/* 3AAEF8 E00AA5D8 00129200 */ sll $s2, $s2, 8 -/* 3AAEFC E00AA5DC 00521025 */ or $v0, $v0, $s2 -/* 3AAF00 E00AA5E0 344200FF */ ori $v0, $v0, 0xff -/* 3AAF04 E00AA5E4 AC820004 */ sw $v0, 4($a0) -/* 3AAF08 E00AA5E8 24820010 */ addiu $v0, $a0, 0x10 -/* 3AAF0C E00AA5EC 3C03DE00 */ lui $v1, 0xde00 -/* 3AAF10 E00AA5F0 AE220000 */ sw $v0, ($s1) -/* 3AAF14 E00AA5F4 3C020900 */ lui $v0, 0x900 -/* 3AAF18 E00AA5F8 24423880 */ addiu $v0, $v0, 0x3880 -/* 3AAF1C E00AA5FC AC82000C */ sw $v0, 0xc($a0) -/* 3AAF20 E00AA600 24820018 */ addiu $v0, $a0, 0x18 -/* 3AAF24 E00AA604 AC830008 */ sw $v1, 8($a0) -/* 3AAF28 E00AA608 AE220000 */ sw $v0, ($s1) -/* 3AAF2C E00AA60C AC830010 */ sw $v1, 0x10($a0) -/* 3AAF30 E00AA610 3C05E00B */ lui $a1, %hi(D_E00AA6C0) -/* 3AAF34 E00AA614 00B52821 */ addu $a1, $a1, $s5 -/* 3AAF38 E00AA618 8CA5A6C0 */ lw $a1, %lo(D_E00AA6C0)($a1) -/* 3AAF3C E00AA61C 24820020 */ addiu $v0, $a0, 0x20 -/* 3AAF40 E00AA620 AE220000 */ sw $v0, ($s1) -/* 3AAF44 E00AA624 24820028 */ addiu $v0, $a0, 0x28 -/* 3AAF48 E00AA628 AC860018 */ sw $a2, 0x18($a0) -/* 3AAF4C E00AA62C AE220000 */ sw $v0, ($s1) -/* 3AAF50 E00AA630 24820030 */ addiu $v0, $a0, 0x30 -/* 3AAF54 E00AA634 AE220000 */ sw $v0, ($s1) -/* 3AAF58 E00AA638 AC850014 */ sw $a1, 0x14($a0) -/* 3AAF5C E00AA63C 8E65002C */ lw $a1, 0x2c($s3) -/* 3AAF60 E00AA640 24820038 */ addiu $v0, $a0, 0x38 -/* 3AAF64 E00AA644 AE220000 */ sw $v0, ($s1) -/* 3AAF68 E00AA648 3C020900 */ lui $v0, 0x900 -/* 3AAF6C E00AA64C 24423DC8 */ addiu $v0, $v0, 0x3dc8 -/* 3AAF70 E00AA650 AC820024 */ sw $v0, 0x24($a0) -/* 3AAF74 E00AA654 24020040 */ addiu $v0, $zero, 0x40 -/* 3AAF78 E00AA658 AC830020 */ sw $v1, 0x20($a0) -/* 3AAF7C E00AA65C 3C030900 */ lui $v1, 0x900 -/* 3AAF80 E00AA660 24632D40 */ addiu $v1, $v1, 0x2d40 -/* 3AAF84 E00AA664 AC870028 */ sw $a3, 0x28($a0) -/* 3AAF88 E00AA668 AC82002C */ sw $v0, 0x2c($a0) -/* 3AAF8C E00AA66C AC970030 */ sw $s7, 0x30($a0) -/* 3AAF90 E00AA670 AC800034 */ sw $zero, 0x34($a0) -/* 3AAF94 E00AA674 00051040 */ sll $v0, $a1, 1 -/* 3AAF98 E00AA678 00451021 */ addu $v0, $v0, $a1 -/* 3AAF9C E00AA67C 00021140 */ sll $v0, $v0, 5 -/* 3AAFA0 E00AA680 00431021 */ addu $v0, $v0, $v1 -/* 3AAFA4 E00AA684 AC82001C */ sw $v0, 0x1c($a0) -/* 3AAFA8 E00AA688 8FBF00B8 */ lw $ra, 0xb8($sp) -/* 3AAFAC E00AA68C 8FB700B4 */ lw $s7, 0xb4($sp) -/* 3AAFB0 E00AA690 8FB600B0 */ lw $s6, 0xb0($sp) -/* 3AAFB4 E00AA694 8FB500AC */ lw $s5, 0xac($sp) -/* 3AAFB8 E00AA698 8FB400A8 */ lw $s4, 0xa8($sp) -/* 3AAFBC E00AA69C 8FB300A4 */ lw $s3, 0xa4($sp) -/* 3AAFC0 E00AA6A0 8FB200A0 */ lw $s2, 0xa0($sp) -/* 3AAFC4 E00AA6A4 8FB1009C */ lw $s1, 0x9c($sp) -/* 3AAFC8 E00AA6A8 8FB00098 */ lw $s0, 0x98($sp) -/* 3AAFCC E00AA6AC 03E00008 */ jr $ra -/* 3AAFD0 E00AA6B0 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 3AAFD4 E00AA6B4 00000000 */ nop -/* 3AAFD8 E00AA6B8 00000000 */ nop -/* 3AAFDC E00AA6BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/butterflies/butterflies_main.s b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_main.s deleted file mode 100644 index 894e6259d9..0000000000 --- a/ver/us/asm/nonmatchings/effects/butterflies/butterflies_main.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel butterflies_main -/* 3AA920 E00AA000 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 3AA924 E00AA004 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 3AA928 E00AA008 4485A000 */ mtc1 $a1, $f20 -/* 3AA92C E00AA00C AFB1002C */ sw $s1, 0x2c($sp) -/* 3AA930 E00AA010 0080882D */ daddu $s1, $a0, $zero -/* 3AA934 E00AA014 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 3AA938 E00AA018 4486B000 */ mtc1 $a2, $f22 -/* 3AA93C E00AA01C 27A40010 */ addiu $a0, $sp, 0x10 -/* 3AA940 E00AA020 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 3AA944 E00AA024 4487C000 */ mtc1 $a3, $f24 -/* 3AA948 E00AA028 3C02E00B */ lui $v0, %hi(butterflies_init) -/* 3AA94C E00AA02C 2442A104 */ addiu $v0, $v0, %lo(butterflies_init) -/* 3AA950 E00AA030 AFA20018 */ sw $v0, 0x18($sp) -/* 3AA954 E00AA034 3C02E00B */ lui $v0, %hi(butterflies_update) -/* 3AA958 E00AA038 2442A10C */ addiu $v0, $v0, %lo(butterflies_update) -/* 3AA95C E00AA03C AFA2001C */ sw $v0, 0x1c($sp) -/* 3AA960 E00AA040 3C02E00B */ lui $v0, %hi(butterflies_render) -/* 3AA964 E00AA044 2442A3C0 */ addiu $v0, $v0, %lo(butterflies_render) -/* 3AA968 E00AA048 AFA20020 */ sw $v0, 0x20($sp) -/* 3AA96C E00AA04C 24020055 */ addiu $v0, $zero, 0x55 -/* 3AA970 E00AA050 AFBF0030 */ sw $ra, 0x30($sp) -/* 3AA974 E00AA054 AFB00028 */ sw $s0, 0x28($sp) -/* 3AA978 E00AA058 AFA00010 */ sw $zero, 0x10($sp) -/* 3AA97C E00AA05C AFA00024 */ sw $zero, 0x24($sp) -/* 3AA980 E00AA060 0C080124 */ jal shim_create_effect_instance -/* 3AA984 E00AA064 AFA20014 */ sw $v0, 0x14($sp) -/* 3AA988 E00AA068 24040048 */ addiu $a0, $zero, 0x48 -/* 3AA98C E00AA06C 24030001 */ addiu $v1, $zero, 1 -/* 3AA990 E00AA070 0040802D */ daddu $s0, $v0, $zero -/* 3AA994 E00AA074 0C08012C */ jal shim_general_heap_malloc -/* 3AA998 E00AA078 AE030008 */ sw $v1, 8($s0) -/* 3AA99C E00AA07C 0040202D */ daddu $a0, $v0, $zero -/* 3AA9A0 E00AA080 14800003 */ bnez $a0, .LE00AA090 -/* 3AA9A4 E00AA084 AE02000C */ sw $v0, 0xc($s0) -.LE00AA088: -/* 3AA9A8 E00AA088 0802A822 */ j .LE00AA088 -/* 3AA9AC E00AA08C 00000000 */ nop -.LE00AA090: -/* 3AA9B0 E00AA090 0200102D */ daddu $v0, $s0, $zero -/* 3AA9B4 E00AA094 3C014248 */ lui $at, 0x4248 -/* 3AA9B8 E00AA098 44810000 */ mtc1 $at, $f0 -/* 3AA9BC E00AA09C 3C0141F0 */ lui $at, 0x41f0 -/* 3AA9C0 E00AA0A0 44811000 */ mtc1 $at, $f2 -/* 3AA9C4 E00AA0A4 240303E8 */ addiu $v1, $zero, 0x3e8 -/* 3AA9C8 E00AA0A8 AC830004 */ sw $v1, 4($a0) -/* 3AA9CC E00AA0AC 240300FF */ addiu $v1, $zero, 0xff -/* 3AA9D0 E00AA0B0 AC910000 */ sw $s1, ($a0) -/* 3AA9D4 E00AA0B4 AC830024 */ sw $v1, 0x24($a0) -/* 3AA9D8 E00AA0B8 E494000C */ swc1 $f20, 0xc($a0) -/* 3AA9DC E00AA0BC E4940018 */ swc1 $f20, 0x18($a0) -/* 3AA9E0 E00AA0C0 E4960010 */ swc1 $f22, 0x10($a0) -/* 3AA9E4 E00AA0C4 E496001C */ swc1 $f22, 0x1c($a0) -/* 3AA9E8 E00AA0C8 E4980014 */ swc1 $f24, 0x14($a0) -/* 3AA9EC E00AA0CC E4980020 */ swc1 $f24, 0x20($a0) -/* 3AA9F0 E00AA0D0 AC800008 */ sw $zero, 8($a0) -/* 3AA9F4 E00AA0D4 AC80002C */ sw $zero, 0x2c($a0) -/* 3AA9F8 E00AA0D8 AC800030 */ sw $zero, 0x30($a0) -/* 3AA9FC E00AA0DC E4800034 */ swc1 $f0, 0x34($a0) -/* 3AAA00 E00AA0E0 E4820038 */ swc1 $f2, 0x38($a0) -/* 3AAA04 E00AA0E4 8FBF0030 */ lw $ra, 0x30($sp) -/* 3AAA08 E00AA0E8 8FB1002C */ lw $s1, 0x2c($sp) -/* 3AAA0C E00AA0EC 8FB00028 */ lw $s0, 0x28($sp) -/* 3AAA10 E00AA0F0 D7B80048 */ ldc1 $f24, 0x48($sp) -/* 3AAA14 E00AA0F4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 3AAA18 E00AA0F8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 3AAA1C E00AA0FC 03E00008 */ jr $ra -/* 3AAA20 E00AA100 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/ver/us/asm/nonmatchings/effects/butterflies/butterflies_update.s b/ver/us/asm/nonmatchings/effects/butterflies/butterflies_update.s deleted file mode 100644 index 778adaec35..0000000000 --- a/ver/us/asm/nonmatchings/effects/butterflies/butterflies_update.s +++ /dev/null @@ -1,186 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel butterflies_update -/* 3AAA2C E00AA10C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 3AAA30 E00AA110 AFBF0014 */ sw $ra, 0x14($sp) -/* 3AAA34 E00AA114 AFB00010 */ sw $s0, 0x10($sp) -/* 3AAA38 E00AA118 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 3AAA3C E00AA11C F7B80028 */ sdc1 $f24, 0x28($sp) -/* 3AAA40 E00AA120 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 3AAA44 E00AA124 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 3AAA48 E00AA128 8C830000 */ lw $v1, ($a0) -/* 3AAA4C E00AA12C 8C90000C */ lw $s0, 0xc($a0) -/* 3AAA50 E00AA130 30620010 */ andi $v0, $v1, 0x10 -/* 3AAA54 E00AA134 10400005 */ beqz $v0, .LE00AA14C -/* 3AAA58 E00AA138 2402FFEF */ addiu $v0, $zero, -0x11 -/* 3AAA5C E00AA13C 00621024 */ and $v0, $v1, $v0 -/* 3AAA60 E00AA140 AC820000 */ sw $v0, ($a0) -/* 3AAA64 E00AA144 24020384 */ addiu $v0, $zero, 0x384 -/* 3AAA68 E00AA148 AE020004 */ sw $v0, 4($s0) -.LE00AA14C: -/* 3AAA6C E00AA14C 8E030004 */ lw $v1, 4($s0) -/* 3AAA70 E00AA150 286203E8 */ slti $v0, $v1, 0x3e8 -/* 3AAA74 E00AA154 10400002 */ beqz $v0, .LE00AA160 -/* 3AAA78 E00AA158 2462FFFF */ addiu $v0, $v1, -1 -/* 3AAA7C E00AA15C AE020004 */ sw $v0, 4($s0) -.LE00AA160: -/* 3AAA80 E00AA160 8E020008 */ lw $v0, 8($s0) -/* 3AAA84 E00AA164 8E030004 */ lw $v1, 4($s0) -/* 3AAA88 E00AA168 24420001 */ addiu $v0, $v0, 1 -/* 3AAA8C E00AA16C 04610005 */ bgez $v1, .LE00AA184 -/* 3AAA90 E00AA170 AE020008 */ sw $v0, 8($s0) -/* 3AAA94 E00AA174 0C080128 */ jal shim_remove_effect -/* 3AAA98 E00AA178 00000000 */ nop -/* 3AAA9C E00AA17C 0802A8E8 */ j .LE00AA3A0 -/* 3AAAA0 E00AA180 00000000 */ nop -.LE00AA184: -/* 3AAAA4 E00AA184 28620010 */ slti $v0, $v1, 0x10 -/* 3AAAA8 E00AA188 10400002 */ beqz $v0, .LE00AA194 -/* 3AAAAC E00AA18C 00031100 */ sll $v0, $v1, 4 -/* 3AAAB0 E00AA190 AE020024 */ sw $v0, 0x24($s0) -.LE00AA194: -/* 3AAAB4 E00AA194 8E020030 */ lw $v0, 0x30($s0) -/* 3AAAB8 E00AA198 2442FFFF */ addiu $v0, $v0, -1 -/* 3AAABC E00AA19C 1C40006D */ bgtz $v0, .LE00AA354 -/* 3AAAC0 E00AA1A0 AE020030 */ sw $v0, 0x30($s0) -/* 3AAAC4 E00AA1A4 0C080138 */ jal shim_rand_int -/* 3AAAC8 E00AA1A8 24040167 */ addiu $a0, $zero, 0x167 -/* 3AAACC E00AA1AC 4482A000 */ mtc1 $v0, $f20 -/* 3AAAD0 E00AA1B0 00000000 */ nop -/* 3AAAD4 E00AA1B4 4680A520 */ cvt.s.w $f20, $f20 -/* 3AAAD8 E00AA1B8 0C080140 */ jal shim_sin_deg -/* 3AAADC E00AA1BC 4600A306 */ mov.s $f12, $f20 -/* 3AAAE0 E00AA1C0 C6020034 */ lwc1 $f2, 0x34($s0) -/* 3AAAE4 E00AA1C4 46001082 */ mul.s $f2, $f2, $f0 -/* 3AAAE8 E00AA1C8 00000000 */ nop -/* 3AAAEC E00AA1CC C6000038 */ lwc1 $f0, 0x38($s0) -/* 3AAAF0 E00AA1D0 C6180018 */ lwc1 $f24, 0x18($s0) -/* 3AAAF4 E00AA1D4 4600028D */ trunc.w.s $f10, $f0 -/* 3AAAF8 E00AA1D8 44045000 */ mfc1 $a0, $f10 -/* 3AAAFC E00AA1DC 0C080138 */ jal shim_rand_int -/* 3AAB00 E00AA1E0 4602C600 */ add.s $f24, $f24, $f2 -/* 3AAB04 E00AA1E4 4600A306 */ mov.s $f12, $f20 -/* 3AAB08 E00AA1E8 C616001C */ lwc1 $f22, 0x1c($s0) -/* 3AAB0C E00AA1EC 44820000 */ mtc1 $v0, $f0 -/* 3AAB10 E00AA1F0 00000000 */ nop -/* 3AAB14 E00AA1F4 46800020 */ cvt.s.w $f0, $f0 -/* 3AAB18 E00AA1F8 0C080144 */ jal shim_cos_deg -/* 3AAB1C E00AA1FC 4600B580 */ add.s $f22, $f22, $f0 -/* 3AAB20 E00AA200 C6020034 */ lwc1 $f2, 0x34($s0) -/* 3AAB24 E00AA204 46001082 */ mul.s $f2, $f2, $f0 -/* 3AAB28 E00AA208 00000000 */ nop -/* 3AAB2C E00AA20C C6140020 */ lwc1 $f20, 0x20($s0) -/* 3AAB30 E00AA210 24040064 */ addiu $a0, $zero, 0x64 -/* 3AAB34 E00AA214 0C080138 */ jal shim_rand_int -/* 3AAB38 E00AA218 4602A500 */ add.s $f20, $f20, $f2 -/* 3AAB3C E00AA21C C604000C */ lwc1 $f4, 0xc($s0) -/* 3AAB40 E00AA220 4604C601 */ sub.s $f24, $f24, $f4 -/* 3AAB44 E00AA224 C6060010 */ lwc1 $f6, 0x10($s0) -/* 3AAB48 E00AA228 4606B581 */ sub.s $f22, $f22, $f6 -/* 3AAB4C E00AA22C C6080014 */ lwc1 $f8, 0x14($s0) -/* 3AAB50 E00AA230 44801000 */ mtc1 $zero, $f2 -/* 3AAB54 E00AA234 4608A501 */ sub.s $f20, $f20, $f8 -/* 3AAB58 E00AA238 2442000A */ addiu $v0, $v0, 0xa -/* 3AAB5C E00AA23C 4602C032 */ c.eq.s $f24, $f2 -/* 3AAB60 E00AA240 00000000 */ nop -/* 3AAB64 E00AA244 4500001E */ bc1f .LE00AA2C0 -/* 3AAB68 E00AA248 AE020030 */ sw $v0, 0x30($s0) -/* 3AAB6C E00AA24C 4602B032 */ c.eq.s $f22, $f2 -/* 3AAB70 E00AA250 00000000 */ nop -/* 3AAB74 E00AA254 4500001A */ bc1f .LE00AA2C0 -/* 3AAB78 E00AA258 00000000 */ nop -/* 3AAB7C E00AA25C 4602A032 */ c.eq.s $f20, $f2 -/* 3AAB80 E00AA260 00000000 */ nop -/* 3AAB84 E00AA264 45000016 */ bc1f .LE00AA2C0 -/* 3AAB88 E00AA268 00000000 */ nop -/* 3AAB8C E00AA26C C6000018 */ lwc1 $f0, 0x18($s0) -/* 3AAB90 E00AA270 46040601 */ sub.s $f24, $f0, $f4 -/* 3AAB94 E00AA274 C600001C */ lwc1 $f0, 0x1c($s0) -/* 3AAB98 E00AA278 46060581 */ sub.s $f22, $f0, $f6 -/* 3AAB9C E00AA27C C6000020 */ lwc1 $f0, 0x20($s0) -/* 3AABA0 E00AA280 4602C032 */ c.eq.s $f24, $f2 -/* 3AABA4 E00AA284 00000000 */ nop -/* 3AABA8 E00AA288 4500000D */ bc1f .LE00AA2C0 -/* 3AABAC E00AA28C 46080501 */ sub.s $f20, $f0, $f8 -/* 3AABB0 E00AA290 4602B032 */ c.eq.s $f22, $f2 -/* 3AABB4 E00AA294 00000000 */ nop -/* 3AABB8 E00AA298 45000009 */ bc1f .LE00AA2C0 -/* 3AABBC E00AA29C 00000000 */ nop -/* 3AABC0 E00AA2A0 4602A032 */ c.eq.s $f20, $f2 -/* 3AABC4 E00AA2A4 00000000 */ nop -/* 3AABC8 E00AA2A8 45000005 */ bc1f .LE00AA2C0 -/* 3AABCC E00AA2AC 00000000 */ nop -/* 3AABD0 E00AA2B0 3C013F80 */ lui $at, 0x3f80 -/* 3AABD4 E00AA2B4 4481C000 */ mtc1 $at, $f24 -/* 3AABD8 E00AA2B8 46001506 */ mov.s $f20, $f2 -/* 3AABDC E00AA2BC 46001586 */ mov.s $f22, $f2 -.LE00AA2C0: -/* 3AABE0 E00AA2C0 4618C002 */ mul.s $f0, $f24, $f24 -/* 3AABE4 E00AA2C4 00000000 */ nop -/* 3AABE8 E00AA2C8 4616B082 */ mul.s $f2, $f22, $f22 -/* 3AABEC E00AA2CC 00000000 */ nop -/* 3AABF0 E00AA2D0 4614A102 */ mul.s $f4, $f20, $f20 -/* 3AABF4 E00AA2D4 00000000 */ nop -/* 3AABF8 E00AA2D8 46020000 */ add.s $f0, $f0, $f2 -/* 3AABFC E00AA2DC 46040300 */ add.s $f12, $f0, $f4 -/* 3AAC00 E00AA2E0 4480D000 */ mtc1 $zero, $f26 -/* 3AAC04 E00AA2E4 00000000 */ nop -/* 3AAC08 E00AA2E8 461A6032 */ c.eq.s $f12, $f26 -/* 3AAC0C E00AA2EC 00000000 */ nop -/* 3AAC10 E00AA2F0 45010007 */ bc1t .LE00AA310 -/* 3AAC14 E00AA2F4 00000000 */ nop -/* 3AAC18 E00AA2F8 0C080154 */ jal shim_sqrtf -/* 3AAC1C E00AA2FC 00000000 */ nop -/* 3AAC20 E00AA300 3C013F80 */ lui $at, 0x3f80 -/* 3AAC24 E00AA304 44811000 */ mtc1 $at, $f2 -/* 3AAC28 E00AA308 00000000 */ nop -/* 3AAC2C E00AA30C 46001303 */ div.s $f12, $f2, $f0 -.LE00AA310: -/* 3AAC30 E00AA310 460CC602 */ mul.s $f24, $f24, $f12 -/* 3AAC34 E00AA314 00000000 */ nop -/* 3AAC38 E00AA318 460CA502 */ mul.s $f20, $f20, $f12 -/* 3AAC3C E00AA31C 00000000 */ nop -/* 3AAC40 E00AA320 460CB582 */ mul.s $f22, $f22, $f12 -/* 3AAC44 E00AA324 00000000 */ nop -/* 3AAC48 E00AA328 4600D306 */ mov.s $f12, $f26 -/* 3AAC4C E00AA32C E618003C */ swc1 $f24, 0x3c($s0) -/* 3AAC50 E00AA330 4600C006 */ mov.s $f0, $f24 -/* 3AAC54 E00AA334 4407A000 */ mfc1 $a3, $f20 -/* 3AAC58 E00AA338 46000007 */ neg.s $f0, $f0 -/* 3AAC5C E00AA33C 44060000 */ mfc1 $a2, $f0 -/* 3AAC60 E00AA340 46006386 */ mov.s $f14, $f12 -/* 3AAC64 E00AA344 E6160040 */ swc1 $f22, 0x40($s0) -/* 3AAC68 E00AA348 0C080148 */ jal shim_atan2 -/* 3AAC6C E00AA34C E6140044 */ swc1 $f20, 0x44($s0) -/* 3AAC70 E00AA350 E6000028 */ swc1 $f0, 0x28($s0) -.LE00AA354: -/* 3AAC74 E00AA354 8E03002C */ lw $v1, 0x2c($s0) -/* 3AAC78 E00AA358 24620003 */ addiu $v0, $v1, 3 -/* 3AAC7C E00AA35C AE02002C */ sw $v0, 0x2c($s0) -/* 3AAC80 E00AA360 2842001E */ slti $v0, $v0, 0x1e -/* 3AAC84 E00AA364 14400002 */ bnez $v0, .LE00AA370 -/* 3AAC88 E00AA368 2462FFE5 */ addiu $v0, $v1, -0x1b -/* 3AAC8C E00AA36C AE02002C */ sw $v0, 0x2c($s0) -.LE00AA370: -/* 3AAC90 E00AA370 C606000C */ lwc1 $f6, 0xc($s0) -/* 3AAC94 E00AA374 C600003C */ lwc1 $f0, 0x3c($s0) -/* 3AAC98 E00AA378 C6040010 */ lwc1 $f4, 0x10($s0) -/* 3AAC9C E00AA37C 46003180 */ add.s $f6, $f6, $f0 -/* 3AACA0 E00AA380 C6000040 */ lwc1 $f0, 0x40($s0) -/* 3AACA4 E00AA384 C6020014 */ lwc1 $f2, 0x14($s0) -/* 3AACA8 E00AA388 46002100 */ add.s $f4, $f4, $f0 -/* 3AACAC E00AA38C C6000044 */ lwc1 $f0, 0x44($s0) -/* 3AACB0 E00AA390 46001080 */ add.s $f2, $f2, $f0 -/* 3AACB4 E00AA394 E606000C */ swc1 $f6, 0xc($s0) -/* 3AACB8 E00AA398 E6040010 */ swc1 $f4, 0x10($s0) -/* 3AACBC E00AA39C E6020014 */ swc1 $f2, 0x14($s0) -.LE00AA3A0: -/* 3AACC0 E00AA3A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 3AACC4 E00AA3A4 8FB00010 */ lw $s0, 0x10($sp) -/* 3AACC8 E00AA3A8 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 3AACCC E00AA3AC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 3AACD0 E00AA3B0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 3AACD4 E00AA3B4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 3AACD8 E00AA3B8 03E00008 */ jr $ra -/* 3AACDC E00AA3BC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/entity/draw_entity_model_C.s b/ver/us/asm/nonmatchings/entity/draw_entity_model_C.s deleted file mode 100644 index 77d2837c69..0000000000 --- a/ver/us/asm/nonmatchings/entity/draw_entity_model_C.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel draw_entity_model_C -/* B8788 80122088 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B878C 8012208C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B8790 80122090 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B8794 80122094 AFBF0020 */ sw $ra, 0x20($sp) -/* B8798 80122098 80420070 */ lb $v0, 0x70($v0) -/* B879C 8012209C 10400004 */ beqz $v0, .L801220B0 -/* B87A0 801220A0 27A80010 */ addiu $t0, $sp, 0x10 -/* B87A4 801220A4 30820800 */ andi $v0, $a0, 0x800 -/* B87A8 801220A8 10400034 */ beqz $v0, .L8012217C -/* B87AC 801220AC 00000000 */ nop -.L801220B0: -/* B87B0 801220B0 2402F7FF */ addiu $v0, $zero, -0x801 -/* B87B4 801220B4 00822024 */ and $a0, $a0, $v0 -/* B87B8 801220B8 3C038015 */ lui $v1, %hi(gCurrentEntityModelList) -/* B87BC 801220BC 8C634370 */ lw $v1, %lo(gCurrentEntityModelList)($v1) -/* B87C0 801220C0 00041080 */ sll $v0, $a0, 2 -/* B87C4 801220C4 00431021 */ addu $v0, $v0, $v1 -/* B87C8 801220C8 8C470000 */ lw $a3, ($v0) -/* B87CC 801220CC 10E0002B */ beqz $a3, .L8012217C -/* B87D0 801220D0 00000000 */ nop -/* B87D4 801220D4 8CE60000 */ lw $a2, ($a3) -/* B87D8 801220D8 10C00028 */ beqz $a2, .L8012217C -/* B87DC 801220DC 30C20100 */ andi $v0, $a2, 0x100 -/* B87E0 801220E0 14400026 */ bnez $v0, .L8012217C -/* B87E4 801220E4 30C20020 */ andi $v0, $a2, 0x20 -/* B87E8 801220E8 14400024 */ bnez $v0, .L8012217C -/* B87EC 801220EC 30C20040 */ andi $v0, $a2, 0x40 -/* B87F0 801220F0 14400022 */ bnez $v0, .L8012217C -/* B87F4 801220F4 24020001 */ addiu $v0, $zero, 1 -/* B87F8 801220F8 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* B87FC 801220FC 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* B8800 80122100 00621004 */ sllv $v0, $v0, $v1 -/* B8804 80122104 00C21024 */ and $v0, $a2, $v0 -/* B8808 80122108 1040001C */ beqz $v0, .L8012217C -/* B880C 8012210C 34C20200 */ ori $v0, $a2, 0x200 -/* B8810 80122110 ACE20000 */ sw $v0, ($a3) -/* B8814 80122114 24E20018 */ addiu $v0, $a3, 0x18 -/* B8818 80122118 24A30040 */ addiu $v1, $a1, 0x40 -.L8012211C: -/* B881C 8012211C 8CA90000 */ lw $t1, ($a1) -/* B8820 80122120 8CAA0004 */ lw $t2, 4($a1) -/* B8824 80122124 8CAB0008 */ lw $t3, 8($a1) -/* B8828 80122128 8CAC000C */ lw $t4, 0xc($a1) -/* B882C 8012212C AC490000 */ sw $t1, ($v0) -/* B8830 80122130 AC4A0004 */ sw $t2, 4($v0) -/* B8834 80122134 AC4B0008 */ sw $t3, 8($v0) -/* B8838 80122138 AC4C000C */ sw $t4, 0xc($v0) -/* B883C 8012213C 24A50010 */ addiu $a1, $a1, 0x10 -/* B8840 80122140 14A3FFF6 */ bne $a1, $v1, .L8012211C -/* B8844 80122144 24420010 */ addiu $v0, $v0, 0x10 -/* B8848 80122148 80E30004 */ lb $v1, 4($a3) -/* B884C 8012214C 3C028012 */ lui $v0, %hi(appendGfx_entity_model) -/* B8850 80122150 24421184 */ addiu $v0, $v0, %lo(appendGfx_entity_model) -/* B8854 80122154 ACE0005C */ sw $zero, 0x5c($a3) -/* B8858 80122158 AD070008 */ sw $a3, 8($t0) -/* B885C 8012215C AD02000C */ sw $v0, 0xc($t0) -/* B8860 80122160 AD030000 */ sw $v1, ($t0) -/* B8864 80122164 8CE20000 */ lw $v0, ($a3) -/* B8868 80122168 0100202D */ daddu $a0, $t0, $zero -/* B886C 8012216C 3042F000 */ andi $v0, $v0, 0xf000 -/* B8870 80122170 00021202 */ srl $v0, $v0, 8 -/* B8874 80122174 0C047644 */ jal queue_render_task -/* B8878 80122178 AD020004 */ sw $v0, 4($t0) -.L8012217C: -/* B887C 8012217C 8FBF0020 */ lw $ra, 0x20($sp) -/* B8880 80122180 03E00008 */ jr $ra -/* B8884 80122184 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/entity/draw_entity_model_D.s b/ver/us/asm/nonmatchings/entity/draw_entity_model_D.s deleted file mode 100644 index 2687fdd2b8..0000000000 --- a/ver/us/asm/nonmatchings/entity/draw_entity_model_D.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel draw_entity_model_D -/* B8888 80122188 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B888C 8012218C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B8890 80122190 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B8894 80122194 AFBF0020 */ sw $ra, 0x20($sp) -/* B8898 80122198 80420070 */ lb $v0, 0x70($v0) -/* B889C 8012219C 10400004 */ beqz $v0, .L801221B0 -/* B88A0 801221A0 27AA0010 */ addiu $t2, $sp, 0x10 -/* B88A4 801221A4 30820800 */ andi $v0, $a0, 0x800 -/* B88A8 801221A8 10400034 */ beqz $v0, .L8012227C -/* B88AC 801221AC 00000000 */ nop -.L801221B0: -/* B88B0 801221B0 2402F7FF */ addiu $v0, $zero, -0x801 -/* B88B4 801221B4 00822024 */ and $a0, $a0, $v0 -/* B88B8 801221B8 3C038015 */ lui $v1, %hi(gCurrentEntityModelList) -/* B88BC 801221BC 8C634370 */ lw $v1, %lo(gCurrentEntityModelList)($v1) -/* B88C0 801221C0 00041080 */ sll $v0, $a0, 2 -/* B88C4 801221C4 00431021 */ addu $v0, $v0, $v1 -/* B88C8 801221C8 8C490000 */ lw $t1, ($v0) -/* B88CC 801221CC 1120002B */ beqz $t1, .L8012227C -/* B88D0 801221D0 00000000 */ nop -/* B88D4 801221D4 8D280000 */ lw $t0, ($t1) -/* B88D8 801221D8 11000028 */ beqz $t0, .L8012227C -/* B88DC 801221DC 31020100 */ andi $v0, $t0, 0x100 -/* B88E0 801221E0 14400026 */ bnez $v0, .L8012227C -/* B88E4 801221E4 31020020 */ andi $v0, $t0, 0x20 -/* B88E8 801221E8 14400024 */ bnez $v0, .L8012227C -/* B88EC 801221EC 24020001 */ addiu $v0, $zero, 1 -/* B88F0 801221F0 3C03800A */ lui $v1, %hi(gCurrentCamID) -/* B88F4 801221F4 8463A634 */ lh $v1, %lo(gCurrentCamID)($v1) -/* B88F8 801221F8 00621004 */ sllv $v0, $v0, $v1 -/* B88FC 801221FC 01021024 */ and $v0, $t0, $v0 -/* B8900 80122200 1040001E */ beqz $v0, .L8012227C -/* B8904 80122204 35020200 */ ori $v0, $t0, 0x200 -/* B8908 80122208 AD220000 */ sw $v0, ($t1) -/* B890C 8012220C 25220018 */ addiu $v0, $t1, 0x18 -/* B8910 80122210 24A30040 */ addiu $v1, $a1, 0x40 -.L80122214: -/* B8914 80122214 8CAB0000 */ lw $t3, ($a1) -/* B8918 80122218 8CAC0004 */ lw $t4, 4($a1) -/* B891C 8012221C 8CAD0008 */ lw $t5, 8($a1) -/* B8920 80122220 8CAE000C */ lw $t6, 0xc($a1) -/* B8924 80122224 AC4B0000 */ sw $t3, ($v0) -/* B8928 80122228 AC4C0004 */ sw $t4, 4($v0) -/* B892C 8012222C AC4D0008 */ sw $t5, 8($v0) -/* B8930 80122230 AC4E000C */ sw $t6, 0xc($v0) -/* B8934 80122234 24A50010 */ addiu $a1, $a1, 0x10 -/* B8938 80122238 14A3FFF6 */ bne $a1, $v1, .L80122214 -/* B893C 8012223C 24420010 */ addiu $v0, $v0, 0x10 -/* B8940 80122240 3C018015 */ lui $at, %hi(D_80154374) -/* B8944 80122244 AC264374 */ sw $a2, %lo(D_80154374)($at) -/* B8948 80122248 81230004 */ lb $v1, 4($t1) -/* B894C 8012224C 3C028012 */ lui $v0, %hi(appendGfx_entity_model) -/* B8950 80122250 24421184 */ addiu $v0, $v0, %lo(appendGfx_entity_model) -/* B8954 80122254 AD27005C */ sw $a3, 0x5c($t1) -/* B8958 80122258 AD490008 */ sw $t1, 8($t2) -/* B895C 8012225C AD42000C */ sw $v0, 0xc($t2) -/* B8960 80122260 AD430000 */ sw $v1, ($t2) -/* B8964 80122264 8D220000 */ lw $v0, ($t1) -/* B8968 80122268 0140202D */ daddu $a0, $t2, $zero -/* B896C 8012226C 3042F000 */ andi $v0, $v0, 0xf000 -/* B8970 80122270 00021202 */ srl $v0, $v0, 8 -/* B8974 80122274 0C047644 */ jal queue_render_task -/* B8978 80122278 AD420004 */ sw $v0, 4($t2) -.L8012227C: -/* B897C 8012227C 8FBF0020 */ lw $ra, 0x20($sp) -/* B8980 80122280 03E00008 */ jr $ra -/* B8984 80122284 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/os/3FEA0/_Printf.s b/ver/us/asm/nonmatchings/os/3FEA0/_Printf.s deleted file mode 100644 index d88fa90fb1..0000000000 --- a/ver/us/asm/nonmatchings/os/3FEA0/_Printf.s +++ /dev/null @@ -1,411 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80099BF0 -.ascii " +-#0\0\0\0" - -dlabel D_80099BF8 -.word 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000000 - -dlabel D_80099C10 -.ascii "hlL\0\0\0\0\0" - -.section .text - -glabel _Printf -/* 3FEA0 80064AA0 27BDFF50 */ addiu $sp, $sp, -0xb0 -/* 3FEA4 80064AA4 AFB400A0 */ sw $s4, 0xa0($sp) -/* 3FEA8 80064AA8 0080A021 */ addu $s4, $a0, $zero -/* 3FEAC 80064AAC AFB3009C */ sw $s3, 0x9c($sp) -/* 3FEB0 80064AB0 00A09821 */ addu $s3, $a1, $zero -/* 3FEB4 80064AB4 00C02821 */ addu $a1, $a2, $zero -/* 3FEB8 80064AB8 AFB500A4 */ sw $s5, 0xa4($sp) -/* 3FEBC 80064ABC 3C15800A */ lui $s5, %hi(D_80099BF0) -/* 3FEC0 80064AC0 26B59BF0 */ addiu $s5, $s5, %lo(D_80099BF0) -/* 3FEC4 80064AC4 AFBF00A8 */ sw $ra, 0xa8($sp) -/* 3FEC8 80064AC8 AFB20098 */ sw $s2, 0x98($sp) -/* 3FECC 80064ACC AFB10094 */ sw $s1, 0x94($sp) -/* 3FED0 80064AD0 AFB00090 */ sw $s0, 0x90($sp) -/* 3FED4 80064AD4 AFA700BC */ sw $a3, 0xbc($sp) -/* 3FED8 80064AD8 AFA0003C */ sw $zero, 0x3c($sp) -.L80064ADC: -/* 3FEDC 80064ADC 80A20000 */ lb $v0, ($a1) -/* 3FEE0 80064AE0 90B10000 */ lbu $s1, ($a1) -/* 3FEE4 80064AE4 080192BD */ j .L80064AF4 -/* 3FEE8 80064AE8 00A09021 */ addu $s2, $a1, $zero -.L80064AEC: -/* 3FEEC 80064AEC 82420000 */ lb $v0, ($s2) -/* 3FEF0 80064AF0 92510000 */ lbu $s1, ($s2) -.L80064AF4: -/* 3FEF4 80064AF4 0002182B */ sltu $v1, $zero, $v0 -/* 3FEF8 80064AF8 38420025 */ xori $v0, $v0, 0x25 -/* 3FEFC 80064AFC 0002102B */ sltu $v0, $zero, $v0 -/* 3FF00 80064B00 00621824 */ and $v1, $v1, $v0 -/* 3FF04 80064B04 5460FFF9 */ bnel $v1, $zero, .L80064AEC -/* 3FF08 80064B08 26520001 */ addiu $s2, $s2, 1 -/* 3FF0C 80064B0C 02458023 */ subu $s0, $s2, $a1 -/* 3FF10 80064B10 1A000009 */ blez $s0, .L80064B38 -/* 3FF14 80064B14 02602021 */ addu $a0, $s3, $zero -/* 3FF18 80064B18 0280F809 */ jalr $s4 -/* 3FF1C 80064B1C 02003021 */ addu $a2, $s0, $zero -/* 3FF20 80064B20 00409821 */ addu $s3, $v0, $zero -/* 3FF24 80064B24 12600134 */ beqz $s3, .L80064FF8 -/* 3FF28 80064B28 00000000 */ nop -/* 3FF2C 80064B2C 8FA2003C */ lw $v0, 0x3c($sp) -/* 3FF30 80064B30 00501021 */ addu $v0, $v0, $s0 -/* 3FF34 80064B34 AFA2003C */ sw $v0, 0x3c($sp) -.L80064B38: -/* 3FF38 80064B38 1220012F */ beqz $s1, .L80064FF8 -/* 3FF3C 80064B3C 26520001 */ addiu $s2, $s2, 1 -/* 3FF40 80064B40 AFA00040 */ sw $zero, 0x40($sp) -/* 3FF44 80064B44 3C10800A */ lui $s0, %hi(D_80099BF8) -/* 3FF48 80064B48 26109BF8 */ addiu $s0, $s0, %lo(D_80099BF8) -.L80064B4C: -/* 3FF4C 80064B4C 82450000 */ lb $a1, ($s2) -/* 3FF50 80064B50 0C019284 */ jal strchr -/* 3FF54 80064B54 02A02021 */ addu $a0, $s5, $zero -/* 3FF58 80064B58 10400009 */ beqz $v0, .L80064B80 -/* 3FF5C 80064B5C 00551023 */ subu $v0, $v0, $s5 -/* 3FF60 80064B60 00021080 */ sll $v0, $v0, 2 -/* 3FF64 80064B64 00501021 */ addu $v0, $v0, $s0 -/* 3FF68 80064B68 8FA30040 */ lw $v1, 0x40($sp) -/* 3FF6C 80064B6C 8C420000 */ lw $v0, ($v0) -/* 3FF70 80064B70 26520001 */ addiu $s2, $s2, 1 -/* 3FF74 80064B74 00621825 */ or $v1, $v1, $v0 -/* 3FF78 80064B78 080192D3 */ j .L80064B4C -/* 3FF7C 80064B7C AFA30040 */ sw $v1, 0x40($sp) -.L80064B80: -/* 3FF80 80064B80 82430000 */ lb $v1, ($s2) -/* 3FF84 80064B84 2402002A */ addiu $v0, $zero, 0x2a -/* 3FF88 80064B88 14620011 */ bne $v1, $v0, .L80064BD0 -/* 3FF8C 80064B8C 00602021 */ addu $a0, $v1, $zero -/* 3FF90 80064B90 8FA200BC */ lw $v0, 0xbc($sp) -/* 3FF94 80064B94 2403FFFC */ addiu $v1, $zero, -4 -/* 3FF98 80064B98 24420003 */ addiu $v0, $v0, 3 -/* 3FF9C 80064B9C 00431024 */ and $v0, $v0, $v1 -/* 3FFA0 80064BA0 24430004 */ addiu $v1, $v0, 4 -/* 3FFA4 80064BA4 AFA300BC */ sw $v1, 0xbc($sp) -/* 3FFA8 80064BA8 8C420000 */ lw $v0, ($v0) -/* 3FFAC 80064BAC 04410006 */ bgez $v0, .L80064BC8 -/* 3FFB0 80064BB0 AFA20038 */ sw $v0, 0x38($sp) -/* 3FFB4 80064BB4 8FA30040 */ lw $v1, 0x40($sp) -/* 3FFB8 80064BB8 00021023 */ negu $v0, $v0 -/* 3FFBC 80064BBC AFA20038 */ sw $v0, 0x38($sp) -/* 3FFC0 80064BC0 34630004 */ ori $v1, $v1, 4 -/* 3FFC4 80064BC4 AFA30040 */ sw $v1, 0x40($sp) -.L80064BC8: -/* 3FFC8 80064BC8 0801930A */ j .L80064C28 -/* 3FFCC 80064BCC 26520001 */ addiu $s2, $s2, 1 -.L80064BD0: -/* 3FFD0 80064BD0 2482FFD0 */ addiu $v0, $a0, -0x30 -/* 3FFD4 80064BD4 304200FF */ andi $v0, $v0, 0xff -/* 3FFD8 80064BD8 2C42000A */ sltiu $v0, $v0, 0xa -/* 3FFDC 80064BDC 10400012 */ beqz $v0, .L80064C28 -/* 3FFE0 80064BE0 AFA00038 */ sw $zero, 0x38($sp) -.L80064BE4: -/* 3FFE4 80064BE4 8FA40038 */ lw $a0, 0x38($sp) -/* 3FFE8 80064BE8 288203E7 */ slti $v0, $a0, 0x3e7 -/* 3FFEC 80064BEC 50400009 */ beql $v0, $zero, .L80064C14 -/* 3FFF0 80064BF0 26520001 */ addiu $s2, $s2, 1 -/* 3FFF4 80064BF4 00041080 */ sll $v0, $a0, 2 -/* 3FFF8 80064BF8 82430000 */ lb $v1, ($s2) -/* 3FFFC 80064BFC 00441021 */ addu $v0, $v0, $a0 -/* 40000 80064C00 00021040 */ sll $v0, $v0, 1 -/* 40004 80064C04 00431021 */ addu $v0, $v0, $v1 -/* 40008 80064C08 2442FFD0 */ addiu $v0, $v0, -0x30 -/* 4000C 80064C0C AFA20038 */ sw $v0, 0x38($sp) -/* 40010 80064C10 26520001 */ addiu $s2, $s2, 1 -.L80064C14: -/* 40014 80064C14 92420000 */ lbu $v0, ($s2) -/* 40018 80064C18 2442FFD0 */ addiu $v0, $v0, -0x30 -/* 4001C 80064C1C 2C42000A */ sltiu $v0, $v0, 0xa -/* 40020 80064C20 1440FFF0 */ bnez $v0, .L80064BE4 -/* 40024 80064C24 00000000 */ nop -.L80064C28: -/* 40028 80064C28 82430000 */ lb $v1, ($s2) -/* 4002C 80064C2C 2402002E */ addiu $v0, $zero, 0x2e -/* 40030 80064C30 10620003 */ beq $v1, $v0, .L80064C40 -/* 40034 80064C34 2402FFFF */ addiu $v0, $zero, -1 -/* 40038 80064C38 08019335 */ j .L80064CD4 -/* 4003C 80064C3C AFA20034 */ sw $v0, 0x34($sp) -.L80064C40: -/* 40040 80064C40 26520001 */ addiu $s2, $s2, 1 -/* 40044 80064C44 82430000 */ lb $v1, ($s2) -/* 40048 80064C48 2402002A */ addiu $v0, $zero, 0x2a -/* 4004C 80064C4C 1462000B */ bne $v1, $v0, .L80064C7C -/* 40050 80064C50 00602021 */ addu $a0, $v1, $zero -/* 40054 80064C54 8FA300BC */ lw $v1, 0xbc($sp) -/* 40058 80064C58 2402FFFC */ addiu $v0, $zero, -4 -/* 4005C 80064C5C 24630003 */ addiu $v1, $v1, 3 -/* 40060 80064C60 00621824 */ and $v1, $v1, $v0 -/* 40064 80064C64 24620004 */ addiu $v0, $v1, 4 -/* 40068 80064C68 AFA200BC */ sw $v0, 0xbc($sp) -/* 4006C 80064C6C 8C620000 */ lw $v0, ($v1) -/* 40070 80064C70 26520001 */ addiu $s2, $s2, 1 -/* 40074 80064C74 08019335 */ j .L80064CD4 -/* 40078 80064C78 AFA20034 */ sw $v0, 0x34($sp) -.L80064C7C: -/* 4007C 80064C7C 2482FFD0 */ addiu $v0, $a0, -0x30 -/* 40080 80064C80 304200FF */ andi $v0, $v0, 0xff -/* 40084 80064C84 2C42000A */ sltiu $v0, $v0, 0xa -/* 40088 80064C88 10400012 */ beqz $v0, .L80064CD4 -/* 4008C 80064C8C AFA00034 */ sw $zero, 0x34($sp) -.L80064C90: -/* 40090 80064C90 8FA40034 */ lw $a0, 0x34($sp) -/* 40094 80064C94 288203E7 */ slti $v0, $a0, 0x3e7 -/* 40098 80064C98 50400009 */ beql $v0, $zero, .L80064CC0 -/* 4009C 80064C9C 26520001 */ addiu $s2, $s2, 1 -/* 400A0 80064CA0 00041080 */ sll $v0, $a0, 2 -/* 400A4 80064CA4 82430000 */ lb $v1, ($s2) -/* 400A8 80064CA8 00441021 */ addu $v0, $v0, $a0 -/* 400AC 80064CAC 00021040 */ sll $v0, $v0, 1 -/* 400B0 80064CB0 00431021 */ addu $v0, $v0, $v1 -/* 400B4 80064CB4 2442FFD0 */ addiu $v0, $v0, -0x30 -/* 400B8 80064CB8 AFA20034 */ sw $v0, 0x34($sp) -/* 400BC 80064CBC 26520001 */ addiu $s2, $s2, 1 -.L80064CC0: -/* 400C0 80064CC0 92420000 */ lbu $v0, ($s2) -/* 400C4 80064CC4 2442FFD0 */ addiu $v0, $v0, -0x30 -/* 400C8 80064CC8 2C42000A */ sltiu $v0, $v0, 0xa -/* 400CC 80064CCC 1440FFF0 */ bnez $v0, .L80064C90 -/* 400D0 80064CD0 00000000 */ nop -.L80064CD4: -/* 400D4 80064CD4 82450000 */ lb $a1, ($s2) -/* 400D8 80064CD8 3C04800A */ lui $a0, %hi(D_80099C10) -/* 400DC 80064CDC 24849C10 */ addiu $a0, $a0, %lo(D_80099C10) -/* 400E0 80064CE0 0C019284 */ jal strchr -/* 400E4 80064CE4 00A08021 */ addu $s0, $a1, $zero -/* 400E8 80064CE8 10400003 */ beqz $v0, .L80064CF8 -/* 400EC 80064CEC 02001021 */ addu $v0, $s0, $zero -/* 400F0 80064CF0 0801933F */ j .L80064CFC -/* 400F4 80064CF4 26520001 */ addiu $s2, $s2, 1 -.L80064CF8: -/* 400F8 80064CF8 00001021 */ addu $v0, $zero, $zero -.L80064CFC: -/* 400FC 80064CFC A3A20044 */ sb $v0, 0x44($sp) -/* 40100 80064D00 00021600 */ sll $v0, $v0, 0x18 -/* 40104 80064D04 00021E03 */ sra $v1, $v0, 0x18 -/* 40108 80064D08 2402006C */ addiu $v0, $zero, 0x6c -/* 4010C 80064D0C 14620007 */ bne $v1, $v0, .L80064D2C -/* 40110 80064D10 27A40010 */ addiu $a0, $sp, 0x10 -/* 40114 80064D14 82420000 */ lb $v0, ($s2) -/* 40118 80064D18 14430004 */ bne $v0, $v1, .L80064D2C -/* 4011C 80064D1C 2402004C */ addiu $v0, $zero, 0x4c -/* 40120 80064D20 A3A20044 */ sb $v0, 0x44($sp) -/* 40124 80064D24 26520001 */ addiu $s2, $s2, 1 -/* 40128 80064D28 27A40010 */ addiu $a0, $sp, 0x10 -.L80064D2C: -/* 4012C 80064D2C 82460000 */ lb $a2, ($s2) -/* 40130 80064D30 27A500BC */ addiu $a1, $sp, 0xbc -/* 40134 80064D34 0C019408 */ jal _Putfld -/* 40138 80064D38 27A70048 */ addiu $a3, $sp, 0x48 -/* 4013C 80064D3C 8FA3001C */ lw $v1, 0x1c($sp) -/* 40140 80064D40 8FA20020 */ lw $v0, 0x20($sp) -/* 40144 80064D44 00621821 */ addu $v1, $v1, $v0 -/* 40148 80064D48 8FA20024 */ lw $v0, 0x24($sp) -/* 4014C 80064D4C 8FA40028 */ lw $a0, 0x28($sp) -/* 40150 80064D50 8FA5002C */ lw $a1, 0x2c($sp) -/* 40154 80064D54 00621821 */ addu $v1, $v1, $v0 -/* 40158 80064D58 00641821 */ addu $v1, $v1, $a0 -/* 4015C 80064D5C 00651821 */ addu $v1, $v1, $a1 -/* 40160 80064D60 8FA40030 */ lw $a0, 0x30($sp) -/* 40164 80064D64 8FA50038 */ lw $a1, 0x38($sp) -/* 40168 80064D68 8FA20040 */ lw $v0, 0x40($sp) -/* 4016C 80064D6C 00641821 */ addu $v1, $v1, $a0 -/* 40170 80064D70 00A32823 */ subu $a1, $a1, $v1 -/* 40174 80064D74 30420004 */ andi $v0, $v0, 4 -/* 40178 80064D78 14400017 */ bnez $v0, .L80064DD8 -/* 4017C 80064D7C AFA50038 */ sw $a1, 0x38($sp) -/* 40180 80064D80 18A00015 */ blez $a1, .L80064DD8 -/* 40184 80064D84 00000000 */ nop -/* 40188 80064D88 00A08821 */ addu $s1, $a1, $zero -/* 4018C 80064D8C 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064D90: -/* 40190 80064D90 10400002 */ beqz $v0, .L80064D9C -/* 40194 80064D94 24100020 */ addiu $s0, $zero, 0x20 -/* 40198 80064D98 02208021 */ addu $s0, $s1, $zero -.L80064D9C: -/* 4019C 80064D9C 5A00000C */ blezl $s0, .L80064DD0 -/* 401A0 80064DA0 02308823 */ subu $s1, $s1, $s0 -/* 401A4 80064DA4 02602021 */ addu $a0, $s3, $zero -/* 401A8 80064DA8 3C058009 */ lui $a1, %hi(spaces) -/* 401AC 80064DAC 24A545E0 */ addiu $a1, $a1, %lo(spaces) -/* 401B0 80064DB0 0280F809 */ jalr $s4 -/* 401B4 80064DB4 02003021 */ addu $a2, $s0, $zero -/* 401B8 80064DB8 00409821 */ addu $s3, $v0, $zero -/* 401BC 80064DBC 1260008E */ beqz $s3, .L80064FF8 -/* 401C0 80064DC0 02308823 */ subu $s1, $s1, $s0 -/* 401C4 80064DC4 8FA2003C */ lw $v0, 0x3c($sp) -/* 401C8 80064DC8 00501021 */ addu $v0, $v0, $s0 -/* 401CC 80064DCC AFA2003C */ sw $v0, 0x3c($sp) -.L80064DD0: -/* 401D0 80064DD0 1E20FFEF */ bgtz $s1, .L80064D90 -/* 401D4 80064DD4 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064DD8: -/* 401D8 80064DD8 8FA6001C */ lw $a2, 0x1c($sp) -/* 401DC 80064DDC 18C0000A */ blez $a2, .L80064E08 -/* 401E0 80064DE0 02602021 */ addu $a0, $s3, $zero -/* 401E4 80064DE4 0280F809 */ jalr $s4 -/* 401E8 80064DE8 27A50048 */ addiu $a1, $sp, 0x48 -/* 401EC 80064DEC 00409821 */ addu $s3, $v0, $zero -/* 401F0 80064DF0 12600081 */ beqz $s3, .L80064FF8 -/* 401F4 80064DF4 00000000 */ nop -/* 401F8 80064DF8 8FA2003C */ lw $v0, 0x3c($sp) -/* 401FC 80064DFC 8FA3001C */ lw $v1, 0x1c($sp) -/* 40200 80064E00 00431021 */ addu $v0, $v0, $v1 -/* 40204 80064E04 AFA2003C */ sw $v0, 0x3c($sp) -.L80064E08: -/* 40208 80064E08 8FA20020 */ lw $v0, 0x20($sp) -/* 4020C 80064E0C 18400015 */ blez $v0, .L80064E64 -/* 40210 80064E10 00000000 */ nop -/* 40214 80064E14 00408821 */ addu $s1, $v0, $zero -/* 40218 80064E18 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064E1C: -/* 4021C 80064E1C 10400002 */ beqz $v0, .L80064E28 -/* 40220 80064E20 24100020 */ addiu $s0, $zero, 0x20 -/* 40224 80064E24 02208021 */ addu $s0, $s1, $zero -.L80064E28: -/* 40228 80064E28 5A00000C */ blezl $s0, .L80064E5C -/* 4022C 80064E2C 02308823 */ subu $s1, $s1, $s0 -/* 40230 80064E30 02602021 */ addu $a0, $s3, $zero -/* 40234 80064E34 3C058009 */ lui $a1, %hi(zeroes) -/* 40238 80064E38 24A54604 */ addiu $a1, $a1, %lo(zeroes) -/* 4023C 80064E3C 0280F809 */ jalr $s4 -/* 40240 80064E40 02003021 */ addu $a2, $s0, $zero -/* 40244 80064E44 00409821 */ addu $s3, $v0, $zero -/* 40248 80064E48 1260006B */ beqz $s3, .L80064FF8 -/* 4024C 80064E4C 02308823 */ subu $s1, $s1, $s0 -/* 40250 80064E50 8FA2003C */ lw $v0, 0x3c($sp) -/* 40254 80064E54 00501021 */ addu $v0, $v0, $s0 -/* 40258 80064E58 AFA2003C */ sw $v0, 0x3c($sp) -.L80064E5C: -/* 4025C 80064E5C 1E20FFEF */ bgtz $s1, .L80064E1C -/* 40260 80064E60 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064E64: -/* 40264 80064E64 8FA60024 */ lw $a2, 0x24($sp) -/* 40268 80064E68 18C0000B */ blez $a2, .L80064E98 -/* 4026C 80064E6C 00000000 */ nop -/* 40270 80064E70 8FA50018 */ lw $a1, 0x18($sp) -/* 40274 80064E74 0280F809 */ jalr $s4 -/* 40278 80064E78 02602021 */ addu $a0, $s3, $zero -/* 4027C 80064E7C 00409821 */ addu $s3, $v0, $zero -/* 40280 80064E80 1260005D */ beqz $s3, .L80064FF8 -/* 40284 80064E84 00000000 */ nop -/* 40288 80064E88 8FA2003C */ lw $v0, 0x3c($sp) -/* 4028C 80064E8C 8FA30024 */ lw $v1, 0x24($sp) -/* 40290 80064E90 00431021 */ addu $v0, $v0, $v1 -/* 40294 80064E94 AFA2003C */ sw $v0, 0x3c($sp) -.L80064E98: -/* 40298 80064E98 8FA20028 */ lw $v0, 0x28($sp) -/* 4029C 80064E9C 18400015 */ blez $v0, .L80064EF4 -/* 402A0 80064EA0 00000000 */ nop -/* 402A4 80064EA4 00408821 */ addu $s1, $v0, $zero -/* 402A8 80064EA8 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064EAC: -/* 402AC 80064EAC 10400002 */ beqz $v0, .L80064EB8 -/* 402B0 80064EB0 24100020 */ addiu $s0, $zero, 0x20 -/* 402B4 80064EB4 02208021 */ addu $s0, $s1, $zero -.L80064EB8: -/* 402B8 80064EB8 5A00000C */ blezl $s0, .L80064EEC -/* 402BC 80064EBC 02308823 */ subu $s1, $s1, $s0 -/* 402C0 80064EC0 02602021 */ addu $a0, $s3, $zero -/* 402C4 80064EC4 3C058009 */ lui $a1, %hi(zeroes) -/* 402C8 80064EC8 24A54604 */ addiu $a1, $a1, %lo(zeroes) -/* 402CC 80064ECC 0280F809 */ jalr $s4 -/* 402D0 80064ED0 02003021 */ addu $a2, $s0, $zero -/* 402D4 80064ED4 00409821 */ addu $s3, $v0, $zero -/* 402D8 80064ED8 12600047 */ beqz $s3, .L80064FF8 -/* 402DC 80064EDC 02308823 */ subu $s1, $s1, $s0 -/* 402E0 80064EE0 8FA2003C */ lw $v0, 0x3c($sp) -/* 402E4 80064EE4 00501021 */ addu $v0, $v0, $s0 -/* 402E8 80064EE8 AFA2003C */ sw $v0, 0x3c($sp) -.L80064EEC: -/* 402EC 80064EEC 1E20FFEF */ bgtz $s1, .L80064EAC -/* 402F0 80064EF0 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064EF4: -/* 402F4 80064EF4 8FA6002C */ lw $a2, 0x2c($sp) -/* 402F8 80064EF8 18C0000C */ blez $a2, .L80064F2C -/* 402FC 80064EFC 02602021 */ addu $a0, $s3, $zero -/* 40300 80064F00 8FA20018 */ lw $v0, 0x18($sp) -/* 40304 80064F04 8FA50024 */ lw $a1, 0x24($sp) -/* 40308 80064F08 0280F809 */ jalr $s4 -/* 4030C 80064F0C 00452821 */ addu $a1, $v0, $a1 -/* 40310 80064F10 00409821 */ addu $s3, $v0, $zero -/* 40314 80064F14 12600038 */ beqz $s3, .L80064FF8 -/* 40318 80064F18 00000000 */ nop -/* 4031C 80064F1C 8FA2003C */ lw $v0, 0x3c($sp) -/* 40320 80064F20 8FA3002C */ lw $v1, 0x2c($sp) -/* 40324 80064F24 00431021 */ addu $v0, $v0, $v1 -/* 40328 80064F28 AFA2003C */ sw $v0, 0x3c($sp) -.L80064F2C: -/* 4032C 80064F2C 8FA20030 */ lw $v0, 0x30($sp) -/* 40330 80064F30 18400015 */ blez $v0, .L80064F88 -/* 40334 80064F34 00000000 */ nop -/* 40338 80064F38 00408821 */ addu $s1, $v0, $zero -/* 4033C 80064F3C 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064F40: -/* 40340 80064F40 10400002 */ beqz $v0, .L80064F4C -/* 40344 80064F44 24100020 */ addiu $s0, $zero, 0x20 -/* 40348 80064F48 02208021 */ addu $s0, $s1, $zero -.L80064F4C: -/* 4034C 80064F4C 5A00000C */ blezl $s0, .L80064F80 -/* 40350 80064F50 02308823 */ subu $s1, $s1, $s0 -/* 40354 80064F54 02602021 */ addu $a0, $s3, $zero -/* 40358 80064F58 3C058009 */ lui $a1, %hi(zeroes) -/* 4035C 80064F5C 24A54604 */ addiu $a1, $a1, %lo(zeroes) -/* 40360 80064F60 0280F809 */ jalr $s4 -/* 40364 80064F64 02003021 */ addu $a2, $s0, $zero -/* 40368 80064F68 00409821 */ addu $s3, $v0, $zero -/* 4036C 80064F6C 12600022 */ beqz $s3, .L80064FF8 -/* 40370 80064F70 02308823 */ subu $s1, $s1, $s0 -/* 40374 80064F74 8FA2003C */ lw $v0, 0x3c($sp) -/* 40378 80064F78 00501021 */ addu $v0, $v0, $s0 -/* 4037C 80064F7C AFA2003C */ sw $v0, 0x3c($sp) -.L80064F80: -/* 40380 80064F80 1E20FFEF */ bgtz $s1, .L80064F40 -/* 40384 80064F84 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064F88: -/* 40388 80064F88 8FA20040 */ lw $v0, 0x40($sp) -/* 4038C 80064F8C 30420004 */ andi $v0, $v0, 4 -/* 40390 80064F90 1040FED2 */ beqz $v0, .L80064ADC -/* 40394 80064F94 26450001 */ addiu $a1, $s2, 1 -/* 40398 80064F98 8FA20038 */ lw $v0, 0x38($sp) -/* 4039C 80064F9C 1840FECF */ blez $v0, .L80064ADC -/* 403A0 80064FA0 00408821 */ addu $s1, $v0, $zero -/* 403A4 80064FA4 2E220021 */ sltiu $v0, $s1, 0x21 -.L80064FA8: -/* 403A8 80064FA8 10400002 */ beqz $v0, .L80064FB4 -/* 403AC 80064FAC 24100020 */ addiu $s0, $zero, 0x20 -/* 403B0 80064FB0 02208021 */ addu $s0, $s1, $zero -.L80064FB4: -/* 403B4 80064FB4 5A00000C */ blezl $s0, .L80064FE8 -/* 403B8 80064FB8 02308823 */ subu $s1, $s1, $s0 -/* 403BC 80064FBC 02602021 */ addu $a0, $s3, $zero -/* 403C0 80064FC0 3C058009 */ lui $a1, %hi(spaces) -/* 403C4 80064FC4 24A545E0 */ addiu $a1, $a1, %lo(spaces) -/* 403C8 80064FC8 0280F809 */ jalr $s4 -/* 403CC 80064FCC 02003021 */ addu $a2, $s0, $zero -/* 403D0 80064FD0 00409821 */ addu $s3, $v0, $zero -/* 403D4 80064FD4 12600008 */ beqz $s3, .L80064FF8 -/* 403D8 80064FD8 02308823 */ subu $s1, $s1, $s0 -/* 403DC 80064FDC 8FA2003C */ lw $v0, 0x3c($sp) -/* 403E0 80064FE0 00501021 */ addu $v0, $v0, $s0 -/* 403E4 80064FE4 AFA2003C */ sw $v0, 0x3c($sp) -.L80064FE8: -/* 403E8 80064FE8 1E20FFEF */ bgtz $s1, .L80064FA8 -/* 403EC 80064FEC 2E220021 */ sltiu $v0, $s1, 0x21 -/* 403F0 80064FF0 080192B7 */ j .L80064ADC -/* 403F4 80064FF4 26450001 */ addiu $a1, $s2, 1 -.L80064FF8: -/* 403F8 80064FF8 8FA2003C */ lw $v0, 0x3c($sp) -/* 403FC 80064FFC 8FBF00A8 */ lw $ra, 0xa8($sp) -/* 40400 80065000 8FB500A4 */ lw $s5, 0xa4($sp) -/* 40404 80065004 8FB400A0 */ lw $s4, 0xa0($sp) -/* 40408 80065008 8FB3009C */ lw $s3, 0x9c($sp) -/* 4040C 8006500C 8FB20098 */ lw $s2, 0x98($sp) -/* 40410 80065010 8FB10094 */ lw $s1, 0x94($sp) -/* 40414 80065014 8FB00090 */ lw $s0, 0x90($sp) -/* 40418 80065018 03E00008 */ jr $ra -/* 4041C 8006501C 27BD00B0 */ addiu $sp, $sp, 0xb0 diff --git a/ver/us/asm/nonmatchings/os/3FEA0/_Putfld.s b/ver/us/asm/nonmatchings/os/3FEA0/_Putfld.s deleted file mode 100644 index de3183b5d3..0000000000 --- a/ver/us/asm/nonmatchings/os/3FEA0/_Putfld.s +++ /dev/null @@ -1,348 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_80099C18 -.word .L800654B0_408B0, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800652CC_406CC, .L800654CC_408CC, .L800652CC_406CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800651B4_405B4, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L80065080_40480, .L800650B4_404B4, .L800652CC_406CC, .L800652CC_406CC, .L800652CC_406CC, .L800654CC_408CC, .L800650B4_404B4, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L800654CC_408CC, .L80065380_40780, .L800651B4_405B4, .L80065420_40820, .L800654CC_408CC, .L800654CC_408CC, .L8006546C_4086C, .L800654CC_408CC, .L800651B4_405B4, .L800654CC_408CC, .L800654CC_408CC, .L800651B4_405B4, 0, 0 - -.section .text - -glabel _Putfld -/* 40420 80065020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 40424 80065024 AFB00010 */ sw $s0, 0x10($sp) -/* 40428 80065028 00808021 */ addu $s0, $a0, $zero -/* 4042C 8006502C 00A04021 */ addu $t0, $a1, $zero -/* 40430 80065030 00E04821 */ addu $t1, $a3, $zero -/* 40434 80065034 00C03821 */ addu $a3, $a2, $zero -/* 40438 80065038 24C6FFDB */ addiu $a2, $a2, -0x25 -/* 4043C 8006503C 00063600 */ sll $a2, $a2, 0x18 -/* 40440 80065040 00063603 */ sra $a2, $a2, 0x18 -/* 40444 80065044 2CC20054 */ sltiu $v0, $a2, 0x54 -/* 40448 80065048 AFBF0014 */ sw $ra, 0x14($sp) -/* 4044C 8006504C AE000020 */ sw $zero, 0x20($s0) -/* 40450 80065050 AE00001C */ sw $zero, 0x1c($s0) -/* 40454 80065054 AE000018 */ sw $zero, 0x18($s0) -/* 40458 80065058 AE000014 */ sw $zero, 0x14($s0) -/* 4045C 8006505C AE000010 */ sw $zero, 0x10($s0) -/* 40460 80065060 1040011A */ beqz $v0, .L800654CC_408CC -/* 40464 80065064 AE00000C */ sw $zero, 0xc($s0) -/* 40468 80065068 00061080 */ sll $v0, $a2, 2 -/* 4046C 8006506C 3C01800A */ lui $at, %hi(jtbl_80099C18) -/* 40470 80065070 00220821 */ addu $at, $at, $v0 -/* 40474 80065074 8C229C18 */ lw $v0, %lo(jtbl_80099C18)($at) -/* 40478 80065078 00400008 */ jr $v0 -/* 4047C 8006507C 00000000 */ nop -.L80065080_40480: -/* 40480 80065080 8E04000C */ lw $a0, 0xc($s0) -/* 40484 80065084 24820001 */ addiu $v0, $a0, 1 -/* 40488 80065088 AE02000C */ sw $v0, 0xc($s0) -/* 4048C 8006508C 8D020000 */ lw $v0, ($t0) -/* 40490 80065090 2403FFFC */ addiu $v1, $zero, -4 -/* 40494 80065094 24420003 */ addiu $v0, $v0, 3 -/* 40498 80065098 00431024 */ and $v0, $v0, $v1 -/* 4049C 8006509C 24430004 */ addiu $v1, $v0, 4 -/* 404A0 800650A0 AD030000 */ sw $v1, ($t0) -/* 404A4 800650A4 8C420000 */ lw $v0, ($v0) -/* 404A8 800650A8 01242021 */ addu $a0, $t1, $a0 -/* 404AC 800650AC 08019538 */ j .L800654E0 -/* 404B0 800650B0 A0820000 */ sb $v0, ($a0) -.L800650B4_404B4: -/* 404B4 800650B4 82030034 */ lb $v1, 0x34($s0) -/* 404B8 800650B8 2402006C */ addiu $v0, $zero, 0x6c -/* 404BC 800650BC 1062000B */ beq $v1, $v0, .L800650EC -/* 404C0 800650C0 2402004C */ addiu $v0, $zero, 0x4c -/* 404C4 800650C4 14620009 */ bne $v1, $v0, .L800650EC -/* 404C8 800650C8 2403FFF8 */ addiu $v1, $zero, -8 -/* 404CC 800650CC 8D020000 */ lw $v0, ($t0) -/* 404D0 800650D0 24420007 */ addiu $v0, $v0, 7 -/* 404D4 800650D4 00431024 */ and $v0, $v0, $v1 -/* 404D8 800650D8 24430008 */ addiu $v1, $v0, 8 -/* 404DC 800650DC AD030000 */ sw $v1, ($t0) -/* 404E0 800650E0 8C430004 */ lw $v1, 4($v0) -/* 404E4 800650E4 08019444 */ j .L80065110 -/* 404E8 800650E8 8C420000 */ lw $v0, ($v0) -.L800650EC: -/* 404EC 800650EC 8D020000 */ lw $v0, ($t0) -/* 404F0 800650F0 2403FFFC */ addiu $v1, $zero, -4 -/* 404F4 800650F4 24420003 */ addiu $v0, $v0, 3 -/* 404F8 800650F8 00431024 */ and $v0, $v0, $v1 -/* 404FC 800650FC 24430004 */ addiu $v1, $v0, 4 -/* 40500 80065100 AD030000 */ sw $v1, ($t0) -/* 40504 80065104 8C420000 */ lw $v0, ($v0) -/* 40508 80065108 00401821 */ addu $v1, $v0, $zero -/* 4050C 8006510C 000217C3 */ sra $v0, $v0, 0x1f -.L80065110: -/* 40510 80065110 AE020000 */ sw $v0, ($s0) -/* 40514 80065114 AE030004 */ sw $v1, 4($s0) -/* 40518 80065118 82030034 */ lb $v1, 0x34($s0) -/* 4051C 8006511C 24020068 */ addiu $v0, $zero, 0x68 -/* 40520 80065120 14620008 */ bne $v1, $v0, .L80065144 -/* 40524 80065124 00000000 */ nop -/* 40528 80065128 8E020000 */ lw $v0, ($s0) -/* 4052C 8006512C 8E030004 */ lw $v1, 4($s0) -/* 40530 80065130 00031400 */ sll $v0, $v1, 0x10 -/* 40534 80065134 00022C03 */ sra $a1, $v0, 0x10 -/* 40538 80065138 000227C3 */ sra $a0, $v0, 0x1f -/* 4053C 8006513C AE040000 */ sw $a0, ($s0) -/* 40540 80065140 AE050004 */ sw $a1, 4($s0) -.L80065144: -/* 40544 80065144 8E020000 */ lw $v0, ($s0) -/* 40548 80065148 04410007 */ bgez $v0, .L80065168 -/* 4054C 8006514C 00000000 */ nop -/* 40550 80065150 8E02000C */ lw $v0, 0xc($s0) -/* 40554 80065154 24430001 */ addiu $v1, $v0, 1 -/* 40558 80065158 01221021 */ addu $v0, $t1, $v0 -/* 4055C 8006515C AE03000C */ sw $v1, 0xc($s0) -/* 40560 80065160 0801946B */ j .L800651AC -/* 40564 80065164 2403002D */ addiu $v1, $zero, 0x2d -.L80065168: -/* 40568 80065168 8E030030 */ lw $v1, 0x30($s0) -/* 4056C 8006516C 30620002 */ andi $v0, $v1, 2 -/* 40570 80065170 10400007 */ beqz $v0, .L80065190 -/* 40574 80065174 30620001 */ andi $v0, $v1, 1 -/* 40578 80065178 8E02000C */ lw $v0, 0xc($s0) -/* 4057C 8006517C 24430001 */ addiu $v1, $v0, 1 -/* 40580 80065180 01221021 */ addu $v0, $t1, $v0 -/* 40584 80065184 AE03000C */ sw $v1, 0xc($s0) -/* 40588 80065188 0801946B */ j .L800651AC -/* 4058C 8006518C 2403002B */ addiu $v1, $zero, 0x2b -.L80065190: -/* 40590 80065190 10400046 */ beqz $v0, .L800652AC -/* 40594 80065194 02002021 */ addu $a0, $s0, $zero -/* 40598 80065198 8E02000C */ lw $v0, 0xc($s0) -/* 4059C 8006519C 24430001 */ addiu $v1, $v0, 1 -/* 405A0 800651A0 01221021 */ addu $v0, $t1, $v0 -/* 405A4 800651A4 AE03000C */ sw $v1, 0xc($s0) -/* 405A8 800651A8 24030020 */ addiu $v1, $zero, 0x20 -.L800651AC: -/* 405AC 800651AC 080194AA */ j .L800652A8 -/* 405B0 800651B0 A0430000 */ sb $v1, ($v0) -.L800651B4_405B4: -/* 405B4 800651B4 82030034 */ lb $v1, 0x34($s0) -/* 405B8 800651B8 2402006C */ addiu $v0, $zero, 0x6c -/* 405BC 800651BC 1062000B */ beq $v1, $v0, .L800651EC -/* 405C0 800651C0 2402004C */ addiu $v0, $zero, 0x4c -/* 405C4 800651C4 14620009 */ bne $v1, $v0, .L800651EC -/* 405C8 800651C8 2403FFF8 */ addiu $v1, $zero, -8 -/* 405CC 800651CC 8D020000 */ lw $v0, ($t0) -/* 405D0 800651D0 24420007 */ addiu $v0, $v0, 7 -/* 405D4 800651D4 00431024 */ and $v0, $v0, $v1 -/* 405D8 800651D8 24430008 */ addiu $v1, $v0, 8 -/* 405DC 800651DC AD030000 */ sw $v1, ($t0) -/* 405E0 800651E0 8C430004 */ lw $v1, 4($v0) -/* 405E4 800651E4 08019484 */ j .L80065210 -/* 405E8 800651E8 8C420000 */ lw $v0, ($v0) -.L800651EC: -/* 405EC 800651EC 8D020000 */ lw $v0, ($t0) -/* 405F0 800651F0 2403FFFC */ addiu $v1, $zero, -4 -/* 405F4 800651F4 24420003 */ addiu $v0, $v0, 3 -/* 405F8 800651F8 00431024 */ and $v0, $v0, $v1 -/* 405FC 800651FC 24430004 */ addiu $v1, $v0, 4 -/* 40600 80065200 AD030000 */ sw $v1, ($t0) -/* 40604 80065204 8C420000 */ lw $v0, ($v0) -/* 40608 80065208 00401821 */ addu $v1, $v0, $zero -/* 4060C 8006520C 000217C3 */ sra $v0, $v0, 0x1f -.L80065210: -/* 40610 80065210 AE020000 */ sw $v0, ($s0) -/* 40614 80065214 AE030004 */ sw $v1, 4($s0) -/* 40618 80065218 82030034 */ lb $v1, 0x34($s0) -/* 4061C 8006521C 24020068 */ addiu $v0, $zero, 0x68 -/* 40620 80065220 14620004 */ bne $v1, $v0, .L80065234 -/* 40624 80065224 00001021 */ addu $v0, $zero, $zero -/* 40628 80065228 96030006 */ lhu $v1, 6($s0) -/* 4062C 8006522C 08019490 */ j .L80065240 -/* 40630 80065230 00000000 */ nop -.L80065234: -/* 40634 80065234 14600004 */ bnez $v1, .L80065248 -/* 40638 80065238 00000000 */ nop -/* 4063C 8006523C 8E030004 */ lw $v1, 4($s0) -.L80065240: -/* 40640 80065240 AE020000 */ sw $v0, ($s0) -/* 40644 80065244 AE030004 */ sw $v1, 4($s0) -.L80065248: -/* 40648 80065248 8E020030 */ lw $v0, 0x30($s0) -/* 4064C 8006524C 30420008 */ andi $v0, $v0, 8 -/* 40650 80065250 10400016 */ beqz $v0, .L800652AC -/* 40654 80065254 02002021 */ addu $a0, $s0, $zero -/* 40658 80065258 8E02000C */ lw $v0, 0xc($s0) -/* 4065C 8006525C 24430001 */ addiu $v1, $v0, 1 -/* 40660 80065260 01221021 */ addu $v0, $t1, $v0 -/* 40664 80065264 AE03000C */ sw $v1, 0xc($s0) -/* 40668 80065268 24030030 */ addiu $v1, $zero, 0x30 -/* 4066C 8006526C A0430000 */ sb $v1, ($v0) -/* 40670 80065270 00071600 */ sll $v0, $a3, 0x18 -/* 40674 80065274 00021603 */ sra $v0, $v0, 0x18 -/* 40678 80065278 38430078 */ xori $v1, $v0, 0x78 -/* 4067C 8006527C 2C630001 */ sltiu $v1, $v1, 1 -/* 40680 80065280 38420058 */ xori $v0, $v0, 0x58 -/* 40684 80065284 2C420001 */ sltiu $v0, $v0, 1 -/* 40688 80065288 00621825 */ or $v1, $v1, $v0 -/* 4068C 8006528C 10600007 */ beqz $v1, .L800652AC -/* 40690 80065290 00000000 */ nop -/* 40694 80065294 8E02000C */ lw $v0, 0xc($s0) -/* 40698 80065298 24430001 */ addiu $v1, $v0, 1 -/* 4069C 8006529C 01221021 */ addu $v0, $t1, $v0 -/* 406A0 800652A0 AE03000C */ sw $v1, 0xc($s0) -/* 406A4 800652A4 A0470000 */ sb $a3, ($v0) -.L800652A8: -/* 406A8 800652A8 02002021 */ addu $a0, $s0, $zero -.L800652AC: -/* 406AC 800652AC 8C82000C */ lw $v0, 0xc($a0) -/* 406B0 800652B0 00072E00 */ sll $a1, $a3, 0x18 -/* 406B4 800652B4 00052E03 */ sra $a1, $a1, 0x18 -/* 406B8 800652B8 01221021 */ addu $v0, $t1, $v0 -/* 406BC 800652BC 0C01AE60 */ jal _Litob -/* 406C0 800652C0 AC820008 */ sw $v0, 8($a0) -/* 406C4 800652C4 08019538 */ j .L800654E0 -/* 406C8 800652C8 00000000 */ nop -.L800652CC_406CC: -/* 406CC 800652CC 8D020000 */ lw $v0, ($t0) -/* 406D0 800652D0 2403FFF8 */ addiu $v1, $zero, -8 -/* 406D4 800652D4 24420007 */ addiu $v0, $v0, 7 -/* 406D8 800652D8 00431024 */ and $v0, $v0, $v1 -/* 406DC 800652DC 24430008 */ addiu $v1, $v0, 8 -/* 406E0 800652E0 AD030000 */ sw $v1, ($t0) -/* 406E4 800652E4 D4400000 */ ldc1 $f0, ($v0) -/* 406E8 800652E8 F6000000 */ sdc1 $f0, ($s0) -/* 406EC 800652EC 96020000 */ lhu $v0, ($s0) -/* 406F0 800652F0 30428000 */ andi $v0, $v0, 0x8000 -/* 406F4 800652F4 10400007 */ beqz $v0, .L80065314 -/* 406F8 800652F8 00000000 */ nop -/* 406FC 800652FC 8E02000C */ lw $v0, 0xc($s0) -/* 40700 80065300 24430001 */ addiu $v1, $v0, 1 -/* 40704 80065304 01221021 */ addu $v0, $t1, $v0 -/* 40708 80065308 AE03000C */ sw $v1, 0xc($s0) -/* 4070C 8006530C 080194D6 */ j .L80065358 -/* 40710 80065310 2403002D */ addiu $v1, $zero, 0x2d -.L80065314: -/* 40714 80065314 8E030030 */ lw $v1, 0x30($s0) -/* 40718 80065318 30620002 */ andi $v0, $v1, 2 -/* 4071C 8006531C 10400007 */ beqz $v0, .L8006533C -/* 40720 80065320 30620001 */ andi $v0, $v1, 1 -/* 40724 80065324 8E02000C */ lw $v0, 0xc($s0) -/* 40728 80065328 24430001 */ addiu $v1, $v0, 1 -/* 4072C 8006532C 01221021 */ addu $v0, $t1, $v0 -/* 40730 80065330 AE03000C */ sw $v1, 0xc($s0) -/* 40734 80065334 080194D6 */ j .L80065358 -/* 40738 80065338 2403002B */ addiu $v1, $zero, 0x2b -.L8006533C: -/* 4073C 8006533C 10400008 */ beqz $v0, .L80065360 -/* 40740 80065340 02002021 */ addu $a0, $s0, $zero -/* 40744 80065344 8E02000C */ lw $v0, 0xc($s0) -/* 40748 80065348 24430001 */ addiu $v1, $v0, 1 -/* 4074C 8006534C 01221021 */ addu $v0, $t1, $v0 -/* 40750 80065350 AE03000C */ sw $v1, 0xc($s0) -/* 40754 80065354 24030020 */ addiu $v1, $zero, 0x20 -.L80065358: -/* 40758 80065358 A0430000 */ sb $v1, ($v0) -/* 4075C 8006535C 02002021 */ addu $a0, $s0, $zero -.L80065360: -/* 40760 80065360 8C82000C */ lw $v0, 0xc($a0) -/* 40764 80065364 00072E00 */ sll $a1, $a3, 0x18 -/* 40768 80065368 00052E03 */ sra $a1, $a1, 0x18 -/* 4076C 8006536C 01221021 */ addu $v0, $t1, $v0 -/* 40770 80065370 0C01AEF4 */ jal _Ldtob -/* 40774 80065374 AC820008 */ sw $v0, 8($a0) -/* 40778 80065378 08019538 */ j .L800654E0 -/* 4077C 8006537C 00000000 */ nop -.L80065380_40780: -/* 40780 80065380 82030034 */ lb $v1, 0x34($s0) -/* 40784 80065384 24020068 */ addiu $v0, $zero, 0x68 -/* 40788 80065388 1462000B */ bne $v1, $v0, .L800653B8 -/* 4078C 8006538C 2402006C */ addiu $v0, $zero, 0x6c -/* 40790 80065390 8D020000 */ lw $v0, ($t0) -/* 40794 80065394 2403FFFC */ addiu $v1, $zero, -4 -/* 40798 80065398 24420003 */ addiu $v0, $v0, 3 -/* 4079C 8006539C 00431024 */ and $v0, $v0, $v1 -/* 407A0 800653A0 24430004 */ addiu $v1, $v0, 4 -/* 407A4 800653A4 AD030000 */ sw $v1, ($t0) -/* 407A8 800653A8 8C430000 */ lw $v1, ($v0) -/* 407AC 800653AC 8E02002C */ lw $v0, 0x2c($s0) -/* 407B0 800653B0 08019538 */ j .L800654E0 -/* 407B4 800653B4 A4620000 */ sh $v0, ($v1) -.L800653B8: -/* 407B8 800653B8 1062000F */ beq $v1, $v0, .L800653F8 -/* 407BC 800653BC 2402004C */ addiu $v0, $zero, 0x4c -/* 407C0 800653C0 1462000D */ bne $v1, $v0, .L800653F8 -/* 407C4 800653C4 2402FFFC */ addiu $v0, $zero, -4 -/* 407C8 800653C8 8D040000 */ lw $a0, ($t0) -/* 407CC 800653CC 24840003 */ addiu $a0, $a0, 3 -/* 407D0 800653D0 00822024 */ and $a0, $a0, $v0 -/* 407D4 800653D4 24820004 */ addiu $v0, $a0, 4 -/* 407D8 800653D8 AD020000 */ sw $v0, ($t0) -/* 407DC 800653DC 8E02002C */ lw $v0, 0x2c($s0) -/* 407E0 800653E0 8C840000 */ lw $a0, ($a0) -/* 407E4 800653E4 00401821 */ addu $v1, $v0, $zero -/* 407E8 800653E8 00001021 */ addu $v0, $zero, $zero -/* 407EC 800653EC AC820000 */ sw $v0, ($a0) -/* 407F0 800653F0 08019538 */ j .L800654E0 -/* 407F4 800653F4 AC830004 */ sw $v1, 4($a0) -.L800653F8: -/* 407F8 800653F8 8D020000 */ lw $v0, ($t0) -/* 407FC 800653FC 2403FFFC */ addiu $v1, $zero, -4 -/* 40800 80065400 24420003 */ addiu $v0, $v0, 3 -/* 40804 80065404 00431024 */ and $v0, $v0, $v1 -/* 40808 80065408 24430004 */ addiu $v1, $v0, 4 -/* 4080C 8006540C AD030000 */ sw $v1, ($t0) -/* 40810 80065410 8C430000 */ lw $v1, ($v0) -/* 40814 80065414 8E02002C */ lw $v0, 0x2c($s0) -/* 40818 80065418 08019538 */ j .L800654E0 -/* 4081C 8006541C AC620000 */ sw $v0, ($v1) -.L80065420_40820: -/* 40820 80065420 8D040000 */ lw $a0, ($t0) -/* 40824 80065424 2405FFFC */ addiu $a1, $zero, -4 -/* 40828 80065428 24840003 */ addiu $a0, $a0, 3 -/* 4082C 8006542C 00852024 */ and $a0, $a0, $a1 -/* 40830 80065430 24850004 */ addiu $a1, $a0, 4 -/* 40834 80065434 AD050000 */ sw $a1, ($t0) -/* 40838 80065438 8C870000 */ lw $a3, ($a0) -/* 4083C 8006543C 02002021 */ addu $a0, $s0, $zero -/* 40840 80065440 24050078 */ addiu $a1, $zero, 0x78 -/* 40844 80065444 8C86000C */ lw $a2, 0xc($a0) -/* 40848 80065448 00E01821 */ addu $v1, $a3, $zero -/* 4084C 8006544C 000717C3 */ sra $v0, $a3, 0x1f -/* 40850 80065450 01263021 */ addu $a2, $t1, $a2 -/* 40854 80065454 AC820000 */ sw $v0, ($a0) -/* 40858 80065458 AC830004 */ sw $v1, 4($a0) -/* 4085C 8006545C 0C01AE60 */ jal _Litob -/* 40860 80065460 AC860008 */ sw $a2, 8($a0) -/* 40864 80065464 08019538 */ j .L800654E0 -/* 40868 80065468 00000000 */ nop -.L8006546C_4086C: -/* 4086C 8006546C 8D020000 */ lw $v0, ($t0) -/* 40870 80065470 2403FFFC */ addiu $v1, $zero, -4 -/* 40874 80065474 24420003 */ addiu $v0, $v0, 3 -/* 40878 80065478 00431024 */ and $v0, $v0, $v1 -/* 4087C 8006547C 24430004 */ addiu $v1, $v0, 4 -/* 40880 80065480 AD030000 */ sw $v1, ($t0) -/* 40884 80065484 8C440000 */ lw $a0, ($v0) -/* 40888 80065488 0C019294 */ jal strlen -/* 4088C 8006548C AE040008 */ sw $a0, 8($s0) -/* 40890 80065490 8E030024 */ lw $v1, 0x24($s0) -/* 40894 80065494 04600012 */ bltz $v1, .L800654E0 -/* 40898 80065498 AE020014 */ sw $v0, 0x14($s0) -/* 4089C 8006549C 0062102A */ slt $v0, $v1, $v0 -/* 408A0 800654A0 5440000F */ bnel $v0, $zero, .L800654E0 -/* 408A4 800654A4 AE030014 */ sw $v1, 0x14($s0) -/* 408A8 800654A8 08019538 */ j .L800654E0 -/* 408AC 800654AC 00000000 */ nop -.L800654B0_408B0: -/* 408B0 800654B0 8E02000C */ lw $v0, 0xc($s0) -/* 408B4 800654B4 24430001 */ addiu $v1, $v0, 1 -/* 408B8 800654B8 01221021 */ addu $v0, $t1, $v0 -/* 408BC 800654BC AE03000C */ sw $v1, 0xc($s0) -/* 408C0 800654C0 24030025 */ addiu $v1, $zero, 0x25 -/* 408C4 800654C4 08019538 */ j .L800654E0 -/* 408C8 800654C8 A0430000 */ sb $v1, ($v0) -.L800654CC_408CC: -/* 408CC 800654CC 8E02000C */ lw $v0, 0xc($s0) -/* 408D0 800654D0 24430001 */ addiu $v1, $v0, 1 -/* 408D4 800654D4 01221021 */ addu $v0, $t1, $v0 -/* 408D8 800654D8 AE03000C */ sw $v1, 0xc($s0) -/* 408DC 800654DC A0470000 */ sb $a3, ($v0) -.L800654E0: -/* 408E0 800654E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 408E4 800654E4 8FB00010 */ lw $s0, 0x10($sp) -/* 408E8 800654E8 03E00008 */ jr $ra -/* 408EC 800654EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s deleted file mode 100644 index 8a7be89de1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411A0_B216E0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0_B216E0 -/* B216E0 802411A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B216E4 802411A4 0080182D */ daddu $v1, $a0, $zero -/* B216E8 802411A8 00A0202D */ daddu $a0, $a1, $zero -/* B216EC 802411AC 2402FFFF */ addiu $v0, $zero, -1 -/* B216F0 802411B0 14820004 */ bne $a0, $v0, .L802411C4 -/* B216F4 802411B4 AFBF0010 */ sw $ra, 0x10($sp) -/* B216F8 802411B8 8C64014C */ lw $a0, 0x14c($v1) -/* B216FC 802411BC 08090476 */ j .L802411D8 -/* B21700 802411C0 00000000 */ nop -.L802411C4: -/* B21704 802411C4 3C02EFE8 */ lui $v0, 0xefe8 -/* B21708 802411C8 34422080 */ ori $v0, $v0, 0x2080 -/* B2170C 802411CC 0082102A */ slt $v0, $a0, $v0 -/* B21710 802411D0 14400003 */ bnez $v0, .L802411E0 -/* B21714 802411D4 0080102D */ daddu $v0, $a0, $zero -.L802411D8: -/* B21718 802411D8 0C00EAD2 */ jal get_npc_safe -/* B2171C 802411DC 00000000 */ nop -.L802411E0: -/* B21720 802411E0 8FBF0010 */ lw $ra, 0x10($sp) -/* B21724 802411E4 03E00008 */ jr $ra -/* B21728 802411E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s deleted file mode 100644 index 85e9c3f690..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411EC_B2172C -/* B2172C 802411EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B21730 802411F0 AFB10014 */ sw $s1, 0x14($sp) -/* B21734 802411F4 0080882D */ daddu $s1, $a0, $zero -/* B21738 802411F8 AFBF0024 */ sw $ra, 0x24($sp) -/* B2173C 802411FC AFB40020 */ sw $s4, 0x20($sp) -/* B21740 80241200 AFB3001C */ sw $s3, 0x1c($sp) -/* B21744 80241204 AFB20018 */ sw $s2, 0x18($sp) -/* B21748 80241208 AFB00010 */ sw $s0, 0x10($sp) -/* B2174C 8024120C F7B40028 */ sdc1 $f20, 0x28($sp) -/* B21750 80241210 8E30000C */ lw $s0, 0xc($s1) -/* B21754 80241214 8E050000 */ lw $a1, ($s0) -/* B21758 80241218 0C0B1EAF */ jal evt_get_variable -/* B2175C 8024121C 26100004 */ addiu $s0, $s0, 4 -/* B21760 80241220 8E120000 */ lw $s2, ($s0) -/* B21764 80241224 26100004 */ addiu $s0, $s0, 4 -/* B21768 80241228 0220202D */ daddu $a0, $s1, $zero -/* B2176C 8024122C 8E130000 */ lw $s3, ($s0) -/* B21770 80241230 8E140004 */ lw $s4, 4($s0) -/* B21774 80241234 0C090468 */ jal func_802411A0_B216E0 -/* B21778 80241238 0040282D */ daddu $a1, $v0, $zero -/* B2177C 8024123C 0040802D */ daddu $s0, $v0, $zero -/* B21780 80241240 12000034 */ beqz $s0, .L80241314 -/* B21784 80241244 24020002 */ addiu $v0, $zero, 2 -/* B21788 80241248 3C038024 */ lui $v1, %hi(D_80245950_B25E90) -/* B2178C 8024124C 24635950 */ addiu $v1, $v1, %lo(D_80245950_B25E90) -/* B21790 80241250 8C640000 */ lw $a0, ($v1) -/* B21794 80241254 24820004 */ addiu $v0, $a0, 4 -/* B21798 80241258 AC620000 */ sw $v0, ($v1) -/* B2179C 8024125C 2C420168 */ sltiu $v0, $v0, 0x168 -/* B217A0 80241260 14400004 */ bnez $v0, .L80241274 -/* B217A4 80241264 3C0200B6 */ lui $v0, 0xb6 -/* B217A8 80241268 2482FE9C */ addiu $v0, $a0, -0x164 -/* B217AC 8024126C AC620000 */ sw $v0, ($v1) -/* B217B0 80241270 3C0200B6 */ lui $v0, 0xb6 -.L80241274: -/* B217B4 80241274 8E030028 */ lw $v1, 0x28($s0) -/* B217B8 80241278 C614003C */ lwc1 $f20, 0x3c($s0) -/* B217BC 8024127C 10620009 */ beq $v1, $v0, .L802412A4 -/* B217C0 80241280 34420004 */ ori $v0, $v0, 4 -/* B217C4 80241284 10620007 */ beq $v1, $v0, .L802412A4 -/* B217C8 80241288 3C0200B6 */ lui $v0, 0xb6 -/* B217CC 8024128C 34420008 */ ori $v0, $v0, 8 -/* B217D0 80241290 10620004 */ beq $v1, $v0, .L802412A4 -/* B217D4 80241294 3C0200B6 */ lui $v0, 0xb6 -/* B217D8 80241298 3442000C */ ori $v0, $v0, 0xc -/* B217DC 8024129C 14620011 */ bne $v1, $v0, .L802412E4 -/* B217E0 802412A0 0220202D */ daddu $a0, $s1, $zero -.L802412A4: -/* B217E4 802412A4 3C028024 */ lui $v0, %hi(D_80245950_B25E90) -/* B217E8 802412A8 8C425950 */ lw $v0, %lo(D_80245950_B25E90)($v0) -/* B217EC 802412AC 44826000 */ mtc1 $v0, $f12 -/* B217F0 802412B0 00000000 */ nop -/* B217F4 802412B4 04410006 */ bgez $v0, .L802412D0 -/* B217F8 802412B8 46806321 */ cvt.d.w $f12, $f12 -/* B217FC 802412BC 3C0141F0 */ lui $at, 0x41f0 -/* B21800 802412C0 44810800 */ mtc1 $at, $f1 -/* B21804 802412C4 44800000 */ mtc1 $zero, $f0 -/* B21808 802412C8 00000000 */ nop -/* B2180C 802412CC 46206300 */ add.d $f12, $f12, $f0 -.L802412D0: -/* B21810 802412D0 0C00A8BB */ jal sin_deg -/* B21814 802412D4 46206320 */ cvt.s.d $f12, $f12 -/* B21818 802412D8 46000000 */ add.s $f0, $f0, $f0 -/* B2181C 802412DC 4600A500 */ add.s $f20, $f20, $f0 -/* B21820 802412E0 0220202D */ daddu $a0, $s1, $zero -.L802412E4: -/* B21824 802412E4 8E060038 */ lw $a2, 0x38($s0) -/* B21828 802412E8 0C0B2190 */ jal evt_set_float_variable -/* B2182C 802412EC 0240282D */ daddu $a1, $s2, $zero -/* B21830 802412F0 0220202D */ daddu $a0, $s1, $zero -/* B21834 802412F4 4406A000 */ mfc1 $a2, $f20 -/* B21838 802412F8 0C0B2190 */ jal evt_set_float_variable -/* B2183C 802412FC 0260282D */ daddu $a1, $s3, $zero -/* B21840 80241300 0220202D */ daddu $a0, $s1, $zero -/* B21844 80241304 8E060040 */ lw $a2, 0x40($s0) -/* B21848 80241308 0C0B2190 */ jal evt_set_float_variable -/* B2184C 8024130C 0280282D */ daddu $a1, $s4, $zero -/* B21850 80241310 24020002 */ addiu $v0, $zero, 2 -.L80241314: -/* B21854 80241314 8FBF0024 */ lw $ra, 0x24($sp) -/* B21858 80241318 8FB40020 */ lw $s4, 0x20($sp) -/* B2185C 8024131C 8FB3001C */ lw $s3, 0x1c($sp) -/* B21860 80241320 8FB20018 */ lw $s2, 0x18($sp) -/* B21864 80241324 8FB10014 */ lw $s1, 0x14($sp) -/* B21868 80241328 8FB00010 */ lw $s0, 0x10($sp) -/* B2186C 8024132C D7B40028 */ ldc1 $f20, 0x28($sp) -/* B21870 80241330 03E00008 */ jr $ra -/* B21874 80241334 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s deleted file mode 100644 index a34cf20045..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802415B0_B21AF0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415B0_B21AF0 -/* B21AF0 802415B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B21AF4 802415B4 24040001 */ addiu $a0, $zero, 1 -/* B21AF8 802415B8 27A50010 */ addiu $a1, $sp, 0x10 -/* B21AFC 802415BC 27A60014 */ addiu $a2, $sp, 0x14 -/* B21B00 802415C0 27A70018 */ addiu $a3, $sp, 0x18 -/* B21B04 802415C4 AFBF0028 */ sw $ra, 0x28($sp) -/* B21B08 802415C8 AFB10024 */ sw $s1, 0x24($sp) -/* B21B0C 802415CC 0C0470AC */ jal mdl_get_copied_vertices -/* B21B10 802415D0 AFB00020 */ sw $s0, 0x20($sp) -/* B21B14 802415D4 3C118024 */ lui $s1, %hi(D_80245954_B25E94) -/* B21B18 802415D8 26315954 */ addiu $s1, $s1, %lo(D_80245954_B25E94) -/* B21B1C 802415DC 8FA40010 */ lw $a0, 0x10($sp) -/* B21B20 802415E0 8FA50014 */ lw $a1, 0x14($sp) -/* B21B24 802415E4 8FA60018 */ lw $a2, 0x18($sp) -/* B21B28 802415E8 0C0904CE */ jal func_80241338_B21878 -/* B21B2C 802415EC 0220382D */ daddu $a3, $s1, $zero -/* B21B30 802415F0 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* B21B34 802415F4 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* B21B38 802415F8 8C620000 */ lw $v0, ($v1) -/* B21B3C 802415FC 24040001 */ addiu $a0, $zero, 1 -/* B21B40 80241600 0040802D */ daddu $s0, $v0, $zero -/* B21B44 80241604 24420008 */ addiu $v0, $v0, 8 -/* B21B48 80241608 AC620000 */ sw $v0, ($v1) -/* B21B4C 8024160C 3C02DE00 */ lui $v0, 0xde00 -/* B21B50 80241610 0C0470BB */ jal mdl_get_copied_gfx -/* B21B54 80241614 AE020000 */ sw $v0, ($s0) -/* B21B58 80241618 8E230000 */ lw $v1, ($s1) -/* B21B5C 8024161C 04600003 */ bltz $v1, .L8024162C -/* B21B60 80241620 AE020004 */ sw $v0, 4($s0) -/* B21B64 80241624 24620004 */ addiu $v0, $v1, 4 -/* B21B68 80241628 AE220000 */ sw $v0, ($s1) -.L8024162C: -/* B21B6C 8024162C 8E220000 */ lw $v0, ($s1) -/* B21B70 80241630 28420168 */ slti $v0, $v0, 0x168 -/* B21B74 80241634 14400002 */ bnez $v0, .L80241640 -/* B21B78 80241638 2402FFFF */ addiu $v0, $zero, -1 -/* B21B7C 8024163C AE220000 */ sw $v0, ($s1) -.L80241640: -/* B21B80 80241640 8FBF0028 */ lw $ra, 0x28($sp) -/* B21B84 80241644 8FB10024 */ lw $s1, 0x24($sp) -/* B21B88 80241648 8FB00020 */ lw $s0, 0x20($sp) -/* B21B8C 8024164C 03E00008 */ jr $ra -/* B21B90 80241650 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s deleted file mode 100644 index d88b5b9ea1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241654_B21B94.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241654_B21B94 -/* B21B94 80241654 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B21B98 80241658 24040002 */ addiu $a0, $zero, 2 -/* B21B9C 8024165C 27A50010 */ addiu $a1, $sp, 0x10 -/* B21BA0 80241660 27A60014 */ addiu $a2, $sp, 0x14 -/* B21BA4 80241664 27A70018 */ addiu $a3, $sp, 0x18 -/* B21BA8 80241668 AFBF0028 */ sw $ra, 0x28($sp) -/* B21BAC 8024166C AFB10024 */ sw $s1, 0x24($sp) -/* B21BB0 80241670 0C0470AC */ jal mdl_get_copied_vertices -/* B21BB4 80241674 AFB00020 */ sw $s0, 0x20($sp) -/* B21BB8 80241678 3C118024 */ lui $s1, %hi(D_80245958_B25E98) -/* B21BBC 8024167C 26315958 */ addiu $s1, $s1, %lo(D_80245958_B25E98) -/* B21BC0 80241680 8FA40010 */ lw $a0, 0x10($sp) -/* B21BC4 80241684 8FA50014 */ lw $a1, 0x14($sp) -/* B21BC8 80241688 8FA60018 */ lw $a2, 0x18($sp) -/* B21BCC 8024168C 0C0904CE */ jal func_80241338_B21878 -/* B21BD0 80241690 0220382D */ daddu $a3, $s1, $zero -/* B21BD4 80241694 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* B21BD8 80241698 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* B21BDC 8024169C 8C620000 */ lw $v0, ($v1) -/* B21BE0 802416A0 24040002 */ addiu $a0, $zero, 2 -/* B21BE4 802416A4 0040802D */ daddu $s0, $v0, $zero -/* B21BE8 802416A8 24420008 */ addiu $v0, $v0, 8 -/* B21BEC 802416AC AC620000 */ sw $v0, ($v1) -/* B21BF0 802416B0 3C02DE00 */ lui $v0, 0xde00 -/* B21BF4 802416B4 0C0470BB */ jal mdl_get_copied_gfx -/* B21BF8 802416B8 AE020000 */ sw $v0, ($s0) -/* B21BFC 802416BC 8E230000 */ lw $v1, ($s1) -/* B21C00 802416C0 04600003 */ bltz $v1, .L802416D0 -/* B21C04 802416C4 AE020004 */ sw $v0, 4($s0) -/* B21C08 802416C8 24620004 */ addiu $v0, $v1, 4 -/* B21C0C 802416CC AE220000 */ sw $v0, ($s1) -.L802416D0: -/* B21C10 802416D0 8E220000 */ lw $v0, ($s1) -/* B21C14 802416D4 28420168 */ slti $v0, $v0, 0x168 -/* B21C18 802416D8 14400002 */ bnez $v0, .L802416E4 -/* B21C1C 802416DC 2402FFFF */ addiu $v0, $zero, -1 -/* B21C20 802416E0 AE220000 */ sw $v0, ($s1) -.L802416E4: -/* B21C24 802416E4 8FBF0028 */ lw $ra, 0x28($sp) -/* B21C28 802416E8 8FB10024 */ lw $s1, 0x24($sp) -/* B21C2C 802416EC 8FB00020 */ lw $s0, 0x20($sp) -/* B21C30 802416F0 03E00008 */ jr $ra -/* B21C34 802416F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s deleted file mode 100644 index e726f29e0a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8_B21C38 -/* B21C38 802416F8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B21C3C 802416FC AFB20018 */ sw $s2, 0x18($sp) -/* B21C40 80241700 0080902D */ daddu $s2, $a0, $zero -/* B21C44 80241704 AFBF0028 */ sw $ra, 0x28($sp) -/* B21C48 80241708 AFB50024 */ sw $s5, 0x24($sp) -/* B21C4C 8024170C AFB40020 */ sw $s4, 0x20($sp) -/* B21C50 80241710 AFB3001C */ sw $s3, 0x1c($sp) -/* B21C54 80241714 AFB10014 */ sw $s1, 0x14($sp) -/* B21C58 80241718 AFB00010 */ sw $s0, 0x10($sp) -/* B21C5C 8024171C F7B80040 */ sdc1 $f24, 0x40($sp) -/* B21C60 80241720 F7B60038 */ sdc1 $f22, 0x38($sp) -/* B21C64 80241724 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B21C68 80241728 8E50000C */ lw $s0, 0xc($s2) -/* B21C6C 8024172C 8E140000 */ lw $s4, ($s0) -/* B21C70 80241730 26100004 */ addiu $s0, $s0, 4 -/* B21C74 80241734 0C0B1EAF */ jal evt_get_variable -/* B21C78 80241738 0280282D */ daddu $a1, $s4, $zero -/* B21C7C 8024173C 0040982D */ daddu $s3, $v0, $zero -/* B21C80 80241740 8E150000 */ lw $s5, ($s0) -/* B21C84 80241744 26100004 */ addiu $s0, $s0, 4 -/* B21C88 80241748 8E050000 */ lw $a1, ($s0) -/* B21C8C 8024174C 26100004 */ addiu $s0, $s0, 4 -/* B21C90 80241750 0C0B210B */ jal evt_get_float_variable -/* B21C94 80241754 0240202D */ daddu $a0, $s2, $zero -/* B21C98 80241758 8E050000 */ lw $a1, ($s0) -/* B21C9C 8024175C 26100004 */ addiu $s0, $s0, 4 -/* B21CA0 80241760 0240202D */ daddu $a0, $s2, $zero -/* B21CA4 80241764 0C0B210B */ jal evt_get_float_variable -/* B21CA8 80241768 46000606 */ mov.s $f24, $f0 -/* B21CAC 8024176C 8E050000 */ lw $a1, ($s0) -/* B21CB0 80241770 26100004 */ addiu $s0, $s0, 4 -/* B21CB4 80241774 0240202D */ daddu $a0, $s2, $zero -/* B21CB8 80241778 0C0B1EAF */ jal evt_get_variable -/* B21CBC 8024177C 46000506 */ mov.s $f20, $f0 -/* B21CC0 80241780 8E050000 */ lw $a1, ($s0) -/* B21CC4 80241784 26100004 */ addiu $s0, $s0, 4 -/* B21CC8 80241788 0240202D */ daddu $a0, $s2, $zero -/* B21CCC 8024178C 0C0B1EAF */ jal evt_get_variable -/* B21CD0 80241790 0040882D */ daddu $s1, $v0, $zero -/* B21CD4 80241794 0240202D */ daddu $a0, $s2, $zero -/* B21CD8 80241798 8E050000 */ lw $a1, ($s0) -/* B21CDC 8024179C 0C0B210B */ jal evt_get_float_variable -/* B21CE0 802417A0 0040802D */ daddu $s0, $v0, $zero -/* B21CE4 802417A4 4618A501 */ sub.s $f20, $f20, $f24 -/* B21CE8 802417A8 3C013F00 */ lui $at, 0x3f00 -/* B21CEC 802417AC 44811000 */ mtc1 $at, $f2 -/* B21CF0 802417B0 00000000 */ nop -/* B21CF4 802417B4 4602A502 */ mul.s $f20, $f20, $f2 -/* B21CF8 802417B8 00000000 */ nop -/* B21CFC 802417BC 12000008 */ beqz $s0, .L802417E0 -/* B21D00 802417C0 46000586 */ mov.s $f22, $f0 -/* B21D04 802417C4 0233102A */ slt $v0, $s1, $s3 -/* B21D08 802417C8 10400005 */ beqz $v0, .L802417E0 -/* B21D0C 802417CC 0240202D */ daddu $a0, $s2, $zero -/* B21D10 802417D0 0220982D */ daddu $s3, $s1, $zero -/* B21D14 802417D4 0280282D */ daddu $a1, $s4, $zero -/* B21D18 802417D8 0C0B2026 */ jal evt_set_variable -/* B21D1C 802417DC 0220302D */ daddu $a2, $s1, $zero -.L802417E0: -/* B21D20 802417E0 3C014334 */ lui $at, 0x4334 -/* B21D24 802417E4 44810000 */ mtc1 $at, $f0 -/* B21D28 802417E8 44936000 */ mtc1 $s3, $f12 -/* B21D2C 802417EC 00000000 */ nop -/* B21D30 802417F0 46806320 */ cvt.s.w $f12, $f12 -/* B21D34 802417F4 46006302 */ mul.s $f12, $f12, $f0 -/* B21D38 802417F8 00000000 */ nop -/* B21D3C 802417FC 44910000 */ mtc1 $s1, $f0 -/* B21D40 80241800 00000000 */ nop -/* B21D44 80241804 46800020 */ cvt.s.w $f0, $f0 -/* B21D48 80241808 46006303 */ div.s $f12, $f12, $f0 -/* B21D4C 8024180C 0C00A8D4 */ jal cos_deg -/* B21D50 80241810 46166300 */ add.s $f12, $f12, $f22 -/* B21D54 80241814 4600A002 */ mul.s $f0, $f20, $f0 -/* B21D58 80241818 00000000 */ nop -/* B21D5C 8024181C 4614C080 */ add.s $f2, $f24, $f20 -/* B21D60 80241820 46001081 */ sub.s $f2, $f2, $f0 -/* B21D64 80241824 0240202D */ daddu $a0, $s2, $zero -/* B21D68 80241828 44061000 */ mfc1 $a2, $f2 -/* B21D6C 8024182C 0C0B2190 */ jal evt_set_float_variable -/* B21D70 80241830 02A0282D */ daddu $a1, $s5, $zero -/* B21D74 80241834 8FBF0028 */ lw $ra, 0x28($sp) -/* B21D78 80241838 8FB50024 */ lw $s5, 0x24($sp) -/* B21D7C 8024183C 8FB40020 */ lw $s4, 0x20($sp) -/* B21D80 80241840 8FB3001C */ lw $s3, 0x1c($sp) -/* B21D84 80241844 8FB20018 */ lw $s2, 0x18($sp) -/* B21D88 80241848 8FB10014 */ lw $s1, 0x14($sp) -/* B21D8C 8024184C 8FB00010 */ lw $s0, 0x10($sp) -/* B21D90 80241850 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B21D94 80241854 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B21D98 80241858 D7B40030 */ ldc1 $f20, 0x30($sp) -/* B21D9C 8024185C 24020002 */ addiu $v0, $zero, 2 -/* B21DA0 80241860 03E00008 */ jr $ra -/* B21DA4 80241864 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s deleted file mode 100644 index 2d8413096e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241868_B21DA8 -/* B21DA8 80241868 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B21DAC 8024186C AFB10014 */ sw $s1, 0x14($sp) -/* B21DB0 80241870 0080882D */ daddu $s1, $a0, $zero -/* B21DB4 80241874 AFBF0018 */ sw $ra, 0x18($sp) -/* B21DB8 80241878 AFB00010 */ sw $s0, 0x10($sp) -/* B21DBC 8024187C F7B80030 */ sdc1 $f24, 0x30($sp) -/* B21DC0 80241880 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B21DC4 80241884 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B21DC8 80241888 0C00EAD2 */ jal get_npc_safe -/* B21DCC 8024188C 0000202D */ daddu $a0, $zero, $zero -/* B21DD0 80241890 0040802D */ daddu $s0, $v0, $zero -/* B21DD4 80241894 C614000C */ lwc1 $f20, 0xc($s0) -/* B21DD8 80241898 3C01432A */ lui $at, 0x432a -/* B21DDC 8024189C 4481C000 */ mtc1 $at, $f24 -/* B21DE0 802418A0 4600A507 */ neg.s $f20, $f20 -/* B21DE4 802418A4 0C00A8BB */ jal sin_deg -/* B21DE8 802418A8 4600A306 */ mov.s $f12, $f20 -/* B21DEC 802418AC 46180002 */ mul.s $f0, $f0, $f24 -/* B21DF0 802418B0 00000000 */ nop -/* B21DF4 802418B4 C6160038 */ lwc1 $f22, 0x38($s0) -/* B21DF8 802418B8 3C0141F0 */ lui $at, 0x41f0 -/* B21DFC 802418BC 44811000 */ mtc1 $at, $f2 -/* B21E00 802418C0 00000000 */ nop -/* B21E04 802418C4 4602B580 */ add.s $f22, $f22, $f2 -/* B21E08 802418C8 4600A306 */ mov.s $f12, $f20 -/* B21E0C 802418CC 0C00A8D4 */ jal cos_deg -/* B21E10 802418D0 4600B580 */ add.s $f22, $f22, $f0 -/* B21E14 802418D4 0220202D */ daddu $a0, $s1, $zero -/* B21E18 802418D8 46180002 */ mul.s $f0, $f0, $f24 -/* B21E1C 802418DC 00000000 */ nop -/* B21E20 802418E0 3C05FE36 */ lui $a1, 0xfe36 -/* B21E24 802418E4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B21E28 802418E8 C6180040 */ lwc1 $f24, 0x40($s0) -/* B21E2C 802418EC C614003C */ lwc1 $f20, 0x3c($s0) -/* B21E30 802418F0 4600C600 */ add.s $f24, $f24, $f0 -/* B21E34 802418F4 3C014248 */ lui $at, 0x4248 -/* B21E38 802418F8 44810000 */ mtc1 $at, $f0 -/* B21E3C 802418FC 4406B000 */ mfc1 $a2, $f22 -/* B21E40 80241900 0C0B2190 */ jal evt_set_float_variable -/* B21E44 80241904 4600A500 */ add.s $f20, $f20, $f0 -/* B21E48 80241908 0220202D */ daddu $a0, $s1, $zero -/* B21E4C 8024190C 3C05FE36 */ lui $a1, 0xfe36 -/* B21E50 80241910 4406A000 */ mfc1 $a2, $f20 -/* B21E54 80241914 0C0B2190 */ jal evt_set_float_variable -/* B21E58 80241918 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B21E5C 8024191C 0220202D */ daddu $a0, $s1, $zero -/* B21E60 80241920 3C05FE36 */ lui $a1, 0xfe36 -/* B21E64 80241924 4406C000 */ mfc1 $a2, $f24 -/* B21E68 80241928 0C0B2190 */ jal evt_set_float_variable -/* B21E6C 8024192C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B21E70 80241930 8FBF0018 */ lw $ra, 0x18($sp) -/* B21E74 80241934 8FB10014 */ lw $s1, 0x14($sp) -/* B21E78 80241938 8FB00010 */ lw $s0, 0x10($sp) -/* B21E7C 8024193C D7B80030 */ ldc1 $f24, 0x30($sp) -/* B21E80 80241940 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B21E84 80241944 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B21E88 80241948 24020002 */ addiu $v0, $zero, 2 -/* B21E8C 8024194C 03E00008 */ jr $ra -/* B21E90 80241950 27BD0038 */ addiu $sp, $sp, 0x38 -/* B21E94 80241954 00000000 */ nop -/* B21E98 80241958 00000000 */ nop -/* B21E9C 8024195C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/jan_00_unkVtxFunc001.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s rename to ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/jan_00_unkVtxFunc001.s index 182fa96c6e..cf6f4be674 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B216E0/jan_00_unkVtxFunc001.s @@ -8,7 +8,7 @@ dlabel jtbl_80247AB8_B27FF8 .section .text -glabel func_80241338_B21878 +glabel jan_00_unkVtxFunc001 /* B21878 80241338 27BDFF98 */ addiu $sp, $sp, -0x68 /* B2187C 8024133C AFB20018 */ sw $s2, 0x18($sp) /* B21880 80241340 0080902D */ daddu $s2, $a0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s deleted file mode 100644 index 8bd5663a2f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242860_8B28D0 -/* 8B28D0 80242860 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8B28D4 80242864 AFB10014 */ sw $s1, 0x14($sp) -/* 8B28D8 80242868 0080882D */ daddu $s1, $a0, $zero -/* 8B28DC 8024286C AFBF001C */ sw $ra, 0x1c($sp) -/* 8B28E0 80242870 AFB20018 */ sw $s2, 0x18($sp) -/* 8B28E4 80242874 AFB00010 */ sw $s0, 0x10($sp) -/* 8B28E8 80242878 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8B28EC 8024287C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8B28F0 80242880 0C00EABB */ jal get_npc_unsafe -/* 8B28F4 80242884 24040007 */ addiu $a0, $zero, 7 -/* 8B28F8 80242888 0040802D */ daddu $s0, $v0, $zero -/* 8B28FC 8024288C 3C12800B */ lui $s2, %hi(gCameras) -/* 8B2900 80242890 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* 8B2904 80242894 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8B2908 80242898 C640006C */ lwc1 $f0, 0x6c($s2) -/* 8B290C 8024289C 46006300 */ add.s $f12, $f12, $f0 -/* 8B2910 802428A0 3C014334 */ lui $at, 0x4334 -/* 8B2914 802428A4 4481A000 */ mtc1 $at, $f20 -/* 8B2918 802428A8 3C014220 */ lui $at, 0x4220 -/* 8B291C 802428AC 4481B000 */ mtc1 $at, $f22 -/* 8B2920 802428B0 0C00A8BB */ jal sin_deg -/* 8B2924 802428B4 46146300 */ add.s $f12, $f12, $f20 -/* 8B2928 802428B8 46160002 */ mul.s $f0, $f0, $f22 -/* 8B292C 802428BC 00000000 */ nop -/* 8B2930 802428C0 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8B2934 802428C4 46001080 */ add.s $f2, $f2, $f0 -/* 8B2938 802428C8 4600110D */ trunc.w.s $f4, $f2 -/* 8B293C 802428CC E6240084 */ swc1 $f4, 0x84($s1) -/* 8B2940 802428D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8B2944 802428D4 3C014100 */ lui $at, 0x4100 -/* 8B2948 802428D8 44811000 */ mtc1 $at, $f2 -/* 8B294C 802428DC 00000000 */ nop -/* 8B2950 802428E0 46020000 */ add.s $f0, $f0, $f2 -/* 8B2954 802428E4 4600010D */ trunc.w.s $f4, $f0 -/* 8B2958 802428E8 E6240088 */ swc1 $f4, 0x88($s1) -/* 8B295C 802428EC C60C000C */ lwc1 $f12, 0xc($s0) -/* 8B2960 802428F0 C640006C */ lwc1 $f0, 0x6c($s2) -/* 8B2964 802428F4 46006300 */ add.s $f12, $f12, $f0 -/* 8B2968 802428F8 0C00A8D4 */ jal cos_deg -/* 8B296C 802428FC 46146300 */ add.s $f12, $f12, $f20 -/* 8B2970 80242900 46160002 */ mul.s $f0, $f0, $f22 -/* 8B2974 80242904 00000000 */ nop -/* 8B2978 80242908 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8B297C 8024290C 46001081 */ sub.s $f2, $f2, $f0 -/* 8B2980 80242910 4600110D */ trunc.w.s $f4, $f2 -/* 8B2984 80242914 E624008C */ swc1 $f4, 0x8c($s1) -/* 8B2988 80242918 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B298C 8024291C 8FB20018 */ lw $s2, 0x18($sp) -/* 8B2990 80242920 8FB10014 */ lw $s1, 0x14($sp) -/* 8B2994 80242924 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2998 80242928 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8B299C 8024292C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8B29A0 80242930 24020002 */ addiu $v0, $zero, 2 -/* 8B29A4 80242934 03E00008 */ jr $ra -/* 8B29A8 80242938 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s deleted file mode 100644 index 4c2161b3f5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240DDC_8DAEDC.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC_8DAEDC -/* 8DAEDC 80240DDC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8DAEE0 80240DE0 AFB10014 */ sw $s1, 0x14($sp) -/* 8DAEE4 80240DE4 0080882D */ daddu $s1, $a0, $zero -/* 8DAEE8 80240DE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8DAEEC 80240DEC AFB20018 */ sw $s2, 0x18($sp) -/* 8DAEF0 80240DF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8DAEF4 80240DF4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8DAEF8 80240DF8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8DAEFC 80240DFC 0C00EABB */ jal get_npc_unsafe -/* 8DAF00 80240E00 24040004 */ addiu $a0, $zero, 4 -/* 8DAF04 80240E04 0040802D */ daddu $s0, $v0, $zero -/* 8DAF08 80240E08 3C12800B */ lui $s2, %hi(gCameras) -/* 8DAF0C 80240E0C 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* 8DAF10 80240E10 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8DAF14 80240E14 C640006C */ lwc1 $f0, 0x6c($s2) -/* 8DAF18 80240E18 46006300 */ add.s $f12, $f12, $f0 -/* 8DAF1C 80240E1C 3C014334 */ lui $at, 0x4334 -/* 8DAF20 80240E20 4481A000 */ mtc1 $at, $f20 -/* 8DAF24 80240E24 3C014220 */ lui $at, 0x4220 -/* 8DAF28 80240E28 4481B000 */ mtc1 $at, $f22 -/* 8DAF2C 80240E2C 0C00A8BB */ jal sin_deg -/* 8DAF30 80240E30 46146300 */ add.s $f12, $f12, $f20 -/* 8DAF34 80240E34 46160002 */ mul.s $f0, $f0, $f22 -/* 8DAF38 80240E38 00000000 */ nop -/* 8DAF3C 80240E3C C6020038 */ lwc1 $f2, 0x38($s0) -/* 8DAF40 80240E40 46001080 */ add.s $f2, $f2, $f0 -/* 8DAF44 80240E44 4600110D */ trunc.w.s $f4, $f2 -/* 8DAF48 80240E48 E6240084 */ swc1 $f4, 0x84($s1) -/* 8DAF4C 80240E4C C600003C */ lwc1 $f0, 0x3c($s0) -/* 8DAF50 80240E50 3C014100 */ lui $at, 0x4100 -/* 8DAF54 80240E54 44811000 */ mtc1 $at, $f2 -/* 8DAF58 80240E58 00000000 */ nop -/* 8DAF5C 80240E5C 46020000 */ add.s $f0, $f0, $f2 -/* 8DAF60 80240E60 4600010D */ trunc.w.s $f4, $f0 -/* 8DAF64 80240E64 E6240088 */ swc1 $f4, 0x88($s1) -/* 8DAF68 80240E68 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8DAF6C 80240E6C C640006C */ lwc1 $f0, 0x6c($s2) -/* 8DAF70 80240E70 46006300 */ add.s $f12, $f12, $f0 -/* 8DAF74 80240E74 0C00A8D4 */ jal cos_deg -/* 8DAF78 80240E78 46146300 */ add.s $f12, $f12, $f20 -/* 8DAF7C 80240E7C 46160002 */ mul.s $f0, $f0, $f22 -/* 8DAF80 80240E80 00000000 */ nop -/* 8DAF84 80240E84 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8DAF88 80240E88 46001081 */ sub.s $f2, $f2, $f0 -/* 8DAF8C 80240E8C 4600110D */ trunc.w.s $f4, $f2 -/* 8DAF90 80240E90 E624008C */ swc1 $f4, 0x8c($s1) -/* 8DAF94 80240E94 8FBF001C */ lw $ra, 0x1c($sp) -/* 8DAF98 80240E98 8FB20018 */ lw $s2, 0x18($sp) -/* 8DAF9C 80240E9C 8FB10014 */ lw $s1, 0x14($sp) -/* 8DAFA0 80240EA0 8FB00010 */ lw $s0, 0x10($sp) -/* 8DAFA4 80240EA4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8DAFA8 80240EA8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8DAFAC 80240EAC 24020002 */ addiu $v0, $zero, 2 -/* 8DAFB0 80240EB0 03E00008 */ jr $ra -/* 8DAFB4 80240EB4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 8DAFB8 80240EB8 00000000 */ nop -/* 8DAFBC 80240EBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s deleted file mode 100644 index 7c0b7310ef..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_85247C -/* 85247C 8024030C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852480 80240310 AFB20018 */ sw $s2, 0x18($sp) -/* 852484 80240314 0080902D */ daddu $s2, $a0, $zero -/* 852488 80240318 AFBF0028 */ sw $ra, 0x28($sp) -/* 85248C 8024031C AFB50024 */ sw $s5, 0x24($sp) -/* 852490 80240320 AFB40020 */ sw $s4, 0x20($sp) -/* 852494 80240324 AFB3001C */ sw $s3, 0x1c($sp) -/* 852498 80240328 AFB10014 */ sw $s1, 0x14($sp) -/* 85249C 8024032C AFB00010 */ sw $s0, 0x10($sp) -/* 8524A0 80240330 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 8524A4 80240334 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 8524A8 80240338 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 8524AC 8024033C 8E50000C */ lw $s0, 0xc($s2) -/* 8524B0 80240340 8E140000 */ lw $s4, ($s0) -/* 8524B4 80240344 26100004 */ addiu $s0, $s0, 4 -/* 8524B8 80240348 0C0B1EAF */ jal evt_get_variable -/* 8524BC 8024034C 0280282D */ daddu $a1, $s4, $zero -/* 8524C0 80240350 0040982D */ daddu $s3, $v0, $zero -/* 8524C4 80240354 8E150000 */ lw $s5, ($s0) -/* 8524C8 80240358 26100004 */ addiu $s0, $s0, 4 -/* 8524CC 8024035C 8E050000 */ lw $a1, ($s0) -/* 8524D0 80240360 26100004 */ addiu $s0, $s0, 4 -/* 8524D4 80240364 0C0B210B */ jal evt_get_float_variable -/* 8524D8 80240368 0240202D */ daddu $a0, $s2, $zero -/* 8524DC 8024036C 8E050000 */ lw $a1, ($s0) -/* 8524E0 80240370 26100004 */ addiu $s0, $s0, 4 -/* 8524E4 80240374 0240202D */ daddu $a0, $s2, $zero -/* 8524E8 80240378 0C0B210B */ jal evt_get_float_variable -/* 8524EC 8024037C 46000606 */ mov.s $f24, $f0 -/* 8524F0 80240380 8E050000 */ lw $a1, ($s0) -/* 8524F4 80240384 26100004 */ addiu $s0, $s0, 4 -/* 8524F8 80240388 0240202D */ daddu $a0, $s2, $zero -/* 8524FC 8024038C 0C0B1EAF */ jal evt_get_variable -/* 852500 80240390 46000506 */ mov.s $f20, $f0 -/* 852504 80240394 8E050000 */ lw $a1, ($s0) -/* 852508 80240398 26100004 */ addiu $s0, $s0, 4 -/* 85250C 8024039C 0240202D */ daddu $a0, $s2, $zero -/* 852510 802403A0 0C0B1EAF */ jal evt_get_variable -/* 852514 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 852518 802403A8 0240202D */ daddu $a0, $s2, $zero -/* 85251C 802403AC 8E050000 */ lw $a1, ($s0) -/* 852520 802403B0 0C0B210B */ jal evt_get_float_variable -/* 852524 802403B4 0040802D */ daddu $s0, $v0, $zero -/* 852528 802403B8 4618A501 */ sub.s $f20, $f20, $f24 -/* 85252C 802403BC 3C013F00 */ lui $at, 0x3f00 -/* 852530 802403C0 44811000 */ mtc1 $at, $f2 -/* 852534 802403C4 00000000 */ nop -/* 852538 802403C8 4602A502 */ mul.s $f20, $f20, $f2 -/* 85253C 802403CC 00000000 */ nop -/* 852540 802403D0 12000008 */ beqz $s0, .L802403F4 -/* 852544 802403D4 46000586 */ mov.s $f22, $f0 -/* 852548 802403D8 0233102A */ slt $v0, $s1, $s3 -/* 85254C 802403DC 10400005 */ beqz $v0, .L802403F4 -/* 852550 802403E0 0240202D */ daddu $a0, $s2, $zero -/* 852554 802403E4 0220982D */ daddu $s3, $s1, $zero -/* 852558 802403E8 0280282D */ daddu $a1, $s4, $zero -/* 85255C 802403EC 0C0B2026 */ jal evt_set_variable -/* 852560 802403F0 0220302D */ daddu $a2, $s1, $zero -.L802403F4: -/* 852564 802403F4 3C014334 */ lui $at, 0x4334 -/* 852568 802403F8 44810000 */ mtc1 $at, $f0 -/* 85256C 802403FC 44936000 */ mtc1 $s3, $f12 -/* 852570 80240400 00000000 */ nop -/* 852574 80240404 46806320 */ cvt.s.w $f12, $f12 -/* 852578 80240408 46006302 */ mul.s $f12, $f12, $f0 -/* 85257C 8024040C 00000000 */ nop -/* 852580 80240410 44910000 */ mtc1 $s1, $f0 -/* 852584 80240414 00000000 */ nop -/* 852588 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 85258C 8024041C 46006303 */ div.s $f12, $f12, $f0 -/* 852590 80240420 0C00A8D4 */ jal cos_deg -/* 852594 80240424 46166300 */ add.s $f12, $f12, $f22 -/* 852598 80240428 4600A002 */ mul.s $f0, $f20, $f0 -/* 85259C 8024042C 00000000 */ nop -/* 8525A0 80240430 4614C080 */ add.s $f2, $f24, $f20 -/* 8525A4 80240434 46001081 */ sub.s $f2, $f2, $f0 -/* 8525A8 80240438 0240202D */ daddu $a0, $s2, $zero -/* 8525AC 8024043C 44061000 */ mfc1 $a2, $f2 -/* 8525B0 80240440 0C0B2190 */ jal evt_set_float_variable -/* 8525B4 80240444 02A0282D */ daddu $a1, $s5, $zero -/* 8525B8 80240448 8FBF0028 */ lw $ra, 0x28($sp) -/* 8525BC 8024044C 8FB50024 */ lw $s5, 0x24($sp) -/* 8525C0 80240450 8FB40020 */ lw $s4, 0x20($sp) -/* 8525C4 80240454 8FB3001C */ lw $s3, 0x1c($sp) -/* 8525C8 80240458 8FB20018 */ lw $s2, 0x18($sp) -/* 8525CC 8024045C 8FB10014 */ lw $s1, 0x14($sp) -/* 8525D0 80240460 8FB00010 */ lw $s0, 0x10($sp) -/* 8525D4 80240464 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 8525D8 80240468 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 8525DC 8024046C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 8525E0 80240470 24020002 */ addiu $v0, $zero, 2 -/* 8525E4 80240474 03E00008 */ jr $ra -/* 8525E8 80240478 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s deleted file mode 100644 index 0d53fbfb40..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802433F0_855560.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433F0_855560 -/* 855560 802433F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 855564 802433F4 0080182D */ daddu $v1, $a0, $zero -/* 855568 802433F8 00A0202D */ daddu $a0, $a1, $zero -/* 85556C 802433FC 2402FFFF */ addiu $v0, $zero, -1 -/* 855570 80243400 14820004 */ bne $a0, $v0, .L80243414 -/* 855574 80243404 AFBF0010 */ sw $ra, 0x10($sp) -/* 855578 80243408 8C64014C */ lw $a0, 0x14c($v1) -/* 85557C 8024340C 08090D0A */ j .L80243428 -/* 855580 80243410 00000000 */ nop -.L80243414: -/* 855584 80243414 3C02EFE8 */ lui $v0, 0xefe8 -/* 855588 80243418 34422080 */ ori $v0, $v0, 0x2080 -/* 85558C 8024341C 0082102A */ slt $v0, $a0, $v0 -/* 855590 80243420 14400003 */ bnez $v0, .L80243430 -/* 855594 80243424 0080102D */ daddu $v0, $a0, $zero -.L80243428: -/* 855598 80243428 0C00EAD2 */ jal get_npc_safe -/* 85559C 8024342C 00000000 */ nop -.L80243430: -/* 8555A0 80243430 8FBF0010 */ lw $ra, 0x10($sp) -/* 8555A4 80243434 03E00008 */ jr $ra -/* 8555A8 80243438 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s deleted file mode 100644 index 725372a748..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024343C_8555AC -/* 8555AC 8024343C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8555B0 80243440 AFB10014 */ sw $s1, 0x14($sp) -/* 8555B4 80243444 0080882D */ daddu $s1, $a0, $zero -/* 8555B8 80243448 AFBF0024 */ sw $ra, 0x24($sp) -/* 8555BC 8024344C AFB40020 */ sw $s4, 0x20($sp) -/* 8555C0 80243450 AFB3001C */ sw $s3, 0x1c($sp) -/* 8555C4 80243454 AFB20018 */ sw $s2, 0x18($sp) -/* 8555C8 80243458 AFB00010 */ sw $s0, 0x10($sp) -/* 8555CC 8024345C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8555D0 80243460 8E30000C */ lw $s0, 0xc($s1) -/* 8555D4 80243464 8E050000 */ lw $a1, ($s0) -/* 8555D8 80243468 0C0B1EAF */ jal evt_get_variable -/* 8555DC 8024346C 26100004 */ addiu $s0, $s0, 4 -/* 8555E0 80243470 8E120000 */ lw $s2, ($s0) -/* 8555E4 80243474 26100004 */ addiu $s0, $s0, 4 -/* 8555E8 80243478 0220202D */ daddu $a0, $s1, $zero -/* 8555EC 8024347C 8E130000 */ lw $s3, ($s0) -/* 8555F0 80243480 8E140004 */ lw $s4, 4($s0) -/* 8555F4 80243484 0C090CFC */ jal func_802433F0_855560 -/* 8555F8 80243488 0040282D */ daddu $a1, $v0, $zero -/* 8555FC 8024348C 0040802D */ daddu $s0, $v0, $zero -/* 855600 80243490 12000034 */ beqz $s0, .L80243564 -/* 855604 80243494 24020002 */ addiu $v0, $zero, 2 -/* 855608 80243498 3C038025 */ lui $v1, %hi(D_80250A50_862BC0) -/* 85560C 8024349C 24630A50 */ addiu $v1, $v1, %lo(D_80250A50_862BC0) -/* 855610 802434A0 8C640000 */ lw $a0, ($v1) -/* 855614 802434A4 24820004 */ addiu $v0, $a0, 4 -/* 855618 802434A8 AC620000 */ sw $v0, ($v1) -/* 85561C 802434AC 2C420168 */ sltiu $v0, $v0, 0x168 -/* 855620 802434B0 14400004 */ bnez $v0, .L802434C4 -/* 855624 802434B4 3C0200B6 */ lui $v0, 0xb6 -/* 855628 802434B8 2482FE9C */ addiu $v0, $a0, -0x164 -/* 85562C 802434BC AC620000 */ sw $v0, ($v1) -/* 855630 802434C0 3C0200B6 */ lui $v0, 0xb6 -.L802434C4: -/* 855634 802434C4 8E030028 */ lw $v1, 0x28($s0) -/* 855638 802434C8 C614003C */ lwc1 $f20, 0x3c($s0) -/* 85563C 802434CC 10620009 */ beq $v1, $v0, .L802434F4 -/* 855640 802434D0 34420004 */ ori $v0, $v0, 4 -/* 855644 802434D4 10620007 */ beq $v1, $v0, .L802434F4 -/* 855648 802434D8 3C0200B6 */ lui $v0, 0xb6 -/* 85564C 802434DC 34420008 */ ori $v0, $v0, 8 -/* 855650 802434E0 10620004 */ beq $v1, $v0, .L802434F4 -/* 855654 802434E4 3C0200B6 */ lui $v0, 0xb6 -/* 855658 802434E8 3442000C */ ori $v0, $v0, 0xc -/* 85565C 802434EC 14620011 */ bne $v1, $v0, .L80243534 -/* 855660 802434F0 0220202D */ daddu $a0, $s1, $zero -.L802434F4: -/* 855664 802434F4 3C028025 */ lui $v0, %hi(D_80250A50_862BC0) -/* 855668 802434F8 8C420A50 */ lw $v0, %lo(D_80250A50_862BC0)($v0) -/* 85566C 802434FC 44826000 */ mtc1 $v0, $f12 -/* 855670 80243500 00000000 */ nop -/* 855674 80243504 04410006 */ bgez $v0, .L80243520 -/* 855678 80243508 46806321 */ cvt.d.w $f12, $f12 -/* 85567C 8024350C 3C0141F0 */ lui $at, 0x41f0 -/* 855680 80243510 44810800 */ mtc1 $at, $f1 -/* 855684 80243514 44800000 */ mtc1 $zero, $f0 -/* 855688 80243518 00000000 */ nop -/* 85568C 8024351C 46206300 */ add.d $f12, $f12, $f0 -.L80243520: -/* 855690 80243520 0C00A8BB */ jal sin_deg -/* 855694 80243524 46206320 */ cvt.s.d $f12, $f12 -/* 855698 80243528 46000000 */ add.s $f0, $f0, $f0 -/* 85569C 8024352C 4600A500 */ add.s $f20, $f20, $f0 -/* 8556A0 80243530 0220202D */ daddu $a0, $s1, $zero -.L80243534: -/* 8556A4 80243534 8E060038 */ lw $a2, 0x38($s0) -/* 8556A8 80243538 0C0B2190 */ jal evt_set_float_variable -/* 8556AC 8024353C 0240282D */ daddu $a1, $s2, $zero -/* 8556B0 80243540 0220202D */ daddu $a0, $s1, $zero -/* 8556B4 80243544 4406A000 */ mfc1 $a2, $f20 -/* 8556B8 80243548 0C0B2190 */ jal evt_set_float_variable -/* 8556BC 8024354C 0260282D */ daddu $a1, $s3, $zero -/* 8556C0 80243550 0220202D */ daddu $a0, $s1, $zero -/* 8556C4 80243554 8E060040 */ lw $a2, 0x40($s0) -/* 8556C8 80243558 0C0B2190 */ jal evt_set_float_variable -/* 8556CC 8024355C 0280282D */ daddu $a1, $s4, $zero -/* 8556D0 80243560 24020002 */ addiu $v0, $zero, 2 -.L80243564: -/* 8556D4 80243564 8FBF0024 */ lw $ra, 0x24($sp) -/* 8556D8 80243568 8FB40020 */ lw $s4, 0x20($sp) -/* 8556DC 8024356C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8556E0 80243570 8FB20018 */ lw $s2, 0x18($sp) -/* 8556E4 80243574 8FB10014 */ lw $s1, 0x14($sp) -/* 8556E8 80243578 8FB00010 */ lw $s0, 0x10($sp) -/* 8556EC 8024357C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8556F0 80243580 03E00008 */ jr $ra -/* 8556F4 80243584 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s deleted file mode 100644 index 7d1235a76d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243800_855970 -/* 855970 80243800 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 855974 80243804 24040001 */ addiu $a0, $zero, 1 -/* 855978 80243808 27A50010 */ addiu $a1, $sp, 0x10 -/* 85597C 8024380C 27A60014 */ addiu $a2, $sp, 0x14 -/* 855980 80243810 27A70018 */ addiu $a3, $sp, 0x18 -/* 855984 80243814 AFBF0028 */ sw $ra, 0x28($sp) -/* 855988 80243818 AFB10024 */ sw $s1, 0x24($sp) -/* 85598C 8024381C 0C0470AC */ jal mdl_get_copied_vertices -/* 855990 80243820 AFB00020 */ sw $s0, 0x20($sp) -/* 855994 80243824 3C118025 */ lui $s1, %hi(D_80250A54_862BC4) -/* 855998 80243828 26310A54 */ addiu $s1, $s1, %lo(D_80250A54_862BC4) -/* 85599C 8024382C 8FA40010 */ lw $a0, 0x10($sp) -/* 8559A0 80243830 8FA50014 */ lw $a1, 0x14($sp) -/* 8559A4 80243834 8FA60018 */ lw $a2, 0x18($sp) -/* 8559A8 80243838 0C090D62 */ jal func_80243588_8556F8 -/* 8559AC 8024383C 0220382D */ daddu $a3, $s1, $zero -/* 8559B0 80243840 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 8559B4 80243844 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 8559B8 80243848 8C620000 */ lw $v0, ($v1) -/* 8559BC 8024384C 24040001 */ addiu $a0, $zero, 1 -/* 8559C0 80243850 0040802D */ daddu $s0, $v0, $zero -/* 8559C4 80243854 24420008 */ addiu $v0, $v0, 8 -/* 8559C8 80243858 AC620000 */ sw $v0, ($v1) -/* 8559CC 8024385C 3C02DE00 */ lui $v0, 0xde00 -/* 8559D0 80243860 0C0470BB */ jal mdl_get_copied_gfx -/* 8559D4 80243864 AE020000 */ sw $v0, ($s0) -/* 8559D8 80243868 8E230000 */ lw $v1, ($s1) -/* 8559DC 8024386C 04600003 */ bltz $v1, .L8024387C -/* 8559E0 80243870 AE020004 */ sw $v0, 4($s0) -/* 8559E4 80243874 24620004 */ addiu $v0, $v1, 4 -/* 8559E8 80243878 AE220000 */ sw $v0, ($s1) -.L8024387C: -/* 8559EC 8024387C 8E220000 */ lw $v0, ($s1) -/* 8559F0 80243880 28420168 */ slti $v0, $v0, 0x168 -/* 8559F4 80243884 14400002 */ bnez $v0, .L80243890 -/* 8559F8 80243888 2402FFFF */ addiu $v0, $zero, -1 -/* 8559FC 8024388C AE220000 */ sw $v0, ($s1) -.L80243890: -/* 855A00 80243890 8FBF0028 */ lw $ra, 0x28($sp) -/* 855A04 80243894 8FB10024 */ lw $s1, 0x24($sp) -/* 855A08 80243898 8FB00020 */ lw $s0, 0x20($sp) -/* 855A0C 8024389C 03E00008 */ jr $ra -/* 855A10 802438A0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s deleted file mode 100644 index 162c40ecf1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438A4_855A14 -/* 855A14 802438A4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 855A18 802438A8 24040002 */ addiu $a0, $zero, 2 -/* 855A1C 802438AC 27A50010 */ addiu $a1, $sp, 0x10 -/* 855A20 802438B0 27A60014 */ addiu $a2, $sp, 0x14 -/* 855A24 802438B4 27A70018 */ addiu $a3, $sp, 0x18 -/* 855A28 802438B8 AFBF0028 */ sw $ra, 0x28($sp) -/* 855A2C 802438BC AFB10024 */ sw $s1, 0x24($sp) -/* 855A30 802438C0 0C0470AC */ jal mdl_get_copied_vertices -/* 855A34 802438C4 AFB00020 */ sw $s0, 0x20($sp) -/* 855A38 802438C8 3C118025 */ lui $s1, %hi(D_80250A58_862BC8) -/* 855A3C 802438CC 26310A58 */ addiu $s1, $s1, %lo(D_80250A58_862BC8) -/* 855A40 802438D0 8FA40010 */ lw $a0, 0x10($sp) -/* 855A44 802438D4 8FA50014 */ lw $a1, 0x14($sp) -/* 855A48 802438D8 8FA60018 */ lw $a2, 0x18($sp) -/* 855A4C 802438DC 0C090D62 */ jal func_80243588_8556F8 -/* 855A50 802438E0 0220382D */ daddu $a3, $s1, $zero -/* 855A54 802438E4 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 855A58 802438E8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 855A5C 802438EC 8C620000 */ lw $v0, ($v1) -/* 855A60 802438F0 24040002 */ addiu $a0, $zero, 2 -/* 855A64 802438F4 0040802D */ daddu $s0, $v0, $zero -/* 855A68 802438F8 24420008 */ addiu $v0, $v0, 8 -/* 855A6C 802438FC AC620000 */ sw $v0, ($v1) -/* 855A70 80243900 3C02DE00 */ lui $v0, 0xde00 -/* 855A74 80243904 0C0470BB */ jal mdl_get_copied_gfx -/* 855A78 80243908 AE020000 */ sw $v0, ($s0) -/* 855A7C 8024390C 8E230000 */ lw $v1, ($s1) -/* 855A80 80243910 04600003 */ bltz $v1, .L80243920 -/* 855A84 80243914 AE020004 */ sw $v0, 4($s0) -/* 855A88 80243918 24620004 */ addiu $v0, $v1, 4 -/* 855A8C 8024391C AE220000 */ sw $v0, ($s1) -.L80243920: -/* 855A90 80243920 8E220000 */ lw $v0, ($s1) -/* 855A94 80243924 28420168 */ slti $v0, $v0, 0x168 -/* 855A98 80243928 14400002 */ bnez $v0, .L80243934 -/* 855A9C 8024392C 2402FFFF */ addiu $v0, $zero, -1 -/* 855AA0 80243930 AE220000 */ sw $v0, ($s1) -.L80243934: -/* 855AA4 80243934 8FBF0028 */ lw $ra, 0x28($sp) -/* 855AA8 80243938 8FB10024 */ lw $s1, 0x24($sp) -/* 855AAC 8024393C 8FB00020 */ lw $s0, 0x20($sp) -/* 855AB0 80243940 03E00008 */ jr $ra -/* 855AB4 80243944 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s deleted file mode 100644 index 4067b7e65a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243948_855AB8 -/* 855AB8 80243948 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 855ABC 8024394C AFB20018 */ sw $s2, 0x18($sp) -/* 855AC0 80243950 0080902D */ daddu $s2, $a0, $zero -/* 855AC4 80243954 AFBF0028 */ sw $ra, 0x28($sp) -/* 855AC8 80243958 AFB50024 */ sw $s5, 0x24($sp) -/* 855ACC 8024395C AFB40020 */ sw $s4, 0x20($sp) -/* 855AD0 80243960 AFB3001C */ sw $s3, 0x1c($sp) -/* 855AD4 80243964 AFB10014 */ sw $s1, 0x14($sp) -/* 855AD8 80243968 AFB00010 */ sw $s0, 0x10($sp) -/* 855ADC 8024396C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 855AE0 80243970 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 855AE4 80243974 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 855AE8 80243978 8E50000C */ lw $s0, 0xc($s2) -/* 855AEC 8024397C 8E140000 */ lw $s4, ($s0) -/* 855AF0 80243980 26100004 */ addiu $s0, $s0, 4 -/* 855AF4 80243984 0C0B1EAF */ jal evt_get_variable -/* 855AF8 80243988 0280282D */ daddu $a1, $s4, $zero -/* 855AFC 8024398C 0040982D */ daddu $s3, $v0, $zero -/* 855B00 80243990 8E150000 */ lw $s5, ($s0) -/* 855B04 80243994 26100004 */ addiu $s0, $s0, 4 -/* 855B08 80243998 8E050000 */ lw $a1, ($s0) -/* 855B0C 8024399C 26100004 */ addiu $s0, $s0, 4 -/* 855B10 802439A0 0C0B210B */ jal evt_get_float_variable -/* 855B14 802439A4 0240202D */ daddu $a0, $s2, $zero -/* 855B18 802439A8 8E050000 */ lw $a1, ($s0) -/* 855B1C 802439AC 26100004 */ addiu $s0, $s0, 4 -/* 855B20 802439B0 0240202D */ daddu $a0, $s2, $zero -/* 855B24 802439B4 0C0B210B */ jal evt_get_float_variable -/* 855B28 802439B8 46000606 */ mov.s $f24, $f0 -/* 855B2C 802439BC 8E050000 */ lw $a1, ($s0) -/* 855B30 802439C0 26100004 */ addiu $s0, $s0, 4 -/* 855B34 802439C4 0240202D */ daddu $a0, $s2, $zero -/* 855B38 802439C8 0C0B1EAF */ jal evt_get_variable -/* 855B3C 802439CC 46000506 */ mov.s $f20, $f0 -/* 855B40 802439D0 8E050000 */ lw $a1, ($s0) -/* 855B44 802439D4 26100004 */ addiu $s0, $s0, 4 -/* 855B48 802439D8 0240202D */ daddu $a0, $s2, $zero -/* 855B4C 802439DC 0C0B1EAF */ jal evt_get_variable -/* 855B50 802439E0 0040882D */ daddu $s1, $v0, $zero -/* 855B54 802439E4 0240202D */ daddu $a0, $s2, $zero -/* 855B58 802439E8 8E050000 */ lw $a1, ($s0) -/* 855B5C 802439EC 0C0B210B */ jal evt_get_float_variable -/* 855B60 802439F0 0040802D */ daddu $s0, $v0, $zero -/* 855B64 802439F4 4618A501 */ sub.s $f20, $f20, $f24 -/* 855B68 802439F8 3C013F00 */ lui $at, 0x3f00 -/* 855B6C 802439FC 44811000 */ mtc1 $at, $f2 -/* 855B70 80243A00 00000000 */ nop -/* 855B74 80243A04 4602A502 */ mul.s $f20, $f20, $f2 -/* 855B78 80243A08 00000000 */ nop -/* 855B7C 80243A0C 12000008 */ beqz $s0, .L80243A30 -/* 855B80 80243A10 46000586 */ mov.s $f22, $f0 -/* 855B84 80243A14 0233102A */ slt $v0, $s1, $s3 -/* 855B88 80243A18 10400005 */ beqz $v0, .L80243A30 -/* 855B8C 80243A1C 0240202D */ daddu $a0, $s2, $zero -/* 855B90 80243A20 0220982D */ daddu $s3, $s1, $zero -/* 855B94 80243A24 0280282D */ daddu $a1, $s4, $zero -/* 855B98 80243A28 0C0B2026 */ jal evt_set_variable -/* 855B9C 80243A2C 0220302D */ daddu $a2, $s1, $zero -.L80243A30: -/* 855BA0 80243A30 3C014334 */ lui $at, 0x4334 -/* 855BA4 80243A34 44810000 */ mtc1 $at, $f0 -/* 855BA8 80243A38 44936000 */ mtc1 $s3, $f12 -/* 855BAC 80243A3C 00000000 */ nop -/* 855BB0 80243A40 46806320 */ cvt.s.w $f12, $f12 -/* 855BB4 80243A44 46006302 */ mul.s $f12, $f12, $f0 -/* 855BB8 80243A48 00000000 */ nop -/* 855BBC 80243A4C 44910000 */ mtc1 $s1, $f0 -/* 855BC0 80243A50 00000000 */ nop -/* 855BC4 80243A54 46800020 */ cvt.s.w $f0, $f0 -/* 855BC8 80243A58 46006303 */ div.s $f12, $f12, $f0 -/* 855BCC 80243A5C 0C00A8D4 */ jal cos_deg -/* 855BD0 80243A60 46166300 */ add.s $f12, $f12, $f22 -/* 855BD4 80243A64 4600A002 */ mul.s $f0, $f20, $f0 -/* 855BD8 80243A68 00000000 */ nop -/* 855BDC 80243A6C 4614C080 */ add.s $f2, $f24, $f20 -/* 855BE0 80243A70 46001081 */ sub.s $f2, $f2, $f0 -/* 855BE4 80243A74 0240202D */ daddu $a0, $s2, $zero -/* 855BE8 80243A78 44061000 */ mfc1 $a2, $f2 -/* 855BEC 80243A7C 0C0B2190 */ jal evt_set_float_variable -/* 855BF0 80243A80 02A0282D */ daddu $a1, $s5, $zero -/* 855BF4 80243A84 8FBF0028 */ lw $ra, 0x28($sp) -/* 855BF8 80243A88 8FB50024 */ lw $s5, 0x24($sp) -/* 855BFC 80243A8C 8FB40020 */ lw $s4, 0x20($sp) -/* 855C00 80243A90 8FB3001C */ lw $s3, 0x1c($sp) -/* 855C04 80243A94 8FB20018 */ lw $s2, 0x18($sp) -/* 855C08 80243A98 8FB10014 */ lw $s1, 0x14($sp) -/* 855C0C 80243A9C 8FB00010 */ lw $s0, 0x10($sp) -/* 855C10 80243AA0 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 855C14 80243AA4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 855C18 80243AA8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 855C1C 80243AAC 24020002 */ addiu $v0, $zero, 2 -/* 855C20 80243AB0 03E00008 */ jr $ra -/* 855C24 80243AB4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s deleted file mode 100644 index b656995d97..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243AB8_855C28 -/* 855C28 80243AB8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 855C2C 80243ABC AFB10014 */ sw $s1, 0x14($sp) -/* 855C30 80243AC0 0080882D */ daddu $s1, $a0, $zero -/* 855C34 80243AC4 AFBF0018 */ sw $ra, 0x18($sp) -/* 855C38 80243AC8 AFB00010 */ sw $s0, 0x10($sp) -/* 855C3C 80243ACC F7B80030 */ sdc1 $f24, 0x30($sp) -/* 855C40 80243AD0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 855C44 80243AD4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 855C48 80243AD8 0C00EAD2 */ jal get_npc_safe -/* 855C4C 80243ADC 0000202D */ daddu $a0, $zero, $zero -/* 855C50 80243AE0 0040802D */ daddu $s0, $v0, $zero -/* 855C54 80243AE4 C614000C */ lwc1 $f20, 0xc($s0) -/* 855C58 80243AE8 3C01428C */ lui $at, 0x428c -/* 855C5C 80243AEC 4481C000 */ mtc1 $at, $f24 -/* 855C60 80243AF0 4600A507 */ neg.s $f20, $f20 -/* 855C64 80243AF4 0C00A8BB */ jal sin_deg -/* 855C68 80243AF8 4600A306 */ mov.s $f12, $f20 -/* 855C6C 80243AFC 46180002 */ mul.s $f0, $f0, $f24 -/* 855C70 80243B00 00000000 */ nop -/* 855C74 80243B04 C6160038 */ lwc1 $f22, 0x38($s0) -/* 855C78 80243B08 3C0141F0 */ lui $at, 0x41f0 -/* 855C7C 80243B0C 44811000 */ mtc1 $at, $f2 -/* 855C80 80243B10 00000000 */ nop -/* 855C84 80243B14 4602B580 */ add.s $f22, $f22, $f2 -/* 855C88 80243B18 4600A306 */ mov.s $f12, $f20 -/* 855C8C 80243B1C 0C00A8D4 */ jal cos_deg -/* 855C90 80243B20 4600B580 */ add.s $f22, $f22, $f0 -/* 855C94 80243B24 0220202D */ daddu $a0, $s1, $zero -/* 855C98 80243B28 46180002 */ mul.s $f0, $f0, $f24 -/* 855C9C 80243B2C 00000000 */ nop -/* 855CA0 80243B30 3C05FE36 */ lui $a1, 0xfe36 -/* 855CA4 80243B34 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 855CA8 80243B38 C6180040 */ lwc1 $f24, 0x40($s0) -/* 855CAC 80243B3C C614003C */ lwc1 $f20, 0x3c($s0) -/* 855CB0 80243B40 4600C600 */ add.s $f24, $f24, $f0 -/* 855CB4 80243B44 3C014248 */ lui $at, 0x4248 -/* 855CB8 80243B48 44810000 */ mtc1 $at, $f0 -/* 855CBC 80243B4C 4406B000 */ mfc1 $a2, $f22 -/* 855CC0 80243B50 0C0B2190 */ jal evt_set_float_variable -/* 855CC4 80243B54 4600A500 */ add.s $f20, $f20, $f0 -/* 855CC8 80243B58 0220202D */ daddu $a0, $s1, $zero -/* 855CCC 80243B5C 3C05FE36 */ lui $a1, 0xfe36 -/* 855CD0 80243B60 4406A000 */ mfc1 $a2, $f20 -/* 855CD4 80243B64 0C0B2190 */ jal evt_set_float_variable -/* 855CD8 80243B68 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 855CDC 80243B6C 0220202D */ daddu $a0, $s1, $zero -/* 855CE0 80243B70 3C05FE36 */ lui $a1, 0xfe36 -/* 855CE4 80243B74 4406C000 */ mfc1 $a2, $f24 -/* 855CE8 80243B78 0C0B2190 */ jal evt_set_float_variable -/* 855CEC 80243B7C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 855CF0 80243B80 8FBF0018 */ lw $ra, 0x18($sp) -/* 855CF4 80243B84 8FB10014 */ lw $s1, 0x14($sp) -/* 855CF8 80243B88 8FB00010 */ lw $s0, 0x10($sp) -/* 855CFC 80243B8C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 855D00 80243B90 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 855D04 80243B94 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 855D08 80243B98 24020002 */ addiu $v0, $zero, 2 -/* 855D0C 80243B9C 03E00008 */ jr $ra -/* 855D10 80243BA0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/mac_05_unkVtxFunc001.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s rename to ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/mac_05_unkVtxFunc001.s index 3c1b7953fe..20fd68fce9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/855560/mac_05_unkVtxFunc001.s @@ -8,7 +8,7 @@ dlabel jtbl_80252970_864AE0 .section .text -glabel func_80243588_8556F8 +glabel mac_05_unkVtxFunc001 /* 8556F8 80243588 27BDFF98 */ addiu $sp, $sp, -0x68 /* 8556FC 8024358C AFB20018 */ sw $s2, 0x18($sp) /* 855700 80243590 0080902D */ daddu $s2, $a0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s deleted file mode 100644 index f29ebd12ea..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/864B40/func_8024030C_864E4C.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C_864E4C -/* 864E4C 8024030C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 864E50 80240310 AFB20018 */ sw $s2, 0x18($sp) -/* 864E54 80240314 0080902D */ daddu $s2, $a0, $zero -/* 864E58 80240318 AFBF0028 */ sw $ra, 0x28($sp) -/* 864E5C 8024031C AFB50024 */ sw $s5, 0x24($sp) -/* 864E60 80240320 AFB40020 */ sw $s4, 0x20($sp) -/* 864E64 80240324 AFB3001C */ sw $s3, 0x1c($sp) -/* 864E68 80240328 AFB10014 */ sw $s1, 0x14($sp) -/* 864E6C 8024032C AFB00010 */ sw $s0, 0x10($sp) -/* 864E70 80240330 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 864E74 80240334 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 864E78 80240338 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 864E7C 8024033C 8E50000C */ lw $s0, 0xc($s2) -/* 864E80 80240340 8E140000 */ lw $s4, ($s0) -/* 864E84 80240344 26100004 */ addiu $s0, $s0, 4 -/* 864E88 80240348 0C0B1EAF */ jal evt_get_variable -/* 864E8C 8024034C 0280282D */ daddu $a1, $s4, $zero -/* 864E90 80240350 0040982D */ daddu $s3, $v0, $zero -/* 864E94 80240354 8E150000 */ lw $s5, ($s0) -/* 864E98 80240358 26100004 */ addiu $s0, $s0, 4 -/* 864E9C 8024035C 8E050000 */ lw $a1, ($s0) -/* 864EA0 80240360 26100004 */ addiu $s0, $s0, 4 -/* 864EA4 80240364 0C0B210B */ jal evt_get_float_variable -/* 864EA8 80240368 0240202D */ daddu $a0, $s2, $zero -/* 864EAC 8024036C 8E050000 */ lw $a1, ($s0) -/* 864EB0 80240370 26100004 */ addiu $s0, $s0, 4 -/* 864EB4 80240374 0240202D */ daddu $a0, $s2, $zero -/* 864EB8 80240378 0C0B210B */ jal evt_get_float_variable -/* 864EBC 8024037C 46000606 */ mov.s $f24, $f0 -/* 864EC0 80240380 8E050000 */ lw $a1, ($s0) -/* 864EC4 80240384 26100004 */ addiu $s0, $s0, 4 -/* 864EC8 80240388 0240202D */ daddu $a0, $s2, $zero -/* 864ECC 8024038C 0C0B1EAF */ jal evt_get_variable -/* 864ED0 80240390 46000506 */ mov.s $f20, $f0 -/* 864ED4 80240394 8E050000 */ lw $a1, ($s0) -/* 864ED8 80240398 26100004 */ addiu $s0, $s0, 4 -/* 864EDC 8024039C 0240202D */ daddu $a0, $s2, $zero -/* 864EE0 802403A0 0C0B1EAF */ jal evt_get_variable -/* 864EE4 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 864EE8 802403A8 0240202D */ daddu $a0, $s2, $zero -/* 864EEC 802403AC 8E050000 */ lw $a1, ($s0) -/* 864EF0 802403B0 0C0B210B */ jal evt_get_float_variable -/* 864EF4 802403B4 0040802D */ daddu $s0, $v0, $zero -/* 864EF8 802403B8 4618A501 */ sub.s $f20, $f20, $f24 -/* 864EFC 802403BC 3C013F00 */ lui $at, 0x3f00 -/* 864F00 802403C0 44811000 */ mtc1 $at, $f2 -/* 864F04 802403C4 00000000 */ nop -/* 864F08 802403C8 4602A502 */ mul.s $f20, $f20, $f2 -/* 864F0C 802403CC 00000000 */ nop -/* 864F10 802403D0 12000008 */ beqz $s0, .L802403F4 -/* 864F14 802403D4 46000586 */ mov.s $f22, $f0 -/* 864F18 802403D8 0233102A */ slt $v0, $s1, $s3 -/* 864F1C 802403DC 10400005 */ beqz $v0, .L802403F4 -/* 864F20 802403E0 0240202D */ daddu $a0, $s2, $zero -/* 864F24 802403E4 0220982D */ daddu $s3, $s1, $zero -/* 864F28 802403E8 0280282D */ daddu $a1, $s4, $zero -/* 864F2C 802403EC 0C0B2026 */ jal evt_set_variable -/* 864F30 802403F0 0220302D */ daddu $a2, $s1, $zero -.L802403F4: -/* 864F34 802403F4 3C014334 */ lui $at, 0x4334 -/* 864F38 802403F8 44810000 */ mtc1 $at, $f0 -/* 864F3C 802403FC 44936000 */ mtc1 $s3, $f12 -/* 864F40 80240400 00000000 */ nop -/* 864F44 80240404 46806320 */ cvt.s.w $f12, $f12 -/* 864F48 80240408 46006302 */ mul.s $f12, $f12, $f0 -/* 864F4C 8024040C 00000000 */ nop -/* 864F50 80240410 44910000 */ mtc1 $s1, $f0 -/* 864F54 80240414 00000000 */ nop -/* 864F58 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 864F5C 8024041C 46006303 */ div.s $f12, $f12, $f0 -/* 864F60 80240420 0C00A8D4 */ jal cos_deg -/* 864F64 80240424 46166300 */ add.s $f12, $f12, $f22 -/* 864F68 80240428 4600A002 */ mul.s $f0, $f20, $f0 -/* 864F6C 8024042C 00000000 */ nop -/* 864F70 80240430 4614C080 */ add.s $f2, $f24, $f20 -/* 864F74 80240434 46001081 */ sub.s $f2, $f2, $f0 -/* 864F78 80240438 0240202D */ daddu $a0, $s2, $zero -/* 864F7C 8024043C 44061000 */ mfc1 $a2, $f2 -/* 864F80 80240440 0C0B2190 */ jal evt_set_float_variable -/* 864F84 80240444 02A0282D */ daddu $a1, $s5, $zero -/* 864F88 80240448 8FBF0028 */ lw $ra, 0x28($sp) -/* 864F8C 8024044C 8FB50024 */ lw $s5, 0x24($sp) -/* 864F90 80240450 8FB40020 */ lw $s4, 0x20($sp) -/* 864F94 80240454 8FB3001C */ lw $s3, 0x1c($sp) -/* 864F98 80240458 8FB20018 */ lw $s2, 0x18($sp) -/* 864F9C 8024045C 8FB10014 */ lw $s1, 0x14($sp) -/* 864FA0 80240460 8FB00010 */ lw $s0, 0x10($sp) -/* 864FA4 80240464 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 864FA8 80240468 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 864FAC 8024046C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 864FB0 80240470 24020002 */ addiu $v0, $zero, 2 -/* 864FB4 80240474 03E00008 */ jr $ra -/* 864FB8 80240478 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s deleted file mode 100644 index db6f3528f1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0_865000 -/* 865000 802404C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 865004 802404C4 0080182D */ daddu $v1, $a0, $zero -/* 865008 802404C8 00A0202D */ daddu $a0, $a1, $zero -/* 86500C 802404CC 2402FFFF */ addiu $v0, $zero, -1 -/* 865010 802404D0 14820004 */ bne $a0, $v0, .L802404E4 -/* 865014 802404D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 865018 802404D8 8C64014C */ lw $a0, 0x14c($v1) -/* 86501C 802404DC 0809013E */ j .L802404F8 -/* 865020 802404E0 00000000 */ nop -.L802404E4: -/* 865024 802404E4 3C02EFE8 */ lui $v0, 0xefe8 -/* 865028 802404E8 34422080 */ ori $v0, $v0, 0x2080 -/* 86502C 802404EC 0082102A */ slt $v0, $a0, $v0 -/* 865030 802404F0 14400003 */ bnez $v0, .L80240500 -/* 865034 802404F4 0080102D */ daddu $v0, $a0, $zero -.L802404F8: -/* 865038 802404F8 0C00EAD2 */ jal get_npc_safe -/* 86503C 802404FC 00000000 */ nop -.L80240500: -/* 865040 80240500 8FBF0010 */ lw $ra, 0x10($sp) -/* 865044 80240504 03E00008 */ jr $ra -/* 865048 80240508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s deleted file mode 100644 index f94693a124..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C_86504C -/* 86504C 8024050C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 865050 80240510 AFB10014 */ sw $s1, 0x14($sp) -/* 865054 80240514 0080882D */ daddu $s1, $a0, $zero -/* 865058 80240518 AFBF0024 */ sw $ra, 0x24($sp) -/* 86505C 8024051C AFB40020 */ sw $s4, 0x20($sp) -/* 865060 80240520 AFB3001C */ sw $s3, 0x1c($sp) -/* 865064 80240524 AFB20018 */ sw $s2, 0x18($sp) -/* 865068 80240528 AFB00010 */ sw $s0, 0x10($sp) -/* 86506C 8024052C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 865070 80240530 8E30000C */ lw $s0, 0xc($s1) -/* 865074 80240534 8E050000 */ lw $a1, ($s0) -/* 865078 80240538 0C0B1EAF */ jal evt_get_variable -/* 86507C 8024053C 26100004 */ addiu $s0, $s0, 4 -/* 865080 80240540 8E120000 */ lw $s2, ($s0) -/* 865084 80240544 26100004 */ addiu $s0, $s0, 4 -/* 865088 80240548 0220202D */ daddu $a0, $s1, $zero -/* 86508C 8024054C 8E130000 */ lw $s3, ($s0) -/* 865090 80240550 8E140004 */ lw $s4, 4($s0) -/* 865094 80240554 0C090130 */ jal func_802404C0_865000 -/* 865098 80240558 0040282D */ daddu $a1, $v0, $zero -/* 86509C 8024055C 0040802D */ daddu $s0, $v0, $zero -/* 8650A0 80240560 12000034 */ beqz $s0, .L80240634 -/* 8650A4 80240564 24020002 */ addiu $v0, $zero, 2 -/* 8650A8 80240568 3C038024 */ lui $v1, %hi(D_80241B60_8666A0) -/* 8650AC 8024056C 24631B60 */ addiu $v1, $v1, %lo(D_80241B60_8666A0) -/* 8650B0 80240570 8C640000 */ lw $a0, ($v1) -/* 8650B4 80240574 24820004 */ addiu $v0, $a0, 4 -/* 8650B8 80240578 AC620000 */ sw $v0, ($v1) -/* 8650BC 8024057C 2C420168 */ sltiu $v0, $v0, 0x168 -/* 8650C0 80240580 14400004 */ bnez $v0, .L80240594 -/* 8650C4 80240584 3C0200B6 */ lui $v0, 0xb6 -/* 8650C8 80240588 2482FE9C */ addiu $v0, $a0, -0x164 -/* 8650CC 8024058C AC620000 */ sw $v0, ($v1) -/* 8650D0 80240590 3C0200B6 */ lui $v0, 0xb6 -.L80240594: -/* 8650D4 80240594 8E030028 */ lw $v1, 0x28($s0) -/* 8650D8 80240598 C614003C */ lwc1 $f20, 0x3c($s0) -/* 8650DC 8024059C 10620009 */ beq $v1, $v0, .L802405C4 -/* 8650E0 802405A0 34420004 */ ori $v0, $v0, 4 -/* 8650E4 802405A4 10620007 */ beq $v1, $v0, .L802405C4 -/* 8650E8 802405A8 3C0200B6 */ lui $v0, 0xb6 -/* 8650EC 802405AC 34420008 */ ori $v0, $v0, 8 -/* 8650F0 802405B0 10620004 */ beq $v1, $v0, .L802405C4 -/* 8650F4 802405B4 3C0200B6 */ lui $v0, 0xb6 -/* 8650F8 802405B8 3442000C */ ori $v0, $v0, 0xc -/* 8650FC 802405BC 14620011 */ bne $v1, $v0, .L80240604 -/* 865100 802405C0 0220202D */ daddu $a0, $s1, $zero -.L802405C4: -/* 865104 802405C4 3C028024 */ lui $v0, %hi(D_80241B60_8666A0) -/* 865108 802405C8 8C421B60 */ lw $v0, %lo(D_80241B60_8666A0)($v0) -/* 86510C 802405CC 44826000 */ mtc1 $v0, $f12 -/* 865110 802405D0 00000000 */ nop -/* 865114 802405D4 04410006 */ bgez $v0, .L802405F0 -/* 865118 802405D8 46806321 */ cvt.d.w $f12, $f12 -/* 86511C 802405DC 3C0141F0 */ lui $at, 0x41f0 -/* 865120 802405E0 44810800 */ mtc1 $at, $f1 -/* 865124 802405E4 44800000 */ mtc1 $zero, $f0 -/* 865128 802405E8 00000000 */ nop -/* 86512C 802405EC 46206300 */ add.d $f12, $f12, $f0 -.L802405F0: -/* 865130 802405F0 0C00A8BB */ jal sin_deg -/* 865134 802405F4 46206320 */ cvt.s.d $f12, $f12 -/* 865138 802405F8 46000000 */ add.s $f0, $f0, $f0 -/* 86513C 802405FC 4600A500 */ add.s $f20, $f20, $f0 -/* 865140 80240600 0220202D */ daddu $a0, $s1, $zero -.L80240604: -/* 865144 80240604 8E060038 */ lw $a2, 0x38($s0) -/* 865148 80240608 0C0B2190 */ jal evt_set_float_variable -/* 86514C 8024060C 0240282D */ daddu $a1, $s2, $zero -/* 865150 80240610 0220202D */ daddu $a0, $s1, $zero -/* 865154 80240614 4406A000 */ mfc1 $a2, $f20 -/* 865158 80240618 0C0B2190 */ jal evt_set_float_variable -/* 86515C 8024061C 0260282D */ daddu $a1, $s3, $zero -/* 865160 80240620 0220202D */ daddu $a0, $s1, $zero -/* 865164 80240624 8E060040 */ lw $a2, 0x40($s0) -/* 865168 80240628 0C0B2190 */ jal evt_set_float_variable -/* 86516C 8024062C 0280282D */ daddu $a1, $s4, $zero -/* 865170 80240630 24020002 */ addiu $v0, $zero, 2 -.L80240634: -/* 865174 80240634 8FBF0024 */ lw $ra, 0x24($sp) -/* 865178 80240638 8FB40020 */ lw $s4, 0x20($sp) -/* 86517C 8024063C 8FB3001C */ lw $s3, 0x1c($sp) -/* 865180 80240640 8FB20018 */ lw $s2, 0x18($sp) -/* 865184 80240644 8FB10014 */ lw $s1, 0x14($sp) -/* 865188 80240648 8FB00010 */ lw $s0, 0x10($sp) -/* 86518C 8024064C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 865190 80240650 03E00008 */ jr $ra -/* 865194 80240654 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s deleted file mode 100644 index bf931d1587..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_865410 -/* 865410 802408D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 865414 802408D4 24040001 */ addiu $a0, $zero, 1 -/* 865418 802408D8 27A50010 */ addiu $a1, $sp, 0x10 -/* 86541C 802408DC 27A60014 */ addiu $a2, $sp, 0x14 -/* 865420 802408E0 27A70018 */ addiu $a3, $sp, 0x18 -/* 865424 802408E4 AFBF0028 */ sw $ra, 0x28($sp) -/* 865428 802408E8 AFB10024 */ sw $s1, 0x24($sp) -/* 86542C 802408EC 0C0470AC */ jal mdl_get_copied_vertices -/* 865430 802408F0 AFB00020 */ sw $s0, 0x20($sp) -/* 865434 802408F4 3C118024 */ lui $s1, %hi(D_80241B64_8666A4) -/* 865438 802408F8 26311B64 */ addiu $s1, $s1, %lo(D_80241B64_8666A4) -/* 86543C 802408FC 8FA40010 */ lw $a0, 0x10($sp) -/* 865440 80240900 8FA50014 */ lw $a1, 0x14($sp) -/* 865444 80240904 8FA60018 */ lw $a2, 0x18($sp) -/* 865448 80240908 0C090196 */ jal func_80240658_865198 -/* 86544C 8024090C 0220382D */ daddu $a3, $s1, $zero -/* 865450 80240910 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 865454 80240914 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 865458 80240918 8C620000 */ lw $v0, ($v1) -/* 86545C 8024091C 24040001 */ addiu $a0, $zero, 1 -/* 865460 80240920 0040802D */ daddu $s0, $v0, $zero -/* 865464 80240924 24420008 */ addiu $v0, $v0, 8 -/* 865468 80240928 AC620000 */ sw $v0, ($v1) -/* 86546C 8024092C 3C02DE00 */ lui $v0, 0xde00 -/* 865470 80240930 0C0470BB */ jal mdl_get_copied_gfx -/* 865474 80240934 AE020000 */ sw $v0, ($s0) -/* 865478 80240938 8E230000 */ lw $v1, ($s1) -/* 86547C 8024093C 04600003 */ bltz $v1, .L8024094C -/* 865480 80240940 AE020004 */ sw $v0, 4($s0) -/* 865484 80240944 24620004 */ addiu $v0, $v1, 4 -/* 865488 80240948 AE220000 */ sw $v0, ($s1) -.L8024094C: -/* 86548C 8024094C 8E220000 */ lw $v0, ($s1) -/* 865490 80240950 28420168 */ slti $v0, $v0, 0x168 -/* 865494 80240954 14400002 */ bnez $v0, .L80240960 -/* 865498 80240958 2402FFFF */ addiu $v0, $zero, -1 -/* 86549C 8024095C AE220000 */ sw $v0, ($s1) -.L80240960: -/* 8654A0 80240960 8FBF0028 */ lw $ra, 0x28($sp) -/* 8654A4 80240964 8FB10024 */ lw $s1, 0x24($sp) -/* 8654A8 80240968 8FB00020 */ lw $s0, 0x20($sp) -/* 8654AC 8024096C 03E00008 */ jr $ra -/* 8654B0 80240970 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s deleted file mode 100644 index d7db2d1fb5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240974_8654B4 -/* 8654B4 80240974 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8654B8 80240978 24040002 */ addiu $a0, $zero, 2 -/* 8654BC 8024097C 27A50010 */ addiu $a1, $sp, 0x10 -/* 8654C0 80240980 27A60014 */ addiu $a2, $sp, 0x14 -/* 8654C4 80240984 27A70018 */ addiu $a3, $sp, 0x18 -/* 8654C8 80240988 AFBF0028 */ sw $ra, 0x28($sp) -/* 8654CC 8024098C AFB10024 */ sw $s1, 0x24($sp) -/* 8654D0 80240990 0C0470AC */ jal mdl_get_copied_vertices -/* 8654D4 80240994 AFB00020 */ sw $s0, 0x20($sp) -/* 8654D8 80240998 3C118024 */ lui $s1, %hi(D_80241B68_8666A8) -/* 8654DC 8024099C 26311B68 */ addiu $s1, $s1, %lo(D_80241B68_8666A8) -/* 8654E0 802409A0 8FA40010 */ lw $a0, 0x10($sp) -/* 8654E4 802409A4 8FA50014 */ lw $a1, 0x14($sp) -/* 8654E8 802409A8 8FA60018 */ lw $a2, 0x18($sp) -/* 8654EC 802409AC 0C090196 */ jal func_80240658_865198 -/* 8654F0 802409B0 0220382D */ daddu $a3, $s1, $zero -/* 8654F4 802409B4 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 8654F8 802409B8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 8654FC 802409BC 8C620000 */ lw $v0, ($v1) -/* 865500 802409C0 24040002 */ addiu $a0, $zero, 2 -/* 865504 802409C4 0040802D */ daddu $s0, $v0, $zero -/* 865508 802409C8 24420008 */ addiu $v0, $v0, 8 -/* 86550C 802409CC AC620000 */ sw $v0, ($v1) -/* 865510 802409D0 3C02DE00 */ lui $v0, 0xde00 -/* 865514 802409D4 0C0470BB */ jal mdl_get_copied_gfx -/* 865518 802409D8 AE020000 */ sw $v0, ($s0) -/* 86551C 802409DC 8E230000 */ lw $v1, ($s1) -/* 865520 802409E0 04600003 */ bltz $v1, .L802409F0 -/* 865524 802409E4 AE020004 */ sw $v0, 4($s0) -/* 865528 802409E8 24620004 */ addiu $v0, $v1, 4 -/* 86552C 802409EC AE220000 */ sw $v0, ($s1) -.L802409F0: -/* 865530 802409F0 8E220000 */ lw $v0, ($s1) -/* 865534 802409F4 28420168 */ slti $v0, $v0, 0x168 -/* 865538 802409F8 14400002 */ bnez $v0, .L80240A04 -/* 86553C 802409FC 2402FFFF */ addiu $v0, $zero, -1 -/* 865540 80240A00 AE220000 */ sw $v0, ($s1) -.L80240A04: -/* 865544 80240A04 8FBF0028 */ lw $ra, 0x28($sp) -/* 865548 80240A08 8FB10024 */ lw $s1, 0x24($sp) -/* 86554C 80240A0C 8FB00020 */ lw $s0, 0x20($sp) -/* 865550 80240A10 03E00008 */ jr $ra -/* 865554 80240A14 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s deleted file mode 100644 index 36cc8737fb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A18_865558 -/* 865558 80240A18 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 86555C 80240A1C AFB20018 */ sw $s2, 0x18($sp) -/* 865560 80240A20 0080902D */ daddu $s2, $a0, $zero -/* 865564 80240A24 AFBF0028 */ sw $ra, 0x28($sp) -/* 865568 80240A28 AFB50024 */ sw $s5, 0x24($sp) -/* 86556C 80240A2C AFB40020 */ sw $s4, 0x20($sp) -/* 865570 80240A30 AFB3001C */ sw $s3, 0x1c($sp) -/* 865574 80240A34 AFB10014 */ sw $s1, 0x14($sp) -/* 865578 80240A38 AFB00010 */ sw $s0, 0x10($sp) -/* 86557C 80240A3C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 865580 80240A40 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 865584 80240A44 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 865588 80240A48 8E50000C */ lw $s0, 0xc($s2) -/* 86558C 80240A4C 8E140000 */ lw $s4, ($s0) -/* 865590 80240A50 26100004 */ addiu $s0, $s0, 4 -/* 865594 80240A54 0C0B1EAF */ jal evt_get_variable -/* 865598 80240A58 0280282D */ daddu $a1, $s4, $zero -/* 86559C 80240A5C 0040982D */ daddu $s3, $v0, $zero -/* 8655A0 80240A60 8E150000 */ lw $s5, ($s0) -/* 8655A4 80240A64 26100004 */ addiu $s0, $s0, 4 -/* 8655A8 80240A68 8E050000 */ lw $a1, ($s0) -/* 8655AC 80240A6C 26100004 */ addiu $s0, $s0, 4 -/* 8655B0 80240A70 0C0B210B */ jal evt_get_float_variable -/* 8655B4 80240A74 0240202D */ daddu $a0, $s2, $zero -/* 8655B8 80240A78 8E050000 */ lw $a1, ($s0) -/* 8655BC 80240A7C 26100004 */ addiu $s0, $s0, 4 -/* 8655C0 80240A80 0240202D */ daddu $a0, $s2, $zero -/* 8655C4 80240A84 0C0B210B */ jal evt_get_float_variable -/* 8655C8 80240A88 46000606 */ mov.s $f24, $f0 -/* 8655CC 80240A8C 8E050000 */ lw $a1, ($s0) -/* 8655D0 80240A90 26100004 */ addiu $s0, $s0, 4 -/* 8655D4 80240A94 0240202D */ daddu $a0, $s2, $zero -/* 8655D8 80240A98 0C0B1EAF */ jal evt_get_variable -/* 8655DC 80240A9C 46000506 */ mov.s $f20, $f0 -/* 8655E0 80240AA0 8E050000 */ lw $a1, ($s0) -/* 8655E4 80240AA4 26100004 */ addiu $s0, $s0, 4 -/* 8655E8 80240AA8 0240202D */ daddu $a0, $s2, $zero -/* 8655EC 80240AAC 0C0B1EAF */ jal evt_get_variable -/* 8655F0 80240AB0 0040882D */ daddu $s1, $v0, $zero -/* 8655F4 80240AB4 0240202D */ daddu $a0, $s2, $zero -/* 8655F8 80240AB8 8E050000 */ lw $a1, ($s0) -/* 8655FC 80240ABC 0C0B210B */ jal evt_get_float_variable -/* 865600 80240AC0 0040802D */ daddu $s0, $v0, $zero -/* 865604 80240AC4 4618A501 */ sub.s $f20, $f20, $f24 -/* 865608 80240AC8 3C013F00 */ lui $at, 0x3f00 -/* 86560C 80240ACC 44811000 */ mtc1 $at, $f2 -/* 865610 80240AD0 00000000 */ nop -/* 865614 80240AD4 4602A502 */ mul.s $f20, $f20, $f2 -/* 865618 80240AD8 00000000 */ nop -/* 86561C 80240ADC 12000008 */ beqz $s0, .L80240B00 -/* 865620 80240AE0 46000586 */ mov.s $f22, $f0 -/* 865624 80240AE4 0233102A */ slt $v0, $s1, $s3 -/* 865628 80240AE8 10400005 */ beqz $v0, .L80240B00 -/* 86562C 80240AEC 0240202D */ daddu $a0, $s2, $zero -/* 865630 80240AF0 0220982D */ daddu $s3, $s1, $zero -/* 865634 80240AF4 0280282D */ daddu $a1, $s4, $zero -/* 865638 80240AF8 0C0B2026 */ jal evt_set_variable -/* 86563C 80240AFC 0220302D */ daddu $a2, $s1, $zero -.L80240B00: -/* 865640 80240B00 3C014334 */ lui $at, 0x4334 -/* 865644 80240B04 44810000 */ mtc1 $at, $f0 -/* 865648 80240B08 44936000 */ mtc1 $s3, $f12 -/* 86564C 80240B0C 00000000 */ nop -/* 865650 80240B10 46806320 */ cvt.s.w $f12, $f12 -/* 865654 80240B14 46006302 */ mul.s $f12, $f12, $f0 -/* 865658 80240B18 00000000 */ nop -/* 86565C 80240B1C 44910000 */ mtc1 $s1, $f0 -/* 865660 80240B20 00000000 */ nop -/* 865664 80240B24 46800020 */ cvt.s.w $f0, $f0 -/* 865668 80240B28 46006303 */ div.s $f12, $f12, $f0 -/* 86566C 80240B2C 0C00A8D4 */ jal cos_deg -/* 865670 80240B30 46166300 */ add.s $f12, $f12, $f22 -/* 865674 80240B34 4600A002 */ mul.s $f0, $f20, $f0 -/* 865678 80240B38 00000000 */ nop -/* 86567C 80240B3C 4614C080 */ add.s $f2, $f24, $f20 -/* 865680 80240B40 46001081 */ sub.s $f2, $f2, $f0 -/* 865684 80240B44 0240202D */ daddu $a0, $s2, $zero -/* 865688 80240B48 44061000 */ mfc1 $a2, $f2 -/* 86568C 80240B4C 0C0B2190 */ jal evt_set_float_variable -/* 865690 80240B50 02A0282D */ daddu $a1, $s5, $zero -/* 865694 80240B54 8FBF0028 */ lw $ra, 0x28($sp) -/* 865698 80240B58 8FB50024 */ lw $s5, 0x24($sp) -/* 86569C 80240B5C 8FB40020 */ lw $s4, 0x20($sp) -/* 8656A0 80240B60 8FB3001C */ lw $s3, 0x1c($sp) -/* 8656A4 80240B64 8FB20018 */ lw $s2, 0x18($sp) -/* 8656A8 80240B68 8FB10014 */ lw $s1, 0x14($sp) -/* 8656AC 80240B6C 8FB00010 */ lw $s0, 0x10($sp) -/* 8656B0 80240B70 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 8656B4 80240B74 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 8656B8 80240B78 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 8656BC 80240B7C 24020002 */ addiu $v0, $zero, 2 -/* 8656C0 80240B80 03E00008 */ jr $ra -/* 8656C4 80240B84 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s deleted file mode 100644 index 249f2e90f6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B88_8656C8 -/* 8656C8 80240B88 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8656CC 80240B8C AFB10014 */ sw $s1, 0x14($sp) -/* 8656D0 80240B90 0080882D */ daddu $s1, $a0, $zero -/* 8656D4 80240B94 AFBF0018 */ sw $ra, 0x18($sp) -/* 8656D8 80240B98 AFB00010 */ sw $s0, 0x10($sp) -/* 8656DC 80240B9C F7B80030 */ sdc1 $f24, 0x30($sp) -/* 8656E0 80240BA0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8656E4 80240BA4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8656E8 80240BA8 0C00EAD2 */ jal get_npc_safe -/* 8656EC 80240BAC 0000202D */ daddu $a0, $zero, $zero -/* 8656F0 80240BB0 0040802D */ daddu $s0, $v0, $zero -/* 8656F4 80240BB4 C614000C */ lwc1 $f20, 0xc($s0) -/* 8656F8 80240BB8 3C01428C */ lui $at, 0x428c -/* 8656FC 80240BBC 4481C000 */ mtc1 $at, $f24 -/* 865700 80240BC0 4600A507 */ neg.s $f20, $f20 -/* 865704 80240BC4 0C00A8BB */ jal sin_deg -/* 865708 80240BC8 4600A306 */ mov.s $f12, $f20 -/* 86570C 80240BCC 46180002 */ mul.s $f0, $f0, $f24 -/* 865710 80240BD0 00000000 */ nop -/* 865714 80240BD4 C6160038 */ lwc1 $f22, 0x38($s0) -/* 865718 80240BD8 3C0141F0 */ lui $at, 0x41f0 -/* 86571C 80240BDC 44811000 */ mtc1 $at, $f2 -/* 865720 80240BE0 00000000 */ nop -/* 865724 80240BE4 4602B580 */ add.s $f22, $f22, $f2 -/* 865728 80240BE8 4600A306 */ mov.s $f12, $f20 -/* 86572C 80240BEC 0C00A8D4 */ jal cos_deg -/* 865730 80240BF0 4600B580 */ add.s $f22, $f22, $f0 -/* 865734 80240BF4 0220202D */ daddu $a0, $s1, $zero -/* 865738 80240BF8 46180002 */ mul.s $f0, $f0, $f24 -/* 86573C 80240BFC 00000000 */ nop -/* 865740 80240C00 3C05FE36 */ lui $a1, 0xfe36 -/* 865744 80240C04 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 865748 80240C08 C6180040 */ lwc1 $f24, 0x40($s0) -/* 86574C 80240C0C C614003C */ lwc1 $f20, 0x3c($s0) -/* 865750 80240C10 4600C600 */ add.s $f24, $f24, $f0 -/* 865754 80240C14 3C014248 */ lui $at, 0x4248 -/* 865758 80240C18 44810000 */ mtc1 $at, $f0 -/* 86575C 80240C1C 4406B000 */ mfc1 $a2, $f22 -/* 865760 80240C20 0C0B2190 */ jal evt_set_float_variable -/* 865764 80240C24 4600A500 */ add.s $f20, $f20, $f0 -/* 865768 80240C28 0220202D */ daddu $a0, $s1, $zero -/* 86576C 80240C2C 3C05FE36 */ lui $a1, 0xfe36 -/* 865770 80240C30 4406A000 */ mfc1 $a2, $f20 -/* 865774 80240C34 0C0B2190 */ jal evt_set_float_variable -/* 865778 80240C38 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 86577C 80240C3C 0220202D */ daddu $a0, $s1, $zero -/* 865780 80240C40 3C05FE36 */ lui $a1, 0xfe36 -/* 865784 80240C44 4406C000 */ mfc1 $a2, $f24 -/* 865788 80240C48 0C0B2190 */ jal evt_set_float_variable -/* 86578C 80240C4C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 865790 80240C50 8FBF0018 */ lw $ra, 0x18($sp) -/* 865794 80240C54 8FB10014 */ lw $s1, 0x14($sp) -/* 865798 80240C58 8FB00010 */ lw $s0, 0x10($sp) -/* 86579C 80240C5C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8657A0 80240C60 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8657A4 80240C64 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8657A8 80240C68 24020002 */ addiu $v0, $zero, 2 -/* 8657AC 80240C6C 03E00008 */ jr $ra -/* 8657B0 80240C70 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/mac_06_unkVtxFunc001.s similarity index 99% rename from ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s rename to ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/mac_06_unkVtxFunc001.s index 46d6918502..c5e58b31f6 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_06/865000/mac_06_unkVtxFunc001.s @@ -8,7 +8,7 @@ dlabel jtbl_80244910_869450 .section .text -glabel func_80240658_865198 +glabel mac_06_unkVtxFunc001 /* 865198 80240658 27BDFF98 */ addiu $sp, $sp, -0x68 /* 86519C 8024065C AFB20018 */ sw $s2, 0x18($sp) /* 8651A0 80240660 0080902D */ daddu $s2, $a0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s deleted file mode 100644 index 96f8aaed1c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024000C_BC2A9C -/* BC2A9C 8024000C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC2AA0 80240010 AFB10014 */ sw $s1, 0x14($sp) -/* BC2AA4 80240014 0080882D */ daddu $s1, $a0, $zero -/* BC2AA8 80240018 AFBF0018 */ sw $ra, 0x18($sp) -/* BC2AAC 8024001C AFB00010 */ sw $s0, 0x10($sp) -/* BC2AB0 80240020 0C00EAD2 */ jal get_npc_safe -/* BC2AB4 80240024 8E24014C */ lw $a0, 0x14c($s1) -/* BC2AB8 80240028 0040802D */ daddu $s0, $v0, $zero -/* BC2ABC 8024002C 8E230074 */ lw $v1, 0x74($s1) -/* BC2AC0 80240030 24020001 */ addiu $v0, $zero, 1 -/* BC2AC4 80240034 10620036 */ beq $v1, $v0, .L80240110 -/* BC2AC8 80240038 28620002 */ slti $v0, $v1, 2 -/* BC2ACC 8024003C 10400005 */ beqz $v0, .L80240054 -/* BC2AD0 80240040 24020002 */ addiu $v0, $zero, 2 -/* BC2AD4 80240044 10600007 */ beqz $v1, .L80240064 -/* BC2AD8 80240048 00000000 */ nop -/* BC2ADC 8024004C 0809005F */ j .L8024017C -/* BC2AE0 80240050 00000000 */ nop -.L80240054: -/* BC2AE4 80240054 10620036 */ beq $v1, $v0, .L80240130 -/* BC2AE8 80240058 00000000 */ nop -/* BC2AEC 8024005C 0809005F */ j .L8024017C -/* BC2AF0 80240060 00000000 */ nop -.L80240064: -/* BC2AF4 80240064 0C00A67F */ jal rand_int -/* BC2AF8 80240068 240400B4 */ addiu $a0, $zero, 0xb4 -/* BC2AFC 8024006C 24040032 */ addiu $a0, $zero, 0x32 -/* BC2B00 80240070 3C01C396 */ lui $at, 0xc396 -/* BC2B04 80240074 44810000 */ mtc1 $at, $f0 -/* BC2B08 80240078 2442001E */ addiu $v0, $v0, 0x1e -/* BC2B0C 8024007C A602008E */ sh $v0, 0x8e($s0) -/* BC2B10 80240080 0C00A67F */ jal rand_int -/* BC2B14 80240084 E6000040 */ swc1 $f0, 0x40($s0) -/* BC2B18 80240088 3C0142A0 */ lui $at, 0x42a0 -/* BC2B1C 8024008C 44811000 */ mtc1 $at, $f2 -/* BC2B20 80240090 44820000 */ mtc1 $v0, $f0 -/* BC2B24 80240094 00000000 */ nop -/* BC2B28 80240098 46800020 */ cvt.s.w $f0, $f0 -/* BC2B2C 8024009C 46020000 */ add.s $f0, $f0, $f2 -/* BC2B30 802400A0 0C00A64D */ jal rand_float -/* BC2B34 802400A4 E600003C */ swc1 $f0, 0x3c($s0) -/* BC2B38 802400A8 46000000 */ add.s $f0, $f0, $f0 -/* BC2B3C 802400AC 3C014000 */ lui $at, 0x4000 -/* BC2B40 802400B0 44811000 */ mtc1 $at, $f2 -/* BC2B44 802400B4 00000000 */ nop -/* BC2B48 802400B8 46020000 */ add.s $f0, $f0, $f2 -/* BC2B4C 802400BC 24040064 */ addiu $a0, $zero, 0x64 -/* BC2B50 802400C0 0C00A67F */ jal rand_int -/* BC2B54 802400C4 E6000018 */ swc1 $f0, 0x18($s0) -/* BC2B58 802400C8 28420032 */ slti $v0, $v0, 0x32 -/* BC2B5C 802400CC 10400007 */ beqz $v0, .L802400EC -/* BC2B60 802400D0 00000000 */ nop -/* BC2B64 802400D4 3C014387 */ lui $at, 0x4387 -/* BC2B68 802400D8 44810000 */ mtc1 $at, $f0 -/* BC2B6C 802400DC 00000000 */ nop -/* BC2B70 802400E0 E6000038 */ swc1 $f0, 0x38($s0) -/* BC2B74 802400E4 08090041 */ j .L80240104 -/* BC2B78 802400E8 E600000C */ swc1 $f0, 0xc($s0) -.L802400EC: -/* BC2B7C 802400EC 3C01C387 */ lui $at, 0xc387 -/* BC2B80 802400F0 44810000 */ mtc1 $at, $f0 -/* BC2B84 802400F4 3C0142B4 */ lui $at, 0x42b4 -/* BC2B88 802400F8 44811000 */ mtc1 $at, $f2 -/* BC2B8C 802400FC E6000038 */ swc1 $f0, 0x38($s0) -/* BC2B90 80240100 E602000C */ swc1 $f2, 0xc($s0) -.L80240104: -/* BC2B94 80240104 24020001 */ addiu $v0, $zero, 1 -/* BC2B98 80240108 0809005F */ j .L8024017C -/* BC2B9C 8024010C AE220074 */ sw $v0, 0x74($s1) -.L80240110: -/* BC2BA0 80240110 9602008E */ lhu $v0, 0x8e($s0) -/* BC2BA4 80240114 2442FFFF */ addiu $v0, $v0, -1 -/* BC2BA8 80240118 A602008E */ sh $v0, 0x8e($s0) -/* BC2BAC 8024011C 00021400 */ sll $v0, $v0, 0x10 -/* BC2BB0 80240120 14400016 */ bnez $v0, .L8024017C -/* BC2BB4 80240124 24020002 */ addiu $v0, $zero, 2 -/* BC2BB8 80240128 0809005F */ j .L8024017C -/* BC2BBC 8024012C AE220074 */ sw $v0, 0x74($s1) -.L80240130: -/* BC2BC0 80240130 8E050018 */ lw $a1, 0x18($s0) -/* BC2BC4 80240134 8E06000C */ lw $a2, 0xc($s0) -/* BC2BC8 80240138 0C00EA95 */ jal npc_move_heading -/* BC2BCC 8024013C 0200202D */ daddu $a0, $s0, $zero -/* BC2BD0 80240140 C6020038 */ lwc1 $f2, 0x38($s0) -/* BC2BD4 80240144 3C01C38C */ lui $at, 0xc38c -/* BC2BD8 80240148 44810000 */ mtc1 $at, $f0 -/* BC2BDC 8024014C 00000000 */ nop -/* BC2BE0 80240150 4600103C */ c.lt.s $f2, $f0 -/* BC2BE4 80240154 00000000 */ nop -/* BC2BE8 80240158 45030008 */ bc1tl .L8024017C -/* BC2BEC 8024015C AE200074 */ sw $zero, 0x74($s1) -/* BC2BF0 80240160 3C01438C */ lui $at, 0x438c -/* BC2BF4 80240164 44810000 */ mtc1 $at, $f0 -/* BC2BF8 80240168 00000000 */ nop -/* BC2BFC 8024016C 4602003C */ c.lt.s $f0, $f2 -/* BC2C00 80240170 00000000 */ nop -/* BC2C04 80240174 45030001 */ bc1tl .L8024017C -/* BC2C08 80240178 AE200074 */ sw $zero, 0x74($s1) -.L8024017C: -/* BC2C0C 8024017C 8FBF0018 */ lw $ra, 0x18($sp) -/* BC2C10 80240180 8FB10014 */ lw $s1, 0x14($sp) -/* BC2C14 80240184 8FB00010 */ lw $s0, 0x10($sp) -/* BC2C18 80240188 24020002 */ addiu $v0, $zero, 2 -/* BC2C1C 8024018C 03E00008 */ jr $ra -/* BC2C20 80240190 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s b/ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s deleted file mode 100644 index d492819442..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407AC_BCD80C -/* BCD80C 802407AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCD810 802407B0 AFB10014 */ sw $s1, 0x14($sp) -/* BCD814 802407B4 0080882D */ daddu $s1, $a0, $zero -/* BCD818 802407B8 AFBF0018 */ sw $ra, 0x18($sp) -/* BCD81C 802407BC AFB00010 */ sw $s0, 0x10($sp) -/* BCD820 802407C0 0C00EAD2 */ jal get_npc_safe -/* BCD824 802407C4 8E24014C */ lw $a0, 0x14c($s1) -/* BCD828 802407C8 0040802D */ daddu $s0, $v0, $zero -/* BCD82C 802407CC 8E230074 */ lw $v1, 0x74($s1) -/* BCD830 802407D0 24020001 */ addiu $v0, $zero, 1 -/* BCD834 802407D4 10620036 */ beq $v1, $v0, .L802408B0 -/* BCD838 802407D8 28620002 */ slti $v0, $v1, 2 -/* BCD83C 802407DC 10400005 */ beqz $v0, .L802407F4 -/* BCD840 802407E0 24020002 */ addiu $v0, $zero, 2 -/* BCD844 802407E4 10600007 */ beqz $v1, .L80240804 -/* BCD848 802407E8 00000000 */ nop -/* BCD84C 802407EC 08090247 */ j .L8024091C -/* BCD850 802407F0 00000000 */ nop -.L802407F4: -/* BCD854 802407F4 10620036 */ beq $v1, $v0, .L802408D0 -/* BCD858 802407F8 00000000 */ nop -/* BCD85C 802407FC 08090247 */ j .L8024091C -/* BCD860 80240800 00000000 */ nop -.L80240804: -/* BCD864 80240804 0C00A67F */ jal rand_int -/* BCD868 80240808 240400B4 */ addiu $a0, $zero, 0xb4 -/* BCD86C 8024080C 24040032 */ addiu $a0, $zero, 0x32 -/* BCD870 80240810 3C01C3D7 */ lui $at, 0xc3d7 -/* BCD874 80240814 44810000 */ mtc1 $at, $f0 -/* BCD878 80240818 2442001E */ addiu $v0, $v0, 0x1e -/* BCD87C 8024081C A602008E */ sh $v0, 0x8e($s0) -/* BCD880 80240820 0C00A67F */ jal rand_int -/* BCD884 80240824 E6000040 */ swc1 $f0, 0x40($s0) -/* BCD888 80240828 3C014220 */ lui $at, 0x4220 -/* BCD88C 8024082C 44811000 */ mtc1 $at, $f2 -/* BCD890 80240830 44820000 */ mtc1 $v0, $f0 -/* BCD894 80240834 00000000 */ nop -/* BCD898 80240838 46800020 */ cvt.s.w $f0, $f0 -/* BCD89C 8024083C 46020000 */ add.s $f0, $f0, $f2 -/* BCD8A0 80240840 0C00A64D */ jal rand_float -/* BCD8A4 80240844 E600003C */ swc1 $f0, 0x3c($s0) -/* BCD8A8 80240848 46000000 */ add.s $f0, $f0, $f0 -/* BCD8AC 8024084C 3C014000 */ lui $at, 0x4000 -/* BCD8B0 80240850 44811000 */ mtc1 $at, $f2 -/* BCD8B4 80240854 00000000 */ nop -/* BCD8B8 80240858 46020000 */ add.s $f0, $f0, $f2 -/* BCD8BC 8024085C 24040064 */ addiu $a0, $zero, 0x64 -/* BCD8C0 80240860 0C00A67F */ jal rand_int -/* BCD8C4 80240864 E6000018 */ swc1 $f0, 0x18($s0) -/* BCD8C8 80240868 28420032 */ slti $v0, $v0, 0x32 -/* BCD8CC 8024086C 10400007 */ beqz $v0, .L8024088C -/* BCD8D0 80240870 00000000 */ nop -/* BCD8D4 80240874 3C014387 */ lui $at, 0x4387 -/* BCD8D8 80240878 44810000 */ mtc1 $at, $f0 -/* BCD8DC 8024087C 00000000 */ nop -/* BCD8E0 80240880 E6000038 */ swc1 $f0, 0x38($s0) -/* BCD8E4 80240884 08090229 */ j .L802408A4 -/* BCD8E8 80240888 E600000C */ swc1 $f0, 0xc($s0) -.L8024088C: -/* BCD8EC 8024088C 3C01C387 */ lui $at, 0xc387 -/* BCD8F0 80240890 44810000 */ mtc1 $at, $f0 -/* BCD8F4 80240894 3C0142B4 */ lui $at, 0x42b4 -/* BCD8F8 80240898 44811000 */ mtc1 $at, $f2 -/* BCD8FC 8024089C E6000038 */ swc1 $f0, 0x38($s0) -/* BCD900 802408A0 E602000C */ swc1 $f2, 0xc($s0) -.L802408A4: -/* BCD904 802408A4 24020001 */ addiu $v0, $zero, 1 -/* BCD908 802408A8 08090247 */ j .L8024091C -/* BCD90C 802408AC AE220074 */ sw $v0, 0x74($s1) -.L802408B0: -/* BCD910 802408B0 9602008E */ lhu $v0, 0x8e($s0) -/* BCD914 802408B4 2442FFFF */ addiu $v0, $v0, -1 -/* BCD918 802408B8 A602008E */ sh $v0, 0x8e($s0) -/* BCD91C 802408BC 00021400 */ sll $v0, $v0, 0x10 -/* BCD920 802408C0 14400016 */ bnez $v0, .L8024091C -/* BCD924 802408C4 24020002 */ addiu $v0, $zero, 2 -/* BCD928 802408C8 08090247 */ j .L8024091C -/* BCD92C 802408CC AE220074 */ sw $v0, 0x74($s1) -.L802408D0: -/* BCD930 802408D0 8E050018 */ lw $a1, 0x18($s0) -/* BCD934 802408D4 8E06000C */ lw $a2, 0xc($s0) -/* BCD938 802408D8 0C00EA95 */ jal npc_move_heading -/* BCD93C 802408DC 0200202D */ daddu $a0, $s0, $zero -/* BCD940 802408E0 C6020038 */ lwc1 $f2, 0x38($s0) -/* BCD944 802408E4 3C01C38C */ lui $at, 0xc38c -/* BCD948 802408E8 44810000 */ mtc1 $at, $f0 -/* BCD94C 802408EC 00000000 */ nop -/* BCD950 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BCD954 802408F4 00000000 */ nop -/* BCD958 802408F8 45030008 */ bc1tl .L8024091C -/* BCD95C 802408FC AE200074 */ sw $zero, 0x74($s1) -/* BCD960 80240900 3C01438C */ lui $at, 0x438c -/* BCD964 80240904 44810000 */ mtc1 $at, $f0 -/* BCD968 80240908 00000000 */ nop -/* BCD96C 8024090C 4602003C */ c.lt.s $f0, $f2 -/* BCD970 80240910 00000000 */ nop -/* BCD974 80240914 45030001 */ bc1tl .L8024091C -/* BCD978 80240918 AE200074 */ sw $zero, 0x74($s1) -.L8024091C: -/* BCD97C 8024091C 8FBF0018 */ lw $ra, 0x18($sp) -/* BCD980 80240920 8FB10014 */ lw $s1, 0x14($sp) -/* BCD984 80240924 8FB00010 */ lw $s0, 0x10($sp) -/* BCD988 80240928 24020002 */ addiu $v0, $zero, 2 -/* BCD98C 8024092C 03E00008 */ jr $ra -/* BCD990 80240930 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s b/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s deleted file mode 100644 index a16d354243..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402CC_BCEEBC -/* BCEEBC 802402CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCEEC0 802402D0 AFB10014 */ sw $s1, 0x14($sp) -/* BCEEC4 802402D4 0080882D */ daddu $s1, $a0, $zero -/* BCEEC8 802402D8 AFBF0018 */ sw $ra, 0x18($sp) -/* BCEECC 802402DC AFB00010 */ sw $s0, 0x10($sp) -/* BCEED0 802402E0 0C00EAD2 */ jal get_npc_safe -/* BCEED4 802402E4 8E24014C */ lw $a0, 0x14c($s1) -/* BCEED8 802402E8 0040802D */ daddu $s0, $v0, $zero -/* BCEEDC 802402EC 8E230074 */ lw $v1, 0x74($s1) -/* BCEEE0 802402F0 24020001 */ addiu $v0, $zero, 1 -/* BCEEE4 802402F4 10620036 */ beq $v1, $v0, .L802403D0 -/* BCEEE8 802402F8 28620002 */ slti $v0, $v1, 2 -/* BCEEEC 802402FC 10400005 */ beqz $v0, .L80240314 -/* BCEEF0 80240300 24020002 */ addiu $v0, $zero, 2 -/* BCEEF4 80240304 10600007 */ beqz $v1, .L80240324 -/* BCEEF8 80240308 00000000 */ nop -/* BCEEFC 8024030C 0809010F */ j .L8024043C -/* BCEF00 80240310 00000000 */ nop -.L80240314: -/* BCEF04 80240314 10620036 */ beq $v1, $v0, .L802403F0 -/* BCEF08 80240318 00000000 */ nop -/* BCEF0C 8024031C 0809010F */ j .L8024043C -/* BCEF10 80240320 00000000 */ nop -.L80240324: -/* BCEF14 80240324 0C00A67F */ jal rand_int -/* BCEF18 80240328 240400B4 */ addiu $a0, $zero, 0xb4 -/* BCEF1C 8024032C 24040032 */ addiu $a0, $zero, 0x32 -/* BCEF20 80240330 3C01C396 */ lui $at, 0xc396 -/* BCEF24 80240334 44810000 */ mtc1 $at, $f0 -/* BCEF28 80240338 2442001E */ addiu $v0, $v0, 0x1e -/* BCEF2C 8024033C A602008E */ sh $v0, 0x8e($s0) -/* BCEF30 80240340 0C00A67F */ jal rand_int -/* BCEF34 80240344 E6000040 */ swc1 $f0, 0x40($s0) -/* BCEF38 80240348 3C0142A0 */ lui $at, 0x42a0 -/* BCEF3C 8024034C 44811000 */ mtc1 $at, $f2 -/* BCEF40 80240350 44820000 */ mtc1 $v0, $f0 -/* BCEF44 80240354 00000000 */ nop -/* BCEF48 80240358 46800020 */ cvt.s.w $f0, $f0 -/* BCEF4C 8024035C 46020000 */ add.s $f0, $f0, $f2 -/* BCEF50 80240360 0C00A64D */ jal rand_float -/* BCEF54 80240364 E600003C */ swc1 $f0, 0x3c($s0) -/* BCEF58 80240368 46000000 */ add.s $f0, $f0, $f0 -/* BCEF5C 8024036C 3C014000 */ lui $at, 0x4000 -/* BCEF60 80240370 44811000 */ mtc1 $at, $f2 -/* BCEF64 80240374 00000000 */ nop -/* BCEF68 80240378 46020000 */ add.s $f0, $f0, $f2 -/* BCEF6C 8024037C 24040064 */ addiu $a0, $zero, 0x64 -/* BCEF70 80240380 0C00A67F */ jal rand_int -/* BCEF74 80240384 E6000018 */ swc1 $f0, 0x18($s0) -/* BCEF78 80240388 28420032 */ slti $v0, $v0, 0x32 -/* BCEF7C 8024038C 10400007 */ beqz $v0, .L802403AC -/* BCEF80 80240390 00000000 */ nop -/* BCEF84 80240394 3C014387 */ lui $at, 0x4387 -/* BCEF88 80240398 44810000 */ mtc1 $at, $f0 -/* BCEF8C 8024039C 00000000 */ nop -/* BCEF90 802403A0 E6000038 */ swc1 $f0, 0x38($s0) -/* BCEF94 802403A4 080900F1 */ j .L802403C4 -/* BCEF98 802403A8 E600000C */ swc1 $f0, 0xc($s0) -.L802403AC: -/* BCEF9C 802403AC 3C01C387 */ lui $at, 0xc387 -/* BCEFA0 802403B0 44810000 */ mtc1 $at, $f0 -/* BCEFA4 802403B4 3C0142B4 */ lui $at, 0x42b4 -/* BCEFA8 802403B8 44811000 */ mtc1 $at, $f2 -/* BCEFAC 802403BC E6000038 */ swc1 $f0, 0x38($s0) -/* BCEFB0 802403C0 E602000C */ swc1 $f2, 0xc($s0) -.L802403C4: -/* BCEFB4 802403C4 24020001 */ addiu $v0, $zero, 1 -/* BCEFB8 802403C8 0809010F */ j .L8024043C -/* BCEFBC 802403CC AE220074 */ sw $v0, 0x74($s1) -.L802403D0: -/* BCEFC0 802403D0 9602008E */ lhu $v0, 0x8e($s0) -/* BCEFC4 802403D4 2442FFFF */ addiu $v0, $v0, -1 -/* BCEFC8 802403D8 A602008E */ sh $v0, 0x8e($s0) -/* BCEFCC 802403DC 00021400 */ sll $v0, $v0, 0x10 -/* BCEFD0 802403E0 14400016 */ bnez $v0, .L8024043C -/* BCEFD4 802403E4 24020002 */ addiu $v0, $zero, 2 -/* BCEFD8 802403E8 0809010F */ j .L8024043C -/* BCEFDC 802403EC AE220074 */ sw $v0, 0x74($s1) -.L802403F0: -/* BCEFE0 802403F0 8E050018 */ lw $a1, 0x18($s0) -/* BCEFE4 802403F4 8E06000C */ lw $a2, 0xc($s0) -/* BCEFE8 802403F8 0C00EA95 */ jal npc_move_heading -/* BCEFEC 802403FC 0200202D */ daddu $a0, $s0, $zero -/* BCEFF0 80240400 C6020038 */ lwc1 $f2, 0x38($s0) -/* BCEFF4 80240404 3C01C38C */ lui $at, 0xc38c -/* BCEFF8 80240408 44810000 */ mtc1 $at, $f0 -/* BCEFFC 8024040C 00000000 */ nop -/* BCF000 80240410 4600103C */ c.lt.s $f2, $f0 -/* BCF004 80240414 00000000 */ nop -/* BCF008 80240418 45030008 */ bc1tl .L8024043C -/* BCF00C 8024041C AE200074 */ sw $zero, 0x74($s1) -/* BCF010 80240420 3C01438C */ lui $at, 0x438c -/* BCF014 80240424 44810000 */ mtc1 $at, $f0 -/* BCF018 80240428 00000000 */ nop -/* BCF01C 8024042C 4602003C */ c.lt.s $f0, $f2 -/* BCF020 80240430 00000000 */ nop -/* BCF024 80240434 45030001 */ bc1tl .L8024043C -/* BCF028 80240438 AE200074 */ sw $zero, 0x74($s1) -.L8024043C: -/* BCF02C 8024043C 8FBF0018 */ lw $ra, 0x18($sp) -/* BCF030 80240440 8FB10014 */ lw $s1, 0x14($sp) -/* BCF034 80240444 8FB00010 */ lw $s0, 0x10($sp) -/* BCF038 80240448 24020002 */ addiu $v0, $zero, 2 -/* BCF03C 8024044C 03E00008 */ jr $ra -/* BCF040 80240450 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s b/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s deleted file mode 100644 index a900ccd166..0000000000 --- a/ver/us/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FE4_BD4854.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE4_BD4854 -/* BD4854 80240FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD4858 80240FE8 AFB10014 */ sw $s1, 0x14($sp) -/* BD485C 80240FEC 0080882D */ daddu $s1, $a0, $zero -/* BD4860 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) -/* BD4864 80240FF4 AFB00010 */ sw $s0, 0x10($sp) -/* BD4868 80240FF8 0C00EAD2 */ jal get_npc_safe -/* BD486C 80240FFC 8E24014C */ lw $a0, 0x14c($s1) -/* BD4870 80241000 0040802D */ daddu $s0, $v0, $zero -/* BD4874 80241004 8E230074 */ lw $v1, 0x74($s1) -/* BD4878 80241008 24020001 */ addiu $v0, $zero, 1 -/* BD487C 8024100C 10620036 */ beq $v1, $v0, .L802410E8 -/* BD4880 80241010 28620002 */ slti $v0, $v1, 2 -/* BD4884 80241014 10400005 */ beqz $v0, .L8024102C -/* BD4888 80241018 24020002 */ addiu $v0, $zero, 2 -/* BD488C 8024101C 10600007 */ beqz $v1, .L8024103C -/* BD4890 80241020 00000000 */ nop -/* BD4894 80241024 08090455 */ j .L80241154 -/* BD4898 80241028 00000000 */ nop -.L8024102C: -/* BD489C 8024102C 10620036 */ beq $v1, $v0, .L80241108 -/* BD48A0 80241030 00000000 */ nop -/* BD48A4 80241034 08090455 */ j .L80241154 -/* BD48A8 80241038 00000000 */ nop -.L8024103C: -/* BD48AC 8024103C 0C00A67F */ jal rand_int -/* BD48B0 80241040 240400B4 */ addiu $a0, $zero, 0xb4 -/* BD48B4 80241044 24040032 */ addiu $a0, $zero, 0x32 -/* BD48B8 80241048 3C01C3D7 */ lui $at, 0xc3d7 -/* BD48BC 8024104C 44810000 */ mtc1 $at, $f0 -/* BD48C0 80241050 2442001E */ addiu $v0, $v0, 0x1e -/* BD48C4 80241054 A602008E */ sh $v0, 0x8e($s0) -/* BD48C8 80241058 0C00A67F */ jal rand_int -/* BD48CC 8024105C E6000040 */ swc1 $f0, 0x40($s0) -/* BD48D0 80241060 3C014220 */ lui $at, 0x4220 -/* BD48D4 80241064 44811000 */ mtc1 $at, $f2 -/* BD48D8 80241068 44820000 */ mtc1 $v0, $f0 -/* BD48DC 8024106C 00000000 */ nop -/* BD48E0 80241070 46800020 */ cvt.s.w $f0, $f0 -/* BD48E4 80241074 46020000 */ add.s $f0, $f0, $f2 -/* BD48E8 80241078 0C00A64D */ jal rand_float -/* BD48EC 8024107C E600003C */ swc1 $f0, 0x3c($s0) -/* BD48F0 80241080 46000000 */ add.s $f0, $f0, $f0 -/* BD48F4 80241084 3C014000 */ lui $at, 0x4000 -/* BD48F8 80241088 44811000 */ mtc1 $at, $f2 -/* BD48FC 8024108C 00000000 */ nop -/* BD4900 80241090 46020000 */ add.s $f0, $f0, $f2 -/* BD4904 80241094 24040064 */ addiu $a0, $zero, 0x64 -/* BD4908 80241098 0C00A67F */ jal rand_int -/* BD490C 8024109C E6000018 */ swc1 $f0, 0x18($s0) -/* BD4910 802410A0 28420032 */ slti $v0, $v0, 0x32 -/* BD4914 802410A4 10400007 */ beqz $v0, .L802410C4 -/* BD4918 802410A8 00000000 */ nop -/* BD491C 802410AC 3C014387 */ lui $at, 0x4387 -/* BD4920 802410B0 44810000 */ mtc1 $at, $f0 -/* BD4924 802410B4 00000000 */ nop -/* BD4928 802410B8 E6000038 */ swc1 $f0, 0x38($s0) -/* BD492C 802410BC 08090437 */ j .L802410DC -/* BD4930 802410C0 E600000C */ swc1 $f0, 0xc($s0) -.L802410C4: -/* BD4934 802410C4 3C01C387 */ lui $at, 0xc387 -/* BD4938 802410C8 44810000 */ mtc1 $at, $f0 -/* BD493C 802410CC 3C0142B4 */ lui $at, 0x42b4 -/* BD4940 802410D0 44811000 */ mtc1 $at, $f2 -/* BD4944 802410D4 E6000038 */ swc1 $f0, 0x38($s0) -/* BD4948 802410D8 E602000C */ swc1 $f2, 0xc($s0) -.L802410DC: -/* BD494C 802410DC 24020001 */ addiu $v0, $zero, 1 -/* BD4950 802410E0 08090455 */ j .L80241154 -/* BD4954 802410E4 AE220074 */ sw $v0, 0x74($s1) -.L802410E8: -/* BD4958 802410E8 9602008E */ lhu $v0, 0x8e($s0) -/* BD495C 802410EC 2442FFFF */ addiu $v0, $v0, -1 -/* BD4960 802410F0 A602008E */ sh $v0, 0x8e($s0) -/* BD4964 802410F4 00021400 */ sll $v0, $v0, 0x10 -/* BD4968 802410F8 14400016 */ bnez $v0, .L80241154 -/* BD496C 802410FC 24020002 */ addiu $v0, $zero, 2 -/* BD4970 80241100 08090455 */ j .L80241154 -/* BD4974 80241104 AE220074 */ sw $v0, 0x74($s1) -.L80241108: -/* BD4978 80241108 8E050018 */ lw $a1, 0x18($s0) -/* BD497C 8024110C 8E06000C */ lw $a2, 0xc($s0) -/* BD4980 80241110 0C00EA95 */ jal npc_move_heading -/* BD4984 80241114 0200202D */ daddu $a0, $s0, $zero -/* BD4988 80241118 C6020038 */ lwc1 $f2, 0x38($s0) -/* BD498C 8024111C 3C01C38C */ lui $at, 0xc38c -/* BD4990 80241120 44810000 */ mtc1 $at, $f0 -/* BD4994 80241124 00000000 */ nop -/* BD4998 80241128 4600103C */ c.lt.s $f2, $f0 -/* BD499C 8024112C 00000000 */ nop -/* BD49A0 80241130 45030008 */ bc1tl .L80241154 -/* BD49A4 80241134 AE200074 */ sw $zero, 0x74($s1) -/* BD49A8 80241138 3C01438C */ lui $at, 0x438c -/* BD49AC 8024113C 44810000 */ mtc1 $at, $f0 -/* BD49B0 80241140 00000000 */ nop -/* BD49B4 80241144 4602003C */ c.lt.s $f0, $f2 -/* BD49B8 80241148 00000000 */ nop -/* BD49BC 8024114C 45030001 */ bc1tl .L80241154 -/* BD49C0 80241150 AE200074 */ sw $zero, 0x74($s1) -.L80241154: -/* BD49C4 80241154 8FBF0018 */ lw $ra, 0x18($sp) -/* BD49C8 80241158 8FB10014 */ lw $s1, 0x14($sp) -/* BD49CC 8024115C 8FB00010 */ lw $s0, 0x10($sp) -/* BD49D0 80241160 24020002 */ addiu $v0, $zero, 2 -/* BD49D4 80241164 03E00008 */ jr $ra -/* BD49D8 80241168 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s deleted file mode 100644 index 26e71217ec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAF240/func_80241E40_DAF240.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E40_DAF240 -/* DAF240 80241E40 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAF244 80241E44 AFB10014 */ sw $s1, 0x14($sp) -/* DAF248 80241E48 0080882D */ daddu $s1, $a0, $zero -/* DAF24C 80241E4C AFBF001C */ sw $ra, 0x1c($sp) -/* DAF250 80241E50 AFB20018 */ sw $s2, 0x18($sp) -/* DAF254 80241E54 AFB00010 */ sw $s0, 0x10($sp) -/* DAF258 80241E58 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DAF25C 80241E5C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DAF260 80241E60 0C00EABB */ jal get_npc_unsafe -/* DAF264 80241E64 24040002 */ addiu $a0, $zero, 2 -/* DAF268 80241E68 0040802D */ daddu $s0, $v0, $zero -/* DAF26C 80241E6C 3C12800B */ lui $s2, %hi(gCameras) -/* DAF270 80241E70 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* DAF274 80241E74 C60C000C */ lwc1 $f12, 0xc($s0) -/* DAF278 80241E78 C640006C */ lwc1 $f0, 0x6c($s2) -/* DAF27C 80241E7C 46006300 */ add.s $f12, $f12, $f0 -/* DAF280 80241E80 3C014334 */ lui $at, 0x4334 -/* DAF284 80241E84 4481A000 */ mtc1 $at, $f20 -/* DAF288 80241E88 3C014220 */ lui $at, 0x4220 -/* DAF28C 80241E8C 4481B000 */ mtc1 $at, $f22 -/* DAF290 80241E90 0C00A8BB */ jal sin_deg -/* DAF294 80241E94 46146300 */ add.s $f12, $f12, $f20 -/* DAF298 80241E98 46160002 */ mul.s $f0, $f0, $f22 -/* DAF29C 80241E9C 00000000 */ nop -/* DAF2A0 80241EA0 C6020038 */ lwc1 $f2, 0x38($s0) -/* DAF2A4 80241EA4 46001080 */ add.s $f2, $f2, $f0 -/* DAF2A8 80241EA8 4600110D */ trunc.w.s $f4, $f2 -/* DAF2AC 80241EAC E6240084 */ swc1 $f4, 0x84($s1) -/* DAF2B0 80241EB0 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAF2B4 80241EB4 3C014100 */ lui $at, 0x4100 -/* DAF2B8 80241EB8 44811000 */ mtc1 $at, $f2 -/* DAF2BC 80241EBC 00000000 */ nop -/* DAF2C0 80241EC0 46020000 */ add.s $f0, $f0, $f2 -/* DAF2C4 80241EC4 4600010D */ trunc.w.s $f4, $f0 -/* DAF2C8 80241EC8 E6240088 */ swc1 $f4, 0x88($s1) -/* DAF2CC 80241ECC C60C000C */ lwc1 $f12, 0xc($s0) -/* DAF2D0 80241ED0 C640006C */ lwc1 $f0, 0x6c($s2) -/* DAF2D4 80241ED4 46006300 */ add.s $f12, $f12, $f0 -/* DAF2D8 80241ED8 0C00A8D4 */ jal cos_deg -/* DAF2DC 80241EDC 46146300 */ add.s $f12, $f12, $f20 -/* DAF2E0 80241EE0 46160002 */ mul.s $f0, $f0, $f22 -/* DAF2E4 80241EE4 00000000 */ nop -/* DAF2E8 80241EE8 C6020040 */ lwc1 $f2, 0x40($s0) -/* DAF2EC 80241EEC 46001081 */ sub.s $f2, $f2, $f0 -/* DAF2F0 80241EF0 4600110D */ trunc.w.s $f4, $f2 -/* DAF2F4 80241EF4 E624008C */ swc1 $f4, 0x8c($s1) -/* DAF2F8 80241EF8 8FBF001C */ lw $ra, 0x1c($sp) -/* DAF2FC 80241EFC 8FB20018 */ lw $s2, 0x18($sp) -/* DAF300 80241F00 8FB10014 */ lw $s1, 0x14($sp) -/* DAF304 80241F04 8FB00010 */ lw $s0, 0x10($sp) -/* DAF308 80241F08 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DAF30C 80241F0C D7B40020 */ ldc1 $f20, 0x20($sp) -/* DAF310 80241F10 24020002 */ addiu $v0, $zero, 2 -/* DAF314 80241F14 03E00008 */ jr $ra -/* DAF318 80241F18 27BD0030 */ addiu $sp, $sp, 0x30 -/* DAF31C 80241F1C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s deleted file mode 100644 index f3285b1007..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243220_DC04D0 -/* DC04D0 80243220 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DC04D4 80243224 AFB10014 */ sw $s1, 0x14($sp) -/* DC04D8 80243228 0080882D */ daddu $s1, $a0, $zero -/* DC04DC 8024322C AFBF001C */ sw $ra, 0x1c($sp) -/* DC04E0 80243230 AFB20018 */ sw $s2, 0x18($sp) -/* DC04E4 80243234 AFB00010 */ sw $s0, 0x10($sp) -/* DC04E8 80243238 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DC04EC 8024323C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC04F0 80243240 0C00EABB */ jal get_npc_unsafe -/* DC04F4 80243244 24040007 */ addiu $a0, $zero, 7 -/* DC04F8 80243248 0040802D */ daddu $s0, $v0, $zero -/* DC04FC 8024324C 3C12800B */ lui $s2, %hi(gCameras) -/* DC0500 80243250 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* DC0504 80243254 C60C000C */ lwc1 $f12, 0xc($s0) -/* DC0508 80243258 C640006C */ lwc1 $f0, 0x6c($s2) -/* DC050C 8024325C 46006300 */ add.s $f12, $f12, $f0 -/* DC0510 80243260 3C014334 */ lui $at, 0x4334 -/* DC0514 80243264 4481A000 */ mtc1 $at, $f20 -/* DC0518 80243268 3C014220 */ lui $at, 0x4220 -/* DC051C 8024326C 4481B000 */ mtc1 $at, $f22 -/* DC0520 80243270 0C00A8BB */ jal sin_deg -/* DC0524 80243274 46146300 */ add.s $f12, $f12, $f20 -/* DC0528 80243278 46160002 */ mul.s $f0, $f0, $f22 -/* DC052C 8024327C 00000000 */ nop -/* DC0530 80243280 C6020038 */ lwc1 $f2, 0x38($s0) -/* DC0534 80243284 46001080 */ add.s $f2, $f2, $f0 -/* DC0538 80243288 4600110D */ trunc.w.s $f4, $f2 -/* DC053C 8024328C E6240084 */ swc1 $f4, 0x84($s1) -/* DC0540 80243290 C600003C */ lwc1 $f0, 0x3c($s0) -/* DC0544 80243294 3C014100 */ lui $at, 0x4100 -/* DC0548 80243298 44811000 */ mtc1 $at, $f2 -/* DC054C 8024329C 00000000 */ nop -/* DC0550 802432A0 46020000 */ add.s $f0, $f0, $f2 -/* DC0554 802432A4 4600010D */ trunc.w.s $f4, $f0 -/* DC0558 802432A8 E6240088 */ swc1 $f4, 0x88($s1) -/* DC055C 802432AC C60C000C */ lwc1 $f12, 0xc($s0) -/* DC0560 802432B0 C640006C */ lwc1 $f0, 0x6c($s2) -/* DC0564 802432B4 46006300 */ add.s $f12, $f12, $f0 -/* DC0568 802432B8 0C00A8D4 */ jal cos_deg -/* DC056C 802432BC 46146300 */ add.s $f12, $f12, $f20 -/* DC0570 802432C0 46160002 */ mul.s $f0, $f0, $f22 -/* DC0574 802432C4 00000000 */ nop -/* DC0578 802432C8 C6020040 */ lwc1 $f2, 0x40($s0) -/* DC057C 802432CC 46001081 */ sub.s $f2, $f2, $f0 -/* DC0580 802432D0 4600110D */ trunc.w.s $f4, $f2 -/* DC0584 802432D4 E624008C */ swc1 $f4, 0x8c($s1) -/* DC0588 802432D8 8FBF001C */ lw $ra, 0x1c($sp) -/* DC058C 802432DC 8FB20018 */ lw $s2, 0x18($sp) -/* DC0590 802432E0 8FB10014 */ lw $s1, 0x14($sp) -/* DC0594 802432E4 8FB00010 */ lw $s0, 0x10($sp) -/* DC0598 802432E8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DC059C 802432EC D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC05A0 802432F0 24020002 */ addiu $v0, $zero, 2 -/* DC05A4 802432F4 03E00008 */ jr $ra -/* DC05A8 802432F8 27BD0030 */ addiu $sp, $sp, 0x30 -/* DC05AC 802432FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s deleted file mode 100644 index 5ff17c8af6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243610_DD02E0 -/* DD02E0 80243610 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DD02E4 80243614 AFB10014 */ sw $s1, 0x14($sp) -/* DD02E8 80243618 0080882D */ daddu $s1, $a0, $zero -/* DD02EC 8024361C AFBF001C */ sw $ra, 0x1c($sp) -/* DD02F0 80243620 AFB20018 */ sw $s2, 0x18($sp) -/* DD02F4 80243624 AFB00010 */ sw $s0, 0x10($sp) -/* DD02F8 80243628 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DD02FC 8024362C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD0300 80243630 0C00EABB */ jal get_npc_unsafe -/* DD0304 80243634 24040007 */ addiu $a0, $zero, 7 -/* DD0308 80243638 0040802D */ daddu $s0, $v0, $zero -/* DD030C 8024363C 3C12800B */ lui $s2, %hi(gCameras) -/* DD0310 80243640 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* DD0314 80243644 C60C000C */ lwc1 $f12, 0xc($s0) -/* DD0318 80243648 C640006C */ lwc1 $f0, 0x6c($s2) -/* DD031C 8024364C 46006300 */ add.s $f12, $f12, $f0 -/* DD0320 80243650 3C014334 */ lui $at, 0x4334 -/* DD0324 80243654 4481A000 */ mtc1 $at, $f20 -/* DD0328 80243658 3C014220 */ lui $at, 0x4220 -/* DD032C 8024365C 4481B000 */ mtc1 $at, $f22 -/* DD0330 80243660 0C00A8BB */ jal sin_deg -/* DD0334 80243664 46146300 */ add.s $f12, $f12, $f20 -/* DD0338 80243668 46160002 */ mul.s $f0, $f0, $f22 -/* DD033C 8024366C 00000000 */ nop -/* DD0340 80243670 C6020038 */ lwc1 $f2, 0x38($s0) -/* DD0344 80243674 46001080 */ add.s $f2, $f2, $f0 -/* DD0348 80243678 4600110D */ trunc.w.s $f4, $f2 -/* DD034C 8024367C E6240084 */ swc1 $f4, 0x84($s1) -/* DD0350 80243680 C600003C */ lwc1 $f0, 0x3c($s0) -/* DD0354 80243684 3C014100 */ lui $at, 0x4100 -/* DD0358 80243688 44811000 */ mtc1 $at, $f2 -/* DD035C 8024368C 00000000 */ nop -/* DD0360 80243690 46020000 */ add.s $f0, $f0, $f2 -/* DD0364 80243694 4600010D */ trunc.w.s $f4, $f0 -/* DD0368 80243698 E6240088 */ swc1 $f4, 0x88($s1) -/* DD036C 8024369C C60C000C */ lwc1 $f12, 0xc($s0) -/* DD0370 802436A0 C640006C */ lwc1 $f0, 0x6c($s2) -/* DD0374 802436A4 46006300 */ add.s $f12, $f12, $f0 -/* DD0378 802436A8 0C00A8D4 */ jal cos_deg -/* DD037C 802436AC 46146300 */ add.s $f12, $f12, $f20 -/* DD0380 802436B0 46160002 */ mul.s $f0, $f0, $f22 -/* DD0384 802436B4 00000000 */ nop -/* DD0388 802436B8 C6020040 */ lwc1 $f2, 0x40($s0) -/* DD038C 802436BC 46001081 */ sub.s $f2, $f2, $f0 -/* DD0390 802436C0 4600110D */ trunc.w.s $f4, $f2 -/* DD0394 802436C4 E624008C */ swc1 $f4, 0x8c($s1) -/* DD0398 802436C8 8FBF001C */ lw $ra, 0x1c($sp) -/* DD039C 802436CC 8FB20018 */ lw $s2, 0x18($sp) -/* DD03A0 802436D0 8FB10014 */ lw $s1, 0x14($sp) -/* DD03A4 802436D4 8FB00010 */ lw $s0, 0x10($sp) -/* DD03A8 802436D8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DD03AC 802436DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD03B0 802436E0 24020002 */ addiu $v0, $zero, 2 -/* DD03B4 802436E4 03E00008 */ jr $ra -/* DD03B8 802436E8 27BD0030 */ addiu $sp, $sp, 0x30 -/* DD03BC 802436EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s b/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s deleted file mode 100644 index cd72cf23ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C4_AB6354 -/* AB6354 802400C4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AB6358 802400C8 AFB10014 */ sw $s1, 0x14($sp) -/* AB635C 802400CC 0080882D */ daddu $s1, $a0, $zero -/* AB6360 802400D0 AFBF001C */ sw $ra, 0x1c($sp) -/* AB6364 802400D4 AFB20018 */ sw $s2, 0x18($sp) -/* AB6368 802400D8 AFB00010 */ sw $s0, 0x10($sp) -/* AB636C 802400DC F7B60028 */ sdc1 $f22, 0x28($sp) -/* AB6370 802400E0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* AB6374 802400E4 0C00EABB */ jal get_npc_unsafe -/* AB6378 802400E8 0000202D */ daddu $a0, $zero, $zero -/* AB637C 802400EC 0040802D */ daddu $s0, $v0, $zero -/* AB6380 802400F0 3C12800B */ lui $s2, %hi(gCameras) -/* AB6384 802400F4 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* AB6388 802400F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* AB638C 802400FC C640006C */ lwc1 $f0, 0x6c($s2) -/* AB6390 80240100 46006300 */ add.s $f12, $f12, $f0 -/* AB6394 80240104 3C014334 */ lui $at, 0x4334 -/* AB6398 80240108 4481A000 */ mtc1 $at, $f20 -/* AB639C 8024010C 3C0141A0 */ lui $at, 0x41a0 -/* AB63A0 80240110 4481B000 */ mtc1 $at, $f22 -/* AB63A4 80240114 0C00A8BB */ jal sin_deg -/* AB63A8 80240118 46146300 */ add.s $f12, $f12, $f20 -/* AB63AC 8024011C 46160002 */ mul.s $f0, $f0, $f22 -/* AB63B0 80240120 00000000 */ nop -/* AB63B4 80240124 C6020038 */ lwc1 $f2, 0x38($s0) -/* AB63B8 80240128 46001080 */ add.s $f2, $f2, $f0 -/* AB63BC 8024012C 4600110D */ trunc.w.s $f4, $f2 -/* AB63C0 80240130 E6240084 */ swc1 $f4, 0x84($s1) -/* AB63C4 80240134 C600003C */ lwc1 $f0, 0x3c($s0) -/* AB63C8 80240138 3C014190 */ lui $at, 0x4190 -/* AB63CC 8024013C 44811000 */ mtc1 $at, $f2 -/* AB63D0 80240140 00000000 */ nop -/* AB63D4 80240144 46020000 */ add.s $f0, $f0, $f2 -/* AB63D8 80240148 4600010D */ trunc.w.s $f4, $f0 -/* AB63DC 8024014C E6240088 */ swc1 $f4, 0x88($s1) -/* AB63E0 80240150 C60C000C */ lwc1 $f12, 0xc($s0) -/* AB63E4 80240154 C640006C */ lwc1 $f0, 0x6c($s2) -/* AB63E8 80240158 46006300 */ add.s $f12, $f12, $f0 -/* AB63EC 8024015C 0C00A8D4 */ jal cos_deg -/* AB63F0 80240160 46146300 */ add.s $f12, $f12, $f20 -/* AB63F4 80240164 46160002 */ mul.s $f0, $f0, $f22 -/* AB63F8 80240168 00000000 */ nop -/* AB63FC 8024016C C6020040 */ lwc1 $f2, 0x40($s0) -/* AB6400 80240170 46001081 */ sub.s $f2, $f2, $f0 -/* AB6404 80240174 4600110D */ trunc.w.s $f4, $f2 -/* AB6408 80240178 E624008C */ swc1 $f4, 0x8c($s1) -/* AB640C 8024017C 8FBF001C */ lw $ra, 0x1c($sp) -/* AB6410 80240180 8FB20018 */ lw $s2, 0x18($sp) -/* AB6414 80240184 8FB10014 */ lw $s1, 0x14($sp) -/* AB6418 80240188 8FB00010 */ lw $s0, 0x10($sp) -/* AB641C 8024018C D7B60028 */ ldc1 $f22, 0x28($sp) -/* AB6420 80240190 D7B40020 */ ldc1 $f20, 0x20($sp) -/* AB6424 80240194 24020002 */ addiu $v0, $zero, 2 -/* AB6428 80240198 03E00008 */ jr $ra -/* AB642C 8024019C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index ce7ab1f2c5..3135c6bc98 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -160,7 +160,7 @@ segments: - [0x3FA50, hasm, os/bcopy] - [0x3FD70, hasm, os/bzero] - [0x3FE10, c, os/string, gcc_272 -O3] - - [0x3FEA0, c, os/3FEA0] + - [0x3FEA0, c, os/xprintf, gcc_272 -O3] - [0x408EC, c, os/sprintf] # MOVE_ADDU - [0x40980, c, os/osCreateMesgQueue] - [0x409B0, c, os/osJamMesg, gcc_272 -O3] @@ -334,7 +334,7 @@ segments: - [0x6F1C0, .data, os/position] - [0x6F1D0, .data, os/rotateRPY] - [0x6F1E0, .data, os/sins] - - [0x6F9E0, .data, os/3FEA0] + - [0x6F9E0, .data, os/xprintf] - [0x6FA30, .data, os/seteventmesg] - [0x6FA40, .data, os/siacs] - [0x6FA50, .data, os/osSetThreadPri] @@ -2678,7 +2678,7 @@ segments: vram: 0xE0060000 subsegments: - [0x363160, c, big_snowflakes] - - [0x363890, data] + - [0x363890] - [0x3638C0, bin] # big_snowflakes gfx - name: effect_debuff dir: effects @@ -3586,7 +3586,7 @@ segments: overlay: True subsegments: - [0x422000, c, hammer] - - [0x422A90, data] + - [0x422A90] - type: code start: 0x422AD0 vram: 0x802A9000 @@ -3604,7 +3604,7 @@ segments: overlay: True subsegments: - [0x4233F0, c, break_free] - - [0x423C30, data] + - [0x423C30] - type: code start: 0x423C70 vram: 0x802A9000 @@ -3613,7 +3613,29 @@ segments: overlay: True subsegments: - [0x423C70, c, whirlwind] - - [0x424550, data] + - start: 0x424550 + type: .data + name: whirlwind + subsegments: + - [0x424550, .data, whirlwind] + - [0x424550, ci4, whirlwind_1, 24, 24] + - [0x424670, palette, whirlwind_1] + - [0x424690, ci4, whirlwind_2, 24, 24] + - [0x4247B0, palette, whirlwind_2] + - [0x4247D0, ci4, whirlwind_3, 24, 24] + - [0x4248F0, palette, whirlwind_3] + - [0x424910, ci4, whirlwind_4, 24, 24] + - [0x424A30, palette, whirlwind_4] + - [0x424A50, ci4, whirlwind_5, 24, 24] + - [0x424B70, palette, whirlwind_5] + - [0x424B90, ci4, whirlwind_6, 24, 24] + - [0x424CB0, palette, whirlwind_6] + - [0x424CD0, ci4, whirlwind_7, 24, 24] + - [0x424DF0, palette, whirlwind_7] + - [0x424E10, ci4, whirlwind_bubble, 56, 48] + - [0x425350, palette, whirlwind_bubble] + - [0x425370] + - [0x425550] - type: code start: 0x425590 vram: 0x802A9000 @@ -3640,7 +3662,7 @@ segments: overlay: True subsegments: - [0x426170, c, dizzy_shell] - - [0x426970, data] + - [0x426970] - type: code start: 0x4269D0 vram: 0x802A9000 @@ -3649,7 +3671,7 @@ segments: overlay: True subsegments: - [0x4269D0, c, fire_shell] - - [0x427320, data] + - [0x427320] - type: code start: 0x4273B0 vram: 0x802A9000 @@ -3703,7 +3725,7 @@ segments: overlay: True subsegments: - [0x429D20, c, squirt] - - [0x42A480, data] + - [0x42A480] - type: code start: 0x42A4F0 vram: 0x802A9000 @@ -3712,7 +3734,29 @@ segments: overlay: True subsegments: - [0x42A4F0, c, water_block] - - [0x42B650, data] + - start: 0x42B650 + type: .data + name: water_block + subsegments: + - [0x42B650, .data, water_block] + - [0x42B650, ci4, water_block_1, 24, 24] + - [0x42B770, palette, water_block_1] + - [0x42B790, ci4, water_block_2, 24, 24] + - [0x42B8B0, palette, water_block_2] + - [0x42B8D0, ci4, water_block_3, 24, 24] + - [0x42B9F0, palette, water_block_3] + - [0x42BA10, ci4, water_block_0, 24, 24] + - [0x42BB30, palette, water_block_0] + - [0x42BB50, ci4, water_block_block, 32, 32] + - [0x42BD50, palette, water_block_block] + - [0x42BD70, ci4, water_block_circle, 40, 40] + - [0x42C090, palette, water_block_circle] + - [0x42C0B0, ci4, water_block_cloud, 40, 40] + - [0x42C3D0, palette, water_block_cloud] + - [0x42C3F0, ci4, water_block_4, 24, 24] + - [0x42C510, palette, water_block_4] + - [0x42C530] + - [0x42C6F0] - type: code start: 0x42C6F0 vram: 0x802A9000 @@ -3721,8 +3765,7 @@ segments: overlay: True subsegments: - [0x42C6F0, c, tidal_wave] - - [0x42CEB0, data] - - [0x42CED0] + - [0x42CEB0] - type: code start: 0x42CF10 vram: 0x802A9000 @@ -3731,8 +3774,7 @@ segments: overlay: True subsegments: - [0x42CF10, c, power_shock] - - [0x42D9B0, data] - - [0x42D9D0] + - [0x42D9B0] - type: code start: 0x42DA10 vram: 0x802A9000 @@ -3741,7 +3783,7 @@ segments: overlay: True subsegments: - [0x42DA10, c, mega_shock] - - [0x42E342, .data, mega_shock] + - [0x42E342] # todo offset ? - type: code start: 0x42E3A0 vram: 0x802A9000 @@ -3759,7 +3801,7 @@ segments: overlay: True subsegments: - [0x42EE20, c, spiny_surge] - - [0x42F680, data] + - [0x42F680] - type: code start: 0x42F6E0 vram: 0x802A9000 @@ -3768,7 +3810,7 @@ segments: overlay: True subsegments: - [0x42F6E0, c, hurricane] - - [0x42FFC0, data] + - [0x42FFC0] - type: code start: 0x430020 vram: 0x802A9000 @@ -3777,7 +3819,7 @@ segments: overlay: True subsegments: - [0x430020, c, spook] - - [0x430940, data] + - [0x430940] - dir: battle/area_kmr_part_1 type: code start: 0x4309A0 @@ -4393,6 +4435,7 @@ segments: - [0x69F320, c] - [0x6A2B50, c] - [0x6A44E0, data] + - [0x6BB940] - dir: battle/area_kpa3 type: code start: 0x6BBB90 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 1e3f1b623b..2acd5a877d 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1426,6 +1426,7 @@ D_80078E58 = 0x80078E58; // type:data rom:0x54258 D_80078E5A = 0x80078E5A; // type:data rom:0x5425A D_80078E5C = 0x80078E5C; // type:data rom:0x5425C D_80078E60 = 0x80078E60; // type:data rom:0x54260 +D_80078EE0 = 0x80078EE0; // type:func rom:0x542E0 D_8007EFE0 = 0x8007EFE0; // type:data rom:0x5A3E0 D_8007F048 = 0x8007F048; // type:data rom:0x5A448 D_8007F158 = 0x8007F158; // type:data rom:0x5A558 @@ -1438,6 +1439,936 @@ D_8007F200 = 0x8007F200; // type:data rom:0x5A600 D_8007F204 = 0x8007F204; // type:data rom:0x5A604 gEffectTable = 0x8007F210; // type:data rom:0x5A610 size:0xCA8 D_8007FEB8 = 0x8007FEB8; // type:data rom:0x5B2B8 +HudScript_HandPointDownLoop = 0x8007FF20; // type:data rom:0x5B320 +HudScript_HandPointDown = 0x800800A0; // type:data rom:0x5B4A0 +HudScript_HandPointDownHeld = 0x800801D8; // type:data rom:0x5B5D8 +HudScript_HandPointLeftLoop = 0x80080208; // type:data rom:0x5B608 +HudScript_HandPointLeft = 0x80080388; // type:data rom:0x5B788 +HudScript_HandPointLeftHeld = 0x800804C0; // type:data rom:0x5B8C0 +HudScript_Item_Present = 0x800804F0; // type:data rom:0x5B8F0 +HudScript_Item_CakeDone = 0x80080520; // type:data rom:0x5B920 +HudScript_Item_CakeBaked = 0x80080550; // type:data rom:0x5B950 +HudScript_Item_CakePan = 0x80080580; // type:data rom:0x5B980 +HudScript_Item_CakeBatter = 0x800805B0; // type:data rom:0x5B9B0 +HudScript_Item_CakeBowl = 0x800805E0; // type:data rom:0x5B9E0 +HudScript_Item_CakeMixed = 0x80080610; // type:data rom:0x5BA10 +HudScript_Item_CakeIcing = 0x80080640; // type:data rom:0x5BA40 +HudScript_Item_CakeBerries = 0x80080670; // type:data rom:0x5BA70 +HudScript_Item_Hammer1 = 0x800806A0; // type:data rom:0x5BAA0 +HudScript_Item_Hammer2 = 0x800806D0; // type:data rom:0x5BAD0 +HudScript_Item_Hammer3 = 0x80080700; // type:data rom:0x5BB00 +HudScript_Item_Boots1 = 0x80080730; // type:data rom:0x5BB30 +HudScript_Item_Boots2 = 0x80080760; // type:data rom:0x5BB60 +HudScript_Item_Boots3 = 0x80080790; // type:data rom:0x5BB90 +HudScript_Item_Items = 0x800807C0; // type:data rom:0x5BBC0 +HudScript_Item_HeartPiece = 0x800807F0; // type:data rom:0x5BBF0 +HudScript_Item_Heart = 0x80080820; // type:data rom:0x5BC20 +HudScript_Item_Coin = 0x80080868; // type:data rom:0x5BC68 +HudScript_Item_CoinSparkleA = 0x80080A4C; // type:data rom:0x5BE4C +HudScript_Item_CoinSparkleB = 0x80080B64; // type:data rom:0x5BF64 +HudScript_Item_CoinSparkleC = 0x80080C7C; // type:data rom:0x5C07C +HudScript_Item_CoinSparkleD = 0x80080D94; // type:data rom:0x5C194 +HudScript_Item_CoinSparkleE = 0x80080EAC; // type:data rom:0x5C2AC +HudScript_Item_CoinSparkleRandom = 0x80080FC4; // type:data rom:0x5C3C4 +HudScript_Item_StarPoint = 0x80080FF0; // type:data rom:0x5C3F0 +HudScript_Item_SmallStarPoint = 0x800810C8; // type:data rom:0x5C4C8 +HudScript_Item_HeartPoint = 0x800811A0; // type:data rom:0x5C5A0 +HudScript_Item_FlowerPoint = 0x80081200; // type:data rom:0x5C600 +HudScript_Item_StarPiece = 0x80081260; // type:data rom:0x5C660 +HudScript_Item_GearBoots1 = 0x800812D8; // type:data rom:0x5C6D8 +HudScript_Item_GearBoots2 = 0x80081308; // type:data rom:0x5C708 +HudScript_Item_GearBoots3 = 0x80081338; // type:data rom:0x5C738 +HudScript_Item_GearHammer1 = 0x80081368; // type:data rom:0x5C768 +HudScript_Item_GearHammer2 = 0x80081398; // type:data rom:0x5C798 +HudScript_Item_GearHammer3 = 0x800813C8; // type:data rom:0x5C7C8 +HudScript_Item_LuckyStar = 0x800813F8; // type:data rom:0x5C7F8 +HudScript_Item_Map = 0x80081428; // type:data rom:0x5C828 +HudScript_Item_KoopaFortressKey = 0x80081458; // type:data rom:0x5C858 +HudScript_Item_RuinsKey = 0x80081488; // type:data rom:0x5C888 +HudScript_Item_TubbaCastleKey = 0x800814B8; // type:data rom:0x5C8B8 +HudScript_Item_IcePalaceKey = 0x800814E8; // type:data rom:0x5C8E8 +HudScript_Item_BowserCastleKey = 0x80081518; // type:data rom:0x5C918 +HudScript_Item_Dolly = 0x80081548; // type:data rom:0x5C948 +HudScript_Item_KooperShell = 0x80081578; // type:data rom:0x5C978 +HudScript_Item_PulseStone = 0x800815A8; // type:data rom:0x5C9A8 +HudScript_Item_Artifact = 0x800815D8; // type:data rom:0x5C9D8 +HudScript_Item_AncientVase = 0x80081608; // type:data rom:0x5CA08 +HudScript_Item_RuinsStonePyramid = 0x80081638; // type:data rom:0x5CA38 +HudScript_Item_RuinsStoneStar = 0x80081668; // type:data rom:0x5CA68 +HudScript_Item_RuinsStoneMoon = 0x80081698; // type:data rom:0x5CA98 +HudScript_Item_ForestPass = 0x800816C8; // type:data rom:0x5CAC8 +HudScript_Item_BooRecordOutline = 0x800816F8; // type:data rom:0x5CAF8 +HudScript_Item_BooRecord = 0x80081728; // type:data rom:0x5CB28 +HudScript_Item_BooWeight = 0x80081758; // type:data rom:0x5CB58 +HudScript_Item_BooPortrait = 0x80081788; // type:data rom:0x5CB88 +HudScript_Item_MysticKey = 0x800817B8; // type:data rom:0x5CBB8 +HudScript_Item_IronKey = 0x800817E8; // type:data rom:0x5CBE8 +HudScript_Item_ToyboxTrain = 0x80081818; // type:data rom:0x5CC18 +HudScript_Item_FryingPan = 0x80081848; // type:data rom:0x5CC48 +HudScript_Item_Dictionary = 0x80081878; // type:data rom:0x5CC78 +HudScript_Item_MysteryNote = 0x800818A8; // type:data rom:0x5CCA8 +HudScript_Item_SuspiciousNote = 0x800818D8; // type:data rom:0x5CCD8 +HudScript_Item_MagicalSeed1 = 0x80081908; // type:data rom:0x5CD08 +HudScript_Item_MagicalSeed2 = 0x80081938; // type:data rom:0x5CD38 +HudScript_Item_MagicalSeed3 = 0x80081968; // type:data rom:0x5CD68 +HudScript_Item_MagicalSeed4 = 0x80081998; // type:data rom:0x5CD98 +HudScript_Item_CrystalBerry = 0x800819C8; // type:data rom:0x5CDC8 +HudScript_Item_WaterStone = 0x800819F8; // type:data rom:0x5CDF8 +HudScript_Item_MagicBean = 0x80081A28; // type:data rom:0x5CE28 +HudScript_Item_FertileSoil = 0x80081A58; // type:data rom:0x5CE58 +HudScript_Item_MiracleWater = 0x80081A88; // type:data rom:0x5CE88 +HudScript_Item_UltraStone = 0x80081AB8; // type:data rom:0x5CEB8 +HudScript_Item_ToadDoll = 0x80081AE8; // type:data rom:0x5CEE8 +HudScript_Item_Calculator = 0x80081B18; // type:data rom:0x5CF18 +HudScript_Item_Screwdriver = 0x80081B48; // type:data rom:0x5CF48 +HudScript_Item_CookBook = 0x80081B78; // type:data rom:0x5CF78 +HudScript_Item_JadeRaven = 0x80081BA8; // type:data rom:0x5CFA8 +HudScript_Item_SnowmanBucket = 0x80081BD8; // type:data rom:0x5CFD8 +HudScript_Item_SnowmanScarf = 0x80081C08; // type:data rom:0x5D008 +HudScript_Item_RedKey = 0x80081C38; // type:data rom:0x5D038 +HudScript_Item_BlueKey = 0x80081C68; // type:data rom:0x5D068 +HudScript_Item_KootPackage = 0x80081C98; // type:data rom:0x5D098 +HudScript_Item_KootRedJar = 0x80081CC8; // type:data rom:0x5D0C8 +HudScript_Item_Melody = 0x80081CF8; // type:data rom:0x5D0F8 +HudScript_Item_Lyrics = 0x80081D28; // type:data rom:0x5D128 +HudScript_Item_Mailbag = 0x80081D58; // type:data rom:0x5D158 +HudScript_Item_StarStone = 0x80081D88; // type:data rom:0x5D188 +HudScript_Item_SneakyParasol = 0x80081DB8; // type:data rom:0x5D1B8 +HudScript_Item_PeachKey = 0x80081DE8; // type:data rom:0x5D1E8 +HudScript_Item_UNK_1DC210 = 0x80081E18; // type:data rom:0x5D218 +HudScript_Item_UNK_1DC430 = 0x80081E48; // type:data rom:0x5D248 +HudScript_Item_UNK_1DC650 = 0x80081E78; // type:data rom:0x5D278 +HudScript_Item_UNK_1DC870 = 0x80081EA8; // type:data rom:0x5D2A8 +HudScript_Item_DojoCard1 = 0x80081ED8; // type:data rom:0x5D2D8 +HudScript_Item_DojoCard2 = 0x80081F08; // type:data rom:0x5D308 +HudScript_Item_DojoCard3 = 0x80081F38; // type:data rom:0x5D338 +HudScript_Item_DojoCard4 = 0x80081F68; // type:data rom:0x5D368 +HudScript_Item_DojoCard5 = 0x80081F98; // type:data rom:0x5D398 +HudScript_Item_CrystalBall = 0x80081FC8; // type:data rom:0x5D3C8 +HudScript_Item_GoldCard = 0x80081FF8; // type:data rom:0x5D3F8 +HudScript_Item_SilverCard = 0x80082028; // type:data rom:0x5D428 +HudScript_Item_KootBook = 0x80082058; // type:data rom:0x5D458 +HudScript_Item_KootTheTape = 0x80082088; // type:data rom:0x5D488 +HudScript_Item_KootMerluvleeAutograph = 0x800820B8; // type:data rom:0x5D4B8 +HudScript_Item_KootEmptyWallet = 0x800820E8; // type:data rom:0x5D4E8 +HudScript_Item_KootLuigiAutograph = 0x80082118; // type:data rom:0x5D518 +HudScript_Item_KootShell = 0x80082148; // type:data rom:0x5D548 +HudScript_Item_KootPhoto = 0x80082178; // type:data rom:0x5D578 +HudScript_Item_KootGlasses = 0x800821A8; // type:data rom:0x5D5A8 +HudScript_Item_Letter = 0x800821D8; // type:data rom:0x5D5D8 +HudScript_Item_Letter_disabled = 0x80082208; // type:data rom:0x5D608 +HudScript_Item_Unused_089 = 0x80082238; // type:data rom:0x5D638 +HudScript_Item_Unused_089_disabled = 0x80082268; // type:data rom:0x5D668 +HudScript_Item_Unused_08A = 0x80082298; // type:data rom:0x5D698 +HudScript_Item_Unused_08A_disabled = 0x800822C8; // type:data rom:0x5D6C8 +HudScript_Item_Unused_08B = 0x800822F8; // type:data rom:0x5D6F8 +HudScript_Item_Unused_08B_disabled = 0x80082328; // type:data rom:0x5D728 +HudScript_Item_Unused_08C = 0x80082358; // type:data rom:0x5D758 +HudScript_Item_Unused_08C_disabled = 0x80082388; // type:data rom:0x5D788 +HudScript_Item_Unused_08D = 0x800823B8; // type:data rom:0x5D7B8 +HudScript_Item_Unused_08D_disabled = 0x800823E8; // type:data rom:0x5D7E8 +HudScript_Item_Unused_08E = 0x80082418; // type:data rom:0x5D818 +HudScript_Item_Unused_08E_disabled = 0x80082448; // type:data rom:0x5D848 +HudScript_Item_Unused_08F = 0x80082478; // type:data rom:0x5D878 +HudScript_Item_Unused_08F_disabled = 0x800824A8; // type:data rom:0x5D8A8 +HudScript_Item_PleaseComeBack = 0x800824D8; // type:data rom:0x5D8D8 +HudScript_Item_PleaseComeBack_disabled = 0x80082508; // type:data rom:0x5D908 +HudScript_Item_Unused_139 = 0x80082538; // type:data rom:0x5D938 +HudScript_Item_Unused_139_disabled = 0x80082568; // type:data rom:0x5D968 +HudScript_Item_FrightJar = 0x80082598; // type:data rom:0x5D998 +HudScript_Item_FrightJar_disabled = 0x800825C8; // type:data rom:0x5D9C8 +HudScript_Item_Mystery = 0x800825F8; // type:data rom:0x5D9F8 +HudScript_Item_Mystery_disabled = 0x80082628; // type:data rom:0x5DA28 +HudScript_Item_RepelGel = 0x80082658; // type:data rom:0x5DA58 +HudScript_Item_RepelGel_disabled = 0x80082688; // type:data rom:0x5DA88 +HudScript_Item_InsecticideHerb = 0x800826B8; // type:data rom:0x5DAB8 +HudScript_Item_InsecticideHerb_disabled = 0x800826E8; // type:data rom:0x5DAE8 +HudScript_Item_Unused_13E = 0x80082718; // type:data rom:0x5DB18 +HudScript_Item_Unused_13E_disabled = 0x80082748; // type:data rom:0x5DB48 +HudScript_Item_Unused_13F = 0x80082778; // type:data rom:0x5DB78 +HudScript_Item_Unused_13F_disabled = 0x800827A8; // type:data rom:0x5DBA8 +HudScript_Item_SpicySoup = 0x800827D8; // type:data rom:0x5DBD8 +HudScript_Item_SpicySoup_disabled = 0x80082808; // type:data rom:0x5DC08 +HudScript_Item_ApplePie = 0x80082838; // type:data rom:0x5DC38 +HudScript_Item_ApplePie_disabled = 0x80082868; // type:data rom:0x5DC68 +HudScript_Item_HoneyUltra = 0x80082898; // type:data rom:0x5DC98 +HudScript_Item_HoneyUltra_disabled = 0x800828C8; // type:data rom:0x5DCC8 +HudScript_Item_MapleUltra = 0x800828F8; // type:data rom:0x5DCF8 +HudScript_Item_MapleUltra_disabled = 0x80082928; // type:data rom:0x5DD28 +HudScript_Item_JellyUltra = 0x80082958; // type:data rom:0x5DD58 +HudScript_Item_JellyUltra_disabled = 0x80082988; // type:data rom:0x5DD88 +HudScript_Item_Koopasta = 0x800829B8; // type:data rom:0x5DDB8 +HudScript_Item_Koopasta_disabled = 0x800829E8; // type:data rom:0x5DDE8 +HudScript_Item_FriedShroom = 0x80082A18; // type:data rom:0x5DE18 +HudScript_Item_FriedShroom_disabled = 0x80082A48; // type:data rom:0x5DE48 +HudScript_Item_ShroomCake = 0x80082A78; // type:data rom:0x5DE78 +HudScript_Item_ShroomCake_disabled = 0x80082AA8; // type:data rom:0x5DEA8 +HudScript_Item_ShroomSteak = 0x80082AD8; // type:data rom:0x5DED8 +HudScript_Item_ShroomSteak_disabled = 0x80082B08; // type:data rom:0x5DF08 +HudScript_Item_HotShroom = 0x80082B38; // type:data rom:0x5DF38 +HudScript_Item_HotShroom_disabled = 0x80082B68; // type:data rom:0x5DF68 +HudScript_Item_SweetShroom = 0x80082B98; // type:data rom:0x5DF98 +HudScript_Item_SweetShroom_disabled = 0x80082BC8; // type:data rom:0x5DFC8 +HudScript_Item_HealthyJuice = 0x80082BF8; // type:data rom:0x5DFF8 +HudScript_Item_HealthyJuice_disabled = 0x80082C28; // type:data rom:0x5E028 +HudScript_Item_BlandMeal = 0x80082C58; // type:data rom:0x5E058 +HudScript_Item_BlandMeal_disabled = 0x80082C88; // type:data rom:0x5E088 +HudScript_Item_YummyMeal = 0x80082CB8; // type:data rom:0x5E0B8 +HudScript_Item_YummyMeal_disabled = 0x80082CE8; // type:data rom:0x5E0E8 +HudScript_Item_DeluxeFeast = 0x80082D18; // type:data rom:0x5E118 +HudScript_Item_DeluxeFeast_disabled = 0x80082D48; // type:data rom:0x5E148 +HudScript_Item_SpecialShake = 0x80082D78; // type:data rom:0x5E178 +HudScript_Item_SpecialShake_disabled = 0x80082DA8; // type:data rom:0x5E1A8 +HudScript_Item_BigCookie = 0x80082DD8; // type:data rom:0x5E1D8 +HudScript_Item_BigCookie_disabled = 0x80082E08; // type:data rom:0x5E208 +HudScript_Item_Cake = 0x80082E38; // type:data rom:0x5E238 +HudScript_Item_Cake_disabled = 0x80082E68; // type:data rom:0x5E268 +HudScript_Item_Mistake = 0x80082E98; // type:data rom:0x5E298 +HudScript_Item_Mistake_disabled = 0x80082EC8; // type:data rom:0x5E2C8 +HudScript_Item_KoopaTea = 0x80082EF8; // type:data rom:0x5E2F8 +HudScript_Item_KoopaTea_disabled = 0x80082F28; // type:data rom:0x5E328 +HudScript_Item_HoneySuper = 0x80082F58; // type:data rom:0x5E358 +HudScript_Item_HoneySuper_disabled = 0x80082F88; // type:data rom:0x5E388 +HudScript_Item_MapleSuper = 0x80082FB8; // type:data rom:0x5E3B8 +HudScript_Item_MapleSuper_disabled = 0x80082FE8; // type:data rom:0x5E3E8 +HudScript_Item_JellySuper = 0x80083018; // type:data rom:0x5E418 +HudScript_Item_JellySuper_disabled = 0x80083048; // type:data rom:0x5E448 +HudScript_Item_Spaghetti = 0x80083078; // type:data rom:0x5E478 +HudScript_Item_Spaghetti_disabled = 0x800830A8; // type:data rom:0x5E4A8 +HudScript_Item_EggMissile = 0x800830D8; // type:data rom:0x5E4D8 +HudScript_Item_EggMissile_disabled = 0x80083108; // type:data rom:0x5E508 +HudScript_Item_FriedEgg = 0x80083138; // type:data rom:0x5E538 +HudScript_Item_FriedEgg_disabled = 0x80083168; // type:data rom:0x5E568 +HudScript_Item_HoneyShroom = 0x80083198; // type:data rom:0x5E598 +HudScript_Item_HoneyShroom_disabled = 0x800831C8; // type:data rom:0x5E5C8 +HudScript_Item_HoneyCandy = 0x800831F8; // type:data rom:0x5E5F8 +HudScript_Item_HoneyCandy_disabled = 0x80083228; // type:data rom:0x5E628 +HudScript_Item_ElectroPop = 0x80083258; // type:data rom:0x5E658 +HudScript_Item_ElectroPop_disabled = 0x80083288; // type:data rom:0x5E688 +HudScript_Item_FirePop = 0x800832B8; // type:data rom:0x5E6B8 +HudScript_Item_FirePop_disabled = 0x800832E8; // type:data rom:0x5E6E8 +HudScript_Item_LimeCandy = 0x80083318; // type:data rom:0x5E718 +HudScript_Item_LimeCandy_disabled = 0x80083348; // type:data rom:0x5E748 +HudScript_Item_CocoPop = 0x80083378; // type:data rom:0x5E778 +HudScript_Item_CocoPop_disabled = 0x800833A8; // type:data rom:0x5E7A8 +HudScript_Item_LemonCandy = 0x800833D8; // type:data rom:0x5E7D8 +HudScript_Item_LemonCandy_disabled = 0x80083408; // type:data rom:0x5E808 +HudScript_Item_JellyPop = 0x80083438; // type:data rom:0x5E838 +HudScript_Item_JellyPop_disabled = 0x80083468; // type:data rom:0x5E868 +HudScript_Item_StrangeCake = 0x80083498; // type:data rom:0x5E898 +HudScript_Item_StrangeCake_disabled = 0x800834C8; // type:data rom:0x5E8C8 +HudScript_Item_KookyCookie = 0x800834F8; // type:data rom:0x5E8F8 +HudScript_Item_KookyCookie_disabled = 0x80083528; // type:data rom:0x5E928 +HudScript_Item_FrozenFries = 0x80083558; // type:data rom:0x5E958 +HudScript_Item_FrozenFries_disabled = 0x80083588; // type:data rom:0x5E988 +HudScript_Item_PotatoSalad = 0x800835B8; // type:data rom:0x5E9B8 +HudScript_Item_PotatoSalad_disabled = 0x800835E8; // type:data rom:0x5E9E8 +HudScript_Item_NuttyCake = 0x80083618; // type:data rom:0x5EA18 +HudScript_Item_NuttyCake_disabled = 0x80083648; // type:data rom:0x5EA48 +HudScript_Item_MapleShroom = 0x80083678; // type:data rom:0x5EA78 +HudScript_Item_MapleShroom_disabled = 0x800836A8; // type:data rom:0x5EAA8 +HudScript_Item_BoiledEgg = 0x800836D8; // type:data rom:0x5EAD8 +HudScript_Item_BoiledEgg_disabled = 0x80083708; // type:data rom:0x5EB08 +HudScript_Item_YoshiCookie = 0x80083738; // type:data rom:0x5EB38 +HudScript_Item_YoshiCookie_disabled = 0x80083768; // type:data rom:0x5EB68 +HudScript_Item_JellyShroom = 0x80083798; // type:data rom:0x5EB98 +HudScript_Item_JellyShroom_disabled = 0x800837C8; // type:data rom:0x5EBC8 +HudScript_Item_Unused_02C = 0x800837F8; // type:data rom:0x5EBF8 +HudScript_Item_Unused_02C_disabled = 0x80083828; // type:data rom:0x5EC28 +HudScript_Item_Unused_02D = 0x80083858; // type:data rom:0x5EC58 +HudScript_Item_Unused_02D_disabled = 0x80083888; // type:data rom:0x5EC88 +HudScript_Item_Unused_02E = 0x800838B8; // type:data rom:0x5ECB8 +HudScript_Item_Unused_02E_disabled = 0x800838E8; // type:data rom:0x5ECE8 +HudScript_Item_Unused_02F = 0x80083918; // type:data rom:0x5ED18 +HudScript_Item_Unused_02F_disabled = 0x80083948; // type:data rom:0x5ED48 +HudScript_Item_Unused_030 = 0x80083978; // type:data rom:0x5ED78 +HudScript_Item_Unused_030_disabled = 0x800839A8; // type:data rom:0x5EDA8 +HudScript_Item_SpinSmash = 0x800839D8; // type:data rom:0x5EDD8 +HudScript_Item_SpinSmash_disabled = 0x80083A08; // type:data rom:0x5EE08 +HudScript_Item_Multibounce = 0x80083A38; // type:data rom:0x5EE38 +HudScript_Item_Multibounce_disabled = 0x80083A68; // type:data rom:0x5EE68 +HudScript_Item_PowerPlus = 0x80083A98; // type:data rom:0x5EE98 +HudScript_Item_PowerPlus_disabled = 0x80083AC8; // type:data rom:0x5EEC8 +HudScript_Item_DodgeMaster = 0x80083AF8; // type:data rom:0x5EEF8 +HudScript_Item_DodgeMaster_disabled = 0x80083B28; // type:data rom:0x5EF28 +HudScript_Item_PowerBounce = 0x80083B58; // type:data rom:0x5EF58 +HudScript_Item_PowerBounce_disabled = 0x80083B88; // type:data rom:0x5EF88 +HudScript_Item_SpikeShield = 0x80083BB8; // type:data rom:0x5EFB8 +HudScript_Item_SpikeShield_disabled = 0x80083BE8; // type:data rom:0x5EFE8 +HudScript_Item_FirstAttack = 0x80083C18; // type:data rom:0x5F018 +HudScript_Item_FirstAttack_disabled = 0x80083C48; // type:data rom:0x5F048 +HudScript_Item_HPPlus = 0x80083C78; // type:data rom:0x5F078 +HudScript_Item_HPPlus_disabled = 0x80083CA8; // type:data rom:0x5F0A8 +HudScript_Item_QuakeHammer = 0x80083CD8; // type:data rom:0x5F0D8 +HudScript_Item_QuakeHammer_disabled = 0x80083D08; // type:data rom:0x5F108 +HudScript_Item_DoubleDip = 0x80083D38; // type:data rom:0x5F138 +HudScript_Item_DoubleDip_disabled = 0x80083D68; // type:data rom:0x5F168 +HudScript_Item_PowerQuake = 0x80083D98; // type:data rom:0x5F198 +HudScript_Item_PowerQuake_disabled = 0x80083DC8; // type:data rom:0x5F1C8 +HudScript_Item_MegaQuake = 0x80083DF8; // type:data rom:0x5F1F8 +HudScript_Item_MegaQuake_disabled = 0x80083E28; // type:data rom:0x5F228 +HudScript_Item_SleepStomp = 0x80083E58; // type:data rom:0x5F258 +HudScript_Item_SleepStomp_disabled = 0x80083E88; // type:data rom:0x5F288 +HudScript_Item_SmashCharge = 0x80083EB8; // type:data rom:0x5F2B8 +HudScript_Item_SmashCharge_disabled = 0x80083EE8; // type:data rom:0x5F2E8 +HudScript_Item_SSmashChg = 0x80083F18; // type:data rom:0x5F318 +HudScript_Item_SSmashChg_disabled = 0x80083F48; // type:data rom:0x5F348 +HudScript_Item_AutoSmash = 0x80083F78; // type:data rom:0x5F378 +HudScript_Item_AutoSmash_disabled = 0x80083FA8; // type:data rom:0x5F3A8 +HudScript_Item_FireShield = 0x80083FD8; // type:data rom:0x5F3D8 +HudScript_Item_FireShield_disabled = 0x80084008; // type:data rom:0x5F408 +HudScript_Item_JumpCharge = 0x80084038; // type:data rom:0x5F438 +HudScript_Item_JumpCharge_disabled = 0x80084068; // type:data rom:0x5F468 +HudScript_Item_SJumpChg = 0x80084098; // type:data rom:0x5F498 +HudScript_Item_SJumpChg_disabled = 0x800840C8; // type:data rom:0x5F4C8 +HudScript_Item_AutoJump = 0x800840F8; // type:data rom:0x5F4F8 +HudScript_Item_AutoJump_disabled = 0x80084128; // type:data rom:0x5F528 +HudScript_Item_DDownPound = 0x80084158; // type:data rom:0x5F558 +HudScript_Item_DDownPound_disabled = 0x80084188; // type:data rom:0x5F588 +HudScript_Item_AutoMultibounce = 0x800841B8; // type:data rom:0x5F5B8 +HudScript_Item_AutoMultibounce_disabled = 0x800841E8; // type:data rom:0x5F5E8 +HudScript_Item_DizzyStomp = 0x80084218; // type:data rom:0x5F618 +HudScript_Item_DizzyStomp_disabled = 0x80084248; // type:data rom:0x5F648 +HudScript_Item_HammerThrow = 0x80084278; // type:data rom:0x5F678 +HudScript_Item_HammerThrow_disabled = 0x800842A8; // type:data rom:0x5F6A8 +HudScript_Item_SmashCharge0 = 0x800842D8; // type:data rom:0x5F6D8 +HudScript_Item_SmashCharge0_disabled = 0x80084308; // type:data rom:0x5F708 +HudScript_Item_PrettyLucky = 0x80084338; // type:data rom:0x5F738 +HudScript_Item_PrettyLucky_disabled = 0x80084368; // type:data rom:0x5F768 +HudScript_Item_FeelingFine = 0x80084398; // type:data rom:0x5F798 +HudScript_Item_FeelingFine_disabled = 0x800843C8; // type:data rom:0x5F7C8 +HudScript_Item_AttackFXA = 0x800843F8; // type:data rom:0x5F7F8 +HudScript_Item_AttackFXA_disabled = 0x80084428; // type:data rom:0x5F828 +HudScript_Item_AllorNothing = 0x80084458; // type:data rom:0x5F858 +HudScript_Item_AllorNothing_disabled = 0x80084488; // type:data rom:0x5F888 +HudScript_Item_HPDrain = 0x800844B8; // type:data rom:0x5F8B8 +HudScript_Item_HPDrain_disabled = 0x800844E8; // type:data rom:0x5F8E8 +HudScript_Item_JumpCharge0 = 0x80084518; // type:data rom:0x5F918 +HudScript_Item_JumpCharge0_disabled = 0x80084548; // type:data rom:0x5F948 +HudScript_Item_SlowGo = 0x80084578; // type:data rom:0x5F978 +HudScript_Item_SlowGo_disabled = 0x800845A8; // type:data rom:0x5F9A8 +HudScript_Item_FPPlus = 0x800845D8; // type:data rom:0x5F9D8 +HudScript_Item_FPPlus_disabled = 0x80084608; // type:data rom:0x5FA08 +HudScript_Item_MegaRush = 0x80084638; // type:data rom:0x5FA38 +HudScript_Item_MegaRush_disabled = 0x80084668; // type:data rom:0x5FA68 +HudScript_Item_IcePower = 0x80084698; // type:data rom:0x5FA98 +HudScript_Item_IcePower_disabled = 0x800846C8; // type:data rom:0x5FAC8 +HudScript_Item_DefendPlus = 0x800846F8; // type:data rom:0x5FAF8 +HudScript_Item_DefendPlus_disabled = 0x80084728; // type:data rom:0x5FB28 +HudScript_Item_PayOff = 0x80084758; // type:data rom:0x5FB58 +HudScript_Item_PayOff_disabled = 0x80084788; // type:data rom:0x5FB88 +HudScript_Item_MoneyMoney = 0x800847B8; // type:data rom:0x5FBB8 +HudScript_Item_MoneyMoney_disabled = 0x800847E8; // type:data rom:0x5FBE8 +HudScript_Item_ChillOut = 0x80084818; // type:data rom:0x5FC18 +HudScript_Item_ChillOut_disabled = 0x80084848; // type:data rom:0x5FC48 +HudScript_Item_HappyHeart = 0x80084878; // type:data rom:0x5FC78 +HudScript_Item_HappyHeart_disabled = 0x800848A8; // type:data rom:0x5FCA8 +HudScript_Item_ZapTap = 0x800848D8; // type:data rom:0x5FCD8 +HudScript_Item_ZapTap_disabled = 0x80084908; // type:data rom:0x5FD08 +HudScript_Item_Berserker = 0x80084938; // type:data rom:0x5FD38 +HudScript_Item_Berserker_disabled = 0x80084968; // type:data rom:0x5FD68 +HudScript_Item_RightOn = 0x80084998; // type:data rom:0x5FD98 +HudScript_Item_RightOn_disabled = 0x800849C8; // type:data rom:0x5FDC8 +HudScript_Item_RunawayPay = 0x800849F8; // type:data rom:0x5FDF8 +HudScript_Item_RunawayPay_disabled = 0x80084A28; // type:data rom:0x5FE28 +HudScript_Item_Refund = 0x80084A58; // type:data rom:0x5FE58 +HudScript_Item_Refund_disabled = 0x80084A88; // type:data rom:0x5FE88 +HudScript_Item_FlowerSaver = 0x80084AB8; // type:data rom:0x5FEB8 +HudScript_Item_FlowerSaver_disabled = 0x80084AE8; // type:data rom:0x5FEE8 +HudScript_Item_TripleDip = 0x80084B18; // type:data rom:0x5FF18 +HudScript_Item_TripleDip_disabled = 0x80084B48; // type:data rom:0x5FF48 +HudScript_Item_FlowerFanatic = 0x80084B78; // type:data rom:0x5FF78 +HudScript_Item_FlowerFanatic_disabled = 0x80084BA8; // type:data rom:0x5FFA8 +HudScript_Item_PowerJump = 0x80084BD8; // type:data rom:0x5FFD8 +HudScript_Item_PowerJump_disabled = 0x80084C08; // type:data rom:0x60008 +HudScript_Item_SuperJump = 0x80084C38; // type:data rom:0x60038 +HudScript_Item_SuperJump_disabled = 0x80084C68; // type:data rom:0x60068 +HudScript_Item_MegaJump = 0x80084C98; // type:data rom:0x60098 +HudScript_Item_MegaJump_disabled = 0x80084CC8; // type:data rom:0x600C8 +HudScript_Item_PowerSmash1 = 0x80084CF8; // type:data rom:0x600F8 +HudScript_Item_PowerSmash1_disabled = 0x80084D28; // type:data rom:0x60128 +HudScript_Item_SuperSmash = 0x80084D58; // type:data rom:0x60158 +HudScript_Item_SuperSmash_disabled = 0x80084D88; // type:data rom:0x60188 +HudScript_Item_MegaSmash = 0x80084DB8; // type:data rom:0x601B8 +HudScript_Item_MegaSmash_disabled = 0x80084DE8; // type:data rom:0x601E8 +HudScript_Item_LuckyDay = 0x80084E18; // type:data rom:0x60218 +HudScript_Item_LuckyDay_disabled = 0x80084E48; // type:data rom:0x60248 +HudScript_Item_MegaHPDrain = 0x80084E78; // type:data rom:0x60278 +HudScript_Item_MegaHPDrain_disabled = 0x80084EA8; // type:data rom:0x602A8 +HudScript_Item_BumpAttack = 0x80084ED8; // type:data rom:0x602D8 +HudScript_Item_BumpAttack_disabled = 0x80084F08; // type:data rom:0x60308 +HudScript_Item_PUpDDown = 0x80084F38; // type:data rom:0x60338 +HudScript_Item_PUpDDown_disabled = 0x80084F68; // type:data rom:0x60368 +HudScript_Item_PDownDUp = 0x80084F98; // type:data rom:0x60398 +HudScript_Item_PDownDUp_disabled = 0x80084FC8; // type:data rom:0x603C8 +HudScript_Item_HeartFinder = 0x80084FF8; // type:data rom:0x603F8 +HudScript_Item_HeartFinder_disabled = 0x80085028; // type:data rom:0x60428 +HudScript_Item_FlowerFinder = 0x80085058; // type:data rom:0x60458 +HudScript_Item_FlowerFinder_disabled = 0x80085088; // type:data rom:0x60488 +HudScript_Item_DizzyAttack = 0x800850B8; // type:data rom:0x604B8 +HudScript_Item_DizzyAttack_disabled = 0x800850E8; // type:data rom:0x604E8 +HudScript_Item_SpeedySpin = 0x80085118; // type:data rom:0x60518 +HudScript_Item_SpeedySpin_disabled = 0x80085148; // type:data rom:0x60548 +HudScript_Item_SpinAttack = 0x80085178; // type:data rom:0x60578 +HudScript_Item_SpinAttack_disabled = 0x800851A8; // type:data rom:0x605A8 +HudScript_Item_ISpy = 0x800851D8; // type:data rom:0x605D8 +HudScript_Item_ISpy_disabled = 0x80085208; // type:data rom:0x60608 +HudScript_Item_PowerRush = 0x80085238; // type:data rom:0x60638 +HudScript_Item_PowerRush_disabled = 0x80085268; // type:data rom:0x60668 +HudScript_Item_LastStand = 0x80085298; // type:data rom:0x60698 +HudScript_Item_LastStand_disabled = 0x800852C8; // type:data rom:0x606C8 +HudScript_Item_CloseCall = 0x800852F8; // type:data rom:0x606F8 +HudScript_Item_CloseCall_disabled = 0x80085328; // type:data rom:0x60728 +HudScript_Item_CrazyHeart = 0x80085358; // type:data rom:0x60758 +HudScript_Item_CrazyHeart_disabled = 0x80085388; // type:data rom:0x60788 +HudScript_Item_Unused_0D5 = 0x800853B8; // type:data rom:0x607B8 +HudScript_Item_Unused_0D5_disabled = 0x800853E8; // type:data rom:0x607E8 +HudScript_Item_Unused_0D6 = 0x80085418; // type:data rom:0x60818 +HudScript_Item_Unused_0D6_disabled = 0x80085448; // type:data rom:0x60848 +HudScript_Item_Unused_0D7 = 0x80085478; // type:data rom:0x60878 +HudScript_Item_Unused_0D7_disabled = 0x800854A8; // type:data rom:0x608A8 +HudScript_Item_ShrinkSmash = 0x800854D8; // type:data rom:0x608D8 +HudScript_Item_ShrinkSmash_disabled = 0x80085508; // type:data rom:0x60908 +HudScript_Item_ShrinkStomp = 0x80085538; // type:data rom:0x60938 +HudScript_Item_ShrinkStomp_disabled = 0x80085568; // type:data rom:0x60968 +HudScript_Item_DDownJump = 0x80085598; // type:data rom:0x60998 +HudScript_Item_DDownJump_disabled = 0x800855C8; // type:data rom:0x609C8 +HudScript_Item_DamageDodge = 0x800855F8; // type:data rom:0x609F8 +HudScript_Item_DamageDodge_disabled = 0x80085628; // type:data rom:0x60A28 +HudScript_Item_EarthquakeJump = 0x80085658; // type:data rom:0x60A58 +HudScript_Item_EarthquakeJump_disabled = 0x80085688; // type:data rom:0x60A88 +HudScript_Item_HappyFlower = 0x800856B8; // type:data rom:0x60AB8 +HudScript_Item_HappyFlower_disabled = 0x800856E8; // type:data rom:0x60AE8 +HudScript_Item_Unused_0DE = 0x80085718; // type:data rom:0x60B18 +HudScript_Item_Unused_0DE_disabled = 0x80085748; // type:data rom:0x60B48 +HudScript_Item_Unused_0DF = 0x80085778; // type:data rom:0x60B78 +HudScript_Item_Unused_0DF_disabled = 0x800857A8; // type:data rom:0x60BA8 +HudScript_Item_DeepFocus = 0x800857D8; // type:data rom:0x60BD8 +HudScript_Item_DeepFocus_disabled = 0x80085808; // type:data rom:0x60C08 +HudScript_Item_SuperFocus = 0x80085838; // type:data rom:0x60C38 +HudScript_Item_SuperFocus_disabled = 0x80085868; // type:data rom:0x60C68 +HudScript_Item_Kaiden = 0x80085898; // type:data rom:0x60C98 +HudScript_Item_Kaiden_disabled = 0x800858C8; // type:data rom:0x60CC8 +HudScript_Item_QuickChange = 0x800858F8; // type:data rom:0x60CF8 +HudScript_Item_QuickChange_disabled = 0x80085928; // type:data rom:0x60D28 +HudScript_Item_Unused_0E4 = 0x80085958; // type:data rom:0x60D58 +HudScript_Item_Unused_0E4_disabled = 0x80085988; // type:data rom:0x60D88 +HudScript_Item_Unused_0E5 = 0x800859B8; // type:data rom:0x60DB8 +HudScript_Item_Unused_0E5_disabled = 0x800859E8; // type:data rom:0x60DE8 +HudScript_Item_Unused_0E6 = 0x80085A18; // type:data rom:0x60E18 +HudScript_Item_Unused_0E6_disabled = 0x80085A48; // type:data rom:0x60E48 +HudScript_Item_Unused_0E7 = 0x80085A78; // type:data rom:0x60E78 +HudScript_Item_Unused_0E7_disabled = 0x80085AA8; // type:data rom:0x60EA8 +HudScript_Item_Peekaboo = 0x80085AD8; // type:data rom:0x60ED8 +HudScript_Item_Peekaboo_disabled = 0x80085B08; // type:data rom:0x60F08 +HudScript_Item_GroupFocus = 0x80085B38; // type:data rom:0x60F38 +HudScript_Item_GroupFocus_disabled = 0x80085B68; // type:data rom:0x60F68 +HudScript_Item_AttackFXD = 0x80085B98; // type:data rom:0x60F98 +HudScript_Item_AttackFXD_disabled = 0x80085BC8; // type:data rom:0x60FC8 +HudScript_Item_AttackFXB = 0x80085BF8; // type:data rom:0x60FF8 +HudScript_Item_AttackFXB_disabled = 0x80085C28; // type:data rom:0x61028 +HudScript_Item_AttackFXE = 0x80085C58; // type:data rom:0x61058 +HudScript_Item_AttackFXE_disabled = 0x80085C88; // type:data rom:0x61088 +HudScript_Item_AttackFXC = 0x80085CB8; // type:data rom:0x610B8 +HudScript_Item_AttackFXC_disabled = 0x80085CE8; // type:data rom:0x610E8 +HudScript_Item_AttackFXF = 0x80085D18; // type:data rom:0x61118 +HudScript_Item_AttackFXF_disabled = 0x80085D48; // type:data rom:0x61148 +HudScript_Item_Unused_0EF = 0x80085D78; // type:data rom:0x61178 +HudScript_Item_Unused_0EF_disabled = 0x80085DA8; // type:data rom:0x611A8 +HudScript_Item_HealthyHealthy = 0x80085DD8; // type:data rom:0x611D8 +HudScript_Item_HealthyHealthy_disabled = 0x80085E08; // type:data rom:0x61208 +HudScript_Item_Unused_0F1 = 0x80085E38; // type:data rom:0x61238 +HudScript_Item_Unused_0F1_disabled = 0x80085E68; // type:data rom:0x61268 +HudScript_Item_Unused_0F2 = 0x80085E98; // type:data rom:0x61298 +HudScript_Item_Unused_0F2_disabled = 0x80085EC8; // type:data rom:0x612C8 +HudScript_Item_Unused_0F3 = 0x80085EF8; // type:data rom:0x612F8 +HudScript_Item_Unused_0F3_disabled = 0x80085F28; // type:data rom:0x61328 +HudScript_Item_Unused_0F4 = 0x80085F58; // type:data rom:0x61358 +HudScript_Item_Unused_0F4_disabled = 0x80085F88; // type:data rom:0x61388 +HudScript_Item_Unused_0F5 = 0x80085FB8; // type:data rom:0x613B8 +HudScript_Item_Unused_0F5_disabled = 0x80085FE8; // type:data rom:0x613E8 +HudScript_Item_Unused_0F6 = 0x80086018; // type:data rom:0x61418 +HudScript_Item_Unused_0F6_disabled = 0x80086048; // type:data rom:0x61448 +HudScript_Item_Unused_0F7 = 0x80086078; // type:data rom:0x61478 +HudScript_Item_Unused_0F7_disabled = 0x800860A8; // type:data rom:0x614A8 +HudScript_Item_FireFlower = 0x800860D8; // type:data rom:0x614D8 +HudScript_Item_FireFlower_disabled = 0x80086108; // type:data rom:0x61508 +HudScript_Item_SnowmanDoll = 0x80086138; // type:data rom:0x61538 +HudScript_Item_SnowmanDoll_disabled = 0x80086168; // type:data rom:0x61568 +HudScript_Item_ThunderRage = 0x80086198; // type:data rom:0x61598 +HudScript_Item_ThunderRage_disabled = 0x800861C8; // type:data rom:0x615C8 +HudScript_Item_ThunderBolt = 0x800861F8; // type:data rom:0x615F8 +HudScript_Item_ThunderBolt_disabled = 0x80086228; // type:data rom:0x61628 +HudScript_Item_ShootingStar = 0x80086258; // type:data rom:0x61658 +HudScript_Item_ShootingStar_disabled = 0x80086288; // type:data rom:0x61688 +HudScript_Item_DustyHammer = 0x800862B8; // type:data rom:0x616B8 +HudScript_Item_DustyHammer_disabled = 0x800862E8; // type:data rom:0x616E8 +HudScript_Item_Pebble = 0x80086318; // type:data rom:0x61718 +HudScript_Item_Pebble_disabled = 0x80086348; // type:data rom:0x61748 +HudScript_Item_Unused_127 = 0x80086378; // type:data rom:0x61778 +HudScript_Item_Unused_127_disabled = 0x800863A8; // type:data rom:0x617A8 +HudScript_Item_StoneCap = 0x800863D8; // type:data rom:0x617D8 +HudScript_Item_StoneCap_disabled = 0x80086408; // type:data rom:0x61808 +HudScript_Item_VoltShroom = 0x80086438; // type:data rom:0x61838 +HudScript_Item_VoltShroom_disabled = 0x80086468; // type:data rom:0x61868 +HudScript_Item_PowerStar = 0x80086498; // type:data rom:0x61898 +HudScript_Item_PowerStar_disabled = 0x800864C8; // type:data rom:0x618C8 +HudScript_Item_Parasol = 0x800864F8; // type:data rom:0x618F8 +HudScript_Item_Parasol_disabled = 0x80086528; // type:data rom:0x61928 +HudScript_Item_MagicMirror = 0x80086558; // type:data rom:0x61958 +HudScript_Item_MagicMirror_disabled = 0x80086588; // type:data rom:0x61988 +HudScript_Item_Unused_12D = 0x800865B8; // type:data rom:0x619B8 +HudScript_Item_Unused_12D_disabled = 0x800865E8; // type:data rom:0x619E8 +HudScript_Item_Unused_12E = 0x80086618; // type:data rom:0x61A18 +HudScript_Item_Unused_12E_disabled = 0x80086648; // type:data rom:0x61A48 +HudScript_Item_Unused_12F = 0x80086678; // type:data rom:0x61A78 +HudScript_Item_Unused_12F_disabled = 0x800866A8; // type:data rom:0x61AA8 +HudScript_Item_Mushroom = 0x800866D8; // type:data rom:0x61AD8 +HudScript_Item_Mushroom_disabled = 0x80086708; // type:data rom:0x61B08 +HudScript_Item_SuperShroom = 0x80086738; // type:data rom:0x61B38 +HudScript_Item_SuperShroom_disabled = 0x80086768; // type:data rom:0x61B68 +HudScript_Item_UltraShroom = 0x80086798; // type:data rom:0x61B98 +HudScript_Item_UltraShroom_disabled = 0x800867C8; // type:data rom:0x61BC8 +HudScript_Item_LifeShroom = 0x800867F8; // type:data rom:0x61BF8 +HudScript_Item_LifeShroom_disabled = 0x80086828; // type:data rom:0x61C28 +HudScript_Item_DriedShroom = 0x80086858; // type:data rom:0x61C58 +HudScript_Item_DriedShroom_disabled = 0x80086888; // type:data rom:0x61C88 +HudScript_Item_TastyTonic = 0x800868B8; // type:data rom:0x61CB8 +HudScript_Item_TastyTonic_disabled = 0x800868E8; // type:data rom:0x61CE8 +HudScript_Item_SuperSoda = 0x80086918; // type:data rom:0x61D18 +HudScript_Item_SuperSoda_disabled = 0x80086948; // type:data rom:0x61D48 +HudScript_Item_BlueBerry = 0x80086978; // type:data rom:0x61D78 +HudScript_Item_BlueBerry_disabled = 0x800869A8; // type:data rom:0x61DA8 +HudScript_Item_RedBerry = 0x800869D8; // type:data rom:0x61DD8 +HudScript_Item_RedBerry_disabled = 0x80086A08; // type:data rom:0x61E08 +HudScript_Item_YellowBerry = 0x80086A38; // type:data rom:0x61E38 +HudScript_Item_YellowBerry_disabled = 0x80086A68; // type:data rom:0x61E68 +HudScript_Item_BubbleBerry = 0x80086A98; // type:data rom:0x61E98 +HudScript_Item_BubbleBerry_disabled = 0x80086AC8; // type:data rom:0x61EC8 +HudScript_Item_Goomnut = 0x80086AF8; // type:data rom:0x61EF8 +HudScript_Item_Goomnut_disabled = 0x80086B28; // type:data rom:0x61F28 +HudScript_Item_KoopaLeaf = 0x80086B58; // type:data rom:0x61F58 +HudScript_Item_KoopaLeaf_disabled = 0x80086B88; // type:data rom:0x61F88 +HudScript_Item_DriedPasta = 0x80086BB8; // type:data rom:0x61FB8 +HudScript_Item_DriedPasta_disabled = 0x80086BE8; // type:data rom:0x61FE8 +HudScript_Item_Lime = 0x80086C18; // type:data rom:0x62018 +HudScript_Item_Lime_disabled = 0x80086C48; // type:data rom:0x62048 +HudScript_Item_Lemon = 0x80086C78; // type:data rom:0x62078 +HudScript_Item_Lemon_disabled = 0x80086CA8; // type:data rom:0x620A8 +HudScript_Item_DriedFruit = 0x80086CD8; // type:data rom:0x620D8 +HudScript_Item_DriedFruit_disabled = 0x80086D08; // type:data rom:0x62108 +HudScript_Item_StrangeLeaf = 0x80086D38; // type:data rom:0x62138 +HudScript_Item_StrangeLeaf_disabled = 0x80086D68; // type:data rom:0x62168 +HudScript_Item_CakeMix = 0x80086D98; // type:data rom:0x62198 +HudScript_Item_CakeMix_disabled = 0x80086DC8; // type:data rom:0x621C8 +HudScript_Item_Egg = 0x80086DF8; // type:data rom:0x621F8 +HudScript_Item_Egg_disabled = 0x80086E28; // type:data rom:0x62228 +HudScript_Item_Coconut = 0x80086E58; // type:data rom:0x62258 +HudScript_Item_Coconut_disabled = 0x80086E88; // type:data rom:0x62288 +HudScript_Item_Melon = 0x80086EB8; // type:data rom:0x622B8 +HudScript_Item_Melon_disabled = 0x80086EE8; // type:data rom:0x622E8 +HudScript_Item_StinkyHerb = 0x80086F18; // type:data rom:0x62318 +HudScript_Item_StinkyHerb_disabled = 0x80086F48; // type:data rom:0x62348 +HudScript_Item_IcedPotato = 0x80086F78; // type:data rom:0x62378 +HudScript_Item_IcedPotato_disabled = 0x80086FA8; // type:data rom:0x623A8 +HudScript_Item_HoneySyrup = 0x80086FD8; // type:data rom:0x623D8 +HudScript_Item_HoneySyrup_disabled = 0x80087008; // type:data rom:0x62408 +HudScript_Item_MapleSyrup = 0x80087038; // type:data rom:0x62438 +HudScript_Item_MapleSyrup_disabled = 0x80087068; // type:data rom:0x62468 +HudScript_Item_JamminJelly = 0x80087098; // type:data rom:0x62498 +HudScript_Item_JamminJelly_disabled = 0x800870C8; // type:data rom:0x624C8 +HudScript_Item_WhackasBump = 0x800870F8; // type:data rom:0x624F8 +HudScript_Item_WhackasBump_disabled = 0x80087128; // type:data rom:0x62528 +HudScript_Item_Apple = 0x80087158; // type:data rom:0x62558 +HudScript_Item_Apple_disabled = 0x80087188; // type:data rom:0x62588 +HudScript_Item_BakingSalt = 0x800871B8; // type:data rom:0x625B8 +HudScript_Item_BakingSalt_disabled = 0x800871E8; // type:data rom:0x625E8 +HudScript_Item_BakingSugar = 0x80087218; // type:data rom:0x62618 +HudScript_Item_BakingSugar_disabled = 0x80087248; // type:data rom:0x62648 +HudScript_Item_BakingEgg = 0x80087278; // type:data rom:0x62678 +HudScript_Item_BakingEgg_disabled = 0x800872A8; // type:data rom:0x626A8 +HudScript_Item_BakingCream = 0x800872D8; // type:data rom:0x626D8 +HudScript_Item_BakingCream_disabled = 0x80087308; // type:data rom:0x62708 +HudScript_Item_BakingStrawberry = 0x80087338; // type:data rom:0x62738 +HudScript_Item_BakingStrawberry_disabled = 0x80087368; // type:data rom:0x62768 +HudScript_Item_BakingButter = 0x80087398; // type:data rom:0x62798 +HudScript_Item_BakingButter_disabled = 0x800873C8; // type:data rom:0x627C8 +HudScript_Item_BakingCleanser = 0x800873F8; // type:data rom:0x627F8 +HudScript_Item_BakingCleanser_disabled = 0x80087428; // type:data rom:0x62828 +HudScript_Item_BakingWater = 0x80087458; // type:data rom:0x62858 +HudScript_Item_BakingWater_disabled = 0x80087488; // type:data rom:0x62888 +HudScript_Item_BakingFlour = 0x800874B8; // type:data rom:0x628B8 +HudScript_Item_BakingFlour_disabled = 0x800874E8; // type:data rom:0x628E8 +HudScript_Item_BakingMilk = 0x80087518; // type:data rom:0x62918 +HudScript_Item_BakingMilk_disabled = 0x80087548; // type:data rom:0x62948 +HudScript_Item_Unused_11F = 0x80087578; // type:data rom:0x62978 +HudScript_Item_Unused_11F_disabled = 0x800875A8; // type:data rom:0x629A8 +HudScript_Item_SleepySheep = 0x800875D8; // type:data rom:0x629D8 +HudScript_Item_SleepySheep_disabled = 0x80087608; // type:data rom:0x62A08 +HudScript_Item_XBandage = 0x80087638; // type:data rom:0x62A38 +HudScript_Item_XBandage_disabled = 0x80087668; // type:data rom:0x62A68 +HudScript_Item_POWBlock = 0x80087698; // type:data rom:0x62A98 +HudScript_Item_POWBlock_disabled = 0x800876C8; // type:data rom:0x62AC8 +HudScript_Item_HustleDrink = 0x800876F8; // type:data rom:0x62AF8 +HudScript_Item_HustleDrink_disabled = 0x80087728; // type:data rom:0x62B28 +HudScript_Item_StopWatch = 0x80087758; // type:data rom:0x62B58 +HudScript_Item_StopWatch_disabled = 0x80087788; // type:data rom:0x62B88 +HudScript_Item_DizzyDial = 0x800877B8; // type:data rom:0x62BB8 +HudScript_Item_DizzyDial_disabled = 0x800877E8; // type:data rom:0x62BE8 +HudScript_Item_Unused_136 = 0x80087818; // type:data rom:0x62C18 +HudScript_Item_Unused_136_disabled = 0x80087848; // type:data rom:0x62C48 +HudScript_Item_Unused_137 = 0x80087878; // type:data rom:0x62C78 +HudScript_Item_Unused_137_disabled = 0x800878A8; // type:data rom:0x62CA8 +pad_after_item_hudscripts = 0x800878D8; // type:data rom:0x62CD8 +gItemTable = 0x800878E0; // rom:0x62CE0 size:0x2D80 +gItemHudScripts = 0x8008A680; // type:data rom:0x65A80 +ItemScript_Jump = 0x8008B108; // type:data rom:0x66508 +ItemScript_CompleteCake = 0x8008B124; // type:data rom:0x66524 +ItemScript_CakeDone = 0x8008B140; // type:data rom:0x66540 +ItemScript_CakeBaked = 0x8008B15C; // type:data rom:0x6655C +ItemScript_CakePan = 0x8008B178; // type:data rom:0x66578 +ItemScript_CakeBatter = 0x8008B194; // type:data rom:0x66594 +ItemScript_CakeBowl = 0x8008B1B0; // type:data rom:0x665B0 +ItemScript_CakeMixed = 0x8008B1CC; // type:data rom:0x665CC +ItemScript_CakeIcing = 0x8008B1E8; // type:data rom:0x665E8 +ItemScript_CakeBerries = 0x8008B204; // type:data rom:0x66604 +ItemScript_Hammer1 = 0x8008B220; // type:data rom:0x66620 +ItemScript_Hammer2 = 0x8008B23C; // type:data rom:0x6663C +ItemScript_Hammer3 = 0x8008B258; // type:data rom:0x66658 +ItemScript_Boots1 = 0x8008B274; // type:data rom:0x66674 +ItemScript_Boots2 = 0x8008B290; // type:data rom:0x66690 +ItemScript_Boots3 = 0x8008B2AC; // type:data rom:0x666AC +ItemScript_Items = 0x8008B2C8; // type:data rom:0x666C8 +ItemScript_PleaseComeBack = 0x8008B2E4; // type:data rom:0x666E4 +ItemScript_ITEM_139 = 0x8008B304; // type:data rom:0x66704 +ItemScript_FrightJar = 0x8008B324; // type:data rom:0x66724 +ItemScript_Mystery = 0x8008B344; // type:data rom:0x66744 +ItemScript_RepelGel = 0x8008B364; // type:data rom:0x66764 +ItemScript_InsecticideHerb = 0x8008B384; // type:data rom:0x66784 +ItemScript_ITEM_13E = 0x8008B3A4; // type:data rom:0x667A4 +ItemScript_ITEM_13F = 0x8008B3C4; // type:data rom:0x667C4 +ItemScript_GearBoots1 = 0x8008B3E4; // type:data rom:0x667E4 +ItemScript_GearBoots2 = 0x8008B404; // type:data rom:0x66804 +ItemScript_GearBoots3 = 0x8008B424; // type:data rom:0x66824 +ItemScript_GearHammer1 = 0x8008B444; // type:data rom:0x66844 +ItemScript_GearHammer2 = 0x8008B464; // type:data rom:0x66864 +ItemScript_GearHammer3 = 0x8008B484; // type:data rom:0x66884 +ItemScript_LuckyStar = 0x8008B4A4; // type:data rom:0x668A4 +ItemScript_Map = 0x8008B4C4; // type:data rom:0x668C4 +ItemScript_KoopaFortressKey = 0x8008B4E4; // type:data rom:0x668E4 +ItemScript_RuinsKey = 0x8008B504; // type:data rom:0x66904 +ItemScript_TubbaCastleKey = 0x8008B524; // type:data rom:0x66924 +ItemScript_IcePalaceKey = 0x8008B544; // type:data rom:0x66944 +ItemScript_BowserCastleKey = 0x8008B564; // type:data rom:0x66964 +ItemScript_Dolly = 0x8008B584; // type:data rom:0x66984 +ItemScript_KooperShell = 0x8008B5A4; // type:data rom:0x669A4 +ItemScript_PulseStone = 0x8008B5C4; // type:data rom:0x669C4 +ItemScript_Artifact = 0x8008B5E4; // type:data rom:0x669E4 +ItemScript_AncientVase = 0x8008B604; // type:data rom:0x66A04 +ItemScript_RuinsStonePyramid = 0x8008B624; // type:data rom:0x66A24 +ItemScript_RuinsStoneStar = 0x8008B644; // type:data rom:0x66A44 +ItemScript_RuinsStoneMoon = 0x8008B664; // type:data rom:0x66A64 +ItemScript_ForestPass = 0x8008B684; // type:data rom:0x66A84 +ItemScript_BooRecordOutline = 0x8008B6A4; // type:data rom:0x66AA4 +ItemScript_BooRecord = 0x8008B6C4; // type:data rom:0x66AC4 +ItemScript_BooWeight = 0x8008B6E4; // type:data rom:0x66AE4 +ItemScript_BoosPortrait = 0x8008B704; // type:data rom:0x66B04 +ItemScript_MysticKey = 0x8008B724; // type:data rom:0x66B24 +ItemScript_StoreroomKey = 0x8008B744; // type:data rom:0x66B44 +ItemScript_ToyTrain = 0x8008B764; // type:data rom:0x66B64 +ItemScript_FryingPan = 0x8008B784; // type:data rom:0x66B84 +ItemScript_Dictionary = 0x8008B7A4; // type:data rom:0x66BA4 +ItemScript_MysteryNote = 0x8008B7C4; // type:data rom:0x66BC4 +ItemScript_SuspiciousNote = 0x8008B7E4; // type:data rom:0x66BE4 +ItemScript_MagicalSeed1 = 0x8008B804; // type:data rom:0x66C04 +ItemScript_MagicalSeed2 = 0x8008B824; // type:data rom:0x66C24 +ItemScript_MagicalSeed3 = 0x8008B844; // type:data rom:0x66C44 +ItemScript_MagicalSeed4 = 0x8008B864; // type:data rom:0x66C64 +ItemScript_CrystalBerry = 0x8008B884; // type:data rom:0x66C84 +ItemScript_WaterStone = 0x8008B8A4; // type:data rom:0x66CA4 +ItemScript_MagicalBean = 0x8008B8C4; // type:data rom:0x66CC4 +ItemScript_FertileSoil = 0x8008B8E4; // type:data rom:0x66CE4 +ItemScript_MiracleWater = 0x8008B904; // type:data rom:0x66D04 +ItemScript_UltraStone = 0x8008B924; // type:data rom:0x66D24 +ItemScript_ToadDoll = 0x8008B944; // type:data rom:0x66D44 +ItemScript_Calculator = 0x8008B964; // type:data rom:0x66D64 +ItemScript_Screwdriver = 0x8008B984; // type:data rom:0x66D84 +ItemScript_Cookbook = 0x8008B9A4; // type:data rom:0x66DA4 +ItemScript_JadeRaven = 0x8008B9C4; // type:data rom:0x66DC4 +ItemScript_SnowmanBucket = 0x8008B9E4; // type:data rom:0x66DE4 +ItemScript_SnowmanScarf = 0x8008BA04; // type:data rom:0x66E04 +ItemScript_RedKey = 0x8008BA24; // type:data rom:0x66E24 +ItemScript_BlueKey = 0x8008BA44; // type:data rom:0x66E44 +ItemScript_KootPackage = 0x8008BA64; // type:data rom:0x66E64 +ItemScript_KootRedJar = 0x8008BA84; // type:data rom:0x66E84 +ItemScript_Melody = 0x8008BAA4; // type:data rom:0x66EA4 +ItemScript_Lyrics = 0x8008BAC4; // type:data rom:0x66EC4 +ItemScript_Mailbag = 0x8008BAE4; // type:data rom:0x66EE4 +ItemScript_StarStone = 0x8008BB04; // type:data rom:0x66F04 +ItemScript_SneakyParasol = 0x8008BB24; // type:data rom:0x66F24 +ItemScript_PeachKey = 0x8008BB44; // type:data rom:0x66F44 +ItemScript_1DC210 = 0x8008BB64; // type:data rom:0x66F64 +ItemScript_1DC430 = 0x8008BB84; // type:data rom:0x66F84 +ItemScript_1DC650 = 0x8008BBA4; // type:data rom:0x66FA4 +ItemScript_1DC870 = 0x8008BBC4; // type:data rom:0x66FC4 +ItemScript_DojoCard1 = 0x8008BBE4; // type:data rom:0x66FE4 +ItemScript_DojoCard2 = 0x8008BC04; // type:data rom:0x67004 +ItemScript_DojoCard3 = 0x8008BC24; // type:data rom:0x67024 +ItemScript_DojoCard4 = 0x8008BC44; // type:data rom:0x67044 +ItemScript_DojoCard5 = 0x8008BC64; // type:data rom:0x67064 +ItemScript_CrystalBall = 0x8008BC84; // type:data rom:0x67084 +ItemScript_GoldCard = 0x8008BCA4; // type:data rom:0x670A4 +ItemScript_SilverCard = 0x8008BCC4; // type:data rom:0x670C4 +ItemScript_KootBook = 0x8008BCE4; // type:data rom:0x670E4 +ItemScript_KootTheTape = 0x8008BD04; // type:data rom:0x67104 +ItemScript_KootAutographMerluvlee = 0x8008BD24; // type:data rom:0x67124 +ItemScript_KootEmptyWallet = 0x8008BD44; // type:data rom:0x67144 +ItemScript_KootAutographLuigi = 0x8008BD64; // type:data rom:0x67164 +ItemScript_KootKoopaShell = 0x8008BD84; // type:data rom:0x67184 +ItemScript_KootOldPhoto = 0x8008BDA4; // type:data rom:0x671A4 +ItemScript_KootGlasses = 0x8008BDC4; // type:data rom:0x671C4 +ItemScript_Letter = 0x8008BDE4; // type:data rom:0x671E4 +ItemScript_Unused_089 = 0x8008BE04; // type:data rom:0x67204 +ItemScript_Unused_08A = 0x8008BE24; // type:data rom:0x67224 +ItemScript_Unused_08B = 0x8008BE44; // type:data rom:0x67244 +ItemScript_Unused_08C = 0x8008BE64; // type:data rom:0x67264 +ItemScript_Unused_08D = 0x8008BE84; // type:data rom:0x67284 +ItemScript_Unused_08E = 0x8008BEA4; // type:data rom:0x672A4 +ItemScript_Unused_08F = 0x8008BEC4; // type:data rom:0x672C4 +ItemScript_SpinSmash = 0x8008BEE4; // type:data rom:0x672E4 +ItemScript_Multibounce = 0x8008BF04; // type:data rom:0x67304 +ItemScript_PowerPlus = 0x8008BF24; // type:data rom:0x67324 +ItemScript_DodgeMaster = 0x8008BF44; // type:data rom:0x67344 +ItemScript_PowerBounce = 0x8008BF64; // type:data rom:0x67364 +ItemScript_SpikeShield = 0x8008BF84; // type:data rom:0x67384 +ItemScript_FirstAttack = 0x8008BFA4; // type:data rom:0x673A4 +ItemScript_HPPlus = 0x8008BFC4; // type:data rom:0x673C4 +ItemScript_QuakeHammer = 0x8008BFE4; // type:data rom:0x673E4 +ItemScript_DoubleDip = 0x8008C004; // type:data rom:0x67404 +ItemScript_PowerQuake = 0x8008C024; // type:data rom:0x67424 +ItemScript_MegaQuake = 0x8008C044; // type:data rom:0x67444 +ItemScript_SleepStomp = 0x8008C064; // type:data rom:0x67464 +ItemScript_SmashCharge = 0x8008C084; // type:data rom:0x67484 +ItemScript_SSmashChg = 0x8008C0A4; // type:data rom:0x674A4 +ItemScript_AutoSmash = 0x8008C0C4; // type:data rom:0x674C4 +ItemScript_FireShield = 0x8008C0E4; // type:data rom:0x674E4 +ItemScript_JumpCharge = 0x8008C104; // type:data rom:0x67504 +ItemScript_SJumpChg = 0x8008C124; // type:data rom:0x67524 +ItemScript_AutoJump = 0x8008C144; // type:data rom:0x67544 +ItemScript_DDownPound = 0x8008C164; // type:data rom:0x67564 +ItemScript_AutoMultibounce = 0x8008C184; // type:data rom:0x67584 +ItemScript_DizzyStomp = 0x8008C1A4; // type:data rom:0x675A4 +ItemScript_HammerThrow = 0x8008C1C4; // type:data rom:0x675C4 +ItemScript_SmashCharge0 = 0x8008C1E4; // type:data rom:0x675E4 +ItemScript_PrettyLucky = 0x8008C204; // type:data rom:0x67604 +ItemScript_FeelingFine = 0x8008C224; // type:data rom:0x67624 +ItemScript_AttackFXA = 0x8008C244; // type:data rom:0x67644 +ItemScript_AllorNothing = 0x8008C264; // type:data rom:0x67664 +ItemScript_HPDrain = 0x8008C284; // type:data rom:0x67684 +ItemScript_JumpCharge0 = 0x8008C2A4; // type:data rom:0x676A4 +ItemScript_SlowGo = 0x8008C2C4; // type:data rom:0x676C4 +ItemScript_FPPlus = 0x8008C2E4; // type:data rom:0x676E4 +ItemScript_MegaRush = 0x8008C304; // type:data rom:0x67704 +ItemScript_IcePower = 0x8008C324; // type:data rom:0x67724 +ItemScript_DefendPlus = 0x8008C344; // type:data rom:0x67744 +ItemScript_PayOff = 0x8008C364; // type:data rom:0x67764 +ItemScript_MoneyMoney = 0x8008C384; // type:data rom:0x67784 +ItemScript_ChillOut = 0x8008C3A4; // type:data rom:0x677A4 +ItemScript_HappyHeart = 0x8008C3C4; // type:data rom:0x677C4 +ItemScript_ZapTap = 0x8008C3E4; // type:data rom:0x677E4 +ItemScript_Berserker = 0x8008C404; // type:data rom:0x67804 +ItemScript_RightOn = 0x8008C424; // type:data rom:0x67824 +ItemScript_RunawayPay = 0x8008C444; // type:data rom:0x67844 +ItemScript_Refund = 0x8008C464; // type:data rom:0x67864 +ItemScript_FlowerSaver = 0x8008C484; // type:data rom:0x67884 +ItemScript_TripleDip = 0x8008C4A4; // type:data rom:0x678A4 +ItemScript_FlowerFanatic = 0x8008C4C4; // type:data rom:0x678C4 +ItemScript_PowerJump = 0x8008C4E4; // type:data rom:0x678E4 +ItemScript_SuperJump = 0x8008C504; // type:data rom:0x67904 +ItemScript_MegaJump = 0x8008C524; // type:data rom:0x67924 +ItemScript_PowerSmash = 0x8008C544; // type:data rom:0x67944 +ItemScript_SuperSmash = 0x8008C564; // type:data rom:0x67964 +ItemScript_MegaSmash = 0x8008C584; // type:data rom:0x67984 +ItemScript_LuckyDay = 0x8008C5A4; // type:data rom:0x679A4 +ItemScript_MegaHPDrain = 0x8008C5C4; // type:data rom:0x679C4 +ItemScript_BumpAttack = 0x8008C5E4; // type:data rom:0x679E4 +ItemScript_PUpDDown = 0x8008C604; // type:data rom:0x67A04 +ItemScript_PDownDUp = 0x8008C624; // type:data rom:0x67A24 +ItemScript_HeartFinder = 0x8008C644; // type:data rom:0x67A44 +ItemScript_FlowerFinder = 0x8008C664; // type:data rom:0x67A64 +ItemScript_DizzyAttack = 0x8008C684; // type:data rom:0x67A84 +ItemScript_SpeedySpin = 0x8008C6A4; // type:data rom:0x67AA4 +ItemScript_SpinAttack = 0x8008C6C4; // type:data rom:0x67AC4 +ItemScript_ISpy = 0x8008C6E4; // type:data rom:0x67AE4 +ItemScript_PowerRush = 0x8008C704; // type:data rom:0x67B04 +ItemScript_LastStand = 0x8008C724; // type:data rom:0x67B24 +ItemScript_CloseCall = 0x8008C744; // type:data rom:0x67B44 +ItemScript_CrazyHeart = 0x8008C764; // type:data rom:0x67B64 +ItemScript_Unused_0D5 = 0x8008C784; // type:data rom:0x67B84 +ItemScript_Unused_0D6 = 0x8008C7A4; // type:data rom:0x67BA4 +ItemScript_Unused_0D7 = 0x8008C7C4; // type:data rom:0x67BC4 +ItemScript_ShrinkSmash = 0x8008C7E4; // type:data rom:0x67BE4 +ItemScript_ShrinkStomp = 0x8008C804; // type:data rom:0x67C04 +ItemScript_DDownJump = 0x8008C824; // type:data rom:0x67C24 +ItemScript_DamageDodge = 0x8008C844; // type:data rom:0x67C44 +ItemScript_EarthquakeJump = 0x8008C864; // type:data rom:0x67C64 +ItemScript_HappyFlower = 0x8008C884; // type:data rom:0x67C84 +ItemScript_HappyCoin = 0x8008C8A4; // type:data rom:0x67CA4 +ItemScript_Unused_0DF = 0x8008C8C4; // type:data rom:0x67CC4 +ItemScript_DeepFocus = 0x8008C8E4; // type:data rom:0x67CE4 +ItemScript_SuperFocus = 0x8008C904; // type:data rom:0x67D04 +ItemScript_Kaiden = 0x8008C924; // type:data rom:0x67D24 +ItemScript_QuickChange = 0x8008C944; // type:data rom:0x67D44 +ItemScript_Unused_0E4 = 0x8008C964; // type:data rom:0x67D64 +ItemScript_Unused_0E5 = 0x8008C984; // type:data rom:0x67D84 +ItemScript_Unused_0E6 = 0x8008C9A4; // type:data rom:0x67DA4 +ItemScript_Unused_0E7 = 0x8008C9C4; // type:data rom:0x67DC4 +ItemScript_Peekaboo = 0x8008C9E4; // type:data rom:0x67DE4 +ItemScript_GroupFocus = 0x8008CA04; // type:data rom:0x67E04 +ItemScript_AttackFXD = 0x8008CA24; // type:data rom:0x67E24 +ItemScript_AttackFXB = 0x8008CA44; // type:data rom:0x67E44 +ItemScript_AttackFXE = 0x8008CA64; // type:data rom:0x67E64 +ItemScript_AttackFXC = 0x8008CA84; // type:data rom:0x67E84 +ItemScript_AttackFXF = 0x8008CAA4; // type:data rom:0x67EA4 +ItemScript_Unused_0EF = 0x8008CAC4; // type:data rom:0x67EC4 +ItemScript_HealthyHealthy = 0x8008CAE4; // type:data rom:0x67EE4 +ItemScript_Unused_0F1 = 0x8008CB04; // type:data rom:0x67F04 +ItemScript_Unused_0F2 = 0x8008CB24; // type:data rom:0x67F24 +ItemScript_Unused_0F3 = 0x8008CB44; // type:data rom:0x67F44 +ItemScript_Unused_0F4 = 0x8008CB64; // type:data rom:0x67F64 +ItemScript_Unused_0F5 = 0x8008CB84; // type:data rom:0x67F84 +ItemScript_Unused_0F6 = 0x8008CBA4; // type:data rom:0x67FA4 +ItemScript_Unused_0F7 = 0x8008CBC4; // type:data rom:0x67FC4 +ItemScript_Heart = 0x8008CBE4; // type:data rom:0x67FE4 +ItemScript_Coin = 0x8008CC1C; // type:data rom:0x6801C +ItemScript_HeartPiece = 0x8008CDE4; // type:data rom:0x681E4 +ItemScript_StarPoint = 0x8008CE04; // type:data rom:0x68204 +ItemScript_HeartPoint = 0x8008CECC; // type:data rom:0x682CC +ItemScript_FlowerPoint = 0x8008CF1C; // type:data rom:0x6831C +ItemScript_StarPiece = 0x8008CF6C; // type:data rom:0x6836C +ItemScript_SpicySoup = 0x8008CFD4; // type:data rom:0x683D4 +ItemScript_ApplePie = 0x8008CFF4; // type:data rom:0x683F4 +ItemScript_HoneyUltra = 0x8008D014; // type:data rom:0x68414 +ItemScript_MapleUltra = 0x8008D034; // type:data rom:0x68434 +ItemScript_JellyUltra = 0x8008D054; // type:data rom:0x68454 +ItemScript_Koopasta = 0x8008D074; // type:data rom:0x68474 +ItemScript_FriedShroom = 0x8008D094; // type:data rom:0x68494 +ItemScript_ShroomCake = 0x8008D0B4; // type:data rom:0x684B4 +ItemScript_ShroomSteak = 0x8008D0D4; // type:data rom:0x684D4 +ItemScript_HotShroom = 0x8008D0F4; // type:data rom:0x684F4 +ItemScript_SweetShroom = 0x8008D114; // type:data rom:0x68514 +ItemScript_HealthyJuice = 0x8008D134; // type:data rom:0x68534 +ItemScript_BlandMeal = 0x8008D154; // type:data rom:0x68554 +ItemScript_YummyMeal = 0x8008D174; // type:data rom:0x68574 +ItemScript_DeluxeFeast = 0x8008D194; // type:data rom:0x68594 +ItemScript_SpecialShake = 0x8008D1B4; // type:data rom:0x685B4 +ItemScript_BigCookie = 0x8008D1D4; // type:data rom:0x685D4 +ItemScript_Cake = 0x8008D1F4; // type:data rom:0x685F4 +ItemScript_Mistake = 0x8008D214; // type:data rom:0x68614 +ItemScript_KoopaTea = 0x8008D234; // type:data rom:0x68634 +ItemScript_HoneySuper = 0x8008D254; // type:data rom:0x68654 +ItemScript_MapleSuper = 0x8008D274; // type:data rom:0x68674 +ItemScript_JellySuper = 0x8008D294; // type:data rom:0x68694 +ItemScript_Spaghetti = 0x8008D2B4; // type:data rom:0x686B4 +ItemScript_EggMissile = 0x8008D2D4; // type:data rom:0x686D4 +ItemScript_FriedEgg = 0x8008D2F4; // type:data rom:0x686F4 +ItemScript_HoneyShroom = 0x8008D314; // type:data rom:0x68714 +ItemScript_HoneyCandy = 0x8008D334; // type:data rom:0x68734 +ItemScript_ElectroPop = 0x8008D354; // type:data rom:0x68754 +ItemScript_FirePop = 0x8008D374; // type:data rom:0x68774 +ItemScript_LimeCandy = 0x8008D394; // type:data rom:0x68794 +ItemScript_CocoPop = 0x8008D3B4; // type:data rom:0x687B4 +ItemScript_LemonCandy = 0x8008D3D4; // type:data rom:0x687D4 +ItemScript_JellyPop = 0x8008D3F4; // type:data rom:0x687F4 +ItemScript_StrangeCake = 0x8008D414; // type:data rom:0x68814 +ItemScript_KookyCookie = 0x8008D434; // type:data rom:0x68834 +ItemScript_FrozenFries = 0x8008D454; // type:data rom:0x68854 +ItemScript_PotatoSalad = 0x8008D474; // type:data rom:0x68874 +ItemScript_NuttyCake = 0x8008D494; // type:data rom:0x68894 +ItemScript_MapleShroom = 0x8008D4B4; // type:data rom:0x688B4 +ItemScript_BoiledEgg = 0x8008D4D4; // type:data rom:0x688D4 +ItemScript_YoshiCookie = 0x8008D4F4; // type:data rom:0x688F4 +ItemScript_JellyShroom = 0x8008D514; // type:data rom:0x68914 +ItemScript_Unused_02C = 0x8008D534; // type:data rom:0x68934 +ItemScript_Unused_02D = 0x8008D554; // type:data rom:0x68954 +ItemScript_Unused_02E = 0x8008D574; // type:data rom:0x68974 +ItemScript_Unused_02F = 0x8008D594; // type:data rom:0x68994 +ItemScript_Unused_030 = 0x8008D5B4; // type:data rom:0x689B4 +ItemScript_FireFlower = 0x8008D5D4; // type:data rom:0x689D4 +ItemScript_SnowmanDoll = 0x8008D5F4; // type:data rom:0x689F4 +ItemScript_ThunderRage = 0x8008D614; // type:data rom:0x68A14 +ItemScript_ThunderBolt = 0x8008D634; // type:data rom:0x68A34 +ItemScript_ShootingStar = 0x8008D654; // type:data rom:0x68A54 +ItemScript_DustyHammer = 0x8008D674; // type:data rom:0x68A74 +ItemScript_Pebble = 0x8008D694; // type:data rom:0x68A94 +ItemScript_ITEM_127 = 0x8008D6B4; // type:data rom:0x68AB4 +ItemScript_StoneCap = 0x8008D6D4; // type:data rom:0x68AD4 +ItemScript_VoltShroom = 0x8008D6F4; // type:data rom:0x68AF4 +ItemScript_PowerStar = 0x8008D714; // type:data rom:0x68B14 +ItemScript_Parasol = 0x8008D734; // type:data rom:0x68B34 +ItemScript_MagicMirror = 0x8008D754; // type:data rom:0x68B54 +ItemScript_ITEM_12D = 0x8008D774; // type:data rom:0x68B74 +ItemScript_ITEM_12E = 0x8008D794; // type:data rom:0x68B94 +ItemScript_ITEM_12F = 0x8008D7B4; // type:data rom:0x68BB4 +ItemScript_Mushroom = 0x8008D7D4; // type:data rom:0x68BD4 +ItemScript_SuperShroom = 0x8008D7F4; // type:data rom:0x68BF4 +ItemScript_UltraShroom = 0x8008D814; // type:data rom:0x68C14 +ItemScript_LifeShroom = 0x8008D834; // type:data rom:0x68C34 +ItemScript_DriedShroom = 0x8008D854; // type:data rom:0x68C54 +ItemScript_TastyTonic = 0x8008D874; // type:data rom:0x68C74 +ItemScript_SuperSoda = 0x8008D894; // type:data rom:0x68C94 +ItemScript_BlueBerry = 0x8008D8B4; // type:data rom:0x68CB4 +ItemScript_RedBerry = 0x8008D8D4; // type:data rom:0x68CD4 +ItemScript_YellowBerry = 0x8008D8F4; // type:data rom:0x68CF4 +ItemScript_BubbleBerry = 0x8008D914; // type:data rom:0x68D14 +ItemScript_Goomnut = 0x8008D934; // type:data rom:0x68D34 +ItemScript_KoopaLeaf = 0x8008D954; // type:data rom:0x68D54 +ItemScript_DriedPasta = 0x8008D974; // type:data rom:0x68D74 +ItemScript_Lime = 0x8008D994; // type:data rom:0x68D94 +ItemScript_Lemon = 0x8008D9B4; // type:data rom:0x68DB4 +ItemScript_DriedFruit = 0x8008D9D4; // type:data rom:0x68DD4 +ItemScript_StrangeLeaf = 0x8008D9F4; // type:data rom:0x68DF4 +ItemScript_CakeMix = 0x8008DA14; // type:data rom:0x68E14 +ItemScript_Egg = 0x8008DA34; // type:data rom:0x68E34 +ItemScript_Coconut = 0x8008DA54; // type:data rom:0x68E54 +ItemScript_Melon = 0x8008DA74; // type:data rom:0x68E74 +ItemScript_StinkyHerb = 0x8008DA94; // type:data rom:0x68E94 +ItemScript_IcedPotato = 0x8008DAB4; // type:data rom:0x68EB4 +ItemScript_HoneySyrup = 0x8008DAD4; // type:data rom:0x68ED4 +ItemScript_MapleSyrup = 0x8008DAF4; // type:data rom:0x68EF4 +ItemScript_JamminJelly = 0x8008DB14; // type:data rom:0x68F14 +ItemScript_WhackasBump = 0x8008DB34; // type:data rom:0x68F34 +ItemScript_Apple = 0x8008DB54; // type:data rom:0x68F54 +ItemScript_BakingSalt = 0x8008DB74; // type:data rom:0x68F74 +ItemScript_BakingSugar = 0x8008DB94; // type:data rom:0x68F94 +ItemScript_BakingEgg = 0x8008DBB4; // type:data rom:0x68FB4 +ItemScript_BakingCream = 0x8008DBD4; // type:data rom:0x68FD4 +ItemScript_BakingStrawberry = 0x8008DBF4; // type:data rom:0x68FF4 +ItemScript_BakingButter = 0x8008DC14; // type:data rom:0x69014 +ItemScript_BakingCleanser = 0x8008DC34; // type:data rom:0x69034 +ItemScript_BakingWater = 0x8008DC54; // type:data rom:0x69054 +ItemScript_BakingFlour = 0x8008DC74; // type:data rom:0x69074 +ItemScript_BakingMilk = 0x8008DC94; // type:data rom:0x69094 +ItemScript_ITEM_11F = 0x8008DCB4; // type:data rom:0x690B4 +ItemScript_SleepySheep = 0x8008DCD4; // type:data rom:0x690D4 +ItemScript_XBandage = 0x8008DCF4; // type:data rom:0x690F4 +ItemScript_POWBlock = 0x8008DD14; // type:data rom:0x69114 +ItemScript_HustleDrink = 0x8008DD34; // type:data rom:0x69134 +ItemScript_StopWatch = 0x8008DD54; // type:data rom:0x69154 +ItemScript_DizzyDial = 0x8008DD74; // type:data rom:0x69174 +ItemScript_ITEM_136 = 0x8008DD94; // type:data rom:0x69194 +ItemScript_ITEM_137 = 0x8008DDB4; // type:data rom:0x691B4 +gItemEntityScripts = 0x8008DDD4; // type:data rom:0x691D4 +gItemIconRasterOffsets = 0x8008E3D8; // type:data rom:0x697D8 +gItemIconPaletteOffsets = 0x8008E94C; // type:data rom:0x69D4C +D_8008EEC0 = 0x8008EEC0; // type:data rom:0x6A2C0 +D_8008EEF0 = 0x8008EEF0; // type:data rom:0x6A2F0 +gPartnerPopupProperties = 0x8008EF20; // type:data rom:0x6A320 +pad8 = 0x8008EFF0; // type:data rom:0x6A3F0 +gPartnerIconHudScripts = 0x8008EFF8; // type:data rom:0x6A3F8 +gMoveTable = 0x8008F060; // type:data rom:0x6A460 +pad_after_move_table = 0x8008FED4; // type:data rom:0x6B2D4 +gMessageBoxFrameParts = 0x8008FEE0; // type:data rom:0x6B2E0 D_8008FF60 = 0x8008FF60; // type:data rom:0x6B360 gEntityColliderFaces = 0x8008FF70; // type:data rom:0x6B370 gEntityColliderNormals = 0x8008FFB8; // type:data rom:0x6B3B8 @@ -6739,6 +7670,10 @@ damage_indicator_update = 0xE003C244; // type:func rom:0x34F704 damage_indicator_render = 0xE003C474; // type:func rom:0x34F934 func_E003C47C = 0xE003C47C; // type:func rom:0x34F93C func_E003C498 = 0xE003C498; // type:func rom:0x34F958 +D_E003CCA0 = 0xE003CCA0; // type:data rom:0x350160 +D_E003CCD0 = 0xE003CCD0; // type:data rom:0x350190 +D_E003CCF8 = 0xE003CCF8; // type:data rom:0x3501B8 +D_E003CD1C = 0xE003CD1C; // type:data rom:0x3501DC purple_ring_main = 0xE003E000; // type:func rom:0x352440 purple_ring_init = 0xE003E3F8; // type:func rom:0x352838 purple_ring_update = 0xE003E400; // type:func rom:0x352840 @@ -6832,6 +7767,8 @@ big_snowflakes_init = 0xE00601D8; // type:func rom:0x363338 big_snowflakes_update = 0xE00601E0; // type:func rom:0x363340 big_snowflakes_render = 0xE006040C; // type:func rom:0x36356C big_snowflakes_appendGfx = 0xE0060450; // type:func rom:0x3635B0 +D_E0060730 = 0xE0060730; // type:data rom:0x363890 +D_E0060738 = 0xE0060738; // type:data rom:0x363898 debuff_main = 0xE0062000; // type:func rom:0x364300 debuff_init = 0xE0062218; // type:func rom:0x364518 debuff_update = 0xE0062220; // type:func rom:0x364520 @@ -7527,12 +8464,35 @@ func_802A91E0_423E50 = 0x802A91E0; // type:func rom:0x423E50 func_802A92F0_423F60 = 0x802A92F0; // type:func rom:0x423F60 func_802A9744_4243B4 = 0x802A9744; // type:func rom:0x4243B4 func_802A9898_424508 = 0x802A9898; // type:func rom:0x424508 -D_802AA7F0_425460 = 0x802AA7F0; // type:data rom:0x425460 -D_802AA818_425488 = 0x802AA818; // type:data rom:0x425488 +battle_action_cmd_whirlwind_1_png = 0x802A98E0; // type:data rom:0x424550 +battle_action_cmd_whirlwind_1_pal = 0x802A9A00; // type:data rom:0x424670 +battle_action_cmd_whirlwind_2_png = 0x802A9A20; // type:data rom:0x424690 +battle_action_cmd_whirlwind_2_pal = 0x802A9B40; // type:data rom:0x4247B0 +battle_action_cmd_whirlwind_3_png = 0x802A9B60; // type:data rom:0x4247D0 +battle_action_cmd_whirlwind_3_pal = 0x802A9C80; // type:data rom:0x4248F0 +battle_action_cmd_whirlwind_4_png = 0x802A9CA0; // type:data rom:0x424910 +battle_action_cmd_whirlwind_4_pal = 0x802A9DC0; // type:data rom:0x424A30 +battle_action_cmd_whirlwind_5_png = 0x802A9DE0; // type:data rom:0x424A50 +battle_action_cmd_whirlwind_5_pal = 0x802A9F00; // type:data rom:0x424B70 +battle_action_cmd_whirlwind_6_png = 0x802A9F20; // type:data rom:0x424B90 +battle_action_cmd_whirlwind_6_pal = 0x802AA040; // type:data rom:0x424CB0 +battle_action_cmd_whirlwind_7_png = 0x802AA060; // type:data rom:0x424CD0 +battle_action_cmd_whirlwind_7_pal = 0x802AA180; // type:data rom:0x424DF0 +battle_action_cmd_whirlwind_bubble_png = 0x802AA1A0; // type:data rom:0x424E10 +battle_action_cmd_whirlwind_bubble_pal = 0x802AA6E0; // type:data rom:0x425350 +HudScript_Whirlwind1 = 0x802AA700; // type:data rom:0x425370 +HudScript_Whirlwind2 = 0x802AA728; // type:data rom:0x425398 +HudScript_Whirlwind3 = 0x802AA750; // type:data rom:0x4253C0 +HudScript_Whirlwind4 = 0x802AA778; // type:data rom:0x4253E8 +HudScript_Whirlwind5 = 0x802AA7A0; // type:data rom:0x425410 +HudScript_Whirlwind6 = 0x802AA7C8; // type:data rom:0x425438 +HudScript_Whirlwind7 = 0x802AA7F0; // type:data rom:0x425460 +HudScript_WhirlwindBubble = 0x802AA818; // type:data rom:0x425488 D_802AA844_4254B4 = 0x802AA844; // type:data rom:0x4254B4 D_802AA85C_4254CC = 0x802AA85C; // type:data rom:0x4254CC D_802AA888_4254F8 = 0x802AA888; // type:data rom:0x4254F8 D_802AA8A0_425510 = 0x802AA8A0; // type:data rom:0x425510 +D_802AA8B4_425524 = 0x802AA8B4; // type:data rom:0x425524 D_802AA8B7_425527 = 0x802AA8B7; // type:data rom:0x425527 func_802A9000_425590 = 0x802A9000; // type:func rom:0x425590 func_802A9110_4256A0 = 0x802A9110; // type:func rom:0x4256A0 @@ -7549,12 +8509,14 @@ action_command_dizzy_shell_MashActionCommandInit = 0x802A9170; // type:func rom: func_802A928C_4263FC = 0x802A928C; // type:func rom:0x4263FC action_command_dizzy_shell_UnkActionCommandFunc1 = 0x802A96DC; // type:func rom:0x42684C action_command_dizzy_shell_free_hud_elements = 0x802A97BC; // type:func rom:0x42692C +D_802A9800_426970 = 0x802A9800; // type:data rom:0x426970 D_802A9802_426972 = 0x802A9802; // type:data rom:0x426972 func_802A9000_4269D0 = 0x802A9000; // type:func rom:0x4269D0 action_command_fire_shell_MashActionCommandInit = 0x802A9178; // type:func rom:0x426B48 func_802A9294_426C64 = 0x802A9294; // type:func rom:0x426C64 action_command_fire_shell_UnkActionCommandFunc1 = 0x802A9834; // type:func rom:0x427204 action_command_fire_shell_free_hud_elements = 0x802A9914; // type:func rom:0x4272E4 +D_802A9950_427320 = 0x802A9950; // type:data rom:0x427320 D_802A9952_427322 = 0x802A9952; // type:data rom:0x427322 D_802A9964_427334 = 0x802A9964; // type:data rom:0x427334 D_802A9974_427344 = 0x802A9974; // type:data rom:0x427344 @@ -7569,7 +8531,7 @@ action_command_bomb_MashActionCommandInit = 0x802A9170; // type:func rom:0x427BE func_802A928C_427CFC = 0x802A928C; // type:func rom:0x427CFC action_command_bomb_UnkActionCommandFunc1 = 0x802A96EC; // type:func rom:0x42815C action_command_bomb_free_hud_elements = 0x802A97CC; // type:func rom:0x42823C -D_802A9812_428280 = 0x802A9810; // type:data rom:0x428280 +D_802A9810_428280 = 0x802A9810; // type:data rom:0x428280 D_802A9812_428282 = 0x802A9812; // type:data rom:0x428282 action_command_body_slam_CreateHudElements = 0x802A9000; // type:func rom:0x4282E0 action_command_body_slam_MashActionCommandInit = 0x802A91B8; // type:func rom:0x428498 @@ -7599,6 +8561,7 @@ func_802A911C_429E3C = 0x802A911C; // type:func rom:0x429E3C func_802A9208_429F28 = 0x802A9208; // type:func rom:0x429F28 func_802A9634_42A354 = 0x802A9634; // type:func rom:0x42A354 func_802A9720_42A440 = 0x802A9720; // type:func rom:0x42A440 +D_802A9760_42A480 = 0x802A9760; // type:data rom:0x42A480 D_802A9762_42A482 = 0x802A9762; // type:data rom:0x42A482 D_802A9778_42A498 = 0x802A9778; // type:data rom:0x42A498 func_802A9000_42A4F0 = 0x802A9000; // type:func rom:0x42A4F0 @@ -7606,9 +8569,30 @@ func_802A9398_42A888 = 0x802A9398; // type:func rom:0x42A888 func_802A948C_42A97C = 0x802A948C; // type:func rom:0x42A97C func_802AA014_42B504 = 0x802AA014; // type:func rom:0x42B504 func_802AA0D8_42B5C8 = 0x802AA0D8; // type:func rom:0x42B5C8 -D_802AB108_42C5F8 = 0x802AB108; // type:data rom:0x42C5F8 -D_802AB130_42C620 = 0x802AB130; // type:data rom:0x42C620 -D_802AB158_42C648 = 0x802AB158; // type:data rom:0x42C648 +battle_action_cmd_water_block_1_png = 0x802AA160; // type:data rom:0x42B650 +battle_action_cmd_water_block_1_pal = 0x802AA280; // type:data rom:0x42B770 +battle_action_cmd_water_block_2_png = 0x802AA2A0; // type:data rom:0x42B790 +battle_action_cmd_water_block_2_pal = 0x802AA3C0; // type:data rom:0x42B8B0 +battle_action_cmd_water_block_3_png = 0x802AA3E0; // type:data rom:0x42B8D0 +battle_action_cmd_water_block_3_pal = 0x802AA500; // type:data rom:0x42B9F0 +battle_action_cmd_water_block_0_png = 0x802AA520; // type:data rom:0x42BA10 +battle_action_cmd_water_block_0_pal = 0x802AA640; // type:data rom:0x42BB30 +battle_action_cmd_water_block_block_png = 0x802AA660; // type:data rom:0x42BB50 +battle_action_cmd_water_block_block_pal = 0x802AA860; // type:data rom:0x42BD50 +battle_action_cmd_water_block_circle_png = 0x802AA880; // type:data rom:0x42BD70 +battle_action_cmd_water_block_circle_pal = 0x802AABA0; // type:data rom:0x42C090 +battle_action_cmd_water_block_cloud_png = 0x802AABC0; // type:data rom:0x42C0B0 +battle_action_cmd_water_block_cloud_pal = 0x802AAEE0; // type:data rom:0x42C3D0 +battle_action_cmd_water_block_4_png = 0x802AAF00; // type:data rom:0x42C3F0 +battle_action_cmd_water_block_4_pal = 0x802AB020; // type:data rom:0x42C510 +HudScript_WaterBlock1 = 0x802AB040; // type:data rom:0x42C530 +HudScript_WaterBlock2 = 0x802AB068; // type:data rom:0x42C558 +HudScript_WaterBlock3 = 0x802AB090; // type:data rom:0x42C580 +HudScript_WaterBlock0 = 0x802AB0B8; // type:data rom:0x42C5A8 +HudScript_WaterBlock4 = 0x802AB0E0; // type:data rom:0x42C5D0 +HudScript_WaterBlockBlock = 0x802AB108; // type:data rom:0x42C5F8 +HudScript_WaterBlockCircle = 0x802AB130; // type:data rom:0x42C620 +HudScript_WaterBlockCloud = 0x802AB158; // type:data rom:0x42C648 D_802AB180_42C670 = 0x802AB180; // type:data rom:0x42C670 D_802AB184_42C674 = 0x802AB184; // type:data rom:0x42C674 action_command_tidal_wave_CreateHudElements = 0x802A9000; // type:func rom:0x42C6F0 @@ -7623,6 +8607,7 @@ func_802A9210_42D120 = 0x802A9210; // type:func rom:0x42D120 func_802A9310_42D220 = 0x802A9310; // type:func rom:0x42D220 action_command_power_shock_draw_hud_elements = 0x802A98D0; // type:func rom:0x42D7E0 action_command_power_shock_free_hud_elements = 0x802A9A54; // type:func rom:0x42D964 +D_802A9AA0_42D9B0 = 0x802A9AA0; // type:data rom:0x42D9B0 D_802A9AA2_42D9B2 = 0x802A9AA2; // type:data rom:0x42D9B2 func_802A9000_42DA10 = 0x802A9000; // type:func rom:0x42DA10 func_802A91A0_42DBB0 = 0x802A91A0; // type:func rom:0x42DBB0 @@ -7646,18 +8631,21 @@ func_802A916C_42EF8C = 0x802A916C; // type:func rom:0x42EF8C func_802A9254_42F074 = 0x802A9254; // type:func rom:0x42F074 action_command_spiny_surge_UnkActionCommandFunc1 = 0x802A973C; // type:func rom:0x42F55C action_command_spiny_surge_free_hud_elements = 0x802A981C; // type:func rom:0x42F63C +D_802A9860_42F680 = 0x802A9860; // type:data rom:0x42F680 D_802A9862_42F682 = 0x802A9862; // type:data rom:0x42F682 func_802A9000_42F6E0 = 0x802A9000; // type:func rom:0x42F6E0 func_802A91A0_42F880 = 0x802A91A0; // type:func rom:0x42F880 func_802A92A0_42F980 = 0x802A92A0; // type:func rom:0x42F980 func_802A97AC_42FE8C = 0x802A97AC; // type:func rom:0x42FE8C func_802A9894_42FF74 = 0x802A9894; // type:func rom:0x42FF74 +D_802A98E0_42FFC0 = 0x802A98E0; // type:data rom:0x42FFC0 D_802A98E2_42FFC2 = 0x802A98E2; // type:data rom:0x42FFC2 func_802A9000_430020 = 0x802A9000; // type:func rom:0x430020 action_command_spook_MashActionCommandInit = 0x802A917C; // type:func rom:0x43019C func_802A9298_4302B8 = 0x802A9298; // type:func rom:0x4302B8 action_command_spook_UnkActionCommandFunc1 = 0x802A97FC; // type:func rom:0x43081C action_command_spook_free_hud_elements = 0x802A98DC; // type:func rom:0x4308FC +D_802A9920_430940 = 0x802A9920; // type:data rom:0x430940 D_802A9922_430942 = 0x802A9922; // type:data rom:0x430942 b_area_kmr_part_1_goomba_BattleAreaAngleStuff1 = 0x80218000; // type:func rom:0x4309A0 b_area_kmr_part_1_goomba_AngleCalculate = 0x8021818C; // type:func rom:0x430B2C @@ -9134,7 +10122,7 @@ b_area_trd_part_2_trd_05f = 0x80235D2C; // type:data rom:0x4CEF1C D_80235E6C_4CF05C = 0x80235E6C; // type:data rom:0x4CF05C D_80235F44_4CF134 = 0x80235F44; // type:data rom:0x4CF134 D_80235FC0 = 0x80218000; // type:func rom:0x4CF1B0 -b_area_trd_part_2_green_ninja_koopa_effectStruct = 0x80236040; // type:data rom:0x4CF230 +b_area_trd_part_2_green_ninja_koopa_effectUnk = 0x80236040; // type:data rom:0x4CF230 func_802180C8_4CF278 = 0x802180C8; // type:func rom:0x4CF278 func_802180E8_4CF298 = 0x802180E8; // type:func rom:0x4CF298 func_80218108_4CF2B8 = 0x80218108; // type:func rom:0x4CF2B8 @@ -9149,7 +10137,7 @@ b_area_trd_part_3_stageTable = 0x80218264; // type:data rom:0x4CF414 b_area_trd_part_3_eldstar_idleAnimations_80218280 = 0x80218280; // type:data rom:0x4CF430 b_area_trd_part_3_eldstar_defenseTable_8021828C = 0x8021828C; // type:data rom:0x4CF43C b_area_trd_part_3_eldstar_statusTable_80218298 = 0x80218298; // type:data rom:0x4CF448 -b_area_trd_part_2_red_ninja_koopa_effectStruct = 0x802362D0; // type:data rom:0x4CF4C0 +b_area_trd_part_2_red_ninja_koopa_effectUnk = 0x802362D0; // type:data rom:0x4CF4C0 b_area_trd_part_3_eldstar_partsTable_80218344 = 0x80218344; // type:data rom:0x4CF4F4 b_area_trd_part_3_eldstar = 0x80218368; // type:data rom:0x4CF518 b_area_trd_part_3_eldstar_init_80218390 = 0x80218390; // type:data rom:0x4CF540 @@ -9157,8 +10145,8 @@ b_area_trd_part_3_eldstar_idle_802183E8 = 0x802183E8; // type:data rom:0x4CF598 b_area_trd_part_3_eldstar_handleEvent_80218404 = 0x80218404; // type:data rom:0x4CF5B4 b_area_trd_part_3_eldstar_takeTurn_80218414 = 0x80218414; // type:data rom:0x4CF5C4 b_area_trd_part_3_eldstar_80218424 = 0x80218424; // type:data rom:0x4CF5D4 -b_area_trd_part_2_blue_ninja_koopa_effectStruct = 0x80236560; // type:data rom:0x4CF750 -b_area_trd_part_2_yellow_ninja_koopa_effectStruct = 0x802367F0; // type:data rom:0x4CF9E0 +b_area_trd_part_2_blue_ninja_koopa_effectUnk = 0x80236560; // type:data rom:0x4CF750 +b_area_trd_part_2_yellow_ninja_koopa_effectUnk = 0x802367F0; // type:data rom:0x4CF9E0 b_area_trd_part_3_nok_01_80218DD0 = 0x80218DD0; // type:data rom:0x4CFF80 b_area_trd_part_3_nok_01_beforeBattle_80218ED8 = 0x80218ED8; // type:data rom:0x4D0088 b_area_trd_part_3_nok_01_afterBattle_80218FA0 = 0x80218FA0; // type:data rom:0x4D0150 @@ -11149,6 +12137,59 @@ b_area_kpa2_CanPlayerLoseAction = 0x8021CEB8; // type:func rom:0x6A40B8 func_8021CF54_6A4154 = 0x8021CF54; // type:func rom:0x6A4154 func_8021CFC0_6A41C0 = 0x8021CFC0; // type:func rom:0x6A41C0 func_8021D290_6A4490 = 0x8021D290; // type:func rom:0x6A4490 +D_80234740_6BB940 = 0x80234740; // type:data rom:0x6BB940 +D_80234748_6BB948 = 0x80234748; // type:data rom:0x6BB948 +D_80234750_6BB950 = 0x80234750; // type:data rom:0x6BB950 +D_80234758_6BB958 = 0x80234758; // type:data rom:0x6BB958 +D_80234760_6BB960 = 0x80234760; // type:data rom:0x6BB960 +D_80234768_6BB968 = 0x80234768; // type:data rom:0x6BB968 +D_80234770_6BB970 = 0x80234770; // type:data rom:0x6BB970 +D_80234780_6BB980 = 0x80234780; // type:data rom:0x6BB980 +D_80234788_6BB988 = 0x80234788; // type:data rom:0x6BB988 +D_80234790_6BB990 = 0x80234790; // type:data rom:0x6BB990 +D_80234798_6BB998 = 0x80234798; // type:data rom:0x6BB998 +D_802347A0_6BB9A0 = 0x802347A0; // type:data rom:0x6BB9A0 +D_802347A8_6BB9A8 = 0x802347A8; // type:data rom:0x6BB9A8 +D_802347B0_6BB9B0 = 0x802347B0; // type:data rom:0x6BB9B0 +D_802347C0_6BB9C0 = 0x802347C0; // type:data rom:0x6BB9C0 +D_802347C8_6BB9C8 = 0x802347C8; // type:data rom:0x6BB9C8 +D_802347D0_6BB9D0 = 0x802347D0; // type:data rom:0x6BB9D0 +D_802347D8_6BB9D8 = 0x802347D8; // type:data rom:0x6BB9D8 +D_802347E0_6BB9E0 = 0x802347E0; // type:data rom:0x6BB9E0 +D_802347E8_6BB9E8 = 0x802347E8; // type:data rom:0x6BB9E8 +D_802347F0_6BB9F0 = 0x802347F0; // type:data rom:0x6BB9F0 +D_802347F8_6BB9F8 = 0x802347F8; // type:data rom:0x6BB9F8 +D_80234800_6BBA00 = 0x80234800; // type:data rom:0x6BBA00 +D_80234810_6BBA10 = 0x80234810; // type:data rom:0x6BBA10 +D_80234828_6BBA28 = 0x80234828; // type:data rom:0x6BBA28 +D_80234830_6BBA30 = 0x80234830; // type:data rom:0x6BBA30 +D_80234838_6BBA38 = 0x80234838; // type:data rom:0x6BBA38 +D_80234840_6BBA40 = 0x80234840; // type:data rom:0x6BBA40 +D_80234848_6BBA48 = 0x80234848; // type:data rom:0x6BBA48 +D_80234850_6BBA50 = 0x80234850; // type:data rom:0x6BBA50 +D_80234858_6BBA58 = 0x80234858; // type:data rom:0x6BBA58 +D_80234860_6BBA60 = 0x80234860; // type:data rom:0x6BBA60 +D_80234868_6BBA68 = 0x80234868; // type:data rom:0x6BBA68 +D_80234870_6BBA70 = 0x80234870; // type:data rom:0x6BBA70 +D_80234880_6BBA80 = 0x80234880; // type:data rom:0x6BBA80 +D_80234890_6BBA90 = 0x80234890; // type:data rom:0x6BBA90 +D_802348A0_6BBAA0 = 0x802348A0; // type:data rom:0x6BBAA0 +D_802348A8_6BBAA8 = 0x802348A8; // type:data rom:0x6BBAA8 +D_802348B0_6BBAB0 = 0x802348B0; // type:data rom:0x6BBAB0 +D_802348C0_6BBAC0 = 0x802348C0; // type:data rom:0x6BBAC0 +D_802348D0_6BBAD0 = 0x802348D0; // type:data rom:0x6BBAD0 +D_802348D8_6BBAD8 = 0x802348D8; // type:data rom:0x6BBAD8 +D_802348E0_6BBAE0 = 0x802348E0; // type:data rom:0x6BBAE0 +D_802348F0_6BBAF0 = 0x802348F0; // type:data rom:0x6BBAF0 +D_80234900_6BBB00 = 0x80234900; // type:data rom:0x6BBB00 +D_80234908_6BBB08 = 0x80234908; // type:data rom:0x6BBB08 +D_80234920_6BBB20 = 0x80234920; // type:data rom:0x6BBB20 +D_80234938_6BBB38 = 0x80234938; // type:data rom:0x6BBB38 +D_80234950_6BBB50 = 0x80234950; // type:data rom:0x6BBB50 +D_80234968_6BBB68 = 0x80234968; // type:data rom:0x6BBB68 +D_80234970_6BBB70 = 0x80234970; // type:data rom:0x6BBB70 +D_80234978_6BBB78 = 0x80234978; // type:data rom:0x6BBB78 +D_80234980_6BBB80 = 0x80234980; // type:data rom:0x6BBB80 b_area_kpa3_UnkBattleFunc1 = 0x80218000; // type:func rom:0x6BBB90 b_area_kpa3_UnkFunc62 = 0x802180D0; // type:func rom:0x6BBC60 b_area_kpa3_ActorJumpToPos = 0x80218960; // type:func rom:0x6BC4F0 @@ -11704,6 +12745,7 @@ battle_item_mystery_modelCommandList = 0x802A2260; // type:data rom:0x72D810 battle_item_mystery_D_802A227C_72D82C = 0x802A227C; // type:data rom:0x72D82C battle_item_mystery_D_802A229C_72D84C = 0x802A229C; // type:data rom:0x72D84C battle_item_mystery_main = 0x802A22BC; // type:data rom:0x72D86C +D_802A25B8 = 0x802A25B8; // type:data rom:0x72DB68 battle_item_repel_gel_GiveRefund = 0x802A1000; // type:func rom:0x72DB70 battle_item_repel_gel_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x72DD44 battle_item_repel_gel_func_802A123C_72DDAC = 0x802A123C; // type:func rom:0x72DDAC @@ -11779,13 +12821,16 @@ battle_item_strange_cake2_png = 0x802A2390; // type:data rom:0x732690 battle_item_strange_cake2_pal = 0x802A2590; // type:data rom:0x732890 battle_item_strange_cake3_png = 0x802A25B0; // type:data rom:0x7328B0 battle_item_strange_cake3_pal = 0x802A27B0; // type:data rom:0x732AB0 -battle_item_strange_cake_data = 0x802A27D0; // type:data rom:0x732AD0 +battle_item_strange_cake_D_802A27D0 = 0x802A27D0; // type:data rom:0x732AD0 +battle_item_strange_cake_D_802A27F8 = 0x802A27F8; // type:data rom:0x732AF8 +battle_item_strange_cake_D_802A2820 = 0x802A2820; // type:data rom:0x732B20 battle_item_strange_cake_D_802A2848_732B48 = 0x802A2848; // type:data rom:0x732B48 battle_item_strange_cake_D_802A2858_732B58 = 0x802A2858; // type:data rom:0x732B58 battle_item_strange_cake_script6 = 0x802A2870; // type:data rom:0x732B70 battle_item_strange_cake_script7 = 0x802A2B70; // type:data rom:0x732E70 battle_item_strange_cake_script8 = 0x802A2C40; // type:data rom:0x732F40 battle_item_strange_cake_script9 = 0x802A2D10; // type:data rom:0x733010 +D_802A2DC8 = 0x802A2DC8; // type:data rom:0x7330C8 battle_item_food_GiveRefund = 0x802A1000; // type:func rom:0x7330D0 battle_item_food_GiveRefundCleanup = 0x802A11D4; // type:func rom:0x7332A4 battle_item_food_func_802A123C_73330C = 0x802A123C; // type:func rom:0x73330C @@ -12779,7 +13824,7 @@ D_8024F550_852120 = 0x8024F550; // type:data rom:0x852120 D_8024F580_852150 = 0x8024F580; // type:data rom:0x852150 mac_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x852170 mac_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x852294 -func_8024030C_85247C = 0x8024030C; // type:func rom:0x85247C +dup_mac_05_UnkFloatFunc001 = 0x8024030C; // type:func rom:0x85247C func_8024047C_8525EC = 0x8024047C; // type:func rom:0x8525EC mac_05_PatrolAI_MoveInit = 0x80240490; // type:func rom:0x852600 mac_05_PatrolAI_Move = 0x802405E8; // type:func rom:0x852758 @@ -12840,13 +13885,13 @@ func_80243254_8553C4 = 0x80243254; // type:func rom:0x8553C4 func_8024335C_8554CC = 0x8024335C; // type:func rom:0x8554CC filemenu_update_show_name_input_8554F0 = 0x80243380; // type:func rom:0x8554F0 func_802433BC_85552C = 0x802433BC; // type:func rom:0x85552C -func_802433F0_855560 = 0x802433F0; // type:func rom:0x855560 -func_8024343C_8555AC = 0x8024343C; // type:func rom:0x8555AC -func_80243588_8556F8 = 0x80243588; // type:func rom:0x8556F8 -func_80243800_855970 = 0x80243800; // type:func rom:0x855970 -func_802438A4_855A14 = 0x802438A4; // type:func rom:0x855A14 -func_80243948_855AB8 = 0x80243948; // type:func rom:0x855AB8 -func_80243AB8_855C28 = 0x80243AB8; // type:func rom:0x855C28 +mac_05_resolve_npc = 0x802433F0; // type:func rom:0x855560 +mac_05_UnkAngleFunc001 = 0x8024343C; // type:func rom:0x8555AC +mac_05_unkVtxFunc001 = 0x80243588; // type:func rom:0x8556F8 +mac_05_unkAngleFunc002 = 0x80243800; // type:func rom:0x855970 +mac_05_unkAngleFunc003 = 0x802438A4; // type:func rom:0x855A14 +mac_05_UnkFloatFunc001 = 0x80243948; // type:func rom:0x855AB8 +mac_05_UnkPlayerPosFunc = 0x80243AB8; // type:func rom:0x855C28 mac_05_PlayFX3D = 0x80243BA4; // type:func rom:0x855D14 func_80243CD4_855E44 = 0x80243CD4; // type:func rom:0x855E44 func_80243D78_855EE8 = 0x80243D78; // type:func rom:0x855EE8 @@ -12866,15 +13911,15 @@ D_802527B8_864928 = 0x802527B8; // type:data rom:0x864928 D_802529C8_864B38 = 0x802529C8; // type:data rom:0x864B38 mac_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x864B40 mac_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x864C64 -func_8024030C_864E4C = 0x8024030C; // type:func rom:0x864E4C +dup_mac_06_UnkFloatFunc001 = 0x8024030C; // type:func rom:0x864E4C mac_06_SpawnSunEffect = 0x8024047C; // type:func rom:0x864FBC -func_802404C0_865000 = 0x802404C0; // type:func rom:0x865000 -func_8024050C_86504C = 0x8024050C; // type:func rom:0x86504C -func_80240658_865198 = 0x80240658; // type:func rom:0x865198 -func_802408D0_865410 = 0x802408D0; // type:func rom:0x865410 -func_80240974_8654B4 = 0x80240974; // type:func rom:0x8654B4 -func_80240A18_865558 = 0x80240A18; // type:func rom:0x865558 -func_80240B88_8656C8 = 0x80240B88; // type:func rom:0x8656C8 +mac_06_resolve_npc = 0x802404C0; // type:func rom:0x865000 +mac_06_UnkAngleFunc001 = 0x8024050C; // type:func rom:0x86504C +mac_06_unkVtxFunc001 = 0x80240658; // type:func rom:0x865198 +mac_06_unkAngleFunc002 = 0x802408D0; // type:func rom:0x865410 +mac_06_unkAngleFunc003 = 0x80240974; // type:func rom:0x8654B4 +jan_00_UnkFloatFunc001 = 0x80240A18; // type:func rom:0x865558 +mac_06_UnkPlayerPosFunc = 0x80240B88; // type:func rom:0x8656C8 mac_06_PlayFX3D = 0x80240C74; // type:func rom:0x8657B4 func_80240DA4_8658E4 = 0x80240DA4; // type:func rom:0x8658E4 func_80240E48_865988 = 0x80240E48; // type:func rom:0x865988 @@ -16519,12 +17564,12 @@ func_80240B4C_B2108C = 0x80240B4C; // type:func rom:0xB2108C func_80240CF8_B21238 = 0x80240CF8; // type:func rom:0xB21238 func_80240F14_B21454 = 0x80240F14; // type:func rom:0xB21454 func_80241134_B21674 = 0x80241134; // type:func rom:0xB21674 -func_802411A0_B216E0 = 0x802411A0; // type:func rom:0xB216E0 -func_802411EC_B2172C = 0x802411EC; // type:func rom:0xB2172C -func_80241338_B21878 = 0x80241338; // type:func rom:0xB21878 -func_802415B0_B21AF0 = 0x802415B0; // type:func rom:0xB21AF0 -func_80241654_B21B94 = 0x80241654; // type:func rom:0xB21B94 -func_802416F8_B21C38 = 0x802416F8; // type:func rom:0xB21C38 +jan_00_resolve_npc = 0x802411A0; // type:func rom:0xB216E0 +jan_00_UnkAngleFunc001 = 0x802411EC; // type:func rom:0xB2172C +jan_00_unkVtxFunc001 = 0x80241338; // type:func rom:0xB21878 +jan_00_unkAngleFunc002 = 0x802415B0; // type:func rom:0xB21AF0 +jan_00_unkAngleFunc003 = 0x80241654; // type:func rom:0xB21B94 +mac_06_UnkFloatFunc001 = 0x802416F8; // type:func rom:0xB21C38 func_80241868_B21DA8 = 0x80241868; // type:func rom:0xB21DA8 jan_00_foliage_setup_shear_mtx = 0x80241960; // type:func rom:0xB21EA0 jan_00_TransformFoliage = 0x802419D0; // type:func rom:0xB21F10 @@ -19105,9 +20150,9 @@ dgb_12_main = 0x802404E0; // type:data rom:0xC4E3D0 dgb_12_lavaResetList_802405C0 = 0x802405C0; // type:data rom:0xC4E4B0 dgb_12_802405E0 = 0x802405E0; // type:data rom:0xC4E4D0 dgb_12_D_80240870_C4E760 = 0x80240870; // type:data rom:0xC4E760 -dgb_06_EVS_ShowGotItem = 0x80240874; // type:data rom:0xC4E764 -dgb_06_EVS_GetItem = 0x802408DC; // type:data rom:0xC4E7CC -dgb_06_EVS_Chest_Interact = 0x802409BC; // type:data rom:0xC4E8AC +dgb_12_EVS_Chest_ShowGotItem = 0x80240874; // type:data rom:0xC4E764 +dgb_12_EVS_Chest_GetItem = 0x802408DC; // type:data rom:0xC4E7CC +dgb_12_EVS_Chest_Interact = 0x802409BC; // type:data rom:0xC4E8AC dgb_12_makeEntities = 0x80240A08; // type:data rom:0xC4E8F8 dgb_13_entryList = 0x80240000; // type:data rom:0xC4E960 dgb_13_config = 0x80240010; // type:data rom:0xC4E970 @@ -23147,6 +24192,7 @@ D_09000900 = 0x9000900; // type:data D_090009E8 = 0x90009E8; // type:data D_090009F0 = 0x90009F0; // type:data D_09000A00 = 0x9000A00; // type:data +D_09000A10 = 0x9000A10; // type:data D_09000B88 = 0x9000B88; // type:data D_09000BA8 = 0x9000BA8; // type:data D_09000BC8 = 0x9000BC8; // type:data @@ -23200,12 +24246,34 @@ D_09001938 = 0x9001938; // type:data D_09001C80 = 0x9001C80; // type:data D_09001CC8 = 0x9001CC8; // type:data D_09001D00 = 0x9001D00; // type:data +D_09001D40 = 0x9001D40; // type:data +D_09001DE0 = 0x9001DE0; // type:data +D_09001E50 = 0x9001E50; // type:data +D_09001E90 = 0x9001E90; // type:data +D_09001ED0 = 0x9001ED0; // type:data +D_09001F10 = 0x9001F10; // type:data +D_09001F50 = 0x9001F50; // type:data +D_09001F90 = 0x9001F90; // type:data +D_09001FD0 = 0x9001FD0; // type:data D_09002000 = 0x9002000; // type:data +D_09002010 = 0x9002010; // type:data +D_09002050 = 0x9002050; // type:data +D_09002090 = 0x9002090; // type:data +D_090020D0 = 0x90020D0; // type:data D_090020E8 = 0x90020E8; // type:data D_09002100 = 0x9002100; // type:data +D_09002110 = 0x9002110; // type:data +D_09002150 = 0x9002150; // type:data +D_09002160 = 0x9002160; // type:data D_09002170 = 0x9002170; // type:data +D_09002180 = 0x9002180; // type:data +D_09002190 = 0x9002190; // type:data D_09002198 = 0x9002198; // type:data +D_090021A8 = 0x90021A8; // type:data +D_090021C0 = 0x90021C0; // type:data D_090021D0 = 0x90021D0; // type:data +D_090021E0 = 0x90021E0; // type:data +D_09002200 = 0x9002200; // type:data D_09002230 = 0x9002230; // type:data D_09002238 = 0x9002238; // type:data D_09002250 = 0x9002250; // type:data @@ -23293,42 +24361,13 @@ dp = 0x8006AE0C; // osDispatchThreadSave = 0x8006B1F4; // dead_guMtxIdentF = 0x8006C660; // type:data dead_guMtxCatF = 0x8006C7C0; // type:data +fx_sun_undeclared = 0x80072950; // type:func EnemyNpcHit = 0x80077F70; // EnemyNpcDefeat = 0x8007809C; // -D_80079540 = 0x80079540; // type:data dead:yes -HudScript_HandPointDownLoop = 0x8007FF20; // type:data -HudScript_HandPointDown = 0x800800A0; // type:data -HudScript_HandPointDownHeld = 0x800801D8; // type:data -HudScript_HandPointLeftLoop = 0x80080208; // type:data -HudScript_HandPointLeft = 0x80080388; // type:data -HudScript_HandPointLeftHeld = 0x800804C0; // type:data -HudScript_Item_Hammer1 = 0x800806A0; // type:data -HudScript_Item_Hammer2 = 0x800806D0; // type:data -HudScript_Item_Hammer3 = 0x80080700; // type:data -HudScript_Item_Boots1 = 0x80080730; // type:data -HudScript_Item_Boots2 = 0x80080760; // type:data -HudScript_Item_Boots3 = 0x80080790; // type:data -HudScript_Item_Items = 0x800807C0; // type:data -HudScript_Item_Coin = 0x80080868; // type:data -HudScript_Item_CoinSparkleRandom = 0x80080FC4; // type:data -HudScript_Item_StarPoint = 0x80080FF0; // type:data -HudScript_Item_SmallStarPoint = 0x800810C8; // type:data -HudScript_Item_Unused_08B = 0x800822F8; // type:data -HudScript_Item_Unused_08B_disabled = 0x80082328; // type:data -HudScript_Item_Unused_08C = 0x80082358; // type:data -HudScript_Item_Unused_08C_disabled = 0x80082388; // type:data -gItemTable = 0x800878E0; // size:0x2D80 -gItemHudScripts = 0x8008A680; // type:data +dead_gGameStatusPtr = 0x80079430; // type:data +D_80079540 = 0x80079540; // type:data +dead_gCurrentCameraID = 0x8007C760; // type:data dead_gItemTable = 0x8008D2C0; // type:data -gItemEntityScripts = 0x8008DDD4; // type:data -gItemIconRasterOffsets = 0x8008E3D8; // type:data -gItemIconPaletteOffsets = 0x8008E94C; // type:data -D_8008EEC0 = 0x8008EEC0; // type:data -D_8008EEF0 = 0x8008EEF0; // type:data -gPartnerPopupProperties = 0x8008EF20; // type:data -gPartnerIconHudScripts = 0x8008EFF8; // type:data -gMoveTable = 0x8008F060; // type:data -gMessageBoxFrameParts = 0x8008FEE0; // type:data rdpstateinit_dl = 0x80093BB8; // type:data hdwrBugFlag.2 = 0x80093DA0; // type:data dtor.2 = 0x80093DC0; // type:data @@ -23732,6 +24771,7 @@ flo_22_pad_518 = 0x80240518; // type:data dgb_11_pad_56C = 0x8024056C; // type:data arn_09_pad_5A8 = 0x802405A8; // type:data dgb_06_Chest_VarStash = 0x80240620; // type:data +varStash.2 = 0x80240620; // type:data varTable.2 = 0x80240620; // type:data dgb_10_pad_66C = 0x8024066C; // type:data arn_11_pad_674 = 0x80240674; // type:data @@ -25246,10 +26286,6 @@ D_E003A80C = 0xE003A80C; // type:data D_E003A820 = 0xE003A820; // type:data D_E003A828 = 0xE003A828; // type:data D_E003A830 = 0xE003A830; // type:data -D_E003CCA0 = 0xE003CCA0; // type:data -D_E003CCD0 = 0xE003CCD0; // type:data -D_E003CCF8 = 0xE003CCF8; // type:data -D_E003CD1C = 0xE003CD1C; // type:data D_E003CD40 = 0xE003CD40; // type:data D_E003CD48 = 0xE003CD48; // type:data D_E003CD50 = 0xE003CD50; // type:data @@ -25348,8 +26384,6 @@ D_E005C720 = 0xE005C720; // type:data D_E005E670 = 0xE005E670; // type:data D_E005E674 = 0xE005E674; // type:data D_E005E680 = 0xE005E680; // type:data -D_E0060730 = 0xE0060730; // type:data -D_E0060738 = 0xE0060738; // type:data D_E0060740 = 0xE0060740; // type:data D_E0060748 = 0xE0060748; // type:data D_E0060750 = 0xE0060750; // type:data @@ -25781,9 +26815,10 @@ dead_guMtxIdentF = 0x8006C660; // type:data dead:yes dead_guMtxCatF = 0x8006C7C0; // type:data dead:yes dead_playFX_11 = 0x80075170; // type:func dead:yes dead_gGameStatusPtr = 0x80079430; // type:data dead:yes +D_80079540 = 0x80079540; // type:data dead:yes dead_gCurrentCameraID = 0x8007C760; // type:data dead:yes -dead_gItemTable = 0x8008D2C0; // type:data dead:true dead_gItemTable = 0x8008D2C0; // type:data dead:yes +dead_gItemTable = 0x8008D2C0; // type:data dead:true dead_gCurrentCamID = 0x800A158C; // type:data dead:yes dead_gOverrideFlags = 0x800A15A8; // type:data dead:yes dead_gCurrentEncounter = 0x800B7EF0; // type:data dead:yes diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 4164d853e3..cf7c6c0b52 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -48,9 +48,7 @@ D_B0000000 = 0xB0000000; D_B0000008 = 0xB0000008; D_B0000010 = 0xB0000010; D_D9FCFFFF = 0xD9FCFFFF; -D_E001C5E0 = 0xE001C5E0; D_E007EC2F = 0xE007EC2F; -D_E00963E0 = 0xE00963E0; D_E1000010 = 0xE1000010; D_E7000008 = 0xE7000008; D_E8000008 = 0xE8000008; @@ -67,6 +65,8 @@ D_7012BC11 = 0x7012BC11; D_80026AC7 = 0x80026AC7; D_8004AA85 = 0x8004AA85; +fx_sun_undeclared = fx_sun; + // effect_1 D_09000FA0 = 0x09000FA0; D_09001060 = 0x09001060; @@ -273,6 +273,27 @@ D_090021C0 = 0x090021C0; D_090021E0 = 0x090021E0; D_09002200 = 0x09002200; +// effect_big_snowflakes +D_09000900 = 0x09000900; +D_090009E8 = 0x090009E8; +D_09000A10 = 0x09000A10; + +// effect_butterflies +D_09002D40 = 0x09002D40; +D_09003880 = 0x09003880; +D_090038F8 = 0x090038F8; +D_09003968 = 0x09003968; +D_090039D8 = 0x090039D8; +D_09003A48 = 0x09003A48; +D_09003AB8 = 0x09003AB8; +D_09003B28 = 0x09003B28; +D_09003B98 = 0x09003B98; +D_09003C08 = 0x09003C08; +D_09003C78 = 0x09003C78; +D_09003CE8 = 0x09003CE8; +D_09003D58 = 0x09003D58; +D_09003DC8 = 0x09003DC8; + // Invalid pointers from dead code dead_atan2 = 0x8002AF70; dead_gCurrentCamID = 0x800A158C; @@ -358,9 +379,6 @@ dead_switch_to_partner = 0x800F2D5C; dead_set_message_msg = 0x80130C74; dead_fx_energy_orb_wave = 0x800769D0; dead_fx_radial_shimmer = 0x80075E30; -func_8002B524 = 0x8002B524; -func_8002BF18 = 0x8002BF18; -func_80076970 = 0x80076970; dead_set_screen_overlay_color = 0x80144200; dead_set_screen_overlay_params_front = 0x80144178; dead_npc_test_move_simple_without_slipping = 0x800E53AC;