From f85a2d10ee92861c91243dab8366ad4e81fa5979 Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Sat, 5 Dec 2020 00:34:27 +0000 Subject: [PATCH] Poe Actor Decomps (#463) * Poe actors progress * Some more progress, En_Poh almost matching * Further progress * Fix merge * Decompile data * Actor struct cleanups * More functions OK * Progress * Last function decompiled, some nonmatchings left * Few more OK, skelanime_init definition changes * Progress * Style improvements, OPEN/CLOSE_DISPS, few more OK * Few more style improvements, function prototype additions/changes, another function OK * Remove unused asm, begin documentation * Use generated reloc * Cleanup, format * Remove a few no longer needed comments * PR suggestions * DISP macros * Missed some FrameUpdateMatrix != 0 replacements * EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx * Fix merge, reformat * Review Suggestions Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Further review suggestions * Ran formatter * Less DECR usage Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> --- .../ovl_En_Po_Desert/EnPoDesert_Destroy.s | 21 - .../actors/ovl_En_Po_Desert/EnPoDesert_Draw.s | 112 -- .../actors/ovl_En_Po_Desert/EnPoDesert_Init.s | 99 -- .../ovl_En_Po_Desert/EnPoDesert_Update.s | 69 - .../actors/ovl_En_Po_Desert/func_80AD2E64.s | 90 -- .../actors/ovl_En_Po_Desert/func_80AD2FBC.s | 17 - .../actors/ovl_En_Po_Desert/func_80AD2FFC.s | 26 - .../actors/ovl_En_Po_Desert/func_80AD305C.s | 33 - .../actors/ovl_En_Po_Desert/func_80AD30D0.s | 56 - .../actors/ovl_En_Po_Desert/func_80AD3194.s | 119 -- .../actors/ovl_En_Po_Desert/func_80AD3328.s | 65 - .../actors/ovl_En_Po_Desert/func_80AD3504.s | 40 - .../actors/ovl_En_Po_Desert/func_80AD3594.s | 163 -- .../ovl_En_Po_Field/EnPoField_Destroy.s | 29 - .../actors/ovl_En_Po_Field/EnPoField_Draw.s | 215 --- .../actors/ovl_En_Po_Field/EnPoField_Init.s | 143 -- .../actors/ovl_En_Po_Field/EnPoField_Update.s | 83 - .../actors/ovl_En_Po_Field/func_80AD3D68.s | 53 - .../actors/ovl_En_Po_Field/func_80AD3E2C.s | 83 - .../actors/ovl_En_Po_Field/func_80AD3F4C.s | 44 - .../actors/ovl_En_Po_Field/func_80AD3FF0.s | 39 - .../actors/ovl_En_Po_Field/func_80AD4084.s | 50 - .../actors/ovl_En_Po_Field/func_80AD4140.s | 22 - .../actors/ovl_En_Po_Field/func_80AD4190.s | 33 - .../actors/ovl_En_Po_Field/func_80AD4208.s | 50 - .../actors/ovl_En_Po_Field/func_80AD42B0.s | 57 - .../actors/ovl_En_Po_Field/func_80AD4384.s | 48 - .../actors/ovl_En_Po_Field/func_80AD443C.s | 5 - .../actors/ovl_En_Po_Field/func_80AD444C.s | 10 - .../actors/ovl_En_Po_Field/func_80AD4470.s | 65 - .../actors/ovl_En_Po_Field/func_80AD4554.s | 76 - .../actors/ovl_En_Po_Field/func_80AD4664.s | 173 --- .../actors/ovl_En_Po_Field/func_80AD48CC.s | 123 -- .../actors/ovl_En_Po_Field/func_80AD4A68.s | 162 -- .../actors/ovl_En_Po_Field/func_80AD4CA4.s | 127 -- .../actors/ovl_En_Po_Field/func_80AD4E48.s | 43 - .../actors/ovl_En_Po_Field/func_80AD4ED8.s | 283 ---- .../actors/ovl_En_Po_Field/func_80AD52F0.s | 71 - .../actors/ovl_En_Po_Field/func_80AD53F0.s | 62 - .../actors/ovl_En_Po_Field/func_80AD54D4.s | 272 ---- .../actors/ovl_En_Po_Field/func_80AD587C.s | 24 - .../actors/ovl_En_Po_Field/func_80AD58D4.s | 149 -- .../actors/ovl_En_Po_Field/func_80AD5AD8.s | 18 - .../actors/ovl_En_Po_Field/func_80AD5B18.s | 102 -- .../actors/ovl_En_Po_Field/func_80AD5C74.s | 46 - .../actors/ovl_En_Po_Field/func_80AD5D0C.s | 23 - .../actors/ovl_En_Po_Field/func_80AD5D60.s | 86 -- .../actors/ovl_En_Po_Field/func_80AD5E8C.s | 231 --- .../actors/ovl_En_Po_Field/func_80AD619C.s | 115 -- .../actors/ovl_En_Po_Field/func_80AD6330.s | 107 -- .../actors/ovl_En_Po_Field/func_80AD65C8.s | 75 - .../actors/ovl_En_Po_Field/func_80AD66D0.s | 154 -- .../actors/ovl_En_Po_Field/func_80AD6BF4.s | 24 - .../actors/ovl_En_Po_Field/func_80AD6C4C.s | 287 ---- .../ovl_En_Po_Relay/EnPoRelay_Destroy.s | 21 - .../actors/ovl_En_Po_Relay/EnPoRelay_Draw.s | 73 - .../actors/ovl_En_Po_Relay/EnPoRelay_Init.s | 108 -- .../{func_80AD7C64.s => EnPoRelay_Race.s} | 17 +- .../actors/ovl_En_Po_Relay/EnPoRelay_Update.s | 70 - .../actors/ovl_En_Po_Relay/func_80AD790C.s | 15 - .../actors/ovl_En_Po_Relay/func_80AD7944.s | 17 - .../actors/ovl_En_Po_Relay/func_80AD7984.s | 52 - .../actors/ovl_En_Po_Relay/func_80AD7A4C.s | 16 - .../actors/ovl_En_Po_Relay/func_80AD7A88.s | 47 - .../actors/ovl_En_Po_Relay/func_80AD7B34.s | 52 - .../actors/ovl_En_Po_Relay/func_80AD7BF0.s | 33 - .../actors/ovl_En_Po_Relay/func_80AD8174.s | 55 - .../actors/ovl_En_Po_Relay/func_80AD8234.s | 63 - .../actors/ovl_En_Po_Relay/func_80AD830C.s | 332 ---- .../actors/ovl_En_Po_Relay/func_80AD88D0.s | 182 --- .../ovl_En_Po_Sisters/EnPoSisters_Destroy.s | 30 - .../ovl_En_Po_Sisters/EnPoSisters_Draw.s | 492 ------ .../ovl_En_Po_Sisters/EnPoSisters_Init.s | 158 -- .../actors/ovl_En_Po_Sisters/func_80AD9240.s | 84 - .../actors/ovl_En_Po_Sisters/func_80AD9368.s | 25 - .../actors/ovl_En_Po_Sisters/func_80AD93C4.s | 33 - .../actors/ovl_En_Po_Sisters/func_80AD943C.s | 5 - .../actors/ovl_En_Po_Sisters/func_80AD944C.s | 40 - .../actors/ovl_En_Po_Sisters/func_80AD94E0.s | 36 - .../actors/ovl_En_Po_Sisters/func_80AD9568.s | 30 - .../actors/ovl_En_Po_Sisters/func_80AD95D8.s | 56 - .../actors/ovl_En_Po_Sisters/func_80AD96A4.s | 30 - .../actors/ovl_En_Po_Sisters/func_80AD9718.s | 49 - .../actors/ovl_En_Po_Sisters/func_80AD97C8.s | 87 -- .../actors/ovl_En_Po_Sisters/func_80AD98F4.s | 62 - .../actors/ovl_En_Po_Sisters/func_80AD99D4.s | 38 - .../actors/ovl_En_Po_Sisters/func_80AD9A54.s | 23 - .../actors/ovl_En_Po_Sisters/func_80AD9AA8.s | 109 -- .../actors/ovl_En_Po_Sisters/func_80AD9C24.s | 75 - .../actors/ovl_En_Po_Sisters/func_80AD9D44.s | 49 - .../actors/ovl_En_Po_Sisters/func_80AD9DF0.s | 29 - .../actors/ovl_En_Po_Sisters/func_80AD9E60.s | 53 - .../actors/ovl_En_Po_Sisters/func_80AD9F1C.s | 30 - .../actors/ovl_En_Po_Sisters/func_80AD9F90.s | 41 - .../actors/ovl_En_Po_Sisters/func_80ADA028.s | 28 - .../actors/ovl_En_Po_Sisters/func_80ADA094.s | 32 - .../actors/ovl_En_Po_Sisters/func_80ADA10C.s | 45 - .../actors/ovl_En_Po_Sisters/func_80ADA1B8.s | 47 - .../actors/ovl_En_Po_Sisters/func_80ADA25C.s | 25 - .../actors/ovl_En_Po_Sisters/func_80ADA2BC.s | 44 - .../actors/ovl_En_Po_Sisters/func_80ADA4A8.s | 39 - .../actors/ovl_En_Po_Sisters/func_80ADA530.s | 104 -- .../actors/ovl_En_Po_Sisters/func_80ADA6A0.s | 95 -- .../actors/ovl_En_Po_Sisters/func_80ADA7F0.s | 59 - .../actors/ovl_En_Po_Sisters/func_80ADA8C0.s | 84 - .../actors/ovl_En_Po_Sisters/func_80ADA9E8.s | 53 - .../actors/ovl_En_Po_Sisters/func_80ADAAA4.s | 129 -- .../actors/ovl_En_Po_Sisters/func_80ADAC70.s | 64 - .../actors/ovl_En_Po_Sisters/func_80ADAD54.s | 77 - .../actors/ovl_En_Po_Sisters/func_80ADAE6C.s | 95 -- .../actors/ovl_En_Po_Sisters/func_80ADAFC0.s | 132 -- .../actors/ovl_En_Po_Sisters/func_80ADB17C.s | 89 -- .../actors/ovl_En_Po_Sisters/func_80ADB2B8.s | 37 - .../actors/ovl_En_Po_Sisters/func_80ADB338.s | 103 -- .../actors/ovl_En_Po_Sisters/func_80ADB4B0.s | 31 - .../actors/ovl_En_Po_Sisters/func_80ADB51C.s | 175 --- .../actors/ovl_En_Po_Sisters/func_80ADB770.s | 183 --- .../actors/ovl_En_Po_Sisters/func_80ADB9F0.s | 107 -- .../actors/ovl_En_Po_Sisters/func_80ADBB6C.s | 39 - .../actors/ovl_En_Po_Sisters/func_80ADBBF4.s | 41 - .../actors/ovl_En_Po_Sisters/func_80ADBC88.s | 50 - .../actors/ovl_En_Po_Sisters/func_80ADBD38.s | 23 - .../actors/ovl_En_Po_Sisters/func_80ADBD8C.s | 97 -- .../actors/ovl_En_Po_Sisters/func_80ADBEE8.s | 32 - .../actors/ovl_En_Po_Sisters/func_80ADBF58.s | 66 - .../actors/ovl_En_Po_Sisters/func_80ADC034.s | 63 - .../actors/ovl_En_Po_Sisters/func_80ADC10C.s | 133 -- .../actors/ovl_En_Po_Sisters/func_80ADC55C.s | 154 -- .../actors/ovl_En_Po_Sisters/func_80ADC77C.s | 137 -- .../actors/ovl_En_Po_Sisters/func_80ADC970.s | 491 ------ .../actors/ovl_En_Poh/EnPoh_Destroy.s | 36 - .../overlays/actors/ovl_En_Poh/EnPoh_Init.s | 244 --- .../overlays/actors/ovl_En_Poh/EnPoh_Update.s | 89 -- .../actors/ovl_En_Poh/func_80ADE114.s | 24 - .../actors/ovl_En_Poh/func_80ADE16C.s | 22 - .../actors/ovl_En_Poh/func_80ADE1BC.s | 21 - .../actors/ovl_En_Poh/func_80ADE20C.s | 36 - .../actors/ovl_En_Poh/func_80ADE28C.s | 60 - .../actors/ovl_En_Poh/func_80ADE368.s | 30 - .../actors/ovl_En_Poh/func_80ADE3DC.s | 49 - .../actors/ovl_En_Poh/func_80ADE48C.s | 16 - .../actors/ovl_En_Poh/func_80ADE4C8.s | 20 - .../actors/ovl_En_Poh/func_80ADE514.s | 23 - .../actors/ovl_En_Poh/func_80ADE56C.s | 25 - .../actors/ovl_En_Poh/func_80ADE5C4.s | 22 - .../actors/ovl_En_Poh/func_80ADE610.s | 58 - .../actors/ovl_En_Poh/func_80ADE6D4.s | 64 - .../actors/ovl_En_Poh/func_80ADE7C0.s | 114 -- .../actors/ovl_En_Poh/func_80ADE950.s | 21 - .../actors/ovl_En_Poh/func_80ADE998.s | 10 - .../actors/ovl_En_Poh/func_80ADE9BC.s | 5 - .../actors/ovl_En_Poh/func_80ADE9CC.s | 41 - .../actors/ovl_En_Poh/func_80ADEA5C.s | 29 - .../actors/ovl_En_Poh/func_80ADEAC4.s | 53 - .../actors/ovl_En_Poh/func_80ADEB80.s | 85 -- .../actors/ovl_En_Poh/func_80ADEC9C.s | 100 -- .../actors/ovl_En_Poh/func_80ADEDFC.s | 61 - .../actors/ovl_En_Poh/func_80ADEECC.s | 33 - .../actors/ovl_En_Poh/func_80ADEF38.s | 111 -- .../actors/ovl_En_Poh/func_80ADF0B8.s | 47 - .../actors/ovl_En_Poh/func_80ADF15C.s | 283 ---- .../actors/ovl_En_Poh/func_80ADF574.s | 32 - .../actors/ovl_En_Poh/func_80ADF5E0.s | 37 - .../actors/ovl_En_Poh/func_80ADF660.s | 79 - .../actors/ovl_En_Poh/func_80ADF77C.s | 77 - .../actors/ovl_En_Poh/func_80ADF894.s | 72 - .../actors/ovl_En_Poh/func_80ADF994.s | 71 - .../actors/ovl_En_Poh/func_80ADFA90.s | 268 ---- .../actors/ovl_En_Poh/func_80ADFE28.s | 24 - .../actors/ovl_En_Poh/func_80ADFE80.s | 156 -- .../actors/ovl_En_Poh/func_80AE009C.s | 19 - .../actors/ovl_En_Poh/func_80AE00DC.s | 86 -- .../actors/ovl_En_Poh/func_80AE0204.s | 89 -- .../actors/ovl_En_Poh/func_80AE032C.s | 46 - .../actors/ovl_En_Poh/func_80AE03C4.s | 102 -- .../actors/ovl_En_Poh/func_80AE067C.s | 154 -- .../actors/ovl_En_Poh/func_80AE089C.s | 111 -- .../actors/ovl_En_Poh/func_80AE0A1C.s | 133 -- .../actors/ovl_En_Poh/func_80AE0BF8.s | 65 - .../actors/ovl_En_Poh/func_80AE0CE8.s | 147 -- .../actors/ovl_En_Poh/func_80AE0EE4.s | 171 --- .../actors/ovl_En_Poh/func_80AE1148.s | 322 ---- .../actors/ovl_En_Poh/func_80AE1600.s | 23 - .../actors/ovl_En_Poh/func_80AE1654.s | 283 ---- data/overlays/actors/z_en_po_desert.data.s | 24 - data/overlays/actors/z_en_po_desert.reloc.s | 13 - data/overlays/actors/z_en_po_field.bss.s | 18 - data/overlays/actors/z_en_po_field.data.s | 40 - data/overlays/actors/z_en_po_field.reloc.s | 13 - data/overlays/actors/z_en_po_relay.data.s | 36 - data/overlays/actors/z_en_po_sisters.data.s | 48 - data/overlays/actors/z_en_poh.data.s | 47 - data/overlays/actors/z_en_poh.reloc.s | 13 - include/functions.h | 5 +- include/z64save.h | 3 +- spec | 20 +- src/code/z_skelanime.c | 4 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 4 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 239 ++- .../actors/ovl_En_Po_Desert/z_en_po_desert.h | 17 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 945 +++++++++++- .../actors/ovl_En_Po_Field/z_en_po_field.h | 34 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 388 ++++- .../actors/ovl_En_Po_Relay/z_en_po_relay.h | 18 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 1358 ++++++++++++++++- .../ovl_En_Po_Sisters/z_en_po_sisters.h | 22 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 1133 +++++++++++++- src/overlays/actors/ovl_En_Poh/z_en_poh.h | 50 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 8 +- src/overlays/actors/ovl_En_Tk/z_en_tk.h | 2 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 4 +- undefined_syms.txt | 60 + 212 files changed, 4102 insertions(+), 15655 deletions(-) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s rename asm/non_matchings/overlays/actors/ovl_En_Po_Relay/{func_80AD7C64.s => EnPoRelay_Race.s} (98%) delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s delete mode 100644 asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s delete mode 100644 data/overlays/actors/z_en_po_desert.data.s delete mode 100644 data/overlays/actors/z_en_po_desert.reloc.s delete mode 100644 data/overlays/actors/z_en_po_field.bss.s delete mode 100644 data/overlays/actors/z_en_po_field.data.s delete mode 100644 data/overlays/actors/z_en_po_field.reloc.s delete mode 100644 data/overlays/actors/z_en_po_relay.data.s delete mode 100644 data/overlays/actors/z_en_po_sisters.data.s delete mode 100644 data/overlays/actors/z_en_poh.data.s delete mode 100644 data/overlays/actors/z_en_poh.reloc.s diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s deleted file mode 100644 index 2653870c37..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel EnPoDesert_Destroy -/* 0016C 80AD2E1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00170 80AD2E20 AFA40018 */ sw $a0, 0x0018($sp) -/* 00174 80AD2E24 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00178 80AD2E28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0017C 80AD2E2C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00180 80AD2E30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00184 80AD2E34 8DC60224 */ lw $a2, 0x0224($t6) ## 00000224 -/* 00188 80AD2E38 AFA7001C */ sw $a3, 0x001C($sp) -/* 0018C 80AD2E3C 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00190 80AD2E40 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 00194 80AD2E44 8FA50018 */ lw $a1, 0x0018($sp) -/* 00198 80AD2E48 8FA4001C */ lw $a0, 0x001C($sp) -/* 0019C 80AD2E4C 0C0170EB */ jal Collider_DestroyCylinder - -/* 001A0 80AD2E50 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 00000238 -/* 001A4 80AD2E54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A8 80AD2E58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001AC 80AD2E5C 03E00008 */ jr $ra -/* 001B0 80AD2E60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s deleted file mode 100644 index a07e2f17e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s +++ /dev/null @@ -1,112 +0,0 @@ -.rdata -glabel D_80AD3A04 - .asciz "../z_en_po_desert.c" - .balign 4 - -glabel D_80AD3A18 - .asciz "../z_en_po_desert.c" - .balign 4 - -.text -glabel EnPoDesert_Draw -/* 00B44 80AD37F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00B48 80AD37F8 AFB20030 */ sw $s2, 0x0030($sp) -/* 00B4C 80AD37FC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00B50 80AD3800 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00B54 80AD3804 AFB1002C */ sw $s1, 0x002C($sp) -/* 00B58 80AD3808 AFB00028 */ sw $s0, 0x0028($sp) -/* 00B5C 80AD380C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00B60 80AD3810 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00B64 80AD3814 3C0680AD */ lui $a2, %hi(D_80AD3A04) ## $a2 = 80AD0000 -/* 00B68 80AD3818 24C63A04 */ addiu $a2, $a2, %lo(D_80AD3A04) ## $a2 = 80AD3A04 -/* 00B6C 80AD381C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 00B70 80AD3820 2407022F */ addiu $a3, $zero, 0x022F ## $a3 = 0000022F -/* 00B74 80AD3824 0C031AB1 */ jal Graph_OpenDisps -/* 00B78 80AD3828 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B7C 80AD382C 0C024F61 */ jal func_80093D84 -/* 00B80 80AD3830 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 00B84 80AD3834 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00B88 80AD3838 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00B8C 80AD383C 35EF0028 */ ori $t7, $t7, 0x0028 ## $t7 = DB060028 -/* 00B90 80AD3840 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00B94 80AD3844 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 00B98 80AD3848 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00B9C 80AD384C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 00BA0 80AD3850 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00BA4 80AD3854 AFB80010 */ sw $t8, 0x0010($sp) -/* 00BA8 80AD3858 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00BAC 80AD385C 24060055 */ addiu $a2, $zero, 0x0055 ## $a2 = 00000055 -/* 00BB0 80AD3860 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00BB4 80AD3864 0C025474 */ jal Gfx_EnvColor -/* 00BB8 80AD3868 AFA2004C */ sw $v0, 0x004C($sp) -/* 00BBC 80AD386C 8FA3004C */ lw $v1, 0x004C($sp) -/* 00BC0 80AD3870 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 00BC4 80AD3874 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 -/* 00BC8 80AD3878 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00BCC 80AD387C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BD0 80AD3880 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00BD4 80AD3884 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00BD8 80AD3888 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 00BDC 80AD388C 92290223 */ lbu $t1, 0x0223($s1) ## 00000223 -/* 00BE0 80AD3890 92270222 */ lbu $a3, 0x0222($s1) ## 00000222 -/* 00BE4 80AD3894 92260221 */ lbu $a2, 0x0221($s1) ## 00000221 -/* 00BE8 80AD3898 92250220 */ lbu $a1, 0x0220($s1) ## 00000220 -/* 00BEC 80AD389C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 00BF0 80AD38A0 AFA20048 */ sw $v0, 0x0048($sp) -/* 00BF4 80AD38A4 0C025474 */ jal Gfx_EnvColor -/* 00BF8 80AD38A8 AFA90010 */ sw $t1, 0x0010($sp) -/* 00BFC 80AD38AC 8FA30048 */ lw $v1, 0x0048($sp) -/* 00C00 80AD38B0 3C0A80AD */ lui $t2, %hi(func_80AD3328) ## $t2 = 80AD0000 -/* 00C04 80AD38B4 254A3328 */ addiu $t2, $t2, %lo(func_80AD3328) ## $t2 = 80AD3328 -/* 00C08 80AD38B8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00C0C 80AD38BC 8E2B0190 */ lw $t3, 0x0190($s1) ## 00000190 -/* 00C10 80AD38C0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00C14 80AD38C4 3C0780AD */ lui $a3, %hi(func_80AD3504) ## $a3 = 80AD0000 -/* 00C18 80AD38C8 154B000B */ bne $t2, $t3, .L80AD38F8 -/* 00C1C 80AD38CC 3C0880AD */ lui $t0, %hi(func_80AD3594) ## $t0 = 80AD0000 -/* 00C20 80AD38D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00C24 80AD38D4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 00C28 80AD38D8 3C0E8011 */ lui $t6, %hi(D_80116280) -/* 00C2C 80AD38DC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00C30 80AD38E0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 00C34 80AD38E4 25CE6280 */ addiu $t6, %lo(D_80116280) -/* 00C38 80AD38E8 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 -/* 00C3C 80AD38EC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00C40 80AD38F0 1000000A */ beq $zero, $zero, .L80AD391C -/* 00C44 80AD38F4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -.L80AD38F8: -/* 00C48 80AD38F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00C4C 80AD38FC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 00C50 80AD3900 3C198011 */ lui $t9, %hi(D_80116280+0x10) -/* 00C54 80AD3904 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00C58 80AD3908 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00C5C 80AD390C 27396290 */ addiu $t9, %lo(D_80116280+0x10) -/* 00C60 80AD3910 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 -/* 00C64 80AD3914 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00C68 80AD3918 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -.L80AD391C: -/* 00C6C 80AD391C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 00C70 80AD3920 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 00C74 80AD3924 25083594 */ addiu $t0, $t0, %lo(func_80AD3594) ## $t0 = 80AD3594 -/* 00C78 80AD3928 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C7C 80AD392C AFB10014 */ sw $s1, 0x0014($sp) -/* 00C80 80AD3930 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 -/* 00C84 80AD3934 24E73504 */ addiu $a3, $a3, %lo(func_80AD3504) ## $a3 = 80AD3504 -/* 00C88 80AD3938 0C0288A2 */ jal SkelAnime_Draw -/* 00C8C 80AD393C AFA90018 */ sw $t1, 0x0018($sp) -/* 00C90 80AD3940 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00C94 80AD3944 3C0680AD */ lui $a2, %hi(D_80AD3A18) ## $a2 = 80AD0000 -/* 00C98 80AD3948 24C63A18 */ addiu $a2, $a2, %lo(D_80AD3A18) ## $a2 = 80AD3A18 -/* 00C9C 80AD394C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00CA0 80AD3950 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 00CA4 80AD3954 0C031AD5 */ jal Graph_CloseDisps -/* 00CA8 80AD3958 24070255 */ addiu $a3, $zero, 0x0255 ## $a3 = 00000255 -/* 00CAC 80AD395C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00CB0 80AD3960 8FB00028 */ lw $s0, 0x0028($sp) -/* 00CB4 80AD3964 8FB1002C */ lw $s1, 0x002C($sp) -/* 00CB8 80AD3968 8FB20030 */ lw $s2, 0x0030($sp) -/* 00CBC 80AD396C 03E00008 */ jr $ra -/* 00CC0 80AD3970 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00CC4 80AD3974 00000000 */ nop -/* 00CC8 80AD3978 00000000 */ nop -/* 00CCC 80AD397C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s deleted file mode 100644 index de5741e8fc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel EnPoDesert_Init -/* 00000 80AD2CB0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80AD2CB4 AFB10028 */ sw $s1, 0x0028($sp) -/* 00008 80AD2CB8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80AD2CBC AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80AD2CC0 AFB00024 */ sw $s0, 0x0024($sp) -/* 00014 80AD2CC4 3C0580AD */ lui $a1, %hi(D_80AD39CC) ## $a1 = 80AD0000 -/* 00018 80AD2CC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80AD2CCC 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80AD2CD0 24A539CC */ addiu $a1, $a1, %lo(D_80AD39CC) ## $a1 = 80AD39CC -/* 00024 80AD2CD4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00028 80AD2CD8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0002C 80AD2CDC 260E01A8 */ addiu $t6, $s0, 0x01A8 ## $t6 = 000001A8 -/* 00030 80AD2CE0 260F01E4 */ addiu $t7, $s0, 0x01E4 ## $t7 = 000001E4 -/* 00034 80AD2CE4 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 00038 80AD2CE8 AFB80018 */ sw $t8, 0x0018($sp) -/* 0003C 80AD2CEC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00040 80AD2CF0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00044 80AD2CF4 24E70924 */ addiu $a3, $a3, 0x0924 ## $a3 = 06000924 -/* 00048 80AD2CF8 24C66A30 */ addiu $a2, $a2, 0x6A30 ## $a2 = 06006A30 -/* 0004C 80AD2CFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00050 80AD2D00 0C02915F */ jal SkelAnime_Init - -/* 00054 80AD2D04 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00058 80AD2D08 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 -/* 0005C 80AD2D0C AFA50034 */ sw $a1, 0x0034($sp) -/* 00060 80AD2D10 0C0170D9 */ jal Collider_InitCylinder - -/* 00064 80AD2D14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80AD2D18 3C0780AD */ lui $a3, %hi(D_80AD39A0) ## $a3 = 80AD0000 -/* 0006C 80AD2D1C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00070 80AD2D20 24E739A0 */ addiu $a3, $a3, %lo(D_80AD39A0) ## $a3 = 80AD39A0 -/* 00074 80AD2D24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00078 80AD2D28 0C01712B */ jal Collider_SetCylinder - -/* 0007C 80AD2D2C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00080 80AD2D30 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00084 80AD2D34 241900D2 */ addiu $t9, $zero, 0x00D2 ## $t9 = 000000D2 -/* 00088 80AD2D38 A2030220 */ sb $v1, 0x0220($s0) ## 00000220 -/* 0008C 80AD2D3C A2030221 */ sb $v1, 0x0221($s0) ## 00000221 -/* 00090 80AD2D40 A2190222 */ sb $t9, 0x0222($s0) ## 00000222 -/* 00094 80AD2D44 A2030223 */ sb $v1, 0x0223($s0) ## 00000223 -/* 00098 80AD2D48 26060228 */ addiu $a2, $s0, 0x0228 ## $a2 = 00000228 -/* 0009C 80AD2D4C AFA60034 */ sw $a2, 0x0034($sp) -/* 000A0 80AD2D50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A4 80AD2D54 0C01E9D9 */ jal LightContext_InsertLight - -/* 000A8 80AD2D58 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 000AC 80AD2D5C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 000B0 80AD2D60 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 000B4 80AD2D64 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 000B8 80AD2D68 4600218D */ trunc.w.s $f6, $f4 -/* 000BC 80AD2D6C AE020224 */ sw $v0, 0x0224($s0) ## 00000224 -/* 000C0 80AD2D70 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 000C4 80AD2D74 4600428D */ trunc.w.s $f10, $f8 -/* 000C8 80AD2D78 44053000 */ mfc1 $a1, $f6 -/* 000CC 80AD2D7C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 000D0 80AD2D80 4600848D */ trunc.w.s $f18, $f16 -/* 000D4 80AD2D84 44065000 */ mfc1 $a2, $f10 -/* 000D8 80AD2D88 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 000DC 80AD2D8C 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 000E0 80AD2D90 44079000 */ mfc1 $a3, $f18 -/* 000E4 80AD2D94 00052C00 */ sll $a1, $a1, 16 -/* 000E8 80AD2D98 00063400 */ sll $a2, $a2, 16 -/* 000EC 80AD2D9C 00073C00 */ sll $a3, $a3, 16 -/* 000F0 80AD2DA0 00073C03 */ sra $a3, $a3, 16 -/* 000F4 80AD2DA4 00063403 */ sra $a2, $a2, 16 -/* 000F8 80AD2DA8 00052C03 */ sra $a1, $a1, 16 -/* 000FC 80AD2DAC AFAE001C */ sw $t6, 0x001C($sp) -/* 00100 80AD2DB0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00104 80AD2DB4 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00108 80AD2DB8 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0010C 80AD2DBC 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 00110 80AD2DC0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00114 80AD2DC4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00118 80AD2DC8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0011C 80AD2DCC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00120 80AD2DD0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00124 80AD2DD4 0C00AC78 */ jal ActorShape_Init - -/* 00128 80AD2DD8 3C074214 */ lui $a3, 0x4214 ## $a3 = 42140000 -/* 0012C 80AD2DDC 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 00130 80AD2DE0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00134 80AD2DE4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00138 80AD2DE8 0018CA03 */ sra $t9, $t8, 8 -/* 0013C 80AD2DEC 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 00140 80AD2DF0 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 -/* 00144 80AD2DF4 A608001C */ sh $t0, 0x001C($s0) ## 0000001C -/* 00148 80AD2DF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0014C 80AD2DFC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00150 80AD2E00 0C2B4B99 */ jal func_80AD2E64 -/* 00154 80AD2E04 E60401A4 */ swc1 $f4, 0x01A4($s0) ## 000001A4 -/* 00158 80AD2E08 8FBF002C */ lw $ra, 0x002C($sp) -/* 0015C 80AD2E0C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00160 80AD2E10 8FB10028 */ lw $s1, 0x0028($sp) -/* 00164 80AD2E14 03E00008 */ jr $ra -/* 00168 80AD2E18 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s deleted file mode 100644 index 6384460eb9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel EnPoDesert_Update -/* 00760 80AD3410 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00764 80AD3414 AFB0001C */ sw $s0, 0x001C($sp) -/* 00768 80AD3418 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0076C 80AD341C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00770 80AD3420 AFB10020 */ sw $s1, 0x0020($sp) -/* 00774 80AD3424 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00778 80AD3428 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0077C 80AD342C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00780 80AD3430 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 00784 80AD3434 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00788 80AD3438 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0078C 80AD343C 0320F809 */ jalr $ra, $t9 -/* 00790 80AD3440 00000000 */ nop -/* 00794 80AD3444 0C00B638 */ jal Actor_MoveForward - -/* 00798 80AD3448 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0079C 80AD344C 0C2B4C17 */ jal func_80AD305C -/* 007A0 80AD3450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007A4 80AD3454 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 007A8 80AD3458 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 007AC 80AD345C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 007B0 80AD3460 AFAE0014 */ sw $t6, 0x0014($sp) -/* 007B4 80AD3464 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 007B8 80AD3468 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 007BC 80AD346C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 007C0 80AD3470 3C0741D8 */ lui $a3, 0x41D8 ## $a3 = 41D80000 -/* 007C4 80AD3474 0C00B92D */ jal func_8002E4B4 -/* 007C8 80AD3478 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 007CC 80AD347C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007D0 80AD3480 0C00B56E */ jal Actor_SetHeight - -/* 007D4 80AD3484 3C054228 */ lui $a1, 0x4228 ## $a1 = 42280000 -/* 007D8 80AD3488 26060238 */ addiu $a2, $s0, 0x0238 ## $a2 = 00000238 -/* 007DC 80AD348C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000238 -/* 007E0 80AD3490 AFA6002C */ sw $a2, 0x002C($sp) -/* 007E4 80AD3494 0C0189B7 */ jal Collider_CylinderUpdate - -/* 007E8 80AD3498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007EC 80AD349C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 007F0 80AD34A0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 007F4 80AD34A4 8FA6002C */ lw $a2, 0x002C($sp) -/* 007F8 80AD34A8 02212821 */ addu $a1, $s1, $at -/* 007FC 80AD34AC 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 00800 80AD34B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00804 80AD34B4 922F1C27 */ lbu $t7, 0x1C27($s1) ## 00001C27 -/* 00808 80AD34B8 3C098003 */ lui $t1, %hi(ActorShadow_DrawFunc_Circle) -/* 0080C 80AD34BC 51E00008 */ beql $t7, $zero, .L80AD34E0 -/* 00810 80AD34C0 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 00814 80AD34C4 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 00818 80AD34C8 2529B5EC */ addiu $t1, %lo(ActorShadow_DrawFunc_Circle) -/* 0081C 80AD34CC AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 -/* 00820 80AD34D0 37080081 */ ori $t0, $t8, 0x0081 ## $t0 = 00000081 -/* 00824 80AD34D4 10000006 */ beq $zero, $zero, .L80AD34F0 -/* 00828 80AD34D8 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 0082C 80AD34DC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -.L80AD34E0: -/* 00830 80AD34E0 2401FF7E */ addiu $at, $zero, 0xFF7E ## $at = FFFFFF7E -/* 00834 80AD34E4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 00838 80AD34E8 01415824 */ and $t3, $t2, $at -/* 0083C 80AD34EC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -.L80AD34F0: -/* 00840 80AD34F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00844 80AD34F4 8FB0001C */ lw $s0, 0x001C($sp) -/* 00848 80AD34F8 8FB10020 */ lw $s1, 0x0020($sp) -/* 0084C 80AD34FC 03E00008 */ jr $ra -/* 00850 80AD3500 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s deleted file mode 100644 index 8aa3842f35..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_80AD2E64 -/* 001B4 80AD2E64 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001B8 80AD2E68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001BC 80AD2E6C AFA50024 */ sw $a1, 0x0024($sp) -/* 001C0 80AD2E70 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 001C4 80AD2E74 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 001C8 80AD2E78 01E57821 */ addu $t7, $t7, $a1 -/* 001CC 80AD2E7C 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 -/* 001D0 80AD2E80 0018C8C0 */ sll $t9, $t8, 3 -/* 001D4 80AD2E84 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001D8 80AD2E88 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001DC 80AD2E8C 01F94021 */ addu $t0, $t7, $t9 -/* 001E0 80AD2E90 AFA8001C */ sw $t0, 0x001C($sp) -/* 001E4 80AD2E94 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 -/* 001E8 80AD2E98 AFA70020 */ sw $a3, 0x0020($sp) -/* 001EC 80AD2E9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F0 80AD2EA0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 001F4 80AD2EA4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 001F8 80AD2EA8 8FA9001C */ lw $t1, 0x001C($sp) -/* 001FC 80AD2EAC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00200 80AD2EB0 3C0D8016 */ lui $t5, %hi(gSegments) -/* 00204 80AD2EB4 8D230004 */ lw $v1, 0x0004($t1) ## 00000004 -/* 00208 80AD2EB8 8C8F0198 */ lw $t7, 0x0198($a0) ## 00000198 -/* 0020C 80AD2EBC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00210 80AD2EC0 00035100 */ sll $t2, $v1, 4 -/* 00214 80AD2EC4 000A5F02 */ srl $t3, $t2, 28 -/* 00218 80AD2EC8 000B6080 */ sll $t4, $t3, 2 -/* 0021C 80AD2ECC 01AC6821 */ addu $t5, $t5, $t4 -/* 00220 80AD2ED0 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* 00224 80AD2ED4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00228 80AD2ED8 000FC880 */ sll $t9, $t7, 2 -/* 0022C 80AD2EDC 00617024 */ and $t6, $v1, $at -/* 00230 80AD2EE0 032FC823 */ subu $t9, $t9, $t7 -/* 00234 80AD2EE4 0019C840 */ sll $t9, $t9, 1 -/* 00238 80AD2EE8 01AEC021 */ addu $t8, $t5, $t6 -/* 0023C 80AD2EEC 03191021 */ addu $v0, $t8, $t9 -/* 00240 80AD2EF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00244 80AD2EF4 00411021 */ addu $v0, $v0, $at -/* 00248 80AD2EF8 84480000 */ lh $t0, 0x0000($v0) ## 00000000 -/* 0024C 80AD2EFC 24850008 */ addiu $a1, $a0, 0x0008 ## $a1 = 00000008 -/* 00250 80AD2F00 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 00254 80AD2F04 00000000 */ nop -/* 00258 80AD2F08 468021A0 */ cvt.s.w $f6, $f4 -/* 0025C 80AD2F0C E4860008 */ swc1 $f6, 0x0008($a0) ## 00000008 -/* 00260 80AD2F10 84490002 */ lh $t1, 0x0002($v0) ## 00000002 -/* 00264 80AD2F14 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 00268 80AD2F18 00000000 */ nop -/* 0026C 80AD2F1C 468042A0 */ cvt.s.w $f10, $f8 -/* 00270 80AD2F20 E48A000C */ swc1 $f10, 0x000C($a0) ## 0000000C -/* 00274 80AD2F24 844A0004 */ lh $t2, 0x0004($v0) ## 00000004 -/* 00278 80AD2F28 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 0027C 80AD2F2C 00000000 */ nop -/* 00280 80AD2F30 468084A0 */ cvt.s.w $f18, $f16 -/* 00284 80AD2F34 0C00B6EC */ jal func_8002DBB0 -/* 00288 80AD2F38 E4920010 */ swc1 $f18, 0x0010($a0) ## 00000010 -/* 0028C 80AD2F3C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00290 80AD2F40 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00294 80AD2F44 8FA70020 */ lw $a3, 0x0020($sp) -/* 00298 80AD2F48 3C1880AD */ lui $t8, %hi(func_80AD30D0) ## $t8 = 80AD0000 -/* 0029C 80AD2F4C 4602003C */ c.lt.s $f0, $f2 -/* 002A0 80AD2F50 271830D0 */ addiu $t8, $t8, %lo(func_80AD30D0) ## $t8 = 80AD30D0 -/* 002A4 80AD2F54 E4E0019C */ swc1 $f0, 0x019C($a3) ## 0000019C -/* 002A8 80AD2F58 45020004 */ bc1fl .L80AD2F6C -/* 002AC 80AD2F5C C4E4019C */ lwc1 $f4, 0x019C($a3) ## 0000019C -/* 002B0 80AD2F60 10000003 */ beq $zero, $zero, .L80AD2F70 -/* 002B4 80AD2F64 E4E2019C */ swc1 $f2, 0x019C($a3) ## 0000019C -/* 002B8 80AD2F68 C4E4019C */ lwc1 $f4, 0x019C($a3) ## 0000019C -.L80AD2F6C: -/* 002BC 80AD2F6C E4E4019C */ swc1 $f4, 0x019C($a3) ## 0000019C -.L80AD2F70: -/* 002C0 80AD2F70 C4E6000C */ lwc1 $f6, 0x000C($a3) ## 0000000C -/* 002C4 80AD2F74 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 -/* 002C8 80AD2F78 8CEB0198 */ lw $t3, 0x0198($a3) ## 00000198 -/* 002CC 80AD2F7C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 002D0 80AD2F80 46083281 */ sub.s $f10, $f6, $f8 -/* 002D4 80AD2F84 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 002D8 80AD2F88 ACEC0198 */ sw $t4, 0x0198($a3) ## 00000198 -/* 002DC 80AD2F8C E4F00068 */ swc1 $f16, 0x0068($a3) ## 00000068 -/* 002E0 80AD2F90 E4EA01A0 */ swc1 $f10, 0x01A0($a3) ## 000001A0 -/* 002E4 80AD2F94 8FAE001C */ lw $t6, 0x001C($sp) -/* 002E8 80AD2F98 91CF0000 */ lbu $t7, 0x0000($t6) ## 00000000 -/* 002EC 80AD2F9C 558F0003 */ bnel $t4, $t7, .L80AD2FAC -/* 002F0 80AD2FA0 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 002F4 80AD2FA4 ACE00198 */ sw $zero, 0x0198($a3) ## 00000198 -/* 002F8 80AD2FA8 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -.L80AD2FAC: -/* 002FC 80AD2FAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00300 80AD2FB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00304 80AD2FB4 03E00008 */ jr $ra -/* 00308 80AD2FB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s deleted file mode 100644 index c2a62c422d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AD2FBC -/* 0030C 80AD2FBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00310 80AD2FC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00314 80AD2FC4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00318 80AD2FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0031C 80AD2FCC 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 -/* 00320 80AD2FD0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00324 80AD2FD4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00328 80AD2FD8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0032C 80AD2FDC 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00330 80AD2FE0 3C0E80AD */ lui $t6, %hi(func_80AD3194) ## $t6 = 80AD0000 -/* 00334 80AD2FE4 25CE3194 */ addiu $t6, $t6, %lo(func_80AD3194) ## $t6 = 80AD3194 -/* 00338 80AD2FE8 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 0033C 80AD2FEC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00340 80AD2FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00344 80AD2FF4 03E00008 */ jr $ra -/* 00348 80AD2FF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s deleted file mode 100644 index 06936d946c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AD2FFC -/* 0034C 80AD2FFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00350 80AD3000 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00354 80AD3004 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00358 80AD3008 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0035C 80AD300C 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 -/* 00360 80AD3010 AFA70018 */ sw $a3, 0x0018($sp) -/* 00364 80AD3014 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00368 80AD3018 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 0036C 80AD301C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00370 80AD3020 8FA40018 */ lw $a0, 0x0018($sp) -/* 00374 80AD3024 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00378 80AD3028 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 0037C 80AD302C 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 -/* 00380 80AD3030 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 -/* 00384 80AD3034 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00388 80AD3038 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 0038C 80AD303C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00390 80AD3040 3C0F80AD */ lui $t7, %hi(func_80AD3328) ## $t7 = 80AD0000 -/* 00394 80AD3044 25EF3328 */ addiu $t7, $t7, %lo(func_80AD3328) ## $t7 = 80AD3328 -/* 00398 80AD3048 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 0039C 80AD304C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003A0 80AD3050 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003A4 80AD3054 03E00008 */ jr $ra -/* 003A8 80AD3058 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s deleted file mode 100644 index 82392c6ea4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AD305C -/* 003AC 80AD305C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003B0 80AD3060 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003B4 80AD3064 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 003B8 80AD3068 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 003BC 80AD306C 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 003C0 80AD3070 14400003 */ bne $v0, $zero, .L80AD3080 -/* 003C4 80AD3074 00000000 */ nop -/* 003C8 80AD3078 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 003CC 80AD307C 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -.L80AD3080: -/* 003D0 80AD3080 10400003 */ beq $v0, $zero, .L80AD3090 -/* 003D4 80AD3084 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 003D8 80AD3088 A4AF0196 */ sh $t7, 0x0196($a1) ## 00000196 -/* 003DC 80AD308C 84A20196 */ lh $v0, 0x0196($a1) ## 00000196 -.L80AD3090: -/* 003E0 80AD3090 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 003E4 80AD3094 000426C0 */ sll $a0, $a0, 27 -/* 003E8 80AD3098 00042403 */ sra $a0, $a0, 16 -/* 003EC 80AD309C 0C01DE1C */ jal Math_Sins - ## sins? -/* 003F0 80AD30A0 AFA50018 */ sw $a1, 0x0018($sp) -/* 003F4 80AD30A4 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 003F8 80AD30A8 44812000 */ mtc1 $at, $f4 ## $f4 = 13.00 -/* 003FC 80AD30AC 8FA50018 */ lw $a1, 0x0018($sp) -/* 00400 80AD30B0 46040182 */ mul.s $f6, $f0, $f4 -/* 00404 80AD30B4 C4A801A4 */ lwc1 $f8, 0x01A4($a1) ## 000001A4 -/* 00408 80AD30B8 46083280 */ add.s $f10, $f6, $f8 -/* 0040C 80AD30BC E4AA0028 */ swc1 $f10, 0x0028($a1) ## 00000028 -/* 00410 80AD30C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00414 80AD30C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00418 80AD30C8 03E00008 */ jr $ra -/* 0041C 80AD30CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s deleted file mode 100644 index 85aadd313a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80AD30D0 -/* 00420 80AD30D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00424 80AD30D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00428 80AD30D8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0042C 80AD30DC 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 00430 80AD30E0 0C00BE5D */ jal func_8002F974 -/* 00434 80AD30E4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00438 80AD30E8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0043C 80AD30EC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00440 80AD30F0 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00444 80AD30F4 C4E40090 */ lwc1 $f4, 0x0090($a3) ## 00000090 -/* 00448 80AD30F8 4606203C */ c.lt.s $f4, $f6 -/* 0044C 80AD30FC 00000000 */ nop -/* 00450 80AD3100 4502001E */ bc1fl .L80AD317C -/* 00454 80AD3104 84E800B6 */ lh $t0, 0x00B6($a3) ## 000000B6 -/* 00458 80AD3108 8CE20198 */ lw $v0, 0x0198($a3) ## 00000198 -/* 0045C 80AD310C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00460 80AD3110 8FAE001C */ lw $t6, 0x001C($sp) -/* 00464 80AD3114 14620004 */ bne $v1, $v0, .L80AD3128 -/* 00468 80AD3118 00000000 */ nop -/* 0046C 80AD311C 91CF1C27 */ lbu $t7, 0x1C27($t6) ## 00001C27 -/* 00470 80AD3120 51E00016 */ beql $t7, $zero, .L80AD317C -/* 00474 80AD3124 84E800B6 */ lh $t0, 0x00B6($a3) ## 000000B6 -.L80AD3128: -/* 00478 80AD3128 1462000F */ bne $v1, $v0, .L80AD3168 -/* 0047C 80AD312C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00480 80AD3130 0C02FF21 */ jal Gameplay_InCsMode -/* 00484 80AD3134 AFA70018 */ sw $a3, 0x0018($sp) -/* 00488 80AD3138 10400005 */ beq $v0, $zero, .L80AD3150 -/* 0048C 80AD313C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00490 80AD3140 84F800B6 */ lh $t8, 0x00B6($a3) ## 000000B6 -/* 00494 80AD3144 27190800 */ addiu $t9, $t8, 0x0800 ## $t9 = 00000800 -/* 00498 80AD3148 1000000E */ beq $zero, $zero, .L80AD3184 -/* 0049C 80AD314C A4F900B6 */ sh $t9, 0x00B6($a3) ## 000000B6 -.L80AD3150: -/* 004A0 80AD3150 8FA4001C */ lw $a0, 0x001C($sp) -/* 004A4 80AD3154 2405600B */ addiu $a1, $zero, 0x600B ## $a1 = 0000600B -/* 004A8 80AD3158 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004AC 80AD315C 0C042DA0 */ jal func_8010B680 -/* 004B0 80AD3160 AFA70018 */ sw $a3, 0x0018($sp) -/* 004B4 80AD3164 8FA70018 */ lw $a3, 0x0018($sp) -.L80AD3168: -/* 004B8 80AD3168 0C2B4BEF */ jal func_80AD2FBC -/* 004BC 80AD316C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 004C0 80AD3170 10000005 */ beq $zero, $zero, .L80AD3188 -/* 004C4 80AD3174 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004C8 80AD3178 84E800B6 */ lh $t0, 0x00B6($a3) ## 000000B6 -.L80AD317C: -/* 004CC 80AD317C 25090800 */ addiu $t1, $t0, 0x0800 ## $t1 = 00000800 -/* 004D0 80AD3180 A4E900B6 */ sh $t1, 0x00B6($a3) ## 000000B6 -.L80AD3184: -/* 004D4 80AD3184 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD3188: -/* 004D8 80AD3188 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004DC 80AD318C 03E00008 */ jr $ra -/* 004E0 80AD3190 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s deleted file mode 100644 index a4e57b4ab4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s +++ /dev/null @@ -1,119 +0,0 @@ -.late_rodata -glabel D_80AD3A2C - .float 0.157079637 -glabel D_80AD3A30 - .float 0.098174773 - -.text -glabel func_80AD3194 -/* 004E4 80AD3194 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 004E8 80AD3198 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004EC 80AD319C AFB00020 */ sw $s0, 0x0020($sp) -/* 004F0 80AD31A0 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 004F4 80AD31A4 AFA5003C */ sw $a1, 0x003C($sp) -/* 004F8 80AD31A8 84820194 */ lh $v0, 0x0194($a0) ## 00000194 -/* 004FC 80AD31AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00500 80AD31B0 10400003 */ beq $v0, $zero, .L80AD31C0 -/* 00504 80AD31B4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00508 80AD31B8 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 -/* 0050C 80AD31BC 84820194 */ lh $v0, 0x0194($a0) ## 00000194 -.L80AD31C0: -/* 00510 80AD31C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00514 80AD31C4 3C0180AD */ lui $at, %hi(D_80AD3A2C) ## $at = 80AD0000 -/* 00518 80AD31C8 C4283A2C */ lwc1 $f8, %lo(D_80AD3A2C)($at) -/* 0051C 80AD31CC 468021A0 */ cvt.s.w $f6, $f4 -/* 00520 80AD31D0 46083302 */ mul.s $f12, $f6, $f8 -/* 00524 80AD31D4 0C0400A4 */ jal sinf - -/* 00528 80AD31D8 00000000 */ nop -/* 0052C 80AD31DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00530 80AD31E0 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 00534 80AD31E4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00538 80AD31E8 460A0502 */ mul.s $f20, $f0, $f10 -/* 0053C 80AD31EC 0C01DE0D */ jal Math_Coss - ## coss? -/* 00540 80AD31F0 00000000 */ nop -/* 00544 80AD31F4 4600A482 */ mul.s $f18, $f20, $f0 -/* 00548 80AD31F8 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 0054C 80AD31FC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00550 80AD3200 46128100 */ add.s $f4, $f16, $f18 -/* 00554 80AD3204 0C01DE1C */ jal Math_Sins - ## sins? -/* 00558 80AD3208 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 0055C 80AD320C 4600A202 */ mul.s $f8, $f20, $f0 -/* 00560 80AD3210 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00564 80AD3214 860F0194 */ lh $t7, 0x0194($s0) ## 00000194 -/* 00568 80AD3218 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 -/* 0056C 80AD321C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00570 80AD3220 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 00574 80AD3224 46083280 */ add.s $f10, $f6, $f8 -/* 00578 80AD3228 15E00002 */ bne $t7, $zero, .L80AD3234 -/* 0057C 80AD322C E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 00580 80AD3230 A6180194 */ sh $t8, 0x0194($s0) ## 00000194 -.L80AD3234: -/* 00584 80AD3234 0C00B6EC */ jal func_8002DBB0 -/* 00588 80AD3238 AFA5002C */ sw $a1, 0x002C($sp) -/* 0058C 80AD323C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00590 80AD3240 46000506 */ mov.s $f20, $f0 -/* 00594 80AD3244 0C00B6B0 */ jal func_8002DAC0 -/* 00598 80AD3248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0059C 80AD324C A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 005A0 80AD3250 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 005A4 80AD3254 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005A8 80AD3258 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 005AC 80AD325C 00A12821 */ addu $a1, $a1, $at -/* 005B0 80AD3260 00052C00 */ sll $a1, $a1, 16 -/* 005B4 80AD3264 00052C03 */ sra $a1, $a1, 16 -/* 005B8 80AD3268 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 005BC 80AD326C 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 005C0 80AD3270 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 -/* 005C4 80AD3274 86190196 */ lh $t9, 0x0196($s0) ## 00000196 -/* 005C8 80AD3278 3C0180AD */ lui $at, %hi(D_80AD3A30) ## $at = 80AD0000 -/* 005CC 80AD327C C4243A30 */ lwc1 $f4, %lo(D_80AD3A30)($at) -/* 005D0 80AD3280 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 005D4 80AD3284 00000000 */ nop -/* 005D8 80AD3288 468084A0 */ cvt.s.w $f18, $f16 -/* 005DC 80AD328C 46049302 */ mul.s $f12, $f18, $f4 -/* 005E0 80AD3290 0C0400A4 */ jal sinf - -/* 005E4 80AD3294 00000000 */ nop -/* 005E8 80AD3298 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 005EC 80AD329C 44813000 */ mtc1 $at, $f6 ## $f6 = 2.50 -/* 005F0 80AD32A0 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 -/* 005F4 80AD32A4 44815000 */ mtc1 $at, $f10 ## $f10 = 5.50 -/* 005F8 80AD32A8 46060202 */ mul.s $f8, $f0, $f6 -/* 005FC 80AD32AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00600 80AD32B0 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 00604 80AD32B4 460A4400 */ add.s $f16, $f8, $f10 -/* 00608 80AD32B8 0C00BE5D */ jal func_8002F974 -/* 0060C 80AD32BC E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00610 80AD32C0 C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 -/* 00614 80AD32C4 C606019C */ lwc1 $f6, 0x019C($s0) ## 0000019C -/* 00618 80AD32C8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0061C 80AD32CC 4612A102 */ mul.s $f4, $f20, $f18 -/* 00620 80AD32D0 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 00624 80AD32D4 C60A000C */ lwc1 $f10, 0x000C($s0) ## 0000000C -/* 00628 80AD32D8 4612A03C */ c.lt.s $f20, $f18 -/* 0062C 80AD32DC 46062203 */ div.s $f8, $f4, $f6 -/* 00630 80AD32E0 46085401 */ sub.s $f16, $f10, $f8 -/* 00634 80AD32E4 4500000B */ bc1f .L80AD3314 -/* 00638 80AD32E8 E61001A4 */ swc1 $f16, 0x01A4($s0) ## 000001A4 -/* 0063C 80AD32EC 8E080198 */ lw $t0, 0x0198($s0) ## 00000198 -/* 00640 80AD32F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00644 80AD32F4 11000005 */ beq $t0, $zero, .L80AD330C -/* 00648 80AD32F8 00000000 */ nop -/* 0064C 80AD32FC 0C2B4B99 */ jal func_80AD2E64 -/* 00650 80AD3300 8FA5003C */ lw $a1, 0x003C($sp) -/* 00654 80AD3304 10000004 */ beq $zero, $zero, .L80AD3318 -/* 00658 80AD3308 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD330C: -/* 0065C 80AD330C 0C2B4BFF */ jal func_80AD2FFC -/* 00660 80AD3310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD3314: -/* 00664 80AD3314 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD3318: -/* 00668 80AD3318 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0066C 80AD331C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00670 80AD3320 03E00008 */ jr $ra -/* 00674 80AD3324 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s deleted file mode 100644 index 25d4b60618..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80AD3328 -/* 00678 80AD3328 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0067C 80AD332C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00680 80AD3330 AFA5001C */ sw $a1, 0x001C($sp) -/* 00684 80AD3334 84820194 */ lh $v0, 0x0194($a0) ## 00000194 -/* 00688 80AD3338 10400003 */ beq $v0, $zero, .L80AD3348 -/* 0068C 80AD333C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00690 80AD3340 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 -/* 00694 80AD3344 84820194 */ lh $v0, 0x0194($a0) ## 00000194 -.L80AD3348: -/* 00698 80AD3348 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0069C 80AD334C 3C01417F */ lui $at, 0x417F ## $at = 417F0000 -/* 006A0 80AD3350 44814000 */ mtc1 $at, $f8 ## $f8 = 15.94 -/* 006A4 80AD3354 468021A0 */ cvt.s.w $f6, $f4 -/* 006A8 80AD3358 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 006AC 80AD335C 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 006B0 80AD3360 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 006B4 80AD3364 25F82000 */ addiu $t8, $t7, 0x2000 ## $t8 = 00002000 -/* 006B8 80AD3368 46083282 */ mul.s $f10, $f6, $f8 -/* 006BC 80AD336C A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -/* 006C0 80AD3370 4459F800 */ cfc1 $t9, $31 -/* 006C4 80AD3374 44C8F800 */ ctc1 $t0, $31 -/* 006C8 80AD3378 00000000 */ nop -/* 006CC 80AD337C 46005424 */ cvt.w.s $f16, $f10 -/* 006D0 80AD3380 4448F800 */ cfc1 $t0, $31 -/* 006D4 80AD3384 00000000 */ nop -/* 006D8 80AD3388 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 006DC 80AD338C 51000013 */ beql $t0, $zero, .L80AD33DC -/* 006E0 80AD3390 44088000 */ mfc1 $t0, $f16 -/* 006E4 80AD3394 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 006E8 80AD3398 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 006EC 80AD339C 46105401 */ sub.s $f16, $f10, $f16 -/* 006F0 80AD33A0 44C8F800 */ ctc1 $t0, $31 -/* 006F4 80AD33A4 00000000 */ nop -/* 006F8 80AD33A8 46008424 */ cvt.w.s $f16, $f16 -/* 006FC 80AD33AC 4448F800 */ cfc1 $t0, $31 -/* 00700 80AD33B0 00000000 */ nop -/* 00704 80AD33B4 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 00708 80AD33B8 15000005 */ bne $t0, $zero, .L80AD33D0 -/* 0070C 80AD33BC 00000000 */ nop -/* 00710 80AD33C0 44088000 */ mfc1 $t0, $f16 -/* 00714 80AD33C4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00718 80AD33C8 10000007 */ beq $zero, $zero, .L80AD33E8 -/* 0071C 80AD33CC 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80AD33D0: -/* 00720 80AD33D0 10000005 */ beq $zero, $zero, .L80AD33E8 -/* 00724 80AD33D4 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 00728 80AD33D8 44088000 */ mfc1 $t0, $f16 -.L80AD33DC: -/* 0072C 80AD33DC 00000000 */ nop -/* 00730 80AD33E0 0500FFFB */ bltz $t0, .L80AD33D0 -/* 00734 80AD33E4 00000000 */ nop -.L80AD33E8: -/* 00738 80AD33E8 44D9F800 */ ctc1 $t9, $31 -/* 0073C 80AD33EC A0880223 */ sb $t0, 0x0223($a0) ## 00000223 -/* 00740 80AD33F0 14400003 */ bne $v0, $zero, .L80AD3400 -/* 00744 80AD33F4 A08800C8 */ sb $t0, 0x00C8($a0) ## 000000C8 -/* 00748 80AD33F8 0C00B55C */ jal Actor_Kill - -/* 0074C 80AD33FC 00000000 */ nop -.L80AD3400: -/* 00750 80AD3400 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00754 80AD3404 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00758 80AD3408 03E00008 */ jr $ra -/* 0075C 80AD340C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s deleted file mode 100644 index 8ceaccebb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AD3504 -/* 00854 80AD3504 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00858 80AD3508 AFA40018 */ sw $a0, 0x0018($sp) -/* 0085C 80AD350C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00860 80AD3510 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00864 80AD3514 AFA60020 */ sw $a2, 0x0020($sp) -/* 00868 80AD3518 AFA70024 */ sw $a3, 0x0024($sp) -/* 0086C 80AD351C 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 00870 80AD3520 3C0E80AD */ lui $t6, %hi(func_80AD3328) ## $t6 = 80AD0000 -/* 00874 80AD3524 25CE3328 */ addiu $t6, $t6, %lo(func_80AD3328) ## $t6 = 80AD3328 -/* 00878 80AD3528 15CF000E */ bne $t6, $t7, .L80AD3564 -/* 0087C 80AD352C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00880 80AD3530 54A1000D */ bnel $a1, $at, .L80AD3568 -/* 00884 80AD3534 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -/* 00888 80AD3538 84980194 */ lh $t8, 0x0194($a0) ## 00000194 -/* 0088C 80AD353C 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 -/* 00890 80AD3540 44814000 */ mtc1 $at, $f8 ## $f8 = 0.06 -/* 00894 80AD3544 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00898 80AD3548 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0089C 80AD354C 468021A0 */ cvt.s.w $f6, $f4 -/* 008A0 80AD3550 46083302 */ mul.s $f12, $f6, $f8 -/* 008A4 80AD3554 44066000 */ mfc1 $a2, $f12 -/* 008A8 80AD3558 0C0342A3 */ jal Matrix_Scale -/* 008AC 80AD355C 46006386 */ mov.s $f14, $f12 -/* 008B0 80AD3560 8FA4002C */ lw $a0, 0x002C($sp) -.L80AD3564: -/* 008B4 80AD3564 8C990004 */ lw $t9, 0x0004($a0) ## 00000004 -.L80AD3568: -/* 008B8 80AD3568 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 008BC 80AD356C 8FA90020 */ lw $t1, 0x0020($sp) -/* 008C0 80AD3570 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 008C4 80AD3574 51010003 */ beql $t0, $at, .L80AD3584 -/* 008C8 80AD3578 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008CC 80AD357C AD200000 */ sw $zero, 0x0000($t1) ## 00000000 -/* 008D0 80AD3580 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD3584: -/* 008D4 80AD3584 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008D8 80AD3588 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 008DC 80AD358C 03E00008 */ jr $ra -/* 008E0 80AD3590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s deleted file mode 100644 index 6ffd0fdddb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s +++ /dev/null @@ -1,163 +0,0 @@ -.rdata -glabel D_80AD39F0 - .asciz "../z_en_po_desert.c" - .balign 4 - -.text -glabel func_80AD3594 -/* 008E4 80AD3594 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 008E8 80AD3598 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 008EC 80AD359C AFBF0024 */ sw $ra, 0x0024($sp) -/* 008F0 80AD35A0 AFA40068 */ sw $a0, 0x0068($sp) -/* 008F4 80AD35A4 AFA60070 */ sw $a2, 0x0070($sp) -/* 008F8 80AD35A8 14A1008E */ bne $a1, $at, .L80AD37E4 -/* 008FC 80AD35AC AFA70074 */ sw $a3, 0x0074($sp) -/* 00900 80AD35B0 3C0480AD */ lui $a0, %hi(D_80AD39D8) ## $a0 = 80AD0000 -/* 00904 80AD35B4 248439D8 */ addiu $a0, $a0, %lo(D_80AD39D8) ## $a0 = 80AD39D8 -/* 00908 80AD35B8 0C0346BD */ jal Matrix_MultVec3f -/* 0090C 80AD35BC 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 00910 80AD35C0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00914 80AD35C4 00000000 */ nop -/* 00918 80AD35C8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0091C 80AD35CC 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 00920 80AD35D0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00924 80AD35D4 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 00928 80AD35D8 46040182 */ mul.s $f6, $f0, $f4 -/* 0092C 80AD35DC 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 00930 80AD35E0 44812000 */ mtc1 $at, $f4 ## $f4 = 160.00 -/* 00934 80AD35E4 460A0402 */ mul.s $f16, $f0, $f10 -/* 00938 80AD35E8 8FA80078 */ lw $t0, 0x0078($sp) -/* 0093C 80AD35EC 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 00940 80AD35F0 8FA7007C */ lw $a3, 0x007C($sp) -/* 00944 80AD35F4 8D190004 */ lw $t9, 0x0004($t0) ## 00000004 -/* 00948 80AD35F8 4600320D */ trunc.w.s $f8, $f6 -/* 0094C 80AD35FC 46040182 */ mul.s $f6, $f0, $f4 -/* 00950 80AD3600 332C0080 */ andi $t4, $t9, 0x0080 ## $t4 = 00000000 -/* 00954 80AD3604 44044000 */ mfc1 $a0, $f8 -/* 00958 80AD3608 4600848D */ trunc.w.s $f18, $f16 -/* 0095C 80AD360C 00042400 */ sll $a0, $a0, 16 -/* 00960 80AD3610 00042403 */ sra $a0, $a0, 16 -/* 00964 80AD3614 4600320D */ trunc.w.s $f8, $f6 -/* 00968 80AD3618 44059000 */ mfc1 $a1, $f18 -/* 0096C 80AD361C 248400E1 */ addiu $a0, $a0, 0x00E1 ## $a0 = 000000E1 -/* 00970 80AD3620 308900FF */ andi $t1, $a0, 0x00FF ## $t1 = 000000E1 -/* 00974 80AD3624 44064000 */ mfc1 $a2, $f8 -/* 00978 80AD3628 00052C00 */ sll $a1, $a1, 16 -/* 0097C 80AD362C 00052C03 */ sra $a1, $a1, 16 -/* 00980 80AD3630 00063400 */ sll $a2, $a2, 16 -/* 00984 80AD3634 00063403 */ sra $a2, $a2, 16 -/* 00988 80AD3638 24A5009B */ addiu $a1, $a1, 0x009B ## $a1 = 0000009B -/* 0098C 80AD363C 24C6005F */ addiu $a2, $a2, 0x005F ## $a2 = 0000005F -/* 00990 80AD3640 30AA00FF */ andi $t2, $a1, 0x00FF ## $t2 = 0000009B -/* 00994 80AD3644 15810051 */ bne $t4, $at, .L80AD378C -/* 00998 80AD3648 30CB00FF */ andi $t3, $a2, 0x00FF ## $t3 = 0000005F -/* 0099C 80AD364C 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 009A0 80AD3650 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 009A4 80AD3654 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 009A8 80AD3658 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 009AC 80AD365C ACED0000 */ sw $t5, 0x0000($a3) ## 00000000 -/* 009B0 80AD3660 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009B4 80AD3664 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 009B8 80AD3668 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 009BC 80AD366C 30CE00FF */ andi $t6, $a2, 0x00FF ## $t6 = 0000005F -/* 009C0 80AD3670 00046E00 */ sll $t5, $a0, 24 -/* 009C4 80AD3674 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 009C8 80AD3678 ACEF0000 */ sw $t7, 0x0000($a3) ## 00000000 -/* 009CC 80AD367C 30AF00FF */ andi $t7, $a1, 0x00FF ## $t7 = 0000009B -/* 009D0 80AD3680 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 009D4 80AD3684 000FC400 */ sll $t8, $t7, 16 -/* 009D8 80AD3688 01B8C825 */ or $t9, $t5, $t8 ## $t9 = FB000008 -/* 009DC 80AD368C 000E7A00 */ sll $t7, $t6, 8 -/* 009E0 80AD3690 032F6825 */ or $t5, $t9, $t7 ## $t5 = FB00009B -/* 009E4 80AD3694 35B800FF */ ori $t8, $t5, 0x00FF ## $t8 = FB0000FF -/* 009E8 80AD3698 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 009EC 80AD369C 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 009F0 80AD36A0 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 009F4 80AD36A4 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 009F8 80AD36A8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 009FC 80AD36AC ACEC0000 */ sw $t4, 0x0000($a3) ## 00000000 -/* 00A00 80AD36B0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00A04 80AD36B4 8FB90068 */ lw $t9, 0x0068($sp) -/* 00A08 80AD36B8 3C0580AD */ lui $a1, %hi(D_80AD39F0) ## $a1 = 80AD0000 -/* 00A0C 80AD36BC 24A539F0 */ addiu $a1, $a1, %lo(D_80AD39F0) ## $a1 = 80AD39F0 -/* 00A10 80AD36C0 8F240000 */ lw $a0, 0x0000($t9) ## FB000008 -/* 00A14 80AD36C4 A3AB005E */ sb $t3, 0x005E($sp) -/* 00A18 80AD36C8 A3AA005D */ sb $t2, 0x005D($sp) -/* 00A1C 80AD36CC A3A9005C */ sb $t1, 0x005C($sp) -/* 00A20 80AD36D0 2406020B */ addiu $a2, $zero, 0x020B ## $a2 = 0000020B -/* 00A24 80AD36D4 0C0346A2 */ jal Matrix_NewMtx -/* 00A28 80AD36D8 AFA20044 */ sw $v0, 0x0044($sp) -/* 00A2C 80AD36DC 8FA30044 */ lw $v1, 0x0044($sp) -/* 00A30 80AD36E0 8FA7007C */ lw $a3, 0x007C($sp) -/* 00A34 80AD36E4 8FA80078 */ lw $t0, 0x0078($sp) -/* 00A38 80AD36E8 93A9005C */ lbu $t1, 0x005C($sp) -/* 00A3C 80AD36EC 93AA005D */ lbu $t2, 0x005D($sp) -/* 00A40 80AD36F0 93AB005E */ lbu $t3, 0x005E($sp) -/* 00A44 80AD36F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00A48 80AD36F8 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 00A4C 80AD36FC 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00A50 80AD3700 25AD4BA0 */ addiu $t5, $t5, 0x4BA0 ## $t5 = 06004BA0 -/* 00A54 80AD3704 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00A58 80AD3708 ACEF0000 */ sw $t7, 0x0000($a3) ## 00000000 -/* 00A5C 80AD370C 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 -/* 00A60 80AD3710 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 00A64 80AD3714 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00A68 80AD3718 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 00A6C 80AD371C 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 00A70 80AD3720 258C4CC0 */ addiu $t4, $t4, 0x4CC0 ## $t4 = 06004CC0 -/* 00A74 80AD3724 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00A78 80AD3728 ACF80000 */ sw $t8, 0x0000($a3) ## 00000000 -/* 00A7C 80AD372C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00A80 80AD3730 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 00A84 80AD3734 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 00A88 80AD3738 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 00A8C 80AD373C 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 00A90 80AD3740 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00A94 80AD3744 ACEE0000 */ sw $t6, 0x0000($a3) ## 00000000 -/* 00A98 80AD3748 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00A9C 80AD374C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00AA0 80AD3750 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 00AA4 80AD3754 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00AA8 80AD3758 ACEF0000 */ sw $t7, 0x0000($a3) ## 00000000 -/* 00AAC 80AD375C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00AB0 80AD3760 910F0221 */ lbu $t7, 0x0221($t0) ## 00000221 -/* 00AB4 80AD3764 910C0220 */ lbu $t4, 0x0220($t0) ## 00000220 -/* 00AB8 80AD3768 91190222 */ lbu $t9, 0x0222($t0) ## 00000222 -/* 00ABC 80AD376C 000F6C00 */ sll $t5, $t7, 16 -/* 00AC0 80AD3770 000C7600 */ sll $t6, $t4, 24 -/* 00AC4 80AD3774 910C0223 */ lbu $t4, 0x0223($t0) ## 00000223 -/* 00AC8 80AD3778 01CDC025 */ or $t8, $t6, $t5 ## $t8 = FB000008 -/* 00ACC 80AD377C 00197A00 */ sll $t7, $t9, 8 -/* 00AD0 80AD3780 030F7025 */ or $t6, $t8, $t7 ## $t6 = FB000008 -/* 00AD4 80AD3784 01CCC825 */ or $t9, $t6, $t4 ## $t9 = FF004CC8 -/* 00AD8 80AD3788 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -.L80AD378C: -/* 00ADC 80AD378C C7AA0050 */ lwc1 $f10, 0x0050($sp) -/* 00AE0 80AD3790 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 00AE4 80AD3794 C7A60058 */ lwc1 $f6, 0x0058($sp) -/* 00AE8 80AD3798 4600540D */ trunc.w.s $f16, $f10 -/* 00AEC 80AD379C 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 00AF0 80AD37A0 AFAE001C */ sw $t6, 0x001C($sp) -/* 00AF4 80AD37A4 4600910D */ trunc.w.s $f4, $f18 -/* 00AF8 80AD37A8 44058000 */ mfc1 $a1, $f16 -/* 00AFC 80AD37AC 25040228 */ addiu $a0, $t0, 0x0228 ## $a0 = 00000228 -/* 00B00 80AD37B0 4600320D */ trunc.w.s $f8, $f6 -/* 00B04 80AD37B4 44062000 */ mfc1 $a2, $f4 -/* 00B08 80AD37B8 00052C00 */ sll $a1, $a1, 16 -/* 00B0C 80AD37BC 00052C03 */ sra $a1, $a1, 16 -/* 00B10 80AD37C0 44074000 */ mfc1 $a3, $f8 -/* 00B14 80AD37C4 00063400 */ sll $a2, $a2, 16 -/* 00B18 80AD37C8 00063403 */ sra $a2, $a2, 16 -/* 00B1C 80AD37CC 00073C00 */ sll $a3, $a3, 16 -/* 00B20 80AD37D0 00073C03 */ sra $a3, $a3, 16 -/* 00B24 80AD37D4 AFA90010 */ sw $t1, 0x0010($sp) -/* 00B28 80AD37D8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00B2C 80AD37DC 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 00B30 80AD37E0 AFAB0018 */ sw $t3, 0x0018($sp) -.L80AD37E4: -/* 00B34 80AD37E4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B38 80AD37E8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00B3C 80AD37EC 03E00008 */ jr $ra -/* 00B40 80AD37F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s deleted file mode 100644 index 3e598b5c54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel EnPoField_Destroy -/* 00208 80AD3D08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0020C 80AD3D0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00210 80AD3D10 AFA5001C */ sw $a1, 0x001C($sp) -/* 00214 80AD3D14 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00218 80AD3D18 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0021C 80AD3D1C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00220 80AD3D20 11C1000D */ beq $t6, $at, .L80AD3D58 -/* 00224 80AD3D24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00228 80AD3D28 8CE60230 */ lw $a2, 0x0230($a3) ## 00000230 -/* 0022C 80AD3D2C AFA70018 */ sw $a3, 0x0018($sp) -/* 00230 80AD3D30 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00234 80AD3D34 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 00238 80AD3D38 8FA50018 */ lw $a1, 0x0018($sp) -/* 0023C 80AD3D3C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00240 80AD3D40 0C0170EB */ jal Collider_DestroyCylinder - -/* 00244 80AD3D44 24A50290 */ addiu $a1, $a1, 0x0290 ## $a1 = 00000290 -/* 00248 80AD3D48 8FA50018 */ lw $a1, 0x0018($sp) -/* 0024C 80AD3D4C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00250 80AD3D50 0C0170EB */ jal Collider_DestroyCylinder - -/* 00254 80AD3D54 24A50244 */ addiu $a1, $a1, 0x0244 ## $a1 = 00000244 -.L80AD3D58: -/* 00258 80AD3D58 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0025C 80AD3D5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00260 80AD3D60 03E00008 */ jr $ra -/* 00264 80AD3D64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s deleted file mode 100644 index 8a0854c60c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s +++ /dev/null @@ -1,215 +0,0 @@ -.rdata -glabel D_80AD71B0 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD71C4 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD71D8 - .asciz "../z_en_po_field.c" - .balign 4 - -.text -glabel EnPoField_Draw -/* 02DE4 80AD68E4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 02DE8 80AD68E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02DEC 80AD68EC AFB20030 */ sw $s2, 0x0030($sp) -/* 02DF0 80AD68F0 AFB1002C */ sw $s1, 0x002C($sp) -/* 02DF4 80AD68F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02DF8 80AD68F8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 02DFC 80AD68FC 8C890190 */ lw $t1, 0x0190($a0) ## 00000190 -/* 02E00 80AD6900 3C1880AD */ lui $t8, %hi(D_80AD712C) ## $t8 = 80AD0000 -/* 02E04 80AD6904 3C1980AD */ lui $t9, %hi(func_80AD4664) ## $t9 = 80AD0000 -/* 02E08 80AD6908 2718712C */ addiu $t8, $t8, %lo(D_80AD712C) ## $t8 = 80AD712C -/* 02E0C 80AD690C 27394664 */ addiu $t9, $t9, %lo(func_80AD4664) ## $t9 = 80AD4664 -/* 02E10 80AD6910 000E7900 */ sll $t7, $t6, 4 -/* 02E14 80AD6914 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 02E18 80AD6918 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 02E1C 80AD691C 132900AC */ beq $t9, $t1, .L80AD6BD0 -/* 02E20 80AD6920 01F84021 */ addu $t0, $t7, $t8 -/* 02E24 80AD6924 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 02E28 80AD6928 3C0680AD */ lui $a2, %hi(D_80AD71B0) ## $a2 = 80AD0000 -/* 02E2C 80AD692C 24C671B0 */ addiu $a2, $a2, %lo(D_80AD71B0) ## $a2 = 80AD71B0 -/* 02E30 80AD6930 AFA80078 */ sw $t0, 0x0078($sp) -/* 02E34 80AD6934 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 02E38 80AD6938 240707B8 */ addiu $a3, $zero, 0x07B8 ## $a3 = 000007B8 -/* 02E3C 80AD693C 0C031AB1 */ jal Graph_OpenDisps -/* 02E40 80AD6940 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02E44 80AD6944 0C024F46 */ jal func_80093D18 -/* 02E48 80AD6948 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02E4C 80AD694C 0C024F61 */ jal func_80093D84 -/* 02E50 80AD6950 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02E54 80AD6954 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02E58 80AD6958 8FA80078 */ lw $t0, 0x0078($sp) -/* 02E5C 80AD695C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 02E60 80AD6960 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 02E64 80AD6964 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 02E68 80AD6968 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 02E6C 80AD696C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 02E70 80AD6970 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02E74 80AD6974 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 02E78 80AD6978 91070008 */ lbu $a3, 0x0008($t0) ## 00000008 -/* 02E7C 80AD697C 91060007 */ lbu $a2, 0x0007($t0) ## 00000007 -/* 02E80 80AD6980 91050006 */ lbu $a1, 0x0006($t0) ## 00000006 -/* 02E84 80AD6984 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02E88 80AD6988 0C025474 */ jal Gfx_EnvColor -/* 02E8C 80AD698C AFA20060 */ sw $v0, 0x0060($sp) -/* 02E90 80AD6990 8FA30060 */ lw $v1, 0x0060($sp) -/* 02E94 80AD6994 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 02E98 80AD6998 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02E9C 80AD699C 92220217 */ lbu $v0, 0x0217($s1) ## 00000217 -/* 02EA0 80AD69A0 50410004 */ beql $v0, $at, .L80AD69B4 -/* 02EA4 80AD69A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02EA8 80AD69A8 54400029 */ bnel $v0, $zero, .L80AD6A50 -/* 02EAC 80AD69AC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02EB0 80AD69B0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -.L80AD69B4: -/* 02EB4 80AD69B4 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 02EB8 80AD69B8 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 02EBC 80AD69BC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02EC0 80AD69C0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 02EC4 80AD69C4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 02EC8 80AD69C8 922F0217 */ lbu $t7, 0x0217($s1) ## 00000217 -/* 02ECC 80AD69CC 92270216 */ lbu $a3, 0x0216($s1) ## 00000216 -/* 02ED0 80AD69D0 92260215 */ lbu $a2, 0x0215($s1) ## 00000215 -/* 02ED4 80AD69D4 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 -/* 02ED8 80AD69D8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02EDC 80AD69DC AFA2005C */ sw $v0, 0x005C($sp) -/* 02EE0 80AD69E0 0C025474 */ jal Gfx_EnvColor -/* 02EE4 80AD69E4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02EE8 80AD69E8 8FA3005C */ lw $v1, 0x005C($sp) -/* 02EEC 80AD69EC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 02EF0 80AD69F0 3C098011 */ lui $t1, %hi(D_80116280+0x10) -/* 02EF4 80AD69F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02EF8 80AD69F8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02EFC 80AD69FC 25296290 */ addiu $t1, %lo(D_80116280+0x10) -/* 02F00 80AD6A00 37390030 */ ori $t9, $t9, 0x0030 ## $t9 = DB060030 -/* 02F04 80AD6A04 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02F08 80AD6A08 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 02F0C 80AD6A0C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02F10 80AD6A10 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02F14 80AD6A14 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 02F18 80AD6A18 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 02F1C 80AD6A1C 3C0A80AD */ lui $t2, %hi(func_80AD66D0) ## $t2 = 80AD0000 -/* 02F20 80AD6A20 254A66D0 */ addiu $t2, $t2, %lo(func_80AD66D0) ## $t2 = 80AD66D0 -/* 02F24 80AD6A24 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02F28 80AD6A28 AFB10014 */ sw $s1, 0x0014($sp) -/* 02F2C 80AD6A2C 8E0B02C0 */ lw $t3, 0x02C0($s0) ## 000002C0 -/* 02F30 80AD6A30 3C0780AD */ lui $a3, %hi(func_80AD65C8) ## $a3 = 80AD0000 -/* 02F34 80AD6A34 24E765C8 */ addiu $a3, $a3, %lo(func_80AD65C8) ## $a3 = 80AD65C8 -/* 02F38 80AD6A38 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02F3C 80AD6A3C 0C0288A2 */ jal SkelAnime_Draw -/* 02F40 80AD6A40 AFAB0018 */ sw $t3, 0x0018($sp) -/* 02F44 80AD6A44 10000027 */ beq $zero, $zero, .L80AD6AE4 -/* 02F48 80AD6A48 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 02F4C 80AD6A4C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L80AD6A50: -/* 02F50 80AD6A50 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 02F54 80AD6A54 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 02F58 80AD6A58 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 02F5C 80AD6A5C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 02F60 80AD6A60 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 02F64 80AD6A64 922E0217 */ lbu $t6, 0x0217($s1) ## 00000217 -/* 02F68 80AD6A68 92270216 */ lbu $a3, 0x0216($s1) ## 00000216 -/* 02F6C 80AD6A6C 92260215 */ lbu $a2, 0x0215($s1) ## 00000215 -/* 02F70 80AD6A70 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 -/* 02F74 80AD6A74 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02F78 80AD6A78 AFA20054 */ sw $v0, 0x0054($sp) -/* 02F7C 80AD6A7C 0C025474 */ jal Gfx_EnvColor -/* 02F80 80AD6A80 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02F84 80AD6A84 8FA30054 */ lw $v1, 0x0054($sp) -/* 02F88 80AD6A88 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 02F8C 80AD6A8C 3C198011 */ lui $t9, %hi(D_80116280) -/* 02F90 80AD6A90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02F94 80AD6A94 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02F98 80AD6A98 27396280 */ addiu $t9, %lo(D_80116280) -/* 02F9C 80AD6A9C 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 -/* 02FA0 80AD6AA0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02FA4 80AD6AA4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 02FA8 80AD6AA8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 02FAC 80AD6AAC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02FB0 80AD6AB0 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 02FB4 80AD6AB4 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 02FB8 80AD6AB8 3C0980AD */ lui $t1, %hi(func_80AD66D0) ## $t1 = 80AD0000 -/* 02FBC 80AD6ABC 252966D0 */ addiu $t1, $t1, %lo(func_80AD66D0) ## $t1 = 80AD66D0 -/* 02FC0 80AD6AC0 AFA90010 */ sw $t1, 0x0010($sp) -/* 02FC4 80AD6AC4 AFB10014 */ sw $s1, 0x0014($sp) -/* 02FC8 80AD6AC8 8E0A02D0 */ lw $t2, 0x02D0($s0) ## 000002D0 -/* 02FCC 80AD6ACC 3C0780AD */ lui $a3, %hi(func_80AD65C8) ## $a3 = 80AD0000 -/* 02FD0 80AD6AD0 24E765C8 */ addiu $a3, $a3, %lo(func_80AD65C8) ## $a3 = 80AD65C8 -/* 02FD4 80AD6AD4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02FD8 80AD6AD8 0C0288A2 */ jal SkelAnime_Draw -/* 02FDC 80AD6ADC AFAA0018 */ sw $t2, 0x0018($sp) -/* 02FE0 80AD6AE0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -.L80AD6AE4: -/* 02FE4 80AD6AE4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02FE8 80AD6AE8 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 -/* 02FEC 80AD6AEC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 02FF0 80AD6AF0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 02FF4 80AD6AF4 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 02FF8 80AD6AF8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 02FFC 80AD6AFC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 03000 80AD6B00 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03004 80AD6B04 3C0480AD */ lui $a0, %hi(D_80AD7700) ## $a0 = 80AD0000 -/* 03008 80AD6B08 24847700 */ addiu $a0, $a0, %lo(D_80AD7700) ## $a0 = 80AD7700 -/* 0300C 80AD6B0C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03010 80AD6B10 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 03014 80AD6B14 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03018 80AD6B18 922A0219 */ lbu $t2, 0x0219($s1) ## 00000219 -/* 0301C 80AD6B1C 92380218 */ lbu $t8, 0x0218($s1) ## 00000218 -/* 03020 80AD6B20 922E021A */ lbu $t6, 0x021A($s1) ## 0000021A -/* 03024 80AD6B24 000A5C00 */ sll $t3, $t2, 16 -/* 03028 80AD6B28 0018CE00 */ sll $t9, $t8, 24 -/* 0302C 80AD6B2C 032B6025 */ or $t4, $t9, $t3 ## $t4 = 00000008 -/* 03030 80AD6B30 000E7A00 */ sll $t7, $t6, 8 -/* 03034 80AD6B34 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000008 -/* 03038 80AD6B38 370900FF */ ori $t1, $t8, 0x00FF ## $t1 = 000000FF -/* 0303C 80AD6B3C 0C03423F */ jal Matrix_Put -/* 03040 80AD6B40 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 03044 80AD6B44 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03048 80AD6B48 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 0304C 80AD6B4C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 03050 80AD6B50 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03054 80AD6B54 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 03058 80AD6B58 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0305C 80AD6B5C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 03060 80AD6B60 3C0580AD */ lui $a1, %hi(D_80AD71C4) ## $a1 = 80AD0000 -/* 03064 80AD6B64 24A571C4 */ addiu $a1, $a1, %lo(D_80AD71C4) ## $a1 = 80AD71C4 -/* 03068 80AD6B68 240607F1 */ addiu $a2, $zero, 0x07F1 ## $a2 = 000007F1 -/* 0306C 80AD6B6C 0C0346A2 */ jal Matrix_NewMtx -/* 03070 80AD6B70 AFA20044 */ sw $v0, 0x0044($sp) -/* 03074 80AD6B74 8FA30044 */ lw $v1, 0x0044($sp) -/* 03078 80AD6B78 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 0307C 80AD6B7C 25AD4BA0 */ addiu $t5, $t5, 0x4BA0 ## $t5 = 06004BA0 -/* 03080 80AD6B80 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03084 80AD6B84 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03088 80AD6B88 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 -/* 0308C 80AD6B8C 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 03090 80AD6B90 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03094 80AD6B94 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 03098 80AD6B98 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 0309C 80AD6B9C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 030A0 80AD6BA0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 030A4 80AD6BA4 258C4CC0 */ addiu $t4, $t4, 0x4CC0 ## $t4 = 06004CC0 -/* 030A8 80AD6BA8 3C0680AD */ lui $a2, %hi(D_80AD71D8) ## $a2 = 80AD0000 -/* 030AC 80AD6BAC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 030B0 80AD6BB0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 030B4 80AD6BB4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 030B8 80AD6BB8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 030BC 80AD6BBC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 030C0 80AD6BC0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 030C4 80AD6BC4 24C671D8 */ addiu $a2, $a2, %lo(D_80AD71D8) ## $a2 = 80AD71D8 -/* 030C8 80AD6BC8 0C031AD5 */ jal Graph_CloseDisps -/* 030CC 80AD6BCC 240707F7 */ addiu $a3, $zero, 0x07F7 ## $a3 = 000007F7 -.L80AD6BD0: -/* 030D0 80AD6BD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 030D4 80AD6BD4 0C2B57A3 */ jal func_80AD5E8C -/* 030D8 80AD6BD8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 030DC 80AD6BDC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 030E0 80AD6BE0 8FB00028 */ lw $s0, 0x0028($sp) -/* 030E4 80AD6BE4 8FB1002C */ lw $s1, 0x002C($sp) -/* 030E8 80AD6BE8 8FB20030 */ lw $s2, 0x0030($sp) -/* 030EC 80AD6BEC 03E00008 */ jr $ra -/* 030F0 80AD6BF0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s deleted file mode 100644 index 6cf8f7deab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s +++ /dev/null @@ -1,143 +0,0 @@ -glabel EnPoField_Init -/* 00000 80AD3B00 3C0680AD */ lui $a2, %hi(D_80AD7100) ## $a2 = 80AD0000 -/* 00004 80AD3B04 24C67100 */ addiu $a2, $a2, %lo(D_80AD7100) ## $a2 = 80AD7100 -/* 00008 80AD3B08 8CC30000 */ lw $v1, 0x0000($a2) ## 80AD7100 -/* 0000C 80AD3B0C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00010 80AD3B10 AFB10028 */ sw $s1, 0x0028($sp) -/* 00014 80AD3B14 AFB00024 */ sw $s0, 0x0024($sp) -/* 00018 80AD3B18 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0001C 80AD3B1C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00020 80AD3B20 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00024 80AD3B24 1061001C */ beq $v1, $at, .L80AD3B98 -/* 00028 80AD3B28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0002C 80AD3B2C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00030 80AD3B30 00037080 */ sll $t6, $v1, 2 -/* 00034 80AD3B34 01C37023 */ subu $t6, $t6, $v1 -/* 00038 80AD3B38 4600218D */ trunc.w.s $f6, $f4 -/* 0003C 80AD3B3C 3C0F80AD */ lui $t7, %hi(D_80AD76B0) ## $t7 = 80AD0000 -/* 00040 80AD3B40 25EF76B0 */ addiu $t7, $t7, %lo(D_80AD76B0) ## $t7 = 80AD76B0 -/* 00044 80AD3B44 000E7040 */ sll $t6, $t6, 1 -/* 00048 80AD3B48 44193000 */ mfc1 $t9, $f6 -/* 0004C 80AD3B4C 01CF1021 */ addu $v0, $t6, $t7 -/* 00050 80AD3B50 3C0180AD */ lui $at, %hi(D_80AD76F0) ## $at = 80AD0000 -/* 00054 80AD3B54 A4590000 */ sh $t9, 0x0000($v0) ## 00000000 -/* 00058 80AD3B58 C4880028 */ lwc1 $f8, 0x0028($a0) ## 00000028 -/* 0005C 80AD3B5C 00230821 */ addu $at, $at, $v1 -/* 00060 80AD3B60 246E0001 */ addiu $t6, $v1, 0x0001 ## $t6 = 00000001 -/* 00064 80AD3B64 4600428D */ trunc.w.s $f10, $f8 -/* 00068 80AD3B68 01C01825 */ or $v1, $t6, $zero ## $v1 = 00000001 -/* 0006C 80AD3B6C 44095000 */ mfc1 $t1, $f10 -/* 00070 80AD3B70 00000000 */ nop -/* 00074 80AD3B74 A4490002 */ sh $t1, 0x0002($v0) ## 00000002 -/* 00078 80AD3B78 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 0007C 80AD3B7C 4600848D */ trunc.w.s $f18, $f16 -/* 00080 80AD3B80 440B9000 */ mfc1 $t3, $f18 -/* 00084 80AD3B84 00000000 */ nop -/* 00088 80AD3B88 A44B0004 */ sh $t3, 0x0004($v0) ## 00000004 -/* 0008C 80AD3B8C 848D001C */ lh $t5, 0x001C($a0) ## 0000001C -/* 00090 80AD3B90 A02D76F0 */ sb $t5, %lo(D_80AD76F0)($at) -/* 00094 80AD3B94 ACCE0000 */ sw $t6, 0x0000($a2) ## 80AD7100 -.L80AD3B98: -/* 00098 80AD3B98 28610002 */ slti $at, $v1, 0x0002 -/* 0009C 80AD3B9C 14200007 */ bne $at, $zero, .L80AD3BBC -/* 000A0 80AD3BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A4 80AD3BA4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 000A8 80AD3BA8 A60F001C */ sh $t7, 0x001C($s0) ## 0000001C -/* 000AC 80AD3BAC 0C00B55C */ jal Actor_Kill - -/* 000B0 80AD3BB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000B4 80AD3BB4 10000050 */ beq $zero, $zero, .L80AD3CF8 -/* 000B8 80AD3BB8 8FBF002C */ lw $ra, 0x002C($sp) -.L80AD3BBC: -/* 000BC 80AD3BBC 3C0580AD */ lui $a1, %hi(D_80AD7110) ## $a1 = 80AD0000 -/* 000C0 80AD3BC0 0C01E037 */ jal Actor_ProcessInitChain - -/* 000C4 80AD3BC4 24A57110 */ addiu $a1, $a1, %lo(D_80AD7110) ## $a1 = 80AD7110 -/* 000C8 80AD3BC8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 000CC 80AD3BCC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 000D0 80AD3BD0 2618019C */ addiu $t8, $s0, 0x019C ## $t8 = 0000019C -/* 000D4 80AD3BD4 261901D8 */ addiu $t9, $s0, 0x01D8 ## $t9 = 000001D8 -/* 000D8 80AD3BD8 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 000DC 80AD3BDC AFA80018 */ sw $t0, 0x0018($sp) -/* 000E0 80AD3BE0 AFB90014 */ sw $t9, 0x0014($sp) -/* 000E4 80AD3BE4 AFB80010 */ sw $t8, 0x0010($sp) -/* 000E8 80AD3BE8 24E70924 */ addiu $a3, $a3, 0x0924 ## $a3 = 06000924 -/* 000EC 80AD3BEC 24C66A30 */ addiu $a2, $a2, 0x6A30 ## $a2 = 06006A30 -/* 000F0 80AD3BF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000F4 80AD3BF4 0C02915F */ jal SkelAnime_Init - -/* 000F8 80AD3BF8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 000FC 80AD3BFC 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 -/* 00100 80AD3C00 AFA50034 */ sw $a1, 0x0034($sp) -/* 00104 80AD3C04 0C0170D9 */ jal Collider_InitCylinder - -/* 00108 80AD3C08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0010C 80AD3C0C 3C0780AD */ lui $a3, %hi(D_80AD7080) ## $a3 = 80AD0000 -/* 00110 80AD3C10 8FA50034 */ lw $a1, 0x0034($sp) -/* 00114 80AD3C14 24E77080 */ addiu $a3, $a3, %lo(D_80AD7080) ## $a3 = 80AD7080 -/* 00118 80AD3C18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0011C 80AD3C1C 0C01712B */ jal Collider_SetCylinder - -/* 00120 80AD3C20 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00124 80AD3C24 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 00128 80AD3C28 AFA50034 */ sw $a1, 0x0034($sp) -/* 0012C 80AD3C2C 0C0170D9 */ jal Collider_InitCylinder - -/* 00130 80AD3C30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00134 80AD3C34 3C0780AD */ lui $a3, %hi(D_80AD70AC) ## $a3 = 80AD0000 -/* 00138 80AD3C38 8FA50034 */ lw $a1, 0x0034($sp) -/* 0013C 80AD3C3C 24E770AC */ addiu $a3, $a3, %lo(D_80AD70AC) ## $a3 = 80AD70AC -/* 00140 80AD3C40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00144 80AD3C44 0C01712B */ jal Collider_SetCylinder - -/* 00148 80AD3C48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0014C 80AD3C4C 3C0580AD */ lui $a1, %hi(D_80AD70E0) ## $a1 = 80AD0000 -/* 00150 80AD3C50 3C0680AD */ lui $a2, %hi(D_80AD70D8) ## $a2 = 80AD0000 -/* 00154 80AD3C54 24C670D8 */ addiu $a2, $a2, %lo(D_80AD70D8) ## $a2 = 80AD70D8 -/* 00158 80AD3C58 24A570E0 */ addiu $a1, $a1, %lo(D_80AD70E0) ## $a1 = 80AD70E0 -/* 0015C 80AD3C5C 0C0187B5 */ jal func_80061ED4 -/* 00160 80AD3C60 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00164 80AD3C64 26060234 */ addiu $a2, $s0, 0x0234 ## $a2 = 00000234 -/* 00168 80AD3C68 AFA60034 */ sw $a2, 0x0034($sp) -/* 0016C 80AD3C6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00170 80AD3C70 0C01E9D9 */ jal LightContext_InsertLight - -/* 00174 80AD3C74 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 00178 80AD3C78 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 0017C 80AD3C7C C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00180 80AD3C80 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 00184 80AD3C84 4600218D */ trunc.w.s $f6, $f4 -/* 00188 80AD3C88 AE020230 */ sw $v0, 0x0230($s0) ## 00000230 -/* 0018C 80AD3C8C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00190 80AD3C90 4600428D */ trunc.w.s $f10, $f8 -/* 00194 80AD3C94 44053000 */ mfc1 $a1, $f6 -/* 00198 80AD3C98 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 0019C 80AD3C9C 4600848D */ trunc.w.s $f18, $f16 -/* 001A0 80AD3CA0 44065000 */ mfc1 $a2, $f10 -/* 001A4 80AD3CA4 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 001A8 80AD3CA8 00052C00 */ sll $a1, $a1, 16 -/* 001AC 80AD3CAC 44079000 */ mfc1 $a3, $f18 -/* 001B0 80AD3CB0 00063400 */ sll $a2, $a2, 16 -/* 001B4 80AD3CB4 00063403 */ sra $a2, $a2, 16 -/* 001B8 80AD3CB8 00073C00 */ sll $a3, $a3, 16 -/* 001BC 80AD3CBC 00073C03 */ sra $a3, $a3, 16 -/* 001C0 80AD3CC0 00052C03 */ sra $a1, $a1, 16 -/* 001C4 80AD3CC4 AFAE0018 */ sw $t6, 0x0018($sp) -/* 001C8 80AD3CC8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 001CC 80AD3CCC AFAC0010 */ sw $t4, 0x0010($sp) -/* 001D0 80AD3CD0 AFA0001C */ sw $zero, 0x001C($sp) -/* 001D4 80AD3CD4 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 001D8 80AD3CD8 8FA40034 */ lw $a0, 0x0034($sp) -/* 001DC 80AD3CDC 3C0F8003 */ lui $t7, %hi(ActorShadow_DrawFunc_Circle) -/* 001E0 80AD3CE0 25EFB5EC */ addiu $t7, %lo(ActorShadow_DrawFunc_Circle) -/* 001E4 80AD3CE4 AE0F00C0 */ sw $t7, 0x00C0($s0) ## 000000C0 -/* 001E8 80AD3CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001EC 80AD3CEC 0C2B4F5A */ jal func_80AD3D68 -/* 001F0 80AD3CF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001F4 80AD3CF4 8FBF002C */ lw $ra, 0x002C($sp) -.L80AD3CF8: -/* 001F8 80AD3CF8 8FB00024 */ lw $s0, 0x0024($sp) -/* 001FC 80AD3CFC 8FB10028 */ lw $s1, 0x0028($sp) -/* 00200 80AD3D00 03E00008 */ jr $ra -/* 00204 80AD3D04 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s deleted file mode 100644 index b675507b7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel EnPoField_Update -/* 029A4 80AD64A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 029A8 80AD64A8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 029AC 80AD64AC AFB10020 */ sw $s1, 0x0020($sp) -/* 029B0 80AD64B0 AFB0001C */ sw $s0, 0x001C($sp) -/* 029B4 80AD64B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029B8 80AD64B8 0C2B571D */ jal func_80AD5C74 -/* 029BC 80AD64BC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 029C0 80AD64C0 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 029C4 80AD64C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029C8 80AD64C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 029CC 80AD64CC 0320F809 */ jalr $ra, $t9 -/* 029D0 80AD64D0 00000000 */ nop -/* 029D4 80AD64D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029D8 80AD64D8 0C2B5758 */ jal func_80AD5D60 -/* 029DC 80AD64DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 029E0 80AD64E0 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 029E4 80AD64E4 3C0E80AD */ lui $t6, %hi(func_80AD4CA4) ## $t6 = 80AD0000 -/* 029E8 80AD64E8 25CE4CA4 */ addiu $t6, $t6, %lo(func_80AD4CA4) ## $t6 = 80AD4CA4 -/* 029EC 80AD64EC 11C20007 */ beq $t6, $v0, .L80AD650C -/* 029F0 80AD64F0 3C0F80AD */ lui $t7, %hi(func_80AD4E48) ## $t7 = 80AD0000 -/* 029F4 80AD64F4 25EF4E48 */ addiu $t7, $t7, %lo(func_80AD4E48) ## $t7 = 80AD4E48 -/* 029F8 80AD64F8 11E20004 */ beq $t7, $v0, .L80AD650C -/* 029FC 80AD64FC 3C1880AD */ lui $t8, %hi(func_80AD48CC) ## $t8 = 80AD0000 -/* 02A00 80AD6500 271848CC */ addiu $t8, $t8, %lo(func_80AD48CC) ## $t8 = 80AD48CC -/* 02A04 80AD6504 17020004 */ bne $t8, $v0, .L80AD6518 -/* 02A08 80AD6508 00000000 */ nop -.L80AD650C: -/* 02A0C 80AD650C 0C00B638 */ jal Actor_MoveForward - -/* 02A10 80AD6510 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A14 80AD6514 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -.L80AD6518: -/* 02A18 80AD6518 3C0880AD */ lui $t0, %hi(func_80AD4664) ## $t0 = 80AD0000 -/* 02A1C 80AD651C 25084664 */ addiu $t0, $t0, %lo(func_80AD4664) ## $t0 = 80AD4664 -/* 02A20 80AD6520 11020024 */ beq $t0, $v0, .L80AD65B4 -/* 02A24 80AD6524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A28 80AD6528 0C00B56E */ jal Actor_SetHeight - -/* 02A2C 80AD652C 3C054228 */ lui $a1, 0x4228 ## $a1 = 42280000 -/* 02A30 80AD6530 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 02A34 80AD6534 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 02A38 80AD6538 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 02A3C 80AD653C AFA90014 */ sw $t1, 0x0014($sp) -/* 02A40 80AD6540 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02A44 80AD6544 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02A48 80AD6548 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 02A4C 80AD654C 3C0741D8 */ lui $a3, 0x41D8 ## $a3 = 41D80000 -/* 02A50 80AD6550 0C00B92D */ jal func_8002E4B4 -/* 02A54 80AD6554 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02A58 80AD6558 0C2B5867 */ jal func_80AD619C -/* 02A5C 80AD655C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A60 80AD6560 0C2B58CC */ jal func_80AD6330 -/* 02A64 80AD6564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A68 80AD6568 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 -/* 02A6C 80AD656C AFA50028 */ sw $a1, 0x0028($sp) -/* 02A70 80AD6570 0C0189B7 */ jal Collider_CylinderUpdate - -/* 02A74 80AD6574 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A78 80AD6578 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02A7C 80AD657C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02A80 80AD6580 02212821 */ addu $a1, $s1, $at -/* 02A84 80AD6584 AFA5002C */ sw $a1, 0x002C($sp) -/* 02A88 80AD6588 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02A8C 80AD658C 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02A90 80AD6590 8FA60028 */ lw $a2, 0x0028($sp) -/* 02A94 80AD6594 920A0255 */ lbu $t2, 0x0255($s0) ## 00000255 -/* 02A98 80AD6598 8FA5002C */ lw $a1, 0x002C($sp) -/* 02A9C 80AD659C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02AA0 80AD65A0 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 02AA4 80AD65A4 51600004 */ beql $t3, $zero, .L80AD65B8 -/* 02AA8 80AD65A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02AAC 80AD65AC 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 02AB0 80AD65B0 8FA60028 */ lw $a2, 0x0028($sp) -.L80AD65B4: -/* 02AB4 80AD65B4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD65B8: -/* 02AB8 80AD65B8 8FB0001C */ lw $s0, 0x001C($sp) -/* 02ABC 80AD65BC 8FB10020 */ lw $s1, 0x0020($sp) -/* 02AC0 80AD65C0 03E00008 */ jr $ra -/* 02AC4 80AD65C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s deleted file mode 100644 index 12f173054d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80AD3D68 -/* 00268 80AD3D68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0026C 80AD3D6C AFB00020 */ sw $s0, 0x0020($sp) -/* 00270 80AD3D70 3C0E80AD */ lui $t6, %hi(EnPoField_Update) ## $t6 = 80AD0000 -/* 00274 80AD3D74 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00278 80AD3D78 AFA5002C */ sw $a1, 0x002C($sp) -/* 0027C 80AD3D7C 25CE64A4 */ addiu $t6, $t6, %lo(EnPoField_Update) ## $t6 = 80AD64A4 -/* 00280 80AD3D80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00284 80AD3D84 AC8E0130 */ sw $t6, 0x0130($a0) ## 00000130 -/* 00288 80AD3D88 8FA4002C */ lw $a0, 0x002C($sp) -/* 0028C 80AD3D8C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00290 80AD3D90 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00294 80AD3D94 0C00CDD2 */ jal Actor_ChangeType - -/* 00298 80AD3D98 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 0029C 80AD3D9C A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 002A0 80AD3DA0 AFA00010 */ sw $zero, 0x0010($sp) -/* 002A4 80AD3DA4 26040234 */ addiu $a0, $s0, 0x0234 ## $a0 = 00000234 -/* 002A8 80AD3DA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002AC 80AD3DAC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 002B0 80AD3DB0 0C01E796 */ jal Lights_PointSetColorAndRadius - -/* 002B4 80AD3DB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002B8 80AD3DB8 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 -/* 002BC 80AD3DBC A6180196 */ sh $t8, 0x0196($s0) ## 00000196 -/* 002C0 80AD3DC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002C4 80AD3DC4 0C00B58B */ jal Actor_SetScale - -/* 002C8 80AD3DC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 002CC 80AD3DCC 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 002D0 80AD3DD0 92090255 */ lbu $t1, 0x0255($s0) ## 00000255 -/* 002D4 80AD3DD4 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 002D8 80AD3DD8 3421FFFE */ ori $at, $at, 0xFFFE ## $at = FFFEFFFE -/* 002DC 80AD3DDC 240B0039 */ addiu $t3, $zero, 0x0039 ## $t3 = 00000039 -/* 002E0 80AD3DE0 03214024 */ and $t0, $t9, $at -/* 002E4 80AD3DE4 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 -/* 002E8 80AD3DE8 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 002EC 80AD3DEC A20A0255 */ sb $t2, 0x0255($s0) ## 00000255 -/* 002F0 80AD3DF0 A20B0256 */ sb $t3, 0x0256($s0) ## 00000256 -/* 002F4 80AD3DF4 3C0C80AD */ lui $t4, %hi(D_80AD70D8) ## $t4 = 80AD0000 -/* 002F8 80AD3DF8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 002FC 80AD3DFC 918C70D8 */ lbu $t4, %lo(D_80AD70D8)($t4) -/* 00300 80AD3E00 3C0D80AD */ lui $t5, %hi(func_80AD4664) ## $t5 = 80AD0000 -/* 00304 80AD3E04 25AD4664 */ addiu $t5, $t5, %lo(func_80AD4664) ## $t5 = 80AD4664 -/* 00308 80AD3E08 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 0030C 80AD3E0C A20C00AF */ sb $t4, 0x00AF($s0) ## 000000AF -/* 00310 80AD3E10 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 00314 80AD3E14 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00318 80AD3E18 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0031C 80AD3E1C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00320 80AD3E20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00324 80AD3E24 03E00008 */ jr $ra -/* 00328 80AD3E28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s deleted file mode 100644 index a153c19274..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s +++ /dev/null @@ -1,83 +0,0 @@ -.late_rodata -glabel D_80AD723C - .word 0x3C656042 -glabel D_80AD7240 - .float 0.01 - -.text -glabel func_80AD3E2C -/* 0032C 80AD3E2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 80AD3E30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00334 80AD3E34 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00338 80AD3E38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0033C 80AD3E3C 24A50F9C */ addiu $a1, $a1, 0x0F9C ## $a1 = 06000F9C -/* 00340 80AD3E40 AFA60018 */ sw $a2, 0x0018($sp) -/* 00344 80AD3E44 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00348 80AD3E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0034C 80AD3E4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00350 80AD3E50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00354 80AD3E54 3C0E80AD */ lui $t6, %hi(EnPoField_Draw) ## $t6 = 80AD0000 -/* 00358 80AD3E58 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 0035C 80AD3E5C 25CE68E4 */ addiu $t6, $t6, %lo(EnPoField_Draw) ## $t6 = 80AD68E4 -/* 00360 80AD3E60 240F00D2 */ addiu $t7, $zero, 0x00D2 ## $t7 = 000000D2 -/* 00364 80AD3E64 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 00368 80AD3E68 AC8E0134 */ sw $t6, 0x0134($a0) ## 00000134 -/* 0036C 80AD3E6C A0820214 */ sb $v0, 0x0214($a0) ## 00000214 -/* 00370 80AD3E70 A0820215 */ sb $v0, 0x0215($a0) ## 00000215 -/* 00374 80AD3E74 A08F0216 */ sb $t7, 0x0216($a0) ## 00000216 -/* 00378 80AD3E78 A0800217 */ sb $zero, 0x0217($a0) ## 00000217 -/* 0037C 80AD3E7C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00380 80AD3E80 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00384 80AD3E84 E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 00388 80AD3E88 8FA60018 */ lw $a2, 0x0018($sp) -/* 0038C 80AD3E8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00390 80AD3E90 3C0F80AD */ lui $t7, %hi(func_80AD48CC) ## $t7 = 80AD0000 -/* 00394 80AD3E94 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C -/* 00398 80AD3E98 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 -/* 0039C 80AD3E9C 25EF48CC */ addiu $t7, $t7, %lo(func_80AD48CC) ## $t7 = 80AD48CC -/* 003A0 80AD3EA0 17010013 */ bne $t8, $at, .L80AD3EF0 -/* 003A4 80AD3EA4 E4C6000C */ swc1 $f6, 0x000C($a2) ## 0000000C -/* 003A8 80AD3EA8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 003AC 80AD3EAC 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 003B0 80AD3EB0 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 003B4 80AD3EB4 44815000 */ mtc1 $at, $f10 ## $f10 = 45.00 -/* 003B8 80AD3EB8 24190023 */ addiu $t9, $zero, 0x0023 ## $t9 = 00000023 -/* 003BC 80AD3EBC 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 003C0 80AD3EC0 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 003C4 80AD3EC4 A4D90284 */ sh $t9, 0x0284($a2) ## 00000284 -/* 003C8 80AD3EC8 A4C80286 */ sh $t0, 0x0286($a2) ## 00000286 -/* 003CC 80AD3ECC A4C90288 */ sh $t1, 0x0288($a2) ## 00000288 -/* 003D0 80AD3ED0 3C0180AD */ lui $at, %hi(D_80AD723C) ## $at = 80AD0000 -/* 003D4 80AD3ED4 E4C80068 */ swc1 $f8, 0x0068($a2) ## 00000068 -/* 003D8 80AD3ED8 E4CA00C4 */ swc1 $f10, 0x00C4($a2) ## 000000C4 -/* 003DC 80AD3EDC C430723C */ lwc1 $f16, %lo(D_80AD723C)($at) -/* 003E0 80AD3EE0 240A005A */ addiu $t2, $zero, 0x005A ## $t2 = 0000005A -/* 003E4 80AD3EE4 A0CA0117 */ sb $t2, 0x0117($a2) ## 00000117 -/* 003E8 80AD3EE8 10000013 */ beq $zero, $zero, .L80AD3F38 -/* 003EC 80AD3EEC E4D0021C */ swc1 $f16, 0x021C($a2) ## 0000021C -.L80AD3EF0: -/* 003F0 80AD3EF0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 003F4 80AD3EF4 3C0280AD */ lui $v0, %hi(D_80AD7080) ## $v0 = 80AD0000 -/* 003F8 80AD3EF8 24427080 */ addiu $v0, $v0, %lo(D_80AD7080) ## $v0 = 80AD7080 -/* 003FC 80AD3EFC E4D20068 */ swc1 $f18, 0x0068($a2) ## 00000068 -/* 00400 80AD3F00 844B0020 */ lh $t3, 0x0020($v0) ## 80AD70A0 -/* 00404 80AD3F04 3C014214 */ lui $at, 0x4214 ## $at = 42140000 -/* 00408 80AD3F08 44812000 */ mtc1 $at, $f4 ## $f4 = 37.00 -/* 0040C 80AD3F0C A4CB0284 */ sh $t3, 0x0284($a2) ## 00000284 -/* 00410 80AD3F10 844C0022 */ lh $t4, 0x0022($v0) ## 80AD70A2 -/* 00414 80AD3F14 3C0180AD */ lui $at, %hi(D_80AD7240) ## $at = 80AD0000 -/* 00418 80AD3F18 240E005C */ addiu $t6, $zero, 0x005C ## $t6 = 0000005C -/* 0041C 80AD3F1C A4CC0286 */ sh $t4, 0x0286($a2) ## 00000286 -/* 00420 80AD3F20 844D0024 */ lh $t5, 0x0024($v0) ## 80AD70A4 -/* 00424 80AD3F24 E4C400C4 */ swc1 $f4, 0x00C4($a2) ## 000000C4 -/* 00428 80AD3F28 A4CD0288 */ sh $t5, 0x0288($a2) ## 00000288 -/* 0042C 80AD3F2C C4267240 */ lwc1 $f6, %lo(D_80AD7240)($at) -/* 00430 80AD3F30 A0CE0117 */ sb $t6, 0x0117($a2) ## 00000117 -/* 00434 80AD3F34 E4C6021C */ swc1 $f6, 0x021C($a2) ## 0000021C -.L80AD3F38: -/* 00438 80AD3F38 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0043C 80AD3F3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00440 80AD3F40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00444 80AD3F44 03E00008 */ jr $ra -/* 00448 80AD3F48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s deleted file mode 100644 index 6c77ddf21f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80AD3F4C -/* 0044C 80AD3F4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00450 80AD3F50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00454 80AD3F54 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 00458 80AD3F58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0045C 80AD3F5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00460 80AD3F60 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 -/* 00464 80AD3F64 AFA60020 */ sw $a2, 0x0020($sp) -/* 00468 80AD3F68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0046C 80AD3F6C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00470 80AD3F70 AFAE001C */ sw $t6, 0x001C($sp) -/* 00474 80AD3F74 8FA60020 */ lw $a2, 0x0020($sp) -/* 00478 80AD3F78 90CF0255 */ lbu $t7, 0x0255($a2) ## 00000255 -/* 0047C 80AD3F7C C4C40090 */ lwc1 $f4, 0x0090($a2) ## 00000090 -/* 00480 80AD3F80 24C40008 */ addiu $a0, $a2, 0x0008 ## $a0 = 00000008 -/* 00484 80AD3F84 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00488 80AD3F88 A0D80255 */ sb $t8, 0x0255($a2) ## 00000255 -/* 0048C 80AD3F8C E4C4021C */ swc1 $f4, 0x021C($a2) ## 0000021C -/* 00490 80AD3F90 8FA5001C */ lw $a1, 0x001C($sp) -/* 00494 80AD3F94 0C01DF90 */ jal Math_Vec3f_Copy - ## Vec3f_Copy -/* 00498 80AD3F98 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 0049C 80AD3F9C 8FA60020 */ lw $a2, 0x0020($sp) -/* 004A0 80AD3FA0 3C0880AD */ lui $t0, %hi(func_80AD4E48) ## $t0 = 80AD0000 -/* 004A4 80AD3FA4 25084E48 */ addiu $t0, $t0, %lo(func_80AD4E48) ## $t0 = 80AD4E48 -/* 004A8 80AD3FA8 8CC90190 */ lw $t1, 0x0190($a2) ## 00000190 -/* 004AC 80AD3FAC 84D9008A */ lh $t9, 0x008A($a2) ## 0000008A -/* 004B0 80AD3FB0 3C0E80AD */ lui $t6, %hi(func_80AD4A68) ## $t6 = 80AD0000 -/* 004B4 80AD3FB4 11090008 */ beq $t0, $t1, .L80AD3FD8 -/* 004B8 80AD3FB8 A4D90032 */ sh $t9, 0x0032($a2) ## 00000032 -/* 004BC 80AD3FBC 8CCA0004 */ lw $t2, 0x0004($a2) ## 00000004 -/* 004C0 80AD3FC0 240C0258 */ addiu $t4, $zero, 0x0258 ## $t4 = 00000258 -/* 004C4 80AD3FC4 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 004C8 80AD3FC8 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 004CC 80AD3FCC ACCB0004 */ sw $t3, 0x0004($a2) ## 00000004 -/* 004D0 80AD3FD0 A4CC0196 */ sh $t4, 0x0196($a2) ## 00000196 -/* 004D4 80AD3FD4 A0CD0194 */ sb $t5, 0x0194($a2) ## 00000194 -.L80AD3FD8: -/* 004D8 80AD3FD8 25CE4A68 */ addiu $t6, $t6, %lo(func_80AD4A68) ## $t6 = 80AD4A68 -/* 004DC 80AD3FDC ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 -/* 004E0 80AD3FE0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004E4 80AD3FE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004E8 80AD3FE8 03E00008 */ jr $ra -/* 004EC 80AD3FEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s deleted file mode 100644 index c02fd5864d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80AD3FF0 -/* 004F0 80AD3FF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004F4 80AD3FF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004F8 80AD3FF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004FC 80AD3FFC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00500 80AD4000 24A50608 */ addiu $a1, $a1, 0x0608 ## $a1 = 06000608 -/* 00504 80AD4004 AFA70018 */ sw $a3, 0x0018($sp) -/* 00508 80AD4008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0050C 80AD400C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00510 80AD4010 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00514 80AD4014 8FA70018 */ lw $a3, 0x0018($sp) -/* 00518 80AD4018 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0051C 80AD401C 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 00520 80AD4020 90EE0255 */ lbu $t6, 0x0255($a3) ## 00000255 -/* 00524 80AD4024 3C0280AD */ lui $v0, %hi(func_80AD4CA4) ## $v0 = 80AD0000 -/* 00528 80AD4028 3C1880AD */ lui $t8, %hi(func_80AD4E48) ## $t8 = 80AD0000 -/* 0052C 80AD402C 24424CA4 */ addiu $v0, $v0, %lo(func_80AD4CA4) ## $v0 = 80AD4CA4 -/* 00530 80AD4030 27184E48 */ addiu $t8, $t8, %lo(func_80AD4E48) ## $t8 = 80AD4E48 -/* 00534 80AD4034 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00538 80AD4038 A0EF0255 */ sb $t7, 0x0255($a3) ## 00000255 -/* 0053C 80AD403C ACE20190 */ sw $v0, 0x0190($a3) ## 00000190 -/* 00540 80AD4040 1302000C */ beq $t8, $v0, .L80AD4074 -/* 00544 80AD4044 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00548 80AD4048 8CF90004 */ lw $t9, 0x0004($a3) ## 00000004 -/* 0054C 80AD404C 84E900B6 */ lh $t1, 0x00B6($a3) ## 000000B6 -/* 00550 80AD4050 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00554 80AD4054 240B07D0 */ addiu $t3, $zero, 0x07D0 ## $t3 = 000007D0 -/* 00558 80AD4058 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 0055C 80AD405C 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00560 80AD4060 01215021 */ addu $t2, $t1, $at -/* 00564 80AD4064 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 -/* 00568 80AD4068 A4EA0032 */ sh $t2, 0x0032($a3) ## 00000032 -/* 0056C 80AD406C A4EB0196 */ sh $t3, 0x0196($a3) ## 00000196 -/* 00570 80AD4070 A0EC0194 */ sb $t4, 0x0194($a3) ## 00000194 -.L80AD4074: -/* 00574 80AD4074 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00578 80AD4078 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0057C 80AD407C 03E00008 */ jr $ra -/* 00580 80AD4080 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s deleted file mode 100644 index e5f4222383..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80AD4084 -/* 00584 80AD4084 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00588 80AD4088 AFB00020 */ sw $s0, 0x0020($sp) -/* 0058C 80AD408C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00590 80AD4090 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00594 80AD4094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00598 80AD4098 24A50454 */ addiu $a1, $a1, 0x0454 ## $a1 = 06000454 -/* 0059C 80AD409C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005A0 80AD40A0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 005A4 80AD40A4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 005A8 80AD40A8 8E0E0280 */ lw $t6, 0x0280($s0) ## 00000280 -/* 005AC 80AD40AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005B0 80AD40B0 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 -/* 005B4 80AD40B4 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 005B8 80AD40B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005BC 80AD40BC 01E1C024 */ and $t8, $t7, $at -/* 005C0 80AD40C0 13000005 */ beq $t8, $zero, .L80AD40D8 -/* 005C4 80AD40C4 00000000 */ nop -/* 005C8 80AD40C8 8E19024C */ lw $t9, 0x024C($s0) ## 0000024C -/* 005CC 80AD40CC 87280032 */ lh $t0, 0x0032($t9) ## 00000032 -/* 005D0 80AD40D0 10000006 */ beq $zero, $zero, .L80AD40EC -/* 005D4 80AD40D4 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -.L80AD40D8: -/* 005D8 80AD40D8 0C00B69E */ jal func_8002DA78 -/* 005DC 80AD40DC 8E05024C */ lw $a1, 0x024C($s0) ## 0000024C -/* 005E0 80AD40E0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005E4 80AD40E4 00414821 */ addu $t1, $v0, $at -/* 005E8 80AD40E8 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -.L80AD40EC: -/* 005EC 80AD40EC 920A0255 */ lbu $t2, 0x0255($s0) ## 00000255 -/* 005F0 80AD40F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 005F4 80AD40F4 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 005F8 80AD40F8 314BFFFC */ andi $t3, $t2, 0xFFFC ## $t3 = 00000000 -/* 005FC 80AD40FC A20B0255 */ sb $t3, 0x0255($s0) ## 00000255 -/* 00600 80AD4100 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 -/* 00604 80AD4104 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00608 80AD4108 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0060C 80AD410C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00610 80AD4110 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 00614 80AD4114 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00618 80AD4118 0C00D09B */ jal func_8003426C -/* 0061C 80AD411C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00620 80AD4120 3C0D80AD */ lui $t5, %hi(func_80AD4E48) ## $t5 = 80AD0000 -/* 00624 80AD4124 25AD4E48 */ addiu $t5, $t5, %lo(func_80AD4E48) ## $t5 = 80AD4E48 -/* 00628 80AD4128 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 0062C 80AD412C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00630 80AD4130 8FB00020 */ lw $s0, 0x0020($sp) -/* 00634 80AD4134 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00638 80AD4138 03E00008 */ jr $ra -/* 0063C 80AD413C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s deleted file mode 100644 index fec19d0d66..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AD4140 -/* 00640 80AD4140 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00644 80AD4144 8488019A */ lh $t0, 0x019A($a0) ## 0000019A -/* 00648 80AD4148 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0064C 80AD414C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00650 80AD4150 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 -/* 00654 80AD4154 01C17824 */ and $t7, $t6, $at -/* 00658 80AD4158 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0065C 80AD415C 29010014 */ slti $at, $t0, 0x0014 -/* 00660 80AD4160 A4800196 */ sh $zero, 0x0196($a0) ## 00000196 -/* 00664 80AD4164 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00668 80AD4168 A0990117 */ sb $t9, 0x0117($a0) ## 00000117 -/* 0066C 80AD416C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00670 80AD4170 14200003 */ bne $at, $zero, .L80AD4180 -/* 00674 80AD4174 A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 00678 80AD4178 24090013 */ addiu $t1, $zero, 0x0013 ## $t1 = 00000013 -/* 0067C 80AD417C A489019A */ sh $t1, 0x019A($a0) ## 0000019A -.L80AD4180: -/* 00680 80AD4180 3C0A80AD */ lui $t2, %hi(func_80AD4ED8) ## $t2 = 80AD0000 -/* 00684 80AD4184 254A4ED8 */ addiu $t2, $t2, %lo(func_80AD4ED8) ## $t2 = 80AD4ED8 -/* 00688 80AD4188 03E00008 */ jr $ra -/* 0068C 80AD418C AC8A0190 */ sw $t2, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s deleted file mode 100644 index 9ba9dd37c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AD4190 -/* 00690 80AD4190 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00694 80AD4194 AFB00018 */ sw $s0, 0x0018($sp) -/* 00698 80AD4198 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0069C 80AD419C AFBF001C */ sw $ra, 0x001C($sp) -/* 006A0 80AD41A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006A4 80AD41A4 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 -/* 006A8 80AD41A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006AC 80AD41AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 006B0 80AD41B0 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 006B4 80AD41B4 920F0255 */ lbu $t7, 0x0255($s0) ## 00000255 -/* 006B8 80AD41B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 006BC 80AD41BC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 006C0 80AD41C0 31F8FFFC */ andi $t8, $t7, 0xFFFC ## $t8 = 00000000 -/* 006C4 80AD41C4 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 006C8 80AD41C8 A2180255 */ sb $t8, 0x0255($s0) ## 00000255 -/* 006CC 80AD41CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D0 80AD41D0 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 006D4 80AD41D4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006D8 80AD41D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 006DC 80AD41DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006E0 80AD41E0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 006E4 80AD41E4 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 -/* 006E8 80AD41E8 3C1980AD */ lui $t9, %hi(func_80AD52F0) ## $t9 = 80AD0000 -/* 006EC 80AD41EC 273952F0 */ addiu $t9, $t9, %lo(func_80AD52F0) ## $t9 = 80AD52F0 -/* 006F0 80AD41F0 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 006F4 80AD41F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 006F8 80AD41F8 8FB00018 */ lw $s0, 0x0018($sp) -/* 006FC 80AD41FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00700 80AD4200 03E00008 */ jr $ra -/* 00704 80AD4204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s deleted file mode 100644 index 2d64bef000..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s +++ /dev/null @@ -1,50 +0,0 @@ -.late_rodata -glabel D_80AD7244 - .float 1500.0 - -.text -glabel func_80AD4208 -/* 00708 80AD4208 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0070C 80AD420C AFA5001C */ sw $a1, 0x001C($sp) -/* 00710 80AD4210 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00714 80AD4214 3C0E80AD */ lui $t6, %hi(func_80AD6BF4) ## $t6 = 80AD0000 -/* 00718 80AD4218 3C0F80AD */ lui $t7, %hi(func_80AD6C4C) ## $t7 = 80AD0000 -/* 0071C 80AD421C 25CE6BF4 */ addiu $t6, $t6, %lo(func_80AD6BF4) ## $t6 = 80AD6BF4 -/* 00720 80AD4220 25EF6C4C */ addiu $t7, $t7, %lo(func_80AD6C4C) ## $t7 = 80AD6C4C -/* 00724 80AD4224 AC8E0130 */ sw $t6, 0x0130($a0) ## 00000130 -/* 00728 80AD4228 AC8F0134 */ sw $t7, 0x0134($a0) ## 00000134 -/* 0072C 80AD422C AC8000C0 */ sw $zero, 0x00C0($a0) ## 000000C0 -/* 00730 80AD4230 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00734 80AD4234 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00738 80AD4238 0C00B58B */ jal Actor_SetScale - -/* 0073C 80AD423C AFA40018 */ sw $a0, 0x0018($sp) -/* 00740 80AD4240 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00744 80AD4244 8FA60018 */ lw $a2, 0x0018($sp) -/* 00748 80AD4248 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 0074C 80AD424C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00750 80AD4250 3C0180AD */ lui $at, %hi(D_80AD7244) ## $at = 80AD0000 -/* 00754 80AD4254 E4C4006C */ swc1 $f4, 0x006C($a2) ## 0000006C -/* 00758 80AD4258 C4267244 */ lwc1 $f6, %lo(D_80AD7244)($at) -/* 0075C 80AD425C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00760 80AD4260 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 00764 80AD4264 C4C80028 */ lwc1 $f8, 0x0028($a2) ## 00000028 -/* 00768 80AD4268 24188000 */ addiu $t8, $zero, 0x8000 ## $t8 = FFFF8000 -/* 0076C 80AD426C 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 00770 80AD4270 460A4401 */ sub.s $f16, $f8, $f10 -/* 00774 80AD4274 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 00778 80AD4278 A4D800B4 */ sh $t8, 0x00B4($a2) ## 000000B4 -/* 0077C 80AD427C A4D90196 */ sh $t9, 0x0196($a2) ## 00000196 -/* 00780 80AD4280 E4D00028 */ swc1 $f16, 0x0028($a2) ## 00000028 -/* 00784 80AD4284 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 00788 80AD4288 0C00CDD2 */ jal Actor_ChangeType - -/* 0078C 80AD428C E4C600BC */ swc1 $f6, 0x00BC($a2) ## 000000BC -/* 00790 80AD4290 8FA60018 */ lw $a2, 0x0018($sp) -/* 00794 80AD4294 3C0880AD */ lui $t0, %hi(func_80AD53F0) ## $t0 = 80AD0000 -/* 00798 80AD4298 250853F0 */ addiu $t0, $t0, %lo(func_80AD53F0) ## $t0 = 80AD53F0 -/* 0079C 80AD429C ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 -/* 007A0 80AD42A0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007A4 80AD42A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007A8 80AD42A8 03E00008 */ jr $ra -/* 007AC 80AD42AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s deleted file mode 100644 index fbef792e69..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80AD42B0 -/* 007B0 80AD42B0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007B4 80AD42B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 007B8 80AD42B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007BC 80AD42BC AFBF002C */ sw $ra, 0x002C($sp) -/* 007C0 80AD42C0 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 007C4 80AD42C4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 007C8 80AD42C8 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 007CC 80AD42CC 4600848D */ trunc.w.s $f18, $f16 -/* 007D0 80AD42D0 AFA0001C */ sw $zero, 0x001C($sp) -/* 007D4 80AD42D4 AFA00018 */ sw $zero, 0x0018($sp) -/* 007D8 80AD42D8 4600428D */ trunc.w.s $f10, $f8 -/* 007DC 80AD42DC 44079000 */ mfc1 $a3, $f18 -/* 007E0 80AD42E0 AFA00014 */ sw $zero, 0x0014($sp) -/* 007E4 80AD42E4 4600218D */ trunc.w.s $f6, $f4 -/* 007E8 80AD42E8 44065000 */ mfc1 $a2, $f10 -/* 007EC 80AD42EC 00073C00 */ sll $a3, $a3, 16 -/* 007F0 80AD42F0 00073C03 */ sra $a3, $a3, 16 -/* 007F4 80AD42F4 44053000 */ mfc1 $a1, $f6 -/* 007F8 80AD42F8 00063400 */ sll $a2, $a2, 16 -/* 007FC 80AD42FC 00063403 */ sra $a2, $a2, 16 -/* 00800 80AD4300 00052C00 */ sll $a1, $a1, 16 -/* 00804 80AD4304 00052C03 */ sra $a1, $a1, 16 -/* 00808 80AD4308 AFA00010 */ sw $zero, 0x0010($sp) -/* 0080C 80AD430C 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 00810 80AD4310 24840234 */ addiu $a0, $a0, 0x0234 ## $a0 = 00000234 -/* 00814 80AD4314 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00818 80AD4318 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 0081C 80AD431C A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 00820 80AD4320 A2000217 */ sb $zero, 0x0217($s0) ## 00000217 -/* 00824 80AD4324 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 00828 80AD4328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0082C 80AD432C 240528E0 */ addiu $a1, $zero, 0x28E0 ## $a1 = 000028E0 -/* 00830 80AD4330 E60000BC */ swc1 $f0, 0x00BC($s0) ## 000000BC -/* 00834 80AD4334 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 00838 80AD4338 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 0083C 80AD433C E604000C */ swc1 $f4, 0x000C($s0) ## 0000000C -/* 00840 80AD4340 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 00844 80AD4344 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00848 80AD4348 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 0084C 80AD434C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00850 80AD4350 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00854 80AD4354 17210003 */ bne $t9, $at, .L80AD4364 -/* 00858 80AD4358 00000000 */ nop -/* 0085C 80AD435C 0C01E221 */ jal func_80078884 -/* 00860 80AD4360 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -.L80AD4364: -/* 00864 80AD4364 3C0880AD */ lui $t0, %hi(func_80AD587C) ## $t0 = 80AD0000 -/* 00868 80AD4368 2508587C */ addiu $t0, $t0, %lo(func_80AD587C) ## $t0 = 80AD587C -/* 0086C 80AD436C AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 00870 80AD4370 8FBF002C */ lw $ra, 0x002C($sp) -/* 00874 80AD4374 8FB00028 */ lw $s0, 0x0028($sp) -/* 00878 80AD4378 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0087C 80AD437C 03E00008 */ jr $ra -/* 00880 80AD4380 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s deleted file mode 100644 index b1069e5139..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80AD4384 -/* 00884 80AD4384 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00888 80AD4388 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0088C 80AD438C C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00890 80AD4390 3C05C120 */ lui $a1, 0xC120 ## $a1 = C1200000 -/* 00894 80AD4394 E484000C */ swc1 $f4, 0x000C($a0) ## 0000000C -/* 00898 80AD4398 0C00B56E */ jal Actor_SetHeight - -/* 0089C 80AD439C AFA40018 */ sw $a0, 0x0018($sp) -/* 008A0 80AD43A0 8FA40018 */ lw $a0, 0x0018($sp) -/* 008A4 80AD43A4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 008A8 80AD43A8 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 008AC 80AD43AC C4860024 */ lwc1 $f6, 0x0024($a0) ## 00000024 -/* 008B0 80AD43B0 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 008B4 80AD43B4 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 008B8 80AD43B8 4600320D */ trunc.w.s $f8, $f6 -/* 008BC 80AD43BC C486002C */ lwc1 $f6, 0x002C($a0) ## 0000002C -/* 008C0 80AD43C0 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 008C4 80AD43C4 46105481 */ sub.s $f18, $f10, $f16 -/* 008C8 80AD43C8 44194000 */ mfc1 $t9, $f8 -/* 008CC 80AD43CC 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 008D0 80AD43D0 4600320D */ trunc.w.s $f8, $f6 -/* 008D4 80AD43D4 3C0880AD */ lui $t0, %hi(func_80AD58D4) ## $t0 = 80AD0000 -/* 008D8 80AD43D8 A48E0284 */ sh $t6, 0x0284($a0) ## 00000284 -/* 008DC 80AD43DC 4600910D */ trunc.w.s $f4, $f18 -/* 008E0 80AD43E0 440B4000 */ mfc1 $t3, $f8 -/* 008E4 80AD43E4 A48F0286 */ sh $t7, 0x0286($a0) ## 00000286 -/* 008E8 80AD43E8 A499028A */ sh $t9, 0x028A($a0) ## 0000028A -/* 008EC 80AD43EC 44092000 */ mfc1 $t1, $f4 -/* 008F0 80AD43F0 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 008F4 80AD43F4 240D5005 */ addiu $t5, $zero, 0x5005 ## $t5 = 00005005 -/* 008F8 80AD43F8 240E0190 */ addiu $t6, $zero, 0x0190 ## $t6 = 00000190 -/* 008FC 80AD43FC 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 00900 80AD4400 250858D4 */ addiu $t0, $t0, %lo(func_80AD58D4) ## $t0 = 80AD58D4 -/* 00904 80AD4404 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00908 80AD4408 A4800288 */ sh $zero, 0x0288($a0) ## 00000288 -/* 0090C 80AD440C A08C0256 */ sb $t4, 0x0256($a0) ## 00000256 -/* 00910 80AD4410 A48D010E */ sh $t5, 0x010E($a0) ## 0000010E -/* 00914 80AD4414 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00918 80AD4418 A08F0194 */ sb $t7, 0x0194($a0) ## 00000194 -/* 0091C 80AD441C AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00920 80AD4420 AC880190 */ sw $t0, 0x0190($a0) ## 00000190 -/* 00924 80AD4424 A48B028E */ sh $t3, 0x028E($a0) ## 0000028E -/* 00928 80AD4428 A489028C */ sh $t1, 0x028C($a0) ## 0000028C -/* 0092C 80AD442C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00930 80AD4430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00934 80AD4434 03E00008 */ jr $ra -/* 00938 80AD4438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s deleted file mode 100644 index 7cb501add3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AD443C -/* 0093C 80AD443C 3C0E80AD */ lui $t6, %hi(func_80AD5AD8) ## $t6 = 80AD0000 -/* 00940 80AD4440 25CE5AD8 */ addiu $t6, $t6, %lo(func_80AD5AD8) ## $t6 = 80AD5AD8 -/* 00944 80AD4444 03E00008 */ jr $ra -/* 00948 80AD4448 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s deleted file mode 100644 index 9a04b5af94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AD444C -/* 0094C 80AD444C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00950 80AD4450 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 00954 80AD4454 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00958 80AD4458 3C0E80AD */ lui $t6, %hi(func_80AD5B18) ## $t6 = 80AD0000 -/* 0095C 80AD445C 25CE5B18 */ addiu $t6, $t6, %lo(func_80AD5B18) ## $t6 = 80AD5B18 -/* 00960 80AD4460 46062201 */ sub.s $f8, $f4, $f6 -/* 00964 80AD4464 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 -/* 00968 80AD4468 03E00008 */ jr $ra -/* 0096C 80AD446C E488000C */ swc1 $f8, 0x000C($a0) ## 0000000C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s deleted file mode 100644 index ae287f98df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80AD4470 -/* 00970 80AD4470 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00974 80AD4474 AFBF001C */ sw $ra, 0x001C($sp) -/* 00978 80AD4478 AFB00018 */ sw $s0, 0x0018($sp) -/* 0097C 80AD447C 90820194 */ lbu $v0, 0x0194($a0) ## 00000194 -/* 00980 80AD4480 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00984 80AD4484 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00988 80AD4488 14400004 */ bne $v0, $zero, .L80AD449C -/* 0098C 80AD448C 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 00990 80AD4490 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 00994 80AD4494 A08E0194 */ sb $t6, 0x0194($a0) ## 00000194 -/* 00998 80AD4498 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 00000020 -.L80AD449C: -/* 0099C 80AD449C 10400002 */ beq $v0, $zero, .L80AD44A8 -/* 009A0 80AD44A0 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = 0000001F -/* 009A4 80AD44A4 A20F0194 */ sb $t7, 0x0194($s0) ## 00000194 -.L80AD44A8: -/* 009A8 80AD44A8 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 -/* 009AC 80AD44AC 44812000 */ mtc1 $at, $f4 ## $f4 = -32000.00 -/* 009B0 80AD44B0 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 009B4 80AD44B4 46002032 */ c.eq.s $f4, $f0 -/* 009B8 80AD44B8 00000000 */ nop -/* 009BC 80AD44BC 45020006 */ bc1fl .L80AD44D8 -/* 009C0 80AD44C0 C4620028 */ lwc1 $f2, 0x0028($v1) ## 00000028 -/* 009C4 80AD44C4 0C2B5064 */ jal func_80AD4190 -/* 009C8 80AD44C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009CC 80AD44CC 1000001D */ beq $zero, $zero, .L80AD4544 -/* 009D0 80AD44D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 009D4 80AD44D4 C4620028 */ lwc1 $f2, 0x0028($v1) ## 00000028 -.L80AD44D8: -/* 009D8 80AD44D8 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 009DC 80AD44DC 4602003C */ c.lt.s $f0, $f2 -/* 009E0 80AD44E0 00000000 */ nop -/* 009E4 80AD44E4 45020004 */ bc1fl .L80AD44F8 -/* 009E8 80AD44E8 46000306 */ mov.s $f12, $f0 -/* 009EC 80AD44EC 10000002 */ beq $zero, $zero, .L80AD44F8 -/* 009F0 80AD44F0 46001306 */ mov.s $f12, $f2 -/* 009F4 80AD44F4 46000306 */ mov.s $f12, $f0 -.L80AD44F8: -/* 009F8 80AD44F8 46066200 */ add.s $f8, $f12, $f6 -/* 009FC 80AD44FC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00A00 80AD4500 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 00A04 80AD4504 2604000C */ addiu $a0, $s0, 0x000C ## $a0 = 0000000C -/* 00A08 80AD4508 44054000 */ mfc1 $a1, $f8 -/* 00A0C 80AD450C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00A10 80AD4510 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 00A14 80AD4514 92040194 */ lbu $a0, 0x0194($s0) ## 00000194 -/* 00A18 80AD4518 000422C0 */ sll $a0, $a0, 11 -/* 00A1C 80AD451C 00042400 */ sll $a0, $a0, 16 -/* 00A20 80AD4520 0C01DE1C */ jal Math_Sins - ## sins? -/* 00A24 80AD4524 00042403 */ sra $a0, $a0, 16 -/* 00A28 80AD4528 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 00A2C 80AD452C 44815000 */ mtc1 $at, $f10 ## $f10 = 13.00 -/* 00A30 80AD4530 C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 00A34 80AD4534 460A0402 */ mul.s $f16, $f0, $f10 -/* 00A38 80AD4538 46128100 */ add.s $f4, $f16, $f18 -/* 00A3C 80AD453C E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 00A40 80AD4540 8FBF001C */ lw $ra, 0x001C($sp) -.L80AD4544: -/* 00A44 80AD4544 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A48 80AD4548 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A4C 80AD454C 03E00008 */ jr $ra -/* 00A50 80AD4550 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s deleted file mode 100644 index fdb6516ad0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_80AD4554 -/* 00A54 80AD4554 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00A58 80AD4558 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00A5C 80AD455C 8C4E067C */ lw $t6, 0x067C($v0) ## 0000067C -/* 00A60 80AD4560 000E7A00 */ sll $t7, $t6, 8 -/* 00A64 80AD4564 05E30009 */ bgezl $t7, .L80AD458C -/* 00A68 80AD4568 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 -/* 00A6C 80AD456C 8C430440 */ lw $v1, 0x0440($v0) ## 00000440 -/* 00A70 80AD4570 50600006 */ beql $v1, $zero, .L80AD458C -/* 00A74 80AD4574 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 -/* 00A78 80AD4578 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00A7C 80AD457C 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 -/* 00A80 80AD4580 10000004 */ beq $zero, $zero, .L80AD4594 -/* 00A84 80AD4584 C4600068 */ lwc1 $f0, 0x0068($v1) ## 00000068 -/* 00A88 80AD4588 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 -.L80AD458C: -/* 00A8C 80AD458C 00000000 */ nop -/* 00A90 80AD4590 46006006 */ mov.s $f0, $f12 -.L80AD4594: -/* 00A94 80AD4594 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00A98 80AD4598 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 -/* 00A9C 80AD459C C4820090 */ lwc1 $f2, 0x0090($a0) ## 00000090 -/* 00AA0 80AD45A0 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00AA4 80AD45A4 4604103C */ c.lt.s $f2, $f4 -/* 00AA8 80AD45A8 00000000 */ nop -/* 00AAC 80AD45AC 4502000A */ bc1fl .L80AD45D8 -/* 00AB0 80AD45B0 44819000 */ mtc1 $at, $f18 ## $f18 = 400.00 -/* 00AB4 80AD45B4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 00AB8 80AD45B8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 00ABC 80AD45BC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00AC0 80AD45C0 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 -/* 00AC4 80AD45C4 46060202 */ mul.s $f8, $f0, $f6 -/* 00AC8 80AD45C8 460A4400 */ add.s $f16, $f8, $f10 -/* 00ACC 80AD45CC 1000001B */ beq $zero, $zero, .L80AD463C -/* 00AD0 80AD45D0 E4900068 */ swc1 $f16, 0x0068($a0) ## 00000068 -/* 00AD4 80AD45D4 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -.L80AD45D8: -/* 00AD8 80AD45D8 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 00ADC 80AD45DC 4612103C */ c.lt.s $f2, $f18 -/* 00AE0 80AD45E0 00000000 */ nop -/* 00AE4 80AD45E4 4502000A */ bc1fl .L80AD4610 -/* 00AE8 80AD45E8 44818000 */ mtc1 $at, $f16 ## $f16 = 500.00 -/* 00AEC 80AD45EC 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 -/* 00AF0 80AD45F0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 -/* 00AF4 80AD45F4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00AF8 80AD45F8 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 00AFC 80AD45FC 46040182 */ mul.s $f6, $f0, $f4 -/* 00B00 80AD4600 46083280 */ add.s $f10, $f6, $f8 -/* 00B04 80AD4604 1000000D */ beq $zero, $zero, .L80AD463C -/* 00B08 80AD4608 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 00B0C 80AD460C 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 -.L80AD4610: -/* 00B10 80AD4610 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00B14 80AD4614 4610103C */ c.lt.s $f2, $f16 -/* 00B18 80AD4618 00000000 */ nop -/* 00B1C 80AD461C 45020007 */ bc1fl .L80AD463C -/* 00B20 80AD4620 E48C0068 */ swc1 $f12, 0x0068($a0) ## 00000068 -/* 00B24 80AD4624 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 -/* 00B28 80AD4628 00000000 */ nop -/* 00B2C 80AD462C 46120100 */ add.s $f4, $f0, $f18 -/* 00B30 80AD4630 10000002 */ beq $zero, $zero, .L80AD463C -/* 00B34 80AD4634 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00B38 80AD4638 E48C0068 */ swc1 $f12, 0x0068($a0) ## 00000068 -.L80AD463C: -/* 00B3C 80AD463C C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 -/* 00B40 80AD4640 460C003C */ c.lt.s $f0, $f12 -/* 00B44 80AD4644 00000000 */ nop -/* 00B48 80AD4648 45020004 */ bc1fl .L80AD465C -/* 00B4C 80AD464C E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 00B50 80AD4650 03E00008 */ jr $ra -/* 00B54 80AD4654 E48C0068 */ swc1 $f12, 0x0068($a0) ## 00000068 -.L80AD4658: -/* 00B58 80AD4658 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -.L80AD465C: -/* 00B5C 80AD465C 03E00008 */ jr $ra -/* 00B60 80AD4660 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s deleted file mode 100644 index ece9d1685d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s +++ /dev/null @@ -1,173 +0,0 @@ -.late_rodata -glabel D_80AD7248 - .float 0.4 - -.text -glabel func_80AD4664 -/* 00B64 80AD4664 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00B68 80AD4668 AFBF0074 */ sw $ra, 0x0074($sp) -/* 00B6C 80AD466C AFBE0070 */ sw $s8, 0x0070($sp) -/* 00B70 80AD4670 AFB7006C */ sw $s7, 0x006C($sp) -/* 00B74 80AD4674 AFB60068 */ sw $s6, 0x0068($sp) -/* 00B78 80AD4678 AFB50064 */ sw $s5, 0x0064($sp) -/* 00B7C 80AD467C AFB40060 */ sw $s4, 0x0060($sp) -/* 00B80 80AD4680 AFB3005C */ sw $s3, 0x005C($sp) -/* 00B84 80AD4684 AFB20058 */ sw $s2, 0x0058($sp) -/* 00B88 80AD4688 AFB10054 */ sw $s1, 0x0054($sp) -/* 00B8C 80AD468C AFB00050 */ sw $s0, 0x0050($sp) -/* 00B90 80AD4690 F7BE0048 */ sdc1 $f30, 0x0048($sp) -/* 00B94 80AD4694 F7BC0040 */ sdc1 $f28, 0x0040($sp) -/* 00B98 80AD4698 F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 00B9C 80AD469C F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 00BA0 80AD46A0 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 00BA4 80AD46A4 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 00BA8 80AD46A8 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 00BAC 80AD46AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BB0 80AD46B0 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 00BB4 80AD46B4 10400004 */ beq $v0, $zero, .L80AD46C8 -/* 00BB8 80AD46B8 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 -/* 00BBC 80AD46BC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00BC0 80AD46C0 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00BC4 80AD46C4 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -.L80AD46C8: -/* 00BC8 80AD46C8 1440006E */ bne $v0, $zero, .L80AD4884 -/* 00BCC 80AD46CC 3C0280AD */ lui $v0, %hi(D_80AD7100) ## $v0 = 80AD0000 -/* 00BD0 80AD46D0 8C427100 */ lw $v0, %lo(D_80AD7100)($v0) -/* 00BD4 80AD46D4 3C1680AD */ lui $s6, %hi(D_80AD76B0) ## $s6 = 80AD0000 -/* 00BD8 80AD46D8 26D676B0 */ addiu $s6, $s6, %lo(D_80AD76B0) ## $s6 = 80AD76B0 -/* 00BDC 80AD46DC 18400069 */ blez $v0, .L80AD4884 -/* 00BE0 80AD46E0 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 -/* 00BE4 80AD46E4 3C0180AD */ lui $at, %hi(D_80AD7248) ## $at = 80AD0000 -/* 00BE8 80AD46E8 C43E7248 */ lwc1 $f30, %lo(D_80AD7248)($at) -/* 00BEC 80AD46EC 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 -/* 00BF0 80AD46F0 4481E000 */ mtc1 $at, $f28 ## $f28 = -32000.00 -/* 00BF4 80AD46F4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 00BF8 80AD46F8 4481D000 */ mtc1 $at, $f26 ## $f26 = 1000.00 -/* 00BFC 80AD46FC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00C00 80AD4700 4481C000 */ mtc1 $at, $f24 ## $f24 = 300.00 -/* 00C04 80AD4704 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00C08 80AD4708 4481B000 */ mtc1 $at, $f22 ## $f22 = 150.00 -/* 00C0C 80AD470C 3C1E0080 */ lui $s8, 0x0080 ## $s8 = 00800000 -.L80AD4710: -/* 00C10 80AD4710 86CF0000 */ lh $t7, 0x0000($s6) ## 80AD76B0 -/* 00C14 80AD4714 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 00C18 80AD4718 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00C1C 80AD471C 00000000 */ nop -/* 00C20 80AD4720 468021A0 */ cvt.s.w $f6, $f4 -/* 00C24 80AD4724 46083001 */ sub.s $f0, $f6, $f8 -/* 00C28 80AD4728 46000005 */ abs.s $f0, $f0 -/* 00C2C 80AD472C 4616003C */ c.lt.s $f0, $f22 -/* 00C30 80AD4730 00000000 */ nop -/* 00C34 80AD4734 45020050 */ bc1fl .L80AD4878 -/* 00C38 80AD4738 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000001 -/* 00C3C 80AD473C 86D80004 */ lh $t8, 0x0004($s6) ## 80AD76B4 -/* 00C40 80AD4740 C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C -/* 00C44 80AD4744 3C0580AD */ lui $a1, %hi(D_80AD76F0) ## $a1 = 80AD0000 -/* 00C48 80AD4748 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 00C4C 80AD474C 00B52821 */ addu $a1, $a1, $s5 -/* 00C50 80AD4750 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 00C54 80AD4754 46805420 */ cvt.s.w $f16, $f10 -/* 00C58 80AD4758 46128001 */ sub.s $f0, $f16, $f18 -/* 00C5C 80AD475C 46000005 */ abs.s $f0, $f0 -/* 00C60 80AD4760 4616003C */ c.lt.s $f0, $f22 -/* 00C64 80AD4764 00000000 */ nop -/* 00C68 80AD4768 45020043 */ bc1fl .L80AD4878 -/* 00C6C 80AD476C 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000002 -/* 00C70 80AD4770 0C00B2D0 */ jal Flags_GetSwitch - -/* 00C74 80AD4774 90A576F0 */ lbu $a1, %lo(D_80AD76F0)($a1) -/* 00C78 80AD4778 1040000A */ beq $v0, $zero, .L80AD47A4 -/* 00C7C 80AD477C 26F207C0 */ addiu $s2, $s7, 0x07C0 ## $s2 = 000007C0 -/* 00C80 80AD4780 8E39067C */ lw $t9, 0x067C($s1) ## 0000067C -/* 00C84 80AD4784 26130078 */ addiu $s3, $s0, 0x0078 ## $s3 = 00000078 -/* 00C88 80AD4788 26140024 */ addiu $s4, $s0, 0x0024 ## $s4 = 00000024 -/* 00C8C 80AD478C 033E4024 */ and $t0, $t9, $s8 -/* 00C90 80AD4790 5500003D */ bnel $t0, $zero, .L80AD4888 -/* 00C94 80AD4794 8FBF0074 */ lw $ra, 0x0074($sp) -/* 00C98 80AD4798 A600001C */ sh $zero, 0x001C($s0) ## 0000001C -/* 00C9C 80AD479C 10000014 */ beq $zero, $zero, .L80AD47F0 -/* 00CA0 80AD47A0 4600C506 */ mov.s $f20, $f24 -.L80AD47A4: -/* 00CA4 80AD47A4 8E29067C */ lw $t1, 0x067C($s1) ## 0000067C -/* 00CA8 80AD47A8 26F207C0 */ addiu $s2, $s7, 0x07C0 ## $s2 = 000007C0 -/* 00CAC 80AD47AC 26130078 */ addiu $s3, $s0, 0x0078 ## $s3 = 00000078 -/* 00CB0 80AD47B0 013E5024 */ and $t2, $t1, $s8 -/* 00CB4 80AD47B4 15400006 */ bne $t2, $zero, .L80AD47D0 -/* 00CB8 80AD47B8 26140024 */ addiu $s4, $s0, 0x0024 ## $s4 = 00000024 -/* 00CBC 80AD47BC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00CC0 80AD47C0 00000000 */ nop -/* 00CC4 80AD47C4 461E003C */ c.lt.s $f0, $f30 -/* 00CC8 80AD47C8 00000000 */ nop -/* 00CCC 80AD47CC 45000006 */ bc1f .L80AD47E8 -.L80AD47D0: -/* 00CD0 80AD47D0 3C0143F0 */ lui $at, 0x43F0 ## $at = 43F00000 -/* 00CD4 80AD47D4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00CD8 80AD47D8 4481A000 */ mtc1 $at, $f20 ## $f20 = 480.00 -/* 00CDC 80AD47DC A60B001C */ sh $t3, 0x001C($s0) ## 0000001C -/* 00CE0 80AD47E0 10000003 */ beq $zero, $zero, .L80AD47F0 -/* 00CE4 80AD47E4 A2150195 */ sb $s5, 0x0195($s0) ## 00000195 -.L80AD47E8: -/* 00CE8 80AD47E8 A600001C */ sh $zero, 0x001C($s0) ## 0000001C -/* 00CEC 80AD47EC 4600C506 */ mov.s $f20, $f24 -.L80AD47F0: -/* 00CF0 80AD47F0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00CF4 80AD47F4 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 -/* 00CF8 80AD47F8 46140102 */ mul.s $f4, $f0, $f20 -/* 00CFC 80AD47FC C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 -/* 00D00 80AD4800 46062200 */ add.s $f8, $f4, $f6 -/* 00D04 80AD4804 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 00D08 80AD4808 0C01DE0D */ jal Math_Coss - ## coss? -/* 00D0C 80AD480C 862400B6 */ lh $a0, 0x00B6($s1) ## 000000B6 -/* 00D10 80AD4810 46140282 */ mul.s $f10, $f0, $f20 -/* 00D14 80AD4814 C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C -/* 00D18 80AD4818 02402025 */ or $a0, $s2, $zero ## $a0 = 000007C0 -/* 00D1C 80AD481C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000078 -/* 00D20 80AD4820 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFF0 -/* 00D24 80AD4824 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 00D28 80AD4828 46105480 */ add.s $f18, $f10, $f16 -/* 00D2C 80AD482C E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 00D30 80AD4830 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 00D34 80AD4834 461A2180 */ add.s $f6, $f4, $f26 -/* 00D38 80AD4838 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 00D3C 80AD483C 0C00F269 */ jal func_8003C9A4 -/* 00D40 80AD4840 AFB40010 */ sw $s4, 0x0010($sp) -/* 00D44 80AD4844 461C0032 */ c.eq.s $f0, $f28 -/* 00D48 80AD4848 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 00D4C 80AD484C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D50 80AD4850 4503000D */ bc1tl .L80AD4888 -/* 00D54 80AD4854 8FBF0074 */ lw $ra, 0x0074($sp) -/* 00D58 80AD4858 0C00B69E */ jal func_8002DA78 -/* 00D5C 80AD485C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00D60 80AD4860 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00D64 80AD4864 0C2B4F8B */ jal func_80AD3E2C -/* 00D68 80AD4868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D6C 80AD486C 3C0280AD */ lui $v0, %hi(D_80AD7100) ## $v0 = 80AD0000 -/* 00D70 80AD4870 8C427100 */ lw $v0, %lo(D_80AD7100)($v0) -/* 00D74 80AD4874 26B50001 */ addiu $s5, $s5, 0x0001 ## $s5 = 00000003 -.L80AD4878: -/* 00D78 80AD4878 02A2082A */ slt $at, $s5, $v0 -/* 00D7C 80AD487C 1420FFA4 */ bne $at, $zero, .L80AD4710 -/* 00D80 80AD4880 26D60006 */ addiu $s6, $s6, 0x0006 ## $s6 = 80AD76B6 -.L80AD4884: -/* 00D84 80AD4884 8FBF0074 */ lw $ra, 0x0074($sp) -.L80AD4888: -/* 00D88 80AD4888 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00D8C 80AD488C D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 00D90 80AD4890 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 00D94 80AD4894 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 00D98 80AD4898 D7BC0040 */ ldc1 $f28, 0x0040($sp) -/* 00D9C 80AD489C D7BE0048 */ ldc1 $f30, 0x0048($sp) -/* 00DA0 80AD48A0 8FB00050 */ lw $s0, 0x0050($sp) -/* 00DA4 80AD48A4 8FB10054 */ lw $s1, 0x0054($sp) -/* 00DA8 80AD48A8 8FB20058 */ lw $s2, 0x0058($sp) -/* 00DAC 80AD48AC 8FB3005C */ lw $s3, 0x005C($sp) -/* 00DB0 80AD48B0 8FB40060 */ lw $s4, 0x0060($sp) -/* 00DB4 80AD48B4 8FB50064 */ lw $s5, 0x0064($sp) -/* 00DB8 80AD48B8 8FB60068 */ lw $s6, 0x0068($sp) -/* 00DBC 80AD48BC 8FB7006C */ lw $s7, 0x006C($sp) -/* 00DC0 80AD48C0 8FBE0070 */ lw $s8, 0x0070($sp) -/* 00DC4 80AD48C4 03E00008 */ jr $ra -/* 00DC8 80AD48C8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s deleted file mode 100644 index 755be4462a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s +++ /dev/null @@ -1,123 +0,0 @@ -.late_rodata -glabel D_80AD724C - .float 0.05 - -glabel D_80AD7250 - .float 0.1 - -.text -glabel func_80AD48CC -/* 00DCC 80AD48CC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DD0 80AD48D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00DD4 80AD48D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DD8 80AD48D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00DDC 80AD48DC AFA50024 */ sw $a1, 0x0024($sp) -/* 00DE0 80AD48E0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00DE4 80AD48E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00DE8 80AD48E8 10400013 */ beq $v0, $zero, .L80AD4938 -/* 00DEC 80AD48EC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00DF0 80AD48F0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00DF4 80AD48F4 A20E0217 */ sb $t6, 0x0217($s0) ## 00000217 -/* 00DF8 80AD48F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DFC 80AD48FC 0C00B58B */ jal Actor_SetScale - -/* 00E00 80AD4900 8E05021C */ lw $a1, 0x021C($s0) ## 0000021C -/* 00E04 80AD4904 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00E08 80AD4908 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00E0C 80AD490C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E10 80AD4910 15E10005 */ bne $t7, $at, .L80AD4928 -/* 00E14 80AD4914 00000000 */ nop -/* 00E18 80AD4918 0C2B4FFC */ jal func_80AD3FF0 -/* 00E1C 80AD491C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E20 80AD4920 10000040 */ beq $zero, $zero, .L80AD4A24 -/* 00E24 80AD4924 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80AD4928: -/* 00E28 80AD4928 0C2B4FD3 */ jal func_80AD3F4C -/* 00E2C 80AD492C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00E30 80AD4930 1000003C */ beq $zero, $zero, .L80AD4A24 -/* 00E34 80AD4934 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80AD4938: -/* 00E38 80AD4938 44811000 */ mtc1 $at, $f2 ## $f2 = 0.00 -/* 00E3C 80AD493C C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 00E40 80AD4940 3C0180AD */ lui $at, %hi(D_80AD7250) ## $at = 80AD0000 -/* 00E44 80AD4944 4600103C */ c.lt.s $f2, $f0 -/* 00E48 80AD4948 00000000 */ nop -/* 00E4C 80AD494C 4502002C */ bc1fl .L80AD4A00 -/* 00E50 80AD4950 C604021C */ lwc1 $f4, 0x021C($s0) ## 0000021C -/* 00E54 80AD4954 46020101 */ sub.s $f4, $f0, $f2 -/* 00E58 80AD4958 3C0180AD */ lui $at, %hi(D_80AD724C) ## $at = 80AD0000 -/* 00E5C 80AD495C C426724C */ lwc1 $f6, %lo(D_80AD724C)($at) -/* 00E60 80AD4960 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00E64 80AD4964 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 00E68 80AD4968 46062202 */ mul.s $f8, $f4, $f6 -/* 00E6C 80AD496C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00E70 80AD4970 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00E74 80AD4974 460A4402 */ mul.s $f16, $f8, $f10 -/* 00E78 80AD4978 4458F800 */ cfc1 $t8, $31 -/* 00E7C 80AD497C 44D9F800 */ ctc1 $t9, $31 -/* 00E80 80AD4980 00000000 */ nop -/* 00E84 80AD4984 460084A4 */ cvt.w.s $f18, $f16 -/* 00E88 80AD4988 4459F800 */ cfc1 $t9, $31 -/* 00E8C 80AD498C 00000000 */ nop -/* 00E90 80AD4990 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 00E94 80AD4994 53200013 */ beql $t9, $zero, .L80AD49E4 -/* 00E98 80AD4998 44199000 */ mfc1 $t9, $f18 -/* 00E9C 80AD499C 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 00EA0 80AD49A0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00EA4 80AD49A4 46128481 */ sub.s $f18, $f16, $f18 -/* 00EA8 80AD49A8 44D9F800 */ ctc1 $t9, $31 -/* 00EAC 80AD49AC 00000000 */ nop -/* 00EB0 80AD49B0 460094A4 */ cvt.w.s $f18, $f18 -/* 00EB4 80AD49B4 4459F800 */ cfc1 $t9, $31 -/* 00EB8 80AD49B8 00000000 */ nop -/* 00EBC 80AD49BC 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 00EC0 80AD49C0 17200005 */ bne $t9, $zero, .L80AD49D8 -/* 00EC4 80AD49C4 00000000 */ nop -/* 00EC8 80AD49C8 44199000 */ mfc1 $t9, $f18 -/* 00ECC 80AD49CC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00ED0 80AD49D0 10000007 */ beq $zero, $zero, .L80AD49F0 -/* 00ED4 80AD49D4 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80AD49D8: -/* 00ED8 80AD49D8 10000005 */ beq $zero, $zero, .L80AD49F0 -/* 00EDC 80AD49DC 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00EE0 80AD49E0 44199000 */ mfc1 $t9, $f18 -.L80AD49E4: -/* 00EE4 80AD49E4 00000000 */ nop -/* 00EE8 80AD49E8 0720FFFB */ bltz $t9, .L80AD49D8 -/* 00EEC 80AD49EC 00000000 */ nop -.L80AD49F0: -/* 00EF0 80AD49F0 44D8F800 */ ctc1 $t8, $31 -/* 00EF4 80AD49F4 1000000A */ beq $zero, $zero, .L80AD4A20 -/* 00EF8 80AD49F8 A2190217 */ sb $t9, 0x0217($s0) ## 00000217 -/* 00EFC 80AD49FC C604021C */ lwc1 $f4, 0x021C($s0) ## 0000021C -.L80AD4A00: -/* 00F00 80AD4A00 C4267250 */ lwc1 $f6, %lo(D_80AD7250)($at) -/* 00F04 80AD4A04 C60A0050 */ lwc1 $f10, 0x0050($s0) ## 00000050 -/* 00F08 80AD4A08 46062202 */ mul.s $f8, $f4, $f6 -/* 00F0C 80AD4A0C 46085400 */ add.s $f16, $f10, $f8 -/* 00F10 80AD4A10 E6100050 */ swc1 $f16, 0x0050($s0) ## 00000050 -/* 00F14 80AD4A14 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 00F18 80AD4A18 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 00F1C 80AD4A1C E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -.L80AD4A20: -/* 00F20 80AD4A20 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -.L80AD4A24: -/* 00F24 80AD4A24 92080217 */ lbu $t0, 0x0217($s0) ## 00000217 -/* 00F28 80AD4A28 8602008A */ lh $v0, 0x008A($s0) ## 0000008A -/* 00F2C 80AD4A2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F30 80AD4A30 A20800C8 */ sb $t0, 0x00C8($s0) ## 000000C8 -/* 00F34 80AD4A34 15210007 */ bne $t1, $at, .L80AD4A54 -/* 00F38 80AD4A38 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00F3C 80AD4A3C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00F40 80AD4A40 00415021 */ addu $t2, $v0, $at -/* 00F44 80AD4A44 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 00F48 80AD4A48 8FA50024 */ lw $a1, 0x0024($sp) -/* 00F4C 80AD4A4C 0C2B5155 */ jal func_80AD4554 -/* 00F50 80AD4A50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD4A54: -/* 00F54 80AD4A54 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F58 80AD4A58 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F5C 80AD4A5C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F60 80AD4A60 03E00008 */ jr $ra -/* 00F64 80AD4A64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s deleted file mode 100644 index 68686b65ff..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s +++ /dev/null @@ -1,162 +0,0 @@ -glabel func_80AD4A68 -/* 00F68 80AD4A68 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F6C 80AD4A6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F70 80AD4A70 AFB00020 */ sw $s0, 0x0020($sp) -/* 00F74 80AD4A74 AFA50034 */ sw $a1, 0x0034($sp) -/* 00F78 80AD4A78 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00F7C 80AD4A7C 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 00F80 80AD4A80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F84 80AD4A84 AFAF002C */ sw $t7, 0x002C($sp) -/* 00F88 80AD4A88 90980194 */ lbu $t8, 0x0194($a0) ## 00000194 -/* 00F8C 80AD4A8C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00F90 80AD4A90 03381823 */ subu $v1, $t9, $t8 -/* 00F94 80AD4A94 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00F98 80AD4A98 AFA30028 */ sw $v1, 0x0028($sp) -/* 00F9C 80AD4A9C 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 00FA0 80AD4AA0 8FA30028 */ lw $v1, 0x0028($sp) -/* 00FA4 80AD4AA4 10400002 */ beq $v0, $zero, .L80AD4AB0 -/* 00FA8 80AD4AA8 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 00FAC 80AD4AAC A6080196 */ sh $t0, 0x0196($s0) ## 00000196 -.L80AD4AB0: -/* 00FB0 80AD4AB0 04620004 */ bltzl $v1, .L80AD4AC4 -/* 00FB4 80AD4AB4 00031023 */ subu $v0, $zero, $v1 -/* 00FB8 80AD4AB8 10000002 */ beq $zero, $zero, .L80AD4AC4 -/* 00FBC 80AD4ABC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 00FC0 80AD4AC0 00031023 */ subu $v0, $zero, $v1 -.L80AD4AC4: -/* 00FC4 80AD4AC4 28410010 */ slti $at, $v0, 0x0010 -/* 00FC8 80AD4AC8 50200013 */ beql $at, $zero, .L80AD4B18 -/* 00FCC 80AD4ACC 2604021C */ addiu $a0, $s0, 0x021C ## $a0 = 0000021C -/* 00FD0 80AD4AD0 92040194 */ lbu $a0, 0x0194($s0) ## 00000194 -/* 00FD4 80AD4AD4 000422C0 */ sll $a0, $a0, 11 -/* 00FD8 80AD4AD8 00042400 */ sll $a0, $a0, 16 -/* 00FDC 80AD4ADC 0C01DE1C */ jal Math_Sins - ## sins? -/* 00FE0 80AD4AE0 00042403 */ sra $a0, $a0, 16 -/* 00FE4 80AD4AE4 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 00FE8 80AD4AE8 3C014400 */ lui $at, 0x4400 ## $at = 44000000 -/* 00FEC 80AD4AEC 44814000 */ mtc1 $at, $f8 ## $f8 = 512.00 -/* 00FF0 80AD4AF0 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00FF4 80AD4AF4 46000005 */ abs.s $f0, $f0 -/* 00FF8 80AD4AF8 46004282 */ mul.s $f10, $f8, $f0 -/* 00FFC 80AD4AFC 468021A0 */ cvt.s.w $f6, $f4 -/* 01000 80AD4B00 460A3400 */ add.s $f16, $f6, $f10 -/* 01004 80AD4B04 4600848D */ trunc.w.s $f18, $f16 -/* 01008 80AD4B08 440B9000 */ mfc1 $t3, $f18 -/* 0100C 80AD4B0C 00000000 */ nop -/* 01010 80AD4B10 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 01014 80AD4B14 2604021C */ addiu $a0, $s0, 0x021C ## $a0 = 0000021C -.L80AD4B18: -/* 01018 80AD4B18 3C054334 */ lui $a1, 0x4334 ## $a1 = 43340000 -/* 0101C 80AD4B1C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01020 80AD4B20 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01024 80AD4B24 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01028 80AD4B28 8FAC002C */ lw $t4, 0x002C($sp) -/* 0102C 80AD4B2C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01030 80AD4B30 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01034 80AD4B34 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 -/* 01038 80AD4B38 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0103C 80AD4B3C 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01040 80AD4B40 8D850024 */ lw $a1, 0x0024($t4) ## 00000024 -/* 01044 80AD4B44 8FAD002C */ lw $t5, 0x002C($sp) -/* 01048 80AD4B48 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0104C 80AD4B4C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01050 80AD4B50 26040010 */ addiu $a0, $s0, 0x0010 ## $a0 = 00000010 -/* 01054 80AD4B54 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 01058 80AD4B58 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 0105C 80AD4B5C 8DA5002C */ lw $a1, 0x002C($t5) ## 0000002C -/* 01060 80AD4B60 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 01064 80AD4B64 240E0200 */ addiu $t6, $zero, 0x0200 ## $t6 = 00000200 -/* 01068 80AD4B68 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0106C 80AD4B6C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01070 80AD4B70 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01074 80AD4B74 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01078 80AD4B78 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 0107C 80AD4B7C 8FAF002C */ lw $t7, 0x002C($sp) -/* 01080 80AD4B80 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 01084 80AD4B84 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01088 80AD4B88 C5E00024 */ lwc1 $f0, 0x0024($t7) ## 00000024 -/* 0108C 80AD4B8C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 01090 80AD4B90 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 01094 80AD4B94 46002081 */ sub.s $f2, $f4, $f0 -/* 01098 80AD4B98 4602603C */ c.lt.s $f12, $f2 -/* 0109C 80AD4B9C 00000000 */ nop -/* 010A0 80AD4BA0 45020007 */ bc1fl .L80AD4BC0 -/* 010A4 80AD4BA4 44817000 */ mtc1 $at, $f14 ## $f14 = -100.00 -/* 010A8 80AD4BA8 460C0200 */ add.s $f8, $f0, $f12 -/* 010AC 80AD4BAC 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 -/* 010B0 80AD4BB0 44817000 */ mtc1 $at, $f14 ## $f14 = -100.00 -/* 010B4 80AD4BB4 10000009 */ beq $zero, $zero, .L80AD4BDC -/* 010B8 80AD4BB8 E6080008 */ swc1 $f8, 0x0008($s0) ## 00000008 -/* 010BC 80AD4BBC 44817000 */ mtc1 $at, $f14 ## $f14 = -100.00 -.L80AD4BC0: -/* 010C0 80AD4BC0 00000000 */ nop -/* 010C4 80AD4BC4 460E103C */ c.lt.s $f2, $f14 -/* 010C8 80AD4BC8 00000000 */ nop -/* 010CC 80AD4BCC 45020004 */ bc1fl .L80AD4BE0 -/* 010D0 80AD4BD0 8FB9002C */ lw $t9, 0x002C($sp) -/* 010D4 80AD4BD4 460E0180 */ add.s $f6, $f0, $f14 -/* 010D8 80AD4BD8 E6060008 */ swc1 $f6, 0x0008($s0) ## 00000008 -.L80AD4BDC: -/* 010DC 80AD4BDC 8FB9002C */ lw $t9, 0x002C($sp) -.L80AD4BE0: -/* 010E0 80AD4BE0 C60A0010 */ lwc1 $f10, 0x0010($s0) ## 00000010 -/* 010E4 80AD4BE4 C720002C */ lwc1 $f0, 0x002C($t9) ## 0000002C -/* 010E8 80AD4BE8 46005081 */ sub.s $f2, $f10, $f0 -/* 010EC 80AD4BEC 4602603C */ c.lt.s $f12, $f2 -/* 010F0 80AD4BF0 00000000 */ nop -/* 010F4 80AD4BF4 45020005 */ bc1fl .L80AD4C0C -/* 010F8 80AD4BF8 460E103C */ c.lt.s $f2, $f14 -/* 010FC 80AD4BFC 460C0400 */ add.s $f16, $f0, $f12 -/* 01100 80AD4C00 10000007 */ beq $zero, $zero, .L80AD4C20 -/* 01104 80AD4C04 E6100010 */ swc1 $f16, 0x0010($s0) ## 00000010 -/* 01108 80AD4C08 460E103C */ c.lt.s $f2, $f14 -.L80AD4C0C: -/* 0110C 80AD4C0C 00000000 */ nop -/* 01110 80AD4C10 45000003 */ bc1f .L80AD4C20 -/* 01114 80AD4C14 00000000 */ nop -/* 01118 80AD4C18 460E0480 */ add.s $f18, $f0, $f14 -/* 0111C 80AD4C1C E6120010 */ swc1 $f18, 0x0010($s0) ## 00000010 -.L80AD4C20: -/* 01120 80AD4C20 0C01DE1C */ jal Math_Sins - ## sins? -/* 01124 80AD4C24 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 01128 80AD4C28 C608021C */ lwc1 $f8, 0x021C($s0) ## 0000021C -/* 0112C 80AD4C2C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 01130 80AD4C30 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 01134 80AD4C34 46080182 */ mul.s $f6, $f0, $f8 -/* 01138 80AD4C38 46062281 */ sub.s $f10, $f4, $f6 -/* 0113C 80AD4C3C 0C01DE0D */ jal Math_Coss - ## coss? -/* 01140 80AD4C40 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 01144 80AD4C44 C612021C */ lwc1 $f18, 0x021C($s0) ## 0000021C -/* 01148 80AD4C48 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 0114C 80AD4C4C 86180196 */ lh $t8, 0x0196($s0) ## 00000196 -/* 01150 80AD4C50 46120202 */ mul.s $f8, $f0, $f18 -/* 01154 80AD4C54 46088101 */ sub.s $f4, $f16, $f8 -/* 01158 80AD4C58 17000005 */ bne $t8, $zero, .L80AD4C70 -/* 0115C 80AD4C5C E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 01160 80AD4C60 0C2B5064 */ jal func_80AD4190 -/* 01164 80AD4C64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01168 80AD4C68 10000004 */ beq $zero, $zero, .L80AD4C7C -/* 0116C 80AD4C6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD4C70: -/* 01170 80AD4C70 0C2B5743 */ jal func_80AD5D0C -/* 01174 80AD4C74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01178 80AD4C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD4C7C: -/* 0117C 80AD4C7C 0C2B511C */ jal func_80AD4470 -/* 01180 80AD4C80 8FA50034 */ lw $a1, 0x0034($sp) -/* 01184 80AD4C84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01188 80AD4C88 0C00BE5D */ jal func_8002F974 -/* 0118C 80AD4C8C 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 01190 80AD4C90 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01194 80AD4C94 8FB00020 */ lw $s0, 0x0020($sp) -/* 01198 80AD4C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0119C 80AD4C9C 03E00008 */ jr $ra -/* 011A0 80AD4CA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s deleted file mode 100644 index f85356d147..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s +++ /dev/null @@ -1,127 +0,0 @@ -.late_rodata -glabel D_80AD7254 - .float 3000.0 - -glabel D_80AD7258 - .float 0.2 - -glabel D_80AD725C - .float 1500.0 - -.text -glabel func_80AD4CA4 -/* 011A4 80AD4CA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 011A8 80AD4CA8 AFB00018 */ sw $s0, 0x0018($sp) -/* 011AC 80AD4CAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011B0 80AD4CB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 011B4 80AD4CB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 011B8 80AD4CB8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 011BC 80AD4CBC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 011C0 80AD4CC0 86030196 */ lh $v1, 0x0196($s0) ## 00000196 -/* 011C4 80AD4CC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011C8 80AD4CC8 3C0580AD */ lui $a1, %hi(D_80AD7104) ## $a1 = 80AD0000 -/* 011CC 80AD4CCC 10600002 */ beq $v1, $zero, .L80AD4CD8 -/* 011D0 80AD4CD0 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 011D4 80AD4CD4 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -.L80AD4CD8: -/* 011D8 80AD4CD8 0C00B6EC */ jal func_8002DBB0 -/* 011DC 80AD4CDC 24A57104 */ addiu $a1, $a1, %lo(D_80AD7104) ## $a1 = 80AD7104 -/* 011E0 80AD4CE0 3C0180AD */ lui $at, %hi(D_80AD7254) ## $at = 80AD0000 -/* 011E4 80AD4CE4 C4247254 */ lwc1 $f4, %lo(D_80AD7254)($at) -/* 011E8 80AD4CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011EC 80AD4CEC 3C0580AD */ lui $a1, %hi(D_80AD7104) ## $a1 = 80AD0000 -/* 011F0 80AD4CF0 4600203C */ c.lt.s $f4, $f0 -/* 011F4 80AD4CF4 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 011F8 80AD4CF8 45020015 */ bc1fl .L80AD4D50 -/* 011FC 80AD4CFC 8603008A */ lh $v1, 0x008A($s0) ## 0000008A -/* 01200 80AD4D00 0C00B6B0 */ jal func_8002DAC0 -/* 01204 80AD4D04 24A57104 */ addiu $a1, $a1, %lo(D_80AD7104) ## $a1 = 80AD7104 -/* 01208 80AD4D08 8603008A */ lh $v1, 0x008A($s0) ## 0000008A -/* 0120C 80AD4D0C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 01210 80AD4D10 00627823 */ subu $t7, $v1, $v0 -/* 01214 80AD4D14 01E1C021 */ addu $t8, $t7, $at -/* 01218 80AD4D18 0018CC00 */ sll $t9, $t8, 16 -/* 0121C 80AD4D1C 00194C03 */ sra $t1, $t9, 16 -/* 01220 80AD4D20 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 -/* 01224 80AD4D24 3C0180AD */ lui $at, %hi(D_80AD7258) ## $at = 80AD0000 -/* 01228 80AD4D28 C42A7258 */ lwc1 $f10, %lo(D_80AD7258)($at) -/* 0122C 80AD4D2C 46803220 */ cvt.s.w $f8, $f6 -/* 01230 80AD4D30 460A4402 */ mul.s $f16, $f8, $f10 -/* 01234 80AD4D34 4600848D */ trunc.w.s $f18, $f16 -/* 01238 80AD4D38 44089000 */ mfc1 $t0, $f18 -/* 0123C 80AD4D3C 00000000 */ nop -/* 01240 80AD4D40 00084400 */ sll $t0, $t0, 16 -/* 01244 80AD4D44 10000002 */ beq $zero, $zero, .L80AD4D50 -/* 01248 80AD4D48 00084403 */ sra $t0, $t0, 16 -/* 0124C 80AD4D4C 8603008A */ lh $v1, 0x008A($s0) ## 0000008A -.L80AD4D50: -/* 01250 80AD4D50 00682823 */ subu $a1, $v1, $t0 -/* 01254 80AD4D54 00052C00 */ sll $a1, $a1, 16 -/* 01258 80AD4D58 00052C03 */ sra $a1, $a1, 16 -/* 0125C 80AD4D5C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01260 80AD4D60 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 01264 80AD4D64 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 01268 80AD4D68 24070400 */ addiu $a3, $zero, 0x0400 ## $a3 = 00000400 -/* 0126C 80AD4D6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01270 80AD4D70 0C2B5155 */ jal func_80AD4554 -/* 01274 80AD4D74 8FA5002C */ lw $a1, 0x002C($sp) -/* 01278 80AD4D78 86040196 */ lh $a0, 0x0196($s0) ## 00000196 -/* 0127C 80AD4D7C 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 01280 80AD4D80 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01284 80AD4D84 000422C0 */ sll $a0, $a0, 11 -/* 01288 80AD4D88 00042400 */ sll $a0, $a0, 16 -/* 0128C 80AD4D8C 01616021 */ addu $t4, $t3, $at -/* 01290 80AD4D90 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 01294 80AD4D94 0C01DE1C */ jal Math_Sins - ## sins? -/* 01298 80AD4D98 00042403 */ sra $a0, $a0, 16 -/* 0129C 80AD4D9C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 012A0 80AD4DA0 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 012A4 80AD4DA4 00000000 */ nop -/* 012A8 80AD4DA8 46040182 */ mul.s $f6, $f0, $f4 -/* 012AC 80AD4DAC E7A60024 */ swc1 $f6, 0x0024($sp) -/* 012B0 80AD4DB0 0C01DE0D */ jal Math_Coss - ## coss? -/* 012B4 80AD4DB4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 012B8 80AD4DB8 C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 012BC 80AD4DBC C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 012C0 80AD4DC0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 012C4 80AD4DC4 46005402 */ mul.s $f16, $f10, $f0 -/* 012C8 80AD4DC8 46104481 */ sub.s $f18, $f8, $f16 -/* 012CC 80AD4DCC 0C01DE1C */ jal Math_Sins - ## sins? -/* 012D0 80AD4DD0 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 012D4 80AD4DD4 C7A60024 */ lwc1 $f6, 0x0024($sp) -/* 012D8 80AD4DD8 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 012DC 80AD4DDC 860D0196 */ lh $t5, 0x0196($s0) ## 00000196 -/* 012E0 80AD4DE0 46003282 */ mul.s $f10, $f6, $f0 -/* 012E4 80AD4DE4 3C0180AD */ lui $at, %hi(D_80AD725C) ## $at = 80AD0000 -/* 012E8 80AD4DE8 460A2200 */ add.s $f8, $f4, $f10 -/* 012EC 80AD4DEC 11A00008 */ beq $t5, $zero, .L80AD4E10 -/* 012F0 80AD4DF0 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 012F4 80AD4DF4 C430725C */ lwc1 $f16, %lo(D_80AD725C)($at) -/* 012F8 80AD4DF8 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 012FC 80AD4DFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01300 80AD4E00 4612803C */ c.lt.s $f16, $f18 -/* 01304 80AD4E04 00000000 */ nop -/* 01308 80AD4E08 45000005 */ bc1f .L80AD4E20 -/* 0130C 80AD4E0C 00000000 */ nop -.L80AD4E10: -/* 01310 80AD4E10 0C2B5064 */ jal func_80AD4190 -/* 01314 80AD4E14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01318 80AD4E18 10000004 */ beq $zero, $zero, .L80AD4E2C -/* 0131C 80AD4E1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD4E20: -/* 01320 80AD4E20 0C2B511C */ jal func_80AD4470 -/* 01324 80AD4E24 8FA5002C */ lw $a1, 0x002C($sp) -/* 01328 80AD4E28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD4E2C: -/* 0132C 80AD4E2C 0C00BE5D */ jal func_8002F974 -/* 01330 80AD4E30 24053072 */ addiu $a1, $zero, 0x3072 ## $a1 = 00003072 -/* 01334 80AD4E34 8FBF001C */ lw $ra, 0x001C($sp) -/* 01338 80AD4E38 8FB00018 */ lw $s0, 0x0018($sp) -/* 0133C 80AD4E3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01340 80AD4E40 03E00008 */ jr $ra -/* 01344 80AD4E44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s deleted file mode 100644 index f26825886e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AD4E48 -/* 01348 80AD4E48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0134C 80AD4E4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01350 80AD4E50 AFA5001C */ sw $a1, 0x001C($sp) -/* 01354 80AD4E54 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01358 80AD4E58 AFA70018 */ sw $a3, 0x0018($sp) -/* 0135C 80AD4E5C 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 01360 80AD4E60 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01364 80AD4E64 0C01DE80 */ jal Math_ApproxF - -/* 01368 80AD4E68 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 0136C 80AD4E6C 8FA70018 */ lw $a3, 0x0018($sp) -/* 01370 80AD4E70 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01374 80AD4E74 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 01378 80AD4E78 10400013 */ beq $v0, $zero, .L80AD4EC8 -/* 0137C 80AD4E7C 8FA70018 */ lw $a3, 0x0018($sp) -/* 01380 80AD4E80 90EE00AF */ lbu $t6, 0x00AF($a3) ## 000000AF -/* 01384 80AD4E84 55C00006 */ bnel $t6, $zero, .L80AD4EA0 -/* 01388 80AD4E88 84EF001C */ lh $t7, 0x001C($a3) ## 0000001C -/* 0138C 80AD4E8C 0C2B5050 */ jal func_80AD4140 -/* 01390 80AD4E90 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01394 80AD4E94 1000000D */ beq $zero, $zero, .L80AD4ECC -/* 01398 80AD4E98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0139C 80AD4E9C 84EF001C */ lh $t7, 0x001C($a3) ## 0000001C -.L80AD4EA0: -/* 013A0 80AD4EA0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 013A4 80AD4EA4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 013A8 80AD4EA8 15E10005 */ bne $t7, $at, .L80AD4EC0 -/* 013AC 80AD4EAC 00000000 */ nop -/* 013B0 80AD4EB0 0C2B4FFC */ jal func_80AD3FF0 -/* 013B4 80AD4EB4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 013B8 80AD4EB8 10000004 */ beq $zero, $zero, .L80AD4ECC -/* 013BC 80AD4EBC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD4EC0: -/* 013C0 80AD4EC0 0C2B4FD3 */ jal func_80AD3F4C -/* 013C4 80AD4EC4 8FA5001C */ lw $a1, 0x001C($sp) -.L80AD4EC8: -/* 013C8 80AD4EC8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD4ECC: -/* 013CC 80AD4ECC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 013D0 80AD4ED0 03E00008 */ jr $ra -/* 013D4 80AD4ED4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s deleted file mode 100644 index 751a661959..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s +++ /dev/null @@ -1,283 +0,0 @@ -.late_rodata -glabel D_80AD7260 - .float 0.001 - -.text -glabel func_80AD4ED8 -/* 013D8 80AD4ED8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 013DC 80AD4EDC AFBF004C */ sw $ra, 0x004C($sp) -/* 013E0 80AD4EE0 AFB10048 */ sw $s1, 0x0048($sp) -/* 013E4 80AD4EE4 AFB00044 */ sw $s0, 0x0044($sp) -/* 013E8 80AD4EE8 848E0196 */ lh $t6, 0x0196($a0) ## 00000196 -/* 013EC 80AD4EEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013F0 80AD4EF0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 013F4 80AD4EF4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 013F8 80AD4EF8 A48F0196 */ sh $t7, 0x0196($a0) ## 00000196 -/* 013FC 80AD4EFC 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 01400 80AD4F00 2403001C */ addiu $v1, $zero, 0x001C ## $v1 = 0000001C -/* 01404 80AD4F04 28410008 */ slti $at, $v0, 0x0008 -/* 01408 80AD4F08 102000D9 */ beq $at, $zero, .L80AD5270 -/* 0140C 80AD4F0C 28410005 */ slti $at, $v0, 0x0005 -/* 01410 80AD4F10 10200037 */ beq $at, $zero, .L80AD4FF0 -/* 01414 80AD4F14 244CFFFB */ addiu $t4, $v0, 0xFFFB ## $t4 = FFFFFFFB -/* 01418 80AD4F18 00022300 */ sll $a0, $v0, 12 -/* 0141C 80AD4F1C 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 01420 80AD4F20 00042400 */ sll $a0, $a0, 16 -/* 01424 80AD4F24 0C01DE1C */ jal Math_Sins - ## sins? -/* 01428 80AD4F28 00042403 */ sra $a0, $a0, 16 -/* 0142C 80AD4F2C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01430 80AD4F30 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01434 80AD4F34 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 01438 80AD4F38 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 0143C 80AD4F3C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01440 80AD4F40 460A0402 */ mul.s $f16, $f0, $f10 -/* 01444 80AD4F44 46062200 */ add.s $f8, $f4, $f6 -/* 01448 80AD4F48 46088480 */ add.s $f18, $f16, $f8 -/* 0144C 80AD4F4C E7B20070 */ swc1 $f18, 0x0070($sp) -/* 01450 80AD4F50 86040196 */ lh $a0, 0x0196($s0) ## 00000196 -/* 01454 80AD4F54 00042300 */ sll $a0, $a0, 12 -/* 01458 80AD4F58 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 0145C 80AD4F5C 00042400 */ sll $a0, $a0, 16 -/* 01460 80AD4F60 0C01DE0D */ jal Math_Coss - ## coss? -/* 01464 80AD4F64 00042403 */ sra $a0, $a0, 16 -/* 01468 80AD4F68 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 0146C 80AD4F6C 44812000 */ mtc1 $at, $f4 ## $f4 = 23.00 -/* 01470 80AD4F70 00000000 */ nop -/* 01474 80AD4F74 46040182 */ mul.s $f6, $f0, $f4 -/* 01478 80AD4F78 E7A60068 */ swc1 $f6, 0x0068($sp) -/* 0147C 80AD4F7C 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 01480 80AD4F80 0018C880 */ sll $t9, $t8, 2 -/* 01484 80AD4F84 02394021 */ addu $t0, $s1, $t9 -/* 01488 80AD4F88 0C016A7D */ jal func_8005A9F4 -/* 0148C 80AD4F8C 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 01490 80AD4F90 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 01494 80AD4F94 00042400 */ sll $a0, $a0, 16 -/* 01498 80AD4F98 0C01DE1C */ jal Math_Sins - ## sins? -/* 0149C 80AD4F9C 00042403 */ sra $a0, $a0, 16 -/* 014A0 80AD4FA0 C7AA0068 */ lwc1 $f10, 0x0068($sp) -/* 014A4 80AD4FA4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 014A8 80AD4FA8 460A0402 */ mul.s $f16, $f0, $f10 -/* 014AC 80AD4FAC 46088480 */ add.s $f18, $f16, $f8 -/* 014B0 80AD4FB0 E7B2006C */ swc1 $f18, 0x006C($sp) -/* 014B4 80AD4FB4 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -/* 014B8 80AD4FB8 00095080 */ sll $t2, $t1, 2 -/* 014BC 80AD4FBC 022A5821 */ addu $t3, $s1, $t2 -/* 014C0 80AD4FC0 0C016A7D */ jal func_8005A9F4 -/* 014C4 80AD4FC4 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 014C8 80AD4FC8 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 014CC 80AD4FCC 00042400 */ sll $a0, $a0, 16 -/* 014D0 80AD4FD0 0C01DE0D */ jal Math_Coss - ## coss? -/* 014D4 80AD4FD4 00042403 */ sra $a0, $a0, 16 -/* 014D8 80AD4FD8 C7A40068 */ lwc1 $f4, 0x0068($sp) -/* 014DC 80AD4FDC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 014E0 80AD4FE0 46040182 */ mul.s $f6, $f0, $f4 -/* 014E4 80AD4FE4 460A3400 */ add.s $f16, $f6, $f10 -/* 014E8 80AD4FE8 1000002A */ beq $zero, $zero, .L80AD5094 -/* 014EC 80AD4FEC E7B00074 */ swc1 $f16, 0x0074($sp) -.L80AD4FF0: -/* 014F0 80AD4FF0 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 014F4 80AD4FF4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 014F8 80AD4FF8 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 014FC 80AD4FFC 46805420 */ cvt.s.w $f16, $f10 -/* 01500 80AD5000 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01504 80AD5004 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 01508 80AD5008 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 0150C 80AD500C 46124100 */ add.s $f4, $f8, $f18 -/* 01510 80AD5010 46103202 */ mul.s $f8, $f6, $f16 -/* 01514 80AD5014 46082480 */ add.s $f18, $f4, $f8 -/* 01518 80AD5018 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 0151C 80AD501C 862D07A0 */ lh $t5, 0x07A0($s1) ## 000007A0 -/* 01520 80AD5020 000D7080 */ sll $t6, $t5, 2 -/* 01524 80AD5024 022E7821 */ addu $t7, $s1, $t6 -/* 01528 80AD5028 0C016A7D */ jal func_8005A9F4 -/* 0152C 80AD502C 8DE40790 */ lw $a0, 0x0790($t7) ## 00000790 -/* 01530 80AD5030 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 01534 80AD5034 00042400 */ sll $a0, $a0, 16 -/* 01538 80AD5038 0C01DE1C */ jal Math_Sins - ## sins? -/* 0153C 80AD503C 00042403 */ sra $a0, $a0, 16 -/* 01540 80AD5040 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 01544 80AD5044 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 01548 80AD5048 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 0154C 80AD504C 460A0182 */ mul.s $f6, $f0, $f10 -/* 01550 80AD5050 46103100 */ add.s $f4, $f6, $f16 -/* 01554 80AD5054 E7A4006C */ swc1 $f4, 0x006C($sp) -/* 01558 80AD5058 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 0155C 80AD505C 0018C880 */ sll $t9, $t8, 2 -/* 01560 80AD5060 02394021 */ addu $t0, $s1, $t9 -/* 01564 80AD5064 0C016A7D */ jal func_8005A9F4 -/* 01568 80AD5068 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 0156C 80AD506C 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 01570 80AD5070 00042400 */ sll $a0, $a0, 16 -/* 01574 80AD5074 0C01DE0D */ jal Math_Coss - ## coss? -/* 01578 80AD5078 00042403 */ sra $a0, $a0, 16 -/* 0157C 80AD507C 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 01580 80AD5080 44814000 */ mtc1 $at, $f8 ## $f8 = 23.00 -/* 01584 80AD5084 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01588 80AD5088 46080482 */ mul.s $f18, $f0, $f8 -/* 0158C 80AD508C 460A9180 */ add.s $f6, $f18, $f10 -/* 01590 80AD5090 E7A60074 */ swc1 $f6, 0x0074($sp) -.L80AD5094: -/* 01594 80AD5094 86090196 */ lh $t1, 0x0196($s0) ## 00000196 -/* 01598 80AD5098 3C0680AD */ lui $a2, %hi(D_80AD7114) ## $a2 = 80AD0000 -/* 0159C 80AD509C 3C0780AD */ lui $a3, %hi(D_80AD7120) ## $a3 = 80AD0000 -/* 015A0 80AD50A0 00095080 */ sll $t2, $t1, 2 -/* 015A4 80AD50A4 01495021 */ addu $t2, $t2, $t1 -/* 015A8 80AD50A8 000A5040 */ sll $t2, $t2, 1 -/* 015AC 80AD50AC 254B0050 */ addiu $t3, $t2, 0x0050 ## $t3 = 00000050 -/* 015B0 80AD50B0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 015B4 80AD50B4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 015B8 80AD50B8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 015BC 80AD50BC 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 015C0 80AD50C0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 015C4 80AD50C4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 015C8 80AD50C8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 015CC 80AD50CC 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 015D0 80AD50D0 AFA80038 */ sw $t0, 0x0038($sp) -/* 015D4 80AD50D4 AFB90034 */ sw $t9, 0x0034($sp) -/* 015D8 80AD50D8 AFB80030 */ sw $t8, 0x0030($sp) -/* 015DC 80AD50DC AFAF0024 */ sw $t7, 0x0024($sp) -/* 015E0 80AD50E0 AFAE0020 */ sw $t6, 0x0020($sp) -/* 015E4 80AD50E4 AFAD001C */ sw $t5, 0x001C($sp) -/* 015E8 80AD50E8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 015EC 80AD50EC AFA9003C */ sw $t1, 0x003C($sp) -/* 015F0 80AD50F0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 015F4 80AD50F4 24E77120 */ addiu $a3, $a3, %lo(D_80AD7120) ## $a3 = 80AD7120 -/* 015F8 80AD50F8 24C67114 */ addiu $a2, $a2, %lo(D_80AD7114) ## $a2 = 80AD7114 -/* 015FC 80AD50FC AFA0002C */ sw $zero, 0x002C($sp) -/* 01600 80AD5100 AFA00028 */ sw $zero, 0x0028($sp) -/* 01604 80AD5104 AFA00014 */ sw $zero, 0x0014($sp) -/* 01608 80AD5108 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0160C 80AD510C 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 01610 80AD5110 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 01614 80AD5114 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 -/* 01618 80AD5118 C7A4006C */ lwc1 $f4, 0x006C($sp) -/* 0161C 80AD511C C7AA0074 */ lwc1 $f10, 0x0074($sp) -/* 01620 80AD5120 46000400 */ add.s $f16, $f0, $f0 -/* 01624 80AD5124 3C0680AD */ lui $a2, %hi(D_80AD7114) ## $a2 = 80AD0000 -/* 01628 80AD5128 3C0780AD */ lui $a3, %hi(D_80AD7120) ## $a3 = 80AD0000 -/* 0162C 80AD512C 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 01630 80AD5130 46048201 */ sub.s $f8, $f16, $f4 -/* 01634 80AD5134 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01638 80AD5138 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 0163C 80AD513C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01640 80AD5140 E7A8006C */ swc1 $f8, 0x006C($sp) -/* 01644 80AD5144 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C -/* 01648 80AD5148 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0164C 80AD514C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01650 80AD5150 46021480 */ add.s $f18, $f2, $f2 -/* 01654 80AD5154 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -/* 01658 80AD5158 24E77120 */ addiu $a3, $a3, %lo(D_80AD7120) ## $a3 = 80AD7120 -/* 0165C 80AD515C 24C67114 */ addiu $a2, $a2, %lo(D_80AD7114) ## $a2 = 80AD7114 -/* 01660 80AD5160 460A9181 */ sub.s $f6, $f18, $f10 -/* 01664 80AD5164 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01668 80AD5168 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 0166C 80AD516C E7A60074 */ swc1 $f6, 0x0074($sp) -/* 01670 80AD5170 860A0196 */ lh $t2, 0x0196($s0) ## 00000196 -/* 01674 80AD5174 AFA90038 */ sw $t1, 0x0038($sp) -/* 01678 80AD5178 AFA80034 */ sw $t0, 0x0034($sp) -/* 0167C 80AD517C 000A5880 */ sll $t3, $t2, 2 -/* 01680 80AD5180 016A5821 */ addu $t3, $t3, $t2 -/* 01684 80AD5184 000B5840 */ sll $t3, $t3, 1 -/* 01688 80AD5188 256C0050 */ addiu $t4, $t3, 0x0050 ## $t4 = 00000050 -/* 0168C 80AD518C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01690 80AD5190 AFAA003C */ sw $t2, 0x003C($sp) -/* 01694 80AD5194 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01698 80AD5198 AFB90030 */ sw $t9, 0x0030($sp) -/* 0169C 80AD519C AFA0002C */ sw $zero, 0x002C($sp) -/* 016A0 80AD51A0 AFA00028 */ sw $zero, 0x0028($sp) -/* 016A4 80AD51A4 AFB80024 */ sw $t8, 0x0024($sp) -/* 016A8 80AD51A8 AFAF0020 */ sw $t7, 0x0020($sp) -/* 016AC 80AD51AC AFAE001C */ sw $t6, 0x001C($sp) -/* 016B0 80AD51B0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 016B4 80AD51B4 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 016B8 80AD51B8 AFA00014 */ sw $zero, 0x0014($sp) -/* 016BC 80AD51BC C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 016C0 80AD51C0 3C0680AD */ lui $a2, %hi(D_80AD7114) ## $a2 = 80AD0000 -/* 016C4 80AD51C4 3C0780AD */ lui $a3, %hi(D_80AD7120) ## $a3 = 80AD0000 -/* 016C8 80AD51C8 E7B0006C */ swc1 $f16, 0x006C($sp) -/* 016CC 80AD51CC C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 016D0 80AD51D0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 016D4 80AD51D4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 016D8 80AD51D8 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 016DC 80AD51DC 860B0196 */ lh $t3, 0x0196($s0) ## 00000196 -/* 016E0 80AD51E0 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 016E4 80AD51E4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 016E8 80AD51E8 000B6080 */ sll $t4, $t3, 2 -/* 016EC 80AD51EC 018B6021 */ addu $t4, $t4, $t3 -/* 016F0 80AD51F0 000C6040 */ sll $t4, $t4, 1 -/* 016F4 80AD51F4 258D0050 */ addiu $t5, $t4, 0x0050 ## $t5 = 00000050 -/* 016F8 80AD51F8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 016FC 80AD51FC 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01700 80AD5200 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01704 80AD5204 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 01708 80AD5208 AFAA0038 */ sw $t2, 0x0038($sp) -/* 0170C 80AD520C AFA90034 */ sw $t1, 0x0034($sp) -/* 01710 80AD5210 AFA80030 */ sw $t0, 0x0030($sp) -/* 01714 80AD5214 AFAB003C */ sw $t3, 0x003C($sp) -/* 01718 80AD5218 AFAD0010 */ sw $t5, 0x0010($sp) -/* 0171C 80AD521C AFB90024 */ sw $t9, 0x0024($sp) -/* 01720 80AD5220 AFB80020 */ sw $t8, 0x0020($sp) -/* 01724 80AD5224 AFA0002C */ sw $zero, 0x002C($sp) -/* 01728 80AD5228 AFA00028 */ sw $zero, 0x0028($sp) -/* 0172C 80AD522C AFAF001C */ sw $t7, 0x001C($sp) -/* 01730 80AD5230 AFAE0018 */ sw $t6, 0x0018($sp) -/* 01734 80AD5234 AFA00014 */ sw $zero, 0x0014($sp) -/* 01738 80AD5238 24E77120 */ addiu $a3, $a3, %lo(D_80AD7120) ## $a3 = 80AD7120 -/* 0173C 80AD523C 24C67114 */ addiu $a2, $a2, %lo(D_80AD7114) ## $a2 = 80AD7114 -/* 01740 80AD5240 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01744 80AD5244 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 01748 80AD5248 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 0174C 80AD524C 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 01750 80AD5250 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01754 80AD5254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01758 80AD5258 5441001C */ bnel $v0, $at, .L80AD52CC -/* 0175C 80AD525C 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 01760 80AD5260 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01764 80AD5264 24053878 */ addiu $a1, $zero, 0x3878 ## $a1 = 00003878 -/* 01768 80AD5268 10000017 */ beq $zero, $zero, .L80AD52C8 -/* 0176C 80AD526C 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -.L80AD5270: -/* 01770 80AD5270 14620006 */ bne $v1, $v0, .L80AD528C -/* 01774 80AD5274 28410013 */ slti $at, $v0, 0x0013 -/* 01778 80AD5278 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0177C 80AD527C 0C2B5082 */ jal func_80AD4208 -/* 01780 80AD5280 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01784 80AD5284 10000010 */ beq $zero, $zero, .L80AD52C8 -/* 01788 80AD5288 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -.L80AD528C: -/* 0178C 80AD528C 1420000E */ bne $at, $zero, .L80AD52C8 -/* 01790 80AD5290 00626023 */ subu $t4, $v1, $v0 -/* 01794 80AD5294 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 01798 80AD5298 3C0180AD */ lui $at, %hi(D_80AD7260) ## $at = 80AD0000 -/* 0179C 80AD529C C42A7260 */ lwc1 $f10, %lo(D_80AD7260)($at) -/* 017A0 80AD52A0 468044A0 */ cvt.s.w $f18, $f8 -/* 017A4 80AD52A4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 017A8 80AD52A8 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 017AC 80AD52AC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 017B0 80AD52B0 460A9002 */ mul.s $f0, $f18, $f10 -/* 017B4 80AD52B4 46103100 */ add.s $f4, $f6, $f16 -/* 017B8 80AD52B8 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 017BC 80AD52BC E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 017C0 80AD52C0 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 017C4 80AD52C4 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -.L80AD52C8: -/* 017C8 80AD52C8 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -.L80AD52CC: -/* 017CC 80AD52CC 14410003 */ bne $v0, $at, .L80AD52DC -/* 017D0 80AD52D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017D4 80AD52D4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 017D8 80AD52D8 24053877 */ addiu $a1, $zero, 0x3877 ## $a1 = 00003877 -.L80AD52DC: -/* 017DC 80AD52DC 8FBF004C */ lw $ra, 0x004C($sp) -/* 017E0 80AD52E0 8FB00044 */ lw $s0, 0x0044($sp) -/* 017E4 80AD52E4 8FB10048 */ lw $s1, 0x0048($sp) -/* 017E8 80AD52E8 03E00008 */ jr $ra -/* 017EC 80AD52EC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s deleted file mode 100644 index cf22a51b64..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_80AD52F0 -/* 017F0 80AD52F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 017F4 80AD52F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 017F8 80AD52F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 017FC 80AD52FC AFA5001C */ sw $a1, 0x001C($sp) -/* 01800 80AD5300 AFA60018 */ sw $a2, 0x0018($sp) -/* 01804 80AD5304 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01808 80AD5308 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0180C 80AD530C 8FA60018 */ lw $a2, 0x0018($sp) -/* 01810 80AD5310 84C20196 */ lh $v0, 0x0196($a2) ## 00000196 -/* 01814 80AD5314 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01818 80AD5318 10400003 */ beq $v0, $zero, .L80AD5328 -/* 0181C 80AD531C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01820 80AD5320 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 01824 80AD5324 84C20196 */ lh $v0, 0x0196($a2) ## 00000196 -.L80AD5328: -/* 01828 80AD5328 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0182C 80AD532C 3C01417F */ lui $at, 0x417F ## $at = 417F0000 -/* 01830 80AD5330 44814000 */ mtc1 $at, $f8 ## $f8 = 15.94 -/* 01834 80AD5334 468021A0 */ cvt.s.w $f6, $f4 -/* 01838 80AD5338 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0183C 80AD533C 84CF00B6 */ lh $t7, 0x00B6($a2) ## 000000B6 -/* 01840 80AD5340 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01844 80AD5344 25F81000 */ addiu $t8, $t7, 0x1000 ## $t8 = 00001000 -/* 01848 80AD5348 46083282 */ mul.s $f10, $f6, $f8 -/* 0184C 80AD534C A4D800B6 */ sh $t8, 0x00B6($a2) ## 000000B6 -/* 01850 80AD5350 4459F800 */ cfc1 $t9, $31 -/* 01854 80AD5354 44C8F800 */ ctc1 $t0, $31 -/* 01858 80AD5358 00000000 */ nop -/* 0185C 80AD535C 46005424 */ cvt.w.s $f16, $f10 -/* 01860 80AD5360 4448F800 */ cfc1 $t0, $31 -/* 01864 80AD5364 00000000 */ nop -/* 01868 80AD5368 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 0186C 80AD536C 51000013 */ beql $t0, $zero, .L80AD53BC -/* 01870 80AD5370 44088000 */ mfc1 $t0, $f16 -/* 01874 80AD5374 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 01878 80AD5378 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0187C 80AD537C 46105401 */ sub.s $f16, $f10, $f16 -/* 01880 80AD5380 44C8F800 */ ctc1 $t0, $31 -/* 01884 80AD5384 00000000 */ nop -/* 01888 80AD5388 46008424 */ cvt.w.s $f16, $f16 -/* 0188C 80AD538C 4448F800 */ cfc1 $t0, $31 -/* 01890 80AD5390 00000000 */ nop -/* 01894 80AD5394 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 01898 80AD5398 15000005 */ bne $t0, $zero, .L80AD53B0 -/* 0189C 80AD539C 00000000 */ nop -/* 018A0 80AD53A0 44088000 */ mfc1 $t0, $f16 -/* 018A4 80AD53A4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 018A8 80AD53A8 10000007 */ beq $zero, $zero, .L80AD53C8 -/* 018AC 80AD53AC 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80AD53B0: -/* 018B0 80AD53B0 10000005 */ beq $zero, $zero, .L80AD53C8 -/* 018B4 80AD53B4 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 018B8 80AD53B8 44088000 */ mfc1 $t0, $f16 -.L80AD53BC: -/* 018BC 80AD53BC 00000000 */ nop -/* 018C0 80AD53C0 0500FFFB */ bltz $t0, .L80AD53B0 -/* 018C4 80AD53C4 00000000 */ nop -.L80AD53C8: -/* 018C8 80AD53C8 44D9F800 */ ctc1 $t9, $31 -/* 018CC 80AD53CC A0C80217 */ sb $t0, 0x0217($a2) ## 00000217 -/* 018D0 80AD53D0 14400003 */ bne $v0, $zero, .L80AD53E0 -/* 018D4 80AD53D4 A0C800C8 */ sb $t0, 0x00C8($a2) ## 000000C8 -/* 018D8 80AD53D8 0C2B4F5A */ jal func_80AD3D68 -/* 018DC 80AD53DC 8FA5001C */ lw $a1, 0x001C($sp) -.L80AD53E0: -/* 018E0 80AD53E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 018E4 80AD53E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018E8 80AD53E8 03E00008 */ jr $ra -/* 018EC 80AD53EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s deleted file mode 100644 index bf8cdc087b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80AD53F0 -/* 018F0 80AD53F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 018F4 80AD53F4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 018F8 80AD53F8 AFB00030 */ sw $s0, 0x0030($sp) -/* 018FC 80AD53FC AFA5003C */ sw $a1, 0x003C($sp) -/* 01900 80AD5400 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 01904 80AD5404 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01908 80AD5408 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0190C 80AD540C 10400002 */ beq $v0, $zero, .L80AD5418 -/* 01910 80AD5410 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01914 80AD5414 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -.L80AD5418: -/* 01918 80AD5418 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 0191C 80AD541C 8FA4003C */ lw $a0, 0x003C($sp) -/* 01920 80AD5420 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 01924 80AD5424 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 01928 80AD5428 13000013 */ beq $t8, $zero, .L80AD5478 -/* 0192C 80AD542C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01930 80AD5430 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 -/* 01934 80AD5434 258C4BA0 */ addiu $t4, $t4, 0x4BA0 ## $t4 = 06004BA0 -/* 01938 80AD5438 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0193C 80AD543C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01940 80AD5440 2409000F */ addiu $t1, $zero, 0x000F ## $t1 = 0000000F -/* 01944 80AD5444 240A006D */ addiu $t2, $zero, 0x006D ## $t2 = 0000006D -/* 01948 80AD5448 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 0194C 80AD544C AFAB0020 */ sw $t3, 0x0020($sp) -/* 01950 80AD5450 AFAA001C */ sw $t2, 0x001C($sp) -/* 01954 80AD5454 AFA90018 */ sw $t1, 0x0018($sp) -/* 01958 80AD5458 AFA80014 */ sw $t0, 0x0014($sp) -/* 0195C 80AD545C AFB90010 */ sw $t9, 0x0010($sp) -/* 01960 80AD5460 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 01964 80AD5464 AFAC0024 */ sw $t4, 0x0024($sp) -/* 01968 80AD5468 0C2B50AC */ jal func_80AD42B0 -/* 0196C 80AD546C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01970 80AD5470 10000007 */ beq $zero, $zero, .L80AD5490 -/* 01974 80AD5474 00000000 */ nop -.L80AD5478: -/* 01978 80AD5478 860D0196 */ lh $t5, 0x0196($s0) ## 00000196 -/* 0197C 80AD547C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01980 80AD5480 15A00003 */ bne $t5, $zero, .L80AD5490 -/* 01984 80AD5484 00000000 */ nop -/* 01988 80AD5488 0C2B4F5A */ jal func_80AD3D68 -/* 0198C 80AD548C 8FA5003C */ lw $a1, 0x003C($sp) -.L80AD5490: -/* 01990 80AD5490 0C00B638 */ jal Actor_MoveForward - -/* 01994 80AD5494 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01998 80AD5498 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0199C 80AD549C 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 019A0 80AD54A0 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 019A4 80AD54A4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 019A8 80AD54A8 44060000 */ mfc1 $a2, $f0 -/* 019AC 80AD54AC 44070000 */ mfc1 $a3, $f0 -/* 019B0 80AD54B0 8FA4003C */ lw $a0, 0x003C($sp) -/* 019B4 80AD54B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 019B8 80AD54B8 0C00B92D */ jal func_8002E4B4 -/* 019BC 80AD54BC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 019C0 80AD54C0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 019C4 80AD54C4 8FB00030 */ lw $s0, 0x0030($sp) -/* 019C8 80AD54C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 019CC 80AD54CC 03E00008 */ jr $ra -/* 019D0 80AD54D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s deleted file mode 100644 index dfaa3f80a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s +++ /dev/null @@ -1,272 +0,0 @@ -.late_rodata -glabel D_80AD7264 - .word 0x3BE56042 -glabel D_80AD7268 - .word 0x3B808081 -glabel D_80AD726C - .word 0x3BB78035 -glabel D_80AD7270 - .word 0x3AB78035 -glabel D_80AD7274 - .word 0x37E64689 -glabel D_80AD7278 - .word 0x3D70F0F1 -glabel D_80AD727C - .word 0x3F48C8C9 - -.text -glabel func_80AD54D4 -/* 019D4 80AD54D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 019D8 80AD54D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 019DC 80AD54DC AFB00028 */ sw $s0, 0x0028($sp) -/* 019E0 80AD54E0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 019E4 80AD54E4 90990217 */ lbu $t9, 0x0217($a0) ## 00000217 -/* 019E8 80AD54E8 3C1880AD */ lui $t8, %hi(D_80AD712C) ## $t8 = 80AD0000 -/* 019EC 80AD54EC 2718712C */ addiu $t8, $t8, %lo(D_80AD712C) ## $t8 = 80AD712C -/* 019F0 80AD54F0 000E7900 */ sll $t7, $t6, 4 -/* 019F4 80AD54F4 03251021 */ addu $v0, $t9, $a1 -/* 019F8 80AD54F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 019FC 80AD54FC 04410003 */ bgez $v0, .L80AD550C -/* 01A00 80AD5500 01F81821 */ addu $v1, $t7, $t8 -/* 01A04 80AD5504 10000007 */ beq $zero, $zero, .L80AD5524 -/* 01A08 80AD5508 A0800217 */ sb $zero, 0x0217($a0) ## 00000217 -.L80AD550C: -/* 01A0C 80AD550C 28410100 */ slti $at, $v0, 0x0100 -/* 01A10 80AD5510 14200003 */ bne $at, $zero, .L80AD5520 -/* 01A14 80AD5514 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01A18 80AD5518 10000001 */ beq $zero, $zero, .L80AD5520 -/* 01A1C 80AD551C 240400FF */ addiu $a0, $zero, 0x00FF ## $a0 = 000000FF -.L80AD5520: -/* 01A20 80AD5520 A2040217 */ sb $a0, 0x0217($s0) ## 00000217 -.L80AD5524: -/* 01A24 80AD5524 04A3001D */ bgezl $a1, .L80AD559C -/* 01A28 80AD5528 92090217 */ lbu $t1, 0x0217($s0) ## 00000217 -/* 01A2C 80AD552C 92080217 */ lbu $t0, 0x0217($s0) ## 00000217 -/* 01A30 80AD5530 3C0180AD */ lui $at, %hi(D_80AD7264) ## $at = 80AD0000 -/* 01A34 80AD5534 C42E7264 */ lwc1 $f14, %lo(D_80AD7264)($at) -/* 01A38 80AD5538 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 01A3C 80AD553C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01A40 80AD5540 05010004 */ bgez $t0, .L80AD5554 -/* 01A44 80AD5544 46802320 */ cvt.s.w $f12, $f4 -/* 01A48 80AD5548 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01A4C 80AD554C 00000000 */ nop -/* 01A50 80AD5550 46066300 */ add.s $f12, $f12, $f6 -.L80AD5554: -/* 01A54 80AD5554 3C0180AD */ lui $at, %hi(D_80AD7268) ## $at = 80AD0000 -/* 01A58 80AD5558 C4287268 */ lwc1 $f8, %lo(D_80AD7268)($at) -/* 01A5C 80AD555C 3C0180AD */ lui $at, %hi(D_80AD726C) ## $at = 80AD0000 -/* 01A60 80AD5560 C42A726C */ lwc1 $f10, %lo(D_80AD726C)($at) -/* 01A64 80AD5564 46086082 */ mul.s $f2, $f12, $f8 -/* 01A68 80AD5568 3C0180AD */ lui $at, %hi(D_80AD7270) ## $at = 80AD0000 -/* 01A6C 80AD556C C4327270 */ lwc1 $f18, %lo(D_80AD7270)($at) -/* 01A70 80AD5570 46025402 */ mul.s $f16, $f10, $f2 -/* 01A74 80AD5574 00000000 */ nop -/* 01A78 80AD5578 46027102 */ mul.s $f4, $f14, $f2 -/* 01A7C 80AD557C 46128000 */ add.s $f0, $f16, $f18 -/* 01A80 80AD5580 46047181 */ sub.s $f6, $f14, $f4 -/* 01A84 80AD5584 E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 01A88 80AD5588 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 01A8C 80AD558C 460E3200 */ add.s $f8, $f6, $f14 -/* 01A90 80AD5590 10000017 */ beq $zero, $zero, .L80AD55F0 -/* 01A94 80AD5594 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 01A98 80AD5598 92090217 */ lbu $t1, 0x0217($s0) ## 00000217 -.L80AD559C: -/* 01A9C 80AD559C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01AA0 80AD55A0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 01AA4 80AD55A4 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 01AA8 80AD55A8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01AAC 80AD55AC 05210004 */ bgez $t1, .L80AD55C0 -/* 01AB0 80AD55B0 46805320 */ cvt.s.w $f12, $f10 -/* 01AB4 80AD55B4 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 01AB8 80AD55B8 00000000 */ nop -/* 01ABC 80AD55BC 46106300 */ add.s $f12, $f12, $f16 -.L80AD55C0: -/* 01AC0 80AD55C0 3C0180AD */ lui $at, %hi(D_80AD7274) ## $at = 80AD0000 -/* 01AC4 80AD55C4 C4327274 */ lwc1 $f18, %lo(D_80AD7274)($at) -/* 01AC8 80AD55C8 3C0180AD */ lui $at, %hi(D_80AD7278) ## $at = 80AD0000 -/* 01ACC 80AD55CC C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 01AD0 80AD55D0 46126002 */ mul.s $f0, $f12, $f18 -/* 01AD4 80AD55D4 E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 01AD8 80AD55D8 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 01ADC 80AD55DC E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 01AE0 80AD55E0 C4267278 */ lwc1 $f6, %lo(D_80AD7278)($at) -/* 01AE4 80AD55E4 460C3202 */ mul.s $f8, $f6, $f12 -/* 01AE8 80AD55E8 46082280 */ add.s $f10, $f4, $f8 -/* 01AEC 80AD55EC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -.L80AD55F0: -/* 01AF0 80AD55F0 906A0003 */ lbu $t2, 0x0003($v1) ## 00000003 -/* 01AF4 80AD55F4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01AF8 80AD55F8 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 -/* 01AFC 80AD55FC 05410004 */ bgez $t2, .L80AD5610 -/* 01B00 80AD5600 468084A0 */ cvt.s.w $f18, $f16 -/* 01B04 80AD5604 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01B08 80AD5608 00000000 */ nop -/* 01B0C 80AD560C 46069480 */ add.s $f18, $f18, $f6 -.L80AD5610: -/* 01B10 80AD5610 46029102 */ mul.s $f4, $f18, $f2 -/* 01B14 80AD5614 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01B18 80AD5618 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01B1C 80AD561C 444BF800 */ cfc1 $t3, $31 -/* 01B20 80AD5620 44CCF800 */ ctc1 $t4, $31 -/* 01B24 80AD5624 00000000 */ nop -/* 01B28 80AD5628 46002224 */ cvt.w.s $f8, $f4 -/* 01B2C 80AD562C 444CF800 */ cfc1 $t4, $31 -/* 01B30 80AD5630 00000000 */ nop -/* 01B34 80AD5634 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01B38 80AD5638 51800013 */ beql $t4, $zero, .L80AD5688 -/* 01B3C 80AD563C 440C4000 */ mfc1 $t4, $f8 -/* 01B40 80AD5640 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 01B44 80AD5644 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01B48 80AD5648 46082201 */ sub.s $f8, $f4, $f8 -/* 01B4C 80AD564C 44CCF800 */ ctc1 $t4, $31 -/* 01B50 80AD5650 00000000 */ nop -/* 01B54 80AD5654 46004224 */ cvt.w.s $f8, $f8 -/* 01B58 80AD5658 444CF800 */ cfc1 $t4, $31 -/* 01B5C 80AD565C 00000000 */ nop -/* 01B60 80AD5660 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01B64 80AD5664 15800005 */ bne $t4, $zero, .L80AD567C -/* 01B68 80AD5668 00000000 */ nop -/* 01B6C 80AD566C 440C4000 */ mfc1 $t4, $f8 -/* 01B70 80AD5670 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01B74 80AD5674 10000007 */ beq $zero, $zero, .L80AD5694 -/* 01B78 80AD5678 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 -.L80AD567C: -/* 01B7C 80AD567C 10000005 */ beq $zero, $zero, .L80AD5694 -/* 01B80 80AD5680 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01B84 80AD5684 440C4000 */ mfc1 $t4, $f8 -.L80AD5688: -/* 01B88 80AD5688 00000000 */ nop -/* 01B8C 80AD568C 0580FFFB */ bltz $t4, .L80AD567C -/* 01B90 80AD5690 00000000 */ nop -.L80AD5694: -/* 01B94 80AD5694 A20C0214 */ sb $t4, 0x0214($s0) ## 00000214 -/* 01B98 80AD5698 906D0004 */ lbu $t5, 0x0004($v1) ## 00000004 -/* 01B9C 80AD569C 44CBF800 */ ctc1 $t3, $31 -/* 01BA0 80AD56A0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01BA4 80AD56A4 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 01BA8 80AD56A8 05A10004 */ bgez $t5, .L80AD56BC -/* 01BAC 80AD56AC 46805420 */ cvt.s.w $f16, $f10 -/* 01BB0 80AD56B0 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01BB4 80AD56B4 00000000 */ nop -/* 01BB8 80AD56B8 46068400 */ add.s $f16, $f16, $f6 -.L80AD56BC: -/* 01BBC 80AD56BC 46028482 */ mul.s $f18, $f16, $f2 -/* 01BC0 80AD56C0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01BC4 80AD56C4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01BC8 80AD56C8 444EF800 */ cfc1 $t6, $31 -/* 01BCC 80AD56CC 44CFF800 */ ctc1 $t7, $31 -/* 01BD0 80AD56D0 00000000 */ nop -/* 01BD4 80AD56D4 46009124 */ cvt.w.s $f4, $f18 -/* 01BD8 80AD56D8 444FF800 */ cfc1 $t7, $31 -/* 01BDC 80AD56DC 00000000 */ nop -/* 01BE0 80AD56E0 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 01BE4 80AD56E4 51E00013 */ beql $t7, $zero, .L80AD5734 -/* 01BE8 80AD56E8 440F2000 */ mfc1 $t7, $f4 -/* 01BEC 80AD56EC 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 01BF0 80AD56F0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01BF4 80AD56F4 46049101 */ sub.s $f4, $f18, $f4 -/* 01BF8 80AD56F8 44CFF800 */ ctc1 $t7, $31 -/* 01BFC 80AD56FC 00000000 */ nop -/* 01C00 80AD5700 46002124 */ cvt.w.s $f4, $f4 -/* 01C04 80AD5704 444FF800 */ cfc1 $t7, $31 -/* 01C08 80AD5708 00000000 */ nop -/* 01C0C 80AD570C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 01C10 80AD5710 15E00005 */ bne $t7, $zero, .L80AD5728 -/* 01C14 80AD5714 00000000 */ nop -/* 01C18 80AD5718 440F2000 */ mfc1 $t7, $f4 -/* 01C1C 80AD571C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01C20 80AD5720 10000007 */ beq $zero, $zero, .L80AD5740 -/* 01C24 80AD5724 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80AD5728: -/* 01C28 80AD5728 10000005 */ beq $zero, $zero, .L80AD5740 -/* 01C2C 80AD572C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 01C30 80AD5730 440F2000 */ mfc1 $t7, $f4 -.L80AD5734: -/* 01C34 80AD5734 00000000 */ nop -/* 01C38 80AD5738 05E0FFFB */ bltz $t7, .L80AD5728 -/* 01C3C 80AD573C 00000000 */ nop -.L80AD5740: -/* 01C40 80AD5740 A20F0215 */ sb $t7, 0x0215($s0) ## 00000215 -/* 01C44 80AD5744 90780005 */ lbu $t8, 0x0005($v1) ## 00000005 -/* 01C48 80AD5748 44CEF800 */ ctc1 $t6, $31 -/* 01C4C 80AD574C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01C50 80AD5750 44984000 */ mtc1 $t8, $f8 ## $f8 = -0.00 -/* 01C54 80AD5754 07010004 */ bgez $t8, .L80AD5768 -/* 01C58 80AD5758 468042A0 */ cvt.s.w $f10, $f8 -/* 01C5C 80AD575C 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01C60 80AD5760 00000000 */ nop -/* 01C64 80AD5764 46065280 */ add.s $f10, $f10, $f6 -.L80AD5768: -/* 01C68 80AD5768 46025402 */ mul.s $f16, $f10, $f2 -/* 01C6C 80AD576C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01C70 80AD5770 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01C74 80AD5774 4459F800 */ cfc1 $t9, $31 -/* 01C78 80AD5778 44C8F800 */ ctc1 $t0, $31 -/* 01C7C 80AD577C 00000000 */ nop -/* 01C80 80AD5780 460084A4 */ cvt.w.s $f18, $f16 -/* 01C84 80AD5784 4448F800 */ cfc1 $t0, $31 -/* 01C88 80AD5788 00000000 */ nop -/* 01C8C 80AD578C 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 01C90 80AD5790 51000013 */ beql $t0, $zero, .L80AD57E0 -/* 01C94 80AD5794 44089000 */ mfc1 $t0, $f18 -/* 01C98 80AD5798 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 01C9C 80AD579C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01CA0 80AD57A0 46128481 */ sub.s $f18, $f16, $f18 -/* 01CA4 80AD57A4 44C8F800 */ ctc1 $t0, $31 -/* 01CA8 80AD57A8 00000000 */ nop -/* 01CAC 80AD57AC 460094A4 */ cvt.w.s $f18, $f18 -/* 01CB0 80AD57B0 4448F800 */ cfc1 $t0, $31 -/* 01CB4 80AD57B4 00000000 */ nop -/* 01CB8 80AD57B8 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 01CBC 80AD57BC 15000005 */ bne $t0, $zero, .L80AD57D4 -/* 01CC0 80AD57C0 00000000 */ nop -/* 01CC4 80AD57C4 44089000 */ mfc1 $t0, $f18 -/* 01CC8 80AD57C8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01CCC 80AD57CC 10000007 */ beq $zero, $zero, .L80AD57EC -/* 01CD0 80AD57D0 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80AD57D4: -/* 01CD4 80AD57D4 10000005 */ beq $zero, $zero, .L80AD57EC -/* 01CD8 80AD57D8 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 01CDC 80AD57DC 44089000 */ mfc1 $t0, $f18 -.L80AD57E0: -/* 01CE0 80AD57E0 00000000 */ nop -/* 01CE4 80AD57E4 0500FFFB */ bltz $t0, .L80AD57D4 -/* 01CE8 80AD57E8 00000000 */ nop -.L80AD57EC: -/* 01CEC 80AD57EC 44D9F800 */ ctc1 $t9, $31 -/* 01CF0 80AD57F0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 01CF4 80AD57F4 A2080216 */ sb $t0, 0x0216($s0) ## 00000216 -/* 01CF8 80AD57F8 3C0180AD */ lui $at, %hi(D_80AD727C) ## $at = 80AD0000 -/* 01CFC 80AD57FC 4600220D */ trunc.w.s $f8, $f4 -/* 01D00 80AD5800 C424727C */ lwc1 $f4, %lo(D_80AD727C)($at) -/* 01D04 80AD5804 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 01D08 80AD5808 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 01D0C 80AD580C 44054000 */ mfc1 $a1, $f8 -/* 01D10 80AD5810 46046202 */ mul.s $f8, $f12, $f4 -/* 01D14 80AD5814 906C0003 */ lbu $t4, 0x0003($v1) ## 00000003 -/* 01D18 80AD5818 00052C00 */ sll $a1, $a1, 16 -/* 01D1C 80AD581C 00052C03 */ sra $a1, $a1, 16 -/* 01D20 80AD5820 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01D24 80AD5824 906D0004 */ lbu $t5, 0x0004($v1) ## 00000004 -/* 01D28 80AD5828 4600328D */ trunc.w.s $f10, $f6 -/* 01D2C 80AD582C 26040234 */ addiu $a0, $s0, 0x0234 ## $a0 = 00000234 -/* 01D30 80AD5830 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01D34 80AD5834 4600848D */ trunc.w.s $f18, $f16 -/* 01D38 80AD5838 44065000 */ mfc1 $a2, $f10 -/* 01D3C 80AD583C 906E0005 */ lbu $t6, 0x0005($v1) ## 00000005 -/* 01D40 80AD5840 4600418D */ trunc.w.s $f6, $f8 -/* 01D44 80AD5844 44079000 */ mfc1 $a3, $f18 -/* 01D48 80AD5848 00063400 */ sll $a2, $a2, 16 -/* 01D4C 80AD584C 00063403 */ sra $a2, $a2, 16 -/* 01D50 80AD5850 44183000 */ mfc1 $t8, $f6 -/* 01D54 80AD5854 00073C00 */ sll $a3, $a3, 16 -/* 01D58 80AD5858 00073C03 */ sra $a3, $a3, 16 -/* 01D5C 80AD585C AFAE0018 */ sw $t6, 0x0018($sp) -/* 01D60 80AD5860 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 01D64 80AD5864 AFB8001C */ sw $t8, 0x001C($sp) -/* 01D68 80AD5868 8FBF002C */ lw $ra, 0x002C($sp) -/* 01D6C 80AD586C 8FB00028 */ lw $s0, 0x0028($sp) -/* 01D70 80AD5870 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01D74 80AD5874 03E00008 */ jr $ra -/* 01D78 80AD5878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s deleted file mode 100644 index eb246bc8d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AD587C -/* 01D7C 80AD587C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D80 80AD5880 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01D84 80AD5884 AFA5001C */ sw $a1, 0x001C($sp) -/* 01D88 80AD5888 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01D8C 80AD588C 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 01D90 80AD5890 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 01D94 80AD5894 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 01D98 80AD5898 46062200 */ add.s $f8, $f4, $f6 -/* 01D9C 80AD589C E488000C */ swc1 $f8, 0x000C($a0) ## 0000000C -/* 01DA0 80AD58A0 0C2B5535 */ jal func_80AD54D4 -/* 01DA4 80AD58A4 AFA40018 */ sw $a0, 0x0018($sp) -/* 01DA8 80AD58A8 8FA40018 */ lw $a0, 0x0018($sp) -/* 01DAC 80AD58AC 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01DB0 80AD58B0 908E0217 */ lbu $t6, 0x0217($a0) ## 00000217 -/* 01DB4 80AD58B4 55C10004 */ bnel $t6, $at, .L80AD58C8 -/* 01DB8 80AD58B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01DBC 80AD58BC 0C2B50E1 */ jal func_80AD4384 -/* 01DC0 80AD58C0 00000000 */ nop -/* 01DC4 80AD58C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD58C8: -/* 01DC8 80AD58C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DCC 80AD58CC 03E00008 */ jr $ra -/* 01DD0 80AD58D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s deleted file mode 100644 index 3230392c24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s +++ /dev/null @@ -1,149 +0,0 @@ -.late_rodata -glabel D_80AD7280 - .word 0x3F48C8C9 - -.text -glabel func_80AD58D4 -/* 01DD4 80AD58D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01DD8 80AD58D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01DDC 80AD58DC AFB00028 */ sw $s0, 0x0028($sp) -/* 01DE0 80AD58E0 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 01DE4 80AD58E4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01DE8 80AD58E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DEC 80AD58EC 10400003 */ beq $v0, $zero, .L80AD58FC -/* 01DF0 80AD58F0 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 01DF4 80AD58F4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01DF8 80AD58F8 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -.L80AD58FC: -/* 01DFC 80AD58FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E00 80AD5900 0C00BC65 */ jal func_8002F194 -/* 01E04 80AD5904 AFA70034 */ sw $a3, 0x0034($sp) -/* 01E08 80AD5908 10400005 */ beq $v0, $zero, .L80AD5920 -/* 01E0C 80AD590C 8FA70034 */ lw $a3, 0x0034($sp) -/* 01E10 80AD5910 0C2B5113 */ jal func_80AD444C -/* 01E14 80AD5914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E18 80AD5918 1000006B */ beq $zero, $zero, .L80AD5AC8 -/* 01E1C 80AD591C 8FBF002C */ lw $ra, 0x002C($sp) -.L80AD5920: -/* 01E20 80AD5920 860F0196 */ lh $t7, 0x0196($s0) ## 00000196 -/* 01E24 80AD5924 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E28 80AD5928 55E0000D */ bnel $t7, $zero, .L80AD5960 -/* 01E2C 80AD592C 92080256 */ lbu $t0, 0x0256($s0) ## 00000256 -/* 01E30 80AD5930 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E34 80AD5934 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 01E38 80AD5938 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 01E3C 80AD593C 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 01E40 80AD5940 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 01E44 80AD5944 0301C824 */ and $t9, $t8, $at -/* 01E48 80AD5948 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 01E4C 80AD594C 0C2B510F */ jal func_80AD443C -/* 01E50 80AD5950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E54 80AD5954 1000005C */ beq $zero, $zero, .L80AD5AC8 -/* 01E58 80AD5958 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E5C 80AD595C 92080256 */ lbu $t0, 0x0256($s0) ## 00000256 -.L80AD5960: -/* 01E60 80AD5960 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 01E64 80AD5964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E68 80AD5968 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 01E6C 80AD596C 11200009 */ beq $t1, $zero, .L80AD5994 -/* 01E70 80AD5970 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 01E74 80AD5974 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 01E78 80AD5978 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01E7C 80AD597C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 01E80 80AD5980 01415825 */ or $t3, $t2, $at ## $t3 = 00010000 -/* 01E84 80AD5984 0C00BCBD */ jal func_8002F2F4 -/* 01E88 80AD5988 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 01E8C 80AD598C 1000000B */ beq $zero, $zero, .L80AD59BC -/* 01E90 80AD5990 92040194 */ lbu $a0, 0x0194($s0) ## 00000194 -.L80AD5994: -/* 01E94 80AD5994 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 01E98 80AD5998 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01E9C 80AD599C 26060244 */ addiu $a2, $s0, 0x0244 ## $a2 = 00000244 -/* 01EA0 80AD59A0 01816824 */ and $t5, $t4, $at -/* 01EA4 80AD59A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01EA8 80AD59A8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01EAC 80AD59AC AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 01EB0 80AD59B0 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 01EB4 80AD59B4 00E12821 */ addu $a1, $a3, $at -/* 01EB8 80AD59B8 92040194 */ lbu $a0, 0x0194($s0) ## 00000194 -.L80AD59BC: -/* 01EBC 80AD59BC 000422C0 */ sll $a0, $a0, 11 -/* 01EC0 80AD59C0 00042400 */ sll $a0, $a0, 16 -/* 01EC4 80AD59C4 0C01DE1C */ jal Math_Sins - ## sins? -/* 01EC8 80AD59C8 00042403 */ sra $a0, $a0, 16 -/* 01ECC 80AD59CC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01ED0 80AD59D0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 01ED4 80AD59D4 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 01ED8 80AD59D8 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 -/* 01EDC 80AD59DC 46040182 */ mul.s $f6, $f0, $f4 -/* 01EE0 80AD59E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01EE4 80AD59E4 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 01EE8 80AD59E8 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 01EEC 80AD59EC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01EF0 80AD59F0 46083280 */ add.s $f10, $f6, $f8 -/* 01EF4 80AD59F4 10400003 */ beq $v0, $zero, .L80AD5A04 -/* 01EF8 80AD59F8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 01EFC 80AD59FC A20E0194 */ sb $t6, 0x0194($s0) ## 00000194 -/* 01F00 80AD5A00 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 000000FF -.L80AD5A04: -/* 01F04 80AD5A04 54400003 */ bnel $v0, $zero, .L80AD5A14 -/* 01F08 80AD5A08 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 01F0C 80AD5A0C A20F0194 */ sb $t7, 0x0194($s0) ## 00000194 -/* 01F10 80AD5A10 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -.L80AD5A14: -/* 01F14 80AD5A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F18 80AD5A18 3C05C120 */ lui $a1, 0xC120 ## $a1 = C1200000 -/* 01F1C 80AD5A1C 46128101 */ sub.s $f4, $f16, $f18 -/* 01F20 80AD5A20 4600218D */ trunc.w.s $f6, $f4 -/* 01F24 80AD5A24 44193000 */ mfc1 $t9, $f6 -/* 01F28 80AD5A28 0C00B56E */ jal Actor_SetHeight - -/* 01F2C 80AD5A2C A619028C */ sh $t9, 0x028C($s0) ## 0000028C -/* 01F30 80AD5A30 920B023C */ lbu $t3, 0x023C($s0) ## 0000023C -/* 01F34 80AD5A34 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 01F38 80AD5A38 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 01F3C 80AD5A3C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 01F40 80AD5A40 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01F44 80AD5A44 920C023D */ lbu $t4, 0x023D($s0) ## 0000023D -/* 01F48 80AD5A48 4600428D */ trunc.w.s $f10, $f8 -/* 01F4C 80AD5A4C 26040234 */ addiu $a0, $s0, 0x0234 ## $a0 = 00000234 -/* 01F50 80AD5A50 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01F54 80AD5A54 920D023E */ lbu $t5, 0x023E($s0) ## 0000023E -/* 01F58 80AD5A58 4600848D */ trunc.w.s $f18, $f16 -/* 01F5C 80AD5A5C 44055000 */ mfc1 $a1, $f10 -/* 01F60 80AD5A60 AFAD0018 */ sw $t5, 0x0018($sp) -/* 01F64 80AD5A64 4600218D */ trunc.w.s $f6, $f4 -/* 01F68 80AD5A68 920E0217 */ lbu $t6, 0x0217($s0) ## 00000217 -/* 01F6C 80AD5A6C 44069000 */ mfc1 $a2, $f18 -/* 01F70 80AD5A70 00052C00 */ sll $a1, $a1, 16 -/* 01F74 80AD5A74 44073000 */ mfc1 $a3, $f6 -/* 01F78 80AD5A78 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 01F7C 80AD5A7C 00063400 */ sll $a2, $a2, 16 -/* 01F80 80AD5A80 00073C00 */ sll $a3, $a3, 16 -/* 01F84 80AD5A84 00073C03 */ sra $a3, $a3, 16 -/* 01F88 80AD5A88 00063403 */ sra $a2, $a2, 16 -/* 01F8C 80AD5A8C 00052C03 */ sra $a1, $a1, 16 -/* 01F90 80AD5A90 05C10005 */ bgez $t6, .L80AD5AA8 -/* 01F94 80AD5A94 468042A0 */ cvt.s.w $f10, $f8 -/* 01F98 80AD5A98 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01F9C 80AD5A9C 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 01FA0 80AD5AA0 00000000 */ nop -/* 01FA4 80AD5AA4 46105280 */ add.s $f10, $f10, $f16 -.L80AD5AA8: -/* 01FA8 80AD5AA8 3C0180AD */ lui $at, %hi(D_80AD7280) ## $at = 80AD0000 -/* 01FAC 80AD5AAC C4327280 */ lwc1 $f18, %lo(D_80AD7280)($at) -/* 01FB0 80AD5AB0 46125102 */ mul.s $f4, $f10, $f18 -/* 01FB4 80AD5AB4 4600218D */ trunc.w.s $f6, $f4 -/* 01FB8 80AD5AB8 44183000 */ mfc1 $t8, $f6 -/* 01FBC 80AD5ABC 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 01FC0 80AD5AC0 AFB8001C */ sw $t8, 0x001C($sp) -/* 01FC4 80AD5AC4 8FBF002C */ lw $ra, 0x002C($sp) -.L80AD5AC8: -/* 01FC8 80AD5AC8 8FB00028 */ lw $s0, 0x0028($sp) -/* 01FCC 80AD5ACC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01FD0 80AD5AD0 03E00008 */ jr $ra -/* 01FD4 80AD5AD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s deleted file mode 100644 index 80b856498f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AD5AD8 -/* 01FD8 80AD5AD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01FDC 80AD5ADC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01FE0 80AD5AE0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01FE4 80AD5AE4 2405FFF3 */ addiu $a1, $zero, 0xFFF3 ## $a1 = FFFFFFF3 -/* 01FE8 80AD5AE8 0C2B5535 */ jal func_80AD54D4 -/* 01FEC 80AD5AEC AFA40018 */ sw $a0, 0x0018($sp) -/* 01FF0 80AD5AF0 8FA40018 */ lw $a0, 0x0018($sp) -/* 01FF4 80AD5AF4 908E0217 */ lbu $t6, 0x0217($a0) ## 00000217 -/* 01FF8 80AD5AF8 55C00004 */ bnel $t6, $zero, .L80AD5B0C -/* 01FFC 80AD5AFC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02000 80AD5B00 0C2B4F5A */ jal func_80AD3D68 -/* 02004 80AD5B04 8FA5001C */ lw $a1, 0x001C($sp) -/* 02008 80AD5B08 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD5B0C: -/* 0200C 80AD5B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02010 80AD5B10 03E00008 */ jr $ra -/* 02014 80AD5B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s deleted file mode 100644 index ab1a1d26eb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_80AD5B18 -/* 02018 80AD5B18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0201C 80AD5B1C AFBF001C */ sw $ra, 0x001C($sp) -/* 02020 80AD5B20 AFB00018 */ sw $s0, 0x0018($sp) -/* 02024 80AD5B24 AFA50024 */ sw $a1, 0x0024($sp) -/* 02028 80AD5B28 948E010E */ lhu $t6, 0x010E($a0) ## 0000010E -/* 0202C 80AD5B2C 24015005 */ addiu $at, $zero, 0x5005 ## $at = 00005005 -/* 02030 80AD5B30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02034 80AD5B34 11C10005 */ beq $t6, $at, .L80AD5B4C -/* 02038 80AD5B38 240531E8 */ addiu $a1, $zero, 0x31E8 ## $a1 = 000031E8 -/* 0203C 80AD5B3C 0C2B5535 */ jal func_80AD54D4 -/* 02040 80AD5B40 2405FFF3 */ addiu $a1, $zero, 0xFFF3 ## $a1 = FFFFFFF3 -/* 02044 80AD5B44 10000004 */ beq $zero, $zero, .L80AD5B58 -/* 02048 80AD5B48 8FA40024 */ lw $a0, 0x0024($sp) -.L80AD5B4C: -/* 0204C 80AD5B4C 0C00BE5D */ jal func_8002F974 -/* 02050 80AD5B50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02054 80AD5B54 8FA40024 */ lw $a0, 0x0024($sp) -.L80AD5B58: -/* 02058 80AD5B58 0C042F6F */ jal func_8010BDBC -/* 0205C 80AD5B5C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 02060 80AD5B60 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 02064 80AD5B64 14410038 */ bne $v0, $at, .L80AD5C48 -/* 02068 80AD5B68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0206C 80AD5B6C 0C041AF2 */ jal func_80106BC8 -/* 02070 80AD5B70 8FA40024 */ lw $a0, 0x0024($sp) -/* 02074 80AD5B74 1040003A */ beq $v0, $zero, .L80AD5C60 -/* 02078 80AD5B78 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 0207C 80AD5B7C 0C03E291 */ jal func_800F8A44 -/* 02080 80AD5B80 240531E8 */ addiu $a1, $zero, 0x31E8 ## $a1 = 000031E8 -/* 02084 80AD5B84 8FAF0024 */ lw $t7, 0x0024($sp) -/* 02088 80AD5B88 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 0208C 80AD5B8C 240C5007 */ addiu $t4, $zero, 0x5007 ## $t4 = 00005007 -/* 02090 80AD5B90 030FC021 */ addu $t8, $t8, $t7 -/* 02094 80AD5B94 931804BD */ lbu $t8, 0x04BD($t8) ## 000104BD -/* 02098 80AD5B98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0209C 80AD5B9C 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 020A0 80AD5BA0 17000022 */ bne $t8, $zero, .L80AD5C2C -/* 020A4 80AD5BA4 00000000 */ nop -/* 020A8 80AD5BA8 0C021AAF */ jal Inventory_HasEmptyBottle -/* 020AC 80AD5BAC 00000000 */ nop -/* 020B0 80AD5BB0 10400019 */ beq $v0, $zero, .L80AD5C18 -/* 020B4 80AD5BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020B8 80AD5BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020BC 80AD5BBC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 020C0 80AD5BC0 24053883 */ addiu $a1, $zero, 0x3883 ## $a1 = 00003883 -/* 020C4 80AD5BC4 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 020C8 80AD5BC8 8FA40024 */ lw $a0, 0x0024($sp) -/* 020CC 80AD5BCC 2409508F */ addiu $t1, $zero, 0x508F ## $t1 = 0000508F -/* 020D0 80AD5BD0 17200006 */ bne $t9, $zero, .L80AD5BEC -/* 020D4 80AD5BD4 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 020D8 80AD5BD8 0C021344 */ jal Item_Give -/* 020DC 80AD5BDC 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 020E0 80AD5BE0 24085008 */ addiu $t0, $zero, 0x5008 ## $t0 = 00005008 -/* 020E4 80AD5BE4 10000013 */ beq $zero, $zero, .L80AD5C34 -/* 020E8 80AD5BE8 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -.L80AD5BEC: -/* 020EC 80AD5BEC A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 020F0 80AD5BF0 0C021344 */ jal Item_Give -/* 020F4 80AD5BF4 8FA40024 */ lw $a0, 0x0024($sp) -/* 020F8 80AD5BF8 920A0195 */ lbu $t2, 0x0195($s0) ## 00000195 -/* 020FC 80AD5BFC 3C0580AD */ lui $a1, %hi(D_80AD76F0) ## $a1 = 80AD0000 -/* 02100 80AD5C00 8FA40024 */ lw $a0, 0x0024($sp) -/* 02104 80AD5C04 00AA2821 */ addu $a1, $a1, $t2 -/* 02108 80AD5C08 0C00B2DD */ jal Flags_SetSwitch - -/* 0210C 80AD5C0C 90A576F0 */ lbu $a1, %lo(D_80AD76F0)($a1) -/* 02110 80AD5C10 10000009 */ beq $zero, $zero, .L80AD5C38 -/* 02114 80AD5C14 8FA40024 */ lw $a0, 0x0024($sp) -.L80AD5C18: -/* 02118 80AD5C18 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0211C 80AD5C1C 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 02120 80AD5C20 240B5006 */ addiu $t3, $zero, 0x5006 ## $t3 = 00005006 -/* 02124 80AD5C24 10000003 */ beq $zero, $zero, .L80AD5C34 -/* 02128 80AD5C28 A60B010E */ sh $t3, 0x010E($s0) ## 0000010E -.L80AD5C2C: -/* 0212C 80AD5C2C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02130 80AD5C30 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -.L80AD5C34: -/* 02134 80AD5C34 8FA40024 */ lw $a0, 0x0024($sp) -.L80AD5C38: -/* 02138 80AD5C38 0C042DC8 */ jal func_8010B720 -/* 0213C 80AD5C3C 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 02140 80AD5C40 10000008 */ beq $zero, $zero, .L80AD5C64 -/* 02144 80AD5C44 8FBF001C */ lw $ra, 0x001C($sp) -.L80AD5C48: -/* 02148 80AD5C48 0C00BCCD */ jal func_8002F334 -/* 0214C 80AD5C4C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02150 80AD5C50 50400004 */ beql $v0, $zero, .L80AD5C64 -/* 02154 80AD5C54 8FBF001C */ lw $ra, 0x001C($sp) -/* 02158 80AD5C58 0C2B510F */ jal func_80AD443C -/* 0215C 80AD5C5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD5C60: -/* 02160 80AD5C60 8FBF001C */ lw $ra, 0x001C($sp) -.L80AD5C64: -/* 02164 80AD5C64 8FB00018 */ lw $s0, 0x0018($sp) -/* 02168 80AD5C68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0216C 80AD5C6C 03E00008 */ jr $ra -/* 02170 80AD5C70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s deleted file mode 100644 index 3bf1d88a26..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80AD5C74 -/* 02174 80AD5C74 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02178 80AD5C78 AFBF001C */ sw $ra, 0x001C($sp) -/* 0217C 80AD5C7C AFB00018 */ sw $s0, 0x0018($sp) -/* 02180 80AD5C80 AFA50024 */ sw $a1, 0x0024($sp) -/* 02184 80AD5C84 90820255 */ lbu $v0, 0x0255($a0) ## 00000255 -/* 02188 80AD5C88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0218C 80AD5C8C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 02190 80AD5C90 51C0001A */ beql $t6, $zero, .L80AD5CFC -/* 02194 80AD5C94 8FBF001C */ lw $ra, 0x001C($sp) -/* 02198 80AD5C98 909800B1 */ lbu $t8, 0x00B1($a0) ## 000000B1 -/* 0219C 80AD5C9C 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 021A0 80AD5CA0 A08F0255 */ sb $t7, 0x0255($a0) ## 00000255 -/* 021A4 80AD5CA4 17000004 */ bne $t8, $zero, .L80AD5CB8 -/* 021A8 80AD5CA8 00000000 */ nop -/* 021AC 80AD5CAC 909900B0 */ lbu $t9, 0x00B0($a0) ## 000000B0 -/* 021B0 80AD5CB0 53200012 */ beql $t9, $zero, .L80AD5CFC -/* 021B4 80AD5CB4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AD5CB8: -/* 021B8 80AD5CB8 0C00D58A */ jal Actor_ApplyDamage - -/* 021BC 80AD5CBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021C0 80AD5CC0 14400009 */ bne $v0, $zero, .L80AD5CE8 -/* 021C4 80AD5CC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021C8 80AD5CC8 8FA40024 */ lw $a0, 0x0024($sp) -/* 021CC 80AD5CCC 0C00CB1F */ jal func_80032C7C -/* 021D0 80AD5CD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 021D4 80AD5CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D8 80AD5CD8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 021DC 80AD5CDC 24053876 */ addiu $a1, $zero, 0x3876 ## $a1 = 00003876 -/* 021E0 80AD5CE0 10000003 */ beq $zero, $zero, .L80AD5CF0 -/* 021E4 80AD5CE4 00000000 */ nop -.L80AD5CE8: -/* 021E8 80AD5CE8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 021EC 80AD5CEC 24053875 */ addiu $a1, $zero, 0x3875 ## $a1 = 00003875 -.L80AD5CF0: -/* 021F0 80AD5CF0 0C2B5021 */ jal func_80AD4084 -/* 021F4 80AD5CF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021F8 80AD5CF8 8FBF001C */ lw $ra, 0x001C($sp) -.L80AD5CFC: -/* 021FC 80AD5CFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 02200 80AD5D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02204 80AD5D04 03E00008 */ jr $ra -/* 02208 80AD5D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s deleted file mode 100644 index 4c79be2bd4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AD5D0C -/* 0220C 80AD5D0C 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 02210 80AD5D10 15C00011 */ bne $t6, $zero, .L80AD5D58 -/* 02214 80AD5D14 00000000 */ nop -/* 02218 80AD5D18 848F0236 */ lh $t7, 0x0236($a0) ## 00000236 -/* 0221C 80AD5D1C 84980238 */ lh $t8, 0x0238($a0) ## 00000238 -/* 02220 80AD5D20 8499023A */ lh $t9, 0x023A($a0) ## 0000023A -/* 02224 80AD5D24 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 02228 80AD5D28 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 0222C 80AD5D2C 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 02230 80AD5D30 468021A0 */ cvt.s.w $f6, $f4 -/* 02234 80AD5D34 848900B6 */ lh $t1, 0x00B6($a0) ## 000000B6 -/* 02238 80AD5D38 24080046 */ addiu $t0, $zero, 0x0046 ## $t0 = 00000046 -/* 0223C 80AD5D3C A488019A */ sh $t0, 0x019A($a0) ## 0000019A -/* 02240 80AD5D40 A4890198 */ sh $t1, 0x0198($a0) ## 00000198 -/* 02244 80AD5D44 468042A0 */ cvt.s.w $f10, $f8 -/* 02248 80AD5D48 E4860224 */ swc1 $f6, 0x0224($a0) ## 00000224 -/* 0224C 80AD5D4C 468084A0 */ cvt.s.w $f18, $f16 -/* 02250 80AD5D50 E48A0228 */ swc1 $f10, 0x0228($a0) ## 00000228 -/* 02254 80AD5D54 E492022C */ swc1 $f18, 0x022C($a0) ## 0000022C -.L80AD5D58: -/* 02258 80AD5D58 03E00008 */ jr $ra -/* 0225C 80AD5D5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s deleted file mode 100644 index ece436824c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80AD5D60 -/* 02260 80AD5D60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02264 80AD5D64 AFBF001C */ sw $ra, 0x001C($sp) -/* 02268 80AD5D68 AFB00018 */ sw $s0, 0x0018($sp) -/* 0226C 80AD5D6C AFA50024 */ sw $a1, 0x0024($sp) -/* 02270 80AD5D70 8482019A */ lh $v0, 0x019A($a0) ## 0000019A -/* 02274 80AD5D74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02278 80AD5D78 50400040 */ beql $v0, $zero, .L80AD5E7C -/* 0227C 80AD5D7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02280 80AD5D80 10400002 */ beq $v0, $zero, .L80AD5D8C -/* 02284 80AD5D84 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02288 80AD5D88 A48E019A */ sh $t6, 0x019A($a0) ## 0000019A -.L80AD5D8C: -/* 0228C 80AD5D8C 920202A0 */ lbu $v0, 0x02A0($s0) ## 000002A0 -/* 02290 80AD5D90 24190013 */ addiu $t9, $zero, 0x0013 ## $t9 = 00000013 -/* 02294 80AD5D94 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 -/* 02298 80AD5D98 304F0002 */ andi $t7, $v0, 0x0002 ## $t7 = 00000000 -/* 0229C 80AD5D9C 11E00003 */ beq $t7, $zero, .L80AD5DAC -/* 022A0 80AD5DA0 3058FFFD */ andi $t8, $v0, 0xFFFD ## $t8 = 00000000 -/* 022A4 80AD5DA4 A21802A0 */ sb $t8, 0x02A0($s0) ## 000002A0 -/* 022A8 80AD5DA8 A619019A */ sh $t9, 0x019A($s0) ## 0000019A -.L80AD5DAC: -/* 022AC 80AD5DAC 8608019A */ lh $t0, 0x019A($s0) ## 0000019A -/* 022B0 80AD5DB0 3C053B44 */ lui $a1, 0x3B44 ## $a1 = 3B440000 -/* 022B4 80AD5DB4 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3B449BA6 -/* 022B8 80AD5DB8 29010014 */ slti $at, $t0, 0x0014 -/* 022BC 80AD5DBC 10200008 */ beq $at, $zero, .L80AD5DE0 -/* 022C0 80AD5DC0 3C063A1D */ lui $a2, 0x3A1D ## $a2 = 3A1D0000 -/* 022C4 80AD5DC4 3C06391D */ lui $a2, 0x391D ## $a2 = 391D0000 -/* 022C8 80AD5DC8 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 391D4952 -/* 022CC 80AD5DCC 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 -/* 022D0 80AD5DD0 0C01DE80 */ jal Math_ApproxF - -/* 022D4 80AD5DD4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 022D8 80AD5DD8 10000028 */ beq $zero, $zero, .L80AD5E7C -/* 022DC 80AD5DDC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AD5DE0: -/* 022E0 80AD5DE0 0C01DE80 */ jal Math_ApproxF - -/* 022E4 80AD5DE4 34C64952 */ ori $a2, $a2, 0x4952 ## $a2 = 00004952 -/* 022E8 80AD5DE8 50400012 */ beql $v0, $zero, .L80AD5E34 -/* 022EC 80AD5DEC C6080224 */ lwc1 $f8, 0x0224($s0) ## 00000224 -/* 022F0 80AD5DF0 0C01DE1C */ jal Math_Sins - ## sins? -/* 022F4 80AD5DF4 86040198 */ lh $a0, 0x0198($s0) ## 00000198 -/* 022F8 80AD5DF8 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 022FC 80AD5DFC 44813000 */ mtc1 $at, $f6 ## $f6 = 2.50 -/* 02300 80AD5E00 C6040224 */ lwc1 $f4, 0x0224($s0) ## 00000224 -/* 02304 80AD5E04 86040198 */ lh $a0, 0x0198($s0) ## 00000198 -/* 02308 80AD5E08 46003202 */ mul.s $f8, $f6, $f0 -/* 0230C 80AD5E0C 46082280 */ add.s $f10, $f4, $f8 -/* 02310 80AD5E10 0C01DE0D */ jal Math_Coss - ## coss? -/* 02314 80AD5E14 E60A0224 */ swc1 $f10, 0x0224($s0) ## 00000224 -/* 02318 80AD5E18 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 0231C 80AD5E1C 44819000 */ mtc1 $at, $f18 ## $f18 = 2.50 -/* 02320 80AD5E20 C610022C */ lwc1 $f16, 0x022C($s0) ## 0000022C -/* 02324 80AD5E24 46009182 */ mul.s $f6, $f18, $f0 -/* 02328 80AD5E28 46068100 */ add.s $f4, $f16, $f6 -/* 0232C 80AD5E2C E604022C */ swc1 $f4, 0x022C($s0) ## 0000022C -/* 02330 80AD5E30 C6080224 */ lwc1 $f8, 0x0224($s0) ## 00000224 -.L80AD5E34: -/* 02334 80AD5E34 C6120228 */ lwc1 $f18, 0x0228($s0) ## 00000228 -/* 02338 80AD5E38 C606022C */ lwc1 $f6, 0x022C($s0) ## 0000022C -/* 0233C 80AD5E3C 4600428D */ trunc.w.s $f10, $f8 -/* 02340 80AD5E40 8FA40024 */ lw $a0, 0x0024($sp) -/* 02344 80AD5E44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02348 80AD5E48 4600940D */ trunc.w.s $f16, $f18 -/* 0234C 80AD5E4C 440A5000 */ mfc1 $t2, $f10 -/* 02350 80AD5E50 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02354 80AD5E54 4600310D */ trunc.w.s $f4, $f6 -/* 02358 80AD5E58 440C8000 */ mfc1 $t4, $f16 -/* 0235C 80AD5E5C 26060290 */ addiu $a2, $s0, 0x0290 ## $a2 = 00000290 -/* 02360 80AD5E60 00812821 */ addu $a1, $a0, $at -/* 02364 80AD5E64 440E2000 */ mfc1 $t6, $f4 -/* 02368 80AD5E68 A60A02D6 */ sh $t2, 0x02D6($s0) ## 000002D6 -/* 0236C 80AD5E6C A60C02D8 */ sh $t4, 0x02D8($s0) ## 000002D8 -/* 02370 80AD5E70 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 02374 80AD5E74 A60E02DA */ sh $t6, 0x02DA($s0) ## 000002DA -/* 02378 80AD5E78 8FBF001C */ lw $ra, 0x001C($sp) -.L80AD5E7C: -/* 0237C 80AD5E7C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02380 80AD5E80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02384 80AD5E84 03E00008 */ jr $ra -/* 02388 80AD5E88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s deleted file mode 100644 index 5c11a7a77c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s +++ /dev/null @@ -1,231 +0,0 @@ -.rdata -glabel D_80AD7160 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7174 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7188 - .asciz "../z_en_po_field.c" - .balign 4 - -.late_rodata -glabel D_80AD7284 - .word 0x47A60400 -glabel D_80AD7288 - .float 9.58738019108e-05 - -glabel D_80AD728C - .word 0x3B449BA6 -glabel D_80AD7290 - .float 0.7 - -glabel D_80AD7294 - .word 0x3A6BEDFB - -.text -glabel func_80AD5E8C -/* 0238C 80AD5E8C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 02390 80AD5E90 AFBF0044 */ sw $ra, 0x0044($sp) -/* 02394 80AD5E94 AFB20040 */ sw $s2, 0x0040($sp) -/* 02398 80AD5E98 AFB1003C */ sw $s1, 0x003C($sp) -/* 0239C 80AD5E9C AFB00038 */ sw $s0, 0x0038($sp) -/* 023A0 80AD5EA0 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 023A4 80AD5EA4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 023A8 80AD5EA8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 023AC 80AD5EAC 11C000B5 */ beq $t6, $zero, .L80AD6184 -/* 023B0 80AD5EB0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 023B4 80AD5EB4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 023B8 80AD5EB8 3C0680AD */ lui $a2, %hi(D_80AD7160) ## $a2 = 80AD0000 -/* 023BC 80AD5EBC 24C67160 */ addiu $a2, $a2, %lo(D_80AD7160) ## $a2 = 80AD7160 -/* 023C0 80AD5EC0 24070685 */ addiu $a3, $zero, 0x0685 ## $a3 = 00000685 -/* 023C4 80AD5EC4 0C031AB1 */ jal Graph_OpenDisps -/* 023C8 80AD5EC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 023CC 80AD5ECC 0C024F61 */ jal func_80093D84 -/* 023D0 80AD5ED0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 023D4 80AD5ED4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 023D8 80AD5ED8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 023DC 80AD5EDC 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 023E0 80AD5EE0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 023E4 80AD5EE4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 023E8 80AD5EE8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 023EC 80AD5EEC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 023F0 80AD5EF0 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 023F4 80AD5EF4 24080040 */ addiu $t0, $zero, 0x0040 ## $t0 = 00000040 -/* 023F8 80AD5EF8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 023FC 80AD5EFC 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 02400 80AD5F00 01525021 */ addu $t2, $t2, $s2 -/* 02404 80AD5F04 AFA90018 */ sw $t1, 0x0018($sp) -/* 02408 80AD5F08 AFA80014 */ sw $t0, 0x0014($sp) -/* 0240C 80AD5F0C AFB90010 */ sw $t9, 0x0010($sp) -/* 02410 80AD5F10 AFA0001C */ sw $zero, 0x001C($sp) -/* 02414 80AD5F14 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 -/* 02418 80AD5F18 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 0241C 80AD5F1C 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 02420 80AD5F20 000A0823 */ subu $at, $zero, $t2 -/* 02424 80AD5F24 00015880 */ sll $t3, $at, 2 -/* 02428 80AD5F28 01615821 */ addu $t3, $t3, $at -/* 0242C 80AD5F2C 000B5880 */ sll $t3, $t3, 2 -/* 02430 80AD5F30 316C01FF */ andi $t4, $t3, 0x01FF ## $t4 = 00000000 -/* 02434 80AD5F34 AFAC0020 */ sw $t4, 0x0020($sp) -/* 02438 80AD5F38 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0243C 80AD5F3C AFAD0024 */ sw $t5, 0x0024($sp) -/* 02440 80AD5F40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02444 80AD5F44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02448 80AD5F48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0244C 80AD5F4C 0C0253D0 */ jal Gfx_TwoTexScroll -/* 02450 80AD5F50 AFA20068 */ sw $v0, 0x0068($sp) -/* 02454 80AD5F54 8FA30068 */ lw $v1, 0x0068($sp) -/* 02458 80AD5F58 3C0180AD */ lui $at, %hi(D_80AD7284) ## $at = 80AD0000 -/* 0245C 80AD5F5C 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 02460 80AD5F60 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02464 80AD5F64 C4267284 */ lwc1 $f6, %lo(D_80AD7284)($at) -/* 02468 80AD5F68 C6240220 */ lwc1 $f4, 0x0220($s1) ## 00000220 -/* 0246C 80AD5F6C 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 02470 80AD5F70 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 -/* 02474 80AD5F74 46062002 */ mul.s $f0, $f4, $f6 -/* 02478 80AD5F78 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 0247C 80AD5F7C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 02480 80AD5F80 37188080 */ ori $t8, $t8, 0x8080 ## $t8 = FA008080 -/* 02484 80AD5F84 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02488 80AD5F88 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0248C 80AD5F8C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 02490 80AD5F90 4459F800 */ cfc1 $t9, $31 -/* 02494 80AD5F94 44C4F800 */ ctc1 $a0, $31 -/* 02498 80AD5F98 00000000 */ nop -/* 0249C 80AD5F9C 46000224 */ cvt.w.s $f8, $f0 -/* 024A0 80AD5FA0 4444F800 */ cfc1 $a0, $31 -/* 024A4 80AD5FA4 00000000 */ nop -/* 024A8 80AD5FA8 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 024AC 80AD5FAC 50800013 */ beql $a0, $zero, .L80AD5FFC -/* 024B0 80AD5FB0 44044000 */ mfc1 $a0, $f8 -/* 024B4 80AD5FB4 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 024B8 80AD5FB8 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 024BC 80AD5FBC 46080201 */ sub.s $f8, $f0, $f8 -/* 024C0 80AD5FC0 44C4F800 */ ctc1 $a0, $31 -/* 024C4 80AD5FC4 00000000 */ nop -/* 024C8 80AD5FC8 46004224 */ cvt.w.s $f8, $f8 -/* 024CC 80AD5FCC 4444F800 */ cfc1 $a0, $31 -/* 024D0 80AD5FD0 00000000 */ nop -/* 024D4 80AD5FD4 30840078 */ andi $a0, $a0, 0x0078 ## $a0 = 00000000 -/* 024D8 80AD5FD8 14800005 */ bne $a0, $zero, .L80AD5FF0 -/* 024DC 80AD5FDC 00000000 */ nop -/* 024E0 80AD5FE0 44044000 */ mfc1 $a0, $f8 -/* 024E4 80AD5FE4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 024E8 80AD5FE8 10000007 */ beq $zero, $zero, .L80AD6008 -/* 024EC 80AD5FEC 00812025 */ or $a0, $a0, $at ## $a0 = 80000000 -.L80AD5FF0: -/* 024F0 80AD5FF0 10000005 */ beq $zero, $zero, .L80AD6008 -/* 024F4 80AD5FF4 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF -/* 024F8 80AD5FF8 44044000 */ mfc1 $a0, $f8 -.L80AD5FFC: -/* 024FC 80AD5FFC 00000000 */ nop -/* 02500 80AD6000 0480FFFB */ bltz $a0, .L80AD5FF0 -/* 02504 80AD6004 00000000 */ nop -.L80AD6008: -/* 02508 80AD6008 308400FF */ andi $a0, $a0, 0x00FF ## $a0 = 000000FF -/* 0250C 80AD600C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 02510 80AD6010 00814025 */ or $t0, $a0, $at ## $t0 = FFFF00FF -/* 02514 80AD6014 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 02518 80AD6018 44D9F800 */ ctc1 $t9, $31 -/* 0251C 80AD601C 8E26022C */ lw $a2, 0x022C($s1) ## 0000022C -/* 02520 80AD6020 C62E0228 */ lwc1 $f14, 0x0228($s1) ## 00000228 -/* 02524 80AD6024 C62C0224 */ lwc1 $f12, 0x0224($s1) ## 00000224 -/* 02528 80AD6028 0C034261 */ jal Matrix_Translate -/* 0252C 80AD602C AFA4004C */ sw $a0, 0x004C($sp) -/* 02530 80AD6030 864907A0 */ lh $t1, 0x07A0($s2) ## 000007A0 -/* 02534 80AD6034 00095080 */ sll $t2, $t1, 2 -/* 02538 80AD6038 024A5821 */ addu $t3, $s2, $t2 -/* 0253C 80AD603C 0C016A7D */ jal func_8005A9F4 -/* 02540 80AD6040 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 02544 80AD6044 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 02548 80AD6048 00416021 */ addu $t4, $v0, $at -/* 0254C 80AD604C 000C6C00 */ sll $t5, $t4, 16 -/* 02550 80AD6050 000D7403 */ sra $t6, $t5, 16 -/* 02554 80AD6054 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 -/* 02558 80AD6058 3C0180AD */ lui $at, %hi(D_80AD7288) ## $at = 80AD0000 -/* 0255C 80AD605C C4327288 */ lwc1 $f18, %lo(D_80AD7288)($at) -/* 02560 80AD6060 46805420 */ cvt.s.w $f16, $f10 -/* 02564 80AD6064 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02568 80AD6068 46128302 */ mul.s $f12, $f16, $f18 -/* 0256C 80AD606C 0C034348 */ jal Matrix_RotateY -/* 02570 80AD6070 00000000 */ nop -/* 02574 80AD6074 862F019A */ lh $t7, 0x019A($s1) ## 0000019A -/* 02578 80AD6078 29E10014 */ slti $at, $t7, 0x0014 -/* 0257C 80AD607C 54200010 */ bnel $at, $zero, .L80AD60C0 -/* 02580 80AD6080 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02584 80AD6084 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02588 80AD6088 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 0258C 80AD608C 3C08FF00 */ lui $t0, 0xFF00 ## $t0 = FF000000 -/* 02590 80AD6090 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 02594 80AD6094 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 02598 80AD6098 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 0259C 80AD609C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 025A0 80AD60A0 C62C0220 */ lwc1 $f12, 0x0220($s1) ## 00000220 -/* 025A4 80AD60A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025A8 80AD60A8 44066000 */ mfc1 $a2, $f12 -/* 025AC 80AD60AC 0C0342A3 */ jal Matrix_Scale -/* 025B0 80AD60B0 46006386 */ mov.s $f14, $f12 -/* 025B4 80AD60B4 10000018 */ beq $zero, $zero, .L80AD6118 -/* 025B8 80AD60B8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 025BC 80AD60BC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L80AD60C0: -/* 025C0 80AD60C0 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 025C4 80AD60C4 3C0180AD */ lui $at, %hi(D_80AD728C) ## $at = 80AD0000 -/* 025C8 80AD60C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 025CC 80AD60CC AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 025D0 80AD60D0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 025D4 80AD60D4 8FAB004C */ lw $t3, 0x004C($sp) -/* 025D8 80AD60D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025DC 80AD60DC 000B6600 */ sll $t4, $t3, 24 -/* 025E0 80AD60E0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 025E4 80AD60E4 C422728C */ lwc1 $f2, %lo(D_80AD728C)($at) -/* 025E8 80AD60E8 3C0180AD */ lui $at, %hi(D_80AD7290) ## $at = 80AD0000 -/* 025EC 80AD60EC C4247290 */ lwc1 $f4, %lo(D_80AD7290)($at) -/* 025F0 80AD60F0 C6200220 */ lwc1 $f0, 0x0220($s1) ## 00000220 -/* 025F4 80AD60F4 3C0180AD */ lui $at, %hi(D_80AD7294) ## $at = 80AD0000 -/* 025F8 80AD60F8 C4287294 */ lwc1 $f8, %lo(D_80AD7294)($at) -/* 025FC 80AD60FC 46040182 */ mul.s $f6, $f0, $f4 -/* 02600 80AD6100 46001281 */ sub.s $f10, $f2, $f0 -/* 02604 80AD6104 44061000 */ mfc1 $a2, $f2 -/* 02608 80AD6108 46025380 */ add.s $f14, $f10, $f2 -/* 0260C 80AD610C 0C0342A3 */ jal Matrix_Scale -/* 02610 80AD6110 46083300 */ add.s $f12, $f6, $f8 -/* 02614 80AD6114 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -.L80AD6118: -/* 02618 80AD6118 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 0261C 80AD611C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 02620 80AD6120 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02624 80AD6124 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 02628 80AD6128 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0262C 80AD612C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02630 80AD6130 3C0580AD */ lui $a1, %hi(D_80AD7174) ## $a1 = 80AD0000 -/* 02634 80AD6134 24A57174 */ addiu $a1, $a1, %lo(D_80AD7174) ## $a1 = 80AD7174 -/* 02638 80AD6138 240606AD */ addiu $a2, $zero, 0x06AD ## $a2 = 000006AD -/* 0263C 80AD613C 0C0346A2 */ jal Matrix_NewMtx -/* 02640 80AD6140 AFA20058 */ sw $v0, 0x0058($sp) -/* 02644 80AD6144 8FA30058 */ lw $v1, 0x0058($sp) -/* 02648 80AD6148 3C190405 */ lui $t9, 0x0405 ## $t9 = 04050000 -/* 0264C 80AD614C 2739D4E0 */ addiu $t9, $t9, 0xD4E0 ## $t9 = 0404D4E0 -/* 02650 80AD6150 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02654 80AD6154 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 02658 80AD6158 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 0265C 80AD615C 3C0680AD */ lui $a2, %hi(D_80AD7188) ## $a2 = 80AD0000 -/* 02660 80AD6160 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 02664 80AD6164 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 02668 80AD6168 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0266C 80AD616C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02670 80AD6170 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02674 80AD6174 24C67188 */ addiu $a2, $a2, %lo(D_80AD7188) ## $a2 = 80AD7188 -/* 02678 80AD6178 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 0267C 80AD617C 0C031AD5 */ jal Graph_CloseDisps -/* 02680 80AD6180 240706B0 */ addiu $a3, $zero, 0x06B0 ## $a3 = 000006B0 -.L80AD6184: -/* 02684 80AD6184 8FBF0044 */ lw $ra, 0x0044($sp) -/* 02688 80AD6188 8FB00038 */ lw $s0, 0x0038($sp) -/* 0268C 80AD618C 8FB1003C */ lw $s1, 0x003C($sp) -/* 02690 80AD6190 8FB20040 */ lw $s2, 0x0040($sp) -/* 02694 80AD6194 03E00008 */ jr $ra -/* 02698 80AD6198 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s deleted file mode 100644 index 89460a8cda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s +++ /dev/null @@ -1,115 +0,0 @@ -glabel func_80AD619C -/* 0269C 80AD619C 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 026A0 80AD61A0 3C0E80AD */ lui $t6, %hi(func_80AD4CA4) ## $t6 = 80AD0000 -/* 026A4 80AD61A4 25CE4CA4 */ addiu $t6, $t6, %lo(func_80AD4CA4) ## $t6 = 80AD4CA4 -/* 026A8 80AD61A8 15C20022 */ bne $t6, $v0, .L80AD6234 -/* 026AC 80AD61AC 3C0880AD */ lui $t0, %hi(func_80AD4E48) ## $t0 = 80AD0000 -/* 026B0 80AD61B0 90820214 */ lbu $v0, 0x0214($a0) ## 00000214 -/* 026B4 80AD61B4 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 026B8 80AD61B8 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 026BC 80AD61BC 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000005 -/* 026C0 80AD61C0 00021400 */ sll $v0, $v0, 16 -/* 026C4 80AD61C4 00021403 */ sra $v0, $v0, 16 -/* 026C8 80AD61C8 28410051 */ slti $at, $v0, 0x0051 -/* 026CC 80AD61CC 14200003 */ bne $at, $zero, .L80AD61DC -/* 026D0 80AD61D0 241900E1 */ addiu $t9, $zero, 0x00E1 ## $t9 = 000000E1 -/* 026D4 80AD61D4 10000002 */ beq $zero, $zero, .L80AD61E0 -/* 026D8 80AD61D8 A08F0214 */ sb $t7, 0x0214($a0) ## 00000214 -.L80AD61DC: -/* 026DC 80AD61DC A0820214 */ sb $v0, 0x0214($a0) ## 00000214 -.L80AD61E0: -/* 026E0 80AD61E0 90820215 */ lbu $v0, 0x0215($a0) ## 00000215 -/* 026E4 80AD61E4 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 0000000A -/* 026E8 80AD61E8 00021400 */ sll $v0, $v0, 16 -/* 026EC 80AD61EC 00021403 */ sra $v0, $v0, 16 -/* 026F0 80AD61F0 28410100 */ slti $at, $v0, 0x0100 -/* 026F4 80AD61F4 54200004 */ bnel $at, $zero, .L80AD6208 -/* 026F8 80AD61F8 A0820215 */ sb $v0, 0x0215($a0) ## 00000215 -/* 026FC 80AD61FC 10000002 */ beq $zero, $zero, .L80AD6208 -/* 02700 80AD6200 A0980215 */ sb $t8, 0x0215($a0) ## 00000215 -/* 02704 80AD6204 A0820215 */ sb $v0, 0x0215($a0) ## 00000215 -.L80AD6208: -/* 02708 80AD6208 90820216 */ lbu $v0, 0x0216($a0) ## 00000216 -/* 0270C 80AD620C 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 0000000F -/* 02710 80AD6210 00021400 */ sll $v0, $v0, 16 -/* 02714 80AD6214 00021403 */ sra $v0, $v0, 16 -/* 02718 80AD6218 284100E2 */ slti $at, $v0, 0x00E2 -/* 0271C 80AD621C 14200003 */ bne $at, $zero, .L80AD622C -/* 02720 80AD6220 00000000 */ nop -/* 02724 80AD6224 03E00008 */ jr $ra -/* 02728 80AD6228 A0990216 */ sb $t9, 0x0216($a0) ## 00000216 -.L80AD622C: -/* 0272C 80AD622C 03E00008 */ jr $ra -/* 02730 80AD6230 A0820216 */ sb $v0, 0x0216($a0) ## 00000216 -.L80AD6234: -/* 02734 80AD6234 25084E48 */ addiu $t0, $t0, %lo(func_80AD4E48) ## $t0 = 80AD4E48 -/* 02738 80AD6238 55020010 */ bnel $t0, $v0, .L80AD627C -/* 0273C 80AD623C 90820214 */ lbu $v0, 0x0214($a0) ## 00000214 -/* 02740 80AD6240 90890114 */ lbu $t1, 0x0114($a0) ## 00000114 -/* 02744 80AD6244 240B0050 */ addiu $t3, $zero, 0x0050 ## $t3 = 00000050 -/* 02748 80AD6248 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 0274C 80AD624C 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 02750 80AD6250 11400005 */ beq $t2, $zero, .L80AD6268 -/* 02754 80AD6254 240D00E1 */ addiu $t5, $zero, 0x00E1 ## $t5 = 000000E1 -/* 02758 80AD6258 A0800214 */ sb $zero, 0x0214($a0) ## 00000214 -/* 0275C 80AD625C A0800215 */ sb $zero, 0x0215($a0) ## 00000215 -/* 02760 80AD6260 03E00008 */ jr $ra -/* 02764 80AD6264 A0800216 */ sb $zero, 0x0216($a0) ## 00000216 -.L80AD6268: -/* 02768 80AD6268 A08B0214 */ sb $t3, 0x0214($a0) ## 00000214 -/* 0276C 80AD626C A08C0215 */ sb $t4, 0x0215($a0) ## 00000215 -/* 02770 80AD6270 03E00008 */ jr $ra -/* 02774 80AD6274 A08D0216 */ sb $t5, 0x0216($a0) ## 00000216 -.L80AD6278: -/* 02778 80AD6278 90820214 */ lbu $v0, 0x0214($a0) ## 00000214 -.L80AD627C: -/* 0277C 80AD627C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 02780 80AD6280 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 02784 80AD6284 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000014 -/* 02788 80AD6288 00021400 */ sll $v0, $v0, 16 -/* 0278C 80AD628C 00021403 */ sra $v0, $v0, 16 -/* 02790 80AD6290 28410100 */ slti $at, $v0, 0x0100 -/* 02794 80AD6294 54200004 */ bnel $at, $zero, .L80AD62A8 -/* 02798 80AD6298 A0820214 */ sb $v0, 0x0214($a0) ## 00000214 -/* 0279C 80AD629C 10000002 */ beq $zero, $zero, .L80AD62A8 -/* 027A0 80AD62A0 A08E0214 */ sb $t6, 0x0214($a0) ## 00000214 -/* 027A4 80AD62A4 A0820214 */ sb $v0, 0x0214($a0) ## 00000214 -.L80AD62A8: -/* 027A8 80AD62A8 90820215 */ lbu $v0, 0x0215($a0) ## 00000215 -/* 027AC 80AD62AC 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000019 -/* 027B0 80AD62B0 00021400 */ sll $v0, $v0, 16 -/* 027B4 80AD62B4 00021403 */ sra $v0, $v0, 16 -/* 027B8 80AD62B8 28410100 */ slti $at, $v0, 0x0100 -/* 027BC 80AD62BC 54200004 */ bnel $at, $zero, .L80AD62D0 -/* 027C0 80AD62C0 A0820215 */ sb $v0, 0x0215($a0) ## 00000215 -/* 027C4 80AD62C4 10000002 */ beq $zero, $zero, .L80AD62D0 -/* 027C8 80AD62C8 A08F0215 */ sb $t7, 0x0215($a0) ## 00000215 -/* 027CC 80AD62CC A0820215 */ sb $v0, 0x0215($a0) ## 00000215 -.L80AD62D0: -/* 027D0 80AD62D0 90830216 */ lbu $v1, 0x0216($a0) ## 00000216 -/* 027D4 80AD62D4 286100D3 */ slti $at, $v1, 0x00D3 -/* 027D8 80AD62D8 1420000B */ bne $at, $zero, .L80AD6308 -/* 027DC 80AD62DC 24620005 */ addiu $v0, $v1, 0x0005 ## $v0 = 00000005 -/* 027E0 80AD62E0 2462FFFB */ addiu $v0, $v1, 0xFFFB ## $v0 = FFFFFFFB -/* 027E4 80AD62E4 00021400 */ sll $v0, $v0, 16 -/* 027E8 80AD62E8 00021403 */ sra $v0, $v0, 16 -/* 027EC 80AD62EC 284100D2 */ slti $at, $v0, 0x00D2 -/* 027F0 80AD62F0 10200003 */ beq $at, $zero, .L80AD6300 -/* 027F4 80AD62F4 241800D2 */ addiu $t8, $zero, 0x00D2 ## $t8 = 000000D2 -/* 027F8 80AD62F8 03E00008 */ jr $ra -/* 027FC 80AD62FC A0980216 */ sb $t8, 0x0216($a0) ## 00000216 -.L80AD6300: -/* 02800 80AD6300 03E00008 */ jr $ra -/* 02804 80AD6304 A0820216 */ sb $v0, 0x0216($a0) ## 00000216 -.L80AD6308: -/* 02808 80AD6308 00021400 */ sll $v0, $v0, 16 -/* 0280C 80AD630C 00021403 */ sra $v0, $v0, 16 -/* 02810 80AD6310 284100D3 */ slti $at, $v0, 0x00D3 -/* 02814 80AD6314 14200003 */ bne $at, $zero, .L80AD6324 -/* 02818 80AD6318 241900D2 */ addiu $t9, $zero, 0x00D2 ## $t9 = 000000D2 -/* 0281C 80AD631C 03E00008 */ jr $ra -/* 02820 80AD6320 A0990216 */ sb $t9, 0x0216($a0) ## 00000216 -.L80AD6324: -/* 02824 80AD6324 A0820216 */ sb $v0, 0x0216($a0) ## 00000216 -/* 02828 80AD6328 03E00008 */ jr $ra -/* 0282C 80AD632C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s deleted file mode 100644 index aa4646644c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s +++ /dev/null @@ -1,107 +0,0 @@ -.late_rodata -glabel D_80AD7298 - .word 0x418547AE -glabel D_80AD729C - .word 0x41855555 - -.text -glabel func_80AD6330 -/* 02830 80AD6330 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02834 80AD6334 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02838 80AD6338 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 0283C 80AD633C 3C0E80AD */ lui $t6, %hi(func_80AD48CC) ## $t6 = 80AD0000 -/* 02840 80AD6340 25CE48CC */ addiu $t6, $t6, %lo(func_80AD48CC) ## $t6 = 80AD48CC -/* 02844 80AD6344 15CF0039 */ bne $t6, $t7, .L80AD642C -/* 02848 80AD6348 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 0284C 80AD634C C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 02850 80AD6350 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 02854 80AD6354 3C0180AD */ lui $at, %hi(D_80AD7298) ## $at = 80AD0000 -/* 02858 80AD6358 4604003C */ c.lt.s $f0, $f4 -/* 0285C 80AD635C 00000000 */ nop -/* 02860 80AD6360 45000032 */ bc1f .L80AD642C -/* 02864 80AD6364 00000000 */ nop -/* 02868 80AD6368 C4267298 */ lwc1 $f6, %lo(D_80AD7298)($at) -/* 0286C 80AD636C 3C0180AD */ lui $at, %hi(D_80AD729C) ## $at = 80AD0000 -/* 02870 80AD6370 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02874 80AD6374 46060202 */ mul.s $f8, $f0, $f6 -/* 02878 80AD6378 4600428D */ trunc.w.s $f10, $f8 -/* 0287C 80AD637C 44025000 */ mfc1 $v0, $f10 -/* 02880 80AD6380 00000000 */ nop -/* 02884 80AD6384 00021400 */ sll $v0, $v0, 16 -/* 02888 80AD6388 00021403 */ sra $v0, $v0, 16 -/* 0288C 80AD638C 24420037 */ addiu $v0, $v0, 0x0037 ## $v0 = 00000037 -/* 02890 80AD6390 A082021A */ sb $v0, 0x021A($a0) ## 0000021A -/* 02894 80AD6394 A0820219 */ sb $v0, 0x0219($a0) ## 00000219 -/* 02898 80AD6398 A0820218 */ sb $v0, 0x0218($a0) ## 00000218 -/* 0289C 80AD639C C430729C */ lwc1 $f16, %lo(D_80AD729C)($at) -/* 028A0 80AD63A0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 028A4 80AD63A4 46100482 */ mul.s $f18, $f0, $f16 -/* 028A8 80AD63A8 4459F800 */ cfc1 $t9, $31 -/* 028AC 80AD63AC 44C8F800 */ ctc1 $t0, $31 -/* 028B0 80AD63B0 00000000 */ nop -/* 028B4 80AD63B4 46009124 */ cvt.w.s $f4, $f18 -/* 028B8 80AD63B8 4448F800 */ cfc1 $t0, $31 -/* 028BC 80AD63BC 00000000 */ nop -/* 028C0 80AD63C0 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 028C4 80AD63C4 51000013 */ beql $t0, $zero, .L80AD6414 -/* 028C8 80AD63C8 44082000 */ mfc1 $t0, $f4 -/* 028CC 80AD63CC 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 028D0 80AD63D0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 028D4 80AD63D4 46049101 */ sub.s $f4, $f18, $f4 -/* 028D8 80AD63D8 44C8F800 */ ctc1 $t0, $31 -/* 028DC 80AD63DC 00000000 */ nop -/* 028E0 80AD63E0 46002124 */ cvt.w.s $f4, $f4 -/* 028E4 80AD63E4 4448F800 */ cfc1 $t0, $31 -/* 028E8 80AD63E8 00000000 */ nop -/* 028EC 80AD63EC 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 028F0 80AD63F0 15000005 */ bne $t0, $zero, .L80AD6408 -/* 028F4 80AD63F4 00000000 */ nop -/* 028F8 80AD63F8 44082000 */ mfc1 $t0, $f4 -/* 028FC 80AD63FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02900 80AD6400 10000007 */ beq $zero, $zero, .L80AD6420 -/* 02904 80AD6404 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80AD6408: -/* 02908 80AD6408 10000005 */ beq $zero, $zero, .L80AD6420 -/* 0290C 80AD640C 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 02910 80AD6410 44082000 */ mfc1 $t0, $f4 -.L80AD6414: -/* 02914 80AD6414 00000000 */ nop -/* 02918 80AD6418 0500FFFB */ bltz $t0, .L80AD6408 -/* 0291C 80AD641C 00000000 */ nop -.L80AD6420: -/* 02920 80AD6420 44D9F800 */ ctc1 $t9, $31 -/* 02924 80AD6424 1000001B */ beq $zero, $zero, .L80AD6494 -/* 02928 80AD6428 A088021B */ sb $t0, 0x021B($a0) ## 0000021B -.L80AD642C: -/* 0292C 80AD642C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 02930 80AD6430 AFA40018 */ sw $a0, 0x0018($sp) -/* 02934 80AD6434 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 02938 80AD6438 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 0293C 80AD643C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02940 80AD6440 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 02944 80AD6444 46060202 */ mul.s $f8, $f0, $f6 -/* 02948 80AD6448 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 0294C 80AD644C 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 02950 80AD6450 46100482 */ mul.s $f18, $f0, $f16 -/* 02954 80AD6454 8FA40018 */ lw $a0, 0x0018($sp) -/* 02958 80AD6458 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 0295C 80AD645C A08E021B */ sb $t6, 0x021B($a0) ## 0000021B -/* 02960 80AD6460 4600428D */ trunc.w.s $f10, $f8 -/* 02964 80AD6464 46060202 */ mul.s $f8, $f0, $f6 -/* 02968 80AD6468 440C5000 */ mfc1 $t4, $f10 -/* 0296C 80AD646C 4600910D */ trunc.w.s $f4, $f18 -/* 02970 80AD6470 258D00E1 */ addiu $t5, $t4, 0x00E1 ## $t5 = 000000E1 -/* 02974 80AD6474 A08D0218 */ sb $t5, 0x0218($a0) ## 00000218 -/* 02978 80AD6478 4600428D */ trunc.w.s $f10, $f8 -/* 0297C 80AD647C 44192000 */ mfc1 $t9, $f4 -/* 02980 80AD6480 440C5000 */ mfc1 $t4, $f10 -/* 02984 80AD6484 2728009B */ addiu $t0, $t9, 0x009B ## $t0 = 0000009B -/* 02988 80AD6488 A0880219 */ sb $t0, 0x0219($a0) ## 00000219 -/* 0298C 80AD648C 258D005F */ addiu $t5, $t4, 0x005F ## $t5 = 0000005F -/* 02990 80AD6490 A08D021A */ sb $t5, 0x021A($a0) ## 0000021A -.L80AD6494: -/* 02994 80AD6494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02998 80AD6498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0299C 80AD649C 03E00008 */ jr $ra -/* 029A0 80AD64A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s deleted file mode 100644 index 6c1b2939a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80AD65C8 -/* 02AC8 80AD65C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02ACC 80AD65CC AFA40018 */ sw $a0, 0x0018($sp) -/* 02AD0 80AD65D0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02AD4 80AD65D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AD8 80AD65D8 AFA70024 */ sw $a3, 0x0024($sp) -/* 02ADC 80AD65DC 908E0217 */ lbu $t6, 0x0217($a0) ## 00000217 -/* 02AE0 80AD65E0 3C0B80AD */ lui $t3, %hi(func_80AD52F0) ## $t3 = 80AD0000 -/* 02AE4 80AD65E4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02AE8 80AD65E8 11C0000C */ beq $t6, $zero, .L80AD661C -/* 02AEC 80AD65EC 256B52F0 */ addiu $t3, $t3, %lo(func_80AD52F0) ## $t3 = 80AD52F0 -/* 02AF0 80AD65F0 50A1000B */ beql $a1, $at, .L80AD6620 -/* 02AF4 80AD65F4 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 02AF8 80AD65F8 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02AFC 80AD65FC 3C0F80AD */ lui $t7, %hi(func_80AD4ED8) ## $t7 = 80AD0000 -/* 02B00 80AD6600 25EF4ED8 */ addiu $t7, $t7, %lo(func_80AD4ED8) ## $t7 = 80AD4ED8 -/* 02B04 80AD6604 55E20009 */ bnel $t7, $v0, .L80AD662C -/* 02B08 80AD6608 8499001C */ lh $t9, 0x001C($a0) ## 0000001C -/* 02B0C 80AD660C 84980196 */ lh $t8, 0x0196($a0) ## 00000196 -/* 02B10 80AD6610 2B010002 */ slti $at, $t8, 0x0002 -/* 02B14 80AD6614 54200005 */ bnel $at, $zero, .L80AD662C -/* 02B18 80AD6618 8499001C */ lh $t9, 0x001C($a0) ## 0000001C -.L80AD661C: -/* 02B1C 80AD661C ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -.L80AD6620: -/* 02B20 80AD6620 10000018 */ beq $zero, $zero, .L80AD6684 -/* 02B24 80AD6624 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02B28 80AD6628 8499001C */ lh $t9, 0x001C($a0) ## 0000001C -.L80AD662C: -/* 02B2C 80AD662C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 02B30 80AD6630 14790014 */ bne $v1, $t9, .L80AD6684 -/* 02B34 80AD6634 00000000 */ nop -/* 02B38 80AD6638 14A30006 */ bne $a1, $v1, .L80AD6654 -/* 02B3C 80AD663C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02B40 80AD6640 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 -/* 02B44 80AD6644 25085900 */ addiu $t0, $t0, 0x5900 ## $t0 = 06005900 -/* 02B48 80AD6648 ACC80000 */ sw $t0, 0x0000($a2) ## 00000000 -/* 02B4C 80AD664C 1000000D */ beq $zero, $zero, .L80AD6684 -/* 02B50 80AD6650 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -.L80AD6654: -/* 02B54 80AD6654 14A10005 */ bne $a1, $at, .L80AD666C -/* 02B58 80AD6658 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 02B5C 80AD665C 25295620 */ addiu $t1, $t1, 0x5620 ## $t1 = 06005620 -/* 02B60 80AD6660 ACC90000 */ sw $t1, 0x0000($a2) ## 00000000 -/* 02B64 80AD6664 10000007 */ beq $zero, $zero, .L80AD6684 -/* 02B68 80AD6668 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -.L80AD666C: -/* 02B6C 80AD666C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 02B70 80AD6670 14A10004 */ bne $a1, $at, .L80AD6684 -/* 02B74 80AD6674 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 02B78 80AD6678 254A59F0 */ addiu $t2, $t2, 0x59F0 ## $t2 = 060059F0 -/* 02B7C 80AD667C ACCA0000 */ sw $t2, 0x0000($a2) ## 00000000 -/* 02B80 80AD6680 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -.L80AD6684: -/* 02B84 80AD6684 1562000D */ bne $t3, $v0, .L80AD66BC -/* 02B88 80AD6688 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02B8C 80AD668C 54A1000C */ bnel $a1, $at, .L80AD66C0 -/* 02B90 80AD6690 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02B94 80AD6694 848C0196 */ lh $t4, 0x0196($a0) ## 00000196 -/* 02B98 80AD6698 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 -/* 02B9C 80AD669C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.06 -/* 02BA0 80AD66A0 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 02BA4 80AD66A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02BA8 80AD66A8 468021A0 */ cvt.s.w $f6, $f4 -/* 02BAC 80AD66AC 46083302 */ mul.s $f12, $f6, $f8 -/* 02BB0 80AD66B0 44066000 */ mfc1 $a2, $f12 -/* 02BB4 80AD66B4 0C0342A3 */ jal Matrix_Scale -/* 02BB8 80AD66B8 46006386 */ mov.s $f14, $f12 -.L80AD66BC: -/* 02BBC 80AD66BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AD66C0: -/* 02BC0 80AD66C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02BC4 80AD66C4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 02BC8 80AD66C8 03E00008 */ jr $ra -/* 02BCC 80AD66CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s deleted file mode 100644 index d90017a6c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s +++ /dev/null @@ -1,154 +0,0 @@ -.rdata -glabel D_80AD719C - .asciz "../z_en_po_field.c" - .balign 4 - -.late_rodata -glabel D_80AD72A0 - .float 0.01 - -glabel D_80AD72A4 - .word 0x3F48C8C9 - -.text -glabel func_80AD66D0 -/* 02BD0 80AD66D0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02BD4 80AD66D4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02BD8 80AD66D8 8FB00068 */ lw $s0, 0x0068($sp) -/* 02BDC 80AD66DC 3C0E80AD */ lui $t6, %hi(func_80AD4ED8) ## $t6 = 80AD0000 -/* 02BE0 80AD66E0 25CE4ED8 */ addiu $t6, $t6, %lo(func_80AD4ED8) ## $t6 = 80AD4ED8 -/* 02BE4 80AD66E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02BE8 80AD66E8 AFA40058 */ sw $a0, 0x0058($sp) -/* 02BEC 80AD66EC AFA5005C */ sw $a1, 0x005C($sp) -/* 02BF0 80AD66F0 AFA60060 */ sw $a2, 0x0060($sp) -/* 02BF4 80AD66F4 AFA70064 */ sw $a3, 0x0064($sp) -/* 02BF8 80AD66F8 AFAE0038 */ sw $t6, 0x0038($sp) -/* 02BFC 80AD66FC 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 -/* 02C00 80AD6700 55CF0020 */ bnel $t6, $t7, .L80AD6784 -/* 02C04 80AD6704 8FAE005C */ lw $t6, 0x005C($sp) -/* 02C08 80AD6708 86180196 */ lh $t8, 0x0196($s0) ## 00000196 -/* 02C0C 80AD670C 2B010002 */ slti $at, $t8, 0x0002 -/* 02C10 80AD6710 1420001B */ bne $at, $zero, .L80AD6780 -/* 02C14 80AD6714 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 02C18 80AD6718 14A10019 */ bne $a1, $at, .L80AD6780 -/* 02C1C 80AD671C 8FA7006C */ lw $a3, 0x006C($sp) -/* 02C20 80AD6720 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 02C24 80AD6724 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 02C28 80AD6728 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 02C2C 80AD672C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 02C30 80AD6730 ACE80000 */ sw $t0, 0x0000($a3) ## 00000000 -/* 02C34 80AD6734 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02C38 80AD6738 8FAA0058 */ lw $t2, 0x0058($sp) -/* 02C3C 80AD673C 3C0580AD */ lui $a1, %hi(D_80AD719C) ## $a1 = 80AD0000 -/* 02C40 80AD6740 24A5719C */ addiu $a1, $a1, %lo(D_80AD719C) ## $a1 = 80AD719C -/* 02C44 80AD6744 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 02C48 80AD6748 2406077C */ addiu $a2, $zero, 0x077C ## $a2 = 0000077C -/* 02C4C 80AD674C 0C0346A2 */ jal Matrix_NewMtx -/* 02C50 80AD6750 AFA20050 */ sw $v0, 0x0050($sp) -/* 02C54 80AD6754 8FA30050 */ lw $v1, 0x0050($sp) -/* 02C58 80AD6758 8FA7006C */ lw $a3, 0x006C($sp) -/* 02C5C 80AD675C 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 02C60 80AD6760 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 02C64 80AD6764 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 02C68 80AD6768 25AD66D0 */ addiu $t5, $t5, 0x66D0 ## $t5 = 060066D0 -/* 02C6C 80AD676C 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 02C70 80AD6770 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 02C74 80AD6774 ACEB0000 */ sw $t3, 0x0000($a3) ## 00000000 -/* 02C78 80AD6778 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 02C7C 80AD677C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L80AD6780: -/* 02C80 80AD6780 8FAE005C */ lw $t6, 0x005C($sp) -.L80AD6784: -/* 02C84 80AD6784 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02C88 80AD6788 3C0480AD */ lui $a0, %hi(D_80AD714C) ## $a0 = 80AD0000 -/* 02C8C 80AD678C 15C10050 */ bne $t6, $at, .L80AD68D0 -/* 02C90 80AD6790 2484714C */ addiu $a0, $a0, %lo(D_80AD714C) ## $a0 = 80AD714C -/* 02C94 80AD6794 0C0346BD */ jal Matrix_MultVec3f -/* 02C98 80AD6798 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFE8 -/* 02C9C 80AD679C 8FAF0038 */ lw $t7, 0x0038($sp) -/* 02CA0 80AD67A0 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 -/* 02CA4 80AD67A4 15F80012 */ bne $t7, $t8, .L80AD67F0 -/* 02CA8 80AD67A8 00000000 */ nop -/* 02CAC 80AD67AC 86190196 */ lh $t9, 0x0196($s0) ## 00000196 -/* 02CB0 80AD67B0 2B210013 */ slti $at, $t9, 0x0013 -/* 02CB4 80AD67B4 1420000E */ bne $at, $zero, .L80AD67F0 -/* 02CB8 80AD67B8 00000000 */ nop -/* 02CBC 80AD67BC C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 02CC0 80AD67C0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02CC4 80AD67C4 3C0180AD */ lui $at, %hi(D_80AD72A0) ## $at = 80AD0000 -/* 02CC8 80AD67C8 46002032 */ c.eq.s $f4, $f0 -/* 02CCC 80AD67CC 00000000 */ nop -/* 02CD0 80AD67D0 45010007 */ bc1t .L80AD67F0 -/* 02CD4 80AD67D4 00000000 */ nop -/* 02CD8 80AD67D8 C42672A0 */ lwc1 $f6, %lo(D_80AD72A0)($at) -/* 02CDC 80AD67DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02CE0 80AD67E0 46003303 */ div.s $f12, $f6, $f0 -/* 02CE4 80AD67E4 44066000 */ mfc1 $a2, $f12 -/* 02CE8 80AD67E8 0C0342A3 */ jal Matrix_Scale -/* 02CEC 80AD67EC 46006386 */ mov.s $f14, $f12 -.L80AD67F0: -/* 02CF0 80AD67F0 3C0480AD */ lui $a0, %hi(D_80AD7700) ## $a0 = 80AD0000 -/* 02CF4 80AD67F4 0C034236 */ jal Matrix_Get -/* 02CF8 80AD67F8 24847700 */ addiu $a0, $a0, %lo(D_80AD7700) ## $a0 = 80AD7700 -/* 02CFC 80AD67FC 8FA80038 */ lw $t0, 0x0038($sp) -/* 02D00 80AD6800 8E090190 */ lw $t1, 0x0190($s0) ## 00000190 -/* 02D04 80AD6804 3C0480AD */ lui $a0, %hi(D_80AD7700) ## $a0 = 80AD0000 -/* 02D08 80AD6808 24847700 */ addiu $a0, $a0, %lo(D_80AD7700) ## $a0 = 80AD7700 -/* 02D0C 80AD680C 5509000C */ bnel $t0, $t1, .L80AD6840 -/* 02D10 80AD6810 920E0218 */ lbu $t6, 0x0218($s0) ## 00000218 -/* 02D14 80AD6814 860A0196 */ lh $t2, 0x0196($s0) ## 00000196 -/* 02D18 80AD6818 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 02D1C 80AD681C 55410008 */ bnel $t2, $at, .L80AD6840 -/* 02D20 80AD6820 920E0218 */ lbu $t6, 0x0218($s0) ## 00000218 -/* 02D24 80AD6824 C4880030 */ lwc1 $f8, 0x0030($a0) ## 80AD7730 -/* 02D28 80AD6828 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 02D2C 80AD682C C48A0034 */ lwc1 $f10, 0x0034($a0) ## 80AD7734 -/* 02D30 80AD6830 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 02D34 80AD6834 C4900038 */ lwc1 $f16, 0x0038($a0) ## 80AD7738 -/* 02D38 80AD6838 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 02D3C 80AD683C 920E0218 */ lbu $t6, 0x0218($s0) ## 00000218 -.L80AD6840: -/* 02D40 80AD6840 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 02D44 80AD6844 C7A60044 */ lwc1 $f6, 0x0044($sp) -/* 02D48 80AD6848 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02D4C 80AD684C 920F0219 */ lbu $t7, 0x0219($s0) ## 00000219 -/* 02D50 80AD6850 C7AA0048 */ lwc1 $f10, 0x0048($sp) -/* 02D54 80AD6854 4600910D */ trunc.w.s $f4, $f18 -/* 02D58 80AD6858 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02D5C 80AD685C 9218021A */ lbu $t8, 0x021A($s0) ## 0000021A -/* 02D60 80AD6860 4600320D */ trunc.w.s $f8, $f6 -/* 02D64 80AD6864 44052000 */ mfc1 $a1, $f4 -/* 02D68 80AD6868 AFB80018 */ sw $t8, 0x0018($sp) -/* 02D6C 80AD686C 4600540D */ trunc.w.s $f16, $f10 -/* 02D70 80AD6870 9219021B */ lbu $t9, 0x021B($s0) ## 0000021B -/* 02D74 80AD6874 44064000 */ mfc1 $a2, $f8 -/* 02D78 80AD6878 00052C00 */ sll $a1, $a1, 16 -/* 02D7C 80AD687C 44078000 */ mfc1 $a3, $f16 -/* 02D80 80AD6880 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 02D84 80AD6884 00063400 */ sll $a2, $a2, 16 -/* 02D88 80AD6888 00073C00 */ sll $a3, $a3, 16 -/* 02D8C 80AD688C 00073C03 */ sra $a3, $a3, 16 -/* 02D90 80AD6890 00063403 */ sra $a2, $a2, 16 -/* 02D94 80AD6894 00052C03 */ sra $a1, $a1, 16 -/* 02D98 80AD6898 26040234 */ addiu $a0, $s0, 0x0234 ## $a0 = 00000234 -/* 02D9C 80AD689C 07210005 */ bgez $t9, .L80AD68B4 -/* 02DA0 80AD68A0 46809120 */ cvt.s.w $f4, $f18 -/* 02DA4 80AD68A4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 02DA8 80AD68A8 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 02DAC 80AD68AC 00000000 */ nop -/* 02DB0 80AD68B0 46062100 */ add.s $f4, $f4, $f6 -.L80AD68B4: -/* 02DB4 80AD68B4 3C0180AD */ lui $at, %hi(D_80AD72A4) ## $at = 80AD0000 -/* 02DB8 80AD68B8 C42872A4 */ lwc1 $f8, %lo(D_80AD72A4)($at) -/* 02DBC 80AD68BC 46082282 */ mul.s $f10, $f4, $f8 -/* 02DC0 80AD68C0 4600540D */ trunc.w.s $f16, $f10 -/* 02DC4 80AD68C4 44098000 */ mfc1 $t1, $f16 -/* 02DC8 80AD68C8 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 02DCC 80AD68CC AFA9001C */ sw $t1, 0x001C($sp) -.L80AD68D0: -/* 02DD0 80AD68D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 02DD4 80AD68D4 8FB00028 */ lw $s0, 0x0028($sp) -/* 02DD8 80AD68D8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 02DDC 80AD68DC 03E00008 */ jr $ra -/* 02DE0 80AD68E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s deleted file mode 100644 index c6114933db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AD6BF4 -/* 030F4 80AD6BF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 030F8 80AD6BF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 030FC 80AD6BFC AFA5001C */ sw $a1, 0x001C($sp) -/* 03100 80AD6C00 AFA40018 */ sw $a0, 0x0018($sp) -/* 03104 80AD6C04 8C990190 */ lw $t9, 0x0190($a0) ## 00000190 -/* 03108 80AD6C08 0320F809 */ jalr $ra, $t9 -/* 0310C 80AD6C0C 00000000 */ nop -/* 03110 80AD6C10 8FA40018 */ lw $a0, 0x0018($sp) -/* 03114 80AD6C14 3C0E80AD */ lui $t6, %hi(func_80AD53F0) ## $t6 = 80AD0000 -/* 03118 80AD6C18 25CE53F0 */ addiu $t6, $t6, %lo(func_80AD53F0) ## $t6 = 80AD53F0 -/* 0311C 80AD6C1C 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 03120 80AD6C20 15CF0004 */ bne $t6, $t7, .L80AD6C34 -/* 03124 80AD6C24 00000000 */ nop -/* 03128 80AD6C28 0C2B58CC */ jal func_80AD6330 -/* 0312C 80AD6C2C AFA40018 */ sw $a0, 0x0018($sp) -/* 03130 80AD6C30 8FA40018 */ lw $a0, 0x0018($sp) -.L80AD6C34: -/* 03134 80AD6C34 0C2B5758 */ jal func_80AD5D60 -/* 03138 80AD6C38 8FA5001C */ lw $a1, 0x001C($sp) -/* 0313C 80AD6C3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03140 80AD6C40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03144 80AD6C44 03E00008 */ jr $ra -/* 03148 80AD6C48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s deleted file mode 100644 index 124f8861df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s +++ /dev/null @@ -1,287 +0,0 @@ -.rdata -glabel D_80AD71EC - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7200 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7214 - .asciz "../z_en_po_field.c" - .balign 4 - -glabel D_80AD7228 - .asciz "../z_en_po_field.c" - .balign 4 - -.late_rodata -glabel D_80AD72A8 - .float 9.58738019108e-05 - -.text -glabel func_80AD6C4C -/* 0314C 80AD6C4C 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 03150 80AD6C50 AFBF0044 */ sw $ra, 0x0044($sp) -/* 03154 80AD6C54 AFB20040 */ sw $s2, 0x0040($sp) -/* 03158 80AD6C58 AFB1003C */ sw $s1, 0x003C($sp) -/* 0315C 80AD6C5C AFB00038 */ sw $s0, 0x0038($sp) -/* 03160 80AD6C60 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 03164 80AD6C64 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 03168 80AD6C68 3C1880AD */ lui $t8, %hi(D_80AD712C) ## $t8 = 80AD0000 -/* 0316C 80AD6C6C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03170 80AD6C70 2718712C */ addiu $t8, $t8, %lo(D_80AD712C) ## $t8 = 80AD712C -/* 03174 80AD6C74 000E7900 */ sll $t7, $t6, 4 -/* 03178 80AD6C78 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0317C 80AD6C7C 01F84021 */ addu $t0, $t7, $t8 -/* 03180 80AD6C80 3C0680AD */ lui $a2, %hi(D_80AD71EC) ## $a2 = 80AD0000 -/* 03184 80AD6C84 24C671EC */ addiu $a2, $a2, %lo(D_80AD71EC) ## $a2 = 80AD71EC -/* 03188 80AD6C88 AFA80094 */ sw $t0, 0x0094($sp) -/* 0318C 80AD6C8C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 -/* 03190 80AD6C90 2407081D */ addiu $a3, $zero, 0x081D ## $a3 = 0000081D -/* 03194 80AD6C94 0C031AB1 */ jal Graph_OpenDisps -/* 03198 80AD6C98 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0319C 80AD6C9C 8E290190 */ lw $t1, 0x0190($s1) ## 00000190 -/* 031A0 80AD6CA0 3C1980AD */ lui $t9, %hi(func_80AD53F0) ## $t9 = 80AD0000 -/* 031A4 80AD6CA4 273953F0 */ addiu $t9, $t9, %lo(func_80AD53F0) ## $t9 = 80AD53F0 -/* 031A8 80AD6CA8 1729005B */ bne $t9, $t1, .L80AD6E18 -/* 031AC 80AD6CAC 8FA80094 */ lw $t0, 0x0094($sp) -/* 031B0 80AD6CB0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 031B4 80AD6CB4 0C024F46 */ jal func_80093D18 -/* 031B8 80AD6CB8 AFA80094 */ sw $t0, 0x0094($sp) -/* 031BC 80AD6CBC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 031C0 80AD6CC0 8FA80094 */ lw $t0, 0x0094($sp) -/* 031C4 80AD6CC4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 031C8 80AD6CC8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 031CC 80AD6CCC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 031D0 80AD6CD0 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 031D4 80AD6CD4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 031D8 80AD6CD8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 031DC 80AD6CDC 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 031E0 80AD6CE0 91070008 */ lbu $a3, 0x0008($t0) ## 00000008 -/* 031E4 80AD6CE4 91060007 */ lbu $a2, 0x0007($t0) ## 00000007 -/* 031E8 80AD6CE8 91050006 */ lbu $a1, 0x0006($t0) ## 00000006 -/* 031EC 80AD6CEC AFAC0010 */ sw $t4, 0x0010($sp) -/* 031F0 80AD6CF0 0C025474 */ jal Gfx_EnvColor -/* 031F4 80AD6CF4 AFA2007C */ sw $v0, 0x007C($sp) -/* 031F8 80AD6CF8 8FA3007C */ lw $v1, 0x007C($sp) -/* 031FC 80AD6CFC 240A00C8 */ addiu $t2, $zero, 0x00C8 ## $t2 = 000000C8 -/* 03200 80AD6D00 26240234 */ addiu $a0, $s1, 0x0234 ## $a0 = 00000234 -/* 03204 80AD6D04 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03208 80AD6D08 C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C -/* 0320C 80AD6D0C C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 -/* 03210 80AD6D10 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 03214 80AD6D14 92380218 */ lbu $t8, 0x0218($s1) ## 00000218 -/* 03218 80AD6D18 4600848D */ trunc.w.s $f18, $f16 -/* 0321C 80AD6D1C AFB80010 */ sw $t8, 0x0010($sp) -/* 03220 80AD6D20 4600428D */ trunc.w.s $f10, $f8 -/* 03224 80AD6D24 92390219 */ lbu $t9, 0x0219($s1) ## 00000219 -/* 03228 80AD6D28 44079000 */ mfc1 $a3, $f18 -/* 0322C 80AD6D2C 4600218D */ trunc.w.s $f6, $f4 -/* 03230 80AD6D30 44065000 */ mfc1 $a2, $f10 -/* 03234 80AD6D34 AFB90014 */ sw $t9, 0x0014($sp) -/* 03238 80AD6D38 9229021A */ lbu $t1, 0x021A($s1) ## 0000021A -/* 0323C 80AD6D3C 44053000 */ mfc1 $a1, $f6 -/* 03240 80AD6D40 00073C00 */ sll $a3, $a3, 16 -/* 03244 80AD6D44 00063400 */ sll $a2, $a2, 16 -/* 03248 80AD6D48 00052C00 */ sll $a1, $a1, 16 -/* 0324C 80AD6D4C 00052C03 */ sra $a1, $a1, 16 -/* 03250 80AD6D50 00063403 */ sra $a2, $a2, 16 -/* 03254 80AD6D54 00073C03 */ sra $a3, $a3, 16 -/* 03258 80AD6D58 AFAA001C */ sw $t2, 0x001C($sp) -/* 0325C 80AD6D5C 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 03260 80AD6D60 AFA90018 */ sw $t1, 0x0018($sp) -/* 03264 80AD6D64 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03268 80AD6D68 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 0326C 80AD6D6C 3C0580AD */ lui $a1, %hi(D_80AD7200) ## $a1 = 80AD0000 -/* 03270 80AD6D70 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03274 80AD6D74 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 03278 80AD6D78 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0327C 80AD6D7C 92390219 */ lbu $t9, 0x0219($s1) ## 00000219 -/* 03280 80AD6D80 922E0218 */ lbu $t6, 0x0218($s1) ## 00000218 -/* 03284 80AD6D84 922C021A */ lbu $t4, 0x021A($s1) ## 0000021A -/* 03288 80AD6D88 00194C00 */ sll $t1, $t9, 16 -/* 0328C 80AD6D8C 000E7E00 */ sll $t7, $t6, 24 -/* 03290 80AD6D90 01E95025 */ or $t2, $t7, $t1 ## $t2 = 00000000 -/* 03294 80AD6D94 000C6A00 */ sll $t5, $t4, 8 -/* 03298 80AD6D98 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000000 -/* 0329C 80AD6D9C 35D800FF */ ori $t8, $t6, 0x00FF ## $t8 = 000000FF -/* 032A0 80AD6DA0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 032A4 80AD6DA4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 032A8 80AD6DA8 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 -/* 032AC 80AD6DAC 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 -/* 032B0 80AD6DB0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 032B4 80AD6DB4 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 032B8 80AD6DB8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 032BC 80AD6DBC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 032C0 80AD6DC0 24A57200 */ addiu $a1, $a1, %lo(D_80AD7200) ## $a1 = 80AD7200 -/* 032C4 80AD6DC4 24060838 */ addiu $a2, $zero, 0x0838 ## $a2 = 00000838 -/* 032C8 80AD6DC8 0C0346A2 */ jal Matrix_NewMtx -/* 032CC 80AD6DCC AFA20074 */ sw $v0, 0x0074($sp) -/* 032D0 80AD6DD0 8FA30074 */ lw $v1, 0x0074($sp) -/* 032D4 80AD6DD4 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 032D8 80AD6DD8 256B4BA0 */ addiu $t3, $t3, 0x4BA0 ## $t3 = 06004BA0 -/* 032DC 80AD6DDC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 032E0 80AD6DE0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 032E4 80AD6DE4 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 -/* 032E8 80AD6DE8 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 032EC 80AD6DEC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 032F0 80AD6DF0 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 032F4 80AD6DF4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 032F8 80AD6DF8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 032FC 80AD6DFC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03300 80AD6E00 254A4CC0 */ addiu $t2, $t2, 0x4CC0 ## $t2 = 06004CC0 -/* 03304 80AD6E04 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03308 80AD6E08 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 0330C 80AD6E0C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 03310 80AD6E10 10000083 */ beq $zero, $zero, .L80AD7020 -/* 03314 80AD6E14 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -.L80AD6E18: -/* 03318 80AD6E18 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0331C 80AD6E1C 0C024F61 */ jal func_80093D84 -/* 03320 80AD6E20 AFA80094 */ sw $t0, 0x0094($sp) -/* 03324 80AD6E24 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03328 80AD6E28 8FA80094 */ lw $t0, 0x0094($sp) -/* 0332C 80AD6E2C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 03330 80AD6E30 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03334 80AD6E34 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 03338 80AD6E38 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 0333C 80AD6E3C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03340 80AD6E40 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 03344 80AD6E44 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 03348 80AD6E48 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 0334C 80AD6E4C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03350 80AD6E50 AFAF0018 */ sw $t7, 0x0018($sp) -/* 03354 80AD6E54 AFB90014 */ sw $t9, 0x0014($sp) -/* 03358 80AD6E58 AFB80010 */ sw $t8, 0x0010($sp) -/* 0335C 80AD6E5C AFA0001C */ sw $zero, 0x001C($sp) -/* 03360 80AD6E60 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 03364 80AD6E64 01324821 */ addu $t1, $t1, $s2 -/* 03368 80AD6E68 8D291DE4 */ lw $t1, 0x1DE4($t1) ## 00011DE4 -/* 0336C 80AD6E6C 810B0009 */ lb $t3, 0x0009($t0) ## 00000009 -/* 03370 80AD6E70 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 03374 80AD6E74 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 03378 80AD6E78 012B0019 */ multu $t1, $t3 -/* 0337C 80AD6E7C AFAD0024 */ sw $t5, 0x0024($sp) -/* 03380 80AD6E80 AFAE0028 */ sw $t6, 0x0028($sp) -/* 03384 80AD6E84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03388 80AD6E88 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0338C 80AD6E8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03390 80AD6E90 AFA20068 */ sw $v0, 0x0068($sp) -/* 03394 80AD6E94 AFA80094 */ sw $t0, 0x0094($sp) -/* 03398 80AD6E98 00006012 */ mflo $t4 -/* 0339C 80AD6E9C 318A01FF */ andi $t2, $t4, 0x01FF ## $t2 = 00000000 -/* 033A0 80AD6EA0 0C0253D0 */ jal Gfx_TwoTexScroll -/* 033A4 80AD6EA4 AFAA0020 */ sw $t2, 0x0020($sp) -/* 033A8 80AD6EA8 8FA30068 */ lw $v1, 0x0068($sp) -/* 033AC 80AD6EAC 8FA80094 */ lw $t0, 0x0094($sp) -/* 033B0 80AD6EB0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 033B4 80AD6EB4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 033B8 80AD6EB8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 033BC 80AD6EBC 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 033C0 80AD6EC0 3C0C8016 */ lui $t4, %hi(gSegments) -/* 033C4 80AD6EC4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 033C8 80AD6EC8 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 033CC 80AD6ECC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 033D0 80AD6ED0 8D04000C */ lw $a0, 0x000C($t0) ## 0000000C -/* 033D4 80AD6ED4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 033D8 80AD6ED8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 033DC 80AD6EDC 00047900 */ sll $t7, $a0, 4 -/* 033E0 80AD6EE0 000F4F02 */ srl $t1, $t7, 28 -/* 033E4 80AD6EE4 00095880 */ sll $t3, $t1, 2 -/* 033E8 80AD6EE8 018B6021 */ addu $t4, $t4, $t3 -/* 033EC 80AD6EEC 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* 033F0 80AD6EF0 00815024 */ and $t2, $a0, $at -/* 033F4 80AD6EF4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 033F8 80AD6EF8 018A6821 */ addu $t5, $t4, $t2 -/* 033FC 80AD6EFC 01A17021 */ addu $t6, $t5, $at -/* 03400 80AD6F00 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 03404 80AD6F04 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03408 80AD6F08 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 -/* 0340C 80AD6F0C 37398080 */ ori $t9, $t9, 0x8080 ## $t9 = FA008080 -/* 03410 80AD6F10 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03414 80AD6F14 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 03418 80AD6F18 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0341C 80AD6F1C 910A0001 */ lbu $t2, 0x0001($t0) ## 00000001 -/* 03420 80AD6F20 91090000 */ lbu $t1, 0x0000($t0) ## 00000000 -/* 03424 80AD6F24 91190002 */ lbu $t9, 0x0002($t0) ## 00000002 -/* 03428 80AD6F28 000A6C00 */ sll $t5, $t2, 16 -/* 0342C 80AD6F2C 922A0217 */ lbu $t2, 0x0217($s1) ## 00000217 -/* 03430 80AD6F30 00095E00 */ sll $t3, $t1, 24 -/* 03434 80AD6F34 016D7025 */ or $t6, $t3, $t5 ## $t6 = 00000000 -/* 03438 80AD6F38 00197A00 */ sll $t7, $t9, 8 -/* 0343C 80AD6F3C 01CF4825 */ or $t1, $t6, $t7 ## $t1 = 00000000 -/* 03440 80AD6F40 012A5825 */ or $t3, $t1, $t2 ## $t3 = 00000000 -/* 03444 80AD6F44 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03448 80AD6F48 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0344C 80AD6F4C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 03450 80AD6F50 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03454 80AD6F54 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 03458 80AD6F58 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0345C 80AD6F5C 92290215 */ lbu $t1, 0x0215($s1) ## 00000215 -/* 03460 80AD6F60 922E0214 */ lbu $t6, 0x0214($s1) ## 00000214 -/* 03464 80AD6F64 92380216 */ lbu $t8, 0x0216($s1) ## 00000216 -/* 03468 80AD6F68 00095400 */ sll $t2, $t1, 16 -/* 0346C 80AD6F6C 000E7E00 */ sll $t7, $t6, 24 -/* 03470 80AD6F70 01EA5825 */ or $t3, $t7, $t2 ## $t3 = 00000000 -/* 03474 80AD6F74 0018CA00 */ sll $t9, $t8, 8 -/* 03478 80AD6F78 01797025 */ or $t6, $t3, $t9 ## $t6 = FA008080 -/* 0347C 80AD6F7C 35CC00FF */ ori $t4, $t6, 0x00FF ## $t4 = FA0080FF -/* 03480 80AD6F80 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 03484 80AD6F84 864907A0 */ lh $t1, 0x07A0($s2) ## 000007A0 -/* 03488 80AD6F88 00097880 */ sll $t7, $t1, 2 -/* 0348C 80AD6F8C 024F5021 */ addu $t2, $s2, $t7 -/* 03490 80AD6F90 0C016A7D */ jal func_8005A9F4 -/* 03494 80AD6F94 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 -/* 03498 80AD6F98 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0349C 80AD6F9C 00416821 */ addu $t5, $v0, $at -/* 034A0 80AD6FA0 000DC400 */ sll $t8, $t5, 16 -/* 034A4 80AD6FA4 00185C03 */ sra $t3, $t8, 16 -/* 034A8 80AD6FA8 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 034AC 80AD6FAC 3C0180AD */ lui $at, %hi(D_80AD72A8) ## $at = 80AD0000 -/* 034B0 80AD6FB0 C42872A8 */ lwc1 $f8, %lo(D_80AD72A8)($at) -/* 034B4 80AD6FB4 468021A0 */ cvt.s.w $f6, $f4 -/* 034B8 80AD6FB8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 034BC 80AD6FBC 46083302 */ mul.s $f12, $f6, $f8 -/* 034C0 80AD6FC0 0C034348 */ jal Matrix_RotateY -/* 034C4 80AD6FC4 00000000 */ nop -/* 034C8 80AD6FC8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 034CC 80AD6FCC 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 -/* 034D0 80AD6FD0 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 -/* 034D4 80AD6FD4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 034D8 80AD6FD8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 034DC 80AD6FDC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 034E0 80AD6FE0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 034E4 80AD6FE4 3C0580AD */ lui $a1, %hi(D_80AD7214) ## $a1 = 80AD0000 -/* 034E8 80AD6FE8 24A57214 */ addiu $a1, $a1, %lo(D_80AD7214) ## $a1 = 80AD7214 -/* 034EC 80AD6FEC 2406085F */ addiu $a2, $zero, 0x085F ## $a2 = 0000085F -/* 034F0 80AD6FF0 0C0346A2 */ jal Matrix_NewMtx -/* 034F4 80AD6FF4 AFA20058 */ sw $v0, 0x0058($sp) -/* 034F8 80AD6FF8 8FA30058 */ lw $v1, 0x0058($sp) -/* 034FC 80AD6FFC 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 03500 80AD7000 252923B0 */ addiu $t1, $t1, 0x23B0 ## $t1 = 060023B0 -/* 03504 80AD7004 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03508 80AD7008 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0350C 80AD700C 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 -/* 03510 80AD7010 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03514 80AD7014 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 03518 80AD7018 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0351C 80AD701C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -.L80AD7020: -/* 03520 80AD7020 3C0680AD */ lui $a2, %hi(D_80AD7228) ## $a2 = 80AD0000 -/* 03524 80AD7024 24C67228 */ addiu $a2, $a2, %lo(D_80AD7228) ## $a2 = 80AD7228 -/* 03528 80AD7028 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 -/* 0352C 80AD702C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03530 80AD7030 0C031AD5 */ jal Graph_CloseDisps -/* 03534 80AD7034 24070865 */ addiu $a3, $zero, 0x0865 ## $a3 = 00000865 -/* 03538 80AD7038 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0353C 80AD703C 0C2B57A3 */ jal func_80AD5E8C -/* 03540 80AD7040 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 03544 80AD7044 8FBF0044 */ lw $ra, 0x0044($sp) -/* 03548 80AD7048 8FB00038 */ lw $s0, 0x0038($sp) -/* 0354C 80AD704C 8FB1003C */ lw $s1, 0x003C($sp) -/* 03550 80AD7050 8FB20040 */ lw $s2, 0x0040($sp) -/* 03554 80AD7054 03E00008 */ jr $ra -/* 03558 80AD7058 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 -/* 0355C 80AD705C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s deleted file mode 100644 index 3be9ccb751..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel EnPoRelay_Destroy -/* 00184 80AD78C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00188 80AD78C8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0018C 80AD78CC 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00190 80AD78D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00194 80AD78D4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00198 80AD78D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0019C 80AD78DC 8DC6027C */ lw $a2, 0x027C($t6) ## 0000027C -/* 001A0 80AD78E0 AFA7001C */ sw $a3, 0x001C($sp) -/* 001A4 80AD78E4 0C01E9F1 */ jal LightContext_RemoveLight - -/* 001A8 80AD78E8 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 001AC 80AD78EC 8FA50018 */ lw $a1, 0x0018($sp) -/* 001B0 80AD78F0 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B4 80AD78F4 0C0170EB */ jal Collider_DestroyCylinder - -/* 001B8 80AD78F8 24A50290 */ addiu $a1, $a1, 0x0290 ## $a1 = 00000290 -/* 001BC 80AD78FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C0 80AD7900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C4 80AD7904 03E00008 */ jr $ra -/* 001C8 80AD7908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s deleted file mode 100644 index 2f3b81cb30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s +++ /dev/null @@ -1,73 +0,0 @@ -.rdata -glabel D_80AD8DC4 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8DD8 - .asciz "../z_en_po_relay.c" - .balign 4 - -.text -glabel EnPoRelay_Draw -/* 013F8 80AD8B38 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 013FC 80AD8B3C AFBF002C */ sw $ra, 0x002C($sp) -/* 01400 80AD8B40 AFB00028 */ sw $s0, 0x0028($sp) -/* 01404 80AD8B44 AFA50054 */ sw $a1, 0x0054($sp) -/* 01408 80AD8B48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0140C 80AD8B4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01410 80AD8B50 3C0680AE */ lui $a2, %hi(D_80AD8DC4) ## $a2 = 80AE0000 -/* 01414 80AD8B54 24C68DC4 */ addiu $a2, $a2, %lo(D_80AD8DC4) ## $a2 = 80AD8DC4 -/* 01418 80AD8B58 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 0141C 80AD8B5C 240703AC */ addiu $a3, $zero, 0x03AC ## $a3 = 000003AC -/* 01420 80AD8B60 0C031AB1 */ jal Graph_OpenDisps -/* 01424 80AD8B64 AFA50048 */ sw $a1, 0x0048($sp) -/* 01428 80AD8B68 8FAF0054 */ lw $t7, 0x0054($sp) -/* 0142C 80AD8B6C 0C024F46 */ jal func_80093D18 -/* 01430 80AD8B70 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01434 80AD8B74 8FA50048 */ lw $a1, 0x0048($sp) -/* 01438 80AD8B78 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 0143C 80AD8B7C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 01440 80AD8B80 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 01444 80AD8B84 3C0480AE */ lui $a0, %hi(D_80AD8D54) ## $a0 = 80AE0000 -/* 01448 80AD8B88 3C0E8016 */ lui $t6, %hi(gSegments) -/* 0144C 80AD8B8C 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 01450 80AD8B90 ACB802C0 */ sw $t8, 0x02C0($a1) ## 000002C0 -/* 01454 80AD8B94 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 01458 80AD8B98 9608019E */ lhu $t0, 0x019E($s0) ## 0000019E -/* 0145C 80AD8B9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01460 80AD8BA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01464 80AD8BA4 00084880 */ sll $t1, $t0, 2 -/* 01468 80AD8BA8 00892021 */ addu $a0, $a0, $t1 -/* 0146C 80AD8BAC 8C848D54 */ lw $a0, %lo(D_80AD8D54)($a0) -/* 01470 80AD8BB0 3C1980AE */ lui $t9, %hi(func_80AD88D0) ## $t9 = 80AE0000 -/* 01474 80AD8BB4 273988D0 */ addiu $t9, $t9, %lo(func_80AD88D0) ## $t9 = 80AD88D0 -/* 01478 80AD8BB8 00045900 */ sll $t3, $a0, 4 -/* 0147C 80AD8BBC 000B6702 */ srl $t4, $t3, 28 -/* 01480 80AD8BC0 000C6880 */ sll $t5, $t4, 2 -/* 01484 80AD8BC4 01CD7021 */ addu $t6, $t6, $t5 -/* 01488 80AD8BC8 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* 0148C 80AD8BCC 00815024 */ and $t2, $a0, $at -/* 01490 80AD8BD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01494 80AD8BD4 014E7821 */ addu $t7, $t2, $t6 -/* 01498 80AD8BD8 01E1C021 */ addu $t8, $t7, $at -/* 0149C 80AD8BDC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 014A0 80AD8BE0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 014A4 80AD8BE4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 014A8 80AD8BE8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 014AC 80AD8BEC AFB00018 */ sw $s0, 0x0018($sp) -/* 014B0 80AD8BF0 AFB90014 */ sw $t9, 0x0014($sp) -/* 014B4 80AD8BF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 014B8 80AD8BF8 0C0286B2 */ jal SkelAnime_DrawFlexOpa -/* 014BC 80AD8BFC 8FA40054 */ lw $a0, 0x0054($sp) -/* 014C0 80AD8C00 8FA80054 */ lw $t0, 0x0054($sp) -/* 014C4 80AD8C04 3C0680AE */ lui $a2, %hi(D_80AD8DD8) ## $a2 = 80AE0000 -/* 014C8 80AD8C08 24C68DD8 */ addiu $a2, $a2, %lo(D_80AD8DD8) ## $a2 = 80AD8DD8 -/* 014CC 80AD8C0C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 014D0 80AD8C10 240703BA */ addiu $a3, $zero, 0x03BA ## $a3 = 000003BA -/* 014D4 80AD8C14 0C031AD5 */ jal Graph_CloseDisps -/* 014D8 80AD8C18 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 014DC 80AD8C1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 014E0 80AD8C20 8FB00028 */ lw $s0, 0x0028($sp) -/* 014E4 80AD8C24 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 014E8 80AD8C28 03E00008 */ jr $ra -/* 014EC 80AD8C2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s deleted file mode 100644 index 69c56ef5e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel EnPoRelay_Init -/* 00000 80AD7740 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80AD7744 AFB10028 */ sw $s1, 0x0028($sp) -/* 00008 80AD7748 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80AD774C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80AD7750 AFB00024 */ sw $s0, 0x0024($sp) -/* 00014 80AD7754 3C0580AE */ lui $a1, %hi(D_80AD8D28) ## $a1 = 80AE0000 -/* 00018 80AD7758 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80AD775C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80AD7760 24A58D28 */ addiu $a1, $a1, %lo(D_80AD8D28) ## $a1 = 80AD8D28 -/* 00024 80AD7764 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00028 80AD7768 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0002C 80AD776C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00030 80AD7770 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00034 80AD7774 0C00AC78 */ jal ActorShape_Init - -/* 00038 80AD7778 3C074228 */ lui $a3, 0x4228 ## $a3 = 42280000 -/* 0003C 80AD777C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00040 80AD7780 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00044 80AD7784 260E01A0 */ addiu $t6, $s0, 0x01A0 ## $t6 = 000001A0 -/* 00048 80AD7788 260F020C */ addiu $t7, $s0, 0x020C ## $t7 = 0000020C -/* 0004C 80AD778C 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 00050 80AD7790 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80AD7794 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80AD7798 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0005C 80AD779C 24E73768 */ addiu $a3, $a3, 0x3768 ## $a3 = 06003768 -/* 00060 80AD77A0 24C6BE40 */ addiu $a2, $a2, 0xBE40 ## $a2 = 0600BE40 -/* 00064 80AD77A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80AD77A8 0C0291BE */ jal SkelAnime_InitFlex -/* 0006C 80AD77AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00070 80AD77B0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 00074 80AD77B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00078 80AD77B8 0C0170D9 */ jal Collider_InitCylinder - -/* 0007C 80AD77BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00080 80AD77C0 3C0780AE */ lui $a3, %hi(D_80AD8CF8) ## $a3 = 80AE0000 -/* 00084 80AD77C4 8FA50034 */ lw $a1, 0x0034($sp) -/* 00088 80AD77C8 24E78CF8 */ addiu $a3, $a3, %lo(D_80AD8CF8) ## $a3 = 80AD8CF8 -/* 0008C 80AD77CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00090 80AD77D0 0C01712B */ jal Collider_SetCylinder - -/* 00094 80AD77D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00098 80AD77D8 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 0009C 80AD77DC AFA60034 */ sw $a2, 0x0034($sp) -/* 000A0 80AD77E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000A4 80AD77E4 0C01E9D9 */ jal LightContext_InsertLight - -/* 000A8 80AD77E8 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 000AC 80AD77EC C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 000B0 80AD77F0 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 000B4 80AD77F4 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 000B8 80AD77F8 4600218D */ trunc.w.s $f6, $f4 -/* 000BC 80AD77FC AE02027C */ sw $v0, 0x027C($s0) ## 0000027C -/* 000C0 80AD7800 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 000C4 80AD7804 4600428D */ trunc.w.s $f10, $f8 -/* 000C8 80AD7808 44053000 */ mfc1 $a1, $f6 -/* 000CC 80AD780C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 000D0 80AD7810 4600848D */ trunc.w.s $f18, $f16 -/* 000D4 80AD7814 44065000 */ mfc1 $a2, $f10 -/* 000D8 80AD7818 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 000DC 80AD781C 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 000E0 80AD7820 44079000 */ mfc1 $a3, $f18 -/* 000E4 80AD7824 00052C00 */ sll $a1, $a1, 16 -/* 000E8 80AD7828 00063400 */ sll $a2, $a2, 16 -/* 000EC 80AD782C 00073C00 */ sll $a3, $a3, 16 -/* 000F0 80AD7830 00073C03 */ sra $a3, $a3, 16 -/* 000F4 80AD7834 00063403 */ sra $a2, $a2, 16 -/* 000F8 80AD7838 00052C03 */ sra $a1, $a1, 16 -/* 000FC 80AD783C AFAD001C */ sw $t5, 0x001C($sp) -/* 00100 80AD7840 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00104 80AD7844 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00108 80AD7848 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0010C 80AD784C 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 00110 80AD7850 8FA40034 */ lw $a0, 0x0034($sp) -/* 00114 80AD7854 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00118 80AD7858 A20E027B */ sb $t6, 0x027B($s0) ## 0000027B -/* 0011C 80AD785C 3C0F80AE */ lui $t7, %hi(D_80AD8D24) ## $t7 = 80AE0000 -/* 00120 80AD7860 8DEF8D24 */ lw $t7, %lo(D_80AD8D24)($t7) -/* 00124 80AD7864 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00128 80AD7868 3C0180AE */ lui $at, %hi(D_80AD8D24) ## $at = 80AE0000 -/* 0012C 80AD786C 11E00005 */ beq $t7, $zero, .L80AD7884 -/* 00130 80AD7870 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00134 80AD7874 0C00B55C */ jal Actor_Kill - -/* 00138 80AD7878 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0013C 80AD787C 1000000A */ beq $zero, $zero, .L80AD78A8 -/* 00140 80AD7880 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -.L80AD7884: -/* 00144 80AD7884 AC388D24 */ sw $t8, %lo(D_80AD8D24)($at) -/* 00148 80AD7888 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0014C 80AD788C 0C00CE50 */ jal Actor_SetTextWithPrefix - -/* 00150 80AD7890 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 -/* 00154 80AD7894 9619010E */ lhu $t9, 0x010E($s0) ## 0000010E -/* 00158 80AD7898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0015C 80AD789C 0C2B5E43 */ jal func_80AD790C -/* 00160 80AD78A0 A619019C */ sh $t9, 0x019C($s0) ## 0000019C -/* 00164 80AD78A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -.L80AD78A8: -/* 00168 80AD78A8 3109003F */ andi $t1, $t0, 0x003F ## $t1 = 00000000 -/* 0016C 80AD78AC A609001C */ sh $t1, 0x001C($s0) ## 0000001C -/* 00170 80AD78B0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00174 80AD78B4 8FB10028 */ lw $s1, 0x0028($sp) -/* 00178 80AD78B8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0017C 80AD78BC 03E00008 */ jr $ra -/* 00180 80AD78C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Race.s similarity index 98% rename from asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s rename to asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Race.s index e930f19af3..ca2b5190ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Race.s @@ -3,11 +3,14 @@ glabel D_80AD8DEC .float 0.03 glabel D_80AD8DF0 - .word 0x44D98000 + .float 1740.0 + glabel D_80AD8DF4 - .word 0x44C58000 + .float 1580.0 + glabel D_80AD8DF8 - .word 0x4502A000 + .float 2090.0 + glabel D_80AD8DFC .float 1.4 @@ -24,7 +27,7 @@ glabel D_80AD8E0C .float 0.02 .text -glabel func_80AD7C64 +glabel EnPoRelay_Race /* 00524 80AD7C64 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 00528 80AD7C68 AFBF0034 */ sw $ra, 0x0034($sp) /* 0052C 80AD7C6C AFB00030 */ sw $s0, 0x0030($sp) @@ -314,7 +317,7 @@ glabel func_80AD7C64 /* 0092C 80AD806C 01CF7023 */ subu $t6, $t6, $t7 /* 00930 80AD8070 000E7040 */ sll $t6, $t6, 1 /* 00934 80AD8074 01D82821 */ addu $a1, $t6, $t8 -/* 00938 80AD8078 0C2B5E51 */ jal func_80AD7944 +/* 00938 80AD8078 0C2B5E51 */ jal EnPoRelay_Vec3sToVec3f /* 0093C 80AD807C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFF0 /* 00940 80AD8080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00944 80AD8084 0C00B6EC */ jal func_8002DBB0 @@ -336,13 +339,13 @@ glabel func_80AD7C64 /* 00984 80AD80C4 00095080 */ sll $t2, $t1, 2 /* 00988 80AD80C8 01495023 */ subu $t2, $t2, $t1 /* 0098C 80AD80CC 000A5040 */ sll $t2, $t2, 1 -/* 00990 80AD80D0 0C2B5E51 */ jal func_80AD7944 +/* 00990 80AD80D0 0C2B5E51 */ jal EnPoRelay_Vec3sToVec3f /* 00994 80AD80D4 014B2821 */ addu $a1, $t2, $t3 /* 00998 80AD80D8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 /* 0099C 80AD80DC 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C /* 009A0 80AD80E0 54410006 */ bnel $v0, $at, .L80AD80FC /* 009A4 80AD80E4 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 009A8 80AD80E8 0C2B5E93 */ jal func_80AD7A4C +/* 009A8 80AD80E8 0C2B5E93 */ jal EnPoRelay_SetupEndRace /* 009AC 80AD80EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009B0 80AD80F0 10000015 */ beq $zero, $zero, .L80AD8148 /* 009B4 80AD80F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s deleted file mode 100644 index d00113ebeb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel EnPoRelay_Update -/* 0109C 80AD87DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 010A0 80AD87E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 010A4 80AD87E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010A8 80AD87E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010AC 80AD87EC AFA5003C */ sw $a1, 0x003C($sp) -/* 010B0 80AD87F0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 010B4 80AD87F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010B8 80AD87F8 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 010BC 80AD87FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010C0 80AD8800 8FA5003C */ lw $a1, 0x003C($sp) -/* 010C4 80AD8804 0320F809 */ jalr $ra, $t9 -/* 010C8 80AD8808 00000000 */ nop -/* 010CC 80AD880C 0C00B638 */ jal Actor_MoveForward - -/* 010D0 80AD8810 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010D4 80AD8814 0C2B5EA2 */ jal func_80AD7A88 -/* 010D8 80AD8818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010DC 80AD881C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 010E0 80AD8820 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 -/* 010E4 80AD8824 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 010E8 80AD8828 AFAE0014 */ sw $t6, 0x0014($sp) -/* 010EC 80AD882C 8FA4003C */ lw $a0, 0x003C($sp) -/* 010F0 80AD8830 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010F4 80AD8834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 010F8 80AD8838 3C0741D8 */ lui $a3, 0x41D8 ## $a3 = 41D80000 -/* 010FC 80AD883C 0C00B92D */ jal func_8002E4B4 -/* 01100 80AD8840 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01104 80AD8844 26060290 */ addiu $a2, $s0, 0x0290 ## $a2 = 00000290 -/* 01108 80AD8848 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000290 -/* 0110C 80AD884C AFA6002C */ sw $a2, 0x002C($sp) -/* 01110 80AD8850 0C0189B7 */ jal Collider_CylinderUpdate - -/* 01114 80AD8854 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01118 80AD8858 8FA4003C */ lw $a0, 0x003C($sp) -/* 0111C 80AD885C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01120 80AD8860 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01124 80AD8864 8FA6002C */ lw $a2, 0x002C($sp) -/* 01128 80AD8868 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 0112C 80AD886C 00812821 */ addu $a1, $a0, $at -/* 01130 80AD8870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01134 80AD8874 0C00B56E */ jal Actor_SetHeight - -/* 01138 80AD8878 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 0113C 80AD887C 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -/* 01140 80AD8880 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 -/* 01144 80AD8884 10400003 */ beq $v0, $zero, .L80AD8894 -/* 01148 80AD8888 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0114C 80AD888C A2180195 */ sb $t8, 0x0195($s0) ## 00000195 -/* 01150 80AD8890 330200FF */ andi $v0, $t8, 0x00FF ## $v0 = 000000FF -.L80AD8894: -/* 01154 80AD8894 54400003 */ bnel $v0, $zero, .L80AD88A4 -/* 01158 80AD8898 9609019E */ lhu $t1, 0x019E($s0) ## 0000019E -/* 0115C 80AD889C A2080195 */ sb $t0, 0x0195($s0) ## 00000195 -/* 01160 80AD88A0 9609019E */ lhu $t1, 0x019E($s0) ## 0000019E -.L80AD88A4: -/* 01164 80AD88A4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01168 80AD88A8 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 0116C 80AD88AC 314BFFFF */ andi $t3, $t2, 0xFFFF ## $t3 = 00000001 -/* 01170 80AD88B0 15610002 */ bne $t3, $at, .L80AD88BC -/* 01174 80AD88B4 A60A019E */ sh $t2, 0x019E($s0) ## 0000019E -/* 01178 80AD88B8 A600019E */ sh $zero, 0x019E($s0) ## 0000019E -.L80AD88BC: -/* 0117C 80AD88BC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01180 80AD88C0 8FB00020 */ lw $s0, 0x0020($sp) -/* 01184 80AD88C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01188 80AD88C8 03E00008 */ jr $ra -/* 0118C 80AD88CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s deleted file mode 100644 index 02a93929e9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AD790C -/* 001CC 80AD790C 3C0880AD */ lui $t0, %hi(func_80AD7B34) ## $t0 = 80AD0000 -/* 001D0 80AD7910 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 001D4 80AD7914 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 001D8 80AD7918 24188000 */ addiu $t8, $zero, 0x8000 ## $t8 = FFFF8000 -/* 001DC 80AD791C 241900FE */ addiu $t9, $zero, 0x00FE ## $t9 = 000000FE -/* 001E0 80AD7920 25087B34 */ addiu $t0, $t0, %lo(func_80AD7B34) ## $t0 = 80AD7B34 -/* 001E4 80AD7924 A08E0195 */ sb $t6, 0x0195($a0) ## 00000195 -/* 001E8 80AD7928 A4800198 */ sh $zero, 0x0198($a0) ## 00000198 -/* 001EC 80AD792C A08F0003 */ sb $t7, 0x0003($a0) ## 00000003 -/* 001F0 80AD7930 A48000B6 */ sh $zero, 0x00B6($a0) ## 000000B6 -/* 001F4 80AD7934 A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 001F8 80AD7938 A09900AE */ sb $t9, 0x00AE($a0) ## 000000AE -/* 001FC 80AD793C 03E00008 */ jr $ra -/* 00200 80AD7940 AC880190 */ sw $t0, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s deleted file mode 100644 index ba93307381..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AD7944 -/* 00204 80AD7944 84AE0000 */ lh $t6, 0x0000($a1) ## 00000000 -/* 00208 80AD7948 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0020C 80AD794C 00000000 */ nop -/* 00210 80AD7950 468021A0 */ cvt.s.w $f6, $f4 -/* 00214 80AD7954 E4860000 */ swc1 $f6, 0x0000($a0) ## 00000000 -/* 00218 80AD7958 84AF0002 */ lh $t7, 0x0002($a1) ## 00000002 -/* 0021C 80AD795C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 00220 80AD7960 00000000 */ nop -/* 00224 80AD7964 468042A0 */ cvt.s.w $f10, $f8 -/* 00228 80AD7968 E48A0004 */ swc1 $f10, 0x0004($a0) ## 00000004 -/* 0022C 80AD796C 84B80004 */ lh $t8, 0x0004($a1) ## 00000004 -/* 00230 80AD7970 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00234 80AD7974 00000000 */ nop -/* 00238 80AD7978 468084A0 */ cvt.s.w $f18, $f16 -/* 0023C 80AD797C 03E00008 */ jr $ra -/* 00240 80AD7980 E4920008 */ swc1 $f18, 0x0008($a0) ## 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s deleted file mode 100644 index 5e878956b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AD7984 -/* 00244 80AD7984 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00248 80AD7988 AFB00018 */ sw $s0, 0x0018($sp) -/* 0024C 80AD798C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00250 80AD7990 AFBF001C */ sw $ra, 0x001C($sp) -/* 00254 80AD7994 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 -/* 00258 80AD7998 3C1880AE */ lui $t8, %hi(D_80AD8C30) ## $t8 = 80AE0000 -/* 0025C 80AD799C 27188C30 */ addiu $t8, $t8, %lo(D_80AD8C30) ## $t8 = 80AD8C30 -/* 00260 80AD79A0 000E7880 */ sll $t7, $t6, 2 -/* 00264 80AD79A4 01EE7823 */ subu $t7, $t7, $t6 -/* 00268 80AD79A8 000F7840 */ sll $t7, $t7, 1 -/* 0026C 80AD79AC 01F82821 */ addu $a1, $t7, $t8 -/* 00270 80AD79B0 0C2B5E51 */ jal func_80AD7944 -/* 00274 80AD79B4 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFF4 -/* 00278 80AD79B8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 0027C 80AD79BC 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -/* 00280 80AD79C0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 00284 80AD79C4 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00288 80AD79C8 03284823 */ subu $t1, $t9, $t0 -/* 0028C 80AD79CC 01216021 */ addu $t4, $t1, $at -/* 00290 80AD79D0 000C6AC3 */ sra $t5, $t4, 11 -/* 00294 80AD79D4 31AE001F */ andi $t6, $t5, 0x001F ## $t6 = 00000000 -/* 00298 80AD79D8 0C0222CD */ jal func_80088B34 -/* 0029C 80AD79DC A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 002A0 80AD79E0 3C0F8012 */ lui $t7, %hi(gItemSlots+0xa) -/* 002A4 80AD79E4 91EF746E */ lbu $t7, %lo(gItemSlots+0xa)($t7) -/* 002A8 80AD79E8 3C188016 */ lui $t8, %hi(gSaveContext+0x74) -/* 002AC 80AD79EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B0 80AD79F0 030FC021 */ addu $t8, $t8, $t7 -/* 002B4 80AD79F4 9318E6D4 */ lbu $t8, %lo(gSaveContext+0x74)($t8) -/* 002B8 80AD79F8 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 002BC 80AD79FC 3B1900FF */ xori $t9, $t8, 0x00FF ## $t9 = 801600FF -/* 002C0 80AD7A00 0019C82B */ sltu $t9, $zero, $t9 -/* 002C4 80AD7A04 0C00B6B0 */ jal func_8002DAC0 -/* 002C8 80AD7A08 A2190194 */ sb $t9, 0x0194($s0) ## 00000194 -/* 002CC 80AD7A0C 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 002D0 80AD7A10 3C010800 */ lui $at, 0x0800 ## $at = 08000000 -/* 002D4 80AD7A14 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -/* 002D8 80AD7A18 01014825 */ or $t1, $t0, $at ## $t1 = 08000000 -/* 002DC 80AD7A1C AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 002E0 80AD7A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E4 80AD7A24 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 002E8 80AD7A28 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 002EC 80AD7A2C 3C0A80AD */ lui $t2, %hi(func_80AD7C64) ## $t2 = 80AD0000 -/* 002F0 80AD7A30 254A7C64 */ addiu $t2, $t2, %lo(func_80AD7C64) ## $t2 = 80AD7C64 -/* 002F4 80AD7A34 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 002F8 80AD7A38 8FBF001C */ lw $ra, 0x001C($sp) -/* 002FC 80AD7A3C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00300 80AD7A40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00304 80AD7A44 03E00008 */ jr $ra -/* 00308 80AD7A48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s deleted file mode 100644 index eab6a091e6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80AD7A4C -/* 0030C 80AD7A4C 848E0016 */ lh $t6, 0x0016($a0) ## 00000016 -/* 00310 80AD7A50 3401C000 */ ori $at, $zero, 0xC000 ## $at = 0000C000 -/* 00314 80AD7A54 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00318 80AD7A58 01C17821 */ addu $t7, $t6, $at -/* 0031C 80AD7A5C 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 00320 80AD7A60 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00324 80AD7A64 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 00328 80AD7A68 3C0880AE */ lui $t0, %hi(func_80AD8174) ## $t0 = 80AE0000 -/* 0032C 80AD7A6C 25088174 */ addiu $t0, $t0, %lo(func_80AD8174) ## $t0 = 80AD8174 -/* 00330 80AD7A70 0301C824 */ and $t9, $t8, $at -/* 00334 80AD7A74 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 00338 80AD7A78 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 0033C 80AD7A7C AC880190 */ sw $t0, 0x0190($a0) ## 00000190 -/* 00340 80AD7A80 03E00008 */ jr $ra -/* 00344 80AD7A84 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s deleted file mode 100644 index 3a03cd2642..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80AD7A88 -/* 00348 80AD7A88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0034C 80AD7A8C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00350 80AD7A90 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 00354 80AD7A94 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00358 80AD7A98 3C0F80AE */ lui $t7, %hi(D_80AD8C32) ## $t7 = 80AE0000 -/* 0035C 80AD7A9C 2841001C */ slti $at, $v0, 0x001C -/* 00360 80AD7AA0 14200003 */ bne $at, $zero, .L80AD7AB0 -/* 00364 80AD7AA4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 00368 80AD7AA8 10000001 */ beq $zero, $zero, .L80AD7AB0 -/* 0036C 80AD7AAC 2403001B */ addiu $v1, $zero, 0x001B ## $v1 = 0000001B -.L80AD7AB0: -/* 00370 80AD7AB0 00037080 */ sll $t6, $v1, 2 -/* 00374 80AD7AB4 01C37023 */ subu $t6, $t6, $v1 -/* 00378 80AD7AB8 000E7040 */ sll $t6, $t6, 1 -/* 0037C 80AD7ABC 01EE7821 */ addu $t7, $t7, $t6 -/* 00380 80AD7AC0 85EF8C32 */ lh $t7, %lo(D_80AD8C32)($t7) -/* 00384 80AD7AC4 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00388 80AD7AC8 44814000 */ mtc1 $at, $f8 ## $f8 = 45.00 -/* 0038C 80AD7ACC 448F2000 */ mtc1 $t7, $f4 ## $f4 = -0.00 -/* 00390 80AD7AD0 24E4000C */ addiu $a0, $a3, 0x000C ## $a0 = 0000000C -/* 00394 80AD7AD4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00398 80AD7AD8 468021A0 */ cvt.s.w $f6, $f4 -/* 0039C 80AD7ADC AFA70018 */ sw $a3, 0x0018($sp) -/* 003A0 80AD7AE0 46083280 */ add.s $f10, $f6, $f8 -/* 003A4 80AD7AE4 44055000 */ mfc1 $a1, $f10 -/* 003A8 80AD7AE8 0C01DE80 */ jal Math_ApproxF - -/* 003AC 80AD7AEC 00000000 */ nop -/* 003B0 80AD7AF0 8FA70018 */ lw $a3, 0x0018($sp) -/* 003B4 80AD7AF4 90E40195 */ lbu $a0, 0x0195($a3) ## 00000195 -/* 003B8 80AD7AF8 000422C0 */ sll $a0, $a0, 11 -/* 003BC 80AD7AFC 00042400 */ sll $a0, $a0, 16 -/* 003C0 80AD7B00 0C01DE1C */ jal Math_Sins - ## sins? -/* 003C4 80AD7B04 00042403 */ sra $a0, $a0, 16 -/* 003C8 80AD7B08 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 003CC 80AD7B0C 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 003D0 80AD7B10 8FA70018 */ lw $a3, 0x0018($sp) -/* 003D4 80AD7B14 46100482 */ mul.s $f18, $f0, $f16 -/* 003D8 80AD7B18 C4E4000C */ lwc1 $f4, 0x000C($a3) ## 0000000C -/* 003DC 80AD7B1C 46049180 */ add.s $f6, $f18, $f4 -/* 003E0 80AD7B20 E4E60028 */ swc1 $f6, 0x0028($a3) ## 00000028 -/* 003E4 80AD7B24 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003E8 80AD7B28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003EC 80AD7B2C 03E00008 */ jr $ra -/* 003F0 80AD7B30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s deleted file mode 100644 index 3ed3013a71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80AD7B34 -/* 003F4 80AD7B34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003F8 80AD7B38 AFB00018 */ sw $s0, 0x0018($sp) -/* 003FC 80AD7B3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00400 80AD7B40 AFBF001C */ sw $ra, 0x001C($sp) -/* 00404 80AD7B44 AFA50024 */ sw $a1, 0x0024($sp) -/* 00408 80AD7B48 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 0040C 80AD7B4C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00410 80AD7B50 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00414 80AD7B54 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 -/* 00418 80AD7B58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0041C 80AD7B5C 0C00BC65 */ jal func_8002F194 -/* 00420 80AD7B60 8FA50024 */ lw $a1, 0x0024($sp) -/* 00424 80AD7B64 1040000A */ beq $v0, $zero, .L80AD7B90 -/* 00428 80AD7B68 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 0042C 80AD7B6C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 00430 80AD7B70 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 00434 80AD7B74 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00438 80AD7B78 3C1880AD */ lui $t8, %hi(func_80AD7BF0) ## $t8 = 80AD0000 -/* 0043C 80AD7B7C 27187BF0 */ addiu $t8, $t8, %lo(func_80AD7BF0) ## $t8 = 80AD7BF0 -/* 00440 80AD7B80 01C17824 */ and $t7, $t6, $at -/* 00444 80AD7B84 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00448 80AD7B88 10000011 */ beq $zero, $zero, .L80AD7BD0 -/* 0044C 80AD7B8C AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L80AD7B90: -/* 00450 80AD7B90 44810000 */ mtc1 $at, $f0 ## $f0 = NaN -/* 00454 80AD7B94 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00458 80AD7B98 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0045C 80AD7B9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00460 80AD7BA0 4600203C */ c.lt.s $f4, $f0 -/* 00464 80AD7BA4 00000000 */ nop -/* 00468 80AD7BA8 4502000A */ bc1fl .L80AD7BD4 -/* 0046C 80AD7BAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00470 80AD7BB0 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 00474 80AD7BB4 9609019C */ lhu $t1, 0x019C($s0) ## 0000019C -/* 00478 80AD7BB8 44060000 */ mfc1 $a2, $f0 -/* 0047C 80AD7BBC 03214025 */ or $t0, $t9, $at ## $t0 = 00010000 -/* 00480 80AD7BC0 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 00484 80AD7BC4 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 00488 80AD7BC8 0C00BCB3 */ jal func_8002F2CC -/* 0048C 80AD7BCC 8FA50024 */ lw $a1, 0x0024($sp) -.L80AD7BD0: -/* 00490 80AD7BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD7BD4: -/* 00494 80AD7BD4 0C00BE5D */ jal func_8002F974 -/* 00498 80AD7BD8 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 0049C 80AD7BDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 004A0 80AD7BE0 8FB00018 */ lw $s0, 0x0018($sp) -/* 004A4 80AD7BE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004A8 80AD7BE8 03E00008 */ jr $ra -/* 004AC 80AD7BEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s deleted file mode 100644 index 6364a7b627..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AD7BF0 -/* 004B0 80AD7BF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004B4 80AD7BF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 004B8 80AD7BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004BC 80AD7BFC AFBF001C */ sw $ra, 0x001C($sp) -/* 004C0 80AD7C00 AFA50024 */ sw $a1, 0x0024($sp) -/* 004C4 80AD7C04 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 004C8 80AD7C08 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 004CC 80AD7C0C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 004D0 80AD7C10 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 -/* 004D4 80AD7C14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D8 80AD7C18 0C00BCCD */ jal func_8002F334 -/* 004DC 80AD7C1C 8FA50024 */ lw $a1, 0x0024($sp) -/* 004E0 80AD7C20 10400008 */ beq $v0, $zero, .L80AD7C44 -/* 004E4 80AD7C24 8FA40024 */ lw $a0, 0x0024($sp) -/* 004E8 80AD7C28 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 004EC 80AD7C2C 0C00CE50 */ jal Actor_SetTextWithPrefix - -/* 004F0 80AD7C30 2406002F */ addiu $a2, $zero, 0x002F ## $a2 = 0000002F -/* 004F4 80AD7C34 960E010E */ lhu $t6, 0x010E($s0) ## 0000010E -/* 004F8 80AD7C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004FC 80AD7C3C 0C2B5E61 */ jal func_80AD7984 -/* 00500 80AD7C40 A60E019C */ sh $t6, 0x019C($s0) ## 0000019C -.L80AD7C44: -/* 00504 80AD7C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00508 80AD7C48 0C00BE5D */ jal func_8002F974 -/* 0050C 80AD7C4C 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 00510 80AD7C50 8FBF001C */ lw $ra, 0x001C($sp) -/* 00514 80AD7C54 8FB00018 */ lw $s0, 0x0018($sp) -/* 00518 80AD7C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0051C 80AD7C5C 03E00008 */ jr $ra -/* 00520 80AD7C60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s deleted file mode 100644 index 7599c27376..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_80AD8174 -/* 00A34 80AD8174 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A38 80AD8178 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A3C 80AD817C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A40 80AD8180 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A44 80AD8184 AFA50024 */ sw $a1, 0x0024($sp) -/* 00A48 80AD8188 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 -/* 00A4C 80AD818C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00A50 80AD8190 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00A54 80AD8194 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 00A58 80AD8198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A5C 80AD819C 0C00BC65 */ jal func_8002F194 -/* 00A60 80AD81A0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00A64 80AD81A4 10400005 */ beq $v0, $zero, .L80AD81BC -/* 00A68 80AD81A8 8FAF0024 */ lw $t7, 0x0024($sp) -/* 00A6C 80AD81AC 3C0E80AE */ lui $t6, %hi(func_80AD8234) ## $t6 = 80AE0000 -/* 00A70 80AD81B0 25CE8234 */ addiu $t6, $t6, %lo(func_80AD8234) ## $t6 = 80AD8234 -/* 00A74 80AD81B4 10000017 */ beq $zero, $zero, .L80AD8214 -/* 00A78 80AD81B8 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -.L80AD81BC: -/* 00A7C 80AD81BC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00A80 80AD81C0 030FC021 */ addu $t8, $t8, $t7 -/* 00A84 80AD81C4 83181CBC */ lb $t8, 0x1CBC($t8) ## 00011CBC -/* 00A88 80AD81C8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A8C 80AD81CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A90 80AD81D0 17010006 */ bne $t8, $at, .L80AD81EC -/* 00A94 80AD81D4 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 -/* 00A98 80AD81D8 0C00B55C */ jal Actor_Kill - -/* 00A9C 80AD81DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AA0 80AD81E0 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) -/* 00AA4 80AD81E4 1000000B */ beq $zero, $zero, .L80AD8214 -/* 00AA8 80AD81E8 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) -.L80AD81EC: -/* 00AAC 80AD81EC 0C00B84B */ jal func_8002E12C -/* 00AB0 80AD81F0 24063000 */ addiu $a2, $zero, 0x3000 ## $a2 = 00003000 -/* 00AB4 80AD81F4 50400008 */ beql $v0, $zero, .L80AD8218 -/* 00AB8 80AD81F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ABC 80AD81FC 9619019C */ lhu $t9, 0x019C($s0) ## 0000019C -/* 00AC0 80AD8200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AC4 80AD8204 3C06437A */ lui $a2, 0x437A ## $a2 = 437A0000 -/* 00AC8 80AD8208 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00ACC 80AD820C 0C00BCB3 */ jal func_8002F2CC -/* 00AD0 80AD8210 8FA50024 */ lw $a1, 0x0024($sp) -.L80AD8214: -/* 00AD4 80AD8214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD8218: -/* 00AD8 80AD8218 0C00BE5D */ jal func_8002F974 -/* 00ADC 80AD821C 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 00AE0 80AD8220 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AE4 80AD8224 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AE8 80AD8228 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AEC 80AD822C 03E00008 */ jr $ra -/* 00AF0 80AD8230 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s deleted file mode 100644 index 31a890f3ac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80AD8234 -/* 00AF4 80AD8234 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00AF8 80AD8238 AFB10018 */ sw $s1, 0x0018($sp) -/* 00AFC 80AD823C AFB00014 */ sw $s0, 0x0014($sp) -/* 00B00 80AD8240 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B04 80AD8244 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B08 80AD8248 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B0C 80AD824C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00B10 80AD8250 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 -/* 00B14 80AD8254 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00B18 80AD8258 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 -/* 00B1C 80AD825C 0C042F6F */ jal func_8010BDBC -/* 00B20 80AD8260 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00B24 80AD8264 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B28 80AD8268 14410017 */ bne $v0, $at, .L80AD82C8 -/* 00B2C 80AD826C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B30 80AD8270 0C041AF2 */ jal func_80106BC8 -/* 00B34 80AD8274 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B38 80AD8278 5040001D */ beql $v0, $zero, .L80AD82F0 -/* 00B3C 80AD827C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B40 80AD8280 920E0194 */ lbu $t6, 0x0194($s0) ## 00000194 -/* 00B44 80AD8284 2406002E */ addiu $a2, $zero, 0x002E ## $a2 = 0000002E -/* 00B48 80AD8288 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B4C 80AD828C 11C00006 */ beq $t6, $zero, .L80AD82A8 -/* 00B50 80AD8290 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B54 80AD8294 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B58 80AD8298 0C00CE50 */ jal Actor_SetTextWithPrefix - -/* 00B5C 80AD829C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B60 80AD82A0 10000004 */ beq $zero, $zero, .L80AD82B4 -/* 00B64 80AD82A4 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -.L80AD82A8: -/* 00B68 80AD82A8 0C00CE50 */ jal Actor_SetTextWithPrefix - -/* 00B6C 80AD82AC 2406002D */ addiu $a2, $zero, 0x002D ## $a2 = 0000002D -/* 00B70 80AD82B0 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -.L80AD82B4: -/* 00B74 80AD82B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B78 80AD82B8 0C042DC8 */ jal func_8010B720 -/* 00B7C 80AD82BC A605019C */ sh $a1, 0x019C($s0) ## 0000019C -/* 00B80 80AD82C0 1000000B */ beq $zero, $zero, .L80AD82F0 -/* 00B84 80AD82C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD82C8: -/* 00B88 80AD82C8 0C00BCCD */ jal func_8002F334 -/* 00B8C 80AD82CC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00B90 80AD82D0 10400006 */ beq $v0, $zero, .L80AD82EC -/* 00B94 80AD82D4 3C018016 */ lui $at, %hi(gSaveContext+0x13ce) -/* 00B98 80AD82D8 A420FA2E */ sh $zero, %lo(gSaveContext+0x13ce)($at) -/* 00B9C 80AD82DC 3C0F80AE */ lui $t7, %hi(func_80AD830C) ## $t7 = 80AE0000 -/* 00BA0 80AD82E0 25EF830C */ addiu $t7, $t7, %lo(func_80AD830C) ## $t7 = 80AD830C -/* 00BA4 80AD82E4 A6000196 */ sh $zero, 0x0196($s0) ## 00000196 -/* 00BA8 80AD82E8 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -.L80AD82EC: -/* 00BAC 80AD82EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AD82F0: -/* 00BB0 80AD82F0 0C00BE5D */ jal func_8002F974 -/* 00BB4 80AD82F4 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 00BB8 80AD82F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BBC 80AD82FC 8FB00014 */ lw $s0, 0x0014($sp) -/* 00BC0 80AD8300 8FB10018 */ lw $s1, 0x0018($sp) -/* 00BC4 80AD8304 03E00008 */ jr $ra -/* 00BC8 80AD8308 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s deleted file mode 100644 index c0112e79ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s +++ /dev/null @@ -1,332 +0,0 @@ -glabel func_80AD830C -/* 00BCC 80AD830C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00BD0 80AD8310 AFBF004C */ sw $ra, 0x004C($sp) -/* 00BD4 80AD8314 AFB10048 */ sw $s1, 0x0048($sp) -/* 00BD8 80AD8318 AFB00044 */ sw $s0, 0x0044($sp) -/* 00BDC 80AD831C 848E0196 */ lh $t6, 0x0196($a0) ## 00000196 -/* 00BE0 80AD8320 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BE4 80AD8324 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00BE8 80AD8328 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00BEC 80AD832C A48F0196 */ sh $t7, 0x0196($a0) ## 00000196 -/* 00BF0 80AD8330 84820196 */ lh $v0, 0x0196($a0) ## 00000196 -/* 00BF4 80AD8334 28410008 */ slti $at, $v0, 0x0008 -/* 00BF8 80AD8338 102000D7 */ beq $at, $zero, .L80AD8698 -/* 00BFC 80AD833C 28410005 */ slti $at, $v0, 0x0005 -/* 00C00 80AD8340 10200037 */ beq $at, $zero, .L80AD8420 -/* 00C04 80AD8344 244CFFFB */ addiu $t4, $v0, 0xFFFB ## $t4 = FFFFFFFB -/* 00C08 80AD8348 00022300 */ sll $a0, $v0, 12 -/* 00C0C 80AD834C 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 00C10 80AD8350 00042400 */ sll $a0, $a0, 16 -/* 00C14 80AD8354 0C01DE1C */ jal Math_Sins - ## sins? -/* 00C18 80AD8358 00042403 */ sra $a0, $a0, 16 -/* 00C1C 80AD835C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00C20 80AD8360 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 00C24 80AD8364 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 00C28 80AD8368 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 00C2C 80AD836C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00C30 80AD8370 460A0402 */ mul.s $f16, $f0, $f10 -/* 00C34 80AD8374 46062200 */ add.s $f8, $f4, $f6 -/* 00C38 80AD8378 46088480 */ add.s $f18, $f16, $f8 -/* 00C3C 80AD837C E7B20078 */ swc1 $f18, 0x0078($sp) -/* 00C40 80AD8380 86040196 */ lh $a0, 0x0196($s0) ## 00000196 -/* 00C44 80AD8384 00042300 */ sll $a0, $a0, 12 -/* 00C48 80AD8388 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 00C4C 80AD838C 00042400 */ sll $a0, $a0, 16 -/* 00C50 80AD8390 0C01DE0D */ jal Math_Coss - ## coss? -/* 00C54 80AD8394 00042403 */ sra $a0, $a0, 16 -/* 00C58 80AD8398 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 00C5C 80AD839C 44812000 */ mtc1 $at, $f4 ## $f4 = 23.00 -/* 00C60 80AD83A0 00000000 */ nop -/* 00C64 80AD83A4 46040182 */ mul.s $f6, $f0, $f4 -/* 00C68 80AD83A8 E7A60070 */ swc1 $f6, 0x0070($sp) -/* 00C6C 80AD83AC 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 00C70 80AD83B0 0018C880 */ sll $t9, $t8, 2 -/* 00C74 80AD83B4 02394021 */ addu $t0, $s1, $t9 -/* 00C78 80AD83B8 0C016A7D */ jal func_8005A9F4 -/* 00C7C 80AD83BC 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 00C80 80AD83C0 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 00C84 80AD83C4 00042400 */ sll $a0, $a0, 16 -/* 00C88 80AD83C8 0C01DE1C */ jal Math_Sins - ## sins? -/* 00C8C 80AD83CC 00042403 */ sra $a0, $a0, 16 -/* 00C90 80AD83D0 C7AA0070 */ lwc1 $f10, 0x0070($sp) -/* 00C94 80AD83D4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00C98 80AD83D8 460A0402 */ mul.s $f16, $f0, $f10 -/* 00C9C 80AD83DC 46088480 */ add.s $f18, $f16, $f8 -/* 00CA0 80AD83E0 E7B20074 */ swc1 $f18, 0x0074($sp) -/* 00CA4 80AD83E4 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -/* 00CA8 80AD83E8 00095080 */ sll $t2, $t1, 2 -/* 00CAC 80AD83EC 022A5821 */ addu $t3, $s1, $t2 -/* 00CB0 80AD83F0 0C016A7D */ jal func_8005A9F4 -/* 00CB4 80AD83F4 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 00CB8 80AD83F8 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 00CBC 80AD83FC 00042400 */ sll $a0, $a0, 16 -/* 00CC0 80AD8400 0C01DE0D */ jal Math_Coss - ## coss? -/* 00CC4 80AD8404 00042403 */ sra $a0, $a0, 16 -/* 00CC8 80AD8408 C7A40070 */ lwc1 $f4, 0x0070($sp) -/* 00CCC 80AD840C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00CD0 80AD8410 46040182 */ mul.s $f6, $f0, $f4 -/* 00CD4 80AD8414 460A3400 */ add.s $f16, $f6, $f10 -/* 00CD8 80AD8418 1000002A */ beq $zero, $zero, .L80AD84C4 -/* 00CDC 80AD841C E7B0007C */ swc1 $f16, 0x007C($sp) -.L80AD8420: -/* 00CE0 80AD8420 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 00CE4 80AD8424 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00CE8 80AD8428 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 00CEC 80AD842C 46805420 */ cvt.s.w $f16, $f10 -/* 00CF0 80AD8430 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00CF4 80AD8434 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00CF8 80AD8438 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 00CFC 80AD843C 46124100 */ add.s $f4, $f8, $f18 -/* 00D00 80AD8440 46103202 */ mul.s $f8, $f6, $f16 -/* 00D04 80AD8444 46082480 */ add.s $f18, $f4, $f8 -/* 00D08 80AD8448 E7B20078 */ swc1 $f18, 0x0078($sp) -/* 00D0C 80AD844C 862D07A0 */ lh $t5, 0x07A0($s1) ## 000007A0 -/* 00D10 80AD8450 000D7080 */ sll $t6, $t5, 2 -/* 00D14 80AD8454 022E7821 */ addu $t7, $s1, $t6 -/* 00D18 80AD8458 0C016A7D */ jal func_8005A9F4 -/* 00D1C 80AD845C 8DE40790 */ lw $a0, 0x0790($t7) ## 00000790 -/* 00D20 80AD8460 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 00D24 80AD8464 00042400 */ sll $a0, $a0, 16 -/* 00D28 80AD8468 0C01DE1C */ jal Math_Sins - ## sins? -/* 00D2C 80AD846C 00042403 */ sra $a0, $a0, 16 -/* 00D30 80AD8470 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 00D34 80AD8474 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 00D38 80AD8478 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00D3C 80AD847C 460A0182 */ mul.s $f6, $f0, $f10 -/* 00D40 80AD8480 46103100 */ add.s $f4, $f6, $f16 -/* 00D44 80AD8484 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 00D48 80AD8488 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 00D4C 80AD848C 0018C880 */ sll $t9, $t8, 2 -/* 00D50 80AD8490 02394021 */ addu $t0, $s1, $t9 -/* 00D54 80AD8494 0C016A7D */ jal func_8005A9F4 -/* 00D58 80AD8498 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 00D5C 80AD849C 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 00D60 80AD84A0 00042400 */ sll $a0, $a0, 16 -/* 00D64 80AD84A4 0C01DE0D */ jal Math_Coss - ## coss? -/* 00D68 80AD84A8 00042403 */ sra $a0, $a0, 16 -/* 00D6C 80AD84AC 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 00D70 80AD84B0 44814000 */ mtc1 $at, $f8 ## $f8 = 23.00 -/* 00D74 80AD84B4 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00D78 80AD84B8 46080482 */ mul.s $f18, $f0, $f8 -/* 00D7C 80AD84BC 460A9180 */ add.s $f6, $f18, $f10 -/* 00D80 80AD84C0 E7A6007C */ swc1 $f6, 0x007C($sp) -.L80AD84C4: -/* 00D84 80AD84C4 86090196 */ lh $t1, 0x0196($s0) ## 00000196 -/* 00D88 80AD84C8 3C0680AE */ lui $a2, %hi(D_80AD8D30) ## $a2 = 80AE0000 -/* 00D8C 80AD84CC 3C0780AE */ lui $a3, %hi(D_80AD8D3C) ## $a3 = 80AE0000 -/* 00D90 80AD84D0 00095080 */ sll $t2, $t1, 2 -/* 00D94 80AD84D4 01495021 */ addu $t2, $t2, $t1 -/* 00D98 80AD84D8 000A5040 */ sll $t2, $t2, 1 -/* 00D9C 80AD84DC 254B0050 */ addiu $t3, $t2, 0x0050 ## $t3 = 00000050 -/* 00DA0 80AD84E0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00DA4 80AD84E4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00DA8 80AD84E8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 00DAC 80AD84EC 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00DB0 80AD84F0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00DB4 80AD84F4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00DB8 80AD84F8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00DBC 80AD84FC 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 00DC0 80AD8500 AFA80038 */ sw $t0, 0x0038($sp) -/* 00DC4 80AD8504 AFB90034 */ sw $t9, 0x0034($sp) -/* 00DC8 80AD8508 AFB80030 */ sw $t8, 0x0030($sp) -/* 00DCC 80AD850C AFAF0024 */ sw $t7, 0x0024($sp) -/* 00DD0 80AD8510 AFAE0020 */ sw $t6, 0x0020($sp) -/* 00DD4 80AD8514 AFAD001C */ sw $t5, 0x001C($sp) -/* 00DD8 80AD8518 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00DDC 80AD851C AFA9003C */ sw $t1, 0x003C($sp) -/* 00DE0 80AD8520 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00DE4 80AD8524 24E78D3C */ addiu $a3, $a3, %lo(D_80AD8D3C) ## $a3 = 80AD8D3C -/* 00DE8 80AD8528 24C68D30 */ addiu $a2, $a2, %lo(D_80AD8D30) ## $a2 = 80AD8D30 -/* 00DEC 80AD852C AFA0002C */ sw $zero, 0x002C($sp) -/* 00DF0 80AD8530 AFA00028 */ sw $zero, 0x0028($sp) -/* 00DF4 80AD8534 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DF8 80AD8538 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00DFC 80AD853C 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00E00 80AD8540 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 -/* 00E04 80AD8544 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 -/* 00E08 80AD8548 C7A40074 */ lwc1 $f4, 0x0074($sp) -/* 00E0C 80AD854C C7AA007C */ lwc1 $f10, 0x007C($sp) -/* 00E10 80AD8550 46000400 */ add.s $f16, $f0, $f0 -/* 00E14 80AD8554 3C0680AE */ lui $a2, %hi(D_80AD8D30) ## $a2 = 80AE0000 -/* 00E18 80AD8558 3C0780AE */ lui $a3, %hi(D_80AD8D3C) ## $a3 = 80AE0000 -/* 00E1C 80AD855C 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 00E20 80AD8560 46048201 */ sub.s $f8, $f16, $f4 -/* 00E24 80AD8564 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00E28 80AD8568 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00E2C 80AD856C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00E30 80AD8570 E7A80074 */ swc1 $f8, 0x0074($sp) -/* 00E34 80AD8574 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C -/* 00E38 80AD8578 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00E3C 80AD857C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00E40 80AD8580 46021480 */ add.s $f18, $f2, $f2 -/* 00E44 80AD8584 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -/* 00E48 80AD8588 24E78D3C */ addiu $a3, $a3, %lo(D_80AD8D3C) ## $a3 = 80AD8D3C -/* 00E4C 80AD858C 24C68D30 */ addiu $a2, $a2, %lo(D_80AD8D30) ## $a2 = 80AD8D30 -/* 00E50 80AD8590 460A9181 */ sub.s $f6, $f18, $f10 -/* 00E54 80AD8594 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E58 80AD8598 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 -/* 00E5C 80AD859C E7A6007C */ swc1 $f6, 0x007C($sp) -/* 00E60 80AD85A0 860A0196 */ lh $t2, 0x0196($s0) ## 00000196 -/* 00E64 80AD85A4 AFA90038 */ sw $t1, 0x0038($sp) -/* 00E68 80AD85A8 AFA80034 */ sw $t0, 0x0034($sp) -/* 00E6C 80AD85AC 000A5880 */ sll $t3, $t2, 2 -/* 00E70 80AD85B0 016A5821 */ addu $t3, $t3, $t2 -/* 00E74 80AD85B4 000B5840 */ sll $t3, $t3, 1 -/* 00E78 80AD85B8 256C0050 */ addiu $t4, $t3, 0x0050 ## $t4 = 00000050 -/* 00E7C 80AD85BC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00E80 80AD85C0 AFAA003C */ sw $t2, 0x003C($sp) -/* 00E84 80AD85C4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00E88 80AD85C8 AFB90030 */ sw $t9, 0x0030($sp) -/* 00E8C 80AD85CC AFA0002C */ sw $zero, 0x002C($sp) -/* 00E90 80AD85D0 AFA00028 */ sw $zero, 0x0028($sp) -/* 00E94 80AD85D4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00E98 80AD85D8 AFAF0020 */ sw $t7, 0x0020($sp) -/* 00E9C 80AD85DC AFAE001C */ sw $t6, 0x001C($sp) -/* 00EA0 80AD85E0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00EA4 80AD85E4 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00EA8 80AD85E8 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EAC 80AD85EC C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 00EB0 80AD85F0 3C0680AE */ lui $a2, %hi(D_80AD8D30) ## $a2 = 80AE0000 -/* 00EB4 80AD85F4 3C0780AE */ lui $a3, %hi(D_80AD8D3C) ## $a3 = 80AE0000 -/* 00EB8 80AD85F8 E7B00074 */ swc1 $f16, 0x0074($sp) -/* 00EBC 80AD85FC C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00EC0 80AD8600 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00EC4 80AD8604 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00EC8 80AD8608 E7A4007C */ swc1 $f4, 0x007C($sp) -/* 00ECC 80AD860C 860B0196 */ lh $t3, 0x0196($s0) ## 00000196 -/* 00ED0 80AD8610 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00ED4 80AD8614 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00ED8 80AD8618 000B6080 */ sll $t4, $t3, 2 -/* 00EDC 80AD861C 018B6021 */ addu $t4, $t4, $t3 -/* 00EE0 80AD8620 000C6040 */ sll $t4, $t4, 1 -/* 00EE4 80AD8624 258D0050 */ addiu $t5, $t4, 0x0050 ## $t5 = 00000050 -/* 00EE8 80AD8628 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00EEC 80AD862C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00EF0 80AD8630 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 00EF4 80AD8634 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 00EF8 80AD8638 AFAA0038 */ sw $t2, 0x0038($sp) -/* 00EFC 80AD863C AFA90034 */ sw $t1, 0x0034($sp) -/* 00F00 80AD8640 AFA80030 */ sw $t0, 0x0030($sp) -/* 00F04 80AD8644 AFAB003C */ sw $t3, 0x003C($sp) -/* 00F08 80AD8648 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00F0C 80AD864C AFB90024 */ sw $t9, 0x0024($sp) -/* 00F10 80AD8650 AFB80020 */ sw $t8, 0x0020($sp) -/* 00F14 80AD8654 AFA0002C */ sw $zero, 0x002C($sp) -/* 00F18 80AD8658 AFA00028 */ sw $zero, 0x0028($sp) -/* 00F1C 80AD865C AFAF001C */ sw $t7, 0x001C($sp) -/* 00F20 80AD8660 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00F24 80AD8664 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F28 80AD8668 24E78D3C */ addiu $a3, $a3, %lo(D_80AD8D3C) ## $a3 = 80AD8D3C -/* 00F2C 80AD866C 24C68D30 */ addiu $a2, $a2, %lo(D_80AD8D30) ## $a2 = 80AD8D30 -/* 00F30 80AD8670 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F34 80AD8674 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00F38 80AD8678 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFF4 -/* 00F3C 80AD867C 860C0196 */ lh $t4, 0x0196($s0) ## 00000196 -/* 00F40 80AD8680 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00F44 80AD8684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F48 80AD8688 55810004 */ bnel $t4, $at, .L80AD869C -/* 00F4C 80AD868C 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 -/* 00F50 80AD8690 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F54 80AD8694 24053878 */ addiu $a1, $zero, 0x3878 ## $a1 = 00003878 -.L80AD8698: -/* 00F58 80AD8698 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 -.L80AD869C: -/* 00F5C 80AD869C 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A83126F -/* 00F60 80AD86A0 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 00F64 80AD86A4 0C01DE80 */ jal Math_ApproxF - -/* 00F68 80AD86A8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00F6C 80AD86AC 5040003F */ beql $v0, $zero, .L80AD87AC -/* 00F70 80AD86B0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F74 80AD86B4 920D0194 */ lbu $t5, 0x0194($s0) ## 00000194 -/* 00F78 80AD86B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00F7C 80AD86BC 11A00032 */ beq $t5, $zero, .L80AD8788 -/* 00F80 80AD86C0 00000000 */ nop -/* 00F84 80AD86C4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00F88 80AD86C8 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00F8C 80AD86CC 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00F90 80AD86D0 E7A80060 */ swc1 $f8, 0x0060($sp) -/* 00F94 80AD86D4 C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 -/* 00F98 80AD86D8 846213D0 */ lh $v0, 0x13D0($v1) ## 8015FA30 -/* 00F9C 80AD86DC 8C6E0ED0 */ lw $t6, 0x0ED0($v1) ## 8015F530 -/* 00FA0 80AD86E0 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 00FA4 80AD86E4 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00FA8 80AD86E8 004E082A */ slt $at, $v0, $t6 -/* 00FAC 80AD86EC 10200002 */ beq $at, $zero, .L80AD86F8 -/* 00FB0 80AD86F0 E7AA0068 */ swc1 $f10, 0x0068($sp) -/* 00FB4 80AD86F4 AC620ED0 */ sw $v0, 0x0ED0($v1) ## 8015F530 -.L80AD86F8: -/* 00FB8 80AD86F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00FBC 80AD86FC 0C00B35B */ jal Flags_GetCollectible - -/* 00FC0 80AD8700 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00FC4 80AD8704 3C038016 */ lui $v1, %hi(gSaveContext) -/* 00FC8 80AD8708 1440000F */ bne $v0, $zero, .L80AD8748 -/* 00FCC 80AD870C 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 00FD0 80AD8710 846F13D0 */ lh $t7, 0x13D0($v1) ## 8015FA30 -/* 00FD4 80AD8714 29E1003D */ slti $at, $t7, 0x003D -/* 00FD8 80AD8718 5020000C */ beql $at, $zero, .L80AD874C -/* 00FDC 80AD871C C7A60064 */ lwc1 $f6, 0x0064($sp) -/* 00FE0 80AD8720 8606001C */ lh $a2, 0x001C($s0) ## 0000001C -/* 00FE4 80AD8724 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00FE8 80AD8728 27A50060 */ addiu $a1, $sp, 0x0060 ## $a1 = FFFFFFE0 -/* 00FEC 80AD872C 00063200 */ sll $a2, $a2, 8 -/* 00FF0 80AD8730 24C64006 */ addiu $a2, $a2, 0x4006 ## $a2 = 00004006 -/* 00FF4 80AD8734 00063400 */ sll $a2, $a2, 16 -/* 00FF8 80AD8738 0C007DDF */ jal Item_DropCollectible2 - -/* 00FFC 80AD873C 00063403 */ sra $a2, $a2, 16 -/* 01000 80AD8740 10000017 */ beq $zero, $zero, .L80AD87A0 -/* 01004 80AD8744 00000000 */ nop -.L80AD8748: -/* 01008 80AD8748 C7A60064 */ lwc1 $f6, 0x0064($sp) -.L80AD874C: -/* 0100C 80AD874C C7B00068 */ lwc1 $f16, 0x0068($sp) -/* 01010 80AD8750 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01014 80AD8754 AFB80024 */ sw $t8, 0x0024($sp) -/* 01018 80AD8758 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 0101C 80AD875C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01020 80AD8760 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 -/* 01024 80AD8764 8FA70060 */ lw $a3, 0x0060($sp) -/* 01028 80AD8768 AFA00018 */ sw $zero, 0x0018($sp) -/* 0102C 80AD876C AFA0001C */ sw $zero, 0x001C($sp) -/* 01030 80AD8770 AFA00020 */ sw $zero, 0x0020($sp) -/* 01034 80AD8774 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01038 80AD8778 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 0103C 80AD877C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 01040 80AD8780 10000007 */ beq $zero, $zero, .L80AD87A0 -/* 01044 80AD8784 00000000 */ nop -.L80AD8788: -/* 01048 80AD8788 0C00B34E */ jal Flags_SetTempClear - -/* 0104C 80AD878C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01050 80AD8790 3C038016 */ lui $v1, %hi(gSaveContext) -/* 01054 80AD8794 2463E660 */ addiu $v1, %lo(gSaveContext) -/* 01058 80AD8798 847913D0 */ lh $t9, 0x13D0($v1) ## 8015FA30 -/* 0105C 80AD879C AC790ED0 */ sw $t9, 0x0ED0($v1) ## 8015F530 -.L80AD87A0: -/* 01060 80AD87A0 0C00B55C */ jal Actor_Kill - -/* 01064 80AD87A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01068 80AD87A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -.L80AD87AC: -/* 0106C 80AD87AC 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01070 80AD87B0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01074 80AD87B4 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 01078 80AD87B8 46082480 */ add.s $f18, $f4, $f8 -/* 0107C 80AD87BC E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 01080 80AD87C0 E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 01084 80AD87C4 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 01088 80AD87C8 8FBF004C */ lw $ra, 0x004C($sp) -/* 0108C 80AD87CC 8FB10048 */ lw $s1, 0x0048($sp) -/* 01090 80AD87D0 8FB00044 */ lw $s0, 0x0044($sp) -/* 01094 80AD87D4 03E00008 */ jr $ra -/* 01098 80AD87D8 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s deleted file mode 100644 index 832fd23882..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s +++ /dev/null @@ -1,182 +0,0 @@ -.rdata -glabel D_80AD8D60 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8D74 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8D88 - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8D9C - .asciz "../z_en_po_relay.c" - .balign 4 - -glabel D_80AD8DB0 - .asciz "../z_en_po_relay.c" - .balign 4 - -.text -glabel func_80AD88D0 -/* 01190 80AD88D0 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01194 80AD88D4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01198 80AD88D8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0119C 80AD88DC AFA40080 */ sw $a0, 0x0080($sp) -/* 011A0 80AD88E0 AFA60088 */ sw $a2, 0x0088($sp) -/* 011A4 80AD88E4 14A10065 */ bne $a1, $at, .L80AD8A7C -/* 011A8 80AD88E8 AFA7008C */ sw $a3, 0x008C($sp) -/* 011AC 80AD88EC 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 011B0 80AD88F0 3C0680AE */ lui $a2, %hi(D_80AD8D60) ## $a2 = 80AE0000 -/* 011B4 80AD88F4 24C68D60 */ addiu $a2, $a2, %lo(D_80AD8D60) ## $a2 = 80AD8D60 -/* 011B8 80AD88F8 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 -/* 011BC 80AD88FC 24070375 */ addiu $a3, $zero, 0x0375 ## $a3 = 00000375 -/* 011C0 80AD8900 0C031AB1 */ jal Graph_OpenDisps -/* 011C4 80AD8904 AFA50068 */ sw $a1, 0x0068($sp) -/* 011C8 80AD8908 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 011CC 80AD890C 00000000 */ nop -/* 011D0 80AD8910 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 011D4 80AD8914 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 011D8 80AD8918 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 011DC 80AD891C 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 011E0 80AD8920 46040182 */ mul.s $f6, $f0, $f4 -/* 011E4 80AD8924 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 011E8 80AD8928 44812000 */ mtc1 $at, $f4 ## $f4 = 160.00 -/* 011EC 80AD892C 460A0402 */ mul.s $f16, $f0, $f10 -/* 011F0 80AD8930 8FA90090 */ lw $t1, 0x0090($sp) -/* 011F4 80AD8934 8FA80068 */ lw $t0, 0x0068($sp) -/* 011F8 80AD8938 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 011FC 80AD893C 3C0680AE */ lui $a2, %hi(D_80AD8D74) ## $a2 = 80AE0000 -/* 01200 80AD8940 24C68D74 */ addiu $a2, $a2, %lo(D_80AD8D74) ## $a2 = 80AD8D74 -/* 01204 80AD8944 4600320D */ trunc.w.s $f8, $f6 -/* 01208 80AD8948 46040182 */ mul.s $f6, $f0, $f4 -/* 0120C 80AD894C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 -/* 01210 80AD8950 24070385 */ addiu $a3, $zero, 0x0385 ## $a3 = 00000385 -/* 01214 80AD8954 440A4000 */ mfc1 $t2, $f8 -/* 01218 80AD8958 4600848D */ trunc.w.s $f18, $f16 -/* 0121C 80AD895C 254B00E1 */ addiu $t3, $t2, 0x00E1 ## $t3 = 000000E1 -/* 01220 80AD8960 A12B0278 */ sb $t3, 0x0278($t1) ## 00000278 -/* 01224 80AD8964 4600320D */ trunc.w.s $f8, $f6 -/* 01228 80AD8968 440F9000 */ mfc1 $t7, $f18 -/* 0122C 80AD896C 440C4000 */ mfc1 $t4, $f8 -/* 01230 80AD8970 25F8009B */ addiu $t8, $t7, 0x009B ## $t8 = 0000009B -/* 01234 80AD8974 A1380279 */ sb $t8, 0x0279($t1) ## 00000279 -/* 01238 80AD8978 258D005F */ addiu $t5, $t4, 0x005F ## $t5 = 0000005F -/* 0123C 80AD897C A12D027A */ sb $t5, 0x027A($t1) ## 0000027A -/* 01240 80AD8980 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01244 80AD8984 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 01248 80AD8988 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0124C 80AD898C AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 01250 80AD8990 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 01254 80AD8994 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01258 80AD8998 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0125C 80AD899C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01260 80AD89A0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01264 80AD89A4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01268 80AD89A8 912B0278 */ lbu $t3, 0x0278($t1) ## 00000278 -/* 0126C 80AD89AC 912E0279 */ lbu $t6, 0x0279($t1) ## 00000279 -/* 01270 80AD89B0 912A027A */ lbu $t2, 0x027A($t1) ## 0000027A -/* 01274 80AD89B4 000B6600 */ sll $t4, $t3, 24 -/* 01278 80AD89B8 000E7C00 */ sll $t7, $t6, 16 -/* 0127C 80AD89BC 018FC025 */ or $t8, $t4, $t7 ## $t8 = E7000000 -/* 01280 80AD89C0 000A5A00 */ sll $t3, $t2, 8 -/* 01284 80AD89C4 030B6825 */ or $t5, $t8, $t3 ## $t5 = E70000E1 -/* 01288 80AD89C8 35AE0080 */ ori $t6, $t5, 0x0080 ## $t6 = E70000E1 -/* 0128C 80AD89CC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01290 80AD89D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01294 80AD89D4 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 01298 80AD89D8 2739B838 */ addiu $t9, $t9, 0xB838 ## $t9 = 0600B838 -/* 0129C 80AD89DC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 012A0 80AD89E0 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 012A4 80AD89E4 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 -/* 012A8 80AD89E8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 012AC 80AD89EC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 012B0 80AD89F0 8FAA0080 */ lw $t2, 0x0080($sp) -/* 012B4 80AD89F4 0C031AD5 */ jal Graph_CloseDisps -/* 012B8 80AD89F8 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 012BC 80AD89FC 3C0480AE */ lui $a0, %hi(D_80AD8D48) ## $a0 = 80AE0000 -/* 012C0 80AD8A00 24848D48 */ addiu $a0, $a0, %lo(D_80AD8D48) ## $a0 = 80AD8D48 -/* 012C4 80AD8A04 0C0346BD */ jal Matrix_MultVec3f -/* 012C8 80AD8A08 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFEC -/* 012CC 80AD8A0C 8FA90090 */ lw $t1, 0x0090($sp) -/* 012D0 80AD8A10 C7AA006C */ lwc1 $f10, 0x006C($sp) -/* 012D4 80AD8A14 C7B20070 */ lwc1 $f18, 0x0070($sp) -/* 012D8 80AD8A18 C7A60074 */ lwc1 $f6, 0x0074($sp) -/* 012DC 80AD8A1C 912E0278 */ lbu $t6, 0x0278($t1) ## 00000278 -/* 012E0 80AD8A20 4600540D */ trunc.w.s $f16, $f10 -/* 012E4 80AD8A24 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 -/* 012E8 80AD8A28 AFAE0010 */ sw $t6, 0x0010($sp) -/* 012EC 80AD8A2C 4600910D */ trunc.w.s $f4, $f18 -/* 012F0 80AD8A30 912C0279 */ lbu $t4, 0x0279($t1) ## 00000279 -/* 012F4 80AD8A34 44058000 */ mfc1 $a1, $f16 -/* 012F8 80AD8A38 4600320D */ trunc.w.s $f8, $f6 -/* 012FC 80AD8A3C 44062000 */ mfc1 $a2, $f4 -/* 01300 80AD8A40 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01304 80AD8A44 912F027A */ lbu $t7, 0x027A($t1) ## 0000027A -/* 01308 80AD8A48 44074000 */ mfc1 $a3, $f8 -/* 0130C 80AD8A4C 00052C00 */ sll $a1, $a1, 16 -/* 01310 80AD8A50 00063400 */ sll $a2, $a2, 16 -/* 01314 80AD8A54 00073C00 */ sll $a3, $a3, 16 -/* 01318 80AD8A58 00073C03 */ sra $a3, $a3, 16 -/* 0131C 80AD8A5C 00063403 */ sra $a2, $a2, 16 -/* 01320 80AD8A60 00052C03 */ sra $a1, $a1, 16 -/* 01324 80AD8A64 AFB9001C */ sw $t9, 0x001C($sp) -/* 01328 80AD8A68 25240280 */ addiu $a0, $t1, 0x0280 ## $a0 = 00000280 -/* 0132C 80AD8A6C 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 01330 80AD8A70 AFAF0018 */ sw $t7, 0x0018($sp) -/* 01334 80AD8A74 1000002D */ beq $zero, $zero, .L80AD8B2C -/* 01338 80AD8A78 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD8A7C: -/* 0133C 80AD8A7C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01340 80AD8A80 14A10029 */ bne $a1, $at, .L80AD8B28 -/* 01344 80AD8A84 8FAA0080 */ lw $t2, 0x0080($sp) -/* 01348 80AD8A88 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 0134C 80AD8A8C 3C0680AE */ lui $a2, %hi(D_80AD8D88) ## $a2 = 80AE0000 -/* 01350 80AD8A90 24C68D88 */ addiu $a2, $a2, %lo(D_80AD8D88) ## $a2 = 80AD8D88 -/* 01354 80AD8A94 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFB8 -/* 01358 80AD8A98 24070394 */ addiu $a3, $zero, 0x0394 ## $a3 = 00000394 -/* 0135C 80AD8A9C 0C031AB1 */ jal Graph_OpenDisps -/* 01360 80AD8AA0 AFA50048 */ sw $a1, 0x0048($sp) -/* 01364 80AD8AA4 8FA80048 */ lw $t0, 0x0048($sp) -/* 01368 80AD8AA8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 0136C 80AD8AAC 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 01370 80AD8AB0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01374 80AD8AB4 3C0580AE */ lui $a1, %hi(D_80AD8D9C) ## $a1 = 80AE0000 -/* 01378 80AD8AB8 24A58D9C */ addiu $a1, $a1, %lo(D_80AD8D9C) ## $a1 = 80AD8D9C -/* 0137C 80AD8ABC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 01380 80AD8AC0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01384 80AD8AC4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01388 80AD8AC8 8FAD0080 */ lw $t5, 0x0080($sp) -/* 0138C 80AD8ACC 24060396 */ addiu $a2, $zero, 0x0396 ## $a2 = 00000396 -/* 01390 80AD8AD0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01394 80AD8AD4 AFA80048 */ sw $t0, 0x0048($sp) -/* 01398 80AD8AD8 0C0346A2 */ jal Matrix_NewMtx -/* 0139C 80AD8ADC AFA20034 */ sw $v0, 0x0034($sp) -/* 013A0 80AD8AE0 8FA30034 */ lw $v1, 0x0034($sp) -/* 013A4 80AD8AE4 8FA80048 */ lw $t0, 0x0048($sp) -/* 013A8 80AD8AE8 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 013AC 80AD8AEC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 013B0 80AD8AF0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 013B4 80AD8AF4 25EFBBA0 */ addiu $t7, $t7, 0xBBA0 ## $t7 = 0600BBA0 -/* 013B8 80AD8AF8 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 013BC 80AD8AFC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 013C0 80AD8B00 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 013C4 80AD8B04 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 013C8 80AD8B08 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 013CC 80AD8B0C 8FB90080 */ lw $t9, 0x0080($sp) -/* 013D0 80AD8B10 3C0680AE */ lui $a2, %hi(D_80AD8DB0) ## $a2 = 80AE0000 -/* 013D4 80AD8B14 24C68DB0 */ addiu $a2, $a2, %lo(D_80AD8DB0) ## $a2 = 80AD8DB0 -/* 013D8 80AD8B18 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFB8 -/* 013DC 80AD8B1C 2407039A */ addiu $a3, $zero, 0x039A ## $a3 = 0000039A -/* 013E0 80AD8B20 0C031AD5 */ jal Graph_CloseDisps -/* 013E4 80AD8B24 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -.L80AD8B28: -/* 013E8 80AD8B28 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AD8B2C: -/* 013EC 80AD8B2C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 013F0 80AD8B30 03E00008 */ jr $ra -/* 013F4 80AD8B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s deleted file mode 100644 index 3c80db211e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel EnPoSisters_Destroy -/* 00248 80AD91D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0024C 80AD91DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00250 80AD91E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00254 80AD91E4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00258 80AD91E8 8CE60298 */ lw $a2, 0x0298($a3) ## 00000298 -/* 0025C 80AD91EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00260 80AD91F0 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 00264 80AD91F4 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00268 80AD91F8 AFA70018 */ sw $a3, 0x0018($sp) -/* 0026C 80AD91FC 8FA70018 */ lw $a3, 0x0018($sp) -/* 00270 80AD9200 90EF0194 */ lbu $t7, 0x0194($a3) ## 00000194 -/* 00274 80AD9204 55E00008 */ bnel $t7, $zero, .L80AD9228 -/* 00278 80AD9208 8FA4001C */ lw $a0, 0x001C($sp) -/* 0027C 80AD920C 90F80195 */ lbu $t8, 0x0195($a3) ## 00000195 -/* 00280 80AD9210 57000005 */ bnel $t8, $zero, .L80AD9228 -/* 00284 80AD9214 8FA4001C */ lw $a0, 0x001C($sp) -/* 00288 80AD9218 0C03D6D6 */ jal func_800F5B58 -/* 0028C 80AD921C AFA70018 */ sw $a3, 0x0018($sp) -/* 00290 80AD9220 8FA70018 */ lw $a3, 0x0018($sp) -/* 00294 80AD9224 8FA4001C */ lw $a0, 0x001C($sp) -.L80AD9228: -/* 00298 80AD9228 0C0170EB */ jal Collider_DestroyCylinder - -/* 0029C 80AD922C 24E502AC */ addiu $a1, $a3, 0x02AC ## $a1 = 000002AC -/* 002A0 80AD9230 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002A4 80AD9234 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002A8 80AD9238 03E00008 */ jr $ra -/* 002AC 80AD923C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s deleted file mode 100644 index 26dd1c9033..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ /dev/null @@ -1,492 +0,0 @@ -.rdata -glabel D_80ADD828 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD840 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD858 - .asciz "../z_en_po_sisters.c" - .balign 4 - -glabel D_80ADD870 - .asciz "../z_en_po_sisters.c" - .balign 4 - -.late_rodata -glabel D_80ADD8A8 - .word 0x3BB78035 -glabel D_80ADD8AC - .float 0.0027 - -glabel D_80ADD8B0 - .float 0.0027 - -glabel D_80ADD8B4 - .word 0x3B656042 -glabel D_80ADD8B8 - .float 0.0027 - -glabel D_80ADD8BC - .float 0.8 - -glabel D_80ADD8C0 - .float 0.025 - -glabel D_80ADD8C4 - .word 0x3BE56042, 0x00000000, 0x00000000 - -.text -glabel EnPoSisters_Draw -/* 040B4 80ADD044 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 -/* 040B8 80ADD048 AFBF006C */ sw $ra, 0x006C($sp) -/* 040BC 80ADD04C AFB70068 */ sw $s7, 0x0068($sp) -/* 040C0 80ADD050 AFB60064 */ sw $s6, 0x0064($sp) -/* 040C4 80ADD054 AFB50060 */ sw $s5, 0x0060($sp) -/* 040C8 80ADD058 AFB4005C */ sw $s4, 0x005C($sp) -/* 040CC 80ADD05C AFB30058 */ sw $s3, 0x0058($sp) -/* 040D0 80ADD060 AFB20054 */ sw $s2, 0x0054($sp) -/* 040D4 80ADD064 AFB10050 */ sw $s1, 0x0050($sp) -/* 040D8 80ADD068 AFB0004C */ sw $s0, 0x004C($sp) -/* 040DC 80ADD06C F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 040E0 80ADD070 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 040E4 80ADD074 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 040E8 80ADD078 AFA400F4 */ sw $a0, 0x00F4($sp) -/* 040EC 80ADD07C 90820194 */ lbu $v0, 0x0194($a0) ## 00000194 -/* 040F0 80ADD080 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 040F4 80ADD084 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 040F8 80ADD088 3C0E80AE */ lui $t6, %hi(D_80ADD700) ## $t6 = 80AE0000 -/* 040FC 80ADD08C 3C0F80AE */ lui $t7, %hi(D_80ADD6F0) ## $t7 = 80AE0000 -/* 04100 80ADD090 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 -/* 04104 80ADD094 25CED700 */ addiu $t6, $t6, %lo(D_80ADD700) ## $t6 = 80ADD700 -/* 04108 80ADD098 25EFD6F0 */ addiu $t7, $t7, %lo(D_80ADD6F0) ## $t7 = 80ADD6F0 -/* 0410C 80ADD09C 3C0680AE */ lui $a2, %hi(D_80ADD828) ## $a2 = 80AE0000 -/* 04110 80ADD0A0 00021080 */ sll $v0, $v0, 2 -/* 04114 80ADD0A4 004E8821 */ addu $s1, $v0, $t6 -/* 04118 80ADD0A8 004FB821 */ addu $s7, $v0, $t7 -/* 0411C 80ADD0AC 24C6D828 */ addiu $a2, $a2, %lo(D_80ADD828) ## $a2 = 80ADD828 -/* 04120 80ADD0B0 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC -/* 04124 80ADD0B4 24070BAD */ addiu $a3, $zero, 0x0BAD ## $a3 = 00000BAD -/* 04128 80ADD0B8 0C031AB1 */ jal Graph_OpenDisps -/* 0412C 80ADD0BC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 04130 80ADD0C0 0C2B7157 */ jal func_80ADC55C -/* 04134 80ADD0C4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 04138 80ADD0C8 0C024F46 */ jal func_80093D18 -/* 0413C 80ADD0CC 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 04140 80ADD0D0 0C024F61 */ jal func_80093D84 -/* 04144 80ADD0D4 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 04148 80ADD0D8 92820231 */ lbu $v0, 0x0231($s4) ## 00000231 -/* 0414C 80ADD0DC 241200FF */ addiu $s2, $zero, 0x00FF ## $s2 = 000000FF -/* 04150 80ADD0E0 3C15FB00 */ lui $s5, 0xFB00 ## $s5 = FB000000 -/* 04154 80ADD0E4 12420003 */ beq $s2, $v0, .L80ADD0F4 -/* 04158 80ADD0E8 3C0E8011 */ lui $t6, %hi(D_80116280+0x10) -/* 0415C 80ADD0EC 14400026 */ bne $v0, $zero, .L80ADD188 -/* 04160 80ADD0F0 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 -.L80ADD0F4: -/* 04164 80ADD0F4 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 -/* 04168 80ADD0F8 25CE6290 */ addiu $t6, %lo(D_80116280+0x10) -/* 0416C 80ADD0FC 3C0780AE */ lui $a3, %hi(func_80ADC77C) ## $a3 = 80AE0000 -/* 04170 80ADD100 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04174 80ADD104 AE7802C0 */ sw $t8, 0x02C0($s3) ## 000002C0 -/* 04178 80ADD108 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0417C 80ADD10C 928B022F */ lbu $t3, 0x022F($s4) ## 0000022F -/* 04180 80ADD110 9288022E */ lbu $t0, 0x022E($s4) ## 0000022E -/* 04184 80ADD114 928F0230 */ lbu $t7, 0x0230($s4) ## 00000230 -/* 04188 80ADD118 928A0231 */ lbu $t2, 0x0231($s4) ## 00000231 -/* 0418C 80ADD11C 000B6400 */ sll $t4, $t3, 16 -/* 04190 80ADD120 00084E00 */ sll $t1, $t0, 24 -/* 04194 80ADD124 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 -/* 04198 80ADD128 000FC200 */ sll $t8, $t7, 8 -/* 0419C 80ADD12C 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000008 -/* 041A0 80ADD130 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000008 -/* 041A4 80ADD134 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 041A8 80ADD138 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 -/* 041AC 80ADD13C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 041B0 80ADD140 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 041B4 80ADD144 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 041B8 80ADD148 AE6902C0 */ sw $t1, 0x02C0($s3) ## 000002C0 -/* 041BC 80ADD14C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 041C0 80ADD150 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 041C4 80ADD154 8E86016C */ lw $a2, 0x016C($s4) ## 0000016C -/* 041C8 80ADD158 8E850150 */ lw $a1, 0x0150($s4) ## 00000150 -/* 041CC 80ADD15C 3C0F80AE */ lui $t7, %hi(func_80ADC970) ## $t7 = 80AE0000 -/* 041D0 80ADD160 25EFC970 */ addiu $t7, $t7, %lo(func_80ADC970) ## $t7 = 80ADC970 -/* 041D4 80ADD164 AFAF0010 */ sw $t7, 0x0010($sp) -/* 041D8 80ADD168 AFB40014 */ sw $s4, 0x0014($sp) -/* 041DC 80ADD16C 8E6D02C0 */ lw $t5, 0x02C0($s3) ## 000002C0 -/* 041E0 80ADD170 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C -/* 041E4 80ADD174 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 041E8 80ADD178 0C0288A2 */ jal SkelAnime_Draw -/* 041EC 80ADD17C AFAD0018 */ sw $t5, 0x0018($sp) -/* 041F0 80ADD180 1000001F */ beq $zero, $zero, .L80ADD200 -/* 041F4 80ADD184 AE6202C0 */ sw $v0, 0x02C0($s3) ## 000002C0 -.L80ADD188: -/* 041F8 80ADD188 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 041FC 80ADD18C 3C15FB00 */ lui $s5, 0xFB00 ## $s5 = FB000000 -/* 04200 80ADD190 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 04204 80ADD194 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 04208 80ADD198 AE7802D0 */ sw $t8, 0x02D0($s3) ## 000002D0 -/* 0420C 80ADD19C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 04210 80ADD1A0 92990231 */ lbu $t9, 0x0231($s4) ## 00000231 -/* 04214 80ADD1A4 3C0C8011 */ lui $t4, %hi(D_80116280) -/* 04218 80ADD1A8 258C6280 */ addiu $t4, %lo(D_80116280) -/* 0421C 80ADD1AC 03215025 */ or $t2, $t9, $at ## $t2 = 00000000 -/* 04220 80ADD1B0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 04224 80ADD1B4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04228 80ADD1B8 35290024 */ ori $t1, $t1, 0x0024 ## $t1 = DB060024 -/* 0422C 80ADD1BC 3C0E80AE */ lui $t6, %hi(func_80ADC970) ## $t6 = 80AE0000 -/* 04230 80ADD1C0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 04234 80ADD1C4 AE6B02D0 */ sw $t3, 0x02D0($s3) ## 000002D0 -/* 04238 80ADD1C8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0423C 80ADD1CC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 04240 80ADD1D0 8E86016C */ lw $a2, 0x016C($s4) ## 0000016C -/* 04244 80ADD1D4 8E850150 */ lw $a1, 0x0150($s4) ## 00000150 -/* 04248 80ADD1D8 25CEC970 */ addiu $t6, $t6, %lo(func_80ADC970) ## $t6 = 80ADC970 -/* 0424C 80ADD1DC AFAE0010 */ sw $t6, 0x0010($sp) -/* 04250 80ADD1E0 AFB40014 */ sw $s4, 0x0014($sp) -/* 04254 80ADD1E4 8E6F02D0 */ lw $t7, 0x02D0($s3) ## 000002D0 -/* 04258 80ADD1E8 3C0780AE */ lui $a3, %hi(func_80ADC77C) ## $a3 = 80AE0000 -/* 0425C 80ADD1EC 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C -/* 04260 80ADD1F0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 04264 80ADD1F4 0C0288A2 */ jal SkelAnime_Draw -/* 04268 80ADD1F8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 0426C 80ADD1FC AE6202D0 */ sw $v0, 0x02D0($s3) ## 000002D0 -.L80ADD200: -/* 04270 80ADD200 928D0199 */ lbu $t5, 0x0199($s4) ## 00000199 -/* 04274 80ADD204 31B80080 */ andi $t8, $t5, 0x0080 ## $t8 = 00000000 -/* 04278 80ADD208 57000019 */ bnel $t8, $zero, .L80ADD270 -/* 0427C 80ADD20C 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04280 80ADD210 0C03423F */ jal Matrix_Put -/* 04284 80ADD214 268402F8 */ addiu $a0, $s4, 0x02F8 ## $a0 = 000002F8 -/* 04288 80ADD218 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 -/* 0428C 80ADD21C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 04290 80ADD220 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 04294 80ADD224 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 04298 80ADD228 AE6802C0 */ sw $t0, 0x02C0($s3) ## 000002C0 -/* 0429C 80ADD22C 3C0580AE */ lui $a1, %hi(D_80ADD840) ## $a1 = 80AE0000 -/* 042A0 80ADD230 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 042A4 80ADD234 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 042A8 80ADD238 24A5D840 */ addiu $a1, $a1, %lo(D_80ADD840) ## $a1 = 80ADD840 -/* 042AC 80ADD23C 24060BDA */ addiu $a2, $zero, 0x0BDA ## $a2 = 00000BDA -/* 042B0 80ADD240 0C0346A2 */ jal Matrix_NewMtx -/* 042B4 80ADD244 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 042B8 80ADD248 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 042BC 80ADD24C 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 -/* 042C0 80ADD250 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 042C4 80ADD254 252927B0 */ addiu $t1, $t1, 0x27B0 ## $t1 = 060027B0 -/* 042C8 80ADD258 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 042CC 80ADD25C AE6A02C0 */ sw $t2, 0x02C0($s3) ## 000002C0 -/* 042D0 80ADD260 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 -/* 042D4 80ADD264 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 042D8 80ADD268 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 042DC 80ADD26C 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -.L80ADD270: -/* 042E0 80ADD270 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 042E4 80ADD274 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 042E8 80ADD278 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 042EC 80ADD27C AE6C02D0 */ sw $t4, 0x02D0($s3) ## 000002D0 -/* 042F0 80ADD280 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 042F4 80ADD284 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 042F8 80ADD288 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 042FC 80ADD28C 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 04300 80ADD290 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04304 80ADD294 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 04308 80ADD298 01164021 */ addu $t0, $t0, $s6 -/* 0430C 80ADD29C AFB80018 */ sw $t8, 0x0018($sp) -/* 04310 80ADD2A0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 04314 80ADD2A4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 04318 80ADD2A8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0431C 80ADD2AC 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 -/* 04320 80ADD2B0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 04324 80ADD2B4 24090080 */ addiu $t1, $zero, 0x0080 ## $t1 = 00000080 -/* 04328 80ADD2B8 00080823 */ subu $at, $zero, $t0 -/* 0432C 80ADD2BC 0001C880 */ sll $t9, $at, 2 -/* 04330 80ADD2C0 0321C821 */ addu $t9, $t9, $at -/* 04334 80ADD2C4 0019C880 */ sll $t9, $t9, 2 -/* 04338 80ADD2C8 332A01FF */ andi $t2, $t9, 0x01FF ## $t2 = 00000000 -/* 0433C 80ADD2CC AFAA0020 */ sw $t2, 0x0020($sp) -/* 04340 80ADD2D0 AFA90028 */ sw $t1, 0x0028($sp) -/* 04344 80ADD2D4 AFAB0024 */ sw $t3, 0x0024($sp) -/* 04348 80ADD2D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0434C 80ADD2DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04350 80ADD2E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04354 80ADD2E4 0C0253D0 */ jal Gfx_TwoTexScroll -/* 04358 80ADD2E8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0435C 80ADD2EC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 04360 80ADD2F0 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04364 80ADD2F4 3C0580AE */ lui $a1, %hi(func_80ADB17C) ## $a1 = 80AE0000 -/* 04368 80ADD2F8 24A5B17C */ addiu $a1, $a1, %lo(func_80ADB17C) ## $a1 = 80ADB17C -/* 0436C 80ADD2FC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 04370 80ADD300 AE6C02D0 */ sw $t4, 0x02D0($s3) ## 000002D0 -/* 04374 80ADD304 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 04378 80ADD308 92280001 */ lbu $t0, 0x0001($s1) ## 00000001 -/* 0437C 80ADD30C 922F0000 */ lbu $t7, 0x0000($s1) ## 00000000 -/* 04380 80ADD310 92290002 */ lbu $t1, 0x0002($s1) ## 00000002 -/* 04384 80ADD314 92380003 */ lbu $t8, 0x0003($s1) ## 00000003 -/* 04388 80ADD318 0008CC00 */ sll $t9, $t0, 16 -/* 0438C 80ADD31C 000F6E00 */ sll $t5, $t7, 24 -/* 04390 80ADD320 01B95025 */ or $t2, $t5, $t9 ## $t2 = 00000000 -/* 04394 80ADD324 00096200 */ sll $t4, $t1, 8 -/* 04398 80ADD328 014C7025 */ or $t6, $t2, $t4 ## $t6 = 00000008 -/* 0439C 80ADD32C 01D84025 */ or $t0, $t6, $t8 ## $t0 = 00000008 -/* 043A0 80ADD330 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 043A4 80ADD334 8E820190 */ lw $v0, 0x0190($s4) ## 00000190 -/* 043A8 80ADD338 3C0B80AE */ lui $t3, %hi(func_80ADBD38) ## $t3 = 80AE0000 -/* 043AC 80ADD33C 256BBD38 */ addiu $t3, $t3, %lo(func_80ADBD38) ## $t3 = 80ADBD38 -/* 043B0 80ADD340 14A20020 */ bne $a1, $v0, .L80ADD3C4 -/* 043B4 80ADD344 00000000 */ nop -/* 043B8 80ADD348 8682019A */ lh $v0, 0x019A($s4) ## 0000019A -/* 043BC 80ADD34C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 043C0 80ADD350 28410020 */ slti $at, $v0, 0x0020 -/* 043C4 80ADD354 1020000D */ beq $at, $zero, .L80ADD38C -/* 043C8 80ADD358 01A2C823 */ subu $t9, $t5, $v0 -/* 043CC 80ADD35C 03320019 */ multu $t9, $s2 -/* 043D0 80ADD360 0000A812 */ mflo $s5 -/* 043D4 80ADD364 06A10002 */ bgez $s5, .L80ADD370 -/* 043D8 80ADD368 02A00821 */ addu $at, $s5, $zero -/* 043DC 80ADD36C 26A1001F */ addiu $at, $s5, 0x001F ## $at = FB00001F -.L80ADD370: -/* 043E0 80ADD370 0001A943 */ sra $s5, $at, 5 -/* 043E4 80ADD374 3C0180AE */ lui $at, %hi(D_80ADD8A8) ## $at = 80AE0000 -/* 043E8 80ADD378 C434D8A8 */ lwc1 $f20, %lo(D_80ADD8A8)($at) -/* 043EC 80ADD37C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 043F0 80ADD380 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 043F4 80ADD384 10000040 */ beq $zero, $zero, .L80ADD488 -/* 043F8 80ADD388 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000000 -.L80ADD38C: -/* 043FC 80ADD38C 00520019 */ multu $v0, $s2 -/* 04400 80ADD390 0000A812 */ mflo $s5 -/* 04404 80ADD394 26B5E020 */ addiu $s5, $s5, 0xE020 ## $s5 = FFFFE020 -/* 04408 80ADD398 06A10002 */ bgez $s5, .L80ADD3A4 -/* 0440C 80ADD39C 02A00821 */ addu $at, $s5, $zero -/* 04410 80ADD3A0 26A1001F */ addiu $at, $s5, 0x001F ## $at = FFFFE03F -.L80ADD3A4: -/* 04414 80ADD3A4 0001A943 */ sra $s5, $at, 5 -/* 04418 80ADD3A8 3C0180AE */ lui $at, %hi(D_80ADD8AC) ## $at = 80AE0000 -/* 0441C 80ADD3AC 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 -/* 04420 80ADD3B0 C434D8AC */ lwc1 $f20, %lo(D_80ADD8AC)($at) -/* 04424 80ADD3B4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 04428 80ADD3B8 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 0442C 80ADD3BC 10000033 */ beq $zero, $zero, .L80ADD48C -/* 04430 80ADD3C0 92990198 */ lbu $t9, 0x0198($s4) ## 00000198 -.L80ADD3C4: -/* 04434 80ADD3C4 15620010 */ bne $t3, $v0, .L80ADD408 -/* 04438 80ADD3C8 3C0F80AE */ lui $t7, %hi(func_80ADBEE8) ## $t7 = 80AE0000 -/* 0443C 80ADD3CC 8689019A */ lh $t1, 0x019A($s4) ## 0000019A -/* 04440 80ADD3D0 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 04444 80ADD3D4 01496023 */ subu $t4, $t2, $t1 -/* 04448 80ADD3D8 01920019 */ multu $t4, $s2 -/* 0444C 80ADD3DC 0000A812 */ mflo $s5 -/* 04450 80ADD3E0 06A10002 */ bgez $s5, .L80ADD3EC -/* 04454 80ADD3E4 02A00821 */ addu $at, $s5, $zero -/* 04458 80ADD3E8 26A1001F */ addiu $at, $s5, 0x001F ## $at = 0000003F -.L80ADD3EC: -/* 0445C 80ADD3EC 0001A943 */ sra $s5, $at, 5 -/* 04460 80ADD3F0 3C0180AE */ lui $at, %hi(D_80ADD8B0) ## $at = 80AE0000 -/* 04464 80ADD3F4 C434D8B0 */ lwc1 $f20, %lo(D_80ADD8B0)($at) -/* 04468 80ADD3F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0446C 80ADD3FC 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 04470 80ADD400 10000021 */ beq $zero, $zero, .L80ADD488 -/* 04474 80ADD404 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 -.L80ADD408: -/* 04478 80ADD408 25EFBEE8 */ addiu $t7, $t7, %lo(func_80ADBEE8) ## $t7 = 80ADBEE8 -/* 0447C 80ADD40C 15E20010 */ bne $t7, $v0, .L80ADD450 -/* 04480 80ADD410 3C0D80AE */ lui $t5, %hi(func_80ADBC88) ## $t5 = 80AE0000 -/* 04484 80ADD414 868E019A */ lh $t6, 0x019A($s4) ## 0000019A -/* 04488 80ADD418 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 0448C 80ADD41C 030E4023 */ subu $t0, $t8, $t6 -/* 04490 80ADD420 01120019 */ multu $t0, $s2 -/* 04494 80ADD424 0000A812 */ mflo $s5 -/* 04498 80ADD428 06A10002 */ bgez $s5, .L80ADD434 -/* 0449C 80ADD42C 02A00821 */ addu $at, $s5, $zero -/* 044A0 80ADD430 26A1001F */ addiu $at, $s5, 0x001F ## $at = 0000003F -.L80ADD434: -/* 044A4 80ADD434 0001A943 */ sra $s5, $at, 5 -/* 044A8 80ADD438 3C0180AE */ lui $at, %hi(D_80ADD8B4) ## $at = 80AE0000 -/* 044AC 80ADD43C C434D8B4 */ lwc1 $f20, %lo(D_80ADD8B4)($at) -/* 044B0 80ADD440 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 044B4 80ADD444 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 044B8 80ADD448 1000000F */ beq $zero, $zero, .L80ADD488 -/* 044BC 80ADD44C 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 -.L80ADD450: -/* 044C0 80ADD450 25ADBC88 */ addiu $t5, $t5, %lo(func_80ADBC88) ## $t5 = 80ADBC88 -/* 044C4 80ADD454 15A20007 */ bne $t5, $v0, .L80ADD474 -/* 044C8 80ADD458 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 044CC 80ADD45C 3C0180AE */ lui $at, %hi(D_80ADD8B8) ## $at = 80AE0000 -/* 044D0 80ADD460 C434D8B8 */ lwc1 $f20, %lo(D_80ADD8B8)($at) -/* 044D4 80ADD464 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 044D8 80ADD468 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 044DC 80ADD46C 10000006 */ beq $zero, $zero, .L80ADD488 -/* 044E0 80ADD470 93B500E7 */ lbu $s5, 0x00E7($sp) -.L80ADD474: -/* 044E4 80ADD474 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 044E8 80ADD478 C6840050 */ lwc1 $f4, 0x0050($s4) ## 00000050 -/* 044EC 80ADD47C 93B500E7 */ lbu $s5, 0x00E7($sp) -/* 044F0 80ADD480 46162502 */ mul.s $f20, $f4, $f22 -/* 044F4 80ADD484 00000000 */ nop -.L80ADD488: -/* 044F8 80ADD488 92990198 */ lbu $t9, 0x0198($s4) ## 00000198 -.L80ADD48C: -/* 044FC 80ADD48C 3C0B80AE */ lui $t3, %hi(func_80ADAFC0) ## $t3 = 80AE0000 -/* 04500 80ADD490 256BAFC0 */ addiu $t3, $t3, %lo(func_80ADAFC0) ## $t3 = 80ADAFC0 -/* 04504 80ADD494 1B200081 */ blez $t9, .L80ADD69C -/* 04508 80ADD498 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 0450C 80ADD49C 3C0A0405 */ lui $t2, 0x0405 ## $t2 = 04050000 -/* 04510 80ADD4A0 254AD4E0 */ addiu $t2, $t2, 0xD4E0 ## $t2 = 0404D4E0 -/* 04514 80ADD4A4 3C0180AE */ lui $at, %hi(D_80ADD8BC) ## $at = 80AE0000 -/* 04518 80ADD4A8 C438D8BC */ lwc1 $f24, %lo(D_80ADD8BC)($at) -/* 0451C 80ADD4AC AFAA0078 */ sw $t2, 0x0078($sp) -/* 04520 80ADD4B0 AFAB007C */ sw $t3, 0x007C($sp) -/* 04524 80ADD4B4 02809025 */ or $s2, $s4, $zero ## $s2 = 00000000 -/* 04528 80ADD4B8 AFA50084 */ sw $a1, 0x0084($sp) -/* 0452C 80ADD4BC 8FA50084 */ lw $a1, 0x0084($sp) -.L80ADD4C0: -/* 04530 80ADD4C0 8E820190 */ lw $v0, 0x0190($s4) ## 00000190 -/* 04534 80ADD4C4 3C0980AE */ lui $t1, %hi(func_80ADBD38) ## $t1 = 80AE0000 -/* 04538 80ADD4C8 2529BD38 */ addiu $t1, $t1, %lo(func_80ADBD38) ## $t1 = 80ADBD38 -/* 0453C 80ADD4CC 10A2000C */ beq $a1, $v0, .L80ADD500 -/* 04540 80ADD4D0 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 04544 80ADD4D4 1122000A */ beq $t1, $v0, .L80ADD500 -/* 04548 80ADD4D8 3C0C80AE */ lui $t4, %hi(func_80ADBEE8) ## $t4 = 80AE0000 -/* 0454C 80ADD4DC 258CBEE8 */ addiu $t4, $t4, %lo(func_80ADBEE8) ## $t4 = 80ADBEE8 -/* 04550 80ADD4E0 51820008 */ beql $t4, $v0, .L80ADD504 -/* 04554 80ADD4E4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04558 80ADD4E8 0011A823 */ subu $s5, $zero, $s1 -/* 0455C 80ADD4EC 02A00821 */ addu $at, $s5, $zero -/* 04560 80ADD4F0 0015A940 */ sll $s5, $s5, 5 -/* 04564 80ADD4F4 02A1A823 */ subu $s5, $s5, $at -/* 04568 80ADD4F8 26B500F8 */ addiu $s5, $s5, 0x00F8 ## $s5 = 00000118 -/* 0456C 80ADD4FC 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000018 -.L80ADD500: -/* 04570 80ADD500 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -.L80ADD504: -/* 04574 80ADD504 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 -/* 04578 80ADD508 35088080 */ ori $t0, $t0, 0x8080 ## $t0 = FA008080 -/* 0457C 80ADD50C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 04580 80ADD510 AE6F02D0 */ sw $t7, 0x02D0($s3) ## 000002D0 -/* 04584 80ADD514 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 04588 80ADD518 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0458C 80ADD51C 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04590 80ADD520 32A400FF */ andi $a0, $s5, 0x00FF ## $a0 = 00000018 -/* 04594 80ADD524 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04598 80ADD528 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0459C 80ADD52C AE6E02D0 */ sw $t6, 0x02D0($s3) ## 000002D0 -/* 045A0 80ADD530 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 045A4 80ADD534 92E90001 */ lbu $t1, 0x0001($s7) ## 00000001 -/* 045A8 80ADD538 92F90000 */ lbu $t9, 0x0000($s7) ## 00000000 -/* 045AC 80ADD53C 92EE0002 */ lbu $t6, 0x0002($s7) ## 00000002 -/* 045B0 80ADD540 00096400 */ sll $t4, $t1, 16 -/* 045B4 80ADD544 00195E00 */ sll $t3, $t9, 24 -/* 045B8 80ADD548 016C7825 */ or $t7, $t3, $t4 ## $t7 = 80ADBFE8 -/* 045BC 80ADD54C 000E4200 */ sll $t0, $t6, 8 -/* 045C0 80ADD550 01E86825 */ or $t5, $t7, $t0 ## $t5 = FAADBFE8 -/* 045C4 80ADD554 01A4C825 */ or $t9, $t5, $a0 ## $t9 = FAADBFF8 -/* 045C8 80ADD558 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 045CC 80ADD55C 8E46023C */ lw $a2, 0x023C($s2) ## 0000023C -/* 045D0 80ADD560 C64E0238 */ lwc1 $f14, 0x0238($s2) ## 00000238 -/* 045D4 80ADD564 C64C0234 */ lwc1 $f12, 0x0234($s2) ## 00000234 -/* 045D8 80ADD568 0C034261 */ jal Matrix_Translate -/* 045DC 80ADD56C AFA50084 */ sw $a1, 0x0084($sp) -/* 045E0 80ADD570 86CA07A0 */ lh $t2, 0x07A0($s6) ## 000007A0 -/* 045E4 80ADD574 000A4880 */ sll $t1, $t2, 2 -/* 045E8 80ADD578 02C95821 */ addu $t3, $s6, $t1 -/* 045EC 80ADD57C 0C016A7D */ jal func_8005A9F4 -/* 045F0 80ADD580 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 045F4 80ADD584 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 045F8 80ADD588 00412821 */ addu $a1, $v0, $at -/* 045FC 80ADD58C 00052C00 */ sll $a1, $a1, 16 -/* 04600 80ADD590 00052C03 */ sra $a1, $a1, 16 -/* 04604 80ADD594 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 04608 80ADD598 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0460C 80ADD59C 0C034421 */ jal Matrix_RotateRPY -/* 04610 80ADD5A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04614 80ADD5A4 8FAC007C */ lw $t4, 0x007C($sp) -/* 04618 80ADD5A8 8E980190 */ lw $t8, 0x0190($s4) ## 00000190 -/* 0461C 80ADD5AC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04620 80ADD5B0 5598001C */ bnel $t4, $t8, .L80ADD624 -/* 04624 80ADD5B4 4406A000 */ mfc1 $a2, $f20 -/* 04628 80ADD5B8 868E019A */ lh $t6, 0x019A($s4) ## 0000019A -/* 0462C 80ADD5BC 3C0180AE */ lui $at, %hi(D_80ADD8C0) ## $at = 80AE0000 -/* 04630 80ADD5C0 C42AD8C0 */ lwc1 $f10, %lo(D_80ADD8C0)($at) -/* 04634 80ADD5C4 01D17823 */ subu $t7, $t6, $s1 -/* 04638 80ADD5C8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0463C 80ADD5CC 3C0180AE */ lui $at, %hi(D_80ADD8C4) ## $at = 80AE0000 -/* 04640 80ADD5D0 46803220 */ cvt.s.w $f8, $f6 -/* 04644 80ADD5D4 460A4402 */ mul.s $f16, $f8, $f10 -/* 04648 80ADD5D8 46168500 */ add.s $f20, $f16, $f22 -/* 0464C 80ADD5DC 4616A03C */ c.lt.s $f20, $f22 -/* 04650 80ADD5E0 00000000 */ nop -/* 04654 80ADD5E4 45020004 */ bc1fl .L80ADD5F8 -/* 04658 80ADD5E8 4614C03C */ c.lt.s $f24, $f20 -/* 0465C 80ADD5EC 10000009 */ beq $zero, $zero, .L80ADD614 -/* 04660 80ADD5F0 4600B006 */ mov.s $f0, $f22 -/* 04664 80ADD5F4 4614C03C */ c.lt.s $f24, $f20 -.L80ADD5F8: -/* 04668 80ADD5F8 00000000 */ nop -/* 0466C 80ADD5FC 45020004 */ bc1fl .L80ADD610 -/* 04670 80ADD600 4600A086 */ mov.s $f2, $f20 -/* 04674 80ADD604 10000002 */ beq $zero, $zero, .L80ADD610 -/* 04678 80ADD608 4600C086 */ mov.s $f2, $f24 -/* 0467C 80ADD60C 4600A086 */ mov.s $f2, $f20 -.L80ADD610: -/* 04680 80ADD610 46001006 */ mov.s $f0, $f2 -.L80ADD614: -/* 04684 80ADD614 C432D8C4 */ lwc1 $f18, %lo(D_80ADD8C4)($at) -/* 04688 80ADD618 46120502 */ mul.s $f20, $f0, $f18 -/* 0468C 80ADD61C 00000000 */ nop -/* 04690 80ADD620 4406A000 */ mfc1 $a2, $f20 -.L80ADD624: -/* 04694 80ADD624 4600A306 */ mov.s $f12, $f20 -/* 04698 80ADD628 0C0342A3 */ jal Matrix_Scale -/* 0469C 80ADD62C 4600A386 */ mov.s $f14, $f20 -/* 046A0 80ADD630 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 046A4 80ADD634 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 -/* 046A8 80ADD638 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 -/* 046AC 80ADD63C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 046B0 80ADD640 AE6802D0 */ sw $t0, 0x02D0($s3) ## 000002D0 -/* 046B4 80ADD644 3C0580AE */ lui $a1, %hi(D_80ADD858) ## $a1 = 80AE0000 -/* 046B8 80ADD648 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 046BC 80ADD64C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 046C0 80ADD650 24A5D858 */ addiu $a1, $a1, %lo(D_80ADD858) ## $a1 = 80ADD858 -/* 046C4 80ADD654 24060C3C */ addiu $a2, $zero, 0x0C3C ## $a2 = 00000C3C -/* 046C8 80ADD658 0C0346A2 */ jal Matrix_NewMtx -/* 046CC 80ADD65C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 046D0 80ADD660 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 -/* 046D4 80ADD664 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 046D8 80ADD668 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 046DC 80ADD66C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 046E0 80ADD670 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 046E4 80ADD674 AE7902D0 */ sw $t9, 0x02D0($s3) ## 000002D0 -/* 046E8 80ADD678 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 046EC 80ADD67C 8FA90078 */ lw $t1, 0x0078($sp) -/* 046F0 80ADD680 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 0000000C -/* 046F4 80ADD684 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 046F8 80ADD688 8FAB00F4 */ lw $t3, 0x00F4($sp) -/* 046FC 80ADD68C 916C0198 */ lbu $t4, 0x0198($t3) ## 00000198 -/* 04700 80ADD690 022C082A */ slt $at, $s1, $t4 -/* 04704 80ADD694 5420FF8A */ bnel $at, $zero, .L80ADD4C0 -/* 04708 80ADD698 8FA50084 */ lw $a1, 0x0084($sp) -.L80ADD69C: -/* 0470C 80ADD69C 3C0680AE */ lui $a2, %hi(D_80ADD870) ## $a2 = 80AE0000 -/* 04710 80ADD6A0 24C6D870 */ addiu $a2, $a2, %lo(D_80ADD870) ## $a2 = 80ADD870 -/* 04714 80ADD6A4 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC -/* 04718 80ADD6A8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 0471C 80ADD6AC 0C031AD5 */ jal Graph_CloseDisps -/* 04720 80ADD6B0 24070C43 */ addiu $a3, $zero, 0x0C43 ## $a3 = 00000C43 -/* 04724 80ADD6B4 8FBF006C */ lw $ra, 0x006C($sp) -/* 04728 80ADD6B8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0472C 80ADD6BC D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 04730 80ADD6C0 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 04734 80ADD6C4 8FB0004C */ lw $s0, 0x004C($sp) -/* 04738 80ADD6C8 8FB10050 */ lw $s1, 0x0050($sp) -/* 0473C 80ADD6CC 8FB20054 */ lw $s2, 0x0054($sp) -/* 04740 80ADD6D0 8FB30058 */ lw $s3, 0x0058($sp) -/* 04744 80ADD6D4 8FB4005C */ lw $s4, 0x005C($sp) -/* 04748 80ADD6D8 8FB50060 */ lw $s5, 0x0060($sp) -/* 0474C 80ADD6DC 8FB60064 */ lw $s6, 0x0064($sp) -/* 04750 80ADD6E0 8FB70068 */ lw $s7, 0x0068($sp) -/* 04754 80ADD6E4 03E00008 */ jr $ra -/* 04758 80ADD6E8 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 -/* 0475C 80ADD6EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s deleted file mode 100644 index b1a8218bc9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s +++ /dev/null @@ -1,158 +0,0 @@ -glabel EnPoSisters_Init -/* 00000 80AD8F90 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80AD8F94 AFB10028 */ sw $s1, 0x0028($sp) -/* 00008 80AD8F98 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80AD8F9C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80AD8FA0 AFB00024 */ sw $s0, 0x0024($sp) -/* 00014 80AD8FA4 3C0580AE */ lui $a1, %hi(D_80ADD788) ## $a1 = 80AE0000 -/* 00018 80AD8FA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80AD8FAC 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80AD8FB0 24A5D788 */ addiu $a1, $a1, %lo(D_80ADD788) ## $a1 = 80ADD788 -/* 00024 80AD8FB4 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00028 80AD8FB8 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0002C 80AD8FBC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00030 80AD8FC0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00034 80AD8FC4 0C00AC78 */ jal ActorShape_Init - -/* 00038 80AD8FC8 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 0003C 80AD8FCC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00040 80AD8FD0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00044 80AD8FD4 260E019E */ addiu $t6, $s0, 0x019E ## $t6 = 0000019E -/* 00048 80AD8FD8 260F01E6 */ addiu $t7, $s0, 0x01E6 ## $t7 = 000001E6 -/* 0004C 80AD8FDC 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 00050 80AD8FE0 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80AD8FE4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80AD8FE8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0005C 80AD8FEC 24E714CC */ addiu $a3, $a3, 0x14CC ## $a3 = 060014CC -/* 00060 80AD8FF0 24C665C8 */ addiu $a2, $a2, 0x65C8 ## $a2 = 060065C8 -/* 00064 80AD8FF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80AD8FF8 0C02915F */ jal SkelAnime_Init - -/* 0006C 80AD8FFC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00070 80AD9000 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00074 80AD9004 241900D2 */ addiu $t9, $zero, 0x00D2 ## $t9 = 000000D2 -/* 00078 80AD9008 A203022E */ sb $v1, 0x022E($s0) ## 0000022E -/* 0007C 80AD900C A203022F */ sb $v1, 0x022F($s0) ## 0000022F -/* 00080 80AD9010 A2190230 */ sb $t9, 0x0230($s0) ## 00000230 -/* 00084 80AD9014 A2030231 */ sb $v1, 0x0231($s0) ## 00000231 -/* 00088 80AD9018 2606029C */ addiu $a2, $s0, 0x029C ## $a2 = 0000029C -/* 0008C 80AD901C AFA60034 */ sw $a2, 0x0034($sp) -/* 00090 80AD9020 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00094 80AD9024 0C01E9D9 */ jal LightContext_InsertLight - -/* 00098 80AD9028 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 0009C 80AD902C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 000A0 80AD9030 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 000A4 80AD9034 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 000A8 80AD9038 4600218D */ trunc.w.s $f6, $f4 -/* 000AC 80AD903C AE020298 */ sw $v0, 0x0298($s0) ## 00000298 -/* 000B0 80AD9040 AFA0001C */ sw $zero, 0x001C($sp) -/* 000B4 80AD9044 4600428D */ trunc.w.s $f10, $f8 -/* 000B8 80AD9048 44053000 */ mfc1 $a1, $f6 -/* 000BC 80AD904C AFA00018 */ sw $zero, 0x0018($sp) -/* 000C0 80AD9050 4600848D */ trunc.w.s $f18, $f16 -/* 000C4 80AD9054 44065000 */ mfc1 $a2, $f10 -/* 000C8 80AD9058 00052C00 */ sll $a1, $a1, 16 -/* 000CC 80AD905C 00052C03 */ sra $a1, $a1, 16 -/* 000D0 80AD9060 44079000 */ mfc1 $a3, $f18 -/* 000D4 80AD9064 00063400 */ sll $a2, $a2, 16 -/* 000D8 80AD9068 00063403 */ sra $a2, $a2, 16 -/* 000DC 80AD906C 00073C00 */ sll $a3, $a3, 16 -/* 000E0 80AD9070 00073C03 */ sra $a3, $a3, 16 -/* 000E4 80AD9074 AFA00014 */ sw $zero, 0x0014($sp) -/* 000E8 80AD9078 AFA00010 */ sw $zero, 0x0010($sp) -/* 000EC 80AD907C 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 000F0 80AD9080 8FA40034 */ lw $a0, 0x0034($sp) -/* 000F4 80AD9084 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC -/* 000F8 80AD9088 AFA50034 */ sw $a1, 0x0034($sp) -/* 000FC 80AD908C 0C0170D9 */ jal Collider_InitCylinder - -/* 00100 80AD9090 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00104 80AD9094 3C0780AE */ lui $a3, %hi(D_80ADD730) ## $a3 = 80AE0000 -/* 00108 80AD9098 8FA50034 */ lw $a1, 0x0034($sp) -/* 0010C 80AD909C 24E7D730 */ addiu $a3, $a3, %lo(D_80ADD730) ## $a3 = 80ADD730 -/* 00110 80AD90A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00114 80AD90A4 0C01712B */ jal Collider_SetCylinder - -/* 00118 80AD90A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0011C 80AD90AC 3C0580AE */ lui $a1, %hi(D_80ADD764) ## $a1 = 80AE0000 -/* 00120 80AD90B0 3C0680AE */ lui $a2, %hi(D_80ADD75C) ## $a2 = 80AE0000 -/* 00124 80AD90B4 24C6D75C */ addiu $a2, $a2, %lo(D_80ADD75C) ## $a2 = 80ADD75C -/* 00128 80AD90B8 24A5D764 */ addiu $a1, $a1, %lo(D_80ADD764) ## $a1 = 80ADD764 -/* 0012C 80AD90BC 0C0187B5 */ jal func_80061ED4 -/* 00130 80AD90C0 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00134 80AD90C4 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 00138 80AD90C8 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 0013C 80AD90CC 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -/* 00140 80AD90D0 000B6203 */ sra $t4, $t3, 8 -/* 00144 80AD90D4 318E0003 */ andi $t6, $t4, 0x0003 ## $t6 = 00000000 -/* 00148 80AD90D8 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 0014C 80AD90DC 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00150 80AD90E0 44812000 */ mtc1 $at, $f4 ## $f4 = 110.00 -/* 00154 80AD90E4 A20E0194 */ sb $t6, 0x0194($s0) ## 00000194 -/* 00158 80AD90E8 25CF0050 */ addiu $t7, $t6, 0x0050 ## $t7 = 00000050 -/* 0015C 80AD90EC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00160 80AD90F0 0018CA83 */ sra $t9, $t8, 10 -/* 00164 80AD90F4 24020020 */ addiu $v0, $zero, 0x0020 ## $v0 = 00000020 -/* 00168 80AD90F8 33280003 */ andi $t0, $t9, 0x0003 ## $t0 = 00000000 -/* 0016C 80AD90FC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 00170 80AD9100 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00174 80AD9104 31AE1000 */ andi $t6, $t5, 0x1000 ## $t6 = 00000000 -/* 00178 80AD9108 01616024 */ and $t4, $t3, $at -/* 0017C 80AD910C A20F0117 */ sb $t7, 0x0117($s0) ## 00000117 -/* 00180 80AD9110 A2080195 */ sb $t0, 0x0195($s0) ## 00000195 -/* 00184 80AD9114 A2020196 */ sb $v0, 0x0196($s0) ## 00000196 -/* 00188 80AD9118 A2090197 */ sb $t1, 0x0197($s0) ## 00000197 -/* 0018C 80AD911C A20A0198 */ sb $t2, 0x0198($s0) ## 00000198 -/* 00190 80AD9120 A2020199 */ sb $v0, 0x0199($s0) ## 00000199 -/* 00194 80AD9124 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00198 80AD9128 11C00006 */ beq $t6, $zero, .L80AD9144 -/* 0019C 80AD912C E6040294 */ swc1 $f4, 0x0294($s0) ## 00000294 -/* 001A0 80AD9130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A4 80AD9134 0C2B6825 */ jal func_80ADA094 -/* 001A8 80AD9138 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001AC 80AD913C 1000001F */ beq $zero, $zero, .L80AD91BC -/* 001B0 80AD9140 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -.L80AD9144: -/* 001B4 80AD9144 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 -/* 001B8 80AD9148 15E00019 */ bne $t7, $zero, .L80AD91B0 -/* 001BC 80AD914C 00000000 */ nop -/* 001C0 80AD9150 92180195 */ lbu $t8, 0x0195($s0) ## 00000195 -/* 001C4 80AD9154 2401BDFF */ addiu $at, $zero, 0xBDFF ## $at = FFFFBDFF -/* 001C8 80AD9158 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 001CC 80AD915C 17000008 */ bne $t8, $zero, .L80AD9180 -/* 001D0 80AD9160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D4 80AD9164 24190009 */ addiu $t9, $zero, 0x0009 ## $t9 = 00000009 -/* 001D8 80AD9168 A21902BE */ sb $t9, 0x02BE($s0) ## 000002BE -/* 001DC 80AD916C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E0 80AD9170 0C2B66AA */ jal func_80AD9AA8 -/* 001E4 80AD9174 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001E8 80AD9178 10000010 */ beq $zero, $zero, .L80AD91BC -/* 001EC 80AD917C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -.L80AD9180: -/* 001F0 80AD9180 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 001F4 80AD9184 8E0B02CC */ lw $t3, 0x02CC($s0) ## 000002CC -/* 001F8 80AD9188 A20A02D8 */ sb $t2, 0x02D8($s0) ## 000002D8 -/* 001FC 80AD918C 01014824 */ and $t1, $t0, $at -/* 00200 80AD9190 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00204 80AD9194 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 -/* 00208 80AD9198 AE0C02CC */ sw $t4, 0x02CC($s0) ## 000002CC -/* 0020C 80AD919C A20002BE */ sb $zero, 0x02BE($s0) ## 000002BE -/* 00210 80AD91A0 0C2B6709 */ jal func_80AD9C24 -/* 00214 80AD91A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00218 80AD91A8 10000004 */ beq $zero, $zero, .L80AD91BC -/* 0021C 80AD91AC 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -.L80AD91B0: -/* 00220 80AD91B0 0C2B6751 */ jal func_80AD9D44 -/* 00224 80AD91B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00228 80AD91B8 860D001C */ lh $t5, 0x001C($s0) ## 0000001C -.L80AD91BC: -/* 0022C 80AD91BC 31AE003F */ andi $t6, $t5, 0x003F ## $t6 = 00000000 -/* 00230 80AD91C0 A60E001C */ sh $t6, 0x001C($s0) ## 0000001C -/* 00234 80AD91C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00238 80AD91C8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0023C 80AD91CC 8FB00024 */ lw $s0, 0x0024($sp) -/* 00240 80AD91D0 03E00008 */ jr $ra -/* 00244 80AD91D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s deleted file mode 100644 index 8b7d384dcc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s +++ /dev/null @@ -1,84 +0,0 @@ -.late_rodata -glabel D_80ADD888 - .float 0.1 - -.text -glabel func_80AD9240 -/* 002B0 80AD9240 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 002B4 80AD9244 AFBF003C */ sw $ra, 0x003C($sp) -/* 002B8 80AD9248 AFB50038 */ sw $s5, 0x0038($sp) -/* 002BC 80AD924C AFB40034 */ sw $s4, 0x0034($sp) -/* 002C0 80AD9250 AFB30030 */ sw $s3, 0x0030($sp) -/* 002C4 80AD9254 AFB2002C */ sw $s2, 0x002C($sp) -/* 002C8 80AD9258 AFB10028 */ sw $s1, 0x0028($sp) -/* 002CC 80AD925C AFB00024 */ sw $s0, 0x0024($sp) -/* 002D0 80AD9260 F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 002D4 80AD9264 F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 002D8 80AD9268 908E0198 */ lbu $t6, 0x0198($a0) ## 00000198 -/* 002DC 80AD926C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002E0 80AD9270 00C0A825 */ or $s5, $a2, $zero ## $s5 = 00000000 -/* 002E4 80AD9274 19C00031 */ blez $t6, .L80AD933C -/* 002E8 80AD9278 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 002EC 80AD927C 00A50019 */ multu $a1, $a1 -/* 002F0 80AD9280 3C0180AE */ lui $at, %hi(D_80ADD888) ## $at = 80AE0000 -/* 002F4 80AD9284 C428D888 */ lwc1 $f8, %lo(D_80ADD888)($at) -/* 002F8 80AD9288 44855000 */ mtc1 $a1, $f10 ## $f10 = 0.00 -/* 002FC 80AD928C 24910234 */ addiu $s1, $a0, 0x0234 ## $s1 = 00000234 -/* 00300 80AD9290 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 00304 80AD9294 468055A0 */ cvt.s.w $f22, $f10 -/* 00308 80AD9298 00007812 */ mflo $t7 -/* 0030C 80AD929C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00310 80AD92A0 00000000 */ nop -/* 00314 80AD92A4 468021A0 */ cvt.s.w $f6, $f4 -/* 00318 80AD92A8 46083502 */ mul.s $f20, $f6, $f8 -/* 0031C 80AD92AC 00000000 */ nop -/* 00320 80AD92B0 8619019A */ lh $t9, 0x019A($s0) ## 0000019A -.L80AD92B4: -/* 00324 80AD92B4 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 00328 80AD92B8 0220A025 */ or $s4, $s1, $zero ## $s4 = 00000234 -/* 0032C 80AD92BC 001942C0 */ sll $t0, $t9, 11 -/* 00330 80AD92C0 03084821 */ addu $t1, $t8, $t0 -/* 00334 80AD92C4 01322021 */ addu $a0, $t1, $s2 -/* 00338 80AD92C8 00042400 */ sll $a0, $a0, 16 -/* 0033C 80AD92CC 0C01DE1C */ jal Math_Sins - ## sins? -/* 00340 80AD92D0 00042403 */ sra $a0, $a0, 16 -/* 00344 80AD92D4 46140402 */ mul.s $f16, $f0, $f20 -/* 00348 80AD92D8 C6B20000 */ lwc1 $f18, 0x0000($s5) ## 00000000 -/* 0034C 80AD92DC 46128100 */ add.s $f4, $f16, $f18 -/* 00350 80AD92E0 E6240000 */ swc1 $f4, 0x0000($s1) ## 00000234 -/* 00354 80AD92E4 860B019A */ lh $t3, 0x019A($s0) ## 0000019A -/* 00358 80AD92E8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0035C 80AD92EC 000B62C0 */ sll $t4, $t3, 11 -/* 00360 80AD92F0 014C6821 */ addu $t5, $t2, $t4 -/* 00364 80AD92F4 01B22021 */ addu $a0, $t5, $s2 -/* 00368 80AD92F8 00042400 */ sll $a0, $a0, 16 -/* 0036C 80AD92FC 0C01DE0D */ jal Math_Coss - ## coss? -/* 00370 80AD9300 00042403 */ sra $a0, $a0, 16 -/* 00374 80AD9304 46140182 */ mul.s $f6, $f0, $f20 -/* 00378 80AD9308 C6A80008 */ lwc1 $f8, 0x0008($s5) ## 00000008 -/* 0037C 80AD930C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 00380 80AD9310 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 00000240 -/* 00384 80AD9314 26522000 */ addiu $s2, $s2, 0x2000 ## $s2 = 00002000 -/* 00388 80AD9318 46083280 */ add.s $f10, $f6, $f8 -/* 0038C 80AD931C E68A0008 */ swc1 $f10, 0x0008($s4) ## 0000023C -/* 00390 80AD9320 C6B00004 */ lwc1 $f16, 0x0004($s5) ## 00000004 -/* 00394 80AD9324 46168480 */ add.s $f18, $f16, $f22 -/* 00398 80AD9328 E6920004 */ swc1 $f18, 0x0004($s4) ## 00000238 -/* 0039C 80AD932C 920E0198 */ lbu $t6, 0x0198($s0) ## 00000198 -/* 003A0 80AD9330 026E082A */ slt $at, $s3, $t6 -/* 003A4 80AD9334 5420FFDF */ bnel $at, $zero, .L80AD92B4 -/* 003A8 80AD9338 8619019A */ lh $t9, 0x019A($s0) ## 0000019A -.L80AD933C: -/* 003AC 80AD933C 8FBF003C */ lw $ra, 0x003C($sp) -/* 003B0 80AD9340 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 003B4 80AD9344 D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 003B8 80AD9348 8FB00024 */ lw $s0, 0x0024($sp) -/* 003BC 80AD934C 8FB10028 */ lw $s1, 0x0028($sp) -/* 003C0 80AD9350 8FB2002C */ lw $s2, 0x002C($sp) -/* 003C4 80AD9354 8FB30030 */ lw $s3, 0x0030($sp) -/* 003C8 80AD9358 8FB40034 */ lw $s4, 0x0034($sp) -/* 003CC 80AD935C 8FB50038 */ lw $s5, 0x0038($sp) -/* 003D0 80AD9360 03E00008 */ jr $ra -/* 003D4 80AD9364 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s deleted file mode 100644 index aea0de05fb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AD9368 -/* 003D8 80AD9368 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003DC 80AD936C AFBF0014 */ sw $ra, 0x0014($sp) -/* 003E0 80AD9370 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 003E4 80AD9374 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003E8 80AD9378 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 003EC 80AD937C AFA70018 */ sw $a3, 0x0018($sp) -/* 003F0 80AD9380 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F4 80AD9384 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 003F8 80AD9388 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 003FC 80AD938C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00400 80AD9390 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00404 80AD9394 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00408 80AD9398 8FA70018 */ lw $a3, 0x0018($sp) -/* 0040C 80AD939C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00410 80AD93A0 3C0E80AE */ lui $t6, %hi(func_80ADA4A8) ## $t6 = 80AE0000 -/* 00414 80AD93A4 25CEA4A8 */ addiu $t6, $t6, %lo(func_80ADA4A8) ## $t6 = 80ADA4A8 -/* 00418 80AD93A8 A4E2019A */ sh $v0, 0x019A($a3) ## 0000019A -/* 0041C 80AD93AC ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -/* 00420 80AD93B0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00424 80AD93B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00428 80AD93B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0042C 80AD93BC 03E00008 */ jr $ra -/* 00430 80AD93C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s deleted file mode 100644 index d2421778da..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80AD93C4 -/* 00434 80AD93C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00438 80AD93C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0043C 80AD93CC 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 00440 80AD93D0 3C0E80AE */ lui $t6, %hi(func_80ADA6A0) ## $t6 = 80AE0000 -/* 00444 80AD93D4 25CEA6A0 */ addiu $t6, $t6, %lo(func_80ADA6A0) ## $t6 = 80ADA6A0 -/* 00448 80AD93D8 11CF0008 */ beq $t6, $t7, .L80AD93FC -/* 0044C 80AD93DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00450 80AD93E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00454 80AD93E4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 00458 80AD93E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0045C 80AD93EC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00460 80AD93F0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00464 80AD93F4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00468 80AD93F8 8FA70018 */ lw $a3, 0x0018($sp) -.L80AD93FC: -/* 0046C 80AD93FC 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 00470 80AD9400 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00474 80AD9404 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00478 80AD9408 AFA70018 */ sw $a3, 0x0018($sp) -/* 0047C 80AD940C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00480 80AD9410 3C0880AE */ lui $t0, %hi(func_80ADA530) ## $t0 = 80AE0000 -/* 00484 80AD9414 2508A530 */ addiu $t0, $t0, %lo(func_80ADA530) ## $t0 = 80ADA530 -/* 00488 80AD9418 90F80199 */ lbu $t8, 0x0199($a3) ## 00000199 -/* 0048C 80AD941C A4E2019A */ sh $v0, 0x019A($a3) ## 0000019A -/* 00490 80AD9420 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 00494 80AD9424 37190007 */ ori $t9, $t8, 0x0007 ## $t9 = 00000007 -/* 00498 80AD9428 A0F90199 */ sb $t9, 0x0199($a3) ## 00000199 -/* 0049C 80AD942C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004A0 80AD9430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004A4 80AD9434 03E00008 */ jr $ra -/* 004A8 80AD9438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s deleted file mode 100644 index a33961bc68..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80AD943C -/* 004AC 80AD943C 3C0E80AE */ lui $t6, %hi(func_80ADA6A0) ## $t6 = 80AE0000 -/* 004B0 80AD9440 25CEA6A0 */ addiu $t6, $t6, %lo(func_80ADA6A0) ## $t6 = 80ADA6A0 -/* 004B4 80AD9444 03E00008 */ jr $ra -/* 004B8 80AD9448 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s deleted file mode 100644 index c4b305d89a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AD944C -/* 004BC 80AD944C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C0 80AD9450 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004C4 80AD9454 908E0231 */ lbu $t6, 0x0231($a0) ## 00000231 -/* 004C8 80AD9458 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004CC 80AD945C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004D0 80AD9460 11C00006 */ beq $t6, $zero, .L80AD947C -/* 004D4 80AD9464 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 -/* 004D8 80AD9468 909802BD */ lbu $t8, 0x02BD($a0) ## 000002BD -/* 004DC 80AD946C 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 -/* 004E0 80AD9470 A08F02C0 */ sb $t7, 0x02C0($a0) ## 000002C0 -/* 004E4 80AD9474 37190004 */ ori $t9, $t8, 0x0004 ## $t9 = 00000004 -/* 004E8 80AD9478 A09902BD */ sb $t9, 0x02BD($a0) ## 000002BD -.L80AD947C: -/* 004EC 80AD947C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 004F0 80AD9480 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 004F4 80AD9484 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 004F8 80AD9488 AFA70018 */ sw $a3, 0x0018($sp) -/* 004FC 80AD948C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00500 80AD9490 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00504 80AD9494 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00508 80AD9498 24840114 */ addiu $a0, $a0, 0x0114 ## $a0 = 06000114 -/* 0050C 80AD949C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00510 80AD94A0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00514 80AD94A4 8FA70018 */ lw $a3, 0x0018($sp) -/* 00518 80AD94A8 00024080 */ sll $t0, $v0, 2 -/* 0051C 80AD94AC 01024023 */ subu $t0, $t0, $v0 -/* 00520 80AD94B0 90EA0199 */ lbu $t2, 0x0199($a3) ## 00000199 -/* 00524 80AD94B4 3C0C80AE */ lui $t4, %hi(func_80ADA7F0) ## $t4 = 80AE0000 -/* 00528 80AD94B8 25090003 */ addiu $t1, $t0, 0x0003 ## $t1 = 00000003 -/* 0052C 80AD94BC 258CA7F0 */ addiu $t4, $t4, %lo(func_80ADA7F0) ## $t4 = 80ADA7F0 -/* 00530 80AD94C0 314BFFFD */ andi $t3, $t2, 0xFFFD ## $t3 = 00000000 -/* 00534 80AD94C4 A4E9019A */ sh $t1, 0x019A($a3) ## 0000019A -/* 00538 80AD94C8 A0EB0199 */ sb $t3, 0x0199($a3) ## 00000199 -/* 0053C 80AD94CC ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 00540 80AD94D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00544 80AD94D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00548 80AD94D8 03E00008 */ jr $ra -/* 0054C 80AD94DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s deleted file mode 100644 index ad9fbcab3a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AD94E0 -/* 00550 80AD94E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00554 80AD94E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00558 80AD94E8 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 -/* 0055C 80AD94EC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00560 80AD94F0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00564 80AD94F4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00568 80AD94F8 15C0000D */ bne $t6, $zero, .L80AD9530 -/* 0056C 80AD94FC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00570 80AD9500 909802BD */ lbu $t8, 0x02BD($a0) ## 000002BD -/* 00574 80AD9504 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 -/* 00578 80AD9508 A08F02C0 */ sb $t7, 0x02C0($a0) ## 000002C0 -/* 0057C 80AD950C 37190004 */ ori $t9, $t8, 0x0004 ## $t9 = 00000004 -/* 00580 80AD9510 A09902BD */ sb $t9, 0x02BD($a0) ## 000002BD -/* 00584 80AD9514 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00588 80AD9518 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 -/* 0058C 80AD951C AFA70018 */ sw $a3, 0x0018($sp) -/* 00590 80AD9520 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00594 80AD9524 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00598 80AD9528 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0059C 80AD952C 8FA70018 */ lw $a3, 0x0018($sp) -.L80AD9530: -/* 005A0 80AD9530 90EA0199 */ lbu $t2, 0x0199($a3) ## 00000199 -/* 005A4 80AD9534 84E9008A */ lh $t1, 0x008A($a3) ## 0000008A -/* 005A8 80AD9538 3C0C80AE */ lui $t4, %hi(func_80ADA8C0) ## $t4 = 80AE0000 -/* 005AC 80AD953C 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 005B0 80AD9540 258CA8C0 */ addiu $t4, $t4, %lo(func_80ADA8C0) ## $t4 = 80ADA8C0 -/* 005B4 80AD9544 354B0008 */ ori $t3, $t2, 0x0008 ## $t3 = 00000008 -/* 005B8 80AD9548 A4E8019A */ sh $t0, 0x019A($a3) ## 0000019A -/* 005BC 80AD954C A0EB0199 */ sb $t3, 0x0199($a3) ## 00000199 -/* 005C0 80AD9550 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 005C4 80AD9554 A4E90032 */ sh $t1, 0x0032($a3) ## 00000032 -/* 005C8 80AD9558 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005CC 80AD955C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005D0 80AD9560 03E00008 */ jr $ra -/* 005D4 80AD9564 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s deleted file mode 100644 index a5b4015506..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AD9568 -/* 005D8 80AD9568 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005DC 80AD956C AFBF0014 */ sw $ra, 0x0014($sp) -/* 005E0 80AD9570 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 005E4 80AD9574 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005E8 80AD9578 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 005EC 80AD957C AFA70018 */ sw $a3, 0x0018($sp) -/* 005F0 80AD9580 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005F4 80AD9584 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 005F8 80AD9588 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 005FC 80AD958C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00600 80AD9590 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00604 80AD9594 3C0A80AE */ lui $t2, %hi(func_80ADA9E8) ## $t2 = 80AE0000 -/* 00608 80AD9598 84EE008A */ lh $t6, 0x008A($a3) ## 0000008A -/* 0060C 80AD959C 90F80194 */ lbu $t8, 0x0194($a3) ## 00000194 -/* 00610 80AD95A0 254AA9E8 */ addiu $t2, $t2, %lo(func_80ADA9E8) ## $t2 = 80ADA9E8 -/* 00614 80AD95A4 01C17821 */ addu $t7, $t6, $at -/* 00618 80AD95A8 13000006 */ beq $t8, $zero, .L80AD95C4 -/* 0061C 80AD95AC A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 -/* 00620 80AD95B0 90E802BD */ lbu $t0, 0x02BD($a3) ## 000002BD -/* 00624 80AD95B4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 00628 80AD95B8 A0F902C0 */ sb $t9, 0x02C0($a3) ## 000002C0 -/* 0062C 80AD95BC 3109FFFB */ andi $t1, $t0, 0xFFFB ## $t1 = 00000000 -/* 00630 80AD95C0 A0E902BD */ sb $t1, 0x02BD($a3) ## 000002BD -.L80AD95C4: -/* 00634 80AD95C4 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 00638 80AD95C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0063C 80AD95CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00640 80AD95D0 03E00008 */ jr $ra -/* 00644 80AD95D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s deleted file mode 100644 index 1d33245ed4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80AD95D8 -/* 00648 80AD95D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0064C 80AD95DC AFB00020 */ sw $s0, 0x0020($sp) -/* 00650 80AD95E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00654 80AD95E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00658 80AD95E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0065C 80AD95EC 24A508C0 */ addiu $a1, $a1, 0x08C0 ## $a1 = 060008C0 -/* 00660 80AD95F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00664 80AD95F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 00668 80AD95F8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 0066C 80AD95FC 8E0502B4 */ lw $a1, 0x02B4($s0) ## 000002B4 -/* 00670 80AD9600 50A00011 */ beql $a1, $zero, .L80AD9648 -/* 00674 80AD9604 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 -/* 00678 80AD9608 8E0E02E8 */ lw $t6, 0x02E8($s0) ## 000002E8 -/* 0067C 80AD960C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00680 80AD9610 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 -/* 00684 80AD9614 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 00688 80AD9618 01E1C024 */ and $t8, $t7, $at -/* 0068C 80AD961C 13000004 */ beq $t8, $zero, .L80AD9630 -/* 00690 80AD9620 00000000 */ nop -/* 00694 80AD9624 84B90032 */ lh $t9, 0x0032($a1) ## 00000032 -/* 00698 80AD9628 10000006 */ beq $zero, $zero, .L80AD9644 -/* 0069C 80AD962C A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -.L80AD9630: -/* 006A0 80AD9630 0C00B69E */ jal func_8002DA78 -/* 006A4 80AD9634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006A8 80AD9638 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 006AC 80AD963C 00414021 */ addu $t0, $v0, $at -/* 006B0 80AD9640 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -.L80AD9644: -/* 006B4 80AD9644 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 -.L80AD9648: -/* 006B8 80AD9648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006BC 80AD964C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 006C0 80AD9650 11200005 */ beq $t1, $zero, .L80AD9668 -/* 006C4 80AD9654 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 006C8 80AD9658 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 006CC 80AD965C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 006D0 80AD9660 00000000 */ nop -/* 006D4 80AD9664 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L80AD9668: -/* 006D8 80AD9668 920A0199 */ lbu $t2, 0x0199($s0) ## 00000199 -/* 006DC 80AD966C 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 -/* 006E0 80AD9670 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 006E4 80AD9674 314BFFF4 */ andi $t3, $t2, 0xFFF4 ## $t3 = 00000000 -/* 006E8 80AD9678 A20B0199 */ sb $t3, 0x0199($s0) ## 00000199 -/* 006EC 80AD967C 0C00D09B */ jal func_8003426C -/* 006F0 80AD9680 AFAC0010 */ sw $t4, 0x0010($sp) -/* 006F4 80AD9684 3C0D80AE */ lui $t5, %hi(func_80ADAAA4) ## $t5 = 80AE0000 -/* 006F8 80AD9688 25ADAAA4 */ addiu $t5, $t5, %lo(func_80ADAAA4) ## $t5 = 80ADAAA4 -/* 006FC 80AD968C AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 00700 80AD9690 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00704 80AD9694 8FB00020 */ lw $s0, 0x0020($sp) -/* 00708 80AD9698 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0070C 80AD969C 03E00008 */ jr $ra -/* 00710 80AD96A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s deleted file mode 100644 index e51945a51f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AD96A4 -/* 00714 80AD96A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00718 80AD96A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0071C 80AD96AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00720 80AD96B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00724 80AD96B4 24A50A54 */ addiu $a1, $a1, 0x0A54 ## $a1 = 06000A54 -/* 00728 80AD96B8 AFA70018 */ sw $a3, 0x0018($sp) -/* 0072C 80AD96BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00730 80AD96C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00734 80AD96C4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00738 80AD96C8 8FA70018 */ lw $a3, 0x0018($sp) -/* 0073C 80AD96CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00740 80AD96D0 3C0980AE */ lui $t1, %hi(func_80ADAC70) ## $t1 = 80AE0000 -/* 00744 80AD96D4 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 -/* 00748 80AD96D8 90F90199 */ lbu $t9, 0x0199($a3) ## 00000199 -/* 0074C 80AD96DC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00750 80AD96E0 01C17821 */ addu $t7, $t6, $at -/* 00754 80AD96E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00758 80AD96E8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0075C 80AD96EC 2529AC70 */ addiu $t1, $t1, %lo(func_80ADAC70) ## $t1 = 80ADAC70 -/* 00760 80AD96F0 3728000B */ ori $t0, $t9, 0x000B ## $t0 = 0000000B -/* 00764 80AD96F4 A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 -/* 00768 80AD96F8 A4F8019A */ sh $t8, 0x019A($a3) ## 0000019A -/* 0076C 80AD96FC A0E80199 */ sb $t0, 0x0199($a3) ## 00000199 -/* 00770 80AD9700 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 -/* 00774 80AD9704 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00778 80AD9708 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0077C 80AD970C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00780 80AD9710 03E00008 */ jr $ra -/* 00784 80AD9714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s deleted file mode 100644 index 0958a7455b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80AD9718 -/* 00788 80AD9718 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0078C 80AD971C AFB00028 */ sw $s0, 0x0028($sp) -/* 00790 80AD9720 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00794 80AD9724 AFBF002C */ sw $ra, 0x002C($sp) -/* 00798 80AD9728 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0079C 80AD972C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 007A0 80AD9730 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C -/* 007A4 80AD9734 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 007A8 80AD9738 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 007AC 80AD973C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 007B0 80AD9740 468021A0 */ cvt.s.w $f6, $f4 -/* 007B4 80AD9744 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 007B8 80AD9748 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 007BC 80AD974C AFAE0014 */ sw $t6, 0x0014($sp) -/* 007C0 80AD9750 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C -/* 007C4 80AD9754 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 007C8 80AD9758 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 007CC 80AD975C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 007D0 80AD9760 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007D4 80AD9764 0C029468 */ jal SkelAnime_ChangeAnim - -/* 007D8 80AD9768 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 007DC 80AD976C 92190199 */ lbu $t9, 0x0199($s0) ## 00000199 -/* 007E0 80AD9770 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 007E4 80AD9774 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 007E8 80AD9778 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 007EC 80AD977C 3328FFFA */ andi $t0, $t9, 0xFFFA ## $t0 = 00000000 -/* 007F0 80AD9780 A60F019C */ sh $t7, 0x019C($s0) ## 0000019C -/* 007F4 80AD9784 A2080199 */ sb $t0, 0x0199($s0) ## 00000199 -/* 007F8 80AD9788 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007FC 80AD978C 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 -/* 00800 80AD9790 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00804 80AD9794 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00808 80AD9798 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 0080C 80AD979C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00810 80AD97A0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00814 80AD97A4 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -/* 00818 80AD97A8 3C0980AE */ lui $t1, %hi(func_80ADAD54) ## $t1 = 80AE0000 -/* 0081C 80AD97AC 2529AD54 */ addiu $t1, $t1, %lo(func_80ADAD54) ## $t1 = 80ADAD54 -/* 00820 80AD97B0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 00824 80AD97B4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00828 80AD97B8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0082C 80AD97BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00830 80AD97C0 03E00008 */ jr $ra -/* 00834 80AD97C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s deleted file mode 100644 index 417e7be05e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80AD97C8 -/* 00838 80AD97C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0083C 80AD97CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00840 80AD97D0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00844 80AD97D4 AFB00014 */ sw $s0, 0x0014($sp) -/* 00848 80AD97D8 90820195 */ lbu $v0, 0x0195($a0) ## 00000195 -/* 0084C 80AD97DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00850 80AD97E0 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 -/* 00854 80AD97E4 50400007 */ beql $v0, $zero, .L80AD9804 -/* 00858 80AD97E8 82380843 */ lb $t8, 0x0843($s1) ## 00000843 -/* 0085C 80AD97EC 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 00860 80AD97F0 3C0E80AE */ lui $t6, %hi(func_80ADAAA4) ## $t6 = 80AE0000 -/* 00864 80AD97F4 25CEAAA4 */ addiu $t6, $t6, %lo(func_80ADAAA4) ## $t6 = 80ADAAA4 -/* 00868 80AD97F8 11CF001E */ beq $t6, $t7, .L80AD9874 -/* 0086C 80AD97FC 00000000 */ nop -/* 00870 80AD9800 82380843 */ lb $t8, 0x0843($s1) ## 00000843 -.L80AD9804: -/* 00874 80AD9804 53000006 */ beql $t8, $zero, .L80AD9820 -/* 00878 80AD9808 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 0087C 80AD980C 82390842 */ lb $t9, 0x0842($s1) ## 00000842 -/* 00880 80AD9810 2B210018 */ slti $at, $t9, 0x0018 -/* 00884 80AD9814 54200011 */ bnel $at, $zero, .L80AD985C -/* 00888 80AD9818 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 0088C 80AD981C C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -.L80AD9820: -/* 00890 80AD9820 C6260080 */ lwc1 $f6, 0x0080($s1) ## 00000080 -/* 00894 80AD9824 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00898 80AD9828 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 0089C 80AD982C 46062201 */ sub.s $f8, $f4, $f6 -/* 008A0 80AD9830 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 008A4 80AD9834 3C0542DC */ lui $a1, 0x42DC ## $a1 = 42DC0000 -/* 008A8 80AD9838 460A403C */ c.lt.s $f8, $f10 -/* 008AC 80AD983C 00000000 */ nop -/* 008B0 80AD9840 45020006 */ bc1fl .L80AD985C -/* 008B4 80AD9844 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 008B8 80AD9848 0C01DE80 */ jal Math_ApproxF - -/* 008BC 80AD984C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 008C0 80AD9850 10000006 */ beq $zero, $zero, .L80AD986C -/* 008C4 80AD9854 C6100294 */ lwc1 $f16, 0x0294($s0) ## 00000294 -/* 008C8 80AD9858 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -.L80AD985C: -/* 008CC 80AD985C 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 -/* 008D0 80AD9860 0C01DE80 */ jal Math_ApproxF - -/* 008D4 80AD9864 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 008D8 80AD9868 C6100294 */ lwc1 $f16, 0x0294($s0) ## 00000294 -.L80AD986C: -/* 008DC 80AD986C 10000006 */ beq $zero, $zero, .L80AD9888 -/* 008E0 80AD9870 E7B00020 */ swc1 $f16, 0x0020($sp) -.L80AD9874: -/* 008E4 80AD9874 50400005 */ beql $v0, $zero, .L80AD988C -/* 008E8 80AD9878 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 008EC 80AD987C 8E080118 */ lw $t0, 0x0118($s0) ## 00000118 -/* 008F0 80AD9880 C5120090 */ lwc1 $f18, 0x0090($t0) ## 00000090 -/* 008F4 80AD9884 E7B20020 */ swc1 $f18, 0x0020($sp) -.L80AD9888: -/* 008F8 80AD9888 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -.L80AD988C: -/* 008FC 80AD988C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00900 80AD9890 00812021 */ addu $a0, $a0, $at -/* 00904 80AD9894 00042400 */ sll $a0, $a0, 16 -/* 00908 80AD9898 0C01DE1C */ jal Math_Sins - ## sins? -/* 0090C 80AD989C 00042403 */ sra $a0, $a0, 16 -/* 00910 80AD98A0 C7A40020 */ lwc1 $f4, 0x0020($sp) -/* 00914 80AD98A4 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 00918 80AD98A8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0091C 80AD98AC 46040182 */ mul.s $f6, $f0, $f4 -/* 00920 80AD98B0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00924 80AD98B4 00812021 */ addu $a0, $a0, $at -/* 00928 80AD98B8 00042400 */ sll $a0, $a0, 16 -/* 0092C 80AD98BC 00042403 */ sra $a0, $a0, 16 -/* 00930 80AD98C0 46083280 */ add.s $f10, $f6, $f8 -/* 00934 80AD98C4 0C01DE0D */ jal Math_Coss - ## coss? -/* 00938 80AD98C8 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 0093C 80AD98CC C7B00020 */ lwc1 $f16, 0x0020($sp) -/* 00940 80AD98D0 C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C -/* 00944 80AD98D4 46100482 */ mul.s $f18, $f0, $f16 -/* 00948 80AD98D8 46049180 */ add.s $f6, $f18, $f4 -/* 0094C 80AD98DC E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 00950 80AD98E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00954 80AD98E4 8FB10018 */ lw $s1, 0x0018($sp) -/* 00958 80AD98E8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0095C 80AD98EC 03E00008 */ jr $ra -/* 00960 80AD98F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s deleted file mode 100644 index 57bc80e32c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_80AD98F4 -/* 00964 80AD98F4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00968 80AD98F8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0096C 80AD98FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00970 80AD9900 AFBF002C */ sw $ra, 0x002C($sp) -/* 00974 80AD9904 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00978 80AD9908 AFA50034 */ sw $a1, 0x0034($sp) -/* 0097C 80AD990C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00980 80AD9910 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C -/* 00984 80AD9914 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00988 80AD9918 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 0098C 80AD991C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00990 80AD9920 468021A0 */ cvt.s.w $f6, $f4 -/* 00994 80AD9924 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00998 80AD9928 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0099C 80AD992C AFAE0014 */ sw $t6, 0x0014($sp) -/* 009A0 80AD9930 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C -/* 009A4 80AD9934 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 009A8 80AD9938 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 009AC 80AD993C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 009B0 80AD9940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 009B4 80AD9944 0C029468 */ jal SkelAnime_ChangeAnim - -/* 009B8 80AD9948 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 009BC 80AD994C 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 -/* 009C0 80AD9950 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 009C4 80AD9954 55E0000C */ bnel $t7, $zero, .L80AD9988 -/* 009C8 80AD9958 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 009CC 80AD995C 44815000 */ mtc1 $at, $f10 ## $f10 = 110.00 -/* 009D0 80AD9960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009D4 80AD9964 E60A0294 */ swc1 $f10, 0x0294($s0) ## 00000294 -/* 009D8 80AD9968 0C2B65F2 */ jal func_80AD97C8 -/* 009DC 80AD996C 8FA50034 */ lw $a1, 0x0034($sp) -/* 009E0 80AD9970 3C1880AE */ lui $t8, %hi(EnPoSisters_Draw) ## $t8 = 80AE0000 -/* 009E4 80AD9974 2718D044 */ addiu $t8, $t8, %lo(EnPoSisters_Draw) ## $t8 = 80ADD044 -/* 009E8 80AD9978 A2000231 */ sb $zero, 0x0231($s0) ## 00000231 -/* 009EC 80AD997C 10000003 */ beq $zero, $zero, .L80AD998C -/* 009F0 80AD9980 AE180134 */ sw $t8, 0x0134($s0) ## 00000134 -/* 009F4 80AD9984 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -.L80AD9988: -/* 009F8 80AD9988 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -.L80AD998C: -/* 009FC 80AD998C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00A00 80AD9990 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F -/* 00A04 80AD9994 A608019A */ sh $t0, 0x019A($s0) ## 0000019A -/* 00A08 80AD9998 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A0C 80AD999C 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 00A10 80AD99A0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A14 80AD99A4 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00A18 80AD99A8 92090199 */ lbu $t1, 0x0199($s0) ## 00000199 -/* 00A1C 80AD99AC 3C0B80AE */ lui $t3, %hi(func_80ADAE6C) ## $t3 = 80AE0000 -/* 00A20 80AD99B0 256BAE6C */ addiu $t3, $t3, %lo(func_80ADAE6C) ## $t3 = 80ADAE6C -/* 00A24 80AD99B4 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 -/* 00A28 80AD99B8 A20A0199 */ sb $t2, 0x0199($s0) ## 00000199 -/* 00A2C 80AD99BC AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00A30 80AD99C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A34 80AD99C4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00A38 80AD99C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A3C 80AD99CC 03E00008 */ jr $ra -/* 00A40 80AD99D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s deleted file mode 100644 index 635275da80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s +++ /dev/null @@ -1,38 +0,0 @@ -.late_rodata -glabel D_80ADD88C - .word 0xC5BB8000 - -.text -glabel func_80AD99D4 -/* 00A44 80AD99D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A48 80AD99D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00A4C 80AD99DC AFA50024 */ sw $a1, 0x0024($sp) -/* 00A50 80AD99E0 3C014228 */ lui $at, 0x4228 ## $at = 42280000 -/* 00A54 80AD99E4 44814000 */ mtc1 $at, $f8 ## $f8 = 42.00 -/* 00A58 80AD99E8 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00A5C 80AD99EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00A60 80AD99F0 A480019A */ sh $zero, 0x019A($a0) ## 0000019A -/* 00A64 80AD99F4 46083280 */ add.s $f10, $f6, $f8 -/* 00A68 80AD99F8 3C0180AE */ lui $at, %hi(D_80ADD88C) ## $at = 80AE0000 -/* 00A6C 80AD99FC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00A70 80AD9A00 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00A74 80AD9A04 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 -/* 00A78 80AD9A08 C430D88C */ lwc1 $f16, %lo(D_80ADD88C)($at) -/* 00A7C 80AD9A0C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00A80 80AD9A10 3C1880AE */ lui $t8, %hi(func_80ADAFC0) ## $t8 = 80AE0000 -/* 00A84 80AD9A14 2718AFC0 */ addiu $t8, $t8, %lo(func_80ADAFC0) ## $t8 = 80ADAFC0 -/* 00A88 80AD9A18 01C17824 */ and $t7, $t6, $at -/* 00A8C 80AD9A1C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00A90 80AD9A20 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00A94 80AD9A24 A0800199 */ sb $zero, 0x0199($a0) ## 00000199 -/* 00A98 80AD9A28 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -/* 00A9C 80AD9A2C E49000BC */ swc1 $f16, 0x00BC($a0) ## 000000BC -/* 00AA0 80AD9A30 AFA00010 */ sw $zero, 0x0010($sp) -/* 00AA4 80AD9A34 8FA40024 */ lw $a0, 0x0024($sp) -/* 00AA8 80AD9A38 24050C76 */ addiu $a1, $zero, 0x0C76 ## $a1 = 00000C76 -/* 00AAC 80AD9A3C 0C02003E */ jal func_800800F8 -/* 00AB0 80AD9A40 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 -/* 00AB4 80AD9A44 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AB8 80AD9A48 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00ABC 80AD9A4C 03E00008 */ jr $ra -/* 00AC0 80AD9A50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s deleted file mode 100644 index d82f13d5d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AD9A54 -/* 00AC4 80AD9A54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AC8 80AD9A58 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00ACC 80AD9A5C AFA40018 */ sw $a0, 0x0018($sp) -/* 00AD0 80AD9A60 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AD4 80AD9A64 C4840238 */ lwc1 $f4, 0x0238($a0) ## 00000238 -/* 00AD8 80AD9A68 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00ADC 80AD9A6C A480019A */ sh $zero, 0x019A($a0) ## 0000019A -/* 00AE0 80AD9A70 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 -/* 00AE4 80AD9A74 AFA50018 */ sw $a1, 0x0018($sp) -/* 00AE8 80AD9A78 8FA4001C */ lw $a0, 0x001C($sp) -/* 00AEC 80AD9A7C 24A60024 */ addiu $a2, $a1, 0x0024 ## $a2 = 00000024 -/* 00AF0 80AD9A80 0C007E50 */ jal Item_DropCollectibleRandom - -/* 00AF4 80AD9A84 24070080 */ addiu $a3, $zero, 0x0080 ## $a3 = 00000080 -/* 00AF8 80AD9A88 8FA50018 */ lw $a1, 0x0018($sp) -/* 00AFC 80AD9A8C 3C0E80AE */ lui $t6, %hi(func_80ADB17C) ## $t6 = 80AE0000 -/* 00B00 80AD9A90 25CEB17C */ addiu $t6, $t6, %lo(func_80ADB17C) ## $t6 = 80ADB17C -/* 00B04 80AD9A94 ACAE0190 */ sw $t6, 0x0190($a1) ## 00000190 -/* 00B08 80AD9A98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B0C 80AD9A9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B10 80AD9AA0 03E00008 */ jr $ra -/* 00B14 80AD9AA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s deleted file mode 100644 index 6d5a6db607..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s +++ /dev/null @@ -1,109 +0,0 @@ -glabel func_80AD9AA8 -/* 00B18 80AD9AA8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00B1C 80AD9AAC AFB00030 */ sw $s0, 0x0030($sp) -/* 00B20 80AD9AB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B24 80AD9AB4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00B28 80AD9AB8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00B2C 80AD9ABC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00B30 80AD9AC0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00B34 80AD9AC4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00B38 80AD9AC8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00B3C 80AD9ACC 240E0400 */ addiu $t6, $zero, 0x0400 ## $t6 = 00000400 -/* 00B40 80AD9AD0 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00B44 80AD9AD4 AFA50054 */ sw $a1, 0x0054($sp) -/* 00B48 80AD9AD8 AFA40038 */ sw $a0, 0x0038($sp) -/* 00B4C 80AD9ADC AFA00020 */ sw $zero, 0x0020($sp) -/* 00B50 80AD9AE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B54 80AD9AE4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00B58 80AD9AE8 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 -/* 00B5C 80AD9AEC 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00B60 80AD9AF0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00B64 80AD9AF4 AFA2004C */ sw $v0, 0x004C($sp) -/* 00B68 80AD9AF8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00B6C 80AD9AFC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00B70 80AD9B00 240F0800 */ addiu $t7, $zero, 0x0800 ## $t7 = 00000800 -/* 00B74 80AD9B04 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00B78 80AD9B08 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00B7C 80AD9B0C AFAF0024 */ sw $t7, 0x0024($sp) -/* 00B80 80AD9B10 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B84 80AD9B14 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B88 80AD9B18 AFA00018 */ sw $zero, 0x0018($sp) -/* 00B8C 80AD9B1C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00B90 80AD9B20 8FA50054 */ lw $a1, 0x0054($sp) -/* 00B94 80AD9B24 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 -/* 00B98 80AD9B28 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00B9C 80AD9B2C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00BA0 80AD9B30 AFA20048 */ sw $v0, 0x0048($sp) -/* 00BA4 80AD9B34 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00BA8 80AD9B38 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00BAC 80AD9B3C 24180C00 */ addiu $t8, $zero, 0x0C00 ## $t8 = 00000C00 -/* 00BB0 80AD9B40 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00BB4 80AD9B44 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00BB8 80AD9B48 AFB80024 */ sw $t8, 0x0024($sp) -/* 00BBC 80AD9B4C AFA00020 */ sw $zero, 0x0020($sp) -/* 00BC0 80AD9B50 AFA0001C */ sw $zero, 0x001C($sp) -/* 00BC4 80AD9B54 AFA00018 */ sw $zero, 0x0018($sp) -/* 00BC8 80AD9B58 8FA40038 */ lw $a0, 0x0038($sp) -/* 00BCC 80AD9B5C 8FA50054 */ lw $a1, 0x0054($sp) -/* 00BD0 80AD9B60 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 -/* 00BD4 80AD9B64 0C00C7D4 */ jal Actor_Spawn - ## ActorSpawn -/* 00BD8 80AD9B68 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00BDC 80AD9B6C 8FA7004C */ lw $a3, 0x004C($sp) -/* 00BE0 80AD9B70 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 00BE4 80AD9B74 8FB90048 */ lw $t9, 0x0048($sp) -/* 00BE8 80AD9B78 10E00005 */ beq $a3, $zero, .L80AD9B90 -/* 00BEC 80AD9B7C 00000000 */ nop -/* 00BF0 80AD9B80 13200003 */ beq $t9, $zero, .L80AD9B90 -/* 00BF4 80AD9B84 00000000 */ nop -/* 00BF8 80AD9B88 14400014 */ bne $v0, $zero, .L80AD9BDC -/* 00BFC 80AD9B8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -.L80AD9B90: -/* 00C00 80AD9B90 10E00004 */ beq $a3, $zero, .L80AD9BA4 -/* 00C04 80AD9B94 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00C08 80AD9B98 0C00B55C */ jal Actor_Kill - -/* 00C0C 80AD9B9C AFA60044 */ sw $a2, 0x0044($sp) -/* 00C10 80AD9BA0 8FA60044 */ lw $a2, 0x0044($sp) -.L80AD9BA4: -/* 00C14 80AD9BA4 8FA80048 */ lw $t0, 0x0048($sp) -/* 00C18 80AD9BA8 11000004 */ beq $t0, $zero, .L80AD9BBC -/* 00C1C 80AD9BAC 01002025 */ or $a0, $t0, $zero ## $a0 = 00000000 -/* 00C20 80AD9BB0 0C00B55C */ jal Actor_Kill - -/* 00C24 80AD9BB4 AFA60044 */ sw $a2, 0x0044($sp) -/* 00C28 80AD9BB8 8FA60044 */ lw $a2, 0x0044($sp) -.L80AD9BBC: -/* 00C2C 80AD9BBC 10C00003 */ beq $a2, $zero, .L80AD9BCC -/* 00C30 80AD9BC0 00000000 */ nop -/* 00C34 80AD9BC4 0C00B55C */ jal Actor_Kill - -/* 00C38 80AD9BC8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -.L80AD9BCC: -/* 00C3C 80AD9BCC 0C00B55C */ jal Actor_Kill - -/* 00C40 80AD9BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AD9BD4 1000000F */ beq $zero, $zero, .L80AD9C14 -/* 00C48 80AD9BD8 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AD9BDC: -/* 00C4C 80AD9BDC ACD00118 */ sw $s0, 0x0118($a2) ## 00000118 -/* 00C50 80AD9BE0 8FA90048 */ lw $t1, 0x0048($sp) -/* 00C54 80AD9BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C58 80AD9BE8 24A50680 */ addiu $a1, $a1, 0x0680 ## $a1 = 06000680 -/* 00C5C 80AD9BEC AD300118 */ sw $s0, 0x0118($t1) ## 00000118 -/* 00C60 80AD9BF0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00C64 80AD9BF4 ACF00118 */ sw $s0, 0x0118($a3) ## 00000118 -/* 00C68 80AD9BF8 3C0B80AE */ lui $t3, %hi(func_80ADB2B8) ## $t3 = 80AE0000 -/* 00C6C 80AD9BFC 240A00A0 */ addiu $t2, $zero, 0x00A0 ## $t2 = 000000A0 -/* 00C70 80AD9C00 256BB2B8 */ addiu $t3, $t3, %lo(func_80ADB2B8) ## $t3 = 80ADB2B8 -/* 00C74 80AD9C04 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 -/* 00C78 80AD9C08 A20A0199 */ sb $t2, 0x0199($s0) ## 00000199 -/* 00C7C 80AD9C0C AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00C80 80AD9C10 8FBF0034 */ lw $ra, 0x0034($sp) -.L80AD9C14: -/* 00C84 80AD9C14 8FB00030 */ lw $s0, 0x0030($sp) -/* 00C88 80AD9C18 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00C8C 80AD9C1C 03E00008 */ jr $ra -/* 00C90 80AD9C20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s deleted file mode 100644 index 9a16bc02df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80AD9C24 -/* 00C94 80AD9C24 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00C98 80AD9C28 AFBF004C */ sw $ra, 0x004C($sp) -/* 00C9C 80AD9C2C AFB00048 */ sw $s0, 0x0048($sp) -/* 00CA0 80AD9C30 AFA50064 */ sw $a1, 0x0064($sp) -/* 00CA4 80AD9C34 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00CA8 80AD9C38 908902BD */ lbu $t1, 0x02BD($a0) ## 000002BD -/* 00CAC 80AD9C3C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00CB0 80AD9C40 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 00CB4 80AD9C44 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 00CB8 80AD9C48 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 00CBC 80AD9C4C 01C17824 */ and $t7, $t6, $at -/* 00CC0 80AD9C50 312AFFFB */ andi $t2, $t1, 0xFFFB ## $t2 = 00000000 -/* 00CC4 80AD9C54 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 -/* 00CC8 80AD9C58 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 00CCC 80AD9C5C A498019C */ sh $t8, 0x019C($a0) ## 0000019C -/* 00CD0 80AD9C60 A0990199 */ sb $t9, 0x0199($a0) ## 00000199 -/* 00CD4 80AD9C64 A08802C0 */ sb $t0, 0x02C0($a0) ## 000002C0 -/* 00CD8 80AD9C68 A08A02BD */ sb $t2, 0x02BD($a0) ## 000002BD -/* 00CDC 80AD9C6C 8FAB0064 */ lw $t3, 0x0064($sp) -/* 00CE0 80AD9C70 3C0680AE */ lui $a2, %hi(D_80ADD790) ## $a2 = 80AE0000 -/* 00CE4 80AD9C74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CE8 80AD9C78 11600024 */ beq $t3, $zero, .L80AD9D0C -/* 00CEC 80AD9C7C 24C6D790 */ addiu $a2, $a2, %lo(D_80ADD790) ## $a2 = 80ADD790 -/* 00CF0 80AD9C80 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 00CF4 80AD9C84 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00CF8 80AD9C88 44814000 */ mtc1 $at, $f8 ## $f8 = 45.00 -/* 00CFC 80AD9C8C E7A40054 */ swc1 $f4, 0x0054($sp) -/* 00D00 80AD9C90 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00D04 80AD9C94 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 -/* 00D08 80AD9C98 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 00D0C 80AD9C9C 46083280 */ add.s $f10, $f6, $f8 -/* 00D10 80AD9CA0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00D14 80AD9CA4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00D18 80AD9CA8 2418009B */ addiu $t8, $zero, 0x009B ## $t8 = 0000009B -/* 00D1C 80AD9CAC E7AA0058 */ swc1 $f10, 0x0058($sp) -/* 00D20 80AD9CB0 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00D24 80AD9CB4 01602025 */ or $a0, $t3, $zero ## $a0 = 00000000 -/* 00D28 80AD9CB8 240B0009 */ addiu $t3, $zero, 0x0009 ## $t3 = 00000009 -/* 00D2C 80AD9CBC 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 -/* 00D30 80AD9CC0 24080096 */ addiu $t0, $zero, 0x0096 ## $t0 = 00000096 -/* 00D34 80AD9CC4 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 -/* 00D38 80AD9CC8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00D3C 80AD9CCC AFAA0034 */ sw $t2, 0x0034($sp) -/* 00D40 80AD9CD0 AFA90030 */ sw $t1, 0x0030($sp) -/* 00D44 80AD9CD4 AFA8002C */ sw $t0, 0x002C($sp) -/* 00D48 80AD9CD8 AFB90028 */ sw $t9, 0x0028($sp) -/* 00D4C 80AD9CDC AFAB0038 */ sw $t3, 0x0038($sp) -/* 00D50 80AD9CE0 AFA0003C */ sw $zero, 0x003C($sp) -/* 00D54 80AD9CE4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00D58 80AD9CE8 AFAF0020 */ sw $t7, 0x0020($sp) -/* 00D5C 80AD9CEC AFAE001C */ sw $t6, 0x001C($sp) -/* 00D60 80AD9CF0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00D64 80AD9CF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00D68 80AD9CF8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00D6C 80AD9CFC 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFF4 -/* 00D70 80AD9D00 00C03825 */ or $a3, $a2, $zero ## $a3 = 80ADD790 -/* 00D74 80AD9D04 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 00D78 80AD9D08 E7B0005C */ swc1 $f16, 0x005C($sp) -.L80AD9D0C: -/* 00D7C 80AD9D0C 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C -/* 00D80 80AD9D10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D84 80AD9D14 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D88 80AD9D18 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00D8C 80AD9D1C 0C01E796 */ jal Lights_PointSetColorAndRadius - -/* 00D90 80AD9D20 AFA00010 */ sw $zero, 0x0010($sp) -/* 00D94 80AD9D24 3C0C80AE */ lui $t4, %hi(func_80ADB338) ## $t4 = 80AE0000 -/* 00D98 80AD9D28 258CB338 */ addiu $t4, $t4, %lo(func_80ADB338) ## $t4 = 80ADB338 -/* 00D9C 80AD9D2C AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 00DA0 80AD9D30 8FBF004C */ lw $ra, 0x004C($sp) -/* 00DA4 80AD9D34 8FB00048 */ lw $s0, 0x0048($sp) -/* 00DA8 80AD9D38 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00DAC 80AD9D3C 03E00008 */ jr $ra -/* 00DB0 80AD9D40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s deleted file mode 100644 index f4896f8f7a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80AD9D44 -/* 00DB4 80AD9D44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00DB8 80AD9D48 AFBF002C */ sw $ra, 0x002C($sp) -/* 00DBC 80AD9D4C AFB00028 */ sw $s0, 0x0028($sp) -/* 00DC0 80AD9D50 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 -/* 00DC4 80AD9D54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DC8 80AD9D58 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00DCC 80AD9D5C 15C10009 */ bne $t6, $at, .L80AD9D84 -/* 00DD0 80AD9D60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00DD4 80AD9D64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DD8 80AD9D68 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00DDC 80AD9D6C 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C -/* 00DE0 80AD9D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DE4 80AD9D74 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00DE8 80AD9D78 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 00DEC 80AD9D7C 10000011 */ beq $zero, $zero, .L80AD9DC4 -/* 00DF0 80AD9D80 00000000 */ nop -.L80AD9D84: -/* 00DF4 80AD9D84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00DF8 80AD9D88 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00DFC 80AD9D8C 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C -/* 00E00 80AD9D90 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00E04 80AD9D94 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E08 80AD9D98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E0C 80AD9D9C 468021A0 */ cvt.s.w $f6, $f4 -/* 00E10 80AD9DA0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00E14 80AD9DA4 44070000 */ mfc1 $a3, $f0 -/* 00E18 80AD9DA8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E1C 80AD9DAC 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C -/* 00E20 80AD9DB0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E24 80AD9DB4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00E28 80AD9DB8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00E2C 80AD9DBC 0C029468 */ jal SkelAnime_ChangeAnim - -/* 00E30 80AD9DC0 E7A00018 */ swc1 $f0, 0x0018($sp) -.L80AD9DC4: -/* 00E34 80AD9DC4 3C1980AE */ lui $t9, %hi(func_80ADB9F0) ## $t9 = 80AE0000 -/* 00E38 80AD9DC8 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00E3C 80AD9DCC 2739B9F0 */ addiu $t9, $t9, %lo(func_80ADB9F0) ## $t9 = 80ADB9F0 -/* 00E40 80AD9DD0 A2000231 */ sb $zero, 0x0231($s0) ## 00000231 -/* 00E44 80AD9DD4 A2180199 */ sb $t8, 0x0199($s0) ## 00000199 -/* 00E48 80AD9DD8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 00E4C 80AD9DDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E50 80AD9DE0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E54 80AD9DE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00E58 80AD9DE8 03E00008 */ jr $ra -/* 00E5C 80AD9DEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s deleted file mode 100644 index 063a4e264e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80AD9DF0 -/* 00E60 80AD9DF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E64 80AD9DF4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E68 80AD9DF8 AFBF001C */ sw $ra, 0x001C($sp) -/* 00E6C 80AD9DFC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00E70 80AD9E00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E74 80AD9E04 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C -/* 00E78 80AD9E08 AFA70020 */ sw $a3, 0x0020($sp) -/* 00E7C 80AD9E0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E80 80AD9E10 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 00E84 80AD9E14 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00E88 80AD9E18 8FA70020 */ lw $a3, 0x0020($sp) -/* 00E8C 80AD9E1C 3C1980AE */ lui $t9, %hi(func_80ADB4B0) ## $t9 = 80AE0000 -/* 00E90 80AD9E20 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00E94 80AD9E24 90EF0199 */ lbu $t7, 0x0199($a3) ## 00000199 -/* 00E98 80AD9E28 2739B4B0 */ addiu $t9, $t9, %lo(func_80ADB4B0) ## $t9 = 80ADB4B0 -/* 00E9C 80AD9E2C A0EE0198 */ sb $t6, 0x0198($a3) ## 00000198 -/* 00EA0 80AD9E30 31F8FF7F */ andi $t8, $t7, 0xFF7F ## $t8 = 00000000 -/* 00EA4 80AD9E34 A0F80199 */ sb $t8, 0x0199($a3) ## 00000199 -/* 00EA8 80AD9E38 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 00EAC 80AD9E3C AFA00010 */ sw $zero, 0x0010($sp) -/* 00EB0 80AD9E40 8FA40024 */ lw $a0, 0x0024($sp) -/* 00EB4 80AD9E44 24050C6C */ addiu $a1, $zero, 0x0C6C ## $a1 = 00000C6C -/* 00EB8 80AD9E48 0C02003E */ jal func_800800F8 -/* 00EBC 80AD9E4C 2406009C */ addiu $a2, $zero, 0x009C ## $a2 = 0000009C -/* 00EC0 80AD9E50 8FBF001C */ lw $ra, 0x001C($sp) -/* 00EC4 80AD9E54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00EC8 80AD9E58 03E00008 */ jr $ra -/* 00ECC 80AD9E5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s deleted file mode 100644 index 95bb327af1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80AD9E60 -/* 00ED0 80AD9E60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00ED4 80AD9E64 AFB00018 */ sw $s0, 0x0018($sp) -/* 00ED8 80AD9E68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 80AD9E6C AFBF001C */ sw $ra, 0x001C($sp) -/* 00EE0 80AD9E70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00EE4 80AD9E74 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 00EE8 80AD9E78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00EEC 80AD9E7C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00EF0 80AD9E80 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00EF4 80AD9E84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00EF8 80AD9E88 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00EFC 80AD9E8C 24840D40 */ addiu $a0, $a0, 0x0D40 ## $a0 = 06000D40 -/* 00F00 80AD9E90 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -/* 00F04 80AD9E94 000270C0 */ sll $t6, $v0, 3 -/* 00F08 80AD9E98 01C27023 */ subu $t6, $t6, $v0 -/* 00F0C 80AD9E9C 25CF0007 */ addiu $t7, $t6, 0x0007 ## $t7 = 00000007 -/* 00F10 80AD9EA0 1060000B */ beq $v1, $zero, .L80AD9ED0 -/* 00F14 80AD9EA4 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 00F18 80AD9EA8 8C790024 */ lw $t9, 0x0024($v1) ## 00000024 -/* 00F1C 80AD9EAC 8E080118 */ lw $t0, 0x0118($s0) ## 00000118 -/* 00F20 80AD9EB0 AE190024 */ sw $t9, 0x0024($s0) ## 00000024 -/* 00F24 80AD9EB4 8C780028 */ lw $t8, 0x0028($v1) ## 00000028 -/* 00F28 80AD9EB8 AE180028 */ sw $t8, 0x0028($s0) ## 00000028 -/* 00F2C 80AD9EBC 8C79002C */ lw $t9, 0x002C($v1) ## 0000002C -/* 00F30 80AD9EC0 AE19002C */ sw $t9, 0x002C($s0) ## 0000002C -/* 00F34 80AD9EC4 850900B6 */ lh $t1, 0x00B6($t0) ## 000000B6 -/* 00F38 80AD9EC8 10000006 */ beq $zero, $zero, .L80AD9EE4 -/* 00F3C 80AD9ECC A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -.L80AD9ED0: -/* 00F40 80AD9ED0 860B019A */ lh $t3, 0x019A($s0) ## 0000019A -/* 00F44 80AD9ED4 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 00F48 80AD9ED8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00F4C 80AD9EDC A60C019A */ sh $t4, 0x019A($s0) ## 0000019A -/* 00F50 80AD9EE0 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -.L80AD9EE4: -/* 00F54 80AD9EE4 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 -/* 00F58 80AD9EE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F5C 80AD9EEC 15A00003 */ bne $t5, $zero, .L80AD9EFC -/* 00F60 80AD9EF0 00000000 */ nop -/* 00F64 80AD9EF4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00F68 80AD9EF8 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -.L80AD9EFC: -/* 00F6C 80AD9EFC 3C0E80AE */ lui $t6, %hi(func_80ADB51C) ## $t6 = 80AE0000 -/* 00F70 80AD9F00 25CEB51C */ addiu $t6, $t6, %lo(func_80ADB51C) ## $t6 = 80ADB51C -/* 00F74 80AD9F04 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00F78 80AD9F08 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F7C 80AD9F0C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F80 80AD9F10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F84 80AD9F14 03E00008 */ jr $ra -/* 00F88 80AD9F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s deleted file mode 100644 index 586ba920e7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80AD9F1C -/* 00F8C 80AD9F1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F90 80AD9F20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F94 80AD9F24 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00F98 80AD9F28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F9C 80AD9F2C 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 00FA0 80AD9F30 AFA70018 */ sw $a3, 0x0018($sp) -/* 00FA4 80AD9F34 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FA8 80AD9F38 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00FAC 80AD9F3C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00FB0 80AD9F40 8FA70018 */ lw $a3, 0x0018($sp) -/* 00FB4 80AD9F44 3C0B80AE */ lui $t3, %hi(func_80ADB770) ## $t3 = 80AE0000 -/* 00FB8 80AD9F48 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 00FBC 80AD9F4C 90F90199 */ lbu $t9, 0x0199($a3) ## 00000199 -/* 00FC0 80AD9F50 8CE90004 */ lw $t1, 0x0004($a3) ## 00000004 -/* 00FC4 80AD9F54 240F012C */ addiu $t7, $zero, 0x012C ## $t7 = 0000012C -/* 00FC8 80AD9F58 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00FCC 80AD9F5C 256BB770 */ addiu $t3, $t3, %lo(func_80ADB770) ## $t3 = 80ADB770 -/* 00FD0 80AD9F60 37280009 */ ori $t0, $t9, 0x0009 ## $t0 = 00000009 -/* 00FD4 80AD9F64 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 00FD8 80AD9F68 A0EE0231 */ sb $t6, 0x0231($a3) ## 00000231 -/* 00FDC 80AD9F6C A4EF019A */ sh $t7, 0x019A($a3) ## 0000019A -/* 00FE0 80AD9F70 A4F8019C */ sh $t8, 0x019C($a3) ## 0000019C -/* 00FE4 80AD9F74 A0E80199 */ sb $t0, 0x0199($a3) ## 00000199 -/* 00FE8 80AD9F78 ACEA0004 */ sw $t2, 0x0004($a3) ## 00000004 -/* 00FEC 80AD9F7C ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 00FF0 80AD9F80 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FF4 80AD9F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FF8 80AD9F88 03E00008 */ jr $ra -/* 00FFC 80AD9F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s deleted file mode 100644 index 243c09e455..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80AD9F90 -/* 01000 80AD9F90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01004 80AD9F94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01008 80AD9F98 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 -/* 0100C 80AD9F9C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01010 80AD9FA0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01014 80AD9FA4 15C10008 */ bne $t6, $at, .L80AD9FC8 -/* 01018 80AD9FA8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0101C 80AD9FAC 3C01C41E */ lui $at, 0xC41E ## $at = C41E0000 -/* 01020 80AD9FB0 44812000 */ mtc1 $at, $f4 ## $f4 = -632.00 -/* 01024 80AD9FB4 3C01C557 */ lui $at, 0xC557 ## $at = C5570000 -/* 01028 80AD9FB8 44813000 */ mtc1 $at, $f6 ## $f6 = -3440.00 -/* 0102C 80AD9FBC E4840008 */ swc1 $f4, 0x0008($a0) ## 00000008 -/* 01030 80AD9FC0 10000007 */ beq $zero, $zero, .L80AD9FE0 -/* 01034 80AD9FC4 E4860010 */ swc1 $f6, 0x0010($a0) ## 00000010 -.L80AD9FC8: -/* 01038 80AD9FC8 3C01443C */ lui $at, 0x443C ## $at = 443C0000 -/* 0103C 80AD9FCC 44814000 */ mtc1 $at, $f8 ## $f8 = 752.00 -/* 01040 80AD9FD0 3C01C557 */ lui $at, 0xC557 ## $at = C5570000 -/* 01044 80AD9FD4 44815000 */ mtc1 $at, $f10 ## $f10 = -3440.00 -/* 01048 80AD9FD8 E4C80008 */ swc1 $f8, 0x0008($a2) ## 00000008 -/* 0104C 80AD9FDC E4CA0010 */ swc1 $f10, 0x0010($a2) ## 00000010 -.L80AD9FE0: -/* 01050 80AD9FE0 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C -/* 01054 80AD9FE4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 01058 80AD9FE8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 0105C 80AD9FEC AFA60018 */ sw $a2, 0x0018($sp) -/* 01060 80AD9FF0 8FA60018 */ lw $a2, 0x0018($sp) -/* 01064 80AD9FF4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01068 80AD9FF8 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 0106C 80AD9FFC 90CF0199 */ lbu $t7, 0x0199($a2) ## 00000199 -/* 01070 80ADA000 3C1980AE */ lui $t9, %hi(func_80ADBB6C) ## $t9 = 80AE0000 -/* 01074 80ADA004 2739BB6C */ addiu $t9, $t9, %lo(func_80ADBB6C) ## $t9 = 80ADBB6C -/* 01078 80ADA008 35F8000A */ ori $t8, $t7, 0x000A ## $t8 = 0000000A -/* 0107C 80ADA00C A0D80199 */ sb $t8, 0x0199($a2) ## 00000199 -/* 01080 80ADA010 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 -/* 01084 80ADA014 E4D00068 */ swc1 $f16, 0x0068($a2) ## 00000068 -/* 01088 80ADA018 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0108C 80ADA01C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01090 80ADA020 03E00008 */ jr $ra -/* 01094 80ADA024 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s deleted file mode 100644 index be23912945..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80ADA028 -/* 01098 80ADA028 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0109C 80ADA02C AFBF0014 */ sw $ra, 0x0014($sp) -/* 010A0 80ADA030 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 010A4 80ADA034 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010A8 80ADA038 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 010AC 80ADA03C AFA70018 */ sw $a3, 0x0018($sp) -/* 010B0 80ADA040 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010B4 80ADA044 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 010B8 80ADA048 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 010BC 80ADA04C 8FA70018 */ lw $a3, 0x0018($sp) -/* 010C0 80ADA050 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 010C4 80ADA054 3C0980AE */ lui $t1, %hi(func_80ADBBF4) ## $t1 = 80AE0000 -/* 010C8 80ADA058 90EF0199 */ lbu $t7, 0x0199($a3) ## 00000199 -/* 010CC 80ADA05C 8CF90004 */ lw $t9, 0x0004($a3) ## 00000004 -/* 010D0 80ADA060 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 010D4 80ADA064 2529BBF4 */ addiu $t1, $t1, %lo(func_80ADBBF4) ## $t1 = 80ADBBF4 -/* 010D8 80ADA068 35F80015 */ ori $t8, $t7, 0x0015 ## $t8 = 00000015 -/* 010DC 80ADA06C 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 010E0 80ADA070 A0EE0231 */ sb $t6, 0x0231($a3) ## 00000231 -/* 010E4 80ADA074 A0F80199 */ sb $t8, 0x0199($a3) ## 00000199 -/* 010E8 80ADA078 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 -/* 010EC 80ADA07C ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 -/* 010F0 80ADA080 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 010F4 80ADA084 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010F8 80ADA088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010FC 80ADA08C 03E00008 */ jr $ra -/* 01100 80ADA090 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s deleted file mode 100644 index 5e3580fc30..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80ADA094 -/* 01104 80ADA094 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01108 80ADA098 3C0180AE */ lui $at, %hi(D_80ADD784) ## $at = 80AE0000 -/* 0110C 80ADA09C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01110 80ADA0A0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01114 80ADA0A4 AC20D784 */ sw $zero, %lo(D_80ADD784)($at) -/* 01118 80ADA0A8 8C990008 */ lw $t9, 0x0008($a0) ## 00000008 -/* 0111C 80ADA0AC 8C98000C */ lw $t8, 0x000C($a0) ## 0000000C -/* 01120 80ADA0B0 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 01124 80ADA0B4 AC990234 */ sw $t9, 0x0234($a0) ## 00000234 -/* 01128 80ADA0B8 8C990010 */ lw $t9, 0x0010($a0) ## 00000010 -/* 0112C 80ADA0BC 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 -/* 01130 80ADA0C0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01134 80ADA0C4 A0800231 */ sb $zero, 0x0231($a0) ## 00000231 -/* 01138 80ADA0C8 A08E0199 */ sb $t6, 0x0199($a0) ## 00000199 -/* 0113C 80ADA0CC A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 01140 80ADA0D0 AC980238 */ sw $t8, 0x0238($a0) ## 00000238 -/* 01144 80ADA0D4 AC99023C */ sw $t9, 0x023C($a0) ## 0000023C -/* 01148 80ADA0D8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0114C 80ADA0DC AFA60018 */ sw $a2, 0x0018($sp) -/* 01150 80ADA0E0 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 01154 80ADA0E4 0C00CDD2 */ jal Actor_ChangeType - -/* 01158 80ADA0E8 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 0115C 80ADA0EC 8FA60018 */ lw $a2, 0x0018($sp) -/* 01160 80ADA0F0 3C0980AE */ lui $t1, %hi(func_80ADBC88) ## $t1 = 80AE0000 -/* 01164 80ADA0F4 2529BC88 */ addiu $t1, $t1, %lo(func_80ADBC88) ## $t1 = 80ADBC88 -/* 01168 80ADA0F8 ACC90190 */ sw $t1, 0x0190($a2) ## 00000190 -/* 0116C 80ADA0FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01170 80ADA100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01174 80ADA104 03E00008 */ jr $ra -/* 01178 80ADA108 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s deleted file mode 100644 index dbb800c312..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80ADA10C -/* 0117C 80ADA10C 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 01180 80ADA110 A08E0198 */ sb $t6, 0x0198($a0) ## 00000198 -/* 01184 80ADA114 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01188 80ADA118 24850234 */ addiu $a1, $a0, 0x0234 ## $a1 = 00000234 -/* 0118C 80ADA11C 24860234 */ addiu $a2, $a0, 0x0234 ## $a2 = 00000234 -/* 01190 80ADA120 24870240 */ addiu $a3, $a0, 0x0240 ## $a3 = 00000240 -/* 01194 80ADA124 2488024C */ addiu $t0, $a0, 0x024C ## $t0 = 0000024C -/* 01198 80ADA128 24890258 */ addiu $t1, $a0, 0x0258 ## $t1 = 00000258 -/* 0119C 80ADA12C 24030008 */ addiu $v1, $zero, 0x0008 ## $v1 = 00000008 -.L80ADA130: -/* 011A0 80ADA130 8CD80000 */ lw $t8, 0x0000($a2) ## 00000234 -/* 011A4 80ADA134 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000004 -/* 011A8 80ADA138 24A50030 */ addiu $a1, $a1, 0x0030 ## $a1 = 00000264 -/* 011AC 80ADA13C ACB8FFD0 */ sw $t8, -0x0030($a1) ## 00000234 -/* 011B0 80ADA140 8CCF0004 */ lw $t7, 0x0004($a2) ## 00000238 -/* 011B4 80ADA144 24E70030 */ addiu $a3, $a3, 0x0030 ## $a3 = 00000270 -/* 011B8 80ADA148 25080030 */ addiu $t0, $t0, 0x0030 ## $t0 = 0000027C -/* 011BC 80ADA14C ACAFFFD4 */ sw $t7, -0x002C($a1) ## 00000238 -/* 011C0 80ADA150 8CD80008 */ lw $t8, 0x0008($a2) ## 0000023C -/* 011C4 80ADA154 25290030 */ addiu $t1, $t1, 0x0030 ## $t1 = 00000288 -/* 011C8 80ADA158 ACB8FFD8 */ sw $t8, -0x0028($a1) ## 0000023C -/* 011CC 80ADA15C 8CCA0000 */ lw $t2, 0x0000($a2) ## 00000234 -/* 011D0 80ADA160 ACEAFFD0 */ sw $t2, -0x0030($a3) ## 00000240 -/* 011D4 80ADA164 8CD90004 */ lw $t9, 0x0004($a2) ## 00000238 -/* 011D8 80ADA168 ACF9FFD4 */ sw $t9, -0x002C($a3) ## 00000244 -/* 011DC 80ADA16C 8CCA0008 */ lw $t2, 0x0008($a2) ## 0000023C -/* 011E0 80ADA170 ACEAFFD8 */ sw $t2, -0x0028($a3) ## 00000248 -/* 011E4 80ADA174 8CCC0000 */ lw $t4, 0x0000($a2) ## 00000234 -/* 011E8 80ADA178 AD0CFFD0 */ sw $t4, -0x0030($t0) ## 0000024C -/* 011EC 80ADA17C 8CCB0004 */ lw $t3, 0x0004($a2) ## 00000238 -/* 011F0 80ADA180 AD0BFFD4 */ sw $t3, -0x002C($t0) ## 00000250 -/* 011F4 80ADA184 8CCC0008 */ lw $t4, 0x0008($a2) ## 0000023C -/* 011F8 80ADA188 AD0CFFD8 */ sw $t4, -0x0028($t0) ## 00000254 -/* 011FC 80ADA18C 8CCE0000 */ lw $t6, 0x0000($a2) ## 00000234 -/* 01200 80ADA190 AD2EFFD0 */ sw $t6, -0x0030($t1) ## 00000258 -/* 01204 80ADA194 8CCD0004 */ lw $t5, 0x0004($a2) ## 00000238 -/* 01208 80ADA198 AD2DFFD4 */ sw $t5, -0x002C($t1) ## 0000025C -/* 0120C 80ADA19C 8CCE0008 */ lw $t6, 0x0008($a2) ## 0000023C -/* 01210 80ADA1A0 1443FFE3 */ bne $v0, $v1, .L80ADA130 -/* 01214 80ADA1A4 AD2EFFD8 */ sw $t6, -0x0028($t1) ## 00000260 -/* 01218 80ADA1A8 3C0F80AE */ lui $t7, %hi(func_80ADBD38) ## $t7 = 80AE0000 -/* 0121C 80ADA1AC 25EFBD38 */ addiu $t7, $t7, %lo(func_80ADBD38) ## $t7 = 80ADBD38 -/* 01220 80ADA1B0 03E00008 */ jr $ra -/* 01224 80ADA1B4 AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s deleted file mode 100644 index 6d16d0e089..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80ADA1B8 -/* 01228 80ADA1B8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0122C 80ADA1BC AFB00028 */ sw $s0, 0x0028($sp) -/* 01230 80ADA1C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01234 80ADA1C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01238 80ADA1C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0123C 80ADA1CC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01240 80ADA1D0 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C -/* 01244 80ADA1D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01248 80ADA1D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0124C 80ADA1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01250 80ADA1E0 468021A0 */ cvt.s.w $f6, $f4 -/* 01254 80ADA1E4 3C063F55 */ lui $a2, 0x3F55 ## $a2 = 3F550000 -/* 01258 80ADA1E8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 0125C 80ADA1EC 44070000 */ mfc1 $a3, $f0 -/* 01260 80ADA1F0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01264 80ADA1F4 34C63F7D */ ori $a2, $a2, 0x3F7D ## $a2 = 3F553F7D -/* 01268 80ADA1F8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0126C 80ADA1FC 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C -/* 01270 80ADA200 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01274 80ADA204 0C029468 */ jal SkelAnime_ChangeAnim - -/* 01278 80ADA208 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0127C 80ADA20C 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 -/* 01280 80ADA210 3C1980AE */ lui $t9, %hi(func_80ADBD8C) ## $t9 = 80AE0000 -/* 01284 80ADA214 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01288 80ADA218 10400003 */ beq $v0, $zero, .L80ADA228 -/* 0128C 80ADA21C 2739BD8C */ addiu $t9, $t9, %lo(func_80ADBD8C) ## $t9 = 80ADBD8C -/* 01290 80ADA220 14410004 */ bne $v0, $at, .L80ADA234 -/* 01294 80ADA224 2418004C */ addiu $t8, $zero, 0x004C ## $t8 = 0000004C -.L80ADA228: -/* 01298 80ADA228 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 0129C 80ADA22C 10000002 */ beq $zero, $zero, .L80ADA238 -/* 012A0 80ADA230 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -.L80ADA234: -/* 012A4 80ADA234 A618019A */ sh $t8, 0x019A($s0) ## 0000019A -.L80ADA238: -/* 012A8 80ADA238 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 -/* 012AC 80ADA23C 3C0180AE */ lui $at, %hi(D_80ADD784) ## $at = 80AE0000 -/* 012B0 80ADA240 AC20D784 */ sw $zero, %lo(D_80ADD784)($at) -/* 012B4 80ADA244 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 012B8 80ADA248 8FBF002C */ lw $ra, 0x002C($sp) -/* 012BC 80ADA24C 8FB00028 */ lw $s0, 0x0028($sp) -/* 012C0 80ADA250 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 012C4 80ADA254 03E00008 */ jr $ra -/* 012C8 80ADA258 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s deleted file mode 100644 index fe9bd6e2cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ADA25C -/* 012CC 80ADA25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D0 80ADA260 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012D4 80ADA264 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 012D8 80ADA268 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 012DC 80ADA26C 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 012E0 80ADA270 AFA70018 */ sw $a3, 0x0018($sp) -/* 012E4 80ADA274 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 012E8 80ADA278 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012EC 80ADA27C 8FA40018 */ lw $a0, 0x0018($sp) -/* 012F0 80ADA280 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 012F4 80ADA284 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 012F8 80ADA288 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 012FC 80ADA28C A08E0198 */ sb $t6, 0x0198($a0) ## 00000198 -/* 01300 80ADA290 8485019A */ lh $a1, 0x019A($a0) ## 0000019A -/* 01304 80ADA294 0C2B6490 */ jal func_80AD9240 -/* 01308 80ADA298 24860008 */ addiu $a2, $a0, 0x0008 ## $a2 = 00000008 -/* 0130C 80ADA29C 8FA70018 */ lw $a3, 0x0018($sp) -/* 01310 80ADA2A0 3C1880AE */ lui $t8, %hi(func_80ADBEE8) ## $t8 = 80AE0000 -/* 01314 80ADA2A4 2718BEE8 */ addiu $t8, $t8, %lo(func_80ADBEE8) ## $t8 = 80ADBEE8 -/* 01318 80ADA2A8 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 0131C 80ADA2AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01320 80ADA2B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01324 80ADA2B4 03E00008 */ jr $ra -/* 01328 80ADA2B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s deleted file mode 100644 index 22801e701b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_80ADA2BC -/* 0132C 80ADA2BC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01330 80ADA2C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01334 80ADA2C4 AFA50024 */ sw $a1, 0x0024($sp) -/* 01338 80ADA2C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0133C 80ADA2CC AFBF001C */ sw $ra, 0x001C($sp) -/* 01340 80ADA2D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01344 80ADA2D4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 01348 80ADA2D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0134C 80ADA2DC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 01350 80ADA2E0 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 01354 80ADA2E4 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 -/* 01358 80ADA2E8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 -/* 0135C 80ADA2EC 240F005A */ addiu $t7, $zero, 0x005A ## $t7 = 0000005A -/* 01360 80ADA2F0 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 01364 80ADA2F4 3C0880AE */ lui $t0, %hi(D_80ADD79C) ## $t0 = 80AE0000 -/* 01368 80ADA2F8 0002C840 */ sll $t9, $v0, 1 -/* 0136C 80ADA2FC A2000198 */ sb $zero, 0x0198($s0) ## 00000198 -/* 01370 80ADA300 A20E0199 */ sb $t6, 0x0199($s0) ## 00000199 -/* 01374 80ADA304 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 01378 80ADA308 A2180196 */ sb $t8, 0x0196($s0) ## 00000196 -/* 0137C 80ADA30C 01194021 */ addu $t0, $t0, $t9 -/* 01380 80ADA310 8508D79C */ lh $t0, %lo(D_80ADD79C)($t0) -/* 01384 80ADA314 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01388 80ADA318 2405001B */ addiu $a1, $zero, 0x001B ## $a1 = 0000001B -/* 0138C 80ADA31C A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 01390 80ADA320 14400003 */ bne $v0, $zero, .L80ADA330 -/* 01394 80ADA324 E604000C */ swc1 $f4, 0x000C($s0) ## 0000000C -/* 01398 80ADA328 0C00B2DD */ jal Flags_SetSwitch - -/* 0139C 80ADA32C 8FA40024 */ lw $a0, 0x0024($sp) -.L80ADA330: -/* 013A0 80ADA330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013A4 80ADA334 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 013A8 80ADA338 24052822 */ addiu $a1, $zero, 0x2822 ## $a1 = 00002822 -/* 013AC 80ADA33C 3C0980AE */ lui $t1, %hi(func_80ADBF58) ## $t1 = 80AE0000 -/* 013B0 80ADA340 2529BF58 */ addiu $t1, $t1, %lo(func_80ADBF58) ## $t1 = 80ADBF58 -/* 013B4 80ADA344 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 013B8 80ADA348 8FBF001C */ lw $ra, 0x001C($sp) -/* 013BC 80ADA34C 8FB00018 */ lw $s0, 0x0018($sp) -/* 013C0 80ADA350 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013C4 80ADA354 03E00008 */ jr $ra -/* 013C8 80ADA358 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s deleted file mode 100644 index 42e1c89da6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80ADA4A8 -/* 01518 80ADA4A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0151C 80ADA4AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01520 80ADA4B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01524 80ADA4B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01528 80ADA4B8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0152C 80ADA4BC AFA4001C */ sw $a0, 0x001C($sp) -/* 01530 80ADA4C0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01534 80ADA4C4 AFA60020 */ sw $a2, 0x0020($sp) -/* 01538 80ADA4C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0153C 80ADA4CC 0C0295B2 */ jal func_800A56C8 -/* 01540 80ADA4D0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01544 80ADA4D4 10400005 */ beq $v0, $zero, .L80ADA4EC -/* 01548 80ADA4D8 8FA60020 */ lw $a2, 0x0020($sp) -/* 0154C 80ADA4DC 84C2019A */ lh $v0, 0x019A($a2) ## 0000019A -/* 01550 80ADA4E0 10400002 */ beq $v0, $zero, .L80ADA4EC -/* 01554 80ADA4E4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01558 80ADA4E8 A4CE019A */ sh $t6, 0x019A($a2) ## 0000019A -.L80ADA4EC: -/* 0155C 80ADA4EC 84CF019A */ lh $t7, 0x019A($a2) ## 0000019A -/* 01560 80ADA4F0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 01564 80ADA4F4 11E00008 */ beq $t7, $zero, .L80ADA518 -/* 01568 80ADA4F8 00000000 */ nop -/* 0156C 80ADA4FC C4C40090 */ lwc1 $f4, 0x0090($a2) ## 00000090 -/* 01570 80ADA500 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 01574 80ADA504 00000000 */ nop -/* 01578 80ADA508 4606203C */ c.lt.s $f4, $f6 -/* 0157C 80ADA50C 00000000 */ nop -/* 01580 80ADA510 45020004 */ bc1fl .L80ADA524 -/* 01584 80ADA514 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADA518: -/* 01588 80ADA518 0C2B64F1 */ jal func_80AD93C4 -/* 0158C 80ADA51C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01590 80ADA520 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADA524: -/* 01594 80ADA524 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01598 80ADA528 03E00008 */ jr $ra -/* 0159C 80ADA52C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s deleted file mode 100644 index 4dcb1fe4b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s +++ /dev/null @@ -1,104 +0,0 @@ -glabel func_80ADA530 -/* 015A0 80ADA530 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 015A4 80ADA534 AFB00018 */ sw $s0, 0x0018($sp) -/* 015A8 80ADA538 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015AC 80ADA53C AFBF001C */ sw $ra, 0x001C($sp) -/* 015B0 80ADA540 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015B4 80ADA544 AFA50034 */ sw $a1, 0x0034($sp) -/* 015B8 80ADA548 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 015BC 80ADA54C AFA40028 */ sw $a0, 0x0028($sp) -/* 015C0 80ADA550 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 015C4 80ADA554 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 015C8 80ADA558 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 015CC 80ADA55C AFA40024 */ sw $a0, 0x0024($sp) -/* 015D0 80ADA560 0C01DE80 */ jal Math_ApproxF - -/* 015D4 80ADA564 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 015D8 80ADA568 8FA40028 */ lw $a0, 0x0028($sp) -/* 015DC 80ADA56C 0C0295B2 */ jal func_800A56C8 -/* 015E0 80ADA570 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 015E4 80ADA574 10400005 */ beq $v0, $zero, .L80ADA58C -/* 015E8 80ADA578 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 015EC 80ADA57C 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 015F0 80ADA580 10400002 */ beq $v0, $zero, .L80ADA58C -/* 015F4 80ADA584 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 015F8 80ADA588 A60E019A */ sh $t6, 0x019A($s0) ## 0000019A -.L80ADA58C: -/* 015FC 80ADA58C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 01600 80ADA590 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 01604 80ADA594 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01608 80ADA598 4606203C */ c.lt.s $f4, $f6 -/* 0160C 80ADA59C 00000000 */ nop -/* 01610 80ADA5A0 45020010 */ bc1fl .L80ADA5E4 -/* 01614 80ADA5A4 860F019A */ lh $t7, 0x019A($s0) ## 0000019A -/* 01618 80ADA5A8 C6080094 */ lwc1 $f8, 0x0094($s0) ## 00000094 -/* 0161C 80ADA5AC 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 01620 80ADA5B0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01624 80ADA5B4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 01628 80ADA5B8 460A4000 */ add.s $f0, $f8, $f10 -/* 0162C 80ADA5BC 46000005 */ abs.s $f0, $f0 -/* 01630 80ADA5C0 4610003C */ c.lt.s $f0, $f16 -/* 01634 80ADA5C4 00000000 */ nop -/* 01638 80ADA5C8 45020006 */ bc1fl .L80ADA5E4 -/* 0163C 80ADA5CC 860F019A */ lh $t7, 0x019A($s0) ## 0000019A -/* 01640 80ADA5D0 0C2B650F */ jal func_80AD943C -/* 01644 80ADA5D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01648 80ADA5D8 1000000D */ beq $zero, $zero, .L80ADA610 -/* 0164C 80ADA5DC 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 01650 80ADA5E0 860F019A */ lh $t7, 0x019A($s0) ## 0000019A -.L80ADA5E4: -/* 01654 80ADA5E4 8FA40024 */ lw $a0, 0x0024($sp) -/* 01658 80ADA5E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0165C 80ADA5EC 15E00007 */ bne $t7, $zero, .L80ADA60C -/* 01660 80ADA5F0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01664 80ADA5F4 0C01DE80 */ jal Math_ApproxF - -/* 01668 80ADA5F8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0166C 80ADA5FC 50400004 */ beql $v0, $zero, .L80ADA610 -/* 01670 80ADA600 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -/* 01674 80ADA604 0C2B64DA */ jal func_80AD9368 -/* 01678 80ADA608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADA60C: -/* 0167C 80ADA60C 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 -.L80ADA610: -/* 01680 80ADA610 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01684 80ADA614 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 01688 80ADA618 33190008 */ andi $t9, $t8, 0x0008 ## $t9 = 00000000 -/* 0168C 80ADA61C 1320000B */ beq $t9, $zero, .L80ADA64C -/* 01690 80ADA620 00000000 */ nop -/* 01694 80ADA624 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01698 80ADA628 0C00B6B0 */ jal func_8002DAC0 -/* 0169C 80ADA62C 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 016A0 80ADA630 00022C00 */ sll $a1, $v0, 16 -/* 016A4 80ADA634 00052C03 */ sra $a1, $a1, 16 -/* 016A8 80ADA638 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 016AC 80ADA63C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 016B0 80ADA640 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 016B4 80ADA644 10000012 */ beq $zero, $zero, .L80ADA690 -/* 016B8 80ADA648 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADA64C: -/* 016BC 80ADA64C 0C00B6EC */ jal func_8002DBB0 -/* 016C0 80ADA650 AFA50028 */ sw $a1, 0x0028($sp) -/* 016C4 80ADA654 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 016C8 80ADA658 44819000 */ mtc1 $at, $f18 ## $f18 = 300.00 -/* 016CC 80ADA65C 8FA50028 */ lw $a1, 0x0028($sp) -/* 016D0 80ADA660 4600903C */ c.lt.s $f18, $f0 -/* 016D4 80ADA664 00000000 */ nop -/* 016D8 80ADA668 45020009 */ bc1fl .L80ADA690 -/* 016DC 80ADA66C 8FBF001C */ lw $ra, 0x001C($sp) -/* 016E0 80ADA670 0C00B6B0 */ jal func_8002DAC0 -/* 016E4 80ADA674 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E8 80ADA678 00022C00 */ sll $a1, $v0, 16 -/* 016EC 80ADA67C 00052C03 */ sra $a1, $a1, 16 -/* 016F0 80ADA680 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 016F4 80ADA684 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 016F8 80ADA688 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 016FC 80ADA68C 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADA690: -/* 01700 80ADA690 8FB00018 */ lw $s0, 0x0018($sp) -/* 01704 80ADA694 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01708 80ADA698 03E00008 */ jr $ra -/* 0170C 80ADA69C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s deleted file mode 100644 index 924064364f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel func_80ADA6A0 -/* 01710 80ADA6A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01714 80ADA6A4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01718 80ADA6A8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0171C 80ADA6AC 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 01720 80ADA6B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01724 80ADA6B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01728 80ADA6B8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0172C 80ADA6BC AFAE0024 */ sw $t6, 0x0024($sp) -/* 01730 80ADA6C0 8FB80024 */ lw $t8, 0x0024($sp) -/* 01734 80ADA6C4 860F008A */ lh $t7, 0x008A($s0) ## 0000008A -/* 01738 80ADA6C8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0173C 80ADA6CC 871900B6 */ lh $t9, 0x00B6($t8) ## 000000B6 -/* 01740 80ADA6D0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01744 80ADA6D4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 01748 80ADA6D8 01F91023 */ subu $v0, $t7, $t9 -/* 0174C 80ADA6DC 00021400 */ sll $v0, $v0, 16 -/* 01750 80ADA6E0 00021403 */ sra $v0, $v0, 16 -/* 01754 80ADA6E4 A7A20022 */ sh $v0, 0x0022($sp) -/* 01758 80ADA6E8 0C01DE80 */ jal Math_ApproxF - -/* 0175C 80ADA6EC 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 -/* 01760 80ADA6F0 87A20022 */ lh $v0, 0x0022($sp) -/* 01764 80ADA6F4 28413001 */ slti $at, $v0, 0x3001 -/* 01768 80ADA6F8 5420000B */ bnel $at, $zero, .L80ADA728 -/* 0176C 80ADA6FC 2841D000 */ slti $at, $v0, 0xD000 -/* 01770 80ADA700 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01774 80ADA704 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01778 80ADA708 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 0177C 80ADA70C 24A53000 */ addiu $a1, $a1, 0x3000 ## $a1 = 00003000 -/* 01780 80ADA710 00052C00 */ sll $a1, $a1, 16 -/* 01784 80ADA714 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01788 80ADA718 00052C03 */ sra $a1, $a1, 16 -/* 0178C 80ADA71C 10000011 */ beq $zero, $zero, .L80ADA764 -/* 01790 80ADA720 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 01794 80ADA724 2841D000 */ slti $at, $v0, 0xD000 -.L80ADA728: -/* 01798 80ADA728 1020000A */ beq $at, $zero, .L80ADA754 -/* 0179C 80ADA72C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 017A0 80ADA730 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 017A4 80ADA734 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 017A8 80ADA738 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 017AC 80ADA73C 24A5D000 */ addiu $a1, $a1, 0xD000 ## $a1 = FFFFD000 -/* 017B0 80ADA740 00052C00 */ sll $a1, $a1, 16 -/* 017B4 80ADA744 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 017B8 80ADA748 00052C03 */ sra $a1, $a1, 16 -/* 017BC 80ADA74C 10000005 */ beq $zero, $zero, .L80ADA764 -/* 017C0 80ADA750 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -.L80ADA754: -/* 017C4 80ADA754 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 017C8 80ADA758 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 017CC 80ADA75C 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 017D0 80ADA760 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -.L80ADA764: -/* 017D4 80ADA764 44812000 */ mtc1 $at, $f4 ## $f4 = 160.00 -/* 017D8 80ADA768 C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 -/* 017DC 80ADA76C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 017E0 80ADA770 4604103C */ c.lt.s $f2, $f4 -/* 017E4 80ADA774 00000000 */ nop -/* 017E8 80ADA778 45020010 */ bc1fl .L80ADA7BC -/* 017EC 80ADA77C 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 017F0 80ADA780 C6060094 */ lwc1 $f6, 0x0094($s0) ## 00000094 -/* 017F4 80ADA784 44814000 */ mtc1 $at, $f8 ## $f8 = 240.00 -/* 017F8 80ADA788 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 017FC 80ADA78C 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 -/* 01800 80ADA790 46083000 */ add.s $f0, $f6, $f8 -/* 01804 80ADA794 46000005 */ abs.s $f0, $f0 -/* 01808 80ADA798 460A003C */ c.lt.s $f0, $f10 -/* 0180C 80ADA79C 00000000 */ nop -/* 01810 80ADA7A0 45020006 */ bc1fl .L80ADA7BC -/* 01814 80ADA7A4 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 01818 80ADA7A8 0C2B6513 */ jal func_80AD944C -/* 0181C 80ADA7AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01820 80ADA7B0 1000000B */ beq $zero, $zero, .L80ADA7E0 -/* 01824 80ADA7B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01828 80ADA7B8 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -.L80ADA7BC: -/* 0182C 80ADA7BC 44818000 */ mtc1 $at, $f16 ## $f16 = 240.00 -/* 01830 80ADA7C0 00000000 */ nop -/* 01834 80ADA7C4 4602803C */ c.lt.s $f16, $f2 -/* 01838 80ADA7C8 00000000 */ nop -/* 0183C 80ADA7CC 45020004 */ bc1fl .L80ADA7E0 -/* 01840 80ADA7D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01844 80ADA7D4 0C2B64F1 */ jal func_80AD93C4 -/* 01848 80ADA7D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0184C 80ADA7DC 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADA7E0: -/* 01850 80ADA7E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01854 80ADA7E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01858 80ADA7E8 03E00008 */ jr $ra -/* 0185C 80ADA7EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s deleted file mode 100644 index 77d2d92fac..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_80ADA7F0 -/* 01860 80ADA7F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01864 80ADA7F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01868 80ADA7F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0186C 80ADA7FC AFA5001C */ sw $a1, 0x001C($sp) -/* 01870 80ADA800 AFA60018 */ sw $a2, 0x0018($sp) -/* 01874 80ADA804 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01878 80ADA808 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0187C 80ADA80C 8FA60018 */ lw $a2, 0x0018($sp) -/* 01880 80ADA810 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01884 80ADA814 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 01888 80ADA818 84C2019A */ lh $v0, 0x019A($a2) ## 0000019A -/* 0188C 80ADA81C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01890 80ADA820 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01894 80ADA824 10400003 */ beq $v0, $zero, .L80ADA834 -/* 01898 80ADA828 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0189C 80ADA82C A4CE019A */ sh $t6, 0x019A($a2) ## 0000019A -/* 018A0 80ADA830 84C2019A */ lh $v0, 0x019A($a2) ## 0000019A -.L80ADA834: -/* 018A4 80ADA834 C4C4015C */ lwc1 $f4, 0x015C($a2) ## 0000015C -/* 018A8 80ADA838 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 018AC 80ADA83C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 018B0 80ADA840 46062200 */ add.s $f8, $f4, $f6 -/* 018B4 80ADA844 84CF00B6 */ lh $t7, 0x00B6($a2) ## 000000B6 -/* 018B8 80ADA848 3C0143C0 */ lui $at, 0x43C0 ## $at = 43C00000 -/* 018BC 80ADA84C 46809120 */ cvt.s.w $f4, $f18 -/* 018C0 80ADA850 460A4402 */ mul.s $f16, $f8, $f10 -/* 018C4 80ADA854 44814000 */ mtc1 $at, $f8 ## $f8 = 384.00 -/* 018C8 80ADA858 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 018CC 80ADA85C 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 018D0 80ADA860 240538EE */ addiu $a1, $zero, 0x38EE ## $a1 = 000038EE -/* 018D4 80ADA864 46048181 */ sub.s $f6, $f16, $f4 -/* 018D8 80ADA868 46809420 */ cvt.s.w $f16, $f18 -/* 018DC 80ADA86C 46064282 */ mul.s $f10, $f8, $f6 -/* 018E0 80ADA870 460A8100 */ add.s $f4, $f16, $f10 -/* 018E4 80ADA874 4600220D */ trunc.w.s $f8, $f4 -/* 018E8 80ADA878 44194000 */ mfc1 $t9, $f8 -/* 018EC 80ADA87C 10410004 */ beq $v0, $at, .L80ADA890 -/* 018F0 80ADA880 A4D900B6 */ sh $t9, 0x00B6($a2) ## 000000B6 -/* 018F4 80ADA884 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 018F8 80ADA888 14410005 */ bne $v0, $at, .L80ADA8A0 -/* 018FC 80ADA88C 00000000 */ nop -.L80ADA890: -/* 01900 80ADA890 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01904 80ADA894 AFA60018 */ sw $a2, 0x0018($sp) -/* 01908 80ADA898 8FA60018 */ lw $a2, 0x0018($sp) -/* 0190C 80ADA89C 84C2019A */ lh $v0, 0x019A($a2) ## 0000019A -.L80ADA8A0: -/* 01910 80ADA8A0 54400004 */ bnel $v0, $zero, .L80ADA8B4 -/* 01914 80ADA8A4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01918 80ADA8A8 0C2B6538 */ jal func_80AD94E0 -/* 0191C 80ADA8AC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01920 80ADA8B0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADA8B4: -/* 01924 80ADA8B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01928 80ADA8B8 03E00008 */ jr $ra -/* 0192C 80ADA8BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s deleted file mode 100644 index 7cb4dda5df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_80ADA8C0 -/* 01930 80ADA8C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01934 80ADA8C4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01938 80ADA8C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0193C 80ADA8CC AFBF001C */ sw $ra, 0x001C($sp) -/* 01940 80ADA8D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01944 80ADA8D4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01948 80ADA8D8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0194C 80ADA8DC AFA40024 */ sw $a0, 0x0024($sp) -/* 01950 80ADA8E0 8FA40024 */ lw $a0, 0x0024($sp) -/* 01954 80ADA8E4 0C0295B2 */ jal func_800A56C8 -/* 01958 80ADA8E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0195C 80ADA8EC 10400005 */ beq $v0, $zero, .L80ADA904 -/* 01960 80ADA8F0 3C0143C0 */ lui $at, 0x43C0 ## $at = 43C00000 -/* 01964 80ADA8F4 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 01968 80ADA8F8 10400002 */ beq $v0, $zero, .L80ADA904 -/* 0196C 80ADA8FC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01970 80ADA900 A60E019A */ sh $t6, 0x019A($s0) ## 0000019A -.L80ADA904: -/* 01974 80ADA904 44812000 */ mtc1 $at, $f4 ## $f4 = 384.00 -/* 01978 80ADA908 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C -/* 0197C 80ADA90C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 01980 80ADA910 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01984 80ADA914 46062202 */ mul.s $f8, $f4, $f6 -/* 01988 80ADA918 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 -/* 0198C 80ADA91C 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01990 80ADA920 8608019A */ lh $t0, 0x019A($s0) ## 0000019A -/* 01994 80ADA924 46809120 */ cvt.s.w $f4, $f18 -/* 01998 80ADA928 460A4402 */ mul.s $f16, $f8, $f10 -/* 0199C 80ADA92C 46102180 */ add.s $f6, $f4, $f16 -/* 019A0 80ADA930 4600320D */ trunc.w.s $f8, $f6 -/* 019A4 80ADA934 44194000 */ mfc1 $t9, $f8 -/* 019A8 80ADA938 1500001F */ bne $t0, $zero, .L80ADA9B8 -/* 019AC 80ADA93C A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 019B0 80ADA940 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 019B4 80ADA944 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 019B8 80ADA948 012A1023 */ subu $v0, $t1, $t2 -/* 019BC 80ADA94C 00021400 */ sll $v0, $v0, 16 -/* 019C0 80ADA950 00021403 */ sra $v0, $v0, 16 -/* 019C4 80ADA954 04400003 */ bltz $v0, .L80ADA964 -/* 019C8 80ADA958 00021823 */ subu $v1, $zero, $v0 -/* 019CC 80ADA95C 10000001 */ beq $zero, $zero, .L80ADA964 -/* 019D0 80ADA960 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -.L80ADA964: -/* 019D4 80ADA964 28611000 */ slti $at, $v1, 0x1000 -/* 019D8 80ADA968 50200014 */ beql $at, $zero, .L80ADA9BC -/* 019DC 80ADA96C 8FA40024 */ lw $a0, 0x0024($sp) -/* 019E0 80ADA970 920B0194 */ lbu $t3, 0x0194($s0) ## 00000194 -/* 019E4 80ADA974 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 019E8 80ADA978 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019EC 80ADA97C 11600009 */ beq $t3, $zero, .L80ADA9A4 -/* 019F0 80ADA980 00000000 */ nop -/* 019F4 80ADA984 920D02BD */ lbu $t5, 0x02BD($s0) ## 000002BD -/* 019F8 80ADA988 A20C02C0 */ sb $t4, 0x02C0($s0) ## 000002C0 -/* 019FC 80ADA98C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A00 80ADA990 31AEFFFB */ andi $t6, $t5, 0xFFFB ## $t6 = 00000000 -/* 01A04 80ADA994 0C2B64F1 */ jal func_80AD93C4 -/* 01A08 80ADA998 A20E02BD */ sb $t6, 0x02BD($s0) ## 000002BD -/* 01A0C 80ADA99C 10000007 */ beq $zero, $zero, .L80ADA9BC -/* 01A10 80ADA9A0 8FA40024 */ lw $a0, 0x0024($sp) -.L80ADA9A4: -/* 01A14 80ADA9A4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01A18 80ADA9A8 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -/* 01A1C 80ADA9AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A20 80ADA9B0 0C2B6709 */ jal func_80AD9C24 -/* 01A24 80ADA9B4 8FA50034 */ lw $a1, 0x0034($sp) -.L80ADA9B8: -/* 01A28 80ADA9B8 8FA40024 */ lw $a0, 0x0024($sp) -.L80ADA9BC: -/* 01A2C 80ADA9BC 0C0295B2 */ jal func_800A56C8 -/* 01A30 80ADA9C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01A34 80ADA9C4 10400003 */ beq $v0, $zero, .L80ADA9D4 -/* 01A38 80ADA9C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A3C 80ADA9CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01A40 80ADA9D0 240538EE */ addiu $a1, $zero, 0x38EE ## $a1 = 000038EE -.L80ADA9D4: -/* 01A44 80ADA9D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01A48 80ADA9D8 8FB00018 */ lw $s0, 0x0018($sp) -/* 01A4C 80ADA9DC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01A50 80ADA9E0 03E00008 */ jr $ra -/* 01A54 80ADA9E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s deleted file mode 100644 index 035ef5aa68..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80ADA9E8 -/* 01A58 80ADA9E8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A5C 80ADA9EC AFB00018 */ sw $s0, 0x0018($sp) -/* 01A60 80ADA9F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01A64 80ADA9F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01A68 80ADA9F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 01A6C 80ADA9FC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A70 80ADAA00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A74 80ADAA04 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01A78 80ADAA08 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01A7C 80ADAA0C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 01A80 80ADAA10 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 01A84 80ADAA14 3C014300 */ lui $at, 0x4300 ## $at = 43000000 -/* 01A88 80ADAA18 46062202 */ mul.s $f8, $f4, $f6 -/* 01A8C 80ADAA1C 44815000 */ mtc1 $at, $f10 ## $f10 = 128.00 -/* 01A90 80ADAA20 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 -/* 01A94 80ADAA24 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01A98 80ADAA28 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01A9C 80ADAA2C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 01AA0 80ADAA30 46809120 */ cvt.s.w $f4, $f18 -/* 01AA4 80ADAA34 460A4402 */ mul.s $f16, $f8, $f10 -/* 01AA8 80ADAA38 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01AAC 80ADAA3C 46102181 */ sub.s $f6, $f4, $f16 -/* 01AB0 80ADAA40 4600320D */ trunc.w.s $f8, $f6 -/* 01AB4 80ADAA44 44184000 */ mfc1 $t8, $f8 -/* 01AB8 80ADAA48 0C01DE80 */ jal Math_ApproxF - -/* 01ABC 80ADAA4C A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 01AC0 80ADAA50 50400010 */ beql $v0, $zero, .L80ADAA94 -/* 01AC4 80ADAA54 8FBF001C */ lw $ra, 0x001C($sp) -/* 01AC8 80ADAA58 92080194 */ lbu $t0, 0x0194($s0) ## 00000194 -/* 01ACC 80ADAA5C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 01AD0 80ADAA60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AD4 80ADAA64 11000005 */ beq $t0, $zero, .L80ADAA7C -/* 01AD8 80ADAA68 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 01ADC 80ADAA6C 0C2B64F1 */ jal func_80AD93C4 -/* 01AE0 80ADAA70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AE4 80ADAA74 10000007 */ beq $zero, $zero, .L80ADAA94 -/* 01AE8 80ADAA78 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADAA7C: -/* 01AEC 80ADAA7C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01AF0 80ADAA80 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -/* 01AF4 80ADAA84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AF8 80ADAA88 0C2B6709 */ jal func_80AD9C24 -/* 01AFC 80ADAA8C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01B00 80ADAA90 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADAA94: -/* 01B04 80ADAA94 8FB00018 */ lw $s0, 0x0018($sp) -/* 01B08 80ADAA98 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B0C 80ADAA9C 03E00008 */ jr $ra -/* 01B10 80ADAAA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s deleted file mode 100644 index 7532d729d5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s +++ /dev/null @@ -1,129 +0,0 @@ -glabel func_80ADAAA4 -/* 01B14 80ADAAA4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01B18 80ADAAA8 AFB00018 */ sw $s0, 0x0018($sp) -/* 01B1C 80ADAAAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B20 80ADAAB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01B24 80ADAAB4 AFA50024 */ sw $a1, 0x0024($sp) -/* 01B28 80ADAAB8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01B2C 80ADAABC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B30 80ADAAC0 50400020 */ beql $v0, $zero, .L80ADAB44 -/* 01B34 80ADAAC4 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -/* 01B38 80ADAAC8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 01B3C 80ADAACC 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 01B40 80ADAAD0 55E0001C */ bnel $t7, $zero, .L80ADAB44 -/* 01B44 80ADAAD4 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -/* 01B48 80ADAAD8 921800AF */ lbu $t8, 0x00AF($s0) ## 000000AF -/* 01B4C 80ADAADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B50 80ADAAE0 13000015 */ beq $t8, $zero, .L80ADAB38 -/* 01B54 80ADAAE4 00000000 */ nop -/* 01B58 80ADAAE8 92190194 */ lbu $t9, 0x0194($s0) ## 00000194 -/* 01B5C 80ADAAEC 53200006 */ beql $t9, $zero, .L80ADAB08 -/* 01B60 80ADAAF0 92080195 */ lbu $t0, 0x0195($s0) ## 00000195 -/* 01B64 80ADAAF4 0C2B65A9 */ jal func_80AD96A4 -/* 01B68 80ADAAF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B6C 80ADAAFC 10000011 */ beq $zero, $zero, .L80ADAB44 -/* 01B70 80ADAB00 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -/* 01B74 80ADAB04 92080195 */ lbu $t0, 0x0195($s0) ## 00000195 -.L80ADAB08: -/* 01B78 80ADAB08 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01B7C 80ADAB0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B80 80ADAB10 11000005 */ beq $t0, $zero, .L80ADAB28 -/* 01B84 80ADAB14 00000000 */ nop -/* 01B88 80ADAB18 0C2B6709 */ jal func_80AD9C24 -/* 01B8C 80ADAB1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B90 80ADAB20 10000008 */ beq $zero, $zero, .L80ADAB44 -/* 01B94 80ADAB24 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -.L80ADAB28: -/* 01B98 80ADAB28 0C2B6709 */ jal func_80AD9C24 -/* 01B9C 80ADAB2C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01BA0 80ADAB30 10000004 */ beq $zero, $zero, .L80ADAB44 -/* 01BA4 80ADAB34 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -.L80ADAB38: -/* 01BA8 80ADAB38 0C2B6675 */ jal func_80AD99D4 -/* 01BAC 80ADAB3C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01BB0 80ADAB40 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -.L80ADAB44: -/* 01BB4 80ADAB44 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01BB8 80ADAB48 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 01BBC 80ADAB4C 5040003D */ beql $v0, $zero, .L80ADAC44 -/* 01BC0 80ADAB50 920D0194 */ lbu $t5, 0x0194($s0) ## 00000194 -/* 01BC4 80ADAB54 54410004 */ bnel $v0, $at, .L80ADAB68 -/* 01BC8 80ADAB58 24020400 */ addiu $v0, $zero, 0x0400 ## $v0 = 00000400 -/* 01BCC 80ADAB5C 10000002 */ beq $zero, $zero, .L80ADAB68 -/* 01BD0 80ADAB60 24020800 */ addiu $v0, $zero, 0x0800 ## $v0 = 00000800 -/* 01BD4 80ADAB64 24020400 */ addiu $v0, $zero, 0x0400 ## $v0 = 00000400 -.L80ADAB68: -/* 01BD8 80ADAB68 8E090118 */ lw $t1, 0x0118($s0) ## 00000118 -/* 01BDC 80ADAB6C 00023400 */ sll $a2, $v0, 16 -/* 01BE0 80ADAB70 00063403 */ sra $a2, $a2, 16 -/* 01BE4 80ADAB74 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01BE8 80ADAB78 852500B6 */ lh $a1, 0x00B6($t1) ## 000000B6 -/* 01BEC 80ADAB7C C600015C */ lwc1 $f0, 0x015C($s0) ## 0000015C -/* 01BF0 80ADAB80 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 -/* 01BF4 80ADAB84 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01BF8 80ADAB88 44814000 */ mtc1 $at, $f8 ## $f8 = 255.00 -/* 01BFC 80ADAB8C 46040181 */ sub.s $f6, $f0, $f4 -/* 01C00 80ADAB90 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01C04 80ADAB94 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01C08 80ADAB98 46083282 */ mul.s $f10, $f6, $f8 -/* 01C0C 80ADAB9C 46005403 */ div.s $f16, $f10, $f0 -/* 01C10 80ADABA0 444AF800 */ cfc1 $t2, $31 -/* 01C14 80ADABA4 44CBF800 */ ctc1 $t3, $31 -/* 01C18 80ADABA8 00000000 */ nop -/* 01C1C 80ADABAC 460084A4 */ cvt.w.s $f18, $f16 -/* 01C20 80ADABB0 444BF800 */ cfc1 $t3, $31 -/* 01C24 80ADABB4 00000000 */ nop -/* 01C28 80ADABB8 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 01C2C 80ADABBC 51600013 */ beql $t3, $zero, .L80ADAC0C -/* 01C30 80ADABC0 440B9000 */ mfc1 $t3, $f18 -/* 01C34 80ADABC4 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 01C38 80ADABC8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01C3C 80ADABCC 46128481 */ sub.s $f18, $f16, $f18 -/* 01C40 80ADABD0 44CBF800 */ ctc1 $t3, $31 -/* 01C44 80ADABD4 00000000 */ nop -/* 01C48 80ADABD8 460094A4 */ cvt.w.s $f18, $f18 -/* 01C4C 80ADABDC 444BF800 */ cfc1 $t3, $31 -/* 01C50 80ADABE0 00000000 */ nop -/* 01C54 80ADABE4 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 01C58 80ADABE8 15600005 */ bne $t3, $zero, .L80ADAC00 -/* 01C5C 80ADABEC 00000000 */ nop -/* 01C60 80ADABF0 440B9000 */ mfc1 $t3, $f18 -/* 01C64 80ADABF4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01C68 80ADABF8 10000007 */ beq $zero, $zero, .L80ADAC18 -/* 01C6C 80ADABFC 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L80ADAC00: -/* 01C70 80ADAC00 10000005 */ beq $zero, $zero, .L80ADAC18 -/* 01C74 80ADAC04 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 01C78 80ADAC08 440B9000 */ mfc1 $t3, $f18 -.L80ADAC0C: -/* 01C7C 80ADAC0C 00000000 */ nop -/* 01C80 80ADAC10 0560FFFB */ bltz $t3, .L80ADAC00 -/* 01C84 80ADAC14 00000000 */ nop -.L80ADAC18: -/* 01C88 80ADAC18 8E0C0118 */ lw $t4, 0x0118($s0) ## 00000118 -/* 01C8C 80ADAC1C A20B0231 */ sb $t3, 0x0231($s0) ## 00000231 -/* 01C90 80ADAC20 44CAF800 */ ctc1 $t2, $31 -/* 01C94 80ADAC24 C5840028 */ lwc1 $f4, 0x0028($t4) ## 00000028 -/* 01C98 80ADAC28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C9C 80ADAC2C E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 01CA0 80ADAC30 0C2B65F2 */ jal func_80AD97C8 -/* 01CA4 80ADAC34 8FA50024 */ lw $a1, 0x0024($sp) -/* 01CA8 80ADAC38 10000009 */ beq $zero, $zero, .L80ADAC60 -/* 01CAC 80ADAC3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CB0 80ADAC40 920D0194 */ lbu $t5, 0x0194($s0) ## 00000194 -.L80ADAC44: -/* 01CB4 80ADAC44 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 01CB8 80ADAC48 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01CBC 80ADAC4C 51A00004 */ beql $t5, $zero, .L80ADAC60 -/* 01CC0 80ADAC50 8FBF001C */ lw $ra, 0x001C($sp) -/* 01CC4 80ADAC54 0C01DE80 */ jal Math_ApproxF - -/* 01CC8 80ADAC58 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01CCC 80ADAC5C 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADAC60: -/* 01CD0 80ADAC60 8FB00018 */ lw $s0, 0x0018($sp) -/* 01CD4 80ADAC64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01CD8 80ADAC68 03E00008 */ jr $ra -/* 01CDC 80ADAC6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s deleted file mode 100644 index 0a23a9fead..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80ADAC70 -/* 01CE0 80ADAC70 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01CE4 80ADAC74 AFB00018 */ sw $s0, 0x0018($sp) -/* 01CE8 80ADAC78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01CEC 80ADAC7C AFBF001C */ sw $ra, 0x001C($sp) -/* 01CF0 80ADAC80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01CF4 80ADAC84 AFA5002C */ sw $a1, 0x002C($sp) -/* 01CF8 80ADAC88 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01CFC 80ADAC8C AFA40024 */ sw $a0, 0x0024($sp) -/* 01D00 80ADAC90 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01D04 80ADAC94 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01D08 80ADAC98 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01D0C 80ADAC9C 00A12821 */ addu $a1, $a1, $at -/* 01D10 80ADACA0 00052C00 */ sll $a1, $a1, 16 -/* 01D14 80ADACA4 00052C03 */ sra $a1, $a1, 16 -/* 01D18 80ADACA8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01D1C 80ADACAC 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 01D20 80ADACB0 8FA40024 */ lw $a0, 0x0024($sp) -/* 01D24 80ADACB4 0C0295B2 */ jal func_800A56C8 -/* 01D28 80ADACB8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01D2C 80ADACBC 50400006 */ beql $v0, $zero, .L80ADACD8 -/* 01D30 80ADACC0 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 01D34 80ADACC4 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 01D38 80ADACC8 10400002 */ beq $v0, $zero, .L80ADACD4 -/* 01D3C 80ADACCC 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01D40 80ADACD0 A60E019A */ sh $t6, 0x019A($s0) ## 0000019A -.L80ADACD4: -/* 01D44 80ADACD4 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -.L80ADACD8: -/* 01D48 80ADACD8 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 01D4C 80ADACDC 5300000B */ beql $t8, $zero, .L80ADAD0C -/* 01D50 80ADACE0 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -/* 01D54 80ADACE4 92080199 */ lbu $t0, 0x0199($s0) ## 00000199 -/* 01D58 80ADACE8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 01D5C 80ADACEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D60 80ADACF0 35090002 */ ori $t1, $t0, 0x0002 ## $t1 = 00000002 -/* 01D64 80ADACF4 A2090199 */ sb $t1, 0x0199($s0) ## 00000199 -/* 01D68 80ADACF8 0C2B65C6 */ jal func_80AD9718 -/* 01D6C 80ADACFC A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 01D70 80ADAD00 10000010 */ beq $zero, $zero, .L80ADAD44 -/* 01D74 80ADAD04 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D78 80ADAD08 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -.L80ADAD0C: -/* 01D7C 80ADAD0C 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 01D80 80ADAD10 5540000C */ bnel $t2, $zero, .L80ADAD44 -/* 01D84 80ADAD14 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D88 80ADAD18 44812000 */ mtc1 $at, $f4 ## $f4 = 240.00 -/* 01D8C 80ADAD1C C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 01D90 80ADAD20 4606203C */ c.lt.s $f4, $f6 -/* 01D94 80ADAD24 00000000 */ nop -/* 01D98 80ADAD28 45020006 */ bc1fl .L80ADAD44 -/* 01D9C 80ADAD2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DA0 80ADAD30 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 01DA4 80ADAD34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01DA8 80ADAD38 0C2B64F1 */ jal func_80AD93C4 -/* 01DAC 80ADAD3C A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 01DB0 80ADAD40 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADAD44: -/* 01DB4 80ADAD44 8FB00018 */ lw $s0, 0x0018($sp) -/* 01DB8 80ADAD48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01DBC 80ADAD4C 03E00008 */ jr $ra -/* 01DC0 80ADAD50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s deleted file mode 100644 index f04f5736cc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80ADAD54 -/* 01DC4 80ADAD54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01DC8 80ADAD58 AFA5001C */ sw $a1, 0x001C($sp) -/* 01DCC 80ADAD5C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 01DD0 80ADAD60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01DD4 80ADAD64 AFA40018 */ sw $a0, 0x0018($sp) -/* 01DD8 80ADAD68 AFA50018 */ sw $a1, 0x0018($sp) -/* 01DDC 80ADAD6C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01DE0 80ADAD70 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01DE4 80ADAD74 10400009 */ beq $v0, $zero, .L80ADAD9C -/* 01DE8 80ADAD78 8FA50018 */ lw $a1, 0x0018($sp) -/* 01DEC 80ADAD7C 3C0E0006 */ lui $t6, 0x0006 ## $t6 = 00060000 -/* 01DF0 80ADAD80 35CE0001 */ ori $t6, $t6, 0x0001 ## $t6 = 00060001 -/* 01DF4 80ADAD84 A0A00231 */ sb $zero, 0x0231($a1) ## 00000231 -/* 01DF8 80ADAD88 ACAE02CC */ sw $t6, 0x02CC($a1) ## 000002CC -/* 01DFC 80ADAD8C 0C2B64F1 */ jal func_80AD93C4 -/* 01E00 80ADAD90 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01E04 80ADAD94 10000032 */ beq $zero, $zero, .L80ADAE60 -/* 01E08 80ADAD98 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADAD9C: -/* 01E0C 80ADAD9C C4A4015C */ lwc1 $f4, 0x015C($a1) ## 0000015C -/* 01E10 80ADADA0 C4AA0164 */ lwc1 $f10, 0x0164($a1) ## 00000164 -/* 01E14 80ADADA4 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01E18 80ADADA8 4600218D */ trunc.w.s $f6, $f4 -/* 01E1C 80ADADAC 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 -/* 01E20 80ADADB0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01E24 80ADADB4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01E28 80ADADB8 44023000 */ mfc1 $v0, $f6 -/* 01E2C 80ADADBC 00000000 */ nop -/* 01E30 80ADADC0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 01E34 80ADADC4 00000000 */ nop -/* 01E38 80ADADC8 46804020 */ cvt.s.w $f0, $f8 -/* 01E3C 80ADADCC 460A0401 */ sub.s $f16, $f0, $f10 -/* 01E40 80ADADD0 46128102 */ mul.s $f4, $f16, $f18 -/* 01E44 80ADADD4 46002183 */ div.s $f6, $f4, $f0 -/* 01E48 80ADADD8 4458F800 */ cfc1 $t8, $31 -/* 01E4C 80ADADDC 44D9F800 */ ctc1 $t9, $31 -/* 01E50 80ADADE0 00000000 */ nop -/* 01E54 80ADADE4 46003224 */ cvt.w.s $f8, $f6 -/* 01E58 80ADADE8 4459F800 */ cfc1 $t9, $31 -/* 01E5C 80ADADEC 00000000 */ nop -/* 01E60 80ADADF0 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01E64 80ADADF4 53200013 */ beql $t9, $zero, .L80ADAE44 -/* 01E68 80ADADF8 44194000 */ mfc1 $t9, $f8 -/* 01E6C 80ADADFC 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 01E70 80ADAE00 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01E74 80ADAE04 46083201 */ sub.s $f8, $f6, $f8 -/* 01E78 80ADAE08 44D9F800 */ ctc1 $t9, $31 -/* 01E7C 80ADAE0C 00000000 */ nop -/* 01E80 80ADAE10 46004224 */ cvt.w.s $f8, $f8 -/* 01E84 80ADAE14 4459F800 */ cfc1 $t9, $31 -/* 01E88 80ADAE18 00000000 */ nop -/* 01E8C 80ADAE1C 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01E90 80ADAE20 17200005 */ bne $t9, $zero, .L80ADAE38 -/* 01E94 80ADAE24 00000000 */ nop -/* 01E98 80ADAE28 44194000 */ mfc1 $t9, $f8 -/* 01E9C 80ADAE2C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01EA0 80ADAE30 10000007 */ beq $zero, $zero, .L80ADAE50 -/* 01EA4 80ADAE34 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80ADAE38: -/* 01EA8 80ADAE38 10000005 */ beq $zero, $zero, .L80ADAE50 -/* 01EAC 80ADAE3C 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 01EB0 80ADAE40 44194000 */ mfc1 $t9, $f8 -.L80ADAE44: -/* 01EB4 80ADAE44 00000000 */ nop -/* 01EB8 80ADAE48 0720FFFB */ bltz $t9, .L80ADAE38 -/* 01EBC 80ADAE4C 00000000 */ nop -.L80ADAE50: -/* 01EC0 80ADAE50 44D8F800 */ ctc1 $t8, $31 -/* 01EC4 80ADAE54 A0B90231 */ sb $t9, 0x0231($a1) ## 00000231 -/* 01EC8 80ADAE58 00000000 */ nop -/* 01ECC 80ADAE5C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADAE60: -/* 01ED0 80ADAE60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01ED4 80ADAE64 03E00008 */ jr $ra -/* 01ED8 80ADAE68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s deleted file mode 100644 index 9b0358a602..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel func_80ADAE6C -/* 01EDC 80ADAE6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EE0 80ADAE70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01EE4 80ADAE74 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01EE8 80ADAE78 AFA5001C */ sw $a1, 0x001C($sp) -/* 01EEC 80ADAE7C AFA60018 */ sw $a2, 0x0018($sp) -/* 01EF0 80ADAE80 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01EF4 80ADAE84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01EF8 80ADAE88 1040001B */ beq $v0, $zero, .L80ADAEF8 -/* 01EFC 80ADAE8C 8FA60018 */ lw $a2, 0x0018($sp) -/* 01F00 80ADAE90 90CF0194 */ lbu $t7, 0x0194($a2) ## 00000194 -/* 01F04 80ADAE94 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01F08 80ADAE98 A0CE0231 */ sb $t6, 0x0231($a2) ## 00000231 -/* 01F0C 80ADAE9C 11E00012 */ beq $t7, $zero, .L80ADAEE8 -/* 01F10 80ADAEA0 3C084FC7 */ lui $t0, 0x4FC7 ## $t0 = 4FC70000 -/* 01F14 80ADAEA4 90D80199 */ lbu $t8, 0x0199($a2) ## 00000199 -/* 01F18 80ADAEA8 84C2019A */ lh $v0, 0x019A($a2) ## 0000019A -/* 01F1C 80ADAEAC 3508FFEA */ ori $t0, $t0, 0xFFEA ## $t0 = 4FC7FFEA -/* 01F20 80ADAEB0 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 01F24 80ADAEB4 A0D90199 */ sb $t9, 0x0199($a2) ## 00000199 -/* 01F28 80ADAEB8 10400004 */ beq $v0, $zero, .L80ADAECC -/* 01F2C 80ADAEBC ACC802CC */ sw $t0, 0x02CC($a2) ## 000002CC -/* 01F30 80ADAEC0 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 01F34 80ADAEC4 A4C9019A */ sh $t1, 0x019A($a2) ## 0000019A -/* 01F38 80ADAEC8 84C2019A */ lh $v0, 0x019A($a2) ## 0000019A -.L80ADAECC: -/* 01F3C 80ADAECC 14400038 */ bne $v0, $zero, .L80ADAFB0 -/* 01F40 80ADAED0 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 01F44 80ADAED4 A0CA0197 */ sb $t2, 0x0197($a2) ## 00000197 -/* 01F48 80ADAED8 0C2B64F1 */ jal func_80AD93C4 -/* 01F4C 80ADAEDC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01F50 80ADAEE0 10000034 */ beq $zero, $zero, .L80ADAFB4 -/* 01F54 80ADAEE4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADAEE8: -/* 01F58 80ADAEE8 0C2B67C7 */ jal func_80AD9F1C -/* 01F5C 80ADAEEC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01F60 80ADAEF0 10000030 */ beq $zero, $zero, .L80ADAFB4 -/* 01F64 80ADAEF4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADAEF8: -/* 01F68 80ADAEF8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01F6C 80ADAEFC 44813000 */ mtc1 $at, $f6 ## $f6 = 255.00 -/* 01F70 80ADAF00 C4C40164 */ lwc1 $f4, 0x0164($a2) ## 00000164 -/* 01F74 80ADAF04 C4CA015C */ lwc1 $f10, 0x015C($a2) ## 0000015C -/* 01F78 80ADAF08 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01F7C 80ADAF0C 46062202 */ mul.s $f8, $f4, $f6 -/* 01F80 80ADAF10 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01F84 80ADAF14 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01F88 80ADAF18 460A4403 */ div.s $f16, $f8, $f10 -/* 01F8C 80ADAF1C 444BF800 */ cfc1 $t3, $31 -/* 01F90 80ADAF20 44CCF800 */ ctc1 $t4, $31 -/* 01F94 80ADAF24 00000000 */ nop -/* 01F98 80ADAF28 460084A4 */ cvt.w.s $f18, $f16 -/* 01F9C 80ADAF2C 444CF800 */ cfc1 $t4, $31 -/* 01FA0 80ADAF30 00000000 */ nop -/* 01FA4 80ADAF34 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01FA8 80ADAF38 51800013 */ beql $t4, $zero, .L80ADAF88 -/* 01FAC 80ADAF3C 440C9000 */ mfc1 $t4, $f18 -/* 01FB0 80ADAF40 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 01FB4 80ADAF44 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01FB8 80ADAF48 46128481 */ sub.s $f18, $f16, $f18 -/* 01FBC 80ADAF4C 44CCF800 */ ctc1 $t4, $31 -/* 01FC0 80ADAF50 00000000 */ nop -/* 01FC4 80ADAF54 460094A4 */ cvt.w.s $f18, $f18 -/* 01FC8 80ADAF58 444CF800 */ cfc1 $t4, $31 -/* 01FCC 80ADAF5C 00000000 */ nop -/* 01FD0 80ADAF60 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01FD4 80ADAF64 15800005 */ bne $t4, $zero, .L80ADAF7C -/* 01FD8 80ADAF68 00000000 */ nop -/* 01FDC 80ADAF6C 440C9000 */ mfc1 $t4, $f18 -/* 01FE0 80ADAF70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01FE4 80ADAF74 10000007 */ beq $zero, $zero, .L80ADAF94 -/* 01FE8 80ADAF78 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 -.L80ADAF7C: -/* 01FEC 80ADAF7C 10000005 */ beq $zero, $zero, .L80ADAF94 -/* 01FF0 80ADAF80 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01FF4 80ADAF84 440C9000 */ mfc1 $t4, $f18 -.L80ADAF88: -/* 01FF8 80ADAF88 00000000 */ nop -/* 01FFC 80ADAF8C 0580FFFB */ bltz $t4, .L80ADAF7C -/* 02000 80ADAF90 00000000 */ nop -.L80ADAF94: -/* 02004 80ADAF94 90CD0194 */ lbu $t5, 0x0194($a2) ## 00000194 -/* 02008 80ADAF98 44CBF800 */ ctc1 $t3, $31 -/* 0200C 80ADAF9C A0CC0231 */ sb $t4, 0x0231($a2) ## 00000231 -/* 02010 80ADAFA0 55A00004 */ bnel $t5, $zero, .L80ADAFB4 -/* 02014 80ADAFA4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02018 80ADAFA8 0C2B65F2 */ jal func_80AD97C8 -/* 0201C 80ADAFAC 8FA5001C */ lw $a1, 0x001C($sp) -.L80ADAFB0: -/* 02020 80ADAFB0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADAFB4: -/* 02024 80ADAFB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02028 80ADAFB8 03E00008 */ jr $ra -/* 0202C 80ADAFBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s deleted file mode 100644 index 4dfe13048a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s +++ /dev/null @@ -1,132 +0,0 @@ -.late_rodata -glabel D_80ADD890 - .float 3000.0 - -glabel D_80ADD894 - .float 3000.0 - -.text -glabel func_80ADAFC0 -/* 02030 80ADAFC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02034 80ADAFC4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02038 80ADAFC8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0203C 80ADAFCC AFA50024 */ sw $a1, 0x0024($sp) -/* 02040 80ADAFD0 90820198 */ lbu $v0, 0x0198($a0) ## 00000198 -/* 02044 80ADAFD4 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 02048 80ADAFD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0204C 80ADAFDC 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 02050 80ADAFE0 28410009 */ slti $at, $v0, 0x0009 -/* 02054 80ADAFE4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 02058 80ADAFE8 14200004 */ bne $at, $zero, .L80ADAFFC -/* 0205C 80ADAFEC A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 02060 80ADAFF0 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 02064 80ADAFF4 10000002 */ beq $zero, $zero, .L80ADB000 -/* 02068 80ADAFF8 A0980198 */ sb $t8, 0x0198($a0) ## 00000198 -.L80ADAFFC: -/* 0206C 80ADAFFC A2020198 */ sb $v0, 0x0198($s0) ## 00000198 -.L80ADB000: -/* 02070 80ADB000 92020198 */ lbu $v0, 0x0198($s0) ## 00000198 -/* 02074 80ADB004 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = 00000000 -/* 02078 80ADB008 18400010 */ blez $v0, .L80ADB04C -/* 0207C 80ADB00C 0002C880 */ sll $t9, $v0, 2 -/* 02080 80ADB010 0322C823 */ subu $t9, $t9, $v0 -/* 02084 80ADB014 0019C880 */ sll $t9, $t9, 2 -/* 02088 80ADB018 02192821 */ addu $a1, $s0, $t9 -/* 0208C 80ADB01C 24A30234 */ addiu $v1, $a1, 0x0234 ## $v1 = 00000234 -/* 02090 80ADB020 24A40228 */ addiu $a0, $a1, 0x0228 ## $a0 = 00000228 -.L80ADB024: -/* 02094 80ADB024 8C890000 */ lw $t1, 0x0000($a0) ## 00000228 -/* 02098 80ADB028 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 0209C 80ADB02C 2463FFF4 */ addiu $v1, $v1, 0xFFF4 ## $v1 = 00000228 -/* 020A0 80ADB030 AC69000C */ sw $t1, 0x000C($v1) ## 00000234 -/* 020A4 80ADB034 8C880004 */ lw $t0, 0x0004($a0) ## 0000022C -/* 020A8 80ADB038 2484FFF4 */ addiu $a0, $a0, 0xFFF4 ## $a0 = 0000021C -/* 020AC 80ADB03C AC680010 */ sw $t0, 0x0010($v1) ## 00000238 -/* 020B0 80ADB040 8C890014 */ lw $t1, 0x0014($a0) ## 00000230 -/* 020B4 80ADB044 1C40FFF7 */ bgtz $v0, .L80ADB024 -/* 020B8 80ADB048 AC690014 */ sw $t1, 0x0014($v1) ## 0000023C -.L80ADB04C: -/* 020BC 80ADB04C 860B019A */ lh $t3, 0x019A($s0) ## 0000019A -/* 020C0 80ADB050 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 020C4 80ADB054 000B6080 */ sll $t4, $t3, 2 -/* 020C8 80ADB058 018B6023 */ subu $t4, $t4, $t3 -/* 020CC 80ADB05C 000C6300 */ sll $t4, $t4, 12 -/* 020D0 80ADB060 014C2021 */ addu $a0, $t2, $t4 -/* 020D4 80ADB064 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC21C -/* 020D8 80ADB068 00042400 */ sll $a0, $a0, 16 -/* 020DC 80ADB06C 0C01DE1C */ jal Math_Sins - ## sins? -/* 020E0 80ADB070 00042403 */ sra $a0, $a0, 16 -/* 020E4 80ADB074 3C0180AE */ lui $at, %hi(D_80ADD890) ## $at = 80AE0000 -/* 020E8 80ADB078 C424D890 */ lwc1 $f4, %lo(D_80ADD890)($at) -/* 020EC 80ADB07C C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 020F0 80ADB080 860E019A */ lh $t6, 0x019A($s0) ## 0000019A -/* 020F4 80ADB084 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 020F8 80ADB088 46062202 */ mul.s $f8, $f4, $f6 -/* 020FC 80ADB08C 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 02100 80ADB090 000E7880 */ sll $t7, $t6, 2 -/* 02104 80ADB094 01EE7823 */ subu $t7, $t7, $t6 -/* 02108 80ADB098 000F7B00 */ sll $t7, $t7, 12 -/* 0210C 80ADB09C 01AF2021 */ addu $a0, $t5, $t7 -/* 02110 80ADB0A0 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 02114 80ADB0A4 46080282 */ mul.s $f10, $f0, $f8 -/* 02118 80ADB0A8 00042400 */ sll $a0, $a0, 16 -/* 0211C 80ADB0AC 00042403 */ sra $a0, $a0, 16 -/* 02120 80ADB0B0 46105480 */ add.s $f18, $f10, $f16 -/* 02124 80ADB0B4 0C01DE0D */ jal Math_Coss - ## coss? -/* 02128 80ADB0B8 E6120234 */ swc1 $f18, 0x0234($s0) ## 00000234 -/* 0212C 80ADB0BC 3C0180AE */ lui $at, %hi(D_80ADD894) ## $at = 80AE0000 -/* 02130 80ADB0C0 C424D894 */ lwc1 $f4, %lo(D_80ADD894)($at) -/* 02134 80ADB0C4 C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 02138 80ADB0C8 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 0213C 80ADB0CC 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 02140 80ADB0D0 46062202 */ mul.s $f8, $f4, $f6 -/* 02144 80ADB0D4 28410008 */ slti $at, $v0, 0x0008 -/* 02148 80ADB0D8 46080282 */ mul.s $f10, $f0, $f8 -/* 0214C 80ADB0DC 46105480 */ add.s $f18, $f10, $f16 -/* 02150 80ADB0E0 10200008 */ beq $at, $zero, .L80ADB104 -/* 02154 80ADB0E4 E612023C */ swc1 $f18, 0x023C($s0) ## 0000023C -/* 02158 80ADB0E8 3C014110 */ lui $at, 0x4110 ## $at = 41100000 -/* 0215C 80ADB0EC 44813000 */ mtc1 $at, $f6 ## $f6 = 9.00 -/* 02160 80ADB0F0 C6040244 */ lwc1 $f4, 0x0244($s0) ## 00000244 -/* 02164 80ADB0F4 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 02168 80ADB0F8 46062201 */ sub.s $f8, $f4, $f6 -/* 0216C 80ADB0FC 10000015 */ beq $zero, $zero, .L80ADB154 -/* 02170 80ADB100 E6080238 */ swc1 $f8, 0x0238($s0) ## 00000238 -.L80ADB104: -/* 02174 80ADB104 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 02178 80ADB108 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 -/* 0217C 80ADB10C C60A0244 */ lwc1 $f10, 0x0244($s0) ## 00000244 -/* 02180 80ADB110 28410010 */ slti $at, $v0, 0x0010 -/* 02184 80ADB114 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 -/* 02188 80ADB118 46105480 */ add.s $f18, $f10, $f16 -/* 0218C 80ADB11C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02190 80ADB120 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 -/* 02194 80ADB124 1420000B */ bne $at, $zero, .L80ADB154 -/* 02198 80ADB128 E6120238 */ swc1 $f18, 0x0238($s0) ## 00000238 -/* 0219C 80ADB12C 0C01DE80 */ jal Math_ApproxF - -/* 021A0 80ADB130 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A83126F -/* 021A4 80ADB134 10400003 */ beq $v0, $zero, .L80ADB144 -/* 021A8 80ADB138 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021AC 80ADB13C 0C2B6695 */ jal func_80AD9A54 -/* 021B0 80ADB140 8FA50024 */ lw $a1, 0x0024($sp) -.L80ADB144: -/* 021B4 80ADB144 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 021B8 80ADB148 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 021BC 80ADB14C E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 021C0 80ADB150 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -.L80ADB154: -/* 021C4 80ADB154 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 021C8 80ADB158 14410003 */ bne $v0, $at, .L80ADB168 -/* 021CC 80ADB15C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D0 80ADB160 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 021D4 80ADB164 24053877 */ addiu $a1, $zero, 0x3877 ## $a1 = 00003877 -.L80ADB168: -/* 021D8 80ADB168 8FBF001C */ lw $ra, 0x001C($sp) -/* 021DC 80ADB16C 8FB00018 */ lw $s0, 0x0018($sp) -/* 021E0 80ADB170 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 021E4 80ADB174 03E00008 */ jr $ra -/* 021E8 80ADB178 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s deleted file mode 100644 index de1bd1fc78..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80ADB17C -/* 021EC 80ADB17C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 021F0 80ADB180 AFBF001C */ sw $ra, 0x001C($sp) -/* 021F4 80ADB184 AFB00018 */ sw $s0, 0x0018($sp) -/* 021F8 80ADB188 AFA50024 */ sw $a1, 0x0024($sp) -/* 021FC 80ADB18C 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 02200 80ADB190 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02204 80ADB194 24020040 */ addiu $v0, $zero, 0x0040 ## $v0 = 00000040 -/* 02208 80ADB198 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0220C 80ADB19C A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 02210 80ADB1A0 8487019A */ lh $a3, 0x019A($a0) ## 0000019A -/* 02214 80ADB1A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 02218 80ADB1A8 14470019 */ bne $v0, $a3, .L80ADB210 -/* 0221C 80ADB1AC 28E10020 */ slti $at, $a3, 0x0020 -/* 02220 80ADB1B0 0C00B2DD */ jal Flags_SetSwitch - -/* 02224 80ADB1B4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 02228 80ADB1B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0222C 80ADB1BC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 02230 80ADB1C0 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 02234 80ADB1C4 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 02238 80ADB1C8 24072822 */ addiu $a3, $zero, 0x2822 ## $a3 = 00002822 -/* 0223C 80ADB1CC 92180194 */ lbu $t8, 0x0194($s0) ## 00000194 -/* 02240 80ADB1D0 8FA40024 */ lw $a0, 0x0024($sp) -/* 02244 80ADB1D4 57000004 */ bnel $t8, $zero, .L80ADB1E8 -/* 02248 80ADB1D8 8FA80024 */ lw $t0, 0x0024($sp) -/* 0224C 80ADB1DC 0C00B2ED */ jal Flags_UnsetSwitch - -/* 02250 80ADB1E0 2405001B */ addiu $a1, $zero, 0x001B ## $a1 = 0000001B -/* 02254 80ADB1E4 8FA80024 */ lw $t0, 0x0024($sp) -.L80ADB1E8: -/* 02258 80ADB1E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0225C 80ADB1EC 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 02260 80ADB1F0 00280821 */ addu $at, $at, $t0 -/* 02264 80ADB1F4 A0390AE3 */ sb $t9, 0x0AE3($at) ## 00010AE3 -/* 02268 80ADB1F8 0C01E221 */ jal func_80078884 -/* 0226C 80ADB1FC 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 02270 80ADB200 0C00B55C */ jal Actor_Kill - -/* 02274 80ADB204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02278 80ADB208 1000000D */ beq $zero, $zero, .L80ADB240 -/* 0227C 80ADB20C 8609019A */ lh $t1, 0x019A($s0) ## 0000019A -.L80ADB210: -/* 02280 80ADB210 10200007 */ beq $at, $zero, .L80ADB230 -/* 02284 80ADB214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 80ADB218 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0228C 80ADB21C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 02290 80ADB220 0C2B6490 */ jal func_80AD9240 -/* 02294 80ADB224 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 02298 80ADB228 10000005 */ beq $zero, $zero, .L80ADB240 -/* 0229C 80ADB22C 8609019A */ lh $t1, 0x019A($s0) ## 0000019A -.L80ADB230: -/* 022A0 80ADB230 00472823 */ subu $a1, $v0, $a3 -/* 022A4 80ADB234 0C2B6490 */ jal func_80AD9240 -/* 022A8 80ADB238 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 -/* 022AC 80ADB23C 8609019A */ lh $t1, 0x019A($s0) ## 0000019A -.L80ADB240: -/* 022B0 80ADB240 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 022B4 80ADB244 55210018 */ bnel $t1, $at, .L80ADB2A8 -/* 022B8 80ADB248 8FBF001C */ lw $ra, 0x001C($sp) -/* 022BC 80ADB24C 920A0194 */ lbu $t2, 0x0194($s0) ## 00000194 -/* 022C0 80ADB250 3C0C80AE */ lui $t4, %hi(D_80ADD7A4) ## $t4 = 80AE0000 -/* 022C4 80ADB254 258CD7A4 */ addiu $t4, $t4, %lo(D_80ADD7A4) ## $t4 = 80ADD7A4 -/* 022C8 80ADB258 000A5880 */ sll $t3, $t2, 2 -/* 022CC 80ADB25C 016A5823 */ subu $t3, $t3, $t2 -/* 022D0 80ADB260 000B5840 */ sll $t3, $t3, 1 -/* 022D4 80ADB264 016C1021 */ addu $v0, $t3, $t4 -/* 022D8 80ADB268 844D0000 */ lh $t5, 0x0000($v0) ## 00000000 -/* 022DC 80ADB26C 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 022E0 80ADB270 00000000 */ nop -/* 022E4 80ADB274 468021A0 */ cvt.s.w $f6, $f4 -/* 022E8 80ADB278 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 -/* 022EC 80ADB27C 844E0002 */ lh $t6, 0x0002($v0) ## 00000002 -/* 022F0 80ADB280 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 022F4 80ADB284 00000000 */ nop -/* 022F8 80ADB288 468042A0 */ cvt.s.w $f10, $f8 -/* 022FC 80ADB28C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 02300 80ADB290 844F0004 */ lh $t7, 0x0004($v0) ## 00000004 -/* 02304 80ADB294 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 02308 80ADB298 00000000 */ nop -/* 0230C 80ADB29C 468084A0 */ cvt.s.w $f18, $f16 -/* 02310 80ADB2A0 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 02314 80ADB2A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADB2A8: -/* 02318 80ADB2A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0231C 80ADB2AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02320 80ADB2B0 03E00008 */ jr $ra -/* 02324 80ADB2B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s deleted file mode 100644 index 0dd6284bed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80ADB2B8 -/* 02328 80ADB2B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0232C 80ADB2BC AFB00018 */ sw $s0, 0x0018($sp) -/* 02330 80ADB2C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02334 80ADB2C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02338 80ADB2C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0233C 80ADB2CC AFA5002C */ sw $a1, 0x002C($sp) -/* 02340 80ADB2D0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02344 80ADB2D4 AFA40024 */ sw $a0, 0x0024($sp) -/* 02348 80ADB2D8 3C014302 */ lui $at, 0x4302 ## $at = 43020000 -/* 0234C 80ADB2DC 44813000 */ mtc1 $at, $f6 ## $f6 = 130.00 -/* 02350 80ADB2E0 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 02354 80ADB2E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02358 80ADB2E8 4606203C */ c.lt.s $f4, $f6 -/* 0235C 80ADB2EC 00000000 */ nop -/* 02360 80ADB2F0 45020004 */ bc1fl .L80ADB304 -/* 02364 80ADB2F4 8FA40024 */ lw $a0, 0x0024($sp) -/* 02368 80ADB2F8 0C2B677C */ jal func_80AD9DF0 -/* 0236C 80ADB2FC 8FA5002C */ lw $a1, 0x002C($sp) -/* 02370 80ADB300 8FA40024 */ lw $a0, 0x0024($sp) -.L80ADB304: -/* 02374 80ADB304 0C0295B2 */ jal func_800A56C8 -/* 02378 80ADB308 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0237C 80ADB30C 10400003 */ beq $v0, $zero, .L80ADB31C -/* 02380 80ADB310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02384 80ADB314 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02388 80ADB318 240538ED */ addiu $a1, $zero, 0x38ED ## $a1 = 000038ED -.L80ADB31C: -/* 0238C 80ADB31C 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 02390 80ADB320 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 -/* 02394 80ADB324 8FBF001C */ lw $ra, 0x001C($sp) -/* 02398 80ADB328 8FB00018 */ lw $s0, 0x0018($sp) -/* 0239C 80ADB32C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 023A0 80ADB330 03E00008 */ jr $ra -/* 023A4 80ADB334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s deleted file mode 100644 index 06bd68c5c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_80ADB338 -/* 023A8 80ADB338 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 023AC 80ADB33C AFBF0014 */ sw $ra, 0x0014($sp) -/* 023B0 80ADB340 AFA50024 */ sw $a1, 0x0024($sp) -/* 023B4 80ADB344 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 023B8 80ADB348 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 023BC 80ADB34C 24C50008 */ addiu $a1, $a2, 0x0008 ## $a1 = 00000008 -/* 023C0 80ADB350 AFAF001C */ sw $t7, 0x001C($sp) -/* 023C4 80ADB354 90870195 */ lbu $a3, 0x0195($a0) ## 00000195 -/* 023C8 80ADB358 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 023CC 80ADB35C 01E02025 */ or $a0, $t7, $zero ## $a0 = 00000000 -/* 023D0 80ADB360 14E0002C */ bne $a3, $zero, .L80ADB414 -/* 023D4 80ADB364 00604025 */ or $t0, $v1, $zero ## $t0 = 00000000 -/* 023D8 80ADB368 0C00B6EC */ jal func_8002DBB0 -/* 023DC 80ADB36C AFA60020 */ sw $a2, 0x0020($sp) -/* 023E0 80ADB370 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 023E4 80ADB374 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 -/* 023E8 80ADB378 8FA60020 */ lw $a2, 0x0020($sp) -/* 023EC 80ADB37C 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 023F0 80ADB380 4604003C */ c.lt.s $f0, $f4 -/* 023F4 80ADB384 00000000 */ nop -/* 023F8 80ADB388 45020008 */ bc1fl .L80ADB3AC -/* 023FC 80ADB38C A4D9019C */ sh $t9, 0x019C($a2) ## 0000019C -/* 02400 80ADB390 84C2019C */ lh $v0, 0x019C($a2) ## 0000019C -/* 02404 80ADB394 10400006 */ beq $v0, $zero, .L80ADB3B0 -/* 02408 80ADB398 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 0240C 80ADB39C A4D8019C */ sh $t8, 0x019C($a2) ## 0000019C -/* 02410 80ADB3A0 10000003 */ beq $zero, $zero, .L80ADB3B0 -/* 02414 80ADB3A4 84C2019C */ lh $v0, 0x019C($a2) ## 0000019C -/* 02418 80ADB3A8 A4D9019C */ sh $t9, 0x019C($a2) ## 0000019C -.L80ADB3AC: -/* 0241C 80ADB3AC 84C2019C */ lh $v0, 0x019C($a2) ## 0000019C -.L80ADB3B0: -/* 02420 80ADB3B0 5440003C */ bnel $v0, $zero, .L80ADB4A4 -/* 02424 80ADB3B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02428 80ADB3B8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0242C 80ADB3BC AFA60020 */ sw $a2, 0x0020($sp) -/* 02430 80ADB3C0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 02434 80ADB3C4 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 02438 80ADB3C8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0243C 80ADB3CC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02440 80ADB3D0 46060202 */ mul.s $f8, $f0, $f6 -/* 02444 80ADB3D4 848C008A */ lh $t4, 0x008A($a0) ## 0000008A -/* 02448 80ADB3D8 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 0244C 80ADB3DC 4600428D */ trunc.w.s $f10, $f8 -/* 02450 80ADB3E0 440A5000 */ mfc1 $t2, $f10 -/* 02454 80ADB3E4 00000000 */ nop -/* 02458 80ADB3E8 000A5B80 */ sll $t3, $t2, 14 -/* 0245C 80ADB3EC 016C6821 */ addu $t5, $t3, $t4 -/* 02460 80ADB3F0 A48D00B6 */ sh $t5, 0x00B6($a0) ## 000000B6 -/* 02464 80ADB3F4 8FAE001C */ lw $t6, 0x001C($sp) -/* 02468 80ADB3F8 C5D00028 */ lwc1 $f16, 0x0028($t6) ## 00000028 -/* 0246C 80ADB3FC 46128100 */ add.s $f4, $f16, $f18 -/* 02470 80ADB400 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 -/* 02474 80ADB404 0C2B663D */ jal func_80AD98F4 -/* 02478 80ADB408 8FA50024 */ lw $a1, 0x0024($sp) -/* 0247C 80ADB40C 10000025 */ beq $zero, $zero, .L80ADB4A4 -/* 02480 80ADB410 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADB414: -/* 02484 80ADB414 8D020190 */ lw $v0, 0x0190($t0) ## 00000190 -/* 02488 80ADB418 3C0F80AE */ lui $t7, %hi(func_80ADB51C) ## $t7 = 80AE0000 -/* 0248C 80ADB41C 25EFB51C */ addiu $t7, $t7, %lo(func_80ADB51C) ## $t7 = 80ADB51C -/* 02490 80ADB420 15E20008 */ bne $t7, $v0, .L80ADB444 -/* 02494 80ADB424 3C1980AE */ lui $t9, %hi(func_80ADAE6C) ## $t9 = 80AE0000 -/* 02498 80ADB428 3C1880AE */ lui $t8, %hi(EnPoSisters_Draw) ## $t8 = 80AE0000 -/* 0249C 80ADB42C 2718D044 */ addiu $t8, $t8, %lo(EnPoSisters_Draw) ## $t8 = 80ADD044 -/* 024A0 80ADB430 ACD80134 */ sw $t8, 0x0134($a2) ## 00000134 -/* 024A4 80ADB434 0C2B6798 */ jal func_80AD9E60 -/* 024A8 80ADB438 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 024AC 80ADB43C 10000019 */ beq $zero, $zero, .L80ADB4A4 -/* 024B0 80ADB440 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADB444: -/* 024B4 80ADB444 2739AE6C */ addiu $t9, $t9, %lo(func_80ADAE6C) ## $t9 = FFFFAE6C -/* 024B8 80ADB448 17220010 */ bne $t9, $v0, .L80ADB48C -/* 024BC 80ADB44C 3C0D80AE */ lui $t5, %hi(func_80ADAFC0) ## $t5 = 80AE0000 -/* 024C0 80ADB450 846900B6 */ lh $t1, 0x00B6($v1) ## 000000B6 -/* 024C4 80ADB454 00075380 */ sll $t2, $a3, 14 -/* 024C8 80ADB458 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 024CC 80ADB45C 012A5821 */ addu $t3, $t1, $t2 -/* 024D0 80ADB460 A4CB00B6 */ sh $t3, 0x00B6($a2) ## 000000B6 -/* 024D4 80ADB464 8FAC001C */ lw $t4, 0x001C($sp) -/* 024D8 80ADB468 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 024DC 80ADB46C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 024E0 80ADB470 C5860028 */ lwc1 $f6, 0x0028($t4) ## 00000028 -/* 024E4 80ADB474 46083280 */ add.s $f10, $f6, $f8 -/* 024E8 80ADB478 E4CA0028 */ swc1 $f10, 0x0028($a2) ## 00000028 -/* 024EC 80ADB47C 0C2B663D */ jal func_80AD98F4 -/* 024F0 80ADB480 8FA50024 */ lw $a1, 0x0024($sp) -/* 024F4 80ADB484 10000007 */ beq $zero, $zero, .L80ADB4A4 -/* 024F8 80ADB488 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADB48C: -/* 024FC 80ADB48C 25ADAFC0 */ addiu $t5, $t5, %lo(func_80ADAFC0) ## $t5 = FFFFAFC0 -/* 02500 80ADB490 55A20004 */ bnel $t5, $v0, .L80ADB4A4 -/* 02504 80ADB494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02508 80ADB498 0C00B55C */ jal Actor_Kill - -/* 0250C 80ADB49C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02510 80ADB4A0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADB4A4: -/* 02514 80ADB4A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02518 80ADB4A8 03E00008 */ jr $ra -/* 0251C 80ADB4AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s deleted file mode 100644 index 1c99dc5c49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80ADB4B0 -/* 02520 80ADB4B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02524 80ADB4B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02528 80ADB4B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0252C 80ADB4BC AFBF001C */ sw $ra, 0x001C($sp) -/* 02530 80ADB4C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 02534 80ADB4C4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02538 80ADB4C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0253C 80ADB4CC 50400004 */ beql $v0, $zero, .L80ADB4E0 -/* 02540 80ADB4D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02544 80ADB4D4 0C2B6798 */ jal func_80AD9E60 -/* 02548 80ADB4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0254C 80ADB4DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB4E0: -/* 02550 80ADB4E0 0C2B65F2 */ jal func_80AD97C8 -/* 02554 80ADB4E4 8FA50024 */ lw $a1, 0x0024($sp) -/* 02558 80ADB4E8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0255C 80ADB4EC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 02560 80ADB4F0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 02564 80ADB4F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02568 80ADB4F8 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 0256C 80ADB4FC 46062200 */ add.s $f8, $f4, $f6 -/* 02570 80ADB500 0C00B56E */ jal Actor_SetHeight - -/* 02574 80ADB504 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 02578 80ADB508 8FBF001C */ lw $ra, 0x001C($sp) -/* 0257C 80ADB50C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02580 80ADB510 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02584 80ADB514 03E00008 */ jr $ra -/* 02588 80ADB518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s deleted file mode 100644 index 5c23de5d0a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s +++ /dev/null @@ -1,175 +0,0 @@ -.late_rodata -glabel D_80ADD898 - .float 0.1 - -.text -glabel func_80ADB51C -/* 0258C 80ADB51C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02590 80ADB520 AFB00018 */ sw $s0, 0x0018($sp) -/* 02594 80ADB524 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02598 80ADB528 AFBF001C */ sw $ra, 0x001C($sp) -/* 0259C 80ADB52C AFA50024 */ sw $a1, 0x0024($sp) -/* 025A0 80ADB530 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 025A4 80ADB534 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 025A8 80ADB538 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 025AC 80ADB53C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 025B0 80ADB540 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 025B4 80ADB544 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 025B8 80ADB548 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 025BC 80ADB54C 46062082 */ mul.s $f2, $f4, $f6 -/* 025C0 80ADB550 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 025C4 80ADB554 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 025C8 80ADB558 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 025CC 80ADB55C 46081001 */ sub.s $f0, $f2, $f8 -/* 025D0 80ADB560 46000005 */ abs.s $f0, $f0 -/* 025D4 80ADB564 460A0402 */ mul.s $f16, $f0, $f10 -/* 025D8 80ADB568 46028483 */ div.s $f18, $f16, $f2 -/* 025DC 80ADB56C 444EF800 */ cfc1 $t6, $31 -/* 025E0 80ADB570 44CFF800 */ ctc1 $t7, $31 -/* 025E4 80ADB574 00000000 */ nop -/* 025E8 80ADB578 46009124 */ cvt.w.s $f4, $f18 -/* 025EC 80ADB57C 444FF800 */ cfc1 $t7, $31 -/* 025F0 80ADB580 00000000 */ nop -/* 025F4 80ADB584 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 025F8 80ADB588 51E00013 */ beql $t7, $zero, .L80ADB5D8 -/* 025FC 80ADB58C 440F2000 */ mfc1 $t7, $f4 -/* 02600 80ADB590 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 02604 80ADB594 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02608 80ADB598 46049101 */ sub.s $f4, $f18, $f4 -/* 0260C 80ADB59C 44CFF800 */ ctc1 $t7, $31 -/* 02610 80ADB5A0 00000000 */ nop -/* 02614 80ADB5A4 46002124 */ cvt.w.s $f4, $f4 -/* 02618 80ADB5A8 444FF800 */ cfc1 $t7, $31 -/* 0261C 80ADB5AC 00000000 */ nop -/* 02620 80ADB5B0 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02624 80ADB5B4 15E00005 */ bne $t7, $zero, .L80ADB5CC -/* 02628 80ADB5B8 00000000 */ nop -/* 0262C 80ADB5BC 440F2000 */ mfc1 $t7, $f4 -/* 02630 80ADB5C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02634 80ADB5C4 10000007 */ beq $zero, $zero, .L80ADB5E4 -/* 02638 80ADB5C8 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80ADB5CC: -/* 0263C 80ADB5CC 10000005 */ beq $zero, $zero, .L80ADB5E4 -/* 02640 80ADB5D0 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02644 80ADB5D4 440F2000 */ mfc1 $t7, $f4 -.L80ADB5D8: -/* 02648 80ADB5D8 00000000 */ nop -/* 0264C 80ADB5DC 05E0FFFB */ bltz $t7, .L80ADB5CC -/* 02650 80ADB5E0 00000000 */ nop -.L80ADB5E4: -/* 02654 80ADB5E4 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 02658 80ADB5E8 44CEF800 */ ctc1 $t6, $31 -/* 0265C 80ADB5EC A20F0231 */ sb $t7, 0x0231($s0) ## 00000231 -/* 02660 80ADB5F0 10400003 */ beq $v0, $zero, .L80ADB600 -/* 02664 80ADB5F4 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF -/* 02668 80ADB5F8 A618019A */ sh $t8, 0x019A($s0) ## 0000019A -/* 0266C 80ADB5FC 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80ADB600: -/* 02670 80ADB600 14400017 */ bne $v0, $zero, .L80ADB660 -/* 02674 80ADB604 3C0180AE */ lui $at, %hi(D_80ADD898) ## $at = 80AE0000 -/* 02678 80ADB608 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0267C 80ADB60C 00000000 */ nop -/* 02680 80ADB610 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 02684 80ADB614 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 02688 80ADB618 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 0268C 80ADB61C 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 -/* 02690 80ADB620 46060202 */ mul.s $f8, $f0, $f6 -/* 02694 80ADB624 4600428D */ trunc.w.s $f10, $f8 -/* 02698 80ADB628 44095000 */ mfc1 $t1, $f10 -/* 0269C 80ADB62C 00000000 */ nop -/* 026A0 80ADB630 00095380 */ sll $t2, $t1, 14 -/* 026A4 80ADB634 032A5821 */ addu $t3, $t9, $t2 -/* 026A8 80ADB638 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 026AC 80ADB63C 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 026B0 80ADB640 15A00003 */ bne $t5, $zero, .L80ADB650 -/* 026B4 80ADB644 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 026B8 80ADB648 0C03D6B3 */ jal func_800F5ACC -/* 026BC 80ADB64C 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 -.L80ADB650: -/* 026C0 80ADB650 0C2B67C7 */ jal func_80AD9F1C -/* 026C4 80ADB654 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C8 80ADB658 1000003B */ beq $zero, $zero, .L80ADB748 -/* 026CC 80ADB65C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB660: -/* 026D0 80ADB660 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 026D4 80ADB664 C432D898 */ lwc1 $f18, %lo(D_80ADD898)($at) -/* 026D8 80ADB668 92040195 */ lbu $a0, 0x0195($s0) ## 00000195 -/* 026DC 80ADB66C 46128100 */ add.s $f4, $f16, $f18 -/* 026E0 80ADB670 1080002B */ beq $a0, $zero, .L80ADB720 -/* 026E4 80ADB674 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 026E8 80ADB678 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 026EC 80ADB67C 24060040 */ addiu $a2, $zero, 0x0040 ## $a2 = 00000040 -/* 026F0 80ADB680 2841005B */ slti $at, $v0, 0x005B -/* 026F4 80ADB684 54200004 */ bnel $at, $zero, .L80ADB698 -/* 026F8 80ADB688 28410047 */ slti $at, $v0, 0x0047 -/* 026FC 80ADB68C 10000012 */ beq $zero, $zero, .L80ADB6D8 -/* 02700 80ADB690 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02704 80ADB694 28410047 */ slti $at, $v0, 0x0047 -.L80ADB698: -/* 02708 80ADB698 14200003 */ bne $at, $zero, .L80ADB6A8 -/* 0270C 80ADB69C 24060040 */ addiu $a2, $zero, 0x0040 ## $a2 = 00000040 -/* 02710 80ADB6A0 1000000D */ beq $zero, $zero, .L80ADB6D8 -/* 02714 80ADB6A4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ADB6A8: -/* 02718 80ADB6A8 28410038 */ slti $at, $v0, 0x0038 -/* 0271C 80ADB6AC 14200003 */ bne $at, $zero, .L80ADB6BC -/* 02720 80ADB6B0 24060060 */ addiu $a2, $zero, 0x0060 ## $a2 = 00000060 -/* 02724 80ADB6B4 10000008 */ beq $zero, $zero, .L80ADB6D8 -/* 02728 80ADB6B8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80ADB6BC: -/* 0272C 80ADB6BC 28410029 */ slti $at, $v0, 0x0029 -/* 02730 80ADB6C0 14200004 */ bne $at, $zero, .L80ADB6D4 -/* 02734 80ADB6C4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02738 80ADB6C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0273C 80ADB6CC 10000002 */ beq $zero, $zero, .L80ADB6D8 -/* 02740 80ADB6D0 24060060 */ addiu $a2, $zero, 0x0060 ## $a2 = 00000060 -.L80ADB6D4: -/* 02744 80ADB6D4 24060100 */ addiu $a2, $zero, 0x0100 ## $a2 = 00000100 -.L80ADB6D8: -/* 02748 80ADB6D8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0274C 80ADB6DC 14810004 */ bne $a0, $at, .L80ADB6F0 -/* 02750 80ADB6E0 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 -/* 02754 80ADB6E4 00063040 */ sll $a2, $a2, 1 -/* 02758 80ADB6E8 00063400 */ sll $a2, $a2, 16 -/* 0275C 80ADB6EC 00063403 */ sra $a2, $a2, 16 -.L80ADB6F0: -/* 02760 80ADB6F0 0003C380 */ sll $t8, $v1, 14 -/* 02764 80ADB6F4 03020019 */ multu $t8, $v0 -/* 02768 80ADB6F8 8E0E0118 */ lw $t6, 0x0118($s0) ## 00000118 -/* 0276C 80ADB6FC 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 02770 80ADB700 85CF00B6 */ lh $t7, 0x00B6($t6) ## 000000B6 -/* 02774 80ADB704 00004012 */ mflo $t0 -/* 02778 80ADB708 01E82821 */ addu $a1, $t7, $t0 -/* 0277C 80ADB70C 00052C00 */ sll $a1, $a1, 16 -/* 02780 80ADB710 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 02784 80ADB714 00052C03 */ sra $a1, $a1, 16 -/* 02788 80ADB718 1000000B */ beq $zero, $zero, .L80ADB748 -/* 0278C 80ADB71C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB720: -/* 02790 80ADB720 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 02794 80ADB724 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 02798 80ADB728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0279C 80ADB72C 10410003 */ beq $v0, $at, .L80ADB73C -/* 027A0 80ADB730 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 027A4 80ADB734 54410004 */ bnel $v0, $at, .L80ADB748 -/* 027A8 80ADB738 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB73C: -/* 027AC 80ADB73C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 027B0 80ADB740 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -/* 027B4 80ADB744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB748: -/* 027B8 80ADB748 0C2B65F2 */ jal func_80AD97C8 -/* 027BC 80ADB74C 8FA50024 */ lw $a1, 0x0024($sp) -/* 027C0 80ADB750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 027C4 80ADB754 0C00B56E */ jal Actor_SetHeight - -/* 027C8 80ADB758 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 027CC 80ADB75C 8FBF001C */ lw $ra, 0x001C($sp) -/* 027D0 80ADB760 8FB00018 */ lw $s0, 0x0018($sp) -/* 027D4 80ADB764 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 027D8 80ADB768 03E00008 */ jr $ra -/* 027DC 80ADB76C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s deleted file mode 100644 index 1211887971..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s +++ /dev/null @@ -1,183 +0,0 @@ -glabel func_80ADB770 -/* 027E0 80ADB770 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 027E4 80ADB774 AFBF001C */ sw $ra, 0x001C($sp) -/* 027E8 80ADB778 AFB00018 */ sw $s0, 0x0018($sp) -/* 027EC 80ADB77C AFA50024 */ sw $a1, 0x0024($sp) -/* 027F0 80ADB780 8482019A */ lh $v0, 0x019A($a0) ## 0000019A -/* 027F4 80ADB784 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 027F8 80ADB788 10400002 */ beq $v0, $zero, .L80ADB794 -/* 027FC 80ADB78C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02800 80ADB790 A48E019A */ sh $t6, 0x019A($a0) ## 0000019A -.L80ADB794: -/* 02804 80ADB794 860F019C */ lh $t7, 0x019C($s0) ## 0000019C -/* 02808 80ADB798 59E0003F */ blezl $t7, .L80ADB898 -/* 0280C 80ADB79C 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 -/* 02810 80ADB7A0 8618019A */ lh $t8, 0x019A($s0) ## 0000019A -/* 02814 80ADB7A4 2B010010 */ slti $at, $t8, 0x0010 -/* 02818 80ADB7A8 5420003B */ bnel $at, $zero, .L80ADB898 -/* 0281C 80ADB7AC 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 -/* 02820 80ADB7B0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02824 80ADB7B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02828 80ADB7B8 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -/* 0282C 80ADB7BC 54400031 */ bnel $v0, $zero, .L80ADB884 -/* 02830 80ADB7C0 8E090118 */ lw $t1, 0x0118($s0) ## 00000118 -/* 02834 80ADB7C4 92030196 */ lbu $v1, 0x0196($s0) ## 00000196 -/* 02838 80ADB7C8 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0283C 80ADB7CC 03231023 */ subu $v0, $t9, $v1 -/* 02840 80ADB7D0 00021400 */ sll $v0, $v0, 16 -/* 02844 80ADB7D4 00021403 */ sra $v0, $v0, 16 -/* 02848 80ADB7D8 04400003 */ bltz $v0, .L80ADB7E8 -/* 0284C 80ADB7DC 00022023 */ subu $a0, $zero, $v0 -/* 02850 80ADB7E0 10000001 */ beq $zero, $zero, .L80ADB7E8 -/* 02854 80ADB7E4 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -.L80ADB7E8: -/* 02858 80ADB7E8 2881000E */ slti $at, $a0, 0x000E -/* 0285C 80ADB7EC 10200016 */ beq $at, $zero, .L80ADB848 -/* 02860 80ADB7F0 00602025 */ or $a0, $v1, $zero ## $a0 = 00000000 -/* 02864 80ADB7F4 000426C0 */ sll $a0, $a0, 27 -/* 02868 80ADB7F8 0C01DE1C */ jal Math_Sins - ## sins? -/* 0286C 80ADB7FC 00042403 */ sra $a0, $a0, 16 -/* 02870 80ADB800 8609019C */ lh $t1, 0x019C($s0) ## 0000019C -/* 02874 80ADB804 240B0580 */ addiu $t3, $zero, 0x0580 ## $t3 = 00000580 -/* 02878 80ADB808 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 0287C 80ADB80C 00095080 */ sll $t2, $t1, 2 -/* 02880 80ADB810 01495023 */ subu $t2, $t2, $t1 -/* 02884 80ADB814 000A51C0 */ sll $t2, $t2, 7 -/* 02888 80ADB818 016A6023 */ subu $t4, $t3, $t2 -/* 0288C 80ADB81C 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 02890 80ADB820 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 02894 80ADB824 46000005 */ abs.s $f0, $f0 -/* 02898 80ADB828 468042A0 */ cvt.s.w $f10, $f8 -/* 0289C 80ADB82C 468021A0 */ cvt.s.w $f6, $f4 -/* 028A0 80ADB830 46005402 */ mul.s $f16, $f10, $f0 -/* 028A4 80ADB834 46103480 */ add.s $f18, $f6, $f16 -/* 028A8 80ADB838 4600910D */ trunc.w.s $f4, $f18 -/* 028AC 80ADB83C 440E2000 */ mfc1 $t6, $f4 -/* 028B0 80ADB840 00000000 */ nop -/* 028B4 80ADB844 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 -.L80ADB848: -/* 028B8 80ADB848 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 028BC 80ADB84C 2841011C */ slti $at, $v0, 0x011C -/* 028C0 80ADB850 10200003 */ beq $at, $zero, .L80ADB860 -/* 028C4 80ADB854 2841001F */ slti $at, $v0, 0x001F -/* 028C8 80ADB858 50200006 */ beql $at, $zero, .L80ADB874 -/* 028CC 80ADB85C 92190199 */ lbu $t9, 0x0199($s0) ## 00000199 -.L80ADB860: -/* 028D0 80ADB860 920F0199 */ lbu $t7, 0x0199($s0) ## 00000199 -/* 028D4 80ADB864 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 -/* 028D8 80ADB868 1000000A */ beq $zero, $zero, .L80ADB894 -/* 028DC 80ADB86C A2180199 */ sb $t8, 0x0199($s0) ## 00000199 -/* 028E0 80ADB870 92190199 */ lbu $t9, 0x0199($s0) ## 00000199 -.L80ADB874: -/* 028E4 80ADB874 3328FFBF */ andi $t0, $t9, 0xFFBF ## $t0 = 00000000 -/* 028E8 80ADB878 10000006 */ beq $zero, $zero, .L80ADB894 -/* 028EC 80ADB87C A2080199 */ sb $t0, 0x0199($s0) ## 00000199 -/* 028F0 80ADB880 8E090118 */ lw $t1, 0x0118($s0) ## 00000118 -.L80ADB884: -/* 028F4 80ADB884 00025380 */ sll $t2, $v0, 14 -/* 028F8 80ADB888 852B00B6 */ lh $t3, 0x00B6($t1) ## 000000B6 -/* 028FC 80ADB88C 016A6021 */ addu $t4, $t3, $t2 -/* 02900 80ADB890 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 -.L80ADB894: -/* 02904 80ADB894 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 -.L80ADB898: -/* 02908 80ADB898 55A00011 */ bnel $t5, $zero, .L80ADB8E0 -/* 0290C 80ADB89C 8FA80024 */ lw $t0, 0x0024($sp) -/* 02910 80ADB8A0 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 02914 80ADB8A4 2841011C */ slti $at, $v0, 0x011C -/* 02918 80ADB8A8 10200005 */ beq $at, $zero, .L80ADB8C0 -/* 0291C 80ADB8AC 2841001F */ slti $at, $v0, 0x001F -/* 02920 80ADB8B0 10200007 */ beq $at, $zero, .L80ADB8D0 -/* 02924 80ADB8B4 28410010 */ slti $at, $v0, 0x0010 -/* 02928 80ADB8B8 54200006 */ bnel $at, $zero, .L80ADB8D4 -/* 0292C 80ADB8BC 92180199 */ lbu $t8, 0x0199($s0) ## 00000199 -.L80ADB8C0: -/* 02930 80ADB8C0 920E0199 */ lbu $t6, 0x0199($s0) ## 00000199 -/* 02934 80ADB8C4 35CF0040 */ ori $t7, $t6, 0x0040 ## $t7 = 00000040 -/* 02938 80ADB8C8 10000004 */ beq $zero, $zero, .L80ADB8DC -/* 0293C 80ADB8CC A20F0199 */ sb $t7, 0x0199($s0) ## 00000199 -.L80ADB8D0: -/* 02940 80ADB8D0 92180199 */ lbu $t8, 0x0199($s0) ## 00000199 -.L80ADB8D4: -/* 02944 80ADB8D4 3319FFBF */ andi $t9, $t8, 0xFFBF ## $t9 = 00000000 -/* 02948 80ADB8D8 A2190199 */ sb $t9, 0x0199($s0) ## 00000199 -.L80ADB8DC: -/* 0294C 80ADB8DC 8FA80024 */ lw $t0, 0x0024($sp) -.L80ADB8E0: -/* 02950 80ADB8E0 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 02954 80ADB8E4 0C00B6EC */ jal func_8002DBB0 -/* 02958 80ADB8E8 8D041C44 */ lw $a0, 0x1C44($t0) ## 00001C44 -/* 0295C 80ADB8EC 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 02960 80ADB8F0 44814000 */ mtc1 $at, $f8 ## $f8 = 600.00 -/* 02964 80ADB8F4 00000000 */ nop -/* 02968 80ADB8F8 4600403C */ c.lt.s $f8, $f0 -/* 0296C 80ADB8FC 00000000 */ nop -/* 02970 80ADB900 4502000A */ bc1fl .L80ADB92C -/* 02974 80ADB904 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -/* 02978 80ADB908 92090199 */ lbu $t1, 0x0199($s0) ## 00000199 -/* 0297C 80ADB90C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02980 80ADB910 312BFFBF */ andi $t3, $t1, 0xFFBF ## $t3 = 00000000 -/* 02984 80ADB914 A20B0199 */ sb $t3, 0x0199($s0) ## 00000199 -/* 02988 80ADB918 0C2B6709 */ jal func_80AD9C24 -/* 0298C 80ADB91C 8FA50024 */ lw $a1, 0x0024($sp) -/* 02990 80ADB920 1000002C */ beq $zero, $zero, .L80ADB9D4 -/* 02994 80ADB924 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02998 80ADB928 860A019A */ lh $t2, 0x019A($s0) ## 0000019A -.L80ADB92C: -/* 0299C 80ADB92C 5540000E */ bnel $t2, $zero, .L80ADB968 -/* 029A0 80ADB930 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 -/* 029A4 80ADB934 920C0195 */ lbu $t4, 0x0195($s0) ## 00000195 -/* 029A8 80ADB938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029AC 80ADB93C 15800005 */ bne $t4, $zero, .L80ADB954 -/* 029B0 80ADB940 00000000 */ nop -/* 029B4 80ADB944 0C2B6538 */ jal func_80AD94E0 -/* 029B8 80ADB948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029BC 80ADB94C 10000021 */ beq $zero, $zero, .L80ADB9D4 -/* 029C0 80ADB950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB954: -/* 029C4 80ADB954 0C2B6709 */ jal func_80AD9C24 -/* 029C8 80ADB958 8FA50024 */ lw $a1, 0x0024($sp) -/* 029CC 80ADB95C 1000001D */ beq $zero, $zero, .L80ADB9D4 -/* 029D0 80ADB960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029D4 80ADB964 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 -.L80ADB968: -/* 029D8 80ADB968 51A0000C */ beql $t5, $zero, .L80ADB99C -/* 029DC 80ADB96C 8602019C */ lh $v0, 0x019C($s0) ## 0000019C -/* 029E0 80ADB970 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 029E4 80ADB974 3C0E80AE */ lui $t6, %hi(func_80ADAAA4) ## $t6 = 80AE0000 -/* 029E8 80ADB978 25CEAAA4 */ addiu $t6, $t6, %lo(func_80ADAAA4) ## $t6 = 80ADAAA4 -/* 029EC 80ADB97C 8C4F0190 */ lw $t7, 0x0190($v0) ## 00000190 -/* 029F0 80ADB980 55CF0014 */ bnel $t6, $t7, .L80ADB9D4 -/* 029F4 80ADB984 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 029F8 80ADB988 0C2B6576 */ jal func_80AD95D8 -/* 029FC 80ADB98C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A00 80ADB990 10000010 */ beq $zero, $zero, .L80ADB9D4 -/* 02A04 80ADB994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A08 80ADB998 8602019C */ lh $v0, 0x019C($s0) ## 0000019C -.L80ADB99C: -/* 02A0C 80ADB99C 2418FFF1 */ addiu $t8, $zero, 0xFFF1 ## $t8 = FFFFFFF1 -/* 02A10 80ADB9A0 14400003 */ bne $v0, $zero, .L80ADB9B0 -/* 02A14 80ADB9A4 00000000 */ nop -/* 02A18 80ADB9A8 10000009 */ beq $zero, $zero, .L80ADB9D0 -/* 02A1C 80ADB9AC A618019C */ sh $t8, 0x019C($s0) ## 0000019C -.L80ADB9B0: -/* 02A20 80ADB9B0 04410007 */ bgez $v0, .L80ADB9D0 -/* 02A24 80ADB9B4 24590001 */ addiu $t9, $v0, 0x0001 ## $t9 = 00000001 -/* 02A28 80ADB9B8 A619019C */ sh $t9, 0x019C($s0) ## 0000019C -/* 02A2C 80ADB9BC 8608019C */ lh $t0, 0x019C($s0) ## 0000019C -/* 02A30 80ADB9C0 55000004 */ bnel $t0, $zero, .L80ADB9D4 -/* 02A34 80ADB9C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A38 80ADB9C8 0C2B6538 */ jal func_80AD94E0 -/* 02A3C 80ADB9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB9D0: -/* 02A40 80ADB9D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADB9D4: -/* 02A44 80ADB9D4 0C2B65F2 */ jal func_80AD97C8 -/* 02A48 80ADB9D8 8FA50024 */ lw $a1, 0x0024($sp) -/* 02A4C 80ADB9DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 02A50 80ADB9E0 8FB00018 */ lw $s0, 0x0018($sp) -/* 02A54 80ADB9E4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02A58 80ADB9E8 03E00008 */ jr $ra -/* 02A5C 80ADB9EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s deleted file mode 100644 index 7de3ed79ec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80ADB9F0 -/* 02A60 80ADB9F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02A64 80ADB9F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02A68 80ADB9F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02A6C 80ADB9FC AFBF001C */ sw $ra, 0x001C($sp) -/* 02A70 80ADBA00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02A74 80ADBA04 AFA5002C */ sw $a1, 0x002C($sp) -/* 02A78 80ADBA08 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02A7C 80ADBA0C AFA40020 */ sw $a0, 0x0020($sp) -/* 02A80 80ADBA10 5040001B */ beql $v0, $zero, .L80ADBA80 -/* 02A84 80ADBA14 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 02A88 80ADBA18 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 -/* 02A8C 80ADBA1C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 02A90 80ADBA20 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02A94 80ADBA24 15E10011 */ bne $t7, $at, .L80ADBA6C -/* 02A98 80ADBA28 A20E0231 */ sb $t6, 0x0231($s0) ## 00000231 -/* 02A9C 80ADBA2C 3C0144F9 */ lui $at, 0x44F9 ## $at = 44F90000 -/* 02AA0 80ADBA30 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 -/* 02AA4 80ADBA34 44812000 */ mtc1 $at, $f4 ## $f4 = 1992.00 -/* 02AA8 80ADBA38 92080199 */ lbu $t0, 0x0199($s0) ## 00000199 -/* 02AAC 80ADBA3C 3C01C4B4 */ lui $at, 0xC4B4 ## $at = C4B40000 -/* 02AB0 80ADBA40 44813000 */ mtc1 $at, $f6 ## $f6 = -1440.00 -/* 02AB4 80ADBA44 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 02AB8 80ADBA48 35090018 */ ori $t1, $t0, 0x0018 ## $t1 = 00000018 -/* 02ABC 80ADBA4C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 02AC0 80ADBA50 A2090199 */ sb $t1, 0x0199($s0) ## 00000199 -/* 02AC4 80ADBA54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AC8 80ADBA58 E6040008 */ swc1 $f4, 0x0008($s0) ## 00000008 -/* 02ACC 80ADBA5C 0C2B64F1 */ jal func_80AD93C4 -/* 02AD0 80ADBA60 E6060010 */ swc1 $f6, 0x0010($s0) ## 00000010 -/* 02AD4 80ADBA64 1000002F */ beq $zero, $zero, .L80ADBB24 -/* 02AD8 80ADBA68 920C0194 */ lbu $t4, 0x0194($s0) ## 00000194 -.L80ADBA6C: -/* 02ADC 80ADBA6C 0C2B67E4 */ jal func_80AD9F90 -/* 02AE0 80ADBA70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AE4 80ADBA74 1000002B */ beq $zero, $zero, .L80ADBB24 -/* 02AE8 80ADBA78 920C0194 */ lbu $t4, 0x0194($s0) ## 00000194 -/* 02AEC 80ADBA7C C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -.L80ADBA80: -/* 02AF0 80ADBA80 C60A015C */ lwc1 $f10, 0x015C($s0) ## 0000015C -/* 02AF4 80ADBA84 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 02AF8 80ADBA88 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 02AFC 80ADBA8C 460A4003 */ div.s $f0, $f8, $f10 -/* 02B00 80ADBA90 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02B04 80ADBA94 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02B08 80ADBA98 46008482 */ mul.s $f18, $f16, $f0 -/* 02B0C 80ADBA9C 444AF800 */ cfc1 $t2, $31 -/* 02B10 80ADBAA0 44CBF800 */ ctc1 $t3, $31 -/* 02B14 80ADBAA4 00000000 */ nop -/* 02B18 80ADBAA8 46009124 */ cvt.w.s $f4, $f18 -/* 02B1C 80ADBAAC 444BF800 */ cfc1 $t3, $31 -/* 02B20 80ADBAB0 00000000 */ nop -/* 02B24 80ADBAB4 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 02B28 80ADBAB8 51600013 */ beql $t3, $zero, .L80ADBB08 -/* 02B2C 80ADBABC 440B2000 */ mfc1 $t3, $f4 -/* 02B30 80ADBAC0 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 02B34 80ADBAC4 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02B38 80ADBAC8 46049101 */ sub.s $f4, $f18, $f4 -/* 02B3C 80ADBACC 44CBF800 */ ctc1 $t3, $31 -/* 02B40 80ADBAD0 00000000 */ nop -/* 02B44 80ADBAD4 46002124 */ cvt.w.s $f4, $f4 -/* 02B48 80ADBAD8 444BF800 */ cfc1 $t3, $31 -/* 02B4C 80ADBADC 00000000 */ nop -/* 02B50 80ADBAE0 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 02B54 80ADBAE4 15600005 */ bne $t3, $zero, .L80ADBAFC -/* 02B58 80ADBAE8 00000000 */ nop -/* 02B5C 80ADBAEC 440B2000 */ mfc1 $t3, $f4 -/* 02B60 80ADBAF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02B64 80ADBAF4 10000007 */ beq $zero, $zero, .L80ADBB14 -/* 02B68 80ADBAF8 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 -.L80ADBAFC: -/* 02B6C 80ADBAFC 10000005 */ beq $zero, $zero, .L80ADBB14 -/* 02B70 80ADBB00 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 02B74 80ADBB04 440B2000 */ mfc1 $t3, $f4 -.L80ADBB08: -/* 02B78 80ADBB08 00000000 */ nop -/* 02B7C 80ADBB0C 0560FFFB */ bltz $t3, .L80ADBAFC -/* 02B80 80ADBB10 00000000 */ nop -.L80ADBB14: -/* 02B84 80ADBB14 44CAF800 */ ctc1 $t2, $31 -/* 02B88 80ADBB18 A20B0231 */ sb $t3, 0x0231($s0) ## 00000231 -/* 02B8C 80ADBB1C 00000000 */ nop -/* 02B90 80ADBB20 920C0194 */ lbu $t4, 0x0194($s0) ## 00000194 -.L80ADBB24: -/* 02B94 80ADBB24 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02B98 80ADBB28 8FA40020 */ lw $a0, 0x0020($sp) -/* 02B9C 80ADBB2C 51810008 */ beql $t4, $at, .L80ADBB50 -/* 02BA0 80ADBB30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BA4 80ADBB34 0C0295B2 */ jal func_800A56C8 -/* 02BA8 80ADBB38 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 02BAC 80ADBB3C 10400003 */ beq $v0, $zero, .L80ADBB4C -/* 02BB0 80ADBB40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BB4 80ADBB44 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02BB8 80ADBB48 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -.L80ADBB4C: -/* 02BBC 80ADBB4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADBB50: -/* 02BC0 80ADBB50 0C00B56E */ jal Actor_SetHeight - -/* 02BC4 80ADBB54 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 02BC8 80ADBB58 8FBF001C */ lw $ra, 0x001C($sp) -/* 02BCC 80ADBB5C 8FB00018 */ lw $s0, 0x0018($sp) -/* 02BD0 80ADBB60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02BD4 80ADBB64 03E00008 */ jr $ra -/* 02BD8 80ADBB68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s deleted file mode 100644 index e8d3fbbaa1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80ADBB6C -/* 02BDC 80ADBB6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02BE0 80ADBB70 AFB00018 */ sw $s0, 0x0018($sp) -/* 02BE4 80ADBB74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02BE8 80ADBB78 AFBF001C */ sw $ra, 0x001C($sp) -/* 02BEC 80ADBB7C AFA5002C */ sw $a1, 0x002C($sp) -/* 02BF0 80ADBB80 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02BF4 80ADBB84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02BF8 80ADBB88 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 02BFC 80ADBB8C AFA50020 */ sw $a1, 0x0020($sp) -/* 02C00 80ADBB90 0C00B6EC */ jal func_8002DBB0 -/* 02C04 80ADBB94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C08 80ADBB98 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02C0C 80ADBB9C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 02C10 80ADBBA0 8FA50020 */ lw $a1, 0x0020($sp) -/* 02C14 80ADBBA4 4604003C */ c.lt.s $f0, $f4 -/* 02C18 80ADBBA8 00000000 */ nop -/* 02C1C 80ADBBAC 45000005 */ bc1f .L80ADBBC4 -/* 02C20 80ADBBB0 00000000 */ nop -/* 02C24 80ADBBB4 0C2B680A */ jal func_80ADA028 -/* 02C28 80ADBBB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C2C 80ADBBBC 10000009 */ beq $zero, $zero, .L80ADBBE4 -/* 02C30 80ADBBC0 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADBBC4: -/* 02C34 80ADBBC4 0C00B6B0 */ jal func_8002DAC0 -/* 02C38 80ADBBC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02C3C 80ADBBCC 00022C00 */ sll $a1, $v0, 16 -/* 02C40 80ADBBD0 00052C03 */ sra $a1, $a1, 16 -/* 02C44 80ADBBD4 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 02C48 80ADBBD8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 02C4C 80ADBBDC 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 02C50 80ADBBE0 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADBBE4: -/* 02C54 80ADBBE4 8FB00018 */ lw $s0, 0x0018($sp) -/* 02C58 80ADBBE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02C5C 80ADBBEC 03E00008 */ jr $ra -/* 02C60 80ADBBF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s deleted file mode 100644 index 56793c4752..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80ADBBF4 -/* 02C64 80ADBBF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02C68 80ADBBF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02C6C 80ADBBFC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02C70 80ADBC00 AFA5001C */ sw $a1, 0x001C($sp) -/* 02C74 80ADBC04 AFA70018 */ sw $a3, 0x0018($sp) -/* 02C78 80ADBC08 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02C7C 80ADBC0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02C80 80ADBC10 8FA70018 */ lw $a3, 0x0018($sp) -/* 02C84 80ADBC14 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 02C88 80ADBC18 24E40032 */ addiu $a0, $a3, 0x0032 ## $a0 = 00000032 -/* 02C8C 80ADBC1C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 02C90 80ADBC20 84E5008A */ lh $a1, 0x008A($a3) ## 0000008A -/* 02C94 80ADBC24 8FA70018 */ lw $a3, 0x0018($sp) -/* 02C98 80ADBC28 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 02C9C 80ADBC2C 44813000 */ mtc1 $at, $f6 ## $f6 = 240.00 -/* 02CA0 80ADBC30 C4E40090 */ lwc1 $f4, 0x0090($a3) ## 00000090 -/* 02CA4 80ADBC34 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02CA8 80ADBC38 4606203C */ c.lt.s $f4, $f6 -/* 02CAC 80ADBC3C 00000000 */ nop -/* 02CB0 80ADBC40 4502000E */ bc1fl .L80ADBC7C -/* 02CB4 80ADBC44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02CB8 80ADBC48 C4E80094 */ lwc1 $f8, 0x0094($a3) ## 00000094 -/* 02CBC 80ADBC4C 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 02CC0 80ADBC50 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 02CC4 80ADBC54 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 02CC8 80ADBC58 460A4000 */ add.s $f0, $f8, $f10 -/* 02CCC 80ADBC5C 46000005 */ abs.s $f0, $f0 -/* 02CD0 80ADBC60 4610003C */ c.lt.s $f0, $f16 -/* 02CD4 80ADBC64 00000000 */ nop -/* 02CD8 80ADBC68 45020004 */ bc1fl .L80ADBC7C -/* 02CDC 80ADBC6C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02CE0 80ADBC70 0C2B64F1 */ jal func_80AD93C4 -/* 02CE4 80ADBC74 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 02CE8 80ADBC78 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADBC7C: -/* 02CEC 80ADBC7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02CF0 80ADBC80 03E00008 */ jr $ra -/* 02CF4 80ADBC84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s deleted file mode 100644 index 1f477a29be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80ADBC88 -/* 02CF8 80ADBC88 3C0E80AE */ lui $t6, %hi(D_80ADD784) ## $t6 = 80AE0000 -/* 02CFC 80ADBC8C 8DCED784 */ lw $t6, %lo(D_80ADD784)($t6) -/* 02D00 80ADBC90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D04 80ADBC94 AFB00020 */ sw $s0, 0x0020($sp) -/* 02D08 80ADBC98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D0C 80ADBC9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02D10 80ADBCA0 15C00005 */ bne $t6, $zero, .L80ADBCB8 -/* 02D14 80ADBCA4 AFA5002C */ sw $a1, 0x002C($sp) -/* 02D18 80ADBCA8 0C023A62 */ jal Player_InCsMode -/* 02D1C 80ADBCAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02D20 80ADBCB0 5440001A */ bnel $v0, $zero, .L80ADBD1C -/* 02D24 80ADBCB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADBCB8: -/* 02D28 80ADBCB8 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 02D2C 80ADBCBC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 02D30 80ADBCC0 10400003 */ beq $v0, $zero, .L80ADBCD0 -/* 02D34 80ADBCC4 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 02D38 80ADBCC8 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 02D3C 80ADBCCC 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80ADBCD0: -/* 02D40 80ADBCD0 1441000D */ bne $v0, $at, .L80ADBD08 -/* 02D44 80ADBCD4 00000000 */ nop -/* 02D48 80ADBCD8 92180194 */ lbu $t8, 0x0194($s0) ## 00000194 -/* 02D4C 80ADBCDC 8FA4002C */ lw $a0, 0x002C($sp) -/* 02D50 80ADBCE0 24050C44 */ addiu $a1, $zero, 0x0C44 ## $a1 = 00000C44 -/* 02D54 80ADBCE4 17000004 */ bne $t8, $zero, .L80ADBCF8 -/* 02D58 80ADBCE8 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 -/* 02D5C 80ADBCEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02D60 80ADBCF0 0C02003E */ jal func_800800F8 -/* 02D64 80ADBCF4 AFA00010 */ sw $zero, 0x0010($sp) -.L80ADBCF8: -/* 02D68 80ADBCF8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02D6C 80ADBCFC 3C0180AE */ lui $at, %hi(D_80ADD784) ## $at = 80AE0000 -/* 02D70 80ADBD00 AC39D784 */ sw $t9, %lo(D_80ADD784)($at) -/* 02D74 80ADBD04 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80ADBD08: -/* 02D78 80ADBD08 54400004 */ bnel $v0, $zero, .L80ADBD1C -/* 02D7C 80ADBD0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D80 80ADBD10 0C2B6843 */ jal func_80ADA10C -/* 02D84 80ADBD14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D88 80ADBD18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADBD1C: -/* 02D8C 80ADBD1C 0C00BE5D */ jal func_8002F974 -/* 02D90 80ADBD20 24052031 */ addiu $a1, $zero, 0x2031 ## $a1 = 00002031 -/* 02D94 80ADBD24 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02D98 80ADBD28 8FB00020 */ lw $s0, 0x0020($sp) -/* 02D9C 80ADBD2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DA0 80ADBD30 03E00008 */ jr $ra -/* 02DA4 80ADBD34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s deleted file mode 100644 index 12995146e2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80ADBD38 -/* 02DA8 80ADBD38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02DAC 80ADBD3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 02DB0 80ADBD40 AFA5001C */ sw $a1, 0x001C($sp) -/* 02DB4 80ADBD44 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 02DB8 80ADBD48 24860008 */ addiu $a2, $a0, 0x0008 ## $a2 = 00000008 -/* 02DBC 80ADBD4C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 02DC0 80ADBD50 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 02DC4 80ADBD54 8485019A */ lh $a1, 0x019A($a0) ## 0000019A -/* 02DC8 80ADBD58 0C2B6490 */ jal func_80AD9240 -/* 02DCC 80ADBD5C AFA40018 */ sw $a0, 0x0018($sp) -/* 02DD0 80ADBD60 8FA40018 */ lw $a0, 0x0018($sp) -/* 02DD4 80ADBD64 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 02DD8 80ADBD68 8498019A */ lh $t8, 0x019A($a0) ## 0000019A -/* 02DDC 80ADBD6C 57010004 */ bnel $t8, $at, .L80ADBD80 -/* 02DE0 80ADBD70 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02DE4 80ADBD74 0C2B686E */ jal func_80ADA1B8 -/* 02DE8 80ADBD78 00000000 */ nop -/* 02DEC 80ADBD7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADBD80: -/* 02DF0 80ADBD80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02DF4 80ADBD84 03E00008 */ jr $ra -/* 02DF8 80ADBD88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s deleted file mode 100644 index 6ad668303b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_80ADBD8C -/* 02DFC 80ADBD8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02E00 80ADBD90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02E04 80ADBD94 AFA5001C */ sw $a1, 0x001C($sp) -/* 02E08 80ADBD98 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 02E0C 80ADBD9C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 02E10 80ADBDA0 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 02E14 80ADBDA4 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 02E18 80ADBDA8 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 02E1C 80ADBDAC 8482019A */ lh $v0, 0x019A($a0) ## 0000019A -/* 02E20 80ADBDB0 14400008 */ bne $v0, $zero, .L80ADBDD4 -/* 02E24 80ADBDB4 00000000 */ nop -/* 02E28 80ADBDB8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02E2C 80ADBDBC AFA60018 */ sw $a2, 0x0018($sp) -/* 02E30 80ADBDC0 8FA60018 */ lw $a2, 0x0018($sp) -/* 02E34 80ADBDC4 90D80199 */ lbu $t8, 0x0199($a2) ## 00000199 -/* 02E38 80ADBDC8 84C2019A */ lh $v0, 0x019A($a2) ## 0000019A -/* 02E3C 80ADBDCC 3319FF7F */ andi $t9, $t8, 0xFF7F ## $t9 = 00000000 -/* 02E40 80ADBDD0 A0D90199 */ sb $t9, 0x0199($a2) ## 00000199 -.L80ADBDD4: -/* 02E44 80ADBDD4 1C400038 */ bgtz $v0, .L80ADBEB8 -/* 02E48 80ADBDD8 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C -/* 02E4C 80ADBDDC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02E50 80ADBDE0 AFA60018 */ sw $a2, 0x0018($sp) -/* 02E54 80ADBDE4 1040000C */ beq $v0, $zero, .L80ADBE18 -/* 02E58 80ADBDE8 8FA60018 */ lw $a2, 0x0018($sp) -/* 02E5C 80ADBDEC 3C0280AE */ lui $v0, %hi(D_80ADD784) ## $v0 = 80AE0000 -/* 02E60 80ADBDF0 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 02E64 80ADBDF4 90CA0194 */ lbu $t2, 0x0194($a2) ## 00000194 -/* 02E68 80ADBDF8 2442D784 */ addiu $v0, $v0, %lo(D_80ADD784) ## $v0 = 80ADD784 -/* 02E6C 80ADBDFC A0C80231 */ sb $t0, 0x0231($a2) ## 00000231 -/* 02E70 80ADBE00 8C490000 */ lw $t1, 0x0000($v0) ## 80ADD784 -/* 02E74 80ADBE04 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02E78 80ADBE08 014B6004 */ sllv $t4, $t3, $t2 -/* 02E7C 80ADBE0C 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 -/* 02E80 80ADBE10 10000029 */ beq $zero, $zero, .L80ADBEB8 -/* 02E84 80ADBE14 AC4D0000 */ sw $t5, 0x0000($v0) ## 80ADD784 -.L80ADBE18: -/* 02E88 80ADBE18 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 02E8C 80ADBE1C 44813000 */ mtc1 $at, $f6 ## $f6 = 255.00 -/* 02E90 80ADBE20 C4C40164 */ lwc1 $f4, 0x0164($a2) ## 00000164 -/* 02E94 80ADBE24 C4CA015C */ lwc1 $f10, 0x015C($a2) ## 0000015C -/* 02E98 80ADBE28 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02E9C 80ADBE2C 46062202 */ mul.s $f8, $f4, $f6 -/* 02EA0 80ADBE30 460A4403 */ div.s $f16, $f8, $f10 -/* 02EA4 80ADBE34 444EF800 */ cfc1 $t6, $31 -/* 02EA8 80ADBE38 44CFF800 */ ctc1 $t7, $31 -/* 02EAC 80ADBE3C 00000000 */ nop -/* 02EB0 80ADBE40 460084A4 */ cvt.w.s $f18, $f16 -/* 02EB4 80ADBE44 444FF800 */ cfc1 $t7, $31 -/* 02EB8 80ADBE48 00000000 */ nop -/* 02EBC 80ADBE4C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02EC0 80ADBE50 11E00012 */ beq $t7, $zero, .L80ADBE9C -/* 02EC4 80ADBE54 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02EC8 80ADBE58 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 02ECC 80ADBE5C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 02ED0 80ADBE60 46128481 */ sub.s $f18, $f16, $f18 -/* 02ED4 80ADBE64 44CFF800 */ ctc1 $t7, $31 -/* 02ED8 80ADBE68 00000000 */ nop -/* 02EDC 80ADBE6C 460094A4 */ cvt.w.s $f18, $f18 -/* 02EE0 80ADBE70 444FF800 */ cfc1 $t7, $31 -/* 02EE4 80ADBE74 00000000 */ nop -/* 02EE8 80ADBE78 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02EEC 80ADBE7C 15E00005 */ bne $t7, $zero, .L80ADBE94 -/* 02EF0 80ADBE80 00000000 */ nop -/* 02EF4 80ADBE84 440F9000 */ mfc1 $t7, $f18 -/* 02EF8 80ADBE88 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02EFC 80ADBE8C 10000007 */ beq $zero, $zero, .L80ADBEAC -/* 02F00 80ADBE90 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80ADBE94: -/* 02F04 80ADBE94 10000005 */ beq $zero, $zero, .L80ADBEAC -/* 02F08 80ADBE98 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -.L80ADBE9C: -/* 02F0C 80ADBE9C 440F9000 */ mfc1 $t7, $f18 -/* 02F10 80ADBEA0 00000000 */ nop -/* 02F14 80ADBEA4 05E0FFFB */ bltz $t7, .L80ADBE94 -/* 02F18 80ADBEA8 00000000 */ nop -.L80ADBEAC: -/* 02F1C 80ADBEAC 44CEF800 */ ctc1 $t6, $31 -/* 02F20 80ADBEB0 A0CF0231 */ sb $t7, 0x0231($a2) ## 00000231 -/* 02F24 80ADBEB4 00000000 */ nop -.L80ADBEB8: -/* 02F28 80ADBEB8 3C0280AE */ lui $v0, %hi(D_80ADD784) ## $v0 = 80AE0000 -/* 02F2C 80ADBEBC 2442D784 */ addiu $v0, $v0, %lo(D_80ADD784) ## $v0 = 80ADD784 -/* 02F30 80ADBEC0 8C580000 */ lw $t8, 0x0000($v0) ## 80ADD784 -/* 02F34 80ADBEC4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 02F38 80ADBEC8 57010004 */ bnel $t8, $at, .L80ADBEDC -/* 02F3C 80ADBECC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02F40 80ADBED0 0C2B6897 */ jal func_80ADA25C -/* 02F44 80ADBED4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 02F48 80ADBED8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADBEDC: -/* 02F4C 80ADBEDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02F50 80ADBEE0 03E00008 */ jr $ra -/* 02F54 80ADBEE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s deleted file mode 100644 index 19bcdd30de..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80ADBEE8 -/* 02F58 80ADBEE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02F5C 80ADBEEC AFBF0014 */ sw $ra, 0x0014($sp) -/* 02F60 80ADBEF0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 02F64 80ADBEF4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02F68 80ADBEF8 AFA70018 */ sw $a3, 0x0018($sp) -/* 02F6C 80ADBEFC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02F70 80ADBF00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02F74 80ADBF04 8FA70018 */ lw $a3, 0x0018($sp) -/* 02F78 80ADBF08 84E5019A */ lh $a1, 0x019A($a3) ## 0000019A -/* 02F7C 80ADBF0C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 02F80 80ADBF10 24E60008 */ addiu $a2, $a3, 0x0008 ## $a2 = 00000008 -/* 02F84 80ADBF14 10A00003 */ beq $a1, $zero, .L80ADBF24 -/* 02F88 80ADBF18 24AEFFFF */ addiu $t6, $a1, 0xFFFF ## $t6 = FFFFFFFF -/* 02F8C 80ADBF1C A4EE019A */ sh $t6, 0x019A($a3) ## 0000019A -/* 02F90 80ADBF20 84E5019A */ lh $a1, 0x019A($a3) ## 0000019A -.L80ADBF24: -/* 02F94 80ADBF24 0C2B6490 */ jal func_80AD9240 -/* 02F98 80ADBF28 AFA70018 */ sw $a3, 0x0018($sp) -/* 02F9C 80ADBF2C 8FA70018 */ lw $a3, 0x0018($sp) -/* 02FA0 80ADBF30 84EF019A */ lh $t7, 0x019A($a3) ## 0000019A -/* 02FA4 80ADBF34 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 02FA8 80ADBF38 55E00004 */ bnel $t7, $zero, .L80ADBF4C -/* 02FAC 80ADBF3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02FB0 80ADBF40 0C2B68AF */ jal func_80ADA2BC -/* 02FB4 80ADBF44 8FA5001C */ lw $a1, 0x001C($sp) -/* 02FB8 80ADBF48 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADBF4C: -/* 02FBC 80ADBF4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02FC0 80ADBF50 03E00008 */ jr $ra -/* 02FC4 80ADBF54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s deleted file mode 100644 index a1aa0218e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_80ADBF58 -/* 02FC8 80ADBF58 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02FCC 80ADBF5C AFB00018 */ sw $s0, 0x0018($sp) -/* 02FD0 80ADBF60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FD4 80ADBF64 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FD8 80ADBF68 AFA50024 */ sw $a1, 0x0024($sp) -/* 02FDC 80ADBF6C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02FE0 80ADBF70 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02FE4 80ADBF74 860E019A */ lh $t6, 0x019A($s0) ## 0000019A -/* 02FE8 80ADBF78 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 02FEC 80ADBF7C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 02FF0 80ADBF80 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 02FF4 80ADBF84 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A -/* 02FF8 80ADBF88 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 02FFC 80ADBF8C 24060500 */ addiu $a2, $zero, 0x0500 ## $a2 = 00000500 -/* 03000 80ADBF90 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 03004 80ADBF94 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 03008 80ADBF98 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 0300C 80ADBF9C 14400009 */ bne $v0, $zero, .L80ADBFC4 -/* 03010 80ADBFA0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 03014 80ADBFA4 92180194 */ lbu $t8, 0x0194($s0) ## 00000194 -/* 03018 80ADBFA8 8FA80024 */ lw $t0, 0x0024($sp) -/* 0301C 80ADBFAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03020 80ADBFB0 17000004 */ bne $t8, $zero, .L80ADBFC4 -/* 03024 80ADBFB4 00280821 */ addu $at, $at, $t0 -/* 03028 80ADBFB8 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 0302C 80ADBFBC A0390AE3 */ sb $t9, 0x0AE3($at) ## 00010AE3 -/* 03030 80ADBFC0 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80ADBFC4: -/* 03034 80ADBFC4 04430005 */ bgezl $v0, .L80ADBFDC -/* 03038 80ADBFC8 2401FFBA */ addiu $at, $zero, 0xFFBA ## $at = FFFFFFBA -/* 0303C 80ADBFCC 0C01DE80 */ jal Math_ApproxF - -/* 03040 80ADBFD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03044 80ADBFD4 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 03048 80ADBFD8 2401FFBA */ addiu $at, $zero, 0xFFBA ## $at = FFFFFFBA -.L80ADBFDC: -/* 0304C 80ADBFDC 5441000C */ bnel $v0, $at, .L80ADC010 -/* 03050 80ADBFE0 2841FF88 */ slti $at, $v0, 0xFF88 -/* 03054 80ADBFE4 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 -/* 03058 80ADBFE8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0305C 80ADBFEC 8FA40024 */ lw $a0, 0x0024($sp) -/* 03060 80ADBFF0 15210006 */ bne $t1, $at, .L80ADC00C -/* 03064 80ADBFF4 3C0580AE */ lui $a1, %hi(D_80ADD7BC) ## $a1 = 80AE0000 -/* 03068 80ADBFF8 24A5D7BC */ addiu $a1, $a1, %lo(D_80ADD7BC) ## $a1 = 80ADD7BC -/* 0306C 80ADBFFC 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 -/* 03070 80ADC000 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 03074 80ADC004 240738EC */ addiu $a3, $zero, 0x38EC ## $a3 = 000038EC -/* 03078 80ADC008 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -.L80ADC00C: -/* 0307C 80ADC00C 2841FF88 */ slti $at, $v0, 0xFF88 -.L80ADC010: -/* 03080 80ADC010 50200004 */ beql $at, $zero, .L80ADC024 -/* 03084 80ADC014 8FBF001C */ lw $ra, 0x001C($sp) -/* 03088 80ADC018 0C00B55C */ jal Actor_Kill - -/* 0308C 80ADC01C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03090 80ADC020 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADC024: -/* 03094 80ADC024 8FB00018 */ lw $s0, 0x0018($sp) -/* 03098 80ADC028 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0309C 80ADC02C 03E00008 */ jr $ra -/* 030A0 80ADC030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s deleted file mode 100644 index 5bbec4213e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80ADC034 -/* 030A4 80ADC034 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 030A8 80ADC038 AFBF0014 */ sw $ra, 0x0014($sp) -/* 030AC 80ADC03C 908E010C */ lbu $t6, 0x010C($a0) ## 0000010C -/* 030B0 80ADC040 3C0980AE */ lui $t1, %hi(func_80ADA8C0) ## $t1 = 80AE0000 -/* 030B4 80ADC044 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 030B8 80ADC048 11C0000B */ beq $t6, $zero, .L80ADC078 -/* 030BC 80ADC04C 2529A8C0 */ addiu $t1, $t1, %lo(func_80ADA8C0) ## $t1 = 80ADA8C0 -/* 030C0 80ADC050 90820231 */ lbu $v0, 0x0231($a0) ## 00000231 -/* 030C4 80ADC054 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 030C8 80ADC058 54410008 */ bnel $v0, $at, .L80ADC07C -/* 030CC 80ADC05C A0980197 */ sb $t8, 0x0197($a0) ## 00000197 -/* 030D0 80ADC060 90830197 */ lbu $v1, 0x0197($a0) ## 00000197 -/* 030D4 80ADC064 10600006 */ beq $v1, $zero, .L80ADC080 -/* 030D8 80ADC068 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF -/* 030DC 80ADC06C A08F0197 */ sb $t7, 0x0197($a0) ## 00000197 -/* 030E0 80ADC070 10000003 */ beq $zero, $zero, .L80ADC080 -/* 030E4 80ADC074 90820231 */ lbu $v0, 0x0231($a0) ## 00000231 -.L80ADC078: -/* 030E8 80ADC078 A0980197 */ sb $t8, 0x0197($a0) ## 00000197 -.L80ADC07C: -/* 030EC 80ADC07C 90820231 */ lbu $v0, 0x0231($a0) ## 00000231 -.L80ADC080: -/* 030F0 80ADC080 54400006 */ bnel $v0, $zero, .L80ADC09C -/* 030F4 80ADC084 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 030F8 80ADC088 8482019C */ lh $v0, 0x019C($a0) ## 0000019C -/* 030FC 80ADC08C 10400002 */ beq $v0, $zero, .L80ADC098 -/* 03100 80ADC090 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 03104 80ADC094 A499019C */ sh $t9, 0x019C($a0) ## 0000019C -.L80ADC098: -/* 03108 80ADC098 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -.L80ADC09C: -/* 0310C 80ADC09C 3C0880AE */ lui $t0, %hi(func_80ADA7F0) ## $t0 = 80AE0000 -/* 03110 80ADC0A0 2508A7F0 */ addiu $t0, $t0, %lo(func_80ADA7F0) ## $t0 = 80ADA7F0 -/* 03114 80ADC0A4 51020016 */ beql $t0, $v0, .L80ADC100 -/* 03118 80ADC0A8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0311C 80ADC0AC 11220013 */ beq $t1, $v0, .L80ADC0FC -/* 03120 80ADC0B0 3C0A80AE */ lui $t2, %hi(func_80ADAAA4) ## $t2 = 80AE0000 -/* 03124 80ADC0B4 254AAAA4 */ addiu $t2, $t2, %lo(func_80ADAAA4) ## $t2 = 80ADAAA4 -/* 03128 80ADC0B8 51420011 */ beql $t2, $v0, .L80ADC100 -/* 0312C 80ADC0BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03130 80ADC0C0 908B0197 */ lbu $t3, 0x0197($a0) ## 00000197 -/* 03134 80ADC0C4 55600006 */ bnel $t3, $zero, .L80ADC0E0 -/* 03138 80ADC0C8 848C019C */ lh $t4, 0x019C($a0) ## 0000019C -/* 0313C 80ADC0CC 0C2B65C6 */ jal func_80AD9718 -/* 03140 80ADC0D0 00000000 */ nop -/* 03144 80ADC0D4 1000000A */ beq $zero, $zero, .L80ADC100 -/* 03148 80ADC0D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0314C 80ADC0DC 848C019C */ lh $t4, 0x019C($a0) ## 0000019C -.L80ADC0E0: -/* 03150 80ADC0E0 55800007 */ bnel $t4, $zero, .L80ADC100 -/* 03154 80ADC0E4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03158 80ADC0E8 908D0231 */ lbu $t5, 0x0231($a0) ## 00000231 -/* 0315C 80ADC0EC 55A00004 */ bnel $t5, $zero, .L80ADC100 -/* 03160 80ADC0F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 03164 80ADC0F4 0C2B663D */ jal func_80AD98F4 -/* 03168 80ADC0F8 00000000 */ nop -.L80ADC0FC: -/* 0316C 80ADC0FC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADC100: -/* 03170 80ADC100 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03174 80ADC104 03E00008 */ jr $ra -/* 03178 80ADC108 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s deleted file mode 100644 index e1200085ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s +++ /dev/null @@ -1,133 +0,0 @@ -.late_rodata -glabel D_80ADD89C - .float 0.2 - -.text -glabel func_80ADC10C -/* 0317C 80ADC10C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03180 80ADC110 AFBF001C */ sw $ra, 0x001C($sp) -/* 03184 80ADC114 AFB00018 */ sw $s0, 0x0018($sp) -/* 03188 80ADC118 AFA50034 */ sw $a1, 0x0034($sp) -/* 0318C 80ADC11C 908202BD */ lbu $v0, 0x02BD($a0) ## 000002BD -/* 03190 80ADC120 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03194 80ADC124 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 03198 80ADC128 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 0319C 80ADC12C 11C00062 */ beq $t6, $zero, .L80ADC2B8 -/* 031A0 80ADC130 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 031A4 80ADC134 A08F02BD */ sb $t7, 0x02BD($a0) ## 000002BD -/* 031A8 80ADC138 0C00D594 */ jal func_80035650 -/* 031AC 80ADC13C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 031B0 80ADC140 92180195 */ lbu $t8, 0x0195($s0) ## 00000195 -/* 031B4 80ADC144 53000020 */ beql $t8, $zero, .L80ADC1C8 -/* 031B8 80ADC148 920902C0 */ lbu $t1, 0x02C0($s0) ## 000002C0 -/* 031BC 80ADC14C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 031C0 80ADC150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031C4 80ADC154 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF -/* 031C8 80ADC158 8459019C */ lh $t9, 0x019C($v0) ## 0000019C -/* 031CC 80ADC15C 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF -/* 031D0 80ADC160 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 031D4 80ADC164 A448019C */ sh $t0, 0x019C($v0) ## 0000019C -/* 031D8 80ADC168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031DC 80ADC16C 0C2B6709 */ jal func_80AD9C24 -/* 031E0 80ADC170 8FA50034 */ lw $a1, 0x0034($sp) -/* 031E4 80ADC174 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 031E8 80ADC178 00000000 */ nop -/* 031EC 80ADC17C 3C0180AE */ lui $at, %hi(D_80ADD89C) ## $at = 80AE0000 -/* 031F0 80ADC180 C424D89C */ lwc1 $f4, %lo(D_80ADD89C)($at) -/* 031F4 80ADC184 4604003C */ c.lt.s $f0, $f4 -/* 031F8 80ADC188 00000000 */ nop -/* 031FC 80ADC18C 4502004B */ bc1fl .L80ADC2BC -/* 03200 80ADC190 8FBF001C */ lw $ra, 0x001C($sp) -/* 03204 80ADC194 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 03208 80ADC198 8FA40034 */ lw $a0, 0x0034($sp) -/* 0320C 80ADC19C 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 03210 80ADC1A0 E7A60024 */ swc1 $f6, 0x0024($sp) -/* 03214 80ADC1A4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 03218 80ADC1A8 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 0321C 80ADC1AC E7A80028 */ swc1 $f8, 0x0028($sp) -/* 03220 80ADC1B0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 03224 80ADC1B4 0C007D52 */ jal Item_DropCollectible - -/* 03228 80ADC1B8 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 0322C 80ADC1BC 1000003F */ beq $zero, $zero, .L80ADC2BC -/* 03230 80ADC1C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 03234 80ADC1C4 920902C0 */ lbu $t1, 0x02C0($s0) ## 000002C0 -.L80ADC1C8: -/* 03238 80ADC1C8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0323C 80ADC1CC 51210009 */ beql $t1, $at, .L80ADC1F4 -/* 03240 80ADC1D0 920B0194 */ lbu $t3, 0x0194($s0) ## 00000194 -/* 03244 80ADC1D4 920200B1 */ lbu $v0, 0x00B1($s0) ## 000000B1 -/* 03248 80ADC1D8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0324C 80ADC1DC 14400009 */ bne $v0, $zero, .L80ADC204 -/* 03250 80ADC1E0 00000000 */ nop -/* 03254 80ADC1E4 920A00B0 */ lbu $t2, 0x00B0($s0) ## 000000B0 -/* 03258 80ADC1E8 15400006 */ bne $t2, $zero, .L80ADC204 -/* 0325C 80ADC1EC 00000000 */ nop -/* 03260 80ADC1F0 920B0194 */ lbu $t3, 0x0194($s0) ## 00000194 -.L80ADC1F4: -/* 03264 80ADC1F4 55600031 */ bnel $t3, $zero, .L80ADC2BC -/* 03268 80ADC1F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0326C 80ADC1FC 1000002E */ beq $zero, $zero, .L80ADC2B8 -/* 03270 80ADC200 A6000110 */ sh $zero, 0x0110($s0) ## 00000110 -.L80ADC204: -/* 03274 80ADC204 5441000C */ bnel $v0, $at, .L80ADC238 -/* 03278 80ADC208 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 -/* 0327C 80ADC20C 920D0199 */ lbu $t5, 0x0199($s0) ## 00000199 -/* 03280 80ADC210 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 03284 80ADC214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03288 80ADC218 35AE0002 */ ori $t6, $t5, 0x0002 ## $t6 = 00000002 -/* 0328C 80ADC21C A20E0199 */ sb $t6, 0x0199($s0) ## 00000199 -/* 03290 80ADC220 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 03294 80ADC224 0C2B663D */ jal func_80AD98F4 -/* 03298 80ADC228 8FA50034 */ lw $a1, 0x0034($sp) -/* 0329C 80ADC22C 10000023 */ beq $zero, $zero, .L80ADC2BC -/* 032A0 80ADC230 8FBF001C */ lw $ra, 0x001C($sp) -/* 032A4 80ADC234 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 -.L80ADC238: -/* 032A8 80ADC238 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 032AC 80ADC23C 15E0000E */ bne $t7, $zero, .L80ADC278 -/* 032B0 80ADC240 00000000 */ nop -/* 032B4 80ADC244 1441000C */ bne $v0, $at, .L80ADC278 -/* 032B8 80ADC248 00000000 */ nop -/* 032BC 80ADC24C 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 032C0 80ADC250 3C1880AE */ lui $t8, %hi(func_80ADB770) ## $t8 = 80AE0000 -/* 032C4 80ADC254 2718B770 */ addiu $t8, $t8, %lo(func_80ADB770) ## $t8 = 80ADB770 -/* 032C8 80ADC258 17190007 */ bne $t8, $t9, .L80ADC278 -/* 032CC 80ADC25C 00000000 */ nop -/* 032D0 80ADC260 8608019C */ lh $t0, 0x019C($s0) ## 0000019C -/* 032D4 80ADC264 2409FFD3 */ addiu $t1, $zero, 0xFFD3 ## $t1 = FFFFFFD3 -/* 032D8 80ADC268 55000014 */ bnel $t0, $zero, .L80ADC2BC -/* 032DC 80ADC26C 8FBF001C */ lw $ra, 0x001C($sp) -/* 032E0 80ADC270 10000011 */ beq $zero, $zero, .L80ADC2B8 -/* 032E4 80ADC274 A609019C */ sh $t1, 0x019C($s0) ## 0000019C -.L80ADC278: -/* 032E8 80ADC278 0C00D58A */ jal Actor_ApplyDamage - -/* 032EC 80ADC27C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032F0 80ADC280 10400006 */ beq $v0, $zero, .L80ADC29C -/* 032F4 80ADC284 8FA40034 */ lw $a0, 0x0034($sp) -/* 032F8 80ADC288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032FC 80ADC28C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03300 80ADC290 24053875 */ addiu $a1, $zero, 0x3875 ## $a1 = 00003875 -/* 03304 80ADC294 10000006 */ beq $zero, $zero, .L80ADC2B0 -/* 03308 80ADC298 00000000 */ nop -.L80ADC29C: -/* 0330C 80ADC29C 0C00CB1F */ jal func_80032C7C -/* 03310 80ADC2A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03314 80ADC2A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03318 80ADC2A8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0331C 80ADC2AC 24053886 */ addiu $a1, $zero, 0x3886 ## $a1 = 00003886 -.L80ADC2B0: -/* 03320 80ADC2B0 0C2B6576 */ jal func_80AD95D8 -/* 03324 80ADC2B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADC2B8: -/* 03328 80ADC2B8 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADC2BC: -/* 0332C 80ADC2BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 03330 80ADC2C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03334 80ADC2C4 03E00008 */ jr $ra -/* 03338 80ADC2C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s deleted file mode 100644 index 139de794c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s +++ /dev/null @@ -1,154 +0,0 @@ -glabel func_80ADC55C -/* 035CC 80ADC55C 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 -/* 035D0 80ADC560 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 035D4 80ADC564 25CE0114 */ addiu $t6, $t6, 0x0114 ## $t6 = 06000114 -/* 035D8 80ADC568 15C20021 */ bne $t6, $v0, .L80ADC5F0 -/* 035DC 80ADC56C 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 035E0 80ADC570 9082022E */ lbu $v0, 0x022E($a0) ## 0000022E -/* 035E4 80ADC574 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 035E8 80ADC578 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 -/* 035EC 80ADC57C 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000005 -/* 035F0 80ADC580 00021400 */ sll $v0, $v0, 16 -/* 035F4 80ADC584 00021403 */ sra $v0, $v0, 16 -/* 035F8 80ADC588 28410100 */ slti $at, $v0, 0x0100 -/* 035FC 80ADC58C 54200004 */ bnel $at, $zero, .L80ADC5A0 -/* 03600 80ADC590 A082022E */ sb $v0, 0x022E($a0) ## 0000022E -/* 03604 80ADC594 10000002 */ beq $zero, $zero, .L80ADC5A0 -/* 03608 80ADC598 A08F022E */ sb $t7, 0x022E($a0) ## 0000022E -/* 0360C 80ADC59C A082022E */ sb $v0, 0x022E($a0) ## 0000022E -.L80ADC5A0: -/* 03610 80ADC5A0 9082022F */ lbu $v0, 0x022F($a0) ## 0000022F -/* 03614 80ADC5A4 2442FFFB */ addiu $v0, $v0, 0xFFFB ## $v0 = 00000000 -/* 03618 80ADC5A8 00021400 */ sll $v0, $v0, 16 -/* 0361C 80ADC5AC 00021403 */ sra $v0, $v0, 16 -/* 03620 80ADC5B0 28410032 */ slti $at, $v0, 0x0032 -/* 03624 80ADC5B4 50200004 */ beql $at, $zero, .L80ADC5C8 -/* 03628 80ADC5B8 A082022F */ sb $v0, 0x022F($a0) ## 0000022F -/* 0362C 80ADC5BC 10000002 */ beq $zero, $zero, .L80ADC5C8 -/* 03630 80ADC5C0 A098022F */ sb $t8, 0x022F($a0) ## 0000022F -/* 03634 80ADC5C4 A082022F */ sb $v0, 0x022F($a0) ## 0000022F -.L80ADC5C8: -/* 03638 80ADC5C8 90820230 */ lbu $v0, 0x0230($a0) ## 00000230 -/* 0363C 80ADC5CC 2442FFFB */ addiu $v0, $v0, 0xFFFB ## $v0 = FFFFFFFB -/* 03640 80ADC5D0 00021400 */ sll $v0, $v0, 16 -/* 03644 80ADC5D4 00021403 */ sra $v0, $v0, 16 -/* 03648 80ADC5D8 04410003 */ bgez $v0, .L80ADC5E8 -/* 0364C 80ADC5DC 00000000 */ nop -/* 03650 80ADC5E0 03E00008 */ jr $ra -/* 03654 80ADC5E4 A0800230 */ sb $zero, 0x0230($a0) ## 00000230 -.L80ADC5E8: -/* 03658 80ADC5E8 03E00008 */ jr $ra -/* 0365C 80ADC5EC A0820230 */ sb $v0, 0x0230($a0) ## 00000230 -.L80ADC5F0: -/* 03660 80ADC5F0 27390A54 */ addiu $t9, $t9, 0x0A54 ## $t9 = 06000A54 -/* 03664 80ADC5F4 17220022 */ bne $t9, $v0, .L80ADC680 -/* 03668 80ADC5F8 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 0366C 80ADC5FC 9082022E */ lbu $v0, 0x022E($a0) ## 0000022E -/* 03670 80ADC600 24080050 */ addiu $t0, $zero, 0x0050 ## $t0 = 00000050 -/* 03674 80ADC604 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 03678 80ADC608 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000000 -/* 0367C 80ADC60C 00021400 */ sll $v0, $v0, 16 -/* 03680 80ADC610 00021403 */ sra $v0, $v0, 16 -/* 03684 80ADC614 28410051 */ slti $at, $v0, 0x0051 -/* 03688 80ADC618 14200003 */ bne $at, $zero, .L80ADC628 -/* 0368C 80ADC61C 240A00E1 */ addiu $t2, $zero, 0x00E1 ## $t2 = 000000E1 -/* 03690 80ADC620 10000002 */ beq $zero, $zero, .L80ADC62C -/* 03694 80ADC624 A088022E */ sb $t0, 0x022E($a0) ## 0000022E -.L80ADC628: -/* 03698 80ADC628 A082022E */ sb $v0, 0x022E($a0) ## 0000022E -.L80ADC62C: -/* 0369C 80ADC62C 9082022F */ lbu $v0, 0x022F($a0) ## 0000022F -/* 036A0 80ADC630 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000005 -/* 036A4 80ADC634 00021400 */ sll $v0, $v0, 16 -/* 036A8 80ADC638 00021403 */ sra $v0, $v0, 16 -/* 036AC 80ADC63C 28410100 */ slti $at, $v0, 0x0100 -/* 036B0 80ADC640 54200004 */ bnel $at, $zero, .L80ADC654 -/* 036B4 80ADC644 A082022F */ sb $v0, 0x022F($a0) ## 0000022F -/* 036B8 80ADC648 10000002 */ beq $zero, $zero, .L80ADC654 -/* 036BC 80ADC64C A089022F */ sb $t1, 0x022F($a0) ## 0000022F -/* 036C0 80ADC650 A082022F */ sb $v0, 0x022F($a0) ## 0000022F -.L80ADC654: -/* 036C4 80ADC654 90820230 */ lbu $v0, 0x0230($a0) ## 00000230 -/* 036C8 80ADC658 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 0000000A -/* 036CC 80ADC65C 00021400 */ sll $v0, $v0, 16 -/* 036D0 80ADC660 00021403 */ sra $v0, $v0, 16 -/* 036D4 80ADC664 284100E2 */ slti $at, $v0, 0x00E2 -/* 036D8 80ADC668 14200003 */ bne $at, $zero, .L80ADC678 -/* 036DC 80ADC66C 00000000 */ nop -/* 036E0 80ADC670 03E00008 */ jr $ra -/* 036E4 80ADC674 A08A0230 */ sb $t2, 0x0230($a0) ## 00000230 -.L80ADC678: -/* 036E8 80ADC678 03E00008 */ jr $ra -/* 036EC 80ADC67C A0820230 */ sb $v0, 0x0230($a0) ## 00000230 -.L80ADC680: -/* 036F0 80ADC680 256B08C0 */ addiu $t3, $t3, 0x08C0 ## $t3 = 060008C0 -/* 036F4 80ADC684 55620010 */ bnel $t3, $v0, .L80ADC6C8 -/* 036F8 80ADC688 9082022E */ lbu $v0, 0x022E($a0) ## 0000022E -/* 036FC 80ADC68C 908C0114 */ lbu $t4, 0x0114($a0) ## 00000114 -/* 03700 80ADC690 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 -/* 03704 80ADC694 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 03708 80ADC698 318D0002 */ andi $t5, $t4, 0x0002 ## $t5 = 00000000 -/* 0370C 80ADC69C 11A00005 */ beq $t5, $zero, .L80ADC6B4 -/* 03710 80ADC6A0 241800E1 */ addiu $t8, $zero, 0x00E1 ## $t8 = 000000E1 -/* 03714 80ADC6A4 A080022E */ sb $zero, 0x022E($a0) ## 0000022E -/* 03718 80ADC6A8 A080022F */ sb $zero, 0x022F($a0) ## 0000022F -/* 0371C 80ADC6AC 03E00008 */ jr $ra -/* 03720 80ADC6B0 A0800230 */ sb $zero, 0x0230($a0) ## 00000230 -.L80ADC6B4: -/* 03724 80ADC6B4 A08E022E */ sb $t6, 0x022E($a0) ## 0000022E -/* 03728 80ADC6B8 A08F022F */ sb $t7, 0x022F($a0) ## 0000022F -/* 0372C 80ADC6BC 03E00008 */ jr $ra -/* 03730 80ADC6C0 A0980230 */ sb $t8, 0x0230($a0) ## 00000230 -.L80ADC6C4: -/* 03734 80ADC6C4 9082022E */ lbu $v0, 0x022E($a0) ## 0000022E -.L80ADC6C8: -/* 03738 80ADC6C8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0373C 80ADC6CC 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 03740 80ADC6D0 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 0000000F -/* 03744 80ADC6D4 00021400 */ sll $v0, $v0, 16 -/* 03748 80ADC6D8 00021403 */ sra $v0, $v0, 16 -/* 0374C 80ADC6DC 28410100 */ slti $at, $v0, 0x0100 -/* 03750 80ADC6E0 54200004 */ bnel $at, $zero, .L80ADC6F4 -/* 03754 80ADC6E4 A082022E */ sb $v0, 0x022E($a0) ## 0000022E -/* 03758 80ADC6E8 10000002 */ beq $zero, $zero, .L80ADC6F4 -/* 0375C 80ADC6EC A099022E */ sb $t9, 0x022E($a0) ## 0000022E -/* 03760 80ADC6F0 A082022E */ sb $v0, 0x022E($a0) ## 0000022E -.L80ADC6F4: -/* 03764 80ADC6F4 9082022F */ lbu $v0, 0x022F($a0) ## 0000022F -/* 03768 80ADC6F8 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000014 -/* 0376C 80ADC6FC 00021400 */ sll $v0, $v0, 16 -/* 03770 80ADC700 00021403 */ sra $v0, $v0, 16 -/* 03774 80ADC704 28410100 */ slti $at, $v0, 0x0100 -/* 03778 80ADC708 54200004 */ bnel $at, $zero, .L80ADC71C -/* 0377C 80ADC70C A082022F */ sb $v0, 0x022F($a0) ## 0000022F -/* 03780 80ADC710 10000002 */ beq $zero, $zero, .L80ADC71C -/* 03784 80ADC714 A088022F */ sb $t0, 0x022F($a0) ## 0000022F -/* 03788 80ADC718 A082022F */ sb $v0, 0x022F($a0) ## 0000022F -.L80ADC71C: -/* 0378C 80ADC71C 90830230 */ lbu $v1, 0x0230($a0) ## 00000230 -/* 03790 80ADC720 286100D3 */ slti $at, $v1, 0x00D3 -/* 03794 80ADC724 1420000B */ bne $at, $zero, .L80ADC754 -/* 03798 80ADC728 24620005 */ addiu $v0, $v1, 0x0005 ## $v0 = 00000005 -/* 0379C 80ADC72C 2462FFFB */ addiu $v0, $v1, 0xFFFB ## $v0 = FFFFFFFB -/* 037A0 80ADC730 00021400 */ sll $v0, $v0, 16 -/* 037A4 80ADC734 00021403 */ sra $v0, $v0, 16 -/* 037A8 80ADC738 284100D2 */ slti $at, $v0, 0x00D2 -/* 037AC 80ADC73C 10200003 */ beq $at, $zero, .L80ADC74C -/* 037B0 80ADC740 240900D2 */ addiu $t1, $zero, 0x00D2 ## $t1 = 000000D2 -/* 037B4 80ADC744 03E00008 */ jr $ra -/* 037B8 80ADC748 A0890230 */ sb $t1, 0x0230($a0) ## 00000230 -.L80ADC74C: -/* 037BC 80ADC74C 03E00008 */ jr $ra -/* 037C0 80ADC750 A0820230 */ sb $v0, 0x0230($a0) ## 00000230 -.L80ADC754: -/* 037C4 80ADC754 00021400 */ sll $v0, $v0, 16 -/* 037C8 80ADC758 00021403 */ sra $v0, $v0, 16 -/* 037CC 80ADC75C 284100D3 */ slti $at, $v0, 0x00D3 -/* 037D0 80ADC760 14200003 */ bne $at, $zero, .L80ADC770 -/* 037D4 80ADC764 240A00D2 */ addiu $t2, $zero, 0x00D2 ## $t2 = 000000D2 -/* 037D8 80ADC768 03E00008 */ jr $ra -/* 037DC 80ADC76C A08A0230 */ sb $t2, 0x0230($a0) ## 00000230 -.L80ADC770: -/* 037E0 80ADC770 A0820230 */ sb $v0, 0x0230($a0) ## 00000230 -/* 037E4 80ADC774 03E00008 */ jr $ra -/* 037E8 80ADC778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s deleted file mode 100644 index ba5aa91ad3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s +++ /dev/null @@ -1,137 +0,0 @@ -glabel func_80ADC77C -/* 037EC 80ADC77C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 037F0 80ADC780 AFA40000 */ sw $a0, 0x0000($sp) -/* 037F4 80ADC784 14A1001A */ bne $a1, $at, .L80ADC7F0 -/* 037F8 80ADC788 AFA7000C */ sw $a3, 0x000C($sp) -/* 037FC 80ADC78C 8FA20014 */ lw $v0, 0x0014($sp) -/* 03800 80ADC790 904E0199 */ lbu $t6, 0x0199($v0) ## 00000199 -/* 03804 80ADC794 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 03808 80ADC798 51E00016 */ beql $t7, $zero, .L80ADC7F4 -/* 0380C 80ADC79C 8FA20014 */ lw $v0, 0x0014($sp) -/* 03810 80ADC7A0 8444019A */ lh $a0, 0x019A($v0) ## 0000019A -/* 03814 80ADC7A4 8FA30010 */ lw $v1, 0x0010($sp) -/* 03818 80ADC7A8 2881011C */ slti $at, $a0, 0x011C -/* 0381C 80ADC7AC 1420000A */ bne $at, $zero, .L80ADC7D8 -/* 03820 80ADC7B0 00045B00 */ sll $t3, $a0, 12 -/* 03824 80ADC7B4 8FA30010 */ lw $v1, 0x0010($sp) -/* 03828 80ADC7B8 0004CB00 */ sll $t9, $a0, 12 -/* 0382C 80ADC7BC 3C01FFEE */ lui $at, 0xFFEE ## $at = FFEE0000 -/* 03830 80ADC7C0 84780000 */ lh $t8, 0x0000($v1) ## 00000000 -/* 03834 80ADC7C4 34214000 */ ori $at, $at, 0x4000 ## $at = FFEE4000 -/* 03838 80ADC7C8 03194021 */ addu $t0, $t8, $t9 -/* 0383C 80ADC7CC 01014821 */ addu $t1, $t0, $at -/* 03840 80ADC7D0 10000007 */ beq $zero, $zero, .L80ADC7F0 -/* 03844 80ADC7D4 A4690000 */ sh $t1, 0x0000($v1) ## 00000000 -.L80ADC7D8: -/* 03848 80ADC7D8 846A0000 */ lh $t2, 0x0000($v1) ## 00000000 -/* 0384C 80ADC7DC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 -/* 03850 80ADC7E0 34211000 */ ori $at, $at, 0x1000 ## $at = FFFF1000 -/* 03854 80ADC7E4 014B6021 */ addu $t4, $t2, $t3 -/* 03858 80ADC7E8 01816821 */ addu $t5, $t4, $at -/* 0385C 80ADC7EC A46D0000 */ sh $t5, 0x0000($v1) ## 00000000 -.L80ADC7F0: -/* 03860 80ADC7F0 8FA20014 */ lw $v0, 0x0014($sp) -.L80ADC7F4: -/* 03864 80ADC7F4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03868 80ADC7F8 904E0231 */ lbu $t6, 0x0231($v0) ## 00000231 -/* 0386C 80ADC7FC 51C0000D */ beql $t6, $zero, .L80ADC834 -/* 03870 80ADC800 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 03874 80ADC804 50A1000B */ beql $a1, $at, .L80ADC834 -/* 03878 80ADC808 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 0387C 80ADC80C 8C580190 */ lw $t8, 0x0190($v0) ## 00000190 -/* 03880 80ADC810 3C0F80AE */ lui $t7, %hi(func_80ADAFC0) ## $t7 = 80AE0000 -/* 03884 80ADC814 25EFAFC0 */ addiu $t7, $t7, %lo(func_80ADAFC0) ## $t7 = 80ADAFC0 -/* 03888 80ADC818 55F80009 */ bnel $t7, $t8, .L80ADC840 -/* 0388C 80ADC81C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 03890 80ADC820 8459019A */ lh $t9, 0x019A($v0) ## 0000019A -/* 03894 80ADC824 2B210008 */ slti $at, $t9, 0x0008 -/* 03898 80ADC828 54200005 */ bnel $at, $zero, .L80ADC840 -/* 0389C 80ADC82C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 038A0 80ADC830 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -.L80ADC834: -/* 038A4 80ADC834 03E00008 */ jr $ra -/* 038A8 80ADC838 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80ADC83C: -/* 038AC 80ADC83C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -.L80ADC840: -/* 038B0 80ADC840 54A1000A */ bnel $a1, $at, .L80ADC86C -/* 038B4 80ADC844 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 038B8 80ADC848 90480194 */ lbu $t0, 0x0194($v0) ## 00000194 -/* 038BC 80ADC84C 3C0A80AE */ lui $t2, %hi(D_80ADD7C8) ## $t2 = 80AE0000 -/* 038C0 80ADC850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 038C4 80ADC854 00084880 */ sll $t1, $t0, 2 -/* 038C8 80ADC858 01495021 */ addu $t2, $t2, $t1 -/* 038CC 80ADC85C 8D4AD7C8 */ lw $t2, %lo(D_80ADD7C8)($t2) -/* 038D0 80ADC860 03E00008 */ jr $ra -/* 038D4 80ADC864 ACCA0000 */ sw $t2, 0x0000($a2) ## 00000000 -.L80ADC868: -/* 038D8 80ADC868 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -.L80ADC86C: -/* 038DC 80ADC86C 54A10021 */ bnel $a1, $at, .L80ADC8F4 -/* 038E0 80ADC870 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 038E4 80ADC874 904B0194 */ lbu $t3, 0x0194($v0) ## 00000194 -/* 038E8 80ADC878 3C0D80AE */ lui $t5, %hi(D_80ADD7D8) ## $t5 = 80AE0000 -/* 038EC 80ADC87C 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 038F0 80ADC880 000B6080 */ sll $t4, $t3, 2 -/* 038F4 80ADC884 01AC6821 */ addu $t5, $t5, $t4 -/* 038F8 80ADC888 8DADD7D8 */ lw $t5, %lo(D_80ADD7D8)($t5) -/* 038FC 80ADC88C 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 03900 80ADC890 ACCD0000 */ sw $t5, 0x0000($a2) ## 00000000 -/* 03904 80ADC894 8FA40018 */ lw $a0, 0x0018($sp) -/* 03908 80ADC898 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 0390C 80ADC89C 24AE0008 */ addiu $t6, $a1, 0x0008 ## $t6 = 00000008 -/* 03910 80ADC8A0 AC8E0000 */ sw $t6, 0x0000($a0) ## 00000000 -/* 03914 80ADC8A4 ACA00004 */ sw $zero, 0x0004($a1) ## 00000004 -/* 03918 80ADC8A8 ACAF0000 */ sw $t7, 0x0000($a1) ## 00000000 -/* 0391C 80ADC8AC 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 03920 80ADC8B0 24B80008 */ addiu $t8, $a1, 0x0008 ## $t8 = 00000008 -/* 03924 80ADC8B4 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 -/* 03928 80ADC8B8 ACB90000 */ sw $t9, 0x0000($a1) ## 00000000 -/* 0392C 80ADC8BC 904C022F */ lbu $t4, 0x022F($v0) ## 0000022F -/* 03930 80ADC8C0 9049022E */ lbu $t1, 0x022E($v0) ## 0000022E -/* 03934 80ADC8C4 90580230 */ lbu $t8, 0x0230($v0) ## 00000230 -/* 03938 80ADC8C8 904B0231 */ lbu $t3, 0x0231($v0) ## 00000231 -/* 0393C 80ADC8CC 000C6C00 */ sll $t5, $t4, 16 -/* 03940 80ADC8D0 00095600 */ sll $t2, $t1, 24 -/* 03944 80ADC8D4 014D7025 */ or $t6, $t2, $t5 ## $t6 = 80AE0000 -/* 03948 80ADC8D8 0018CA00 */ sll $t9, $t8, 8 -/* 0394C 80ADC8DC 01D94025 */ or $t0, $t6, $t9 ## $t0 = FBAE0000 -/* 03950 80ADC8E0 010B6025 */ or $t4, $t0, $t3 ## $t4 = FBAE0000 -/* 03954 80ADC8E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03958 80ADC8E8 03E00008 */ jr $ra -/* 0395C 80ADC8EC ACAC0004 */ sw $t4, 0x0004($a1) ## 00000004 -.L80ADC8F0: -/* 03960 80ADC8F0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -.L80ADC8F4: -/* 03964 80ADC8F4 14A1001C */ bne $a1, $at, .L80ADC968 -/* 03968 80ADC8F8 3C0F80AE */ lui $t7, %hi(D_80ADD7E8) ## $t7 = 80AE0000 -/* 0396C 80ADC8FC 8FA40018 */ lw $a0, 0x0018($sp) -/* 03970 80ADC900 904A0194 */ lbu $t2, 0x0194($v0) ## 00000194 -/* 03974 80ADC904 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 03978 80ADC908 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 0397C 80ADC90C 25EFD7E8 */ addiu $t7, $t7, %lo(D_80ADD7E8) ## $t7 = 80ADD7E8 -/* 03980 80ADC910 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 03984 80ADC914 24B80008 */ addiu $t8, $a1, 0x0008 ## $t8 = 00000008 -/* 03988 80ADC918 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 -/* 0398C 80ADC91C ACA00004 */ sw $zero, 0x0004($a1) ## 00000004 -/* 03990 80ADC920 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 -/* 03994 80ADC924 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 03998 80ADC928 000A6880 */ sll $t5, $t2, 2 -/* 0399C 80ADC92C 01AF1821 */ addu $v1, $t5, $t7 -/* 039A0 80ADC930 24B90008 */ addiu $t9, $a1, 0x0008 ## $t9 = 00000008 -/* 039A4 80ADC934 AC990000 */ sw $t9, 0x0000($a0) ## 00000000 -/* 039A8 80ADC938 ACA90000 */ sw $t1, 0x0000($a1) ## 00000000 -/* 039AC 80ADC93C 906D0001 */ lbu $t5, 0x0001($v1) ## 00000001 -/* 039B0 80ADC940 906B0000 */ lbu $t3, 0x0000($v1) ## 00000000 -/* 039B4 80ADC944 90790002 */ lbu $t9, 0x0002($v1) ## 00000002 -/* 039B8 80ADC948 904A0231 */ lbu $t2, 0x0231($v0) ## 00000231 -/* 039BC 80ADC94C 000D7C00 */ sll $t7, $t5, 16 -/* 039C0 80ADC950 000B6600 */ sll $t4, $t3, 24 -/* 039C4 80ADC954 018FC025 */ or $t8, $t4, $t7 ## $t8 = FBAFD7E8 -/* 039C8 80ADC958 00194A00 */ sll $t1, $t9, 8 -/* 039CC 80ADC95C 03094025 */ or $t0, $t8, $t1 ## $t0 = FBAFD7E8 -/* 039D0 80ADC960 010A6825 */ or $t5, $t0, $t2 ## $t5 = FBAFD7E8 -/* 039D4 80ADC964 ACAD0004 */ sw $t5, 0x0004($a1) ## 00000004 -.L80ADC968: -/* 039D8 80ADC968 03E00008 */ jr $ra -/* 039DC 80ADC96C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s deleted file mode 100644 index e16b261def..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s +++ /dev/null @@ -1,491 +0,0 @@ -.rdata -glabel D_80ADD810 - .asciz "../z_en_po_sisters.c" - .balign 4 - -.late_rodata -glabel D_80ADD8A0 - .float 0.3 - -glabel D_80ADD8A4 - .float 0.7 - -.text -glabel func_80ADC970 -/* 039E0 80ADC970 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 039E4 80ADC974 AFB00028 */ sw $s0, 0x0028($sp) -/* 039E8 80ADC978 8FB00058 */ lw $s0, 0x0058($sp) -/* 039EC 80ADC97C AFBF002C */ sw $ra, 0x002C($sp) -/* 039F0 80ADC980 AFA40048 */ sw $a0, 0x0048($sp) -/* 039F4 80ADC984 AFA5004C */ sw $a1, 0x004C($sp) -/* 039F8 80ADC988 AFA60050 */ sw $a2, 0x0050($sp) -/* 039FC 80ADC98C AFA70054 */ sw $a3, 0x0054($sp) -/* 03A00 80ADC990 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 -/* 03A04 80ADC994 3C0E80AE */ lui $t6, %hi(func_80ADAFC0) ## $t6 = 80AE0000 -/* 03A08 80ADC998 25CEAFC0 */ addiu $t6, $t6, %lo(func_80ADAFC0) ## $t6 = 80ADAFC0 -/* 03A0C 80ADC99C 55CF0020 */ bnel $t6, $t7, .L80ADCA20 -/* 03A10 80ADC9A0 8FAE004C */ lw $t6, 0x004C($sp) -/* 03A14 80ADC9A4 8618019A */ lh $t8, 0x019A($s0) ## 0000019A -/* 03A18 80ADC9A8 2B010008 */ slti $at, $t8, 0x0008 -/* 03A1C 80ADC9AC 1420001B */ bne $at, $zero, .L80ADCA1C -/* 03A20 80ADC9B0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 03A24 80ADC9B4 14A10019 */ bne $a1, $at, .L80ADCA1C -/* 03A28 80ADC9B8 8FA7005C */ lw $a3, 0x005C($sp) -/* 03A2C 80ADC9BC 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 03A30 80ADC9C0 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 03A34 80ADC9C4 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 03A38 80ADC9C8 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 03A3C 80ADC9CC ACE80000 */ sw $t0, 0x0000($a3) ## 00000000 -/* 03A40 80ADC9D0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 03A44 80ADC9D4 8FAA0048 */ lw $t2, 0x0048($sp) -/* 03A48 80ADC9D8 3C0580AE */ lui $a1, %hi(D_80ADD810) ## $a1 = 80AE0000 -/* 03A4C 80ADC9DC 24A5D810 */ addiu $a1, $a1, %lo(D_80ADD810) ## $a1 = 80ADD810 -/* 03A50 80ADC9E0 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 03A54 80ADC9E4 24060B3C */ addiu $a2, $zero, 0x0B3C ## $a2 = 00000B3C -/* 03A58 80ADC9E8 0C0346A2 */ jal Matrix_NewMtx -/* 03A5C 80ADC9EC AFA20038 */ sw $v0, 0x0038($sp) -/* 03A60 80ADC9F0 8FA30038 */ lw $v1, 0x0038($sp) -/* 03A64 80ADC9F4 8FA7005C */ lw $a3, 0x005C($sp) -/* 03A68 80ADC9F8 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 03A6C 80ADC9FC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03A70 80ADCA00 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 03A74 80ADCA04 25AD46E0 */ addiu $t5, $t5, 0x46E0 ## $t5 = 060046E0 -/* 03A78 80ADCA08 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 03A7C 80ADCA0C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03A80 80ADCA10 ACEB0000 */ sw $t3, 0x0000($a3) ## 00000000 -/* 03A84 80ADCA14 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 03A88 80ADCA18 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -.L80ADCA1C: -/* 03A8C 80ADCA1C 8FAE004C */ lw $t6, 0x004C($sp) -.L80ADCA20: -/* 03A90 80ADCA20 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 03A94 80ADCA24 55C10183 */ bnel $t6, $at, .L80ADD034 -/* 03A98 80ADCA28 8FBF002C */ lw $ra, 0x002C($sp) -/* 03A9C 80ADCA2C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 03AA0 80ADCA30 3C0F80AE */ lui $t7, %hi(func_80ADB2B8) ## $t7 = 80AE0000 -/* 03AA4 80ADCA34 25EFB2B8 */ addiu $t7, $t7, %lo(func_80ADB2B8) ## $t7 = 80ADB2B8 -/* 03AA8 80ADCA38 51E2017E */ beql $t7, $v0, .L80ADD034 -/* 03AAC 80ADCA3C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03AB0 80ADCA40 92180199 */ lbu $t8, 0x0199($s0) ## 00000199 -/* 03AB4 80ADCA44 3C0B80AE */ lui $t3, %hi(func_80ADBD8C) ## $t3 = 80AE0000 -/* 03AB8 80ADCA48 256BBD8C */ addiu $t3, $t3, %lo(func_80ADBD8C) ## $t3 = 80ADBD8C -/* 03ABC 80ADCA4C 33190020 */ andi $t9, $t8, 0x0020 ## $t9 = 00000000 -/* 03AC0 80ADCA50 1320001A */ beq $t9, $zero, .L80ADCABC -/* 03AC4 80ADCA54 00000000 */ nop -/* 03AC8 80ADCA58 92020198 */ lbu $v0, 0x0198($s0) ## 00000198 -/* 03ACC 80ADCA5C 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 03AD0 80ADCA60 18400010 */ blez $v0, .L80ADCAA4 -/* 03AD4 80ADCA64 00024080 */ sll $t0, $v0, 2 -/* 03AD8 80ADCA68 01024023 */ subu $t0, $t0, $v0 -/* 03ADC 80ADCA6C 00084080 */ sll $t0, $t0, 2 -/* 03AE0 80ADCA70 02082821 */ addu $a1, $s0, $t0 -/* 03AE4 80ADCA74 24A30234 */ addiu $v1, $a1, 0x0234 ## $v1 = 00000234 -/* 03AE8 80ADCA78 24A40228 */ addiu $a0, $a1, 0x0228 ## $a0 = 00000228 -.L80ADCA7C: -/* 03AEC 80ADCA7C 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000228 -/* 03AF0 80ADCA80 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFE -/* 03AF4 80ADCA84 2463FFF4 */ addiu $v1, $v1, 0xFFF4 ## $v1 = 00000228 -/* 03AF8 80ADCA88 AC6A000C */ sw $t2, 0x000C($v1) ## 00000234 -/* 03AFC 80ADCA8C 8C890004 */ lw $t1, 0x0004($a0) ## 0000022C -/* 03B00 80ADCA90 2484FFF4 */ addiu $a0, $a0, 0xFFF4 ## $a0 = 0000021C -/* 03B04 80ADCA94 AC690010 */ sw $t1, 0x0010($v1) ## 00000238 -/* 03B08 80ADCA98 8C8A0014 */ lw $t2, 0x0014($a0) ## 00000230 -/* 03B0C 80ADCA9C 1C40FFF7 */ bgtz $v0, .L80ADCA7C -/* 03B10 80ADCAA0 AC6A0014 */ sw $t2, 0x0014($v1) ## 0000023C -.L80ADCAA4: -/* 03B14 80ADCAA4 3C0480AE */ lui $a0, %hi(D_80ADD7F8) ## $a0 = 80AE0000 -/* 03B18 80ADCAA8 2484D7F8 */ addiu $a0, $a0, %lo(D_80ADD7F8) ## $a0 = 80ADD7F8 -/* 03B1C 80ADCAAC 0C0346BD */ jal Matrix_MultVec3f -/* 03B20 80ADCAB0 26050234 */ addiu $a1, $s0, 0x0234 ## $a1 = 00000234 -/* 03B24 80ADCAB4 10000007 */ beq $zero, $zero, .L80ADCAD4 -/* 03B28 80ADCAB8 920C0198 */ lbu $t4, 0x0198($s0) ## 00000198 -.L80ADCABC: -/* 03B2C 80ADCABC 15620004 */ bne $t3, $v0, .L80ADCAD0 -/* 03B30 80ADCAC0 3C0480AE */ lui $a0, %hi(D_80ADD7F8) ## $a0 = 80AE0000 -/* 03B34 80ADCAC4 2484D7F8 */ addiu $a0, $a0, %lo(D_80ADD7F8) ## $a0 = 80ADD7F8 -/* 03B38 80ADCAC8 0C0346BD */ jal Matrix_MultVec3f -/* 03B3C 80ADCACC 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -.L80ADCAD0: -/* 03B40 80ADCAD0 920C0198 */ lbu $t4, 0x0198($s0) ## 00000198 -.L80ADCAD4: -/* 03B44 80ADCAD4 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C -/* 03B48 80ADCAD8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03B4C 80ADCADC 1980014B */ blez $t4, .L80ADD00C -/* 03B50 80ADCAE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03B54 80ADCAE4 920D0194 */ lbu $t5, 0x0194($s0) ## 00000194 -/* 03B58 80ADCAE8 3C0F80AE */ lui $t7, %hi(D_80ADD6F0) ## $t7 = 80AE0000 -/* 03B5C 80ADCAEC 25EFD6F0 */ addiu $t7, $t7, %lo(D_80ADD6F0) ## $t7 = 80ADD6F0 -/* 03B60 80ADCAF0 000D7080 */ sll $t6, $t5, 2 -/* 03B64 80ADCAF4 01CF1821 */ addu $v1, $t6, $t7 -/* 03B68 80ADCAF8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 03B6C 80ADCAFC AFA30030 */ sw $v1, 0x0030($sp) -/* 03B70 80ADCB00 3C0180AE */ lui $at, %hi(D_80ADD8A0) ## $at = 80AE0000 -/* 03B74 80ADCB04 C424D8A0 */ lwc1 $f4, %lo(D_80ADD8A0)($at) -/* 03B78 80ADCB08 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 03B7C 80ADCB0C 3C0180AE */ lui $at, %hi(D_80ADD8A4) ## $at = 80AE0000 -/* 03B80 80ADCB10 46040182 */ mul.s $f6, $f0, $f4 -/* 03B84 80ADCB14 C428D8A4 */ lwc1 $f8, %lo(D_80ADD8A4)($at) -/* 03B88 80ADCB18 3C1880AE */ lui $t8, %hi(func_80ADB17C) ## $t8 = 80AE0000 -/* 03B8C 80ADCB1C 2718B17C */ addiu $t8, $t8, %lo(func_80ADB17C) ## $t8 = 80ADB17C -/* 03B90 80ADCB20 8FA30030 */ lw $v1, 0x0030($sp) -/* 03B94 80ADCB24 3C1980AE */ lui $t9, %hi(func_80ADBD38) ## $t9 = 80AE0000 -/* 03B98 80ADCB28 13020007 */ beq $t8, $v0, .L80ADCB48 -/* 03B9C 80ADCB2C 46083080 */ add.s $f2, $f6, $f8 -/* 03BA0 80ADCB30 2739BD38 */ addiu $t9, $t9, %lo(func_80ADBD38) ## $t9 = 80ADBD38 -/* 03BA4 80ADCB34 13220004 */ beq $t9, $v0, .L80ADCB48 -/* 03BA8 80ADCB38 3C0880AE */ lui $t0, %hi(func_80ADBEE8) ## $t0 = 80AE0000 -/* 03BAC 80ADCB3C 2508BEE8 */ addiu $t0, $t0, %lo(func_80ADBEE8) ## $t0 = 80ADBEE8 -/* 03BB0 80ADCB40 1502009A */ bne $t0, $v0, .L80ADCDAC -/* 03BB4 80ADCB44 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -.L80ADCB48: -/* 03BB8 80ADCB48 C60A0234 */ lwc1 $f10, 0x0234($s0) ## 00000234 -/* 03BBC 80ADCB4C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 03BC0 80ADCB50 44812000 */ mtc1 $at, $f4 ## $f4 = 15.00 -/* 03BC4 80ADCB54 C6120238 */ lwc1 $f18, 0x0238($s0) ## 00000238 -/* 03BC8 80ADCB58 4600540D */ trunc.w.s $f16, $f10 -/* 03BCC 80ADCB5C C60A023C */ lwc1 $f10, 0x023C($s0) ## 0000023C -/* 03BD0 80ADCB60 906C0000 */ lbu $t4, 0x0000($v1) ## 00000000 -/* 03BD4 80ADCB64 46049180 */ add.s $f6, $f18, $f4 -/* 03BD8 80ADCB68 44058000 */ mfc1 $a1, $f16 -/* 03BDC 80ADCB6C 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 -/* 03BE0 80ADCB70 4600540D */ trunc.w.s $f16, $f10 -/* 03BE4 80ADCB74 00052C00 */ sll $a1, $a1, 16 -/* 03BE8 80ADCB78 00052C03 */ sra $a1, $a1, 16 -/* 03BEC 80ADCB7C 4600320D */ trunc.w.s $f8, $f6 -/* 03BF0 80ADCB80 44078000 */ mfc1 $a3, $f16 -/* 03BF4 80ADCB84 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C -/* 03BF8 80ADCB88 46809120 */ cvt.s.w $f4, $f18 -/* 03BFC 80ADCB8C 44064000 */ mfc1 $a2, $f8 -/* 03C00 80ADCB90 00073C00 */ sll $a3, $a3, 16 -/* 03C04 80ADCB94 00073C03 */ sra $a3, $a3, 16 -/* 03C08 80ADCB98 00063400 */ sll $a2, $a2, 16 -/* 03C0C 80ADCB9C 05810005 */ bgez $t4, .L80ADCBB4 -/* 03C10 80ADCBA0 00063403 */ sra $a2, $a2, 16 -/* 03C14 80ADCBA4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03C18 80ADCBA8 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 03C1C 80ADCBAC 00000000 */ nop -/* 03C20 80ADCBB0 46062100 */ add.s $f4, $f4, $f6 -.L80ADCBB4: -/* 03C24 80ADCBB4 46022202 */ mul.s $f8, $f4, $f2 -/* 03C28 80ADCBB8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03C2C 80ADCBBC 240B00C8 */ addiu $t3, $zero, 0x00C8 ## $t3 = 000000C8 -/* 03C30 80ADCBC0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03C34 80ADCBC4 444DF800 */ cfc1 $t5, $31 -/* 03C38 80ADCBC8 44CEF800 */ ctc1 $t6, $31 -/* 03C3C 80ADCBCC 00000000 */ nop -/* 03C40 80ADCBD0 460042A4 */ cvt.w.s $f10, $f8 -/* 03C44 80ADCBD4 444EF800 */ cfc1 $t6, $31 -/* 03C48 80ADCBD8 00000000 */ nop -/* 03C4C 80ADCBDC 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 03C50 80ADCBE0 51C00013 */ beql $t6, $zero, .L80ADCC30 -/* 03C54 80ADCBE4 440E5000 */ mfc1 $t6, $f10 -/* 03C58 80ADCBE8 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 -/* 03C5C 80ADCBEC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03C60 80ADCBF0 460A4281 */ sub.s $f10, $f8, $f10 -/* 03C64 80ADCBF4 44CEF800 */ ctc1 $t6, $31 -/* 03C68 80ADCBF8 00000000 */ nop -/* 03C6C 80ADCBFC 460052A4 */ cvt.w.s $f10, $f10 -/* 03C70 80ADCC00 444EF800 */ cfc1 $t6, $31 -/* 03C74 80ADCC04 00000000 */ nop -/* 03C78 80ADCC08 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 03C7C 80ADCC0C 15C00005 */ bne $t6, $zero, .L80ADCC24 -/* 03C80 80ADCC10 00000000 */ nop -/* 03C84 80ADCC14 440E5000 */ mfc1 $t6, $f10 -/* 03C88 80ADCC18 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03C8C 80ADCC1C 10000007 */ beq $zero, $zero, .L80ADCC3C -/* 03C90 80ADCC20 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 -.L80ADCC24: -/* 03C94 80ADCC24 10000005 */ beq $zero, $zero, .L80ADCC3C -/* 03C98 80ADCC28 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 03C9C 80ADCC2C 440E5000 */ mfc1 $t6, $f10 -.L80ADCC30: -/* 03CA0 80ADCC30 00000000 */ nop -/* 03CA4 80ADCC34 05C0FFFB */ bltz $t6, .L80ADCC24 -/* 03CA8 80ADCC38 00000000 */ nop -.L80ADCC3C: -/* 03CAC 80ADCC3C AFAE0010 */ sw $t6, 0x0010($sp) -/* 03CB0 80ADCC40 906F0001 */ lbu $t7, 0x0001($v1) ## 00000001 -/* 03CB4 80ADCC44 44CDF800 */ ctc1 $t5, $31 -/* 03CB8 80ADCC48 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03CBC 80ADCC4C 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 -/* 03CC0 80ADCC50 05E10004 */ bgez $t7, .L80ADCC64 -/* 03CC4 80ADCC54 468084A0 */ cvt.s.w $f18, $f16 -/* 03CC8 80ADCC58 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 03CCC 80ADCC5C 00000000 */ nop -/* 03CD0 80ADCC60 46069480 */ add.s $f18, $f18, $f6 -.L80ADCC64: -/* 03CD4 80ADCC64 46029102 */ mul.s $f4, $f18, $f2 -/* 03CD8 80ADCC68 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03CDC 80ADCC6C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03CE0 80ADCC70 4458F800 */ cfc1 $t8, $31 -/* 03CE4 80ADCC74 44D9F800 */ ctc1 $t9, $31 -/* 03CE8 80ADCC78 00000000 */ nop -/* 03CEC 80ADCC7C 46002224 */ cvt.w.s $f8, $f4 -/* 03CF0 80ADCC80 4459F800 */ cfc1 $t9, $31 -/* 03CF4 80ADCC84 00000000 */ nop -/* 03CF8 80ADCC88 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03CFC 80ADCC8C 53200013 */ beql $t9, $zero, .L80ADCCDC -/* 03D00 80ADCC90 44194000 */ mfc1 $t9, $f8 -/* 03D04 80ADCC94 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 03D08 80ADCC98 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03D0C 80ADCC9C 46082201 */ sub.s $f8, $f4, $f8 -/* 03D10 80ADCCA0 44D9F800 */ ctc1 $t9, $31 -/* 03D14 80ADCCA4 00000000 */ nop -/* 03D18 80ADCCA8 46004224 */ cvt.w.s $f8, $f8 -/* 03D1C 80ADCCAC 4459F800 */ cfc1 $t9, $31 -/* 03D20 80ADCCB0 00000000 */ nop -/* 03D24 80ADCCB4 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03D28 80ADCCB8 17200005 */ bne $t9, $zero, .L80ADCCD0 -/* 03D2C 80ADCCBC 00000000 */ nop -/* 03D30 80ADCCC0 44194000 */ mfc1 $t9, $f8 -/* 03D34 80ADCCC4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03D38 80ADCCC8 10000007 */ beq $zero, $zero, .L80ADCCE8 -/* 03D3C 80ADCCCC 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80ADCCD0: -/* 03D40 80ADCCD0 10000005 */ beq $zero, $zero, .L80ADCCE8 -/* 03D44 80ADCCD4 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 03D48 80ADCCD8 44194000 */ mfc1 $t9, $f8 -.L80ADCCDC: -/* 03D4C 80ADCCDC 00000000 */ nop -/* 03D50 80ADCCE0 0720FFFB */ bltz $t9, .L80ADCCD0 -/* 03D54 80ADCCE4 00000000 */ nop -.L80ADCCE8: -/* 03D58 80ADCCE8 AFB90014 */ sw $t9, 0x0014($sp) -/* 03D5C 80ADCCEC 90680002 */ lbu $t0, 0x0002($v1) ## 00000002 -/* 03D60 80ADCCF0 44D8F800 */ ctc1 $t8, $31 -/* 03D64 80ADCCF4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03D68 80ADCCF8 44885000 */ mtc1 $t0, $f10 ## $f10 = -0.00 -/* 03D6C 80ADCCFC 05010004 */ bgez $t0, .L80ADCD10 -/* 03D70 80ADCD00 46805420 */ cvt.s.w $f16, $f10 -/* 03D74 80ADCD04 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 03D78 80ADCD08 00000000 */ nop -/* 03D7C 80ADCD0C 46068400 */ add.s $f16, $f16, $f6 -.L80ADCD10: -/* 03D80 80ADCD10 46028482 */ mul.s $f18, $f16, $f2 -/* 03D84 80ADCD14 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03D88 80ADCD18 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03D8C 80ADCD1C 4449F800 */ cfc1 $t1, $31 -/* 03D90 80ADCD20 44CAF800 */ ctc1 $t2, $31 -/* 03D94 80ADCD24 00000000 */ nop -/* 03D98 80ADCD28 46009124 */ cvt.w.s $f4, $f18 -/* 03D9C 80ADCD2C 444AF800 */ cfc1 $t2, $31 -/* 03DA0 80ADCD30 00000000 */ nop -/* 03DA4 80ADCD34 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03DA8 80ADCD38 51400013 */ beql $t2, $zero, .L80ADCD88 -/* 03DAC 80ADCD3C 440A2000 */ mfc1 $t2, $f4 -/* 03DB0 80ADCD40 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 03DB4 80ADCD44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03DB8 80ADCD48 46049101 */ sub.s $f4, $f18, $f4 -/* 03DBC 80ADCD4C 44CAF800 */ ctc1 $t2, $31 -/* 03DC0 80ADCD50 00000000 */ nop -/* 03DC4 80ADCD54 46002124 */ cvt.w.s $f4, $f4 -/* 03DC8 80ADCD58 444AF800 */ cfc1 $t2, $31 -/* 03DCC 80ADCD5C 00000000 */ nop -/* 03DD0 80ADCD60 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03DD4 80ADCD64 15400005 */ bne $t2, $zero, .L80ADCD7C -/* 03DD8 80ADCD68 00000000 */ nop -/* 03DDC 80ADCD6C 440A2000 */ mfc1 $t2, $f4 -/* 03DE0 80ADCD70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03DE4 80ADCD74 10000007 */ beq $zero, $zero, .L80ADCD94 -/* 03DE8 80ADCD78 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80ADCD7C: -/* 03DEC 80ADCD7C 10000005 */ beq $zero, $zero, .L80ADCD94 -/* 03DF0 80ADCD80 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 03DF4 80ADCD84 440A2000 */ mfc1 $t2, $f4 -.L80ADCD88: -/* 03DF8 80ADCD88 00000000 */ nop -/* 03DFC 80ADCD8C 0540FFFB */ bltz $t2, .L80ADCD7C -/* 03E00 80ADCD90 00000000 */ nop -.L80ADCD94: -/* 03E04 80ADCD94 44C9F800 */ ctc1 $t1, $31 -/* 03E08 80ADCD98 AFAA0018 */ sw $t2, 0x0018($sp) -/* 03E0C 80ADCD9C 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 03E10 80ADCDA0 AFAB001C */ sw $t3, 0x001C($sp) -/* 03E14 80ADCDA4 1000009D */ beq $zero, $zero, .L80ADD01C -/* 03E18 80ADCDA8 920F0199 */ lbu $t7, 0x0199($s0) ## 00000199 -.L80ADCDAC: -/* 03E1C 80ADCDAC C6080234 */ lwc1 $f8, 0x0234($s0) ## 00000234 -/* 03E20 80ADCDB0 C6060238 */ lwc1 $f6, 0x0238($s0) ## 00000238 -/* 03E24 80ADCDB4 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 03E28 80ADCDB8 4600428D */ trunc.w.s $f10, $f8 -/* 03E2C 80ADCDBC C608023C */ lwc1 $f8, 0x023C($s0) ## 0000023C -/* 03E30 80ADCDC0 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 -/* 03E34 80ADCDC4 46103480 */ add.s $f18, $f6, $f16 -/* 03E38 80ADCDC8 44055000 */ mfc1 $a1, $f10 -/* 03E3C 80ADCDCC 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 03E40 80ADCDD0 4600428D */ trunc.w.s $f10, $f8 -/* 03E44 80ADCDD4 00052C00 */ sll $a1, $a1, 16 -/* 03E48 80ADCDD8 00052C03 */ sra $a1, $a1, 16 -/* 03E4C 80ADCDDC 4600910D */ trunc.w.s $f4, $f18 -/* 03E50 80ADCDE0 44075000 */ mfc1 $a3, $f10 -/* 03E54 80ADCDE4 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C -/* 03E58 80ADCDE8 46803420 */ cvt.s.w $f16, $f6 -/* 03E5C 80ADCDEC 44062000 */ mfc1 $a2, $f4 -/* 03E60 80ADCDF0 00073C00 */ sll $a3, $a3, 16 -/* 03E64 80ADCDF4 00073C03 */ sra $a3, $a3, 16 -/* 03E68 80ADCDF8 00063400 */ sll $a2, $a2, 16 -/* 03E6C 80ADCDFC 05E10005 */ bgez $t7, .L80ADCE14 -/* 03E70 80ADCE00 00063403 */ sra $a2, $a2, 16 -/* 03E74 80ADCE04 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03E78 80ADCE08 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 03E7C 80ADCE0C 00000000 */ nop -/* 03E80 80ADCE10 46128400 */ add.s $f16, $f16, $f18 -.L80ADCE14: -/* 03E84 80ADCE14 46028102 */ mul.s $f4, $f16, $f2 -/* 03E88 80ADCE18 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03E8C 80ADCE1C 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 03E90 80ADCE20 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03E94 80ADCE24 4458F800 */ cfc1 $t8, $31 -/* 03E98 80ADCE28 44D9F800 */ ctc1 $t9, $31 -/* 03E9C 80ADCE2C 00000000 */ nop -/* 03EA0 80ADCE30 46002224 */ cvt.w.s $f8, $f4 -/* 03EA4 80ADCE34 4459F800 */ cfc1 $t9, $31 -/* 03EA8 80ADCE38 00000000 */ nop -/* 03EAC 80ADCE3C 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03EB0 80ADCE40 53200013 */ beql $t9, $zero, .L80ADCE90 -/* 03EB4 80ADCE44 44194000 */ mfc1 $t9, $f8 -/* 03EB8 80ADCE48 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 03EBC 80ADCE4C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 03EC0 80ADCE50 46082201 */ sub.s $f8, $f4, $f8 -/* 03EC4 80ADCE54 44D9F800 */ ctc1 $t9, $31 -/* 03EC8 80ADCE58 00000000 */ nop -/* 03ECC 80ADCE5C 46004224 */ cvt.w.s $f8, $f8 -/* 03ED0 80ADCE60 4459F800 */ cfc1 $t9, $31 -/* 03ED4 80ADCE64 00000000 */ nop -/* 03ED8 80ADCE68 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 03EDC 80ADCE6C 17200005 */ bne $t9, $zero, .L80ADCE84 -/* 03EE0 80ADCE70 00000000 */ nop -/* 03EE4 80ADCE74 44194000 */ mfc1 $t9, $f8 -/* 03EE8 80ADCE78 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03EEC 80ADCE7C 10000007 */ beq $zero, $zero, .L80ADCE9C -/* 03EF0 80ADCE80 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 -.L80ADCE84: -/* 03EF4 80ADCE84 10000005 */ beq $zero, $zero, .L80ADCE9C -/* 03EF8 80ADCE88 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 03EFC 80ADCE8C 44194000 */ mfc1 $t9, $f8 -.L80ADCE90: -/* 03F00 80ADCE90 00000000 */ nop -/* 03F04 80ADCE94 0720FFFB */ bltz $t9, .L80ADCE84 -/* 03F08 80ADCE98 00000000 */ nop -.L80ADCE9C: -/* 03F0C 80ADCE9C AFB90010 */ sw $t9, 0x0010($sp) -/* 03F10 80ADCEA0 90680001 */ lbu $t0, 0x0001($v1) ## 00000001 -/* 03F14 80ADCEA4 44D8F800 */ ctc1 $t8, $31 -/* 03F18 80ADCEA8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03F1C 80ADCEAC 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 03F20 80ADCEB0 05010004 */ bgez $t0, .L80ADCEC4 -/* 03F24 80ADCEB4 468051A0 */ cvt.s.w $f6, $f10 -/* 03F28 80ADCEB8 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 03F2C 80ADCEBC 00000000 */ nop -/* 03F30 80ADCEC0 46123180 */ add.s $f6, $f6, $f18 -.L80ADCEC4: -/* 03F34 80ADCEC4 46023402 */ mul.s $f16, $f6, $f2 -/* 03F38 80ADCEC8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03F3C 80ADCECC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03F40 80ADCED0 4449F800 */ cfc1 $t1, $31 -/* 03F44 80ADCED4 44CAF800 */ ctc1 $t2, $31 -/* 03F48 80ADCED8 00000000 */ nop -/* 03F4C 80ADCEDC 46008124 */ cvt.w.s $f4, $f16 -/* 03F50 80ADCEE0 444AF800 */ cfc1 $t2, $31 -/* 03F54 80ADCEE4 00000000 */ nop -/* 03F58 80ADCEE8 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03F5C 80ADCEEC 51400013 */ beql $t2, $zero, .L80ADCF3C -/* 03F60 80ADCEF0 440A2000 */ mfc1 $t2, $f4 -/* 03F64 80ADCEF4 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 03F68 80ADCEF8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 03F6C 80ADCEFC 46048101 */ sub.s $f4, $f16, $f4 -/* 03F70 80ADCF00 44CAF800 */ ctc1 $t2, $31 -/* 03F74 80ADCF04 00000000 */ nop -/* 03F78 80ADCF08 46002124 */ cvt.w.s $f4, $f4 -/* 03F7C 80ADCF0C 444AF800 */ cfc1 $t2, $31 -/* 03F80 80ADCF10 00000000 */ nop -/* 03F84 80ADCF14 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 03F88 80ADCF18 15400005 */ bne $t2, $zero, .L80ADCF30 -/* 03F8C 80ADCF1C 00000000 */ nop -/* 03F90 80ADCF20 440A2000 */ mfc1 $t2, $f4 -/* 03F94 80ADCF24 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03F98 80ADCF28 10000007 */ beq $zero, $zero, .L80ADCF48 -/* 03F9C 80ADCF2C 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 -.L80ADCF30: -/* 03FA0 80ADCF30 10000005 */ beq $zero, $zero, .L80ADCF48 -/* 03FA4 80ADCF34 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 03FA8 80ADCF38 440A2000 */ mfc1 $t2, $f4 -.L80ADCF3C: -/* 03FAC 80ADCF3C 00000000 */ nop -/* 03FB0 80ADCF40 0540FFFB */ bltz $t2, .L80ADCF30 -/* 03FB4 80ADCF44 00000000 */ nop -.L80ADCF48: -/* 03FB8 80ADCF48 AFAA0014 */ sw $t2, 0x0014($sp) -/* 03FBC 80ADCF4C 906B0002 */ lbu $t3, 0x0002($v1) ## 00000002 -/* 03FC0 80ADCF50 44C9F800 */ ctc1 $t1, $31 -/* 03FC4 80ADCF54 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 03FC8 80ADCF58 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 03FCC 80ADCF5C 05610004 */ bgez $t3, .L80ADCF70 -/* 03FD0 80ADCF60 468042A0 */ cvt.s.w $f10, $f8 -/* 03FD4 80ADCF64 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 03FD8 80ADCF68 00000000 */ nop -/* 03FDC 80ADCF6C 46125280 */ add.s $f10, $f10, $f18 -.L80ADCF70: -/* 03FE0 80ADCF70 46025182 */ mul.s $f6, $f10, $f2 -/* 03FE4 80ADCF74 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 03FE8 80ADCF78 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 03FEC 80ADCF7C 444CF800 */ cfc1 $t4, $31 -/* 03FF0 80ADCF80 44CDF800 */ ctc1 $t5, $31 -/* 03FF4 80ADCF84 00000000 */ nop -/* 03FF8 80ADCF88 46003424 */ cvt.w.s $f16, $f6 -/* 03FFC 80ADCF8C 444DF800 */ cfc1 $t5, $31 -/* 04000 80ADCF90 00000000 */ nop -/* 04004 80ADCF94 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04008 80ADCF98 51A00013 */ beql $t5, $zero, .L80ADCFE8 -/* 0400C 80ADCF9C 440D8000 */ mfc1 $t5, $f16 -/* 04010 80ADCFA0 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 -/* 04014 80ADCFA4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 04018 80ADCFA8 46103401 */ sub.s $f16, $f6, $f16 -/* 0401C 80ADCFAC 44CDF800 */ ctc1 $t5, $31 -/* 04020 80ADCFB0 00000000 */ nop -/* 04024 80ADCFB4 46008424 */ cvt.w.s $f16, $f16 -/* 04028 80ADCFB8 444DF800 */ cfc1 $t5, $31 -/* 0402C 80ADCFBC 00000000 */ nop -/* 04030 80ADCFC0 31AD0078 */ andi $t5, $t5, 0x0078 ## $t5 = 00000000 -/* 04034 80ADCFC4 15A00005 */ bne $t5, $zero, .L80ADCFDC -/* 04038 80ADCFC8 00000000 */ nop -/* 0403C 80ADCFCC 440D8000 */ mfc1 $t5, $f16 -/* 04040 80ADCFD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04044 80ADCFD4 10000007 */ beq $zero, $zero, .L80ADCFF4 -/* 04048 80ADCFD8 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 -.L80ADCFDC: -/* 0404C 80ADCFDC 10000005 */ beq $zero, $zero, .L80ADCFF4 -/* 04050 80ADCFE0 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 04054 80ADCFE4 440D8000 */ mfc1 $t5, $f16 -.L80ADCFE8: -/* 04058 80ADCFE8 00000000 */ nop -/* 0405C 80ADCFEC 05A0FFFB */ bltz $t5, .L80ADCFDC -/* 04060 80ADCFF0 00000000 */ nop -.L80ADCFF4: -/* 04064 80ADCFF4 44CCF800 */ ctc1 $t4, $31 -/* 04068 80ADCFF8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0406C 80ADCFFC 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 04070 80ADD000 AFAE001C */ sw $t6, 0x001C($sp) -/* 04074 80ADD004 10000005 */ beq $zero, $zero, .L80ADD01C -/* 04078 80ADD008 920F0199 */ lbu $t7, 0x0199($s0) ## 00000199 -.L80ADD00C: -/* 0407C 80ADD00C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04080 80ADD010 0C01E796 */ jal Lights_PointSetColorAndRadius - -/* 04084 80ADD014 AFA00010 */ sw $zero, 0x0010($sp) -/* 04088 80ADD018 920F0199 */ lbu $t7, 0x0199($s0) ## 00000199 -.L80ADD01C: -/* 0408C 80ADD01C 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 04090 80ADD020 57000004 */ bnel $t8, $zero, .L80ADD034 -/* 04094 80ADD024 8FBF002C */ lw $ra, 0x002C($sp) -/* 04098 80ADD028 0C034236 */ jal Matrix_Get -/* 0409C 80ADD02C 260402F8 */ addiu $a0, $s0, 0x02F8 ## $a0 = 000002F8 -/* 040A0 80ADD030 8FBF002C */ lw $ra, 0x002C($sp) -.L80ADD034: -/* 040A4 80ADD034 8FB00028 */ lw $s0, 0x0028($sp) -/* 040A8 80ADD038 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 040AC 80ADD03C 03E00008 */ jr $ra -/* 040B0 80ADD040 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s deleted file mode 100644 index 3c9c82ac71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel EnPoh_Destroy -/* 00344 80ADE094 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00348 80ADE098 AFA40018 */ sw $a0, 0x0018($sp) -/* 0034C 80ADE09C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00350 80ADE0A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00354 80ADE0A4 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00358 80ADE0A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0035C 80ADE0AC 8DC602A8 */ lw $a2, 0x02A8($t6) ## 000002A8 -/* 00360 80ADE0B0 AFA7001C */ sw $a3, 0x001C($sp) -/* 00364 80ADE0B4 0C01E9F1 */ jal LightContext_RemoveLight - -/* 00368 80ADE0B8 24A507A8 */ addiu $a1, $a1, 0x07A8 ## $a1 = 000007A8 -/* 0036C 80ADE0BC 8FA50018 */ lw $a1, 0x0018($sp) -/* 00370 80ADE0C0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00374 80ADE0C4 0C016F32 */ jal Collider_DestroyJntSph -/* 00378 80ADE0C8 24A50308 */ addiu $a1, $a1, 0x0308 ## $a1 = 00000308 -/* 0037C 80ADE0CC 8FA50018 */ lw $a1, 0x0018($sp) -/* 00380 80ADE0D0 8FA4001C */ lw $a0, 0x001C($sp) -/* 00384 80ADE0D4 0C0170EB */ jal Collider_DestroyCylinder - -/* 00388 80ADE0D8 24A502BC */ addiu $a1, $a1, 0x02BC ## $a1 = 000002BC -/* 0038C 80ADE0DC 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00390 80ADE0E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00394 80ADE0E4 3C0280AE */ lui $v0, %hi(D_80AE1A50) ## $v0 = 80AE0000 -/* 00398 80ADE0E8 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 0039C 80ADE0EC 24421A50 */ addiu $v0, $v0, %lo(D_80AE1A50) ## $v0 = 80AE1A50 -/* 003A0 80ADE0F0 57010005 */ bnel $t8, $at, .L80ADE108 -/* 003A4 80ADE0F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003A8 80ADE0F8 84590000 */ lh $t9, 0x0000($v0) ## 80AE1A50 -/* 003AC 80ADE0FC 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF -/* 003B0 80ADE100 A4480000 */ sh $t0, 0x0000($v0) ## 80AE1A50 -/* 003B4 80ADE104 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADE108: -/* 003B8 80ADE108 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003BC 80ADE10C 03E00008 */ jr $ra -/* 003C0 80ADE110 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s deleted file mode 100644 index d82b308c2c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s +++ /dev/null @@ -1,244 +0,0 @@ -glabel EnPoh_Init -/* 00000 80ADDD50 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80ADDD54 AFB10028 */ sw $s1, 0x0028($sp) -/* 00008 80ADDD58 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80ADDD5C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80ADDD60 AFB00024 */ sw $s0, 0x0024($sp) -/* 00014 80ADDD64 3C0580AE */ lui $a1, %hi(D_80AE1B5C) ## $a1 = 80AE0000 -/* 00018 80ADDD68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80ADDD6C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 80ADDD70 24A51B5C */ addiu $a1, $a1, %lo(D_80AE1B5C) ## $a1 = 80AE1B5C -/* 00024 80ADDD74 3C068003 */ lui $a2, %hi(ActorShadow_DrawFunc_Circle) -/* 00028 80ADDD78 24C6B5EC */ addiu $a2, %lo(ActorShadow_DrawFunc_Circle) -/* 0002C 80ADDD7C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00030 80ADDD80 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00034 80ADDD84 0C00AC78 */ jal ActorShape_Init - -/* 00038 80ADDD88 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0003C 80ADDD8C 26050308 */ addiu $a1, $s0, 0x0308 ## $a1 = 00000308 -/* 00040 80ADDD90 AFA50030 */ sw $a1, 0x0030($sp) -/* 00044 80ADDD94 0C016EFE */ jal Collider_InitJntSph -/* 00048 80ADDD98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0004C 80ADDD9C 3C0780AE */ lui $a3, %hi(D_80AE1AC4) ## $a3 = 80AE0000 -/* 00050 80ADDDA0 260E0328 */ addiu $t6, $s0, 0x0328 ## $t6 = 00000328 -/* 00054 80ADDDA4 8FA50030 */ lw $a1, 0x0030($sp) -/* 00058 80ADDDA8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0005C 80ADDDAC 24E71AC4 */ addiu $a3, $a3, %lo(D_80AE1AC4) ## $a3 = 80AE1AC4 -/* 00060 80ADDDB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00064 80ADDDB4 0C017014 */ jal Collider_SetJntSph -/* 00068 80ADDDB8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0006C 80ADDDBC 8E0F0324 */ lw $t7, 0x0324($s0) ## 00000324 -/* 00070 80ADDDC0 260502BC */ addiu $a1, $s0, 0x02BC ## $a1 = 000002BC -/* 00074 80ADDDC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00078 80ADDDC8 A5E00036 */ sh $zero, 0x0036($t7) ## 00000036 -/* 0007C 80ADDDCC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00080 80ADDDD0 8E080324 */ lw $t0, 0x0324($s0) ## 00000324 -/* 00084 80ADDDD4 4600218D */ trunc.w.s $f6, $f4 -/* 00088 80ADDDD8 44193000 */ mfc1 $t9, $f6 -/* 0008C 80ADDDDC 00000000 */ nop -/* 00090 80ADDDE0 A5190030 */ sh $t9, 0x0030($t0) ## 00000030 -/* 00094 80ADDDE4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 00098 80ADDDE8 8E0B0324 */ lw $t3, 0x0324($s0) ## 00000324 -/* 0009C 80ADDDEC 4600428D */ trunc.w.s $f10, $f8 -/* 000A0 80ADDDF0 440A5000 */ mfc1 $t2, $f10 -/* 000A4 80ADDDF4 00000000 */ nop -/* 000A8 80ADDDF8 A56A0032 */ sh $t2, 0x0032($t3) ## 00000032 -/* 000AC 80ADDDFC C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 000B0 80ADDE00 8E0E0324 */ lw $t6, 0x0324($s0) ## 00000324 -/* 000B4 80ADDE04 4600848D */ trunc.w.s $f18, $f16 -/* 000B8 80ADDE08 440D9000 */ mfc1 $t5, $f18 -/* 000BC 80ADDE0C 00000000 */ nop -/* 000C0 80ADDE10 A5CD0034 */ sh $t5, 0x0034($t6) ## 00000034 -/* 000C4 80ADDE14 0C0170D9 */ jal Collider_InitCylinder - -/* 000C8 80ADDE18 AFA50030 */ sw $a1, 0x0030($sp) -/* 000CC 80ADDE1C 3C0780AE */ lui $a3, %hi(D_80AE1A74) ## $a3 = 80AE0000 -/* 000D0 80ADDE20 8FA50030 */ lw $a1, 0x0030($sp) -/* 000D4 80ADDE24 24E71A74 */ addiu $a3, $a3, %lo(D_80AE1A74) ## $a3 = 80AE1A74 -/* 000D8 80ADDE28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 80ADDE2C 0C01712B */ jal Collider_SetCylinder - -/* 000E0 80ADDE30 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000E4 80ADDE34 3C0580AE */ lui $a1, %hi(D_80AE1ADC) ## $a1 = 80AE0000 -/* 000E8 80ADDE38 3C0680AE */ lui $a2, %hi(D_80AE1AD4) ## $a2 = 80AE0000 -/* 000EC 80ADDE3C 24C61AD4 */ addiu $a2, $a2, %lo(D_80AE1AD4) ## $a2 = 80AE1AD4 -/* 000F0 80ADDE40 24A51ADC */ addiu $a1, $a1, %lo(D_80AE1ADC) ## $a1 = 80AE1ADC -/* 000F4 80ADDE44 0C0187B5 */ jal func_80061ED4 -/* 000F8 80ADDE48 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000FC 80ADDE4C 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 00100 80ADDE50 A2000194 */ sb $zero, 0x0194($s0) ## 00000194 -/* 00104 80ADDE54 A20F0195 */ sb $t7, 0x0195($s0) ## 00000195 -/* 00108 80ADDE58 240402BC */ addiu $a0, $zero, 0x02BC ## $a0 = 000002BC -/* 0010C 80ADDE5C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00110 80ADDE60 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C -/* 00114 80ADDE64 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -/* 00118 80ADDE68 260602AC */ addiu $a2, $s0, 0x02AC ## $a2 = 000002AC -/* 0011C 80ADDE6C AFA60030 */ sw $a2, 0x0030($sp) -/* 00120 80ADDE70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00124 80ADDE74 0C01E9D9 */ jal LightContext_InsertLight - -/* 00128 80ADDE78 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 -/* 0012C 80ADDE7C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 00130 80ADDE80 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00134 80ADDE84 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 00138 80ADDE88 4600218D */ trunc.w.s $f6, $f4 -/* 0013C 80ADDE8C AE0202A8 */ sw $v0, 0x02A8($s0) ## 000002A8 -/* 00140 80ADDE90 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00144 80ADDE94 4600428D */ trunc.w.s $f10, $f8 -/* 00148 80ADDE98 44053000 */ mfc1 $a1, $f6 -/* 0014C 80ADDE9C 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00150 80ADDEA0 4600848D */ trunc.w.s $f18, $f16 -/* 00154 80ADDEA4 44065000 */ mfc1 $a2, $f10 -/* 00158 80ADDEA8 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0015C 80ADDEAC 00052C00 */ sll $a1, $a1, 16 -/* 00160 80ADDEB0 44079000 */ mfc1 $a3, $f18 -/* 00164 80ADDEB4 00063400 */ sll $a2, $a2, 16 -/* 00168 80ADDEB8 00063403 */ sra $a2, $a2, 16 -/* 0016C 80ADDEBC 00073C00 */ sll $a3, $a3, 16 -/* 00170 80ADDEC0 00073C03 */ sra $a3, $a3, 16 -/* 00174 80ADDEC4 00052C03 */ sra $a1, $a1, 16 -/* 00178 80ADDEC8 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0017C 80ADDECC AFAA0014 */ sw $t2, 0x0014($sp) -/* 00180 80ADDED0 AFA90010 */ sw $t1, 0x0010($sp) -/* 00184 80ADDED4 AFA0001C */ sw $zero, 0x001C($sp) -/* 00188 80ADDED8 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 0018C 80ADDEDC 8FA40030 */ lw $a0, 0x0030($sp) -/* 00190 80ADDEE0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00194 80ADDEE4 28410004 */ slti $at, $v0, 0x0004 -/* 00198 80ADDEE8 54200004 */ bnel $at, $zero, .L80ADDEFC -/* 0019C 80ADDEEC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001A0 80ADDEF0 A600001C */ sh $zero, 0x001C($s0) ## 0000001C -/* 001A4 80ADDEF4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 001A8 80ADDEF8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -.L80ADDEFC: -/* 001AC 80ADDEFC 5441001A */ bnel $v0, $at, .L80ADDF68 -/* 001B0 80ADDF00 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001B4 80ADDF04 3C0280AE */ lui $v0, %hi(D_80AE1A50) ## $v0 = 80AE0000 -/* 001B8 80ADDF08 24421A50 */ addiu $v0, $v0, %lo(D_80AE1A50) ## $v0 = 80AE1A50 -/* 001BC 80ADDF0C 844C0000 */ lh $t4, 0x0000($v0) ## 80AE1A50 -/* 001C0 80ADDF10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001C4 80ADDF14 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 001C8 80ADDF18 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 001CC 80ADDF1C A44D0000 */ sh $t5, 0x0000($v0) ## 80AE1A50 -/* 001D0 80ADDF20 844E0000 */ lh $t6, 0x0000($v0) ## 80AE1A50 -/* 001D4 80ADDF24 29C10003 */ slti $at, $t6, 0x0003 -/* 001D8 80ADDF28 14200005 */ bne $at, $zero, .L80ADDF40 -/* 001DC 80ADDF2C 00000000 */ nop -/* 001E0 80ADDF30 0C00B55C */ jal Actor_Kill - -/* 001E4 80ADDF34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E8 80ADDF38 10000008 */ beq $zero, $zero, .L80ADDF5C -/* 001EC 80ADDF3C 00000000 */ nop -.L80ADDF40: -/* 001F0 80ADDF40 0C007D52 */ jal Item_DropCollectible - -/* 001F4 80ADDF44 24064001 */ addiu $a2, $zero, 0x4001 ## $a2 = 00004001 -/* 001F8 80ADDF48 10400004 */ beq $v0, $zero, .L80ADDF5C -/* 001FC 80ADDF4C 00000000 */ nop -/* 00200 80ADDF50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00204 80ADDF54 00000000 */ nop -/* 00208 80ADDF58 E4440068 */ swc1 $f4, 0x0068($v0) ## 00000068 -.L80ADDF5C: -/* 0020C 80ADDF5C 10000026 */ beq $zero, $zero, .L80ADDFF8 -/* 00210 80ADDF60 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00214 80ADDF64 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -.L80ADDF68: -/* 00218 80ADDF68 14410011 */ bne $v0, $at, .L80ADDFB0 -/* 0021C 80ADDF6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00220 80ADDF70 0C00B2D0 */ jal Flags_GetSwitch - -/* 00224 80ADDF74 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -/* 00228 80ADDF78 14400005 */ bne $v0, $zero, .L80ADDF90 -/* 0022C 80ADDF7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00230 80ADDF80 0C00B2D0 */ jal Flags_GetSwitch - -/* 00234 80ADDF84 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 00238 80ADDF88 10400005 */ beq $v0, $zero, .L80ADDFA0 -/* 0023C 80ADDF8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80ADDF90: -/* 00240 80ADDF90 0C00B55C */ jal Actor_Kill - -/* 00244 80ADDF94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00248 80ADDF98 10000003 */ beq $zero, $zero, .L80ADDFA8 -/* 0024C 80ADDF9C 00000000 */ nop -.L80ADDFA0: -/* 00250 80ADDFA0 0C00B2DD */ jal Flags_SetSwitch - -/* 00254 80ADDFA4 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 -.L80ADDFA8: -/* 00258 80ADDFA8 10000013 */ beq $zero, $zero, .L80ADDFF8 -/* 0025C 80ADDFAC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80ADDFB0: -/* 00260 80ADDFB0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00264 80ADDFB4 14410010 */ bne $v0, $at, .L80ADDFF8 -/* 00268 80ADDFB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0026C 80ADDFBC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00270 80ADDFC0 24050029 */ addiu $a1, $zero, 0x0029 ## $a1 = 00000029 -/* 00274 80ADDFC4 14400005 */ bne $v0, $zero, .L80ADDFDC -/* 00278 80ADDFC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0027C 80ADDFCC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00280 80ADDFD0 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 00284 80ADDFD4 10400005 */ beq $v0, $zero, .L80ADDFEC -/* 00288 80ADDFD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80ADDFDC: -/* 0028C 80ADDFDC 0C00B55C */ jal Actor_Kill - -/* 00290 80ADDFE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00294 80ADDFE4 10000004 */ beq $zero, $zero, .L80ADDFF8 -/* 00298 80ADDFE8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80ADDFEC: -/* 0029C 80ADDFEC 0C00B2DD */ jal Flags_SetSwitch - -/* 002A0 80ADDFF0 24050029 */ addiu $a1, $zero, 0x0029 ## $a1 = 00000029 -/* 002A4 80ADDFF4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80ADDFF8: -/* 002A8 80ADDFF8 28410002 */ slti $at, $v0, 0x0002 -/* 002AC 80ADDFFC 1020000B */ beq $at, $zero, .L80ADE02C -/* 002B0 80ADE000 2405006E */ addiu $a1, $zero, 0x006E ## $a1 = 0000006E -/* 002B4 80ADE004 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002B8 80ADE008 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 002BC 80ADE00C 02212021 */ addu $a0, $s1, $at -/* 002C0 80ADE010 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 002C4 80ADE014 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 002C8 80ADE018 240F0044 */ addiu $t7, $zero, 0x0044 ## $t7 = 00000044 -/* 002CC 80ADE01C A2020196 */ sb $v0, 0x0196($s0) ## 00000196 -/* 002D0 80ADE020 A2000197 */ sb $zero, 0x0197($s0) ## 00000197 -/* 002D4 80ADE024 1000000A */ beq $zero, $zero, .L80ADE050 -/* 002D8 80ADE028 A20F0117 */ sb $t7, 0x0117($s0) ## 00000117 -.L80ADE02C: -/* 002DC 80ADE02C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 002E0 80ADE030 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 002E4 80ADE034 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 002E8 80ADE038 02212021 */ addu $a0, $s1, $at -/* 002EC 80ADE03C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 002F0 80ADE040 24190043 */ addiu $t9, $zero, 0x0043 ## $t9 = 00000043 -/* 002F4 80ADE044 A2020196 */ sb $v0, 0x0196($s0) ## 00000196 -/* 002F8 80ADE048 A2180197 */ sb $t8, 0x0197($s0) ## 00000197 -/* 002FC 80ADE04C A2190117 */ sb $t9, 0x0117($s0) ## 00000117 -.L80ADE050: -/* 00300 80ADE050 92080197 */ lbu $t0, 0x0197($s0) ## 00000197 -/* 00304 80ADE054 820C0196 */ lb $t4, 0x0196($s0) ## 00000196 -/* 00308 80ADE058 3C0A80AE */ lui $t2, %hi(D_80AE1AFC) ## $t2 = 80AE0000 -/* 0030C 80ADE05C 00084880 */ sll $t1, $t0, 2 -/* 00310 80ADE060 01284821 */ addu $t1, $t1, $t0 -/* 00314 80ADE064 000948C0 */ sll $t1, $t1, 3 -/* 00318 80ADE068 254A1AFC */ addiu $t2, $t2, %lo(D_80AE1AFC) ## $t2 = 80AE1AFC -/* 0031C 80ADE06C 012A5821 */ addu $t3, $t1, $t2 -/* 00320 80ADE070 05810003 */ bgez $t4, .L80ADE080 -/* 00324 80ADE074 AE0B02A4 */ sw $t3, 0x02A4($s0) ## 000002A4 -/* 00328 80ADE078 0C00B55C */ jal Actor_Kill - -/* 0032C 80ADE07C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADE080: -/* 00330 80ADE080 8FBF002C */ lw $ra, 0x002C($sp) -/* 00334 80ADE084 8FB00024 */ lw $s0, 0x0024($sp) -/* 00338 80ADE088 8FB10028 */ lw $s1, 0x0028($sp) -/* 0033C 80ADE08C 03E00008 */ jr $ra -/* 00340 80ADE090 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s deleted file mode 100644 index f4dd5bb1c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel EnPoh_Update -/* 027E4 80AE0534 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027E8 80AE0538 AFB00028 */ sw $s0, 0x0028($sp) -/* 027EC 80AE053C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 027F0 80AE0540 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 027F4 80AE0544 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 027F8 80AE0548 AFBF002C */ sw $ra, 0x002C($sp) -/* 027FC 80AE054C AFA50034 */ sw $a1, 0x0034($sp) -/* 02800 80AE0550 00A12021 */ addu $a0, $a1, $at -/* 02804 80AE0554 0C026062 */ jal Object_IsLoaded - -/* 02808 80AE0558 82050196 */ lb $a1, 0x0196($s0) ## 00000196 -/* 0280C 80AE055C 10400042 */ beq $v0, $zero, .L80AE0668 -/* 02810 80AE0560 3C0F80AE */ lui $t7, %hi(func_80AE0A1C) ## $t7 = 80AE0000 -/* 02814 80AE0564 820E0196 */ lb $t6, 0x0196($s0) ## 00000196 -/* 02818 80AE0568 25EF0A1C */ addiu $t7, $t7, %lo(func_80AE0A1C) ## $t7 = 80AE0A1C -/* 0281C 80AE056C AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 -/* 02820 80AE0570 A20E001E */ sb $t6, 0x001E($s0) ## 0000001E -/* 02824 80AE0574 8FA40034 */ lw $a0, 0x0034($sp) -/* 02828 80AE0578 0C00B591 */ jal Actor_SetObjectDependency - -/* 0282C 80AE057C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02830 80AE0580 92180197 */ lbu $t8, 0x0197($s0) ## 00000197 -/* 02834 80AE0584 8FA40034 */ lw $a0, 0x0034($sp) -/* 02838 80AE0588 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0283C 80AE058C 17000012 */ bne $t8, $zero, .L80AE05D8 -/* 02840 80AE0590 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02844 80AE0594 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 02848 80AE0598 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0284C 80AE059C 2619019E */ addiu $t9, $s0, 0x019E ## $t9 = 0000019E -/* 02850 80AE05A0 2608021C */ addiu $t0, $s0, 0x021C ## $t0 = 0000021C -/* 02854 80AE05A4 24090015 */ addiu $t1, $zero, 0x0015 ## $t1 = 00000015 -/* 02858 80AE05A8 AFA90018 */ sw $t1, 0x0018($sp) -/* 0285C 80AE05AC AFA80014 */ sw $t0, 0x0014($sp) -/* 02860 80AE05B0 AFB90010 */ sw $t9, 0x0010($sp) -/* 02864 80AE05B4 24E70A60 */ addiu $a3, $a3, 0x0A60 ## $a3 = 06000A60 -/* 02868 80AE05B8 24C650D0 */ addiu $a2, $a2, 0x50D0 ## $a2 = 060050D0 -/* 0286C 80AE05BC 8FA40034 */ lw $a0, 0x0034($sp) -/* 02870 80AE05C0 0C02915F */ jal SkelAnime_Init - -/* 02874 80AE05C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 02878 80AE05C8 3C0A80AE */ lui $t2, %hi(func_80AE0EE4) ## $t2 = 80AE0000 -/* 0287C 80AE05CC 254A0EE4 */ addiu $t2, $t2, %lo(func_80AE0EE4) ## $t2 = 80AE0EE4 -/* 02880 80AE05D0 1000001F */ beq $zero, $zero, .L80AE0650 -/* 02884 80AE05D4 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 -.L80AE05D8: -/* 02888 80AE05D8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 0288C 80AE05DC 260B019E */ addiu $t3, $s0, 0x019E ## $t3 = 0000019E -/* 02890 80AE05E0 260C021C */ addiu $t4, $s0, 0x021C ## $t4 = 0000021C -/* 02894 80AE05E4 240D000C */ addiu $t5, $zero, 0x000C ## $t5 = 0000000C -/* 02898 80AE05E8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0289C 80AE05EC AFAC0014 */ sw $t4, 0x0014($sp) -/* 028A0 80AE05F0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 028A4 80AE05F4 24E709DC */ addiu $a3, $a3, 0x09DC ## $a3 = 060009DC -/* 028A8 80AE05F8 0C0291BE */ jal SkelAnime_InitFlex -/* 028AC 80AE05FC 24C66F90 */ addiu $a2, $a2, 0x6F90 ## $a2 = 00006F90 -/* 028B0 80AE0600 8E180324 */ lw $t8, 0x0324($s0) ## 00000324 -/* 028B4 80AE0604 3C0E80AE */ lui $t6, %hi(func_80AE1148) ## $t6 = 80AE0000 -/* 028B8 80AE0608 25CE1148 */ addiu $t6, $t6, %lo(func_80AE1148) ## $t6 = 80AE1148 -/* 028BC 80AE060C AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -/* 028C0 80AE0610 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 -/* 028C4 80AE0614 A30F003C */ sb $t7, 0x003C($t8) ## 0000003C -/* 028C8 80AE0618 8E030324 */ lw $v1, 0x0324($s0) ## 00000324 -/* 028CC 80AE061C 2409C000 */ addiu $t1, $zero, 0xC000 ## $t1 = FFFFC000 -/* 028D0 80AE0620 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 028D4 80AE0624 8479002A */ lh $t9, 0x002A($v1) ## 0000002A -/* 028D8 80AE0628 240C0037 */ addiu $t4, $zero, 0x0037 ## $t4 = 00000037 -/* 028DC 80AE062C 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 028E0 80AE0630 00194023 */ subu $t0, $zero, $t9 -/* 028E4 80AE0634 A468002A */ sh $t0, 0x002A($v1) ## 0000002A -/* 028E8 80AE0638 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 028EC 80AE063C 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 028F0 80AE0640 A60B02FC */ sh $t3, 0x02FC($s0) ## 000002FC -/* 028F4 80AE0644 A60C02FE */ sh $t4, 0x02FE($s0) ## 000002FE -/* 028F8 80AE0648 A60D0300 */ sh $t5, 0x0300($s0) ## 00000300 -/* 028FC 80AE064C A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -.L80AE0650: -/* 02900 80AE0650 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 02904 80AE0654 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 02908 80AE0658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0290C 80AE065C 01C17824 */ and $t7, $t6, $at -/* 02910 80AE0660 0C2B78F7 */ jal func_80ADE3DC -/* 02914 80AE0664 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -.L80AE0668: -/* 02918 80AE0668 8FBF002C */ lw $ra, 0x002C($sp) -/* 0291C 80AE066C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02920 80AE0670 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02924 80AE0674 03E00008 */ jr $ra -/* 02928 80AE0678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s deleted file mode 100644 index 79080be662..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80ADE114 -/* 003C4 80ADE114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C8 80ADE118 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003CC 80ADE11C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 003D0 80ADE120 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 -/* 003D4 80ADE124 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003D8 80ADE128 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 003DC 80ADE12C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 003E0 80ADE130 AFA60018 */ sw $a2, 0x0018($sp) -/* 003E4 80ADE134 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 003E8 80ADE138 0C01DF64 */ jal Math_Rand_S16Offset - -/* 003EC 80ADE13C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 003F0 80ADE140 8FA60018 */ lw $a2, 0x0018($sp) -/* 003F4 80ADE144 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 003F8 80ADE148 3C0F80AE */ lui $t7, %hi(func_80ADEAC4) ## $t7 = 80AE0000 -/* 003FC 80ADE14C 25EFEAC4 */ addiu $t7, $t7, %lo(func_80ADEAC4) ## $t7 = 80ADEAC4 -/* 00400 80ADE150 A4C20198 */ sh $v0, 0x0198($a2) ## 00000198 -/* 00404 80ADE154 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00408 80ADE158 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 0040C 80ADE15C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00410 80ADE160 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00414 80ADE164 03E00008 */ jr $ra -/* 00418 80ADE168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s deleted file mode 100644 index bd529dbb5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80ADE16C -/* 0041C 80ADE16C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00420 80ADE170 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00424 80ADE174 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00428 80ADE178 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 -/* 0042C 80ADE17C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00430 80ADE180 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00434 80ADE184 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00438 80ADE188 AFA60018 */ sw $a2, 0x0018($sp) -/* 0043C 80ADE18C 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F -/* 00440 80ADE190 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00444 80ADE194 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00448 80ADE198 8FA60018 */ lw $a2, 0x0018($sp) -/* 0044C 80ADE19C 3C0F80AE */ lui $t7, %hi(func_80ADEB80) ## $t7 = 80AE0000 -/* 00450 80ADE1A0 25EFEB80 */ addiu $t7, $t7, %lo(func_80ADEB80) ## $t7 = 80ADEB80 -/* 00454 80ADE1A4 A4C20198 */ sh $v0, 0x0198($a2) ## 00000198 -/* 00458 80ADE1A8 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0045C 80ADE1AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00460 80ADE1B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00464 80ADE1B4 03E00008 */ jr $ra -/* 00468 80ADE1B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s deleted file mode 100644 index ebac79583f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80ADE1BC -/* 0046C 80ADE1BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00470 80ADE1C0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00474 80ADE1C4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00478 80ADE1C8 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 -/* 0047C 80ADE1CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00480 80ADE1D0 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00484 80ADE1D4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 00488 80ADE1D8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0048C 80ADE1DC 8FA60018 */ lw $a2, 0x0018($sp) -/* 00490 80ADE1E0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00494 80ADE1E4 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00498 80ADE1E8 3C0F80AE */ lui $t7, %hi(func_80ADEC9C) ## $t7 = 80AE0000 -/* 0049C 80ADE1EC 25EFEC9C */ addiu $t7, $t7, %lo(func_80ADEC9C) ## $t7 = 80ADEC9C -/* 004A0 80ADE1F0 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 004A4 80ADE1F4 A4C00198 */ sh $zero, 0x0198($a2) ## 00000198 -/* 004A8 80ADE1F8 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 004AC 80ADE1FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004B0 80ADE200 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004B4 80ADE204 03E00008 */ jr $ra -/* 004B8 80ADE208 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s deleted file mode 100644 index b09d7ee65d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80ADE20C -/* 004BC 80ADE20C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004C0 80ADE210 AFBF001C */ sw $ra, 0x001C($sp) -/* 004C4 80ADE214 AFB00018 */ sw $s0, 0x0018($sp) -/* 004C8 80ADE218 908E0197 */ lbu $t6, 0x0197($a0) ## 00000197 -/* 004CC 80ADE21C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004D0 80ADE220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004D4 80ADE224 15C00008 */ bne $t6, $zero, .L80ADE248 -/* 004D8 80ADE228 24A5020C */ addiu $a1, $a1, 0x020C ## $a1 = 0600020C -/* 004DC 80ADE22C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004E0 80ADE230 24A501A8 */ addiu $a1, $a1, 0x01A8 ## $a1 = 060001A8 -/* 004E4 80ADE234 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004E8 80ADE238 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 004EC 80ADE23C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 004F0 80ADE240 10000004 */ beq $zero, $zero, .L80ADE254 -/* 004F4 80ADE244 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80ADE248: -/* 004F8 80ADE248 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 004FC 80ADE24C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00500 80ADE250 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -.L80ADE254: -/* 00504 80ADE254 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C -/* 00508 80ADE258 A60F0198 */ sh $t7, 0x0198($s0) ## 00000198 -/* 0050C 80ADE25C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00510 80ADE260 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 00514 80ADE264 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00518 80ADE268 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0051C 80ADE26C 3C1880AE */ lui $t8, %hi(func_80ADEDFC) ## $t8 = 80AE0000 -/* 00520 80ADE270 2718EDFC */ addiu $t8, $t8, %lo(func_80ADEDFC) ## $t8 = 80ADEDFC -/* 00524 80ADE274 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 00528 80ADE278 8FBF001C */ lw $ra, 0x001C($sp) -/* 0052C 80ADE27C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00530 80ADE280 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00534 80ADE284 03E00008 */ jr $ra -/* 00538 80ADE288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s deleted file mode 100644 index 77ad1fbefd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_80ADE28C -/* 0053C 80ADE28C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00540 80ADE290 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00544 80ADE294 AFB00020 */ sw $s0, 0x0020($sp) -/* 00548 80ADE298 908E0197 */ lbu $t6, 0x0197($a0) ## 00000197 -/* 0054C 80ADE29C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00550 80ADE2A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00554 80ADE2A4 15C00008 */ bne $t6, $zero, .L80ADE2C8 -/* 00558 80ADE2A8 24A50570 */ addiu $a1, $a1, 0x0570 ## $a1 = 06000570 -/* 0055C 80ADE2AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00560 80ADE2B0 24A504EC */ addiu $a1, $a1, 0x04EC ## $a1 = 060004EC -/* 00564 80ADE2B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00568 80ADE2B8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop -/* 0056C 80ADE2BC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00570 80ADE2C0 10000004 */ beq $zero, $zero, .L80ADE2D4 -/* 00574 80ADE2C4 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 -.L80ADE2C8: -/* 00578 80ADE2C8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 0057C 80ADE2CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00580 80ADE2D0 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 -.L80ADE2D4: -/* 00584 80ADE2D4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00588 80ADE2D8 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 -/* 0058C 80ADE2DC 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 00590 80ADE2E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00594 80ADE2E4 0301C824 */ and $t9, $t8, $at -/* 00598 80ADE2E8 13200005 */ beq $t9, $zero, .L80ADE300 -/* 0059C 80ADE2EC 00000000 */ nop -/* 005A0 80ADE2F0 8E0802C4 */ lw $t0, 0x02C4($s0) ## 000002C4 -/* 005A4 80ADE2F4 85090032 */ lh $t1, 0x0032($t0) ## 00000032 -/* 005A8 80ADE2F8 10000006 */ beq $zero, $zero, .L80ADE314 -/* 005AC 80ADE2FC A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -.L80ADE300: -/* 005B0 80ADE300 0C00B69E */ jal func_8002DA78 -/* 005B4 80ADE304 8E0502C4 */ lw $a1, 0x02C4($s0) ## 000002C4 -/* 005B8 80ADE308 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005BC 80ADE30C 00415021 */ addu $t2, $v0, $at -/* 005C0 80ADE310 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -.L80ADE314: -/* 005C4 80ADE314 920B02CD */ lbu $t3, 0x02CD($s0) ## 000002CD -/* 005C8 80ADE318 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 005CC 80ADE31C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 005D0 80ADE320 316CFFFE */ andi $t4, $t3, 0xFFFE ## $t4 = 00000000 -/* 005D4 80ADE324 A20C02CD */ sb $t4, 0x02CD($s0) ## 000002CD -/* 005D8 80ADE328 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 005DC 80ADE32C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 005E0 80ADE330 AFAD0010 */ sw $t5, 0x0010($sp) -/* 005E4 80ADE334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005E8 80ADE338 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 005EC 80ADE33C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 005F0 80ADE340 0C00D09B */ jal func_8003426C -/* 005F4 80ADE344 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005F8 80ADE348 3C0E80AE */ lui $t6, %hi(func_80ADEECC) ## $t6 = 80AE0000 -/* 005FC 80ADE34C 25CEEECC */ addiu $t6, $t6, %lo(func_80ADEECC) ## $t6 = 80ADEECC -/* 00600 80ADE350 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00604 80ADE354 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00608 80ADE358 8FB00020 */ lw $s0, 0x0020($sp) -/* 0060C 80ADE35C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00610 80ADE360 03E00008 */ jr $ra -/* 00614 80ADE364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s deleted file mode 100644 index 78a190522f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80ADE368 -/* 00618 80ADE368 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0061C 80ADE36C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00620 80ADE370 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00624 80ADE374 8CEE02A4 */ lw $t6, 0x02A4($a3) ## 000002A4 -/* 00628 80ADE378 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0062C 80ADE37C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00630 80ADE380 8DC50018 */ lw $a1, 0x0018($t6) ## 00000018 -/* 00634 80ADE384 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat -/* 00638 80ADE388 AFA70018 */ sw $a3, 0x0018($sp) -/* 0063C 80ADE38C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00640 80ADE390 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00644 80ADE394 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00648 80ADE398 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 -/* 0064C 80ADE39C 90F902CD */ lbu $t9, 0x02CD($a3) ## 000002CD -/* 00650 80ADE3A0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00654 80ADE3A4 3C0A80AE */ lui $t2, %hi(func_80ADF894) ## $t2 = 80AE0000 -/* 00658 80ADE3A8 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 -/* 0065C 80ADE3AC 254AF894 */ addiu $t2, $t2, %lo(func_80ADF894) ## $t2 = 80ADF894 -/* 00660 80ADE3B0 01E1C021 */ addu $t8, $t7, $at -/* 00664 80ADE3B4 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00668 80ADE3B8 A4F80032 */ sh $t8, 0x0032($a3) ## 00000032 -/* 0066C 80ADE3BC A0E802CD */ sb $t0, 0x02CD($a3) ## 000002CD -/* 00670 80ADE3C0 A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 -/* 00674 80ADE3C4 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 00678 80ADE3C8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0067C 80ADE3CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00680 80ADE3D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00684 80ADE3D4 03E00008 */ jr $ra -/* 00688 80ADE3D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s deleted file mode 100644 index 34a57261d3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80ADE3DC -/* 0068C 80ADE3DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00690 80ADE3E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00694 80ADE3E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00698 80ADE3E8 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 0069C 80ADE3EC 90980197 */ lbu $t8, 0x0197($a0) ## 00000197 -/* 006A0 80ADE3F0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 006A4 80ADE3F4 01C17824 */ and $t7, $t6, $at -/* 006A8 80ADE3F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006AC 80ADE3FC A080029D */ sb $zero, 0x029D($a0) ## 0000029D -/* 006B0 80ADE400 1700000A */ bne $t8, $zero, .L80ADE42C -/* 006B4 80ADE404 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 006B8 80ADE408 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006BC 80ADE40C 24A511C4 */ addiu $a1, $a1, 0x11C4 ## $a1 = 060011C4 -/* 006C0 80ADE410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006C4 80ADE414 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop -/* 006C8 80ADE418 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 006CC 80ADE41C 3C1980AE */ lui $t9, %hi(func_80ADEF38) ## $t9 = 80AE0000 -/* 006D0 80ADE420 2739EF38 */ addiu $t9, $t9, %lo(func_80ADEF38) ## $t9 = 80ADEF38 -/* 006D4 80ADE424 10000014 */ beq $zero, $zero, .L80ADE478 -/* 006D8 80ADE428 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L80ADE42C: -/* 006DC 80ADE42C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006E0 80ADE430 24A50FE4 */ addiu $a1, $a1, 0x0FE4 ## $a1 = 06000FE4 -/* 006E4 80ADE434 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006E8 80ADE438 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop -/* 006EC 80ADE43C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006F0 80ADE440 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 006F4 80ADE444 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 006F8 80ADE448 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 006FC 80ADE44C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00700 80ADE450 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 00704 80ADE454 46062200 */ add.s $f8, $f4, $f6 -/* 00708 80ADE458 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0070C 80ADE45C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 00710 80ADE460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00714 80ADE464 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00718 80ADE468 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 0071C 80ADE46C 3C0880AE */ lui $t0, %hi(func_80ADF0B8) ## $t0 = 80AE0000 -/* 00720 80ADE470 2508F0B8 */ addiu $t0, $t0, %lo(func_80ADF0B8) ## $t0 = 80ADF0B8 -/* 00724 80ADE474 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -.L80ADE478: -/* 00728 80ADE478 8FBF001C */ lw $ra, 0x001C($sp) -/* 0072C 80ADE47C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00730 80ADE480 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00734 80ADE484 03E00008 */ jr $ra -/* 00738 80ADE488 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s deleted file mode 100644 index e17005cd5a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_80ADE48C -/* 0073C 80ADE48C 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00740 80ADE490 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00744 80ADE494 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 00748 80ADE498 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0074C 80ADE49C 3C0880AE */ lui $t0, %hi(func_80ADF15C) ## $t0 = 80AE0000 -/* 00750 80ADE4A0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00754 80ADE4A4 2508F15C */ addiu $t0, $t0, %lo(func_80ADF15C) ## $t0 = 80ADF15C -/* 00758 80ADE4A8 0301C824 */ and $t9, $t8, $at -/* 0075C 80ADE4AC A4800198 */ sh $zero, 0x0198($a0) ## 00000198 -/* 00760 80ADE4B0 A08F0117 */ sb $t7, 0x0117($a0) ## 00000117 -/* 00764 80ADE4B4 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00768 80ADE4B8 AC880190 */ sw $t0, 0x0190($a0) ## 00000190 -/* 0076C 80ADE4BC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00770 80ADE4C0 03E00008 */ jr $ra -/* 00774 80ADE4C4 A48E0032 */ sh $t6, 0x0032($a0) ## 00000032 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s deleted file mode 100644 index ff7fadf36b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80ADE4C8 -/* 00778 80ADE4C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0077C 80ADE4CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00780 80ADE4D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00784 80ADE4D4 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 -/* 00788 80ADE4D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0078C 80ADE4DC 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00790 80ADE4E0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop -/* 00794 80ADE4E4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00798 80ADE4E8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0079C 80ADE4EC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 007A0 80ADE4F0 44812000 */ mtc1 $at, $f4 ## $f4 = -5.00 -/* 007A4 80ADE4F4 3C0F80AE */ lui $t7, %hi(func_80ADF574) ## $t7 = 80AE0000 -/* 007A8 80ADE4F8 25EFF574 */ addiu $t7, $t7, %lo(func_80ADF574) ## $t7 = 80ADF574 -/* 007AC 80ADE4FC ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 007B0 80ADE500 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 007B4 80ADE504 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007B8 80ADE508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007BC 80ADE50C 03E00008 */ jr $ra -/* 007C0 80ADE510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s deleted file mode 100644 index 602507f57d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80ADE514 -/* 007C4 80ADE514 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007C8 80ADE518 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007CC 80ADE51C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 007D0 80ADE520 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 -/* 007D4 80ADE524 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007D8 80ADE528 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 007DC 80ADE52C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat -/* 007E0 80ADE530 AFA60018 */ sw $a2, 0x0018($sp) -/* 007E4 80ADE534 8FA60018 */ lw $a2, 0x0018($sp) -/* 007E8 80ADE538 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 007EC 80ADE53C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 007F0 80ADE540 84CF0032 */ lh $t7, 0x0032($a2) ## 00000032 -/* 007F4 80ADE544 3C1980AE */ lui $t9, %hi(func_80ADF5E0) ## $t9 = 80AE0000 -/* 007F8 80ADE548 2739F5E0 */ addiu $t9, $t9, %lo(func_80ADF5E0) ## $t9 = 80ADF5E0 -/* 007FC 80ADE54C 01E1C021 */ addu $t8, $t7, $at -/* 00800 80ADE550 A4D8019C */ sh $t8, 0x019C($a2) ## 0000019C -/* 00804 80ADE554 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 -/* 00808 80ADE558 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 0080C 80ADE55C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00810 80ADE560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 80ADE564 03E00008 */ jr $ra -/* 00818 80ADE568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s deleted file mode 100644 index 9eb0e26012..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80ADE56C -/* 0081C 80ADE56C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00820 80ADE570 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00824 80ADE574 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00828 80ADE578 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 0082C 80ADE57C 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 00830 80ADE580 A08E0194 */ sb $t6, 0x0194($a0) ## 00000194 -/* 00834 80ADE584 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00838 80ADE588 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 0083C 80ADE58C AFA40018 */ sw $a0, 0x0018($sp) -/* 00840 80ADE590 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00844 80ADE594 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 -/* 00848 80ADE598 8FA40018 */ lw $a0, 0x0018($sp) -/* 0084C 80ADE59C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00850 80ADE5A0 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 00854 80ADE5A4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00858 80ADE5A8 3C1880AE */ lui $t8, %hi(func_80ADF660) ## $t8 = 80AE0000 -/* 0085C 80ADE5AC 2718F660 */ addiu $t8, $t8, %lo(func_80ADF660) ## $t8 = 80ADF660 -/* 00860 80ADE5B0 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -/* 00864 80ADE5B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00868 80ADE5B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0086C 80ADE5BC 03E00008 */ jr $ra -/* 00870 80ADE5C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s deleted file mode 100644 index d7db4589ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80ADE5C4 -/* 00874 80ADE5C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00878 80ADE5C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0087C 80ADE5CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00880 80ADE5D0 A0800194 */ sb $zero, 0x0194($a0) ## 00000194 -/* 00884 80ADE5D4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00888 80ADE5D8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0088C 80ADE5DC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00890 80ADE5E0 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 00894 80ADE5E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00898 80ADE5E8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0089C 80ADE5EC 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 008A0 80ADE5F0 8FA40018 */ lw $a0, 0x0018($sp) -/* 008A4 80ADE5F4 3C0E80AE */ lui $t6, %hi(func_80ADF77C) ## $t6 = 80AE0000 -/* 008A8 80ADE5F8 25CEF77C */ addiu $t6, $t6, %lo(func_80ADF77C) ## $t6 = 80ADF77C -/* 008AC 80ADE5FC AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 -/* 008B0 80ADE600 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008B4 80ADE604 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008B8 80ADE608 03E00008 */ jr $ra -/* 008BC 80ADE60C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s deleted file mode 100644 index 15a920ec06..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s +++ /dev/null @@ -1,58 +0,0 @@ -.late_rodata -glabel D_80AE1C30 - .float 1500.0 - -.text -glabel func_80ADE610 -/* 008C0 80ADE610 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008C4 80ADE614 AFA5001C */ sw $a1, 0x001C($sp) -/* 008C8 80ADE618 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008CC 80ADE61C 3C0E80AE */ lui $t6, %hi(func_80AE1600) ## $t6 = 80AE0000 -/* 008D0 80ADE620 3C0F80AE */ lui $t7, %hi(func_80AE1654) ## $t7 = 80AE0000 -/* 008D4 80ADE624 25CE1600 */ addiu $t6, $t6, %lo(func_80AE1600) ## $t6 = 80AE1600 -/* 008D8 80ADE628 25EF1654 */ addiu $t7, $t7, %lo(func_80AE1654) ## $t7 = 80AE1654 -/* 008DC 80ADE62C AC8E0130 */ sw $t6, 0x0130($a0) ## 00000130 -/* 008E0 80ADE630 AC8F0134 */ sw $t7, 0x0134($a0) ## 00000134 -/* 008E4 80ADE634 AC8000C0 */ sw $zero, 0x00C0($a0) ## 000000C0 -/* 008E8 80ADE638 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 008EC 80ADE63C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 008F0 80ADE640 0C00B58B */ jal Actor_SetScale - -/* 008F4 80ADE644 AFA40018 */ sw $a0, 0x0018($sp) -/* 008F8 80ADE648 8FA60018 */ lw $a2, 0x0018($sp) -/* 008FC 80ADE64C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00900 80ADE650 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 00904 80ADE654 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 -/* 00908 80ADE658 8FA4001C */ lw $a0, 0x001C($sp) -/* 0090C 80ADE65C 3C0180AE */ lui $at, %hi(D_80AE1C30) ## $at = 80AE0000 -/* 00910 80ADE660 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 -/* 00914 80ADE664 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 00918 80ADE668 E4C4006C */ swc1 $f4, 0x006C($a2) ## 0000006C -/* 0091C 80ADE66C C4261C30 */ lwc1 $f6, %lo(D_80AE1C30)($at) -/* 00920 80ADE670 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00924 80ADE674 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 00928 80ADE678 C4C80028 */ lwc1 $f8, 0x0028($a2) ## 00000028 -/* 0092C 80ADE67C 90C80197 */ lbu $t0, 0x0197($a2) ## 00000197 -/* 00930 80ADE680 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00934 80ADE684 460A4401 */ sub.s $f16, $f8, $f10 -/* 00938 80ADE688 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 0093C 80ADE68C E4C600BC */ swc1 $f6, 0x00BC($a2) ## 000000BC -/* 00940 80ADE690 11010003 */ beq $t0, $at, .L80ADE6A0 -/* 00944 80ADE694 E4D00028 */ swc1 $f16, 0x0028($a2) ## 00000028 -/* 00948 80ADE698 24098000 */ addiu $t1, $zero, 0x8000 ## $t1 = FFFF8000 -/* 0094C 80ADE69C A4C900B4 */ sh $t1, 0x00B4($a2) ## 000000B4 -.L80ADE6A0: -/* 00950 80ADE6A0 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 00954 80ADE6A4 0C00CDD2 */ jal Actor_ChangeType - -/* 00958 80ADE6A8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0095C 80ADE6AC 8FA60018 */ lw $a2, 0x0018($sp) -/* 00960 80ADE6B0 3C0B80AE */ lui $t3, %hi(func_80ADF994) ## $t3 = 80AE0000 -/* 00964 80ADE6B4 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C -/* 00968 80ADE6B8 256BF994 */ addiu $t3, $t3, %lo(func_80ADF994) ## $t3 = 80ADF994 -/* 0096C 80ADE6BC A4CA0198 */ sh $t2, 0x0198($a2) ## 00000198 -/* 00970 80ADE6C0 ACCB0190 */ sw $t3, 0x0190($a2) ## 00000190 -/* 00974 80ADE6C4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00978 80ADE6C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0097C 80ADE6CC 03E00008 */ jr $ra -/* 00980 80ADE6D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s deleted file mode 100644 index 3adf75a828..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80ADE6D4 -/* 00984 80ADE6D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00988 80ADE6D8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0098C 80ADE6DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00990 80ADE6E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00994 80ADE6E4 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 00998 80ADE6E8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0099C 80ADE6EC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 009A0 80ADE6F0 4600848D */ trunc.w.s $f18, $f16 -/* 009A4 80ADE6F4 AFA0001C */ sw $zero, 0x001C($sp) -/* 009A8 80ADE6F8 AFA00018 */ sw $zero, 0x0018($sp) -/* 009AC 80ADE6FC 4600428D */ trunc.w.s $f10, $f8 -/* 009B0 80ADE700 44079000 */ mfc1 $a3, $f18 -/* 009B4 80ADE704 AFA00014 */ sw $zero, 0x0014($sp) -/* 009B8 80ADE708 4600218D */ trunc.w.s $f6, $f4 -/* 009BC 80ADE70C 44065000 */ mfc1 $a2, $f10 -/* 009C0 80ADE710 00073C00 */ sll $a3, $a3, 16 -/* 009C4 80ADE714 00073C03 */ sra $a3, $a3, 16 -/* 009C8 80ADE718 44053000 */ mfc1 $a1, $f6 -/* 009CC 80ADE71C 00063400 */ sll $a2, $a2, 16 -/* 009D0 80ADE720 00063403 */ sra $a2, $a2, 16 -/* 009D4 80ADE724 00052C00 */ sll $a1, $a1, 16 -/* 009D8 80ADE728 00052C03 */ sra $a1, $a1, 16 -/* 009DC 80ADE72C AFA00010 */ sw $zero, 0x0010($sp) -/* 009E0 80ADE730 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 009E4 80ADE734 248402AC */ addiu $a0, $a0, 0x02AC ## $a0 = 000002AC -/* 009E8 80ADE738 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 009EC 80ADE73C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 009F0 80ADE740 A600019A */ sh $zero, 0x019A($s0) ## 0000019A -/* 009F4 80ADE744 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 009F8 80ADE748 2B210002 */ slti $at, $t9, 0x0002 -/* 009FC 80ADE74C A200029A */ sb $zero, 0x029A($s0) ## 0000029A -/* 00A00 80ADE750 A200029D */ sb $zero, 0x029D($s0) ## 0000029D -/* 00A04 80ADE754 E60000BC */ swc1 $f0, 0x00BC($s0) ## 000000BC -/* 00A08 80ADE758 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 00A0C 80ADE75C 14200005 */ bne $at, $zero, .L80ADE774 -/* 00A10 80ADE760 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00A14 80ADE764 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 00A18 80ADE768 A208029B */ sb $t0, 0x029B($s0) ## 0000029B -/* 00A1C 80ADE76C 10000004 */ beq $zero, $zero, .L80ADE780 -/* 00A20 80ADE770 A200029C */ sb $zero, 0x029C($s0) ## 0000029C -.L80ADE774: -/* 00A24 80ADE774 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 -/* 00A28 80ADE778 A200029B */ sb $zero, 0x029B($s0) ## 0000029B -/* 00A2C 80ADE77C A209029C */ sb $t1, 0x029C($s0) ## 0000029C -.L80ADE780: -/* 00A30 80ADE780 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00A34 80ADE784 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 00A38 80ADE788 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 00A3C 80ADE78C A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 -/* 00A40 80ADE790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A44 80ADE794 240528E0 */ addiu $a1, $zero, 0x28E0 ## $a1 = 000028E0 -/* 00A48 80ADE798 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A4C 80ADE79C E604000C */ swc1 $f4, 0x000C($s0) ## 0000000C -/* 00A50 80ADE7A0 3C0A80AE */ lui $t2, %hi(func_80ADFE28) ## $t2 = 80AE0000 -/* 00A54 80ADE7A4 254AFE28 */ addiu $t2, $t2, %lo(func_80ADFE28) ## $t2 = 80ADFE28 -/* 00A58 80ADE7A8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 00A5C 80ADE7AC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A60 80ADE7B0 8FB00028 */ lw $s0, 0x0028($sp) -/* 00A64 80ADE7B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A68 80ADE7B8 03E00008 */ jr $ra -/* 00A6C 80ADE7BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s deleted file mode 100644 index 2dd691f6f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s +++ /dev/null @@ -1,114 +0,0 @@ -glabel func_80ADE7C0 -/* 00A70 80ADE7C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A74 80ADE7C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A78 80ADE7C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 00A7C 80ADE7CC C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00A80 80ADE7D0 3C05C120 */ lui $a1, 0xC120 ## $a1 = C1200000 -/* 00A84 80ADE7D4 E484000C */ swc1 $f4, 0x000C($a0) ## 0000000C -/* 00A88 80ADE7D8 0C00B56E */ jal Actor_SetHeight - -/* 00A8C 80ADE7DC AFA40018 */ sw $a0, 0x0018($sp) -/* 00A90 80ADE7E0 8FA60018 */ lw $a2, 0x0018($sp) -/* 00A94 80ADE7E4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00A98 80ADE7E8 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 00A9C 80ADE7EC C4C60024 */ lwc1 $f6, 0x0024($a2) ## 00000024 -/* 00AA0 80ADE7F0 C4CA0028 */ lwc1 $f10, 0x0028($a2) ## 00000028 -/* 00AA4 80ADE7F4 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -/* 00AA8 80ADE7F8 4600320D */ trunc.w.s $f8, $f6 -/* 00AAC 80ADE7FC C4C6002C */ lwc1 $f6, 0x002C($a2) ## 0000002C -/* 00AB0 80ADE800 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 00AB4 80ADE804 46105481 */ sub.s $f18, $f10, $f16 -/* 00AB8 80ADE808 44194000 */ mfc1 $t9, $f8 -/* 00ABC 80ADE80C 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 00AC0 80ADE810 4600320D */ trunc.w.s $f8, $f6 -/* 00AC4 80ADE814 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 00AC8 80ADE818 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00ACC 80ADE81C 4600910D */ trunc.w.s $f4, $f18 -/* 00AD0 80ADE820 440B4000 */ mfc1 $t3, $f8 -/* 00AD4 80ADE824 A4CE02FC */ sh $t6, 0x02FC($a2) ## 000002FC -/* 00AD8 80ADE828 A4CF02FE */ sh $t7, 0x02FE($a2) ## 000002FE -/* 00ADC 80ADE82C 44092000 */ mfc1 $t1, $f4 -/* 00AE0 80ADE830 A4C00300 */ sh $zero, 0x0300($a2) ## 00000300 -/* 00AE4 80ADE834 A0CC02CE */ sb $t4, 0x02CE($a2) ## 000002CE -/* 00AE8 80ADE838 A4D90302 */ sh $t9, 0x0302($a2) ## 00000302 -/* 00AEC 80ADE83C A4CB0306 */ sh $t3, 0x0306($a2) ## 00000306 -/* 00AF0 80ADE840 10410004 */ beq $v0, $at, .L80ADE854 -/* 00AF4 80ADE844 A4C90304 */ sh $t1, 0x0304($a2) ## 00000304 -/* 00AF8 80ADE848 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00AFC 80ADE84C 14410031 */ bne $v0, $at, .L80ADE914 -/* 00B00 80ADE850 240A5005 */ addiu $t2, $zero, 0x5005 ## $t2 = 00005005 -.L80ADE854: -/* 00B04 80ADE854 3C0D8012 */ lui $t5, %hi(gBitFlags+0x3c) -/* 00B08 80ADE858 3C0E8016 */ lui $t6, %hi(gSaveContext+0xa4) -/* 00B0C 80ADE85C 8DCEE704 */ lw $t6, %lo(gSaveContext+0xa4)($t6) -/* 00B10 80ADE860 8DAD715C */ lw $t5, %lo(gBitFlags+0x3c)($t5) -/* 00B14 80ADE864 24185000 */ addiu $t8, $zero, 0x5000 ## $t8 = 00005000 -/* 00B18 80ADE868 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B1C 80ADE86C 01AE7824 */ and $t7, $t5, $t6 -/* 00B20 80ADE870 11E00003 */ beq $t7, $zero, .L80ADE880 -/* 00B24 80ADE874 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 00B28 80ADE878 10000027 */ beq $zero, $zero, .L80ADE918 -/* 00B2C 80ADE87C A4D8010E */ sh $t8, 0x010E($a2) ## 0000010E -.L80ADE880: -/* 00B30 80ADE880 0C00B2D0 */ jal Flags_GetSwitch - -/* 00B34 80ADE884 AFA60018 */ sw $a2, 0x0018($sp) -/* 00B38 80ADE888 1440000A */ bne $v0, $zero, .L80ADE8B4 -/* 00B3C 80ADE88C 8FA60018 */ lw $a2, 0x0018($sp) -/* 00B40 80ADE890 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B44 80ADE894 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 00B48 80ADE898 0C00B2D0 */ jal Flags_GetSwitch - -/* 00B4C 80ADE89C AFA60018 */ sw $a2, 0x0018($sp) -/* 00B50 80ADE8A0 14400004 */ bne $v0, $zero, .L80ADE8B4 -/* 00B54 80ADE8A4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00B58 80ADE8A8 2419500F */ addiu $t9, $zero, 0x500F ## $t9 = 0000500F -/* 00B5C 80ADE8AC 1000001A */ beq $zero, $zero, .L80ADE918 -/* 00B60 80ADE8B0 A4D9010E */ sh $t9, 0x010E($a2) ## 0000010E -.L80ADE8B4: -/* 00B64 80ADE8B4 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -/* 00B68 80ADE8B8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00B6C 80ADE8BC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B70 80ADE8C0 14410006 */ bne $v0, $at, .L80ADE8DC -/* 00B74 80ADE8C4 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 00B78 80ADE8C8 0C00B2D0 */ jal Flags_GetSwitch - -/* 00B7C 80ADE8CC AFA60018 */ sw $a2, 0x0018($sp) -/* 00B80 80ADE8D0 1440000A */ bne $v0, $zero, .L80ADE8FC -/* 00B84 80ADE8D4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00B88 80ADE8D8 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -.L80ADE8DC: -/* 00B8C 80ADE8DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00B90 80ADE8E0 14410009 */ bne $v0, $at, .L80ADE908 -/* 00B94 80ADE8E4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B98 80ADE8E8 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 00B9C 80ADE8EC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00BA0 80ADE8F0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00BA4 80ADE8F4 10400004 */ beq $v0, $zero, .L80ADE908 -/* 00BA8 80ADE8F8 8FA60018 */ lw $a2, 0x0018($sp) -.L80ADE8FC: -/* 00BAC 80ADE8FC 24085013 */ addiu $t0, $zero, 0x5013 ## $t0 = 00005013 -/* 00BB0 80ADE900 10000005 */ beq $zero, $zero, .L80ADE918 -/* 00BB4 80ADE904 A4C8010E */ sh $t0, 0x010E($a2) ## 0000010E -.L80ADE908: -/* 00BB8 80ADE908 24095012 */ addiu $t1, $zero, 0x5012 ## $t1 = 00005012 -/* 00BBC 80ADE90C 10000002 */ beq $zero, $zero, .L80ADE918 -/* 00BC0 80ADE910 A4C9010E */ sh $t1, 0x010E($a2) ## 0000010E -.L80ADE914: -/* 00BC4 80ADE914 A4CA010E */ sh $t2, 0x010E($a2) ## 0000010E -.L80ADE918: -/* 00BC8 80ADE918 8CCD0004 */ lw $t5, 0x0004($a2) ## 00000004 -/* 00BCC 80ADE91C 3C0F80AE */ lui $t7, %hi(func_80ADFE80) ## $t7 = 80AE0000 -/* 00BD0 80ADE920 240B00C8 */ addiu $t3, $zero, 0x00C8 ## $t3 = 000000C8 -/* 00BD4 80ADE924 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 00BD8 80ADE928 25EFFE80 */ addiu $t7, $t7, %lo(func_80ADFE80) ## $t7 = 80ADFE80 -/* 00BDC 80ADE92C 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 00BE0 80ADE930 A4CB0198 */ sh $t3, 0x0198($a2) ## 00000198 -/* 00BE4 80ADE934 A0CC0195 */ sb $t4, 0x0195($a2) ## 00000195 -/* 00BE8 80ADE938 ACCE0004 */ sw $t6, 0x0004($a2) ## 00000004 -/* 00BEC 80ADE93C ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00BF0 80ADE940 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BF4 80ADE944 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BF8 80ADE948 03E00008 */ jr $ra -/* 00BFC 80ADE94C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s deleted file mode 100644 index 99a06efee8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80ADE950 -/* 00C00 80ADE950 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C04 80ADE954 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C08 80ADE958 10A00007 */ beq $a1, $zero, .L80ADE978 -/* 00C0C 80ADE95C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C10 80ADE960 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 00C14 80ADE964 0C03E291 */ jal func_800F8A44 -/* 00C18 80ADE968 240531E8 */ addiu $a1, $zero, 0x31E8 ## $a1 = 000031E8 -/* 00C1C 80ADE96C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C20 80ADE970 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00C24 80ADE974 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -.L80ADE978: -/* 00C28 80ADE978 8FAF0018 */ lw $t7, 0x0018($sp) -/* 00C2C 80ADE97C 3C0E80AE */ lui $t6, %hi(func_80AE009C) ## $t6 = 80AE0000 -/* 00C30 80ADE980 25CE009C */ addiu $t6, $t6, %lo(func_80AE009C) ## $t6 = 80AE009C -/* 00C34 80ADE984 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00C38 80ADE988 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C3C 80ADE98C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C40 80ADE990 03E00008 */ jr $ra -/* 00C44 80ADE994 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s deleted file mode 100644 index 391de04b37..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80ADE998 -/* 00C48 80ADE998 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00C4C 80ADE99C 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 00C50 80ADE9A0 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 -/* 00C54 80ADE9A4 3C0E80AE */ lui $t6, %hi(func_80AE00DC) ## $t6 = 80AE0000 -/* 00C58 80ADE9A8 25CE00DC */ addiu $t6, $t6, %lo(func_80AE00DC) ## $t6 = 80AE00DC -/* 00C5C 80ADE9AC 46062201 */ sub.s $f8, $f4, $f6 -/* 00C60 80ADE9B0 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 -/* 00C64 80ADE9B4 03E00008 */ jr $ra -/* 00C68 80ADE9B8 E488000C */ swc1 $f8, 0x000C($a0) ## 0000000C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s deleted file mode 100644 index 84f35ae3b7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80ADE9BC -/* 00C6C 80ADE9BC 3C0E80AE */ lui $t6, %hi(func_80AE0204) ## $t6 = 80AE0000 -/* 00C70 80ADE9C0 25CE0204 */ addiu $t6, $t6, %lo(func_80AE0204) ## $t6 = 80AE0204 -/* 00C74 80ADE9C4 03E00008 */ jr $ra -/* 00C78 80ADE9C8 AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s deleted file mode 100644 index 36acf4f867..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80ADE9CC -/* 00C7C 80ADE9CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C80 80ADE9D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C84 80ADE9D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C88 80ADE9D8 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 00C8C 80ADE9DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00C90 80ADE9E0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 00C94 80ADE9E4 8C450028 */ lw $a1, 0x0028($v0) ## 00000028 -/* 00C98 80ADE9E8 AFA70018 */ sw $a3, 0x0018($sp) -/* 00C9C 80ADE9EC 0C01DE80 */ jal Math_ApproxF - -/* 00CA0 80ADE9F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00CA4 80ADE9F4 8FA70018 */ lw $a3, 0x0018($sp) -/* 00CA8 80ADE9F8 90E40195 */ lbu $a0, 0x0195($a3) ## 00000195 -/* 00CAC 80ADE9FC 000422C0 */ sll $a0, $a0, 11 -/* 00CB0 80ADEA00 00042400 */ sll $a0, $a0, 16 -/* 00CB4 80ADEA04 0C01DE1C */ jal Math_Sins - ## sins? -/* 00CB8 80ADEA08 00042403 */ sra $a0, $a0, 16 -/* 00CBC 80ADEA0C 3C014020 */ lui $at, 0x4020 ## $at = 40200000 -/* 00CC0 80ADEA10 44813000 */ mtc1 $at, $f6 ## $f6 = 2.50 -/* 00CC4 80ADEA14 8FA70018 */ lw $a3, 0x0018($sp) -/* 00CC8 80ADEA18 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00CCC 80ADEA1C 46003202 */ mul.s $f8, $f6, $f0 -/* 00CD0 80ADEA20 C4E40028 */ lwc1 $f4, 0x0028($a3) ## 00000028 -/* 00CD4 80ADEA24 90E20195 */ lbu $v0, 0x0195($a3) ## 00000195 -/* 00CD8 80ADEA28 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 00CDC 80ADEA2C 46082280 */ add.s $f10, $f4, $f8 -/* 00CE0 80ADEA30 10400003 */ beq $v0, $zero, .L80ADEA40 -/* 00CE4 80ADEA34 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 00CE8 80ADEA38 A0EF0195 */ sb $t7, 0x0195($a3) ## 00000195 -/* 00CEC 80ADEA3C 31E200FF */ andi $v0, $t7, 0x00FF ## $v0 = 000000FF -.L80ADEA40: -/* 00CF0 80ADEA40 54400003 */ bnel $v0, $zero, .L80ADEA50 -/* 00CF4 80ADEA44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00CF8 80ADEA48 A0F80195 */ sb $t8, 0x0195($a3) ## 00000195 -/* 00CFC 80ADEA4C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADEA50: -/* 00D00 80ADEA50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D04 80ADEA54 03E00008 */ jr $ra -/* 00D08 80ADEA58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s deleted file mode 100644 index c34b56d8d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80ADEA5C -/* 00D0C 80ADEA5C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00D10 80ADEA60 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D14 80ADEA64 24850008 */ addiu $a1, $a0, 0x0008 ## $a1 = 00000008 -/* 00D18 80ADEA68 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D1C 80ADEA6C 0C00B6EC */ jal func_8002DBB0 -/* 00D20 80ADEA70 AFA40020 */ sw $a0, 0x0020($sp) -/* 00D24 80ADEA74 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00D28 80ADEA78 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 00D2C 80ADEA7C 8FA70020 */ lw $a3, 0x0020($sp) -/* 00D30 80ADEA80 8FA5001C */ lw $a1, 0x001C($sp) -/* 00D34 80ADEA84 4600203C */ c.lt.s $f4, $f0 -/* 00D38 80ADEA88 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D3C 80ADEA8C 45020006 */ bc1fl .L80ADEAA8 -/* 00D40 80ADEA90 24E40032 */ addiu $a0, $a3, 0x0032 ## $a0 = 00000032 -/* 00D44 80ADEA94 0C00B6B0 */ jal func_8002DAC0 -/* 00D48 80ADEA98 AFA70020 */ sw $a3, 0x0020($sp) -/* 00D4C 80ADEA9C 8FA70020 */ lw $a3, 0x0020($sp) -/* 00D50 80ADEAA0 A4E2019C */ sh $v0, 0x019C($a3) ## 0000019C -/* 00D54 80ADEAA4 24E40032 */ addiu $a0, $a3, 0x0032 ## $a0 = 00000032 -.L80ADEAA8: -/* 00D58 80ADEAA8 84E5019C */ lh $a1, 0x019C($a3) ## 0000019C -/* 00D5C 80ADEAAC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00D60 80ADEAB0 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 00D64 80ADEAB4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00D68 80ADEAB8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00D6C 80ADEABC 03E00008 */ jr $ra -/* 00D70 80ADEAC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s deleted file mode 100644 index 64e78eca4b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_80ADEAC4 -/* 00D74 80ADEAC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D78 80ADEAC8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D7C 80ADEACC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D80 80ADEAD0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00D84 80ADEAD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D88 80ADEAD8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00D8C 80ADEADC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D90 80ADEAE0 AFA40024 */ sw $a0, 0x0024($sp) -/* 00D94 80ADEAE4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00D98 80ADEAE8 0C0295B2 */ jal func_800A56C8 -/* 00D9C 80ADEAEC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00DA0 80ADEAF0 10400005 */ beq $v0, $zero, .L80ADEB08 -/* 00DA4 80ADEAF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DA8 80ADEAF8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 00DAC 80ADEAFC 10400002 */ beq $v0, $zero, .L80ADEB08 -/* 00DB0 80ADEB00 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00DB4 80ADEB04 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -.L80ADEB08: -/* 00DB8 80ADEB08 0C2B7A73 */ jal func_80ADE9CC -/* 00DBC 80ADEB0C 8FA5002C */ lw $a1, 0x002C($sp) -/* 00DC0 80ADEB10 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00DC4 80ADEB14 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00DC8 80ADEB18 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00DCC 80ADEB1C 4606203C */ c.lt.s $f4, $f6 -/* 00DD0 80ADEB20 00000000 */ nop -/* 00DD4 80ADEB24 45020006 */ bc1fl .L80ADEB40 -/* 00DD8 80ADEB28 860F0198 */ lh $t7, 0x0198($s0) ## 00000198 -/* 00DDC 80ADEB2C 0C2B786F */ jal func_80ADE1BC -/* 00DE0 80ADEB30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DE4 80ADEB34 10000007 */ beq $zero, $zero, .L80ADEB54 -/* 00DE8 80ADEB38 9218029D */ lbu $t8, 0x029D($s0) ## 0000029D -/* 00DEC 80ADEB3C 860F0198 */ lh $t7, 0x0198($s0) ## 00000198 -.L80ADEB40: -/* 00DF0 80ADEB40 55E00004 */ bnel $t7, $zero, .L80ADEB54 -/* 00DF4 80ADEB44 9218029D */ lbu $t8, 0x029D($s0) ## 0000029D -/* 00DF8 80ADEB48 0C2B785B */ jal func_80ADE16C -/* 00DFC 80ADEB4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 80ADEB50 9218029D */ lbu $t8, 0x029D($s0) ## 0000029D -.L80ADEB54: -/* 00E04 80ADEB54 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00E08 80ADEB58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E0C 80ADEB5C 57010004 */ bnel $t8, $at, .L80ADEB70 -/* 00E10 80ADEB60 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E14 80ADEB64 0C00BE5D */ jal func_8002F974 -/* 00E18 80ADEB68 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 00E1C 80ADEB6C 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADEB70: -/* 00E20 80ADEB70 8FB00018 */ lw $s0, 0x0018($sp) -/* 00E24 80ADEB74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E28 80ADEB78 03E00008 */ jr $ra -/* 00E2C 80ADEB7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s deleted file mode 100644 index 569ddef504..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s +++ /dev/null @@ -1,85 +0,0 @@ -.late_rodata -glabel D_80AE1C34 - .float 0.1 - -.text -glabel func_80ADEB80 -/* 00E30 80ADEB80 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E34 80ADEB84 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E38 80ADEB88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E3C 80ADEB8C AFBF001C */ sw $ra, 0x001C($sp) -/* 00E40 80ADEB90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E44 80ADEB94 AFA5002C */ sw $a1, 0x002C($sp) -/* 00E48 80ADEB98 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E4C 80ADEB9C AFA40024 */ sw $a0, 0x0024($sp) -/* 00E50 80ADEBA0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00E54 80ADEBA4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 00E58 80ADEBA8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00E5C 80ADEBAC 0C01DE80 */ jal Math_ApproxF - -/* 00E60 80ADEBB0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00E64 80ADEBB4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00E68 80ADEBB8 0C0295B2 */ jal func_800A56C8 -/* 00E6C 80ADEBBC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00E70 80ADEBC0 10400005 */ beq $v0, $zero, .L80ADEBD8 -/* 00E74 80ADEBC4 00000000 */ nop -/* 00E78 80ADEBC8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 00E7C 80ADEBCC 10400002 */ beq $v0, $zero, .L80ADEBD8 -/* 00E80 80ADEBD0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00E84 80ADEBD4 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -.L80ADEBD8: -/* 00E88 80ADEBD8 0C2B7A97 */ jal func_80ADEA5C -/* 00E8C 80ADEBDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E90 80ADEBE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E94 80ADEBE4 0C2B7A73 */ jal func_80ADE9CC -/* 00E98 80ADEBE8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00E9C 80ADEBEC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00EA0 80ADEBF0 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00EA4 80ADEBF4 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00EA8 80ADEBF8 4606203C */ c.lt.s $f4, $f6 -/* 00EAC 80ADEBFC 00000000 */ nop -/* 00EB0 80ADEC00 4502000A */ bc1fl .L80ADEC2C -/* 00EB4 80ADEC04 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -/* 00EB8 80ADEC08 860F0198 */ lh $t7, 0x0198($s0) ## 00000198 -/* 00EBC 80ADEC0C 29E10013 */ slti $at, $t7, 0x0013 -/* 00EC0 80ADEC10 50200006 */ beql $at, $zero, .L80ADEC2C -/* 00EC4 80ADEC14 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -/* 00EC8 80ADEC18 0C2B786F */ jal func_80ADE1BC -/* 00ECC 80ADEC1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ED0 80ADEC20 10000013 */ beq $zero, $zero, .L80ADEC70 -/* 00ED4 80ADEC24 9219029D */ lbu $t9, 0x029D($s0) ## 0000029D -/* 00ED8 80ADEC28 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -.L80ADEC2C: -/* 00EDC 80ADEC2C 57000010 */ bnel $t8, $zero, .L80ADEC70 -/* 00EE0 80ADEC30 9219029D */ lbu $t9, 0x029D($s0) ## 0000029D -/* 00EE4 80ADEC34 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00EE8 80ADEC38 00000000 */ nop -/* 00EEC 80ADEC3C 3C0180AE */ lui $at, %hi(D_80AE1C34) ## $at = 80AE0000 -/* 00EF0 80ADEC40 C4281C34 */ lwc1 $f8, %lo(D_80AE1C34)($at) -/* 00EF4 80ADEC44 4608003C */ c.lt.s $f0, $f8 -/* 00EF8 80ADEC48 00000000 */ nop -/* 00EFC 80ADEC4C 45000005 */ bc1f .L80ADEC64 -/* 00F00 80ADEC50 00000000 */ nop -/* 00F04 80ADEC54 0C2B7945 */ jal func_80ADE514 -/* 00F08 80ADEC58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F0C 80ADEC5C 10000004 */ beq $zero, $zero, .L80ADEC70 -/* 00F10 80ADEC60 9219029D */ lbu $t9, 0x029D($s0) ## 0000029D -.L80ADEC64: -/* 00F14 80ADEC64 0C2B7845 */ jal func_80ADE114 -/* 00F18 80ADEC68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F1C 80ADEC6C 9219029D */ lbu $t9, 0x029D($s0) ## 0000029D -.L80ADEC70: -/* 00F20 80ADEC70 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00F24 80ADEC74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F28 80ADEC78 57210004 */ bnel $t9, $at, .L80ADEC8C -/* 00F2C 80ADEC7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F30 80ADEC80 0C00BE5D */ jal func_8002F974 -/* 00F34 80ADEC84 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 00F38 80ADEC88 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADEC8C: -/* 00F3C 80ADEC8C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00F40 80ADEC90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F44 80ADEC94 03E00008 */ jr $ra -/* 00F48 80ADEC98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s deleted file mode 100644 index 0f4f913fda..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_80ADEC9C -/* 00F4C 80ADEC9C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F50 80ADECA0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F54 80ADECA4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F58 80ADECA8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00F5C 80ADECAC 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00F60 80ADECB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F64 80ADECB4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00F68 80ADECB8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00F6C 80ADECBC AFAF0024 */ sw $t7, 0x0024($sp) -/* 00F70 80ADECC0 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 00F74 80ADECC4 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00F78 80ADECC8 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 00F7C 80ADECCC 10600002 */ beq $v1, $zero, .L80ADECD8 -/* 00F80 80ADECD0 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF -/* 00F84 80ADECD4 A6180198 */ sh $t8, 0x0198($s0) ## 00000198 -.L80ADECD8: -/* 00F88 80ADECD8 8FB90024 */ lw $t9, 0x0024($sp) -/* 00F8C 80ADECDC 8607008A */ lh $a3, 0x008A($s0) ## 0000008A -/* 00F90 80ADECE0 872800B6 */ lh $t0, 0x00B6($t9) ## 000000B6 -/* 00F94 80ADECE4 24E53000 */ addiu $a1, $a3, 0x3000 ## $a1 = 00003000 -/* 00F98 80ADECE8 00052C00 */ sll $a1, $a1, 16 -/* 00F9C 80ADECEC 00E81023 */ subu $v0, $a3, $t0 -/* 00FA0 80ADECF0 00021400 */ sll $v0, $v0, 16 -/* 00FA4 80ADECF4 00021403 */ sra $v0, $v0, 16 -/* 00FA8 80ADECF8 28413001 */ slti $at, $v0, 0x3001 -/* 00FAC 80ADECFC 54200006 */ bnel $at, $zero, .L80ADED18 -/* 00FB0 80ADED00 2841D000 */ slti $at, $v0, 0xD000 -/* 00FB4 80ADED04 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00FB8 80ADED08 00052C03 */ sra $a1, $a1, 16 -/* 00FBC 80ADED0C 10000011 */ beq $zero, $zero, .L80ADED54 -/* 00FC0 80ADED10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FC4 80ADED14 2841D000 */ slti $at, $v0, 0xD000 -.L80ADED18: -/* 00FC8 80ADED18 10200009 */ beq $at, $zero, .L80ADED40 -/* 00FCC 80ADED1C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00FD0 80ADED20 24E5D000 */ addiu $a1, $a3, 0xD000 ## $a1 = FFFFD000 -/* 00FD4 80ADED24 00052C00 */ sll $a1, $a1, 16 -/* 00FD8 80ADED28 00052C03 */ sra $a1, $a1, 16 -/* 00FDC 80ADED2C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00FE0 80ADED30 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00FE4 80ADED34 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 00FE8 80ADED38 10000006 */ beq $zero, $zero, .L80ADED54 -/* 00FEC 80ADED3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADED40: -/* 00FF0 80ADED40 00072C00 */ sll $a1, $a3, 16 -/* 00FF4 80ADED44 00052C03 */ sra $a1, $a1, 16 -/* 00FF8 80ADED48 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 00FFC 80ADED4C 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 01000 80ADED50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADED54: -/* 01004 80ADED54 0C2B7A73 */ jal func_80ADE9CC -/* 01008 80ADED58 8FA5002C */ lw $a1, 0x002C($sp) -/* 0100C 80ADED5C 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 01010 80ADED60 44812000 */ mtc1 $at, $f4 ## $f4 = 280.00 -/* 01014 80ADED64 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 01018 80ADED68 4600203C */ c.lt.s $f4, $f0 -/* 0101C 80ADED6C 00000000 */ nop -/* 01020 80ADED70 45020006 */ bc1fl .L80ADED8C -/* 01024 80ADED74 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -/* 01028 80ADED78 0C2B785B */ jal func_80ADE16C -/* 0102C 80ADED7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01030 80ADED80 10000013 */ beq $zero, $zero, .L80ADEDD0 -/* 01034 80ADED84 920A029D */ lbu $t2, 0x029D($s0) ## 0000029D -/* 01038 80ADED88 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -.L80ADED8C: -/* 0103C 80ADED8C 3C01430C */ lui $at, 0x430C ## $at = 430C0000 -/* 01040 80ADED90 5520000F */ bnel $t1, $zero, .L80ADEDD0 -/* 01044 80ADED94 920A029D */ lbu $t2, 0x029D($s0) ## 0000029D -/* 01048 80ADED98 44813000 */ mtc1 $at, $f6 ## $f6 = 140.00 -/* 0104C 80ADED9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01050 80ADEDA0 24052AAA */ addiu $a1, $zero, 0x2AAA ## $a1 = 00002AAA -/* 01054 80ADEDA4 4606003C */ c.lt.s $f0, $f6 -/* 01058 80ADEDA8 00000000 */ nop -/* 0105C 80ADEDAC 45020008 */ bc1fl .L80ADEDD0 -/* 01060 80ADEDB0 920A029D */ lbu $t2, 0x029D($s0) ## 0000029D -/* 01064 80ADEDB4 0C00B7F2 */ jal func_8002DFC8 -/* 01068 80ADEDB8 8FA6002C */ lw $a2, 0x002C($sp) -/* 0106C 80ADEDBC 54400004 */ bnel $v0, $zero, .L80ADEDD0 -/* 01070 80ADEDC0 920A029D */ lbu $t2, 0x029D($s0) ## 0000029D -/* 01074 80ADEDC4 0C2B7883 */ jal func_80ADE20C -/* 01078 80ADEDC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0107C 80ADEDCC 920A029D */ lbu $t2, 0x029D($s0) ## 0000029D -.L80ADEDD0: -/* 01080 80ADEDD0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01084 80ADEDD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01088 80ADEDD8 55410004 */ bnel $t2, $at, .L80ADEDEC -/* 0108C 80ADEDDC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01090 80ADEDE0 0C00BE5D */ jal func_8002F974 -/* 01094 80ADEDE4 24053071 */ addiu $a1, $zero, 0x3071 ## $a1 = 00003071 -/* 01098 80ADEDE8 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADEDEC: -/* 0109C 80ADEDEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 010A0 80ADEDF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 010A4 80ADEDF4 03E00008 */ jr $ra -/* 010A8 80ADEDF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s deleted file mode 100644 index 6e78c26a6a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80ADEDFC -/* 010AC 80ADEDFC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010B0 80ADEE00 AFB00018 */ sw $s0, 0x0018($sp) -/* 010B4 80ADEE04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010B8 80ADEE08 AFBF001C */ sw $ra, 0x001C($sp) -/* 010BC 80ADEE0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010C0 80ADEE10 AFA5002C */ sw $a1, 0x002C($sp) -/* 010C4 80ADEE14 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 010C8 80ADEE18 AFA40024 */ sw $a0, 0x0024($sp) -/* 010CC 80ADEE1C 8FA40024 */ lw $a0, 0x0024($sp) -/* 010D0 80ADEE20 0C0295B2 */ jal func_800A56C8 -/* 010D4 80ADEE24 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 010D8 80ADEE28 10400007 */ beq $v0, $zero, .L80ADEE48 -/* 010DC 80ADEE2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010E0 80ADEE30 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 010E4 80ADEE34 24053870 */ addiu $a1, $zero, 0x3870 ## $a1 = 00003870 -/* 010E8 80ADEE38 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 010EC 80ADEE3C 10400002 */ beq $v0, $zero, .L80ADEE48 -/* 010F0 80ADEE40 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 010F4 80ADEE44 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 -.L80ADEE48: -/* 010F8 80ADEE48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010FC 80ADEE4C 0C2B7A73 */ jal func_80ADE9CC -/* 01100 80ADEE50 8FA5002C */ lw $a1, 0x002C($sp) -/* 01104 80ADEE54 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 01108 80ADEE58 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 0110C 80ADEE5C 24060E38 */ addiu $a2, $zero, 0x0E38 ## $a2 = 00000E38 -/* 01110 80ADEE60 2841000A */ slti $at, $v0, 0x000A -/* 01114 80ADEE64 54200006 */ bnel $at, $zero, .L80ADEE80 -/* 01118 80ADEE68 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0111C 80ADEE6C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01120 80ADEE70 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01124 80ADEE74 10000011 */ beq $zero, $zero, .L80ADEEBC -/* 01128 80ADEE78 8FBF001C */ lw $ra, 0x001C($sp) -/* 0112C 80ADEE7C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -.L80ADEE80: -/* 01130 80ADEE80 14410007 */ bne $v0, $at, .L80ADEEA0 -/* 01134 80ADEE84 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 01138 80ADEE88 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0113C 80ADEE8C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01140 80ADEE90 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 01144 80ADEE94 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01148 80ADEE98 10000007 */ beq $zero, $zero, .L80ADEEB8 -/* 0114C 80ADEE9C E6060168 */ swc1 $f6, 0x0168($s0) ## 00000168 -.L80ADEEA0: -/* 01150 80ADEEA0 54400006 */ bnel $v0, $zero, .L80ADEEBC -/* 01154 80ADEEA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01158 80ADEEA8 0C2B785B */ jal func_80ADE16C -/* 0115C 80ADEEAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01160 80ADEEB0 240F0017 */ addiu $t7, $zero, 0x0017 ## $t7 = 00000017 -/* 01164 80ADEEB4 A60F0198 */ sh $t7, 0x0198($s0) ## 00000198 -.L80ADEEB8: -/* 01168 80ADEEB8 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADEEBC: -/* 0116C 80ADEEBC 8FB00018 */ lw $s0, 0x0018($sp) -/* 01170 80ADEEC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01174 80ADEEC4 03E00008 */ jr $ra -/* 01178 80ADEEC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s deleted file mode 100644 index 2909a71454..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80ADEECC -/* 0117C 80ADEECC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01180 80ADEED0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01184 80ADEED4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01188 80ADEED8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0118C 80ADEEDC AFA70018 */ sw $a3, 0x0018($sp) -/* 01190 80ADEEE0 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 01194 80ADEEE4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01198 80ADEEE8 0C01DE80 */ jal Math_ApproxF - -/* 0119C 80ADEEEC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 011A0 80ADEEF0 8FA70018 */ lw $a3, 0x0018($sp) -/* 011A4 80ADEEF4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 011A8 80ADEEF8 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 011AC 80ADEEFC 1040000A */ beq $v0, $zero, .L80ADEF28 -/* 011B0 80ADEF00 8FA70018 */ lw $a3, 0x0018($sp) -/* 011B4 80ADEF04 90EE00AF */ lbu $t6, 0x00AF($a3) ## 000000AF -/* 011B8 80ADEF08 11C00005 */ beq $t6, $zero, .L80ADEF20 -/* 011BC 80ADEF0C 00000000 */ nop -/* 011C0 80ADEF10 0C2B78DA */ jal func_80ADE368 -/* 011C4 80ADEF14 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 011C8 80ADEF18 10000004 */ beq $zero, $zero, .L80ADEF2C -/* 011CC 80ADEF1C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADEF20: -/* 011D0 80ADEF20 0C2B7923 */ jal func_80ADE48C -/* 011D4 80ADEF24 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L80ADEF28: -/* 011D8 80ADEF28 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADEF2C: -/* 011DC 80ADEF2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011E0 80ADEF30 03E00008 */ jr $ra -/* 011E4 80ADEF34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s deleted file mode 100644 index 995b329eeb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s +++ /dev/null @@ -1,111 +0,0 @@ -.late_rodata -glabel D_80AE1C38 - .float 0.05 - -.text -glabel func_80ADEF38 -/* 011E8 80ADEF38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011EC 80ADEF3C AFB00018 */ sw $s0, 0x0018($sp) -/* 011F0 80ADEF40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011F4 80ADEF44 AFBF001C */ sw $ra, 0x001C($sp) -/* 011F8 80ADEF48 AFA50024 */ sw $a1, 0x0024($sp) -/* 011FC 80ADEF4C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01200 80ADEF50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01204 80ADEF54 1040000E */ beq $v0, $zero, .L80ADEF90 -/* 01208 80ADEF58 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0120C 80ADEF5C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01210 80ADEF60 A20E029D */ sb $t6, 0x029D($s0) ## 0000029D -/* 01214 80ADEF64 240402BC */ addiu $a0, $zero, 0x02BC ## $a0 = 000002BC -/* 01218 80ADEF68 0C01DF64 */ jal Math_Rand_S16Offset - -/* 0121C 80ADEF6C 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C -/* 01220 80ADEF70 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 01224 80ADEF74 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -/* 01228 80ADEF78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0122C 80ADEF7C 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 01230 80ADEF80 0C2B785B */ jal func_80ADE16C -/* 01234 80ADEF84 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 01238 80ADEF88 10000032 */ beq $zero, $zero, .L80ADF054 -/* 0123C 80ADEF8C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L80ADEF90: -/* 01240 80ADEF90 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 -/* 01244 80ADEF94 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 -/* 01248 80ADEF98 3C0180AE */ lui $at, %hi(D_80AE1C38) ## $at = 80AE0000 -/* 0124C 80ADEF9C 4600103C */ c.lt.s $f2, $f0 -/* 01250 80ADEFA0 00000000 */ nop -/* 01254 80ADEFA4 4502002B */ bc1fl .L80ADF054 -/* 01258 80ADEFA8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0125C 80ADEFAC 46020101 */ sub.s $f4, $f0, $f2 -/* 01260 80ADEFB0 C4261C38 */ lwc1 $f6, %lo(D_80AE1C38)($at) -/* 01264 80ADEFB4 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 01268 80ADEFB8 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 0126C 80ADEFBC 46062202 */ mul.s $f8, $f4, $f6 -/* 01270 80ADEFC0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01274 80ADEFC4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01278 80ADEFC8 460A4402 */ mul.s $f16, $f8, $f10 -/* 0127C 80ADEFCC 4459F800 */ cfc1 $t9, $31 -/* 01280 80ADEFD0 44C8F800 */ ctc1 $t0, $31 -/* 01284 80ADEFD4 00000000 */ nop -/* 01288 80ADEFD8 460084A4 */ cvt.w.s $f18, $f16 -/* 0128C 80ADEFDC 4448F800 */ cfc1 $t0, $31 -/* 01290 80ADEFE0 00000000 */ nop -/* 01294 80ADEFE4 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 01298 80ADEFE8 51000013 */ beql $t0, $zero, .L80ADF038 -/* 0129C 80ADEFEC 44089000 */ mfc1 $t0, $f18 -/* 012A0 80ADEFF0 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 012A4 80ADEFF4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 012A8 80ADEFF8 46128481 */ sub.s $f18, $f16, $f18 -/* 012AC 80ADEFFC 44C8F800 */ ctc1 $t0, $31 -/* 012B0 80ADF000 00000000 */ nop -/* 012B4 80ADF004 460094A4 */ cvt.w.s $f18, $f18 -/* 012B8 80ADF008 4448F800 */ cfc1 $t0, $31 -/* 012BC 80ADF00C 00000000 */ nop -/* 012C0 80ADF010 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 012C4 80ADF014 15000005 */ bne $t0, $zero, .L80ADF02C -/* 012C8 80ADF018 00000000 */ nop -/* 012CC 80ADF01C 44089000 */ mfc1 $t0, $f18 -/* 012D0 80ADF020 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 012D4 80ADF024 10000007 */ beq $zero, $zero, .L80ADF044 -/* 012D8 80ADF028 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80ADF02C: -/* 012DC 80ADF02C 10000005 */ beq $zero, $zero, .L80ADF044 -/* 012E0 80ADF030 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 012E4 80ADF034 44089000 */ mfc1 $t0, $f18 -.L80ADF038: -/* 012E8 80ADF038 00000000 */ nop -/* 012EC 80ADF03C 0500FFFB */ bltz $t0, .L80ADF02C -/* 012F0 80ADF040 00000000 */ nop -.L80ADF044: -/* 012F4 80ADF044 44D9F800 */ ctc1 $t9, $31 -/* 012F8 80ADF048 A208029D */ sb $t0, 0x029D($s0) ## 0000029D -/* 012FC 80ADF04C 00000000 */ nop -/* 01300 80ADF050 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -.L80ADF054: -/* 01304 80ADF054 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01308 80ADF058 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 0130C 80ADF05C 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 01310 80ADF060 4606203C */ c.lt.s $f4, $f6 -/* 01314 80ADF064 00000000 */ nop -/* 01318 80ADF068 4502000F */ bc1fl .L80ADF0A8 -/* 0131C 80ADF06C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01320 80ADF070 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 01324 80ADF074 44815000 */ mtc1 $at, $f10 ## $f10 = 280.00 -/* 01328 80ADF078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0132C 80ADF07C 460A403C */ c.lt.s $f8, $f10 -/* 01330 80ADF080 00000000 */ nop -/* 01334 80ADF084 45020008 */ bc1fl .L80ADF0A8 -/* 01338 80ADF088 8FBF001C */ lw $ra, 0x001C($sp) -/* 0133C 80ADF08C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01340 80ADF090 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 01344 80ADF094 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01348 80ADF098 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 0134C 80ADF09C 00000000 */ nop -/* 01350 80ADF0A0 E6100168 */ swc1 $f16, 0x0168($s0) ## 00000168 -/* 01354 80ADF0A4 8FBF001C */ lw $ra, 0x001C($sp) -.L80ADF0A8: -/* 01358 80ADF0A8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0135C 80ADF0AC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01360 80ADF0B0 03E00008 */ jr $ra -/* 01364 80ADF0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s deleted file mode 100644 index fdf3027f7e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80ADF0B8 -/* 01368 80ADF0B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0136C 80ADF0BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01370 80ADF0C0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01374 80ADF0C4 AFA5001C */ sw $a1, 0x001C($sp) -/* 01378 80ADF0C8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0137C 80ADF0CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01380 80ADF0D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01384 80ADF0D4 1040000F */ beq $v0, $zero, .L80ADF114 -/* 01388 80ADF0D8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0138C 80ADF0DC 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01390 80ADF0E0 A0CE029D */ sb $t6, 0x029D($a2) ## 0000029D -/* 01394 80ADF0E4 AFA60018 */ sw $a2, 0x0018($sp) -/* 01398 80ADF0E8 240402BC */ addiu $a0, $zero, 0x02BC ## $a0 = 000002BC -/* 0139C 80ADF0EC 0C01DF64 */ jal Math_Rand_S16Offset - -/* 013A0 80ADF0F0 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C -/* 013A4 80ADF0F4 8FA40018 */ lw $a0, 0x0018($sp) -/* 013A8 80ADF0F8 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 013AC 80ADF0FC A482019A */ sh $v0, 0x019A($a0) ## 0000019A -/* 013B0 80ADF100 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 013B4 80ADF104 0C2B785B */ jal func_80ADE16C -/* 013B8 80ADF108 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 013BC 80ADF10C 10000010 */ beq $zero, $zero, .L80ADF150 -/* 013C0 80ADF110 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADF114: -/* 013C4 80ADF114 3C0141CC */ lui $at, 0x41CC ## $at = 41CC0000 -/* 013C8 80ADF118 44813000 */ mtc1 $at, $f6 ## $f6 = 25.50 -/* 013CC 80ADF11C C4C40164 */ lwc1 $f4, 0x0164($a2) ## 00000164 -/* 013D0 80ADF120 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 013D4 80ADF124 46062202 */ mul.s $f8, $f4, $f6 -/* 013D8 80ADF128 4600428D */ trunc.w.s $f10, $f8 -/* 013DC 80ADF12C 44025000 */ mfc1 $v0, $f10 -/* 013E0 80ADF130 00000000 */ nop -/* 013E4 80ADF134 28410100 */ slti $at, $v0, 0x0100 -/* 013E8 80ADF138 54200004 */ bnel $at, $zero, .L80ADF14C -/* 013EC 80ADF13C A0C2029D */ sb $v0, 0x029D($a2) ## 0000029D -/* 013F0 80ADF140 10000002 */ beq $zero, $zero, .L80ADF14C -/* 013F4 80ADF144 A0C8029D */ sb $t0, 0x029D($a2) ## 0000029D -/* 013F8 80ADF148 A0C2029D */ sb $v0, 0x029D($a2) ## 0000029D -.L80ADF14C: -/* 013FC 80ADF14C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADF150: -/* 01400 80ADF150 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01404 80ADF154 03E00008 */ jr $ra -/* 01408 80ADF158 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s deleted file mode 100644 index 0d35bfe3c0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s +++ /dev/null @@ -1,283 +0,0 @@ -.late_rodata -glabel D_80AE1C3C - .float 0.001 - -.text -glabel func_80ADF15C -/* 0140C 80ADF15C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 01410 80ADF160 AFBF004C */ sw $ra, 0x004C($sp) -/* 01414 80ADF164 AFB10048 */ sw $s1, 0x0048($sp) -/* 01418 80ADF168 AFB00044 */ sw $s0, 0x0044($sp) -/* 0141C 80ADF16C 848E0198 */ lh $t6, 0x0198($a0) ## 00000198 -/* 01420 80ADF170 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01424 80ADF174 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01428 80ADF178 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 0142C 80ADF17C A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 01430 80ADF180 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 01434 80ADF184 2403001C */ addiu $v1, $zero, 0x001C ## $v1 = 0000001C -/* 01438 80ADF188 28410008 */ slti $at, $v0, 0x0008 -/* 0143C 80ADF18C 102000D9 */ beq $at, $zero, .L80ADF4F4 -/* 01440 80ADF190 28410005 */ slti $at, $v0, 0x0005 -/* 01444 80ADF194 10200037 */ beq $at, $zero, .L80ADF274 -/* 01448 80ADF198 244CFFFB */ addiu $t4, $v0, 0xFFFB ## $t4 = FFFFFFFB -/* 0144C 80ADF19C 00022300 */ sll $a0, $v0, 12 -/* 01450 80ADF1A0 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 01454 80ADF1A4 00042400 */ sll $a0, $a0, 16 -/* 01458 80ADF1A8 0C01DE1C */ jal Math_Sins - ## sins? -/* 0145C 80ADF1AC 00042403 */ sra $a0, $a0, 16 -/* 01460 80ADF1B0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 01464 80ADF1B4 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01468 80ADF1B8 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 0146C 80ADF1BC 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 01470 80ADF1C0 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01474 80ADF1C4 460A0402 */ mul.s $f16, $f0, $f10 -/* 01478 80ADF1C8 46062200 */ add.s $f8, $f4, $f6 -/* 0147C 80ADF1CC 46088480 */ add.s $f18, $f16, $f8 -/* 01480 80ADF1D0 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 01484 80ADF1D4 86040198 */ lh $a0, 0x0198($s0) ## 00000198 -/* 01488 80ADF1D8 00042300 */ sll $a0, $a0, 12 -/* 0148C 80ADF1DC 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 01490 80ADF1E0 00042400 */ sll $a0, $a0, 16 -/* 01494 80ADF1E4 0C01DE0D */ jal Math_Coss - ## coss? -/* 01498 80ADF1E8 00042403 */ sra $a0, $a0, 16 -/* 0149C 80ADF1EC 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 014A0 80ADF1F0 44812000 */ mtc1 $at, $f4 ## $f4 = 23.00 -/* 014A4 80ADF1F4 00000000 */ nop -/* 014A8 80ADF1F8 46040182 */ mul.s $f6, $f0, $f4 -/* 014AC 80ADF1FC E7A60068 */ swc1 $f6, 0x0068($sp) -/* 014B0 80ADF200 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 014B4 80ADF204 0018C880 */ sll $t9, $t8, 2 -/* 014B8 80ADF208 02394021 */ addu $t0, $s1, $t9 -/* 014BC 80ADF20C 0C016A7D */ jal func_8005A9F4 -/* 014C0 80ADF210 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 014C4 80ADF214 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 014C8 80ADF218 00042400 */ sll $a0, $a0, 16 -/* 014CC 80ADF21C 0C01DE1C */ jal Math_Sins - ## sins? -/* 014D0 80ADF220 00042403 */ sra $a0, $a0, 16 -/* 014D4 80ADF224 C7AA0068 */ lwc1 $f10, 0x0068($sp) -/* 014D8 80ADF228 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 014DC 80ADF22C 460A0402 */ mul.s $f16, $f0, $f10 -/* 014E0 80ADF230 46088480 */ add.s $f18, $f16, $f8 -/* 014E4 80ADF234 E7B2006C */ swc1 $f18, 0x006C($sp) -/* 014E8 80ADF238 862907A0 */ lh $t1, 0x07A0($s1) ## 000007A0 -/* 014EC 80ADF23C 00095080 */ sll $t2, $t1, 2 -/* 014F0 80ADF240 022A5821 */ addu $t3, $s1, $t2 -/* 014F4 80ADF244 0C016A7D */ jal func_8005A9F4 -/* 014F8 80ADF248 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 014FC 80ADF24C 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 01500 80ADF250 00042400 */ sll $a0, $a0, 16 -/* 01504 80ADF254 0C01DE0D */ jal Math_Coss - ## coss? -/* 01508 80ADF258 00042403 */ sra $a0, $a0, 16 -/* 0150C 80ADF25C C7A40068 */ lwc1 $f4, 0x0068($sp) -/* 01510 80ADF260 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01514 80ADF264 46040182 */ mul.s $f6, $f0, $f4 -/* 01518 80ADF268 460A3400 */ add.s $f16, $f6, $f10 -/* 0151C 80ADF26C 1000002A */ beq $zero, $zero, .L80ADF318 -/* 01520 80ADF270 E7B00074 */ swc1 $f16, 0x0074($sp) -.L80ADF274: -/* 01524 80ADF274 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 -/* 01528 80ADF278 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0152C 80ADF27C 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01530 80ADF280 46805420 */ cvt.s.w $f16, $f10 -/* 01534 80ADF284 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01538 80ADF288 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0153C 80ADF28C 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 01540 80ADF290 46124100 */ add.s $f4, $f8, $f18 -/* 01544 80ADF294 46103202 */ mul.s $f8, $f6, $f16 -/* 01548 80ADF298 46082480 */ add.s $f18, $f4, $f8 -/* 0154C 80ADF29C E7B20070 */ swc1 $f18, 0x0070($sp) -/* 01550 80ADF2A0 862D07A0 */ lh $t5, 0x07A0($s1) ## 000007A0 -/* 01554 80ADF2A4 000D7080 */ sll $t6, $t5, 2 -/* 01558 80ADF2A8 022E7821 */ addu $t7, $s1, $t6 -/* 0155C 80ADF2AC 0C016A7D */ jal func_8005A9F4 -/* 01560 80ADF2B0 8DE40790 */ lw $a0, 0x0790($t7) ## 00000790 -/* 01564 80ADF2B4 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 01568 80ADF2B8 00042400 */ sll $a0, $a0, 16 -/* 0156C 80ADF2BC 0C01DE1C */ jal Math_Sins - ## sins? -/* 01570 80ADF2C0 00042403 */ sra $a0, $a0, 16 -/* 01574 80ADF2C4 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 01578 80ADF2C8 44815000 */ mtc1 $at, $f10 ## $f10 = 23.00 -/* 0157C 80ADF2CC C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 01580 80ADF2D0 460A0182 */ mul.s $f6, $f0, $f10 -/* 01584 80ADF2D4 46103100 */ add.s $f4, $f6, $f16 -/* 01588 80ADF2D8 E7A4006C */ swc1 $f4, 0x006C($sp) -/* 0158C 80ADF2DC 863807A0 */ lh $t8, 0x07A0($s1) ## 000007A0 -/* 01590 80ADF2E0 0018C880 */ sll $t9, $t8, 2 -/* 01594 80ADF2E4 02394021 */ addu $t0, $s1, $t9 -/* 01598 80ADF2E8 0C016A7D */ jal func_8005A9F4 -/* 0159C 80ADF2EC 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 015A0 80ADF2F0 24444800 */ addiu $a0, $v0, 0x4800 ## $a0 = 00004800 -/* 015A4 80ADF2F4 00042400 */ sll $a0, $a0, 16 -/* 015A8 80ADF2F8 0C01DE0D */ jal Math_Coss - ## coss? -/* 015AC 80ADF2FC 00042403 */ sra $a0, $a0, 16 -/* 015B0 80ADF300 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 -/* 015B4 80ADF304 44814000 */ mtc1 $at, $f8 ## $f8 = 23.00 -/* 015B8 80ADF308 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 015BC 80ADF30C 46080482 */ mul.s $f18, $f0, $f8 -/* 015C0 80ADF310 460A9180 */ add.s $f6, $f18, $f10 -/* 015C4 80ADF314 E7A60074 */ swc1 $f6, 0x0074($sp) -.L80ADF318: -/* 015C8 80ADF318 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -/* 015CC 80ADF31C 3C0680AE */ lui $a2, %hi(D_80AE1B60) ## $a2 = 80AE0000 -/* 015D0 80ADF320 3C0780AE */ lui $a3, %hi(D_80AE1B6C) ## $a3 = 80AE0000 -/* 015D4 80ADF324 00095080 */ sll $t2, $t1, 2 -/* 015D8 80ADF328 01495021 */ addu $t2, $t2, $t1 -/* 015DC 80ADF32C 000A5040 */ sll $t2, $t2, 1 -/* 015E0 80ADF330 254B0050 */ addiu $t3, $t2, 0x0050 ## $t3 = 00000050 -/* 015E4 80ADF334 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 015E8 80ADF338 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 015EC 80ADF33C 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 015F0 80ADF340 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 015F4 80ADF344 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 015F8 80ADF348 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 015FC 80ADF34C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01600 80ADF350 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 01604 80ADF354 AFA80038 */ sw $t0, 0x0038($sp) -/* 01608 80ADF358 AFB90034 */ sw $t9, 0x0034($sp) -/* 0160C 80ADF35C AFB80030 */ sw $t8, 0x0030($sp) -/* 01610 80ADF360 AFAF0024 */ sw $t7, 0x0024($sp) -/* 01614 80ADF364 AFAE0020 */ sw $t6, 0x0020($sp) -/* 01618 80ADF368 AFAD001C */ sw $t5, 0x001C($sp) -/* 0161C 80ADF36C AFAC0018 */ sw $t4, 0x0018($sp) -/* 01620 80ADF370 AFA9003C */ sw $t1, 0x003C($sp) -/* 01624 80ADF374 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01628 80ADF378 24E71B6C */ addiu $a3, $a3, %lo(D_80AE1B6C) ## $a3 = 80AE1B6C -/* 0162C 80ADF37C 24C61B60 */ addiu $a2, $a2, %lo(D_80AE1B60) ## $a2 = 80AE1B60 -/* 01630 80ADF380 AFA0002C */ sw $zero, 0x002C($sp) -/* 01634 80ADF384 AFA00028 */ sw $zero, 0x0028($sp) -/* 01638 80ADF388 AFA00014 */ sw $zero, 0x0014($sp) -/* 0163C 80ADF38C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01640 80ADF390 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 01644 80ADF394 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 01648 80ADF398 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 -/* 0164C 80ADF39C C7A4006C */ lwc1 $f4, 0x006C($sp) -/* 01650 80ADF3A0 C7AA0074 */ lwc1 $f10, 0x0074($sp) -/* 01654 80ADF3A4 46000400 */ add.s $f16, $f0, $f0 -/* 01658 80ADF3A8 3C0680AE */ lui $a2, %hi(D_80AE1B60) ## $a2 = 80AE0000 -/* 0165C 80ADF3AC 3C0780AE */ lui $a3, %hi(D_80AE1B6C) ## $a3 = 80AE0000 -/* 01660 80ADF3B0 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 01664 80ADF3B4 46048201 */ sub.s $f8, $f16, $f4 -/* 01668 80ADF3B8 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 0166C 80ADF3BC 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 01670 80ADF3C0 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01674 80ADF3C4 E7A8006C */ swc1 $f8, 0x006C($sp) -/* 01678 80ADF3C8 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C -/* 0167C 80ADF3CC 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01680 80ADF3D0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01684 80ADF3D4 46021480 */ add.s $f18, $f2, $f2 -/* 01688 80ADF3D8 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 -/* 0168C 80ADF3DC 24E71B6C */ addiu $a3, $a3, %lo(D_80AE1B6C) ## $a3 = 80AE1B6C -/* 01690 80ADF3E0 24C61B60 */ addiu $a2, $a2, %lo(D_80AE1B60) ## $a2 = 80AE1B60 -/* 01694 80ADF3E4 460A9181 */ sub.s $f6, $f18, $f10 -/* 01698 80ADF3E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0169C 80ADF3EC 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 016A0 80ADF3F0 E7A60074 */ swc1 $f6, 0x0074($sp) -/* 016A4 80ADF3F4 860A0198 */ lh $t2, 0x0198($s0) ## 00000198 -/* 016A8 80ADF3F8 AFA90038 */ sw $t1, 0x0038($sp) -/* 016AC 80ADF3FC AFA80034 */ sw $t0, 0x0034($sp) -/* 016B0 80ADF400 000A5880 */ sll $t3, $t2, 2 -/* 016B4 80ADF404 016A5821 */ addu $t3, $t3, $t2 -/* 016B8 80ADF408 000B5840 */ sll $t3, $t3, 1 -/* 016BC 80ADF40C 256C0050 */ addiu $t4, $t3, 0x0050 ## $t4 = 00000050 -/* 016C0 80ADF410 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 016C4 80ADF414 AFAA003C */ sw $t2, 0x003C($sp) -/* 016C8 80ADF418 AFAC0010 */ sw $t4, 0x0010($sp) -/* 016CC 80ADF41C AFB90030 */ sw $t9, 0x0030($sp) -/* 016D0 80ADF420 AFA0002C */ sw $zero, 0x002C($sp) -/* 016D4 80ADF424 AFA00028 */ sw $zero, 0x0028($sp) -/* 016D8 80ADF428 AFB80024 */ sw $t8, 0x0024($sp) -/* 016DC 80ADF42C AFAF0020 */ sw $t7, 0x0020($sp) -/* 016E0 80ADF430 AFAE001C */ sw $t6, 0x001C($sp) -/* 016E4 80ADF434 AFAD0018 */ sw $t5, 0x0018($sp) -/* 016E8 80ADF438 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 016EC 80ADF43C AFA00014 */ sw $zero, 0x0014($sp) -/* 016F0 80ADF440 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 016F4 80ADF444 3C0680AE */ lui $a2, %hi(D_80AE1B60) ## $a2 = 80AE0000 -/* 016F8 80ADF448 3C0780AE */ lui $a3, %hi(D_80AE1B6C) ## $a3 = 80AE0000 -/* 016FC 80ADF44C E7B0006C */ swc1 $f16, 0x006C($sp) -/* 01700 80ADF450 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 01704 80ADF454 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 01708 80ADF458 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 0170C 80ADF45C E7A40074 */ swc1 $f4, 0x0074($sp) -/* 01710 80ADF460 860B0198 */ lh $t3, 0x0198($s0) ## 00000198 -/* 01714 80ADF464 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 01718 80ADF468 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0171C 80ADF46C 000B6080 */ sll $t4, $t3, 2 -/* 01720 80ADF470 018B6021 */ addu $t4, $t4, $t3 -/* 01724 80ADF474 000C6040 */ sll $t4, $t4, 1 -/* 01728 80ADF478 258D0050 */ addiu $t5, $t4, 0x0050 ## $t5 = 00000050 -/* 0172C 80ADF47C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01730 80ADF480 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 01734 80ADF484 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01738 80ADF488 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 0173C 80ADF48C AFAA0038 */ sw $t2, 0x0038($sp) -/* 01740 80ADF490 AFA90034 */ sw $t1, 0x0034($sp) -/* 01744 80ADF494 AFA80030 */ sw $t0, 0x0030($sp) -/* 01748 80ADF498 AFAB003C */ sw $t3, 0x003C($sp) -/* 0174C 80ADF49C AFAD0010 */ sw $t5, 0x0010($sp) -/* 01750 80ADF4A0 AFB90024 */ sw $t9, 0x0024($sp) -/* 01754 80ADF4A4 AFB80020 */ sw $t8, 0x0020($sp) -/* 01758 80ADF4A8 AFA0002C */ sw $zero, 0x002C($sp) -/* 0175C 80ADF4AC AFA00028 */ sw $zero, 0x0028($sp) -/* 01760 80ADF4B0 AFAF001C */ sw $t7, 0x001C($sp) -/* 01764 80ADF4B4 AFAE0018 */ sw $t6, 0x0018($sp) -/* 01768 80ADF4B8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0176C 80ADF4BC 24E71B6C */ addiu $a3, $a3, %lo(D_80AE1B6C) ## $a3 = 80AE1B6C -/* 01770 80ADF4C0 24C61B60 */ addiu $a2, $a2, %lo(D_80AE1B60) ## $a2 = 80AE1B60 -/* 01774 80ADF4C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01778 80ADF4C8 0C00A9AE */ jal EffectSsDeadDb_Spawn -/* 0177C 80ADF4CC 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4 -/* 01780 80ADF4D0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 01784 80ADF4D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01788 80ADF4D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0178C 80ADF4DC 5441001C */ bnel $v0, $at, .L80ADF550 -/* 01790 80ADF4E0 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 01794 80ADF4E4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01798 80ADF4E8 24053878 */ addiu $a1, $zero, 0x3878 ## $a1 = 00003878 -/* 0179C 80ADF4EC 10000017 */ beq $zero, $zero, .L80ADF54C -/* 017A0 80ADF4F0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L80ADF4F4: -/* 017A4 80ADF4F4 14620006 */ bne $v1, $v0, .L80ADF510 -/* 017A8 80ADF4F8 28410013 */ slti $at, $v0, 0x0013 -/* 017AC 80ADF4FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017B0 80ADF500 0C2B7984 */ jal func_80ADE610 -/* 017B4 80ADF504 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 017B8 80ADF508 10000010 */ beq $zero, $zero, .L80ADF54C -/* 017BC 80ADF50C 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -.L80ADF510: -/* 017C0 80ADF510 1420000E */ bne $at, $zero, .L80ADF54C -/* 017C4 80ADF514 00626023 */ subu $t4, $v1, $v0 -/* 017C8 80ADF518 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 -/* 017CC 80ADF51C 3C0180AE */ lui $at, %hi(D_80AE1C3C) ## $at = 80AE0000 -/* 017D0 80ADF520 C42A1C3C */ lwc1 $f10, %lo(D_80AE1C3C)($at) -/* 017D4 80ADF524 468044A0 */ cvt.s.w $f18, $f8 -/* 017D8 80ADF528 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 017DC 80ADF52C 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 017E0 80ADF530 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 017E4 80ADF534 460A9002 */ mul.s $f0, $f18, $f10 -/* 017E8 80ADF538 46103100 */ add.s $f4, $f6, $f16 -/* 017EC 80ADF53C E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 017F0 80ADF540 E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 017F4 80ADF544 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 017F8 80ADF548 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -.L80ADF54C: -/* 017FC 80ADF54C 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -.L80ADF550: -/* 01800 80ADF550 14410003 */ bne $v0, $at, .L80ADF560 -/* 01804 80ADF554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01808 80ADF558 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0180C 80ADF55C 24053877 */ addiu $a1, $zero, 0x3877 ## $a1 = 00003877 -.L80ADF560: -/* 01810 80ADF560 8FBF004C */ lw $ra, 0x004C($sp) -/* 01814 80ADF564 8FB00044 */ lw $s0, 0x0044($sp) -/* 01818 80ADF568 8FB10048 */ lw $s1, 0x0048($sp) -/* 0181C 80ADF56C 03E00008 */ jr $ra -/* 01820 80ADF570 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s deleted file mode 100644 index 2e7e337685..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80ADF574 -/* 01824 80ADF574 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01828 80ADF578 AFB00018 */ sw $s0, 0x0018($sp) -/* 0182C 80ADF57C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01830 80ADF580 AFBF001C */ sw $ra, 0x001C($sp) -/* 01834 80ADF584 AFA50024 */ sw $a1, 0x0024($sp) -/* 01838 80ADF588 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0183C 80ADF58C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01840 80ADF590 10400008 */ beq $v0, $zero, .L80ADF5B4 -/* 01844 80ADF594 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 01848 80ADF598 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 0184C 80ADF59C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01850 80ADF5A0 0C2B785B */ jal func_80ADE16C -/* 01854 80ADF5A4 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -/* 01858 80ADF5A8 240F0017 */ addiu $t7, $zero, 0x0017 ## $t7 = 00000017 -/* 0185C 80ADF5AC 10000007 */ beq $zero, $zero, .L80ADF5CC -/* 01860 80ADF5B0 A60F0198 */ sh $t7, 0x0198($s0) ## 00000198 -.L80ADF5B4: -/* 01864 80ADF5B4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01868 80ADF5B8 0C01DE80 */ jal Math_ApproxF - -/* 0186C 80ADF5BC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01870 80ADF5C0 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 01874 80ADF5C4 27191000 */ addiu $t9, $t8, 0x1000 ## $t9 = 00001000 -/* 01878 80ADF5C8 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -.L80ADF5CC: -/* 0187C 80ADF5CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01880 80ADF5D0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01884 80ADF5D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01888 80ADF5D8 03E00008 */ jr $ra -/* 0188C 80ADF5DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s deleted file mode 100644 index 99dcbea27c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_80ADF5E0 -/* 01890 80ADF5E0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01894 80ADF5E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 01898 80ADF5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0189C 80ADF5EC AFBF001C */ sw $ra, 0x001C($sp) -/* 018A0 80ADF5F0 AFA50024 */ sw $a1, 0x0024($sp) -/* 018A4 80ADF5F4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 018A8 80ADF5F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018AC 80ADF5FC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 018B0 80ADF600 8605019C */ lh $a1, 0x019C($s0) ## 0000019C -/* 018B4 80ADF604 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 018B8 80ADF608 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 018BC 80ADF60C 50400004 */ beql $v0, $zero, .L80ADF620 -/* 018C0 80ADF610 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 018C4 80ADF614 0C2B785B */ jal func_80ADE16C -/* 018C8 80ADF618 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018CC 80ADF61C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -.L80ADF620: -/* 018D0 80ADF620 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 018D4 80ADF624 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 018D8 80ADF628 4606203C */ c.lt.s $f4, $f6 -/* 018DC 80ADF62C 00000000 */ nop -/* 018E0 80ADF630 45020004 */ bc1fl .L80ADF644 -/* 018E4 80ADF634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E8 80ADF638 0C2B786F */ jal func_80ADE1BC -/* 018EC 80ADF63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F0 80ADF640 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADF644: -/* 018F4 80ADF644 0C2B7A73 */ jal func_80ADE9CC -/* 018F8 80ADF648 8FA50024 */ lw $a1, 0x0024($sp) -/* 018FC 80ADF64C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01900 80ADF650 8FB00018 */ lw $s0, 0x0018($sp) -/* 01904 80ADF654 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01908 80ADF658 03E00008 */ jr $ra -/* 0190C 80ADF65C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s deleted file mode 100644 index 5ed22ae8db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s +++ /dev/null @@ -1,79 +0,0 @@ -glabel func_80ADF660 -/* 01910 80ADF660 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01914 80ADF664 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01918 80ADF668 90820194 */ lbu $v0, 0x0194($a0) ## 00000194 -/* 0191C 80ADF66C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01920 80ADF670 10400002 */ beq $v0, $zero, .L80ADF67C -/* 01924 80ADF674 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01928 80ADF678 A08E0194 */ sb $t6, 0x0194($a0) ## 00000194 -.L80ADF67C: -/* 0192C 80ADF67C 84CF0032 */ lh $t7, 0x0032($a2) ## 00000032 -/* 01930 80ADF680 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 01934 80ADF684 25F81000 */ addiu $t8, $t7, 0x1000 ## $t8 = 00001000 -/* 01938 80ADF688 A4D80032 */ sh $t8, 0x0032($a2) ## 00000032 -/* 0193C 80ADF68C 0C2B7A73 */ jal func_80ADE9CC -/* 01940 80ADF690 AFA60018 */ sw $a2, 0x0018($sp) -/* 01944 80ADF694 8FA60018 */ lw $a2, 0x0018($sp) -/* 01948 80ADF698 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0194C 80ADF69C 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 -/* 01950 80ADF6A0 90C20194 */ lbu $v0, 0x0194($a2) ## 00000194 -/* 01954 80ADF6A4 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 01958 80ADF6A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0195C 80ADF6AC 04410004 */ bgez $v0, .L80ADF6C0 -/* 01960 80ADF6B0 468021A0 */ cvt.s.w $f6, $f4 -/* 01964 80ADF6B4 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 01968 80ADF6B8 00000000 */ nop -/* 0196C 80ADF6BC 46083180 */ add.s $f6, $f6, $f8 -.L80ADF6C0: -/* 01970 80ADF6C0 3C0140FF */ lui $at, 0x40FF ## $at = 40FF0000 -/* 01974 80ADF6C4 44815000 */ mtc1 $at, $f10 ## $f10 = 7.97 -/* 01978 80ADF6C8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0197C 80ADF6CC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01980 80ADF6D0 460A3402 */ mul.s $f16, $f6, $f10 -/* 01984 80ADF6D4 4459F800 */ cfc1 $t9, $31 -/* 01988 80ADF6D8 44C8F800 */ ctc1 $t0, $31 -/* 0198C 80ADF6DC 00000000 */ nop -/* 01990 80ADF6E0 460084A4 */ cvt.w.s $f18, $f16 -/* 01994 80ADF6E4 4448F800 */ cfc1 $t0, $31 -/* 01998 80ADF6E8 00000000 */ nop -/* 0199C 80ADF6EC 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 019A0 80ADF6F0 51000013 */ beql $t0, $zero, .L80ADF740 -/* 019A4 80ADF6F4 44089000 */ mfc1 $t0, $f18 -/* 019A8 80ADF6F8 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 019AC 80ADF6FC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 019B0 80ADF700 46128481 */ sub.s $f18, $f16, $f18 -/* 019B4 80ADF704 44C8F800 */ ctc1 $t0, $31 -/* 019B8 80ADF708 00000000 */ nop -/* 019BC 80ADF70C 460094A4 */ cvt.w.s $f18, $f18 -/* 019C0 80ADF710 4448F800 */ cfc1 $t0, $31 -/* 019C4 80ADF714 00000000 */ nop -/* 019C8 80ADF718 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 019CC 80ADF71C 15000005 */ bne $t0, $zero, .L80ADF734 -/* 019D0 80ADF720 00000000 */ nop -/* 019D4 80ADF724 44089000 */ mfc1 $t0, $f18 -/* 019D8 80ADF728 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 019DC 80ADF72C 10000007 */ beq $zero, $zero, .L80ADF74C -/* 019E0 80ADF730 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80ADF734: -/* 019E4 80ADF734 10000005 */ beq $zero, $zero, .L80ADF74C -/* 019E8 80ADF738 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 019EC 80ADF73C 44089000 */ mfc1 $t0, $f18 -.L80ADF740: -/* 019F0 80ADF740 00000000 */ nop -/* 019F4 80ADF744 0500FFFB */ bltz $t0, .L80ADF734 -/* 019F8 80ADF748 00000000 */ nop -.L80ADF74C: -/* 019FC 80ADF74C 44D9F800 */ ctc1 $t9, $31 -/* 01A00 80ADF750 14400006 */ bne $v0, $zero, .L80ADF76C -/* 01A04 80ADF754 A0C8029D */ sb $t0, 0x029D($a2) ## 0000029D -/* 01A08 80ADF758 0C01DF64 */ jal Math_Rand_S16Offset - -/* 01A0C 80ADF75C AFA60018 */ sw $a2, 0x0018($sp) -/* 01A10 80ADF760 8FA40018 */ lw $a0, 0x0018($sp) -/* 01A14 80ADF764 0C2B785B */ jal func_80ADE16C -/* 01A18 80ADF768 A482019A */ sh $v0, 0x019A($a0) ## 0000019A -.L80ADF76C: -/* 01A1C 80ADF76C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A20 80ADF770 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01A24 80ADF774 03E00008 */ jr $ra -/* 01A28 80ADF778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s deleted file mode 100644 index 831354627b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_80ADF77C -/* 01A2C 80ADF77C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01A30 80ADF780 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01A34 80ADF784 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 -/* 01A38 80ADF788 84980032 */ lh $t8, 0x0032($a0) ## 00000032 -/* 01A3C 80ADF78C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01A40 80ADF790 2719F000 */ addiu $t9, $t8, 0xF000 ## $t9 = FFFFF000 -/* 01A44 80ADF794 A08F0194 */ sb $t7, 0x0194($a0) ## 00000194 -/* 01A48 80ADF798 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 01A4C 80ADF79C 0C2B7A73 */ jal func_80ADE9CC -/* 01A50 80ADF7A0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01A54 80ADF7A4 8FA60018 */ lw $a2, 0x0018($sp) -/* 01A58 80ADF7A8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01A5C 80ADF7AC 240402BC */ addiu $a0, $zero, 0x02BC ## $a0 = 000002BC -/* 01A60 80ADF7B0 90C20194 */ lbu $v0, 0x0194($a2) ## 00000194 -/* 01A64 80ADF7B4 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C -/* 01A68 80ADF7B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01A6C 80ADF7BC 04410004 */ bgez $v0, .L80ADF7D0 -/* 01A70 80ADF7C0 468021A0 */ cvt.s.w $f6, $f4 -/* 01A74 80ADF7C4 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 01A78 80ADF7C8 00000000 */ nop -/* 01A7C 80ADF7CC 46083180 */ add.s $f6, $f6, $f8 -.L80ADF7D0: -/* 01A80 80ADF7D0 3C0140FF */ lui $at, 0x40FF ## $at = 40FF0000 -/* 01A84 80ADF7D4 44815000 */ mtc1 $at, $f10 ## $f10 = 7.97 -/* 01A88 80ADF7D8 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01A8C 80ADF7DC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01A90 80ADF7E0 460A3402 */ mul.s $f16, $f6, $f10 -/* 01A94 80ADF7E4 4448F800 */ cfc1 $t0, $31 -/* 01A98 80ADF7E8 44C9F800 */ ctc1 $t1, $31 -/* 01A9C 80ADF7EC 00000000 */ nop -/* 01AA0 80ADF7F0 460084A4 */ cvt.w.s $f18, $f16 -/* 01AA4 80ADF7F4 4449F800 */ cfc1 $t1, $31 -/* 01AA8 80ADF7F8 00000000 */ nop -/* 01AAC 80ADF7FC 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 01AB0 80ADF800 51200013 */ beql $t1, $zero, .L80ADF850 -/* 01AB4 80ADF804 44099000 */ mfc1 $t1, $f18 -/* 01AB8 80ADF808 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 01ABC 80ADF80C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01AC0 80ADF810 46128481 */ sub.s $f18, $f16, $f18 -/* 01AC4 80ADF814 44C9F800 */ ctc1 $t1, $31 -/* 01AC8 80ADF818 00000000 */ nop -/* 01ACC 80ADF81C 460094A4 */ cvt.w.s $f18, $f18 -/* 01AD0 80ADF820 4449F800 */ cfc1 $t1, $31 -/* 01AD4 80ADF824 00000000 */ nop -/* 01AD8 80ADF828 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 01ADC 80ADF82C 15200005 */ bne $t1, $zero, .L80ADF844 -/* 01AE0 80ADF830 00000000 */ nop -/* 01AE4 80ADF834 44099000 */ mfc1 $t1, $f18 -/* 01AE8 80ADF838 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01AEC 80ADF83C 10000007 */ beq $zero, $zero, .L80ADF85C -/* 01AF0 80ADF840 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 -.L80ADF844: -/* 01AF4 80ADF844 10000005 */ beq $zero, $zero, .L80ADF85C -/* 01AF8 80ADF848 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 01AFC 80ADF84C 44099000 */ mfc1 $t1, $f18 -.L80ADF850: -/* 01B00 80ADF850 00000000 */ nop -/* 01B04 80ADF854 0520FFFB */ bltz $t1, .L80ADF844 -/* 01B08 80ADF858 00000000 */ nop -.L80ADF85C: -/* 01B0C 80ADF85C 44C8F800 */ ctc1 $t0, $31 -/* 01B10 80ADF860 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 01B14 80ADF864 14410007 */ bne $v0, $at, .L80ADF884 -/* 01B18 80ADF868 A0C9029D */ sb $t1, 0x029D($a2) ## 0000029D -/* 01B1C 80ADF86C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 01B20 80ADF870 AFA60018 */ sw $a2, 0x0018($sp) -/* 01B24 80ADF874 8FA40018 */ lw $a0, 0x0018($sp) -/* 01B28 80ADF878 A482019A */ sh $v0, 0x019A($a0) ## 0000019A -/* 01B2C 80ADF87C 0C2B785B */ jal func_80ADE16C -/* 01B30 80ADF880 A0800194 */ sb $zero, 0x0194($a0) ## 00000194 -.L80ADF884: -/* 01B34 80ADF884 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01B38 80ADF888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B3C 80ADF88C 03E00008 */ jr $ra -/* 01B40 80ADF890 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s deleted file mode 100644 index 2b6cd2a1b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80ADF894 -/* 01B44 80ADF894 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B48 80ADF898 AFB00018 */ sw $s0, 0x0018($sp) -/* 01B4C 80ADF89C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B50 80ADF8A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01B54 80ADF8A4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01B58 80ADF8A8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01B5C 80ADF8AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B60 80ADF8B0 92040195 */ lbu $a0, 0x0195($s0) ## 00000195 -/* 01B64 80ADF8B4 000422C0 */ sll $a0, $a0, 11 -/* 01B68 80ADF8B8 00042400 */ sll $a0, $a0, 16 -/* 01B6C 80ADF8BC 0C01DE1C */ jal Math_Sins - ## sins? -/* 01B70 80ADF8C0 00042403 */ sra $a0, $a0, 16 -/* 01B74 80ADF8C4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01B78 80ADF8C8 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 01B7C 80ADF8CC 00000000 */ nop -/* 01B80 80ADF8D0 46040182 */ mul.s $f6, $f0, $f4 -/* 01B84 80ADF8D4 E7A60024 */ swc1 $f6, 0x0024($sp) -/* 01B88 80ADF8D8 0C01DE0D */ jal Math_Coss - ## coss? -/* 01B8C 80ADF8DC 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01B90 80ADF8E0 C7AA0024 */ lwc1 $f10, 0x0024($sp) -/* 01B94 80ADF8E4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 01B98 80ADF8E8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01B9C 80ADF8EC 46005402 */ mul.s $f16, $f10, $f0 -/* 01BA0 80ADF8F0 46104481 */ sub.s $f18, $f8, $f16 -/* 01BA4 80ADF8F4 0C01DE1C */ jal Math_Sins - ## sins? -/* 01BA8 80ADF8F8 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 01BAC 80ADF8FC C7A60024 */ lwc1 $f6, 0x0024($sp) -/* 01BB0 80ADF900 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 01BB4 80ADF904 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 01BB8 80ADF908 46003282 */ mul.s $f10, $f6, $f0 -/* 01BBC 80ADF90C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01BC0 80ADF910 00A12821 */ addu $a1, $a1, $at -/* 01BC4 80ADF914 00052C00 */ sll $a1, $a1, 16 -/* 01BC8 80ADF918 00052C03 */ sra $a1, $a1, 16 -/* 01BCC 80ADF91C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01BD0 80ADF920 2406071C */ addiu $a2, $zero, 0x071C ## $a2 = 0000071C -/* 01BD4 80ADF924 460A2200 */ add.s $f8, $f4, $f10 -/* 01BD8 80ADF928 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 01BDC 80ADF92C E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 01BE0 80ADF930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BE4 80ADF934 0C2B7A73 */ jal func_80ADE9CC -/* 01BE8 80ADF938 8FA5002C */ lw $a1, 0x002C($sp) -/* 01BEC 80ADF93C 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 -/* 01BF0 80ADF940 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 01BF4 80ADF944 51C00008 */ beql $t6, $zero, .L80ADF968 -/* 01BF8 80ADF948 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 01BFC 80ADF94C 44818000 */ mtc1 $at, $f16 ## $f16 = 250.00 -/* 01C00 80ADF950 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 01C04 80ADF954 4612803C */ c.lt.s $f16, $f18 -/* 01C08 80ADF958 00000000 */ nop -/* 01C0C 80ADF95C 45020006 */ bc1fl .L80ADF978 -/* 01C10 80ADF960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C14 80ADF964 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -.L80ADF968: -/* 01C18 80ADF968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C1C 80ADF96C 0C2B785B */ jal func_80ADE16C -/* 01C20 80ADF970 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 01C24 80ADF974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80ADF978: -/* 01C28 80ADF978 0C00BE5D */ jal func_8002F974 -/* 01C2C 80ADF97C 24053072 */ addiu $a1, $zero, 0x3072 ## $a1 = 00003072 -/* 01C30 80ADF980 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C34 80ADF984 8FB00018 */ lw $s0, 0x0018($sp) -/* 01C38 80ADF988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C3C 80ADF98C 03E00008 */ jr $ra -/* 01C40 80ADF990 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s deleted file mode 100644 index a903b4d5d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_80ADF994 -/* 01C44 80ADF994 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01C48 80ADF998 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01C4C 80ADF99C AFB00030 */ sw $s0, 0x0030($sp) -/* 01C50 80ADF9A0 AFA5003C */ sw $a1, 0x003C($sp) -/* 01C54 80ADF9A4 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 01C58 80ADF9A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C5C 80ADF9AC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 01C60 80ADF9B0 10400002 */ beq $v0, $zero, .L80ADF9BC -/* 01C64 80ADF9B4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01C68 80ADF9B8 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -.L80ADF9BC: -/* 01C6C 80ADF9BC 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 01C70 80ADF9C0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01C74 80ADF9C4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01C78 80ADF9C8 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 01C7C 80ADF9CC 13000018 */ beq $t8, $zero, .L80ADFA30 -/* 01C80 80ADF9D0 240A000F */ addiu $t2, $zero, 0x000F ## $t2 = 0000000F -/* 01C84 80ADF9D4 92190197 */ lbu $t9, 0x0197($s0) ## 00000197 -/* 01C88 80ADF9D8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01C8C 80ADF9DC 24020009 */ addiu $v0, $zero, 0x0009 ## $v0 = 00000009 -/* 01C90 80ADF9E0 17210003 */ bne $t9, $at, .L80ADF9F0 -/* 01C94 80ADF9E4 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A -/* 01C98 80ADF9E8 10000001 */ beq $zero, $zero, .L80ADF9F0 -/* 01C9C 80ADF9EC 2402006E */ addiu $v0, $zero, 0x006E ## $v0 = 0000006E -.L80ADF9F0: -/* 01CA0 80ADF9F0 AFA80010 */ sw $t0, 0x0010($sp) -/* 01CA4 80ADF9F4 AFA90014 */ sw $t1, 0x0014($sp) -/* 01CA8 80ADF9F8 AFAA0018 */ sw $t2, 0x0018($sp) -/* 01CAC 80ADF9FC AFA2001C */ sw $v0, 0x001C($sp) -/* 01CB0 80ADFA00 AFAB0020 */ sw $t3, 0x0020($sp) -/* 01CB4 80ADFA04 8E0C02A4 */ lw $t4, 0x02A4($s0) ## 000002A4 -/* 01CB8 80ADFA08 8FA4003C */ lw $a0, 0x003C($sp) -/* 01CBC 80ADFA0C 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 01CC0 80ADFA10 8D8D001C */ lw $t5, 0x001C($t4) ## 0000001C -/* 01CC4 80ADFA14 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01CC8 80ADFA18 0C00A5E9 */ jal EffectSsHahen_SpawnBurst -/* 01CCC 80ADFA1C AFAD0024 */ sw $t5, 0x0024($sp) -/* 01CD0 80ADFA20 0C2B79B5 */ jal func_80ADE6D4 -/* 01CD4 80ADFA24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CD8 80ADFA28 10000008 */ beq $zero, $zero, .L80ADFA4C -/* 01CDC 80ADFA2C 00000000 */ nop -.L80ADFA30: -/* 01CE0 80ADFA30 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 -/* 01CE4 80ADFA34 15C00005 */ bne $t6, $zero, .L80ADFA4C -/* 01CE8 80ADFA38 00000000 */ nop -/* 01CEC 80ADFA3C 0C00B55C */ jal Actor_Kill - -/* 01CF0 80ADFA40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CF4 80ADFA44 1000000E */ beq $zero, $zero, .L80ADFA80 -/* 01CF8 80ADFA48 8FBF0034 */ lw $ra, 0x0034($sp) -.L80ADFA4C: -/* 01CFC 80ADFA4C 0C00B638 */ jal Actor_MoveForward - -/* 01D00 80ADFA50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D04 80ADFA54 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01D08 80ADFA58 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 01D0C 80ADFA5C 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 01D10 80ADFA60 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01D14 80ADFA64 44060000 */ mfc1 $a2, $f0 -/* 01D18 80ADFA68 44070000 */ mfc1 $a3, $f0 -/* 01D1C 80ADFA6C 8FA4003C */ lw $a0, 0x003C($sp) -/* 01D20 80ADFA70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D24 80ADFA74 0C00B92D */ jal func_8002E4B4 -/* 01D28 80ADFA78 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01D2C 80ADFA7C 8FBF0034 */ lw $ra, 0x0034($sp) -.L80ADFA80: -/* 01D30 80ADFA80 8FB00030 */ lw $s0, 0x0030($sp) -/* 01D34 80ADFA84 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01D38 80ADFA88 03E00008 */ jr $ra -/* 01D3C 80ADFA8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s deleted file mode 100644 index 1fb9024545..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s +++ /dev/null @@ -1,268 +0,0 @@ -.late_rodata -glabel D_80AE1C40 - .word 0x3BE56042 -glabel D_80AE1C44 - .word 0x3B808081 -glabel D_80AE1C48 - .word 0x3BB78035 -glabel D_80AE1C4C - .word 0x3AB78035 -glabel D_80AE1C50 - .word 0x37E64689 -glabel D_80AE1C54 - .word 0x3D70F0F1 -glabel D_80AE1C58 - .word 0x3F48C8C9 - -.text -glabel func_80ADFA90 -/* 01D40 80ADFA90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D44 80ADFA94 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D48 80ADFA98 AFB00028 */ sw $s0, 0x0028($sp) -/* 01D4C 80ADFA9C 908E029D */ lbu $t6, 0x029D($a0) ## 0000029D -/* 01D50 80ADFAA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D54 80ADFAA4 01C51021 */ addu $v0, $t6, $a1 -/* 01D58 80ADFAA8 04410003 */ bgez $v0, .L80ADFAB8 -/* 01D5C 80ADFAAC 28410100 */ slti $at, $v0, 0x0100 -/* 01D60 80ADFAB0 10000006 */ beq $zero, $zero, .L80ADFACC -/* 01D64 80ADFAB4 A080029D */ sb $zero, 0x029D($a0) ## 0000029D -.L80ADFAB8: -/* 01D68 80ADFAB8 14200003 */ bne $at, $zero, .L80ADFAC8 -/* 01D6C 80ADFABC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 01D70 80ADFAC0 10000001 */ beq $zero, $zero, .L80ADFAC8 -/* 01D74 80ADFAC4 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -.L80ADFAC8: -/* 01D78 80ADFAC8 A203029D */ sb $v1, 0x029D($s0) ## 0000029D -.L80ADFACC: -/* 01D7C 80ADFACC 04A3001D */ bgezl $a1, .L80ADFB44 -/* 01D80 80ADFAD0 9218029D */ lbu $t8, 0x029D($s0) ## 0000029D -/* 01D84 80ADFAD4 920F029D */ lbu $t7, 0x029D($s0) ## 0000029D -/* 01D88 80ADFAD8 3C0180AE */ lui $at, %hi(D_80AE1C40) ## $at = 80AE0000 -/* 01D8C 80ADFADC C42E1C40 */ lwc1 $f14, %lo(D_80AE1C40)($at) -/* 01D90 80ADFAE0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01D94 80ADFAE4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01D98 80ADFAE8 05E10004 */ bgez $t7, .L80ADFAFC -/* 01D9C 80ADFAEC 46802320 */ cvt.s.w $f12, $f4 -/* 01DA0 80ADFAF0 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01DA4 80ADFAF4 00000000 */ nop -/* 01DA8 80ADFAF8 46066300 */ add.s $f12, $f12, $f6 -.L80ADFAFC: -/* 01DAC 80ADFAFC 3C0180AE */ lui $at, %hi(D_80AE1C44) ## $at = 80AE0000 -/* 01DB0 80ADFB00 C4281C44 */ lwc1 $f8, %lo(D_80AE1C44)($at) -/* 01DB4 80ADFB04 3C0180AE */ lui $at, %hi(D_80AE1C48) ## $at = 80AE0000 -/* 01DB8 80ADFB08 C42A1C48 */ lwc1 $f10, %lo(D_80AE1C48)($at) -/* 01DBC 80ADFB0C 46086082 */ mul.s $f2, $f12, $f8 -/* 01DC0 80ADFB10 3C0180AE */ lui $at, %hi(D_80AE1C4C) ## $at = 80AE0000 -/* 01DC4 80ADFB14 C4321C4C */ lwc1 $f18, %lo(D_80AE1C4C)($at) -/* 01DC8 80ADFB18 46025402 */ mul.s $f16, $f10, $f2 -/* 01DCC 80ADFB1C 00000000 */ nop -/* 01DD0 80ADFB20 46027102 */ mul.s $f4, $f14, $f2 -/* 01DD4 80ADFB24 46128000 */ add.s $f0, $f16, $f18 -/* 01DD8 80ADFB28 46047181 */ sub.s $f6, $f14, $f4 -/* 01DDC 80ADFB2C E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 01DE0 80ADFB30 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 01DE4 80ADFB34 460E3200 */ add.s $f8, $f6, $f14 -/* 01DE8 80ADFB38 10000017 */ beq $zero, $zero, .L80ADFB98 -/* 01DEC 80ADFB3C E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 01DF0 80ADFB40 9218029D */ lbu $t8, 0x029D($s0) ## 0000029D -.L80ADFB44: -/* 01DF4 80ADFB44 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01DF8 80ADFB48 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 01DFC 80ADFB4C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 -/* 01E00 80ADFB50 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01E04 80ADFB54 07010004 */ bgez $t8, .L80ADFB68 -/* 01E08 80ADFB58 46805320 */ cvt.s.w $f12, $f10 -/* 01E0C 80ADFB5C 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 01E10 80ADFB60 00000000 */ nop -/* 01E14 80ADFB64 46106300 */ add.s $f12, $f12, $f16 -.L80ADFB68: -/* 01E18 80ADFB68 3C0180AE */ lui $at, %hi(D_80AE1C50) ## $at = 80AE0000 -/* 01E1C 80ADFB6C C4321C50 */ lwc1 $f18, %lo(D_80AE1C50)($at) -/* 01E20 80ADFB70 3C0180AE */ lui $at, %hi(D_80AE1C54) ## $at = 80AE0000 -/* 01E24 80ADFB74 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 01E28 80ADFB78 46126002 */ mul.s $f0, $f12, $f18 -/* 01E2C 80ADFB7C E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 01E30 80ADFB80 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 01E34 80ADFB84 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 01E38 80ADFB88 C4261C54 */ lwc1 $f6, %lo(D_80AE1C54)($at) -/* 01E3C 80ADFB8C 460C3202 */ mul.s $f8, $f6, $f12 -/* 01E40 80ADFB90 46082280 */ add.s $f10, $f4, $f8 -/* 01E44 80ADFB94 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -.L80ADFB98: -/* 01E48 80ADFB98 8E0202A4 */ lw $v0, 0x02A4($s0) ## 000002A4 -/* 01E4C 80ADFB9C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01E50 80ADFBA0 90590003 */ lbu $t9, 0x0003($v0) ## 00000003 -/* 01E54 80ADFBA4 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 01E58 80ADFBA8 07210004 */ bgez $t9, .L80ADFBBC -/* 01E5C 80ADFBAC 468084A0 */ cvt.s.w $f18, $f16 -/* 01E60 80ADFBB0 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01E64 80ADFBB4 00000000 */ nop -/* 01E68 80ADFBB8 46069480 */ add.s $f18, $f18, $f6 -.L80ADFBBC: -/* 01E6C 80ADFBBC 46029102 */ mul.s $f4, $f18, $f2 -/* 01E70 80ADFBC0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01E74 80ADFBC4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01E78 80ADFBC8 4448F800 */ cfc1 $t0, $31 -/* 01E7C 80ADFBCC 44C9F800 */ ctc1 $t1, $31 -/* 01E80 80ADFBD0 00000000 */ nop -/* 01E84 80ADFBD4 46002224 */ cvt.w.s $f8, $f4 -/* 01E88 80ADFBD8 4449F800 */ cfc1 $t1, $31 -/* 01E8C 80ADFBDC 00000000 */ nop -/* 01E90 80ADFBE0 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 01E94 80ADFBE4 51200013 */ beql $t1, $zero, .L80ADFC34 -/* 01E98 80ADFBE8 44094000 */ mfc1 $t1, $f8 -/* 01E9C 80ADFBEC 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 -/* 01EA0 80ADFBF0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01EA4 80ADFBF4 46082201 */ sub.s $f8, $f4, $f8 -/* 01EA8 80ADFBF8 44C9F800 */ ctc1 $t1, $31 -/* 01EAC 80ADFBFC 00000000 */ nop -/* 01EB0 80ADFC00 46004224 */ cvt.w.s $f8, $f8 -/* 01EB4 80ADFC04 4449F800 */ cfc1 $t1, $31 -/* 01EB8 80ADFC08 00000000 */ nop -/* 01EBC 80ADFC0C 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 01EC0 80ADFC10 15200005 */ bne $t1, $zero, .L80ADFC28 -/* 01EC4 80ADFC14 00000000 */ nop -/* 01EC8 80ADFC18 44094000 */ mfc1 $t1, $f8 -/* 01ECC 80ADFC1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01ED0 80ADFC20 10000007 */ beq $zero, $zero, .L80ADFC40 -/* 01ED4 80ADFC24 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 -.L80ADFC28: -/* 01ED8 80ADFC28 10000005 */ beq $zero, $zero, .L80ADFC40 -/* 01EDC 80ADFC2C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 01EE0 80ADFC30 44094000 */ mfc1 $t1, $f8 -.L80ADFC34: -/* 01EE4 80ADFC34 00000000 */ nop -/* 01EE8 80ADFC38 0520FFFB */ bltz $t1, .L80ADFC28 -/* 01EEC 80ADFC3C 00000000 */ nop -.L80ADFC40: -/* 01EF0 80ADFC40 A209029A */ sb $t1, 0x029A($s0) ## 0000029A -/* 01EF4 80ADFC44 904A0004 */ lbu $t2, 0x0004($v0) ## 00000004 -/* 01EF8 80ADFC48 44C8F800 */ ctc1 $t0, $31 -/* 01EFC 80ADFC4C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01F00 80ADFC50 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 01F04 80ADFC54 05410004 */ bgez $t2, .L80ADFC68 -/* 01F08 80ADFC58 46805420 */ cvt.s.w $f16, $f10 -/* 01F0C 80ADFC5C 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01F10 80ADFC60 00000000 */ nop -/* 01F14 80ADFC64 46068400 */ add.s $f16, $f16, $f6 -.L80ADFC68: -/* 01F18 80ADFC68 46028482 */ mul.s $f18, $f16, $f2 -/* 01F1C 80ADFC6C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01F20 80ADFC70 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01F24 80ADFC74 444BF800 */ cfc1 $t3, $31 -/* 01F28 80ADFC78 44CCF800 */ ctc1 $t4, $31 -/* 01F2C 80ADFC7C 00000000 */ nop -/* 01F30 80ADFC80 46009124 */ cvt.w.s $f4, $f18 -/* 01F34 80ADFC84 444CF800 */ cfc1 $t4, $31 -/* 01F38 80ADFC88 00000000 */ nop -/* 01F3C 80ADFC8C 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01F40 80ADFC90 51800013 */ beql $t4, $zero, .L80ADFCE0 -/* 01F44 80ADFC94 440C2000 */ mfc1 $t4, $f4 -/* 01F48 80ADFC98 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 01F4C 80ADFC9C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01F50 80ADFCA0 46049101 */ sub.s $f4, $f18, $f4 -/* 01F54 80ADFCA4 44CCF800 */ ctc1 $t4, $31 -/* 01F58 80ADFCA8 00000000 */ nop -/* 01F5C 80ADFCAC 46002124 */ cvt.w.s $f4, $f4 -/* 01F60 80ADFCB0 444CF800 */ cfc1 $t4, $31 -/* 01F64 80ADFCB4 00000000 */ nop -/* 01F68 80ADFCB8 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01F6C 80ADFCBC 15800005 */ bne $t4, $zero, .L80ADFCD4 -/* 01F70 80ADFCC0 00000000 */ nop -/* 01F74 80ADFCC4 440C2000 */ mfc1 $t4, $f4 -/* 01F78 80ADFCC8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01F7C 80ADFCCC 10000007 */ beq $zero, $zero, .L80ADFCEC -/* 01F80 80ADFCD0 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 -.L80ADFCD4: -/* 01F84 80ADFCD4 10000005 */ beq $zero, $zero, .L80ADFCEC -/* 01F88 80ADFCD8 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01F8C 80ADFCDC 440C2000 */ mfc1 $t4, $f4 -.L80ADFCE0: -/* 01F90 80ADFCE0 00000000 */ nop -/* 01F94 80ADFCE4 0580FFFB */ bltz $t4, .L80ADFCD4 -/* 01F98 80ADFCE8 00000000 */ nop -.L80ADFCEC: -/* 01F9C 80ADFCEC A20C029B */ sb $t4, 0x029B($s0) ## 0000029B -/* 01FA0 80ADFCF0 904D0005 */ lbu $t5, 0x0005($v0) ## 00000005 -/* 01FA4 80ADFCF4 44CBF800 */ ctc1 $t3, $31 -/* 01FA8 80ADFCF8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 01FAC 80ADFCFC 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 -/* 01FB0 80ADFD00 05A10004 */ bgez $t5, .L80ADFD14 -/* 01FB4 80ADFD04 468042A0 */ cvt.s.w $f10, $f8 -/* 01FB8 80ADFD08 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 01FBC 80ADFD0C 00000000 */ nop -/* 01FC0 80ADFD10 46065280 */ add.s $f10, $f10, $f6 -.L80ADFD14: -/* 01FC4 80ADFD14 46025402 */ mul.s $f16, $f10, $f2 -/* 01FC8 80ADFD18 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01FCC 80ADFD1C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 01FD0 80ADFD20 444EF800 */ cfc1 $t6, $31 -/* 01FD4 80ADFD24 44CFF800 */ ctc1 $t7, $31 -/* 01FD8 80ADFD28 00000000 */ nop -/* 01FDC 80ADFD2C 460084A4 */ cvt.w.s $f18, $f16 -/* 01FE0 80ADFD30 444FF800 */ cfc1 $t7, $31 -/* 01FE4 80ADFD34 00000000 */ nop -/* 01FE8 80ADFD38 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 01FEC 80ADFD3C 51E00013 */ beql $t7, $zero, .L80ADFD8C -/* 01FF0 80ADFD40 440F9000 */ mfc1 $t7, $f18 -/* 01FF4 80ADFD44 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 -/* 01FF8 80ADFD48 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01FFC 80ADFD4C 46128481 */ sub.s $f18, $f16, $f18 -/* 02000 80ADFD50 44CFF800 */ ctc1 $t7, $31 -/* 02004 80ADFD54 00000000 */ nop -/* 02008 80ADFD58 460094A4 */ cvt.w.s $f18, $f18 -/* 0200C 80ADFD5C 444FF800 */ cfc1 $t7, $31 -/* 02010 80ADFD60 00000000 */ nop -/* 02014 80ADFD64 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 02018 80ADFD68 15E00005 */ bne $t7, $zero, .L80ADFD80 -/* 0201C 80ADFD6C 00000000 */ nop -/* 02020 80ADFD70 440F9000 */ mfc1 $t7, $f18 -/* 02024 80ADFD74 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02028 80ADFD78 10000007 */ beq $zero, $zero, .L80ADFD98 -/* 0202C 80ADFD7C 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 -.L80ADFD80: -/* 02030 80ADFD80 10000005 */ beq $zero, $zero, .L80ADFD98 -/* 02034 80ADFD84 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02038 80ADFD88 440F9000 */ mfc1 $t7, $f18 -.L80ADFD8C: -/* 0203C 80ADFD8C 00000000 */ nop -/* 02040 80ADFD90 05E0FFFB */ bltz $t7, .L80ADFD80 -/* 02044 80ADFD94 00000000 */ nop -.L80ADFD98: -/* 02048 80ADFD98 44CEF800 */ ctc1 $t6, $31 -/* 0204C 80ADFD9C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02050 80ADFDA0 A20F029C */ sb $t7, 0x029C($s0) ## 0000029C -/* 02054 80ADFDA4 3C0180AE */ lui $at, %hi(D_80AE1C58) ## $at = 80AE0000 -/* 02058 80ADFDA8 4600220D */ trunc.w.s $f8, $f4 -/* 0205C 80ADFDAC C4241C58 */ lwc1 $f4, %lo(D_80AE1C58)($at) -/* 02060 80ADFDB0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 02064 80ADFDB4 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 02068 80ADFDB8 44054000 */ mfc1 $a1, $f8 -/* 0206C 80ADFDBC 46046202 */ mul.s $f8, $f12, $f4 -/* 02070 80ADFDC0 90490003 */ lbu $t1, 0x0003($v0) ## 00000003 -/* 02074 80ADFDC4 00052C00 */ sll $a1, $a1, 16 -/* 02078 80ADFDC8 00052C03 */ sra $a1, $a1, 16 -/* 0207C 80ADFDCC AFA90010 */ sw $t1, 0x0010($sp) -/* 02080 80ADFDD0 904A0004 */ lbu $t2, 0x0004($v0) ## 00000004 -/* 02084 80ADFDD4 4600328D */ trunc.w.s $f10, $f6 -/* 02088 80ADFDD8 260402AC */ addiu $a0, $s0, 0x02AC ## $a0 = 000002AC -/* 0208C 80ADFDDC AFAA0014 */ sw $t2, 0x0014($sp) -/* 02090 80ADFDE0 4600848D */ trunc.w.s $f18, $f16 -/* 02094 80ADFDE4 44065000 */ mfc1 $a2, $f10 -/* 02098 80ADFDE8 904B0005 */ lbu $t3, 0x0005($v0) ## 00000005 -/* 0209C 80ADFDEC 4600418D */ trunc.w.s $f6, $f8 -/* 020A0 80ADFDF0 44079000 */ mfc1 $a3, $f18 -/* 020A4 80ADFDF4 00063400 */ sll $a2, $a2, 16 -/* 020A8 80ADFDF8 00063403 */ sra $a2, $a2, 16 -/* 020AC 80ADFDFC 440D3000 */ mfc1 $t5, $f6 -/* 020B0 80ADFE00 00073C00 */ sll $a3, $a3, 16 -/* 020B4 80ADFE04 00073C03 */ sra $a3, $a3, 16 -/* 020B8 80ADFE08 AFAB0018 */ sw $t3, 0x0018($sp) -/* 020BC 80ADFE0C 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 020C0 80ADFE10 AFAD001C */ sw $t5, 0x001C($sp) -/* 020C4 80ADFE14 8FBF002C */ lw $ra, 0x002C($sp) -/* 020C8 80ADFE18 8FB00028 */ lw $s0, 0x0028($sp) -/* 020CC 80ADFE1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 020D0 80ADFE20 03E00008 */ jr $ra -/* 020D4 80ADFE24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s deleted file mode 100644 index dda3f59921..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80ADFE28 -/* 020D8 80ADFE28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 020DC 80ADFE2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 020E0 80ADFE30 AFA5001C */ sw $a1, 0x001C($sp) -/* 020E4 80ADFE34 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 020E8 80ADFE38 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 020EC 80ADFE3C C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 020F0 80ADFE40 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 020F4 80ADFE44 46062200 */ add.s $f8, $f4, $f6 -/* 020F8 80ADFE48 E488000C */ swc1 $f8, 0x000C($a0) ## 0000000C -/* 020FC 80ADFE4C 0C2B7EA4 */ jal func_80ADFA90 -/* 02100 80ADFE50 AFA40018 */ sw $a0, 0x0018($sp) -/* 02104 80ADFE54 8FA40018 */ lw $a0, 0x0018($sp) -/* 02108 80ADFE58 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0210C 80ADFE5C 908E029D */ lbu $t6, 0x029D($a0) ## 0000029D -/* 02110 80ADFE60 55C10004 */ bnel $t6, $at, .L80ADFE74 -/* 02114 80ADFE64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02118 80ADFE68 0C2B79F0 */ jal func_80ADE7C0 -/* 0211C 80ADFE6C 8FA5001C */ lw $a1, 0x001C($sp) -/* 02120 80ADFE70 8FBF0014 */ lw $ra, 0x0014($sp) -.L80ADFE74: -/* 02124 80ADFE74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02128 80ADFE78 03E00008 */ jr $ra -/* 0212C 80ADFE7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s deleted file mode 100644 index 7be9d587f2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s +++ /dev/null @@ -1,156 +0,0 @@ -.late_rodata -glabel D_80AE1C5C - .word 0x3F48C8C9 - -.text -glabel func_80ADFE80 -/* 02130 80ADFE80 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02134 80ADFE84 AFBF002C */ sw $ra, 0x002C($sp) -/* 02138 80ADFE88 AFB00028 */ sw $s0, 0x0028($sp) -/* 0213C 80ADFE8C 84820198 */ lh $v0, 0x0198($a0) ## 00000198 -/* 02140 80ADFE90 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 02144 80ADFE94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02148 80ADFE98 10400003 */ beq $v0, $zero, .L80ADFEA8 -/* 0214C 80ADFE9C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 02150 80ADFEA0 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02154 80ADFEA4 A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 -.L80ADFEA8: -/* 02158 80ADFEA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0215C 80ADFEAC 0C00BC65 */ jal func_8002F194 -/* 02160 80ADFEB0 AFA70034 */ sw $a3, 0x0034($sp) -/* 02164 80ADFEB4 1040000D */ beq $v0, $zero, .L80ADFEEC -/* 02168 80ADFEB8 8FA70034 */ lw $a3, 0x0034($sp) -/* 0216C 80ADFEBC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 02170 80ADFEC0 29E10002 */ slti $at, $t7, 0x0002 -/* 02174 80ADFEC4 14200005 */ bne $at, $zero, .L80ADFEDC -/* 02178 80ADFEC8 00000000 */ nop -/* 0217C 80ADFECC 0C2B7A6F */ jal func_80ADE9BC -/* 02180 80ADFED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02184 80ADFED4 1000006D */ beq $zero, $zero, .L80AE008C -/* 02188 80ADFED8 8FBF002C */ lw $ra, 0x002C($sp) -.L80ADFEDC: -/* 0218C 80ADFEDC 0C2B7A66 */ jal func_80ADE998 -/* 02190 80ADFEE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02194 80ADFEE4 10000069 */ beq $zero, $zero, .L80AE008C -/* 02198 80ADFEE8 8FBF002C */ lw $ra, 0x002C($sp) -.L80ADFEEC: -/* 0219C 80ADFEEC 86180198 */ lh $t8, 0x0198($s0) ## 00000198 -/* 021A0 80ADFEF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021A4 80ADFEF4 5700000A */ bnel $t8, $zero, .L80ADFF20 -/* 021A8 80ADFEF8 920902CE */ lbu $t1, 0x02CE($s0) ## 000002CE -/* 021AC 80ADFEFC 0C2B7A54 */ jal func_80ADE950 -/* 021B0 80ADFF00 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 021B4 80ADFF04 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 021B8 80ADFF08 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 021BC 80ADFF0C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 021C0 80ADFF10 03214024 */ and $t0, $t9, $at -/* 021C4 80ADFF14 1000005C */ beq $zero, $zero, .L80AE0088 -/* 021C8 80ADFF18 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 021CC 80ADFF1C 920902CE */ lbu $t1, 0x02CE($s0) ## 000002CE -.L80ADFF20: -/* 021D0 80ADFF20 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 021D4 80ADFF24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021D8 80ADFF28 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 021DC 80ADFF2C 11400009 */ beq $t2, $zero, .L80ADFF54 -/* 021E0 80ADFF30 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 021E4 80ADFF34 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 021E8 80ADFF38 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 021EC 80ADFF3C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 021F0 80ADFF40 01616025 */ or $t4, $t3, $at ## $t4 = 00010000 -/* 021F4 80ADFF44 0C00BCBD */ jal func_8002F2F4 -/* 021F8 80ADFF48 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 021FC 80ADFF4C 1000000B */ beq $zero, $zero, .L80ADFF7C -/* 02200 80ADFF50 92040195 */ lbu $a0, 0x0195($s0) ## 00000195 -.L80ADFF54: -/* 02204 80ADFF54 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 02208 80ADFF58 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0220C 80ADFF5C 260602BC */ addiu $a2, $s0, 0x02BC ## $a2 = 000002BC -/* 02210 80ADFF60 01A17024 */ and $t6, $t5, $at -/* 02214 80ADFF64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02218 80ADFF68 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0221C 80ADFF6C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 02220 80ADFF70 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02224 80ADFF74 00E12821 */ addu $a1, $a3, $at -/* 02228 80ADFF78 92040195 */ lbu $a0, 0x0195($s0) ## 00000195 -.L80ADFF7C: -/* 0222C 80ADFF7C 000422C0 */ sll $a0, $a0, 11 -/* 02230 80ADFF80 00042400 */ sll $a0, $a0, 16 -/* 02234 80ADFF84 0C01DE1C */ jal Math_Sins - ## sins? -/* 02238 80ADFF88 00042403 */ sra $a0, $a0, 16 -/* 0223C 80ADFF8C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02240 80ADFF90 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 02244 80ADFF94 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 02248 80ADFF98 92020195 */ lbu $v0, 0x0195($s0) ## 00000195 -/* 0224C 80ADFF9C 46040182 */ mul.s $f6, $f0, $f4 -/* 02250 80ADFFA0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02254 80ADFFA4 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 02258 80ADFFA8 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 0225C 80ADFFAC 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 02260 80ADFFB0 46083280 */ add.s $f10, $f6, $f8 -/* 02264 80ADFFB4 10400003 */ beq $v0, $zero, .L80ADFFC4 -/* 02268 80ADFFB8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 0226C 80ADFFBC A20F0195 */ sb $t7, 0x0195($s0) ## 00000195 -/* 02270 80ADFFC0 31E200FF */ andi $v0, $t7, 0x00FF ## $v0 = 000000FF -.L80ADFFC4: -/* 02274 80ADFFC4 54400003 */ bnel $v0, $zero, .L80ADFFD4 -/* 02278 80ADFFC8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 0227C 80ADFFCC A2180195 */ sb $t8, 0x0195($s0) ## 00000195 -/* 02280 80ADFFD0 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -.L80ADFFD4: -/* 02284 80ADFFD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 80ADFFD8 3C05C120 */ lui $a1, 0xC120 ## $a1 = C1200000 -/* 0228C 80ADFFDC 46128101 */ sub.s $f4, $f16, $f18 -/* 02290 80ADFFE0 4600218D */ trunc.w.s $f6, $f4 -/* 02294 80ADFFE4 44083000 */ mfc1 $t0, $f6 -/* 02298 80ADFFE8 0C00B56E */ jal Actor_SetHeight - -/* 0229C 80ADFFEC A6080304 */ sh $t0, 0x0304($s0) ## 00000304 -/* 022A0 80ADFFF0 8E0202A4 */ lw $v0, 0x02A4($s0) ## 000002A4 -/* 022A4 80ADFFF4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 022A8 80ADFFF8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 022AC 80ADFFFC 904C0003 */ lbu $t4, 0x0003($v0) ## 00000003 -/* 022B0 80AE0000 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 022B4 80AE0004 4600428D */ trunc.w.s $f10, $f8 -/* 022B8 80AE0008 AFAC0010 */ sw $t4, 0x0010($sp) -/* 022BC 80AE000C 904D0004 */ lbu $t5, 0x0004($v0) ## 00000004 -/* 022C0 80AE0010 4600848D */ trunc.w.s $f18, $f16 -/* 022C4 80AE0014 44055000 */ mfc1 $a1, $f10 -/* 022C8 80AE0018 AFAD0014 */ sw $t5, 0x0014($sp) -/* 022CC 80AE001C 904E0005 */ lbu $t6, 0x0005($v0) ## 00000005 -/* 022D0 80AE0020 4600218D */ trunc.w.s $f6, $f4 -/* 022D4 80AE0024 44069000 */ mfc1 $a2, $f18 -/* 022D8 80AE0028 AFAE0018 */ sw $t6, 0x0018($sp) -/* 022DC 80AE002C 920F029D */ lbu $t7, 0x029D($s0) ## 0000029D -/* 022E0 80AE0030 44073000 */ mfc1 $a3, $f6 -/* 022E4 80AE0034 00052C00 */ sll $a1, $a1, 16 -/* 022E8 80AE0038 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 022EC 80AE003C 00063400 */ sll $a2, $a2, 16 -/* 022F0 80AE0040 00073C00 */ sll $a3, $a3, 16 -/* 022F4 80AE0044 00073C03 */ sra $a3, $a3, 16 -/* 022F8 80AE0048 00063403 */ sra $a2, $a2, 16 -/* 022FC 80AE004C 00052C03 */ sra $a1, $a1, 16 -/* 02300 80AE0050 260402AC */ addiu $a0, $s0, 0x02AC ## $a0 = 000002AC -/* 02304 80AE0054 05E10005 */ bgez $t7, .L80AE006C -/* 02308 80AE0058 468042A0 */ cvt.s.w $f10, $f8 -/* 0230C 80AE005C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 02310 80AE0060 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 -/* 02314 80AE0064 00000000 */ nop -/* 02318 80AE0068 46105280 */ add.s $f10, $f10, $f16 -.L80AE006C: -/* 0231C 80AE006C 3C0180AE */ lui $at, %hi(D_80AE1C5C) ## $at = 80AE0000 -/* 02320 80AE0070 C4321C5C */ lwc1 $f18, %lo(D_80AE1C5C)($at) -/* 02324 80AE0074 46125102 */ mul.s $f4, $f10, $f18 -/* 02328 80AE0078 4600218D */ trunc.w.s $f6, $f4 -/* 0232C 80AE007C 44193000 */ mfc1 $t9, $f6 -/* 02330 80AE0080 0C01E763 */ jal Lights_PointNoGlowSetInfo - -/* 02334 80AE0084 AFB9001C */ sw $t9, 0x001C($sp) -.L80AE0088: -/* 02338 80AE0088 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE008C: -/* 0233C 80AE008C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02340 80AE0090 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02344 80AE0094 03E00008 */ jr $ra -/* 02348 80AE0098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s deleted file mode 100644 index b447123e9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AE009C -/* 0234C 80AE009C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02350 80AE00A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02354 80AE00A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 02358 80AE00A8 2405FFF3 */ addiu $a1, $zero, 0xFFF3 ## $a1 = FFFFFFF3 -/* 0235C 80AE00AC 0C2B7EA4 */ jal func_80ADFA90 -/* 02360 80AE00B0 AFA40018 */ sw $a0, 0x0018($sp) -/* 02364 80AE00B4 8FA40018 */ lw $a0, 0x0018($sp) -/* 02368 80AE00B8 908E029D */ lbu $t6, 0x029D($a0) ## 0000029D -/* 0236C 80AE00BC 55C00004 */ bnel $t6, $zero, .L80AE00D0 -/* 02370 80AE00C0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02374 80AE00C4 0C00B55C */ jal Actor_Kill - -/* 02378 80AE00C8 00000000 */ nop -/* 0237C 80AE00CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE00D0: -/* 02380 80AE00D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02384 80AE00D4 03E00008 */ jr $ra -/* 02388 80AE00D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s deleted file mode 100644 index 9ffc6afa24..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_80AE00DC -/* 0238C 80AE00DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02390 80AE00E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 02394 80AE00E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 02398 80AE00E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0239C 80AE00EC 948E010E */ lhu $t6, 0x010E($a0) ## 0000010E -/* 023A0 80AE00F0 24015005 */ addiu $at, $zero, 0x5005 ## $at = 00005005 -/* 023A4 80AE00F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023A8 80AE00F8 11C10005 */ beq $t6, $at, .L80AE0110 -/* 023AC 80AE00FC 240531E8 */ addiu $a1, $zero, 0x31E8 ## $a1 = 000031E8 -/* 023B0 80AE0100 0C2B7EA4 */ jal func_80ADFA90 -/* 023B4 80AE0104 2405FFF3 */ addiu $a1, $zero, 0xFFF3 ## $a1 = FFFFFFF3 -/* 023B8 80AE0108 10000004 */ beq $zero, $zero, .L80AE011C -/* 023BC 80AE010C 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE0110: -/* 023C0 80AE0110 0C00BE5D */ jal func_8002F974 -/* 023C4 80AE0114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023C8 80AE0118 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE011C: -/* 023CC 80AE011C 0C042F6F */ jal func_8010BDBC -/* 023D0 80AE0120 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 023D4 80AE0124 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 023D8 80AE0128 1441002B */ bne $v0, $at, .L80AE01D8 -/* 023DC 80AE012C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 023E0 80AE0130 0C041AF2 */ jal func_80106BC8 -/* 023E4 80AE0134 8FA40024 */ lw $a0, 0x0024($sp) -/* 023E8 80AE0138 1040002D */ beq $v0, $zero, .L80AE01F0 -/* 023EC 80AE013C 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 023F0 80AE0140 0C03E291 */ jal func_800F8A44 -/* 023F4 80AE0144 240531E8 */ addiu $a1, $zero, 0x31E8 ## $a1 = 000031E8 -/* 023F8 80AE0148 8FAF0024 */ lw $t7, 0x0024($sp) -/* 023FC 80AE014C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 02400 80AE0150 24095007 */ addiu $t1, $zero, 0x5007 ## $t1 = 00005007 -/* 02404 80AE0154 030FC021 */ addu $t8, $t8, $t7 -/* 02408 80AE0158 931804BD */ lbu $t8, 0x04BD($t8) ## 000104BD -/* 0240C 80AE015C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02410 80AE0160 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 02414 80AE0164 17000015 */ bne $t8, $zero, .L80AE01BC -/* 02418 80AE0168 00000000 */ nop -/* 0241C 80AE016C 0C021AAF */ jal Inventory_HasEmptyBottle -/* 02420 80AE0170 00000000 */ nop -/* 02424 80AE0174 1040000B */ beq $v0, $zero, .L80AE01A4 -/* 02428 80AE0178 24085006 */ addiu $t0, $zero, 0x5006 ## $t0 = 00005006 -/* 0242C 80AE017C 24195008 */ addiu $t9, $zero, 0x5008 ## $t9 = 00005008 -/* 02430 80AE0180 A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 02434 80AE0184 8FA40024 */ lw $a0, 0x0024($sp) -/* 02438 80AE0188 0C021344 */ jal Item_Give -/* 0243C 80AE018C 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 02440 80AE0190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02444 80AE0194 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02448 80AE0198 24053883 */ addiu $a1, $zero, 0x3883 ## $a1 = 00003883 -/* 0244C 80AE019C 1000000A */ beq $zero, $zero, .L80AE01C8 -/* 02450 80AE01A0 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE01A4: -/* 02454 80AE01A4 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 02458 80AE01A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0245C 80AE01AC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02460 80AE01B0 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 02464 80AE01B4 10000004 */ beq $zero, $zero, .L80AE01C8 -/* 02468 80AE01B8 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE01BC: -/* 0246C 80AE01BC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02470 80AE01C0 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 02474 80AE01C4 8FA40024 */ lw $a0, 0x0024($sp) -.L80AE01C8: -/* 02478 80AE01C8 0C042DC8 */ jal func_8010B720 -/* 0247C 80AE01CC 9605010E */ lhu $a1, 0x010E($s0) ## 0000010E -/* 02480 80AE01D0 10000008 */ beq $zero, $zero, .L80AE01F4 -/* 02484 80AE01D4 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE01D8: -/* 02488 80AE01D8 0C00BCCD */ jal func_8002F334 -/* 0248C 80AE01DC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02490 80AE01E0 10400003 */ beq $v0, $zero, .L80AE01F0 -/* 02494 80AE01E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02498 80AE01E8 0C2B7A54 */ jal func_80ADE950 -/* 0249C 80AE01EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -.L80AE01F0: -/* 024A0 80AE01F0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE01F4: -/* 024A4 80AE01F4 8FB00018 */ lw $s0, 0x0018($sp) -/* 024A8 80AE01F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 024AC 80AE01FC 03E00008 */ jr $ra -/* 024B0 80AE0200 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s deleted file mode 100644 index e693b58960..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_80AE0204 -/* 024B4 80AE0204 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 024B8 80AE0208 AFB00014 */ sw $s0, 0x0014($sp) -/* 024BC 80AE020C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 024C0 80AE0210 AFBF001C */ sw $ra, 0x001C($sp) -/* 024C4 80AE0214 AFB10018 */ sw $s1, 0x0018($sp) -/* 024C8 80AE0218 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 024CC 80AE021C 0C00BE5D */ jal func_8002F974 -/* 024D0 80AE0220 240531E8 */ addiu $a1, $zero, 0x31E8 ## $a1 = 000031E8 -/* 024D4 80AE0224 0C042F6F */ jal func_8010BDBC -/* 024D8 80AE0228 260420D8 */ addiu $a0, $s0, 0x20D8 ## $a0 = 000020D8 -/* 024DC 80AE022C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 024E0 80AE0230 1441002B */ bne $v0, $at, .L80AE02E0 -/* 024E4 80AE0234 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 024E8 80AE0238 0C041AF2 */ jal func_80106BC8 -/* 024EC 80AE023C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024F0 80AE0240 10400035 */ beq $v0, $zero, .L80AE0318 -/* 024F4 80AE0244 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 024F8 80AE0248 01D07021 */ addu $t6, $t6, $s0 -/* 024FC 80AE024C 91CE04BD */ lbu $t6, 0x04BD($t6) ## 000104BD -/* 02500 80AE0250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02504 80AE0254 55C00013 */ bnel $t6, $zero, .L80AE02A4 -/* 02508 80AE0258 8639001C */ lh $t9, 0x001C($s1) ## 0000001C -/* 0250C 80AE025C 0C00B2D0 */ jal Flags_GetSwitch - -/* 02510 80AE0260 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 02514 80AE0264 14400007 */ bne $v0, $zero, .L80AE0284 -/* 02518 80AE0268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0251C 80AE026C 0C00B2D0 */ jal Flags_GetSwitch - -/* 02520 80AE0270 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 02524 80AE0274 14400003 */ bne $v0, $zero, .L80AE0284 -/* 02528 80AE0278 240F5010 */ addiu $t7, $zero, 0x5010 ## $t7 = 00005010 -/* 0252C 80AE027C 10000003 */ beq $zero, $zero, .L80AE028C -/* 02530 80AE0280 A62F010E */ sh $t7, 0x010E($s1) ## 0000010E -.L80AE0284: -/* 02534 80AE0284 24185014 */ addiu $t8, $zero, 0x5014 ## $t8 = 00005014 -/* 02538 80AE0288 A638010E */ sh $t8, 0x010E($s1) ## 0000010E -.L80AE028C: -/* 0253C 80AE028C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02540 80AE0290 0C042DC8 */ jal func_8010B720 -/* 02544 80AE0294 9625010E */ lhu $a1, 0x010E($s1) ## 0000010E -/* 02548 80AE0298 10000020 */ beq $zero, $zero, .L80AE031C -/* 0254C 80AE029C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02550 80AE02A0 8639001C */ lh $t9, 0x001C($s1) ## 0000001C -.L80AE02A4: -/* 02554 80AE02A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02558 80AE02A8 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 0255C 80AE02AC 17210005 */ bne $t9, $at, .L80AE02C4 -/* 02560 80AE02B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02564 80AE02B4 0C00B2DD */ jal Flags_SetSwitch - -/* 02568 80AE02B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0256C 80AE02BC 10000004 */ beq $zero, $zero, .L80AE02D0 -/* 02570 80AE02C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AE02C4: -/* 02574 80AE02C4 0C00B2DD */ jal Flags_SetSwitch - -/* 02578 80AE02C8 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 0257C 80AE02CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AE02D0: -/* 02580 80AE02D0 0C2B7A54 */ jal func_80ADE950 -/* 02584 80AE02D4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02588 80AE02D8 10000010 */ beq $zero, $zero, .L80AE031C -/* 0258C 80AE02DC 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE02E0: -/* 02590 80AE02E0 0C00BCCD */ jal func_8002F334 -/* 02594 80AE02E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02598 80AE02E8 5040000C */ beql $v0, $zero, .L80AE031C -/* 0259C 80AE02EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 025A0 80AE02F0 9628010E */ lhu $t0, 0x010E($s1) ## 0000010E -/* 025A4 80AE02F4 24015000 */ addiu $at, $zero, 0x5000 ## $at = 00005000 -/* 025A8 80AE02F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025AC 80AE02FC 55010004 */ bnel $t0, $at, .L80AE0310 -/* 025B0 80AE0300 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 025B4 80AE0304 0C00B2DD */ jal Flags_SetSwitch - -/* 025B8 80AE0308 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 025BC 80AE030C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AE0310: -/* 025C0 80AE0310 0C2B7A54 */ jal func_80ADE950 -/* 025C4 80AE0314 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -.L80AE0318: -/* 025C8 80AE0318 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE031C: -/* 025CC 80AE031C 8FB00014 */ lw $s0, 0x0014($sp) -/* 025D0 80AE0320 8FB10018 */ lw $s1, 0x0018($sp) -/* 025D4 80AE0324 03E00008 */ jr $ra -/* 025D8 80AE0328 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s deleted file mode 100644 index d28fd21edc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80AE032C -/* 025DC 80AE032C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 025E0 80AE0330 AFBF001C */ sw $ra, 0x001C($sp) -/* 025E4 80AE0334 AFB00018 */ sw $s0, 0x0018($sp) -/* 025E8 80AE0338 AFA50024 */ sw $a1, 0x0024($sp) -/* 025EC 80AE033C 908202CD */ lbu $v0, 0x02CD($a0) ## 000002CD -/* 025F0 80AE0340 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025F4 80AE0344 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 025F8 80AE0348 51C0001A */ beql $t6, $zero, .L80AE03B4 -/* 025FC 80AE034C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02600 80AE0350 909800B1 */ lbu $t8, 0x00B1($a0) ## 000000B1 -/* 02604 80AE0354 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 02608 80AE0358 A08F02CD */ sb $t7, 0x02CD($a0) ## 000002CD -/* 0260C 80AE035C 17000004 */ bne $t8, $zero, .L80AE0370 -/* 02610 80AE0360 00000000 */ nop -/* 02614 80AE0364 909900B0 */ lbu $t9, 0x00B0($a0) ## 000000B0 -/* 02618 80AE0368 53200012 */ beql $t9, $zero, .L80AE03B4 -/* 0261C 80AE036C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE0370: -/* 02620 80AE0370 0C00D58A */ jal Actor_ApplyDamage - -/* 02624 80AE0374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02628 80AE0378 14400009 */ bne $v0, $zero, .L80AE03A0 -/* 0262C 80AE037C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02630 80AE0380 8FA40024 */ lw $a0, 0x0024($sp) -/* 02634 80AE0384 0C00CB1F */ jal func_80032C7C -/* 02638 80AE0388 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0263C 80AE038C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02640 80AE0390 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02644 80AE0394 24053876 */ addiu $a1, $zero, 0x3876 ## $a1 = 00003876 -/* 02648 80AE0398 10000003 */ beq $zero, $zero, .L80AE03A8 -/* 0264C 80AE039C 00000000 */ nop -.L80AE03A0: -/* 02650 80AE03A0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02654 80AE03A4 24053875 */ addiu $a1, $zero, 0x3875 ## $a1 = 00003875 -.L80AE03A8: -/* 02658 80AE03A8 0C2B78A3 */ jal func_80ADE28C -/* 0265C 80AE03AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02660 80AE03B0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AE03B4: -/* 02664 80AE03B4 8FB00018 */ lw $s0, 0x0018($sp) -/* 02668 80AE03B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0266C 80AE03BC 03E00008 */ jr $ra -/* 02670 80AE03C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s deleted file mode 100644 index f2b5834b72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_80AE03C4 -/* 02674 80AE03C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02678 80AE03C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0267C 80AE03CC 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02680 80AE03D0 3C0E80AE */ lui $t6, %hi(func_80ADF77C) ## $t6 = 80AE0000 -/* 02684 80AE03D4 25CEF77C */ addiu $t6, $t6, %lo(func_80ADF77C) ## $t6 = 80ADF77C -/* 02688 80AE03D8 11C20052 */ beq $t6, $v0, .L80AE0524 -/* 0268C 80AE03DC 3C0F80AE */ lui $t7, %hi(func_80ADF660) ## $t7 = 80AE0000 -/* 02690 80AE03E0 25EFF660 */ addiu $t7, $t7, %lo(func_80ADF660) ## $t7 = 80ADF660 -/* 02694 80AE03E4 11E2004F */ beq $t7, $v0, .L80AE0524 -/* 02698 80AE03E8 3C1880AE */ lui $t8, %hi(func_80ADEF38) ## $t8 = 80AE0000 -/* 0269C 80AE03EC 2718EF38 */ addiu $t8, $t8, %lo(func_80ADEF38) ## $t8 = 80ADEF38 -/* 026A0 80AE03F0 1302004C */ beq $t8, $v0, .L80AE0524 -/* 026A4 80AE03F4 3C1980AE */ lui $t9, %hi(func_80ADF0B8) ## $t9 = 80AE0000 -/* 026A8 80AE03F8 2739F0B8 */ addiu $t9, $t9, %lo(func_80ADF0B8) ## $t9 = 80ADF0B8 -/* 026AC 80AE03FC 5322004A */ beql $t9, $v0, .L80AE0528 -/* 026B0 80AE0400 8FBF0014 */ lw $ra, 0x0014($sp) -/* 026B4 80AE0404 8482019A */ lh $v0, 0x019A($a0) ## 0000019A -/* 026B8 80AE0408 10400002 */ beq $v0, $zero, .L80AE0414 -/* 026BC 80AE040C 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF -/* 026C0 80AE0410 A488019A */ sh $t0, 0x019A($a0) ## 0000019A -.L80AE0414: -/* 026C4 80AE0414 9082029D */ lbu $v0, 0x029D($a0) ## 0000029D -/* 026C8 80AE0418 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 026CC 80AE041C 1441002C */ bne $v0, $at, .L80AE04D0 -/* 026D0 80AE0420 00000000 */ nop -/* 026D4 80AE0424 9089010C */ lbu $t1, 0x010C($a0) ## 0000010C -/* 026D8 80AE0428 5120000D */ beql $t1, $zero, .L80AE0460 -/* 026DC 80AE042C A0800194 */ sb $zero, 0x0194($a0) ## 00000194 -/* 026E0 80AE0430 908A0194 */ lbu $t2, 0x0194($a0) ## 00000194 -/* 026E4 80AE0434 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 -/* 026E8 80AE0438 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 026EC 80AE043C 316200FF */ andi $v0, $t3, 0x00FF ## $v0 = 00000001 -/* 026F0 80AE0440 28410015 */ slti $at, $v0, 0x0015 -/* 026F4 80AE0444 14200003 */ bne $at, $zero, .L80AE0454 -/* 026F8 80AE0448 A08B0194 */ sb $t3, 0x0194($a0) ## 00000194 -/* 026FC 80AE044C 10000004 */ beq $zero, $zero, .L80AE0460 -/* 02700 80AE0450 A08C0194 */ sb $t4, 0x0194($a0) ## 00000194 -.L80AE0454: -/* 02704 80AE0454 10000002 */ beq $zero, $zero, .L80AE0460 -/* 02708 80AE0458 A0820194 */ sb $v0, 0x0194($a0) ## 00000194 -/* 0270C 80AE045C A0800194 */ sb $zero, 0x0194($a0) ## 00000194 -.L80AE0460: -/* 02710 80AE0460 908D0194 */ lbu $t5, 0x0194($a0) ## 00000194 -/* 02714 80AE0464 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 02718 80AE0468 51A10005 */ beql $t5, $at, .L80AE0480 -/* 0271C 80AE046C 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02720 80AE0470 848E019A */ lh $t6, 0x019A($a0) ## 0000019A -/* 02724 80AE0474 55C0002C */ bnel $t6, $zero, .L80AE0528 -/* 02728 80AE0478 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0272C 80AE047C 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -.L80AE0480: -/* 02730 80AE0480 3C0F80AE */ lui $t7, %hi(func_80ADEAC4) ## $t7 = 80AE0000 -/* 02734 80AE0484 25EFEAC4 */ addiu $t7, $t7, %lo(func_80ADEAC4) ## $t7 = 80ADEAC4 -/* 02738 80AE0488 11E2000D */ beq $t7, $v0, .L80AE04C0 -/* 0273C 80AE048C 3C1880AE */ lui $t8, %hi(func_80ADEB80) ## $t8 = 80AE0000 -/* 02740 80AE0490 2718EB80 */ addiu $t8, $t8, %lo(func_80ADEB80) ## $t8 = 80ADEB80 -/* 02744 80AE0494 1302000A */ beq $t8, $v0, .L80AE04C0 -/* 02748 80AE0498 3C1980AE */ lui $t9, %hi(func_80ADEC9C) ## $t9 = 80AE0000 -/* 0274C 80AE049C 2739EC9C */ addiu $t9, $t9, %lo(func_80ADEC9C) ## $t9 = 80ADEC9C -/* 02750 80AE04A0 13220007 */ beq $t9, $v0, .L80AE04C0 -/* 02754 80AE04A4 3C0880AE */ lui $t0, %hi(func_80ADF894) ## $t0 = 80AE0000 -/* 02758 80AE04A8 2508F894 */ addiu $t0, $t0, %lo(func_80ADF894) ## $t0 = 80ADF894 -/* 0275C 80AE04AC 11020004 */ beq $t0, $v0, .L80AE04C0 -/* 02760 80AE04B0 3C0980AE */ lui $t1, %hi(func_80ADF5E0) ## $t1 = 80AE0000 -/* 02764 80AE04B4 2529F5E0 */ addiu $t1, $t1, %lo(func_80ADF5E0) ## $t1 = 80ADF5E0 -/* 02768 80AE04B8 5522001B */ bnel $t1, $v0, .L80AE0528 -/* 0276C 80AE04BC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE04C0: -/* 02770 80AE04C0 0C2B795B */ jal func_80ADE56C -/* 02774 80AE04C4 00000000 */ nop -/* 02778 80AE04C8 10000017 */ beq $zero, $zero, .L80AE0528 -/* 0277C 80AE04CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE04D0: -/* 02780 80AE04D0 54400015 */ bnel $v0, $zero, .L80AE0528 -/* 02784 80AE04D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02788 80AE04D8 848A019A */ lh $t2, 0x019A($a0) ## 0000019A -/* 0278C 80AE04DC 55400012 */ bnel $t2, $zero, .L80AE0528 -/* 02790 80AE04E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02794 80AE04E4 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02798 80AE04E8 3C0B80AE */ lui $t3, %hi(func_80ADEAC4) ## $t3 = 80AE0000 -/* 0279C 80AE04EC 256BEAC4 */ addiu $t3, $t3, %lo(func_80ADEAC4) ## $t3 = 80ADEAC4 -/* 027A0 80AE04F0 1162000A */ beq $t3, $v0, .L80AE051C -/* 027A4 80AE04F4 3C0C80AE */ lui $t4, %hi(func_80ADEB80) ## $t4 = 80AE0000 -/* 027A8 80AE04F8 258CEB80 */ addiu $t4, $t4, %lo(func_80ADEB80) ## $t4 = 80ADEB80 -/* 027AC 80AE04FC 11820007 */ beq $t4, $v0, .L80AE051C -/* 027B0 80AE0500 3C0D80AE */ lui $t5, %hi(func_80ADEC9C) ## $t5 = 80AE0000 -/* 027B4 80AE0504 25ADEC9C */ addiu $t5, $t5, %lo(func_80ADEC9C) ## $t5 = 80ADEC9C -/* 027B8 80AE0508 11A20004 */ beq $t5, $v0, .L80AE051C -/* 027BC 80AE050C 3C0E80AE */ lui $t6, %hi(func_80ADF5E0) ## $t6 = 80AE0000 -/* 027C0 80AE0510 25CEF5E0 */ addiu $t6, $t6, %lo(func_80ADF5E0) ## $t6 = 80ADF5E0 -/* 027C4 80AE0514 55C20004 */ bnel $t6, $v0, .L80AE0528 -/* 027C8 80AE0518 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE051C: -/* 027CC 80AE051C 0C2B7971 */ jal func_80ADE5C4 -/* 027D0 80AE0520 00000000 */ nop -.L80AE0524: -/* 027D4 80AE0524 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AE0528: -/* 027D8 80AE0528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 027DC 80AE052C 03E00008 */ jr $ra -/* 027E0 80AE0530 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s deleted file mode 100644 index 558e9aea6e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s +++ /dev/null @@ -1,154 +0,0 @@ -glabel func_80AE067C -/* 0292C 80AE067C 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02930 80AE0680 3C0E80AE */ lui $t6, %hi(func_80ADEDFC) ## $t6 = 80AE0000 -/* 02934 80AE0684 25CEEDFC */ addiu $t6, $t6, %lo(func_80ADEDFC) ## $t6 = 80ADEDFC -/* 02938 80AE0688 15C20021 */ bne $t6, $v0, .L80AE0710 -/* 0293C 80AE068C 3C1980AE */ lui $t9, %hi(func_80ADF894) ## $t9 = 80AE0000 -/* 02940 80AE0690 9082029A */ lbu $v0, 0x029A($a0) ## 0000029A -/* 02944 80AE0694 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 02948 80AE0698 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 -/* 0294C 80AE069C 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000005 -/* 02950 80AE06A0 00021400 */ sll $v0, $v0, 16 -/* 02954 80AE06A4 00021403 */ sra $v0, $v0, 16 -/* 02958 80AE06A8 28410100 */ slti $at, $v0, 0x0100 -/* 0295C 80AE06AC 54200004 */ bnel $at, $zero, .L80AE06C0 -/* 02960 80AE06B0 A082029A */ sb $v0, 0x029A($a0) ## 0000029A -/* 02964 80AE06B4 10000002 */ beq $zero, $zero, .L80AE06C0 -/* 02968 80AE06B8 A08F029A */ sb $t7, 0x029A($a0) ## 0000029A -/* 0296C 80AE06BC A082029A */ sb $v0, 0x029A($a0) ## 0000029A -.L80AE06C0: -/* 02970 80AE06C0 9082029B */ lbu $v0, 0x029B($a0) ## 0000029B -/* 02974 80AE06C4 2442FFFB */ addiu $v0, $v0, 0xFFFB ## $v0 = 00000000 -/* 02978 80AE06C8 00021400 */ sll $v0, $v0, 16 -/* 0297C 80AE06CC 00021403 */ sra $v0, $v0, 16 -/* 02980 80AE06D0 28410032 */ slti $at, $v0, 0x0032 -/* 02984 80AE06D4 50200004 */ beql $at, $zero, .L80AE06E8 -/* 02988 80AE06D8 A082029B */ sb $v0, 0x029B($a0) ## 0000029B -/* 0298C 80AE06DC 10000002 */ beq $zero, $zero, .L80AE06E8 -/* 02990 80AE06E0 A098029B */ sb $t8, 0x029B($a0) ## 0000029B -/* 02994 80AE06E4 A082029B */ sb $v0, 0x029B($a0) ## 0000029B -.L80AE06E8: -/* 02998 80AE06E8 9082029C */ lbu $v0, 0x029C($a0) ## 0000029C -/* 0299C 80AE06EC 2442FFFB */ addiu $v0, $v0, 0xFFFB ## $v0 = FFFFFFFB -/* 029A0 80AE06F0 00021400 */ sll $v0, $v0, 16 -/* 029A4 80AE06F4 00021403 */ sra $v0, $v0, 16 -/* 029A8 80AE06F8 04410003 */ bgez $v0, .L80AE0708 -/* 029AC 80AE06FC 00000000 */ nop -/* 029B0 80AE0700 03E00008 */ jr $ra -/* 029B4 80AE0704 A080029C */ sb $zero, 0x029C($a0) ## 0000029C -.L80AE0708: -/* 029B8 80AE0708 03E00008 */ jr $ra -/* 029BC 80AE070C A082029C */ sb $v0, 0x029C($a0) ## 0000029C -.L80AE0710: -/* 029C0 80AE0710 2739F894 */ addiu $t9, $t9, %lo(func_80ADF894) ## $t9 = 80ADF894 -/* 029C4 80AE0714 17220022 */ bne $t9, $v0, .L80AE07A0 -/* 029C8 80AE0718 3C0B80AE */ lui $t3, %hi(func_80ADEECC) ## $t3 = 80AE0000 -/* 029CC 80AE071C 9082029A */ lbu $v0, 0x029A($a0) ## 0000029A -/* 029D0 80AE0720 24080050 */ addiu $t0, $zero, 0x0050 ## $t0 = 00000050 -/* 029D4 80AE0724 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 029D8 80AE0728 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000000 -/* 029DC 80AE072C 00021400 */ sll $v0, $v0, 16 -/* 029E0 80AE0730 00021403 */ sra $v0, $v0, 16 -/* 029E4 80AE0734 28410051 */ slti $at, $v0, 0x0051 -/* 029E8 80AE0738 14200003 */ bne $at, $zero, .L80AE0748 -/* 029EC 80AE073C 240A00E1 */ addiu $t2, $zero, 0x00E1 ## $t2 = 000000E1 -/* 029F0 80AE0740 10000002 */ beq $zero, $zero, .L80AE074C -/* 029F4 80AE0744 A088029A */ sb $t0, 0x029A($a0) ## 0000029A -.L80AE0748: -/* 029F8 80AE0748 A082029A */ sb $v0, 0x029A($a0) ## 0000029A -.L80AE074C: -/* 029FC 80AE074C 9082029B */ lbu $v0, 0x029B($a0) ## 0000029B -/* 02A00 80AE0750 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000005 -/* 02A04 80AE0754 00021400 */ sll $v0, $v0, 16 -/* 02A08 80AE0758 00021403 */ sra $v0, $v0, 16 -/* 02A0C 80AE075C 28410100 */ slti $at, $v0, 0x0100 -/* 02A10 80AE0760 54200004 */ bnel $at, $zero, .L80AE0774 -/* 02A14 80AE0764 A082029B */ sb $v0, 0x029B($a0) ## 0000029B -/* 02A18 80AE0768 10000002 */ beq $zero, $zero, .L80AE0774 -/* 02A1C 80AE076C A089029B */ sb $t1, 0x029B($a0) ## 0000029B -/* 02A20 80AE0770 A082029B */ sb $v0, 0x029B($a0) ## 0000029B -.L80AE0774: -/* 02A24 80AE0774 9082029C */ lbu $v0, 0x029C($a0) ## 0000029C -/* 02A28 80AE0778 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 0000000A -/* 02A2C 80AE077C 00021400 */ sll $v0, $v0, 16 -/* 02A30 80AE0780 00021403 */ sra $v0, $v0, 16 -/* 02A34 80AE0784 284100E2 */ slti $at, $v0, 0x00E2 -/* 02A38 80AE0788 14200003 */ bne $at, $zero, .L80AE0798 -/* 02A3C 80AE078C 00000000 */ nop -/* 02A40 80AE0790 03E00008 */ jr $ra -/* 02A44 80AE0794 A08A029C */ sb $t2, 0x029C($a0) ## 0000029C -.L80AE0798: -/* 02A48 80AE0798 03E00008 */ jr $ra -/* 02A4C 80AE079C A082029C */ sb $v0, 0x029C($a0) ## 0000029C -.L80AE07A0: -/* 02A50 80AE07A0 256BEECC */ addiu $t3, $t3, %lo(func_80ADEECC) ## $t3 = 80ADEECC -/* 02A54 80AE07A4 55620010 */ bnel $t3, $v0, .L80AE07E8 -/* 02A58 80AE07A8 9082029A */ lbu $v0, 0x029A($a0) ## 0000029A -/* 02A5C 80AE07AC 908C0114 */ lbu $t4, 0x0114($a0) ## 00000114 -/* 02A60 80AE07B0 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 -/* 02A64 80AE07B4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 02A68 80AE07B8 318D0002 */ andi $t5, $t4, 0x0002 ## $t5 = 00000000 -/* 02A6C 80AE07BC 11A00005 */ beq $t5, $zero, .L80AE07D4 -/* 02A70 80AE07C0 241800E1 */ addiu $t8, $zero, 0x00E1 ## $t8 = 000000E1 -/* 02A74 80AE07C4 A080029A */ sb $zero, 0x029A($a0) ## 0000029A -/* 02A78 80AE07C8 A080029B */ sb $zero, 0x029B($a0) ## 0000029B -/* 02A7C 80AE07CC 03E00008 */ jr $ra -/* 02A80 80AE07D0 A080029C */ sb $zero, 0x029C($a0) ## 0000029C -.L80AE07D4: -/* 02A84 80AE07D4 A08E029A */ sb $t6, 0x029A($a0) ## 0000029A -/* 02A88 80AE07D8 A08F029B */ sb $t7, 0x029B($a0) ## 0000029B -/* 02A8C 80AE07DC 03E00008 */ jr $ra -/* 02A90 80AE07E0 A098029C */ sb $t8, 0x029C($a0) ## 0000029C -.L80AE07E4: -/* 02A94 80AE07E4 9082029A */ lbu $v0, 0x029A($a0) ## 0000029A -.L80AE07E8: -/* 02A98 80AE07E8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 02A9C 80AE07EC 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 02AA0 80AE07F0 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 0000000F -/* 02AA4 80AE07F4 00021400 */ sll $v0, $v0, 16 -/* 02AA8 80AE07F8 00021403 */ sra $v0, $v0, 16 -/* 02AAC 80AE07FC 28410100 */ slti $at, $v0, 0x0100 -/* 02AB0 80AE0800 54200004 */ bnel $at, $zero, .L80AE0814 -/* 02AB4 80AE0804 A082029A */ sb $v0, 0x029A($a0) ## 0000029A -/* 02AB8 80AE0808 10000002 */ beq $zero, $zero, .L80AE0814 -/* 02ABC 80AE080C A099029A */ sb $t9, 0x029A($a0) ## 0000029A -/* 02AC0 80AE0810 A082029A */ sb $v0, 0x029A($a0) ## 0000029A -.L80AE0814: -/* 02AC4 80AE0814 9082029B */ lbu $v0, 0x029B($a0) ## 0000029B -/* 02AC8 80AE0818 24420005 */ addiu $v0, $v0, 0x0005 ## $v0 = 00000014 -/* 02ACC 80AE081C 00021400 */ sll $v0, $v0, 16 -/* 02AD0 80AE0820 00021403 */ sra $v0, $v0, 16 -/* 02AD4 80AE0824 28410100 */ slti $at, $v0, 0x0100 -/* 02AD8 80AE0828 54200004 */ bnel $at, $zero, .L80AE083C -/* 02ADC 80AE082C A082029B */ sb $v0, 0x029B($a0) ## 0000029B -/* 02AE0 80AE0830 10000002 */ beq $zero, $zero, .L80AE083C -/* 02AE4 80AE0834 A088029B */ sb $t0, 0x029B($a0) ## 0000029B -/* 02AE8 80AE0838 A082029B */ sb $v0, 0x029B($a0) ## 0000029B -.L80AE083C: -/* 02AEC 80AE083C 9083029C */ lbu $v1, 0x029C($a0) ## 0000029C -/* 02AF0 80AE0840 286100D3 */ slti $at, $v1, 0x00D3 -/* 02AF4 80AE0844 1420000B */ bne $at, $zero, .L80AE0874 -/* 02AF8 80AE0848 24620005 */ addiu $v0, $v1, 0x0005 ## $v0 = 00000005 -/* 02AFC 80AE084C 2462FFFB */ addiu $v0, $v1, 0xFFFB ## $v0 = FFFFFFFB -/* 02B00 80AE0850 00021400 */ sll $v0, $v0, 16 -/* 02B04 80AE0854 00021403 */ sra $v0, $v0, 16 -/* 02B08 80AE0858 284100D2 */ slti $at, $v0, 0x00D2 -/* 02B0C 80AE085C 10200003 */ beq $at, $zero, .L80AE086C -/* 02B10 80AE0860 240900D2 */ addiu $t1, $zero, 0x00D2 ## $t1 = 000000D2 -/* 02B14 80AE0864 03E00008 */ jr $ra -/* 02B18 80AE0868 A089029C */ sb $t1, 0x029C($a0) ## 0000029C -.L80AE086C: -/* 02B1C 80AE086C 03E00008 */ jr $ra -/* 02B20 80AE0870 A082029C */ sb $v0, 0x029C($a0) ## 0000029C -.L80AE0874: -/* 02B24 80AE0874 00021400 */ sll $v0, $v0, 16 -/* 02B28 80AE0878 00021403 */ sra $v0, $v0, 16 -/* 02B2C 80AE087C 284100D3 */ slti $at, $v0, 0x00D3 -/* 02B30 80AE0880 14200003 */ bne $at, $zero, .L80AE0890 -/* 02B34 80AE0884 240A00D2 */ addiu $t2, $zero, 0x00D2 ## $t2 = 000000D2 -/* 02B38 80AE0888 03E00008 */ jr $ra -/* 02B3C 80AE088C A08A029C */ sb $t2, 0x029C($a0) ## 0000029C -.L80AE0890: -/* 02B40 80AE0890 A082029C */ sb $v0, 0x029C($a0) ## 0000029C -/* 02B44 80AE0894 03E00008 */ jr $ra -/* 02B48 80AE0898 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s deleted file mode 100644 index 19bbed42d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s +++ /dev/null @@ -1,111 +0,0 @@ -.late_rodata -glabel D_80AE1C60 - .word 0x418547AE -glabel D_80AE1C64 - .word 0x41855555 - -.text -glabel func_80AE089C -/* 02B4C 80AE089C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02B50 80AE08A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02B54 80AE08A4 8C820190 */ lw $v0, 0x0190($a0) ## 00000190 -/* 02B58 80AE08A8 3C0E80AE */ lui $t6, %hi(func_80ADEF38) ## $t6 = 80AE0000 -/* 02B5C 80AE08AC 25CEEF38 */ addiu $t6, $t6, %lo(func_80ADEF38) ## $t6 = 80ADEF38 -/* 02B60 80AE08B0 11C20003 */ beq $t6, $v0, .L80AE08C0 -/* 02B64 80AE08B4 3C0F80AE */ lui $t7, %hi(func_80ADF0B8) ## $t7 = 80AE0000 -/* 02B68 80AE08B8 25EFF0B8 */ addiu $t7, $t7, %lo(func_80ADF0B8) ## $t7 = 80ADF0B8 -/* 02B6C 80AE08BC 15E20039 */ bne $t7, $v0, .L80AE09A4 -.L80AE08C0: -/* 02B70 80AE08C0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 02B74 80AE08C4 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 02B78 80AE08C8 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 02B7C 80AE08CC 3C0180AE */ lui $at, %hi(D_80AE1C60) ## $at = 80AE0000 -/* 02B80 80AE08D0 4604003C */ c.lt.s $f0, $f4 -/* 02B84 80AE08D4 00000000 */ nop -/* 02B88 80AE08D8 45000032 */ bc1f .L80AE09A4 -/* 02B8C 80AE08DC 00000000 */ nop -/* 02B90 80AE08E0 C4261C60 */ lwc1 $f6, %lo(D_80AE1C60)($at) -/* 02B94 80AE08E4 3C0180AE */ lui $at, %hi(D_80AE1C64) ## $at = 80AE0000 -/* 02B98 80AE08E8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02B9C 80AE08EC 46060202 */ mul.s $f8, $f0, $f6 -/* 02BA0 80AE08F0 4600428D */ trunc.w.s $f10, $f8 -/* 02BA4 80AE08F4 44025000 */ mfc1 $v0, $f10 -/* 02BA8 80AE08F8 00000000 */ nop -/* 02BAC 80AE08FC 00021400 */ sll $v0, $v0, 16 -/* 02BB0 80AE0900 00021403 */ sra $v0, $v0, 16 -/* 02BB4 80AE0904 24420037 */ addiu $v0, $v0, 0x0037 ## $v0 = 00000037 -/* 02BB8 80AE0908 A08202A0 */ sb $v0, 0x02A0($a0) ## 000002A0 -/* 02BBC 80AE090C A082029F */ sb $v0, 0x029F($a0) ## 0000029F -/* 02BC0 80AE0910 A082029E */ sb $v0, 0x029E($a0) ## 0000029E -/* 02BC4 80AE0914 C4301C64 */ lwc1 $f16, %lo(D_80AE1C64)($at) -/* 02BC8 80AE0918 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02BCC 80AE091C 46100482 */ mul.s $f18, $f0, $f16 -/* 02BD0 80AE0920 4459F800 */ cfc1 $t9, $31 -/* 02BD4 80AE0924 44C8F800 */ ctc1 $t0, $31 -/* 02BD8 80AE0928 00000000 */ nop -/* 02BDC 80AE092C 46009124 */ cvt.w.s $f4, $f18 -/* 02BE0 80AE0930 4448F800 */ cfc1 $t0, $31 -/* 02BE4 80AE0934 00000000 */ nop -/* 02BE8 80AE0938 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 02BEC 80AE093C 51000013 */ beql $t0, $zero, .L80AE098C -/* 02BF0 80AE0940 44082000 */ mfc1 $t0, $f4 -/* 02BF4 80AE0944 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 -/* 02BF8 80AE0948 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 02BFC 80AE094C 46049101 */ sub.s $f4, $f18, $f4 -/* 02C00 80AE0950 44C8F800 */ ctc1 $t0, $31 -/* 02C04 80AE0954 00000000 */ nop -/* 02C08 80AE0958 46002124 */ cvt.w.s $f4, $f4 -/* 02C0C 80AE095C 4448F800 */ cfc1 $t0, $31 -/* 02C10 80AE0960 00000000 */ nop -/* 02C14 80AE0964 31080078 */ andi $t0, $t0, 0x0078 ## $t0 = 00000000 -/* 02C18 80AE0968 15000005 */ bne $t0, $zero, .L80AE0980 -/* 02C1C 80AE096C 00000000 */ nop -/* 02C20 80AE0970 44082000 */ mfc1 $t0, $f4 -/* 02C24 80AE0974 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02C28 80AE0978 10000007 */ beq $zero, $zero, .L80AE0998 -/* 02C2C 80AE097C 01014025 */ or $t0, $t0, $at ## $t0 = 80000000 -.L80AE0980: -/* 02C30 80AE0980 10000005 */ beq $zero, $zero, .L80AE0998 -/* 02C34 80AE0984 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF -/* 02C38 80AE0988 44082000 */ mfc1 $t0, $f4 -.L80AE098C: -/* 02C3C 80AE098C 00000000 */ nop -/* 02C40 80AE0990 0500FFFB */ bltz $t0, .L80AE0980 -/* 02C44 80AE0994 00000000 */ nop -.L80AE0998: -/* 02C48 80AE0998 44D9F800 */ ctc1 $t9, $31 -/* 02C4C 80AE099C 1000001B */ beq $zero, $zero, .L80AE0A0C -/* 02C50 80AE09A0 A08802A1 */ sb $t0, 0x02A1($a0) ## 000002A1 -.L80AE09A4: -/* 02C54 80AE09A4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 02C58 80AE09A8 AFA40018 */ sw $a0, 0x0018($sp) -/* 02C5C 80AE09AC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 02C60 80AE09B0 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 02C64 80AE09B4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 02C68 80AE09B8 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 02C6C 80AE09BC 46060202 */ mul.s $f8, $f0, $f6 -/* 02C70 80AE09C0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 02C74 80AE09C4 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 02C78 80AE09C8 46100482 */ mul.s $f18, $f0, $f16 -/* 02C7C 80AE09CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 02C80 80AE09D0 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 -/* 02C84 80AE09D4 A08E02A1 */ sb $t6, 0x02A1($a0) ## 000002A1 -/* 02C88 80AE09D8 4600428D */ trunc.w.s $f10, $f8 -/* 02C8C 80AE09DC 46060202 */ mul.s $f8, $f0, $f6 -/* 02C90 80AE09E0 440C5000 */ mfc1 $t4, $f10 -/* 02C94 80AE09E4 4600910D */ trunc.w.s $f4, $f18 -/* 02C98 80AE09E8 258D00E1 */ addiu $t5, $t4, 0x00E1 ## $t5 = 000000E1 -/* 02C9C 80AE09EC A08D029E */ sb $t5, 0x029E($a0) ## 0000029E -/* 02CA0 80AE09F0 4600428D */ trunc.w.s $f10, $f8 -/* 02CA4 80AE09F4 44192000 */ mfc1 $t9, $f4 -/* 02CA8 80AE09F8 440C5000 */ mfc1 $t4, $f10 -/* 02CAC 80AE09FC 2728009B */ addiu $t0, $t9, 0x009B ## $t0 = 0000009B -/* 02CB0 80AE0A00 A088029F */ sb $t0, 0x029F($a0) ## 0000029F -/* 02CB4 80AE0A04 258D005F */ addiu $t5, $t4, 0x005F ## $t5 = 0000005F -/* 02CB8 80AE0A08 A08D02A0 */ sb $t5, 0x02A0($a0) ## 000002A0 -.L80AE0A0C: -/* 02CBC 80AE0A0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 02CC0 80AE0A10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02CC4 80AE0A14 03E00008 */ jr $ra -/* 02CC8 80AE0A18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s deleted file mode 100644 index bb07ca6c8a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s +++ /dev/null @@ -1,133 +0,0 @@ -glabel func_80AE0A1C -/* 02CCC 80AE0A1C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02CD0 80AE0A20 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02CD4 80AE0A24 AFB10020 */ sw $s1, 0x0020($sp) -/* 02CD8 80AE0A28 AFB0001C */ sw $s0, 0x001C($sp) -/* 02CDC 80AE0A2C 90820318 */ lbu $v0, 0x0318($a0) ## 00000318 -/* 02CE0 80AE0A30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02CE4 80AE0A34 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02CE8 80AE0A38 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 02CEC 80AE0A3C 11C00003 */ beq $t6, $zero, .L80AE0A4C -/* 02CF0 80AE0A40 304FFFFD */ andi $t7, $v0, 0xFFFD ## $t7 = 00000000 -/* 02CF4 80AE0A44 0C2B7932 */ jal func_80ADE4C8 -/* 02CF8 80AE0A48 A08F0318 */ sb $t7, 0x0318($a0) ## 00000318 -.L80AE0A4C: -/* 02CFC 80AE0A4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D00 80AE0A50 0C2B80CB */ jal func_80AE032C -/* 02D04 80AE0A54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02D08 80AE0A58 0C2B80F1 */ jal func_80AE03C4 -/* 02D0C 80AE0A5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D10 80AE0A60 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 02D14 80AE0A64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D18 80AE0A68 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02D1C 80AE0A6C 0320F809 */ jalr $ra, $t9 -/* 02D20 80AE0A70 00000000 */ nop -/* 02D24 80AE0A74 0C00B638 */ jal Actor_MoveForward - -/* 02D28 80AE0A78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02D2C 80AE0A7C 8E080190 */ lw $t0, 0x0190($s0) ## 00000190 -/* 02D30 80AE0A80 3C1880AE */ lui $t8, %hi(func_80ADEDFC) ## $t8 = 80AE0000 -/* 02D34 80AE0A84 2718EDFC */ addiu $t8, $t8, %lo(func_80ADEDFC) ## $t8 = 80ADEDFC -/* 02D38 80AE0A88 57080010 */ bnel $t8, $t0, .L80AE0ACC -/* 02D3C 80AE0A8C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02D40 80AE0A90 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -/* 02D44 80AE0A94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D48 80AE0A98 2921000A */ slti $at, $t1, 0x000A -/* 02D4C 80AE0A9C 5020000B */ beql $at, $zero, .L80AE0ACC -/* 02D50 80AE0AA0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02D54 80AE0AA4 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 02D58 80AE0AA8 3C010100 */ lui $at, 0x0100 ## $at = 01000000 -/* 02D5C 80AE0AAC 26060308 */ addiu $a2, $s0, 0x0308 ## $a2 = 00000308 -/* 02D60 80AE0AB0 01415825 */ or $t3, $t2, $at ## $t3 = 01000000 -/* 02D64 80AE0AB4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02D68 80AE0AB8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02D6C 80AE0ABC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 02D70 80AE0AC0 0C0175E7 */ jal CollisionCheck_SetAT - ## CollisionCheck_setAT -/* 02D74 80AE0AC4 02212821 */ addu $a1, $s1, $at -/* 02D78 80AE0AC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80AE0ACC: -/* 02D7C 80AE0ACC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 02D80 80AE0AD0 02216021 */ addu $t4, $s1, $at -/* 02D84 80AE0AD4 260502BC */ addiu $a1, $s0, 0x02BC ## $a1 = 000002BC -/* 02D88 80AE0AD8 260D0308 */ addiu $t5, $s0, 0x0308 ## $t5 = 00000308 -/* 02D8C 80AE0ADC AFAD0030 */ sw $t5, 0x0030($sp) -/* 02D90 80AE0AE0 AFA5002C */ sw $a1, 0x002C($sp) -/* 02D94 80AE0AE4 AFAC0034 */ sw $t4, 0x0034($sp) -/* 02D98 80AE0AE8 0C0189B7 */ jal Collider_CylinderUpdate - -/* 02D9C 80AE0AEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DA0 80AE0AF0 920E02CD */ lbu $t6, 0x02CD($s0) ## 000002CD -/* 02DA4 80AE0AF4 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 02DA8 80AE0AF8 51E00009 */ beql $t7, $zero, .L80AE0B20 -/* 02DAC 80AE0AFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02DB0 80AE0B00 9219029D */ lbu $t9, 0x029D($s0) ## 0000029D -/* 02DB4 80AE0B04 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 02DB8 80AE0B08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02DBC 80AE0B0C 17210003 */ bne $t9, $at, .L80AE0B1C -/* 02DC0 80AE0B10 8FA50034 */ lw $a1, 0x0034($sp) -/* 02DC4 80AE0B14 0C01767D */ jal CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 02DC8 80AE0B18 8FA6002C */ lw $a2, 0x002C($sp) -.L80AE0B1C: -/* 02DCC 80AE0B1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80AE0B20: -/* 02DD0 80AE0B20 8FA50034 */ lw $a1, 0x0034($sp) -/* 02DD4 80AE0B24 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02DD8 80AE0B28 8FA6002C */ lw $a2, 0x002C($sp) -/* 02DDC 80AE0B2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02DE0 80AE0B30 8FA50034 */ lw $a1, 0x0034($sp) -/* 02DE4 80AE0B34 0C017713 */ jal CollisionCheck_SetOC - ## CollisionCheck_setOT -/* 02DE8 80AE0B38 8FA60030 */ lw $a2, 0x0030($sp) -/* 02DEC 80AE0B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DF0 80AE0B40 0C00B56E */ jal Actor_SetHeight - -/* 02DF4 80AE0B44 3C054228 */ lui $a1, 0x4228 ## $a1 = 42280000 -/* 02DF8 80AE0B48 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 -/* 02DFC 80AE0B4C 3C1880AE */ lui $t8, %hi(func_80ADEECC) ## $t8 = 80AE0000 -/* 02E00 80AE0B50 2718EECC */ addiu $t8, $t8, %lo(func_80ADEECC) ## $t8 = 80ADEECC -/* 02E04 80AE0B54 1302000E */ beq $t8, $v0, .L80AE0B90 -/* 02E08 80AE0B58 3C0880AE */ lui $t0, %hi(func_80ADF574) ## $t0 = 80AE0000 -/* 02E0C 80AE0B5C 2508F574 */ addiu $t0, $t0, %lo(func_80ADF574) ## $t0 = 80ADF574 -/* 02E10 80AE0B60 1102000B */ beq $t0, $v0, .L80AE0B90 -/* 02E14 80AE0B64 3C0980AE */ lui $t1, %hi(func_80ADF894) ## $t1 = 80AE0000 -/* 02E18 80AE0B68 2529F894 */ addiu $t1, $t1, %lo(func_80ADF894) ## $t1 = 80ADF894 -/* 02E1C 80AE0B6C 55220007 */ bnel $t1, $v0, .L80AE0B8C -/* 02E20 80AE0B70 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 -/* 02E24 80AE0B74 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 02E28 80AE0B78 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 02E2C 80AE0B7C 01415821 */ addu $t3, $t2, $at -/* 02E30 80AE0B80 10000003 */ beq $zero, $zero, .L80AE0B90 -/* 02E34 80AE0B84 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 -/* 02E38 80AE0B88 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 -.L80AE0B8C: -/* 02E3C 80AE0B8C A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 -.L80AE0B90: -/* 02E40 80AE0B90 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 02E44 80AE0B94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02E48 80AE0B98 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 02E4C 80AE0B9C E7A4003C */ swc1 $f4, 0x003C($sp) -/* 02E50 80AE0BA0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 02E54 80AE0BA4 27AD003C */ addiu $t5, $sp, 0x003C ## $t5 = FFFFFFEC -/* 02E58 80AE0BA8 262407C0 */ addiu $a0, $s1, 0x07C0 ## $a0 = 000007C0 -/* 02E5C 80AE0BAC 46083280 */ add.s $f10, $f6, $f8 -/* 02E60 80AE0BB0 26050078 */ addiu $a1, $s0, 0x0078 ## $a1 = 00000078 -/* 02E64 80AE0BB4 27A60038 */ addiu $a2, $sp, 0x0038 ## $a2 = FFFFFFE8 -/* 02E68 80AE0BB8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 02E6C 80AE0BBC E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 02E70 80AE0BC0 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 02E74 80AE0BC4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 02E78 80AE0BC8 0C00F269 */ jal func_8003C9A4 -/* 02E7C 80AE0BCC E7B00044 */ swc1 $f16, 0x0044($sp) -/* 02E80 80AE0BD0 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 -/* 02E84 80AE0BD4 0C2B8227 */ jal func_80AE089C -/* 02E88 80AE0BD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02E8C 80AE0BDC 920E029D */ lbu $t6, 0x029D($s0) ## 0000029D -/* 02E90 80AE0BE0 A20E00C8 */ sb $t6, 0x00C8($s0) ## 000000C8 -/* 02E94 80AE0BE4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02E98 80AE0BE8 8FB10020 */ lw $s1, 0x0020($sp) -/* 02E9C 80AE0BEC 8FB0001C */ lw $s0, 0x001C($sp) -/* 02EA0 80AE0BF0 03E00008 */ jr $ra -/* 02EA4 80AE0BF4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s deleted file mode 100644 index 27a66407ad..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80AE0BF8 -/* 02EA8 80AE0BF8 AFA40000 */ sw $a0, 0x0000($sp) -/* 02EAC 80AE0BFC 8FA40014 */ lw $a0, 0x0014($sp) -/* 02EB0 80AE0C00 AFA7000C */ sw $a3, 0x000C($sp) -/* 02EB4 80AE0C04 908E029D */ lbu $t6, 0x029D($a0) ## 0000029D -/* 02EB8 80AE0C08 11C0000E */ beq $t6, $zero, .L80AE0C44 -/* 02EBC 80AE0C0C 00000000 */ nop -/* 02EC0 80AE0C10 8C8F02A4 */ lw $t7, 0x02A4($a0) ## 000002A4 -/* 02EC4 80AE0C14 91F80006 */ lbu $t8, 0x0006($t7) ## 00000006 -/* 02EC8 80AE0C18 10B8000A */ beq $a1, $t8, .L80AE0C44 -/* 02ECC 80AE0C1C 00000000 */ nop -/* 02ED0 80AE0C20 8C880190 */ lw $t0, 0x0190($a0) ## 00000190 -/* 02ED4 80AE0C24 3C1980AE */ lui $t9, %hi(func_80ADF15C) ## $t9 = 80AE0000 -/* 02ED8 80AE0C28 2739F15C */ addiu $t9, $t9, %lo(func_80ADF15C) ## $t9 = 80ADF15C -/* 02EDC 80AE0C2C 57280008 */ bnel $t9, $t0, .L80AE0C50 -/* 02EE0 80AE0C30 848A001C */ lh $t2, 0x001C($a0) ## 0000001C -/* 02EE4 80AE0C34 84890198 */ lh $t1, 0x0198($a0) ## 00000198 -/* 02EE8 80AE0C38 29210002 */ slti $at, $t1, 0x0002 -/* 02EEC 80AE0C3C 54200004 */ bnel $at, $zero, .L80AE0C50 -/* 02EF0 80AE0C40 848A001C */ lh $t2, 0x001C($a0) ## 0000001C -.L80AE0C44: -/* 02EF4 80AE0C44 10000009 */ beq $zero, $zero, .L80AE0C6C -/* 02EF8 80AE0C48 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 02EFC 80AE0C4C 848A001C */ lh $t2, 0x001C($a0) ## 0000001C -.L80AE0C50: -/* 02F00 80AE0C50 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02F04 80AE0C54 15410005 */ bne $t2, $at, .L80AE0C6C -/* 02F08 80AE0C58 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02F0C 80AE0C5C 14A10003 */ bne $a1, $at, .L80AE0C6C -/* 02F10 80AE0C60 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 02F14 80AE0C64 256B4638 */ addiu $t3, $t3, 0x4638 ## $t3 = 06004638 -/* 02F18 80AE0C68 ACCB0000 */ sw $t3, 0x0000($a2) ## 00000000 -.L80AE0C6C: -/* 02F1C 80AE0C6C 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 02F20 80AE0C70 14A1001B */ bne $a1, $at, .L80AE0CE0 -/* 02F24 80AE0C74 00000000 */ nop -/* 02F28 80AE0C78 908C0197 */ lbu $t4, 0x0197($a0) ## 00000197 -/* 02F2C 80AE0C7C 8FA30018 */ lw $v1, 0x0018($sp) -/* 02F30 80AE0C80 15800017 */ bne $t4, $zero, .L80AE0CE0 -/* 02F34 80AE0C84 00000000 */ nop -/* 02F38 80AE0C88 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 02F3C 80AE0C8C 3C0EE700 */ lui $t6, 0xE700 ## $t6 = E7000000 -/* 02F40 80AE0C90 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 02F44 80AE0C94 24AD0008 */ addiu $t5, $a1, 0x0008 ## $t5 = 00000008 -/* 02F48 80AE0C98 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 -/* 02F4C 80AE0C9C ACA00004 */ sw $zero, 0x0004($a1) ## 00000004 -/* 02F50 80AE0CA0 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 -/* 02F54 80AE0CA4 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 02F58 80AE0CA8 24AF0008 */ addiu $t7, $a1, 0x0008 ## $t7 = 00000008 -/* 02F5C 80AE0CAC AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 02F60 80AE0CB0 ACB80000 */ sw $t8, 0x0000($a1) ## 00000000 -/* 02F64 80AE0CB4 908B029B */ lbu $t3, 0x029B($a0) ## 0000029B -/* 02F68 80AE0CB8 9088029A */ lbu $t0, 0x029A($a0) ## 0000029A -/* 02F6C 80AE0CBC 908F029C */ lbu $t7, 0x029C($a0) ## 0000029C -/* 02F70 80AE0CC0 908A029D */ lbu $t2, 0x029D($a0) ## 0000029D -/* 02F74 80AE0CC4 000B6400 */ sll $t4, $t3, 16 -/* 02F78 80AE0CC8 00084E00 */ sll $t1, $t0, 24 -/* 02F7C 80AE0CCC 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 -/* 02F80 80AE0CD0 000FC200 */ sll $t8, $t7, 8 -/* 02F84 80AE0CD4 01B8C825 */ or $t9, $t5, $t8 ## $t9 = FB000000 -/* 02F88 80AE0CD8 032A5825 */ or $t3, $t9, $t2 ## $t3 = FB000000 -/* 02F8C 80AE0CDC ACAB0004 */ sw $t3, 0x0004($a1) ## 00000004 -.L80AE0CE0: -/* 02F90 80AE0CE0 03E00008 */ jr $ra -/* 02F94 80AE0CE4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s deleted file mode 100644 index 4126d2bd2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s +++ /dev/null @@ -1,147 +0,0 @@ -.rdata -glabel D_80AE1B80 - .asciz "../z_en_poh.c" - .balign 4 - -.late_rodata -glabel D_80AE1C68 - .float 0.01 - -glabel D_80AE1C6C - .word 0x3F48C8C9 - -.text -glabel func_80AE0CE8 -/* 02F98 80AE0CE8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02F9C 80AE0CEC AFB00028 */ sw $s0, 0x0028($sp) -/* 02FA0 80AE0CF0 8FB00058 */ lw $s0, 0x0058($sp) -/* 02FA4 80AE0CF4 AFA40048 */ sw $a0, 0x0048($sp) -/* 02FA8 80AE0CF8 AFBF002C */ sw $ra, 0x002C($sp) -/* 02FAC 80AE0CFC AFA5004C */ sw $a1, 0x004C($sp) -/* 02FB0 80AE0D00 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02FB4 80AE0D04 AFA60050 */ sw $a2, 0x0050($sp) -/* 02FB8 80AE0D08 AFA70054 */ sw $a3, 0x0054($sp) -/* 02FBC 80AE0D0C 0C018A29 */ jal func_800628A4 -/* 02FC0 80AE0D10 26050308 */ addiu $a1, $s0, 0x0308 ## $a1 = 00000308 -/* 02FC4 80AE0D14 8E0E0190 */ lw $t6, 0x0190($s0) ## 00000190 -/* 02FC8 80AE0D18 3C0880AE */ lui $t0, %hi(func_80ADF15C) ## $t0 = 80AE0000 -/* 02FCC 80AE0D1C 2508F15C */ addiu $t0, $t0, %lo(func_80ADF15C) ## $t0 = 80ADF15C -/* 02FD0 80AE0D20 550E0026 */ bnel $t0, $t6, .L80AE0DBC -/* 02FD4 80AE0D24 8E0902A4 */ lw $t1, 0x02A4($s0) ## 000002A4 -/* 02FD8 80AE0D28 860F0198 */ lh $t7, 0x0198($s0) ## 00000198 -/* 02FDC 80AE0D2C 29E10002 */ slti $at, $t7, 0x0002 -/* 02FE0 80AE0D30 54200022 */ bnel $at, $zero, .L80AE0DBC -/* 02FE4 80AE0D34 8E0902A4 */ lw $t1, 0x02A4($s0) ## 000002A4 -/* 02FE8 80AE0D38 8E1902A4 */ lw $t9, 0x02A4($s0) ## 000002A4 -/* 02FEC 80AE0D3C 8FB8004C */ lw $t8, 0x004C($sp) -/* 02FF0 80AE0D40 8FA7005C */ lw $a3, 0x005C($sp) -/* 02FF4 80AE0D44 93290007 */ lbu $t1, 0x0007($t9) ## 00000007 -/* 02FF8 80AE0D48 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 02FFC 80AE0D4C 5709001B */ bnel $t8, $t1, .L80AE0DBC -/* 03000 80AE0D50 8E0902A4 */ lw $t1, 0x02A4($s0) ## 000002A4 -/* 03004 80AE0D54 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 03008 80AE0D58 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 0300C 80AE0D5C 3C0580AE */ lui $a1, %hi(D_80AE1B80) ## $a1 = 80AE0000 -/* 03010 80AE0D60 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03014 80AE0D64 ACEA0000 */ sw $t2, 0x0000($a3) ## 00000000 -/* 03018 80AE0D68 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0301C 80AE0D6C 8FAC0048 */ lw $t4, 0x0048($sp) -/* 03020 80AE0D70 24A51B80 */ addiu $a1, $a1, %lo(D_80AE1B80) ## $a1 = 80AE1B80 -/* 03024 80AE0D74 2406099C */ addiu $a2, $zero, 0x099C ## $a2 = 0000099C -/* 03028 80AE0D78 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0302C 80AE0D7C AFA80034 */ sw $t0, 0x0034($sp) -/* 03030 80AE0D80 0C0346A2 */ jal Matrix_NewMtx -/* 03034 80AE0D84 AFA20040 */ sw $v0, 0x0040($sp) -/* 03038 80AE0D88 8FA30040 */ lw $v1, 0x0040($sp) -/* 0303C 80AE0D8C 8FA7005C */ lw $a3, 0x005C($sp) -/* 03040 80AE0D90 8FA80034 */ lw $t0, 0x0034($sp) -/* 03044 80AE0D94 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03048 80AE0D98 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 -/* 0304C 80AE0D9C 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 03050 80AE0DA0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03054 80AE0DA4 ACED0000 */ sw $t5, 0x0000($a3) ## 00000000 -/* 03058 80AE0DA8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0305C 80AE0DAC 8E0F02A4 */ lw $t7, 0x02A4($s0) ## 000002A4 -/* 03060 80AE0DB0 8DF90020 */ lw $t9, 0x0020($t7) ## 00000020 -/* 03064 80AE0DB4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03068 80AE0DB8 8E0902A4 */ lw $t1, 0x02A4($s0) ## 000002A4 -.L80AE0DBC: -/* 0306C 80AE0DBC 8FB8004C */ lw $t8, 0x004C($sp) -/* 03070 80AE0DC0 912A0006 */ lbu $t2, 0x0006($t1) ## 00000006 -/* 03074 80AE0DC4 570A0043 */ bnel $t8, $t2, .L80AE0ED4 -/* 03078 80AE0DC8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0307C 80AE0DCC 8E0B0190 */ lw $t3, 0x0190($s0) ## 00000190 -/* 03080 80AE0DD0 550B0015 */ bnel $t0, $t3, .L80AE0E28 -/* 03084 80AE0DD4 26040368 */ addiu $a0, $s0, 0x0368 ## $a0 = 00000368 -/* 03088 80AE0DD8 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 -/* 0308C 80AE0DDC 29810013 */ slti $at, $t4, 0x0013 -/* 03090 80AE0DE0 54200011 */ bnel $at, $zero, .L80AE0E28 -/* 03094 80AE0DE4 26040368 */ addiu $a0, $s0, 0x0368 ## $a0 = 00000368 -/* 03098 80AE0DE8 C6000050 */ lwc1 $f0, 0x0050($s0) ## 00000050 -/* 0309C 80AE0DEC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 030A0 80AE0DF0 3C0180AE */ lui $at, %hi(D_80AE1C68) ## $at = 80AE0000 -/* 030A4 80AE0DF4 46002032 */ c.eq.s $f4, $f0 -/* 030A8 80AE0DF8 00000000 */ nop -/* 030AC 80AE0DFC 4503000A */ bc1tl .L80AE0E28 -/* 030B0 80AE0E00 26040368 */ addiu $a0, $s0, 0x0368 ## $a0 = 00000368 -/* 030B4 80AE0E04 C4261C68 */ lwc1 $f6, %lo(D_80AE1C68)($at) -/* 030B8 80AE0E08 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 030BC 80AE0E0C AFA80034 */ sw $t0, 0x0034($sp) -/* 030C0 80AE0E10 46003303 */ div.s $f12, $f6, $f0 -/* 030C4 80AE0E14 44066000 */ mfc1 $a2, $f12 -/* 030C8 80AE0E18 0C0342A3 */ jal Matrix_Scale -/* 030CC 80AE0E1C 46006386 */ mov.s $f14, $f12 -/* 030D0 80AE0E20 8FA80034 */ lw $t0, 0x0034($sp) -/* 030D4 80AE0E24 26040368 */ addiu $a0, $s0, 0x0368 ## $a0 = 00000368 -.L80AE0E28: -/* 030D8 80AE0E28 0C034236 */ jal Matrix_Get -/* 030DC 80AE0E2C AFA80034 */ sw $t0, 0x0034($sp) -/* 030E0 80AE0E30 8FA80034 */ lw $t0, 0x0034($sp) -/* 030E4 80AE0E34 8E0D0190 */ lw $t5, 0x0190($s0) ## 00000190 -/* 030E8 80AE0E38 550D000C */ bnel $t0, $t5, .L80AE0E6C -/* 030EC 80AE0E3C 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 -/* 030F0 80AE0E40 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 -/* 030F4 80AE0E44 2401001B */ addiu $at, $zero, 0x001B ## $at = 0000001B -/* 030F8 80AE0E48 55C10008 */ bnel $t6, $at, .L80AE0E6C -/* 030FC 80AE0E4C 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 -/* 03100 80AE0E50 C6080398 */ lwc1 $f8, 0x0398($s0) ## 00000398 -/* 03104 80AE0E54 C60A039C */ lwc1 $f10, 0x039C($s0) ## 0000039C -/* 03108 80AE0E58 C61003A0 */ lwc1 $f16, 0x03A0($s0) ## 000003A0 -/* 0310C 80AE0E5C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 03110 80AE0E60 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 03114 80AE0E64 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 03118 80AE0E68 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 -.L80AE0E6C: -/* 0311C 80AE0E6C 920F029E */ lbu $t7, 0x029E($s0) ## 0000029E -/* 03120 80AE0E70 260402AC */ addiu $a0, $s0, 0x02AC ## $a0 = 000002AC -/* 03124 80AE0E74 84450030 */ lh $a1, 0x0030($v0) ## 00000030 -/* 03128 80AE0E78 84460032 */ lh $a2, 0x0032($v0) ## 00000032 -/* 0312C 80AE0E7C 84470034 */ lh $a3, 0x0034($v0) ## 00000034 -/* 03130 80AE0E80 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03134 80AE0E84 9219029F */ lbu $t9, 0x029F($s0) ## 0000029F -/* 03138 80AE0E88 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 0313C 80AE0E8C AFB90014 */ sw $t9, 0x0014($sp) -/* 03140 80AE0E90 920902A0 */ lbu $t1, 0x02A0($s0) ## 000002A0 -/* 03144 80AE0E94 AFA90018 */ sw $t1, 0x0018($sp) -/* 03148 80AE0E98 921802A1 */ lbu $t8, 0x02A1($s0) ## 000002A1 -/* 0314C 80AE0E9C 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 -/* 03150 80AE0EA0 07010004 */ bgez $t8, .L80AE0EB4 -/* 03154 80AE0EA4 46809120 */ cvt.s.w $f4, $f18 -/* 03158 80AE0EA8 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 0315C 80AE0EAC 00000000 */ nop -/* 03160 80AE0EB0 46062100 */ add.s $f4, $f4, $f6 -.L80AE0EB4: -/* 03164 80AE0EB4 3C0180AE */ lui $at, %hi(D_80AE1C6C) ## $at = 80AE0000 -/* 03168 80AE0EB8 C4281C6C */ lwc1 $f8, %lo(D_80AE1C6C)($at) -/* 0316C 80AE0EBC 46082282 */ mul.s $f10, $f4, $f8 -/* 03170 80AE0EC0 4600540D */ trunc.w.s $f16, $f10 -/* 03174 80AE0EC4 440B8000 */ mfc1 $t3, $f16 -/* 03178 80AE0EC8 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 0317C 80AE0ECC AFAB001C */ sw $t3, 0x001C($sp) -/* 03180 80AE0ED0 8FBF002C */ lw $ra, 0x002C($sp) -.L80AE0ED4: -/* 03184 80AE0ED4 8FB00028 */ lw $s0, 0x0028($sp) -/* 03188 80AE0ED8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0318C 80AE0EDC 03E00008 */ jr $ra -/* 03190 80AE0EE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s deleted file mode 100644 index 77a48945f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s +++ /dev/null @@ -1,171 +0,0 @@ -.rdata -glabel D_80AE1B90 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BA0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BB0 - .asciz "../z_en_poh.c" - .balign 4 - -.text -glabel func_80AE0EE4 -/* 03194 80AE0EE4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03198 80AE0EE8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0319C 80AE0EEC AFB10028 */ sw $s1, 0x0028($sp) -/* 031A0 80AE0EF0 AFB00024 */ sw $s0, 0x0024($sp) -/* 031A4 80AE0EF4 AFA50074 */ sw $a1, 0x0074($sp) -/* 031A8 80AE0EF8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 031AC 80AE0EFC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 031B0 80AE0F00 3C0680AE */ lui $a2, %hi(D_80AE1B90) ## $a2 = 80AE0000 -/* 031B4 80AE0F04 24C61B90 */ addiu $a2, $a2, %lo(D_80AE1B90) ## $a2 = 80AE1B90 -/* 031B8 80AE0F08 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 031BC 80AE0F0C 24070A45 */ addiu $a3, $zero, 0x0A45 ## $a3 = 00000A45 -/* 031C0 80AE0F10 0C031AB1 */ jal Graph_OpenDisps -/* 031C4 80AE0F14 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 031C8 80AE0F18 0C2B819F */ jal func_80AE067C -/* 031CC 80AE0F1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 031D0 80AE0F20 8FAF0074 */ lw $t7, 0x0074($sp) -/* 031D4 80AE0F24 0C024F46 */ jal func_80093D18 -/* 031D8 80AE0F28 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 031DC 80AE0F2C 8FB80074 */ lw $t8, 0x0074($sp) -/* 031E0 80AE0F30 0C024F61 */ jal func_80093D84 -/* 031E4 80AE0F34 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 031E8 80AE0F38 9222029D */ lbu $v0, 0x029D($s1) ## 0000029D -/* 031EC 80AE0F3C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 031F0 80AE0F40 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 031F4 80AE0F44 10410003 */ beq $v0, $at, .L80AE0F54 -/* 031F8 80AE0F48 3C188011 */ lui $t8, %hi(D_80116280+0x10) -/* 031FC 80AE0F4C 14400026 */ bne $v0, $zero, .L80AE0FE8 -/* 03200 80AE0F50 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -.L80AE0F54: -/* 03204 80AE0F54 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03208 80AE0F58 27186290 */ addiu $t8, %lo(D_80116280+0x10) -/* 0320C 80AE0F5C 3C0780AE */ lui $a3, %hi(func_80AE0BF8) ## $a3 = 80AE0000 -/* 03210 80AE0F60 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03214 80AE0F64 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 03218 80AE0F68 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0321C 80AE0F6C 922D029B */ lbu $t5, 0x029B($s1) ## 0000029B -/* 03220 80AE0F70 922A029A */ lbu $t2, 0x029A($s1) ## 0000029A -/* 03224 80AE0F74 9239029C */ lbu $t9, 0x029C($s1) ## 0000029C -/* 03228 80AE0F78 922C029D */ lbu $t4, 0x029D($s1) ## 0000029D -/* 0322C 80AE0F7C 000D7400 */ sll $t6, $t5, 16 -/* 03230 80AE0F80 000A5E00 */ sll $t3, $t2, 24 -/* 03234 80AE0F84 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000000 -/* 03238 80AE0F88 00194200 */ sll $t0, $t9, 8 -/* 0323C 80AE0F8C 01E84825 */ or $t1, $t7, $t0 ## $t1 = FB000000 -/* 03240 80AE0F90 012C6825 */ or $t5, $t1, $t4 ## $t5 = FB000000 -/* 03244 80AE0F94 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 03248 80AE0F98 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0324C 80AE0F9C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 03250 80AE0FA0 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 03254 80AE0FA4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03258 80AE0FA8 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 0325C 80AE0FAC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03260 80AE0FB0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03264 80AE0FB4 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 03268 80AE0FB8 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 0326C 80AE0FBC 3C1980AE */ lui $t9, %hi(func_80AE0CE8) ## $t9 = 80AE0000 -/* 03270 80AE0FC0 27390CE8 */ addiu $t9, $t9, %lo(func_80AE0CE8) ## $t9 = 80AE0CE8 -/* 03274 80AE0FC4 AFB90010 */ sw $t9, 0x0010($sp) -/* 03278 80AE0FC8 AFB10014 */ sw $s1, 0x0014($sp) -/* 0327C 80AE0FCC 8E0F02C0 */ lw $t7, 0x02C0($s0) ## 000002C0 -/* 03280 80AE0FD0 8FA40074 */ lw $a0, 0x0074($sp) -/* 03284 80AE0FD4 24E70BF8 */ addiu $a3, $a3, %lo(func_80AE0BF8) ## $a3 = 80AE0BF8 -/* 03288 80AE0FD8 0C0288A2 */ jal SkelAnime_Draw -/* 0328C 80AE0FDC AFAF0018 */ sw $t7, 0x0018($sp) -/* 03290 80AE0FE0 1000001F */ beq $zero, $zero, .L80AE1060 -/* 03294 80AE0FE4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -.L80AE0FE8: -/* 03298 80AE0FE8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 0329C 80AE0FEC 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 -/* 032A0 80AE0FF0 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 032A4 80AE0FF4 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 -/* 032A8 80AE0FF8 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 032AC 80AE0FFC AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 032B0 80AE1000 922C029D */ lbu $t4, 0x029D($s1) ## 0000029D -/* 032B4 80AE1004 3C188011 */ lui $t8, %hi(D_80116280) -/* 032B8 80AE1008 27186280 */ addiu $t8, %lo(D_80116280) -/* 032BC 80AE100C 01816825 */ or $t5, $t4, $at ## $t5 = FFFFFF00 -/* 032C0 80AE1010 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 032C4 80AE1014 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 032C8 80AE1018 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 032CC 80AE101C 3C1980AE */ lui $t9, %hi(func_80AE0CE8) ## $t9 = 80AE0000 -/* 032D0 80AE1020 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 032D4 80AE1024 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 032D8 80AE1028 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 032DC 80AE102C AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 032E0 80AE1030 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 032E4 80AE1034 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 032E8 80AE1038 27390CE8 */ addiu $t9, $t9, %lo(func_80AE0CE8) ## $t9 = 80AE0CE8 -/* 032EC 80AE103C AFB90010 */ sw $t9, 0x0010($sp) -/* 032F0 80AE1040 AFB10014 */ sw $s1, 0x0014($sp) -/* 032F4 80AE1044 8E0F02D0 */ lw $t7, 0x02D0($s0) ## 000002D0 -/* 032F8 80AE1048 3C0780AE */ lui $a3, %hi(func_80AE0BF8) ## $a3 = 80AE0000 -/* 032FC 80AE104C 24E70BF8 */ addiu $a3, $a3, %lo(func_80AE0BF8) ## $a3 = 80AE0BF8 -/* 03300 80AE1050 8FA40074 */ lw $a0, 0x0074($sp) -/* 03304 80AE1054 0C0288A2 */ jal SkelAnime_Draw -/* 03308 80AE1058 AFAF0018 */ sw $t7, 0x0018($sp) -/* 0330C 80AE105C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -.L80AE1060: -/* 03310 80AE1060 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03314 80AE1064 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 03318 80AE1068 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 0331C 80AE106C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 03320 80AE1070 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 03324 80AE1074 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 03328 80AE1078 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0332C 80AE107C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03330 80AE1080 26240368 */ addiu $a0, $s1, 0x0368 ## $a0 = 00000368 -/* 03334 80AE1084 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 03338 80AE1088 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 0333C 80AE108C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 03340 80AE1090 9239029F */ lbu $t9, 0x029F($s1) ## 0000029F -/* 03344 80AE1094 922B029E */ lbu $t3, 0x029E($s1) ## 0000029E -/* 03348 80AE1098 922902A0 */ lbu $t1, 0x02A0($s1) ## 000002A0 -/* 0334C 80AE109C 00197C00 */ sll $t7, $t9, 16 -/* 03350 80AE10A0 000B7600 */ sll $t6, $t3, 24 -/* 03354 80AE10A4 01CF4025 */ or $t0, $t6, $t7 ## $t0 = 00000000 -/* 03358 80AE10A8 00096200 */ sll $t4, $t1, 8 -/* 0335C 80AE10AC 010C6825 */ or $t5, $t0, $t4 ## $t5 = FB000000 -/* 03360 80AE10B0 35AB00FF */ ori $t3, $t5, 0x00FF ## $t3 = FB0000FF -/* 03364 80AE10B4 0C03423F */ jal Matrix_Put -/* 03368 80AE10B8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0336C 80AE10BC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03370 80AE10C0 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 03374 80AE10C4 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 03378 80AE10C8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0337C 80AE10CC AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 03380 80AE10D0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03384 80AE10D4 8FAE0074 */ lw $t6, 0x0074($sp) -/* 03388 80AE10D8 3C0580AE */ lui $a1, %hi(D_80AE1BA0) ## $a1 = 80AE0000 -/* 0338C 80AE10DC 24A51BA0 */ addiu $a1, $a1, %lo(D_80AE1BA0) ## $a1 = 80AE1BA0 -/* 03390 80AE10E0 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 03394 80AE10E4 24060A74 */ addiu $a2, $zero, 0x0A74 ## $a2 = 00000A74 -/* 03398 80AE10E8 0C0346A2 */ jal Matrix_NewMtx -/* 0339C 80AE10EC AFA2003C */ sw $v0, 0x003C($sp) -/* 033A0 80AE10F0 8FA3003C */ lw $v1, 0x003C($sp) -/* 033A4 80AE10F4 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 033A8 80AE10F8 3C0680AE */ lui $a2, %hi(D_80AE1BB0) ## $a2 = 80AE0000 -/* 033AC 80AE10FC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 033B0 80AE1100 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 033B4 80AE1104 24C61BB0 */ addiu $a2, $a2, %lo(D_80AE1BB0) ## $a2 = 80AE1BB0 -/* 033B8 80AE1108 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 033BC 80AE110C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 033C0 80AE1110 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 033C4 80AE1114 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 033C8 80AE1118 8E2902A4 */ lw $t1, 0x02A4($s1) ## 000002A4 -/* 033CC 80AE111C 24070A79 */ addiu $a3, $zero, 0x0A79 ## $a3 = 00000A79 -/* 033D0 80AE1120 8D28001C */ lw $t0, 0x001C($t1) ## 0000001C -/* 033D4 80AE1124 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 033D8 80AE1128 8FAC0074 */ lw $t4, 0x0074($sp) -/* 033DC 80AE112C 0C031AD5 */ jal Graph_CloseDisps -/* 033E0 80AE1130 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 033E4 80AE1134 8FBF002C */ lw $ra, 0x002C($sp) -/* 033E8 80AE1138 8FB00024 */ lw $s0, 0x0024($sp) -/* 033EC 80AE113C 8FB10028 */ lw $s1, 0x0028($sp) -/* 033F0 80AE1140 03E00008 */ jr $ra -/* 033F4 80AE1144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s deleted file mode 100644 index 036e151745..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s +++ /dev/null @@ -1,322 +0,0 @@ -.rdata -glabel D_80AE1BC0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BD0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1BE0 - .asciz "../z_en_poh.c" - .balign 4 - -.text -glabel func_80AE1148 -/* 033F8 80AE1148 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 033FC 80AE114C AFBF002C */ sw $ra, 0x002C($sp) -/* 03400 80AE1150 AFB10028 */ sw $s1, 0x0028($sp) -/* 03404 80AE1154 AFB00024 */ sw $s0, 0x0024($sp) -/* 03408 80AE1158 AFA5009C */ sw $a1, 0x009C($sp) -/* 0340C 80AE115C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03410 80AE1160 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 03414 80AE1164 3C0680AE */ lui $a2, %hi(D_80AE1BC0) ## $a2 = 80AE0000 -/* 03418 80AE1168 24C61BC0 */ addiu $a2, $a2, %lo(D_80AE1BC0) ## $a2 = 80AE1BC0 -/* 0341C 80AE116C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 -/* 03420 80AE1170 24070A86 */ addiu $a3, $zero, 0x0A86 ## $a3 = 00000A86 -/* 03424 80AE1174 0C031AB1 */ jal Graph_OpenDisps -/* 03428 80AE1178 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0342C 80AE117C 0C2B819F */ jal func_80AE067C -/* 03430 80AE1180 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03434 80AE1184 862F001C */ lh $t7, 0x001C($s1) ## 0000001C -/* 03438 80AE1188 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0343C 80AE118C 3C1980AE */ lui $t9, %hi(D_80AE1B50) ## $t9 = 80AE0000 -/* 03440 80AE1190 15E10007 */ bne $t7, $at, .L80AE11B0 -/* 03444 80AE1194 27391B50 */ addiu $t9, $t9, %lo(D_80AE1B50) ## $t9 = 80AE1B50 -/* 03448 80AE1198 3C1880AE */ lui $t8, %hi(D_80AE1B4C) ## $t8 = 80AE0000 -/* 0344C 80AE119C 27181B4C */ addiu $t8, $t8, %lo(D_80AE1B4C) ## $t8 = 80AE1B4C -/* 03450 80AE11A0 3C0880AE */ lui $t0, %hi(D_80AE1B54) ## $t0 = 80AE0000 -/* 03454 80AE11A4 AFB80090 */ sw $t8, 0x0090($sp) -/* 03458 80AE11A8 10000004 */ beq $zero, $zero, .L80AE11BC -/* 0345C 80AE11AC 25081B54 */ addiu $t0, $t0, %lo(D_80AE1B54) ## $t0 = 80AE1B54 -.L80AE11B0: -/* 03460 80AE11B0 3C0880AE */ lui $t0, %hi(D_80AE1B58) ## $t0 = 80AE0000 -/* 03464 80AE11B4 AFB90090 */ sw $t9, 0x0090($sp) -/* 03468 80AE11B8 25081B58 */ addiu $t0, $t0, %lo(D_80AE1B58) ## $t0 = 80AE1B58 -.L80AE11BC: -/* 0346C 80AE11BC 9222029D */ lbu $v0, 0x029D($s1) ## 0000029D -/* 03470 80AE11C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 03474 80AE11C4 8FAA009C */ lw $t2, 0x009C($sp) -/* 03478 80AE11C8 50410004 */ beql $v0, $at, .L80AE11DC -/* 0347C 80AE11CC 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 03480 80AE11D0 14400056 */ bne $v0, $zero, .L80AE132C -/* 03484 80AE11D4 8FAD009C */ lw $t5, 0x009C($sp) -/* 03488 80AE11D8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -.L80AE11DC: -/* 0348C 80AE11DC 0C024F46 */ jal func_80093D18 -/* 03490 80AE11E0 AFA8008C */ sw $t0, 0x008C($sp) -/* 03494 80AE11E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03498 80AE11E8 8FA8008C */ lw $t0, 0x008C($sp) -/* 0349C 80AE11EC 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 034A0 80AE11F0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 034A4 80AE11F4 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 034A8 80AE11F8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 034AC 80AE11FC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 034B0 80AE1200 8FAD009C */ lw $t5, 0x009C($sp) -/* 034B4 80AE1204 922E029D */ lbu $t6, 0x029D($s1) ## 0000029D -/* 034B8 80AE1208 9227029C */ lbu $a3, 0x029C($s1) ## 0000029C -/* 034BC 80AE120C 9226029B */ lbu $a2, 0x029B($s1) ## 0000029B -/* 034C0 80AE1210 9225029A */ lbu $a1, 0x029A($s1) ## 0000029A -/* 034C4 80AE1214 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 034C8 80AE1218 AFA20074 */ sw $v0, 0x0074($sp) -/* 034CC 80AE121C AFA8008C */ sw $t0, 0x008C($sp) -/* 034D0 80AE1220 0C025474 */ jal Gfx_EnvColor -/* 034D4 80AE1224 AFAE0010 */ sw $t6, 0x0010($sp) -/* 034D8 80AE1228 8FA30074 */ lw $v1, 0x0074($sp) -/* 034DC 80AE122C 8FA8008C */ lw $t0, 0x008C($sp) -/* 034E0 80AE1230 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 034E4 80AE1234 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 034E8 80AE1238 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 034EC 80AE123C 8FA90090 */ lw $t1, 0x0090($sp) -/* 034F0 80AE1240 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 034F4 80AE1244 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 034F8 80AE1248 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 034FC 80AE124C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03500 80AE1250 8FB9009C */ lw $t9, 0x009C($sp) -/* 03504 80AE1254 922A029D */ lbu $t2, 0x029D($s1) ## 0000029D -/* 03508 80AE1258 91270002 */ lbu $a3, 0x0002($t1) ## 00000002 -/* 0350C 80AE125C 91260001 */ lbu $a2, 0x0001($t1) ## 00000001 -/* 03510 80AE1260 91250000 */ lbu $a1, 0x0000($t1) ## 00000000 -/* 03514 80AE1264 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 03518 80AE1268 AFA8008C */ sw $t0, 0x008C($sp) -/* 0351C 80AE126C AFA20070 */ sw $v0, 0x0070($sp) -/* 03520 80AE1270 0C025474 */ jal Gfx_EnvColor -/* 03524 80AE1274 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03528 80AE1278 8FA30070 */ lw $v1, 0x0070($sp) -/* 0352C 80AE127C 8FA8008C */ lw $t0, 0x008C($sp) -/* 03530 80AE1280 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 03534 80AE1284 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03538 80AE1288 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0353C 80AE128C 358C002C */ ori $t4, $t4, 0x002C ## $t4 = DB06002C -/* 03540 80AE1290 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03544 80AE1294 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 -/* 03548 80AE1298 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0354C 80AE129C 8FAD009C */ lw $t5, 0x009C($sp) -/* 03550 80AE12A0 922E029D */ lbu $t6, 0x029D($s1) ## 0000029D -/* 03554 80AE12A4 91070002 */ lbu $a3, 0x0002($t0) ## 00000002 -/* 03558 80AE12A8 91060001 */ lbu $a2, 0x0001($t0) ## 00000001 -/* 0355C 80AE12AC 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 -/* 03560 80AE12B0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 03564 80AE12B4 AFA2006C */ sw $v0, 0x006C($sp) -/* 03568 80AE12B8 0C025474 */ jal Gfx_EnvColor -/* 0356C 80AE12BC AFAE0010 */ sw $t6, 0x0010($sp) -/* 03570 80AE12C0 8FA3006C */ lw $v1, 0x006C($sp) -/* 03574 80AE12C4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 03578 80AE12C8 3C198011 */ lui $t9, %hi(D_80116280+0x10) -/* 0357C 80AE12CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03580 80AE12D0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03584 80AE12D4 27396290 */ addiu $t9, %lo(D_80116280+0x10) -/* 03588 80AE12D8 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 -/* 0358C 80AE12DC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03590 80AE12E0 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 03594 80AE12E4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03598 80AE12E8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0359C 80AE12EC 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E -/* 035A0 80AE12F0 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 035A4 80AE12F4 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 035A8 80AE12F8 3C0A80AE */ lui $t2, %hi(func_80AE0BF8) ## $t2 = 80AE0000 -/* 035AC 80AE12FC 3C0B80AE */ lui $t3, %hi(func_80AE0CE8) ## $t3 = 80AE0000 -/* 035B0 80AE1300 256B0CE8 */ addiu $t3, $t3, %lo(func_80AE0CE8) ## $t3 = 80AE0CE8 -/* 035B4 80AE1304 254A0BF8 */ addiu $t2, $t2, %lo(func_80AE0BF8) ## $t2 = 80AE0BF8 -/* 035B8 80AE1308 AFAA0010 */ sw $t2, 0x0010($sp) -/* 035BC 80AE130C AFAB0014 */ sw $t3, 0x0014($sp) -/* 035C0 80AE1310 AFB10018 */ sw $s1, 0x0018($sp) -/* 035C4 80AE1314 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 035C8 80AE1318 8FA4009C */ lw $a0, 0x009C($sp) -/* 035CC 80AE131C 0C0289CF */ jal SkelAnime_DrawFlex -/* 035D0 80AE1320 AFAC001C */ sw $t4, 0x001C($sp) -/* 035D4 80AE1324 10000058 */ beq $zero, $zero, .L80AE1488 -/* 035D8 80AE1328 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -.L80AE132C: -/* 035DC 80AE132C 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 035E0 80AE1330 0C024F46 */ jal func_80093D18 -/* 035E4 80AE1334 AFA8008C */ sw $t0, 0x008C($sp) -/* 035E8 80AE1338 8FAE009C */ lw $t6, 0x009C($sp) -/* 035EC 80AE133C 0C024F61 */ jal func_80093D84 -/* 035F0 80AE1340 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 035F4 80AE1344 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 035F8 80AE1348 8FA8008C */ lw $t0, 0x008C($sp) -/* 035FC 80AE134C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 03600 80AE1350 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 03604 80AE1354 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 03608 80AE1358 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 0360C 80AE135C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03610 80AE1360 8FB9009C */ lw $t9, 0x009C($sp) -/* 03614 80AE1364 922A029D */ lbu $t2, 0x029D($s1) ## 0000029D -/* 03618 80AE1368 9227029C */ lbu $a3, 0x029C($s1) ## 0000029C -/* 0361C 80AE136C 9226029B */ lbu $a2, 0x029B($s1) ## 0000029B -/* 03620 80AE1370 9225029A */ lbu $a1, 0x029A($s1) ## 0000029A -/* 03624 80AE1374 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 03628 80AE1378 AFA20064 */ sw $v0, 0x0064($sp) -/* 0362C 80AE137C AFA8008C */ sw $t0, 0x008C($sp) -/* 03630 80AE1380 0C025474 */ jal Gfx_EnvColor -/* 03634 80AE1384 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03638 80AE1388 8FA30064 */ lw $v1, 0x0064($sp) -/* 0363C 80AE138C 8FA8008C */ lw $t0, 0x008C($sp) -/* 03640 80AE1390 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 03644 80AE1394 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03648 80AE1398 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0364C 80AE139C 358C0028 */ ori $t4, $t4, 0x0028 ## $t4 = DB060028 -/* 03650 80AE13A0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03654 80AE13A4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 03658 80AE13A8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0365C 80AE13AC 8FAE0090 */ lw $t6, 0x0090($sp) -/* 03660 80AE13B0 8FAD009C */ lw $t5, 0x009C($sp) -/* 03664 80AE13B4 922F029D */ lbu $t7, 0x029D($s1) ## 0000029D -/* 03668 80AE13B8 91C50000 */ lbu $a1, 0x0000($t6) ## 00000000 -/* 0366C 80AE13BC 91C60001 */ lbu $a2, 0x0001($t6) ## 00000001 -/* 03670 80AE13C0 91C70002 */ lbu $a3, 0x0002($t6) ## 00000002 -/* 03674 80AE13C4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 03678 80AE13C8 AFA8008C */ sw $t0, 0x008C($sp) -/* 0367C 80AE13CC AFA20060 */ sw $v0, 0x0060($sp) -/* 03680 80AE13D0 0C025474 */ jal Gfx_EnvColor -/* 03684 80AE13D4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03688 80AE13D8 8FA30060 */ lw $v1, 0x0060($sp) -/* 0368C 80AE13DC 8FA8008C */ lw $t0, 0x008C($sp) -/* 03690 80AE13E0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 03694 80AE13E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03698 80AE13E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0369C 80AE13EC 3739002C */ ori $t9, $t9, 0x002C ## $t9 = DB06002C -/* 036A0 80AE13F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 036A4 80AE13F4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 036A8 80AE13F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 036AC 80AE13FC 8FAA009C */ lw $t2, 0x009C($sp) -/* 036B0 80AE1400 922B029D */ lbu $t3, 0x029D($s1) ## 0000029D -/* 036B4 80AE1404 91070002 */ lbu $a3, 0x0002($t0) ## 00000002 -/* 036B8 80AE1408 91060001 */ lbu $a2, 0x0001($t0) ## 00000001 -/* 036BC 80AE140C 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 -/* 036C0 80AE1410 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 036C4 80AE1414 AFA2005C */ sw $v0, 0x005C($sp) -/* 036C8 80AE1418 0C025474 */ jal Gfx_EnvColor -/* 036CC 80AE141C AFAB0010 */ sw $t3, 0x0010($sp) -/* 036D0 80AE1420 8FA3005C */ lw $v1, 0x005C($sp) -/* 036D4 80AE1424 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 036D8 80AE1428 3C0E8011 */ lui $t6, %hi(D_80116280) -/* 036DC 80AE142C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 036E0 80AE1430 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 036E4 80AE1434 25CE6280 */ addiu $t6, %lo(D_80116280) -/* 036E8 80AE1438 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 -/* 036EC 80AE143C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 036F0 80AE1440 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 036F4 80AE1444 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 036F8 80AE1448 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 036FC 80AE144C 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E -/* 03700 80AE1450 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C -/* 03704 80AE1454 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 03708 80AE1458 3C0F80AE */ lui $t7, %hi(func_80AE0BF8) ## $t7 = 80AE0000 -/* 0370C 80AE145C 3C1880AE */ lui $t8, %hi(func_80AE0CE8) ## $t8 = 80AE0000 -/* 03710 80AE1460 27180CE8 */ addiu $t8, $t8, %lo(func_80AE0CE8) ## $t8 = 80AE0CE8 -/* 03714 80AE1464 25EF0BF8 */ addiu $t7, $t7, %lo(func_80AE0BF8) ## $t7 = 80AE0BF8 -/* 03718 80AE1468 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0371C 80AE146C AFB80014 */ sw $t8, 0x0014($sp) -/* 03720 80AE1470 AFB10018 */ sw $s1, 0x0018($sp) -/* 03724 80AE1474 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 03728 80AE1478 8FA4009C */ lw $a0, 0x009C($sp) -/* 0372C 80AE147C 0C0289CF */ jal SkelAnime_DrawFlex -/* 03730 80AE1480 AFB9001C */ sw $t9, 0x001C($sp) -/* 03734 80AE1484 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -.L80AE1488: -/* 03738 80AE1488 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0373C 80AE148C 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 -/* 03740 80AE1490 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 03744 80AE1494 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 03748 80AE1498 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 0374C 80AE149C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 03750 80AE14A0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03754 80AE14A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03758 80AE14A8 26240368 */ addiu $a0, $s1, 0x0368 ## $a0 = 00000368 -/* 0375C 80AE14AC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03760 80AE14B0 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 03764 80AE14B4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03768 80AE14B8 922F029E */ lbu $t7, 0x029E($s1) ## 0000029E -/* 0376C 80AE14BC 922A029F */ lbu $t2, 0x029F($s1) ## 0000029F -/* 03770 80AE14C0 922E02A0 */ lbu $t6, 0x02A0($s1) ## 000002A0 -/* 03774 80AE14C4 000FC600 */ sll $t8, $t7, 24 -/* 03778 80AE14C8 000A5C00 */ sll $t3, $t2, 16 -/* 0377C 80AE14CC 030B6025 */ or $t4, $t8, $t3 ## $t4 = E7000000 -/* 03780 80AE14D0 000E7A00 */ sll $t7, $t6, 8 -/* 03784 80AE14D4 018FC825 */ or $t9, $t4, $t7 ## $t9 = E7000000 -/* 03788 80AE14D8 372A00FF */ ori $t2, $t9, 0x00FF ## $t2 = E70000FF -/* 0378C 80AE14DC 0C03423F */ jal Matrix_Put -/* 03790 80AE14E0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 03794 80AE14E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03798 80AE14E8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 0379C 80AE14EC 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 037A0 80AE14F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 037A4 80AE14F4 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 037A8 80AE14F8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 037AC 80AE14FC 8FAD009C */ lw $t5, 0x009C($sp) -/* 037B0 80AE1500 3C0580AE */ lui $a1, %hi(D_80AE1BD0) ## $a1 = 80AE0000 -/* 037B4 80AE1504 24A51BD0 */ addiu $a1, $a1, %lo(D_80AE1BD0) ## $a1 = 80AE1BD0 -/* 037B8 80AE1508 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 037BC 80AE150C 24060AE3 */ addiu $a2, $zero, 0x0AE3 ## $a2 = 00000AE3 -/* 037C0 80AE1510 0C0346A2 */ jal Matrix_NewMtx -/* 037C4 80AE1514 AFA2004C */ sw $v0, 0x004C($sp) -/* 037C8 80AE1518 8FA3004C */ lw $v1, 0x004C($sp) -/* 037CC 80AE151C 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 -/* 037D0 80AE1520 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 -/* 037D4 80AE1524 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 037D8 80AE1528 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 037DC 80AE152C 254A4498 */ addiu $t2, $t2, 0x4498 ## $t2 = 06004498 -/* 037E0 80AE1530 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 -/* 037E4 80AE1534 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 037E8 80AE1538 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 -/* 037EC 80AE153C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 037F0 80AE1540 8E2C02A4 */ lw $t4, 0x02A4($s1) ## 000002A4 -/* 037F4 80AE1544 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 037F8 80AE1548 3C0680AE */ lui $a2, %hi(D_80AE1BE0) ## $a2 = 80AE0000 -/* 037FC 80AE154C 8D8F001C */ lw $t7, 0x001C($t4) ## 0000001C -/* 03800 80AE1550 24C61BE0 */ addiu $a2, $a2, %lo(D_80AE1BE0) ## $a2 = 80AE1BE0 -/* 03804 80AE1554 24070AF2 */ addiu $a3, $zero, 0x0AF2 ## $a3 = 00000AF2 -/* 03808 80AE1558 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 0380C 80AE155C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03810 80AE1560 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03814 80AE1564 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 03818 80AE1568 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 0381C 80AE156C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 03820 80AE1570 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03824 80AE1574 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03828 80AE1578 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 0382C 80AE157C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 03830 80AE1580 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03834 80AE1584 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03838 80AE1588 8FA50090 */ lw $a1, 0x0090($sp) -/* 0383C 80AE158C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03840 80AE1590 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 -/* 03844 80AE1594 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 03848 80AE1598 90AF0000 */ lbu $t7, 0x0000($a1) ## 00000000 -/* 0384C 80AE159C 90B80001 */ lbu $t8, 0x0001($a1) ## 00000001 -/* 03850 80AE15A0 90AC0002 */ lbu $t4, 0x0002($a1) ## 00000002 -/* 03854 80AE15A4 000FCE00 */ sll $t9, $t7, 24 -/* 03858 80AE15A8 00185C00 */ sll $t3, $t8, 16 -/* 0385C 80AE15AC 032B6825 */ or $t5, $t9, $t3 ## $t5 = E7000008 -/* 03860 80AE15B0 000C7A00 */ sll $t7, $t4, 8 -/* 03864 80AE15B4 01AF5025 */ or $t2, $t5, $t7 ## $t2 = E7000008 -/* 03868 80AE15B8 355800FF */ ori $t8, $t2, 0x00FF ## $t8 = E70000FF -/* 0386C 80AE15BC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03870 80AE15C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03874 80AE15C4 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 03878 80AE15C8 256B4530 */ addiu $t3, $t3, 0x4530 ## $t3 = 06004530 -/* 0387C 80AE15CC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03880 80AE15D0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 03884 80AE15D4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03888 80AE15D8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 0388C 80AE15DC 8FAE009C */ lw $t6, 0x009C($sp) -/* 03890 80AE15E0 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 -/* 03894 80AE15E4 0C031AD5 */ jal Graph_CloseDisps -/* 03898 80AE15E8 8DC50000 */ lw $a1, 0x0000($t6) ## FB000000 -/* 0389C 80AE15EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 038A0 80AE15F0 8FB00024 */ lw $s0, 0x0024($sp) -/* 038A4 80AE15F4 8FB10028 */ lw $s1, 0x0028($sp) -/* 038A8 80AE15F8 03E00008 */ jr $ra -/* 038AC 80AE15FC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s deleted file mode 100644 index f54dcbdaf4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AE1600 -/* 038B0 80AE1600 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 038B4 80AE1604 AFBF0014 */ sw $ra, 0x0014($sp) -/* 038B8 80AE1608 AFA40018 */ sw $a0, 0x0018($sp) -/* 038BC 80AE160C 8C990190 */ lw $t9, 0x0190($a0) ## 00000190 -/* 038C0 80AE1610 0320F809 */ jalr $ra, $t9 -/* 038C4 80AE1614 00000000 */ nop -/* 038C8 80AE1618 8FA40018 */ lw $a0, 0x0018($sp) -/* 038CC 80AE161C 3C0E80AE */ lui $t6, %hi(func_80ADF994) ## $t6 = 80AE0000 -/* 038D0 80AE1620 25CEF994 */ addiu $t6, $t6, %lo(func_80ADF994) ## $t6 = 80ADF994 -/* 038D4 80AE1624 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 -/* 038D8 80AE1628 11CF0004 */ beq $t6, $t7, .L80AE163C -/* 038DC 80AE162C 00000000 */ nop -/* 038E0 80AE1630 8498019A */ lh $t8, 0x019A($a0) ## 0000019A -/* 038E4 80AE1634 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 -/* 038E8 80AE1638 A488019A */ sh $t0, 0x019A($a0) ## 0000019A -.L80AE163C: -/* 038EC 80AE163C 0C2B8227 */ jal func_80AE089C -/* 038F0 80AE1640 00000000 */ nop -/* 038F4 80AE1644 8FBF0014 */ lw $ra, 0x0014($sp) -/* 038F8 80AE1648 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 038FC 80AE164C 03E00008 */ jr $ra -/* 03900 80AE1650 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s deleted file mode 100644 index a497b5af51..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s +++ /dev/null @@ -1,283 +0,0 @@ -.rdata -glabel D_80AE1BF0 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1C00 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1C10 - .asciz "../z_en_poh.c" - .balign 4 - -glabel D_80AE1C20 - .asciz "../z_en_poh.c" - .balign 4 - -.late_rodata -glabel D_80AE1C70 - .float 9.58738019108e-05 - -.text -glabel func_80AE1654 -/* 03904 80AE1654 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 03908 80AE1658 AFBF003C */ sw $ra, 0x003C($sp) -/* 0390C 80AE165C AFB10038 */ sw $s1, 0x0038($sp) -/* 03910 80AE1660 AFB00034 */ sw $s0, 0x0034($sp) -/* 03914 80AE1664 AFA5009C */ sw $a1, 0x009C($sp) -/* 03918 80AE1668 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0391C 80AE166C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03920 80AE1670 3C0680AE */ lui $a2, %hi(D_80AE1BF0) ## $a2 = 80AE0000 -/* 03924 80AE1674 24C61BF0 */ addiu $a2, $a2, %lo(D_80AE1BF0) ## $a2 = 80AE1BF0 -/* 03928 80AE1678 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 -/* 0392C 80AE167C 24070B11 */ addiu $a3, $zero, 0x0B11 ## $a3 = 00000B11 -/* 03930 80AE1680 0C031AB1 */ jal Graph_OpenDisps -/* 03934 80AE1684 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03938 80AE1688 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 -/* 0393C 80AE168C 3C0F80AE */ lui $t7, %hi(func_80ADF994) ## $t7 = 80AE0000 -/* 03940 80AE1690 25EFF994 */ addiu $t7, $t7, %lo(func_80ADF994) ## $t7 = 80ADF994 -/* 03944 80AE1694 15F80072 */ bne $t7, $t8, .L80AE1860 -/* 03948 80AE1698 8FB9009C */ lw $t9, 0x009C($sp) -/* 0394C 80AE169C 0C024F46 */ jal func_80093D18 -/* 03950 80AE16A0 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 03954 80AE16A4 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 03958 80AE16A8 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 -/* 0395C 80AE16AC 260402AC */ addiu $a0, $s0, 0x02AC ## $a0 = 000002AC -/* 03960 80AE16B0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 03964 80AE16B4 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 -/* 03968 80AE16B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0396C 80AE16BC 920E029F */ lbu $t6, 0x029F($s0) ## 0000029F -/* 03970 80AE16C0 920B029E */ lbu $t3, 0x029E($s0) ## 0000029E -/* 03974 80AE16C4 920802A0 */ lbu $t0, 0x02A0($s0) ## 000002A0 -/* 03978 80AE16C8 000E7C00 */ sll $t7, $t6, 16 -/* 0397C 80AE16CC 000B6600 */ sll $t4, $t3, 24 -/* 03980 80AE16D0 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000000 -/* 03984 80AE16D4 00084A00 */ sll $t1, $t0, 8 -/* 03988 80AE16D8 03095025 */ or $t2, $t8, $t1 ## $t2 = FB000000 -/* 0398C 80AE16DC 354B00FF */ ori $t3, $t2, 0x00FF ## $t3 = FB0000FF -/* 03990 80AE16E0 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03994 80AE16E4 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 03998 80AE16E8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0399C 80AE16EC C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 039A0 80AE16F0 920F029E */ lbu $t7, 0x029E($s0) ## 0000029E -/* 039A4 80AE16F4 4600848D */ trunc.w.s $f18, $f16 -/* 039A8 80AE16F8 241800C8 */ addiu $t8, $zero, 0x00C8 ## $t8 = 000000C8 -/* 039AC 80AE16FC AFAF0010 */ sw $t7, 0x0010($sp) -/* 039B0 80AE1700 4600428D */ trunc.w.s $f10, $f8 -/* 039B4 80AE1704 9219029F */ lbu $t9, 0x029F($s0) ## 0000029F -/* 039B8 80AE1708 44079000 */ mfc1 $a3, $f18 -/* 039BC 80AE170C 4600218D */ trunc.w.s $f6, $f4 -/* 039C0 80AE1710 44065000 */ mfc1 $a2, $f10 -/* 039C4 80AE1714 AFB90014 */ sw $t9, 0x0014($sp) -/* 039C8 80AE1718 920802A0 */ lbu $t0, 0x02A0($s0) ## 000002A0 -/* 039CC 80AE171C 44053000 */ mfc1 $a1, $f6 -/* 039D0 80AE1720 00073C00 */ sll $a3, $a3, 16 -/* 039D4 80AE1724 00063400 */ sll $a2, $a2, 16 -/* 039D8 80AE1728 00052C00 */ sll $a1, $a1, 16 -/* 039DC 80AE172C 00052C03 */ sra $a1, $a1, 16 -/* 039E0 80AE1730 00063403 */ sra $a2, $a2, 16 -/* 039E4 80AE1734 00073C03 */ sra $a3, $a3, 16 -/* 039E8 80AE1738 AFB8001C */ sw $t8, 0x001C($sp) -/* 039EC 80AE173C 0C01E77C */ jal Lights_PointGlowSetInfo - -/* 039F0 80AE1740 AFA80018 */ sw $t0, 0x0018($sp) -/* 039F4 80AE1744 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 039F8 80AE1748 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 039FC 80AE174C 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 03A00 80AE1750 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 03A04 80AE1754 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 03A08 80AE1758 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03A0C 80AE175C 8FAB009C */ lw $t3, 0x009C($sp) -/* 03A10 80AE1760 3C0580AE */ lui $a1, %hi(D_80AE1C00) ## $a1 = 80AE0000 -/* 03A14 80AE1764 24A51C00 */ addiu $a1, $a1, %lo(D_80AE1C00) ## $a1 = 80AE1C00 -/* 03A18 80AE1768 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03A1C 80AE176C 24060B26 */ addiu $a2, $zero, 0x0B26 ## $a2 = 00000B26 -/* 03A20 80AE1770 0C0346A2 */ jal Matrix_NewMtx -/* 03A24 80AE1774 AFA20078 */ sw $v0, 0x0078($sp) -/* 03A28 80AE1778 8FA30078 */ lw $v1, 0x0078($sp) -/* 03A2C 80AE177C 3C05DE00 */ lui $a1, 0xDE00 ## $a1 = DE000000 -/* 03A30 80AE1780 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03A34 80AE1784 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03A38 80AE1788 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 03A3C 80AE178C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 03A40 80AE1790 AE2D02C0 */ sw $t5, 0x02C0($s1) ## 000002C0 -/* 03A44 80AE1794 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -/* 03A48 80AE1798 8E0E02A4 */ lw $t6, 0x02A4($s0) ## 000002A4 -/* 03A4C 80AE179C 8DCC001C */ lw $t4, 0x001C($t6) ## 0000001C -/* 03A50 80AE17A0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 03A54 80AE17A4 920F0197 */ lbu $t7, 0x0197($s0) ## 00000197 -/* 03A58 80AE17A8 55E1009C */ bnel $t7, $at, .L80AE1A1C -/* 03A5C 80AE17AC 8FAE009C */ lw $t6, 0x009C($sp) -/* 03A60 80AE17B0 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 03A64 80AE17B4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03A68 80AE17B8 3C0480AE */ lui $a0, %hi(D_80AE1B50) ## $a0 = 80AE0000 -/* 03A6C 80AE17BC 17210004 */ bne $t9, $at, .L80AE17D0 -/* 03A70 80AE17C0 24841B50 */ addiu $a0, $a0, %lo(D_80AE1B50) ## $a0 = 80AE1B50 -/* 03A74 80AE17C4 3C0480AE */ lui $a0, %hi(D_80AE1B4C) ## $a0 = 80AE0000 -/* 03A78 80AE17C8 10000001 */ beq $zero, $zero, .L80AE17D0 -/* 03A7C 80AE17CC 24841B4C */ addiu $a0, $a0, %lo(D_80AE1B4C) ## $a0 = 80AE1B4C -.L80AE17D0: -/* 03A80 80AE17D0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 03A84 80AE17D4 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 -/* 03A88 80AE17D8 27184498 */ addiu $t8, $t8, 0x4498 ## $t8 = 06004498 -/* 03A8C 80AE17DC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 03A90 80AE17E0 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 -/* 03A94 80AE17E4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03A98 80AE17E8 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -/* 03A9C 80AE17EC 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 03AA0 80AE17F0 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 -/* 03AA4 80AE17F4 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 03AA8 80AE17F8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 03AAC 80AE17FC AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 03AB0 80AE1800 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 03AB4 80AE1804 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03AB8 80AE1808 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 03ABC 80AE180C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 03AC0 80AE1810 AE2B02C0 */ sw $t3, 0x02C0($s1) ## 000002C0 -/* 03AC4 80AE1814 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03AC8 80AE1818 90880001 */ lbu $t0, 0x0001($a0) ## 80AE1B4D -/* 03ACC 80AE181C 908C0000 */ lbu $t4, 0x0000($a0) ## 80AE1B4C -/* 03AD0 80AE1820 908B0002 */ lbu $t3, 0x0002($a0) ## 80AE1B4E -/* 03AD4 80AE1824 0008C400 */ sll $t8, $t0, 16 -/* 03AD8 80AE1828 000C7E00 */ sll $t7, $t4, 24 -/* 03ADC 80AE182C 01F84825 */ or $t1, $t7, $t8 ## $t1 = 06004498 -/* 03AE0 80AE1830 000B6A00 */ sll $t5, $t3, 8 -/* 03AE4 80AE1834 012D7025 */ or $t6, $t1, $t5 ## $t6 = FF004498 -/* 03AE8 80AE1838 35CC00FF */ ori $t4, $t6, 0x00FF ## $t4 = FF0044FF -/* 03AEC 80AE183C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 03AF0 80AE1840 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 03AF4 80AE1844 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 -/* 03AF8 80AE1848 25084530 */ addiu $t0, $t0, 0x4530 ## $t0 = 06004530 -/* 03AFC 80AE184C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03B00 80AE1850 AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 -/* 03B04 80AE1854 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 03B08 80AE1858 1000006F */ beq $zero, $zero, .L80AE1A18 -/* 03B0C 80AE185C AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -.L80AE1860: -/* 03B10 80AE1860 8FAF009C */ lw $t7, 0x009C($sp) -/* 03B14 80AE1864 0C024F61 */ jal func_80093D84 -/* 03B18 80AE1868 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 03B1C 80AE186C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 03B20 80AE1870 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 03B24 80AE1874 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 -/* 03B28 80AE1878 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03B2C 80AE187C AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 03B30 80AE1880 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03B34 80AE1884 8FAB009C */ lw $t3, 0x009C($sp) -/* 03B38 80AE1888 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 03B3C 80AE188C 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 03B40 80AE1890 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03B44 80AE1894 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03B48 80AE1898 AFAE0018 */ sw $t6, 0x0018($sp) -/* 03B4C 80AE189C AFA0001C */ sw $zero, 0x001C($sp) -/* 03B50 80AE18A0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 03B54 80AE18A4 AFA90010 */ sw $t1, 0x0010($sp) -/* 03B58 80AE18A8 8E1902A4 */ lw $t9, 0x02A4($s0) ## 000002A4 -/* 03B5C 80AE18AC 860C019A */ lh $t4, 0x019A($s0) ## 0000019A -/* 03B60 80AE18B0 240B0080 */ addiu $t3, $zero, 0x0080 ## $t3 = 00000080 -/* 03B64 80AE18B4 83280008 */ lb $t0, 0x0008($t9) ## 00000008 -/* 03B68 80AE18B8 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 03B6C 80AE18BC AFAA0024 */ sw $t2, 0x0024($sp) -/* 03B70 80AE18C0 01880019 */ multu $t4, $t0 -/* 03B74 80AE18C4 AFAB0028 */ sw $t3, 0x0028($sp) -/* 03B78 80AE18C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03B7C 80AE18CC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03B80 80AE18D0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03B84 80AE18D4 AFA20058 */ sw $v0, 0x0058($sp) -/* 03B88 80AE18D8 00007812 */ mflo $t7 -/* 03B8C 80AE18DC 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 03B90 80AE18E0 0C0253D0 */ jal Gfx_TwoTexScroll -/* 03B94 80AE18E4 AFB80020 */ sw $t8, 0x0020($sp) -/* 03B98 80AE18E8 8FA30058 */ lw $v1, 0x0058($sp) -/* 03B9C 80AE18EC 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 03BA0 80AE18F0 35AD8080 */ ori $t5, $t5, 0x8080 ## $t5 = FA008080 -/* 03BA4 80AE18F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03BA8 80AE18F8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 03BAC 80AE18FC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 03BB0 80AE1900 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 -/* 03BB4 80AE1904 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03BB8 80AE1908 8E0302A4 */ lw $v1, 0x02A4($s0) ## 000002A4 -/* 03BBC 80AE190C 9208029D */ lbu $t0, 0x029D($s0) ## 0000029D -/* 03BC0 80AE1910 90790000 */ lbu $t9, 0x0000($v1) ## 00000000 -/* 03BC4 80AE1914 906F0001 */ lbu $t7, 0x0001($v1) ## 00000001 -/* 03BC8 80AE1918 90690002 */ lbu $t1, 0x0002($v1) ## 00000002 -/* 03BCC 80AE191C 00196600 */ sll $t4, $t9, 24 -/* 03BD0 80AE1920 000FC400 */ sll $t8, $t7, 16 -/* 03BD4 80AE1924 01985025 */ or $t2, $t4, $t8 ## $t2 = 00000000 -/* 03BD8 80AE1928 00096A00 */ sll $t5, $t1, 8 -/* 03BDC 80AE192C 014D7025 */ or $t6, $t2, $t5 ## $t6 = FA008080 -/* 03BE0 80AE1930 01C87825 */ or $t7, $t6, $t0 ## $t7 = FA008080 -/* 03BE4 80AE1934 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 03BE8 80AE1938 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 03BEC 80AE193C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 03BF0 80AE1940 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 03BF4 80AE1944 AE2C02D0 */ sw $t4, 0x02D0($s1) ## 000002D0 -/* 03BF8 80AE1948 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03BFC 80AE194C 9219029B */ lbu $t9, 0x029B($s0) ## 0000029B -/* 03C00 80AE1950 9209029A */ lbu $t1, 0x029A($s0) ## 0000029A -/* 03C04 80AE1954 920C029C */ lbu $t4, 0x029C($s0) ## 0000029C -/* 03C08 80AE1958 00197400 */ sll $t6, $t9, 16 -/* 03C0C 80AE195C 00095600 */ sll $t2, $t1, 24 -/* 03C10 80AE1960 014E4025 */ or $t0, $t2, $t6 ## $t0 = FA008080 -/* 03C14 80AE1964 000CC200 */ sll $t8, $t4, 8 -/* 03C18 80AE1968 01185825 */ or $t3, $t0, $t8 ## $t3 = FB008080 -/* 03C1C 80AE196C 356900FF */ ori $t1, $t3, 0x00FF ## $t1 = FB0080FF -/* 03C20 80AE1970 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 03C24 80AE1974 8FAD009C */ lw $t5, 0x009C($sp) -/* 03C28 80AE1978 85B907A0 */ lh $t9, 0x07A0($t5) ## FA008820 -/* 03C2C 80AE197C 00195080 */ sll $t2, $t9, 2 -/* 03C30 80AE1980 01AA7021 */ addu $t6, $t5, $t2 -/* 03C34 80AE1984 0C016A7D */ jal func_8005A9F4 -/* 03C38 80AE1988 8DC40790 */ lw $a0, 0x0790($t6) ## FA008810 -/* 03C3C 80AE198C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 03C40 80AE1990 00417821 */ addu $t7, $v0, $at -/* 03C44 80AE1994 000F6400 */ sll $t4, $t7, 16 -/* 03C48 80AE1998 000C4403 */ sra $t0, $t4, 16 -/* 03C4C 80AE199C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 -/* 03C50 80AE19A0 3C0180AE */ lui $at, %hi(D_80AE1C70) ## $at = 80AE0000 -/* 03C54 80AE19A4 C4281C70 */ lwc1 $f8, %lo(D_80AE1C70)($at) -/* 03C58 80AE19A8 468021A0 */ cvt.s.w $f6, $f4 -/* 03C5C 80AE19AC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03C60 80AE19B0 46083302 */ mul.s $f12, $f6, $f8 -/* 03C64 80AE19B4 0C034348 */ jal Matrix_RotateY -/* 03C68 80AE19B8 00000000 */ nop -/* 03C6C 80AE19BC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 03C70 80AE19C0 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 -/* 03C74 80AE19C4 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 -/* 03C78 80AE19C8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 03C7C 80AE19CC AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 -/* 03C80 80AE19D0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 03C84 80AE19D4 8FA9009C */ lw $t1, 0x009C($sp) -/* 03C88 80AE19D8 3C0580AE */ lui $a1, %hi(D_80AE1C10) ## $a1 = 80AE0000 -/* 03C8C 80AE19DC 24A51C10 */ addiu $a1, $a1, %lo(D_80AE1C10) ## $a1 = 80AE1C10 -/* 03C90 80AE19E0 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 03C94 80AE19E4 24060B5E */ addiu $a2, $zero, 0x0B5E ## $a2 = 00000B5E -/* 03C98 80AE19E8 0C0346A2 */ jal Matrix_NewMtx -/* 03C9C 80AE19EC AFA2004C */ sw $v0, 0x004C($sp) -/* 03CA0 80AE19F0 8FA3004C */ lw $v1, 0x004C($sp) -/* 03CA4 80AE19F4 3C05DE00 */ lui $a1, 0xDE00 ## $a1 = DE000000 -/* 03CA8 80AE19F8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03CAC 80AE19FC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 03CB0 80AE1A00 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 03CB4 80AE1A04 AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 -/* 03CB8 80AE1A08 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -/* 03CBC 80AE1A0C 8E0D02A4 */ lw $t5, 0x02A4($s0) ## 000002A4 -/* 03CC0 80AE1A10 8DAA0024 */ lw $t2, 0x0024($t5) ## 00000024 -/* 03CC4 80AE1A14 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -.L80AE1A18: -/* 03CC8 80AE1A18 8FAE009C */ lw $t6, 0x009C($sp) -.L80AE1A1C: -/* 03CCC 80AE1A1C 3C0680AE */ lui $a2, %hi(D_80AE1C20) ## $a2 = 80AE0000 -/* 03CD0 80AE1A20 24C61C20 */ addiu $a2, $a2, %lo(D_80AE1C20) ## $a2 = 80AE1C20 -/* 03CD4 80AE1A24 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 -/* 03CD8 80AE1A28 24070B64 */ addiu $a3, $zero, 0x0B64 ## $a3 = 00000B64 -/* 03CDC 80AE1A2C 0C031AD5 */ jal Graph_CloseDisps -/* 03CE0 80AE1A30 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03CE4 80AE1A34 8FBF003C */ lw $ra, 0x003C($sp) -/* 03CE8 80AE1A38 8FB00034 */ lw $s0, 0x0034($sp) -/* 03CEC 80AE1A3C 8FB10038 */ lw $s1, 0x0038($sp) -/* 03CF0 80AE1A40 03E00008 */ jr $ra -/* 03CF4 80AE1A44 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 03CF8 80AE1A48 00000000 */ nop -/* 03CFC 80AE1A4C 00000000 */ nop diff --git a/data/overlays/actors/z_en_po_desert.data.s b/data/overlays/actors/z_en_po_desert.data.s deleted file mode 100644 index a9fff98abe..0000000000 --- a/data/overlays/actors/z_en_po_desert.data.s +++ /dev/null @@ -1,24 +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 En_Po_Desert_InitVars - .word 0x01BF0100, 0x00001090, 0x006D0000, 0x00000284 -.word EnPoDesert_Init -.word EnPoDesert_Destroy -.word EnPoDesert_Update -.word EnPoDesert_Draw -glabel D_80AD39A0 - .word 0x03000039, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00190032, 0x00140000, 0x00000000 -glabel D_80AD39CC - .word 0x8917005C, 0xB0F407D0, 0x304C0C80 -glabel D_80AD39D8 - .word 0x00000000, 0x44AF0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_po_desert.reloc.s b/data/overlays/actors/z_en_po_desert.reloc.s deleted file mode 100644 index 61a4e5f905..0000000000 --- a/data/overlays/actors/z_en_po_desert.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_80AD3A40 - .incbin "baserom/ovl_En_Po_Desert", 0xD90, 0x000000C0 diff --git a/data/overlays/actors/z_en_po_field.bss.s b/data/overlays/actors/z_en_po_field.bss.s deleted file mode 100644 index 2d2221c1ca..0000000000 --- a/data/overlays/actors/z_en_po_field.bss.s +++ /dev/null @@ -1,18 +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_80AD76B0 - .space 0x40 -glabel D_80AD76F0 - .space 0x10 -glabel D_80AD7700 - .space 0x40 - diff --git a/data/overlays/actors/z_en_po_field.data.s b/data/overlays/actors/z_en_po_field.data.s deleted file mode 100644 index ef817e0d84..0000000000 --- a/data/overlays/actors/z_en_po_field.data.s +++ /dev/null @@ -1,40 +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 En_Po_Field_InitVars - .word 0x01750500, 0x00001035, 0x006D0000, 0x000002DC -.word EnPoField_Init -.word EnPoField_Destroy -.word EnPoField_Update -.word EnPoField_Draw -glabel D_80AD7080 - .word 0x03000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00190032, 0x00140000, 0x00000000 -glabel D_80AD70AC - .word 0x0A110000, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x000A001E, 0x00000000, 0x00000000 -glabel D_80AD70D8 - .word 0x04000019, 0x00322800 -glabel D_80AD70E0 - .word 0x00020102, 0x11020212, 0x01020402, 0x02020202, 0x02000000, 0x00000104, 0x02020804, 0x00000400 -glabel D_80AD7100 - .word 0x00000000 -glabel D_80AD7104 - .word 0xC47A0000, 0x00000000, 0x45CB2000 -glabel D_80AD7110 - .word 0x304C0C80 -glabel D_80AD7114 - .word 0x00000000, 0x40400000, 0x00000000 -glabel D_80AD7120 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AD712C - .word 0xFFAAFF64, 0x0096FF55, 0x00F80000, 0x06001B70, 0xFFFFAAFF, 0xC800A000, 0xFFF10000, 0x06001370 -glabel D_80AD714C - .word 0x00000000, 0x44AF0000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_po_field.reloc.s b/data/overlays/actors/z_en_po_field.reloc.s deleted file mode 100644 index f3f09daeac..0000000000 --- a/data/overlays/actors/z_en_po_field.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_80AD72B0 - .incbin "baserom/ovl_En_Po_Field", 0x37B0, 0x00000400 diff --git a/data/overlays/actors/z_en_po_relay.data.s b/data/overlays/actors/z_en_po_relay.data.s deleted file mode 100644 index f9b82a21c9..0000000000 --- a/data/overlays/actors/z_en_po_relay.data.s +++ /dev/null @@ -1,36 +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_80AD8C30 - .byte 0xFF, 0xC4 -glabel D_80AD8C32 - .byte 0xFD, 0xEE, 0xF4, 0x7A, 0x01, 0x86, 0xFE, 0x0C, 0xF4, 0x7A, 0x01, 0x86, 0xFE, 0x0C, 0xF0, 0xF6, 0x00, 0xD2, 0xFD, 0xEE, 0xF0, 0xF6, 0x00, 0xD2, 0xFD, 0x9E, 0xEE, 0xDA, 0x02, 0x3A, 0xFD, 0xC6, 0xEE, 0xDA, 0x02, 0x3A, 0xFD, 0xC6, 0xED, 0x18, 0x00, 0xD2, 0xFD, 0xC6, 0xED, 0x18, 0x00, 0xD2, 0xFD, 0xC6, 0xEB, 0xCE, 0x00, 0xD2, 0xFD, 0xC6, 0xEA, 0xA2, 0x02, 0x3A, 0xFD, 0xC6, 0xEA, 0xA2, 0x02, 0x3A, 0xFD, 0xC6, 0xEB, 0xB0, 0x04, 0xEC, 0xFD, 0x9E, 0xEB, 0xB0, 0x06, 0x72, 0xFD, 0x62, 0xED, 0x18, 0x06, 0x72, 0xFD, 0x30, 0xEE, 0x80, 0x07, 0xDA, 0xFD, 0x26, 0xEE, 0x80, 0x07, 0xDA, 0xFD, 0x26, 0xEF, 0x70, 0x07, 0xDA, 0xFD, 0x26, 0xF2, 0x04, 0x06, 0x72, 0xFD, 0x44, 0xF2, 0x04, 0x06, 0x72, 0xFD, 0x6C, 0xF3, 0xC6, 0x08, 0x8E, 0xFD, 0x6C, 0xF3, 0xC6, 0x08, 0x8E, 0xFD, 0xB2, 0xF5, 0xE2, 0x09, 0x9C, 0xFD, 0xD0, 0xF5, 0xE2, 0x0B, 0x54, 0xFE, 0x66, 0xF7, 0x72, 0x0B, 0x4E, 0xFE, 0x66, 0xF8, 0x7E, 0x0B, 0x4A, 0xFE, 0x66, 0xF9, 0x7A, 0x0B, 0x4A, 0xFE, 0x98, 0xF9, 0xFC, 0x0B, 0xAE, 0xFE, 0x98, 0xF9, 0xFC -glabel En_Po_Relay_InitVars - .word 0x01220400, 0x00011019, 0x00890000, 0x000002DC -.word EnPoRelay_Init -.word EnPoRelay_Destroy -.word EnPoRelay_Update -.word EnPoRelay_Draw -glabel D_80AD8CF8 - .word 0x0A000039, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x001E0034, 0x00000000, 0x00000000 -glabel D_80AD8D24 - .word 0x00000000 -glabel D_80AD8D28 - .word 0x8917004F, 0x304C05DC -glabel D_80AD8D30 - .word 0x00000000, 0x3FC00000, 0x00000000 -glabel D_80AD8D3C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80AD8D48 - .word 0x00000000, 0x44960000, 0x00000000 -glabel D_80AD8D54 - .word 0x06003B40, 0x06004340, 0x06004B40 - diff --git a/data/overlays/actors/z_en_po_sisters.data.s b/data/overlays/actors/z_en_po_sisters.data.s deleted file mode 100644 index a11f0e1eb6..0000000000 --- a/data/overlays/actors/z_en_po_sisters.data.s +++ /dev/null @@ -1,48 +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_80ADD6F0 - .word 0xFFAAFFFF, 0xFFC800FF, 0x00AAFFFF, 0xAAFF00FF -glabel D_80ADD700 - .word 0x6400FFFF, 0xFF0000FF, 0x0000FFFF, 0x009600FF -glabel En_Po_Sisters_InitVars - .word 0x00910500, 0x00005215, 0x00990000, 0x00000338 -.word EnPoSisters_Init -.word EnPoSisters_Destroy -.word EnPoSisters_Update -.word EnPoSisters_Draw -glabel D_80ADD730 - .word 0x03110939, 0x10010000, 0x00000000, 0xFFCFFFFF, 0x00080000, 0x4FC7FFEA, 0x00000000, 0x01050100, 0x0012003C, 0x000F0000, 0x00000000 -glabel D_80ADD75C - .word 0x0A000019, 0x003C2800 -glabel D_80ADD764 - .word 0xF0020102, 0x00020202, 0xE1E2E402, 0x02020202, 0x02000000, 0x0000E1E4, 0xE2E2E8E4, 0x00000400 -glabel D_80ADD784 - .word 0x00000000 -glabel D_80ADD788 - .word 0xC8500007, 0x304C1770 -glabel D_80ADD790 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80ADD79C - .word 0xB000D000, 0x50003000 -glabel D_80ADD7A4 - .word 0xFFEA0151, 0xF958FE51, 0x036FF2AE, 0x0225036F, 0xF2AE06B5, 0x0203FAC4 -glabel D_80ADD7BC - .word 0x42F00000, 0x437A0000, 0xC4B18000 -glabel D_80ADD7C8 - .word 0x06001DE0, 0x06002F88, 0x06003628, 0x06003DC8 -glabel D_80ADD7D8 - .word 0x06001CB0, 0x06002EB8, 0x06003880, 0x06004020 -glabel D_80ADD7E8 - .word 0x50006400, 0x500F0000, 0x00463200, 0x46460000 -glabel D_80ADD7F8 - .word 0x447A0000, 0xC4D48000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_poh.data.s b/data/overlays/actors/z_en_poh.data.s deleted file mode 100644 index c20cca7103..0000000000 --- a/data/overlays/actors/z_en_poh.data.s +++ /dev/null @@ -1,47 +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_80AE1A50 - .word 0x00000000 -glabel En_Poh_InitVars - .word 0x000D0500, 0x00001015, 0x00010000, 0x000003A8 -.word EnPoh_Init -.word EnPoh_Destroy -.word EnPoh_Update -.word 0x00000000 -glabel D_80AE1A74 - .word 0x03000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00140028, 0x00140000, 0x00000000 -glabel D_80AE1AA0 - .word 0x00000000, 0xFFCFFFFF, 0x00080000, 0x00000000, 0x00000000, 0x01000100, 0x12000000, 0x05780000, 0x000A0064 -glabel D_80AE1AC4 - .word 0x03110939, 0x10000000, 0x00000001 -.word D_80AE1AA0 -glabel D_80AE1AD4 - .word 0x04000019, 0x00322800 -glabel D_80AE1ADC - .word 0x00020102, 0x11020212, 0x01020402, 0x02020202, 0x02000000, 0x00000104, 0x02020804, 0x00000400 -glabel D_80AE1AFC - .word 0xFFAAFF64, 0x00961205, 0xF8000000, 0x060015B0, 0x06000A60, 0x060004EC, 0x060006E0, 0x06002D28, 0x06002608, 0x06003850, 0xFFFFAA00, 0x96000901, 0xF4000000, 0x06001440, 0x060009DC, 0x06000570, 0x06000708, 0x060045A0, 0x06005220, 0x06001C90 -glabel D_80AE1B4C - .word 0x4B1419FF -glabel D_80AE1B50 - .word 0x506E5AFF -glabel D_80AE1B54 - .word 0x5A5532FF -glabel D_80AE1B58 - .word 0x645A64FF -glabel D_80AE1B5C - .word 0x304C0C80 -glabel D_80AE1B60 - .word 0x00000000, 0x40400000, 0x00000000 -glabel D_80AE1B6C - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_poh.reloc.s b/data/overlays/actors/z_en_poh.reloc.s deleted file mode 100644 index 77c0213b4b..0000000000 --- a/data/overlays/actors/z_en_poh.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_80AE1C80 - .incbin "baserom/ovl_En_Poh", 0x3F30, 0x00000440 diff --git a/include/functions.h b/include/functions.h index 54b72c202c..8b55f35a14 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1279,6 +1279,7 @@ Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 wi 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); void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b); void func_80095974(GraphicsContext* gfxCtx); void func_80095AA0(GlobalContext* globalCtx, Room* room, Input* arg2, UNK_TYPE arg3); @@ -1361,7 +1362,7 @@ void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimation s32 func_800A4530(SkelAnime* skelAnime, f32 arg1); s32 SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animationseg, Vec3s* limbDrawTable, Vec3s* arg5, s32 limbCount); -void SkelAnime_InitFlex(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, +s32 SkelAnime_InitFlex(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, AnimationHeader* animationseg, Vec3s* limbDrawTable, Vec3s* arg5, s32 limbCount); void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animationseg); @@ -2336,7 +2337,7 @@ void func_800F87A0(u8); void func_800F8884(u8, Vec3f*); void func_800F89A0(u8, Vec3f*); void func_800F89E8(Vec3f*); -void func_800F8A44(Vec3f*, u16); +void func_800F8A44(Vec3f* pos, u16 sfxId); void func_800F8BA0(u8, u16); void func_800F8D04(u32 sfxId); void func_800F8E3C(void); diff --git a/include/z64save.h b/include/z64save.h index 7ef1cba0e8..1a3b3ca505 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -98,7 +98,8 @@ typedef struct { /* 0x0E9C */ s32 gsFlags[6]; /* 0x0EB4 */ char unk_EB4[0x10]; /* 0x0EC4 */ s32 horseRaceRecord; - /* 0x0EC8 */ char unk_EC8[0x0C]; + /* 0x0EC8 */ char unk_EC8[0x08]; + /* 0x0ED0 */ s32 dampeRaceTime; /* 0x0ED4 */ u16 eventChkInf[14]; // "event_chk_inf" /* 0x0EF0 */ u16 itemGetInf[4]; // "item_get_inf" /* 0x0EF8 */ u16 infTable[30]; // "inf_table" diff --git a/spec b/spec index ad21cb63ac..f9165dd31d 100644 --- a/spec +++ b/spec @@ -2849,37 +2849,39 @@ endseg beginseg name "ovl_En_Po_Desert" include "build/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.o" - include "build/data/overlays/actors/z_en_po_desert.data.o" - include "build/data/overlays/actors/z_en_po_desert.reloc.o" + include "build/src/overlays/actors/ovl_En_Po_Desert/ovl_En_Po_Desert_reloc.o" endseg beginseg name "ovl_En_Po_Field" include "build/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.o" - include "build/data/overlays/actors/z_en_po_field.data.o" - include "build/data/overlays/actors/z_en_po_field.bss.o" - include "build/data/overlays/actors/z_en_po_field.reloc.o" + include "build/src/overlays/actors/ovl_En_Po_Field/ovl_En_Po_Field_reloc.o" endseg beginseg name "ovl_En_Po_Relay" include "build/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.o" - include "build/data/overlays/actors/z_en_po_relay.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Po_Relay/ovl_En_Po_Relay_reloc.o" +#else include "build/data/overlays/actors/z_en_po_relay.reloc.o" +#endif endseg beginseg name "ovl_En_Po_Sisters" include "build/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.o" - include "build/data/overlays/actors/z_en_po_sisters.data.o" +#ifdef NON_MATCHING + include "build/src/overlays/actors/ovl_En_Po_Sisters/ovl_En_Po_Sisters_reloc.o" +#else include "build/data/overlays/actors/z_en_po_sisters.reloc.o" +#endif endseg beginseg name "ovl_En_Poh" include "build/src/overlays/actors/ovl_En_Poh/z_en_poh.o" - include "build/data/overlays/actors/z_en_poh.data.o" - include "build/data/overlays/actors/z_en_poh.reloc.o" + include "build/src/overlays/actors/ovl_En_Poh/ovl_En_Poh_reloc.o" endseg beginseg diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 61ab1fdf6a..e57b770ddd 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1300,8 +1300,8 @@ s32 SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeade } } -void SkelAnime_InitFlex(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, - AnimationHeader* animationSeg, Vec3s* limbDrawTbl, Vec3s* transitionDrawTable, s32 limbCount) { +s32 SkelAnime_InitFlex(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationSeg, Vec3s* limbDrawTbl, Vec3s* transitionDrawTable, s32 limbCount) { FlexSkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); skelAnime->limbCount = skeletonHeader->sh.limbCount + 1; diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index cb44f51940..7599e1764a 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -50,7 +50,7 @@ static InitChainEntry sInitChain[] = { extern UNK_TYPE D_060108B8; extern Gfx D_0600FE40[]; -extern UNK_TYPE D_0400CD80; +extern Gfx D_0400CD80[]; extern Gfx D_040184B0[]; void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -105,7 +105,7 @@ void BgHakaTubo_Idle(BgHakaTubo* this, GlobalContext* globalCtx) { pos.y = this->dyna.actor.posRot.pos.y + 80.0f; EffectSsBomb2_SpawnLayered(globalCtx, &pos, &sZeroVector, &sZeroVector, 100, 45); Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.posRot.pos, 50, NA_SE_EV_BOX_BREAK); - EffectSsHahen_SpawnBurst(globalCtx, &pos, 20.0f, 0, 350, 100, 50, OBJECT_HAKA_OBJECTS, 40, &D_0400CD80); + EffectSsHahen_SpawnBurst(globalCtx, &pos, 20.0f, 0, 350, 100, 50, OBJECT_HAKA_OBJECTS, 40, D_0400CD80); this->dropTimer = 5; this->dyna.actor.draw = NULL; Actor_SetScale(&this->dyna.actor, 0.0f); diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 9fafb9a3fc..e5b9213df3 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -15,7 +15,11 @@ void EnPoDesert_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnPoDesert_Update(Actor* thisx, GlobalContext* globalCtx); void EnPoDesert_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnPoDesert_SetNextPathPoint(EnPoDesert* this, GlobalContext* globalCtx); +void EnPoDesert_WaitForPlayer(EnPoDesert* this, GlobalContext* globalCtx); +void EnPoDesert_MoveToNextPoint(EnPoDesert* this, GlobalContext* globalCtx); +void EnPoDesert_Disappear(EnPoDesert* this, GlobalContext* globalCtx); + const ActorInit En_Po_Desert_InitVars = { ACTOR_EN_PO_DESERT, ACTORTYPE_BG, @@ -27,29 +31,234 @@ const ActorInit En_Po_Desert_InitVars = { (ActorFunc)EnPoDesert_Update, (ActorFunc)EnPoDesert_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Destroy.s") +static ColliderCylinderInit sColliderInit = { + { COLTYPE_UNK3, 0x00, 0x00, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 25, 50, 20, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s") +static InitChainEntry sInitChain[] = { + ICHAIN_S8(naviEnemyId, 0x5C, ICHAIN_CONTINUE), + ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 3200, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s") +extern SkeletonHeader D_06006A30; +extern AnimationHeader D_06000924; +extern AnimationHeader D_06001360; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s") +extern Gfx D_06004BA0[]; +extern Gfx D_06004CC0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD305C.s") +void EnPoDesert_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnPoDesert* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD30D0.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_06006A30, &D_06000924, this->limbDrawTable, + this->transitionDrawTable, 10); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sColliderInit); + this->lightColor.r = 255; + this->lightColor.g = 255; + this->lightColor.b = 210; + this->lightColor.a = 255; + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, + this->actor.initPosRot.pos.z, 255, 255, 255, 200); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 37.0f); + this->currentPathPoint = 1; + this->actor.params = (this->actor.params >> 8) & 0xFF; + this->targetY = this->actor.posRot.pos.y; + EnPoDesert_SetNextPathPoint(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3194.s") +void EnPoDesert_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnPoDesert* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3328.s") + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Update.s") +void EnPoDesert_SetNextPathPoint(EnPoDesert* this, GlobalContext* globalCtx) { + Path* path = &globalCtx->setupPathList[this->actor.params]; + Vec3s* pathPoint; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3504.s") + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06001360, -6.0f); + pathPoint = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[this->currentPathPoint]; + this->actor.initPosRot.pos.x = pathPoint->x; + this->actor.initPosRot.pos.y = pathPoint->y; + this->actor.initPosRot.pos.z = pathPoint->z; + this->initDistToNextPoint = func_8002DBB0(&this->actor, &this->actor.initPosRot.pos); + this->initDistToNextPoint = CLAMP_MIN(this->initDistToNextPoint, 1.0f); + this->currentPathPoint++; + this->yDiff = this->actor.initPosRot.pos.y - this->actor.posRot.pos.y; + this->actor.speedXZ = 0.0f; + if (path->count == this->currentPathPoint) { + this->currentPathPoint = 0; + } + this->actionFunc = EnPoDesert_WaitForPlayer; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD3594.s") +void EnPoDesert_SetupMoveToNextPoint(EnPoDesert* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000924, -5.0f); + this->actionFunc = EnPoDesert_MoveToNextPoint; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s") +void EnPoDesert_SetupDisappear(EnPoDesert* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06001360, -6.0f); + this->actionTimer = 16; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DISAPPEAR); + this->actionFunc = EnPoDesert_Disappear; +} + +void EnPoDesert_UpdateSpeedModifier(EnPoDesert* this) { + if (this->speedModifier == 0) { + this->speedModifier = 32; + } + if (this->speedModifier != 0) { + this->speedModifier--; + } + this->actor.posRot.pos.y = Math_Sins(this->speedModifier * 0x800) * 13.0f + this->targetY; +} + +void EnPoDesert_WaitForPlayer(EnPoDesert* this, GlobalContext* globalCtx) { + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + if (this->actor.xzDistFromLink < 200.0f && (this->currentPathPoint != 2 || globalCtx->actorCtx.unk_03)) { + if (this->currentPathPoint == 2) { + if (Gameplay_InCsMode(globalCtx)) { + this->actor.shape.rot.y += 0x800; + return; + } + func_8010B680(globalCtx, 0x600B, NULL); + } + EnPoDesert_SetupMoveToNextPoint(this); + } else { + this->actor.shape.rot.y += 0x800; + } +} + +void EnPoDesert_MoveToNextPoint(EnPoDesert* this, GlobalContext* globalCtx) { + f32 temp_f20; + + if (this->actionTimer != 0) { + this->actionTimer--; + } + temp_f20 = sinf(this->actionTimer * (M_PI / 20.0f)) * 5.0f; + this->actor.posRot.pos.x += temp_f20 * Math_Coss(this->actor.shape.rot.y); + this->actor.posRot.pos.z += temp_f20 * Math_Sins(this->actor.shape.rot.y); + if (this->actionTimer == 0) { + this->actionTimer = 40; + } + temp_f20 = func_8002DBB0(&this->actor, &this->actor.initPosRot.pos); + this->actor.posRot.rot.y = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.posRot.rot.y + 0x8000, 5, 0x400); + this->actor.speedXZ = sinf(this->speedModifier * (M_PI / 32.0f)) * 2.5f + 5.5f; + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + this->targetY = this->actor.initPosRot.pos.y - ((temp_f20 * this->yDiff) / this->initDistToNextPoint); + if (temp_f20 < 40.0f) { + if (this->currentPathPoint != 0) { + EnPoDesert_SetNextPathPoint(this, globalCtx); + } else { + EnPoDesert_SetupDisappear(this); + } + } +} + +void EnPoDesert_Disappear(EnPoDesert* this, GlobalContext* globalCtx) { + if (this->actionTimer != 0) { + this->actionTimer--; + } + this->actor.shape.rot.y += 0x2000; + this->lightColor.a = this->actionTimer * 15.9375f; + this->actor.shape.unk_14 = this->lightColor.a; + if (this->actionTimer == 0) { + Actor_Kill(&this->actor); + } +} + +void EnPoDesert_Update(Actor* thisx, GlobalContext* globalCtx) { + EnPoDesert* this = THIS; + s32 pad; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + EnPoDesert_UpdateSpeedModifier(this); + func_8002E4B4(globalCtx, &this->actor, 0.0f, 27.0f, 60.0f, 4); + Actor_SetHeight(&this->actor, 42.0f); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + if (globalCtx->actorCtx.unk_03) { + this->actor.flags |= 0x81; + this->actor.shape.shadowDrawFunc = ActorShadow_DrawFunc_Circle; + } else { + this->actor.shape.shadowDrawFunc = NULL; + this->actor.flags &= ~0x81; + } +} + +s32 EnPoDesert_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx, Gfx** gfxP) { + EnPoDesert* this = THIS; + f32 mtxScale; + + if (this->actionFunc == EnPoDesert_Disappear && limbIndex == 7) { + mtxScale = this->actionTimer * 0.0625f; + Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); + } + if ((this->actor.flags & 0x80) != 0x80) { + *dList = NULL; + } + return 0; +} + +void EnPoDesert_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, + Gfx** gfxP) { + static Vec3f baseLightPos = { 0.0f, 1400.0f, 0.0f }; + + EnPoDesert* this = THIS; + f32 rand; + Color_RGBA8 color; + Vec3f lightPos; + + if (limbIndex == 7) { + Matrix_MultVec3f(&baseLightPos, &lightPos); + rand = Math_Rand_ZeroOne(); + color.r = (s16)(rand * 30.0f) + 225; + color.g = (s16)(rand * 100.0f) + 155; + color.b = (s16)(rand * 160.0f) + 95; + if ((this->actor.flags & 0x80) == 0x80) { + gDPPipeSync((*gfxP)++); + gDPSetEnvColor((*gfxP)++, color.r, color.g, color.b, 255); + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_desert.c", 523), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList((*gfxP)++, D_06004BA0); + gSPDisplayList((*gfxP)++, D_06004CC0); + gDPPipeSync((*gfxP)++); + gDPSetEnvColor((*gfxP)++, this->lightColor.r, this->lightColor.g, this->lightColor.b, this->lightColor.a); + } + Lights_PointNoGlowSetInfo(&this->lightInfo, lightPos.x, lightPos.y, lightPos.z, color.r, color.g, color.b, 200); + } +} + +void EnPoDesert_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnPoDesert* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_desert.c", 559); + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_EnvColor(globalCtx->state.gfxCtx, 255, 85, 0, 255)); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_EnvColor(globalCtx->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b, + this->lightColor.a)); + if (this->actionFunc == EnPoDesert_Disappear) { + gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280); + } else { + gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280 + 2); + } + POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnPoDesert_OverrideLimbDraw, EnPoDesert_PostLimbDraw, &this->actor, POLY_XLU_DISP); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_desert.c", 597); +} diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h index 260ff4eac9..f338aaa4ab 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h @@ -6,9 +6,24 @@ struct EnPoDesert; +typedef void (*EnPoDesertActionFunc)(struct EnPoDesert*, GlobalContext*); + typedef struct EnPoDesert { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x138]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnPoDesertActionFunc actionFunc; + /* 0x0194 */ s16 actionTimer; + /* 0x0196 */ s16 speedModifier; + /* 0x0198 */ s32 currentPathPoint; + /* 0x019C */ f32 initDistToNextPoint; + /* 0x01A0 */ f32 yDiff; + /* 0x01A4 */ f32 targetY; + /* 0x01A8 */ Vec3s limbDrawTable[10]; + /* 0x01E4 */ Vec3s transitionDrawTable[10]; + /* 0x0220 */ Color_RGBA8 lightColor; + /* 0x0224 */ LightNode* lightNode; + /* 0x0228 */ LightInfo lightInfo; + /* 0x0238 */ ColliderCylinder collider; } EnPoDesert; // size = 0x0284 extern const ActorInit En_Po_Desert_InitVars; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index d464ebc2c4..1793ad5ff8 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -1,3 +1,9 @@ +/* + * File: z_en_po_field.c + * Overlay: ovl_En_Po_Field + * Description: Field Poe + */ + #include "z_en_po_field.h" #define FLAGS 0x00001035 @@ -9,7 +15,24 @@ void EnPoField_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnPoField_Update(Actor* thisx, GlobalContext* globalCtx); void EnPoField_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnPoField_UpdateDead(Actor* thisx, GlobalContext* globalCtx); +void EnPoField_DrawSoul(Actor* thisx, GlobalContext* globalCtx); + +void EnPoField_SetupWaitForSpawn(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_WaitForSpawn(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_Appear(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_CirclePlayer(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_Damage(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_Flee(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_Death(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_Disappear(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_SoulIdle(EnPoField* this, GlobalContext* globalCtx); +void func_80AD587C(EnPoField* this, GlobalContext* globalCtx); +void func_80AD58D4(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_SoulDisappear(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_SoulInteract(EnPoField* this, GlobalContext* globalCtx); +void EnPoField_SpawnFlame(EnPoField* this); + const ActorInit En_Po_Field_InitVars = { ACTOR_EN_PO_FIELD, ACTORTYPE_ENEMY, @@ -21,85 +44,921 @@ const ActorInit En_Po_Field_InitVars = { (ActorFunc)EnPoField_Update, (ActorFunc)EnPoField_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Destroy.s") +static ColliderCylinderInit D_80AD7080 = { + { COLTYPE_UNK3, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 25, 50, 20, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3D68.s") +static ColliderCylinderInit D_80AD70AC = { + { COLTYPE_UNK10, 0x11, 0x00, 0x00, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x19, 0x00, 0x00 }, + { 10, 30, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s") +static CollisionCheckInfoInit D_80AD70D8 = { 0x04, 0x0019, 0x0032, 0x28 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s") +static DamageTable sDamageTable = { + 0x00, 0x02, 0x01, 0x02, 0x11, 0x02, 0x02, 0x12, 0x01, 0x02, 0x04, 0x02, 0x02, 0x02, 0x02, 0x02, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x02, 0x02, 0x08, 0x04, 0x00, 0x00, 0x04, 0x00, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s") +static s32 sNumSpawned = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s") +static Vec3f sFieldMiddle = { -1000.0f, 0.0f, 6500.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4140.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(unk_4C, 3200, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s") +static Vec3f D_80AD7114 = { 0.0f, 3.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4208.s") +static Vec3f D_80AD7120 = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD42B0.s") +static EnPoFieldInfo sPoFieldInfo[2] = { + { { 255, 170, 255 }, { 100, 0, 150 }, { 255, 85, 0 }, 248, 0x06001B70 }, + { { 255, 255, 170 }, { 255, 200, 0 }, { 160, 0, 255 }, 241, 0x06001370 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4384.s") +static Vec3f D_80AD714C = { 0.0f, 1400.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD443C.s") +static Vec3s sSpawnPositions[10]; +static u8 sSpawnSwitchFlags[10]; +static MtxF sLimb7Mtx; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD444C.s") +extern AnimationHeader D_06000924; +extern SkeletonHeader D_06006A30; +extern AnimationHeader D_06000F9C; +extern AnimationHeader D_06000608; +extern AnimationHeader D_06000454; +extern AnimationHeader D_06001360; +extern Gfx D_0404D4E0[]; +extern Gfx D_060059F0[]; +extern Gfx D_06005900[]; +extern Gfx D_06005620[]; +extern Gfx D_060066D0[]; +extern Gfx D_06004BA0[]; +extern Gfx D_06004CC0[]; +extern Gfx D_060023B0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4470.s") +void EnPoField_Init(Actor* thisx, GlobalContext* globalCtx) { + EnPoField* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4554.s") + if (sNumSpawned != 10) { + sSpawnPositions[sNumSpawned].x = this->actor.posRot.pos.x; + sSpawnPositions[sNumSpawned].y = this->actor.posRot.pos.y; + sSpawnPositions[sNumSpawned].z = this->actor.posRot.pos.z; + sSpawnSwitchFlags[sNumSpawned] = this->actor.params & 0xFF; + sNumSpawned++; + } + if (sNumSpawned >= 2) { + this->actor.params = 0xFF; + Actor_Kill(&this->actor); + return; + } + Actor_ProcessInitChain(&this->actor, sInitChain); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_06006A30, &D_06000924, this->limbDrawTable, + this->transitionDrawTable, 10); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &D_80AD7080); + Collider_InitCylinder(globalCtx, &this->flameCollider); + Collider_SetCylinder(globalCtx, &this->flameCollider, &this->actor, &D_80AD70AC); + func_80061ED4(&this->actor.colChkInfo, &sDamageTable, &D_80AD70D8); + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + Lights_PointGlowSetInfo(&this->lightInfo, this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, + this->actor.initPosRot.pos.z, 255, 255, 255, 0); + this->actor.shape.shadowDrawFunc = ActorShadow_DrawFunc_Circle; + EnPoField_SetupWaitForSpawn(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4664.s") +void EnPoField_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnPoField* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD48CC.s") + if (this->actor.params != 0xFF) { + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); + Collider_DestroyCylinder(globalCtx, &this->flameCollider); + Collider_DestroyCylinder(globalCtx, &this->collider); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4A68.s") +void EnPoField_SetupWaitForSpawn(EnPoField* this, GlobalContext* globalCtx) { + this->actor.update = EnPoField_Update; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_ENEMY); + this->actor.shape.rot.x = 0; + Lights_PointSetColorAndRadius(&this->lightInfo, 0, 0, 0, 0); + this->actionTimer = 200; + Actor_SetScale(&this->actor, 0.0f); + this->actor.flags &= ~0x00010001; + this->collider.base.acFlags &= ~1; + this->collider.base.maskA = 0x39; + this->actor.colChkInfo.health = D_80AD70D8.health; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + this->actionFunc = EnPoField_WaitForSpawn; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4CA4.s") +void EnPoField_SetupAppear(EnPoField* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06000F9C); + this->actor.draw = EnPoField_Draw; + this->lightColor.r = 255; + this->lightColor.g = 255; + this->lightColor.b = 210; + this->lightColor.a = 0; + this->actor.shape.unk_14 = 0; + this->actor.shape.unk_08 = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y; + if (this->actor.params == EN_PO_FIELD_BIG) { + this->actor.speedXZ = 12.0f; + this->collider.dim.radius = 35; + this->collider.dim.height = 100; + this->collider.dim.yShift = 10; + this->actor.shape.unk_10 = 45.0f; + this->scaleModifier = 0.014f; + this->actor.naviEnemyId = 0x5A; + } else { + this->actor.speedXZ = 0.0f; + this->collider.dim.radius = D_80AD7080.dim.radius; + this->collider.dim.height = D_80AD7080.dim.height; + this->collider.dim.yShift = D_80AD7080.dim.yShift; + this->actor.shape.unk_10 = 37.0f; + this->scaleModifier = 0.01f; + this->actor.naviEnemyId = 0x5C; + } + this->actionFunc = EnPoField_Appear; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4E48.s") +void EnPoField_SetupCirclePlayer(EnPoField* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4ED8.s") + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06000924); + this->collider.base.acFlags |= 1; + this->scaleModifier = this->actor.xzDistFromLink; + Math_Vec3f_Copy(&this->actor.initPosRot.pos, &player->actor.posRot.pos); + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + if (this->actionFunc != EnPoField_Damage) { + this->actor.flags |= 1; + this->actionTimer = 600; + this->unk_194 = 32; + } + this->actionFunc = EnPoField_CirclePlayer; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD52F0.s") +void EnPoField_SetupFlee(EnPoField* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000608, -5.0f); + this->collider.base.acFlags |= 1; + this->actionFunc = EnPoField_Flee; + this->actor.speedXZ = 12.0f; + if (this->actionFunc != EnPoField_Damage) { + this->actor.flags |= 1; + this->actor.posRot.rot.y = this->actor.shape.rot.y + 0x8000; + this->actionTimer = 2000; + this->unk_194 = 32; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD53F0.s") +void EnPoField_SetupDamage(EnPoField* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06000454, -6.0f); + if (this->collider.body.acHitItem->toucher.flags & 0x1F824) { + this->actor.posRot.rot.y = this->collider.base.ac->posRot.rot.y; + } else { + this->actor.posRot.rot.y = func_8002DA78(&this->actor, this->collider.base.ac) + 0x8000; + } + this->collider.base.acFlags &= ~3; + this->actor.speedXZ = 5.0f; + func_8003426C(&this->actor, 0x4000, 255, 0, 16); + this->actionFunc = EnPoField_Damage; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD54D4.s") +void EnPoField_SetupDeath(EnPoField* this) { + this->actionTimer = 0; + this->actor.flags &= -2; + this->actor.speedXZ = 0.0f; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + this->actor.naviEnemyId = 0xFF; + if (this->flameTimer >= 20) { + this->flameTimer = 19; + } + this->actionFunc = EnPoField_Death; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD587C.s") +void EnPoField_SetupDisappear(EnPoField* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06001360, -6.0f); + this->actionTimer = 16; + this->collider.base.acFlags &= ~3; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DISAPPEAR); + this->actionFunc = EnPoField_Disappear; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD58D4.s") +void EnPoField_SetupSoulIdle(EnPoField* this, GlobalContext* globalCtx) { + this->actor.update = EnPoField_UpdateDead; + this->actor.draw = EnPoField_DrawSoul; + this->actor.shape.shadowDrawFunc = NULL; + Actor_SetScale(&this->actor, 0.01f); + this->actor.gravity = -1.0f; + this->actor.shape.unk_08 = 1500.0f; + this->actor.shape.rot.x = -0x8000; + this->actionTimer = 60; + this->actor.posRot.pos.y -= 15.0f; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_MISC); + this->actionFunc = EnPoField_SoulIdle; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5AD8.s") +void func_80AD42B0(EnPoField* this) { + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, 0, 0, 0); + this->actor.shape.rot.y = 0; + this->lightColor.a = 0; + this->actor.shape.rot.x = 0; + this->actor.shape.unk_08 = 0.0f; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y; + this->actor.scale.x = 0.0f; + this->actor.scale.y = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_METAL_BOX_BOUND); + if (this->actor.params == EN_PO_FIELD_BIG) { + func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + } + this->actionFunc = func_80AD587C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5B18.s") +void func_80AD4384(EnPoField* this) { + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y; + Actor_SetHeight(&this->actor, -10.0f); + this->collider.dim.radius = 13; + this->collider.dim.height = 30; + this->collider.dim.yShift = 0; + this->collider.dim.pos.x = this->actor.posRot.pos.x; + this->collider.dim.pos.y = this->actor.posRot.pos.y - 20.0f; + this->collider.dim.pos.z = this->actor.posRot.pos.z; + this->collider.base.maskA = 9; + this->actor.textId = 0x5005; + this->actionTimer = 400; + this->unk_194 = 32; + this->actor.flags |= 1; + this->actionFunc = func_80AD58D4; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5C74.s") +void EnPoField_SetupSoulDisappear(EnPoField* this) { + this->actionFunc = EnPoField_SoulDisappear; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D0C.s") +void EnPoField_SetupInteractWithSoul(EnPoField* this) { + this->actionFunc = EnPoField_SoulInteract; + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y - 15.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5D60.s") +void EnPoField_CorrectYPos(EnPoField* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s") + if (this->unk_194 == 0) { + this->unk_194 = 32; + } + if (this->unk_194 != 0) { + this->unk_194 -= 1; + } + if (this->actor.groundY == -32000.0f) { + EnPoField_SetupDisappear(this); + return; + } + Math_SmoothScaleMaxF( + &this->actor.initPosRot.pos.y, + ((player->actor.posRot.pos.y > this->actor.groundY) ? player->actor.posRot.pos.y : this->actor.groundY) + 13.0f, + 0.2f, 5.0f); + this->actor.posRot.pos.y = Math_Sins(this->unk_194 * 0x800) * 13.0f + this->actor.initPosRot.pos.y; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD619C.s") +f32 EnPoField_SetFleeSpeed(EnPoField* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 speed = ((player->stateFlags1 & 0x800000) && player->rideActor != NULL) ? player->rideActor->speedXZ : 12.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6330.s") + if (this->actor.xzDistFromLink < 300.0f) { + this->actor.speedXZ = speed * 1.5f + 2.0f; + } else if (this->actor.xzDistFromLink < 400.0f) { + this->actor.speedXZ = speed * 1.25f + 2.0f; + } else if (this->actor.xzDistFromLink < 500.0f) { + this->actor.speedXZ = speed + 2.0f; + } else { + this->actor.speedXZ = 12.0f; + } + this->actor.speedXZ = CLAMP_MIN(this->actor.speedXZ, 12.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Update.s") +void EnPoField_WaitForSpawn(EnPoField* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 spawnDist; + s32 i; + UNK_TYPE sp88; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD65C8.s") + if (this->actionTimer != 0) { + this->actionTimer--; + } + if (this->actionTimer == 0) { + for (i = 0; i < sNumSpawned; i++) { + if (fabsf(sSpawnPositions[i].x - player->actor.posRot.pos.x) < 150.0f && + fabsf(sSpawnPositions[i].z - player->actor.posRot.pos.z) < 150.0f) { + if (Flags_GetSwitch(globalCtx, sSpawnSwitchFlags[i])) { + if (player->stateFlags1 & 0x800000) { // Player riding Epona + return; + } else { + this->actor.params = EN_PO_FIELD_SMALL; + spawnDist = 300.0f; + } + } else if (player->stateFlags1 & 0x800000 || Math_Rand_ZeroOne() < 0.4f) { + this->actor.params = EN_PO_FIELD_BIG; + this->spawnFlagIndex = i; + spawnDist = 480.0f; + } else { + this->actor.params = EN_PO_FIELD_SMALL; + spawnDist = 300.0f; + } + this->actor.posRot.pos.x = + Math_Sins(player->actor.shape.rot.y) * spawnDist + player->actor.posRot.pos.x; + this->actor.posRot.pos.z = + Math_Coss(player->actor.shape.rot.y) * spawnDist + player->actor.posRot.pos.z; + this->actor.posRot.pos.y = player->actor.posRot.pos.y + 1000.0f; + this->actor.posRot.pos.y = func_8003C9A4(&globalCtx->colCtx, &this->actor.floorPoly, &sp88, + &this->actor, &this->actor.posRot.pos); + if (this->actor.posRot.pos.y != -32000.0f) { + this->actor.shape.rot.y = func_8002DA78(&this->actor, &player->actor); + EnPoField_SetupAppear(this); + } else { + return; + } + } + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD66D0.s") +void EnPoField_Appear(EnPoField* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->lightColor.a = 255; + Actor_SetScale(&this->actor, this->scaleModifier); + if (this->actor.params == EN_PO_FIELD_BIG) { + EnPoField_SetupFlee(this); + } else { + EnPoField_SetupCirclePlayer(this, globalCtx); + } + } else if (this->skelAnime.animCurrentFrame > 10.0f) { + this->lightColor.a = ((this->skelAnime.animCurrentFrame - 10.0f) * 0.05f) * 255.0f; + } else { + this->actor.scale.x += this->scaleModifier * 0.1f; + this->actor.scale.y = this->actor.scale.x; + this->actor.scale.z = this->actor.scale.x; + } + this->actor.shape.unk_14 = this->lightColor.a; + this->actor.shape.rot.y = this->actor.yawTowardsLink; + if (this->actor.params == EN_PO_FIELD_BIG) { + this->actor.posRot.rot.y = this->actor.yawTowardsLink + 0x8000; + EnPoField_SetFleeSpeed(this, globalCtx); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s") +void EnPoField_CirclePlayer(EnPoField* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s32 temp_v1 = 16 - this->unk_194; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->actionTimer != 0) { + this->actionTimer--; + } + if (ABS(temp_v1) < 16) { + this->actor.posRot.rot.y += 512.0f * fabsf(Math_Sins(this->unk_194 * 0x800)); + } + Math_SmoothScaleMaxF(&this->scaleModifier, 180.0f, 0.5f, 10.0f); + Math_SmoothScaleMaxF(&this->actor.initPosRot.pos.x, player->actor.posRot.pos.x, 0.2f, 6.0f); + Math_SmoothScaleMaxF(&this->actor.initPosRot.pos.z, player->actor.posRot.pos.z, 0.2f, 6.0f); + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 1, 0x800, 0x200); + if (this->actor.initPosRot.pos.x - player->actor.posRot.pos.x > 100.0f) { + this->actor.initPosRot.pos.x = player->actor.posRot.pos.x + 100.0f; + } else if (this->actor.initPosRot.pos.x - player->actor.posRot.pos.x < -100.0f) { + this->actor.initPosRot.pos.x = player->actor.posRot.pos.x + -100.0f; + } + if (this->actor.initPosRot.pos.z - player->actor.posRot.pos.z > 100.0f) { + this->actor.initPosRot.pos.z = player->actor.posRot.pos.z + 100.0f; + } else if (this->actor.initPosRot.pos.z - player->actor.posRot.pos.z < -100.0f) { + this->actor.initPosRot.pos.z = player->actor.posRot.pos.z + -100.0f; + } + this->actor.posRot.pos.x = + this->actor.initPosRot.pos.x - (Math_Sins(this->actor.posRot.rot.y) * this->scaleModifier); + this->actor.posRot.pos.z = + this->actor.initPosRot.pos.z - (Math_Coss(this->actor.posRot.rot.y) * this->scaleModifier); + if (this->actionTimer == 0) { + EnPoField_SetupDisappear(this); + } else { + EnPoField_SpawnFlame(this); + } + EnPoField_CorrectYPos(this, globalCtx); + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s") +void EnPoField_Flee(EnPoField* this, GlobalContext* globalCtx) { + f32 temp_f6; + s16 phi_t0; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->actionTimer != 0) { + this->actionTimer--; + } + if (func_8002DBB0(&this->actor, &sFieldMiddle) > 3000.0f) { + phi_t0 = (s16)(this->actor.yawTowardsLink - func_8002DAC0(&this->actor, &sFieldMiddle) - 0x8000) * 0.2f; + } else { + phi_t0 = 0; + } + Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.yawTowardsLink - phi_t0, 6, 0x400); + EnPoField_SetFleeSpeed(this, globalCtx); + this->actor.posRot.rot.y = this->actor.shape.rot.y + 0x8000; + temp_f6 = Math_Sins(this->actionTimer * 0x800) * 3.0f; + this->actor.posRot.pos.x -= temp_f6 * Math_Coss(this->actor.shape.rot.y); + this->actor.posRot.pos.z += temp_f6 * Math_Sins(this->actor.shape.rot.y); + if (this->actionTimer == 0 || this->actor.xzDistFromLink > 1500.0f) { + EnPoField_SetupDisappear(this); + } else { + EnPoField_CorrectYPos(this, globalCtx); + } + func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); +} + +void EnPoField_Damage(EnPoField* this, GlobalContext* globalCtx) { + Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + if (this->actor.colChkInfo.health == 0) { + EnPoField_SetupDeath(this); + } else if (this->actor.params == EN_PO_FIELD_BIG) { + EnPoField_SetupFlee(this); + } else { + EnPoField_SetupCirclePlayer(this, globalCtx); + } + } +} + +void EnPoField_Death(EnPoField* this, GlobalContext* globalCtx) { + Vec3f sp6C; + f32 sp68; + s32 pad; + s32 pad1; + f32 temp_f0; + + this->actionTimer++; + if (this->actionTimer < 8) { + if (this->actionTimer < 5) { + sp6C.y = Math_Sins(this->actionTimer * 0x1000 - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); + sp68 = Math_Coss(this->actionTimer * 0x1000 - 0x4000) * 23.0f; + sp6C.x = Math_Sins(func_8005A9F4(ACTIVE_CAM) + 0x4800) * sp68 + this->actor.posRot.pos.x; + sp6C.z = Math_Coss(func_8005A9F4(ACTIVE_CAM) + 0x4800) * sp68 + this->actor.posRot.pos.z; + } else { + sp6C.y = this->actor.posRot.pos.y + 40.0f + 15.0f * (this->actionTimer - 5); + sp6C.x = Math_Sins(func_8005A9F4(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.x; + sp6C.z = Math_Coss(func_8005A9F4(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.z; + } + EffectSsDeadDb_Spawn(globalCtx, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255, + 255, 0, 0, 255, 1, 9, 1); + sp6C.x = (this->actor.posRot.pos.x + this->actor.posRot.pos.x) - sp6C.x; + sp6C.z = (this->actor.posRot.pos.z + this->actor.posRot.pos.z) - sp6C.z; + EffectSsDeadDb_Spawn(globalCtx, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255, + 255, 0, 0, 255, 1, 9, 1); + sp6C.x = this->actor.posRot.pos.x; + sp6C.z = this->actor.posRot.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &sp6C, &D_80AD7114, &D_80AD7120, this->actionTimer * 10 + 80, 0, 255, 255, 255, + 255, 0, 0, 255, 1, 9, 1); + if (this->actionTimer == 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_EXTINCT); + } + } else if (this->actionTimer == 28) { + EnPoField_SetupSoulIdle(this, globalCtx); + } else if (this->actionTimer >= 19) { + temp_f0 = (28 - this->actionTimer) * 0.001f; + this->actor.posRot.pos.y += 5.0f; + this->actor.scale.z = temp_f0; + this->actor.scale.y = temp_f0; + this->actor.scale.x = temp_f0; + } + if (this->actionTimer == 18) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DEAD2); + } +} + +void EnPoField_Disappear(EnPoField* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->actionTimer != 0) { + this->actionTimer--; + } + this->actor.shape.rot.y += 0x1000; + this->lightColor.a = this->actionTimer * 15.9375f; + this->actor.shape.unk_14 = this->lightColor.a; + if (this->actionTimer == 0) { + EnPoField_SetupWaitForSpawn(this, globalCtx); + } +} + +void EnPoField_SoulIdle(EnPoField* this, GlobalContext* globalCtx) { + if (this->actionTimer != 0) { + this->actionTimer--; + } + if (this->actor.bgCheckFlags & 1) { + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.posRot.pos, 6.0f, 0, 1, 1, 15, OBJECT_PO_FIELD, 10, + D_06004BA0); + func_80AD42B0(this); + } else if (this->actionTimer == 0) { + EnPoField_SetupWaitForSpawn(this, globalCtx); + } + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 10.0f, 4); +} + +void EnPoField_SoulUpdateProperties(EnPoField* this, s32 arg1) { + EnPoFieldInfo* info = &sPoFieldInfo[this->actor.params]; + f32 multiplier; + + this->lightColor.a = CLAMP(this->lightColor.a + arg1, 0, 255); + if (arg1 < 0) { + multiplier = this->lightColor.a * 0.003921569f; + this->actor.scale.z = 0.0056000003f * multiplier + 0.00140000007f; + this->actor.scale.x = 0.0056000003f * multiplier + 0.00140000007f; + this->actor.scale.y = 0.007f - 0.007f * multiplier + 0.007f; + } else { + multiplier = 1.0f; + this->actor.scale.z = this->lightColor.a * 2.7450982e-05f; + this->actor.scale.y = this->lightColor.a * 2.7450982e-05f; + this->actor.scale.x = this->lightColor.a * 2.7450982e-05f; + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + (0.05882353f * this->lightColor.a); + } + this->lightColor.r = info->lightColor.r * multiplier; + this->lightColor.g = info->lightColor.g * multiplier; + this->lightColor.b = info->lightColor.b * multiplier; + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, info->lightColor.r, info->lightColor.g, info->lightColor.b, + this->lightColor.a * 0.78431373f); +} + +void func_80AD587C(EnPoField* this, GlobalContext* globalCtx) { + this->actor.initPosRot.pos.y += 2.0f; + EnPoField_SoulUpdateProperties(this, 20); + if (this->lightColor.a == 255) { + func_80AD4384(this); + } +} + +void func_80AD58D4(EnPoField* this, GlobalContext* globalCtx) { + if (this->actionTimer != 0) { + this->actionTimer--; + } + if (func_8002F194(&this->actor, globalCtx) != 0) { + EnPoField_SetupInteractWithSoul(this); + return; + } + if (this->actionTimer == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + this->actor.flags &= ~0x10000; + EnPoField_SetupSoulDisappear(this); + return; + } + if (this->collider.base.maskA & 2) { + this->actor.flags |= 0x10000; + func_8002F2F4(&this->actor, globalCtx); + } else { + this->actor.flags &= ~0x10000; + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + this->actor.posRot.pos.y = Math_Sins(this->unk_194 * 0x800) * 5.0f + this->actor.initPosRot.pos.y; + if (this->unk_194 != 0) { + this->unk_194 -= 1; + } + if (this->unk_194 == 0) { + this->unk_194 = 32; + } + this->collider.dim.pos.y = this->actor.posRot.pos.y - 20.0f; + Actor_SetHeight(&this->actor, -10.0f); + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, this->lightInfo.params.point.color[0], + this->lightInfo.params.point.color[1], this->lightInfo.params.point.color[2], + this->lightColor.a * 0.78431374f); +} + +void EnPoField_SoulDisappear(EnPoField* this, GlobalContext* globalCtx) { + EnPoField_SoulUpdateProperties(this, -13); + if (this->lightColor.a == 0) { + EnPoField_SetupWaitForSpawn(this, globalCtx); + } +} + +void EnPoField_SoulInteract(EnPoField* this, GlobalContext* globalCtx) { + if (this->actor.textId != 0x5005) { + EnPoField_SoulUpdateProperties(this, -13); + } else { + func_8002F974(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + } + if (func_8010BDBC(&globalCtx->msgCtx) == 4) { + if (func_80106BC8(globalCtx) != 0) { + func_800F8A44(&this->actor.projectedPos, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + if (globalCtx->msgCtx.choiceIndex == 0) { + if (Inventory_HasEmptyBottle()) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_BIG_GET); + if (this->actor.params == 0) { + Item_Give(globalCtx, ITEM_POE); + this->actor.textId = 0x5008; + } else { + this->actor.textId = 0x508F; + Item_Give(globalCtx, ITEM_BIG_POE); + Flags_SetSwitch(globalCtx, sSpawnSwitchFlags[this->spawnFlagIndex]); + } + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + this->actor.textId = 0x5006; + } + } else { + this->actor.textId = 0x5007; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + } + func_8010B720(globalCtx, this->actor.textId); + return; + } + } else if (func_8002F334(&this->actor, globalCtx) != 0) { + EnPoField_SetupSoulDisappear(this); + } +} + +void EnPoField_TestForDamage(EnPoField* this, GlobalContext* globalCtx) { + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (Actor_ApplyDamage(&this->actor) == 0) { + func_80032C7C(globalCtx, &this->actor); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DEAD); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DAMAGE); + } + EnPoField_SetupDamage(this); + } + } +} + +void EnPoField_SpawnFlame(EnPoField* this) { + if (this->flameTimer == 0) { + this->flamePosition.x = this->lightInfo.params.point.x; + this->flamePosition.y = this->lightInfo.params.point.y; + this->flamePosition.z = this->lightInfo.params.point.z; + this->flameTimer = 70; + this->flameRotation = this->actor.shape.rot.y; + } +} + +void EnPoField_UpdateFlame(EnPoField* this, GlobalContext* globalCtx) { + if (this->flameTimer != 0) { + if (this->flameTimer != 0) { + this->flameTimer--; + } + if (this->flameCollider.base.atFlags & 2) { + this->flameCollider.base.atFlags &= ~2; + this->flameTimer = 19; + } + if (this->flameTimer < 20) { + Math_ApproxF(&this->flameScale, 0.0f, 0.00015f); + return; + } + if (Math_ApproxF(&this->flameScale, 0.003f, 0.0006f) != 0) { + this->flamePosition.x += 2.5f * Math_Sins(this->flameRotation); + this->flamePosition.z += 2.5f * Math_Coss(this->flameRotation); + } + this->flameCollider.dim.pos.x = this->flamePosition.x; + this->flameCollider.dim.pos.y = this->flamePosition.y; + this->flameCollider.dim.pos.z = this->flamePosition.z; + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->flameCollider.base); + } +} + +void EnPoField_DrawFlame(EnPoField* this, GlobalContext* globalCtx) { + f32 sp4C; + s32 pad; + + if (this->flameTimer != 0) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1669); + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, + (globalCtx->gameplayFrames * -20) % 512, 32, 128)); + sp4C = this->flameScale * 85000.0f; + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, sp4C); + Matrix_Translate(this->flamePosition.x, this->flamePosition.y, this->flamePosition.z, MTXMODE_NEW); + Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) + 0x8000) * 0.0000958738f, MTXMODE_APPLY); + if (this->flameTimer >= 20) { + gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); + Matrix_Scale(this->flameScale, this->flameScale, this->flameScale, MTXMODE_APPLY); + } else { + gDPSetEnvColor(POLY_XLU_DISP++, sp4C, 0, 0, 0); + Matrix_Scale((this->flameScale * 0.7f) + 0.00090000004f, (0.003f - this->flameScale) + 0.003f, 0.003f, + MTXMODE_APPLY); + } + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1709), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1712); + } +} + +void func_80AD619C(EnPoField* this) { + s16 temp_var; + + if (this->actionFunc == EnPoField_Flee) { + this->lightColor.r = CLAMP_MAX((s16)(this->lightColor.r + 5), 80); + this->lightColor.g = CLAMP_MAX((s16)(this->lightColor.g + 5), 255); + temp_var = this->lightColor.b + 5; + this->lightColor.b = CLAMP_MAX(temp_var, 225); + } else if (this->actionFunc == EnPoField_Damage) { + if (this->actor.dmgEffectTimer & 2) { + this->lightColor.r = 0; + this->lightColor.g = 0; + this->lightColor.b = 0; + } else { + this->lightColor.r = 80; + this->lightColor.g = 255; + this->lightColor.b = 225; + } + } else { + this->lightColor.r = CLAMP_MAX((s16)(this->lightColor.r + 5), 255); + this->lightColor.g = CLAMP_MAX((s16)(this->lightColor.g + 5), 255); + if (this->lightColor.b > 210) { + temp_var = this->lightColor.b - 5; + this->lightColor.b = CLAMP_MIN(temp_var, 210); + } else { + temp_var = this->lightColor.b + 5; + this->lightColor.b = CLAMP_MAX(temp_var, 210); + } + } +} + +void func_80AD6330(EnPoField* this) { + f32 rand; + + if (this->actionFunc == EnPoField_Appear && this->skelAnime.animCurrentFrame < 12.0f) { + this->soulColor.r = this->soulColor.g = this->soulColor.b = + (s16)(this->skelAnime.animCurrentFrame * 16.66f) + 55; + this->soulColor.a = this->skelAnime.animCurrentFrame * 16.666666f; + } else { + rand = Math_Rand_ZeroOne(); + this->soulColor.r = (s16)(rand * 30.0f) + 225; + this->soulColor.g = (s16)(rand * 100.0f) + 155; + this->soulColor.b = (s16)(rand * 160.0f) + 95; + this->soulColor.a = 200; + } +} + +void EnPoField_Update(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnPoField* this = THIS; + + EnPoField_TestForDamage(this, globalCtx); + this->actionFunc(this, globalCtx); + EnPoField_UpdateFlame(this, globalCtx); + if (this->actionFunc == EnPoField_Flee || this->actionFunc == EnPoField_Damage || + this->actionFunc == EnPoField_Appear) { + Actor_MoveForward(&this->actor); + } + if (this->actionFunc != EnPoField_WaitForSpawn) { + Actor_SetHeight(&this->actor, 42.0f); + func_8002E4B4(globalCtx, &this->actor, 0.0f, 27.0f, 60.0f, 4); + func_80AD619C(this); + func_80AD6330(this); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + if (this->collider.base.acFlags & 1) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + } +} + +s32 EnPoField_OverrideLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx, Gfx** gfxP) { + EnPoField* this = THIS; + + if (this->lightColor.a == 0 || limbIndex == 7 || (this->actionFunc == EnPoField_Death && this->actionTimer >= 2)) { + *dList = NULL; + } else if (this->actor.params == EN_PO_FIELD_BIG) { + if (limbIndex == 1) { + *dList = D_06005900; + } else if (limbIndex == 8) { + *dList = D_06005620; + } else if (limbIndex == 9) { + *dList = D_060059F0; + } + } + if (this->actionFunc == EnPoField_Disappear && limbIndex == 7) { + Matrix_Scale(this->actionTimer * 0.0625f, this->actionTimer * 0.0625f, this->actionTimer * 0.0625f, 1); + } + return 0; +} + +void EnPoField_PostLimDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfxP) { + EnPoField* this = THIS; + + if (this->actionFunc == EnPoField_Death && this->actionTimer >= 2 && limbIndex == 8) { + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1916), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList((*gfxP)++, D_060066D0); + } + if (limbIndex == 7) { + Vec3f vec; + Matrix_MultVec3f(&D_80AD714C, &vec); + if (this->actionFunc == EnPoField_Death && this->actionTimer >= 19 && this->actor.scale.x != 0.0f) { + f32 mtxScale = 0.01f / this->actor.scale.x; + Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); + } + Matrix_Get(&sLimb7Mtx); + if (this->actionFunc == EnPoField_Death && this->actionTimer == 27) { + this->actor.posRot.pos.x = sLimb7Mtx.wx; + this->actor.posRot.pos.y = sLimb7Mtx.wy; + this->actor.posRot.pos.z = sLimb7Mtx.wz; + } + Lights_PointGlowSetInfo(&this->lightInfo, vec.x, vec.y, vec.z, this->soulColor.r, this->soulColor.g, + this->soulColor.b, this->soulColor.a * 0.7843137383460999f); + } +} + +void EnPoField_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnPoField* this = THIS; + EnPoFieldInfo* info = &sPoFieldInfo[this->actor.params]; + + if (this->actionFunc != EnPoField_WaitForSpawn) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1976); + func_80093D18(globalCtx->state.gfxCtx); + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x0A, + Gfx_EnvColor(globalCtx->state.gfxCtx, info->envColor.r, info->envColor.g, info->envColor.b, 255)); + if (this->lightColor.a == 255 || this->lightColor.a == 0) { + gSPSegment(POLY_OPA_DISP++, 0x08, + Gfx_EnvColor(globalCtx->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b, + this->lightColor.a)); + gSPSegment(POLY_OPA_DISP++, 0x0C, D_80116280 + 2); + POLY_OPA_DISP = + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnPoField_OverrideLimbDraw2, EnPoField_PostLimDraw2, &this->actor, POLY_OPA_DISP); + } else { + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_EnvColor(globalCtx->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b, + this->lightColor.a)); + gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280); + POLY_XLU_DISP = + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnPoField_OverrideLimbDraw2, EnPoField_PostLimDraw2, &this->actor, POLY_XLU_DISP); + } + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, this->soulColor.r, this->soulColor.g, this->soulColor.b, 255); + Matrix_Put(&sLimb7Mtx); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2033), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06004BA0); + gSPDisplayList(POLY_OPA_DISP++, D_06004CC0); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2039); + } + EnPoField_DrawFlame(this, globalCtx); +} + +void EnPoField_UpdateDead(Actor* thisx, GlobalContext* globalCtx) { + EnPoField* this = THIS; + + this->actionFunc(this, globalCtx); + if (this->actionFunc == EnPoField_SoulIdle) { + func_80AD6330(this); + } + EnPoField_UpdateFlame(this, globalCtx); +} + +void EnPoField_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { + EnPoField* this = THIS; + s32 pad; + EnPoFieldInfo* info = &sPoFieldInfo[this->actor.params]; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2077); + if (this->actionFunc == EnPoField_SoulIdle) { + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x0A, + Gfx_EnvColor(globalCtx->state.gfxCtx, info->envColor.r, info->envColor.g, info->envColor.b, 255)); + Lights_PointGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, this->soulColor.r, this->soulColor.g, this->soulColor.b, 200); + gDPSetEnvColor(POLY_OPA_DISP++, this->soulColor.r, this->soulColor.g, this->soulColor.b, 255); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2104), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_06004BA0); + gSPDisplayList(POLY_OPA_DISP++, D_06004CC0); + } else { + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, + (globalCtx->gameplayFrames * info->unk_9) & 0x1FF, 0x20, 0x80)); + gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(info->unk_C)); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, info->primColor.r, info->primColor.g, info->primColor.b, + this->lightColor.a); + gDPSetEnvColor(POLY_XLU_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 255); + Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) + 0x8000) * 9.58738e-05f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2143), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_060023B0); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2149); + EnPoField_DrawFlame(this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h index 752c0b56ae..ead31b949a 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h @@ -6,9 +6,41 @@ struct EnPoField; +typedef void (*EnPoFieldActionFunc)(struct EnPoField*, GlobalContext*); + +typedef enum { + EN_PO_FIELD_SMALL, + EN_PO_FIELD_BIG +} EnPoFieldSize; + +typedef struct { + /* 0x0000 */ Color_RGB8 primColor; + /* 0x0003 */ Color_RGB8 lightColor; + /* 0x0006 */ Color_RGB8 envColor; + /* 0x0009 */ s8 unk_9; + /* 0x000C */ UNK_PTR unk_C; +} EnPoFieldInfo; // size = 0x10 + typedef struct EnPoField { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x190]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnPoFieldActionFunc actionFunc; + /* 0x0194 */ u8 unk_194; + /* 0x0195 */ u8 spawnFlagIndex; + /* 0x0196 */ s16 actionTimer; + /* 0x0198 */ s16 flameRotation; + /* 0x019A */ s16 flameTimer; + /* 0x019C */ Vec3s limbDrawTable[10]; + /* 0x01D8 */ Vec3s transitionDrawTable[10]; + /* 0x0214 */ Color_RGBA8 lightColor; + /* 0x0214 */ Color_RGBA8 soulColor; + /* 0x021C */ f32 scaleModifier; + /* 0x0220 */ f32 flameScale; + /* 0x0224 */ Vec3f flamePosition; + /* 0x0230 */ LightNode* lightNode; + /* 0x0234 */ LightInfo lightInfo; + /* 0x0244 */ ColliderCylinder collider; + /* 0x0290 */ ColliderCylinder flameCollider; } EnPoField; // size = 0x02DC extern const ActorInit En_Po_Field_InitVars; diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index abd6b82523..8413d4c082 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -1,3 +1,9 @@ +/* + * File: z_en_po_relay.c + * Overlay: ovl_En_Po_Relay + * Description: Dampé's Ghost + */ + #include "z_en_po_relay.h" #define FLAGS 0x00011019 @@ -9,7 +15,24 @@ void EnPoRelay_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnPoRelay_Update(Actor* thisx, GlobalContext* globalCtx); void EnPoRelay_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void EnPoRelay_Idle(EnPoRelay* this, GlobalContext* globalCtx); +void EnPoRelay_Race(EnPoRelay* this, GlobalContext* globalCtx); +void EnPoRelay_EndRace(EnPoRelay* this, GlobalContext* globalCtx); +void EnPoRelay_Talk(EnPoRelay* this, GlobalContext* globalCtx); +void EnPoRelay_Talk2(EnPoRelay* this, GlobalContext* globalCtx); +void EnPoRelay_DisappearAndReward(EnPoRelay* this, GlobalContext* globalCtx); +void EnPoRelay_SetupIdle(EnPoRelay* this); + +Vec3s D_80AD8C30[] = { + { 0xFFC4, 0xFDEE, 0xF47A }, { 0x0186, 0xFE0C, 0xF47A }, { 0x0186, 0xFE0C, 0xF0F6 }, { 0x00D2, 0xFDEE, 0xF0F6 }, + { 0x00D2, 0xFD9E, 0xEEDA }, { 0x023A, 0xFDC6, 0xEEDA }, { 0x023A, 0xFDC6, 0xED18 }, { 0x00D2, 0xFDC6, 0xED18 }, + { 0x00D2, 0xFDC6, 0xEBCE }, { 0x00D2, 0xFDC6, 0xEAA2 }, { 0x023A, 0xFDC6, 0xEAA2 }, { 0x023A, 0xFDC6, 0xEBB0 }, + { 0x04EC, 0xFD9E, 0xEBB0 }, { 0x0672, 0xFD62, 0xED18 }, { 0x0672, 0xFD30, 0xEE80 }, { 0x07DA, 0xFD26, 0xEE80 }, + { 0x07DA, 0xFD26, 0xEF70 }, { 0x07DA, 0xFD26, 0xF204 }, { 0x0672, 0xFD44, 0xF204 }, { 0x0672, 0xFD6C, 0xF3C6 }, + { 0x088E, 0xFD6C, 0xF3C6 }, { 0x088E, 0xFDB2, 0xF5E2 }, { 0x099C, 0xFDD0, 0xF5E2 }, { 0x0B54, 0xFE66, 0xF772 }, + { 0x0B4E, 0xFE66, 0xF87E }, { 0x0B4A, 0xFE66, 0xF97A }, { 0x0B4A, 0xFE98, 0xF9FC }, { 0x0BAE, 0xFE98, 0xF9FC }, +}; + const ActorInit En_Po_Relay_InitVars = { ACTOR_EN_PO_RELAY, ACTORTYPE_NPC, @@ -21,35 +44,364 @@ const ActorInit En_Po_Relay_InitVars = { (ActorFunc)EnPoRelay_Update, (ActorFunc)EnPoRelay_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 }, + { 30, 52, 0, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD790C.s") +static s32 D_80AD8D24 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7944.s") +static InitChainEntry sInitChain[] = { + ICHAIN_S8(naviEnemyId, 0x4F, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 1500, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7984.s") +static Vec3f D_80AD8D30 = { 0.0f, 1.5f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A4C.s") +static Vec3f D_80AD8D3C = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7A88.s") +static Vec3f D_80AD8D48 = { 0.0f, 1200.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7B34.s") +static UNK_PTR sEyesSegments[] = { + 0x06003B40, + 0x06004340, + 0x06004B40, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7BF0.s") +extern FlexSkeletonHeader D_0600BE40; +extern AnimationHeader D_06003768; +extern Gfx D_0600B838[]; +extern Gfx D_0600BBA0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD7C64.s") +void EnPoRelay_Init(Actor* thisx, GlobalContext* globalCtx) { + EnPoRelay* this = THIS; + s32 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8174.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 42.0f); + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_0600BE40, &D_06003768, this->limbDrawTable, + this->transitionDrawTable, 18); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, + this->actor.initPosRot.pos.z, 255, 255, 255, 200); + this->lightColor.a = 255; + temp = 1; + if (D_80AD8D24 != 0) { + Actor_Kill(&this->actor); + } else { + D_80AD8D24 = temp; + Actor_SetTextWithPrefix(globalCtx, &this->actor, 65); + this->textId = this->actor.textId; + EnPoRelay_SetupIdle(this); + } + this->actor.params &= 0x3F; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD8234.s") +void EnPoRelay_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnPoRelay* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD830C.s") + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Update.s") +void EnPoRelay_SetupIdle(EnPoRelay* this) { + this->unk_195 = 32; + this->pathIndex = 0; + this->actor.room = -1; + this->actor.shape.rot.y = 0; + this->actor.posRot.rot.y = -0x8000; + this->actor.colChkInfo.mass = 0xFE; + this->actionFunc = EnPoRelay_Idle; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s") +void EnPoRelay_Vec3sToVec3f(Vec3f* dest, Vec3s* src) { + dest->x = src->x; + dest->y = src->y; + dest->z = src->z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s") +void EnPoRelay_SetupRace(EnPoRelay* this) { + Vec3f vec; + + EnPoRelay_Vec3sToVec3f(&vec, &D_80AD8C30[this->pathIndex]); + this->actionTimer = ((s16)(this->actor.shape.rot.y - this->actor.posRot.rot.y - 0x8000) >> 0xB) % 32U; + func_80088B34(0); + this->hookshotSlotFull = INV_CONTENT(ITEM_HOOKSHOT) != ITEM_NONE; + this->unk_19A = func_8002DAC0(&this->actor, &vec); + this->actor.flags |= 0x8000000; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + this->actionFunc = EnPoRelay_Race; +} + +void EnPoRelay_SetupEndRace(EnPoRelay* this) { + this->actor.posRot.rot.y = this->actor.initPosRot.rot.y + 0xC000; + this->actor.flags &= ~0x08000000; + this->actor.speedXZ = 0.0f; + this->actionFunc = EnPoRelay_EndRace; +} + +void EnPoRelay_CorrectY(EnPoRelay* this) { + Math_ApproxF(&this->actor.initPosRot.pos.y, D_80AD8C30[(this->pathIndex >= 28) ? 27 : this->pathIndex].y + 45.0f, + 2.0f); + this->actor.posRot.pos.y = Math_Sins(this->unk_195 * 0x800) * 8.0f + this->actor.initPosRot.pos.y; +} + +void EnPoRelay_Idle(EnPoRelay* this, GlobalContext* globalCtx) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); + if (func_8002F194(&this->actor, globalCtx) != 0) { + this->actor.flags &= ~0x10000; + this->actionFunc = EnPoRelay_Talk; + } else if (this->actor.xzDistFromLink < 250.0f) { + this->actor.flags |= 0x10000; + this->actor.textId = this->textId; + func_8002F2CC(&this->actor, globalCtx, 250.0f); + } + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); +} + +void EnPoRelay_Talk(EnPoRelay* this, GlobalContext* globalCtx) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); + if (func_8002F334(&this->actor, globalCtx) != 0) { + Actor_SetTextWithPrefix(globalCtx, &this->actor, 0x2F); + this->textId = this->actor.textId; + EnPoRelay_SetupRace(this); + } + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); +} + +#ifdef NON_MATCHING +// Single stack difference +void EnPoRelay_Race(EnPoRelay* this, GlobalContext* globalCtx) { // saved, sp64 + Player* player = PLAYER; // sp5C + Vec3f vec; // sp50 + f32 rand; + f32 multiplier; // sp48 + f32 speed; + + if (this->actionTimer != 0) { + this->actionTimer--; + } + if (this->actionTimer == 0 && Math_Rand_ZeroOne() < 0.03f) { + this->actionTimer = 32; + if (this->pathIndex < 23) { + rand = Math_Rand_ZeroOne() * 3.0f; + if (rand < 1.0f) { + multiplier = 1.0f; + } else if (rand < 2.0f) { + multiplier = -1.0f; + } else { + multiplier = 0.0f; + } + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HONOTRAP, + Math_Coss(this->unk_19A) * (30.0f * multiplier) + this->actor.posRot.pos.x, + this->actor.posRot.pos.y, + Math_Sins(this->unk_19A) * (30.0f * multiplier) + this->actor.posRot.pos.z, 0, + (this->unk_19A + 0x8000) - (0x2000 * multiplier), 0, 2); + } + } + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_19A, 2, 0x1000, 0x100); + this->actor.shape.rot.y = this->actor.posRot.rot.y + (this->actionTimer * 0x800) + 0x8000; + if (this->pathIndex < 23) { + // If the player travels along a different path to Dampé that converges later + if ((Math3D_PointInSquare2D(660.0f, 840.0f, -4480.0f, -3760.0f, player->actor.posRot.pos.x, + player->actor.posRot.pos.z) != 0) || + (Math3D_PointInSquare2D(1560.0f, 1740.0f, -4030.0f, -3670.0f, player->actor.posRot.pos.x, + player->actor.posRot.pos.z) != 0) || + (Math3D_PointInSquare2D(1580.0f, 2090.0f, -3030.0f, -2500.0f, player->actor.posRot.pos.x, + player->actor.posRot.pos.z) != 0)) { + speed = (this->hookshotSlotFull) ? player->actor.speedXZ * 1.4f : player->actor.speedXZ * 1.2f; + } else if (this->actor.xzDistFromLink < 150.0f) { + speed = (this->hookshotSlotFull) ? player->actor.speedXZ * 1.2f : player->actor.speedXZ; + } else if (this->actor.xzDistFromLink < 300.0f) { + speed = (this->hookshotSlotFull) ? player->actor.speedXZ : player->actor.speedXZ * 0.8f; + } else if (this->hookshotSlotFull) { + speed = 4.5f; + } else { + speed = 3.5f; + } + multiplier = 250.0f - this->actor.xzDistFromLink; + multiplier = CLAMP_MIN(multiplier, 0.0f); + speed += multiplier * 0.02f + 1.0f; + Math_SmoothScaleMaxF(&this->actor.speedXZ, speed, 0.5f, 1.5f); + } else { + Math_SmoothScaleMaxF(&this->actor.speedXZ, 3.5f, 0.5f, 1.5f); + } + EnPoRelay_Vec3sToVec3f(&vec, &D_80AD8C30[this->pathIndex]); + if (func_8002DBB0(&this->actor, &vec) < 40.0f) { + this->pathIndex++; + EnPoRelay_Vec3sToVec3f(&vec, &D_80AD8C30[this->pathIndex]); + if (this->pathIndex == 28) { + EnPoRelay_SetupEndRace(this); + } else if (this->pathIndex == 9) { + Flags_SetSwitch(globalCtx, 0x35); + } else if (this->pathIndex == 17) { + Flags_SetSwitch(globalCtx, 0x36); + } else if (this->pathIndex == 25) { + Flags_SetSwitch(globalCtx, 0x37); + } + } + this->unk_19A = func_8002DAC0(&this->actor, &vec); + func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Race.s") +#endif + +void EnPoRelay_EndRace(EnPoRelay* this, GlobalContext* globalCtx) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, -0x4000, 0x800); + if (func_8002F194(&this->actor, globalCtx) != 0) { + this->actionFunc = EnPoRelay_Talk2; + } else if (globalCtx->roomCtx.curRoom.num == 5) { + Actor_Kill(&this->actor); + gSaveContext.timer1State = 0; + } else if (func_8002E12C(&this->actor, 150.0f, 0x3000) != 0) { + this->actor.textId = this->textId; + func_8002F2CC(&this->actor, globalCtx, 250.0f); + } + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); +} + +void EnPoRelay_Talk2(EnPoRelay* this, GlobalContext* globalCtx) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.yawTowardsLink, 0x100); + if (func_8010BDBC(&globalCtx->msgCtx) == 5) { + if (func_80106BC8(globalCtx) != 0) { + if (this->hookshotSlotFull != 0) { + Actor_SetTextWithPrefix(globalCtx, &this->actor, 0x2E); + } else { + Actor_SetTextWithPrefix(globalCtx, &this->actor, 0x2D); + } + this->textId = this->actor.textId; + func_8010B720(globalCtx, this->actor.textId); + } + } else if (func_8002F334(&this->actor, globalCtx) != 0) { + gSaveContext.timer1State = 0; + this->actionTimer = 0; + this->actionFunc = EnPoRelay_DisappearAndReward; + } + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); +} + +void EnPoRelay_DisappearAndReward(EnPoRelay* this, GlobalContext* globalCtx) { + Vec3f vec; + f32 multiplier; + s32 pad; + Vec3f sp60; + s32 pad1; + + this->actionTimer++; + if (this->actionTimer < 8) { + if (this->actionTimer < 5) { + vec.y = Math_Sins((this->actionTimer * 0x1000) - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); + multiplier = Math_Coss((this->actionTimer * 0x1000) - 0x4000) * 23.0f; + vec.x = (Math_Sins(func_8005A9F4(ACTIVE_CAM) + 0x4800) * multiplier) + this->actor.posRot.pos.x; + vec.z = (Math_Coss(func_8005A9F4(ACTIVE_CAM) + 0x4800) * multiplier) + this->actor.posRot.pos.z; + } else { + vec.y = this->actor.posRot.pos.y + 40.0f + 15.0f * (this->actionTimer - 5); + vec.x = (Math_Sins(func_8005A9F4(ACTIVE_CAM) + 0x4800) * 23.0f) + this->actor.posRot.pos.x; + vec.z = (Math_Coss(func_8005A9F4(ACTIVE_CAM) + 0x4800) * 23.0f) + this->actor.posRot.pos.z; + } + EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255, + 255, 0, 0, 255, 1, 9, true); + vec.x = (this->actor.posRot.pos.x + this->actor.posRot.pos.x) - vec.x; + vec.z = (this->actor.posRot.pos.z + this->actor.posRot.pos.z) - vec.z; + EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255, + 255, 0, 0, 255, 1, 9, true); + vec.x = this->actor.posRot.pos.x; + vec.z = this->actor.posRot.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AD8D30, &D_80AD8D3C, this->actionTimer * 10 + 80, 0, 255, 255, 255, + 255, 0, 0, 255, 1, 9, true); + if (this->actionTimer == 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_EXTINCT); + } + } + if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.001f) != 0) { + if (this->hookshotSlotFull != 0) { + sp60.x = this->actor.posRot.pos.x; + sp60.y = this->actor.groundY; + sp60.z = this->actor.posRot.pos.z; + if (gSaveContext.timer1Value < gSaveContext.dampeRaceTime) { + gSaveContext.dampeRaceTime = gSaveContext.timer1Value; + } + if (Flags_GetCollectible(globalCtx, this->actor.params) == 0 && gSaveContext.timer1Value <= 60) { + Item_DropCollectible2(globalCtx, &sp60, (this->actor.params << 8) + (0x4000 | ITEM00_HEART_PIECE)); + } else { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, sp60.x, sp60.y, sp60.z, 0, 0, 0, 2); + } + } else { + Flags_SetTempClear(globalCtx, 4); + gSaveContext.dampeRaceTime = gSaveContext.timer1Value; + } + Actor_Kill(&this->actor); + } + this->actor.scale.y = this->actor.scale.x; + this->actor.scale.z = this->actor.scale.x; + this->actor.posRot.pos.y += 10.0f; +} + +void EnPoRelay_Update(Actor* thisx, GlobalContext* globalCtx) { + EnPoRelay* this = THIS; + s32 pad; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + EnPoRelay_CorrectY(this); + func_8002E4B4(globalCtx, &this->actor, 0.0f, 27.0f, 60.0f, 4); + Collider_CylinderUpdate(&this->actor, &this->collider); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + Actor_SetHeight(&this->actor, 50.0f); + if (this->unk_195 != 0) { + this->unk_195 -= 1; + } + if (this->unk_195 == 0) { + this->unk_195 = 32; + } + this->eyeTextureIdx++; + if (this->eyeTextureIdx == 3) { + this->eyeTextureIdx = 0; + } +} + +void EnPoRelay_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { + EnPoRelay* this = THIS; + + if (limbIndex == 14) { + f32 rand; + Vec3f vec; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 885); + rand = Math_Rand_ZeroOne(); + this->lightColor.r = (s16)(rand * 30.0f) + 225; + this->lightColor.g = (s16)(rand * 100.0f) + 155; + this->lightColor.b = (s16)(rand * 160.0f) + 95; + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 128); + gSPDisplayList(POLY_OPA_DISP++, D_0600B838); + if (1) {} + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 901); + Matrix_MultVec3f(&D_80AD8D48, &vec); + Lights_PointNoGlowSetInfo(&this->lightInfo, vec.x, vec.y, vec.z, this->lightColor.r, this->lightColor.g, + this->lightColor.b, 200); + } else if (limbIndex == 8) { + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 916); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 918), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_0600BBA0); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 922); + } +} + +void EnPoRelay_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnPoRelay* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 940); + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeTextureIdx])); + SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount, + NULL, EnPoRelay_PostLimbDraw, &this->actor); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 954); +} diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h index b4fd76f1b0..414173a62a 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h @@ -6,9 +6,25 @@ struct EnPoRelay; +typedef void (*EnPoRelayActionFunc)(struct EnPoRelay*, GlobalContext*); + typedef struct EnPoRelay { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x190]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnPoRelayActionFunc actionFunc; + /* 0x0194 */ u8 hookshotSlotFull; + /* 0x0195 */ u8 unk_195; + /* 0x0196 */ s16 actionTimer; + /* 0x0198 */ s16 pathIndex; + /* 0x019A */ s16 unk_19A; + /* 0x019C */ u16 textId; + /* 0x019E */ u16 eyeTextureIdx; + /* 0x01A0 */ Vec3s limbDrawTable[18]; + /* 0x020C */ Vec3s transitionDrawTable[18]; + /* 0x0278 */ Color_RGBA8 lightColor; + /* 0x027C */ LightNode* lightNode; + /* 0x0280 */ LightInfo lightInfo; + /* 0x0290 */ ColliderCylinder collider; } EnPoRelay; // size = 0x02DC extern const ActorInit En_Po_Relay_InitVars; diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 9470b3b084..c0fc9d8e25 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -1,3 +1,9 @@ +/* + * File: z_en_po_sisters.c + * Overlay: ovl_En_Po_Sisters + * Description: Forest Temple Four Poe Sisters + */ + #include "z_en_po_sisters.h" #define FLAGS 0x00005215 @@ -9,7 +15,52 @@ void EnPoSisters_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnPoSisters_Update(Actor* thisx, GlobalContext* globalCtx); void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx); -/* +void func_80ADA094(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADA4A8(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADA530(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADA6A0(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADA7F0(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADA8C0(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADA9E8(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADAAA4(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADAC70(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADAD54(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADAE6C(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADAFC0(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADB17C(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADB2B8(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADB338(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADB9F0(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADB4B0(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADB51C(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADB770(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADBB6C(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADBBF4(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADBC88(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADBD38(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADBD8C(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADBEE8(EnPoSisters* this, GlobalContext* globalCtx); +void func_80ADBF58(EnPoSisters* this, GlobalContext* globalCtx); + +void func_80AD9AA8(EnPoSisters* this, GlobalContext* globalCtx); +void func_80AD9C24(EnPoSisters* this, GlobalContext* globalCtx); + +void func_80AD9D44(EnPoSisters* this); + +static Color_RGBA8 D_80ADD6F0[4] = { + { 255, 170, 255, 255 }, + { 255, 200, 0, 255 }, + { 0, 170, 255, 255 }, + { 170, 255, 0, 255 }, +}; + +static Color_RGBA8 D_80ADD700[4] = { + { 100, 0, 255, 255 }, + { 255, 0, 0, 255 }, + { 0, 0, 255, 255 }, + { 0, 150, 0, 255 }, +}; + const ActorInit En_Po_Sisters_InitVars = { ACTOR_EN_PO_SISTERS, ACTORTYPE_ENEMY, @@ -21,127 +72,1310 @@ const ActorInit En_Po_Sisters_InitVars = { (ActorFunc)EnPoSisters_Update, (ActorFunc)EnPoSisters_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK3, 0x11, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x4FC7FFEA, 0x00, 0x00 }, 0x01, 0x05, 0x01 }, + { 18, 60, 15, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9240.s") +static CollisionCheckInfoInit sColChkInfoInit = { 0x0A, 0x0019, 0x003C, 0x28 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s") +static DamageTable sDamageTable = { + 0xF0, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x02, 0xE1, 0xE2, 0xE4, 0x02, 0x02, 0x02, 0x02, 0x02, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xE4, 0xE2, 0xE2, 0xE8, 0xE4, 0x00, 0x00, 0x04, 0x00, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s") +static s32 D_80ADD784 = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD943C.s") +static InitChainEntry sInitChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 7, ICHAIN_CONTINUE), + ICHAIN_F32(unk_4C, 6000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s") +static Vec3f sZeroVector = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s") +static s16 D_80ADD79C[4] = { 0xB000, 0xD000, 0x5000, 0x3000 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s") +static Vec3s D_80ADD7A4[4] = { + { -22, 337, -1704 }, + { -431, 879, -3410 }, + { 549, 879, -3410 }, + { 1717, 515, -1340 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s") +static Vec3f D_80ADD7BC = { 120.0f, 250.0f, -1420.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s") +static Gfx* D_80ADD7C8[4] = { 0x06001DE0, 0x06002F88, 0x06003628, 0x06003DC8 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s") +static Gfx* D_80ADD7D8[4] = { 0x06001CB0, 0x06002EB8, 0x06003880, 0x06004020 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD97C8.s") +static Color_RGBA8 D_80ADD7E8[4] = { + { 80, 0, 100, 0 }, + { 80, 15, 0, 0 }, + { 0, 70, 50, 0 }, + { 70, 70, 0, 0 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s") +static Vec3f D_80ADD7F8 = { 1000.0f, -1700.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD99D4.s") +extern SkeletonHeader D_060065C8; +extern AnimationHeader D_060014CC; +extern AnimationHeader D_06000D40; +extern AnimationHeader D_06000114; +extern AnimationHeader D_060008C0; +extern AnimationHeader D_06000A54; +extern AnimationHeader D_0600119C; +extern AnimationHeader D_06000680; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9A54.s") +extern Gfx D_060027B0[]; +extern Gfx D_060046E0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s") +extern Gfx D_0404D4E0[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9C24.s") +void EnPoSisters_Init(Actor* thisx, GlobalContext* globalCtx) { + EnPoSisters* this = THIS; + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 50.0f); + SkelAnime_Init(globalCtx, &this->skelAnime, &D_060065C8, &D_060014CC, this->limbDrawTable, + this->transitionDrawTable, 12); + this->unk_22E.r = 255; + this->unk_22E.g = 255; + this->unk_22E.b = 210; + this->unk_22E.a = 255; + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + Lights_PointGlowSetInfo(&this->lightInfo, this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, + this->actor.initPosRot.pos.z, 0, 0, 0, 0); + Collider_InitCylinder(globalCtx, &this->collider); + Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit); + func_80061ED4(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); + this->unk_194 = (thisx->params >> 8) & 3; + this->actor.naviEnemyId = this->unk_194 + 0x50; + if (1) {} + this->unk_195 = (thisx->params >> 0xA) & 3; + this->unk_196 = 32; + this->unk_197 = 20; + this->unk_198 = 1; + this->unk_199 = 32; + this->unk_294 = 110.0f; + this->actor.flags &= ~1; + if (this->actor.params & 0x1000) { + func_80ADA094(this, globalCtx); + } else if (this->unk_194 == 0) { + if (this->unk_195 == 0) { + this->collider.base.maskA = 9; + func_80AD9AA8(this, globalCtx); + } else { + this->actor.flags &= -0x4201; + this->collider.body.flags = 4; + this->collider.body.bumper.flags |= 1; + this->collider.base.maskA = 0; + func_80AD9C24(this, NULL); + } + } else { + func_80AD9D44(this); + } + this->actor.params &= 0x3F; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s") +void EnPoSisters_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnPoSisters* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s") + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); + if (this->unk_194 == 0 && this->unk_195 == 0) { + func_800F5B58(); + } + Collider_DestroyCylinder(globalCtx, &this->collider); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s") +void func_80AD9240(EnPoSisters* this, s32 arg1, Vec3f* arg2) { + f32 temp_f20 = SQ(arg1) * 0.1f; + Vec3f* vec; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s") + for (i = 0; i < this->unk_198; i++) { + vec = &this->unk_234[i]; + vec->x = arg2->x + Math_Sins((s16)(this->actor.shape.rot.y + (this->unk_19A * 0x800) + i * 0x2000)) * temp_f20; + vec->z = arg2->z + Math_Coss((s16)(this->actor.shape.rot.y + (this->unk_19A * 0x800) + i * 0x2000)) * temp_f20; + vec->y = arg2->y + arg1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s") +void func_80AD9368(EnPoSisters* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_060014CC, -3.0f); + this->unk_19A = Math_Rand_S16Offset(2, 3); + this->actionFunc = func_80ADA4A8; + this->actor.speedXZ = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA094.s") +void func_80AD93C4(EnPoSisters* this) { + if (this->actionFunc != func_80ADA6A0) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000D40, -3.0f); + } + this->unk_19A = Math_Rand_S16Offset(0xF, 3); + this->unk_199 |= 7; + this->actionFunc = func_80ADA530; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA10C.s") +void func_80AD943C(EnPoSisters* this) { + this->actionFunc = func_80ADA6A0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s") +void func_80AD944C(EnPoSisters* this) { + if (this->unk_22E.a != 0) { + this->collider.base.type = COLTYPE_METAL_SHIELD; + this->collider.base.acFlags |= 4; + } + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000114, -5.0f); + this->actor.speedXZ = 0.0f; + this->unk_19A = SkelAnime_GetFrameCount(&D_06000114) * 3 + 3; + this->unk_199 &= ~2; + this->actionFunc = func_80ADA7F0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s") +void func_80AD94E0(EnPoSisters* this) { + this->actor.speedXZ = 5.0f; + if (this->unk_194 == 0) { + this->collider.base.type = COLTYPE_METAL_SHIELD; + this->collider.base.acFlags |= 4; + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000114, -5.0f); + } + this->unk_19A = 5; + this->actor.posRot.rot.y = this->actor.yawTowardsLink; + this->unk_199 |= 8; + this->actionFunc = func_80ADA8C0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s") +void func_80AD9568(EnPoSisters* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000D40, -3.0f); + this->actor.posRot.rot.y = this->actor.yawTowardsLink + 0x8000; + if (this->unk_194 != 0) { + this->collider.base.type = COLTYPE_UNK3; + this->collider.base.acFlags &= ~4; + } + this->actionFunc = func_80ADA9E8; +} +void func_80AD95D8(EnPoSisters* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_060008C0, -3.0f); + if (this->collider.base.ac != NULL) { + this->actor.posRot.rot.y = (this->collider.body.acHitItem->toucher.flags & 0x1F824) + ? this->collider.base.ac->posRot.rot.y + : func_8002DA78(&this->actor, this->collider.base.ac) + 0x8000; + } + if (this->unk_194 != 0) { + this->actor.speedXZ = 10.0f; + } + this->unk_199 &= ~0xB; + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 0x10); + this->actionFunc = func_80ADAAA4; +} + +void func_80AD96A4(EnPoSisters* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000A54, -3.0f); + this->actor.posRot.rot.y = this->actor.shape.rot.y + 0x8000; + this->unk_19A = 5; + this->unk_199 |= 0xB; + this->actor.speedXZ = 5.0f; + this->actionFunc = func_80ADAC70; +} + +void func_80AD9718(EnPoSisters* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600119C, 1.5f, 0.0f, SkelAnime_GetFrameCount(&D_0600119C), 2, -3.0f); + this->actor.speedXZ = 0.0f; + this->unk_19C = 100; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + this->unk_199 &= ~5; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DISAPPEAR); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); + this->actionFunc = func_80ADAD54; +} + +void func_80AD97C8(EnPoSisters* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 sp20; + + if (this->unk_195 == 0 || this->actionFunc != func_80ADAAA4) { + if ((player->swordState == 0 || player->swordAnimation >= 24) && + player->actor.posRot.pos.y - player->actor.groundY < 1.0f) { + Math_ApproxF(&this->unk_294, 110.0f, 3.0f); + } else { + Math_ApproxF(&this->unk_294, 170.0f, 10.0f); + } + sp20 = this->unk_294; + } else if (this->unk_195 != 0) { + sp20 = this->actor.parent->xzDistFromLink; + } + this->actor.posRot.pos.x = (Math_Sins(this->actor.shape.rot.y + 0x8000) * sp20) + player->actor.posRot.pos.x; + this->actor.posRot.pos.z = (Math_Coss(this->actor.shape.rot.y + 0x8000) * sp20) + player->actor.posRot.pos.z; +} + +void func_80AD98F4(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600119C, 1.5f, 0.0f, SkelAnime_GetFrameCount(&D_0600119C), 2, -3.0f); + if (this->unk_194 == 0) { + this->unk_294 = 110.0f; + func_80AD97C8(this, globalCtx); + this->unk_22E.a = 0; + this->actor.draw = EnPoSisters_Draw; + } else { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + } + this->unk_19A = 15; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + this->unk_199 &= ~1; + this->actionFunc = func_80ADAE6C; +} + +void func_80AD99D4(EnPoSisters* this, GlobalContext* globalCtx) { + this->unk_19A = 0; + this->actor.speedXZ = 0.0f; + this->actor.posRot.pos.y += 42.0f; + this->actor.shape.unk_08 = -6000.0f; + this->actor.flags &= -2; + this->unk_199 = 0; + this->actionFunc = func_80ADAFC0; + func_800800F8(globalCtx, 0xC76, 0x3E7, &this->actor, 0); +} + +void func_80AD9A54(EnPoSisters* this, GlobalContext* globalCtx) { + this->unk_19A = 0; + this->actor.posRot.pos.y = this->unk_234[0].y; + Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0x80); + this->actionFunc = func_80ADB17C; +} + +// Meg spawning fakes +void func_80AD9AA8(EnPoSisters* this, GlobalContext* globalCtx) { + Actor* actor1 = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_PO_SISTERS, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0x400); + Actor* actor2 = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_PO_SISTERS, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0x800); + Actor* actor3 = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_PO_SISTERS, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 0xC00); + s32 pad; + s32 pad1; + + if (actor1 == NULL || actor2 == NULL || actor3 == NULL) { + if (actor1 != NULL) { + Actor_Kill(actor1); + } + if (actor2 != NULL) { + Actor_Kill(actor2); + } + if (actor3 != NULL) { + Actor_Kill(actor3); + } + Actor_Kill(&this->actor); + } else { + actor3->parent = &this->actor; + actor2->parent = &this->actor; + actor1->parent = &this->actor; + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06000680); + this->unk_198 = 0; + this->unk_199 = 160; + this->actionFunc = func_80ADB2B8; + } +} + +void func_80AD9C24(EnPoSisters* this, GlobalContext* globalCtx) { + Vec3f vec; + + this->actor.draw = NULL; + this->actor.flags &= -2; + this->unk_19C = 100; + this->unk_199 = 32; + this->collider.base.type = COLTYPE_UNK3; + this->collider.base.acFlags &= ~4; + if (globalCtx != NULL) { + vec.x = this->actor.posRot.pos.x; + vec.y = this->actor.posRot.pos.y + 45.0f; + vec.z = this->actor.posRot.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &vec, &sZeroVector, &sZeroVector, 150, 0, 255, 255, 255, 155, 150, 150, 150, 1, + 9, 0); + } + Lights_PointSetColorAndRadius(&this->lightInfo, 0, 0, 0, 0); + this->actionFunc = func_80ADB338; +} + +void func_80AD9D44(EnPoSisters* this) { + if (this->unk_194 == 3) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600119C); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + } else { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600119C, 0.5f, 0.0f, SkelAnime_GetFrameCount(&D_0600119C), 3, 0.0f); + } + this->unk_22E.a = 0; + this->unk_199 = 32; + this->actionFunc = func_80ADB9F0; +} + +void func_80AD9DF0(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_0600119C, -5.0f); + this->unk_198 = 1; + this->unk_199 &= ~0x80; + this->actionFunc = func_80ADB4B0; + func_800800F8(globalCtx, 0xC6C, 0x9C, &this->actor, 0); +} + +void func_80AD9E60(EnPoSisters* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000D40, -3.0f); + this->unk_19A = SkelAnime_GetFrameCount(&D_06000D40) * 7 + 7; + if (this->actor.parent != NULL) { + this->actor.posRot.pos = this->actor.parent->posRot.pos; + this->actor.shape.rot.y = this->actor.parent->shape.rot.y; + } else { + this->actor.shape.rot.y = this->actor.yawTowardsLink; + this->unk_19A++; + } + if (this->unk_195 == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); + } + this->actionFunc = func_80ADB51C; +} + +void func_80AD9F1C(EnPoSisters* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000D40, -3.0f); + this->unk_22E.a = 255; + this->unk_19A = 300; + this->unk_19C = 3; + this->unk_199 |= 9; + this->actor.flags |= 1; + this->actionFunc = func_80ADB770; +} + +void func_80AD9F90(EnPoSisters* this) { + if (this->unk_194 == 1) { + this->actor.initPosRot.pos.x = -632.0f; + this->actor.initPosRot.pos.z = -3440.0f; + } else { + this->actor.initPosRot.pos.x = 752.0f; + this->actor.initPosRot.pos.z = -3440.0f; + } + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06000D40); + this->unk_199 |= 0xA; + this->actionFunc = func_80ADBB6C; + this->actor.speedXZ = 5.0f; +} + +void func_80ADA028(EnPoSisters* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_060014CC, -3.0f); + this->unk_22E.a = 255; + this->unk_199 |= 0x15; + this->actor.flags |= 1; + this->actionFunc = func_80ADBBF4; + this->actor.speedXZ = 0.0f; +} + +void func_80ADA094(EnPoSisters* this, GlobalContext* globalCtx) { + D_80ADD784 = 0; + this->unk_22E.a = 0; + this->unk_199 = 128; + this->unk_19A = 50; + this->unk_234[0] = this->actor.initPosRot.pos; + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_PROP); + this->actionFunc = func_80ADBC88; +} + +void func_80ADA10C(EnPoSisters* this) { + s32 i; + + this->unk_198 = ARRAY_COUNT(this->unk_234); + for (i = 0; i < ARRAY_COUNT(this->unk_234); i++) { + this->unk_234[i] = this->unk_234[0]; + } + this->actionFunc = func_80ADBD38; +} + +void func_80ADA1B8(EnPoSisters* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_0600119C, 0.833f, 0.0f, SkelAnime_GetFrameCount(&D_0600119C), 3, 0.0f); + if (this->unk_194 == 0 || this->unk_194 == 1) { + this->unk_19A = 40; + } else { + this->unk_19A = 76; + } + this->unk_198 = 0; + D_80ADD784 = 0; + this->actionFunc = func_80ADBD8C; +} + +void func_80ADA25C(EnPoSisters* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060014CC); + this->unk_198 = 8; + this->unk_19A = 32; + func_80AD9240(this, this->unk_19A, &this->actor.initPosRot.pos); + this->actionFunc = func_80ADBEE8; +} + +void func_80ADA2BC(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06000D40, -3.0f); + this->unk_198 = 0; + this->unk_199 = 40; + this->unk_19A = 90; + this->unk_196 = 32; + this->actor.posRot.rot.y = D_80ADD79C[this->unk_194]; + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y; + if (this->unk_194 == 0) { + Flags_SetSwitch(globalCtx, 0x1B); + } + Audio_PlayActorSound2(&this->actor, NA_SE_EV_FLAME_IGNITION); + this->actionFunc = func_80ADBF58; +} + +#ifdef NON_MATCHING +// Single register swap +void func_80ADA35C(EnPoSisters* this, GlobalContext* globalCtx) { + f32 targetY; + Player* player = PLAYER; + + if (this->actionFunc == func_80ADBF58) { + targetY = this->actor.initPosRot.pos.y; + } else if (this->unk_194 == 0 || this->unk_194 == 3) { + targetY = player->actor.posRot.pos.y + 5.0f; + } else { + targetY = 832.0f; + } + Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, targetY, 0.5f, 3.0f); + if (this->unk_196 == 0) { + this->unk_196 = 32; + } + if (this->unk_196 != 0U) { // U improves codegen from missing move + regalloc to just regalloc + this->unk_196 -= 1U; + } + this->actor.posRot.pos.y += (2.0f + 0.5f * Math_Rand_ZeroOne()) * Math_Sins(this->unk_196 * 0x800); + if (this->unk_22E.a == 255 && this->actionFunc != func_80ADA8C0 && this->actionFunc != func_80ADA7F0) { + if (this->actionFunc == func_80ADAC70) { + func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); + } else { + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + } + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA35C.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA4A8.s") +void func_80ADA4A8(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_19A != 0) { + this->unk_19A--; + } + if (this->unk_19A == 0 || this->actor.xzDistFromLink < 200.0f) { + func_80AD93C4(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA530.s") +void func_80ADA530(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_ApproxF(&this->actor.speedXZ, 1.0f, 0.2f); + if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_19A != 0) { + this->unk_19A--; + } + if (this->actor.xzDistFromLink < 200.0f && fabsf(this->actor.yDistFromLink + 5.0f) < 30.0f) { + func_80AD943C(this); + } else if (this->unk_19A == 0 && Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f) != 0) { + func_80AD9368(this); + } + if (this->actor.bgCheckFlags & 8) { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + 0x71C); + } else if (func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) > 300.0f) { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + 0x71C); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA6A0.s") +void func_80ADA6A0(EnPoSisters* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 temp_v0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA7F0.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + temp_v0 = this->actor.yawTowardsLink - player->actor.shape.rot.y; + Math_ApproxF(&this->actor.speedXZ, 2.0f, 0.2f); + if (temp_v0 > 0x3000) { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x3000, 0x71C); + } else if (temp_v0 < -0x3000) { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink - 0x3000, 0x71C); + } else { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x71C); + } + if (this->actor.xzDistFromLink < 160.0f && fabsf(this->actor.yDistFromLink + 5.0f) < 30.0f) { + func_80AD944C(this); + } else if (this->actor.xzDistFromLink > 240.0f) { + func_80AD93C4(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA8C0.s") +void func_80ADA7F0(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->unk_19A != 0) { + this->unk_19A--; + } + this->actor.shape.rot.y += 384.0f * ((this->skelAnime.animFrameCount + 1.0f) * 3.0f - this->unk_19A); + if (this->unk_19A == 18 || this->unk_19A == 7) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_ROLL); + } + if (this->unk_19A == 0) { + func_80AD94E0(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA9E8.s") +void func_80ADA8C0(EnPoSisters* this, GlobalContext* globalCtx) { + s32 pad; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAAA4.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_19A != 0) { + this->unk_19A--; + } + this->actor.shape.rot.y += (384.0f * this->skelAnime.animFrameCount) * 3.0f; + if (this->unk_19A == 0 && ABS((s16)(this->actor.shape.rot.y - this->actor.posRot.rot.y)) < 0x1000) { + if (this->unk_194 != 0) { + this->collider.base.type = COLTYPE_UNK3; + this->collider.base.acFlags &= ~4; + func_80AD93C4(this); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); + func_80AD9C24(this, globalCtx); + } + } + if (func_800A56C8(&this->skelAnime, 1.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_ROLL); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAC70.s") +void func_80ADA9E8(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + this->actor.shape.rot.y -= (this->actor.speedXZ * 10.0f) * 128.0f; + if (Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.1f) != 0) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + if (this->unk_194 != 0) { + func_80AD93C4(this); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); + func_80AD9C24(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAD54.s") +void func_80ADAAA4(EnPoSisters* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) && !(this->actor.flags & 0x8000)) { + if (this->actor.colChkInfo.health != 0) { + if (this->unk_194 != 0) { + func_80AD96A4(this); + } else if (this->unk_195 != 0) { + func_80AD9C24(this, NULL); + } else { + func_80AD9C24(this, globalCtx); + } + } else { + func_80AD99D4(this, globalCtx); + } + } + if (this->unk_195 != 0) { + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.parent->shape.rot.y, + (this->unk_195 == 2) ? 0x800 : 0x400); + this->unk_22E.a = ((this->skelAnime.animFrameCount - this->skelAnime.animCurrentFrame) * 255.0f) / + this->skelAnime.animFrameCount; + this->actor.posRot.pos.y = this->actor.parent->posRot.pos.y; + func_80AD97C8(this, globalCtx); + } else if (this->unk_194 != 0) { + Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAE6C.s") +void func_80ADAC70(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 1820); + if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_19A != 0) { + this->unk_19A--; + } + if (this->actor.bgCheckFlags & 8) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + this->unk_199 |= 2; + func_80AD9718(this); + } else if (this->unk_19A == 0 && 240.0f < this->actor.xzDistFromLink) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + func_80AD93C4(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADAFC0.s") +void func_80ADAD54(EnPoSisters* this, GlobalContext* globalCtx) { + s32 animFrameCount; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB17C.s") + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->unk_22E.a = 0; + this->collider.body.bumper.flags = 0x60001; + func_80AD93C4(this); + } else { + animFrameCount = this->skelAnime.animFrameCount; + this->unk_22E.a = ((animFrameCount - this->skelAnime.animCurrentFrame) * 255.0f) / animFrameCount; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB2B8.s") +void func_80ADAE6C(EnPoSisters* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->unk_22E.a = 255; + if (this->unk_194 != 0) { + this->unk_199 |= 1; + this->collider.body.bumper.flags = 0x4FC7FFEA; + if (this->unk_19A != 0) { + this->unk_19A--; + } + if (this->unk_19A == 0) { + this->unk_197 = 20; + func_80AD93C4(this); + } + } else { + func_80AD9F1C(this); + } + } else { + this->unk_22E.a = (this->skelAnime.animCurrentFrame * 255.0f) / this->skelAnime.animFrameCount; + if (this->unk_194 == 0) { + func_80AD97C8(this, globalCtx); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB338.s") +void func_80ADAFC0(EnPoSisters* this, GlobalContext* globalCtx) { + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB4B0.s") + this->unk_19A++; + this->unk_198 = CLAMP_MAX(this->unk_198 + 1, 8); + for (i = this->unk_198 - 1; i > 0; i--) { + this->unk_234[i] = this->unk_234[i - 1]; + } + this->unk_234[0].x = + (Math_Sins((this->actor.shape.rot.y + this->unk_19A * 0x3000) - 0x4000) * (3000.0f * this->actor.scale.x)) + + this->actor.posRot.pos.x; + this->unk_234[0].z = + (Math_Coss((this->actor.shape.rot.y + this->unk_19A * 0x3000) - 0x4000) * (3000.0f * this->actor.scale.x)) + + this->actor.posRot.pos.z; + if (this->unk_19A < 8) { + this->unk_234[0].y = this->unk_234[1].y - 9.0f; + } else { + this->unk_234[0].y = this->unk_234[1].y + 2.0f; + if (this->unk_19A >= 16) { + if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.001f) != 0) { + func_80AD9A54(this, globalCtx); + } + this->actor.scale.z = this->actor.scale.x; + this->actor.scale.y = this->actor.scale.x; + } + } + if (this->unk_19A == 16) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DEAD2); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB51C.s") +void func_80ADB17C(EnPoSisters* this, GlobalContext* globalCtx) { + Vec3s* vec; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB770.s") + this->unk_19A++; + if (this->unk_19A == 64) { + Flags_SetSwitch(globalCtx, this->actor.params); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 30, NA_SE_EV_FLAME_IGNITION); + if (this->unk_194 == 0) { + Flags_UnsetSwitch(globalCtx, 0x1B); + } + globalCtx->envCtx.unk_BF = 0xFF; + func_80078884(NA_SE_SY_CORRECT_CHIME); + Actor_Kill(&this->actor); + } else if (this->unk_19A < 32) { + func_80AD9240(this, this->unk_19A, &this->actor.posRot.pos); + } else { + func_80AD9240(this, 64 - this->unk_19A, &this->actor.posRot.pos); + } + if (this->unk_19A == 32) { + vec = &D_80ADD7A4[this->unk_194]; + this->actor.posRot.pos.x = vec->x; + this->actor.posRot.pos.y = vec->y; + this->actor.posRot.pos.z = vec->z; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADB9F0.s") +void func_80ADB2B8(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->actor.xzDistFromLink < 130.0f) { + func_80AD9DF0(this, globalCtx); + } + if (func_800A56C8(&this->skelAnime, 0.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_CRY); + } + this->actor.shape.rot.y = this->actor.yawTowardsLink; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBB6C.s") +void func_80ADB338(EnPoSisters* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + EnPoSisters* realMeg = (EnPoSisters*)this->actor.parent; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBBF4.s") + if (this->unk_195 == 0) { + if (func_8002DBB0(&player->actor, &this->actor.initPosRot.pos) < 600.0f) { + if (this->unk_19C != 0) { + this->unk_19C--; + } + } else { + this->unk_19C = 100; + } + if (this->unk_19C == 0) { + this->actor.shape.rot.y = (s32)(4.0f * Math_Rand_ZeroOne()) * 0x4000 + this->actor.yawTowardsLink; + this->actor.posRot.pos.y = player->actor.posRot.pos.y + 5.0f; + func_80AD98F4(this, globalCtx); + } + } else { + if (realMeg->actionFunc == func_80ADB51C) { + this->actor.draw = EnPoSisters_Draw; + func_80AD9E60(this); + } else if (realMeg->actionFunc == func_80ADAE6C) { + this->actor.shape.rot.y = this->actor.parent->shape.rot.y + this->unk_195 * 0x4000; + this->actor.posRot.pos.y = player->actor.posRot.pos.y + 5.0f; + func_80AD98F4(this, globalCtx); + } else if (realMeg->actionFunc == func_80ADAFC0) { + Actor_Kill(&this->actor); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBC88.s") +void func_80ADB4B0(EnPoSisters* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + func_80AD9E60(this); + } + func_80AD97C8(this, globalCtx); + this->actor.posRot.pos.y += 1.0f; + Actor_SetHeight(&this->actor, 40.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD38.s") +void func_80ADB51C(EnPoSisters* this, GlobalContext* globalCtx) { + f32 temp_f2; + s16 phi_v0; + s16 phi_a2; + u8 temp; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBD8C.s") + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + temp_f2 = this->skelAnime.animFrameCount * 0.5f; + this->unk_22E.a = (fabsf(temp_f2 - this->skelAnime.animCurrentFrame) * 255.0f) / temp_f2; + if (this->unk_19A != 0) { + this->unk_19A -= 1; + } + if (this->unk_19A == 0) { + this->actor.posRot.rot.y = this->actor.shape.rot.y += 0x4000 * (s32)(Math_Rand_ZeroOne() * 4.0f); + if (this->unk_195 == 0) { + func_800F5ACC(0x38); + } + func_80AD9F1C(this); + } else { + this->actor.posRot.pos.y += 0.1f; + temp = this->unk_195; + if (temp != 0) { + if (this->unk_19A > 90) { + phi_v0 = 1; + phi_a2 = 64; + } else if (this->unk_19A > 70) { + phi_v0 = 0; + phi_a2 = 64; + } else if (this->unk_19A > 55) { + phi_v0 = 1; + phi_a2 = 96; + } else if (this->unk_19A > 40) { + phi_v0 = 0; + phi_a2 = 96; + } else { + phi_v0 = 1; + phi_a2 = 256; + } + if (this->unk_195 == 2) { + phi_a2 *= 2; + } + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, + this->actor.parent->shape.rot.y + (this->unk_195 * 0x4000) * phi_v0, phi_a2); + } else if (this->unk_19A == 70 || this->unk_19A == 40) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); + } + } + func_80AD97C8(this, globalCtx); + Actor_SetHeight(&this->actor, 40.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBEE8.s") +void func_80ADB770(EnPoSisters* this, GlobalContext* globalCtx) { + s32 temp_v0; + s32 phi_a0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADBF58.s") + if (this->unk_19A != 0) { + this->unk_19A--; + } + if (this->unk_19C > 0) { + if (this->unk_19A >= 16) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->unk_195 == 0) { + if (ABS((s16)(16 - this->unk_196)) < 14) { + this->actor.shape.rot.y += + (0x580 - (this->unk_19C * 0x180)) * fabsf(Math_Sins(this->unk_196 * 0x800)); + } + if (this->unk_19A >= 284 || this->unk_19A < 31) { + this->unk_199 |= 0x40; + } else { + this->unk_199 &= ~0x40; + } + } else { + this->actor.shape.rot.y = (s16)(this->actor.parent->shape.rot.y + (this->unk_195 * 0x4000)); + } + } + } + if (this->unk_195 == 0) { + if (this->unk_19A >= 284 || (this->unk_19A < 31 && this->unk_19A >= 16)) { + this->unk_199 |= 0x40; + } else { + this->unk_199 &= ~0x40; + } + } + if (func_8002DBB0(&PLAYER->actor, &this->actor.initPosRot.pos) > 600.0f) { + this->unk_199 &= ~0x40; + func_80AD9C24(this, globalCtx); + } else if (this->unk_19A == 0) { + if (this->unk_195 == 0) { + func_80AD94E0(this); + } else { + func_80AD9C24(this, globalCtx); + } + } else if (this->unk_195 != 0) { + EnPoSisters* realMeg = (EnPoSisters*)this->actor.parent; + if (realMeg->actionFunc == func_80ADAAA4) { + func_80AD95D8(this); + } + } else if (this->unk_19C == 0) { + this->unk_19C = -15; + } else if (this->unk_19C < 0) { + this->unk_19C++; + if (this->unk_19C == 0) { + func_80AD94E0(this); + } + } + func_80AD97C8(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC034.s") +void func_80ADB9F0(EnPoSisters* this, GlobalContext* globalCtx) { + f32 div; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC10C.s") + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->unk_22E.a = 255; + if (this->unk_194 == 3) { + this->actor.flags |= 1; + this->actor.initPosRot.pos.x = 1992.0f; + this->actor.initPosRot.pos.z = -1440.0f; + this->unk_199 |= 0x18; + func_80AD93C4(this); + } else { + func_80AD9F90(this); + } + } else { + div = this->skelAnime.animCurrentFrame / this->skelAnime.animFrameCount; + this->unk_22E.a = 255.0f * div; + } + if (this->unk_194 != 3 && func_800A56C8(&this->skelAnime, 1.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + } + Actor_SetHeight(&this->actor, 40.0f); +} +void func_80ADBB6C(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) < 10.0f) { + func_80ADA028(this); + } else { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, func_8002DAC0(&this->actor, &this->actor.initPosRot.pos), + 1820); + } +} + +void func_80ADBBF4(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1820); + if (this->actor.xzDistFromLink < 240.0f && fabsf(this->actor.yDistFromLink + 5.0f) < 30.0f) { + func_80AD93C4(this); + } +} + +void func_80ADBC88(EnPoSisters* this, GlobalContext* globalCtx) { + if (D_80ADD784 != 0 || !Player_InCsMode(globalCtx)) { + if (this->unk_19A != 0) { + this->unk_19A--; + } + if (this->unk_19A == 30) { + if (this->unk_194 == 0) { + func_800800F8(globalCtx, 0xC44, 0x3E7, NULL, 0); + } + D_80ADD784 = 1; + } + if (this->unk_19A == 0) { + func_80ADA10C(this); + } + } + func_8002F974(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); +} + +void func_80ADBD38(EnPoSisters* this, GlobalContext* globalCtx) { + this->unk_19A++; + func_80AD9240(this, this->unk_19A, &this->actor.initPosRot.pos); + if (this->unk_19A == 32) { + func_80ADA1B8(this); + } +} + +void func_80ADBD8C(EnPoSisters* this, GlobalContext* globalCtx) { + this->unk_19A--; + if (this->unk_19A == 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + this->unk_199 &= ~0x80; + } + if (this->unk_19A <= 0) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->unk_22E.a = 255; + D_80ADD784 |= (1 << this->unk_194); + } else { + this->unk_22E.a = (this->skelAnime.animCurrentFrame * 255.0f) / this->skelAnime.animFrameCount; + } + } + if (D_80ADD784 == 15) { + func_80ADA25C(this); + } +} + +void func_80ADBEE8(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->unk_19A != 0) { + this->unk_19A--; + } + func_80AD9240(this, this->unk_19A, &this->actor.initPosRot.pos); + if (this->unk_19A == 0) { + func_80ADA2BC(this, globalCtx); + } +} + +void func_80ADBF58(EnPoSisters* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + this->unk_19A--; + Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, this->actor.posRot.rot.y, 0x500); + if (this->unk_19A == 0 && this->unk_194 == 0) { + globalCtx->envCtx.unk_BF = 4; + } + if (this->unk_19A < 0) { + Math_ApproxF(&this->actor.speedXZ, 5.0f, 0.2f); + } + if (this->unk_19A == -70 && this->unk_194 == 1) { + Audio_PlaySoundAtPosition(globalCtx, &D_80ADD7BC, 40, NA_SE_EN_PO_LAUGH); + } + if (this->unk_19A < -120) { + Actor_Kill(&this->actor); + } +} + +void func_80ADC034(EnPoSisters* this, GlobalContext* globalCtx) { + if (this->actor.unk_10C != 0 && this->unk_22E.a == 255) { + if (this->unk_197 != 0) { + this->unk_197--; + } + } else { + this->unk_197 = 20; + } + if (this->unk_22E.a == 0) { + if (this->unk_19C != 0) { + this->unk_19C--; + } + } + if (this->actionFunc != func_80ADA7F0 && this->actionFunc != func_80ADA8C0 && this->actionFunc != func_80ADAAA4) { + if (this->unk_197 == 0) { + func_80AD9718(this); + } else if (this->unk_19C == 0 && this->unk_22E.a == 0) { + func_80AD98F4(this, globalCtx); + } + } +} + +void func_80ADC10C(EnPoSisters* this, GlobalContext* globalCtx) { + Vec3f sp24; + + if (this->collider.base.acFlags & 2) { + this->collider.base.acFlags &= ~2; + func_80035650(&this->actor, &this->collider.body, 1); + if (this->unk_195 != 0) { + ((EnPoSisters*)this->actor.parent)->unk_19C--; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH2); + func_80AD9C24(this, globalCtx); + if (Math_Rand_ZeroOne() < 0.2f) { + sp24.x = this->actor.posRot.pos.x; + sp24.y = this->actor.posRot.pos.y; + sp24.z = this->actor.posRot.pos.z; + Item_DropCollectible(globalCtx, &sp24, ITEM00_ARROWS_SMALL); + } + } else if (this->collider.base.type == 9 || + (this->actor.colChkInfo.damageEffect == 0 && this->actor.colChkInfo.damage == 0)) { + if (this->unk_194 == 0) { + this->actor.freezeTimer = 0; + } + } else if (this->actor.colChkInfo.damageEffect == 0xF) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + this->unk_199 |= 2; + func_80AD98F4(this, globalCtx); + } else if (this->unk_194 == 0 && this->actor.colChkInfo.damageEffect == 0xE && + this->actionFunc == func_80ADB770) { + if (this->unk_19C == 0) { + this->unk_19C = -45; + } + } else { + if (Actor_ApplyDamage(&this->actor) != 0) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DAMAGE); + } else { + func_80032C7C(globalCtx, &this->actor); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_SISTER_DEAD); + } + func_80AD95D8(this); + } + } +} + +#ifdef NON_MATCHING +// Stack only +void EnPoSisters_Update(Actor* thisx, GlobalContext* globalCtx) { + EnPoSisters* this = THIS; + s32 pad; + + if (this->collider.base.atFlags & 2) { + this->collider.base.atFlags &= ~2; + func_80AD9568(this); + } + func_80ADC10C(this, globalCtx); + if (this->unk_199 & 4) { + func_80ADC034(this, globalCtx); + } + this->actionFunc(this, globalCtx); + if (this->unk_199 & 0x1F) { + if (this->unk_199 & 8) { + func_80ADA35C(this, globalCtx); + } + Actor_MoveForward(&this->actor); + if (this->unk_199 & 0x10) { + func_8002E4B4(globalCtx, &this->actor, 20.0f, 20.0f, 0.0f, 5); + } else { + Vec3f vec; + UNK_TYPE sp34; + vec.x = this->actor.posRot.pos.x; + vec.y = this->actor.posRot.pos.y + 10.0f; + vec.z = this->actor.posRot.pos.z; + this->actor.groundY = func_8003C9A4(&globalCtx->colCtx, &this->actor.floorPoly, &sp34, &this->actor, &vec); + } + Collider_CylinderUpdate(&this->actor, &this->collider); + if (this->actionFunc == func_80ADA8C0 || this->actionFunc == func_80ADA7F0) { + this->unk_198++; + this->unk_198 = CLAMP_MAX(this->unk_198, 8); + } else if (this->actionFunc != func_80ADAFC0) { + this->unk_198 = CLAMP_MIN((s16)(this->unk_198 - 1), 1); + } + if (this->actionFunc == func_80ADA8C0) { + this->actor.flags |= 0x01000000; + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + if (this->unk_199 & 1) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + if (this->actionFunc != func_80ADB338) { + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); + } + Actor_SetHeight(&this->actor, 40.0f); + if (this->actionFunc == func_80ADAC70) { + this->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; + } else if (this->unk_199 & 2) { + this->actor.shape.rot.y = this->actor.posRot.rot.y; + } + } +} +#else #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Update.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC55C.s") +void func_80ADC55C(EnPoSisters* this) { + s16 temp_var; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC77C.s") + if (this->skelAnime.animation == &D_06000114) { + this->unk_22E.r = CLAMP_MAX((s16)(this->unk_22E.r + 5), 255); + this->unk_22E.g = CLAMP_MIN((s16)(this->unk_22E.g - 5), 50); + temp_var = this->unk_22E.b - 5; + this->unk_22E.b = CLAMP_MIN(temp_var, 0); + } else if (this->skelAnime.animation == &D_06000A54) { + this->unk_22E.r = CLAMP_MAX((s16)(this->unk_22E.r + 5), 80); + this->unk_22E.g = CLAMP_MAX((s16)(this->unk_22E.g + 5), 255); + temp_var = this->unk_22E.b + 5; + this->unk_22E.b = CLAMP_MAX(temp_var, 225); + } else if (this->skelAnime.animation == &D_060008C0) { + if (this->actor.dmgEffectTimer & 2) { + this->unk_22E.r = 0; + this->unk_22E.g = 0; + this->unk_22E.b = 0; + } else { + this->unk_22E.r = 80; + this->unk_22E.g = 255; + this->unk_22E.b = 225; + } + } else { + this->unk_22E.r = CLAMP_MAX((s16)(this->unk_22E.r + 5), 255); + this->unk_22E.g = CLAMP_MAX((s16)(this->unk_22E.g + 5), 255); + if (this->unk_22E.b > 210) { + temp_var = this->unk_22E.b - 5; + this->unk_22E.b = CLAMP_MIN(temp_var, 210); + } else { + temp_var = this->unk_22E.b + 5; + this->unk_22E.b = CLAMP_MAX(temp_var, 210); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADC970.s") +s32 EnPoSisters_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + void* thisx, Gfx** gfxP) { + EnPoSisters* this = THIS; + Color_RGBA8* color; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s") + if (limbIndex == 1 && (this->unk_199 & 0x40)) { + if (this->unk_19A >= 284) { + rot->x += (this->unk_19A * 0x1000) + 0xFFEE4000; + } else { + rot->x += (this->unk_19A * 0x1000) + 0xFFFF1000; + } + } + if (this->unk_22E.a == 0 || limbIndex == 8 || (this->actionFunc == func_80ADAFC0 && this->unk_19A >= 8)) { + *dList = NULL; + } else if (limbIndex == 9) { + *dList = D_80ADD7C8[this->unk_194]; + } else if (limbIndex == 10) { + *dList = D_80ADD7D8[this->unk_194]; + gDPPipeSync((*gfxP)++); + gDPSetEnvColor((*gfxP)++, this->unk_22E.r, this->unk_22E.g, this->unk_22E.b, this->unk_22E.a); + } else if (limbIndex == 11) { + color = &D_80ADD7E8[this->unk_194]; + gDPPipeSync((*gfxP)++); + gDPSetEnvColor((*gfxP)++, color->r, color->g, color->b, this->unk_22E.a); + } + return 0; +} + +void EnPoSisters_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, + Gfx** gfxP) { + EnPoSisters* this = THIS; + s32 i; + s32 pad; + + if (this->actionFunc == func_80ADAFC0 && this->unk_19A >= 8 && limbIndex == 9) { + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 2876), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList((*gfxP)++, D_060046E0); + } + if (limbIndex == 8 && this->actionFunc != func_80ADB2B8) { + if (this->unk_199 & 0x20) { + for (i = this->unk_198 - 1; i > 0; i--) { + this->unk_234[i] = this->unk_234[i - 1]; + } + Matrix_MultVec3f(&D_80ADD7F8, &this->unk_234[0]); + } else if (this->actionFunc == func_80ADBD8C) { + Matrix_MultVec3f(&D_80ADD7F8, &this->actor.initPosRot.pos); + } + if (this->unk_198 > 0) { + Color_RGBA8* color = &D_80ADD6F0[this->unk_194]; + f32 temp_f2 = Math_Rand_ZeroOne() * 0.3f + 0.7f; + + if (this->actionFunc == func_80ADB17C || this->actionFunc == func_80ADBD38 || + this->actionFunc == func_80ADBEE8) { + Lights_PointNoGlowSetInfo(&this->lightInfo, this->unk_234[0].x, this->unk_234[0].y + 15.0f, + this->unk_234[0].z, color->r * temp_f2, color->g * temp_f2, + color->b * temp_f2, 200); + } else { + Lights_PointGlowSetInfo(&this->lightInfo, this->unk_234[0].x, this->unk_234[0].y + 15.0f, + this->unk_234[0].z, color->r * temp_f2, color->g * temp_f2, color->b * temp_f2, + 200); + } + } else { + Lights_PointSetColorAndRadius(&this->lightInfo, 0, 0, 0, 0); + } + if (!(this->unk_199 & 0x80)) { + Matrix_Get(&this->unk_2F8); + } + } +} + +void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx) { + EnPoSisters* this = THIS; + u8 phi_s5; + f32 phi_f20; + s32 i; + u8 spE7; + Color_RGBA8* temp_s1 = &D_80ADD700[this->unk_194]; + Color_RGBA8* temp_s7 = &D_80ADD6F0[this->unk_194]; + s32 pad; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 2989); + func_80ADC55C(this); + func_80093D18(globalCtx->state.gfxCtx); + func_80093D84(globalCtx->state.gfxCtx); + if (this->unk_22E.a == 255 || this->unk_22E.a == 0) { + gDPSetEnvColor(POLY_OPA_DISP++, this->unk_22E.r, this->unk_22E.g, this->unk_22E.b, this->unk_22E.a); + gSPSegment(POLY_OPA_DISP++, 0x09, D_80116280 + 2); + POLY_OPA_DISP = + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnPoSisters_OverrideLimbDraw, EnPoSisters_PostLimbDraw, &this->actor, POLY_OPA_DISP); + } else { + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->unk_22E.a); + gSPSegment(POLY_XLU_DISP++, 0x09, D_80116280); + POLY_XLU_DISP = + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnPoSisters_OverrideLimbDraw, EnPoSisters_PostLimbDraw, &this->actor, POLY_XLU_DISP); + } + if (!(this->unk_199 & 0x80)) { + Matrix_Put(&this->unk_2F8); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 3034), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, D_060027B0); + } + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, + (globalCtx->gameplayFrames * -20) % 512, 0x20, 0x80)); + gDPSetEnvColor(POLY_XLU_DISP++, temp_s1->r, temp_s1->g, temp_s1->b, temp_s1->a); + if (this->actionFunc == func_80ADB17C) { + if (this->unk_19A < 32) { + phi_s5 = ((32 - this->unk_19A) * 255) / 32; + phi_f20 = 0.0056000003f; + } else { + phi_s5 = (this->unk_19A * 255 - 8160) / 32; + phi_f20 = 0.0027f; + } + } else if (this->actionFunc == func_80ADBD38) { + phi_s5 = ((32 - this->unk_19A) * 255) / 32; + phi_f20 = 0.0027f; + } else if (this->actionFunc == func_80ADBEE8) { + phi_s5 = ((32 - this->unk_19A) * 255) / 32; + phi_f20 = 0.0035f; + } else if (this->actionFunc == func_80ADBC88) { + //! @bug uninitialised spE7 + phi_s5 = spE7; + phi_f20 = 0.0027f; + } else { + phi_s5 = spE7; + phi_f20 = this->actor.scale.x * 0.5f; + } + for (i = 0; i < this->unk_198; i++) { + if (this->actionFunc != func_80ADB17C && this->actionFunc != func_80ADBD38 && + this->actionFunc != func_80ADBEE8) { + phi_s5 = -i * 31 + 248; + } + gDPPipeSync(POLY_XLU_DISP++); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, temp_s7->r, temp_s7->g, temp_s7->b, phi_s5); + Matrix_Translate(this->unk_234[i].x, this->unk_234[i].y, this->unk_234[i].z, MTXMODE_NEW); + Matrix_RotateRPY(0, (s16)(func_8005A9F4(ACTIVE_CAM) + 0x8000), 0, MTXMODE_APPLY); + if (this->actionFunc == func_80ADAFC0) { + phi_f20 = (this->unk_19A - i) * 0.025f + 0.5f; + phi_f20 = CLAMP(phi_f20, 0.5f, 0.8f) * 0.007f; + } + Matrix_Scale(phi_f20, phi_f20, phi_f20, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 3132), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 3139); +} diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h index ca00287df5..3ce5d6e9df 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h @@ -6,9 +6,29 @@ struct EnPoSisters; +typedef void (*EnPoSistersActionFunc)(struct EnPoSisters*, GlobalContext*); + typedef struct EnPoSisters { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1EC]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnPoSistersActionFunc actionFunc; + /* 0x0194 */ u8 unk_194; + /* 0x0195 */ u8 unk_195; + /* 0x0196 */ u8 unk_196; + /* 0x0197 */ u8 unk_197; + /* 0x0198 */ u8 unk_198; + /* 0x0199 */ u8 unk_199; + /* 0x019A */ s16 unk_19A; + /* 0x019A */ s16 unk_19C; + /* 0x019E */ Vec3s limbDrawTable[12]; + /* 0x01E6 */ Vec3s transitionDrawTable[12]; + /* 0x022E */ Color_RGBA8 unk_22E; + /* 0x0234 */ Vec3f unk_234[8]; + /* 0x0294 */ f32 unk_294; + /* 0x0298 */ LightNode* lightNode; + /* 0x029C */ LightInfo lightInfo; + /* 0x02AC */ ColliderCylinder collider; + /* 0x02F8 */ MtxF unk_2F8; } EnPoSisters; // size = 0x0338 extern const ActorInit En_Po_Sisters_InitVars; diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 5703de7ebf..100ad82597 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -1,3 +1,9 @@ +/* + * File: z_en_poh.c + * Overlay: ovl_En_Poh + * Description: Graveyard Poe + */ + #include "z_en_poh.h" #define FLAGS 0x00001015 @@ -8,7 +14,34 @@ void EnPoh_Init(Actor* thisx, GlobalContext* globalCtx); void EnPoh_Destroy(Actor* thisx, GlobalContext* globalCtx); void EnPoh_Update(Actor* thisx, GlobalContext* globalCtx); -/* +void EnPoh_UpdateLiving(Actor* thisx, GlobalContext* globalCtx); +void EnPoh_UpdateDead(Actor* thisx, GlobalContext* globalCtx); +void EnPoh_DrawRegular(Actor* thisx, GlobalContext* globalCtx); +void EnPoh_DrawComposer(Actor* thisx, GlobalContext* globalCtx); +void EnPoh_DrawSoul(Actor* thisx, GlobalContext* globalCtx); + +void func_80ADEAC4(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_Idle(EnPoh* this, GlobalContext* globalCtx); +void func_80ADEC9C(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_Attack(EnPoh* this, GlobalContext* globalCtx); +void func_80ADEECC(EnPoh* this, GlobalContext* globalCtx); +void func_80ADF894(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_ComposerAppear(EnPoh* this, GlobalContext* globalCtx); +void func_80ADEF38(EnPoh* this, GlobalContext* globalCtx); +void func_80ADF15C(EnPoh* this, GlobalContext* globalCtx); +void func_80ADF574(EnPoh* this, GlobalContext* globalCtx); +void func_80ADF5E0(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_Disappear(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_Appear(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_Death(EnPoh* this, GlobalContext* globalCtx); +void func_80ADFE28(EnPoh* this, GlobalContext* globalCtx); +void func_80ADFE80(EnPoh* this, GlobalContext* globalCtx); +void func_80AE009C(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_TalkRegular(EnPoh* this, GlobalContext* globalCtx); +void EnPoh_TalkComposer(EnPoh* this, GlobalContext* globalCtx); + +static s16 D_80AE1A50 = 0; + const ActorInit En_Poh_InitVars = { ACTOR_EN_POH, ACTORTYPE_ENEMY, @@ -20,111 +53,1099 @@ const ActorInit En_Poh_InitVars = { (ActorFunc)EnPoh_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Destroy.s") +static ColliderCylinderInit sCylinderInit = { + { COLTYPE_UNK3, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER }, + { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 }, + { 20, 40, 20, { 0, 0, 0 } }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s") +static ColliderJntSphItemInit D_80AE1AA0[] = { + { + { 0x00, { 0xFFCFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, 0x01, 0x00, 0x01 }, + { 18, { { 0, 1400, 0 }, 10 }, 100 }, + }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s") +static ColliderJntSphInit sJntSphInit = { { COLTYPE_UNK3, 0x11, 0x09, 0x39, 0x10, COLSHAPE_JNTSPH }, 1, D_80AE1AA0 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s") +static CollisionCheckInfoInit sColChkInfoInit = { 0x04, 0x0019, 0x0032, 0x28 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s") +static DamageTable sDamageTable = { + 0x00, 0x02, 0x01, 0x02, 0x11, 0x02, 0x02, 0x12, 0x01, 0x02, 0x04, 0x02, 0x02, 0x02, 0x02, 0x02, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x02, 0x02, 0x08, 0x04, 0x00, 0x00, 0x04, 0x00, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s") +static EnPohInfo sPoeInfo[2] = { + { + { 255, 170, 255 }, + { 100, 0, 150 }, + 18, + 5, + 248, + 0x060015B0, + 0x06000A60, + 0x060004EC, + 0x060006E0, + 0x06002D28, + 0x06002608, + 0x06003850, + }, + { + { 255, 255, 170 }, + { 0, 150, 0 }, + 9, + 1, + 244, + 0x06001440, + 0x060009DC, + 0x06000570, + 0x06000708, + 0x060045A0, + 0x06005220, + 0x06001C90, + }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s") +static Color_RGBA8 D_80AE1B4C = { 75, 20, 25, 255 }; +static Color_RGBA8 D_80AE1B50 = { 80, 110, 90, 255 }; +static Color_RGBA8 D_80AE1B54 = { 90, 85, 50, 255 }; +static Color_RGBA8 D_80AE1B58 = { 100, 90, 100, 255 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s") +static InitChainEntry sInitChain[] = { + ICHAIN_F32(unk_4C, 3200, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE48C.s") +static Vec3f D_80AE1B60 = { 0.0f, 3.0f, 0.0f }; +static Vec3f D_80AE1B6C = { 0.0f, 0.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s") +extern FlexSkeletonHeader D_06006F90; +extern AnimationHeader D_060009DC; +extern SkeletonHeader D_060050D0; +extern AnimationHeader D_06000A60; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s") +extern AnimationHeader D_060001A8; +extern AnimationHeader D_0600020C; +extern AnimationHeader D_060004EC; +extern AnimationHeader D_06000570; +extern AnimationHeader D_06000FE4; +extern AnimationHeader D_060011C4; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE56C.s") +extern Gfx D_06004638[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE5C4.s") +extern Gfx D_06004498[]; +extern Gfx D_06004530[]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE610.s") +void EnPoh_Init(Actor* thisx, GlobalContext* globalCtx) { + s32 pad; + EnItem00* collectible; + EnPoh* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE6D4.s") + Actor_ProcessInitChain(&this->actor, sInitChain); + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + Collider_InitJntSph(globalCtx, &this->colliderSph); + Collider_SetJntSph(globalCtx, &this->colliderSph, &this->actor, &sJntSphInit, &this->colliderSphItem); + this->colliderSph.list[0].dim.worldSphere.radius = 0; + this->colliderSph.list[0].dim.worldSphere.center.x = this->actor.posRot.pos.x; + this->colliderSph.list[0].dim.worldSphere.center.y = this->actor.posRot.pos.y; + this->colliderSph.list[0].dim.worldSphere.center.z = this->actor.posRot.pos.z; + Collider_InitCylinder(globalCtx, &this->colliderCyl); + Collider_SetCylinder(globalCtx, &this->colliderCyl, &this->actor, &sCylinderInit); + func_80061ED4(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); + this->unk_194 = 0; + this->unk_195 = 32; + this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->lightNode = LightContext_InsertLight(globalCtx, &globalCtx->lightCtx, &this->lightInfo); + Lights_PointGlowSetInfo(&this->lightInfo, this->actor.initPosRot.pos.x, this->actor.initPosRot.pos.y, + this->actor.initPosRot.pos.z, 255, 255, 255, 0); + if (this->actor.params >= 4) { + this->actor.params = EN_POH_NORMAL; + } + if (this->actor.params == EN_POH_RUPEE) { + D_80AE1A50++; + if (D_80AE1A50 >= 3) { + Actor_Kill(&this->actor); + } else { + collectible = Item_DropCollectible(globalCtx, &this->actor.posRot.pos, 0x4000 | ITEM00_RUPEE_BLUE); + if (collectible != NULL) { + collectible->actor.speedXZ = 0.0f; + } + } + } else if (this->actor.params == EN_POH_FLAT) { + if (Flags_GetSwitch(globalCtx, 0x28) || Flags_GetSwitch(globalCtx, 0x9)) { + Actor_Kill(&this->actor); + } else { + Flags_SetSwitch(globalCtx, 0x28); + } + } else if (this->actor.params == EN_POH_SHARP) { + if (Flags_GetSwitch(globalCtx, 0x29) || Flags_GetSwitch(globalCtx, 0x9)) { + Actor_Kill(&this->actor); + } else { + Flags_SetSwitch(globalCtx, 0x29); + } + } + if (this->actor.params < EN_POH_SHARP) { + this->objectIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_POH); + this->infoIdx = EN_POH_INFO_NORMAL; + this->actor.naviEnemyId = 0x44; + } else { + this->objectIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_PO_COMPOSER); + this->infoIdx = EN_POH_INFO_COMPOSER; + this->actor.naviEnemyId = 0x43; + } + this->info = &sPoeInfo[this->infoIdx]; + if (this->objectIdx < 0) { + Actor_Kill(&this->actor); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE7C0.s") +void EnPoh_Destroy(Actor* thisx, GlobalContext* globalCtx) { + EnPoh* this = THIS; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE950.s") + LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode); + Collider_DestroyJntSph(globalCtx, &this->colliderSph); + Collider_DestroyCylinder(globalCtx, &this->colliderCyl); + if (this->actor.params == EN_POH_RUPEE) { + D_80AE1A50--; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE998.s") +void func_80ADE114(EnPoh* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, this->info->unk_C); + this->unk_198 = Math_Rand_S16Offset(2, 3); + this->actionFunc = func_80ADEAC4; + this->actor.speedXZ = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9BC.s") +void EnPoh_SetupIdle(EnPoh* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, this->info->unk_10); + this->unk_198 = Math_Rand_S16Offset(15, 3); + this->actionFunc = EnPoh_Idle; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE9CC.s") +void func_80ADE1BC(EnPoh* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, this->info->unk_10); + this->actionFunc = func_80ADEC9C; + this->unk_198 = 0; + this->actor.speedXZ = 2.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEA5C.s") +void EnPoh_SetupAttack(EnPoh* this) { + if (this->infoIdx == EN_POH_INFO_NORMAL) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_060001A8, -6.0f); + } else { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_0600020C); + } + this->unk_198 = 12; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + this->actionFunc = EnPoh_Attack; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEAC4.s") +void func_80ADE28C(EnPoh* this) { + if (this->infoIdx == EN_POH_INFO_NORMAL) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_060004EC, -6.0f); + } else { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06000570); + } + if (this->colliderCyl.body.acHitItem->toucher.flags & 0x0001F824) { + this->actor.posRot.rot.y = this->colliderCyl.base.ac->posRot.rot.y; + } else { + this->actor.posRot.rot.y = func_8002DA78(&this->actor, this->colliderCyl.base.ac) + 0x8000; + } + this->colliderCyl.base.acFlags &= ~1; + this->actor.speedXZ = 5.0f; + func_8003426C(&this->actor, 0x4000, 0xFF, 0, 0x10); + this->actionFunc = func_80ADEECC; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEB80.s") +void func_80ADE368(EnPoh* this) { + SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, this->info->unk_18, -5.0f); + this->actor.speedXZ = 5.0f; + this->actor.posRot.rot.y = this->actor.shape.rot.y + 0x8000; + this->colliderCyl.base.acFlags |= 1; + this->unk_198 = 200; + this->actionFunc = func_80ADF894; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEC9C.s") +void EnPoh_SetupInitialAction(EnPoh* this) { + this->lightColor.a = 0; + this->actor.flags &= ~1; + if (this->infoIdx == EN_POH_INFO_NORMAL) { + SkelAnime_ChangeAnimPlaybackStop(&this->skelAnime, &D_060011C4, 0.0f); + this->actionFunc = func_80ADEF38; + } else { + SkelAnime_ChangeAnimPlaybackStop(&this->skelAnime, &D_06000FE4, 1.0f); + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + 20.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + this->actionFunc = EnPoh_ComposerAppear; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEDFC.s") +void func_80ADE48C(EnPoh* this) { + this->actor.speedXZ = 0.0f; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + this->unk_198 = 0; + this->actor.naviEnemyId = 0xFF; + this->actor.flags &= ~1; + this->actionFunc = func_80ADF15C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEECC.s") +void func_80ADE4C8(EnPoh* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, this->info->unk_10); + this->actionFunc = func_80ADF574; + this->actor.speedXZ = -5.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADEF38.s") +void func_80ADE514(EnPoh* this) { + SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, this->info->unk_C); + this->unk_19C = this->actor.posRot.rot.y + 0x8000; + this->actionFunc = func_80ADF5E0; + this->actor.speedXZ = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF0B8.s") +void EnPoh_SetupDisappear(EnPoh* this) { + this->unk_194 = 32; + this->actor.speedXZ = 0.0f; + this->actor.posRot.rot.y = this->actor.shape.rot.y; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DISAPPEAR); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + this->actionFunc = EnPoh_Disappear; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF15C.s") +void EnPoh_SetupAppear(EnPoh* this) { + this->unk_194 = 0; + this->actor.speedXZ = 0.0f; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + this->actionFunc = EnPoh_Appear; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF574.s") +void EnPoh_SetupDeath(EnPoh* this, GlobalContext* globalCtx) { + this->actor.update = EnPoh_UpdateDead; + this->actor.draw = EnPoh_DrawSoul; + this->actor.shape.shadowDrawFunc = NULL; + Actor_SetScale(&this->actor, 0.01f); + this->actor.flags |= 0x10; + this->actor.gravity = -1.0f; + this->actor.shape.unk_08 = 1500.0f; + this->actor.posRot.pos.y -= 15.0f; + if (this->infoIdx != EN_POH_INFO_COMPOSER) { + this->actor.shape.rot.x = -0x8000; + } + Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, 8); + this->unk_198 = 60; + this->actionFunc = EnPoh_Death; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF5E0.s") +void func_80ADE6D4(EnPoh* this) { + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, 0, 0, 0); + this->visibilityTimer = 0; + this->actor.shape.rot.y = 0; + this->lightColor.r = 0; + this->lightColor.a = 0; + this->actor.shape.unk_08 = 0.0f; + this->actor.gravity = 0.0f; + this->actor.velocity.y = 0.0f; + if (this->actor.params >= EN_POH_SHARP) { + this->lightColor.g = 200; + this->lightColor.b = 0; + } else { + this->lightColor.g = 0; + this->lightColor.b = 200; + } + this->actor.scale.x = 0.0f; + this->actor.scale.y = 0.0f; + this->actor.shape.rot.x = 0; + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y; + Audio_PlayActorSound2(&this->actor, NA_SE_EV_METAL_BOX_BOUND); + this->actionFunc = func_80ADFE28; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF660.s") +void EnPoh_Talk(EnPoh* this, GlobalContext* globalCtx) { + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y; + Actor_SetHeight(&this->actor, -10.0f); + this->colliderCyl.dim.radius = 13; + this->colliderCyl.dim.height = 30; + this->colliderCyl.dim.yShift = 0; + this->colliderCyl.dim.pos.x = this->actor.posRot.pos.x; + this->colliderCyl.dim.pos.y = this->actor.posRot.pos.y - 20.0f; + this->colliderCyl.dim.pos.z = this->actor.posRot.pos.z; + this->colliderCyl.base.maskA = 9; + if (this->actor.params == EN_POH_FLAT || this->actor.params == EN_POH_SHARP) { + if (CHECK_QUEST_ITEM(QUEST_SONG_SUN)) { + this->actor.textId = 0x5000; + } else if (!Flags_GetSwitch(globalCtx, 0xA) && !Flags_GetSwitch(globalCtx, 0xB)) { + this->actor.textId = 0x500F; + } else if ((this->actor.params == EN_POH_FLAT && Flags_GetSwitch(globalCtx, 0xA)) || + (this->actor.params == EN_POH_SHARP && Flags_GetSwitch(globalCtx, 0xB))) { + this->actor.textId = 0x5013; + } else { + this->actor.textId = 0x5012; + } + } else { + this->actor.textId = 0x5005; + } + this->unk_198 = 200; + this->unk_195 = 32; + this->actor.flags |= 1; + this->actionFunc = func_80ADFE80; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF77C.s") +void func_80ADE950(EnPoh* this, s32 arg1) { + if (arg1) { + func_800F8A44(&this->actor.projectedPos, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + } + this->actionFunc = func_80AE009C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF894.s") +void func_80ADE998(EnPoh* this) { + this->actionFunc = EnPoh_TalkRegular; + this->actor.initPosRot.pos.y = this->actor.posRot.pos.y - 15.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADF994.s") +void func_80ADE9BC(EnPoh* this) { + this->actionFunc = EnPoh_TalkComposer; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFA90.s") +void EnPoh_MoveTowardsPlayerHeight(EnPoh* this, GlobalContext* globalCtx) { + Player* player = PLAYER; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE28.s") + Math_ApproxF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y, 1.0f); + this->actor.posRot.pos.y += 2.5f * Math_Sins(this->unk_195 * 0x800); + if (this->unk_195 != 0) { + this->unk_195 -= 1; + } + if (this->unk_195 == 0) { + this->unk_195 = 32; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADFE80.s") +void func_80ADEA5C(EnPoh* this) { + if (func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) > 400.0f) { + this->unk_19C = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos); + } + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->unk_19C, 0x71C); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE009C.s") +void func_80ADEAC4(EnPoh* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_198 != 0) { + this->unk_198--; + } + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); + if (this->actor.xzDistFromLink < 200.0f) { + func_80ADE1BC(this); + } else if (this->unk_198 == 0) { + EnPoh_SetupIdle(this); + } + if (this->lightColor.a == 255) { + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE00DC.s") +void EnPoh_Idle(EnPoh* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + Math_ApproxF(&this->actor.speedXZ, 1.0f, 0.2f); + if (func_800A56C8(&this->skelAnime, 0.0f) && this->unk_198 != 0) { + this->unk_198--; + } + func_80ADEA5C(this); + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); + if (this->actor.xzDistFromLink < 200.0f && this->unk_198 < 19) { + func_80ADE1BC(this); + } else if (this->unk_198 == 0) { + if (Math_Rand_ZeroOne() < 0.1f) { + func_80ADE514(this); + } else { + func_80ADE114(this); + } + } + if (this->lightColor.a == 255) { + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0204.s") +void func_80ADEC9C(EnPoh* this, GlobalContext* globalCtx) { + Player* player; + s16 facingDiff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE032C.s") + player = PLAYER; + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (this->unk_198 != 0) { + this->unk_198--; + } + facingDiff = this->actor.yawTowardsLink - player->actor.shape.rot.y; + if (facingDiff >= 0x3001) { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x3000, 0x71C); + } else if (facingDiff < -0x3000) { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink - 0x3000, 0x71C); + } else { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0x71C); + } + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); + if (this->actor.xzDistFromLink > 280.0f) { + EnPoh_SetupIdle(this); + } else if (this->unk_198 == 0 && this->actor.xzDistFromLink < 140.0f && + func_8002DFC8(&this->actor, 0x2AAA, globalCtx) == 0) { + EnPoh_SetupAttack(this); + } + if (this->lightColor.a == 255) { + func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE03C4.s") +void EnPoh_Attack(EnPoh* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (func_800A56C8(&this->skelAnime, 0.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_KANTERA); + if (this->unk_198 != 0) { + this->unk_198--; + } + } + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); + if (this->unk_198 >= 10) { + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 0xE38); + } else if (this->unk_198 == 9) { + this->actor.speedXZ = 5.0f; + this->skelAnime.animPlaybackSpeed = 2.0f; + } else if (this->unk_198 == 0) { + EnPoh_SetupIdle(this); + this->unk_198 = 23; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s") +void func_80ADEECC(EnPoh* this, GlobalContext* globalCtx) { + Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + if (this->actor.colChkInfo.health != 0) { + func_80ADE368(this); + } else { + func_80ADE48C(this); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE067C.s") +void func_80ADEF38(EnPoh* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->lightColor.a = 255; + this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->actor.flags |= 1; + EnPoh_SetupIdle(this); + } else if (this->skelAnime.animCurrentFrame > 10.0f) { + this->lightColor.a = ((this->skelAnime.animCurrentFrame - 10.0f) * 0.05f) * 255.0f; + } + if (this->skelAnime.animPlaybackSpeed < 0.5f && this->actor.xzDistFromLink < 280.0f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_APPEAR); + this->skelAnime.animPlaybackSpeed = 1.0f; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE089C.s") +void EnPoh_ComposerAppear(EnPoh* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->lightColor.a = 255; + this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->actor.flags |= 1; + EnPoh_SetupIdle(this); + } else { + this->lightColor.a = CLAMP_MAX((s32)(this->skelAnime.animCurrentFrame * 25.5f), 255); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0A1C.s") +void func_80ADF15C(EnPoh* this, GlobalContext* globalCtx) { + Vec3f vec; + f32 multiplier; + f32 newScale; + s32 pad; + s32 pad1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0BF8.s") + this->unk_198++; + if (this->unk_198 < 8) { + if (this->unk_198 < 5) { + vec.y = Math_Sins((this->unk_198 * 0x1000) - 0x4000) * 23.0f + (this->actor.posRot.pos.y + 40.0f); + multiplier = Math_Coss((this->unk_198 * 0x1000) - 0x4000) * 23.0f; + vec.x = Math_Sins(func_8005A9F4(ACTIVE_CAM) + 0x4800) * multiplier + this->actor.posRot.pos.x; + vec.z = Math_Coss(func_8005A9F4(ACTIVE_CAM) + 0x4800) * multiplier + this->actor.posRot.pos.z; + } else { + vec.y = (this->actor.posRot.pos.y + 40.0f) + (15.0f * (this->unk_198 - 5)); + vec.x = Math_Sins(func_8005A9F4(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.x; + vec.z = Math_Coss(func_8005A9F4(ACTIVE_CAM) + 0x4800) * 23.0f + this->actor.posRot.pos.z; + } + EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255, + 0, 0, 255, 1, 9, 1); + vec.x = (this->actor.posRot.pos.x + this->actor.posRot.pos.x) - vec.x; + vec.z = (this->actor.posRot.pos.z + this->actor.posRot.pos.z) - vec.z; + EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255, + 0, 0, 255, 1, 9, 1); + vec.x = this->actor.posRot.pos.x; + vec.z = this->actor.posRot.pos.z; + EffectSsDeadDb_Spawn(globalCtx, &vec, &D_80AE1B60, &D_80AE1B6C, this->unk_198 * 10 + 80, 0, 255, 255, 255, 255, + 0, 0, 255, 1, 9, 1); + if (this->unk_198 == 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_EXTINCT); + } + } else if (this->unk_198 == 28) { + EnPoh_SetupDeath(this, globalCtx); + } else if (this->unk_198 >= 19) { + newScale = (28 - this->unk_198) * 0.001f; + this->actor.posRot.pos.y += 5.0f; + this->actor.scale.z = newScale; + this->actor.scale.y = newScale; + this->actor.scale.x = newScale; + } + if (this->unk_198 == 18) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DEAD2); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0CE8.s") +void func_80ADF574(EnPoh* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + EnPoh_SetupIdle(this); + this->unk_198 = 23; + } else { + Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.5f); + this->actor.shape.rot.y += 0x1000; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s") +void func_80ADF5E0(EnPoh* this, GlobalContext* globalCtx) { + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->unk_19C, 1820) != 0) { + EnPoh_SetupIdle(this); + } + if (this->actor.xzDistFromLink < 200.0f) { + func_80ADE1BC(this); + } + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s") +void EnPoh_Disappear(EnPoh* this, GlobalContext* globalCtx) { + if (this->unk_194 != 0) { + this->unk_194--; + } + this->actor.posRot.rot.y += 0x1000; + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); + this->lightColor.a = this->unk_194 * 7.96875f; + if (this->unk_194 == 0) { + this->visibilityTimer = Math_Rand_S16Offset(100, 50); + EnPoh_SetupIdle(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1600.s") +void EnPoh_Appear(EnPoh* this, GlobalContext* globalCtx) { + this->unk_194++; + this->actor.posRot.rot.y -= 0x1000; + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); + this->lightColor.a = this->unk_194 * 7.96875f; + if (this->unk_194 == 32) { + this->visibilityTimer = Math_Rand_S16Offset(700, 300); + this->unk_194 = 0; + EnPoh_SetupIdle(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s") +void func_80ADF894(EnPoh* this, GlobalContext* globalCtx) { + f32 multiplier; + + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + multiplier = Math_Sins(this->unk_195 * 0x800) * 3.0f; + this->actor.posRot.pos.x -= multiplier * Math_Coss(this->actor.shape.rot.y); + this->actor.posRot.pos.z += multiplier * Math_Sins(this->actor.shape.rot.y); + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink + 0x8000, 0x71C); + EnPoh_MoveTowardsPlayerHeight(this, globalCtx); + if (this->unk_198 == 0 || this->actor.xzDistFromLink > 250.0f) { + this->actor.posRot.rot.y = this->actor.shape.rot.y; + EnPoh_SetupIdle(this); + } + func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); +} + +void EnPoh_Death(EnPoh* this, GlobalContext* globalCtx) { + s32 objId; + + if (this->unk_198 != 0) { + this->unk_198--; + } + if (this->actor.bgCheckFlags & 1) { + objId = (this->infoIdx == EN_POH_INFO_COMPOSER) ? OBJECT_PO_COMPOSER : OBJECT_POH; + EffectSsHahen_SpawnBurst(globalCtx, &this->actor.posRot.pos, 6.0f, 0, 1, 1, 15, objId, 10, this->info->unk_1C); + func_80ADE6D4(this); + } else if (this->unk_198 == 0) { + Actor_Kill(&this->actor); + return; + } + Actor_MoveForward(&this->actor); + func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 10.0f, 4); +} + +void func_80ADFA90(EnPoh* this, s32 arg1) { + f32 multiplier; + + this->lightColor.a = CLAMP(this->lightColor.a + arg1, 0, 255); + if (arg1 < 0) { + multiplier = this->lightColor.a * 0.003921569f; + this->actor.scale.z = 0.0056000002f * multiplier + 0.00140000006f; + this->actor.scale.x = 0.0056000002f * multiplier + 0.00140000006f; + this->actor.scale.y = (0.007f - 0.007f * multiplier) + 0.007f; + } else { + multiplier = 1.0f; + this->actor.scale.z = this->lightColor.a * 2.7450982e-05f; + this->actor.scale.y = this->lightColor.a * 2.7450982e-05f; + this->actor.scale.x = this->lightColor.a * 2.7450982e-05f; + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + 0.05882353f * this->lightColor.a; + } + this->lightColor.r = this->info->lightColor.r * multiplier; + this->lightColor.g = this->info->lightColor.g * multiplier; + this->lightColor.b = this->info->lightColor.b * multiplier; + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, this->info->lightColor.r, this->info->lightColor.g, + this->info->lightColor.b, this->lightColor.a * 0.78431373f); +} + +void func_80ADFE28(EnPoh* this, GlobalContext* globalCtx) { + this->actor.initPosRot.pos.y += 2.0f; + func_80ADFA90(this, 20); + if (this->lightColor.a == 255) { + EnPoh_Talk(this, globalCtx); + } +} + +void func_80ADFE80(EnPoh* this, GlobalContext* globalCtx) { + if (this->unk_198 != 0) { + this->unk_198--; + } + if (func_8002F194(&this->actor, globalCtx) != 0) { + if (this->actor.params >= EN_POH_SHARP) { + func_80ADE9BC(this); + } else { + func_80ADE998(this); + } + return; + } + if (this->unk_198 == 0) { + func_80ADE950(this, 1); + this->actor.flags &= ~0x10000; + return; + } + if (this->colliderCyl.base.maskA & 2) { + this->actor.flags |= 0x10000; + func_8002F2F4(&this->actor, globalCtx); + } else { + this->actor.flags &= ~0x10000; + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderCyl.base); + } + this->actor.posRot.pos.y = Math_Sins(this->unk_195 * 0x800) * 5.0f + this->actor.initPosRot.pos.y; + if (this->unk_195 != 0) { + this->unk_195 -= 1; + } + if (this->unk_195 == 0) { + this->unk_195 = 32; + } + this->colliderCyl.dim.pos.y = this->actor.posRot.pos.y - 20.0f; + Actor_SetHeight(&this->actor, -10.0f); + Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, this->info->lightColor.r, this->info->lightColor.g, + this->info->lightColor.b, this->lightColor.a * 0.78431373f); +} + +void func_80AE009C(EnPoh* this, GlobalContext* globalCtx) { + func_80ADFA90(this, -13); + if (this->lightColor.a == 0) { + Actor_Kill(&this->actor); + } +} + +void EnPoh_TalkRegular(EnPoh* this, GlobalContext* globalCtx) { + if (this->actor.textId != 0x5005) { + func_80ADFA90(this, -13); + } else { + func_8002F974(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + } + if (func_8010BDBC(&globalCtx->msgCtx) == 4) { + if (func_80106BC8(globalCtx) != 0) { + func_800F8A44(&this->actor.projectedPos, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + if (globalCtx->msgCtx.choiceIndex == 0) { + if (Inventory_HasEmptyBottle()) { + this->actor.textId = 0x5008; + Item_Give(globalCtx, ITEM_POE); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_BIG_GET); + } else { + this->actor.textId = 0x5006; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + } + } else { + this->actor.textId = 0x5007; + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH); + } + func_8010B720(globalCtx, this->actor.textId); + } + } else if (func_8002F334(&this->actor, globalCtx) != 0) { + func_80ADE950(this, 0); + } +} + +void EnPoh_TalkComposer(EnPoh* this, GlobalContext* globalCtx) { + func_8002F974(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + if (func_8010BDBC(&globalCtx->msgCtx) == 4) { + if (func_80106BC8(globalCtx) != 0) { + if (globalCtx->msgCtx.choiceIndex == 0) { + if (!Flags_GetSwitch(globalCtx, 0xB) && !Flags_GetSwitch(globalCtx, 0xA)) { + this->actor.textId = 0x5010; + } else { + this->actor.textId = 0x5014; + } + func_8010B720(globalCtx, this->actor.textId); + } else { + if (this->actor.params == EN_POH_SHARP) { + Flags_SetSwitch(globalCtx, 0xB); + } else { + Flags_SetSwitch(globalCtx, 0xA); + } + func_80ADE950(this, 1); + } + } + } else if (func_8002F334(&this->actor, globalCtx) != 0) { + if (this->actor.textId == 0x5000) { + Flags_SetSwitch(globalCtx, 9); + } + func_80ADE950(this, 1); + } +} + +void func_80AE032C(EnPoh* this, GlobalContext* globalCtx) { + if (this->colliderCyl.base.acFlags & 2) { + this->colliderCyl.base.acFlags &= ~2; + if (this->actor.colChkInfo.damageEffect != 0 || this->actor.colChkInfo.damage != 0) { + if (Actor_ApplyDamage(&this->actor) == 0) { + func_80032C7C(globalCtx, &this->actor); + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DEAD); + } else { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_DAMAGE); + } + func_80ADE28C(this); + } + } +} + +void EnPoh_UpdateVisibility(EnPoh* this) { + if (this->actionFunc != EnPoh_Appear && this->actionFunc != EnPoh_Disappear && this->actionFunc != func_80ADEF38 && + this->actionFunc != EnPoh_ComposerAppear) { + if (this->visibilityTimer != 0) { + this->visibilityTimer--; + } + if (this->lightColor.a == 255) { + if (this->actor.unk_10C != 0) { + this->unk_194++; + this->unk_194 = CLAMP_MAX(this->unk_194, 20); + } else { + this->unk_194 = 0; + } + if ((this->unk_194 == 20 || this->visibilityTimer == 0) && + (this->actionFunc == func_80ADEAC4 || this->actionFunc == EnPoh_Idle || + this->actionFunc == func_80ADEC9C || this->actionFunc == func_80ADF894 || + this->actionFunc == func_80ADF5E0)) { + EnPoh_SetupDisappear(this); + } + } else if (this->lightColor.a == 0 && this->visibilityTimer == 0 && + (this->actionFunc == func_80ADEAC4 || this->actionFunc == EnPoh_Idle || + this->actionFunc == func_80ADEC9C || this->actionFunc == func_80ADF5E0)) { + EnPoh_SetupAppear(this); + } + } +} + +void EnPoh_Update(Actor* thisx, GlobalContext* globalCtx) { + EnPoh* this = THIS; + + if (Object_IsLoaded(&globalCtx->objectCtx, this->objectIdx) != 0) { + this->actor.objBankIndex = this->objectIdx; + this->actor.update = EnPoh_UpdateLiving; + Actor_SetObjectDependency(globalCtx, &this->actor); + if (this->infoIdx == EN_POH_INFO_NORMAL) { + SkelAnime_Init(globalCtx, &this->skelAnime, &D_060050D0, &D_06000A60, this->limbDrawTable, + this->transitionDrawTable, 21); + this->actor.draw = EnPoh_DrawRegular; + } else { + SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006F90, &D_060009DC, this->limbDrawTable, + this->transitionDrawTable, 12); + this->actor.draw = EnPoh_DrawComposer; + this->colliderSph.list[0].dim.joint = 9; + this->colliderSph.list->dim.modelSphere.center.y *= -1; + this->actor.shape.rot.y = this->actor.posRot.rot.y = -0x4000; + this->colliderCyl.dim.radius = 20; + this->colliderCyl.dim.height = 55; + this->colliderCyl.dim.yShift = 15; + } + this->actor.flags &= ~0x10; + EnPoh_SetupInitialAction(this); + } +} + +void func_80AE067C(EnPoh* this) { + s16 temp_var; + + if (this->actionFunc == EnPoh_Attack) { + this->lightColor.r = CLAMP_MAX((s16)(this->lightColor.r + 5), 255); + this->lightColor.g = CLAMP_MIN((s16)(this->lightColor.g - 5), 50); + temp_var = this->lightColor.b - 5; + this->lightColor.b = CLAMP_MIN(temp_var, 0); + } else if (this->actionFunc == func_80ADF894) { + this->lightColor.r = CLAMP_MAX((s16)(this->lightColor.r + 5), 80); + this->lightColor.g = CLAMP_MAX((s16)(this->lightColor.g + 5), 255); + temp_var = this->lightColor.b + 5; + this->lightColor.b = CLAMP_MAX(temp_var, 225); + } else if (this->actionFunc == func_80ADEECC) { + if (this->actor.dmgEffectTimer & 2) { + this->lightColor.r = 0; + this->lightColor.g = 0; + this->lightColor.b = 0; + } else { + this->lightColor.r = 80; + this->lightColor.g = 255; + this->lightColor.b = 225; + } + } else { + this->lightColor.r = CLAMP_MAX((s16)(this->lightColor.r + 5), 255); + this->lightColor.g = CLAMP_MAX((s16)(this->lightColor.g + 5), 255); + if (this->lightColor.b >= 211) { + temp_var = this->lightColor.b - 5; + this->lightColor.b = CLAMP_MIN(temp_var, 210); + } else { + temp_var = this->lightColor.b + 5; + this->lightColor.b = CLAMP_MAX(temp_var, 210); + } + } +} + +void func_80AE089C(EnPoh* this) { + f32 rand; + + if ((this->actionFunc == func_80ADEF38 || this->actionFunc == EnPoh_ComposerAppear) && + this->skelAnime.animCurrentFrame < 12.0f) { + this->envColor.r = this->envColor.g = this->envColor.b = (s16)(this->skelAnime.animCurrentFrame * 16.66f) + 55; + this->envColor.a = this->skelAnime.animCurrentFrame * 16.666666f; + } else { + rand = Math_Rand_ZeroOne(); + this->envColor.r = (s16)(rand * 30.0f) + 225; + this->envColor.g = (s16)(rand * 100.0f) + 155; + this->envColor.b = (s16)(rand * 160.0f) + 95; + this->envColor.a = 200; + } +} + +void EnPoh_UpdateLiving(Actor* thisx, GlobalContext* globalCtx) { + EnPoh* this = THIS; + s32 pad; + Vec3f vec; + UNK_TYPE sp38; + + if (this->colliderSph.base.atFlags & 2) { + this->colliderSph.base.atFlags &= ~2; + func_80ADE4C8(this); + } + func_80AE032C(this, globalCtx); + EnPoh_UpdateVisibility(this); + this->actionFunc(this, globalCtx); + Actor_MoveForward(&this->actor); + if (this->actionFunc == EnPoh_Attack && this->unk_198 < 10) { + this->actor.flags |= 0x1000000; + CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->colliderSph.base); + } + Collider_CylinderUpdate(&this->actor, &this->colliderCyl); + if ((this->colliderCyl.base.acFlags & 1) && this->lightColor.a == 255) { + CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderCyl.base); + } + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderCyl.base); + CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderSph.base); + Actor_SetHeight(&this->actor, 42.0f); + if (this->actionFunc != func_80ADEECC && this->actionFunc != func_80ADF574) { + if (this->actionFunc == func_80ADF894) { + this->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000; + } else { + this->actor.shape.rot.y = this->actor.posRot.rot.y; + } + } + vec.x = this->actor.posRot.pos.x; + vec.y = this->actor.posRot.pos.y + 20.0f; + vec.z = this->actor.posRot.pos.z; + this->actor.groundY = func_8003C9A4(&globalCtx->colCtx, &this->actor.floorPoly, &sp38, &this->actor, &vec); + func_80AE089C(this); + this->actor.shape.unk_14 = this->lightColor.a; +} + +s32 EnPoh_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, + Gfx** gfxP) { + EnPoh* this = THIS; + + if ((this->lightColor.a == 0 || limbIndex == this->info->unk_6) || + (this->actionFunc == func_80ADF15C && this->unk_198 >= 2)) { + *dList = NULL; + } else if (this->actor.params == EN_POH_FLAT && limbIndex == 0xA) { + *dList = D_06004638; + } + if (limbIndex == 0x13 && this->infoIdx == EN_POH_INFO_NORMAL) { + gDPPipeSync((*gfxP)++); + gDPSetEnvColor((*gfxP)++, this->lightColor.r, this->lightColor.g, this->lightColor.b, this->lightColor.a); + } + return 0; +} + +void EnPoh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfxP) { + EnPoh* this = THIS; + + func_800628A4(limbIndex, &this->colliderSph); + if (this->actionFunc == func_80ADF15C && this->unk_198 >= 2 && limbIndex == this->info->unk_7) { + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2460), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList((*gfxP)++, this->info->unk_20); + } + if (limbIndex == this->info->unk_6) { + if (this->actionFunc == func_80ADF15C && this->unk_198 >= 19 && 0.0f != this->actor.scale.x) { + f32 mtxScale = 0.01f / this->actor.scale.x; + Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); + } + Matrix_Get(&this->unk_368); + if (this->actionFunc == func_80ADF15C && this->unk_198 == 27) { + this->actor.posRot.pos.x = this->unk_368.wx; + this->actor.posRot.pos.y = this->unk_368.wy; + this->actor.posRot.pos.z = this->unk_368.wz; + } + Lights_PointGlowSetInfo(&this->lightInfo, this->colliderSph.list[0].dim.worldSphere.center.x, + this->colliderSph.list[0].dim.worldSphere.center.y, + this->colliderSph.list[0].dim.worldSphere.center.z, this->envColor.r, this->envColor.g, + this->envColor.b, this->envColor.a * 0.78431374f); + } +} + +void EnPoh_DrawRegular(Actor* thisx, GlobalContext* globalCtx) { + EnPoh* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2629); + func_80AE067C(this); + func_80093D18(globalCtx->state.gfxCtx); + func_80093D84(globalCtx->state.gfxCtx); + if (this->lightColor.a == 255 || this->lightColor.a == 0) { + gDPSetEnvColor(POLY_OPA_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, this->lightColor.a); + gSPSegment(POLY_OPA_DISP++, 0x08, D_80116280 + 2); + POLY_OPA_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, &this->actor, POLY_OPA_DISP); + } else { + gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->lightColor.a); + gSPSegment(POLY_XLU_DISP++, 0x08, D_80116280); + POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, &this->actor, POLY_XLU_DISP); + } + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255); + Matrix_Put(&this->unk_368); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2676), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, this->info->unk_1C); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2681); +} + +void EnPoh_DrawComposer(Actor* thisx, GlobalContext* globalCtx) { + EnPoh* this = THIS; + Color_RGBA8* sp90; + Color_RGBA8* phi_t0; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2694); + func_80AE067C(this); + if (this->actor.params == EN_POH_SHARP) { + sp90 = &D_80AE1B4C; + phi_t0 = &D_80AE1B54; + } else { + sp90 = &D_80AE1B50; + phi_t0 = &D_80AE1B58; + } + if (this->lightColor.a == 255 || this->lightColor.a == 0) { + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(POLY_OPA_DISP++, 0x08, + Gfx_EnvColor(globalCtx->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b, + this->lightColor.a)); + gSPSegment(POLY_OPA_DISP++, 0x0A, + Gfx_EnvColor(globalCtx->state.gfxCtx, sp90->r, sp90->g, sp90->b, this->lightColor.a)); + gSPSegment(POLY_OPA_DISP++, 0x0B, + Gfx_EnvColor(globalCtx->state.gfxCtx, phi_t0->r, phi_t0->g, phi_t0->b, this->lightColor.a)); + gSPSegment(POLY_OPA_DISP++, 0x0C, D_80116280 + 2); + POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + this->skelAnime.dListCount, EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, + &this->actor, POLY_OPA_DISP); + } else { + func_80093D18(globalCtx->state.gfxCtx); + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_EnvColor(globalCtx->state.gfxCtx, this->lightColor.r, this->lightColor.g, this->lightColor.b, + this->lightColor.a)); + gSPSegment(POLY_XLU_DISP++, 0x0A, + Gfx_EnvColor(globalCtx->state.gfxCtx, sp90->r, sp90->g, sp90->b, this->lightColor.a)); + gSPSegment(POLY_XLU_DISP++, 0x0B, + Gfx_EnvColor(globalCtx->state.gfxCtx, phi_t0->r, phi_t0->g, phi_t0->b, this->lightColor.a)); + gSPSegment(POLY_XLU_DISP++, 0x0C, D_80116280); + POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, + this->skelAnime.dListCount, EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, + &this->actor, POLY_XLU_DISP); + } + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255); + Matrix_Put(&this->unk_368); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2787), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, this->info->unk_1C); + gSPDisplayList(POLY_OPA_DISP++, D_06004498); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, sp90->r, sp90->g, sp90->b, 255); + gSPDisplayList(POLY_OPA_DISP++, D_06004530); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2802); +} + +void EnPoh_UpdateDead(Actor* thisx, GlobalContext* globalCtx) { + EnPoh* this = THIS; + + this->actionFunc(this, globalCtx); + if (this->actionFunc != EnPoh_Death) { + this->visibilityTimer++; + } + func_80AE089C(this); +} + +void EnPoh_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { + EnPoh* this = THIS; + + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2833); + + if (this->actionFunc == EnPoh_Death) { + func_80093D18(globalCtx->state.gfxCtx); + gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255); + Lights_PointGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, this->envColor.r, this->envColor.g, this->envColor.b, 200); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2854), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, this->info->unk_1C); + if (this->infoIdx == EN_POH_INFO_COMPOSER) { + Color_RGBA8* envColor = (this->actor.params == EN_POH_SHARP) ? &D_80AE1B4C : &D_80AE1B50; + s32 pad; + gSPDisplayList(POLY_OPA_DISP++, D_06004498); + gDPPipeSync(POLY_OPA_DISP++); + gDPSetEnvColor(POLY_OPA_DISP++, envColor->r, envColor->g, envColor->b, 255); + gSPDisplayList(POLY_OPA_DISP++, D_06004530); + } + } else { + func_80093D84(globalCtx->state.gfxCtx); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, + (this->visibilityTimer * this->info->unk_8) % 512U, 0x20, 0x80)); + gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, this->info->primColor.r, this->info->primColor.g, + this->info->primColor.b, this->lightColor.a); + gDPSetEnvColor(POLY_XLU_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 255); + Matrix_RotateY((s16)(func_8005A9F4(ACTIVE_CAM) + 0x8000) * 9.58738e-05f, MTXMODE_APPLY); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2910), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_XLU_DISP++, this->info->soulDisplayList); + } + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2916); +} diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h index f3b50339fa..7ee1ee042c 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -6,9 +6,57 @@ struct EnPoh; +typedef void (*EnPohActionFunc)(struct EnPoh*, GlobalContext*); + +typedef enum { + EN_POH_NORMAL, + EN_POH_RUPEE, + EN_POH_SHARP, + EN_POH_FLAT +} EnPohType; + +typedef enum { + EN_POH_INFO_NORMAL, + EN_POH_INFO_COMPOSER +} EnPohInfoType; + +typedef struct { + /* 0x0000 */ Color_RGB8 primColor; + /* 0x0003 */ Color_RGB8 lightColor; + /* 0x0006 */ u8 unk_6; // limb index + /* 0x0006 */ u8 unk_7; // limb index + /* 0x0008 */ s8 unk_8; // rate of some kind + /* 0x000C */ AnimationHeader* unk_C; + /* 0x0010 */ AnimationHeader* unk_10; + /* 0x0014 */ UNK_PTR unk_14; + /* 0x0018 */ AnimationHeader* unk_18; + /* 0x001C */ Gfx* unk_1C; + /* 0x0020 */ Gfx* unk_20; + /* 0x0024 */ Gfx* soulDisplayList; +} EnPohInfo; // size = 0x28 + typedef struct EnPoh { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x25C]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ EnPohActionFunc actionFunc; + /* 0x0194 */ u8 unk_194; + /* 0x0195 */ u8 unk_195; + /* 0x0196 */ s8 objectIdx; + /* 0x0197 */ u8 infoIdx; + /* 0x0198 */ s16 unk_198; + /* 0x019A */ s16 visibilityTimer; + /* 0x019C */ s16 unk_19C; + /* 0x019E */ Vec3s limbDrawTable[21]; + /* 0x021C */ Vec3s transitionDrawTable[21]; + /* 0x029A */ Color_RGBA8 lightColor; + /* 0x029E */ Color_RGBA8 envColor; + /* 0x02A4 */ EnPohInfo* info; + /* 0x02A8 */ LightNode* lightNode; + /* 0x02AC */ LightInfo lightInfo; + /* 0x02BC */ ColliderCylinder colliderCyl; + /* 0x0308 */ ColliderJntSph colliderSph; + /* 0x0328 */ ColliderJntSphItem colliderSphItem; + /* 0x0368 */ MtxF unk_368; } EnPoh; // size = 0x03A8 extern const ActorInit En_Poh_InitVars; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 5a73310c66..7fbe600bee 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -196,8 +196,8 @@ void EnTk_DigAnim(EnTk* this, GlobalContext* globalCtx) { void EnTk_UpdateEyes(EnTk* this) { if (DECR(this->blinkCountdown) == 0) { - this->eyeImageIdx++; - if (this->eyeImageIdx > 2) { + this->eyeTextureIdx++; + if (this->eyeTextureIdx > 2) { this->blinkCycles--; if (this->blinkCycles < 0) { this->blinkCountdown = Math_Rand_S16Offset(30, 30); @@ -206,7 +206,7 @@ void EnTk_UpdateEyes(EnTk* this) { this->blinkCycles++; } } - this->eyeImageIdx = 0; + this->eyeTextureIdx = 0; } } } @@ -738,7 +738,7 @@ void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeImageIdx])); + gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->eyeTextureIdx])); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnim.skeleton, this->skelAnim.limbDrawTbl, this->skelAnim.dListCount, EnTk_OverrideLimbDraw, EnTk_PostLimbDraw, this); diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 7887057000..c62051b92c 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -39,7 +39,7 @@ typedef struct EnTk { /* 0x021C */ s16 actionCountdown; /* 0x021E */ s16 h_21E; /* 0x0220 */ char unk_220[0x2]; - /* 0x0222 */ s16 eyeImageIdx; + /* 0x0222 */ s16 eyeTextureIdx; /* 0x0224 */ s16 blinkCountdown; /* 0x0226 */ s16 headRot; /* 0x0228 */ s16 currentWaypoint; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 6f764872bd..51efd7d78a 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -44,7 +44,7 @@ static InitChainEntry sInitChain[] = { static UNK_PTR D_80B43F64[] = { 0x06000AF0, 0x06000000 }; -extern UNK_TYPE D_06000A60; +extern Gfx D_06000A60[]; extern Gfx D_06000970[]; void EnYukabyun_Init(Actor* thisx, GlobalContext* globalCtx) { @@ -98,7 +98,7 @@ void func_80B43B6C(EnYukabyun* this, GlobalContext* globalCtx) { void EnYukabyun_Break(EnYukabyun* this, GlobalContext* globalCtx) { EffectSsHahen_SpawnBurst(globalCtx, &this->actor.posRot.pos, 8.0f, 0, 1300, 300, 15, OBJECT_YUKABYUN, 10, - &D_06000A60); + D_06000A60); Actor_Kill(&this->actor); } diff --git a/undefined_syms.txt b/undefined_syms.txt index 3aaaf9bbfc..f1b1ec7c44 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1156,6 +1156,66 @@ D_060009E0 = 0x060009E0; D_06000660 = 0x06000660; D_06000FC0 = 0x06000FC0; +// z_en_poh +D_060001A8 = 0x060001A8; +D_0600020C = 0x0600020C; +D_060004EC = 0x060004EC; +D_06000570 = 0x06000570; +D_06000FE4 = 0x06000FE4; +D_060011C4 = 0x060011C4; +D_06006F90 = 0x06006F90; +D_060009DC = 0x060009DC; +D_060050D0 = 0x060050D0; +D_06000A60 = 0x06000A60; +D_06004638 = 0x06004638; +D_06004498 = 0x06004498; +D_06004530 = 0x06004530; +D_06004530 = 0x06004530; +D_06004498 = 0x06004498; +D_06004498 = 0x06004498; +D_06004530 = 0x06004530; + +// z_en_po_field +D_06000924 = 0x06000924; +D_06006A30 = 0x06006A30; +D_06000F9C = 0x06000F9C; +D_06000608 = 0x06000608; +D_06000454 = 0x06000454; +D_06001360 = 0x06001360; +D_06004BA0 = 0x06004BA0; +D_0404D4E0 = 0x0404D4E0; +D_060059F0 = 0x060059F0; +D_06005900 = 0x06005900; +D_06005620 = 0x06005620; +D_060066D0 = 0x060066D0; +D_06004CC0 = 0x06004CC0; +D_060023B0 = 0x060023B0; + +// z_en_po_desert +D_06006A30 = 0x06006A30; +D_06000924 = 0x06000924; +D_06001360 = 0x06001360; +D_06004BA0 = 0x06004BA0; +D_06004CC0 = 0x06004CC0; + +// z_en_po_sisters +D_060065C8 = 0x060065C8; +D_060014CC = 0x060014CC; +D_06000D40 = 0x06000D40; +D_06000114 = 0x06000114; +D_060008C0 = 0x060008C0; +D_06000A54 = 0x06000A54; +D_0600119C = 0x0600119C; +D_06000680 = 0x06000680; +D_060027B0 = 0x060027B0; +D_060046E0 = 0x060046E0; + +// z_en_po_relay +D_0600BE40 = 0x0600BE40; +D_06003768 = 0x06003768; +D_0600B838 = 0x0600B838; +D_0600BBA0 = 0x0600BBA0; + // z_en_nb D_060181C8 = 0x060181C8; D_06009694 = 0x06009694;