From d47528ee591c0093dd704fa82f5bfe15d9435158 Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Mon, 5 Apr 2021 18:08:45 -0500 Subject: [PATCH] Bongo Bongo (ovl_Boss_Sst) (#458) * First pass * Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * more matching fun * fun with bongo * clean this up later * found the matching versions * diff.py has escaped? * now with more docs * Now with floor and more docs * one more thing * incremental progress * It's Bongo time * one little thing * merge ZAP * update * camera * gfx now in their own file * now with more object decomp * name animations * now shiftable * missed some. also DECR * opd merge * start xml * now with xml asset extraction * format * cleanup * removed union Co-authored-by: Kelebek1 Co-authored-by: petrie911 --- .../ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s | 14 - .../actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s | 82 - .../actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s | 31 - .../ovl_Bg_Sst_Floor/BgSstFloor_Update.s | 246 -- .../actors/ovl_Boss_Sst/BossSst_Destroy.s | 21 - .../actors/ovl_Boss_Sst/BossSst_Draw.s | 272 -- .../actors/ovl_Boss_Sst/BossSst_Init.s | 319 -- .../actors/ovl_Boss_Sst/BossSst_Update.s | 221 - .../actors/ovl_Boss_Sst/func_8092CAA0.s | 13 - .../actors/ovl_Boss_Sst/func_8092CAD0.s | 17 - .../actors/ovl_Boss_Sst/func_8092CB0C.s | 87 - .../actors/ovl_Boss_Sst/func_8092CC58.s | 958 ----- .../actors/ovl_Boss_Sst/func_8092DA6C.s | 21 - .../actors/ovl_Boss_Sst/func_8092DAB8.s | 33 - .../actors/ovl_Boss_Sst/func_8092DB30.s | 8 - .../actors/ovl_Boss_Sst/func_8092DB4C.s | 118 - .../actors/ovl_Boss_Sst/func_8092DCEC.s | 28 - .../actors/ovl_Boss_Sst/func_8092DD50.s | 70 - .../actors/ovl_Boss_Sst/func_8092DE48.s | 23 - .../actors/ovl_Boss_Sst/func_8092DEA0.s | 46 - .../actors/ovl_Boss_Sst/func_8092DF40.s | 55 - .../actors/ovl_Boss_Sst/func_8092DFFC.s | 175 - .../actors/ovl_Boss_Sst/func_8092E25C.s | 34 - .../actors/ovl_Boss_Sst/func_8092E2E0.s | 31 - .../actors/ovl_Boss_Sst/func_8092E34C.s | 22 - .../actors/ovl_Boss_Sst/func_8092E3A0.s | 21 - .../actors/ovl_Boss_Sst/func_8092E3E8.s | 21 - .../actors/ovl_Boss_Sst/func_8092E438.s | 17 - .../actors/ovl_Boss_Sst/func_8092E470.s | 42 - .../actors/ovl_Boss_Sst/func_8092E510.s | 190 - .../actors/ovl_Boss_Sst/func_8092E790.s | 42 - .../actors/ovl_Boss_Sst/func_8092E830.s | 75 - .../actors/ovl_Boss_Sst/func_8092E930.s | 56 - .../actors/ovl_Boss_Sst/func_8092EA00.s | 24 - .../actors/ovl_Boss_Sst/func_8092EA50.s | 37 - .../actors/ovl_Boss_Sst/func_8092EAE0.s | 115 - .../actors/ovl_Boss_Sst/func_8092EC74.s | 78 - .../actors/ovl_Boss_Sst/func_8092ED9C.s | 102 - .../actors/ovl_Boss_Sst/func_8092EF28.s | 104 - .../actors/ovl_Boss_Sst/func_8092F0BC.s | 168 - .../actors/ovl_Boss_Sst/func_8092F30C.s | 32 - .../actors/ovl_Boss_Sst/func_8092F374.s | 37 - .../actors/ovl_Boss_Sst/func_8092F3F0.s | 23 - .../actors/ovl_Boss_Sst/func_8092F434.s | 154 - .../actors/ovl_Boss_Sst/func_8092F65C.s | 41 - .../actors/ovl_Boss_Sst/func_8092F6F0.s | 44 - .../actors/ovl_Boss_Sst/func_8092F790.s | 25 - .../actors/ovl_Boss_Sst/func_8092F7DC.s | 59 - .../actors/ovl_Boss_Sst/func_8092F894.s | 30 - .../actors/ovl_Boss_Sst/func_8092F8F0.s | 207 - .../actors/ovl_Boss_Sst/func_8092FBE4.s | 32 - .../actors/ovl_Boss_Sst/func_8092FC60.s | 102 - .../actors/ovl_Boss_Sst/func_8092FDD0.s | 30 - .../actors/ovl_Boss_Sst/func_8092FE44.s | 97 - .../actors/ovl_Boss_Sst/func_8092FF94.s | 24 - .../actors/ovl_Boss_Sst/func_8092FFF0.s | 69 - .../actors/ovl_Boss_Sst/func_809300E4.s | 30 - .../actors/ovl_Boss_Sst/func_80930158.s | 66 - .../actors/ovl_Boss_Sst/func_80930238.s | 20 - .../actors/ovl_Boss_Sst/func_80930284.s | 91 - .../actors/ovl_Boss_Sst/func_809303C8.s | 30 - .../actors/ovl_Boss_Sst/func_8093043C.s | 17 - .../actors/ovl_Boss_Sst/func_80930474.s | 43 - .../actors/ovl_Boss_Sst/func_8093051C.s | 162 - .../actors/ovl_Boss_Sst/func_80930748.s | 28 - .../actors/ovl_Boss_Sst/func_809307B4.s | 71 - .../actors/ovl_Boss_Sst/func_809308A4.s | 38 - .../actors/ovl_Boss_Sst/func_80930934.s | 139 - .../actors/ovl_Boss_Sst/func_80930B18.s | 43 - .../actors/ovl_Boss_Sst/func_80930BC0.s | 84 - .../actors/ovl_Boss_Sst/func_80930CE4.s | 37 - .../actors/ovl_Boss_Sst/func_80930D70.s | 144 - .../actors/ovl_Boss_Sst/func_80930F80.s | 27 - .../actors/ovl_Boss_Sst/func_80930FE8.s | 28 - .../actors/ovl_Boss_Sst/func_80931044.s | 35 - .../actors/ovl_Boss_Sst/func_809310CC.s | 91 - .../actors/ovl_Boss_Sst/func_80931210.s | 62 - .../actors/ovl_Boss_Sst/func_80931300.s | 141 - .../actors/ovl_Boss_Sst/func_809314F0.s | 29 - .../actors/ovl_Boss_Sst/func_80931560.s | 159 - .../actors/ovl_Boss_Sst/func_80931788.s | 29 - .../actors/ovl_Boss_Sst/func_809317F8.s | 49 - .../actors/ovl_Boss_Sst/func_809318A0.s | 35 - .../actors/ovl_Boss_Sst/func_80931928.s | 48 - .../actors/ovl_Boss_Sst/func_809319D0.s | 36 - .../actors/ovl_Boss_Sst/func_80931A5C.s | 196 - .../actors/ovl_Boss_Sst/func_80931D04.s | 23 - .../actors/ovl_Boss_Sst/func_80931D5C.s | 79 - .../actors/ovl_Boss_Sst/func_80931E70.s | 21 - .../actors/ovl_Boss_Sst/func_80931EC0.s | 17 - .../actors/ovl_Boss_Sst/func_80931EF8.s | 38 - .../actors/ovl_Boss_Sst/func_80931F84.s | 231 - .../actors/ovl_Boss_Sst/func_809322B4.s | 40 - .../actors/ovl_Boss_Sst/func_8093234C.s | 99 - .../actors/ovl_Boss_Sst/func_809324A4.s | 21 - .../actors/ovl_Boss_Sst/func_809324F4.s | 101 - .../actors/ovl_Boss_Sst/func_8093265C.s | 7 - .../actors/ovl_Boss_Sst/func_80932674.s | 121 - .../actors/ovl_Boss_Sst/func_80932808.s | 22 - .../actors/ovl_Boss_Sst/func_8093285C.s | 104 - .../actors/ovl_Boss_Sst/func_809329D4.s | 46 - .../actors/ovl_Boss_Sst/func_80932A80.s | 102 - .../actors/ovl_Boss_Sst/func_80932BDC.s | 24 - .../actors/ovl_Boss_Sst/func_80932C38.s | 64 - .../actors/ovl_Boss_Sst/func_80932D10.s | 42 - .../actors/ovl_Boss_Sst/func_80932DAC.s | 139 - .../actors/ovl_Boss_Sst/func_80932FA0.s | 21 - .../actors/ovl_Boss_Sst/func_80932FF0.s | 34 - .../actors/ovl_Boss_Sst/func_80933064.s | 21 - .../actors/ovl_Boss_Sst/func_809330B4.s | 36 - .../actors/ovl_Boss_Sst/func_80933134.s | 16 - .../actors/ovl_Boss_Sst/func_80933170.s | 40 - .../actors/ovl_Boss_Sst/func_809331E8.s | 11 - .../actors/ovl_Boss_Sst/func_80933210.s | 14 - .../actors/ovl_Boss_Sst/func_8093323C.s | 22 - .../actors/ovl_Boss_Sst/func_80933290.s | 43 - .../actors/ovl_Boss_Sst/func_80933328.s | 54 - .../actors/ovl_Boss_Sst/func_809333F4.s | 99 - .../actors/ovl_Boss_Sst/func_80933554.s | 47 - .../actors/ovl_Boss_Sst/func_80933608.s | 82 - .../actors/ovl_Boss_Sst/func_80933724.s | 10 - .../actors/ovl_Boss_Sst/func_80933748.s | 121 - .../actors/ovl_Boss_Sst/func_809338DC.s | 42 - .../actors/ovl_Boss_Sst/func_80933978.s | 35 - .../actors/ovl_Boss_Sst/func_809339F8.s | 105 - .../actors/ovl_Boss_Sst/func_80933B84.s | 77 - .../actors/ovl_Boss_Sst/func_80933C80.s | 29 - .../actors/ovl_Boss_Sst/func_80933CEC.s | 18 - .../actors/ovl_Boss_Sst/func_80933D2C.s | 11 - .../actors/ovl_Boss_Sst/func_80933D54.s | 109 - .../actors/ovl_Boss_Sst/func_80933EE0.s | 92 - .../actors/ovl_Boss_Sst/func_80934338.s | 174 - .../actors/ovl_Boss_Sst/func_809345A4.s | 21 - .../actors/ovl_Boss_Sst/func_809345F0.s | 15 - .../actors/ovl_Boss_Sst/func_80934628.s | 18 - .../actors/ovl_Boss_Sst/func_80934A44.s | 581 --- .../actors/ovl_Boss_Sst/func_80935238.s | 43 - .../actors/ovl_Boss_Sst/func_809352DC.s | 328 -- .../actors/ovl_Boss_Sst/func_80935764.s | 80 - .../actors/ovl_Boss_Sst/func_80935890.s | 49 - .../actors/ovl_Boss_Sst/func_80935948.s | 60 - .../actors/ovl_Boss_Sst/func_80935A20.s | 202 - .../actors/ovl_Boss_Sst/func_80935CDC.s | 166 - .../actors/ovl_Boss_Sst/func_80935F30.s | 123 - .../actors/ovl_Boss_Sst/func_809360FC.s | 185 - .../actors/ovl_Boss_Sst/func_8093639C.s | 432 -- assets/xml/objects/object_sst.xml | 55 + assets/xml/overlays/ovl_Boss_Sst.xml | 8 + data/overlays/actors/z_bg_sst_floor.data.s | 19 - data/overlays/actors/z_bg_sst_floor.reloc.s | 13 - data/overlays/actors/z_boss_sst.bss.s | 32 - data/overlays/actors/z_boss_sst.data.s | 140 - data/overlays/actors/z_boss_sst.reloc.s | 13 - diff.py | 0 include/functions.h | 6 +- spec | 10 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 129 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h | 11 +- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 3803 ++++++++++++++--- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h | 50 +- .../actors/ovl_Boss_Sst/z_boss_sst_colchk.c | 352 ++ 161 files changed, 3802 insertions(+), 12897 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s create mode 100644 assets/xml/objects/object_sst.xml create mode 100644 assets/xml/overlays/ovl_Boss_Sst.xml delete mode 100644 data/overlays/actors/z_bg_sst_floor.data.s delete mode 100644 data/overlays/actors/z_bg_sst_floor.reloc.s delete mode 100644 data/overlays/actors/z_boss_sst.bss.s delete mode 100644 data/overlays/actors/z_boss_sst.data.s delete mode 100644 data/overlays/actors/z_boss_sst.reloc.s mode change 100755 => 100644 diff.py create mode 100644 src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.c diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s deleted file mode 100644 index fff3d06f32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgSstFloor_Destroy -/* 00068 808B9978 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0006C 808B997C AFA40018 */ sw $a0, 0x0018($sp) -/* 00070 808B9980 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00074 808B9984 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00078 808B9988 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0007C 808B998C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00080 808B9990 0C00FB56 */ jal DynaPoly_DeleteBgActor - ## DynaPoly_DeleteBgActor -/* 00084 808B9994 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00088 808B9998 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0008C 808B999C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00090 808B99A0 03E00008 */ jr $ra -/* 00094 808B99A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s deleted file mode 100644 index 961bf0fda8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s +++ /dev/null @@ -1,82 +0,0 @@ -.rdata -glabel D_808B9E40 - .asciz "../z_bg_sst_floor.c" - .balign 4 - -glabel D_808B9E54 - .asciz "../z_bg_sst_floor.c" - .balign 4 - -glabel D_808B9E68 - .asciz "../z_bg_sst_floor.c" - .balign 4 - -.late_rodata -glabel D_808B9E88 - .word 0xBB23D70A, 0x00000000 - -.text -glabel BgSstFloor_Draw -/* 00404 808B9D14 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00408 808B9D18 AFBF001C */ sw $ra, 0x001C($sp) -/* 0040C 808B9D1C AFB00018 */ sw $s0, 0x0018($sp) -/* 00410 808B9D20 AFA40048 */ sw $a0, 0x0048($sp) -/* 00414 808B9D24 AFA5004C */ sw $a1, 0x004C($sp) -/* 00418 808B9D28 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0041C 808B9D2C 3C06808C */ lui $a2, %hi(D_808B9E40) ## $a2 = 808C0000 -/* 00420 808B9D30 24C69E40 */ addiu $a2, $a2, %lo(D_808B9E40) ## $a2 = 808B9E40 -/* 00424 808B9D34 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00428 808B9D38 24070115 */ addiu $a3, $zero, 0x0115 ## $a3 = 00000115 -/* 0042C 808B9D3C 0C031AB1 */ jal Graph_OpenDisps -/* 00430 808B9D40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00434 808B9D44 8FAF004C */ lw $t7, 0x004C($sp) -/* 00438 808B9D48 0C024F46 */ jal func_80093D18 -/* 0043C 808B9D4C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00440 808B9D50 8FB80048 */ lw $t8, 0x0048($sp) -/* 00444 808B9D54 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00448 808B9D58 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0044C 808B9D5C 87190168 */ lh $t9, 0x0168($t8) ## 00000168 -/* 00450 808B9D60 3C01808C */ lui $at, %hi(D_808B9E88) ## $at = 808C0000 -/* 00454 808B9D64 C4289E88 */ lwc1 $f8, %lo(D_808B9E88)($at) -/* 00458 808B9D68 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0045C 808B9D6C 44066000 */ mfc1 $a2, $f12 -/* 00460 808B9D70 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00464 808B9D74 468021A0 */ cvt.s.w $f6, $f4 -/* 00468 808B9D78 46083382 */ mul.s $f14, $f6, $f8 -/* 0046C 808B9D7C 0C0342A3 */ jal Matrix_Scale -/* 00470 808B9D80 00000000 */ nop -/* 00474 808B9D84 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00478 808B9D88 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 0047C 808B9D8C 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 00480 808B9D90 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00484 808B9D94 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 00488 808B9D98 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0048C 808B9D9C 8FAA004C */ lw $t2, 0x004C($sp) -/* 00490 808B9DA0 3C05808C */ lui $a1, %hi(D_808B9E54) ## $a1 = 808C0000 -/* 00494 808B9DA4 24A59E54 */ addiu $a1, $a1, %lo(D_808B9E54) ## $a1 = 808B9E54 -/* 00498 808B9DA8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 0049C 808B9DAC 2406011B */ addiu $a2, $zero, 0x011B ## $a2 = 0000011B -/* 004A0 808B9DB0 0C0346A2 */ jal Matrix_NewMtx -/* 004A4 808B9DB4 AFA2002C */ sw $v0, 0x002C($sp) -/* 004A8 808B9DB8 8FA3002C */ lw $v1, 0x002C($sp) -/* 004AC 808B9DBC 3C0D0602 */ lui $t5, 0x0602 ## $t5 = 06020000 -/* 004B0 808B9DC0 25AD9210 */ addiu $t5, $t5, 0x9210 ## $t5 = 06019210 -/* 004B4 808B9DC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 004B8 808B9DC8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004BC 808B9DCC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 004C0 808B9DD0 3C06808C */ lui $a2, %hi(D_808B9E68) ## $a2 = 808C0000 -/* 004C4 808B9DD4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 004C8 808B9DD8 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 004CC 808B9DDC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 004D0 808B9DE0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 004D4 808B9DE4 8FAE004C */ lw $t6, 0x004C($sp) -/* 004D8 808B9DE8 24C69E68 */ addiu $a2, $a2, %lo(D_808B9E68) ## $a2 = 808B9E68 -/* 004DC 808B9DEC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 004E0 808B9DF0 2407011F */ addiu $a3, $zero, 0x011F ## $a3 = 0000011F -/* 004E4 808B9DF4 0C031AD5 */ jal Graph_CloseDisps -/* 004E8 808B9DF8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 004EC 808B9DFC 8FBF001C */ lw $ra, 0x001C($sp) -/* 004F0 808B9E00 8FB00018 */ lw $s0, 0x0018($sp) -/* 004F4 808B9E04 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 004F8 808B9E08 03E00008 */ jr $ra -/* 004FC 808B9E0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s deleted file mode 100644 index 39c639f385..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel BgSstFloor_Init -/* 00000 808B9910 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00004 808B9914 AFA5002C */ sw $a1, 0x002C($sp) -/* 00008 808B9918 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0000C 808B991C 3C05808C */ lui $a1, %hi(D_808B9E3C) ## $a1 = 808C0000 -/* 00010 808B9920 AFA40028 */ sw $a0, 0x0028($sp) -/* 00014 808B9924 AFA0001C */ sw $zero, 0x001C($sp) -/* 00018 808B9928 0C01E037 */ jal Actor_ProcessInitChain - -/* 0001C 808B992C 24A59E3C */ addiu $a1, $a1, %lo(D_808B9E3C) ## $a1 = 808B9E3C -/* 00020 808B9930 8FA40028 */ lw $a0, 0x0028($sp) -/* 00024 808B9934 0C010D20 */ jal DynaPolyActor_Init - -/* 00028 808B9938 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0002C 808B993C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 00030 808B9940 248494F8 */ addiu $a0, $a0, 0x94F8 ## $a0 = 060194F8 -/* 00034 808B9944 0C010620 */ jal CollisionHeader_GetVirtual - -/* 00038 808B9948 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFF4 -/* 0003C 808B994C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00040 808B9950 8FA60028 */ lw $a2, 0x0028($sp) -/* 00044 808B9954 8FA7001C */ lw $a3, 0x001C($sp) -/* 00048 808B9958 0C00FA9D */ jal DynaPoly_SetBgActor - ## DynaPoly_SetBgActor -/* 0004C 808B995C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00050 808B9960 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00054 808B9964 ADC2014C */ sw $v0, 0x014C($t6) ## 0000014C -/* 00058 808B9968 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0005C 808B996C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00060 808B9970 03E00008 */ jr $ra -/* 00064 808B9974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s deleted file mode 100644 index d1bdc3fd77..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s +++ /dev/null @@ -1,246 +0,0 @@ -.late_rodata -glabel D_808B9E7C - .word 0x3B3B3EE7 -glabel D_808B9E80 - .word 0x3B3B3EE7 -glabel D_808B9E84 - .float 1.57079637051 - -.text -glabel BgSstFloor_Update -/* 00098 808B99A8 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 -/* 0009C 808B99AC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 000A0 808B99B0 244294F8 */ addiu $v0, $v0, 0x94F8 ## $v0 = 060194F8 -/* 000A4 808B99B4 0002C100 */ sll $t8, $v0, 4 -/* 000A8 808B99B8 3C068016 */ lui $a2, %hi(gSegments) -/* 000AC 808B99BC 0018CF02 */ srl $t9, $t8, 28 -/* 000B0 808B99C0 24C66FA8 */ addiu $a2, %lo(gSegments) -/* 000B4 808B99C4 00194880 */ sll $t1, $t9, 2 -/* 000B8 808B99C8 00C95021 */ addu $t2, $a2, $t1 -/* 000BC 808B99CC 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 000C0 808B99D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 000C4 808B99D4 AFB20020 */ sw $s2, 0x0020($sp) -/* 000C8 808B99D8 AFB1001C */ sw $s1, 0x001C($sp) -/* 000CC 808B99DC AFB00018 */ sw $s0, 0x0018($sp) -/* 000D0 808B99E0 AFA5003C */ sw $a1, 0x003C($sp) -/* 000D4 808B99E4 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 -/* 000D8 808B99E8 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 000DC 808B99EC 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 000E0 808B99F0 00476024 */ and $t4, $v0, $a3 -/* 000E4 808B99F4 3C088000 */ lui $t0, 0x8000 ## $t0 = 80000000 -/* 000E8 808B99F8 016C6821 */ addu $t5, $t3, $t4 -/* 000EC 808B99FC 01A89021 */ addu $s2, $t5, $t0 -/* 000F0 808B9A00 AFAF002C */ sw $t7, 0x002C($sp) -/* 000F4 808B9A04 8E430010 */ lw $v1, 0x0010($s2) ## 00000010 -/* 000F8 808B9A08 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 000FC 808B9A0C 00037100 */ sll $t6, $v1, 4 -/* 00100 808B9A10 000E7F02 */ srl $t7, $t6, 28 -/* 00104 808B9A14 000FC080 */ sll $t8, $t7, 2 -/* 00108 808B9A18 00D8C821 */ addu $t9, $a2, $t8 -/* 0010C 808B9A1C 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 00110 808B9A20 00675024 */ and $t2, $v1, $a3 -/* 00114 808B9A24 012A5821 */ addu $t3, $t1, $t2 -/* 00118 808B9A28 01686021 */ addu $t4, $t3, $t0 -/* 0011C 808B9A2C 0C010D64 */ jal func_80043590 -/* 00120 808B9A30 AE4C0010 */ sw $t4, 0x0010($s2) ## 00000010 -/* 00124 808B9A34 1040000D */ beq $v0, $zero, .L808B9A6C -/* 00128 808B9A38 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0012C 808B9A3C C6240094 */ lwc1 $f4, 0x0094($s1) ## 00000094 -/* 00130 808B9A40 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 00134 808B9A44 8FAD003C */ lw $t5, 0x003C($sp) -/* 00138 808B9A48 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 0013C 808B9A4C 4606203C */ c.lt.s $f4, $f6 -/* 00140 808B9A50 00000000 */ nop -/* 00144 808B9A54 45020006 */ bc1fl .L808B9A70 -/* 00148 808B9A58 8FAE003C */ lw $t6, 0x003C($sp) -/* 0014C 808B9A5C 0C0169DF */ jal Camera_ChangeSetting -/* 00150 808B9A60 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 -/* 00154 808B9A64 10000005 */ beq $zero, $zero, .L808B9A7C -/* 00158 808B9A68 00000000 */ nop -.L808B9A6C: -/* 0015C 808B9A6C 8FAE003C */ lw $t6, 0x003C($sp) -.L808B9A70: -/* 00160 808B9A70 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00164 808B9A74 0C0169DF */ jal Camera_ChangeSetting -/* 00168 808B9A78 8DC40790 */ lw $a0, 0x0790($t6) ## 00000790 -.L808B9A7C: -/* 0016C 808B9A7C 0C010D5B */ jal func_8004356C -/* 00170 808B9A80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00174 808B9A84 1040000F */ beq $v0, $zero, .L808B9AC4 -/* 00178 808B9A88 8FAF002C */ lw $t7, 0x002C($sp) -/* 0017C 808B9A8C 85F80896 */ lh $t8, 0x0896($t7) ## 00000896 -/* 00180 808B9A90 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00184 808B9A94 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 -/* 00188 808B9A98 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 0018C 808B9A9C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00190 808B9AA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00194 808B9AA4 468054A0 */ cvt.s.w $f18, $f10 -/* 00198 808B9AA8 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 -/* 0019C 808B9AAC 4612403C */ c.lt.s $f8, $f18 -/* 001A0 808B9AB0 00000000 */ nop -/* 001A4 808B9AB4 45020004 */ bc1fl .L808B9AC8 -/* 001A8 808B9AB8 8629001C */ lh $t1, 0x001C($s1) ## 0000001C -/* 001AC 808B9ABC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 001B0 808B9AC0 A639001C */ sh $t9, 0x001C($s1) ## 0000001C -.L808B9AC4: -/* 001B4 808B9AC4 8629001C */ lh $t1, 0x001C($s1) ## 0000001C -.L808B9AC8: -/* 001B8 808B9AC8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001BC 808B9ACC 8FAA003C */ lw $t2, 0x003C($sp) -/* 001C0 808B9AD0 15210051 */ bne $t1, $at, .L808B9C18 -/* 001C4 808B9AD4 240B0050 */ addiu $t3, $zero, 0x0050 ## $t3 = 00000050 -/* 001C8 808B9AD8 8D501C74 */ lw $s0, 0x1C74($t2) ## 00001C74 -/* 001CC 808B9ADC 240C001C */ addiu $t4, $zero, 0x001C ## $t4 = 0000001C -/* 001D0 808B9AE0 A62B0166 */ sh $t3, 0x0166($s1) ## 00000166 -/* 001D4 808B9AE4 A620001C */ sh $zero, 0x001C($s1) ## 0000001C -/* 001D8 808B9AE8 A62C0164 */ sh $t4, 0x0164($s1) ## 00000164 -/* 001DC 808B9AEC 0C010D5B */ jal func_8004356C -/* 001E0 808B9AF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001E4 808B9AF4 10400020 */ beq $v0, $zero, .L808B9B78 -/* 001E8 808B9AF8 00000000 */ nop -/* 001EC 808B9AFC 8FA2002C */ lw $v0, 0x002C($sp) -/* 001F0 808B9B00 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 001F4 808B9B04 8C4D067C */ lw $t5, 0x067C($v0) ## 0000067C -/* 001F8 808B9B08 31AE6000 */ andi $t6, $t5, 0x6000 ## $t6 = 00000000 -/* 001FC 808B9B0C 15C0001A */ bne $t6, $zero, .L808B9B78 -/* 00200 808B9B10 00000000 */ nop -/* 00204 808B9B14 44818000 */ mtc1 $at, $f16 ## $f16 = 600.00 -/* 00208 808B9B18 C6240090 */ lwc1 $f4, 0x0090($s1) ## 00000090 -/* 0020C 808B9B1C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00210 808B9B20 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 00214 808B9B24 46048301 */ sub.s $f12, $f16, $f4 -/* 00218 808B9B28 460C303C */ c.lt.s $f6, $f12 -/* 0021C 808B9B2C 00000000 */ nop -/* 00220 808B9B30 45000011 */ bc1f .L808B9B78 -/* 00224 808B9B34 00000000 */ nop -/* 00228 808B9B38 44817000 */ mtc1 $at, $f14 ## $f14 = 350.00 -/* 0022C 808B9B3C 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 00230 808B9B40 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -/* 00234 808B9B44 460C703C */ c.lt.s $f14, $f12 -/* 00238 808B9B48 00000000 */ nop -/* 0023C 808B9B4C 45020003 */ bc1fl .L808B9B5C -/* 00240 808B9B50 944F0088 */ lhu $t7, 0x0088($v0) ## 00000088 -/* 00244 808B9B54 46007306 */ mov.s $f12, $f14 -/* 00248 808B9B58 944F0088 */ lhu $t7, 0x0088($v0) ## 00000088 -.L808B9B5C: -/* 0024C 808B9B5C 460C5202 */ mul.s $f8, $f10, $f12 -/* 00250 808B9B60 3C01808C */ lui $at, %hi(D_808B9E7C) ## $at = 808C0000 -/* 00254 808B9B64 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 00258 808B9B68 A4580088 */ sh $t8, 0x0088($v0) ## 00000088 -/* 0025C 808B9B6C C4329E7C */ lwc1 $f18, %lo(D_808B9E7C)($at) -/* 00260 808B9B70 46124102 */ mul.s $f4, $f8, $f18 -/* 00264 808B9B74 E4440060 */ swc1 $f4, 0x0060($v0) ## 00000060 -.L808B9B78: -/* 00268 808B9B78 52000028 */ beql $s0, $zero, .L808B9C1C -/* 0026C 808B9B7C 862B0164 */ lh $t3, 0x0164($s1) ## 00000164 -/* 00270 808B9B80 86190000 */ lh $t9, 0x0000($s0) ## 00000000 -.L808B9B84: -/* 00274 808B9B84 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 00278 808B9B88 57210021 */ bnel $t9, $at, .L808B9C10 -/* 0027C 808B9B8C 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 00280 808B9B90 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00284 808B9B94 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00288 808B9B98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0028C 808B9B9C 460A3032 */ c.eq.s $f6, $f10 -/* 00290 808B9BA0 00000000 */ nop -/* 00294 808B9BA4 4502001A */ bc1fl .L808B9C10 -/* 00298 808B9BA8 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 0029C 808B9BAC 0C00B6E3 */ jal Actor_WorldDistXZToActor -/* 002A0 808B9BB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002A4 808B9BB4 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 002A8 808B9BB8 44817000 */ mtc1 $at, $f14 ## $f14 = 350.00 -/* 002AC 808B9BBC 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 002B0 808B9BC0 44818000 */ mtc1 $at, $f16 ## $f16 = 600.00 -/* 002B4 808B9BC4 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 002B8 808B9BC8 4610003C */ c.lt.s $f0, $f16 -/* 002BC 808B9BCC 46008081 */ sub.s $f2, $f16, $f0 -/* 002C0 808B9BD0 4500000E */ bc1f .L808B9C0C -/* 002C4 808B9BD4 46001306 */ mov.s $f12, $f2 -/* 002C8 808B9BD8 4602703C */ c.lt.s $f14, $f2 -/* 002CC 808B9BDC 44814000 */ mtc1 $at, $f8 ## $f8 = 9.00 -/* 002D0 808B9BE0 45020003 */ bc1fl .L808B9BF0 -/* 002D4 808B9BE4 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 002D8 808B9BE8 46007306 */ mov.s $f12, $f14 -/* 002DC 808B9BEC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -.L808B9BF0: -/* 002E0 808B9BF0 460C4482 */ mul.s $f18, $f8, $f12 -/* 002E4 808B9BF4 3C01808C */ lui $at, %hi(D_808B9E80) ## $at = 808C0000 -/* 002E8 808B9BF8 312AFFFC */ andi $t2, $t1, 0xFFFC ## $t2 = 00000000 -/* 002EC 808B9BFC A60A0088 */ sh $t2, 0x0088($s0) ## 00000088 -/* 002F0 808B9C00 C4249E80 */ lwc1 $f4, %lo(D_808B9E80)($at) -/* 002F4 808B9C04 46049182 */ mul.s $f6, $f18, $f4 -/* 002F8 808B9C08 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -.L808B9C0C: -/* 002FC 808B9C0C 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -.L808B9C10: -/* 00300 808B9C10 5600FFDC */ bnel $s0, $zero, .L808B9B84 -/* 00304 808B9C14 86190000 */ lh $t9, 0x0000($s0) ## 00000000 -.L808B9C18: -/* 00308 808B9C18 862B0164 */ lh $t3, 0x0164($s1) ## 00000164 -.L808B9C1C: -/* 0030C 808B9C1C 3C01808C */ lui $at, %hi(D_808B9E84) ## $at = 808C0000 -/* 00310 808B9C20 C4329E84 */ lwc1 $f18, %lo(D_808B9E84)($at) -/* 00314 808B9C24 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 00318 808B9C28 00000000 */ nop -/* 0031C 808B9C2C 46805220 */ cvt.s.w $f8, $f10 -/* 00320 808B9C30 46124302 */ mul.s $f12, $f8, $f18 -/* 00324 808B9C34 0C0400A4 */ jal sinf - -/* 00328 808B9C38 00000000 */ nop -/* 0032C 808B9C3C 862C0166 */ lh $t4, 0x0166($s1) ## 00000166 -/* 00330 808B9C40 26240166 */ addiu $a0, $s1, 0x0166 ## $a0 = 00000166 -/* 00334 808B9C44 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00338 808B9C48 000C6823 */ subu $t5, $zero, $t4 -/* 0033C 808B9C4C 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 00340 808B9C50 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00344 808B9C54 468021A0 */ cvt.s.w $f6, $f4 -/* 00348 808B9C58 46060282 */ mul.s $f10, $f0, $f6 -/* 0034C 808B9C5C 4600520D */ trunc.w.s $f8, $f10 -/* 00350 808B9C60 440F4000 */ mfc1 $t7, $f8 -/* 00354 808B9C64 0C01DE5F */ jal Math_StepToS - -/* 00358 808B9C68 A62F0168 */ sh $t7, 0x0168($s1) ## 00000168 -/* 0035C 808B9C6C 86380168 */ lh $t8, 0x0168($s1) ## 00000168 -/* 00360 808B9C70 C632000C */ lwc1 $f18, 0x000C($s1) ## 0000000C -/* 00364 808B9C74 8E490010 */ lw $t1, 0x0010($s2) ## 00000010 -/* 00368 808B9C78 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 0036C 808B9C7C 00000000 */ nop -/* 00370 808B9C80 468021A0 */ cvt.s.w $f6, $f4 -/* 00374 808B9C84 46069280 */ add.s $f10, $f18, $f6 -/* 00378 808B9C88 4600520D */ trunc.w.s $f8, $f10 -/* 0037C 808B9C8C 44034000 */ mfc1 $v1, $f8 -/* 00380 808B9C90 00000000 */ nop -/* 00384 808B9C94 00031C00 */ sll $v1, $v1, 16 -/* 00388 808B9C98 00031C03 */ sra $v1, $v1, 16 -/* 0038C 808B9C9C A5230050 */ sh $v1, 0x0050($t1) ## 00000050 -/* 00390 808B9CA0 8E4A0010 */ lw $t2, 0x0010($s2) ## 00000010 -/* 00394 808B9CA4 A5430044 */ sh $v1, 0x0044($t2) ## 00000044 -/* 00398 808B9CA8 8E4B0010 */ lw $t3, 0x0010($s2) ## 00000010 -/* 0039C 808B9CAC A5630038 */ sh $v1, 0x0038($t3) ## 00000038 -/* 003A0 808B9CB0 8E4C0010 */ lw $t4, 0x0010($s2) ## 00000010 -/* 003A4 808B9CB4 A583002C */ sh $v1, 0x002C($t4) ## 0000002C -/* 003A8 808B9CB8 8E4D0010 */ lw $t5, 0x0010($s2) ## 00000010 -/* 003AC 808B9CBC A5A3001A */ sh $v1, 0x001A($t5) ## 0000001A -/* 003B0 808B9CC0 8E4E0010 */ lw $t6, 0x0010($s2) ## 00000010 -/* 003B4 808B9CC4 A5C30014 */ sh $v1, 0x0014($t6) ## 00000014 -/* 003B8 808B9CC8 8E4F0010 */ lw $t7, 0x0010($s2) ## 00000010 -/* 003BC 808B9CCC A5E3000E */ sh $v1, 0x000E($t7) ## 0000000E -/* 003C0 808B9CD0 8E580010 */ lw $t8, 0x0010($s2) ## 00000010 -/* 003C4 808B9CD4 A7030002 */ sh $v1, 0x0002($t8) ## 00000002 -/* 003C8 808B9CD8 8E590010 */ lw $t9, 0x0010($s2) ## 00000010 -/* 003CC 808B9CDC A7230008 */ sh $v1, 0x0008($t9) ## 00000008 -/* 003D0 808B9CE0 86240164 */ lh $a0, 0x0164($s1) ## 00000164 -/* 003D4 808B9CE4 10800002 */ beq $a0, $zero, .L808B9CF0 -/* 003D8 808B9CE8 2489FFFF */ addiu $t1, $a0, 0xFFFF ## $t1 = FFFFFFFF -/* 003DC 808B9CEC A6290164 */ sh $t1, 0x0164($s1) ## 00000164 -.L808B9CF0: -/* 003E0 808B9CF0 8FA4003C */ lw $a0, 0x003C($sp) -/* 003E4 808B9CF4 0C00FB9B */ jal func_8003EE6C -/* 003E8 808B9CF8 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 003EC 808B9CFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003F0 808B9D00 8FB00018 */ lw $s0, 0x0018($sp) -/* 003F4 808B9D04 8FB1001C */ lw $s1, 0x001C($sp) -/* 003F8 808B9D08 8FB20020 */ lw $s2, 0x0020($sp) -/* 003FC 808B9D0C 03E00008 */ jr $ra -/* 00400 808B9D10 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s deleted file mode 100644 index 41d5cbba63..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel BossSst_Destroy -/* 00484 8092CA54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00488 8092CA58 AFA40018 */ sw $a0, 0x0018($sp) -/* 0048C 8092CA5C AFA5001C */ sw $a1, 0x001C($sp) -/* 00490 8092CA60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00494 8092CA64 8FA50018 */ lw $a1, 0x0018($sp) -/* 00498 8092CA68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0049C 8092CA6C 0C016F32 */ jal Collider_DestroyJntSph -/* 004A0 8092CA70 24A503D4 */ addiu $a1, $a1, 0x03D4 ## $a1 = 000003D4 -/* 004A4 8092CA74 8FA50018 */ lw $a1, 0x0018($sp) -/* 004A8 8092CA78 8FA4001C */ lw $a0, 0x001C($sp) -/* 004AC 8092CA7C 0C0170EB */ jal Collider_DestroyCylinder - -/* 004B0 8092CA80 24A506B4 */ addiu $a1, $a1, 0x06B4 ## $a1 = 000006B4 -/* 004B4 8092CA84 8FA40018 */ lw $a0, 0x0018($sp) -/* 004B8 8092CA88 0C03E27A */ jal func_800F89E8 -/* 004BC 8092CA8C 248403C8 */ addiu $a0, $a0, 0x03C8 ## $a0 = 000003C8 -/* 004C0 8092CA90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004C4 8092CA94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004C8 8092CA98 03E00008 */ jr $ra -/* 004CC 8092CA9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s deleted file mode 100644 index e50bb47d47..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s +++ /dev/null @@ -1,272 +0,0 @@ -.rdata -glabel D_809378F0 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937900 - .asciz "../z_boss_sst.c" - .balign 4 - -.late_rodata -glabel D_80937A18 - .float 0.02 - -.text -glabel BossSst_Draw -/* 08098 80934668 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 -/* 0809C 8093466C AFBF005C */ sw $ra, 0x005C($sp) -/* 080A0 80934670 AFBE0058 */ sw $s8, 0x0058($sp) -/* 080A4 80934674 AFB70054 */ sw $s7, 0x0054($sp) -/* 080A8 80934678 AFB60050 */ sw $s6, 0x0050($sp) -/* 080AC 8093467C AFB5004C */ sw $s5, 0x004C($sp) -/* 080B0 80934680 AFB40048 */ sw $s4, 0x0048($sp) -/* 080B4 80934684 AFB30044 */ sw $s3, 0x0044($sp) -/* 080B8 80934688 AFB20040 */ sw $s2, 0x0040($sp) -/* 080BC 8093468C AFB1003C */ sw $s1, 0x003C($sp) -/* 080C0 80934690 AFB00038 */ sw $s0, 0x0038($sp) -/* 080C4 80934694 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 080C8 80934698 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 080CC 8093469C AFA500CC */ sw $a1, 0x00CC($sp) -/* 080D0 809346A0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 080D4 809346A4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 080D8 809346A8 3C068093 */ lui $a2, %hi(D_809378F0) ## $a2 = 80930000 -/* 080DC 809346AC 24C678F0 */ addiu $a2, $a2, %lo(D_809378F0) ## $a2 = 809378F0 -/* 080E0 809346B0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 -/* 080E4 809346B4 240719A3 */ addiu $a3, $zero, 0x19A3 ## $a3 = 000019A3 -/* 080E8 809346B8 0C031AB1 */ jal Graph_OpenDisps -/* 080EC 809346BC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 080F0 809346C0 8FAF00CC */ lw $t7, 0x00CC($sp) -/* 080F4 809346C4 0C024F46 */ jal func_80093D18 -/* 080F8 809346C8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 080FC 809346CC 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 -/* 08100 809346D0 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 08104 809346D4 37390080 */ ori $t9, $t9, 0x0080 ## $t9 = FA000080 -/* 08108 809346D8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0810C 809346DC AE9802C0 */ sw $t8, 0x02C0($s4) ## 000002C0 -/* 08110 809346E0 3C048093 */ lui $a0, %hi(D_80937464) ## $a0 = 80930000 -/* 08114 809346E4 24847464 */ addiu $a0, $a0, %lo(D_80937464) ## $a0 = 80937464 -/* 08118 809346E8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0811C 809346EC 908C0001 */ lbu $t4, 0x0001($a0) ## 80937465 -/* 08120 809346F0 90890000 */ lbu $t1, 0x0000($a0) ## 80937464 -/* 08124 809346F4 90980002 */ lbu $t8, 0x0002($a0) ## 80937466 -/* 08128 809346F8 000C6C00 */ sll $t5, $t4, 16 -/* 0812C 809346FC 00095600 */ sll $t2, $t1, 24 -/* 08130 80934700 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000000 -/* 08134 80934704 0018CA00 */ sll $t9, $t8, 8 -/* 08138 80934708 01D94025 */ or $t0, $t6, $t9 ## $t0 = FA000080 -/* 0813C 8093470C 350900FF */ ori $t1, $t0, 0x00FF ## $t1 = FA0000FF -/* 08140 80934710 3C0B8093 */ lui $t3, %hi(D_80937448) ## $t3 = 80930000 -/* 08144 80934714 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 08148 80934718 8D6B7448 */ lw $t3, %lo(D_80937448)($t3) -/* 0814C 8093471C 3C048093 */ lui $a0, %hi(D_80937468) ## $a0 = 80930000 -/* 08150 80934720 24847468 */ addiu $a0, $a0, %lo(D_80937468) ## $a0 = 80937468 -/* 08154 80934724 1560000B */ bne $t3, $zero, .L80934754 -/* 08158 80934728 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 0815C 8093472C 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 -/* 08160 80934730 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 08164 80934734 3C0D8011 */ lui $t5, %hi(D_80116280+0x10) -/* 08168 80934738 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0816C 8093473C AE8C02C0 */ sw $t4, 0x02C0($s4) ## 000002C0 -/* 08170 80934740 25AD6290 */ addiu $t5, %lo(D_80116280+0x10) -/* 08174 80934744 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 08178 80934748 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0817C 8093474C 10000017 */ beq $zero, $zero, .L809347AC -/* 08180 80934750 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -.L80934754: -/* 08184 80934754 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 -/* 08188 80934758 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 0818C 8093475C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 08190 80934760 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 08194 80934764 AE8F02C0 */ sw $t7, 0x02C0($s4) ## 000002C0 -/* 08198 80934768 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0819C 8093476C 908B0001 */ lbu $t3, 0x0001($a0) ## 80937469 -/* 081A0 80934770 90990000 */ lbu $t9, 0x0000($a0) ## 80937468 -/* 081A4 80934774 908F0002 */ lbu $t7, 0x0002($a0) ## 8093746A -/* 081A8 80934778 000B6400 */ sll $t4, $t3, 16 -/* 081AC 8093477C 00194600 */ sll $t0, $t9, 24 -/* 081B0 80934780 010C5025 */ or $t2, $t0, $t4 ## $t2 = FA000088 -/* 081B4 80934784 000FC200 */ sll $t8, $t7, 8 -/* 081B8 80934788 01587025 */ or $t6, $t2, $t8 ## $t6 = FB000088 -/* 081BC 8093478C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 081C0 80934790 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 -/* 081C4 80934794 3C0B8093 */ lui $t3, %hi(D_80936990) ## $t3 = 80930000 -/* 081C8 80934798 256B6990 */ addiu $t3, $t3, %lo(D_80936990) ## $t3 = 80936990 -/* 081CC 8093479C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 081D0 809347A0 AE9902C0 */ sw $t9, 0x02C0($s4) ## 000002C0 -/* 081D4 809347A4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 081D8 809347A8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -.L809347AC: -/* 081DC 809347AC 8E650150 */ lw $a1, 0x0150($s3) ## 00000150 -/* 081E0 809347B0 8E66016C */ lw $a2, 0x016C($s3) ## 0000016C -/* 081E4 809347B4 9267014E */ lbu $a3, 0x014E($s3) ## 0000014E -/* 081E8 809347B8 3C088093 */ lui $t0, %hi(func_809345A4) ## $t0 = 80930000 -/* 081EC 809347BC 3C0C8093 */ lui $t4, %hi(func_809345F0) ## $t4 = 80930000 -/* 081F0 809347C0 258C45F0 */ addiu $t4, $t4, %lo(func_809345F0) ## $t4 = 809345F0 -/* 081F4 809347C4 250845A4 */ addiu $t0, $t0, %lo(func_809345A4) ## $t0 = 809345A4 -/* 081F8 809347C8 AFA80010 */ sw $t0, 0x0010($sp) -/* 081FC 809347CC AFAC0014 */ sw $t4, 0x0014($sp) -/* 08200 809347D0 AFB30018 */ sw $s3, 0x0018($sp) -/* 08204 809347D4 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 08208 809347D8 8FA400CC */ lw $a0, 0x00CC($sp) -/* 0820C 809347DC 866D09D2 */ lh $t5, 0x09D2($s3) ## 000009D2 -/* 08210 809347E0 8FAF00CC */ lw $t7, 0x00CC($sp) -/* 08214 809347E4 29A10002 */ slti $at, $t5, 0x0002 -/* 08218 809347E8 5420007F */ bnel $at, $zero, .L809349E8 -/* 0821C 809347EC 8FA900CC */ lw $t1, 0x00CC($sp) -/* 08220 809347F0 0C024F61 */ jal func_80093D84 -/* 08224 809347F4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 08228 809347F8 866A09D0 */ lh $t2, 0x09D0($s3) ## 000009D0 -/* 0822C 809347FC 24030007 */ addiu $v1, $zero, 0x0007 ## $v1 = 00000007 -/* 08230 80934800 2406001C */ addiu $a2, $zero, 0x001C ## $a2 = 0000001C -/* 08234 80934804 25580004 */ addiu $t8, $t2, 0x0004 ## $t8 = 00000004 -/* 08238 80934808 0303001A */ div $zero, $t8, $v1 -/* 0823C 8093480C 0000A810 */ mfhi $s5 -/* 08240 80934810 26B90002 */ addiu $t9, $s5, 0x0002 ## $t9 = 00000002 -/* 08244 80934814 866209D2 */ lh $v0, 0x09D2($s3) ## 000009D2 -/* 08248 80934818 02A60019 */ multu $s5, $a2 -/* 0824C 8093481C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 08250 80934820 00021043 */ sra $v0, $v0, 1 -/* 08254 80934824 14600002 */ bne $v1, $zero, .L80934830 -/* 08258 80934828 00000000 */ nop -/* 0825C 8093482C 0007000D */ break 7 -.L80934830: -/* 08260 80934830 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 08264 80934834 14610004 */ bne $v1, $at, .L80934848 -/* 08268 80934838 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0826C 8093483C 17010002 */ bne $t8, $at, .L80934848 -/* 08270 80934840 00000000 */ nop -/* 08274 80934844 0006000D */ break 6 -.L80934848: -/* 08278 80934848 00007012 */ mflo $t6 -/* 0827C 8093484C 026E8021 */ addu $s0, $s3, $t6 -/* 08280 80934850 261009D4 */ addiu $s0, $s0, 0x09D4 ## $s0 = 000009D4 -/* 08284 80934854 0323001A */ div $zero, $t9, $v1 -/* 08288 80934858 00004810 */ mfhi $t1 -/* 0828C 8093485C AFB0009C */ sw $s0, 0x009C($sp) -/* 08290 80934860 14600002 */ bne $v1, $zero, .L8093486C -/* 08294 80934864 00000000 */ nop -/* 08298 80934868 0007000D */ break 7 -.L8093486C: -/* 0829C 8093486C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 082A0 80934870 14610004 */ bne $v1, $at, .L80934884 -/* 082A4 80934874 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 082A8 80934878 17210002 */ bne $t9, $at, .L80934884 -/* 082AC 8093487C 00000000 */ nop -/* 082B0 80934880 0006000D */ break 6 -.L80934884: -/* 082B4 80934884 01260019 */ multu $t1, $a2 -/* 082B8 80934888 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 082BC 8093488C 00005812 */ mflo $t3 -/* 082C0 80934890 026B2021 */ addu $a0, $s3, $t3 -/* 082C4 80934894 18400053 */ blez $v0, .L809349E4 -/* 082C8 80934898 248409D4 */ addiu $a0, $a0, 0x09D4 ## $a0 = 000009D4 -/* 082CC 8093489C 4481B000 */ mtc1 $at, $f22 ## $f22 = 900.00 -/* 082D0 809348A0 3C018093 */ lui $at, %hi(D_80937A18) ## $at = 80930000 -/* 082D4 809348A4 C4347A18 */ lwc1 $f20, %lo(D_80937A18)($at) -/* 082D8 809348A8 AFA2008C */ sw $v0, 0x008C($sp) -.L809348AC: -/* 082DC 809348AC 0C032D94 */ jal Math3D_Vec3fDistSq -/* 082E0 809348B0 02002825 */ or $a1, $s0, $zero ## $a1 = 000009D4 -/* 082E4 809348B4 4600B03C */ c.lt.s $f22, $f0 -/* 082E8 809348B8 3C128093 */ lui $s2, %hi(D_809369A8) ## $s2 = 80930000 -/* 082EC 809348BC 265269A8 */ addiu $s2, $s2, %lo(D_809369A8) ## $s2 = 809369A8 -/* 082F0 809348C0 2607000C */ addiu $a3, $s0, 0x000C ## $a3 = 000009E0 -/* 082F4 809348C4 45000039 */ bc1f .L809349AC -/* 082F8 809348C8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 082FC 809348CC 01111023 */ subu $v0, $t0, $s1 -/* 08300 809348D0 0002B080 */ sll $s6, $v0, 2 -/* 08304 809348D4 0002B880 */ sll $s7, $v0, 2 -/* 08308 809348D8 0002F100 */ sll $s8, $v0, 4 -/* 0830C 809348DC 03C2F023 */ subu $s8, $s8, $v0 -/* 08310 809348E0 02E2B821 */ addu $s7, $s7, $v0 -/* 08314 809348E4 02C2B021 */ addu $s6, $s6, $v0 -/* 08318 809348E8 3C0C8093 */ lui $t4, %hi(func_80934628) ## $t4 = 80930000 -/* 0831C 809348EC 258C4628 */ addiu $t4, $t4, %lo(func_80934628) ## $t4 = 80934628 -/* 08320 809348F0 0016B040 */ sll $s6, $s6, 1 -/* 08324 809348F4 0017B880 */ sll $s7, $s7, 2 -/* 08328 809348F8 001EF040 */ sll $s8, $s8, 1 -/* 0832C 809348FC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 000009D4 -/* 08330 80934900 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 000009D8 -/* 08334 80934904 8E060008 */ lw $a2, 0x0008($s0) ## 000009DC -/* 08338 80934908 AFAC0068 */ sw $t4, 0x0068($sp) -/* 0833C 8093490C 27DE0046 */ addiu $s8, $s8, 0x0046 ## $s8 = 00000046 -/* 08340 80934910 26F70032 */ addiu $s7, $s7, 0x0032 ## $s7 = 00000032 -/* 08344 80934914 0C0345A5 */ jal func_800D1694 -/* 08348 80934918 26D60014 */ addiu $s6, $s6, 0x0014 ## $s6 = 00000014 -/* 0834C 8093491C 4406A000 */ mfc1 $a2, $f20 -/* 08350 80934920 4600A306 */ mov.s $f12, $f20 -/* 08354 80934924 4600A386 */ mov.s $f14, $f20 -/* 08358 80934928 0C0342A3 */ jal Matrix_Scale -/* 0835C 8093492C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08360 80934930 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0 -/* 08364 80934934 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 08368 80934938 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0836C 8093493C 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 08370 80934940 AE8D02D0 */ sw $t5, 0x02D0($s4) ## 000002D0 -/* 08374 80934944 AC720004 */ sw $s2, 0x0004($v1) ## 00000004 -/* 08378 80934948 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 0837C 8093494C 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0 -/* 08380 80934950 32E900FF */ andi $t1, $s7, 0x00FF ## $t1 = 00000032 -/* 08384 80934954 00095A00 */ sll $t3, $t1, 8 -/* 08388 80934958 0016CE00 */ sll $t9, $s6, 24 -/* 0838C 8093495C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 08390 80934960 AE8A02D0 */ sw $t2, 0x02D0($s4) ## 000002D0 -/* 08394 80934964 032B4025 */ or $t0, $t9, $t3 ## $t0 = 00000000 -/* 08398 80934968 33CC00FF */ andi $t4, $s8, 0x00FF ## $t4 = 00000046 -/* 0839C 8093496C 010C6825 */ or $t5, $t0, $t4 ## $t5 = 00000046 -/* 083A0 80934970 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 083A4 80934974 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 083A8 80934978 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 083AC 8093497C 8FAF0068 */ lw $t7, 0x0068($sp) -/* 083B0 80934980 9267014E */ lbu $a3, 0x014E($s3) ## 0000014E -/* 083B4 80934984 8E66016C */ lw $a2, 0x016C($s3) ## 0000016C -/* 083B8 80934988 8E650150 */ lw $a1, 0x0150($s3) ## 00000150 -/* 083BC 8093498C AFB00018 */ sw $s0, 0x0018($sp) -/* 083C0 80934990 AFA00014 */ sw $zero, 0x0014($sp) -/* 083C4 80934994 AFAF0010 */ sw $t7, 0x0010($sp) -/* 083C8 80934998 8E8A02D0 */ lw $t2, 0x02D0($s4) ## 000002D0 -/* 083CC 8093499C 8FA400CC */ lw $a0, 0x00CC($sp) -/* 083D0 809349A0 0C0289CF */ jal SkelAnime_DrawFlex -/* 083D4 809349A4 AFAA001C */ sw $t2, 0x001C($sp) -/* 083D8 809349A8 AE8202D0 */ sw $v0, 0x02D0($s4) ## 000002D0 -.L809349AC: -/* 083DC 809349AC 26B50005 */ addiu $s5, $s5, 0x0005 ## $s5 = 00000005 -/* 083E0 809349B0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 083E4 809349B4 02A1001A */ div $zero, $s5, $at -/* 083E8 809349B8 0000A810 */ mfhi $s5 -/* 083EC 809349BC 0015C0C0 */ sll $t8, $s5, 3 -/* 083F0 809349C0 0315C023 */ subu $t8, $t8, $s5 -/* 083F4 809349C4 8FAE008C */ lw $t6, 0x008C($sp) -/* 083F8 809349C8 0018C080 */ sll $t8, $t8, 2 -/* 083FC 809349CC 02788021 */ addu $s0, $s3, $t8 -/* 08400 809349D0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 08404 809349D4 8FA4009C */ lw $a0, 0x009C($sp) -/* 08408 809349D8 261009D4 */ addiu $s0, $s0, 0x09D4 ## $s0 = 000013A8 -/* 0840C 809349DC 162EFFB3 */ bne $s1, $t6, .L809348AC -/* 08410 809349E0 AFB0009C */ sw $s0, 0x009C($sp) -.L809349E4: -/* 08414 809349E4 8FA900CC */ lw $t1, 0x00CC($sp) -.L809349E8: -/* 08418 809349E8 3C068093 */ lui $a2, %hi(D_80937900) ## $a2 = 80930000 -/* 0841C 809349EC 24C67900 */ addiu $a2, $a2, %lo(D_80937900) ## $a2 = 80937900 -/* 08420 809349F0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 -/* 08424 809349F4 240719FE */ addiu $a3, $zero, 0x19FE ## $a3 = 000019FE -/* 08428 809349F8 0C031AD5 */ jal Graph_CloseDisps -/* 0842C 809349FC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 08430 80934A00 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 08434 80934A04 0C24D8E7 */ jal func_8093639C -/* 08438 80934A08 8FA500CC */ lw $a1, 0x00CC($sp) -/* 0843C 80934A0C 8FBF005C */ lw $ra, 0x005C($sp) -/* 08440 80934A10 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 08444 80934A14 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 08448 80934A18 8FB00038 */ lw $s0, 0x0038($sp) -/* 0844C 80934A1C 8FB1003C */ lw $s1, 0x003C($sp) -/* 08450 80934A20 8FB20040 */ lw $s2, 0x0040($sp) -/* 08454 80934A24 8FB30044 */ lw $s3, 0x0044($sp) -/* 08458 80934A28 8FB40048 */ lw $s4, 0x0048($sp) -/* 0845C 80934A2C 8FB5004C */ lw $s5, 0x004C($sp) -/* 08460 80934A30 8FB60050 */ lw $s6, 0x0050($sp) -/* 08464 80934A34 8FB70054 */ lw $s7, 0x0054($sp) -/* 08468 80934A38 8FBE0058 */ lw $s8, 0x0058($sp) -/* 0846C 80934A3C 03E00008 */ jr $ra -/* 08470 80934A40 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s deleted file mode 100644 index c1b9ba9d15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s +++ /dev/null @@ -1,319 +0,0 @@ -.late_rodata -glabel D_80937990 - .word 0xC4228000 -glabel D_80937994 - .word 0xC4228000 -glabel D_80937998 - .float 5000.0 - -.text -glabel BossSst_Init -/* 00000 8092C5D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 8092C5D4 AFB10030 */ sw $s1, 0x0030($sp) -/* 00008 8092C5D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 8092C5DC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00010 8092C5E0 AFB0002C */ sw $s0, 0x002C($sp) -/* 00014 8092C5E4 3C058093 */ lui $a1, %hi(D_8093788C) ## $a1 = 80930000 -/* 00018 8092C5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 8092C5EC 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 8092C5F0 24A5788C */ addiu $a1, $a1, %lo(D_8093788C) ## $a1 = 8093788C -/* 00024 8092C5F4 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4 -/* 00028 8092C5F8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0002C 8092C5FC 0C0170D9 */ jal Collider_InitCylinder - -/* 00030 8092C600 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00034 8092C604 260503D4 */ addiu $a1, $s0, 0x03D4 ## $a1 = 000003D4 -/* 00038 8092C608 AFA50040 */ sw $a1, 0x0040($sp) -/* 0003C 8092C60C 0C016EFE */ jal Collider_InitJntSph -/* 00040 8092C610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00044 8092C614 3C058093 */ lui $a1, %hi(D_8093782C) ## $a1 = 80930000 -/* 00048 8092C618 3C068093 */ lui $a2, %hi(D_80937824) ## $a2 = 80930000 -/* 0004C 8092C61C 24C67824 */ addiu $a2, $a2, %lo(D_80937824) ## $a2 = 80937824 -/* 00050 8092C620 24A5782C */ addiu $a1, $a1, %lo(D_8093782C) ## $a1 = 8093782C -/* 00054 8092C624 0C0187B5 */ jal CollisionCheck_SetInfo -/* 00058 8092C628 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0005C 8092C62C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00060 8092C630 0C00B2DD */ jal Flags_SetSwitch - -/* 00064 8092C634 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 00068 8092C638 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 0006C 8092C63C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 00070 8092C640 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00074 8092C644 15C100BA */ bne $t6, $at, .L8092C930 -/* 00078 8092C648 8FA50040 */ lw $a1, 0x0040($sp) -/* 0007C 8092C64C 3C028093 */ lui $v0, %hi(D_80937340) ## $v0 = 80930000 -/* 00080 8092C650 24427340 */ addiu $v0, $v0, %lo(D_80937340) ## $v0 = 80937340 -/* 00084 8092C654 C4440004 */ lwc1 $f4, 0x0004($v0) ## 80937344 -/* 00088 8092C658 C4460008 */ lwc1 $f6, 0x0008($v0) ## 80937348 -/* 0008C 8092C65C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00090 8092C660 AFA4003C */ sw $a0, 0x003C($sp) -/* 00094 8092C664 8C470000 */ lw $a3, 0x0000($v0) ## 80937340 -/* 00098 8092C668 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0009C 8092C66C 24060166 */ addiu $a2, $zero, 0x0166 ## $a2 = 00000166 -/* 000A0 8092C670 AFA00018 */ sw $zero, 0x0018($sp) -/* 000A4 8092C674 AFA0001C */ sw $zero, 0x001C($sp) -/* 000A8 8092C678 AFA00020 */ sw $zero, 0x0020($sp) -/* 000AC 8092C67C AFA00024 */ sw $zero, 0x0024($sp) -/* 000B0 8092C680 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 000B4 8092C684 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 000B8 8092C688 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 000BC 8092C68C 3C018094 */ lui $at, %hi(D_80938CA0) ## $at = 80940000 -/* 000C0 8092C690 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 000C4 8092C694 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 -/* 000C8 8092C698 260F01A8 */ addiu $t7, $s0, 0x01A8 ## $t7 = 000001A8 -/* 000CC 8092C69C 261802B6 */ addiu $t8, $s0, 0x02B6 ## $t8 = 000002B6 -/* 000D0 8092C6A0 2419002D */ addiu $t9, $zero, 0x002D ## $t9 = 0000002D -/* 000D4 8092C6A4 AC228CA0 */ sw $v0, %lo(D_80938CA0)($at) -/* 000D8 8092C6A8 AFB90018 */ sw $t9, 0x0018($sp) -/* 000DC 8092C6AC AFB80014 */ sw $t8, 0x0014($sp) -/* 000E0 8092C6B0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 000E4 8092C6B4 24E7E7B8 */ addiu $a3, $a3, 0xE7B8 ## $a3 = 0600E7B8 -/* 000E8 8092C6B8 24C67C40 */ addiu $a2, $a2, 0x7C40 ## $a2 = 06017C40 -/* 000EC 8092C6BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000F0 8092C6C0 0C0291BE */ jal SkelAnime_InitFlex -/* 000F4 8092C6C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 000F8 8092C6C8 3C054788 */ lui $a1, 0x4788 ## $a1 = 47880000 -/* 000FC 8092C6CC 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00100 8092C6D0 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00104 8092C6D4 34A5B800 */ ori $a1, $a1, 0xB800 ## $a1 = 4788B800 -/* 00108 8092C6D8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0010C 8092C6DC 0C00AC78 */ jal ActorShape_Init - -/* 00110 8092C6E0 3C0742BE */ lui $a3, 0x42BE ## $a3 = 42BE0000 -/* 00114 8092C6E4 3C078093 */ lui $a3, %hi(D_809377BC) ## $a3 = 80930000 -/* 00118 8092C6E8 260803F4 */ addiu $t0, $s0, 0x03F4 ## $t0 = 000003F4 -/* 0011C 8092C6EC AFA80010 */ sw $t0, 0x0010($sp) -/* 00120 8092C6F0 24E777BC */ addiu $a3, $a3, %lo(D_809377BC) ## $a3 = 809377BC -/* 00124 8092C6F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00128 8092C6F8 8FA50040 */ lw $a1, 0x0040($sp) -/* 0012C 8092C6FC 0C017014 */ jal Collider_SetJntSph -/* 00130 8092C700 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00134 8092C704 3C078093 */ lui $a3, %hi(D_809377CC) ## $a3 = 80930000 -/* 00138 8092C708 24E777CC */ addiu $a3, $a3, %lo(D_809377CC) ## $a3 = 809377CC -/* 0013C 8092C70C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00140 8092C710 8FA50044 */ lw $a1, 0x0044($sp) -/* 00144 8092C714 0C01712B */ jal Collider_SetCylinder - -/* 00148 8092C718 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0014C 8092C71C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00150 8092C720 3C018094 */ lui $at, %hi(D_80938C90) ## $at = 80940000 -/* 00154 8092C724 AC308C90 */ sw $s0, %lo(D_80938C90)($at) -/* 00158 8092C728 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 -/* 0015C 8092C72C 3C018093 */ lui $at, %hi(D_80937990) ## $at = 80930000 -/* 00160 8092C730 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 00164 8092C734 C4287990 */ lwc1 $f8, %lo(D_80937990)($at) -/* 00168 8092C738 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 -/* 0016C 8092C73C 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 -/* 00170 8092C740 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 00174 8092C744 AE0A0008 */ sw $t2, 0x0008($s0) ## 00000008 -/* 00178 8092C748 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C -/* 0017C 8092C74C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00180 8092C750 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 00184 8092C754 00B12821 */ addu $a1, $a1, $s1 -/* 00188 8092C758 AE09000C */ sw $t1, 0x000C($s0) ## 0000000C -/* 0018C 8092C75C AE0A0010 */ sw $t2, 0x0010($s0) ## 00000010 -/* 00190 8092C760 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC -/* 00194 8092C764 0C00B337 */ jal Flags_GetClear - -/* 00198 8092C768 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0019C 8092C76C 10400022 */ beq $v0, $zero, .L8092C7F8 -/* 001A0 8092C770 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 001A4 8092C774 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 001A8 8092C778 44818000 */ mtc1 $at, $f16 ## $f16 = 400.00 -/* 001AC 8092C77C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 001B0 8092C780 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 001B4 8092C784 AFAB0024 */ sw $t3, 0x0024($sp) -/* 001B8 8092C788 8FA4003C */ lw $a0, 0x003C($sp) -/* 001BC 8092C78C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001C0 8092C790 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 001C4 8092C794 3C07C248 */ lui $a3, 0xC248 ## $a3 = C2480000 -/* 001C8 8092C798 AFA00018 */ sw $zero, 0x0018($sp) -/* 001CC 8092C79C AFA0001C */ sw $zero, 0x001C($sp) -/* 001D0 8092C7A0 AFA00020 */ sw $zero, 0x0020($sp) -/* 001D4 8092C7A4 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 001D8 8092C7A8 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 001DC 8092C7AC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 001E0 8092C7B0 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 001E4 8092C7B4 44812000 */ mtc1 $at, $f4 ## $f4 = -200.00 -/* 001E8 8092C7B8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 001EC 8092C7BC 8FA4003C */ lw $a0, 0x003C($sp) -/* 001F0 8092C7C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001F4 8092C7C4 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F -/* 001F8 8092C7C8 3C07C248 */ lui $a3, 0xC248 ## $a3 = C2480000 -/* 001FC 8092C7CC AFA00018 */ sw $zero, 0x0018($sp) -/* 00200 8092C7D0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00204 8092C7D4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00208 8092C7D8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0020C 8092C7DC E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00210 8092C7E0 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00214 8092C7E4 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00218 8092C7E8 0C00B55C */ jal Actor_Kill - -/* 0021C 8092C7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00220 8092C7F0 10000094 */ beq $zero, $zero, .L8092CA44 -/* 00224 8092C7F4 8FBF0034 */ lw $ra, 0x0034($sp) -.L8092C7F8: -/* 00228 8092C7F8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 0022C 8092C7FC C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00230 8092C800 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 -/* 00234 8092C804 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00238 8092C808 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0023C 8092C80C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00240 8092C810 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 00244 8092C814 46083280 */ add.s $f10, $f6, $f8 -/* 00248 8092C818 AFA00018 */ sw $zero, 0x0018($sp) -/* 0024C 8092C81C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00250 8092C820 46049180 */ add.s $f6, $f18, $f4 -/* 00254 8092C824 44075000 */ mfc1 $a3, $f10 -/* 00258 8092C828 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0025C 8092C82C 240600E9 */ addiu $a2, $zero, 0x00E9 ## $a2 = 000000E9 -/* 00260 8092C830 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00264 8092C834 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 00268 8092C838 AFA00024 */ sw $zero, 0x0024($sp) -/* 0026C 8092C83C AFA00020 */ sw $zero, 0x0020($sp) -/* 00270 8092C840 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00274 8092C844 AFAC001C */ sw $t4, 0x001C($sp) -/* 00278 8092C848 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 0027C 8092C84C 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 -/* 00280 8092C850 AC620000 */ sw $v0, 0x0000($v1) ## 80938C98 -/* 00284 8092C854 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 00288 8092C858 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 0028C 8092C85C 44815000 */ mtc1 $at, $f10 ## $f10 = -200.00 -/* 00290 8092C860 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00294 8092C864 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00298 8092C868 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 0029C 8092C86C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 002A0 8092C870 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 002A4 8092C874 460A4400 */ add.s $f16, $f8, $f10 -/* 002A8 8092C878 AFA00018 */ sw $zero, 0x0018($sp) -/* 002AC 8092C87C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 002B0 8092C880 46062200 */ add.s $f8, $f4, $f6 -/* 002B4 8092C884 44078000 */ mfc1 $a3, $f16 -/* 002B8 8092C888 8FA4003C */ lw $a0, 0x003C($sp) -/* 002BC 8092C88C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002C0 8092C890 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 002C4 8092C894 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 002C8 8092C898 AFAE0024 */ sw $t6, 0x0024($sp) -/* 002CC 8092C89C AFA00020 */ sw $zero, 0x0020($sp) -/* 002D0 8092C8A0 240600E9 */ addiu $a2, $zero, 0x00E9 ## $a2 = 000000E9 -/* 002D4 8092C8A4 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 002D8 8092C8A8 AFAD001C */ sw $t5, 0x001C($sp) -/* 002DC 8092C8AC 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 002E0 8092C8B0 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 -/* 002E4 8092C8B4 8C780000 */ lw $t8, 0x0000($v1) ## 80938C98 -/* 002E8 8092C8B8 AC620004 */ sw $v0, 0x0004($v1) ## 80938C9C -/* 002EC 8092C8BC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 002F0 8092C8C0 AF02011C */ sw $v0, 0x011C($t8) ## 0000011C -/* 002F4 8092C8C4 8C680004 */ lw $t0, 0x0004($v1) ## 80938C9C -/* 002F8 8092C8C8 8C790000 */ lw $t9, 0x0000($v1) ## 80938C98 -/* 002FC 8092C8CC 3C0B8093 */ lui $t3, %hi(func_80934338) ## $t3 = 80930000 -/* 00300 8092C8D0 3C0C8093 */ lui $t4, %hi(func_809352DC) ## $t4 = 80930000 -/* 00304 8092C8D4 AD19011C */ sw $t9, 0x011C($t0) ## 0000011C -/* 00308 8092C8D8 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 0030C 8092C8DC 256B4338 */ addiu $t3, $t3, %lo(func_80934338) ## $t3 = 80934338 -/* 00310 8092C8E0 258C52DC */ addiu $t4, $t4, %lo(func_809352DC) ## $t4 = 809352DC -/* 00314 8092C8E4 01215024 */ and $t2, $t1, $at -/* 00318 8092C8E8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 0031C 8092C8EC AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 -/* 00320 8092C8F0 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 -/* 00324 8092C8F4 3C018093 */ lui $at, %hi(D_80937994) ## $at = 80930000 -/* 00328 8092C8F8 C42A7994 */ lwc1 $f10, %lo(D_80937994)($at) -/* 0032C 8092C8FC 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 00330 8092C900 44818000 */ mtc1 $at, $f16 ## $f16 = 4000.00 -/* 00334 8092C904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00338 8092C908 E60A03C4 */ swc1 $f10, 0x03C4($s0) ## 000003C4 -/* 0033C 8092C90C 0C24B2A8 */ jal func_8092CAA0 -/* 00340 8092C910 E610004C */ swc1 $f16, 0x004C($s0) ## 0000004C -/* 00344 8092C914 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00348 8092C918 8FA5003C */ lw $a1, 0x003C($sp) -/* 0034C 8092C91C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00350 8092C920 0C00CDD2 */ jal Actor_ChangeCategory - -/* 00354 8092C924 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -/* 00358 8092C928 10000046 */ beq $zero, $zero, .L8092CA44 -/* 0035C 8092C92C 8FBF0034 */ lw $ra, 0x0034($sp) -.L8092C930: -/* 00360 8092C930 3C078093 */ lui $a3, %hi(D_80937620) ## $a3 = 80930000 -/* 00364 8092C934 260D03F4 */ addiu $t5, $s0, 0x03F4 ## $t5 = 000003F4 -/* 00368 8092C938 AFAD0010 */ sw $t5, 0x0010($sp) -/* 0036C 8092C93C 24E77620 */ addiu $a3, $a3, %lo(D_80937620) ## $a3 = 80937620 -/* 00370 8092C940 0C017014 */ jal Collider_SetJntSph -/* 00374 8092C944 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00378 8092C948 3C078093 */ lui $a3, %hi(D_809377F8) ## $a3 = 80930000 -/* 0037C 8092C94C 24E777F8 */ addiu $a3, $a3, %lo(D_809377F8) ## $a3 = 809377F8 -/* 00380 8092C950 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00384 8092C954 8FA50044 */ lw $a1, 0x0044($sp) -/* 00388 8092C958 0C01712B */ jal Collider_SetCylinder - -/* 0038C 8092C95C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00390 8092C960 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00394 8092C964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00398 8092C968 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0039C 8092C96C 15C00017 */ bne $t6, $zero, .L8092C9CC -/* 003A0 8092C970 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 003A4 8092C974 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 003A8 8092C978 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 003AC 8092C97C 260F01A8 */ addiu $t7, $s0, 0x01A8 ## $t7 = 000001A8 -/* 003B0 8092C980 261802B6 */ addiu $t8, $s0, 0x02B6 ## $t8 = 000002B6 -/* 003B4 8092C984 2419001B */ addiu $t9, $zero, 0x001B ## $t9 = 0000001B -/* 003B8 8092C988 AFB90018 */ sw $t9, 0x0018($sp) -/* 003BC 8092C98C AFB80014 */ sw $t8, 0x0014($sp) -/* 003C0 8092C990 AFAF0010 */ sw $t7, 0x0010($sp) -/* 003C4 8092C994 24E702E8 */ addiu $a3, $a3, 0x02E8 ## $a3 = 060002E8 -/* 003C8 8092C998 24C64DE0 */ addiu $a2, $a2, 0x4DE0 ## $a2 = 06004DE0 -/* 003CC 8092C99C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003D0 8092C9A0 0C0291BE */ jal SkelAnime_InitFlex -/* 003D4 8092C9A4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 003D8 8092C9A8 8E0303F0 */ lw $v1, 0x03F0($s0) ## 000003F0 -/* 003DC 8092C9AC 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 003E0 8092C9B0 A2040194 */ sb $a0, 0x0194($s0) ## 00000194 -/* 003E4 8092C9B4 8468002C */ lh $t0, 0x002C($v1) ## 0000002C -/* 003E8 8092C9B8 01040019 */ multu $t0, $a0 -/* 003EC 8092C9BC 00004812 */ mflo $t1 -/* 003F0 8092C9C0 A469002C */ sh $t1, 0x002C($v1) ## 0000002C -/* 003F4 8092C9C4 1000000D */ beq $zero, $zero, .L8092C9FC -/* 003F8 8092C9C8 00000000 */ nop -.L8092C9CC: -/* 003FC 8092C9CC 3C070600 */ lui $a3, %hi(D_06005860) ## $a3 = 06000000 -/* 00400 8092C9D0 260A01A8 */ addiu $t2, $s0, 0x01A8 ## $t2 = 000001A8 -/* 00404 8092C9D4 260B02B6 */ addiu $t3, $s0, 0x02B6 ## $t3 = 000002B6 -/* 00408 8092C9D8 240C001B */ addiu $t4, $zero, 0x001B ## $t4 = 0000001B -/* 0040C 8092C9DC AFAC0018 */ sw $t4, 0x0018($sp) -/* 00410 8092C9E0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00414 8092C9E4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00418 8092C9E8 24E75860 */ addiu $a3, $a3, %lo(D_06005860) ## $a3 = 06005860 -/* 0041C 8092C9EC 0C0291BE */ jal SkelAnime_InitFlex -/* 00420 8092C9F0 24C6A350 */ addiu $a2, $a2, 0xA350 ## $a2 = FFFFA350 -/* 00424 8092C9F4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00428 8092C9F8 A20D0194 */ sb $t5, 0x0194($s0) ## 00000194 -.L8092C9FC: -/* 0042C 8092C9FC 3C068003 */ lui $a2, %hi(ActorShadow_DrawCircle) -/* 00430 8092CA00 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawCircle) -/* 00434 8092CA04 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00438 8092CA08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0043C 8092CA0C 0C00AC78 */ jal ActorShape_Init - -/* 00440 8092CA10 3C0742BE */ lui $a3, 0x42BE ## $a3 = 42BE0000 -/* 00444 8092CA14 240EF254 */ addiu $t6, $zero, 0xF254 ## $t6 = FFFFF254 -/* 00448 8092CA18 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 0044C 8092CA1C A60E019E */ sh $t6, 0x019E($s0) ## 0000019E -/* 00450 8092CA20 3C018093 */ lui $at, %hi(D_80937998) ## $at = 80930000 -/* 00454 8092CA24 C4327998 */ lwc1 $f18, %lo(D_80937998)($at) -/* 00458 8092CA28 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0045C 8092CA2C 01E1C024 */ and $t8, $t7, $at -/* 00460 8092CA30 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 00464 8092CA34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00468 8092CA38 0C24BEF9 */ jal func_8092FBE4 -/* 0046C 8092CA3C E612004C */ swc1 $f18, 0x004C($s0) ## 0000004C -/* 00470 8092CA40 8FBF0034 */ lw $ra, 0x0034($sp) -.L8092CA44: -/* 00474 8092CA44 8FB0002C */ lw $s0, 0x002C($sp) -/* 00478 8092CA48 8FB10030 */ lw $s1, 0x0030($sp) -/* 0047C 8092CA4C 03E00008 */ jr $ra -/* 00480 8092CA50 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s deleted file mode 100644 index 1f9815fe7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s +++ /dev/null @@ -1,221 +0,0 @@ -.late_rodata -glabel D_80937A14 - .float 0.01 - -.text -glabel BossSst_Update -/* 07A5C 8093402C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 07A60 80934030 AFBF0024 */ sw $ra, 0x0024($sp) -/* 07A64 80934034 AFB10020 */ sw $s1, 0x0020($sp) -/* 07A68 80934038 AFB0001C */ sw $s0, 0x001C($sp) -/* 07A6C 8093403C 908206C4 */ lbu $v0, 0x06C4($a0) ## 000006C4 -/* 07A70 80934040 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 07A74 80934044 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07A78 80934048 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 07A7C 8093404C 11C0002F */ beq $t6, $zero, .L8093410C -/* 07A80 80934050 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07A84 80934054 848F0720 */ lh $t7, 0x0720($a0) ## 00000720 -/* 07A88 80934058 3C188093 */ lui $t8, %hi(D_80937818) ## $t8 = 80930000 -/* 07A8C 8093405C 3049FFFC */ andi $t1, $v0, 0xFFFC ## $t1 = 00000000 -/* 07A90 80934060 29E10005 */ slti $at, $t7, 0x0005 -/* 07A94 80934064 14200018 */ bne $at, $zero, .L809340C8 -/* 07A98 80934068 00000000 */ nop -/* 07A9C 8093406C 87187818 */ lh $t8, %lo(D_80937818)($t8) -/* 07AA0 80934070 9499076E */ lhu $t9, 0x076E($a0) ## 0000076E -/* 07AA4 80934074 3C018093 */ lui $at, %hi(D_80937A14) ## $at = 80930000 -/* 07AA8 80934078 44982000 */ mtc1 $t8, $f4 ## $f4 = -0.00 -/* 07AAC 8093407C 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 07AB0 80934080 C4227A14 */ lwc1 $f2, %lo(D_80937A14)($at) -/* 07AB4 80934084 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 -/* 07AB8 80934088 46802020 */ cvt.s.w $f0, $f4 -/* 07ABC 8093408C 07210005 */ bgez $t9, .L809340A4 -/* 07AC0 80934090 468042A0 */ cvt.s.w $f10, $f8 -/* 07AC4 80934094 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 07AC8 80934098 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 07ACC 8093409C 00000000 */ nop -/* 07AD0 809340A0 46105280 */ add.s $f10, $f10, $f16 -.L809340A4: -/* 07AD4 809340A4 46025482 */ mul.s $f18, $f10, $f2 -/* 07AD8 809340A8 30480002 */ andi $t0, $v0, 0x0002 ## $t0 = 00000000 -/* 07ADC 809340AC 46009102 */ mul.s $f4, $f18, $f0 -/* 07AE0 809340B0 4604303C */ c.lt.s $f6, $f4 -/* 07AE4 809340B4 00000000 */ nop -/* 07AE8 809340B8 45010003 */ bc1t .L809340C8 -/* 07AEC 809340BC 00000000 */ nop -/* 07AF0 809340C0 51000004 */ beql $t0, $zero, .L809340D4 -/* 07AF4 809340C4 960A071E */ lhu $t2, 0x071E($s0) ## 0000071E -.L809340C8: -/* 07AF8 809340C8 10000010 */ beq $zero, $zero, .L8093410C -/* 07AFC 809340CC A20906C4 */ sb $t1, 0x06C4($s0) ## 000006C4 -/* 07B00 809340D0 960A071E */ lhu $t2, 0x071E($s0) ## 0000071E -.L809340D4: -/* 07B04 809340D4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 07B08 809340D8 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 07B0C 809340DC 05410004 */ bgez $t2, .L809340F0 -/* 07B10 809340E0 46804420 */ cvt.s.w $f16, $f8 -/* 07B14 809340E4 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 07B18 809340E8 00000000 */ nop -/* 07B1C 809340EC 460A8400 */ add.s $f16, $f16, $f10 -.L809340F0: -/* 07B20 809340F0 46028482 */ mul.s $f18, $f16, $f2 -/* 07B24 809340F4 00000000 */ nop -/* 07B28 809340F8 46009182 */ mul.s $f6, $f18, $f0 -/* 07B2C 809340FC 4600310D */ trunc.w.s $f4, $f6 -/* 07B30 80934100 440C2000 */ mfc1 $t4, $f4 -/* 07B34 80934104 00000000 */ nop -/* 07B38 80934108 A60C06F4 */ sh $t4, 0x06F4($s0) ## 000006F4 -.L8093410C: -/* 07B3C 8093410C 0C24CF55 */ jal func_80933D54 -/* 07B40 80934110 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07B44 80934114 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 07B48 80934118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07B4C 8093411C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07B50 80934120 0320F809 */ jalr $ra, $t9 -/* 07B54 80934124 00000000 */ nop -/* 07B58 80934128 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 07B5C 8093412C 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 07B60 80934130 AFAD0014 */ sw $t5, 0x0014($sp) -/* 07B64 80934134 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07B68 80934138 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 07B6C 8093413C 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 07B70 80934140 3C074302 */ lui $a3, 0x4302 ## $a3 = 43020000 -/* 07B74 80934144 0C00B92D */ jal Actor_UpdateBgCheckInfo -/* 07B78 80934148 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 07B7C 8093414C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07B80 80934150 0C00B56E */ jal Actor_SetFocus - -/* 07B84 80934154 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 07B88 80934158 920E03E4 */ lbu $t6, 0x03E4($s0) ## 000003E4 -/* 07B8C 8093415C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07B90 80934160 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 07B94 80934164 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 07B98 80934168 11E00004 */ beq $t7, $zero, .L8093417C -/* 07B9C 8093416C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07BA0 80934170 02212821 */ addu $a1, $s1, $at -/* 07BA4 80934174 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 07BA8 80934178 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 -.L8093417C: -/* 07BAC 8093417C 3C188094 */ lui $t8, %hi(D_80938C90) ## $t8 = 80940000 -/* 07BB0 80934180 8F188C90 */ lw $t8, %lo(D_80938C90)($t8) -/* 07BB4 80934184 3C088093 */ lui $t0, %hi(func_8092CAD0) ## $t0 = 80930000 -/* 07BB8 80934188 2508CAD0 */ addiu $t0, $t0, %lo(func_8092CAD0) ## $t0 = 8092CAD0 -/* 07BBC 8093418C 8F020190 */ lw $v0, 0x0190($t8) ## 80940190 -/* 07BC0 80934190 3C098093 */ lui $t1, %hi(func_8092CC58) ## $t1 = 80930000 -/* 07BC4 80934194 2529CC58 */ addiu $t1, $t1, %lo(func_8092CC58) ## $t1 = 8092CC58 -/* 07BC8 80934198 5102000D */ beql $t0, $v0, .L809341D0 -/* 07BCC 8093419C 920C03E6 */ lbu $t4, 0x03E6($s0) ## 000003E6 -/* 07BD0 809341A0 5122000B */ beql $t1, $v0, .L809341D0 -/* 07BD4 809341A4 920C03E6 */ lbu $t4, 0x03E6($s0) ## 000003E6 -/* 07BD8 809341A8 920A03E5 */ lbu $t2, 0x03E5($s0) ## 000003E5 -/* 07BDC 809341AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07BE0 809341B0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 07BE4 809341B4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 07BE8 809341B8 11600004 */ beq $t3, $zero, .L809341CC -/* 07BEC 809341BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07BF0 809341C0 02212821 */ addu $a1, $s1, $at -/* 07BF4 809341C4 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 07BF8 809341C8 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 -.L809341CC: -/* 07BFC 809341CC 920C03E6 */ lbu $t4, 0x03E6($s0) ## 000003E6 -.L809341D0: -/* 07C00 809341D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07C04 809341D4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 07C08 809341D8 31990001 */ andi $t9, $t4, 0x0001 ## $t9 = 00000000 -/* 07C0C 809341DC 13200004 */ beq $t9, $zero, .L809341F0 -/* 07C10 809341E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07C14 809341E4 02212821 */ addu $a1, $s1, $at -/* 07C18 809341E8 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 07C1C 809341EC 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 -.L809341F0: -/* 07C20 809341F0 920D06C4 */ lbu $t5, 0x06C4($s0) ## 000006C4 -/* 07C24 809341F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07C28 809341F8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 07C2C 809341FC 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 07C30 80934200 11C00004 */ beq $t6, $zero, .L80934214 -/* 07C34 80934204 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07C38 80934208 02212821 */ addu $a1, $s1, $at -/* 07C3C 8093420C 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 07C40 80934210 260606B4 */ addiu $a2, $s0, 0x06B4 ## $a2 = 000006B4 -.L80934214: -/* 07C44 80934214 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 07C48 80934218 3C028093 */ lui $v0, %hi(D_8093746C) ## $v0 = 80930000 -/* 07C4C 8093421C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 07C50 80934220 000FC080 */ sll $t8, $t7, 2 -/* 07C54 80934224 00581021 */ addu $v0, $v0, $t8 -/* 07C58 80934228 8C42746C */ lw $v0, %lo(D_8093746C)($v0) -/* 07C5C 8093422C 50410014 */ beql $v0, $at, .L80934280 -/* 07C60 80934230 860B09D2 */ lh $t3, 0x09D2($s0) ## 000009D2 -/* 07C64 80934234 10400011 */ beq $v0, $zero, .L8093427C -/* 07C68 80934238 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07C6C 8093423C 1041000F */ beq $v0, $at, .L8093427C -/* 07C70 80934240 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 07C74 80934244 5041000E */ beql $v0, $at, .L80934280 -/* 07C78 80934248 860B09D2 */ lh $t3, 0x09D2($s0) ## 000009D2 -/* 07C7C 8093424C 860809D2 */ lh $t0, 0x09D2($s0) ## 000009D2 -/* 07C80 80934250 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 07C84 80934254 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 07C88 80934258 A60909D2 */ sh $t1, 0x09D2($s0) ## 000009D2 -/* 07C8C 8093425C 860209D2 */ lh $v0, 0x09D2($s0) ## 000009D2 -/* 07C90 80934260 28410008 */ slti $at, $v0, 0x0008 -/* 07C94 80934264 14200003 */ bne $at, $zero, .L80934274 -/* 07C98 80934268 00000000 */ nop -/* 07C9C 8093426C 1000000C */ beq $zero, $zero, .L809342A0 -/* 07CA0 80934270 A60A09D2 */ sh $t2, 0x09D2($s0) ## 000009D2 -.L80934274: -/* 07CA4 80934274 1000000A */ beq $zero, $zero, .L809342A0 -/* 07CA8 80934278 A60209D2 */ sh $v0, 0x09D2($s0) ## 000009D2 -.L8093427C: -/* 07CAC 8093427C 860B09D2 */ lh $t3, 0x09D2($s0) ## 000009D2 -.L80934280: -/* 07CB0 80934280 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF -/* 07CB4 80934284 A60C09D2 */ sh $t4, 0x09D2($s0) ## 000009D2 -/* 07CB8 80934288 860209D2 */ lh $v0, 0x09D2($s0) ## 000009D2 -/* 07CBC 8093428C 04430004 */ bgezl $v0, .L809342A0 -/* 07CC0 80934290 A60209D2 */ sh $v0, 0x09D2($s0) ## 000009D2 -/* 07CC4 80934294 10000002 */ beq $zero, $zero, .L809342A0 -/* 07CC8 80934298 A60009D2 */ sh $zero, 0x09D2($s0) ## 000009D2 -/* 07CCC 8093429C A60209D2 */ sh $v0, 0x09D2($s0) ## 000009D2 -.L809342A0: -/* 07CD0 809342A0 861909D0 */ lh $t9, 0x09D0($s0) ## 000009D0 -/* 07CD4 809342A4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 07CD8 809342A8 001968C0 */ sll $t5, $t9, 3 -/* 07CDC 809342AC 01B96823 */ subu $t5, $t5, $t9 -/* 07CE0 809342B0 000D6880 */ sll $t5, $t5, 2 -/* 07CE4 809342B4 020D3021 */ addu $a2, $s0, $t5 -/* 07CE8 809342B8 24C409D4 */ addiu $a0, $a2, 0x09D4 ## $a0 = 000009D4 -/* 07CEC 809342BC 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 07CF0 809342C0 AFA4002C */ sw $a0, 0x002C($sp) -/* 07CF4 809342C4 8A0F00B4 */ lwl $t7, 0x00B4($s0) ## 000000B4 -/* 07CF8 809342C8 8FA6002C */ lw $a2, 0x002C($sp) -/* 07CFC 809342CC 9A0F00B7 */ lwr $t7, 0x00B7($s0) ## 000000B7 -/* 07D00 809342D0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 07D04 809342D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07D08 809342D8 A8CF000C */ swl $t7, 0x000C($a2) ## 0000000C -/* 07D0C 809342DC B8CF000F */ swr $t7, 0x000F($a2) ## 0000000F -/* 07D10 809342E0 960F00B8 */ lhu $t7, 0x00B8($s0) ## 000000B8 -/* 07D14 809342E4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07D18 809342E8 A4CF0010 */ sh $t7, 0x0010($a2) ## 00000010 -/* 07D1C 809342EC 8618019E */ lh $t8, 0x019E($s0) ## 0000019E -/* 07D20 809342F0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 07D24 809342F4 00000000 */ nop -/* 07D28 809342F8 46805420 */ cvt.s.w $f16, $f10 -/* 07D2C 809342FC E4D00014 */ swc1 $f16, 0x0014($a2) ## 00000014 -/* 07D30 80934300 860801A0 */ lh $t0, 0x01A0($s0) ## 000001A0 -/* 07D34 80934304 A4C80018 */ sh $t0, 0x0018($a2) ## 00000018 -/* 07D38 80934308 860909D0 */ lh $t1, 0x09D0($s0) ## 000009D0 -/* 07D3C 8093430C 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 07D40 80934310 0141001A */ div $zero, $t2, $at -/* 07D44 80934314 00005810 */ mfhi $t3 -/* 07D48 80934318 A60B09D0 */ sh $t3, 0x09D0($s0) ## 000009D0 -/* 07D4C 8093431C 0C24D83F */ jal func_809360FC -/* 07D50 80934320 00000000 */ nop -/* 07D54 80934324 8FBF0024 */ lw $ra, 0x0024($sp) -/* 07D58 80934328 8FB0001C */ lw $s0, 0x001C($sp) -/* 07D5C 8093432C 8FB10020 */ lw $s1, 0x0020($sp) -/* 07D60 80934330 03E00008 */ jr $ra -/* 07D64 80934334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s deleted file mode 100644 index 71ada23e55..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8092CAA0 -/* 004D0 8092CAA0 3C028094 */ lui $v0, %hi(D_80938C98) ## $v0 = 80940000 -/* 004D4 8092CAA4 24428C98 */ addiu $v0, $v0, %lo(D_80938C98) ## $v0 = 80938C98 -/* 004D8 8092CAA8 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 -/* 004DC 8092CAAC 8C4E0000 */ lw $t6, 0x0000($v0) ## 80938C98 -/* 004E0 8092CAB0 3C188093 */ lui $t8, %hi(func_8092CAD0) ## $t8 = 80930000 -/* 004E4 8092CAB4 2718CAD0 */ addiu $t8, $t8, %lo(func_8092CAD0) ## $t8 = 8092CAD0 -/* 004E8 8092CAB8 ADC00134 */ sw $zero, 0x0134($t6) ## 00000134 -/* 004EC 8092CABC 8C4F0004 */ lw $t7, 0x0004($v0) ## 80938C9C -/* 004F0 8092CAC0 ADE00134 */ sw $zero, 0x0134($t7) ## 00000134 -/* 004F4 8092CAC4 A0800194 */ sb $zero, 0x0194($a0) ## 00000194 -/* 004F8 8092CAC8 03E00008 */ jr $ra -/* 004FC 8092CACC AC980190 */ sw $t8, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s deleted file mode 100644 index b1dae7a4d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8092CAD0 -/* 00500 8092CAD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00504 8092CAD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00508 8092CAD8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0050C 8092CADC 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 00510 8092CAE0 C4840094 */ lwc1 $f4, 0x0094($a0) ## 00000094 -/* 00514 8092CAE4 4606203C */ c.lt.s $f4, $f6 -/* 00518 8092CAE8 00000000 */ nop -/* 0051C 8092CAEC 45020004 */ bc1fl .L8092CB00 -/* 00520 8092CAF0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00524 8092CAF4 0C24B2C3 */ jal func_8092CB0C -/* 00528 8092CAF8 00000000 */ nop -/* 0052C 8092CAFC 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092CB00: -/* 00530 8092CB00 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00534 8092CB04 03E00008 */ jr $ra -/* 00538 8092CB08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s deleted file mode 100644 index 79758a21e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_8092CB0C -/* 0053C 8092CB0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00540 8092CB10 AFBF001C */ sw $ra, 0x001C($sp) -/* 00544 8092CB14 AFB10018 */ sw $s1, 0x0018($sp) -/* 00548 8092CB18 AFB00014 */ sw $s0, 0x0014($sp) -/* 0054C 8092CB1C 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 00550 8092CB20 240E0263 */ addiu $t6, $zero, 0x0263 ## $t6 = 00000263 -/* 00554 8092CB24 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 -/* 00558 8092CB28 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 0055C 8092CB2C A0800195 */ sb $zero, 0x0195($a0) ## 00000195 -/* 00560 8092CB30 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 -/* 00564 8092CB34 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00568 8092CB38 C4640000 */ lwc1 $f4, 0x0000($v1) ## 80937340 -/* 0056C 8092CB3C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 00570 8092CB40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00574 8092CB44 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 00578 8092CB48 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 0057C 8092CB4C C4680008 */ lwc1 $f8, 0x0008($v1) ## 80937348 -/* 00580 8092CB50 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 00584 8092CB54 24028000 */ addiu $v0, $zero, 0x8000 ## $v0 = FFFF8000 -/* 00588 8092CB58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0058C 8092CB5C 35F80020 */ ori $t8, $t7, 0x0020 ## $t8 = 00000020 -/* 00590 8092CB60 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00594 8092CB64 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00598 8092CB68 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 0059C 8092CB6C A602083E */ sh $v0, 0x083E($s0) ## 0000083E -/* 005A0 8092CB70 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 005A4 8092CB74 A6000894 */ sh $zero, 0x0894($s0) ## 00000894 -/* 005A8 8092CB78 AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 005AC 8092CB7C E6000838 */ swc1 $f0, 0x0838($s0) ## 00000838 -/* 005B0 8092CB80 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 005B4 8092CB84 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 005B8 8092CB88 AFA60020 */ sw $a2, 0x0020($sp) -/* 005BC 8092CB8C 0C019148 */ jal func_80064520 -/* 005C0 8092CB90 24A51D64 */ addiu $a1, $a1, 0x1D64 ## $a1 = 00001D64 -/* 005C4 8092CB94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005C8 8092CB98 8FA50020 */ lw $a1, 0x0020($sp) -/* 005CC 8092CB9C 0C00B7D5 */ jal func_8002DF54 -/* 005D0 8092CBA0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 005D4 8092CBA4 0C03008C */ jal Gameplay_CreateSubCamera -/* 005D8 8092CBA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005DC 8092CBAC 3C018094 */ lui $at, %hi(D_80938CC4) ## $at = 80940000 -/* 005E0 8092CBB0 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) -/* 005E4 8092CBB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 005E8 8092CBB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005EC 8092CBBC 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 005F0 8092CBC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 005F4 8092CBC4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 005F8 8092CBC8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 005FC 8092CBCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00600 8092CBD0 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 00604 8092CBD4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00608 8092CBD8 3C048093 */ lui $a0, %hi(D_8093734C) ## $a0 = 80930000 -/* 0060C 8092CBDC 2484734C */ addiu $a0, $a0, %lo(D_8093734C) ## $a0 = 8093734C -/* 00610 8092CBE0 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00614 8092CBE4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00618 8092CBE8 3C198016 */ lui $t9, %hi(gSaveContext+0xee2) -/* 0061C 8092CBEC 9739F542 */ lhu $t9, %lo(gSaveContext+0xee2)($t9) -/* 00620 8092CBF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00624 8092CBF4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 00628 8092CBF8 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 0062C 8092CBFC 11000005 */ beq $t0, $zero, .L8092CC14 -/* 00630 8092CC00 3C068093 */ lui $a2, %hi(D_8093734C) ## $a2 = 80930000 -/* 00634 8092CC04 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 00638 8092CC08 44815000 */ mtc1 $at, $f10 ## $f10 = -100.00 -/* 0063C 8092CC0C 3C018093 */ lui $at, %hi(D_80937360) ## $at = 80930000 -/* 00640 8092CC10 E42A7360 */ swc1 $f10, %lo(D_80937360)($at) -.L8092CC14: -/* 00644 8092CC14 3C078093 */ lui $a3, %hi(D_80937358) ## $a3 = 80930000 -/* 00648 8092CC18 24E77358 */ addiu $a3, $a3, %lo(D_80937358) ## $a3 = 80937358 -/* 0064C 8092CC1C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 00650 8092CC20 0C030136 */ jal Gameplay_CameraSetAtEye -/* 00654 8092CC24 24C6734C */ addiu $a2, $a2, %lo(D_8093734C) ## $a2 = 8093734C -/* 00658 8092CC28 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 0065C 8092CC2C 0C03E803 */ jal Audio_SetBGM - -/* 00660 8092CC30 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF -/* 00664 8092CC34 8FAA0020 */ lw $t2, 0x0020($sp) -/* 00668 8092CC38 3C098093 */ lui $t1, %hi(func_8092CC58) ## $t1 = 80930000 -/* 0066C 8092CC3C 2529CC58 */ addiu $t1, $t1, %lo(func_8092CC58) ## $t1 = 8092CC58 -/* 00670 8092CC40 AD490190 */ sw $t1, 0x0190($t2) ## 00000190 -/* 00674 8092CC44 8FBF001C */ lw $ra, 0x001C($sp) -/* 00678 8092CC48 8FB10018 */ lw $s1, 0x0018($sp) -/* 0067C 8092CC4C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00680 8092CC50 03E00008 */ jr $ra -/* 00684 8092CC54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s deleted file mode 100644 index 957e509984..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s +++ /dev/null @@ -1,958 +0,0 @@ -.late_rodata -glabel D_8093799C - .word 0x409D70A4 -glabel D_809379A0 - .word 0x3F4CCCCC -glabel D_809379A4 - .word 0x40666666 - -.text -glabel func_8092CC58 -/* 00688 8092CC58 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0068C 8092CC5C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00690 8092CC60 AFB20030 */ sw $s2, 0x0030($sp) -/* 00694 8092CC64 AFB1002C */ sw $s1, 0x002C($sp) -/* 00698 8092CC68 AFB00028 */ sw $s0, 0x0028($sp) -/* 0069C 8092CC6C AFA50054 */ sw $a1, 0x0054($sp) -/* 006A0 8092CC70 84860198 */ lh $a2, 0x0198($a0) ## 00000198 -/* 006A4 8092CC74 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 006A8 8092CC78 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 006AC 8092CC7C 10C00002 */ beq $a2, $zero, .L8092CC88 -/* 006B0 8092CC80 24CFFFFF */ addiu $t7, $a2, 0xFFFF ## $t7 = FFFFFFFF -/* 006B4 8092CC84 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -.L8092CC88: -/* 006B8 8092CC88 2644014C */ addiu $a0, $s2, 0x014C ## $a0 = 0000014C -/* 006BC 8092CC8C AFA40038 */ sw $a0, 0x0038($sp) -/* 006C0 8092CC90 0C02927F */ jal SkelAnime_Update - -/* 006C4 8092CC94 AFA7004C */ sw $a3, 0x004C($sp) -/* 006C8 8092CC98 10400008 */ beq $v0, $zero, .L8092CCBC -/* 006CC 8092CC9C 8FA7004C */ lw $a3, 0x004C($sp) -/* 006D0 8092CCA0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 006D4 8092CCA4 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 006D8 8092CCA8 8FA40038 */ lw $a0, 0x0038($sp) -/* 006DC 8092CCAC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 006E0 8092CCB0 0C0294D3 */ jal Animation_MorphToLoop -/* 006E4 8092CCB4 AFA7004C */ sw $a3, 0x004C($sp) -/* 006E8 8092CCB8 8FA7004C */ lw $a3, 0x004C($sp) -.L8092CCBC: -/* 006EC 8092CCBC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -/* 006F0 8092CCC0 54C00054 */ bnel $a2, $zero, .L8092CE14 -/* 006F4 8092CCC4 28C10222 */ slti $at, $a2, 0x0222 -/* 006F8 8092CCC8 3C068094 */ lui $a2, %hi(D_80938C98) ## $a2 = 80940000 -/* 006FC 8092CCCC 24C68C98 */ addiu $a2, $a2, %lo(D_80938C98) ## $a2 = 80938C98 -/* 00700 8092CCD0 8CC20004 */ lw $v0, 0x0004($a2) ## 80938C9C -/* 00704 8092CCD4 8FA40054 */ lw $a0, 0x0054($sp) -/* 00708 8092CCD8 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF -/* 0070C 8092CCDC 8C580004 */ lw $t8, 0x0004($v0) ## 00000004 -/* 00710 8092CCE0 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 00714 8092CCE4 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00718 8092CCE8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0071C 8092CCEC 8CC30000 */ lw $v1, 0x0000($a2) ## 80938C98 -/* 00720 8092CCF0 8C6A0004 */ lw $t2, 0x0004($v1) ## 00000004 -/* 00724 8092CCF4 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00728 8092CCF8 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 0072C 8092CCFC 8CEC067C */ lw $t4, 0x067C($a3) ## 0000067C -/* 00730 8092CD00 01816824 */ and $t5, $t4, $at -/* 00734 8092CD04 0C01914D */ jal func_80064534 -/* 00738 8092CD08 ACED067C */ sw $t5, 0x067C($a3) ## 0000067C -/* 0073C 8092CD0C 8FA40054 */ lw $a0, 0x0054($sp) -/* 00740 8092CD10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00744 8092CD14 0C00B7D5 */ jal func_8002DF54 -/* 00748 8092CD18 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 0074C 8092CD1C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00750 8092CD20 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00754 8092CD24 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00758 8092CD28 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 0075C 8092CD2C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00760 8092CD30 C6240004 */ lwc1 $f4, 0x0004($s1) ## 80937350 -/* 00764 8092CD34 44818000 */ mtc1 $at, $f16 ## $f16 = 300.00 -/* 00768 8092CD38 C62A0008 */ lwc1 $f10, 0x0008($s1) ## 80937354 -/* 0076C 8092CD3C 46062200 */ add.s $f8, $f4, $f6 -/* 00770 8092CD40 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00774 8092CD44 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00778 8092CD48 46105480 */ add.s $f18, $f10, $f16 -/* 0077C 8092CD4C E6280004 */ swc1 $f8, 0x0004($s1) ## 80937350 -/* 00780 8092CD50 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 00784 8092CD54 02003825 */ or $a3, $s0, $zero ## $a3 = 80937358 -/* 00788 8092CD58 E6320008 */ swc1 $f18, 0x0008($s1) ## 80937354 -/* 0078C 8092CD5C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 00790 8092CD60 02203025 */ or $a2, $s1, $zero ## $a2 = 8093734C -/* 00794 8092CD64 0C030136 */ jal Gameplay_CameraSetAtEye -/* 00798 8092CD68 8FA40054 */ lw $a0, 0x0054($sp) -/* 0079C 8092CD6C 3C068094 */ lui $a2, %hi(D_80938CC4) ## $a2 = 80940000 -/* 007A0 8092CD70 84C68CC4 */ lh $a2, %lo(D_80938CC4)($a2) -/* 007A4 8092CD74 8FA40054 */ lw $a0, 0x0054($sp) -/* 007A8 8092CD78 0C0301E3 */ jal Gameplay_CopyCamera -/* 007AC 8092CD7C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007B0 8092CD80 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 007B4 8092CD84 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 007B8 8092CD88 8FA40054 */ lw $a0, 0x0054($sp) -/* 007BC 8092CD8C 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 007C0 8092CD90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 007C4 8092CD94 8FA40054 */ lw $a0, 0x0054($sp) -/* 007C8 8092CD98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007CC 8092CD9C 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 007D0 8092CDA0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 007D4 8092CDA4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 007D8 8092CDA8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 007DC 8092CDAC 0C0300E1 */ jal Gameplay_ClearCamera -/* 007E0 8092CDB0 8FA40054 */ lw $a0, 0x0054($sp) -/* 007E4 8092CDB4 3C058016 */ lui $a1, %hi(gSaveContext) -/* 007E8 8092CDB8 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 007EC 8092CDBC 94AE0EE2 */ lhu $t6, 0x0EE2($a1) ## 8015F542 -/* 007F0 8092CDC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 007F4 8092CDC4 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 -/* 007F8 8092CDC8 0C24B6CC */ jal func_8092DB30 -/* 007FC 8092CDCC A4AF0EE2 */ sh $t7, 0x0EE2($a1) ## 8015F542 -/* 00800 8092CDD0 925803E6 */ lbu $t8, 0x03E6($s2) ## 000003E6 -/* 00804 8092CDD4 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 00808 8092CDD8 24848C98 */ addiu $a0, $a0, %lo(D_80938C98) ## $a0 = 80938C98 -/* 0080C 8092CDDC 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00810 8092CDE0 A25903E6 */ sb $t9, 0x03E6($s2) ## 000003E6 -/* 00814 8092CDE4 8C830000 */ lw $v1, 0x0000($a0) ## 80938C98 -/* 00818 8092CDE8 240E0070 */ addiu $t6, $zero, 0x0070 ## $t6 = 00000070 -/* 0081C 8092CDEC 906A03E6 */ lbu $t2, 0x03E6($v1) ## 000003E6 -/* 00820 8092CDF0 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00824 8092CDF4 A06B03E6 */ sb $t3, 0x03E6($v1) ## 000003E6 -/* 00828 8092CDF8 8C820004 */ lw $v0, 0x0004($a0) ## 80938C9C -/* 0082C 8092CDFC 904C03E6 */ lbu $t4, 0x03E6($v0) ## 000003E6 -/* 00830 8092CE00 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00834 8092CE04 A04D03E6 */ sb $t5, 0x03E6($v0) ## 000003E6 -/* 00838 8092CE08 10000308 */ beq $zero, $zero, .L8092DA2C -/* 0083C 8092CE0C A64E0198 */ sh $t6, 0x0198($s2) ## 00000198 -/* 00840 8092CE10 28C10222 */ slti $at, $a2, 0x0222 -.L8092CE14: -/* 00844 8092CE14 1420004F */ bne $at, $zero, .L8092CF54 -/* 00848 8092CE18 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0084C 8092CE1C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00850 8092CE20 C4E60028 */ lwc1 $f6, 0x0028($a3) ## 00000028 -/* 00854 8092CE24 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00858 8092CE28 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 -/* 0085C 8092CE2C 4606203C */ c.lt.s $f4, $f6 -/* 00860 8092CE30 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00864 8092CE34 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 -/* 00868 8092CE38 02202025 */ or $a0, $s1, $zero ## $a0 = 8093734C -/* 0086C 8092CE3C 4500000B */ bc1f .L8092CE6C -/* 00870 8092CE40 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 -/* 00874 8092CE44 C4680000 */ lwc1 $f8, 0x0000($v1) ## 80937340 -/* 00878 8092CE48 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0087C 8092CE4C 24028000 */ addiu $v0, $zero, 0x8000 ## $v0 = FFFF8000 -/* 00880 8092CE50 E4E80024 */ swc1 $f8, 0x0024($a3) ## 00000024 -/* 00884 8092CE54 C46A0008 */ lwc1 $f10, 0x0008($v1) ## 80937348 -/* 00888 8092CE58 A4E200B6 */ sh $v0, 0x00B6($a3) ## 000000B6 -/* 0088C 8092CE5C A4E2083E */ sh $v0, 0x083E($a3) ## 0000083E -/* 00890 8092CE60 A4E2083C */ sh $v0, 0x083C($a3) ## 0000083C -/* 00894 8092CE64 E4F00838 */ swc1 $f16, 0x0838($a3) ## 00000838 -/* 00898 8092CE68 E4EA002C */ swc1 $f10, 0x002C($a3) ## 0000002C -.L8092CE6C: -/* 0089C 8092CE6C 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 008A0 8092CE70 AFA7004C */ sw $a3, 0x004C($sp) -/* 008A4 8092CE74 8FA7004C */ lw $a3, 0x004C($sp) -/* 008A8 8092CE78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008AC 8092CE7C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 008B0 8092CE80 94EF0088 */ lhu $t7, 0x0088($a3) ## 00000088 -/* 008B4 8092CE84 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 008B8 8092CE88 13000030 */ beq $t8, $zero, .L8092CF4C -/* 008BC 8092CE8C 00000000 */ nop -/* 008C0 8092CE90 82590195 */ lb $t9, 0x0195($s2) ## 00000195 -/* 008C4 8092CE94 3C058016 */ lui $a1, %hi(gSaveContext) -/* 008C8 8092CE98 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 008CC 8092CE9C 17200011 */ bne $t9, $zero, .L8092CEE4 -/* 008D0 8092CEA0 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 008D4 8092CEA4 3C108094 */ lui $s0, %hi(D_80938CA0) ## $s0 = 80940000 -/* 008D8 8092CEA8 26108CA0 */ addiu $s0, $s0, %lo(D_80938CA0) ## $s0 = 80938CA0 -/* 008DC 8092CEAC 8E0A0000 */ lw $t2, 0x0000($s0) ## 80938CA0 -/* 008E0 8092CEB0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 008E4 8092CEB4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 008E8 8092CEB8 A542001C */ sh $v0, 0x001C($t2) ## 0000001C -/* 008EC 8092CEBC A2420195 */ sb $v0, 0x0195($s2) ## 00000195 -/* 008F0 8092CEC0 C64C008C */ lwc1 $f12, 0x008C($s2) ## 0000008C -/* 008F4 8092CEC4 0C02A800 */ jal func_800AA000 -/* 008F8 8092CEC8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 008FC 8092CECC 8E040000 */ lw $a0, 0x0000($s0) ## 80938CA0 -/* 00900 8092CED0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00904 8092CED4 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 -/* 00908 8092CED8 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 0090C 8092CEDC 100002D3 */ beq $zero, $zero, .L8092DA2C -/* 00910 8092CEE0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -.L8092CEE4: -/* 00914 8092CEE4 94AB0EE2 */ lhu $t3, 0x0EE2($a1) ## 00000EE2 -/* 00918 8092CEE8 3C028093 */ lui $v0, %hi(BossSst_Draw) ## $v0 = 80930000 -/* 0091C 8092CEEC 24424668 */ addiu $v0, $v0, %lo(BossSst_Draw) ## $v0 = 80934668 -/* 00920 8092CEF0 316C0080 */ andi $t4, $t3, 0x0080 ## $t4 = 00000000 -/* 00924 8092CEF4 11800014 */ beq $t4, $zero, .L8092CF48 -/* 00928 8092CEF8 24190222 */ addiu $t9, $zero, 0x0222 ## $t9 = 00000222 -/* 0092C 8092CEFC 3C0D8094 */ lui $t5, %hi(D_80938C9C) ## $t5 = 80940000 -/* 00930 8092CF00 8DAD8C9C */ lw $t5, %lo(D_80938C9C)($t5) -/* 00934 8092CF04 3C0E8094 */ lui $t6, %hi(D_80938C98) ## $t6 = 80940000 -/* 00938 8092CF08 3C0F8093 */ lui $t7, %hi(func_809352DC) ## $t7 = 80930000 -/* 0093C 8092CF0C ADA20134 */ sw $v0, 0x0134($t5) ## 80940134 -/* 00940 8092CF10 8DCE8C98 */ lw $t6, %lo(D_80938C98)($t6) -/* 00944 8092CF14 25EF52DC */ addiu $t7, $t7, %lo(func_809352DC) ## $t7 = 809352DC -/* 00948 8092CF18 241800B2 */ addiu $t8, $zero, 0x00B2 ## $t8 = 000000B2 -/* 0094C 8092CF1C ADC20134 */ sw $v0, 0x0134($t6) ## 80940134 -/* 00950 8092CF20 3C01C292 */ lui $at, 0xC292 ## $at = C2920000 -/* 00954 8092CF24 44819000 */ mtc1 $at, $f18 ## $f18 = -73.00 -/* 00958 8092CF28 AE4F0134 */ sw $t7, 0x0134($s2) ## 00000134 -/* 0095C 8092CF2C A6580198 */ sh $t8, 0x0198($s2) ## 00000198 -/* 00960 8092CF30 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00964 8092CF34 E6200004 */ swc1 $f0, 0x0004($s1) ## 80937350 -/* 00968 8092CF38 E6200008 */ swc1 $f0, 0x0008($s1) ## 80937354 -/* 0096C 8092CF3C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00970 8092CF40 100002BA */ beq $zero, $zero, .L8092DA2C -/* 00974 8092CF44 E6320000 */ swc1 $f18, 0x0000($s1) ## 8093734C -.L8092CF48: -/* 00978 8092CF48 A6590198 */ sh $t9, 0x0198($s2) ## 00000198 -.L8092CF4C: -/* 0097C 8092CF4C 100002B7 */ beq $zero, $zero, .L8092DA2C -/* 00980 8092CF50 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 8093E6B0 -.L8092CF54: -/* 00984 8092CF54 28C101DE */ slti $at, $a2, 0x01DE -/* 00988 8092CF58 14200010 */ bne $at, $zero, .L8092CF9C -/* 0098C 8092CF5C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00990 8092CF60 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00994 8092CF64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00998 8092CF68 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 0099C 8092CF6C C6040000 */ lwc1 $f4, 0x0000($s0) ## 80937358 -/* 009A0 8092CF70 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C -/* 009A4 8092CF74 C6100008 */ lwc1 $f16, 0x0008($s0) ## 80937360 -/* 009A8 8092CF78 46002180 */ add.s $f6, $f4, $f0 -/* 009AC 8092CF7C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 009B0 8092CF80 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 009B4 8092CF84 46004280 */ add.s $f10, $f8, $f0 -/* 009B8 8092CF88 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 009BC 8092CF8C 46008481 */ sub.s $f18, $f16, $f0 -/* 009C0 8092CF90 E60A0004 */ swc1 $f10, 0x0004($s0) ## 8093735C -/* 009C4 8092CF94 100002A5 */ beq $zero, $zero, .L8092DA2C -/* 009C8 8092CF98 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 -.L8092CF9C: -/* 009CC 8092CF9C 28C101C0 */ slti $at, $a2, 0x01C0 -/* 009D0 8092CFA0 14200051 */ bne $at, $zero, .L8092D0E8 -/* 009D4 8092CFA4 241001CC */ addiu $s0, $zero, 0x01CC ## $s0 = 000001CC -/* 009D8 8092CFA8 16060015 */ bne $s0, $a2, .L8092D000 -/* 009DC 8092CFAC 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 -/* 009E0 8092CFB0 3C0A8094 */ lui $t2, %hi(D_80938C9C) ## $t2 = 80940000 -/* 009E4 8092CFB4 8D4A8C9C */ lw $t2, %lo(D_80938C9C)($t2) -/* 009E8 8092CFB8 3C028093 */ lui $v0, %hi(BossSst_Draw) ## $v0 = 80930000 -/* 009EC 8092CFBC 24424668 */ addiu $v0, $v0, %lo(BossSst_Draw) ## $v0 = 80934668 -/* 009F0 8092CFC0 3C0B8094 */ lui $t3, %hi(D_80938C98) ## $t3 = 80940000 -/* 009F4 8092CFC4 AD420134 */ sw $v0, 0x0134($t2) ## 80940134 -/* 009F8 8092CFC8 8D6B8C98 */ lw $t3, %lo(D_80938C98)($t3) -/* 009FC 8092CFCC 3C0C8093 */ lui $t4, %hi(func_809352DC) ## $t4 = 80930000 -/* 00A00 8092CFD0 258C52DC */ addiu $t4, $t4, %lo(func_809352DC) ## $t4 = 809352DC -/* 00A04 8092CFD4 AD620134 */ sw $v0, 0x0134($t3) ## 80940134 -/* 00A08 8092CFD8 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 -/* 00A0C 8092CFDC AE4C0134 */ sw $t4, 0x0134($s2) ## 00000134 -/* 00A10 8092CFE0 C4640000 */ lwc1 $f4, 0x0000($v1) ## 80937340 -/* 00A14 8092CFE4 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 00A18 8092CFE8 E4E40024 */ swc1 $f4, 0x0024($a3) ## 00000024 -/* 00A1C 8092CFEC C4660008 */ lwc1 $f6, 0x0008($v1) ## 80937348 -/* 00A20 8092CFF0 E4E6002C */ swc1 $f6, 0x002C($a3) ## 0000002C -/* 00A24 8092CFF4 0C24BF74 */ jal func_8092FDD0 -/* 00A28 8092CFF8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 00A2C 8092CFFC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D000: -/* 00A30 8092D000 28C101CD */ slti $at, $a2, 0x01CD -/* 00A34 8092D004 14200011 */ bne $at, $zero, .L8092D04C -/* 00A38 8092D008 00000000 */ nop -/* 00A3C 8092D00C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00A40 8092D010 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00A44 8092D014 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00A48 8092D018 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 00A4C 8092D01C C6080000 */ lwc1 $f8, 0x0000($s0) ## 80937358 -/* 00A50 8092D020 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00A54 8092D024 C6100004 */ lwc1 $f16, 0x0004($s0) ## 8093735C -/* 00A58 8092D028 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 00A5C 8092D02C C6040008 */ lwc1 $f4, 0x0008($s0) ## 80937360 -/* 00A60 8092D030 46024281 */ sub.s $f10, $f8, $f2 -/* 00A64 8092D034 46028481 */ sub.s $f18, $f16, $f2 -/* 00A68 8092D038 E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 -/* 00A6C 8092D03C 46062200 */ add.s $f8, $f4, $f6 -/* 00A70 8092D040 E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C -/* 00A74 8092D044 10000023 */ beq $zero, $zero, .L8092D0D4 -/* 00A78 8092D048 E6080008 */ swc1 $f8, 0x0008($s0) ## 80937360 -.L8092D04C: -/* 00A7C 8092D04C 16060021 */ bne $s0, $a2, .L8092D0D4 -/* 00A80 8092D050 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00A84 8092D054 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) -/* 00A88 8092D058 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00A8C 8092D05C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A90 8092D060 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 -/* 00A94 8092D064 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00A98 8092D068 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00A9C 8092D06C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00AA0 8092D070 E62A0000 */ swc1 $f10, 0x0000($s1) ## 8093734C -/* 00AA4 8092D074 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 00AA8 8092D078 C450000C */ lwc1 $f16, 0x000C($v0) ## 8094000C -/* 00AAC 8092D07C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00AB0 8092D080 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00AB4 8092D084 46128101 */ sub.s $f4, $f16, $f18 -/* 00AB8 8092D088 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 -/* 00ABC 8092D08C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00AC0 8092D090 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00AC4 8092D094 E6240004 */ swc1 $f4, 0x0004($s1) ## 80937350 -/* 00AC8 8092D098 C4460010 */ lwc1 $f6, 0x0010($v0) ## 80940010 -/* 00ACC 8092D09C 46003200 */ add.s $f8, $f6, $f0 -/* 00AD0 8092D0A0 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 00AD4 8092D0A4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00AD8 8092D0A8 E6280008 */ swc1 $f8, 0x0008($s1) ## 80937354 -/* 00ADC 8092D0AC C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 -/* 00AE0 8092D0B0 46105480 */ add.s $f18, $f10, $f16 -/* 00AE4 8092D0B4 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 -/* 00AE8 8092D0B8 E6120000 */ swc1 $f18, 0x0000($s0) ## 80937358 -/* 00AEC 8092D0BC C444000C */ lwc1 $f4, 0x000C($v0) ## 8094000C -/* 00AF0 8092D0C0 46062200 */ add.s $f8, $f4, $f6 -/* 00AF4 8092D0C4 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C -/* 00AF8 8092D0C8 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00AFC 8092D0CC 46105480 */ add.s $f18, $f10, $f16 -/* 00B00 8092D0D0 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 -.L8092D0D4: -/* 00B04 8092D0D4 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00B08 8092D0D8 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00B0C 8092D0DC 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00B10 8092D0E0 10000252 */ beq $zero, $zero, .L8092DA2C -/* 00B14 8092D0E4 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -.L8092D0E8: -/* 00B18 8092D0E8 28C10174 */ slti $at, $a2, 0x0174 -/* 00B1C 8092D0EC 14200068 */ bne $at, $zero, .L8092D290 -/* 00B20 8092D0F0 240101BF */ addiu $at, $zero, 0x01BF ## $at = 000001BF -/* 00B24 8092D0F4 24C8FE8C */ addiu $t0, $a2, 0xFE8C ## $t0 = FFFFFE8C -/* 00B28 8092D0F8 14C10016 */ bne $a2, $at, .L8092D154 -/* 00B2C 8092D0FC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 00B30 8092D100 8CEE0024 */ lw $t6, 0x0024($a3) ## 00000024 -/* 00B34 8092D104 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00B38 8092D108 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00B3C 8092D10C AE2E0000 */ sw $t6, 0x0000($s1) ## 8093734C -/* 00B40 8092D110 8CED0028 */ lw $t5, 0x0028($a3) ## 00000028 -/* 00B44 8092D114 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 -/* 00B48 8092D118 44812000 */ mtc1 $at, $f4 ## $f4 = -250.00 -/* 00B4C 8092D11C 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 00B50 8092D120 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 00B54 8092D124 AE2D0004 */ sw $t5, 0x0004($s1) ## 80937350 -/* 00B58 8092D128 8CEE002C */ lw $t6, 0x002C($a3) ## 0000002C -/* 00B5C 8092D12C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00B60 8092D130 3C01C33E */ lui $at, 0xC33E ## $at = C33E0000 -/* 00B64 8092D134 44814000 */ mtc1 $at, $f8 ## $f8 = -190.00 -/* 00B68 8092D138 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00B6C 8092D13C E6040000 */ swc1 $f4, 0x0000($s0) ## 80937358 -/* 00B70 8092D140 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C -/* 00B74 8092D144 AE2E0008 */ sw $t6, 0x0008($s1) ## 80937354 -/* 00B78 8092D148 E6080008 */ swc1 $f8, 0x0008($s0) ## 80937360 -/* 00B7C 8092D14C 1000004B */ beq $zero, $zero, .L8092D27C -/* 00B80 8092D150 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D154: -/* 00B84 8092D154 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00B88 8092D158 15010023 */ bne $t0, $at, .L8092D1E8 -/* 00B8C 8092D15C 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00B90 8092D160 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) -/* 00B94 8092D164 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B98 8092D168 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00B9C 8092D16C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00BA0 8092D170 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 00BA4 8092D174 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 -/* 00BA8 8092D178 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00BAC 8092D17C 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00BB0 8092D180 46105480 */ add.s $f18, $f10, $f16 -/* 00BB4 8092D184 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00BB8 8092D188 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 00BBC 8092D18C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00BC0 8092D190 E6320000 */ swc1 $f18, 0x0000($s1) ## 8093734C -/* 00BC4 8092D194 C444000C */ lwc1 $f4, 0x000C($v0) ## 8094000C -/* 00BC8 8092D198 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 00BCC 8092D19C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00BD0 8092D1A0 E6240004 */ swc1 $f4, 0x0004($s1) ## 80937350 -/* 00BD4 8092D1A4 C4460010 */ lwc1 $f6, 0x0010($v0) ## 80940010 -/* 00BD8 8092D1A8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00BDC 8092D1AC 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 00BE0 8092D1B0 46083280 */ add.s $f10, $f6, $f8 -/* 00BE4 8092D1B4 E62A0008 */ swc1 $f10, 0x0008($s1) ## 80937354 -/* 00BE8 8092D1B8 C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 -/* 00BEC 8092D1BC 46128100 */ add.s $f4, $f16, $f18 -/* 00BF0 8092D1C0 44818000 */ mtc1 $at, $f16 ## $f16 = 210.00 -/* 00BF4 8092D1C4 E6040000 */ swc1 $f4, 0x0000($s0) ## 80937358 -/* 00BF8 8092D1C8 C446000C */ lwc1 $f6, 0x000C($v0) ## 8094000C -/* 00BFC 8092D1CC 46003200 */ add.s $f8, $f6, $f0 -/* 00C00 8092D1D0 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C -/* 00C04 8092D1D4 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00C08 8092D1D8 46105481 */ sub.s $f18, $f10, $f16 -/* 00C0C 8092D1DC E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 -/* 00C10 8092D1E0 10000026 */ beq $zero, $zero, .L8092D27C -/* 00C14 8092D1E4 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D1E8: -/* 00C18 8092D1E8 2401003E */ addiu $at, $zero, 0x003E ## $at = 0000003E -/* 00C1C 8092D1EC 15010023 */ bne $t0, $at, .L8092D27C -/* 00C20 8092D1F0 00000000 */ nop -/* 00C24 8092D1F4 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00C28 8092D1F8 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) -/* 00C2C 8092D1FC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00C30 8092D200 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00C34 8092D204 C4640008 */ lwc1 $f4, 0x0008($v1) ## 80940008 -/* 00C38 8092D208 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00C3C 8092D20C 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 00C40 8092D210 E6240000 */ swc1 $f4, 0x0000($s1) ## 8093734C -/* 00C44 8092D214 C466000C */ lwc1 $f6, 0x000C($v1) ## 8094000C -/* 00C48 8092D218 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00C4C 8092D21C 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 00C50 8092D220 46083280 */ add.s $f10, $f6, $f8 -/* 00C54 8092D224 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00C58 8092D228 44814000 */ mtc1 $at, $f8 ## $f8 = 110.00 -/* 00C5C 8092D22C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00C60 8092D230 E62A0004 */ swc1 $f10, 0x0004($s1) ## 80937350 -/* 00C64 8092D234 C4700010 */ lwc1 $f16, 0x0010($v1) ## 80940010 -/* 00C68 8092D238 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00C6C 8092D23C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 00C70 8092D240 46128100 */ add.s $f4, $f16, $f18 -/* 00C74 8092D244 44819000 */ mtc1 $at, $f18 ## $f18 = 180.00 -/* 00C78 8092D248 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00C7C 8092D24C E6240008 */ swc1 $f4, 0x0008($s1) ## 80937354 -/* 00C80 8092D250 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80940008 -/* 00C84 8092D254 46083280 */ add.s $f10, $f6, $f8 -/* 00C88 8092D258 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 -/* 00C8C 8092D25C E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 -/* 00C90 8092D260 C470000C */ lwc1 $f16, 0x000C($v1) ## 8094000C -/* 00C94 8092D264 46128100 */ add.s $f4, $f16, $f18 -/* 00C98 8092D268 E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C -/* 00C9C 8092D26C C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 00CA0 8092D270 46083281 */ sub.s $f10, $f6, $f8 -/* 00CA4 8092D274 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 -/* 00CA8 8092D278 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D27C: -/* 00CAC 8092D27C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00CB0 8092D280 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00CB4 8092D284 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00CB8 8092D288 10000116 */ beq $zero, $zero, .L8092D6E4 -/* 00CBC 8092D28C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -.L8092D290: -/* 00CC0 8092D290 28C10130 */ slti $at, $a2, 0x0130 -/* 00CC4 8092D294 1420004F */ bne $at, $zero, .L8092D3D4 -/* 00CC8 8092D298 24C8FED0 */ addiu $t0, $a2, 0xFED0 ## $t0 = FFFFFED0 -/* 00CCC 8092D29C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00CD0 8092D2A0 15010025 */ bne $t0, $at, .L8092D338 -/* 00CD4 8092D2A4 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 00CD8 8092D2A8 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00CDC 8092D2AC 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) -/* 00CE0 8092D2B0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00CE4 8092D2B4 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 00CE8 8092D2B8 C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 -/* 00CEC 8092D2BC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00CF0 8092D2C0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00CF4 8092D2C4 46028480 */ add.s $f18, $f16, $f2 -/* 00CF8 8092D2C8 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 00CFC 8092D2CC 44813000 */ mtc1 $at, $f6 ## $f6 = 90.00 -/* 00D00 8092D2D0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00D04 8092D2D4 E6320000 */ swc1 $f18, 0x0000($s1) ## 8093734C -/* 00D08 8092D2D8 C444000C */ lwc1 $f4, 0x000C($v0) ## 8094000C -/* 00D0C 8092D2DC 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00D10 8092D2E0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00D14 8092D2E4 46062201 */ sub.s $f8, $f4, $f6 -/* 00D18 8092D2E8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00D1C 8092D2EC 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 00D20 8092D2F0 E6280004 */ swc1 $f8, 0x0004($s1) ## 80937350 -/* 00D24 8092D2F4 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00D28 8092D2F8 46025401 */ sub.s $f16, $f10, $f2 -/* 00D2C 8092D2FC 44815000 */ mtc1 $at, $f10 ## $f10 = 210.00 -/* 00D30 8092D300 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 00D34 8092D304 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 -/* 00D38 8092D308 C4520008 */ lwc1 $f18, 0x0008($v0) ## 80940008 -/* 00D3C 8092D30C 46049181 */ sub.s $f6, $f18, $f4 -/* 00D40 8092D310 44812000 */ mtc1 $at, $f4 ## $f4 = 170.00 -/* 00D44 8092D314 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 00D48 8092D318 C448000C */ lwc1 $f8, 0x000C($v0) ## 8094000C -/* 00D4C 8092D31C 460A4400 */ add.s $f16, $f8, $f10 -/* 00D50 8092D320 E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C -/* 00D54 8092D324 C4520010 */ lwc1 $f18, 0x0010($v0) ## 80940010 -/* 00D58 8092D328 46049180 */ add.s $f6, $f18, $f4 -/* 00D5C 8092D32C E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 00D60 8092D330 10000023 */ beq $zero, $zero, .L8092D3C0 -/* 00D64 8092D334 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D338: -/* 00D68 8092D338 24010170 */ addiu $at, $zero, 0x0170 ## $at = 00000170 -/* 00D6C 8092D33C 14C10020 */ bne $a2, $at, .L8092D3C0 -/* 00D70 8092D340 00000000 */ nop -/* 00D74 8092D344 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00D78 8092D348 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) -/* 00D7C 8092D34C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00D80 8092D350 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00D84 8092D354 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 -/* 00D88 8092D358 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00D8C 8092D35C 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00D90 8092D360 460A4401 */ sub.s $f16, $f8, $f10 -/* 00D94 8092D364 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00D98 8092D368 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 -/* 00D9C 8092D36C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00DA0 8092D370 E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C -/* 00DA4 8092D374 C472000C */ lwc1 $f18, 0x000C($v1) ## 8094000C -/* 00DA8 8092D378 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00DAC 8092D37C 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 00DB0 8092D380 E6320004 */ swc1 $f18, 0x0004($s1) ## 80937350 -/* 00DB4 8092D384 C4640010 */ lwc1 $f4, 0x0010($v1) ## 80940010 -/* 00DB8 8092D388 44819000 */ mtc1 $at, $f18 ## $f18 = 170.00 -/* 00DBC 8092D38C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00DC0 8092D390 E6240008 */ swc1 $f4, 0x0008($s1) ## 80937354 -/* 00DC4 8092D394 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80940008 -/* 00DC8 8092D398 46083281 */ sub.s $f10, $f6, $f8 -/* 00DCC 8092D39C 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 00DD0 8092D3A0 E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 -/* 00DD4 8092D3A4 C470000C */ lwc1 $f16, 0x000C($v1) ## 8094000C -/* 00DD8 8092D3A8 46128100 */ add.s $f4, $f16, $f18 -/* 00DDC 8092D3AC E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C -/* 00DE0 8092D3B0 C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 00DE4 8092D3B4 46083280 */ add.s $f10, $f6, $f8 -/* 00DE8 8092D3B8 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 -/* 00DEC 8092D3BC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D3C0: -/* 00DF0 8092D3C0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00DF4 8092D3C4 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00DF8 8092D3C8 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00DFC 8092D3CC 100000C5 */ beq $zero, $zero, .L8092D6E4 -/* 00E00 8092D3D0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -.L8092D3D4: -/* 00E04 8092D3D4 28C100F4 */ slti $at, $a2, 0x00F4 -/* 00E08 8092D3D8 14200055 */ bne $at, $zero, .L8092D530 -/* 00E0C 8092D3DC 24C8FF0C */ addiu $t0, $a2, 0xFF0C ## $t0 = FFFFFF0C -/* 00E10 8092D3E0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00E14 8092D3E4 15010027 */ bne $t0, $at, .L8092D484 -/* 00E18 8092D3E8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 00E1C 8092D3EC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00E20 8092D3F0 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00E24 8092D3F4 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00E28 8092D3F8 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) -/* 00E2C 8092D3FC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00E30 8092D400 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 00E34 8092D404 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00E38 8092D408 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 -/* 00E3C 8092D40C C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 -/* 00E40 8092D410 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00E44 8092D414 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00E48 8092D418 46128100 */ add.s $f4, $f16, $f18 -/* 00E4C 8092D41C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00E50 8092D420 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 -/* 00E54 8092D424 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00E58 8092D428 E6240000 */ swc1 $f4, 0x0000($s1) ## 8093734C -/* 00E5C 8092D42C C446000C */ lwc1 $f6, 0x000C($v0) ## 8094000C -/* 00E60 8092D430 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00E64 8092D434 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00E68 8092D438 46083280 */ add.s $f10, $f6, $f8 -/* 00E6C 8092D43C 44813000 */ mtc1 $at, $f6 ## $f6 = 110.00 -/* 00E70 8092D440 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 00E74 8092D444 E62A0004 */ swc1 $f10, 0x0004($s1) ## 80937350 -/* 00E78 8092D448 C4500010 */ lwc1 $f16, 0x0010($v0) ## 80940010 -/* 00E7C 8092D44C 46028480 */ add.s $f18, $f16, $f2 -/* 00E80 8092D450 44818000 */ mtc1 $at, $f16 ## $f16 = 140.00 -/* 00E84 8092D454 E6320008 */ swc1 $f18, 0x0008($s1) ## 80937354 -/* 00E88 8092D458 C4440008 */ lwc1 $f4, 0x0008($v0) ## 80940008 -/* 00E8C 8092D45C 46062200 */ add.s $f8, $f4, $f6 -/* 00E90 8092D460 E6080000 */ swc1 $f8, 0x0000($s0) ## 80937358 -/* 00E94 8092D464 C44A000C */ lwc1 $f10, 0x000C($v0) ## 8094000C -/* 00E98 8092D468 46105481 */ sub.s $f18, $f10, $f16 -/* 00E9C 8092D46C E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C -/* 00EA0 8092D470 C4440010 */ lwc1 $f4, 0x0010($v0) ## 80940010 -/* 00EA4 8092D474 46002181 */ sub.s $f6, $f4, $f0 -/* 00EA8 8092D478 E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 00EAC 8092D47C 10000027 */ beq $zero, $zero, .L8092D51C -/* 00EB0 8092D480 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D484: -/* 00EB4 8092D484 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C -/* 00EB8 8092D488 14C10024 */ bne $a2, $at, .L8092D51C -/* 00EBC 8092D48C 00000000 */ nop -/* 00EC0 8092D490 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00EC4 8092D494 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) -/* 00EC8 8092D498 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 00ECC 8092D49C 44810000 */ mtc1 $at, $f0 ## $f0 = 130.00 -/* 00ED0 8092D4A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00ED4 8092D4A4 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00ED8 8092D4A8 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 -/* 00EDC 8092D4AC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00EE0 8092D4B0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00EE4 8092D4B4 460A4401 */ sub.s $f16, $f8, $f10 -/* 00EE8 8092D4B8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00EEC 8092D4BC 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 -/* 00EF0 8092D4C0 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 -/* 00EF4 8092D4C4 E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C -/* 00EF8 8092D4C8 C472000C */ lwc1 $f18, 0x000C($v1) ## 8094000C -/* 00EFC 8092D4CC 44815000 */ mtc1 $at, $f10 ## $f10 = 320.00 -/* 00F00 8092D4D0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00F04 8092D4D4 46049181 */ sub.s $f6, $f18, $f4 -/* 00F08 8092D4D8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00F0C 8092D4DC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00F10 8092D4E0 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 00F14 8092D4E4 C4680010 */ lwc1 $f8, 0x0010($v1) ## 80940010 -/* 00F18 8092D4E8 460A4400 */ add.s $f16, $f8, $f10 -/* 00F1C 8092D4EC E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 -/* 00F20 8092D4F0 C4720008 */ lwc1 $f18, 0x0008($v1) ## 80940008 -/* 00F24 8092D4F4 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 -/* 00F28 8092D4F8 46009101 */ sub.s $f4, $f18, $f0 -/* 00F2C 8092D4FC E6040000 */ swc1 $f4, 0x0000($s0) ## 80937358 -/* 00F30 8092D500 C466000C */ lwc1 $f6, 0x000C($v1) ## 8094000C -/* 00F34 8092D504 46003200 */ add.s $f8, $f6, $f0 -/* 00F38 8092D508 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C -/* 00F3C 8092D50C C46A0010 */ lwc1 $f10, 0x0010($v1) ## 80940010 -/* 00F40 8092D510 46105481 */ sub.s $f18, $f10, $f16 -/* 00F44 8092D514 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 -/* 00F48 8092D518 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D51C: -/* 00F4C 8092D51C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00F50 8092D520 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00F54 8092D524 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00F58 8092D528 1000006E */ beq $zero, $zero, .L8092D6E4 -/* 00F5C 8092D52C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -.L8092D530: -/* 00F60 8092D530 28C100C0 */ slti $at, $a2, 0x00C0 -/* 00F64 8092D534 14200051 */ bne $at, $zero, .L8092D67C -/* 00F68 8092D538 240100F0 */ addiu $at, $zero, 0x00F0 ## $at = 000000F0 -/* 00F6C 8092D53C 24C8FF40 */ addiu $t0, $a2, 0xFF40 ## $t0 = FFFFFF40 -/* 00F70 8092D540 14C10027 */ bne $a2, $at, .L8092D5E0 -/* 00F74 8092D544 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00F78 8092D548 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 00F7C 8092D54C 44810000 */ mtc1 $at, $f0 ## $f0 = 130.00 -/* 00F80 8092D550 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00F84 8092D554 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) -/* 00F88 8092D558 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00F8C 8092D55C 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 00F90 8092D560 3C01433E */ lui $at, 0x433E ## $at = 433E0000 -/* 00F94 8092D564 44813000 */ mtc1 $at, $f6 ## $f6 = 190.00 -/* 00F98 8092D568 C4640008 */ lwc1 $f4, 0x0008($v1) ## 80940008 -/* 00F9C 8092D56C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 00FA0 8092D570 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00FA4 8092D574 46062201 */ sub.s $f8, $f4, $f6 -/* 00FA8 8092D578 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00FAC 8092D57C 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 -/* 00FB0 8092D580 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 00FB4 8092D584 E6280000 */ swc1 $f8, 0x0000($s1) ## 8093734C -/* 00FB8 8092D588 C46A000C */ lwc1 $f10, 0x000C($v1) ## 8094000C -/* 00FBC 8092D58C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00FC0 8092D590 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00FC4 8092D594 46105481 */ sub.s $f18, $f10, $f16 -/* 00FC8 8092D598 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 -/* 00FCC 8092D59C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00FD0 8092D5A0 E6320004 */ swc1 $f18, 0x0004($s1) ## 80937350 -/* 00FD4 8092D5A4 C4640010 */ lwc1 $f4, 0x0010($v1) ## 80940010 -/* 00FD8 8092D5A8 46022180 */ add.s $f6, $f4, $f2 -/* 00FDC 8092D5AC E6260008 */ swc1 $f6, 0x0008($s1) ## 80937354 -/* 00FE0 8092D5B0 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 -/* 00FE4 8092D5B4 460A4400 */ add.s $f16, $f8, $f10 -/* 00FE8 8092D5B8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 00FEC 8092D5BC E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 -/* 00FF0 8092D5C0 C472000C */ lwc1 $f18, 0x000C($v1) ## 8094000C -/* 00FF4 8092D5C4 46009100 */ add.s $f4, $f18, $f0 -/* 00FF8 8092D5C8 E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C -/* 00FFC 8092D5CC C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 01000 8092D5D0 46083280 */ add.s $f10, $f6, $f8 -/* 01004 8092D5D4 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 -/* 01008 8092D5D8 10000023 */ beq $zero, $zero, .L8092D668 -/* 0100C 8092D5DC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D5E0: -/* 01010 8092D5E0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01014 8092D5E4 15010020 */ bne $t0, $at, .L8092D668 -/* 01018 8092D5E8 00000000 */ nop -/* 0101C 8092D5EC 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 -/* 01020 8092D5F0 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 -/* 01024 8092D5F4 C4700000 */ lwc1 $f16, 0x0000($v1) ## 80937340 -/* 01028 8092D5F8 C46C0004 */ lwc1 $f12, 0x0004($v1) ## 80937344 -/* 0102C 8092D5FC C4600008 */ lwc1 $f0, 0x0008($v1) ## 80937348 -/* 01030 8092D600 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01034 8092D604 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 01038 8092D608 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 0103C 8092D60C 44812000 */ mtc1 $at, $f4 ## $f4 = 90.00 -/* 01040 8092D610 46128080 */ add.s $f2, $f16, $f18 -/* 01044 8092D614 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01048 8092D618 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 0104C 8092D61C 46046181 */ sub.s $f6, $f12, $f4 -/* 01050 8092D620 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 01054 8092D624 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 01058 8092D628 46080281 */ sub.s $f10, $f0, $f8 -/* 0105C 8092D62C 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 01060 8092D630 44818000 */ mtc1 $at, $f16 ## $f16 = 350.00 -/* 01064 8092D634 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 01068 8092D638 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 0106C 8092D63C 46106480 */ add.s $f18, $f12, $f16 -/* 01070 8092D640 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 01074 8092D644 44812000 */ mtc1 $at, $f4 ## $f4 = 150.00 -/* 01078 8092D648 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 0107C 8092D64C E6220000 */ swc1 $f2, 0x0000($s1) ## 8093734C -/* 01080 8092D650 46040180 */ add.s $f6, $f0, $f4 -/* 01084 8092D654 E62A0008 */ swc1 $f10, 0x0008($s1) ## 80937354 -/* 01088 8092D658 E6020000 */ swc1 $f2, 0x0000($s0) ## 80937358 -/* 0108C 8092D65C E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C -/* 01090 8092D660 E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 01094 8092D664 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -.L8092D668: -/* 01098 8092D668 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 0109C 8092D66C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 010A0 8092D670 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010A4 8092D674 1000001B */ beq $zero, $zero, .L8092D6E4 -/* 010A8 8092D678 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -.L8092D67C: -/* 010AC 8092D67C 28C10094 */ slti $at, $a2, 0x0094 -/* 010B0 8092D680 14200007 */ bne $at, $zero, .L8092D6A0 -/* 010B4 8092D684 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 010B8 8092D688 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 010BC 8092D68C 24C8FF6C */ addiu $t0, $a2, 0xFF6C ## $t0 = FFFFFF6C -/* 010C0 8092D690 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 010C4 8092D694 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010C8 8092D698 10000012 */ beq $zero, $zero, .L8092D6E4 -/* 010CC 8092D69C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -.L8092D6A0: -/* 010D0 8092D6A0 28C10070 */ slti $at, $a2, 0x0070 -/* 010D4 8092D6A4 14200008 */ bne $at, $zero, .L8092D6C8 -/* 010D8 8092D6A8 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 -/* 010DC 8092D6AC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 010E0 8092D6B0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 010E4 8092D6B4 24C8FF90 */ addiu $t0, $a2, 0xFF90 ## $t0 = FFFFFF90 -/* 010E8 8092D6B8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 010EC 8092D6BC 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010F0 8092D6C0 10000008 */ beq $zero, $zero, .L8092D6E4 -/* 010F4 8092D6C4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -.L8092D6C8: -/* 010F8 8092D6C8 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 010FC 8092D6CC 00C1001A */ div $zero, $a2, $at -/* 01100 8092D6D0 00004010 */ mfhi $t0 -/* 01104 8092D6D4 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 -/* 01108 8092D6D8 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 0110C 8092D6DC 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 01110 8092D6E0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -.L8092D6E4: -/* 01114 8092D6E4 28C100C7 */ slti $at, $a2, 0x00C7 -/* 01118 8092D6E8 502000B3 */ beql $at, $zero, .L8092D9B8 -/* 0111C 8092D6EC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01120 8092D6F0 3C058016 */ lui $a1, %hi(gSaveContext) -/* 01124 8092D6F4 24A5E660 */ addiu $a1, %lo(gSaveContext) -/* 01128 8092D6F8 94A30EE2 */ lhu $v1, 0x0EE2($a1) ## 8015F542 -/* 0112C 8092D6FC 240F00C6 */ addiu $t7, $zero, 0x00C6 ## $t7 = 000000C6 -/* 01130 8092D700 01E61023 */ subu $v0, $t7, $a2 -/* 01134 8092D704 30630080 */ andi $v1, $v1, 0x0080 ## $v1 = 00000000 -/* 01138 8092D708 1060001C */ beq $v1, $zero, .L8092D77C -/* 0113C 8092D70C 2841002D */ slti $at, $v0, 0x002D -/* 01140 8092D710 1020001A */ beq $at, $zero, .L8092D77C -/* 01144 8092D714 3C018093 */ lui $at, %hi(D_8093799C) ## $at = 80930000 -/* 01148 8092D718 C42A799C */ lwc1 $f10, %lo(D_8093799C)($at) -/* 0114C 8092D71C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01150 8092D720 C6280000 */ lwc1 $f8, 0x0000($s1) ## 8093734C -/* 01154 8092D724 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 01158 8092D728 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 -/* 0115C 8092D72C 460A4400 */ add.s $f16, $f8, $f10 -/* 01160 8092D730 3C018093 */ lui $at, %hi(D_809379A0) ## $at = 80930000 -/* 01164 8092D734 C6080000 */ lwc1 $f8, 0x0000($s0) ## 80937358 -/* 01168 8092D738 46049180 */ add.s $f6, $f18, $f4 -/* 0116C 8092D73C E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C -/* 01170 8092D740 C6120004 */ lwc1 $f18, 0x0004($s0) ## 8093735C -/* 01174 8092D744 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 01178 8092D748 C42A79A0 */ lwc1 $f10, %lo(D_809379A0)($at) -/* 0117C 8092D74C 3C018093 */ lui $at, %hi(D_809379A4) ## $at = 80930000 -/* 01180 8092D750 460A4401 */ sub.s $f16, $f8, $f10 -/* 01184 8092D754 C6080008 */ lwc1 $f8, 0x0008($s0) ## 80937360 -/* 01188 8092D758 E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 -/* 0118C 8092D75C C42479A4 */ lwc1 $f4, %lo(D_809379A4)($at) -/* 01190 8092D760 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01194 8092D764 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01198 8092D768 46049181 */ sub.s $f6, $f18, $f4 -/* 0119C 8092D76C 460A4400 */ add.s $f16, $f8, $f10 -/* 011A0 8092D770 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C -/* 011A4 8092D774 1000008F */ beq $zero, $zero, .L8092D9B4 -/* 011A8 8092D778 E6100008 */ swc1 $f16, 0x0008($s0) ## 80937360 -.L8092D77C: -/* 011AC 8092D77C 28C10015 */ slti $at, $a2, 0x0015 -/* 011B0 8092D780 1020001F */ beq $at, $zero, .L8092D800 -/* 011B4 8092D784 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 011B8 8092D788 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 011BC 8092D78C C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 -/* 011C0 8092D790 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 011C4 8092D794 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -/* 011C8 8092D798 46049181 */ sub.s $f6, $f18, $f4 -/* 011CC 8092D79C 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 -/* 011D0 8092D7A0 C6280008 */ lwc1 $f8, 0x0008($s1) ## 80937354 -/* 011D4 8092D7A4 44812000 */ mtc1 $at, $f4 ## $f4 = 6.50 -/* 011D8 8092D7A8 C6120000 */ lwc1 $f18, 0x0000($s0) ## 80937358 -/* 011DC 8092D7AC E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 011E0 8092D7B0 460A4400 */ add.s $f16, $f8, $f10 -/* 011E4 8092D7B4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 011E8 8092D7B8 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 011EC 8092D7BC 46049180 */ add.s $f6, $f18, $f4 -/* 011F0 8092D7C0 3C014178 */ lui $at, 0x4178 ## $at = 41780000 -/* 011F4 8092D7C4 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C -/* 011F8 8092D7C8 44812000 */ mtc1 $at, $f4 ## $f4 = 15.50 -/* 011FC 8092D7CC C6120008 */ lwc1 $f18, 0x0008($s0) ## 80937360 -/* 01200 8092D7D0 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 -/* 01204 8092D7D4 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 01208 8092D7D8 460A4400 */ add.s $f16, $f8, $f10 -/* 0120C 8092D7DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01210 8092D7E0 46049180 */ add.s $f6, $f18, $f4 -/* 01214 8092D7E4 E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C -/* 01218 8092D7E8 E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 0121C 8092D7EC 8E580004 */ lw $t8, 0x0004($s2) ## 00000004 -/* 01220 8092D7F0 A2420194 */ sb $v0, 0x0194($s2) ## 00000194 -/* 01224 8092D7F4 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = 00000080 -/* 01228 8092D7F8 1000006E */ beq $zero, $zero, .L8092D9B4 -/* 0122C 8092D7FC AE590004 */ sw $t9, 0x0004($s2) ## 00000004 -.L8092D800: -/* 01230 8092D800 28410028 */ slti $at, $v0, 0x0028 -/* 01234 8092D804 1020001A */ beq $at, $zero, .L8092D870 -/* 01238 8092D808 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 0123C 8092D80C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.25 -/* 01240 8092D810 C6280000 */ lwc1 $f8, 0x0000($s1) ## 8093734C -/* 01244 8092D814 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 01248 8092D818 44812000 */ mtc1 $at, $f4 ## $f4 = 3.50 -/* 0124C 8092D81C 460A4400 */ add.s $f16, $f8, $f10 -/* 01250 8092D820 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01254 8092D824 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 -/* 01258 8092D828 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0125C 8092D82C C6280008 */ lwc1 $f8, 0x0008($s1) ## 80937354 -/* 01260 8092D830 E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C -/* 01264 8092D834 46049180 */ add.s $f6, $f18, $f4 -/* 01268 8092D838 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0126C 8092D83C 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 01270 8092D840 460A4400 */ add.s $f16, $f8, $f10 -/* 01274 8092D844 3C014108 */ lui $at, 0x4108 ## $at = 41080000 -/* 01278 8092D848 C6120000 */ lwc1 $f18, 0x0000($s0) ## 80937358 -/* 0127C 8092D84C 44815000 */ mtc1 $at, $f10 ## $f10 = 8.50 -/* 01280 8092D850 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C -/* 01284 8092D854 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 01288 8092D858 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 -/* 0128C 8092D85C 46049180 */ add.s $f6, $f18, $f4 -/* 01290 8092D860 460A4401 */ sub.s $f16, $f8, $f10 -/* 01294 8092D864 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 01298 8092D868 10000052 */ beq $zero, $zero, .L8092D9B4 -/* 0129C 8092D86C E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C -.L8092D870: -/* 012A0 8092D870 2841002D */ slti $at, $v0, 0x002D -/* 012A4 8092D874 1420004F */ bne $at, $zero, .L8092D9B4 -/* 012A8 8092D878 28410055 */ slti $at, $v0, 0x0055 -/* 012AC 8092D87C 1020001F */ beq $at, $zero, .L8092D8FC -/* 012B0 8092D880 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 012B4 8092D884 44812000 */ mtc1 $at, $f4 ## $f4 = 2.50 -/* 012B8 8092D888 3C014088 */ lui $at, 0x4088 ## $at = 40880000 -/* 012BC 8092D88C C6320000 */ lwc1 $f18, 0x0000($s1) ## 8093734C -/* 012C0 8092D890 44815000 */ mtc1 $at, $f10 ## $f10 = 4.25 -/* 012C4 8092D894 C6280004 */ lwc1 $f8, 0x0004($s1) ## 80937350 -/* 012C8 8092D898 46049181 */ sub.s $f6, $f18, $f4 -/* 012CC 8092D89C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 012D0 8092D8A0 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 012D4 8092D8A4 460A4400 */ add.s $f16, $f8, $f10 -/* 012D8 8092D8A8 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 -/* 012DC 8092D8AC C6320008 */ lwc1 $f18, 0x0008($s1) ## 80937354 -/* 012E0 8092D8B0 44815000 */ mtc1 $at, $f10 ## $f10 = 6.50 -/* 012E4 8092D8B4 C6080000 */ lwc1 $f8, 0x0000($s0) ## 80937358 -/* 012E8 8092D8B8 E6260000 */ swc1 $f6, 0x0000($s1) ## 8093734C -/* 012EC 8092D8BC E6300004 */ swc1 $f16, 0x0004($s1) ## 80937350 -/* 012F0 8092D8C0 46049181 */ sub.s $f6, $f18, $f4 -/* 012F4 8092D8C4 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 012F8 8092D8C8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 -/* 012FC 8092D8CC 460A4401 */ sub.s $f16, $f8, $f10 -/* 01300 8092D8D0 3C014060 */ lui $at, 0x4060 ## $at = 40600000 -/* 01304 8092D8D4 C6120004 */ lwc1 $f18, 0x0004($s0) ## 8093735C -/* 01308 8092D8D8 44815000 */ mtc1 $at, $f10 ## $f10 = 3.50 -/* 0130C 8092D8DC C6080008 */ lwc1 $f8, 0x0008($s0) ## 80937360 -/* 01310 8092D8E0 E6260008 */ swc1 $f6, 0x0008($s1) ## 80937354 -/* 01314 8092D8E4 E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 -/* 01318 8092D8E8 46049180 */ add.s $f6, $f18, $f4 -/* 0131C 8092D8EC 460A4401 */ sub.s $f16, $f8, $f10 -/* 01320 8092D8F0 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C -/* 01324 8092D8F4 1000002F */ beq $zero, $zero, .L8092D9B4 -/* 01328 8092D8F8 E6100008 */ swc1 $f16, 0x0008($s0) ## 80937360 -.L8092D8FC: -/* 0132C 8092D8FC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01330 8092D900 5441002D */ bnel $v0, $at, .L8092D9B8 -/* 01334 8092D904 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01338 8092D908 1460001C */ bne $v1, $zero, .L8092D97C -/* 0133C 8092D90C 8FA40054 */ lw $a0, 0x0054($sp) -/* 01340 8092D910 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 -/* 01344 8092D914 24423D80 */ addiu $v0, $v0, 0x3D80 ## $v0 = 06013D80 -/* 01348 8092D918 00025900 */ sll $t3, $v0, 4 -/* 0134C 8092D91C 000B6702 */ srl $t4, $t3, 28 -/* 01350 8092D920 000C6880 */ sll $t5, $t4, 2 -/* 01354 8092D924 3C0E8016 */ lui $t6, %hi(gSegments) -/* 01358 8092D928 01CD7021 */ addu $t6, $t6, $t5 -/* 0135C 8092D92C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01360 8092D930 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 01364 8092D934 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01368 8092D938 00417824 */ and $t7, $v0, $at -/* 0136C 8092D93C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01370 8092D940 241800B4 */ addiu $t8, $zero, 0x00B4 ## $t8 = 000000B4 -/* 01374 8092D944 24190080 */ addiu $t9, $zero, 0x0080 ## $t9 = 00000080 -/* 01378 8092D948 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 -/* 0137C 8092D94C 01CF3021 */ addu $a2, $t6, $t7 -/* 01380 8092D950 00C13021 */ addu $a2, $a2, $at -/* 01384 8092D954 AFAA0018 */ sw $t2, 0x0018($sp) -/* 01388 8092D958 AFB90014 */ sw $t9, 0x0014($sp) -/* 0138C 8092D95C AFB80010 */ sw $t8, 0x0010($sp) -/* 01390 8092D960 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C -/* 01394 8092D964 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 01398 8092D968 AFA80044 */ sw $t0, 0x0044($sp) -/* 0139C 8092D96C 0C00B380 */ jal TitleCard_InitBossName - -/* 013A0 8092D970 AFA90048 */ sw $t1, 0x0048($sp) -/* 013A4 8092D974 8FA80044 */ lw $t0, 0x0044($sp) -/* 013A8 8092D978 8FA90048 */ lw $t1, 0x0048($sp) -.L8092D97C: -/* 013AC 8092D97C 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B -/* 013B0 8092D980 AFA80044 */ sw $t0, 0x0044($sp) -/* 013B4 8092D984 0C03E803 */ jal Audio_SetBGM - -/* 013B8 8092D988 AFA90048 */ sw $t1, 0x0048($sp) -/* 013BC 8092D98C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 013C0 8092D990 24A5C288 */ addiu $a1, $a1, 0xC288 ## $a1 = 0600C288 -/* 013C4 8092D994 8FA40038 */ lw $a0, 0x0038($sp) -/* 013C8 8092D998 0C029490 */ jal Animation_MorphToPlayOnce -/* 013CC 8092D99C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 013D0 8092D9A0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 013D4 8092D9A4 0C24CF4B */ jal func_80933D2C -/* 013D8 8092D9A8 2405396B */ addiu $a1, $zero, 0x396B ## $a1 = 0000396B -/* 013DC 8092D9AC 8FA80044 */ lw $t0, 0x0044($sp) -/* 013E0 8092D9B0 8FA90048 */ lw $t1, 0x0048($sp) -.L8092D9B4: -/* 013E4 8092D9B4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -.L8092D9B8: -/* 013E8 8092D9B8 55010009 */ bnel $t0, $at, .L8092D9E0 -/* 013EC 8092D9BC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -/* 013F0 8092D9C0 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 013F4 8092D9C4 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 013F8 8092D9C8 AFA80044 */ sw $t0, 0x0044($sp) -/* 013FC 8092D9CC 0C24BF74 */ jal func_8092FDD0 -/* 01400 8092D9D0 AFA90048 */ sw $t1, 0x0048($sp) -/* 01404 8092D9D4 8FA80044 */ lw $t0, 0x0044($sp) -/* 01408 8092D9D8 8FA90048 */ lw $t1, 0x0048($sp) -/* 0140C 8092D9DC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L8092D9E0: -/* 01410 8092D9E0 11020012 */ beq $t0, $v0, .L8092DA2C -/* 01414 8092D9E4 00095840 */ sll $t3, $t1, 1 -/* 01418 8092D9E8 256C0007 */ addiu $t4, $t3, 0x0007 ## $t4 = 00000007 -/* 0141C 8092D9EC 010C001A */ div $zero, $t0, $t4 -/* 01420 8092D9F0 00006810 */ mfhi $t5 -/* 01424 8092D9F4 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 01428 8092D9F8 15800002 */ bne $t4, $zero, .L8092DA04 -/* 0142C 8092D9FC 00000000 */ nop -/* 01430 8092DA00 0007000D */ break 7 -.L8092DA04: -/* 01434 8092DA04 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 01438 8092DA08 15810004 */ bne $t4, $at, .L8092DA1C -/* 0143C 8092DA0C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01440 8092DA10 15010002 */ bne $t0, $at, .L8092DA1C -/* 01444 8092DA14 00000000 */ nop -/* 01448 8092DA18 0006000D */ break 6 -.L8092DA1C: -/* 0144C 8092DA1C 544D0004 */ bnel $v0, $t5, .L8092DA30 -/* 01450 8092DA20 8E4F0190 */ lw $t7, 0x0190($s2) ## 00000190 -/* 01454 8092DA24 0C24C039 */ jal func_809300E4 -/* 01458 8092DA28 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -.L8092DA2C: -/* 0145C 8092DA2C 8E4F0190 */ lw $t7, 0x0190($s2) ## 00000190 -.L8092DA30: -/* 01460 8092DA30 3C0E8093 */ lui $t6, %hi(func_8092DB4C) ## $t6 = 80930000 -/* 01464 8092DA34 25CEDB4C */ addiu $t6, $t6, %lo(func_8092DB4C) ## $t6 = 8092DB4C -/* 01468 8092DA38 11CF0006 */ beq $t6, $t7, .L8092DA54 -/* 0146C 8092DA3C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 01470 8092DA40 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 01474 8092DA44 8FA40054 */ lw $a0, 0x0054($sp) -/* 01478 8092DA48 02203025 */ or $a2, $s1, $zero ## $a2 = 8093734C -/* 0147C 8092DA4C 0C030136 */ jal Gameplay_CameraSetAtEye -/* 01480 8092DA50 02003825 */ or $a3, $s0, $zero ## $a3 = 80937358 -.L8092DA54: -/* 01484 8092DA54 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01488 8092DA58 8FB00028 */ lw $s0, 0x0028($sp) -/* 0148C 8092DA5C 8FB1002C */ lw $s1, 0x002C($sp) -/* 01490 8092DA60 8FB20030 */ lw $s2, 0x0030($sp) -/* 01494 8092DA64 03E00008 */ jr $ra -/* 01498 8092DA68 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s deleted file mode 100644 index 42cc696d3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8092DA6C -/* 0149C 8092DA6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014A0 8092DA70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 014A4 8092DA74 8C8E0154 */ lw $t6, 0x0154($a0) ## 00000154 -/* 014A8 8092DA78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 014AC 8092DA7C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 014B0 8092DA80 10AE0006 */ beq $a1, $t6, .L8092DA9C -/* 014B4 8092DA84 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 014B8 8092DA88 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 014BC 8092DA8C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 014C0 8092DA90 0C0294D3 */ jal Animation_MorphToLoop -/* 014C4 8092DA94 AFA70018 */ sw $a3, 0x0018($sp) -/* 014C8 8092DA98 8FA70018 */ lw $a3, 0x0018($sp) -.L8092DA9C: -/* 014CC 8092DA9C 3C0F8093 */ lui $t7, %hi(func_8092DAB8) ## $t7 = 80930000 -/* 014D0 8092DAA0 25EFDAB8 */ addiu $t7, $t7, %lo(func_8092DAB8) ## $t7 = 8092DAB8 -/* 014D4 8092DAA4 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 014D8 8092DAA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 014DC 8092DAAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014E0 8092DAB0 03E00008 */ jr $ra -/* 014E4 8092DAB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s deleted file mode 100644 index af372cb6ea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8092DAB8 -/* 014E8 8092DAB8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014EC 8092DABC AFBF0014 */ sw $ra, 0x0014($sp) -/* 014F0 8092DAC0 AFA40018 */ sw $a0, 0x0018($sp) -/* 014F4 8092DAC4 AFA5001C */ sw $a1, 0x001C($sp) -/* 014F8 8092DAC8 0C02927F */ jal SkelAnime_Update - -/* 014FC 8092DACC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01500 8092DAD0 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 01504 8092DAD4 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 -/* 01508 8092DAD8 8C6E0000 */ lw $t6, 0x0000($v1) ## 80938C98 -/* 0150C 8092DADC 3C028093 */ lui $v0, %hi(D_8093746C) ## $v0 = 80930000 -/* 01510 8092DAE0 2442746C */ addiu $v0, $v0, %lo(D_8093746C) ## $v0 = 8093746C -/* 01514 8092DAE4 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 01518 8092DAE8 000FC080 */ sll $t8, $t7, 2 -/* 0151C 8092DAEC 0058C821 */ addu $t9, $v0, $t8 -/* 01520 8092DAF0 8F280000 */ lw $t0, 0x0000($t9) ## 00000000 -/* 01524 8092DAF4 5500000B */ bnel $t0, $zero, .L8092DB24 -/* 01528 8092DAF8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0152C 8092DAFC 8C690004 */ lw $t1, 0x0004($v1) ## 80938C9C -/* 01530 8092DB00 852A001C */ lh $t2, 0x001C($t1) ## 0000001C -/* 01534 8092DB04 000A5880 */ sll $t3, $t2, 2 -/* 01538 8092DB08 004B6021 */ addu $t4, $v0, $t3 -/* 0153C 8092DB0C 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 01540 8092DB10 55A00004 */ bnel $t5, $zero, .L8092DB24 -/* 01544 8092DB14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01548 8092DB18 0C24B6CC */ jal func_8092DB30 -/* 0154C 8092DB1C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01550 8092DB20 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092DB24: -/* 01554 8092DB24 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01558 8092DB28 03E00008 */ jr $ra -/* 0155C 8092DB2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s deleted file mode 100644 index b29b42744d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_8092DB30 -/* 01560 8092DB30 3C0F8093 */ lui $t7, %hi(func_8092DB4C) ## $t7 = 80930000 -/* 01564 8092DB34 240E007F */ addiu $t6, $zero, 0x007F ## $t6 = 0000007F -/* 01568 8092DB38 25EFDB4C */ addiu $t7, $t7, %lo(func_8092DB4C) ## $t7 = 8092DB4C -/* 0156C 8092DB3C A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 01570 8092DB40 A0800195 */ sb $zero, 0x0195($a0) ## 00000195 -/* 01574 8092DB44 03E00008 */ jr $ra -/* 01578 8092DB48 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s deleted file mode 100644 index 47de679f4d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s +++ /dev/null @@ -1,118 +0,0 @@ -glabel func_8092DB4C -/* 0157C 8092DB4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01580 8092DB50 AFB00018 */ sw $s0, 0x0018($sp) -/* 01584 8092DB54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01588 8092DB58 AFBF001C */ sw $ra, 0x001C($sp) -/* 0158C 8092DB5C AFA50024 */ sw $a1, 0x0024($sp) -/* 01590 8092DB60 0C02927F */ jal SkelAnime_Update - -/* 01594 8092DB64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01598 8092DB68 82030195 */ lb $v1, 0x0195($s0) ## 00000195 -/* 0159C 8092DB6C 8FA60024 */ lw $a2, 0x0024($sp) -/* 015A0 8092DB70 3C0E8094 */ lui $t6, %hi(D_80938C98) ## $t6 = 80940000 -/* 015A4 8092DB74 14600019 */ bne $v1, $zero, .L8092DBDC -/* 015A8 8092DB78 00000000 */ nop -/* 015AC 8092DB7C 8DCE8C98 */ lw $t6, %lo(D_80938C98)($t6) -/* 015B0 8092DB80 3C048093 */ lui $a0, %hi(D_8093746C) ## $a0 = 80930000 -/* 015B4 8092DB84 2484746C */ addiu $a0, $a0, %lo(D_8093746C) ## $a0 = 8093746C -/* 015B8 8092DB88 85CF001C */ lh $t7, 0x001C($t6) ## 8094001C -/* 015BC 8092DB8C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 015C0 8092DB90 3C088094 */ lui $t0, %hi(D_80938C9C) ## $t0 = 80940000 -/* 015C4 8092DB94 000FC080 */ sll $t8, $t7, 2 -/* 015C8 8092DB98 0098C821 */ addu $t9, $a0, $t8 -/* 015CC 8092DB9C 8F220000 */ lw $v0, 0x0000($t9) ## 00000000 -/* 015D0 8092DBA0 10A20003 */ beq $a1, $v0, .L8092DBB0 -/* 015D4 8092DBA4 00000000 */ nop -/* 015D8 8092DBA8 1440000C */ bne $v0, $zero, .L8092DBDC -/* 015DC 8092DBAC 00000000 */ nop -.L8092DBB0: -/* 015E0 8092DBB0 8D088C9C */ lw $t0, %lo(D_80938C9C)($t0) -/* 015E4 8092DBB4 8509001C */ lh $t1, 0x001C($t0) ## 8094001C -/* 015E8 8092DBB8 00095080 */ sll $t2, $t1, 2 -/* 015EC 8092DBBC 008A5821 */ addu $t3, $a0, $t2 -/* 015F0 8092DBC0 8D620000 */ lw $v0, 0x0000($t3) ## 00000000 -/* 015F4 8092DBC4 50A20004 */ beql $a1, $v0, .L8092DBD8 -/* 015F8 8092DBC8 A2050195 */ sb $a1, 0x0195($s0) ## 00000195 -/* 015FC 8092DBCC 14400003 */ bne $v0, $zero, .L8092DBDC -/* 01600 8092DBD0 00000000 */ nop -/* 01604 8092DBD4 A2050195 */ sb $a1, 0x0195($s0) ## 00000195 -.L8092DBD8: -/* 01608 8092DBD8 82030195 */ lb $v1, 0x0195($s0) ## 00000195 -.L8092DBDC: -/* 0160C 8092DBDC 10600005 */ beq $v1, $zero, .L8092DBF4 -/* 01610 8092DBE0 3C058093 */ lui $a1, %hi(D_80937340) ## $a1 = 80930000 -/* 01614 8092DBE4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 01618 8092DBE8 10400002 */ beq $v0, $zero, .L8092DBF4 -/* 0161C 8092DBEC 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF -/* 01620 8092DBF0 A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 -.L8092DBF4: -/* 01624 8092DBF4 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -/* 01628 8092DBF8 24A57340 */ addiu $a1, $a1, %lo(D_80937340) ## $a1 = 80937340 -/* 0162C 8092DBFC 15A00023 */ bne $t5, $zero, .L8092DC8C -/* 01630 8092DC00 00000000 */ nop -/* 01634 8092DC04 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 01638 8092DC08 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 0163C 8092DC0C 44812000 */ mtc1 $at, $f4 ## $f4 = -50.00 -/* 01640 8092DC10 C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 -/* 01644 8092DC14 2409001C */ addiu $t1, $zero, 0x001C ## $t1 = 0000001C -/* 01648 8092DC18 4606203C */ c.lt.s $f4, $f6 -/* 0164C 8092DC1C 00000000 */ nop -/* 01650 8092DC20 45000018 */ bc1f .L8092DC84 -/* 01654 8092DC24 00000000 */ nop -/* 01658 8092DC28 8C4E067C */ lw $t6, 0x067C($v0) ## 0000067C -/* 0165C 8092DC2C 31CF6080 */ andi $t7, $t6, 0x6080 ## $t7 = 00000000 -/* 01660 8092DC30 15E00014 */ bne $t7, $zero, .L8092DC84 -/* 01664 8092DC34 00000000 */ nop -/* 01668 8092DC38 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0166C 8092DC3C 00000000 */ nop -/* 01670 8092DC40 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01674 8092DC44 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 01678 8092DC48 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0167C 8092DC4C 0000C025 */ or $t8, $zero, $zero ## $t8 = 00000000 -/* 01680 8092DC50 4608003E */ c.le.s $f0, $f8 -/* 01684 8092DC54 3C088094 */ lui $t0, %hi(D_80938C98) ## $t0 = 80940000 -/* 01688 8092DC58 45020003 */ bc1fl .L8092DC68 -/* 0168C 8092DC5C 0018C880 */ sll $t9, $t8, 2 -/* 01690 8092DC60 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01694 8092DC64 0018C880 */ sll $t9, $t8, 2 -.L8092DC68: -/* 01698 8092DC68 01194021 */ addu $t0, $t0, $t9 -/* 0169C 8092DC6C 8D088C98 */ lw $t0, %lo(D_80938C98)($t0) -/* 016A0 8092DC70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016A4 8092DC74 0C24B69B */ jal func_8092DA6C -/* 016A8 8092DC78 A1050195 */ sb $a1, 0x0195($t0) ## 80940195 -/* 016AC 8092DC7C 10000017 */ beq $zero, $zero, .L8092DCDC -/* 016B0 8092DC80 8FBF001C */ lw $ra, 0x001C($sp) -.L8092DC84: -/* 016B4 8092DC84 10000014 */ beq $zero, $zero, .L8092DCD8 -/* 016B8 8092DC88 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 -.L8092DC8C: -/* 016BC 8092DC8C 0C00B6B0 */ jal Actor_WorldYawTowardPoint -/* 016C0 8092DC90 8CC41C44 */ lw $a0, 0x1C44($a2) ## 00001C44 -/* 016C4 8092DC94 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 016C8 8092DC98 00412821 */ addu $a1, $v0, $at -/* 016CC 8092DC9C 00052C00 */ sll $a1, $a1, 16 -/* 016D0 8092DCA0 00052C03 */ sra $a1, $a1, 16 -/* 016D4 8092DCA4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 016D8 8092DCA8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 016DC 8092DCAC 0C01E1EF */ jal Math_ApproachS - -/* 016E0 8092DCB0 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 -/* 016E4 8092DCB4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 016E8 8092DCB8 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 016EC 8092DCBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F0 8092DCC0 10410003 */ beq $v0, $at, .L8092DCD0 -/* 016F4 8092DCC4 24010054 */ addiu $at, $zero, 0x0054 ## $at = 00000054 -/* 016F8 8092DCC8 54410004 */ bnel $v0, $at, .L8092DCDC -/* 016FC 8092DCCC 8FBF001C */ lw $ra, 0x001C($sp) -.L8092DCD0: -/* 01700 8092DCD0 0C24CF4B */ jal func_80933D2C -/* 01704 8092DCD4 2405398E */ addiu $a1, $zero, 0x398E ## $a1 = 0000398E -.L8092DCD8: -/* 01708 8092DCD8 8FBF001C */ lw $ra, 0x001C($sp) -.L8092DCDC: -/* 0170C 8092DCDC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01710 8092DCE0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01714 8092DCE4 03E00008 */ jr $ra -/* 01718 8092DCE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s deleted file mode 100644 index 8dd4d8b611..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8092DCEC -/* 0171C 8092DCEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01720 8092DCF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01724 8092DCF4 10A00008 */ beq $a1, $zero, .L8092DD18 -/* 01728 8092DCF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0172C 8092DCFC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01730 8092DD00 24A5C9BC */ addiu $a1, $a1, 0xC9BC ## $a1 = 0600C9BC -/* 01734 8092DD04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01738 8092DD08 0C029490 */ jal Animation_MorphToPlayOnce -/* 0173C 8092DD0C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01740 8092DD10 10000008 */ beq $zero, $zero, .L8092DD34 -/* 01744 8092DD14 8FAF0018 */ lw $t7, 0x0018($sp) -.L8092DD18: -/* 01748 8092DD18 8FA40018 */ lw $a0, 0x0018($sp) -/* 0174C 8092DD1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01750 8092DD20 24A5C5B0 */ addiu $a1, $a1, 0xC5B0 ## $a1 = 0600C5B0 -/* 01754 8092DD24 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01758 8092DD28 0C029490 */ jal Animation_MorphToPlayOnce -/* 0175C 8092DD2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01760 8092DD30 8FAF0018 */ lw $t7, 0x0018($sp) -.L8092DD34: -/* 01764 8092DD34 3C0E8093 */ lui $t6, %hi(func_8092DD50) ## $t6 = 80930000 -/* 01768 8092DD38 25CEDD50 */ addiu $t6, $t6, %lo(func_8092DD50) ## $t6 = 8092DD50 -/* 0176C 8092DD3C ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 01770 8092DD40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01774 8092DD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01778 8092DD48 03E00008 */ jr $ra -/* 0177C 8092DD4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s deleted file mode 100644 index b3c1da3386..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_8092DD50 -/* 01780 8092DD50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01784 8092DD54 AFA5001C */ sw $a1, 0x001C($sp) -/* 01788 8092DD58 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0178C 8092DD5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01790 8092DD60 AFA40018 */ sw $a0, 0x0018($sp) -/* 01794 8092DD64 AFA50018 */ sw $a1, 0x0018($sp) -/* 01798 8092DD68 0C02927F */ jal SkelAnime_Update - -/* 0179C 8092DD6C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 017A0 8092DD70 10400031 */ beq $v0, $zero, .L8092DE38 -/* 017A4 8092DD74 8FA50018 */ lw $a1, 0x0018($sp) -/* 017A8 8092DD78 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 017AC 8092DD7C 24848C98 */ addiu $a0, $a0, %lo(D_80938C98) ## $a0 = 80938C98 -/* 017B0 8092DD80 8C8E0000 */ lw $t6, 0x0000($a0) ## 80938C98 -/* 017B4 8092DD84 3C038093 */ lui $v1, %hi(D_8093746C) ## $v1 = 80930000 -/* 017B8 8092DD88 2463746C */ addiu $v1, $v1, %lo(D_8093746C) ## $v1 = 8093746C -/* 017BC 8092DD8C 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 017C0 8092DD90 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 017C4 8092DD94 000FC080 */ sll $t8, $t7, 2 -/* 017C8 8092DD98 0078C821 */ addu $t9, $v1, $t8 -/* 017CC 8092DD9C 8F220000 */ lw $v0, 0x0000($t9) ## 00000000 -/* 017D0 8092DDA0 54C2000D */ bnel $a2, $v0, .L8092DDD8 -/* 017D4 8092DDA4 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 017D8 8092DDA8 8C880004 */ lw $t0, 0x0004($a0) ## 80938C9C -/* 017DC 8092DDAC 8509001C */ lh $t1, 0x001C($t0) ## 0000001C -/* 017E0 8092DDB0 00095080 */ sll $t2, $t1, 2 -/* 017E4 8092DDB4 006A5821 */ addu $t3, $v1, $t2 -/* 017E8 8092DDB8 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 017EC 8092DDBC 54CC0006 */ bnel $a2, $t4, .L8092DDD8 -/* 017F0 8092DDC0 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 017F4 8092DDC4 0C24B792 */ jal func_8092DE48 -/* 017F8 8092DDC8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 017FC 8092DDCC 1000001B */ beq $zero, $zero, .L8092DE3C -/* 01800 8092DDD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01804 8092DDD4 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -.L8092DDD8: -/* 01808 8092DDD8 10C20008 */ beq $a2, $v0, .L8092DDFC -/* 0180C 8092DDDC 00000000 */ nop -/* 01810 8092DDE0 8C8D0004 */ lw $t5, 0x0004($a0) ## 00000004 -/* 01814 8092DDE4 85AE001C */ lh $t6, 0x001C($t5) ## 0000001C -/* 01818 8092DDE8 000E7880 */ sll $t7, $t6, 2 -/* 0181C 8092DDEC 006FC021 */ addu $t8, $v1, $t7 -/* 01820 8092DDF0 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 -/* 01824 8092DDF4 54D90006 */ bnel $a2, $t9, .L8092DE10 -/* 01828 8092DDF8 8CA90154 */ lw $t1, 0x0154($a1) ## 00000154 -.L8092DDFC: -/* 0182C 8092DDFC 0C24B8D3 */ jal func_8092E34C -/* 01830 8092DE00 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01834 8092DE04 1000000D */ beq $zero, $zero, .L8092DE3C -/* 01838 8092DE08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0183C 8092DE0C 8CA90154 */ lw $t1, 0x0154($a1) ## 00000154 -.L8092DE10: -/* 01840 8092DE10 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 -/* 01844 8092DE14 2508C9BC */ addiu $t0, $t0, 0xC9BC ## $t0 = 0600C9BC -/* 01848 8092DE18 15090005 */ bne $t0, $t1, .L8092DE30 -/* 0184C 8092DE1C 00000000 */ nop -/* 01850 8092DE20 0C24B8FA */ jal func_8092E3E8 -/* 01854 8092DE24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01858 8092DE28 10000004 */ beq $zero, $zero, .L8092DE3C -/* 0185C 8092DE2C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092DE30: -/* 01860 8092DE30 0C24B69B */ jal func_8092DA6C -/* 01864 8092DE34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -.L8092DE38: -/* 01868 8092DE38 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092DE3C: -/* 0186C 8092DE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01870 8092DE40 03E00008 */ jr $ra -/* 01874 8092DE44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s deleted file mode 100644 index 411e51f9b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_8092DE48 -/* 01878 8092DE48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0187C 8092DE4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01880 8092DE50 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01884 8092DE54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01888 8092DE58 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 0188C 8092DE5C AFA70018 */ sw $a3, 0x0018($sp) -/* 01890 8092DE60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01894 8092DE64 0C0294D3 */ jal Animation_MorphToLoop -/* 01898 8092DE68 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0189C 8092DE6C 8FA70018 */ lw $a3, 0x0018($sp) -/* 018A0 8092DE70 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 018A4 8092DE74 3C188093 */ lui $t8, %hi(func_8092DEA0) ## $t8 = 80930000 -/* 018A8 8092DE78 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 -/* 018AC 8092DE7C 2718DEA0 */ addiu $t8, $t8, %lo(func_8092DEA0) ## $t8 = 8092DEA0 -/* 018B0 8092DE80 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 018B4 8092DE84 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 018B8 8092DE88 A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 018BC 8092DE8C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 018C0 8092DE90 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018C4 8092DE94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C8 8092DE98 03E00008 */ jr $ra -/* 018CC 8092DE9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s deleted file mode 100644 index 79233b6802..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_8092DEA0 -/* 018D0 8092DEA0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 018D4 8092DEA4 AFBF001C */ sw $ra, 0x001C($sp) -/* 018D8 8092DEA8 AFA40020 */ sw $a0, 0x0020($sp) -/* 018DC 8092DEAC AFA50024 */ sw $a1, 0x0024($sp) -/* 018E0 8092DEB0 0C02927F */ jal SkelAnime_Update - -/* 018E4 8092DEB4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018E8 8092DEB8 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 018EC 8092DEBC 24848C98 */ addiu $a0, $a0, %lo(D_80938C98) ## $a0 = 80938C98 -/* 018F0 8092DEC0 8C820000 */ lw $v0, 0x0000($a0) ## 80938C98 -/* 018F4 8092DEC4 8FAE0020 */ lw $t6, 0x0020($sp) -/* 018F8 8092DEC8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 018FC 8092DECC 804F0195 */ lb $t7, 0x0195($v0) ## 00000195 -/* 01900 8092DED0 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 01904 8092DED4 240A0400 */ addiu $t2, $zero, 0x0400 ## $t2 = 00000400 -/* 01908 8092DED8 11E00011 */ beq $t7, $zero, .L8092DF20 -/* 0190C 8092DEDC 01C04025 */ or $t0, $t6, $zero ## $t0 = 00000000 -/* 01910 8092DEE0 8C580190 */ lw $t8, 0x0190($v0) ## 00000190 -/* 01914 8092DEE4 3C038093 */ lui $v1, %hi(func_8093285C) ## $v1 = 80930000 -/* 01918 8092DEE8 2463285C */ addiu $v1, $v1, %lo(func_8093285C) ## $v1 = 8093285C -/* 0191C 8092DEEC 5478000D */ bnel $v1, $t8, .L8092DF24 -/* 01920 8092DEF0 8505008A */ lh $a1, 0x008A($t0) ## 0000008A -/* 01924 8092DEF4 8C820004 */ lw $v0, 0x0004($a0) ## 80938C9C -/* 01928 8092DEF8 80590195 */ lb $t9, 0x0195($v0) ## 00000195 -/* 0192C 8092DEFC 53200009 */ beql $t9, $zero, .L8092DF24 -/* 01930 8092DF00 8505008A */ lh $a1, 0x008A($t0) ## 0000008A -/* 01934 8092DF04 8C490190 */ lw $t1, 0x0190($v0) ## 00000190 -/* 01938 8092DF08 54690006 */ bnel $v1, $t1, .L8092DF24 -/* 0193C 8092DF0C 8505008A */ lh $a1, 0x008A($t0) ## 0000008A -/* 01940 8092DF10 0C24B7D0 */ jal func_8092DF40 -/* 01944 8092DF14 01C02025 */ or $a0, $t6, $zero ## $a0 = 00000000 -/* 01948 8092DF18 10000006 */ beq $zero, $zero, .L8092DF34 -/* 0194C 8092DF1C 8FBF001C */ lw $ra, 0x001C($sp) -.L8092DF20: -/* 01950 8092DF20 8505008A */ lh $a1, 0x008A($t0) ## 0000008A -.L8092DF24: -/* 01954 8092DF24 AFAA0010 */ sw $t2, 0x0010($sp) -/* 01958 8092DF28 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0195C 8092DF2C 250400B6 */ addiu $a0, $t0, 0x00B6 ## $a0 = 000000B6 -/* 01960 8092DF30 8FBF001C */ lw $ra, 0x001C($sp) -.L8092DF34: -/* 01964 8092DF34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01968 8092DF38 03E00008 */ jr $ra -/* 0196C 8092DF3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s deleted file mode 100644 index d3686a4c2d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s +++ /dev/null @@ -1,55 +0,0 @@ -.late_rodata -glabel D_809379A8 - .word 0xC4228000 - -.text -glabel func_8092DF40 -/* 01970 8092DF40 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01974 8092DF44 AFB00028 */ sw $s0, 0x0028($sp) -/* 01978 8092DF48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0197C 8092DF4C AFBF002C */ sw $ra, 0x002C($sp) -/* 01980 8092DF50 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01984 8092DF54 0C028800 */ jal Animation_GetLastFrame - -/* 01988 8092DF58 2484B0D8 */ addiu $a0, $a0, 0xB0D8 ## $a0 = 0600B0D8 -/* 0198C 8092DF5C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01990 8092DF60 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 01994 8092DF64 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 01998 8092DF68 468021A0 */ cvt.s.w $f6, $f4 -/* 0199C 8092DF6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 019A0 8092DF70 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 019A4 8092DF74 AFAE0014 */ sw $t6, 0x0014($sp) -/* 019A8 8092DF78 24A5B0D8 */ addiu $a1, $a1, 0xB0D8 ## $a1 = 0600B0D8 -/* 019AC 8092DF7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 019B0 8092DF80 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 019B4 8092DF84 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 019B8 8092DF88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 019BC 8092DF8C 0C029468 */ jal Animation_Change - -/* 019C0 8092DF90 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 019C4 8092DF94 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 019C8 8092DF98 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 019CC 8092DF9C 0C24CF20 */ jal func_80933C80 -/* 019D0 8092DFA0 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 019D4 8092DFA4 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 019D8 8092DFA8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 019DC 8092DFAC 0C24CF20 */ jal func_80933C80 -/* 019E0 8092DFB0 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 019E4 8092DFB4 920F03E4 */ lbu $t7, 0x03E4($s0) ## 000003E4 -/* 019E8 8092DFB8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 019EC 8092DFBC 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 019F0 8092DFC0 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 019F4 8092DFC4 A21803E4 */ sb $t8, 0x03E4($s0) ## 000003E4 -/* 019F8 8092DFC8 3C018093 */ lui $at, %hi(D_809379A8) ## $at = 80930000 -/* 019FC 8092DFCC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 01A00 8092DFD0 C43079A8 */ lwc1 $f16, %lo(D_809379A8)($at) -/* 01A04 8092DFD4 3C198093 */ lui $t9, %hi(func_8092DFFC) ## $t9 = 80930000 -/* 01A08 8092DFD8 2739DFFC */ addiu $t9, $t9, %lo(func_8092DFFC) ## $t9 = 8092DFFC -/* 01A0C 8092DFDC A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 01A10 8092DFE0 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 01A14 8092DFE4 E61003C4 */ swc1 $f16, 0x03C4($s0) ## 000003C4 -/* 01A18 8092DFE8 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A1C 8092DFEC 8FB00028 */ lw $s0, 0x0028($sp) -/* 01A20 8092DFF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01A24 8092DFF4 03E00008 */ jr $ra -/* 01A28 8092DFF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s deleted file mode 100644 index 69ba439f17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s +++ /dev/null @@ -1,175 +0,0 @@ -.late_rodata -glabel D_809379AC - .float 0.2 - -glabel D_809379B0 - .word 0x44228000 - -.text -glabel func_8092DFFC -/* 01A2C 8092DFFC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01A30 8092E000 AFB00020 */ sw $s0, 0x0020($sp) -/* 01A34 8092E004 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A38 8092E008 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A3C 8092E00C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A40 8092E010 AFA5003C */ sw $a1, 0x003C($sp) -/* 01A44 8092E014 0C02927F */ jal SkelAnime_Update - -/* 01A48 8092E018 AFA4002C */ sw $a0, 0x002C($sp) -/* 01A4C 8092E01C AFA20030 */ sw $v0, 0x0030($sp) -/* 01A50 8092E020 820E0195 */ lb $t6, 0x0195($s0) ## 00000195 -/* 01A54 8092E024 8FA4002C */ lw $a0, 0x002C($sp) -/* 01A58 8092E028 55C0000D */ bnel $t6, $zero, .L8092E060 -/* 01A5C 8092E02C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 01A60 8092E030 0C0295B2 */ jal Animation_OnFrame -/* 01A64 8092E034 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 01A68 8092E038 10400008 */ beq $v0, $zero, .L8092E05C -/* 01A6C 8092E03C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01A70 8092E040 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 01A74 8092E044 44812000 */ mtc1 $at, $f4 ## $f4 = 0.25 -/* 01A78 8092E048 A20F0195 */ sb $t7, 0x0195($s0) ## 00000195 -/* 01A7C 8092E04C 3C018093 */ lui $at, %hi(D_809379AC) ## $at = 80930000 -/* 01A80 8092E050 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01A84 8092E054 C42679AC */ lwc1 $f6, %lo(D_809379AC)($at) -/* 01A88 8092E058 E6060168 */ swc1 $f6, 0x0168($s0) ## 00000168 -.L8092E05C: -/* 01A8C 8092E05C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -.L8092E060: -/* 01A90 8092E060 44811000 */ mtc1 $at, $f2 ## $f2 = 45.00 -/* 01A94 8092E064 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 01A98 8092E068 44815000 */ mtc1 $at, $f10 ## $f10 = 1.25 -/* 01A9C 8092E06C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 01AA0 8092E070 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 01AA4 8092E074 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01AA8 8092E078 460A4402 */ mul.s $f16, $f8, $f10 -/* 01AAC 8092E07C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 01AB0 8092E080 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 01AB4 8092E084 3C05C42F */ lui $a1, 0xC42F ## $a1 = C42F0000 -/* 01AB8 8092E088 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 01ABC 8092E08C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 01AC0 8092E090 4600103C */ c.lt.s $f2, $f0 -/* 01AC4 8092E094 00000000 */ nop -/* 01AC8 8092E098 45020004 */ bc1fl .L8092E0AC -/* 01ACC 8092E09C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01AD0 8092E0A0 10000002 */ beq $zero, $zero, .L8092E0AC -/* 01AD4 8092E0A4 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 01AD8 8092E0A8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L8092E0AC: -/* 01ADC 8092E0AC 82180195 */ lb $t8, 0x0195($s0) ## 00000195 -/* 01AE0 8092E0B0 13000037 */ beq $t8, $zero, .L8092E190 -/* 01AE4 8092E0B4 00000000 */ nop -/* 01AE8 8092E0B8 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01AEC 8092E0BC 3C054422 */ lui $a1, 0x4422 ## $a1 = 44220000 -/* 01AF0 8092E0C0 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 01AF4 8092E0C4 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 01AF8 8092E0C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 01AFC 8092E0CC 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44228000 -/* 01B00 8092E0D0 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 01B04 8092E0D4 0C01E0C4 */ jal Math_SmoothStepToF - -/* 01B08 8092E0D8 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01B0C 8092E0DC 3C018093 */ lui $at, %hi(D_809379B0) ## $at = 80930000 -/* 01B10 8092E0E0 C42C79B0 */ lwc1 $f12, %lo(D_809379B0)($at) -/* 01B14 8092E0E4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01B18 8092E0E8 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 01B1C 8092E0EC 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 01B20 8092E0F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B24 8092E0F4 4604003C */ c.lt.s $f0, $f4 -/* 01B28 8092E0F8 00000000 */ nop -/* 01B2C 8092E0FC 45020006 */ bc1fl .L8092E118 -/* 01B30 8092E100 C60603C4 */ lwc1 $f6, 0x03C4($s0) ## 000003C4 -/* 01B34 8092E104 0C24B897 */ jal func_8092E25C -/* 01B38 8092E108 E60C03C4 */ swc1 $f12, 0x03C4($s0) ## 000003C4 -/* 01B3C 8092E10C 10000011 */ beq $zero, $zero, .L8092E154 -/* 01B40 8092E110 8FB90030 */ lw $t9, 0x0030($sp) -/* 01B44 8092E114 C60603C4 */ lwc1 $f6, 0x03C4($s0) ## 000003C4 -.L8092E118: -/* 01B48 8092E118 44811000 */ mtc1 $at, $f2 ## $f2 = 0.00 -/* 01B4C 8092E11C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01B50 8092E120 46066201 */ sub.s $f8, $f12, $f6 -/* 01B54 8092E124 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 01B58 8092E128 00000000 */ nop -/* 01B5C 8092E12C 460A4002 */ mul.s $f0, $f8, $f10 -/* 01B60 8092E130 4600103C */ c.lt.s $f2, $f0 -/* 01B64 8092E134 00000000 */ nop -/* 01B68 8092E138 45020003 */ bc1fl .L8092E148 -/* 01B6C 8092E13C C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 01B70 8092E140 46001006 */ mov.s $f0, $f2 -/* 01B74 8092E144 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -.L8092E148: -/* 01B78 8092E148 46008481 */ sub.s $f18, $f16, $f0 -/* 01B7C 8092E14C E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 01B80 8092E150 8FB90030 */ lw $t9, 0x0030($sp) -.L8092E154: -/* 01B84 8092E154 3C038094 */ lui $v1, %hi(D_80938CA8) ## $v1 = 80940000 -/* 01B88 8092E158 24638CA8 */ addiu $v1, $v1, %lo(D_80938CA8) ## $v1 = 80938CA8 -/* 01B8C 8092E15C 17200008 */ bne $t9, $zero, .L8092E180 -/* 01B90 8092E160 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01B94 8092E164 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 -/* 01B98 8092E168 C4640008 */ lwc1 $f4, 0x0008($v1) ## 80938CB0 -/* 01B9C 8092E16C C4680014 */ lwc1 $f8, 0x0014($v1) ## 80938CBC -/* 01BA0 8092E170 46002180 */ add.s $f6, $f4, $f0 -/* 01BA4 8092E174 46004280 */ add.s $f10, $f8, $f0 -/* 01BA8 8092E178 E4660008 */ swc1 $f6, 0x0008($v1) ## 80938CB0 -/* 01BAC 8092E17C E46A0014 */ swc1 $f10, 0x0014($v1) ## 80938CBC -.L8092E180: -/* 01BB0 8092E180 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01BB4 8092E184 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 -/* 01BB8 8092E188 10000017 */ beq $zero, $zero, .L8092E1E8 -/* 01BBC 8092E18C 920903E4 */ lbu $t1, 0x03E4($s0) ## 000003E4 -.L8092E190: -/* 01BC0 8092E190 0C01E107 */ jal Math_ApproachF - -/* 01BC4 8092E194 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 01BC8 8092E198 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 01BCC 8092E19C 44811000 */ mtc1 $at, $f2 ## $f2 = 180.00 -/* 01BD0 8092E1A0 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 01BD4 8092E1A4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 01BD8 8092E1A8 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 01BDC 8092E1AC 46028481 */ sub.s $f18, $f16, $f2 -/* 01BE0 8092E1B0 44059000 */ mfc1 $a1, $f18 -/* 01BE4 8092E1B4 0C01DE80 */ jal Math_StepToF - -/* 01BE8 8092E1B8 00000000 */ nop -/* 01BEC 8092E1BC 3C038094 */ lui $v1, %hi(D_80938CA8) ## $v1 = 80940000 -/* 01BF0 8092E1C0 24638CA8 */ addiu $v1, $v1, %lo(D_80938CA8) ## $v1 = 80938CA8 -/* 01BF4 8092E1C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01BF8 8092E1C8 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 -/* 01BFC 8092E1CC C4640004 */ lwc1 $f4, 0x0004($v1) ## 80938CAC -/* 01C00 8092E1D0 C4680010 */ lwc1 $f8, 0x0010($v1) ## 80938CB8 -/* 01C04 8092E1D4 46002180 */ add.s $f6, $f4, $f0 -/* 01C08 8092E1D8 46004280 */ add.s $f10, $f8, $f0 -/* 01C0C 8092E1DC E4660004 */ swc1 $f6, 0x0004($v1) ## 80938CAC -/* 01C10 8092E1E0 E46A0010 */ swc1 $f10, 0x0010($v1) ## 80938CB8 -/* 01C14 8092E1E4 920903E4 */ lbu $t1, 0x03E4($s0) ## 000003E4 -.L8092E1E8: -/* 01C18 8092E1E8 3C0A8094 */ lui $t2, %hi(D_80938C98) ## $t2 = 80940000 -/* 01C1C 8092E1EC 254A8C98 */ addiu $t2, $t2, %lo(D_80938C98) ## $t2 = 80938C98 -/* 01C20 8092E1F0 312B0002 */ andi $t3, $t1, 0x0002 ## $t3 = 00000000 -/* 01C24 8092E1F4 11600014 */ beq $t3, $zero, .L8092E248 -/* 01C28 8092E1F8 312CFFFC */ andi $t4, $t1, 0xFFFC ## $t4 = 00000000 -/* 01C2C 8092E1FC A20C03E4 */ sb $t4, 0x03E4($s0) ## 000003E4 -/* 01C30 8092E200 8D420000 */ lw $v0, 0x0000($t2) ## 80938C98 -/* 01C34 8092E204 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01C38 8092E208 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 01C3C 8092E20C 904D03E4 */ lbu $t5, 0x03E4($v0) ## 000003E4 -/* 01C40 8092E210 31AEFFFC */ andi $t6, $t5, 0xFFFC ## $t6 = 00000000 -/* 01C44 8092E214 A04E03E4 */ sb $t6, 0x03E4($v0) ## 000003E4 -/* 01C48 8092E218 8D430004 */ lw $v1, 0x0004($t2) ## 80938C9C -/* 01C4C 8092E21C 906F03E4 */ lbu $t7, 0x03E4($v1) ## 8093908C -/* 01C50 8092E220 31F8FFFC */ andi $t8, $t7, 0xFFFC ## $t8 = 00000000 -/* 01C54 8092E224 A07803E4 */ sb $t8, 0x03E4($v1) ## 8093908C -/* 01C58 8092E228 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 01C5C 8092E22C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01C60 8092E230 0C00BDC7 */ jal func_8002F71C -/* 01C64 8092E234 8FA4003C */ lw $a0, 0x003C($sp) -/* 01C68 8092E238 8FB9003C */ lw $t9, 0x003C($sp) -/* 01C6C 8092E23C 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 01C70 8092E240 0C00BDF7 */ jal func_8002F7DC -/* 01C74 8092E244 8F241C44 */ lw $a0, 0x1C44($t9) ## 00001C44 -.L8092E248: -/* 01C78 8092E248 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01C7C 8092E24C 8FB00020 */ lw $s0, 0x0020($sp) -/* 01C80 8092E250 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01C84 8092E254 03E00008 */ jr $ra -/* 01C88 8092E258 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s deleted file mode 100644 index 426c1767c5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8092E25C -/* 01C8C 8092E25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C90 8092E260 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C94 8092E264 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01C98 8092E268 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01C9C 8092E26C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 01CA0 8092E270 AFA70018 */ sw $a3, 0x0018($sp) -/* 01CA4 8092E274 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01CA8 8092E278 0C0294D3 */ jal Animation_MorphToLoop -/* 01CAC 8092E27C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 -/* 01CB0 8092E280 3C058093 */ lui $a1, %hi(D_80937340) ## $a1 = 80930000 -/* 01CB4 8092E284 8FA40018 */ lw $a0, 0x0018($sp) -/* 01CB8 8092E288 0C00B6B0 */ jal Actor_WorldYawTowardPoint -/* 01CBC 8092E28C 24A57340 */ addiu $a1, $a1, %lo(D_80937340) ## $a1 = 80937340 -/* 01CC0 8092E290 8FA70018 */ lw $a3, 0x0018($sp) -/* 01CC4 8092E294 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 01CC8 8092E298 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 01CCC 8092E29C C4E403C4 */ lwc1 $f4, 0x03C4($a3) ## 000003C4 -/* 01CD0 8092E2A0 90EE03E4 */ lbu $t6, 0x03E4($a3) ## 000003E4 -/* 01CD4 8092E2A4 90F806C5 */ lbu $t8, 0x06C5($a3) ## 000006C5 -/* 01CD8 8092E2A8 46062202 */ mul.s $f8, $f4, $f6 -/* 01CDC 8092E2AC 3C088093 */ lui $t0, %hi(func_8092E2E0) ## $t0 = 80930000 -/* 01CE0 8092E2B0 2508E2E0 */ addiu $t0, $t0, %lo(func_8092E2E0) ## $t0 = 8092E2E0 -/* 01CE4 8092E2B4 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 -/* 01CE8 8092E2B8 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 -/* 01CEC 8092E2BC A4E201A4 */ sh $v0, 0x01A4($a3) ## 000001A4 -/* 01CF0 8092E2C0 A0EF03E4 */ sb $t7, 0x03E4($a3) ## 000003E4 -/* 01CF4 8092E2C4 A0F906C5 */ sb $t9, 0x06C5($a3) ## 000006C5 -/* 01CF8 8092E2C8 E4E803C4 */ swc1 $f8, 0x03C4($a3) ## 000003C4 -/* 01CFC 8092E2CC ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 01D00 8092E2D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01D04 8092E2D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D08 8092E2D8 03E00008 */ jr $ra -/* 01D0C 8092E2DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s deleted file mode 100644 index cf8d7f91a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_8092E2E0 -/* 01D10 8092E2E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01D14 8092E2E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01D18 8092E2E8 AFA40020 */ sw $a0, 0x0020($sp) -/* 01D1C 8092E2EC AFA50024 */ sw $a1, 0x0024($sp) -/* 01D20 8092E2F0 0C02927F */ jal SkelAnime_Update - -/* 01D24 8092E2F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D28 8092E2F8 8FA30020 */ lw $v1, 0x0020($sp) -/* 01D2C 8092E2FC 240E0100 */ addiu $t6, $zero, 0x0100 ## $t6 = 00000100 -/* 01D30 8092E300 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01D34 8092E304 846501A4 */ lh $a1, 0x01A4($v1) ## 000001A4 -/* 01D38 8092E308 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01D3C 8092E30C 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 01D40 8092E310 0C01E1A7 */ jal Math_SmoothStepToS - -/* 01D44 8092E314 246400B6 */ addiu $a0, $v1, 0x00B6 ## $a0 = 000000B6 -/* 01D48 8092E318 14400008 */ bne $v0, $zero, .L8092E33C -/* 01D4C 8092E31C 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 01D50 8092E320 0C24C11D */ jal func_80930474 -/* 01D54 8092E324 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 01D58 8092E328 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 01D5C 8092E32C 0C24C11D */ jal func_80930474 -/* 01D60 8092E330 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 01D64 8092E334 0C24B6CC */ jal func_8092DB30 -/* 01D68 8092E338 8FA40020 */ lw $a0, 0x0020($sp) -.L8092E33C: -/* 01D6C 8092E33C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D70 8092E340 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01D74 8092E344 03E00008 */ jr $ra -/* 01D78 8092E348 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s deleted file mode 100644 index 95e4150be9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8092E34C -/* 01D7C 8092E34C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D80 8092E350 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D84 8092E354 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01D88 8092E358 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01D8C 8092E35C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 01D90 8092E360 AFA70018 */ sw $a3, 0x0018($sp) -/* 01D94 8092E364 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D98 8092E368 0C0294D3 */ jal Animation_MorphToLoop -/* 01D9C 8092E36C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01DA0 8092E370 8FA70018 */ lw $a3, 0x0018($sp) -/* 01DA4 8092E374 3C188093 */ lui $t8, %hi(func_8092E3A0) ## $t8 = 80930000 -/* 01DA8 8092E378 2718E3A0 */ addiu $t8, $t8, %lo(func_8092E3A0) ## $t8 = 8092E3A0 -/* 01DAC 8092E37C 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 -/* 01DB0 8092E380 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 -/* 01DB4 8092E384 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 01DB8 8092E388 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01DBC 8092E38C A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 01DC0 8092E390 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DC4 8092E394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DC8 8092E398 03E00008 */ jr $ra -/* 01DCC 8092E39C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s deleted file mode 100644 index d0c77f26fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8092E3A0 -/* 01DD0 8092E3A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01DD4 8092E3A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01DD8 8092E3A8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 01DDC 8092E3AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DE0 8092E3B0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01DE4 8092E3B4 AFA50018 */ sw $a1, 0x0018($sp) -/* 01DE8 8092E3B8 0C02927F */ jal SkelAnime_Update - -/* 01DEC 8092E3BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01DF0 8092E3C0 8FA50018 */ lw $a1, 0x0018($sp) -/* 01DF4 8092E3C4 80AE0195 */ lb $t6, 0x0195($a1) ## 00000195 -/* 01DF8 8092E3C8 51C00004 */ beql $t6, $zero, .L8092E3DC -/* 01DFC 8092E3CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E00 8092E3D0 0C24B8FA */ jal func_8092E3E8 -/* 01E04 8092E3D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01E08 8092E3D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092E3DC: -/* 01E0C 8092E3DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E10 8092E3E0 03E00008 */ jr $ra -/* 01E14 8092E3E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s deleted file mode 100644 index 9e72195b23..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_8092E3E8 -/* 01E18 8092E3E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E1C 8092E3EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E20 8092E3F0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01E24 8092E3F4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01E28 8092E3F8 24A5C288 */ addiu $a1, $a1, 0xC288 ## $a1 = 0600C288 -/* 01E2C 8092E3FC AFA70018 */ sw $a3, 0x0018($sp) -/* 01E30 8092E400 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01E34 8092E404 0C029490 */ jal Animation_MorphToPlayOnce -/* 01E38 8092E408 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01E3C 8092E40C 8FA70018 */ lw $a3, 0x0018($sp) -/* 01E40 8092E410 3C188093 */ lui $t8, %hi(func_8092E438) ## $t8 = 80930000 -/* 01E44 8092E414 2718E438 */ addiu $t8, $t8, %lo(func_8092E438) ## $t8 = 8092E438 -/* 01E48 8092E418 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 -/* 01E4C 8092E41C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 01E50 8092E420 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 01E54 8092E424 A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 01E58 8092E428 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E5C 8092E42C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E60 8092E430 03E00008 */ jr $ra -/* 01E64 8092E434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s deleted file mode 100644 index 4efb798c94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8092E438 -/* 01E68 8092E438 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E6C 8092E43C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01E70 8092E440 AFA40018 */ sw $a0, 0x0018($sp) -/* 01E74 8092E444 AFA5001C */ sw $a1, 0x001C($sp) -/* 01E78 8092E448 0C02927F */ jal SkelAnime_Update - -/* 01E7C 8092E44C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01E80 8092E450 50400004 */ beql $v0, $zero, .L8092E464 -/* 01E84 8092E454 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01E88 8092E458 0C24B69B */ jal func_8092DA6C -/* 01E8C 8092E45C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01E90 8092E460 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092E464: -/* 01E94 8092E464 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E98 8092E468 03E00008 */ jr $ra -/* 01E9C 8092E46C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s deleted file mode 100644 index f7ba005b76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_8092E470 -/* 01EA0 8092E470 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01EA4 8092E474 AFB00020 */ sw $s0, 0x0020($sp) -/* 01EA8 8092E478 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01EAC 8092E47C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01EB0 8092E480 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01EB4 8092E484 24A5B6FC */ addiu $a1, $a1, 0xB6FC ## $a1 = 0600B6FC -/* 01EB8 8092E488 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01EBC 8092E48C 0C029490 */ jal Animation_MorphToPlayOnce -/* 01EC0 8092E490 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01EC4 8092E494 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01EC8 8092E498 0C028800 */ jal Animation_GetLastFrame - -/* 01ECC 8092E49C 2484B6FC */ addiu $a0, $a0, 0xB6FC ## $a0 = 0600B6FC -/* 01ED0 8092E4A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01ED4 8092E4A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01ED8 8092E4A8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 01EDC 8092E4AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01EE0 8092E4B0 0C00D09B */ jal Actor_SetColorFilter -/* 01EE4 8092E4B4 AFA20010 */ sw $v0, 0x0010($sp) -/* 01EE8 8092E4B8 920E03E4 */ lbu $t6, 0x03E4($s0) ## 000003E4 -/* 01EEC 8092E4BC 921806C5 */ lbu $t8, 0x06C5($s0) ## 000006C5 -/* 01EF0 8092E4C0 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 01EF4 8092E4C4 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 01EF8 8092E4C8 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 -/* 01EFC 8092E4CC 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 -/* 01F00 8092E4D0 01014824 */ and $t1, $t0, $at -/* 01F04 8092E4D4 A20F03E4 */ sb $t7, 0x03E4($s0) ## 000003E4 -/* 01F08 8092E4D8 A21906C5 */ sb $t9, 0x06C5($s0) ## 000006C5 -/* 01F0C 8092E4DC A2000194 */ sb $zero, 0x0194($s0) ## 00000194 -/* 01F10 8092E4E0 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 01F14 8092E4E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F18 8092E4E8 0C24CF4B */ jal func_80933D2C -/* 01F1C 8092E4EC 2405396E */ addiu $a1, $zero, 0x396E ## $a1 = 0000396E -/* 01F20 8092E4F0 3C0A8093 */ lui $t2, %hi(func_8092E510) ## $t2 = 80930000 -/* 01F24 8092E4F4 254AE510 */ addiu $t2, $t2, %lo(func_8092E510) ## $t2 = 8092E510 -/* 01F28 8092E4F8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 01F2C 8092E4FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01F30 8092E500 8FB00020 */ lw $s0, 0x0020($sp) -/* 01F34 8092E504 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01F38 8092E508 03E00008 */ jr $ra -/* 01F3C 8092E50C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s deleted file mode 100644 index c9f2f2a696..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s +++ /dev/null @@ -1,190 +0,0 @@ -.late_rodata -glabel D_809379B4 - .word 0x3E923A14 -glabel D_809379B8 - .word 0x3E923A14 -glabel D_809379BC - .word 0x3F20D97C - -.text -glabel func_8092E510 -/* 01F40 8092E510 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01F44 8092E514 AFB00020 */ sw $s0, 0x0020($sp) -/* 01F48 8092E518 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F4C 8092E51C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01F50 8092E520 AFA5003C */ sw $a1, 0x003C($sp) -/* 01F54 8092E524 3C048094 */ lui $a0, %hi(D_80938CB0) ## $a0 = 80940000 -/* 01F58 8092E528 24848CB0 */ addiu $a0, $a0, %lo(D_80938CB0) ## $a0 = 80938CB0 -/* 01F5C 8092E52C 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 01F60 8092E530 0C01DE80 */ jal Math_StepToF - -/* 01F64 8092E534 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 01F68 8092E538 3C048094 */ lui $a0, %hi(D_80938CBC) ## $a0 = 80940000 -/* 01F6C 8092E53C 24848CBC */ addiu $a0, $a0, %lo(D_80938CBC) ## $a0 = 80938CBC -/* 01F70 8092E540 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 01F74 8092E544 0C01DE80 */ jal Math_StepToF - -/* 01F78 8092E548 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 01F7C 8092E54C 3C048094 */ lui $a0, %hi(D_80938CA8) ## $a0 = 80940000 -/* 01F80 8092E550 24848CA8 */ addiu $a0, $a0, %lo(D_80938CA8) ## $a0 = 80938CA8 -/* 01F84 8092E554 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 01F88 8092E558 0C01DE80 */ jal Math_StepToF - -/* 01F8C 8092E55C 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 01F90 8092E560 3C048094 */ lui $a0, %hi(D_80938CB4) ## $a0 = 80940000 -/* 01F94 8092E564 24848CB4 */ addiu $a0, $a0, %lo(D_80938CB4) ## $a0 = 80938CB4 -/* 01F98 8092E568 3C05C348 */ lui $a1, 0xC348 ## $a1 = C3480000 -/* 01F9C 8092E56C 0C01DE80 */ jal Math_StepToF - -/* 01FA0 8092E570 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 01FA4 8092E574 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 01FA8 8092E578 C606006C */ lwc1 $f6, 0x006C($s0) ## 0000006C -/* 01FAC 8092E57C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01FB0 8092E580 46062200 */ add.s $f8, $f4, $f6 -/* 01FB4 8092E584 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 01FB8 8092E588 0C02927F */ jal SkelAnime_Update - -/* 01FBC 8092E58C AFA40028 */ sw $a0, 0x0028($sp) -/* 01FC0 8092E590 AFA20030 */ sw $v0, 0x0030($sp) -/* 01FC4 8092E594 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01FC8 8092E598 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 01FCC 8092E59C 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 -/* 01FD0 8092E5A0 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 01FD4 8092E5A4 460A003E */ c.le.s $f0, $f10 -/* 01FD8 8092E5A8 00000000 */ nop -/* 01FDC 8092E5AC 45020016 */ bc1fl .L8092E608 -/* 01FE0 8092E5B0 44819000 */ mtc1 $at, $f18 ## $f18 = 11.00 -/* 01FE4 8092E5B4 3C018093 */ lui $at, %hi(D_809379B4) ## $at = 80930000 -/* 01FE8 8092E5B8 C43079B4 */ lwc1 $f16, %lo(D_809379B4)($at) -/* 01FEC 8092E5BC 46008302 */ mul.s $f12, $f16, $f0 -/* 01FF0 8092E5C0 0C0400A4 */ jal sinf - -/* 01FF4 8092E5C4 00000000 */ nop -/* 01FF8 8092E5C8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 01FFC 8092E5CC 44812000 */ mtc1 $at, $f4 ## $f4 = 180.00 -/* 02000 8092E5D0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02004 8092E5D4 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 02008 8092E5D8 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 0200C 8092E5DC C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 02010 8092E5E0 46080282 */ mul.s $f10, $f0, $f8 -/* 02014 8092E5E4 46049181 */ sub.s $f6, $f18, $f4 -/* 02018 8092E5E8 46065080 */ add.s $f2, $f10, $f6 -/* 0201C 8092E5EC 4602803C */ c.lt.s $f16, $f2 -/* 02020 8092E5F0 00000000 */ nop -/* 02024 8092E5F4 45020029 */ bc1fl .L8092E69C -/* 02028 8092E5F8 8FAE0030 */ lw $t6, 0x0030($sp) -/* 0202C 8092E5FC 10000026 */ beq $zero, $zero, .L8092E698 -/* 02030 8092E600 E6020028 */ swc1 $f2, 0x0028($s0) ## 00000028 -/* 02034 8092E604 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -.L8092E608: -/* 02038 8092E608 3C014130 */ lui $at, 0x4130 ## $at = 41300000 -/* 0203C 8092E60C 4612003E */ c.le.s $f0, $f18 -/* 02040 8092E610 00000000 */ nop -/* 02044 8092E614 45020011 */ bc1fl .L8092E65C -/* 02048 8092E618 44814000 */ mtc1 $at, $f8 ## $f8 = 11.00 -/* 0204C 8092E61C 3C018093 */ lui $at, %hi(D_809379B8) ## $at = 80930000 -/* 02050 8092E620 C42479B8 */ lwc1 $f4, %lo(D_809379B8)($at) -/* 02054 8092E624 46002302 */ mul.s $f12, $f4, $f0 -/* 02058 8092E628 0C0400A4 */ jal sinf - -/* 0205C 8092E62C 00000000 */ nop -/* 02060 8092E630 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 02064 8092E634 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 02068 8092E638 3C01432A */ lui $at, 0x432A ## $at = 432A0000 -/* 0206C 8092E63C 44818000 */ mtc1 $at, $f16 ## $f16 = 170.00 -/* 02070 8092E640 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 02074 8092E644 46100482 */ mul.s $f18, $f0, $f16 -/* 02078 8092E648 460A4181 */ sub.s $f6, $f8, $f10 -/* 0207C 8092E64C 46069100 */ add.s $f4, $f18, $f6 -/* 02080 8092E650 10000011 */ beq $zero, $zero, .L8092E698 -/* 02084 8092E654 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 02088 8092E658 44814000 */ mtc1 $at, $f8 ## $f8 = 170.00 -.L8092E65C: -/* 0208C 8092E65C 3C018093 */ lui $at, %hi(D_809379BC) ## $at = 80930000 -/* 02090 8092E660 C43079BC */ lwc1 $f16, %lo(D_809379BC)($at) -/* 02094 8092E664 46080281 */ sub.s $f10, $f0, $f8 -/* 02098 8092E668 46105302 */ mul.s $f12, $f10, $f16 -/* 0209C 8092E66C 0C0400A4 */ jal sinf - -/* 020A0 8092E670 00000000 */ nop -/* 020A4 8092E674 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 020A8 8092E678 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 -/* 020AC 8092E67C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 020B0 8092E680 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 020B4 8092E684 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 020B8 8092E688 46080282 */ mul.s $f10, $f0, $f8 -/* 020BC 8092E68C 46069101 */ sub.s $f4, $f18, $f6 -/* 020C0 8092E690 46045400 */ add.s $f16, $f10, $f4 -/* 020C4 8092E694 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -.L8092E698: -/* 020C8 8092E698 8FAE0030 */ lw $t6, 0x0030($sp) -.L8092E69C: -/* 020CC 8092E69C 8FA40028 */ lw $a0, 0x0028($sp) -/* 020D0 8092E6A0 55C00005 */ bnel $t6, $zero, .L8092E6B8 -/* 020D4 8092E6A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020D8 8092E6A8 0C0295B2 */ jal Animation_OnFrame -/* 020DC 8092E6AC 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 -/* 020E0 8092E6B0 10400003 */ beq $v0, $zero, .L8092E6C0 -/* 020E4 8092E6B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8092E6B8: -/* 020E8 8092E6B8 0C24CF4B */ jal func_80933D2C -/* 020EC 8092E6BC 24053966 */ addiu $a1, $zero, 0x3966 ## $a1 = 00003966 -.L8092E6C0: -/* 020F0 8092E6C0 3C01C3FA */ lui $at, 0xC3FA ## $at = C3FA0000 -/* 020F4 8092E6C4 44810000 */ mtc1 $at, $f0 ## $f0 = -500.00 -/* 020F8 8092E6C8 C61203C4 */ lwc1 $f18, 0x03C4($s0) ## 000003C4 -/* 020FC 8092E6CC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 02100 8092E6D0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02104 8092E6D4 4600903C */ c.lt.s $f18, $f0 -/* 02108 8092E6D8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0210C 8092E6DC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02110 8092E6E0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 02114 8092E6E4 4502000B */ bc1fl .L8092E714 -/* 02118 8092E6E8 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 0211C 8092E6EC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02120 8092E6F0 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 02124 8092E6F4 44050000 */ mfc1 $a1, $f0 -/* 02128 8092E6F8 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 0212C 8092E6FC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02130 8092E700 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02134 8092E704 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02138 8092E708 1000000A */ beq $zero, $zero, .L8092E734 -/* 0213C 8092E70C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 02140 8092E710 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -.L8092E714: -/* 02144 8092E714 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 02148 8092E718 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0214C 8092E71C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 02150 8092E720 C60A03C4 */ lwc1 $f10, 0x03C4($s0) ## 000003C4 -/* 02154 8092E724 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 02158 8092E728 46045400 */ add.s $f16, $f10, $f4 -/* 0215C 8092E72C E61003C4 */ swc1 $f16, 0x03C4($s0) ## 000003C4 -/* 02160 8092E730 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -.L8092E734: -/* 02164 8092E734 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 -/* 02168 8092E738 C60003C4 */ lwc1 $f0, 0x03C4($s0) ## 000003C4 -/* 0216C 8092E73C 4600103C */ c.lt.s $f2, $f0 -/* 02170 8092E740 00000000 */ nop -/* 02174 8092E744 45020004 */ bc1fl .L8092E758 -/* 02178 8092E748 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 -/* 0217C 8092E74C 10000002 */ beq $zero, $zero, .L8092E758 -/* 02180 8092E750 E60203C4 */ swc1 $f2, 0x03C4($s0) ## 000003C4 -/* 02184 8092E754 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 -.L8092E758: -/* 02188 8092E758 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 0218C 8092E75C C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 02190 8092E760 46069200 */ add.s $f8, $f18, $f6 -/* 02194 8092E764 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 02198 8092E768 8FAF0030 */ lw $t7, 0x0030($sp) -/* 0219C 8092E76C 51E00004 */ beql $t7, $zero, .L8092E780 -/* 021A0 8092E770 8FBF0024 */ lw $ra, 0x0024($sp) -/* 021A4 8092E774 0C24B9E4 */ jal func_8092E790 -/* 021A8 8092E778 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021AC 8092E77C 8FBF0024 */ lw $ra, 0x0024($sp) -.L8092E780: -/* 021B0 8092E780 8FB00020 */ lw $s0, 0x0020($sp) -/* 021B4 8092E784 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 021B8 8092E788 03E00008 */ jr $ra -/* 021BC 8092E78C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s deleted file mode 100644 index 149020f906..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_8092E790 -/* 021C0 8092E790 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021C4 8092E794 AFBF0014 */ sw $ra, 0x0014($sp) -/* 021C8 8092E798 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 021CC 8092E79C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 021D0 8092E7A0 24A5ACD4 */ addiu $a1, $a1, 0xACD4 ## $a1 = 0600ACD4 -/* 021D4 8092E7A4 AFA70018 */ sw $a3, 0x0018($sp) -/* 021D8 8092E7A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 021DC 8092E7AC 0C0294D3 */ jal Animation_MorphToLoop -/* 021E0 8092E7B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 021E4 8092E7B4 8FA70018 */ lw $a3, 0x0018($sp) -/* 021E8 8092E7B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 021EC 8092E7BC 3C180FC0 */ lui $t8, 0x0FC0 ## $t8 = 0FC00000 -/* 021F0 8092E7C0 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 -/* 021F4 8092E7C4 8CE203F0 */ lw $v0, 0x03F0($a3) ## 000003F0 -/* 021F8 8092E7C8 37180702 */ ori $t8, $t8, 0x0702 ## $t8 = 0FC00702 -/* 021FC 8092E7CC 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 02200 8092E7D0 A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 02204 8092E7D4 ACF806D4 */ sw $t8, 0x06D4($a3) ## 000006D4 -/* 02208 8092E7D8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0220C 8092E7DC 90590296 */ lbu $t9, 0x0296($v0) ## 00000296 -/* 02210 8092E7E0 3C0B8093 */ lui $t3, %hi(func_8092EA00) ## $t3 = 80930000 -/* 02214 8092E7E4 256BEA00 */ addiu $t3, $t3, %lo(func_8092EA00) ## $t3 = 8092EA00 -/* 02218 8092E7E8 37280005 */ ori $t0, $t9, 0x0005 ## $t0 = 00000005 -/* 0221C 8092E7EC A0480296 */ sb $t0, 0x0296($v0) ## 00000296 -/* 02220 8092E7F0 8CE203F0 */ lw $v0, 0x03F0($a3) ## 000003F0 -/* 02224 8092E7F4 3C0E8093 */ lui $t6, %hi(func_8092E830) ## $t6 = 80930000 -/* 02228 8092E7F8 240D0032 */ addiu $t5, $zero, 0x0032 ## $t5 = 00000032 -/* 0222C 8092E7FC 90490016 */ lbu $t1, 0x0016($v0) ## 00000016 -/* 02230 8092E800 25CEE830 */ addiu $t6, $t6, %lo(func_8092E830) ## $t6 = 8092E830 -/* 02234 8092E804 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 -/* 02238 8092E808 A04A0016 */ sb $t2, 0x0016($v0) ## 00000016 -/* 0223C 8092E80C 8CEC0190 */ lw $t4, 0x0190($a3) ## 00000190 -/* 02240 8092E810 516C0003 */ beql $t3, $t4, .L8092E820 -/* 02244 8092E814 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -/* 02248 8092E818 A4ED0198 */ sh $t5, 0x0198($a3) ## 00000198 -/* 0224C 8092E81C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -.L8092E820: -/* 02250 8092E820 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02254 8092E824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02258 8092E828 03E00008 */ jr $ra -/* 0225C 8092E82C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s deleted file mode 100644 index f303a6cd03..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_8092E830 -/* 02260 8092E830 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02264 8092E834 AFB00018 */ sw $s0, 0x0018($sp) -/* 02268 8092E838 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0226C 8092E83C AFBF001C */ sw $ra, 0x001C($sp) -/* 02270 8092E840 AFA50024 */ sw $a1, 0x0024($sp) -/* 02274 8092E844 0C02927F */ jal SkelAnime_Update - -/* 02278 8092E848 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0227C 8092E84C 3C048094 */ lui $a0, %hi(D_80938CB0) ## $a0 = 80940000 -/* 02280 8092E850 24848CB0 */ addiu $a0, $a0, %lo(D_80938CB0) ## $a0 = 80938CB0 -/* 02284 8092E854 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 02288 8092E858 0C01DE80 */ jal Math_StepToF - -/* 0228C 8092E85C 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 02290 8092E860 3C048094 */ lui $a0, %hi(D_80938CBC) ## $a0 = 80940000 -/* 02294 8092E864 24848CBC */ addiu $a0, $a0, %lo(D_80938CBC) ## $a0 = 80938CBC -/* 02298 8092E868 3C054416 */ lui $a1, 0x4416 ## $a1 = 44160000 -/* 0229C 8092E86C 0C01DE80 */ jal Math_StepToF - -/* 022A0 8092E870 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 022A4 8092E874 3C048094 */ lui $a0, %hi(D_80938CA8) ## $a0 = 80940000 -/* 022A8 8092E878 24848CA8 */ addiu $a0, $a0, %lo(D_80938CA8) ## $a0 = 80938CA8 -/* 022AC 8092E87C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 -/* 022B0 8092E880 0C01DE80 */ jal Math_StepToF - -/* 022B4 8092E884 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 022B8 8092E888 3C048094 */ lui $a0, %hi(D_80938CB4) ## $a0 = 80940000 -/* 022BC 8092E88C 24848CB4 */ addiu $a0, $a0, %lo(D_80938CB4) ## $a0 = 80938CB4 -/* 022C0 8092E890 3C05C348 */ lui $a1, 0xC348 ## $a1 = C3480000 -/* 022C4 8092E894 0C01DE80 */ jal Math_StepToF - -/* 022C8 8092E898 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 022CC 8092E89C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 022D0 8092E8A0 24012000 */ addiu $at, $zero, 0x2000 ## $at = 00002000 -/* 022D4 8092E8A4 31CF2000 */ andi $t7, $t6, 0x2000 ## $t7 = 00000000 -/* 022D8 8092E8A8 55E1000E */ bnel $t7, $at, .L8092E8E4 -/* 022DC 8092E8AC 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 022E0 8092E8B0 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -/* 022E4 8092E8B4 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 -/* 022E8 8092E8B8 27190002 */ addiu $t9, $t8, 0x0002 ## $t9 = 00000002 -/* 022EC 8092E8BC A6190198 */ sh $t9, 0x0198($s0) ## 00000198 -/* 022F0 8092E8C0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 022F4 8092E8C4 28410033 */ slti $at, $v0, 0x0033 -/* 022F8 8092E8C8 14200003 */ bne $at, $zero, .L8092E8D8 -/* 022FC 8092E8CC 00000000 */ nop -/* 02300 8092E8D0 10000012 */ beq $zero, $zero, .L8092E91C -/* 02304 8092E8D4 A6080198 */ sh $t0, 0x0198($s0) ## 00000198 -.L8092E8D8: -/* 02308 8092E8D8 10000010 */ beq $zero, $zero, .L8092E91C -/* 0230C 8092E8DC A6020198 */ sh $v0, 0x0198($s0) ## 00000198 -/* 02310 8092E8E0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L8092E8E4: -/* 02314 8092E8E4 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 02318 8092E8E8 10400003 */ beq $v0, $zero, .L8092E8F8 -/* 0231C 8092E8EC 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 02320 8092E8F0 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 -/* 02324 8092E8F4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L8092E8F8: -/* 02328 8092E8F8 54400009 */ bnel $v0, $zero, .L8092E920 -/* 0232C 8092E8FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02330 8092E900 0C24CC8F */ jal func_8093323C -/* 02334 8092E904 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 02338 8092E908 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 0233C 8092E90C 0C24CC8F */ jal func_8093323C -/* 02340 8092E910 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 02344 8092E914 0C24BA94 */ jal func_8092EA50 -/* 02348 8092E918 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8092E91C: -/* 0234C 8092E91C 8FBF001C */ lw $ra, 0x001C($sp) -.L8092E920: -/* 02350 8092E920 8FB00018 */ lw $s0, 0x0018($sp) -/* 02354 8092E924 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02358 8092E928 03E00008 */ jr $ra -/* 0235C 8092E92C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s deleted file mode 100644 index 135a7ca64c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_8092E930 -/* 02360 8092E930 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02364 8092E934 AFB00020 */ sw $s0, 0x0020($sp) -/* 02368 8092E938 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0236C 8092E93C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02370 8092E940 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02374 8092E944 24A5CC6C */ addiu $a1, $a1, 0xCC6C ## $a1 = 0600CC6C -/* 02378 8092E948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0237C 8092E94C 0C029490 */ jal Animation_MorphToPlayOnce -/* 02380 8092E950 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 02384 8092E954 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 02388 8092E958 0C028800 */ jal Animation_GetLastFrame - -/* 0238C 8092E95C 2484CC6C */ addiu $a0, $a0, 0xCC6C ## $a0 = 0600CC6C -/* 02390 8092E960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02394 8092E964 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 02398 8092E968 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0239C 8092E96C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 023A0 8092E970 0C00D09B */ jal Actor_SetColorFilter -/* 023A4 8092E974 AFA20010 */ sw $v0, 0x0010($sp) -/* 023A8 8092E978 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 023AC 8092E97C 0C028800 */ jal Animation_GetLastFrame - -/* 023B0 8092E980 2484CC6C */ addiu $a0, $a0, 0xCC6C ## $a0 = 0600CC6C -/* 023B4 8092E984 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 023B8 8092E988 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 023BC 8092E98C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 023C0 8092E990 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 023C4 8092E994 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 023C8 8092E998 0C00D09B */ jal Actor_SetColorFilter -/* 023CC 8092E99C AFA20010 */ sw $v0, 0x0010($sp) -/* 023D0 8092E9A0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 023D4 8092E9A4 0C028800 */ jal Animation_GetLastFrame - -/* 023D8 8092E9A8 2484CC6C */ addiu $a0, $a0, 0xCC6C ## $a0 = 0600CC6C -/* 023DC 8092E9AC 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 023E0 8092E9B0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 023E4 8092E9B4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 023E8 8092E9B8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 023EC 8092E9BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 023F0 8092E9C0 0C00D09B */ jal Actor_SetColorFilter -/* 023F4 8092E9C4 AFA20010 */ sw $v0, 0x0010($sp) -/* 023F8 8092E9C8 920E06C5 */ lbu $t6, 0x06C5($s0) ## 000006C5 -/* 023FC 8092E9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02400 8092E9D0 24053969 */ addiu $a1, $zero, 0x3969 ## $a1 = 00003969 -/* 02404 8092E9D4 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 02408 8092E9D8 0C24CF4B */ jal func_80933D2C -/* 0240C 8092E9DC A20F06C5 */ sb $t7, 0x06C5($s0) ## 000006C5 -/* 02410 8092E9E0 3C188093 */ lui $t8, %hi(func_8092EA00) ## $t8 = 80930000 -/* 02414 8092E9E4 2718EA00 */ addiu $t8, $t8, %lo(func_8092EA00) ## $t8 = 8092EA00 -/* 02418 8092E9E8 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 0241C 8092E9EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02420 8092E9F0 8FB00020 */ lw $s0, 0x0020($sp) -/* 02424 8092E9F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02428 8092E9F8 03E00008 */ jr $ra -/* 0242C 8092E9FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s deleted file mode 100644 index 84f36109bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8092EA00 -/* 02430 8092EA00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02434 8092EA04 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02438 8092EA08 AFA40018 */ sw $a0, 0x0018($sp) -/* 0243C 8092EA0C AFA5001C */ sw $a1, 0x001C($sp) -/* 02440 8092EA10 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 02444 8092EA14 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 02448 8092EA18 10400002 */ beq $v0, $zero, .L8092EA24 -/* 0244C 8092EA1C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02450 8092EA20 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -.L8092EA24: -/* 02454 8092EA24 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C -/* 02458 8092EA28 0C02927F */ jal SkelAnime_Update - -/* 0245C 8092EA2C AFA50018 */ sw $a1, 0x0018($sp) -/* 02460 8092EA30 10400003 */ beq $v0, $zero, .L8092EA40 -/* 02464 8092EA34 8FA50018 */ lw $a1, 0x0018($sp) -/* 02468 8092EA38 0C24B9E4 */ jal func_8092E790 -/* 0246C 8092EA3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -.L8092EA40: -/* 02470 8092EA40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02474 8092EA44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02478 8092EA48 03E00008 */ jr $ra -/* 0247C 8092EA4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s deleted file mode 100644 index e256c84b7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8092EA50 -/* 02480 8092EA50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02484 8092EA54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02488 8092EA58 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0248C 8092EA5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02490 8092EA60 24A5D458 */ addiu $a1, $a1, 0xD458 ## $a1 = 0600D458 -/* 02494 8092EA64 AFA70018 */ sw $a3, 0x0018($sp) -/* 02498 8092EA68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0249C 8092EA6C 0C029490 */ jal Animation_MorphToPlayOnce -/* 024A0 8092EA70 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 024A4 8092EA74 8FA70018 */ lw $a3, 0x0018($sp) -/* 024A8 8092EA78 3C18FFCF */ lui $t8, 0xFFCF ## $t8 = FFCF0000 -/* 024AC 8092EA7C 3718FFFF */ ori $t8, $t8, 0xFFFF ## $t8 = FFCFFFFF -/* 024B0 8092EA80 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 -/* 024B4 8092EA84 8CE203F0 */ lw $v0, 0x03F0($a3) ## 000003F0 -/* 024B8 8092EA88 ACF806D4 */ sw $t8, 0x06D4($a3) ## 000006D4 -/* 024BC 8092EA8C 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 024C0 8092EA90 A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 024C4 8092EA94 90590296 */ lbu $t9, 0x0296($v0) ## 00000296 -/* 024C8 8092EA98 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 024CC 8092EA9C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 024D0 8092EAA0 3328FFFA */ andi $t0, $t9, 0xFFFA ## $t0 = 00000000 -/* 024D4 8092EAA4 A0480296 */ sb $t0, 0x0296($v0) ## 00000296 -/* 024D8 8092EAA8 8CE203F0 */ lw $v0, 0x03F0($a3) ## 000003F0 -/* 024DC 8092EAAC 3C0C8093 */ lui $t4, %hi(func_8092EAE0) ## $t4 = 80930000 -/* 024E0 8092EAB0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 024E4 8092EAB4 90490016 */ lbu $t1, 0x0016($v0) ## 00000016 -/* 024E8 8092EAB8 258CEAE0 */ addiu $t4, $t4, %lo(func_8092EAE0) ## $t4 = 8092EAE0 -/* 024EC 8092EABC 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 024F0 8092EAC0 A04A0016 */ sb $t2, 0x0016($v0) ## 00000016 -/* 024F4 8092EAC4 A0EB0194 */ sb $t3, 0x0194($a3) ## 00000194 -/* 024F8 8092EAC8 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 024FC 8092EACC E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 02500 8092EAD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02504 8092EAD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02508 8092EAD8 03E00008 */ jr $ra -/* 0250C 8092EADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s deleted file mode 100644 index ae974ed9d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s +++ /dev/null @@ -1,115 +0,0 @@ -.late_rodata -glabel D_809379C0 - .word 0xC4228000 - -.text -glabel func_8092EAE0 -/* 02510 8092EAE0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02514 8092EAE4 AFB00020 */ sw $s0, 0x0020($sp) -/* 02518 8092EAE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0251C 8092EAEC AFBF0024 */ sw $ra, 0x0024($sp) -/* 02520 8092EAF0 AFA5003C */ sw $a1, 0x003C($sp) -/* 02524 8092EAF4 0C02927F */ jal SkelAnime_Update - -/* 02528 8092EAF8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0252C 8092EAFC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02530 8092EB00 AFA20034 */ sw $v0, 0x0034($sp) -/* 02534 8092EB04 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 02538 8092EB08 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 0253C 8092EB0C 3C05C422 */ lui $a1, 0xC422 ## $a1 = C4220000 -/* 02540 8092EB10 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 02544 8092EB14 4602003C */ c.lt.s $f0, $f2 -/* 02548 8092EB18 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C4228000 -/* 0254C 8092EB1C 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 02550 8092EB20 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02554 8092EB24 45020018 */ bc1fl .L8092EB88 -/* 02558 8092EB28 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 0255C 8092EB2C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 02560 8092EB30 3C028094 */ lui $v0, %hi(D_80938CA8) ## $v0 = 80940000 -/* 02564 8092EB34 24428CA8 */ addiu $v0, $v0, %lo(D_80938CA8) ## $v0 = 80938CA8 -/* 02568 8092EB38 46022180 */ add.s $f6, $f4, $f2 -/* 0256C 8092EB3C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 02570 8092EB40 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 02574 8092EB44 3C05C43B */ lui $a1, 0xC43B ## $a1 = C43B0000 -/* 02578 8092EB48 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 0257C 8092EB4C C4480004 */ lwc1 $f8, 0x0004($v0) ## 80938CAC -/* 02580 8092EB50 C4500010 */ lwc1 $f16, 0x0010($v0) ## 80938CB8 -/* 02584 8092EB54 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C43B8000 -/* 02588 8092EB58 46024281 */ sub.s $f10, $f8, $f2 -/* 0258C 8092EB5C 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 02590 8092EB60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02594 8092EB64 46028481 */ sub.s $f18, $f16, $f2 -/* 02598 8092EB68 E44A0004 */ swc1 $f10, 0x0004($v0) ## 80938CAC -/* 0259C 8092EB6C E4520010 */ swc1 $f18, 0x0010($v0) ## 80938CB8 -/* 025A0 8092EB70 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 025A4 8092EB74 0C01E0C4 */ jal Math_SmoothStepToF - -/* 025A8 8092EB78 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 025AC 8092EB7C 10000021 */ beq $zero, $zero, .L8092EC04 -/* 025B0 8092EB80 8FAE0034 */ lw $t6, 0x0034($sp) -/* 025B4 8092EB84 44816000 */ mtc1 $at, $f12 ## $f12 = 0.00 -.L8092EB88: -/* 025B8 8092EB88 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 025BC 8092EB8C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.25 -/* 025C0 8092EB90 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 025C4 8092EB94 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 025C8 8092EB98 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 -/* 025CC 8092EB9C 46083282 */ mul.s $f10, $f6, $f8 -/* 025D0 8092EBA0 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 025D4 8092EBA4 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 025D8 8092EBA8 4600603C */ c.lt.s $f12, $f0 -/* 025DC 8092EBAC 00000000 */ nop -/* 025E0 8092EBB0 45020004 */ bc1fl .L8092EBC4 -/* 025E4 8092EBB4 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 025E8 8092EBB8 10000002 */ beq $zero, $zero, .L8092EBC4 -/* 025EC 8092EBBC E60C0068 */ swc1 $f12, 0x0068($s0) ## 00000068 -/* 025F0 8092EBC0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L8092EBC4: -/* 025F4 8092EBC4 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 025F8 8092EBC8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 025FC 8092EBCC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 02600 8092EBD0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 02604 8092EBD4 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 -/* 02608 8092EBD8 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 0260C 8092EBDC 8E05000C */ lw $a1, 0x000C($s0) ## 0000000C -/* 02610 8092EBE0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 02614 8092EBE4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 02618 8092EBE8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0261C 8092EBEC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 02620 8092EBF0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 02624 8092EBF4 C7A4002C */ lwc1 $f4, 0x002C($sp) -/* 02628 8092EBF8 46002180 */ add.s $f6, $f4, $f0 -/* 0262C 8092EBFC E7A6002C */ swc1 $f6, 0x002C($sp) -/* 02630 8092EC00 8FAE0034 */ lw $t6, 0x0034($sp) -.L8092EC04: -/* 02634 8092EC04 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 02638 8092EC08 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0263C 8092EC0C 51C00015 */ beql $t6, $zero, .L8092EC64 -/* 02640 8092EC10 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02644 8092EC14 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 02648 8092EC18 00000000 */ nop -/* 0264C 8092EC1C 460A403C */ c.lt.s $f8, $f10 -/* 02650 8092EC20 00000000 */ nop -/* 02654 8092EC24 4502000F */ bc1fl .L8092EC64 -/* 02658 8092EC28 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0265C 8092EC2C C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 02660 8092EC30 3C018093 */ lui $at, %hi(D_809379C0) ## $at = 80930000 -/* 02664 8092EC34 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 02668 8092EC38 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 0266C 8092EC3C C43279C0 */ lwc1 $f18, %lo(D_809379C0)($at) -/* 02670 8092EC40 E61203C4 */ swc1 $f18, 0x03C4($s0) ## 000003C4 -/* 02674 8092EC44 0C24C11D */ jal func_80930474 -/* 02678 8092EC48 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 0267C 8092EC4C 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 02680 8092EC50 0C24C11D */ jal func_80930474 -/* 02684 8092EC54 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 02688 8092EC58 0C24B6CC */ jal func_8092DB30 -/* 0268C 8092EC5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02690 8092EC60 8FBF0024 */ lw $ra, 0x0024($sp) -.L8092EC64: -/* 02694 8092EC64 8FB00020 */ lw $s0, 0x0020($sp) -/* 02698 8092EC68 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0269C 8092EC6C 03E00008 */ jr $ra -/* 026A0 8092EC70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s deleted file mode 100644 index 06e65ac023..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_8092EC74 -/* 026A4 8092EC74 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 026A8 8092EC78 AFBF0014 */ sw $ra, 0x0014($sp) -/* 026AC 8092EC7C 10A00016 */ beq $a1, $zero, .L8092ECD8 -/* 026B0 8092EC80 AFA5002C */ sw $a1, 0x002C($sp) -/* 026B4 8092EC84 00053080 */ sll $a2, $a1, 2 -/* 026B8 8092EC88 00C53023 */ subu $a2, $a2, $a1 -/* 026BC 8092EC8C 00063080 */ sll $a2, $a2, 2 -/* 026C0 8092EC90 3C188093 */ lui $t8, %hi(D_8093737C) ## $t8 = 80930000 -/* 026C4 8092EC94 2718737C */ addiu $t8, $t8, %lo(D_8093737C) ## $t8 = 8093737C -/* 026C8 8092EC98 24CFFFF4 */ addiu $t7, $a2, 0xFFF4 ## $t7 = FFFFFFF4 -/* 026CC 8092EC9C 3C048093 */ lui $a0, %hi(D_8093734C) ## $a0 = 80930000 -/* 026D0 8092ECA0 2484734C */ addiu $a0, $a0, %lo(D_8093734C) ## $a0 = 8093734C -/* 026D4 8092ECA4 01F82821 */ addu $a1, $t7, $t8 -/* 026D8 8092ECA8 AFA6001C */ sw $a2, 0x001C($sp) -/* 026DC 8092ECAC 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 026E0 8092ECB0 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 026E4 8092ECB4 8FA6001C */ lw $a2, 0x001C($sp) -/* 026E8 8092ECB8 3C088093 */ lui $t0, %hi(D_809373DC) ## $t0 = 80930000 -/* 026EC 8092ECBC 250873DC */ addiu $t0, $t0, %lo(D_809373DC) ## $t0 = 809373DC -/* 026F0 8092ECC0 3C048093 */ lui $a0, %hi(D_80937358) ## $a0 = 80930000 -/* 026F4 8092ECC4 24D9FFF4 */ addiu $t9, $a2, 0xFFF4 ## $t9 = FFFFFFF4 -/* 026F8 8092ECC8 03282821 */ addu $a1, $t9, $t0 -/* 026FC 8092ECCC 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 02700 8092ECD0 24847358 */ addiu $a0, $a0, %lo(D_80937358) ## $a0 = 80937358 -/* 02704 8092ECD4 C7AC0028 */ lwc1 $f12, 0x0028($sp) -.L8092ECD8: -/* 02708 8092ECD8 8FA1002C */ lw $at, 0x002C($sp) -/* 0270C 8092ECDC 3C098093 */ lui $t1, %hi(D_8093737C) ## $t1 = 80930000 -/* 02710 8092ECE0 3C048093 */ lui $a0, %hi(D_8093734C) ## $a0 = 80930000 -/* 02714 8092ECE4 00013080 */ sll $a2, $at, 2 -/* 02718 8092ECE8 00C13023 */ subu $a2, $a2, $at -/* 0271C 8092ECEC 00063080 */ sll $a2, $a2, 2 -/* 02720 8092ECF0 2529737C */ addiu $t1, $t1, %lo(D_8093737C) ## $t1 = 8093737C -/* 02724 8092ECF4 2484734C */ addiu $a0, $a0, %lo(D_8093734C) ## $a0 = 8093734C -/* 02728 8092ECF8 00C91021 */ addu $v0, $a2, $t1 -/* 0272C 8092ECFC C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000000 -/* 02730 8092ED00 C4860000 */ lwc1 $f6, 0x0000($a0) ## 8093734C -/* 02734 8092ED04 3C018093 */ lui $at, %hi(D_80937364) ## $at = 80930000 -/* 02738 8092ED08 3C0A8093 */ lui $t2, %hi(D_809373DC) ## $t2 = 80930000 -/* 0273C 8092ED0C 46062201 */ sub.s $f8, $f4, $f6 -/* 02740 8092ED10 3C058093 */ lui $a1, %hi(D_80937358) ## $a1 = 80930000 -/* 02744 8092ED14 254A73DC */ addiu $t2, $t2, %lo(D_809373DC) ## $t2 = 809373DC -/* 02748 8092ED18 24A57358 */ addiu $a1, $a1, %lo(D_80937358) ## $a1 = 80937358 -/* 0274C 8092ED1C 460C4282 */ mul.s $f10, $f8, $f12 -/* 02750 8092ED20 00CA1821 */ addu $v1, $a2, $t2 -/* 02754 8092ED24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02758 8092ED28 E42A7364 */ swc1 $f10, %lo(D_80937364)($at) -/* 0275C 8092ED2C C4920004 */ lwc1 $f18, 0x0004($a0) ## 80937350 -/* 02760 8092ED30 C4500004 */ lwc1 $f16, 0x0004($v0) ## 00000004 -/* 02764 8092ED34 46128101 */ sub.s $f4, $f16, $f18 -/* 02768 8092ED38 460C2182 */ mul.s $f6, $f4, $f12 -/* 0276C 8092ED3C E4267368 */ swc1 $f6, %lo(D_80937368)($at) -/* 02770 8092ED40 C48A0008 */ lwc1 $f10, 0x0008($a0) ## 80937354 -/* 02774 8092ED44 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 02778 8092ED48 460A4401 */ sub.s $f16, $f8, $f10 -/* 0277C 8092ED4C 460C8482 */ mul.s $f18, $f16, $f12 -/* 02780 8092ED50 E432736C */ swc1 $f18, %lo(D_8093736C)($at) -/* 02784 8092ED54 C4A60000 */ lwc1 $f6, 0x0000($a1) ## 80937358 -/* 02788 8092ED58 C4640000 */ lwc1 $f4, 0x0000($v1) ## 00000000 -/* 0278C 8092ED5C 3C018093 */ lui $at, %hi(D_80937370) ## $at = 80930000 -/* 02790 8092ED60 46062201 */ sub.s $f8, $f4, $f6 -/* 02794 8092ED64 460C4282 */ mul.s $f10, $f8, $f12 -/* 02798 8092ED68 E42A7370 */ swc1 $f10, %lo(D_80937370)($at) -/* 0279C 8092ED6C C4B20004 */ lwc1 $f18, 0x0004($a1) ## 8093735C -/* 027A0 8092ED70 C4700004 */ lwc1 $f16, 0x0004($v1) ## 00000004 -/* 027A4 8092ED74 46128101 */ sub.s $f4, $f16, $f18 -/* 027A8 8092ED78 460C2182 */ mul.s $f6, $f4, $f12 -/* 027AC 8092ED7C E4267374 */ swc1 $f6, %lo(D_80937374)($at) -/* 027B0 8092ED80 C4AA0008 */ lwc1 $f10, 0x0008($a1) ## 80937360 -/* 027B4 8092ED84 C4680008 */ lwc1 $f8, 0x0008($v1) ## 00000008 -/* 027B8 8092ED88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 027BC 8092ED8C 460A4401 */ sub.s $f16, $f8, $f10 -/* 027C0 8092ED90 460C8482 */ mul.s $f18, $f16, $f12 -/* 027C4 8092ED94 03E00008 */ jr $ra -/* 027C8 8092ED98 E4327378 */ swc1 $f18, %lo(D_80937378)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s deleted file mode 100644 index 477480d584..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_8092ED9C -/* 027CC 8092ED9C 3C028093 */ lui $v0, %hi(D_8093734C) ## $v0 = 80930000 -/* 027D0 8092EDA0 3C038093 */ lui $v1, %hi(D_80937358) ## $v1 = 80930000 -/* 027D4 8092EDA4 2442734C */ addiu $v0, $v0, %lo(D_8093734C) ## $v0 = 8093734C -/* 027D8 8092EDA8 C4520000 */ lwc1 $f18, 0x0000($v0) ## 8093734C -/* 027DC 8092EDAC C4500004 */ lwc1 $f16, 0x0004($v0) ## 80937350 -/* 027E0 8092EDB0 C44E0008 */ lwc1 $f14, 0x0008($v0) ## 80937354 -/* 027E4 8092EDB4 3C068093 */ lui $a2, %hi(D_80937364) ## $a2 = 80930000 -/* 027E8 8092EDB8 24637358 */ addiu $v1, $v1, %lo(D_80937358) ## $v1 = 80937358 -/* 027EC 8092EDBC C46C0000 */ lwc1 $f12, 0x0000($v1) ## 80937358 -/* 027F0 8092EDC0 C46A0004 */ lwc1 $f10, 0x0004($v1) ## 8093735C -/* 027F4 8092EDC4 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80937360 -/* 027F8 8092EDC8 3C078093 */ lui $a3, %hi(D_80937370) ## $a3 = 80930000 -/* 027FC 8092EDCC 24C67364 */ addiu $a2, $a2, %lo(D_80937364) ## $a2 = 80937364 -/* 02800 8092EDD0 C4C60000 */ lwc1 $f6, 0x0000($a2) ## 80937364 -/* 02804 8092EDD4 C4C40004 */ lwc1 $f4, 0x0004($a2) ## 80937368 -/* 02808 8092EDD8 C4C20008 */ lwc1 $f2, 0x0008($a2) ## 8093736C -/* 0280C 8092EDDC 46069180 */ add.s $f6, $f18, $f6 -/* 02810 8092EDE0 24E77370 */ addiu $a3, $a3, %lo(D_80937370) ## $a3 = 80937370 -/* 02814 8092EDE4 C4F20000 */ lwc1 $f18, 0x0000($a3) ## 80937370 -/* 02818 8092EDE8 46048100 */ add.s $f4, $f16, $f4 -/* 0281C 8092EDEC C4F00004 */ lwc1 $f16, 0x0004($a3) ## 80937374 -/* 02820 8092EDF0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02824 8092EDF4 46027080 */ add.s $f2, $f14, $f2 -/* 02828 8092EDF8 C4EE0008 */ lwc1 $f14, 0x0008($a3) ## 80937378 -/* 0282C 8092EDFC AFB00018 */ sw $s0, 0x0018($sp) -/* 02830 8092EE00 46126480 */ add.s $f18, $f12, $f18 -/* 02834 8092EE04 AFBF001C */ sw $ra, 0x001C($sp) -/* 02838 8092EE08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0283C 8092EE0C 46105400 */ add.s $f16, $f10, $f16 -/* 02840 8092EE10 AFA5004C */ sw $a1, 0x004C($sp) -/* 02844 8092EE14 E4460000 */ swc1 $f6, 0x0000($v0) ## 8093734C -/* 02848 8092EE18 460E4380 */ add.s $f14, $f8, $f14 -/* 0284C 8092EE1C E4440004 */ swc1 $f4, 0x0004($v0) ## 80937350 -/* 02850 8092EE20 E4420008 */ swc1 $f2, 0x0008($v0) ## 80937354 -/* 02854 8092EE24 E4720000 */ swc1 $f18, 0x0000($v1) ## 80937358 -/* 02858 8092EE28 E4700004 */ swc1 $f16, 0x0004($v1) ## 8093735C -/* 0285C 8092EE2C E46E0008 */ swc1 $f14, 0x0008($v1) ## 80937360 -/* 02860 8092EE30 0C01DE1C */ jal Math_SinS - ## sins? -/* 02864 8092EE34 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 02868 8092EE38 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0286C 8092EE3C 0C01DE0D */ jal Math_CosS - ## coss? -/* 02870 8092EE40 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 02874 8092EE44 3C028093 */ lui $v0, %hi(D_8093734C) ## $v0 = 80930000 -/* 02878 8092EE48 2442734C */ addiu $v0, $v0, %lo(D_8093734C) ## $v0 = 8093734C -/* 0287C 8092EE4C C7B2002C */ lwc1 $f18, 0x002C($sp) -/* 02880 8092EE50 C44C0008 */ lwc1 $f12, 0x0008($v0) ## 80937354 -/* 02884 8092EE54 C4420000 */ lwc1 $f2, 0x0000($v0) ## 8093734C -/* 02888 8092EE58 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 0288C 8092EE5C 46126282 */ mul.s $f10, $f12, $f18 -/* 02890 8092EE60 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 02894 8092EE64 3C038093 */ lui $v1, %hi(D_80937358) ## $v1 = 80930000 -/* 02898 8092EE68 46001182 */ mul.s $f6, $f2, $f0 -/* 0289C 8092EE6C 24637358 */ addiu $v1, $v1, %lo(D_80937358) ## $v1 = 80937358 -/* 028A0 8092EE70 C4700008 */ lwc1 $f16, 0x0008($v1) ## 80937360 -/* 028A4 8092EE74 C46E0000 */ lwc1 $f14, 0x0000($v1) ## 80937358 -/* 028A8 8092EE78 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 028AC 8092EE7C 460A4100 */ add.s $f4, $f8, $f10 -/* 028B0 8092EE80 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 028B4 8092EE84 8FA4004C */ lw $a0, 0x004C($sp) -/* 028B8 8092EE88 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFF4 -/* 028BC 8092EE8C 46062200 */ add.s $f8, $f4, $f6 -/* 028C0 8092EE90 44812000 */ mtc1 $at, $f4 ## $f4 = 140.00 -/* 028C4 8092EE94 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFE8 -/* 028C8 8092EE98 E7A8003C */ swc1 $f8, 0x003C($sp) -/* 028CC 8092EE9C C60A000C */ lwc1 $f10, 0x000C($s0) ## 0000000C -/* 028D0 8092EEA0 C4480004 */ lwc1 $f8, 0x0004($v0) ## 80937350 -/* 028D4 8092EEA4 46045181 */ sub.s $f6, $f10, $f4 -/* 028D8 8092EEA8 46083280 */ add.s $f10, $f6, $f8 -/* 028DC 8092EEAC 46006182 */ mul.s $f6, $f12, $f0 -/* 028E0 8092EEB0 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 028E4 8092EEB4 46121282 */ mul.s $f10, $f2, $f18 -/* 028E8 8092EEB8 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 028EC 8092EEBC 46062200 */ add.s $f8, $f4, $f6 -/* 028F0 8092EEC0 460A4101 */ sub.s $f4, $f8, $f10 -/* 028F4 8092EEC4 46128202 */ mul.s $f8, $f16, $f18 -/* 028F8 8092EEC8 E7A40044 */ swc1 $f4, 0x0044($sp) -/* 028FC 8092EECC 46007102 */ mul.s $f4, $f14, $f0 -/* 02900 8092EED0 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 02904 8092EED4 46083280 */ add.s $f10, $f6, $f8 -/* 02908 8092EED8 46045180 */ add.s $f6, $f10, $f4 -/* 0290C 8092EEDC 44815000 */ mtc1 $at, $f10 ## $f10 = 140.00 -/* 02910 8092EEE0 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 02914 8092EEE4 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 02918 8092EEE8 C4660004 */ lwc1 $f6, 0x0004($v1) ## 8093735C -/* 0291C 8092EEEC 460A4101 */ sub.s $f4, $f8, $f10 -/* 02920 8092EEF0 46062200 */ add.s $f8, $f4, $f6 -/* 02924 8092EEF4 46008102 */ mul.s $f4, $f16, $f0 -/* 02928 8092EEF8 E7A80034 */ swc1 $f8, 0x0034($sp) -/* 0292C 8092EEFC 46127202 */ mul.s $f8, $f14, $f18 -/* 02930 8092EF00 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02934 8092EF04 46045180 */ add.s $f6, $f10, $f4 -/* 02938 8092EF08 46083281 */ sub.s $f10, $f6, $f8 -/* 0293C 8092EF0C 0C030136 */ jal Gameplay_CameraSetAtEye -/* 02940 8092EF10 E7AA0038 */ swc1 $f10, 0x0038($sp) -/* 02944 8092EF14 8FBF001C */ lw $ra, 0x001C($sp) -/* 02948 8092EF18 8FB00018 */ lw $s0, 0x0018($sp) -/* 0294C 8092EF1C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 02950 8092EF20 03E00008 */ jr $ra -/* 02954 8092EF24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s deleted file mode 100644 index 133c460893..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_8092EF28 -/* 02958 8092EF28 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0295C 8092EF2C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02960 8092EF30 AFB10020 */ sw $s1, 0x0020($sp) -/* 02964 8092EF34 AFB0001C */ sw $s0, 0x001C($sp) -/* 02968 8092EF38 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 0296C 8092EF3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02970 8092EF40 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02974 8092EF44 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02978 8092EF48 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 0297C 8092EF4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02980 8092EF50 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 02984 8092EF54 0C0294D3 */ jal Animation_MorphToLoop -/* 02988 8092EF58 AFAE002C */ sw $t6, 0x002C($sp) -/* 0298C 8092EF5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02990 8092EF60 0C24CF4B */ jal func_80933D2C -/* 02994 8092EF64 2405396F */ addiu $a1, $zero, 0x396F ## $a1 = 0000396F -/* 02998 8092EF68 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 0299C 8092EF6C AFAF0010 */ sw $t7, 0x0010($sp) -/* 029A0 8092EF70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 029A4 8092EF74 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 029A8 8092EF78 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029AC 8092EF7C 0C00D09B */ jal Actor_SetColorFilter -/* 029B0 8092EF80 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 029B4 8092EF84 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 029B8 8092EF88 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 029BC 8092EF8C AFB80010 */ sw $t8, 0x0010($sp) -/* 029C0 8092EF90 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 029C4 8092EF94 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 029C8 8092EF98 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029CC 8092EF9C 0C00D09B */ jal Actor_SetColorFilter -/* 029D0 8092EFA0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 029D4 8092EFA4 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 029D8 8092EFA8 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 029DC 8092EFAC AFB90010 */ sw $t9, 0x0010($sp) -/* 029E0 8092EFB0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 029E4 8092EFB4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 029E8 8092EFB8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029EC 8092EFBC 0C00D09B */ jal Actor_SetColorFilter -/* 029F0 8092EFC0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 029F4 8092EFC4 922906C5 */ lbu $t1, 0x06C5($s1) ## 000006C5 -/* 029F8 8092EFC8 922B03E6 */ lbu $t3, 0x03E6($s1) ## 000003E6 -/* 029FC 8092EFCC 3C068094 */ lui $a2, %hi(D_80938C98) ## $a2 = 80940000 -/* 02A00 8092EFD0 2408003C */ addiu $t0, $zero, 0x003C ## $t0 = 0000003C -/* 02A04 8092EFD4 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 -/* 02A08 8092EFD8 316CFFFE */ andi $t4, $t3, 0xFFFE ## $t4 = 00000000 -/* 02A0C 8092EFDC 24C68C98 */ addiu $a2, $a2, %lo(D_80938C98) ## $a2 = 80938C98 -/* 02A10 8092EFE0 A6280198 */ sh $t0, 0x0198($s1) ## 00000198 -/* 02A14 8092EFE4 A22A06C5 */ sb $t2, 0x06C5($s1) ## 000006C5 -/* 02A18 8092EFE8 A22C03E6 */ sb $t4, 0x03E6($s1) ## 000003E6 -/* 02A1C 8092EFEC 8CC20000 */ lw $v0, 0x0000($a2) ## 80938C98 -/* 02A20 8092EFF0 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 02A24 8092EFF4 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF -/* 02A28 8092EFF8 904D03E6 */ lbu $t5, 0x03E6($v0) ## 000003E6 -/* 02A2C 8092EFFC 31AEFFFE */ andi $t6, $t5, 0xFFFE ## $t6 = 00000000 -/* 02A30 8092F000 A04E03E6 */ sb $t6, 0x03E6($v0) ## 000003E6 -/* 02A34 8092F004 8CC30004 */ lw $v1, 0x0004($a2) ## 80938C9C -/* 02A38 8092F008 906F03E6 */ lbu $t7, 0x03E6($v1) ## 000003E6 -/* 02A3C 8092F00C 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 02A40 8092F010 0C03E803 */ jal Audio_SetBGM - -/* 02A44 8092F014 A07803E6 */ sb $t8, 0x03E6($v1) ## 000003E6 -/* 02A48 8092F018 0C03008C */ jal Gameplay_CreateSubCamera -/* 02A4C 8092F01C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A50 8092F020 3C018094 */ lui $at, %hi(D_80938CC4) ## $at = 80940000 -/* 02A54 8092F024 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) -/* 02A58 8092F028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A5C 8092F02C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02A60 8092F030 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 02A64 8092F034 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02A68 8092F038 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 02A6C 8092F03C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 02A70 8092F040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A74 8092F044 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 02A78 8092F048 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 02A7C 8092F04C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 02A80 8092F050 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 02A84 8092F054 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A88 8092F058 0C0301E3 */ jal Gameplay_CopyCamera -/* 02A8C 8092F05C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02A90 8092F060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A94 8092F064 8FA5002C */ lw $a1, 0x002C($sp) -/* 02A98 8092F068 0C00B7D5 */ jal func_8002DF54 -/* 02A9C 8092F06C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 02AA0 8092F070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AA4 8092F074 0C019148 */ jal func_80064520 -/* 02AA8 8092F078 26051D64 */ addiu $a1, $s0, 0x1D64 ## $a1 = 00001D64 -/* 02AAC 8092F07C 861907A0 */ lh $t9, 0x07A0($s0) ## 000007A0 -/* 02AB0 8092F080 3C048093 */ lui $a0, %hi(D_80937358) ## $a0 = 80930000 -/* 02AB4 8092F084 24847358 */ addiu $a0, $a0, %lo(D_80937358) ## $a0 = 80937358 -/* 02AB8 8092F088 00194080 */ sll $t0, $t9, 2 -/* 02ABC 8092F08C 02084821 */ addu $t1, $s0, $t0 -/* 02AC0 8092F090 8D250790 */ lw $a1, 0x0790($t1) ## 00000790 -/* 02AC4 8092F094 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 02AC8 8092F098 24A5005C */ addiu $a1, $a1, 0x005C ## $a1 = 0000005C -/* 02ACC 8092F09C 3C0A8093 */ lui $t2, %hi(func_8092F0BC) ## $t2 = 80930000 -/* 02AD0 8092F0A0 254AF0BC */ addiu $t2, $t2, %lo(func_8092F0BC) ## $t2 = 8092F0BC -/* 02AD4 8092F0A4 AE2A0190 */ sw $t2, 0x0190($s1) ## 00000190 -/* 02AD8 8092F0A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02ADC 8092F0AC 8FB10020 */ lw $s1, 0x0020($sp) -/* 02AE0 8092F0B0 8FB0001C */ lw $s0, 0x001C($sp) -/* 02AE4 8092F0B4 03E00008 */ jr $ra -/* 02AE8 8092F0B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s deleted file mode 100644 index 047e9f9f4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s +++ /dev/null @@ -1,168 +0,0 @@ -.late_rodata -glabel D_809379C4 - .word 0x3CAAAAAB - -.text -glabel func_8092F0BC -/* 02AEC 8092F0BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02AF0 8092F0C0 AFB00014 */ sw $s0, 0x0014($sp) -/* 02AF4 8092F0C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02AF8 8092F0C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02AFC 8092F0CC AFB10018 */ sw $s1, 0x0018($sp) -/* 02B00 8092F0D0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02B04 8092F0D4 0C02927F */ jal SkelAnime_Update - -/* 02B08 8092F0D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02B0C 8092F0DC 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 02B10 8092F0E0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 02B14 8092F0E4 44813000 */ mtc1 $at, $f6 ## $f6 = 140.00 -/* 02B18 8092F0E8 10600002 */ beq $v1, $zero, .L8092F0F4 -/* 02B1C 8092F0EC 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 02B20 8092F0F0 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -.L8092F0F4: -/* 02B24 8092F0F4 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 02B28 8092F0F8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 02B2C 8092F0FC 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 02B30 8092F100 46062201 */ sub.s $f8, $f4, $f6 -/* 02B34 8092F104 44054000 */ mfc1 $a1, $f8 -/* 02B38 8092F108 0C01DE80 */ jal Math_StepToF - -/* 02B3C 8092F10C 00000000 */ nop -/* 02B40 8092F110 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 02B44 8092F114 1460000B */ bne $v1, $zero, .L8092F144 -/* 02B48 8092F118 28610031 */ slti $at, $v1, 0x0031 -/* 02B4C 8092F11C 3C118094 */ lui $s1, %hi(D_80938C98) ## $s1 = 80940000 -/* 02B50 8092F120 26318C98 */ addiu $s1, $s1, %lo(D_80938C98) ## $s1 = 80938C98 -/* 02B54 8092F124 0C24CB44 */ jal func_80932D10 -/* 02B58 8092F128 8E240000 */ lw $a0, 0x0000($s1) ## 80938C98 -/* 02B5C 8092F12C 0C24CB44 */ jal func_80932D10 -/* 02B60 8092F130 8E240004 */ lw $a0, 0x0004($s1) ## 80938C9C -/* 02B64 8092F134 0C24BCC3 */ jal func_8092F30C -/* 02B68 8092F138 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B6C 8092F13C 1000006F */ beq $zero, $zero, .L8092F2FC -/* 02B70 8092F140 8FBF001C */ lw $ra, 0x001C($sp) -.L8092F144: -/* 02B74 8092F144 1420000D */ bne $at, $zero, .L8092F17C -/* 02B78 8092F148 02202025 */ or $a0, $s1, $zero ## $a0 = 80938C98 -/* 02B7C 8092F14C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 02B80 8092F150 3C078093 */ lui $a3, %hi(D_80937358) ## $a3 = 80930000 -/* 02B84 8092F154 24E77358 */ addiu $a3, $a3, %lo(D_80937358) ## $a3 = 80937358 -/* 02B88 8092F158 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 02B8C 8092F15C 0C030136 */ jal Gameplay_CameraSetAtEye -/* 02B90 8092F160 26060038 */ addiu $a2, $s0, 0x0038 ## $a2 = 00000038 -/* 02B94 8092F164 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 02B98 8092F168 3C05C3AF */ lui $a1, 0xC3AF ## $a1 = C3AF0000 -/* 02B9C 8092F16C 0C01DE80 */ jal Math_StepToF - -/* 02BA0 8092F170 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 02BA4 8092F174 10000061 */ beq $zero, $zero, .L8092F2FC -/* 02BA8 8092F178 8FBF001C */ lw $ra, 0x001C($sp) -.L8092F17C: -/* 02BAC 8092F17C 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 02BB0 8092F180 1461005B */ bne $v1, $at, .L8092F2F0 -/* 02BB4 8092F184 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BB8 8092F188 8E2F1C44 */ lw $t7, 0x1C44($s1) ## 8093A8DC -/* 02BBC 8092F18C AFAF0024 */ sw $t7, 0x0024($sp) -/* 02BC0 8092F190 0C01DE1C */ jal Math_SinS - ## sins? -/* 02BC4 8092F194 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 02BC8 8092F198 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 02BCC 8092F19C 0C01DE0D */ jal Math_CosS - ## coss? -/* 02BD0 8092F1A0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 02BD4 8092F1A4 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 02BD8 8092F1A8 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 02BDC 8092F1AC C7B00020 */ lwc1 $f16, 0x0020($sp) -/* 02BE0 8092F1B0 3C018093 */ lui $at, %hi(D_80937340) ## $at = 80930000 -/* 02BE4 8092F1B4 C4247340 */ lwc1 $f4, %lo(D_80937340)($at) -/* 02BE8 8092F1B8 46105482 */ mul.s $f18, $f10, $f16 -/* 02BEC 8092F1BC 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 -/* 02BF0 8092F1C0 44814000 */ mtc1 $at, $f8 ## $f8 = -120.00 -/* 02BF4 8092F1C4 8FB80024 */ lw $t8, 0x0024($sp) -/* 02BF8 8092F1C8 46080282 */ mul.s $f10, $f0, $f8 -/* 02BFC 8092F1CC 46122180 */ add.s $f6, $f4, $f18 -/* 02C00 8092F1D0 46065400 */ add.s $f16, $f10, $f6 -/* 02C04 8092F1D4 E7100024 */ swc1 $f16, 0x0024($t8) ## 00000024 -/* 02C08 8092F1D8 0C01DE0D */ jal Math_CosS - ## coss? -/* 02C0C 8092F1DC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 02C10 8092F1E0 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 02C14 8092F1E4 0C01DE1C */ jal Math_SinS - ## sins? -/* 02C18 8092F1E8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 02C1C 8092F1EC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 02C20 8092F1F0 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 02C24 8092F1F4 C7B20020 */ lwc1 $f18, 0x0020($sp) -/* 02C28 8092F1F8 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 -/* 02C2C 8092F1FC 44818000 */ mtc1 $at, $f16 ## $f16 = -120.00 -/* 02C30 8092F200 46122202 */ mul.s $f8, $f4, $f18 -/* 02C34 8092F204 3C058093 */ lui $a1, %hi(D_80937340) ## $a1 = 80930000 -/* 02C38 8092F208 24A57340 */ addiu $a1, $a1, %lo(D_80937340) ## $a1 = 80937340 -/* 02C3C 8092F20C 46100102 */ mul.s $f4, $f0, $f16 -/* 02C40 8092F210 C4AA0008 */ lwc1 $f10, 0x0008($a1) ## 80937348 -/* 02C44 8092F214 8FA40024 */ lw $a0, 0x0024($sp) -/* 02C48 8092F218 46085180 */ add.s $f6, $f10, $f8 -/* 02C4C 8092F21C 46043481 */ sub.s $f18, $f6, $f4 -/* 02C50 8092F220 0C00B6B0 */ jal Actor_WorldYawTowardPoint -/* 02C54 8092F224 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C -/* 02C58 8092F228 8FB90024 */ lw $t9, 0x0024($sp) -/* 02C5C 8092F22C 3C058093 */ lui $a1, %hi(D_80937358) ## $a1 = 80930000 -/* 02C60 8092F230 24A57358 */ addiu $a1, $a1, %lo(D_80937358) ## $a1 = 80937358 -/* 02C64 8092F234 A72200B6 */ sh $v0, 0x00B6($t9) ## 000000B6 -/* 02C68 8092F238 862807A0 */ lh $t0, 0x07A0($s1) ## 80939438 -/* 02C6C 8092F23C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C70 8092F240 00084880 */ sll $t1, $t0, 2 -/* 02C74 8092F244 02295021 */ addu $t2, $s1, $t1 -/* 02C78 8092F248 8D460790 */ lw $a2, 0x0790($t2) ## 00000790 -/* 02C7C 8092F24C 0C00B6F4 */ jal func_8002DBD0 -/* 02C80 8092F250 24C6005C */ addiu $a2, $a2, 0x005C ## $a2 = 0000005C -/* 02C84 8092F254 862B07A0 */ lh $t3, 0x07A0($s1) ## 80939438 -/* 02C88 8092F258 3C058093 */ lui $a1, %hi(D_8093734C) ## $a1 = 80930000 -/* 02C8C 8092F25C 24A5734C */ addiu $a1, $a1, %lo(D_8093734C) ## $a1 = 8093734C -/* 02C90 8092F260 000B6080 */ sll $t4, $t3, 2 -/* 02C94 8092F264 022C6821 */ addu $t5, $s1, $t4 -/* 02C98 8092F268 8DA60790 */ lw $a2, 0x0790($t5) ## 00000790 -/* 02C9C 8092F26C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02CA0 8092F270 0C00B6F4 */ jal func_8002DBD0 -/* 02CA4 8092F274 24C60050 */ addiu $a2, $a2, 0x0050 ## $a2 = 00000050 -/* 02CA8 8092F278 3C01C3AF */ lui $at, 0xC3AF ## $at = C3AF0000 -/* 02CAC 8092F27C 44815000 */ mtc1 $at, $f10 ## $f10 = -350.00 -/* 02CB0 8092F280 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 02CB4 8092F284 0C01DE1C */ jal Math_SinS - ## sins? -/* 02CB8 8092F288 E60A03C4 */ swc1 $f10, 0x03C4($s0) ## 000003C4 -/* 02CBC 8092F28C 3C018093 */ lui $at, %hi(D_80937340) ## $at = 80930000 -/* 02CC0 8092F290 C4287340 */ lwc1 $f8, %lo(D_80937340)($at) -/* 02CC4 8092F294 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 02CC8 8092F298 44818000 */ mtc1 $at, $f16 ## $f16 = 350.00 -/* 02CCC 8092F29C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 02CD0 8092F2A0 46100182 */ mul.s $f6, $f0, $f16 -/* 02CD4 8092F2A4 46064101 */ sub.s $f4, $f8, $f6 -/* 02CD8 8092F2A8 0C01DE0D */ jal Math_CosS - ## coss? -/* 02CDC 8092F2AC E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 02CE0 8092F2B0 3C018093 */ lui $at, %hi(D_80937348) ## $at = 80930000 -/* 02CE4 8092F2B4 C4327348 */ lwc1 $f18, %lo(D_80937348)($at) -/* 02CE8 8092F2B8 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 02CEC 8092F2BC 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 -/* 02CF0 8092F2C0 3C018093 */ lui $at, %hi(D_809379C4) ## $at = 80930000 -/* 02CF4 8092F2C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02CF8 8092F2C8 460A0402 */ mul.s $f16, $f0, $f10 -/* 02CFC 8092F2CC 46109201 */ sub.s $f8, $f18, $f16 -/* 02D00 8092F2D0 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 02D04 8092F2D4 0C24BB1D */ jal func_8092EC74 -/* 02D08 8092F2D8 C42C79C4 */ lwc1 $f12, %lo(D_809379C4)($at) -/* 02D0C 8092F2DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D10 8092F2E0 0C24BB67 */ jal func_8092ED9C -/* 02D14 8092F2E4 02202825 */ or $a1, $s1, $zero ## $a1 = 80938C98 -/* 02D18 8092F2E8 10000004 */ beq $zero, $zero, .L8092F2FC -/* 02D1C 8092F2EC 8FBF001C */ lw $ra, 0x001C($sp) -.L8092F2F0: -/* 02D20 8092F2F0 0C24BB67 */ jal func_8092ED9C -/* 02D24 8092F2F4 02202825 */ or $a1, $s1, $zero ## $a1 = 80938C98 -/* 02D28 8092F2F8 8FBF001C */ lw $ra, 0x001C($sp) -.L8092F2FC: -/* 02D2C 8092F2FC 8FB00014 */ lw $s0, 0x0014($sp) -/* 02D30 8092F300 8FB10018 */ lw $s1, 0x0018($sp) -/* 02D34 8092F304 03E00008 */ jr $ra -/* 02D38 8092F308 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s deleted file mode 100644 index e4644fbc4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s +++ /dev/null @@ -1,32 +0,0 @@ -.late_rodata -glabel D_809379C8 - .word 0x3C4CCCCD - -.text -glabel func_8092F30C -/* 02D3C 8092F30C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D40 8092F310 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02D44 8092F314 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02D48 8092F318 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02D4C 8092F31C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 02D50 8092F320 AFA70018 */ sw $a3, 0x0018($sp) -/* 02D54 8092F324 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02D58 8092F328 0C029490 */ jal Animation_MorphToPlayOnce -/* 02D5C 8092F32C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 02D60 8092F330 8FA70018 */ lw $a3, 0x0018($sp) -/* 02D64 8092F334 240E00A0 */ addiu $t6, $zero, 0x00A0 ## $t6 = 000000A0 -/* 02D68 8092F338 3C018093 */ lui $at, %hi(D_809379C8) ## $at = 80930000 -/* 02D6C 8092F33C 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 -/* 02D70 8092F340 A4EE0198 */ sh $t6, 0x0198($a3) ## 00000198 -/* 02D74 8092F344 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02D78 8092F348 A4EF01A4 */ sh $t7, 0x01A4($a3) ## 000001A4 -/* 02D7C 8092F34C 0C24BB1D */ jal func_8092EC74 -/* 02D80 8092F350 C42C79C8 */ lwc1 $f12, %lo(D_809379C8)($at) -/* 02D84 8092F354 8FA70018 */ lw $a3, 0x0018($sp) -/* 02D88 8092F358 3C188093 */ lui $t8, %hi(func_8092F374) ## $t8 = 80930000 -/* 02D8C 8092F35C 2718F374 */ addiu $t8, $t8, %lo(func_8092F374) ## $t8 = 8092F374 -/* 02D90 8092F360 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 02D94 8092F364 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02D98 8092F368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D9C 8092F36C 03E00008 */ jr $ra -/* 02DA0 8092F370 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s deleted file mode 100644 index 479c05a1ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_8092F374 -/* 02DA4 8092F374 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02DA8 8092F378 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02DAC 8092F37C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02DB0 8092F380 AFA5001C */ sw $a1, 0x001C($sp) -/* 02DB4 8092F384 AFA60018 */ sw $a2, 0x0018($sp) -/* 02DB8 8092F388 0C02927F */ jal SkelAnime_Update - -/* 02DBC 8092F38C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02DC0 8092F390 8FA60018 */ lw $a2, 0x0018($sp) -/* 02DC4 8092F394 84C20198 */ lh $v0, 0x0198($a2) ## 00000198 -/* 02DC8 8092F398 10400003 */ beq $v0, $zero, .L8092F3A8 -/* 02DCC 8092F39C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02DD0 8092F3A0 A4CE0198 */ sh $t6, 0x0198($a2) ## 00000198 -/* 02DD4 8092F3A4 84C20198 */ lh $v0, 0x0198($a2) ## 00000198 -.L8092F3A8: -/* 02DD8 8092F3A8 14400009 */ bne $v0, $zero, .L8092F3D0 -/* 02DDC 8092F3AC 28410050 */ slti $at, $v0, 0x0050 -/* 02DE0 8092F3B0 84CF01A4 */ lh $t7, 0x01A4($a2) ## 000001A4 -/* 02DE4 8092F3B4 84D800B6 */ lh $t8, 0x00B6($a2) ## 000000B6 -/* 02DE8 8092F3B8 15F80005 */ bne $t7, $t8, .L8092F3D0 -/* 02DEC 8092F3BC 00000000 */ nop -/* 02DF0 8092F3C0 0C24BCFC */ jal func_8092F3F0 -/* 02DF4 8092F3C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02DF8 8092F3C8 10000006 */ beq $zero, $zero, .L8092F3E4 -/* 02DFC 8092F3CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092F3D0: -/* 02E00 8092F3D0 14200003 */ bne $at, $zero, .L8092F3E0 -/* 02E04 8092F3D4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02E08 8092F3D8 0C24BB67 */ jal func_8092ED9C -/* 02E0C 8092F3DC 8FA5001C */ lw $a1, 0x001C($sp) -.L8092F3E0: -/* 02E10 8092F3E0 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092F3E4: -/* 02E14 8092F3E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02E18 8092F3E8 03E00008 */ jr $ra -/* 02E1C 8092F3EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s deleted file mode 100644 index b24936194a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s +++ /dev/null @@ -1,23 +0,0 @@ -.late_rodata -glabel D_809379CC - .word 0x3C4CCCCD - -.text -glabel func_8092F3F0 -/* 02E20 8092F3F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02E24 8092F3F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02E28 8092F3F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 02E2C 8092F3FC 240E00A0 */ addiu $t6, $zero, 0x00A0 ## $t6 = 000000A0 -/* 02E30 8092F400 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 02E34 8092F404 3C018093 */ lui $at, %hi(D_809379CC) ## $at = 80930000 -/* 02E38 8092F408 C42C79CC */ lwc1 $f12, %lo(D_809379CC)($at) -/* 02E3C 8092F40C 0C24BB1D */ jal func_8092EC74 -/* 02E40 8092F410 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 02E44 8092F414 8FB90018 */ lw $t9, 0x0018($sp) -/* 02E48 8092F418 3C188093 */ lui $t8, %hi(func_8092F434) ## $t8 = 80930000 -/* 02E4C 8092F41C 2718F434 */ addiu $t8, $t8, %lo(func_8092F434) ## $t8 = 8092F434 -/* 02E50 8092F420 AF380190 */ sw $t8, 0x0190($t9) ## 00000190 -/* 02E54 8092F424 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02E58 8092F428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02E5C 8092F42C 03E00008 */ jr $ra -/* 02E60 8092F430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s deleted file mode 100644 index 1b659dfacb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s +++ /dev/null @@ -1,154 +0,0 @@ -.late_rodata -glabel D_809379D0 - .word 0x3C4CCCCD - -.text -glabel func_8092F434 -/* 02E64 8092F434 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02E68 8092F438 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02E6C 8092F43C 84860198 */ lh $a2, 0x0198($a0) ## 00000198 -/* 02E70 8092F440 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -/* 02E74 8092F444 10C00003 */ beq $a2, $zero, .L8092F454 -/* 02E78 8092F448 24CEFFFF */ addiu $t6, $a2, 0xFFFF ## $t6 = FFFFFFFF -/* 02E7C 8092F44C A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 02E80 8092F450 84860198 */ lh $a2, 0x0198($a0) ## 00000198 -.L8092F454: -/* 02E84 8092F454 28C10050 */ slti $at, $a2, 0x0050 -/* 02E88 8092F458 1420001C */ bne $at, $zero, .L8092F4CC -/* 02E8C 8092F45C 00E66023 */ subu $t4, $a3, $a2 -/* 02E90 8092F460 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -/* 02E94 8092F464 14E60003 */ bne $a3, $a2, .L8092F474 -/* 02E98 8092F468 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02E9C 8092F46C 3C018093 */ lui $at, %hi(D_80937448) ## $at = 80930000 -/* 02EA0 8092F470 AC2F7448 */ sw $t7, %lo(D_80937448)($at) -.L8092F474: -/* 02EA4 8092F474 0C24BB67 */ jal func_8092ED9C -/* 02EA8 8092F478 AFA40018 */ sw $a0, 0x0018($sp) -/* 02EAC 8092F47C 8FA40018 */ lw $a0, 0x0018($sp) -/* 02EB0 8092F480 3C038093 */ lui $v1, %hi(D_80937464) ## $v1 = 80930000 -/* 02EB4 8092F484 24637464 */ addiu $v1, $v1, %lo(D_80937464) ## $v1 = 80937464 -/* 02EB8 8092F488 84980198 */ lh $t8, 0x0198($a0) ## 00000198 -/* 02EBC 8092F48C 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 -/* 02EC0 8092F490 3C018093 */ lui $at, %hi(D_809379D0) ## $at = 80930000 -/* 02EC4 8092F494 0018C880 */ sll $t9, $t8, 2 -/* 02EC8 8092F498 0338C823 */ subu $t9, $t9, $t8 -/* 02ECC 8092F49C 272AFF10 */ addiu $t2, $t9, 0xFF10 ## $t2 = FFFFFF10 -/* 02ED0 8092F4A0 A06A0002 */ sb $t2, 0x0002($v1) ## 80937466 -/* 02ED4 8092F4A4 A06A0001 */ sb $t2, 0x0001($v1) ## 80937465 -/* 02ED8 8092F4A8 A06A0000 */ sb $t2, 0x0000($v1) ## 80937464 -/* 02EDC 8092F4AC 848B0198 */ lh $t3, 0x0198($a0) ## 00000198 -/* 02EE0 8092F4B0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 02EE4 8092F4B4 54EB0066 */ bnel $a3, $t3, .L8092F650 -/* 02EE8 8092F4B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02EEC 8092F4BC 0C24BB1D */ jal func_8092EC74 -/* 02EF0 8092F4C0 C42C79D0 */ lwc1 $f12, %lo(D_809379D0)($at) -/* 02EF4 8092F4C4 10000062 */ beq $zero, $zero, .L8092F650 -/* 02EF8 8092F4C8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092F4CC: -/* 02EFC 8092F4CC 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 02F00 8092F4D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 02F04 8092F4D4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 02F08 8092F4D8 468021A0 */ cvt.s.w $f6, $f4 -/* 02F0C 8092F4DC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02F10 8092F4E0 3C028093 */ lui $v0, %hi(D_80937468) ## $v0 = 80930000 -/* 02F14 8092F4E4 3C038093 */ lui $v1, %hi(D_80937464) ## $v1 = 80930000 -/* 02F18 8092F4E8 24637464 */ addiu $v1, $v1, %lo(D_80937464) ## $v1 = 80937464 -/* 02F1C 8092F4EC 24427468 */ addiu $v0, $v0, %lo(D_80937468) ## $v0 = 80937468 -/* 02F20 8092F4F0 46083282 */ mul.s $f10, $f6, $f8 -/* 02F24 8092F4F4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02F28 8092F4F8 444DF800 */ cfc1 $t5, $31 -/* 02F2C 8092F4FC 44CEF800 */ ctc1 $t6, $31 -/* 02F30 8092F500 00000000 */ nop -/* 02F34 8092F504 46005424 */ cvt.w.s $f16, $f10 -/* 02F38 8092F508 444EF800 */ cfc1 $t6, $31 -/* 02F3C 8092F50C 00000000 */ nop -/* 02F40 8092F510 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 02F44 8092F514 51C00013 */ beql $t6, $zero, .L8092F564 -/* 02F48 8092F518 440E8000 */ mfc1 $t6, $f16 -/* 02F4C 8092F51C 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 02F50 8092F520 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02F54 8092F524 46105401 */ sub.s $f16, $f10, $f16 -/* 02F58 8092F528 44CEF800 */ ctc1 $t6, $31 -/* 02F5C 8092F52C 00000000 */ nop -/* 02F60 8092F530 46008424 */ cvt.w.s $f16, $f16 -/* 02F64 8092F534 444EF800 */ cfc1 $t6, $31 -/* 02F68 8092F538 00000000 */ nop -/* 02F6C 8092F53C 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 02F70 8092F540 15C00005 */ bne $t6, $zero, .L8092F558 -/* 02F74 8092F544 00000000 */ nop -/* 02F78 8092F548 440E8000 */ mfc1 $t6, $f16 -/* 02F7C 8092F54C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02F80 8092F550 10000007 */ beq $zero, $zero, .L8092F570 -/* 02F84 8092F554 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 -.L8092F558: -/* 02F88 8092F558 10000005 */ beq $zero, $zero, .L8092F570 -/* 02F8C 8092F55C 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 02F90 8092F560 440E8000 */ mfc1 $t6, $f16 -.L8092F564: -/* 02F94 8092F564 00000000 */ nop -/* 02F98 8092F568 05C0FFFB */ bltz $t6, .L8092F558 -/* 02F9C 8092F56C 00000000 */ nop -.L8092F570: -/* 02FA0 8092F570 A06E0002 */ sb $t6, 0x0002($v1) ## 80937466 -/* 02FA4 8092F574 848F0198 */ lh $t7, 0x0198($a0) ## 00000198 -/* 02FA8 8092F578 44CDF800 */ ctc1 $t5, $31 -/* 02FAC 8092F57C 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 02FB0 8092F580 00EFC023 */ subu $t8, $a3, $t7 -/* 02FB4 8092F584 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 -/* 02FB8 8092F588 44813000 */ mtc1 $at, $f6 ## $f6 = 0.12 -/* 02FBC 8092F58C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02FC0 8092F590 46809120 */ cvt.s.w $f4, $f18 -/* 02FC4 8092F594 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02FC8 8092F598 46062202 */ mul.s $f8, $f4, $f6 -/* 02FCC 8092F59C 4459F800 */ cfc1 $t9, $31 -/* 02FD0 8092F5A0 44C8F800 */ ctc1 $t0, $31 -/* 02FD4 8092F5A4 00000000 */ nop -/* 02FD8 8092F5A8 460042A4 */ cvt.w.s $f10, $f8 -/* 02FDC 8092F5AC 4448F800 */ cfc1 $t0, $31 -/* 02FE0 8092F5B0 00000000 */ nop -/* 02FE4 8092F5B4 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 02FE8 8092F5B8 51000013 */ beql $t0, $zero, .L8092F608 -/* 02FEC 8092F5BC 44085000 */ mfc1 $t0, $f10 -/* 02FF0 8092F5C0 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 02FF4 8092F5C4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02FF8 8092F5C8 460A4281 */ sub.s $f10, $f8, $f10 -/* 02FFC 8092F5CC 44C8F800 */ ctc1 $t0, $31 -/* 03000 8092F5D0 00000000 */ nop -/* 03004 8092F5D4 460052A4 */ cvt.w.s $f10, $f10 -/* 03008 8092F5D8 4448F800 */ cfc1 $t0, $31 -/* 0300C 8092F5DC 00000000 */ nop -/* 03010 8092F5E0 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 03014 8092F5E4 15000005 */ bne $t0, $zero, .L8092F5FC -/* 03018 8092F5E8 00000000 */ nop -/* 0301C 8092F5EC 44085000 */ mfc1 $t0, $f10 -/* 03020 8092F5F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03024 8092F5F4 10000007 */ beq $zero, $zero, .L8092F614 -/* 03028 8092F5F8 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L8092F5FC: -/* 0302C 8092F5FC 10000005 */ beq $zero, $zero, .L8092F614 -/* 03030 8092F600 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 03034 8092F604 44085000 */ mfc1 $t0, $f10 -.L8092F608: -/* 03038 8092F608 00000000 */ nop -/* 0303C 8092F60C 0500FFFB */ bltz $t0, .L8092F5FC -/* 03040 8092F610 00000000 */ nop -.L8092F614: -/* 03044 8092F614 44D9F800 */ ctc1 $t9, $31 -/* 03048 8092F618 A0480002 */ sb $t0, 0x0002($v0) ## 8093746A -/* 0304C 8092F61C A0480001 */ sb $t0, 0x0001($v0) ## 80937469 -/* 03050 8092F620 A0480000 */ sb $t0, 0x0000($v0) ## 80937468 -/* 03054 8092F624 A0680001 */ sb $t0, 0x0001($v1) ## 80937465 -/* 03058 8092F628 A0680000 */ sb $t0, 0x0000($v1) ## 80937464 -/* 0305C 8092F62C 0C24BB67 */ jal func_8092ED9C -/* 03060 8092F630 AFA40018 */ sw $a0, 0x0018($sp) -/* 03064 8092F634 8FA40018 */ lw $a0, 0x0018($sp) -/* 03068 8092F638 848D0198 */ lh $t5, 0x0198($a0) ## 00000198 -/* 0306C 8092F63C 55A00004 */ bnel $t5, $zero, .L8092F650 -/* 03070 8092F640 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03074 8092F644 0C24BD97 */ jal func_8092F65C -/* 03078 8092F648 00000000 */ nop -/* 0307C 8092F64C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092F650: -/* 03080 8092F650 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03084 8092F654 03E00008 */ jr $ra -/* 03088 8092F658 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s deleted file mode 100644 index 83f874d6d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_8092F65C -/* 0308C 8092F65C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03090 8092F660 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 03094 8092F664 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03098 8092F668 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0309C 8092F66C AFA40018 */ sw $a0, 0x0018($sp) -/* 030A0 8092F670 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 030A4 8092F674 3C048093 */ lui $a0, %hi(D_8093734C) ## $a0 = 80930000 -/* 030A8 8092F678 3C058093 */ lui $a1, %hi(D_809373A0) ## $a1 = 80930000 -/* 030AC 8092F67C 24A573A0 */ addiu $a1, $a1, %lo(D_809373A0) ## $a1 = 809373A0 -/* 030B0 8092F680 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 030B4 8092F684 2484734C */ addiu $a0, $a0, %lo(D_8093734C) ## $a0 = 8093734C -/* 030B8 8092F688 3C048093 */ lui $a0, %hi(D_80937358) ## $a0 = 80930000 -/* 030BC 8092F68C 3C058093 */ lui $a1, %hi(D_80937400) ## $a1 = 80930000 -/* 030C0 8092F690 24A57400 */ addiu $a1, $a1, %lo(D_80937400) ## $a1 = 80937400 -/* 030C4 8092F694 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 030C8 8092F698 24847358 */ addiu $a0, $a0, %lo(D_80937358) ## $a0 = 80937358 -/* 030CC 8092F69C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 030D0 8092F6A0 3C028093 */ lui $v0, %hi(D_80937364) ## $v0 = 80930000 -/* 030D4 8092F6A4 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 030D8 8092F6A8 44813000 */ mtc1 $at, $f6 ## $f6 = -50.00 -/* 030DC 8092F6AC 24427364 */ addiu $v0, $v0, %lo(D_80937364) ## $v0 = 80937364 -/* 030E0 8092F6B0 3C048093 */ lui $a0, %hi(D_80937370) ## $a0 = 80930000 -/* 030E4 8092F6B4 3C058093 */ lui $a1, %hi(D_8093743C) ## $a1 = 80930000 -/* 030E8 8092F6B8 24A5743C */ addiu $a1, $a1, %lo(D_8093743C) ## $a1 = 8093743C -/* 030EC 8092F6BC 24847370 */ addiu $a0, $a0, %lo(D_80937370) ## $a0 = 80937370 -/* 030F0 8092F6C0 E4400000 */ swc1 $f0, 0x0000($v0) ## 80937364 -/* 030F4 8092F6C4 E4400008 */ swc1 $f0, 0x0008($v0) ## 8093736C -/* 030F8 8092F6C8 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 030FC 8092F6CC E4460004 */ swc1 $f6, 0x0004($v0) ## 80937368 -/* 03100 8092F6D0 8FB80018 */ lw $t8, 0x0018($sp) -/* 03104 8092F6D4 3C0F8093 */ lui $t7, %hi(func_8092F6F0) ## $t7 = 80930000 -/* 03108 8092F6D8 25EFF6F0 */ addiu $t7, $t7, %lo(func_8092F6F0) ## $t7 = 8092F6F0 -/* 0310C 8092F6DC AF0F0190 */ sw $t7, 0x0190($t8) ## 00000190 -/* 03110 8092F6E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03114 8092F6E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03118 8092F6E8 03E00008 */ jr $ra -/* 0311C 8092F6EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s deleted file mode 100644 index d1843266eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_8092F6F0 -/* 03120 8092F6F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03124 8092F6F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03128 8092F6F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0312C 8092F6FC 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 03130 8092F700 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 03134 8092F704 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 03138 8092F708 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0313C 8092F70C 3C014366 */ lui $at, 0x4366 ## $at = 43660000 -/* 03140 8092F710 46062202 */ mul.s $f8, $f4, $f6 -/* 03144 8092F714 44818000 */ mtc1 $at, $f16 ## $f16 = 230.00 -/* 03148 8092F718 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 0314C 8092F71C E4880040 */ swc1 $f8, 0x0040($a0) ## 00000068 -/* 03150 8092F720 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -/* 03154 8092F724 8CE60068 */ lw $a2, 0x0068($a3) ## 00000068 -/* 03158 8092F728 AFA70018 */ sw $a3, 0x0018($sp) -/* 0315C 8092F72C 46105481 */ sub.s $f18, $f10, $f16 -/* 03160 8092F730 44059000 */ mfc1 $a1, $f18 -/* 03164 8092F734 0C01DE80 */ jal Math_StepToF - -/* 03168 8092F738 00000000 */ nop -/* 0316C 8092F73C 10400005 */ beq $v0, $zero, .L8092F754 -/* 03170 8092F740 8FA70018 */ lw $a3, 0x0018($sp) -/* 03174 8092F744 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03178 8092F748 0C24BDE4 */ jal func_8092F790 -/* 0317C 8092F74C AFA70018 */ sw $a3, 0x0018($sp) -/* 03180 8092F750 8FA70018 */ lw $a3, 0x0018($sp) -.L8092F754: -/* 03184 8092F754 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 03188 8092F758 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 0318C 8092F75C 3C018093 */ lui $at, %hi(D_80937350) ## $at = 80930000 -/* 03190 8092F760 C4267350 */ lwc1 $f6, %lo(D_80937350)($at) -/* 03194 8092F764 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 03198 8092F768 4606203C */ c.lt.s $f4, $f6 -/* 0319C 8092F76C 00000000 */ nop -/* 031A0 8092F770 45020004 */ bc1fl .L8092F784 -/* 031A4 8092F774 8FBF0014 */ lw $ra, 0x0014($sp) -/* 031A8 8092F778 0C24BB67 */ jal func_8092ED9C -/* 031AC 8092F77C 8FA5001C */ lw $a1, 0x001C($sp) -/* 031B0 8092F780 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092F784: -/* 031B4 8092F784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 031B8 8092F788 03E00008 */ jr $ra -/* 031BC 8092F78C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s deleted file mode 100644 index abb5a1941f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s +++ /dev/null @@ -1,25 +0,0 @@ -.late_rodata -glabel D_809379D4 - .float 0.0166666675359 - -.text -glabel func_8092F790 -/* 031C0 8092F790 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 031C4 8092F794 AFBF0014 */ sw $ra, 0x0014($sp) -/* 031C8 8092F798 0C24D5D9 */ jal func_80935764 -/* 031CC 8092F79C AFA40018 */ sw $a0, 0x0018($sp) -/* 031D0 8092F7A0 8FAF0018 */ lw $t7, 0x0018($sp) -/* 031D4 8092F7A4 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 -/* 031D8 8092F7A8 3C018093 */ lui $at, %hi(D_809379D4) ## $at = 80930000 -/* 031DC 8092F7AC A5EE0198 */ sh $t6, 0x0198($t7) ## 00000198 -/* 031E0 8092F7B0 C42C79D4 */ lwc1 $f12, %lo(D_809379D4)($at) -/* 031E4 8092F7B4 0C24BB1D */ jal func_8092EC74 -/* 031E8 8092F7B8 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 031EC 8092F7BC 8FB90018 */ lw $t9, 0x0018($sp) -/* 031F0 8092F7C0 3C188093 */ lui $t8, %hi(func_8092F7DC) ## $t8 = 80930000 -/* 031F4 8092F7C4 2718F7DC */ addiu $t8, $t8, %lo(func_8092F7DC) ## $t8 = 8092F7DC -/* 031F8 8092F7C8 AF380190 */ sw $t8, 0x0190($t9) ## 00000190 -/* 031FC 8092F7CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03200 8092F7D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03204 8092F7D4 03E00008 */ jr $ra -/* 03208 8092F7D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s deleted file mode 100644 index d7208b89de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s +++ /dev/null @@ -1,59 +0,0 @@ -.late_rodata -glabel D_809379D8 - .word 0x389D4952 -glabel D_809379DC - .word 0x3983126F -glabel D_809379E0 - .word 0x4633B000 - -.text -glabel func_8092F7DC -/* 0320C 8092F7DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03210 8092F7E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03214 8092F7E4 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 03218 8092F7E8 3C018093 */ lui $at, %hi(D_809379D8) ## $at = 80930000 -/* 0321C 8092F7EC 10400003 */ beq $v0, $zero, .L8092F7FC -/* 03220 8092F7F0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 03224 8092F7F4 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 03228 8092F7F8 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -.L8092F7FC: -/* 0322C 8092F7FC C42079D8 */ lwc1 $f0, %lo(D_809379D8)($at) -/* 03230 8092F800 3C018093 */ lui $at, %hi(D_809379DC) ## $at = 80930000 -/* 03234 8092F804 C42679DC */ lwc1 $f6, %lo(D_809379DC)($at) -/* 03238 8092F808 C4840054 */ lwc1 $f4, 0x0054($a0) ## 00000054 -/* 0323C 8092F80C C48A0050 */ lwc1 $f10, 0x0050($a0) ## 00000050 -/* 03240 8092F810 C4920058 */ lwc1 $f18, 0x0058($a0) ## 00000058 -/* 03244 8092F814 46062201 */ sub.s $f8, $f4, $f6 -/* 03248 8092F818 3C018093 */ lui $at, %hi(D_809379E0) ## $at = 80930000 -/* 0324C 8092F81C 46005400 */ add.s $f16, $f10, $f0 -/* 03250 8092F820 E4880054 */ swc1 $f8, 0x0054($a0) ## 00000054 -/* 03254 8092F824 C4880054 */ lwc1 $f8, 0x0054($a0) ## 00000054 -/* 03258 8092F828 46009100 */ add.s $f4, $f18, $f0 -/* 0325C 8092F82C E4900050 */ swc1 $f16, 0x0050($a0) ## 00000050 -/* 03260 8092F830 C490000C */ lwc1 $f16, 0x000C($a0) ## 0000000C -/* 03264 8092F834 E4840058 */ swc1 $f4, 0x0058($a0) ## 00000058 -/* 03268 8092F838 C42679E0 */ lwc1 $f6, %lo(D_809379E0)($at) -/* 0326C 8092F83C 46083282 */ mul.s $f10, $f6, $f8 -/* 03270 8092F840 460A8481 */ sub.s $f18, $f16, $f10 -/* 03274 8092F844 14400005 */ bne $v0, $zero, .L8092F85C -/* 03278 8092F848 E4920028 */ swc1 $f18, 0x0028($a0) ## 00000028 -/* 0327C 8092F84C 0C24BE25 */ jal func_8092F894 -/* 03280 8092F850 00000000 */ nop -/* 03284 8092F854 1000000C */ beq $zero, $zero, .L8092F888 -/* 03288 8092F858 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092F85C: -/* 0328C 8092F85C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03290 8092F860 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 03294 8092F864 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 03298 8092F868 468021A0 */ cvt.s.w $f6, $f4 -/* 0329C 8092F86C 4606403E */ c.le.s $f8, $f6 -/* 032A0 8092F870 00000000 */ nop -/* 032A4 8092F874 45020004 */ bc1fl .L8092F888 -/* 032A8 8092F878 8FBF0014 */ lw $ra, 0x0014($sp) -/* 032AC 8092F87C 0C24BB67 */ jal func_8092ED9C -/* 032B0 8092F880 00000000 */ nop -/* 032B4 8092F884 8FBF0014 */ lw $ra, 0x0014($sp) -.L8092F888: -/* 032B8 8092F888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 032BC 8092F88C 03E00008 */ jr $ra -/* 032C0 8092F890 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s deleted file mode 100644 index 7d40c2d031..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s +++ /dev/null @@ -1,30 +0,0 @@ -.late_rodata -glabel D_809379E4 - .float 0.025 - -.text -glabel func_8092F894 -/* 032C4 8092F894 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 032C8 8092F898 AFBF0014 */ sw $ra, 0x0014($sp) -/* 032CC 8092F89C 3C0E8093 */ lui $t6, %hi(func_8093639C) ## $t6 = 80930000 -/* 032D0 8092F8A0 25CE639C */ addiu $t6, $t6, %lo(func_8093639C) ## $t6 = 8093639C -/* 032D4 8092F8A4 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 032D8 8092F8A8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 032DC 8092F8AC AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 -/* 032E0 8092F8B0 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 032E4 8092F8B4 AFA50018 */ sw $a1, 0x0018($sp) -/* 032E8 8092F8B8 0C03E803 */ jal Audio_SetBGM - -/* 032EC 8092F8BC 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 -/* 032F0 8092F8C0 3C018093 */ lui $at, %hi(D_809379E4) ## $at = 80930000 -/* 032F4 8092F8C4 C42C79E4 */ lwc1 $f12, %lo(D_809379E4)($at) -/* 032F8 8092F8C8 0C24BB1D */ jal func_8092EC74 -/* 032FC 8092F8CC 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 03300 8092F8D0 8FB90018 */ lw $t9, 0x0018($sp) -/* 03304 8092F8D4 3C188093 */ lui $t8, %hi(func_8092F8F0) ## $t8 = 80930000 -/* 03308 8092F8D8 2718F8F0 */ addiu $t8, $t8, %lo(func_8092F8F0) ## $t8 = 8092F8F0 -/* 0330C 8092F8DC AF380190 */ sw $t8, 0x0190($t9) ## 00000190 -/* 03310 8092F8E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03314 8092F8E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03318 8092F8E8 03E00008 */ jr $ra -/* 0331C 8092F8EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s deleted file mode 100644 index 2b20b47f82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s +++ /dev/null @@ -1,207 +0,0 @@ -glabel func_8092F8F0 -/* 03320 8092F8F0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03324 8092F8F4 AFBF0064 */ sw $ra, 0x0064($sp) -/* 03328 8092F8F8 AFB60060 */ sw $s6, 0x0060($sp) -/* 0332C 8092F8FC AFB5005C */ sw $s5, 0x005C($sp) -/* 03330 8092F900 AFB40058 */ sw $s4, 0x0058($sp) -/* 03334 8092F904 AFB30054 */ sw $s3, 0x0054($sp) -/* 03338 8092F908 AFB20050 */ sw $s2, 0x0050($sp) -/* 0333C 8092F90C AFB1004C */ sw $s1, 0x004C($sp) -/* 03340 8092F910 AFB00048 */ sw $s0, 0x0048($sp) -/* 03344 8092F914 F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 03348 8092F918 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 0334C 8092F91C F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 03350 8092F920 848E0198 */ lh $t6, 0x0198($a0) ## 00000198 -/* 03354 8092F924 90980196 */ lbu $t8, 0x0196($a0) ## 00000196 -/* 03358 8092F928 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0335C 8092F92C 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 03360 8092F930 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 03364 8092F934 1700002E */ bne $t8, $zero, .L8092F9F0 -/* 03368 8092F938 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 0336C 8092F93C 84990198 */ lh $t9, 0x0198($a0) ## 00000198 -/* 03370 8092F940 2B21FF56 */ slti $at, $t9, 0xFF56 -/* 03374 8092F944 10200028 */ beq $at, $zero, .L8092F9E8 -/* 03378 8092F948 00000000 */ nop -/* 0337C 8092F94C 0C24BB67 */ jal func_8092ED9C -/* 03380 8092F950 00000000 */ nop -/* 03384 8092F954 3C118094 */ lui $s1, %hi(D_80938CC4) ## $s1 = 80940000 -/* 03388 8092F958 26318CC4 */ addiu $s1, $s1, %lo(D_80938CC4) ## $s1 = 80938CC4 -/* 0338C 8092F95C 86260000 */ lh $a2, 0x0000($s1) ## 80938CC4 -/* 03390 8092F960 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 03394 8092F964 0C0301E3 */ jal Gameplay_CopyCamera -/* 03398 8092F968 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0339C 8092F96C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 033A0 8092F970 86250000 */ lh $a1, 0x0000($s1) ## 80938CC4 -/* 033A4 8092F974 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 033A8 8092F978 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 033AC 8092F97C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 033B0 8092F980 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 033B4 8092F984 0C0300C5 */ jal Gameplay_ChangeCameraStatus -/* 033B8 8092F988 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 033BC 8092F98C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 033C0 8092F990 0C0300E1 */ jal Gameplay_ClearCamera -/* 033C4 8092F994 86250000 */ lh $a1, 0x0000($s1) ## 80938CC4 -/* 033C8 8092F998 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 033CC 8092F99C 8EC51C44 */ lw $a1, 0x1C44($s6) ## 00001C44 -/* 033D0 8092F9A0 0C00B7D5 */ jal func_8002DF54 -/* 033D4 8092F9A4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 033D8 8092F9A8 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 033DC 8092F9AC 0C01914D */ jal func_80064534 -/* 033E0 8092F9B0 26C51D64 */ addiu $a1, $s6, 0x1D64 ## $a1 = 00001D64 -/* 033E4 8092F9B4 0C00B55C */ jal Actor_Kill - -/* 033E8 8092F9B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033EC 8092F9BC 3C118094 */ lui $s1, %hi(D_80938C98) ## $s1 = 80940000 -/* 033F0 8092F9C0 26318C98 */ addiu $s1, $s1, %lo(D_80938C98) ## $s1 = 80938C98 -/* 033F4 8092F9C4 0C00B55C */ jal Actor_Kill - -/* 033F8 8092F9C8 8E240000 */ lw $a0, 0x0000($s1) ## 80938C98 -/* 033FC 8092F9CC 0C00B55C */ jal Actor_Kill - -/* 03400 8092F9D0 8E240004 */ lw $a0, 0x0004($s1) ## 80938C9C -/* 03404 8092F9D4 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 03408 8092F9D8 00B62821 */ addu $a1, $a1, $s6 -/* 0340C 8092F9DC 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC -/* 03410 8092F9E0 0C00B33C */ jal Flags_SetClear - -/* 03414 8092F9E4 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -.L8092F9E8: -/* 03418 8092F9E8 10000042 */ beq $zero, $zero, .L8092FAF4 -/* 0341C 8092F9EC 92020724 */ lbu $v0, 0x0724($s0) ## 00000724 -.L8092F9F0: -/* 03420 8092F9F0 92020724 */ lbu $v0, 0x0724($s0) ## 00000724 -/* 03424 8092F9F4 26D11C24 */ addiu $s1, $s6, 0x1C24 ## $s1 = 00001C24 -/* 03428 8092F9F8 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 0342C 8092F9FC 1440002B */ bne $v0, $zero, .L8092FAAC -/* 03430 8092FA00 02202025 */ or $a0, $s1, $zero ## $a0 = 00001C24 -/* 03434 8092FA04 4481C000 */ mtc1 $at, $f24 ## $f24 = -50.00 -/* 03438 8092FA08 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 0343C 8092FA0C 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 03440 8092FA10 4407C000 */ mfc1 $a3, $f24 -/* 03444 8092FA14 AFA80024 */ sw $t0, 0x0024($sp) -/* 03448 8092FA18 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 -/* 0344C 8092FA1C 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D -/* 03450 8092FA20 AFA00018 */ sw $zero, 0x0018($sp) -/* 03454 8092FA24 AFA0001C */ sw $zero, 0x001C($sp) -/* 03458 8092FA28 AFA00020 */ sw $zero, 0x0020($sp) -/* 0345C 8092FA2C E7B60010 */ swc1 $f22, 0x0010($sp) -/* 03460 8092FA30 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 03464 8092FA34 E7B60014 */ swc1 $f22, 0x0014($sp) -/* 03468 8092FA38 0C01DE1C */ jal Math_SinS - ## sins? -/* 0346C 8092FA3C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03470 8092FA40 46000506 */ mov.s $f20, $f0 -/* 03474 8092FA44 0C01DE0D */ jal Math_CosS - ## coss? -/* 03478 8092FA48 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0347C 8092FA4C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 03480 8092FA50 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 03484 8092FA54 02202025 */ or $a0, $s1, $zero ## $a0 = 00001C24 -/* 03488 8092FA58 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 -/* 0348C 8092FA5C 4602A102 */ mul.s $f4, $f20, $f2 -/* 03490 8092FA60 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F -/* 03494 8092FA64 E7B60010 */ swc1 $f22, 0x0010($sp) -/* 03498 8092FA68 46020202 */ mul.s $f8, $f0, $f2 -/* 0349C 8092FA6C AFA00018 */ sw $zero, 0x0018($sp) -/* 034A0 8092FA70 AFA0001C */ sw $zero, 0x001C($sp) -/* 034A4 8092FA74 AFA00020 */ sw $zero, 0x0020($sp) -/* 034A8 8092FA78 AFA00024 */ sw $zero, 0x0024($sp) -/* 034AC 8092FA7C 46182180 */ add.s $f6, $f4, $f24 -/* 034B0 8092FA80 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 034B4 8092FA84 44073000 */ mfc1 $a3, $f6 -/* 034B8 8092FA88 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 034BC 8092FA8C 00000000 */ nop -/* 034C0 8092FA90 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 034C4 8092FA94 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 034C8 8092FA98 0C24BB1D */ jal func_8092EC74 -/* 034CC 8092FA9C 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 034D0 8092FAA0 A2000196 */ sb $zero, 0x0196($s0) ## 00000196 -/* 034D4 8092FAA4 10000013 */ beq $zero, $zero, .L8092FAF4 -/* 034D8 8092FAA8 92020724 */ lbu $v0, 0x0724($s0) ## 00000724 -.L8092FAAC: -/* 034DC 8092FAAC 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 034E0 8092FAB0 14600007 */ bne $v1, $zero, .L8092FAD0 -/* 034E4 8092FAB4 00000000 */ nop -/* 034E8 8092FAB8 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF -/* 034EC 8092FABC A6000722 */ sh $zero, 0x0722($s0) ## 00000722 -/* 034F0 8092FAC0 A603074A */ sh $v1, 0x074A($s0) ## 0000074A -/* 034F4 8092FAC4 A6030772 */ sh $v1, 0x0772($s0) ## 00000772 -/* 034F8 8092FAC8 1000000A */ beq $zero, $zero, .L8092FAF4 -/* 034FC 8092FACC 92020724 */ lbu $v0, 0x0724($s0) ## 00000724 -.L8092FAD0: -/* 03500 8092FAD0 18600008 */ blez $v1, .L8092FAF4 -/* 03504 8092FAD4 00000000 */ nop -/* 03508 8092FAD8 86090722 */ lh $t1, 0x0722($s0) ## 00000722 -/* 0350C 8092FADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03510 8092FAE0 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 -/* 03514 8092FAE4 252A0005 */ addiu $t2, $t1, 0x0005 ## $t2 = 00000005 -/* 03518 8092FAE8 0C24BB67 */ jal func_8092ED9C -/* 0351C 8092FAEC A60A0722 */ sh $t2, 0x0722($s0) ## 00000722 -/* 03520 8092FAF0 92020724 */ lbu $v0, 0x0724($s0) ## 00000724 -.L8092FAF4: -/* 03524 8092FAF4 3C018093 */ lui $at, %hi(D_8093789B) ## $at = 80930000 -/* 03528 8092FAF8 A022789B */ sb $v0, %lo(D_8093789B)($at) -/* 0352C 8092FAFC 920B0724 */ lbu $t3, 0x0724($s0) ## 00000724 -/* 03530 8092FB00 3C018093 */ lui $at, %hi(D_8093789F) ## $at = 80930000 -/* 03534 8092FB04 3C108093 */ lui $s0, %hi(D_80937340) ## $s0 = 80930000 -/* 03538 8092FB08 A02B789F */ sb $t3, %lo(D_8093789F)($at) -/* 0353C 8092FB0C 3C01C1E0 */ lui $at, 0xC1E0 ## $at = C1E00000 -/* 03540 8092FB10 4481C000 */ mtc1 $at, $f24 ## $f24 = -28.00 -/* 03544 8092FB14 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 03548 8092FB18 4481B000 */ mtc1 $at, $f22 ## $f22 = 5.00 -/* 0354C 8092FB1C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 03550 8092FB20 3C148093 */ lui $s4, %hi(D_8093789C) ## $s4 = 80930000 -/* 03554 8092FB24 3C138093 */ lui $s3, %hi(D_80937898) ## $s3 = 80930000 -/* 03558 8092FB28 4481A000 */ mtc1 $at, $f20 ## $f20 = 800.00 -/* 0355C 8092FB2C 26737898 */ addiu $s3, $s3, %lo(D_80937898) ## $s3 = 80937898 -/* 03560 8092FB30 2694789C */ addiu $s4, $s4, %lo(D_8093789C) ## $s4 = 8093789C -/* 03564 8092FB34 26107340 */ addiu $s0, $s0, %lo(D_80937340) ## $s0 = 80937340 -/* 03568 8092FB38 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 0356C 8092FB3C 24150005 */ addiu $s5, $zero, 0x0005 ## $s5 = 00000005 -/* 03570 8092FB40 27B2007C */ addiu $s2, $sp, 0x007C ## $s2 = FFFFFFF4 -.L8092FB44: -/* 03574 8092FB44 0C00CFC8 */ jal Rand_CenteredFloat - -/* 03578 8092FB48 4600A306 */ mov.s $f12, $f20 -/* 0357C 8092FB4C C60A0000 */ lwc1 $f10, 0x0000($s0) ## 80937340 -/* 03580 8092FB50 460A0400 */ add.s $f16, $f0, $f10 -/* 03584 8092FB54 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 03588 8092FB58 E7B0007C */ swc1 $f16, 0x007C($sp) -/* 0358C 8092FB5C 46160482 */ mul.s $f18, $f0, $f22 -/* 03590 8092FB60 C6040004 */ lwc1 $f4, 0x0004($s0) ## 80937344 -/* 03594 8092FB64 4600A306 */ mov.s $f12, $f20 -/* 03598 8092FB68 46182180 */ add.s $f6, $f4, $f24 -/* 0359C 8092FB6C 46069200 */ add.s $f8, $f18, $f6 -/* 035A0 8092FB70 0C00CFC8 */ jal Rand_CenteredFloat - -/* 035A4 8092FB74 E7A80080 */ swc1 $f8, 0x0080($sp) -/* 035A8 8092FB78 C60A0008 */ lwc1 $f10, 0x0008($s0) ## 80937348 -/* 035AC 8092FB7C 240C03E8 */ addiu $t4, $zero, 0x03E8 ## $t4 = 000003E8 -/* 035B0 8092FB80 AFAC0014 */ sw $t4, 0x0014($sp) -/* 035B4 8092FB84 460A0400 */ add.s $f16, $f0, $f10 -/* 035B8 8092FB88 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 035BC 8092FB8C 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFF4 -/* 035C0 8092FB90 02603025 */ or $a2, $s3, $zero ## $a2 = 80937898 -/* 035C4 8092FB94 E7B00084 */ swc1 $f16, 0x0084($sp) -/* 035C8 8092FB98 02803825 */ or $a3, $s4, $zero ## $a3 = 8093789C -/* 035CC 8092FB9C 0C00A527 */ jal EffectSsGSplash_Spawn -/* 035D0 8092FBA0 AFA00010 */ sw $zero, 0x0010($sp) -/* 035D4 8092FBA4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 035D8 8092FBA8 1635FFE6 */ bne $s1, $s5, .L8092FB44 -/* 035DC 8092FBAC 00000000 */ nop -/* 035E0 8092FBB0 8FBF0064 */ lw $ra, 0x0064($sp) -/* 035E4 8092FBB4 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 035E8 8092FBB8 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 035EC 8092FBBC D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 035F0 8092FBC0 8FB00048 */ lw $s0, 0x0048($sp) -/* 035F4 8092FBC4 8FB1004C */ lw $s1, 0x004C($sp) -/* 035F8 8092FBC8 8FB20050 */ lw $s2, 0x0050($sp) -/* 035FC 8092FBCC 8FB30054 */ lw $s3, 0x0054($sp) -/* 03600 8092FBD0 8FB40058 */ lw $s4, 0x0058($sp) -/* 03604 8092FBD4 8FB5005C */ lw $s5, 0x005C($sp) -/* 03608 8092FBD8 8FB60060 */ lw $s6, 0x0060($sp) -/* 0360C 8092FBDC 03E00008 */ jr $ra -/* 03610 8092FBE0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s deleted file mode 100644 index 49e5c44103..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8092FBE4 -/* 03614 8092FBE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03618 8092FBE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0361C 8092FBEC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 03620 8092FBF0 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 03624 8092FBF4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03628 8092FBF8 000E7880 */ sll $t7, $t6, 2 -/* 0362C 8092FBFC 002F0821 */ addu $at, $at, $t7 -/* 03630 8092FC00 AC20746C */ sw $zero, %lo(D_8093746C)($at) -/* 03634 8092FC04 909803E4 */ lbu $t8, 0x03E4($a0) ## 000003E4 -/* 03638 8092FC08 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 -/* 0363C 8092FC0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03640 8092FC10 3319FFFC */ andi $t9, $t8, 0xFFFC ## $t9 = 00000000 -/* 03644 8092FC14 A0990298 */ sb $t9, 0x0298($a0) ## 000003E4 -/* 03648 8092FC18 84E8001C */ lh $t0, 0x001C($a3) ## 0000001C -/* 0364C 8092FC1C AFA70018 */ sw $a3, 0x0018($sp) -/* 03650 8092FC20 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03654 8092FC24 00084880 */ sll $t1, $t0, 2 -/* 03658 8092FC28 00A92821 */ addu $a1, $a1, $t1 -/* 0365C 8092FC2C 0C0294D3 */ jal Animation_MorphToLoop -/* 03660 8092FC30 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 03664 8092FC34 8FA70018 */ lw $a3, 0x0018($sp) -/* 03668 8092FC38 3C0B8093 */ lui $t3, %hi(func_8092FC60) ## $t3 = 80930000 -/* 0366C 8092FC3C 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 03670 8092FC40 256BFC60 */ addiu $t3, $t3, %lo(func_8092FC60) ## $t3 = 8092FC60 -/* 03674 8092FC44 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 -/* 03678 8092FC48 A4EA0198 */ sh $t2, 0x0198($a3) ## 00000198 -/* 0367C 8092FC4C ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 03680 8092FC50 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03684 8092FC54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03688 8092FC58 03E00008 */ jr $ra -/* 0368C 8092FC5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s deleted file mode 100644 index 3936bdcc1d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_8092FC60 -/* 03690 8092FC60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03694 8092FC64 AFB00018 */ sw $s0, 0x0018($sp) -/* 03698 8092FC68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0369C 8092FC6C AFBF001C */ sw $ra, 0x001C($sp) -/* 036A0 8092FC70 AFA50024 */ sw $a1, 0x0024($sp) -/* 036A4 8092FC74 0C02927F */ jal SkelAnime_Update - -/* 036A8 8092FC78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 036AC 8092FC7C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 036B0 8092FC80 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 -/* 036B4 8092FC84 0C01DE80 */ jal Math_StepToF - -/* 036B8 8092FC88 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 036BC 8092FC8C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 036C0 8092FC90 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 036C4 8092FC94 0C01DE80 */ jal Math_StepToF - -/* 036C8 8092FC98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 036CC 8092FC9C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 036D0 8092FCA0 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 036D4 8092FCA4 0C01DE80 */ jal Math_StepToF - -/* 036D8 8092FCA8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 036DC 8092FCAC 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 036E0 8092FCB0 3C198093 */ lui $t9, %hi(D_8093746C) ## $t9 = 80930000 -/* 036E4 8092FCB4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 036E8 8092FCB8 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 036EC 8092FCBC 3C028094 */ lui $v0, %hi(D_80938C90) ## $v0 = 80940000 -/* 036F0 8092FCC0 000FC080 */ sll $t8, $t7, 2 -/* 036F4 8092FCC4 0338C821 */ addu $t9, $t9, $t8 -/* 036F8 8092FCC8 8F39746C */ lw $t9, %lo(D_8093746C)($t9) -/* 036FC 8092FCCC 17210019 */ bne $t9, $at, .L8092FD34 -/* 03700 8092FCD0 00000000 */ nop -/* 03704 8092FCD4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 03708 8092FCD8 8FA80024 */ lw $t0, 0x0024($sp) -/* 0370C 8092FCDC 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 03710 8092FCE0 10400004 */ beq $v0, $zero, .L8092FCF4 -/* 03714 8092FCE4 8D031C44 */ lw $v1, 0x1C44($t0) ## 00001C44 -/* 03718 8092FCE8 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = 8093FFFF -/* 0371C 8092FCEC A6090198 */ sh $t1, 0x0198($s0) ## 00000198 -/* 03720 8092FCF0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L8092FCF4: -/* 03724 8092FCF4 54400032 */ bnel $v0, $zero, .L8092FDC0 -/* 03728 8092FCF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0372C 8092FCFC 44812000 */ mtc1 $at, $f4 ## $f4 = -50.00 -/* 03730 8092FD00 C4660028 */ lwc1 $f6, 0x0028($v1) ## 00000028 -/* 03734 8092FD04 4606203C */ c.lt.s $f4, $f6 -/* 03738 8092FD08 00000000 */ nop -/* 0373C 8092FD0C 4502002C */ bc1fl .L8092FDC0 -/* 03740 8092FD10 8FBF001C */ lw $ra, 0x001C($sp) -/* 03744 8092FD14 8C6A067C */ lw $t2, 0x067C($v1) ## 0000067C -/* 03748 8092FD18 314B6080 */ andi $t3, $t2, 0x6080 ## $t3 = 00000000 -/* 0374C 8092FD1C 55600028 */ bnel $t3, $zero, .L8092FDC0 -/* 03750 8092FD20 8FBF001C */ lw $ra, 0x001C($sp) -/* 03754 8092FD24 0C24CEE1 */ jal func_80933B84 -/* 03758 8092FD28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0375C 8092FD2C 10000024 */ beq $zero, $zero, .L8092FDC0 -/* 03760 8092FD30 8FBF001C */ lw $ra, 0x001C($sp) -.L8092FD34: -/* 03764 8092FD34 8C428C90 */ lw $v0, %lo(D_80938C90)($v0) -/* 03768 8092FD38 3C0C8093 */ lui $t4, %hi(func_8092DB4C) ## $t4 = 80930000 -/* 0376C 8092FD3C 258CDB4C */ addiu $t4, $t4, %lo(func_8092DB4C) ## $t4 = 8092DB4C -/* 03770 8092FD40 8C4D0190 */ lw $t5, 0x0190($v0) ## 00000190 -/* 03774 8092FD44 558D001E */ bnel $t4, $t5, .L8092FDC0 -/* 03778 8092FD48 8FBF001C */ lw $ra, 0x001C($sp) -/* 0377C 8092FD4C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 03780 8092FD50 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03784 8092FD54 1461000C */ bne $v1, $at, .L8092FD88 -/* 03788 8092FD58 00000000 */ nop -/* 0378C 8092FD5C 844E0198 */ lh $t6, 0x0198($v0) ## 00000198 -/* 03790 8092FD60 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 03794 8092FD64 01C1001A */ div $zero, $t6, $at -/* 03798 8092FD68 00007810 */ mfhi $t7 -/* 0379C 8092FD6C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 037A0 8092FD70 15E10005 */ bne $t7, $at, .L8092FD88 -/* 037A4 8092FD74 00000000 */ nop -/* 037A8 8092FD78 0C24BF74 */ jal func_8092FDD0 -/* 037AC 8092FD7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037B0 8092FD80 1000000F */ beq $zero, $zero, .L8092FDC0 -/* 037B4 8092FD84 8FBF001C */ lw $ra, 0x001C($sp) -.L8092FD88: -/* 037B8 8092FD88 5460000D */ bnel $v1, $zero, .L8092FDC0 -/* 037BC 8092FD8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 037C0 8092FD90 84430198 */ lh $v1, 0x0198($v0) ## 00000198 -/* 037C4 8092FD94 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 037C8 8092FD98 0061001A */ div $zero, $v1, $at -/* 037CC 8092FD9C 0000C010 */ mfhi $t8 -/* 037D0 8092FDA0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 037D4 8092FDA4 17010005 */ bne $t8, $at, .L8092FDBC -/* 037D8 8092FDA8 28610070 */ slti $at, $v1, 0x0070 -/* 037DC 8092FDAC 50200004 */ beql $at, $zero, .L8092FDC0 -/* 037E0 8092FDB0 8FBF001C */ lw $ra, 0x001C($sp) -/* 037E4 8092FDB4 0C24C039 */ jal func_809300E4 -/* 037E8 8092FDB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8092FDBC: -/* 037EC 8092FDBC 8FBF001C */ lw $ra, 0x001C($sp) -.L8092FDC0: -/* 037F0 8092FDC0 8FB00018 */ lw $s0, 0x0018($sp) -/* 037F4 8092FDC4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 037F8 8092FDC8 03E00008 */ jr $ra -/* 037FC 8092FDCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s deleted file mode 100644 index 6d6afc53d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8092FDD0 -/* 03800 8092FDD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03804 8092FDD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03808 8092FDD8 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 0380C 8092FDDC 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 03810 8092FDE0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03814 8092FDE4 000FC080 */ sll $t8, $t7, 2 -/* 03818 8092FDE8 00380821 */ addu $at, $at, $t8 -/* 0381C 8092FDEC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03820 8092FDF0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 03824 8092FDF4 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C -/* 03828 8092FDF8 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 0382C 8092FDFC AFA70018 */ sw $a3, 0x0018($sp) -/* 03830 8092FE00 00194080 */ sll $t0, $t9, 2 -/* 03834 8092FE04 00A82821 */ addu $a1, $a1, $t0 -/* 03838 8092FE08 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 0383C 8092FE0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03840 8092FE10 0C029490 */ jal Animation_MorphToPlayOnce -/* 03844 8092FE14 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03848 8092FE18 8FA70018 */ lw $a3, 0x0018($sp) -/* 0384C 8092FE1C 3C0A8093 */ lui $t2, %hi(func_8092FE44) ## $t2 = 80930000 -/* 03850 8092FE20 2409000C */ addiu $t1, $zero, 0x000C ## $t1 = 0000000C -/* 03854 8092FE24 254AFE44 */ addiu $t2, $t2, %lo(func_8092FE44) ## $t2 = 8092FE44 -/* 03858 8092FE28 A4E000B4 */ sh $zero, 0x00B4($a3) ## 000000B4 -/* 0385C 8092FE2C A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 -/* 03860 8092FE30 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 03864 8092FE34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03868 8092FE38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0386C 8092FE3C 03E00008 */ jr $ra -/* 03870 8092FE40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s deleted file mode 100644 index a7caf9d206..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_8092FE44 -/* 03874 8092FE44 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03878 8092FE48 AFB00018 */ sw $s0, 0x0018($sp) -/* 0387C 8092FE4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03880 8092FE50 AFBF001C */ sw $ra, 0x001C($sp) -/* 03884 8092FE54 AFA50024 */ sw $a1, 0x0024($sp) -/* 03888 8092FE58 0C02927F */ jal SkelAnime_Update - -/* 0388C 8092FE5C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03890 8092FE60 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 03894 8092FE64 3C198093 */ lui $t9, %hi(D_8093746C) ## $t9 = 80930000 -/* 03898 8092FE68 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 0389C 8092FE6C 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 038A0 8092FE70 000FC080 */ sll $t8, $t7, 2 -/* 038A4 8092FE74 0338C821 */ addu $t9, $t9, $t8 -/* 038A8 8092FE78 8F39746C */ lw $t9, %lo(D_8093746C)($t9) -/* 038AC 8092FE7C 57210006 */ bnel $t9, $at, .L8092FE98 -/* 038B0 8092FE80 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 038B4 8092FE84 0C24BEF9 */ jal func_8092FBE4 -/* 038B8 8092FE88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038BC 8092FE8C 1000003D */ beq $zero, $zero, .L8092FF84 -/* 038C0 8092FE90 8FBF001C */ lw $ra, 0x001C($sp) -/* 038C4 8092FE94 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L8092FE98: -/* 038C8 8092FE98 3C054334 */ lui $a1, 0x4334 ## $a1 = 43340000 -/* 038CC 8092FE9C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 038D0 8092FEA0 10400003 */ beq $v0, $zero, .L8092FEB0 -/* 038D4 8092FEA4 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 038D8 8092FEA8 A6080198 */ sh $t0, 0x0198($s0) ## 00000198 -/* 038DC 8092FEAC 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L8092FEB0: -/* 038E0 8092FEB0 28410003 */ slti $at, $v0, 0x0003 -/* 038E4 8092FEB4 5420000A */ bnel $at, $zero, .L8092FEE0 -/* 038E8 8092FEB8 860B00B4 */ lh $t3, 0x00B4($s0) ## 000000B4 -/* 038EC 8092FEBC 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 -/* 038F0 8092FEC0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 038F4 8092FEC4 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 038F8 8092FEC8 252AFF00 */ addiu $t2, $t1, 0xFF00 ## $t2 = FFFFFF00 -/* 038FC 8092FECC 0C01DE80 */ jal Math_StepToF - -/* 03900 8092FED0 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 03904 8092FED4 10000008 */ beq $zero, $zero, .L8092FEF8 -/* 03908 8092FED8 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -/* 0390C 8092FEDC 860B00B4 */ lh $t3, 0x00B4($s0) ## 000000B4 -.L8092FEE0: -/* 03910 8092FEE0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 03914 8092FEE4 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 -/* 03918 8092FEE8 256C0300 */ addiu $t4, $t3, 0x0300 ## $t4 = 00000300 -/* 0391C 8092FEEC 0C01DE80 */ jal Math_StepToF - -/* 03920 8092FEF0 A60C00B4 */ sh $t4, 0x00B4($s0) ## 000000B4 -/* 03924 8092FEF4 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -.L8092FEF8: -/* 03928 8092FEF8 3C0F8094 */ lui $t7, %hi(D_80938CA0) ## $t7 = 80940000 -/* 0392C 8092FEFC 55A00021 */ bnel $t5, $zero, .L8092FF84 -/* 03930 8092FF00 8FBF001C */ lw $ra, 0x001C($sp) -/* 03934 8092FF04 8DEF8CA0 */ lw $t7, %lo(D_80938CA0)($t7) -/* 03938 8092FF08 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0393C 8092FF0C 3C198094 */ lui $t9, %hi(D_80938C90) ## $t9 = 80940000 -/* 03940 8092FF10 A5EE001C */ sh $t6, 0x001C($t7) ## 8094001C -/* 03944 8092FF14 8F398C90 */ lw $t9, %lo(D_80938C90)($t9) -/* 03948 8092FF18 3C188093 */ lui $t8, %hi(func_8092DAB8) ## $t8 = 80930000 -/* 0394C 8092FF1C 2718DAB8 */ addiu $t8, $t8, %lo(func_8092DAB8) ## $t8 = 8092DAB8 -/* 03950 8092FF20 8F280190 */ lw $t0, 0x0190($t9) ## 80940190 -/* 03954 8092FF24 1708000C */ bne $t8, $t0, .L8092FF58 -/* 03958 8092FF28 00000000 */ nop -/* 0395C 8092FF2C 82090195 */ lb $t1, 0x0195($s0) ## 00000195 -/* 03960 8092FF30 11200005 */ beq $t1, $zero, .L8092FF48 -/* 03964 8092FF34 00000000 */ nop -/* 03968 8092FF38 0C24CEE1 */ jal func_80933B84 -/* 0396C 8092FF3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03970 8092FF40 10000008 */ beq $zero, $zero, .L8092FF64 -/* 03974 8092FF44 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C -.L8092FF48: -/* 03978 8092FF48 0C24BEF9 */ jal func_8092FBE4 -/* 0397C 8092FF4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03980 8092FF50 10000004 */ beq $zero, $zero, .L8092FF64 -/* 03984 8092FF54 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C -.L8092FF58: -/* 03988 8092FF58 0C24BFE5 */ jal func_8092FF94 -/* 0398C 8092FF5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03990 8092FF60 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C -.L8092FF64: -/* 03994 8092FF64 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 03998 8092FF68 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 0399C 8092FF6C 0C02A800 */ jal func_800AA000 -/* 039A0 8092FF70 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 039A4 8092FF74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039A8 8092FF78 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 039AC 8092FF7C 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 -/* 039B0 8092FF80 8FBF001C */ lw $ra, 0x001C($sp) -.L8092FF84: -/* 039B4 8092FF84 8FB00018 */ lw $s0, 0x0018($sp) -/* 039B8 8092FF88 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 039BC 8092FF8C 03E00008 */ jr $ra -/* 039C0 8092FF90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s deleted file mode 100644 index c8fc77c05a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_8092FF94 -/* 039C4 8092FF94 3C0F8094 */ lui $t7, %hi(D_80938CA0) ## $t7 = 80940000 -/* 039C8 8092FF98 8DEF8CA0 */ lw $t7, %lo(D_80938CA0)($t7) -/* 039CC 8092FF9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 039D0 8092FFA0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 039D4 8092FFA4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 039D8 8092FFA8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 039DC 8092FFAC A5EE001C */ sh $t6, 0x001C($t7) ## 8094001C -/* 039E0 8092FFB0 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C -/* 039E4 8092FFB4 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 039E8 8092FFB8 AFA60018 */ sw $a2, 0x0018($sp) -/* 039EC 8092FFBC 0018C880 */ sll $t9, $t8, 2 -/* 039F0 8092FFC0 00B92821 */ addu $a1, $a1, $t9 -/* 039F4 8092FFC4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 039F8 8092FFC8 0C02947A */ jal Animation_PlayOnce -/* 039FC 8092FFCC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03A00 8092FFD0 8FA60018 */ lw $a2, 0x0018($sp) -/* 03A04 8092FFD4 3C088093 */ lui $t0, %hi(func_8092FFF0) ## $t0 = 80930000 -/* 03A08 8092FFD8 2508FFF0 */ addiu $t0, $t0, %lo(func_8092FFF0) ## $t0 = 8092FFF0 -/* 03A0C 8092FFDC ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 -/* 03A10 8092FFE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03A14 8092FFE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A18 8092FFE8 03E00008 */ jr $ra -/* 03A1C 8092FFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s deleted file mode 100644 index 318698b3ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_8092FFF0 -/* 03A20 8092FFF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03A24 8092FFF4 AFB00020 */ sw $s0, 0x0020($sp) -/* 03A28 8092FFF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03A2C 8092FFFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 03A30 80930000 AFA5002C */ sw $a1, 0x002C($sp) -/* 03A34 80930004 0C02927F */ jal SkelAnime_Update - -/* 03A38 80930008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03A3C 8093000C 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 03A40 80930010 3C198093 */ lui $t9, %hi(D_8093746C) ## $t9 = 80930000 -/* 03A44 80930014 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03A48 80930018 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 03A4C 8093001C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 03A50 80930020 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 03A54 80930024 000FC080 */ sll $t8, $t7, 2 -/* 03A58 80930028 0338C821 */ addu $t9, $t9, $t8 -/* 03A5C 8093002C 8F39746C */ lw $t9, %lo(D_8093746C)($t9) -/* 03A60 80930030 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 03A64 80930034 57210006 */ bnel $t9, $at, .L80930050 -/* 03A68 80930038 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 03A6C 8093003C 0C24BEF9 */ jal func_8092FBE4 -/* 03A70 80930040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A74 80930044 10000023 */ beq $zero, $zero, .L809300D4 -/* 03A78 80930048 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03A7C 8093004C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L80930050: -/* 03A80 80930050 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 03A84 80930054 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 03A88 80930058 0C01E0C4 */ jal Math_SmoothStepToF - -/* 03A8C 8093005C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 03A90 80930060 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 03A94 80930064 2405F800 */ addiu $a1, $zero, 0xF800 ## $a1 = FFFFF800 -/* 03A98 80930068 0C01DE2B */ jal Math_ScaledStepToS - -/* 03A9C 8093006C 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 -/* 03AA0 80930070 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 03AA4 80930074 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 03AA8 80930078 0C01DE80 */ jal Math_StepToF - -/* 03AAC 8093007C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03AB0 80930080 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 03AB4 80930084 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 03AB8 80930088 0C01DE80 */ jal Math_StepToF - -/* 03ABC 8093008C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03AC0 80930090 3C028094 */ lui $v0, %hi(D_80938C90) ## $v0 = 80940000 -/* 03AC4 80930094 8C428C90 */ lw $v0, %lo(D_80938C90)($v0) -/* 03AC8 80930098 3C088093 */ lui $t0, %hi(func_8092CC58) ## $t0 = 80930000 -/* 03ACC 8093009C 2508CC58 */ addiu $t0, $t0, %lo(func_8092CC58) ## $t0 = 8092CC58 -/* 03AD0 809300A0 8C490190 */ lw $t1, 0x0190($v0) ## 80940190 -/* 03AD4 809300A4 5109000B */ beql $t0, $t1, .L809300D4 -/* 03AD8 809300A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03ADC 809300AC 844A0198 */ lh $t2, 0x0198($v0) ## 80940198 -/* 03AE0 809300B0 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 03AE4 809300B4 0141001A */ div $zero, $t2, $at -/* 03AE8 809300B8 00005810 */ mfhi $t3 -/* 03AEC 809300BC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 03AF0 809300C0 55610004 */ bnel $t3, $at, .L809300D4 -/* 03AF4 809300C4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03AF8 809300C8 0C24BF74 */ jal func_8092FDD0 -/* 03AFC 809300CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B00 809300D0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809300D4: -/* 03B04 809300D4 8FB00020 */ lw $s0, 0x0020($sp) -/* 03B08 809300D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03B0C 809300DC 03E00008 */ jr $ra -/* 03B10 809300E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s deleted file mode 100644 index b85079c1fd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_809300E4 -/* 03B14 809300E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03B18 809300E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03B1C 809300EC 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 03B20 809300F0 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 03B24 809300F4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03B28 809300F8 000FC080 */ sll $t8, $t7, 2 -/* 03B2C 809300FC 00380821 */ addu $at, $at, $t8 -/* 03B30 80930100 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03B34 80930104 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 03B38 80930108 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C -/* 03B3C 8093010C 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 03B40 80930110 AFA70018 */ sw $a3, 0x0018($sp) -/* 03B44 80930114 00194080 */ sll $t0, $t9, 2 -/* 03B48 80930118 00A82821 */ addu $a1, $a1, $t0 -/* 03B4C 8093011C 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 03B50 80930120 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03B54 80930124 0C029490 */ jal Animation_MorphToPlayOnce -/* 03B58 80930128 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03B5C 8093012C 8FA70018 */ lw $a3, 0x0018($sp) -/* 03B60 80930130 3C0A8093 */ lui $t2, %hi(func_80930158) ## $t2 = 80930000 -/* 03B64 80930134 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 03B68 80930138 254A0158 */ addiu $t2, $t2, %lo(func_80930158) ## $t2 = 80930158 -/* 03B6C 8093013C A4E000B4 */ sh $zero, 0x00B4($a3) ## 000000B4 -/* 03B70 80930140 A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 -/* 03B74 80930144 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 03B78 80930148 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03B7C 8093014C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B80 80930150 03E00008 */ jr $ra -/* 03B84 80930154 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s deleted file mode 100644 index 722585e195..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80930158 -/* 03B88 80930158 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03B8C 8093015C AFB00018 */ sw $s0, 0x0018($sp) -/* 03B90 80930160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03B94 80930164 AFBF001C */ sw $ra, 0x001C($sp) -/* 03B98 80930168 AFA50024 */ sw $a1, 0x0024($sp) -/* 03B9C 8093016C 0C02927F */ jal SkelAnime_Update - -/* 03BA0 80930170 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03BA4 80930174 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 03BA8 80930178 3C198093 */ lui $t9, %hi(D_8093746C) ## $t9 = 80930000 -/* 03BAC 8093017C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03BB0 80930180 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 03BB4 80930184 000FC080 */ sll $t8, $t7, 2 -/* 03BB8 80930188 0338C821 */ addu $t9, $t9, $t8 -/* 03BBC 8093018C 8F39746C */ lw $t9, %lo(D_8093746C)($t9) -/* 03BC0 80930190 57210006 */ bnel $t9, $at, .L809301AC -/* 03BC4 80930194 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 03BC8 80930198 0C24BEF9 */ jal func_8092FBE4 -/* 03BCC 8093019C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03BD0 809301A0 10000021 */ beq $zero, $zero, .L80930228 -/* 03BD4 809301A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03BD8 809301A8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L809301AC: -/* 03BDC 809301AC 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 03BE0 809301B0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 03BE4 809301B4 10400003 */ beq $v0, $zero, .L809301C4 -/* 03BE8 809301B8 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 03BEC 809301BC A6080198 */ sh $t0, 0x0198($s0) ## 00000198 -/* 03BF0 809301C0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L809301C4: -/* 03BF4 809301C4 5040000A */ beql $v0, $zero, .L809301F0 -/* 03BF8 809301C8 860B00B4 */ lh $t3, 0x00B4($s0) ## 000000B4 -/* 03BFC 809301CC 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 -/* 03C00 809301D0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 03C04 809301D4 3C064170 */ lui $a2, 0x4170 ## $a2 = 41700000 -/* 03C08 809301D8 252AFEC0 */ addiu $t2, $t1, 0xFEC0 ## $t2 = FFFFFEC0 -/* 03C0C 809301DC 0C01DE80 */ jal Math_StepToF - -/* 03C10 809301E0 A60A00B4 */ sh $t2, 0x00B4($s0) ## 000000B4 -/* 03C14 809301E4 10000008 */ beq $zero, $zero, .L80930208 -/* 03C18 809301E8 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -/* 03C1C 809301EC 860B00B4 */ lh $t3, 0x00B4($s0) ## 000000B4 -.L809301F0: -/* 03C20 809301F0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 03C24 809301F4 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 -/* 03C28 809301F8 256C0500 */ addiu $t4, $t3, 0x0500 ## $t4 = 00000500 -/* 03C2C 809301FC 0C01DE80 */ jal Math_StepToF - -/* 03C30 80930200 A60C00B4 */ sh $t4, 0x00B4($s0) ## 000000B4 -/* 03C34 80930204 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -.L80930208: -/* 03C38 80930208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C3C 8093020C 55A00006 */ bnel $t5, $zero, .L80930228 -/* 03C40 80930210 8FBF001C */ lw $ra, 0x001C($sp) -/* 03C44 80930214 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03C48 80930218 24053950 */ addiu $a1, $zero, 0x3950 ## $a1 = 00003950 -/* 03C4C 8093021C 0C24C08E */ jal func_80930238 -/* 03C50 80930220 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C54 80930224 8FBF001C */ lw $ra, 0x001C($sp) -.L80930228: -/* 03C58 80930228 8FB00018 */ lw $s0, 0x0018($sp) -/* 03C5C 8093022C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03C60 80930230 03E00008 */ jr $ra -/* 03C64 80930234 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s deleted file mode 100644 index 9c8d717a86..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80930238 -/* 03C68 80930238 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03C6C 8093023C AFBF0014 */ sw $ra, 0x0014($sp) -/* 03C70 80930240 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 03C74 80930244 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C -/* 03C78 80930248 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 03C7C 8093024C AFA60018 */ sw $a2, 0x0018($sp) -/* 03C80 80930250 000E7880 */ sll $t7, $t6, 2 -/* 03C84 80930254 00AF2821 */ addu $a1, $a1, $t7 -/* 03C88 80930258 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 03C8C 8093025C 0C02947A */ jal Animation_PlayOnce -/* 03C90 80930260 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03C94 80930264 8FA60018 */ lw $a2, 0x0018($sp) -/* 03C98 80930268 3C188093 */ lui $t8, %hi(func_80930284) ## $t8 = 80930000 -/* 03C9C 8093026C 27180284 */ addiu $t8, $t8, %lo(func_80930284) ## $t8 = 80930284 -/* 03CA0 80930270 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 03CA4 80930274 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03CA8 80930278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03CAC 8093027C 03E00008 */ jr $ra -/* 03CB0 80930280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s deleted file mode 100644 index 5ff307c1d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80930284 -/* 03CB4 80930284 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03CB8 80930288 AFB00020 */ sw $s0, 0x0020($sp) -/* 03CBC 8093028C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03CC0 80930290 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03CC4 80930294 AFA5002C */ sw $a1, 0x002C($sp) -/* 03CC8 80930298 0C02927F */ jal SkelAnime_Update - -/* 03CCC 8093029C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03CD0 809302A0 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 03CD4 809302A4 3C198093 */ lui $t9, %hi(D_8093746C) ## $t9 = 80930000 -/* 03CD8 809302A8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03CDC 809302AC 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 03CE0 809302B0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 03CE4 809302B4 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 03CE8 809302B8 000FC080 */ sll $t8, $t7, 2 -/* 03CEC 809302BC 0338C821 */ addu $t9, $t9, $t8 -/* 03CF0 809302C0 8F39746C */ lw $t9, %lo(D_8093746C)($t9) -/* 03CF4 809302C4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 03CF8 809302C8 57210006 */ bnel $t9, $at, .L809302E4 -/* 03CFC 809302CC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 03D00 809302D0 0C24BEF9 */ jal func_8092FBE4 -/* 03D04 809302D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03D08 809302D8 10000037 */ beq $zero, $zero, .L809303B8 -/* 03D0C 809302DC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03D10 809302E0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -.L809302E4: -/* 03D14 809302E4 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 03D18 809302E8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 03D1C 809302EC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 03D20 809302F0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 03D24 809302F4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 03D28 809302F8 2405FC00 */ addiu $a1, $zero, 0xFC00 ## $a1 = FFFFFC00 -/* 03D2C 809302FC 0C01DE2B */ jal Math_ScaledStepToS - -/* 03D30 80930300 240600A0 */ addiu $a2, $zero, 0x00A0 ## $a2 = 000000A0 -/* 03D34 80930304 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 03D38 80930308 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 03D3C 8093030C 0C01DE80 */ jal Math_StepToF - -/* 03D40 80930310 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03D44 80930314 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 03D48 80930318 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 03D4C 8093031C 0C01DE80 */ jal Math_StepToF - -/* 03D50 80930320 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03D54 80930324 3C028094 */ lui $v0, %hi(D_80938C90) ## $v0 = 80940000 -/* 03D58 80930328 8C428C90 */ lw $v0, %lo(D_80938C90)($v0) -/* 03D5C 8093032C 3C088093 */ lui $t0, %hi(func_8092DAB8) ## $t0 = 80930000 -/* 03D60 80930330 2508DAB8 */ addiu $t0, $t0, %lo(func_8092DAB8) ## $t0 = 8092DAB8 -/* 03D64 80930334 8C430190 */ lw $v1, 0x0190($v0) ## 80940190 -/* 03D68 80930338 3C0A8093 */ lui $t2, %hi(func_8092CC58) ## $t2 = 80930000 -/* 03D6C 8093033C 254ACC58 */ addiu $t2, $t2, %lo(func_8092CC58) ## $t2 = 8092CC58 -/* 03D70 80930340 1503000C */ bne $t0, $v1, .L80930374 -/* 03D74 80930344 00000000 */ nop -/* 03D78 80930348 82090195 */ lb $t1, 0x0195($s0) ## 00000195 -/* 03D7C 8093034C 11200005 */ beq $t1, $zero, .L80930364 -/* 03D80 80930350 00000000 */ nop -/* 03D84 80930354 0C24CEE1 */ jal func_80933B84 -/* 03D88 80930358 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03D8C 8093035C 10000016 */ beq $zero, $zero, .L809303B8 -/* 03D90 80930360 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930364: -/* 03D94 80930364 0C24BEF9 */ jal func_8092FBE4 -/* 03D98 80930368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03D9C 8093036C 10000012 */ beq $zero, $zero, .L809303B8 -/* 03DA0 80930370 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930374: -/* 03DA4 80930374 51430010 */ beql $t2, $v1, .L809303B8 -/* 03DA8 80930378 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03DAC 8093037C 84430198 */ lh $v1, 0x0198($v0) ## 00000198 -/* 03DB0 80930380 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 03DB4 80930384 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 03DB8 80930388 0061001A */ div $zero, $v1, $at -/* 03DBC 8093038C 00005810 */ mfhi $t3 -/* 03DC0 80930390 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 03DC4 80930394 548B0008 */ bnel $a0, $t3, .L809303B8 -/* 03DC8 80930398 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03DCC 8093039C 0061001A */ div $zero, $v1, $at -/* 03DD0 809303A0 00006010 */ mfhi $t4 -/* 03DD4 809303A4 508C0004 */ beql $a0, $t4, .L809303B8 -/* 03DD8 809303A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 03DDC 809303AC 0C24C039 */ jal func_809300E4 -/* 03DE0 809303B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03DE4 809303B4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809303B8: -/* 03DE8 809303B8 8FB00020 */ lw $s0, 0x0020($sp) -/* 03DEC 809303BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03DF0 809303C0 03E00008 */ jr $ra -/* 03DF4 809303C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s deleted file mode 100644 index 134214d4a2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_809303C8 -/* 03DF8 809303C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03DFC 809303CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 03E00 809303D0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 03E04 809303D4 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 03E08 809303D8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03E0C 809303DC 000FC080 */ sll $t8, $t7, 2 -/* 03E10 809303E0 00380821 */ addu $at, $at, $t8 -/* 03E14 809303E4 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 03E18 809303E8 909903E4 */ lbu $t9, 0x03E4($a0) ## 000003E4 -/* 03E1C 809303EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03E20 809303F0 3C058093 */ lui $a1, %hi(D_8093787C) ## $a1 = 80930000 -/* 03E24 809303F4 3328FFFC */ andi $t0, $t9, 0xFFFC ## $t0 = 00000000 -/* 03E28 809303F8 A08803E4 */ sb $t0, 0x03E4($a0) ## 000003E4 -/* 03E2C 809303FC 84E9001C */ lh $t1, 0x001C($a3) ## 0000001C -/* 03E30 80930400 AFA70018 */ sw $a3, 0x0018($sp) -/* 03E34 80930404 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03E38 80930408 00095080 */ sll $t2, $t1, 2 -/* 03E3C 8093040C 00AA2821 */ addu $a1, $a1, $t2 -/* 03E40 80930410 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) -/* 03E44 80930414 0C029490 */ jal Animation_MorphToPlayOnce -/* 03E48 80930418 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 03E4C 8093041C 8FA70018 */ lw $a3, 0x0018($sp) -/* 03E50 80930420 3C0B8093 */ lui $t3, %hi(func_8093043C) ## $t3 = 80930000 -/* 03E54 80930424 256B043C */ addiu $t3, $t3, %lo(func_8093043C) ## $t3 = 8093043C -/* 03E58 80930428 ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 03E5C 8093042C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03E60 80930430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03E64 80930434 03E00008 */ jr $ra -/* 03E68 80930438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s deleted file mode 100644 index 9a112dbfd2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8093043C -/* 03E6C 8093043C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03E70 80930440 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03E74 80930444 AFA40018 */ sw $a0, 0x0018($sp) -/* 03E78 80930448 AFA5001C */ sw $a1, 0x001C($sp) -/* 03E7C 8093044C 0C02927F */ jal SkelAnime_Update - -/* 03E80 80930450 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03E84 80930454 50400004 */ beql $v0, $zero, .L80930468 -/* 03E88 80930458 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03E8C 8093045C 0C24C11D */ jal func_80930474 -/* 03E90 80930460 8FA40018 */ lw $a0, 0x0018($sp) -/* 03E94 80930464 8FBF0014 */ lw $ra, 0x0014($sp) -.L80930468: -/* 03E98 80930468 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03E9C 8093046C 03E00008 */ jr $ra -/* 03EA0 80930470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s deleted file mode 100644 index 4052c70c6a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80930474 -/* 03EA4 80930474 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03EA8 80930478 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03EAC 8093047C 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 03EB0 80930480 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 03EB4 80930484 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03EB8 80930488 000FC080 */ sll $t8, $t7, 2 -/* 03EBC 8093048C 00380821 */ addu $at, $at, $t8 -/* 03EC0 80930490 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03EC4 80930494 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 03EC8 80930498 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C -/* 03ECC 8093049C 3C058093 */ lui $a1, %hi(D_80937884) ## $a1 = 80930000 -/* 03ED0 809304A0 AFA70018 */ sw $a3, 0x0018($sp) -/* 03ED4 809304A4 00194080 */ sll $t0, $t9, 2 -/* 03ED8 809304A8 00A82821 */ addu $a1, $a1, $t0 -/* 03EDC 809304AC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) -/* 03EE0 809304B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03EE4 809304B4 0C029490 */ jal Animation_MorphToPlayOnce -/* 03EE8 809304B8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 03EEC 809304BC 8FA40018 */ lw $a0, 0x0018($sp) -/* 03EF0 809304C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03EF4 809304C4 908903E4 */ lbu $t1, 0x03E4($a0) ## 000003E4 -/* 03EF8 809304C8 908B03E5 */ lbu $t3, 0x03E5($a0) ## 000003E5 -/* 03EFC 809304CC 8C8D0004 */ lw $t5, 0x0004($a0) ## 00000004 -/* 03F00 809304D0 312AFFFC */ andi $t2, $t1, 0xFFFC ## $t2 = 00000000 -/* 03F04 809304D4 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 03F08 809304D8 35AF0001 */ ori $t7, $t5, 0x0001 ## $t7 = 00000001 -/* 03F0C 809304DC A08A03E4 */ sb $t2, 0x03E4($a0) ## 000003E4 -/* 03F10 809304E0 A08C03E5 */ sb $t4, 0x03E5($a0) ## 000003E5 -/* 03F14 809304E4 0C24CF3B */ jal func_80933CEC -/* 03F18 809304E8 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 03F1C 809304EC 8FA70018 */ lw $a3, 0x0018($sp) -/* 03F20 809304F0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 03F24 809304F4 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 03F28 809304F8 3C0E8093 */ lui $t6, %hi(func_8093051C) ## $t6 = 80930000 -/* 03F2C 809304FC 25CE051C */ addiu $t6, $t6, %lo(func_8093051C) ## $t6 = 8093051C -/* 03F30 80930500 A4E00198 */ sh $zero, 0x0198($a3) ## 00000198 -/* 03F34 80930504 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -/* 03F38 80930508 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 03F3C 8093050C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03F40 80930510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F44 80930514 03E00008 */ jr $ra -/* 03F48 80930518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s deleted file mode 100644 index 6faf73059b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s +++ /dev/null @@ -1,162 +0,0 @@ -.late_rodata -glabel D_809379E8 - .float 1.2 - -glabel D_809379EC - .float 3.14159274101 - -.text -glabel func_8093051C -/* 03F4C 8093051C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03F50 80930520 AFB00020 */ sw $s0, 0x0020($sp) -/* 03F54 80930524 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03F58 80930528 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03F5C 8093052C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03F60 80930530 AFA50044 */ sw $a1, 0x0044($sp) -/* 03F64 80930534 0C02927F */ jal SkelAnime_Update - -/* 03F68 80930538 AFA4002C */ sw $a0, 0x002C($sp) -/* 03F6C 8093053C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03F70 80930540 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 -/* 03F74 80930544 3C018093 */ lui $at, %hi(D_809379E8) ## $at = 80930000 -/* 03F78 80930548 C42679E8 */ lwc1 $f6, %lo(D_809379E8)($at) -/* 03F7C 8093054C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 03F80 80930550 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03F84 80930554 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 03F88 80930558 46062202 */ mul.s $f8, $f4, $f6 -/* 03F8C 8093055C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 03F90 80930560 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 03F94 80930564 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 03F98 80930568 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 03F9C 8093056C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 03FA0 80930570 4600103C */ c.lt.s $f2, $f0 -/* 03FA4 80930574 00000000 */ nop -/* 03FA8 80930578 45020004 */ bc1fl .L8093058C -/* 03FAC 8093057C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 03FB0 80930580 10000002 */ beq $zero, $zero, .L8093058C -/* 03FB4 80930584 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 03FB8 80930588 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L8093058C: -/* 03FBC 8093058C 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 03FC0 80930590 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 03FC4 80930594 0C01E0C4 */ jal Math_SmoothStepToF - -/* 03FC8 80930598 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03FCC 8093059C E7A0003C */ swc1 $f0, 0x003C($sp) -/* 03FD0 809305A0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 03FD4 809305A4 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 03FD8 809305A8 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 03FDC 809305AC 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 03FE0 809305B0 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 -/* 03FE4 809305B4 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A -/* 03FE8 809305B8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 03FEC 809305BC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 03FF0 809305C0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 03FF4 809305C4 C7B2003C */ lwc1 $f18, 0x003C($sp) -/* 03FF8 809305C8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 03FFC 809305CC 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 04000 809305D0 46009100 */ add.s $f4, $f18, $f0 -/* 04004 809305D4 E7A4003C */ swc1 $f4, 0x003C($sp) -/* 04008 809305D8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 0400C 809305DC 10400028 */ beq $v0, $zero, .L80930680 -/* 04010 809305E0 00000000 */ nop -/* 04014 809305E4 10400003 */ beq $v0, $zero, .L809305F4 -/* 04018 809305E8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0401C 809305EC A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -/* 04020 809305F0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L809305F4: -/* 04024 809305F4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 04028 809305F8 3C018093 */ lui $at, %hi(D_809379EC) ## $at = 80930000 -/* 0402C 809305FC C42A79EC */ lwc1 $f10, %lo(D_809379EC)($at) -/* 04030 80930600 46803220 */ cvt.s.w $f8, $f6 -/* 04034 80930604 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 -/* 04038 80930608 44819000 */ mtc1 $at, $f18 ## $f18 = 0.06 -/* 0403C 8093060C 460A4402 */ mul.s $f16, $f8, $f10 -/* 04040 80930610 00000000 */ nop -/* 04044 80930614 46128302 */ mul.s $f12, $f16, $f18 -/* 04048 80930618 0C0400A4 */ jal sinf - -/* 0404C 8093061C 00000000 */ nop -/* 04050 80930620 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 04054 80930624 44812000 */ mtc1 $at, $f4 ## $f4 = 250.00 -/* 04058 80930628 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 0405C 8093062C 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 04060 80930630 46040182 */ mul.s $f6, $f0, $f4 -/* 04064 80930634 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04068 80930638 46083280 */ add.s $f10, $f6, $f8 -/* 0406C 8093063C 14400005 */ bne $v0, $zero, .L80930654 -/* 04070 80930640 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 04074 80930644 0C24BEF9 */ jal func_8092FBE4 -/* 04078 80930648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0407C 8093064C 1000003A */ beq $zero, $zero, .L80930738 -/* 04080 80930650 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930654: -/* 04084 80930654 14410037 */ bne $v0, $at, .L80930734 -/* 04088 80930658 8FA4002C */ lw $a0, 0x002C($sp) -/* 0408C 8093065C 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 04090 80930660 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 -/* 04094 80930664 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 04098 80930668 000FC080 */ sll $t8, $t7, 2 -/* 0409C 8093066C 00B82821 */ addu $a1, $a1, $t8 -/* 040A0 80930670 0C0294D3 */ jal Animation_MorphToLoop -/* 040A4 80930674 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 040A8 80930678 1000002F */ beq $zero, $zero, .L80930738 -/* 040AC 8093067C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930680: -/* 040B0 80930680 0C01DE2B */ jal Math_ScaledStepToS - -/* 040B4 80930684 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 040B8 80930688 AFA20038 */ sw $v0, 0x0038($sp) -/* 040BC 8093068C 86050018 */ lh $a1, 0x0018($s0) ## 00000018 -/* 040C0 80930690 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 040C4 80930694 0C01DE2B */ jal Math_ScaledStepToS - -/* 040C8 80930698 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 040CC 8093069C 8FB90038 */ lw $t9, 0x0038($sp) -/* 040D0 809306A0 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 040D4 809306A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 040D8 809306A8 03224024 */ and $t0, $t9, $v0 -/* 040DC 809306AC AFA80038 */ sw $t0, 0x0038($sp) -/* 040E0 809306B0 0C01DE2B */ jal Math_ScaledStepToS - -/* 040E4 809306B4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 040E8 809306B8 8FA90038 */ lw $t1, 0x0038($sp) -/* 040EC 809306BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040F0 809306C0 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 040F4 809306C4 01225024 */ and $t2, $t1, $v0 -/* 040F8 809306C8 0C00BE5D */ jal func_8002F974 -/* 040FC 809306CC AFAA0038 */ sw $t2, 0x0038($sp) -/* 04100 809306D0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 04104 809306D4 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 04108 809306D8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0410C 809306DC 3C05437A */ lui $a1, 0x437A ## $a1 = 437A0000 -/* 04110 809306E0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04114 809306E4 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 -/* 04118 809306E8 0C01E0C4 */ jal Math_SmoothStepToF - -/* 0411C 809306EC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 04120 809306F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04124 809306F4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 04128 809306F8 8FAB0038 */ lw $t3, 0x0038($sp) -/* 0412C 809306FC 4612003C */ c.lt.s $f0, $f18 -/* 04130 80930700 00000000 */ nop -/* 04134 80930704 4502000C */ bc1fl .L80930738 -/* 04138 80930708 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0413C 8093070C 11600009 */ beq $t3, $zero, .L80930734 -/* 04140 80930710 C7A4003C */ lwc1 $f4, 0x003C($sp) -/* 04144 80930714 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 04148 80930718 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0414C 8093071C 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 04150 80930720 4606203C */ c.lt.s $f4, $f6 -/* 04154 80930724 00000000 */ nop -/* 04158 80930728 45020003 */ bc1fl .L80930738 -/* 0415C 8093072C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04160 80930730 A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 -.L80930734: -/* 04164 80930734 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930738: -/* 04168 80930738 8FB00020 */ lw $s0, 0x0020($sp) -/* 0416C 8093073C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04170 80930740 03E00008 */ jr $ra -/* 04174 80930744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s deleted file mode 100644 index 981f847eea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80930748 -/* 04178 80930748 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0417C 8093074C AFBF0014 */ sw $ra, 0x0014($sp) -/* 04180 80930750 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 04184 80930754 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 04188 80930758 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 0418C 8093075C 000FC080 */ sll $t8, $t7, 2 -/* 04190 80930760 00380821 */ addu $at, $at, $t8 -/* 04194 80930764 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 04198 80930768 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0419C 8093076C A4800198 */ sh $zero, 0x0198($a0) ## 00000198 -/* 041A0 80930770 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C -/* 041A4 80930774 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 041A8 80930778 AFA70018 */ sw $a3, 0x0018($sp) -/* 041AC 8093077C 00194080 */ sll $t0, $t9, 2 -/* 041B0 80930780 00A82821 */ addu $a1, $a1, $t0 -/* 041B4 80930784 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 041B8 80930788 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 041BC 8093078C 0C029490 */ jal Animation_MorphToPlayOnce -/* 041C0 80930790 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 041C4 80930794 8FA70018 */ lw $a3, 0x0018($sp) -/* 041C8 80930798 3C098093 */ lui $t1, %hi(func_809307B4) ## $t1 = 80930000 -/* 041CC 8093079C 252907B4 */ addiu $t1, $t1, %lo(func_809307B4) ## $t1 = 809307B4 -/* 041D0 809307A0 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 -/* 041D4 809307A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 041D8 809307A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 041DC 809307AC 03E00008 */ jr $ra -/* 041E0 809307B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s deleted file mode 100644 index 5032756e21..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_809307B4 -/* 041E4 809307B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 041E8 809307B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 041EC 809307BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 041F0 809307C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 041F4 809307C4 AFA5002C */ sw $a1, 0x002C($sp) -/* 041F8 809307C8 0C02927F */ jal SkelAnime_Update - -/* 041FC 809307CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04200 809307D0 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 04204 809307D4 8FAF002C */ lw $t7, 0x002C($sp) -/* 04208 809307D8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0420C 809307DC 1060000B */ beq $v1, $zero, .L8093080C -/* 04210 809307E0 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 -/* 04214 809307E4 10600003 */ beq $v1, $zero, .L809307F4 -/* 04218 809307E8 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 0421C 809307EC A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -/* 04220 809307F0 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -.L809307F4: -/* 04224 809307F4 54600027 */ bnel $v1, $zero, .L80930894 -/* 04228 809307F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0422C 809307FC 0C24C229 */ jal func_809308A4 -/* 04230 80930800 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04234 80930804 10000023 */ beq $zero, $zero, .L80930894 -/* 04238 80930808 8FBF001C */ lw $ra, 0x001C($sp) -.L8093080C: -/* 0423C 8093080C 8DF81C44 */ lw $t8, 0x1C44($t7) ## 00001C44 -/* 04240 80930810 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 04244 80930814 0C01DE80 */ jal Math_StepToF - -/* 04248 80930818 AFB80024 */ sw $t8, 0x0024($sp) -/* 0424C 8093081C 1040000A */ beq $v0, $zero, .L80930848 -/* 04250 80930820 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 04254 80930824 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 04258 80930828 44813000 */ mtc1 $at, $f6 ## $f6 = 140.00 -/* 0425C 8093082C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 04260 80930830 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 04264 80930834 4606203C */ c.lt.s $f4, $f6 -/* 04268 80930838 00000000 */ nop -/* 0426C 8093083C 45020003 */ bc1fl .L8093084C -/* 04270 80930840 2405F000 */ addiu $a1, $zero, 0xF000 ## $a1 = FFFFF000 -/* 04274 80930844 A6190198 */ sh $t9, 0x0198($s0) ## 00000198 -.L80930848: -/* 04278 80930848 2405F000 */ addiu $a1, $zero, 0xF000 ## $a1 = FFFFF000 -.L8093084C: -/* 0427C 8093084C 0C01DE2B */ jal Math_ScaledStepToS - -/* 04280 80930850 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 -/* 04284 80930854 8FA80024 */ lw $t0, 0x0024($sp) -/* 04288 80930858 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 0428C 8093085C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04290 80930860 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 04294 80930864 0C01E107 */ jal Math_ApproachF - -/* 04298 80930868 8D050024 */ lw $a1, 0x0024($t0) ## 00000024 -/* 0429C 8093086C 8FA90024 */ lw $t1, 0x0024($sp) -/* 042A0 80930870 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 042A4 80930874 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 042A8 80930878 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 042AC 8093087C 0C01E107 */ jal Math_ApproachF - -/* 042B0 80930880 8D25002C */ lw $a1, 0x002C($t1) ## 0000002C -/* 042B4 80930884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042B8 80930888 0C00BE5D */ jal func_8002F974 -/* 042BC 8093088C 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 042C0 80930890 8FBF001C */ lw $ra, 0x001C($sp) -.L80930894: -/* 042C4 80930894 8FB00018 */ lw $s0, 0x0018($sp) -/* 042C8 80930898 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 042CC 8093089C 03E00008 */ jr $ra -/* 042D0 809308A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s deleted file mode 100644 index 5b27ee956c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_809308A4 -/* 042D4 809308A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 042D8 809308A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 042DC 809308AC AFB00018 */ sw $s0, 0x0018($sp) -/* 042E0 809308B0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 042E4 809308B4 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 042E8 809308B8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 042EC 809308BC 000FC080 */ sll $t8, $t7, 2 -/* 042F0 809308C0 00380821 */ addu $at, $at, $t8 -/* 042F4 809308C4 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 042F8 809308C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 042FC 809308CC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 04300 809308D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04304 809308D4 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 04308 809308D8 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 -/* 0430C 809308DC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 04310 809308E0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04314 809308E4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 04318 809308E8 00194080 */ sll $t0, $t9, 2 -/* 0431C 809308EC 00A82821 */ addu $a1, $a1, $t0 -/* 04320 809308F0 0C029490 */ jal Animation_MorphToPlayOnce -/* 04324 809308F4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 04328 809308F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0432C 809308FC 0C24CF20 */ jal func_80933C80 -/* 04330 80930900 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 04334 80930904 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 04338 80930908 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0433C 8093090C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04340 80930910 24053953 */ addiu $a1, $zero, 0x3953 ## $a1 = 00003953 -/* 04344 80930914 3C098093 */ lui $t1, %hi(func_80930934) ## $t1 = 80930000 -/* 04348 80930918 25290934 */ addiu $t1, $t1, %lo(func_80930934) ## $t1 = 80930934 -/* 0434C 8093091C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 04350 80930920 8FBF001C */ lw $ra, 0x001C($sp) -/* 04354 80930924 8FB00018 */ lw $s0, 0x0018($sp) -/* 04358 80930928 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0435C 8093092C 03E00008 */ jr $ra -/* 04360 80930930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s deleted file mode 100644 index 8cf00e7a7b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s +++ /dev/null @@ -1,139 +0,0 @@ -glabel func_80930934 -/* 04364 80930934 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04368 80930938 AFB00020 */ sw $s0, 0x0020($sp) -/* 0436C 8093093C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04370 80930940 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04374 80930944 AFA50034 */ sw $a1, 0x0034($sp) -/* 04378 80930948 0C02927F */ jal SkelAnime_Update - -/* 0437C 8093094C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04380 80930950 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E -/* 04384 80930954 2405F254 */ addiu $a1, $zero, 0xF254 ## $a1 = FFFFF254 -/* 04388 80930958 0C01DE5F */ jal Math_StepToS - -/* 0438C 8093095C 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 04390 80930960 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 04394 80930964 AFA40028 */ sw $a0, 0x0028($sp) -/* 04398 80930968 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0439C 8093096C 0C01DE2B */ jal Math_ScaledStepToS - -/* 043A0 80930970 24061000 */ addiu $a2, $zero, 0x1000 ## $a2 = 00001000 -/* 043A4 80930974 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 043A8 80930978 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 043AC 8093097C 0C01DE2B */ jal Math_ScaledStepToS - -/* 043B0 80930980 24061000 */ addiu $a2, $zero, 0x1000 ## $a2 = 00001000 -/* 043B4 80930984 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 043B8 80930988 50600015 */ beql $v1, $zero, .L809309E0 -/* 043BC 8093098C 82190195 */ lb $t9, 0x0195($s0) ## 00000195 -/* 043C0 80930990 10600003 */ beq $v1, $zero, .L809309A0 -/* 043C4 80930994 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 043C8 80930998 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -/* 043CC 8093099C 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -.L809309A0: -/* 043D0 809309A0 54600059 */ bnel $v1, $zero, .L80930B08 -/* 043D4 809309A4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 043D8 809309A8 920203E5 */ lbu $v0, 0x03E5($s0) ## 000003E5 -/* 043DC 809309AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 043E0 809309B0 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 043E4 809309B4 11E00005 */ beq $t7, $zero, .L809309CC -/* 043E8 809309B8 34580001 */ ori $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 043EC 809309BC 0C24C0F2 */ jal func_809303C8 -/* 043F0 809309C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 043F4 809309C4 10000050 */ beq $zero, $zero, .L80930B08 -/* 043F8 809309C8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809309CC: -/* 043FC 809309CC 0C24BEF9 */ jal func_8092FBE4 -/* 04400 809309D0 A21803E5 */ sb $t8, 0x03E5($s0) ## 000003E5 -/* 04404 809309D4 1000004C */ beq $zero, $zero, .L80930B08 -/* 04408 809309D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0440C 809309DC 82190195 */ lb $t9, 0x0195($s0) ## 00000195 -.L809309E0: -/* 04410 809309E0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 04414 809309E4 53200008 */ beql $t9, $zero, .L80930A08 -/* 04418 809309E8 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 0441C 809309EC 920903E4 */ lbu $t1, 0x03E4($s0) ## 000003E4 -/* 04420 809309F0 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 04424 809309F4 A6080198 */ sh $t0, 0x0198($s0) ## 00000198 -/* 04428 809309F8 312AFFFC */ andi $t2, $t1, 0xFFFC ## $t2 = 00000000 -/* 0442C 809309FC 1000001A */ beq $zero, $zero, .L80930A68 -/* 04430 80930A00 A20A03E4 */ sb $t2, 0x03E4($s0) ## 000003E4 -/* 04434 80930A04 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -.L80930A08: -/* 04438 80930A08 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 0443C 80930A0C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 04440 80930A10 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 -/* 04444 80930A14 46062202 */ mul.s $f8, $f4, $f6 -/* 04448 80930A18 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 0444C 80930A1C 0C01DE80 */ jal Math_StepToF - -/* 04450 80930A20 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 -/* 04454 80930A24 10400010 */ beq $v0, $zero, .L80930A68 -/* 04458 80930A28 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0445C 80930A2C A20B0195 */ sb $t3, 0x0195($s0) ## 00000195 -/* 04460 80930A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04464 80930A34 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04468 80930A38 24053950 */ addiu $a1, $zero, 0x3950 ## $a1 = 00003950 -/* 0446C 80930A3C 0C24D652 */ jal func_80935948 -/* 04470 80930A40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04474 80930A44 920C06C4 */ lbu $t4, 0x06C4($s0) ## 000006C4 -/* 04478 80930A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0447C 80930A4C 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4 -/* 04480 80930A50 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 04484 80930A54 0C0189B7 */ jal Collider_UpdateCylinder - -/* 04488 80930A58 A20D06C4 */ sb $t5, 0x06C4($s0) ## 000006C4 -/* 0448C 80930A5C 3C0E8093 */ lui $t6, %hi(D_80937818) ## $t6 = 80930000 -/* 04490 80930A60 85CE7818 */ lh $t6, %lo(D_80937818)($t6) -/* 04494 80930A64 A60E06F4 */ sh $t6, 0x06F4($s0) ## 000006F4 -.L80930A68: -/* 04498 80930A68 920F03E4 */ lbu $t7, 0x03E4($s0) ## 000003E4 -/* 0449C 80930A6C 8FB90034 */ lw $t9, 0x0034($sp) -/* 044A0 80930A70 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 044A4 80930A74 53000020 */ beql $t8, $zero, .L80930AF8 -/* 044A8 80930A78 8FA40028 */ lw $a0, 0x0028($sp) -/* 044AC 80930A7C 8F281C44 */ lw $t0, 0x1C44($t9) ## 00001C44 -/* 044B0 80930A80 AFA8002C */ sw $t0, 0x002C($sp) -/* 044B4 80930A84 0C01DE1C */ jal Math_SinS - ## sins? -/* 044B8 80930A88 8604008A */ lh $a0, 0x008A($s0) ## 0000008A -/* 044BC 80930A8C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 044C0 80930A90 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 044C4 80930A94 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 044C8 80930A98 8FA9002C */ lw $t1, 0x002C($sp) -/* 044CC 80930A9C 460A0402 */ mul.s $f16, $f0, $f10 -/* 044D0 80930AA0 46128100 */ add.s $f4, $f16, $f18 -/* 044D4 80930AA4 E5240024 */ swc1 $f4, 0x0024($t1) ## 00000024 -/* 044D8 80930AA8 0C01DE0D */ jal Math_CosS - ## coss? -/* 044DC 80930AAC 8604008A */ lh $a0, 0x008A($s0) ## 0000008A -/* 044E0 80930AB0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 044E4 80930AB4 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 044E8 80930AB8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 044EC 80930ABC 8FAA002C */ lw $t2, 0x002C($sp) -/* 044F0 80930AC0 46060202 */ mul.s $f8, $f0, $f6 -/* 044F4 80930AC4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 044F8 80930AC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044FC 80930ACC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 04500 80930AD0 460A4400 */ add.s $f16, $f8, $f10 -/* 04504 80930AD4 E550002C */ swc1 $f16, 0x002C($t2) ## 0000002C -/* 04508 80930AD8 920B03E4 */ lbu $t3, 0x03E4($s0) ## 000003E4 -/* 0450C 80930ADC 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 04510 80930AE0 316CFFFC */ andi $t4, $t3, 0xFFFC ## $t4 = 00000000 -/* 04514 80930AE4 A20C03E4 */ sb $t4, 0x03E4($s0) ## 000003E4 -/* 04518 80930AE8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0451C 80930AEC 0C00BDC7 */ jal func_8002F71C -/* 04520 80930AF0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 04524 80930AF4 8FA40028 */ lw $a0, 0x0028($sp) -.L80930AF8: -/* 04528 80930AF8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0452C 80930AFC 0C01DE2B */ jal Math_ScaledStepToS - -/* 04530 80930B00 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 04534 80930B04 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930B08: -/* 04538 80930B08 8FB00020 */ lw $s0, 0x0020($sp) -/* 0453C 80930B0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04540 80930B10 03E00008 */ jr $ra -/* 04544 80930B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s deleted file mode 100644 index 06bd919677..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80930B18 -/* 04548 80930B18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0454C 80930B1C AFBF001C */ sw $ra, 0x001C($sp) -/* 04550 80930B20 AFB00018 */ sw $s0, 0x0018($sp) -/* 04554 80930B24 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 04558 80930B28 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 0455C 80930B2C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 04560 80930B30 000FC080 */ sll $t8, $t7, 2 -/* 04564 80930B34 00380821 */ addu $at, $at, $t8 -/* 04568 80930B38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0456C 80930B3C AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 04570 80930B40 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 04574 80930B44 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 04578 80930B48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0457C 80930B4C 00194080 */ sll $t0, $t9, 2 -/* 04580 80930B50 00A82821 */ addu $a1, $a1, $t0 -/* 04584 80930B54 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 04588 80930B58 0C029490 */ jal Animation_MorphToPlayOnce -/* 0458C 80930B5C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 04590 80930B60 3C058094 */ lui $a1, %hi(D_80938C90) ## $a1 = 80940000 -/* 04594 80930B64 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) -/* 04598 80930B68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0459C 80930B6C 0C00B6EC */ jal Actor_WorldDistXZToPoint -/* 045A0 80930B70 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 80940024 -/* 045A4 80930B74 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 -/* 045A8 80930B78 3C048094 */ lui $a0, %hi(D_80938C90) ## $a0 = 80940000 -/* 045AC 80930B7C 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) -/* 045B0 80930B80 0C00B6B0 */ jal Actor_WorldYawTowardPoint -/* 045B4 80930B84 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 045B8 80930B88 820A0194 */ lb $t2, 0x0194($s0) ## 00000194 -/* 045BC 80930B8C 86090016 */ lh $t1, 0x0016($s0) ## 00000016 -/* 045C0 80930B90 3C0D8093 */ lui $t5, %hi(func_80930BC0) ## $t5 = 80930000 -/* 045C4 80930B94 000A5B40 */ sll $t3, $t2, 13 -/* 045C8 80930B98 25AD0BC0 */ addiu $t5, $t5, %lo(func_80930BC0) ## $t5 = 80930BC0 -/* 045CC 80930B9C 012B6021 */ addu $t4, $t1, $t3 -/* 045D0 80930BA0 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 045D4 80930BA4 A60C01A4 */ sh $t4, 0x01A4($s0) ## 000001A4 -/* 045D8 80930BA8 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 045DC 80930BAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 045E0 80930BB0 8FB00018 */ lw $s0, 0x0018($sp) -/* 045E4 80930BB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 045E8 80930BB8 03E00008 */ jr $ra -/* 045EC 80930BBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s deleted file mode 100644 index 1d5af8eec3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80930BC0 -/* 045F0 80930BC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 045F4 80930BC4 AFB0001C */ sw $s0, 0x001C($sp) -/* 045F8 80930BC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 045FC 80930BCC AFBF0024 */ sw $ra, 0x0024($sp) -/* 04600 80930BD0 AFB10020 */ sw $s1, 0x0020($sp) -/* 04604 80930BD4 AFA5002C */ sw $a1, 0x002C($sp) -/* 04608 80930BD8 0C02927F */ jal SkelAnime_Update - -/* 0460C 80930BDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04610 80930BE0 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 04614 80930BE4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 04618 80930BE8 0C01DE80 */ jal Math_StepToF - -/* 0461C 80930BEC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 04620 80930BF0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 04624 80930BF4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 04628 80930BF8 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 0462C 80930BFC 0C01DE2B */ jal Math_ScaledStepToS - -/* 04630 80930C00 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 04634 80930C04 02228824 */ and $s1, $s1, $v0 -/* 04638 80930C08 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 0463C 80930C0C 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 04640 80930C10 0C01DE2B */ jal Math_ScaledStepToS - -/* 04644 80930C14 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 04648 80930C18 3C0E8094 */ lui $t6, %hi(D_80938C90) ## $t6 = 80940000 -/* 0464C 80930C1C 8DCE8C90 */ lw $t6, %lo(D_80938C90)($t6) -/* 04650 80930C20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04654 80930C24 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 04658 80930C28 8DC50090 */ lw $a1, 0x0090($t6) ## 80940090 -/* 0465C 80930C2C 02228824 */ and $s1, $s1, $v0 -/* 04660 80930C30 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 04664 80930C34 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04668 80930C38 3C074270 */ lui $a3, 0x4270 ## $a3 = 42700000 -/* 0466C 80930C3C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 04670 80930C40 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 04674 80930C44 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 04678 80930C48 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0467C 80930C4C 00007825 */ or $t7, $zero, $zero ## $t7 = 00000000 -/* 04680 80930C50 4606003C */ c.lt.s $f0, $f6 -/* 04684 80930C54 00000000 */ nop -/* 04688 80930C58 45020003 */ bc1fl .L80930C68 -/* 0468C 80930C5C 022F8824 */ and $s1, $s1, $t7 -/* 04690 80930C60 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 04694 80930C64 022F8824 */ and $s1, $s1, $t7 -.L80930C68: -/* 04698 80930C68 0C01DE1C */ jal Math_SinS - ## sins? -/* 0469C 80930C6C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 046A0 80930C70 C60803C4 */ lwc1 $f8, 0x03C4($s0) ## 000003C4 -/* 046A4 80930C74 3C188094 */ lui $t8, %hi(D_80938C90) ## $t8 = 80940000 -/* 046A8 80930C78 8F188C90 */ lw $t8, %lo(D_80938C90)($t8) -/* 046AC 80930C7C 46080282 */ mul.s $f10, $f0, $f8 -/* 046B0 80930C80 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 046B4 80930C84 C7100024 */ lwc1 $f16, 0x0024($t8) ## 80940024 -/* 046B8 80930C88 46105480 */ add.s $f18, $f10, $f16 -/* 046BC 80930C8C 0C01DE0D */ jal Math_CosS - ## coss? -/* 046C0 80930C90 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 046C4 80930C94 C60403C4 */ lwc1 $f4, 0x03C4($s0) ## 000003C4 -/* 046C8 80930C98 3C198094 */ lui $t9, %hi(D_80938C90) ## $t9 = 80940000 -/* 046CC 80930C9C 8F398C90 */ lw $t9, %lo(D_80938C90)($t9) -/* 046D0 80930CA0 46040182 */ mul.s $f6, $f0, $f4 -/* 046D4 80930CA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046D8 80930CA8 C728002C */ lwc1 $f8, 0x002C($t9) ## 8094002C -/* 046DC 80930CAC 46083280 */ add.s $f10, $f6, $f8 -/* 046E0 80930CB0 12200005 */ beq $s1, $zero, .L80930CC8 -/* 046E4 80930CB4 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 046E8 80930CB8 0C24C339 */ jal func_80930CE4 -/* 046EC 80930CBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046F0 80930CC0 10000004 */ beq $zero, $zero, .L80930CD4 -/* 046F4 80930CC4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930CC8: -/* 046F8 80930CC8 0C00BE5D */ jal func_8002F974 -/* 046FC 80930CCC 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 04700 80930CD0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80930CD4: -/* 04704 80930CD4 8FB0001C */ lw $s0, 0x001C($sp) -/* 04708 80930CD8 8FB10020 */ lw $s1, 0x0020($sp) -/* 0470C 80930CDC 03E00008 */ jr $ra -/* 04710 80930CE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s deleted file mode 100644 index 3c40312f69..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80930CE4 -/* 04714 80930CE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04718 80930CE8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0471C 80930CEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04720 80930CF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 04724 80930CF4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 04728 80930CF8 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 0472C 80930CFC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04730 80930D00 000E7880 */ sll $t7, $t6, 2 -/* 04734 80930D04 00AF2821 */ addu $a1, $a1, $t7 -/* 04738 80930D08 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 0473C 80930D0C 0C029490 */ jal Animation_MorphToPlayOnce -/* 04740 80930D10 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 04744 80930D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04748 80930D18 0C24CF20 */ jal func_80933C80 -/* 0474C 80930D1C 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 04750 80930D20 82190194 */ lb $t9, 0x0194($s0) ## 00000194 -/* 04754 80930D24 86180016 */ lh $t8, 0x0016($s0) ## 00000016 -/* 04758 80930D28 240A0300 */ addiu $t2, $zero, 0x0300 ## $t2 = 00000300 -/* 0475C 80930D2C 00194340 */ sll $t0, $t9, 13 -/* 04760 80930D30 03084823 */ subu $t1, $t8, $t0 -/* 04764 80930D34 A60901A4 */ sh $t1, 0x01A4($s0) ## 000001A4 -/* 04768 80930D38 A60A019C */ sh $t2, 0x019C($s0) ## 0000019C -/* 0476C 80930D3C A600019A */ sh $zero, 0x019A($s0) ## 0000019A -/* 04770 80930D40 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 04774 80930D44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04778 80930D48 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0477C 80930D4C 24053953 */ addiu $a1, $zero, 0x3953 ## $a1 = 00003953 -/* 04780 80930D50 3C0B8093 */ lui $t3, %hi(func_80930D70) ## $t3 = 80930000 -/* 04784 80930D54 256B0D70 */ addiu $t3, $t3, %lo(func_80930D70) ## $t3 = 80930D70 -/* 04788 80930D58 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 0478C 80930D5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04790 80930D60 8FB00018 */ lw $s0, 0x0018($sp) -/* 04794 80930D64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04798 80930D68 03E00008 */ jr $ra -/* 0479C 80930D6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s deleted file mode 100644 index e5b7f3f227..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel func_80930D70 -/* 047A0 80930D70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 047A4 80930D74 AFBF0024 */ sw $ra, 0x0024($sp) -/* 047A8 80930D78 AFB00020 */ sw $s0, 0x0020($sp) -/* 047AC 80930D7C AFA50034 */ sw $a1, 0x0034($sp) -/* 047B0 80930D80 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 047B4 80930D84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 047B8 80930D88 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 047BC 80930D8C 0C02927F */ jal SkelAnime_Update - -/* 047C0 80930D90 AFAF002C */ sw $t7, 0x002C($sp) -/* 047C4 80930D94 8618019A */ lh $t8, 0x019A($s0) ## 0000019A -/* 047C8 80930D98 8604019C */ lh $a0, 0x019C($s0) ## 0000019C -/* 047CC 80930D9C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 047D0 80930DA0 27190060 */ addiu $t9, $t8, 0x0060 ## $t9 = 00000060 -/* 047D4 80930DA4 A619019A */ sh $t9, 0x019A($s0) ## 0000019A -/* 047D8 80930DA8 8603019A */ lh $v1, 0x019A($s0) ## 0000019A -/* 047DC 80930DAC 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 047E0 80930DB0 0083082A */ slt $at, $a0, $v1 -/* 047E4 80930DB4 50200004 */ beql $at, $zero, .L80930DC8 -/* 047E8 80930DB8 A603019A */ sh $v1, 0x019A($s0) ## 0000019A -/* 047EC 80930DBC 10000002 */ beq $zero, $zero, .L80930DC8 -/* 047F0 80930DC0 A604019A */ sh $a0, 0x019A($s0) ## 0000019A -/* 047F4 80930DC4 A603019A */ sh $v1, 0x019A($s0) ## 0000019A -.L80930DC8: -/* 047F8 80930DC8 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 047FC 80930DCC 8607019A */ lh $a3, 0x019A($s0) ## 0000019A -/* 04800 80930DD0 AFA80010 */ sw $t0, 0x0010($sp) -/* 04804 80930DD4 0C01E1A7 */ jal Math_SmoothStepToS - -/* 04808 80930DD8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0480C 80930DDC 54400009 */ bnel $v0, $zero, .L80930E04 -/* 04810 80930DE0 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -/* 04814 80930DE4 920903E6 */ lbu $t1, 0x03E6($s0) ## 000003E6 -/* 04818 80930DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0481C 80930DEC 312AFFFB */ andi $t2, $t1, 0xFFFB ## $t2 = 00000000 -/* 04820 80930DF0 0C24C11D */ jal func_80930474 -/* 04824 80930DF4 A20A03E6 */ sb $t2, 0x03E6($s0) ## 000003E6 -/* 04828 80930DF8 1000002B */ beq $zero, $zero, .L80930EA8 -/* 0482C 80930DFC 820F0195 */ lb $t7, 0x0195($s0) ## 00000195 -/* 04830 80930E00 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -.L80930E04: -/* 04834 80930E04 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 04838 80930E08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0483C 80930E0C 304B0002 */ andi $t3, $v0, 0x0002 ## $t3 = 00000000 -/* 04840 80930E10 11600024 */ beq $t3, $zero, .L80930EA4 -/* 04844 80930E14 304CFFFC */ andi $t4, $v0, 0xFFFC ## $t4 = 00000000 -/* 04848 80930E18 820F0194 */ lb $t7, 0x0194($s0) ## 00000194 -/* 0484C 80930E1C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 04850 80930E20 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04854 80930E24 000FC0C0 */ sll $t8, $t7, 3 -/* 04858 80930E28 030FC023 */ subu $t8, $t8, $t7 -/* 0485C 80930E2C 0018C2C0 */ sll $t8, $t8, 11 -/* 04860 80930E30 01D83823 */ subu $a3, $t6, $t8 -/* 04864 80930E34 A20C03E4 */ sb $t4, 0x03E4($s0) ## 000003E4 -/* 04868 80930E38 A20D0195 */ sb $t5, 0x0195($s0) ## 00000195 -/* 0486C 80930E3C 00073C00 */ sll $a3, $a3, 16 -/* 04870 80930E40 00073C03 */ sra $a3, $a3, 16 -/* 04874 80930E44 8FA40034 */ lw $a0, 0x0034($sp) -/* 04878 80930E48 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 0487C 80930E4C 0C00BDC7 */ jal func_8002F71C -/* 04880 80930E50 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 04884 80930E54 8FA4002C */ lw $a0, 0x002C($sp) -/* 04888 80930E58 0C00BDF7 */ jal func_8002F7DC -/* 0488C 80930E5C 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 04890 80930E60 82020194 */ lb $v0, 0x0194($s0) ## 00000194 -/* 04894 80930E64 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 04898 80930E68 860901A4 */ lh $t1, 0x01A4($s0) ## 000001A4 -/* 0489C 80930E6C 00024080 */ sll $t0, $v0, 2 -/* 048A0 80930E70 01024021 */ addu $t0, $t0, $v0 -/* 048A4 80930E74 00084280 */ sll $t0, $t0, 10 -/* 048A8 80930E78 03281823 */ subu $v1, $t9, $t0 -/* 048AC 80930E7C 00031C00 */ sll $v1, $v1, 16 -/* 048B0 80930E80 00031C03 */ sra $v1, $v1, 16 -/* 048B4 80930E84 00695023 */ subu $t2, $v1, $t1 -/* 048B8 80930E88 000A5C00 */ sll $t3, $t2, 16 -/* 048BC 80930E8C 000B6403 */ sra $t4, $t3, 16 -/* 048C0 80930E90 01820019 */ multu $t4, $v0 -/* 048C4 80930E94 00006812 */ mflo $t5 -/* 048C8 80930E98 59A00003 */ blezl $t5, .L80930EA8 -/* 048CC 80930E9C 820F0195 */ lb $t7, 0x0195($s0) ## 00000195 -/* 048D0 80930EA0 A60301A4 */ sh $v1, 0x01A4($s0) ## 000001A4 -.L80930EA4: -/* 048D4 80930EA4 820F0195 */ lb $t7, 0x0195($s0) ## 00000195 -.L80930EA8: -/* 048D8 80930EA8 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -/* 048DC 80930EAC 8FA3002C */ lw $v1, 0x002C($sp) -/* 048E0 80930EB0 55E00018 */ bnel $t7, $zero, .L80930F14 -/* 048E4 80930EB4 920A03E6 */ lbu $t2, 0x03E6($s0) ## 000003E6 -/* 048E8 80930EB8 846E04DA */ lh $t6, 0x04DA($v1) ## 000004DA -/* 048EC 80930EBC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 048F0 80930EC0 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 048F4 80930EC4 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 048F8 80930EC8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 048FC 80930ECC 468042A0 */ cvt.s.w $f10, $f8 -/* 04900 80930ED0 460A303C */ c.lt.s $f6, $f10 -/* 04904 80930ED4 00000000 */ nop -/* 04908 80930ED8 45030008 */ bc1tl .L80930EFC -/* 0490C 80930EDC 921903E6 */ lbu $t9, 0x03E6($s0) ## 000003E6 -/* 04910 80930EE0 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 04914 80930EE4 C4720028 */ lwc1 $f18, 0x0028($v1) ## 00000028 -/* 04918 80930EE8 4612803C */ c.lt.s $f16, $f18 -/* 0491C 80930EEC 00000000 */ nop -/* 04920 80930EF0 45020008 */ bc1fl .L80930F14 -/* 04924 80930EF4 920A03E6 */ lbu $t2, 0x03E6($s0) ## 000003E6 -/* 04928 80930EF8 921903E6 */ lbu $t9, 0x03E6($s0) ## 000003E6 -.L80930EFC: -/* 0492C 80930EFC 34580001 */ ori $t8, $v0, 0x0001 ## $t8 = 00000001 -/* 04930 80930F00 A21803E4 */ sb $t8, 0x03E4($s0) ## 000003E4 -/* 04934 80930F04 3328FFFB */ andi $t0, $t9, 0xFFFB ## $t0 = 00000000 -/* 04938 80930F08 10000006 */ beq $zero, $zero, .L80930F24 -/* 0493C 80930F0C A20803E6 */ sb $t0, 0x03E6($s0) ## 000003E6 -/* 04940 80930F10 920A03E6 */ lbu $t2, 0x03E6($s0) ## 000003E6 -.L80930F14: -/* 04944 80930F14 3049FFFE */ andi $t1, $v0, 0xFFFE ## $t1 = 00000000 -/* 04948 80930F18 A20903E4 */ sb $t1, 0x03E4($s0) ## 000003E4 -/* 0494C 80930F1C 354B0004 */ ori $t3, $t2, 0x0004 ## $t3 = 00000004 -/* 04950 80930F20 A20B03E6 */ sb $t3, 0x03E6($s0) ## 000003E6 -.L80930F24: -/* 04954 80930F24 0C01DE1C */ jal Math_SinS - ## sins? -/* 04958 80930F28 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0495C 80930F2C C60403C4 */ lwc1 $f4, 0x03C4($s0) ## 000003C4 -/* 04960 80930F30 3C0C8094 */ lui $t4, %hi(D_80938C90) ## $t4 = 80940000 -/* 04964 80930F34 8D8C8C90 */ lw $t4, %lo(D_80938C90)($t4) -/* 04968 80930F38 46040202 */ mul.s $f8, $f0, $f4 -/* 0496C 80930F3C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 04970 80930F40 C5860024 */ lwc1 $f6, 0x0024($t4) ## 80940024 -/* 04974 80930F44 46064280 */ add.s $f10, $f8, $f6 -/* 04978 80930F48 0C01DE0D */ jal Math_CosS - ## coss? -/* 0497C 80930F4C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 04980 80930F50 C61003C4 */ lwc1 $f16, 0x03C4($s0) ## 000003C4 -/* 04984 80930F54 3C0D8094 */ lui $t5, %hi(D_80938C90) ## $t5 = 80940000 -/* 04988 80930F58 8DAD8C90 */ lw $t5, %lo(D_80938C90)($t5) -/* 0498C 80930F5C 46100482 */ mul.s $f18, $f0, $f16 -/* 04990 80930F60 C5A4002C */ lwc1 $f4, 0x002C($t5) ## 8094002C -/* 04994 80930F64 46049200 */ add.s $f8, $f18, $f4 -/* 04998 80930F68 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 0499C 80930F6C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 049A0 80930F70 8FB00020 */ lw $s0, 0x0020($sp) -/* 049A4 80930F74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 049A8 80930F78 03E00008 */ jr $ra -/* 049AC 80930F7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s deleted file mode 100644 index 9bbd5af93e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80930F80 -/* 049B0 80930F80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 049B4 80930F84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 049B8 80930F88 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 049BC 80930F8C 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 049C0 80930F90 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 049C4 80930F94 000FC080 */ sll $t8, $t7, 2 -/* 049C8 80930F98 00380821 */ addu $at, $at, $t8 -/* 049CC 80930F9C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 049D0 80930FA0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 049D4 80930FA4 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C -/* 049D8 80930FA8 3C058093 */ lui $a1, %hi(D_8093787C) ## $a1 = 80930000 -/* 049DC 80930FAC AFA70018 */ sw $a3, 0x0018($sp) -/* 049E0 80930FB0 00194080 */ sll $t0, $t9, 2 -/* 049E4 80930FB4 00A82821 */ addu $a1, $a1, $t0 -/* 049E8 80930FB8 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) -/* 049EC 80930FBC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 049F0 80930FC0 0C029490 */ jal Animation_MorphToPlayOnce -/* 049F4 80930FC4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 049F8 80930FC8 8FA70018 */ lw $a3, 0x0018($sp) -/* 049FC 80930FCC 3C098093 */ lui $t1, %hi(func_80930FE8) ## $t1 = 80930000 -/* 04A00 80930FD0 25290FE8 */ addiu $t1, $t1, %lo(func_80930FE8) ## $t1 = 80930FE8 -/* 04A04 80930FD4 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 -/* 04A08 80930FD8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04A0C 80930FDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04A10 80930FE0 03E00008 */ jr $ra -/* 04A14 80930FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s deleted file mode 100644 index 70bf11796a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80930FE8 -/* 04A18 80930FE8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04A1C 80930FEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 04A20 80930FF0 AFA50024 */ sw $a1, 0x0024($sp) -/* 04A24 80930FF4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 04A28 80930FF8 84E5008A */ lh $a1, 0x008A($a3) ## 0000008A -/* 04A2C 80930FFC AFA70020 */ sw $a3, 0x0020($sp) -/* 04A30 80931000 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 04A34 80931004 0C01DE2B */ jal Math_ScaledStepToS - -/* 04A38 80931008 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 04A3C 8093100C 8FA40020 */ lw $a0, 0x0020($sp) -/* 04A40 80931010 AFA2001C */ sw $v0, 0x001C($sp) -/* 04A44 80931014 0C02927F */ jal SkelAnime_Update - -/* 04A48 80931018 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04A4C 8093101C 10400005 */ beq $v0, $zero, .L80931034 -/* 04A50 80931020 8FAE001C */ lw $t6, 0x001C($sp) -/* 04A54 80931024 51C00004 */ beql $t6, $zero, .L80931038 -/* 04A58 80931028 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04A5C 8093102C 0C24C411 */ jal func_80931044 -/* 04A60 80931030 8FA40020 */ lw $a0, 0x0020($sp) -.L80931034: -/* 04A64 80931034 8FBF0014 */ lw $ra, 0x0014($sp) -.L80931038: -/* 04A68 80931038 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04A6C 8093103C 03E00008 */ jr $ra -/* 04A70 80931040 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s deleted file mode 100644 index 2fe3dc77cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80931044 -/* 04A74 80931044 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 04A78 80931048 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 04A7C 8093104C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04A80 80931050 AFB00018 */ sw $s0, 0x0018($sp) -/* 04A84 80931054 AFBF001C */ sw $ra, 0x001C($sp) -/* 04A88 80931058 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04A8C 8093105C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 04A90 80931060 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 04A94 80931064 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 -/* 04A98 80931068 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04A9C 8093106C 000E7880 */ sll $t7, $t6, 2 -/* 04AA0 80931070 00AF2821 */ addu $a1, $a1, $t7 -/* 04AA4 80931074 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 04AA8 80931078 0C029490 */ jal Animation_MorphToPlayOnce -/* 04AAC 8093107C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 04AB0 80931080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04AB4 80931084 0C24CF3B */ jal func_80933CEC -/* 04AB8 80931088 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04ABC 8093108C 82180194 */ lb $t8, 0x0194($s0) ## 00000194 -/* 04AC0 80931090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04AC4 80931094 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 04AC8 80931098 0018C980 */ sll $t9, $t8, 6 -/* 04ACC 8093109C 0338C823 */ subu $t9, $t9, $t8 -/* 04AD0 809310A0 0019CA00 */ sll $t9, $t9, 8 -/* 04AD4 809310A4 0C24CF20 */ jal func_80933C80 -/* 04AD8 809310A8 A61901A6 */ sh $t9, 0x01A6($s0) ## 000001A6 -/* 04ADC 809310AC 3C088093 */ lui $t0, %hi(func_809310CC) ## $t0 = 80930000 -/* 04AE0 809310B0 250810CC */ addiu $t0, $t0, %lo(func_809310CC) ## $t0 = 809310CC -/* 04AE4 809310B4 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 04AE8 809310B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 04AEC 809310BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 04AF0 809310C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04AF4 809310C4 03E00008 */ jr $ra -/* 04AF8 809310C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s deleted file mode 100644 index c03363dbd5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_809310CC -/* 04AFC 809310CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04B00 809310D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 04B04 809310D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04B08 809310D8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04B0C 809310DC AFA5002C */ sw $a1, 0x002C($sp) -/* 04B10 809310E0 0C02927F */ jal SkelAnime_Update - -/* 04B14 809310E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04B18 809310E8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 04B1C 809310EC 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 -/* 04B20 809310F0 0C01DE80 */ jal Math_StepToF - -/* 04B24 809310F4 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 04B28 809310F8 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 04B2C 809310FC 860501A6 */ lh $a1, 0x01A6($s0) ## 000001A6 -/* 04B30 80931100 0C01DE2B */ jal Math_ScaledStepToS - -/* 04B34 80931104 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 04B38 80931108 10400004 */ beq $v0, $zero, .L8093111C -/* 04B3C 8093110C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 04B40 80931110 860E01A6 */ lh $t6, 0x01A6($s0) ## 000001A6 -/* 04B44 80931114 000E7823 */ subu $t7, $zero, $t6 -/* 04B48 80931118 A60F01A6 */ sh $t7, 0x01A6($s0) ## 000001A6 -.L8093111C: -/* 04B4C 8093111C 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 -/* 04B50 80931120 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 04B54 80931124 44813000 */ mtc1 $at, $f6 ## $f6 = 1.25 -/* 04B58 80931128 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 04B5C 8093112C 46062202 */ mul.s $f8, $f4, $f6 -/* 04B60 80931130 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 04B64 80931134 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 04B68 80931138 4600103C */ c.lt.s $f2, $f0 -/* 04B6C 8093113C 00000000 */ nop -/* 04B70 80931140 45020004 */ bc1fl .L80931154 -/* 04B74 80931144 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 04B78 80931148 10000002 */ beq $zero, $zero, .L80931154 -/* 04B7C 8093114C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 04B80 80931150 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80931154: -/* 04B84 80931154 0C01DE1C */ jal Math_SinS - ## sins? -/* 04B88 80931158 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 04B8C 8093115C C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 04B90 80931160 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 04B94 80931164 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 04B98 80931168 46008482 */ mul.s $f18, $f16, $f0 -/* 04B9C 8093116C 46125100 */ add.s $f4, $f10, $f18 -/* 04BA0 80931170 0C01DE0D */ jal Math_CosS - ## coss? -/* 04BA4 80931174 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 04BA8 80931178 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 04BAC 8093117C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 04BB0 80931180 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 04BB4 80931184 46004402 */ mul.s $f16, $f8, $f0 -/* 04BB8 80931188 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 04BBC 8093118C 46103280 */ add.s $f10, $f6, $f16 -/* 04BC0 80931190 13200005 */ beq $t9, $zero, .L809311A8 -/* 04BC4 80931194 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 04BC8 80931198 0C24C11D */ jal func_80930474 -/* 04BCC 8093119C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04BD0 809311A0 10000014 */ beq $zero, $zero, .L809311F4 -/* 04BD4 809311A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809311A8: -/* 04BD8 809311A8 920803E4 */ lbu $t0, 0x03E4($s0) ## 000003E4 -/* 04BDC 809311AC 8FAA002C */ lw $t2, 0x002C($sp) -/* 04BE0 809311B0 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 04BE4 809311B4 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 04BE8 809311B8 5120000E */ beql $t1, $zero, .L809311F4 -/* 04BEC 809311BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04BF0 809311C0 0C00BDF7 */ jal func_8002F7DC -/* 04BF4 809311C4 8D441C44 */ lw $a0, 0x1C44($t2) ## 00001C44 -/* 04BF8 809311C8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 04BFC 809311CC 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 04C00 809311D0 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 04C04 809311D4 8FA4002C */ lw $a0, 0x002C($sp) -/* 04C08 809311D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04C0C 809311DC 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 04C10 809311E0 0C00BDC7 */ jal func_8002F71C -/* 04C14 809311E4 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 04C18 809311E8 0C24C11D */ jal func_80930474 -/* 04C1C 809311EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04C20 809311F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809311F4: -/* 04C24 809311F4 0C00BE5D */ jal func_8002F974 -/* 04C28 809311F8 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 04C2C 809311FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04C30 80931200 8FB00020 */ lw $s0, 0x0020($sp) -/* 04C34 80931204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C38 80931208 03E00008 */ jr $ra -/* 04C3C 8093120C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s deleted file mode 100644 index 3084f5a6bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80931210 -/* 04C40 80931210 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04C44 80931214 AFBF001C */ sw $ra, 0x001C($sp) -/* 04C48 80931218 AFB00018 */ sw $s0, 0x0018($sp) -/* 04C4C 8093121C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 04C50 80931220 3C028093 */ lui $v0, %hi(D_8093746C) ## $v0 = 80930000 -/* 04C54 80931224 2442746C */ addiu $v0, $v0, %lo(D_8093746C) ## $v0 = 8093746C -/* 04C58 80931228 000E7880 */ sll $t7, $t6, 2 -/* 04C5C 8093122C 24030006 */ addiu $v1, $zero, 0x0006 ## $v1 = 00000006 -/* 04C60 80931230 004FC021 */ addu $t8, $v0, $t7 -/* 04C64 80931234 AF030000 */ sw $v1, 0x0000($t8) ## 00000000 -/* 04C68 80931238 8C85011C */ lw $a1, 0x011C($a0) ## 0000011C -/* 04C6C 8093123C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04C70 80931240 84B9001C */ lh $t9, 0x001C($a1) ## 0000001C -/* 04C74 80931244 00194080 */ sll $t0, $t9, 2 -/* 04C78 80931248 00484821 */ addu $t1, $v0, $t0 -/* 04C7C 8093124C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 04C80 80931250 506A0004 */ beql $v1, $t2, .L80931264 -/* 04C84 80931254 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 04C88 80931258 0C24C484 */ jal func_80931210 -/* 04C8C 8093125C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 04C90 80931260 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -.L80931264: -/* 04C94 80931264 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 04C98 80931268 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04C9C 8093126C 000B6080 */ sll $t4, $t3, 2 -/* 04CA0 80931270 00AC2821 */ addu $a1, $a1, $t4 -/* 04CA4 80931274 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 04CA8 80931278 0C029490 */ jal Animation_MorphToPlayOnce -/* 04CAC 8093127C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 04CB0 80931280 3C058094 */ lui $a1, %hi(D_80938C90) ## $a1 = 80940000 -/* 04CB4 80931284 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) -/* 04CB8 80931288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04CBC 8093128C 0C00B6EC */ jal Actor_WorldDistXZToPoint -/* 04CC0 80931290 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 80940024 -/* 04CC4 80931294 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 -/* 04CC8 80931298 3C048094 */ lui $a0, %hi(D_80938C90) ## $a0 = 80940000 -/* 04CCC 8093129C 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) -/* 04CD0 809312A0 0C00B6B0 */ jal Actor_WorldYawTowardPoint -/* 04CD4 809312A4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 04CD8 809312A8 82030194 */ lb $v1, 0x0194($s0) ## 00000194 -/* 04CDC 809312AC 860D0016 */ lh $t5, 0x0016($s0) ## 00000016 -/* 04CE0 809312B0 8E19011C */ lw $t9, 0x011C($s0) ## 0000011C -/* 04CE4 809312B4 00037080 */ sll $t6, $v1, 2 -/* 04CE8 809312B8 01C37023 */ subu $t6, $t6, $v1 -/* 04CEC 809312BC 000E72C0 */ sll $t6, $t6, 11 -/* 04CF0 809312C0 0003C380 */ sll $t8, $v1, 14 -/* 04CF4 809312C4 01AE7823 */ subu $t7, $t5, $t6 -/* 04CF8 809312C8 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 04CFC 809312CC A60F01A4 */ sh $t7, 0x01A4($s0) ## 000001A4 -/* 04D00 809312D0 A61801A6 */ sh $t8, 0x01A6($s0) ## 000001A6 -/* 04D04 809312D4 A6000198 */ sh $zero, 0x0198($s0) ## 00000198 -/* 04D08 809312D8 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 04D0C 809312DC 3C088093 */ lui $t0, %hi(func_80931300) ## $t0 = 80930000 -/* 04D10 809312E0 25081300 */ addiu $t0, $t0, %lo(func_80931300) ## $t0 = 80931300 -/* 04D14 809312E4 A3200195 */ sb $zero, 0x0195($t9) ## 00000195 -/* 04D18 809312E8 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 04D1C 809312EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 04D20 809312F0 8FB00018 */ lw $s0, 0x0018($sp) -/* 04D24 809312F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04D28 809312F8 03E00008 */ jr $ra -/* 04D2C 809312FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s deleted file mode 100644 index bb3745c80d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_80931300 -/* 04D30 80931300 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04D34 80931304 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04D38 80931308 AFB00020 */ sw $s0, 0x0020($sp) -/* 04D3C 8093130C AFA5002C */ sw $a1, 0x002C($sp) -/* 04D40 80931310 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 04D44 80931314 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04D48 80931318 50400010 */ beql $v0, $zero, .L8093135C -/* 04D4C 8093131C 82180195 */ lb $t8, 0x0195($s0) ## 00000195 -/* 04D50 80931320 10400003 */ beq $v0, $zero, .L80931330 -/* 04D54 80931324 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 04D58 80931328 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 04D5C 8093132C 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -.L80931330: -/* 04D60 80931330 5440006B */ bnel $v0, $zero, .L809314E0 -/* 04D64 80931334 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04D68 80931338 0C24C53C */ jal func_809314F0 -/* 04D6C 8093133C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D70 80931340 0C24C53C */ jal func_809314F0 -/* 04D74 80931344 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C -/* 04D78 80931348 C60403C4 */ lwc1 $f4, 0x03C4($s0) ## 000003C4 -/* 04D7C 8093134C 8E0F011C */ lw $t7, 0x011C($s0) ## 0000011C -/* 04D80 80931350 10000062 */ beq $zero, $zero, .L809314DC -/* 04D84 80931354 E5E403C4 */ swc1 $f4, 0x03C4($t7) ## 000003C4 -/* 04D88 80931358 82180195 */ lb $t8, 0x0195($s0) ## 00000195 -.L8093135C: -/* 04D8C 8093135C 5700005A */ bnel $t8, $zero, .L809314C8 -/* 04D90 80931360 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 04D94 80931364 0C02927F */ jal SkelAnime_Update - -/* 04D98 80931368 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04D9C 8093136C A2020195 */ sb $v0, 0x0195($s0) ## 00000195 -/* 04DA0 80931370 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 04DA4 80931374 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04DA8 80931378 0C01DE2B */ jal Math_ScaledStepToS - -/* 04DAC 8093137C 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 -/* 04DB0 80931380 82190195 */ lb $t9, 0x0195($s0) ## 00000195 -/* 04DB4 80931384 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 04DB8 80931388 860501A6 */ lh $a1, 0x01A6($s0) ## 000001A6 -/* 04DBC 8093138C 03224024 */ and $t0, $t9, $v0 -/* 04DC0 80931390 A2080195 */ sb $t0, 0x0195($s0) ## 00000195 -/* 04DC4 80931394 0C01DE2B */ jal Math_ScaledStepToS - -/* 04DC8 80931398 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 -/* 04DCC 8093139C 82090195 */ lb $t1, 0x0195($s0) ## 00000195 -/* 04DD0 809313A0 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 04DD4 809313A4 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 04DD8 809313A8 01225024 */ and $t2, $t1, $v0 -/* 04DDC 809313AC A20A0195 */ sb $t2, 0x0195($s0) ## 00000195 -/* 04DE0 809313B0 0C01DE2B */ jal Math_ScaledStepToS - -/* 04DE4 809313B4 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 04DE8 809313B8 820B0195 */ lb $t3, 0x0195($s0) ## 00000195 -/* 04DEC 809313BC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 04DF0 809313C0 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 04DF4 809313C4 01626024 */ and $t4, $t3, $v0 -/* 04DF8 809313C8 A20C0195 */ sb $t4, 0x0195($s0) ## 00000195 -/* 04DFC 809313CC 0C01DE2B */ jal Math_ScaledStepToS - -/* 04E00 809313D0 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 04E04 809313D4 820D0195 */ lb $t5, 0x0195($s0) ## 00000195 -/* 04E08 809313D8 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 04E0C 809313DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04E10 809313E0 01A27024 */ and $t6, $t5, $v0 -/* 04E14 809313E4 A20E0195 */ sb $t6, 0x0195($s0) ## 00000195 -/* 04E18 809313E8 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 04E1C 809313EC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 04E20 809313F0 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 04E24 809313F4 8DE50090 */ lw $a1, 0x0090($t7) ## 80940090 -/* 04E28 809313F8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04E2C 809313FC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 04E30 80931400 0C01E0C4 */ jal Math_SmoothStepToF - -/* 04E34 80931404 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04E38 80931408 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 04E3C 8093140C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 04E40 80931410 82180195 */ lb $t8, 0x0195($s0) ## 00000195 -/* 04E44 80931414 0000C825 */ or $t9, $zero, $zero ## $t9 = 00000000 -/* 04E48 80931418 4608003C */ c.lt.s $f0, $f8 -/* 04E4C 8093141C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 04E50 80931420 3C0542BE */ lui $a1, 0x42BE ## $a1 = 42BE0000 -/* 04E54 80931424 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 04E58 80931428 45000002 */ bc1f .L80931434 -/* 04E5C 8093142C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 04E60 80931430 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -.L80931434: -/* 04E64 80931434 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04E68 80931438 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 04E6C 8093143C 03194024 */ and $t0, $t8, $t9 -/* 04E70 80931440 A2080195 */ sb $t0, 0x0195($s0) ## 00000195 -/* 04E74 80931444 0C01E0C4 */ jal Math_SmoothStepToF - -/* 04E78 80931448 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 04E7C 8093144C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 04E80 80931450 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 04E84 80931454 82090195 */ lb $t1, 0x0195($s0) ## 00000195 -/* 04E88 80931458 00005025 */ or $t2, $zero, $zero ## $t2 = 00000000 -/* 04E8C 8093145C 4610003C */ c.lt.s $f0, $f16 -/* 04E90 80931460 00000000 */ nop -/* 04E94 80931464 45020003 */ bc1fl .L80931474 -/* 04E98 80931468 012A5824 */ and $t3, $t1, $t2 -/* 04E9C 8093146C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 04EA0 80931470 012A5824 */ and $t3, $t1, $t2 -.L80931474: -/* 04EA4 80931474 A20B0195 */ sb $t3, 0x0195($s0) ## 00000195 -/* 04EA8 80931478 0C01DE1C */ jal Math_SinS - ## sins? -/* 04EAC 8093147C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 04EB0 80931480 C61203C4 */ lwc1 $f18, 0x03C4($s0) ## 000003C4 -/* 04EB4 80931484 3C0C8094 */ lui $t4, %hi(D_80938C90) ## $t4 = 80940000 -/* 04EB8 80931488 8D8C8C90 */ lw $t4, %lo(D_80938C90)($t4) -/* 04EBC 8093148C 46120102 */ mul.s $f4, $f0, $f18 -/* 04EC0 80931490 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 04EC4 80931494 C5860024 */ lwc1 $f6, 0x0024($t4) ## 80940024 -/* 04EC8 80931498 46062200 */ add.s $f8, $f4, $f6 -/* 04ECC 8093149C 0C01DE0D */ jal Math_CosS - ## coss? -/* 04ED0 809314A0 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 04ED4 809314A4 C60A03C4 */ lwc1 $f10, 0x03C4($s0) ## 000003C4 -/* 04ED8 809314A8 3C0D8094 */ lui $t5, %hi(D_80938C90) ## $t5 = 80940000 -/* 04EDC 809314AC 8DAD8C90 */ lw $t5, %lo(D_80938C90)($t5) -/* 04EE0 809314B0 460A0402 */ mul.s $f16, $f0, $f10 -/* 04EE4 809314B4 C5B2002C */ lwc1 $f18, 0x002C($t5) ## 8094002C -/* 04EE8 809314B8 46128100 */ add.s $f4, $f16, $f18 -/* 04EEC 809314BC 10000007 */ beq $zero, $zero, .L809314DC -/* 04EF0 809314C0 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 04EF4 809314C4 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -.L809314C8: -/* 04EF8 809314C8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 04EFC 809314CC 81CF0195 */ lb $t7, 0x0195($t6) ## 00000195 -/* 04F00 809314D0 51E00003 */ beql $t7, $zero, .L809314E0 -/* 04F04 809314D4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04F08 809314D8 A6180198 */ sh $t8, 0x0198($s0) ## 00000198 -.L809314DC: -/* 04F0C 809314DC 8FBF0024 */ lw $ra, 0x0024($sp) -.L809314E0: -/* 04F10 809314E0 8FB00020 */ lw $s0, 0x0020($sp) -/* 04F14 809314E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04F18 809314E8 03E00008 */ jr $ra -/* 04F1C 809314EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s deleted file mode 100644 index f934262b3e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_809314F0 -/* 04F20 809314F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04F24 809314F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04F28 809314F8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 04F2C 809314FC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 04F30 80931500 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 04F34 80931504 AFA70018 */ sw $a3, 0x0018($sp) -/* 04F38 80931508 000E7880 */ sll $t7, $t6, 2 -/* 04F3C 8093150C 00AF2821 */ addu $a1, $a1, $t7 -/* 04F40 80931510 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 04F44 80931514 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04F48 80931518 0C029490 */ jal Animation_MorphToPlayOnce -/* 04F4C 8093151C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 04F50 80931520 8FA40018 */ lw $a0, 0x0018($sp) -/* 04F54 80931524 24180240 */ addiu $t8, $zero, 0x0240 ## $t8 = 00000240 -/* 04F58 80931528 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 04F5C 8093152C A4800198 */ sh $zero, 0x0198($a0) ## 00000198 -/* 04F60 80931530 A498019C */ sh $t8, 0x019C($a0) ## 0000019C -/* 04F64 80931534 A480019A */ sh $zero, 0x019A($a0) ## 0000019A -/* 04F68 80931538 0C24CF20 */ jal func_80933C80 -/* 04F6C 8093153C A0800195 */ sb $zero, 0x0195($a0) ## 00000195 -/* 04F70 80931540 8FA70018 */ lw $a3, 0x0018($sp) -/* 04F74 80931544 3C198093 */ lui $t9, %hi(func_80931560) ## $t9 = 80930000 -/* 04F78 80931548 27391560 */ addiu $t9, $t9, %lo(func_80931560) ## $t9 = 80931560 -/* 04F7C 8093154C ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 04F80 80931550 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04F84 80931554 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04F88 80931558 03E00008 */ jr $ra -/* 04F8C 8093155C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s deleted file mode 100644 index 37677f52f3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s +++ /dev/null @@ -1,159 +0,0 @@ -glabel func_80931560 -/* 04F90 80931560 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04F94 80931564 AFBF001C */ sw $ra, 0x001C($sp) -/* 04F98 80931568 AFB00018 */ sw $s0, 0x0018($sp) -/* 04F9C 8093156C AFA5002C */ sw $a1, 0x002C($sp) -/* 04FA0 80931570 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 04FA4 80931574 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04FA8 80931578 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04FAC 8093157C 0C02927F */ jal SkelAnime_Update - -/* 04FB0 80931580 AFAF0024 */ sw $t7, 0x0024($sp) -/* 04FB4 80931584 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 04FB8 80931588 50600024 */ beql $v1, $zero, .L8093161C -/* 04FBC 8093158C 920303E4 */ lbu $v1, 0x03E4($s0) ## 000003E4 -/* 04FC0 80931590 10600003 */ beq $v1, $zero, .L809315A0 -/* 04FC4 80931594 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF -/* 04FC8 80931598 A6180198 */ sh $t8, 0x0198($s0) ## 00000198 -/* 04FCC 8093159C 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -.L809315A0: -/* 04FD0 809315A0 14600069 */ bne $v1, $zero, .L80931748 -/* 04FD4 809315A4 3C198093 */ lui $t9, %hi(D_809378A8) ## $t9 = 80930000 -/* 04FD8 809315A8 8F3978A8 */ lw $t9, %lo(D_809378A8)($t9) -/* 04FDC 809315AC 53200013 */ beql $t9, $zero, .L809315FC -/* 04FE0 809315B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04FE4 809315B4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 04FE8 809315B8 00000000 */ nop -/* 04FEC 809315BC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 04FF0 809315C0 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 04FF4 809315C4 8FA4002C */ lw $a0, 0x002C($sp) -/* 04FF8 809315C8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 04FFC 809315CC 4604003C */ c.lt.s $f0, $f4 -/* 05000 809315D0 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F -/* 05004 809315D4 45000003 */ bc1f .L809315E4 -/* 05008 809315D8 00000000 */ nop -/* 0500C 809315DC 10000001 */ beq $zero, $zero, .L809315E4 -/* 05010 809315E0 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -.L809315E4: -/* 05014 809315E4 00023400 */ sll $a2, $v0, 16 -/* 05018 809315E8 0C007D52 */ jal Item_DropCollectible - -/* 0501C 809315EC 00063403 */ sra $a2, $a2, 16 -/* 05020 809315F0 3C018093 */ lui $at, %hi(D_809378A8) ## $at = 80930000 -/* 05024 809315F4 AC2078A8 */ sw $zero, %lo(D_809378A8)($at) -/* 05028 809315F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809315FC: -/* 0502C 809315FC 8FA5002C */ lw $a1, 0x002C($sp) -/* 05030 80931600 0C24CE5E */ jal func_80933978 -/* 05034 80931604 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 05038 80931608 0C24C5E2 */ jal func_80931788 -/* 0503C 8093160C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05040 80931610 1000004E */ beq $zero, $zero, .L8093174C -/* 05044 80931614 8FA20024 */ lw $v0, 0x0024($sp) -/* 05048 80931618 920303E4 */ lbu $v1, 0x03E4($s0) ## 000003E4 -.L8093161C: -/* 0504C 8093161C 30680002 */ andi $t0, $v1, 0x0002 ## $t0 = 00000000 -/* 05050 80931620 5100000B */ beql $t0, $zero, .L80931650 -/* 05054 80931624 820C0195 */ lb $t4, 0x0195($s0) ## 00000195 -/* 05058 80931628 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 0505C 8093162C 3069FFFC */ andi $t1, $v1, 0xFFFC ## $t1 = 00000000 -/* 05060 80931630 A20903E4 */ sb $t1, 0x03E4($s0) ## 000003E4 -/* 05064 80931634 904A03E4 */ lbu $t2, 0x03E4($v0) ## 000003E4 -/* 05068 80931638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0506C 8093163C 314BFFFC */ andi $t3, $t2, 0xFFFC ## $t3 = 00000000 -/* 05070 80931640 A04B03E4 */ sb $t3, 0x03E4($v0) ## 000003E4 -/* 05074 80931644 0C24CE37 */ jal func_809338DC -/* 05078 80931648 8FA5002C */ lw $a1, 0x002C($sp) -/* 0507C 8093164C 820C0195 */ lb $t4, 0x0195($s0) ## 00000195 -.L80931650: -/* 05080 80931650 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 05084 80931654 51800010 */ beql $t4, $zero, .L80931698 -/* 05088 80931658 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -/* 0508C 8093165C 920E03E4 */ lbu $t6, 0x03E4($s0) ## 000003E4 -/* 05090 80931660 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E -/* 05094 80931664 A60D0198 */ sh $t5, 0x0198($s0) ## 00000198 -/* 05098 80931668 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 -/* 0509C 8093166C A20F03E4 */ sb $t7, 0x03E4($s0) ## 000003E4 -/* 050A0 80931670 8FB80024 */ lw $t8, 0x0024($sp) -/* 050A4 80931674 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 050A8 80931678 3C018093 */ lui $at, %hi(D_809378A8) ## $at = 80930000 -/* 050AC 8093167C 8F190680 */ lw $t9, 0x0680($t8) ## 00000680 -/* 050B0 80931680 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 050B4 80931684 55000031 */ bnel $t0, $zero, .L8093174C -/* 050B8 80931688 8FA20024 */ lw $v0, 0x0024($sp) -/* 050BC 8093168C 1000002E */ beq $zero, $zero, .L80931748 -/* 050C0 80931690 AC2978A8 */ sw $t1, %lo(D_809378A8)($at) -/* 050C4 80931694 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -.L80931698: -/* 050C8 80931698 8603019C */ lh $v1, 0x019C($s0) ## 0000019C -/* 050CC 8093169C 254B0040 */ addiu $t3, $t2, 0x0040 ## $t3 = 00000040 -/* 050D0 809316A0 A60B019A */ sh $t3, 0x019A($s0) ## 0000019A -/* 050D4 809316A4 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 050D8 809316A8 0062082A */ slt $at, $v1, $v0 -/* 050DC 809316AC 50200004 */ beql $at, $zero, .L809316C0 -/* 050E0 809316B0 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -/* 050E4 809316B4 10000002 */ beq $zero, $zero, .L809316C0 -/* 050E8 809316B8 A603019A */ sh $v1, 0x019A($s0) ## 0000019A -/* 050EC 809316BC A602019A */ sh $v0, 0x019A($s0) ## 0000019A -.L809316C0: -/* 050F0 809316C0 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 050F4 809316C4 0C01DE2B */ jal Math_ScaledStepToS - -/* 050F8 809316C8 8606019A */ lh $a2, 0x019A($s0) ## 0000019A -/* 050FC 809316CC 1040000A */ beq $v0, $zero, .L809316F8 -/* 05100 809316D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05104 809316D4 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 05108 809316D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0510C 809316DC 55800004 */ bnel $t4, $zero, .L809316F0 -/* 05110 809316E0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 05114 809316E4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 05118 809316E8 24053952 */ addiu $a1, $zero, 0x3952 ## $a1 = 00003952 -/* 0511C 809316EC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -.L809316F0: -/* 05120 809316F0 10000003 */ beq $zero, $zero, .L80931700 -/* 05124 809316F4 A20D0195 */ sb $t5, 0x0195($s0) ## 00000195 -.L809316F8: -/* 05128 809316F8 0C00BE5D */ jal func_8002F974 -/* 0512C 809316FC 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -.L80931700: -/* 05130 80931700 0C01DE1C */ jal Math_SinS - ## sins? -/* 05134 80931704 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05138 80931708 C60603C4 */ lwc1 $f6, 0x03C4($s0) ## 000003C4 -/* 0513C 8093170C 3C0E8094 */ lui $t6, %hi(D_80938C90) ## $t6 = 80940000 -/* 05140 80931710 8DCE8C90 */ lw $t6, %lo(D_80938C90)($t6) -/* 05144 80931714 46060202 */ mul.s $f8, $f0, $f6 -/* 05148 80931718 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0514C 8093171C C5CA0024 */ lwc1 $f10, 0x0024($t6) ## 80940024 -/* 05150 80931720 460A4400 */ add.s $f16, $f8, $f10 -/* 05154 80931724 0C01DE0D */ jal Math_CosS - ## coss? -/* 05158 80931728 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 0515C 8093172C C61203C4 */ lwc1 $f18, 0x03C4($s0) ## 000003C4 -/* 05160 80931730 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 05164 80931734 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 05168 80931738 46120102 */ mul.s $f4, $f0, $f18 -/* 0516C 8093173C C5E6002C */ lwc1 $f6, 0x002C($t7) ## 8094002C -/* 05170 80931740 46062200 */ add.s $f8, $f4, $f6 -/* 05174 80931744 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -.L80931748: -/* 05178 80931748 8FA20024 */ lw $v0, 0x0024($sp) -.L8093174C: -/* 0517C 8093174C 8C580118 */ lw $t8, 0x0118($v0) ## 00000118 -/* 05180 80931750 56180009 */ bnel $s0, $t8, .L80931778 -/* 05184 80931754 8FBF001C */ lw $ra, 0x001C($sp) -/* 05188 80931758 A4400850 */ sh $zero, 0x0850($v0) ## 00000850 -/* 0518C 8093175C 8E080024 */ lw $t0, 0x0024($s0) ## 00000024 -/* 05190 80931760 AC480024 */ sw $t0, 0x0024($v0) ## 00000024 -/* 05194 80931764 8E190028 */ lw $t9, 0x0028($s0) ## 00000028 -/* 05198 80931768 AC590028 */ sw $t9, 0x0028($v0) ## 00000028 -/* 0519C 8093176C 8E08002C */ lw $t0, 0x002C($s0) ## 0000002C -/* 051A0 80931770 AC48002C */ sw $t0, 0x002C($v0) ## 0000002C -/* 051A4 80931774 8FBF001C */ lw $ra, 0x001C($sp) -.L80931778: -/* 051A8 80931778 8FB00018 */ lw $s0, 0x0018($sp) -/* 051AC 8093177C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 051B0 80931780 03E00008 */ jr $ra -/* 051B4 80931784 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s deleted file mode 100644 index 2e7905f48a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80931788 -/* 051B8 80931788 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 051BC 8093178C AFBF0014 */ sw $ra, 0x0014($sp) -/* 051C0 80931790 808F0194 */ lb $t7, 0x0194($a0) ## 00000194 -/* 051C4 80931794 848E0016 */ lh $t6, 0x0016($a0) ## 00000016 -/* 051C8 80931798 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 051CC 8093179C 000FC300 */ sll $t8, $t7, 12 -/* 051D0 809317A0 01D8C823 */ subu $t9, $t6, $t8 -/* 051D4 809317A4 A49901A4 */ sh $t9, 0x01A4($a0) ## 000001A4 -/* 051D8 809317A8 84E8001C */ lh $t0, 0x001C($a3) ## 0000001C -/* 051DC 809317AC 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 051E0 809317B0 AFA70018 */ sw $a3, 0x0018($sp) -/* 051E4 809317B4 00084880 */ sll $t1, $t0, 2 -/* 051E8 809317B8 00A92821 */ addu $a1, $a1, $t1 -/* 051EC 809317BC 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 051F0 809317C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 051F4 809317C4 0C029490 */ jal Animation_MorphToPlayOnce -/* 051F8 809317C8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 051FC 809317CC 8FA70018 */ lw $a3, 0x0018($sp) -/* 05200 809317D0 3C0C8093 */ lui $t4, %hi(func_809317F8) ## $t4 = 80930000 -/* 05204 809317D4 258C17F8 */ addiu $t4, $t4, %lo(func_809317F8) ## $t4 = 809317F8 -/* 05208 809317D8 90EA03E4 */ lbu $t2, 0x03E4($a3) ## 000003E4 -/* 0520C 809317DC ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 05210 809317E0 314BFFFC */ andi $t3, $t2, 0xFFFC ## $t3 = 00000000 -/* 05214 809317E4 A0EB03E4 */ sb $t3, 0x03E4($a3) ## 000003E4 -/* 05218 809317E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0521C 809317EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05220 809317F0 03E00008 */ jr $ra -/* 05224 809317F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s deleted file mode 100644 index d7a41ddbc6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809317F8 -/* 05228 809317F8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0522C 809317FC AFB00018 */ sw $s0, 0x0018($sp) -/* 05230 80931800 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05234 80931804 AFBF001C */ sw $ra, 0x001C($sp) -/* 05238 80931808 AFA50024 */ sw $a1, 0x0024($sp) -/* 0523C 8093180C 0C02927F */ jal SkelAnime_Update - -/* 05240 80931810 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05244 80931814 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 05248 80931818 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0524C 8093181C 0C01DE2B */ jal Math_ScaledStepToS - -/* 05250 80931820 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 05254 80931824 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 05258 80931828 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 0525C 8093182C 0C01DE2B */ jal Math_ScaledStepToS - -/* 05260 80931830 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 -/* 05264 80931834 10400003 */ beq $v0, $zero, .L80931844 -/* 05268 80931838 00000000 */ nop -/* 0526C 8093183C 0C24C11D */ jal func_80930474 -/* 05270 80931840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80931844: -/* 05274 80931844 0C01DE1C */ jal Math_SinS - ## sins? -/* 05278 80931848 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0527C 8093184C C60403C4 */ lwc1 $f4, 0x03C4($s0) ## 000003C4 -/* 05280 80931850 3C0E8094 */ lui $t6, %hi(D_80938C90) ## $t6 = 80940000 -/* 05284 80931854 8DCE8C90 */ lw $t6, %lo(D_80938C90)($t6) -/* 05288 80931858 46040182 */ mul.s $f6, $f0, $f4 -/* 0528C 8093185C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05290 80931860 C5C80024 */ lwc1 $f8, 0x0024($t6) ## 80940024 -/* 05294 80931864 46083280 */ add.s $f10, $f6, $f8 -/* 05298 80931868 0C01DE0D */ jal Math_CosS - ## coss? -/* 0529C 8093186C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 052A0 80931870 C61003C4 */ lwc1 $f16, 0x03C4($s0) ## 000003C4 -/* 052A4 80931874 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 052A8 80931878 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 052AC 8093187C 46100482 */ mul.s $f18, $f0, $f16 -/* 052B0 80931880 C5E4002C */ lwc1 $f4, 0x002C($t7) ## 8094002C -/* 052B4 80931884 46049180 */ add.s $f6, $f18, $f4 -/* 052B8 80931888 E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 052BC 8093188C 8FBF001C */ lw $ra, 0x001C($sp) -/* 052C0 80931890 8FB00018 */ lw $s0, 0x0018($sp) -/* 052C4 80931894 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 052C8 80931898 03E00008 */ jr $ra -/* 052CC 8093189C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s deleted file mode 100644 index e87d73e607..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809318A0 -/* 052D0 809318A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 052D4 809318A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 052D8 809318A8 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 052DC 809318AC 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 052E0 809318B0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 052E4 809318B4 000FC080 */ sll $t8, $t7, 2 -/* 052E8 809318B8 00380821 */ addu $at, $at, $t8 -/* 052EC 809318BC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 052F0 809318C0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 052F4 809318C4 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C -/* 052F8 809318C8 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 052FC 809318CC AFA70018 */ sw $a3, 0x0018($sp) -/* 05300 809318D0 00194080 */ sll $t0, $t9, 2 -/* 05304 809318D4 00A82821 */ addu $a1, $a1, $t0 -/* 05308 809318D8 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 0530C 809318DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05310 809318E0 0C029490 */ jal Animation_MorphToPlayOnce -/* 05314 809318E4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 05318 809318E8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0531C 809318EC 3C0B8093 */ lui $t3, %hi(func_80931928) ## $t3 = 80930000 -/* 05320 809318F0 256B1928 */ addiu $t3, $t3, %lo(func_80931928) ## $t3 = 80931928 -/* 05324 809318F4 80E20194 */ lb $v0, 0x0194($a3) ## 00000194 -/* 05328 809318F8 ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 0532C 809318FC 00020823 */ subu $at, $zero, $v0 -/* 05330 80931900 00014880 */ sll $t1, $at, 2 -/* 05334 80931904 01214821 */ addu $t1, $t1, $at -/* 05338 80931908 00094B00 */ sll $t1, $t1, 12 -/* 0533C 8093190C 00025380 */ sll $t2, $v0, 14 -/* 05340 80931910 A4E901A4 */ sh $t1, 0x01A4($a3) ## 000001A4 -/* 05344 80931914 A4EA01A6 */ sh $t2, 0x01A6($a3) ## 000001A6 -/* 05348 80931918 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0534C 8093191C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05350 80931920 03E00008 */ jr $ra -/* 05354 80931924 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s deleted file mode 100644 index a854e1a4e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80931928 -/* 05358 80931928 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0535C 8093192C AFB00020 */ sw $s0, 0x0020($sp) -/* 05360 80931930 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05364 80931934 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05368 80931938 AFA50034 */ sw $a1, 0x0034($sp) -/* 0536C 8093193C 0C02927F */ jal SkelAnime_Update - -/* 05370 80931940 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05374 80931944 860501A6 */ lh $a1, 0x01A6($s0) ## 000001A6 -/* 05378 80931948 240E0100 */ addiu $t6, $zero, 0x0100 ## $t6 = 00000100 -/* 0537C 8093194C AFAE0010 */ sw $t6, 0x0010($sp) -/* 05380 80931950 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 05384 80931954 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 05388 80931958 0C01E1A7 */ jal Math_SmoothStepToS - -/* 0538C 8093195C 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 05390 80931960 2C4F0001 */ sltiu $t7, $v0, 0x0001 -/* 05394 80931964 AFAF002C */ sw $t7, 0x002C($sp) -/* 05398 80931968 861901A4 */ lh $t9, 0x01A4($s0) ## 000001A4 -/* 0539C 8093196C 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 053A0 80931970 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 053A4 80931974 24060A00 */ addiu $a2, $zero, 0x0A00 ## $a2 = 00000A00 -/* 053A8 80931978 03192821 */ addu $a1, $t8, $t9 -/* 053AC 8093197C 00052C00 */ sll $a1, $a1, 16 -/* 053B0 80931980 0C01DE2B */ jal Math_ScaledStepToS - -/* 053B4 80931984 00052C03 */ sra $a1, $a1, 16 -/* 053B8 80931988 8FA8002C */ lw $t0, 0x002C($sp) -/* 053BC 8093198C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 053C0 80931990 3C0542BE */ lui $a1, 0x42BE ## $a1 = 42BE0000 -/* 053C4 80931994 01024824 */ and $t1, $t0, $v0 -/* 053C8 80931998 AFA9002C */ sw $t1, 0x002C($sp) -/* 053CC 8093199C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 053D0 809319A0 0C01E107 */ jal Math_ApproachF - -/* 053D4 809319A4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 053D8 809319A8 8FAA002C */ lw $t2, 0x002C($sp) -/* 053DC 809319AC 51400004 */ beql $t2, $zero, .L809319C0 -/* 053E0 809319B0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 053E4 809319B4 0C24C674 */ jal func_809319D0 -/* 053E8 809319B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 053EC 809319BC 8FBF0024 */ lw $ra, 0x0024($sp) -.L809319C0: -/* 053F0 809319C0 8FB00020 */ lw $s0, 0x0020($sp) -/* 053F4 809319C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 053F8 809319C8 03E00008 */ jr $ra -/* 053FC 809319CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s deleted file mode 100644 index f8a97e93d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_809319D0 -/* 05400 809319D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05404 809319D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05408 809319D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0540C 809319DC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 05410 809319E0 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 -/* 05414 809319E4 AFA70018 */ sw $a3, 0x0018($sp) -/* 05418 809319E8 000E7880 */ sll $t7, $t6, 2 -/* 0541C 809319EC 00AF2821 */ addu $a1, $a1, $t7 -/* 05420 809319F0 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 05424 809319F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05428 809319F8 0C029490 */ jal Animation_MorphToPlayOnce -/* 0542C 809319FC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 05430 80931A00 8FA40018 */ lw $a0, 0x0018($sp) -/* 05434 80931A04 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 05438 80931A08 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0543C 80931A0C 80990194 */ lb $t9, 0x0194($a0) ## 00000194 -/* 05440 80931A10 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 05444 80931A14 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E -/* 05448 80931A18 00194380 */ sll $t0, $t9, 14 -/* 0544C 80931A1C 03084821 */ addu $t1, $t8, $t0 -/* 05450 80931A20 A4890032 */ sh $t1, 0x0032($a0) ## 00000032 -/* 05454 80931A24 848A0032 */ lh $t2, 0x0032($a0) ## 00000032 -/* 05458 80931A28 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 0545C 80931A2C A48B0198 */ sh $t3, 0x0198($a0) ## 00000198 -/* 05460 80931A30 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 05464 80931A34 0C24CF20 */ jal func_80933C80 -/* 05468 80931A38 A48A01A4 */ sh $t2, 0x01A4($a0) ## 000001A4 -/* 0546C 80931A3C 8FA70018 */ lw $a3, 0x0018($sp) -/* 05470 80931A40 3C0C8093 */ lui $t4, %hi(func_80931A5C) ## $t4 = 80930000 -/* 05474 80931A44 258C1A5C */ addiu $t4, $t4, %lo(func_80931A5C) ## $t4 = 80931A5C -/* 05478 80931A48 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 0547C 80931A4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05480 80931A50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05484 80931A54 03E00008 */ jr $ra -/* 05488 80931A58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s deleted file mode 100644 index 4ff8b63b42..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s +++ /dev/null @@ -1,196 +0,0 @@ -.late_rodata -glabel D_809379F0 - .word 0x3D567750 -glabel D_809379F4 - .word 0x3FA147AE - -.text -glabel func_80931A5C -/* 0548C 80931A5C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05490 80931A60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05494 80931A64 AFB00020 */ sw $s0, 0x0020($sp) -/* 05498 80931A68 AFA50034 */ sw $a1, 0x0034($sp) -/* 0549C 80931A6C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 054A0 80931A70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 054A4 80931A74 AFAF002C */ sw $t7, 0x002C($sp) -/* 054A8 80931A78 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 054AC 80931A7C 10400003 */ beq $v0, $zero, .L80931A8C -/* 054B0 80931A80 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 054B4 80931A84 A4980198 */ sh $t8, 0x0198($a0) ## 00000198 -/* 054B8 80931A88 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -.L80931A8C: -/* 054BC 80931A8C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 054C0 80931A90 3C018093 */ lui $at, %hi(D_809379F0) ## $at = 80930000 -/* 054C4 80931A94 C42879F0 */ lwc1 $f8, %lo(D_809379F0)($at) -/* 054C8 80931A98 468021A0 */ cvt.s.w $f6, $f4 -/* 054CC 80931A9C 46083302 */ mul.s $f12, $f6, $f8 -/* 054D0 80931AA0 0C0400A4 */ jal sinf - -/* 054D4 80931AA4 00000000 */ nop -/* 054D8 80931AA8 82020194 */ lb $v0, 0x0194($s0) ## 00000194 -/* 054DC 80931AAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 054E0 80931AB0 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 054E4 80931AB4 0002CB40 */ sll $t9, $v0, 13 -/* 054E8 80931AB8 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 054EC 80931ABC 860801A4 */ lh $t0, 0x01A4($s0) ## 000001A4 -/* 054F0 80931AC0 46005401 */ sub.s $f16, $f10, $f0 -/* 054F4 80931AC4 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 -/* 054F8 80931AC8 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 054FC 80931ACC 46809120 */ cvt.s.w $f4, $f18 -/* 05500 80931AD0 00026380 */ sll $t4, $v0, 14 -/* 05504 80931AD4 29C10005 */ slti $at, $t6, 0x0005 -/* 05508 80931AD8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0550C 80931ADC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 05510 80931AE0 468042A0 */ cvt.s.w $f10, $f8 -/* 05514 80931AE4 46048182 */ mul.s $f6, $f16, $f4 -/* 05518 80931AE8 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 0551C 80931AEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05520 80931AF0 460A3480 */ add.s $f18, $f6, $f10 -/* 05524 80931AF4 4600940D */ trunc.w.s $f16, $f18 -/* 05528 80931AF8 440A8000 */ mfc1 $t2, $f16 -/* 0552C 80931AFC 00000000 */ nop -/* 05530 80931B00 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 05534 80931B04 860B0032 */ lh $t3, 0x0032($s0) ## 00000032 -/* 05538 80931B08 016C6823 */ subu $t5, $t3, $t4 -/* 0553C 80931B0C 10200038 */ beq $at, $zero, .L80931BF0 -/* 05540 80931B10 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B6 -/* 05544 80931B14 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 05548 80931B18 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0554C 80931B1C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 05550 80931B20 0C01E0C4 */ jal Math_SmoothStepToF - -/* 05554 80931B24 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05558 80931B28 0C02927F */ jal SkelAnime_Update - -/* 0555C 80931B2C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 05560 80931B30 50400041 */ beql $v0, $zero, .L80931C38 -/* 05564 80931B34 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -/* 05568 80931B38 920F03E4 */ lbu $t7, 0x03E4($s0) ## 000003E4 -/* 0556C 80931B3C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 05570 80931B40 31F8FFFC */ andi $t8, $t7, 0xFFFC ## $t8 = 00000000 -/* 05574 80931B44 A21803E4 */ sb $t8, 0x03E4($s0) ## 000003E4 -/* 05578 80931B48 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 0557C 80931B4C 8FB9002C */ lw $t9, 0x002C($sp) -/* 05580 80931B50 8F280680 */ lw $t0, 0x0680($t9) ## 00000680 -/* 05584 80931B54 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 -/* 05588 80931B58 11200012 */ beq $t1, $zero, .L80931BA4 -/* 0558C 80931B5C 00000000 */ nop -/* 05590 80931B60 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 05594 80931B64 00000000 */ nop -/* 05598 80931B68 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0559C 80931B6C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 055A0 80931B70 00000000 */ nop -/* 055A4 80931B74 4606003C */ c.lt.s $f0, $f6 -/* 055A8 80931B78 00000000 */ nop -/* 055AC 80931B7C 45000005 */ bc1f .L80931B94 -/* 055B0 80931B80 00000000 */ nop -/* 055B4 80931B84 0C24C741 */ jal func_80931D04 -/* 055B8 80931B88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055BC 80931B8C 1000002A */ beq $zero, $zero, .L80931C38 -/* 055C0 80931B90 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -.L80931B94: -/* 055C4 80931B94 0C24C7BE */ jal func_80931EF8 -/* 055C8 80931B98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055CC 80931B9C 10000026 */ beq $zero, $zero, .L80931C38 -/* 055D0 80931BA0 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -.L80931BA4: -/* 055D4 80931BA4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 055D8 80931BA8 00000000 */ nop -/* 055DC 80931BAC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 055E0 80931BB0 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 055E4 80931BB4 8FA40034 */ lw $a0, 0x0034($sp) -/* 055E8 80931BB8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 055EC 80931BBC 460A003C */ c.lt.s $f0, $f10 -/* 055F0 80931BC0 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F -/* 055F4 80931BC4 45000003 */ bc1f .L80931BD4 -/* 055F8 80931BC8 00000000 */ nop -/* 055FC 80931BCC 10000001 */ beq $zero, $zero, .L80931BD4 -/* 05600 80931BD0 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -.L80931BD4: -/* 05604 80931BD4 00023400 */ sll $a2, $v0, 16 -/* 05608 80931BD8 0C007D52 */ jal Item_DropCollectible - -/* 0560C 80931BDC 00063403 */ sra $a2, $a2, 16 -/* 05610 80931BE0 0C24C11D */ jal func_80930474 -/* 05614 80931BE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05618 80931BE8 10000013 */ beq $zero, $zero, .L80931C38 -/* 0561C 80931BEC 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -.L80931BF0: -/* 05620 80931BF0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 05624 80931BF4 44811000 */ mtc1 $at, $f2 ## $f2 = 70.00 -/* 05628 80931BF8 3C018093 */ lui $at, %hi(D_809379F4) ## $at = 80930000 -/* 0562C 80931BFC C43079F4 */ lwc1 $f16, %lo(D_809379F4)($at) -/* 05630 80931C00 C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 05634 80931C04 46109102 */ mul.s $f4, $f18, $f16 -/* 05638 80931C08 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0563C 80931C0C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 05640 80931C10 4600103C */ c.lt.s $f2, $f0 -/* 05644 80931C14 00000000 */ nop -/* 05648 80931C18 45020004 */ bc1fl .L80931C2C -/* 0564C 80931C1C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 05650 80931C20 10000002 */ beq $zero, $zero, .L80931C2C -/* 05654 80931C24 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 05658 80931C28 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L80931C2C: -/* 0565C 80931C2C 0C00BE5D */ jal func_8002F974 -/* 05660 80931C30 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 05664 80931C34 920203E4 */ lbu $v0, 0x03E4($s0) ## 000003E4 -.L80931C38: -/* 05668 80931C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0566C 80931C3C 24053965 */ addiu $a1, $zero, 0x3965 ## $a1 = 00003965 -/* 05670 80931C40 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 05674 80931C44 1140000E */ beq $t2, $zero, .L80931C80 -/* 05678 80931C48 304BFFFC */ andi $t3, $v0, 0xFFFC ## $t3 = 00000000 -/* 0567C 80931C4C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 05680 80931C50 A20B03E4 */ sb $t3, 0x03E4($s0) ## 000003E4 -/* 05684 80931C54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05688 80931C58 0C24CE37 */ jal func_809338DC -/* 0568C 80931C5C 8FA50034 */ lw $a1, 0x0034($sp) -/* 05690 80931C60 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 05694 80931C64 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 -/* 05698 80931C68 28410006 */ slti $at, $v0, 0x0006 -/* 0569C 80931C6C 54200004 */ bnel $at, $zero, .L80931C80 -/* 056A0 80931C70 A6020198 */ sh $v0, 0x0198($s0) ## 00000198 -/* 056A4 80931C74 10000002 */ beq $zero, $zero, .L80931C80 -/* 056A8 80931C78 A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 -/* 056AC 80931C7C A6020198 */ sh $v0, 0x0198($s0) ## 00000198 -.L80931C80: -/* 056B0 80931C80 0C01DE1C */ jal Math_SinS - ## sins? -/* 056B4 80931C84 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 056B8 80931C88 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 056BC 80931C8C C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 056C0 80931C90 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 056C4 80931C94 46003282 */ mul.s $f10, $f6, $f0 -/* 056C8 80931C98 460A4480 */ add.s $f18, $f8, $f10 -/* 056CC 80931C9C 0C01DE0D */ jal Math_CosS - ## coss? -/* 056D0 80931CA0 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 056D4 80931CA4 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 056D8 80931CA8 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 056DC 80931CAC 8FA2002C */ lw $v0, 0x002C($sp) -/* 056E0 80931CB0 46002182 */ mul.s $f6, $f4, $f0 -/* 056E4 80931CB4 46068200 */ add.s $f8, $f16, $f6 -/* 056E8 80931CB8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 056EC 80931CBC 8C4D0680 */ lw $t5, 0x0680($v0) ## 00000680 -/* 056F0 80931CC0 31AE0080 */ andi $t6, $t5, 0x0080 ## $t6 = 00000000 -/* 056F4 80931CC4 51C0000B */ beql $t6, $zero, .L80931CF4 -/* 056F8 80931CC8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 056FC 80931CCC A4400850 */ sh $zero, 0x0850($v0) ## 00000850 -/* 05700 80931CD0 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 -/* 05704 80931CD4 AC580024 */ sw $t8, 0x0024($v0) ## 00000024 -/* 05708 80931CD8 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 -/* 0570C 80931CDC AC4F0028 */ sw $t7, 0x0028($v0) ## 00000028 -/* 05710 80931CE0 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C -/* 05714 80931CE4 AC58002C */ sw $t8, 0x002C($v0) ## 0000002C -/* 05718 80931CE8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 0571C 80931CEC A45900B6 */ sh $t9, 0x00B6($v0) ## 000000B6 -/* 05720 80931CF0 8FBF0024 */ lw $ra, 0x0024($sp) -.L80931CF4: -/* 05724 80931CF4 8FB00020 */ lw $s0, 0x0020($sp) -/* 05728 80931CF8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0572C 80931CFC 03E00008 */ jr $ra -/* 05730 80931D00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s deleted file mode 100644 index 474d3cbe43..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80931D04 -/* 05734 80931D04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05738 80931D08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0573C 80931D0C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 05740 80931D10 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 05744 80931D14 3C058093 */ lui $a1, %hi(D_8093786C) ## $a1 = 80930000 -/* 05748 80931D18 AFA70018 */ sw $a3, 0x0018($sp) -/* 0574C 80931D1C 000E7880 */ sll $t7, $t6, 2 -/* 05750 80931D20 00AF2821 */ addu $a1, $a1, $t7 -/* 05754 80931D24 8CA5786C */ lw $a1, %lo(D_8093786C)($a1) -/* 05758 80931D28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0575C 80931D2C 0C0294D3 */ jal Animation_MorphToLoop -/* 05760 80931D30 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 05764 80931D34 8FA70018 */ lw $a3, 0x0018($sp) -/* 05768 80931D38 3C198093 */ lui $t9, %hi(func_80931D5C) ## $t9 = 80930000 -/* 0576C 80931D3C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 05770 80931D40 27391D5C */ addiu $t9, $t9, %lo(func_80931D5C) ## $t9 = 80931D5C -/* 05774 80931D44 A4F80198 */ sh $t8, 0x0198($a3) ## 00000198 -/* 05778 80931D48 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 0577C 80931D4C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05780 80931D50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05784 80931D54 03E00008 */ jr $ra -/* 05788 80931D58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s deleted file mode 100644 index 64074f1b12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_80931D5C -/* 0578C 80931D5C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05790 80931D60 AFB00018 */ sw $s0, 0x0018($sp) -/* 05794 80931D64 AFBF001C */ sw $ra, 0x001C($sp) -/* 05798 80931D68 AFA5002C */ sw $a1, 0x002C($sp) -/* 0579C 80931D6C 8CA61C44 */ lw $a2, 0x1C44($a1) ## 00001C44 -/* 057A0 80931D70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 057A4 80931D74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 057A8 80931D78 AFA40020 */ sw $a0, 0x0020($sp) -/* 057AC 80931D7C 0C02927F */ jal SkelAnime_Update - -/* 057B0 80931D80 AFA60024 */ sw $a2, 0x0024($sp) -/* 057B4 80931D84 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 057B8 80931D88 8FA60024 */ lw $a2, 0x0024($sp) -/* 057BC 80931D8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057C0 80931D90 10600002 */ beq $v1, $zero, .L80931D9C -/* 057C4 80931D94 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF -/* 057C8 80931D98 A60F0198 */ sh $t7, 0x0198($s0) ## 00000198 -.L80931D9C: -/* 057CC 80931D9C 8CD80680 */ lw $t8, 0x0680($a2) ## 00000680 -/* 057D0 80931DA0 8FA5002C */ lw $a1, 0x002C($sp) -/* 057D4 80931DA4 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 057D8 80931DA8 57200008 */ bnel $t9, $zero, .L80931DCC -/* 057DC 80931DAC 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 -/* 057E0 80931DB0 0C24CE5E */ jal func_80933978 -/* 057E4 80931DB4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 057E8 80931DB8 0C24C79C */ jal func_80931E70 -/* 057EC 80931DBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057F0 80931DC0 10000027 */ beq $zero, $zero, .L80931E60 -/* 057F4 80931DC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 057F8 80931DC8 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 -.L80931DCC: -/* 057FC 80931DCC 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 05800 80931DD0 3C0C8016 */ lui $t4, %hi(gSaveContext+4) -/* 05804 80931DD4 ACC90024 */ sw $t1, 0x0024($a2) ## 00000024 -/* 05808 80931DD8 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 -/* 0580C 80931DDC ACC80028 */ sw $t0, 0x0028($a2) ## 00000028 -/* 05810 80931DE0 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 05814 80931DE4 ACC9002C */ sw $t1, 0x002C($a2) ## 0000002C -/* 05818 80931DE8 860A0198 */ lh $t2, 0x0198($s0) ## 00000198 -/* 0581C 80931DEC 55400015 */ bnel $t2, $zero, .L80931E44 -/* 05820 80931DF0 8FA40020 */ lw $a0, 0x0020($sp) -/* 05824 80931DF4 A60B0198 */ sh $t3, 0x0198($s0) ## 00000198 -/* 05828 80931DF8 8D8CE664 */ lw $t4, %lo(gSaveContext+4)($t4) -/* 0582C 80931DFC 24056825 */ addiu $a1, $zero, 0x6825 ## $a1 = 00006825 -/* 05830 80931E00 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 05834 80931E04 11800005 */ beq $t4, $zero, .L80931E1C -/* 05838 80931E08 00000000 */ nop -/* 0583C 80931E0C 0C00BDF7 */ jal func_8002F7DC -/* 05840 80931E10 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 05844 80931E14 10000004 */ beq $zero, $zero, .L80931E28 -/* 05848 80931E18 8FA4002C */ lw $a0, 0x002C($sp) -.L80931E1C: -/* 0584C 80931E1C 0C00BDF7 */ jal func_8002F7DC -/* 05850 80931E20 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 05854 80931E24 8FA4002C */ lw $a0, 0x002C($sp) -.L80931E28: -/* 05858 80931E28 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 0585C 80931E2C 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 05860 80931E30 0324C821 */ addu $t9, $t9, $a0 -/* 05864 80931E34 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 05868 80931E38 0320F809 */ jalr $ra, $t9 -/* 0586C 80931E3C 00000000 */ nop -/* 05870 80931E40 8FA40020 */ lw $a0, 0x0020($sp) -.L80931E44: -/* 05874 80931E44 0C0295B2 */ jal Animation_OnFrame -/* 05878 80931E48 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0587C 80931E4C 10400003 */ beq $v0, $zero, .L80931E5C -/* 05880 80931E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05884 80931E54 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 05888 80931E58 24053965 */ addiu $a1, $zero, 0x3965 ## $a1 = 00003965 -.L80931E5C: -/* 0588C 80931E5C 8FBF001C */ lw $ra, 0x001C($sp) -.L80931E60: -/* 05890 80931E60 8FB00018 */ lw $s0, 0x0018($sp) -/* 05894 80931E64 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05898 80931E68 03E00008 */ jr $ra -/* 0589C 80931E6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s deleted file mode 100644 index 7e3a7b193f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80931E70 -/* 058A0 80931E70 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 058A4 80931E74 AFBF0014 */ sw $ra, 0x0014($sp) -/* 058A8 80931E78 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 058AC 80931E7C 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 058B0 80931E80 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 058B4 80931E84 AFA70018 */ sw $a3, 0x0018($sp) -/* 058B8 80931E88 000E7880 */ sll $t7, $t6, 2 -/* 058BC 80931E8C 00AF2821 */ addu $a1, $a1, $t7 -/* 058C0 80931E90 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 058C4 80931E94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 058C8 80931E98 0C029490 */ jal Animation_MorphToPlayOnce -/* 058CC 80931E9C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 058D0 80931EA0 8FA70018 */ lw $a3, 0x0018($sp) -/* 058D4 80931EA4 3C188093 */ lui $t8, %hi(func_80931EC0) ## $t8 = 80930000 -/* 058D8 80931EA8 27181EC0 */ addiu $t8, $t8, %lo(func_80931EC0) ## $t8 = 80931EC0 -/* 058DC 80931EAC ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 058E0 80931EB0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 058E4 80931EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 058E8 80931EB8 03E00008 */ jr $ra -/* 058EC 80931EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s deleted file mode 100644 index 5021bf7507..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80931EC0 -/* 058F0 80931EC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 058F4 80931EC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 058F8 80931EC8 AFA40018 */ sw $a0, 0x0018($sp) -/* 058FC 80931ECC AFA5001C */ sw $a1, 0x001C($sp) -/* 05900 80931ED0 0C02927F */ jal SkelAnime_Update - -/* 05904 80931ED4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05908 80931ED8 50400004 */ beql $v0, $zero, .L80931EEC -/* 0590C 80931EDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05910 80931EE0 0C24C11D */ jal func_80930474 -/* 05914 80931EE4 8FA40018 */ lw $a0, 0x0018($sp) -/* 05918 80931EE8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80931EEC: -/* 0591C 80931EEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05920 80931EF0 03E00008 */ jr $ra -/* 05924 80931EF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s deleted file mode 100644 index 0c34e5410f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80931EF8 -/* 05928 80931EF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0592C 80931EFC AFBF0014 */ sw $ra, 0x0014($sp) -/* 05930 80931F00 240EC000 */ addiu $t6, $zero, 0xC000 ## $t6 = FFFFC000 -/* 05934 80931F04 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 05938 80931F08 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 0593C 80931F0C A48E01A2 */ sh $t6, 0x01A2($a0) ## 000001A2 -/* 05940 80931F10 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 05944 80931F14 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 05948 80931F18 0C01DE1C */ jal Math_SinS - ## sins? -/* 0594C 80931F1C AFA50018 */ sw $a1, 0x0018($sp) -/* 05950 80931F20 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 05954 80931F24 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 05958 80931F28 8FA50018 */ lw $a1, 0x0018($sp) -/* 0595C 80931F2C 46060202 */ mul.s $f8, $f0, $f6 -/* 05960 80931F30 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 05964 80931F34 C4B00028 */ lwc1 $f16, 0x0028($a1) ## 00000028 -/* 05968 80931F38 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 0596C 80931F3C E4B003CC */ swc1 $f16, 0x03CC($a1) ## 000003CC -/* 05970 80931F40 46082281 */ sub.s $f10, $f4, $f8 -/* 05974 80931F44 0C01DE0D */ jal Math_CosS - ## coss? -/* 05978 80931F48 E4AA03C8 */ swc1 $f10, 0x03C8($a1) ## 000003C8 -/* 0597C 80931F4C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 05980 80931F50 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 05984 80931F54 8FA50018 */ lw $a1, 0x0018($sp) -/* 05988 80931F58 3C188093 */ lui $t8, %hi(func_80931F84) ## $t8 = 80930000 -/* 0598C 80931F5C 46060102 */ mul.s $f4, $f0, $f6 -/* 05990 80931F60 C4B2002C */ lwc1 $f18, 0x002C($a1) ## 0000002C -/* 05994 80931F64 27181F84 */ addiu $t8, $t8, %lo(func_80931F84) ## $t8 = 80931F84 -/* 05998 80931F68 ACB80190 */ sw $t8, 0x0190($a1) ## 00000190 -/* 0599C 80931F6C 46049201 */ sub.s $f8, $f18, $f4 -/* 059A0 80931F70 E4A803D0 */ swc1 $f8, 0x03D0($a1) ## 000003D0 -/* 059A4 80931F74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 059A8 80931F78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 059AC 80931F7C 03E00008 */ jr $ra -/* 059B0 80931F80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s deleted file mode 100644 index 0278c6bdef..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s +++ /dev/null @@ -1,231 +0,0 @@ -glabel func_80931F84 -/* 059B4 80931F84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 059B8 80931F88 AFB0001C */ sw $s0, 0x001C($sp) -/* 059BC 80931F8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 059C0 80931F90 AFBF0024 */ sw $ra, 0x0024($sp) -/* 059C4 80931F94 AFB10020 */ sw $s1, 0x0020($sp) -/* 059C8 80931F98 AFA50034 */ sw $a1, 0x0034($sp) -/* 059CC 80931F9C 86060198 */ lh $a2, 0x0198($s0) ## 00000198 -/* 059D0 80931FA0 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 -/* 059D4 80931FA4 860501A2 */ lh $a1, 0x01A2($s0) ## 000001A2 -/* 059D8 80931FA8 00C00821 */ addu $at, $a2, $zero -/* 059DC 80931FAC 000630C0 */ sll $a2, $a2, 3 -/* 059E0 80931FB0 00C13023 */ subu $a2, $a2, $at -/* 059E4 80931FB4 000630C0 */ sll $a2, $a2, 3 -/* 059E8 80931FB8 00C13021 */ addu $a2, $a2, $at -/* 059EC 80931FBC 00063080 */ sll $a2, $a2, 2 -/* 059F0 80931FC0 24C601C8 */ addiu $a2, $a2, 0x01C8 ## $a2 = 000001C8 -/* 059F4 80931FC4 00063400 */ sll $a2, $a2, 16 -/* 059F8 80931FC8 00063403 */ sra $a2, $a2, 16 -/* 059FC 80931FCC 0C01DE2B */ jal Math_ScaledStepToS - -/* 05A00 80931FD0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 05A04 80931FD4 50400027 */ beql $v0, $zero, .L80932074 -/* 05A08 80931FD8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 05A0C 80931FDC 860F01A2 */ lh $t7, 0x01A2($s0) ## 000001A2 -/* 05A10 80931FE0 51E00010 */ beql $t7, $zero, .L80932024 -/* 05A14 80931FE4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 05A18 80931FE8 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -/* 05A1C 80931FEC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 05A20 80931FF0 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 -/* 05A24 80931FF4 1701001E */ bne $t8, $at, .L80932070 -/* 05A28 80931FF8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 05A2C 80931FFC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 05A30 80932000 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 05A34 80932004 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 05A38 80932008 00194080 */ sll $t0, $t9, 2 -/* 05A3C 8093200C 00A82821 */ addu $a1, $a1, $t0 -/* 05A40 80932010 0C029490 */ jal Animation_MorphToPlayOnce -/* 05A44 80932014 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 05A48 80932018 10000016 */ beq $zero, $zero, .L80932074 -/* 05A4C 8093201C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 05A50 80932020 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L80932024: -/* 05A54 80932024 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 05A58 80932028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A5C 8093202C 54410007 */ bnel $v0, $at, .L8093204C -/* 05A60 80932030 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 05A64 80932034 A62000B4 */ sh $zero, 0x00B4($s1) ## 000000B4 -/* 05A68 80932038 0C24C11D */ jal func_80930474 -/* 05A6C 8093203C A62000B8 */ sh $zero, 0x00B8($s1) ## 000000B8 -/* 05A70 80932040 10000098 */ beq $zero, $zero, .L809322A4 -/* 05A74 80932044 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05A78 80932048 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L8093204C: -/* 05A7C 8093204C 14410004 */ bne $v0, $at, .L80932060 -/* 05A80 80932050 240AC000 */ addiu $t2, $zero, 0xC000 ## $t2 = FFFFC000 -/* 05A84 80932054 2409A000 */ addiu $t1, $zero, 0xA000 ## $t1 = FFFFA000 -/* 05A88 80932058 10000002 */ beq $zero, $zero, .L80932064 -/* 05A8C 8093205C A60901A2 */ sh $t1, 0x01A2($s0) ## 000001A2 -.L80932060: -/* 05A90 80932060 A60A01A2 */ sh $t2, 0x01A2($s0) ## 000001A2 -.L80932064: -/* 05A94 80932064 860B0198 */ lh $t3, 0x0198($s0) ## 00000198 -/* 05A98 80932068 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 05A9C 8093206C A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 -.L80932070: -/* 05AA0 80932070 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -.L80932074: -/* 05AA4 80932074 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 05AA8 80932078 00042400 */ sll $a0, $a0, 16 -/* 05AAC 8093207C 0C01DE0D */ jal Math_CosS - ## coss? -/* 05AB0 80932080 00042403 */ sra $a0, $a0, 16 -/* 05AB4 80932084 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 05AB8 80932088 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 05ABC 8093208C C60803CC */ lwc1 $f8, 0x03CC($s0) ## 000003CC -/* 05AC0 80932090 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 05AC4 80932094 46040182 */ mul.s $f6, $f0, $f4 -/* 05AC8 80932098 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 05ACC 8093209C 00042400 */ sll $a0, $a0, 16 -/* 05AD0 809320A0 00042403 */ sra $a0, $a0, 16 -/* 05AD4 809320A4 46083280 */ add.s $f10, $f6, $f8 -/* 05AD8 809320A8 0C01DE1C */ jal Math_SinS - ## sins? -/* 05ADC 809320AC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 05AE0 809320B0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 05AE4 809320B4 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 05AE8 809320B8 00000000 */ nop -/* 05AEC 809320BC 46100482 */ mul.s $f18, $f0, $f16 -/* 05AF0 809320C0 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 05AF4 809320C4 0C01DE1C */ jal Math_SinS - ## sins? -/* 05AF8 809320C8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05AFC 809320CC C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 05B00 809320D0 C60803C8 */ lwc1 $f8, 0x03C8($s0) ## 000003C8 -/* 05B04 809320D4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05B08 809320D8 46040182 */ mul.s $f6, $f0, $f4 -/* 05B0C 809320DC 46083280 */ add.s $f10, $f6, $f8 -/* 05B10 809320E0 0C01DE0D */ jal Math_CosS - ## coss? -/* 05B14 809320E4 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 05B18 809320E8 C7B00028 */ lwc1 $f16, 0x0028($sp) -/* 05B1C 809320EC C60403D0 */ lwc1 $f4, 0x03D0($s0) ## 000003D0 -/* 05B20 809320F0 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -/* 05B24 809320F4 46100482 */ mul.s $f18, $f0, $f16 -/* 05B28 809320F8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 05B2C 809320FC 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 05B30 80932100 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05B34 80932104 46049180 */ add.s $f6, $f18, $f4 -/* 05B38 80932108 11A10009 */ beq $t5, $at, .L80932130 -/* 05B3C 8093210C E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 05B40 80932110 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 05B44 80932114 82180194 */ lb $t8, 0x0194($s0) ## 00000194 -/* 05B48 80932118 25CF4000 */ addiu $t7, $t6, 0x4000 ## $t7 = 00004000 -/* 05B4C 8093211C 01F80019 */ multu $t7, $t8 -/* 05B50 80932120 0000C812 */ mflo $t9 -/* 05B54 80932124 A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 -/* 05B58 80932128 10000004 */ beq $zero, $zero, .L8093213C -/* 05B5C 8093212C 8E280680 */ lw $t0, 0x0680($s1) ## 00000680 -.L80932130: -/* 05B60 80932130 0C01DE2B */ jal Math_ScaledStepToS - -/* 05B64 80932134 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 05B68 80932138 8E280680 */ lw $t0, 0x0680($s1) ## 00000680 -.L8093213C: -/* 05B6C 8093213C 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 -/* 05B70 80932140 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05B74 80932144 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 -/* 05B78 80932148 1120000E */ beq $t1, $zero, .L80932184 -/* 05B7C 8093214C 00000000 */ nop -/* 05B80 80932150 A6200850 */ sh $zero, 0x0850($s1) ## 00000850 -/* 05B84 80932154 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 -/* 05B88 80932158 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 05B8C 8093215C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 05B90 80932160 860A00B4 */ lh $t2, 0x00B4($s0) ## 000000B4 -/* 05B94 80932164 A62A00B4 */ sh $t2, 0x00B4($s1) ## 000000B4 -/* 05B98 80932168 820B0194 */ lb $t3, 0x0194($s0) ## 00000194 -/* 05B9C 8093216C 860D00B8 */ lh $t5, 0x00B8($s0) ## 000000B8 -/* 05BA0 80932170 000B0823 */ subu $at, $zero, $t3 -/* 05BA4 80932174 00016380 */ sll $t4, $at, 14 -/* 05BA8 80932178 018D7021 */ addu $t6, $t4, $t5 -/* 05BAC 8093217C 10000017 */ beq $zero, $zero, .L809321DC -/* 05BB0 80932180 A62E00B8 */ sh $t6, 0x00B8($s1) ## 000000B8 -.L80932184: -/* 05BB4 80932184 0C01DE2B */ jal Math_ScaledStepToS - -/* 05BB8 80932188 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 -/* 05BBC 8093218C 262400B8 */ addiu $a0, $s1, 0x00B8 ## $a0 = 000000B8 -/* 05BC0 80932190 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05BC4 80932194 0C01DE2B */ jal Math_ScaledStepToS - -/* 05BC8 80932198 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 -/* 05BCC 8093219C 0C01DE1C */ jal Math_SinS - ## sins? -/* 05BD0 809321A0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05BD4 809321A4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 05BD8 809321A8 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 05BDC 809321AC C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 05BE0 809321B0 46005402 */ mul.s $f16, $f10, $f0 -/* 05BE4 809321B4 46104480 */ add.s $f18, $f8, $f16 -/* 05BE8 809321B8 E6320024 */ swc1 $f18, 0x0024($s1) ## 00000024 -/* 05BEC 809321BC 0C01DE0D */ jal Math_CosS - ## coss? -/* 05BF0 809321C0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05BF4 809321C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 05BF8 809321C8 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 05BFC 809321CC C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C -/* 05C00 809321D0 46003282 */ mul.s $f10, $f6, $f0 -/* 05C04 809321D4 460A2200 */ add.s $f8, $f4, $f10 -/* 05C08 809321D8 E628002C */ swc1 $f8, 0x002C($s1) ## 0000002C -.L809321DC: -/* 05C0C 809321DC 860F0198 */ lh $t7, 0x0198($s0) ## 00000198 -/* 05C10 809321E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 05C14 809321E4 55E1002C */ bnel $t7, $at, .L80932298 -/* 05C18 809321E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C1C 809321EC 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 -/* 05C20 809321F0 57000029 */ bnel $t8, $zero, .L80932298 -/* 05C24 809321F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C28 809321F8 0C02927F */ jal SkelAnime_Update - -/* 05C2C 809321FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 05C30 80932200 50400025 */ beql $v0, $zero, .L80932298 -/* 05C34 80932204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C38 80932208 8E390680 */ lw $t9, 0x0680($s1) ## 00000680 -/* 05C3C 8093220C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C40 80932210 8FA50034 */ lw $a1, 0x0034($sp) -/* 05C44 80932214 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 05C48 80932218 5100001F */ beql $t0, $zero, .L80932298 -/* 05C4C 8093221C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C50 80932220 0C24CE5E */ jal func_80933978 -/* 05C54 80932224 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05C58 80932228 0C01DE1C */ jal Math_SinS - ## sins? -/* 05C5C 8093222C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05C60 80932230 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 05C64 80932234 44819000 */ mtc1 $at, $f18 ## $f18 = 70.00 -/* 05C68 80932238 C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 05C6C 8093223C 46009182 */ mul.s $f6, $f18, $f0 -/* 05C70 80932240 46068100 */ add.s $f4, $f16, $f6 -/* 05C74 80932244 E6240024 */ swc1 $f4, 0x0024($s1) ## 00000024 -/* 05C78 80932248 0C01DE0D */ jal Math_CosS - ## coss? -/* 05C7C 8093224C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05C80 80932250 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 05C84 80932254 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 -/* 05C88 80932258 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C -/* 05C8C 8093225C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 05C90 80932260 46004482 */ mul.s $f18, $f8, $f0 -/* 05C94 80932264 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 05C98 80932268 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05C9C 8093226C 3C064170 */ lui $a2, 0x4170 ## $a2 = 41700000 -/* 05CA0 80932270 46125400 */ add.s $f16, $f10, $f18 -/* 05CA4 80932274 E630002C */ swc1 $f16, 0x002C($s1) ## 0000002C -/* 05CA8 80932278 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 05CAC 8093227C 8FA40034 */ lw $a0, 0x0034($sp) -/* 05CB0 80932280 0C00BDC7 */ jal func_8002F71C -/* 05CB4 80932284 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 05CB8 80932288 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05CBC 8093228C 0C00BDF7 */ jal func_8002F7DC -/* 05CC0 80932290 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 05CC4 80932294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80932298: -/* 05CC8 80932298 0C00BE5D */ jal func_8002F974 -/* 05CCC 8093229C 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 05CD0 809322A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809322A4: -/* 05CD4 809322A4 8FB0001C */ lw $s0, 0x001C($sp) -/* 05CD8 809322A8 8FB10020 */ lw $s1, 0x0020($sp) -/* 05CDC 809322AC 03E00008 */ jr $ra -/* 05CE0 809322B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s deleted file mode 100644 index 825f071908..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_809322B4 -/* 05CE4 809322B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05CE8 809322B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05CEC 809322BC AFB00020 */ sw $s0, 0x0020($sp) -/* 05CF0 809322C0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 05CF4 809322C4 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 05CF8 809322C8 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 05CFC 809322CC 000FC080 */ sll $t8, $t7, 2 -/* 05D00 809322D0 00380821 */ addu $at, $at, $t8 -/* 05D04 809322D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05D08 809322D8 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 05D0C 809322DC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 05D10 809322E0 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 05D14 809322E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05D18 809322E8 00194080 */ sll $t0, $t9, 2 -/* 05D1C 809322EC 00A82821 */ addu $a1, $a1, $t0 -/* 05D20 809322F0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 05D24 809322F4 0C029490 */ jal Animation_MorphToPlayOnce -/* 05D28 809322F8 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 05D2C 809322FC 24090024 */ addiu $t1, $zero, 0x0024 ## $t1 = 00000024 -/* 05D30 80932300 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 -/* 05D34 80932304 260403C8 */ addiu $a0, $s0, 0x03C8 ## $a0 = 000003C8 -/* 05D38 80932308 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 05D3C 8093230C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 05D40 80932310 240A00C8 */ addiu $t2, $zero, 0x00C8 ## $t2 = 000000C8 -/* 05D44 80932314 AFAA0010 */ sw $t2, 0x0010($sp) -/* 05D48 80932318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D4C 8093231C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05D50 80932320 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 05D54 80932324 0C00D09B */ jal Actor_SetColorFilter -/* 05D58 80932328 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05D5C 8093232C 3C0B8093 */ lui $t3, %hi(func_8093234C) ## $t3 = 80930000 -/* 05D60 80932330 256B234C */ addiu $t3, $t3, %lo(func_8093234C) ## $t3 = 8093234C -/* 05D64 80932334 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 05D68 80932338 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05D6C 8093233C 8FB00020 */ lw $s0, 0x0020($sp) -/* 05D70 80932340 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05D74 80932344 03E00008 */ jr $ra -/* 05D78 80932348 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s deleted file mode 100644 index 09bf2eea4a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_8093234C -/* 05D7C 8093234C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05D80 80932350 AFB00018 */ sw $s0, 0x0018($sp) -/* 05D84 80932354 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05D88 80932358 AFBF001C */ sw $ra, 0x001C($sp) -/* 05D8C 8093235C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05D90 80932360 AFA5002C */ sw $a1, 0x002C($sp) -/* 05D94 80932364 0C02927F */ jal SkelAnime_Update - -/* 05D98 80932368 AFA40020 */ sw $a0, 0x0020($sp) -/* 05D9C 8093236C 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 05DA0 80932370 8FA40020 */ lw $a0, 0x0020($sp) -/* 05DA4 80932374 10400003 */ beq $v0, $zero, .L80932384 -/* 05DA8 80932378 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 05DAC 8093237C A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -/* 05DB0 80932380 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L80932384: -/* 05DB4 80932384 04410004 */ bgez $v0, .L80932398 -/* 05DB8 80932388 304F0003 */ andi $t7, $v0, 0x0003 ## $t7 = 00000000 -/* 05DBC 8093238C 11E00002 */ beq $t7, $zero, .L80932398 -/* 05DC0 80932390 00000000 */ nop -/* 05DC4 80932394 25EFFFFC */ addiu $t7, $t7, 0xFFFC ## $t7 = FFFFFFFC -.L80932398: -/* 05DC8 80932398 55E00019 */ bnel $t7, $zero, .L80932400 -/* 05DCC 8093239C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 05DD0 809323A0 04410004 */ bgez $v0, .L809323B4 -/* 05DD4 809323A4 30580007 */ andi $t8, $v0, 0x0007 ## $t8 = 00000000 -/* 05DD8 809323A8 13000002 */ beq $t8, $zero, .L809323B4 -/* 05DDC 809323AC 00000000 */ nop -/* 05DE0 809323B0 2718FFF8 */ addiu $t8, $t8, 0xFFF8 ## $t8 = FFFFFFF8 -.L809323B4: -/* 05DE4 809323B4 5300000B */ beql $t8, $zero, .L809323E4 -/* 05DE8 809323B8 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 05DEC 809323BC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 05DF0 809323C0 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 05DF4 809323C4 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 05DF8 809323C8 00194080 */ sll $t0, $t9, 2 -/* 05DFC 809323CC 00A82821 */ addu $a1, $a1, $t0 -/* 05E00 809323D0 0C029490 */ jal Animation_MorphToPlayOnce -/* 05E04 809323D4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 05E08 809323D8 10000009 */ beq $zero, $zero, .L80932400 -/* 05E0C 809323DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 05E10 809323E0 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L809323E4: -/* 05E14 809323E4 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 -/* 05E18 809323E8 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 05E1C 809323EC 00095080 */ sll $t2, $t1, 2 -/* 05E20 809323F0 00AA2821 */ addu $a1, $a1, $t2 -/* 05E24 809323F4 0C029490 */ jal Animation_MorphToPlayOnce -/* 05E28 809323F8 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 05E2C 809323FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -.L80932400: -/* 05E30 80932400 240B00C8 */ addiu $t3, $zero, 0x00C8 ## $t3 = 000000C8 -/* 05E34 80932404 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 05E38 80932408 0C00CFC8 */ jal Rand_CenteredFloat - -/* 05E3C 8093240C A20B0114 */ sb $t3, 0x0114($s0) ## 00000114 -/* 05E40 80932410 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 05E44 80932414 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 05E48 80932418 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 05E4C 8093241C 46002180 */ add.s $f6, $f4, $f0 -/* 05E50 80932420 0C00CFC8 */ jal Rand_CenteredFloat - -/* 05E54 80932424 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 05E58 80932428 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 05E5C 8093242C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 05E60 80932430 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 05E64 80932434 46004280 */ add.s $f10, $f8, $f0 -/* 05E68 80932438 0C00CFC8 */ jal Rand_CenteredFloat - -/* 05E6C 8093243C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 05E70 80932440 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 05E74 80932444 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 05E78 80932448 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 05E7C 8093244C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 05E80 80932450 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 05E84 80932454 46062080 */ add.s $f2, $f4, $f6 -/* 05E88 80932458 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 05E8C 8093245C 46008480 */ add.s $f18, $f16, $f0 -/* 05E90 80932460 4602403C */ c.lt.s $f8, $f2 -/* 05E94 80932464 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 05E98 80932468 45020005 */ bc1fl .L80932480 -/* 05E9C 8093246C 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 -/* 05EA0 80932470 44051000 */ mfc1 $a1, $f2 -/* 05EA4 80932474 0C01DE80 */ jal Math_StepToF - -/* 05EA8 80932478 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 05EAC 8093247C 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 -.L80932480: -/* 05EB0 80932480 55800004 */ bnel $t4, $zero, .L80932494 -/* 05EB4 80932484 8FBF001C */ lw $ra, 0x001C($sp) -/* 05EB8 80932488 0C24C929 */ jal func_809324A4 -/* 05EBC 8093248C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05EC0 80932490 8FBF001C */ lw $ra, 0x001C($sp) -.L80932494: -/* 05EC4 80932494 8FB00018 */ lw $s0, 0x0018($sp) -/* 05EC8 80932498 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05ECC 8093249C 03E00008 */ jr $ra -/* 05ED0 809324A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s deleted file mode 100644 index 62d93a4904..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_809324A4 -/* 05ED4 809324A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05ED8 809324A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05EDC 809324AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 05EE0 809324B0 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 05EE4 809324B4 3C058093 */ lui $a1, %hi(D_80937874) ## $a1 = 80930000 -/* 05EE8 809324B8 AFA70018 */ sw $a3, 0x0018($sp) -/* 05EEC 809324BC 000E7880 */ sll $t7, $t6, 2 -/* 05EF0 809324C0 00AF2821 */ addu $a1, $a1, $t7 -/* 05EF4 809324C4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) -/* 05EF8 809324C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05EFC 809324CC 0C029490 */ jal Animation_MorphToPlayOnce -/* 05F00 809324D0 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 -/* 05F04 809324D4 8FA70018 */ lw $a3, 0x0018($sp) -/* 05F08 809324D8 3C188093 */ lui $t8, %hi(func_809324F4) ## $t8 = 80930000 -/* 05F0C 809324DC 271824F4 */ addiu $t8, $t8, %lo(func_809324F4) ## $t8 = 809324F4 -/* 05F10 809324E0 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 05F14 809324E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 05F18 809324E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05F1C 809324EC 03E00008 */ jr $ra -/* 05F20 809324F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s deleted file mode 100644 index 43b9c45980..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_809324F4 -/* 05F24 809324F4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05F28 809324F8 AFB00024 */ sw $s0, 0x0024($sp) -/* 05F2C 809324FC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 05F30 80932500 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 05F34 80932504 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05F38 80932508 AFBF002C */ sw $ra, 0x002C($sp) -/* 05F3C 8093250C AFB10028 */ sw $s1, 0x0028($sp) -/* 05F40 80932510 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 05F44 80932514 AFA50034 */ sw $a1, 0x0034($sp) -/* 05F48 80932518 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 -/* 05F4C 8093251C 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 05F50 80932520 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 05F54 80932524 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 05F58 80932528 0C01E0C4 */ jal Math_SmoothStepToF - -/* 05F5C 8093252C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05F60 80932530 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 05F64 80932534 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 05F68 80932538 8E050010 */ lw $a1, 0x0010($s0) ## 00000010 -/* 05F6C 8093253C 46000506 */ mov.s $f20, $f0 -/* 05F70 80932540 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 05F74 80932544 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 05F78 80932548 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 05F7C 8093254C 0C01E0C4 */ jal Math_SmoothStepToF - -/* 05F80 80932550 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 05F84 80932554 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 05F88 80932558 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 05F8C 8093255C C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 05F90 80932560 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 05F94 80932564 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 05F98 80932568 460A4400 */ add.s $f16, $f8, $f10 -/* 05F9C 8093256C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 05FA0 80932570 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 05FA4 80932574 4600A500 */ add.s $f20, $f20, $f0 -/* 05FA8 80932578 44058000 */ mfc1 $a1, $f16 -/* 05FAC 8093257C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 05FB0 80932580 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 05FB4 80932584 0C01E0C4 */ jal Math_SmoothStepToF - -/* 05FB8 80932588 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 05FBC 8093258C 4600A500 */ add.s $f20, $f20, $f0 -/* 05FC0 80932590 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 05FC4 80932594 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 05FC8 80932598 0C01DE2B */ jal Math_ScaledStepToS - -/* 05FCC 8093259C 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 05FD0 809325A0 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 05FD4 809325A4 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 05FD8 809325A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05FDC 809325AC 0C01DE2B */ jal Math_ScaledStepToS - -/* 05FE0 809325B0 24061000 */ addiu $a2, $zero, 0x1000 ## $a2 = 00001000 -/* 05FE4 809325B4 02228824 */ and $s1, $s1, $v0 -/* 05FE8 809325B8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 05FEC 809325BC 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 05FF0 809325C0 0C01DE2B */ jal Math_ScaledStepToS - -/* 05FF4 809325C4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 05FF8 809325C8 02228824 */ and $s1, $s1, $v0 -/* 05FFC 809325CC 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E -/* 06000 809325D0 2405FA24 */ addiu $a1, $zero, 0xFA24 ## $a1 = FFFFFA24 -/* 06004 809325D4 0C01DE5F */ jal Math_StepToS - -/* 06008 809325D8 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 0600C 809325DC 82050194 */ lb $a1, 0x0194($s0) ## 00000194 -/* 06010 809325E0 02228824 */ and $s1, $s1, $v0 -/* 06014 809325E4 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 06018 809325E8 00050823 */ subu $at, $zero, $a1 -/* 0601C 809325EC 00202825 */ or $a1, $at, $zero ## $a1 = 00000000 -/* 06020 809325F0 00052F40 */ sll $a1, $a1, 29 -/* 06024 809325F4 00052C03 */ sra $a1, $a1, 16 -/* 06028 809325F8 0C01DE2B */ jal Math_ScaledStepToS - -/* 0602C 809325FC 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 06030 80932600 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 06034 80932604 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 06038 80932608 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 0603C 8093260C 02228824 */ and $s1, $s1, $v0 -/* 06040 80932610 4604A03C */ c.lt.s $f20, $f4 -/* 06044 80932614 A20E0114 */ sb $t6, 0x0114($s0) ## 00000114 -/* 06048 80932618 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0604C 8093261C 45000007 */ bc1f .L8093263C -/* 06050 80932620 00000000 */ nop -/* 06054 80932624 12200005 */ beq $s1, $zero, .L8093263C -/* 06058 80932628 00000000 */ nop -/* 0605C 8093262C 0C24C997 */ jal func_8093265C -/* 06060 80932630 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06064 80932634 10000004 */ beq $zero, $zero, .L80932648 -/* 06068 80932638 8FBF002C */ lw $ra, 0x002C($sp) -.L8093263C: -/* 0606C 8093263C 0C00BE5D */ jal func_8002F974 -/* 06070 80932640 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 06074 80932644 8FBF002C */ lw $ra, 0x002C($sp) -.L80932648: -/* 06078 80932648 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0607C 8093264C 8FB00024 */ lw $s0, 0x0024($sp) -/* 06080 80932650 8FB10028 */ lw $s1, 0x0028($sp) -/* 06084 80932654 03E00008 */ jr $ra -/* 06088 80932658 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s deleted file mode 100644 index 4e22d9976b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_8093265C -/* 0608C 8093265C 3C0F8093 */ lui $t7, %hi(func_80932674) ## $t7 = 80930000 -/* 06090 80932660 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 06094 80932664 25EF2674 */ addiu $t7, $t7, %lo(func_80932674) ## $t7 = 80932674 -/* 06098 80932668 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 0609C 8093266C 03E00008 */ jr $ra -/* 060A0 80932670 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s deleted file mode 100644 index 7b59ee9414..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel D_809379F8 - .word 0x3F20D97C -glabel D_809379FC - .word 0x3F490FDB - -.text -glabel func_80932674 -/* 060A4 80932674 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 060A8 80932678 AFB00018 */ sw $s0, 0x0018($sp) -/* 060AC 8093267C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 060B0 80932680 AFBF001C */ sw $ra, 0x001C($sp) -/* 060B4 80932684 AFA50024 */ sw $a1, 0x0024($sp) -/* 060B8 80932688 0C02927F */ jal SkelAnime_Update - -/* 060BC 8093268C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 060C0 80932690 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 060C4 80932694 10400003 */ beq $v0, $zero, .L809326A4 -/* 060C8 80932698 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 060CC 8093269C A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -/* 060D0 809326A0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L809326A4: -/* 060D4 809326A4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 060D8 809326A8 3C018093 */ lui $at, %hi(D_809379F8) ## $at = 80930000 -/* 060DC 809326AC C42879F8 */ lwc1 $f8, %lo(D_809379F8)($at) -/* 060E0 809326B0 468021A0 */ cvt.s.w $f6, $f4 -/* 060E4 809326B4 46083302 */ mul.s $f12, $f6, $f8 -/* 060E8 809326B8 0C0400A4 */ jal sinf - -/* 060EC 809326BC 00000000 */ nop -/* 060F0 809326C0 3C014600 */ lui $at, 0x4600 ## $at = 46000000 -/* 060F4 809326C4 44815000 */ mtc1 $at, $f10 ## $f10 = 8192.00 -/* 060F8 809326C8 3C014680 */ lui $at, 0x4680 ## $at = 46800000 -/* 060FC 809326CC 44819000 */ mtc1 $at, $f18 ## $f18 = 16384.00 -/* 06100 809326D0 460A0402 */ mul.s $f16, $f0, $f10 -/* 06104 809326D4 86190198 */ lh $t9, 0x0198($s0) ## 00000198 -/* 06108 809326D8 3C018093 */ lui $at, %hi(D_809379FC) ## $at = 80930000 -/* 0610C 809326DC 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 06110 809326E0 46128100 */ add.s $f4, $f16, $f18 -/* 06114 809326E4 468042A0 */ cvt.s.w $f10, $f8 -/* 06118 809326E8 4600218D */ trunc.w.s $f6, $f4 -/* 0611C 809326EC 44183000 */ mfc1 $t8, $f6 -/* 06120 809326F0 00000000 */ nop -/* 06124 809326F4 A61800B4 */ sh $t8, 0x00B4($s0) ## 000000B4 -/* 06128 809326F8 C43079FC */ lwc1 $f16, %lo(D_809379FC)($at) -/* 0612C 809326FC 46105302 */ mul.s $f12, $f10, $f16 -/* 06130 80932700 0C0400A4 */ jal sinf - -/* 06134 80932704 00000000 */ nop -/* 06138 80932708 82080194 */ lb $t0, 0x0194($s0) ## 00000194 -/* 0613C 8093270C 3C014620 */ lui $at, 0x4620 ## $at = 46200000 -/* 06140 80932710 44819000 */ mtc1 $at, $f18 ## $f18 = 10240.00 -/* 06144 80932714 00080823 */ subu $at, $zero, $t0 -/* 06148 80932718 00014B40 */ sll $t1, $at, 13 -/* 0614C 8093271C 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 06150 80932720 46120102 */ mul.s $f4, $f0, $f18 -/* 06154 80932724 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 -/* 06158 80932728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0615C 8093272C 46803220 */ cvt.s.w $f8, $f6 -/* 06160 80932730 46082280 */ add.s $f10, $f4, $f8 -/* 06164 80932734 4600540D */ trunc.w.s $f16, $f10 -/* 06168 80932738 440B8000 */ mfc1 $t3, $f16 -/* 0616C 8093273C 00000000 */ nop -/* 06170 80932740 A60B01A0 */ sh $t3, 0x01A0($s0) ## 000001A0 -/* 06174 80932744 05810004 */ bgez $t4, .L80932758 -/* 06178 80932748 318D0007 */ andi $t5, $t4, 0x0007 ## $t5 = 00000000 -/* 0617C 8093274C 11A00002 */ beq $t5, $zero, .L80932758 -/* 06180 80932750 00000000 */ nop -/* 06184 80932754 25ADFFF8 */ addiu $t5, $t5, 0xFFF8 ## $t5 = FFFFFFF8 -.L80932758: -/* 06188 80932758 55A00004 */ bnel $t5, $zero, .L8093276C -/* 0618C 8093275C 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 06190 80932760 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 06194 80932764 24053968 */ addiu $a1, $zero, 0x3968 ## $a1 = 00003968 -/* 06198 80932768 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -.L8093276C: -/* 0619C 8093276C 3C188093 */ lui $t8, %hi(D_8093746C) ## $t8 = 80930000 -/* 061A0 80932770 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 061A4 80932774 844E001C */ lh $t6, 0x001C($v0) ## 0000001C -/* 061A8 80932778 000E7880 */ sll $t7, $t6, 2 -/* 061AC 8093277C 030FC021 */ addu $t8, $t8, $t7 -/* 061B0 80932780 8F18746C */ lw $t8, %lo(D_8093746C)($t8) -/* 061B4 80932784 57010014 */ bnel $t8, $at, .L809327D8 -/* 061B8 80932788 860B0198 */ lh $t3, 0x0198($s0) ## 00000198 -/* 061BC 8093278C 8C430190 */ lw $v1, 0x0190($v0) ## 00000190 -/* 061C0 80932790 3C198093 */ lui $t9, %hi(func_80932674) ## $t9 = 80930000 -/* 061C4 80932794 27392674 */ addiu $t9, $t9, %lo(func_80932674) ## $t9 = 80932674 -/* 061C8 80932798 13230004 */ beq $t9, $v1, .L809327AC -/* 061CC 8093279C 3C088093 */ lui $t0, %hi(func_8093285C) ## $t0 = 80930000 -/* 061D0 809327A0 2508285C */ addiu $t0, $t0, %lo(func_8093285C) ## $t0 = 8093285C -/* 061D4 809327A4 55030006 */ bnel $t0, $v1, .L809327C0 -/* 061D8 809327A8 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -.L809327AC: -/* 061DC 809327AC 0C24CA02 */ jal func_80932808 -/* 061E0 809327B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 061E4 809327B4 10000010 */ beq $zero, $zero, .L809327F8 -/* 061E8 809327B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 061EC 809327BC 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -.L809327C0: -/* 061F0 809327C0 240A0050 */ addiu $t2, $zero, 0x0050 ## $t2 = 00000050 -/* 061F4 809327C4 5520000C */ bnel $t1, $zero, .L809327F8 -/* 061F8 809327C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 061FC 809327CC 10000009 */ beq $zero, $zero, .L809327F4 -/* 06200 809327D0 A60A0198 */ sh $t2, 0x0198($s0) ## 00000198 -/* 06204 809327D4 860B0198 */ lh $t3, 0x0198($s0) ## 00000198 -.L809327D8: -/* 06208 809327D8 55600007 */ bnel $t3, $zero, .L809327F8 -/* 0620C 809327DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 06210 809327E0 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 06214 809327E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06218 809327E8 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 0621C 809327EC 0C24C229 */ jal func_809308A4 -/* 06220 809327F0 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -.L809327F4: -/* 06224 809327F4 8FBF001C */ lw $ra, 0x001C($sp) -.L809327F8: -/* 06228 809327F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0622C 809327FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06230 80932800 03E00008 */ jr $ra -/* 06234 80932804 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s deleted file mode 100644 index 957213a176..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80932808 -/* 06238 80932808 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0623C 8093280C AFBF0014 */ sw $ra, 0x0014($sp) -/* 06240 80932810 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 06244 80932814 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 06248 80932818 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 -/* 0624C 8093281C AFA70018 */ sw $a3, 0x0018($sp) -/* 06250 80932820 000E7880 */ sll $t7, $t6, 2 -/* 06254 80932824 00AF2821 */ addu $a1, $a1, $t7 -/* 06258 80932828 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 0625C 8093282C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06260 80932830 0C029490 */ jal Animation_MorphToPlayOnce -/* 06264 80932834 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 06268 80932838 8FA70018 */ lw $a3, 0x0018($sp) -/* 0626C 8093283C 3C188093 */ lui $t8, %hi(func_8093285C) ## $t8 = 80930000 -/* 06270 80932840 2718285C */ addiu $t8, $t8, %lo(func_8093285C) ## $t8 = 8093285C -/* 06274 80932844 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 -/* 06278 80932848 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 0627C 8093284C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06280 80932850 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06284 80932854 03E00008 */ jr $ra -/* 06288 80932858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s deleted file mode 100644 index 62d2789b17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_8093285C -/* 0628C 8093285C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06290 80932860 AFBF0024 */ sw $ra, 0x0024($sp) -/* 06294 80932864 AFB00020 */ sw $s0, 0x0020($sp) -/* 06298 80932868 AFA5002C */ sw $a1, 0x002C($sp) -/* 0629C 8093286C 808E0195 */ lb $t6, 0x0195($a0) ## 00000195 -/* 062A0 80932870 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 062A4 80932874 55C00038 */ bnel $t6, $zero, .L80932958 -/* 062A8 80932878 920903E4 */ lbu $t1, 0x03E4($s0) ## 000003E4 -/* 062AC 8093287C 0C02927F */ jal SkelAnime_Update - -/* 062B0 80932880 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 062B4 80932884 A2020195 */ sb $v0, 0x0195($s0) ## 00000195 -/* 062B8 80932888 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 062BC 8093288C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 062C0 80932890 0C01DE2B */ jal Math_ScaledStepToS - -/* 062C4 80932894 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 062C8 80932898 820A0194 */ lb $t2, 0x0194($s0) ## 00000194 -/* 062CC 8093289C 86190016 */ lh $t9, 0x0016($s0) ## 00000016 -/* 062D0 809328A0 820F0195 */ lb $t7, 0x0195($s0) ## 00000195 -/* 062D4 809328A4 000A5B00 */ sll $t3, $t2, 12 -/* 062D8 809328A8 032B2821 */ addu $a1, $t9, $t3 -/* 062DC 809328AC 00052C00 */ sll $a1, $a1, 16 -/* 062E0 809328B0 01E2C024 */ and $t8, $t7, $v0 -/* 062E4 809328B4 A2180195 */ sb $t8, 0x0195($s0) ## 00000195 -/* 062E8 809328B8 00052C03 */ sra $a1, $a1, 16 -/* 062EC 809328BC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 062F0 809328C0 0C01DE2B */ jal Math_ScaledStepToS - -/* 062F4 809328C4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 062F8 809328C8 820C0195 */ lb $t4, 0x0195($s0) ## 00000195 -/* 062FC 809328CC 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 06300 809328D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06304 809328D4 01826824 */ and $t5, $t4, $v0 -/* 06308 809328D8 A20D0195 */ sb $t5, 0x0195($s0) ## 00000195 -/* 0630C 809328DC 0C01DE2B */ jal Math_ScaledStepToS - -/* 06310 809328E0 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 06314 809328E4 82050194 */ lb $a1, 0x0194($s0) ## 00000194 -/* 06318 809328E8 820E0195 */ lb $t6, 0x0195($s0) ## 00000195 -/* 0631C 809328EC 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 06320 809328F0 00A00821 */ addu $at, $a1, $zero -/* 06324 809328F4 00052880 */ sll $a1, $a1, 2 -/* 06328 809328F8 00A12821 */ addu $a1, $a1, $at -/* 0632C 809328FC 00052AC0 */ sll $a1, $a1, 11 -/* 06330 80932900 00052C00 */ sll $a1, $a1, 16 -/* 06334 80932904 01C27824 */ and $t7, $t6, $v0 -/* 06338 80932908 A20F0195 */ sb $t7, 0x0195($s0) ## 00000195 -/* 0633C 8093290C 00052C03 */ sra $a1, $a1, 16 -/* 06340 80932910 0C01DE2B */ jal Math_ScaledStepToS - -/* 06344 80932914 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 06348 80932918 82180195 */ lb $t8, 0x0195($s0) ## 00000195 -/* 0634C 8093291C 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E -/* 06350 80932920 2405F254 */ addiu $a1, $zero, 0xF254 ## $a1 = FFFFF254 -/* 06354 80932924 03025024 */ and $t2, $t8, $v0 -/* 06358 80932928 A20A0195 */ sb $t2, 0x0195($s0) ## 00000195 -/* 0635C 8093292C 0C01DE5F */ jal Math_StepToS - -/* 06360 80932930 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 06364 80932934 82190195 */ lb $t9, 0x0195($s0) ## 00000195 -/* 06368 80932938 03225824 */ and $t3, $t9, $v0 -/* 0636C 8093293C A20B0195 */ sb $t3, 0x0195($s0) ## 00000195 -/* 06370 80932940 820C0195 */ lb $t4, 0x0195($s0) ## 00000195 -/* 06374 80932944 5180001F */ beql $t4, $zero, .L809329C4 -/* 06378 80932948 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0637C 8093294C 1000001C */ beq $zero, $zero, .L809329C0 -/* 06380 80932950 A2000114 */ sb $zero, 0x0114($s0) ## 00000114 -/* 06384 80932954 920903E4 */ lbu $t1, 0x03E4($s0) ## 000003E4 -.L80932958: -/* 06388 80932958 312D0002 */ andi $t5, $t1, 0x0002 ## $t5 = 00000000 -/* 0638C 8093295C 51A00019 */ beql $t5, $zero, .L809329C4 -/* 06390 80932960 8FBF0024 */ lw $ra, 0x0024($sp) -/* 06394 80932964 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 06398 80932968 312EFFFC */ andi $t6, $t1, 0xFFFC ## $t6 = 00000000 -/* 0639C 8093296C A20E03E4 */ sb $t6, 0x03E4($s0) ## 000003E4 -/* 063A0 80932970 904F03E4 */ lbu $t7, 0x03E4($v0) ## 000003E4 -/* 063A4 80932974 3C038094 */ lui $v1, %hi(D_80938C90) ## $v1 = 80940000 -/* 063A8 80932978 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 063AC 8093297C 31F8FFFC */ andi $t8, $t7, 0xFFFC ## $t8 = 00000000 -/* 063B0 80932980 A05803E4 */ sb $t8, 0x03E4($v0) ## 000003E4 -/* 063B4 80932984 8C638C90 */ lw $v1, %lo(D_80938C90)($v1) -/* 063B8 80932988 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 063BC 8093298C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 063C0 80932990 906A03E4 */ lbu $t2, 0x03E4($v1) ## 809403E4 -/* 063C4 80932994 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 063C8 80932998 3159FFFC */ andi $t9, $t2, 0xFFFC ## $t9 = 00000000 -/* 063CC 8093299C A07903E4 */ sb $t9, 0x03E4($v1) ## 809403E4 -/* 063D0 809329A0 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 063D4 809329A4 8FA4002C */ lw $a0, 0x002C($sp) -/* 063D8 809329A8 0C00BDC7 */ jal func_8002F71C -/* 063DC 809329AC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 063E0 809329B0 8FAB002C */ lw $t3, 0x002C($sp) -/* 063E4 809329B4 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 063E8 809329B8 0C00BDF7 */ jal func_8002F7DC -/* 063EC 809329BC 8D641C44 */ lw $a0, 0x1C44($t3) ## 00001C44 -.L809329C0: -/* 063F0 809329C0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809329C4: -/* 063F4 809329C4 8FB00020 */ lw $s0, 0x0020($sp) -/* 063F8 809329C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 063FC 809329CC 03E00008 */ jr $ra -/* 06400 809329D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s deleted file mode 100644 index 995ea41087..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809329D4 -/* 06404 809329D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06408 809329D8 AFB00020 */ sw $s0, 0x0020($sp) -/* 0640C 809329DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06410 809329E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 06414 809329E4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 06418 809329E8 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 -/* 0641C 809329EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06420 809329F0 000E7880 */ sll $t7, $t6, 2 -/* 06424 809329F4 00AF2821 */ addu $a1, $a1, $t7 -/* 06428 809329F8 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 0642C 809329FC 0C029490 */ jal Animation_MorphToPlayOnce -/* 06430 80932A00 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 06434 80932A04 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 06438 80932A08 3C188093 */ lui $t8, %hi(func_80932C38) ## $t8 = 80930000 -/* 0643C 80932A0C 27182C38 */ addiu $t8, $t8, %lo(func_80932C38) ## $t8 = 80932C38 -/* 06440 80932A10 13190002 */ beq $t8, $t9, .L80932A1C -/* 06444 80932A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06448 80932A18 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -.L80932A1C: -/* 0644C 80932A1C 920803E4 */ lbu $t0, 0x03E4($s0) ## 000003E4 -/* 06450 80932A20 920A03E5 */ lbu $t2, 0x03E5($s0) ## 000003E5 -/* 06454 80932A24 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 06458 80932A28 3109FFFC */ andi $t1, $t0, 0xFFFC ## $t1 = 00000000 -/* 0645C 80932A2C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 06460 80932A30 A20903E4 */ sb $t1, 0x03E4($s0) ## 000003E4 -/* 06464 80932A34 0C24CF3B */ jal func_80933CEC -/* 06468 80932A38 A20B03E5 */ sb $t3, 0x03E5($s0) ## 000003E5 -/* 0646C 80932A3C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 06470 80932A40 0C028800 */ jal Animation_GetLastFrame - -/* 06474 80932A44 2484B6FC */ addiu $a0, $a0, 0xB6FC ## $a0 = 0600B6FC -/* 06478 80932A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0647C 80932A4C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06480 80932A50 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 06484 80932A54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06488 80932A58 0C00D09B */ jal Actor_SetColorFilter -/* 0648C 80932A5C AFA20010 */ sw $v0, 0x0010($sp) -/* 06490 80932A60 3C0C8093 */ lui $t4, %hi(func_80932A80) ## $t4 = 80930000 -/* 06494 80932A64 258C2A80 */ addiu $t4, $t4, %lo(func_80932A80) ## $t4 = 80932A80 -/* 06498 80932A68 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 0649C 80932A6C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 064A0 80932A70 8FB00020 */ lw $s0, 0x0020($sp) -/* 064A4 80932A74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 064A8 80932A78 03E00008 */ jr $ra -/* 064AC 80932A7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s deleted file mode 100644 index b6d92a6892..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_80932A80 -/* 064B0 80932A80 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 064B4 80932A84 AFB00018 */ sw $s0, 0x0018($sp) -/* 064B8 80932A88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 064BC 80932A8C AFBF001C */ sw $ra, 0x001C($sp) -/* 064C0 80932A90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 064C4 80932A94 AFA5002C */ sw $a1, 0x002C($sp) -/* 064C8 80932A98 0C02927F */ jal SkelAnime_Update - -/* 064CC 80932A9C AFA40020 */ sw $a0, 0x0020($sp) -/* 064D0 80932AA0 3C0E8094 */ lui $t6, %hi(D_80938C90) ## $t6 = 80940000 -/* 064D4 80932AA4 8DCE8C90 */ lw $t6, %lo(D_80938C90)($t6) -/* 064D8 80932AA8 0C01DE0D */ jal Math_CosS - ## coss? -/* 064DC 80932AAC 85C400B6 */ lh $a0, 0x00B6($t6) ## 809400B6 -/* 064E0 80932AB0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 064E4 80932AB4 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 064E8 80932AB8 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 -/* 064EC 80932ABC 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 064F0 80932AC0 46040182 */ mul.s $f6, $f0, $f4 -/* 064F4 80932AC4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 064F8 80932AC8 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 064FC 80932ACC 46083280 */ add.s $f10, $f6, $f8 -/* 06500 80932AD0 44055000 */ mfc1 $a1, $f10 -/* 06504 80932AD4 0C01E107 */ jal Math_ApproachF - -/* 06508 80932AD8 00000000 */ nop -/* 0650C 80932ADC 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 06510 80932AE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 06514 80932AE4 0C01DE1C */ jal Math_SinS - ## sins? -/* 06518 80932AE8 85E400B6 */ lh $a0, 0x00B6($t7) ## 809400B6 -/* 0651C 80932AEC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 06520 80932AF0 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 06524 80932AF4 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 06528 80932AF8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 0652C 80932AFC 46100482 */ mul.s $f18, $f0, $f16 -/* 06530 80932B00 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 06534 80932B04 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 06538 80932B08 46049180 */ add.s $f6, $f18, $f4 -/* 0653C 80932B0C 44053000 */ mfc1 $a1, $f6 -/* 06540 80932B10 0C01E107 */ jal Math_ApproachF - -/* 06544 80932B14 00000000 */ nop -/* 06548 80932B18 82180195 */ lb $t8, 0x0195($s0) ## 00000195 -/* 0654C 80932B1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06550 80932B20 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 06554 80932B24 17000026 */ bne $t8, $zero, .L80932BC0 -/* 06558 80932B28 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 -/* 0655C 80932B2C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 06560 80932B30 0C01DE2B */ jal Math_ScaledStepToS - -/* 06564 80932B34 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 06568 80932B38 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E -/* 0656C 80932B3C 2405F254 */ addiu $a1, $zero, 0xF254 ## $a1 = FFFFF254 -/* 06570 80932B40 0C01DE5F */ jal Math_StepToS - -/* 06574 80932B44 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 -/* 06578 80932B48 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 0657C 80932B4C 86050014 */ lh $a1, 0x0014($s0) ## 00000014 -/* 06580 80932B50 0C01DE2B */ jal Math_ScaledStepToS - -/* 06584 80932B54 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 06588 80932B58 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 0658C 80932B5C 86050018 */ lh $a1, 0x0018($s0) ## 00000018 -/* 06590 80932B60 0C01DE2B */ jal Math_ScaledStepToS - -/* 06594 80932B64 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 06598 80932B68 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0659C 80932B6C 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 065A0 80932B70 0C01DE2B */ jal Math_ScaledStepToS - -/* 065A4 80932B74 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 065A8 80932B78 3C088094 */ lui $t0, %hi(D_80938C90) ## $t0 = 80940000 -/* 065AC 80932B7C 8D088C90 */ lw $t0, %lo(D_80938C90)($t0) -/* 065B0 80932B80 3C198093 */ lui $t9, %hi(func_8092E830) ## $t9 = 80930000 -/* 065B4 80932B84 2739E830 */ addiu $t9, $t9, %lo(func_8092E830) ## $t9 = 8092E830 -/* 065B8 80932B88 8D090190 */ lw $t1, 0x0190($t0) ## 80940190 -/* 065BC 80932B8C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 065C0 80932B90 3C058093 */ lui $a1, %hi(D_80937874) ## $a1 = 80930000 -/* 065C4 80932B94 1729000C */ bne $t9, $t1, .L80932BC8 -/* 065C8 80932B98 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 065CC 80932B9C 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 065D0 80932BA0 A20A0195 */ sb $t2, 0x0195($s0) ## 00000195 -/* 065D4 80932BA4 8FA40020 */ lw $a0, 0x0020($sp) -/* 065D8 80932BA8 000B6080 */ sll $t4, $t3, 2 -/* 065DC 80932BAC 00AC2821 */ addu $a1, $a1, $t4 -/* 065E0 80932BB0 0C029490 */ jal Animation_MorphToPlayOnce -/* 065E4 80932BB4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) -/* 065E8 80932BB8 10000004 */ beq $zero, $zero, .L80932BCC -/* 065EC 80932BBC 8FBF001C */ lw $ra, 0x001C($sp) -.L80932BC0: -/* 065F0 80932BC0 0C01DE80 */ jal Math_StepToF - -/* 065F4 80932BC4 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 -.L80932BC8: -/* 065F8 80932BC8 8FBF001C */ lw $ra, 0x001C($sp) -.L80932BCC: -/* 065FC 80932BCC 8FB00018 */ lw $s0, 0x0018($sp) -/* 06600 80932BD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06604 80932BD4 03E00008 */ jr $ra -/* 06608 80932BD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s deleted file mode 100644 index f7dc88f98e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80932BDC -/* 0660C 80932BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06610 80932BE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06614 80932BE4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 06618 80932BE8 A48000B4 */ sh $zero, 0x00B4($a0) ## 000000B4 -/* 0661C 80932BEC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 06620 80932BF0 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 06624 80932BF4 AFA70018 */ sw $a3, 0x0018($sp) -/* 06628 80932BF8 000E7880 */ sll $t7, $t6, 2 -/* 0662C 80932BFC 00AF2821 */ addu $a1, $a1, $t7 -/* 06630 80932C00 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 06634 80932C04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06638 80932C08 0C029490 */ jal Animation_MorphToPlayOnce -/* 0663C 80932C0C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 06640 80932C10 8FA70018 */ lw $a3, 0x0018($sp) -/* 06644 80932C14 3C198093 */ lui $t9, %hi(func_80932C38) ## $t9 = 80930000 -/* 06648 80932C18 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 0664C 80932C1C 27392C38 */ addiu $t9, $t9, %lo(func_80932C38) ## $t9 = 80932C38 -/* 06650 80932C20 A4F80198 */ sh $t8, 0x0198($a3) ## 00000198 -/* 06654 80932C24 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 06658 80932C28 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0665C 80932C2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06660 80932C30 03E00008 */ jr $ra -/* 06664 80932C34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s deleted file mode 100644 index 3381cc75e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80932C38 -/* 06668 80932C38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0666C 80932C3C AFBF001C */ sw $ra, 0x001C($sp) -/* 06670 80932C40 AFB00018 */ sw $s0, 0x0018($sp) -/* 06674 80932C44 AFA50024 */ sw $a1, 0x0024($sp) -/* 06678 80932C48 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 0667C 80932C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06680 80932C50 10400002 */ beq $v0, $zero, .L80932C5C -/* 06684 80932C54 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 06688 80932C58 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -.L80932C5C: -/* 0668C 80932C5C 0C02927F */ jal SkelAnime_Update - -/* 06690 80932C60 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 06694 80932C64 860F0198 */ lh $t7, 0x0198($s0) ## 00000198 -/* 06698 80932C68 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0669C 80932C6C 29E10002 */ slti $at, $t7, 0x0002 -/* 066A0 80932C70 1420000E */ bne $at, $zero, .L80932CAC -/* 066A4 80932C74 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 066A8 80932C78 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 066AC 80932C7C C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 -/* 066B0 80932C80 861800B4 */ lh $t8, 0x00B4($s0) ## 000000B4 -/* 066B4 80932C84 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 066B8 80932C88 46062200 */ add.s $f8, $f4, $f6 -/* 066BC 80932C8C 2719FE00 */ addiu $t9, $t8, 0xFE00 ## $t9 = FFFFFE00 -/* 066C0 80932C90 A61900B4 */ sh $t9, 0x00B4($s0) ## 000000B4 -/* 066C4 80932C94 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 066C8 80932C98 44054000 */ mfc1 $a1, $f8 -/* 066CC 80932C9C 0C01DE80 */ jal Math_StepToF - -/* 066D0 80932CA0 00000000 */ nop -/* 066D4 80932CA4 10000008 */ beq $zero, $zero, .L80932CC8 -/* 066D8 80932CA8 860A0198 */ lh $t2, 0x0198($s0) ## 00000198 -.L80932CAC: -/* 066DC 80932CAC 860800B4 */ lh $t0, 0x00B4($s0) ## 000000B4 -/* 066E0 80932CB0 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 -/* 066E4 80932CB4 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 066E8 80932CB8 25090400 */ addiu $t1, $t0, 0x0400 ## $t1 = 00000400 -/* 066EC 80932CBC 0C01DE80 */ jal Math_StepToF - -/* 066F0 80932CC0 A60900B4 */ sh $t1, 0x00B4($s0) ## 000000B4 -/* 066F4 80932CC4 860A0198 */ lh $t2, 0x0198($s0) ## 00000198 -.L80932CC8: -/* 066F8 80932CC8 5540000D */ bnel $t2, $zero, .L80932D00 -/* 066FC 80932CCC 8FBF001C */ lw $ra, 0x001C($sp) -/* 06700 80932CD0 C60A0080 */ lwc1 $f10, 0x0080($s0) ## 00000080 -/* 06704 80932CD4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 06708 80932CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0670C 80932CDC 460A803E */ c.le.s $f16, $f10 -/* 06710 80932CE0 00000000 */ nop -/* 06714 80932CE4 45000003 */ bc1f .L80932CF4 -/* 06718 80932CE8 00000000 */ nop -/* 0671C 80932CEC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 06720 80932CF0 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 -.L80932CF4: -/* 06724 80932CF4 0C24CA75 */ jal func_809329D4 -/* 06728 80932CF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0672C 80932CFC 8FBF001C */ lw $ra, 0x001C($sp) -.L80932D00: -/* 06730 80932D00 8FB00018 */ lw $s0, 0x0018($sp) -/* 06734 80932D04 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06738 80932D08 03E00008 */ jr $ra -/* 0673C 80932D0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s deleted file mode 100644 index 667f3184f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80932D10 -/* 06740 80932D10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06744 80932D14 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06748 80932D18 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 0674C 80932D1C 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 06750 80932D20 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 06754 80932D24 000FC080 */ sll $t8, $t7, 2 -/* 06758 80932D28 00380821 */ addu $at, $at, $t8 -/* 0675C 80932D2C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 06760 80932D30 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 06764 80932D34 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C -/* 06768 80932D38 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 0676C 80932D3C AFA70018 */ sw $a3, 0x0018($sp) -/* 06770 80932D40 00194080 */ sll $t0, $t9, 2 -/* 06774 80932D44 00A82821 */ addu $a1, $a1, $t0 -/* 06778 80932D48 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 0677C 80932D4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06780 80932D50 0C029490 */ jal Animation_MorphToPlayOnce -/* 06784 80932D54 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 06788 80932D58 8FA70018 */ lw $a3, 0x0018($sp) -/* 0678C 80932D5C 240900A0 */ addiu $t1, $zero, 0x00A0 ## $t1 = 000000A0 -/* 06790 80932D60 240D0180 */ addiu $t5, $zero, 0x0180 ## $t5 = 00000180 -/* 06794 80932D64 84EA001C */ lh $t2, 0x001C($a3) ## 0000001C -/* 06798 80932D68 3C0F8093 */ lui $t7, %hi(func_80932DAC) ## $t7 = 80930000 -/* 0679C 80932D6C A4E000B4 */ sh $zero, 0x00B4($a3) ## 000000B4 -/* 067A0 80932D70 15400004 */ bne $t2, $zero, .L80932D84 -/* 067A4 80932D74 A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 -/* 067A8 80932D78 240BF800 */ addiu $t3, $zero, 0xF800 ## $t3 = FFFFF800 -/* 067AC 80932D7C 10000004 */ beq $zero, $zero, .L80932D90 -/* 067B0 80932D80 A4EB01A2 */ sh $t3, 0x01A2($a3) ## 000001A2 -.L80932D84: -/* 067B4 80932D84 240CF800 */ addiu $t4, $zero, 0xF800 ## $t4 = FFFFF800 -/* 067B8 80932D88 A4E001A2 */ sh $zero, 0x01A2($a3) ## 000001A2 -/* 067BC 80932D8C A4EC00B4 */ sh $t4, 0x00B4($a3) ## 000000B4 -.L80932D90: -/* 067C0 80932D90 25EF2DAC */ addiu $t7, $t7, %lo(func_80932DAC) ## $t7 = 80932DAC -/* 067C4 80932D94 A4ED019A */ sh $t5, 0x019A($a3) ## 0000019A -/* 067C8 80932D98 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 067CC 80932D9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 067D0 80932DA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 067D4 80932DA4 03E00008 */ jr $ra -/* 067D8 80932DA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s deleted file mode 100644 index 11c0f91783..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s +++ /dev/null @@ -1,139 +0,0 @@ -glabel func_80932DAC -/* 067DC 80932DAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 067E0 80932DB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 067E4 80932DB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 067E8 80932DB8 AFA5002C */ sw $a1, 0x002C($sp) -/* 067EC 80932DBC 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 067F0 80932DC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 067F4 80932DC4 10400002 */ beq $v0, $zero, .L80932DD0 -/* 067F8 80932DC8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 067FC 80932DCC A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -.L80932DD0: -/* 06800 80932DD0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 06804 80932DD4 0C02927F */ jal SkelAnime_Update - -/* 06808 80932DD8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0680C 80932DDC 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 06810 80932DE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 06814 80932DE4 0C01DE0D */ jal Math_CosS - ## coss? -/* 06818 80932DE8 85E400B6 */ lh $a0, 0x00B6($t7) ## 809400B6 -/* 0681C 80932DEC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 06820 80932DF0 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 -/* 06824 80932DF4 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 -/* 06828 80932DF8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 0682C 80932DFC 46040182 */ mul.s $f6, $f0, $f4 -/* 06830 80932E00 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 06834 80932E04 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 06838 80932E08 46083280 */ add.s $f10, $f6, $f8 -/* 0683C 80932E0C 44055000 */ mfc1 $a1, $f10 -/* 06840 80932E10 0C01E107 */ jal Math_ApproachF - -/* 06844 80932E14 00000000 */ nop -/* 06848 80932E18 3C188094 */ lui $t8, %hi(D_80938C90) ## $t8 = 80940000 -/* 0684C 80932E1C 8F188C90 */ lw $t8, %lo(D_80938C90)($t8) -/* 06850 80932E20 0C01DE1C */ jal Math_SinS - ## sins? -/* 06854 80932E24 870400B6 */ lh $a0, 0x00B6($t8) ## 809400B6 -/* 06858 80932E28 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0685C 80932E2C 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 06860 80932E30 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 06864 80932E34 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 06868 80932E38 46100482 */ mul.s $f18, $f0, $f16 -/* 0686C 80932E3C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 06870 80932E40 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 06874 80932E44 46049180 */ add.s $f6, $f18, $f4 -/* 06878 80932E48 44053000 */ mfc1 $a1, $f6 -/* 0687C 80932E4C 0C01E107 */ jal Math_ApproachF - -/* 06880 80932E50 00000000 */ nop -/* 06884 80932E54 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 06888 80932E58 860501A2 */ lh $a1, 0x01A2($s0) ## 000001A2 -/* 0688C 80932E5C 0C01DE2B */ jal Math_ScaledStepToS - -/* 06890 80932E60 8606019A */ lh $a2, 0x019A($s0) ## 0000019A -/* 06894 80932E64 50400031 */ beql $v0, $zero, .L80932F2C -/* 06898 80932E68 8619019A */ lh $t9, 0x019A($s0) ## 0000019A -/* 0689C 80932E6C 861901A2 */ lh $t9, 0x01A2($s0) ## 000001A2 -/* 068A0 80932E70 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 068A4 80932E74 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 068A8 80932E78 1320000A */ beq $t9, $zero, .L80932EA4 -/* 068AC 80932E7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 068B0 80932E80 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 068B4 80932E84 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 -/* 068B8 80932E88 8FA40020 */ lw $a0, 0x0020($sp) -/* 068BC 80932E8C 00084880 */ sll $t1, $t0, 2 -/* 068C0 80932E90 00A92821 */ addu $a1, $a1, $t1 -/* 068C4 80932E94 0C029490 */ jal Animation_MorphToPlayOnce -/* 068C8 80932E98 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 068CC 80932E9C 1000000E */ beq $zero, $zero, .L80932ED8 -/* 068D0 80932EA0 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -.L80932EA4: -/* 068D4 80932EA4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 068D8 80932EA8 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 -/* 068DC 80932EAC 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 068E0 80932EB0 240AF800 */ addiu $t2, $zero, 0xF800 ## $t2 = FFFFF800 -/* 068E4 80932EB4 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 068E8 80932EB8 000B6080 */ sll $t4, $t3, 2 -/* 068EC 80932EBC A60A01A2 */ sh $t2, 0x01A2($s0) ## 000001A2 -/* 068F0 80932EC0 00AC2821 */ addu $a1, $a1, $t4 -/* 068F4 80932EC4 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 068F8 80932EC8 8FA40020 */ lw $a0, 0x0020($sp) -/* 068FC 80932ECC 0C029490 */ jal Animation_MorphToPlayOnce -/* 06900 80932ED0 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 06904 80932ED4 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -.L80932ED8: -/* 06908 80932ED8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 0690C 80932EDC 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 -/* 06910 80932EE0 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 -/* 06914 80932EE4 00000000 */ nop -/* 06918 80932EE8 468042A0 */ cvt.s.w $f10, $f8 -/* 0691C 80932EEC 4610503C */ c.lt.s $f10, $f16 -/* 06920 80932EF0 00000000 */ nop -/* 06924 80932EF4 4502000D */ bc1fl .L80932F2C -/* 06928 80932EF8 8619019A */ lh $t9, 0x019A($s0) ## 0000019A -/* 0692C 80932EFC 860E019A */ lh $t6, 0x019A($s0) ## 0000019A -/* 06930 80932F00 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 06934 80932F04 25CFFFC0 */ addiu $t7, $t6, 0xFFC0 ## $t7 = FFFFFFC0 -/* 06938 80932F08 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 0693C 80932F0C 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 06940 80932F10 28410040 */ slti $at, $v0, 0x0040 -/* 06944 80932F14 50200004 */ beql $at, $zero, .L80932F28 -/* 06948 80932F18 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -/* 0694C 80932F1C 10000002 */ beq $zero, $zero, .L80932F28 -/* 06950 80932F20 A618019A */ sh $t8, 0x019A($s0) ## 0000019A -/* 06954 80932F24 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -.L80932F28: -/* 06958 80932F28 8619019A */ lh $t9, 0x019A($s0) ## 0000019A -.L80932F2C: -/* 0695C 80932F2C 3C013B80 */ lui $at, 0x3B80 ## $at = 3B800000 -/* 06960 80932F30 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 06964 80932F34 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 06968 80932F38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0696C 80932F3C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 06970 80932F40 46809120 */ cvt.s.w $f4, $f18 -/* 06974 80932F44 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 06978 80932F48 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 0697C 80932F4C 860800B4 */ lh $t0, 0x00B4($s0) ## 000000B4 -/* 06980 80932F50 3C01BA00 */ lui $at, 0xBA00 ## $at = BA000000 -/* 06984 80932F54 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -/* 06988 80932F58 46062202 */ mul.s $f8, $f4, $f6 -/* 0698C 80932F5C 44813000 */ mtc1 $at, $f6 ## $f6 = -0.00 -/* 06990 80932F60 460A4400 */ add.s $f16, $f8, $f10 -/* 06994 80932F64 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 06998 80932F68 46128102 */ mul.s $f4, $f16, $f18 -/* 0699C 80932F6C 46805420 */ cvt.s.w $f16, $f10 -/* 069A0 80932F70 46062202 */ mul.s $f8, $f4, $f6 -/* 069A4 80932F74 00000000 */ nop -/* 069A8 80932F78 46104482 */ mul.s $f18, $f8, $f16 -/* 069AC 80932F7C 15200003 */ bne $t1, $zero, .L80932F8C -/* 069B0 80932F80 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 069B4 80932F84 0C24CBE8 */ jal func_80932FA0 -/* 069B8 80932F88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80932F8C: -/* 069BC 80932F8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 069C0 80932F90 8FB00018 */ lw $s0, 0x0018($sp) -/* 069C4 80932F94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 069C8 80932F98 03E00008 */ jr $ra -/* 069CC 80932F9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s deleted file mode 100644 index db570737e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80932FA0 -/* 069D0 80932FA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 069D4 80932FA4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 069D8 80932FA8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 069DC 80932FAC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 069E0 80932FB0 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 069E4 80932FB4 AFA70018 */ sw $a3, 0x0018($sp) -/* 069E8 80932FB8 000E7880 */ sll $t7, $t6, 2 -/* 069EC 80932FBC 00AF2821 */ addu $a1, $a1, $t7 -/* 069F0 80932FC0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 069F4 80932FC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 069F8 80932FC8 0C029490 */ jal Animation_MorphToPlayOnce -/* 069FC 80932FCC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 06A00 80932FD0 8FA70018 */ lw $a3, 0x0018($sp) -/* 06A04 80932FD4 3C188093 */ lui $t8, %hi(func_80932FF0) ## $t8 = 80930000 -/* 06A08 80932FD8 27182FF0 */ addiu $t8, $t8, %lo(func_80932FF0) ## $t8 = 80932FF0 -/* 06A0C 80932FDC ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 06A10 80932FE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06A14 80932FE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06A18 80932FE8 03E00008 */ jr $ra -/* 06A1C 80932FEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s deleted file mode 100644 index e781ea0280..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80932FF0 -/* 06A20 80932FF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 06A24 80932FF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 06A28 80932FF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06A2C 80932FFC AFBF001C */ sw $ra, 0x001C($sp) -/* 06A30 80933000 AFA50024 */ sw $a1, 0x0024($sp) -/* 06A34 80933004 0C02927F */ jal SkelAnime_Update - -/* 06A38 80933008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06A3C 8093300C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 06A40 80933010 2405F800 */ addiu $a1, $zero, 0xF800 ## $a1 = FFFFF800 -/* 06A44 80933014 0C01DE2B */ jal Math_ScaledStepToS - -/* 06A48 80933018 8606019A */ lh $a2, 0x019A($s0) ## 0000019A -/* 06A4C 8093301C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 06A50 80933020 3C0542B4 */ lui $a1, 0x42B4 ## $a1 = 42B40000 -/* 06A54 80933024 0C01DE80 */ jal Math_StepToF - -/* 06A58 80933028 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 06A5C 8093302C 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 06A60 80933030 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) -/* 06A64 80933034 3C0E8093 */ lui $t6, %hi(func_8092F6F0) ## $t6 = 80930000 -/* 06A68 80933038 25CEF6F0 */ addiu $t6, $t6, %lo(func_8092F6F0) ## $t6 = 8092F6F0 -/* 06A6C 8093303C 8DF80190 */ lw $t8, 0x0190($t7) ## 80940190 -/* 06A70 80933040 55D80004 */ bnel $t6, $t8, .L80933054 -/* 06A74 80933044 8FBF001C */ lw $ra, 0x001C($sp) -/* 06A78 80933048 0C24CC19 */ jal func_80933064 -/* 06A7C 8093304C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06A80 80933050 8FBF001C */ lw $ra, 0x001C($sp) -.L80933054: -/* 06A84 80933054 8FB00018 */ lw $s0, 0x0018($sp) -/* 06A88 80933058 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 06A8C 8093305C 03E00008 */ jr $ra -/* 06A90 80933060 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s deleted file mode 100644 index 048ab2aa97..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80933064 -/* 06A94 80933064 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06A98 80933068 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06A9C 8093306C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 06AA0 80933070 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 06AA4 80933074 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 06AA8 80933078 AFA70018 */ sw $a3, 0x0018($sp) -/* 06AAC 8093307C 000E7880 */ sll $t7, $t6, 2 -/* 06AB0 80933080 00AF2821 */ addu $a1, $a1, $t7 -/* 06AB4 80933084 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 06AB8 80933088 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06ABC 8093308C 0C029490 */ jal Animation_MorphToPlayOnce -/* 06AC0 80933090 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 06AC4 80933094 8FA70018 */ lw $a3, 0x0018($sp) -/* 06AC8 80933098 3C188093 */ lui $t8, %hi(func_809330B4) ## $t8 = 80930000 -/* 06ACC 8093309C 271830B4 */ addiu $t8, $t8, %lo(func_809330B4) ## $t8 = 809330B4 -/* 06AD0 809330A0 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 06AD4 809330A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06AD8 809330A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06ADC 809330AC 03E00008 */ jr $ra -/* 06AE0 809330B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s deleted file mode 100644 index 9bda0b8166..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_809330B4 -/* 06AE4 809330B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06AE8 809330B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06AEC 809330BC AFA40018 */ sw $a0, 0x0018($sp) -/* 06AF0 809330C0 AFA5001C */ sw $a1, 0x001C($sp) -/* 06AF4 809330C4 0C02927F */ jal SkelAnime_Update - -/* 06AF8 809330C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06AFC 809330CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 06B00 809330D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06B04 809330D4 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 06B08 809330D8 0C01DE2B */ jal Math_ScaledStepToS - -/* 06B0C 809330DC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 06B10 809330E0 3C028094 */ lui $v0, %hi(D_80938C90) ## $v0 = 80940000 -/* 06B14 809330E4 24428C90 */ addiu $v0, $v0, %lo(D_80938C90) ## $v0 = 80938C90 -/* 06B18 809330E8 8C4E0000 */ lw $t6, 0x0000($v0) ## 80938C90 -/* 06B1C 809330EC 3C014366 */ lui $at, 0x4366 ## $at = 43660000 -/* 06B20 809330F0 44813000 */ mtc1 $at, $f6 ## $f6 = 230.00 -/* 06B24 809330F4 C5C40028 */ lwc1 $f4, 0x0028($t6) ## 00000028 -/* 06B28 809330F8 8FA40018 */ lw $a0, 0x0018($sp) -/* 06B2C 809330FC 3C0F8093 */ lui $t7, %hi(func_8092F7DC) ## $t7 = 80930000 -/* 06B30 80933100 46062200 */ add.s $f8, $f4, $f6 -/* 06B34 80933104 25EFF7DC */ addiu $t7, $t7, %lo(func_8092F7DC) ## $t7 = 8092F7DC -/* 06B38 80933108 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -/* 06B3C 8093310C 8C580000 */ lw $t8, 0x0000($v0) ## 80938C90 -/* 06B40 80933110 8F190190 */ lw $t9, 0x0190($t8) ## 00000190 -/* 06B44 80933114 55F90004 */ bnel $t7, $t9, .L80933128 -/* 06B48 80933118 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06B4C 8093311C 0C24CC4D */ jal func_80933134 -/* 06B50 80933120 00000000 */ nop -/* 06B54 80933124 8FBF0014 */ lw $ra, 0x0014($sp) -.L80933128: -/* 06B58 80933128 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06B5C 8093312C 03E00008 */ jr $ra -/* 06B60 80933130 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s deleted file mode 100644 index 5da8d9982c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80933134 -/* 06B64 80933134 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06B68 80933138 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06B6C 8093313C 0C24D624 */ jal func_80935890 -/* 06B70 80933140 AFA40018 */ sw $a0, 0x0018($sp) -/* 06B74 80933144 8FA40018 */ lw $a0, 0x0018($sp) -/* 06B78 80933148 3C0F8093 */ lui $t7, %hi(func_80933170) ## $t7 = 80930000 -/* 06B7C 8093314C 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 -/* 06B80 80933150 25EF3170 */ addiu $t7, $t7, %lo(func_80933170) ## $t7 = 80933170 -/* 06B84 80933154 AC8000C0 */ sw $zero, 0x00C0($a0) ## 000000C0 -/* 06B88 80933158 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 06B8C 8093315C AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -/* 06B90 80933160 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06B94 80933164 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06B98 80933168 03E00008 */ jr $ra -/* 06B9C 8093316C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s deleted file mode 100644 index f14e069957..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s +++ /dev/null @@ -1,40 +0,0 @@ -.late_rodata -glabel D_80937A00 - .word 0x37D1B717 -glabel D_80937A04 - .word 0x3983126F - -.text -glabel func_80933170 -/* 06BA0 80933170 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06BA4 80933174 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06BA8 80933178 AFA5001C */ sw $a1, 0x001C($sp) -/* 06BAC 8093317C 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 06BB0 80933180 3C018093 */ lui $at, %hi(D_80937A00) ## $at = 80930000 -/* 06BB4 80933184 10400003 */ beq $v0, $zero, .L80933194 -/* 06BB8 80933188 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 06BBC 8093318C A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 06BC0 80933190 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -.L80933194: -/* 06BC4 80933194 C4207A00 */ lwc1 $f0, %lo(D_80937A00)($at) -/* 06BC8 80933198 3C018093 */ lui $at, %hi(D_80937A04) ## $at = 80930000 -/* 06BCC 8093319C C4267A04 */ lwc1 $f6, %lo(D_80937A04)($at) -/* 06BD0 809331A0 C4840054 */ lwc1 $f4, 0x0054($a0) ## 00000054 -/* 06BD4 809331A4 C48A0050 */ lwc1 $f10, 0x0050($a0) ## 00000050 -/* 06BD8 809331A8 C4920058 */ lwc1 $f18, 0x0058($a0) ## 00000058 -/* 06BDC 809331AC 46062201 */ sub.s $f8, $f4, $f6 -/* 06BE0 809331B0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 06BE4 809331B4 46005400 */ add.s $f16, $f10, $f0 -/* 06BE8 809331B8 E4880054 */ swc1 $f8, 0x0054($a0) ## 00000054 -/* 06BEC 809331BC E4860028 */ swc1 $f6, 0x0028($a0) ## 00000028 -/* 06BF0 809331C0 46009100 */ add.s $f4, $f18, $f0 -/* 06BF4 809331C4 E4900050 */ swc1 $f16, 0x0050($a0) ## 00000050 -/* 06BF8 809331C8 14400003 */ bne $v0, $zero, .L809331D8 -/* 06BFC 809331CC E4840058 */ swc1 $f4, 0x0058($a0) ## 00000058 -/* 06C00 809331D0 0C24CC7A */ jal func_809331E8 -/* 06C04 809331D4 00000000 */ nop -.L809331D8: -/* 06C08 809331D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06C0C 809331DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06C10 809331E0 03E00008 */ jr $ra -/* 06C14 809331E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s deleted file mode 100644 index 13b752b0b4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_809331E8 -/* 06C18 809331E8 3C0E8093 */ lui $t6, %hi(func_8093639C) ## $t6 = 80930000 -/* 06C1C 809331EC 3C188093 */ lui $t8, %hi(func_80933210) ## $t8 = 80930000 -/* 06C20 809331F0 25CE639C */ addiu $t6, $t6, %lo(func_8093639C) ## $t6 = 8093639C -/* 06C24 809331F4 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 06C28 809331F8 27183210 */ addiu $t8, $t8, %lo(func_80933210) ## $t8 = 80933210 -/* 06C2C 809331FC AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 -/* 06C30 80933200 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 06C34 80933204 A4800722 */ sh $zero, 0x0722($a0) ## 00000722 -/* 06C38 80933208 03E00008 */ jr $ra -/* 06C3C 8093320C AC980190 */ sw $t8, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s deleted file mode 100644 index f77b08261a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80933210 -/* 06C40 80933210 AFA50004 */ sw $a1, 0x0004($sp) -/* 06C44 80933214 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 06C48 80933218 10400003 */ beq $v0, $zero, .L80933228 -/* 06C4C 8093321C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 06C50 80933220 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 06C54 80933224 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -.L80933228: -/* 06C58 80933228 14400002 */ bne $v0, $zero, .L80933234 -/* 06C5C 8093322C 00000000 */ nop -/* 06C60 80933230 A0800196 */ sb $zero, 0x0196($a0) ## 00000196 -.L80933234: -/* 06C64 80933234 03E00008 */ jr $ra -/* 06C68 80933238 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s deleted file mode 100644 index bce100af09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_8093323C -/* 06C6C 8093323C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06C70 80933240 AFBF0014 */ sw $ra, 0x0014($sp) -/* 06C74 80933244 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 06C78 80933248 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 06C7C 8093324C 3C058093 */ lui $a1, %hi(D_8093787C) ## $a1 = 80930000 -/* 06C80 80933250 AFA70018 */ sw $a3, 0x0018($sp) -/* 06C84 80933254 000E7880 */ sll $t7, $t6, 2 -/* 06C88 80933258 00AF2821 */ addu $a1, $a1, $t7 -/* 06C8C 8093325C 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) -/* 06C90 80933260 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06C94 80933264 0C029490 */ jal Animation_MorphToPlayOnce -/* 06C98 80933268 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 06C9C 8093326C 8FA70018 */ lw $a3, 0x0018($sp) -/* 06CA0 80933270 3C188093 */ lui $t8, %hi(func_80933290) ## $t8 = 80930000 -/* 06CA4 80933274 27183290 */ addiu $t8, $t8, %lo(func_80933290) ## $t8 = 80933290 -/* 06CA8 80933278 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 -/* 06CAC 8093327C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 06CB0 80933280 8FBF0014 */ lw $ra, 0x0014($sp) -/* 06CB4 80933284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06CB8 80933288 03E00008 */ jr $ra -/* 06CBC 8093328C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s deleted file mode 100644 index a0836365e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80933290 -/* 06CC0 80933290 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 06CC4 80933294 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 06CC8 80933298 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 06CCC 8093329C AFB00020 */ sw $s0, 0x0020($sp) -/* 06CD0 809332A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06CD4 809332A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 06CD8 809332A8 AFA50034 */ sw $a1, 0x0034($sp) -/* 06CDC 809332AC 3C05437A */ lui $a1, 0x437A ## $a1 = 437A0000 -/* 06CE0 809332B0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 06CE4 809332B4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 06CE8 809332B8 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 -/* 06CEC 809332BC 0C01E0C4 */ jal Math_SmoothStepToF - -/* 06CF0 809332C0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 06CF4 809332C4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 06CF8 809332C8 0C02927F */ jal SkelAnime_Update - -/* 06CFC 809332CC AFA4002C */ sw $a0, 0x002C($sp) -/* 06D00 809332D0 1040000D */ beq $v0, $zero, .L80933308 -/* 06D04 809332D4 8FA4002C */ lw $a0, 0x002C($sp) -/* 06D08 809332D8 820E0195 */ lb $t6, 0x0195($s0) ## 00000195 -/* 06D0C 809332DC 55C0000B */ bnel $t6, $zero, .L8093330C -/* 06D10 809332E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06D14 809332E4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 06D18 809332E8 3C058093 */ lui $a1, %hi(D_80937884) ## $a1 = 80930000 -/* 06D1C 809332EC 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 06D20 809332F0 000FC080 */ sll $t8, $t7, 2 -/* 06D24 809332F4 00B82821 */ addu $a1, $a1, $t8 -/* 06D28 809332F8 0C029490 */ jal Animation_MorphToPlayOnce -/* 06D2C 809332FC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) -/* 06D30 80933300 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 06D34 80933304 A2190195 */ sb $t9, 0x0195($s0) ## 00000195 -.L80933308: -/* 06D38 80933308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L8093330C: -/* 06D3C 8093330C 0C00BE5D */ jal func_8002F974 -/* 06D40 80933310 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 06D44 80933314 8FBF0024 */ lw $ra, 0x0024($sp) -/* 06D48 80933318 8FB00020 */ lw $s0, 0x0020($sp) -/* 06D4C 8093331C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 06D50 80933320 03E00008 */ jr $ra -/* 06D54 80933324 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s deleted file mode 100644 index 2d20815ea2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80933328 -/* 06D58 80933328 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06D5C 8093332C AFBF0024 */ sw $ra, 0x0024($sp) -/* 06D60 80933330 AFB00020 */ sw $s0, 0x0020($sp) -/* 06D64 80933334 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 06D68 80933338 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 06D6C 8093333C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06D70 80933340 000FC080 */ sll $t8, $t7, 2 -/* 06D74 80933344 00380821 */ addu $at, $at, $t8 -/* 06D78 80933348 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 06D7C 8093334C AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 06D80 80933350 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 06D84 80933354 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 06D88 80933358 248403C8 */ addiu $a0, $a0, 0x03C8 ## $a0 = 000003C8 -/* 06D8C 8093335C 0C24CD55 */ jal func_80933554 -/* 06D90 80933360 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C -/* 06D94 80933364 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 06D98 80933368 24080023 */ addiu $t0, $zero, 0x0023 ## $t0 = 00000023 -/* 06D9C 8093336C A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 06DA0 80933370 A2190196 */ sb $t9, 0x0196($s0) ## 00000196 -/* 06DA4 80933374 A6080198 */ sh $t0, 0x0198($s0) ## 00000198 -/* 06DA8 80933378 A6000720 */ sh $zero, 0x0720($s0) ## 00000720 -/* 06DAC 8093337C A6000748 */ sh $zero, 0x0748($s0) ## 00000748 -/* 06DB0 80933380 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 06DB4 80933384 26020050 */ addiu $v0, $s0, 0x0050 ## $v0 = 00000050 -/* 06DB8 80933388 24040012 */ addiu $a0, $zero, 0x0012 ## $a0 = 00000012 -.L8093338C: -/* 06DBC 8093338C 24630004 */ addiu $v1, $v1, 0x0004 ## $v1 = 00000006 -/* 06DC0 80933390 A4400748 */ sh $zero, 0x0748($v0) ## 00000798 -/* 06DC4 80933394 A4400770 */ sh $zero, 0x0770($v0) ## 000007C0 -/* 06DC8 80933398 A4400798 */ sh $zero, 0x0798($v0) ## 000007E8 -/* 06DCC 8093339C 244200A0 */ addiu $v0, $v0, 0x00A0 ## $v0 = 000000F0 -/* 06DD0 809333A0 1464FFFA */ bne $v1, $a0, .L8093338C -/* 06DD4 809333A4 A4400680 */ sh $zero, 0x0680($v0) ## 00000770 -/* 06DD8 809333A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06DDC 809333AC 0C24D688 */ jal func_80935A20 -/* 06DE0 809333B0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06DE4 809333B4 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 06DE8 809333B8 AFA90010 */ sw $t1, 0x0010($sp) -/* 06DEC 809333BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06DF0 809333C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06DF4 809333C4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 06DF8 809333C8 0C00D09B */ jal Actor_SetColorFilter -/* 06DFC 809333CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06E00 809333D0 3C0A8093 */ lui $t2, %hi(func_809333F4) ## $t2 = 80930000 -/* 06E04 809333D4 254A33F4 */ addiu $t2, $t2, %lo(func_809333F4) ## $t2 = 809333F4 -/* 06E08 809333D8 A600019A */ sh $zero, 0x019A($s0) ## 0000019A -/* 06E0C 809333DC AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 06E10 809333E0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 06E14 809333E4 8FB00020 */ lw $s0, 0x0020($sp) -/* 06E18 809333E8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06E1C 809333EC 03E00008 */ jr $ra -/* 06E20 809333F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s deleted file mode 100644 index 4c92bede74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_809333F4 -/* 06E24 809333F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06E28 809333F8 AFBF001C */ sw $ra, 0x001C($sp) -/* 06E2C 809333FC AFB00018 */ sw $s0, 0x0018($sp) -/* 06E30 80933400 AFA5002C */ sw $a1, 0x002C($sp) -/* 06E34 80933404 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 06E38 80933408 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06E3C 8093340C 10400003 */ beq $v0, $zero, .L8093341C -/* 06E40 80933410 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 06E44 80933414 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 06E48 80933418 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -.L8093341C: -/* 06E4C 8093341C 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 06E50 80933420 11E00004 */ beq $t7, $zero, .L80933434 -/* 06E54 80933424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06E58 80933428 00022843 */ sra $a1, $v0, 1 -/* 06E5C 8093342C 0C24D688 */ jal func_80935A20 -/* 06E60 80933430 24A50001 */ addiu $a1, $a1, 0x0001 ## $a1 = 00000001 -.L80933434: -/* 06E64 80933434 82180195 */ lb $t8, 0x0195($s0) ## 00000195 -/* 06E68 80933438 5300000B */ beql $t8, $zero, .L80933468 -/* 06E6C 8093343C 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -/* 06E70 80933440 0C24D7CC */ jal func_80935F30 -/* 06E74 80933444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06E78 80933448 0C24C11D */ jal func_80930474 -/* 06E7C 8093344C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06E80 80933450 3C088094 */ lui $t0, %hi(D_80938C90) ## $t0 = 80940000 -/* 06E84 80933454 8D088C90 */ lw $t0, %lo(D_80938C90)($t0) -/* 06E88 80933458 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 06E8C 8093345C 10000038 */ beq $zero, $zero, .L80933540 -/* 06E90 80933460 A1190195 */ sb $t9, 0x0195($t0) ## 80940195 -/* 06E94 80933464 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -.L80933468: -/* 06E98 80933468 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 06E9C 8093346C A2090114 */ sb $t1, 0x0114($s0) ## 00000114 -/* 06EA0 80933470 51400034 */ beql $t2, $zero, .L80933544 -/* 06EA4 80933474 8FBF001C */ lw $ra, 0x001C($sp) -/* 06EA8 80933478 8E0B011C */ lw $t3, 0x011C($s0) ## 0000011C -/* 06EAC 8093347C 0C01DE1C */ jal Math_SinS - ## sins? -/* 06EB0 80933480 856400B4 */ lh $a0, 0x00B4($t3) ## 000000B4 -/* 06EB4 80933484 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 06EB8 80933488 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 06EBC 8093348C 8E0C011C */ lw $t4, 0x011C($s0) ## 0000011C -/* 06EC0 80933490 46040082 */ mul.s $f2, $f0, $f4 -/* 06EC4 80933494 858400B4 */ lh $a0, 0x00B4($t4) ## 000000B4 -/* 06EC8 80933498 0C01DE0D */ jal Math_CosS - ## coss? -/* 06ECC 8093349C E7A20024 */ swc1 $f2, 0x0024($sp) -/* 06ED0 809334A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 06ED4 809334A4 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 06ED8 809334A8 860D019A */ lh $t5, 0x019A($s0) ## 0000019A -/* 06EDC 809334AC C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 06EE0 809334B0 46060382 */ mul.s $f14, $f0, $f6 -/* 06EE4 809334B4 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 06EE8 809334B8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 06EEC 809334BC 11C00007 */ beq $t6, $zero, .L809334DC -/* 06EF0 809334C0 46007306 */ mov.s $f12, $f14 -/* 06EF4 809334C4 44810000 */ mtc1 $at, $f0 ## $f0 = -1.00 -/* 06EF8 809334C8 00000000 */ nop -/* 06EFC 809334CC 46001082 */ mul.s $f2, $f2, $f0 -/* 06F00 809334D0 00000000 */ nop -/* 06F04 809334D4 46007302 */ mul.s $f12, $f14, $f0 -/* 06F08 809334D8 00000000 */ nop -.L809334DC: -/* 06F0C 809334DC 8E0F011C */ lw $t7, 0x011C($s0) ## 0000011C -/* 06F10 809334E0 85E400B6 */ lh $a0, 0x00B6($t7) ## 000000B6 -/* 06F14 809334E4 E7AC0020 */ swc1 $f12, 0x0020($sp) -/* 06F18 809334E8 0C01DE0D */ jal Math_CosS - ## coss? -/* 06F1C 809334EC E7A20024 */ swc1 $f2, 0x0024($sp) -/* 06F20 809334F0 C7AC0020 */ lwc1 $f12, 0x0020($sp) -/* 06F24 809334F4 C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 06F28 809334F8 C60A03C8 */ lwc1 $f10, 0x03C8($s0) ## 000003C8 -/* 06F2C 809334FC 460C0202 */ mul.s $f8, $f0, $f12 -/* 06F30 80933500 C61203CC */ lwc1 $f18, 0x03CC($s0) ## 000003CC -/* 06F34 80933504 8E18011C */ lw $t8, 0x011C($s0) ## 0000011C -/* 06F38 80933508 46029100 */ add.s $f4, $f18, $f2 -/* 06F3C 8093350C 460A4400 */ add.s $f16, $f8, $f10 -/* 06F40 80933510 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 06F44 80933514 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 06F48 80933518 0C01DE1C */ jal Math_SinS - ## sins? -/* 06F4C 8093351C 870400B6 */ lh $a0, 0x00B6($t8) ## 000000B6 -/* 06F50 80933520 C7AC0020 */ lwc1 $f12, 0x0020($sp) -/* 06F54 80933524 C60803D0 */ lwc1 $f8, 0x03D0($s0) ## 000003D0 -/* 06F58 80933528 8619019A */ lh $t9, 0x019A($s0) ## 0000019A -/* 06F5C 8093352C 460C0182 */ mul.s $f6, $f0, $f12 -/* 06F60 80933530 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF -/* 06F64 80933534 A608019A */ sh $t0, 0x019A($s0) ## 0000019A -/* 06F68 80933538 46083280 */ add.s $f10, $f6, $f8 -/* 06F6C 8093353C E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -.L80933540: -/* 06F70 80933540 8FBF001C */ lw $ra, 0x001C($sp) -.L80933544: -/* 06F74 80933544 8FB00018 */ lw $s0, 0x0018($sp) -/* 06F78 80933548 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06F7C 8093354C 03E00008 */ jr $ra -/* 06F80 80933550 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s deleted file mode 100644 index e82059160e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80933554 -/* 06F84 80933554 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 06F88 80933558 AFBF001C */ sw $ra, 0x001C($sp) -/* 06F8C 8093355C AFB00018 */ sw $s0, 0x0018($sp) -/* 06F90 80933560 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 06F94 80933564 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 -/* 06F98 80933568 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 06F9C 8093356C 000FC080 */ sll $t8, $t7, 2 -/* 06FA0 80933570 00380821 */ addu $at, $at, $t8 -/* 06FA4 80933574 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06FA8 80933578 AC2E746C */ sw $t6, %lo(D_8093746C)($at) -/* 06FAC 8093357C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 06FB0 80933580 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 -/* 06FB4 80933584 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06FB8 80933588 00194080 */ sll $t0, $t9, 2 -/* 06FBC 8093358C 00A82821 */ addu $a1, $a1, $t0 -/* 06FC0 80933590 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 06FC4 80933594 0C029490 */ jal Animation_MorphToPlayOnce -/* 06FC8 80933598 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 06FCC 8093359C 92090196 */ lbu $t1, 0x0196($s0) ## 00000196 -/* 06FD0 809335A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06FD4 809335A4 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 06FD8 809335A8 15210002 */ bne $t1, $at, .L809335B4 -/* 06FDC 809335AC A2000114 */ sb $zero, 0x0114($s0) ## 00000114 -/* 06FE0 809335B0 A2000196 */ sb $zero, 0x0196($s0) ## 00000196 -.L809335B4: -/* 06FE4 809335B4 8E05011C */ lw $a1, 0x011C($s0) ## 0000011C -/* 06FE8 809335B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06FEC 809335BC 0C00B6EC */ jal Actor_WorldDistXZToPoint -/* 06FF0 809335C0 24A503C8 */ addiu $a1, $a1, 0x03C8 ## $a1 = 000003C8 -/* 06FF4 809335C4 8E05011C */ lw $a1, 0x011C($s0) ## 0000011C -/* 06FF8 809335C8 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 -/* 06FFC 809335CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07000 809335D0 0C00B6B0 */ jal Actor_WorldYawTowardPoint -/* 07004 809335D4 24A503C8 */ addiu $a1, $a1, 0x03C8 ## $a1 = 000003C8 -/* 07008 809335D8 A60201A4 */ sh $v0, 0x01A4($s0) ## 000001A4 -/* 0700C 809335DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07010 809335E0 0C24CF3B */ jal func_80933CEC -/* 07014 809335E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 07018 809335E8 3C0A8093 */ lui $t2, %hi(func_80933608) ## $t2 = 80930000 -/* 0701C 809335EC 254A3608 */ addiu $t2, $t2, %lo(func_80933608) ## $t2 = 80933608 -/* 07020 809335F0 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 07024 809335F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 07028 809335F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0702C 809335FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 07030 80933600 03E00008 */ jr $ra -/* 07034 80933604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s deleted file mode 100644 index 2fa60637af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_80933608 -/* 07038 80933608 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0703C 8093360C AFB00014 */ sw $s0, 0x0014($sp) -/* 07040 80933610 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07044 80933614 AFBF001C */ sw $ra, 0x001C($sp) -/* 07048 80933618 AFB10018 */ sw $s1, 0x0018($sp) -/* 0704C 8093361C AFA50024 */ sw $a1, 0x0024($sp) -/* 07050 80933620 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 07054 80933624 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 07058 80933628 0C01DE2B */ jal Math_ScaledStepToS - -/* 0705C 8093362C 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 07060 80933630 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 07064 80933634 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 07068 80933638 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 -/* 0706C 8093363C 0C01DE2B */ jal Math_ScaledStepToS - -/* 07070 80933640 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 07074 80933644 02228824 */ and $s1, $s1, $v0 -/* 07078 80933648 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 -/* 0707C 8093364C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 07080 80933650 0C01DE2B */ jal Math_ScaledStepToS - -/* 07084 80933654 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 07088 80933658 02228824 */ and $s1, $s1, $v0 -/* 0708C 8093365C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 07090 80933660 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 07094 80933664 0C01DE2B */ jal Math_ScaledStepToS - -/* 07098 80933668 24060400 */ addiu $a2, $zero, 0x0400 ## $a2 = 00000400 -/* 0709C 8093366C 8E0E011C */ lw $t6, 0x011C($s0) ## 0000011C -/* 070A0 80933670 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 070A4 80933674 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 070A8 80933678 C5C403CC */ lwc1 $f4, 0x03CC($t6) ## 000003CC -/* 070AC 8093367C 02228824 */ and $s1, $s1, $v0 -/* 070B0 80933680 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 070B4 80933684 46062200 */ add.s $f8, $f4, $f6 -/* 070B8 80933688 3C064248 */ lui $a2, 0x4248 ## $a2 = 42480000 -/* 070BC 8093368C 44054000 */ mfc1 $a1, $f8 -/* 070C0 80933690 0C01DE80 */ jal Math_StepToF - -/* 070C4 80933694 00000000 */ nop -/* 070C8 80933698 02228824 */ and $s1, $s1, $v0 -/* 070CC 8093369C 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 070D0 809336A0 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 -/* 070D4 809336A4 0C01DE80 */ jal Math_StepToF - -/* 070D8 809336A8 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 -/* 070DC 809336AC 02228824 */ and $s1, $s1, $v0 -/* 070E0 809336B0 0C01DE1C */ jal Math_SinS - ## sins? -/* 070E4 809336B4 860401A4 */ lh $a0, 0x01A4($s0) ## 000001A4 -/* 070E8 809336B8 C61003C4 */ lwc1 $f16, 0x03C4($s0) ## 000003C4 -/* 070EC 809336BC 8E0F011C */ lw $t7, 0x011C($s0) ## 0000011C -/* 070F0 809336C0 860401A4 */ lh $a0, 0x01A4($s0) ## 000001A4 -/* 070F4 809336C4 46100482 */ mul.s $f18, $f0, $f16 -/* 070F8 809336C8 C5EA03C8 */ lwc1 $f10, 0x03C8($t7) ## 000003C8 -/* 070FC 809336CC 46125101 */ sub.s $f4, $f10, $f18 -/* 07100 809336D0 0C01DE0D */ jal Math_CosS - ## coss? -/* 07104 809336D4 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 07108 809336D8 C60803C4 */ lwc1 $f8, 0x03C4($s0) ## 000003C4 -/* 0710C 809336DC 8E18011C */ lw $t8, 0x011C($s0) ## 0000011C -/* 07110 809336E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 07114 809336E4 46080402 */ mul.s $f16, $f0, $f8 -/* 07118 809336E8 C70603D0 */ lwc1 $f6, 0x03D0($t8) ## 000003D0 -/* 0711C 809336EC 46103281 */ sub.s $f10, $f6, $f16 -/* 07120 809336F0 0C02927F */ jal SkelAnime_Update - -/* 07124 809336F4 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 07128 809336F8 50400006 */ beql $v0, $zero, .L80933714 -/* 0712C 809336FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 07130 80933700 52200004 */ beql $s1, $zero, .L80933714 -/* 07134 80933704 8FBF001C */ lw $ra, 0x001C($sp) -/* 07138 80933708 0C24CDC9 */ jal func_80933724 -/* 0713C 8093370C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07140 80933710 8FBF001C */ lw $ra, 0x001C($sp) -.L80933714: -/* 07144 80933714 8FB00014 */ lw $s0, 0x0014($sp) -/* 07148 80933718 8FB10018 */ lw $s1, 0x0018($sp) -/* 0714C 8093371C 03E00008 */ jr $ra -/* 07150 80933720 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s deleted file mode 100644 index 32768111dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80933724 -/* 07154 80933724 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 07158 80933728 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0715C 8093372C 3C0F8093 */ lui $t7, %hi(func_80933748) ## $t7 = 80930000 -/* 07160 80933730 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 07164 80933734 25EF3748 */ addiu $t7, $t7, %lo(func_80933748) ## $t7 = 80933748 -/* 07168 80933738 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -/* 0716C 8093373C AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -/* 07170 80933740 03E00008 */ jr $ra -/* 07174 80933744 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s deleted file mode 100644 index 63ad1085d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s +++ /dev/null @@ -1,121 +0,0 @@ -.late_rodata -glabel D_80937A08 - .float 0.8 - -glabel D_80937A0C - .float 0.4 - -.text -glabel func_80933748 -/* 07178 80933748 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0717C 8093374C AFBF001C */ sw $ra, 0x001C($sp) -/* 07180 80933750 AFB00018 */ sw $s0, 0x0018($sp) -/* 07184 80933754 AFA50024 */ sw $a1, 0x0024($sp) -/* 07188 80933758 848E0198 */ lh $t6, 0x0198($a0) ## 00000198 -/* 0718C 8093375C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07190 80933760 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 -/* 07194 80933764 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 07198 80933768 11E00025 */ beq $t7, $zero, .L80933800 -/* 0719C 8093376C 3C018093 */ lui $at, %hi(D_80937A08) ## $at = 80930000 -/* 071A0 80933770 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 071A4 80933774 44811000 */ mtc1 $at, $f2 ## $f2 = 60.00 -/* 071A8 80933778 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 071AC 8093377C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 071B0 80933780 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 071B4 80933784 46062202 */ mul.s $f8, $f4, $f6 -/* 071B8 80933788 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 -/* 071BC 8093378C C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 071C0 80933790 4600103C */ c.lt.s $f2, $f0 -/* 071C4 80933794 00000000 */ nop -/* 071C8 80933798 45020004 */ bc1fl .L809337AC -/* 071CC 8093379C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 071D0 809337A0 10000002 */ beq $zero, $zero, .L809337AC -/* 071D4 809337A4 E4820068 */ swc1 $f2, 0x0068($a0) ## 00000068 -/* 071D8 809337A8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -.L809337AC: -/* 071DC 809337AC 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 071E0 809337B0 0C01DE80 */ jal Math_StepToF - -/* 071E4 809337B4 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 071E8 809337B8 10400024 */ beq $v0, $zero, .L8093384C -/* 071EC 809337BC 00000000 */ nop -/* 071F0 809337C0 0C24D737 */ jal func_80935CDC -/* 071F4 809337C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 071F8 809337C8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 071FC 809337CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07200 809337D0 10400003 */ beq $v0, $zero, .L809337E0 -/* 07204 809337D4 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 07208 809337D8 A6180198 */ sh $t8, 0x0198($s0) ## 00000198 -/* 0720C 809337DC 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L809337E0: -/* 07210 809337E0 50400004 */ beql $v0, $zero, .L809337F4 -/* 07214 809337E4 8E08011C */ lw $t0, 0x011C($s0) ## 0000011C -/* 07218 809337E8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0721C 809337EC 240528CB */ addiu $a1, $zero, 0x28CB ## $a1 = 000028CB -/* 07220 809337F0 8E08011C */ lw $t0, 0x011C($s0) ## 0000011C -.L809337F4: -/* 07224 809337F4 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 07228 809337F8 10000014 */ beq $zero, $zero, .L8093384C -/* 0722C 809337FC A519019A */ sh $t9, 0x019A($t0) ## 0000019A -.L80933800: -/* 07230 80933800 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 07234 80933804 C4307A08 */ lwc1 $f16, %lo(D_80937A08)($at) -/* 07238 80933808 260403C4 */ addiu $a0, $s0, 0x03C4 ## $a0 = 000003C4 -/* 0723C 8093380C 3C0543FA */ lui $a1, 0x43FA ## $a1 = 43FA0000 -/* 07240 80933810 46105482 */ mul.s $f18, $f10, $f16 -/* 07244 80933814 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 07248 80933818 0C01DE80 */ jal Math_StepToF - -/* 0724C 8093381C 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 07250 80933820 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 07254 80933824 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 07258 80933828 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 0725C 8093382C 4606203C */ c.lt.s $f4, $f6 -/* 07260 80933830 00000000 */ nop -/* 07264 80933834 45000005 */ bc1f .L8093384C -/* 07268 80933838 00000000 */ nop -/* 0726C 8093383C 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 07270 80933840 10400002 */ beq $v0, $zero, .L8093384C -/* 07274 80933844 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 07278 80933848 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 -.L8093384C: -/* 0727C 8093384C 0C01DE1C */ jal Math_SinS - ## sins? -/* 07280 80933850 860401A4 */ lh $a0, 0x01A4($s0) ## 000001A4 -/* 07284 80933854 C60A03C4 */ lwc1 $f10, 0x03C4($s0) ## 000003C4 -/* 07288 80933858 8E0A011C */ lw $t2, 0x011C($s0) ## 0000011C -/* 0728C 8093385C 860401A4 */ lh $a0, 0x01A4($s0) ## 000001A4 -/* 07290 80933860 460A0402 */ mul.s $f16, $f0, $f10 -/* 07294 80933864 C54803C8 */ lwc1 $f8, 0x03C8($t2) ## 000003C8 -/* 07298 80933868 46104481 */ sub.s $f18, $f8, $f16 -/* 0729C 8093386C 0C01DE0D */ jal Math_CosS - ## coss? -/* 072A0 80933870 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 072A4 80933874 C60203C4 */ lwc1 $f2, 0x03C4($s0) ## 000003C4 -/* 072A8 80933878 8E02011C */ lw $v0, 0x011C($s0) ## 0000011C -/* 072AC 8093387C 3C018093 */ lui $at, %hi(D_80937A0C) ## $at = 80930000 -/* 072B0 80933880 46020182 */ mul.s $f6, $f0, $f2 -/* 072B4 80933884 C44403D0 */ lwc1 $f4, 0x03D0($v0) ## 000003D0 -/* 072B8 80933888 860B0198 */ lh $t3, 0x0198($s0) ## 00000198 -/* 072BC 8093388C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 072C0 80933890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 072C4 80933894 46062281 */ sub.s $f10, $f4, $f6 -/* 072C8 80933898 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 072CC 8093389C C4307A0C */ lwc1 $f16, %lo(D_80937A0C)($at) -/* 072D0 809338A0 C44803CC */ lwc1 $f8, 0x03CC($v0) ## 000003CC -/* 072D4 809338A4 46101482 */ mul.s $f18, $f2, $f16 -/* 072D8 809338A8 46124100 */ add.s $f4, $f8, $f18 -/* 072DC 809338AC 15600003 */ bne $t3, $zero, .L809338BC -/* 072E0 809338B0 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 072E4 809338B4 0C24C11D */ jal func_80930474 -/* 072E8 809338B8 A04C0195 */ sb $t4, 0x0195($v0) ## 00000195 -.L809338BC: -/* 072EC 809338BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 072F0 809338C0 0C00BE5D */ jal func_8002F974 -/* 072F4 809338C4 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 072F8 809338C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 072FC 809338CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 07300 809338D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 07304 809338D4 03E00008 */ jr $ra -/* 07308 809338D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s deleted file mode 100644 index 572347c053..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_809338DC -/* 0730C 809338DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 07310 809338E0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 07314 809338E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 07318 809338E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0731C 809338EC 8CA51C44 */ lw $a1, 0x1C44($a1) ## 00001C44 -/* 07320 809338F0 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 07324 809338F4 0324C821 */ addu $t9, $t9, $a0 -/* 07328 809338F8 AFA70020 */ sw $a3, 0x0020($sp) -/* 0732C 809338FC AFA5001C */ sw $a1, 0x001C($sp) -/* 07330 80933900 8F391D4C */ lw $t9, 0x1D4C($t9) ## 00011D4C -/* 07334 80933904 0320F809 */ jalr $ra, $t9 -/* 07338 80933908 00000000 */ nop -/* 0733C 8093390C 8FA5001C */ lw $a1, 0x001C($sp) -/* 07340 80933910 10400015 */ beq $v0, $zero, .L80933968 -/* 07344 80933914 8FA70020 */ lw $a3, 0x0020($sp) -/* 07348 80933918 90AE00AF */ lbu $t6, 0x00AF($a1) ## 000000AF -/* 0734C 8093391C ACA70118 */ sw $a3, 0x0118($a1) ## 00000118 -/* 07350 80933920 59C00012 */ blezl $t6, .L8093396C -/* 07354 80933924 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07358 80933928 90EF03E6 */ lbu $t7, 0x03E6($a3) ## 000003E6 -/* 0735C 8093392C 84E8001C */ lh $t0, 0x001C($a3) ## 0000001C -/* 07360 80933930 3C0A8093 */ lui $t2, %hi(D_8093746C) ## $t2 = 80930000 -/* 07364 80933934 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 07368 80933938 00084880 */ sll $t1, $t0, 2 -/* 0736C 8093393C A0F803E6 */ sb $t8, 0x03E6($a3) ## 000003E6 -/* 07370 80933940 01495021 */ addu $t2, $t2, $t1 -/* 07374 80933944 8D4A746C */ lw $t2, %lo(D_8093746C)($t2) -/* 07378 80933948 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0737C 8093394C 2403FFFE */ addiu $v1, $zero, 0xFFFE ## $v1 = FFFFFFFE -/* 07380 80933950 55410006 */ bnel $t2, $at, .L8093396C -/* 07384 80933954 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07388 80933958 8CE2011C */ lw $v0, 0x011C($a3) ## 0000011C -/* 0738C 8093395C 904B03E6 */ lbu $t3, 0x03E6($v0) ## 000003E6 -/* 07390 80933960 01636024 */ and $t4, $t3, $v1 -/* 07394 80933964 A04C03E6 */ sb $t4, 0x03E6($v0) ## 000003E6 -.L80933968: -/* 07398 80933968 8FBF0014 */ lw $ra, 0x0014($sp) -.L8093396C: -/* 0739C 8093396C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 073A0 80933970 03E00008 */ jr $ra -/* 073A4 80933974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s deleted file mode 100644 index 54a821378a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80933978 -/* 073A8 80933978 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 073AC 8093397C AFBF0024 */ sw $ra, 0x0024($sp) -/* 073B0 80933980 AFB00020 */ sw $s0, 0x0020($sp) -/* 073B4 80933984 AFA5002C */ sw $a1, 0x002C($sp) -/* 073B8 80933988 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 073BC 8093398C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 073C0 80933990 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 073C4 80933994 8C6F0118 */ lw $t7, 0x0118($v1) ## 00000118 -/* 073C8 80933998 548F0013 */ bnel $a0, $t7, .L809339E8 -/* 073CC 8093399C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 073D0 809339A0 AC600118 */ sw $zero, 0x0118($v1) ## 00000118 -/* 073D4 809339A4 A4780850 */ sh $t8, 0x0850($v1) ## 00000850 -/* 073D8 809339A8 909903E6 */ lbu $t9, 0x03E6($a0) ## 000003E6 -/* 073DC 809339AC 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C -/* 073E0 809339B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 073E4 809339B4 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 073E8 809339B8 A08803E6 */ sb $t0, 0x03E6($a0) ## 000003E6 -/* 073EC 809339BC 904903E6 */ lbu $t1, 0x03E6($v0) ## 000003E6 -/* 073F0 809339C0 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 073F4 809339C4 10C00007 */ beq $a2, $zero, .L809339E4 -/* 073F8 809339C8 A04A03E6 */ sb $t2, 0x03E6($v0) ## 000003E6 -/* 073FC 809339CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 07400 809339D0 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 07404 809339D4 8FA4002C */ lw $a0, 0x002C($sp) -/* 07408 809339D8 44060000 */ mfc1 $a2, $f0 -/* 0740C 809339DC 0C00BDC7 */ jal func_8002F71C -/* 07410 809339E0 E7A00010 */ swc1 $f0, 0x0010($sp) -.L809339E4: -/* 07414 809339E4 8FBF0024 */ lw $ra, 0x0024($sp) -.L809339E8: -/* 07418 809339E8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0741C 809339EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 07420 809339F0 03E00008 */ jr $ra -/* 07424 809339F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s deleted file mode 100644 index 89170404ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_809339F8 -/* 07428 809339F8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0742C 809339FC AFBF0014 */ sw $ra, 0x0014($sp) -/* 07430 80933A00 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 07434 80933A04 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 07438 80933A08 0C01DE1C */ jal Math_SinS - ## sins? -/* 0743C 80933A0C AFA50028 */ sw $a1, 0x0028($sp) -/* 07440 80933A10 8FA50028 */ lw $a1, 0x0028($sp) -/* 07444 80933A14 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 07448 80933A18 0C01DE0D */ jal Math_CosS - ## coss? -/* 0744C 80933A1C E7A0001C */ swc1 $f0, 0x001C($sp) -/* 07450 80933A20 8FA50028 */ lw $a1, 0x0028($sp) -/* 07454 80933A24 3C0E8093 */ lui $t6, %hi(func_8092E2E0) ## $t6 = 80930000 -/* 07458 80933A28 25CEE2E0 */ addiu $t6, $t6, %lo(func_8092E2E0) ## $t6 = 8092E2E0 -/* 0745C 80933A2C 8CAF0190 */ lw $t7, 0x0190($a1) ## 00000190 -/* 07460 80933A30 3C068094 */ lui $a2, %hi(D_80938C98) ## $a2 = 80940000 -/* 07464 80933A34 C7AC001C */ lwc1 $f12, 0x001C($sp) -/* 07468 80933A38 11CF000C */ beq $t6, $t7, .L80933A6C -/* 0746C 80933A3C 24C68C98 */ addiu $a2, $a2, %lo(D_80938C98) ## $a2 = 80938C98 -/* 07470 80933A40 C4A203C4 */ lwc1 $f2, 0x03C4($a1) ## 000003C4 -/* 07474 80933A44 3C028093 */ lui $v0, %hi(D_80937340) ## $v0 = 80930000 -/* 07478 80933A48 24427340 */ addiu $v0, $v0, %lo(D_80937340) ## $v0 = 80937340 -/* 0747C 80933A4C 460C1102 */ mul.s $f4, $f2, $f12 -/* 07480 80933A50 C4460000 */ lwc1 $f6, 0x0000($v0) ## 80937340 -/* 07484 80933A54 46001282 */ mul.s $f10, $f2, $f0 -/* 07488 80933A58 46062200 */ add.s $f8, $f4, $f6 -/* 0748C 80933A5C E4A80024 */ swc1 $f8, 0x0024($a1) ## 00000024 -/* 07490 80933A60 C4440008 */ lwc1 $f4, 0x0008($v0) ## 80937348 -/* 07494 80933A64 46045180 */ add.s $f6, $f10, $f4 -/* 07498 80933A68 E4A6002C */ swc1 $f6, 0x002C($a1) ## 0000002C -.L80933A6C: -/* 0749C 80933A6C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 074A0 80933A70 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 -/* 074A4 80933A74 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 074A8 80933A78 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 074AC 80933A7C 460C4382 */ mul.s $f14, $f8, $f12 -/* 074B0 80933A80 3C038094 */ lui $v1, %hi(D_80938CA8) ## $v1 = 80940000 -/* 074B4 80933A84 3C048094 */ lui $a0, %hi(D_80938CC0) ## $a0 = 80940000 -/* 074B8 80933A88 3C078094 */ lui $a3, %hi(D_80938CC4) ## $a3 = 80940000 -/* 074BC 80933A8C 44819000 */ mtc1 $at, $f18 ## $f18 = -200.00 -/* 074C0 80933A90 46005402 */ mul.s $f16, $f10, $f0 -/* 074C4 80933A94 24E78CC4 */ addiu $a3, $a3, %lo(D_80938CC4) ## $a3 = 80938CC4 -/* 074C8 80933A98 24848CC0 */ addiu $a0, $a0, %lo(D_80938CC0) ## $a0 = 80938CC0 -/* 074CC 80933A9C 24638CA8 */ addiu $v1, $v1, %lo(D_80938CA8) ## $v1 = 80938CA8 -.L80933AA0: -/* 074D0 80933AA0 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80938CB0 -/* 074D4 80933AA4 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 074D8 80933AA8 8CC20000 */ lw $v0, 0x0000($a2) ## 80938C98 -/* 074DC 80933AAC 460C3202 */ mul.s $f8, $f6, $f12 -/* 074E0 80933AB0 C4660000 */ lwc1 $f6, 0x0000($v1) ## 80938CA8 -/* 074E4 80933AB4 80580194 */ lb $t8, 0x0194($v0) ## 809374D4 -/* 074E8 80933AB8 24C60004 */ addiu $a2, $a2, 0x0004 ## $a2 = 80938C9C -/* 074EC 80933ABC 24840002 */ addiu $a0, $a0, 0x0002 ## $a0 = 80938CC2 -/* 074F0 80933AC0 46082280 */ add.s $f10, $f4, $f8 -/* 074F4 80933AC4 46003102 */ mul.s $f4, $f6, $f0 -/* 074F8 80933AC8 46045200 */ add.s $f8, $f10, $f4 -/* 074FC 80933ACC E4480024 */ swc1 $f8, 0x0024($v0) ## 80937364 -/* 07500 80933AD0 C4A60028 */ lwc1 $f6, 0x0028($a1) ## 00000028 -/* 07504 80933AD4 C46A0004 */ lwc1 $f10, 0x0004($v1) ## 80938CAC -/* 07508 80933AD8 460A3100 */ add.s $f4, $f6, $f10 -/* 0750C 80933ADC E4440028 */ swc1 $f4, 0x0028($v0) ## 80937368 -/* 07510 80933AE0 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80938CB0 -/* 07514 80933AE4 C4A8002C */ lwc1 $f8, 0x002C($a1) ## 0000002C -/* 07518 80933AE8 46003282 */ mul.s $f10, $f6, $f0 -/* 0751C 80933AEC C4660000 */ lwc1 $f6, 0x0000($v1) ## 80938CA8 -/* 07520 80933AF0 460A4100 */ add.s $f4, $f8, $f10 -/* 07524 80933AF4 460C3202 */ mul.s $f8, $f6, $f12 -/* 07528 80933AF8 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 0752C 80933AFC 46082281 */ sub.s $f10, $f4, $f8 -/* 07530 80933B00 46803120 */ cvt.s.w $f4, $f6 -/* 07534 80933B04 E44A002C */ swc1 $f10, 0x002C($v0) ## 8093736C -/* 07538 80933B08 C4A80024 */ lwc1 $f8, 0x0024($a1) ## 00000024 -/* 0753C 80933B0C 460E4280 */ add.s $f10, $f8, $f14 -/* 07540 80933B10 46049082 */ mul.s $f2, $f18, $f4 -/* 07544 80933B14 00000000 */ nop -/* 07548 80933B18 46001182 */ mul.s $f6, $f2, $f0 -/* 0754C 80933B1C 46065100 */ add.s $f4, $f10, $f6 -/* 07550 80933B20 E4440008 */ swc1 $f4, 0x0008($v0) ## 80937348 -/* 07554 80933B24 C4A80028 */ lwc1 $f8, 0x0028($a1) ## 00000028 -/* 07558 80933B28 460C1102 */ mul.s $f4, $f2, $f12 -/* 0755C 80933B2C C4420080 */ lwc1 $f2, 0x0080($v0) ## 809373C0 -/* 07560 80933B30 E448000C */ swc1 $f8, 0x000C($v0) ## 8093734C -/* 07564 80933B34 C4AA002C */ lwc1 $f10, 0x002C($a1) ## 0000002C -/* 07568 80933B38 46105180 */ add.s $f6, $f10, $f16 -/* 0756C 80933B3C C44A0028 */ lwc1 $f10, 0x0028($v0) ## 80937368 -/* 07570 80933B40 46043201 */ sub.s $f8, $f6, $f4 -/* 07574 80933B44 4602503C */ c.lt.s $f10, $f2 -/* 07578 80933B48 E4480010 */ swc1 $f8, 0x0010($v0) ## 80937350 -/* 0757C 80933B4C 84B900B6 */ lh $t9, 0x00B6($a1) ## 000000B6 -/* 07580 80933B50 A4590016 */ sh $t9, 0x0016($v0) ## 80937356 -/* 07584 80933B54 84A900B6 */ lh $t1, 0x00B6($a1) ## 000000B6 -/* 07588 80933B58 8488FFFE */ lh $t0, -0x0002($a0) ## 80938CC0 -/* 0758C 80933B5C 01095021 */ addu $t2, $t0, $t1 -/* 07590 80933B60 45000002 */ bc1f .L80933B6C -/* 07594 80933B64 A44A00B6 */ sh $t2, 0x00B6($v0) ## 809373F6 -/* 07598 80933B68 E4420028 */ swc1 $f2, 0x0028($v0) ## 80937368 -.L80933B6C: -/* 0759C 80933B6C 1487FFCC */ bne $a0, $a3, .L80933AA0 -/* 075A0 80933B70 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 80938CB4 -/* 075A4 80933B74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 075A8 80933B78 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 075AC 80933B7C 03E00008 */ jr $ra -/* 075B0 80933B80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s deleted file mode 100644 index 4cb7e9a79c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_80937A10 - .word 0x3F555555 - -.text -glabel func_80933B84 -/* 075B4 80933B84 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 075B8 80933B88 AFBF0014 */ sw $ra, 0x0014($sp) -/* 075BC 80933B8C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 075C0 80933B90 AFA40018 */ sw $a0, 0x0018($sp) -/* 075C4 80933B94 8FA40018 */ lw $a0, 0x0018($sp) -/* 075C8 80933B98 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 075CC 80933B9C 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 075D0 80933BA0 8C8E011C */ lw $t6, 0x011C($a0) ## 0000011C -/* 075D4 80933BA4 3C198093 */ lui $t9, %hi(D_8093746C) ## $t9 = 80930000 -/* 075D8 80933BA8 46040302 */ mul.s $f12, $f0, $f4 -/* 075DC 80933BAC 85CF001C */ lh $t7, 0x001C($t6) ## 0000001C -/* 075E0 80933BB0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 075E4 80933BB4 000FC080 */ sll $t8, $t7, 2 -/* 075E8 80933BB8 0338C821 */ addu $t9, $t9, $t8 -/* 075EC 80933BBC 8F39746C */ lw $t9, %lo(D_8093746C)($t9) -/* 075F0 80933BC0 46006086 */ mov.s $f2, $f12 -/* 075F4 80933BC4 1721000A */ bne $t9, $at, .L80933BF0 -/* 075F8 80933BC8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 075FC 80933BCC 44810000 */ mtc1 $at, $f0 ## $f0 = 4.00 -/* 07600 80933BD0 3C018093 */ lui $at, %hi(D_80937A10) ## $at = 80930000 -/* 07604 80933BD4 C4267A10 */ lwc1 $f6, %lo(D_80937A10)($at) -/* 07608 80933BD8 46066082 */ mul.s $f2, $f12, $f6 -/* 0760C 80933BDC 4602003C */ c.lt.s $f0, $f2 -/* 07610 80933BE0 00000000 */ nop -/* 07614 80933BE4 45020003 */ bc1fl .L80933BF4 -/* 07618 80933BE8 4600120D */ trunc.w.s $f8, $f2 -/* 0761C 80933BEC 46000086 */ mov.s $f2, $f0 -.L80933BF0: -/* 07620 80933BF0 4600120D */ trunc.w.s $f8, $f2 -.L80933BF4: -/* 07624 80933BF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07628 80933BF8 44024000 */ mfc1 $v0, $f8 -/* 0762C 80933BFC 00000000 */ nop -/* 07630 80933C00 14400005 */ bne $v0, $zero, .L80933C18 -/* 07634 80933C04 00000000 */ nop -/* 07638 80933C08 0C24C1D2 */ jal func_80930748 -/* 0763C 80933C0C 00000000 */ nop -/* 07640 80933C10 10000018 */ beq $zero, $zero, .L80933C74 -/* 07644 80933C14 8FBF0014 */ lw $ra, 0x0014($sp) -.L80933C18: -/* 07648 80933C18 54410006 */ bnel $v0, $at, .L80933C34 -/* 0764C 80933C1C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 07650 80933C20 0C24C2C6 */ jal func_80930B18 -/* 07654 80933C24 00000000 */ nop -/* 07658 80933C28 10000012 */ beq $zero, $zero, .L80933C74 -/* 0765C 80933C2C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07660 80933C30 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80933C34: -/* 07664 80933C34 54410006 */ bnel $v0, $at, .L80933C50 -/* 07668 80933C38 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0766C 80933C3C 0C24C3E0 */ jal func_80930F80 -/* 07670 80933C40 00000000 */ nop -/* 07674 80933C44 1000000B */ beq $zero, $zero, .L80933C74 -/* 07678 80933C48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0767C 80933C4C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80933C50: -/* 07680 80933C50 14410005 */ bne $v0, $at, .L80933C68 -/* 07684 80933C54 00000000 */ nop -/* 07688 80933C58 0C24C484 */ jal func_80931210 -/* 0768C 80933C5C 00000000 */ nop -/* 07690 80933C60 10000004 */ beq $zero, $zero, .L80933C74 -/* 07694 80933C64 8FBF0014 */ lw $ra, 0x0014($sp) -.L80933C68: -/* 07698 80933C68 0C24C628 */ jal func_809318A0 -/* 0769C 80933C6C 00000000 */ nop -/* 076A0 80933C70 8FBF0014 */ lw $ra, 0x0014($sp) -.L80933C74: -/* 076A4 80933C74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 076A8 80933C78 03E00008 */ jr $ra -/* 076AC 80933C7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s deleted file mode 100644 index 73102911d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80933C80 -/* 076B0 80933C80 908E03E4 */ lbu $t6, 0x03E4($a0) ## 000003E4 -/* 076B4 80933C84 8C9803F0 */ lw $t8, 0x03F0($a0) ## 000003F0 -/* 076B8 80933C88 240300C0 */ addiu $v1, $zero, 0x00C0 ## $v1 = 000000C0 -/* 076BC 80933C8C 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 076C0 80933C90 A08F03E4 */ sb $t7, 0x03E4($a0) ## 000003E4 -/* 076C4 80933C94 A3050005 */ sb $a1, 0x0005($t8) ## 00000005 -/* 076C8 80933C98 8C9903F0 */ lw $t9, 0x03F0($a0) ## 000003F0 -/* 076CC 80933C9C 240202C0 */ addiu $v0, $zero, 0x02C0 ## $v0 = 000002C0 -/* 076D0 80933CA0 A3250045 */ sb $a1, 0x0045($t9) ## 00000045 -/* 076D4 80933CA4 8C8803F0 */ lw $t0, 0x03F0($a0) ## 000003F0 -/* 076D8 80933CA8 A1050085 */ sb $a1, 0x0085($t0) ## 00000085 -.L80933CAC: -/* 076DC 80933CAC 8C8903F0 */ lw $t1, 0x03F0($a0) ## 000003F0 -/* 076E0 80933CB0 01235021 */ addu $t2, $t1, $v1 -/* 076E4 80933CB4 A1450005 */ sb $a1, 0x0005($t2) ## 00000005 -/* 076E8 80933CB8 8C8B03F0 */ lw $t3, 0x03F0($a0) ## 000003F0 -/* 076EC 80933CBC 01636021 */ addu $t4, $t3, $v1 -/* 076F0 80933CC0 A1850045 */ sb $a1, 0x0045($t4) ## 00000045 -/* 076F4 80933CC4 8C8D03F0 */ lw $t5, 0x03F0($a0) ## 000003F0 -/* 076F8 80933CC8 01A37021 */ addu $t6, $t5, $v1 -/* 076FC 80933CCC A1C50085 */ sb $a1, 0x0085($t6) ## 00000085 -/* 07700 80933CD0 8C8F03F0 */ lw $t7, 0x03F0($a0) ## 000003F0 -/* 07704 80933CD4 01E3C021 */ addu $t8, $t7, $v1 -/* 07708 80933CD8 24630100 */ addiu $v1, $v1, 0x0100 ## $v1 = 000001C0 -/* 0770C 80933CDC 1462FFF3 */ bne $v1, $v0, .L80933CAC -/* 07710 80933CE0 A30500C5 */ sb $a1, 0x00C5($t8) ## 000000C5 -/* 07714 80933CE4 03E00008 */ jr $ra -/* 07718 80933CE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s deleted file mode 100644 index cfc4c0e26d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80933CEC -/* 0771C 80933CEC 908E03E5 */ lbu $t6, 0x03E5($a0) ## 000003E5 -/* 07720 80933CF0 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 07724 80933CF4 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 07728 80933CF8 01C17824 */ and $t7, $t6, $at -/* 0772C 80933CFC 10A00005 */ beq $a1, $zero, .L80933D14 -/* 07730 80933D00 A08F03E5 */ sb $t7, 0x03E5($a0) ## 000003E5 -/* 07734 80933D04 35E80004 */ ori $t0, $t7, 0x0004 ## $t0 = 00000004 -/* 07738 80933D08 A09803E8 */ sb $t8, 0x03E8($a0) ## 000003E8 -/* 0773C 80933D0C 03E00008 */ jr $ra -/* 07740 80933D10 A08803E5 */ sb $t0, 0x03E5($a0) ## 000003E5 -.L80933D14: -/* 07744 80933D14 908903E5 */ lbu $t1, 0x03E5($a0) ## 000003E5 -/* 07748 80933D18 A08003E8 */ sb $zero, 0x03E8($a0) ## 000003E8 -/* 0774C 80933D1C 312AFFFB */ andi $t2, $t1, 0xFFFB ## $t2 = 00000000 -/* 07750 80933D20 A08A03E5 */ sb $t2, 0x03E5($a0) ## 000003E5 -/* 07754 80933D24 03E00008 */ jr $ra -/* 07758 80933D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s deleted file mode 100644 index 9ad9b81ea9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80933D2C -/* 0775C 80933D2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07760 80933D30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 07764 80933D34 AFA5001C */ sw $a1, 0x001C($sp) -/* 07768 80933D38 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00000000 -/* 0776C 80933D3C 0C01E245 */ jal func_80078914 -/* 07770 80933D40 248403C8 */ addiu $a0, $a0, 0x03C8 ## $a0 = 000003C8 -/* 07774 80933D44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07778 80933D48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0777C 80933D4C 03E00008 */ jr $ra -/* 07780 80933D50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s deleted file mode 100644 index e55a1da9b8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s +++ /dev/null @@ -1,109 +0,0 @@ -glabel func_80933D54 -/* 07784 80933D54 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 07788 80933D58 AFBF001C */ sw $ra, 0x001C($sp) -/* 0778C 80933D5C AFB00018 */ sw $s0, 0x0018($sp) -/* 07790 80933D60 AFA5002C */ sw $a1, 0x002C($sp) -/* 07794 80933D64 908203E5 */ lbu $v0, 0x03E5($a0) ## 000003E5 -/* 07798 80933D68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0779C 80933D6C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 077A0 80933D70 51C00057 */ beql $t6, $zero, .L80933ED0 -/* 077A4 80933D74 8FBF001C */ lw $ra, 0x001C($sp) -/* 077A8 80933D78 908F03E8 */ lbu $t7, 0x03E8($a0) ## 000003E8 -/* 077AC 80933D7C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 077B0 80933D80 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 077B4 80933D84 51E10052 */ beql $t7, $at, .L80933ED0 -/* 077B8 80933D88 8FBF001C */ lw $ra, 0x001C($sp) -/* 077BC 80933D8C AFB80024 */ sw $t8, 0x0024($sp) -/* 077C0 80933D90 908800B1 */ lbu $t0, 0x00B1($a0) ## 000000B1 -/* 077C4 80933D94 3059FFFD */ andi $t9, $v0, 0xFFFD ## $t9 = 00000000 -/* 077C8 80933D98 A09903E5 */ sb $t9, 0x03E5($a0) ## 000003E5 -/* 077CC 80933D9C 15000004 */ bne $t0, $zero, .L80933DB0 -/* 077D0 80933DA0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 077D4 80933DA4 908900B0 */ lbu $t1, 0x00B0($a0) ## 000000B0 -/* 077D8 80933DA8 51200049 */ beql $t1, $zero, .L80933ED0 -/* 077DC 80933DAC 8FBF001C */ lw $ra, 0x001C($sp) -.L80933DB0: -/* 077E0 80933DB0 920A03E4 */ lbu $t2, 0x03E4($s0) ## 000003E4 -/* 077E4 80933DB4 920C03E5 */ lbu $t4, 0x03E5($s0) ## 000003E5 -/* 077E8 80933DB8 920E03E6 */ lbu $t6, 0x03E6($s0) ## 000003E6 -/* 077EC 80933DBC 314BFFFC */ andi $t3, $t2, 0xFFFC ## $t3 = 00000000 -/* 077F0 80933DC0 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 -/* 077F4 80933DC4 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 077F8 80933DC8 A20B03E4 */ sb $t3, 0x03E4($s0) ## 000003E4 -/* 077FC 80933DCC A20D03E5 */ sb $t5, 0x03E5($s0) ## 000003E5 -/* 07800 80933DD0 A20F03E6 */ sb $t7, 0x03E6($s0) ## 000003E6 -/* 07804 80933DD4 8FA5002C */ lw $a1, 0x002C($sp) -/* 07808 80933DD8 0C24CE5E */ jal func_80933978 -/* 0780C 80933DDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07810 80933DE0 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C -/* 07814 80933DE4 3C088093 */ lui $t0, %hi(D_8093746C) ## $t0 = 80930000 -/* 07818 80933DE8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0781C 80933DEC 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 07820 80933DF0 8FA5002C */ lw $a1, 0x002C($sp) -/* 07824 80933DF4 0018C880 */ sll $t9, $t8, 2 -/* 07828 80933DF8 01194021 */ addu $t0, $t0, $t9 -/* 0782C 80933DFC 8D08746C */ lw $t0, %lo(D_8093746C)($t0) -/* 07830 80933E00 55010006 */ bnel $t0, $at, .L80933E1C -/* 07834 80933E04 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 07838 80933E08 0C24CE5E */ jal func_80933978 -/* 0783C 80933E0C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 07840 80933E10 0C24C11D */ jal func_80930474 -/* 07844 80933E14 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C -/* 07848 80933E18 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -.L80933E1C: -/* 0784C 80933E1C 920B00B1 */ lbu $t3, 0x00B1($s0) ## 000000B1 -/* 07850 80933E20 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 07854 80933E24 01215024 */ and $t2, $t1, $at -/* 07858 80933E28 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0785C 80933E2C 15610005 */ bne $t3, $at, .L80933E44 -/* 07860 80933E30 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 07864 80933E34 0C24CCCA */ jal func_80933328 -/* 07868 80933E38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0786C 80933E3C 1000000D */ beq $zero, $zero, .L80933E74 -/* 07870 80933E40 00000000 */ nop -.L80933E44: -/* 07874 80933E44 0C24C8AD */ jal func_809322B4 -/* 07878 80933E48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0787C 80933E4C 8E0C011C */ lw $t4, 0x011C($s0) ## 0000011C -/* 07880 80933E50 3C0F8093 */ lui $t7, %hi(D_8093746C) ## $t7 = 80930000 -/* 07884 80933E54 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 07888 80933E58 858D001C */ lh $t5, 0x001C($t4) ## 0000001C -/* 0788C 80933E5C 000D7080 */ sll $t6, $t5, 2 -/* 07890 80933E60 01EE7821 */ addu $t7, $t7, $t6 -/* 07894 80933E64 8DEF746C */ lw $t7, %lo(D_8093746C)($t7) -/* 07898 80933E68 11E10002 */ beq $t7, $at, .L80933E74 -/* 0789C 80933E6C 00000000 */ nop -/* 078A0 80933E70 AFA00024 */ sw $zero, 0x0024($sp) -.L80933E74: -/* 078A4 80933E74 3C048094 */ lui $a0, %hi(D_80938C90) ## $a0 = 80940000 -/* 078A8 80933E78 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) -/* 078AC 80933E7C 0C24B73B */ jal func_8092DCEC -/* 078B0 80933E80 8FA50024 */ lw $a1, 0x0024($sp) -/* 078B4 80933E84 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 078B8 80933E88 00000000 */ nop -/* 078BC 80933E8C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 078C0 80933E90 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 078C4 80933E94 8FA4002C */ lw $a0, 0x002C($sp) -/* 078C8 80933E98 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 078CC 80933E9C 4604003C */ c.lt.s $f0, $f4 -/* 078D0 80933EA0 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F -/* 078D4 80933EA4 45000003 */ bc1f .L80933EB4 -/* 078D8 80933EA8 00000000 */ nop -/* 078DC 80933EAC 10000001 */ beq $zero, $zero, .L80933EB4 -/* 078E0 80933EB0 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 -.L80933EB4: -/* 078E4 80933EB4 00023400 */ sll $a2, $v0, 16 -/* 078E8 80933EB8 0C007D52 */ jal Item_DropCollectible - -/* 078EC 80933EBC 00063403 */ sra $a2, $a2, 16 -/* 078F0 80933EC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 078F4 80933EC4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 078F8 80933EC8 2405396A */ addiu $a1, $zero, 0x396A ## $a1 = 0000396A -/* 078FC 80933ECC 8FBF001C */ lw $ra, 0x001C($sp) -.L80933ED0: -/* 07900 80933ED0 8FB00018 */ lw $s0, 0x0018($sp) -/* 07904 80933ED4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 07908 80933ED8 03E00008 */ jr $ra -/* 0790C 80933EDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s deleted file mode 100644 index 621b89596e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80933EE0 -/* 07910 80933EE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 07914 80933EE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 07918 80933EE8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0791C 80933EEC 908206C5 */ lbu $v0, 0x06C5($a0) ## 000006C5 -/* 07920 80933EF0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 07924 80933EF4 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 07928 80933EF8 51C00049 */ beql $t6, $zero, .L80934020 -/* 0792C 80933EFC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07930 80933F00 909800B1 */ lbu $t8, 0x00B1($a0) ## 000000B1 -/* 07934 80933F04 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 07938 80933F08 A08F06C5 */ sb $t7, 0x06C5($a0) ## 000006C5 -/* 0793C 80933F0C 57000005 */ bnel $t8, $zero, .L80933F24 -/* 07940 80933F10 8CC90190 */ lw $t1, 0x0190($a2) ## 00000190 -/* 07944 80933F14 909900B0 */ lbu $t9, 0x00B0($a0) ## 000000B0 -/* 07948 80933F18 53200041 */ beql $t9, $zero, .L80934020 -/* 0794C 80933F1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 07950 80933F20 8CC90190 */ lw $t1, 0x0190($a2) ## 00000190 -.L80933F24: -/* 07954 80933F24 3C088093 */ lui $t0, %hi(func_8092E830) ## $t0 = 80930000 -/* 07958 80933F28 2508E830 */ addiu $t0, $t0, %lo(func_8092E830) ## $t0 = 8092E830 -/* 0795C 80933F2C 15090018 */ bne $t0, $t1, .L80933F90 -/* 07960 80933F30 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 07964 80933F34 0C00D58A */ jal Actor_ApplyDamage - -/* 07968 80933F38 AFA60018 */ sw $a2, 0x0018($sp) -/* 0796C 80933F3C 1440000A */ bne $v0, $zero, .L80933F68 -/* 07970 80933F40 8FA60018 */ lw $a2, 0x0018($sp) -/* 07974 80933F44 8FA4001C */ lw $a0, 0x001C($sp) -/* 07978 80933F48 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 0797C 80933F4C 0C00CB1F */ jal func_80032C7C -/* 07980 80933F50 AFA60018 */ sw $a2, 0x0018($sp) -/* 07984 80933F54 8FA40018 */ lw $a0, 0x0018($sp) -/* 07988 80933F58 0C24BBCA */ jal func_8092EF28 -/* 0798C 80933F5C 8FA5001C */ lw $a1, 0x001C($sp) -/* 07990 80933F60 10000003 */ beq $zero, $zero, .L80933F70 -/* 07994 80933F64 00000000 */ nop -.L80933F68: -/* 07998 80933F68 0C24BA4C */ jal func_8092E930 -/* 0799C 80933F6C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80933F70: -/* 079A0 80933F70 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 079A4 80933F74 0C24CAF7 */ jal func_80932BDC -/* 079A8 80933F78 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 079AC 80933F7C 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 079B0 80933F80 0C24CAF7 */ jal func_80932BDC -/* 079B4 80933F84 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 079B8 80933F88 10000025 */ beq $zero, $zero, .L80934020 -/* 079BC 80933F8C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80933F90: -/* 079C0 80933F90 0C24B91C */ jal func_8092E470 -/* 079C4 80933F94 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 079C8 80933F98 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 079CC 80933F9C 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 079D0 80933FA0 3C038093 */ lui $v1, %hi(D_8093746C) ## $v1 = 80930000 -/* 079D4 80933FA4 2463746C */ addiu $v1, $v1, %lo(D_8093746C) ## $v1 = 8093746C -/* 079D8 80933FA8 848A001C */ lh $t2, 0x001C($a0) ## 8094001C -/* 079DC 80933FAC 24020009 */ addiu $v0, $zero, 0x0009 ## $v0 = 00000009 -/* 079E0 80933FB0 3C058094 */ lui $a1, %hi(D_80938C98) ## $a1 = 80940000 -/* 079E4 80933FB4 000A5880 */ sll $t3, $t2, 2 -/* 079E8 80933FB8 006B6021 */ addu $t4, $v1, $t3 -/* 079EC 80933FBC 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 079F0 80933FC0 144D0006 */ bne $v0, $t5, .L80933FDC -/* 079F4 80933FC4 00000000 */ nop -/* 079F8 80933FC8 0C24D7CC */ jal func_80935F30 -/* 079FC 80933FCC 00000000 */ nop -/* 07A00 80933FD0 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 07A04 80933FD4 1000000C */ beq $zero, $zero, .L80934008 -/* 07A08 80933FD8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -.L80933FDC: -/* 07A0C 80933FDC 8CA58C98 */ lw $a1, %lo(D_80938C98)($a1) -/* 07A10 80933FE0 84AE001C */ lh $t6, 0x001C($a1) ## 0000001C -/* 07A14 80933FE4 000E7880 */ sll $t7, $t6, 2 -/* 07A18 80933FE8 006FC021 */ addu $t8, $v1, $t7 -/* 07A1C 80933FEC 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 -/* 07A20 80933FF0 14590005 */ bne $v0, $t9, .L80934008 -/* 07A24 80933FF4 00000000 */ nop -/* 07A28 80933FF8 0C24D7CC */ jal func_80935F30 -/* 07A2C 80933FFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 07A30 80934000 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 07A34 80934004 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -.L80934008: -/* 07A38 80934008 0C24CA75 */ jal func_809329D4 -/* 07A3C 8093400C 00000000 */ nop -/* 07A40 80934010 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 07A44 80934014 0C24CA75 */ jal func_809329D4 -/* 07A48 80934018 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 07A4C 8093401C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80934020: -/* 07A50 80934020 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 07A54 80934024 03E00008 */ jr $ra -/* 07A58 80934028 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s deleted file mode 100644 index 8a9d95f49b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s +++ /dev/null @@ -1,174 +0,0 @@ -glabel func_80934338 -/* 07D68 80934338 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 07D6C 8093433C AFB10018 */ sw $s1, 0x0018($sp) -/* 07D70 80934340 3C068094 */ lui $a2, %hi(D_80938C9C) ## $a2 = 80940000 -/* 07D74 80934344 8CC68C9C */ lw $a2, %lo(D_80938C9C)($a2) -/* 07D78 80934348 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 07D7C 8093434C AFBF001C */ sw $ra, 0x001C($sp) -/* 07D80 80934350 AFB00014 */ sw $s0, 0x0014($sp) -/* 07D84 80934354 3C058094 */ lui $a1, %hi(D_80938CB4) ## $a1 = 80940000 -/* 07D88 80934358 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07D8C 8093435C 24A58CB4 */ addiu $a1, $a1, %lo(D_80938CB4) ## $a1 = 80938CB4 -/* 07D90 80934360 0C00B6F4 */ jal func_8002DBD0 -/* 07D94 80934364 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 80940024 -/* 07D98 80934368 3C068094 */ lui $a2, %hi(D_80938C98) ## $a2 = 80940000 -/* 07D9C 8093436C 8CC68C98 */ lw $a2, %lo(D_80938C98)($a2) -/* 07DA0 80934370 3C058094 */ lui $a1, %hi(D_80938CA8) ## $a1 = 80940000 -/* 07DA4 80934374 24A58CA8 */ addiu $a1, $a1, %lo(D_80938CA8) ## $a1 = 80938CA8 -/* 07DA8 80934378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07DAC 8093437C 0C00B6F4 */ jal func_8002DBD0 -/* 07DB0 80934380 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 80940024 -/* 07DB4 80934384 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 07DB8 80934388 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 -/* 07DBC 8093438C 8C6E0000 */ lw $t6, 0x0000($v1) ## 80938C98 -/* 07DC0 80934390 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 07DC4 80934394 3C028094 */ lui $v0, %hi(D_80938CC0) ## $v0 = 80940000 -/* 07DC8 80934398 85CF00B6 */ lh $t7, 0x00B6($t6) ## 000000B6 -/* 07DCC 8093439C 8C680004 */ lw $t0, 0x0004($v1) ## 80938C9C -/* 07DD0 809343A0 24428CC0 */ addiu $v0, $v0, %lo(D_80938CC0) ## $v0 = 80938CC0 -/* 07DD4 809343A4 01F8C823 */ subu $t9, $t7, $t8 -/* 07DD8 809343A8 A4590000 */ sh $t9, 0x0000($v0) ## 80938CC0 -/* 07DDC 809343AC 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 07DE0 809343B0 850900B6 */ lh $t1, 0x00B6($t0) ## 000000B6 -/* 07DE4 809343B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07DE8 809343B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07DEC 809343BC 012A5823 */ subu $t3, $t1, $t2 -/* 07DF0 809343C0 0C24CFB8 */ jal func_80933EE0 -/* 07DF4 809343C4 A44B0002 */ sh $t3, 0x0002($v0) ## 80938CC2 -/* 07DF8 809343C8 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 07DFC 809343CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07E00 809343D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07E04 809343D4 0320F809 */ jalr $ra, $t9 -/* 07E08 809343D8 00000000 */ nop -/* 07E0C 809343DC 820C0194 */ lb $t4, 0x0194($s0) ## 00000194 -/* 07E10 809343E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07E14 809343E4 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 -/* 07E18 809343E8 51800010 */ beql $t4, $zero, .L8093442C -/* 07E1C 809343EC 920A03E4 */ lbu $t2, 0x03E4($s0) ## 000003E4 -/* 07E20 809343F0 922D1C27 */ lbu $t5, 0x1C27($s1) ## 00001C27 -/* 07E24 809343F4 51A00005 */ beql $t5, $zero, .L8093440C -/* 07E28 809343F8 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 07E2C 809343FC 920E0114 */ lbu $t6, 0x0114($s0) ## 00000114 -/* 07E30 80934400 51C00007 */ beql $t6, $zero, .L80934420 -/* 07E34 80934404 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 07E38 80934408 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -.L8093440C: -/* 07E3C 8093440C 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 07E40 80934410 01E1C024 */ and $t8, $t7, $at -/* 07E44 80934414 10000004 */ beq $zero, $zero, .L80934428 -/* 07E48 80934418 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 07E4C 8093441C 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -.L80934420: -/* 07E50 80934420 35090080 */ ori $t1, $t0, 0x0080 ## $t1 = 00000080 -/* 07E54 80934424 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -.L80934428: -/* 07E58 80934428 920A03E4 */ lbu $t2, 0x03E4($s0) ## 000003E4 -.L8093442C: -/* 07E5C 8093442C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07E60 80934430 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 07E64 80934434 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 07E68 80934438 51600004 */ beql $t3, $zero, .L8093444C -/* 07E6C 8093443C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 07E70 80934440 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 07E74 80934444 02212821 */ addu $a1, $s1, $at -/* 07E78 80934448 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -.L8093444C: -/* 07E7C 8093444C 3C198093 */ lui $t9, %hi(func_8092CAD0) ## $t9 = 80930000 -/* 07E80 80934450 2739CAD0 */ addiu $t9, $t9, %lo(func_8092CAD0) ## $t9 = 8092CAD0 -/* 07E84 80934454 13220014 */ beq $t9, $v0, .L809344A8 -/* 07E88 80934458 3C0C8093 */ lui $t4, %hi(func_8092CC58) ## $t4 = 80930000 -/* 07E8C 8093445C 258CCC58 */ addiu $t4, $t4, %lo(func_8092CC58) ## $t4 = 8092CC58 -/* 07E90 80934460 11820011 */ beq $t4, $v0, .L809344A8 -/* 07E94 80934464 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07E98 80934468 920D06C5 */ lbu $t5, 0x06C5($s0) ## 000006C5 -/* 07E9C 8093446C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 07EA0 80934470 02212821 */ addu $a1, $s1, $at -/* 07EA4 80934474 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 07EA8 80934478 11C00008 */ beq $t6, $zero, .L8093449C -/* 07EAC 8093447C 260703D4 */ addiu $a3, $s0, 0x03D4 ## $a3 = 000003D4 -/* 07EB0 80934480 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07EB4 80934484 260606B4 */ addiu $a2, $s0, 0x06B4 ## $a2 = 000006B4 -/* 07EB8 80934488 AFA50024 */ sw $a1, 0x0024($sp) -/* 07EBC 8093448C 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 07EC0 80934490 AFA70020 */ sw $a3, 0x0020($sp) -/* 07EC4 80934494 8FA50024 */ lw $a1, 0x0024($sp) -/* 07EC8 80934498 8FA70020 */ lw $a3, 0x0020($sp) -.L8093449C: -/* 07ECC 8093449C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07ED0 809344A0 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 07ED4 809344A4 00E03025 */ or $a2, $a3, $zero ## $a2 = 00000000 -.L809344A8: -/* 07ED8 809344A8 920F03E6 */ lbu $t7, 0x03E6($s0) ## 000003E6 -/* 07EDC 809344AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07EE0 809344B0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 07EE4 809344B4 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 07EE8 809344B8 13000004 */ beq $t8, $zero, .L809344CC -/* 07EEC 809344BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 07EF0 809344C0 02212821 */ addu $a1, $s1, $at -/* 07EF4 809344C4 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOC -/* 07EF8 809344C8 260603D4 */ addiu $a2, $s0, 0x03D4 ## $a2 = 000003D4 -.L809344CC: -/* 07EFC 809344CC 0C24CE7E */ jal func_809339F8 -/* 07F00 809344D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07F04 809344D4 82080194 */ lb $t0, 0x0194($s0) ## 00000194 -/* 07F08 809344D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07F0C 809344DC 51000007 */ beql $t0, $zero, .L809344FC -/* 07F10 809344E0 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 07F14 809344E4 8E030004 */ lw $v1, 0x0004($s0) ## 00000004 -/* 07F18 809344E8 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 07F1C 809344EC 30690080 */ andi $t1, $v1, 0x0080 ## $t1 = 00000000 -/* 07F20 809344F0 5521001B */ bnel $t1, $at, .L80934560 -/* 07F24 809344F4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 07F28 809344F8 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -.L809344FC: -/* 07F2C 809344FC 3C0A8093 */ lui $t2, %hi(func_8092DEA0) ## $t2 = 80930000 -/* 07F30 80934500 254ADEA0 */ addiu $t2, $t2, %lo(func_8092DEA0) ## $t2 = 8092DEA0 -/* 07F34 80934504 11420010 */ beq $t2, $v0, .L80934548 -/* 07F38 80934508 8E030004 */ lw $v1, 0x0004($s0) ## 00000004 -/* 07F3C 8093450C 3C0B8093 */ lui $t3, %hi(func_8092DFFC) ## $t3 = 80930000 -/* 07F40 80934510 256BDFFC */ addiu $t3, $t3, %lo(func_8092DFFC) ## $t3 = 8092DFFC -/* 07F44 80934514 1162000C */ beq $t3, $v0, .L80934548 -/* 07F48 80934518 3C198093 */ lui $t9, %hi(func_8092E3A0) ## $t9 = 80930000 -/* 07F4C 8093451C 2739E3A0 */ addiu $t9, $t9, %lo(func_8092E3A0) ## $t9 = 8092E3A0 -/* 07F50 80934520 13220009 */ beq $t9, $v0, .L80934548 -/* 07F54 80934524 3C0C8093 */ lui $t4, %hi(func_8092E510) ## $t4 = 80930000 -/* 07F58 80934528 258CE510 */ addiu $t4, $t4, %lo(func_8092E510) ## $t4 = 8092E510 -/* 07F5C 8093452C 11820006 */ beq $t4, $v0, .L80934548 -/* 07F60 80934530 3C0D8093 */ lui $t5, %hi(func_8092E830) ## $t5 = 80930000 -/* 07F64 80934534 25ADE830 */ addiu $t5, $t5, %lo(func_8092E830) ## $t5 = 8092E830 -/* 07F68 80934538 11A20003 */ beq $t5, $v0, .L80934548 -/* 07F6C 8093453C 3C0E8093 */ lui $t6, %hi(func_8092EA00) ## $t6 = 80930000 -/* 07F70 80934540 25CEEA00 */ addiu $t6, $t6, %lo(func_8092EA00) ## $t6 = 8092EA00 -/* 07F74 80934544 15C20005 */ bne $t6, $v0, .L8093455C -.L80934548: -/* 07F78 80934548 346F0001 */ ori $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 07F7C 8093454C 3C028093 */ lui $v0, %hi(func_8092DFFC) ## $v0 = 80930000 -/* 07F80 80934550 2442DFFC */ addiu $v0, $v0, %lo(func_8092DFFC) ## $v0 = 8092DFFC -/* 07F84 80934554 10000006 */ beq $zero, $zero, .L80934570 -/* 07F88 80934558 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L8093455C: -/* 07F8C 8093455C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -.L80934560: -/* 07F90 80934560 0061C024 */ and $t8, $v1, $at -/* 07F94 80934564 3C028093 */ lui $v0, %hi(func_8092DFFC) ## $v0 = 80930000 -/* 07F98 80934568 2442DFFC */ addiu $v0, $v0, %lo(func_8092DFFC) ## $v0 = 8092DFFC -/* 07F9C 8093456C AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -.L80934570: -/* 07FA0 80934570 8E080190 */ lw $t0, 0x0190($s0) ## 00000190 -/* 07FA4 80934574 54480004 */ bnel $v0, $t0, .L80934588 -/* 07FA8 80934578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07FAC 8093457C 0C24CF4B */ jal func_80933D2C -/* 07FB0 80934580 2405318D */ addiu $a1, $zero, 0x318D ## $a1 = 0000318D -/* 07FB4 80934584 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80934588: -/* 07FB8 80934588 0C24D83F */ jal func_809360FC -/* 07FBC 8093458C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 07FC0 80934590 8FBF001C */ lw $ra, 0x001C($sp) -/* 07FC4 80934594 8FB00014 */ lw $s0, 0x0014($sp) -/* 07FC8 80934598 8FB10018 */ lw $s1, 0x0018($sp) -/* 07FCC 8093459C 03E00008 */ jr $ra -/* 07FD0 809345A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s deleted file mode 100644 index 82a13a7b0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_809345A4 -/* 07FD4 809345A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07FD8 809345A8 AFA40000 */ sw $a0, 0x0000($sp) -/* 07FDC 809345AC 14A1000E */ bne $a1, $at, .L809345E8 -/* 07FE0 809345B0 AFA60008 */ sw $a2, 0x0008($sp) -/* 07FE4 809345B4 8FA20014 */ lw $v0, 0x0014($sp) -/* 07FE8 809345B8 C4E40008 */ lwc1 $f4, 0x0008($a3) ## 00000008 -/* 07FEC 809345BC 8FA30010 */ lw $v1, 0x0010($sp) -/* 07FF0 809345C0 844E019E */ lh $t6, 0x019E($v0) ## 0000019E -/* 07FF4 809345C4 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 07FF8 809345C8 00000000 */ nop -/* 07FFC 809345CC 46803220 */ cvt.s.w $f8, $f6 -/* 08000 809345D0 46082280 */ add.s $f10, $f4, $f8 -/* 08004 809345D4 E4EA0008 */ swc1 $f10, 0x0008($a3) ## 00000008 -/* 08008 809345D8 845801A0 */ lh $t8, 0x01A0($v0) ## 000001A0 -/* 0800C 809345DC 846F0002 */ lh $t7, 0x0002($v1) ## 00000002 -/* 08010 809345E0 01F8C821 */ addu $t9, $t7, $t8 -/* 08014 809345E4 A4790002 */ sh $t9, 0x0002($v1) ## 00000002 -.L809345E8: -/* 08018 809345E8 03E00008 */ jr $ra -/* 0801C 809345EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s deleted file mode 100644 index c8406438da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_809345F0 -/* 08020 809345F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 08024 809345F4 AFA40018 */ sw $a0, 0x0018($sp) -/* 08028 809345F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0802C 809345FC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 08030 80934600 8FA50028 */ lw $a1, 0x0028($sp) -/* 08034 80934604 AFBF0014 */ sw $ra, 0x0014($sp) -/* 08038 80934608 AFA60020 */ sw $a2, 0x0020($sp) -/* 0803C 8093460C AFA70024 */ sw $a3, 0x0024($sp) -/* 08040 80934610 0C018A29 */ jal Collider_UpdateSpheres -/* 08044 80934614 24A503D4 */ addiu $a1, $a1, 0x03D4 ## $a1 = 000003D4 -/* 08048 80934618 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0804C 8093461C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 08050 80934620 03E00008 */ jr $ra -/* 08054 80934624 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s deleted file mode 100644 index fba6dbd733..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80934628 -/* 08058 80934628 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0805C 8093462C AFA40000 */ sw $a0, 0x0000($sp) -/* 08060 80934630 14A1000B */ bne $a1, $at, .L80934660 -/* 08064 80934634 AFA60008 */ sw $a2, 0x0008($sp) -/* 08068 80934638 8FA20014 */ lw $v0, 0x0014($sp) -/* 0806C 8093463C C4E40008 */ lwc1 $f4, 0x0008($a3) ## 00000008 -/* 08070 80934640 8FA30010 */ lw $v1, 0x0010($sp) -/* 08074 80934644 C4460014 */ lwc1 $f6, 0x0014($v0) ## 00000014 -/* 08078 80934648 46062200 */ add.s $f8, $f4, $f6 -/* 0807C 8093464C E4E80008 */ swc1 $f8, 0x0008($a3) ## 00000008 -/* 08080 80934650 844F0018 */ lh $t7, 0x0018($v0) ## 00000018 -/* 08084 80934654 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 -/* 08088 80934658 01CFC021 */ addu $t8, $t6, $t7 -/* 0808C 8093465C A4780002 */ sh $t8, 0x0002($v1) ## 00000002 -.L80934660: -/* 08090 80934660 03E00008 */ jr $ra -/* 08094 80934664 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s deleted file mode 100644 index a1e90790fa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s +++ /dev/null @@ -1,581 +0,0 @@ -.late_rodata -glabel D_80937A1C - .word 0x3F20D97C -glabel D_80937A20 - .word 0x3F20D97C -glabel D_80937A24 - .word 0x3F20D97C -glabel D_80937A28 - .word 0x3F20D97C -glabel D_80937A2C - .word 0x3F20D97C -glabel D_80937A30 - .word 0x3F20D97C -glabel D_80937A34 - .word 0x3F20D97C -glabel D_80937A38 - .word 0x3F20D97C -glabel D_80937A3C - .word 0x3F20D97C -glabel D_80937A40 - .word 0x3E060A92 -glabel D_80937A44 - .word 0x3E060A92 -glabel D_80937A48 - .word 0x3E060A92 - -.text -glabel func_80934A44 -/* 08474 80934A44 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 08478 80934A48 AFA40038 */ sw $a0, 0x0038($sp) -/* 0847C 80934A4C 8FA4004C */ lw $a0, 0x004C($sp) -/* 08480 80934A50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 08484 80934A54 AFA70044 */ sw $a3, 0x0044($sp) -/* 08488 80934A58 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 0848C 80934A5C 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 08490 80934A60 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 -/* 08494 80934A64 51E10007 */ beql $t7, $at, .L80934A84 -/* 08498 80934A68 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 0849C 80934A6C 80980194 */ lb $t8, 0x0194($a0) ## 00000194 -/* 084A0 80934A70 53000004 */ beql $t8, $zero, .L80934A84 -/* 084A4 80934A74 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 084A8 80934A78 100001EA */ beq $zero, $zero, .L80935224 -/* 084AC 80934A7C ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 084B0 80934A80 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -.L80934A84: -/* 084B4 80934A84 3C198093 */ lui $t9, %hi(func_8092F374) ## $t9 = 80930000 -/* 084B8 80934A88 2739F374 */ addiu $t9, $t9, %lo(func_8092F374) ## $t9 = 8092F374 -/* 084BC 80934A8C 17220166 */ bne $t9, $v0, .L80935028 -/* 084C0 80934A90 3C098093 */ lui $t1, %hi(func_8092F0BC) ## $t1 = 80930000 -/* 084C4 80934A94 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 084C8 80934A98 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 084CC 80934A9C 0041001A */ div $zero, $v0, $at -/* 084D0 80934AA0 00004012 */ mflo $t0 -/* 084D4 80934AA4 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 084D8 80934AA8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 084DC 80934AAC 10A10006 */ beq $a1, $at, .L80934AC8 -/* 084E0 80934AB0 AFA90030 */ sw $t1, 0x0030($sp) -/* 084E4 80934AB4 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 -/* 084E8 80934AB8 10A10003 */ beq $a1, $at, .L80934AC8 -/* 084EC 80934ABC 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 084F0 80934AC0 14A10070 */ bne $a1, $at, .L80934C84 -/* 084F4 80934AC4 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 -.L80934AC8: -/* 084F8 80934AC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 084FC 80934ACC 3C018093 */ lui $at, %hi(D_80937A1C) ## $at = 80930000 -/* 08500 80934AD0 C4287A1C */ lwc1 $f8, %lo(D_80937A1C)($at) -/* 08504 80934AD4 468021A0 */ cvt.s.w $f6, $f4 -/* 08508 80934AD8 AFA5003C */ sw $a1, 0x003C($sp) -/* 0850C 80934ADC 46083302 */ mul.s $f12, $f6, $f8 -/* 08510 80934AE0 0C0400A4 */ jal sinf - -/* 08514 80934AE4 00000000 */ nop -/* 08518 80934AE8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0851C 80934AEC E7A00024 */ swc1 $f0, 0x0024($sp) -/* 08520 80934AF0 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 -/* 08524 80934AF4 44818000 */ mtc1 $at, $f16 ## $f16 = 1280.00 -/* 08528 80934AF8 3C014520 */ lui $at, 0x4520 ## $at = 45200000 -/* 0852C 80934AFC 44812000 */ mtc1 $at, $f4 ## $f4 = 2560.00 -/* 08530 80934B00 46008482 */ mul.s $f18, $f16, $f0 -/* 08534 80934B04 8FAA0030 */ lw $t2, 0x0030($sp) -/* 08538 80934B08 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 0853C 80934B0C 44814000 */ mtc1 $at, $f8 ## $f8 = 16.00 -/* 08540 80934B10 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 08544 80934B14 8FA20048 */ lw $v0, 0x0048($sp) -/* 08548 80934B18 8FA4004C */ lw $a0, 0x004C($sp) -/* 0854C 80934B1C 46049180 */ add.s $f6, $f18, $f4 -/* 08550 80934B20 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 -/* 08554 80934B24 C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 08558 80934B28 468050A0 */ cvt.s.w $f2, $f10 -/* 0855C 80934B2C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 08560 80934B30 46083283 */ div.s $f10, $f6, $f8 -/* 08564 80934B34 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 08568 80934B38 00000000 */ nop -/* 0856C 80934B3C 46803220 */ cvt.s.w $f8, $f6 -/* 08570 80934B40 46025402 */ mul.s $f16, $f10, $f2 -/* 08574 80934B44 00000000 */ nop -/* 08578 80934B48 46128102 */ mul.s $f4, $f16, $f18 -/* 0857C 80934B4C 46044280 */ add.s $f10, $f8, $f4 -/* 08580 80934B50 4600540D */ trunc.w.s $f16, $f10 -/* 08584 80934B54 440D8000 */ mfc1 $t5, $f16 -/* 08588 80934B58 00000000 */ nop -/* 0858C 80934B5C A44D0000 */ sh $t5, 0x0000($v0) ## 00000000 -/* 08590 80934B60 848E0198 */ lh $t6, 0x0198($a0) ## 00000198 -/* 08594 80934B64 E7A2001C */ swc1 $f2, 0x001C($sp) -/* 08598 80934B68 01C1001A */ div $zero, $t6, $at -/* 0859C 80934B6C 00007810 */ mfhi $t7 -/* 085A0 80934B70 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 085A4 80934B74 3C018093 */ lui $at, %hi(D_80937A20) ## $at = 80930000 -/* 085A8 80934B78 C4287A20 */ lwc1 $f8, %lo(D_80937A20)($at) -/* 085AC 80934B7C 468091A0 */ cvt.s.w $f6, $f18 -/* 085B0 80934B80 46083302 */ mul.s $f12, $f6, $f8 -/* 085B4 80934B84 0C0400A4 */ jal sinf - -/* 085B8 80934B88 00000000 */ nop -/* 085BC 80934B8C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 085C0 80934B90 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 085C4 80934B94 3C014580 */ lui $at, 0x4580 ## $at = 45800000 -/* 085C8 80934B98 44811000 */ mtc1 $at, $f2 ## $f2 = 4096.00 -/* 085CC 80934B9C 3C014500 */ lui $at, 0x4500 ## $at = 45000000 -/* 085D0 80934BA0 44812000 */ mtc1 $at, $f4 ## $f4 = 2048.00 -/* 085D4 80934BA4 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 085D8 80934BA8 44819000 */ mtc1 $at, $f18 ## $f18 = 16.00 -/* 085DC 80934BAC 46002282 */ mul.s $f10, $f4, $f0 -/* 085E0 80934BB0 C7A8001C */ lwc1 $f8, 0x001C($sp) -/* 085E4 80934BB4 8FA20048 */ lw $v0, 0x0048($sp) -/* 085E8 80934BB8 8FA5003C */ lw $a1, 0x003C($sp) -/* 085EC 80934BBC 8FA4004C */ lw $a0, 0x004C($sp) -/* 085F0 80934BC0 84580004 */ lh $t8, 0x0004($v0) ## 00000004 -/* 085F4 80934BC4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 085F8 80934BC8 46025400 */ add.s $f16, $f10, $f2 -/* 085FC 80934BCC C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 08600 80934BD0 46128183 */ div.s $f6, $f16, $f18 -/* 08604 80934BD4 46083102 */ mul.s $f4, $f6, $f8 -/* 08608 80934BD8 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 0860C 80934BDC 00000000 */ nop -/* 08610 80934BE0 46803220 */ cvt.s.w $f8, $f6 -/* 08614 80934BE4 460A2402 */ mul.s $f16, $f4, $f10 -/* 08618 80934BE8 46028480 */ add.s $f18, $f16, $f2 -/* 0861C 80934BEC 46124101 */ sub.s $f4, $f8, $f18 -/* 08620 80934BF0 4600228D */ trunc.w.s $f10, $f4 -/* 08624 80934BF4 44085000 */ mfc1 $t0, $f10 -/* 08628 80934BF8 14A1018A */ bne $a1, $at, .L80935224 -/* 0862C 80934BFC A4480004 */ sh $t0, 0x0004($v0) ## 00000004 -/* 08630 80934C00 84890198 */ lh $t1, 0x0198($a0) ## 00000198 -/* 08634 80934C04 3C018093 */ lui $at, %hi(D_80937A24) ## $at = 80930000 -/* 08638 80934C08 C4287A24 */ lwc1 $f8, %lo(D_80937A24)($at) -/* 0863C 80934C0C 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 08640 80934C10 00000000 */ nop -/* 08644 80934C14 468081A0 */ cvt.s.w $f6, $f16 -/* 08648 80934C18 46083302 */ mul.s $f12, $f6, $f8 -/* 0864C 80934C1C 0C0400A4 */ jal sinf - -/* 08650 80934C20 00000000 */ nop -/* 08654 80934C24 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 08658 80934C28 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 0865C 80934C2C 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 -/* 08660 80934C30 44819000 */ mtc1 $at, $f18 ## $f18 = 1280.00 -/* 08664 80934C34 3C014520 */ lui $at, 0x4520 ## $at = 45200000 -/* 08668 80934C38 44815000 */ mtc1 $at, $f10 ## $f10 = 2560.00 -/* 0866C 80934C3C 46009102 */ mul.s $f4, $f18, $f0 -/* 08670 80934C40 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 08674 80934C44 44813000 */ mtc1 $at, $f6 ## $f6 = 16.00 -/* 08678 80934C48 C7B2001C */ lwc1 $f18, 0x001C($sp) -/* 0867C 80934C4C 8FA20048 */ lw $v0, 0x0048($sp) -/* 08680 80934C50 460A2400 */ add.s $f16, $f4, $f10 -/* 08684 80934C54 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 -/* 08688 80934C58 C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 0868C 80934C5C 46068203 */ div.s $f8, $f16, $f6 -/* 08690 80934C60 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 -/* 08694 80934C64 46124102 */ mul.s $f4, $f8, $f18 -/* 08698 80934C68 46803220 */ cvt.s.w $f8, $f6 -/* 0869C 80934C6C 460A2402 */ mul.s $f16, $f4, $f10 -/* 086A0 80934C70 46104480 */ add.s $f18, $f8, $f16 -/* 086A4 80934C74 4600910D */ trunc.w.s $f4, $f18 -/* 086A8 80934C78 440C2000 */ mfc1 $t4, $f4 -/* 086AC 80934C7C 10000169 */ beq $zero, $zero, .L80935224 -/* 086B0 80934C80 A44C0002 */ sh $t4, 0x0002($v0) ## 00000002 -.L80934C84: -/* 086B4 80934C84 10A30004 */ beq $a1, $v1, .L80934C98 -/* 086B8 80934C88 00000000 */ nop -/* 086BC 80934C8C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 086C0 80934C90 54A10076 */ bnel $a1, $at, .L80934E6C -/* 086C4 80934C94 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80934C98: -/* 086C8 80934C98 0043001A */ div $zero, $v0, $v1 -/* 086CC 80934C9C 00006810 */ mfhi $t5 -/* 086D0 80934CA0 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 086D4 80934CA4 14600002 */ bne $v1, $zero, .L80934CB0 -/* 086D8 80934CA8 00000000 */ nop -/* 086DC 80934CAC 0007000D */ break 7 -.L80934CB0: -/* 086E0 80934CB0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 086E4 80934CB4 14610004 */ bne $v1, $at, .L80934CC8 -/* 086E8 80934CB8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 086EC 80934CBC 14410002 */ bne $v0, $at, .L80934CC8 -/* 086F0 80934CC0 00000000 */ nop -/* 086F4 80934CC4 0006000D */ break 6 -.L80934CC8: -/* 086F8 80934CC8 468051A0 */ cvt.s.w $f6, $f10 -/* 086FC 80934CCC 3C018093 */ lui $at, %hi(D_80937A28) ## $at = 80930000 -/* 08700 80934CD0 C4287A28 */ lwc1 $f8, %lo(D_80937A28)($at) -/* 08704 80934CD4 AFA5003C */ sw $a1, 0x003C($sp) -/* 08708 80934CD8 46083302 */ mul.s $f12, $f6, $f8 -/* 0870C 80934CDC 0C0400A4 */ jal sinf - -/* 08710 80934CE0 00000000 */ nop -/* 08714 80934CE4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 08718 80934CE8 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 0871C 80934CEC 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 -/* 08720 80934CF0 44817000 */ mtc1 $at, $f14 ## $f14 = 1280.00 -/* 08724 80934CF4 3C014420 */ lui $at, 0x4420 ## $at = 44200000 -/* 08728 80934CF8 44819000 */ mtc1 $at, $f18 ## $f18 = 640.00 -/* 0872C 80934CFC 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 08730 80934D00 44813000 */ mtc1 $at, $f6 ## $f6 = 16.00 -/* 08734 80934D04 46009102 */ mul.s $f4, $f18, $f0 -/* 08738 80934D08 8FAE0030 */ lw $t6, 0x0030($sp) -/* 0873C 80934D0C 8FA20048 */ lw $v0, 0x0048($sp) -/* 08740 80934D10 C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 08744 80934D14 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 08748 80934D18 844F0004 */ lh $t7, 0x0004($v0) ## 00000004 -/* 0874C 80934D1C 8FA5003C */ lw $a1, 0x003C($sp) -/* 08750 80934D20 460E2280 */ add.s $f10, $f4, $f14 -/* 08754 80934D24 8FA4004C */ lw $a0, 0x004C($sp) -/* 08758 80934D28 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0875C 80934D2C 468080A0 */ cvt.s.w $f2, $f16 -/* 08760 80934D30 46065203 */ div.s $f8, $f10, $f6 -/* 08764 80934D34 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 08768 80934D38 46024402 */ mul.s $f16, $f8, $f2 -/* 0876C 80934D3C 46803220 */ cvt.s.w $f8, $f6 -/* 08770 80934D40 46128102 */ mul.s $f4, $f16, $f18 -/* 08774 80934D44 460E2280 */ add.s $f10, $f4, $f14 -/* 08778 80934D48 460A4401 */ sub.s $f16, $f8, $f10 -/* 0877C 80934D4C 4600848D */ trunc.w.s $f18, $f16 -/* 08780 80934D50 44199000 */ mfc1 $t9, $f18 -/* 08784 80934D54 14A10133 */ bne $a1, $at, .L80935224 -/* 08788 80934D58 A4590004 */ sh $t9, 0x0004($v0) ## 00000004 -/* 0878C 80934D5C 84880198 */ lh $t0, 0x0198($a0) ## 00000198 -/* 08790 80934D60 3C018093 */ lui $at, %hi(D_80937A2C) ## $at = 80930000 -/* 08794 80934D64 C4287A2C */ lwc1 $f8, %lo(D_80937A2C)($at) -/* 08798 80934D68 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 0879C 80934D6C E7A2001C */ swc1 $f2, 0x001C($sp) -/* 087A0 80934D70 468021A0 */ cvt.s.w $f6, $f4 -/* 087A4 80934D74 46083302 */ mul.s $f12, $f6, $f8 -/* 087A8 80934D78 0C0400A4 */ jal sinf - -/* 087AC 80934D7C 00000000 */ nop -/* 087B0 80934D80 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 087B4 80934D84 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 087B8 80934D88 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 -/* 087BC 80934D8C 44815000 */ mtc1 $at, $f10 ## $f10 = 1280.00 -/* 087C0 80934D90 3C014520 */ lui $at, 0x4520 ## $at = 45200000 -/* 087C4 80934D94 44819000 */ mtc1 $at, $f18 ## $f18 = 2560.00 -/* 087C8 80934D98 46005402 */ mul.s $f16, $f10, $f0 -/* 087CC 80934D9C 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 087D0 80934DA0 44813000 */ mtc1 $at, $f6 ## $f6 = 16.00 -/* 087D4 80934DA4 C7AA001C */ lwc1 $f10, 0x001C($sp) -/* 087D8 80934DA8 8FA20048 */ lw $v0, 0x0048($sp) -/* 087DC 80934DAC 8FA4004C */ lw $a0, 0x004C($sp) -/* 087E0 80934DB0 3C018093 */ lui $at, %hi(D_80937A30) ## $at = 80930000 -/* 087E4 80934DB4 46128100 */ add.s $f4, $f16, $f18 -/* 087E8 80934DB8 84490000 */ lh $t1, 0x0000($v0) ## 00000000 -/* 087EC 80934DBC C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 087F0 80934DC0 46062203 */ div.s $f8, $f4, $f6 -/* 087F4 80934DC4 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 087F8 80934DC8 460A4402 */ mul.s $f16, $f8, $f10 -/* 087FC 80934DCC 46803220 */ cvt.s.w $f8, $f6 -/* 08800 80934DD0 46128102 */ mul.s $f4, $f16, $f18 -/* 08804 80934DD4 46044280 */ add.s $f10, $f8, $f4 -/* 08808 80934DD8 4600540D */ trunc.w.s $f16, $f10 -/* 0880C 80934DDC 440B8000 */ mfc1 $t3, $f16 -/* 08810 80934DE0 00000000 */ nop -/* 08814 80934DE4 A44B0000 */ sh $t3, 0x0000($v0) ## 00000000 -/* 08818 80934DE8 848C0198 */ lh $t4, 0x0198($a0) ## 00000198 -/* 0881C 80934DEC C4287A30 */ lwc1 $f8, %lo(D_80937A30)($at) -/* 08820 80934DF0 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 -/* 08824 80934DF4 00000000 */ nop -/* 08828 80934DF8 468091A0 */ cvt.s.w $f6, $f18 -/* 0882C 80934DFC 46083302 */ mul.s $f12, $f6, $f8 -/* 08830 80934E00 0C0400A4 */ jal sinf - -/* 08834 80934E04 00000000 */ nop -/* 08838 80934E08 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0883C 80934E0C E7A00024 */ swc1 $f0, 0x0024($sp) -/* 08840 80934E10 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 -/* 08844 80934E14 44812000 */ mtc1 $at, $f4 ## $f4 = 1280.00 -/* 08848 80934E18 3C014520 */ lui $at, 0x4520 ## $at = 45200000 -/* 0884C 80934E1C 44818000 */ mtc1 $at, $f16 ## $f16 = 2560.00 -/* 08850 80934E20 46002282 */ mul.s $f10, $f4, $f0 -/* 08854 80934E24 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 08858 80934E28 44813000 */ mtc1 $at, $f6 ## $f6 = 16.00 -/* 0885C 80934E2C C7A4001C */ lwc1 $f4, 0x001C($sp) -/* 08860 80934E30 8FA20048 */ lw $v0, 0x0048($sp) -/* 08864 80934E34 46105480 */ add.s $f18, $f10, $f16 -/* 08868 80934E38 844D0002 */ lh $t5, 0x0002($v0) ## 00000002 -/* 0886C 80934E3C C7B00024 */ lwc1 $f16, 0x0024($sp) -/* 08870 80934E40 46069203 */ div.s $f8, $f18, $f6 -/* 08874 80934E44 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 08878 80934E48 46044282 */ mul.s $f10, $f8, $f4 -/* 0887C 80934E4C 46803220 */ cvt.s.w $f8, $f6 -/* 08880 80934E50 46105482 */ mul.s $f18, $f10, $f16 -/* 08884 80934E54 46124100 */ add.s $f4, $f8, $f18 -/* 08888 80934E58 4600228D */ trunc.w.s $f10, $f4 -/* 0888C 80934E5C 440F5000 */ mfc1 $t7, $f10 -/* 08890 80934E60 100000F0 */ beq $zero, $zero, .L80935224 -/* 08894 80934E64 A44F0002 */ sh $t7, 0x0002($v0) ## 00000002 -/* 08898 80934E68 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80934E6C: -/* 0889C 80934E6C 54A100EE */ bnel $a1, $at, .L80935228 -/* 088A0 80934E70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 088A4 80934E74 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 088A8 80934E78 3C018093 */ lui $at, %hi(D_80937A34) ## $at = 80930000 -/* 088AC 80934E7C C4287A34 */ lwc1 $f8, %lo(D_80937A34)($at) -/* 088B0 80934E80 468081A0 */ cvt.s.w $f6, $f16 -/* 088B4 80934E84 46083302 */ mul.s $f12, $f6, $f8 -/* 088B8 80934E88 0C0400A4 */ jal sinf - -/* 088BC 80934E8C 00000000 */ nop -/* 088C0 80934E90 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 088C4 80934E94 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 088C8 80934E98 3C014400 */ lui $at, 0x4400 ## $at = 44000000 -/* 088CC 80934E9C 44812000 */ mtc1 $at, $f4 ## $f4 = 512.00 -/* 088D0 80934EA0 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 088D4 80934EA4 44818000 */ mtc1 $at, $f16 ## $f16 = 1024.00 -/* 088D8 80934EA8 46002282 */ mul.s $f10, $f4, $f0 -/* 088DC 80934EAC 8FB80030 */ lw $t8, 0x0030($sp) -/* 088E0 80934EB0 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 088E4 80934EB4 44814000 */ mtc1 $at, $f8 ## $f8 = 16.00 -/* 088E8 80934EB8 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 -/* 088EC 80934EBC 8FA20048 */ lw $v0, 0x0048($sp) -/* 088F0 80934EC0 8FA4004C */ lw $a0, 0x004C($sp) -/* 088F4 80934EC4 46105180 */ add.s $f6, $f10, $f16 -/* 088F8 80934EC8 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 088FC 80934ECC C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 08900 80934ED0 468090A0 */ cvt.s.w $f2, $f18 -/* 08904 80934ED4 3C018093 */ lui $at, %hi(D_80937A38) ## $at = 80930000 -/* 08908 80934ED8 46083483 */ div.s $f18, $f6, $f8 -/* 0890C 80934EDC 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 08910 80934EE0 00000000 */ nop -/* 08914 80934EE4 46803220 */ cvt.s.w $f8, $f6 -/* 08918 80934EE8 46029102 */ mul.s $f4, $f18, $f2 -/* 0891C 80934EEC 00000000 */ nop -/* 08920 80934EF0 460A2402 */ mul.s $f16, $f4, $f10 -/* 08924 80934EF4 46104480 */ add.s $f18, $f8, $f16 -/* 08928 80934EF8 4600910D */ trunc.w.s $f4, $f18 -/* 0892C 80934EFC 44092000 */ mfc1 $t1, $f4 -/* 08930 80934F00 00000000 */ nop -/* 08934 80934F04 A4490000 */ sh $t1, 0x0000($v0) ## 00000000 -/* 08938 80934F08 848A0198 */ lh $t2, 0x0198($a0) ## 00000198 -/* 0893C 80934F0C C4287A38 */ lwc1 $f8, %lo(D_80937A38)($at) -/* 08940 80934F10 E7A2001C */ swc1 $f2, 0x001C($sp) -/* 08944 80934F14 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 08948 80934F18 00000000 */ nop -/* 0894C 80934F1C 468051A0 */ cvt.s.w $f6, $f10 -/* 08950 80934F20 46083302 */ mul.s $f12, $f6, $f8 -/* 08954 80934F24 0C0400A4 */ jal sinf - -/* 08958 80934F28 00000000 */ nop -/* 0895C 80934F2C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 08960 80934F30 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 08964 80934F34 3C014400 */ lui $at, 0x4400 ## $at = 44000000 -/* 08968 80934F38 44818000 */ mtc1 $at, $f16 ## $f16 = 512.00 -/* 0896C 80934F3C 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 08970 80934F40 44812000 */ mtc1 $at, $f4 ## $f4 = 1024.00 -/* 08974 80934F44 46008482 */ mul.s $f18, $f16, $f0 -/* 08978 80934F48 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 0897C 80934F4C 44813000 */ mtc1 $at, $f6 ## $f6 = 16.00 -/* 08980 80934F50 C7B0001C */ lwc1 $f16, 0x001C($sp) -/* 08984 80934F54 8FA20048 */ lw $v0, 0x0048($sp) -/* 08988 80934F58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0898C 80934F5C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 08990 80934F60 46049280 */ add.s $f10, $f18, $f4 -/* 08994 80934F64 844B0002 */ lh $t3, 0x0002($v0) ## 00000002 -/* 08998 80934F68 C7A40024 */ lwc1 $f4, 0x0024($sp) -/* 0899C 80934F6C 46065203 */ div.s $f8, $f10, $f6 -/* 089A0 80934F70 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 089A4 80934F74 46104482 */ mul.s $f18, $f8, $f16 -/* 089A8 80934F78 46803220 */ cvt.s.w $f8, $f6 -/* 089AC 80934F7C 46049282 */ mul.s $f10, $f18, $f4 -/* 089B0 80934F80 460A4400 */ add.s $f16, $f8, $f10 -/* 089B4 80934F84 4600848D */ trunc.w.s $f18, $f16 -/* 089B8 80934F88 440D9000 */ mfc1 $t5, $f18 -/* 089BC 80934F8C 00000000 */ nop -/* 089C0 80934F90 A44D0002 */ sh $t5, 0x0002($v0) ## 00000002 -/* 089C4 80934F94 848E0198 */ lh $t6, 0x0198($a0) ## 00000198 -/* 089C8 80934F98 01C1001A */ div $zero, $t6, $at -/* 089CC 80934F9C 00007810 */ mfhi $t7 -/* 089D0 80934FA0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 089D4 80934FA4 3C018093 */ lui $at, %hi(D_80937A3C) ## $at = 80930000 -/* 089D8 80934FA8 C4287A3C */ lwc1 $f8, %lo(D_80937A3C)($at) -/* 089DC 80934FAC 468021A0 */ cvt.s.w $f6, $f4 -/* 089E0 80934FB0 46083302 */ mul.s $f12, $f6, $f8 -/* 089E4 80934FB4 0C0400A4 */ jal sinf - -/* 089E8 80934FB8 00000000 */ nop -/* 089EC 80934FBC 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 089F0 80934FC0 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 089F4 80934FC4 3C014380 */ lui $at, 0x4380 ## $at = 43800000 -/* 089F8 80934FC8 44815000 */ mtc1 $at, $f10 ## $f10 = 256.00 -/* 089FC 80934FCC 3C014400 */ lui $at, 0x4400 ## $at = 44000000 -/* 08A00 80934FD0 44819000 */ mtc1 $at, $f18 ## $f18 = 512.00 -/* 08A04 80934FD4 46005402 */ mul.s $f16, $f10, $f0 -/* 08A08 80934FD8 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 08A0C 80934FDC 44813000 */ mtc1 $at, $f6 ## $f6 = 16.00 -/* 08A10 80934FE0 C7AA001C */ lwc1 $f10, 0x001C($sp) -/* 08A14 80934FE4 8FA20048 */ lw $v0, 0x0048($sp) -/* 08A18 80934FE8 3C014400 */ lui $at, 0x4400 ## $at = 44000000 -/* 08A1C 80934FEC 46128100 */ add.s $f4, $f16, $f18 -/* 08A20 80934FF0 C7B20024 */ lwc1 $f18, 0x0024($sp) -/* 08A24 80934FF4 84580004 */ lh $t8, 0x0004($v0) ## 00000004 -/* 08A28 80934FF8 46062203 */ div.s $f8, $f4, $f6 -/* 08A2C 80934FFC 44813000 */ mtc1 $at, $f6 ## $f6 = 512.00 -/* 08A30 80935000 460A4402 */ mul.s $f16, $f8, $f10 -/* 08A34 80935004 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 08A38 80935008 46128102 */ mul.s $f4, $f16, $f18 -/* 08A3C 8093500C 46805420 */ cvt.s.w $f16, $f10 -/* 08A40 80935010 46062200 */ add.s $f8, $f4, $f6 -/* 08A44 80935014 46088481 */ sub.s $f18, $f16, $f8 -/* 08A48 80935018 4600910D */ trunc.w.s $f4, $f18 -/* 08A4C 8093501C 44082000 */ mfc1 $t0, $f4 -/* 08A50 80935020 10000080 */ beq $zero, $zero, .L80935224 -/* 08A54 80935024 A4480004 */ sh $t0, 0x0004($v0) ## 00000004 -.L80935028: -/* 08A58 80935028 2529F0BC */ addiu $t1, $t1, %lo(func_8092F0BC) ## $t1 = FFFFF0BC -/* 08A5C 8093502C 15220058 */ bne $t1, $v0, .L80935190 -/* 08A60 80935030 00000000 */ nop -/* 08A64 80935034 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 08A68 80935038 28410031 */ slti $at, $v0, 0x0031 -/* 08A6C 8093503C 54200004 */ bnel $at, $zero, .L80935050 -/* 08A70 80935040 28410007 */ slti $at, $v0, 0x0007 -/* 08A74 80935044 10000007 */ beq $zero, $zero, .L80935064 -/* 08A78 80935048 2446FFDC */ addiu $a2, $v0, 0xFFDC ## $a2 = FFFFFFDC -/* 08A7C 8093504C 28410007 */ slti $at, $v0, 0x0007 -.L80935050: -/* 08A80 80935050 14200003 */ bne $at, $zero, .L80935060 -/* 08A84 80935054 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 08A88 80935058 10000001 */ beq $zero, $zero, .L80935060 -/* 08A8C 8093505C 24030006 */ addiu $v1, $zero, 0x0006 ## $v1 = 00000006 -.L80935060: -/* 08A90 80935060 00033040 */ sll $a2, $v1, 1 -.L80935064: -/* 08A94 80935064 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 08A98 80935068 10A10005 */ beq $a1, $at, .L80935080 -/* 08A9C 8093506C 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 -/* 08AA0 80935070 10A10003 */ beq $a1, $at, .L80935080 -/* 08AA4 80935074 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 08AA8 80935078 54A10016 */ bnel $a1, $at, .L809350D4 -/* 08AAC 8093507C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L80935080: -/* 08AB0 80935080 44863000 */ mtc1 $a2, $f6 ## $f6 = NaN -/* 08AB4 80935084 3C018093 */ lui $at, %hi(D_80937A40) ## $at = 80930000 -/* 08AB8 80935088 C4307A40 */ lwc1 $f16, %lo(D_80937A40)($at) -/* 08ABC 8093508C 468032A0 */ cvt.s.w $f10, $f6 -/* 08AC0 80935090 46105302 */ mul.s $f12, $f10, $f16 -/* 08AC4 80935094 0C0400A4 */ jal sinf - -/* 08AC8 80935098 00000000 */ nop -/* 08ACC 8093509C 8FA20048 */ lw $v0, 0x0048($sp) -/* 08AD0 809350A0 3C014600 */ lui $at, 0x4600 ## $at = 46000000 -/* 08AD4 809350A4 44812000 */ mtc1 $at, $f4 ## $f4 = 8192.00 -/* 08AD8 809350A8 844A0004 */ lh $t2, 0x0004($v0) ## 00000004 -/* 08ADC 809350AC 46002182 */ mul.s $f6, $f4, $f0 -/* 08AE0 809350B0 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 08AE4 809350B4 00000000 */ nop -/* 08AE8 809350B8 468044A0 */ cvt.s.w $f18, $f8 -/* 08AEC 809350BC 46069281 */ sub.s $f10, $f18, $f6 -/* 08AF0 809350C0 4600540D */ trunc.w.s $f16, $f10 -/* 08AF4 809350C4 440C8000 */ mfc1 $t4, $f16 -/* 08AF8 809350C8 10000056 */ beq $zero, $zero, .L80935224 -/* 08AFC 809350CC A44C0004 */ sh $t4, 0x0004($v0) ## 00000004 -/* 08B00 809350D0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L809350D4: -/* 08B04 809350D4 10A10003 */ beq $a1, $at, .L809350E4 -/* 08B08 809350D8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 08B0C 809350DC 54A10016 */ bnel $a1, $at, .L80935138 -/* 08B10 809350E0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L809350E4: -/* 08B14 809350E4 44864000 */ mtc1 $a2, $f8 ## $f8 = 0.00 -/* 08B18 809350E8 3C018093 */ lui $at, %hi(D_80937A44) ## $at = 80930000 -/* 08B1C 809350EC C4327A44 */ lwc1 $f18, %lo(D_80937A44)($at) -/* 08B20 809350F0 46804120 */ cvt.s.w $f4, $f8 -/* 08B24 809350F4 46122302 */ mul.s $f12, $f4, $f18 -/* 08B28 809350F8 0C0400A4 */ jal sinf - -/* 08B2C 809350FC 00000000 */ nop -/* 08B30 80935100 8FA20048 */ lw $v0, 0x0048($sp) -/* 08B34 80935104 3C014520 */ lui $at, 0x4520 ## $at = 45200000 -/* 08B38 80935108 44818000 */ mtc1 $at, $f16 ## $f16 = 2560.00 -/* 08B3C 8093510C 844D0004 */ lh $t5, 0x0004($v0) ## 00000004 -/* 08B40 80935110 46008202 */ mul.s $f8, $f16, $f0 -/* 08B44 80935114 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 08B48 80935118 00000000 */ nop -/* 08B4C 8093511C 468032A0 */ cvt.s.w $f10, $f6 -/* 08B50 80935120 46085101 */ sub.s $f4, $f10, $f8 -/* 08B54 80935124 4600248D */ trunc.w.s $f18, $f4 -/* 08B58 80935128 440F9000 */ mfc1 $t7, $f18 -/* 08B5C 8093512C 1000003D */ beq $zero, $zero, .L80935224 -/* 08B60 80935130 A44F0004 */ sh $t7, 0x0004($v0) ## 00000004 -/* 08B64 80935134 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80935138: -/* 08B68 80935138 54A1003B */ bnel $a1, $at, .L80935228 -/* 08B6C 8093513C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 08B70 80935140 44863000 */ mtc1 $a2, $f6 ## $f6 = 0.00 -/* 08B74 80935144 3C018093 */ lui $at, %hi(D_80937A48) ## $at = 80930000 -/* 08B78 80935148 C42A7A48 */ lwc1 $f10, %lo(D_80937A48)($at) -/* 08B7C 8093514C 46803420 */ cvt.s.w $f16, $f6 -/* 08B80 80935150 460A8302 */ mul.s $f12, $f16, $f10 -/* 08B84 80935154 0C0400A4 */ jal sinf - -/* 08B88 80935158 00000000 */ nop -/* 08B8C 8093515C 8FA20048 */ lw $v0, 0x0048($sp) -/* 08B90 80935160 3C014480 */ lui $at, 0x4480 ## $at = 44800000 -/* 08B94 80935164 44819000 */ mtc1 $at, $f18 ## $f18 = 1024.00 -/* 08B98 80935168 84580004 */ lh $t8, 0x0004($v0) ## 00000004 -/* 08B9C 8093516C 46009182 */ mul.s $f6, $f18, $f0 -/* 08BA0 80935170 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 08BA4 80935174 00000000 */ nop -/* 08BA8 80935178 46804120 */ cvt.s.w $f4, $f8 -/* 08BAC 8093517C 46062401 */ sub.s $f16, $f4, $f6 -/* 08BB0 80935180 4600828D */ trunc.w.s $f10, $f16 -/* 08BB4 80935184 44085000 */ mfc1 $t0, $f10 -/* 08BB8 80935188 10000026 */ beq $zero, $zero, .L80935224 -/* 08BBC 8093518C A4480004 */ sh $t0, 0x0004($v0) ## 00000004 -.L80935190: -/* 08BC0 80935190 3C098093 */ lui $t1, %hi(func_8092F434) ## $t1 = 80930000 -/* 08BC4 80935194 2529F434 */ addiu $t1, $t1, %lo(func_8092F434) ## $t1 = 8092F434 -/* 08BC8 80935198 11220006 */ beq $t1, $v0, .L809351B4 -/* 08BCC 8093519C 3C0A8093 */ lui $t2, %hi(func_8092F6F0) ## $t2 = 80930000 -/* 08BD0 809351A0 254AF6F0 */ addiu $t2, $t2, %lo(func_8092F6F0) ## $t2 = 8092F6F0 -/* 08BD4 809351A4 11420003 */ beq $t2, $v0, .L809351B4 -/* 08BD8 809351A8 3C0B8093 */ lui $t3, %hi(func_8092F7DC) ## $t3 = 80930000 -/* 08BDC 809351AC 256BF7DC */ addiu $t3, $t3, %lo(func_8092F7DC) ## $t3 = 8092F7DC -/* 08BE0 809351B0 1562001C */ bne $t3, $v0, .L80935224 -.L809351B4: -/* 08BE4 809351B4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 08BE8 809351B8 10A10006 */ beq $a1, $at, .L809351D4 -/* 08BEC 809351BC 8FA20048 */ lw $v0, 0x0048($sp) -/* 08BF0 809351C0 24010027 */ addiu $at, $zero, 0x0027 ## $at = 00000027 -/* 08BF4 809351C4 10A10003 */ beq $a1, $at, .L809351D4 -/* 08BF8 809351C8 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 08BFC 809351CC 54A10006 */ bnel $a1, $at, .L809351E8 -/* 08C00 809351D0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L809351D4: -/* 08C04 809351D4 844C0004 */ lh $t4, 0x0004($v0) ## 00000004 -/* 08C08 809351D8 258DF000 */ addiu $t5, $t4, 0xF000 ## $t5 = FFFFF000 -/* 08C0C 809351DC 10000011 */ beq $zero, $zero, .L80935224 -/* 08C10 809351E0 A44D0004 */ sh $t5, 0x0004($v0) ## 00000004 -/* 08C14 809351E4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -.L809351E8: -/* 08C18 809351E8 10A10004 */ beq $a1, $at, .L809351FC -/* 08C1C 809351EC 8FA20048 */ lw $v0, 0x0048($sp) -/* 08C20 809351F0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 08C24 809351F4 54A10006 */ bnel $a1, $at, .L80935210 -/* 08C28 809351F8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L809351FC: -/* 08C2C 809351FC 844E0004 */ lh $t6, 0x0004($v0) ## 00000004 -/* 08C30 80935200 25CFFB00 */ addiu $t7, $t6, 0xFB00 ## $t7 = FFFFFB00 -/* 08C34 80935204 10000007 */ beq $zero, $zero, .L80935224 -/* 08C38 80935208 A44F0004 */ sh $t7, 0x0004($v0) ## 00000004 -/* 08C3C 8093520C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80935210: -/* 08C40 80935210 14A10004 */ bne $a1, $at, .L80935224 -/* 08C44 80935214 8FA20048 */ lw $v0, 0x0048($sp) -/* 08C48 80935218 84580004 */ lh $t8, 0x0004($v0) ## 00000004 -/* 08C4C 8093521C 2719FE00 */ addiu $t9, $t8, 0xFE00 ## $t9 = FFFFFE00 -/* 08C50 80935220 A4590004 */ sh $t9, 0x0004($v0) ## 00000004 -.L80935224: -/* 08C54 80935224 8FBF0014 */ lw $ra, 0x0014($sp) -.L80935228: -/* 08C58 80935228 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 08C5C 8093522C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 08C60 80935230 03E00008 */ jr $ra -/* 08C64 80935234 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s deleted file mode 100644 index e12489cf2f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80935238 -/* 08C68 80935238 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 08C6C 8093523C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 08C70 80935240 AFBF0014 */ sw $ra, 0x0014($sp) -/* 08C74 80935244 AFA40028 */ sw $a0, 0x0028($sp) -/* 08C78 80935248 AFA5002C */ sw $a1, 0x002C($sp) -/* 08C7C 8093524C AFA60030 */ sw $a2, 0x0030($sp) -/* 08C80 80935250 14A1001A */ bne $a1, $at, .L809352BC -/* 08C84 80935254 AFA70034 */ sw $a3, 0x0034($sp) -/* 08C88 80935258 8FA50038 */ lw $a1, 0x0038($sp) -/* 08C8C 8093525C 3C048093 */ lui $a0, %hi(D_809378AC) ## $a0 = 80930000 -/* 08C90 80935260 248478AC */ addiu $a0, $a0, %lo(D_809378AC) ## $a0 = 809378AC -/* 08C94 80935264 0C0346BD */ jal Matrix_MultVec3f -/* 08C98 80935268 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 08C9C 8093526C 3C048093 */ lui $a0, %hi(D_809378B8) ## $a0 = 80930000 -/* 08CA0 80935270 248478B8 */ addiu $a0, $a0, %lo(D_809378B8) ## $a0 = 809378B8 -/* 08CA4 80935274 0C0346BD */ jal Matrix_MultVec3f -/* 08CA8 80935278 27A50018 */ addiu $a1, $sp, 0x0018 ## $a1 = FFFFFFF0 -/* 08CAC 8093527C C7A40018 */ lwc1 $f4, 0x0018($sp) -/* 08CB0 80935280 8FA20038 */ lw $v0, 0x0038($sp) -/* 08CB4 80935284 4600218D */ trunc.w.s $f6, $f4 -/* 08CB8 80935288 44183000 */ mfc1 $t8, $f6 -/* 08CBC 8093528C 00000000 */ nop -/* 08CC0 80935290 A45806FA */ sh $t8, 0x06FA($v0) ## 000006FA -/* 08CC4 80935294 C7A8001C */ lwc1 $f8, 0x001C($sp) -/* 08CC8 80935298 4600428D */ trunc.w.s $f10, $f8 -/* 08CCC 8093529C 44085000 */ mfc1 $t0, $f10 -/* 08CD0 809352A0 00000000 */ nop -/* 08CD4 809352A4 A44806FC */ sh $t0, 0x06FC($v0) ## 000006FC -/* 08CD8 809352A8 C7B00020 */ lwc1 $f16, 0x0020($sp) -/* 08CDC 809352AC 4600848D */ trunc.w.s $f18, $f16 -/* 08CE0 809352B0 440A9000 */ mfc1 $t2, $f18 -/* 08CE4 809352B4 00000000 */ nop -/* 08CE8 809352B8 A44A06FE */ sh $t2, 0x06FE($v0) ## 000006FE -.L809352BC: -/* 08CEC 809352BC 8FA20038 */ lw $v0, 0x0038($sp) -/* 08CF0 809352C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 08CF4 809352C4 0C018A29 */ jal Collider_UpdateSpheres -/* 08CF8 809352C8 244503D4 */ addiu $a1, $v0, 0x03D4 ## $a1 = 000003D4 -/* 08CFC 809352CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 08D00 809352D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 08D04 809352D4 03E00008 */ jr $ra -/* 08D08 809352D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s deleted file mode 100644 index 3daad1c38f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s +++ /dev/null @@ -1,328 +0,0 @@ -.rdata -glabel D_80937910 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937920 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937930 - .asciz "../z_boss_sst.c" - .balign 4 - -.late_rodata -glabel D_80937A4C - .float 6.28318548203 - -glabel D_80937A50 - .float 6.28318548203 - -glabel D_80937A54 - .word 0x39C49BA6 -glabel D_80937A58 - .word 0x3A449BA6 - -.text -glabel func_809352DC -/* 08D0C 809352DC 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 08D10 809352E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 08D14 809352E4 AFB10028 */ sw $s1, 0x0028($sp) -/* 08D18 809352E8 AFB00024 */ sw $s0, 0x0024($sp) -/* 08D1C 809352EC AFA500A4 */ sw $a1, 0x00A4($sp) -/* 08D20 809352F0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 08D24 809352F4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 08D28 809352F8 3C068093 */ lui $a2, %hi(D_80937910) ## $a2 = 80930000 -/* 08D2C 809352FC 24C67910 */ addiu $a2, $a2, %lo(D_80937910) ## $a2 = 80937910 -/* 08D30 80935300 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 -/* 08D34 80935304 24071A9A */ addiu $a3, $zero, 0x1A9A ## $a3 = 00001A9A -/* 08D38 80935308 0C031AB1 */ jal Graph_OpenDisps -/* 08D3C 8093530C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 08D40 80935310 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 -/* 08D44 80935314 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 08D48 80935318 8FB900A4 */ lw $t9, 0x00A4($sp) -/* 08D4C 8093531C 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 08D50 80935320 1301003C */ beq $t8, $at, .L80935414 -/* 08D54 80935324 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 08D58 80935328 0C024F46 */ jal func_80093D18 -/* 08D5C 8093532C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 08D60 80935330 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 08D64 80935334 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 -/* 08D68 80935338 35290080 */ ori $t1, $t1, 0x0080 ## $t1 = FA000080 -/* 08D6C 8093533C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 08D70 80935340 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 08D74 80935344 3C048093 */ lui $a0, %hi(D_80937464) ## $a0 = 80930000 -/* 08D78 80935348 24847464 */ addiu $a0, $a0, %lo(D_80937464) ## $a0 = 80937464 -/* 08D7C 8093534C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 08D80 80935350 908E0001 */ lbu $t6, 0x0001($a0) ## 80937465 -/* 08D84 80935354 908B0000 */ lbu $t3, 0x0000($a0) ## 80937464 -/* 08D88 80935358 90880002 */ lbu $t0, 0x0002($a0) ## 80937466 -/* 08D8C 8093535C 000E7C00 */ sll $t7, $t6, 16 -/* 08D90 80935360 000B6600 */ sll $t4, $t3, 24 -/* 08D94 80935364 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000000 -/* 08D98 80935368 00084A00 */ sll $t1, $t0, 8 -/* 08D9C 8093536C 03095025 */ or $t2, $t8, $t1 ## $t2 = FA000080 -/* 08DA0 80935370 354B00FF */ ori $t3, $t2, 0x00FF ## $t3 = FA0000FF -/* 08DA4 80935374 3C0D8093 */ lui $t5, %hi(D_80937448) ## $t5 = 80930000 -/* 08DA8 80935378 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 08DAC 8093537C 8DAD7448 */ lw $t5, %lo(D_80937448)($t5) -/* 08DB0 80935380 3C048093 */ lui $a0, %hi(D_80937468) ## $a0 = 80930000 -/* 08DB4 80935384 24847468 */ addiu $a0, $a0, %lo(D_80937468) ## $a0 = 80937468 -/* 08DB8 80935388 15A0000B */ bne $t5, $zero, .L809353B8 -/* 08DBC 8093538C 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 08DC0 80935390 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 08DC4 80935394 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 08DC8 80935398 3C0F8011 */ lui $t7, %hi(D_80116280+0x10) -/* 08DCC 8093539C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 08DD0 809353A0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 08DD4 809353A4 25EF6290 */ addiu $t7, %lo(D_80116280+0x10) -/* 08DD8 809353A8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 08DDC 809353AC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 08DE0 809353B0 1000002B */ beq $zero, $zero, .L80935460 -/* 08DE4 809353B4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -.L809353B8: -/* 08DE8 809353B8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 08DEC 809353BC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 08DF0 809353C0 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 08DF4 809353C4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 08DF8 809353C8 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 08DFC 809353CC AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 08E00 809353D0 908D0001 */ lbu $t5, 0x0001($a0) ## 80937469 -/* 08E04 809353D4 90890000 */ lbu $t1, 0x0000($a0) ## 80937468 -/* 08E08 809353D8 90990002 */ lbu $t9, 0x0002($a0) ## 8093746A -/* 08E0C 809353DC 000D7400 */ sll $t6, $t5, 16 -/* 08E10 809353E0 00095600 */ sll $t2, $t1, 24 -/* 08E14 809353E4 014E6025 */ or $t4, $t2, $t6 ## $t4 = FA000088 -/* 08E18 809353E8 00194200 */ sll $t0, $t9, 8 -/* 08E1C 809353EC 0188C025 */ or $t8, $t4, $t0 ## $t8 = FB000088 -/* 08E20 809353F0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 08E24 809353F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 08E28 809353F8 3C0D8093 */ lui $t5, %hi(D_80936990) ## $t5 = 80930000 -/* 08E2C 809353FC 25AD6990 */ addiu $t5, $t5, %lo(D_80936990) ## $t5 = 80936990 -/* 08E30 80935400 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 08E34 80935404 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 08E38 80935408 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 08E3C 8093540C 10000014 */ beq $zero, $zero, .L80935460 -/* 08E40 80935410 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -.L80935414: -/* 08E44 80935414 0C024F61 */ jal func_80093D84 -/* 08E48 80935418 8D440000 */ lw $a0, 0x0000($t2) ## FA000080 -/* 08E4C 8093541C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 08E50 80935420 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 08E54 80935424 35EF0080 */ ori $t7, $t7, 0x0080 ## $t7 = FA000080 -/* 08E58 80935428 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 08E5C 8093542C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 08E60 80935430 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 08E64 80935434 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 08E68 80935438 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 08E6C 8093543C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 08E70 80935440 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 08E74 80935444 3C188011 */ lui $t8, %hi(D_80116280+0x10) -/* 08E78 80935448 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 08E7C 8093544C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 08E80 80935450 27186290 */ addiu $t8, %lo(D_80116280+0x10) -/* 08E84 80935454 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 -/* 08E88 80935458 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 08E8C 8093545C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -.L80935460: -/* 08E90 80935460 8E2B0190 */ lw $t3, 0x0190($s1) ## 00000190 -/* 08E94 80935464 3C098093 */ lui $t1, %hi(func_8092F374) ## $t1 = 80930000 -/* 08E98 80935468 2529F374 */ addiu $t1, $t1, %lo(func_8092F374) ## $t1 = 8092F374 -/* 08E9C 8093546C 552B002A */ bnel $t1, $t3, .L80935518 -/* 08EA0 80935470 8E2A0004 */ lw $t2, 0x0004($s1) ## 00000004 -/* 08EA4 80935474 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 08EA8 80935478 00000000 */ nop -/* 08EAC 8093547C 3C018093 */ lui $at, %hi(D_80937A4C) ## $at = 80930000 -/* 08EB0 80935480 C4247A4C */ lwc1 $f4, %lo(D_80937A4C)($at) -/* 08EB4 80935484 46040182 */ mul.s $f6, $f0, $f4 -/* 08EB8 80935488 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 08EBC 8093548C E7A60068 */ swc1 $f6, 0x0068($sp) -/* 08EC0 80935490 3C018093 */ lui $at, %hi(D_80937A50) ## $at = 80930000 -/* 08EC4 80935494 C4287A50 */ lwc1 $f8, %lo(D_80937A50)($at) -/* 08EC8 80935498 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08ECC 8093549C 46080302 */ mul.s $f12, $f0, $f8 -/* 08ED0 809354A0 0C034348 */ jal Matrix_RotateY -/* 08ED4 809354A4 E7AC0064 */ swc1 $f12, 0x0064($sp) -/* 08ED8 809354A8 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 08EDC 809354AC 0C0342DC */ jal Matrix_RotateX -/* 08EE0 809354B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08EE4 809354B4 862D0198 */ lh $t5, 0x0198($s1) ## 00000198 -/* 08EE8 809354B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 08EEC 809354BC 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 08EF0 809354C0 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 08EF4 809354C4 3C018093 */ lui $at, %hi(D_80937A54) ## $at = 80930000 -/* 08EF8 809354C8 C4307A54 */ lwc1 $f16, %lo(D_80937A54)($at) -/* 08EFC 809354CC 46805020 */ cvt.s.w $f0, $f10 -/* 08F00 809354D0 3C018093 */ lui $at, %hi(D_80937A58) ## $at = 80930000 -/* 08F04 809354D4 C4247A58 */ lwc1 $f4, %lo(D_80937A58)($at) -/* 08F08 809354D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08F0C 809354DC 46100482 */ mul.s $f18, $f0, $f16 -/* 08F10 809354E0 46029300 */ add.s $f12, $f18, $f2 -/* 08F14 809354E4 46040182 */ mul.s $f6, $f0, $f4 -/* 08F18 809354E8 44066000 */ mfc1 $a2, $f12 -/* 08F1C 809354EC 0C0342A3 */ jal Matrix_Scale -/* 08F20 809354F0 46061381 */ sub.s $f14, $f2, $f6 -/* 08F24 809354F4 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 08F28 809354F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08F2C 809354FC 0C0342DC */ jal Matrix_RotateX -/* 08F30 80935500 46006307 */ neg.s $f12, $f12 -/* 08F34 80935504 C7AC0064 */ lwc1 $f12, 0x0064($sp) -/* 08F38 80935508 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08F3C 8093550C 0C034348 */ jal Matrix_RotateY -/* 08F40 80935510 46006307 */ neg.s $f12, $f12 -/* 08F44 80935514 8E2A0004 */ lw $t2, 0x0004($s1) ## 00000004 -.L80935518: -/* 08F48 80935518 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 08F4C 8093551C 3C088093 */ lui $t0, %hi(func_80934A44) ## $t0 = 80930000 -/* 08F50 80935520 314E0080 */ andi $t6, $t2, 0x0080 ## $t6 = 00000000 -/* 08F54 80935524 11C10011 */ beq $t6, $at, .L8093556C -/* 08F58 80935528 25084A44 */ addiu $t0, $t0, %lo(func_80934A44) ## $t0 = 80934A44 -/* 08F5C 8093552C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 08F60 80935530 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 08F64 80935534 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E -/* 08F68 80935538 3C0F8093 */ lui $t7, %hi(func_80934A44) ## $t7 = 80930000 -/* 08F6C 8093553C 3C198093 */ lui $t9, %hi(func_80935238) ## $t9 = 80930000 -/* 08F70 80935540 27395238 */ addiu $t9, $t9, %lo(func_80935238) ## $t9 = 80935238 -/* 08F74 80935544 25EF4A44 */ addiu $t7, $t7, %lo(func_80934A44) ## $t7 = 80934A44 -/* 08F78 80935548 AFAF0010 */ sw $t7, 0x0010($sp) -/* 08F7C 8093554C AFB90014 */ sw $t9, 0x0014($sp) -/* 08F80 80935550 AFB10018 */ sw $s1, 0x0018($sp) -/* 08F84 80935554 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 08F88 80935558 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 08F8C 8093555C 0C0289CF */ jal SkelAnime_DrawFlex -/* 08F90 80935560 AFAC001C */ sw $t4, 0x001C($sp) -/* 08F94 80935564 1000000E */ beq $zero, $zero, .L809355A0 -/* 08F98 80935568 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -.L8093556C: -/* 08F9C 8093556C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 08FA0 80935570 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 08FA4 80935574 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E -/* 08FA8 80935578 3C188093 */ lui $t8, %hi(func_80935238) ## $t8 = 80930000 -/* 08FAC 8093557C 27185238 */ addiu $t8, $t8, %lo(func_80935238) ## $t8 = 80935238 -/* 08FB0 80935580 AFB80014 */ sw $t8, 0x0014($sp) -/* 08FB4 80935584 AFB10018 */ sw $s1, 0x0018($sp) -/* 08FB8 80935588 AFA80010 */ sw $t0, 0x0010($sp) -/* 08FBC 8093558C 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 -/* 08FC0 80935590 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 08FC4 80935594 0C0289CF */ jal SkelAnime_DrawFlex -/* 08FC8 80935598 AFA9001C */ sw $t1, 0x001C($sp) -/* 08FCC 8093559C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -.L809355A0: -/* 08FD0 809355A0 8E2D0190 */ lw $t5, 0x0190($s1) ## 00000190 -/* 08FD4 809355A4 3C0B8093 */ lui $t3, %hi(func_8092CC58) ## $t3 = 80930000 -/* 08FD8 809355A8 256BCC58 */ addiu $t3, $t3, %lo(func_8092CC58) ## $t3 = 8092CC58 -/* 08FDC 809355AC 556D0058 */ bnel $t3, $t5, .L80935710 -/* 08FE0 809355B0 8FB900A4 */ lw $t9, 0x00A4($sp) -/* 08FE4 809355B4 86220198 */ lh $v0, 0x0198($s1) ## 00000198 -/* 08FE8 809355B8 28410072 */ slti $at, $v0, 0x0072 -/* 08FEC 809355BC 10200053 */ beq $at, $zero, .L8093570C -/* 08FF0 809355C0 28410015 */ slti $at, $v0, 0x0015 -/* 08FF4 809355C4 14200051 */ bne $at, $zero, .L8093570C -/* 08FF8 809355C8 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 08FFC 809355CC 0C024F61 */ jal func_80093D84 -/* 09000 809355D0 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 09004 809355D4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 09008 809355D8 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 0900C 809355DC 241912FF */ addiu $t9, $zero, 0x12FF ## $t9 = 000012FF -/* 09010 809355E0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 09014 809355E4 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 09018 809355E8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0901C 809355EC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 09020 809355F0 862C0198 */ lh $t4, 0x0198($s1) ## 00000198 -/* 09024 809355F4 24180388 */ addiu $t8, $zero, 0x0388 ## $t8 = 00000388 -/* 09028 809355F8 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 -/* 0902C 809355FC 000C40C0 */ sll $t0, $t4, 3 -/* 09030 80935600 03081023 */ subu $v0, $t8, $t0 -/* 09034 80935604 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 09038 80935608 44810000 */ mtc1 $at, $f0 ## $f0 = 450.00 -/* 0903C 8093560C 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 09040 80935610 46805420 */ cvt.s.w $f16, $f10 -/* 09044 80935614 44814000 */ mtc1 $at, $f8 ## $f8 = 35.00 -/* 09048 80935618 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 -/* 0904C 8093561C 44819000 */ mtc1 $at, $f18 ## $f18 = -250.00 -/* 09050 80935620 3C01433E */ lui $at, 0x433E ## $at = 433E0000 -/* 09054 80935624 44813000 */ mtc1 $at, $f6 ## $f6 = 190.00 -/* 09058 80935628 46128100 */ add.s $f4, $f16, $f18 -/* 0905C 8093562C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 09060 80935630 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFB4 -/* 09064 80935634 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFA8 -/* 09068 80935638 4604003C */ c.lt.s $f0, $f4 -/* 0906C 8093563C E7A40058 */ swc1 $f4, 0x0058($sp) -/* 09070 80935640 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 09074 80935644 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 09078 80935648 45020003 */ bc1fl .L80935658 -/* 0907C 8093564C 8FA600A4 */ lw $a2, 0x00A4($sp) -/* 09080 80935650 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 09084 80935654 8FA600A4 */ lw $a2, 0x00A4($sp) -.L80935658: -/* 09088 80935658 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0908C 8093565C 0C0347BD */ jal Matrix_MultVec3fExt -/* 09090 80935660 00C13021 */ addu $a2, $a2, $at -/* 09094 80935664 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 09098 80935668 C7AA0048 */ lwc1 $f10, 0x0048($sp) -/* 0909C 8093566C C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 090A0 80935670 C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 090A4 80935674 460A4300 */ add.s $f12, $f8, $f10 -/* 090A8 80935678 C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 -/* 090AC 8093567C C7B2004C */ lwc1 $f18, 0x004C($sp) -/* 090B0 80935680 46043200 */ add.s $f8, $f6, $f4 -/* 090B4 80935684 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 090B8 80935688 46128380 */ add.s $f14, $f16, $f18 -/* 090BC 8093568C 44064000 */ mfc1 $a2, $f8 -/* 090C0 80935690 0C034261 */ jal Matrix_Translate -/* 090C4 80935694 00000000 */ nop -/* 090C8 80935698 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 090CC 8093569C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 090D0 809356A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 090D4 809356A4 44066000 */ mfc1 $a2, $f12 -/* 090D8 809356A8 0C0342A3 */ jal Matrix_Scale -/* 090DC 809356AC 46006386 */ mov.s $f14, $f12 -/* 090E0 809356B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 090E4 809356B4 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 090E8 809356B8 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 090EC 809356BC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 090F0 809356C0 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 090F4 809356C4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 090F8 809356C8 8FAD00A4 */ lw $t5, 0x00A4($sp) -/* 090FC 809356CC 3C058093 */ lui $a1, %hi(D_80937920) ## $a1 = 80930000 -/* 09100 809356D0 24A57920 */ addiu $a1, $a1, %lo(D_80937920) ## $a1 = 80937920 -/* 09104 809356D4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 09108 809356D8 24061B16 */ addiu $a2, $zero, 0x1B16 ## $a2 = 00001B16 -/* 0910C 809356DC 0C0346A2 */ jal Matrix_NewMtx -/* 09110 809356E0 AFA20040 */ sw $v0, 0x0040($sp) -/* 09114 809356E4 8FA30040 */ lw $v1, 0x0040($sp) -/* 09118 809356E8 3C0F8093 */ lui $t7, %hi(D_80936E08) ## $t7 = 80930000 -/* 0911C 809356EC 25EF6E08 */ addiu $t7, $t7, %lo(D_80936E08) ## $t7 = 80936E08 -/* 09120 809356F0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 09124 809356F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 09128 809356F8 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 0912C 809356FC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 09130 80935700 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 09134 80935704 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 09138 80935708 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -.L8093570C: -/* 0913C 8093570C 8FB900A4 */ lw $t9, 0x00A4($sp) -.L80935710: -/* 09140 80935710 3C068093 */ lui $a2, %hi(D_80937930) ## $a2 = 80930000 -/* 09144 80935714 24C67930 */ addiu $a2, $a2, %lo(D_80937930) ## $a2 = 80937930 -/* 09148 80935718 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 -/* 0914C 8093571C 24071B1D */ addiu $a3, $zero, 0x1B1D ## $a3 = 00001B1D -/* 09150 80935720 0C031AD5 */ jal Graph_CloseDisps -/* 09154 80935724 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 09158 80935728 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0915C 8093572C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 09160 80935730 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 09164 80935734 26250038 */ addiu $a1, $s1, 0x0038 ## $a1 = 00000038 -/* 09168 80935738 262603C8 */ addiu $a2, $s1, 0x03C8 ## $a2 = 000003C8 -/* 0916C 8093573C 0C029BBD */ jal SkinMatrix_Vec3fMtxFMultXYZ -/* 09170 80935740 00812021 */ addu $a0, $a0, $at -/* 09174 80935744 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 09178 80935748 0C24D8E7 */ jal func_8093639C -/* 0917C 8093574C 8FA500A4 */ lw $a1, 0x00A4($sp) -/* 09180 80935750 8FBF002C */ lw $ra, 0x002C($sp) -/* 09184 80935754 8FB00024 */ lw $s0, 0x0024($sp) -/* 09188 80935758 8FB10028 */ lw $s1, 0x0028($sp) -/* 0918C 8093575C 03E00008 */ jr $ra -/* 09190 80935760 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s deleted file mode 100644 index e91427584a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_80935764 -/* 09194 80935764 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 09198 80935768 AFB00018 */ sw $s0, 0x0018($sp) -/* 0919C 8093576C AFBF001C */ sw $ra, 0x001C($sp) -/* 091A0 80935770 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 091A4 80935774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 091A8 80935778 A08E0196 */ sb $t6, 0x0196($a0) ## 00000196 -/* 091AC 8093577C 0C01DE1C */ jal Math_SinS - ## sins? -/* 091B0 80935780 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 091B4 80935784 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 091B8 80935788 0C01DE0D */ jal Math_CosS - ## coss? -/* 091BC 8093578C E7A00024 */ swc1 $f0, 0x0024($sp) -/* 091C0 80935790 3C038093 */ lui $v1, %hi(D_809378C4) ## $v1 = 80930000 -/* 091C4 80935794 3C078093 */ lui $a3, %hi(D_809378E8) ## $a3 = 80930000 -/* 091C8 80935798 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 091CC 8093579C C7A20024 */ lwc1 $f2, 0x0024($sp) -/* 091D0 809357A0 24E778E8 */ addiu $a3, $a3, %lo(D_809378E8) ## $a3 = 809378E8 -/* 091D4 809357A4 246378C4 */ addiu $v1, $v1, %lo(D_809378C4) ## $v1 = 809378C4 -/* 091D8 809357A8 02001025 */ or $v0, $s0, $zero ## $v0 = 00000000 -/* 091DC 809357AC 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 -/* 091E0 809357B0 240500FE */ addiu $a1, $zero, 0x00FE ## $a1 = 000000FE -/* 091E4 809357B4 240405AA */ addiu $a0, $zero, 0x05AA ## $a0 = 000005AA -/* 091E8 809357B8 C4680008 */ lwc1 $f8, 0x0008($v1) ## 809378CC -/* 091EC 809357BC 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 809378D0 -/* 091F0 809357C0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 091F4 809357C4 46081402 */ mul.s $f16, $f2, $f8 -/* 091F8 809357C8 10670019 */ beq $v1, $a3, .L80935830 -/* 091FC 809357CC C46EFFF4 */ lwc1 $f14, -0x000C($v1) ## 809378C4 -.L809357D0: -/* 09200 809357D0 460E0282 */ mul.s $f10, $f0, $f14 -/* 09204 809357D4 46109200 */ add.s $f8, $f18, $f16 -/* 09208 809357D8 E44C0704 */ swc1 $f12, 0x0704($v0) ## 00000704 -/* 0920C 809357DC 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 809378DC -/* 09210 809357E0 24420028 */ addiu $v0, $v0, 0x0028 ## $v0 = 00000028 -/* 09214 809357E4 460A4280 */ add.s $f10, $f8, $f10 -/* 09218 809357E8 E44A06D8 */ swc1 $f10, 0x06D8($v0) ## 00000700 -/* 0921C 809357EC C46AFFF0 */ lwc1 $f10, -0x0010($v1) ## 809378CC -/* 09220 809357F0 C468FFE8 */ lwc1 $f8, -0x0018($v1) ## 809378C4 -/* 09224 809357F4 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 09228 809357F8 460A0282 */ mul.s $f10, $f0, $f10 -/* 0922C 809357FC A44406F6 */ sh $a0, 0x06F6($v0) ## 0000071E -/* 09230 80935800 A04506FC */ sb $a1, 0x06FC($v0) ## 00000724 -/* 09234 80935804 46081202 */ mul.s $f8, $f2, $f8 -/* 09238 80935808 A44606FA */ sh $a2, 0x06FA($v0) ## 00000722 -/* 0923C 8093580C 460A3280 */ add.s $f10, $f6, $f10 -/* 09240 80935810 46085201 */ sub.s $f8, $f10, $f8 -/* 09244 80935814 E44806E0 */ swc1 $f8, 0x06E0($v0) ## 00000708 -/* 09248 80935818 C468FFFC */ lwc1 $f8, -0x0004($v1) ## 809378D8 -/* 0924C 8093581C C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 09250 80935820 C46EFFF4 */ lwc1 $f14, -0x000C($v1) ## 809378D0 -/* 09254 80935824 46081402 */ mul.s $f16, $f2, $f8 -/* 09258 80935828 1467FFE9 */ bne $v1, $a3, .L809357D0 -/* 0925C 8093582C 00000000 */ nop -.L80935830: -/* 09260 80935830 460E0282 */ mul.s $f10, $f0, $f14 -/* 09264 80935834 46109200 */ add.s $f8, $f18, $f16 -/* 09268 80935838 E44C0704 */ swc1 $f12, 0x0704($v0) ## 0000072C -/* 0926C 8093583C 24420028 */ addiu $v0, $v0, 0x0028 ## $v0 = 00000050 -/* 09270 80935840 460A4280 */ add.s $f10, $f8, $f10 -/* 09274 80935844 E44A06D8 */ swc1 $f10, 0x06D8($v0) ## 00000728 -/* 09278 80935848 C46AFFFC */ lwc1 $f10, -0x0004($v1) ## 809378D8 -/* 0927C 8093584C C468FFF4 */ lwc1 $f8, -0x000C($v1) ## 809378D0 -/* 09280 80935850 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 09284 80935854 460A0282 */ mul.s $f10, $f0, $f10 -/* 09288 80935858 A44406F6 */ sh $a0, 0x06F6($v0) ## 00000746 -/* 0928C 8093585C A04506FC */ sb $a1, 0x06FC($v0) ## 0000074C -/* 09290 80935860 46081202 */ mul.s $f8, $f2, $f8 -/* 09294 80935864 A44606FA */ sh $a2, 0x06FA($v0) ## 0000074A -/* 09298 80935868 460A3280 */ add.s $f10, $f6, $f10 -/* 0929C 8093586C 46085201 */ sub.s $f8, $f10, $f8 -/* 092A0 80935870 E44806E0 */ swc1 $f8, 0x06E0($v0) ## 00000730 -/* 092A4 80935874 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 092A8 80935878 A60F079A */ sh $t7, 0x079A($s0) ## 0000079A -/* 092AC 8093587C 8FBF001C */ lw $ra, 0x001C($sp) -/* 092B0 80935880 8FB00018 */ lw $s0, 0x0018($sp) -/* 092B4 80935884 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 092B8 80935888 03E00008 */ jr $ra -/* 092BC 8093588C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s deleted file mode 100644 index 49985b6260..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80935890 -/* 092C0 80935890 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 092C4 80935894 AFBF0014 */ sw $ra, 0x0014($sp) -/* 092C8 80935898 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 092CC 8093589C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 092D0 809358A0 A08E0196 */ sb $t6, 0x0196($a0) ## 00000196 -/* 092D4 809358A4 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 092D8 809358A8 0C01DE0D */ jal Math_CosS - ## coss? -/* 092DC 809358AC AFA50018 */ sw $a1, 0x0018($sp) -/* 092E0 809358B0 8FA50018 */ lw $a1, 0x0018($sp) -/* 092E4 809358B4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 092E8 809358B8 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 092EC 809358BC 80AF0194 */ lb $t7, 0x0194($a1) ## 00000194 -/* 092F0 809358C0 C4B20024 */ lwc1 $f18, 0x0024($a1) ## 00000024 -/* 092F4 809358C4 46040182 */ mul.s $f6, $f0, $f4 -/* 092F8 809358C8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 092FC 809358CC 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 09300 809358D0 468042A0 */ cvt.s.w $f10, $f8 -/* 09304 809358D4 460A3402 */ mul.s $f16, $f6, $f10 -/* 09308 809358D8 46128100 */ add.s $f4, $f16, $f18 -/* 0930C 809358DC 0C01DE1C */ jal Math_SinS - ## sins? -/* 09310 809358E0 E4A40700 */ swc1 $f4, 0x0700($a1) ## 00000700 -/* 09314 809358E4 8FA50018 */ lw $a1, 0x0018($sp) -/* 09318 809358E8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0931C 809358EC 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 09320 809358F0 80B80194 */ lb $t8, 0x0194($a1) ## 00000194 -/* 09324 809358F4 C4A4002C */ lwc1 $f4, 0x002C($a1) ## 0000002C -/* 09328 809358F8 46080182 */ mul.s $f6, $f0, $f8 -/* 0932C 809358FC 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 09330 80935900 241908FC */ addiu $t9, $zero, 0x08FC ## $t9 = 000008FC -/* 09334 80935904 240800FE */ addiu $t0, $zero, 0x00FE ## $t0 = 000000FE -/* 09338 80935908 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 0933C 8093590C 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 09340 80935910 46805420 */ cvt.s.w $f16, $f10 -/* 09344 80935914 C4AA0028 */ lwc1 $f10, 0x0028($a1) ## 00000028 -/* 09348 80935918 A4B9071E */ sh $t9, 0x071E($a1) ## 0000071E -/* 0934C 8093591C A0A80724 */ sb $t0, 0x0724($a1) ## 00000724 -/* 09350 80935920 A4A90722 */ sh $t1, 0x0722($a1) ## 00000722 -/* 09354 80935924 A4AA074A */ sh $t2, 0x074A($a1) ## 0000074A -/* 09358 80935928 46103482 */ mul.s $f18, $f6, $f16 -/* 0935C 8093592C E4AA0704 */ swc1 $f10, 0x0704($a1) ## 00000704 -/* 09360 80935930 46122201 */ sub.s $f8, $f4, $f18 -/* 09364 80935934 E4A80708 */ swc1 $f8, 0x0708($a1) ## 00000708 -/* 09368 80935938 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0936C 8093593C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09370 80935940 03E00008 */ jr $ra -/* 09374 80935944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s deleted file mode 100644 index cdb9ceb42f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80935948 -/* 09378 80935948 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0937C 8093594C AFBF0034 */ sw $ra, 0x0034($sp) -/* 09380 80935950 AFB40028 */ sw $s4, 0x0028($sp) -/* 09384 80935954 AFB30024 */ sw $s3, 0x0024($sp) -/* 09388 80935958 AFB00018 */ sw $s0, 0x0018($sp) -/* 0938C 8093595C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09390 80935960 AFB60030 */ sw $s6, 0x0030($sp) -/* 09394 80935964 AFB5002C */ sw $s5, 0x002C($sp) -/* 09398 80935968 AFB20020 */ sw $s2, 0x0020($sp) -/* 0939C 8093596C AFB1001C */ sw $s1, 0x001C($sp) -/* 093A0 80935970 24130078 */ addiu $s3, $zero, 0x0078 ## $s3 = 00000078 -/* 093A4 80935974 241400FA */ addiu $s4, $zero, 0x00FA ## $s4 = 000000FA -/* 093A8 80935978 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 093AC 8093597C 24053964 */ addiu $a1, $zero, 0x3964 ## $a1 = 00003964 -/* 093B0 80935980 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 093B4 80935984 A20E0196 */ sb $t6, 0x0196($s0) ## 00000196 -/* 093B8 80935988 26110700 */ addiu $s1, $s0, 0x0700 ## $s1 = 00000700 -/* 093BC 8093598C 26150024 */ addiu $s5, $s0, 0x0024 ## $s5 = 00000024 -/* 093C0 80935990 24120012 */ addiu $s2, $zero, 0x0012 ## $s2 = 00000012 -/* 093C4 80935994 24160018 */ addiu $s6, $zero, 0x0018 ## $s6 = 00000018 -.L80935998: -/* 093C8 80935998 02208025 */ or $s0, $s1, $zero ## $s0 = 00000700 -/* 093CC 8093599C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000700 -/* 093D0 809359A0 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 093D4 809359A4 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000024 -/* 093D8 809359A8 A6120020 */ sh $s2, 0x0020($s0) ## 00000720 -/* 093DC 809359AC 860F0020 */ lh $t7, 0x0020($s0) ## 00000720 -/* 093E0 809359B0 26520002 */ addiu $s2, $s2, 0x0002 ## $s2 = 00000014 -/* 093E4 809359B4 A613001E */ sh $s3, 0x001E($s0) ## 0000071E -/* 093E8 809359B8 028F001A */ div $zero, $s4, $t7 -/* 093EC 809359BC 0000C012 */ mflo $t8 -/* 093F0 809359C0 26310028 */ addiu $s1, $s1, 0x0028 ## $s1 = 00000728 -/* 093F4 809359C4 15E00002 */ bne $t7, $zero, .L809359D0 -/* 093F8 809359C8 00000000 */ nop -/* 093FC 809359CC 0007000D */ break 7 -.L809359D0: -/* 09400 809359D0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 09404 809359D4 15E10004 */ bne $t7, $at, .L809359E8 -/* 09408 809359D8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0940C 809359DC 16810002 */ bne $s4, $at, .L809359E8 -/* 09410 809359E0 00000000 */ nop -/* 09414 809359E4 0006000D */ break 6 -.L809359E8: -/* 09418 809359E8 A2180024 */ sb $t8, 0x0024($s0) ## 00000724 -/* 0941C 809359EC 2673FFCE */ addiu $s3, $s3, 0xFFCE ## $s3 = 00000046 -/* 09420 809359F0 1656FFE9 */ bne $s2, $s6, .L80935998 -/* 09424 809359F4 2694FFE7 */ addiu $s4, $s4, 0xFFE7 ## $s4 = 000000E1 -/* 09428 809359F8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0942C 809359FC 8FB00018 */ lw $s0, 0x0018($sp) -/* 09430 80935A00 8FB1001C */ lw $s1, 0x001C($sp) -/* 09434 80935A04 8FB20020 */ lw $s2, 0x0020($sp) -/* 09438 80935A08 8FB30024 */ lw $s3, 0x0024($sp) -/* 0943C 80935A0C 8FB40028 */ lw $s4, 0x0028($sp) -/* 09440 80935A10 8FB5002C */ lw $s5, 0x002C($sp) -/* 09444 80935A14 8FB60030 */ lw $s6, 0x0030($sp) -/* 09448 80935A18 03E00008 */ jr $ra -/* 0944C 80935A1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s deleted file mode 100644 index d19307c25a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s +++ /dev/null @@ -1,202 +0,0 @@ -.late_rodata -glabel D_80937A5C - .word 0x3D75C28F -glabel D_80937A60 - .float 0.12 - -glabel D_80937A64 - .word 0x3D75C28F -glabel D_80937A68 - .float 0.12 - -.text -glabel func_80935A20 -/* 09450 80935A20 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 09454 80935A24 AFB10018 */ sw $s1, 0x0018($sp) -/* 09458 80935A28 28A1000B */ slti $at, $a1, 0x000B -/* 0945C 80935A2C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 09460 80935A30 AFBF001C */ sw $ra, 0x001C($sp) -/* 09464 80935A34 10200025 */ beq $at, $zero, .L80935ACC -/* 09468 80935A38 AFB00014 */ sw $s0, 0x0014($sp) -/* 0946C 80935A3C 8C8E03F0 */ lw $t6, 0x03F0($a0) ## 000003F0 -/* 09470 80935A40 00057980 */ sll $t7, $a1, 6 -/* 09474 80935A44 0005C080 */ sll $t8, $a1, 2 -/* 09478 80935A48 01CF1821 */ addu $v1, $t6, $t7 -/* 0947C 80935A4C 84790030 */ lh $t9, 0x0030($v1) ## 00000030 -/* 09480 80935A50 0305C021 */ addu $t8, $t8, $a1 -/* 09484 80935A54 0018C0C0 */ sll $t8, $t8, 3 -/* 09488 80935A58 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0948C 80935A5C 00988021 */ addu $s0, $a0, $t8 -/* 09490 80935A60 24630030 */ addiu $v1, $v1, 0x0030 ## $v1 = 00000030 -/* 09494 80935A64 468021A0 */ cvt.s.w $f6, $f4 -/* 09498 80935A68 26100700 */ addiu $s0, $s0, 0x0700 ## $s0 = 00000700 -/* 0949C 80935A6C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 094A0 80935A70 E6060000 */ swc1 $f6, 0x0000($s0) ## 00000700 -/* 094A4 80935A74 84680002 */ lh $t0, 0x0002($v1) ## 00000032 -/* 094A8 80935A78 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 094AC 80935A7C 00000000 */ nop -/* 094B0 80935A80 468042A0 */ cvt.s.w $f10, $f8 -/* 094B4 80935A84 E60A0004 */ swc1 $f10, 0x0004($s0) ## 00000704 -/* 094B8 80935A88 84690004 */ lh $t1, 0x0004($v1) ## 00000034 -/* 094BC 80935A8C 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 -/* 094C0 80935A90 00000000 */ nop -/* 094C4 80935A94 468084A0 */ cvt.s.w $f18, $f16 -/* 094C8 80935A98 14A0003E */ bne $a1, $zero, .L80935B94 -/* 094CC 80935A9C E6120008 */ swc1 $f18, 0x0008($s0) ## 00000708 -/* 094D0 80935AA0 44810000 */ mtc1 $at, $f0 ## $f0 = 25.00 -/* 094D4 80935AA4 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000700 -/* 094D8 80935AA8 C6080004 */ lwc1 $f8, 0x0004($s0) ## 00000704 -/* 094DC 80935AAC C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000708 -/* 094E0 80935AB0 46002181 */ sub.s $f6, $f4, $f0 -/* 094E4 80935AB4 46004281 */ sub.s $f10, $f8, $f0 -/* 094E8 80935AB8 E6060000 */ swc1 $f6, 0x0000($s0) ## 00000700 -/* 094EC 80935ABC 46008481 */ sub.s $f18, $f16, $f0 -/* 094F0 80935AC0 E60A0004 */ swc1 $f10, 0x0004($s0) ## 00000704 -/* 094F4 80935AC4 10000033 */ beq $zero, $zero, .L80935B94 -/* 094F8 80935AC8 E6120008 */ swc1 $f18, 0x0008($s0) ## 00000708 -.L80935ACC: -/* 094FC 80935ACC 8E2303F0 */ lw $v1, 0x03F0($s1) ## 000003F0 -/* 09500 80935AD0 24A4FFF5 */ addiu $a0, $a1, 0xFFF5 ## $a0 = FFFFFFF5 -/* 09504 80935AD4 308A0001 */ andi $t2, $a0, 0x0001 ## $t2 = 00000001 -/* 09508 80935AD8 11400003 */ beq $t2, $zero, .L80935AE8 -/* 0950C 80935ADC 24630030 */ addiu $v1, $v1, 0x0030 ## $v1 = 00000060 -/* 09510 80935AE0 10000002 */ beq $zero, $zero, .L80935AEC -/* 09514 80935AE4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80935AE8: -/* 09518 80935AE8 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80935AEC: -/* 0951C 80935AEC 44822000 */ mtc1 $v0, $f4 ## $f4 = NaN -/* 09520 80935AF0 846C0000 */ lh $t4, 0x0000($v1) ## 00000060 -/* 09524 80935AF4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 09528 80935AF8 468021A0 */ cvt.s.w $f6, $f4 -/* 0952C 80935AFC 44810000 */ mtc1 $at, $f0 ## $f0 = 25.00 -/* 09530 80935B00 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 09534 80935B04 00055880 */ sll $t3, $a1, 2 -/* 09538 80935B08 01655821 */ addu $t3, $t3, $a1 -/* 0953C 80935B0C 46805420 */ cvt.s.w $f16, $f10 -/* 09540 80935B10 46003202 */ mul.s $f8, $f6, $f0 -/* 09544 80935B14 000B58C0 */ sll $t3, $t3, 3 -/* 09548 80935B18 022B8021 */ addu $s0, $s1, $t3 -/* 0954C 80935B1C 308D0002 */ andi $t5, $a0, 0x0002 ## $t5 = 00000000 -/* 09550 80935B20 26100700 */ addiu $s0, $s0, 0x0700 ## $s0 = 00000E00 -/* 09554 80935B24 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 09558 80935B28 46104480 */ add.s $f18, $f8, $f16 -/* 0955C 80935B2C 11A00003 */ beq $t5, $zero, .L80935B3C -/* 09560 80935B30 E6120000 */ swc1 $f18, 0x0000($s0) ## 00000E00 -/* 09564 80935B34 10000001 */ beq $zero, $zero, .L80935B3C -/* 09568 80935B38 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80935B3C: -/* 0956C 80935B3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 09570 80935B40 846E0002 */ lh $t6, 0x0002($v1) ## 00000062 -/* 09574 80935B44 308F0004 */ andi $t7, $a0, 0x0004 ## $t7 = 00000004 -/* 09578 80935B48 468021A0 */ cvt.s.w $f6, $f4 -/* 0957C 80935B4C 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 09580 80935B50 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 09584 80935B54 46804420 */ cvt.s.w $f16, $f8 -/* 09588 80935B58 46003282 */ mul.s $f10, $f6, $f0 -/* 0958C 80935B5C 46105480 */ add.s $f18, $f10, $f16 -/* 09590 80935B60 11E00003 */ beq $t7, $zero, .L80935B70 -/* 09594 80935B64 E6120004 */ swc1 $f18, 0x0004($s0) ## 00000E04 -/* 09598 80935B68 10000001 */ beq $zero, $zero, .L80935B70 -/* 0959C 80935B6C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80935B70: -/* 095A0 80935B70 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 095A4 80935B74 84780004 */ lh $t8, 0x0004($v1) ## 00000064 -/* 095A8 80935B78 468021A0 */ cvt.s.w $f6, $f4 -/* 095AC 80935B7C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 095B0 80935B80 00000000 */ nop -/* 095B4 80935B84 46805420 */ cvt.s.w $f16, $f10 -/* 095B8 80935B88 46003202 */ mul.s $f8, $f6, $f0 -/* 095BC 80935B8C 46104480 */ add.s $f18, $f8, $f16 -/* 095C0 80935B90 E6120008 */ swc1 $f18, 0x0008($s0) ## 00000E08 -.L80935B94: -/* 095C4 80935B94 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000E00 -/* 095C8 80935B98 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 095CC 80935B9C C6080004 */ lwc1 $f8, 0x0004($s0) ## 00000E04 -/* 095D0 80935BA0 46062281 */ sub.s $f10, $f4, $f6 -/* 095D4 80935BA4 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000E08 -/* 095D8 80935BA8 E60A0000 */ swc1 $f10, 0x0000($s0) ## 00000E00 -/* 095DC 80935BAC C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 -/* 095E0 80935BB0 46104481 */ sub.s $f18, $f8, $f16 -/* 095E4 80935BB4 E6120004 */ swc1 $f18, 0x0004($s0) ## 00000E04 -/* 095E8 80935BB8 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 095EC 80935BBC A6000022 */ sh $zero, 0x0022($s0) ## 00000E22 -/* 095F0 80935BC0 46062281 */ sub.s $f10, $f4, $f6 -/* 095F4 80935BC4 E60A0008 */ swc1 $f10, 0x0008($s0) ## 00000E08 -/* 095F8 80935BC8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 095FC 80935BCC AFA50024 */ sw $a1, 0x0024($sp) -/* 09600 80935BD0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 09604 80935BD4 44814000 */ mtc1 $at, $f8 ## $f8 = 65536.00 -/* 09608 80935BD8 00000000 */ nop -/* 0960C 80935BDC 46080402 */ mul.s $f16, $f0, $f8 -/* 09610 80935BE0 4600848D */ trunc.w.s $f18, $f16 -/* 09614 80935BE4 44089000 */ mfc1 $t0, $f18 -/* 09618 80935BE8 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0961C 80935BEC A6080018 */ sh $t0, 0x0018($s0) ## 00000E18 -/* 09620 80935BF0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 09624 80935BF4 44812000 */ mtc1 $at, $f4 ## $f4 = 65536.00 -/* 09628 80935BF8 00000000 */ nop -/* 0962C 80935BFC 46040182 */ mul.s $f6, $f0, $f4 -/* 09630 80935C00 4600328D */ trunc.w.s $f10, $f6 -/* 09634 80935C04 440A5000 */ mfc1 $t2, $f10 -/* 09638 80935C08 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0963C 80935C0C A60A001A */ sh $t2, 0x001A($s0) ## 00000E1A -/* 09640 80935C10 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 09644 80935C14 44814000 */ mtc1 $at, $f8 ## $f8 = 65536.00 -/* 09648 80935C18 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 -/* 0964C 80935C1C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 09650 80935C20 46080402 */ mul.s $f16, $f0, $f8 -/* 09654 80935C24 A20D0024 */ sb $t5, 0x0024($s0) ## 00000E24 -/* 09658 80935C28 A60E0020 */ sh $t6, 0x0020($s0) ## 00000E20 -/* 0965C 80935C2C 4600848D */ trunc.w.s $f18, $f16 -/* 09660 80935C30 440C9000 */ mfc1 $t4, $f18 -/* 09664 80935C34 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09668 80935C38 A60C001C */ sh $t4, 0x001C($s0) ## 00000E1C -/* 0966C 80935C3C 3C018093 */ lui $at, %hi(D_80937A5C) ## $at = 80930000 -/* 09670 80935C40 C4247A5C */ lwc1 $f4, %lo(D_80937A5C)($at) -/* 09674 80935C44 3C018093 */ lui $at, %hi(D_80937A60) ## $at = 80930000 -/* 09678 80935C48 C42A7A60 */ lwc1 $f10, %lo(D_80937A60)($at) -/* 0967C 80935C4C 46040182 */ mul.s $f6, $f0, $f4 -/* 09680 80935C50 C6100000 */ lwc1 $f16, 0x0000($s0) ## 00000E00 -/* 09684 80935C54 460A3200 */ add.s $f8, $f6, $f10 -/* 09688 80935C58 46104482 */ mul.s $f18, $f8, $f16 -/* 0968C 80935C5C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09690 80935C60 E612000C */ swc1 $f18, 0x000C($s0) ## 00000E0C -/* 09694 80935C64 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 09698 80935C68 44812000 */ mtc1 $at, $f4 ## $f4 = 15.00 -/* 0969C 80935C6C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 096A0 80935C70 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 096A4 80935C74 46040182 */ mul.s $f6, $f0, $f4 -/* 096A8 80935C78 460A3200 */ add.s $f8, $f6, $f10 -/* 096AC 80935C7C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 096B0 80935C80 E6080010 */ swc1 $f8, 0x0010($s0) ## 00000E10 -/* 096B4 80935C84 3C018093 */ lui $at, %hi(D_80937A64) ## $at = 80930000 -/* 096B8 80935C88 C4307A64 */ lwc1 $f16, %lo(D_80937A64)($at) -/* 096BC 80935C8C 3C018093 */ lui $at, %hi(D_80937A68) ## $at = 80930000 -/* 096C0 80935C90 C4247A68 */ lwc1 $f4, %lo(D_80937A68)($at) -/* 096C4 80935C94 46100482 */ mul.s $f18, $f0, $f16 -/* 096C8 80935C98 C60A0008 */ lwc1 $f10, 0x0008($s0) ## 00000E08 -/* 096CC 80935C9C 8FA50024 */ lw $a1, 0x0024($sp) -/* 096D0 80935CA0 240F0FA0 */ addiu $t7, $zero, 0x0FA0 ## $t7 = 00000FA0 -/* 096D4 80935CA4 A60F001E */ sh $t7, 0x001E($s0) ## 00000E1E -/* 096D8 80935CA8 30B80001 */ andi $t8, $a1, 0x0001 ## $t8 = 00000000 -/* 096DC 80935CAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 096E0 80935CB0 46049180 */ add.s $f6, $f18, $f4 -/* 096E4 80935CB4 460A3202 */ mul.s $f8, $f6, $f10 -/* 096E8 80935CB8 17000003 */ bne $t8, $zero, .L80935CC8 -/* 096EC 80935CBC E6080014 */ swc1 $f8, 0x0014($s0) ## 00000E14 -/* 096F0 80935CC0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 096F4 80935CC4 24050874 */ addiu $a1, $zero, 0x0874 ## $a1 = 00000874 -.L80935CC8: -/* 096F8 80935CC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 096FC 80935CCC 8FB00014 */ lw $s0, 0x0014($sp) -/* 09700 80935CD0 8FB10018 */ lw $s1, 0x0018($sp) -/* 09704 80935CD4 03E00008 */ jr $ra -/* 09708 80935CD8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s deleted file mode 100644 index 21f01a38c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s +++ /dev/null @@ -1,166 +0,0 @@ -glabel func_80935CDC -/* 0970C 80935CDC 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 09710 80935CE0 AFB20050 */ sw $s2, 0x0050($sp) -/* 09714 80935CE4 AFBF0064 */ sw $ra, 0x0064($sp) -/* 09718 80935CE8 AFB60060 */ sw $s6, 0x0060($sp) -/* 0971C 80935CEC AFB5005C */ sw $s5, 0x005C($sp) -/* 09720 80935CF0 AFB40058 */ sw $s4, 0x0058($sp) -/* 09724 80935CF4 AFB30054 */ sw $s3, 0x0054($sp) -/* 09728 80935CF8 AFB1004C */ sw $s1, 0x004C($sp) -/* 0972C 80935CFC AFB00048 */ sw $s0, 0x0048($sp) -/* 09730 80935D00 F7BE0040 */ sdc1 $f30, 0x0040($sp) -/* 09734 80935D04 F7BC0038 */ sdc1 $f28, 0x0038($sp) -/* 09738 80935D08 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 0973C 80935D0C F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 09740 80935D10 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 09744 80935D14 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 09748 80935D18 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0974C 80935D1C 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 09750 80935D20 A08E0196 */ sb $t6, 0x0196($a0) ## 00000196 -/* 09754 80935D24 0C01DE0D */ jal Math_CosS - ## coss? -/* 09758 80935D28 848400B4 */ lh $a0, 0x00B4($a0) ## 000000B4 -/* 0975C 80935D2C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 09760 80935D30 4481B000 */ mtc1 $at, $f22 ## $f22 = 50.00 -/* 09764 80935D34 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 -/* 09768 80935D38 46160502 */ mul.s $f20, $f0, $f22 -/* 0976C 80935D3C 0C01DE0D */ jal Math_CosS - ## coss? -/* 09770 80935D40 00000000 */ nop -/* 09774 80935D44 46140102 */ mul.s $f4, $f0, $f20 -/* 09778 80935D48 C6460024 */ lwc1 $f6, 0x0024($s2) ## 00000024 -/* 0977C 80935D4C 46062200 */ add.s $f8, $f4, $f6 -/* 09780 80935D50 E7A80078 */ swc1 $f8, 0x0078($sp) -/* 09784 80935D54 0C01DE1C */ jal Math_SinS - ## sins? -/* 09788 80935D58 864400B4 */ lh $a0, 0x00B4($s2) ## 000000B4 -/* 0978C 80935D5C 46160282 */ mul.s $f10, $f0, $f22 -/* 09790 80935D60 C6500028 */ lwc1 $f16, 0x0028($s2) ## 00000028 -/* 09794 80935D64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 09798 80935D68 4481F000 */ mtc1 $at, $f30 ## $f30 = 10.00 -/* 0979C 80935D6C 46105480 */ add.s $f18, $f10, $f16 -/* 097A0 80935D70 461E9101 */ sub.s $f4, $f18, $f30 -/* 097A4 80935D74 E7A4007C */ swc1 $f4, 0x007C($sp) -/* 097A8 80935D78 0C01DE1C */ jal Math_SinS - ## sins? -/* 097AC 80935D7C 864400B6 */ lh $a0, 0x00B6($s2) ## 000000B6 -/* 097B0 80935D80 46140182 */ mul.s $f6, $f0, $f20 -/* 097B4 80935D84 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 097B8 80935D88 4481E000 */ mtc1 $at, $f28 ## $f28 = 400.00 -/* 097BC 80935D8C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 097C0 80935D90 C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C -/* 097C4 80935D94 4481D000 */ mtc1 $at, $f26 ## $f26 = 200.00 -/* 097C8 80935D98 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 097CC 80935D9C 4481C000 */ mtc1 $at, $f24 ## $f24 = 3.00 -/* 097D0 80935DA0 46083280 */ add.s $f10, $f6, $f8 -/* 097D4 80935DA4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 097D8 80935DA8 4481B000 */ mtc1 $at, $f22 ## $f22 = 20.00 -/* 097DC 80935DAC 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 097E0 80935DB0 4481A000 */ mtc1 $at, $f20 ## $f20 = 65536.00 -/* 097E4 80935DB4 E7AA0080 */ swc1 $f10, 0x0080($sp) -/* 097E8 80935DB8 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 097EC 80935DBC 26500700 */ addiu $s0, $s2, 0x0700 ## $s0 = 00000700 -/* 097F0 80935DC0 241602D0 */ addiu $s6, $zero, 0x02D0 ## $s6 = 000002D0 -/* 097F4 80935DC4 24150078 */ addiu $s5, $zero, 0x0078 ## $s5 = 00000078 -/* 097F8 80935DC8 27B40078 */ addiu $s4, $sp, 0x0078 ## $s4 = FFFFFFF0 -/* 097FC 80935DCC 24130001 */ addiu $s3, $zero, 0x0001 ## $s3 = 00000001 -.L80935DD0: -/* 09800 80935DD0 02009025 */ or $s2, $s0, $zero ## $s2 = 00000700 -/* 09804 80935DD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000700 -/* 09808 80935DD8 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 0980C 80935DDC 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF0 -/* 09810 80935DE0 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09814 80935DE4 A6130022 */ sh $s3, 0x0022($s0) ## 00000722 -/* 09818 80935DE8 46140402 */ mul.s $f16, $f0, $f20 -/* 0981C 80935DEC 4600848D */ trunc.w.s $f18, $f16 -/* 09820 80935DF0 44189000 */ mfc1 $t8, $f18 -/* 09824 80935DF4 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09828 80935DF8 A6180018 */ sh $t8, 0x0018($s0) ## 00000718 -/* 0982C 80935DFC 46140102 */ mul.s $f4, $f0, $f20 -/* 09830 80935E00 4600218D */ trunc.w.s $f6, $f4 -/* 09834 80935E04 44083000 */ mfc1 $t0, $f6 -/* 09838 80935E08 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 0983C 80935E0C A608001A */ sh $t0, 0x001A($s0) ## 0000071A -/* 09840 80935E10 46140202 */ mul.s $f8, $f0, $f20 -/* 09844 80935E14 A2150024 */ sb $s5, 0x0024($s0) ## 00000724 -/* 09848 80935E18 A6130020 */ sh $s3, 0x0020($s0) ## 00000720 -/* 0984C 80935E1C 4600B306 */ mov.s $f12, $f22 -/* 09850 80935E20 4600428D */ trunc.w.s $f10, $f8 -/* 09854 80935E24 440A5000 */ mfc1 $t2, $f10 -/* 09858 80935E28 0C00CFC8 */ jal Rand_CenteredFloat - -/* 0985C 80935E2C A60A001C */ sh $t2, 0x001C($s0) ## 0000071C -/* 09860 80935E30 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09864 80935E34 E600000C */ swc1 $f0, 0x000C($s0) ## 0000070C -/* 09868 80935E38 461E0402 */ mul.s $f16, $f0, $f30 -/* 0986C 80935E3C 4600B306 */ mov.s $f12, $f22 -/* 09870 80935E40 46188480 */ add.s $f18, $f16, $f24 -/* 09874 80935E44 0C00CFC8 */ jal Rand_CenteredFloat - -/* 09878 80935E48 E6120010 */ swc1 $f18, 0x0010($s0) ## 00000710 -/* 0987C 80935E4C 0C03F66B */ jal Rand_ZeroOne - ## Rand.Next() float -/* 09880 80935E50 E6000014 */ swc1 $f0, 0x0014($s0) ## 00000714 -/* 09884 80935E54 461A0102 */ mul.s $f4, $f0, $f26 -/* 09888 80935E58 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 0988C 80935E5C 26310028 */ addiu $s1, $s1, 0x0028 ## $s1 = 00000028 -/* 09890 80935E60 26100028 */ addiu $s0, $s0, 0x0028 ## $s0 = 00000728 -/* 09894 80935E64 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 09898 80935E68 461C2180 */ add.s $f6, $f4, $f28 -/* 0989C 80935E6C 444BF800 */ cfc1 $t3, $31 -/* 098A0 80935E70 44CCF800 */ ctc1 $t4, $31 -/* 098A4 80935E74 00000000 */ nop -/* 098A8 80935E78 46003224 */ cvt.w.s $f8, $f6 -/* 098AC 80935E7C 444CF800 */ cfc1 $t4, $31 -/* 098B0 80935E80 00000000 */ nop -/* 098B4 80935E84 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 098B8 80935E88 51800013 */ beql $t4, $zero, .L80935ED8 -/* 098BC 80935E8C 440C4000 */ mfc1 $t4, $f8 -/* 098C0 80935E90 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 098C4 80935E94 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 098C8 80935E98 46083201 */ sub.s $f8, $f6, $f8 -/* 098CC 80935E9C 44CCF800 */ ctc1 $t4, $31 -/* 098D0 80935EA0 00000000 */ nop -/* 098D4 80935EA4 46004224 */ cvt.w.s $f8, $f8 -/* 098D8 80935EA8 444CF800 */ cfc1 $t4, $31 -/* 098DC 80935EAC 00000000 */ nop -/* 098E0 80935EB0 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 098E4 80935EB4 15800005 */ bne $t4, $zero, .L80935ECC -/* 098E8 80935EB8 00000000 */ nop -/* 098EC 80935EBC 440C4000 */ mfc1 $t4, $f8 -/* 098F0 80935EC0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 098F4 80935EC4 10000007 */ beq $zero, $zero, .L80935EE4 -/* 098F8 80935EC8 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 -.L80935ECC: -/* 098FC 80935ECC 10000005 */ beq $zero, $zero, .L80935EE4 -/* 09900 80935ED0 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 09904 80935ED4 440C4000 */ mfc1 $t4, $f8 -.L80935ED8: -/* 09908 80935ED8 00000000 */ nop -/* 0990C 80935EDC 0580FFFB */ bltz $t4, .L80935ECC -/* 09910 80935EE0 00000000 */ nop -.L80935EE4: -/* 09914 80935EE4 44CBF800 */ ctc1 $t3, $31 -/* 09918 80935EE8 1636FFB9 */ bne $s1, $s6, .L80935DD0 -/* 0991C 80935EEC A64C001E */ sh $t4, 0x001E($s2) ## 0000071E -/* 09920 80935EF0 8FBF0064 */ lw $ra, 0x0064($sp) -/* 09924 80935EF4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 09928 80935EF8 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 0992C 80935EFC D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 09930 80935F00 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 09934 80935F04 D7BC0038 */ ldc1 $f28, 0x0038($sp) -/* 09938 80935F08 D7BE0040 */ ldc1 $f30, 0x0040($sp) -/* 0993C 80935F0C 8FB00048 */ lw $s0, 0x0048($sp) -/* 09940 80935F10 8FB1004C */ lw $s1, 0x004C($sp) -/* 09944 80935F14 8FB20050 */ lw $s2, 0x0050($sp) -/* 09948 80935F18 8FB30054 */ lw $s3, 0x0054($sp) -/* 0994C 80935F1C 8FB40058 */ lw $s4, 0x0058($sp) -/* 09950 80935F20 8FB5005C */ lw $s5, 0x005C($sp) -/* 09954 80935F24 8FB60060 */ lw $s6, 0x0060($sp) -/* 09958 80935F28 03E00008 */ jr $ra -/* 0995C 80935F2C 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s deleted file mode 100644 index 2cdb1c5848..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_80935F30 -/* 09960 80935F30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 09964 80935F34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09968 80935F38 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0996C 80935F3C A48E0722 */ sh $t6, 0x0722($a0) ## 00000722 -/* 09970 80935F40 AFA40018 */ sw $a0, 0x0018($sp) -/* 09974 80935F44 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 09978 80935F48 24050875 */ addiu $a1, $zero, 0x0875 ## $a1 = 00000875 -/* 0997C 80935F4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 09980 80935F50 24050050 */ addiu $a1, $zero, 0x0050 ## $a1 = 00000050 -/* 09984 80935F54 240602D0 */ addiu $a2, $zero, 0x02D0 ## $a2 = 000002D0 -/* 09988 80935F58 848F0720 */ lh $t7, 0x0720($a0) ## 00000720 -/* 0998C 80935F5C 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 -/* 09990 80935F60 24620700 */ addiu $v0, $v1, 0x0700 ## $v0 = 00000700 -/* 09994 80935F64 51E0000E */ beql $t7, $zero, .L80935FA0 -/* 09998 80935F68 84780748 */ lh $t8, 0x0748($v1) ## 00000748 -/* 0999C 80935F6C C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000700 -/* 099A0 80935F70 C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 099A4 80935F74 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000704 -/* 099A8 80935F78 46062200 */ add.s $f8, $f4, $f6 -/* 099AC 80935F7C C4440008 */ lwc1 $f4, 0x0008($v0) ## 00000708 -/* 099B0 80935F80 E4480000 */ swc1 $f8, 0x0000($v0) ## 00000700 -/* 099B4 80935F84 C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 099B8 80935F88 46105480 */ add.s $f18, $f10, $f16 -/* 099BC 80935F8C E4520004 */ swc1 $f18, 0x0004($v0) ## 00000704 -/* 099C0 80935F90 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 099C4 80935F94 46062200 */ add.s $f8, $f4, $f6 -/* 099C8 80935F98 E4480008 */ swc1 $f8, 0x0008($v0) ## 00000708 -/* 099CC 80935F9C 84780748 */ lh $t8, 0x0748($v1) ## 00000748 -.L80935FA0: -/* 099D0 80935FA0 24620728 */ addiu $v0, $v1, 0x0728 ## $v0 = 00000728 -/* 099D4 80935FA4 5300000E */ beql $t8, $zero, .L80935FE0 -/* 099D8 80935FA8 24830050 */ addiu $v1, $a0, 0x0050 ## $v1 = 00000050 -/* 099DC 80935FAC C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000728 -/* 099E0 80935FB0 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 099E4 80935FB4 C4440004 */ lwc1 $f4, 0x0004($v0) ## 0000072C -/* 099E8 80935FB8 46105480 */ add.s $f18, $f10, $f16 -/* 099EC 80935FBC C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000730 -/* 099F0 80935FC0 E4520000 */ swc1 $f18, 0x0000($v0) ## 00000728 -/* 099F4 80935FC4 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 099F8 80935FC8 46062200 */ add.s $f8, $f4, $f6 -/* 099FC 80935FCC E4480004 */ swc1 $f8, 0x0004($v0) ## 0000072C -/* 09A00 80935FD0 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 09A04 80935FD4 46105480 */ add.s $f18, $f10, $f16 -/* 09A08 80935FD8 E4520008 */ swc1 $f18, 0x0008($v0) ## 00000730 -/* 09A0C 80935FDC 24830050 */ addiu $v1, $a0, 0x0050 ## $v1 = 00000050 -.L80935FE0: -/* 09A10 80935FE0 84790720 */ lh $t9, 0x0720($v1) ## 00000770 -/* 09A14 80935FE4 24A500A0 */ addiu $a1, $a1, 0x00A0 ## $a1 = 000000F0 -/* 09A18 80935FE8 24620700 */ addiu $v0, $v1, 0x0700 ## $v0 = 00000750 -/* 09A1C 80935FEC 5320000E */ beql $t9, $zero, .L80936028 -/* 09A20 80935FF0 84680748 */ lh $t0, 0x0748($v1) ## 00000798 -/* 09A24 80935FF4 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000750 -/* 09A28 80935FF8 C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 09A2C 80935FFC C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000754 -/* 09A30 80936000 46062200 */ add.s $f8, $f4, $f6 -/* 09A34 80936004 C4440008 */ lwc1 $f4, 0x0008($v0) ## 00000758 -/* 09A38 80936008 E4480000 */ swc1 $f8, 0x0000($v0) ## 00000750 -/* 09A3C 8093600C C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 09A40 80936010 46105480 */ add.s $f18, $f10, $f16 -/* 09A44 80936014 E4520004 */ swc1 $f18, 0x0004($v0) ## 00000754 -/* 09A48 80936018 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 09A4C 8093601C 46062200 */ add.s $f8, $f4, $f6 -/* 09A50 80936020 E4480008 */ swc1 $f8, 0x0008($v0) ## 00000758 -/* 09A54 80936024 84680748 */ lh $t0, 0x0748($v1) ## 00000798 -.L80936028: -/* 09A58 80936028 24620728 */ addiu $v0, $v1, 0x0728 ## $v0 = 00000778 -/* 09A5C 8093602C 5100000E */ beql $t0, $zero, .L80936068 -/* 09A60 80936030 84690770 */ lh $t1, 0x0770($v1) ## 000007C0 -/* 09A64 80936034 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000778 -/* 09A68 80936038 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 09A6C 8093603C C4440004 */ lwc1 $f4, 0x0004($v0) ## 0000077C -/* 09A70 80936040 46105480 */ add.s $f18, $f10, $f16 -/* 09A74 80936044 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000780 -/* 09A78 80936048 E4520000 */ swc1 $f18, 0x0000($v0) ## 00000778 -/* 09A7C 8093604C C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 09A80 80936050 46062200 */ add.s $f8, $f4, $f6 -/* 09A84 80936054 E4480004 */ swc1 $f8, 0x0004($v0) ## 0000077C -/* 09A88 80936058 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 09A8C 8093605C 46105480 */ add.s $f18, $f10, $f16 -/* 09A90 80936060 E4520008 */ swc1 $f18, 0x0008($v0) ## 00000780 -/* 09A94 80936064 84690770 */ lh $t1, 0x0770($v1) ## 000007C0 -.L80936068: -/* 09A98 80936068 24620750 */ addiu $v0, $v1, 0x0750 ## $v0 = 000007A0 -/* 09A9C 8093606C 5120000E */ beql $t1, $zero, .L809360A8 -/* 09AA0 80936070 846A0798 */ lh $t2, 0x0798($v1) ## 000007E8 -/* 09AA4 80936074 C4440000 */ lwc1 $f4, 0x0000($v0) ## 000007A0 -/* 09AA8 80936078 C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 09AAC 8093607C C44A0004 */ lwc1 $f10, 0x0004($v0) ## 000007A4 -/* 09AB0 80936080 46062200 */ add.s $f8, $f4, $f6 -/* 09AB4 80936084 C4440008 */ lwc1 $f4, 0x0008($v0) ## 000007A8 -/* 09AB8 80936088 E4480000 */ swc1 $f8, 0x0000($v0) ## 000007A0 -/* 09ABC 8093608C C4900028 */ lwc1 $f16, 0x0028($a0) ## 00000028 -/* 09AC0 80936090 46105480 */ add.s $f18, $f10, $f16 -/* 09AC4 80936094 E4520004 */ swc1 $f18, 0x0004($v0) ## 000007A4 -/* 09AC8 80936098 C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 09ACC 8093609C 46062200 */ add.s $f8, $f4, $f6 -/* 09AD0 809360A0 E4480008 */ swc1 $f8, 0x0008($v0) ## 000007A8 -/* 09AD4 809360A4 846A0798 */ lh $t2, 0x0798($v1) ## 000007E8 -.L809360A8: -/* 09AD8 809360A8 24620778 */ addiu $v0, $v1, 0x0778 ## $v0 = 000007C8 -/* 09ADC 809360AC 1140000D */ beq $t2, $zero, .L809360E4 -/* 09AE0 809360B0 00000000 */ nop -/* 09AE4 809360B4 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000007C8 -/* 09AE8 809360B8 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 09AEC 809360BC C4440004 */ lwc1 $f4, 0x0004($v0) ## 000007CC -/* 09AF0 809360C0 46105480 */ add.s $f18, $f10, $f16 -/* 09AF4 809360C4 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 000007D0 -/* 09AF8 809360C8 E4520000 */ swc1 $f18, 0x0000($v0) ## 000007C8 -/* 09AFC 809360CC C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 09B00 809360D0 46062200 */ add.s $f8, $f4, $f6 -/* 09B04 809360D4 E4480004 */ swc1 $f8, 0x0004($v0) ## 000007CC -/* 09B08 809360D8 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 09B0C 809360DC 46105480 */ add.s $f18, $f10, $f16 -/* 09B10 809360E0 E4520008 */ swc1 $f18, 0x0008($v0) ## 000007D0 -.L809360E4: -/* 09B14 809360E4 14A6FFBE */ bne $a1, $a2, .L80935FE0 -/* 09B18 809360E8 246300A0 */ addiu $v1, $v1, 0x00A0 ## $v1 = 000000F0 -/* 09B1C 809360EC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09B20 809360F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09B24 809360F4 03E00008 */ jr $ra -/* 09B28 809360F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s deleted file mode 100644 index 728e8fb60c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s +++ /dev/null @@ -1,185 +0,0 @@ -glabel func_809360FC -/* 09B2C 809360FC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 09B30 80936100 AFBF0014 */ sw $ra, 0x0014($sp) -/* 09B34 80936104 AFA5003C */ sw $a1, 0x003C($sp) -/* 09B38 80936108 90820196 */ lbu $v0, 0x0196($a0) ## 00000196 -/* 09B3C 8093610C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 09B40 80936110 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09B44 80936114 5040009E */ beql $v0, $zero, .L80936390 -/* 09B48 80936118 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09B4C 8093611C 5441004D */ bnel $v0, $at, .L80936254 -/* 09B50 80936120 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09B54 80936124 848E0722 */ lh $t6, 0x0722($a0) ## 00000722 -/* 09B58 80936128 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 09B5C 8093612C 00E01825 */ or $v1, $a3, $zero ## $v1 = 00000000 -/* 09B60 80936130 11C00042 */ beq $t6, $zero, .L8093623C -/* 09B64 80936134 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 09B68 80936138 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 09B6C 8093613C 240502D0 */ addiu $a1, $zero, 0x02D0 ## $a1 = 000002D0 -.L80936140: -/* 09B70 80936140 846F0720 */ lh $t7, 0x0720($v1) ## 00000720 -/* 09B74 80936144 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 09B78 80936148 24620700 */ addiu $v0, $v1, 0x0700 ## $v0 = 00000700 -/* 09B7C 8093614C 51E0001C */ beql $t7, $zero, .L809361C0 -/* 09B80 80936150 846F0748 */ lh $t7, 0x0748($v1) ## 00000748 -/* 09B84 80936154 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000700 -/* 09B88 80936158 C446000C */ lwc1 $f6, 0x000C($v0) ## 0000070C -/* 09B8C 8093615C C4400010 */ lwc1 $f0, 0x0010($v0) ## 00000710 -/* 09B90 80936160 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000704 -/* 09B94 80936164 46062200 */ add.s $f8, $f4, $f6 -/* 09B98 80936168 C4440014 */ lwc1 $f4, 0x0014($v0) ## 00000714 -/* 09B9C 8093616C C4520008 */ lwc1 $f18, 0x0008($v0) ## 00000708 -/* 09BA0 80936170 46005400 */ add.s $f16, $f10, $f0 -/* 09BA4 80936174 E4480000 */ swc1 $f8, 0x0000($v0) ## 00000700 -/* 09BA8 80936178 90580024 */ lbu $t8, 0x0024($v0) ## 00000724 -/* 09BAC 8093617C 46020201 */ sub.s $f8, $f0, $f2 -/* 09BB0 80936180 84490018 */ lh $t1, 0x0018($v0) ## 00000718 -/* 09BB4 80936184 844B001A */ lh $t3, 0x001A($v0) ## 0000071A -/* 09BB8 80936188 46049180 */ add.s $f6, $f18, $f4 -/* 09BBC 8093618C 844D001C */ lh $t5, 0x001C($v0) ## 0000071C -/* 09BC0 80936190 2719FFFD */ addiu $t9, $t8, 0xFFFD ## $t9 = FFFFFFFD -/* 09BC4 80936194 252A0D00 */ addiu $t2, $t1, 0x0D00 ## $t2 = 00000D00 -/* 09BC8 80936198 256C1100 */ addiu $t4, $t3, 0x1100 ## $t4 = 00001100 -/* 09BCC 8093619C 25AE1500 */ addiu $t6, $t5, 0x1500 ## $t6 = 00001500 -/* 09BD0 809361A0 E4500004 */ swc1 $f16, 0x0004($v0) ## 00000704 -/* 09BD4 809361A4 E4460008 */ swc1 $f6, 0x0008($v0) ## 00000708 -/* 09BD8 809361A8 A0590024 */ sb $t9, 0x0024($v0) ## 00000724 -/* 09BDC 809361AC E4480010 */ swc1 $f8, 0x0010($v0) ## 00000710 -/* 09BE0 809361B0 A44A0018 */ sh $t2, 0x0018($v0) ## 00000718 -/* 09BE4 809361B4 A44C001A */ sh $t4, 0x001A($v0) ## 0000071A -/* 09BE8 809361B8 A44E001C */ sh $t6, 0x001C($v0) ## 0000071C -/* 09BEC 809361BC 846F0748 */ lh $t7, 0x0748($v1) ## 00000748 -.L809361C0: -/* 09BF0 809361C0 24620728 */ addiu $v0, $v1, 0x0728 ## $v0 = 00000728 -/* 09BF4 809361C4 11E0001B */ beq $t7, $zero, .L80936234 -/* 09BF8 809361C8 00000000 */ nop -/* 09BFC 809361CC C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000728 -/* 09C00 809361D0 C450000C */ lwc1 $f16, 0x000C($v0) ## 00000734 -/* 09C04 809361D4 C4400010 */ lwc1 $f0, 0x0010($v0) ## 00000738 -/* 09C08 809361D8 C4440004 */ lwc1 $f4, 0x0004($v0) ## 0000072C -/* 09C0C 809361DC 46105480 */ add.s $f18, $f10, $f16 -/* 09C10 809361E0 C44A0014 */ lwc1 $f10, 0x0014($v0) ## 0000073C -/* 09C14 809361E4 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000730 -/* 09C18 809361E8 46002180 */ add.s $f6, $f4, $f0 -/* 09C1C 809361EC E4520000 */ swc1 $f18, 0x0000($v0) ## 00000728 -/* 09C20 809361F0 90580024 */ lbu $t8, 0x0024($v0) ## 0000074C -/* 09C24 809361F4 46020481 */ sub.s $f18, $f0, $f2 -/* 09C28 809361F8 84490018 */ lh $t1, 0x0018($v0) ## 00000740 -/* 09C2C 809361FC 844B001A */ lh $t3, 0x001A($v0) ## 00000742 -/* 09C30 80936200 460A4400 */ add.s $f16, $f8, $f10 -/* 09C34 80936204 844D001C */ lh $t5, 0x001C($v0) ## 00000744 -/* 09C38 80936208 2719FFFD */ addiu $t9, $t8, 0xFFFD ## $t9 = FFFFFFFD -/* 09C3C 8093620C 252A0D00 */ addiu $t2, $t1, 0x0D00 ## $t2 = 00000D00 -/* 09C40 80936210 256C1100 */ addiu $t4, $t3, 0x1100 ## $t4 = 00001100 -/* 09C44 80936214 25AE1500 */ addiu $t6, $t5, 0x1500 ## $t6 = 00001500 -/* 09C48 80936218 A44E001C */ sh $t6, 0x001C($v0) ## 00000744 -/* 09C4C 8093621C A44C001A */ sh $t4, 0x001A($v0) ## 00000742 -/* 09C50 80936220 A44A0018 */ sh $t2, 0x0018($v0) ## 00000740 -/* 09C54 80936224 A0590024 */ sb $t9, 0x0024($v0) ## 0000074C -/* 09C58 80936228 E4500008 */ swc1 $f16, 0x0008($v0) ## 00000730 -/* 09C5C 8093622C E4520010 */ swc1 $f18, 0x0010($v0) ## 00000738 -/* 09C60 80936230 E4460004 */ swc1 $f6, 0x0004($v0) ## 0000072C -.L80936234: -/* 09C64 80936234 1485FFC2 */ bne $a0, $a1, .L80936140 -/* 09C68 80936238 24630050 */ addiu $v1, $v1, 0x0050 ## $v1 = 00000050 -.L8093623C: -/* 09C6C 8093623C 90EF0724 */ lbu $t7, 0x0724($a3) ## 00000724 -/* 09C70 80936240 55E00053 */ bnel $t7, $zero, .L80936390 -/* 09C74 80936244 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09C78 80936248 10000050 */ beq $zero, $zero, .L8093638C -/* 09C7C 8093624C A0E00196 */ sb $zero, 0x0196($a3) ## 00000196 -/* 09C80 80936250 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -.L80936254: -/* 09C84 80936254 1441001D */ bne $v0, $at, .L809362CC -/* 09C88 80936258 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 09C8C 8093625C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09C90 80936260 00E01825 */ or $v1, $a3, $zero ## $v1 = 00000000 -/* 09C94 80936264 24E20700 */ addiu $v0, $a3, 0x0700 ## $v0 = 00000700 -/* 09C98 80936268 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -.L8093626C: -/* 09C9C 8093626C 84640720 */ lh $a0, 0x0720($v1) ## 00000720 -/* 09CA0 80936270 24630028 */ addiu $v1, $v1, 0x0028 ## $v1 = 00000028 -/* 09CA4 80936274 00042040 */ sll $a0, $a0, 1 -/* 09CA8 80936278 28810015 */ slti $at, $a0, 0x0015 -/* 09CAC 8093627C 14200003 */ bne $at, $zero, .L8093628C -/* 09CB0 80936280 00802825 */ or $a1, $a0, $zero ## $a1 = 00000050 -/* 09CB4 80936284 10000001 */ beq $zero, $zero, .L8093628C -/* 09CB8 80936288 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -.L8093628C: -/* 09CBC 8093628C 9458001E */ lhu $t8, 0x001E($v0) ## 0000071E -/* 09CC0 80936290 84440020 */ lh $a0, 0x0020($v0) ## 00000720 -/* 09CC4 80936294 0305C821 */ addu $t9, $t8, $a1 -/* 09CC8 80936298 03264821 */ addu $t1, $t9, $a2 -/* 09CCC 8093629C 10800003 */ beq $a0, $zero, .L809362AC -/* 09CD0 809362A0 A449001E */ sh $t1, 0x001E($v0) ## 0000071E -/* 09CD4 809362A4 248AFFFF */ addiu $t2, $a0, 0xFFFF ## $t2 = 0000004F -/* 09CD8 809362A8 A44A0020 */ sh $t2, 0x0020($v0) ## 00000720 -.L809362AC: -/* 09CDC 809362AC 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 09CE0 809362B0 14C8FFEE */ bne $a2, $t0, .L8093626C -/* 09CE4 809362B4 24420028 */ addiu $v0, $v0, 0x0028 ## $v0 = 00000728 -/* 09CE8 809362B8 84EB0720 */ lh $t3, 0x0720($a3) ## 00000720 -/* 09CEC 809362BC 55600034 */ bnel $t3, $zero, .L80936390 -/* 09CF0 809362C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09CF4 809362C4 10000031 */ beq $zero, $zero, .L8093638C -/* 09CF8 809362C8 A0E00196 */ sb $zero, 0x0196($a3) ## 00000196 -.L809362CC: -/* 09CFC 809362CC 55020030 */ bnel $t0, $v0, .L80936390 -/* 09D00 809362D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09D04 809362D4 84EC001C */ lh $t4, 0x001C($a3) ## 0000001C -/* 09D08 809362D8 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 09D0C 809362DC 24E30700 */ addiu $v1, $a3, 0x0700 ## $v1 = 00000700 -/* 09D10 809362E0 150C0011 */ bne $t0, $t4, .L80936328 -/* 09D14 809362E4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000700 -/* 09D18 809362E8 8FA4003C */ lw $a0, 0x003C($sp) -/* 09D1C 809362EC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 09D20 809362F0 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 -/* 09D24 809362F4 24E50038 */ addiu $a1, $a3, 0x0038 ## $a1 = 00000038 -/* 09D28 809362F8 24E603C8 */ addiu $a2, $a3, 0x03C8 ## $a2 = 000003C8 -/* 09D2C 809362FC AFA20030 */ sw $v0, 0x0030($sp) -/* 09D30 80936300 AFA3001C */ sw $v1, 0x001C($sp) -/* 09D34 80936304 AFA70038 */ sw $a3, 0x0038($sp) -/* 09D38 80936308 0C029BBD */ jal SkinMatrix_Vec3fMtxFMultXYZ -/* 09D3C 8093630C 00812021 */ addu $a0, $a0, $at -/* 09D40 80936310 8FA40038 */ lw $a0, 0x0038($sp) -/* 09D44 80936314 0C24CF4B */ jal func_80933D2C -/* 09D48 80936318 2405318C */ addiu $a1, $zero, 0x318C ## $a1 = 0000318C -/* 09D4C 8093631C 8FA20030 */ lw $v0, 0x0030($sp) -/* 09D50 80936320 8FA3001C */ lw $v1, 0x001C($sp) -/* 09D54 80936324 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -.L80936328: -/* 09D58 80936328 846D0022 */ lh $t5, 0x0022($v1) ## 00000022 -/* 09D5C 8093632C 24042710 */ addiu $a0, $zero, 0x2710 ## $a0 = 00002710 -/* 09D60 80936330 510D0017 */ beql $t0, $t5, .L80936390 -/* 09D64 80936334 8FBF0014 */ lw $ra, 0x0014($sp) -/* 09D68 80936338 84430022 */ lh $v1, 0x0022($v0) ## 00000022 -.L8093633C: -/* 09D6C 8093633C 54600006 */ bnel $v1, $zero, .L80936358 -/* 09D70 80936340 9458001E */ lhu $t8, 0x001E($v0) ## 0000001E -/* 09D74 80936344 904E0024 */ lbu $t6, 0x0024($v0) ## 00000024 -/* 09D78 80936348 25CFFFFE */ addiu $t7, $t6, 0xFFFE ## $t7 = FFFFFFFE -/* 09D7C 8093634C 10000004 */ beq $zero, $zero, .L80936360 -/* 09D80 80936350 A04F0024 */ sb $t7, 0x0024($v0) ## 00000024 -/* 09D84 80936354 9458001E */ lhu $t8, 0x001E($v0) ## 0000001E -.L80936358: -/* 09D88 80936358 0303C821 */ addu $t9, $t8, $v1 -/* 09D8C 8093635C A459001E */ sh $t9, 0x001E($v0) ## 0000001E -.L80936360: -/* 09D90 80936360 9443001E */ lhu $v1, 0x001E($v0) ## 0000001E -/* 09D94 80936364 28612711 */ slti $at, $v1, 0x2711 -/* 09D98 80936368 54200004 */ bnel $at, $zero, .L8093637C -/* 09D9C 8093636C A443001E */ sh $v1, 0x001E($v0) ## 0000001E -/* 09DA0 80936370 10000002 */ beq $zero, $zero, .L8093637C -/* 09DA4 80936374 A444001E */ sh $a0, 0x001E($v0) ## 0000001E -/* 09DA8 80936378 A443001E */ sh $v1, 0x001E($v0) ## 0000001E -.L8093637C: -/* 09DAC 8093637C 8443004A */ lh $v1, 0x004A($v0) ## 0000004A -/* 09DB0 80936380 24420028 */ addiu $v0, $v0, 0x0028 ## $v0 = 00000028 -/* 09DB4 80936384 1503FFED */ bne $t0, $v1, .L8093633C -/* 09DB8 80936388 00000000 */ nop -.L8093638C: -/* 09DBC 8093638C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80936390: -/* 09DC0 80936390 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 09DC4 80936394 03E00008 */ jr $ra -/* 09DC8 80936398 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s deleted file mode 100644 index 2111359760..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s +++ /dev/null @@ -1,432 +0,0 @@ -.rdata -glabel D_80937940 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937950 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937960 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937970 - .asciz "../z_boss_sst.c" - .balign 4 - -glabel D_80937980 - .asciz "../z_boss_sst.c" - .balign 4 - -.late_rodata -glabel D_80937A6C - .float 0.001 - -glabel D_80937A70 - .float 0.005 - -glabel D_80937A74 - .float 0.001 - -glabel D_80937A78 - .float 0.001 - -.text -glabel func_8093639C -/* 09DCC 8093639C 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 09DD0 809363A0 AFBF006C */ sw $ra, 0x006C($sp) -/* 09DD4 809363A4 AFBE0068 */ sw $s8, 0x0068($sp) -/* 09DD8 809363A8 AFB70064 */ sw $s7, 0x0064($sp) -/* 09DDC 809363AC AFB60060 */ sw $s6, 0x0060($sp) -/* 09DE0 809363B0 AFB5005C */ sw $s5, 0x005C($sp) -/* 09DE4 809363B4 AFB40058 */ sw $s4, 0x0058($sp) -/* 09DE8 809363B8 AFB30054 */ sw $s3, 0x0054($sp) -/* 09DEC 809363BC AFB20050 */ sw $s2, 0x0050($sp) -/* 09DF0 809363C0 AFB1004C */ sw $s1, 0x004C($sp) -/* 09DF4 809363C4 AFB00048 */ sw $s0, 0x0048($sp) -/* 09DF8 809363C8 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 09DFC 809363CC F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 09E00 809363D0 AFA500F4 */ sw $a1, 0x00F4($sp) -/* 09E04 809363D4 908E0196 */ lbu $t6, 0x0196($a0) ## 00000196 -/* 09E08 809363D8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 09E0C 809363DC 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC -/* 09E10 809363E0 11C0015B */ beq $t6, $zero, .L80936950 -/* 09E14 809363E4 3C068093 */ lui $a2, %hi(D_80937940) ## $a2 = 80930000 -/* 09E18 809363E8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 09E1C 809363EC 24C67940 */ addiu $a2, $a2, %lo(D_80937940) ## $a2 = 80937940 -/* 09E20 809363F0 24071C86 */ addiu $a3, $zero, 0x1C86 ## $a3 = 00001C86 -/* 09E24 809363F4 0C031AB1 */ jal Graph_OpenDisps -/* 09E28 809363F8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 09E2C 809363FC 8FB800F4 */ lw $t8, 0x00F4($sp) -/* 09E30 80936400 0C024F61 */ jal func_80093D84 -/* 09E34 80936404 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 09E38 80936408 92220196 */ lbu $v0, 0x0196($s1) ## 00000196 -/* 09E3C 8093640C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09E40 80936410 8FA800F4 */ lw $t0, 0x00F4($sp) -/* 09E44 80936414 1441007F */ bne $v0, $at, .L80936614 -/* 09E48 80936418 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 09E4C 8093641C 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 09E50 80936420 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 09E54 80936424 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 09E58 80936428 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 09E5C 8093642C AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 09E60 80936430 00681821 */ addu $v1, $v1, $t0 -/* 09E64 80936434 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 09E68 80936438 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 09E6C 8093643C 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 09E70 80936440 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 09E74 80936444 00036840 */ sll $t5, $v1, 1 -/* 09E78 80936448 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 09E7C 8093644C 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 09E80 80936450 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 09E84 80936454 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 -/* 09E88 80936458 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 09E8C 8093645C AFB80028 */ sw $t8, 0x0028($sp) -/* 09E90 80936460 AFAF0024 */ sw $t7, 0x0024($sp) -/* 09E94 80936464 AFAC0018 */ sw $t4, 0x0018($sp) -/* 09E98 80936468 AFAB0014 */ sw $t3, 0x0014($sp) -/* 09E9C 8093646C AFAE0020 */ sw $t6, 0x0020($sp) -/* 09EA0 80936470 AFAA0010 */ sw $t2, 0x0010($sp) -/* 09EA4 80936474 AFA0001C */ sw $zero, 0x001C($sp) -/* 09EA8 80936478 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 09EAC 8093647C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09EB0 80936480 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 09EB4 80936484 0C0253D0 */ jal Gfx_TwoTexScroll -/* 09EB8 80936488 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 -/* 09EBC 8093648C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 09EC0 80936490 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 09EC4 80936494 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 09EC8 80936498 3C010032 */ lui $at, 0x0032 ## $at = 00320000 -/* 09ECC 8093649C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 09ED0 809364A0 AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 09ED4 809364A4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 09ED8 809364A8 922B0724 */ lbu $t3, 0x0724($s1) ## 00000724 -/* 09EDC 809364AC 34216400 */ ori $at, $at, 0x6400 ## $at = 00326400 -/* 09EE0 809364B0 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 09EE4 809364B4 01616025 */ or $t4, $t3, $at ## $t4 = 00326400 -/* 09EE8 809364B8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 09EEC 809364BC 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 09EF0 809364C0 25CE7EE0 */ addiu $t6, $t6, 0x7EE0 ## $t6 = 06017EE0 -/* 09EF4 809364C4 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 -/* 09EF8 809364C8 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 09EFC 809364CC AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 -/* 09F00 809364D0 3C018093 */ lui $at, %hi(D_80937A6C) ## $at = 80930000 -/* 09F04 809364D4 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000 -/* 09F08 809364D8 3C168093 */ lui $s6, %hi(D_80937950) ## $s6 = 80930000 -/* 09F0C 809364DC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 09F10 809364E0 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -/* 09F14 809364E4 C4367A6C */ lwc1 $f22, %lo(D_80937A6C)($at) -/* 09F18 809364E8 26D67950 */ addiu $s6, $s6, %lo(D_80937950) ## $s6 = 80937950 -/* 09F1C 809364EC 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 -/* 09F20 809364F0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 09F24 809364F4 02209825 */ or $s3, $s1, $zero ## $s3 = 00000000 -.L809364F8: -/* 09F28 809364F8 866F0720 */ lh $t7, 0x0720($s3) ## 00000720 -/* 09F2C 809364FC 26700700 */ addiu $s0, $s3, 0x0700 ## $s0 = 00000700 -/* 09F30 80936500 02002025 */ or $a0, $s0, $zero ## $a0 = 00000700 -/* 09F34 80936504 11E0003D */ beq $t7, $zero, .L809365FC -/* 09F38 80936508 8FA500F4 */ lw $a1, 0x00F4($sp) -/* 09F3C 8093650C 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 -/* 09F40 80936510 0C00D0D7 */ jal func_8003435C -/* 09F44 80936514 26B57F80 */ addiu $s5, $s5, 0x7F80 ## $s5 = 06017F80 -/* 09F48 80936518 86380722 */ lh $t8, 0x0722($s1) ## 00000722 -/* 09F4C 8093651C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09F50 80936520 53000008 */ beql $t8, $zero, .L80936544 -/* 09F54 80936524 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000700 -/* 09F58 80936528 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700 -/* 09F5C 8093652C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 -/* 09F60 80936530 0C034261 */ jal Matrix_Translate -/* 09F64 80936534 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 09F68 80936538 1000000F */ beq $zero, $zero, .L80936578 -/* 09F6C 8093653C 86040018 */ lh $a0, 0x0018($s0) ## 00000718 -/* 09F70 80936540 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000700 -.L80936544: -/* 09F74 80936544 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 09F78 80936548 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000708 -/* 09F7C 8093654C C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C -/* 09F80 80936550 46062300 */ add.s $f12, $f4, $f6 -/* 09F84 80936554 C6080004 */ lwc1 $f8, 0x0004($s0) ## 00000704 -/* 09F88 80936558 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 09F8C 8093655C 46128100 */ add.s $f4, $f16, $f18 -/* 09F90 80936560 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09F94 80936564 460A4380 */ add.s $f14, $f8, $f10 -/* 09F98 80936568 44062000 */ mfc1 $a2, $f4 -/* 09F9C 8093656C 0C034261 */ jal Matrix_Translate -/* 09FA0 80936570 00000000 */ nop -/* 09FA4 80936574 86040018 */ lh $a0, 0x0018($s0) ## 00000718 -.L80936578: -/* 09FA8 80936578 8605001A */ lh $a1, 0x001A($s0) ## 0000071A -/* 09FAC 8093657C 8606001C */ lh $a2, 0x001C($s0) ## 0000071C -/* 09FB0 80936580 0C034421 */ jal Matrix_RotateRPY -/* 09FB4 80936584 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 09FB8 80936588 9619001E */ lhu $t9, 0x001E($s0) ## 0000071E -/* 09FBC 8093658C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 09FC0 80936590 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 09FC4 80936594 07210004 */ bgez $t9, .L809365A8 -/* 09FC8 80936598 46803220 */ cvt.s.w $f8, $f6 -/* 09FCC 8093659C 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 09FD0 809365A0 00000000 */ nop -/* 09FD4 809365A4 460A4200 */ add.s $f8, $f8, $f10 -.L809365A8: -/* 09FD8 809365A8 46164302 */ mul.s $f12, $f8, $f22 -/* 09FDC 809365AC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 09FE0 809365B0 44066000 */ mfc1 $a2, $f12 -/* 09FE4 809365B4 0C0342A3 */ jal Matrix_Scale -/* 09FE8 809365B8 46006386 */ mov.s $f14, $f12 -/* 09FEC 809365BC 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 09FF0 809365C0 02C02825 */ or $a1, $s6, $zero ## $a1 = 80937950 -/* 09FF4 809365C4 24061CB6 */ addiu $a2, $zero, 0x1CB6 ## $a2 = 00001CB6 -/* 09FF8 809365C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 09FFC 809365CC AE4902D0 */ sw $t1, 0x02D0($s2) ## 000002D0 -/* 0A000 809365D0 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A004 809365D4 8FAA00F4 */ lw $t2, 0x00F4($sp) -/* 0A008 809365D8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A00C 809365DC 0C0346A2 */ jal Matrix_NewMtx -/* 0A010 809365E0 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 0A014 809365E4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 0A018 809365E8 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A01C 809365EC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 0A020 809365F0 AE4B02D0 */ sw $t3, 0x02D0($s2) ## 000002D0 -/* 0A024 809365F4 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 0A028 809365F8 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -.L809365FC: -/* 0A02C 809365FC 26940028 */ addiu $s4, $s4, 0x0028 ## $s4 = 00000028 -/* 0A030 80936600 240102D0 */ addiu $at, $zero, 0x02D0 ## $at = 000002D0 -/* 0A034 80936604 1681FFBC */ bne $s4, $at, .L809364F8 -/* 0A038 80936608 26730028 */ addiu $s3, $s3, 0x0028 ## $s3 = 00000028 -/* 0A03C 8093660C 100000CA */ beq $zero, $zero, .L80936938 -/* 0A040 80936610 8FA900F4 */ lw $t1, 0x00F4($sp) -.L80936614: -/* 0A044 80936614 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A048 80936618 1441007B */ bne $v0, $at, .L80936808 -/* 0A04C 8093661C 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 -/* 0A050 80936620 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A054 80936624 3C018093 */ lui $at, %hi(D_80937A70) ## $at = 80930000 -/* 0A058 80936628 C4347A70 */ lwc1 $f20, %lo(D_80937A70)($at) -/* 0A05C 8093662C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0A060 80936630 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 -/* 0A064 80936634 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0A068 80936638 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 0A06C 8093663C 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A070 80936640 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 0A074 80936644 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0A078 80936648 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0A07C 8093664C AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 -/* 0A080 80936650 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0A084 80936654 8FB800F4 */ lw $t8, 0x00F4($sp) -/* 0A088 80936658 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 0A08C 8093665C 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 0A090 80936660 00781821 */ addu $v1, $v1, $t8 -/* 0A094 80936664 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 -/* 0A098 80936668 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 0A09C 8093666C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 0A0A0 80936670 00030823 */ subu $at, $zero, $v1 -/* 0A0A4 80936674 00015900 */ sll $t3, $at, 4 -/* 0A0A8 80936678 01615823 */ subu $t3, $t3, $at -/* 0A0AC 8093667C 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000008 -/* 0A0B0 80936680 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 0A0B4 80936684 24090040 */ addiu $t1, $zero, 0x0040 ## $t1 = 00000040 -/* 0A0B8 80936688 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0A0BC 8093668C AFAA0018 */ sw $t2, 0x0018($sp) -/* 0A0C0 80936690 AFA90014 */ sw $t1, 0x0014($sp) -/* 0A0C4 80936694 AFB90010 */ sw $t9, 0x0010($sp) -/* 0A0C8 80936698 AFAC0020 */ sw $t4, 0x0020($sp) -/* 0A0CC 8093669C AFAD0024 */ sw $t5, 0x0024($sp) -/* 0A0D0 809366A0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0A0D4 809366A4 AFA0001C */ sw $zero, 0x001C($sp) -/* 0A0D8 809366A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0A0DC 809366AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A0E0 809366B0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A0E4 809366B4 0C0253D0 */ jal Gfx_TwoTexScroll -/* 0A0E8 809366B8 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 -/* 0A0EC 809366BC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 0A0F0 809366C0 3C018093 */ lui $at, %hi(D_80937A74) ## $at = 80930000 -/* 0A0F4 809366C4 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000 -/* 0A0F8 809366C8 3C161E00 */ lui $s6, 0x1E00 ## $s6 = 1E000000 -/* 0A0FC 809366CC 36D61E00 */ ori $s6, $s6, 0x1E00 ## $s6 = 1E001E00 -/* 0A100 809366D0 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 -/* 0A104 809366D4 C4367A74 */ lwc1 $f22, %lo(D_80937A74)($at) -/* 0A108 809366D8 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0A10C 809366DC 02209825 */ or $s3, $s1, $zero ## $s3 = 00000000 -/* 0A110 809366E0 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 -.L809366E4: -/* 0A114 809366E4 866F0720 */ lh $t7, 0x0720($s3) ## 00000720 -/* 0A118 809366E8 26700700 */ addiu $s0, $s3, 0x0700 ## $s0 = 00000700 -/* 0A11C 809366EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A120 809366F0 11E0003E */ beq $t7, $zero, .L809367EC -/* 0A124 809366F4 3C150402 */ lui $s5, %hi(gEffFireCircleDL) ## $s5 = 04020000 -/* 0A128 809366F8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700 -/* 0A12C 809366FC C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 -/* 0A130 80936700 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 0A134 80936704 0C034261 */ jal Matrix_Translate -/* 0A138 80936708 26B584B0 */ addiu $s5, $s5, %lo(gEffFireCircleDL) ## $s5 = 040184B0 -/* 0A13C 8093670C 9618001E */ lhu $t8, 0x001E($s0) ## 0000071E -/* 0A140 80936710 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0A144 80936714 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 0A148 80936718 07010004 */ bgez $t8, .L8093672C -/* 0A14C 8093671C 468084A0 */ cvt.s.w $f18, $f16 -/* 0A150 80936720 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 -/* 0A154 80936724 00000000 */ nop -/* 0A158 80936728 46049480 */ add.s $f18, $f18, $f4 -.L8093672C: -/* 0A15C 8093672C 46169302 */ mul.s $f12, $f18, $f22 -/* 0A160 80936730 4600A386 */ mov.s $f14, $f20 -/* 0A164 80936734 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A168 80936738 44066000 */ mfc1 $a2, $f12 -/* 0A16C 8093673C 0C0342A3 */ jal Matrix_Scale -/* 0A170 80936740 00000000 */ nop -/* 0A174 80936744 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A178 80936748 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 -/* 0A17C 8093674C 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 -/* 0A180 80936750 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0A184 80936754 AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 0A188 80936758 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0A18C 8093675C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 0A190 80936760 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A194 80936764 356B8080 */ ori $t3, $t3, 0x8080 ## $t3 = FA008080 -/* 0A198 80936768 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 0A19C 8093676C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0A1A0 80936770 AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 -/* 0A1A4 80936774 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0A1A8 80936778 860D0020 */ lh $t5, 0x0020($s0) ## 00000720 -/* 0A1AC 8093677C 920C0024 */ lbu $t4, 0x0024($s0) ## 00000724 -/* 0A1B0 80936780 3C058093 */ lui $a1, %hi(D_80937960) ## $a1 = 80930000 -/* 0A1B4 80936784 24A57960 */ addiu $a1, $a1, %lo(D_80937960) ## $a1 = 80937960 -/* 0A1B8 80936788 018D0019 */ multu $t4, $t5 -/* 0A1BC 8093678C 24061CE4 */ addiu $a2, $zero, 0x1CE4 ## $a2 = 00001CE4 -/* 0A1C0 80936790 00007012 */ mflo $t6 -/* 0A1C4 80936794 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 0A1C8 80936798 01F6C025 */ or $t8, $t7, $s6 ## $t8 = 1E001E00 -/* 0A1CC 8093679C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0A1D0 809367A0 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A1D4 809367A4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0A1D8 809367A8 AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 0A1DC 809367AC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0A1E0 809367B0 AC560004 */ sw $s6, 0x0004($v0) ## 00000004 -/* 0A1E4 809367B4 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A1E8 809367B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 0A1EC 809367BC AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 -/* 0A1F0 809367C0 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A1F4 809367C4 8FAB00F4 */ lw $t3, 0x00F4($sp) -/* 0A1F8 809367C8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A1FC 809367CC 0C0346A2 */ jal Matrix_NewMtx -/* 0A200 809367D0 8D640000 */ lw $a0, 0x0000($t3) ## FA008080 -/* 0A204 809367D4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 0A208 809367D8 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A20C 809367DC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0A210 809367E0 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 -/* 0A214 809367E4 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 0A218 809367E8 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -.L809367EC: -/* 0A21C 809367EC 26940028 */ addiu $s4, $s4, 0x0028 ## $s4 = 00000028 -/* 0A220 809367F0 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 0A224 809367F4 26730028 */ addiu $s3, $s3, 0x0028 ## $s3 = 00000028 -/* 0A228 809367F8 1681FFBA */ bne $s4, $at, .L809366E4 -/* 0A22C 809367FC 4616A501 */ sub.s $f20, $f20, $f22 -/* 0A230 80936800 1000004D */ beq $zero, $zero, .L80936938 -/* 0A234 80936804 8FA900F4 */ lw $t1, 0x00F4($sp) -.L80936808: -/* 0A238 80936808 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0A23C 8093680C 14410049 */ bne $v0, $at, .L80936934 -/* 0A240 80936810 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 -/* 0A244 80936814 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A248 80936818 3C0F0A0A */ lui $t7, 0x0A0A ## $t7 = 0A0A0000 -/* 0A24C 8093681C 35EF5000 */ ori $t7, $t7, 0x5000 ## $t7 = 0A0A5000 -/* 0A250 80936820 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 0A254 80936824 AE4D02D0 */ sw $t5, 0x02D0($s2) ## 000002D0 -/* 0A258 80936828 35CE0080 */ ori $t6, $t6, 0x0080 ## $t6 = FA000080 -/* 0A25C 8093682C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0A260 80936830 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0A264 80936834 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A268 80936838 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 0A26C 8093683C 3C010A0A */ lui $at, 0x0A0A ## $at = 0A0A0000 -/* 0A270 80936840 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0A274 80936844 AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0 -/* 0A278 80936848 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0A27C 8093684C 922A0724 */ lbu $t2, 0x0724($s1) ## 00000724 -/* 0A280 80936850 34210A00 */ ori $at, $at, 0x0A00 ## $at = 0A0A0A00 -/* 0A284 80936854 2415FFFF */ addiu $s5, $zero, 0xFFFF ## $s5 = FFFFFFFF -/* 0A288 80936858 01415825 */ or $t3, $t2, $at ## $t3 = 0A0A0A00 -/* 0A28C 8093685C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0A290 80936860 862C0722 */ lh $t4, 0x0722($s1) ## 00000722 -/* 0A294 80936864 3C138093 */ lui $s3, %hi(D_809372C0) ## $s3 = 80930000 -/* 0A298 80936868 26300700 */ addiu $s0, $s1, 0x0700 ## $s0 = 00000700 -/* 0A29C 8093686C 12AC0031 */ beq $s5, $t4, .L80936934 -/* 0A2A0 80936870 267372C0 */ addiu $s3, $s3, %lo(D_809372C0) ## $s3 = 809372C0 -/* 0A2A4 80936874 3C018093 */ lui $at, %hi(D_80937A78) ## $at = 80930000 -/* 0A2A8 80936878 C4367A78 */ lwc1 $f22, %lo(D_80937A78)($at) -/* 0A2AC 8093687C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0A2B0 80936880 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000 -/* 0A2B4 80936884 3C148093 */ lui $s4, %hi(D_80937970) ## $s4 = 80930000 -/* 0A2B8 80936888 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 0A2BC 8093688C 26947970 */ addiu $s4, $s4, %lo(D_80937970) ## $s4 = 80937970 -/* 0A2C0 80936890 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 -/* 0A2C4 80936894 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 -/* 0A2C8 80936898 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700 -.L8093689C: -/* 0A2CC 8093689C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 -/* 0A2D0 809368A0 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 0A2D4 809368A4 0C034261 */ jal Matrix_Translate -/* 0A2D8 809368A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A2DC 809368AC 960D001E */ lhu $t5, 0x001E($s0) ## 0000071E -/* 0A2E0 809368B0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0A2E4 809368B4 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 0A2E8 809368B8 05A10004 */ bgez $t5, .L809368CC -/* 0A2EC 809368BC 468032A0 */ cvt.s.w $f10, $f6 -/* 0A2F0 809368C0 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 0A2F4 809368C4 00000000 */ nop -/* 0A2F8 809368C8 46085280 */ add.s $f10, $f10, $f8 -.L809368CC: -/* 0A2FC 809368CC 46165302 */ mul.s $f12, $f10, $f22 -/* 0A300 809368D0 4600A386 */ mov.s $f14, $f20 -/* 0A304 809368D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A308 809368D8 44066000 */ mfc1 $a2, $f12 -/* 0A30C 809368DC 0C0342A3 */ jal Matrix_Scale -/* 0A310 809368E0 00000000 */ nop -/* 0A314 809368E4 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A318 809368E8 02802825 */ or $a1, $s4, $zero ## $a1 = 80937970 -/* 0A31C 809368EC 24061CFF */ addiu $a2, $zero, 0x1CFF ## $a2 = 00001CFF -/* 0A320 809368F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0A324 809368F4 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 -/* 0A328 809368F8 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A32C 809368FC 8FAF00F4 */ lw $t7, 0x00F4($sp) -/* 0A330 80936900 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 0A334 80936904 0C0346A2 */ jal Matrix_NewMtx -/* 0A338 80936908 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0A33C 8093690C AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 0A340 80936910 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 -/* 0A344 80936914 26100028 */ addiu $s0, $s0, 0x0028 ## $s0 = 00000728 -/* 0A348 80936918 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0A34C 8093691C AE5802D0 */ sw $t8, 0x02D0($s2) ## 000002D0 -/* 0A350 80936920 AC530004 */ sw $s3, 0x0004($v0) ## 00000004 -/* 0A354 80936924 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -/* 0A358 80936928 86190022 */ lh $t9, 0x0022($s0) ## 0000074A -/* 0A35C 8093692C 56B9FFDB */ bnel $s5, $t9, .L8093689C -/* 0A360 80936930 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000728 -.L80936934: -/* 0A364 80936934 8FA900F4 */ lw $t1, 0x00F4($sp) -.L80936938: -/* 0A368 80936938 3C068093 */ lui $a2, %hi(D_80937980) ## $a2 = 80930000 -/* 0A36C 8093693C 24C67980 */ addiu $a2, $a2, %lo(D_80937980) ## $a2 = 80937980 -/* 0A370 80936940 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC -/* 0A374 80936944 24071D09 */ addiu $a3, $zero, 0x1D09 ## $a3 = 00001D09 -/* 0A378 80936948 0C031AD5 */ jal Graph_CloseDisps -/* 0A37C 8093694C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -.L80936950: -/* 0A380 80936950 8FBF006C */ lw $ra, 0x006C($sp) -/* 0A384 80936954 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 0A388 80936958 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 0A38C 8093695C 8FB00048 */ lw $s0, 0x0048($sp) -/* 0A390 80936960 8FB1004C */ lw $s1, 0x004C($sp) -/* 0A394 80936964 8FB20050 */ lw $s2, 0x0050($sp) -/* 0A398 80936968 8FB30054 */ lw $s3, 0x0054($sp) -/* 0A39C 8093696C 8FB40058 */ lw $s4, 0x0058($sp) -/* 0A3A0 80936970 8FB5005C */ lw $s5, 0x005C($sp) -/* 0A3A4 80936974 8FB60060 */ lw $s6, 0x0060($sp) -/* 0A3A8 80936978 8FB70064 */ lw $s7, 0x0064($sp) -/* 0A3AC 8093697C 8FBE0068 */ lw $s8, 0x0068($sp) -/* 0A3B0 80936980 03E00008 */ jr $ra -/* 0A3B4 80936984 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 -/* 0A3B8 80936988 00000000 */ nop -/* 0A3BC 8093698C 00000000 */ nop diff --git a/assets/xml/objects/object_sst.xml b/assets/xml/objects/object_sst.xml new file mode 100644 index 0000000000..cb0aa17dfe --- /dev/null +++ b/assets/xml/objects/object_sst.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/overlays/ovl_Boss_Sst.xml b/assets/xml/overlays/ovl_Boss_Sst.xml new file mode 100644 index 0000000000..f364108896 --- /dev/null +++ b/assets/xml/overlays/ovl_Boss_Sst.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/overlays/actors/z_bg_sst_floor.data.s b/data/overlays/actors/z_bg_sst_floor.data.s deleted file mode 100644 index b35fb03afd..0000000000 --- a/data/overlays/actors/z_bg_sst_floor.data.s +++ /dev/null @@ -1,19 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.word 0x00000000, 0x00000000, 0x00000000 -glabel Bg_Sst_Floor_InitVars - .word 0x01660100, 0x00000030, 0x00E20000, 0x0000016C -.word BgSstFloor_Init -.word BgSstFloor_Destroy -.word BgSstFloor_Update -.word BgSstFloor_Draw -glabel D_808B9E3C - .word 0x48500064 - diff --git a/data/overlays/actors/z_bg_sst_floor.reloc.s b/data/overlays/actors/z_bg_sst_floor.reloc.s deleted file mode 100644 index 5df173429f..0000000000 --- a/data/overlays/actors/z_bg_sst_floor.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_808B9E90 - .incbin "baserom/ovl_Bg_Sst_Floor", 0x580, 0x00000070 diff --git a/data/overlays/actors/z_boss_sst.bss.s b/data/overlays/actors/z_boss_sst.bss.s deleted file mode 100644 index 3af3071322..0000000000 --- a/data/overlays/actors/z_boss_sst.bss.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .bss - -.balign 16 - -glabel D_80938C90 - .space 0x08 -glabel D_80938C98 - .space 0x04 -glabel D_80938C9C - .space 0x04 -glabel D_80938CA0 - .space 0x08 -glabel D_80938CA8 - .space 0x08 -glabel D_80938CB0 - .space 0x04 -glabel D_80938CB4 - .space 0x08 -glabel D_80938CBC - .space 0x04 -glabel D_80938CC0 - .space 0x04 -glabel D_80938CC4 - .space 0x0C - diff --git a/data/overlays/actors/z_boss_sst.data.s b/data/overlays/actors/z_boss_sst.data.s deleted file mode 100644 index b1e821ae71..0000000000 --- a/data/overlays/actors/z_boss_sst.data.s +++ /dev/null @@ -1,140 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .data - -.balign 16 - -glabel D_80936990 - .word 0xE7000000, 0x00000000, 0xFC71FE04, 0x5FFEFDF8, 0xDF000000, 0x00000000 -glabel D_809369A8 - .word 0xE7000000, 0x00000000, 0xFCFFFE04, 0xFFFDF7F8, 0xE200001C, 0x0C1849F8, 0xDF000000, 0x00000000 -glabel D_809369C8 - .word 0x01900190, 0x00000000, 0x08000000, 0xFFFFFFFF, 0xFE700190, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFE70FE70, 0x00000000, 0x00001800, 0xFFFFFFFF, 0x0190FE70, 0x00000000, 0x08001800, 0xFFFFFFFF -glabel D_80936A08 - .word 0x04040404, 0x04040404, 0x04040404, 0x04040404, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x0C0C0C0C, 0x10101010, 0x10101010, 0x10101010, 0x10101010, 0x14141414, 0x14141414, 0x14141414, 0x14141414, 0x18181818, 0x18181818, 0x18181818, 0x18181818, 0x1C1C1C1C, 0x1C1C1C1C, 0x1C1C1C1C, 0x1C1C1C1C, 0x20202020, 0x20202020, 0x20202020, 0x20202020, 0x24242424, 0x24242424, 0x24242424, 0x24242424, 0x28282828, 0x28282828, 0x28282828, 0x28282828, 0x2C2C2C2C, 0x2C2C2C2C, 0x2C2C2C2C, 0x2C2C2C2C, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x34343434, 0x34343434, 0x34343434, 0x34343434, 0x38383838, 0x38383838, 0x38383838, 0x38383838, 0x3C3C3C3C, 0x3C3C3C3C, 0x3C3C3C3C, 0x3C3C3C3C, 0x40404040, 0x40404040, 0x40404040, 0x40404040, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x48484848, 0x48484848, 0x48484848, 0x48484848, 0x4C4C4C4C, 0x4C4C4C4C, 0x4C4C4C4C, 0x4C4C4C4C, 0x50505050, 0x50505050, 0x50505050, 0x50505050, 0x54545454, 0x54545454, 0x54545454, 0x54545454, 0x58585858, 0x58585858, 0x58585858, 0x58585858, 0x5C5C5C5C, 0x5C5C5C5C, 0x5C5C5C5C, 0x5C5C5C5C, 0x60606060, 0x60606060, 0x60606060, 0x60606060, 0x64646464, 0x64646464, 0x64646464, 0x64646464, 0x68686868, 0x68686868, 0x68686868, 0x68686868, 0x6C6C6C6C, 0x6C6C6C6C, 0x6C6C6C6C, 0x6C6C6C6C, 0x70707070, 0x70707070, 0x70707070, 0x70707070, 0x74747474, 0x74747474, 0x74747474, 0x74747474, 0x78787878, 0x78787878, 0x78787878, 0x78787878, 0x7C7C7C7C, 0x7C7C7C7C, 0x7C7C7C7C, 0x7C7C7C7C, 0x80808080, 0x80808080, 0x80808080, 0x80808080, 0x84848484, 0x84848484, 0x84848484, 0x84848484, 0x88888888, 0x88888888, 0x88888888, 0x88888888, 0x8C8C8C8C, 0x8C8C8C8C, 0x8C8C8C8C, 0x8C8C8C8C, 0x90909090, 0x90909090, 0x90909090, 0x90909090, 0x94949494, 0x94949494, 0x94949494, 0x94949494, 0x98989898, 0x98989898, 0x98989898, 0x98989898, 0x9C9C9C9C, 0x9C9C9C9C, 0x9C9C9C9C, 0x9C9C9C9C, 0xA0A0A0A0, 0xA0A0A0A0, 0xA0A0A0A0, 0xA0A0A0A0, 0xA4A4A4A4, 0xA4A4A4A4, 0xA4A4A4A4, 0xA4A4A4A4, 0xA8A8A8A8, 0xA8A8A8A8, 0xA8A8A8A8, 0xA8A8A8A8, 0xACACACAC, 0xACACACAC, 0xACACACAC, 0xACACACAC, 0xB0B0B0B0, 0xB0B0B0B0, 0xB0B0B0B0, 0xB0B0B0B0, 0xB4B4B4B4, 0xB4B4B4B4, 0xB4B4B4B4, 0xB4B4B4B4, 0xB8B8B8B8, 0xB8B8B8B8, 0xB8B8B8B8, 0xB8B8B8B8, 0xBCBCBCBC, 0xBCBCBCBC, 0xBCBCBCBC, 0xBCBCBCBC, 0xC0C0C0C0, 0xC0C0C0C0, 0xC0C0C0C0, 0xC0C0C0C0, 0xC4C4C4C4, 0xC4C4C4C4, 0xC4C4C4C4, 0xC4C4C4C4, 0xC8C8C8C8, 0xC8C8C8C8, 0xC8C8C8C8, 0xC8C8C8C8, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xD0D0D0D0, 0xD0D0D0D0, 0xD0D0D0D0, 0xD0D0D0D0, 0xD4D4D4D4, 0xD4D4D4D4, 0xD4D4D4D4, 0xD4D4D4D4, 0xD8D8D8D8, 0xD8D8D8D8, 0xD8D8D8D8, 0xD8D8D8D8, 0xDCDCDCDC, 0xDCDCDCDC, 0xDCDCDCDC, 0xDCDCDCDC, 0xE0E0E0E0, 0xE0E0E0E0, 0xE0E0E0E0, 0xE0E0E0E0, 0xE4E4E4E4, 0xE4E4E4E4, 0xE4E4E4E4, 0xE4E4E4E4, 0xE8E8E8E8, 0xE8E8E8E8, 0xE8E8E8E8, 0xE8E8E8E8, 0xECECECEC, 0xECECECEC, 0xECECECEC, 0xECECECEC, 0xF0F0F0F0, 0xF0F0F0F0, 0xF0F0F0F0, 0xF0F0F0F0, 0xF4F4F4F4, 0xF4F4F4F4, 0xF4F4F4F4, 0xF4F4F4F4, 0xF8F8F8F8, 0xF8F8F8F8, 0xF8F8F8F8, 0xF8F8F8F8, 0xFCFCFCFC, 0xFCFCFCFC, 0xFCFCFCFC, 0xFCFCFCFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF -glabel D_80936E08 - .word 0xE7000000, 0x00000000, 0xDA380001, 0x01000000, 0xD7000002, 0xFFFFFFFF, 0xFCFFB3FF, 0xFFFFFEF8, 0xE200001C, 0x0C184A70, 0xD9FCFBFF, 0x00000000, 0xFB000000, 0x00000000, 0xFD900000 -.word D_80936A08 -.word 0xF5900000, 0x07098040, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF400, 0xE7000000, 0x00000000, 0xF5880400, 0x00098040, 0xF2000000, 0x0003C0FC, 0x01004008 -.word D_809369C8 -.word 0x06000204, 0x00000406, 0xDF000000, 0x00000000 -glabel D_80936E90 - .word 0xFF800000, 0x004B0000, 0xFD81FF81, 0xA097CDFF, 0x00810000, 0x004A0000, 0x066AFF5B, 0xA097CDFF, 0x00000000, 0xFF6C0000, 0x02160726, 0xA097CDFF -glabel D_80936EC0 - .word 0x00000000, 0x00000000, 0x01060907, 0x1215222F, 0x3129200D, 0x06030100, 0x00000000, 0x00000000, 0x00000000, 0x00000101, 0x07203A46, 0x526B8591, 0x968E744C, 0x2C1B0F09, 0x00000000, 0x00000000, 0x00000000, 0x0003040F, 0x235793B3, 0xC9D8E4E9, 0xE9E7D2B3, 0x8B704B29, 0x0F040000, 0x00000000, 0x00000000, 0x01061538, 0x6EA4DDF2, 0xFAFDFFFD, 0xFDFAFAEF, 0xDECAAC7C, 0x43170301, 0x00000000, 0x00000000, 0x04184382, 0xC6E3F7FD, 0xFFFFFFFF, 0xFFFFFBFB, 0xF8F2EECC, 0x8E4F1A04, 0x03000000, 0x00000001, 0x175190C4, 0xF1FBFDFF, 0xFFFFFFFF, 0xFFFDFFFD, 0xFDFDF8EC, 0xCC8E4612, 0x03000000, 0x01010307, 0x4EA7CFE9, 0xF7FDFFFF, 0xFFFFFFFF, 0xFFFFFDFF, 0xFFFDFFF8, 0xEEC98134, 0x07000000, 0x00010721, 0x9EE1E7F4, 0xFAFDFFFF, 0xFFFFFFFD, 0xFFFDFFFF, 0xFFFFFFFB, 0xF7E4AF5C, 0x18010000, 0x0003134C, 0xD3ECEEF5, 0xFDFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFAF2CD85, 0x29060000, 0x00093485, 0xE0EBF1FA, 0xFFFFFFFF, 0xFFFFFFFD, 0xFDFFFFFF, 0xFFFFFDFA, 0xFAFAE4AA, 0x490C0000, 0x031051AC, 0xE7F4F8FA, 0xFFFFFFFF, 0xFFFFFFFD, 0xFDFFFFFF, 0xFFFFFBFA, 0xFAF7F1CD, 0x6D1A0300, 0x03156BC7, 0xEFF7FBFD, 0xFDFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFDFBFB, 0xFAF7F2DE, 0x90290400, 0x032088E0, 0xFAFBFAFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDFA, 0xF7F1ECE3, 0xA8430C01, 0x06269EEE, 0xFBFBFFFF, 0xFDFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDFA, 0xEEE6E9E3, 0xB3511001, 0x041DA7F4, 0xFFFDFFFF, 0xFFFFFFFF, 0xFFFDFFFF, 0xFFFFFFFF, 0xFFFDFFFB, 0xF5F1EBE3, 0xB85F1501, 0x0315A7F8, 0xFFFDFDFF, 0xFFFFFFFF, 0xFFFDFFFF, 0xFFFFFFFF, 0xFFFFFFFD, 0xFAF4EFE7, 0xC06B1A09, 0x0315B8FD, 0xFFFDFDFF, 0xFDFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFAF4EEE9, 0xCC7A1809, 0x0C18CDFF, 0xFAFBFDFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFDFFFF, 0xFBF4EEEB, 0xD27D1509, 0x090FC9F5, 0xE9F7FBFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFDFFFF, 0xFFFFFFFB, 0xF7EFE9E7, 0xC6731707, 0x0406B9EC, 0xD7F1FBFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFDFFFF, 0xFFFFFFFA, 0xF7F1E9E1, 0xB55D0F09, 0x00039EF1, 0xDAEEFAFD, 0xFDFFFFFF, 0xFFFFFFFF, 0xFFFDFFFD, 0xFDFDFBFD, 0xF8F1ECD8, 0x9845090C, 0x00035DF2, 0xEEF5F7F7, 0xFAFDFFFF, 0xFFFFFFFF, 0xFFFBFBFD, 0xFBFBFBFA, 0xF5F1EFD2, 0x872F040A, 0x000120C7, 0xEBF5F2EC, 0xF4FDFFFF, 0xFFFFFDFD, 0xFFFFFDFB, 0xFAFAFAF4, 0xF2EFEEC7, 0x6D230407, 0x0000037D, 0xCDF2ECE6, 0xF1F8FBFF, 0xFFFFFFFF, 0xFDFDFBFB, 0xF8F7F8F4, 0xECF2E6A8, 0x4B130A07, 0x0000013A, 0x9BEBEBDD, 0xE3F5FDFF, 0xFFFFFFFF, 0xFFFDFDFB, 0xF8F8F4EF, 0xEBEBCD76, 0x2609090D, 0x00000017, 0x62D7E9DD, 0xDEF2FBFF, 0xFFFFFDFF, 0xFFFFFDFB, 0xF8F8F4F2, 0xEFE3A140, 0x0D030309, 0x00000003, 0x2082E0E1, 0xE7F5FFFF, 0xFFFFFFFD, 0xFFFBFDFB, 0xFAF8F7F1, 0xE4BE661D, 0x03000101, 0x00000000, 0x042B96CC, 0xD8EEFBFF, 0xFFFFFFFF, 0xFFFDFBFB, 0xFAFAF7E6, 0xC3772906, 0x00000000, 0x00000000, 0x00032154, 0x79B0D8F1, 0xF8FFFFFF, 0xFDFAF7EF, 0xE6D3B685, 0x4B1A0400, 0x00000000, 0x00000000, 0x0000030A, 0x183D73AA, 0xD5ECF4F7, 0xF2E1CAB3, 0x9E7D5129, 0x0C010000, 0x00000000, 0x00000000, 0x00000000, 0x0003040C, 0x274E6B73, 0x62544C43, 0x3A271706, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x060F1B15, 0x100C120F, 0x0C090401, 0x00000000, 0x00000000 -glabel D_809372C0 - .word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_80936EC0 -.word 0xF5900000, 0x07094250, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF200, 0xE7000000, 0x00000000, 0xF5880800, 0x00094250, 0xF2000000, 0x0007C07C, 0xFC719BFF, 0x5FFEFE38, 0xE200001C, 0x0C184DD8, 0xD9F2FFFF, 0x00000000, 0xD9FFFFFF, 0x00020400, 0x01003006 -.word D_80936E90 -.word 0x05000204, 0x00000000, 0xDF000000, 0x00000000 -glabel D_80937340 - .word 0xC2480000, 0x00000000 -glabel D_80937348 - .word 0x00000000 -glabel D_8093734C - .word 0x00000000 -glabel D_80937350 - .word 0x00000000, 0x00000000 -glabel D_80937358 - .word 0x42C80000, 0x42C80000 -glabel D_80937360 - .word 0x00000000 -glabel D_80937364 - .word 0x00000000 -glabel D_80937368 - .word 0x00000000 -glabel D_8093736C - .word 0x00000000 -glabel D_80937370 - .word 0x00000000 -glabel D_80937374 - .word 0x00000000 -glabel D_80937378 - .word 0x00000000 -glabel D_8093737C - .word 0xC2C80000, 0x43960000, 0x00000000, 0x42C80000, 0x43960000, 0x42C80000, 0xC2480000, 0x44160000, 0x42C80000 -glabel D_809373A0 - .word 0x00000000, 0x43C80000, 0x43480000, 0x00000000, 0x43480000, 0x43480000, 0xC2C80000, 0x00000000, 0x43480000, 0xC3480000, 0x00000000, 0x42C80000, 0xC2DC0000, 0x43340000, 0x44368000 -glabel D_809373DC - .word 0x43480000, 0x44480000, 0x44480000, 0xC3480000, 0x442F0000, 0x44AF0000, 0x43480000, 0x42C80000, 0x443B8000 -glabel D_80937400 - .word 0x00000000, 0x43480000, 0x44610000, 0x00000000, 0x43480000, 0x44610000, 0x43960000, 0x43C80000, 0x44960000, 0xC2C80000, 0x43480000, 0x44480000, 0xC2C80000, 0x43480000, 0x44480000 -glabel D_8093743C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80937448 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_80937464 - .word 0xFFFFFFFF -glabel D_80937468 - .word 0x000000FF -glabel D_8093746C - .word 0x00000000, 0x00000000 -glabel Boss_Sst_InitVars - .word 0x00E90900, 0x00000435, 0x00E20000, 0x00000A98 -.word BossSst_Init -.word BossSst_Destroy -.word BossSst_Update -.word BossSst_Draw -glabel D_80937494 - .word 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x020007D0, 0xFA2400FA, 0x00410064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x0A000000, 0x00000000, 0x00160064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x0B0001F4, 0x00000000, 0x00160064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x0F00FF06, 0xFF060000, 0x00190064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x100001F4, 0xFF060000, 0x00190064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x140000FA, 0xFF060000, 0x00190064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x150001F4, 0xFF060000, 0x00190064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x19000000, 0x00000000, 0x001B0064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x1A0002EE, 0x00000000, 0x001A0064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x050002EE, 0xFF6A0000, 0x00150064, 0x01000000, 0x20000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x060002EE, 0x00000000, 0x00140064 -glabel D_80937620 - .word 0x00100938, 0x10000000, 0x0000000B -.word D_80937494 -glabel D_80937630 - .word 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x070005DC, 0x00000000, 0x00460064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x06000000, 0x00000000, 0x004B0064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x04001388, 0x00000000, 0x00780064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x0300F63C, 0x00000000, 0x00960064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x2B0005DC, 0x00000000, 0x00500064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x2B001D4C, 0x00000000, 0x00460064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x2C000BB8, 0x00000000, 0x003C0064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x280005DC, 0x00000000, 0x00500064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x28001D4C, 0x00000000, 0x00460064, 0x01000000, 0x20000000, 0x00300000, 0xFFCFFFFF, 0x00000000, 0x01010100, 0x29000BB8, 0x00000000, 0x003C0064, 0x01000000, 0x20000000, 0x00300000, 0x00000080, 0x00000000, 0x01000100, 0x080005DC, 0x00000000, 0x00460064 -glabel D_809377BC - .word 0x0C100D38, 0x10000000, 0x0000000B -.word D_80937630 -glabel D_809377CC - .word 0x00000800, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010000, 0x00550064, 0xFFCE0000, 0x00000000 -glabel D_809377F8 - .word 0x0A100000, 0x10010000, 0x00000000, 0x20000000, 0x04100000, 0x00000000, 0x00000000, 0x19000000 -glabel D_80937818 - .word 0x00550001, 0x00000000, 0x00000000 -glabel D_80937824 - .word 0x24000064, 0x0064C800 -glabel D_8093782C - .word 0x00020102, 0x00020202, 0x01020402, 0x34020402, 0x02003444, 0x00000104, 0x02020804, 0x00000400 -glabel D_8093784C - .word 0x060002E8, 0x06005860 -glabel D_80937854 - .word 0x06004EC4, 0x0600A434 -glabel D_8093785C - .word 0x06004FB4, 0x0600A524 -glabel D_80937864 - .word 0x060050A8, 0x0600A618 -glabel D_8093786C - .word 0x0600529C, 0x0600A848 -glabel D_80937874 - .word 0x0600539C, 0x0600A948 -glabel D_8093787C - .word 0x0600549C, 0x0600AA4C -glabel D_80937884 - .word 0x06005588, 0x0600AB38 -glabel D_8093788C - .word 0x89170029, 0x801F0005, 0x48500014 -glabel D_80937898 - .byte 0x50, 0x50, 0x96 -glabel D_8093789B - .byte 0xFF -glabel D_8093789C - .byte 0x28, 0x28, 0x50 -glabel D_8093789F - .byte 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x64, 0x64, 0x64, 0x00 -glabel D_809378A8 - .word 0x00000000 -glabel D_809378AC - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_809378B8 - .word 0x447A0000, 0x00000000, 0x00000000 -glabel D_809378C4 - .word 0x00000000, 0x00000000, 0x43AA0000, 0xC3200000, 0x00000000, 0x437A0000, 0x43200000, 0x00000000, 0x437A0000 -glabel D_809378E8 - .word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_boss_sst.reloc.s b/data/overlays/actors/z_boss_sst.reloc.s deleted file mode 100644 index c6df37dbdd..0000000000 --- a/data/overlays/actors/z_boss_sst.reloc.s +++ /dev/null @@ -1,13 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purpose registers - -.section .rodata - -.balign 16 - -glabel D_80937A80 - .incbin "baserom/ovl_Boss_Sst", 0xB4B0, 0x00001210 diff --git a/diff.py b/diff.py old mode 100755 new mode 100644 diff --git a/include/functions.h b/include/functions.h index e2a079f21a..c55f8cd197 100644 --- a/include/functions.h +++ b/include/functions.h @@ -669,7 +669,7 @@ void func_8003ECA8(GlobalContext* globalCtx, DynaCollisionContext* dyna, s32 bgI s32 DynaPoly_SetBgActor(GlobalContext* globalCtx, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader); DynaPolyActor* DynaPoly_GetActor(CollisionContext* colCtx, s32 bgId); void DynaPoly_DeleteBgActor(GlobalContext* globalCtx, DynaCollisionContext* dyna, s32 bgId); -// ? DynaPoly_ExpandSRT(?); +void func_8003EE6C(GlobalContext* globalCtx, DynaCollisionContext* dyna); void func_8003F8EC(GlobalContext* globalCtx, DynaCollisionContext* dyna, Actor* actor); void DynaPoly_Setup(GlobalContext* globalCtx, DynaCollisionContext* dyna); void DynaPoly_UpdateBgActorTransforms(GlobalContext* globalCtx, DynaCollisionContext* dyna); @@ -1236,8 +1236,8 @@ void func_80094D28(Gfx** gfxp); Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height); Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y); Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height); -Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, - u32 y2, s32 width2, s32 height2); +Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, + u32 x2, u32 y2, s32 width2, s32 height2); Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a); Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a); diff --git a/spec b/spec index 9a68d55ed1..86d8a7f11f 100644 --- a/spec +++ b/spec @@ -1307,8 +1307,7 @@ endseg beginseg name "ovl_Bg_Sst_Floor" include "build/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.o" - include "build/data/overlays/actors/z_bg_sst_floor.data.o" - include "build/data/overlays/actors/z_bg_sst_floor.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Sst_Floor/ovl_Bg_Sst_Floor_reloc.o" endseg beginseg @@ -1430,9 +1429,7 @@ endseg beginseg name "ovl_Boss_Sst" include "build/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.o" - include "build/data/overlays/actors/z_boss_sst.data.o" - include "build/data/overlays/actors/z_boss_sst.bss.o" - include "build/data/overlays/actors/z_boss_sst.reloc.o" + include "build/src/overlays/actors/ovl_Boss_Sst/ovl_Boss_Sst_reloc.o" endseg beginseg @@ -4785,7 +4782,8 @@ endseg beginseg name "object_sst" romalign 0x1000 - include "build/baserom/object_sst.o" + include "build/assets/objects/object_sst/object_sst.o" + number 6 endseg beginseg diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 290f41f2ac..128708f3df 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -1,15 +1,23 @@ +/* + * File: z_bg_sst_floor.c + * Overlay: ovl_Bg_Sst_Floor + * Description: Bongo Bongo's drum + */ + #include "z_bg_sst_floor.h" +#include "objects/object_sst/object_sst.h" #define FLAGS 0x00000030 #define THIS ((BgSstFloor*)thisx) -void BgSstFloor_Init(Actor* thisx, GlobalContext* globalCtx); -void BgSstFloor_Destroy(Actor* thisx, GlobalContext* globalCtx); -void BgSstFloor_Update(Actor* thisx, GlobalContext* globalCtx); -void BgSstFloor_Draw(Actor* thisx, GlobalContext* globalCtx); +void BgSstFloor_Init(BgSstFloor* this, GlobalContext* globalCtx); +void BgSstFloor_Destroy(BgSstFloor* this, GlobalContext* globalCtx); +void BgSstFloor_Update(BgSstFloor* this, GlobalContext* globalCtx); +void BgSstFloor_Draw(BgSstFloor* this, GlobalContext* globalCtx); + +static s32 sUnkValues[] = { 0, 0, 0 }; // Unused, probably a zero vector -/* const ActorInit Bg_Sst_Floor_InitVars = { ACTOR_BG_SST_FLOOR, ACTORCAT_BG, @@ -21,11 +29,112 @@ const ActorInit Bg_Sst_Floor_InitVars = { (ActorFunc)BgSstFloor_Update, (ActorFunc)BgSstFloor_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Destroy.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale.x, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Update.s") +void BgSstFloor_Init(BgSstFloor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgSstFloor* this = THIS; + CollisionHeader* colHeader = NULL; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s") + Actor_ProcessInitChain(&this->dyna.actor, sInitChain); + DynaPolyActor_Init(&this->dyna, DPM_PLAYER); + CollisionHeader_GetVirtual(&gBongoDrumCol, &colHeader); + this->dyna.bgId = + DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); +} + +void BgSstFloor_Destroy(BgSstFloor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgSstFloor* this = THIS; + + DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId); +} + +void BgSstFloor_Update(BgSstFloor* thisx, GlobalContext* globalCtx) { + s32 pad; + BgSstFloor* this = THIS; + Player* player = PLAYER; + CollisionHeader* colHeader = SEGMENTED_TO_VIRTUAL(&gBongoDrumCol); + + colHeader->vtxList = SEGMENTED_TO_VIRTUAL(colHeader->vtxList); + + if (1) {} + + if (func_80043590(&this->dyna) && (this->dyna.actor.yDistToPlayer < 1000.0f)) { + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_BOSS_SHADES); + } else { + Camera_ChangeSetting(globalCtx->cameraPtrs[MAIN_CAM], CAM_SET_DUNGEON0); + } + + if (func_8004356C(&this->dyna) && (player->fallDistance > 1000.0f)) { + this->dyna.actor.params = 1; + Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EN_SHADEST_TAIKO_HIGH); + } + + if (this->dyna.actor.params == BONGOFLOOR_HIT) { + Actor* item00 = globalCtx->actorCtx.actorLists[ACTORCAT_MISC].head; + f32 distFromRim; + f32 xzDist; + + this->drumAmp = 80; + this->dyna.actor.params = BONGOFLOOR_REST; + this->drumPhase = 28; + + if (func_8004356C(&this->dyna) && !(player->stateFlags1 & 0x6000)) { + distFromRim = 600.0f - this->dyna.actor.xzDistToPlayer; + if (distFromRim > 0.0f) { + if (distFromRim > 350.0f) { + distFromRim = 350.0f; + } + player->actor.bgCheckFlags &= ~1; + player->actor.velocity.y = 9.0f * distFromRim * (1.0f / 350.0f); + } + } + + while (item00 != NULL) { + if ((item00->id == ACTOR_EN_ITEM00) && (item00->world.pos.y == 0.0f)) { + xzDist = Actor_WorldDistXZToActor(&this->dyna.actor, item00); + distFromRim = 600.0f - xzDist; + if (xzDist < 600.0f) { + if (distFromRim > 350.0f) { + distFromRim = 350.0f; + } + item00->bgCheckFlags &= ~3; + item00->velocity.y = 9.0f * distFromRim * (1.0f / 350.0f); + } + } + item00 = item00->next; + } + } + this->drumHeight = sinf(this->drumPhase * (M_PI / 2)) * (-this->drumAmp); + Math_StepToS(&this->drumAmp, 0, 5); + + colHeader->vtxList[1].y = colHeader->vtxList[0].y = colHeader->vtxList[2].y = + colHeader->vtxList[3].y = colHeader->vtxList[4].y = colHeader->vtxList[7].y = + colHeader->vtxList[9].y = colHeader->vtxList[11].y = colHeader->vtxList[13].y = + this->dyna.actor.home.pos.y + this->drumHeight; + + if (this->drumPhase != 0) { + this->drumPhase--; + } + if (1) {} + func_8003EE6C(globalCtx, &globalCtx->colCtx.dyna); +} + +void BgSstFloor_Draw(BgSstFloor* thisx, GlobalContext* globalCtx) { + BgSstFloor* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 277); + func_80093D18(globalCtx->state.gfxCtx); + Matrix_Scale(1.0f, this->drumHeight * -0.0025f, 1.0f, MTXMODE_APPLY); + + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 283), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(POLY_OPA_DISP++, gBongoDrumDL); + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 287); +} diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h index 43b4453a30..992e41f9cf 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h @@ -7,10 +7,17 @@ struct BgSstFloor; typedef struct BgSstFloor { - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x0000 */ DynaPolyActor dyna; + /* 0x014C */ s16 drumPhase; + /* 0x0166 */ s16 drumAmp; + /* 0x0168 */ s16 drumHeight; } BgSstFloor; // size = 0x016C +typedef enum { + /* 0 */ BONGOFLOOR_REST, + /* 1 */ BONGOFLOOR_HIT +} BgSstFloorParams; + extern const ActorInit Bg_Sst_Floor_InitVars; #endif diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 4d5ab239ca..2fe71b65c3 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -1,15 +1,240 @@ +/* + * File: z_boss_sst.c + * Overlay: ovl_Boss_Sst + * Description: Bongo Bongo + */ + #include "z_boss_sst.h" +#include "objects/object_sst/object_sst.h" +#include "objects/gameplay_keep/gameplay_keep.h" +#include "overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h" #define FLAGS 0x00000435 #define THIS ((BossSst*)thisx) +#define vParity actionVar +#define vVanish actionVar + +#define LEFT 0 +#define RIGHT 1 +#define OTHER_HAND(hand) ((BossSst*)hand->actor.child) +#define HAND_STATE(hand) sHandState[hand->actor.params] + +#define ROOM_CENTER_X -50.0f +#define ROOM_CENTER_Y 0.0f +#define ROOM_CENTER_Z 0.0f + +typedef enum { + /* 0 */ HAND_WAIT, + /* 1 */ HAND_BEAT, + /* 2 */ HAND_RETREAT, + /* 3 */ HAND_SLAM, + /* 4 */ HAND_SWEEP, + /* 5 */ HAND_PUNCH, + /* 6 */ HAND_CLAP, + /* 7 */ HAND_GRAB, + /* 8 */ HAND_DAMAGED, + /* 9 */ HAND_FROZEN, + /* 10 */ HAND_BREAK_ICE, + /* 11 */ HAND_DEATH +} BossSstHandState; + +typedef enum { + /* 0 */ BONGO_NULL, + /* 1 */ BONGO_ICE, + /* 2 */ BONGO_SHOCKWAVE, + /* 3 */ BONGO_SHADOW +} BossSstEffectMode; + void BossSst_Init(Actor* thisx, GlobalContext* globalCtx); void BossSst_Destroy(Actor* thisx, GlobalContext* globalCtx); -void BossSst_Update(Actor* thisx, GlobalContext* globalCtx); -void BossSst_Draw(Actor* thisx, GlobalContext* globalCtx); +void BossSst_UpdateHand(Actor* thisx, GlobalContext* globalCtx); +void BossSst_UpdateHead(Actor* thisx, GlobalContext* globalCtx); +void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx); +void BossSst_DrawHead(Actor* thisx, GlobalContext* globalCtx); +void BossSst_UpdateEffect(Actor* thisx, GlobalContext* globalCtx); +void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx); + +void BossSst_HeadSfx(BossSst* this, u16 sfxId); + +void BossSst_HeadSetupLurk(BossSst* this); +void BossSst_HeadLurk(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupIntro(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadIntro(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupNeutral(BossSst* this); +void BossSst_HeadNeutral(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadWait(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HeadSetupDamagedHand(BossSst* this, s32 bothHands); +void BossSst_HeadDamagedHand(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupReadyCharge(BossSst* this); +void BossSst_HeadReadyCharge(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupCharge(BossSst* this); +void BossSst_HeadCharge(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupEndCharge(BossSst* this); +void BossSst_HeadEndCharge(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HeadSetupFrozenHand(BossSst* this); +void BossSst_HeadFrozenHand(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupUnfreezeHand(BossSst* this); +void BossSst_HeadUnfreezeHand(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HeadStunned(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupVulnerable(BossSst* this); +void BossSst_HeadVulnerable(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadDamage(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupRecover(BossSst* this); +void BossSst_HeadRecover(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HeadDeath(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupThrash(BossSst* this); +void BossSst_HeadThrash(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupDarken(BossSst* this); +void BossSst_HeadDarken(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupFall(BossSst* this); +void BossSst_HeadFall(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupMelt(BossSst* this); +void BossSst_HeadMelt(BossSst* this, GlobalContext* globalCtx); +void BossSst_HeadSetupFinish(BossSst* this); +void BossSst_HeadFinish(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandGrabPlayer(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandReleasePlayer(BossSst* this, GlobalContext* globalCtx, s32 dropPlayer); +void BossSst_HandSelectAttack(BossSst* this); +void BossSst_HandSetDamage(BossSst* this, s32 damage); +void BossSst_HandSetInvulnerable(BossSst* this, s32 isInv); + +void BossSst_HandSetupWait(BossSst* this); +void BossSst_HandWait(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupDownbeat(BossSst* this); +void BossSst_HandDownbeat(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupOffbeat(BossSst* this); +void BossSst_HandOffbeat(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupDownbeatEnd(BossSst* this); +void BossSst_HandDownbeatEnd(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupOffbeatEnd(BossSst* this); +void BossSst_HandOffbeatEnd(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandReadySlam(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupSlam(BossSst* this); +void BossSst_HandSlam(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandEndSlam(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandReadySweep(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupSweep(BossSst* this); +void BossSst_HandSweep(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandReadyPunch(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupPunch(BossSst* this); +void BossSst_HandPunch(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandReadyClap(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupClap(BossSst* this); +void BossSst_HandClap(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupEndClap(BossSst* this); +void BossSst_HandEndClap(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandReadyGrab(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupGrab(BossSst* this); +void BossSst_HandGrab(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupCrush(BossSst* this); +void BossSst_HandCrush(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupEndCrush(BossSst* this); +void BossSst_HandEndCrush(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupSwing(BossSst* this); +void BossSst_HandSwing(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandSetupRetreat(BossSst* this); +void BossSst_HandRetreat(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandSetupReel(BossSst* this); +void BossSst_HandReel(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupReadyShake(BossSst* this); +void BossSst_HandReadyShake(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupShake(BossSst* this); +void BossSst_HandShake(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupReadyCharge(BossSst* this); +void BossSst_HandReadyCharge(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandSetupFrozen(BossSst* this); +void BossSst_HandFrozen(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupReadyBreakIce(BossSst* this); +void BossSst_HandReadyBreakIce(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupBreakIce(BossSst* this); +void BossSst_HandBreakIce(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandStunned(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandDamage(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupRecover(BossSst* this); +void BossSst_HandRecover(BossSst* this, GlobalContext* globalCtx); + +void BossSst_HandSetupThrash(BossSst* this); +void BossSst_HandThrash(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupDarken(BossSst* this); +void BossSst_HandDarken(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupFall(BossSst* this); +void BossSst_HandFall(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupMelt(BossSst* this); +void BossSst_HandMelt(BossSst* this, GlobalContext* globalCtx); +void BossSst_HandSetupFinish(BossSst* this); +void BossSst_HandFinish(BossSst* this, GlobalContext* globalCtx); + +void BossSst_SpawnHeadShadow(BossSst* this); +void BossSst_SpawnHandShadow(BossSst* this); +void BossSst_SpawnShockwave(BossSst* this); +void BossSst_SpawnIceCrystal(BossSst* this, s32 index); +void BossSst_SpawnIceShard(BossSst* this); +void BossSst_IceShatter(BossSst* this); + +#include "overlays/ovl_Boss_Sst/ovl_Boss_Sst.c" + +static BossSst* sHead; +static BossSst* sHands[2]; +static BgSstFloor* sFloor; + +static Vec3f sRoomCenter = { ROOM_CENTER_X, ROOM_CENTER_Y, ROOM_CENTER_Z }; +static Vec3f sHandOffsets[2]; +static s16 sHandYawOffsets[2]; + +static s16 sCutsceneCamera; +static Vec3f sCameraAt = { ROOM_CENTER_X + 50.0f, ROOM_CENTER_Y + 0.0f, ROOM_CENTER_Z + 0.0f }; +static Vec3f sCameraEye = { ROOM_CENTER_X + 150.0f, ROOM_CENTER_Y + 100.0f, ROOM_CENTER_Z + 0.0f }; +static Vec3f sCameraAtVel = { 0.0f, 0.0f, 0.0f }; +static Vec3f sCameraEyeVel = { 0.0f, 0.0f, 0.0f }; + +static Vec3f sCameraAtPoints[] = { + { ROOM_CENTER_X - 50.0f, ROOM_CENTER_Y + 300.0f, ROOM_CENTER_Z + 0.0f }, + { ROOM_CENTER_X + 150.0f, ROOM_CENTER_Y + 300.0f, ROOM_CENTER_Z + 100.0f }, + { ROOM_CENTER_X + 0.0f, ROOM_CENTER_Y + 600.0f, ROOM_CENTER_Z + 100.0f }, + { ROOM_CENTER_X + 50.0f, ROOM_CENTER_Y + 400.0f, ROOM_CENTER_Z + 200.0f }, + { ROOM_CENTER_X + 50.0f, ROOM_CENTER_Y + 200.0f, ROOM_CENTER_Z + 200.0f }, + { ROOM_CENTER_X - 50.0f, ROOM_CENTER_Y + 0.0f, ROOM_CENTER_Z + 200.0f }, + { ROOM_CENTER_X - 150.0f, ROOM_CENTER_Y + 0.0f, ROOM_CENTER_Z + 100.0f }, + { ROOM_CENTER_X - 60.0f, ROOM_CENTER_Y + 180.0f, ROOM_CENTER_Z + 730.0f }, +}; + +static Vec3f sCameraEyePoints[] = { + { ROOM_CENTER_X + 250.0f, ROOM_CENTER_Y + 800.0f, ROOM_CENTER_Z + 800.0f }, + { ROOM_CENTER_X - 150.0f, ROOM_CENTER_Y + 700.0f, ROOM_CENTER_Z + 1400.0f }, + { ROOM_CENTER_X + 250.0f, ROOM_CENTER_Y + 100.0f, ROOM_CENTER_Z + 750.0f }, + { ROOM_CENTER_X + 50.0f, ROOM_CENTER_Y + 200.0f, ROOM_CENTER_Z + 900.0f }, + { ROOM_CENTER_X + 50.0f, ROOM_CENTER_Y + 200.0f, ROOM_CENTER_Z + 900.0f }, + { ROOM_CENTER_X + 350.0f, ROOM_CENTER_Y + 400.0f, ROOM_CENTER_Z + 1200.0f }, + { ROOM_CENTER_X - 50.0f, ROOM_CENTER_Y + 200.0f, ROOM_CENTER_Z + 800.0f }, + { ROOM_CENTER_X - 50.0f, ROOM_CENTER_Y + 200.0f, ROOM_CENTER_Z + 800.0f }, +}; + +static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; +static u32 sBodyStatic = false; + +// Unreferenced. Maybe two zero vectors? +static u32 sUnkValues[] = { 0, 0, 0, 0, 0, 0 }; + +static Color_RGBA8 sBodyColor = { 255, 255, 255, 255 }; +static Color_RGBA8 sStaticColor = { 0, 0, 0, 255 }; +static s32 sHandState[] = { HAND_WAIT, HAND_WAIT }; -/* const ActorInit Boss_Sst_InitVars = { ACTOR_BOSS_SST, ACTORCAT_BOSS, @@ -18,604 +243,2982 @@ const ActorInit Boss_Sst_InitVars = { sizeof(BossSst), (ActorFunc)BossSst_Init, (ActorFunc)BossSst_Destroy, - (ActorFunc)BossSst_Update, - (ActorFunc)BossSst_Draw, + (ActorFunc)BossSst_UpdateHand, + (ActorFunc)BossSst_DrawHand, }; -static ColliderJntSphElementInit D_80937630[11] = { - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 7, { { 1500, 0, 0 }, 70 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 6, { { 0, 0, 0 }, 75 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 4, { { 5000, 0, 0 }, 120 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 3, { { -2500, 0, 0 }, 150 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 43, { { 1500, 0, 0 }, 80 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 43, { { 7500, 0, 0 }, 70 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 44, { { 3000, 0, 0 }, 60 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 40, { { 1500, 0, 0 }, 80 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 40, { { 7500, 0, 0 }, 70 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 41, { { 3000, 0, 0 }, 60 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x30 }, - { 0x00000080, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, - OCELEM_ON, - }, - { 8, { { 1500, 0, 0 }, 70 }, 100 }, - }, +#include "z_boss_sst_colchk.c" + +static AnimationHeader* sHandIdleAnims[] = { &gBongoLeftHandIdleAnim, &gBongoRightHandIdleAnim }; +static AnimationHeader* sHandFlatPoses[] = { &gBongoLeftHandFlatPoseAnim, &gBongoRightHandFlatPoseAnim }; +static AnimationHeader* sHandOpenPoses[] = { &gBongoLeftHandOpenPoseAnim, &gBongoRightHandOpenPoseAnim }; +static AnimationHeader* sHandFistPoses[] = { &gBongoLeftHandFistPoseAnim, &gBongoRightHandFistPoseAnim }; +static AnimationHeader* sHandClenchAnims[] = { &gBongoLeftHandClenchAnim, &gBongoRightHandClenchAnim }; +static AnimationHeader* sHandDamagePoses[] = { &gBongoLeftHandDamagePoseAnim, &gBongoRightHandDamagePoseAnim }; +static AnimationHeader* sHandPushoffPoses[] = { &gBongoLeftHandPushoffPoseAnim, &gBongoRightHandPushoffPoseAnim }; +static AnimationHeader* sHandHangPoses[] = { &gBongoLeftHandHangPoseAnim, &gBongoRightHandHangPoseAnim }; + +static InitChainEntry sInitChain[] = { + ICHAIN_S8(naviEnemyId, 41, ICHAIN_CONTINUE), + ICHAIN_U8(targetMode, 5, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 20, ICHAIN_STOP), }; -static ColliderJntSphInit D_809377BC = { - { - COLTYPE_HARD, - AT_TYPE_ENEMY, - AC_ON | AC_HARD | AC_TYPE_PLAYER, - OC1_TYPE_ALL, - OC2_TYPE_1, - COLSHAPE_JNTSPH, - }, - 11, - D_80937630, -}; - -static ColliderCylinderInit D_809377CC = { - { - COLTYPE_HIT0, - AT_NONE, - AC_NONE | AC_TYPE_PLAYER, - OC1_NONE, - OC2_TYPE_1, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK0, - { 0x00000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_ON, - OCELEM_NONE, - }, - { 85, 100, -50, { 0, 0, 0 } }, -}; - -static ColliderJntSphElementInit D_80937494[11] = { - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 2, { { 2000, -1500, 250 }, 65 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 10, { { 0, 0, 0 }, 22 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 11, { { 500, 0, 0 }, 22 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 15, { { -250, -250, 0 }, 25 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 16, { { 500, -250, 0 }, 25 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 20, { { 250, -250, 0 }, 25 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 21, { { 500, -250, 0 }, 25 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 25, { { 0, 0, 0 }, 27 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 26, { { 750, 0, 0 }, 26 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 5, { { 750, -150, 0 }, 21 }, 100 }, - }, - { - { - ELEMTYPE_UNK1, - { 0x20000000, 0x00, 0x00 }, - { 0xFFCFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, - OCELEM_ON, - }, - { 6, { { 750, 0, 0 }, 20 }, 100 }, - }, -}; - -static ColliderJntSphInit D_80937620 = { - { - COLTYPE_HIT0, - AT_TYPE_ENEMY, - AC_ON | AC_TYPE_PLAYER, - OC1_TYPE_ALL, - OC2_TYPE_1, - COLSHAPE_JNTSPH, - }, - 11, - D_80937494, -}; - -static ColliderCylinderInit D_809377F8 = { - { - COLTYPE_NONE, - AT_TYPE_ENEMY, - AC_NONE, - OC1_NONE, - OC2_TYPE_1, - COLSHAPE_CYLINDER, - }, - { - ELEMTYPE_UNK0, - { 0x20000000, 0x04, 0x10 }, - { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, - OCELEM_NONE, - }, - { 85, 1, 0, { 0, 0, 0 } }, -}; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CAD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CB0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DAB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DB4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DD50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DEA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DFFC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E2E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E438.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E510.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E830.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA00.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EAE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EC74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092ED9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F0BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F374.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F3F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F434.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F65C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F6F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F790.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F7DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F894.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F8F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FC60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FE44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FFF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930158.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930284.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093043C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809307B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930934.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930BC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930D70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930FE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809310CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931300.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931560.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809317F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931928.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931A5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931EF8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093265C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932674.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093285C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932C38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809330B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933134.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933170.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809331E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933210.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933328.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809333F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933608.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933724.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933748.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809338DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933978.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809339F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933B84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933C80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933CEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933D54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933EE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934338.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809345F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934628.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80934A44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935238.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935764.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935890.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935948.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935A20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935CDC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80935F30.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s") +void BossSst_Init(Actor* thisx, GlobalContext* globalCtx2) { + GlobalContext* globalCtx = globalCtx2; + BossSst* this = THIS; + + Actor_ProcessInitChain(&this->actor, sInitChain); + Collider_InitCylinder(globalCtx, &this->colliderCyl); + Collider_InitJntSph(globalCtx, &this->colliderJntSph); + CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); + Flags_SetSwitch(globalCtx, 0x14); + if (this->actor.params == BONGO_HEAD) { + sFloor = (BgSstFloor*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BG_SST_FLOOR, sRoomCenter.x, + sRoomCenter.y, sRoomCenter.z, 0, 0, 0, BONGOFLOOR_REST); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBongoHeadSkel, &gBongoHeadEyeOpenIdleAnim, this->jointTable, + this->morphTable, 45); + ActorShape_Init(&this->actor.shape, 70000.0f, ActorShadow_DrawCircle, 95.0f); + Collider_SetJntSph(globalCtx, &this->colliderJntSph, &this->actor, &sJntSphInitHead, this->colliderItems); + Collider_SetCylinder(globalCtx, &this->colliderCyl, &this->actor, &sCylinderInitHead); + sHead = this; + this->actor.world.pos.x = ROOM_CENTER_X + 50.0f; + this->actor.world.pos.y = ROOM_CENTER_Y + 0.0f; + this->actor.world.pos.z = ROOM_CENTER_Z - 650.0f; + this->actor.home.pos = this->actor.world.pos; + this->actor.shape.rot.y = 0; + if (Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y, + ROOM_CENTER_Z + 400.0f, 0, 0, 0, -1); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_B_HEART, ROOM_CENTER_X, ROOM_CENTER_Y, + ROOM_CENTER_Z - 200.0f, 0, 0, 0, 0); + Actor_Kill(&this->actor); + } else { + sHands[LEFT] = + (BossSst*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BOSS_SST, this->actor.world.pos.x + 200.0f, + this->actor.world.pos.y, this->actor.world.pos.z + 400.0f, 0, + this->actor.shape.rot.y, 0, BONGO_LEFT_HAND); + sHands[RIGHT] = (BossSst*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_BOSS_SST, + this->actor.world.pos.x + (-200.0f), this->actor.world.pos.y, + this->actor.world.pos.z + 400.0f, 0, this->actor.shape.rot.y, 0, + BONGO_RIGHT_HAND); + sHands[LEFT]->actor.child = &sHands[RIGHT]->actor; + sHands[RIGHT]->actor.child = &sHands[LEFT]->actor; + + this->actor.flags &= ~1; + this->actor.update = BossSst_UpdateHead; + this->actor.draw = BossSst_DrawHead; + this->radius = -650.0f; + this->actor.targetArrowOffset = 4000.0f; + BossSst_HeadSetupLurk(this); + Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_BOSS); + } + } else { + Collider_SetJntSph(globalCtx, &this->colliderJntSph, &this->actor, &sJntSphInitHand, this->colliderItems); + Collider_SetCylinder(globalCtx, &this->colliderCyl, &this->actor, &sCylinderInitHand); + if (this->actor.params == BONGO_LEFT_HAND) { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBongoLeftHandSkel, &gBongoLeftHandIdleAnim, + this->jointTable, this->morphTable, 27); + this->vParity = -1; + this->colliderJntSph.elements[0].dim.modelSphere.center.z *= -1; + } else { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBongoRightHandSkel, &gBongoRightHandIdleAnim, + this->jointTable, this->morphTable, 27); + this->vParity = 1; + } + + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 95.0f); + this->handZPosMod = -3500; + this->actor.targetArrowOffset = 5000.0f; + this->actor.flags &= ~1; + BossSst_HandSetupWait(this); + } +} + +void BossSst_Destroy(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BossSst* this = THIS; + + Collider_DestroyJntSph(globalCtx, &this->colliderJntSph); + Collider_DestroyCylinder(globalCtx, &this->colliderCyl); + func_800F89E8(&this->center); +} + +void BossSst_HeadSetupLurk(BossSst* this) { + this->actor.draw = NULL; + sHands[LEFT]->actor.draw = NULL; + sHands[RIGHT]->actor.draw = NULL; + this->vVanish = false; + this->actionFunc = BossSst_HeadLurk; +} + +void BossSst_HeadLurk(BossSst* this, GlobalContext* globalCtx) { + if (this->actor.yDistToPlayer < 1000.0f) { + BossSst_HeadSetupIntro(this, globalCtx); + } +} + +void BossSst_HeadSetupIntro(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + this->timer = 611; + this->ready = false; + player->actor.world.pos.x = sRoomCenter.x; + player->actor.world.pos.y = ROOM_CENTER_Y + 1000.0f; + player->actor.world.pos.z = sRoomCenter.z; + player->linearVelocity = player->actor.velocity.y = 0.0f; + player->actor.shape.rot.y = -0x8000; + player->targetYaw = -0x8000; + player->currentYaw = -0x8000; + player->fallStartHeight = 0; + player->stateFlags1 |= 0x20; + + func_80064520(globalCtx, &globalCtx->csCtx); + func_8002DF54(globalCtx, &this->actor, 8); + sCutsceneCamera = Gameplay_CreateSubCamera(globalCtx); + Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_WAIT); + Gameplay_ChangeCameraStatus(globalCtx, sCutsceneCamera, CAM_STAT_ACTIVE); + Math_Vec3f_Copy(&sCameraAt, &player->actor.world.pos); + if (gSaveContext.eventChkInf[7] & 0x80) { + sCameraEye.z = ROOM_CENTER_Z - 100.0f; + } + + Gameplay_CameraSetAtEye(globalCtx, sCutsceneCamera, &sCameraAt, &sCameraEye); + Audio_SetBGM(0x100100FF); + this->actionFunc = BossSst_HeadIntro; +} + +void BossSst_HeadIntro(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 tempo; + s32 introStateTimer; + s32 revealStateTimer; + + if (this->timer != 0) { + this->timer--; + } + + if (SkelAnime_Update(&this->skelAnime)) { + Animation_MorphToLoop(&this->skelAnime, &gBongoHeadEyeCloseIdleAnim, -3.0f); + } + + if (this->timer == 0) { + sHands[RIGHT]->actor.flags |= 1; + sHands[LEFT]->actor.flags |= 1; + player->stateFlags1 &= ~0x20; + func_80064534(globalCtx, &globalCtx->csCtx); + func_8002DF54(globalCtx, &this->actor, 7); + sCameraAt.y += 30.0f; + sCameraAt.z += 300.0f; + Gameplay_CameraSetAtEye(globalCtx, sCutsceneCamera, &sCameraAt, &sCameraEye); + Gameplay_CopyCamera(globalCtx, MAIN_CAM, sCutsceneCamera); + Gameplay_ChangeCameraStatus(globalCtx, sCutsceneCamera, CAM_STAT_WAIT); + Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_ACTIVE); + Gameplay_ClearCamera(globalCtx, sCutsceneCamera); + gSaveContext.eventChkInf[7] |= 0x80; + BossSst_HeadSetupNeutral(this); + this->colliderJntSph.base.ocFlags1 |= OC1_ON; + sHands[LEFT]->colliderJntSph.base.ocFlags1 |= OC1_ON; + sHands[RIGHT]->colliderJntSph.base.ocFlags1 |= OC1_ON; + this->timer = 112; + } else if (this->timer >= 546) { + if (player->actor.world.pos.y > 100.0f) { + player->actor.world.pos.x = sRoomCenter.x; + player->actor.world.pos.z = sRoomCenter.z; + player->linearVelocity = 0; + player->actor.shape.rot.y = -0x8000; + player->targetYaw = -0x8000; + player->currentYaw = -0x8000; + } + + Math_Vec3f_Copy(&sCameraAt, &player->actor.world.pos); + if (player->actor.bgCheckFlags & 2) { + if (!this->ready) { + sFloor->dyna.actor.params = BONGOFLOOR_HIT; + this->ready = true; + func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Audio_PlayActorSound2(&sFloor->dyna.actor, NA_SE_EN_SHADEST_TAIKO_HIGH); + } else if (gSaveContext.eventChkInf[7] & 0x80) { + sHands[RIGHT]->actor.draw = BossSst_DrawHand; + sHands[LEFT]->actor.draw = BossSst_DrawHand; + this->actor.draw = BossSst_DrawHead; + this->timer = 178; + sCameraAt.x = ROOM_CENTER_X - 23.0f; + sCameraAt.y = ROOM_CENTER_Y + 0.0f; + sCameraAt.z = ROOM_CENTER_Z + 0.0f; + } else { + this->timer = 546; + } + } + } else if (this->timer >= 478) { + sCameraEye.x += 10.0f; + sCameraEye.y += 10.0f; + sCameraEye.z -= 10.0f; + } else if (this->timer >= 448) { + if (this->timer == 460) { + sHands[RIGHT]->actor.draw = BossSst_DrawHand; + sHands[LEFT]->actor.draw = BossSst_DrawHand; + this->actor.draw = BossSst_DrawHead; + player->actor.world.pos.x = sRoomCenter.x; + player->actor.world.pos.z = sRoomCenter.z; + BossSst_HandSetupDownbeat(sHands[RIGHT]); + } + if (this->timer > 460) { + sCameraEye.x -= 40.0f; + sCameraEye.y -= 40.0f; + sCameraEye.z += 20.0f; + } else if (this->timer == 460) { + sCameraAt.x = sHands[RIGHT]->actor.home.pos.x + 0.0f; + sCameraAt.y = sHands[RIGHT]->actor.home.pos.y - 20.0f; + sCameraAt.z = sHands[RIGHT]->actor.home.pos.z + 10.0f; + sCameraEye.x = sHands[RIGHT]->actor.home.pos.x + 150.0f; + sCameraEye.y = sHands[RIGHT]->actor.home.pos.y + 100.0f; + sCameraEye.z = sHands[RIGHT]->actor.home.pos.z + 80.0f; + } + } else { + if (this->timer >= 372) { + introStateTimer = this->timer - 372; + tempo = 6; + if (this->timer == 447) { + sCameraAt = player->actor.world.pos; + sCameraEye.x = ROOM_CENTER_X - 200.0f; + sCameraEye.y = ROOM_CENTER_Y + 160.0f; + sCameraEye.z = ROOM_CENTER_Z - 190.0f; + } else if (introStateTimer == 11) { + sCameraAt.x = sHands[RIGHT]->actor.home.pos.x + 30.0f; + sCameraAt.y = sHands[RIGHT]->actor.home.pos.y + 0.0f; + sCameraAt.z = sHands[RIGHT]->actor.home.pos.z + 20.0f; + sCameraEye.x = sHands[RIGHT]->actor.home.pos.x + 100.0f; + sCameraEye.y = sHands[RIGHT]->actor.home.pos.y + 10.0f; + sCameraEye.z = sHands[RIGHT]->actor.home.pos.z - 210.0f; + } else if (introStateTimer == 62) { + sCameraAt.x = sHands[LEFT]->actor.home.pos.x + 0.0f; + sCameraAt.y = sHands[LEFT]->actor.home.pos.y + 50.0f; + sCameraAt.z = sHands[LEFT]->actor.home.pos.z + 100.0f; + sCameraEye.x = sHands[LEFT]->actor.home.pos.x + 110.0f; + sCameraEye.y = sHands[LEFT]->actor.home.pos.y + 180.0f; + sCameraEye.z = sHands[LEFT]->actor.home.pos.z - 70.0f; + } + } else if (this->timer >= 304) { + introStateTimer = this->timer - 304; + tempo = 5; + if (introStateTimer == 11) { + sCameraAt.x = sHands[RIGHT]->actor.home.pos.x + 40.0f; + sCameraAt.y = sHands[RIGHT]->actor.home.pos.y - 90.0f; + sCameraAt.z = sHands[RIGHT]->actor.home.pos.z - 40.0f; + sCameraEye.x = sHands[RIGHT]->actor.home.pos.x - 20.0f; + sCameraEye.y = sHands[RIGHT]->actor.home.pos.y + 210.0f; + sCameraEye.z = sHands[RIGHT]->actor.home.pos.z + 170.0f; + } else if (this->timer == 368) { + sCameraAt.x = sHands[LEFT]->actor.home.pos.x - 20.0f; + sCameraAt.y = sHands[LEFT]->actor.home.pos.y + 0.0f; + sCameraAt.z = sHands[LEFT]->actor.home.pos.z + 0.0f; + sCameraEye.x = sHands[LEFT]->actor.home.pos.x - 70.0f; + sCameraEye.y = sHands[LEFT]->actor.home.pos.y + 170.0f; + sCameraEye.z = sHands[LEFT]->actor.home.pos.z + 150.0f; + } + } else if (this->timer >= 244) { + introStateTimer = this->timer - 244; + tempo = 4; + if (introStateTimer == 11) { + sCameraAt.x = sHands[RIGHT]->actor.home.pos.x + 30.0f; + sCameraAt.y = sHands[RIGHT]->actor.home.pos.y + 70.0f; + sCameraAt.z = sHands[RIGHT]->actor.home.pos.z + 40.0f; + sCameraEye.x = sHands[RIGHT]->actor.home.pos.x + 110.0f; + sCameraEye.y = sHands[RIGHT]->actor.home.pos.y - 140.0f; + sCameraEye.z = sHands[RIGHT]->actor.home.pos.z - 10.0f; + } else if (this->timer == 300) { + sCameraAt.x = sHands[LEFT]->actor.home.pos.x - 20.0f; + sCameraAt.y = sHands[LEFT]->actor.home.pos.y - 80.0f; + sCameraAt.z = sHands[LEFT]->actor.home.pos.z + 320.0f; + sCameraEye.x = sHands[LEFT]->actor.home.pos.x - 130.0f; + sCameraEye.y = sHands[LEFT]->actor.home.pos.y + 130.0f; + sCameraEye.z = sHands[LEFT]->actor.home.pos.z - 150.0f; + } + } else if (this->timer >= 192) { + introStateTimer = this->timer - 192; + tempo = 3; + if (this->timer == 240) { + sCameraAt.x = sHands[LEFT]->actor.home.pos.x - 190.0f; + sCameraAt.y = sHands[LEFT]->actor.home.pos.y - 110.0f; + sCameraAt.z = sHands[LEFT]->actor.home.pos.z + 40.0f; + sCameraEye.x = sHands[LEFT]->actor.home.pos.x + 120.0f; + sCameraEye.y = sHands[LEFT]->actor.home.pos.y + 130.0f; + sCameraEye.z = sHands[LEFT]->actor.home.pos.z + 50.0f; + } else if (introStateTimer == 12) { + sCameraAt.x = sRoomCenter.x + 50.0f; + sCameraAt.y = sRoomCenter.y - 90.0f; + sCameraAt.z = sRoomCenter.z - 200.0f; + sCameraEye.x = sRoomCenter.x + 50.0f; + sCameraEye.y = sRoomCenter.y + 350.0f; + sCameraEye.z = sRoomCenter.z + 150.0f; + } + } else if (this->timer >= 148) { + introStateTimer = this->timer - 148; + tempo = 2; + } else if (this->timer >= 112) { + introStateTimer = this->timer - 112; + tempo = 1; + } else { + introStateTimer = this->timer % 28; + tempo = 0; + } + if (this->timer <= 198) { + revealStateTimer = 198 - this->timer; + if ((gSaveContext.eventChkInf[7] & 0x80) && (revealStateTimer <= 44)) { + sCameraAt.x += 492.0f * 0.01f; + sCameraAt.y += 200.0f * 0.01f; + sCameraEye.x -= 80.0f * 0.01f; + sCameraEye.y -= 360.0f * 0.01f; + sCameraEye.z += 1000.0f * 0.01f; + } else if (this->timer <= 20) { + sCameraAt.y -= 700.0f * 0.01f; + sCameraAt.z += 900.0f * 0.01f; + sCameraEye.x += 650.0f * 0.01f; + sCameraEye.y += 400.0f * 0.01f; + sCameraEye.z += 1550.0f * 0.01f; + this->vVanish = true; + this->actor.flags |= 0x80; + } else if (revealStateTimer < 40) { + sCameraAt.x += 125.0f * 0.01f; + sCameraAt.y += 350.0f * 0.01f; + sCameraAt.z += 500.0f * 0.01f; + sCameraEye.x += 200.0f * 0.01f; + sCameraEye.y -= 850.0f * 0.01f; + } else if (revealStateTimer >= 45) { + if (revealStateTimer < 85) { + sCameraAt.x -= 250.0f * 0.01f; + sCameraAt.y += 425.0f * 0.01f; + sCameraAt.z -= 1200.0f * 0.01f; + sCameraEye.x -= 650.0f * 0.01f; + sCameraEye.y += 125.0f * 0.01f; + sCameraEye.z -= 350.0f * 0.01f; + } else if (revealStateTimer == 85) { + if (!(gSaveContext.eventChkInf[7] & 0x80)) { + TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx, + SEGMENTED_TO_VIRTUAL(&gBongoTitleCardTex), 160, 180, 128, 40); + } + Audio_SetBGM(0x1B); + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadEyeCloseAnim, -5.0f); + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_DISAPPEAR); + } + } + } + if (introStateTimer == 12) { + BossSst_HandSetupDownbeat(sHands[RIGHT]); + } + if ((introStateTimer != 5) && ((introStateTimer % ((tempo * 2) + 7)) == 5)) { + BossSst_HandSetupOffbeat(sHands[LEFT]); + } + } + + if (this->actionFunc != BossSst_HeadNeutral) { + Gameplay_CameraSetAtEye(globalCtx, sCutsceneCamera, &sCameraAt, &sCameraEye); + } +} + +void BossSst_HeadSetupWait(BossSst* this) { + if (this->skelAnime.animation != &gBongoHeadEyeCloseIdleAnim) { + Animation_MorphToLoop(&this->skelAnime, &gBongoHeadEyeCloseIdleAnim, -5.0f); + } + this->actionFunc = BossSst_HeadWait; +} + +void BossSst_HeadWait(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if ((HAND_STATE(sHands[LEFT]) == HAND_WAIT) && (HAND_STATE(sHands[RIGHT]) == HAND_WAIT)) { + BossSst_HeadSetupNeutral(this); + } +} + +void BossSst_HeadSetupNeutral(BossSst* this) { + this->timer = 127; + this->ready = false; + this->actionFunc = BossSst_HeadNeutral; +} + +void BossSst_HeadNeutral(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (!this->ready && ((HAND_STATE(sHands[LEFT]) == HAND_BEAT) || (HAND_STATE(sHands[LEFT]) == HAND_WAIT)) && + ((HAND_STATE(sHands[RIGHT]) == HAND_BEAT) || (HAND_STATE(sHands[RIGHT]) == HAND_WAIT))) { + this->ready = true; + } + + if (this->ready) { + if (this->timer != 0) { + this->timer--; + } + } + + if (this->timer == 0) { + if ((PLAYER->actor.world.pos.y > -50.0f) && !(PLAYER->stateFlags1 & 0x6080)) { + sHands[Rand_ZeroOne() <= 0.5f]->ready = true; + BossSst_HeadSetupWait(this); + } else { + this->timer = 28; + } + } else { + Math_ApproachS(&this->actor.shape.rot.y, Actor_WorldYawTowardPoint(&PLAYER->actor, &sRoomCenter) + 0x8000, 4, + 0x400); + if ((this->timer == 28) || (this->timer == 84)) { + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_PRAY); + } + } +} + +void BossSst_HeadSetupDamagedHand(BossSst* this, s32 bothHands) { + if (bothHands) { + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadEyeOpenAnim, -5.0f); + } else { + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadDamagedHandAnim, -5.0f); + } + this->actionFunc = BossSst_HeadDamagedHand; +} + +void BossSst_HeadDamagedHand(BossSst* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + if ((HAND_STATE(sHands[LEFT]) == HAND_DAMAGED) && (HAND_STATE(sHands[RIGHT]) == HAND_DAMAGED)) { + BossSst_HeadSetupReadyCharge(this); + } else if ((HAND_STATE(sHands[LEFT]) == HAND_FROZEN) || (HAND_STATE(sHands[RIGHT]) == HAND_FROZEN)) { + BossSst_HeadSetupFrozenHand(this); + } else if (this->skelAnime.animation == &gBongoHeadEyeOpenAnim) { + BossSst_HeadSetupUnfreezeHand(this); + } else { + BossSst_HeadSetupWait(this); + } + } +} + +void BossSst_HeadSetupReadyCharge(BossSst* this) { + Animation_MorphToLoop(&this->skelAnime, &gBongoHeadEyeOpenIdleAnim, -5.0f); + this->actor.speedXZ = 0.0f; + this->colliderCyl.base.acFlags |= AC_ON; + this->actionFunc = BossSst_HeadReadyCharge; +} + +void BossSst_HeadReadyCharge(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (sHands[LEFT]->ready && (sHands[LEFT]->actionFunc == BossSst_HandReadyCharge) && sHands[RIGHT]->ready && + (sHands[RIGHT]->actionFunc == BossSst_HandReadyCharge)) { + BossSst_HeadSetupCharge(this); + } else { + Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 4, 0x800, 0x400); + } +} + +void BossSst_HeadSetupCharge(BossSst* this) { + Animation_Change(&this->skelAnime, &gBongoHeadChargeAnim, 0.5f, 0.0f, Animation_GetLastFrame(&gBongoHeadChargeAnim), + ANIMMODE_ONCE_INTERP, -5.0f); + BossSst_HandSetDamage(sHands[LEFT], 0x20); + BossSst_HandSetDamage(sHands[RIGHT], 0x20); + this->colliderJntSph.base.atFlags |= AT_ON; + this->actor.speedXZ = 3.0f; + this->radius = -650.0f; + this->ready = false; + this->actionFunc = BossSst_HeadCharge; +} + +void BossSst_HeadCharge(BossSst* this, GlobalContext* globalCtx) { + f32 chargeDist; + s32 animFinish = SkelAnime_Update(&this->skelAnime); + + if (!this->ready && Animation_OnFrame(&this->skelAnime, 6.0f)) { + this->ready = true; + this->actor.speedXZ = 0.25f; + this->skelAnime.playSpeed = 0.2f; + } + + this->actor.speedXZ *= 1.25f; + this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 45.0f); + + if (this->ready) { + if (Math_SmoothStepToF(&this->radius, 650.0f, 0.4f, this->actor.speedXZ, 1.0f) < 10.0f) { + this->radius = 650.0f; + BossSst_HeadSetupEndCharge(this); + } else { + chargeDist = (650.0f - this->radius) * 3.0f; + if (chargeDist > 180.0f) { + chargeDist = 180.0f; + } + + this->actor.world.pos.y = this->actor.home.pos.y - chargeDist; + } + + if (!animFinish) { + sHandOffsets[LEFT].z += 5.0f; + sHandOffsets[RIGHT].z += 5.0f; + } + } else { + Math_ApproachF(&this->radius, -700.0f, 0.4f, this->actor.speedXZ); + Math_StepToF(&this->actor.world.pos.y, this->actor.home.pos.y - 180.0f, 20.0f); + sHandOffsets[LEFT].y += 5.0f; + sHandOffsets[RIGHT].y += 5.0f; + } + + if (this->colliderJntSph.base.atFlags & AT_HIT) { + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + sHands[LEFT]->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + sHands[RIGHT]->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + func_8002F71C(globalCtx, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); + func_8002F7DC(&PLAYER->actor, NA_SE_PL_BODY_HIT); + } +} + +void BossSst_HeadSetupEndCharge(BossSst* this) { + Animation_MorphToLoop(&this->skelAnime, &gBongoHeadEyeCloseIdleAnim, -20.0f); + this->targetYaw = Actor_WorldYawTowardPoint(&this->actor, &sRoomCenter); + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + this->colliderCyl.base.acFlags &= ~AC_ON; + this->radius *= -1.0f; + this->actionFunc = BossSst_HeadEndCharge; +} + +void BossSst_HeadEndCharge(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (Math_SmoothStepToS(&this->actor.shape.rot.y, this->targetYaw, 4, 0x800, 0x100) == 0) { + BossSst_HandSetupRetreat(sHands[LEFT]); + BossSst_HandSetupRetreat(sHands[RIGHT]); + BossSst_HeadSetupNeutral(this); + } +} + +void BossSst_HeadSetupFrozenHand(BossSst* this) { + Animation_MorphToLoop(&this->skelAnime, &gBongoHeadEyeOpenIdleAnim, -5.0f); + this->ready = false; + this->colliderCyl.base.acFlags |= AC_ON; + this->actionFunc = BossSst_HeadFrozenHand; +} + +void BossSst_HeadFrozenHand(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->ready) { + BossSst_HeadSetupUnfreezeHand(this); + } +} + +void BossSst_HeadSetupUnfreezeHand(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadEyeCloseAnim, -5.0f); + this->colliderCyl.base.acFlags &= ~AC_ON; + this->actionFunc = BossSst_HeadUnfreezeHand; +} + +void BossSst_HeadUnfreezeHand(BossSst* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + BossSst_HeadSetupWait(this); + } +} + +void BossSst_HeadSetupStunned(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadKnockoutAnim, -5.0f); + Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, Animation_GetLastFrame(&gBongoHeadKnockoutAnim)); + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + this->colliderCyl.base.acFlags &= ~AC_ON; + this->vVanish = false; + this->actor.flags &= ~0x80; + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_FREEZE); + this->actionFunc = BossSst_HeadStunned; +} + +void BossSst_HeadStunned(BossSst* this, GlobalContext* globalCtx) { + f32 bounce; + s32 animFinish; + f32 currentFrame; + + Math_StepToF(&sHandOffsets[LEFT].z, 600.0f, 20.0f); + Math_StepToF(&sHandOffsets[RIGHT].z, 600.0f, 20.0f); + Math_StepToF(&sHandOffsets[LEFT].x, 200.0f, 20.0f); + Math_StepToF(&sHandOffsets[RIGHT].x, -200.0f, 20.0f); + this->actor.velocity.y += this->actor.gravity; + animFinish = SkelAnime_Update(&this->skelAnime); + currentFrame = this->skelAnime.curFrame; + if (currentFrame <= 6.0f) { + bounce = (sinf((M_PI / 11) * currentFrame) * 100.0f) + (this->actor.home.pos.y - 180.0f); + if (this->actor.world.pos.y < bounce) { + this->actor.world.pos.y = bounce; + } + } else if (currentFrame <= 11.0f) { + this->actor.world.pos.y = (sinf((M_PI / 11) * currentFrame) * 170.0f) + (this->actor.home.pos.y - 250.0f); + } else { + this->actor.world.pos.y = + (sinf((currentFrame - 11.0f) * (M_PI / 5)) * 50.0f) + (this->actor.home.pos.y - 250.0f); + } + + if ((animFinish) || Animation_OnFrame(&this->skelAnime, 11.0f)) { + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_LAND); + } + + if (this->radius < -500.0f) { + Math_SmoothStepToF(&this->radius, -500.0f, 1.0f, 50.0f, 5.0f); + } else { + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.5f, 15.0f, 3.0f); + this->radius += this->actor.speedXZ; + } + + this->radius = CLAMP_MAX(this->radius, 400.0f); + + this->actor.world.pos.y += this->actor.velocity.y; + if (animFinish) { + BossSst_HeadSetupVulnerable(this); + } +} + +void BossSst_HeadSetupVulnerable(BossSst* this) { + Animation_MorphToLoop(&this->skelAnime, &gBongoHeadStunnedAnim, -5.0f); + this->colliderCyl.base.acFlags |= AC_ON; + this->colliderCyl.info.bumper.dmgFlags = 0x0FC00702; // Sword-type damage + this->actor.speedXZ = 0.0f; + this->colliderJntSph.elements[10].info.bumperFlags |= (BUMP_ON | BUMP_HOOKABLE); + this->colliderJntSph.elements[0].info.bumperFlags &= ~BUMP_ON; + if (this->actionFunc != BossSst_HeadDamage) { + this->timer = 50; + } + + this->actionFunc = BossSst_HeadVulnerable; +} + +void BossSst_HeadVulnerable(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_StepToF(&sHandOffsets[LEFT].z, 600.0f, 20.0f); + Math_StepToF(&sHandOffsets[RIGHT].z, 600.0f, 20.0f); + Math_StepToF(&sHandOffsets[LEFT].x, 200.0f, 20.0f); + Math_StepToF(&sHandOffsets[RIGHT].x, -200.0f, 20.0f); + if ((this->actor.flags & 0x2000) == 0x2000) { + this->timer += 2; + this->timer = CLAMP_MAX(this->timer, 50); + } else { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + BossSst_HandSetupRecover(sHands[LEFT]); + BossSst_HandSetupRecover(sHands[RIGHT]); + BossSst_HeadSetupRecover(this); + } + } +} + +void BossSst_HeadSetupDamage(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadDamageAnim, -3.0f); + Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, Animation_GetLastFrame(&gBongoHeadDamageAnim)); + Actor_SetColorFilter(&sHands[LEFT]->actor, 0x4000, 0xFF, 0, Animation_GetLastFrame(&gBongoHeadDamageAnim)); + Actor_SetColorFilter(&sHands[RIGHT]->actor, 0x4000, 0xFF, 0, Animation_GetLastFrame(&gBongoHeadDamageAnim)); + this->colliderCyl.base.acFlags &= ~AC_ON; + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_DAMAGE); + this->actionFunc = BossSst_HeadDamage; +} + +void BossSst_HeadDamage(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + if (SkelAnime_Update(&this->skelAnime)) { + BossSst_HeadSetupVulnerable(this); + } +} + +void BossSst_HeadSetupRecover(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadRecoverAnim, -5.0f); + this->colliderCyl.base.acFlags &= ~AC_ON; + this->colliderCyl.info.bumper.dmgFlags = 0xFFCFFFFF; + this->colliderJntSph.elements[10].info.bumperFlags &= ~(BUMP_ON | BUMP_HOOKABLE); + this->colliderJntSph.elements[0].info.bumperFlags |= BUMP_ON; + this->vVanish = true; + this->actor.speedXZ = 5.0f; + this->actionFunc = BossSst_HeadRecover; +} + +void BossSst_HeadRecover(BossSst* this, GlobalContext* globalCtx) { + s32 animFinish; + f32 currentFrame; + f32 diff; + + animFinish = SkelAnime_Update(&this->skelAnime); + currentFrame = this->skelAnime.curFrame; + if (currentFrame < 10.0f) { + this->actor.world.pos.y += 10.0f; + sHandOffsets[LEFT].y -= 10.0f; + sHandOffsets[RIGHT].y -= 10.0f; + Math_SmoothStepToF(&this->radius, -750.0f, 1.0f, this->actor.speedXZ, 2.0f); + } else { + this->actor.speedXZ *= 1.25f; + this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 50.0f); + diff = Math_SmoothStepToF(&this->radius, -650.0f, 1.0f, this->actor.speedXZ, 2.0f); + diff += Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.home.pos.y, 0.5f, 30.0f, 3.0f); + } + if (animFinish && (diff < 10.0f)) { + this->actor.world.pos.y = this->actor.home.pos.y; + this->radius = -650.0f; + BossSst_HandSetupRetreat(sHands[LEFT]); + BossSst_HandSetupRetreat(sHands[RIGHT]); + BossSst_HeadSetupNeutral(this); + } +} + +void BossSst_SetCameraTargets(f32 cameraSpeedMod, s32 targetIndex) { + Vec3f* nextAt = &sCameraAtPoints[targetIndex]; + Vec3f* nextEye = &sCameraEyePoints[targetIndex]; + + if (targetIndex != 0) { + Math_Vec3f_Copy(&sCameraAt, &sCameraAtPoints[targetIndex - 1]); + Math_Vec3f_Copy(&sCameraEye, &sCameraEyePoints[targetIndex - 1]); + } + + sCameraAtVel.x = (nextAt->x - sCameraAt.x) * cameraSpeedMod; + sCameraAtVel.y = (nextAt->y - sCameraAt.y) * cameraSpeedMod; + sCameraAtVel.z = (nextAt->z - sCameraAt.z) * cameraSpeedMod; + + sCameraEyeVel.x = (nextEye->x - sCameraEye.x) * cameraSpeedMod; + sCameraEyeVel.y = (nextEye->y - sCameraEye.y) * cameraSpeedMod; + sCameraEyeVel.z = (nextEye->z - sCameraEye.z) * cameraSpeedMod; +} + +void BossSst_UpdateDeathCamera(BossSst* this, GlobalContext* globalCtx) { + Vec3f cameraAt; + Vec3f cameraEye; + f32 sn; + f32 cs; + + sCameraAt.x += sCameraAtVel.x; + sCameraAt.y += sCameraAtVel.y; + sCameraAt.z += sCameraAtVel.z; + sCameraEye.x += sCameraEyeVel.x; + sCameraEye.y += sCameraEyeVel.y; + sCameraEye.z += sCameraEyeVel.z; + + sn = Math_SinS(this->actor.shape.rot.y); + cs = Math_CosS(this->actor.shape.rot.y); + cameraAt.x = this->actor.world.pos.x + (sCameraAt.z * sn) + (sCameraAt.x * cs); + cameraAt.y = this->actor.home.pos.y - 140.0f + sCameraAt.y; + cameraAt.z = this->actor.world.pos.z + (sCameraAt.z * cs) - (sCameraAt.x * sn); + cameraEye.x = this->actor.world.pos.x + (sCameraEye.z * sn) + (sCameraEye.x * cs); + cameraEye.y = this->actor.home.pos.y - 140.0f + sCameraEye.y; + cameraEye.z = this->actor.world.pos.z + (sCameraEye.z * cs) - (sCameraEye.x * sn); + Gameplay_CameraSetAtEye(globalCtx, sCutsceneCamera, &cameraAt, &cameraEye); +} + +void BossSst_HeadSetupDeath(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + Animation_MorphToLoop(&this->skelAnime, &gBongoHeadEyeOpenIdleAnim, -5.0f); + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_DEAD); + Actor_SetColorFilter(&this->actor, 0x4000, 0xFF, 0, 60); + Actor_SetColorFilter(&sHands[LEFT]->actor, 0x4000, 0xFF, 0, 60); + Actor_SetColorFilter(&sHands[RIGHT]->actor, 0x4000, 0xFF, 0, 60); + this->timer = 60; + this->colliderCyl.base.acFlags &= ~AC_ON; + this->colliderJntSph.base.ocFlags1 &= ~OC1_ON; + sHands[LEFT]->colliderJntSph.base.ocFlags1 &= ~OC1_ON; + sHands[RIGHT]->colliderJntSph.base.ocFlags1 &= ~OC1_ON; + Audio_SetBGM(0x100100FF); + sCutsceneCamera = Gameplay_CreateSubCamera(globalCtx); + Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_WAIT); + Gameplay_ChangeCameraStatus(globalCtx, sCutsceneCamera, CAM_STAT_ACTIVE); + Gameplay_CopyCamera(globalCtx, sCutsceneCamera, MAIN_CAM); + func_8002DF54(globalCtx, &player->actor, 8); + func_80064520(globalCtx, &globalCtx->csCtx); + Math_Vec3f_Copy(&sCameraEye, &ACTIVE_CAM->eye); + this->actionFunc = BossSst_HeadDeath; +} + +void BossSst_HeadDeath(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->timer != 0) { + this->timer--; + } + + Math_StepToF(&this->actor.world.pos.y, this->actor.home.pos.y - 140.0f, 20.0f); + if (this->timer == 0) { + BossSst_HandSetupThrash(sHands[LEFT]); + BossSst_HandSetupThrash(sHands[RIGHT]); + BossSst_HeadSetupThrash(this); + } else if (this->timer > 48) { + Gameplay_CameraSetAtEye(globalCtx, sCutsceneCamera, &this->actor.focus.pos, &sCameraEye); + Math_StepToF(&this->radius, -350.0f, 10.0f); + } else if (this->timer == 48) { + Player* player = PLAYER; + + player->actor.world.pos.x = sRoomCenter.x + (400.0f * Math_SinS(this->actor.shape.rot.y)) + + (Math_CosS(this->actor.shape.rot.y) * -120.0f); + player->actor.world.pos.z = sRoomCenter.z + (400.0f * Math_CosS(this->actor.shape.rot.y)) - + (Math_SinS(this->actor.shape.rot.y) * -120.0f); + player->actor.shape.rot.y = Actor_WorldYawTowardPoint(&player->actor, &sRoomCenter); + func_8002DBD0(&this->actor, &sCameraEye, &globalCtx->cameraPtrs[globalCtx->activeCamera]->eye); + func_8002DBD0(&this->actor, &sCameraAt, &globalCtx->cameraPtrs[globalCtx->activeCamera]->at); + this->radius = -350.0f; + this->actor.world.pos.x = sRoomCenter.x - (Math_SinS(this->actor.shape.rot.y) * 350.0f); + this->actor.world.pos.z = sRoomCenter.z - (Math_CosS(this->actor.shape.rot.y) * 350.0f); + BossSst_SetCameraTargets(1.0 / 48, 0); + BossSst_UpdateDeathCamera(this, globalCtx); + } else { + BossSst_UpdateDeathCamera(this, globalCtx); + } +} + +void BossSst_HeadSetupThrash(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadEyeOpenIdleAnim, -5.0f); + this->timer = 160; + this->targetYaw = this->actor.shape.rot.y; + BossSst_SetCameraTargets(1.0 / 80, 1); + this->actionFunc = BossSst_HeadThrash; +} + +void BossSst_HeadThrash(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->timer != 0) { + this->timer--; + } + + if ((this->timer == 0) && (this->actor.shape.rot.y == this->targetYaw)) { + BossSst_HeadSetupDarken(this); + } else if (this->timer >= 80) { + BossSst_UpdateDeathCamera(this, globalCtx); + } +} + +void BossSst_HeadSetupDarken(BossSst* this) { + this->timer = 160; + BossSst_SetCameraTargets(1.0 / 80, 2); + this->actionFunc = BossSst_HeadDarken; +} + +void BossSst_HeadDarken(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + if (1) {} + + if (this->timer >= 80) { + if (this->timer == 80) { + sBodyStatic = true; + } + BossSst_UpdateDeathCamera(this, globalCtx); + sBodyColor.r = sBodyColor.g = sBodyColor.b = (this->timer * 3) - 240; + if (this->timer == 80) { + BossSst_SetCameraTargets(1.0 / 80, 3); + } + } else { + sBodyColor.b = (80 - this->timer) / 1.0f; + sBodyColor.r = sBodyColor.g = sStaticColor.r = sStaticColor.g = sStaticColor.b = (80 - this->timer) / 8.0f; + BossSst_UpdateDeathCamera(this, globalCtx); + if (this->timer == 0) { + BossSst_HeadSetupFall(this); + } + } +} + +void BossSst_HeadSetupFall(BossSst* this) { + this->actor.speedXZ = 1.0f; + Math_Vec3f_Copy(&sCameraAt, &sCameraAtPoints[3]); + Math_Vec3f_Copy(&sCameraEye, &sCameraEyePoints[3]); + sCameraAtVel.x = 0.0f; + sCameraAtVel.z = 0.0f; + sCameraAtVel.y = -50.0f; + Math_Vec3f_Copy(&sCameraEyeVel, &sZeroVec); + this->actionFunc = BossSst_HeadFall; +} + +void BossSst_HeadFall(BossSst* this, GlobalContext* globalCtx) { + this->actor.speedXZ *= 1.5f; + if (Math_StepToF(&this->actor.world.pos.y, this->actor.home.pos.y - 230.0f, this->actor.speedXZ)) { + BossSst_HeadSetupMelt(this); + } + + if (sCameraAt.y > 200.0f) { + BossSst_UpdateDeathCamera(this, globalCtx); + } +} + +void BossSst_HeadSetupMelt(BossSst* this) { + BossSst_SpawnHeadShadow(this); + this->timer = 80; + BossSst_SetCameraTargets(1.0 / 60, 5); + this->actionFunc = BossSst_HeadMelt; +} + +void BossSst_HeadMelt(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + this->actor.scale.y -= 0.00025f; + this->actor.scale.x += 0.000075f; + this->actor.scale.z += 0.000075f; + this->actor.world.pos.y = this->actor.home.pos.y - 11500.0f * this->actor.scale.y; + if (this->timer == 0) { + BossSst_HeadSetupFinish(this); + } else if (this->timer >= 20.0f) { + BossSst_UpdateDeathCamera(this, globalCtx); + } +} + +void BossSst_HeadSetupFinish(BossSst* this) { + this->actor.draw = BossSst_DrawEffect; + this->timer = 40; + Audio_SetBGM(0x21); + BossSst_SetCameraTargets(1.0 / 40, 6); + this->actionFunc = BossSst_HeadFinish; +} + +void BossSst_HeadFinish(BossSst* this, GlobalContext* globalCtx) { + static Color_RGBA8 colorIndigo = { 80, 80, 150, 255 }; + static Color_RGBA8 colorDarkIndigo = { 40, 40, 80, 255 }; + static Color_RGBA8 colorUnused[2] = { + { 0, 0, 0, 255 }, + { 100, 100, 100, 0 }, + }; + Vec3f spawnPos; + s32 i; + + this->timer--; + if (this->effectMode == BONGO_NULL) { + if (this->timer < -170) { + BossSst_UpdateDeathCamera(this, globalCtx); + Gameplay_CopyCamera(globalCtx, MAIN_CAM, sCutsceneCamera); + Gameplay_ChangeCameraStatus(globalCtx, sCutsceneCamera, CAM_STAT_WAIT); + Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_ACTIVE); + Gameplay_ClearCamera(globalCtx, sCutsceneCamera); + func_8002DF54(globalCtx, &PLAYER->actor, 7); + func_80064534(globalCtx, &globalCtx->csCtx); + Actor_Kill(&this->actor); + Actor_Kill(&sHands[LEFT]->actor); + Actor_Kill(&sHands[RIGHT]->actor); + Flags_SetClear(globalCtx, globalCtx->roomCtx.curRoom.num); + } + } else if (this->effects[0].alpha == 0) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, ROOM_CENTER_X, ROOM_CENTER_Y, ROOM_CENTER_Z, 0, + 0, 0, -1); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_B_HEART, + (Math_SinS(this->actor.shape.rot.y) * 200.0f) + ROOM_CENTER_X, ROOM_CENTER_Y, + Math_CosS(this->actor.shape.rot.y) * 200.0f + ROOM_CENTER_Z, 0, 0, 0, 0); + BossSst_SetCameraTargets(1.0f, 7); + this->effectMode = BONGO_NULL; + } else if (this->timer == 0) { + this->effects[0].status = 0; + this->effects[1].status = -1; + this->effects[2].status = -1; + } else if (this->timer > 0) { + this->effects[0].status += 5; + BossSst_UpdateDeathCamera(this, globalCtx); + } + + colorIndigo.a = this->effects[0].alpha; + colorDarkIndigo.a = this->effects[0].alpha; + + for (i = 0; i < 5; i++) { + spawnPos.x = sRoomCenter.x + 0.0f + Rand_CenteredFloat(800.0f); + spawnPos.y = sRoomCenter.y + (-28.0f) + (Rand_ZeroOne() * 5.0f); + spawnPos.z = sRoomCenter.z + 0.0f + Rand_CenteredFloat(800.0f); + EffectSsGSplash_Spawn(globalCtx, &spawnPos, &colorIndigo, &colorDarkIndigo, 0, 0x3E8); + } +} + +void BossSst_HandSetupWait(BossSst* this) { + HAND_STATE(this) = HAND_WAIT; + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + Animation_MorphToLoop(&this->skelAnime, sHandIdleAnims[this->actor.params], 5.0f); + this->ready = false; + this->timer = 20; + this->actionFunc = BossSst_HandWait; +} + +void BossSst_HandWait(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight, 20.0f); + Math_StepToF(&this->actor.world.pos.x, this->actor.home.pos.x, 1.0f); + Math_StepToF(&this->actor.world.pos.z, this->actor.home.pos.z, 1.0f); + if (HAND_STATE(OTHER_HAND(this)) == HAND_DAMAGED) { + Player* player = PLAYER; + + if (this->timer != 0) { + this->timer--; + } + + if ((this->timer == 0) && (player->actor.world.pos.y > -50.0f) && !(player->stateFlags1 & 0x6080)) { + BossSst_HandSelectAttack(this); + } + } else if (sHead->actionFunc == BossSst_HeadNeutral) { + if ((this->actor.params == BONGO_RIGHT_HAND) && ((sHead->timer % 28) == 12)) { + BossSst_HandSetupDownbeat(this); + } else if ((this->actor.params == BONGO_LEFT_HAND) && ((sHead->timer % 7) == 5) && (sHead->timer < 112)) { + BossSst_HandSetupOffbeat(this); + } + } +} + +void BossSst_HandSetupDownbeat(BossSst* this) { + HAND_STATE(this) = HAND_BEAT; + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 5.0f); + this->actor.shape.rot.x = 0; + this->timer = 12; + this->actionFunc = BossSst_HandDownbeat; +} + +void BossSst_HandDownbeat(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (HAND_STATE(OTHER_HAND(this)) == HAND_DAMAGED) { + BossSst_HandSetupWait(this); + } else { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer >= 3) { + this->actor.shape.rot.x -= 0x100; + Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 180.0f, 20.0f); + } else { + this->actor.shape.rot.x += 0x300; + Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 0.0f, 60.0f); + } + + if (this->timer == 0) { + sFloor->dyna.actor.params = BONGOFLOOR_HIT; + if (sHead->actionFunc == BossSst_HeadWait) { + if (this->ready) { + BossSst_HandSelectAttack(this); + } else { + BossSst_HandSetupWait(this); + } + } else { + BossSst_HandSetupDownbeatEnd(this); + } + func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_TAIKO_HIGH); + } + } +} + +void BossSst_HandSetupDownbeatEnd(BossSst* this) { + sFloor->dyna.actor.params = BONGOFLOOR_HIT; + Animation_PlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params]); + this->actionFunc = BossSst_HandDownbeatEnd; +} + +void BossSst_HandDownbeatEnd(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (HAND_STATE(OTHER_HAND(this)) == HAND_DAMAGED) { + BossSst_HandSetupWait(this); + } else { + Math_SmoothStepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 40.0f, 0.5f, 20.0f, 3.0f); + Math_ScaledStepToS(&this->actor.shape.rot.x, -0x800, 0x100); + Math_StepToF(&this->actor.world.pos.x, this->actor.home.pos.x, 1.0f); + Math_StepToF(&this->actor.world.pos.z, this->actor.home.pos.z, 1.0f); + if ((sHead->actionFunc != BossSst_HeadIntro) && ((sHead->timer % 28) == 12)) { + BossSst_HandSetupDownbeat(this); + } + } +} + +void BossSst_HandSetupOffbeat(BossSst* this) { + HAND_STATE(this) = HAND_BEAT; + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 5.0f); + this->actor.shape.rot.x = 0; + this->timer = 5; + this->actionFunc = BossSst_HandOffbeat; +} + +void BossSst_HandOffbeat(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (HAND_STATE(OTHER_HAND(this)) == HAND_DAMAGED) { + BossSst_HandSetupWait(this); + } else { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer != 0) { + this->actor.shape.rot.x -= 0x140; + Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 60.0f, 15.0f); + } else { + this->actor.shape.rot.x += 0x500; + Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 0.0f, 60.0f); + } + + if (this->timer == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_TAIKO_LOW); + BossSst_HandSetupOffbeatEnd(this); + } + } +} + +void BossSst_HandSetupOffbeatEnd(BossSst* this) { + Animation_PlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params]); + this->actionFunc = BossSst_HandOffbeatEnd; +} + +void BossSst_HandOffbeatEnd(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (HAND_STATE(OTHER_HAND(this)) == HAND_DAMAGED) { + BossSst_HandSetupWait(this); + } else { + Math_SmoothStepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 40.0f, 0.5f, 20.0f, 3.0f); + Math_ScaledStepToS(&this->actor.shape.rot.x, -0x400, 0xA0); + Math_StepToF(&this->actor.world.pos.x, this->actor.home.pos.x, 1.0f); + Math_StepToF(&this->actor.world.pos.z, this->actor.home.pos.z, 1.0f); + if (sHead->actionFunc == BossSst_HeadWait) { + if (this->ready) { + BossSst_HandSelectAttack(this); + } else { + BossSst_HandSetupWait(this); + } + } else if ((sHead->actionFunc != BossSst_HeadIntro) && ((sHead->timer % 7) == 5) && + ((sHead->timer % 28) != 5)) { + BossSst_HandSetupOffbeat(this); + } + } +} + +void BossSst_HandSetupEndSlam(BossSst* this) { + HAND_STATE(this) = HAND_RETREAT; + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + Animation_MorphToPlayOnce(&this->skelAnime, sHandPushoffPoses[this->actor.params], 6.0f); + this->actionFunc = BossSst_HandEndSlam; +} + +void BossSst_HandEndSlam(BossSst* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + BossSst_HandSetupRetreat(this); + } +} + +void BossSst_HandSetupRetreat(BossSst* this) { + HAND_STATE(this) = HAND_RETREAT; + Animation_MorphToPlayOnce(&this->skelAnime, sHandHangPoses[this->actor.params], 10.0f); + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + this->colliderJntSph.base.acFlags |= AC_ON; + this->actor.flags |= 1; + BossSst_HandSetInvulnerable(this, false); + this->timer = 0; + this->actionFunc = BossSst_HandRetreat; + this->actor.speedXZ = 3.0f; +} + +void BossSst_HandRetreat(BossSst* this, GlobalContext* globalCtx) { + f32 diff; + s32 inPosition; + + SkelAnime_Update(&this->skelAnime); + this->actor.speedXZ = this->actor.speedXZ * 1.2f; + this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 50.0f); + + diff = Math_SmoothStepToF(&this->actor.world.pos.x, this->actor.home.pos.x, 0.3f, this->actor.speedXZ, 1.0f); + diff += Math_SmoothStepToF(&this->actor.world.pos.z, this->actor.home.pos.z, 0.3f, this->actor.speedXZ, 1.0f); + if (this->timer != 0) { + if (this->timer != 0) { + this->timer--; + } + + this->actor.world.pos.y = (sinf((this->timer * M_PI) / 16.0f) * 250.0f) + this->actor.home.pos.y; + if (this->timer == 0) { + BossSst_HandSetupWait(this); + } else if (this->timer == 4) { + Animation_MorphToLoop(&this->skelAnime, sHandIdleAnims[this->actor.params], 4.0f); + } + } else { + inPosition = Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x200); + inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.z, this->actor.home.rot.z, 0x200); + inPosition &= Math_ScaledStepToS(&this->handYRotMod, 0, 0x800); + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + if ((Math_SmoothStepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 250.0f, 0.5f, 70.0f, 5.0f) < 1.0f) && + inPosition && (diff < 10.0f)) { + this->timer = 8; + } + } +} + +void BossSst_HandSetupReadySlam(BossSst* this) { + HAND_STATE(this) = HAND_SLAM; + this->timer = 0; + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 10.0f); + this->actionFunc = BossSst_HandReadySlam; +} + +void BossSst_HandReadySlam(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->timer != 0) { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + BossSst_HandSetupSlam(this); + } + } else { + Player* player = PLAYER; + + if (Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 300.0f, 30.0f) && + (this->actor.xzDistToPlayer < 140.0f)) { + this->timer = 20; + } + Math_ScaledStepToS(&this->actor.shape.rot.x, -0x1000, 0x100); + Math_ApproachF(&this->actor.world.pos.x, player->actor.world.pos.x, 0.5f, 40.0f); + Math_ApproachF(&this->actor.world.pos.z, player->actor.world.pos.z, 0.5f, 40.0f); + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + } +} + +void BossSst_HandSetupSlam(BossSst* this) { + HAND_STATE(this) = HAND_SLAM; + this->actor.velocity.y = 1.0f; + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 10.0f); + BossSst_HandSetDamage(this, 0x20); + this->ready = false; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_FLY_ATTACK); + this->actionFunc = BossSst_HandSlam; +} + +void BossSst_HandSlam(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_StepToS(&this->handZPosMod, -0xDAC, 0x1F4); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x1000); + Math_ScaledStepToS(&this->handYRotMod, 0, 0x1000); + if (this->timer != 0) { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + if (this->colliderJntSph.base.acFlags & AC_ON) { + BossSst_HandSetupEndSlam(this); + } else { + this->colliderJntSph.base.acFlags |= AC_ON; + BossSst_HandSetupWait(this); + } + } + } else { + if (this->ready) { + this->timer = 30; + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + } else { + this->actor.velocity.y *= 1.5f; + if (Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight, this->actor.velocity.y)) { + this->ready = true; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_TAIKO_LOW); + BossSst_SpawnShockwave(this); + this->colliderCyl.base.atFlags |= AT_ON; + Collider_UpdateCylinder(&this->actor, &this->colliderCyl); + this->colliderCyl.dim.radius = sCylinderInitHand.dim.radius; + } + } + + if (this->colliderJntSph.base.atFlags & AT_HIT) { + Player* player = PLAYER; + + player->actor.world.pos.x = (Math_SinS(this->actor.yawTowardsPlayer) * 100.0f) + this->actor.world.pos.x; + player->actor.world.pos.z = (Math_CosS(this->actor.yawTowardsPlayer) * 100.0f) + this->actor.world.pos.z; + + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + func_8002F71C(globalCtx, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 0.0f); + } + + Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x200); + } +} + +void BossSst_HandSetupReadySweep(BossSst* this) { + HAND_STATE(this) = HAND_SWEEP; + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 10.0f); + this->radius = Actor_WorldDistXZToPoint(&this->actor, &sHead->actor.world.pos); + this->actor.world.rot.y = Actor_WorldYawTowardPoint(&sHead->actor, &this->actor.world.pos); + this->targetYaw = this->actor.home.rot.y + (this->vParity * 0x2000); + this->actionFunc = BossSst_HandReadySweep; +} + +void BossSst_HandReadySweep(BossSst* this, GlobalContext* globalCtx) { + s32 inPosition; + + SkelAnime_Update(&this->skelAnime); + inPosition = Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 50.0f, 4.0f); + inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.y, this->targetYaw, 0x200); + inPosition &= Math_ScaledStepToS(&this->actor.world.rot.y, this->targetYaw, 0x400); + inPosition &= (Math_SmoothStepToF(&this->radius, sHead->actor.xzDistToPlayer, 0.5f, 60.0f, 1.0f) < 10.0f); + + this->actor.world.pos.x = (Math_SinS(this->actor.world.rot.y) * this->radius) + sHead->actor.world.pos.x; + this->actor.world.pos.z = (Math_CosS(this->actor.world.rot.y) * this->radius) + sHead->actor.world.pos.z; + if (inPosition) { + BossSst_HandSetupSweep(this); + } else { + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + } +} + +void BossSst_HandSetupSweep(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 5.0f); + BossSst_HandSetDamage(this, 0x10); + this->targetYaw = this->actor.home.rot.y - (this->vParity * 0x2000); + this->handMaxSpeed = 0x300; + this->handAngSpeed = 0; + this->ready = false; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_FLY_ATTACK); + this->actionFunc = BossSst_HandSweep; +} + +void BossSst_HandSweep(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 newTargetYaw; + + SkelAnime_Update(&this->skelAnime); + this->handAngSpeed += 0x60; + this->handAngSpeed = CLAMP_MAX(this->handAngSpeed, this->handMaxSpeed); + + if (!Math_SmoothStepToS(&this->actor.shape.rot.y, this->targetYaw, 4, this->handAngSpeed, 0x10)) { + this->colliderJntSph.base.ocFlags1 &= ~OC1_NO_PUSH; + BossSst_HandSetupRetreat(this); + } else if (this->colliderJntSph.base.atFlags & AT_HIT) { + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + this->ready = true; + func_8002F71C(globalCtx, &this->actor, 5.0f, this->actor.shape.rot.y - (this->vParity * 0x3800), 0.0f); + func_8002F7DC(&player->actor, NA_SE_PL_BODY_HIT); + newTargetYaw = this->actor.shape.rot.y - (this->vParity * 0x1400); + if (((s16)(newTargetYaw - this->targetYaw) * this->vParity) > 0) { + this->targetYaw = newTargetYaw; + } + } + + if (!this->ready && ((player->cylinder.dim.height > 40.0f) || (player->actor.world.pos.y > 1.0f))) { + this->colliderJntSph.base.atFlags |= AT_ON; + this->colliderJntSph.base.ocFlags1 &= ~OC1_NO_PUSH; + } else { + this->colliderJntSph.base.atFlags &= ~AT_ON; + this->colliderJntSph.base.ocFlags1 |= OC1_NO_PUSH; + } + + this->actor.world.pos.x = (Math_SinS(this->actor.shape.rot.y) * this->radius) + sHead->actor.world.pos.x; + this->actor.world.pos.z = (Math_CosS(this->actor.shape.rot.y) * this->radius) + sHead->actor.world.pos.z; +} + +void BossSst_HandSetupReadyPunch(BossSst* this) { + HAND_STATE(this) = HAND_PUNCH; + Animation_MorphToPlayOnce(&this->skelAnime, sHandPushoffPoses[this->actor.params], 10.0f); + this->actionFunc = BossSst_HandReadyPunch; +} + +void BossSst_HandReadyPunch(BossSst* this, GlobalContext* globalCtx) { + s32 inPosition = Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 0x400); + + if (SkelAnime_Update(&this->skelAnime) && inPosition) { + BossSst_HandSetupPunch(this); + } +} + +void BossSst_HandSetupPunch(BossSst* this) { + this->actor.speedXZ = 0.5f; + Animation_MorphToPlayOnce(&this->skelAnime, sHandFistPoses[this->actor.params], 5.0f); + BossSst_HandSetInvulnerable(this, true); + this->targetRoll = this->vParity * 0x3F00; + BossSst_HandSetDamage(this, 0x10); + this->actionFunc = BossSst_HandPunch; +} + +void BossSst_HandPunch(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 80.0f, 20.0f); + if (Math_ScaledStepToS(&this->actor.shape.rot.z, this->targetRoll, 0x400)) { + this->targetRoll *= -1; + } + + this->actor.speedXZ *= 1.25f; + this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 50.0f); + + this->actor.world.pos.x += this->actor.speedXZ * Math_SinS(this->actor.shape.rot.y); + this->actor.world.pos.z += this->actor.speedXZ * Math_CosS(this->actor.shape.rot.y); + if (this->actor.bgCheckFlags & 8) { + BossSst_HandSetupRetreat(this); + } else if (this->colliderJntSph.base.atFlags & AT_HIT) { + func_8002F7DC(&PLAYER->actor, NA_SE_PL_BODY_HIT); + func_8002F71C(globalCtx, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); + BossSst_HandSetupRetreat(this); + } + + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); +} + +void BossSst_HandSetupReadyClap(BossSst* this) { + HAND_STATE(this) = HAND_CLAP; + if (HAND_STATE(OTHER_HAND(this)) != HAND_CLAP) { + BossSst_HandSetupReadyClap(OTHER_HAND(this)); + } + + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 10.0f); + this->radius = Actor_WorldDistXZToPoint(&this->actor, &sHead->actor.world.pos); + this->actor.world.rot.y = Actor_WorldYawTowardPoint(&sHead->actor, &this->actor.world.pos); + this->targetYaw = this->actor.home.rot.y - (this->vParity * 0x1800); + this->targetRoll = this->vParity * 0x4000; + this->timer = 0; + this->ready = false; + OTHER_HAND(this)->ready = false; + this->actionFunc = BossSst_HandReadyClap; +} + +void BossSst_HandReadyClap(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + BossSst_HandSetupClap(this); + BossSst_HandSetupClap(OTHER_HAND(this)); + OTHER_HAND(this)->radius = this->radius; + } + } else if (!this->ready) { + this->ready = SkelAnime_Update(&this->skelAnime); + this->ready &= Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x600); + this->ready &= Math_ScaledStepToS(&this->actor.shape.rot.z, this->targetRoll, 0x600); + this->ready &= Math_ScaledStepToS(&this->actor.shape.rot.y, this->targetYaw, 0x200); + this->ready &= Math_ScaledStepToS(&this->actor.world.rot.y, this->targetYaw, 0x400); + this->ready &= Math_SmoothStepToF(&this->radius, sHead->actor.xzDistToPlayer, 0.5f, 50.0f, 1.0f) < 10.0f; + this->ready &= Math_SmoothStepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 95.0f, 0.5f, 30.0f, 1.0f) < 1.0f; + + this->actor.world.pos.x = Math_SinS(this->actor.world.rot.y) * this->radius + sHead->actor.world.pos.x; + this->actor.world.pos.z = Math_CosS(this->actor.world.rot.y) * this->radius + sHead->actor.world.pos.z; + } else if (OTHER_HAND(this)->ready) { + this->timer = 20; + } +} + +void BossSst_HandSetupClap(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 3.0f); + this->timer = 0; + this->handMaxSpeed = 0x240; + this->handAngSpeed = 0; + this->ready = false; + BossSst_HandSetDamage(this, 0x20); + this->actionFunc = BossSst_HandClap; +} + +void BossSst_HandClap(BossSst* this, GlobalContext* globalCtx) { + static s32 dropFlag = false; + Player* player = PLAYER; + + SkelAnime_Update(&this->skelAnime); + if (this->timer != 0) { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + if (dropFlag) { + Item_DropCollectible(globalCtx, &this->actor.world.pos, + (Rand_ZeroOne() < 0.5f) ? ITEM00_ARROWS_SMALL : ITEM00_MAGIC_SMALL); + dropFlag = false; + } + + BossSst_HandReleasePlayer(this, globalCtx, true); + BossSst_HandSetupEndClap(this); + } + } else { + if (this->colliderJntSph.base.atFlags & AT_HIT) { + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + OTHER_HAND(this)->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + BossSst_HandGrabPlayer(this, globalCtx); + } + + if (this->ready) { + this->timer = 30; + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + if (!(player->stateFlags2 & 0x80)) { + dropFlag = true; + } + } else { + this->handAngSpeed += 0x40; + this->handAngSpeed = CLAMP_MAX(this->handAngSpeed, this->handMaxSpeed); + + if (Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, this->handAngSpeed)) { + if (this->actor.params == BONGO_LEFT_HAND) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_CLAP); + } + this->ready = true; + } else { + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + } + + this->actor.world.pos.x = (Math_SinS(this->actor.shape.rot.y) * this->radius) + sHead->actor.world.pos.x; + this->actor.world.pos.z = (Math_CosS(this->actor.shape.rot.y) * this->radius) + sHead->actor.world.pos.z; + } + } + + if (player->actor.parent == &this->actor) { + player->unk_850 = 0; + player->actor.world.pos = this->actor.world.pos; + } +} + +void BossSst_HandSetupEndClap(BossSst* this) { + this->targetYaw = this->actor.home.rot.y - (this->vParity * 0x1000); + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 10.0f); + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + this->actionFunc = BossSst_HandEndClap; +} + +void BossSst_HandEndClap(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_ScaledStepToS(&this->actor.shape.rot.z, 0, 0x200); + if (Math_ScaledStepToS(&this->actor.shape.rot.y, this->targetYaw, 0x100)) { + BossSst_HandSetupRetreat(this); + } + this->actor.world.pos.x = (Math_SinS(this->actor.shape.rot.y) * this->radius) + sHead->actor.world.pos.x; + this->actor.world.pos.z = (Math_CosS(this->actor.shape.rot.y) * this->radius) + sHead->actor.world.pos.z; +} + +void BossSst_HandSetupReadyGrab(BossSst* this) { + HAND_STATE(this) = HAND_GRAB; + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 10.0f); + this->targetYaw = this->vParity * -0x5000; + this->targetRoll = this->vParity * 0x4000; + this->actionFunc = BossSst_HandReadyGrab; +} + +void BossSst_HandReadyGrab(BossSst* this, GlobalContext* globalCtx) { + s32 inPosition; + + SkelAnime_Update(&this->skelAnime); + inPosition = Math_SmoothStepToS(&this->actor.shape.rot.z, this->targetRoll, 4, 0x800, 0x100) == 0; + inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer + this->targetYaw, 0xA00); + Math_ApproachF(&this->actor.world.pos.y, ROOM_CENTER_Y + 95.0f, 0.5f, 20.0f); + if (inPosition) { + BossSst_HandSetupGrab(this); + } +} + +void BossSst_HandSetupGrab(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFistPoses[this->actor.params], 5.0f); + this->actor.world.rot.y = this->actor.shape.rot.y + (this->vParity * 0x4000); + this->targetYaw = this->actor.world.rot.y; + this->timer = 30; + this->actor.speedXZ = 0.5f; + BossSst_HandSetDamage(this, 0x20); + this->actionFunc = BossSst_HandGrab; +} + +void BossSst_HandGrab(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (this->timer != 0) { + this->timer--; + } + + this->actor.world.rot.y = ((1.0f - sinf(this->timer * (M_PI / 60.0f))) * (this->vParity * 0x2000)) + this->targetYaw; + this->actor.shape.rot.y = this->actor.world.rot.y - (this->vParity * 0x4000); + if (this->timer < 5) { + Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.5f, 25.0f, 5.0f); + if (SkelAnime_Update(&this->skelAnime)) { + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + this->actor.speedXZ = 0.0f; + if (player->stateFlags2 & 0x80) { + if (Rand_ZeroOne() < 0.5f) { + BossSst_HandSetupCrush(this); + } else { + BossSst_HandSetupSwing(this); + } + } else { + Item_DropCollectible(globalCtx, &this->actor.world.pos, + (Rand_ZeroOne() < 0.5f) ? ITEM00_ARROWS_SMALL : ITEM00_MAGIC_SMALL); + BossSst_HandSetupRetreat(this); + } + } + } else { + this->actor.speedXZ *= 1.26f; + this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 70.0f); + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + } + + if (this->colliderJntSph.base.atFlags & AT_HIT) { + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_CATCH); + BossSst_HandGrabPlayer(this, globalCtx); + this->timer = CLAMP_MAX(this->timer, 5); + } + + this->actor.world.pos.x += this->actor.speedXZ * Math_SinS(this->actor.world.rot.y); + this->actor.world.pos.z += this->actor.speedXZ * Math_CosS(this->actor.world.rot.y); + if (player->stateFlags2 & 0x80) { + player->unk_850 = 0; + player->actor.world.pos = this->actor.world.pos; + player->actor.shape.rot.y = this->actor.shape.rot.y; + } +} + +void BossSst_HandSetupCrush(BossSst* this) { + Animation_MorphToLoop(&this->skelAnime, sHandClenchAnims[this->actor.params], -10.0f); + this->timer = 20; + this->actionFunc = BossSst_HandCrush; +} + +void BossSst_HandCrush(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + SkelAnime_Update(&this->skelAnime); + if (this->timer != 0) { + this->timer--; + } + + if (!(player->stateFlags2 & 0x80)) { + BossSst_HandReleasePlayer(this, globalCtx, true); + BossSst_HandSetupEndCrush(this); + } else { + player->actor.world.pos = this->actor.world.pos; + if (this->timer == 0) { + this->timer = 20; + if (LINK_IS_CHILD) { + func_8002F7DC(&player->actor, NA_SE_VO_LI_DAMAGE_S_KID); + } else { + func_8002F7DC(&player->actor, NA_SE_VO_LI_DAMAGE_S); + } + + globalCtx->damagePlayer(globalCtx, -8); + } + if (Animation_OnFrame(&this->skelAnime, 0.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_CATCH); + } + } +} + +void BossSst_HandSetupEndCrush(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 10.0f); + this->actionFunc = BossSst_HandEndCrush; +} + +void BossSst_HandEndCrush(BossSst* this, GlobalContext* globalCtx) { + if (SkelAnime_Update(&this->skelAnime)) { + BossSst_HandSetupRetreat(this); + } +} + +void BossSst_HandSetupSwing(BossSst* this) { + this->amplitude = -0x4000; + this->timer = 1; + this->center.x = this->actor.world.pos.x - (Math_SinS(this->actor.shape.rot.y) * 200.0f); + this->center.y = this->actor.world.pos.y; + this->center.z = this->actor.world.pos.z - (Math_CosS(this->actor.shape.rot.y) * 200.0f); + this->actionFunc = BossSst_HandSwing; +} + +void BossSst_HandSwing(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 offXZ; + + if (Math_ScaledStepToS(&this->actor.shape.rot.x, this->amplitude, this->timer * 0xE4 + 0x1C8)) { + if (this->amplitude != 0) { + this->amplitude = 0; + if (this->timer == 4) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 4.0f); + } + } else { + if (this->timer == 4) { + player->actor.shape.rot.x = 0; + player->actor.shape.rot.z = 0; + BossSst_HandSetupRetreat(this); + return; + } + this->amplitude = (this->timer == 3) ? -0x6000 : -0x4000; + this->timer++; + } + } + + this->actor.world.pos.y = (Math_CosS(this->actor.shape.rot.x + 0x4000) * 200.0f) + this->center.y; + offXZ = Math_SinS(this->actor.shape.rot.x + 0x4000) * 200.0f; + this->actor.world.pos.x = (Math_SinS(this->actor.shape.rot.y) * offXZ) + this->center.x; + this->actor.world.pos.z = (Math_CosS(this->actor.shape.rot.y) * offXZ) + this->center.z; + if (this->timer != 4) { + this->actor.shape.rot.z = (this->actor.shape.rot.x + 0x4000) * this->vParity; + } else { + Math_ScaledStepToS(&this->actor.shape.rot.z, 0, 0x800); + } + + if (player->stateFlags2 & 0x80) { + player->unk_850 = 0; + Math_Vec3f_Copy(&player->actor.world.pos, &this->actor.world.pos); + player->actor.shape.rot.x = this->actor.shape.rot.x; + player->actor.shape.rot.z = (this->vParity * -0x4000) + this->actor.shape.rot.z; + } else { + Math_ScaledStepToS(&player->actor.shape.rot.x, 0, 0x600); + Math_ScaledStepToS(&player->actor.shape.rot.z, 0, 0x600); + player->actor.world.pos.x += 20.0f * Math_SinS(this->actor.shape.rot.y); + player->actor.world.pos.z += 20.0f * Math_CosS(this->actor.shape.rot.y); + } + + if ((this->timer == 4) && (this->amplitude == 0) && SkelAnime_Update(&this->skelAnime) && + (player->stateFlags2 & 0x80)) { + BossSst_HandReleasePlayer(this, globalCtx, false); + player->actor.world.pos.x += 70.0f * Math_SinS(this->actor.shape.rot.y); + player->actor.world.pos.z += 70.0f * Math_CosS(this->actor.shape.rot.y); + func_8002F71C(globalCtx, &this->actor, 15.0f, this->actor.shape.rot.y, 2.0f); + func_8002F7DC(&player->actor, NA_SE_PL_BODY_HIT); + } + + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); +} + +void BossSst_HandSetupReel(BossSst* this) { + HAND_STATE(this) = HAND_DAMAGED; + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 4.0f); + this->timer = 36; + Math_Vec3f_Copy(&this->center, &this->actor.world.pos); + Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, 200); + this->actionFunc = BossSst_HandReel; +} + +void BossSst_HandReel(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->timer != 0) { + this->timer--; + } + + if (!(this->timer % 4)) { + if (this->timer % 8) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 4.0f); + } else { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFistPoses[this->actor.params], 6.0f); + } + } + + this->actor.colorFilterTimer = 200; + this->actor.world.pos.x += Rand_CenteredFloat(20.0f); + this->actor.world.pos.y += Rand_CenteredFloat(20.0f); + this->actor.world.pos.z += Rand_CenteredFloat(20.0f); + + if (this->actor.world.pos.y < (this->actor.floorHeight + 100.0f)) { + Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight + 100.0f, 20.0f); + } + + if (this->timer == 0) { + BossSst_HandSetupReadyShake(this); + } +} + +void BossSst_HandSetupReadyShake(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandDamagePoses[this->actor.params], 8.0f); + this->actionFunc = BossSst_HandReadyShake; +} + +void BossSst_HandReadyShake(BossSst* this, GlobalContext* globalCtx) { + f32 diff; + s32 inPosition; + + diff = Math_SmoothStepToF(&this->actor.world.pos.x, this->actor.home.pos.x, 0.5f, 25.0f, 1.0f); + diff += Math_SmoothStepToF(&this->actor.world.pos.z, this->actor.home.pos.z, 0.5f, 25.0f, 1.0f); + diff += Math_SmoothStepToF(&this->actor.world.pos.y, this->actor.home.pos.y + 200.0f, 0.2f, 30.0f, 1.0f); + inPosition = Math_ScaledStepToS(&this->actor.shape.rot.x, 0x4000, 0x400); + inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.z, 0, 0x1000); + inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x800); + inPosition &= Math_StepToS(&this->handZPosMod, -0x5DC, 0x1F4); + inPosition &= Math_ScaledStepToS(&this->handYRotMod, this->vParity * -0x2000, 0x800); + this->actor.colorFilterTimer = 200; + if ((diff < 30.0f) && inPosition) { + BossSst_HandSetupShake(this); + } else { + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + } +} + +void BossSst_HandSetupShake(BossSst* this) { + this->timer = 200; + this->actionFunc = BossSst_HandShake; +} + +void BossSst_HandShake(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + if (this->timer != 0) { + this->timer--; + } + + this->actor.shape.rot.x = 0x4000 + (sinf(this->timer * (M_PI / 5)) * 0x2000); + this->handYRotMod = (this->vParity * -0x2000) + (sinf(this->timer * (M_PI / 4)) * 0x2800); + + if (!(this->timer % 8)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_SHAKEHAND); + } + + if (HAND_STATE(OTHER_HAND(this)) == HAND_DAMAGED) { + if ((OTHER_HAND(this)->actionFunc == BossSst_HandShake) || + (OTHER_HAND(this)->actionFunc == BossSst_HandReadyCharge)) { + BossSst_HandSetupReadyCharge(this); + } else if (this->timer == 0) { + this->timer = 80; + } + } else if (this->timer == 0) { + this->actor.flags |= 1; + BossSst_HandSetupSlam(this); + } +} + +void BossSst_HandSetupReadyCharge(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFistPoses[this->actor.params], 10.0f); + this->ready = false; + this->actionFunc = BossSst_HandReadyCharge; +} + +void BossSst_HandReadyCharge(BossSst* this, GlobalContext* globalCtx) { + if (!this->ready) { + this->ready = SkelAnime_Update(&this->skelAnime); + this->ready &= Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x800); + this->ready &= + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y + (this->vParity * 0x1000), 0x800); + this->ready &= Math_ScaledStepToS(&this->handYRotMod, 0, 0x800); + this->ready &= Math_ScaledStepToS(&this->actor.shape.rot.z, this->vParity * 0x2800, 0x800); + this->ready &= Math_StepToS(&this->handZPosMod, -0xDAC, 0x1F4); + if (this->ready) { + this->actor.colorFilterTimer = 0; + } + } else if (this->colliderJntSph.base.atFlags & AT_HIT) { + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + OTHER_HAND(this)->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + sHead->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + func_8002F71C(globalCtx, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); + func_8002F7DC(&PLAYER->actor, NA_SE_PL_BODY_HIT); + } +} + +void BossSst_HandSetupStunned(BossSst* hand) { + Animation_MorphToPlayOnce(&hand->skelAnime, sHandIdleAnims[hand->actor.params], 10.0f); + if (hand->actionFunc != BossSst_HandDamage) { + hand->ready = false; + } + + hand->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + hand->colliderJntSph.base.acFlags |= AC_ON; + BossSst_HandSetInvulnerable(hand, true); + Actor_SetColorFilter(&hand->actor, 0, 0xFF, 0, Animation_GetLastFrame(&gBongoHeadKnockoutAnim)); + hand->actionFunc = BossSst_HandStunned; +} + +void BossSst_HandStunned(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_ApproachF(&this->actor.world.pos.z, (Math_CosS(sHead->actor.shape.rot.y) * 200.0f) + this->actor.home.pos.z, + 0.5f, 25.0f); + Math_ApproachF(&this->actor.world.pos.x, (Math_SinS(sHead->actor.shape.rot.y) * 200.0f) + this->actor.home.pos.x, + 0.5f, 25.0f); + if (!this->ready) { + Math_ScaledStepToS(&this->handYRotMod, 0, 0x800); + Math_StepToS(&this->handZPosMod, -0xDAC, 0x1F4); + Math_ScaledStepToS(&this->actor.shape.rot.x, this->actor.home.rot.x, 0x800); + Math_ScaledStepToS(&this->actor.shape.rot.z, this->actor.home.rot.z, 0x800); + Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x800); + if (sHead->actionFunc == BossSst_HeadVulnerable) { + this->ready = true; + Animation_MorphToPlayOnce(&this->skelAnime, sHandDamagePoses[this->actor.params], 10.0f); + } + } else { + Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight, 30.0f); + } +} + +void BossSst_HandSetupDamage(BossSst* hand) { + hand->actor.shape.rot.x = 0; + Animation_MorphToPlayOnce(&hand->skelAnime, sHandOpenPoses[hand->actor.params], 3.0f); + hand->timer = 6; + hand->actionFunc = BossSst_HandDamage; +} + +void BossSst_HandDamage(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + SkelAnime_Update(&this->skelAnime); + if (this->timer >= 2) { + this->actor.shape.rot.x -= 0x200; + Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight + 200.0f, 50.0f); + } else { + this->actor.shape.rot.x += 0x400; + Math_StepToF(&this->actor.world.pos.y, this->actor.floorHeight, 100.0f); + } + + if (this->timer == 0) { + if (this->actor.floorHeight >= 0.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_TAIKO_HIGH); + } + BossSst_HandSetupStunned(this); + } +} + +void BossSst_HandSetupThrash(BossSst* this) { + HAND_STATE(this) = HAND_DEATH; + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 2.0f); + this->actor.shape.rot.x = 0; + this->timer = 160; + if (this->actor.params == BONGO_LEFT_HAND) { + this->amplitude = -0x800; + } else { + this->amplitude = 0; + this->actor.shape.rot.x = -0x800; + } + + this->handAngSpeed = 0x180; + this->actionFunc = BossSst_HandThrash; +} + +void BossSst_HandThrash(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + SkelAnime_Update(&this->skelAnime); + Math_ApproachF(&this->actor.world.pos.z, (Math_CosS(sHead->actor.shape.rot.y) * 200.0f) + this->actor.home.pos.z, + 0.5f, 25.0f); + Math_ApproachF(&this->actor.world.pos.x, (Math_SinS(sHead->actor.shape.rot.y) * 200.0f) + this->actor.home.pos.x, + 0.5f, 25.0f); + if (Math_ScaledStepToS(&this->actor.shape.rot.x, this->amplitude, this->handAngSpeed)) { + if (this->amplitude != 0) { + this->amplitude = 0; + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 5.0f); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_TAIKO_HIGH); + this->amplitude = -0x800; + Animation_MorphToPlayOnce(&this->skelAnime, sHandOpenPoses[this->actor.params], 5.0f); + } + + if (this->timer < 80.0f) { + this->handAngSpeed -= 0x40; + this->handAngSpeed = CLAMP_MIN(this->handAngSpeed, 0x40); + } + } + + this->actor.world.pos.y = + (((this->handAngSpeed / 256.0f) + 0.5f) * 150.0f) * (-1.0f / 0x800) * this->actor.shape.rot.x; + if (this->timer == 0) { + BossSst_HandSetupDarken(this); + } +} + +void BossSst_HandSetupDarken(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 5.0f); + this->actionFunc = BossSst_HandDarken; +} + +void BossSst_HandDarken(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_ScaledStepToS(&this->actor.shape.rot.x, -0x800, this->handAngSpeed); + Math_StepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 90.0f, 5.0f); + if (sHead->actionFunc == BossSst_HeadFall) { + BossSst_HandSetupFall(this); + } +} + +void BossSst_HandSetupFall(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandFlatPoses[this->actor.params], 3.0f); + this->actionFunc = BossSst_HandFall; +} + +void BossSst_HandFall(BossSst* this, GlobalContext* globalCtx) { + SkelAnime_Update(&this->skelAnime); + Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x400); + this->actor.world.pos.y = sHead->actor.world.pos.y + 230.0f; + if (sHead->actionFunc == BossSst_HeadMelt) { + BossSst_HandSetupMelt(this); + } +} + +void BossSst_HandSetupMelt(BossSst* this) { + BossSst_SpawnHandShadow(this); + this->actor.shape.shadowDraw = NULL; + this->timer = 80; + this->actionFunc = BossSst_HandMelt; +} + +void BossSst_HandMelt(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + this->actor.scale.y -= 0.00025f; + this->actor.scale.x += 0.000025f; + this->actor.scale.z += 0.000025f; + this->actor.world.pos.y = ROOM_CENTER_Y + 0.0f; + if (this->timer == 0) { + BossSst_HandSetupFinish(this); + } +} + +void BossSst_HandSetupFinish(BossSst* this) { + this->actor.draw = BossSst_DrawEffect; + this->timer = 20; + this->effects[0].status = 0; + this->actionFunc = BossSst_HandFinish; +} + +void BossSst_HandFinish(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + if (this->timer == 0) { + this->effectMode = BONGO_NULL; + } +} + +void BossSst_HandSetupRecover(BossSst* this) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandPushoffPoses[this->actor.params], 10.0f); + this->ready = false; + this->actionFunc = BossSst_HandRecover; +} + +void BossSst_HandRecover(BossSst* this, GlobalContext* globalCtx) { + Math_SmoothStepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 250.0f, 0.5f, 70.0f, 5.0f); + if (SkelAnime_Update(&this->skelAnime)) { + if (!this->ready) { + Animation_MorphToPlayOnce(&this->skelAnime, sHandHangPoses[this->actor.params], 10.0f); + this->ready = true; + } + } + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); +} + +void BossSst_HandSetupFrozen(BossSst* this) { + s32 i; + + HAND_STATE(this) = HAND_FROZEN; + Math_Vec3f_Copy(&this->center, &this->actor.world.pos); + BossSst_HandSetupReadyBreakIce(OTHER_HAND(this)); + this->ready = false; + this->effectMode = BONGO_ICE; + this->timer = 35; + for (i = 0; i < 18; i++) { + this->effects[i].move = false; + } + + BossSst_SpawnIceCrystal(this, 0); + Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, 0xA); + this->handAngSpeed = 0; + this->actionFunc = BossSst_HandFrozen; +} + +void BossSst_HandFrozen(BossSst* this, GlobalContext* globalCtx) { + if (this->timer != 0) { + this->timer--; + } + + if ((this->timer % 2) != 0) { + BossSst_SpawnIceCrystal(this, (this->timer >> 1) + 1); + } + + if (this->ready) { + BossSst_IceShatter(this); + BossSst_HandSetupRetreat(this); + sHead->ready = true; + } else { + this->actor.colorFilterTimer = 10; + if (this->handAngSpeed != 0) { + f32 offY = Math_SinS(OTHER_HAND(this)->actor.shape.rot.x) * 5.0f; + f32 offXZ = Math_CosS(OTHER_HAND(this)->actor.shape.rot.x) * 5.0f; + + if ((this->handAngSpeed % 2) != 0) { + offY *= -1.0f; + offXZ *= -1.0f; + } + + this->actor.world.pos.x = this->center.x + (Math_CosS(OTHER_HAND(this)->actor.shape.rot.y) * offXZ); + this->actor.world.pos.y = this->center.y + offY; + this->actor.world.pos.z = this->center.z + (Math_SinS(OTHER_HAND(this)->actor.shape.rot.y) * offXZ); + this->handAngSpeed--; + } + } +} + +void BossSst_HandSetupReadyBreakIce(BossSst* this) { + HAND_STATE(this) = HAND_BREAK_ICE; + Animation_MorphToPlayOnce(&this->skelAnime, sHandFistPoses[this->actor.params], 5.0f); + this->ready = false; + this->actor.colorFilterTimer = 0; + if (this->effectMode == BONGO_ICE) { + this->effectMode = BONGO_NULL; + } + + this->radius = Actor_WorldDistXZToPoint(&this->actor, &OTHER_HAND(this)->center); + this->targetYaw = Actor_WorldYawTowardPoint(&this->actor, &OTHER_HAND(this)->center); + BossSst_HandSetInvulnerable(this, true); + this->actionFunc = BossSst_HandReadyBreakIce; +} + +void BossSst_HandReadyBreakIce(BossSst* this, GlobalContext* globalCtx) { + s32 inPosition; + + inPosition = Math_ScaledStepToS(&this->actor.shape.rot.y, this->targetYaw, 0x400); + inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.x, 0x1000, 0x400); + inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.z, 0, 0x800); + inPosition &= Math_ScaledStepToS(&this->handYRotMod, 0, 0x400); + inPosition &= Math_StepToF(&this->actor.world.pos.y, OTHER_HAND(this)->center.y + 200.0f, 50.0f); + inPosition &= Math_StepToF(&this->radius, 400.0f, 60.0f); + this->actor.world.pos.x = OTHER_HAND(this)->center.x - (Math_SinS(this->targetYaw) * this->radius); + this->actor.world.pos.z = OTHER_HAND(this)->center.z - (Math_CosS(this->targetYaw) * this->radius); + if (SkelAnime_Update(&this->skelAnime) && inPosition) { + BossSst_HandSetupBreakIce(this); + } +} + +void BossSst_HandSetupBreakIce(BossSst* this) { + this->timer = 9; + this->actionFunc = BossSst_HandBreakIce; + this->actor.speedXZ = 0.5f; +} + +void BossSst_HandBreakIce(BossSst* this, GlobalContext* globalCtx) { + if ((this->timer % 2) != 0) { + this->actor.speedXZ *= 1.5f; + this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 60.0f); + + if (Math_StepToF(&this->radius, 100.0f, this->actor.speedXZ)) { + BossSst_SpawnIceShard(this); + if (this->timer != 0) { + this->timer--; + } + + if (this->timer != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_ICE_BROKEN); + } + + OTHER_HAND(this)->handAngSpeed = 5; + } + } else { + this->actor.speedXZ *= 0.8f; + Math_StepToF(&this->radius, 500.0f, this->actor.speedXZ); + if (this->actor.speedXZ < 2.0f) { + if (this->timer != 0) { + this->timer--; + } + } + } + + this->actor.world.pos.x = OTHER_HAND(this)->center.x - (Math_SinS(this->targetYaw) * this->radius); + this->actor.world.pos.z = OTHER_HAND(this)->center.z - (Math_CosS(this->targetYaw) * this->radius); + this->actor.world.pos.y = OTHER_HAND(this)->center.y + (this->radius * 0.4f); + if (this->timer == 0) { + OTHER_HAND(this)->ready = true; + BossSst_HandSetupRetreat(this); + } + + func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); +} + +void BossSst_HandGrabPlayer(BossSst* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if (globalCtx->grabPlayer(globalCtx, player)) { + player->actor.parent = &this->actor; + if (player->actor.colChkInfo.health > 0) { + this->colliderJntSph.base.ocFlags1 &= ~OC1_ON; + if (HAND_STATE(this) == HAND_CLAP) { + OTHER_HAND(this)->colliderJntSph.base.ocFlags1 &= ~OC1_ON; + } + } + } +} + +void BossSst_HandReleasePlayer(BossSst* this, GlobalContext* globalCtx, s32 dropPlayer) { + Player* player = PLAYER; + + if (player->actor.parent == &this->actor) { + player->actor.parent = NULL; + player->unk_850 = 100; + this->colliderJntSph.base.ocFlags1 |= OC1_ON; + OTHER_HAND(this)->colliderJntSph.base.ocFlags1 |= OC1_ON; + if (dropPlayer) { + func_8002F71C(globalCtx, &this->actor, 0.0f, this->actor.shape.rot.y, 0.0f); + } + } +} + +void BossSst_MoveAround(BossSst* this) { + BossSst* hand; + Vec3f* vec; + f32 sn; + f32 cs; + s32 i; + + sn = Math_SinS(this->actor.shape.rot.y); + cs = Math_CosS(this->actor.shape.rot.y); + if (this->actionFunc != BossSst_HeadEndCharge) { + this->actor.world.pos.x = sRoomCenter.x + (this->radius * sn); + this->actor.world.pos.z = sRoomCenter.z + (this->radius * cs); + } + + for (i = 0; i < 2; i++) { + hand = sHands[i]; + vec = &sHandOffsets[i]; + + hand->actor.world.pos.x = this->actor.world.pos.x + (vec->z * sn) + (vec->x * cs); + hand->actor.world.pos.y = this->actor.world.pos.y + vec->y; + hand->actor.world.pos.z = this->actor.world.pos.z + (vec->z * cs) - (vec->x * sn); + + hand->actor.home.pos.x = this->actor.world.pos.x + (400.0f * sn) + (-200.0f * hand->vParity * cs); + hand->actor.home.pos.y = this->actor.world.pos.y; + hand->actor.home.pos.z = this->actor.world.pos.z + (400.0f * cs) - (-200.0f * hand->vParity * sn); + + hand->actor.home.rot.y = this->actor.shape.rot.y; + hand->actor.shape.rot.y = sHandYawOffsets[i] + this->actor.shape.rot.y; + + if (hand->actor.world.pos.y < hand->actor.floorHeight) { + hand->actor.world.pos.y = hand->actor.floorHeight; + } + } +} + +void BossSst_HandSelectAttack(BossSst* this) { + f32 rand = Rand_ZeroOne() * 6.0f; + s32 randInt; + + if (HAND_STATE(OTHER_HAND(this)) == HAND_DAMAGED) { + rand *= 5.0f / 6; + if (rand > 4.0f) { + rand = 4.0f; + } + } + + randInt = rand; + if (randInt == 0) { + BossSst_HandSetupReadySlam(this); + } else if (randInt == 1) { + BossSst_HandSetupReadySweep(this); + } else if (randInt == 2) { + BossSst_HandSetupReadyPunch(this); + } else if (randInt == 5) { + BossSst_HandSetupReadyClap(this); + } else { // randInt == 3 || randInt == 4 + BossSst_HandSetupReadyGrab(this); + } +} + +void BossSst_HandSetDamage(BossSst* this, s32 damage) { + s32 i; + + this->colliderJntSph.base.atFlags |= AT_ON; + for (i = 0; i < 11; i++) { + this->colliderJntSph.elements[i].info.toucher.damage = damage; + } +} + +void BossSst_HandSetInvulnerable(BossSst* this, s32 isInv) { + this->colliderJntSph.base.acFlags &= ~AC_HIT; + if (isInv) { + this->colliderJntSph.base.colType = COLTYPE_HARD; + this->colliderJntSph.base.acFlags |= AC_HARD; + } else { + this->colliderJntSph.base.colType = COLTYPE_HIT0; + this->colliderJntSph.base.acFlags &= ~AC_HARD; + } +} + +void BossSst_HeadSfx(BossSst* this, u16 sfxId) { + func_80078914(&this->center, sfxId); +} + +void BossSst_HandCollisionCheck(BossSst* this, GlobalContext* globalCtx) { + if ((this->colliderJntSph.base.acFlags & AC_HIT) && (this->colliderJntSph.base.colType != COLTYPE_HARD)) { + s32 bothHands = true; + + this->colliderJntSph.base.acFlags &= ~AC_HIT; + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); + this->colliderJntSph.base.acFlags &= ~AC_ON; + this->colliderJntSph.base.ocFlags1 &= ~OC1_NO_PUSH; + BossSst_HandReleasePlayer(this, globalCtx, true); + if (HAND_STATE(OTHER_HAND(this)) == HAND_CLAP) { + BossSst_HandReleasePlayer(OTHER_HAND(this), globalCtx, true); + BossSst_HandSetupRetreat(OTHER_HAND(this)); + } + + this->actor.flags &= ~1; + if (this->actor.colChkInfo.damageEffect == 3) { + BossSst_HandSetupFrozen(this); + } else { + BossSst_HandSetupReel(this); + if (HAND_STATE(OTHER_HAND(this)) != HAND_DAMAGED) { + bothHands = false; + } + } + + BossSst_HeadSetupDamagedHand(sHead, bothHands); + Item_DropCollectible(globalCtx, &this->actor.world.pos, + (Rand_ZeroOne() < 0.5f) ? ITEM00_ARROWS_SMALL : ITEM00_MAGIC_SMALL); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_DAMAGE_HAND); + } + } +} + +void BossSst_HeadCollisionCheck(BossSst* this, GlobalContext* globalCtx) { + if (this->colliderCyl.base.acFlags & AC_HIT) { + this->colliderCyl.base.acFlags &= ~AC_HIT; + if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { + if (this->actionFunc == BossSst_HeadVulnerable) { + if (Actor_ApplyDamage(&this->actor) == 0) { + func_80032C7C(globalCtx, &this->actor); + BossSst_HeadSetupDeath(this, globalCtx); + } else { + BossSst_HeadSetupDamage(this); + } + + BossSst_HandSetupDamage(sHands[LEFT]); + BossSst_HandSetupDamage(sHands[RIGHT]); + } else { + BossSst_HeadSetupStunned(this); + if (HAND_STATE(sHands[RIGHT]) == HAND_FROZEN) { + BossSst_IceShatter(sHands[RIGHT]); + } else if (HAND_STATE(sHands[LEFT]) == HAND_FROZEN) { + BossSst_IceShatter(sHands[LEFT]); + } + + BossSst_HandSetupStunned(sHands[RIGHT]); + BossSst_HandSetupStunned(sHands[LEFT]); + } + } + } +} + +void BossSst_UpdateHand(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BossSst* this = THIS; + BossSstHandTrail* trail; + + if (this->colliderCyl.base.atFlags & AT_ON) { + if ((this->effects[0].move < 5) || + (this->actor.xzDistToPlayer < ((this->effects[2].scale * 0.01f) * sCylinderInitHand.dim.radius)) || + (this->colliderCyl.base.atFlags & AT_HIT)) { + this->colliderCyl.base.atFlags &= ~(AT_ON | AT_HIT); + } else { + this->colliderCyl.dim.radius = (this->effects[0].scale * 0.01f) * sCylinderInitHand.dim.radius; + } + } + + BossSst_HandCollisionCheck(this, globalCtx); + this->actionFunc(this, globalCtx); + Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 50.0f, 130.0f, 0.0f, 5); + Actor_SetFocus(&this->actor, 0.0f); + if (this->colliderJntSph.base.atFlags & AT_ON) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph.base); + } + + if ((sHead->actionFunc != BossSst_HeadLurk) && (sHead->actionFunc != BossSst_HeadIntro) && + (this->colliderJntSph.base.acFlags & AC_ON)) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph.base); + } + + if (this->colliderJntSph.base.ocFlags1 & OC1_ON) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph.base); + } + + if (this->colliderCyl.base.atFlags & AT_ON) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colliderCyl.base); + } + + if ((HAND_STATE(this) != HAND_DEATH) && (HAND_STATE(this) != HAND_WAIT) && (HAND_STATE(this) != HAND_BEAT) && + (HAND_STATE(this) != HAND_FROZEN)) { + this->trailCount++; + this->trailCount = CLAMP_MAX(this->trailCount, 7); + } else { + this->trailCount--; + this->trailCount = CLAMP_MIN(this->trailCount, 0); + } + + trail = &this->handTrails[this->trailIndex]; + Math_Vec3f_Copy(&trail->world.pos, &this->actor.world.pos); + trail->world.rot = this->actor.shape.rot; + trail->zPosMod = this->handZPosMod; + trail->yRotMod = this->handYRotMod; + + this->trailIndex = (this->trailIndex + 1) % 7; + BossSst_UpdateEffect(&this->actor, globalCtx); +} + +void BossSst_UpdateHead(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BossSst* this = THIS; + + func_8002DBD0(&this->actor, &sHandOffsets[RIGHT], &sHands[RIGHT]->actor.world.pos); + func_8002DBD0(&this->actor, &sHandOffsets[LEFT], &sHands[LEFT]->actor.world.pos); + + sHandYawOffsets[LEFT] = sHands[LEFT]->actor.shape.rot.y - thisx->shape.rot.y; + sHandYawOffsets[RIGHT] = sHands[RIGHT]->actor.shape.rot.y - thisx->shape.rot.y; + + BossSst_HeadCollisionCheck(this, globalCtx); + this->actionFunc(this, globalCtx); + if (this->vVanish) { + if ((globalCtx->actorCtx.unk_03 == 0) || (thisx->colorFilterTimer != 0)) { + this->actor.flags &= ~0x80; + } else { + this->actor.flags |= 0x80; + } + } + + if (this->colliderJntSph.base.atFlags & AT_ON) { + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph.base); + } + + if ((this->actionFunc != BossSst_HeadLurk) && (this->actionFunc != BossSst_HeadIntro)) { + if (this->colliderCyl.base.acFlags & AC_ON) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderCyl.base); + } + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph.base); + } + + if (this->colliderJntSph.base.ocFlags1 & OC1_ON) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph.base); + } + + BossSst_MoveAround(this); + if ((!this->vVanish || ((this->actor.flags & 0x80) == 0x80)) && + ((this->actionFunc == BossSst_HeadReadyCharge) || (this->actionFunc == BossSst_HeadCharge) || + (this->actionFunc == BossSst_HeadFrozenHand) || (this->actionFunc == BossSst_HeadStunned) || + (this->actionFunc == BossSst_HeadVulnerable) || (this->actionFunc == BossSst_HeadDamage))) { + this->actor.flags |= 1; + } else { + this->actor.flags &= ~1; + } + + if (this->actionFunc == BossSst_HeadCharge) { + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_MOVE - SFX_FLAG); + } + + BossSst_UpdateEffect(&this->actor, globalCtx); +} + +s32 BossSst_OverrideHandDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx) { + BossSst* this = THIS; + + if (limbIndex == 1) { + pos->z += this->handZPosMod; + rot->y += this->handYRotMod; + } + return false; +} + +void BossSst_PostHandDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + BossSst* this = THIS; + + Collider_UpdateSpheres(limbIndex, &this->colliderJntSph); +} + +s32 BossSst_OverrideHandTrailDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* data, Gfx** gfx) { + BossSstHandTrail* trail = (BossSstHandTrail*)data; + + if (limbIndex == 1) { + pos->z += trail->zPosMod; + rot->y += trail->yRotMod; + } + return false; +} + +void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) { + BossSst* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6563); + + func_80093D18(globalCtx->state.gfxCtx); + + gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x80, sBodyColor.r, sBodyColor.g, sBodyColor.b, 255); + + if (!sBodyStatic) { + gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]); + } else { + gDPSetEnvColor(POLY_OPA_DISP++, sStaticColor.r, sStaticColor.g, sStaticColor.b, 0); + gSPSegment(POLY_OPA_DISP++, 0x08, sBodyStaticDList); + } + + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, + BossSst_OverrideHandDraw, BossSst_PostHandDraw, this); + if (this->trailCount >= 2) { + BossSstHandTrail* trail; + BossSstHandTrail* trail2; + s32 i; + s32 idx; + s32 end; + s32 pad; + + func_80093D84(globalCtx->state.gfxCtx); + + end = this->trailCount >> 1; + idx = (this->trailIndex + 4) % 7; + trail = &this->handTrails[idx]; + trail2 = &this->handTrails[(idx + 2) % 7]; + + for (i = 0; i < end; i++) { + if (Math3D_Vec3fDistSq(&trail2->world.pos, &trail->world.pos) > 900.0f) { + func_800D1694(trail->world.pos.x, trail->world.pos.y, trail->world.pos.z, &trail->world.rot); + Matrix_Scale(0.02f, 0.02f, 0.02f, MTXMODE_APPLY); + + gSPSegment(POLY_XLU_DISP++, 0x08, sHandTrailDList); + gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x00, ((3 - i) * 10) + 20, 0, ((3 - i) * 20) + 50, + ((3 - i) * 30) + 70); + + POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, BossSst_OverrideHandTrailDraw, NULL, + trail, POLY_XLU_DISP); + } + idx = (idx + 5) % 7; + trail2 = trail; + trail = &this->handTrails[idx]; + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6654); + + BossSst_DrawEffect(&this->actor, globalCtx); +} + +s32 BossSst_OverrideHeadDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, + Gfx** gfx) { + BossSst* this = THIS; + s32 shakeAmp; + s32 pad; + s32 timer12; + f32 shakeMod; + + if (((this->actor.flags & 0x80) != 0x80) && this->vVanish) { + *dList = NULL; + } else if (this->actionFunc == BossSst_HeadThrash) { // Animation modifications for death cutscene + shakeAmp = (this->timer / 10) + 1; + if ((limbIndex == 3) || (limbIndex == 39) || (limbIndex == 42)) { + + shakeMod = sinf(this->timer * (M_PI / 5)); + rot->x += ((0x500 * Rand_ZeroOne() + 0xA00) / 0x10) * shakeAmp * shakeMod; + + shakeMod = sinf((this->timer % 5) * (M_PI / 5)); + rot->z -= ((0x800 * Rand_ZeroOne() + 0x1000) / 0x10) * shakeAmp * shakeMod + 0x1000; + + if (limbIndex == 3) { + + shakeMod = sinf(this->timer * (M_PI / 5)); + rot->y += ((0x500 * Rand_ZeroOne() + 0xA00) / 0x10) * shakeAmp * shakeMod; + } + } else if ((limbIndex == 5) || (limbIndex == 6)) { + + shakeMod = sinf((this->timer % 5) * (M_PI / 5)); + rot->z -= ((0x280 * Rand_ZeroOne() + 0x500) / 0x10) * shakeAmp * shakeMod + 0x500; + + if (limbIndex == 5) { + + shakeMod = sinf(this->timer * (M_PI / 5)); + rot->x += ((0x500 * Rand_ZeroOne() + 0xA00) / 0x10) * shakeAmp * shakeMod; + + shakeMod = sinf(this->timer * (M_PI / 5)); + rot->y += ((0x500 * Rand_ZeroOne() + 0xA00) / 0x10) * shakeAmp * shakeMod; + } + } else if (limbIndex == 2) { + shakeMod = sinf(this->timer * (M_PI / 5)); + rot->x += ((0x200 * Rand_ZeroOne() + 0x400) / 0x10) * shakeAmp * shakeMod; + + shakeMod = sinf(this->timer * (M_PI / 5)); + rot->y += ((0x200 * Rand_ZeroOne() + 0x400) / 0x10) * shakeAmp * shakeMod; + + shakeMod = sinf((this->timer % 5) * (M_PI / 5)); + rot->z -= ((0x100 * Rand_ZeroOne() + 0x200) / 0x10) * shakeAmp * shakeMod + 0x200; + } + } else if (this->actionFunc == BossSst_HeadDeath) { + if (this->timer > 48) { + timer12 = this->timer - 36; + } else { + pad = ((this->timer > 6) ? 6 : this->timer); + timer12 = pad * 2; + } + + if ((limbIndex == 3) || (limbIndex == 39) || (limbIndex == 42)) { + rot->z -= 0x2000 * sinf(timer12 * (M_PI / 24)); + } else if ((limbIndex == 5) || (limbIndex == 6)) { + rot->z -= 0xA00 * sinf(timer12 * (M_PI / 24)); + } else if (limbIndex == 2) { + rot->z -= 0x400 * sinf(timer12 * (M_PI / 24)); + } + } else if ((this->actionFunc == BossSst_HeadDarken) || (this->actionFunc == BossSst_HeadFall) || + (this->actionFunc == BossSst_HeadMelt)) { + if ((limbIndex == 3) || (limbIndex == 39) || (limbIndex == 42)) { + rot->z -= 0x1000; + } else if ((limbIndex == 5) || (limbIndex == 6)) { + rot->z -= 0x500; + } else if (limbIndex == 2) { + rot->z -= 0x200; + } + } + return false; +} + +void BossSst_PostHeadDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { + static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + static Vec3f headVec = { 1000.0f, 0.0f, 0.0f }; + BossSst* this = THIS; + Vec3f headPos; + + if (limbIndex == 8) { + Matrix_MultVec3f(&zeroVec, &this->actor.focus.pos); + Matrix_MultVec3f(&headVec, &headPos); + this->colliderCyl.dim.pos.x = headPos.x; + this->colliderCyl.dim.pos.y = headPos.y; + this->colliderCyl.dim.pos.z = headPos.z; + } + + Collider_UpdateSpheres(limbIndex, &this->colliderJntSph); +} + +void BossSst_DrawHead(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BossSst* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6810); + + if ((this->actor.flags & 0x80) != 0x80) { + func_80093D18(globalCtx->state.gfxCtx); + gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0x80, sBodyColor.r, sBodyColor.g, sBodyColor.b, 255); + if (!sBodyStatic) { + gSPSegment(POLY_OPA_DISP++, 0x08, &D_80116280[2]); + } else { + gDPSetEnvColor(POLY_OPA_DISP++, sStaticColor.r, sStaticColor.g, sStaticColor.b, 0); + gSPSegment(POLY_OPA_DISP++, 0x08, sBodyStaticDList); + } + } else { + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 255, 255, 255, 255); + gSPSegment(POLY_XLU_DISP++, 0x08, &D_80116280[2]); + } + + if (this->actionFunc == BossSst_HeadThrash) { + f32 randPitch = Rand_ZeroOne() * (2 * M_PI); + f32 randYaw = Rand_ZeroOne() * (2 * M_PI); + + Matrix_RotateY(randYaw, MTXMODE_APPLY); + Matrix_RotateX(randPitch, MTXMODE_APPLY); + Matrix_Scale((this->timer * 0.000375f) + 1.0f, 1.0f - (this->timer * 0.00075f), + (this->timer * 0.000375f) + 1.0f, MTXMODE_APPLY); + Matrix_RotateX(-randPitch, MTXMODE_APPLY); + Matrix_RotateY(-randYaw, MTXMODE_APPLY); + } + + if ((this->actor.flags & 0x80) != 0x80) { + POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, BossSst_OverrideHeadDraw, BossSst_PostHeadDraw, + this, POLY_OPA_DISP); + } else { + POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, BossSst_OverrideHeadDraw, BossSst_PostHeadDraw, + this, POLY_XLU_DISP); + } + + if ((this->actionFunc == BossSst_HeadIntro) && (113 >= this->timer) && (this->timer > 20)) { + s32 yOffset; + Vec3f vanishMaskPos; + Vec3f vanishMaskOffset; + + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x00, 0, 0, 18, 255); + + yOffset = 113 * 8 - this->timer * 8; + vanishMaskPos.x = ROOM_CENTER_X + 85.0f; + vanishMaskPos.y = ROOM_CENTER_Y - 250.0f + yOffset; + vanishMaskPos.z = ROOM_CENTER_Z + 190.0f; + if (vanishMaskPos.y > 450.0f) { + vanishMaskPos.y = 450.0f; + } + + Matrix_MultVec3fExt(&vanishMaskPos, &vanishMaskOffset, &globalCtx->mf_11DA0); + Matrix_Translate(this->actor.world.pos.x + vanishMaskOffset.x, this->actor.world.pos.y + vanishMaskOffset.y, + this->actor.world.pos.z + vanishMaskOffset.z, MTXMODE_NEW); + Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6934), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDList); + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6941); + + SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->mf_11D60, &this->actor.focus.pos, &this->center); + BossSst_DrawEffect(&this->actor, globalCtx); +} + +void BossSst_SpawnHeadShadow(BossSst* this) { + static Vec3f shadowOffset[] = { + { 0.0f, 0.0f, 340.0f }, + { -160.0f, 0.0f, 250.0f }, + { 160.0f, 0.0f, 250.0f }, + }; + s32 pad; + s32 i; + f32 sn; + f32 cs; + + this->effectMode = BONGO_SHADOW; + sn = Math_SinS(this->actor.shape.rot.y); + cs = Math_CosS(this->actor.shape.rot.y); + + for (i = 0; i < 3; i++) { + BossSstEffect* shadow = &this->effects[i]; + Vec3f* offset = &shadowOffset[i]; + + shadow->pos.x = this->actor.world.pos.x + (sn * offset->z) + (cs * offset->x); + shadow->pos.y = 0.0f; + shadow->pos.z = this->actor.world.pos.z + (cs * offset->z) - (sn * offset->x); + + shadow->scale = 1450; + shadow->alpha = 254; + shadow->status = 65; + } + + this->effects[3].status = -1; +} + +void BossSst_SpawnHandShadow(BossSst* this) { + this->effectMode = BONGO_SHADOW; + this->effects[0].pos.x = this->actor.world.pos.x + (Math_CosS(this->actor.shape.rot.y) * 30.0f * this->vParity); + this->effects[0].pos.z = this->actor.world.pos.z - (Math_SinS(this->actor.shape.rot.y) * 30.0f * this->vParity); + this->effects[0].pos.y = this->actor.world.pos.y; + this->effects[0].scale = 2300; + this->effects[0].alpha = 254; + this->effects[0].status = 5; + this->effects[1].status = -1; +} + +void BossSst_SpawnShockwave(BossSst* this) { + s32 i; + s32 scale = 120; + s32 alpha = 250; + + Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_HAND_WAVE); + this->effectMode = BONGO_SHOCKWAVE; + + for (i = 0; i < 3; i++) { + BossSstEffect* shockwave = &this->effects[i]; + + Math_Vec3f_Copy(&shockwave->pos, &this->actor.world.pos); + shockwave->move = (i + 9) * 2; + shockwave->scale = scale; + shockwave->alpha = alpha / shockwave->move; + scale -= 50; + alpha -= 25; + } +} + +void BossSst_SpawnIceCrystal(BossSst* this, s32 index) { + BossSstEffect* ice = &this->effects[index]; + Sphere16* sphere; + + if (index < 11) { + sphere = &this->colliderJntSph.elements[index].dim.worldSphere; + + ice->pos.x = sphere->center.x; + ice->pos.y = sphere->center.y; + ice->pos.z = sphere->center.z; + if (index == 0) { + ice->pos.x -= 25.0f; + ice->pos.y -= 25.0f; + ice->pos.z -= 25.0f; + } + } else { + sphere = &this->colliderJntSph.elements[0].dim.worldSphere; + + ice->pos.x = ((((index - 11) & 1) ? 1 : -1) * 25.0f) + sphere->center.x; + ice->pos.y = ((((index - 11) & 2) ? 1 : -1) * 25.0f) + sphere->center.y; + ice->pos.z = ((((index - 11) & 4) ? 1 : -1) * 25.0f) + sphere->center.z; + } + + ice->pos.x -= this->actor.world.pos.x; + ice->pos.y -= this->actor.world.pos.y; + ice->pos.z -= this->actor.world.pos.z; + + ice->status = 0; + + ice->rot.x = Rand_ZeroOne() * 0x10000; + ice->rot.y = Rand_ZeroOne() * 0x10000; + ice->rot.z = Rand_ZeroOne() * 0x10000; + + ice->alpha = 120; + ice->move = true; + + ice->vel.x = (Rand_ZeroOne() * 0.06f + 0.12f) * ice->pos.x; + ice->vel.y = (Rand_ZeroOne() * 15.0f + 5.0f); + ice->vel.z = (Rand_ZeroOne() * 0.06f + 0.12f) * ice->pos.z; + ice->scale = 4000; + + if ((index % 2) == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_PL_FREEZE_S); + } +} + +void BossSst_SpawnIceShard(BossSst* this) { + s32 i; + Vec3f spawnPos; + f32 offXZ; + + this->effectMode = BONGO_ICE; + offXZ = Math_CosS(this->actor.shape.rot.x) * 50.0f; + spawnPos.x = Math_CosS(this->actor.shape.rot.y) * offXZ + this->actor.world.pos.x; + spawnPos.y = Math_SinS(this->actor.shape.rot.x) * 50.0f + this->actor.world.pos.y - 10.0f; + spawnPos.z = Math_SinS(this->actor.shape.rot.y) * offXZ + this->actor.world.pos.z; + + for (i = 0; i < 18; i++) { + BossSstEffect* ice = &this->effects[i]; + + Math_Vec3f_Copy(&ice->pos, &spawnPos); + ice->status = 1; + ice->rot.x = Rand_ZeroOne() * 0x10000; + ice->rot.y = Rand_ZeroOne() * 0x10000; + ice->rot.z = Rand_ZeroOne() * 0x10000; + + ice->alpha = 120; + ice->move = true; + + ice->vel.x = Rand_CenteredFloat(20.0f); + ice->vel.y = Rand_ZeroOne() * 10.0f + 3.0f; + ice->vel.z = Rand_CenteredFloat(20.0f); + + ice->scale = Rand_ZeroOne() * 200.0f + 400.0f; + } +} + +void BossSst_IceShatter(BossSst* this) { + s32 i; + + this->effects[0].status = 1; + Audio_PlayActorSound2(&this->actor, NA_SE_PL_ICE_BROKEN); + + for (i = 0; i < 18; i++) { + BossSstEffect* ice = &this->effects[i]; + + if (ice->move) { + ice->pos.x += this->actor.world.pos.x; + ice->pos.y += this->actor.world.pos.y; + ice->pos.z += this->actor.world.pos.z; + } + } +} + +void BossSst_UpdateEffect(Actor* thisx, GlobalContext* globalCtx) { + BossSst* this = THIS; + BossSstEffect* effect; + s32 i; + + if (this->effectMode != BONGO_NULL) { + if (this->effectMode == BONGO_ICE) { + if (this->effects[0].status) { + for (i = 0; i < 18; i++) { + effect = &this->effects[i]; + + if (effect->move) { + effect->pos.x += effect->vel.x; + effect->pos.y += effect->vel.y; + effect->pos.z += effect->vel.z; + effect->alpha -= 3; + effect->vel.y -= 1.0f; + effect->rot.x += 0xD00; + effect->rot.y += 0x1100; + effect->rot.z += 0x1500; + } + } + } + if (this->effects[0].alpha == 0) { + this->effectMode = BONGO_NULL; + } + } else if (this->effectMode == BONGO_SHOCKWAVE) { + for (i = 0; i < 3; i++) { + BossSstEffect* effect2 = &this->effects[i]; + s32 scale = effect2->move * 2; + + effect2->scale += CLAMP_MAX(scale, 20) + i; + if (effect2->move != 0) { + effect2->move--; + } + } + + if (this->effects[0].move == 0) { + this->effectMode = BONGO_NULL; + } + } else if (this->effectMode == BONGO_SHADOW) { + effect = &this->effects[0]; + + if (this->actor.params == BONGO_HEAD) { + SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->mf_11D60, &this->actor.focus.pos, &this->center); + BossSst_HeadSfx(this, NA_SE_EN_SHADEST_LAST - SFX_FLAG); + } + while (effect->status != -1) { + if (effect->status == 0) { + effect->alpha -= 2; + } else { + effect->scale += effect->status; + } + + effect->scale = CLAMP_MAX(effect->scale, 10000); + effect++; + } + } + } +} + +void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + BossSst* this = THIS; + s32 i; + BossSstEffect* effect; + + if (this->effectMode != BONGO_NULL) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7302); + + func_80093D84(globalCtx->state.gfxCtx); + if (this->effectMode == BONGO_ICE) { + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, globalCtx->gameplayFrames % 256, 0x20, 0x10, 1, + 0, (globalCtx->gameplayFrames * 2) % 256, 0x40, 0x20)); + gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, this->effects[0].alpha); + gSPDisplayList(POLY_XLU_DISP++, gBongoIceCrystalDL); + + for (i = 0; i < 18; i++) { + effect = &this->effects[i]; + if (effect->move) { + func_8003435C(&effect->pos, globalCtx); + if (this->effects[0].status != 0) { + Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); + } else { + Matrix_Translate(effect->pos.x + this->actor.world.pos.x, + effect->pos.y + this->actor.world.pos.y, + effect->pos.z + this->actor.world.pos.z, MTXMODE_NEW); + } + + Matrix_RotateRPY(effect->rot.x, effect->rot.y, effect->rot.z, MTXMODE_APPLY); + Matrix_Scale(effect->scale * 0.001f, effect->scale * 0.001f, effect->scale * 0.001f, MTXMODE_APPLY); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7350), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gBongoIceShardDL); + } + } + } else if (this->effectMode == BONGO_SHOCKWAVE) { + f32 scaleY = 0.005f; + + gDPPipeSync(POLY_XLU_DISP++); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 0, 0x20, 0x40, 1, + 0, (globalCtx->gameplayFrames * -15) % 256, 0x20, 0x40)); + + for (i = 0; i < 3; i++, scaleY -= 0.001f) { + effect = &this->effects[i]; + + if (effect->move != 0) { + Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); + Matrix_Scale(effect->scale * 0.001f, scaleY, effect->scale * 0.001f, MTXMODE_APPLY); + + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 30, 0, 30, effect->alpha * effect->move); + gDPSetEnvColor(POLY_XLU_DISP++, 30, 0, 30, 0); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7396), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL); + } + } + } else if (this->effectMode == BONGO_SHADOW) { + gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 10, 10, 80, 0); + gDPSetEnvColor(POLY_XLU_DISP++, 10, 10, 10, this->effects[0].alpha); + + effect = &this->effects[0]; + while (effect->status != -1) { + Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); + Matrix_Scale(effect->scale * 0.001f, 1.0f, effect->scale * 0.001f, MTXMODE_APPLY); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7423), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, sShadowDList); + effect++; + } + } + + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7433); + } +} diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h index 7bd0085641..f19caa3e3a 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h @@ -6,11 +6,59 @@ struct BossSst; +typedef void (*BossSstActionFunc)(struct BossSst*, GlobalContext*); + + +typedef struct { + /* 0x0000 */ Vec3f pos; + /* 0x0010 */ Vec3f vel; + /* 0x0018 */ Vec3s rot; + /* 0x001E */ u16 scale; + /* 0x0020 */ s16 move; + /* 0x0022 */ s16 status; + /* 0x0024 */ u8 alpha; +} BossSstEffect; // size = 0x28 + +typedef struct { + /* 0x0000 */ PosRot world; + /* 0x0014 */ f32 zPosMod; + /* 0x0018 */ s16 yRotMod; +} BossSstHandTrail; // size = 0x1C + typedef struct BossSst { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x94C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ BossSstActionFunc actionFunc; + /* 0x0194 */ s8 actionVar; // head: flag for visible without lens; hand: 1 for right, -1 for left + /* 0x0195 */ s8 ready; + /* 0x0196 */ u8 effectMode; + /* 0x0198 */ s16 timer; + /* 0x019A */ s16 handAngSpeed; + /* 0x019C */ s16 handMaxSpeed; + /* 0x019E */ s16 handZPosMod; + /* 0x01A0 */ s16 handYRotMod; + /* 0x01A2 */ s16 amplitude; + /* 0x01A4 */ s16 targetYaw; + /* 0x01A6 */ s16 targetRoll; + /* 0x01A8 */ Vec3s jointTable[45]; + /* 0x02B6 */ Vec3s morphTable[45]; + /* 0x03C4 */ f32 radius; + /* 0x03C8 */ Vec3f center; + /* 0x03D4 */ ColliderJntSph colliderJntSph; + /* 0x03F4 */ ColliderJntSphElement colliderItems[11]; + /* 0x06B4 */ ColliderCylinder colliderCyl; + /* 0x0700 */ BossSstEffect effects[18]; + /* 0x09D0 */ s16 trailIndex; + /* 0x09D2 */ s16 trailCount; + /* 0x09D4 */ BossSstHandTrail handTrails[7]; } BossSst; // size = 0x0A98 +typedef enum { + /* -1 */ BONGO_HEAD = -1, + /* 0 */ BONGO_LEFT_HAND, + /* 1 */ BONGO_RIGHT_HAND +} BossSstType; + extern const ActorInit Boss_Sst_InitVars; #endif diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.c new file mode 100644 index 0000000000..821d5f36a6 --- /dev/null +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.c @@ -0,0 +1,352 @@ +#include "z_boss_sst.h" + +static ColliderJntSphElementInit sJntSphItemsInitHand[11] = { + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 2, { { 2000, -1500, 250 }, 65 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 10, { { 0, 0, 0 }, 22 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 11, { { 500, 0, 0 }, 22 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 15, { { -250, -250, 0 }, 25 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 16, { { 500, -250, 0 }, 25 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 20, { { 250, -250, 0 }, 25 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 21, { { 500, -250, 0 }, 25 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 25, { { 0, 0, 0 }, 27 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 26, { { 750, 0, 0 }, 26 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 5, { { 750, -150, 0 }, 21 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 6, { { 750, 0, 0 }, 20 }, 100 }, + }, +}; + +static ColliderJntSphInit sJntSphInitHand = { + { + COLTYPE_HIT0, + AT_TYPE_ENEMY, + AC_ON | AC_TYPE_PLAYER, + OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + 11, + sJntSphItemsInitHand, +}; + +static ColliderJntSphElementInit sJntSphItemsInitHead[11] = { + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 7, { { 1500, 0, 0 }, 70 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 6, { { 0, 0, 0 }, 75 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 4, { { 5000, 0, 0 }, 120 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 3, { { -2500, 0, 0 }, 150 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 43, { { 1500, 0, 0 }, 80 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 43, { { 7500, 0, 0 }, 70 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 44, { { 3000, 0, 0 }, 60 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 40, { { 1500, 0, 0 }, 80 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 40, { { 7500, 0, 0 }, 70 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_ON, + OCELEM_ON, + }, + { 41, { { 3000, 0, 0 }, 60 }, 100 }, + }, + { + { + ELEMTYPE_UNK1, + { 0x20000000, 0x00, 0x30 }, + { 0x00000080, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NORMAL, + BUMP_NONE, + OCELEM_ON, + }, + { 8, { { 1500, 0, 0 }, 70 }, 100 }, + }, +}; + +static ColliderJntSphInit sJntSphInitHead = { + { + COLTYPE_HARD, + AT_TYPE_ENEMY, + AC_ON | AC_HARD | AC_TYPE_PLAYER, + OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_JNTSPH, + }, + 11, + sJntSphItemsInitHead, +}; + +static ColliderCylinderInit sCylinderInitHead = { + { + COLTYPE_HIT0, + AT_NONE, + AC_NONE | AC_TYPE_PLAYER, + OC1_NONE, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x00000000, 0x00, 0x00 }, + { 0xFFCFFFFF, 0x00, 0x00 }, + TOUCH_NONE, + BUMP_ON, + OCELEM_NONE, + }, + { 85, 100, -50, { 0, 0, 0 } }, +}; + +static ColliderCylinderInit sCylinderInitHand = { + { + COLTYPE_NONE, + AT_TYPE_ENEMY, + AC_NONE, + OC1_NONE, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK0, + { 0x20000000, 0x04, 0x10 }, + { 0x00000000, 0x00, 0x00 }, + TOUCH_ON | TOUCH_SFX_NONE, + BUMP_NONE, + OCELEM_NONE, + }, + { 85, 1, 0, { 0, 0, 0 } }, +}; + +static CollisionCheckInfoInit sColChkInfoInit = { 36, 100, 100, 200 }; + +static DamageTable sDamageTable = { + /* Deku nut */ DMG_ENTRY(0 , 0x0), + /* Deku stick */ DMG_ENTRY(2 , 0x0), + /* Slingshot */ DMG_ENTRY(1 , 0x0), + /* Explosive */ DMG_ENTRY(2 , 0x0), + /* Boomerang */ DMG_ENTRY(0 , 0x0), + /* Normal arrow */ DMG_ENTRY(2 , 0x0), + /* Hammer swing */ DMG_ENTRY(2 , 0x0), + /* Hookshot */ DMG_ENTRY(2 , 0x0), + /* Kokiri sword */ DMG_ENTRY(1 , 0x0), + /* Master sword */ DMG_ENTRY(2 , 0x0), + /* Giant's Knife */ DMG_ENTRY(4 , 0x0), + /* Fire arrow */ DMG_ENTRY(2 , 0x0), + /* Ice arrow */ DMG_ENTRY(4 , 0x3), + /* Light arrow */ DMG_ENTRY(2 , 0x0), + /* Unk arrow 1 */ DMG_ENTRY(4 , 0x0), + /* Unk arrow 2 */ DMG_ENTRY(2 , 0x0), + /* Unk arrow 3 */ DMG_ENTRY(2 , 0x0), + /* Fire magic */ DMG_ENTRY(0 , 0x0), + /* Ice magic */ DMG_ENTRY(4 , 0x3), + /* Light magic */ DMG_ENTRY(4 , 0x4), + /* Shield */ DMG_ENTRY(0 , 0x0), + /* Mirror Ray */ DMG_ENTRY(0 , 0x0), + /* Kokiri spin */ DMG_ENTRY(1 , 0x0), + /* Giant spin */ DMG_ENTRY(4 , 0x0), + /* Master spin */ DMG_ENTRY(2 , 0x0), + /* Kokiri jump */ DMG_ENTRY(2 , 0x0), + /* Giant jump */ DMG_ENTRY(8 , 0x0), + /* Master jump */ DMG_ENTRY(4 , 0x0), + /* Unknown 1 */ DMG_ENTRY(0 , 0x0), + /* Unblockable */ DMG_ENTRY(0 , 0x0), + /* Hammer jump */ DMG_ENTRY(4 , 0x0), + /* Unknown 2 */ DMG_ENTRY(0 , 0x0), +};