From 782ed71f6135152697c6da5a232cef4aa1804d85 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Wed, 29 Mar 2023 20:52:15 -0400 Subject: [PATCH] Massive data relocation (#295) Mostly relocating rodata from data/* files to the appropriate asm/nonmatching/* files, although there is some plain data relocating to be found in here too. Big change to note is the addition of the code_802AAA70.c file, split from memory.c. Based on some padding in the ro/data for memory it seems clear that a split is needed, although it is not clear that exact spot chosen for the split is correct. Still, it gets the file padding for the ro/data and text segments correct so it can't be too wrong. Also included is an update to the asm_processor tool to support the .hword directive. I made a PR to the main repo of that project with an identical change and it was accepted. Signed-off-by: Taggerung --- asm/bss_80004740.s | 15 - asm/bss_800431B0.s | 5 - .../audio/external/func_800C16E8.s | 7 + .../audio/external/func_800C19D0.s | 8 + .../audio/external/func_800C1E2C.s | 91 - .../audio/external/func_800C1F8C.s | 162 - .../audio/external/func_800C21E8.s | 39 - .../audio/external/func_800C2474.s | 7 + .../audio/external/func_800C2A2C.s | 10 + .../audio/external/func_800C3724.s | 8 + .../audio/external/func_800C41CC.s | 11 + .../audio/external/func_800C4398.s | 7 + .../audio/external/func_800C473C.s | 7 + .../audio/external/func_800C4888.s | 10 + .../audio/external/func_800C5E38.s | 7 + .../audio/external/func_800C6108.s | 25 + .../audio/external/func_800C64A0.s | 38 + .../audio/external/func_800C6758.s | 61 - .../audio/external/func_800C683C.s | 14 + .../audio/external/func_800C70A8.s | 29 + .../audio/external/func_800C8770.s | 118 - .../audio/external/func_800C89E4.s | 71 - .../audio/external/func_800C8AE4.s | 7 + .../audio/external/func_800C94A4.s | 110 + .../audio/external/func_800C9A88.s | 173 - .../audio/external/func_800CADD0.s | 10 + .../audio/external/func_800CAEC4.s | 10 + asm/non_matchings/audio/heap/func_800B9BE4.s | 6 + asm/non_matchings/audio/heap/func_800BA00C.s | 8 + asm/non_matchings/audio/heap/func_800BA250.s | 10 + asm/non_matchings/audio/load/audio_init.s | 13 + .../audio/port_eu/func_800CBCB0.s | 8 + .../audio/seqplayer/func_800BFD90.s | 69 + .../audio/seqplayer/func_800C08CC.s | 47 + .../seq_channel_layer_process_script.s | 27 + asm/non_matchings/camera/func_8001C4D0.s | 30 + asm/non_matchings/camera/func_8001CCEC.s | 37 + asm/non_matchings/camera/func_8001D944.s | 37 + asm/non_matchings/camera/func_8001F394.s | 13 + .../code_80027D00/control_cpu_movement.s | 24 + .../code_80027D00/func_80027EDC.s | 19 + .../code_80027D00/func_8002934C.s | 10 + .../code_80027D00/func_80029B4C.s | 16 + .../code_80027D00/func_8002B218.s | 65 - .../code_80027D00/func_8002B9CC.s | 7 + .../code_80027D00/func_8002BB9C.s | 11 + .../code_80027D00/func_8002BD58.s | 134 - .../code_80027D00/func_8002C954.s | 7 + .../code_80027D00/func_8002D268.s | 67 + .../code_80027D00/func_8002E594.s | 48 + .../code_80027D00/func_8002F730.s | 37 + .../code_80027D00/func_8002FE84.s | 196 -- .../code_80027D00/func_80030150.s | 622 ---- .../code_80027D00/func_80030A34.s | 140 - .../code_80027D00/func_800323E4.s | 219 -- .../code_80027D00/func_80032700.s | 379 --- .../code_80027D00/func_800332E8.s | 325 -- .../code_80027D00/func_80033AE0.s | 146 + .../code_80027D00/func_8003680C.s | 295 -- .../code_80027D00/func_80036DB4.s | 287 -- .../code_80027D00/func_800371F4.s | 279 -- .../code_80027D00/func_80038C6C.s | 27 + .../code_80057C60/func_8005A14C.s | 7 + .../code_80057C60/func_8005A74C.s | 11 + .../code_80057C60/func_8005AB60.s | 44 + .../code_80057C60/func_8005B914.s | 31 + .../code_80057C60/func_8005C360.s | 7 + .../code_80057C60/func_8005DAF4.s | 18 + .../code_80057C60/func_8005ED48.s | 10 + .../code_80057C60/func_8005F90C.s | 10 + .../code_80057C60/func_80060504.s | 18 + .../code_80057C60/func_800608E0.s | 147 - .../code_80057C60/func_80060BCC.s | 233 -- .../code_80057C60/func_80061430.s | 99 - .../code_80057C60/func_800615AC.s | 7 + .../code_80057C60/func_80061D4C.s | 7 + .../code_80057C60/func_800624D8.s | 278 -- .../code_80057C60/func_80062C74.s | 28 + .../code_80057C60/func_800644E8.s | 99 - .../code_80057C60/func_80064664.s | 92 - .../code_80057C60/func_8006538C.s | 7 + .../code_80057C60/func_8006801C.s | 7 + .../code_80057C60/func_8006A50C.s | 11 + .../code_80057C60/func_8006A7C0.s | 44 + .../code_80057C60/func_8006AFD0.s | 21 + .../code_80057C60/func_8006C6AC.s | 9 + .../code_80057C60/func_8006C9B8.s | 9 + .../code_80057C60/func_8006CEC0.s | 8 + .../code_80057C60/func_8006D194.s | 8 + .../code_80057C60/func_8006D474.s | 14 + .../code_80057C60/func_8006DD3C.s | 214 -- .../code_8006E9C0/func_8006F008.s | 71 + .../code_8006E9C0/func_8007055C.s | 10 + .../code_8006E9C0/func_80070780.s | 15 + .../code_80071F00/func_80074924.s | 23 + .../code_80071F00/func_800750D8.s | 145 - .../code_80071F00/func_800763CC.s | 101 - .../code_80071F00/func_800769D8.s | 77 - .../code_80071F00/func_80076C9C.s | 54 - .../code_80071F00/func_80076FEC.s | 7 + .../code_80071F00/func_80077138.s | 13 + .../code_80071F00/func_80077584.s | 51 - .../code_80071F00/func_80077700.s | 219 -- .../code_80071F00/func_80077E20.s | 39 - .../code_80071F00/func_80077F64.s | 7 + .../code_80071F00/func_80078220.s | 27 - .../code_80071F00/func_80078288.s | 295 -- .../code_80071F00/func_80078A44.s | 8 + .../code_80071F00/func_80078C70.s | 17 + .../code_80071F00/func_800792D8.s | 7 + .../code_80071F00/func_80079380.s | 10 + .../code_80071F00/func_8007963C.s | 10 + .../code_80071F00/func_80079700.s | 8 + .../code_80071F00/func_800799A8.s | 7 + .../code_80071F00/func_80079B40.s | 8 + .../code_80071F00/func_80079D44.s | 8 + .../code_80071F00/func_8007A060.s | 10 + .../code_80071F00/func_8007A124.s | 8 + .../code_80071F00/func_8007A228.s | 10 + .../code_80071F00/func_8007A2EC.s | 8 + .../code_80071F00/func_8007A3F0.s | 10 + .../code_80071F00/func_8007A4D4.s | 8 + .../code_80071F00/func_8007A948.s | 9 + .../code_80071F00/func_8007AA44.s | 9 + .../code_80071F00/func_8007B34C.s | 19 + .../code_80071F00/func_8007BD04.s | 43 - .../code_80071F00/func_8007BDE0.s | 11 + .../code_80071F00/func_8007BEC8.s | 8 + .../code_80071F00/func_8007BFB0.s | 40 + .../code_80071F00/func_8007C5B4.s | 7 + .../code_80071F00/func_8007C684.s | 8 + .../code_80071F00/func_8007CE0C.s | 7 + .../code_80071F00/func_8007CEDC.s | 14 + .../code_80071F00/func_8007D360.s | 222 -- .../code_80071F00/func_8007D6A8.s | 28 - .../code_80071F00/func_8007D8D4.s | 103 - .../code_80071F00/func_8007DDC0.s | 98 - .../code_80071F00/func_8007DF20.s | 10 + .../code_80071F00/func_8007E00C.s | 8 + .../code_80071F00/func_8007E358.s | 38 - .../code_80071F00/func_8007E3EC.s | 63 - .../code_80071F00/func_8007E63C.s | 13 + .../code_80071F00/func_8007ED6C.s | 8 + .../code_80071F00/func_8007EFBC.s | 194 -- .../code_80071F00/func_8007F280.s | 194 -- .../code_80071F00/func_8007FB48.s | 14 + .../code_80071F00/func_800801FC.s | 8 + .../code_80071F00/func_80080408.s | 8 + .../code_80071F00/func_80080B28.s | 7 + .../code_80071F00/func_80080E8C.s | 10 + .../code_80071F00/func_800810F4.s | 7 + .../code_80071F00/func_80081210.s | 8 + .../code_80071F00/func_8008153C.s | 19 + .../code_80071F00/func_80081848.s | 7 + .../code_80071F00/func_80081924.s | 99 - .../code_80071F00/func_80081AFC.s | 9 + .../code_80071F00/func_8008241C.s | 25 + .../code_80071F00/func_80082A4C.s | 7 + .../code_80071F00/func_80082C30.s | 130 - .../code_80071F00/func_80082F1C.s | 7 + .../code_80071F00/func_8008311C.s | 11 + .../code_80071F00/func_80083248.s | 107 - .../code_80071F00/func_80083538.s | 16 + .../code_80071F00/func_80083868.s | 7 + .../code_80071F00/func_80083948.s | 92 - .../code_80071F00/func_80083B0C.s | 7 + .../code_80071F00/func_80083C04.s | 17 + .../code_80071F00/func_80083FD0.s | 16 + .../code_80071F00/func_80084430.s | 11 + .../code_80071F00/func_800845C8.s | 53 + .../code_80071F00/func_80084B7C.s | 8 + .../code_80071F00/func_80084D2C.s | 11 + .../code_80071F00/func_800850B0.s | 8 + .../code_80071F00/func_80085214.s | 8 + .../code_80071F00/func_800853DC.s | 7 + .../code_80071F00/func_80085534.s | 152 - .../code_80071F00/func_80085878.s | 7 + .../code_80071F00/func_800859C8.s | 8 + .../code_80071F00/func_80085C20.s | 7 + .../code_80071F00/func_80085CA0.s | 11 + .../code_80071F00/func_80085DB8.s | 7 + .../code_80071F00/func_80085E38.s | 8 + .../code_80071F00/func_80085EF8.s | 7 + .../code_80071F00/func_80085F74.s | 11 + .../code_80071F00/func_80086424.s | 70 - .../code_80071F00/func_80086700.s | 7 + .../code_80071F00/func_80086940.s | 11 + .../code_80086E70/func_80089020.s | 196 -- .../code_80086E70/func_80089474.s | 7 + .../code_80086E70/func_80089820.s | 7 + .../code_80086E70/func_80089A04.s | 7 + .../code_80086E70/func_8008A6DC.s | 83 - .../code_80086E70/func_8008ACE0.s | 10 + .../code_80086E70/func_8008B478.s | 10 + .../code_80086E70/func_8008BFFC.s | 8 + .../code_8008C1D0/func_8008CEB0.s | 10 + .../code_8008C1D0/func_8008D170.s | 13 + .../code_8008C1D0/func_8008E118.s | 178 -- .../code_8008C1D0/func_8008FF08.s | 186 -- .../code_8008C1D0/func_80090178.s | 10 + .../code_8008C1D0/func_80090970.s | 19 + .../code_8008C1D0/func_800910E4.s | 64 - .../code_8008C1D0/func_80091298.s | 7 + .../code_80280650/func_8028088C.s | 7 + .../code_80280650/func_8028101C.s | 7 + .../code_80280650/func_8028118C.s | 7 + .../{memory => code_802AAA70}/func_802AAB4C.s | 58 + .../{memory => code_802AAA70}/func_802AAE4C.s | 7 + .../{memory => code_802AAA70}/func_802AB288.s | 0 .../{memory => code_802AAA70}/func_802AB6C4.s | 0 .../{memory => code_802AAA70}/func_802ABB04.s | 0 .../{memory => code_802AAA70}/func_802AC22C.s | 0 .../{memory => code_802AAA70}/func_802AC760.s | 0 .../{memory => code_802AAA70}/func_802ACBA4.s | 0 .../{memory => code_802AAA70}/func_802AD278.s | 0 .../{memory => code_802AAA70}/func_802AD950.s | 0 .../{memory => code_802AAA70}/func_802ADDC8.s | 0 .../{memory => code_802AAA70}/func_802AE1C0.s | 22 + .../{memory => code_802AAA70}/func_802AE434.s | 16 + .../{memory => code_802AAA70}/func_802AEB14.s | 0 .../{memory => code_802AAA70}/func_802AEBA4.s | 0 .../{memory => code_802AAA70}/func_802AECA0.s | 0 .../{memory => code_802AAA70}/func_802AED6C.s | 0 .../{memory => code_802AAA70}/func_802AF314.s | 0 .../{memory => code_802AAA70}/func_802AF5D8.s | 0 .../{memory => code_802AAA70}/func_802AF83C.s | 0 .../{memory => code_802AAA70}/func_802AF8BC.s | 0 .../{memory => code_802AAA70}/func_802AFA34.s | 0 .../process_shell_collision.s | 0 asm/non_matchings/math_util/func_802B6540.s | 10 + asm/non_matchings/math_util/func_802B68F8.s | 10 + asm/non_matchings/math_util/func_802B79F0.s | 37 + .../memory/display_list_unpack.s | 29 + asm/non_matchings/memory/func_802A8F80.s | 11 + asm/non_matchings/memory/func_802A91E4.s | 8 + asm/non_matchings/race_logic/func_802903D8.s | 18 + .../render_courses/func_8029122C.s | 24 + asm/non_matchings/skybox/func_802A4A0C.s | 7 + asm/non_matchings/skybox/func_802A4D18.s | 137 - asm/os/__osException.s | 13 + ctx_includes.c | 1 + data/data_0DD0A0_0.s | 65 - data/data_0DD0A0_1.s | 17 - data/data_0DD0A0_2.s | 411 --- data/data_0DD0A0_2_0.s | 6 +- data/data_0DD0A0_2_1_0.s | 87 - data/data_0DD0A0_3.s | 103 - data/data_0DD0A0_3_0_0.s | 717 ----- data/data_0DD0A0_3_1.s | 21 - data/data_121DA0_2_1.s | 110 - data/data_121DA0_2_2.s | 178 -- data/data_121DA0_2_3.s | 66 - data/data_audio.s | 191 -- data/data_credits_128480_1.s | 21 - data/rodata_audio.s | 27 - data/rodata_audio_2.s | 509 --- ...ta_0DD0A0_3_0.s => rodata_code_80091750.s} | 1387 +------- data/rodata_main.s | 50 - include/waypoints.h | 2 +- mk64.ld | 37 +- progress.py | 2 + src/actors.c | 1 + src/actors_extended.c | 1 + src/audio/external.c | 64 - src/audio/heap.c | 55 +- src/audio/load.c | 79 +- src/audio/synthesis.c | 13 +- src/camera.c | 3 + src/camera.h | 2 + src/code_80004740.c | 5 + src/code_80005FD0.c | 1 + src/code_80027D00.c | 631 ++-- src/code_80027D00.h | 147 +- src/code_800431B0.c | 1 + src/code_80057C60.c | 161 +- src/code_80057C60.h | 66 +- src/code_80071F00.c | 176 +- src/code_80071F00.h | 4 - src/code_80086E70.c | 37 +- src/code_80086E70.h | 2 + src/code_8008C1D0.c | 39 +- src/code_8008C1D0.h | 13 +- src/code_80280650.c | 10 +- src/code_80280650.h | 4 +- src/code_802AAA70.c | 2796 +++++++++++++++++ src/code_802AAA70.h | 31 + src/main.h | 2 - src/math_util.c | 11 +- src/math_util.h | 3 - src/math_util_2.c | 1 + src/memory.c | 2795 +--------------- src/memory.h | 24 - src/profiler.c | 9 +- src/profiler.h | 2 + src/render_courses.c | 1 + src/skybox_and_splitscreen.c | 27 +- src/spawn_players.c | 1 + src/spawn_players.h | 2 - tools/asm_processor/asm_processor.py | 2 +- 299 files changed, 6189 insertions(+), 16002 deletions(-) delete mode 100644 asm/bss_80004740.s delete mode 100644 asm/bss_800431B0.s delete mode 100644 asm/non_matchings/audio/external/func_800C1E2C.s delete mode 100644 asm/non_matchings/audio/external/func_800C1F8C.s delete mode 100644 asm/non_matchings/audio/external/func_800C21E8.s delete mode 100644 asm/non_matchings/audio/external/func_800C6758.s delete mode 100644 asm/non_matchings/audio/external/func_800C8770.s delete mode 100644 asm/non_matchings/audio/external/func_800C89E4.s delete mode 100644 asm/non_matchings/audio/external/func_800C9A88.s delete mode 100644 asm/non_matchings/code_80027D00/func_8002B218.s delete mode 100644 asm/non_matchings/code_80027D00/func_8002BD58.s delete mode 100644 asm/non_matchings/code_80027D00/func_8002FE84.s delete mode 100644 asm/non_matchings/code_80027D00/func_80030150.s delete mode 100644 asm/non_matchings/code_80027D00/func_80030A34.s delete mode 100644 asm/non_matchings/code_80027D00/func_800323E4.s delete mode 100644 asm/non_matchings/code_80027D00/func_80032700.s delete mode 100644 asm/non_matchings/code_80027D00/func_800332E8.s delete mode 100644 asm/non_matchings/code_80027D00/func_8003680C.s delete mode 100644 asm/non_matchings/code_80027D00/func_80036DB4.s delete mode 100644 asm/non_matchings/code_80027D00/func_800371F4.s delete mode 100644 asm/non_matchings/code_80057C60/func_800608E0.s delete mode 100644 asm/non_matchings/code_80057C60/func_80060BCC.s delete mode 100644 asm/non_matchings/code_80057C60/func_80061430.s delete mode 100644 asm/non_matchings/code_80057C60/func_800624D8.s delete mode 100644 asm/non_matchings/code_80057C60/func_800644E8.s delete mode 100644 asm/non_matchings/code_80057C60/func_80064664.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006DD3C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800750D8.s delete mode 100644 asm/non_matchings/code_80071F00/func_800763CC.s delete mode 100644 asm/non_matchings/code_80071F00/func_800769D8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80076C9C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077584.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077700.s delete mode 100644 asm/non_matchings/code_80071F00/func_80077E20.s delete mode 100644 asm/non_matchings/code_80071F00/func_80078220.s delete mode 100644 asm/non_matchings/code_80071F00/func_80078288.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007BD04.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007D360.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007D6A8.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007D8D4.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007DDC0.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007E358.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007E3EC.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007EFBC.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007F280.s delete mode 100644 asm/non_matchings/code_80071F00/func_80081924.s delete mode 100644 asm/non_matchings/code_80071F00/func_80082C30.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083248.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083948.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085534.s delete mode 100644 asm/non_matchings/code_80071F00/func_80086424.s delete mode 100644 asm/non_matchings/code_80086E70/func_80089020.s delete mode 100644 asm/non_matchings/code_80086E70/func_8008A6DC.s delete mode 100644 asm/non_matchings/code_8008C1D0/func_8008E118.s delete mode 100644 asm/non_matchings/code_8008C1D0/func_8008FF08.s delete mode 100644 asm/non_matchings/code_8008C1D0/func_800910E4.s rename asm/non_matchings/{memory => code_802AAA70}/func_802AAB4C.s (94%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AAE4C.s (99%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AB288.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AB6C4.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802ABB04.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AC22C.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AC760.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802ACBA4.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AD278.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AD950.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802ADDC8.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AE1C0.s (97%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AE434.s (99%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AEB14.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AEBA4.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AECA0.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AED6C.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AF314.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AF5D8.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AF83C.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AF8BC.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/func_802AFA34.s (100%) rename asm/non_matchings/{memory => code_802AAA70}/process_shell_collision.s (100%) delete mode 100644 asm/non_matchings/skybox/func_802A4D18.s delete mode 100644 data/data_0DD0A0_0.s delete mode 100644 data/data_0DD0A0_2.s delete mode 100644 data/data_0DD0A0_2_1_0.s delete mode 100644 data/data_0DD0A0_3_0_0.s delete mode 100644 data/data_0DD0A0_3_1.s delete mode 100644 data/data_121DA0_2_1.s delete mode 100644 data/data_121DA0_2_2.s delete mode 100644 data/data_121DA0_2_3.s delete mode 100644 data/data_audio.s delete mode 100644 data/data_credits_128480_1.s delete mode 100644 data/rodata_audio.s delete mode 100644 data/rodata_audio_2.s rename data/{data_0DD0A0_3_0.s => rodata_code_80091750.s} (68%) delete mode 100644 data/rodata_main.s create mode 100644 src/code_802AAA70.c create mode 100644 src/code_802AAA70.h diff --git a/asm/bss_80004740.s b/asm/bss_80004740.s deleted file mode 100644 index f92968b22..000000000 --- a/asm/bss_80004740.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macros.inc" - -.section .bss - -glabel D_80162D70 -.skip 6 - -glabel D_80162D76 -.skip 2 - -glabel D_80162D78 -.skip 2 - -glabel D_80162D7A -.skip 6 diff --git a/asm/bss_800431B0.s b/asm/bss_800431B0.s deleted file mode 100644 index 9eec262e6..000000000 --- a/asm/bss_800431B0.s +++ /dev/null @@ -1,5 +0,0 @@ -.include "macros.inc" - -.section .bss - - diff --git a/asm/non_matchings/audio/external/func_800C16E8.s b/asm/non_matchings/audio/external/func_800C16E8.s index 4938e4498..08f7c7912 100644 --- a/asm/non_matchings/audio/external/func_800C16E8.s +++ b/asm/non_matchings/audio/external/func_800C16E8.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800F35C0 +.float 3.333333333 + +.section .text + glabel func_800C16E8 /* 0C22E8 800C16E8 27ADFFE8 */ addiu $t5, $sp, -0x18 /* 0C22EC 800C16EC F5B40010 */ sdc1 $f20, 0x10($t5) diff --git a/asm/non_matchings/audio/external/func_800C19D0.s b/asm/non_matchings/audio/external/func_800C19D0.s index 07b56dff3..477ab9868 100644 --- a/asm/non_matchings/audio/external/func_800C19D0.s +++ b/asm/non_matchings/audio/external/func_800C19D0.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800F35C4 +.word L800C1A34, L800C1A34, L800C1A34, L800C1A34 +.word L800C1AEC, L800C1A34 + +.section .text + glabel func_800C19D0 /* 0C25D0 800C19D0 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 0C25D4 800C19D4 3C013F80 */ li $at, 0x3F800000 # 1.000000 diff --git a/asm/non_matchings/audio/external/func_800C1E2C.s b/asm/non_matchings/audio/external/func_800C1E2C.s deleted file mode 100644 index 9c88e063f..000000000 --- a/asm/non_matchings/audio/external/func_800C1E2C.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_800C1E2C -/* 0C2A2C 800C1E2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 0C2A30 800C1E30 AFBF002C */ sw $ra, 0x2c($sp) -/* 0C2A34 800C1E34 AFBE0028 */ sw $fp, 0x28($sp) -/* 0C2A38 800C1E38 8CCE0000 */ lw $t6, ($a2) -/* 0C2A3C 800C1E3C C4860000 */ lwc1 $f6, ($a0) -/* 0C2A40 800C1E40 8CCF0008 */ lw $t7, 8($a2) -/* 0C2A44 800C1E44 C5C40000 */ lwc1 $f4, ($t6) -/* 0C2A48 800C1E48 8CD8000C */ lw $t8, 0xc($a2) -/* 0C2A4C 800C1E4C C48A0008 */ lwc1 $f10, 8($a0) -/* 0C2A50 800C1E50 46062401 */ sub.s $f16, $f4, $f6 -/* 0C2A54 800C1E54 C5E80000 */ lwc1 $f8, ($t7) -/* 0C2A58 800C1E58 C4A60000 */ lwc1 $f6, ($a1) -/* 0C2A5C 800C1E5C C7040000 */ lwc1 $f4, ($t8) -/* 0C2A60 800C1E60 460A4481 */ sub.s $f18, $f8, $f10 -/* 0C2A64 800C1E64 03A0F025 */ move $fp, $sp -/* 0C2A68 800C1E68 46062201 */ sub.s $f8, $f4, $f6 -/* 0C2A6C 800C1E6C E7A80044 */ swc1 $f8, 0x44($sp) -/* 0C2A70 800C1E70 8CD90014 */ lw $t9, 0x14($a2) -/* 0C2A74 800C1E74 C4A40008 */ lwc1 $f4, 8($a1) -/* 0C2A78 800C1E78 46108202 */ mul.s $f8, $f16, $f16 -/* 0C2A7C 800C1E7C C72A0000 */ lwc1 $f10, ($t9) -/* 0C2A80 800C1E80 E7B20038 */ swc1 $f18, 0x38($sp) -/* 0C2A84 800C1E84 E7B0003C */ swc1 $f16, 0x3c($sp) -/* 0C2A88 800C1E88 AFA60050 */ sw $a2, 0x50($sp) -/* 0C2A8C 800C1E8C 46045181 */ sub.s $f6, $f10, $f4 -/* 0C2A90 800C1E90 46129282 */ mul.s $f10, $f18, $f18 -/* 0C2A94 800C1E94 E7A60040 */ swc1 $f6, 0x40($sp) -/* 0C2A98 800C1E98 0C033850 */ jal sqrtf -/* 0C2A9C 800C1E9C 460A4300 */ add.s $f12, $f8, $f10 -/* 0C2AA0 800C1EA0 C7D0003C */ lwc1 $f16, 0x3c($fp) -/* 0C2AA4 800C1EA4 C7C40044 */ lwc1 $f4, 0x44($fp) -/* 0C2AA8 800C1EA8 C7D20038 */ lwc1 $f18, 0x38($fp) -/* 0C2AAC 800C1EAC C7C60040 */ lwc1 $f6, 0x40($fp) -/* 0C2AB0 800C1EB0 46048080 */ add.s $f2, $f16, $f4 -/* 0C2AB4 800C1EB4 E7C00034 */ swc1 $f0, 0x34($fp) -/* 0C2AB8 800C1EB8 46069380 */ add.s $f14, $f18, $f6 -/* 0C2ABC 800C1EBC 46021202 */ mul.s $f8, $f2, $f2 -/* 0C2AC0 800C1EC0 00000000 */ nop -/* 0C2AC4 800C1EC4 460E7282 */ mul.s $f10, $f14, $f14 -/* 0C2AC8 800C1EC8 0C033850 */ jal sqrtf -/* 0C2ACC 800C1ECC 460A4300 */ add.s $f12, $f8, $f10 -/* 0C2AD0 800C1ED0 C7C40034 */ lwc1 $f4, 0x34($fp) -/* 0C2AD4 800C1ED4 8FC60050 */ lw $a2, 0x50($fp) -/* 0C2AD8 800C1ED8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C2ADC 800C1EDC 46002181 */ sub.s $f6, $f4, $f0 -/* 0C2AE0 800C1EE0 C4C80034 */ lwc1 $f8, 0x34($a2) -/* 0C2AE4 800C1EE4 44816000 */ mtc1 $at, $f12 -/* 0C2AE8 800C1EE8 3C01800F */ lui $at, %hi(D_800F35DC) # $at, 0x800f -/* 0C2AEC 800C1EEC 46083283 */ div.s $f10, $f6, $f8 -/* 0C2AF0 800C1EF0 C42E35DC */ lwc1 $f14, %lo(D_800F35DC)($at) -/* 0C2AF4 800C1EF4 460A6101 */ sub.s $f4, $f12, $f10 -/* 0C2AF8 800C1EF8 46046083 */ div.s $f2, $f12, $f4 -/* 0C2AFC 800C1EFC 4602703C */ c.lt.s $f14, $f2 -/* 0C2B00 800C1F00 00000000 */ nop -/* 0C2B04 800C1F04 45020004 */ bc1fl .L800C1F18 -/* 0C2B08 800C1F08 E4CE002C */ swc1 $f14, 0x2c($a2) -/* 0C2B0C 800C1F0C 10000002 */ b .L800C1F18 -/* 0C2B10 800C1F10 E4C2002C */ swc1 $f2, 0x2c($a2) -/* 0C2B14 800C1F14 E4CE002C */ swc1 $f14, 0x2c($a2) -.L800C1F18: -/* 0C2B18 800C1F18 8CC80024 */ lw $t0, 0x24($a2) -/* 0C2B1C 800C1F1C 44803000 */ mtc1 $zero, $f6 -/* 0C2B20 800C1F20 C5000000 */ lwc1 $f0, ($t0) -/* 0C2B24 800C1F24 46003032 */ c.eq.s $f6, $f0 -/* 0C2B28 800C1F28 00000000 */ nop -/* 0C2B2C 800C1F2C 45030013 */ bc1tl .L800C1F7C -/* 0C2B30 800C1F30 8FDF002C */ lw $ra, 0x2c($fp) -/* 0C2B34 800C1F34 90C20030 */ lbu $v0, 0x30($a2) -/* 0C2B38 800C1F38 3C0A800F */ lui $t2, %hi(D_800EA06C) # $t2, 0x800f -/* 0C2B3C 800C1F3C 254AA06C */ addiu $t2, %lo(D_800EA06C) # addiu $t2, $t2, -0x5f94 -/* 0C2B40 800C1F40 00024900 */ sll $t1, $v0, 4 -/* 0C2B44 800C1F44 012A1821 */ addu $v1, $t1, $t2 -/* 0C2B48 800C1F48 C4680004 */ lwc1 $f8, 4($v1) -/* 0C2B4C 800C1F4C C4640000 */ lwc1 $f4, ($v1) -/* 0C2B50 800C1F50 3C01800F */ lui $at, %hi(D_800E9F34) -/* 0C2B54 800C1F54 46080283 */ div.s $f10, $f0, $f8 -/* 0C2B58 800C1F58 00025880 */ sll $t3, $v0, 2 -/* 0C2B5C 800C1F5C 002B0821 */ addu $at, $at, $t3 -/* 0C2B60 800C1F60 C4289F34 */ lwc1 $f8, %lo(D_800E9F34)($at) -/* 0C2B64 800C1F64 46045180 */ add.s $f6, $f10, $f4 -/* 0C2B68 800C1F68 C4C4002C */ lwc1 $f4, 0x2c($a2) -/* 0C2B6C 800C1F6C 46083280 */ add.s $f10, $f6, $f8 -/* 0C2B70 800C1F70 460A2182 */ mul.s $f6, $f4, $f10 -/* 0C2B74 800C1F74 E4C6002C */ swc1 $f6, 0x2c($a2) -/* 0C2B78 800C1F78 8FDF002C */ lw $ra, 0x2c($fp) -.L800C1F7C: -/* 0C2B7C 800C1F7C 03C0E825 */ move $sp, $fp -/* 0C2B80 800C1F80 8FDE0028 */ lw $fp, 0x28($fp) -/* 0C2B84 800C1F84 03E00008 */ jr $ra -/* 0C2B88 800C1F88 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/audio/external/func_800C1F8C.s b/asm/non_matchings/audio/external/func_800C1F8C.s deleted file mode 100644 index 0e0531e53..000000000 --- a/asm/non_matchings/audio/external/func_800C1F8C.s +++ /dev/null @@ -1,162 +0,0 @@ -glabel func_800C1F8C -/* 0C2B8C 800C1F8C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 0C2B90 800C1F90 3C05800F */ lui $a1, %hi(D_800EA1C0) # $a1, 0x800f -/* 0C2B94 800C1F94 90A5A1C0 */ lbu $a1, %lo(D_800EA1C0)($a1) -/* 0C2B98 800C1F98 AFBE0050 */ sw $fp, 0x50($sp) -/* 0C2B9C 800C1F9C AFB10034 */ sw $s1, 0x34($sp) -/* 0C2BA0 800C1FA0 24A50001 */ addiu $a1, $a1, 1 -/* 0C2BA4 800C1FA4 30A800FF */ andi $t0, $a1, 0xff -/* 0C2BA8 800C1FA8 03A0F025 */ move $fp, $sp -/* 0C2BAC 800C1FAC AFBF0054 */ sw $ra, 0x54($sp) -/* 0C2BB0 800C1FB0 AFB7004C */ sw $s7, 0x4c($sp) -/* 0C2BB4 800C1FB4 AFB60048 */ sw $s6, 0x48($sp) -/* 0C2BB8 800C1FB8 AFB50044 */ sw $s5, 0x44($sp) -/* 0C2BBC 800C1FBC AFB40040 */ sw $s4, 0x40($sp) -/* 0C2BC0 800C1FC0 AFB3003C */ sw $s3, 0x3c($sp) -/* 0C2BC4 800C1FC4 AFB20038 */ sw $s2, 0x38($sp) -/* 0C2BC8 800C1FC8 AFB00030 */ sw $s0, 0x30($sp) -/* 0C2BCC 800C1FCC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 0C2BD0 800C1FD0 19000020 */ blez $t0, .L800C2054 -/* 0C2BD4 800C1FD4 00008825 */ move $s1, $zero -/* 0C2BD8 800C1FD8 3C0A8019 */ lui $t2, %hi(D_8018FB98) # $t2, 0x8019 -/* 0C2BDC 800C1FDC 3C098019 */ lui $t1, %hi(D_8018FBA8) # $t1, 0x8019 -/* 0C2BE0 800C1FE0 3C078019 */ lui $a3, %hi(D_8018FBD8) # $a3, 0x8019 -/* 0C2BE4 800C1FE4 24E7FBD8 */ addiu $a3, %lo(D_8018FBD8) # addiu $a3, $a3, -0x428 -/* 0C2BE8 800C1FE8 2529FBA8 */ addiu $t1, %lo(D_8018FBA8) # addiu $t1, $t1, -0x458 -/* 0C2BEC 800C1FEC 254AFB98 */ addiu $t2, %lo(D_8018FB98) # addiu $t2, $t2, -0x468 -/* 0C2BF0 800C1FF0 2406000C */ li $a2, 12 -.L800C1FF4: -/* 0C2BF4 800C1FF4 02260019 */ multu $s1, $a2 -/* 0C2BF8 800C1FF8 00117880 */ sll $t7, $s1, 2 -/* 0C2BFC 800C1FFC 014FC021 */ addu $t8, $t2, $t7 -/* 0C2C00 800C2000 8F020000 */ lw $v0, ($t8) -/* 0C2C04 800C2004 26310001 */ addiu $s1, $s1, 1 -/* 0C2C08 800C2008 323900FF */ andi $t9, $s1, 0xff -/* 0C2C0C 800C200C C4440000 */ lwc1 $f4, ($v0) -/* 0C2C10 800C2010 0328082A */ slt $at, $t9, $t0 -/* 0C2C14 800C2014 03208825 */ move $s1, $t9 -/* 0C2C18 800C2018 00002012 */ mflo $a0 -/* 0C2C1C 800C201C 00E41821 */ addu $v1, $a3, $a0 -/* 0C2C20 800C2020 C4660000 */ lwc1 $f6, ($v1) -/* 0C2C24 800C2024 01242821 */ addu $a1, $t1, $a0 -/* 0C2C28 800C2028 C4700008 */ lwc1 $f16, 8($v1) -/* 0C2C2C 800C202C 46062201 */ sub.s $f8, $f4, $f6 -/* 0C2C30 800C2030 E4A80000 */ swc1 $f8, ($a1) -/* 0C2C34 800C2034 C44A0008 */ lwc1 $f10, 8($v0) -/* 0C2C38 800C2038 46105481 */ sub.s $f18, $f10, $f16 -/* 0C2C3C 800C203C E4B20008 */ swc1 $f18, 8($a1) -/* 0C2C40 800C2040 C4440000 */ lwc1 $f4, ($v0) -/* 0C2C44 800C2044 E4640000 */ swc1 $f4, ($v1) -/* 0C2C48 800C2048 C4460008 */ lwc1 $f6, 8($v0) -/* 0C2C4C 800C204C 1420FFE9 */ bnez $at, .L800C1FF4 -/* 0C2C50 800C2050 E4660008 */ swc1 $f6, 8($v1) -.L800C2054: -/* 0C2C54 800C2054 3C138019 */ lui $s3, %hi(D_8018EFD8) # $s3, 0x8019 -/* 0C2C58 800C2058 2673EFD8 */ addiu $s3, %lo(D_8018EFD8) # addiu $s3, $s3, -0x1028 -/* 0C2C5C 800C205C 9271002A */ lbu $s1, 0x2a($s3) -/* 0C2C60 800C2060 241500FF */ li $s5, 255 -/* 0C2C64 800C2064 00002825 */ move $a1, $zero -/* 0C2C68 800C2068 12B10051 */ beq $s5, $s1, .L800C21B0 -/* 0C2C6C 800C206C 02201025 */ move $v0, $s1 -/* 0C2C70 800C2070 3C01800F */ lui $at, %hi(D_800F35E0) # $at, 0x800f -/* 0C2C74 800C2074 3C178019 */ lui $s7, %hi(D_8018FB90) # $s7, 0x8019 -/* 0C2C78 800C2078 3C168019 */ lui $s6, %hi(D_8018FB91) # $s6, 0x8019 -/* 0C2C7C 800C207C 26D6FB91 */ addiu $s6, %lo(D_8018FB91) # addiu $s6, $s6, -0x46f -/* 0C2C80 800C2080 26F7FB90 */ addiu $s7, %lo(D_8018FB90) # addiu $s7, $s7, -0x470 -/* 0C2C84 800C2084 C43435E0 */ lwc1 $f20, %lo(D_800F35E0)($at) -/* 0C2C88 800C2088 2414003C */ li $s4, 60 -.L800C208C: -/* 0C2C8C 800C208C 02340019 */ multu $s1, $s4 -/* 0C2C90 800C2090 00056100 */ sll $t4, $a1, 4 -/* 0C2C94 800C2094 00005812 */ mflo $t3 -/* 0C2C98 800C2098 026B8021 */ addu $s0, $s3, $t3 -/* 0C2C9C 800C209C C608001C */ lwc1 $f8, 0x1c($s0) -/* 0C2CA0 800C20A0 4608A032 */ c.eq.s $f20, $f8 -/* 0C2CA4 800C20A4 00000000 */ nop -/* 0C2CA8 800C20A8 45020020 */ bc1fl .L800C212C -/* 0C2CAC 800C20AC 92020028 */ lbu $v0, 0x28($s0) -/* 0C2CB0 800C20B0 92CD0000 */ lbu $t5, ($s6) -/* 0C2CB4 800C20B4 01856023 */ subu $t4, $t4, $a1 -/* 0C2CB8 800C20B8 000C6080 */ sll $t4, $t4, 2 -/* 0C2CBC 800C20BC 144D0004 */ bne $v0, $t5, .L800C20D0 -/* 0C2CC0 800C20C0 026C2021 */ addu $a0, $s3, $t4 -/* 0C2CC4 800C20C4 92030029 */ lbu $v1, 0x29($s0) -/* 0C2CC8 800C20C8 10000008 */ b .L800C20EC -/* 0C2CCC 800C20CC A2C30000 */ sb $v1, ($s6) -.L800C20D0: -/* 0C2CD0 800C20D0 920F002A */ lbu $t7, 0x2a($s0) -/* 0C2CD4 800C20D4 920E0029 */ lbu $t6, 0x29($s0) -/* 0C2CD8 800C20D8 01F40019 */ multu $t7, $s4 -/* 0C2CDC 800C20DC 0000C012 */ mflo $t8 -/* 0C2CE0 800C20E0 0278C821 */ addu $t9, $s3, $t8 -/* 0C2CE4 800C20E4 A32E0029 */ sb $t6, 0x29($t9) -/* 0C2CE8 800C20E8 92030029 */ lbu $v1, 0x29($s0) -.L800C20EC: -/* 0C2CEC 800C20EC 00740019 */ multu $v1, $s4 -/* 0C2CF0 800C20F0 920B002A */ lbu $t3, 0x2a($s0) -/* 0C2CF4 800C20F4 240F00FF */ li $t7, 255 -/* 0C2CF8 800C20F8 00006012 */ mflo $t4 -/* 0C2CFC 800C20FC 026C6821 */ addu $t5, $s3, $t4 -/* 0C2D00 800C2100 A1AB002A */ sb $t3, 0x2a($t5) -/* 0C2D04 800C2104 92E20000 */ lbu $v0, ($s7) -/* 0C2D08 800C2108 A20F0029 */ sb $t7, 0x29($s0) -/* 0C2D0C 800C210C 00540019 */ multu $v0, $s4 -/* 0C2D10 800C2110 A202002A */ sb $v0, 0x2a($s0) -/* 0C2D14 800C2114 0000C012 */ mflo $t8 -/* 0C2D18 800C2118 02787021 */ addu $t6, $s3, $t8 -/* 0C2D1C 800C211C A1D10029 */ sb $s1, 0x29($t6) -/* 0C2D20 800C2120 10000018 */ b .L800C2184 -/* 0C2D24 800C2124 A2F10000 */ sb $s1, ($s7) -/* 0C2D28 800C2128 92020028 */ lbu $v0, 0x28($s0) -.L800C212C: -/* 0C2D2C 800C212C 3C0C8019 */ lui $t4, %hi(D_8018FB98) # $t4, 0x8019 -/* 0C2D30 800C2130 258CFB98 */ addiu $t4, %lo(D_8018FB98) # addiu $t4, $t4, -0x468 -/* 0C2D34 800C2134 0002C880 */ sll $t9, $v0, 2 -/* 0C2D38 800C2138 032C9021 */ addu $s2, $t9, $t4 -/* 0C2D3C 800C213C 8E440000 */ lw $a0, ($s2) -/* 0C2D40 800C2140 02003025 */ move $a2, $s0 -/* 0C2D44 800C2144 0C030769 */ jal func_800C1DA4 -/* 0C2D48 800C2148 24850024 */ addiu $a1, $a0, 0x24 -/* 0C2D4C 800C214C 8E0D000C */ lw $t5, 0xc($s0) -/* 0C2D50 800C2150 3C0B800F */ lui $t3, %hi(D_800EA1C8) # $t3, 0x800f -/* 0C2D54 800C2154 256BA1C8 */ addiu $t3, %lo(D_800EA1C8) # addiu $t3, $t3, -0x5e38 -/* 0C2D58 800C2158 116D0005 */ beq $t3, $t5, .L800C2170 -/* 0C2D5C 800C215C 3C058019 */ lui $a1, %hi(D_8018FBA8) # $a1, 0x8019 -/* 0C2D60 800C2160 8E440000 */ lw $a0, ($s2) -/* 0C2D64 800C2164 24A5FBA8 */ addiu $a1, %lo(D_8018FBA8) # addiu $a1, $a1, -0x458 -/* 0C2D68 800C2168 0C03078B */ jal func_800C1E2C -/* 0C2D6C 800C216C 02003025 */ move $a2, $s0 -.L800C2170: -/* 0C2D70 800C2170 322500FF */ andi $a1, $s1, 0xff -/* 0C2D74 800C2174 00057900 */ sll $t7, $a1, 4 -/* 0C2D78 800C2178 01E57823 */ subu $t7, $t7, $a1 -/* 0C2D7C 800C217C 000F7880 */ sll $t7, $t7, 2 -/* 0C2D80 800C2180 026F2021 */ addu $a0, $s3, $t7 -.L800C2184: -/* 0C2D84 800C2184 9091002A */ lbu $s1, 0x2a($a0) -/* 0C2D88 800C2188 3C18800F */ lui $t8, %hi(D_800EA244) # $t8, 0x800f -/* 0C2D8C 800C218C 12B10006 */ beq $s5, $s1, .L800C21A8 -/* 0C2D90 800C2190 02201025 */ move $v0, $s1 -/* 0C2D94 800C2194 9318A244 */ lbu $t8, %lo(D_800EA244)($t8) -/* 0C2D98 800C2198 0302082A */ slt $at, $t8, $v0 -/* 0C2D9C 800C219C 10200002 */ beqz $at, .L800C21A8 -/* 0C2DA0 800C21A0 3C01800F */ lui $at, %hi(D_800EA244) # $at, 0x800f -/* 0C2DA4 800C21A4 A031A244 */ sb $s1, %lo(D_800EA244)($at) -.L800C21A8: -/* 0C2DA8 800C21A8 16A2FFB8 */ bne $s5, $v0, .L800C208C -/* 0C2DAC 800C21AC 00000000 */ nop -.L800C21B0: -/* 0C2DB0 800C21B0 8FDF0054 */ lw $ra, 0x54($fp) -/* 0C2DB4 800C21B4 03C0E825 */ move $sp, $fp -/* 0C2DB8 800C21B8 D7D40028 */ ldc1 $f20, 0x28($fp) -/* 0C2DBC 800C21BC 8FD00030 */ lw $s0, 0x30($fp) -/* 0C2DC0 800C21C0 8FD10034 */ lw $s1, 0x34($fp) -/* 0C2DC4 800C21C4 8FD20038 */ lw $s2, 0x38($fp) -/* 0C2DC8 800C21C8 8FD3003C */ lw $s3, 0x3c($fp) -/* 0C2DCC 800C21CC 8FD40040 */ lw $s4, 0x40($fp) -/* 0C2DD0 800C21D0 8FD50044 */ lw $s5, 0x44($fp) -/* 0C2DD4 800C21D4 8FD60048 */ lw $s6, 0x48($fp) -/* 0C2DD8 800C21D8 8FD7004C */ lw $s7, 0x4c($fp) -/* 0C2DDC 800C21DC 8FDE0050 */ lw $fp, 0x50($fp) -/* 0C2DE0 800C21E0 03E00008 */ jr $ra -/* 0C2DE4 800C21E4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/audio/external/func_800C21E8.s b/asm/non_matchings/audio/external/func_800C21E8.s deleted file mode 100644 index 9454be13b..000000000 --- a/asm/non_matchings/audio/external/func_800C21E8.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_800C21E8 -/* 0C2DE8 800C21E8 3C078019 */ lui $a3, %hi(D_8018EFD8) # $a3, 0x8019 -/* 0C2DEC 800C21EC 24E7EFD8 */ addiu $a3, %lo(D_8018EFD8) # addiu $a3, $a3, -0x1028 -/* 0C2DF0 800C21F0 90E2002A */ lbu $v0, 0x2a($a3) -/* 0C2DF4 800C21F4 240800FF */ li $t0, 255 -/* 0C2DF8 800C21F8 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C2DFC 800C21FC 00A03025 */ move $a2, $a1 -/* 0C2E00 800C2200 11020018 */ beq $t0, $v0, .L800C2264 -/* 0C2E04 800C2204 00001825 */ move $v1, $zero -/* 0C2E08 800C2208 3C01800F */ lui $at, %hi(D_800F35E4) # $at, 0x800f -/* 0C2E0C 800C220C C42035E4 */ lwc1 $f0, %lo(D_800F35E4)($at) -/* 0C2E10 800C2210 2409003C */ li $t1, 60 -.L800C2214: -/* 0C2E14 800C2214 00490019 */ multu $v0, $t1 -/* 0C2E18 800C2218 00007012 */ mflo $t6 -/* 0C2E1C 800C221C 00EE2821 */ addu $a1, $a3, $t6 -/* 0C2E20 800C2220 8CAF0000 */ lw $t7, ($a1) -/* 0C2E24 800C2224 548F000D */ bnel $a0, $t7, .L800C225C -/* 0C2E28 800C2228 90A2002A */ lbu $v0, 0x2a($a1) -/* 0C2E2C 800C222C 8CB80038 */ lw $t8, 0x38($a1) -/* 0C2E30 800C2230 54D8000A */ bnel $a2, $t8, .L800C225C -/* 0C2E34 800C2234 90A2002A */ lbu $v0, 0x2a($a1) -/* 0C2E38 800C2238 C4A4001C */ lwc1 $f4, 0x1c($a1) -/* 0C2E3C 800C223C 240200FF */ li $v0, 255 -/* 0C2E40 800C2240 46040032 */ c.eq.s $f0, $f4 -/* 0C2E44 800C2244 00000000 */ nop -/* 0C2E48 800C2248 45030004 */ bc1tl .L800C225C -/* 0C2E4C 800C224C 90A2002A */ lbu $v0, 0x2a($a1) -/* 0C2E50 800C2250 10000002 */ b .L800C225C -/* 0C2E54 800C2254 24A30018 */ addiu $v1, $a1, 0x18 -/* 0C2E58 800C2258 90A2002A */ lbu $v0, 0x2a($a1) -.L800C225C: -/* 0C2E5C 800C225C 1502FFED */ bne $t0, $v0, .L800C2214 -/* 0C2E60 800C2260 00000000 */ nop -.L800C2264: -/* 0C2E64 800C2264 01A0E825 */ move $sp, $t5 -/* 0C2E68 800C2268 25BD0010 */ addiu $sp, $t5, 0x10 -/* 0C2E6C 800C226C 03E00008 */ jr $ra -/* 0C2E70 800C2270 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/audio/external/func_800C2474.s b/asm/non_matchings/audio/external/func_800C2474.s index 8ffe25f93..852744ef1 100644 --- a/asm/non_matchings/audio/external/func_800C2474.s +++ b/asm/non_matchings/audio/external/func_800C2474.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800F35E8 +.float 0.85 + +.section .text + glabel func_800C2474 /* 0C3074 800C2474 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e /* 0C3078 800C2478 8DCEDB40 */ lw $t6, %lo(camera1)($t6) diff --git a/asm/non_matchings/audio/external/func_800C2A2C.s b/asm/non_matchings/audio/external/func_800C2A2C.s index 51bcdd389..9ba8d8ff2 100644 --- a/asm/non_matchings/audio/external/func_800C2A2C.s +++ b/asm/non_matchings/audio/external/func_800C2A2C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel jpt_800F35EC +.word L800C2A80, L800C2AB8, L800C2AD8, L800C2CDC +.word L800C2E40, L800C2F04, L800C3008, L800C3118 +.word L800C3154, L800C31E4, L800C3218, L800C32B8 +.word L800C32EC, L800C3430, L800C3390, L800C33E0 + +.section .text + glabel func_800C2A2C /* 0C362C 800C2A2C 3C010F00 */ lui $at, 0xf00 /* 0C3630 800C2A30 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/non_matchings/audio/external/func_800C3724.s b/asm/non_matchings/audio/external/func_800C3724.s index 80c545910..5c68a2a09 100644 --- a/asm/non_matchings/audio/external/func_800C3724.s +++ b/asm/non_matchings/audio/external/func_800C3724.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800F362C +.word L800C3DEC, L800C3E10, L800C3E30, L800C3E70 +.word L800C3E98, L800C3EBC, L800C3F04 + +.section .text + glabel func_800C3724 /* 0C4324 800C3724 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 0C4328 800C3728 AFB60048 */ sw $s6, 0x48($sp) diff --git a/asm/non_matchings/audio/external/func_800C41CC.s b/asm/non_matchings/audio/external/func_800C41CC.s index 10b3a9f99..2e2e41e0c 100644 --- a/asm/non_matchings/audio/external/func_800C41CC.s +++ b/asm/non_matchings/audio/external/func_800C41CC.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel D_800F3648 +.float 100000.0 + +glabel jpt_800F364C +.word L800C423C, L800C4268, L800C42A4, L800C42C8 +.word L800C42FC, L800C4330 + +.section .text + glabel func_800C41CC /* 0C4DCC 800C41CC 27ADFFF0 */ addiu $t5, $sp, -0x10 /* 0C4DD0 800C41D0 ADA40010 */ sw $a0, 0x10($t5) diff --git a/asm/non_matchings/audio/external/func_800C4398.s b/asm/non_matchings/audio/external/func_800C4398.s index 15f1b0b89..0e9b5c9cb 100644 --- a/asm/non_matchings/audio/external/func_800C4398.s +++ b/asm/non_matchings/audio/external/func_800C4398.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800F3664 +.float 100000.0 + +.section .text + glabel func_800C4398 /* 0C4F98 800C4398 3C0E800F */ lui $t6, %hi(sNumProcessedSoundRequests) # $t6, 0x800f /* 0C4F9C 800C439C 91CEA1BC */ lbu $t6, %lo(sNumProcessedSoundRequests)($t6) diff --git a/asm/non_matchings/audio/external/func_800C473C.s b/asm/non_matchings/audio/external/func_800C473C.s index e13c6cfe3..2281f9b30 100644 --- a/asm/non_matchings/audio/external/func_800C473C.s +++ b/asm/non_matchings/audio/external/func_800C473C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800F3668 +.float 100000.0 + +.section .text + glabel func_800C473C /* 0C533C 800C473C 30AE00FF */ andi $t6, $a1, 0xff /* 0C5340 800C4740 24080030 */ li $t0, 48 diff --git a/asm/non_matchings/audio/external/func_800C4888.s b/asm/non_matchings/audio/external/func_800C4888.s index 5247e4913..cd17ed2d1 100644 --- a/asm/non_matchings/audio/external/func_800C4888.s +++ b/asm/non_matchings/audio/external/func_800C4888.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800F366C +.float 4000000.0 + +glabel D_800F3670 +.float 10000000000.0 + +.section .text + glabel func_800C4888 /* 0C5488 800C4888 27BDFF30 */ addiu $sp, $sp, -0xd0 /* 0C548C 800C488C AFBE0048 */ sw $fp, 0x48($sp) diff --git a/asm/non_matchings/audio/external/func_800C5E38.s b/asm/non_matchings/audio/external/func_800C5E38.s index 127a17efc..dbdc8348a 100644 --- a/asm/non_matchings/audio/external/func_800C5E38.s +++ b/asm/non_matchings/audio/external/func_800C5E38.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800F3674 +.float 0.6 + +.section .text + glabel func_800C5E38 /* 0C6A38 800C5E38 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f /* 0C6A3C 800C5E3C 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) diff --git a/asm/non_matchings/audio/external/func_800C6108.s b/asm/non_matchings/audio/external/func_800C6108.s index 689c8b23a..43a6592b9 100644 --- a/asm/non_matchings/audio/external/func_800C6108.s +++ b/asm/non_matchings/audio/external/func_800C6108.s @@ -1,3 +1,28 @@ +.section .late_rodata + +glabel D_800F3678 +.float 0.4 + +glabel D_800F367C +.float 0.005000 + +glabel D_800F3680 +.float 0.01 + +glabel D_800F3684 +.float 12000.0 + +glabel D_800F3688 +.float 0.03 + +glabel D_800F368C +.float 0.03 + +glabel D_800F3690 +.float 0.4 + +.section .text + glabel func_800C6108 /* 0C6D08 800C6108 308600FF */ andi $a2, $a0, 0xff /* 0C6D0C 800C610C 000678C0 */ sll $t7, $a2, 3 diff --git a/asm/non_matchings/audio/external/func_800C64A0.s b/asm/non_matchings/audio/external/func_800C64A0.s index e75dcd1c8..24cb90dbc 100644 --- a/asm/non_matchings/audio/external/func_800C64A0.s +++ b/asm/non_matchings/audio/external/func_800C64A0.s @@ -1,3 +1,41 @@ +.section .late_rodata + +glabel jpt_800F3694 +.word L800C6544, L800C6618, L800C64E4, L800C65B8 +.word L800C65B8, L800C65B8, L800C65B8, L800C65B8 +.word L800C65B8, L800C65B8, L800C65B8, L800C65B8 +.word L800C6544, L800C6544, L800C6618, L800C6618 +.word L800C6544, L800C6618, L800C6618, L800C6618 +.word L800C6618, L800C65B8, L800C65B8, L800C65B8 +.word L800C6618, L800C6618, L800C6618, L800C6618 +.word L800C65B8, L800C65B8, L800C65B8 + +glabel D_800F3710 +.float 0.2 + +glabel D_800F3714 +.float 3500.0 + +glabel D_800F3718 +.float 3000.0 + +glabel D_800F371C +.float 0.4 + +glabel D_800F3720 +.float 0.2 + +glabel D_800F3724 +.float 0.06 + +glabel D_800F3728 +.float 0.56 + +glabel D_800F372C +.float 0.9 + +.section .text + glabel func_800C64A0 /* 0C70A0 800C64A0 308E00FF */ andi $t6, $a0, 0xff /* 0C70A4 800C64A4 27ADFFF0 */ addiu $t5, $sp, -0x10 diff --git a/asm/non_matchings/audio/external/func_800C6758.s b/asm/non_matchings/audio/external/func_800C6758.s deleted file mode 100644 index 6b4e7c3f4..000000000 --- a/asm/non_matchings/audio/external/func_800C6758.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_800C6758 -/* 0C7358 800C6758 308E00FF */ andi $t6, $a0, 0xff -/* 0C735C 800C675C 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C7360 800C6760 000E1880 */ sll $v1, $t6, 2 -/* 0C7364 800C6764 3C02800F */ lui $v0, %hi(D_800E9E74) -/* 0C7368 800C6768 ADA40010 */ sw $a0, 0x10($t5) -/* 0C736C 800C676C 00431021 */ addu $v0, $v0, $v1 -/* 0C7370 800C6770 8C429E74 */ lw $v0, %lo(D_800E9E74)($v0) -/* 0C7374 800C6774 24010002 */ li $at, 2 -/* 0C7378 800C6778 01C02025 */ move $a0, $t6 -/* 0C737C 800C677C 10410021 */ beq $v0, $at, .L800C6804 -/* 0C7380 800C6780 01A0E825 */ move $sp, $t5 -/* 0C7384 800C6784 24010003 */ li $at, 3 -/* 0C7388 800C6788 1041000B */ beq $v0, $at, .L800C67B8 -/* 0C738C 800C678C 000478C0 */ sll $t7, $a0, 3 -/* 0C7390 800C6790 2401000D */ li $at, 13 -/* 0C7394 800C6794 1041001B */ beq $v0, $at, .L800C6804 -/* 0C7398 800C6798 24010011 */ li $at, 17 -/* 0C739C 800C679C 10410019 */ beq $v0, $at, .L800C6804 -/* 0C73A0 800C67A0 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C73A4 800C67A4 44812000 */ mtc1 $at, $f4 -/* 0C73A8 800C67A8 3C01800F */ lui $at, %hi(D_800E9F14) -/* 0C73AC 800C67AC 00230821 */ addu $at, $at, $v1 -/* 0C73B0 800C67B0 10000020 */ b .L800C6834 -/* 0C73B4 800C67B4 E4249F14 */ swc1 $f4, %lo(D_800E9F14)($at) -.L800C67B8: -/* 0C73B8 800C67B8 01E47823 */ subu $t7, $t7, $a0 -/* 0C73BC 800C67BC 000F7900 */ sll $t7, $t7, 4 -/* 0C73C0 800C67C0 01E47823 */ subu $t7, $t7, $a0 -/* 0C73C4 800C67C4 000F7880 */ sll $t7, $t7, 2 -/* 0C73C8 800C67C8 01E47823 */ subu $t7, $t7, $a0 -/* 0C73CC 800C67CC 000F78C0 */ sll $t7, $t7, 3 -/* 0C73D0 800C67D0 3C01800F */ lui $at, %hi(gPlayers+0x94) -/* 0C73D4 800C67D4 002F0821 */ addu $at, $at, $t7 -/* 0C73D8 800C67D8 C4266A24 */ lwc1 $f6, %lo(gPlayers+0x94)($at) -/* 0C73DC 800C67DC 3C014110 */ li $at, 0x41100000 # 9.000000 -/* 0C73E0 800C67E0 44814000 */ mtc1 $at, $f8 -/* 0C73E4 800C67E4 3C01800F */ lui $at, %hi(D_800F3730) # $at, 0x800f -/* 0C73E8 800C67E8 C4303730 */ lwc1 $f16, %lo(D_800F3730)($at) -/* 0C73EC 800C67EC 46083283 */ div.s $f10, $f6, $f8 -/* 0C73F0 800C67F0 3C01800F */ lui $at, %hi(D_800E9F14) -/* 0C73F4 800C67F4 00230821 */ addu $at, $at, $v1 -/* 0C73F8 800C67F8 46105480 */ add.s $f18, $f10, $f16 -/* 0C73FC 800C67FC 1000000D */ b .L800C6834 -/* 0C7400 800C6800 E4329F14 */ swc1 $f18, %lo(D_800E9F14)($at) -.L800C6804: -/* 0C7404 800C6804 3C01800F */ lui $at, %hi(D_800E9E54) -/* 0C7408 800C6808 00230821 */ addu $at, $at, $v1 -/* 0C740C 800C680C C4249E54 */ lwc1 $f4, %lo(D_800E9E54)($at) -/* 0C7410 800C6810 3C01800F */ lui $at, %hi(D_800F3734) # $at, 0x800f -/* 0C7414 800C6814 C4263734 */ lwc1 $f6, %lo(D_800F3734)($at) -/* 0C7418 800C6818 3C01800F */ lui $at, %hi(D_800F3738) # $at, 0x800f -/* 0C741C 800C681C C42A3738 */ lwc1 $f10, %lo(D_800F3738)($at) -/* 0C7420 800C6820 46062203 */ div.s $f8, $f4, $f6 -/* 0C7424 800C6824 3C01800F */ lui $at, %hi(D_800E9F14) -/* 0C7428 800C6828 00230821 */ addu $at, $at, $v1 -/* 0C742C 800C682C 460A4400 */ add.s $f16, $f8, $f10 -/* 0C7430 800C6830 E4309F14 */ swc1 $f16, %lo(D_800E9F14)($at) -.L800C6834: -/* 0C7434 800C6834 03E00008 */ jr $ra -/* 0C7438 800C6838 25BD0010 */ addiu $sp, $t5, 0x10 diff --git a/asm/non_matchings/audio/external/func_800C683C.s b/asm/non_matchings/audio/external/func_800C683C.s index a5f5cc375..804fc224d 100644 --- a/asm/non_matchings/audio/external/func_800C683C.s +++ b/asm/non_matchings/audio/external/func_800C683C.s @@ -1,3 +1,17 @@ +.section .late_rodata + +glabel jpt_800F373C +.word L800C69C8, L800C6A0C, L800C6910, L800C6C74 +.word L800C6CB8, L800C6CFC, L800C6D40, L800C6D84 +.word L800C6DC8, L800C6E0C, L800C6E50, L800C6E94 +.word L800C6FA4, L800C6E0C, L800C6A98, L800C6ADC +.word L800C6A50, L800C6958, L800C6990, L800C6B20 +.word L800C7070, L800C6FA4, L800C6FE8, L800C702C +.word L800C6B64, L800C6BA8, L800C6BEC, L800C6C30 +.word L800C6ED8, L800C6F1C, L800C6F60 + +.section .text + glabel func_800C683C /* 0C743C 800C683C 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 0C7440 800C6840 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f diff --git a/asm/non_matchings/audio/external/func_800C70A8.s b/asm/non_matchings/audio/external/func_800C70A8.s index ce8eb0cd2..efa4233e0 100644 --- a/asm/non_matchings/audio/external/func_800C70A8.s +++ b/asm/non_matchings/audio/external/func_800C70A8.s @@ -1,3 +1,32 @@ +.section .late_rodata + +glabel D_800F37B8 +.float 3500.0 + +glabel jpt_800F37BC +.word L800C718C, L800C7198, L800C71B0, L800C71BC +.word L800C71A4, L800C71F4, L800C71F4, L800C71C8 +.word L800C71F4, L800C71F4, L800C71F4, L800C71F4 +.word L800C71EC, L800C71F4, L800C71D4, L800C71E0 + +glabel jpt_800F37FC +.word L800C7238, L800C7244, L800C725C, L800C7268 +.word L800C7250, L800C7294, L800C7294, L800C7274 +.word L800C7294, L800C7294, L800C7294, L800C7294 +.word L800C7290, L800C7294, L800C7280, L800C7288 + +glabel jpt_800F383C +.word L800C72F8, L800C72B8, L800C742C, L800C73B8 +.word L800C7378, L800C742C, L800C7338, L800C7428 +.word L800C742C, L800C7418, L800C7420 + +glabel jpt_800F3868 +.word L800C7494, L800C7454, L800C75C8, L800C7554 +.word L800C7514, L800C75C8, L800C74D4, L800C75C4 +.word L800C75C8, L800C75B4, L800C75BC + +.section .text + glabel func_800C70A8 /* 0C7CA8 800C70A8 27ADFFF0 */ addiu $t5, $sp, -0x10 /* 0C7CAC 800C70AC 308500FF */ andi $a1, $a0, 0xff diff --git a/asm/non_matchings/audio/external/func_800C8770.s b/asm/non_matchings/audio/external/func_800C8770.s deleted file mode 100644 index d6f62a491..000000000 --- a/asm/non_matchings/audio/external/func_800C8770.s +++ /dev/null @@ -1,118 +0,0 @@ -glabel func_800C8770 -/* 0C9370 800C8770 308E00FF */ andi $t6, $a0, 0xff -/* 0C9374 800C8774 000E78C0 */ sll $t7, $t6, 3 -/* 0C9378 800C8778 01EE7823 */ subu $t7, $t7, $t6 -/* 0C937C 800C877C 000F7900 */ sll $t7, $t7, 4 -/* 0C9380 800C8780 01EE7823 */ subu $t7, $t7, $t6 -/* 0C9384 800C8784 000F7880 */ sll $t7, $t7, 2 -/* 0C9388 800C8788 01EE7823 */ subu $t7, $t7, $t6 -/* 0C938C 800C878C 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C9390 800C8790 000F78C0 */ sll $t7, $t7, 3 -/* 0C9394 800C8794 3C18800F */ lui $t8, %hi(gPlayers+0xBC) -/* 0C9398 800C8798 ADA40010 */ sw $a0, 0x10($t5) -/* 0C939C 800C879C 030FC021 */ addu $t8, $t8, $t7 -/* 0C93A0 800C87A0 8F186A4C */ lw $t8, %lo(gPlayers+0xBC)($t8) -/* 0C93A4 800C87A4 3C024000 */ lui $v0, 0x4000 -/* 0C93A8 800C87A8 01C02025 */ move $a0, $t6 -/* 0C93AC 800C87AC 0302C824 */ and $t9, $t8, $v0 -/* 0C93B0 800C87B0 14590010 */ bne $v0, $t9, .L800C87F4 -/* 0C93B4 800C87B4 3C01800F */ lui $at, %hi(D_800E9F2C) -/* 0C93B8 800C87B8 3C0A800F */ lui $t2, %hi(D_800E9F2C) # $t2, 0x800f -/* 0C93BC 800C87BC 254A9F2C */ addiu $t2, %lo(D_800E9F2C) # addiu $t2, $t2, -0x60d4 -/* 0C93C0 800C87C0 01CA1821 */ addu $v1, $t6, $t2 -/* 0C93C4 800C87C4 90650000 */ lbu $a1, ($v1) -/* 0C93C8 800C87C8 3C08800F */ lui $t0, %hi(D_800E9F24) # $t0, 0x800f -/* 0C93CC 800C87CC 25089F24 */ addiu $t0, %lo(D_800E9F24) # addiu $t0, $t0, -0x60dc -/* 0C93D0 800C87D0 01C81021 */ addu $v0, $t6, $t0 -/* 0C93D4 800C87D4 24090001 */ li $t1, 1 -/* 0C93D8 800C87D8 28A100FA */ slti $at, $a1, 0xfa -/* 0C93DC 800C87DC 10200003 */ beqz $at, .L800C87EC -/* 0C93E0 800C87E0 A0490000 */ sb $t1, ($v0) -/* 0C93E4 800C87E4 24AB0001 */ addiu $t3, $a1, 1 -/* 0C93E8 800C87E8 A06B0000 */ sb $t3, ($v1) -.L800C87EC: -/* 0C93EC 800C87EC 1000000D */ b .L800C8824 -/* 0C93F0 800C87F0 90430000 */ lbu $v1, ($v0) -.L800C87F4: -/* 0C93F4 800C87F4 3C0C800F */ lui $t4, %hi(D_800E9F24) # $t4, 0x800f -/* 0C93F8 800C87F8 00240821 */ addu $at, $at, $a0 -/* 0C93FC 800C87FC 258C9F24 */ addiu $t4, %lo(D_800E9F24) # addiu $t4, $t4, -0x60dc -/* 0C9400 800C8800 A0209F2C */ sb $zero, %lo(D_800E9F2C)($at) -/* 0C9404 800C8804 008C1021 */ addu $v0, $a0, $t4 -/* 0C9408 800C8808 90430000 */ lbu $v1, ($v0) -/* 0C940C 800C880C 24010001 */ li $at, 1 -/* 0C9410 800C8810 240E0002 */ li $t6, 2 -/* 0C9414 800C8814 54610004 */ bnel $v1, $at, .L800C8828 -/* 0C9418 800C8818 24010001 */ li $at, 1 -/* 0C941C 800C881C A04E0000 */ sb $t6, ($v0) -/* 0C9420 800C8820 31C300FF */ andi $v1, $t6, 0xff -.L800C8824: -/* 0C9424 800C8824 24010001 */ li $at, 1 -.L800C8828: -/* 0C9428 800C8828 10610006 */ beq $v1, $at, .L800C8844 -/* 0C942C 800C882C 3C0F800F */ lui $t7, %hi(D_800E9F34) # $t7, 0x800f -/* 0C9430 800C8830 24010002 */ li $at, 2 -/* 0C9434 800C8834 1061001A */ beq $v1, $at, .L800C88A0 -/* 0C9438 800C8838 3C19800F */ lui $t9, %hi(D_800E9F34) # $t9, 0x800f -/* 0C943C 800C883C 10000036 */ b .L800C8918 -/* 0C9440 800C8840 01A0E825 */ move $sp, $t5 -.L800C8844: -/* 0C9444 800C8844 00041880 */ sll $v1, $a0, 2 -/* 0C9448 800C8848 25EF9F34 */ addiu $t7, %lo(D_800E9F34) # addiu $t7, $t7, -0x60cc -/* 0C944C 800C884C 006F2821 */ addu $a1, $v1, $t7 -/* 0C9450 800C8850 3C01800F */ lui $at, %hi(D_800F3894) # $at, 0x800f -/* 0C9454 800C8854 C4243894 */ lwc1 $f4, %lo(D_800F3894)($at) -/* 0C9458 800C8858 C4A00000 */ lwc1 $f0, ($a1) -/* 0C945C 800C885C 3C01800F */ lui $at, %hi(D_800F3898) # $at, 0x800f -/* 0C9460 800C8860 4604003C */ c.lt.s $f0, $f4 -/* 0C9464 800C8864 00000000 */ nop -/* 0C9468 800C8868 4502002B */ bc1fl .L800C8918 -/* 0C946C 800C886C 01A0E825 */ move $sp, $t5 -/* 0C9470 800C8870 C4263898 */ lwc1 $f6, %lo(D_800F3898)($at) -/* 0C9474 800C8874 3C18800F */ lui $t8, %hi(D_800E9F54) # $t8, 0x800f -/* 0C9478 800C8878 27189F54 */ addiu $t8, %lo(D_800E9F54) # addiu $t8, $t8, -0x60ac -/* 0C947C 800C887C 46060200 */ add.s $f8, $f0, $f6 -/* 0C9480 800C8880 00781021 */ addu $v0, $v1, $t8 -/* 0C9484 800C8884 3C01800F */ lui $at, %hi(D_800F389C) # $at, 0x800f -/* 0C9488 800C8888 C44A0000 */ lwc1 $f10, ($v0) -/* 0C948C 800C888C E4A80000 */ swc1 $f8, ($a1) -/* 0C9490 800C8890 C430389C */ lwc1 $f16, %lo(D_800F389C)($at) -/* 0C9494 800C8894 46105480 */ add.s $f18, $f10, $f16 -/* 0C9498 800C8898 1000001E */ b .L800C8914 -/* 0C949C 800C889C E4520000 */ swc1 $f18, ($v0) -.L800C88A0: -/* 0C94A0 800C88A0 00041880 */ sll $v1, $a0, 2 -/* 0C94A4 800C88A4 27399F34 */ addiu $t9, %lo(D_800E9F34) # addiu $t9, $t9, -0x60cc -/* 0C94A8 800C88A8 00792821 */ addu $a1, $v1, $t9 -/* 0C94AC 800C88AC 3C01800F */ lui $at, %hi(D_800F38A0) # $at, 0x800f -/* 0C94B0 800C88B0 C42438A0 */ lwc1 $f4, %lo(D_800F38A0)($at) -/* 0C94B4 800C88B4 C4A00000 */ lwc1 $f0, ($a1) -/* 0C94B8 800C88B8 3C01800F */ lui $at, %hi(D_800F38A4) # $at, 0x800f -/* 0C94BC 800C88BC 4600203C */ c.lt.s $f4, $f0 -/* 0C94C0 800C88C0 00000000 */ nop -/* 0C94C4 800C88C4 4502000E */ bc1fl .L800C8900 -/* 0C94C8 800C88C8 44800000 */ mtc1 $zero, $f0 -/* 0C94CC 800C88CC C42638A4 */ lwc1 $f6, %lo(D_800F38A4)($at) -/* 0C94D0 800C88D0 3C08800F */ lui $t0, %hi(D_800E9F54) # $t0, 0x800f -/* 0C94D4 800C88D4 25089F54 */ addiu $t0, %lo(D_800E9F54) # addiu $t0, $t0, -0x60ac -/* 0C94D8 800C88D8 46060201 */ sub.s $f8, $f0, $f6 -/* 0C94DC 800C88DC 00681021 */ addu $v0, $v1, $t0 -/* 0C94E0 800C88E0 3C01800F */ lui $at, %hi(D_800F38A8) # $at, 0x800f -/* 0C94E4 800C88E4 C44A0000 */ lwc1 $f10, ($v0) -/* 0C94E8 800C88E8 E4A80000 */ swc1 $f8, ($a1) -/* 0C94EC 800C88EC C43038A8 */ lwc1 $f16, %lo(D_800F38A8)($at) -/* 0C94F0 800C88F0 46105481 */ sub.s $f18, $f10, $f16 -/* 0C94F4 800C88F4 10000007 */ b .L800C8914 -/* 0C94F8 800C88F8 E4520000 */ swc1 $f18, ($v0) -/* 0C94FC 800C88FC 44800000 */ mtc1 $zero, $f0 -.L800C8900: -/* 0C9500 800C8900 3C01800F */ lui $at, %hi(D_800E9F54) -/* 0C9504 800C8904 00230821 */ addu $at, $at, $v1 -/* 0C9508 800C8908 E4A00000 */ swc1 $f0, ($a1) -/* 0C950C 800C890C E4209F54 */ swc1 $f0, %lo(D_800E9F54)($at) -/* 0C9510 800C8910 A0400000 */ sb $zero, ($v0) -.L800C8914: -/* 0C9514 800C8914 01A0E825 */ move $sp, $t5 -.L800C8918: -/* 0C9518 800C8918 03E00008 */ jr $ra -/* 0C951C 800C891C 25BD0010 */ addiu $sp, $t5, 0x10 diff --git a/asm/non_matchings/audio/external/func_800C89E4.s b/asm/non_matchings/audio/external/func_800C89E4.s deleted file mode 100644 index b896aa994..000000000 --- a/asm/non_matchings/audio/external/func_800C89E4.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_800C89E4 -/* 0C95E4 800C89E4 3C04800F */ lui $a0, %hi(D_800EA180) # $a0, 0x800f -/* 0C95E8 800C89E8 2484A180 */ addiu $a0, %lo(D_800EA180) # addiu $a0, $a0, -0x5e80 -/* 0C95EC 800C89EC 94820000 */ lhu $v0, ($a0) -/* 0C95F0 800C89F0 27ADFFF0 */ addiu $t5, $sp, -0x10 -/* 0C95F4 800C89F4 01A0E825 */ move $sp, $t5 -/* 0C95F8 800C89F8 10400038 */ beqz $v0, .L800C8ADC -/* 0C95FC 800C89FC 244E0001 */ addiu $t6, $v0, 1 -/* 0C9600 800C8A00 31C2FFFF */ andi $v0, $t6, 0xffff -/* 0C9604 800C8A04 24010002 */ li $at, 2 -/* 0C9608 800C8A08 A48E0000 */ sh $t6, ($a0) -/* 0C960C 800C8A0C 14410006 */ bne $v0, $at, .L800C8A28 -/* 0C9610 800C8A10 00401825 */ move $v1, $v0 -/* 0C9614 800C8A14 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C9618 800C8A18 44810000 */ mtc1 $at, $f0 -/* 0C961C 800C8A1C 3C05800F */ lui $a1, %hi(D_800EA17C) # $a1, 0x800f -/* 0C9620 800C8A20 24A5A17C */ addiu $a1, %lo(D_800EA17C) # addiu $a1, $a1, -0x5e84 -/* 0C9624 800C8A24 E4A00000 */ swc1 $f0, ($a1) -.L800C8A28: -/* 0C9628 800C8A28 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0C962C 800C8A2C 44810000 */ mtc1 $at, $f0 -/* 0C9630 800C8A30 3C05800F */ lui $a1, %hi(D_800EA17C) # $a1, 0x800f -/* 0C9634 800C8A34 2861000F */ slti $at, $v1, 0xf -/* 0C9638 800C8A38 1020000E */ beqz $at, .L800C8A74 -/* 0C963C 800C8A3C 24A5A17C */ addiu $a1, %lo(D_800EA17C) # addiu $a1, $a1, -0x5e84 -/* 0C9640 800C8A40 44822000 */ mtc1 $v0, $f4 -/* 0C9644 800C8A44 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0C9648 800C8A48 04410004 */ bgez $v0, .L800C8A5C -/* 0C964C 800C8A4C 468021A0 */ cvt.s.w $f6, $f4 -/* 0C9650 800C8A50 44814000 */ mtc1 $at, $f8 -/* 0C9654 800C8A54 00000000 */ nop -/* 0C9658 800C8A58 46083180 */ add.s $f6, $f6, $f8 -.L800C8A5C: -/* 0C965C 800C8A5C 3C01800F */ lui $at, %hi(D_800F38AC) # $at, 0x800f -/* 0C9660 800C8A60 C42A38AC */ lwc1 $f10, %lo(D_800F38AC)($at) -/* 0C9664 800C8A64 3C01800F */ lui $at, %hi(D_800EA178) # $at, 0x800f -/* 0C9668 800C8A68 460A3402 */ mul.s $f16, $f6, $f10 -/* 0C966C 800C8A6C 46100481 */ sub.s $f18, $f0, $f16 -/* 0C9670 800C8A70 E432A178 */ swc1 $f18, %lo(D_800EA178)($at) -.L800C8A74: -/* 0C9674 800C8A74 28610033 */ slti $at, $v1, 0x33 -/* 0C9678 800C8A78 1420000A */ bnez $at, .L800C8AA4 -/* 0C967C 800C8A7C 28610096 */ slti $at, $v1, 0x96 -/* 0C9680 800C8A80 10200008 */ beqz $at, .L800C8AA4 -/* 0C9684 800C8A84 246FFFCE */ addiu $t7, $v1, -0x32 -/* 0C9688 800C8A88 448F2000 */ mtc1 $t7, $f4 -/* 0C968C 800C8A8C 3C0142DC */ li $at, 0x42DC0000 # 110.000000 -/* 0C9690 800C8A90 44813000 */ mtc1 $at, $f6 -/* 0C9694 800C8A94 46802220 */ cvt.s.w $f8, $f4 -/* 0C9698 800C8A98 46064283 */ div.s $f10, $f8, $f6 -/* 0C969C 800C8A9C 460A0401 */ sub.s $f16, $f0, $f10 -/* 0C96A0 800C8AA0 E4B00000 */ swc1 $f16, ($a1) -.L800C8AA4: -/* 0C96A4 800C8AA4 2401012D */ li $at, 301 -/* 0C96A8 800C8AA8 54610005 */ bnel $v1, $at, .L800C8AC0 -/* 0C96AC 800C8AAC 24010321 */ li $at, 801 -/* 0C96B0 800C8AB0 44809000 */ mtc1 $zero, $f18 -/* 0C96B4 800C8AB4 00000000 */ nop -/* 0C96B8 800C8AB8 E4B20000 */ swc1 $f18, ($a1) -/* 0C96BC 800C8ABC 24010321 */ li $at, 801 -.L800C8AC0: -/* 0C96C0 800C8AC0 14610006 */ bne $v1, $at, .L800C8ADC -/* 0C96C4 800C8AC4 3C01800F */ lui $at, %hi(D_800EA178) # $at, 0x800f -/* 0C96C8 800C8AC8 E420A178 */ swc1 $f0, %lo(D_800EA178)($at) -/* 0C96CC 800C8ACC 3C01800F */ lui $at, %hi(D_800F38B0) # $at, 0x800f -/* 0C96D0 800C8AD0 C42438B0 */ lwc1 $f4, %lo(D_800F38B0)($at) -/* 0C96D4 800C8AD4 A4800000 */ sh $zero, ($a0) -/* 0C96D8 800C8AD8 E4A40000 */ swc1 $f4, ($a1) -.L800C8ADC: -/* 0C96DC 800C8ADC 03E00008 */ jr $ra -/* 0C96E0 800C8AE0 25BD0010 */ addiu $sp, $t5, 0x10 diff --git a/asm/non_matchings/audio/external/func_800C8AE4.s b/asm/non_matchings/audio/external/func_800C8AE4.s index acd1b4cbf..643f68f8f 100644 --- a/asm/non_matchings/audio/external/func_800C8AE4.s +++ b/asm/non_matchings/audio/external/func_800C8AE4.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800F38B4 +.float 0.85 + +.section .text + glabel func_800C8AE4 /* 0C96E4 800C8AE4 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e /* 0C96E8 800C8AE8 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) diff --git a/asm/non_matchings/audio/external/func_800C94A4.s b/asm/non_matchings/audio/external/func_800C94A4.s index 0ced5d014..db2761d3d 100644 --- a/asm/non_matchings/audio/external/func_800C94A4.s +++ b/asm/non_matchings/audio/external/func_800C94A4.s @@ -1,3 +1,113 @@ +.section .late_rodata + +glabel jpt_800F38B8 +.word L800C9560, L800C9560, L800C95BC, L800C9618 +.word L800C9674, L800C96D0, L800C95BC, L800C96D0 + +glabel D_800F38D8 +.float 0.35 + +glabel D_800F38DC +.float 2.800000 + +glabel D_800F38E0 +.float 3844.0 + +glabel D_800F38E4 +.float -0.8 + +glabel D_800F38E8 +.float 1568.979614 + +glabel D_800F38EC +.float 1067.777832 + +glabel D_800F38F0 +.float 2766.064941 + +glabel D_800F38F4 +.float 0.6 + +glabel D_800F38F8 +.float 3.200000 + +glabel D_800F38FC +.float 3844.0 + +glabel D_800F3900 +.float -1.700000 + +glabel D_800F3904 +.float 1478.461548 + +glabel D_800F3908 +.float 784.489807 + +glabel D_800F390C +.float 12813.334961 + +glabel D_800F3910 +.float 0.6 + +glabel D_800F3914 +.float 2.800000 + +glabel D_800F3918 +.float 3844.0 + +glabel D_800F391C +.float -0.6 + +glabel D_800F3920 +.float 1747.272827 + +glabel D_800F3924 +.float 1130.588257 + +glabel D_800F3928 +.float 3844.000977 + +glabel D_800F392C +.float 0.2 + +glabel D_800F3930 +.float 3844.0 + +glabel D_800F3934 +.float -0.4 + +glabel D_800F3938 +.float 2135.555664 + +glabel D_800F393C +.float 1601.666626 + +glabel D_800F3940 +.float 3203.333008 + +glabel D_800F3944 +.float 0.4 + +glabel D_800F3948 +.float 2.400000 + +glabel D_800F394C +.float 3844.0 + +glabel D_800F3950 +.float -0.8 + +glabel D_800F3954 +.float 1922.0 + +glabel D_800F3958 +.float 1201.250000 + +glabel D_800F395C +.float 4805.0 + +.section .text + glabel func_800C94A4 /* 0CA0A4 800C94A4 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f /* 0CA0A8 800C94A8 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) diff --git a/asm/non_matchings/audio/external/func_800C9A88.s b/asm/non_matchings/audio/external/func_800C9A88.s deleted file mode 100644 index 526227d68..000000000 --- a/asm/non_matchings/audio/external/func_800C9A88.s +++ /dev/null @@ -1,173 +0,0 @@ -glabel func_800C9A88 -/* 0CA688 800C9A88 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 0CA68C 800C9A8C 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0CA690 800C9A90 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0CA694 800C9A94 AFBE0058 */ sw $fp, 0x58($sp) -/* 0CA698 800C9A98 AFB30044 */ sw $s3, 0x44($sp) -/* 0CA69C 800C9A9C 309300FF */ andi $s3, $a0, 0xff -/* 0CA6A0 800C9AA0 03A0F025 */ move $fp, $sp -/* 0CA6A4 800C9AA4 AFBF005C */ sw $ra, 0x5c($sp) -/* 0CA6A8 800C9AA8 AFB70054 */ sw $s7, 0x54($sp) -/* 0CA6AC 800C9AAC AFB60050 */ sw $s6, 0x50($sp) -/* 0CA6B0 800C9AB0 AFB5004C */ sw $s5, 0x4c($sp) -/* 0CA6B4 800C9AB4 AFB40048 */ sw $s4, 0x48($sp) -/* 0CA6B8 800C9AB8 AFB20040 */ sw $s2, 0x40($sp) -/* 0CA6BC 800C9ABC AFB1003C */ sw $s1, 0x3c($sp) -/* 0CA6C0 800C9AC0 AFB00038 */ sw $s0, 0x38($sp) -/* 0CA6C4 800C9AC4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 0CA6C8 800C9AC8 15C00082 */ bnez $t6, .L800C9CD4 -/* 0CA6CC 800C9ACC AFA40078 */ sw $a0, 0x78($sp) -/* 0CA6D0 800C9AD0 3C03800F */ lui $v1, %hi(D_800EA0F0) # $v1, 0x800f -/* 0CA6D4 800C9AD4 2463A0F0 */ addiu $v1, %lo(D_800EA0F0) # addiu $v1, $v1, -0x5f10 -/* 0CA6D8 800C9AD8 90620000 */ lbu $v0, ($v1) -/* 0CA6DC 800C9ADC 0013C0C0 */ sll $t8, $s3, 3 -/* 0CA6E0 800C9AE0 24010002 */ li $at, 2 -/* 0CA6E4 800C9AE4 10400004 */ beqz $v0, .L800C9AF8 -/* 0CA6E8 800C9AE8 0313C023 */ subu $t8, $t8, $s3 -/* 0CA6EC 800C9AEC 14410079 */ bne $v0, $at, .L800C9CD4 -/* 0CA6F0 800C9AF0 240F0001 */ li $t7, 1 -/* 0CA6F4 800C9AF4 A06F0000 */ sb $t7, ($v1) -.L800C9AF8: -/* 0CA6F8 800C9AF8 0018C100 */ sll $t8, $t8, 4 -/* 0CA6FC 800C9AFC 0313C023 */ subu $t8, $t8, $s3 -/* 0CA700 800C9B00 0018C080 */ sll $t8, $t8, 2 -/* 0CA704 800C9B04 0313C023 */ subu $t8, $t8, $s3 -/* 0CA708 800C9B08 3C19800F */ lui $t9, %hi(gPlayers) # $t9, 0x800f -/* 0CA70C 800C9B0C 27396990 */ addiu $t9, %lo(gPlayers) # addiu $t9, $t9, 0x6990 -/* 0CA710 800C9B10 0018C0C0 */ sll $t8, $t8, 3 -/* 0CA714 800C9B14 03191821 */ addu $v1, $t8, $t9 -/* 0CA718 800C9B18 94680254 */ lhu $t0, 0x254($v1) -/* 0CA71C 800C9B1C 2D010008 */ sltiu $at, $t0, 8 -/* 0CA720 800C9B20 1020003C */ beqz $at, .L800C9C14 -/* 0CA724 800C9B24 00084080 */ sll $t0, $t0, 2 -/* 0CA728 800C9B28 3C01800F */ lui $at, %hi(jpt_800F3960) -/* 0CA72C 800C9B2C 00280821 */ addu $at, $at, $t0 -/* 0CA730 800C9B30 8C283960 */ lw $t0, %lo(jpt_800F3960)($at) -/* 0CA734 800C9B34 01000008 */ jr $t0 -/* 0CA738 800C9B38 00000000 */ nop -glabel L800C9B3C -/* 0CA73C 800C9B3C 3C01800F */ lui $at, %hi(D_800F3980) # $at, 0x800f -/* 0CA740 800C9B40 C4243980 */ lwc1 $f4, %lo(D_800F3980)($at) -/* 0CA744 800C9B44 3C0A800F */ lui $t2, %hi(D_800EA06C) # $t2, 0x800f -/* 0CA748 800C9B48 254AA06C */ addiu $t2, %lo(D_800EA06C) # addiu $t2, $t2, -0x5f94 -/* 0CA74C 800C9B4C 00134900 */ sll $t1, $s3, 4 -/* 0CA750 800C9B50 012A1021 */ addu $v0, $t1, $t2 -/* 0CA754 800C9B54 3C01800F */ lui $at, %hi(D_800F3984) # $at, 0x800f -/* 0CA758 800C9B58 E4440000 */ swc1 $f4, ($v0) -/* 0CA75C 800C9B5C C4263984 */ lwc1 $f6, %lo(D_800F3984)($at) -/* 0CA760 800C9B60 1000002C */ b .L800C9C14 -/* 0CA764 800C9B64 E4460004 */ swc1 $f6, 4($v0) -glabel L800C9B68 -/* 0CA768 800C9B68 3C01800F */ lui $at, %hi(D_800F3988) # $at, 0x800f -/* 0CA76C 800C9B6C C4283988 */ lwc1 $f8, %lo(D_800F3988)($at) -/* 0CA770 800C9B70 3C0C800F */ lui $t4, %hi(D_800EA06C) # $t4, 0x800f -/* 0CA774 800C9B74 258CA06C */ addiu $t4, %lo(D_800EA06C) # addiu $t4, $t4, -0x5f94 -/* 0CA778 800C9B78 00135900 */ sll $t3, $s3, 4 -/* 0CA77C 800C9B7C 016C1021 */ addu $v0, $t3, $t4 -/* 0CA780 800C9B80 3C01800F */ lui $at, %hi(D_800F398C) # $at, 0x800f -/* 0CA784 800C9B84 E4480000 */ swc1 $f8, ($v0) -/* 0CA788 800C9B88 C42A398C */ lwc1 $f10, %lo(D_800F398C)($at) -/* 0CA78C 800C9B8C 10000021 */ b .L800C9C14 -/* 0CA790 800C9B90 E44A0004 */ swc1 $f10, 4($v0) -glabel L800C9B94 -/* 0CA794 800C9B94 3C01800F */ lui $at, %hi(D_800F3990) # $at, 0x800f -/* 0CA798 800C9B98 C4303990 */ lwc1 $f16, %lo(D_800F3990)($at) -/* 0CA79C 800C9B9C 3C0E800F */ lui $t6, %hi(D_800EA06C) # $t6, 0x800f -/* 0CA7A0 800C9BA0 25CEA06C */ addiu $t6, %lo(D_800EA06C) # addiu $t6, $t6, -0x5f94 -/* 0CA7A4 800C9BA4 00136900 */ sll $t5, $s3, 4 -/* 0CA7A8 800C9BA8 01AE1021 */ addu $v0, $t5, $t6 -/* 0CA7AC 800C9BAC 3C01800F */ lui $at, %hi(D_800F3994) # $at, 0x800f -/* 0CA7B0 800C9BB0 E4500000 */ swc1 $f16, ($v0) -/* 0CA7B4 800C9BB4 C4323994 */ lwc1 $f18, %lo(D_800F3994)($at) -/* 0CA7B8 800C9BB8 10000016 */ b .L800C9C14 -/* 0CA7BC 800C9BBC E4520004 */ swc1 $f18, 4($v0) -glabel L800C9BC0 -/* 0CA7C0 800C9BC0 3C01800F */ lui $at, %hi(D_800F3998) # $at, 0x800f -/* 0CA7C4 800C9BC4 C4243998 */ lwc1 $f4, %lo(D_800F3998)($at) -/* 0CA7C8 800C9BC8 3C18800F */ lui $t8, %hi(D_800EA06C) # $t8, 0x800f -/* 0CA7CC 800C9BCC 2718A06C */ addiu $t8, %lo(D_800EA06C) # addiu $t8, $t8, -0x5f94 -/* 0CA7D0 800C9BD0 00137900 */ sll $t7, $s3, 4 -/* 0CA7D4 800C9BD4 01F81021 */ addu $v0, $t7, $t8 -/* 0CA7D8 800C9BD8 3C01800F */ lui $at, %hi(D_800F399C) # $at, 0x800f -/* 0CA7DC 800C9BDC E4440000 */ swc1 $f4, ($v0) -/* 0CA7E0 800C9BE0 C426399C */ lwc1 $f6, %lo(D_800F399C)($at) -/* 0CA7E4 800C9BE4 1000000B */ b .L800C9C14 -/* 0CA7E8 800C9BE8 E4460004 */ swc1 $f6, 4($v0) -glabel L800C9BEC -/* 0CA7EC 800C9BEC 3C01800F */ lui $at, %hi(D_800F39A0) # $at, 0x800f -/* 0CA7F0 800C9BF0 C42839A0 */ lwc1 $f8, %lo(D_800F39A0)($at) -/* 0CA7F4 800C9BF4 3C08800F */ lui $t0, %hi(D_800EA06C) # $t0, 0x800f -/* 0CA7F8 800C9BF8 2508A06C */ addiu $t0, %lo(D_800EA06C) # addiu $t0, $t0, -0x5f94 -/* 0CA7FC 800C9BFC 0013C900 */ sll $t9, $s3, 4 -/* 0CA800 800C9C00 03281021 */ addu $v0, $t9, $t0 -/* 0CA804 800C9C04 3C01800F */ lui $at, %hi(D_800F39A4) # $at, 0x800f -/* 0CA808 800C9C08 E4480000 */ swc1 $f8, ($v0) -/* 0CA80C 800C9C0C C42A39A4 */ lwc1 $f10, %lo(D_800F39A4)($at) -/* 0CA810 800C9C10 E44A0004 */ swc1 $f10, 4($v0) -.L800C9C14: -/* 0CA814 800C9C14 3C17800F */ lui $s7, %hi(D_800EA1C0) # $s7, 0x800f -/* 0CA818 800C9C18 26F7A1C0 */ addiu $s7, %lo(D_800EA1C0) # addiu $s7, $s7, -0x5e40 -/* 0CA81C 800C9C1C 92E20000 */ lbu $v0, ($s7) -/* 0CA820 800C9C20 28410002 */ slti $at, $v0, 2 -/* 0CA824 800C9C24 5020002C */ beql $at, $zero, .L800C9CD8 -/* 0CA828 800C9C28 8FDF005C */ lw $ra, 0x5c($fp) -/* 0CA82C 800C9C2C 04400029 */ bltz $v0, .L800C9CD4 -/* 0CA830 800C9C30 00008025 */ move $s0, $zero -/* 0CA834 800C9C34 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 0CA838 800C9C38 3C123102 */ lui $s2, (0x31028000 >> 16) # lui $s2, 0x3102 -/* 0CA83C 800C9C3C 4481A000 */ mtc1 $at, $f20 -/* 0CA840 800C9C40 36528000 */ ori $s2, (0x31028000 & 0xFFFF) # ori $s2, $s2, 0x8000 -/* 0CA844 800C9C44 24740014 */ addiu $s4, $v1, 0x14 -/* 0CA848 800C9C48 24750034 */ addiu $s5, $v1, 0x34 -/* 0CA84C 800C9C4C 24760098 */ addiu $s6, $v1, 0x98 -/* 0CA850 800C9C50 AFC30064 */ sw $v1, 0x64($fp) -.L800C9C54: -/* 0CA854 800C9C54 8FC30064 */ lw $v1, 0x64($fp) -/* 0CA858 800C9C58 AFB00010 */ sw $s0, 0x10($sp) -/* 0CA85C 800C9C5C 326400FF */ andi $a0, $s3, 0xff -/* 0CA860 800C9C60 94690254 */ lhu $t1, 0x254($v1) -/* 0CA864 800C9C64 02802825 */ move $a1, $s4 -/* 0CA868 800C9C68 02A03025 */ move $a2, $s5 -/* 0CA86C 800C9C6C 01328821 */ addu $s1, $t1, $s2 -/* 0CA870 800C9C70 AFB10014 */ sw $s1, 0x14($sp) -/* 0CA874 800C9C74 0C030722 */ jal func_800C1C88 -/* 0CA878 800C9C78 02C03825 */ move $a3, $s6 -/* 0CA87C 800C9C7C 1040000E */ beqz $v0, .L800C9CB8 -/* 0CA880 800C9C80 02202025 */ move $a0, $s1 -/* 0CA884 800C9C84 3C0B800F */ lui $t3, %hi(D_800EA06C) # $t3, 0x800f -/* 0CA888 800C9C88 E4540034 */ swc1 $f20, 0x34($v0) -/* 0CA88C 800C9C8C 256BA06C */ addiu $t3, %lo(D_800EA06C) # addiu $t3, $t3, -0x5f94 -/* 0CA890 800C9C90 24450018 */ addiu $a1, $v0, 0x18 -/* 0CA894 800C9C94 2447002C */ addiu $a3, $v0, 0x2c -/* 0CA898 800C9C98 00135100 */ sll $t2, $s3, 4 -/* 0CA89C 800C9C9C 014B1021 */ addu $v0, $t2, $t3 -/* 0CA8A0 800C9CA0 244C0008 */ addiu $t4, $v0, 8 -/* 0CA8A4 800C9CA4 244D000C */ addiu $t5, $v0, 0xc -/* 0CA8A8 800C9CA8 AFAD0014 */ sw $t5, 0x14($sp) -/* 0CA8AC 800C9CAC AFAC0010 */ sw $t4, 0x10($sp) -/* 0CA8B0 800C9CB0 0C031052 */ jal play_sound -/* 0CA8B4 800C9CB4 320600FF */ andi $a2, $s0, 0xff -.L800C9CB8: -/* 0CA8B8 800C9CB8 92EF0000 */ lbu $t7, ($s7) -/* 0CA8BC 800C9CBC 26100001 */ addiu $s0, $s0, 1 -/* 0CA8C0 800C9CC0 320E00FF */ andi $t6, $s0, 0xff -/* 0CA8C4 800C9CC4 25F80001 */ addiu $t8, $t7, 1 -/* 0CA8C8 800C9CC8 01D8082A */ slt $at, $t6, $t8 -/* 0CA8CC 800C9CCC 1420FFE1 */ bnez $at, .L800C9C54 -/* 0CA8D0 800C9CD0 01C08025 */ move $s0, $t6 -.L800C9CD4: -/* 0CA8D4 800C9CD4 8FDF005C */ lw $ra, 0x5c($fp) -.L800C9CD8: -/* 0CA8D8 800C9CD8 03C0E825 */ move $sp, $fp -/* 0CA8DC 800C9CDC D7D40030 */ ldc1 $f20, 0x30($fp) -/* 0CA8E0 800C9CE0 8FD00038 */ lw $s0, 0x38($fp) -/* 0CA8E4 800C9CE4 8FD1003C */ lw $s1, 0x3c($fp) -/* 0CA8E8 800C9CE8 8FD20040 */ lw $s2, 0x40($fp) -/* 0CA8EC 800C9CEC 8FD30044 */ lw $s3, 0x44($fp) -/* 0CA8F0 800C9CF0 8FD40048 */ lw $s4, 0x48($fp) -/* 0CA8F4 800C9CF4 8FD5004C */ lw $s5, 0x4c($fp) -/* 0CA8F8 800C9CF8 8FD60050 */ lw $s6, 0x50($fp) -/* 0CA8FC 800C9CFC 8FD70054 */ lw $s7, 0x54($fp) -/* 0CA900 800C9D00 8FDE0058 */ lw $fp, 0x58($fp) -/* 0CA904 800C9D04 03E00008 */ jr $ra -/* 0CA908 800C9D08 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/non_matchings/audio/external/func_800CADD0.s b/asm/non_matchings/audio/external/func_800CADD0.s index 48b70b5c1..b8b9eddf7 100644 --- a/asm/non_matchings/audio/external/func_800CADD0.s +++ b/asm/non_matchings/audio/external/func_800CADD0.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800F39A8 +.float 0.55 + +glabel D_800F39AC +.float 0.45 + +.section .text + glabel func_800CADD0 /* 0CB9D0 800CADD0 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f /* 0CB9D4 800CADD4 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) diff --git a/asm/non_matchings/audio/external/func_800CAEC4.s b/asm/non_matchings/audio/external/func_800CAEC4.s index 96700fea2..b68857a37 100644 --- a/asm/non_matchings/audio/external/func_800CAEC4.s +++ b/asm/non_matchings/audio/external/func_800CAEC4.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800F39B0 +.float 0.7 + +glabel D_800F39B4 +.float 0.1 + +.section .text + glabel func_800CAEC4 /* 0CBAC4 800CAEC4 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f /* 0CBAC8 800CAEC8 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) diff --git a/asm/non_matchings/audio/heap/func_800B9BE4.s b/asm/non_matchings/audio/heap/func_800B9BE4.s index a3edd3e8a..f95db81dc 100644 --- a/asm/non_matchings/audio/heap/func_800B9BE4.s +++ b/asm/non_matchings/audio/heap/func_800B9BE4.s @@ -1,3 +1,9 @@ +.section .late_rodata + +glabel D_800F2E80 +.float 262159.0 + +.section .text glabel func_800B9BE4 /* 0BA7E4 800B9BE4 3C01800F */ lui $at, %hi(D_800F2E80) # $at, 0x800f diff --git a/asm/non_matchings/audio/heap/func_800BA00C.s b/asm/non_matchings/audio/heap/func_800BA00C.s index 879d16feb..40da0100b 100644 --- a/asm/non_matchings/audio/heap/func_800BA00C.s +++ b/asm/non_matchings/audio/heap/func_800BA00C.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800F2E84 +.word L800BA210, L800BA1E4, L800BA14C, L800BA094 +.word L800BA050 + +.section .text + glabel func_800BA00C /* 0BAC0C 800BA00C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 0BAC10 800BA010 AFB20020 */ sw $s2, 0x20($sp) diff --git a/asm/non_matchings/audio/heap/func_800BA250.s b/asm/non_matchings/audio/heap/func_800BA250.s index 8cd1fdb90..c767bfeb0 100644 --- a/asm/non_matchings/audio/heap/func_800BA250.s +++ b/asm/non_matchings/audio/heap/func_800BA250.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800F2E98 +.float 0.001171875 + +glabel D_800F2E9C +.float 2880000.0 + +.section .text + glabel func_800BA250 /* 0BAE50 800BA250 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 0BAE54 800BA254 3C0E803B */ lui $t6, %hi(D_803B0501) # $t6, 0x803b diff --git a/asm/non_matchings/audio/load/audio_init.s b/asm/non_matchings/audio/load/audio_init.s index 99c1a246c..f96444478 100644 --- a/asm/non_matchings/audio/load/audio_init.s +++ b/asm/non_matchings/audio/load/audio_init.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800F2EA0 +.float 20.0304203 + +glabel D_800F2EA4 +.float 16.546 + +glabel D_800F2EA8 +.float 16.713 + +.section .text + glabel audio_init /* 0BCCDC 800BC0DC 27BDFF70 */ addiu $sp, $sp, -0x90 /* 0BCCE0 800BC0E0 3C0E800F */ lui $t6, %hi(D_800EA5DC) # $t6, 0x800f diff --git a/asm/non_matchings/audio/port_eu/func_800CBCB0.s b/asm/non_matchings/audio/port_eu/func_800CBCB0.s index 0c203a876..355e814f9 100644 --- a/asm/non_matchings/audio/port_eu/func_800CBCB0.s +++ b/asm/non_matchings/audio/port_eu/func_800CBCB0.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800F39C0 +.word L800CBE60, L800CBE78, L800CBE90, L800CBEA8 +.word L800CBEC0, L800CBECC, L800CBF08, L800CBEEC + +.section .text + glabel func_800CBCB0 /* 0CC8B0 800CBCB0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 0CC8B4 800CBCB4 AFB20030 */ sw $s2, 0x30($sp) diff --git a/asm/non_matchings/audio/seqplayer/func_800BFD90.s b/asm/non_matchings/audio/seqplayer/func_800BFD90.s index e10db8380..6ec05e641 100644 --- a/asm/non_matchings/audio/seqplayer/func_800BFD90.s +++ b/asm/non_matchings/audio/seqplayer/func_800BFD90.s @@ -1,3 +1,72 @@ +.section .late_rodata + +glabel jpt_800F2F90 +.word L800C0124, L800C0078, L800C0140, L800C0150 +.word L800C0094, L800C035C, L800C03B4, L800C03EC +.word L800C03EC, L800C0438, L800C0448, L800C03EC +.word L800BFE40, L800BFE40, L800BFE40, L800C0468 +.word L800C048C, L800C049C, L800C01E8, L800C034C +.word L800BFE40, L800BFE40, L800C02B4, L800C0298 +.word L800C0288, L800C026C, L800C0254, L800C0238 +.word L800C021C, L800C01B4, L800C0160, L800C0184 +.word L800C0304, L800C02D0, L800C0338, L800C04BC +.word L800C04AC, L800C0518, L800C0528, L800C0590 +.word L800C0630, L800BFEC4, L800C00D0, L800C0608 +.word L800BFE40, L800BFE40, L800C0640, L800C0068 +.word L800C0040, L800BFFF8, L800BFFF8, L800BFFF8 +.word L800BFFA0, L800BFF90, L800BFF48, L800BFF10 +.word L800BFFA0, L800BFFA0, L800BFFA0, L800BFED4 +.word L800BFEB4, L800C0880, L800BFE7C + +glabel jpt_800F308C +.word L800C0684, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C07E4, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C0814, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C0830, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C0858, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C06EC, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C0708, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C06BC, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C06CC, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C0714, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C0760, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 +.word L800C077C + +.section .text + glabel func_800BFD90 /* 0C0990 800BFD90 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 0C0994 800BFD94 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/audio/seqplayer/func_800C08CC.s b/asm/non_matchings/audio/seqplayer/func_800C08CC.s index 4bffd60e0..5733f7b6c 100644 --- a/asm/non_matchings/audio/seqplayer/func_800C08CC.s +++ b/asm/non_matchings/audio/seqplayer/func_800C08CC.s @@ -1,3 +1,50 @@ +.section .late_rodata + +glabel jpt_800F3350 +.word L800C0FF4, L800C0FE4, L800C0AE8, L800C0AE8 +.word L800C0FD4, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0FC4, L800C0F98, L800C0F98, L800C0F88 +.word L800C0F78, L800C0F4C, L800C0F30, L800C0F14 +.word L800C0AE8, L800C0EE8, L800C0DD4, L800C0E50 +.word L800C0D50, L800C0D50, L800C0D30, L800C0D2C +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0D1C, L800C0CF4, L800C0CAC, L800C0CAC +.word L800C0CAC, L800C0C54, L800C0AE8, L800C0C0C +.word L800C0BD4, L800C0C54, L800C0C54, L800C0C54 +.word L800C0B90, L800C0AE8, L800C0AE8, L800C0AE8 + +glabel jpt_800F3430 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C1084, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C1090, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C1098, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C10A0, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 +.word L800C0AE8 + +.section .text + glabel func_800C08CC /* 0C14CC 800C08CC 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 0C14D0 800C08D0 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/audio/seqplayer/seq_channel_layer_process_script.s b/asm/non_matchings/audio/seqplayer/seq_channel_layer_process_script.s index 1de771ca3..0eafc89e9 100644 --- a/asm/non_matchings/audio/seqplayer/seq_channel_layer_process_script.s +++ b/asm/non_matchings/audio/seqplayer/seq_channel_layer_process_script.s @@ -1,3 +1,30 @@ +.section .late_rodata + +glabel jpt_800F2F10 +.word L800BF3E8, L800BF600, L800BF600, L800BF380 +.word L800BF348, L800BF600, L800BF600, L800BF3C8 +.word L800BF308, L800BF600, L800BF600, L800BF2D0 + +glabel jpt_800F2F40 +.word L800BF408, L800BF450, L800BF4B0, L800BF478 +.word L800BF478, L800BF4C4, L800BF534, L800BF5BC +.word L800BF450, L800BF408, L800BF5C4, L800BF5F0 + +glabel D_800F2F70 +.float 16129.0 + +glabel D_800F2F74 +.float 16129.0 + +glabel D_800F2F78 +.float 16129.0 + +glabel jpt_800F2F7C +.word L800BFA20, L800BFA28, L800BFA20, L800BFA28 +.word L800BFA20 + +.section .text + glabel seq_channel_layer_process_script /* 0BFD90 800BF190 27BDFF90 */ addiu $sp, $sp, -0x70 /* 0BFD94 800BF194 240E0001 */ li $t6, 1 diff --git a/asm/non_matchings/camera/func_8001C4D0.s b/asm/non_matchings/camera/func_8001C4D0.s index 812989fb4..fa4429071 100644 --- a/asm/non_matchings/camera/func_8001C4D0.s +++ b/asm/non_matchings/camera/func_8001C4D0.s @@ -1,3 +1,33 @@ +.section .late_rodata + +glabel jpt_800ED4E0 +.word L8001C524, L8001C524, L8001C9CC, L8001C524 +.word L8001C9CC, L8001C9CC, L8001C9CC, L8001C9CC +.word L8001C524, L8001C524, L8001C524 + +glabel D_800ED50C +.float 11.600000381 + +glabel D_800ED510 +.float 19.200000763 + +glabel D_800ED514 +.float 11.600000381 + +glabel D_800ED518 +.float 19.200000763 + +glabel D_800ED51C +.float 9.600000381 + +glabel D_800ED520 +.float 11.600000381 + +glabel D_800ED524 +.float 19.200000763 + +.section .text + glabel func_8001C4D0 /* 01D0D0 8001C4D0 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 01D0D4 8001C4D4 AFA60048 */ sw $a2, 0x48($sp) diff --git a/asm/non_matchings/camera/func_8001CCEC.s b/asm/non_matchings/camera/func_8001CCEC.s index ff30a11c9..f19998327 100644 --- a/asm/non_matchings/camera/func_8001CCEC.s +++ b/asm/non_matchings/camera/func_8001CCEC.s @@ -1,3 +1,40 @@ +.section .late_rodata + +glabel D_800ED528 +.double 0.7 + +glabel D_800ED530 +.double 0.8 + +glabel D_800ED538 +.double 0.1 + +glabel D_800ED540 +.double 0.9 + +glabel D_800ED548 +.double 0.1 + +glabel D_800ED550 +.double 0.1 + +glabel D_800ED558 +.double 0.1 + +glabel D_800ED560 +.double 0.85 + +glabel D_800ED568 +.double 0.02 + +glabel D_800ED570 +.double 0.01 + +glabel D_800ED578 +.double 0.15 + +.section .text + glabel func_8001CCEC /* 01D8EC 8001CCEC 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 01D8F0 8001CCF0 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/camera/func_8001D944.s b/asm/non_matchings/camera/func_8001D944.s index e55788c43..bdd88dfbb 100644 --- a/asm/non_matchings/camera/func_8001D944.s +++ b/asm/non_matchings/camera/func_8001D944.s @@ -1,3 +1,40 @@ +.section .late_rodata + +glabel D_800ED580 +.double 0.7 + +glabel D_800ED588 +.double 0.8 + +glabel D_800ED590 +.double 0.1 + +glabel D_800ED598 +.double 0.9 + +glabel D_800ED5A0 +.double 0.1 + +glabel D_800ED5A8 +.double 0.1 + +glabel D_800ED5B0 +.double 0.1 + +glabel D_800ED5B8 +.double 0.85 + +glabel D_800ED5C0 +.double 0.02 + +glabel D_800ED5C8 +.double 0.01 + +glabel D_800ED5D0 +.double 0.15 + +.section .text + glabel func_8001D944 /* 01E544 8001D944 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 01E548 8001D948 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/camera/func_8001F394.s b/asm/non_matchings/camera/func_8001F394.s index 59b25c32f..24a4ee2a1 100644 --- a/asm/non_matchings/camera/func_8001F394.s +++ b/asm/non_matchings/camera/func_8001F394.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel jpt_800ED5D8 +.word L8001F4E0, L8001F54C, L8001F5DC, L8001F654 +.word L8001F6D8 + +.word 0x00000000 + +glabel D_800ED5F0 +.double 0.8 + +.section .text + glabel func_8001F394 /* 01FF94 8001F394 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 01FF98 8001F398 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) diff --git a/asm/non_matchings/code_80027D00/control_cpu_movement.s b/asm/non_matchings/code_80027D00/control_cpu_movement.s index 47902f4fc..3ead001b4 100644 --- a/asm/non_matchings/code_80027D00/control_cpu_movement.s +++ b/asm/non_matchings/code_80027D00/control_cpu_movement.s @@ -1,3 +1,27 @@ +.section .data + +glabel D_800E3D98 +.float 0.0, 0.0, 1.0 + +glabel D_800E3DA4 +.float 0.0, 0.0, 0.0 + +glabel D_800E3DB0 +.float 0.0, 0.0, 0.0 + +glabel D_800E3DBC +.float 0.0, 0.0, 0.0 + +.section .late_rodata + +glabel D_800ED898 +.double 0.12 + +glabel D_800ED8A0 +.double 6000.0 + +.section .text + glabel control_cpu_movement /* 02FF5C 8002F35C 27BDFF00 */ addiu $sp, $sp, -0x100 /* 02FF60 8002F360 3C18800E */ lui $t8, %hi(D_800E3D98) # $t8, 0x800e diff --git a/asm/non_matchings/code_80027D00/func_80027EDC.s b/asm/non_matchings/code_80027D00/func_80027EDC.s index 7eeea8085..4a6283421 100644 --- a/asm/non_matchings/code_80027D00/func_80027EDC.s +++ b/asm/non_matchings/code_80027D00/func_80027EDC.s @@ -1,3 +1,22 @@ +.section .late_rodata + +glabel jpt_800ED6F0 +.word L80027F38, L80027FC0, L80028048, L800280D0 +.word L80028854, L80028854, L80028854, L80028854 +.word L80028158, L80028854, L800281E0, L80028854 +.word L8002825C, L80028854, L80028854, L80028854 +.word L80028854, L80028854, L800282E4 + +glabel jpt_800ED73C +.word L80028424 +.word L800284AC, L80028534, L800285BC, L80028854 +.word L80028854, L80028854, L80028854, L80028644 +.word L80028854, L800286CC, L80028854, L80028748 +.word L80028854, L80028854, L80028854, L80028854 +.word L80028854, L800287D0 + +.section .text + glabel func_80027EDC /* 028ADC 80027EDC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 028AE0 80027EE0 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80027D00/func_8002934C.s b/asm/non_matchings/code_80027D00/func_8002934C.s index 75c4e2f28..48a446523 100644 --- a/asm/non_matchings/code_80027D00/func_8002934C.s +++ b/asm/non_matchings/code_80027D00/func_8002934C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800ED788 +.double 1.6 + +glabel D_800ED790 +.double 0.9 + +.section .text + glabel func_8002934C /* 029F4C 8002934C 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 029F50 80029350 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80027D00/func_80029B4C.s b/asm/non_matchings/code_80027D00/func_80029B4C.s index ba818ceda..37505ffd6 100644 --- a/asm/non_matchings/code_80027D00/func_80029B4C.s +++ b/asm/non_matchings/code_80027D00/func_80029B4C.s @@ -1,3 +1,19 @@ +.section .late_rodata + +glabel D_800ED798 +.double 3.6 + +glabel D_800ED7A0 +.double 3.6 + +glabel D_800ED7A8 +.double 2.6 + +glabel D_800ED7B0 +.double 2.6 + +.section .text + glabel func_80029B4C /* 02A74C 80029B4C 27BDFF58 */ addiu $sp, $sp, -0xa8 /* 02A750 80029B50 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80027D00/func_8002B218.s b/asm/non_matchings/code_80027D00/func_8002B218.s deleted file mode 100644 index 2ed3af295..000000000 --- a/asm/non_matchings/code_80027D00/func_8002B218.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_8002B218 -/* 02BE18 8002B218 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 02BE1C 8002B21C 3C0E800E */ lui $t6, %hi(D_800E3C70) # $t6, 0x800e -/* 02BE20 8002B220 AFBF0014 */ sw $ra, 0x14($sp) -/* 02BE24 8002B224 25CE3C70 */ addiu $t6, %lo(D_800E3C70) # addiu $t6, $t6, 0x3c70 -/* 02BE28 8002B228 8DC10000 */ lw $at, ($t6) -/* 02BE2C 8002B22C 27A60038 */ addiu $a2, $sp, 0x38 -/* 02BE30 8002B230 3C08800E */ lui $t0, %hi(D_800E3C84) # $t0, 0x800e -/* 02BE34 8002B234 ACC10000 */ sw $at, ($a2) -/* 02BE38 8002B238 8DD90004 */ lw $t9, 4($t6) -/* 02BE3C 8002B23C 25083C84 */ addiu $t0, %lo(D_800E3C84) # addiu $t0, $t0, 0x3c84 -/* 02BE40 8002B240 27A70024 */ addiu $a3, $sp, 0x24 -/* 02BE44 8002B244 ACD90004 */ sw $t9, 4($a2) -/* 02BE48 8002B248 8DC10008 */ lw $at, 8($t6) -/* 02BE4C 8002B24C 00001025 */ move $v0, $zero -/* 02BE50 8002B250 ACC10008 */ sw $at, 8($a2) -/* 02BE54 8002B254 8DD9000C */ lw $t9, 0xc($t6) -/* 02BE58 8002B258 ACD9000C */ sw $t9, 0xc($a2) -/* 02BE5C 8002B25C 8DC10010 */ lw $at, 0x10($t6) -/* 02BE60 8002B260 ACC10010 */ sw $at, 0x10($a2) -/* 02BE64 8002B264 8D010000 */ lw $at, ($t0) -/* 02BE68 8002B268 ACE10000 */ sw $at, ($a3) -/* 02BE6C 8002B26C 8D0B0004 */ lw $t3, 4($t0) -/* 02BE70 8002B270 ACEB0004 */ sw $t3, 4($a3) -/* 02BE74 8002B274 8D010008 */ lw $at, 8($t0) -/* 02BE78 8002B278 ACE10008 */ sw $at, 8($a3) -/* 02BE7C 8002B27C 8D0B000C */ lw $t3, 0xc($t0) -/* 02BE80 8002B280 ACEB000C */ sw $t3, 0xc($a3) -/* 02BE84 8002B284 8D010010 */ lw $at, 0x10($t0) -/* 02BE88 8002B288 ACE10010 */ sw $at, 0x10($a3) -/* 02BE8C 8002B28C 94850006 */ lhu $a1, 6($a0) -.L8002B290: -/* 02BE90 8002B290 00021840 */ sll $v1, $v0, 1 -/* 02BE94 8002B294 00C36021 */ addu $t4, $a2, $v1 -/* 02BE98 8002B298 958D0000 */ lhu $t5, ($t4) -/* 02BE9C 8002B29C 24420001 */ addiu $v0, $v0, 1 -/* 02BEA0 8002B2A0 3048FFFF */ andi $t0, $v0, 0xffff -/* 02BEA4 8002B2A4 14AD0009 */ bne $a1, $t5, .L8002B2CC -/* 02BEA8 8002B2A8 00E37021 */ addu $t6, $a3, $v1 -/* 02BEAC 8002B2AC 8C9800BC */ lw $t8, 0xbc($a0) -/* 02BEB0 8002B2B0 370F0010 */ ori $t7, $t8, 0x10 -/* 02BEB4 8002B2B4 AC8F00BC */ sw $t7, 0xbc($a0) -/* 02BEB8 8002B2B8 0C00AA94 */ jal func_8002AA50 -/* 02BEBC 8002B2BC AFA40050 */ sw $a0, 0x50($sp) -/* 02BEC0 8002B2C0 8FA40050 */ lw $a0, 0x50($sp) -/* 02BEC4 8002B2C4 1000000C */ b .L8002B2F8 -/* 02BEC8 8002B2C8 A4800204 */ sh $zero, 0x204($a0) -.L8002B2CC: -/* 02BECC 8002B2CC 95D90000 */ lhu $t9, ($t6) -/* 02BED0 8002B2D0 2901000A */ slti $at, $t0, 0xa -/* 02BED4 8002B2D4 14B90006 */ bne $a1, $t9, .L8002B2F0 -/* 02BED8 8002B2D8 00000000 */ nop -/* 02BEDC 8002B2DC 8C8A00BC */ lw $t2, 0xbc($a0) -/* 02BEE0 8002B2E0 2401FFEF */ li $at, -17 -/* 02BEE4 8002B2E4 01414824 */ and $t1, $t2, $at -/* 02BEE8 8002B2E8 10000003 */ b .L8002B2F8 -/* 02BEEC 8002B2EC AC8900BC */ sw $t1, 0xbc($a0) -.L8002B2F0: -/* 02BEF0 8002B2F0 1420FFE7 */ bnez $at, .L8002B290 -/* 02BEF4 8002B2F4 01001025 */ move $v0, $t0 -.L8002B2F8: -/* 02BEF8 8002B2F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 02BEFC 8002B2FC 27BD0050 */ addiu $sp, $sp, 0x50 -/* 02BF00 8002B300 03E00008 */ jr $ra -/* 02BF04 8002B304 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002B9CC.s b/asm/non_matchings/code_80027D00/func_8002B9CC.s index 2e840c5e8..d4ef0fa39 100644 --- a/asm/non_matchings/code_80027D00/func_8002B9CC.s +++ b/asm/non_matchings/code_80027D00/func_8002B9CC.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED7D0 +.double 4.2 + +.section .text + glabel func_8002B9CC /* 02C5CC 8002B9CC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 02C5D0 8002B9D0 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80027D00/func_8002BB9C.s b/asm/non_matchings/code_80027D00/func_8002BB9C.s index 6451d6d2e..11813d81c 100644 --- a/asm/non_matchings/code_80027D00/func_8002BB9C.s +++ b/asm/non_matchings/code_80027D00/func_8002BB9C.s @@ -1,3 +1,14 @@ +.section .data + +glabel D_800E3C98 +# Due to this data being included via a GLOBAL_ASM macro, +# it gets passed through asm_processor instead of, I presume, the MIPS assembler +# asm_process seemingly does not support .hword, only .half +.hword 0x0000, 0x00b6, 0x016c, 0x0222, 0x02d8, 0x038e, 0x0444, 0x04fa +.hword 0x05b0, 0x0666 + +.section .text + glabel func_8002BB9C /* 02C79C 8002BB9C 27BDFF78 */ addiu $sp, $sp, -0x88 /* 02C7A0 8002BBA0 3C0F800E */ lui $t7, %hi(D_800E3C98) # $t7, 0x800e diff --git a/asm/non_matchings/code_80027D00/func_8002BD58.s b/asm/non_matchings/code_80027D00/func_8002BD58.s deleted file mode 100644 index 2e8f66964..000000000 --- a/asm/non_matchings/code_80027D00/func_8002BD58.s +++ /dev/null @@ -1,134 +0,0 @@ -glabel func_8002BD58 -/* 02C958 8002BD58 3C0E800E */ lui $t6, %hi(D_800E3CAC) # $t6, 0x800e -/* 02C95C 8002BD5C 25CE3CAC */ addiu $t6, %lo(D_800E3CAC) # addiu $t6, $t6, 0x3cac -/* 02C960 8002BD60 8DC10000 */ lw $at, ($t6) -/* 02C964 8002BD64 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 02C968 8002BD68 27A5002C */ addiu $a1, $sp, 0x2c -/* 02C96C 8002BD6C ACA10000 */ sw $at, ($a1) -/* 02C970 8002BD70 8DD90004 */ lw $t9, 4($t6) -/* 02C974 8002BD74 3C08800E */ lui $t0, %hi(D_800E3CC8) # $t0, 0x800e -/* 02C978 8002BD78 25083CC8 */ addiu $t0, %lo(D_800E3CC8) # addiu $t0, $t0, 0x3cc8 -/* 02C97C 8002BD7C ACB90004 */ sw $t9, 4($a1) -/* 02C980 8002BD80 8DC10008 */ lw $at, 8($t6) -/* 02C984 8002BD84 27A6000C */ addiu $a2, $sp, 0xc -/* 02C988 8002BD88 ACA10008 */ sw $at, 8($a1) -/* 02C98C 8002BD8C 8DD9000C */ lw $t9, 0xc($t6) -/* 02C990 8002BD90 ACB9000C */ sw $t9, 0xc($a1) -/* 02C994 8002BD94 8DC10010 */ lw $at, 0x10($t6) -/* 02C998 8002BD98 ACA10010 */ sw $at, 0x10($a1) -/* 02C99C 8002BD9C 8DD90014 */ lw $t9, 0x14($t6) -/* 02C9A0 8002BDA0 ACB90014 */ sw $t9, 0x14($a1) -/* 02C9A4 8002BDA4 8DC10018 */ lw $at, 0x18($t6) -/* 02C9A8 8002BDA8 ACA10018 */ sw $at, 0x18($a1) -/* 02C9AC 8002BDAC 8D010000 */ lw $at, ($t0) -/* 02C9B0 8002BDB0 ACC10000 */ sw $at, ($a2) -/* 02C9B4 8002BDB4 8D0B0004 */ lw $t3, 4($t0) -/* 02C9B8 8002BDB8 ACCB0004 */ sw $t3, 4($a2) -/* 02C9BC 8002BDBC 8D010008 */ lw $at, 8($t0) -/* 02C9C0 8002BDC0 ACC10008 */ sw $at, 8($a2) -/* 02C9C4 8002BDC4 8D0B000C */ lw $t3, 0xc($t0) -/* 02C9C8 8002BDC8 ACCB000C */ sw $t3, 0xc($a2) -/* 02C9CC 8002BDCC 8D010010 */ lw $at, 0x10($t0) -/* 02C9D0 8002BDD0 ACC10010 */ sw $at, 0x10($a2) -/* 02C9D4 8002BDD4 8D0B0014 */ lw $t3, 0x14($t0) -/* 02C9D8 8002BDD8 ACCB0014 */ sw $t3, 0x14($a2) -/* 02C9DC 8002BDDC 8D010018 */ lw $at, 0x18($t0) -/* 02C9E0 8002BDE0 ACC10018 */ sw $at, 0x18($a2) -/* 02C9E4 8002BDE4 8D0B001C */ lw $t3, 0x1c($t0) -/* 02C9E8 8002BDE8 ACCB001C */ sw $t3, 0x1c($a2) -/* 02C9EC 8002BDEC 84820234 */ lh $v0, 0x234($a0) -/* 02C9F0 8002BDF0 04400023 */ bltz $v0, .L8002BE80 -/* 02C9F4 8002BDF4 00021823 */ negu $v1, $v0 -/* 02C9F8 8002BDF8 28410005 */ slti $at, $v0, 5 -/* 02C9FC 8002BDFC 14200009 */ bnez $at, .L8002BE24 -/* 02CA00 8002BE00 2841001E */ slti $at, $v0, 0x1e -/* 02CA04 8002BE04 10200007 */ beqz $at, .L8002BE24 -/* 02CA08 8002BE08 24010006 */ li $at, 6 -/* 02CA0C 8002BE0C 0041001A */ div $zero, $v0, $at -/* 02CA10 8002BE10 00006012 */ mflo $t4 -/* 02CA14 8002BE14 000C6880 */ sll $t5, $t4, 2 -/* 02CA18 8002BE18 00ADC021 */ addu $t8, $a1, $t5 -/* 02CA1C 8002BE1C 8F0F0000 */ lw $t7, ($t8) -/* 02CA20 8002BE20 AC8F007C */ sw $t7, 0x7c($a0) -.L8002BE24: -/* 02CA24 8002BE24 2841001E */ slti $at, $v0, 0x1e -/* 02CA28 8002BE28 1420000A */ bnez $at, .L8002BE54 -/* 02CA2C 8002BE2C 28410050 */ slti $at, $v0, 0x50 -/* 02CA30 8002BE30 10200008 */ beqz $at, .L8002BE54 -/* 02CA34 8002BE34 244EFFE2 */ addiu $t6, $v0, -0x1e -/* 02CA38 8002BE38 2401000C */ li $at, 12 -/* 02CA3C 8002BE3C 01C1001A */ div $zero, $t6, $at -/* 02CA40 8002BE40 0000C812 */ mflo $t9 -/* 02CA44 8002BE44 00195080 */ sll $t2, $t9, 2 -/* 02CA48 8002BE48 00CA4821 */ addu $t1, $a2, $t2 -/* 02CA4C 8002BE4C 8D280000 */ lw $t0, ($t1) -/* 02CA50 8002BE50 AC88007C */ sw $t0, 0x7c($a0) -.L8002BE54: -/* 02CA54 8002BE54 28410050 */ slti $at, $v0, 0x50 -/* 02CA58 8002BE58 14200002 */ bnez $at, .L8002BE64 -/* 02CA5C 8002BE5C 2841005B */ slti $at, $v0, 0x5b -/* 02CA60 8002BE60 14200038 */ bnez $at, .L8002BF44 -.L8002BE64: -/* 02CA64 8002BE64 2841005B */ slti $at, $v0, 0x5b -/* 02CA68 8002BE68 14200036 */ bnez $at, .L8002BF44 -/* 02CA6C 8002BE6C 284100A1 */ slti $at, $v0, 0xa1 -/* 02CA70 8002BE70 10200034 */ beqz $at, .L8002BF44 -/* 02CA74 8002BE74 8FAB0010 */ lw $t3, 0x10($sp) -/* 02CA78 8002BE78 10000032 */ b .L8002BF44 -/* 02CA7C 8002BE7C AC8B007C */ sw $t3, 0x7c($a0) -.L8002BE80: -/* 02CA80 8002BE80 00036400 */ sll $t4, $v1, 0x10 -/* 02CA84 8002BE84 000C6C03 */ sra $t5, $t4, 0x10 -/* 02CA88 8002BE88 2841FFFC */ slti $at, $v0, -4 -/* 02CA8C 8002BE8C 1020000F */ beqz $at, .L8002BECC -/* 02CA90 8002BE90 01A01825 */ move $v1, $t5 -/* 02CA94 8002BE94 2841FFE2 */ slti $at, $v0, -0x1e -/* 02CA98 8002BE98 1420000C */ bnez $at, .L8002BECC -/* 02CA9C 8002BE9C 24010006 */ li $at, 6 -/* 02CAA0 8002BEA0 01A1001A */ div $zero, $t5, $at -/* 02CAA4 8002BEA4 0000C012 */ mflo $t8 -/* 02CAA8 8002BEA8 00187880 */ sll $t7, $t8, 2 -/* 02CAAC 8002BEAC 00AF7021 */ addu $t6, $a1, $t7 -/* 02CAB0 8002BEB0 8DD90000 */ lw $t9, ($t6) -/* 02CAB4 8002BEB4 2407FFFF */ li $a3, -1 -/* 02CAB8 8002BEB8 84820234 */ lh $v0, 0x234($a0) -/* 02CABC 8002BEBC 03270019 */ multu $t9, $a3 -/* 02CAC0 8002BEC0 00005012 */ mflo $t2 -/* 02CAC4 8002BEC4 AC8A007C */ sw $t2, 0x7c($a0) -/* 02CAC8 8002BEC8 00000000 */ nop -.L8002BECC: -/* 02CACC 8002BECC 2841FFE2 */ slti $at, $v0, -0x1e -/* 02CAD0 8002BED0 1020000F */ beqz $at, .L8002BF10 -/* 02CAD4 8002BED4 2407FFFF */ li $a3, -1 -/* 02CAD8 8002BED8 2841FFB0 */ slti $at, $v0, -0x50 -/* 02CADC 8002BEDC 1420000C */ bnez $at, .L8002BF10 -/* 02CAE0 8002BEE0 2469FFE2 */ addiu $t1, $v1, -0x1e -/* 02CAE4 8002BEE4 2401000C */ li $at, 12 -/* 02CAE8 8002BEE8 0121001A */ div $zero, $t1, $at -/* 02CAEC 8002BEEC 00004012 */ mflo $t0 -/* 02CAF0 8002BEF0 00085880 */ sll $t3, $t0, 2 -/* 02CAF4 8002BEF4 00CB6021 */ addu $t4, $a2, $t3 -/* 02CAF8 8002BEF8 8D8D0000 */ lw $t5, ($t4) -/* 02CAFC 8002BEFC 84820234 */ lh $v0, 0x234($a0) -/* 02CB00 8002BF00 01A70019 */ multu $t5, $a3 -/* 02CB04 8002BF04 0000C012 */ mflo $t8 -/* 02CB08 8002BF08 AC98007C */ sw $t8, 0x7c($a0) -/* 02CB0C 8002BF0C 00000000 */ nop -.L8002BF10: -/* 02CB10 8002BF10 2841FFB0 */ slti $at, $v0, -0x50 -/* 02CB14 8002BF14 10200002 */ beqz $at, .L8002BF20 -/* 02CB18 8002BF18 2841FFA6 */ slti $at, $v0, -0x5a -/* 02CB1C 8002BF1C 10200009 */ beqz $at, .L8002BF44 -.L8002BF20: -/* 02CB20 8002BF20 2841FFA6 */ slti $at, $v0, -0x5a -/* 02CB24 8002BF24 10200007 */ beqz $at, .L8002BF44 -/* 02CB28 8002BF28 2841FF60 */ slti $at, $v0, -0xa0 -/* 02CB2C 8002BF2C 14200005 */ bnez $at, .L8002BF44 -/* 02CB30 8002BF30 8FAF0010 */ lw $t7, 0x10($sp) -/* 02CB34 8002BF34 01E70019 */ multu $t7, $a3 -/* 02CB38 8002BF38 00007012 */ mflo $t6 -/* 02CB3C 8002BF3C AC8E007C */ sw $t6, 0x7c($a0) -/* 02CB40 8002BF40 00000000 */ nop -.L8002BF44: -/* 02CB44 8002BF44 03E00008 */ jr $ra -/* 02CB48 8002BF48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_80027D00/func_8002C954.s b/asm/non_matchings/code_80027D00/func_8002C954.s index 325f8dd2d..0acf2abbf 100644 --- a/asm/non_matchings/code_80027D00/func_8002C954.s +++ b/asm/non_matchings/code_80027D00/func_8002C954.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800ED7D8 +.double 0.6 + +.section .text + glabel func_8002C954 /* 02D554 8002C954 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 02D558 8002C958 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80027D00/func_8002D268.s b/asm/non_matchings/code_80027D00/func_8002D268.s index 19b832fe6..edb85d85a 100644 --- a/asm/non_matchings/code_80027D00/func_8002D268.s +++ b/asm/non_matchings/code_80027D00/func_8002D268.s @@ -1,3 +1,70 @@ +.section .data + +glabel D_800E3CE8 +.float 0.0, 0.0, 1.0 + +glabel D_800E3CF4 +.float 0.0, 0.0, 0.0 + +glabel D_800E3D00 +.float 0.0, 0.0, 0.0 + +glabel D_800E3D0C +.float 0.0, 0.0, 0.0 + +glabel D_800E3D18 +.float 0.825, 0.8, 0.725, 0.625 +.float 0.425, 0.3, 0.3, 0.3 +.float 0.3, 0.3, 0.3, 0.3 +.float 0.3, 0.3, 0.3, 0.3 +.float 0.3, 0.3, 0.3, 0.3 +.float 0.3, 0.3, 0.3 + +.section .late_rodata + +glabel D_800ED7E0 +.double 0.925 + +glabel D_800ED7E8 +.double 0.1 + +glabel D_800ED7F0 +.float 4500.0 +.word 0x00000000 + +glabel D_800ED7F8 +.double 0.12 + +glabel D_800ED800 +.double 6000.0 + +glabel D_800ED808 +.double 0.6 + +glabel D_800ED810 +.double 0.12 + +glabel D_800ED818 +.double 6000.0 + +glabel D_800ED820 +.double 0.12 + +glabel D_800ED828 +.double 6000.0 + +glabel D_800ED830 +.double 0.02 + +glabel D_800ED838 +.float 2.8 +.word 0x00000000 + +glabel D_800ED840 +.double 0.08 + +.section .text + glabel func_8002D268 /* 02DE68 8002D268 27BDFE70 */ addiu $sp, $sp, -0x190 /* 02DE6C 8002D26C 3C0F800E */ lui $t7, %hi(D_800E3CE8) # $t7, 0x800e diff --git a/asm/non_matchings/code_80027D00/func_8002E594.s b/asm/non_matchings/code_80027D00/func_8002E594.s index 77b8a7cbe..7c7f329f9 100644 --- a/asm/non_matchings/code_80027D00/func_8002E594.s +++ b/asm/non_matchings/code_80027D00/func_8002E594.s @@ -1,3 +1,51 @@ +.section .data + +glabel D_800E3D74 +.float 0.0, 0.0, 1.0 + +glabel D_800E3D80 +.float 0.0, 0.0, 0.0 + +glabel D_800E3D8C +.float 0.0, 0.0, 0.0 + +.section .late_rodata + +glabel D_800ED848 +.double 0.1 + +glabel D_800ED850 +.double 6000.0 + +glabel D_800ED858 +.double 0.12 + +glabel D_800ED860 +.double 6000.0 + +glabel D_800ED868 +.double 0.2 + +glabel D_800ED870 +.double 0.08 + +glabel D_800ED878 +.double 0.12 + +glabel D_800ED880 +.float 0.06 + +glabel D_800ED884 +.float 0.06 + +glabel D_800ED888 +.double 0.13 + +glabel D_800ED890 +.double 0.2 + +.section .text + glabel func_8002E594 /* 02F194 8002E594 27BDFF08 */ addiu $sp, $sp, -0xf8 /* 02F198 8002E598 3C0F800E */ lui $t7, %hi(D_800E3D74) # $t7, 0x800e diff --git a/asm/non_matchings/code_80027D00/func_8002F730.s b/asm/non_matchings/code_80027D00/func_8002F730.s index ed84c5355..d630ccc39 100644 --- a/asm/non_matchings/code_80027D00/func_8002F730.s +++ b/asm/non_matchings/code_80027D00/func_8002F730.s @@ -1,3 +1,40 @@ +.section .data + +glabel D_800E3DC8 +.float 0.0, 0.0, 1.0 + +glabel D_800E3DD4 +.float 0.0, 0.0, 0.0 + +glabel D_800E3DE0 +.float 0.0, 0.0, 0.0 + +glabel D_800E3DEC +.float 0.0, 0.0, 0.0 + +.section .late_rodata + +glabel D_800ED8A8 +.double 780.0 + +glabel D_800ED8B0 +.double 6500.0 + +glabel D_800ED8B8 +.float -1100.0 +.word 0x00000000 + +glabel D_800ED8C0 +.double 0.13 + +glabel D_800ED8C8 +.double 0.2 + +glabel D_800ED8D0 +.double 0.018 + +.section .text + glabel func_8002F730 /* 030330 8002F730 27BDFF00 */ addiu $sp, $sp, -0x100 /* 030334 8002F734 3C0F800E */ lui $t7, %hi(D_800E3DC8) # $t7, 0x800e diff --git a/asm/non_matchings/code_80027D00/func_8002FE84.s b/asm/non_matchings/code_80027D00/func_8002FE84.s deleted file mode 100644 index 3c1d34734..000000000 --- a/asm/non_matchings/code_80027D00/func_8002FE84.s +++ /dev/null @@ -1,196 +0,0 @@ -glabel func_8002FE84 -/* 030A84 8002FE84 8C8200BC */ lw $v0, 0xbc($a0) -/* 030A88 8002FE88 44856000 */ mtc1 $a1, $f12 -/* 030A8C 8002FE8C 24014000 */ li $at, 16384 -/* 030A90 8002FE90 304E4000 */ andi $t6, $v0, 0x4000 -/* 030A94 8002FE94 15C1000D */ bne $t6, $at, .L8002FECC -/* 030A98 8002FE98 304F0008 */ andi $t7, $v0, 8 -/* 030A9C 8002FE9C C480009C */ lwc1 $f0, 0x9c($a0) -/* 030AA0 8002FEA0 3C0141C8 */ li $at, 0x41C80000 # 25.000000 -/* 030AA4 8002FEA4 44813000 */ mtc1 $at, $f6 -/* 030AA8 8002FEA8 46000102 */ mul.s $f4, $f0, $f0 -/* 030AAC 8002FEAC 3C01800F */ lui $at, %hi(D_800ED8D8) -/* 030AB0 8002FEB0 D430D8D8 */ ldc1 $f16, %lo(D_800ED8D8)($at) -/* 030AB4 8002FEB4 46062203 */ div.s $f8, $f4, $f6 -/* 030AB8 8002FEB8 460042A1 */ cvt.d.s $f10, $f8 -/* 030ABC 8002FEBC 46305482 */ mul.d $f18, $f10, $f16 -/* 030AC0 8002FEC0 46209120 */ cvt.s.d $f4, $f18 -/* 030AC4 8002FEC4 03E00008 */ jr $ra -/* 030AC8 8002FEC8 E4840098 */ swc1 $f4, 0x98($a0) - -.L8002FECC: -/* 030ACC 8002FECC 24010008 */ li $at, 8 -/* 030AD0 8002FED0 55E1000E */ bnel $t7, $at, .L8002FF0C -/* 030AD4 8002FED4 849800C4 */ lh $t8, 0xc4($a0) -/* 030AD8 8002FED8 C480009C */ lwc1 $f0, 0x9c($a0) -/* 030ADC 8002FEDC 3C0141C8 */ li $at, 0x41C80000 # 25.000000 -/* 030AE0 8002FEE0 44814000 */ mtc1 $at, $f8 -/* 030AE4 8002FEE4 46000182 */ mul.s $f6, $f0, $f0 -/* 030AE8 8002FEE8 3C01800F */ lui $at, %hi(D_800ED8E0) -/* 030AEC 8002FEEC D432D8E0 */ ldc1 $f18, %lo(D_800ED8E0)($at) -/* 030AF0 8002FEF0 46083283 */ div.s $f10, $f6, $f8 -/* 030AF4 8002FEF4 46005421 */ cvt.d.s $f16, $f10 -/* 030AF8 8002FEF8 46328102 */ mul.d $f4, $f16, $f18 -/* 030AFC 8002FEFC 462021A0 */ cvt.s.d $f6, $f4 -/* 030B00 8002FF00 03E00008 */ jr $ra -/* 030B04 8002FF04 E4860098 */ swc1 $f6, 0x98($a0) - -/* 030B08 8002FF08 849800C4 */ lh $t8, 0xc4($a0) -.L8002FF0C: -/* 030B0C 8002FF0C 240300B6 */ li $v1, 182 -/* 030B10 8002FF10 E48C0098 */ swc1 $f12, 0x98($a0) -/* 030B14 8002FF14 0303001A */ div $zero, $t8, $v1 -/* 030B18 8002FF18 14600002 */ bnez $v1, .L8002FF24 -/* 030B1C 8002FF1C 00000000 */ nop -/* 030B20 8002FF20 0007000D */ break 7 -.L8002FF24: -/* 030B24 8002FF24 2401FFFF */ li $at, -1 -/* 030B28 8002FF28 14610004 */ bne $v1, $at, .L8002FF3C -/* 030B2C 8002FF2C 3C018000 */ lui $at, 0x8000 -/* 030B30 8002FF30 17010002 */ bne $t8, $at, .L8002FF3C -/* 030B34 8002FF34 00000000 */ nop -/* 030B38 8002FF38 0006000D */ break 6 -.L8002FF3C: -/* 030B3C 8002FF3C 00001012 */ mflo $v0 -/* 030B40 8002FF40 0002CC00 */ sll $t9, $v0, 0x10 -/* 030B44 8002FF44 00194403 */ sra $t0, $t9, 0x10 -/* 030B48 8002FF48 29010012 */ slti $at, $t0, 0x12 -/* 030B4C 8002FF4C 10200004 */ beqz $at, .L8002FF60 -/* 030B50 8002FF50 01001025 */ move $v0, $t0 -/* 030B54 8002FF54 2841FFEF */ slti $at, $v0, -0x11 -/* 030B58 8002FF58 5020000F */ beql $at, $zero, .L8002FF98 -/* 030B5C 8002FF5C 44829000 */ mtc1 $v0, $f18 -.L8002FF60: -/* 030B60 8002FF60 44824000 */ mtc1 $v0, $f8 -/* 030B64 8002FF64 3C01800F */ lui $at, %hi(D_800ED8E8) -/* 030B68 8002FF68 D430D8E8 */ ldc1 $f16, %lo(D_800ED8E8)($at) -/* 030B6C 8002FF6C 468042A1 */ cvt.d.w $f10, $f8 -/* 030B70 8002FF70 3C01800F */ lui $at, %hi(D_800ED8F0) -/* 030B74 8002FF74 D424D8F0 */ ldc1 $f4, %lo(D_800ED8F0)($at) -/* 030B78 8002FF78 44804000 */ mtc1 $zero, $f8 -/* 030B7C 8002FF7C 46305482 */ mul.d $f18, $f10, $f16 -/* 030B80 8002FF80 460042A1 */ cvt.d.s $f10, $f8 -/* 030B84 8002FF84 46249183 */ div.d $f6, $f18, $f4 -/* 030B88 8002FF88 46265400 */ add.d $f16, $f10, $f6 -/* 030B8C 8002FF8C 1000000D */ b .L8002FFC4 -/* 030B90 8002FF90 46208020 */ cvt.s.d $f0, $f16 -/* 030B94 8002FF94 44829000 */ mtc1 $v0, $f18 -.L8002FF98: -/* 030B98 8002FF98 3C01800F */ lui $at, %hi(D_800ED8F8) -/* 030B9C 8002FF9C D428D8F8 */ ldc1 $f8, %lo(D_800ED8F8)($at) -/* 030BA0 8002FFA0 46809121 */ cvt.d.w $f4, $f18 -/* 030BA4 8002FFA4 3C01800F */ lui $at, %hi(D_800ED900) -/* 030BA8 8002FFA8 D426D900 */ ldc1 $f6, %lo(D_800ED900)($at) -/* 030BAC 8002FFAC 44809000 */ mtc1 $zero, $f18 -/* 030BB0 8002FFB0 46282282 */ mul.d $f10, $f4, $f8 -/* 030BB4 8002FFB4 46009121 */ cvt.d.s $f4, $f18 -/* 030BB8 8002FFB8 46265403 */ div.d $f16, $f10, $f6 -/* 030BBC 8002FFBC 46302200 */ add.d $f8, $f4, $f16 -/* 030BC0 8002FFC0 46204020 */ cvt.s.d $f0, $f8 -.L8002FFC4: -/* 030BC4 8002FFC4 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 030BC8 8002FFC8 44815000 */ mtc1 $at, $f10 -/* 030BCC 8002FFCC 908201EC */ lbu $v0, 0x1ec($a0) -/* 030BD0 8002FFD0 24050008 */ li $a1, 8 -/* 030BD4 8002FFD4 46005181 */ sub.s $f6, $f10, $f0 -/* 030BD8 8002FFD8 460C3482 */ mul.s $f18, $f6, $f12 -/* 030BDC 8002FFDC 14A20010 */ bne $a1, $v0, .L80030020 -/* 030BE0 8002FFE0 E4920098 */ swc1 $f18, 0x98($a0) -/* 030BE4 8002FFE4 94890254 */ lhu $t1, 0x254($a0) -/* 030BE8 8002FFE8 3C0B800E */ lui $t3, %hi(D_800E2E90) -/* 030BEC 8002FFEC 00026080 */ sll $t4, $v0, 2 -/* 030BF0 8002FFF0 00095080 */ sll $t2, $t1, 2 -/* 030BF4 8002FFF4 016A5821 */ addu $t3, $t3, $t2 -/* 030BF8 8002FFF8 8D6B2E90 */ lw $t3, %lo(D_800E2E90)($t3) -/* 030BFC 8002FFFC 3C01800F */ lui $at, %hi(D_800ED908) -/* 030C00 80030000 D428D908 */ ldc1 $f8, %lo(D_800ED908)($at) -/* 030C04 80030004 016C6821 */ addu $t5, $t3, $t4 -/* 030C08 80030008 C5A40000 */ lwc1 $f4, ($t5) -/* 030C0C 8003000C 460001A1 */ cvt.d.s $f6, $f0 -/* 030C10 80030010 46002421 */ cvt.d.s $f16, $f4 -/* 030C14 80030014 46288282 */ mul.d $f10, $f16, $f8 -/* 030C18 80030018 462A3480 */ add.d $f18, $f6, $f10 -/* 030C1C 8003001C 46209020 */ cvt.s.d $f0, $f18 -.L80030020: -/* 030C20 80030020 908201D4 */ lbu $v0, 0x1d4($a0) -/* 030C24 80030024 54A20011 */ bnel $a1, $v0, .L8003006C -/* 030C28 80030028 848900C0 */ lh $t1, 0xc0($a0) -/* 030C2C 8003002C 948E0254 */ lhu $t6, 0x254($a0) -/* 030C30 80030030 3C18800E */ lui $t8, %hi(D_800E2E90) -/* 030C34 80030034 0002C880 */ sll $t9, $v0, 2 -/* 030C38 80030038 000E7880 */ sll $t7, $t6, 2 -/* 030C3C 8003003C 030FC021 */ addu $t8, $t8, $t7 -/* 030C40 80030040 8F182E90 */ lw $t8, %lo(D_800E2E90)($t8) -/* 030C44 80030044 3C01800F */ lui $at, %hi(D_800ED910) -/* 030C48 80030048 D428D910 */ ldc1 $f8, %lo(D_800ED910)($at) -/* 030C4C 8003004C 03194021 */ addu $t0, $t8, $t9 -/* 030C50 80030050 C5040000 */ lwc1 $f4, ($t0) -/* 030C54 80030054 460002A1 */ cvt.d.s $f10, $f0 -/* 030C58 80030058 46002421 */ cvt.d.s $f16, $f4 -/* 030C5C 8003005C 46288182 */ mul.d $f6, $f16, $f8 -/* 030C60 80030060 46265480 */ add.d $f18, $f10, $f6 -/* 030C64 80030064 46209020 */ cvt.s.d $f0, $f18 -/* 030C68 80030068 848900C0 */ lh $t1, 0xc0($a0) -.L8003006C: -/* 030C6C 8003006C 0123001A */ div $zero, $t1, $v1 -/* 030C70 80030070 14600002 */ bnez $v1, .L8003007C -/* 030C74 80030074 00000000 */ nop -/* 030C78 80030078 0007000D */ break 7 -.L8003007C: -/* 030C7C 8003007C 2401FFFF */ li $at, -1 -/* 030C80 80030080 14610004 */ bne $v1, $at, .L80030094 -/* 030C84 80030084 3C018000 */ lui $at, 0x8000 -/* 030C88 80030088 15210002 */ bne $t1, $at, .L80030094 -/* 030C8C 8003008C 00000000 */ nop -/* 030C90 80030090 0006000D */ break 6 -.L80030094: -/* 030C94 80030094 00001012 */ mflo $v0 -/* 030C98 80030098 00025023 */ negu $t2, $v0 -/* 030C9C 8003009C 0441000A */ bgez $v0, .L800300C8 -/* 030CA0 800300A0 3C01800F */ lui $at, %hi(D_800ED920) -/* 030CA4 800300A4 448A2000 */ mtc1 $t2, $f4 -/* 030CA8 800300A8 3C01800F */ lui $at, %hi(D_800ED918) -/* 030CAC 800300AC D428D918 */ ldc1 $f8, %lo(D_800ED918)($at) -/* 030CB0 800300B0 46802421 */ cvt.d.w $f16, $f4 -/* 030CB4 800300B4 460001A1 */ cvt.d.s $f6, $f0 -/* 030CB8 800300B8 46288282 */ mul.d $f10, $f16, $f8 -/* 030CBC 800300BC 462A3480 */ add.d $f18, $f6, $f10 -/* 030CC0 800300C0 10000008 */ b .L800300E4 -/* 030CC4 800300C4 46209020 */ cvt.s.d $f0, $f18 -.L800300C8: -/* 030CC8 800300C8 44822000 */ mtc1 $v0, $f4 -/* 030CCC 800300CC D428D920 */ ldc1 $f8, %lo(D_800ED920)($at) -/* 030CD0 800300D0 460002A1 */ cvt.d.s $f10, $f0 -/* 030CD4 800300D4 46802421 */ cvt.d.w $f16, $f4 -/* 030CD8 800300D8 46288182 */ mul.d $f6, $f16, $f8 -/* 030CDC 800300DC 46265480 */ add.d $f18, $f10, $f6 -/* 030CE0 800300E0 46209020 */ cvt.s.d $f0, $f18 -.L800300E4: -/* 030CE4 800300E4 3C01800F */ lui $at, %hi(D_800ED928) -/* 030CE8 800300E8 D430D928 */ ldc1 $f16, %lo(D_800ED928)($at) -/* 030CEC 800300EC 46000121 */ cvt.d.s $f4, $f0 -/* 030CF0 800300F0 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 030CF4 800300F4 46302202 */ mul.d $f8, $f4, $f16 -/* 030CF8 800300F8 44815800 */ mtc1 $at, $f11 -/* 030CFC 800300FC 44805000 */ mtc1 $zero, $f10 -/* 030D00 80030100 460064A1 */ cvt.d.s $f18, $f12 -/* 030D04 80030104 8C8B00BC */ lw $t3, 0xbc($a0) -/* 030D08 80030108 24010020 */ li $at, 32 -/* 030D0C 8003010C 316C0020 */ andi $t4, $t3, 0x20 -/* 030D10 80030110 46285180 */ add.d $f6, $f10, $f8 -/* 030D14 80030114 46269102 */ mul.d $f4, $f18, $f6 -/* 030D18 80030118 46202420 */ cvt.s.d $f16, $f4 -/* 030D1C 8003011C 1581000A */ bne $t4, $at, .L80030148 -/* 030D20 80030120 E4900098 */ swc1 $f16, 0x98($a0) -/* 030D24 80030124 3C014334 */ li $at, 0x43340000 # 180.000000 -/* 030D28 80030128 44814000 */ mtc1 $at, $f8 -/* 030D2C 8003012C C48A009C */ lwc1 $f10, 0x9c($a0) -/* 030D30 80030130 3C0141C8 */ li $at, 0x41C80000 # 25.000000 -/* 030D34 80030134 44813000 */ mtc1 $at, $f6 -/* 030D38 80030138 46085000 */ add.s $f0, $f10, $f8 -/* 030D3C 8003013C 46000482 */ mul.s $f18, $f0, $f0 -/* 030D40 80030140 46069103 */ div.s $f4, $f18, $f6 -/* 030D44 80030144 E4840098 */ swc1 $f4, 0x98($a0) -.L80030148: -/* 030D48 80030148 03E00008 */ jr $ra -/* 030D4C 8003014C 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80030150.s b/asm/non_matchings/code_80027D00/func_80030150.s deleted file mode 100644 index 176c6fec7..000000000 --- a/asm/non_matchings/code_80027D00/func_80030150.s +++ /dev/null @@ -1,622 +0,0 @@ -glabel func_80030150 -/* 030D50 80030150 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 030D54 80030154 AFBF0014 */ sw $ra, 0x14($sp) -/* 030D58 80030158 AFA5002C */ sw $a1, 0x2c($sp) -/* 030D5C 8003015C 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 030D60 80030160 44813000 */ mtc1 $at, $f6 -/* 030D64 80030164 C4840094 */ lwc1 $f4, 0x94($a0) -/* 030D68 80030168 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 030D6C 8003016C 44815000 */ mtc1 $at, $f10 -/* 030D70 80030170 46062203 */ div.s $f8, $f4, $f6 -/* 030D74 80030174 3C014100 */ li $at, 0x41000000 # 8.000000 -/* 030D78 80030178 44818000 */ mtc1 $at, $f16 -/* 030D7C 8003017C 44807000 */ mtc1 $zero, $f14 -/* 030D80 80030180 00803825 */ move $a3, $a0 -/* 030D84 80030184 46007006 */ mov.s $f0, $f14 -/* 030D88 80030188 460A4082 */ mul.s $f2, $f8, $f10 -/* 030D8C 8003018C 4602803E */ c.le.s $f16, $f2 -/* 030D90 80030190 00000000 */ nop -/* 030D94 80030194 45020147 */ bc1fl .L800306B4 -/* 030D98 80030198 84F900C4 */ lh $t9, 0xc4($a3) -/* 030D9C 8003019C 8C8500BC */ lw $a1, 0xbc($a0) -/* 030DA0 800301A0 24090200 */ li $t1, 512 -/* 030DA4 800301A4 30A80200 */ andi $t0, $a1, 0x200 -/* 030DA8 800301A8 11280037 */ beq $t1, $t0, .L80030288 -/* 030DAC 800301AC 30A60008 */ andi $a2, $a1, 8 -/* 030DB0 800301B0 908201EC */ lbu $v0, 0x1ec($a0) -/* 030DB4 800301B4 3C03800E */ lui $v1, %hi(D_800E2E90) # $v1, 0x800e -/* 030DB8 800301B8 2841000F */ slti $at, $v0, 0xf -/* 030DBC 800301BC 54200004 */ bnel $at, $zero, .L800301D0 -/* 030DC0 800301C0 94EE0254 */ lhu $t6, 0x254($a3) -/* 030DC4 800301C4 1000000B */ b .L800301F4 -/* 030DC8 800301C8 24632E90 */ addiu $v1, %lo(D_800E2E90) # addiu $v1, $v1, 0x2e90 -/* 030DCC 800301CC 94EE0254 */ lhu $t6, 0x254($a3) -.L800301D0: -/* 030DD0 800301D0 3C03800E */ lui $v1, %hi(D_800E2E90) # $v1, 0x800e -/* 030DD4 800301D4 24632E90 */ addiu $v1, %lo(D_800E2E90) # addiu $v1, $v1, 0x2e90 -/* 030DD8 800301D8 000E7880 */ sll $t7, $t6, 2 -/* 030DDC 800301DC 006FC021 */ addu $t8, $v1, $t7 -/* 030DE0 800301E0 8F190000 */ lw $t9, ($t8) -/* 030DE4 800301E4 00025080 */ sll $t2, $v0, 2 -/* 030DE8 800301E8 032A5821 */ addu $t3, $t9, $t2 -/* 030DEC 800301EC C5720000 */ lwc1 $f18, ($t3) -/* 030DF0 800301F0 46127000 */ add.s $f0, $f14, $f18 -.L800301F4: -/* 030DF4 800301F4 90E201D4 */ lbu $v0, 0x1d4($a3) -/* 030DF8 800301F8 2841000F */ slti $at, $v0, 0xf -/* 030DFC 800301FC 5020000A */ beql $at, $zero, .L80030228 -/* 030E00 80030200 90E201BC */ lbu $v0, 0x1bc($a3) -/* 030E04 80030204 94EC0254 */ lhu $t4, 0x254($a3) -/* 030E08 80030208 0002C080 */ sll $t8, $v0, 2 -/* 030E0C 8003020C 000C6880 */ sll $t5, $t4, 2 -/* 030E10 80030210 006D7021 */ addu $t6, $v1, $t5 -/* 030E14 80030214 8DCF0000 */ lw $t7, ($t6) -/* 030E18 80030218 01F8C821 */ addu $t9, $t7, $t8 -/* 030E1C 8003021C C7240000 */ lwc1 $f4, ($t9) -/* 030E20 80030220 46040000 */ add.s $f0, $f0, $f4 -/* 030E24 80030224 90E201BC */ lbu $v0, 0x1bc($a3) -.L80030228: -/* 030E28 80030228 2841000F */ slti $at, $v0, 0xf -/* 030E2C 8003022C 5020000B */ beql $at, $zero, .L8003025C -/* 030E30 80030230 90E201A4 */ lbu $v0, 0x1a4($a3) -/* 030E34 80030234 94EA0254 */ lhu $t2, 0x254($a3) -/* 030E38 80030238 3C0C800E */ lui $t4, %hi(D_800E2EB0) -/* 030E3C 8003023C 00026880 */ sll $t5, $v0, 2 -/* 030E40 80030240 000A5880 */ sll $t3, $t2, 2 -/* 030E44 80030244 018B6021 */ addu $t4, $t4, $t3 -/* 030E48 80030248 8D8C2EB0 */ lw $t4, %lo(D_800E2EB0)($t4) -/* 030E4C 8003024C 018D7021 */ addu $t6, $t4, $t5 -/* 030E50 80030250 C5C60000 */ lwc1 $f6, ($t6) -/* 030E54 80030254 46060000 */ add.s $f0, $f0, $f6 -/* 030E58 80030258 90E201A4 */ lbu $v0, 0x1a4($a3) -.L8003025C: -/* 030E5C 8003025C 2841000F */ slti $at, $v0, 0xf -/* 030E60 80030260 5020000A */ beql $at, $zero, .L8003028C -/* 030E64 80030264 24010008 */ li $at, 8 -/* 030E68 80030268 94EF0254 */ lhu $t7, 0x254($a3) -/* 030E6C 8003026C 00025880 */ sll $t3, $v0, 2 -/* 030E70 80030270 000FC080 */ sll $t8, $t7, 2 -/* 030E74 80030274 0078C821 */ addu $t9, $v1, $t8 -/* 030E78 80030278 8F2A0000 */ lw $t2, ($t9) -/* 030E7C 8003027C 014B6021 */ addu $t4, $t2, $t3 -/* 030E80 80030280 C5880000 */ lwc1 $f8, ($t4) -/* 030E84 80030284 46080000 */ add.s $f0, $f0, $f8 -.L80030288: -/* 030E88 80030288 24010008 */ li $at, 8 -.L8003028C: -/* 030E8C 8003028C 50C100BD */ beql $a2, $at, .L80030584 -/* 030E90 80030290 94E200DE */ lhu $v0, 0xde($a3) -/* 030E94 80030294 84ED00CA */ lh $t5, 0xca($a3) -/* 030E98 80030298 24010002 */ li $at, 2 -/* 030E9C 8003029C 30AB0010 */ andi $t3, $a1, 0x10 -/* 030EA0 800302A0 31AE0002 */ andi $t6, $t5, 2 -/* 030EA4 800302A4 51C100B7 */ beql $t6, $at, .L80030584 -/* 030EA8 800302A8 94E200DE */ lhu $v0, 0xde($a3) -/* 030EAC 800302AC 84EF00C4 */ lh $t7, 0xc4($a3) -/* 030EB0 800302B0 240400B6 */ li $a0, 182 -/* 030EB4 800302B4 01E4001A */ div $zero, $t7, $a0 -/* 030EB8 800302B8 14800002 */ bnez $a0, .L800302C4 -/* 030EBC 800302BC 00000000 */ nop -/* 030EC0 800302C0 0007000D */ break 7 -.L800302C4: -/* 030EC4 800302C4 2401FFFF */ li $at, -1 -/* 030EC8 800302C8 14810004 */ bne $a0, $at, .L800302DC -/* 030ECC 800302CC 3C018000 */ lui $at, 0x8000 -/* 030ED0 800302D0 15E10002 */ bne $t7, $at, .L800302DC -/* 030ED4 800302D4 00000000 */ nop -/* 030ED8 800302D8 0006000D */ break 6 -.L800302DC: -/* 030EDC 800302DC 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 030EE0 800302E0 44815000 */ mtc1 $at, $f10 -/* 030EE4 800302E4 00001012 */ mflo $v0 -/* 030EE8 800302E8 0002C400 */ sll $t8, $v0, 0x10 -/* 030EEC 800302EC 4602503E */ c.le.s $f10, $f2 -/* 030EF0 800302F0 0018CC03 */ sra $t9, $t8, 0x10 -/* 030EF4 800302F4 03201025 */ move $v0, $t9 -/* 030EF8 800302F8 3C01800F */ lui $at, %hi(D_800ED940) -/* 030EFC 800302FC 45000020 */ bc1f .L80030380 -/* 030F00 80030300 00000000 */ nop -/* 030F04 80030304 28410012 */ slti $at, $v0, 0x12 -/* 030F08 80030308 10200003 */ beqz $at, .L80030318 -/* 030F0C 8003030C 2841FFEF */ slti $at, $v0, -0x11 -/* 030F10 80030310 5020000F */ beql $at, $zero, .L80030350 -/* 030F14 80030314 44822000 */ mtc1 $v0, $f4 -.L80030318: -/* 030F18 80030318 44828000 */ mtc1 $v0, $f16 -/* 030F1C 8003031C 3C01800F */ lui $at, %hi(D_800ED930) -/* 030F20 80030320 D424D930 */ ldc1 $f4, %lo(D_800ED930)($at) -/* 030F24 80030324 468084A1 */ cvt.d.w $f18, $f16 -/* 030F28 80030328 3C014008 */ li $at, 0x40080000 # 2.125000 -/* 030F2C 8003032C 44814800 */ mtc1 $at, $f9 -/* 030F30 80030330 44804000 */ mtc1 $zero, $f8 -/* 030F34 80030334 46000421 */ cvt.d.s $f16, $f0 -/* 030F38 80030338 46249182 */ mul.d $f6, $f18, $f4 -/* 030F3C 8003033C 46283283 */ div.d $f10, $f6, $f8 -/* 030F40 80030340 462A8481 */ sub.d $f18, $f16, $f10 -/* 030F44 80030344 1000001A */ b .L800303B0 -/* 030F48 80030348 46209020 */ cvt.s.d $f0, $f18 -/* 030F4C 8003034C 44822000 */ mtc1 $v0, $f4 -.L80030350: -/* 030F50 80030350 3C01800F */ lui $at, %hi(D_800ED938) -/* 030F54 80030354 D428D938 */ ldc1 $f8, %lo(D_800ED938)($at) -/* 030F58 80030358 468021A1 */ cvt.d.w $f6, $f4 -/* 030F5C 8003035C 3C014008 */ li $at, 0x40080000 # 2.125000 -/* 030F60 80030360 44815800 */ mtc1 $at, $f11 -/* 030F64 80030364 44805000 */ mtc1 $zero, $f10 -/* 030F68 80030368 46000121 */ cvt.d.s $f4, $f0 -/* 030F6C 8003036C 46283402 */ mul.d $f16, $f6, $f8 -/* 030F70 80030370 462A8483 */ div.d $f18, $f16, $f10 -/* 030F74 80030374 46322181 */ sub.d $f6, $f4, $f18 -/* 030F78 80030378 1000000D */ b .L800303B0 -/* 030F7C 8003037C 46203020 */ cvt.s.d $f0, $f6 -.L80030380: -/* 030F80 80030380 D430D940 */ ldc1 $f16, %lo(D_800ED940)($at) -/* 030F84 80030384 46000221 */ cvt.d.s $f8, $f0 -/* 030F88 80030388 3C024000 */ li $v0, 0x40000000 # 2.000000 -/* 030F8C 8003038C 46304280 */ add.d $f10, $f8, $f16 -/* 030F90 80030390 00A25024 */ and $t2, $a1, $v0 -/* 030F94 80030394 3C01800F */ lui $at, %hi(D_800ED948) -/* 030F98 80030398 144A0005 */ bne $v0, $t2, .L800303B0 -/* 030F9C 8003039C 46205020 */ cvt.s.d $f0, $f10 -/* 030FA0 800303A0 D432D948 */ ldc1 $f18, %lo(D_800ED948)($at) -/* 030FA4 800303A4 46000121 */ cvt.d.s $f4, $f0 -/* 030FA8 800303A8 46322180 */ add.d $f6, $f4, $f18 -/* 030FAC 800303AC 46203020 */ cvt.s.d $f0, $f6 -.L800303B0: -/* 030FB0 800303B0 24010010 */ li $at, 16 -/* 030FB4 800303B4 51610005 */ beql $t3, $at, .L800303CC -/* 030FB8 800303B8 84ED00C0 */ lh $t5, 0xc0($a3) -/* 030FBC 800303BC 84EC0204 */ lh $t4, 0x204($a3) -/* 030FC0 800303C0 59800022 */ blezl $t4, .L8003044C -/* 030FC4 800303C4 84EF00C0 */ lh $t7, 0xc0($a3) -/* 030FC8 800303C8 84ED00C0 */ lh $t5, 0xc0($a3) -.L800303CC: -/* 030FCC 800303CC 01A4001A */ div $zero, $t5, $a0 -/* 030FD0 800303D0 14800002 */ bnez $a0, .L800303DC -/* 030FD4 800303D4 00000000 */ nop -/* 030FD8 800303D8 0007000D */ break 7 -.L800303DC: -/* 030FDC 800303DC 2401FFFF */ li $at, -1 -/* 030FE0 800303E0 14810004 */ bne $a0, $at, .L800303F4 -/* 030FE4 800303E4 3C018000 */ lui $at, 0x8000 -/* 030FE8 800303E8 15A10002 */ bne $t5, $at, .L800303F4 -/* 030FEC 800303EC 00000000 */ nop -/* 030FF0 800303F0 0006000D */ break 6 -.L800303F4: -/* 030FF4 800303F4 00001012 */ mflo $v0 -/* 030FF8 800303F8 00027023 */ negu $t6, $v0 -/* 030FFC 800303FC 0441000A */ bgez $v0, .L80030428 -/* 031000 80030400 3C01800F */ lui $at, %hi(D_800ED958) -/* 031004 80030404 448E4000 */ mtc1 $t6, $f8 -/* 031008 80030408 3C01800F */ lui $at, %hi(D_800ED950) -/* 03100C 8003040C D42AD950 */ ldc1 $f10, %lo(D_800ED950)($at) -/* 031010 80030410 46804421 */ cvt.d.w $f16, $f8 -/* 031014 80030414 460004A1 */ cvt.d.s $f18, $f0 -/* 031018 80030418 462A8102 */ mul.d $f4, $f16, $f10 -/* 03101C 8003041C 46249180 */ add.d $f6, $f18, $f4 -/* 031020 80030420 10000035 */ b .L800304F8 -/* 031024 80030424 46203020 */ cvt.s.d $f0, $f6 -.L80030428: -/* 031028 80030428 44824000 */ mtc1 $v0, $f8 -/* 03102C 8003042C D42AD958 */ ldc1 $f10, %lo(D_800ED958)($at) -/* 031030 80030430 46000121 */ cvt.d.s $f4, $f0 -/* 031034 80030434 46804421 */ cvt.d.w $f16, $f8 -/* 031038 80030438 462A8482 */ mul.d $f18, $f16, $f10 -/* 03103C 8003043C 46322180 */ add.d $f6, $f4, $f18 -/* 031040 80030440 1000002D */ b .L800304F8 -/* 031044 80030444 46203020 */ cvt.s.d $f0, $f6 -/* 031048 80030448 84EF00C0 */ lh $t7, 0xc0($a3) -.L8003044C: -/* 03104C 8003044C 94E30254 */ lhu $v1, 0x254($a3) -/* 031050 80030450 01E4001A */ div $zero, $t7, $a0 -/* 031054 80030454 14800002 */ bnez $a0, .L80030460 -/* 031058 80030458 00000000 */ nop -/* 03105C 8003045C 0007000D */ break 7 -.L80030460: -/* 031060 80030460 2401FFFF */ li $at, -1 -/* 031064 80030464 14810004 */ bne $a0, $at, .L80030478 -/* 031068 80030468 3C018000 */ lui $at, 0x8000 -/* 03106C 8003046C 15E10002 */ bne $t7, $at, .L80030478 -/* 031070 80030470 00000000 */ nop -/* 031074 80030474 0006000D */ break 6 -.L80030478: -/* 031078 80030478 00001012 */ mflo $v0 -/* 03107C 8003047C 0003C080 */ sll $t8, $v1, 2 -/* 031080 80030480 03001825 */ move $v1, $t8 -/* 031084 80030484 04410010 */ bgez $v0, .L800304C8 -/* 031088 80030488 3C01800F */ lui $at, %hi(D_800ED968) -/* 03108C 8003048C 3C01800F */ lui $at, %hi(D_800ED960) -/* 031090 80030490 D428D960 */ ldc1 $f8, %lo(D_800ED960)($at) -/* 031094 80030494 3C01800E */ lui $at, %hi(gKartTurnSpeedReductionTable0) -/* 031098 80030498 00380821 */ addu $at, $at, $t8 -/* 03109C 8003049C C4303670 */ lwc1 $f16, %lo(gKartTurnSpeedReductionTable0)($at) -/* 0310A0 800304A0 0002C823 */ negu $t9, $v0 -/* 0310A4 800304A4 44999000 */ mtc1 $t9, $f18 -/* 0310A8 800304A8 460082A1 */ cvt.d.s $f10, $f16 -/* 0310AC 800304AC 468091A1 */ cvt.d.w $f6, $f18 -/* 0310B0 800304B0 462A4100 */ add.d $f4, $f8, $f10 -/* 0310B4 800304B4 46000221 */ cvt.d.s $f8, $f0 -/* 0310B8 800304B8 46243402 */ mul.d $f16, $f6, $f4 -/* 0310BC 800304BC 46304280 */ add.d $f10, $f8, $f16 -/* 0310C0 800304C0 1000000D */ b .L800304F8 -/* 0310C4 800304C4 46205020 */ cvt.s.d $f0, $f10 -.L800304C8: -/* 0310C8 800304C8 D432D968 */ ldc1 $f18, %lo(D_800ED968)($at) -/* 0310CC 800304CC 3C01800E */ lui $at, %hi(gKartTurnSpeedReductionTable0) -/* 0310D0 800304D0 00230821 */ addu $at, $at, $v1 -/* 0310D4 800304D4 C4263670 */ lwc1 $f6, %lo(gKartTurnSpeedReductionTable0)($at) -/* 0310D8 800304D8 44828000 */ mtc1 $v0, $f16 -/* 0310DC 800304DC 46003121 */ cvt.d.s $f4, $f6 -/* 0310E0 800304E0 468082A1 */ cvt.d.w $f10, $f16 -/* 0310E4 800304E4 46249200 */ add.d $f8, $f18, $f4 -/* 0310E8 800304E8 460004A1 */ cvt.d.s $f18, $f0 -/* 0310EC 800304EC 46285182 */ mul.d $f6, $f10, $f8 -/* 0310F0 800304F0 46269100 */ add.d $f4, $f18, $f6 -/* 0310F4 800304F4 46202020 */ cvt.s.d $f0, $f4 -.L800304F8: -/* 0310F8 800304F8 3C032000 */ lui $v1, 0x2000 -/* 0310FC 800304FC 00A35024 */ and $t2, $a1, $v1 -/* 031100 80030500 146A0018 */ bne $v1, $t2, .L80030564 -/* 031104 80030504 00000000 */ nop -/* 031108 80030508 84EB0228 */ lh $t3, 0x228($a3) -/* 03110C 8003050C 2961000A */ slti $at, $t3, 0xa -/* 031110 80030510 10200014 */ beqz $at, .L80030564 -/* 031114 80030514 00000000 */ nop -/* 031118 80030518 0441000A */ bgez $v0, .L80030544 -/* 03111C 8003051C 00026023 */ negu $t4, $v0 -/* 031120 80030520 448C8000 */ mtc1 $t4, $f16 -/* 031124 80030524 3C01800F */ lui $at, %hi(D_800ED970) -/* 031128 80030528 D428D970 */ ldc1 $f8, %lo(D_800ED970)($at) -/* 03112C 8003052C 468082A1 */ cvt.d.w $f10, $f16 -/* 031130 80030530 460001A1 */ cvt.d.s $f6, $f0 -/* 031134 80030534 46285482 */ mul.d $f18, $f10, $f8 -/* 031138 80030538 46323100 */ add.d $f4, $f6, $f18 -/* 03113C 8003053C 10000009 */ b .L80030564 -/* 031140 80030540 46202020 */ cvt.s.d $f0, $f4 -.L80030544: -/* 031144 80030544 44828000 */ mtc1 $v0, $f16 -/* 031148 80030548 3C01800F */ lui $at, %hi(D_800ED978) -/* 03114C 8003054C D428D978 */ ldc1 $f8, %lo(D_800ED978)($at) -/* 031150 80030550 468082A1 */ cvt.d.w $f10, $f16 -/* 031154 80030554 460004A1 */ cvt.d.s $f18, $f0 -/* 031158 80030558 46285182 */ mul.d $f6, $f10, $f8 -/* 03115C 8003055C 46269100 */ add.d $f4, $f18, $f6 -/* 031160 80030560 46202020 */ cvt.s.d $f0, $f4 -.L80030564: -/* 031164 80030564 15280006 */ bne $t1, $t0, .L80030580 -/* 031168 80030568 3C01BFD0 */ li $at, 0xBFD00000 # -1.625000 -/* 03116C 8003056C 44815800 */ mtc1 $at, $f11 -/* 031170 80030570 44805000 */ mtc1 $zero, $f10 -/* 031174 80030574 46000421 */ cvt.d.s $f16, $f0 -/* 031178 80030578 462A8200 */ add.d $f8, $f16, $f10 -/* 03117C 8003057C 46204020 */ cvt.s.d $f0, $f8 -.L80030580: -/* 031180 80030580 94E200DE */ lhu $v0, 0xde($a3) -.L80030584: -/* 031184 80030584 24010001 */ li $at, 1 -/* 031188 80030588 83AF002F */ lb $t7, 0x2f($sp) -/* 03118C 8003058C 304D0001 */ andi $t5, $v0, 1 -/* 031190 80030590 15A10007 */ bne $t5, $at, .L800305B0 -/* 031194 80030594 304E0002 */ andi $t6, $v0, 2 -/* 031198 80030598 3C01800F */ lui $at, %hi(D_800ED980) -/* 03119C 8003059C D426D980 */ ldc1 $f6, %lo(D_800ED980)($at) -/* 0311A0 800305A0 460004A1 */ cvt.d.s $f18, $f0 -/* 0311A4 800305A4 46269100 */ add.d $f4, $f18, $f6 -/* 0311A8 800305A8 10000022 */ b .L80030634 -/* 0311AC 800305AC 46202020 */ cvt.s.d $f0, $f4 -.L800305B0: -/* 0311B0 800305B0 24010002 */ li $at, 2 -/* 0311B4 800305B4 15C10006 */ bne $t6, $at, .L800305D0 -/* 0311B8 800305B8 000FC080 */ sll $t8, $t7, 2 -/* 0311BC 800305BC 3C01800F */ lui $at, %hi(D_800ED988) -/* 0311C0 800305C0 D42AD988 */ ldc1 $f10, %lo(D_800ED988)($at) -/* 0311C4 800305C4 46000421 */ cvt.d.s $f16, $f0 -/* 0311C8 800305C8 462A8200 */ add.d $f8, $f16, $f10 -/* 0311CC 800305CC 46204020 */ cvt.s.d $f0, $f8 -.L800305D0: -/* 0311D0 800305D0 3C01400C */ li $at, 0x400C0000 # 2.187500 -/* 0311D4 800305D4 44816800 */ mtc1 $at, $f13 -/* 0311D8 800305D8 3C018016 */ lui $at, %hi(D_801652A0) -/* 0311DC 800305DC 00380821 */ addu $at, $at, $t8 -/* 0311E0 800305E0 C42252A0 */ lwc1 $f2, %lo(D_801652A0)($at) -/* 0311E4 800305E4 C4F201D8 */ lwc1 $f18, 0x1d8($a3) -/* 0311E8 800305E8 44806000 */ mtc1 $zero, $f12 -/* 0311EC 800305EC 3C01800F */ lui $at, %hi(D_800ED990) -/* 0311F0 800305F0 46121181 */ sub.s $f6, $f2, $f18 -/* 0311F4 800305F4 46003121 */ cvt.d.s $f4, $f6 -/* 0311F8 800305F8 4624603E */ c.le.d $f12, $f4 -/* 0311FC 800305FC 00000000 */ nop -/* 031200 80030600 45010008 */ bc1t .L80030624 -/* 031204 80030604 00000000 */ nop -/* 031208 80030608 C4F001F0 */ lwc1 $f16, 0x1f0($a3) -/* 03120C 8003060C 46101281 */ sub.s $f10, $f2, $f16 -/* 031210 80030610 46005221 */ cvt.d.s $f8, $f10 -/* 031214 80030614 4628603E */ c.le.d $f12, $f8 -/* 031218 80030618 00000000 */ nop -/* 03121C 8003061C 45000005 */ bc1f .L80030634 -/* 031220 80030620 00000000 */ nop -.L80030624: -/* 031224 80030624 D426D990 */ ldc1 $f6, %lo(D_800ED990)($at) -/* 031228 80030628 460004A1 */ cvt.d.s $f18, $f0 -/* 03122C 8003062C 46269100 */ add.d $f4, $f18, $f6 -/* 031230 80030630 46202020 */ cvt.s.d $f0, $f4 -.L80030634: -/* 031234 80030634 10C00013 */ beqz $a2, .L80030684 -/* 031238 80030638 24E400A0 */ addiu $a0, $a3, 0xa0 -/* 03123C 8003063C C4F0008C */ lwc1 $f16, 0x8c($a3) -/* 031240 80030640 3C01800F */ lui $at, %hi(D_800ED998) -/* 031244 80030644 D428D998 */ ldc1 $f8, %lo(D_800ED998)($at) -/* 031248 80030648 460082A1 */ cvt.d.s $f10, $f16 -/* 03124C 8003064C 3C063E19 */ lui $a2, (0x3E19999A >> 16) # lui $a2, 0x3e19 -/* 031250 80030650 46285482 */ mul.d $f18, $f10, $f8 -/* 031254 80030654 34C6999A */ ori $a2, (0x3E19999A & 0xFFFF) # ori $a2, $a2, 0x999a -/* 031258 80030658 E7A00024 */ swc1 $f0, 0x24($sp) -/* 03125C 8003065C AFA70028 */ sw $a3, 0x28($sp) -/* 031260 80030660 24E400A0 */ addiu $a0, $a3, 0xa0 -/* 031264 80030664 462091A0 */ cvt.s.d $f6, $f18 -/* 031268 80030668 44053000 */ mfc1 $a1, $f6 -/* 03126C 8003066C 0C008973 */ jal move_f32_towards -/* 031270 80030670 00000000 */ nop -/* 031274 80030674 44807000 */ mtc1 $zero, $f14 -/* 031278 80030678 8FA70028 */ lw $a3, 0x28($sp) -/* 03127C 8003067C 1000002A */ b .L80030728 -/* 031280 80030680 C7A00024 */ lwc1 $f0, 0x24($sp) -.L80030684: -/* 031284 80030684 44057000 */ mfc1 $a1, $f14 -/* 031288 80030688 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc -/* 03128C 8003068C 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 031290 80030690 AFA70028 */ sw $a3, 0x28($sp) -/* 031294 80030694 0C008973 */ jal move_f32_towards -/* 031298 80030698 E7A00024 */ swc1 $f0, 0x24($sp) -/* 03129C 8003069C 8FA70028 */ lw $a3, 0x28($sp) -/* 0312A0 800306A0 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 0312A4 800306A4 44807000 */ mtc1 $zero, $f14 -/* 0312A8 800306A8 10000020 */ b .L8003072C -/* 0312AC 800306AC 94E20000 */ lhu $v0, ($a3) -/* 0312B0 800306B0 84F900C4 */ lh $t9, 0xc4($a3) -.L800306B4: -/* 0312B4 800306B4 240400B6 */ li $a0, 182 -/* 0312B8 800306B8 E4EE00A0 */ swc1 $f14, 0xa0($a3) -/* 0312BC 800306BC 0324001A */ div $zero, $t9, $a0 -/* 0312C0 800306C0 00005012 */ mflo $t2 -/* 0312C4 800306C4 E4EE00E8 */ swc1 $f14, 0xe8($a3) -/* 0312C8 800306C8 14800002 */ bnez $a0, .L800306D4 -/* 0312CC 800306CC 00000000 */ nop -/* 0312D0 800306D0 0007000D */ break 7 -.L800306D4: -/* 0312D4 800306D4 2401FFFF */ li $at, -1 -/* 0312D8 800306D8 14810004 */ bne $a0, $at, .L800306EC -/* 0312DC 800306DC 3C018000 */ lui $at, 0x8000 -/* 0312E0 800306E0 17210002 */ bne $t9, $at, .L800306EC -/* 0312E4 800306E4 00000000 */ nop -/* 0312E8 800306E8 0006000D */ break 6 -.L800306EC: -/* 0312EC 800306EC 3C01800F */ lui $at, %hi(D_800ED9A0) -/* 0312F0 800306F0 0543000E */ bgezl $t2, .L8003072C -/* 0312F4 800306F4 94E20000 */ lhu $v0, ($a3) -/* 0312F8 800306F8 D430D9A0 */ ldc1 $f16, %lo(D_800ED9A0)($at) -/* 0312FC 800306FC 46007121 */ cvt.d.s $f4, $f14 -/* 031300 80030700 8CEB00BC */ lw $t3, 0xbc($a3) -/* 031304 80030704 46302280 */ add.d $f10, $f4, $f16 -/* 031308 80030708 3C01800F */ lui $at, %hi(D_800ED9A8) -/* 03130C 8003070C 000B6040 */ sll $t4, $t3, 1 -/* 031310 80030710 05810005 */ bgez $t4, .L80030728 -/* 031314 80030714 46205020 */ cvt.s.d $f0, $f10 -/* 031318 80030718 D432D9A8 */ ldc1 $f18, %lo(D_800ED9A8)($at) -/* 03131C 8003071C 46000221 */ cvt.d.s $f8, $f0 -/* 031320 80030720 46324180 */ add.d $f6, $f8, $f18 -/* 031324 80030724 46203020 */ cvt.s.d $f0, $f6 -.L80030728: -/* 031328 80030728 94E20000 */ lhu $v0, ($a3) -.L8003072C: -/* 03132C 8003072C 24014000 */ li $at, 16384 -/* 031330 80030730 304D4000 */ andi $t5, $v0, 0x4000 -/* 031334 80030734 11A1001F */ beq $t5, $at, .L800307B4 -/* 031338 80030738 01A01025 */ move $v0, $t5 -/* 03133C 8003073C 8CEE00BC */ lw $t6, 0xbc($a3) -/* 031340 80030740 3C020020 */ lui $v0, 0x20 -/* 031344 80030744 24E400E8 */ addiu $a0, $a3, 0xe8 -/* 031348 80030748 01C27824 */ and $t7, $t6, $v0 -/* 03134C 8003074C 144F000E */ bne $v0, $t7, .L80030788 -/* 031350 80030750 3C063DCC */ lui $a2, 0x3dcc -/* 031354 80030754 24E400E8 */ addiu $a0, $a3, 0xe8 -/* 031358 80030758 3C0543BE */ lui $a1, 0x43be -/* 03135C 8003075C 3C063F00 */ lui $a2, (0x3F00CCCD >> 16) # lui $a2, 0x3f00 -/* 031360 80030760 AFA70028 */ sw $a3, 0x28($sp) -/* 031364 80030764 0C008973 */ jal move_f32_towards -/* 031368 80030768 E7A00024 */ swc1 $f0, 0x24($sp) -/* 03136C 8003076C 8FA70028 */ lw $a3, 0x28($sp) -/* 031370 80030770 44807000 */ mtc1 $zero, $f14 -/* 031374 80030774 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 031378 80030778 94E20000 */ lhu $v0, ($a3) -/* 03137C 8003077C 30584000 */ andi $t8, $v0, 0x4000 -/* 031380 80030780 1000000C */ b .L800307B4 -/* 031384 80030784 03001025 */ move $v0, $t8 -.L80030788: -/* 031388 80030788 44057000 */ mfc1 $a1, $f14 -/* 03138C 8003078C 34C6CCCD */ ori $a2, (0x3F00CCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 031390 80030790 AFA70028 */ sw $a3, 0x28($sp) -/* 031394 80030794 0C008973 */ jal move_f32_towards -/* 031398 80030798 E7A00024 */ swc1 $f0, 0x24($sp) -/* 03139C 8003079C 8FA70028 */ lw $a3, 0x28($sp) -/* 0313A0 800307A0 44807000 */ mtc1 $zero, $f14 -/* 0313A4 800307A4 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 0313A8 800307A8 94E20000 */ lhu $v0, ($a3) -/* 0313AC 800307AC 30594000 */ andi $t9, $v0, 0x4000 -/* 0313B0 800307B0 03201025 */ move $v0, $t9 -.L800307B4: -/* 0313B4 800307B4 24014000 */ li $at, 16384 -/* 0313B8 800307B8 54410032 */ bnel $v0, $at, .L80030884 -/* 0313BC 800307BC 94EE0254 */ lhu $t6, 0x254($a3) -/* 0313C0 800307C0 8CE500BC */ lw $a1, 0xbc($a3) -/* 0313C4 800307C4 24010100 */ li $at, 256 -/* 0313C8 800307C8 24E400E8 */ addiu $a0, $a3, 0xe8 -/* 0313CC 800307CC 30AA0100 */ andi $t2, $a1, 0x100 -/* 0313D0 800307D0 1541000C */ bne $t2, $at, .L80030804 -/* 0313D4 800307D4 30AB0010 */ andi $t3, $a1, 0x10 -/* 0313D8 800307D8 24010010 */ li $at, 16 -/* 0313DC 800307DC 11610009 */ beq $t3, $at, .L80030804 -/* 0313E0 800307E0 3C054411 */ lui $a1, 0x4411 -/* 0313E4 800307E4 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c -/* 0313E8 800307E8 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 0313EC 800307EC AFA70028 */ sw $a3, 0x28($sp) -/* 0313F0 800307F0 0C008973 */ jal move_f32_towards -/* 0313F4 800307F4 E7A00024 */ swc1 $f0, 0x24($sp) -/* 0313F8 800307F8 8FA70028 */ lw $a3, 0x28($sp) -/* 0313FC 800307FC 10000009 */ b .L80030824 -/* 031400 80030800 C7A00024 */ lwc1 $f0, 0x24($sp) -.L80030804: -/* 031404 80030804 44057000 */ mfc1 $a1, $f14 -/* 031408 80030808 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23 -/* 03140C 8003080C 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 031410 80030810 AFA70028 */ sw $a3, 0x28($sp) -/* 031414 80030814 0C008973 */ jal move_f32_towards -/* 031418 80030818 E7A00024 */ swc1 $f0, 0x24($sp) -/* 03141C 8003081C 8FA70028 */ lw $a3, 0x28($sp) -/* 031420 80030820 C7A00024 */ lwc1 $f0, 0x24($sp) -.L80030824: -/* 031424 80030824 8CEC00BC */ lw $t4, 0xbc($a3) -/* 031428 80030828 3C010020 */ lui $at, 0x20 -/* 03142C 8003082C 24E400E4 */ addiu $a0, $a3, 0xe4 -/* 031430 80030830 01816824 */ and $t5, $t4, $at -/* 031434 80030834 15A1000B */ bne $t5, $at, .L80030864 -/* 031438 80030838 24050000 */ li $a1, 0 -/* 03143C 8003083C 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23 -/* 031440 80030840 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 031444 80030844 24E400E4 */ addiu $a0, $a3, 0xe4 -/* 031448 80030848 3C054411 */ lui $a1, 0x4411 -/* 03144C 8003084C AFA70028 */ sw $a3, 0x28($sp) -/* 031450 80030850 0C008973 */ jal move_f32_towards -/* 031454 80030854 E7A00024 */ swc1 $f0, 0x24($sp) -/* 031458 80030858 8FA70028 */ lw $a3, 0x28($sp) -/* 03145C 8003085C 10000008 */ b .L80030880 -/* 031460 80030860 C7A00024 */ lwc1 $f0, 0x24($sp) -.L80030864: -/* 031464 80030864 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23 -/* 031468 80030868 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 03146C 8003086C AFA70028 */ sw $a3, 0x28($sp) -/* 031470 80030870 0C008973 */ jal move_f32_towards -/* 031474 80030874 E7A00024 */ swc1 $f0, 0x24($sp) -/* 031478 80030878 8FA70028 */ lw $a3, 0x28($sp) -/* 03147C 8003087C C7A00024 */ lwc1 $f0, 0x24($sp) -.L80030880: -/* 031480 80030880 94EE0254 */ lhu $t6, 0x254($a3) -.L80030884: -/* 031484 80030884 3C01800E */ lui $at, %hi(gKartTurnSpeedReductionTable1) -/* 031488 80030888 44050000 */ mfc1 $a1, $f0 -/* 03148C 8003088C 000E7880 */ sll $t7, $t6, 2 -/* 031490 80030890 002F0821 */ addu $at, $at, $t7 -/* 031494 80030894 C4243690 */ lwc1 $f4, %lo(gKartTurnSpeedReductionTable1)($at) -/* 031498 80030898 3C01800F */ lui $at, %hi(D_800ED9B0) -/* 03149C 8003089C D42AD9B0 */ ldc1 $f10, %lo(D_800ED9B0)($at) -/* 0314A0 800308A0 46002421 */ cvt.d.s $f16, $f4 -/* 0314A4 800308A4 AFA70028 */ sw $a3, 0x28($sp) -/* 0314A8 800308A8 462A8200 */ add.d $f8, $f16, $f10 -/* 0314AC 800308AC 24E40104 */ addiu $a0, $a3, 0x104 -/* 0314B0 800308B0 462044A0 */ cvt.s.d $f18, $f8 -/* 0314B4 800308B4 44069000 */ mfc1 $a2, $f18 -/* 0314B8 800308B8 0C008973 */ jal move_f32_towards -/* 0314BC 800308BC 00000000 */ nop -/* 0314C0 800308C0 8FA70028 */ lw $a3, 0x28($sp) -/* 0314C4 800308C4 C4E0008C */ lwc1 $f0, 0x8c($a3) -/* 0314C8 800308C8 C4E600E8 */ lwc1 $f6, 0xe8($a3) -/* 0314CC 800308CC C4EC0080 */ lwc1 $f12, 0x80($a3) -/* 0314D0 800308D0 C4EA00E4 */ lwc1 $f10, 0xe4($a3) -/* 0314D4 800308D4 46060100 */ add.s $f4, $f0, $f6 -/* 0314D8 800308D8 C4F200A0 */ lwc1 $f18, 0xa0($a3) -/* 0314DC 800308DC 44803000 */ mtc1 $zero, $f6 -/* 0314E0 800308E0 460C2400 */ add.s $f16, $f4, $f12 -/* 0314E4 800308E4 460A8200 */ add.s $f8, $f16, $f10 -/* 0314E8 800308E8 46124081 */ sub.s $f2, $f8, $f18 -/* 0314EC 800308EC 4606103C */ c.lt.s $f2, $f6 -/* 0314F0 800308F0 00000000 */ nop -/* 0314F4 800308F4 45020004 */ bc1fl .L80030908 -/* 0314F8 800308F8 84E200CA */ lh $v0, 0xca($a3) -/* 0314FC 800308FC 44801000 */ mtc1 $zero, $f2 -/* 031500 80030900 00000000 */ nop -/* 031504 80030904 84E200CA */ lh $v0, 0xca($a3) -.L80030908: -/* 031508 80030908 24010002 */ li $at, 2 -/* 03150C 8003090C 30580002 */ andi $t8, $v0, 2 -/* 031510 80030910 13010008 */ beq $t8, $at, .L80030934 -/* 031514 80030914 30590008 */ andi $t9, $v0, 8 -/* 031518 80030918 24010008 */ li $at, 8 -/* 03151C 8003091C 53210006 */ beql $t9, $at, .L80030938 -/* 031520 80030920 3C013F80 */ lui $at, 0x3f80 -/* 031524 80030924 94EA0000 */ lhu $t2, ($a3) -/* 031528 80030928 24012000 */ li $at, 8192 -/* 03152C 8003092C 314B2000 */ andi $t3, $t2, 0x2000 -/* 031530 80030930 15610007 */ bne $t3, $at, .L80030950 -.L80030934: -/* 031534 80030934 3C013F80 */ li $at, 0x3F800000 # 1.000000 -.L80030938: -/* 031538 80030938 44812000 */ mtc1 $at, $f4 -/* 03153C 8003093C C4F00104 */ lwc1 $f16, 0x104($a3) -/* 031540 80030940 46102281 */ sub.s $f10, $f4, $f16 -/* 031544 80030944 46025002 */ mul.s $f0, $f10, $f2 -/* 031548 80030948 10000037 */ b .L80030A28 -/* 03154C 8003094C 8FBF0014 */ lw $ra, 0x14($sp) -.L80030950: -/* 031550 80030950 8CE500BC */ lw $a1, 0xbc($a3) -/* 031554 80030954 24010080 */ li $at, 128 -/* 031558 80030958 30AC0080 */ andi $t4, $a1, 0x80 -/* 03155C 8003095C 1181000A */ beq $t4, $at, .L80030988 -/* 031560 80030960 30AD0040 */ andi $t5, $a1, 0x40 -/* 031564 80030964 24010040 */ li $at, 64 -/* 031568 80030968 11A10007 */ beq $t5, $at, .L80030988 -/* 03156C 8003096C 3C020100 */ lui $v0, 0x100 -/* 031570 80030970 00A27024 */ and $t6, $a1, $v0 -/* 031574 80030974 104E0004 */ beq $v0, $t6, .L80030988 -/* 031578 80030978 3C020200 */ lui $v0, 0x200 -/* 03157C 8003097C 00A27824 */ and $t7, $a1, $v0 -/* 031580 80030980 144F0008 */ bne $v0, $t7, .L800309A4 -/* 031584 80030984 30B82000 */ andi $t8, $a1, 0x2000 -.L80030988: -/* 031588 80030988 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 03158C 8003098C 44814000 */ mtc1 $at, $f8 -/* 031590 80030990 C4F20104 */ lwc1 $f18, 0x104($a3) -/* 031594 80030994 46124181 */ sub.s $f6, $f8, $f18 -/* 031598 80030998 46023002 */ mul.s $f0, $f6, $f2 -/* 03159C 8003099C 10000022 */ b .L80030A28 -/* 0315A0 800309A0 8FBF0014 */ lw $ra, 0x14($sp) -.L800309A4: -/* 0315A4 800309A4 24012000 */ li $at, 8192 -/* 0315A8 800309A8 13010007 */ beq $t8, $at, .L800309C8 -/* 0315AC 800309AC 3C020010 */ lui $v0, 0x10 -/* 0315B0 800309B0 00A2C824 */ and $t9, $a1, $v0 -/* 0315B4 800309B4 10590004 */ beq $v0, $t9, .L800309C8 -/* 0315B8 800309B8 30AA0004 */ andi $t2, $a1, 4 -/* 0315BC 800309BC 24010004 */ li $at, 4 -/* 0315C0 800309C0 1541000C */ bne $t2, $at, .L800309F4 -/* 0315C4 800309C4 00E02025 */ move $a0, $a3 -.L800309C8: -/* 0315C8 800309C8 46006100 */ add.s $f4, $f12, $f0 -/* 0315CC 800309CC 00E02025 */ move $a0, $a3 -/* 0315D0 800309D0 AFA70028 */ sw $a3, 0x28($sp) -/* 0315D4 800309D4 44052000 */ mfc1 $a1, $f4 -/* 0315D8 800309D8 0C00BFA1 */ jal func_8002FE84 -/* 0315DC 800309DC 00000000 */ nop -/* 0315E0 800309E0 8FA70028 */ lw $a3, 0x28($sp) -/* 0315E4 800309E4 C4F00080 */ lwc1 $f16, 0x80($a3) -/* 0315E8 800309E8 C4EA008C */ lwc1 $f10, 0x8c($a3) -/* 0315EC 800309EC 1000000D */ b .L80030A24 -/* 0315F0 800309F0 460A8000 */ add.s $f0, $f16, $f10 -.L800309F4: -/* 0315F4 800309F4 44051000 */ mfc1 $a1, $f2 -/* 0315F8 800309F8 AFA70028 */ sw $a3, 0x28($sp) -/* 0315FC 800309FC 0C00BFA1 */ jal func_8002FE84 -/* 031600 80030A00 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 031604 80030A04 8FA70028 */ lw $a3, 0x28($sp) -/* 031608 80030A08 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 03160C 80030A0C 44814000 */ mtc1 $at, $f8 -/* 031610 80030A10 C4F20104 */ lwc1 $f18, 0x104($a3) -/* 031614 80030A14 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 031618 80030A18 46124181 */ sub.s $f6, $f8, $f18 -/* 03161C 80030A1C 46023002 */ mul.s $f0, $f6, $f2 -/* 031620 80030A20 00000000 */ nop -.L80030A24: -/* 031624 80030A24 8FBF0014 */ lw $ra, 0x14($sp) -.L80030A28: -/* 031628 80030A28 27BD0028 */ addiu $sp, $sp, 0x28 -/* 03162C 80030A2C 03E00008 */ jr $ra -/* 031630 80030A30 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80030A34.s b/asm/non_matchings/code_80027D00/func_80030A34.s deleted file mode 100644 index 1bb7ec60d..000000000 --- a/asm/non_matchings/code_80027D00/func_80030A34.s +++ /dev/null @@ -1,140 +0,0 @@ -glabel func_80030A34 -/* 031634 80030A34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 031638 80030A38 AFBF0014 */ sw $ra, 0x14($sp) -/* 03163C 80030A3C 848200CA */ lh $v0, 0xca($a0) -/* 031640 80030A40 24010002 */ li $at, 2 -/* 031644 80030A44 00802825 */ move $a1, $a0 -/* 031648 80030A48 304E0002 */ andi $t6, $v0, 2 -/* 03164C 80030A4C 11C10075 */ beq $t6, $at, .L80030C24 -/* 031650 80030A50 304F0008 */ andi $t7, $v0, 8 -/* 031654 80030A54 24010008 */ li $at, 8 -/* 031658 80030A58 11E10072 */ beq $t7, $at, .L80030C24 -/* 03165C 80030A5C 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 031660 80030A60 44813000 */ mtc1 $at, $f6 -/* 031664 80030A64 C4840094 */ lwc1 $f4, 0x94($a0) -/* 031668 80030A68 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 03166C 80030A6C 44815000 */ mtc1 $at, $f10 -/* 031670 80030A70 46062203 */ div.s $f8, $f4, $f6 -/* 031674 80030A74 3C014100 */ li $at, 0x41000000 # 8.000000 -/* 031678 80030A78 44819000 */ mtc1 $at, $f18 -/* 03167C 80030A7C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 031680 80030A80 460A4402 */ mul.s $f16, $f8, $f10 -/* 031684 80030A84 4610903E */ c.le.s $f18, $f16 -/* 031688 80030A88 00000000 */ nop -/* 03168C 80030A8C 45020030 */ bc1fl .L80030B50 -/* 031690 80030A90 2404000A */ li $a0, 10 -/* 031694 80030A94 C4840DC0 */ lwc1 $f4, 0xdc0($a0) -/* 031698 80030A98 44813000 */ mtc1 $at, $f6 -/* 03169C 80030A9C 00000000 */ nop -/* 0316A0 80030AA0 4606203C */ c.lt.s $f4, $f6 -/* 0316A4 80030AA4 00000000 */ nop -/* 0316A8 80030AA8 45020029 */ bc1fl .L80030B50 -/* 0316AC 80030AAC 2404000A */ li $a0, 10 -/* 0316B0 80030AB0 948200F8 */ lhu $v0, 0xf8($a0) -/* 0316B4 80030AB4 24010001 */ li $at, 1 -/* 0316B8 80030AB8 2404000A */ li $a0, 10 -/* 0316BC 80030ABC 10410007 */ beq $v0, $at, .L80030ADC -/* 0316C0 80030AC0 2401000E */ li $at, 14 -/* 0316C4 80030AC4 10410016 */ beq $v0, $at, .L80030B20 -/* 0316C8 80030AC8 24010010 */ li $at, 16 -/* 0316CC 80030ACC 10410014 */ beq $v0, $at, .L80030B20 -/* 0316D0 80030AD0 00000000 */ nop -/* 0316D4 80030AD4 10000018 */ b .L80030B38 -/* 0316D8 80030AD8 3C01800F */ lui $at, %hi(D_800ED9C8) # 0x800f -.L80030ADC: -/* 0316DC 80030ADC 0C0ADF8D */ jal random_int -/* 0316E0 80030AE0 AFA50018 */ sw $a1, 0x18($sp) -/* 0316E4 80030AE4 24010008 */ li $at, 8 -/* 0316E8 80030AE8 10410007 */ beq $v0, $at, .L80030B08 -/* 0316EC 80030AEC 8FA50018 */ lw $a1, 0x18($sp) -/* 0316F0 80030AF0 3C01800F */ lui $at, %hi(D_800ED9B8) # $at, 0x800f -/* 0316F4 80030AF4 C420D9B8 */ lwc1 $f0, %lo(D_800ED9B8)($at) -/* 0316F8 80030AF8 3C01800F */ lui $at, %hi(D_800ED9BC) # $at, 0x800f -/* 0316FC 80030AFC 44806000 */ mtc1 $zero, $f12 -/* 031700 80030B00 10000023 */ b .L80030B90 -/* 031704 80030B04 C422D9BC */ lwc1 $f2, %lo(D_800ED9BC)($at) -.L80030B08: -/* 031708 80030B08 44806000 */ mtc1 $zero, $f12 -/* 03170C 80030B0C A4A0007A */ sh $zero, 0x7a($a1) -/* 031710 80030B10 E4AC0108 */ swc1 $f12, 0x108($a1) -/* 031714 80030B14 46006006 */ mov.s $f0, $f12 -/* 031718 80030B18 1000001D */ b .L80030B90 -/* 03171C 80030B1C 46006086 */ mov.s $f2, $f12 -.L80030B20: -/* 031720 80030B20 3C01800F */ lui $at, %hi(D_800ED9C0) # $at, 0x800f -/* 031724 80030B24 C420D9C0 */ lwc1 $f0, %lo(D_800ED9C0)($at) -/* 031728 80030B28 3C01800F */ lui $at, %hi(D_800ED9C4) # $at, 0x800f -/* 03172C 80030B2C 44806000 */ mtc1 $zero, $f12 -/* 031730 80030B30 10000017 */ b .L80030B90 -/* 031734 80030B34 C422D9C4 */ lwc1 $f2, %lo(D_800ED9C4)($at) -.L80030B38: -/* 031738 80030B38 C420D9C8 */ lwc1 $f0, %lo(D_800ED9C8)($at) -/* 03173C 80030B3C 3C01800F */ lui $at, %hi(D_800ED9CC) # $at, 0x800f -/* 031740 80030B40 44806000 */ mtc1 $zero, $f12 -/* 031744 80030B44 10000012 */ b .L80030B90 -/* 031748 80030B48 C422D9CC */ lwc1 $f2, %lo(D_800ED9CC)($at) -/* 03174C 80030B4C 2404000A */ li $a0, 10 -.L80030B50: -/* 031750 80030B50 0C0ADF8D */ jal random_int -/* 031754 80030B54 AFA50018 */ sw $a1, 0x18($sp) -/* 031758 80030B58 24010008 */ li $at, 8 -/* 03175C 80030B5C 10410007 */ beq $v0, $at, .L80030B7C -/* 031760 80030B60 8FA50018 */ lw $a1, 0x18($sp) -/* 031764 80030B64 3C01800F */ lui $at, %hi(D_800ED9D0) # $at, 0x800f -/* 031768 80030B68 C420D9D0 */ lwc1 $f0, %lo(D_800ED9D0)($at) -/* 03176C 80030B6C 3C01800F */ lui $at, %hi(D_800ED9D4) # $at, 0x800f -/* 031770 80030B70 44806000 */ mtc1 $zero, $f12 -/* 031774 80030B74 10000006 */ b .L80030B90 -/* 031778 80030B78 C422D9D4 */ lwc1 $f2, %lo(D_800ED9D4)($at) -.L80030B7C: -/* 03177C 80030B7C 44806000 */ mtc1 $zero, $f12 -/* 031780 80030B80 A4A0007A */ sh $zero, 0x7a($a1) -/* 031784 80030B84 E4AC0108 */ swc1 $f12, 0x108($a1) -/* 031788 80030B88 46006006 */ mov.s $f0, $f12 -/* 03178C 80030B8C 46006086 */ mov.s $f2, $f12 -.L80030B90: -/* 031790 80030B90 84B8007A */ lh $t8, 0x7a($a1) -/* 031794 80030B94 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 031798 80030B98 44814800 */ mtc1 $at, $f9 -/* 03179C 80030B9C 27190001 */ addiu $t9, $t8, 1 -/* 0317A0 80030BA0 A4B9007A */ sh $t9, 0x7a($a1) -/* 0317A4 80030BA4 84A2007A */ lh $v0, 0x7a($a1) -/* 0317A8 80030BA8 44804000 */ mtc1 $zero, $f8 -/* 0317AC 80030BAC 460012A1 */ cvt.d.s $f10, $f2 -/* 0317B0 80030BB0 00420019 */ multu $v0, $v0 -/* 0317B4 80030BB4 462A4402 */ mul.d $f16, $f8, $f10 -/* 0317B8 80030BB8 44824000 */ mtc1 $v0, $f8 -/* 0317BC 80030BBC 00000000 */ nop -/* 0317C0 80030BC0 468042A0 */ cvt.s.w $f10, $f8 -/* 0317C4 80030BC4 00004012 */ mflo $t0 -/* 0317C8 80030BC8 44889000 */ mtc1 $t0, $f18 -/* 0317CC 80030BCC 00000000 */ nop -/* 0317D0 80030BD0 46809121 */ cvt.d.w $f4, $f18 -/* 0317D4 80030BD4 46248182 */ mul.d $f6, $f16, $f4 -/* 0317D8 80030BD8 00000000 */ nop -/* 0317DC 80030BDC 46005482 */ mul.s $f18, $f10, $f0 -/* 0317E0 80030BE0 46009421 */ cvt.d.s $f16, $f18 -/* 0317E4 80030BE4 46268101 */ sub.d $f4, $f16, $f6 -/* 0317E8 80030BE8 46202220 */ cvt.s.d $f8, $f4 -/* 0317EC 80030BEC 10400007 */ beqz $v0, .L80030C0C -/* 0317F0 80030BF0 E4A80108 */ swc1 $f8, 0x108($a1) -/* 0317F4 80030BF4 C4AA0108 */ lwc1 $f10, 0x108($a1) -/* 0317F8 80030BF8 460C503C */ c.lt.s $f10, $f12 -/* 0317FC 80030BFC 00000000 */ nop -/* 031800 80030C00 45020003 */ bc1fl .L80030C10 -/* 031804 80030C04 C4B20108 */ lwc1 $f18, 0x108($a1) -/* 031808 80030C08 A4A0007A */ sh $zero, 0x7a($a1) -.L80030C0C: -/* 03180C 80030C0C C4B20108 */ lwc1 $f18, 0x108($a1) -.L80030C10: -/* 031810 80030C10 460C903E */ c.le.s $f18, $f12 -/* 031814 80030C14 00000000 */ nop -/* 031818 80030C18 45020003 */ bc1fl .L80030C28 -/* 03181C 80030C1C 8FBF0014 */ lw $ra, 0x14($sp) -/* 031820 80030C20 E4AC0108 */ swc1 $f12, 0x108($a1) -.L80030C24: -/* 031824 80030C24 8FBF0014 */ lw $ra, 0x14($sp) -.L80030C28: -/* 031828 80030C28 27BD0018 */ addiu $sp, $sp, 0x18 -/* 03182C 80030C2C 03E00008 */ jr $ra -/* 031830 80030C30 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_800323E4.s b/asm/non_matchings/code_80027D00/func_800323E4.s deleted file mode 100644 index e7665629f..000000000 --- a/asm/non_matchings/code_80027D00/func_800323E4.s +++ /dev/null @@ -1,219 +0,0 @@ -glabel func_800323E4 -/* 032FE4 800323E4 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e -/* 032FE8 800323E8 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) -/* 032FEC 800323EC 44806000 */ mtc1 $zero, $f12 -/* 032FF0 800323F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 032FF4 800323F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 032FF8 800323F8 148E0002 */ bne $a0, $t6, .L80032404 -/* 032FFC 800323FC 46006086 */ mov.s $f2, $f12 -/* 033000 80032400 AFA00024 */ sw $zero, 0x24($sp) -.L80032404: -/* 033004 80032404 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e -/* 033008 80032408 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) -/* 03300C 8003240C 8FA30024 */ lw $v1, 0x24($sp) -/* 033010 80032410 3C18800E */ lui $t8, %hi(gPlayerThree) # $t8, 0x800e -/* 033014 80032414 148F0002 */ bne $a0, $t7, .L80032420 -/* 033018 80032418 3C19800E */ lui $t9, %hi(gPlayerFour) # $t9, 0x800e -/* 03301C 8003241C 24030001 */ li $v1, 1 -.L80032420: -/* 033020 80032420 8F18C4E4 */ lw $t8, %lo(gPlayerThree)($t8) -/* 033024 80032424 3C08800E */ lui $t0, %hi(gPlayerFive) # $t0, 0x800e -/* 033028 80032428 3C09800E */ lui $t1, %hi(gPlayerSix) # $t1, 0x800e -/* 03302C 8003242C 14980002 */ bne $a0, $t8, .L80032438 -/* 033030 80032430 3C0A800E */ lui $t2, %hi(gPlayerSeven) # $t2, 0x800e -/* 033034 80032434 24030002 */ li $v1, 2 -.L80032438: -/* 033038 80032438 8F39C4E8 */ lw $t9, %lo(gPlayerFour)($t9) -/* 03303C 8003243C 3C0B800E */ lui $t3, %hi(gPlayerEight) # $t3, 0x800e -/* 033040 80032440 14990002 */ bne $a0, $t9, .L8003244C -/* 033044 80032444 00000000 */ nop -/* 033048 80032448 24030003 */ li $v1, 3 -.L8003244C: -/* 03304C 8003244C 8D08C4EC */ lw $t0, %lo(gPlayerFive)($t0) -/* 033050 80032450 14880002 */ bne $a0, $t0, .L8003245C -/* 033054 80032454 00000000 */ nop -/* 033058 80032458 24030004 */ li $v1, 4 -.L8003245C: -/* 03305C 8003245C 8D29C4F0 */ lw $t1, %lo(gPlayerSix)($t1) -/* 033060 80032460 14890002 */ bne $a0, $t1, .L8003246C -/* 033064 80032464 00000000 */ nop -/* 033068 80032468 24030005 */ li $v1, 5 -.L8003246C: -/* 03306C 8003246C 8D4AC4F4 */ lw $t2, %lo(gPlayerSeven)($t2) -/* 033070 80032470 3C053F80 */ lui $a1, 0x3f80 -/* 033074 80032474 148A0002 */ bne $a0, $t2, .L80032480 -/* 033078 80032478 00000000 */ nop -/* 03307C 8003247C 24030006 */ li $v1, 6 -.L80032480: -/* 033080 80032480 8D6BC4F8 */ lw $t3, %lo(gPlayerEight)($t3) -/* 033084 80032484 548B0003 */ bnel $a0, $t3, .L80032494 -/* 033088 80032488 8C8C00BC */ lw $t4, 0xbc($a0) -/* 03308C 8003248C 24030007 */ li $v1, 7 -/* 033090 80032490 8C8C00BC */ lw $t4, 0xbc($a0) -.L80032494: -/* 033094 80032494 24010020 */ li $at, 32 -/* 033098 80032498 358D0001 */ ori $t5, $t4, 1 -/* 03309C 8003249C 31AF0020 */ andi $t7, $t5, 0x20 -/* 0330A0 800324A0 15E10007 */ bne $t7, $at, .L800324C0 -/* 0330A4 800324A4 AC8D00BC */ sw $t5, 0xbc($a0) -/* 0330A8 800324A8 0C00C7D2 */ jal func_80031F48 -/* 0330AC 800324AC AFA40028 */ sw $a0, 0x28($sp) -/* 0330B0 800324B0 8FA40028 */ lw $a0, 0x28($sp) -/* 0330B4 800324B4 44806000 */ mtc1 $zero, $f12 -/* 0330B8 800324B8 1000008D */ b .L800326F0 -/* 0330BC 800324BC E48C020C */ swc1 $f12, 0x20c($a0) -.L800324C0: -/* 0330C0 800324C0 908201EC */ lbu $v0, 0x1ec($a0) -/* 0330C4 800324C4 2841000F */ slti $at, $v0, 0xf -/* 0330C8 800324C8 5020000B */ beql $at, $zero, .L800324F8 -/* 0330CC 800324CC 908201D4 */ lbu $v0, 0x1d4($a0) -/* 0330D0 800324D0 94980254 */ lhu $t8, 0x254($a0) -/* 0330D4 800324D4 3C08800E */ lui $t0, %hi(D_800E3210) -/* 0330D8 800324D8 00024880 */ sll $t1, $v0, 2 -/* 0330DC 800324DC 0018C880 */ sll $t9, $t8, 2 -/* 0330E0 800324E0 01194021 */ addu $t0, $t0, $t9 -/* 0330E4 800324E4 8D083210 */ lw $t0, %lo(D_800E3210)($t0) -/* 0330E8 800324E8 01095021 */ addu $t2, $t0, $t1 -/* 0330EC 800324EC C5440000 */ lwc1 $f4, ($t2) -/* 0330F0 800324F0 46046080 */ add.s $f2, $f12, $f4 -/* 0330F4 800324F4 908201D4 */ lbu $v0, 0x1d4($a0) -.L800324F8: -/* 0330F8 800324F8 0003C080 */ sll $t8, $v1, 2 -/* 0330FC 800324FC 3C198016 */ lui $t9, %hi(D_80165520) # 0x8016 -/* 033100 80032500 2841000F */ slti $at, $v0, 0xf -/* 033104 80032504 1020000A */ beqz $at, .L80032530 -/* 033108 80032508 0338C821 */ addu $t9, $t9, $t8 -/* 03310C 8003250C 948B0254 */ lhu $t3, 0x254($a0) -/* 033110 80032510 3C0D800E */ lui $t5, %hi(D_800E3210) -/* 033114 80032514 00027080 */ sll $t6, $v0, 2 -/* 033118 80032518 000B6080 */ sll $t4, $t3, 2 -/* 03311C 8003251C 01AC6821 */ addu $t5, $t5, $t4 -/* 033120 80032520 8DAD3210 */ lw $t5, %lo(D_800E3210)($t5) -/* 033124 80032524 01AE7821 */ addu $t7, $t5, $t6 -/* 033128 80032528 C5E60000 */ lwc1 $f6, ($t7) -/* 03312C 8003252C 46061080 */ add.s $f2, $f2, $f6 -.L80032530: -/* 033130 80032530 C488022C */ lwc1 $f8, 0x22c($a0) -/* 033134 80032534 C48A0094 */ lwc1 $f10, 0x94($a0) -/* 033138 80032538 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 03313C 8003253C 460A4001 */ sub.s $f0, $f8, $f10 -/* 033140 80032540 460C003E */ c.le.s $f0, $f12 -/* 033144 80032544 00000000 */ nop -/* 033148 80032548 45020007 */ bc1fl .L80032568 -/* 03314C 8003254C 44816000 */ mtc1 $at, $f12 -/* 033150 80032550 E48C020C */ swc1 $f12, 0x20c($a0) -/* 033154 80032554 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 033158 80032558 44816000 */ mtc1 $at, $f12 -/* 03315C 8003255C 1000000F */ b .L8003259C -/* 033160 80032560 00000000 */ nop -/* 033164 80032564 44816000 */ mtc1 $at, $f12 -.L80032568: -/* 033168 80032568 C490020C */ lwc1 $f16, 0x20c($a0) -/* 03316C 8003256C 3C01800F */ lui $at, %hi(D_800EDB00) -/* 033170 80032570 D424DB00 */ ldc1 $f4, %lo(D_800EDB00)($at) -/* 033174 80032574 460084A1 */ cvt.d.s $f18, $f16 -/* 033178 80032578 46249180 */ add.d $f6, $f18, $f4 -/* 03317C 8003257C 46203220 */ cvt.s.d $f8, $f6 -/* 033180 80032580 E488020C */ swc1 $f8, 0x20c($a0) -/* 033184 80032584 C48A020C */ lwc1 $f10, 0x20c($a0) -/* 033188 80032588 460A603E */ c.le.s $f12, $f10 -/* 03318C 8003258C 00000000 */ nop -/* 033190 80032590 45000002 */ bc1f .L8003259C -/* 033194 80032594 00000000 */ nop -/* 033198 80032598 E48C020C */ swc1 $f12, 0x20c($a0) -.L8003259C: -/* 03319C 8003259C 8F395520 */ lw $t9, %lo(D_80165520)($t9) # x5520($t9) -/* 0331A0 800325A0 24010001 */ li $at, 1 -/* 0331A4 800325A4 5721001D */ bnel $t9, $at, .L8003261C -/* 0331A8 800325A8 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 0331AC 800325AC C490020C */ lwc1 $f16, 0x20c($a0) -/* 0331B0 800325B0 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0331B4 800325B4 4610603E */ c.le.s $f12, $f16 -/* 0331B8 800325B8 00000000 */ nop -/* 0331BC 800325BC 4502000D */ bc1fl .L800325F4 -/* 0331C0 800325C0 44815000 */ mtc1 $at, $f10 -/* 0331C4 800325C4 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0331C8 800325C8 44819000 */ mtc1 $at, $f18 -/* 0331CC 800325CC 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 0331D0 800325D0 44813000 */ mtc1 $at, $f6 -/* 0331D4 800325D4 46029101 */ sub.s $f4, $f18, $f2 -/* 0331D8 800325D8 46062202 */ mul.s $f8, $f4, $f6 -/* 0331DC 800325DC 44054000 */ mfc1 $a1, $f8 -/* 0331E0 800325E0 0C00C7D2 */ jal func_80031F48 -/* 0331E4 800325E4 00000000 */ nop -/* 0331E8 800325E8 10000042 */ b .L800326F4 -/* 0331EC 800325EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 0331F0 800325F0 44815000 */ mtc1 $at, $f10 -.L800325F4: -/* 0331F4 800325F4 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 0331F8 800325F8 44819000 */ mtc1 $at, $f18 -/* 0331FC 800325FC 46025401 */ sub.s $f16, $f10, $f2 -/* 033200 80032600 46128102 */ mul.s $f4, $f16, $f18 -/* 033204 80032604 44052000 */ mfc1 $a1, $f4 -/* 033208 80032608 0C00C7D2 */ jal func_80031F48 -/* 03320C 8003260C 00000000 */ nop -/* 033210 80032610 10000038 */ b .L800326F4 -/* 033214 80032614 8FBF0014 */ lw $ra, 0x14($sp) -/* 033218 80032618 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -.L8003261C: -/* 03321C 8003261C 44813000 */ mtc1 $at, $f6 -/* 033220 80032620 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 033224 80032624 44815000 */ mtc1 $at, $f10 -/* 033228 80032628 C4880094 */ lwc1 $f8, 0x94($a0) -/* 03322C 8003262C 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 033230 80032630 44819000 */ mtc1 $at, $f18 -/* 033234 80032634 460A4403 */ div.s $f16, $f8, $f10 -/* 033238 80032638 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 03323C 8003263C 46128102 */ mul.s $f4, $f16, $f18 -/* 033240 80032640 4606203E */ c.le.s $f4, $f6 -/* 033244 80032644 00000000 */ nop -/* 033248 80032648 45020010 */ bc1fl .L8003268C -/* 03324C 8003264C C484020C */ lwc1 $f4, 0x20c($a0) -/* 033250 80032650 44814000 */ mtc1 $at, $f8 -/* 033254 80032654 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 033258 80032658 44818000 */ mtc1 $at, $f16 -/* 03325C 8003265C 46024281 */ sub.s $f10, $f8, $f2 -/* 033260 80032660 AFA40028 */ sw $a0, 0x28($sp) -/* 033264 80032664 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 033268 80032668 46105482 */ mul.s $f18, $f10, $f16 -/* 03326C 8003266C 44059000 */ mfc1 $a1, $f18 -/* 033270 80032670 0C00C7D2 */ jal func_80031F48 -/* 033274 80032674 00000000 */ nop -/* 033278 80032678 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 03327C 8003267C 44816000 */ mtc1 $at, $f12 -/* 033280 80032680 8FA40028 */ lw $a0, 0x28($sp) -/* 033284 80032684 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 033288 80032688 C484020C */ lwc1 $f4, 0x20c($a0) -.L8003268C: -/* 03328C 8003268C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 033290 80032690 44813000 */ mtc1 $at, $f6 -/* 033294 80032694 4604603E */ c.le.s $f12, $f4 -/* 033298 80032698 3C01800F */ lui $at, %hi(D_800EDB08) -/* 03329C 8003269C 46023001 */ sub.s $f0, $f6, $f2 -/* 0332A0 800326A0 4500000C */ bc1f .L800326D4 -/* 0332A4 800326A4 00000000 */ nop -/* 0332A8 800326A8 3C014004 */ li $at, 0x40040000 # 2.062500 -/* 0332AC 800326AC 44815800 */ mtc1 $at, $f11 -/* 0332B0 800326B0 44805000 */ mtc1 $zero, $f10 -/* 0332B4 800326B4 46000221 */ cvt.d.s $f8, $f0 -/* 0332B8 800326B8 462A4402 */ mul.d $f16, $f8, $f10 -/* 0332BC 800326BC 462084A0 */ cvt.s.d $f18, $f16 -/* 0332C0 800326C0 44059000 */ mfc1 $a1, $f18 -/* 0332C4 800326C4 0C00C7D2 */ jal func_80031F48 -/* 0332C8 800326C8 00000000 */ nop -/* 0332CC 800326CC 10000009 */ b .L800326F4 -/* 0332D0 800326D0 8FBF0014 */ lw $ra, 0x14($sp) -.L800326D4: -/* 0332D4 800326D4 D424DB08 */ ldc1 $f4, %lo(D_800EDB08)($at) -/* 0332D8 800326D8 460001A1 */ cvt.d.s $f6, $f0 -/* 0332DC 800326DC 46243202 */ mul.d $f8, $f6, $f4 -/* 0332E0 800326E0 462042A0 */ cvt.s.d $f10, $f8 -/* 0332E4 800326E4 44055000 */ mfc1 $a1, $f10 -/* 0332E8 800326E8 0C00C7D2 */ jal func_80031F48 -/* 0332EC 800326EC 00000000 */ nop -.L800326F0: -/* 0332F0 800326F0 8FBF0014 */ lw $ra, 0x14($sp) -.L800326F4: -/* 0332F4 800326F4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0332F8 800326F8 03E00008 */ jr $ra -/* 0332FC 800326FC 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80032700.s b/asm/non_matchings/code_80027D00/func_80032700.s deleted file mode 100644 index 717e1a15d..000000000 --- a/asm/non_matchings/code_80027D00/func_80032700.s +++ /dev/null @@ -1,379 +0,0 @@ -glabel func_80032700 -/* 033300 80032700 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 033304 80032704 AFBF0014 */ sw $ra, 0x14($sp) -/* 033308 80032708 0C009F40 */ jal get_player_index_for_player -/* 03330C 8003270C AFA40018 */ sw $a0, 0x18($sp) -/* 033310 80032710 8FA40018 */ lw $a0, 0x18($sp) -/* 033314 80032714 44803800 */ mtc1 $zero, $f7 -/* 033318 80032718 44803000 */ mtc1 $zero, $f6 -/* 03331C 8003271C C484009C */ lwc1 $f4, 0x9c($a0) -/* 033320 80032720 46002021 */ cvt.d.s $f0, $f4 -/* 033324 80032724 4620303E */ c.le.d $f6, $f0 -/* 033328 80032728 00000000 */ nop -/* 03332C 8003272C 4502001C */ bc1fl .L800327A0 -/* 033330 80032730 3C014008 */ lui $at, 0x4008 -/* 033334 80032734 C4880214 */ lwc1 $f8, 0x214($a0) -/* 033338 80032738 3C01800F */ lui $at, %hi(D_800EDB10) -/* 03333C 8003273C D430DB10 */ ldc1 $f16, %lo(D_800EDB10)($at) -/* 033340 80032740 460042A1 */ cvt.d.s $f10, $f8 -/* 033344 80032744 46305482 */ mul.d $f18, $f10, $f16 -/* 033348 80032748 4632003C */ c.lt.d $f0, $f18 -/* 03334C 8003274C 00000000 */ nop -/* 033350 80032750 45020013 */ bc1fl .L800327A0 -/* 033354 80032754 3C014008 */ lui $at, 0x4008 -/* 033358 80032758 948E0254 */ lhu $t6, 0x254($a0) -/* 03335C 8003275C 3C03800E */ lui $v1, %hi(gKartAccelerationTables) # $v1, 0x800e -/* 033360 80032760 24633010 */ addiu $v1, %lo(gKartAccelerationTables) # addiu $v1, $v1, 0x3010 -/* 033364 80032764 000E7880 */ sll $t7, $t6, 2 -/* 033368 80032768 006FC021 */ addu $t8, $v1, $t7 -/* 03336C 8003276C 8F190000 */ lw $t9, ($t8) -/* 033370 80032770 3C014008 */ li $at, 0x40080000 # 2.125000 -/* 033374 80032774 44816800 */ mtc1 $at, $f13 -/* 033378 80032778 C7240000 */ lwc1 $f4, ($t9) -/* 03337C 8003277C 44806000 */ mtc1 $zero, $f12 -/* 033380 80032780 460021A1 */ cvt.d.s $f6, $f4 -/* 033384 80032784 462C3202 */ mul.d $f8, $f6, $f12 -/* 033388 80032788 46280280 */ add.d $f10, $f0, $f8 -/* 03338C 8003278C 46205420 */ cvt.s.d $f16, $f10 -/* 033390 80032790 E490009C */ swc1 $f16, 0x9c($a0) -/* 033394 80032794 C492009C */ lwc1 $f18, 0x9c($a0) -/* 033398 80032798 46009021 */ cvt.d.s $f0, $f18 -/* 03339C 8003279C 3C014008 */ li $at, 0x40080000 # 2.125000 -.L800327A0: -/* 0333A0 800327A0 C4840214 */ lwc1 $f4, 0x214($a0) -/* 0333A4 800327A4 44816800 */ mtc1 $at, $f13 -/* 0333A8 800327A8 3C01800F */ lui $at, %hi(D_800EDB18) -/* 0333AC 800327AC D426DB18 */ ldc1 $f6, %lo(D_800EDB18)($at) -/* 0333B0 800327B0 460020A1 */ cvt.d.s $f2, $f4 -/* 0333B4 800327B4 3C03800E */ lui $v1, %hi(gKartAccelerationTables) # $v1, 0x800e -/* 0333B8 800327B8 46261202 */ mul.d $f8, $f2, $f6 -/* 0333BC 800327BC 44806000 */ mtc1 $zero, $f12 -/* 0333C0 800327C0 24633010 */ addiu $v1, %lo(gKartAccelerationTables) # addiu $v1, $v1, 0x3010 -/* 0333C4 800327C4 3C01800F */ lui $at, %hi(D_800EDB20) -/* 0333C8 800327C8 4620403E */ c.le.d $f8, $f0 -/* 0333CC 800327CC 00000000 */ nop -/* 0333D0 800327D0 45000015 */ bc1f .L80032828 -/* 0333D4 800327D4 00000000 */ nop -/* 0333D8 800327D8 D42ADB20 */ ldc1 $f10, %lo(D_800EDB20)($at) -/* 0333DC 800327DC 462A1402 */ mul.d $f16, $f2, $f10 -/* 0333E0 800327E0 4630003C */ c.lt.d $f0, $f16 -/* 0333E4 800327E4 00000000 */ nop -/* 0333E8 800327E8 4500000F */ bc1f .L80032828 -/* 0333EC 800327EC 00000000 */ nop -/* 0333F0 800327F0 94880254 */ lhu $t0, 0x254($a0) -/* 0333F4 800327F4 00084880 */ sll $t1, $t0, 2 -/* 0333F8 800327F8 00695021 */ addu $t2, $v1, $t1 -/* 0333FC 800327FC 8D4B0000 */ lw $t3, ($t2) -/* 033400 80032800 C5720004 */ lwc1 $f18, 4($t3) -/* 033404 80032804 46009121 */ cvt.d.s $f4, $f18 -/* 033408 80032808 C4920214 */ lwc1 $f18, 0x214($a0) -/* 03340C 8003280C 462C2182 */ mul.d $f6, $f4, $f12 -/* 033410 80032810 460090A1 */ cvt.d.s $f2, $f18 -/* 033414 80032814 46260200 */ add.d $f8, $f0, $f6 -/* 033418 80032818 462042A0 */ cvt.s.d $f10, $f8 -/* 03341C 8003281C E48A009C */ swc1 $f10, 0x9c($a0) -/* 033420 80032820 C490009C */ lwc1 $f16, 0x9c($a0) -/* 033424 80032824 46008021 */ cvt.d.s $f0, $f16 -.L80032828: -/* 033428 80032828 3C01800F */ lui $at, %hi(D_800EDB28) -/* 03342C 8003282C D424DB28 */ ldc1 $f4, %lo(D_800EDB28)($at) -/* 033430 80032830 3C01800F */ lui $at, %hi(D_800EDB30) -/* 033434 80032834 46241182 */ mul.d $f6, $f2, $f4 -/* 033438 80032838 4620303E */ c.le.d $f6, $f0 -/* 03343C 8003283C 00000000 */ nop -/* 033440 80032840 45000015 */ bc1f .L80032898 -/* 033444 80032844 00000000 */ nop -/* 033448 80032848 D428DB30 */ ldc1 $f8, %lo(D_800EDB30)($at) -/* 03344C 8003284C 46281282 */ mul.d $f10, $f2, $f8 -/* 033450 80032850 462A003C */ c.lt.d $f0, $f10 -/* 033454 80032854 00000000 */ nop -/* 033458 80032858 4500000F */ bc1f .L80032898 -/* 03345C 8003285C 00000000 */ nop -/* 033460 80032860 948C0254 */ lhu $t4, 0x254($a0) -/* 033464 80032864 000C6880 */ sll $t5, $t4, 2 -/* 033468 80032868 006D7021 */ addu $t6, $v1, $t5 -/* 03346C 8003286C 8DCF0000 */ lw $t7, ($t6) -/* 033470 80032870 C5F00008 */ lwc1 $f16, 8($t7) -/* 033474 80032874 460084A1 */ cvt.d.s $f18, $f16 -/* 033478 80032878 C4900214 */ lwc1 $f16, 0x214($a0) -/* 03347C 8003287C 462C9102 */ mul.d $f4, $f18, $f12 -/* 033480 80032880 460080A1 */ cvt.d.s $f2, $f16 -/* 033484 80032884 46240180 */ add.d $f6, $f0, $f4 -/* 033488 80032888 46203220 */ cvt.s.d $f8, $f6 -/* 03348C 8003288C E488009C */ swc1 $f8, 0x9c($a0) -/* 033490 80032890 C48A009C */ lwc1 $f10, 0x9c($a0) -/* 033494 80032894 46005021 */ cvt.d.s $f0, $f10 -.L80032898: -/* 033498 80032898 3C01800F */ lui $at, %hi(D_800EDB38) -/* 03349C 8003289C D432DB38 */ ldc1 $f18, %lo(D_800EDB38)($at) -/* 0334A0 800328A0 3C01800F */ lui $at, %hi(D_800EDB40) -/* 0334A4 800328A4 46321102 */ mul.d $f4, $f2, $f18 -/* 0334A8 800328A8 4620203E */ c.le.d $f4, $f0 -/* 0334AC 800328AC 00000000 */ nop -/* 0334B0 800328B0 45000015 */ bc1f .L80032908 -/* 0334B4 800328B4 00000000 */ nop -/* 0334B8 800328B8 D426DB40 */ ldc1 $f6, %lo(D_800EDB40)($at) -/* 0334BC 800328BC 46261202 */ mul.d $f8, $f2, $f6 -/* 0334C0 800328C0 4628003C */ c.lt.d $f0, $f8 -/* 0334C4 800328C4 00000000 */ nop -/* 0334C8 800328C8 4500000F */ bc1f .L80032908 -/* 0334CC 800328CC 00000000 */ nop -/* 0334D0 800328D0 94980254 */ lhu $t8, 0x254($a0) -/* 0334D4 800328D4 0018C880 */ sll $t9, $t8, 2 -/* 0334D8 800328D8 00794021 */ addu $t0, $v1, $t9 -/* 0334DC 800328DC 8D090000 */ lw $t1, ($t0) -/* 0334E0 800328E0 C52A000C */ lwc1 $f10, 0xc($t1) -/* 0334E4 800328E4 46005421 */ cvt.d.s $f16, $f10 -/* 0334E8 800328E8 C48A0214 */ lwc1 $f10, 0x214($a0) -/* 0334EC 800328EC 462C8482 */ mul.d $f18, $f16, $f12 -/* 0334F0 800328F0 460050A1 */ cvt.d.s $f2, $f10 -/* 0334F4 800328F4 46320100 */ add.d $f4, $f0, $f18 -/* 0334F8 800328F8 462021A0 */ cvt.s.d $f6, $f4 -/* 0334FC 800328FC E486009C */ swc1 $f6, 0x9c($a0) -/* 033500 80032900 C488009C */ lwc1 $f8, 0x9c($a0) -/* 033504 80032904 46004021 */ cvt.d.s $f0, $f8 -.L80032908: -/* 033508 80032908 3C01800F */ lui $at, %hi(D_800EDB48) -/* 03350C 8003290C D430DB48 */ ldc1 $f16, %lo(D_800EDB48)($at) -/* 033510 80032910 3C013FE0 */ lui $at, 0x3fe0 -/* 033514 80032914 46301482 */ mul.d $f18, $f2, $f16 -/* 033518 80032918 4620903E */ c.le.d $f18, $f0 -/* 03351C 8003291C 00000000 */ nop -/* 033520 80032920 45020018 */ bc1fl .L80032984 -/* 033524 80032924 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 033528 80032928 44812800 */ mtc1 $at, $f5 -/* 03352C 8003292C 44802000 */ mtc1 $zero, $f4 -/* 033530 80032930 00000000 */ nop -/* 033534 80032934 46241182 */ mul.d $f6, $f2, $f4 -/* 033538 80032938 4626003C */ c.lt.d $f0, $f6 -/* 03353C 8003293C 00000000 */ nop -/* 033540 80032940 45020010 */ bc1fl .L80032984 -/* 033544 80032944 3C013FE0 */ lui $at, 0x3fe0 -/* 033548 80032948 948A0254 */ lhu $t2, 0x254($a0) -/* 03354C 8003294C 000A5880 */ sll $t3, $t2, 2 -/* 033550 80032950 006B6021 */ addu $t4, $v1, $t3 -/* 033554 80032954 8D8D0000 */ lw $t5, ($t4) -/* 033558 80032958 C5A80010 */ lwc1 $f8, 0x10($t5) -/* 03355C 8003295C 460042A1 */ cvt.d.s $f10, $f8 -/* 033560 80032960 C4880214 */ lwc1 $f8, 0x214($a0) -/* 033564 80032964 462C5402 */ mul.d $f16, $f10, $f12 -/* 033568 80032968 460040A1 */ cvt.d.s $f2, $f8 -/* 03356C 8003296C 46300480 */ add.d $f18, $f0, $f16 -/* 033570 80032970 46209120 */ cvt.s.d $f4, $f18 -/* 033574 80032974 E484009C */ swc1 $f4, 0x9c($a0) -/* 033578 80032978 C486009C */ lwc1 $f6, 0x9c($a0) -/* 03357C 8003297C 46003021 */ cvt.d.s $f0, $f6 -/* 033580 80032980 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -.L80032984: -/* 033584 80032984 44815800 */ mtc1 $at, $f11 -/* 033588 80032988 44805000 */ mtc1 $zero, $f10 -/* 03358C 8003298C 3C01800F */ lui $at, %hi(D_800EDB50) -/* 033590 80032990 462A1402 */ mul.d $f16, $f2, $f10 -/* 033594 80032994 4620803E */ c.le.d $f16, $f0 -/* 033598 80032998 00000000 */ nop -/* 03359C 8003299C 45000015 */ bc1f .L800329F4 -/* 0335A0 800329A0 00000000 */ nop -/* 0335A4 800329A4 D432DB50 */ ldc1 $f18, %lo(D_800EDB50)($at) -/* 0335A8 800329A8 46321102 */ mul.d $f4, $f2, $f18 -/* 0335AC 800329AC 4624003C */ c.lt.d $f0, $f4 -/* 0335B0 800329B0 00000000 */ nop -/* 0335B4 800329B4 4500000F */ bc1f .L800329F4 -/* 0335B8 800329B8 00000000 */ nop -/* 0335BC 800329BC 948E0254 */ lhu $t6, 0x254($a0) -/* 0335C0 800329C0 000E7880 */ sll $t7, $t6, 2 -/* 0335C4 800329C4 006FC021 */ addu $t8, $v1, $t7 -/* 0335C8 800329C8 8F190000 */ lw $t9, ($t8) -/* 0335CC 800329CC C7260014 */ lwc1 $f6, 0x14($t9) -/* 0335D0 800329D0 46003221 */ cvt.d.s $f8, $f6 -/* 0335D4 800329D4 C4860214 */ lwc1 $f6, 0x214($a0) -/* 0335D8 800329D8 462C4282 */ mul.d $f10, $f8, $f12 -/* 0335DC 800329DC 460030A1 */ cvt.d.s $f2, $f6 -/* 0335E0 800329E0 462A0400 */ add.d $f16, $f0, $f10 -/* 0335E4 800329E4 462084A0 */ cvt.s.d $f18, $f16 -/* 0335E8 800329E8 E492009C */ swc1 $f18, 0x9c($a0) -/* 0335EC 800329EC C484009C */ lwc1 $f4, 0x9c($a0) -/* 0335F0 800329F0 46002021 */ cvt.d.s $f0, $f4 -.L800329F4: -/* 0335F4 800329F4 3C01800F */ lui $at, %hi(D_800EDB58) -/* 0335F8 800329F8 D428DB58 */ ldc1 $f8, %lo(D_800EDB58)($at) -/* 0335FC 800329FC 3C01800F */ lui $at, %hi(D_800EDB60) -/* 033600 80032A00 46281282 */ mul.d $f10, $f2, $f8 -/* 033604 80032A04 4620503E */ c.le.d $f10, $f0 -/* 033608 80032A08 00000000 */ nop -/* 03360C 80032A0C 45020019 */ bc1fl .L80032A74 -/* 033610 80032A10 3C014004 */ lui $at, 0x4004 # 2.0625 -/* 033614 80032A14 D430DB60 */ ldc1 $f16, %lo(D_800EDB60)($at) -/* 033618 80032A18 46301482 */ mul.d $f18, $f2, $f16 -/* 03361C 80032A1C 4632003C */ c.lt.d $f0, $f18 -/* 033620 80032A20 00000000 */ nop -/* 033624 80032A24 45020013 */ bc1fl .L80032A74 -/* 033628 80032A28 3C014004 */ lui $at, 0x4004 # 2.0625 -/* 03362C 80032A2C 94880254 */ lhu $t0, 0x254($a0) -/* 033630 80032A30 3C014004 */ li $at, 0x40040000 # 2.062500 -/* 033634 80032A34 44816800 */ mtc1 $at, $f13 -/* 033638 80032A38 00084880 */ sll $t1, $t0, 2 -/* 03363C 80032A3C 00695021 */ addu $t2, $v1, $t1 -/* 033640 80032A40 8D4B0000 */ lw $t3, ($t2) -/* 033644 80032A44 44806000 */ mtc1 $zero, $f12 -/* 033648 80032A48 C5640018 */ lwc1 $f4, 0x18($t3) -/* 03364C 80032A4C 460021A1 */ cvt.d.s $f6, $f4 -/* 033650 80032A50 C4840214 */ lwc1 $f4, 0x214($a0) -/* 033654 80032A54 462C3202 */ mul.d $f8, $f6, $f12 -/* 033658 80032A58 460020A1 */ cvt.d.s $f2, $f4 -/* 03365C 80032A5C 46280280 */ add.d $f10, $f0, $f8 -/* 033660 80032A60 46205420 */ cvt.s.d $f16, $f10 -/* 033664 80032A64 E490009C */ swc1 $f16, 0x9c($a0) -/* 033668 80032A68 C492009C */ lwc1 $f18, 0x9c($a0) -/* 03366C 80032A6C 46009021 */ cvt.d.s $f0, $f18 -/* 033670 80032A70 3C014004 */ li $at, 0x40040000 # 2.062500 -.L80032A74: -/* 033674 80032A74 44816800 */ mtc1 $at, $f13 -/* 033678 80032A78 3C01800F */ lui $at, %hi(D_800EDB68) -/* 03367C 80032A7C D426DB68 */ ldc1 $f6, %lo(D_800EDB68)($at) -/* 033680 80032A80 44806000 */ mtc1 $zero, $f12 -/* 033684 80032A84 3C01800F */ lui $at, %hi(D_800EDB70) -/* 033688 80032A88 46261202 */ mul.d $f8, $f2, $f6 -/* 03368C 80032A8C 4620403E */ c.le.d $f8, $f0 -/* 033690 80032A90 00000000 */ nop -/* 033694 80032A94 45000015 */ bc1f .L80032AEC -/* 033698 80032A98 00000000 */ nop -/* 03369C 80032A9C D42ADB70 */ ldc1 $f10, %lo(D_800EDB70)($at) -/* 0336A0 80032AA0 462A1402 */ mul.d $f16, $f2, $f10 -/* 0336A4 80032AA4 4630003C */ c.lt.d $f0, $f16 -/* 0336A8 80032AA8 00000000 */ nop -/* 0336AC 80032AAC 4500000F */ bc1f .L80032AEC -/* 0336B0 80032AB0 00000000 */ nop -/* 0336B4 80032AB4 948C0254 */ lhu $t4, 0x254($a0) -/* 0336B8 80032AB8 000C6880 */ sll $t5, $t4, 2 -/* 0336BC 80032ABC 006D7021 */ addu $t6, $v1, $t5 -/* 0336C0 80032AC0 8DCF0000 */ lw $t7, ($t6) -/* 0336C4 80032AC4 C5F2001C */ lwc1 $f18, 0x1c($t7) -/* 0336C8 80032AC8 46009121 */ cvt.d.s $f4, $f18 -/* 0336CC 80032ACC C4920214 */ lwc1 $f18, 0x214($a0) -/* 0336D0 80032AD0 462C2182 */ mul.d $f6, $f4, $f12 -/* 0336D4 80032AD4 460090A1 */ cvt.d.s $f2, $f18 -/* 0336D8 80032AD8 46260200 */ add.d $f8, $f0, $f6 -/* 0336DC 80032ADC 462042A0 */ cvt.s.d $f10, $f8 -/* 0336E0 80032AE0 E48A009C */ swc1 $f10, 0x9c($a0) -/* 0336E4 80032AE4 C490009C */ lwc1 $f16, 0x9c($a0) -/* 0336E8 80032AE8 46008021 */ cvt.d.s $f0, $f16 -.L80032AEC: -/* 0336EC 80032AEC 3C01800F */ lui $at, %hi(D_800EDB78) -/* 0336F0 80032AF0 D424DB78 */ ldc1 $f4, %lo(D_800EDB78)($at) -/* 0336F4 80032AF4 3C01800F */ lui $at, %hi(D_800EDB80) -/* 0336F8 80032AF8 3C0E8016 */ lui $t6, %hi(D_801656F0) # $t6, 0x8016 -/* 0336FC 80032AFC 46241182 */ mul.d $f6, $f2, $f4 -/* 033700 80032B00 3C0F8019 */ lui $t7, %hi(gRaceFrameCounter) # $t7, 0x8019 -/* 033704 80032B04 4620303E */ c.le.d $f6, $f0 -/* 033708 80032B08 00000000 */ nop -/* 03370C 80032B0C 45000015 */ bc1f .L80032B64 -/* 033710 80032B10 00000000 */ nop -/* 033714 80032B14 D428DB80 */ ldc1 $f8, %lo(D_800EDB80)($at) -/* 033718 80032B18 46281282 */ mul.d $f10, $f2, $f8 -/* 03371C 80032B1C 462A003C */ c.lt.d $f0, $f10 -/* 033720 80032B20 00000000 */ nop -/* 033724 80032B24 4500000F */ bc1f .L80032B64 -/* 033728 80032B28 00000000 */ nop -/* 03372C 80032B2C 94980254 */ lhu $t8, 0x254($a0) -/* 033730 80032B30 0018C880 */ sll $t9, $t8, 2 -/* 033734 80032B34 00794021 */ addu $t0, $v1, $t9 -/* 033738 80032B38 8D090000 */ lw $t1, ($t0) -/* 03373C 80032B3C C5300020 */ lwc1 $f16, 0x20($t1) -/* 033740 80032B40 460084A1 */ cvt.d.s $f18, $f16 -/* 033744 80032B44 C4900214 */ lwc1 $f16, 0x214($a0) -/* 033748 80032B48 462C9102 */ mul.d $f4, $f18, $f12 -/* 03374C 80032B4C 460080A1 */ cvt.d.s $f2, $f16 -/* 033750 80032B50 46240180 */ add.d $f6, $f0, $f4 -/* 033754 80032B54 46203220 */ cvt.s.d $f8, $f6 -/* 033758 80032B58 E488009C */ swc1 $f8, 0x9c($a0) -/* 03375C 80032B5C C48A009C */ lwc1 $f10, 0x9c($a0) -/* 033760 80032B60 46005021 */ cvt.d.s $f0, $f10 -.L80032B64: -/* 033764 80032B64 3C01800F */ lui $at, %hi(D_800EDB88) -/* 033768 80032B68 D432DB88 */ ldc1 $f18, %lo(D_800EDB88)($at) -/* 03376C 80032B6C 0002C080 */ sll $t8, $v0, 2 -/* 033770 80032B70 3C198016 */ lui $t9, %hi(D_801652E0) # 0x8016 -/* 033774 80032B74 46321102 */ mul.d $f4, $f2, $f18 -/* 033778 80032B78 0338C821 */ addu $t9, $t9, $t8 -/* 03377C 80032B7C 3C08800E */ lui $t0, %hi(gModeSelection) # $t0, 0x800e -/* 033780 80032B80 4620203E */ c.le.d $f4, $f0 -/* 033784 80032B84 00000000 */ nop -/* 033788 80032B88 4500000F */ bc1f .L80032BC8 -/* 03378C 80032B8C 00000000 */ nop -/* 033790 80032B90 4622003E */ c.le.d $f0, $f2 -/* 033794 80032B94 00000000 */ nop -/* 033798 80032B98 4500000B */ bc1f .L80032BC8 -/* 03379C 80032B9C 00000000 */ nop -/* 0337A0 80032BA0 948A0254 */ lhu $t2, 0x254($a0) -/* 0337A4 80032BA4 000A5880 */ sll $t3, $t2, 2 -/* 0337A8 80032BA8 006B6021 */ addu $t4, $v1, $t3 -/* 0337AC 80032BAC 8D8D0000 */ lw $t5, ($t4) -/* 0337B0 80032BB0 C5A60024 */ lwc1 $f6, 0x24($t5) -/* 0337B4 80032BB4 46003221 */ cvt.d.s $f8, $f6 -/* 0337B8 80032BB8 462C4282 */ mul.d $f10, $f8, $f12 -/* 0337BC 80032BBC 462A0400 */ add.d $f16, $f0, $f10 -/* 0337C0 80032BC0 462084A0 */ cvt.s.d $f18, $f16 -/* 0337C4 80032BC4 E492009C */ swc1 $f18, 0x9c($a0) -.L80032BC8: -/* 0337C8 80032BC8 85CE56F0 */ lh $t6, %lo(D_801656F0)($t6) -/* 0337CC 80032BCC 24050001 */ li $a1, 1 -/* 0337D0 80032BD0 54AE002B */ bnel $a1, $t6, .L80032C80 -/* 0337D4 80032BD4 C480009C */ lwc1 $f0, 0x9c($a0) -/* 0337D8 80032BD8 8D08C53C */ lw $t0, %lo(gModeSelection)($t0) -/* 0337DC 80032BDC 8DEFD3FC */ lw $t7, %lo(gRaceFrameCounter)($t7) -/* 0337E0 80032BE0 8F3952E0 */ lw $t9, %lo(D_801652E0)($t9) # 0x52e0($t9) -/* 0337E4 80032BE4 24020008 */ li $v0, 8 -/* 0337E8 80032BE8 14A80003 */ bne $a1, $t0, .L80032BF8 -/* 0337EC 80032BEC 01F91823 */ subu $v1, $t7, $t9 -/* 0337F0 80032BF0 10000001 */ b .L80032BF8 -/* 0337F4 80032BF4 24020014 */ li $v0, 20 -.L80032BF8: -/* 0337F8 80032BF8 0062082A */ slt $at, $v1, $v0 -/* 0337FC 80032BFC 1020000B */ beqz $at, .L80032C2C -/* 033800 80032C00 00000000 */ nop -/* 033804 80032C04 84890044 */ lh $t1, 0x44($a0) -/* 033808 80032C08 24010020 */ li $at, 32 -/* 03380C 80032C0C 312A0020 */ andi $t2, $t1, 0x20 -/* 033810 80032C10 11410006 */ beq $t2, $at, .L80032C2C -/* 033814 80032C14 00000000 */ nop -/* 033818 80032C18 8C8B000C */ lw $t3, 0xc($a0) -/* 03381C 80032C1C 3C030200 */ lui $v1, 0x200 -/* 033820 80032C20 01636025 */ or $t4, $t3, $v1 -/* 033824 80032C24 10000015 */ b .L80032C7C -/* 033828 80032C28 AC8C000C */ sw $t4, 0xc($a0) -.L80032C2C: -/* 03382C 80032C2C 3C01800F */ lui $at, %hi(D_800EDB90) # $at, 0x800f -/* 033830 80032C30 C428DB90 */ lwc1 $f8, %lo(D_800EDB90)($at) -/* 033834 80032C34 C4860214 */ lwc1 $f6, 0x214($a0) -/* 033838 80032C38 C484009C */ lwc1 $f4, 0x9c($a0) -/* 03383C 80032C3C 46083282 */ mul.s $f10, $f6, $f8 -/* 033840 80032C40 4604503E */ c.le.s $f10, $f4 -/* 033844 80032C44 00000000 */ nop -/* 033848 80032C48 4502000D */ bc1fl .L80032C80 -/* 03384C 80032C4C C480009C */ lwc1 $f0, 0x9c($a0) -/* 033850 80032C50 8C82000C */ lw $v0, 0xc($a0) -/* 033854 80032C54 3C030200 */ lui $v1, 0x200 -/* 033858 80032C58 3C011000 */ lui $at, 0x1000 -/* 03385C 80032C5C 00436824 */ and $t5, $v0, $v1 -/* 033860 80032C60 106D0006 */ beq $v1, $t5, .L80032C7C -/* 033864 80032C64 00417025 */ or $t6, $v0, $at -/* 033868 80032C68 3C01FDFF */ lui $at, (0xFDFFFFFF >> 16) # lui $at, 0xfdff -/* 03386C 80032C6C 3421FFFF */ ori $at, (0xFDFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 033870 80032C70 AC8E000C */ sw $t6, 0xc($a0) -/* 033874 80032C74 01C17824 */ and $t7, $t6, $at -/* 033878 80032C78 AC8F000C */ sw $t7, 0xc($a0) -.L80032C7C: -/* 03387C 80032C7C C480009C */ lwc1 $f0, 0x9c($a0) -.L80032C80: -/* 033880 80032C80 3C0141C8 */ li $at, 0x41C80000 # 25.000000 -/* 033884 80032C84 44819000 */ mtc1 $at, $f18 -/* 033888 80032C88 46000402 */ mul.s $f16, $f0, $f0 -/* 03388C 80032C8C 84990044 */ lh $t9, 0x44($a0) -/* 033890 80032C90 37280020 */ ori $t0, $t9, 0x20 -/* 033894 80032C94 A4880044 */ sh $t0, 0x44($a0) -/* 033898 80032C98 46128183 */ div.s $f6, $f16, $f18 -/* 03389C 80032C9C E4860098 */ swc1 $f6, 0x98($a0) -/* 0338A0 80032CA0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0338A4 80032CA4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0338A8 80032CA8 03E00008 */ jr $ra -/* 0338AC 80032CAC 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_800332E8.s b/asm/non_matchings/code_80027D00/func_800332E8.s deleted file mode 100644 index 02c1209aa..000000000 --- a/asm/non_matchings/code_80027D00/func_800332E8.s +++ /dev/null @@ -1,325 +0,0 @@ -glabel func_800332E8 -/* 033EE8 800332E8 3C0F8016 */ lui $t7, %hi(D_80165280) # $t7, 0x8016 -/* 033EEC 800332EC 25EF5280 */ addiu $t7, %lo(D_80165280) # addiu $t7, $t7, 0x5280 -/* 033EF0 800332F0 00057080 */ sll $t6, $a1, 2 -/* 033EF4 800332F4 01CF1021 */ addu $v0, $t6, $t7 -/* 033EF8 800332F8 C4440000 */ lwc1 $f4, ($v0) -/* 033EFC 800332FC 44803800 */ mtc1 $zero, $f7 -/* 033F00 80033300 44803000 */ mtc1 $zero, $f6 -/* 033F04 80033304 46002021 */ cvt.d.s $f0, $f4 -/* 033F08 80033308 4620303E */ c.le.d $f6, $f0 -/* 033F0C 8003330C 00000000 */ nop -/* 033F10 80033310 4500001A */ bc1f .L8003337C -/* 033F14 80033314 00000000 */ nop -/* 033F18 80033318 C4880214 */ lwc1 $f8, 0x214($a0) -/* 033F1C 8003331C 3C01800F */ lui $at, %hi(D_800EDC48) -/* 033F20 80033320 D430DC48 */ ldc1 $f16, %lo(D_800EDC48)($at) -/* 033F24 80033324 460042A1 */ cvt.d.s $f10, $f8 -/* 033F28 80033328 46305482 */ mul.d $f18, $f10, $f16 -/* 033F2C 8003332C 4632003C */ c.lt.d $f0, $f18 -/* 033F30 80033330 00000000 */ nop -/* 033F34 80033334 45000011 */ bc1f .L8003337C -/* 033F38 80033338 00000000 */ nop -/* 033F3C 8003333C 94980254 */ lhu $t8, 0x254($a0) -/* 033F40 80033340 3C03800E */ lui $v1, %hi(gKartAccelerationTables) # $v1, 0x800e -/* 033F44 80033344 24633010 */ addiu $v1, %lo(gKartAccelerationTables) # addiu $v1, $v1, 0x3010 -/* 033F48 80033348 0018C880 */ sll $t9, $t8, 2 -/* 033F4C 8003334C 00794021 */ addu $t0, $v1, $t9 -/* 033F50 80033350 8D090000 */ lw $t1, ($t0) -/* 033F54 80033354 3C01800F */ lui $at, %hi(D_800EDC50) -/* 033F58 80033358 D42CDC50 */ ldc1 $f12, %lo(D_800EDC50)($at) -/* 033F5C 8003335C C5240000 */ lwc1 $f4, ($t1) -/* 033F60 80033360 460021A1 */ cvt.d.s $f6, $f4 -/* 033F64 80033364 462C3202 */ mul.d $f8, $f6, $f12 -/* 033F68 80033368 46280280 */ add.d $f10, $f0, $f8 -/* 033F6C 8003336C 46205420 */ cvt.s.d $f16, $f10 -/* 033F70 80033370 E4500000 */ swc1 $f16, ($v0) -/* 033F74 80033374 C4520000 */ lwc1 $f18, ($v0) -/* 033F78 80033378 46009021 */ cvt.d.s $f0, $f18 -.L8003337C: -/* 033F7C 8003337C 3C01800F */ lui $at, %hi(D_800EDC58) -/* 033F80 80033380 C4840214 */ lwc1 $f4, 0x214($a0) -/* 033F84 80033384 D42CDC58 */ ldc1 $f12, %lo(D_800EDC58)($at) -/* 033F88 80033388 3C01800F */ lui $at, %hi(D_800EDC60) -/* 033F8C 8003338C D426DC60 */ ldc1 $f6, %lo(D_800EDC60)($at) -/* 033F90 80033390 460020A1 */ cvt.d.s $f2, $f4 -/* 033F94 80033394 3C03800E */ lui $v1, %hi(gKartAccelerationTables) # $v1, 0x800e -/* 033F98 80033398 46261202 */ mul.d $f8, $f2, $f6 -/* 033F9C 8003339C 24633010 */ addiu $v1, %lo(gKartAccelerationTables) # addiu $v1, $v1, 0x3010 -/* 033FA0 800333A0 3C01800F */ lui $at, %hi(D_800EDC68) -/* 033FA4 800333A4 4620403E */ c.le.d $f8, $f0 -/* 033FA8 800333A8 00000000 */ nop -/* 033FAC 800333AC 45000015 */ bc1f .L80033404 -/* 033FB0 800333B0 00000000 */ nop -/* 033FB4 800333B4 D42ADC68 */ ldc1 $f10, %lo(D_800EDC68)($at) -/* 033FB8 800333B8 462A1402 */ mul.d $f16, $f2, $f10 -/* 033FBC 800333BC 4630003C */ c.lt.d $f0, $f16 -/* 033FC0 800333C0 00000000 */ nop -/* 033FC4 800333C4 4500000F */ bc1f .L80033404 -/* 033FC8 800333C8 00000000 */ nop -/* 033FCC 800333CC 948A0254 */ lhu $t2, 0x254($a0) -/* 033FD0 800333D0 000A5880 */ sll $t3, $t2, 2 -/* 033FD4 800333D4 006B6021 */ addu $t4, $v1, $t3 -/* 033FD8 800333D8 8D8D0000 */ lw $t5, ($t4) -/* 033FDC 800333DC C5B20004 */ lwc1 $f18, 4($t5) -/* 033FE0 800333E0 46009121 */ cvt.d.s $f4, $f18 -/* 033FE4 800333E4 462C2182 */ mul.d $f6, $f4, $f12 -/* 033FE8 800333E8 46260200 */ add.d $f8, $f0, $f6 -/* 033FEC 800333EC 462042A0 */ cvt.s.d $f10, $f8 -/* 033FF0 800333F0 E44A0000 */ swc1 $f10, ($v0) -/* 033FF4 800333F4 C4920214 */ lwc1 $f18, 0x214($a0) -/* 033FF8 800333F8 C4500000 */ lwc1 $f16, ($v0) -/* 033FFC 800333FC 460090A1 */ cvt.d.s $f2, $f18 -/* 034000 80033400 46008021 */ cvt.d.s $f0, $f16 -.L80033404: -/* 034004 80033404 3C01800F */ lui $at, %hi(D_800EDC70) -/* 034008 80033408 D424DC70 */ ldc1 $f4, %lo(D_800EDC70)($at) -/* 03400C 8003340C 3C01800F */ lui $at, %hi(D_800EDC78) -/* 034010 80033410 46241182 */ mul.d $f6, $f2, $f4 -/* 034014 80033414 4620303E */ c.le.d $f6, $f0 -/* 034018 80033418 00000000 */ nop -/* 03401C 8003341C 45000015 */ bc1f .L80033474 -/* 034020 80033420 00000000 */ nop -/* 034024 80033424 D428DC78 */ ldc1 $f8, %lo(D_800EDC78)($at) -/* 034028 80033428 46281282 */ mul.d $f10, $f2, $f8 -/* 03402C 8003342C 462A003C */ c.lt.d $f0, $f10 -/* 034030 80033430 00000000 */ nop -/* 034034 80033434 4500000F */ bc1f .L80033474 -/* 034038 80033438 00000000 */ nop -/* 03403C 8003343C 948E0254 */ lhu $t6, 0x254($a0) -/* 034040 80033440 000E7880 */ sll $t7, $t6, 2 -/* 034044 80033444 006FC021 */ addu $t8, $v1, $t7 -/* 034048 80033448 8F190000 */ lw $t9, ($t8) -/* 03404C 8003344C C7300008 */ lwc1 $f16, 8($t9) -/* 034050 80033450 460084A1 */ cvt.d.s $f18, $f16 -/* 034054 80033454 462C9102 */ mul.d $f4, $f18, $f12 -/* 034058 80033458 46240180 */ add.d $f6, $f0, $f4 -/* 03405C 8003345C 46203220 */ cvt.s.d $f8, $f6 -/* 034060 80033460 E4480000 */ swc1 $f8, ($v0) -/* 034064 80033464 C4900214 */ lwc1 $f16, 0x214($a0) -/* 034068 80033468 C44A0000 */ lwc1 $f10, ($v0) -/* 03406C 8003346C 460080A1 */ cvt.d.s $f2, $f16 -/* 034070 80033470 46005021 */ cvt.d.s $f0, $f10 -.L80033474: -/* 034074 80033474 3C01800F */ lui $at, %hi(D_800EDC80) -/* 034078 80033478 D432DC80 */ ldc1 $f18, %lo(D_800EDC80)($at) -/* 03407C 8003347C 3C01800F */ lui $at, %hi(D_800EDC88) -/* 034080 80033480 46321102 */ mul.d $f4, $f2, $f18 -/* 034084 80033484 4620203E */ c.le.d $f4, $f0 -/* 034088 80033488 00000000 */ nop -/* 03408C 8003348C 45000015 */ bc1f .L800334E4 -/* 034090 80033490 00000000 */ nop -/* 034094 80033494 D426DC88 */ ldc1 $f6, %lo(D_800EDC88)($at) -/* 034098 80033498 46261202 */ mul.d $f8, $f2, $f6 -/* 03409C 8003349C 4628003C */ c.lt.d $f0, $f8 -/* 0340A0 800334A0 00000000 */ nop -/* 0340A4 800334A4 4500000F */ bc1f .L800334E4 -/* 0340A8 800334A8 00000000 */ nop -/* 0340AC 800334AC 94880254 */ lhu $t0, 0x254($a0) -/* 0340B0 800334B0 00084880 */ sll $t1, $t0, 2 -/* 0340B4 800334B4 00695021 */ addu $t2, $v1, $t1 -/* 0340B8 800334B8 8D4B0000 */ lw $t3, ($t2) -/* 0340BC 800334BC C56A000C */ lwc1 $f10, 0xc($t3) -/* 0340C0 800334C0 46005421 */ cvt.d.s $f16, $f10 -/* 0340C4 800334C4 462C8482 */ mul.d $f18, $f16, $f12 -/* 0340C8 800334C8 46320100 */ add.d $f4, $f0, $f18 -/* 0340CC 800334CC 462021A0 */ cvt.s.d $f6, $f4 -/* 0340D0 800334D0 E4460000 */ swc1 $f6, ($v0) -/* 0340D4 800334D4 C48A0214 */ lwc1 $f10, 0x214($a0) -/* 0340D8 800334D8 C4480000 */ lwc1 $f8, ($v0) -/* 0340DC 800334DC 460050A1 */ cvt.d.s $f2, $f10 -/* 0340E0 800334E0 46004021 */ cvt.d.s $f0, $f8 -.L800334E4: -/* 0340E4 800334E4 3C01800F */ lui $at, %hi(D_800EDC90) -/* 0340E8 800334E8 D430DC90 */ ldc1 $f16, %lo(D_800EDC90)($at) -/* 0340EC 800334EC 3C013FE0 */ lui $at, 0x3fe0 -/* 0340F0 800334F0 46301482 */ mul.d $f18, $f2, $f16 -/* 0340F4 800334F4 4620903E */ c.le.d $f18, $f0 -/* 0340F8 800334F8 00000000 */ nop -/* 0340FC 800334FC 45020018 */ bc1fl .L80033560 -/* 034100 80033500 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 034104 80033504 44812800 */ mtc1 $at, $f5 -/* 034108 80033508 44802000 */ mtc1 $zero, $f4 -/* 03410C 8003350C 00000000 */ nop -/* 034110 80033510 46241182 */ mul.d $f6, $f2, $f4 -/* 034114 80033514 4626003C */ c.lt.d $f0, $f6 -/* 034118 80033518 00000000 */ nop -/* 03411C 8003351C 45020010 */ bc1fl .L80033560 -/* 034120 80033520 3C013FE0 */ lui $at, 0x3fe0 -/* 034124 80033524 948C0254 */ lhu $t4, 0x254($a0) -/* 034128 80033528 000C6880 */ sll $t5, $t4, 2 -/* 03412C 8003352C 006D7021 */ addu $t6, $v1, $t5 -/* 034130 80033530 8DCF0000 */ lw $t7, ($t6) -/* 034134 80033534 C5E80010 */ lwc1 $f8, 0x10($t7) -/* 034138 80033538 460042A1 */ cvt.d.s $f10, $f8 -/* 03413C 8003353C 462C5402 */ mul.d $f16, $f10, $f12 -/* 034140 80033540 46300480 */ add.d $f18, $f0, $f16 -/* 034144 80033544 46209120 */ cvt.s.d $f4, $f18 -/* 034148 80033548 E4440000 */ swc1 $f4, ($v0) -/* 03414C 8003354C C4880214 */ lwc1 $f8, 0x214($a0) -/* 034150 80033550 C4460000 */ lwc1 $f6, ($v0) -/* 034154 80033554 460040A1 */ cvt.d.s $f2, $f8 -/* 034158 80033558 46003021 */ cvt.d.s $f0, $f6 -/* 03415C 8003355C 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -.L80033560: -/* 034160 80033560 44815800 */ mtc1 $at, $f11 -/* 034164 80033564 44805000 */ mtc1 $zero, $f10 -/* 034168 80033568 3C01800F */ lui $at, %hi(D_800EDC98) -/* 03416C 8003356C 462A1402 */ mul.d $f16, $f2, $f10 -/* 034170 80033570 4620803E */ c.le.d $f16, $f0 -/* 034174 80033574 00000000 */ nop -/* 034178 80033578 45000015 */ bc1f .L800335D0 -/* 03417C 8003357C 00000000 */ nop -/* 034180 80033580 D432DC98 */ ldc1 $f18, %lo(D_800EDC98)($at) -/* 034184 80033584 46321102 */ mul.d $f4, $f2, $f18 -/* 034188 80033588 4624003C */ c.lt.d $f0, $f4 -/* 03418C 8003358C 00000000 */ nop -/* 034190 80033590 4500000F */ bc1f .L800335D0 -/* 034194 80033594 00000000 */ nop -/* 034198 80033598 94980254 */ lhu $t8, 0x254($a0) -/* 03419C 8003359C 0018C880 */ sll $t9, $t8, 2 -/* 0341A0 800335A0 00794021 */ addu $t0, $v1, $t9 -/* 0341A4 800335A4 8D090000 */ lw $t1, ($t0) -/* 0341A8 800335A8 C5260014 */ lwc1 $f6, 0x14($t1) -/* 0341AC 800335AC 46003221 */ cvt.d.s $f8, $f6 -/* 0341B0 800335B0 462C4282 */ mul.d $f10, $f8, $f12 -/* 0341B4 800335B4 462A0400 */ add.d $f16, $f0, $f10 -/* 0341B8 800335B8 462084A0 */ cvt.s.d $f18, $f16 -/* 0341BC 800335BC E4520000 */ swc1 $f18, ($v0) -/* 0341C0 800335C0 C4860214 */ lwc1 $f6, 0x214($a0) -/* 0341C4 800335C4 C4440000 */ lwc1 $f4, ($v0) -/* 0341C8 800335C8 460030A1 */ cvt.d.s $f2, $f6 -/* 0341CC 800335CC 46002021 */ cvt.d.s $f0, $f4 -.L800335D0: -/* 0341D0 800335D0 3C01800F */ lui $at, %hi(D_800EDCA0) -/* 0341D4 800335D4 D428DCA0 */ ldc1 $f8, %lo(D_800EDCA0)($at) -/* 0341D8 800335D8 3C01800F */ lui $at, %hi(D_800EDCA8) -/* 0341DC 800335DC 46281282 */ mul.d $f10, $f2, $f8 -/* 0341E0 800335E0 4620503E */ c.le.d $f10, $f0 -/* 0341E4 800335E4 00000000 */ nop -/* 0341E8 800335E8 45000015 */ bc1f .L80033640 -/* 0341EC 800335EC 00000000 */ nop -/* 0341F0 800335F0 D430DCA8 */ ldc1 $f16, %lo(D_800EDCA8)($at) -/* 0341F4 800335F4 46301482 */ mul.d $f18, $f2, $f16 -/* 0341F8 800335F8 4632003C */ c.lt.d $f0, $f18 -/* 0341FC 800335FC 00000000 */ nop -/* 034200 80033600 4500000F */ bc1f .L80033640 -/* 034204 80033604 00000000 */ nop -/* 034208 80033608 948A0254 */ lhu $t2, 0x254($a0) -/* 03420C 8003360C 000A5880 */ sll $t3, $t2, 2 -/* 034210 80033610 006B6021 */ addu $t4, $v1, $t3 -/* 034214 80033614 8D8D0000 */ lw $t5, ($t4) -/* 034218 80033618 C5A40018 */ lwc1 $f4, 0x18($t5) -/* 03421C 8003361C 460021A1 */ cvt.d.s $f6, $f4 -/* 034220 80033620 462C3202 */ mul.d $f8, $f6, $f12 -/* 034224 80033624 46280280 */ add.d $f10, $f0, $f8 -/* 034228 80033628 46205420 */ cvt.s.d $f16, $f10 -/* 03422C 8003362C E4500000 */ swc1 $f16, ($v0) -/* 034230 80033630 C4840214 */ lwc1 $f4, 0x214($a0) -/* 034234 80033634 C4520000 */ lwc1 $f18, ($v0) -/* 034238 80033638 460020A1 */ cvt.d.s $f2, $f4 -/* 03423C 8003363C 46009021 */ cvt.d.s $f0, $f18 -.L80033640: -/* 034240 80033640 3C01800F */ lui $at, %hi(D_800EDCB0) -/* 034244 80033644 D426DCB0 */ ldc1 $f6, %lo(D_800EDCB0)($at) -/* 034248 80033648 3C01800F */ lui $at, %hi(D_800EDCB8) -/* 03424C 8003364C 46261202 */ mul.d $f8, $f2, $f6 -/* 034250 80033650 4620403E */ c.le.d $f8, $f0 -/* 034254 80033654 00000000 */ nop -/* 034258 80033658 45000017 */ bc1f .L800336B8 -/* 03425C 8003365C 00000000 */ nop -/* 034260 80033660 D42ADCB8 */ ldc1 $f10, %lo(D_800EDCB8)($at) -/* 034264 80033664 462A1402 */ mul.d $f16, $f2, $f10 -/* 034268 80033668 4630003C */ c.lt.d $f0, $f16 -/* 03426C 8003366C 00000000 */ nop -/* 034270 80033670 45000011 */ bc1f .L800336B8 -/* 034274 80033674 00000000 */ nop -/* 034278 80033678 948E0254 */ lhu $t6, 0x254($a0) -/* 03427C 8003367C 3C01800F */ lui $at, %hi(D_800EDCC0) -/* 034280 80033680 D42CDCC0 */ ldc1 $f12, %lo(D_800EDCC0)($at) -/* 034284 80033684 000E7880 */ sll $t7, $t6, 2 -/* 034288 80033688 006FC021 */ addu $t8, $v1, $t7 -/* 03428C 8003368C 8F190000 */ lw $t9, ($t8) -/* 034290 80033690 C732001C */ lwc1 $f18, 0x1c($t9) -/* 034294 80033694 46009121 */ cvt.d.s $f4, $f18 -/* 034298 80033698 462C2182 */ mul.d $f6, $f4, $f12 -/* 03429C 8003369C 46260200 */ add.d $f8, $f0, $f6 -/* 0342A0 800336A0 462042A0 */ cvt.s.d $f10, $f8 -/* 0342A4 800336A4 E44A0000 */ swc1 $f10, ($v0) -/* 0342A8 800336A8 C4920214 */ lwc1 $f18, 0x214($a0) -/* 0342AC 800336AC C4500000 */ lwc1 $f16, ($v0) -/* 0342B0 800336B0 460090A1 */ cvt.d.s $f2, $f18 -/* 0342B4 800336B4 46008021 */ cvt.d.s $f0, $f16 -.L800336B8: -/* 0342B8 800336B8 3C01800F */ lui $at, %hi(D_800EDCC8) -/* 0342BC 800336BC D42CDCC8 */ ldc1 $f12, %lo(D_800EDCC8)($at) -/* 0342C0 800336C0 3C01800F */ lui $at, %hi(D_800EDCD0) -/* 0342C4 800336C4 D424DCD0 */ ldc1 $f4, %lo(D_800EDCD0)($at) -/* 0342C8 800336C8 3C01800F */ lui $at, %hi(D_800EDCD8) -/* 0342CC 800336CC 46241182 */ mul.d $f6, $f2, $f4 -/* 0342D0 800336D0 4620303E */ c.le.d $f6, $f0 -/* 0342D4 800336D4 00000000 */ nop -/* 0342D8 800336D8 45000015 */ bc1f .L80033730 -/* 0342DC 800336DC 00000000 */ nop -/* 0342E0 800336E0 D428DCD8 */ ldc1 $f8, %lo(D_800EDCD8)($at) -/* 0342E4 800336E4 46281282 */ mul.d $f10, $f2, $f8 -/* 0342E8 800336E8 462A003C */ c.lt.d $f0, $f10 -/* 0342EC 800336EC 00000000 */ nop -/* 0342F0 800336F0 4500000F */ bc1f .L80033730 -/* 0342F4 800336F4 00000000 */ nop -/* 0342F8 800336F8 94880254 */ lhu $t0, 0x254($a0) -/* 0342FC 800336FC 00084880 */ sll $t1, $t0, 2 -/* 034300 80033700 00695021 */ addu $t2, $v1, $t1 -/* 034304 80033704 8D4B0000 */ lw $t3, ($t2) -/* 034308 80033708 C5700020 */ lwc1 $f16, 0x20($t3) -/* 03430C 8003370C 460084A1 */ cvt.d.s $f18, $f16 -/* 034310 80033710 462C9102 */ mul.d $f4, $f18, $f12 -/* 034314 80033714 46240180 */ add.d $f6, $f0, $f4 -/* 034318 80033718 46203220 */ cvt.s.d $f8, $f6 -/* 03431C 8003371C E4480000 */ swc1 $f8, ($v0) -/* 034320 80033720 C4900214 */ lwc1 $f16, 0x214($a0) -/* 034324 80033724 C44A0000 */ lwc1 $f10, ($v0) -/* 034328 80033728 460080A1 */ cvt.d.s $f2, $f16 -/* 03432C 8003372C 46005021 */ cvt.d.s $f0, $f10 -.L80033730: -/* 034330 80033730 3C01800F */ lui $at, %hi(D_800EDCE0) -/* 034334 80033734 D432DCE0 */ ldc1 $f18, %lo(D_800EDCE0)($at) -/* 034338 80033738 46321102 */ mul.d $f4, $f2, $f18 -/* 03433C 8003373C 4620203E */ c.le.d $f4, $f0 -/* 034340 80033740 00000000 */ nop -/* 034344 80033744 45020010 */ bc1fl .L80033788 -/* 034348 80033748 84980044 */ lh $t8, 0x44($a0) -/* 03434C 8003374C 4622003E */ c.le.d $f0, $f2 -/* 034350 80033750 00000000 */ nop -/* 034354 80033754 4502000C */ bc1fl .L80033788 -/* 034358 80033758 84980044 */ lh $t8, 0x44($a0) -/* 03435C 8003375C 948C0254 */ lhu $t4, 0x254($a0) -/* 034360 80033760 000C6880 */ sll $t5, $t4, 2 -/* 034364 80033764 006D7021 */ addu $t6, $v1, $t5 -/* 034368 80033768 8DCF0000 */ lw $t7, ($t6) -/* 03436C 8003376C C5E60024 */ lwc1 $f6, 0x24($t7) -/* 034370 80033770 46003221 */ cvt.d.s $f8, $f6 -/* 034374 80033774 462C4282 */ mul.d $f10, $f8, $f12 -/* 034378 80033778 462A0400 */ add.d $f16, $f0, $f10 -/* 03437C 8003377C 462084A0 */ cvt.s.d $f18, $f16 -/* 034380 80033780 E4520000 */ swc1 $f18, ($v0) -/* 034384 80033784 84980044 */ lh $t8, 0x44($a0) -.L80033788: -/* 034388 80033788 44801000 */ mtc1 $zero, $f2 -/* 03438C 8003378C 37190020 */ ori $t9, $t8, 0x20 -/* 034390 80033790 A4990044 */ sh $t9, 0x44($a0) -/* 034394 80033794 C4400000 */ lwc1 $f0, ($v0) -/* 034398 80033798 4602003C */ c.lt.s $f0, $f2 -/* 03439C 8003379C 00000000 */ nop -/* 0343A0 800337A0 45000003 */ bc1f .L800337B0 -/* 0343A4 800337A4 00000000 */ nop -/* 0343A8 800337A8 E4420000 */ swc1 $f2, ($v0) -/* 0343AC 800337AC C4400000 */ lwc1 $f0, ($v0) -.L800337B0: -/* 0343B0 800337B0 46000102 */ mul.s $f4, $f0, $f0 -/* 0343B4 800337B4 3C0141C8 */ li $at, 0x41C80000 # 25.000000 -/* 0343B8 800337B8 44813000 */ mtc1 $at, $f6 -/* 0343BC 800337BC 00000000 */ nop -/* 0343C0 800337C0 46062203 */ div.s $f8, $f4, $f6 -/* 0343C4 800337C4 03E00008 */ jr $ra -/* 0343C8 800337C8 E4880098 */ swc1 $f8, 0x98($a0) diff --git a/asm/non_matchings/code_80027D00/func_80033AE0.s b/asm/non_matchings/code_80027D00/func_80033AE0.s index 1f1efa8c0..1b067bfa4 100644 --- a/asm/non_matchings/code_80027D00/func_80033AE0.s +++ b/asm/non_matchings/code_80027D00/func_80033AE0.s @@ -1,3 +1,149 @@ +.section .data + +glabel D_800E3DF8 +.float 0.0, 0.5, 0.5, 0.5 +.float 0.5, 0.5, 0.5, 0.6 +.float 0.6, 0.6, 0.6, 0.6 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.6, 0.6, 0.6, 0.6 +.float 0.6, 0.6, 0.6, 0.6 +.float 0.6, 0.6, 0.6, 0.6 +.float 0.5, 0.5, 0.5, 0.5 +.float 0.6, 0.6, 0.6, 0.6 +.float 0.6, 0.6, 0.6, 0.6 +.float 0.6, 0.6, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.6, 0.6, 0.6, 0.6 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.7, 0.7, 0.7, 0.7 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 +.float 0.8, 0.8, 0.8, 0.8 + +.section .late_rodata + +glabel D_800EDCE8 +.double 1.2 + +glabel D_800EDCF0 +.double 1.05 + +glabel D_800EDCF8 +.float 0.9 + +glabel D_800EDCFC +.float 0.9 + +glabel D_800EDD00 +.float 0.9 + +glabel D_800EDD04 +.float 0.9 + +glabel D_800EDD08 +.float 0.9 + +glabel D_800EDD0C +.float 1.05 + +glabel D_800EDD10 +.float 1.05 + +glabel D_800EDD14 +.float 1.05 + +glabel D_800EDD18 +.float 1.05 + +glabel D_800EDD1C +.float 1.05 + +glabel D_800EDD20 +.float 1.2 + +glabel D_800EDD24 +.float 1.2 + +glabel D_800EDD28 +.float 1.2 + +glabel D_800EDD2C +.float 1.2 + +glabel D_800EDD30 +.float 1.2 + +glabel D_800EDD34 +.float 1.6 + +glabel D_800EDD38 +.float 1.6 + +glabel D_800EDD3C +.float 1.6 + +glabel D_800EDD40 +.float 1.6 + +glabel D_800EDD44 +.float 1.6 + +glabel D_800EDD48 +.float 1.9 + +glabel D_800EDD4C +.float 1.9 + +glabel D_800EDD50 +.float 1.9 + +glabel D_800EDD54 +.float 1.9 + +glabel D_800EDD58 +.float 1.9 + +glabel D_800EDD5C +.float 1.9 + +glabel D_800EDD60 +.double 0.15 + +glabel D_800EDD68 +.double 1.6 + +glabel D_800EDD70 +.double 0.9 + +glabel D_800EDD78 +.double 0.65 + +glabel D_800EDD80 +.double 1.7 + +.section .text + glabel func_80033AE0 /* 0346E0 80033AE0 27BDFD18 */ addiu $sp, $sp, -0x2e8 /* 0346E4 80033AE4 44802000 */ mtc1 $zero, $f4 diff --git a/asm/non_matchings/code_80027D00/func_8003680C.s b/asm/non_matchings/code_80027D00/func_8003680C.s deleted file mode 100644 index 03b450e1c..000000000 --- a/asm/non_matchings/code_80027D00/func_8003680C.s +++ /dev/null @@ -1,295 +0,0 @@ -glabel func_8003680C -/* 03740C 8003680C 27BDFCF8 */ addiu $sp, $sp, -0x308 -/* 037410 80036810 3C0E800E */ lui $t6, %hi(D_800E4068) # $t6, 0x800e -/* 037414 80036814 25CE4068 */ addiu $t6, %lo(D_800E4068) # addiu $t6, $t6, 0x4068 -/* 037418 80036818 AFBF0014 */ sw $ra, 0x14($sp) -/* 03741C 8003681C AFA5030C */ sw $a1, 0x30c($sp) -/* 037420 80036820 27A90044 */ addiu $t1, $sp, 0x44 -/* 037424 80036824 00803825 */ move $a3, $a0 -/* 037428 80036828 AFA00304 */ sw $zero, 0x304($sp) -/* 03742C 8003682C 25D902A0 */ addiu $t9, $t6, 0x2a0 -.L80036830: -/* 037430 80036830 8DC10000 */ lw $at, ($t6) -/* 037434 80036834 25CE000C */ addiu $t6, $t6, 0xc -/* 037438 80036838 2529000C */ addiu $t1, $t1, 0xc -/* 03743C 8003683C AD21FFF4 */ sw $at, -0xc($t1) -/* 037440 80036840 8DC1FFF8 */ lw $at, -8($t6) -/* 037444 80036844 AD21FFF8 */ sw $at, -8($t1) -/* 037448 80036848 8DC1FFFC */ lw $at, -4($t6) -/* 03744C 8003684C 15D9FFF8 */ bne $t6, $t9, .L80036830 -/* 037450 80036850 AD21FFFC */ sw $at, -4($t1) -/* 037454 80036854 3C0B800E */ lui $t3, %hi(D_800E4308) # $t3, 0x800e -/* 037458 80036858 256B4308 */ addiu $t3, %lo(D_800E4308) # addiu $t3, $t3, 0x4308 -/* 03745C 8003685C 8D610000 */ lw $at, ($t3) -/* 037460 80036860 8D780004 */ lw $t8, 4($t3) -/* 037464 80036864 27AA0024 */ addiu $t2, $sp, 0x24 -/* 037468 80036868 AD410000 */ sw $at, ($t2) -/* 03746C 8003686C AD580004 */ sw $t8, 4($t2) -/* 037470 80036870 8D78000C */ lw $t8, 0xc($t3) -/* 037474 80036874 8D610008 */ lw $at, 8($t3) -/* 037478 80036878 AD58000C */ sw $t8, 0xc($t2) -/* 03747C 8003687C AD410008 */ sw $at, 8($t2) -/* 037480 80036880 8D610010 */ lw $at, 0x10($t3) -/* 037484 80036884 8D780014 */ lw $t8, 0x14($t3) -/* 037488 80036888 AD410010 */ sw $at, 0x10($t2) -/* 03748C 8003688C AD580014 */ sw $t8, 0x14($t2) -/* 037490 80036890 8D78001C */ lw $t8, 0x1c($t3) -/* 037494 80036894 8D610018 */ lw $at, 0x18($t3) -/* 037498 80036898 AD58001C */ sw $t8, 0x1c($t2) -/* 03749C 8003689C AD410018 */ sw $at, 0x18($t2) -/* 0374A0 800368A0 8CE200BC */ lw $v0, 0xbc($a3) -/* 0374A4 800368A4 304F0080 */ andi $t7, $v0, 0x80 -/* 0374A8 800368A8 15E000E8 */ bnez $t7, .L80036C4C -/* 0374AC 800368AC 30590040 */ andi $t9, $v0, 0x40 -/* 0374B0 800368B0 172000E6 */ bnez $t9, .L80036C4C -/* 0374B4 800368B4 304E0400 */ andi $t6, $v0, 0x400 -/* 0374B8 800368B8 15C000E4 */ bnez $t6, .L80036C4C -/* 0374BC 800368BC 00024BC0 */ sll $t1, $v0, 0xf -/* 0374C0 800368C0 052000E2 */ bltz $t1, .L80036C4C -/* 0374C4 800368C4 00026B80 */ sll $t5, $v0, 0xe -/* 0374C8 800368C8 05A000E0 */ bltz $t5, .L80036C4C -/* 0374CC 800368CC 000261C0 */ sll $t4, $v0, 7 -/* 0374D0 800368D0 058000DE */ bltz $t4, .L80036C4C -/* 0374D4 800368D4 00025180 */ sll $t2, $v0, 6 -/* 0374D8 800368D8 054000DC */ bltz $t2, .L80036C4C -/* 0374DC 800368DC 00025940 */ sll $t3, $v0, 5 -/* 0374E0 800368E0 056000DA */ bltz $t3, .L80036C4C -/* 0374E4 800368E4 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 0374E8 800368E8 44811000 */ mtc1 $at, $f2 -/* 0374EC 800368EC C4E40094 */ lwc1 $f4, 0x94($a3) -/* 0374F0 800368F0 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 0374F4 800368F4 44816000 */ mtc1 $at, $f12 -/* 0374F8 800368F8 46022183 */ div.s $f6, $f4, $f2 -/* 0374FC 800368FC 3C0142DC */ li $at, 0x42DC0000 # 110.000000 -/* 037500 80036900 44815000 */ mtc1 $at, $f10 -/* 037504 80036904 3C01DFFF */ lui $at, (0xDFFFFFFF >> 16) # lui $at, 0xdfff -/* 037508 80036908 3421FFFF */ ori $at, (0xDFFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 03750C 8003690C 0041C024 */ and $t8, $v0, $at -/* 037510 80036910 330F0080 */ andi $t7, $t8, 0x80 -/* 037514 80036914 460C3202 */ mul.s $f8, $f6, $f12 -/* 037518 80036918 4608503E */ c.le.s $f10, $f8 -/* 03751C 8003691C 00000000 */ nop -/* 037520 80036920 450300CB */ bc1tl .L80036C50 -/* 037524 80036924 8FBF0014 */ lw $ra, 0x14($sp) -/* 037528 80036928 ACF800BC */ sw $t8, 0xbc($a3) -/* 03752C 8003692C 15E000C7 */ bnez $t7, .L80036C4C -/* 037530 80036930 A4E00228 */ sh $zero, 0x228($a3) -/* 037534 80036934 33190040 */ andi $t9, $t8, 0x40 -/* 037538 80036938 172000C4 */ bnez $t9, .L80036C4C -/* 03753C 8003693C 27A40304 */ addiu $a0, $sp, 0x304 -/* 037540 80036940 8CEE007C */ lw $t6, 0x7c($a3) -/* 037544 80036944 3C063EB3 */ lui $a2, (0x3EB33333 >> 16) # lui $a2, 0x3eb3 -/* 037548 80036948 34C63333 */ ori $a2, (0x3EB33333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 03754C 8003694C 000E4C03 */ sra $t1, $t6, 0x10 -/* 037550 80036950 AFA90304 */ sw $t1, 0x304($sp) -/* 037554 80036954 AFA70308 */ sw $a3, 0x308($sp) -/* 037558 80036958 0C008966 */ jal move_s32_towards -/* 03755C 8003695C 87A5030E */ lh $a1, 0x30e($sp) -/* 037560 80036960 8FAD0304 */ lw $t5, 0x304($sp) -/* 037564 80036964 8FA70308 */ lw $a3, 0x308($sp) -/* 037568 80036968 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 03756C 8003696C 000D6400 */ sll $t4, $t5, 0x10 -/* 037570 80036970 AFAC0304 */ sw $t4, 0x304($sp) -/* 037574 80036974 8CE200BC */ lw $v0, 0xbc($a3) -/* 037578 80036978 44811000 */ mtc1 $at, $f2 -/* 03757C 8003697C 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037580 80036980 44816000 */ mtc1 $at, $f12 -/* 037584 80036984 24040010 */ li $a0, 16 -/* 037588 80036988 30430010 */ andi $v1, $v0, 0x10 -/* 03758C 8003698C 14830008 */ bne $a0, $v1, .L800369B0 -/* 037590 80036990 27A80044 */ addiu $t0, $sp, 0x44 -/* 037594 80036994 000C5403 */ sra $t2, $t4, 0x10 -/* 037598 80036998 24010005 */ li $at, 5 -/* 03759C 8003699C 0141001A */ div $zero, $t2, $at -/* 0375A0 800369A0 00005812 */ mflo $t3 -/* 0375A4 800369A4 448B8000 */ mtc1 $t3, $f16 -/* 0375A8 800369A8 1000000D */ b .L800369E0 -/* 0375AC 800369AC 46808020 */ cvt.s.w $f0, $f16 -.L800369B0: -/* 0375B0 800369B0 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 0375B4 800369B4 44812000 */ mtc1 $at, $f4 -/* 0375B8 800369B8 C4F2009C */ lwc1 $f18, 0x9c($a3) -/* 0375BC 800369BC 8FB80304 */ lw $t8, 0x304($sp) -/* 0375C0 800369C0 3C014100 */ li $at, 0x41000000 # 8.000000 -/* 0375C4 800369C4 46049183 */ div.s $f6, $f18, $f4 -/* 0375C8 800369C8 00187C03 */ sra $t7, $t8, 0x10 -/* 0375CC 800369CC 448F8000 */ mtc1 $t7, $f16 -/* 0375D0 800369D0 44814000 */ mtc1 $at, $f8 -/* 0375D4 800369D4 468084A0 */ cvt.s.w $f18, $f16 -/* 0375D8 800369D8 46064280 */ add.s $f10, $f8, $f6 -/* 0375DC 800369DC 460A9003 */ div.s $f0, $f18, $f10 -.L800369E0: -/* 0375E0 800369E0 44802000 */ mtc1 $zero, $f4 -/* 0375E4 800369E4 24050002 */ li $a1, 2 -/* 0375E8 800369E8 24010008 */ li $at, 8 -/* 0375EC 800369EC 4604003C */ c.lt.s $f0, $f4 -/* 0375F0 800369F0 00000000 */ nop -/* 0375F4 800369F4 45000002 */ bc1f .L80036A00 -/* 0375F8 800369F8 00000000 */ nop -/* 0375FC 800369FC 46000007 */ neg.s $f0, $f0 -.L80036A00: -/* 037600 80036A00 54830010 */ bnel $a0, $v1, .L80036A44 -/* 037604 80036A04 C4E80094 */ lwc1 $f8, 0x94($a3) -/* 037608 80036A08 C4E80094 */ lwc1 $f8, 0x94($a3) -/* 03760C 80036A0C 46024183 */ div.s $f6, $f8, $f2 -/* 037610 80036A10 460C3402 */ mul.s $f16, $f6, $f12 -/* 037614 80036A14 4600848D */ trunc.w.s $f18, $f16 -/* 037618 80036A18 440E9000 */ mfc1 $t6, $f18 -/* 03761C 80036A1C 00000000 */ nop -/* 037620 80036A20 000E4C00 */ sll $t1, $t6, 0x10 -/* 037624 80036A24 00096C03 */ sra $t5, $t1, 0x10 -/* 037628 80036A28 000D6080 */ sll $t4, $t5, 2 -/* 03762C 80036A2C 010C5021 */ addu $t2, $t0, $t4 -/* 037630 80036A30 C54A0000 */ lwc1 $f10, ($t2) -/* 037634 80036A34 46005002 */ mul.s $f0, $f10, $f0 -/* 037638 80036A38 10000015 */ b .L80036A90 -/* 03763C 80036A3C 8FAB0304 */ lw $t3, 0x304($sp) -/* 037640 80036A40 C4E80094 */ lwc1 $f8, 0x94($a3) -.L80036A44: -/* 037644 80036A44 94EB0254 */ lhu $t3, 0x254($a3) -/* 037648 80036A48 46024183 */ div.s $f6, $f8, $f2 -/* 03764C 80036A4C 000BC080 */ sll $t8, $t3, 2 -/* 037650 80036A50 03B87821 */ addu $t7, $sp, $t8 -/* 037654 80036A54 C5E40024 */ lwc1 $f4, 0x24($t7) -/* 037658 80036A58 460C3402 */ mul.s $f16, $f6, $f12 -/* 03765C 80036A5C 4600848D */ trunc.w.s $f18, $f16 -/* 037660 80036A60 440E9000 */ mfc1 $t6, $f18 -/* 037664 80036A64 00000000 */ nop -/* 037668 80036A68 000E4C00 */ sll $t1, $t6, 0x10 -/* 03766C 80036A6C 00096C03 */ sra $t5, $t1, 0x10 -/* 037670 80036A70 000D6080 */ sll $t4, $t5, 2 -/* 037674 80036A74 010C5021 */ addu $t2, $t0, $t4 -/* 037678 80036A78 C54A0000 */ lwc1 $f10, ($t2) -/* 03767C 80036A7C 460A2202 */ mul.s $f8, $f4, $f10 -/* 037680 80036A80 00000000 */ nop -/* 037684 80036A84 46004002 */ mul.s $f0, $f8, $f0 -/* 037688 80036A88 00000000 */ nop -/* 03768C 80036A8C 8FAB0304 */ lw $t3, 0x304($sp) -.L80036A90: -/* 037690 80036A90 30580002 */ andi $t8, $v0, 2 -/* 037694 80036A94 10B8001C */ beq $a1, $t8, .L80036B08 -/* 037698 80036A98 ACEB007C */ sw $t3, 0x7c($a3) -/* 03769C 80036A9C 1083001A */ beq $a0, $v1, .L80036B08 -/* 0376A0 80036AA0 304F0001 */ andi $t7, $v0, 1 -/* 0376A4 80036AA4 24010001 */ li $at, 1 -/* 0376A8 80036AA8 11E10009 */ beq $t7, $at, .L80036AD0 -/* 0376AC 80036AAC 000B7403 */ sra $t6, $t3, 0x10 -/* 0376B0 80036AB0 448E3000 */ mtc1 $t6, $f6 -/* 0376B4 80036AB4 00000000 */ nop -/* 0376B8 80036AB8 46803420 */ cvt.s.w $f16, $f6 -/* 0376BC 80036ABC 46008482 */ mul.s $f18, $f16, $f0 -/* 0376C0 80036AC0 4600910D */ trunc.w.s $f4, $f18 -/* 0376C4 80036AC4 440D2000 */ mfc1 $t5, $f4 -/* 0376C8 80036AC8 10000047 */ b .L80036BE8 -/* 0376CC 80036ACC A4ED0078 */ sh $t5, 0x78($a3) -.L80036AD0: -/* 0376D0 80036AD0 8CEC007C */ lw $t4, 0x7c($a3) -/* 0376D4 80036AD4 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 -/* 0376D8 80036AD8 44814800 */ mtc1 $at, $f9 -/* 0376DC 80036ADC 000C5403 */ sra $t2, $t4, 0x10 -/* 0376E0 80036AE0 448A8000 */ mtc1 $t2, $f16 -/* 0376E4 80036AE4 44804000 */ mtc1 $zero, $f8 -/* 0376E8 80036AE8 460002A1 */ cvt.d.s $f10, $f0 -/* 0376EC 80036AEC 468084A1 */ cvt.d.w $f18, $f16 -/* 0376F0 80036AF0 46285180 */ add.d $f6, $f10, $f8 -/* 0376F4 80036AF4 46269102 */ mul.d $f4, $f18, $f6 -/* 0376F8 80036AF8 4620228D */ trunc.w.d $f10, $f4 -/* 0376FC 80036AFC 44185000 */ mfc1 $t8, $f10 -/* 037700 80036B00 10000039 */ b .L80036BE8 -/* 037704 80036B04 A4F80078 */ sh $t8, 0x78($a3) -.L80036B08: -/* 037708 80036B08 304F0008 */ andi $t7, $v0, 8 -/* 03770C 80036B0C 51E10028 */ beql $t7, $at, .L80036BB0 -/* 037710 80036B10 8CE2007C */ lw $v0, 0x7c($a3) -/* 037714 80036B14 84F900C0 */ lh $t9, 0xc0($a3) -/* 037718 80036B18 240100B6 */ li $at, 182 -/* 03771C 80036B1C 46000221 */ cvt.d.s $f8, $f0 -/* 037720 80036B20 0321001A */ div $zero, $t9, $at -/* 037724 80036B24 00007012 */ mflo $t6 -/* 037728 80036B28 3C014008 */ li $at, 0x40080000 # 2.125000 -/* 03772C 80036B2C 59C00007 */ blezl $t6, .L80036B4C -/* 037730 80036B30 8CE2007C */ lw $v0, 0x7c($a3) -/* 037734 80036B34 8CE2007C */ lw $v0, 0x7c($a3) -/* 037738 80036B38 00024C03 */ sra $t1, $v0, 0x10 -/* 03773C 80036B3C 00096C00 */ sll $t5, $t1, 0x10 -/* 037740 80036B40 10000005 */ b .L80036B58 -/* 037744 80036B44 000D1403 */ sra $v0, $t5, 0x10 -/* 037748 80036B48 8CE2007C */ lw $v0, 0x7c($a3) -.L80036B4C: -/* 03774C 80036B4C 00025403 */ sra $t2, $v0, 0x10 -/* 037750 80036B50 000A5C00 */ sll $t3, $t2, 0x10 -/* 037754 80036B54 000B1403 */ sra $v0, $t3, 0x10 -.L80036B58: -/* 037758 80036B58 44823000 */ mtc1 $v0, $f6 -/* 03775C 80036B5C 44818800 */ mtc1 $at, $f17 -/* 037760 80036B60 44808000 */ mtc1 $zero, $f16 -/* 037764 80036B64 46803121 */ cvt.d.w $f4, $f6 -/* 037768 80036B68 3C01800F */ lui $at, %hi(D_800EDD88) -/* 03776C 80036B6C 46304480 */ add.d $f18, $f8, $f16 -/* 037770 80036B70 46322282 */ mul.d $f10, $f4, $f18 -/* 037774 80036B74 4620520D */ trunc.w.d $f8, $f10 -/* 037778 80036B78 44194000 */ mfc1 $t9, $f8 -/* 03777C 80036B7C 00000000 */ nop -/* 037780 80036B80 A4F90078 */ sh $t9, 0x78($a3) -/* 037784 80036B84 84EE0078 */ lh $t6, 0x78($a3) -/* 037788 80036B88 D424DD88 */ ldc1 $f4, %lo(D_800EDD88)($at) -/* 03778C 80036B8C 448E8000 */ mtc1 $t6, $f16 -/* 037790 80036B90 00000000 */ nop -/* 037794 80036B94 468081A1 */ cvt.d.w $f6, $f16 -/* 037798 80036B98 46243482 */ mul.d $f18, $f6, $f4 -/* 03779C 80036B9C 4620928D */ trunc.w.d $f10, $f18 -/* 0377A0 80036BA0 440D5000 */ mfc1 $t5, $f10 -/* 0377A4 80036BA4 10000010 */ b .L80036BE8 -/* 0377A8 80036BA8 A4ED0078 */ sh $t5, 0x78($a3) -/* 0377AC 80036BAC 8CE2007C */ lw $v0, 0x7c($a3) -.L80036BB0: -/* 0377B0 80036BB0 87B8030E */ lh $t8, 0x30e($sp) -/* 0377B4 80036BB4 00026403 */ sra $t4, $v0, 0x10 -/* 0377B8 80036BB8 000C5400 */ sll $t2, $t4, 0x10 -/* 0377BC 80036BBC 17000002 */ bnez $t8, .L80036BC8 -/* 0377C0 80036BC0 000A1403 */ sra $v0, $t2, 0x10 -/* 0377C4 80036BC4 00001025 */ move $v0, $zero -.L80036BC8: -/* 0377C8 80036BC8 44824000 */ mtc1 $v0, $f8 -/* 0377CC 80036BCC 00000000 */ nop -/* 0377D0 80036BD0 46804420 */ cvt.s.w $f16, $f8 -/* 0377D4 80036BD4 46008182 */ mul.s $f6, $f16, $f0 -/* 0377D8 80036BD8 4600310D */ trunc.w.s $f4, $f6 -/* 0377DC 80036BDC 44192000 */ mfc1 $t9, $f4 -/* 0377E0 80036BE0 00000000 */ nop -/* 0377E4 80036BE4 A4F90078 */ sh $t9, 0x78($a3) -.L80036BE8: -/* 0377E8 80036BE8 8CE200BC */ lw $v0, 0xbc($a3) -/* 0377EC 80036BEC 304E0002 */ andi $t6, $v0, 2 -/* 0377F0 80036BF0 50AE0008 */ beql $a1, $t6, .L80036C14 -/* 0377F4 80036BF4 C4EA0094 */ lwc1 $f10, 0x94($a3) -/* 0377F8 80036BF8 84E300C0 */ lh $v1, 0xc0($a3) -/* 0377FC 80036BFC 2861003D */ slti $at, $v1, 0x3d -/* 037800 80036C00 10200003 */ beqz $at, .L80036C10 -/* 037804 80036C04 2861FFC4 */ slti $at, $v1, -0x3c -/* 037808 80036C08 1020000E */ beqz $at, .L80036C44 -/* 03780C 80036C0C 00000000 */ nop -.L80036C10: -/* 037810 80036C10 C4EA0094 */ lwc1 $f10, 0x94($a3) -.L80036C14: -/* 037814 80036C14 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 037818 80036C18 44819000 */ mtc1 $at, $f18 -/* 03781C 80036C1C 46025203 */ div.s $f8, $f10, $f2 -/* 037820 80036C20 34018000 */ li $at, 32768 -/* 037824 80036C24 30498000 */ andi $t1, $v0, 0x8000 -/* 037828 80036C28 460C4402 */ mul.s $f16, $f8, $f12 -/* 03782C 80036C2C 4612803E */ c.le.s $f16, $f18 -/* 037830 80036C30 00000000 */ nop -/* 037834 80036C34 45010003 */ bc1t .L80036C44 -/* 037838 80036C38 00000000 */ nop -/* 03783C 80036C3C 55210004 */ bnel $t1, $at, .L80036C50 -/* 037840 80036C40 8FBF0014 */ lw $ra, 0x14($sp) -.L80036C44: -/* 037844 80036C44 0C00DB2D */ jal func_80036CB4 -/* 037848 80036C48 00E02025 */ move $a0, $a3 -.L80036C4C: -/* 03784C 80036C4C 8FBF0014 */ lw $ra, 0x14($sp) -.L80036C50: -/* 037850 80036C50 27BD0308 */ addiu $sp, $sp, 0x308 -/* 037854 80036C54 03E00008 */ jr $ra -/* 037858 80036C58 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80036DB4.s b/asm/non_matchings/code_80027D00/func_80036DB4.s deleted file mode 100644 index 9cec2b2dd..000000000 --- a/asm/non_matchings/code_80027D00/func_80036DB4.s +++ /dev/null @@ -1,287 +0,0 @@ -glabel func_80036DB4 -/* 0379B4 80036DB4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0379B8 80036DB8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0379BC 80036DBC AFB00018 */ sw $s0, 0x18($sp) -/* 0379C0 80036DC0 8C8800BC */ lw $t0, 0xbc($a0) -/* 0379C4 80036DC4 24011000 */ li $at, 4096 -/* 0379C8 80036DC8 00A08025 */ move $s0, $a1 -/* 0379CC 80036DCC 310E1000 */ andi $t6, $t0, 0x1000 -/* 0379D0 80036DD0 11C10005 */ beq $t6, $at, .L80036DE8 -/* 0379D4 80036DD4 00803825 */ move $a3, $a0 -/* 0379D8 80036DD8 310F0020 */ andi $t7, $t0, 0x20 -/* 0379DC 80036DDC 24010020 */ li $at, 32 -/* 0379E0 80036DE0 15E1000B */ bne $t7, $at, .L80036E10 -/* 0379E4 80036DE4 24050010 */ li $a1, 16 -.L80036DE8: -/* 0379E8 80036DE8 44800000 */ mtc1 $zero, $f0 -/* 0379EC 80036DEC 02002025 */ move $a0, $s0 -/* 0379F0 80036DF0 24E50174 */ addiu $a1, $a3, 0x174 -/* 0379F4 80036DF4 E6000000 */ swc1 $f0, ($s0) -/* 0379F8 80036DF8 E6000004 */ swc1 $f0, 4($s0) -/* 0379FC 80036DFC E6000008 */ swc1 $f0, 8($s0) -/* 037A00 80036E00 0C0AD8EE */ jal func_802B63B8 -/* 037A04 80036E04 AFA60030 */ sw $a2, 0x30($sp) -/* 037A08 80036E08 100000EF */ b .L800371C8 -/* 037A0C 80036E0C 8FA60030 */ lw $a2, 0x30($sp) -.L80036E10: -/* 037A10 80036E10 31040010 */ andi $a0, $t0, 0x10 -/* 037A14 80036E14 14A4001D */ bne $a1, $a0, .L80036E8C -/* 037A18 80036E18 31180002 */ andi $t8, $t0, 2 -/* 037A1C 80036E1C 24010002 */ li $at, 2 -/* 037A20 80036E20 1301001A */ beq $t8, $at, .L80036E8C -/* 037A24 80036E24 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 037A28 80036E28 44812000 */ mtc1 $at, $f4 -/* 037A2C 80036E2C C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037A30 80036E30 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037A34 80036E34 44815000 */ mtc1 $at, $f10 -/* 037A38 80036E38 46046183 */ div.s $f6, $f12, $f4 -/* 037A3C 80036E3C 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037A40 80036E40 44812000 */ mtc1 $at, $f4 -/* 037A44 80036E44 C4EE020C */ lwc1 $f14, 0x20c($a3) -/* 037A48 80036E48 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037A4C 80036E4C 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 037A50 80036E50 46007387 */ neg.s $f14, $f14 -/* 037A54 80036E54 C4F00084 */ lwc1 $f16, 0x84($a3) -/* 037A58 80036E58 46003207 */ neg.s $f8, $f6 -/* 037A5C 80036E5C 460A4082 */ mul.s $f2, $f8, $f10 -/* 037A60 80036E60 44815000 */ mtc1 $at, $f10 -/* 037A64 80036E64 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037A68 80036E68 46041182 */ mul.s $f6, $f2, $f4 -/* 037A6C 80036E6C 46060200 */ add.s $f8, $f0, $f6 -/* 037A70 80036E70 460A7102 */ mul.s $f4, $f14, $f10 -/* 037A74 80036E74 44813000 */ mtc1 $at, $f6 -/* 037A78 80036E78 00000000 */ nop -/* 037A7C 80036E7C 46068282 */ mul.s $f10, $f16, $f6 -/* 037A80 80036E80 46044480 */ add.s $f18, $f8, $f4 -/* 037A84 80036E84 100000A6 */ b .L80037120 -/* 037A88 80036E88 E7AA0020 */ swc1 $f10, 0x20($sp) -.L80036E8C: -/* 037A8C 80036E8C 31190800 */ andi $t9, $t0, 0x800 -/* 037A90 80036E90 1720007B */ bnez $t9, .L80037080 -/* 037A94 80036E94 3C014190 */ lui $at, 0x4190 -/* 037A98 80036E98 84E90044 */ lh $t1, 0x44($a3) -/* 037A9C 80036E9C 312A4000 */ andi $t2, $t1, 0x4000 -/* 037AA0 80036EA0 55400078 */ bnel $t2, $zero, .L80037084 -/* 037AA4 80036EA4 C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037AA8 80036EA8 84E200FA */ lh $v0, 0xfa($a3) -/* 037AAC 80036EAC 18400003 */ blez $v0, .L80036EBC -/* 037AB0 80036EB0 00025823 */ negu $t3, $v0 -/* 037AB4 80036EB4 000B6400 */ sll $t4, $t3, 0x10 -/* 037AB8 80036EB8 000C1403 */ sra $v0, $t4, 0x10 -.L80036EBC: -/* 037ABC 80036EBC 8CE3007C */ lw $v1, 0x7c($a3) -/* 037AC0 80036EC0 00037403 */ sra $t6, $v1, 0x10 -/* 037AC4 80036EC4 29C10015 */ slti $at, $t6, 0x15 -/* 037AC8 80036EC8 10200047 */ beqz $at, .L80036FE8 -/* 037ACC 80036ECC 01C01825 */ move $v1, $t6 -/* 037AD0 80036ED0 29C1FFEC */ slti $at, $t6, -0x14 -/* 037AD4 80036ED4 14200044 */ bnez $at, .L80036FE8 -/* 037AD8 80036ED8 28410014 */ slti $at, $v0, 0x14 -/* 037ADC 80036EDC 1020001E */ beqz $at, .L80036F58 -/* 037AE0 80036EE0 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 037AE4 80036EE4 44814000 */ mtc1 $at, $f8 -/* 037AE8 80036EE8 C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037AEC 80036EEC 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037AF0 80036EF0 44815000 */ mtc1 $at, $f10 -/* 037AF4 80036EF4 46086103 */ div.s $f4, $f12, $f8 -/* 037AF8 80036EF8 C4E8009C */ lwc1 $f8, 0x9c($a3) -/* 037AFC 80036EFC 3C01800F */ lui $at, %hi(D_800EDD90) -/* 037B00 80036F00 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037B04 80036F04 C4EE020C */ lwc1 $f14, 0x20c($a3) -/* 037B08 80036F08 46007387 */ neg.s $f14, $f14 -/* 037B0C 80036F0C 46002187 */ neg.s $f6, $f4 -/* 037B10 80036F10 46004107 */ neg.s $f4, $f8 -/* 037B14 80036F14 460A3082 */ mul.s $f2, $f6, $f10 -/* 037B18 80036F18 D42ADD90 */ ldc1 $f10, %lo(D_800EDD90)($at) -/* 037B1C 80036F1C 460021A1 */ cvt.d.s $f6, $f4 -/* 037B20 80036F20 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037B24 80036F24 44812000 */ mtc1 $at, $f4 -/* 037B28 80036F28 462A3202 */ mul.d $f8, $f6, $f10 -/* 037B2C 80036F2C 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 037B30 80036F30 46041183 */ div.s $f6, $f2, $f4 -/* 037B34 80036F34 46060280 */ add.s $f10, $f0, $f6 -/* 037B38 80036F38 46005121 */ cvt.d.s $f4, $f10 -/* 037B3C 80036F3C 44815000 */ mtc1 $at, $f10 -/* 037B40 80036F40 46282180 */ add.d $f6, $f4, $f8 -/* 037B44 80036F44 460A7102 */ mul.s $f4, $f14, $f10 -/* 037B48 80036F48 46002221 */ cvt.d.s $f8, $f4 -/* 037B4C 80036F4C 46283280 */ add.d $f10, $f6, $f8 -/* 037B50 80036F50 10000048 */ b .L80037074 -/* 037B54 80036F54 462054A0 */ cvt.s.d $f18, $f10 -.L80036F58: -/* 037B58 80036F58 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 037B5C 80036F5C 44812000 */ mtc1 $at, $f4 -/* 037B60 80036F60 C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037B64 80036F64 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037B68 80036F68 44815000 */ mtc1 $at, $f10 -/* 037B6C 80036F6C 46046183 */ div.s $f6, $f12, $f4 -/* 037B70 80036F70 44832000 */ mtc1 $v1, $f4 -/* 037B74 80036F74 3C01800F */ lui $at, %hi(D_800EDD98) -/* 037B78 80036F78 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037B7C 80036F7C C4EE020C */ lwc1 $f14, 0x20c($a3) -/* 037B80 80036F80 46007387 */ neg.s $f14, $f14 -/* 037B84 80036F84 46003207 */ neg.s $f8, $f6 -/* 037B88 80036F88 468021A1 */ cvt.d.w $f6, $f4 -/* 037B8C 80036F8C 460A4082 */ mul.s $f2, $f8, $f10 -/* 037B90 80036F90 D428DD98 */ ldc1 $f8, %lo(D_800EDD98)($at) -/* 037B94 80036F94 C4E4009C */ lwc1 $f4, 0x9c($a3) -/* 037B98 80036F98 3C01800F */ lui $at, %hi(D_800EDDA0) -/* 037B9C 80036F9C 46283282 */ mul.d $f10, $f6, $f8 -/* 037BA0 80036FA0 46002187 */ neg.s $f6, $f4 -/* 037BA4 80036FA4 D424DDA0 */ ldc1 $f4, %lo(D_800EDDA0)($at) -/* 037BA8 80036FA8 46003221 */ cvt.d.s $f8, $f6 -/* 037BAC 80036FAC 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037BB0 80036FB0 46244182 */ mul.d $f6, $f8, $f4 -/* 037BB4 80036FB4 44812000 */ mtc1 $at, $f4 -/* 037BB8 80036FB8 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 037BBC 80036FBC 46265200 */ add.d $f8, $f10, $f6 -/* 037BC0 80036FC0 46041283 */ div.s $f10, $f2, $f4 -/* 037BC4 80036FC4 460A0180 */ add.s $f6, $f0, $f10 -/* 037BC8 80036FC8 46003121 */ cvt.d.s $f4, $f6 -/* 037BCC 80036FCC 44813000 */ mtc1 $at, $f6 -/* 037BD0 80036FD0 46282280 */ add.d $f10, $f4, $f8 -/* 037BD4 80036FD4 46067102 */ mul.s $f4, $f14, $f6 -/* 037BD8 80036FD8 46002221 */ cvt.d.s $f8, $f4 -/* 037BDC 80036FDC 46285180 */ add.d $f6, $f10, $f8 -/* 037BE0 80036FE0 10000024 */ b .L80037074 -/* 037BE4 80036FE4 462034A0 */ cvt.s.d $f18, $f6 -.L80036FE8: -/* 037BE8 80036FE8 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 037BEC 80036FEC 44812000 */ mtc1 $at, $f4 -/* 037BF0 80036FF0 C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037BF4 80036FF4 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037BF8 80036FF8 44813000 */ mtc1 $at, $f6 -/* 037BFC 80036FFC 46046283 */ div.s $f10, $f12, $f4 -/* 037C00 80037000 44832000 */ mtc1 $v1, $f4 -/* 037C04 80037004 3C01800F */ lui $at, %hi(D_800EDDA8) -/* 037C08 80037008 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037C0C 8003700C C4EE020C */ lwc1 $f14, 0x20c($a3) -/* 037C10 80037010 46007387 */ neg.s $f14, $f14 -/* 037C14 80037014 46005207 */ neg.s $f8, $f10 -/* 037C18 80037018 468022A1 */ cvt.d.w $f10, $f4 -/* 037C1C 8003701C 46064082 */ mul.s $f2, $f8, $f6 -/* 037C20 80037020 D428DDA8 */ ldc1 $f8, %lo(D_800EDDA8)($at) -/* 037C24 80037024 C4E4009C */ lwc1 $f4, 0x9c($a3) -/* 037C28 80037028 3C01800F */ lui $at, %hi(D_800EDDB0) -/* 037C2C 8003702C 46285182 */ mul.d $f6, $f10, $f8 -/* 037C30 80037030 46002287 */ neg.s $f10, $f4 -/* 037C34 80037034 D424DDB0 */ ldc1 $f4, %lo(D_800EDDB0)($at) -/* 037C38 80037038 46005221 */ cvt.d.s $f8, $f10 -/* 037C3C 8003703C 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037C40 80037040 46244282 */ mul.d $f10, $f8, $f4 -/* 037C44 80037044 44812000 */ mtc1 $at, $f4 -/* 037C48 80037048 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 037C4C 8003704C 462A3200 */ add.d $f8, $f6, $f10 -/* 037C50 80037050 46041183 */ div.s $f6, $f2, $f4 -/* 037C54 80037054 46060280 */ add.s $f10, $f0, $f6 -/* 037C58 80037058 46005121 */ cvt.d.s $f4, $f10 -/* 037C5C 8003705C 44815000 */ mtc1 $at, $f10 -/* 037C60 80037060 46282180 */ add.d $f6, $f4, $f8 -/* 037C64 80037064 460A7102 */ mul.s $f4, $f14, $f10 -/* 037C68 80037068 46002221 */ cvt.d.s $f8, $f4 -/* 037C6C 8003706C 46283280 */ add.d $f10, $f6, $f8 -/* 037C70 80037070 462054A0 */ cvt.s.d $f18, $f10 -.L80037074: -/* 037C74 80037074 C4F00084 */ lwc1 $f16, 0x84($a3) -/* 037C78 80037078 10000029 */ b .L80037120 -/* 037C7C 8003707C E7B00020 */ swc1 $f16, 0x20($sp) -.L80037080: -/* 037C80 80037080 C4EC0094 */ lwc1 $f12, 0x94($a3) -.L80037084: -/* 037C84 80037084 44812000 */ mtc1 $at, $f4 -/* 037C88 80037088 8CEF007C */ lw $t7, 0x7c($a3) -/* 037C8C 8003708C 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037C90 80037090 46046183 */ div.s $f6, $f12, $f4 -/* 037C94 80037094 000FC403 */ sra $t8, $t7, 0x10 -/* 037C98 80037098 44982000 */ mtc1 $t8, $f4 -/* 037C9C 8003709C 44815000 */ mtc1 $at, $f10 -/* 037CA0 800370A0 3C01800F */ lui $at, %hi(D_800EDDB8) -/* 037CA4 800370A4 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037CA8 800370A8 C4EE020C */ lwc1 $f14, 0x20c($a3) -/* 037CAC 800370AC C4F00084 */ lwc1 $f16, 0x84($a3) -/* 037CB0 800370B0 46007387 */ neg.s $f14, $f14 -/* 037CB4 800370B4 46003207 */ neg.s $f8, $f6 -/* 037CB8 800370B8 468021A1 */ cvt.d.w $f6, $f4 -/* 037CBC 800370BC 460A4082 */ mul.s $f2, $f8, $f10 -/* 037CC0 800370C0 D428DDB8 */ ldc1 $f8, %lo(D_800EDDB8)($at) -/* 037CC4 800370C4 C4E4009C */ lwc1 $f4, 0x9c($a3) -/* 037CC8 800370C8 3C01800F */ lui $at, %hi(D_800EDDC0) -/* 037CCC 800370CC 46283282 */ mul.d $f10, $f6, $f8 -/* 037CD0 800370D0 E7B00020 */ swc1 $f16, 0x20($sp) -/* 037CD4 800370D4 46002187 */ neg.s $f6, $f4 -/* 037CD8 800370D8 D424DDC0 */ ldc1 $f4, %lo(D_800EDDC0)($at) -/* 037CDC 800370DC 46003221 */ cvt.d.s $f8, $f6 -/* 037CE0 800370E0 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 -/* 037CE4 800370E4 46244182 */ mul.d $f6, $f8, $f4 -/* 037CE8 800370E8 46001121 */ cvt.d.s $f4, $f2 -/* 037CEC 800370EC 46265200 */ add.d $f8, $f10, $f6 -/* 037CF0 800370F0 44805000 */ mtc1 $zero, $f10 -/* 037CF4 800370F4 44815800 */ mtc1 $at, $f11 -/* 037CF8 800370F8 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 037CFC 800370FC 462A2182 */ mul.d $f6, $f4, $f10 -/* 037D00 80037100 46000121 */ cvt.d.s $f4, $f0 -/* 037D04 80037104 46262280 */ add.d $f10, $f4, $f6 -/* 037D08 80037108 44813000 */ mtc1 $at, $f6 -/* 037D0C 8003710C 46285100 */ add.d $f4, $f10, $f8 -/* 037D10 80037110 46067282 */ mul.s $f10, $f14, $f6 -/* 037D14 80037114 46005221 */ cvt.d.s $f8, $f10 -/* 037D18 80037118 46282180 */ add.d $f6, $f4, $f8 -/* 037D1C 8003711C 462034A0 */ cvt.s.d $f18, $f6 -.L80037120: -/* 037D20 80037120 31190200 */ andi $t9, $t0, 0x200 -/* 037D24 80037124 24010200 */ li $at, 512 -/* 037D28 80037128 57210019 */ bnel $t9, $at, .L80037190 -/* 037D2C 8003712C C4E40090 */ lwc1 $f4, 0x90($a3) -/* 037D30 80037130 14A40011 */ bne $a1, $a0, .L80037178 -/* 037D34 80037134 31090002 */ andi $t1, $t0, 2 -/* 037D38 80037138 24010002 */ li $at, 2 -/* 037D3C 8003713C 1121000E */ beq $t1, $at, .L80037178 -/* 037D40 80037140 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037D44 80037144 44815000 */ mtc1 $at, $f10 -/* 037D48 80037148 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 037D4C 8003714C 44813000 */ mtc1 $at, $f6 -/* 037D50 80037150 460A1102 */ mul.s $f4, $f2, $f10 -/* 037D54 80037154 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037D58 80037158 46067282 */ mul.s $f10, $f14, $f6 -/* 037D5C 8003715C 46040200 */ add.s $f8, $f0, $f4 -/* 037D60 80037160 44812000 */ mtc1 $at, $f4 -/* 037D64 80037164 00000000 */ nop -/* 037D68 80037168 46048182 */ mul.s $f6, $f16, $f4 -/* 037D6C 8003716C 460A4480 */ add.s $f18, $f8, $f10 -/* 037D70 80037170 10000006 */ b .L8003718C -/* 037D74 80037174 E7A60020 */ swc1 $f6, 0x20($sp) -.L80037178: -/* 037D78 80037178 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037D7C 8003717C 44814000 */ mtc1 $at, $f8 -/* 037D80 80037180 E7B00020 */ swc1 $f16, 0x20($sp) -/* 037D84 80037184 46081283 */ div.s $f10, $f2, $f8 -/* 037D88 80037188 460A0480 */ add.s $f18, $f0, $f10 -.L8003718C: -/* 037D8C 8003718C C4E40090 */ lwc1 $f4, 0x90($a3) -.L80037190: -/* 037D90 80037190 44800000 */ mtc1 $zero, $f0 -/* 037D94 80037194 02002025 */ move $a0, $s0 -/* 037D98 80037198 46122180 */ add.s $f6, $f4, $f18 -/* 037D9C 8003719C E6000004 */ swc1 $f0, 4($s0) -/* 037DA0 800371A0 24E50174 */ addiu $a1, $a3, 0x174 -/* 037DA4 800371A4 460C3202 */ mul.s $f8, $f6, $f12 -/* 037DA8 800371A8 E6080000 */ swc1 $f8, ($s0) -/* 037DAC 800371AC C7A40020 */ lwc1 $f4, 0x20($sp) -/* 037DB0 800371B0 C4EA0094 */ lwc1 $f10, 0x94($a3) -/* 037DB4 800371B4 46045182 */ mul.s $f6, $f10, $f4 -/* 037DB8 800371B8 E6060008 */ swc1 $f6, 8($s0) -/* 037DBC 800371BC 0C0AD8EE */ jal func_802B63B8 -/* 037DC0 800371C0 AFA60030 */ sw $a2, 0x30($sp) -/* 037DC4 800371C4 8FA60030 */ lw $a2, 0x30($sp) -.L800371C8: -/* 037DC8 800371C8 C6080000 */ lwc1 $f8, ($s0) -/* 037DCC 800371CC E4C80000 */ swc1 $f8, ($a2) -/* 037DD0 800371D0 C60A0004 */ lwc1 $f10, 4($s0) -/* 037DD4 800371D4 E4CA0004 */ swc1 $f10, 4($a2) -/* 037DD8 800371D8 C6040008 */ lwc1 $f4, 8($s0) -/* 037DDC 800371DC E4C40008 */ swc1 $f4, 8($a2) -/* 037DE0 800371E0 8FBF001C */ lw $ra, 0x1c($sp) -/* 037DE4 800371E4 8FB00018 */ lw $s0, 0x18($sp) -/* 037DE8 800371E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 037DEC 800371EC 03E00008 */ jr $ra -/* 037DF0 800371F0 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_800371F4.s b/asm/non_matchings/code_80027D00/func_800371F4.s deleted file mode 100644 index 5b8c6ab37..000000000 --- a/asm/non_matchings/code_80027D00/func_800371F4.s +++ /dev/null @@ -1,279 +0,0 @@ -glabel func_800371F4 -/* 037DF4 800371F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 037DF8 800371F8 AFBF001C */ sw $ra, 0x1c($sp) -/* 037DFC 800371FC AFB00018 */ sw $s0, 0x18($sp) -/* 037E00 80037200 8C8800BC */ lw $t0, 0xbc($a0) -/* 037E04 80037204 24011000 */ li $at, 4096 -/* 037E08 80037208 00A08025 */ move $s0, $a1 -/* 037E0C 8003720C 310E1000 */ andi $t6, $t0, 0x1000 -/* 037E10 80037210 11C10005 */ beq $t6, $at, .L80037228 -/* 037E14 80037214 00803825 */ move $a3, $a0 -/* 037E18 80037218 310F0020 */ andi $t7, $t0, 0x20 -/* 037E1C 8003721C 24010020 */ li $at, 32 -/* 037E20 80037220 15E1000B */ bne $t7, $at, .L80037250 -/* 037E24 80037224 24050010 */ li $a1, 16 -.L80037228: -/* 037E28 80037228 44800000 */ mtc1 $zero, $f0 -/* 037E2C 8003722C 02002025 */ move $a0, $s0 -/* 037E30 80037230 24E50174 */ addiu $a1, $a3, 0x174 -/* 037E34 80037234 E6000000 */ swc1 $f0, ($s0) -/* 037E38 80037238 E6000004 */ swc1 $f0, 4($s0) -/* 037E3C 8003723C E6000008 */ swc1 $f0, 8($s0) -/* 037E40 80037240 0C0AD8EE */ jal func_802B63B8 -/* 037E44 80037244 AFA60030 */ sw $a2, 0x30($sp) -/* 037E48 80037248 100000E7 */ b .L800375E8 -/* 037E4C 8003724C 8FA60030 */ lw $a2, 0x30($sp) -.L80037250: -/* 037E50 80037250 31040010 */ andi $a0, $t0, 0x10 -/* 037E54 80037254 14A4001B */ bne $a1, $a0, .L800372C4 -/* 037E58 80037258 31180002 */ andi $t8, $t0, 2 -/* 037E5C 8003725C 24010002 */ li $at, 2 -/* 037E60 80037260 13010018 */ beq $t8, $at, .L800372C4 -/* 037E64 80037264 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 037E68 80037268 44812000 */ mtc1 $at, $f4 -/* 037E6C 8003726C C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037E70 80037270 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037E74 80037274 44815000 */ mtc1 $at, $f10 -/* 037E78 80037278 46046183 */ div.s $f6, $f12, $f4 -/* 037E7C 8003727C C4E4020C */ lwc1 $f4, 0x20c($a3) -/* 037E80 80037280 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 037E84 80037284 C4F00084 */ lwc1 $f16, 0x84($a3) -/* 037E88 80037288 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037E8C 8003728C 46003207 */ neg.s $f8, $f6 -/* 037E90 80037290 46002187 */ neg.s $f6, $f4 -/* 037E94 80037294 460A4082 */ mul.s $f2, $f8, $f10 -/* 037E98 80037298 44814000 */ mtc1 $at, $f8 -/* 037E9C 8003729C 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037EA0 800372A0 44815000 */ mtc1 $at, $f10 -/* 037EA4 800372A4 46083382 */ mul.s $f14, $f6, $f8 -/* 037EA8 800372A8 44814000 */ mtc1 $at, $f8 -/* 037EAC 800372AC 460A1102 */ mul.s $f4, $f2, $f10 -/* 037EB0 800372B0 46040180 */ add.s $f6, $f0, $f4 -/* 037EB4 800372B4 46088282 */ mul.s $f10, $f16, $f8 -/* 037EB8 800372B8 460E3480 */ add.s $f18, $f6, $f14 -/* 037EBC 800372BC 100000A4 */ b .L80037550 -/* 037EC0 800372C0 E7AA0020 */ swc1 $f10, 0x20($sp) -.L800372C4: -/* 037EC4 800372C4 31190800 */ andi $t9, $t0, 0x800 -/* 037EC8 800372C8 17200079 */ bnez $t9, .L800374B0 -/* 037ECC 800372CC 3C014190 */ lui $at, 0x4190 -/* 037ED0 800372D0 84E90044 */ lh $t1, 0x44($a3) -/* 037ED4 800372D4 312A4000 */ andi $t2, $t1, 0x4000 -/* 037ED8 800372D8 55400076 */ bnel $t2, $zero, .L800374B4 -/* 037EDC 800372DC C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037EE0 800372E0 84E200FA */ lh $v0, 0xfa($a3) -/* 037EE4 800372E4 18400003 */ blez $v0, .L800372F4 -/* 037EE8 800372E8 00025823 */ negu $t3, $v0 -/* 037EEC 800372EC 000B6400 */ sll $t4, $t3, 0x10 -/* 037EF0 800372F0 000C1403 */ sra $v0, $t4, 0x10 -.L800372F4: -/* 037EF4 800372F4 8CE3007C */ lw $v1, 0x7c($a3) -/* 037EF8 800372F8 00037403 */ sra $t6, $v1, 0x10 -/* 037EFC 800372FC 29C10015 */ slti $at, $t6, 0x15 -/* 037F00 80037300 10200046 */ beqz $at, .L8003741C -/* 037F04 80037304 01C01825 */ move $v1, $t6 -/* 037F08 80037308 29C1FFEC */ slti $at, $t6, -0x14 -/* 037F0C 8003730C 14200043 */ bnez $at, .L8003741C -/* 037F10 80037310 28410014 */ slti $at, $v0, 0x14 -/* 037F14 80037314 1020001E */ beqz $at, .L80037390 -/* 037F18 80037318 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 037F1C 8003731C 44812000 */ mtc1 $at, $f4 -/* 037F20 80037320 C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037F24 80037324 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037F28 80037328 44815000 */ mtc1 $at, $f10 -/* 037F2C 8003732C 46046183 */ div.s $f6, $f12, $f4 -/* 037F30 80037330 C4E4020C */ lwc1 $f4, 0x20c($a3) -/* 037F34 80037334 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 037F38 80037338 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037F3C 8003733C 46003207 */ neg.s $f8, $f6 -/* 037F40 80037340 46002187 */ neg.s $f6, $f4 -/* 037F44 80037344 460A4082 */ mul.s $f2, $f8, $f10 -/* 037F48 80037348 C4EA009C */ lwc1 $f10, 0x9c($a3) -/* 037F4C 8003734C 44814000 */ mtc1 $at, $f8 -/* 037F50 80037350 3C01800F */ lui $at, %hi(D_800EDDC8) -/* 037F54 80037354 46005107 */ neg.s $f4, $f10 -/* 037F58 80037358 46083382 */ mul.s $f14, $f6, $f8 -/* 037F5C 8003735C D428DDC8 */ ldc1 $f8, %lo(D_800EDDC8)($at) -/* 037F60 80037360 460021A1 */ cvt.d.s $f6, $f4 -/* 037F64 80037364 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037F68 80037368 44812000 */ mtc1 $at, $f4 -/* 037F6C 8003736C 46283282 */ mul.d $f10, $f6, $f8 -/* 037F70 80037370 46041183 */ div.s $f6, $f2, $f4 -/* 037F74 80037374 46060200 */ add.s $f8, $f0, $f6 -/* 037F78 80037378 46004121 */ cvt.d.s $f4, $f8 -/* 037F7C 8003737C 46007221 */ cvt.d.s $f8, $f14 -/* 037F80 80037380 462A2180 */ add.d $f6, $f4, $f10 -/* 037F84 80037384 46283100 */ add.d $f4, $f6, $f8 -/* 037F88 80037388 10000046 */ b .L800374A4 -/* 037F8C 8003738C 462024A0 */ cvt.s.d $f18, $f4 -.L80037390: -/* 037F90 80037390 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 037F94 80037394 44815000 */ mtc1 $at, $f10 -/* 037F98 80037398 C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 037F9C 8003739C 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 037FA0 800373A0 44812000 */ mtc1 $at, $f4 -/* 037FA4 800373A4 460A6183 */ div.s $f6, $f12, $f10 -/* 037FA8 800373A8 C4EA020C */ lwc1 $f10, 0x20c($a3) -/* 037FAC 800373AC 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 037FB0 800373B0 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 037FB4 800373B4 46003207 */ neg.s $f8, $f6 -/* 037FB8 800373B8 46005187 */ neg.s $f6, $f10 -/* 037FBC 800373BC 46044082 */ mul.s $f2, $f8, $f4 -/* 037FC0 800373C0 44832000 */ mtc1 $v1, $f4 -/* 037FC4 800373C4 44814000 */ mtc1 $at, $f8 -/* 037FC8 800373C8 3C01800F */ lui $at, %hi(D_800EDDD0) -/* 037FCC 800373CC 46083382 */ mul.s $f14, $f6, $f8 -/* 037FD0 800373D0 D426DDD0 */ ldc1 $f6, %lo(D_800EDDD0)($at) -/* 037FD4 800373D4 3C01800F */ lui $at, %hi(D_800EDDD8) -/* 037FD8 800373D8 468022A1 */ cvt.d.w $f10, $f4 -/* 037FDC 800373DC C4E4009C */ lwc1 $f4, 0x9c($a3) -/* 037FE0 800373E0 46265202 */ mul.d $f8, $f10, $f6 -/* 037FE4 800373E4 D426DDD8 */ ldc1 $f6, %lo(D_800EDDD8)($at) -/* 037FE8 800373E8 460022A1 */ cvt.d.s $f10, $f4 -/* 037FEC 800373EC 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 037FF0 800373F0 46265102 */ mul.d $f4, $f10, $f6 -/* 037FF4 800373F4 44813000 */ mtc1 $at, $f6 -/* 037FF8 800373F8 46244280 */ add.d $f10, $f8, $f4 -/* 037FFC 800373FC 46061203 */ div.s $f8, $f2, $f6 -/* 038000 80037400 46080100 */ add.s $f4, $f0, $f8 -/* 038004 80037404 460021A1 */ cvt.d.s $f6, $f4 -/* 038008 80037408 46007121 */ cvt.d.s $f4, $f14 -/* 03800C 8003740C 462A3201 */ sub.d $f8, $f6, $f10 -/* 038010 80037410 46244180 */ add.d $f6, $f8, $f4 -/* 038014 80037414 10000023 */ b .L800374A4 -/* 038018 80037418 462034A0 */ cvt.s.d $f18, $f6 -.L8003741C: -/* 03801C 8003741C 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 038020 80037420 44815000 */ mtc1 $at, $f10 -/* 038024 80037424 C4EC0094 */ lwc1 $f12, 0x94($a3) -/* 038028 80037428 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 03802C 8003742C 44813000 */ mtc1 $at, $f6 -/* 038030 80037430 460A6203 */ div.s $f8, $f12, $f10 -/* 038034 80037434 C4EA020C */ lwc1 $f10, 0x20c($a3) -/* 038038 80037438 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 03803C 8003743C C4E00208 */ lwc1 $f0, 0x208($a3) -/* 038040 80037440 46004107 */ neg.s $f4, $f8 -/* 038044 80037444 46005207 */ neg.s $f8, $f10 -/* 038048 80037448 46062082 */ mul.s $f2, $f4, $f6 -/* 03804C 8003744C 44833000 */ mtc1 $v1, $f6 -/* 038050 80037450 44812000 */ mtc1 $at, $f4 -/* 038054 80037454 3C01800F */ lui $at, %hi(D_800EDDE0) -/* 038058 80037458 46044382 */ mul.s $f14, $f8, $f4 -/* 03805C 8003745C D428DDE0 */ ldc1 $f8, %lo(D_800EDDE0)($at) -/* 038060 80037460 3C01800F */ lui $at, %hi(D_800EDDE8) -/* 038064 80037464 468032A1 */ cvt.d.w $f10, $f6 -/* 038068 80037468 C4E6009C */ lwc1 $f6, 0x9c($a3) -/* 03806C 8003746C 46285102 */ mul.d $f4, $f10, $f8 -/* 038070 80037470 D428DDE8 */ ldc1 $f8, %lo(D_800EDDE8)($at) -/* 038074 80037474 460032A1 */ cvt.d.s $f10, $f6 -/* 038078 80037478 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 03807C 8003747C 46285182 */ mul.d $f6, $f10, $f8 -/* 038080 80037480 44814000 */ mtc1 $at, $f8 -/* 038084 80037484 46262280 */ add.d $f10, $f4, $f6 -/* 038088 80037488 46081103 */ div.s $f4, $f2, $f8 -/* 03808C 8003748C 46040180 */ add.s $f6, $f0, $f4 -/* 038090 80037490 46003221 */ cvt.d.s $f8, $f6 -/* 038094 80037494 460071A1 */ cvt.d.s $f6, $f14 -/* 038098 80037498 462A4101 */ sub.d $f4, $f8, $f10 -/* 03809C 8003749C 46262200 */ add.d $f8, $f4, $f6 -/* 0380A0 800374A0 462044A0 */ cvt.s.d $f18, $f8 -.L800374A4: -/* 0380A4 800374A4 C4F00084 */ lwc1 $f16, 0x84($a3) -/* 0380A8 800374A8 10000029 */ b .L80037550 -/* 0380AC 800374AC E7B00020 */ swc1 $f16, 0x20($sp) -.L800374B0: -/* 0380B0 800374B0 C4EC0094 */ lwc1 $f12, 0x94($a3) -.L800374B4: -/* 0380B4 800374B4 44815000 */ mtc1 $at, $f10 -/* 0380B8 800374B8 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 0380BC 800374BC 44814000 */ mtc1 $at, $f8 -/* 0380C0 800374C0 460A6103 */ div.s $f4, $f12, $f10 -/* 0380C4 800374C4 8CEF007C */ lw $t7, 0x7c($a3) -/* 0380C8 800374C8 C4EA020C */ lwc1 $f10, 0x20c($a3) -/* 0380CC 800374CC 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 0380D0 800374D0 000FC403 */ sra $t8, $t7, 0x10 -/* 0380D4 800374D4 C4E00208 */ lwc1 $f0, 0x208($a3) -/* 0380D8 800374D8 C4F00084 */ lwc1 $f16, 0x84($a3) -/* 0380DC 800374DC 46002187 */ neg.s $f6, $f4 -/* 0380E0 800374E0 46005107 */ neg.s $f4, $f10 -/* 0380E4 800374E4 46083082 */ mul.s $f2, $f6, $f8 -/* 0380E8 800374E8 44984000 */ mtc1 $t8, $f8 -/* 0380EC 800374EC 44813000 */ mtc1 $at, $f6 -/* 0380F0 800374F0 3C01800F */ lui $at, %hi(D_800EDDF0) -/* 0380F4 800374F4 46062382 */ mul.s $f14, $f4, $f6 -/* 0380F8 800374F8 D424DDF0 */ ldc1 $f4, %lo(D_800EDDF0)($at) -/* 0380FC 800374FC 3C01800F */ lui $at, %hi(D_800EDDF8) -/* 038100 80037500 468042A1 */ cvt.d.w $f10, $f8 -/* 038104 80037504 C4E8009C */ lwc1 $f8, 0x9c($a3) -/* 038108 80037508 E7B00020 */ swc1 $f16, 0x20($sp) -/* 03810C 8003750C 46245182 */ mul.d $f6, $f10, $f4 -/* 038110 80037510 D424DDF8 */ ldc1 $f4, %lo(D_800EDDF8)($at) -/* 038114 80037514 460042A1 */ cvt.d.s $f10, $f8 -/* 038118 80037518 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 -/* 03811C 8003751C 46245202 */ mul.d $f8, $f10, $f4 -/* 038120 80037520 46001121 */ cvt.d.s $f4, $f2 -/* 038124 80037524 46283280 */ add.d $f10, $f6, $f8 -/* 038128 80037528 44803000 */ mtc1 $zero, $f6 -/* 03812C 8003752C 44813800 */ mtc1 $at, $f7 -/* 038130 80037530 00000000 */ nop -/* 038134 80037534 46262202 */ mul.d $f8, $f4, $f6 -/* 038138 80037538 46000121 */ cvt.d.s $f4, $f0 -/* 03813C 8003753C 46282180 */ add.d $f6, $f4, $f8 -/* 038140 80037540 46007221 */ cvt.d.s $f8, $f14 -/* 038144 80037544 462A3101 */ sub.d $f4, $f6, $f10 -/* 038148 80037548 46282180 */ add.d $f6, $f4, $f8 -/* 03814C 8003754C 462034A0 */ cvt.s.d $f18, $f6 -.L80037550: -/* 038150 80037550 31190200 */ andi $t9, $t0, 0x200 -/* 038154 80037554 24010200 */ li $at, 512 -/* 038158 80037558 57210014 */ bnel $t9, $at, .L800375AC -/* 03815C 8003755C C4E60090 */ lwc1 $f6, 0x90($a3) -/* 038160 80037560 14A4000C */ bne $a1, $a0, .L80037594 -/* 038164 80037564 31090002 */ andi $t1, $t0, 2 -/* 038168 80037568 24010002 */ li $at, 2 -/* 03816C 8003756C 11210009 */ beq $t1, $at, .L80037594 -/* 038170 80037570 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 038174 80037574 44815000 */ mtc1 $at, $f10 -/* 038178 80037578 44813000 */ mtc1 $at, $f6 -/* 03817C 8003757C 460A1102 */ mul.s $f4, $f2, $f10 -/* 038180 80037580 46040200 */ add.s $f8, $f0, $f4 -/* 038184 80037584 46068282 */ mul.s $f10, $f16, $f6 -/* 038188 80037588 460E4480 */ add.s $f18, $f8, $f14 -/* 03818C 8003758C 10000006 */ b .L800375A8 -/* 038190 80037590 E7AA0020 */ swc1 $f10, 0x20($sp) -.L80037594: -/* 038194 80037594 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 038198 80037598 44812000 */ mtc1 $at, $f4 -/* 03819C 8003759C E7B00020 */ swc1 $f16, 0x20($sp) -/* 0381A0 800375A0 46041203 */ div.s $f8, $f2, $f4 -/* 0381A4 800375A4 46080480 */ add.s $f18, $f0, $f8 -.L800375A8: -/* 0381A8 800375A8 C4E60090 */ lwc1 $f6, 0x90($a3) -.L800375AC: -/* 0381AC 800375AC 44800000 */ mtc1 $zero, $f0 -/* 0381B0 800375B0 02002025 */ move $a0, $s0 -/* 0381B4 800375B4 46123280 */ add.s $f10, $f6, $f18 -/* 0381B8 800375B8 E6000004 */ swc1 $f0, 4($s0) -/* 0381BC 800375BC 24E50174 */ addiu $a1, $a3, 0x174 -/* 0381C0 800375C0 46005107 */ neg.s $f4, $f10 -/* 0381C4 800375C4 460C2202 */ mul.s $f8, $f4, $f12 -/* 0381C8 800375C8 E6080000 */ swc1 $f8, ($s0) -/* 0381CC 800375CC C7AA0020 */ lwc1 $f10, 0x20($sp) -/* 0381D0 800375D0 C4E60094 */ lwc1 $f6, 0x94($a3) -/* 0381D4 800375D4 460A3102 */ mul.s $f4, $f6, $f10 -/* 0381D8 800375D8 E6040008 */ swc1 $f4, 8($s0) -/* 0381DC 800375DC 0C0AD8EE */ jal func_802B63B8 -/* 0381E0 800375E0 AFA60030 */ sw $a2, 0x30($sp) -/* 0381E4 800375E4 8FA60030 */ lw $a2, 0x30($sp) -.L800375E8: -/* 0381E8 800375E8 C6080000 */ lwc1 $f8, ($s0) -/* 0381EC 800375EC E4C80000 */ swc1 $f8, ($a2) -/* 0381F0 800375F0 C6060004 */ lwc1 $f6, 4($s0) -/* 0381F4 800375F4 E4C60004 */ swc1 $f6, 4($a2) -/* 0381F8 800375F8 C60A0008 */ lwc1 $f10, 8($s0) -/* 0381FC 800375FC E4CA0008 */ swc1 $f10, 8($a2) -/* 038200 80037600 8FBF001C */ lw $ra, 0x1c($sp) -/* 038204 80037604 8FB00018 */ lw $s0, 0x18($sp) -/* 038208 80037608 27BD0028 */ addiu $sp, $sp, 0x28 -/* 03820C 8003760C 03E00008 */ jr $ra -/* 038210 80037610 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80038C6C.s b/asm/non_matchings/code_80027D00/func_80038C6C.s index c929ccd19..185bc111d 100644 --- a/asm/non_matchings/code_80027D00/func_80038C6C.s +++ b/asm/non_matchings/code_80027D00/func_80038C6C.s @@ -1,3 +1,30 @@ +.section .data + +glabel D_800E4328 +.float 0.0, 0.0, 1.0 + +glabel D_800E4334 +.float 0.0, 0.0, 0.0 + +glabel D_800E4340 +.float 0.0, 0.0, 0.0 + +glabel D_800E434C +.float 0.0, 0.0, 0.0 + +.section .late_rodata + +glabel D_800EDE00 +.double 0.12 + +glabel D_800EDE08 +.double 6000.0 + +glabel D_800EDE10 +.double 0.02 + +.section .text + glabel func_80038C6C /* 03986C 80038C6C 27BDFEE0 */ addiu $sp, $sp, -0x120 /* 039870 80038C70 3C0F800E */ lui $t7, %hi(D_800E4328) # $t7, 0x800e diff --git a/asm/non_matchings/code_80057C60/func_8005A14C.s b/asm/non_matchings/code_80057C60/func_8005A14C.s index d4a3912aa..68dcb5e60 100644 --- a/asm/non_matchings/code_80057C60/func_8005A14C.s +++ b/asm/non_matchings/code_80057C60/func_8005A14C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EE1E0 +.float 0.6 + +.section .text + glabel func_8005A14C /* 05AD4C 8005A14C 000470C0 */ sll $t6, $a0, 3 /* 05AD50 8005A150 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80057C60/func_8005A74C.s b/asm/non_matchings/code_80057C60/func_8005A74C.s index 0f130acb2..c4d6f8f07 100644 --- a/asm/non_matchings/code_80057C60/func_8005A74C.s +++ b/asm/non_matchings/code_80057C60/func_8005A74C.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_800EE1E4 +.word L8005A950, L8005A950, L8005A77C, L8005A794 +.word L8005A7EC, L8005A818, L8005A844, L8005A950 +.word L8005A89C, L8005A8BC, L8005A950, L8005A8E0 +.word L8005A8F0, L8005A91C, L8005A950, L8005A950 +.word L8005A950, L8005A950, L8005A948 + +.section .text + glabel func_8005A74C /* 05B34C 8005A74C 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e /* 05B350 8005A750 95CEC5A0 */ lhu $t6, %lo(gCurrentCourseId)($t6) diff --git a/asm/non_matchings/code_80057C60/func_8005AB60.s b/asm/non_matchings/code_80057C60/func_8005AB60.s index 0a28b5ae3..8cb80b168 100644 --- a/asm/non_matchings/code_80057C60/func_8005AB60.s +++ b/asm/non_matchings/code_80057C60/func_8005AB60.s @@ -1,3 +1,47 @@ +.section .late_rodata + +glabel jpt_800EE230 +.word L8005AD64, L8005AB98, L8005ABE0, L8005AC20 +.word L8005AC60, L8005ACA0, L8005ACE0, L8005AD20 +.word L8005AD60 + +glabel jpt_800EE254 +.word L8005AF2C, L8005ADF4, L8005AE20, L8005AE4C +.word L8005AE78, L8005AEA4, L8005AED0, L8005AEFC +.word L8005AF28 + +glabel jpt_800EE278 +.word L8005B088, L8005AF50, L8005AF7C, L8005AFA8 +.word L8005AFD4, L8005B000, L8005B02C, L8005B058 +.word L8005B084 + +glabel jpt_800EE29C +.word L8005B1E4, L8005B0AC, L8005B0D8, L8005B104 +.word L8005B130, L8005B15C, L8005B188, L8005B1B4 +.word L8005B1E0 + +glabel jpt_800EE2C0 +.word L8005B378, L8005B240, L8005B26C, L8005B298 +.word L8005B2C4, L8005B2F0, L8005B31C, L8005B348 +.word L8005B374 + +glabel jpt_800EE2E4 +.word L8005B4D4, L8005B39C, L8005B3C8, L8005B3F4 +.word L8005B420, L8005B44C, L8005B478, L8005B4A4 +.word L8005B4D0 + +glabel jpt_800EE308 +.word L8005B630, L8005B4F8, L8005B524, L8005B550 +.word L8005B57C, L8005B5A8, L8005B5D4, L8005B600 +.word L8005B62C + +glabel jpt_800EE32C +.word L8005B78C, L8005B654, L8005B680, L8005B6AC +.word L8005B6D8, L8005B704, L8005B730, L8005B75C +.word L8005B788 + +.section .text + glabel func_8005AB60 /* 05B760 8005AB60 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 05B764 8005AB64 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/code_80057C60/func_8005B914.s b/asm/non_matchings/code_80057C60/func_8005B914.s index 9a7912b28..107f8cac2 100644 --- a/asm/non_matchings/code_80057C60/func_8005B914.s +++ b/asm/non_matchings/code_80057C60/func_8005B914.s @@ -1,3 +1,34 @@ +.section .late_rodata + +glabel jpt_800EE350 +.word L8005BB2C, L8005BB40, L8005BB54, L8005BB84 +.word L8005BB98, L8005BBC8, L8005BBDC, L8005BC0C +.word L8005BC20, L8005BC50, L8005BC64, L8005BCF0 +.word L8005BD04, L8005BD54, L8005BD68, L8005BDB8 +.word L8005BDCC, L8005BE1C, L8005BE30, L8005BE80 +.word L8005BE94, L8005BEE4, L8005BEF8, L8005BF48 +.word L8005BF5C, L8005BFAC, L8005BFC0, L8005C000 +.word L8005C014, L8005C290, L8005C04C, L8005C290 +.word L8005C290, L8005C290, L8005C290, L8005C290 +.word L8005C290, L8005C290, L8005C290, L8005C290 +.word L8005C060, L8005C090, L8005C0A4, L8005C0D4 +.word L8005C0E8, L8005C118, L8005C12C, L8005C15C +.word L8005C170, L8005C1A0, L8005C1B4, L8005C1E4 +.word L8005C1F8, L8005C228, L8005C23C, L8005C26C +.word L8005C280 + +glabel jpt_800EE434 +.word L8005C290, L8005B974, L8005B988, L8005B9D0 +.word L8005B9E4, L8005BA08, L8005BA1C, L8005C290 +.word L8005C290, L8005C290, L8005C290, L8005C290 +.word L8005C290, L8005C290, L8005C290, L8005C290 +.word L8005C290, L8005C290, L8005C290, L8005C290 +.word L8005BA48, L8005BA68, L8005BA7C, L8005BA9C +.word L8005BAB0, L8005BAD0, L8005BAE4, L8005BB04 +.word L8005BB18 + +.section .text + glabel func_8005B914 /* 05C514 8005B914 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019 /* 05C518 8005B918 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0) diff --git a/asm/non_matchings/code_80057C60/func_8005C360.s b/asm/non_matchings/code_80057C60/func_8005C360.s index bc238fff1..242492a74 100644 --- a/asm/non_matchings/code_80057C60/func_8005C360.s +++ b/asm/non_matchings/code_80057C60/func_8005C360.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EE4A8 +.double 268.8 + +.section .text + glabel func_8005C360 /* 05CF60 8005C360 3C0E8019 */ lui $t6, %hi(D_8018CAE9) # $t6, 0x8019 /* 05CF64 8005C364 91CECAE9 */ lbu $t6, %lo(D_8018CAE9)($t6) diff --git a/asm/non_matchings/code_80057C60/func_8005DAF4.s b/asm/non_matchings/code_80057C60/func_8005DAF4.s index 1ff092812..3d1b342e6 100644 --- a/asm/non_matchings/code_80057C60/func_8005DAF4.s +++ b/asm/non_matchings/code_80057C60/func_8005DAF4.s @@ -1,3 +1,21 @@ +.section .late_rodata + +glabel jpt_800EE4B0 +.word L8005E870, L8005DBD8, L8005E25C, L8005E870 +.word L8005E6F0, L8005E870, L8005E0DC, L8005DEF0 +.word L8005EA7C, L8005E3DC, L8005E6F0, L8005EA7C +.word L8005E55C + +.word 0x00000000 + +glabel D_800EE4E8 +.double 0.04 + +glabel D_800EE4F0 +.double 0.04 + +.section .text + glabel func_8005DAF4 /* 05E6F4 8005DAF4 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 05E6F8 8005DAF8 AFB1002C */ sw $s1, 0x2c($sp) diff --git a/asm/non_matchings/code_80057C60/func_8005ED48.s b/asm/non_matchings/code_80057C60/func_8005ED48.s index 9e0ff81dd..2f2f24577 100644 --- a/asm/non_matchings/code_80057C60/func_8005ED48.s +++ b/asm/non_matchings/code_80057C60/func_8005ED48.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel jpt_800EE4F8 +.word L8005F7E0, L8005EE2C, L8005F380, L8005F7E0 +.word L8005F6C8, L8005F7E0, L8005F268, L8005F0DC +.word L8005F8F4, L8005F498, L8005F6C8, L8005F8F4 +.word L8005F5B0 + +.section .text + glabel func_8005ED48 /* 05F948 8005ED48 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 05F94C 8005ED4C AFB1002C */ sw $s1, 0x2c($sp) diff --git a/asm/non_matchings/code_80057C60/func_8005F90C.s b/asm/non_matchings/code_80057C60/func_8005F90C.s index 02cf77639..783f99016 100644 --- a/asm/non_matchings/code_80057C60/func_8005F90C.s +++ b/asm/non_matchings/code_80057C60/func_8005F90C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel jpt_800EE52C +.word L800603C8, L8005F9A0, L8005FF28, L800603C8 +.word L800602A0, L800603C8, L8005FE00, L8005FC60 +.word L800604EC, L80060050, L800602A0, L800604EC +.word L80060178 + +.section .text + glabel func_8005F90C /* 06050C 8005F90C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 060510 8005F910 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/non_matchings/code_80057C60/func_80060504.s b/asm/non_matchings/code_80057C60/func_80060504.s index 2d8eca5e7..c8544dabb 100644 --- a/asm/non_matchings/code_80057C60/func_80060504.s +++ b/asm/non_matchings/code_80057C60/func_80060504.s @@ -1,3 +1,21 @@ +.section .late_rodata + +glabel D_800EE560 +.float 3000.0 +.word 0x00000000 + +glabel D_800EE568 +.double 0.1 + +glabel D_800EE570 +.float 5000.0 +.word 0x00000000 + +glabel D_800EE578 +.double 0.1 + +.section .text + glabel func_80060504 /* 061104 80060504 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 061108 80060508 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code_80057C60/func_800608E0.s b/asm/non_matchings/code_80057C60/func_800608E0.s deleted file mode 100644 index aa4ed49d8..000000000 --- a/asm/non_matchings/code_80057C60/func_800608E0.s +++ /dev/null @@ -1,147 +0,0 @@ -glabel func_800608E0 -/* 0614E0 800608E0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 0614E4 800608E4 00077600 */ sll $t6, $a3, 0x18 -/* 0614E8 800608E8 000E7E03 */ sra $t7, $t6, 0x18 -/* 0614EC 800608EC 000FC080 */ sll $t8, $t7, 2 -/* 0614F0 800608F0 3C018016 */ lui $at, %hi(D_801652A0) -/* 0614F4 800608F4 AFBF0034 */ sw $ra, 0x34($sp) -/* 0614F8 800608F8 AFB20030 */ sw $s2, 0x30($sp) -/* 0614FC 800608FC AFB1002C */ sw $s1, 0x2c($sp) -/* 061500 80060900 AFB00028 */ sw $s0, 0x28($sp) -/* 061504 80060904 AFA5005C */ sw $a1, 0x5c($sp) -/* 061508 80060908 AFA60060 */ sw $a2, 0x60($sp) -/* 06150C 8006090C AFA70064 */ sw $a3, 0x64($sp) -/* 061510 80060910 00380821 */ addu $at, $at, $t8 -/* 061514 80060914 C42252A0 */ lwc1 $f2, %lo(D_801652A0)($at) -/* 061518 80060918 C4840018 */ lwc1 $f4, 0x18($a0) -/* 06151C 8006091C 3C014100 */ li $at, 0x41000000 # 8.000000 -/* 061520 80060920 44813000 */ mtc1 $at, $f6 -/* 061524 80060924 46041301 */ sub.s $f12, $f2, $f4 -/* 061528 80060928 44804800 */ mtc1 $zero, $f9 -/* 06152C 8006092C 44804000 */ mtc1 $zero, $f8 -/* 061530 80060930 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 061534 80060934 460C3001 */ sub.s $f0, $f6, $f12 -/* 061538 80060938 44818000 */ mtc1 $at, $f16 -/* 06153C 8006093C 00808025 */ move $s0, $a0 -/* 061540 80060940 3C09800E */ lui $t1, %hi(gCurrentCourseId) # $t1, 0x800e -/* 061544 80060944 460002A1 */ cvt.d.s $f10, $f0 -/* 061548 80060948 02002025 */ move $a0, $s0 -/* 06154C 8006094C 4628503E */ c.le.d $f10, $f8 -/* 061550 80060950 46106481 */ sub.s $f18, $f12, $f16 -/* 061554 80060954 45020004 */ bc1fl .L80060968 -/* 061558 80060958 E7B2004C */ swc1 $f18, 0x4c($sp) -/* 06155C 8006095C 44800000 */ mtc1 $zero, $f0 -/* 061560 80060960 00000000 */ nop -/* 061564 80060964 E7B2004C */ swc1 $f18, 0x4c($sp) -.L80060968: -/* 061568 80060968 961900DE */ lhu $t9, 0xde($s0) -/* 06156C 8006096C 44807000 */ mtc1 $zero, $f14 -/* 061570 80060970 33280001 */ andi $t0, $t9, 1 -/* 061574 80060974 51000010 */ beql $t0, $zero, .L800609B8 -/* 061578 80060978 87AA005E */ lh $t2, 0x5e($sp) -/* 06157C 8006097C 8529C5A0 */ lh $t1, %lo(gCurrentCourseId)($t1) -/* 061580 80060980 24010006 */ li $at, 6 -/* 061584 80060984 5121000C */ beql $t1, $at, .L800609B8 -/* 061588 80060988 87AA005E */ lh $t2, 0x5e($sp) -/* 06158C 8006098C C6040018 */ lwc1 $f4, 0x18($s0) -/* 061590 80060990 3C014020 */ li $at, 0x40200000 # 2.500000 -/* 061594 80060994 44810000 */ mtc1 $at, $f0 -/* 061598 80060998 46041181 */ sub.s $f6, $f2, $f4 -/* 06159C 8006099C 3C01800F */ lui $at, %hi(D_800EE580) -/* 0615A0 800609A0 D42AE580 */ ldc1 $f10, %lo(D_800EE580)($at) -/* 0615A4 800609A4 46003221 */ cvt.d.s $f8, $f6 -/* 0615A8 800609A8 462A4400 */ add.d $f16, $f8, $f10 -/* 0615AC 800609AC 462084A0 */ cvt.s.d $f18, $f16 -/* 0615B0 800609B0 E7B2004C */ swc1 $f18, 0x4c($sp) -/* 0615B4 800609B4 87AA005E */ lh $t2, 0x5e($sp) -.L800609B8: -/* 0615B8 800609B8 44067000 */ mfc1 $a2, $f14 -/* 0615BC 800609BC 44077000 */ mfc1 $a3, $f14 -/* 0615C0 800609C0 000A58C0 */ sll $t3, $t2, 3 -/* 0615C4 800609C4 016A5821 */ addu $t3, $t3, $t2 -/* 0615C8 800609C8 000B58C0 */ sll $t3, $t3, 3 -/* 0615CC 800609CC 020B8821 */ addu $s1, $s0, $t3 -/* 0615D0 800609D0 26320258 */ addiu $s2, $s1, 0x258 -/* 0615D4 800609D4 02402825 */ move $a1, $s2 -/* 0615D8 800609D8 E7AE0010 */ swc1 $f14, 0x10($sp) -/* 0615DC 800609DC AFA00014 */ sw $zero, 0x14($sp) -/* 0615E0 800609E0 AFA00018 */ sw $zero, 0x18($sp) -/* 0615E4 800609E4 0C0175E5 */ jal func_8005D794 -/* 0615E8 800609E8 E7A00054 */ swc1 $f0, 0x54($sp) -/* 0615EC 800609EC C7A00054 */ lwc1 $f0, 0x54($sp) -/* 0615F0 800609F0 02402025 */ move $a0, $s2 -/* 0615F4 800609F4 24050003 */ li $a1, 3 -/* 0615F8 800609F8 44060000 */ mfc1 $a2, $f0 -/* 0615FC 800609FC 0C0175F6 */ jal func_8005D7D8 -/* 061600 80060A00 00000000 */ nop -/* 061604 80060A04 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 061608 80060A08 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 06160C 80060A0C 24010002 */ li $at, 2 -/* 061610 80060A10 02402025 */ move $a0, $s2 -/* 061614 80060A14 10410004 */ beq $v0, $at, .L80060A28 -/* 061618 80060A18 00002825 */ move $a1, $zero -/* 06161C 80060A1C 24010013 */ li $at, 19 -/* 061620 80060A20 14410005 */ bne $v0, $at, .L80060A38 -/* 061624 80060A24 240600CF */ li $a2, 207 -.L80060A28: -/* 061628 80060A28 0C017600 */ jal func_8005D800 -/* 06162C 80060A2C 240600AF */ li $a2, 175 -/* 061630 80060A30 10000006 */ b .L80060A4C -/* 061634 80060A34 C7A4004C */ lwc1 $f4, 0x4c($sp) -.L80060A38: -/* 061638 80060A38 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 06163C 80060A3C 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 061640 80060A40 0C017600 */ jal func_8005D800 -/* 061644 80060A44 02402025 */ move $a0, $s2 -/* 061648 80060A48 C7A4004C */ lwc1 $f4, 0x4c($sp) -.L80060A4C: -/* 06164C 80060A4C 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 061650 80060A50 44814000 */ mtc1 $at, $f8 -/* 061654 80060A54 E7A40010 */ swc1 $f4, 0x10($sp) -/* 061658 80060A58 C6060094 */ lwc1 $f6, 0x94($s0) -/* 06165C 80060A5C 862C0276 */ lh $t4, 0x276($s1) -/* 061660 80060A60 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 061664 80060A64 46083283 */ div.s $f10, $f6, $f8 -/* 061668 80060A68 000C6823 */ negu $t5, $t4 -/* 06166C 80060A6C 448D8000 */ mtc1 $t5, $f16 -/* 061670 80060A70 44813000 */ mtc1 $at, $f6 -/* 061674 80060A74 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 061678 80060A78 468084A0 */ cvt.s.w $f18, $f16 -/* 06167C 80060A7C 44818000 */ mtc1 $at, $f16 -/* 061680 80060A80 3C01C080 */ li $at, 0xC0800000 # -4.000000 -/* 061684 80060A84 27A40050 */ addiu $a0, $sp, 0x50 -/* 061688 80060A88 27A5004C */ addiu $a1, $sp, 0x4c -/* 06168C 80060A8C 27A60048 */ addiu $a2, $sp, 0x48 -/* 061690 80060A90 24070000 */ li $a3, 0 -/* 061694 80060A94 460A9102 */ mul.s $f4, $f18, $f10 -/* 061698 80060A98 44815000 */ mtc1 $at, $f10 -/* 06169C 80060A9C 46062202 */ mul.s $f8, $f4, $f6 -/* 0616A0 80060AA0 46104483 */ div.s $f18, $f8, $f16 -/* 0616A4 80060AA4 460A9100 */ add.s $f4, $f18, $f10 -/* 0616A8 80060AA8 E7A40014 */ swc1 $f4, 0x14($sp) -/* 0616AC 80060AAC 862E0278 */ lh $t6, 0x278($s1) -/* 0616B0 80060AB0 000E7823 */ negu $t7, $t6 -/* 0616B4 80060AB4 AFAF0018 */ sw $t7, 0x18($sp) -/* 0616B8 80060AB8 86180206 */ lh $t8, 0x206($s0) -/* 0616BC 80060ABC 0018C823 */ negu $t9, $t8 -/* 0616C0 80060AC0 00194040 */ sll $t0, $t9, 1 -/* 0616C4 80060AC4 0C018AC6 */ jal func_80062B18 -/* 0616C8 80060AC8 AFA8001C */ sw $t0, 0x1c($sp) -/* 0616CC 80060ACC C6060014 */ lwc1 $f6, 0x14($s0) -/* 0616D0 80060AD0 C7A80050 */ lwc1 $f8, 0x50($sp) -/* 0616D4 80060AD4 46083400 */ add.s $f16, $f6, $f8 -/* 0616D8 80060AD8 E6300258 */ swc1 $f16, 0x258($s1) -/* 0616DC 80060ADC C7AA0048 */ lwc1 $f10, 0x48($sp) -/* 0616E0 80060AE0 C612001C */ lwc1 $f18, 0x1c($s0) -/* 0616E4 80060AE4 460A9100 */ add.s $f4, $f18, $f10 -/* 0616E8 80060AE8 E6240260 */ swc1 $f4, 0x260($s1) -/* 0616EC 80060AEC C7A8004C */ lwc1 $f8, 0x4c($sp) -/* 0616F0 80060AF0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 0616F4 80060AF4 46083400 */ add.s $f16, $f6, $f8 -/* 0616F8 80060AF8 E630025C */ swc1 $f16, 0x25c($s1) -/* 0616FC 80060AFC 8FBF0034 */ lw $ra, 0x34($sp) -/* 061700 80060B00 8FB20030 */ lw $s2, 0x30($sp) -/* 061704 80060B04 8FB1002C */ lw $s1, 0x2c($sp) -/* 061708 80060B08 8FB00028 */ lw $s0, 0x28($sp) -/* 06170C 80060B0C 03E00008 */ jr $ra -/* 061710 80060B10 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_80057C60/func_80060BCC.s b/asm/non_matchings/code_80057C60/func_80060BCC.s deleted file mode 100644 index 62133c0be..000000000 --- a/asm/non_matchings/code_80057C60/func_80060BCC.s +++ /dev/null @@ -1,233 +0,0 @@ -glabel func_80060BCC -/* 0617CC 80060BCC 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 0617D0 80060BD0 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 0617D4 80060BD4 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 0617D8 80060BD8 AFB20030 */ sw $s2, 0x30($sp) -/* 0617DC 80060BDC AFB00028 */ sw $s0, 0x28($sp) -/* 0617E0 80060BE0 24010010 */ li $at, 16 -/* 0617E4 80060BE4 00C08025 */ move $s0, $a2 -/* 0617E8 80060BE8 00809025 */ move $s2, $a0 -/* 0617EC 80060BEC AFBF0034 */ sw $ra, 0x34($sp) -/* 0617F0 80060BF0 AFB1002C */ sw $s1, 0x2c($sp) -/* 0617F4 80060BF4 AFA5005C */ sw $a1, 0x5c($sp) -/* 0617F8 80060BF8 104100CF */ beq $v0, $at, .L80060F38 -/* 0617FC 80060BFC AFA70064 */ sw $a3, 0x64($sp) -/* 061800 80060C00 2401000D */ li $at, 13 -/* 061804 80060C04 504100CD */ beql $v0, $at, .L80060F3C -/* 061808 80060C08 8FBF0034 */ lw $ra, 0x34($sp) -/* 06180C 80060C0C 0C0ADF8D */ jal random_int -/* 061810 80060C10 24040168 */ li $a0, 360 -/* 061814 80060C14 244EFF4C */ addiu $t6, $v0, -0xb4 -/* 061818 80060C18 AFAE0054 */ sw $t6, 0x54($sp) -/* 06181C 80060C1C 0C0ADF8D */ jal random_int -/* 061820 80060C20 24040006 */ li $a0, 6 -/* 061824 80060C24 AFA2004C */ sw $v0, 0x4c($sp) -/* 061828 80060C28 0C0ADF8D */ jal random_int -/* 06182C 80060C2C 24040006 */ li $a0, 6 -/* 061830 80060C30 44822000 */ mtc1 $v0, $f4 -/* 061834 80060C34 24040003 */ li $a0, 3 -/* 061838 80060C38 04410005 */ bgez $v0, .L80060C50 -/* 06183C 80060C3C 468021A0 */ cvt.s.w $f6, $f4 -/* 061840 80060C40 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 061844 80060C44 44814000 */ mtc1 $at, $f8 -/* 061848 80060C48 00000000 */ nop -/* 06184C 80060C4C 46083180 */ add.s $f6, $f6, $f8 -.L80060C50: -/* 061850 80060C50 0C0ADF8D */ jal random_int -/* 061854 80060C54 E7A60044 */ swc1 $f6, 0x44($sp) -/* 061858 80060C58 44825000 */ mtc1 $v0, $f10 -/* 06185C 80060C5C 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e -/* 061860 80060C60 04410005 */ bgez $v0, .L80060C78 -/* 061864 80060C64 46805420 */ cvt.s.w $f16, $f10 -/* 061868 80060C68 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 06186C 80060C6C 44819000 */ mtc1 $at, $f18 -/* 061870 80060C70 00000000 */ nop -/* 061874 80060C74 46128400 */ add.s $f16, $f16, $f18 -.L80060C78: -/* 061878 80060C78 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) -/* 06187C 80060C7C E7B00048 */ swc1 $f16, 0x48($sp) -/* 061880 80060C80 87A8005E */ lh $t0, 0x5e($sp) -/* 061884 80060C84 564F00AD */ bnel $s2, $t7, .L80060F3C -/* 061888 80060C88 8FBF0034 */ lw $ra, 0x34($sp) -/* 06188C 80060C8C 15000057 */ bnez $t0, .L80060DEC -/* 061890 80060C90 24030048 */ li $v1, 72 -/* 061894 80060C94 02030019 */ multu $s0, $v1 -/* 061898 80060C98 0000C012 */ mflo $t8 -/* 06189C 80060C9C 02581021 */ addu $v0, $s2, $t8 -/* 0618A0 80060CA0 84590546 */ lh $t9, 0x546($v0) -/* 0618A4 80060CA4 1F200004 */ bgtz $t9, .L80060CB8 -/* 0618A8 80060CA8 00000000 */ nop -/* 0618AC 80060CAC 84490544 */ lh $t1, 0x544($v0) -/* 0618B0 80060CB0 5520004F */ bnel $t1, $zero, .L80060DF0 -/* 0618B4 80060CB4 24030048 */ li $v1, 72 -.L80060CB8: -/* 0618B8 80060CB8 01030019 */ multu $t0, $v1 -/* 0618BC 80060CBC 44800000 */ mtc1 $zero, $f0 -/* 0618C0 80060CC0 02402025 */ move $a0, $s2 -/* 0618C4 80060CC4 AFA00014 */ sw $zero, 0x14($sp) -/* 0618C8 80060CC8 44060000 */ mfc1 $a2, $f0 -/* 0618CC 80060CCC 44070000 */ mfc1 $a3, $f0 -/* 0618D0 80060CD0 AFA00018 */ sw $zero, 0x18($sp) -/* 0618D4 80060CD4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 0618D8 80060CD8 00005012 */ mflo $t2 -/* 0618DC 80060CDC 024A8021 */ addu $s0, $s2, $t2 -/* 0618E0 80060CE0 26110528 */ addiu $s1, $s0, 0x528 -/* 0618E4 80060CE4 0C0175E5 */ jal func_8005D794 -/* 0618E8 80060CE8 02202825 */ move $a1, $s1 -/* 0618EC 80060CEC 3C063ECC */ lui $a2, (0x3ECCCCCD >> 16) # lui $a2, 0x3ecc -/* 0618F0 80060CF0 34C6CCCD */ ori $a2, (0x3ECCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 0618F4 80060CF4 02202025 */ move $a0, $s1 -/* 0618F8 80060CF8 0C0175F6 */ jal func_8005D7D8 -/* 0618FC 80060CFC 2405000B */ li $a1, 11 -/* 061900 80060D00 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 061904 80060D04 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 061908 80060D08 02202025 */ move $a0, $s1 -/* 06190C 80060D0C 0C017600 */ jal func_8005D800 -/* 061910 80060D10 240600FF */ li $a2, 255 -/* 061914 80060D14 8FA40054 */ lw $a0, 0x54($sp) -/* 061918 80060D18 00045880 */ sll $t3, $a0, 2 -/* 06191C 80060D1C 01645823 */ subu $t3, $t3, $a0 -/* 061920 80060D20 000B58C0 */ sll $t3, $t3, 3 -/* 061924 80060D24 01645823 */ subu $t3, $t3, $a0 -/* 061928 80060D28 000B5880 */ sll $t3, $t3, 2 -/* 06192C 80060D2C 01645823 */ subu $t3, $t3, $a0 -/* 061930 80060D30 000B5840 */ sll $t3, $t3, 1 -/* 061934 80060D34 3164FFFF */ andi $a0, $t3, 0xffff -/* 061938 80060D38 0C0AE00E */ jal coss -/* 06193C 80060D3C AFA4003C */ sw $a0, 0x3c($sp) -/* 061940 80060D40 3C01800F */ lui $at, %hi(D_800EE588) -/* 061944 80060D44 D428E588 */ ldc1 $f8, %lo(D_800EE588)($at) -/* 061948 80060D48 46000121 */ cvt.d.s $f4, $f0 -/* 06194C 80060D4C C64A001C */ lwc1 $f10, 0x1c($s2) -/* 061950 80060D50 46282182 */ mul.d $f6, $f4, $f8 -/* 061954 80060D54 8FA4003C */ lw $a0, 0x3c($sp) -/* 061958 80060D58 460054A1 */ cvt.d.s $f18, $f10 -/* 06195C 80060D5C 46323400 */ add.d $f16, $f6, $f18 -/* 061960 80060D60 46208120 */ cvt.s.d $f4, $f16 -/* 061964 80060D64 0C0AE006 */ jal sins -/* 061968 80060D68 E6040530 */ swc1 $f4, 0x530($s0) -/* 06196C 80060D6C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 061970 80060D70 44811000 */ mtc1 $at, $f2 -/* 061974 80060D74 3C01800F */ lui $at, %hi(D_800EE590) -/* 061978 80060D78 D42AE590 */ ldc1 $f10, %lo(D_800EE590)($at) -/* 06197C 80060D7C 46000221 */ cvt.d.s $f8, $f0 -/* 061980 80060D80 C6520014 */ lwc1 $f18, 0x14($s2) -/* 061984 80060D84 462A4182 */ mul.d $f6, $f8, $f10 -/* 061988 80060D88 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 06198C 80060D8C 46009421 */ cvt.d.s $f16, $f18 -/* 061990 80060D90 46303100 */ add.d $f4, $f6, $f16 -/* 061994 80060D94 46202220 */ cvt.s.d $f8, $f4 -/* 061998 80060D98 E6080528 */ swc1 $f8, 0x528($s0) -/* 06199C 80060D9C 8FAD004C */ lw $t5, 0x4c($sp) -/* 0619A0 80060DA0 C6520070 */ lwc1 $f18, 0x70($s2) -/* 0619A4 80060DA4 C64A0018 */ lwc1 $f10, 0x18($s2) -/* 0619A8 80060DA8 448D8000 */ mtc1 $t5, $f16 -/* 0619AC 80060DAC 46125181 */ sub.s $f6, $f10, $f18 -/* 0619B0 80060DB0 46808120 */ cvt.s.w $f4, $f16 -/* 0619B4 80060DB4 44818000 */ mtc1 $at, $f16 -/* 0619B8 80060DB8 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 0619BC 80060DBC 46043200 */ add.s $f8, $f6, $f4 -/* 0619C0 80060DC0 46024280 */ add.s $f10, $f8, $f2 -/* 0619C4 80060DC4 E60A052C */ swc1 $f10, 0x52c($s0) -/* 0619C8 80060DC8 C7B20044 */ lwc1 $f18, 0x44($sp) -/* 0619CC 80060DCC 44815000 */ mtc1 $at, $f10 -/* 0619D0 80060DD0 46109180 */ add.s $f6, $f18, $f16 -/* 0619D4 80060DD4 E6060540 */ swc1 $f6, 0x540($s0) -/* 0619D8 80060DD8 C7A40048 */ lwc1 $f4, 0x48($sp) -/* 0619DC 80060DDC 46022200 */ add.s $f8, $f4, $f2 -/* 0619E0 80060DE0 460A4483 */ div.s $f18, $f8, $f10 -/* 0619E4 80060DE4 10000054 */ b .L80060F38 -/* 0619E8 80060DE8 E6120534 */ swc1 $f18, 0x534($s0) -.L80060DEC: -/* 0619EC 80060DEC 24030048 */ li $v1, 72 -.L80060DF0: -/* 0619F0 80060DF0 02030019 */ multu $s0, $v1 -/* 0619F4 80060DF4 00007012 */ mflo $t6 -/* 0619F8 80060DF8 024E7821 */ addu $t7, $s2, $t6 -/* 0619FC 80060DFC 85F80546 */ lh $t8, 0x546($t7) -/* 061A00 80060E00 5B00004E */ blezl $t8, .L80060F3C -/* 061A04 80060E04 8FBF0034 */ lw $ra, 0x34($sp) -/* 061A08 80060E08 01030019 */ multu $t0, $v1 -/* 061A0C 80060E0C 44800000 */ mtc1 $zero, $f0 -/* 061A10 80060E10 02402025 */ move $a0, $s2 -/* 061A14 80060E14 AFA00014 */ sw $zero, 0x14($sp) -/* 061A18 80060E18 44060000 */ mfc1 $a2, $f0 -/* 061A1C 80060E1C 44070000 */ mfc1 $a3, $f0 -/* 061A20 80060E20 AFA00018 */ sw $zero, 0x18($sp) -/* 061A24 80060E24 E7A00010 */ swc1 $f0, 0x10($sp) -/* 061A28 80060E28 0000C812 */ mflo $t9 -/* 061A2C 80060E2C 02598021 */ addu $s0, $s2, $t9 -/* 061A30 80060E30 26110528 */ addiu $s1, $s0, 0x528 -/* 061A34 80060E34 0C0175E5 */ jal func_8005D794 -/* 061A38 80060E38 02202825 */ move $a1, $s1 -/* 061A3C 80060E3C 3C063ECC */ lui $a2, (0x3ECCCCCD >> 16) # lui $a2, 0x3ecc -/* 061A40 80060E40 34C6CCCD */ ori $a2, (0x3ECCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 061A44 80060E44 02202025 */ move $a0, $s1 -/* 061A48 80060E48 0C0175F6 */ jal func_8005D7D8 -/* 061A4C 80060E4C 2405000B */ li $a1, 11 -/* 061A50 80060E50 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 061A54 80060E54 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 061A58 80060E58 02202025 */ move $a0, $s1 -/* 061A5C 80060E5C 0C017600 */ jal func_8005D800 -/* 061A60 80060E60 240600FF */ li $a2, 255 -/* 061A64 80060E64 8FA40054 */ lw $a0, 0x54($sp) -/* 061A68 80060E68 00044880 */ sll $t1, $a0, 2 -/* 061A6C 80060E6C 01244823 */ subu $t1, $t1, $a0 -/* 061A70 80060E70 000948C0 */ sll $t1, $t1, 3 -/* 061A74 80060E74 01244823 */ subu $t1, $t1, $a0 -/* 061A78 80060E78 00094880 */ sll $t1, $t1, 2 -/* 061A7C 80060E7C 01244823 */ subu $t1, $t1, $a0 -/* 061A80 80060E80 00094840 */ sll $t1, $t1, 1 -/* 061A84 80060E84 3124FFFF */ andi $a0, $t1, 0xffff -/* 061A88 80060E88 0C0AE00E */ jal coss -/* 061A8C 80060E8C AFA4003C */ sw $a0, 0x3c($sp) -/* 061A90 80060E90 3C01800F */ lui $at, %hi(D_800EE598) -/* 061A94 80060E94 D426E598 */ ldc1 $f6, %lo(D_800EE598)($at) -/* 061A98 80060E98 46000421 */ cvt.d.s $f16, $f0 -/* 061A9C 80060E9C C648001C */ lwc1 $f8, 0x1c($s2) -/* 061AA0 80060EA0 46268102 */ mul.d $f4, $f16, $f6 -/* 061AA4 80060EA4 8FA4003C */ lw $a0, 0x3c($sp) -/* 061AA8 80060EA8 460042A1 */ cvt.d.s $f10, $f8 -/* 061AAC 80060EAC 462A2480 */ add.d $f18, $f4, $f10 -/* 061AB0 80060EB0 46209420 */ cvt.s.d $f16, $f18 -/* 061AB4 80060EB4 0C0AE006 */ jal sins -/* 061AB8 80060EB8 E6100530 */ swc1 $f16, 0x530($s0) -/* 061ABC 80060EBC 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 061AC0 80060EC0 44811000 */ mtc1 $at, $f2 -/* 061AC4 80060EC4 3C01800F */ lui $at, %hi(D_800EE5A0) -/* 061AC8 80060EC8 D428E5A0 */ ldc1 $f8, %lo(D_800EE5A0)($at) -/* 061ACC 80060ECC 460001A1 */ cvt.d.s $f6, $f0 -/* 061AD0 80060ED0 C64A0014 */ lwc1 $f10, 0x14($s2) -/* 061AD4 80060ED4 46283102 */ mul.d $f4, $f6, $f8 -/* 061AD8 80060ED8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 061ADC 80060EDC 460054A1 */ cvt.d.s $f18, $f10 -/* 061AE0 80060EE0 46322400 */ add.d $f16, $f4, $f18 -/* 061AE4 80060EE4 462081A0 */ cvt.s.d $f6, $f16 -/* 061AE8 80060EE8 E6060528 */ swc1 $f6, 0x528($s0) -/* 061AEC 80060EEC 8FAB004C */ lw $t3, 0x4c($sp) -/* 061AF0 80060EF0 C64A0070 */ lwc1 $f10, 0x70($s2) -/* 061AF4 80060EF4 C6480018 */ lwc1 $f8, 0x18($s2) -/* 061AF8 80060EF8 448B9000 */ mtc1 $t3, $f18 -/* 061AFC 80060EFC 460A4101 */ sub.s $f4, $f8, $f10 -/* 061B00 80060F00 46809420 */ cvt.s.w $f16, $f18 -/* 061B04 80060F04 44819000 */ mtc1 $at, $f18 -/* 061B08 80060F08 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 061B0C 80060F0C 46102180 */ add.s $f6, $f4, $f16 -/* 061B10 80060F10 46023200 */ add.s $f8, $f6, $f2 -/* 061B14 80060F14 E608052C */ swc1 $f8, 0x52c($s0) -/* 061B18 80060F18 C7AA0044 */ lwc1 $f10, 0x44($sp) -/* 061B1C 80060F1C 44814000 */ mtc1 $at, $f8 -/* 061B20 80060F20 46125100 */ add.s $f4, $f10, $f18 -/* 061B24 80060F24 E6040540 */ swc1 $f4, 0x540($s0) -/* 061B28 80060F28 C7B00048 */ lwc1 $f16, 0x48($sp) -/* 061B2C 80060F2C 46028180 */ add.s $f6, $f16, $f2 -/* 061B30 80060F30 46083283 */ div.s $f10, $f6, $f8 -/* 061B34 80060F34 E60A0534 */ swc1 $f10, 0x534($s0) -.L80060F38: -/* 061B38 80060F38 8FBF0034 */ lw $ra, 0x34($sp) -.L80060F3C: -/* 061B3C 80060F3C 8FB00028 */ lw $s0, 0x28($sp) -/* 061B40 80060F40 8FB1002C */ lw $s1, 0x2c($sp) -/* 061B44 80060F44 8FB20030 */ lw $s2, 0x30($sp) -/* 061B48 80060F48 03E00008 */ jr $ra -/* 061B4C 80060F4C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_80057C60/func_80061430.s b/asm/non_matchings/code_80057C60/func_80061430.s deleted file mode 100644 index 6a4cb18e9..000000000 --- a/asm/non_matchings/code_80057C60/func_80061430.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80061430 -/* 062030 80061430 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 062034 80061434 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 062038 80061438 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 06203C 8006143C 4481D000 */ mtc1 $at, $f26 -/* 062040 80061440 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 062044 80061444 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 -/* 062048 80061448 4481C800 */ mtc1 $at, $f25 -/* 06204C 8006144C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 062050 80061450 3C01800F */ lui $at, %hi(D_800EE5B8) -/* 062054 80061454 D436E5B8 */ ldc1 $f22, %lo(D_800EE5B8)($at) -/* 062058 80061458 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 06205C 8006145C 3C0142C8 */ li $at, 0x42C80000 # 100.000000 -/* 062060 80061460 AFB60050 */ sw $s6, 0x50($sp) -/* 062064 80061464 AFB5004C */ sw $s5, 0x4c($sp) -/* 062068 80061468 AFB40048 */ sw $s4, 0x48($sp) -/* 06206C 8006146C AFB30044 */ sw $s3, 0x44($sp) -/* 062070 80061470 AFB20040 */ sw $s2, 0x40($sp) -/* 062074 80061474 AFB1003C */ sw $s1, 0x3c($sp) -/* 062078 80061478 AFB00038 */ sw $s0, 0x38($sp) -/* 06207C 8006147C 4481A000 */ mtc1 $at, $f20 -/* 062080 80061480 4480C000 */ mtc1 $zero, $f24 -/* 062084 80061484 00809025 */ move $s2, $a0 -/* 062088 80061488 AFBF0054 */ sw $ra, 0x54($sp) -/* 06208C 8006148C AFA5005C */ sw $a1, 0x5c($sp) -/* 062090 80061490 AFA60060 */ sw $a2, 0x60($sp) -/* 062094 80061494 AFA70064 */ sw $a3, 0x64($sp) -/* 062098 80061498 00808025 */ move $s0, $a0 -/* 06209C 8006149C 00008825 */ move $s1, $zero -/* 0620A0 800614A0 24130001 */ li $s3, 1 -/* 0620A4 800614A4 24140009 */ li $s4, 9 -/* 0620A8 800614A8 241500FF */ li $s5, 255 -/* 0620AC 800614AC 3416C710 */ li $s6, 50960 -.L800614B0: -/* 0620B0 800614B0 A6130AE4 */ sh $s3, 0xae4($s0) -/* 0620B4 800614B4 C6440018 */ lwc1 $f4, 0x18($s2) -/* 0620B8 800614B8 24040064 */ li $a0, 100 -/* 0620BC 800614BC 461A2181 */ sub.s $f6, $f4, $f26 -/* 0620C0 800614C0 E6060AF0 */ swc1 $f6, 0xaf0($s0) -/* 0620C4 800614C4 864E002E */ lh $t6, 0x2e($s2) -/* 0620C8 800614C8 022E7823 */ subu $t7, $s1, $t6 -/* 0620CC 800614CC 0C0ADF8D */ jal random_int -/* 0620D0 800614D0 A60F0AE8 */ sh $t7, 0xae8($s0) -/* 0620D4 800614D4 44824000 */ mtc1 $v0, $f8 -/* 0620D8 800614D8 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0620DC 800614DC 04410004 */ bgez $v0, .L800614F0 -/* 0620E0 800614E0 468042A0 */ cvt.s.w $f10, $f8 -/* 0620E4 800614E4 44818000 */ mtc1 $at, $f16 -/* 0620E8 800614E8 00000000 */ nop -/* 0620EC 800614EC 46105280 */ add.s $f10, $f10, $f16 -.L800614F0: -/* 0620F0 800614F0 46145483 */ div.s $f18, $f10, $f20 -/* 0620F4 800614F4 24040064 */ li $a0, 100 -/* 0620F8 800614F8 46009121 */ cvt.d.s $f4, $f18 -/* 0620FC 800614FC 46362180 */ add.d $f6, $f4, $f22 -/* 062100 80061500 46203220 */ cvt.s.d $f8, $f6 -/* 062104 80061504 0C0ADF8D */ jal random_int -/* 062108 80061508 E6080AEC */ swc1 $f8, 0xaec($s0) -/* 06210C 8006150C 44828000 */ mtc1 $v0, $f16 -/* 062110 80061510 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 062114 80061514 04410004 */ bgez $v0, .L80061528 -/* 062118 80061518 468082A0 */ cvt.s.w $f10, $f16 -/* 06211C 8006151C 44819000 */ mtc1 $at, $f18 -/* 062120 80061520 00000000 */ nop -/* 062124 80061524 46125280 */ add.s $f10, $f10, $f18 -.L80061528: -/* 062128 80061528 46145103 */ div.s $f4, $f10, $f20 -/* 06212C 8006152C A6000B02 */ sh $zero, 0xb02($s0) -/* 062130 80061530 A6140ADA */ sh $s4, 0xada($s0) -/* 062134 80061534 A6000AE6 */ sh $zero, 0xae6($s0) -/* 062138 80061538 A6150B06 */ sh $s5, 0xb06($s0) -/* 06213C 8006153C 26311C70 */ addiu $s1, $s1, 0x1c70 -/* 062140 80061540 26100048 */ addiu $s0, $s0, 0x48 -/* 062144 80061544 460021A1 */ cvt.d.s $f6, $f4 -/* 062148 80061548 46383200 */ add.d $f8, $f6, $f24 -/* 06214C 8006154C 46204420 */ cvt.s.d $f16, $f8 -/* 062150 80061550 E6100AA4 */ swc1 $f16, 0xaa4($s0) -/* 062154 80061554 C652001C */ lwc1 $f18, 0x1c($s2) -/* 062158 80061558 E6120A88 */ swc1 $f18, 0xa88($s0) -/* 06215C 8006155C C64A0014 */ lwc1 $f10, 0x14($s2) -/* 062160 80061560 1636FFD3 */ bne $s1, $s6, .L800614B0 -/* 062164 80061564 E60A0A80 */ swc1 $f10, 0xa80($s0) -/* 062168 80061568 86580044 */ lh $t8, 0x44($s2) -/* 06216C 8006156C 3319EFFF */ andi $t9, $t8, 0xefff -/* 062170 80061570 A6590044 */ sh $t9, 0x44($s2) -/* 062174 80061574 8FBF0054 */ lw $ra, 0x54($sp) -/* 062178 80061578 8FB60050 */ lw $s6, 0x50($sp) -/* 06217C 8006157C 8FB5004C */ lw $s5, 0x4c($sp) -/* 062180 80061580 8FB40048 */ lw $s4, 0x48($sp) -/* 062184 80061584 8FB30044 */ lw $s3, 0x44($sp) -/* 062188 80061588 8FB20040 */ lw $s2, 0x40($sp) -/* 06218C 8006158C 8FB1003C */ lw $s1, 0x3c($sp) -/* 062190 80061590 8FB00038 */ lw $s0, 0x38($sp) -/* 062194 80061594 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 062198 80061598 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 06219C 8006159C D7B60020 */ ldc1 $f22, 0x20($sp) -/* 0621A0 800615A0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 0621A4 800615A4 03E00008 */ jr $ra -/* 0621A8 800615A8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_80057C60/func_800615AC.s b/asm/non_matchings/code_80057C60/func_800615AC.s index a01363006..81e84b742 100644 --- a/asm/non_matchings/code_80057C60/func_800615AC.s +++ b/asm/non_matchings/code_80057C60/func_800615AC.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EE5C0 +.float 0.15 + +.section .text + glabel func_800615AC /* 0621AC 800615AC 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 0621B0 800615B0 3C0F800E */ lui $t7, %hi(D_800E4848) # $t7, 0x800e diff --git a/asm/non_matchings/code_80057C60/func_80061D4C.s b/asm/non_matchings/code_80057C60/func_80061D4C.s index 5f9397ce4..2bdda21d1 100644 --- a/asm/non_matchings/code_80057C60/func_80061D4C.s +++ b/asm/non_matchings/code_80057C60/func_80061D4C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EE5C4 +.float 0.4 + +.section .text + glabel func_80061D4C /* 06294C 80061D4C 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 062950 80061D50 3C0F800E */ lui $t7, %hi(D_800E4870) # $t7, 0x800e diff --git a/asm/non_matchings/code_80057C60/func_800624D8.s b/asm/non_matchings/code_80057C60/func_800624D8.s deleted file mode 100644 index 93623a1db..000000000 --- a/asm/non_matchings/code_80057C60/func_800624D8.s +++ /dev/null @@ -1,278 +0,0 @@ -glabel func_800624D8 -/* 0630D8 800624D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0630DC 800624DC AFBF0024 */ sw $ra, 0x24($sp) -/* 0630E0 800624E0 AFB30020 */ sw $s3, 0x20($sp) -/* 0630E4 800624E4 AFB2001C */ sw $s2, 0x1c($sp) -/* 0630E8 800624E8 AFB10018 */ sw $s1, 0x18($sp) -/* 0630EC 800624EC AFB00014 */ sw $s0, 0x14($sp) -/* 0630F0 800624F0 AFA5002C */ sw $a1, 0x2c($sp) -/* 0630F4 800624F4 AFA60030 */ sw $a2, 0x30($sp) -/* 0630F8 800624F8 AFA70034 */ sw $a3, 0x34($sp) -/* 0630FC 800624FC 948E00F8 */ lhu $t6, 0xf8($a0) -/* 063100 80062500 00809825 */ move $s3, $a0 -/* 063104 80062504 25CFFFFF */ addiu $t7, $t6, -1 -/* 063108 80062508 2DE1000D */ sltiu $at, $t7, 0xd -/* 06310C 8006250C 102000D3 */ beqz $at, .L8006285C -/* 063110 80062510 000F7880 */ sll $t7, $t7, 2 -/* 063114 80062514 3C01800F */ lui $at, %hi(jpt_800EE5C8) -/* 063118 80062518 002F0821 */ addu $at, $at, $t7 -/* 06311C 8006251C 8C2FE5C8 */ lw $t7, %lo(jpt_800EE5C8)($at) -/* 063120 80062520 01E00008 */ jr $t7 -/* 063124 80062524 00000000 */ nop -glabel L80062528 -/* 063128 80062528 00008825 */ move $s1, $zero -/* 06312C 8006252C 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 063130 80062530 2412000A */ li $s2, 10 -.L80062534: -/* 063134 80062534 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 063138 80062538 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 06313C 8006253C 24010001 */ li $at, 1 -/* 063140 80062540 02002025 */ move $a0, $s0 -/* 063144 80062544 10410003 */ beq $v0, $at, .L80062554 -/* 063148 80062548 24050001 */ li $a1, 1 -/* 06314C 8006254C 24010007 */ li $at, 7 -/* 063150 80062550 14410005 */ bne $v0, $at, .L80062568 -.L80062554: -/* 063154 80062554 00003025 */ move $a2, $zero -/* 063158 80062558 0C0176B6 */ jal func_8005DAD8 -/* 06315C 8006255C 240700A8 */ li $a3, 168 -/* 063160 80062560 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 063164 80062564 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -.L80062568: -/* 063168 80062568 2401000B */ li $at, 11 -/* 06316C 8006256C 14410007 */ bne $v0, $at, .L8006258C -/* 063170 80062570 02002025 */ move $a0, $s0 -/* 063174 80062574 24050007 */ li $a1, 7 -/* 063178 80062578 00003025 */ move $a2, $zero -/* 06317C 8006257C 0C0176B6 */ jal func_8005DAD8 -/* 063180 80062580 240700A8 */ li $a3, 168 -/* 063184 80062584 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 063188 80062588 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -.L8006258C: -/* 06318C 8006258C 24010009 */ li $at, 9 -/* 063190 80062590 14410007 */ bne $v0, $at, .L800625B0 -/* 063194 80062594 02002025 */ move $a0, $s0 -/* 063198 80062598 24050008 */ li $a1, 8 -/* 06319C 8006259C 00003025 */ move $a2, $zero -/* 0631A0 800625A0 0C0176B6 */ jal func_8005DAD8 -/* 0631A4 800625A4 240700A8 */ li $a3, 168 -/* 0631A8 800625A8 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 0631AC 800625AC 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -.L800625B0: -/* 0631B0 800625B0 2401000E */ li $at, 14 -/* 0631B4 800625B4 14410007 */ bne $v0, $at, .L800625D4 -/* 0631B8 800625B8 02002025 */ move $a0, $s0 -/* 0631BC 800625BC 24050009 */ li $a1, 9 -/* 0631C0 800625C0 00003025 */ move $a2, $zero -/* 0631C4 800625C4 0C0176B6 */ jal func_8005DAD8 -/* 0631C8 800625C8 240700A8 */ li $a3, 168 -/* 0631CC 800625CC 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 0631D0 800625D0 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -.L800625D4: -/* 0631D4 800625D4 24010004 */ li $at, 4 -/* 0631D8 800625D8 14410009 */ bne $v0, $at, .L80062600 -/* 0631DC 800625DC 02002025 */ move $a0, $s0 -/* 0631E0 800625E0 00122C00 */ sll $a1, $s2, 0x10 -/* 0631E4 800625E4 0005C403 */ sra $t8, $a1, 0x10 -/* 0631E8 800625E8 03002825 */ move $a1, $t8 -/* 0631EC 800625EC 00003025 */ move $a2, $zero -/* 0631F0 800625F0 0C0176B6 */ jal func_8005DAD8 -/* 0631F4 800625F4 240700A8 */ li $a3, 168 -/* 0631F8 800625F8 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 0631FC 800625FC 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -.L80062600: -/* 063200 80062600 24010012 */ li $at, 18 -/* 063204 80062604 14410005 */ bne $v0, $at, .L8006261C -/* 063208 80062608 02002025 */ move $a0, $s0 -/* 06320C 8006260C 2405000B */ li $a1, 11 -/* 063210 80062610 00003025 */ move $a2, $zero -/* 063214 80062614 0C0176B6 */ jal func_8005DAD8 -/* 063218 80062618 240700A8 */ li $a3, 168 -.L8006261C: -/* 06321C 8006261C 02602025 */ move $a0, $s3 -/* 063220 80062620 02002825 */ move $a1, $s0 -/* 063224 80062624 0C018921 */ jal func_80062484 -/* 063228 80062628 02203025 */ move $a2, $s1 -/* 06322C 8006262C 26310001 */ addiu $s1, $s1, 1 -/* 063230 80062630 1632FFC0 */ bne $s1, $s2, .L80062534 -/* 063234 80062634 26100048 */ addiu $s0, $s0, 0x48 -/* 063238 80062638 86790044 */ lh $t9, 0x44($s3) -/* 06323C 8006263C 3328FEFF */ andi $t0, $t9, 0xfeff -/* 063240 80062640 10000098 */ b .L800628A4 -/* 063244 80062644 A6680044 */ sh $t0, 0x44($s3) -glabel L80062648 -/* 063248 80062648 00008825 */ move $s1, $zero -/* 06324C 8006264C 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 063250 80062650 2412000A */ li $s2, 10 -.L80062654: -/* 063254 80062654 02002025 */ move $a0, $s0 -/* 063258 80062658 24050002 */ li $a1, 2 -/* 06325C 8006265C 24060001 */ li $a2, 1 -/* 063260 80062660 0C0176B6 */ jal func_8005DAD8 -/* 063264 80062664 240700A8 */ li $a3, 168 -/* 063268 80062668 02602025 */ move $a0, $s3 -/* 06326C 8006266C 02002825 */ move $a1, $s0 -/* 063270 80062670 0C018921 */ jal func_80062484 -/* 063274 80062674 02203025 */ move $a2, $s1 -/* 063278 80062678 26310001 */ addiu $s1, $s1, 1 -/* 06327C 8006267C 1632FFF5 */ bne $s1, $s2, .L80062654 -/* 063280 80062680 26100048 */ addiu $s0, $s0, 0x48 -/* 063284 80062684 86690044 */ lh $t1, 0x44($s3) -/* 063288 80062688 312AFEFF */ andi $t2, $t1, 0xfeff -/* 06328C 8006268C 10000085 */ b .L800628A4 -/* 063290 80062690 A66A0044 */ sh $t2, 0x44($s3) -glabel L80062694 -/* 063294 80062694 00008825 */ move $s1, $zero -/* 063298 80062698 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 06329C 8006269C 2412000A */ li $s2, 10 -.L800626A0: -/* 0632A0 800626A0 02002025 */ move $a0, $s0 -/* 0632A4 800626A4 24050002 */ li $a1, 2 -/* 0632A8 800626A8 24060001 */ li $a2, 1 -/* 0632AC 800626AC 0C0176B6 */ jal func_8005DAD8 -/* 0632B0 800626B0 240700A8 */ li $a3, 168 -/* 0632B4 800626B4 02602025 */ move $a0, $s3 -/* 0632B8 800626B8 02002825 */ move $a1, $s0 -/* 0632BC 800626BC 0C018921 */ jal func_80062484 -/* 0632C0 800626C0 02203025 */ move $a2, $s1 -/* 0632C4 800626C4 26310001 */ addiu $s1, $s1, 1 -/* 0632C8 800626C8 1632FFF5 */ bne $s1, $s2, .L800626A0 -/* 0632CC 800626CC 26100048 */ addiu $s0, $s0, 0x48 -/* 0632D0 800626D0 866B0044 */ lh $t3, 0x44($s3) -/* 0632D4 800626D4 316CFEFF */ andi $t4, $t3, 0xfeff -/* 0632D8 800626D8 10000072 */ b .L800628A4 -/* 0632DC 800626DC A66C0044 */ sh $t4, 0x44($s3) -glabel L800626E0 -/* 0632E0 800626E0 00008825 */ move $s1, $zero -/* 0632E4 800626E4 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 0632E8 800626E8 2412000A */ li $s2, 10 -.L800626EC: -/* 0632EC 800626EC 02002025 */ move $a0, $s0 -/* 0632F0 800626F0 24050003 */ li $a1, 3 -/* 0632F4 800626F4 24060001 */ li $a2, 1 -/* 0632F8 800626F8 0C0176B6 */ jal func_8005DAD8 -/* 0632FC 800626FC 240700A8 */ li $a3, 168 -/* 063300 80062700 02602025 */ move $a0, $s3 -/* 063304 80062704 02002825 */ move $a1, $s0 -/* 063308 80062708 0C018921 */ jal func_80062484 -/* 06330C 8006270C 02203025 */ move $a2, $s1 -/* 063310 80062710 26310001 */ addiu $s1, $s1, 1 -/* 063314 80062714 1632FFF5 */ bne $s1, $s2, .L800626EC -/* 063318 80062718 26100048 */ addiu $s0, $s0, 0x48 -/* 06331C 8006271C 866D0044 */ lh $t5, 0x44($s3) -/* 063320 80062720 31AEFEFF */ andi $t6, $t5, 0xfeff -/* 063324 80062724 1000005F */ b .L800628A4 -/* 063328 80062728 A66E0044 */ sh $t6, 0x44($s3) -glabel L8006272C -/* 06332C 8006272C 00008825 */ move $s1, $zero -/* 063330 80062730 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 063334 80062734 2412000A */ li $s2, 10 -.L80062738: -/* 063338 80062738 02002025 */ move $a0, $s0 -/* 06333C 8006273C 24050004 */ li $a1, 4 -/* 063340 80062740 24060001 */ li $a2, 1 -/* 063344 80062744 0C0176B6 */ jal func_8005DAD8 -/* 063348 80062748 240700A8 */ li $a3, 168 -/* 06334C 8006274C 02602025 */ move $a0, $s3 -/* 063350 80062750 02002825 */ move $a1, $s0 -/* 063354 80062754 0C018921 */ jal func_80062484 -/* 063358 80062758 02203025 */ move $a2, $s1 -/* 06335C 8006275C 26310001 */ addiu $s1, $s1, 1 -/* 063360 80062760 1632FFF5 */ bne $s1, $s2, .L80062738 -/* 063364 80062764 26100048 */ addiu $s0, $s0, 0x48 -/* 063368 80062768 866F0044 */ lh $t7, 0x44($s3) -/* 06336C 8006276C 31F8FEFF */ andi $t8, $t7, 0xfeff -/* 063370 80062770 1000004C */ b .L800628A4 -/* 063374 80062774 A6780044 */ sh $t8, 0x44($s3) -glabel L80062778 -/* 063378 80062778 00008825 */ move $s1, $zero -/* 06337C 8006277C 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 063380 80062780 2412000A */ li $s2, 10 -.L80062784: -/* 063384 80062784 02002025 */ move $a0, $s0 -/* 063388 80062788 24050005 */ li $a1, 5 -/* 06338C 8006278C 24060001 */ li $a2, 1 -/* 063390 80062790 0C0176B6 */ jal func_8005DAD8 -/* 063394 80062794 240700A8 */ li $a3, 168 -/* 063398 80062798 02602025 */ move $a0, $s3 -/* 06339C 8006279C 02002825 */ move $a1, $s0 -/* 0633A0 800627A0 0C018921 */ jal func_80062484 -/* 0633A4 800627A4 02203025 */ move $a2, $s1 -/* 0633A8 800627A8 26310001 */ addiu $s1, $s1, 1 -/* 0633AC 800627AC 1632FFF5 */ bne $s1, $s2, .L80062784 -/* 0633B0 800627B0 26100048 */ addiu $s0, $s0, 0x48 -/* 0633B4 800627B4 86790044 */ lh $t9, 0x44($s3) -/* 0633B8 800627B8 3328FEFF */ andi $t0, $t9, 0xfeff -/* 0633BC 800627BC 10000039 */ b .L800628A4 -/* 0633C0 800627C0 A6680044 */ sh $t0, 0x44($s3) -glabel L800627C4 -/* 0633C4 800627C4 00008825 */ move $s1, $zero -/* 0633C8 800627C8 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 0633CC 800627CC 2412000A */ li $s2, 10 -.L800627D0: -/* 0633D0 800627D0 02002025 */ move $a0, $s0 -/* 0633D4 800627D4 24050006 */ li $a1, 6 -/* 0633D8 800627D8 24060001 */ li $a2, 1 -/* 0633DC 800627DC 0C0176B6 */ jal func_8005DAD8 -/* 0633E0 800627E0 240700A8 */ li $a3, 168 -/* 0633E4 800627E4 02602025 */ move $a0, $s3 -/* 0633E8 800627E8 02002825 */ move $a1, $s0 -/* 0633EC 800627EC 0C018921 */ jal func_80062484 -/* 0633F0 800627F0 02203025 */ move $a2, $s1 -/* 0633F4 800627F4 26310001 */ addiu $s1, $s1, 1 -/* 0633F8 800627F8 1632FFF5 */ bne $s1, $s2, .L800627D0 -/* 0633FC 800627FC 26100048 */ addiu $s0, $s0, 0x48 -/* 063400 80062800 86690044 */ lh $t1, 0x44($s3) -/* 063404 80062804 312AFEFF */ andi $t2, $t1, 0xfeff -/* 063408 80062808 10000026 */ b .L800628A4 -/* 06340C 8006280C A66A0044 */ sh $t2, 0x44($s3) -glabel L80062810 -/* 063410 80062810 00008825 */ move $s1, $zero -/* 063414 80062814 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 063418 80062818 2412000A */ li $s2, 10 -.L8006281C: -/* 06341C 8006281C 02002025 */ move $a0, $s0 -/* 063420 80062820 00002825 */ move $a1, $zero -/* 063424 80062824 00003025 */ move $a2, $zero -/* 063428 80062828 0C0176B6 */ jal func_8005DAD8 -/* 06342C 8006282C 240700A8 */ li $a3, 168 -/* 063430 80062830 02602025 */ move $a0, $s3 -/* 063434 80062834 02002825 */ move $a1, $s0 -/* 063438 80062838 0C018921 */ jal func_80062484 -/* 06343C 8006283C 02203025 */ move $a2, $s1 -/* 063440 80062840 26310001 */ addiu $s1, $s1, 1 -/* 063444 80062844 1632FFF5 */ bne $s1, $s2, .L8006281C -/* 063448 80062848 26100048 */ addiu $s0, $s0, 0x48 -/* 06344C 8006284C 866B0044 */ lh $t3, 0x44($s3) -/* 063450 80062850 316CFEFF */ andi $t4, $t3, 0xfeff -/* 063454 80062854 10000013 */ b .L800628A4 -/* 063458 80062858 A66C0044 */ sh $t4, 0x44($s3) -.L8006285C: -glabel L8006285C -/* 06345C 8006285C 00008825 */ move $s1, $zero -/* 063460 80062860 26700AC8 */ addiu $s0, $s3, 0xac8 -/* 063464 80062864 2412000A */ li $s2, 10 -.L80062868: -/* 063468 80062868 02002025 */ move $a0, $s0 -/* 06346C 8006286C 00002825 */ move $a1, $zero -/* 063470 80062870 00003025 */ move $a2, $zero -/* 063474 80062874 0C0176B6 */ jal func_8005DAD8 -/* 063478 80062878 240700A8 */ li $a3, 168 -/* 06347C 8006287C 02602025 */ move $a0, $s3 -/* 063480 80062880 02002825 */ move $a1, $s0 -/* 063484 80062884 0C018921 */ jal func_80062484 -/* 063488 80062888 02203025 */ move $a2, $s1 -/* 06348C 8006288C 26310001 */ addiu $s1, $s1, 1 -/* 063490 80062890 1632FFF5 */ bne $s1, $s2, .L80062868 -/* 063494 80062894 26100048 */ addiu $s0, $s0, 0x48 -/* 063498 80062898 866D0044 */ lh $t5, 0x44($s3) -/* 06349C 8006289C 31AEFEFF */ andi $t6, $t5, 0xfeff -/* 0634A0 800628A0 A66E0044 */ sh $t6, 0x44($s3) -.L800628A4: -/* 0634A4 800628A4 8FBF0024 */ lw $ra, 0x24($sp) -/* 0634A8 800628A8 8FB00014 */ lw $s0, 0x14($sp) -/* 0634AC 800628AC 8FB10018 */ lw $s1, 0x18($sp) -/* 0634B0 800628B0 8FB2001C */ lw $s2, 0x1c($sp) -/* 0634B4 800628B4 8FB30020 */ lw $s3, 0x20($sp) -/* 0634B8 800628B8 03E00008 */ jr $ra -/* 0634BC 800628BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80057C60/func_80062C74.s b/asm/non_matchings/code_80057C60/func_80062C74.s index ba1adbfa4..3bd050a12 100644 --- a/asm/non_matchings/code_80057C60/func_80062C74.s +++ b/asm/non_matchings/code_80057C60/func_80062C74.s @@ -1,3 +1,31 @@ +.section .late_rodata + +glabel D_800EE610 +.double 0.07 + +glabel D_800EE618 +.double 0.3 + +glabel D_800EE620 +.double 0.1 + +glabel D_800EE628 +.double 0.1 + +glabel D_800EE630 +.double 0.3 + +glabel D_800EE638 +.float 5000.0 + +glabel D_800EE63C +.float 6000.0 + +glabel D_800EE640 +.double 0.06 + +.section .text + glabel func_80062C74 /* 063874 80062C74 27BDFF98 */ addiu $sp, $sp, -0x68 /* 063878 80062C78 3C18800E */ lui $t8, %hi(D_800E4898) # $t8, 0x800e diff --git a/asm/non_matchings/code_80057C60/func_800644E8.s b/asm/non_matchings/code_80057C60/func_800644E8.s deleted file mode 100644 index 8d9df943e..000000000 --- a/asm/non_matchings/code_80057C60/func_800644E8.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_800644E8 -/* 0650E8 800644E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0650EC 800644EC 00057400 */ sll $t6, $a1, 0x10 -/* 0650F0 800644F0 000E7C03 */ sra $t7, $t6, 0x10 -/* 0650F4 800644F4 000FC8C0 */ sll $t9, $t7, 3 -/* 0650F8 800644F8 032FC821 */ addu $t9, $t9, $t7 -/* 0650FC 800644FC 0019C8C0 */ sll $t9, $t9, 3 -/* 065100 80064500 AFBF0014 */ sw $ra, 0x14($sp) -/* 065104 80064504 AFA40038 */ sw $a0, 0x38($sp) -/* 065108 80064508 AFA5003C */ sw $a1, 0x3c($sp) -/* 06510C 8006450C AFA60040 */ sw $a2, 0x40($sp) -/* 065110 80064510 AFA70044 */ sw $a3, 0x44($sp) -/* 065114 80064514 00991021 */ addu $v0, $a0, $t9 -/* 065118 80064518 84430AE6 */ lh $v1, 0xae6($v0) -/* 06511C 8006451C 24080009 */ li $t0, 9 -/* 065120 80064520 28610009 */ slti $at, $v1, 9 -/* 065124 80064524 54200004 */ bnel $at, $zero, .L80064538 -/* 065128 80064528 C4440AEC */ lwc1 $f4, 0xaec($v0) -/* 06512C 8006452C A4480AE6 */ sh $t0, 0xae6($v0) -/* 065130 80064530 84430AE6 */ lh $v1, 0xae6($v0) -/* 065134 80064534 C4440AEC */ lwc1 $f4, 0xaec($v0) -.L80064538: -/* 065138 80064538 E7A40034 */ swc1 $f4, 0x34($sp) -/* 06513C 8006453C 94440AE8 */ lhu $a0, 0xae8($v0) -/* 065140 80064540 AFA3002C */ sw $v1, 0x2c($sp) -/* 065144 80064544 0C0AE00E */ jal coss -/* 065148 80064548 AFA20024 */ sw $v0, 0x24($sp) -/* 06514C 8006454C 8FA5002C */ lw $a1, 0x2c($sp) -/* 065150 80064550 3C01800F */ lui $at, %hi(D_800EE6F0) -/* 065154 80064554 D426E6F0 */ ldc1 $f6, %lo(D_800EE6F0)($at) -/* 065158 80064558 44854000 */ mtc1 $a1, $f8 -/* 06515C 8006455C 46000421 */ cvt.d.s $f16, $f0 -/* 065160 80064560 8FA90038 */ lw $t1, 0x38($sp) -/* 065164 80064564 468042A1 */ cvt.d.w $f10, $f8 -/* 065168 80064568 8FA20024 */ lw $v0, 0x24($sp) -/* 06516C 8006456C C524001C */ lwc1 $f4, 0x1c($t1) -/* 065170 80064570 94440AE8 */ lhu $a0, 0xae8($v0) -/* 065174 80064574 462A3082 */ mul.d $f2, $f6, $f10 -/* 065178 80064578 46002221 */ cvt.d.s $f8, $f4 -/* 06517C 8006457C 46228482 */ mul.d $f18, $f16, $f2 -/* 065180 80064580 46289180 */ add.d $f6, $f18, $f8 -/* 065184 80064584 462032A0 */ cvt.s.d $f10, $f6 -/* 065188 80064588 E44A0AD0 */ swc1 $f10, 0xad0($v0) -/* 06518C 8006458C 0C0AE006 */ jal sins -/* 065190 80064590 F7A20018 */ sdc1 $f2, 0x18($sp) -/* 065194 80064594 D7A20018 */ ldc1 $f2, 0x18($sp) -/* 065198 80064598 46000421 */ cvt.d.s $f16, $f0 -/* 06519C 8006459C 8FAA0038 */ lw $t2, 0x38($sp) -/* 0651A0 800645A0 46228102 */ mul.d $f4, $f16, $f2 -/* 0651A4 800645A4 8FA5002C */ lw $a1, 0x2c($sp) -/* 0651A8 800645A8 C5520014 */ lwc1 $f18, 0x14($t2) -/* 0651AC 800645AC 8FA20024 */ lw $v0, 0x24($sp) -/* 0651B0 800645B0 00A50019 */ multu $a1, $a1 -/* 0651B4 800645B4 46009221 */ cvt.d.s $f8, $f18 -/* 0651B8 800645B8 44858000 */ mtc1 $a1, $f16 -/* 0651BC 800645BC 844B0AE6 */ lh $t3, 0xae6($v0) -/* 0651C0 800645C0 46282180 */ add.d $f6, $f4, $f8 -/* 0651C4 800645C4 3C01800F */ lui $at, %hi(D_800EE6F8) -/* 0651C8 800645C8 256C0001 */ addiu $t4, $t3, 1 -/* 0651CC 800645CC 468084A0 */ cvt.s.w $f18, $f16 -/* 0651D0 800645D0 A44C0AE6 */ sh $t4, 0xae6($v0) -/* 0651D4 800645D4 84430AE6 */ lh $v1, 0xae6($v0) -/* 0651D8 800645D8 00006812 */ mflo $t5 -/* 0651DC 800645DC 448D8000 */ mtc1 $t5, $f16 -/* 0651E0 800645E0 462032A0 */ cvt.s.d $f10, $f6 -/* 0651E4 800645E4 E44A0AC8 */ swc1 $f10, 0xac8($v0) -/* 0651E8 800645E8 C7A40034 */ lwc1 $f4, 0x34($sp) -/* 0651EC 800645EC D42AE6F8 */ ldc1 $f10, %lo(D_800EE6F8)($at) -/* 0651F0 800645F0 2401000A */ li $at, 10 -/* 0651F4 800645F4 46049202 */ mul.s $f8, $f18, $f4 -/* 0651F8 800645F8 468084A1 */ cvt.d.w $f18, $f16 -/* 0651FC 800645FC 460041A1 */ cvt.d.s $f6, $f8 -/* 065200 80064600 46325102 */ mul.d $f4, $f10, $f18 -/* 065204 80064604 C44A0AF0 */ lwc1 $f10, 0xaf0($v0) -/* 065208 80064608 46243201 */ sub.d $f8, $f6, $f4 -/* 06520C 8006460C 46204420 */ cvt.s.d $f16, $f8 -/* 065210 80064610 46105480 */ add.s $f18, $f10, $f16 -/* 065214 80064614 14610005 */ bne $v1, $at, .L8006462C -/* 065218 80064618 E4520ACC */ swc1 $f18, 0xacc($v0) -/* 06521C 8006461C A4400AE6 */ sh $zero, 0xae6($v0) -/* 065220 80064620 A4400AE4 */ sh $zero, 0xae4($v0) -/* 065224 80064624 84430AE6 */ lh $v1, 0xae6($v0) -/* 065228 80064628 A4400ADA */ sh $zero, 0xada($v0) -.L8006462C: -/* 06522C 8006462C 28610007 */ slti $at, $v1, 7 -/* 065230 80064630 54200009 */ bnel $at, $zero, .L80064658 -/* 065234 80064634 8FBF0014 */ lw $ra, 0x14($sp) -/* 065238 80064638 844E0B06 */ lh $t6, 0xb06($v0) -/* 06523C 8006463C 25CFFFA0 */ addiu $t7, $t6, -0x60 -/* 065240 80064640 A44F0B06 */ sh $t7, 0xb06($v0) -/* 065244 80064644 84580B06 */ lh $t8, 0xb06($v0) -/* 065248 80064648 5F000003 */ bgtzl $t8, .L80064658 -/* 06524C 8006464C 8FBF0014 */ lw $ra, 0x14($sp) -/* 065250 80064650 A4400B06 */ sh $zero, 0xb06($v0) -/* 065254 80064654 8FBF0014 */ lw $ra, 0x14($sp) -.L80064658: -/* 065258 80064658 27BD0038 */ addiu $sp, $sp, 0x38 -/* 06525C 8006465C 03E00008 */ jr $ra -/* 065260 80064660 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80064664.s b/asm/non_matchings/code_80057C60/func_80064664.s deleted file mode 100644 index bec95714f..000000000 --- a/asm/non_matchings/code_80057C60/func_80064664.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80064664 -/* 065264 80064664 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 065268 80064668 00057400 */ sll $t6, $a1, 0x10 -/* 06526C 8006466C 000E7C03 */ sra $t7, $t6, 0x10 -/* 065270 80064670 000FC8C0 */ sll $t9, $t7, 3 -/* 065274 80064674 032FC821 */ addu $t9, $t9, $t7 -/* 065278 80064678 0019C8C0 */ sll $t9, $t9, 3 -/* 06527C 8006467C AFBF0014 */ sw $ra, 0x14($sp) -/* 065280 80064680 AFA40038 */ sw $a0, 0x38($sp) -/* 065284 80064684 AFA5003C */ sw $a1, 0x3c($sp) -/* 065288 80064688 AFA60040 */ sw $a2, 0x40($sp) -/* 06528C 8006468C AFA70044 */ sw $a3, 0x44($sp) -/* 065290 80064690 00991021 */ addu $v0, $a0, $t9 -/* 065294 80064694 C4440AEC */ lwc1 $f4, 0xaec($v0) -/* 065298 80064698 84430AE6 */ lh $v1, 0xae6($v0) -/* 06529C 8006469C E7A40034 */ swc1 $f4, 0x34($sp) -/* 0652A0 800646A0 94440AE8 */ lhu $a0, 0xae8($v0) -/* 0652A4 800646A4 AFA20024 */ sw $v0, 0x24($sp) -/* 0652A8 800646A8 0C0AE00E */ jal coss -/* 0652AC 800646AC AFA3002C */ sw $v1, 0x2c($sp) -/* 0652B0 800646B0 8FA3002C */ lw $v1, 0x2c($sp) -/* 0652B4 800646B4 3C01800F */ lui $at, %hi(D_800EE700) -/* 0652B8 800646B8 D426E700 */ ldc1 $f6, %lo(D_800EE700)($at) -/* 0652BC 800646BC 44834000 */ mtc1 $v1, $f8 -/* 0652C0 800646C0 46000421 */ cvt.d.s $f16, $f0 -/* 0652C4 800646C4 8FA80038 */ lw $t0, 0x38($sp) -/* 0652C8 800646C8 468042A1 */ cvt.d.w $f10, $f8 -/* 0652CC 800646CC 8FA20024 */ lw $v0, 0x24($sp) -/* 0652D0 800646D0 C504001C */ lwc1 $f4, 0x1c($t0) -/* 0652D4 800646D4 94440AE8 */ lhu $a0, 0xae8($v0) -/* 0652D8 800646D8 462A3082 */ mul.d $f2, $f6, $f10 -/* 0652DC 800646DC 46002221 */ cvt.d.s $f8, $f4 -/* 0652E0 800646E0 46228482 */ mul.d $f18, $f16, $f2 -/* 0652E4 800646E4 46289180 */ add.d $f6, $f18, $f8 -/* 0652E8 800646E8 462032A0 */ cvt.s.d $f10, $f6 -/* 0652EC 800646EC E44A0AD0 */ swc1 $f10, 0xad0($v0) -/* 0652F0 800646F0 0C0AE006 */ jal sins -/* 0652F4 800646F4 F7A20018 */ sdc1 $f2, 0x18($sp) -/* 0652F8 800646F8 D7A20018 */ ldc1 $f2, 0x18($sp) -/* 0652FC 800646FC 46000421 */ cvt.d.s $f16, $f0 -/* 065300 80064700 8FA90038 */ lw $t1, 0x38($sp) -/* 065304 80064704 46228102 */ mul.d $f4, $f16, $f2 -/* 065308 80064708 8FA3002C */ lw $v1, 0x2c($sp) -/* 06530C 8006470C C5320014 */ lwc1 $f18, 0x14($t1) -/* 065310 80064710 8FA20024 */ lw $v0, 0x24($sp) -/* 065314 80064714 00630019 */ multu $v1, $v1 -/* 065318 80064718 46009221 */ cvt.d.s $f8, $f18 -/* 06531C 8006471C 44838000 */ mtc1 $v1, $f16 -/* 065320 80064720 844A0AE6 */ lh $t2, 0xae6($v0) -/* 065324 80064724 46282180 */ add.d $f6, $f4, $f8 -/* 065328 80064728 3C01800F */ lui $at, %hi(D_800EE708) -/* 06532C 8006472C 254B0001 */ addiu $t3, $t2, 1 -/* 065330 80064730 468084A0 */ cvt.s.w $f18, $f16 -/* 065334 80064734 A44B0AE6 */ sh $t3, 0xae6($v0) -/* 065338 80064738 84440AE6 */ lh $a0, 0xae6($v0) -/* 06533C 8006473C 00006012 */ mflo $t4 -/* 065340 80064740 448C8000 */ mtc1 $t4, $f16 -/* 065344 80064744 462032A0 */ cvt.s.d $f10, $f6 -/* 065348 80064748 E44A0AC8 */ swc1 $f10, 0xac8($v0) -/* 06534C 8006474C C7A40034 */ lwc1 $f4, 0x34($sp) -/* 065350 80064750 D42AE708 */ ldc1 $f10, %lo(D_800EE708)($at) -/* 065354 80064754 24010019 */ li $at, 25 -/* 065358 80064758 46049202 */ mul.s $f8, $f18, $f4 -/* 06535C 8006475C 468084A1 */ cvt.d.w $f18, $f16 -/* 065360 80064760 460041A1 */ cvt.d.s $f6, $f8 -/* 065364 80064764 46325102 */ mul.d $f4, $f10, $f18 -/* 065368 80064768 C44A0AF0 */ lwc1 $f10, 0xaf0($v0) -/* 06536C 8006476C 46243201 */ sub.d $f8, $f6, $f4 -/* 065370 80064770 46204420 */ cvt.s.d $f16, $f8 -/* 065374 80064774 46105480 */ add.s $f18, $f10, $f16 -/* 065378 80064778 14810005 */ bne $a0, $at, .L80064790 -/* 06537C 8006477C E4520ACC */ swc1 $f18, 0xacc($v0) -/* 065380 80064780 A4400AE6 */ sh $zero, 0xae6($v0) -/* 065384 80064784 A4400AE4 */ sh $zero, 0xae4($v0) -/* 065388 80064788 84440AE6 */ lh $a0, 0xae6($v0) -/* 06538C 8006478C A4400ADA */ sh $zero, 0xada($v0) -.L80064790: -/* 065390 80064790 28810007 */ slti $at, $a0, 7 -/* 065394 80064794 54200009 */ bnel $at, $zero, .L800647BC -/* 065398 80064798 8FBF0014 */ lw $ra, 0x14($sp) -/* 06539C 8006479C 844D0B06 */ lh $t5, 0xb06($v0) -/* 0653A0 800647A0 25AEFFFA */ addiu $t6, $t5, -6 -/* 0653A4 800647A4 A44E0B06 */ sh $t6, 0xb06($v0) -/* 0653A8 800647A8 844F0B06 */ lh $t7, 0xb06($v0) -/* 0653AC 800647AC 5DE00003 */ bgtzl $t7, .L800647BC -/* 0653B0 800647B0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0653B4 800647B4 A4400B06 */ sh $zero, 0xb06($v0) -/* 0653B8 800647B8 8FBF0014 */ lw $ra, 0x14($sp) -.L800647BC: -/* 0653BC 800647BC 27BD0038 */ addiu $sp, $sp, 0x38 -/* 0653C0 800647C0 03E00008 */ jr $ra -/* 0653C4 800647C4 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006538C.s b/asm/non_matchings/code_80057C60/func_8006538C.s index a7ef7deab..f050dcde5 100644 --- a/asm/non_matchings/code_80057C60/func_8006538C.s +++ b/asm/non_matchings/code_80057C60/func_8006538C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EE7C0 +.double 1.4 + +.section .text + glabel func_8006538C /* 065F8C 8006538C 27BDFF40 */ addiu $sp, $sp, -0xc0 /* 065F90 80065390 0006C400 */ sll $t8, $a2, 0x10 diff --git a/asm/non_matchings/code_80057C60/func_8006801C.s b/asm/non_matchings/code_80057C60/func_8006801C.s index 0df34f9ab..8ef910e6e 100644 --- a/asm/non_matchings/code_80057C60/func_8006801C.s +++ b/asm/non_matchings/code_80057C60/func_8006801C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EE7C8 +.double 0.8 + +.section .text + glabel func_8006801C /* 068C1C 8006801C 27BDFF78 */ addiu $sp, $sp, -0x88 /* 068C20 80068020 AFA5008C */ sw $a1, 0x8c($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006A50C.s b/asm/non_matchings/code_80057C60/func_8006A50C.s index 4783a03e5..d08cd1d0f 100644 --- a/asm/non_matchings/code_80057C60/func_8006A50C.s +++ b/asm/non_matchings/code_80057C60/func_8006A50C.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel D_800EE7D0 +.float 0.1 +.word 0x00000000 + +glabel D_800EE7D8 +.double -3.8 + +.section .text + glabel func_8006A50C /* 06B10C 8006A50C 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 06B110 8006A510 AFB00024 */ sw $s0, 0x24($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006A7C0.s b/asm/non_matchings/code_80057C60/func_8006A7C0.s index 59098090f..54f696c5b 100644 --- a/asm/non_matchings/code_80057C60/func_8006A7C0.s +++ b/asm/non_matchings/code_80057C60/func_8006A7C0.s @@ -1,3 +1,47 @@ +.section .late_rodata + +glabel D_800EE7E0 +.double 0.0006 + +glabel D_800EE7E8 +.double -0.003 + +glabel D_800EE7F0 +.double 0.05 + +glabel D_800EE7F8 +.float 0.05 +.word 0x00000000 + +glabel D_800EE800 +.double -0.05 + +glabel D_800EE808 +.float -0.05 +.word 0x00000000 + +glabel D_800EE810 +.double 0.06 + +glabel D_800EE818 +.float 0.06 +.word 0x00000000 + +glabel D_800EE820 +.double -0.06 + +glabel D_800EE828 +.float -0.06 +.word 0x00000000 + +glabel D_800EE830 +.double -3.2 + +glabel D_800EE838 +.double 0.2 + +.section .text + glabel func_8006A7C0 /* 06B3C0 8006A7C0 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 06B3C4 8006A7C4 3C18800E */ lui $t8, %hi(D_800E4914) # $t8, 0x800e diff --git a/asm/non_matchings/code_80057C60/func_8006AFD0.s b/asm/non_matchings/code_80057C60/func_8006AFD0.s index d32806312..1b8b4ef65 100644 --- a/asm/non_matchings/code_80057C60/func_8006AFD0.s +++ b/asm/non_matchings/code_80057C60/func_8006AFD0.s @@ -1,3 +1,24 @@ +.section .late_rodata + +glabel D_800EE840 +.float 0.3 +.word 0x00000000 + +glabel D_800EE848 +.double 1.8 + +glabel D_800EE850 +.float 1.8 +.word 0x00000000 + +glabel D_800EE858 +.double 0.3 + +glabel D_800EE860 +.float 0.3 + +.section .text + glabel func_8006AFD0 /* 06BBD0 8006AFD0 27BDFE80 */ addiu $sp, $sp, -0x180 /* 06BBD4 8006AFD4 3C19800E */ lui $t9, %hi(D_800E4934) # $t9, 0x800e diff --git a/asm/non_matchings/code_80057C60/func_8006C6AC.s b/asm/non_matchings/code_80057C60/func_8006C6AC.s index 284f15680..0adbe15ae 100644 --- a/asm/non_matchings/code_80057C60/func_8006C6AC.s +++ b/asm/non_matchings/code_80057C60/func_8006C6AC.s @@ -1,3 +1,12 @@ +.section .late_rodata + +glabel jpt_800EE864 +.word L8006C734, L8006C750, L8006C76C, L8006C788 +.word L8006C7A4, L8006C9A4, L8006C9A4, L8006C9A4 +.word L8006C7C0, L8006C9A4, L8006C7DC + +.section .text + glabel func_8006C6AC /* 06D2AC 8006C6AC 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 06D2B0 8006C6B0 AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006C9B8.s b/asm/non_matchings/code_80057C60/func_8006C9B8.s index 5a72fe74c..d9ffd27ff 100644 --- a/asm/non_matchings/code_80057C60/func_8006C9B8.s +++ b/asm/non_matchings/code_80057C60/func_8006C9B8.s @@ -1,3 +1,12 @@ +.section .late_rodata + +glabel jpt_800EE890 +.word L8006CA50, L8006CA74, L8006CA98, L8006CABC +.word L8006CAE0, L8006CB04, L8006CB28, L8006CB4C +.word L8006CB70 + +.section .text + glabel func_8006C9B8 /* 06D5B8 8006C9B8 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 06D5BC 8006C9BC AFB10020 */ sw $s1, 0x20($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006CEC0.s b/asm/non_matchings/code_80057C60/func_8006CEC0.s index 9a8ef3744..304234e3b 100644 --- a/asm/non_matchings/code_80057C60/func_8006CEC0.s +++ b/asm/non_matchings/code_80057C60/func_8006CEC0.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EE8B4 +.word L8006CF38, L8006D184, L8006CF4C, L8006D184 +.word L8006CF60, L8006CF74, L8006CF88 + +.section .text + glabel func_8006CEC0 /* 06DAC0 8006CEC0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 06DAC4 8006CEC4 AFA5002C */ sw $a1, 0x2c($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006D194.s b/asm/non_matchings/code_80057C60/func_8006D194.s index f3c1abd00..907a9ef97 100644 --- a/asm/non_matchings/code_80057C60/func_8006D194.s +++ b/asm/non_matchings/code_80057C60/func_8006D194.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EE8D0 +.word L8006D200, L8006D22C, L8006D258, L8006D284 +.word L8006D2B0 + +.section .text + glabel func_8006D194 /* 06DD94 8006D194 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 06DD98 8006D198 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006D474.s b/asm/non_matchings/code_80057C60/func_8006D474.s index b406d3ef0..3d49ef7fe 100644 --- a/asm/non_matchings/code_80057C60/func_8006D474.s +++ b/asm/non_matchings/code_80057C60/func_8006D474.s @@ -1,3 +1,17 @@ +.section .late_rodata + +glabel jpt_800EE8E4 +.word L8006D628, L8006D69C, L8006D720, L8006D794 +.word L8006D808, L8006D87C, L8006D8F0, L8006D964 +.word L8006D628 + +glabel jpt_800EE908 +.word L8006D9F8, L8006DA6C, L8006DA6C, L8006DA6C +.word L8006DA6C, L8006DBC8, L8006DBC8, L8006DBC8 +.word L8006DAE0, L8006DBC8, L8006DB54 + +.section .text + glabel func_8006D474 /* 06E074 8006D474 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 06E078 8006D478 AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006DD3C.s b/asm/non_matchings/code_80057C60/func_8006DD3C.s deleted file mode 100644 index 563bb66c2..000000000 --- a/asm/non_matchings/code_80057C60/func_8006DD3C.s +++ /dev/null @@ -1,214 +0,0 @@ -glabel func_8006DD3C -/* 06E93C 8006DD3C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 06E940 8006DD40 AFB30028 */ sw $s3, 0x28($sp) -/* 06E944 8006DD44 00069E00 */ sll $s3, $a2, 0x18 -/* 06E948 8006DD48 AFBF003C */ sw $ra, 0x3c($sp) -/* 06E94C 8006DD4C AFB70038 */ sw $s7, 0x38($sp) -/* 06E950 8006DD50 AFB60034 */ sw $s6, 0x34($sp) -/* 06E954 8006DD54 AFB50030 */ sw $s5, 0x30($sp) -/* 06E958 8006DD58 AFB4002C */ sw $s4, 0x2c($sp) -/* 06E95C 8006DD5C AFB20024 */ sw $s2, 0x24($sp) -/* 06E960 8006DD60 AFB10020 */ sw $s1, 0x20($sp) -/* 06E964 8006DD64 AFB0001C */ sw $s0, 0x1c($sp) -/* 06E968 8006DD68 AFA50044 */ sw $a1, 0x44($sp) -/* 06E96C 8006DD6C AFA60048 */ sw $a2, 0x48($sp) -/* 06E970 8006DD70 94880002 */ lhu $t0, 2($a0) -/* 06E974 8006DD74 00137E03 */ sra $t7, $s3, 0x18 -/* 06E978 8006DD78 000FC080 */ sll $t8, $t7, 2 -/* 06E97C 8006DD7C 24190008 */ li $t9, 8 -/* 06E980 8006DD80 00058E00 */ sll $s1, $a1, 0x18 -/* 06E984 8006DD84 03191004 */ sllv $v0, $t9, $t8 -/* 06E988 8006DD88 00117603 */ sra $t6, $s1, 0x18 -/* 06E98C 8006DD8C 01024824 */ and $t1, $t0, $v0 -/* 06E990 8006DD90 01C08825 */ move $s1, $t6 -/* 06E994 8006DD94 01E09825 */ move $s3, $t7 -/* 06E998 8006DD98 144900A4 */ bne $v0, $t1, .L8006E02C -/* 06E99C 8006DD9C 00809025 */ move $s2, $a0 -/* 06E9A0 8006DDA0 3C16800E */ lui $s6, %hi(gActiveScreenMode) # $s6, 0x800e -/* 06E9A4 8006DDA4 26D6C52C */ addiu $s6, %lo(gActiveScreenMode) # addiu $s6, $s6, -0x3ad4 -/* 06E9A8 8006DDA8 00008025 */ move $s0, $zero -/* 06E9AC 8006DDAC 24170005 */ li $s7, 5 -/* 06E9B0 8006DDB0 24150048 */ li $s5, 72 -/* 06E9B4 8006DDB4 24140003 */ li $s4, 3 -.L8006DDB8: -/* 06E9B8 8006DDB8 02150019 */ multu $s0, $s5 -/* 06E9BC 8006DDBC 00005012 */ mflo $t2 -/* 06E9C0 8006DDC0 024A5821 */ addu $t3, $s2, $t2 -/* 06E9C4 8006DDC4 9562026A */ lhu $v0, 0x26a($t3) -/* 06E9C8 8006DDC8 50540010 */ beql $v0, $s4, .L8006DE0C -/* 06E9CC 8006DDCC 8ECF0000 */ lw $t7, ($s6) -/* 06E9D0 8006DDD0 14570028 */ bne $v0, $s7, .L8006DE74 -/* 06E9D4 8006DDD4 02402025 */ move $a0, $s2 -/* 06E9D8 8006DDD8 00112E00 */ sll $a1, $s1, 0x18 -/* 06E9DC 8006DDDC 00103400 */ sll $a2, $s0, 0x10 -/* 06E9E0 8006DDE0 00133E00 */ sll $a3, $s3, 0x18 -/* 06E9E4 8006DDE4 00077603 */ sra $t6, $a3, 0x18 -/* 06E9E8 8006DDE8 00066C03 */ sra $t5, $a2, 0x10 -/* 06E9EC 8006DDEC 00056603 */ sra $t4, $a1, 0x18 -/* 06E9F0 8006DDF0 01802825 */ move $a1, $t4 -/* 06E9F4 8006DDF4 01A03025 */ move $a2, $t5 -/* 06E9F8 8006DDF8 0C01A8A0 */ jal func_8006A280 -/* 06E9FC 8006DDFC 01C03825 */ move $a3, $t6 -/* 06EA00 8006DE00 1000001D */ b .L8006DE78 -/* 06EA04 8006DE04 26100001 */ addiu $s0, $s0, 1 -/* 06EA08 8006DE08 8ECF0000 */ lw $t7, ($s6) -.L8006DE0C: -/* 06EA0C 8006DE0C 00112E00 */ sll $a1, $s1, 0x18 -/* 06EA10 8006DE10 00054E03 */ sra $t1, $a1, 0x18 -/* 06EA14 8006DE14 168F000F */ bne $s4, $t7, .L8006DE54 -/* 06EA18 8006DE18 02402025 */ move $a0, $s2 -/* 06EA1C 8006DE1C 16710015 */ bne $s3, $s1, .L8006DE74 -/* 06EA20 8006DE20 02402025 */ move $a0, $s2 -/* 06EA24 8006DE24 00112E00 */ sll $a1, $s1, 0x18 -/* 06EA28 8006DE28 00103400 */ sll $a2, $s0, 0x10 -/* 06EA2C 8006DE2C 00133E00 */ sll $a3, $s3, 0x18 -/* 06EA30 8006DE30 00074603 */ sra $t0, $a3, 0x18 -/* 06EA34 8006DE34 0006C403 */ sra $t8, $a2, 0x10 -/* 06EA38 8006DE38 0005CE03 */ sra $t9, $a1, 0x18 -/* 06EA3C 8006DE3C 03202825 */ move $a1, $t9 -/* 06EA40 8006DE40 03003025 */ move $a2, $t8 -/* 06EA44 8006DE44 0C019A66 */ jal func_80066998 -/* 06EA48 8006DE48 01003825 */ move $a3, $t0 -/* 06EA4C 8006DE4C 1000000A */ b .L8006DE78 -/* 06EA50 8006DE50 26100001 */ addiu $s0, $s0, 1 -.L8006DE54: -/* 06EA54 8006DE54 00103400 */ sll $a2, $s0, 0x10 -/* 06EA58 8006DE58 00133E00 */ sll $a3, $s3, 0x18 -/* 06EA5C 8006DE5C 00075E03 */ sra $t3, $a3, 0x18 -/* 06EA60 8006DE60 00065403 */ sra $t2, $a2, 0x10 -/* 06EA64 8006DE64 01403025 */ move $a2, $t2 -/* 06EA68 8006DE68 01603825 */ move $a3, $t3 -/* 06EA6C 8006DE6C 0C019A66 */ jal func_80066998 -/* 06EA70 8006DE70 01202825 */ move $a1, $t1 -.L8006DE74: -/* 06EA74 8006DE74 26100001 */ addiu $s0, $s0, 1 -.L8006DE78: -/* 06EA78 8006DE78 00106400 */ sll $t4, $s0, 0x10 -/* 06EA7C 8006DE7C 000C8403 */ sra $s0, $t4, 0x10 -/* 06EA80 8006DE80 2A01000A */ slti $at, $s0, 0xa -/* 06EA84 8006DE84 1420FFCC */ bnez $at, .L8006DDB8 -/* 06EA88 8006DE88 00000000 */ nop -/* 06EA8C 8006DE8C 964E0000 */ lhu $t6, ($s2) -/* 06EA90 8006DE90 24014000 */ li $at, 16384 -/* 06EA94 8006DE94 31CF4000 */ andi $t7, $t6, 0x4000 -/* 06EA98 8006DE98 55E10065 */ bnel $t7, $at, .L8006E030 -/* 06EA9C 8006DE9C 8FBF003C */ lw $ra, 0x3c($sp) -/* 06EAA0 8006DEA0 56710063 */ bnel $s3, $s1, .L8006E030 -/* 06EAA4 8006DEA4 8FBF003C */ lw $ra, 0x3c($sp) -/* 06EAA8 8006DEA8 9659080A */ lhu $t9, 0x80a($s2) -/* 06EAAC 8006DEAC 2738FFFE */ addiu $t8, $t9, -2 -/* 06EAB0 8006DEB0 2F010005 */ sltiu $at, $t8, 5 -/* 06EAB4 8006DEB4 10200040 */ beqz $at, .L8006DFB8 -/* 06EAB8 8006DEB8 0018C080 */ sll $t8, $t8, 2 -/* 06EABC 8006DEBC 3C01800F */ lui $at, %hi(jpt_800EE934) -/* 06EAC0 8006DEC0 00380821 */ addu $at, $at, $t8 -/* 06EAC4 8006DEC4 8C38E934 */ lw $t8, %lo(jpt_800EE934)($at) -/* 06EAC8 8006DEC8 03000008 */ jr $t8 -/* 06EACC 8006DECC 00000000 */ nop -glabel L8006DED0 -/* 06EAD0 8006DED0 00112E00 */ sll $a1, $s1, 0x18 -/* 06EAD4 8006DED4 00133E00 */ sll $a3, $s3, 0x18 -/* 06EAD8 8006DED8 00074E03 */ sra $t1, $a3, 0x18 -/* 06EADC 8006DEDC 00054603 */ sra $t0, $a1, 0x18 -/* 06EAE0 8006DEE0 8E460804 */ lw $a2, 0x804($s2) -/* 06EAE4 8006DEE4 AFA00010 */ sw $zero, 0x10($sp) -/* 06EAE8 8006DEE8 01002825 */ move $a1, $t0 -/* 06EAEC 8006DEEC 01203825 */ move $a3, $t1 -/* 06EAF0 8006DEF0 0C01A0C4 */ jal func_80068310 -/* 06EAF4 8006DEF4 02402025 */ move $a0, $s2 -/* 06EAF8 8006DEF8 10000030 */ b .L8006DFBC -/* 06EAFC 8006DEFC 96480852 */ lhu $t0, 0x852($s2) -glabel L8006DF00 -/* 06EB00 8006DF00 00112E00 */ sll $a1, $s1, 0x18 -/* 06EB04 8006DF04 00133E00 */ sll $a3, $s3, 0x18 -/* 06EB08 8006DF08 00075E03 */ sra $t3, $a3, 0x18 -/* 06EB0C 8006DF0C 00055603 */ sra $t2, $a1, 0x18 -/* 06EB10 8006DF10 8E460804 */ lw $a2, 0x804($s2) -/* 06EB14 8006DF14 AFA00010 */ sw $zero, 0x10($sp) -/* 06EB18 8006DF18 01402825 */ move $a1, $t2 -/* 06EB1C 8006DF1C 01603825 */ move $a3, $t3 -/* 06EB20 8006DF20 0C019E59 */ jal func_80067964 -/* 06EB24 8006DF24 02402025 */ move $a0, $s2 -/* 06EB28 8006DF28 10000024 */ b .L8006DFBC -/* 06EB2C 8006DF2C 96480852 */ lhu $t0, 0x852($s2) -glabel L8006DF30 -/* 06EB30 8006DF30 00112E00 */ sll $a1, $s1, 0x18 -/* 06EB34 8006DF34 00133E00 */ sll $a3, $s3, 0x18 -/* 06EB38 8006DF38 00076E03 */ sra $t5, $a3, 0x18 -/* 06EB3C 8006DF3C 00056603 */ sra $t4, $a1, 0x18 -/* 06EB40 8006DF40 8E460804 */ lw $a2, 0x804($s2) -/* 06EB44 8006DF44 AFA00010 */ sw $zero, 0x10($sp) -/* 06EB48 8006DF48 01802825 */ move $a1, $t4 -/* 06EB4C 8006DF4C 01A03825 */ move $a3, $t5 -/* 06EB50 8006DF50 0C01A1C9 */ jal func_80068724 -/* 06EB54 8006DF54 02402025 */ move $a0, $s2 -/* 06EB58 8006DF58 10000018 */ b .L8006DFBC -/* 06EB5C 8006DF5C 96480852 */ lhu $t0, 0x852($s2) -glabel L8006DF60 -/* 06EB60 8006DF60 00112E00 */ sll $a1, $s1, 0x18 -/* 06EB64 8006DF64 00133E00 */ sll $a3, $s3, 0x18 -/* 06EB68 8006DF68 00077E03 */ sra $t7, $a3, 0x18 -/* 06EB6C 8006DF6C 00057603 */ sra $t6, $a1, 0x18 -/* 06EB70 8006DF70 8E460804 */ lw $a2, 0x804($s2) -/* 06EB74 8006DF74 AFA00010 */ sw $zero, 0x10($sp) -/* 06EB78 8006DF78 01C02825 */ move $a1, $t6 -/* 06EB7C 8006DF7C 01E03825 */ move $a3, $t7 -/* 06EB80 8006DF80 0C01A2A9 */ jal func_80068AA4 -/* 06EB84 8006DF84 02402025 */ move $a0, $s2 -/* 06EB88 8006DF88 1000000C */ b .L8006DFBC -/* 06EB8C 8006DF8C 96480852 */ lhu $t0, 0x852($s2) -glabel L8006DF90 -/* 06EB90 8006DF90 00112E00 */ sll $a1, $s1, 0x18 -/* 06EB94 8006DF94 00133E00 */ sll $a3, $s3, 0x18 -/* 06EB98 8006DF98 0007C603 */ sra $t8, $a3, 0x18 -/* 06EB9C 8006DF9C 0005CE03 */ sra $t9, $a1, 0x18 -/* 06EBA0 8006DFA0 8E460804 */ lw $a2, 0x804($s2) -/* 06EBA4 8006DFA4 AFA00010 */ sw $zero, 0x10($sp) -/* 06EBA8 8006DFA8 03202825 */ move $a1, $t9 -/* 06EBAC 8006DFAC 03003825 */ move $a3, $t8 -/* 06EBB0 8006DFB0 0C01A368 */ jal func_80068DA0 -/* 06EBB4 8006DFB4 02402025 */ move $a0, $s2 -.L8006DFB8: -/* 06EBB8 8006DFB8 96480852 */ lhu $t0, 0x852($s2) -.L8006DFBC: -/* 06EBBC 8006DFBC 00132E00 */ sll $a1, $s3, 0x18 -/* 06EBC0 8006DFC0 00054E03 */ sra $t1, $a1, 0x18 -/* 06EBC4 8006DFC4 16E80019 */ bne $s7, $t0, .L8006E02C -/* 06EBC8 8006DFC8 02402025 */ move $a0, $s2 -/* 06EBCC 8006DFCC 3C01800F */ lui $at, %hi(D_800EE948) # $at, 0x800f -/* 06EBD0 8006DFD0 C424E948 */ lwc1 $f4, %lo(D_800EE948)($at) -/* 06EBD4 8006DFD4 3C0A00FF */ lui $t2, (0x00FFFFFF >> 16) # lui $t2, 0xff -/* 06EBD8 8006DFD8 354AFFFF */ ori $t2, (0x00FFFFFF & 0xFFFF) # ori $t2, $t2, 0xffff -/* 06EBDC 8006DFDC 3C068019 */ lui $a2, %hi(D_8018D480) # $a2, 0x8019 -/* 06EBE0 8006DFE0 8CC6D480 */ lw $a2, %lo(D_8018D480)($a2) -/* 06EBE4 8006DFE4 AFAA0014 */ sw $t2, 0x14($sp) -/* 06EBE8 8006DFE8 01202825 */ move $a1, $t1 -/* 06EBEC 8006DFEC 24070001 */ li $a3, 1 -/* 06EBF0 8006DFF0 0C019F4F */ jal func_80067D3C -/* 06EBF4 8006DFF4 E7A40010 */ swc1 $f4, 0x10($sp) -/* 06EBF8 8006DFF8 3C01800F */ lui $at, %hi(D_800EE94C) # $at, 0x800f -/* 06EBFC 8006DFFC C426E94C */ lwc1 $f6, %lo(D_800EE94C)($at) -/* 06EC00 8006E000 00132E00 */ sll $a1, $s3, 0x18 -/* 06EC04 8006E004 00055E03 */ sra $t3, $a1, 0x18 -/* 06EC08 8006E008 3C068019 */ lui $a2, %hi(D_8018D484) # $a2, 0x8019 -/* 06EC0C 8006E00C 240C00FF */ li $t4, 255 -/* 06EC10 8006E010 AFAC0014 */ sw $t4, 0x14($sp) -/* 06EC14 8006E014 8CC6D484 */ lw $a2, %lo(D_8018D484)($a2) -/* 06EC18 8006E018 01602825 */ move $a1, $t3 -/* 06EC1C 8006E01C 02402025 */ move $a0, $s2 -/* 06EC20 8006E020 24070001 */ li $a3, 1 -/* 06EC24 8006E024 0C01A007 */ jal func_8006801C -/* 06EC28 8006E028 E7A60010 */ swc1 $f6, 0x10($sp) -.L8006E02C: -/* 06EC2C 8006E02C 8FBF003C */ lw $ra, 0x3c($sp) -.L8006E030: -/* 06EC30 8006E030 8FB0001C */ lw $s0, 0x1c($sp) -/* 06EC34 8006E034 8FB10020 */ lw $s1, 0x20($sp) -/* 06EC38 8006E038 8FB20024 */ lw $s2, 0x24($sp) -/* 06EC3C 8006E03C 8FB30028 */ lw $s3, 0x28($sp) -/* 06EC40 8006E040 8FB4002C */ lw $s4, 0x2c($sp) -/* 06EC44 8006E044 8FB50030 */ lw $s5, 0x30($sp) -/* 06EC48 8006E048 8FB60034 */ lw $s6, 0x34($sp) -/* 06EC4C 8006E04C 8FB70038 */ lw $s7, 0x38($sp) -/* 06EC50 8006E050 03E00008 */ jr $ra -/* 06EC54 8006E054 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_8006E9C0/func_8006F008.s b/asm/non_matchings/code_8006E9C0/func_8006F008.s index 2baec86c2..5d36c2bcb 100644 --- a/asm/non_matchings/code_8006E9C0/func_8006F008.s +++ b/asm/non_matchings/code_8006E9C0/func_8006F008.s @@ -1,3 +1,74 @@ +.section .late_rodata + +glabel jpt_800EE950 +.word L8006F0E4, L8006F174, L8006F1AC, L8006F1E4 +.word L8006F248, L8006F2A4, L8006F2FC, L8006F360 +.word L8006F3E8, L8006F470, L8006F4D4, L8006F50C +.word L8006F578, L8006F600, L8006F640, L8006F678 +.word L8006F6A4, L8006F6D0, L8006F6FC, L8006F734 + +glabel D_800EE9A0 +.float 0.022 + +glabel D_800EE9A4 +.float 0.022 + +glabel D_800EE9A8 +.float 0.0174 + +glabel D_800EE9AC +.float 0.016 + +glabel D_800EE9B0 +.float 0.018 + +glabel D_800EE9B4 +.float 0.016 + +glabel D_800EE9B8 +.float 0.014 + +glabel D_800EE9BC +.float 0.014 + +glabel D_800EE9C0 +.float 0.0155 + +glabel D_800EE9C4 +.float 0.0155 + +glabel D_800EE9C8 +.float 0.013 + +glabel D_800EE9CC +.float 0.015 + +glabel D_800EE9D0 +.float 0.015 + +glabel D_800EE9D4 +.float 0.0103 + +glabel D_800EE9D8 +.float 0.0155 + +glabel D_800EE9DC +.float 0.0335 + +glabel D_800EE9E0 +.float 0.0445 + +glabel D_800EE9E4 +.float 0.0285 + +glabel D_800EE9E8 +.float 0.0155 + +glabel D_800EE9EC +.float 0.0257 + +.section .text + glabel func_8006F008 /* 06FC08 8006F008 3C018016 */ lui $at, %hi(D_801655C8) # $at, 0x8016 /* 06FC0C 8006F00C AC2055C8 */ sw $zero, %lo(D_801655C8)($at) diff --git a/asm/non_matchings/code_8006E9C0/func_8007055C.s b/asm/non_matchings/code_8006E9C0/func_8007055C.s index f426fcf0c..ee7b39989 100644 --- a/asm/non_matchings/code_8006E9C0/func_8007055C.s +++ b/asm/non_matchings/code_8006E9C0/func_8007055C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel jpt_800EE9F0 +.word L800705A0, L800706EC, L800706EC, L800706EC +.word L800705B4, L800705C8, L80070640, L80070654 +.word L80070668, L8007067C, L80070690, L800706A4 +.word L800706B8, L800706CC, L800706E0 + +.section .text + glabel func_8007055C /* 07115C 8007055C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 071160 80070560 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e diff --git a/asm/non_matchings/code_8006E9C0/func_80070780.s b/asm/non_matchings/code_8006E9C0/func_80070780.s index 07aeda17e..855fb3803 100644 --- a/asm/non_matchings/code_8006E9C0/func_80070780.s +++ b/asm/non_matchings/code_8006E9C0/func_80070780.s @@ -1,3 +1,18 @@ +.section .late_rodata + +glabel jpt_800EEA2C +.word L800707CC +.word L80071400, L80070848, L80070AA8, L80070B30 +.word L80070C60, L80070DD8, L80070F10, L80070F8C +.word L80071024, L80071400, L800712A0, L80071348 +.word L80071378, L80071400, L80071400, L80071400 +.word L80071400, L800713E4 + +glabel D_800EEA78 +.float 0.7 + +.section .text + glabel func_80070780 /* 071380 80070780 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 071384 80070784 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e diff --git a/asm/non_matchings/code_80071F00/func_80074924.s b/asm/non_matchings/code_80071F00/func_80074924.s index 0fe56f63f..0d5d89f82 100644 --- a/asm/non_matchings/code_80071F00/func_80074924.s +++ b/asm/non_matchings/code_80071F00/func_80074924.s @@ -1,3 +1,26 @@ +.section .late_rodata + +glabel D_800EEA80 +.float 0.15 +.word 0x00000000 + +glabel D_800EEA88 +.double 180.0 + +glabel D_800EEA90 +.double 150.0 + +glabel D_800EEA98 +.double 0.8 + +glabel D_800EEAA0 +.double 0.2 + +glabel D_800EEAA8 +.double 0.4 + +.section .text + glabel func_80074924 /* 075524 80074924 000478C0 */ sll $t7, $a0, 3 /* 075528 80074928 3C01800F */ lui $at, %hi(D_800EEA80) # $at, 0x800f diff --git a/asm/non_matchings/code_80071F00/func_800750D8.s b/asm/non_matchings/code_80071F00/func_800750D8.s deleted file mode 100644 index 28ad49274..000000000 --- a/asm/non_matchings/code_80071F00/func_800750D8.s +++ /dev/null @@ -1,145 +0,0 @@ -glabel func_800750D8 -/* 075CD8 800750D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 075CDC 800750DC AFBF0014 */ sw $ra, 0x14($sp) -/* 075CE0 800750E0 AFA5002C */ sw $a1, 0x2c($sp) -/* 075CE4 800750E4 AFA40028 */ sw $a0, 0x28($sp) -/* 075CE8 800750E8 AFA60030 */ sw $a2, 0x30($sp) -/* 075CEC 800750EC AFA70034 */ sw $a3, 0x34($sp) -/* 075CF0 800750F0 0C01C8E9 */ jal func_800723A4 -/* 075CF4 800750F4 00002825 */ move $a1, $zero -/* 075CF8 800750F8 0C0ADF8D */ jal random_int -/* 075CFC 800750FC 240401F4 */ li $a0, 500 -/* 075D00 80075100 AFA20024 */ sw $v0, 0x24($sp) -/* 075D04 80075104 0C0ADF8D */ jal random_int -/* 075D08 80075108 24040032 */ li $a0, 50 -/* 075D0C 8007510C 8FA80024 */ lw $t0, 0x24($sp) -/* 075D10 80075110 8FAE0028 */ lw $t6, 0x28($sp) -/* 075D14 80075114 8FB90034 */ lw $t9, 0x34($sp) -/* 075D18 80075118 44882000 */ mtc1 $t0, $f4 -/* 075D1C 8007511C 000E78C0 */ sll $t7, $t6, 3 -/* 075D20 80075120 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 075D24 80075124 468021A0 */ cvt.s.w $f6, $f4 -/* 075D28 80075128 01EE7823 */ subu $t7, $t7, $t6 -/* 075D2C 8007512C 000F7940 */ sll $t7, $t7, 5 -/* 075D30 80075130 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 075D34 80075134 01F81821 */ addu $v1, $t7, $t8 -/* 075D38 80075138 3C01800F */ lui $at, %hi(D_800EEAB0) -/* 075D3C 8007513C A07900D5 */ sb $t9, 0xd5($v1) -/* 075D40 80075140 D42AEAB0 */ ldc1 $f10, %lo(D_800EEAB0)($at) -/* 075D44 80075144 46003221 */ cvt.d.s $f8, $f6 -/* 075D48 80075148 3C01800F */ lui $at, %hi(D_800EEAB8) -/* 075D4C 8007514C 462A4402 */ mul.d $f16, $f8, $f10 -/* 075D50 80075150 D432EAB8 */ ldc1 $f18, %lo(D_800EEAB8)($at) -/* 075D54 80075154 3C01800F */ lui $at, %hi(D_800EEAC0) -/* 075D58 80075158 8FAA002C */ lw $t2, 0x2c($sp) -/* 075D5C 8007515C 8FAC0038 */ lw $t4, 0x38($sp) -/* 075D60 80075160 00402825 */ move $a1, $v0 -/* 075D64 80075164 000A5C00 */ sll $t3, $t2, 0x10 -/* 075D68 80075168 44854000 */ mtc1 $a1, $f8 -/* 075D6C 8007516C 46328100 */ add.d $f4, $f16, $f18 -/* 075D70 80075170 8FAE0030 */ lw $t6, 0x30($sp) -/* 075D74 80075174 00403025 */ move $a2, $v0 -/* 075D78 80075178 468042A0 */ cvt.s.w $f10, $f8 -/* 075D7C 8007517C 2404000A */ li $a0, 10 -/* 075D80 80075180 462021A0 */ cvt.s.d $f6, $f4 -/* 075D84 80075184 46005421 */ cvt.d.s $f16, $f10 -/* 075D88 80075188 E4660000 */ swc1 $f6, ($v1) -/* 075D8C 8007518C D432EAC0 */ ldc1 $f18, %lo(D_800EEAC0)($at) -/* 075D90 80075190 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 075D94 80075194 44813800 */ mtc1 $at, $f7 -/* 075D98 80075198 24010005 */ li $at, 5 -/* 075D9C 8007519C 0041001A */ div $zero, $v0, $at -/* 075DA0 800751A0 00004810 */ mfhi $t1 -/* 075DA4 800751A4 46328102 */ mul.d $f4, $f16, $f18 -/* 075DA8 800751A8 44803000 */ mtc1 $zero, $f6 -/* 075DAC 800751AC 016C001A */ div $zero, $t3, $t4 -/* 075DB0 800751B0 46262200 */ add.d $f8, $f4, $f6 -/* 075DB4 800751B4 44898000 */ mtc1 $t1, $f16 -/* 075DB8 800751B8 3C01800F */ lui $at, %hi(D_800EEAC8) -/* 075DBC 800751BC 00006812 */ mflo $t5 -/* 075DC0 800751C0 468084A0 */ cvt.s.w $f18, $f16 -/* 075DC4 800751C4 462042A0 */ cvt.s.d $f10, $f8 -/* 075DC8 800751C8 46009121 */ cvt.d.s $f4, $f18 -/* 075DCC 800751CC E46A003C */ swc1 $f10, 0x3c($v1) -/* 075DD0 800751D0 D426EAC8 */ ldc1 $f6, %lo(D_800EEAC8)($at) -/* 075DD4 800751D4 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 075DD8 800751D8 44815800 */ mtc1 $at, $f11 -/* 075DDC 800751DC 46262202 */ mul.d $f8, $f4, $f6 -/* 075DE0 800751E0 44805000 */ mtc1 $zero, $f10 -/* 075DE4 800751E4 A46D00C0 */ sh $t5, 0xc0($v1) -/* 075DE8 800751E8 462A4400 */ add.d $f16, $f8, $f10 -/* 075DEC 800751EC 462084A0 */ cvt.s.d $f18, $f16 -/* 075DF0 800751F0 E4720034 */ swc1 $f18, 0x34($v1) -/* 075DF4 800751F4 15800002 */ bnez $t4, .L80075200 -/* 075DF8 800751F8 00000000 */ nop -/* 075DFC 800751FC 0007000D */ break 7 -.L80075200: -/* 075E00 80075200 2401FFFF */ li $at, -1 -/* 075E04 80075204 15810004 */ bne $t4, $at, .L80075218 -/* 075E08 80075208 3C018000 */ lui $at, 0x8000 -/* 075E0C 8007520C 15610002 */ bne $t3, $at, .L80075218 -/* 075E10 80075210 00000000 */ nop -/* 075E14 80075214 0006000D */ break 6 -.L80075218: -/* 075E18 80075218 C5C40000 */ lwc1 $f4, ($t6) -/* 075E1C 8007521C 04A10003 */ bgez $a1, .L8007522C -/* 075E20 80075220 00057843 */ sra $t7, $a1, 1 -/* 075E24 80075224 24A10001 */ addiu $at, $a1, 1 -/* 075E28 80075228 00017843 */ sra $t7, $at, 1 -.L8007522C: -/* 075E2C 8007522C 448F3000 */ mtc1 $t7, $f6 -/* 075E30 80075230 3C014140 */ li $at, 0x41400000 # 12.000000 -/* 075E34 80075234 44818000 */ mtc1 $at, $f16 -/* 075E38 80075238 46803220 */ cvt.s.w $f8, $f6 -/* 075E3C 8007523C AFA60020 */ sw $a2, 0x20($sp) -/* 075E40 80075240 AFA30018 */ sw $v1, 0x18($sp) -/* 075E44 80075244 46082280 */ add.s $f10, $f4, $f8 -/* 075E48 80075248 46105481 */ sub.s $f18, $f10, $f16 -/* 075E4C 8007524C 0C0ADF8D */ jal random_int -/* 075E50 80075250 E4720010 */ swc1 $f18, 0x10($v1) -/* 075E54 80075254 8FB80030 */ lw $t8, 0x30($sp) -/* 075E58 80075258 44808000 */ mtc1 $zero, $f16 -/* 075E5C 8007525C 44827000 */ mtc1 $v0, $f14 -/* 075E60 80075260 C70C0004 */ lwc1 $f12, 4($t8) -/* 075E64 80075264 3C014024 */ li $at, 0x40240000 # 2.562500 -/* 075E68 80075268 468074A1 */ cvt.d.w $f18, $f14 -/* 075E6C 8007526C 44818800 */ mtc1 $at, $f17 -/* 075E70 80075270 8FA30018 */ lw $v1, 0x18($sp) -/* 075E74 80075274 8FA60020 */ lw $a2, 0x20($sp) -/* 075E78 80075278 46006321 */ cvt.d.s $f12, $f12 -/* 075E7C 8007527C 04410006 */ bgez $v0, .L80075298 -/* 075E80 80075280 46306281 */ sub.d $f10, $f12, $f16 -/* 075E84 80075284 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 075E88 80075288 44813800 */ mtc1 $at, $f7 -/* 075E8C 8007528C 44803000 */ mtc1 $zero, $f6 -/* 075E90 80075290 00000000 */ nop -/* 075E94 80075294 46269480 */ add.d $f18, $f18, $f6 -.L80075298: -/* 075E98 80075298 462A9100 */ add.d $f4, $f18, $f10 -/* 075E9C 8007529C 8FB90030 */ lw $t9, 0x30($sp) -/* 075EA0 800752A0 8FA90024 */ lw $t1, 0x24($sp) -/* 075EA4 800752A4 8FBF0014 */ lw $ra, 0x14($sp) -/* 075EA8 800752A8 46202220 */ cvt.s.d $f8, $f4 -/* 075EAC 800752AC 00062080 */ sll $a0, $a2, 2 -/* 075EB0 800752B0 00862021 */ addu $a0, $a0, $a2 -/* 075EB4 800752B4 00042100 */ sll $a0, $a0, 4 -/* 075EB8 800752B8 E4680014 */ swc1 $f8, 0x14($v1) -/* 075EBC 800752BC C7300008 */ lwc1 $f16, 8($t9) -/* 075EC0 800752C0 04C10003 */ bgez $a2, .L800752D0 -/* 075EC4 800752C4 00064043 */ sra $t0, $a2, 1 -/* 075EC8 800752C8 24C10001 */ addiu $at, $a2, 1 -/* 075ECC 800752CC 00014043 */ sra $t0, $at, 1 -.L800752D0: -/* 075ED0 800752D0 44883000 */ mtc1 $t0, $f6 -/* 075ED4 800752D4 3C014140 */ li $at, 0x41400000 # 12.000000 -/* 075ED8 800752D8 44812000 */ mtc1 $at, $f4 -/* 075EDC 800752DC 468034A0 */ cvt.s.w $f18, $f6 -/* 075EE0 800752E0 000951C0 */ sll $t2, $t1, 7 -/* 075EE4 800752E4 A46A00B2 */ sh $t2, 0xb2($v1) -/* 075EE8 800752E8 A46400B4 */ sh $a0, 0xb4($v1) -/* 075EEC 800752EC A46400B6 */ sh $a0, 0xb6($v1) -/* 075EF0 800752F0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 075EF4 800752F4 46128280 */ add.s $f10, $f16, $f18 -/* 075EF8 800752F8 46045201 */ sub.s $f8, $f10, $f4 -/* 075EFC 800752FC 03E00008 */ jr $ra -/* 075F00 80075300 E4680018 */ swc1 $f8, 0x18($v1) diff --git a/asm/non_matchings/code_80071F00/func_800763CC.s b/asm/non_matchings/code_80071F00/func_800763CC.s deleted file mode 100644 index dba21fff1..000000000 --- a/asm/non_matchings/code_80071F00/func_800763CC.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_800763CC -/* 076FCC 800763CC 000470C0 */ sll $t6, $a0, 3 -/* 076FD0 800763D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 076FD4 800763D4 01C47023 */ subu $t6, $t6, $a0 -/* 076FD8 800763D8 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 076FDC 800763DC AFB00024 */ sw $s0, 0x24($sp) -/* 076FE0 800763E0 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 076FE4 800763E4 000E7140 */ sll $t6, $t6, 5 -/* 076FE8 800763E8 01CF8021 */ addu $s0, $t6, $t7 -/* 076FEC 800763EC 961800A6 */ lhu $t8, 0xa6($s0) -/* 076FF0 800763F0 AFB10028 */ sw $s1, 0x28($sp) -/* 076FF4 800763F4 00808825 */ move $s1, $a0 -/* 076FF8 800763F8 2F010005 */ sltiu $at, $t8, 5 -/* 076FFC 800763FC 10200049 */ beqz $at, .L80076524 -/* 077000 80076400 AFBF002C */ sw $ra, 0x2c($sp) -/* 077004 80076404 0018C080 */ sll $t8, $t8, 2 -/* 077008 80076408 3C01800F */ lui $at, %hi(jpt_800EEAEC) -/* 07700C 8007640C 00380821 */ addu $at, $at, $t8 -/* 077010 80076410 8C38EAEC */ lw $t8, %lo(jpt_800EEAEC)($at) -/* 077014 80076414 03000008 */ jr $t8 -/* 077018 80076418 00000000 */ nop -glabel L8007641C -/* 07701C 8007641C 0C01D8D3 */ jal func_8007634C -/* 077020 80076420 02202025 */ move $a0, $s1 -/* 077024 80076424 10000040 */ b .L80076528 -/* 077028 80076428 8FBF002C */ lw $ra, 0x2c($sp) -glabel L8007642C -/* 07702C 8007642C 02202025 */ move $a0, $s1 -/* 077030 80076430 0C01C9E3 */ jal func_8007278C -/* 077034 80076434 8E050048 */ lw $a1, 0x48($s0) -/* 077038 80076438 5040003B */ beql $v0, $zero, .L80076528 -/* 07703C 8007643C 8FBF002C */ lw $ra, 0x2c($sp) -/* 077040 80076440 0C021B9C */ jal func_80086E70 -/* 077044 80076444 02202025 */ move $a0, $s1 -/* 077048 80076448 10000037 */ b .L80076528 -/* 07704C 8007644C 8FBF002C */ lw $ra, 0x2c($sp) -glabel L80076450 -/* 077050 80076450 921900D5 */ lbu $t9, 0xd5($s0) -/* 077054 80076454 24010004 */ li $at, 4 -/* 077058 80076458 02002025 */ move $a0, $s0 -/* 07705C 8007645C 17210010 */ bne $t9, $at, .L800764A0 -/* 077060 80076460 3C053F80 */ lui $a1, 0x3f80 -/* 077064 80076464 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc -/* 077068 80076468 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 07706C 8007646C 02002025 */ move $a0, $s0 -/* 077070 80076470 0C0104EE */ jal f32_step_towards -/* 077074 80076474 3C054080 */ lui $a1, 0x4080 -/* 077078 80076478 260400A4 */ addiu $a0, $s0, 0xa4 -/* 07707C 8007647C 00002825 */ move $a1, $zero -/* 077080 80076480 0C0104A2 */ jal s16_step_towards -/* 077084 80076484 24060018 */ li $a2, 24 -/* 077088 80076488 260400A2 */ addiu $a0, $s0, 0xa2 -/* 07708C 8007648C 24050080 */ li $a1, 128 -/* 077090 80076490 0C0104A2 */ jal s16_step_towards -/* 077094 80076494 2406000C */ li $a2, 12 -/* 077098 80076498 1000000D */ b .L800764D0 -/* 07709C 8007649C 860800AE */ lh $t0, 0xae($s0) -.L800764A0: -/* 0770A0 800764A0 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc -/* 0770A4 800764A4 0C0104EE */ jal f32_step_towards -/* 0770A8 800764A8 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 0770AC 800764AC 260400A4 */ addiu $a0, $s0, 0xa4 -/* 0770B0 800764B0 00002825 */ move $a1, $zero -/* 0770B4 800764B4 0C0104A2 */ jal s16_step_towards -/* 0770B8 800764B8 24060018 */ li $a2, 24 -/* 0770BC 800764BC 260400A2 */ addiu $a0, $s0, 0xa2 -/* 0770C0 800764C0 24050080 */ li $a1, 128 -/* 0770C4 800764C4 0C0104A2 */ jal s16_step_towards -/* 0770C8 800764C8 2406000C */ li $a2, 12 -/* 0770CC 800764CC 860800AE */ lh $t0, 0xae($s0) -.L800764D0: -/* 0770D0 800764D0 02202025 */ move $a0, $s1 -/* 0770D4 800764D4 260500A0 */ addiu $a1, $s0, 0xa0 -/* 0770D8 800764D8 29010002 */ slti $at, $t0, 2 -/* 0770DC 800764DC 14200011 */ bnez $at, .L80076524 -/* 0770E0 800764E0 240600FF */ li $a2, 255 -/* 0770E4 800764E4 24090020 */ li $t1, 32 -/* 0770E8 800764E8 AFA90010 */ sw $t1, 0x10($sp) -/* 0770EC 800764EC 24070050 */ li $a3, 80 -/* 0770F0 800764F0 AFA00014 */ sw $zero, 0x14($sp) -/* 0770F4 800764F4 0C01CEC0 */ jal func_80073B00 -/* 0770F8 800764F8 AFA00018 */ sw $zero, 0x18($sp) -/* 0770FC 800764FC 5040000A */ beql $v0, $zero, .L80076528 -/* 077100 80076500 8FBF002C */ lw $ra, 0x2c($sp) -/* 077104 80076504 0C01C922 */ jal func_80072488 -/* 077108 80076508 02202025 */ move $a0, $s1 -/* 07710C 8007650C 10000006 */ b .L80076528 -/* 077110 80076510 8FBF002C */ lw $ra, 0x2c($sp) -glabel L80076514 -/* 077114 80076514 0C01C90A */ jal func_80072428 -/* 077118 80076518 02202025 */ move $a0, $s1 -/* 07711C 8007651C 0C021BD8 */ jal func_80086F60 -/* 077120 80076520 02202025 */ move $a0, $s1 -.L80076524: -glabel L80076524 -/* 077124 80076524 8FBF002C */ lw $ra, 0x2c($sp) -.L80076528: -/* 077128 80076528 8FB00024 */ lw $s0, 0x24($sp) -/* 07712C 8007652C 8FB10028 */ lw $s1, 0x28($sp) -/* 077130 80076530 03E00008 */ jr $ra -/* 077134 80076534 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_800769D8.s b/asm/non_matchings/code_80071F00/func_800769D8.s deleted file mode 100644 index 01a487f0b..000000000 --- a/asm/non_matchings/code_80071F00/func_800769D8.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_800769D8 -/* 0775D8 800769D8 000470C0 */ sll $t6, $a0, 3 -/* 0775DC 800769DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0775E0 800769E0 01C47023 */ subu $t6, $t6, $a0 -/* 0775E4 800769E4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 0775E8 800769E8 AFB00024 */ sw $s0, 0x24($sp) -/* 0775EC 800769EC 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 0775F0 800769F0 000E7140 */ sll $t6, $t6, 5 -/* 0775F4 800769F4 01CF8021 */ addu $s0, $t6, $t7 -/* 0775F8 800769F8 961800A6 */ lhu $t8, 0xa6($s0) -/* 0775FC 800769FC AFB10028 */ sw $s1, 0x28($sp) -/* 077600 80076A00 00808825 */ move $s1, $a0 -/* 077604 80076A04 2F010005 */ sltiu $at, $t8, 5 -/* 077608 80076A08 10200033 */ beqz $at, .L80076AD8 -/* 07760C 80076A0C AFBF002C */ sw $ra, 0x2c($sp) -/* 077610 80076A10 0018C080 */ sll $t8, $t8, 2 -/* 077614 80076A14 3C01800F */ lui $at, %hi(jpt_800EEB00) # 0x800f -/* 077618 80076A18 00380821 */ addu $at, $at, $t8 -/* 07761C 80076A1C 8C38EB00 */ lw $t8, %lo(jpt_800EEB00)($at) # -0x1500($at) -/* 077620 80076A20 03000008 */ jr $t8 -/* 077624 80076A24 00000000 */ nop -glabel L80076A28 -/* 077628 80076A28 0C01DA56 */ jal func_80076958 -/* 07762C 80076A2C 02202025 */ move $a0, $s1 -/* 077630 80076A30 1000002A */ b .L80076ADC -/* 077634 80076A34 8FBF002C */ lw $ra, 0x2c($sp) -glabel L80076A38 -/* 077638 80076A38 02202025 */ move $a0, $s1 -/* 07763C 80076A3C 0C01C9E3 */ jal func_8007278C -/* 077640 80076A40 8E050048 */ lw $a1, 0x48($s0) -/* 077644 80076A44 50400025 */ beql $v0, $zero, .L80076ADC -/* 077648 80076A48 8FBF002C */ lw $ra, 0x2c($sp) -/* 07764C 80076A4C 0C021B9C */ jal func_80086E70 -/* 077650 80076A50 02202025 */ move $a0, $s1 -/* 077654 80076A54 10000021 */ b .L80076ADC -/* 077658 80076A58 8FBF002C */ lw $ra, 0x2c($sp) -glabel L80076A5C -/* 07765C 80076A5C 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c -/* 077660 80076A60 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 077664 80076A64 02002025 */ move $a0, $s0 -/* 077668 80076A68 0C0104EE */ jal f32_step_towards -/* 07766C 80076A6C 3C054000 */ lui $a1, 0x4000 -/* 077670 80076A70 260400A4 */ addiu $a0, $s0, 0xa4 -/* 077674 80076A74 00002825 */ move $a1, $zero -/* 077678 80076A78 0C0104A2 */ jal s16_step_towards -/* 07767C 80076A7C 24060018 */ li $a2, 24 -/* 077680 80076A80 861900AE */ lh $t9, 0xae($s0) -/* 077684 80076A84 02202025 */ move $a0, $s1 -/* 077688 80076A88 260500A0 */ addiu $a1, $s0, 0xa0 -/* 07768C 80076A8C 2B210002 */ slti $at, $t9, 2 -/* 077690 80076A90 14200011 */ bnez $at, .L80076AD8 -/* 077694 80076A94 240600FF */ li $a2, 255 -/* 077698 80076A98 24080020 */ li $t0, 32 -/* 07769C 80076A9C AFA80010 */ sw $t0, 0x10($sp) -/* 0776A0 80076AA0 24070050 */ li $a3, 80 -/* 0776A4 80076AA4 AFA00014 */ sw $zero, 0x14($sp) -/* 0776A8 80076AA8 0C01CEC0 */ jal func_80073B00 -/* 0776AC 80076AAC AFA00018 */ sw $zero, 0x18($sp) -/* 0776B0 80076AB0 5040000A */ beql $v0, $zero, .L80076ADC -/* 0776B4 80076AB4 8FBF002C */ lw $ra, 0x2c($sp) -/* 0776B8 80076AB8 0C01C922 */ jal func_80072488 -/* 0776BC 80076ABC 02202025 */ move $a0, $s1 -/* 0776C0 80076AC0 10000006 */ b .L80076ADC -/* 0776C4 80076AC4 8FBF002C */ lw $ra, 0x2c($sp) -glabel L80076AC8 -/* 0776C8 80076AC8 0C01C90A */ jal func_80072428 -/* 0776CC 80076ACC 02202025 */ move $a0, $s1 -/* 0776D0 80076AD0 0C021BD8 */ jal func_80086F60 -/* 0776D4 80076AD4 02202025 */ move $a0, $s1 -.L80076AD8: -glabel L80076AD8 -/* 0776D8 80076AD8 8FBF002C */ lw $ra, 0x2c($sp) -.L80076ADC: -/* 0776DC 80076ADC 8FB00024 */ lw $s0, 0x24($sp) -/* 0776E0 80076AE0 8FB10028 */ lw $s1, 0x28($sp) -/* 0776E4 80076AE4 03E00008 */ jr $ra -/* 0776E8 80076AE8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_80076C9C.s b/asm/non_matchings/code_80071F00/func_80076C9C.s deleted file mode 100644 index 399df9036..000000000 --- a/asm/non_matchings/code_80071F00/func_80076C9C.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80076C9C -/* 07789C 80076C9C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0778A0 80076CA0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0778A4 80076CA4 AFB00018 */ sw $s0, 0x18($sp) -/* 0778A8 80076CA8 AFA5002C */ sw $a1, 0x2c($sp) -/* 0778AC 80076CAC 00067400 */ sll $t6, $a2, 0x10 -/* 0778B0 80076CB0 000E2C03 */ sra $a1, $t6, 0x10 -/* 0778B4 80076CB4 00808025 */ move $s0, $a0 -/* 0778B8 80076CB8 0C01C8E9 */ jal func_800723A4 -/* 0778BC 80076CBC AFA60030 */ sw $a2, 0x30($sp) -/* 0778C0 80076CC0 0010C0C0 */ sll $t8, $s0, 3 -/* 0778C4 80076CC4 0310C023 */ subu $t8, $t8, $s0 -/* 0778C8 80076CC8 3C198016 */ lui $t9, %hi(D_80165C18) # $t9, 0x8016 -/* 0778CC 80076CCC 27395C18 */ addiu $t9, %lo(D_80165C18) # addiu $t9, $t9, 0x5c18 -/* 0778D0 80076CD0 0018C140 */ sll $t8, $t8, 5 -/* 0778D4 80076CD4 3C080D03 */ lui $t0, %hi(D_0D02BC58) # $t0, 0xd03 -/* 0778D8 80076CD8 03191021 */ addu $v0, $t8, $t9 -/* 0778DC 80076CDC 2508BC58 */ addiu $t0, %lo(D_0D02BC58) # addiu $t0, $t0, -0x43a8 -/* 0778E0 80076CE0 2409000A */ li $t1, 10 -/* 0778E4 80076CE4 A04900D5 */ sb $t1, 0xd5($v0) -/* 0778E8 80076CE8 AC480064 */ sw $t0, 0x64($v0) -/* 0778EC 80076CEC AC48006C */ sw $t0, 0x6c($v0) -/* 0778F0 80076CF0 3C01800F */ lui $at, %hi(D_800EEB14) # $at, 0x800f -/* 0778F4 80076CF4 C424EB14 */ lwc1 $f4, %lo(D_800EEB14)($at) -/* 0778F8 80076CF8 8FA3002C */ lw $v1, 0x2c($sp) -/* 0778FC 80076CFC 02002025 */ move $a0, $s0 -/* 077900 80076D00 E4440000 */ swc1 $f4, ($v0) -/* 077904 80076D04 8C670008 */ lw $a3, 8($v1) -/* 077908 80076D08 8C660004 */ lw $a2, 4($v1) -/* 07790C 80076D0C 8C650000 */ lw $a1, ($v1) -/* 077910 80076D10 0C022DF5 */ jal func_8008B7D4 -/* 077914 80076D14 AFA20020 */ sw $v0, 0x20($sp) -/* 077918 80076D18 8FA20020 */ lw $v0, 0x20($sp) -/* 07791C 80076D1C 44800000 */ mtc1 $zero, $f0 -/* 077920 80076D20 240A00FF */ li $t2, 255 -/* 077924 80076D24 02002025 */ move $a0, $s0 -/* 077928 80076D28 00002825 */ move $a1, $zero -/* 07792C 80076D2C 00003025 */ move $a2, $zero -/* 077930 80076D30 00003825 */ move $a3, $zero -/* 077934 80076D34 A44A00A4 */ sh $t2, 0xa4($v0) -/* 077938 80076D38 0C022E2F */ jal func_8008B8BC -/* 07793C 80076D3C E4400034 */ swc1 $f0, 0x34($v0) -/* 077940 80076D40 44800000 */ mtc1 $zero, $f0 -/* 077944 80076D44 02002025 */ move $a0, $s0 -/* 077948 80076D48 44050000 */ mfc1 $a1, $f0 -/* 07794C 80076D4C 44060000 */ mfc1 $a2, $f0 -/* 077950 80076D50 44070000 */ mfc1 $a3, $f0 -/* 077954 80076D54 0C022E03 */ jal func_8008B80C -/* 077958 80076D58 00000000 */ nop -/* 07795C 80076D5C 8FBF001C */ lw $ra, 0x1c($sp) -/* 077960 80076D60 8FB00018 */ lw $s0, 0x18($sp) -/* 077964 80076D64 27BD0028 */ addiu $sp, $sp, 0x28 -/* 077968 80076D68 03E00008 */ jr $ra -/* 07796C 80076D6C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80076FEC.s b/asm/non_matchings/code_80071F00/func_80076FEC.s index 576cd6f67..7dcb8c6d7 100644 --- a/asm/non_matchings/code_80071F00/func_80076FEC.s +++ b/asm/non_matchings/code_80071F00/func_80076FEC.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EEB18 +.float 0.8 + +.section .text + glabel func_80076FEC /* 077BEC 80076FEC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 077BF0 80076FF0 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80071F00/func_80077138.s b/asm/non_matchings/code_80071F00/func_80077138.s index ce54625b2..33124dc48 100644 --- a/asm/non_matchings/code_80071F00/func_80077138.s +++ b/asm/non_matchings/code_80071F00/func_80077138.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800EEB1C +.float 0.05 + +glabel D_800EEB20 +.double 0.01 + +glabel D_800EEB28 +.double 0.01 + +.section .text + glabel func_80077138 /* 077D38 80077138 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 077D3C 8007713C AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_80077584.s b/asm/non_matchings/code_80071F00/func_80077584.s deleted file mode 100644 index 1eb6595b0..000000000 --- a/asm/non_matchings/code_80071F00/func_80077584.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80077584 -/* 078184 80077584 000470C0 */ sll $t6, $a0, 3 -/* 078188 80077588 01C47023 */ subu $t6, $t6, $a0 -/* 07818C 8007758C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 078190 80077590 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 078194 80077594 000E7140 */ sll $t6, $t6, 5 -/* 078198 80077598 01CF1021 */ addu $v0, $t6, $t7 -/* 07819C 8007759C 844300AE */ lh $v1, 0xae($v0) -/* 0781A0 800775A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0781A4 800775A4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0781A8 800775A8 10600019 */ beqz $v1, .L80077610 -/* 0781AC 800775AC 24010001 */ li $at, 1 -/* 0781B0 800775B0 54610018 */ bnel $v1, $at, .L80077614 -/* 0781B4 800775B4 945900B6 */ lhu $t9, 0xb6($v0) -/* 0781B8 800775B8 905800D8 */ lbu $t8, 0xd8($v0) -/* 0781BC 800775BC 3C01BFE0 */ li $at, 0xBFE00000 # -1.750000 -/* 0781C0 800775C0 53000014 */ beql $t8, $zero, .L80077614 -/* 0781C4 800775C4 945900B6 */ lhu $t9, 0xb6($v0) -/* 0781C8 800775C8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 0781CC 800775CC 44813800 */ mtc1 $at, $f7 -/* 0781D0 800775D0 44803000 */ mtc1 $zero, $f6 -/* 0781D4 800775D4 46002021 */ cvt.d.s $f0, $f4 -/* 0781D8 800775D8 3C01800F */ lui $at, %hi(D_800EEB30) -/* 0781DC 800775DC 4620303E */ c.le.d $f6, $f0 -/* 0781E0 800775E0 00000000 */ nop -/* 0781E4 800775E4 45020007 */ bc1fl .L80077604 -/* 0781E8 800775E8 44800000 */ mtc1 $zero, $f0 -/* 0781EC 800775EC D428EB30 */ ldc1 $f8, %lo(D_800EEB30)($at) -/* 0781F0 800775F0 46280281 */ sub.d $f10, $f0, $f8 -/* 0781F4 800775F4 46205420 */ cvt.s.d $f16, $f10 -/* 0781F8 800775F8 10000005 */ b .L80077610 -/* 0781FC 800775FC E450003C */ swc1 $f16, 0x3c($v0) -/* 078200 80077600 44800000 */ mtc1 $zero, $f0 -.L80077604: -/* 078204 80077604 00000000 */ nop -/* 078208 80077608 E4400040 */ swc1 $f0, 0x40($v0) -/* 07820C 8007760C E4400038 */ swc1 $f0, 0x38($v0) -.L80077610: -/* 078210 80077610 945900B6 */ lhu $t9, 0xb6($v0) -.L80077614: -/* 078214 80077614 8448008A */ lh $t0, 0x8a($v0) -/* 078218 80077618 AFA40018 */ sw $a0, 0x18($sp) -/* 07821C 8007761C 03284821 */ addu $t1, $t9, $t0 -/* 078220 80077620 0C021DC4 */ jal func_80087710 -/* 078224 80077624 A44900B6 */ sh $t1, 0xb6($v0) -/* 078228 80077628 0C022FC6 */ jal func_8008BF18 -/* 07822C 8007762C 8FA40018 */ lw $a0, 0x18($sp) -/* 078230 80077630 8FBF0014 */ lw $ra, 0x14($sp) -/* 078234 80077634 27BD0018 */ addiu $sp, $sp, 0x18 -/* 078238 80077638 03E00008 */ jr $ra -/* 07823C 8007763C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80077700.s b/asm/non_matchings/code_80071F00/func_80077700.s deleted file mode 100644 index 427d565b2..000000000 --- a/asm/non_matchings/code_80071F00/func_80077700.s +++ /dev/null @@ -1,219 +0,0 @@ -glabel func_80077700 -/* 078300 80077700 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 078304 80077704 AFB00024 */ sw $s0, 0x24($sp) -/* 078308 80077708 00A08025 */ move $s0, $a1 -/* 07830C 8007770C AFBF002C */ sw $ra, 0x2c($sp) -/* 078310 80077710 AFB10028 */ sw $s1, 0x28($sp) -/* 078314 80077714 00808825 */ move $s1, $a0 -/* 078318 80077718 AFA60050 */ sw $a2, 0x50($sp) -/* 07831C 8007771C 0C01C8E9 */ jal func_800723A4 -/* 078320 80077720 00002825 */ move $a1, $zero -/* 078324 80077724 001170C0 */ sll $t6, $s1, 3 -/* 078328 80077728 01D17023 */ subu $t6, $t6, $s1 -/* 07832C 8007772C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 078330 80077730 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 078334 80077734 000E7140 */ sll $t6, $t6, 5 -/* 078338 80077738 3C040D03 */ lui $a0, %hi(D_0D028DD8) # $a0, 0xd03 -/* 07833C 8007773C 01CF1021 */ addu $v0, $t6, $t7 -/* 078340 80077740 24848DD8 */ addiu $a0, %lo(D_0D028DD8) # addiu $a0, $a0, -0x7228 -/* 078344 80077744 24180007 */ li $t8, 7 -/* 078348 80077748 A05800D5 */ sb $t8, 0xd5($v0) -/* 07834C 8007774C AC440060 */ sw $a0, 0x60($v0) -/* 078350 80077750 AC440068 */ sw $a0, 0x68($v0) -/* 078354 80077754 3C01800F */ lui $at, %hi(D_800EEB38) # $at, 0x800f -/* 078358 80077758 C424EB38 */ lwc1 $f4, %lo(D_800EEB38)($at) -/* 07835C 8007775C 3C03800E */ lui $v1, %hi(gCurrentCourseId) # $v1, 0x800e -/* 078360 80077760 3C014039 */ li $at, 0x40390000 # 2.890625 -/* 078364 80077764 E4440000 */ swc1 $f4, ($v0) -/* 078368 80077768 C6060004 */ lwc1 $f6, 4($s0) -/* 07836C 8007776C 02202025 */ move $a0, $s1 -/* 078370 80077770 24180014 */ li $t8, 20 -/* 078374 80077774 E4460044 */ swc1 $f6, 0x44($v0) -/* 078378 80077778 8463C5A0 */ lh $v1, %lo(gCurrentCourseId)($v1) -/* 07837C 8007777C 5060000D */ beql $v1, $zero, .L800777B4 -/* 078380 80077780 C6080000 */ lwc1 $f8, ($s0) -/* 078384 80077784 24010004 */ li $at, 4 -/* 078388 80077788 10610029 */ beq $v1, $at, .L80077830 -/* 07838C 8007778C 02202025 */ move $a0, $s1 -/* 078390 80077790 24010007 */ li $at, 7 -/* 078394 80077794 10610048 */ beq $v1, $at, .L800778B8 -/* 078398 80077798 02202025 */ move $a0, $s1 -/* 07839C 8007779C 24010008 */ li $at, 8 -/* 0783A0 800777A0 10610067 */ beq $v1, $at, .L80077940 -/* 0783A4 800777A4 02202025 */ move $a0, $s1 -/* 0783A8 800777A8 10000088 */ b .L800779CC -/* 0783AC 800777AC 00000000 */ nop -/* 0783B0 800777B0 C6080000 */ lwc1 $f8, ($s0) -.L800777B4: -/* 0783B4 800777B4 C6100004 */ lwc1 $f16, 4($s0) -/* 0783B8 800777B8 44812800 */ mtc1 $at, $f5 -/* 0783BC 800777BC 4600428D */ trunc.w.s $f10, $f8 -/* 0783C0 800777C0 44802000 */ mtc1 $zero, $f4 -/* 0783C4 800777C4 2419001E */ li $t9, 30 -/* 0783C8 800777C8 460084A1 */ cvt.d.s $f18, $f16 -/* 0783CC 800777CC 44055000 */ mfc1 $a1, $f10 -/* 0783D0 800777D0 46249180 */ add.d $f6, $f18, $f4 -/* 0783D4 800777D4 C60A0008 */ lwc1 $f10, 8($s0) -/* 0783D8 800777D8 00054400 */ sll $t0, $a1, 0x10 -/* 0783DC 800777DC 00082C03 */ sra $a1, $t0, 0x10 -/* 0783E0 800777E0 4620320D */ trunc.w.d $f8, $f6 -/* 0783E4 800777E4 24080014 */ li $t0, 20 -/* 0783E8 800777E8 AFA80018 */ sw $t0, 0x18($sp) -/* 0783EC 800777EC 4600540D */ trunc.w.s $f16, $f10 -/* 0783F0 800777F0 44064000 */ mfc1 $a2, $f8 -/* 0783F4 800777F4 AFA20034 */ sw $v0, 0x34($sp) -/* 0783F8 800777F8 AFB90014 */ sw $t9, 0x14($sp) -/* 0783FC 800777FC 44078000 */ mfc1 $a3, $f16 -/* 078400 80077800 00065C00 */ sll $t3, $a2, 0x10 -/* 078404 80077804 000B3403 */ sra $a2, $t3, 0x10 -/* 078408 80077808 00077400 */ sll $t6, $a3, 0x10 -/* 07840C 8007780C 000E3C03 */ sra $a3, $t6, 0x10 -/* 078410 80077810 0C022F45 */ jal func_8008BD14 -/* 078414 80077814 AFB80010 */ sw $t8, 0x10($sp) -/* 078418 80077818 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 07841C 8007781C 44810000 */ mtc1 $at, $f0 -/* 078420 80077820 8FA20034 */ lw $v0, 0x34($sp) -/* 078424 80077824 E4400034 */ swc1 $f0, 0x34($v0) -/* 078428 80077828 10000068 */ b .L800779CC -/* 07842C 8007782C E440003C */ swc1 $f0, 0x3c($v0) -.L80077830: -/* 078430 80077830 C6120000 */ lwc1 $f18, ($s0) -/* 078434 80077834 C6060004 */ lwc1 $f6, 4($s0) -/* 078438 80077838 3C014039 */ li $at, 0x40390000 # 2.890625 -/* 07843C 8007783C 4600910D */ trunc.w.s $f4, $f18 -/* 078440 80077840 44815800 */ mtc1 $at, $f11 -/* 078444 80077844 44805000 */ mtc1 $zero, $f10 -/* 078448 80077848 46003221 */ cvt.d.s $f8, $f6 -/* 07844C 8007784C 44052000 */ mfc1 $a1, $f4 -/* 078450 80077850 462A4400 */ add.d $f16, $f8, $f10 -/* 078454 80077854 C6040008 */ lwc1 $f4, 8($s0) -/* 078458 80077858 00055400 */ sll $t2, $a1, 0x10 -/* 07845C 8007785C 000A2C03 */ sra $a1, $t2, 0x10 -/* 078460 80077860 4620848D */ trunc.w.d $f18, $f16 -/* 078464 80077864 240A0014 */ li $t2, 20 -/* 078468 80077868 24080014 */ li $t0, 20 -/* 07846C 8007786C 4600218D */ trunc.w.s $f6, $f4 -/* 078470 80077870 44069000 */ mfc1 $a2, $f18 -/* 078474 80077874 2409001E */ li $t1, 30 -/* 078478 80077878 AFA90014 */ sw $t1, 0x14($sp) -/* 07847C 8007787C 44073000 */ mfc1 $a3, $f6 -/* 078480 80077880 00066C00 */ sll $t5, $a2, 0x10 -/* 078484 80077884 000D3403 */ sra $a2, $t5, 0x10 -/* 078488 80077888 0007C400 */ sll $t8, $a3, 0x10 -/* 07848C 8007788C 00183C03 */ sra $a3, $t8, 0x10 -/* 078490 80077890 AFA80010 */ sw $t0, 0x10($sp) -/* 078494 80077894 AFAA0018 */ sw $t2, 0x18($sp) -/* 078498 80077898 0C022F45 */ jal func_8008BD14 -/* 07849C 8007789C AFA20034 */ sw $v0, 0x34($sp) -/* 0784A0 800778A0 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0784A4 800778A4 44810000 */ mtc1 $at, $f0 -/* 0784A8 800778A8 8FA20034 */ lw $v0, 0x34($sp) -/* 0784AC 800778AC E4400034 */ swc1 $f0, 0x34($v0) -/* 0784B0 800778B0 10000046 */ b .L800779CC -/* 0784B4 800778B4 E440003C */ swc1 $f0, 0x3c($v0) -.L800778B8: -/* 0784B8 800778B8 C6080000 */ lwc1 $f8, ($s0) -/* 0784BC 800778BC C6100004 */ lwc1 $f16, 4($s0) -/* 0784C0 800778C0 3C01403E */ li $at, 0x403E0000 # 2.968750 -/* 0784C4 800778C4 4600428D */ trunc.w.s $f10, $f8 -/* 0784C8 800778C8 44812800 */ mtc1 $at, $f5 -/* 0784CC 800778CC 44802000 */ mtc1 $zero, $f4 -/* 0784D0 800778D0 460084A1 */ cvt.d.s $f18, $f16 -/* 0784D4 800778D4 44055000 */ mfc1 $a1, $f10 -/* 0784D8 800778D8 46249180 */ add.d $f6, $f18, $f4 -/* 0784DC 800778DC C60A0008 */ lwc1 $f10, 8($s0) -/* 0784E0 800778E0 00056400 */ sll $t4, $a1, 0x10 -/* 0784E4 800778E4 000C2C03 */ sra $a1, $t4, 0x10 -/* 0784E8 800778E8 4620320D */ trunc.w.d $f8, $f6 -/* 0784EC 800778EC 240C0010 */ li $t4, 16 -/* 0784F0 800778F0 240A0010 */ li $t2, 16 -/* 0784F4 800778F4 4600540D */ trunc.w.s $f16, $f10 -/* 0784F8 800778F8 44064000 */ mfc1 $a2, $f8 -/* 0784FC 800778FC 240B0028 */ li $t3, 40 -/* 078500 80077900 AFAB0014 */ sw $t3, 0x14($sp) -/* 078504 80077904 44078000 */ mfc1 $a3, $f16 -/* 078508 80077908 00067C00 */ sll $t7, $a2, 0x10 -/* 07850C 8007790C 000F3403 */ sra $a2, $t7, 0x10 -/* 078510 80077910 00074400 */ sll $t0, $a3, 0x10 -/* 078514 80077914 00083C03 */ sra $a3, $t0, 0x10 -/* 078518 80077918 AFAA0010 */ sw $t2, 0x10($sp) -/* 07851C 8007791C AFAC0018 */ sw $t4, 0x18($sp) -/* 078520 80077920 0C022F45 */ jal func_8008BD14 -/* 078524 80077924 AFA20034 */ sw $v0, 0x34($sp) -/* 078528 80077928 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 07852C 8007792C 44810000 */ mtc1 $at, $f0 -/* 078530 80077930 8FA20034 */ lw $v0, 0x34($sp) -/* 078534 80077934 E4400034 */ swc1 $f0, 0x34($v0) -/* 078538 80077938 10000024 */ b .L800779CC -/* 07853C 8007793C E440003C */ swc1 $f0, 0x3c($v0) -.L80077940: -/* 078540 80077940 C6120000 */ lwc1 $f18, ($s0) -/* 078544 80077944 C6060004 */ lwc1 $f6, 4($s0) -/* 078548 80077948 3C014039 */ li $at, 0x40390000 # 2.890625 -/* 07854C 8007794C 4600910D */ trunc.w.s $f4, $f18 -/* 078550 80077950 44815800 */ mtc1 $at, $f11 -/* 078554 80077954 44805000 */ mtc1 $zero, $f10 -/* 078558 80077958 46003221 */ cvt.d.s $f8, $f6 -/* 07855C 8007795C 44052000 */ mfc1 $a1, $f4 -/* 078560 80077960 462A4400 */ add.d $f16, $f8, $f10 -/* 078564 80077964 C6040008 */ lwc1 $f4, 8($s0) -/* 078568 80077968 00057400 */ sll $t6, $a1, 0x10 -/* 07856C 8007796C 000E2C03 */ sra $a1, $t6, 0x10 -/* 078570 80077970 4620848D */ trunc.w.d $f18, $f16 -/* 078574 80077974 240E0014 */ li $t6, 20 -/* 078578 80077978 240C0014 */ li $t4, 20 -/* 07857C 8007797C 4600218D */ trunc.w.s $f6, $f4 -/* 078580 80077980 44069000 */ mfc1 $a2, $f18 -/* 078584 80077984 240D001E */ li $t5, 30 -/* 078588 80077988 AFAD0014 */ sw $t5, 0x14($sp) -/* 07858C 8007798C 44073000 */ mfc1 $a3, $f6 -/* 078590 80077990 0006CC00 */ sll $t9, $a2, 0x10 -/* 078594 80077994 00193403 */ sra $a2, $t9, 0x10 -/* 078598 80077998 00075400 */ sll $t2, $a3, 0x10 -/* 07859C 8007799C 000A3C03 */ sra $a3, $t2, 0x10 -/* 0785A0 800779A0 AFAC0010 */ sw $t4, 0x10($sp) -/* 0785A4 800779A4 AFAE0018 */ sw $t6, 0x18($sp) -/* 0785A8 800779A8 0C022F45 */ jal func_8008BD14 -/* 0785AC 800779AC AFA20034 */ sw $v0, 0x34($sp) -/* 0785B0 800779B0 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 0785B4 800779B4 44810000 */ mtc1 $at, $f0 -/* 0785B8 800779B8 8FA20034 */ lw $v0, 0x34($sp) -/* 0785BC 800779BC 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0785C0 800779C0 44814000 */ mtc1 $at, $f8 -/* 0785C4 800779C4 E4400034 */ swc1 $f0, 0x34($v0) -/* 0785C8 800779C8 E448003C */ swc1 $f8, 0x3c($v0) -.L800779CC: -/* 0785CC 800779CC 0C0ADF8D */ jal random_int -/* 0785D0 800779D0 24040010 */ li $a0, 16 -/* 0785D4 800779D4 00028300 */ sll $s0, $v0, 0xc -/* 0785D8 800779D8 320FFFFF */ andi $t7, $s0, 0xffff -/* 0785DC 800779DC 01E08025 */ move $s0, $t7 -/* 0785E0 800779E0 0C0ADF8D */ jal random_int -/* 0785E4 800779E4 24040010 */ li $a0, 16 -/* 0785E8 800779E8 0002C300 */ sll $t8, $v0, 0xc -/* 0785EC 800779EC A7B8003E */ sh $t8, 0x3e($sp) -/* 0785F0 800779F0 0C0ADF8D */ jal random_int -/* 0785F4 800779F4 24040010 */ li $a0, 16 -/* 0785F8 800779F8 8FA60050 */ lw $a2, 0x50($sp) -/* 0785FC 800779FC 24010014 */ li $at, 20 -/* 078600 80077A00 0002CB00 */ sll $t9, $v0, 0xc -/* 078604 80077A04 00064400 */ sll $t0, $a2, 0x10 -/* 078608 80077A08 01064023 */ subu $t0, $t0, $a2 -/* 07860C 80077A0C 0101001A */ div $zero, $t0, $at -/* 078610 80077A10 00004812 */ mflo $t1 -/* 078614 80077A14 A7B9003C */ sh $t9, 0x3c($sp) -/* 078618 80077A18 3126FFFF */ andi $a2, $t1, 0xffff -/* 07861C 80077A1C 02202025 */ move $a0, $s1 -/* 078620 80077A20 00002825 */ move $a1, $zero -/* 078624 80077A24 0C022E22 */ jal func_8008B888 -/* 078628 80077A28 00003825 */ move $a3, $zero -/* 07862C 80077A2C 02202025 */ move $a0, $s1 -/* 078630 80077A30 3205FFFF */ andi $a1, $s0, 0xffff -/* 078634 80077A34 97A6003E */ lhu $a2, 0x3e($sp) -/* 078638 80077A38 0C022E2F */ jal func_8008B8BC -/* 07863C 80077A3C 97A7003C */ lhu $a3, 0x3c($sp) -/* 078640 80077A40 8FBF002C */ lw $ra, 0x2c($sp) -/* 078644 80077A44 8FB00024 */ lw $s0, 0x24($sp) -/* 078648 80077A48 8FB10028 */ lw $s1, 0x28($sp) -/* 07864C 80077A4C 03E00008 */ jr $ra -/* 078650 80077A50 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_80071F00/func_80077E20.s b/asm/non_matchings/code_80071F00/func_80077E20.s deleted file mode 100644 index 7af71ead1..000000000 --- a/asm/non_matchings/code_80071F00/func_80077E20.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_80077E20 -/* 078A20 80077E20 000470C0 */ sll $t6, $a0, 3 -/* 078A24 80077E24 01C47023 */ subu $t6, $t6, $a0 -/* 078A28 80077E28 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 078A2C 80077E2C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 078A30 80077E30 000E7140 */ sll $t6, $t6, 5 -/* 078A34 80077E34 01CF1021 */ addu $v0, $t6, $t7 -/* 078A38 80077E38 3C030D03 */ lui $v1, %hi(D_0D0293D8) # $v1, 0xd03 -/* 078A3C 80077E3C 246393D8 */ addiu $v1, %lo(D_0D0293D8) # addiu $v1, $v1, -0x6c28 -/* 078A40 80077E40 3C180D00 */ lui $t8, %hi(D_0D005770) # $t8, 0xd00 -/* 078A44 80077E44 24080010 */ li $t0, 16 -/* 078A48 80077E48 27185770 */ addiu $t8, %lo(D_0D005770) # addiu $t8, $t8, 0x5770 -/* 078A4C 80077E4C AC430064 */ sw $v1, 0x64($v0) -/* 078A50 80077E50 AC43006C */ sw $v1, 0x6c($v0) -/* 078A54 80077E54 AC580074 */ sw $t8, 0x74($v0) -/* 078A58 80077E58 A04800DA */ sb $t0, 0xda($v0) -/* 078A5C 80077E5C A04800D9 */ sb $t0, 0xd9($v0) -/* 078A60 80077E60 3C01800F */ lui $at, %hi(D_800EEB3C) # $at, 0x800f -/* 078A64 80077E64 C424EB3C */ lwc1 $f4, %lo(D_800EEB3C)($at) -/* 078A68 80077E68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 078A6C 80077E6C AFBF0014 */ sw $ra, 0x14($sp) -/* 078A70 80077E70 AFA20018 */ sw $v0, 0x18($sp) -/* 078A74 80077E74 AFA40020 */ sw $a0, 0x20($sp) -/* 078A78 80077E78 24050010 */ li $a1, 16 -/* 078A7C 80077E7C 0C01C870 */ jal func_800721C0 -/* 078A80 80077E80 E4440000 */ swc1 $f4, ($v0) -/* 078A84 80077E84 0C021BBC */ jal func_80086EF0 -/* 078A88 80077E88 8FA40020 */ lw $a0, 0x20($sp) -/* 078A8C 80077E8C 8FA20018 */ lw $v0, 0x18($sp) -/* 078A90 80077E90 240900FF */ li $t1, 255 -/* 078A94 80077E94 8FA40020 */ lw $a0, 0x20($sp) -/* 078A98 80077E98 A44900A0 */ sh $t1, 0xa0($v0) -/* 078A9C 80077E9C A04000D5 */ sb $zero, 0xd5($v0) -/* 078AA0 80077EA0 0C01C922 */ jal func_80072488 -/* 078AA4 80077EA4 A44000A4 */ sh $zero, 0xa4($v0) -/* 078AA8 80077EA8 8FBF0014 */ lw $ra, 0x14($sp) -/* 078AAC 80077EAC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 078AB0 80077EB0 03E00008 */ jr $ra -/* 078AB4 80077EB4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80077F64.s b/asm/non_matchings/code_80071F00/func_80077F64.s index be4c51b97..3d6abfe8f 100644 --- a/asm/non_matchings/code_80071F00/func_80077F64.s +++ b/asm/non_matchings/code_80071F00/func_80077F64.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EEB40 +.double 0.01 + +.section .text + glabel func_80077F64 /* 078B64 80077F64 000470C0 */ sll $t6, $a0, 3 /* 078B68 80077F68 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/non_matchings/code_80071F00/func_80078220.s b/asm/non_matchings/code_80071F00/func_80078220.s deleted file mode 100644 index 920de82ba..000000000 --- a/asm/non_matchings/code_80071F00/func_80078220.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80078220 -/* 078E20 80078220 000470C0 */ sll $t6, $a0, 3 -/* 078E24 80078224 01C47023 */ subu $t6, $t6, $a0 -/* 078E28 80078228 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 078E2C 8007822C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 078E30 80078230 000E7140 */ sll $t6, $t6, 5 -/* 078E34 80078234 3C030D03 */ lui $v1, %hi(D_0D0293D8) # $v1, 0xd03 -/* 078E38 80078238 01CF1021 */ addu $v0, $t6, $t7 -/* 078E3C 8007823C 246393D8 */ addiu $v1, %lo(D_0D0293D8) # addiu $v1, $v1, -0x6c28 -/* 078E40 80078240 3C180D00 */ lui $t8, %hi(D_0D005770) # $t8, 0xd00 -/* 078E44 80078244 27185770 */ addiu $t8, %lo(D_0D005770) # addiu $t8, $t8, 0x5770 -/* 078E48 80078248 AC430064 */ sw $v1, 0x64($v0) -/* 078E4C 8007824C AC43006C */ sw $v1, 0x6c($v0) -/* 078E50 80078250 AC580074 */ sw $t8, 0x74($v0) -/* 078E54 80078254 3C01800F */ lui $at, %hi(D_800EEB48) # $at, 0x800f -/* 078E58 80078258 C424EB48 */ lwc1 $f4, %lo(D_800EEB48)($at) -/* 078E5C 8007825C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 078E60 80078260 AFBF0014 */ sw $ra, 0x14($sp) -/* 078E64 80078264 AFA40018 */ sw $a0, 0x18($sp) -/* 078E68 80078268 0C021BBC */ jal func_80086EF0 -/* 078E6C 8007826C E4440000 */ swc1 $f4, ($v0) -/* 078E70 80078270 0C01C922 */ jal func_80072488 -/* 078E74 80078274 8FA40018 */ lw $a0, 0x18($sp) -/* 078E78 80078278 8FBF0014 */ lw $ra, 0x14($sp) -/* 078E7C 8007827C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 078E80 80078280 03E00008 */ jr $ra -/* 078E84 80078284 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80078288.s b/asm/non_matchings/code_80071F00/func_80078288.s deleted file mode 100644 index ca1216f94..000000000 --- a/asm/non_matchings/code_80071F00/func_80078288.s +++ /dev/null @@ -1,295 +0,0 @@ -glabel func_80078288 -/* 078E88 80078288 000478C0 */ sll $t7, $a0, 3 -/* 078E8C 8007828C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 078E90 80078290 01E47823 */ subu $t7, $t7, $a0 -/* 078E94 80078294 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 078E98 80078298 AFB00018 */ sw $s0, 0x18($sp) -/* 078E9C 8007829C 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 078EA0 800782A0 000F7940 */ sll $t7, $t7, 5 -/* 078EA4 800782A4 01F88021 */ addu $s0, $t7, $t8 -/* 078EA8 800782A8 860200AE */ lh $v0, 0xae($s0) -/* 078EAC 800782AC AFBF001C */ sw $ra, 0x1c($sp) -/* 078EB0 800782B0 AFA40040 */ sw $a0, 0x40($sp) -/* 078EB4 800782B4 10400108 */ beqz $v0, .L800786D8 -/* 078EB8 800782B8 24010001 */ li $at, 1 -/* 078EBC 800782BC 10410008 */ beq $v0, $at, .L800782E0 -/* 078EC0 800782C0 3C19800E */ lui $t9, %hi(gGamestate) # $t9, 0x800e -/* 078EC4 800782C4 24010002 */ li $at, 2 -/* 078EC8 800782C8 104100E4 */ beq $v0, $at, .L8007865C -/* 078ECC 800782CC 24010003 */ li $at, 3 -/* 078ED0 800782D0 104100FF */ beq $v0, $at, .L800786D0 -/* 078ED4 800782D4 00000000 */ nop -/* 078ED8 800782D8 10000100 */ b .L800786DC -/* 078EDC 800782DC 8FBF001C */ lw $ra, 0x1c($sp) -.L800782E0: -/* 078EE0 800782E0 8F39C50C */ lw $t9, %lo(gGamestate)($t9) -/* 078EE4 800782E4 24010009 */ li $at, 9 -/* 078EE8 800782E8 13210081 */ beq $t9, $at, .L800784F0 -/* 078EEC 800782EC 3C08800E */ lui $t0, %hi(gPlayerOneCopy) # $t0, 0x800e -/* 078EF0 800782F0 8D08C4FC */ lw $t0, %lo(gPlayerOneCopy)($t0) -/* 078EF4 800782F4 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 078EF8 800782F8 44813000 */ mtc1 $at, $f6 -/* 078EFC 800782FC C5040094 */ lwc1 $f4, 0x94($t0) -/* 078F00 80078300 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 078F04 80078304 44815000 */ mtc1 $at, $f10 -/* 078F08 80078308 46062203 */ div.s $f8, $f4, $f6 -/* 078F0C 8007830C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 078F10 80078310 44819000 */ mtc1 $at, $f18 -/* 078F14 80078314 2404000F */ li $a0, 15 -/* 078F18 80078318 460A4402 */ mul.s $f16, $f8, $f10 -/* 078F1C 8007831C 46128103 */ div.s $f4, $f16, $f18 -/* 078F20 80078320 4600218D */ trunc.w.s $f6, $f4 -/* 078F24 80078324 440A3000 */ mfc1 $t2, $f6 -/* 078F28 80078328 0C0ADF8D */ jal random_int -/* 078F2C 8007832C A7AA003A */ sh $t2, 0x3a($sp) -/* 078F30 80078330 87AB003A */ lh $t3, 0x3a($sp) -/* 078F34 80078334 2404012C */ li $a0, 300 -/* 078F38 80078338 004B6023 */ subu $t4, $v0, $t3 -/* 078F3C 8007833C 258D002D */ addiu $t5, $t4, 0x2d -/* 078F40 80078340 0C0ADF8D */ jal random_int -/* 078F44 80078344 A7AD003E */ sh $t5, 0x3e($sp) -/* 078F48 80078348 244E001E */ addiu $t6, $v0, 0x1e -/* 078F4C 8007834C A7AE003C */ sh $t6, 0x3c($sp) -/* 078F50 80078350 0C0ADF8D */ jal random_int -/* 078F54 80078354 24043000 */ li $a0, 12288 -/* 078F58 80078358 87B8003A */ lh $t8, 0x3a($sp) -/* 078F5C 8007835C 2401000F */ li $at, 15 -/* 078F60 80078360 244FE800 */ addiu $t7, $v0, -0x1800 -/* 078F64 80078364 0301001A */ div $zero, $t8, $at -/* 078F68 80078368 0000C812 */ mflo $t9 -/* 078F6C 8007836C 27280001 */ addiu $t0, $t9, 1 -/* 078F70 80078370 00084C00 */ sll $t1, $t0, 0x10 -/* 078F74 80078374 00095403 */ sra $t2, $t1, 0x10 -/* 078F78 80078378 01EA001A */ div $zero, $t7, $t2 -/* 078F7C 8007837C 3C0C800E */ lui $t4, %hi(camera1) # $t4, 0x800e -/* 078F80 80078380 8D8CDB40 */ lw $t4, %lo(camera1)($t4) -/* 078F84 80078384 00005812 */ mflo $t3 -/* 078F88 80078388 858D0026 */ lh $t5, 0x26($t4) -/* 078F8C 8007838C 15400002 */ bnez $t2, .L80078398 -/* 078F90 80078390 00000000 */ nop -/* 078F94 80078394 0007000D */ break 7 -.L80078398: -/* 078F98 80078398 2401FFFF */ li $at, -1 -/* 078F9C 8007839C 15410004 */ bne $t2, $at, .L800783B0 -/* 078FA0 800783A0 3C018000 */ lui $at, 0x8000 -/* 078FA4 800783A4 15E10002 */ bne $t7, $at, .L800783B0 -/* 078FA8 800783A8 00000000 */ nop -/* 078FAC 800783AC 0006000D */ break 6 -.L800783B0: -/* 078FB0 800783B0 016D2021 */ addu $a0, $t3, $t5 -/* 078FB4 800783B4 308EFFFF */ andi $t6, $a0, 0xffff -/* 078FB8 800783B8 01C02025 */ move $a0, $t6 -/* 078FBC 800783BC 0C0AE006 */ jal sins -/* 078FC0 800783C0 A7AE0036 */ sh $t6, 0x36($sp) -/* 078FC4 800783C4 87B8003C */ lh $t8, 0x3c($sp) -/* 078FC8 800783C8 3C02800E */ lui $v0, %hi(gPlayerOneCopy) # $v0, 0x800e -/* 078FCC 800783CC 8C42C4FC */ lw $v0, %lo(gPlayerOneCopy)($v0) -/* 078FD0 800783D0 44984000 */ mtc1 $t8, $f8 -/* 078FD4 800783D4 87B9003E */ lh $t9, 0x3e($sp) -/* 078FD8 800783D8 C4500014 */ lwc1 $f16, 0x14($v0) -/* 078FDC 800783DC 468040A0 */ cvt.s.w $f2, $f8 -/* 078FE0 800783E0 44992000 */ mtc1 $t9, $f4 -/* 078FE4 800783E4 97A40036 */ lhu $a0, 0x36($sp) -/* 078FE8 800783E8 468021A0 */ cvt.s.w $f6, $f4 -/* 078FEC 800783EC 46020282 */ mul.s $f10, $f0, $f2 -/* 078FF0 800783F0 46105480 */ add.s $f18, $f10, $f16 -/* 078FF4 800783F4 E6120010 */ swc1 $f18, 0x10($s0) -/* 078FF8 800783F8 C4480074 */ lwc1 $f8, 0x74($v0) -/* 078FFC 800783FC E7A20024 */ swc1 $f2, 0x24($sp) -/* 079000 80078400 46083280 */ add.s $f10, $f6, $f8 -/* 079004 80078404 0C0AE00E */ jal coss -/* 079008 80078408 E60A0014 */ swc1 $f10, 0x14($s0) -/* 07900C 8007840C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 079010 80078410 3C08800E */ lui $t0, %hi(gPlayerOneCopy) # $t0, 0x800e -/* 079014 80078414 8D08C4FC */ lw $t0, %lo(gPlayerOneCopy)($t0) -/* 079018 80078418 46020402 */ mul.s $f16, $f0, $f2 -/* 07901C 8007841C 24040400 */ li $a0, 1024 -/* 079020 80078420 C512001C */ lwc1 $f18, 0x1c($t0) -/* 079024 80078424 46128100 */ add.s $f4, $f16, $f18 -/* 079028 80078428 0C0ADF8D */ jal random_int -/* 07902C 8007842C E6040018 */ swc1 $f4, 0x18($s0) -/* 079030 80078430 24490100 */ addiu $t1, $v0, 0x100 -/* 079034 80078434 A60900C4 */ sh $t1, 0xc4($s0) -/* 079038 80078438 0C0ADF8D */ jal random_int -/* 07903C 8007843C 24040064 */ li $a0, 100 -/* 079040 80078440 44823000 */ mtc1 $v0, $f6 -/* 079044 80078444 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 079048 80078448 04410004 */ bgez $v0, .L8007845C -/* 07904C 8007844C 46803220 */ cvt.s.w $f8, $f6 -/* 079050 80078450 44815000 */ mtc1 $at, $f10 -/* 079054 80078454 00000000 */ nop -/* 079058 80078458 460A4200 */ add.s $f8, $f8, $f10 -.L8007845C: -/* 07905C 8007845C 3C01800F */ lui $at, %hi(D_800EEB50) -/* 079060 80078460 D432EB50 */ ldc1 $f18, %lo(D_800EEB50)($at) -/* 079064 80078464 46004421 */ cvt.d.s $f16, $f8 -/* 079068 80078468 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 07906C 8007846C 46328102 */ mul.d $f4, $f16, $f18 -/* 079070 80078470 44813800 */ mtc1 $at, $f7 -/* 079074 80078474 44803000 */ mtc1 $zero, $f6 -/* 079078 80078478 24040032 */ li $a0, 50 -/* 07907C 8007847C 46262280 */ add.d $f10, $f4, $f6 -/* 079080 80078480 46205220 */ cvt.s.d $f8, $f10 -/* 079084 80078484 0C0ADF8D */ jal random_int -/* 079088 80078488 E608001C */ swc1 $f8, 0x1c($s0) -/* 07908C 8007848C 44828000 */ mtc1 $v0, $f16 -/* 079090 80078490 44800000 */ mtc1 $zero, $f0 -/* 079094 80078494 04410006 */ bgez $v0, .L800784B0 -/* 079098 80078498 468084A1 */ cvt.d.w $f18, $f16 -/* 07909C 8007849C 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 0790A0 800784A0 44812800 */ mtc1 $at, $f5 -/* 0790A4 800784A4 44802000 */ mtc1 $zero, $f4 -/* 0790A8 800784A8 00000000 */ nop -/* 0790AC 800784AC 46249480 */ add.d $f18, $f18, $f4 -.L800784B0: -/* 0790B0 800784B0 3C01800F */ lui $at, %hi(D_800EEB58) -/* 0790B4 800784B4 D426EB58 */ ldc1 $f6, %lo(D_800EEB58)($at) -/* 0790B8 800784B8 3C01800F */ lui $at, %hi(D_800EEB60) -/* 0790BC 800784BC D424EB60 */ ldc1 $f4, %lo(D_800EEB60)($at) -/* 0790C0 800784C0 46269282 */ mul.d $f10, $f18, $f6 -/* 0790C4 800784C4 E6000028 */ swc1 $f0, 0x28($s0) -/* 0790C8 800784C8 E600002C */ swc1 $f0, 0x2c($s0) -/* 0790CC 800784CC 8FA40040 */ lw $a0, 0x40($sp) -/* 0790D0 800784D0 46205220 */ cvt.s.d $f8, $f10 -/* 0790D4 800784D4 46004421 */ cvt.d.s $f16, $f8 -/* 0790D8 800784D8 46302481 */ sub.d $f18, $f4, $f16 -/* 0790DC 800784DC 462091A0 */ cvt.s.d $f6, $f18 -/* 0790E0 800784E0 0C021BF5 */ jal func_80086FD4 -/* 0790E4 800784E4 E606003C */ swc1 $f6, 0x3c($s0) -/* 0790E8 800784E8 1000007C */ b .L800786DC -/* 0790EC 800784EC 8FBF001C */ lw $ra, 0x1c($sp) -.L800784F0: -/* 0790F0 800784F0 0C0ADF8D */ jal random_int -/* 0790F4 800784F4 24040064 */ li $a0, 100 -/* 0790F8 800784F8 244F0028 */ addiu $t7, $v0, 0x28 -/* 0790FC 800784FC A7AF003C */ sh $t7, 0x3c($sp) -/* 079100 80078500 0C0ADF8D */ jal random_int -/* 079104 80078504 24043000 */ li $a0, 12288 -/* 079108 80078508 3C0A800E */ lui $t2, %hi(camera1) # $t2, 0x800e -/* 07910C 8007850C 8D4ADB40 */ lw $t2, %lo(camera1)($t2) -/* 079110 80078510 854C0026 */ lh $t4, 0x26($t2) -/* 079114 80078514 004C2021 */ addu $a0, $v0, $t4 -/* 079118 80078518 2484E800 */ addiu $a0, $a0, -0x1800 -/* 07911C 8007851C 308BFFFF */ andi $t3, $a0, 0xffff -/* 079120 80078520 01602025 */ move $a0, $t3 -/* 079124 80078524 0C0AE006 */ jal sins -/* 079128 80078528 A7AB0036 */ sh $t3, 0x36($sp) -/* 07912C 8007852C 87AD003C */ lh $t5, 0x3c($sp) -/* 079130 80078530 3C02800E */ lui $v0, %hi(camera1) # $v0, 0x800e -/* 079134 80078534 8C42DB40 */ lw $v0, %lo(camera1)($v0) -/* 079138 80078538 448D5000 */ mtc1 $t5, $f10 -/* 07913C 8007853C 3C01800F */ lui $at, %hi(D_800EEB68) -/* 079140 80078540 C4440000 */ lwc1 $f4, ($v0) -/* 079144 80078544 468050A0 */ cvt.s.w $f2, $f10 -/* 079148 80078548 97A40036 */ lhu $a0, 0x36($sp) -/* 07914C 8007854C 46020202 */ mul.s $f8, $f0, $f2 -/* 079150 80078550 46044400 */ add.s $f16, $f8, $f4 -/* 079154 80078554 E6100010 */ swc1 $f16, 0x10($s0) -/* 079158 80078558 C4520004 */ lwc1 $f18, 4($v0) -/* 07915C 8007855C D42AEB68 */ ldc1 $f10, %lo(D_800EEB68)($at) -/* 079160 80078560 E7A20024 */ swc1 $f2, 0x24($sp) -/* 079164 80078564 460091A1 */ cvt.d.s $f6, $f18 -/* 079168 80078568 462A3200 */ add.d $f8, $f6, $f10 -/* 07916C 8007856C 46204120 */ cvt.s.d $f4, $f8 -/* 079170 80078570 0C0AE00E */ jal coss -/* 079174 80078574 E6040014 */ swc1 $f4, 0x14($s0) -/* 079178 80078578 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 07917C 8007857C 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e -/* 079180 80078580 8DCEDB40 */ lw $t6, %lo(camera1)($t6) -/* 079184 80078584 46020402 */ mul.s $f16, $f0, $f2 -/* 079188 80078588 24040400 */ li $a0, 1024 -/* 07918C 8007858C C5D20008 */ lwc1 $f18, 8($t6) -/* 079190 80078590 46128180 */ add.s $f6, $f16, $f18 -/* 079194 80078594 0C0ADF8D */ jal random_int -/* 079198 80078598 E6060018 */ swc1 $f6, 0x18($s0) -/* 07919C 8007859C 24580100 */ addiu $t8, $v0, 0x100 -/* 0791A0 800785A0 A61800C4 */ sh $t8, 0xc4($s0) -/* 0791A4 800785A4 0C0ADF8D */ jal random_int -/* 0791A8 800785A8 24040064 */ li $a0, 100 -/* 0791AC 800785AC 44825000 */ mtc1 $v0, $f10 -/* 0791B0 800785B0 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0791B4 800785B4 04410004 */ bgez $v0, .L800785C8 -/* 0791B8 800785B8 46805220 */ cvt.s.w $f8, $f10 -/* 0791BC 800785BC 44812000 */ mtc1 $at, $f4 -/* 0791C0 800785C0 00000000 */ nop -/* 0791C4 800785C4 46044200 */ add.s $f8, $f8, $f4 -.L800785C8: -/* 0791C8 800785C8 3C01800F */ lui $at, %hi(D_800EEB70) -/* 0791CC 800785CC D432EB70 */ ldc1 $f18, %lo(D_800EEB70)($at) -/* 0791D0 800785D0 46004421 */ cvt.d.s $f16, $f8 -/* 0791D4 800785D4 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0791D8 800785D8 46328182 */ mul.d $f6, $f16, $f18 -/* 0791DC 800785DC 44815800 */ mtc1 $at, $f11 -/* 0791E0 800785E0 44805000 */ mtc1 $zero, $f10 -/* 0791E4 800785E4 24040032 */ li $a0, 50 -/* 0791E8 800785E8 462A3100 */ add.d $f4, $f6, $f10 -/* 0791EC 800785EC 46202220 */ cvt.s.d $f8, $f4 -/* 0791F0 800785F0 0C0ADF8D */ jal random_int -/* 0791F4 800785F4 E608001C */ swc1 $f8, 0x1c($s0) -/* 0791F8 800785F8 44828000 */ mtc1 $v0, $f16 -/* 0791FC 800785FC 44800000 */ mtc1 $zero, $f0 -/* 079200 80078600 04410006 */ bgez $v0, .L8007861C -/* 079204 80078604 468084A1 */ cvt.d.w $f18, $f16 -/* 079208 80078608 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07920C 8007860C 44813800 */ mtc1 $at, $f7 -/* 079210 80078610 44803000 */ mtc1 $zero, $f6 -/* 079214 80078614 00000000 */ nop -/* 079218 80078618 46269480 */ add.d $f18, $f18, $f6 -.L8007861C: -/* 07921C 8007861C 3C01800F */ lui $at, %hi(D_800EEB78) -/* 079220 80078620 D42AEB78 */ ldc1 $f10, %lo(D_800EEB78)($at) -/* 079224 80078624 3C01800F */ lui $at, %hi(D_800EEB80) -/* 079228 80078628 D426EB80 */ ldc1 $f6, %lo(D_800EEB80)($at) -/* 07922C 8007862C 462A9102 */ mul.d $f4, $f18, $f10 -/* 079230 80078630 E6000028 */ swc1 $f0, 0x28($s0) -/* 079234 80078634 E600002C */ swc1 $f0, 0x2c($s0) -/* 079238 80078638 8FA40040 */ lw $a0, 0x40($sp) -/* 07923C 8007863C 46202220 */ cvt.s.d $f8, $f4 -/* 079240 80078640 46004421 */ cvt.d.s $f16, $f8 -/* 079244 80078644 46303481 */ sub.d $f18, $f6, $f16 -/* 079248 80078648 462092A0 */ cvt.s.d $f10, $f18 -/* 07924C 8007864C 0C021BF5 */ jal func_80086FD4 -/* 079250 80078650 E60A003C */ swc1 $f10, 0x3c($s0) -/* 079254 80078654 10000021 */ b .L800786DC -/* 079258 80078658 8FBF001C */ lw $ra, 0x1c($sp) -.L8007865C: -/* 07925C 8007865C 0C021DF1 */ jal func_800877C4 -/* 079260 80078660 8FA40040 */ lw $a0, 0x40($sp) -/* 079264 80078664 961900BE */ lhu $t9, 0xbe($s0) -/* 079268 80078668 960800C4 */ lhu $t0, 0xc4($s0) -/* 07926C 8007866C 03284821 */ addu $t1, $t9, $t0 -/* 079270 80078670 A60900BE */ sh $t1, 0xbe($s0) -/* 079274 80078674 0C0AE006 */ jal sins -/* 079278 80078678 3124FFFF */ andi $a0, $t1, 0xffff -/* 07927C 8007867C C604001C */ lwc1 $f4, 0x1c($s0) -/* 079280 80078680 8FA40040 */ lw $a0, 0x40($sp) -/* 079284 80078684 46002202 */ mul.s $f8, $f4, $f0 -/* 079288 80078688 0C022FC6 */ jal func_8008BF18 -/* 07928C 8007868C E6080028 */ swc1 $f8, 0x28($s0) -/* 079290 80078690 C6100008 */ lwc1 $f16, 8($s0) -/* 079294 80078694 44803800 */ mtc1 $zero, $f7 -/* 079298 80078698 44803000 */ mtc1 $zero, $f6 -/* 07929C 8007869C 460084A1 */ cvt.d.s $f18, $f16 -/* 0792A0 800786A0 4626903E */ c.le.d $f18, $f6 -/* 0792A4 800786A4 00000000 */ nop -/* 0792A8 800786A8 45000003 */ bc1f .L800786B8 -/* 0792AC 800786AC 00000000 */ nop -/* 0792B0 800786B0 0C021BF5 */ jal func_80086FD4 -/* 0792B4 800786B4 8FA40040 */ lw $a0, 0x40($sp) -.L800786B8: -/* 0792B8 800786B8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e -/* 0792BC 800786BC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 0792C0 800786C0 0C021CB6 */ jal func_800872D8 -/* 0792C4 800786C4 8FA40040 */ lw $a0, 0x40($sp) -/* 0792C8 800786C8 10000003 */ b .L800786D8 -/* 0792CC 800786CC A60200B4 */ sh $v0, 0xb4($s0) -.L800786D0: -/* 0792D0 800786D0 0C021BD8 */ jal func_80086F60 -/* 0792D4 800786D4 8FA40040 */ lw $a0, 0x40($sp) -.L800786D8: -/* 0792D8 800786D8 8FBF001C */ lw $ra, 0x1c($sp) -.L800786DC: -/* 0792DC 800786DC 8FB00018 */ lw $s0, 0x18($sp) -/* 0792E0 800786E0 27BD0040 */ addiu $sp, $sp, 0x40 -/* 0792E4 800786E4 03E00008 */ jr $ra -/* 0792E8 800786E8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80078A44.s b/asm/non_matchings/code_80071F00/func_80078A44.s index af605b4f6..cb2895d16 100644 --- a/asm/non_matchings/code_80071F00/func_80078A44.s +++ b/asm/non_matchings/code_80071F00/func_80078A44.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEB88 +.word L80078AFC, L80078B38, L80078B74, L80078BB0 +.word L80078BEC + +.section .text + glabel func_80078A44 /* 079644 80078A44 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 079648 80078A48 AFBE0048 */ sw $fp, 0x48($sp) diff --git a/asm/non_matchings/code_80071F00/func_80078C70.s b/asm/non_matchings/code_80071F00/func_80078C70.s index 13849b382..cf5d54e2d 100644 --- a/asm/non_matchings/code_80071F00/func_80078C70.s +++ b/asm/non_matchings/code_80071F00/func_80078C70.s @@ -1,3 +1,20 @@ +.section .late_rodata + +glabel jpt_800EEB9C +.word L80078CA4, L80078CDC, L80078D14 +.word L80078D54, L80078D8C + +glabel D_800EEBB0 +.double 1.7578125 + +glabel jpt_800EEBB8 +.word L80078E70, L80078F54, L80078F54, L80078F54 +.word L80078E84, L80078E98, L80078EA8, L80078EBC +.word L80078ED0, L80078EE4, L80078EF8, L80078F0C +.word L80078F20, L80078F34, L80078F48 + +.section .text + glabel func_80078C70 /* 079870 80078C70 3C0E8016 */ lui $t6, %hi(D_801657C8) # $t6, 0x8016 /* 079874 80078C74 81CE57C8 */ lb $t6, %lo(D_801657C8)($t6) diff --git a/asm/non_matchings/code_80071F00/func_800792D8.s b/asm/non_matchings/code_80071F00/func_800792D8.s index 00f8ba7e8..a4ef62816 100644 --- a/asm/non_matchings/code_80071F00/func_800792D8.s +++ b/asm/non_matchings/code_80071F00/func_800792D8.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EEBF4 +.float 0.15 + +.section .text + glabel func_800792D8 /* 079ED8 800792D8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 079EDC 800792DC AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_80079380.s b/asm/non_matchings/code_80071F00/func_80079380.s index 2dc3e3644..fdfe9fad2 100644 --- a/asm/non_matchings/code_80071F00/func_80079380.s +++ b/asm/non_matchings/code_80071F00/func_80079380.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel jpt_800EEBF8 +.word L8007962C, L800793C8, L800793D8, L80079424 +.word L80079454, L8007948C, L8007949C, L800794C0 +.word L800794FC, L80079520, L80079548, L80079580 +.word L800795BC, L800795E0, L80079614, L80079624 + +.section .text + glabel func_80079380 /* 079F80 80079380 000470C0 */ sll $t6, $a0, 3 /* 079F84 80079384 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007963C.s b/asm/non_matchings/code_80071F00/func_8007963C.s index c6126827e..c6c189118 100644 --- a/asm/non_matchings/code_80071F00/func_8007963C.s +++ b/asm/non_matchings/code_80071F00/func_8007963C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EEC38 +.float 5000.0 + +glabel D_800EEC3C +.float 0.15 + +.section .text + glabel func_8007963C /* 07A23C 8007963C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 07A240 80079640 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_80079700.s b/asm/non_matchings/code_80071F00/func_80079700.s index 6d8ae90bb..b2c70e36a 100644 --- a/asm/non_matchings/code_80071F00/func_80079700.s +++ b/asm/non_matchings/code_80071F00/func_80079700.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEC40 +.word L8007979C, L80079740, L80079750, L8007976C +.word L80079794 + +.section .text + glabel func_80079700 /* 07A300 80079700 000470C0 */ sll $t6, $a0, 3 /* 07A304 80079704 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_800799A8.s b/asm/non_matchings/code_80071F00/func_800799A8.s index 2ff1512fd..5f15cae48 100644 --- a/asm/non_matchings/code_80071F00/func_800799A8.s +++ b/asm/non_matchings/code_80071F00/func_800799A8.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EEC54 +.float 0.15 + +.section .text + glabel func_800799A8 /* 07A5A8 800799A8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 07A5AC 800799AC AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_80079B40.s b/asm/non_matchings/code_80071F00/func_80079B40.s index 1b982c4e1..9292f852e 100644 --- a/asm/non_matchings/code_80071F00/func_80079B40.s +++ b/asm/non_matchings/code_80071F00/func_80079B40.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEC58 +.word L80079D04, L80079C4C, L80079C6C, L80079C84 +.word L80079CB8, L80079CD8 + +.section .text + glabel func_80079B40 /* 07A740 80079B40 000578C0 */ sll $t7, $a1, 3 /* 07A744 80079B44 01E57823 */ subu $t7, $t7, $a1 diff --git a/asm/non_matchings/code_80071F00/func_80079D44.s b/asm/non_matchings/code_80071F00/func_80079D44.s index 4819f751f..06294b465 100644 --- a/asm/non_matchings/code_80071F00/func_80079D44.s +++ b/asm/non_matchings/code_80071F00/func_80079D44.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEC70 +.word L80079E5C, L80079E88, L80079EAC, L80079F2C +.word L80079F40, L80079F9C, L80079FD4, L80079FE8 + +.section .text + glabel func_80079D44 /* 07A944 80079D44 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 07A948 80079D48 0004C8C0 */ sll $t9, $a0, 3 diff --git a/asm/non_matchings/code_80071F00/func_8007A060.s b/asm/non_matchings/code_80071F00/func_8007A060.s index af20fc0a5..dbe4c3295 100644 --- a/asm/non_matchings/code_80071F00/func_8007A060.s +++ b/asm/non_matchings/code_80071F00/func_8007A060.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EEC90 +.float 5000.0 + +glabel D_800EEC94 +.float 0.15 + +.section .text + glabel func_8007A060 /* 07AC60 8007A060 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 07AC64 8007A064 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007A124.s b/asm/non_matchings/code_80071F00/func_8007A124.s index f9af33104..d5f7cb7be 100644 --- a/asm/non_matchings/code_80071F00/func_8007A124.s +++ b/asm/non_matchings/code_80071F00/func_8007A124.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEC98 +.word L8007A218, L8007A168, L8007A178, L8007A194 +.word L8007A1A4, L8007A1CC, L8007A1DC, L8007A204 + +.section .text + glabel func_8007A124 /* 07AD24 8007A124 000470C0 */ sll $t6, $a0, 3 /* 07AD28 8007A128 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007A228.s b/asm/non_matchings/code_80071F00/func_8007A228.s index 933bbadfc..45e9825e7 100644 --- a/asm/non_matchings/code_80071F00/func_8007A228.s +++ b/asm/non_matchings/code_80071F00/func_8007A228.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EECB8 +.float 5000.0 + +glabel D_800EECBC +.float 0.15 + +.section .text + glabel func_8007A228 /* 07AE28 8007A228 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 07AE2C 8007A22C AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007A2EC.s b/asm/non_matchings/code_80071F00/func_8007A2EC.s index 3af94a40f..f9e27dbee 100644 --- a/asm/non_matchings/code_80071F00/func_8007A2EC.s +++ b/asm/non_matchings/code_80071F00/func_8007A2EC.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EECC0 +.word L8007A3E0, L8007A330, L8007A340, L8007A35C +.word L8007A36C, L8007A394, L8007A3A4, L8007A3CC + +.section .text + glabel func_8007A2EC /* 07AEEC 8007A2EC 000470C0 */ sll $t6, $a0, 3 /* 07AEF0 8007A2F0 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007A3F0.s b/asm/non_matchings/code_80071F00/func_8007A3F0.s index e3918975a..6c8f5ab4e 100644 --- a/asm/non_matchings/code_80071F00/func_8007A3F0.s +++ b/asm/non_matchings/code_80071F00/func_8007A3F0.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EECE0 +.float 5000.0 + +glabel D_800EECE4 +.float 0.15 + +.section .text + glabel func_8007A3F0 /* 07AFF0 8007A3F0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 07AFF4 8007A3F4 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007A4D4.s b/asm/non_matchings/code_80071F00/func_8007A4D4.s index ed617da6b..8968818fb 100644 --- a/asm/non_matchings/code_80071F00/func_8007A4D4.s +++ b/asm/non_matchings/code_80071F00/func_8007A4D4.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EECE8 +.word L8007A5C0, L8007A554, L8007A568, L8007A58C +.word L8007A5B8 + +.section .text + glabel func_8007A4D4 /* 07B0D4 8007A4D4 000578C0 */ sll $t7, $a1, 3 /* 07B0D8 8007A4D8 000440C0 */ sll $t0, $a0, 3 diff --git a/asm/non_matchings/code_80071F00/func_8007A948.s b/asm/non_matchings/code_80071F00/func_8007A948.s index 9bc2ccb3b..a2e83ad1f 100644 --- a/asm/non_matchings/code_80071F00/func_8007A948.s +++ b/asm/non_matchings/code_80071F00/func_8007A948.s @@ -1,3 +1,12 @@ +.section .late_rodata + +glabel jpt_800EECFC +.word L8007AA30, L8007A9A0, L8007A9B8 +.word L8007A9D0, L8007A9E0, L8007A9F8, L8007AA10 +.word L8007AA28 + +.section .text + glabel func_8007A948 /* 07B548 8007A948 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 07B54C 8007A94C AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007AA44.s b/asm/non_matchings/code_80071F00/func_8007AA44.s index 20244939c..ac127e0bc 100644 --- a/asm/non_matchings/code_80071F00/func_8007AA44.s +++ b/asm/non_matchings/code_80071F00/func_8007AA44.s @@ -1,3 +1,12 @@ +.section .late_rodata + +glabel jpt_800EED1C +.word L8007ABE8, L8007AABC, L8007AAE8 +.word L8007AB14, L8007AB40, L8007AB6C, L8007AB98 +.word L8007ABC4 + +.section .text + glabel func_8007AA44 /* 07B644 8007AA44 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 07B648 8007AA48 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007B34C.s b/asm/non_matchings/code_80071F00/func_8007B34C.s index 4409e1d54..e527a6a3e 100644 --- a/asm/non_matchings/code_80071F00/func_8007B34C.s +++ b/asm/non_matchings/code_80071F00/func_8007B34C.s @@ -1,3 +1,22 @@ +.section .late_rodata + +glabel jpt_800EED3C +.word L8007B998, L8007B41C, L8007B430 +.word L8007B5A4, L8007B5D0, L8007B5FC, L8007B628 +.word L8007B680, L8007B998, L8007B6A8, L8007B6D4 +.word L8007B6E8, L8007B834, L8007B998, L8007B998 +.word L8007B998, L8007B998, L8007B998, L8007B998 +.word L8007B998, L8007B844, L8007B894, L8007B998 +.word L8007B998, L8007B998, L8007B998, L8007B998 +.word L8007B998, L8007B998, L8007B998, L8007B8B0 +.word L8007B900, L8007B998, L8007B998, L8007B998 +.word L8007B998, L8007B998, L8007B998, L8007B998 +.word L8007B998, L8007B914, L8007B964, L8007B998 +.word L8007B998, L8007B998, L8007B998, L8007B998 +.word L8007B998, L8007B998, L8007B998, L8007B978 + +.section .text + glabel func_8007B34C /* 07BF4C 8007B34C 0004C0C0 */ sll $t8, $a0, 3 /* 07BF50 8007B350 0304C023 */ subu $t8, $t8, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007BD04.s b/asm/non_matchings/code_80071F00/func_8007BD04.s deleted file mode 100644 index f40da8c66..000000000 --- a/asm/non_matchings/code_80071F00/func_8007BD04.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8007BD04 -/* 07C904 8007BD04 3C0E8018 */ lui $t6, %hi(D_80183F28) # $t6, 0x8018 -/* 07C908 8007BD08 8DCE3F28 */ lw $t6, %lo(D_80183F28)($t6) -/* 07C90C 8007BD0C 3C188016 */ lui $t8, %hi(D_80165CBE) # 0x8016 -/* 07C910 8007BD10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07C914 8007BD14 000E78C0 */ sll $t7, $t6, 3 -/* 07C918 8007BD18 01EE7823 */ subu $t7, $t7, $t6 -/* 07C91C 8007BD1C 000F7940 */ sll $t7, $t7, 5 -/* 07C920 8007BD20 030FC021 */ addu $t8, $t8, $t7 -/* 07C924 8007BD24 87185CBE */ lh $t8, %lo(D_80165CBE)($t8) # 0x5cbe($t8) -/* 07C928 8007BD28 AFBF0014 */ sw $ra, 0x14($sp) -/* 07C92C 8007BD2C 0004C840 */ sll $t9, $a0, 1 -/* 07C930 8007BD30 17000019 */ bnez $t8, .L8007BD98 -/* 07C934 8007BD34 AFAE001C */ sw $t6, 0x1c($sp) -/* 07C938 8007BD38 3C028016 */ lui $v0, %hi(gNearestWaypointByPlayerId) # 0x8016 -/* 07C93C 8007BD3C 00591021 */ addu $v0, $v0, $t9 -/* 07C940 8007BD40 94424438 */ lhu $v0, %lo(gNearestWaypointByPlayerId)($v0) # 0x4438($v0) -/* 07C944 8007BD44 284100A0 */ slti $at, $v0, 0xa0 -/* 07C948 8007BD48 14200013 */ bnez $at, .L8007BD98 -/* 07C94C 8007BD4C 284100AB */ slti $at, $v0, 0xab -/* 07C950 8007BD50 10200011 */ beqz $at, .L8007BD98 -/* 07C954 8007BD54 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07C958 8007BD58 C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 07C95C 8007BD5C 3C01800F */ lui $at, %hi(D_800EEE08) -/* 07C960 8007BD60 D428EE08 */ ldc1 $f8, %lo(D_800EEE08)($at) -/* 07C964 8007BD64 460021A1 */ cvt.d.s $f6, $f4 -/* 07C968 8007BD68 3C07C4CE */ lui $a3, (0xC4CE4000 >> 16) # lui $a3, 0xc4ce -/* 07C96C 8007BD6C 46283282 */ mul.d $f10, $f6, $f8 -/* 07C970 8007BD70 34E74000 */ ori $a3, (0xC4CE4000 & 0xFFFF) # ori $a3, $a3, 0x4000 -/* 07C974 8007BD74 01C02025 */ move $a0, $t6 -/* 07C978 8007BD78 3C06C348 */ lui $a2, 0xc348 -/* 07C97C 8007BD7C 46205420 */ cvt.s.d $f16, $f10 -/* 07C980 8007BD80 44058000 */ mfc1 $a1, $f16 -/* 07C984 8007BD84 0C022DF5 */ jal func_8008B7D4 -/* 07C988 8007BD88 00000000 */ nop -/* 07C98C 8007BD8C 8FA4001C */ lw $a0, 0x1c($sp) -/* 07C990 8007BD90 0C01C8E9 */ jal func_800723A4 -/* 07C994 8007BD94 24050001 */ li $a1, 1 -.L8007BD98: -/* 07C998 8007BD98 8FBF0014 */ lw $ra, 0x14($sp) -/* 07C99C 8007BD9C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07C9A0 8007BDA0 03E00008 */ jr $ra -/* 07C9A4 8007BDA4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007BDE0.s b/asm/non_matchings/code_80071F00/func_8007BDE0.s index 1782fc5f0..e35f18e3a 100644 --- a/asm/non_matchings/code_80071F00/func_8007BDE0.s +++ b/asm/non_matchings/code_80071F00/func_8007BDE0.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel D_800EEE10 +.float 0.2 +.word 0x00000000 + +glabel D_800EEE18 +.double 55.0 + +.section .text + glabel func_8007BDE0 /* 07C9E0 8007BDE0 000470C0 */ sll $t6, $a0, 3 /* 07C9E4 8007BDE4 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007BEC8.s b/asm/non_matchings/code_80071F00/func_8007BEC8.s index 9f8ee9369..8cd1c42e4 100644 --- a/asm/non_matchings/code_80071F00/func_8007BEC8.s +++ b/asm/non_matchings/code_80071F00/func_8007BEC8.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEE20 +.word L8007BFA0, L8007BF0C, L8007BF1C, L8007BF4C +.word L8007BF68, L8007BF8C + +.section .text + glabel func_8007BEC8 /* 07CAC8 8007BEC8 000470C0 */ sll $t6, $a0, 3 /* 07CACC 8007BECC 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007BFB0.s b/asm/non_matchings/code_80071F00/func_8007BFB0.s index 983d8f9c6..c49c08fbf 100644 --- a/asm/non_matchings/code_80071F00/func_8007BFB0.s +++ b/asm/non_matchings/code_80071F00/func_8007BFB0.s @@ -1,3 +1,43 @@ +.section .late_rodata + +glabel jpt_800EEE38 +.word L8007C220, L8007C000 +.word L8007C040, L8007C060, L8007C0BC, L8007C0F8 +.word L8007C180, L8007C1B0, L8007C214 + +glabel D_800EEE5C +.float -0.2 + +glabel D_800EEE60 +.double 0.0015 + +glabel D_800EEE68 +.double 0.0015 + +glabel D_800EEE70 +.float 0.001 +.word 0x00000000 + +glabel D_800EEE78 +.double 0.004 + +glabel D_800EEE80 +.double 0.0002 + +glabel D_800EEE88 +.double 0.05 + +glabel D_800EEE90 +.double 0.01 + +glabel D_800EEE98 +.float 0.000001 + +glabel D_800EEE9C +.float 0.001 + +.section .text + glabel func_8007BFB0 /* 07CBB0 8007BFB0 000470C0 */ sll $t6, $a0, 3 /* 07CBB4 8007BFB4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/non_matchings/code_80071F00/func_8007C5B4.s b/asm/non_matchings/code_80071F00/func_8007C5B4.s index b71d77655..2edc7a308 100644 --- a/asm/non_matchings/code_80071F00/func_8007C5B4.s +++ b/asm/non_matchings/code_80071F00/func_8007C5B4.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EEEA0 +.float 0.15 + +.section .text + glabel func_8007C5B4 /* 07D1B4 8007C5B4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 07D1B8 8007C5B8 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007C684.s b/asm/non_matchings/code_80071F00/func_8007C684.s index 3c87d5219..2bf34ae01 100644 --- a/asm/non_matchings/code_80071F00/func_8007C684.s +++ b/asm/non_matchings/code_80071F00/func_8007C684.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEEA4 +.word L8007C798, L8007C704, L8007C734, L8007C764 +.word L8007C780 + +.section .text + glabel func_8007C684 /* 07D284 8007C684 000470C0 */ sll $t6, $a0, 3 /* 07D288 8007C688 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007CE0C.s b/asm/non_matchings/code_80071F00/func_8007CE0C.s index 64a792a70..872fa498f 100644 --- a/asm/non_matchings/code_80071F00/func_8007CE0C.s +++ b/asm/non_matchings/code_80071F00/func_8007CE0C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EEEB8 +.float 0.15 + +.section .text + glabel func_8007CE0C /* 07DA0C 8007CE0C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 07DA10 8007CE10 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007CEDC.s b/asm/non_matchings/code_80071F00/func_8007CEDC.s index 922d2fb28..d5c19b86c 100644 --- a/asm/non_matchings/code_80071F00/func_8007CEDC.s +++ b/asm/non_matchings/code_80071F00/func_8007CEDC.s @@ -1,3 +1,17 @@ +.section .late_rodata + +glabel jpt_800EEEBC +.word L8007CF70, L8007CF2C, L8007CF3C, L8007CF50 +.word L8007CF64 + +glabel jpt_800EEED0 +.word L8007D05C, L8007CFB8, L8007CFE4 +.word L8007D038, L8007D054 + +.word 0x00000000 + +.section .text + glabel func_8007CEDC /* 07DADC 8007CEDC 000470C0 */ sll $t6, $a0, 3 /* 07DAE0 8007CEE0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/non_matchings/code_80071F00/func_8007D360.s b/asm/non_matchings/code_80071F00/func_8007D360.s deleted file mode 100644 index 787d3a9c7..000000000 --- a/asm/non_matchings/code_80071F00/func_8007D360.s +++ /dev/null @@ -1,222 +0,0 @@ -glabel func_8007D360 -/* 07DF60 8007D360 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07DF64 8007D364 24010001 */ li $at, 1 -/* 07DF68 8007D368 AFBF001C */ sw $ra, 0x1c($sp) -/* 07DF6C 8007D36C AFB00018 */ sw $s0, 0x18($sp) -/* 07DF70 8007D370 AFA40020 */ sw $a0, 0x20($sp) -/* 07DF74 8007D374 14A10057 */ bne $a1, $at, .L8007D4D4 -/* 07DF78 8007D378 AFA50024 */ sw $a1, 0x24($sp) -/* 07DF7C 8007D37C 0C0ADF8D */ jal random_int -/* 07DF80 8007D380 2404001E */ li $a0, 30 -/* 07DF84 8007D384 8FAF0020 */ lw $t7, 0x20($sp) -/* 07DF88 8007D388 44823000 */ mtc1 $v0, $f6 -/* 07DF8C 8007D38C 3C198016 */ lui $t9, %hi(D_80165C18) # $t9, 0x8016 -/* 07DF90 8007D390 000FC0C0 */ sll $t8, $t7, 3 -/* 07DF94 8007D394 030FC023 */ subu $t8, $t8, $t7 -/* 07DF98 8007D398 0018C140 */ sll $t8, $t8, 5 -/* 07DF9C 8007D39C 27395C18 */ addiu $t9, %lo(D_80165C18) # addiu $t9, $t9, 0x5c18 -/* 07DFA0 8007D3A0 3C01800F */ lui $at, %hi(D_800EEEE8) -/* 07DFA4 8007D3A4 D424EEE8 */ ldc1 $f4, %lo(D_800EEEE8)($at) -/* 07DFA8 8007D3A8 03198021 */ addu $s0, $t8, $t9 -/* 07DFAC 8007D3AC 04410006 */ bgez $v0, .L8007D3C8 -/* 07DFB0 8007D3B0 46803221 */ cvt.d.w $f8, $f6 -/* 07DFB4 8007D3B4 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07DFB8 8007D3B8 44815800 */ mtc1 $at, $f11 -/* 07DFBC 8007D3BC 44805000 */ mtc1 $zero, $f10 -/* 07DFC0 8007D3C0 00000000 */ nop -/* 07DFC4 8007D3C4 462A4200 */ add.d $f8, $f8, $f10 -.L8007D3C8: -/* 07DFC8 8007D3C8 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07DFCC 8007D3CC C432D01C */ lwc1 $f18, %lo(D_8018D01C)($at) -/* 07DFD0 8007D3D0 46282401 */ sub.d $f16, $f4, $f8 -/* 07DFD4 8007D3D4 24040019 */ li $a0, 25 -/* 07DFD8 8007D3D8 460091A1 */ cvt.d.s $f6, $f18 -/* 07DFDC 8007D3DC 46268282 */ mul.d $f10, $f16, $f6 -/* 07DFE0 8007D3E0 46205120 */ cvt.s.d $f4, $f10 -/* 07DFE4 8007D3E4 0C0ADF8D */ jal random_int -/* 07DFE8 8007D3E8 E6040010 */ swc1 $f4, 0x10($s0) -/* 07DFEC 8007D3EC 44824000 */ mtc1 $v0, $f8 -/* 07DFF0 8007D3F0 44803000 */ mtc1 $zero, $f6 -/* 07DFF4 8007D3F4 04410006 */ bgez $v0, .L8007D410 -/* 07DFF8 8007D3F8 468044A1 */ cvt.d.w $f18, $f8 -/* 07DFFC 8007D3FC 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07E000 8007D400 44818800 */ mtc1 $at, $f17 -/* 07E004 8007D404 44808000 */ mtc1 $zero, $f16 -/* 07E008 8007D408 00000000 */ nop -/* 07E00C 8007D40C 46309480 */ add.d $f18, $f18, $f16 -.L8007D410: -/* 07E010 8007D410 3C014039 */ li $at, 0x40390000 # 2.890625 -/* 07E014 8007D414 44813800 */ mtc1 $at, $f7 -/* 07E018 8007D418 2404001E */ li $a0, 30 -/* 07E01C 8007D41C 46269280 */ add.d $f10, $f18, $f6 -/* 07E020 8007D420 46205120 */ cvt.s.d $f4, $f10 -/* 07E024 8007D424 0C0ADF8D */ jal random_int -/* 07E028 8007D428 E6040014 */ swc1 $f4, 0x14($s0) -/* 07E02C 8007D42C 44824000 */ mtc1 $v0, $f8 -/* 07E030 8007D430 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07E034 8007D434 04410005 */ bgez $v0, .L8007D44C -/* 07E038 8007D438 46804421 */ cvt.d.w $f16, $f8 -/* 07E03C 8007D43C 44819800 */ mtc1 $at, $f19 -/* 07E040 8007D440 44809000 */ mtc1 $zero, $f18 -/* 07E044 8007D444 00000000 */ nop -/* 07E048 8007D448 46328400 */ add.d $f16, $f16, $f18 -.L8007D44C: -/* 07E04C 8007D44C 3C01800F */ lui $at, %hi(D_800EEEF0) -/* 07E050 8007D450 D426EEF0 */ ldc1 $f6, %lo(D_800EEEF0)($at) -/* 07E054 8007D454 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07E058 8007D458 24040096 */ li $a0, 150 -/* 07E05C 8007D45C 46268280 */ add.d $f10, $f16, $f6 -/* 07E060 8007D460 46205120 */ cvt.s.d $f4, $f10 -/* 07E064 8007D464 E6040018 */ swc1 $f4, 0x18($s0) -/* 07E068 8007D468 C428D01C */ lwc1 $f8, %lo(D_8018D01C)($at) -/* 07E06C 8007D46C 3C01800F */ lui $at, %hi(D_800EEEF8) -/* 07E070 8007D470 D430EEF8 */ ldc1 $f16, %lo(D_800EEEF8)($at) -/* 07E074 8007D474 460044A1 */ cvt.d.s $f18, $f8 -/* 07E078 8007D478 44802000 */ mtc1 $zero, $f4 -/* 07E07C 8007D47C 46309182 */ mul.d $f6, $f18, $f16 -/* 07E080 8007D480 E6040020 */ swc1 $f4, 0x20($s0) -/* 07E084 8007D484 462032A0 */ cvt.s.d $f10, $f6 -/* 07E088 8007D488 0C0ADF8D */ jal random_int -/* 07E08C 8007D48C E60A001C */ swc1 $f10, 0x1c($s0) -/* 07E090 8007D490 44829000 */ mtc1 $v0, $f18 -/* 07E094 8007D494 3C01800F */ lui $at, %hi(D_800EEF00) -/* 07E098 8007D498 D428EF00 */ ldc1 $f8, %lo(D_800EEF00)($at) -/* 07E09C 8007D49C 04410006 */ bgez $v0, .L8007D4B8 -/* 07E0A0 8007D4A0 46809421 */ cvt.d.w $f16, $f18 -/* 07E0A4 8007D4A4 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07E0A8 8007D4A8 44813800 */ mtc1 $at, $f7 -/* 07E0AC 8007D4AC 44803000 */ mtc1 $zero, $f6 -/* 07E0B0 8007D4B0 00000000 */ nop -/* 07E0B4 8007D4B4 46268400 */ add.d $f16, $f16, $f6 -.L8007D4B8: -/* 07E0B8 8007D4B8 46304281 */ sub.d $f10, $f8, $f16 -/* 07E0BC 8007D4BC 3408DC00 */ li $t0, 56320 -/* 07E0C0 8007D4C0 24090800 */ li $t1, 2048 -/* 07E0C4 8007D4C4 A60800BE */ sh $t0, 0xbe($s0) -/* 07E0C8 8007D4C8 46205120 */ cvt.s.d $f4, $f10 -/* 07E0CC 8007D4CC A60900C6 */ sh $t1, 0xc6($s0) -/* 07E0D0 8007D4D0 E6040024 */ swc1 $f4, 0x24($s0) -.L8007D4D4: -/* 07E0D4 8007D4D4 8FAA0020 */ lw $t2, 0x20($sp) -/* 07E0D8 8007D4D8 8FAD0024 */ lw $t5, 0x24($sp) -/* 07E0DC 8007D4DC 3C0C8016 */ lui $t4, %hi(D_80165C18) # $t4, 0x8016 -/* 07E0E0 8007D4E0 000A58C0 */ sll $t3, $t2, 3 -/* 07E0E4 8007D4E4 016A5823 */ subu $t3, $t3, $t2 -/* 07E0E8 8007D4E8 000B5940 */ sll $t3, $t3, 5 -/* 07E0EC 8007D4EC 258C5C18 */ addiu $t4, %lo(D_80165C18) # addiu $t4, $t4, 0x5c18 -/* 07E0F0 8007D4F0 24010002 */ li $at, 2 -/* 07E0F4 8007D4F4 15A10032 */ bne $t5, $at, .L8007D5C0 -/* 07E0F8 8007D4F8 016C8021 */ addu $s0, $t3, $t4 -/* 07E0FC 8007D4FC 0C0ADF8D */ jal random_int -/* 07E100 8007D500 2404001E */ li $a0, 30 -/* 07E104 8007D504 240EFAA5 */ li $t6, -1371 -/* 07E108 8007D508 01C27823 */ subu $t7, $t6, $v0 -/* 07E10C 8007D50C 448F9000 */ mtc1 $t7, $f18 -/* 07E110 8007D510 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07E114 8007D514 C428D01C */ lwc1 $f8, %lo(D_8018D01C)($at) -/* 07E118 8007D518 468091A0 */ cvt.s.w $f6, $f18 -/* 07E11C 8007D51C 24040019 */ li $a0, 25 -/* 07E120 8007D520 46083402 */ mul.s $f16, $f6, $f8 -/* 07E124 8007D524 0C0ADF8D */ jal random_int -/* 07E128 8007D528 E6100010 */ swc1 $f16, 0x10($s0) -/* 07E12C 8007D52C 2458000F */ addiu $t8, $v0, 0xf -/* 07E130 8007D530 44985000 */ mtc1 $t8, $f10 -/* 07E134 8007D534 2404001E */ li $a0, 30 -/* 07E138 8007D538 46805120 */ cvt.s.w $f4, $f10 -/* 07E13C 8007D53C 0C0ADF8D */ jal random_int -/* 07E140 8007D540 E6040014 */ swc1 $f4, 0x14($s0) -/* 07E144 8007D544 2459FF18 */ addiu $t9, $v0, -0xe8 -/* 07E148 8007D548 44999000 */ mtc1 $t9, $f18 -/* 07E14C 8007D54C 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07E150 8007D550 240400C8 */ li $a0, 200 -/* 07E154 8007D554 468091A0 */ cvt.s.w $f6, $f18 -/* 07E158 8007D558 E6060018 */ swc1 $f6, 0x18($s0) -/* 07E15C 8007D55C C428D01C */ lwc1 $f8, %lo(D_8018D01C)($at) -/* 07E160 8007D560 3C01800F */ lui $at, %hi(D_800EEF08) -/* 07E164 8007D564 D42AEF08 */ ldc1 $f10, %lo(D_800EEF08)($at) -/* 07E168 8007D568 46004421 */ cvt.d.s $f16, $f8 -/* 07E16C 8007D56C 44803000 */ mtc1 $zero, $f6 -/* 07E170 8007D570 462A8102 */ mul.d $f4, $f16, $f10 -/* 07E174 8007D574 E6060020 */ swc1 $f6, 0x20($s0) -/* 07E178 8007D578 462024A0 */ cvt.s.d $f18, $f4 -/* 07E17C 8007D57C 0C0ADF8D */ jal random_int -/* 07E180 8007D580 E612001C */ swc1 $f18, 0x1c($s0) -/* 07E184 8007D584 44824000 */ mtc1 $v0, $f8 -/* 07E188 8007D588 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07E18C 8007D58C 04410005 */ bgez $v0, .L8007D5A4 -/* 07E190 8007D590 46804421 */ cvt.d.w $f16, $f8 -/* 07E194 8007D594 44815800 */ mtc1 $at, $f11 -/* 07E198 8007D598 44805000 */ mtc1 $zero, $f10 -/* 07E19C 8007D59C 00000000 */ nop -/* 07E1A0 8007D5A0 462A8400 */ add.d $f16, $f16, $f10 -.L8007D5A4: -/* 07E1A4 8007D5A4 3C01800F */ lui $at, %hi(D_800EEF10) -/* 07E1A8 8007D5A8 D424EF10 */ ldc1 $f4, %lo(D_800EEF10)($at) -/* 07E1AC 8007D5AC A60000BE */ sh $zero, 0xbe($s0) -/* 07E1B0 8007D5B0 A60000C6 */ sh $zero, 0xc6($s0) -/* 07E1B4 8007D5B4 46248480 */ add.d $f18, $f16, $f4 -/* 07E1B8 8007D5B8 462091A0 */ cvt.s.d $f6, $f18 -/* 07E1BC 8007D5BC E6060024 */ swc1 $f6, 0x24($s0) -.L8007D5C0: -/* 07E1C0 8007D5C0 C60C0010 */ lwc1 $f12, 0x10($s0) -/* 07E1C4 8007D5C4 C60E001C */ lwc1 $f14, 0x1c($s0) -/* 07E1C8 8007D5C8 8E060018 */ lw $a2, 0x18($s0) -/* 07E1CC 8007D5CC 0C0105DC */ jal func_80041770 -/* 07E1D0 8007D5D0 8E070024 */ lw $a3, 0x24($s0) -/* 07E1D4 8007D5D4 A60200C0 */ sh $v0, 0xc0($s0) -/* 07E1D8 8007D5D8 A60000C2 */ sh $zero, 0xc2($s0) -/* 07E1DC 8007D5DC 8FA40020 */ lw $a0, 0x20($sp) -/* 07E1E0 8007D5E0 24050000 */ li $a1, 0 -/* 07E1E4 8007D5E4 24060000 */ li $a2, 0 -/* 07E1E8 8007D5E8 0C022E03 */ jal func_8008B80C -/* 07E1EC 8007D5EC 24070000 */ li $a3, 0 -/* 07E1F0 8007D5F0 A60000B0 */ sh $zero, 0xb0($s0) -/* 07E1F4 8007D5F4 3C08800E */ lui $t0, %hi(gCCSelection) # $t0, 0x800e -/* 07E1F8 8007D5F8 8D08C548 */ lw $t0, %lo(gCCSelection)($t0) -/* 07E1FC 8007D5FC 29010002 */ slti $at, $t0, 2 -/* 07E200 8007D600 10200013 */ beqz $at, .L8007D650 -/* 07E204 8007D604 00000000 */ nop -/* 07E208 8007D608 0C0ADF8D */ jal random_int -/* 07E20C 8007D60C 24040004 */ li $a0, 4 -/* 07E210 8007D610 44824000 */ mtc1 $v0, $f8 -/* 07E214 8007D614 44802000 */ mtc1 $zero, $f4 -/* 07E218 8007D618 04410006 */ bgez $v0, .L8007D634 -/* 07E21C 8007D61C 468042A1 */ cvt.d.w $f10, $f8 -/* 07E220 8007D620 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07E224 8007D624 44818800 */ mtc1 $at, $f17 -/* 07E228 8007D628 44808000 */ mtc1 $zero, $f16 -/* 07E22C 8007D62C 00000000 */ nop -/* 07E230 8007D630 46305280 */ add.d $f10, $f10, $f16 -.L8007D634: -/* 07E234 8007D634 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 07E238 8007D638 44812800 */ mtc1 $at, $f5 -/* 07E23C 8007D63C 00000000 */ nop -/* 07E240 8007D640 46245480 */ add.d $f18, $f10, $f4 -/* 07E244 8007D644 462091A0 */ cvt.s.d $f6, $f18 -/* 07E248 8007D648 10000012 */ b .L8007D694 -/* 07E24C 8007D64C E6060034 */ swc1 $f6, 0x34($s0) -.L8007D650: -/* 07E250 8007D650 0C0ADF8D */ jal random_int -/* 07E254 8007D654 24040004 */ li $a0, 4 -/* 07E258 8007D658 44824000 */ mtc1 $v0, $f8 -/* 07E25C 8007D65C 44802000 */ mtc1 $zero, $f4 -/* 07E260 8007D660 04410006 */ bgez $v0, .L8007D67C -/* 07E264 8007D664 46804421 */ cvt.d.w $f16, $f8 -/* 07E268 8007D668 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07E26C 8007D66C 44815800 */ mtc1 $at, $f11 -/* 07E270 8007D670 44805000 */ mtc1 $zero, $f10 -/* 07E274 8007D674 00000000 */ nop -/* 07E278 8007D678 462A8400 */ add.d $f16, $f16, $f10 -.L8007D67C: -/* 07E27C 8007D67C 3C014014 */ li $at, 0x40140000 # 2.312500 -/* 07E280 8007D680 44812800 */ mtc1 $at, $f5 -/* 07E284 8007D684 00000000 */ nop -/* 07E288 8007D688 46248480 */ add.d $f18, $f16, $f4 -/* 07E28C 8007D68C 462091A0 */ cvt.s.d $f6, $f18 -/* 07E290 8007D690 E6060034 */ swc1 $f6, 0x34($s0) -.L8007D694: -/* 07E294 8007D694 8FBF001C */ lw $ra, 0x1c($sp) -/* 07E298 8007D698 8FB00018 */ lw $s0, 0x18($sp) -/* 07E29C 8007D69C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07E2A0 8007D6A0 03E00008 */ jr $ra -/* 07E2A4 8007D6A4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007D6A8.s b/asm/non_matchings/code_80071F00/func_8007D6A8.s deleted file mode 100644 index 7a1b1a157..000000000 --- a/asm/non_matchings/code_80071F00/func_8007D6A8.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8007D6A8 -/* 07E2A8 8007D6A8 000470C0 */ sll $t6, $a0, 3 -/* 07E2AC 8007D6AC 01C47023 */ subu $t6, $t6, $a0 -/* 07E2B0 8007D6B0 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07E2B4 8007D6B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07E2B8 8007D6B8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07E2BC 8007D6BC 000E7140 */ sll $t6, $t6, 5 -/* 07E2C0 8007D6C0 AFBF0014 */ sw $ra, 0x14($sp) -/* 07E2C4 8007D6C4 01CF1021 */ addu $v0, $t6, $t7 -/* 07E2C8 8007D6C8 2418000D */ li $t8, 13 -/* 07E2CC 8007D6CC A05800D5 */ sb $t8, 0xd5($v0) -/* 07E2D0 8007D6D0 AFA20018 */ sw $v0, 0x18($sp) -/* 07E2D4 8007D6D4 0C01F4D8 */ jal func_8007D360 -/* 07E2D8 8007D6D8 AFA40028 */ sw $a0, 0x28($sp) -/* 07E2DC 8007D6DC 3C01800F */ lui $at, %hi(D_800EEF18) # $at, 0x800f -/* 07E2E0 8007D6E0 C424EF18 */ lwc1 $f4, %lo(D_800EEF18)($at) -/* 07E2E4 8007D6E4 8FB90018 */ lw $t9, 0x18($sp) -/* 07E2E8 8007D6E8 8FA40028 */ lw $a0, 0x28($sp) -/* 07E2EC 8007D6EC 24050200 */ li $a1, 512 -/* 07E2F0 8007D6F0 0C01C870 */ jal func_800721C0 -/* 07E2F4 8007D6F4 E7240000 */ swc1 $f4, ($t9) -/* 07E2F8 8007D6F8 8FA90018 */ lw $t1, 0x18($sp) -/* 07E2FC 8007D6FC 24080003 */ li $t0, 3 -/* 07E300 8007D700 A52800C8 */ sh $t0, 0xc8($t1) -/* 07E304 8007D704 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E308 8007D708 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07E30C 8007D70C 03E00008 */ jr $ra -/* 07E310 8007D710 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007D8D4.s b/asm/non_matchings/code_80071F00/func_8007D8D4.s deleted file mode 100644 index c6aa11d47..000000000 --- a/asm/non_matchings/code_80071F00/func_8007D8D4.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_8007D8D4 -/* 07E4D4 8007D8D4 000470C0 */ sll $t6, $a0, 3 -/* 07E4D8 8007D8D8 01C47023 */ subu $t6, $t6, $a0 -/* 07E4DC 8007D8DC 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07E4E0 8007D8E0 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07E4E4 8007D8E4 000E7140 */ sll $t6, $t6, 5 -/* 07E4E8 8007D8E8 01CF1821 */ addu $v1, $t6, $t7 -/* 07E4EC 8007D8EC 846200A6 */ lh $v0, 0xa6($v1) -/* 07E4F0 8007D8F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07E4F4 8007D8F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 07E4F8 8007D8F8 10400050 */ beqz $v0, .L8007DA3C -/* 07E4FC 8007D8FC AFA50024 */ sw $a1, 0x24($sp) -/* 07E500 8007D900 24010001 */ li $at, 1 -/* 07E504 8007D904 10410005 */ beq $v0, $at, .L8007D91C -/* 07E508 8007D908 24010002 */ li $at, 2 -/* 07E50C 8007D90C 50410008 */ beql $v0, $at, .L8007D930 -/* 07E510 8007D910 AFA30018 */ sw $v1, 0x18($sp) -/* 07E514 8007D914 1000004A */ b .L8007DA40 -/* 07E518 8007D918 8FBF0014 */ lw $ra, 0x14($sp) -.L8007D91C: -/* 07E51C 8007D91C 0C01F62B */ jal func_8007D8AC -/* 07E520 8007D920 00000000 */ nop -/* 07E524 8007D924 10000046 */ b .L8007DA40 -/* 07E528 8007D928 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E52C 8007D92C AFA30018 */ sw $v1, 0x18($sp) -.L8007D930: -/* 07E530 8007D930 0C01F601 */ jal func_8007D804 -/* 07E534 8007D934 AFA40020 */ sw $a0, 0x20($sp) -/* 07E538 8007D938 8FA30018 */ lw $v1, 0x18($sp) -/* 07E53C 8007D93C 14400006 */ bnez $v0, .L8007D958 -/* 07E540 8007D940 8FA40020 */ lw $a0, 0x20($sp) -/* 07E544 8007D944 AFA30018 */ sw $v1, 0x18($sp) -/* 07E548 8007D948 0C01C90A */ jal func_80072428 -/* 07E54C 8007D94C AFA40020 */ sw $a0, 0x20($sp) -/* 07E550 8007D950 8FA30018 */ lw $v1, 0x18($sp) -/* 07E554 8007D954 8FA40020 */ lw $a0, 0x20($sp) -.L8007D958: -/* 07E558 8007D958 8FB80024 */ lw $t8, 0x24($sp) -/* 07E55C 8007D95C 24010001 */ li $at, 1 -/* 07E560 8007D960 3C19800E */ lui $t9, %hi(gIsMirrorMode) # $t9, 0x800e -/* 07E564 8007D964 1701001C */ bne $t8, $at, .L8007D9D8 -/* 07E568 8007D968 3C08800E */ lui $t0, %hi(gIsMirrorMode) # $t0, 0x800e -/* 07E56C 8007D96C 8F39C604 */ lw $t9, %lo(gIsMirrorMode)($t9) -/* 07E570 8007D970 5320000E */ beql $t9, $zero, .L8007D9AC -/* 07E574 8007D974 C4700004 */ lwc1 $f16, 4($v1) -/* 07E578 8007D978 C4640004 */ lwc1 $f4, 4($v1) -/* 07E57C 8007D97C 3C01800F */ lui $at, %hi(D_800EEF20) -/* 07E580 8007D980 D428EF20 */ ldc1 $f8, %lo(D_800EEF20)($at) -/* 07E584 8007D984 460021A1 */ cvt.d.s $f6, $f4 -/* 07E588 8007D988 4626403E */ c.le.d $f8, $f6 -/* 07E58C 8007D98C 00000000 */ nop -/* 07E590 8007D990 4502002B */ bc1fl .L8007DA40 -/* 07E594 8007D994 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E598 8007D998 0C01C90A */ jal func_80072428 -/* 07E59C 8007D99C 00000000 */ nop -/* 07E5A0 8007D9A0 10000027 */ b .L8007DA40 -/* 07E5A4 8007D9A4 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E5A8 8007D9A8 C4700004 */ lwc1 $f16, 4($v1) -.L8007D9AC: -/* 07E5AC 8007D9AC 3C01800F */ lui $at, %hi(D_800EEF28) -/* 07E5B0 8007D9B0 D42AEF28 */ ldc1 $f10, %lo(D_800EEF28)($at) -/* 07E5B4 8007D9B4 460084A1 */ cvt.d.s $f18, $f16 -/* 07E5B8 8007D9B8 462A903E */ c.le.d $f18, $f10 -/* 07E5BC 8007D9BC 00000000 */ nop -/* 07E5C0 8007D9C0 4502001F */ bc1fl .L8007DA40 -/* 07E5C4 8007D9C4 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E5C8 8007D9C8 0C01C90A */ jal func_80072428 -/* 07E5CC 8007D9CC 00000000 */ nop -/* 07E5D0 8007D9D0 1000001B */ b .L8007DA40 -/* 07E5D4 8007D9D4 8FBF0014 */ lw $ra, 0x14($sp) -.L8007D9D8: -/* 07E5D8 8007D9D8 8D08C604 */ lw $t0, %lo(gIsMirrorMode)($t0) -/* 07E5DC 8007D9DC 5100000E */ beql $t0, $zero, .L8007DA18 -/* 07E5E0 8007D9E0 C46A0004 */ lwc1 $f10, 4($v1) -/* 07E5E4 8007D9E4 C4640004 */ lwc1 $f4, 4($v1) -/* 07E5E8 8007D9E8 3C01800F */ lui $at, %hi(D_800EEF30) -/* 07E5EC 8007D9EC D428EF30 */ ldc1 $f8, %lo(D_800EEF30)($at) -/* 07E5F0 8007D9F0 460021A1 */ cvt.d.s $f6, $f4 -/* 07E5F4 8007D9F4 4626403E */ c.le.d $f8, $f6 -/* 07E5F8 8007D9F8 00000000 */ nop -/* 07E5FC 8007D9FC 45020010 */ bc1fl .L8007DA40 -/* 07E600 8007DA00 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E604 8007DA04 0C01C90A */ jal func_80072428 -/* 07E608 8007DA08 00000000 */ nop -/* 07E60C 8007DA0C 1000000C */ b .L8007DA40 -/* 07E610 8007DA10 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E614 8007DA14 C46A0004 */ lwc1 $f10, 4($v1) -.L8007DA18: -/* 07E618 8007DA18 3C01800F */ lui $at, %hi(D_800EEF38) -/* 07E61C 8007DA1C D430EF38 */ ldc1 $f16, %lo(D_800EEF38)($at) -/* 07E620 8007DA20 460054A1 */ cvt.d.s $f18, $f10 -/* 07E624 8007DA24 4630903E */ c.le.d $f18, $f16 -/* 07E628 8007DA28 00000000 */ nop -/* 07E62C 8007DA2C 45020004 */ bc1fl .L8007DA40 -/* 07E630 8007DA30 8FBF0014 */ lw $ra, 0x14($sp) -/* 07E634 8007DA34 0C01C90A */ jal func_80072428 -/* 07E638 8007DA38 00000000 */ nop -.L8007DA3C: -/* 07E63C 8007DA3C 8FBF0014 */ lw $ra, 0x14($sp) -.L8007DA40: -/* 07E640 8007DA40 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07E644 8007DA44 03E00008 */ jr $ra -/* 07E648 8007DA48 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007DDC0.s b/asm/non_matchings/code_80071F00/func_8007DDC0.s deleted file mode 100644 index b111c2605..000000000 --- a/asm/non_matchings/code_80071F00/func_8007DDC0.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_8007DDC0 -/* 07E9C0 8007DDC0 000478C0 */ sll $t7, $a0, 3 -/* 07E9C4 8007DDC4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 07E9C8 8007DDC8 01E47823 */ subu $t7, $t7, $a0 -/* 07E9CC 8007DDCC 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07E9D0 8007DDD0 AFB00018 */ sw $s0, 0x18($sp) -/* 07E9D4 8007DDD4 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07E9D8 8007DDD8 000F7940 */ sll $t7, $t7, 5 -/* 07E9DC 8007DDDC 01F88021 */ addu $s0, $t7, $t8 -/* 07E9E0 8007DDE0 8E02004C */ lw $v0, 0x4c($s0) -/* 07E9E4 8007DDE4 AFBF001C */ sw $ra, 0x1c($sp) -/* 07E9E8 8007DDE8 AFA40030 */ sw $a0, 0x30($sp) -/* 07E9EC 8007DDEC 18400005 */ blez $v0, .L8007DE04 -/* 07E9F0 8007DDF0 2459FFFF */ addiu $t9, $v0, -1 -/* 07E9F4 8007DDF4 17200003 */ bnez $t9, .L8007DE04 -/* 07E9F8 8007DDF8 AE19004C */ sw $t9, 0x4c($s0) -/* 07E9FC 8007DDFC 0C01C8B3 */ jal func_800722CC -/* 07EA00 8007DE00 24050001 */ li $a1, 1 -.L8007DE04: -/* 07EA04 8007DE04 8E020048 */ lw $v0, 0x48($s0) -/* 07EA08 8007DE08 18400007 */ blez $v0, .L8007DE28 -/* 07EA0C 8007DE0C 2449FFFF */ addiu $t1, $v0, -1 -/* 07EA10 8007DE10 15200005 */ bnez $t1, .L8007DE28 -/* 07EA14 8007DE14 AE090048 */ sw $t1, 0x48($s0) -/* 07EA18 8007DE18 3C055102 */ lui $a1, (0x51028006 >> 16) # lui $a1, 0x5102 -/* 07EA1C 8007DE1C 34A58006 */ ori $a1, (0x51028006 & 0xFFFF) # ori $a1, $a1, 0x8006 -/* 07EA20 8007DE20 0C0327BD */ jal func_800C9EF4 -/* 07EA24 8007DE24 26040004 */ addiu $a0, $s0, 4 -.L8007DE28: -/* 07EA28 8007DE28 8E0B004C */ lw $t3, 0x4c($s0) -/* 07EA2C 8007DE2C 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e -/* 07EA30 8007DE30 55600031 */ bnel $t3, $zero, .L8007DEF8 -/* 07EA34 8007DE34 2404000F */ li $a0, 15 -/* 07EA38 8007DE38 8C42C548 */ lw $v0, %lo(gCCSelection)($v0) -/* 07EA3C 8007DE3C 24010001 */ li $at, 1 -/* 07EA40 8007DE40 10400006 */ beqz $v0, .L8007DE5C -/* 07EA44 8007DE44 00000000 */ nop -/* 07EA48 8007DE48 10410004 */ beq $v0, $at, .L8007DE5C -/* 07EA4C 8007DE4C 24010002 */ li $at, 2 -/* 07EA50 8007DE50 10410002 */ beq $v0, $at, .L8007DE5C -/* 07EA54 8007DE54 24010003 */ li $at, 3 -/* 07EA58 8007DE58 14410003 */ bne $v0, $at, .L8007DE68 -.L8007DE5C: -/* 07EA5C 8007DE5C 3C01800F */ lui $at, %hi(D_800EEF40) # $at, 0x800f -/* 07EA60 8007DE60 C424EF40 */ lwc1 $f4, %lo(D_800EEF40)($at) -/* 07EA64 8007DE64 E7A4002C */ swc1 $f4, 0x2c($sp) -.L8007DE68: -/* 07EA68 8007DE68 8FA40030 */ lw $a0, 0x30($sp) -/* 07EA6C 8007DE6C 0C0229B7 */ jal func_8008A6DC -/* 07EA70 8007DE70 8FA5002C */ lw $a1, 0x2c($sp) -/* 07EA74 8007DE74 8FA40030 */ lw $a0, 0x30($sp) -/* 07EA78 8007DE78 0C01C88F */ jal func_8007223C -/* 07EA7C 8007DE7C 3C050004 */ lui $a1, 4 -/* 07EA80 8007DE80 1040001C */ beqz $v0, .L8007DEF4 -/* 07EA84 8007DE84 8FA40030 */ lw $a0, 0x30($sp) -/* 07EA88 8007DE88 0C01C8D5 */ jal func_80072354 -/* 07EA8C 8007DE8C 24050001 */ li $a1, 1 -/* 07EA90 8007DE90 10400018 */ beqz $v0, .L8007DEF4 -/* 07EA94 8007DE94 8FA40030 */ lw $a0, 0x30($sp) -/* 07EA98 8007DE98 260C0004 */ addiu $t4, $s0, 4 -/* 07EA9C 8007DE9C AFAC0020 */ sw $t4, 0x20($sp) -/* 07EAA0 8007DEA0 0C01C8A9 */ jal func_800722A4 -/* 07EAA4 8007DEA4 24050001 */ li $a1, 1 -/* 07EAA8 8007DEA8 3C065102 */ lui $a2, (0x51028006 >> 16) # lui $a2, 0x5102 -/* 07EAAC 8007DEAC 34C68006 */ ori $a2, (0x51028006 & 0xFFFF) # ori $a2, $a2, 0x8006 -/* 07EAB0 8007DEB0 8FA40020 */ lw $a0, 0x20($sp) -/* 07EAB4 8007DEB4 0C032760 */ jal func_800C9D80 -/* 07EAB8 8007DEB8 26050038 */ addiu $a1, $s0, 0x38 -/* 07EABC 8007DEBC 8FA40030 */ lw $a0, 0x30($sp) -/* 07EAC0 8007DEC0 0C01C9B3 */ jal func_800726CC -/* 07EAC4 8007DEC4 24050003 */ li $a1, 3 -/* 07EAC8 8007DEC8 860200A4 */ lh $v0, 0xa4($s0) -/* 07EACC 8007DECC 240F0168 */ li $t7, 360 -/* 07EAD0 8007DED0 2418012C */ li $t8, 300 -/* 07EAD4 8007DED4 18400005 */ blez $v0, .L8007DEEC -/* 07EAD8 8007DED8 244DFFFF */ addiu $t5, $v0, -1 -/* 07EADC 8007DEDC 240E0168 */ li $t6, 360 -/* 07EAE0 8007DEE0 A60D00A4 */ sh $t5, 0xa4($s0) -/* 07EAE4 8007DEE4 10000002 */ b .L8007DEF0 -/* 07EAE8 8007DEE8 AE0E004C */ sw $t6, 0x4c($s0) -.L8007DEEC: -/* 07EAEC 8007DEEC AE0F004C */ sw $t7, 0x4c($s0) -.L8007DEF0: -/* 07EAF0 8007DEF0 AE180048 */ sw $t8, 0x48($s0) -.L8007DEF4: -/* 07EAF4 8007DEF4 2404000F */ li $a0, 15 -.L8007DEF8: -/* 07EAF8 8007DEF8 0C022A2C */ jal func_8008A8B0 -/* 07EAFC 8007DEFC 24050012 */ li $a1, 18 -/* 07EB00 8007DF00 14400002 */ bnez $v0, .L8007DF0C -/* 07EB04 8007DF04 24190002 */ li $t9, 2 -/* 07EB08 8007DF08 A61900A4 */ sh $t9, 0xa4($s0) -.L8007DF0C: -/* 07EB0C 8007DF0C 8FBF001C */ lw $ra, 0x1c($sp) -/* 07EB10 8007DF10 8FB00018 */ lw $s0, 0x18($sp) -/* 07EB14 8007DF14 27BD0030 */ addiu $sp, $sp, 0x30 -/* 07EB18 8007DF18 03E00008 */ jr $ra -/* 07EB1C 8007DF1C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007DF20.s b/asm/non_matchings/code_80071F00/func_8007DF20.s index 02bde3146..f4d081937 100644 --- a/asm/non_matchings/code_80071F00/func_8007DF20.s +++ b/asm/non_matchings/code_80071F00/func_8007DF20.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EEF44 +.float 1765.0 + +glabel D_800EEF48 +.float -1765.0 + +.section .text + glabel func_8007DF20 /* 07EB20 8007DF20 000470C0 */ sll $t6, $a0, 3 /* 07EB24 8007DF24 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007E00C.s b/asm/non_matchings/code_80071F00/func_8007E00C.s index 12ea16c7e..e22ebb512 100644 --- a/asm/non_matchings/code_80071F00/func_8007E00C.s +++ b/asm/non_matchings/code_80071F00/func_8007E00C.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEF4C +.word L8007E198, L8007E058, L8007E198, L8007E068 +.word L8007E084, L8007E154, L8007E180 + +.section .text + glabel func_8007E00C /* 07EC0C 8007E00C 000470C0 */ sll $t6, $a0, 3 /* 07EC10 8007E010 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/non_matchings/code_80071F00/func_8007E358.s b/asm/non_matchings/code_80071F00/func_8007E358.s deleted file mode 100644 index c3ecea7f3..000000000 --- a/asm/non_matchings/code_80071F00/func_8007E358.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8007E358 -/* 07EF58 8007E358 3C01800F */ lui $at, %hi(D_800EEF68) # $at, 0x800f -/* 07EF5C 8007E35C C424EF68 */ lwc1 $f4, %lo(D_800EEF68)($at) -/* 07EF60 8007E360 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07EF64 8007E364 C426D01C */ lwc1 $f6, %lo(D_8018D01C)($at) -/* 07EF68 8007E368 44800000 */ mtc1 $zero, $f0 -/* 07EF6C 8007E36C 000470C0 */ sll $t6, $a0, 3 -/* 07EF70 8007E370 46062202 */ mul.s $f8, $f4, $f6 -/* 07EF74 8007E374 01C47023 */ subu $t6, $t6, $a0 -/* 07EF78 8007E378 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07EF7C 8007E37C 3C0141F8 */ li $at, 0x41F80000 # 31.000000 -/* 07EF80 8007E380 44815000 */ mtc1 $at, $f10 -/* 07EF84 8007E384 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07EF88 8007E388 000E7140 */ sll $t6, $t6, 5 -/* 07EF8C 8007E38C 01CF1021 */ addu $v0, $t6, $t7 -/* 07EF90 8007E390 3C01C359 */ li $at, 0xC3590000 # -217.000000 -/* 07EF94 8007E394 44818000 */ mtc1 $at, $f16 -/* 07EF98 8007E398 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07EF9C 8007E39C AFBF0014 */ sw $ra, 0x14($sp) -/* 07EFA0 8007E3A0 44050000 */ mfc1 $a1, $f0 -/* 07EFA4 8007E3A4 44060000 */ mfc1 $a2, $f0 -/* 07EFA8 8007E3A8 44070000 */ mfc1 $a3, $f0 -/* 07EFAC 8007E3AC E4480004 */ swc1 $f8, 4($v0) -/* 07EFB0 8007E3B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 07EFB4 8007E3B4 AFA40020 */ sw $a0, 0x20($sp) -/* 07EFB8 8007E3B8 E44A0008 */ swc1 $f10, 8($v0) -/* 07EFBC 8007E3BC 0C022E3C */ jal func_8008B8F0 -/* 07EFC0 8007E3C0 E450000C */ swc1 $f16, 0xc($v0) -/* 07EFC4 8007E3C4 8FA2001C */ lw $v0, 0x1c($sp) -/* 07EFC8 8007E3C8 8FA40020 */ lw $a0, 0x20($sp) -/* 07EFCC 8007E3CC A44000A4 */ sh $zero, 0xa4($v0) -/* 07EFD0 8007E3D0 AC40004C */ sw $zero, 0x4c($v0) -/* 07EFD4 8007E3D4 0C01C922 */ jal func_80072488 -/* 07EFD8 8007E3D8 A4400092 */ sh $zero, 0x92($v0) -/* 07EFDC 8007E3DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 07EFE0 8007E3E0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07EFE4 8007E3E4 03E00008 */ jr $ra -/* 07EFE8 8007E3E8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007E3EC.s b/asm/non_matchings/code_80071F00/func_8007E3EC.s deleted file mode 100644 index 731c490db..000000000 --- a/asm/non_matchings/code_80071F00/func_8007E3EC.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_8007E3EC -/* 07EFEC 8007E3EC 000470C0 */ sll $t6, $a0, 3 -/* 07EFF0 8007E3F0 01C47023 */ subu $t6, $t6, $a0 -/* 07EFF4 8007E3F4 000E7140 */ sll $t6, $t6, 5 -/* 07EFF8 8007E3F8 3C0F8016 */ lui $t7, %hi(D_80165CBE) # 0x8016 -/* 07EFFC 8007E3FC 01EE7821 */ addu $t7, $t7, $t6 -/* 07F000 8007E400 95EF5CBE */ lhu $t7, %lo(D_80165CBE)($t7) # 0x5cbe($t7) -/* 07F004 8007E404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 07F008 8007E408 AFBF0014 */ sw $ra, 0x14($sp) -/* 07F00C 8007E40C 2DE10006 */ sltiu $at, $t7, 6 -/* 07F010 8007E410 10200028 */ beqz $at, .L8007E4B4 -/* 07F014 8007E414 000F7880 */ sll $t7, $t7, 2 -/* 07F018 8007E418 3C01800F */ lui $at, %hi(jpt_800EEF6C) -/* 07F01C 8007E41C 002F0821 */ addu $at, $at, $t7 -/* 07F020 8007E420 8C2FEF6C */ lw $t7, %lo(jpt_800EEF6C)($at) -/* 07F024 8007E424 01E00008 */ jr $t7 -/* 07F028 8007E428 00000000 */ nop -glabel L8007E42C -/* 07F02C 8007E42C 0C01F8D6 */ jal func_8007E358 -/* 07F030 8007E430 00000000 */ nop -/* 07F034 8007E434 10000020 */ b .L8007E4B8 -/* 07F038 8007E438 8FBF0014 */ lw $ra, 0x14($sp) -glabel L8007E43C -/* 07F03C 8007E43C 24180001 */ li $t8, 1 -/* 07F040 8007E440 3C018019 */ lui $at, %hi(D_8018CFE8) # $at, 0x8019 -/* 07F044 8007E444 0C01C922 */ jal func_80072488 -/* 07F048 8007E448 A438CFE8 */ sh $t8, %lo(D_8018CFE8)($at) -/* 07F04C 8007E44C 1000001A */ b .L8007E4B8 -/* 07F050 8007E450 8FBF0014 */ lw $ra, 0x14($sp) -glabel L8007E454 -/* 07F054 8007E454 0C01C9E3 */ jal func_8007278C -/* 07F058 8007E458 240500D2 */ li $a1, 210 -/* 07F05C 8007E45C 3C198016 */ lui $t9, %hi(D_80165598) # $t9, 0x8016 -/* 07F060 8007E460 8F395598 */ lw $t9, %lo(D_80165598)($t9) -/* 07F064 8007E464 3C08800E */ lui $t0, %hi(gCCSelection) # $t0, 0x800e -/* 07F068 8007E468 57200013 */ bnel $t9, $zero, .L8007E4B8 -/* 07F06C 8007E46C 8FBF0014 */ lw $ra, 0x14($sp) -/* 07F070 8007E470 8D08C548 */ lw $t0, %lo(gCCSelection)($t0) -/* 07F074 8007E474 29010002 */ slti $at, $t0, 2 -/* 07F078 8007E478 10200005 */ beqz $at, .L8007E490 -/* 07F07C 8007E47C 00000000 */ nop -/* 07F080 8007E480 0C01F5C5 */ jal func_8007D714 -/* 07F084 8007E484 24040002 */ li $a0, 2 -/* 07F088 8007E488 1000000B */ b .L8007E4B8 -/* 07F08C 8007E48C 8FBF0014 */ lw $ra, 0x14($sp) -.L8007E490: -/* 07F090 8007E490 0C01F5C5 */ jal func_8007D714 -/* 07F094 8007E494 24040002 */ li $a0, 2 -/* 07F098 8007E498 0C01F5C5 */ jal func_8007D714 -/* 07F09C 8007E49C 24040002 */ li $a0, 2 -/* 07F0A0 8007E4A0 10000005 */ b .L8007E4B8 -/* 07F0A4 8007E4A4 8FBF0014 */ lw $ra, 0x14($sp) -glabel L8007E4A8 -/* 07F0A8 8007E4A8 3C018019 */ lui $at, %hi(D_8018CFE8) # $at, 0x8019 -/* 07F0AC 8007E4AC 0C01C922 */ jal func_80072488 -/* 07F0B0 8007E4B0 A420CFE8 */ sh $zero, %lo(D_8018CFE8)($at) -.L8007E4B4: -glabel L8007E4B4 -/* 07F0B4 8007E4B4 8FBF0014 */ lw $ra, 0x14($sp) -.L8007E4B8: -/* 07F0B8 8007E4B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 07F0BC 8007E4BC 03E00008 */ jr $ra -/* 07F0C0 8007E4C0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007E63C.s b/asm/non_matchings/code_80071F00/func_8007E63C.s index 82e2aa3bb..09d9a81ff 100644 --- a/asm/non_matchings/code_80071F00/func_8007E63C.s +++ b/asm/non_matchings/code_80071F00/func_8007E63C.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel jpt_800EEF84 +.word L8007E8CC, L8007E8F4 +.word L8007E908, L8007E930, L8007E98C, L8007E9B4 +.word L8007EA44, L8007EA80, L8007EB88 + +glabel jpt_800EEFA8 +.word L8007E6E0 +.word L8007E748, L8007E82C, L8007E844, L8007E85C + +.section .text + glabel func_8007E63C /* 07F23C 8007E63C 000470C0 */ sll $t6, $a0, 3 /* 07F240 8007E640 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8007ED6C.s b/asm/non_matchings/code_80071F00/func_8007ED6C.s index b45b79837..5d572e8b1 100644 --- a/asm/non_matchings/code_80071F00/func_8007ED6C.s +++ b/asm/non_matchings/code_80071F00/func_8007ED6C.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EEFBC +.word L8007EE24, L8007EDBC, L8007EDCC, L8007EDE0 +.word L8007EDF4 + +.section .text + glabel func_8007ED6C /* 07F96C 8007ED6C 000470C0 */ sll $t6, $a0, 3 /* 07F970 8007ED70 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/non_matchings/code_80071F00/func_8007EFBC.s b/asm/non_matchings/code_80071F00/func_8007EFBC.s deleted file mode 100644 index 1f19e636d..000000000 --- a/asm/non_matchings/code_80071F00/func_8007EFBC.s +++ /dev/null @@ -1,194 +0,0 @@ -glabel func_8007EFBC -/* 07FBBC 8007EFBC 000470C0 */ sll $t6, $a0, 3 -/* 07FBC0 8007EFC0 01C47023 */ subu $t6, $t6, $a0 -/* 07FBC4 8007EFC4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07FBC8 8007EFC8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07FBCC 8007EFCC 000E7140 */ sll $t6, $t6, 5 -/* 07FBD0 8007EFD0 01CF1821 */ addu $v1, $t6, $t7 -/* 07FBD4 8007EFD4 947800AE */ lhu $t8, 0xae($v1) -/* 07FBD8 8007EFD8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07FBDC 8007EFDC AFB00018 */ sw $s0, 0x18($sp) -/* 07FBE0 8007EFE0 2F010012 */ sltiu $at, $t8, 0x12 -/* 07FBE4 8007EFE4 00808025 */ move $s0, $a0 -/* 07FBE8 8007EFE8 102000A0 */ beqz $at, .L8007F26C -/* 07FBEC 8007EFEC AFBF001C */ sw $ra, 0x1c($sp) -/* 07FBF0 8007EFF0 0018C080 */ sll $t8, $t8, 2 -/* 07FBF4 8007EFF4 3C01800F */ lui $at, %hi(jpt_800EEFD0) # 0x800f -/* 07FBF8 8007EFF8 00380821 */ addu $at, $at, $t8 -/* 07FBFC 8007EFFC 8C38EFD0 */ lw $t8, %lo(jpt_800EEFD0)($at) # -0x1030($at) -/* 07FC00 8007F000 03000008 */ jr $t8 -/* 07FC04 8007F004 00000000 */ nop -glabel L8007F008 -/* 07FC08 8007F008 02002025 */ move $a0, $s0 -/* 07FC0C 8007F00C 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FC10 8007F010 24060800 */ li $a2, 2048 -/* 07FC14 8007F014 34078000 */ li $a3, 32768 -/* 07FC18 8007F018 0C01CF86 */ jal func_80073E18 -/* 07FC1C 8007F01C AFA30024 */ sw $v1, 0x24($sp) -/* 07FC20 8007F020 10400092 */ beqz $v0, .L8007F26C -/* 07FC24 8007F024 8FA30024 */ lw $v1, 0x24($sp) -/* 07FC28 8007F028 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07FC2C 8007F02C C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 07FC30 8007F030 3C014069 */ li $at, 0x40690000 # 3.640625 -/* 07FC34 8007F034 44814800 */ mtc1 $at, $f9 -/* 07FC38 8007F038 44804000 */ mtc1 $zero, $f8 -/* 07FC3C 8007F03C 460021A1 */ cvt.d.s $f6, $f4 -/* 07FC40 8007F040 02002025 */ move $a0, $s0 -/* 07FC44 8007F044 46283282 */ mul.d $f10, $f6, $f8 -/* 07FC48 8007F048 46205420 */ cvt.s.d $f16, $f10 -/* 07FC4C 8007F04C 0C021BF5 */ jal func_80086FD4 -/* 07FC50 8007F050 E470001C */ swc1 $f16, 0x1c($v1) -/* 07FC54 8007F054 10000086 */ b .L8007F270 -/* 07FC58 8007F058 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F05C -/* 07FC5C 8007F05C 24640028 */ addiu $a0, $v1, 0x28 -/* 07FC60 8007F060 8C65001C */ lw $a1, 0x1c($v1) -/* 07FC64 8007F064 0C0104EE */ jal f32_step_towards -/* 07FC68 8007F068 3C064080 */ lui $a2, 0x4080 -/* 07FC6C 8007F06C 50400080 */ beql $v0, $zero, .L8007F270 -/* 07FC70 8007F070 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FC74 8007F074 0C021BF5 */ jal func_80086FD4 -/* 07FC78 8007F078 02002025 */ move $a0, $s0 -/* 07FC7C 8007F07C 1000007C */ b .L8007F270 -/* 07FC80 8007F080 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F084 -/* 07FC84 8007F084 02002025 */ move $a0, $s0 -/* 07FC88 8007F088 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FC8C 8007F08C 24060400 */ li $a2, 1024 -/* 07FC90 8007F090 0C01CF86 */ jal func_80073E18 -/* 07FC94 8007F094 34078000 */ li $a3, 32768 -/* 07FC98 8007F098 10400074 */ beqz $v0, .L8007F26C -/* 07FC9C 8007F09C 02002025 */ move $a0, $s0 -/* 07FCA0 8007F0A0 0C01C9B3 */ jal func_800726CC -/* 07FCA4 8007F0A4 24050003 */ li $a1, 3 -/* 07FCA8 8007F0A8 0C021BF5 */ jal func_80086FD4 -/* 07FCAC 8007F0AC 02002025 */ move $a0, $s0 -/* 07FCB0 8007F0B0 1000006F */ b .L8007F270 -/* 07FCB4 8007F0B4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F0B8 -/* 07FCB8 8007F0B8 02002025 */ move $a0, $s0 -/* 07FCBC 8007F0BC 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FCC0 8007F0C0 24060400 */ li $a2, 1024 -/* 07FCC4 8007F0C4 0C01CF86 */ jal func_80073E18 -/* 07FCC8 8007F0C8 3407C000 */ li $a3, 49152 -/* 07FCCC 8007F0CC 50400068 */ beql $v0, $zero, .L8007F270 -/* 07FCD0 8007F0D0 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FCD4 8007F0D4 0C021BF5 */ jal func_80086FD4 -/* 07FCD8 8007F0D8 02002025 */ move $a0, $s0 -/* 07FCDC 8007F0DC 10000064 */ b .L8007F270 -/* 07FCE0 8007F0E0 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F0E4 -/* 07FCE4 8007F0E4 24640030 */ addiu $a0, $v1, 0x30 -/* 07FCE8 8007F0E8 3C05C2C8 */ lui $a1, 0xc2c8 -/* 07FCEC 8007F0EC 0C0103CB */ jal f32_step_down_towards -/* 07FCF0 8007F0F0 3C064000 */ lui $a2, 0x4000 -/* 07FCF4 8007F0F4 5040005E */ beql $v0, $zero, .L8007F270 -/* 07FCF8 8007F0F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FCFC 8007F0FC 0C021BF5 */ jal func_80086FD4 -/* 07FD00 8007F100 02002025 */ move $a0, $s0 -/* 07FD04 8007F104 1000005A */ b .L8007F270 -/* 07FD08 8007F108 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F10C -/* 07FD0C 8007F10C 02002025 */ move $a0, $s0 -/* 07FD10 8007F110 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FD14 8007F114 24060400 */ li $a2, 1024 -/* 07FD18 8007F118 0C01CF86 */ jal func_80073E18 -/* 07FD1C 8007F11C 24074000 */ li $a3, 16384 -/* 07FD20 8007F120 50400053 */ beql $v0, $zero, .L8007F270 -/* 07FD24 8007F124 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FD28 8007F128 0C021BF5 */ jal func_80086FD4 -/* 07FD2C 8007F12C 02002025 */ move $a0, $s0 -/* 07FD30 8007F130 02002025 */ move $a0, $s0 -/* 07FD34 8007F134 0C01C9B3 */ jal func_800726CC -/* 07FD38 8007F138 24050003 */ li $a1, 3 -/* 07FD3C 8007F13C 1000004C */ b .L8007F270 -/* 07FD40 8007F140 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F144 -/* 07FD44 8007F144 02002025 */ move $a0, $s0 -/* 07FD48 8007F148 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FD4C 8007F14C 24060400 */ li $a2, 1024 -/* 07FD50 8007F150 0C01CF86 */ jal func_80073E18 -/* 07FD54 8007F154 3C070001 */ lui $a3, 1 -/* 07FD58 8007F158 50400045 */ beql $v0, $zero, .L8007F270 -/* 07FD5C 8007F15C 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FD60 8007F160 0C021BF5 */ jal func_80086FD4 -/* 07FD64 8007F164 02002025 */ move $a0, $s0 -/* 07FD68 8007F168 10000041 */ b .L8007F270 -/* 07FD6C 8007F16C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F170 -/* 07FD70 8007F170 24640028 */ addiu $a0, $v1, 0x28 -/* 07FD74 8007F174 24050000 */ li $a1, 0 -/* 07FD78 8007F178 0C0104EE */ jal f32_step_towards -/* 07FD7C 8007F17C 3C064080 */ lui $a2, 0x4080 -/* 07FD80 8007F180 5040003B */ beql $v0, $zero, .L8007F270 -/* 07FD84 8007F184 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FD88 8007F188 0C021BF5 */ jal func_80086FD4 -/* 07FD8C 8007F18C 02002025 */ move $a0, $s0 -/* 07FD90 8007F190 10000037 */ b .L8007F270 -/* 07FD94 8007F194 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F198 -/* 07FD98 8007F198 02002025 */ move $a0, $s0 -/* 07FD9C 8007F19C 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FDA0 8007F1A0 24060400 */ li $a2, 1024 -/* 07FDA4 8007F1A4 0C01CF86 */ jal func_80073E18 -/* 07FDA8 8007F1A8 3C070001 */ lui $a3, 1 -/* 07FDAC 8007F1AC 50400030 */ beql $v0, $zero, .L8007F270 -/* 07FDB0 8007F1B0 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FDB4 8007F1B4 0C021BF5 */ jal func_80086FD4 -/* 07FDB8 8007F1B8 02002025 */ move $a0, $s0 -/* 07FDBC 8007F1BC 02002025 */ move $a0, $s0 -/* 07FDC0 8007F1C0 0C01C9B3 */ jal func_800726CC -/* 07FDC4 8007F1C4 24050003 */ li $a1, 3 -/* 07FDC8 8007F1C8 10000029 */ b .L8007F270 -/* 07FDCC 8007F1CC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F1D0 -/* 07FDD0 8007F1D0 3C070001 */ lui $a3, (0x00014000 >> 16) # lui $a3, 1 -/* 07FDD4 8007F1D4 34E74000 */ ori $a3, (0x00014000 & 0xFFFF) # ori $a3, $a3, 0x4000 -/* 07FDD8 8007F1D8 02002025 */ move $a0, $s0 -/* 07FDDC 8007F1DC 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FDE0 8007F1E0 0C01CF86 */ jal func_80073E18 -/* 07FDE4 8007F1E4 24060400 */ li $a2, 1024 -/* 07FDE8 8007F1E8 50400021 */ beql $v0, $zero, .L8007F270 -/* 07FDEC 8007F1EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FDF0 8007F1F0 0C021BF5 */ jal func_80086FD4 -/* 07FDF4 8007F1F4 02002025 */ move $a0, $s0 -/* 07FDF8 8007F1F8 1000001D */ b .L8007F270 -/* 07FDFC 8007F1FC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F200 -/* 07FE00 8007F200 24640030 */ addiu $a0, $v1, 0x30 -/* 07FE04 8007F204 24050000 */ li $a1, 0 -/* 07FE08 8007F208 0C0103B8 */ jal f32_step_up_towards -/* 07FE0C 8007F20C 3C064000 */ lui $a2, 0x4000 -/* 07FE10 8007F210 50400017 */ beql $v0, $zero, .L8007F270 -/* 07FE14 8007F214 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FE18 8007F218 0C021BF5 */ jal func_80086FD4 -/* 07FE1C 8007F21C 02002025 */ move $a0, $s0 -/* 07FE20 8007F220 10000013 */ b .L8007F270 -/* 07FE24 8007F224 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F228 -/* 07FE28 8007F228 02002025 */ move $a0, $s0 -/* 07FE2C 8007F22C 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FE30 8007F230 24060400 */ li $a2, 1024 -/* 07FE34 8007F234 0C01CF86 */ jal func_80073E18 -/* 07FE38 8007F238 3407C000 */ li $a3, 49152 -/* 07FE3C 8007F23C 5040000C */ beql $v0, $zero, .L8007F270 -/* 07FE40 8007F240 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FE44 8007F244 0C021BF5 */ jal func_80086FD4 -/* 07FE48 8007F248 02002025 */ move $a0, $s0 -/* 07FE4C 8007F24C 02002025 */ move $a0, $s0 -/* 07FE50 8007F250 0C01C9B3 */ jal func_800726CC -/* 07FE54 8007F254 24050003 */ li $a1, 3 -/* 07FE58 8007F258 10000005 */ b .L8007F270 -/* 07FE5C 8007F25C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F260 -/* 07FE60 8007F260 02002025 */ move $a0, $s0 -/* 07FE64 8007F264 0C021C07 */ jal func_8008701C -/* 07FE68 8007F268 24050001 */ li $a1, 1 -.L8007F26C: -glabel L8007F26C -/* 07FE6C 8007F26C 8FBF001C */ lw $ra, 0x1c($sp) -.L8007F270: -/* 07FE70 8007F270 8FB00018 */ lw $s0, 0x18($sp) -/* 07FE74 8007F274 27BD0028 */ addiu $sp, $sp, 0x28 -/* 07FE78 8007F278 03E00008 */ jr $ra -/* 07FE7C 8007F27C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007F280.s b/asm/non_matchings/code_80071F00/func_8007F280.s deleted file mode 100644 index 200a05e07..000000000 --- a/asm/non_matchings/code_80071F00/func_8007F280.s +++ /dev/null @@ -1,194 +0,0 @@ -glabel func_8007F280 -/* 07FE80 8007F280 000470C0 */ sll $t6, $a0, 3 -/* 07FE84 8007F284 01C47023 */ subu $t6, $t6, $a0 -/* 07FE88 8007F288 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07FE8C 8007F28C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07FE90 8007F290 000E7140 */ sll $t6, $t6, 5 -/* 07FE94 8007F294 01CF1821 */ addu $v1, $t6, $t7 -/* 07FE98 8007F298 947800AE */ lhu $t8, 0xae($v1) -/* 07FE9C 8007F29C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07FEA0 8007F2A0 AFB00018 */ sw $s0, 0x18($sp) -/* 07FEA4 8007F2A4 2F010012 */ sltiu $at, $t8, 0x12 -/* 07FEA8 8007F2A8 00808025 */ move $s0, $a0 -/* 07FEAC 8007F2AC 102000A0 */ beqz $at, .L8007F530 -/* 07FEB0 8007F2B0 AFBF001C */ sw $ra, 0x1c($sp) -/* 07FEB4 8007F2B4 0018C080 */ sll $t8, $t8, 2 -/* 07FEB8 8007F2B8 3C01800F */ lui $at, %hi(jpt_800EF018) # 0x800f -/* 07FEBC 8007F2BC 00380821 */ addu $at, $at, $t8 -/* 07FEC0 8007F2C0 8C38F018 */ lw $t8, %lo(jpt_800EF018)($at) # -0xfe8($at) -/* 07FEC4 8007F2C4 03000008 */ jr $t8 -/* 07FEC8 8007F2C8 00000000 */ nop -glabel L8007F2CC -/* 07FECC 8007F2CC 02002025 */ move $a0, $s0 -/* 07FED0 8007F2D0 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FED4 8007F2D4 24060400 */ li $a2, 1024 -/* 07FED8 8007F2D8 3C070001 */ lui $a3, 1 -/* 07FEDC 8007F2DC 0C01CF86 */ jal func_80073E18 -/* 07FEE0 8007F2E0 AFA30024 */ sw $v1, 0x24($sp) -/* 07FEE4 8007F2E4 10400092 */ beqz $v0, .L8007F530 -/* 07FEE8 8007F2E8 8FA30024 */ lw $v1, 0x24($sp) -/* 07FEEC 8007F2EC 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 07FEF0 8007F2F0 C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 07FEF4 8007F2F4 3C01C069 */ li $at, 0xC0690000 # -3.640625 -/* 07FEF8 8007F2F8 44814800 */ mtc1 $at, $f9 -/* 07FEFC 8007F2FC 44804000 */ mtc1 $zero, $f8 -/* 07FF00 8007F300 460021A1 */ cvt.d.s $f6, $f4 -/* 07FF04 8007F304 02002025 */ move $a0, $s0 -/* 07FF08 8007F308 46283282 */ mul.d $f10, $f6, $f8 -/* 07FF0C 8007F30C 46205420 */ cvt.s.d $f16, $f10 -/* 07FF10 8007F310 0C021BF5 */ jal func_80086FD4 -/* 07FF14 8007F314 E470001C */ swc1 $f16, 0x1c($v1) -/* 07FF18 8007F318 10000086 */ b .L8007F534 -/* 07FF1C 8007F31C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F320 -/* 07FF20 8007F320 24640028 */ addiu $a0, $v1, 0x28 -/* 07FF24 8007F324 8C65001C */ lw $a1, 0x1c($v1) -/* 07FF28 8007F328 0C0104EE */ jal f32_step_towards -/* 07FF2C 8007F32C 3C064080 */ lui $a2, 0x4080 -/* 07FF30 8007F330 50400080 */ beql $v0, $zero, .L8007F534 -/* 07FF34 8007F334 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FF38 8007F338 0C021BF5 */ jal func_80086FD4 -/* 07FF3C 8007F33C 02002025 */ move $a0, $s0 -/* 07FF40 8007F340 1000007C */ b .L8007F534 -/* 07FF44 8007F344 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F348 -/* 07FF48 8007F348 02002025 */ move $a0, $s0 -/* 07FF4C 8007F34C 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FF50 8007F350 24060400 */ li $a2, 1024 -/* 07FF54 8007F354 0C01CF86 */ jal func_80073E18 -/* 07FF58 8007F358 3C070001 */ lui $a3, 1 -/* 07FF5C 8007F35C 10400074 */ beqz $v0, .L8007F530 -/* 07FF60 8007F360 02002025 */ move $a0, $s0 -/* 07FF64 8007F364 0C01C9B3 */ jal func_800726CC -/* 07FF68 8007F368 24050003 */ li $a1, 3 -/* 07FF6C 8007F36C 0C021BF5 */ jal func_80086FD4 -/* 07FF70 8007F370 02002025 */ move $a0, $s0 -/* 07FF74 8007F374 1000006F */ b .L8007F534 -/* 07FF78 8007F378 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F37C -/* 07FF7C 8007F37C 02002025 */ move $a0, $s0 -/* 07FF80 8007F380 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FF84 8007F384 24060400 */ li $a2, 1024 -/* 07FF88 8007F388 0C01CF86 */ jal func_80073E18 -/* 07FF8C 8007F38C 24074000 */ li $a3, 16384 -/* 07FF90 8007F390 50400068 */ beql $v0, $zero, .L8007F534 -/* 07FF94 8007F394 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FF98 8007F398 0C021BF5 */ jal func_80086FD4 -/* 07FF9C 8007F39C 02002025 */ move $a0, $s0 -/* 07FFA0 8007F3A0 10000064 */ b .L8007F534 -/* 07FFA4 8007F3A4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F3A8 -/* 07FFA8 8007F3A8 24640030 */ addiu $a0, $v1, 0x30 -/* 07FFAC 8007F3AC 3C0542C8 */ lui $a1, 0x42c8 -/* 07FFB0 8007F3B0 0C0103B8 */ jal f32_step_up_towards -/* 07FFB4 8007F3B4 3C064000 */ lui $a2, 0x4000 -/* 07FFB8 8007F3B8 5040005E */ beql $v0, $zero, .L8007F534 -/* 07FFBC 8007F3BC 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FFC0 8007F3C0 0C021BF5 */ jal func_80086FD4 -/* 07FFC4 8007F3C4 02002025 */ move $a0, $s0 -/* 07FFC8 8007F3C8 1000005A */ b .L8007F534 -/* 07FFCC 8007F3CC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F3D0 -/* 07FFD0 8007F3D0 02002025 */ move $a0, $s0 -/* 07FFD4 8007F3D4 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07FFD8 8007F3D8 24060400 */ li $a2, 1024 -/* 07FFDC 8007F3DC 0C01CF86 */ jal func_80073E18 -/* 07FFE0 8007F3E0 3407C000 */ li $a3, 49152 -/* 07FFE4 8007F3E4 50400053 */ beql $v0, $zero, .L8007F534 -/* 07FFE8 8007F3E8 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FFEC 8007F3EC 0C021BF5 */ jal func_80086FD4 -/* 07FFF0 8007F3F0 02002025 */ move $a0, $s0 -/* 07FFF4 8007F3F4 02002025 */ move $a0, $s0 -/* 07FFF8 8007F3F8 0C01C9B3 */ jal func_800726CC -/* 07FFFC 8007F3FC 24050003 */ li $a1, 3 -/* 080000 8007F400 1000004C */ b .L8007F534 -/* 080004 8007F404 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F408 -/* 080008 8007F408 02002025 */ move $a0, $s0 -/* 08000C 8007F40C 246500B4 */ addiu $a1, $v1, 0xb4 -/* 080010 8007F410 24060400 */ li $a2, 1024 -/* 080014 8007F414 0C01CF86 */ jal func_80073E18 -/* 080018 8007F418 34078000 */ li $a3, 32768 -/* 08001C 8007F41C 50400045 */ beql $v0, $zero, .L8007F534 -/* 080020 8007F420 8FBF001C */ lw $ra, 0x1c($sp) -/* 080024 8007F424 0C021BF5 */ jal func_80086FD4 -/* 080028 8007F428 02002025 */ move $a0, $s0 -/* 08002C 8007F42C 10000041 */ b .L8007F534 -/* 080030 8007F430 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F434 -/* 080034 8007F434 24640028 */ addiu $a0, $v1, 0x28 -/* 080038 8007F438 24050000 */ li $a1, 0 -/* 08003C 8007F43C 0C0104EE */ jal f32_step_towards -/* 080040 8007F440 3C064080 */ lui $a2, 0x4080 -/* 080044 8007F444 5040003B */ beql $v0, $zero, .L8007F534 -/* 080048 8007F448 8FBF001C */ lw $ra, 0x1c($sp) -/* 08004C 8007F44C 0C021BF5 */ jal func_80086FD4 -/* 080050 8007F450 02002025 */ move $a0, $s0 -/* 080054 8007F454 10000037 */ b .L8007F534 -/* 080058 8007F458 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F45C -/* 08005C 8007F45C 02002025 */ move $a0, $s0 -/* 080060 8007F460 246500B4 */ addiu $a1, $v1, 0xb4 -/* 080064 8007F464 24060400 */ li $a2, 1024 -/* 080068 8007F468 0C01CF86 */ jal func_80073E18 -/* 08006C 8007F46C 34078000 */ li $a3, 32768 -/* 080070 8007F470 50400030 */ beql $v0, $zero, .L8007F534 -/* 080074 8007F474 8FBF001C */ lw $ra, 0x1c($sp) -/* 080078 8007F478 0C021BF5 */ jal func_80086FD4 -/* 08007C 8007F47C 02002025 */ move $a0, $s0 -/* 080080 8007F480 02002025 */ move $a0, $s0 -/* 080084 8007F484 0C01C9B3 */ jal func_800726CC -/* 080088 8007F488 24050003 */ li $a1, 3 -/* 08008C 8007F48C 10000029 */ b .L8007F534 -/* 080090 8007F490 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F494 -/* 080094 8007F494 02002025 */ move $a0, $s0 -/* 080098 8007F498 246500B4 */ addiu $a1, $v1, 0xb4 -/* 08009C 8007F49C 24060400 */ li $a2, 1024 -/* 0800A0 8007F4A0 0C01CF86 */ jal func_80073E18 -/* 0800A4 8007F4A4 3407C000 */ li $a3, 49152 -/* 0800A8 8007F4A8 50400022 */ beql $v0, $zero, .L8007F534 -/* 0800AC 8007F4AC 8FBF001C */ lw $ra, 0x1c($sp) -/* 0800B0 8007F4B0 0C021BF5 */ jal func_80086FD4 -/* 0800B4 8007F4B4 02002025 */ move $a0, $s0 -/* 0800B8 8007F4B8 1000001E */ b .L8007F534 -/* 0800BC 8007F4BC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F4C0 -/* 0800C0 8007F4C0 24640030 */ addiu $a0, $v1, 0x30 -/* 0800C4 8007F4C4 24050000 */ li $a1, 0 -/* 0800C8 8007F4C8 0C0103CB */ jal f32_step_down_towards -/* 0800CC 8007F4CC 3C064000 */ lui $a2, 0x4000 -/* 0800D0 8007F4D0 50400018 */ beql $v0, $zero, .L8007F534 -/* 0800D4 8007F4D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0800D8 8007F4D8 0C021BF5 */ jal func_80086FD4 -/* 0800DC 8007F4DC 02002025 */ move $a0, $s0 -/* 0800E0 8007F4E0 10000014 */ b .L8007F534 -/* 0800E4 8007F4E4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F4E8 -/* 0800E8 8007F4E8 3C070001 */ lui $a3, (0x00014000 >> 16) # lui $a3, 1 -/* 0800EC 8007F4EC 34E74000 */ ori $a3, (0x00014000 & 0xFFFF) # ori $a3, $a3, 0x4000 -/* 0800F0 8007F4F0 02002025 */ move $a0, $s0 -/* 0800F4 8007F4F4 246500B4 */ addiu $a1, $v1, 0xb4 -/* 0800F8 8007F4F8 0C01CF86 */ jal func_80073E18 -/* 0800FC 8007F4FC 24060400 */ li $a2, 1024 -/* 080100 8007F500 5040000C */ beql $v0, $zero, .L8007F534 -/* 080104 8007F504 8FBF001C */ lw $ra, 0x1c($sp) -/* 080108 8007F508 0C021BF5 */ jal func_80086FD4 -/* 08010C 8007F50C 02002025 */ move $a0, $s0 -/* 080110 8007F510 02002025 */ move $a0, $s0 -/* 080114 8007F514 0C01C9B3 */ jal func_800726CC -/* 080118 8007F518 24050003 */ li $a1, 3 -/* 08011C 8007F51C 10000005 */ b .L8007F534 -/* 080120 8007F520 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8007F524 -/* 080124 8007F524 02002025 */ move $a0, $s0 -/* 080128 8007F528 0C021C07 */ jal func_8008701C -/* 08012C 8007F52C 24050001 */ li $a1, 1 -.L8007F530: -glabel L8007F530 -/* 080130 8007F530 8FBF001C */ lw $ra, 0x1c($sp) -.L8007F534: -/* 080134 8007F534 8FB00018 */ lw $s0, 0x18($sp) -/* 080138 8007F538 27BD0028 */ addiu $sp, $sp, 0x28 -/* 08013C 8007F53C 03E00008 */ jr $ra -/* 080140 8007F540 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007FB48.s b/asm/non_matchings/code_80071F00/func_8007FB48.s index 015d9741e..bee3312c2 100644 --- a/asm/non_matchings/code_80071F00/func_8007FB48.s +++ b/asm/non_matchings/code_80071F00/func_8007FB48.s @@ -1,3 +1,17 @@ +.section .late_rodata + +glabel jpt_800EF060 +.word L8007FE94, L8007FBBC, L8007FBE4 +.word L8007FE94, L8007FDE0, L8007FE4C + +glabel D_800EF078 +.double -1000.0 + +glabel D_800EF080 +.double 1000.0 + +.section .text + glabel func_8007FB48 /* 080748 8007FB48 000478C0 */ sll $t7, $a0, 3 /* 08074C 8007FB4C 01E47823 */ subu $t7, $t7, $a0 diff --git a/asm/non_matchings/code_80071F00/func_800801FC.s b/asm/non_matchings/code_80071F00/func_800801FC.s index 479afc526..66b08b94b 100644 --- a/asm/non_matchings/code_80071F00/func_800801FC.s +++ b/asm/non_matchings/code_80071F00/func_800801FC.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EF088 +.word L80080294, L80080248, L80080258, L8008026C +.word L80080280 + +.section .text + glabel func_800801FC /* 080DFC 800801FC 000470C0 */ sll $t6, $a0, 3 /* 080E00 80080200 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80080408.s b/asm/non_matchings/code_80071F00/func_80080408.s index f45ca0943..52cc8959b 100644 --- a/asm/non_matchings/code_80071F00/func_80080408.s +++ b/asm/non_matchings/code_80071F00/func_80080408.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EF09C +.word L80080500, L80080454, L80080464 +.word L800804AC, L800804E4 + +.section .text + glabel func_80080408 /* 081008 80080408 000470C0 */ sll $t6, $a0, 3 /* 08100C 8008040C 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80080B28.s b/asm/non_matchings/code_80071F00/func_80080B28.s index dda471faa..4e7ad253e 100644 --- a/asm/non_matchings/code_80071F00/func_80080B28.s +++ b/asm/non_matchings/code_80071F00/func_80080B28.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF0B0 +.double 17.5 + +.section .text + glabel func_80080B28 /* 081728 80080B28 000578C0 */ sll $t7, $a1, 3 /* 08172C 80080B2C 01E57823 */ subu $t7, $t7, $a1 diff --git a/asm/non_matchings/code_80071F00/func_80080E8C.s b/asm/non_matchings/code_80071F00/func_80080E8C.s index e0eb4ce76..d3fedb0a5 100644 --- a/asm/non_matchings/code_80071F00/func_80080E8C.s +++ b/asm/non_matchings/code_80071F00/func_80080E8C.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EF0B8 +.double 0.6 + +glabel D_800EF0C0 +.double 0.6 + +.section .text + glabel func_80080E8C /* 081A8C 80080E8C 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 081A90 80080E90 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_800810F4.s b/asm/non_matchings/code_80071F00/func_800810F4.s index 52cd3b973..aefc8152f 100644 --- a/asm/non_matchings/code_80071F00/func_800810F4.s +++ b/asm/non_matchings/code_80071F00/func_800810F4.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF0C8 +.float 0.025 + +.section .text + glabel func_800810F4 /* 081CF4 800810F4 000470C0 */ sll $t6, $a0, 3 /* 081CF8 800810F8 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80081210.s b/asm/non_matchings/code_80071F00/func_80081210.s index e2465dc35..c2ffd5f8d 100644 --- a/asm/non_matchings/code_80071F00/func_80081210.s +++ b/asm/non_matchings/code_80071F00/func_80081210.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EF0CC +.word L80081318, L80081328, L80081338, L80081348 +.word L80081368, L80081358 + +.section .text + glabel func_80081210 /* 081E10 80081210 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 081E14 80081214 3C028016 */ lui $v0, %hi(D_80165834) # $v0, 0x8016 diff --git a/asm/non_matchings/code_80071F00/func_8008153C.s b/asm/non_matchings/code_80071F00/func_8008153C.s index 2769531ad..26849f108 100644 --- a/asm/non_matchings/code_80071F00/func_8008153C.s +++ b/asm/non_matchings/code_80071F00/func_8008153C.s @@ -1,3 +1,22 @@ +.section .late_rodata + +glabel D_800EF0E4 +.float 0.15 + +glabel D_800EF0E8 +.double 0.8 + +glabel D_800EF0F0 +.double 0.01 + +glabel D_800EF0F8 +.double 4.8 + +glabel D_800EF100 +.double 0.1 + +.section .text + glabel func_8008153C /* 08213C 8008153C 27BDFF80 */ addiu $sp, $sp, -0x80 /* 082140 80081540 3C0E800E */ lui $t6, %hi(gPlayerCountSelection1) # $t6, 0x800e diff --git a/asm/non_matchings/code_80071F00/func_80081848.s b/asm/non_matchings/code_80071F00/func_80081848.s index ed96a8a49..e4251420b 100644 --- a/asm/non_matchings/code_80071F00/func_80081848.s +++ b/asm/non_matchings/code_80071F00/func_80081848.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF108 +.float 0.15 + +.section .text + glabel func_80081848 /* 082448 80081848 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 08244C 8008184C AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_80081924.s b/asm/non_matchings/code_80071F00/func_80081924.s deleted file mode 100644 index 4e75d2471..000000000 --- a/asm/non_matchings/code_80071F00/func_80081924.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80081924 -/* 082524 80081924 000470C0 */ sll $t6, $a0, 3 -/* 082528 80081928 01C47023 */ subu $t6, $t6, $a0 -/* 08252C 8008192C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 082530 80081930 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 082534 80081934 000E7140 */ sll $t6, $t6, 5 -/* 082538 80081938 01CF1021 */ addu $v0, $t6, $t7 -/* 08253C 8008193C 945800AE */ lhu $t8, 0xae($v0) -/* 082540 80081940 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 082544 80081944 AFB00018 */ sw $s0, 0x18($sp) -/* 082548 80081948 2F01000B */ sltiu $at, $t8, 0xb -/* 08254C 8008194C 00808025 */ move $s0, $a0 -/* 082550 80081950 10200048 */ beqz $at, .L80081A74 -/* 082554 80081954 AFBF001C */ sw $ra, 0x1c($sp) -/* 082558 80081958 0018C080 */ sll $t8, $t8, 2 -/* 08255C 8008195C 3C01800F */ lui $at, %hi(jpt_800EF10C) -/* 082560 80081960 00380821 */ addu $at, $at, $t8 -/* 082564 80081964 8C38F10C */ lw $t8, %lo(jpt_800EF10C)($at) -/* 082568 80081968 03000008 */ jr $t8 -/* 08256C 8008196C 00000000 */ nop -glabel L80081970 -/* 082570 80081970 3C063F33 */ lui $a2, (0x3F333333 >> 16) # lui $a2, 0x3f33 -/* 082574 80081974 34C63333 */ ori $a2, (0x3F333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 082578 80081978 2444002C */ addiu $a0, $v0, 0x2c -/* 08257C 8008197C 0C0103B8 */ jal f32_step_up_towards -/* 082580 80081980 3C054110 */ lui $a1, 0x4110 -/* 082584 80081984 5040003C */ beql $v0, $zero, .L80081A78 -/* 082588 80081988 8FBF001C */ lw $ra, 0x1c($sp) -/* 08258C 8008198C 0C021BF5 */ jal func_80086FD4 -/* 082590 80081990 02002025 */ move $a0, $s0 -/* 082594 80081994 10000038 */ b .L80081A78 -/* 082598 80081998 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8008199C -/* 08259C 8008199C 02002025 */ move $a0, $s0 -/* 0825A0 800819A0 0C021C6B */ jal func_800871AC -/* 0825A4 800819A4 2405000A */ li $a1, 10 -/* 0825A8 800819A8 10000033 */ b .L80081A78 -/* 0825AC 800819AC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800819B0 -/* 0825B0 800819B0 2444002C */ addiu $a0, $v0, 0x2c -/* 0825B4 800819B4 3C054040 */ lui $a1, 0x4040 -/* 0825B8 800819B8 0C0103CB */ jal f32_step_down_towards -/* 0825BC 800819BC 3C063F80 */ lui $a2, 0x3f80 -/* 0825C0 800819C0 5040002D */ beql $v0, $zero, .L80081A78 -/* 0825C4 800819C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0825C8 800819C8 0C021BD8 */ jal func_80086F60 -/* 0825CC 800819CC 02002025 */ move $a0, $s0 -/* 0825D0 800819D0 10000029 */ b .L80081A78 -/* 0825D4 800819D4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800819D8 -/* 0825D8 800819D8 3C054066 */ lui $a1, (0x40666666 >> 16) # lui $a1, 0x4066 -/* 0825DC 800819DC 34A56666 */ ori $a1, (0x40666666 & 0xFFFF) # ori $a1, $a1, 0x6666 -/* 0825E0 800819E0 02002025 */ move $a0, $s0 -/* 0825E4 800819E4 3C063E80 */ lui $a2, 0x3e80 -/* 0825E8 800819E8 0C021F49 */ jal func_80087D24 -/* 0825EC 800819EC 24070000 */ li $a3, 0 -/* 0825F0 800819F0 10000021 */ b .L80081A78 -/* 0825F4 800819F4 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800819F8 -/* 0825F8 800819F8 0C021BD8 */ jal func_80086F60 -/* 0825FC 800819FC 02002025 */ move $a0, $s0 -/* 082600 80081A00 1000001D */ b .L80081A78 -/* 082604 80081A04 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80081A08 -/* 082608 80081A08 945900B6 */ lhu $t9, 0xb6($v0) -/* 08260C 80081A0C C444003C */ lwc1 $f4, 0x3c($v0) -/* 082610 80081A10 3C01800F */ lui $at, %hi(D_800EF138) -/* 082614 80081A14 27281000 */ addiu $t0, $t9, 0x1000 -/* 082618 80081A18 A44800B6 */ sh $t0, 0xb6($v0) -/* 08261C 80081A1C D428F138 */ ldc1 $f8, %lo(D_800EF138)($at) -/* 082620 80081A20 460021A1 */ cvt.d.s $f6, $f4 -/* 082624 80081A24 02002025 */ move $a0, $s0 -/* 082628 80081A28 46283281 */ sub.d $f10, $f6, $f8 -/* 08262C 80081A2C AFA20024 */ sw $v0, 0x24($sp) -/* 082630 80081A30 46205420 */ cvt.s.d $f16, $f10 -/* 082634 80081A34 0C021D47 */ jal func_8008751C -/* 082638 80081A38 E450003C */ swc1 $f16, 0x3c($v0) -/* 08263C 80081A3C 0C021DC4 */ jal func_80087710 -/* 082640 80081A40 02002025 */ move $a0, $s0 -/* 082644 80081A44 8FA20024 */ lw $v0, 0x24($sp) -/* 082648 80081A48 3C01C024 */ li $at, 0xC0240000 # -2.562500 -/* 08264C 80081A4C 44819800 */ mtc1 $at, $f19 -/* 082650 80081A50 C4440008 */ lwc1 $f4, 8($v0) -/* 082654 80081A54 44809000 */ mtc1 $zero, $f18 -/* 082658 80081A58 460021A1 */ cvt.d.s $f6, $f4 -/* 08265C 80081A5C 4632303E */ c.le.d $f6, $f18 -/* 082660 80081A60 00000000 */ nop -/* 082664 80081A64 45020004 */ bc1fl .L80081A78 -/* 082668 80081A68 8FBF001C */ lw $ra, 0x1c($sp) -/* 08266C 80081A6C 0C021BD8 */ jal func_80086F60 -/* 082670 80081A70 02002025 */ move $a0, $s0 -.L80081A74: -glabel L80081A74 -/* 082674 80081A74 8FBF001C */ lw $ra, 0x1c($sp) -.L80081A78: -/* 082678 80081A78 8FB00018 */ lw $s0, 0x18($sp) -/* 08267C 80081A7C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 082680 80081A80 03E00008 */ jr $ra -/* 082684 80081A84 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80081AFC.s b/asm/non_matchings/code_80071F00/func_80081AFC.s index deb7b00ce..d8cc0e5ef 100644 --- a/asm/non_matchings/code_80071F00/func_80081AFC.s +++ b/asm/non_matchings/code_80071F00/func_80081AFC.s @@ -1,3 +1,12 @@ +.section .late_rodata + +glabel jpt_800EF140 +.word L80081D0C, L80081B70, L80081B80, L80081BC4 +.word L80081C0C, L80081D0C, L80081D0C, L80081D0C +.word L80081D0C, L80081D0C, L80081C44 + +.section .text + glabel func_80081AFC /* 0826FC 80081AFC 000470C0 */ sll $t6, $a0, 3 /* 082700 80081B00 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/non_matchings/code_80071F00/func_8008241C.s b/asm/non_matchings/code_80071F00/func_8008241C.s index 45311e1e7..2c9166b7b 100644 --- a/asm/non_matchings/code_80071F00/func_8008241C.s +++ b/asm/non_matchings/code_80071F00/func_8008241C.s @@ -1,3 +1,28 @@ +.section .late_rodata + +glabel D_800EF16C +.float 0.2 + +glabel D_800EF170 +.double -360.0 + +glabel D_800EF178 +.double -1300.0 + +glabel D_800EF180 +.double 328.0 + +glabel D_800EF188 +.double 2541.0 + +glabel D_800EF190 +.double -985.0 + +glabel D_800EF198 +.double 1200.0 + +.section .text + glabel func_8008241C /* 08301C 8008241C 000470C0 */ sll $t6, $a0, 3 /* 083020 80082420 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/non_matchings/code_80071F00/func_80082A4C.s b/asm/non_matchings/code_80071F00/func_80082A4C.s index c40926fb2..6b70cc00c 100644 --- a/asm/non_matchings/code_80071F00/func_80082A4C.s +++ b/asm/non_matchings/code_80071F00/func_80082A4C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF1A0 +.float 0.15 + +.section .text + glabel func_80082A4C /* 08364C 80082A4C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 083650 80082A50 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_80082C30.s b/asm/non_matchings/code_80071F00/func_80082C30.s deleted file mode 100644 index 88bdf9a8d..000000000 --- a/asm/non_matchings/code_80071F00/func_80082C30.s +++ /dev/null @@ -1,130 +0,0 @@ -glabel func_80082C30 -/* 083830 80082C30 000470C0 */ sll $t6, $a0, 3 -/* 083834 80082C34 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 083838 80082C38 01C47023 */ subu $t6, $t6, $a0 -/* 08383C 80082C3C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 083840 80082C40 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 083844 80082C44 000E7140 */ sll $t6, $t6, 5 -/* 083848 80082C48 01CFC021 */ addu $t8, $t6, $t7 -/* 08384C 80082C4C AFBF0024 */ sw $ra, 0x24($sp) -/* 083850 80082C50 AFB00020 */ sw $s0, 0x20($sp) -/* 083854 80082C54 AFB8002C */ sw $t8, 0x2c($sp) -/* 083858 80082C58 871900AE */ lh $t9, 0xae($t8) -/* 08385C 80082C5C 00808025 */ move $s0, $a0 -/* 083860 80082C60 2728FFFF */ addiu $t0, $t9, -1 -/* 083864 80082C64 2D010005 */ sltiu $at, $t0, 5 -/* 083868 80082C68 10200054 */ beqz $at, .L80082DBC -/* 08386C 80082C6C 00084080 */ sll $t0, $t0, 2 -/* 083870 80082C70 3C01800F */ lui $at, %hi(jpt_800EF1A4) -/* 083874 80082C74 00280821 */ addu $at, $at, $t0 -/* 083878 80082C78 8C28F1A4 */ lw $t0, %lo(jpt_800EF1A4)($at) -/* 08387C 80082C7C 01000008 */ jr $t0 -/* 083880 80082C80 00000000 */ nop -glabel L80082C84 -/* 083884 80082C84 8FA9002C */ lw $t1, 0x2c($sp) -/* 083888 80082C88 02002025 */ move $a0, $s0 -/* 08388C 80082C8C C5240010 */ lwc1 $f4, 0x10($t1) -/* 083890 80082C90 C528001C */ lwc1 $f8, 0x1c($t1) -/* 083894 80082C94 C5300018 */ lwc1 $f16, 0x18($t1) -/* 083898 80082C98 4600218D */ trunc.w.s $f6, $f4 -/* 08389C 80082C9C C5240024 */ lwc1 $f4, 0x24($t1) -/* 0838A0 80082CA0 4600428D */ trunc.w.s $f10, $f8 -/* 0838A4 80082CA4 44053000 */ mfc1 $a1, $f6 -/* 0838A8 80082CA8 4600848D */ trunc.w.s $f18, $f16 -/* 0838AC 80082CAC 44065000 */ mfc1 $a2, $f10 -/* 0838B0 80082CB0 00055C00 */ sll $t3, $a1, 0x10 -/* 0838B4 80082CB4 4600218D */ trunc.w.s $f6, $f4 -/* 0838B8 80082CB8 44079000 */ mfc1 $a3, $f18 -/* 0838BC 80082CBC 000B2C03 */ sra $a1, $t3, 0x10 -/* 0838C0 80082CC0 00067400 */ sll $t6, $a2, 0x10 -/* 0838C4 80082CC4 440B3000 */ mfc1 $t3, $f6 -/* 0838C8 80082CC8 0007CC00 */ sll $t9, $a3, 0x10 -/* 0838CC 80082CCC 00193C03 */ sra $a3, $t9, 0x10 -/* 0838D0 80082CD0 000E3403 */ sra $a2, $t6, 0x10 -/* 0838D4 80082CD4 0C021E83 */ jal func_80087A0C -/* 0838D8 80082CD8 AFAB0010 */ sw $t3, 0x10($sp) -/* 0838DC 80082CDC 10400037 */ beqz $v0, .L80082DBC -/* 0838E0 80082CE0 02002025 */ move $a0, $s0 -/* 0838E4 80082CE4 0C01C9B3 */ jal func_800726CC -/* 0838E8 80082CE8 24050003 */ li $a1, 3 -/* 0838EC 80082CEC 0C021BF5 */ jal func_80086FD4 -/* 0838F0 80082CF0 02002025 */ move $a0, $s0 -/* 0838F4 80082CF4 10000031 */ b .L80082DBC -/* 0838F8 80082CF8 00000000 */ nop -glabel L80082CFC -/* 0838FC 80082CFC 02002025 */ move $a0, $s0 -/* 083900 80082D00 0C021C41 */ jal func_80087104 -/* 083904 80082D04 2405003C */ li $a1, 60 -/* 083908 80082D08 1040002C */ beqz $v0, .L80082DBC -/* 08390C 80082D0C 3C01800F */ lui $at, %hi(D_800EF1B8) # $at, 0x800f -/* 083910 80082D10 C428F1B8 */ lwc1 $f8, %lo(D_800EF1B8)($at) -/* 083914 80082D14 8FAC002C */ lw $t4, 0x2c($sp) -/* 083918 80082D18 02002025 */ move $a0, $s0 -/* 08391C 80082D1C 24050002 */ li $a1, 2 -/* 083920 80082D20 0C01C9B3 */ jal func_800726CC -/* 083924 80082D24 E5880034 */ swc1 $f8, 0x34($t4) -/* 083928 80082D28 0C021BF5 */ jal func_80086FD4 -/* 08392C 80082D2C 02002025 */ move $a0, $s0 -/* 083930 80082D30 10000022 */ b .L80082DBC -/* 083934 80082D34 00000000 */ nop -glabel L80082D38 -/* 083938 80082D38 02002025 */ move $a0, $s0 -/* 08393C 80082D3C 0C021E55 */ jal func_80087954 -/* 083940 80082D40 2405003C */ li $a1, 60 -/* 083944 80082D44 1040001D */ beqz $v0, .L80082DBC -/* 083948 80082D48 00000000 */ nop -/* 08394C 80082D4C 0C021BF5 */ jal func_80086FD4 -/* 083950 80082D50 02002025 */ move $a0, $s0 -/* 083954 80082D54 02002025 */ move $a0, $s0 -/* 083958 80082D58 0C01C9B3 */ jal func_800726CC -/* 08395C 80082D5C 24050003 */ li $a1, 3 -/* 083960 80082D60 10000016 */ b .L80082DBC -/* 083964 80082D64 00000000 */ nop -glabel L80082D68 -/* 083968 80082D68 02002025 */ move $a0, $s0 -/* 08396C 80082D6C 0C021C41 */ jal func_80087104 -/* 083970 80082D70 2405003C */ li $a1, 60 -/* 083974 80082D74 10400011 */ beqz $v0, .L80082DBC -/* 083978 80082D78 02002025 */ move $a0, $s0 -/* 08397C 80082D7C 0C01C9B3 */ jal func_800726CC -/* 083980 80082D80 24050002 */ li $a1, 2 -/* 083984 80082D84 0C021BF5 */ jal func_80086FD4 -/* 083988 80082D88 02002025 */ move $a0, $s0 -/* 08398C 80082D8C 1000000B */ b .L80082DBC -/* 083990 80082D90 00000000 */ nop -glabel L80082D94 -/* 083994 80082D94 02002025 */ move $a0, $s0 -/* 083998 80082D98 0C021E27 */ jal func_8008789C -/* 08399C 80082D9C 2405003C */ li $a1, 60 -/* 0839A0 80082DA0 10400006 */ beqz $v0, .L80082DBC -/* 0839A4 80082DA4 02002025 */ move $a0, $s0 -/* 0839A8 80082DA8 0C01C9B3 */ jal func_800726CC -/* 0839AC 80082DAC 24050003 */ li $a1, 3 -/* 0839B0 80082DB0 02002025 */ move $a0, $s0 -/* 0839B4 80082DB4 0C021C07 */ jal func_8008701C -/* 0839B8 80082DB8 24050002 */ li $a1, 2 -.L80082DBC: -/* 0839BC 80082DBC 0C022FC6 */ jal func_8008BF18 -/* 0839C0 80082DC0 02002025 */ move $a0, $s0 -/* 0839C4 80082DC4 02002025 */ move $a0, $s0 -/* 0839C8 80082DC8 0C01C88F */ jal func_8007223C -/* 0839CC 80082DCC 3C050004 */ lui $a1, 4 -/* 0839D0 80082DD0 5040000D */ beql $v0, $zero, .L80082E08 -/* 0839D4 80082DD4 8FBF0024 */ lw $ra, 0x24($sp) -/* 0839D8 80082DD8 0C02214E */ jal func_80088538 -/* 0839DC 80082DDC 02002025 */ move $a0, $s0 -/* 0839E0 80082DE0 8FAD002C */ lw $t5, 0x2c($sp) -/* 0839E4 80082DE4 3C014004 */ li $at, 0x40040000 # 2.062500 -/* 0839E8 80082DE8 44819800 */ mtc1 $at, $f19 -/* 0839EC 80082DEC C5AA0044 */ lwc1 $f10, 0x44($t5) -/* 0839F0 80082DF0 44809000 */ mtc1 $zero, $f18 -/* 0839F4 80082DF4 46005421 */ cvt.d.s $f16, $f10 -/* 0839F8 80082DF8 46328100 */ add.d $f4, $f16, $f18 -/* 0839FC 80082DFC 462021A0 */ cvt.s.d $f6, $f4 -/* 083A00 80082E00 E5A60008 */ swc1 $f6, 8($t5) -/* 083A04 80082E04 8FBF0024 */ lw $ra, 0x24($sp) -.L80082E08: -/* 083A08 80082E08 8FB00020 */ lw $s0, 0x20($sp) -/* 083A0C 80082E0C 27BD0030 */ addiu $sp, $sp, 0x30 -/* 083A10 80082E10 03E00008 */ jr $ra -/* 083A14 80082E14 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80082F1C.s b/asm/non_matchings/code_80071F00/func_80082F1C.s index a89be63fb..e50a0e187 100644 --- a/asm/non_matchings/code_80071F00/func_80082F1C.s +++ b/asm/non_matchings/code_80071F00/func_80082F1C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF1BC +.float 0.027 + +.section .text + glabel func_80082F1C /* 083B1C 80082F1C 000470C0 */ sll $t6, $a0, 3 /* 083B20 80082F20 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_8008311C.s b/asm/non_matchings/code_80071F00/func_8008311C.s index 1ed41d901..30e7c873b 100644 --- a/asm/non_matchings/code_80071F00/func_8008311C.s +++ b/asm/non_matchings/code_80071F00/func_8008311C.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel D_800EF1C0 +.float 0.2 +.word 0x00000000 + +glabel D_800EF1C8 +.double 0.1 + +.section .text + glabel func_8008311C /* 083D1C 8008311C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 083D20 80083120 AFA5002C */ sw $a1, 0x2c($sp) diff --git a/asm/non_matchings/code_80071F00/func_80083248.s b/asm/non_matchings/code_80071F00/func_80083248.s deleted file mode 100644 index a92b1f9ef..000000000 --- a/asm/non_matchings/code_80071F00/func_80083248.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80083248 -/* 083E48 80083248 000470C0 */ sll $t6, $a0, 3 -/* 083E4C 8008324C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 083E50 80083250 01C47023 */ subu $t6, $t6, $a0 -/* 083E54 80083254 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 083E58 80083258 AFB10020 */ sw $s1, 0x20($sp) -/* 083E5C 8008325C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 083E60 80083260 000E7140 */ sll $t6, $t6, 5 -/* 083E64 80083264 01CF8821 */ addu $s1, $t6, $t7 -/* 083E68 80083268 963800AE */ lhu $t8, 0xae($s1) -/* 083E6C 8008326C AFB0001C */ sw $s0, 0x1c($sp) -/* 083E70 80083270 00808025 */ move $s0, $a0 -/* 083E74 80083274 2F010005 */ sltiu $at, $t8, 5 -/* 083E78 80083278 1020003B */ beqz $at, .L80083368 -/* 083E7C 8008327C AFBF0024 */ sw $ra, 0x24($sp) -/* 083E80 80083280 0018C080 */ sll $t8, $t8, 2 -/* 083E84 80083284 3C01800F */ lui $at, %hi(jpt_800EF1D0) -/* 083E88 80083288 00380821 */ addu $at, $at, $t8 -/* 083E8C 8008328C 8C38F1D0 */ lw $t8, %lo(jpt_800EF1D0)($at) -/* 083E90 80083290 03000008 */ jr $t8 -/* 083E94 80083294 00000000 */ nop -glabel L80083298 -/* 083E98 80083298 C6240010 */ lwc1 $f4, 0x10($s1) -/* 083E9C 8008329C C6280018 */ lwc1 $f8, 0x18($s1) -/* 083EA0 800832A0 862D009E */ lh $t5, 0x9e($s1) -/* 083EA4 800832A4 4600218D */ trunc.w.s $f6, $f4 -/* 083EA8 800832A8 02002025 */ move $a0, $s0 -/* 083EAC 800832AC 8626009C */ lh $a2, 0x9c($s1) -/* 083EB0 800832B0 4600428D */ trunc.w.s $f10, $f8 -/* 083EB4 800832B4 44053000 */ mfc1 $a1, $f6 -/* 083EB8 800832B8 AFAD0010 */ sw $t5, 0x10($sp) -/* 083EBC 800832BC 44075000 */ mfc1 $a3, $f10 -/* 083EC0 800832C0 00054400 */ sll $t0, $a1, 0x10 -/* 083EC4 800832C4 00082C03 */ sra $a1, $t0, 0x10 -/* 083EC8 800832C8 00075C00 */ sll $t3, $a3, 0x10 -/* 083ECC 800832CC 0C021E83 */ jal func_80087A0C -/* 083ED0 800832D0 000B3C03 */ sra $a3, $t3, 0x10 -/* 083ED4 800832D4 10400024 */ beqz $v0, .L80083368 -/* 083ED8 800832D8 00000000 */ nop -/* 083EDC 800832DC 0C021BF5 */ jal func_80086FD4 -/* 083EE0 800832E0 02002025 */ move $a0, $s0 -/* 083EE4 800832E4 10000020 */ b .L80083368 -/* 083EE8 800832E8 00000000 */ nop -glabel L800832EC -/* 083EEC 800832EC 02002025 */ move $a0, $s0 -/* 083EF0 800832F0 0C021C6B */ jal func_800871AC -/* 083EF4 800832F4 2405003C */ li $a1, 60 -/* 083EF8 800832F8 1000001B */ b .L80083368 -/* 083EFC 800832FC 00000000 */ nop -glabel L80083300 -/* 083F00 80083300 C6300010 */ lwc1 $f16, 0x10($s1) -/* 083F04 80083304 C6240018 */ lwc1 $f4, 0x18($s1) -/* 083F08 80083308 02002025 */ move $a0, $s0 -/* 083F0C 8008330C 4600848D */ trunc.w.s $f18, $f16 -/* 083F10 80083310 8625009C */ lh $a1, 0x9c($s1) -/* 083F14 80083314 8627009E */ lh $a3, 0x9e($s1) -/* 083F18 80083318 4600218D */ trunc.w.s $f6, $f4 -/* 083F1C 8008331C 44069000 */ mfc1 $a2, $f18 -/* 083F20 80083320 44083000 */ mfc1 $t0, $f6 -/* 083F24 80083324 00067C00 */ sll $t7, $a2, 0x10 -/* 083F28 80083328 000F3403 */ sra $a2, $t7, 0x10 -/* 083F2C 8008332C 0C021E83 */ jal func_80087A0C -/* 083F30 80083330 AFA80010 */ sw $t0, 0x10($sp) -/* 083F34 80083334 1040000C */ beqz $v0, .L80083368 -/* 083F38 80083338 00000000 */ nop -/* 083F3C 8008333C 0C021BF5 */ jal func_80086FD4 -/* 083F40 80083340 02002025 */ move $a0, $s0 -/* 083F44 80083344 10000008 */ b .L80083368 -/* 083F48 80083348 00000000 */ nop -glabel L8008334C -/* 083F4C 8008334C 02002025 */ move $a0, $s0 -/* 083F50 80083350 0C021C18 */ jal func_80087060 -/* 083F54 80083354 2405003C */ li $a1, 60 -/* 083F58 80083358 10400003 */ beqz $v0, .L80083368 -/* 083F5C 8008335C 02002025 */ move $a0, $s0 -/* 083F60 80083360 0C021C07 */ jal func_8008701C -/* 083F64 80083364 24050001 */ li $a1, 1 -.L80083368: -glabel L80083368 -/* 083F68 80083368 0C022FC6 */ jal func_8008BF18 -/* 083F6C 8008336C 02002025 */ move $a0, $s0 -/* 083F70 80083370 02002025 */ move $a0, $s0 -/* 083F74 80083374 0C01C88F */ jal func_8007223C -/* 083F78 80083378 3C050020 */ lui $a1, 0x20 -/* 083F7C 8008337C 1040000F */ beqz $v0, .L800833BC -/* 083F80 80083380 02002025 */ move $a0, $s0 -/* 083F84 80083384 0C01C88F */ jal func_8007223C -/* 083F88 80083388 3C050040 */ lui $a1, 0x40 -/* 083F8C 8008338C 50400004 */ beql $v0, $zero, .L800833A0 -/* 083F90 80083390 C6280044 */ lwc1 $f8, 0x44($s1) -/* 083F94 80083394 0C022187 */ jal func_8008861C -/* 083F98 80083398 02002025 */ move $a0, $s0 -/* 083F9C 8008339C C6280044 */ lwc1 $f8, 0x44($s1) -.L800833A0: -/* 083FA0 800833A0 3C014018 */ li $at, 0x40180000 # 2.375000 -/* 083FA4 800833A4 44818800 */ mtc1 $at, $f17 -/* 083FA8 800833A8 44808000 */ mtc1 $zero, $f16 -/* 083FAC 800833AC 460042A1 */ cvt.d.s $f10, $f8 -/* 083FB0 800833B0 46305480 */ add.d $f18, $f10, $f16 -/* 083FB4 800833B4 46209120 */ cvt.s.d $f4, $f18 -/* 083FB8 800833B8 E6240008 */ swc1 $f4, 8($s1) -.L800833BC: -/* 083FBC 800833BC 8FBF0024 */ lw $ra, 0x24($sp) -/* 083FC0 800833C0 8FB0001C */ lw $s0, 0x1c($sp) -/* 083FC4 800833C4 8FB10020 */ lw $s1, 0x20($sp) -/* 083FC8 800833C8 03E00008 */ jr $ra -/* 083FCC 800833CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_80083538.s b/asm/non_matchings/code_80071F00/func_80083538.s index 3f8cbc608..45dbd7aed 100644 --- a/asm/non_matchings/code_80071F00/func_80083538.s +++ b/asm/non_matchings/code_80071F00/func_80083538.s @@ -1,3 +1,19 @@ +.section .late_rodata + +glabel D_800EF1E8 +.double 0.001 + +glabel D_800EF1F0 +.double 0.05 + +glabel D_800EF1F8 +.double 2.6 + +glabel D_800EF200 +.double 0.1 + +.section .text + glabel func_80083538 /* 084138 80083538 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 08413C 8008353C AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_80083868.s b/asm/non_matchings/code_80071F00/func_80083868.s index 9340d2122..85c7e72da 100644 --- a/asm/non_matchings/code_80071F00/func_80083868.s +++ b/asm/non_matchings/code_80071F00/func_80083868.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF208 +.float 0.1 + +.section .text + glabel func_80083868 /* 084468 80083868 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 08446C 8008386C AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_80083948.s b/asm/non_matchings/code_80071F00/func_80083948.s deleted file mode 100644 index 010900155..000000000 --- a/asm/non_matchings/code_80071F00/func_80083948.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80083948 -/* 084548 80083948 000470C0 */ sll $t6, $a0, 3 -/* 08454C 8008394C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 084550 80083950 01C47023 */ subu $t6, $t6, $a0 -/* 084554 80083954 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 084558 80083958 AFB10028 */ sw $s1, 0x28($sp) -/* 08455C 8008395C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 084560 80083960 000E7140 */ sll $t6, $t6, 5 -/* 084564 80083964 01CF8821 */ addu $s1, $t6, $t7 -/* 084568 80083968 963800AE */ lhu $t8, 0xae($s1) -/* 08456C 8008396C AFB00024 */ sw $s0, 0x24($sp) -/* 084570 80083970 00808025 */ move $s0, $a0 -/* 084574 80083974 2F010015 */ sltiu $at, $t8, 0x15 -/* 084578 80083978 10200030 */ beqz $at, .L80083A3C -/* 08457C 8008397C AFBF002C */ sw $ra, 0x2c($sp) -/* 084580 80083980 0018C080 */ sll $t8, $t8, 2 -/* 084584 80083984 3C01800F */ lui $at, %hi(jpt_800EF20C) -/* 084588 80083988 00380821 */ addu $at, $at, $t8 -/* 08458C 8008398C 8C38F20C */ lw $t8, %lo(jpt_800EF20C)($at) -/* 084590 80083990 03000008 */ jr $t8 -/* 084594 80083994 00000000 */ nop -glabel L80083998 -/* 084598 80083998 0C021BF5 */ jal func_80086FD4 -/* 08459C 8008399C 02002025 */ move $a0, $s0 -/* 0845A0 800839A0 10000026 */ b .L80083A3C -/* 0845A4 800839A4 00000000 */ nop -glabel L800839A8 -/* 0845A8 800839A8 02002025 */ move $a0, $s0 -/* 0845AC 800839AC 0C021C6B */ jal func_800871AC -/* 0845B0 800839B0 24050014 */ li $a1, 20 -/* 0845B4 800839B4 10000021 */ b .L80083A3C -/* 0845B8 800839B8 00000000 */ nop -glabel L800839BC -/* 0845BC 800839BC 02002025 */ move $a0, $s0 -/* 0845C0 800839C0 0C021C07 */ jal func_8008701C -/* 0845C4 800839C4 24050001 */ li $a1, 1 -/* 0845C8 800839C8 1000001C */ b .L80083A3C -/* 0845CC 800839CC 00000000 */ nop -glabel L800839D0 -/* 0845D0 800839D0 02002025 */ move $a0, $s0 -/* 0845D4 800839D4 3C054120 */ lui $a1, 0x4120 -/* 0845D8 800839D8 3C063F00 */ lui $a2, 0x3f00 -/* 0845DC 800839DC 0C021F12 */ jal func_80087C48 -/* 0845E0 800839E0 2407000A */ li $a3, 10 -/* 0845E4 800839E4 10000015 */ b .L80083A3C -/* 0845E8 800839E8 00000000 */ nop -glabel L800839EC -/* 0845EC 800839EC 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c -/* 0845F0 800839F0 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 0845F4 800839F4 02002025 */ move $a0, $s0 -/* 0845F8 800839F8 24050000 */ li $a1, 0 -/* 0845FC 800839FC 0C021F49 */ jal func_80087D24 -/* 084600 80083A00 3C07C0E0 */ lui $a3, 0xc0e0 -/* 084604 80083A04 1000000D */ b .L80083A3C -/* 084608 80083A08 00000000 */ nop -glabel L80083A0C -/* 08460C 80083A0C 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c -/* 084610 80083A10 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 084614 80083A14 2624002C */ addiu $a0, $s1, 0x2c -/* 084618 80083A18 0C0103B8 */ jal f32_step_up_towards -/* 08461C 80083A1C 24050000 */ li $a1, 0 -/* 084620 80083A20 10400006 */ beqz $v0, .L80083A3C -/* 084624 80083A24 02002025 */ move $a0, $s0 -/* 084628 80083A28 0C01CE00 */ jal func_80073800 -/* 08462C 80083A2C 00002825 */ move $a1, $zero -/* 084630 80083A30 02002025 */ move $a0, $s0 -/* 084634 80083A34 0C021C07 */ jal func_8008701C -/* 084638 80083A38 24050001 */ li $a1, 1 -.L80083A3C: -glabel L80083A3C -/* 08463C 80083A3C 0C022FC6 */ jal func_8008BF18 -/* 084640 80083A40 02002025 */ move $a0, $s0 -/* 084644 80083A44 24190400 */ li $t9, 1024 -/* 084648 80083A48 24080001 */ li $t0, 1 -/* 08464C 80083A4C 2409FFFF */ li $t1, -1 -/* 084650 80083A50 AFA90018 */ sw $t1, 0x18($sp) -/* 084654 80083A54 AFA80014 */ sw $t0, 0x14($sp) -/* 084658 80083A58 AFB90010 */ sw $t9, 0x10($sp) -/* 08465C 80083A5C 02002025 */ move $a0, $s0 -/* 084660 80083A60 262500A0 */ addiu $a1, $s1, 0xa0 -/* 084664 80083A64 2406F000 */ li $a2, -4096 -/* 084668 80083A68 0C01CF43 */ jal func_80073D0C -/* 08466C 80083A6C 24071000 */ li $a3, 4096 -/* 084670 80083A70 862A00A0 */ lh $t2, 0xa0($s1) -/* 084674 80083A74 34018000 */ li $at, 32768 -/* 084678 80083A78 8FBF002C */ lw $ra, 0x2c($sp) -/* 08467C 80083A7C 01415821 */ addu $t3, $t2, $at -/* 084680 80083A80 A62B00B6 */ sh $t3, 0xb6($s1) -/* 084684 80083A84 8FB10028 */ lw $s1, 0x28($sp) -/* 084688 80083A88 8FB00024 */ lw $s0, 0x24($sp) -/* 08468C 80083A8C 03E00008 */ jr $ra -/* 084690 80083A90 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_80083B0C.s b/asm/non_matchings/code_80071F00/func_80083B0C.s index cf09cefa0..24e40c0c0 100644 --- a/asm/non_matchings/code_80071F00/func_80083B0C.s +++ b/asm/non_matchings/code_80071F00/func_80083B0C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF260 +.float 0.1 + +.section .text + glabel func_80083B0C /* 08470C 80083B0C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 084710 80083B10 AFBF0024 */ sw $ra, 0x24($sp) diff --git a/asm/non_matchings/code_80071F00/func_80083C04.s b/asm/non_matchings/code_80071F00/func_80083C04.s index 8bce855cf..d1cd61552 100644 --- a/asm/non_matchings/code_80071F00/func_80083C04.s +++ b/asm/non_matchings/code_80071F00/func_80083C04.s @@ -1,3 +1,20 @@ +.section .late_rodata + +glabel jpt_800EF264 +.word L80083D30, L80083C54, L80083C64, L80083D30 +.word L80083D30, L80083D30, L80083D30, L80083D30 +.word L80083D30, L80083D30, L80083C78, L80083C9C +.word L80083CCC, L80083D14 + +glabel D_800EF29C +.float 0.001 + +glabel D_800EF2A0 +.float 0.0025 +.word 0x00000000 + +.section .text + glabel func_80083C04 /* 084804 80083C04 000470C0 */ sll $t6, $a0, 3 /* 084808 80083C08 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/non_matchings/code_80071F00/func_80083FD0.s b/asm/non_matchings/code_80071F00/func_80083FD0.s index fa84258be..635e0cfc6 100644 --- a/asm/non_matchings/code_80071F00/func_80083FD0.s +++ b/asm/non_matchings/code_80071F00/func_80083FD0.s @@ -1,3 +1,19 @@ +.section .late_rodata + +glabel D_800EF2A8 +.double 0.0002 + +glabel D_800EF2B0 +.double 0.04 + +glabel D_800EF2B8 +.double 0.05 + +glabel D_800EF2C0 +.double 0.1 + +.section .text + glabel func_80083FD0 /* 084BD0 80083FD0 000670C0 */ sll $t6, $a2, 3 /* 084BD4 80083FD4 01C67023 */ subu $t6, $t6, $a2 diff --git a/asm/non_matchings/code_80071F00/func_80084430.s b/asm/non_matchings/code_80071F00/func_80084430.s index ff4541da1..61870beba 100644 --- a/asm/non_matchings/code_80071F00/func_80084430.s +++ b/asm/non_matchings/code_80071F00/func_80084430.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel D_800EF2C8 +.float 0.2 +.word 0x00000000 + +glabel D_800EF2D0 +.double -383.0 + +.section .text + glabel func_80084430 /* 085030 80084430 000470C0 */ sll $t6, $a0, 3 /* 085034 80084434 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/non_matchings/code_80071F00/func_800845C8.s b/asm/non_matchings/code_80071F00/func_800845C8.s index 17479fb96..afaccf4aa 100644 --- a/asm/non_matchings/code_80071F00/func_800845C8.s +++ b/asm/non_matchings/code_80071F00/func_800845C8.s @@ -1,3 +1,56 @@ +.section .late_rodata + +glabel D_800EF2D8 +.double -2960.0 + +glabel D_800EF2E0 +.double -2490.0 + +glabel D_800EF2E8 +.double -2098.0 + +glabel D_800EF2F0 +.double -2080.0 + +glabel D_800EF2F8 +.float 0.08 + +glabel jpt_800EF2FC +.word L80084848, L80084904, L80084968, L800849CC +.word L80084A30, L80084A94 + +.word 0x00000000 + +glabel D_800EF318 +.double 146.0 + +glabel D_800EF320 +.double 380.0 + +glabel D_800EF328 +.float 0.15 +.word 0x00000000 + +glabel D_800EF330 +.double 380.0 + +glabel D_800EF338 +.double -2300.0 + +glabel D_800EF340 +.double -2500.0 + +glabel D_800EF348 +.double -535.0 + +glabel D_800EF350 +.double -250.0 + +glabel D_800EF358 +.float 0.04 + +.section .text + glabel func_800845C8 /* 0851C8 800845C8 000470C0 */ sll $t6, $a0, 3 /* 0851CC 800845CC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/non_matchings/code_80071F00/func_80084B7C.s b/asm/non_matchings/code_80071F00/func_80084B7C.s index 62b91f4e7..897ee3996 100644 --- a/asm/non_matchings/code_80071F00/func_80084B7C.s +++ b/asm/non_matchings/code_80071F00/func_80084B7C.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EF35C +.word L80084C80, L80084BCC, L80084BDC, L80084C48 +.word L80084C6C + +.section .text + glabel func_80084B7C /* 08577C 80084B7C 000470C0 */ sll $t6, $a0, 3 /* 085780 80084B80 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/non_matchings/code_80071F00/func_80084D2C.s b/asm/non_matchings/code_80071F00/func_80084D2C.s index 5ca6f823a..f5eb38a38 100644 --- a/asm/non_matchings/code_80071F00/func_80084D2C.s +++ b/asm/non_matchings/code_80071F00/func_80084D2C.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_800EF370 +.word L80085000, L80084D7C, L80084DBC +.word L80084E5C, L80084F10, L80084F3C, L80084FAC + +glabel D_800EF38C +.float 0.4 + +.section .text + glabel func_80084D2C /* 08592C 80084D2C 000470C0 */ sll $t6, $a0, 3 /* 085930 80084D30 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/non_matchings/code_80071F00/func_800850B0.s b/asm/non_matchings/code_80071F00/func_800850B0.s index 0a4d6b4af..7af3fb983 100644 --- a/asm/non_matchings/code_80071F00/func_800850B0.s +++ b/asm/non_matchings/code_80071F00/func_800850B0.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EF390 +.word L80085104, L80085114, L80085124, L80085138 +.word L8008514C, L80085160 + +.section .text + glabel func_800850B0 /* 085CB0 800850B0 000470C0 */ sll $t6, $a0, 3 /* 085CB4 800850B4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/non_matchings/code_80071F00/func_80085214.s b/asm/non_matchings/code_80071F00/func_80085214.s index 96b1bd1ff..6b58382b8 100644 --- a/asm/non_matchings/code_80071F00/func_80085214.s +++ b/asm/non_matchings/code_80071F00/func_80085214.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel D_800EF3A8 +.float 1.3 +.word 0x00000000 + +.section .text + glabel func_80085214 /* 085E14 80085214 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 085E18 80085218 F7BC0030 */ sdc1 $f28, 0x30($sp) diff --git a/asm/non_matchings/code_80071F00/func_800853DC.s b/asm/non_matchings/code_80071F00/func_800853DC.s index ddef95aee..2822806de 100644 --- a/asm/non_matchings/code_80071F00/func_800853DC.s +++ b/asm/non_matchings/code_80071F00/func_800853DC.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF3B0 +.double -1250.0 + +.section .text + glabel func_800853DC /* 085FDC 800853DC 000470C0 */ sll $t6, $a0, 3 /* 085FE0 800853E0 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80085534.s b/asm/non_matchings/code_80071F00/func_80085534.s deleted file mode 100644 index ea2792a8e..000000000 --- a/asm/non_matchings/code_80071F00/func_80085534.s +++ /dev/null @@ -1,152 +0,0 @@ -glabel func_80085534 -/* 086134 80085534 000470C0 */ sll $t6, $a0, 3 -/* 086138 80085538 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 08613C 8008553C 01C47023 */ subu $t6, $t6, $a0 -/* 086140 80085540 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 086144 80085544 AFB00014 */ sw $s0, 0x14($sp) -/* 086148 80085548 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 08614C 8008554C 000E7140 */ sll $t6, $t6, 5 -/* 086150 80085550 01CF8021 */ addu $s0, $t6, $t7 -/* 086154 80085554 861800AE */ lh $t8, 0xae($s0) -/* 086158 80085558 AFB10018 */ sw $s1, 0x18($sp) -/* 08615C 8008555C 00808825 */ move $s1, $a0 -/* 086160 80085560 2719FFFF */ addiu $t9, $t8, -1 -/* 086164 80085564 2F210009 */ sltiu $at, $t9, 9 -/* 086168 80085568 10200075 */ beqz $at, .L80085740 -/* 08616C 8008556C AFBF001C */ sw $ra, 0x1c($sp) -/* 086170 80085570 0019C880 */ sll $t9, $t9, 2 -/* 086174 80085574 3C01800F */ lui $at, %hi(jpt_800EF3B8) -/* 086178 80085578 00390821 */ addu $at, $at, $t9 -/* 08617C 8008557C 8C39F3B8 */ lw $t9, %lo(jpt_800EF3B8)($at) -/* 086180 80085580 03200008 */ jr $t9 -/* 086184 80085584 00000000 */ nop -glabel L80085588 -/* 086188 80085588 C606002C */ lwc1 $f6, 0x2c($s0) -/* 08618C 8008558C 3C014032 */ li $at, 0x40320000 # 2.781250 -/* 086190 80085590 44812800 */ mtc1 $at, $f5 -/* 086194 80085594 44802000 */ mtc1 $zero, $f4 -/* 086198 80085598 46003221 */ cvt.d.s $f8, $f6 -/* 08619C 8008559C 4624403E */ c.le.d $f8, $f4 -/* 0861A0 800855A0 00000000 */ nop -/* 0861A4 800855A4 45000066 */ bc1f .L80085740 -/* 0861A8 800855A8 00000000 */ nop -/* 0861AC 800855AC 0C021BF5 */ jal func_80086FD4 -/* 0861B0 800855B0 02202025 */ move $a0, $s1 -/* 0861B4 800855B4 10000062 */ b .L80085740 -/* 0861B8 800855B8 00000000 */ nop -glabel L800855BC -/* 0861BC 800855BC 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c -/* 0861C0 800855C0 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 0861C4 800855C4 2604003C */ addiu $a0, $s0, 0x3c -/* 0861C8 800855C8 0C0104EE */ jal f32_step_towards -/* 0861CC 800855CC 24050000 */ li $a1, 0 -/* 0861D0 800855D0 C610003C */ lwc1 $f16, 0x3c($s0) -/* 0861D4 800855D4 44805800 */ mtc1 $zero, $f11 -/* 0861D8 800855D8 44805000 */ mtc1 $zero, $f10 -/* 0861DC 800855DC 460084A1 */ cvt.d.s $f18, $f16 -/* 0861E0 800855E0 46325032 */ c.eq.d $f10, $f18 -/* 0861E4 800855E4 00000000 */ nop -/* 0861E8 800855E8 45000055 */ bc1f .L80085740 -/* 0861EC 800855EC 00000000 */ nop -/* 0861F0 800855F0 0C021BF5 */ jal func_80086FD4 -/* 0861F4 800855F4 02202025 */ move $a0, $s1 -/* 0861F8 800855F8 10000051 */ b .L80085740 -/* 0861FC 800855FC 00000000 */ nop -glabel L80085600 -/* 086200 80085600 02202025 */ move $a0, $s1 -/* 086204 80085604 0C021C6B */ jal func_800871AC -/* 086208 80085608 24050001 */ li $a1, 1 -/* 08620C 8008560C 1000004C */ b .L80085740 -/* 086210 80085610 00000000 */ nop -glabel L80085614 -/* 086214 80085614 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c -/* 086218 80085618 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 08621C 8008561C 2604003C */ addiu $a0, $s0, 0x3c -/* 086220 80085620 0C0104EE */ jal f32_step_towards -/* 086224 80085624 3C053F80 */ lui $a1, 0x3f80 -/* 086228 80085628 C604003C */ lwc1 $f4, 0x3c($s0) -/* 08622C 8008562C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 086230 80085630 44813800 */ mtc1 $at, $f7 -/* 086234 80085634 44803000 */ mtc1 $zero, $f6 -/* 086238 80085638 46002221 */ cvt.d.s $f8, $f4 -/* 08623C 8008563C 46283032 */ c.eq.d $f6, $f8 -/* 086240 80085640 00000000 */ nop -/* 086244 80085644 4500003E */ bc1f .L80085740 -/* 086248 80085648 00000000 */ nop -/* 08624C 8008564C 0C021BF5 */ jal func_80086FD4 -/* 086250 80085650 02202025 */ move $a0, $s1 -/* 086254 80085654 1000003A */ b .L80085740 -/* 086258 80085658 00000000 */ nop -glabel L8008565C -/* 08625C 8008565C 02202025 */ move $a0, $s1 -/* 086260 80085660 0C021C6B */ jal func_800871AC -/* 086264 80085664 2405005A */ li $a1, 90 -/* 086268 80085668 10000035 */ b .L80085740 -/* 08626C 8008566C 00000000 */ nop -glabel L80085670 -/* 086270 80085670 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c -/* 086274 80085674 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 086278 80085678 2604003C */ addiu $a0, $s0, 0x3c -/* 08627C 8008567C 0C0104EE */ jal f32_step_towards -/* 086280 80085680 24050000 */ li $a1, 0 -/* 086284 80085684 C60A003C */ lwc1 $f10, 0x3c($s0) -/* 086288 80085688 44808800 */ mtc1 $zero, $f17 -/* 08628C 8008568C 44808000 */ mtc1 $zero, $f16 -/* 086290 80085690 460054A1 */ cvt.d.s $f18, $f10 -/* 086294 80085694 46328032 */ c.eq.d $f16, $f18 -/* 086298 80085698 00000000 */ nop -/* 08629C 8008569C 45000028 */ bc1f .L80085740 -/* 0862A0 800856A0 00000000 */ nop -/* 0862A4 800856A4 0C021BF5 */ jal func_80086FD4 -/* 0862A8 800856A8 02202025 */ move $a0, $s1 -/* 0862AC 800856AC 10000024 */ b .L80085740 -/* 0862B0 800856B0 00000000 */ nop -glabel L800856B4 -/* 0862B4 800856B4 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c -/* 0862B8 800856B8 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 0862BC 800856BC 2604003C */ addiu $a0, $s0, 0x3c -/* 0862C0 800856C0 0C0104EE */ jal f32_step_towards -/* 0862C4 800856C4 3C05BF80 */ lui $a1, 0xbf80 -/* 0862C8 800856C8 C606003C */ lwc1 $f6, 0x3c($s0) -/* 0862CC 800856CC 3C01BFF0 */ li $at, 0xBFF00000 # -1.875000 -/* 0862D0 800856D0 44812800 */ mtc1 $at, $f5 -/* 0862D4 800856D4 44802000 */ mtc1 $zero, $f4 -/* 0862D8 800856D8 46003221 */ cvt.d.s $f8, $f6 -/* 0862DC 800856DC 46282032 */ c.eq.d $f4, $f8 -/* 0862E0 800856E0 00000000 */ nop -/* 0862E4 800856E4 45000016 */ bc1f .L80085740 -/* 0862E8 800856E8 00000000 */ nop -/* 0862EC 800856EC 0C021BF5 */ jal func_80086FD4 -/* 0862F0 800856F0 02202025 */ move $a0, $s1 -/* 0862F4 800856F4 10000012 */ b .L80085740 -/* 0862F8 800856F8 00000000 */ nop -glabel L800856FC -/* 0862FC 800856FC 02202025 */ move $a0, $s1 -/* 086300 80085700 0C021C6B */ jal func_800871AC -/* 086304 80085704 2405005A */ li $a1, 90 -/* 086308 80085708 1000000D */ b .L80085740 -/* 08630C 8008570C 00000000 */ nop -glabel L80085710 -/* 086310 80085710 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c -/* 086314 80085714 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 086318 80085718 2604003C */ addiu $a0, $s0, 0x3c -/* 08631C 8008571C 0C0104EE */ jal f32_step_towards -/* 086320 80085720 24050000 */ li $a1, 0 -/* 086324 80085724 02202025 */ move $a0, $s1 -/* 086328 80085728 0C021C18 */ jal func_80087060 -/* 08632C 8008572C 2405005A */ li $a1, 90 -/* 086330 80085730 10400003 */ beqz $v0, .L80085740 -/* 086334 80085734 02202025 */ move $a0, $s1 -/* 086338 80085738 0C021C07 */ jal func_8008701C -/* 08633C 8008573C 24050003 */ li $a1, 3 -.L80085740: -/* 086340 80085740 0C021DF1 */ jal func_800877C4 -/* 086344 80085744 02202025 */ move $a0, $s1 -/* 086348 80085748 960800C0 */ lhu $t0, 0xc0($s0) -/* 08634C 8008574C 8FBF001C */ lw $ra, 0x1c($sp) -/* 086350 80085750 8FB10018 */ lw $s1, 0x18($sp) -/* 086354 80085754 25090100 */ addiu $t1, $t0, 0x100 -/* 086358 80085758 A60900C0 */ sh $t1, 0xc0($s0) -/* 08635C 8008575C 8FB00014 */ lw $s0, 0x14($sp) -/* 086360 80085760 03E00008 */ jr $ra -/* 086364 80085764 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80071F00/func_80085878.s b/asm/non_matchings/code_80071F00/func_80085878.s index 5989c045a..ac4e4830d 100644 --- a/asm/non_matchings/code_80071F00/func_80085878.s +++ b/asm/non_matchings/code_80071F00/func_80085878.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF3DC +.float 0.03 + +.section .text + glabel func_80085878 /* 086478 80085878 000470C0 */ sll $t6, $a0, 3 /* 08647C 8008587C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/non_matchings/code_80071F00/func_800859C8.s b/asm/non_matchings/code_80071F00/func_800859C8.s index 13f2f7f4d..fdaccafd7 100644 --- a/asm/non_matchings/code_80071F00/func_800859C8.s +++ b/asm/non_matchings/code_80071F00/func_800859C8.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel D_800EF3E0 +.float 0.03 +.word 0x00000000 + +.section .text + glabel func_800859C8 /* 0865C8 800859C8 000478C0 */ sll $t7, $a0, 3 /* 0865CC 800859CC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/non_matchings/code_80071F00/func_80085C20.s b/asm/non_matchings/code_80071F00/func_80085C20.s index 4841944c7..da478b9f6 100644 --- a/asm/non_matchings/code_80071F00/func_80085C20.s +++ b/asm/non_matchings/code_80071F00/func_80085C20.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF3E8 +.double -1431.0 + +.section .text + glabel func_80085C20 /* 086820 80085C20 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 /* 086824 80085C24 C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) diff --git a/asm/non_matchings/code_80071F00/func_80085CA0.s b/asm/non_matchings/code_80071F00/func_80085CA0.s index 4a9fcd944..beaec3f1b 100644 --- a/asm/non_matchings/code_80071F00/func_80085CA0.s +++ b/asm/non_matchings/code_80071F00/func_80085CA0.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_800EF3F0 +.word L80085DA8, L80085CE0, L80085CF0, L80085D18 +.word L80085D38, L80085D48, L80085D70, L80085D80 +.word L80085DA0 + +.word 0x00000000 + +.section .text + glabel func_80085CA0 /* 0868A0 80085CA0 000470C0 */ sll $t6, $a0, 3 /* 0868A4 80085CA4 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80085DB8.s b/asm/non_matchings/code_80071F00/func_80085DB8.s index 74d834e6b..99475e1b4 100644 --- a/asm/non_matchings/code_80071F00/func_80085DB8.s +++ b/asm/non_matchings/code_80071F00/func_80085DB8.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF418 +.double 799.0 + +.section .text + glabel func_80085DB8 /* 0869B8 80085DB8 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 /* 0869BC 80085DBC C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) diff --git a/asm/non_matchings/code_80071F00/func_80085E38.s b/asm/non_matchings/code_80071F00/func_80085E38.s index fa6ee8997..8ff5b3690 100644 --- a/asm/non_matchings/code_80071F00/func_80085E38.s +++ b/asm/non_matchings/code_80071F00/func_80085E38.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EF420 +.word L80085EE8, L80085E78, L80085E88, L80085EB0 +.word L80085ED0, L80085EE0 + +.section .text + glabel func_80085E38 /* 086A38 80085E38 000470C0 */ sll $t6, $a0, 3 /* 086A3C 80085E3C 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80085EF8.s b/asm/non_matchings/code_80071F00/func_80085EF8.s index 7ad041b02..8219a0521 100644 --- a/asm/non_matchings/code_80071F00/func_80085EF8.s +++ b/asm/non_matchings/code_80071F00/func_80085EF8.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF438 +.double -2013.0 + +.section .text + glabel func_80085EF8 /* 086AF8 80085EF8 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 /* 086AFC 80085EFC C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) diff --git a/asm/non_matchings/code_80071F00/func_80085F74.s b/asm/non_matchings/code_80071F00/func_80085F74.s index 3b2b99d9a..b1bac28e0 100644 --- a/asm/non_matchings/code_80071F00/func_80085F74.s +++ b/asm/non_matchings/code_80071F00/func_80085F74.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_800EF440 +.word L80086064, L80085FB4, L80085FC4, L80085FEC +.word L80085FFC, L80086014, L80086024, L8008604C +.word L8008605C + +.word 0x00000000 + +.section .text + glabel func_80085F74 /* 086B74 80085F74 000470C0 */ sll $t6, $a0, 3 /* 086B78 80085F78 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_80071F00/func_80086424.s b/asm/non_matchings/code_80071F00/func_80086424.s deleted file mode 100644 index 41c309048..000000000 --- a/asm/non_matchings/code_80071F00/func_80086424.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80086424 -/* 087024 80086424 000470C0 */ sll $t6, $a0, 3 -/* 087028 80086428 01C47023 */ subu $t6, $t6, $a0 -/* 08702C 8008642C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 087030 80086430 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 087034 80086434 000E7140 */ sll $t6, $t6, 5 -/* 087038 80086438 01CF1021 */ addu $v0, $t6, $t7 -/* 08703C 8008643C 844300AE */ lh $v1, 0xae($v0) -/* 087040 80086440 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 087044 80086444 AFB00018 */ sw $s0, 0x18($sp) -/* 087048 80086448 00808025 */ move $s0, $a0 -/* 08704C 8008644C 1060002F */ beqz $v1, .L8008650C -/* 087050 80086450 AFBF001C */ sw $ra, 0x1c($sp) -/* 087054 80086454 24010001 */ li $at, 1 -/* 087058 80086458 10610005 */ beq $v1, $at, .L80086470 -/* 08705C 8008645C 24010002 */ li $at, 2 -/* 087060 80086460 1061000A */ beq $v1, $at, .L8008648C -/* 087064 80086464 02002025 */ move $a0, $s0 -/* 087068 80086468 10000028 */ b .L8008650C -/* 08706C 8008646C 00000000 */ nop -.L80086470: -/* 087070 80086470 3C013F40 */ li $at, 0x3F400000 # 0.750000 -/* 087074 80086474 44812000 */ mtc1 $at, $f4 -/* 087078 80086478 02002025 */ move $a0, $s0 -/* 08707C 8008647C 0C021BF5 */ jal func_80086FD4 -/* 087080 80086480 E444003C */ swc1 $f4, 0x3c($v0) -/* 087084 80086484 10000021 */ b .L8008650C -/* 087088 80086488 00000000 */ nop -.L8008648C: -/* 08708C 8008648C C446002C */ lwc1 $f6, 0x2c($v0) -/* 087090 80086490 3C01C000 */ li $at, 0xC0000000 # -2.000000 -/* 087094 80086494 44815800 */ mtc1 $at, $f11 -/* 087098 80086498 44805000 */ mtc1 $zero, $f10 -/* 08709C 8008649C 46003221 */ cvt.d.s $f8, $f6 -/* 0870A0 800864A0 4628503E */ c.le.d $f10, $f8 -/* 0870A4 800864A4 00000000 */ nop -/* 0870A8 800864A8 45000008 */ bc1f .L800864CC -/* 0870AC 800864AC 00000000 */ nop -/* 0870B0 800864B0 C450003C */ lwc1 $f16, 0x3c($v0) -/* 0870B4 800864B4 3C01800F */ lui $at, %hi(D_800EF468) -/* 0870B8 800864B8 D424F468 */ ldc1 $f4, %lo(D_800EF468)($at) -/* 0870BC 800864BC 460084A1 */ cvt.d.s $f18, $f16 -/* 0870C0 800864C0 46249181 */ sub.d $f6, $f18, $f4 -/* 0870C4 800864C4 46203220 */ cvt.s.d $f8, $f6 -/* 0870C8 800864C8 E448003C */ swc1 $f8, 0x3c($v0) -.L800864CC: -/* 0870CC 800864CC 0C021DF1 */ jal func_800877C4 -/* 0870D0 800864D0 AFA20020 */ sw $v0, 0x20($sp) -/* 0870D4 800864D4 8FA20020 */ lw $v0, 0x20($sp) -/* 0870D8 800864D8 44809800 */ mtc1 $zero, $f19 -/* 0870DC 800864DC 44809000 */ mtc1 $zero, $f18 -/* 0870E0 800864E0 C44A002C */ lwc1 $f10, 0x2c($v0) -/* 0870E4 800864E4 46005421 */ cvt.d.s $f16, $f10 -/* 0870E8 800864E8 4630903E */ c.le.d $f18, $f16 -/* 0870EC 800864EC 00000000 */ nop -/* 0870F0 800864F0 45000006 */ bc1f .L8008650C -/* 0870F4 800864F4 00000000 */ nop -/* 0870F8 800864F8 44800000 */ mtc1 $zero, $f0 -/* 0870FC 800864FC 02002025 */ move $a0, $s0 -/* 087100 80086500 E440002C */ swc1 $f0, 0x2c($v0) -/* 087104 80086504 0C021BD8 */ jal func_80086F60 -/* 087108 80086508 E440003C */ swc1 $f0, 0x3c($v0) -.L8008650C: -/* 08710C 8008650C 0C022FC6 */ jal func_8008BF18 -/* 087110 80086510 02002025 */ move $a0, $s0 -/* 087114 80086514 8FBF001C */ lw $ra, 0x1c($sp) -/* 087118 80086518 8FB00018 */ lw $s0, 0x18($sp) -/* 08711C 8008651C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 087120 80086520 03E00008 */ jr $ra -/* 087124 80086524 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80086700.s b/asm/non_matchings/code_80071F00/func_80086700.s index 3e0a194aa..2f5600ccd 100644 --- a/asm/non_matchings/code_80071F00/func_80086700.s +++ b/asm/non_matchings/code_80071F00/func_80086700.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF470 +.float 0.005 + +.section .text + glabel func_80086700 /* 087300 80086700 3C0E800E */ lui $t6, %hi(gCCSelection) # $t6, 0x800e /* 087304 80086704 8DCEC548 */ lw $t6, %lo(gCCSelection)($t6) diff --git a/asm/non_matchings/code_80071F00/func_80086940.s b/asm/non_matchings/code_80071F00/func_80086940.s index d3da55361..4f3e0d1ff 100644 --- a/asm/non_matchings/code_80071F00/func_80086940.s +++ b/asm/non_matchings/code_80071F00/func_80086940.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_800EF474 +.word L80086BB0, L80086990, L800869A0, L80086A04 +.word L80086A18, L80086AFC, L80086B6C, L80086B8C + +glabel D_800EF494 +.float -0.4 + +.section .text + glabel func_80086940 /* 087540 80086940 000470C0 */ sll $t6, $a0, 3 /* 087544 80086944 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/non_matchings/code_80086E70/func_80089020.s b/asm/non_matchings/code_80086E70/func_80089020.s deleted file mode 100644 index 9ae98c711..000000000 --- a/asm/non_matchings/code_80086E70/func_80089020.s +++ /dev/null @@ -1,196 +0,0 @@ -glabel func_80089020 -/* 089C20 80089020 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 089C24 80089024 AFBF0014 */ sw $ra, 0x14($sp) -/* 089C28 80089028 44806000 */ mtc1 $zero, $f12 -/* 089C2C 8008902C C4A00000 */ lwc1 $f0, ($a1) -/* 089C30 80089030 000470C0 */ sll $t6, $a0, 3 -/* 089C34 80089034 01C47023 */ subu $t6, $t6, $a0 -/* 089C38 80089038 000E7100 */ sll $t6, $t6, 4 -/* 089C3C 8008903C 4600603E */ c.le.s $f12, $f0 -/* 089C40 80089040 01C47023 */ subu $t6, $t6, $a0 -/* 089C44 80089044 000E7080 */ sll $t6, $t6, 2 -/* 089C48 80089048 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e -/* 089C4C 8008904C 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) -/* 089C50 80089050 01C47023 */ subu $t6, $t6, $a0 -/* 089C54 80089054 000E70C0 */ sll $t6, $t6, 3 -/* 089C58 80089058 00A03825 */ move $a3, $a1 -/* 089C5C 8008905C 45000003 */ bc1f .L8008906C -/* 089C60 80089060 01CF1021 */ addu $v0, $t6, $t7 -/* 089C64 80089064 10000002 */ b .L80089070 -/* 089C68 80089068 46000086 */ mov.s $f2, $f0 -.L8008906C: -/* 089C6C 8008906C 46000087 */ neg.s $f2, $f0 -.L80089070: -/* 089C70 80089070 8C5800BC */ lw $t8, 0xbc($v0) -/* 089C74 80089074 44056000 */ mfc1 $a1, $f12 -/* 089C78 80089078 3C08800E */ lui $t0, %hi(gCurrentCourseId) # $t0, 0x800e -/* 089C7C 8008907C 331900C0 */ andi $t9, $t8, 0xc0 -/* 089C80 80089080 1320004A */ beqz $t9, .L800891AC -/* 089C84 80089084 3C09800E */ lui $t1, %hi(gCurrentCourseId) # $t1, 0x800e -/* 089C88 80089088 8508C5A0 */ lh $t0, %lo(gCurrentCourseId)($t0) -/* 089C8C 8008908C 2401000C */ li $at, 12 -/* 089C90 80089090 15010023 */ bne $t0, $at, .L80089120 -/* 089C94 80089094 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 089C98 80089098 44812800 */ mtc1 $at, $f5 -/* 089C9C 8008909C 44802000 */ mtc1 $zero, $f4 -/* 089CA0 800890A0 46001021 */ cvt.d.s $f0, $f2 -/* 089CA4 800890A4 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 089CA8 800890A8 4624003E */ c.le.d $f0, $f4 -/* 089CAC 800890AC 00000000 */ nop -/* 089CB0 800890B0 45020005 */ bc1fl .L800890C8 -/* 089CB4 800890B4 44813800 */ mtc1 $at, $f7 -/* 089CB8 800890B8 3C01800F */ lui $at, %hi(D_800EF4A0) # 0x800F0000 # -0.000000 -/* 089CBC 800890BC 10000081 */ b .L800892C4 -/* 089CC0 800890C0 C420F4A0 */ lwc1 $f0, %lo(D_800EF4A0)($at) -/* 089CC4 800890C4 44813800 */ mtc1 $at, $f7 -.L800890C8: -/* 089CC8 800890C8 44803000 */ mtc1 $zero, $f6 -/* 089CCC 800890CC 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 089CD0 800890D0 4626003E */ c.le.d $f0, $f6 -/* 089CD4 800890D4 00000000 */ nop -/* 089CD8 800890D8 45020005 */ bc1fl .L800890F0 -/* 089CDC 800890DC 44814800 */ mtc1 $at, $f9 -/* 089CE0 800890E0 3C01800F */ lui $at, %hi(D_800EF4A4) # 0x800F0000 # -0.000000 -/* 089CE4 800890E4 10000077 */ b .L800892C4 -/* 089CE8 800890E8 C420F4A4 */ lwc1 $f0, %lo(D_800EF4A4)($at) -/* 089CEC 800890EC 44814800 */ mtc1 $at, $f9 -.L800890F0: -/* 089CF0 800890F0 44804000 */ mtc1 $zero, $f8 -/* 089CF4 800890F4 3C013E80 */ li $at, 0x3E800000 # 0.250000 -/* 089CF8 800890F8 4628003E */ c.le.d $f0, $f8 -/* 089CFC 800890FC 00000000 */ nop -/* 089D00 80089100 45020005 */ bc1fl .L80089118 -/* 089D04 80089104 44810000 */ mtc1 $at, $f0 -/* 089D08 80089108 3C01800F */ lui $at, %hi(D_800EF4A8) # 0x800F0000 # -0.000000 -/* 089D0C 8008910C 1000006D */ b .L800892C4 -/* 089D10 80089110 C420F4A8 */ lwc1 $f0, %lo(D_800EF4A8)($at) -/* 089D14 80089114 44810000 */ mtc1 $at, $f0 -.L80089118: -/* 089D18 80089118 1000006B */ b .L800892C8 -/* 089D1C 8008911C 44060000 */ mfc1 $a2, $f0 -.L80089120: -/* 089D20 80089120 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 089D24 80089124 44815800 */ mtc1 $at, $f11 -/* 089D28 80089128 44805000 */ mtc1 $zero, $f10 -/* 089D2C 8008912C 46001021 */ cvt.d.s $f0, $f2 -/* 089D30 80089130 3C014008 */ li $at, 0x40080000 # 2.125000 -/* 089D34 80089134 462A003E */ c.le.d $f0, $f10 -/* 089D38 80089138 00000000 */ nop -/* 089D3C 8008913C 45020005 */ bc1fl .L80089154 -/* 089D40 80089140 44818800 */ mtc1 $at, $f17 -/* 089D44 80089144 3C01800F */ lui $at, %hi(D_800EF4AC) # 0x800F0000 # -0.000000 -/* 089D48 80089148 1000005E */ b .L800892C4 -/* 089D4C 8008914C C420F4AC */ lwc1 $f0, %lo(D_800EF4AC)($at) -/* 089D50 80089150 44818800 */ mtc1 $at, $f17 -.L80089154: -/* 089D54 80089154 44808000 */ mtc1 $zero, $f16 -/* 089D58 80089158 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 089D5C 8008915C 4630003E */ c.le.d $f0, $f16 -/* 089D60 80089160 00000000 */ nop -/* 089D64 80089164 45020005 */ bc1fl .L8008917C -/* 089D68 80089168 44819800 */ mtc1 $at, $f19 -/* 089D6C 8008916C 3C01800F */ lui $at, %hi(D_800EF4B0) # 0x800F0000 # -0.000000 -/* 089D70 80089170 10000054 */ b .L800892C4 -/* 089D74 80089174 C420F4B0 */ lwc1 $f0, %lo(D_800EF4B0)($at) -/* 089D78 80089178 44819800 */ mtc1 $at, $f19 -.L8008917C: -/* 089D7C 8008917C 44809000 */ mtc1 $zero, $f18 -/* 089D80 80089180 3C013E80 */ li $at, 0x3E800000 # 0.250000 -/* 089D84 80089184 4632003E */ c.le.d $f0, $f18 -/* 089D88 80089188 00000000 */ nop -/* 089D8C 8008918C 45020005 */ bc1fl .L800891A4 -/* 089D90 80089190 44810000 */ mtc1 $at, $f0 -/* 089D94 80089194 3C01800F */ lui $at, %hi(D_800EF4B4) # 0x800F0000 # -0.000000 -/* 089D98 80089198 1000004A */ b .L800892C4 -/* 089D9C 8008919C C420F4B4 */ lwc1 $f0, %lo(D_800EF4B4)($at) -/* 089DA0 800891A0 44810000 */ mtc1 $at, $f0 -.L800891A4: -/* 089DA4 800891A4 10000048 */ b .L800892C8 -/* 089DA8 800891A8 44060000 */ mfc1 $a2, $f0 -.L800891AC: -/* 089DAC 800891AC 8529C5A0 */ lh $t1, %lo(gCurrentCourseId)($t1) -/* 089DB0 800891B0 2401000C */ li $at, 12 -/* 089DB4 800891B4 15210022 */ bne $t1, $at, .L80089240 -/* 089DB8 800891B8 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 089DBC 800891BC 44812800 */ mtc1 $at, $f5 -/* 089DC0 800891C0 44802000 */ mtc1 $zero, $f4 -/* 089DC4 800891C4 46001021 */ cvt.d.s $f0, $f2 -/* 089DC8 800891C8 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 089DCC 800891CC 4624003E */ c.le.d $f0, $f4 -/* 089DD0 800891D0 00000000 */ nop -/* 089DD4 800891D4 45020005 */ bc1fl .L800891EC -/* 089DD8 800891D8 44813800 */ mtc1 $at, $f7 -/* 089DDC 800891DC 3C01800F */ lui $at, %hi(D_800EF4B8) # 0x800F0000 # -0.000000 -/* 089DE0 800891E0 10000038 */ b .L800892C4 -/* 089DE4 800891E4 C420F4B8 */ lwc1 $f0, %lo(D_800EF4B8)($at) -/* 089DE8 800891E8 44813800 */ mtc1 $at, $f7 -.L800891EC: -/* 089DEC 800891EC 44803000 */ mtc1 $zero, $f6 -/* 089DF0 800891F0 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 089DF4 800891F4 4626003E */ c.le.d $f0, $f6 -/* 089DF8 800891F8 00000000 */ nop -/* 089DFC 800891FC 45020005 */ bc1fl .L80089214 -/* 089E00 80089200 44814800 */ mtc1 $at, $f9 -/* 089E04 80089204 3C01800F */ lui $at, %hi(D_800EF4BC) # 0x800F0000 # -0.000000 -/* 089E08 80089208 1000002E */ b .L800892C4 -/* 089E0C 8008920C C420F4BC */ lwc1 $f0, %lo(D_800EF4BC)($at) -/* 089E10 80089210 44814800 */ mtc1 $at, $f9 -.L80089214: -/* 089E14 80089214 44804000 */ mtc1 $zero, $f8 -/* 089E18 80089218 3C01800F */ lui $at, %hi(D_800EF4C4) -/* 089E1C 8008921C 4628003E */ c.le.d $f0, $f8 -/* 089E20 80089220 00000000 */ nop -/* 089E24 80089224 45000004 */ bc1f .L80089238 -/* 089E28 80089228 00000000 */ nop -/* 089E2C 8008922C 3C01800F */ lui $at, %hi(D_800EF4C0) # $at, 0x800f -/* 089E30 80089230 10000024 */ b .L800892C4 -/* 089E34 80089234 C420F4C0 */ lwc1 $f0, %lo(D_800EF4C0)($at) -.L80089238: -/* 089E38 80089238 10000022 */ b .L800892C4 -/* 089E3C 8008923C C420F4C4 */ lwc1 $f0, %lo(D_800EF4C4)($at) -.L80089240: -/* 089E40 80089240 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 089E44 80089244 44815800 */ mtc1 $at, $f11 -/* 089E48 80089248 44805000 */ mtc1 $zero, $f10 -/* 089E4C 8008924C 46001021 */ cvt.d.s $f0, $f2 -/* 089E50 80089250 3C014008 */ li $at, 0x40080000 # 2.125000 -/* 089E54 80089254 462A003E */ c.le.d $f0, $f10 -/* 089E58 80089258 00000000 */ nop -/* 089E5C 8008925C 45020005 */ bc1fl .L80089274 -/* 089E60 80089260 44818800 */ mtc1 $at, $f17 -/* 089E64 80089264 3C01800F */ lui $at, %hi(D_800EF4C8) # 0x800F0000 # -0.000000 -/* 089E68 80089268 10000016 */ b .L800892C4 -/* 089E6C 8008926C C420F4C8 */ lwc1 $f0, %lo(D_800EF4C8)($at) -/* 089E70 80089270 44818800 */ mtc1 $at, $f17 -.L80089274: -/* 089E74 80089274 44808000 */ mtc1 $zero, $f16 -/* 089E78 80089278 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 089E7C 8008927C 4630003E */ c.le.d $f0, $f16 -/* 089E80 80089280 00000000 */ nop -/* 089E84 80089284 45020005 */ bc1fl .L8008929C -/* 089E88 80089288 44819800 */ mtc1 $at, $f19 -/* 089E8C 8008928C 3C01800F */ lui $at, %hi(D_800EF4CC) # 0x800F0000 # -0.000000 -/* 089E90 80089290 1000000C */ b .L800892C4 -/* 089E94 80089294 C420F4CC */ lwc1 $f0, %lo(D_800EF4CC)($at) -/* 089E98 80089298 44819800 */ mtc1 $at, $f19 -.L8008929C: -/* 089E9C 8008929C 44809000 */ mtc1 $zero, $f18 -/* 089EA0 800892A0 3C01800F */ lui $at, %hi(D_800EF4D0) # 0x800f -/* 089EA4 800892A4 4632003E */ c.le.d $f0, $f18 -/* 089EA8 800892A8 00000000 */ nop -/* 089EAC 800892AC 45000004 */ bc1f .L800892C0 -/* 089EB0 800892B0 00000000 */ nop -/* 089EB4 800892B4 3C01800F */ lui $at, %hi(D_800EF4D4) # $at, 0x800f -/* 089EB8 800892B8 10000002 */ b .L800892C4 -/* 089EBC 800892BC C420F4D0 */ lwc1 $f0, %lo(D_800EF4D0)($at) -.L800892C0: -/* 089EC0 800892C0 C420F4D4 */ lwc1 $f0, %lo(D_800EF4D4)($at) -.L800892C4: -/* 089EC4 800892C4 44060000 */ mfc1 $a2, $f0 -.L800892C8: -/* 089EC8 800892C8 0C0104EE */ jal f32_step_towards -/* 089ECC 800892CC 00E02025 */ move $a0, $a3 -/* 089ED0 800892D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 089ED4 800892D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 089ED8 800892D8 03E00008 */ jr $ra -/* 089EDC 800892DC 00000000 */ nop diff --git a/asm/non_matchings/code_80086E70/func_80089474.s b/asm/non_matchings/code_80086E70/func_80089474.s index 44b4ba2bb..3e94b2cb4 100644 --- a/asm/non_matchings/code_80086E70/func_80089474.s +++ b/asm/non_matchings/code_80086E70/func_80089474.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF4D8 +.double 1.1 + +.section .text + glabel func_80089474 /* 08A074 80089474 000578C0 */ sll $t7, $a1, 3 /* 08A078 80089478 01E57823 */ subu $t7, $t7, $a1 diff --git a/asm/non_matchings/code_80086E70/func_80089820.s b/asm/non_matchings/code_80086E70/func_80089820.s index ad3408a57..21569b0d7 100644 --- a/asm/non_matchings/code_80086E70/func_80089820.s +++ b/asm/non_matchings/code_80086E70/func_80089820.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF4E0 +.double 1.1 + +.section .text + glabel func_80089820 /* 08A420 80089820 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 08A424 80089824 AFB00038 */ sw $s0, 0x38($sp) diff --git a/asm/non_matchings/code_80086E70/func_80089A04.s b/asm/non_matchings/code_80086E70/func_80089A04.s index d0acab209..5641c130d 100644 --- a/asm/non_matchings/code_80086E70/func_80089A04.s +++ b/asm/non_matchings/code_80086E70/func_80089A04.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF4E8 +.double 1.1 + +.section .text + glabel func_80089A04 /* 08A604 80089A04 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 08A608 80089A08 AFB00030 */ sw $s0, 0x30($sp) diff --git a/asm/non_matchings/code_80086E70/func_8008A6DC.s b/asm/non_matchings/code_80086E70/func_8008A6DC.s deleted file mode 100644 index 3aa8cec31..000000000 --- a/asm/non_matchings/code_80086E70/func_8008A6DC.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_8008A6DC -/* 08B2DC 8008A6DC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 08B2E0 8008A6E0 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 08B2E4 8008A6E4 4485C000 */ mtc1 $a1, $f24 -/* 08B2E8 8008A6E8 AFBF004C */ sw $ra, 0x4c($sp) -/* 08B2EC 8008A6EC AFB00030 */ sw $s0, 0x30($sp) -/* 08B2F0 8008A6F0 00808025 */ move $s0, $a0 -/* 08B2F4 8008A6F4 AFB60048 */ sw $s6, 0x48($sp) -/* 08B2F8 8008A6F8 AFB50044 */ sw $s5, 0x44($sp) -/* 08B2FC 8008A6FC AFB40040 */ sw $s4, 0x40($sp) -/* 08B300 8008A700 AFB3003C */ sw $s3, 0x3c($sp) -/* 08B304 8008A704 AFB20038 */ sw $s2, 0x38($sp) -/* 08B308 8008A708 AFB10034 */ sw $s1, 0x34($sp) -/* 08B30C 8008A70C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 08B310 8008A710 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08B314 8008A714 0C01C87A */ jal func_800721E8 -/* 08B318 8008A718 3C050006 */ lui $a1, 6 -/* 08B31C 8008A71C 3C16800E */ lui $s6, %hi(gPlayerCountSelection1) # $s6, 0x800e -/* 08B320 8008A720 26D6C538 */ addiu $s6, %lo(gPlayerCountSelection1) # addiu $s6, $s6, -0x3ac8 -/* 08B324 8008A724 8ECE0000 */ lw $t6, ($s6) -/* 08B328 8008A728 3C11800E */ lui $s1, %hi(camera1) # $s1, 0x800e -/* 08B32C 8008A72C 8E31DB40 */ lw $s1, %lo(camera1)($s1) -/* 08B330 8008A730 19C0002A */ blez $t6, .L8008A7DC -/* 08B334 8008A734 00009025 */ move $s2, $zero -/* 08B338 8008A738 001078C0 */ sll $t7, $s0, 3 -/* 08B33C 8008A73C 01F07823 */ subu $t7, $t7, $s0 -/* 08B340 8008A740 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08B344 8008A744 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08B348 8008A748 000F7940 */ sll $t7, $t7, 5 -/* 08B34C 8008A74C 3C01800F */ lui $at, %hi(D_800EF4F0) -/* 08B350 8008A750 D436F4F0 */ ldc1 $f22, %lo(D_800EF4F0)($at) -/* 08B354 8008A754 01F89821 */ addu $s3, $t7, $t8 -/* 08B358 8008A758 3C150004 */ lui $s5, 4 -/* 08B35C 8008A75C 3C140002 */ lui $s4, 2 -/* 08B360 8008A760 867900A6 */ lh $t9, 0xa6($s3) -.L8008A764: -/* 08B364 8008A764 02002025 */ move $a0, $s0 -/* 08B368 8008A768 53200017 */ beql $t9, $zero, .L8008A7C8 -/* 08B36C 8008A76C 8EC80000 */ lw $t0, ($s6) -/* 08B370 8008A770 4406C000 */ mfc1 $a2, $f24 -/* 08B374 8008A774 0C0222EE */ jal func_80088BB8 -/* 08B378 8008A778 02202825 */ move $a1, $s1 -/* 08B37C 8008A77C 10400011 */ beqz $v0, .L8008A7C4 -/* 08B380 8008A780 02002025 */ move $a0, $s0 -/* 08B384 8008A784 02802825 */ move $a1, $s4 -/* 08B388 8008A788 0C01C870 */ jal func_800721C0 -/* 08B38C 8008A78C 4600C521 */ cvt.d.s $f20, $f24 -/* 08B390 8008A790 4636A03E */ c.le.d $f20, $f22 -/* 08B394 8008A794 24062AAB */ li $a2, 10923 -/* 08B398 8008A798 02002025 */ move $a0, $s0 -/* 08B39C 8008A79C 45000003 */ bc1f .L8008A7AC -/* 08B3A0 8008A7A0 00000000 */ nop -/* 08B3A4 8008A7A4 10000001 */ b .L8008A7AC -/* 08B3A8 8008A7A8 24064000 */ li $a2, 16384 -.L8008A7AC: -/* 08B3AC 8008A7AC 0C022850 */ jal func_8008A140 -/* 08B3B0 8008A7B0 02202825 */ move $a1, $s1 -/* 08B3B4 8008A7B4 10400003 */ beqz $v0, .L8008A7C4 -/* 08B3B8 8008A7B8 02002025 */ move $a0, $s0 -/* 08B3BC 8008A7BC 0C01C870 */ jal func_800721C0 -/* 08B3C0 8008A7C0 02A02825 */ move $a1, $s5 -.L8008A7C4: -/* 08B3C4 8008A7C4 8EC80000 */ lw $t0, ($s6) -.L8008A7C8: -/* 08B3C8 8008A7C8 26520001 */ addiu $s2, $s2, 1 -/* 08B3CC 8008A7CC 263100B8 */ addiu $s1, $s1, 0xb8 -/* 08B3D0 8008A7D0 0248082A */ slt $at, $s2, $t0 -/* 08B3D4 8008A7D4 5420FFE3 */ bnel $at, $zero, .L8008A764 -/* 08B3D8 8008A7D8 867900A6 */ lh $t9, 0xa6($s3) -.L8008A7DC: -/* 08B3DC 8008A7DC 8FBF004C */ lw $ra, 0x4c($sp) -/* 08B3E0 8008A7E0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 08B3E4 8008A7E4 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 08B3E8 8008A7E8 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 08B3EC 8008A7EC 8FB00030 */ lw $s0, 0x30($sp) -/* 08B3F0 8008A7F0 8FB10034 */ lw $s1, 0x34($sp) -/* 08B3F4 8008A7F4 8FB20038 */ lw $s2, 0x38($sp) -/* 08B3F8 8008A7F8 8FB3003C */ lw $s3, 0x3c($sp) -/* 08B3FC 8008A7FC 8FB40040 */ lw $s4, 0x40($sp) -/* 08B400 8008A800 8FB50044 */ lw $s5, 0x44($sp) -/* 08B404 8008A804 8FB60048 */ lw $s6, 0x48($sp) -/* 08B408 8008A808 03E00008 */ jr $ra -/* 08B40C 8008A80C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_80086E70/func_8008ACE0.s b/asm/non_matchings/code_80086E70/func_8008ACE0.s index 8dbe56387..93e4e1445 100644 --- a/asm/non_matchings/code_80086E70/func_8008ACE0.s +++ b/asm/non_matchings/code_80086E70/func_8008ACE0.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EF4F8 +.double 0.6666666666666666 + +glabel D_800EF500 +.double 0.16666666666666666 + +.section .text + glabel func_8008ACE0 /* 08B8E0 8008ACE0 44856000 */ mtc1 $a1, $f12 /* 08B8E4 8008ACE4 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 diff --git a/asm/non_matchings/code_80086E70/func_8008B478.s b/asm/non_matchings/code_80086E70/func_8008B478.s index 42de14fb5..5a5de5d14 100644 --- a/asm/non_matchings/code_80086E70/func_8008B478.s +++ b/asm/non_matchings/code_80086E70/func_8008B478.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EF508 +.double 10000.0 + +glabel D_800EF510 +.double 10000.0 + +.section .text + glabel func_8008B478 /* 08C078 8008B478 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 08C07C 8008B47C AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80086E70/func_8008BFFC.s b/asm/non_matchings/code_80086E70/func_8008BFFC.s index 70e13c406..11af6fc79 100644 --- a/asm/non_matchings/code_80086E70/func_8008BFFC.s +++ b/asm/non_matchings/code_80086E70/func_8008BFFC.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_800EF518 +.word L8008C1A8, L8008C040, L8008C060, L8008C088 +.word L8008C0B0, L8008C0F8, L8008C140, L8008C168 + +.section .text + glabel func_8008BFFC /* 08CBFC 8008BFFC 000470C0 */ sll $t6, $a0, 3 /* 08CC00 8008C000 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_8008C1D0/func_8008CEB0.s b/asm/non_matchings/code_8008C1D0/func_8008CEB0.s index 7bc92c6a7..82a1da22a 100644 --- a/asm/non_matchings/code_8008C1D0/func_8008CEB0.s +++ b/asm/non_matchings/code_8008C1D0/func_8008CEB0.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_800EF540 +.double 0.2 + +glabel D_800EF548 +.double 0.8 + +.section .text + glabel func_8008CEB0 /* 08DAB0 8008CEB0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 08DAB4 8008CEB4 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_8008C1D0/func_8008D170.s b/asm/non_matchings/code_8008C1D0/func_8008D170.s index 132fd7d40..3b3e6745f 100644 --- a/asm/non_matchings/code_8008C1D0/func_8008D170.s +++ b/asm/non_matchings/code_8008C1D0/func_8008D170.s @@ -1,3 +1,16 @@ +.section .late_rodata + +glabel D_800EF550 +.double 0.1 + +glabel D_800EF558 +.double 0.9 + +glabel D_800EF560 +.double 1.3 + +.section .text + glabel func_8008D170 /* 08DD70 8008D170 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 08DD74 8008D174 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_8008C1D0/func_8008E118.s b/asm/non_matchings/code_8008C1D0/func_8008E118.s deleted file mode 100644 index 1824e7d65..000000000 --- a/asm/non_matchings/code_8008C1D0/func_8008E118.s +++ /dev/null @@ -1,178 +0,0 @@ -glabel func_8008E118 -/* 08ED18 8008E118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 08ED1C 8008E11C AFBF001C */ sw $ra, 0x1c($sp) -/* 08ED20 8008E120 AFB00018 */ sw $s0, 0x18($sp) -/* 08ED24 8008E124 AFA50024 */ sw $a1, 0x24($sp) -/* 08ED28 8008E128 8C8200BC */ lw $v0, 0xbc($a0) -/* 08ED2C 8008E12C 00053600 */ sll $a2, $a1, 0x18 -/* 08ED30 8008E130 00067603 */ sra $t6, $a2, 0x18 -/* 08ED34 8008E134 34018000 */ li $at, 32768 -/* 08ED38 8008E138 304F8000 */ andi $t7, $v0, 0x8000 -/* 08ED3C 8008E13C 01C03025 */ move $a2, $t6 -/* 08ED40 8008E140 15E10023 */ bne $t7, $at, .L8008E1D0 -/* 08ED44 8008E144 00808025 */ move $s0, $a0 -/* 08ED48 8008E148 3C030400 */ lui $v1, 0x400 -/* 08ED4C 8008E14C 0043C024 */ and $t8, $v0, $v1 -/* 08ED50 8008E150 1078001F */ beq $v1, $t8, .L8008E1D0 -/* 08ED54 8008E154 3C01FFFD */ lui $at, (0xFFFDFFFF >> 16) # lui $at, 0xfffd -/* 08ED58 8008E158 848800AE */ lh $t0, 0xae($a0) -/* 08ED5C 8008E15C 3421FFFF */ ori $at, (0xFFFDFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 08ED60 8008E160 0041C824 */ and $t9, $v0, $at -/* 08ED64 8008E164 000E2E00 */ sll $a1, $t6, 0x18 -/* 08ED68 8008E168 AC9900BC */ sw $t9, 0xbc($a0) -/* 08ED6C 8008E16C A48000A8 */ sh $zero, 0xa8($a0) -/* 08ED70 8008E170 AC80007C */ sw $zero, 0x7c($a0) -/* 08ED74 8008E174 A48000C0 */ sh $zero, 0xc0($a0) -/* 08ED78 8008E178 00054E03 */ sra $t1, $a1, 0x18 -/* 08ED7C 8008E17C A488002E */ sh $t0, 0x2e($a0) -/* 08ED80 8008E180 A3AE0027 */ sb $t6, 0x27($sp) -/* 08ED84 8008E184 0C0238F0 */ jal func_8008E3C0 -/* 08ED88 8008E188 01202825 */ move $a1, $t1 -/* 08ED8C 8008E18C 83A60027 */ lb $a2, 0x27($sp) -/* 08ED90 8008E190 3C0B8016 */ lui $t3, %hi(D_80165190) # $t3, 0x8016 -/* 08ED94 8008E194 256B5190 */ addiu $t3, %lo(D_80165190) # addiu $t3, $t3, 0x5190 -/* 08ED98 8008E198 00065040 */ sll $t2, $a2, 1 -/* 08ED9C 8008E19C 24030001 */ li $v1, 1 -/* 08EDA0 8008E1A0 014B1021 */ addu $v0, $t2, $t3 -/* 08EDA4 8008E1A4 00062E00 */ sll $a1, $a2, 0x18 -/* 08EDA8 8008E1A8 00056603 */ sra $t4, $a1, 0x18 -/* 08EDAC 8008E1AC A4430000 */ sh $v1, ($v0) -/* 08EDB0 8008E1B0 A4430010 */ sh $v1, 0x10($v0) -/* 08EDB4 8008E1B4 A4430020 */ sh $v1, 0x20($v0) -/* 08EDB8 8008E1B8 A4430030 */ sh $v1, 0x30($v0) -/* 08EDBC 8008E1BC 01802825 */ move $a1, $t4 -/* 08EDC0 8008E1C0 0C0236AF */ jal func_8008DABC -/* 08EDC4 8008E1C4 02002025 */ move $a0, $s0 -/* 08EDC8 8008E1C8 10000079 */ b .L8008E3B0 -/* 08EDCC 8008E1CC 8FBF001C */ lw $ra, 0x1c($sp) -.L8008E1D0: -/* 08EDD0 8008E1D0 3C030002 */ lui $v1, 2 -/* 08EDD4 8008E1D4 00436824 */ and $t5, $v0, $v1 -/* 08EDD8 8008E1D8 146D002D */ bne $v1, $t5, .L8008E290 -/* 08EDDC 8008E1DC 00062040 */ sll $a0, $a2, 1 -/* 08EDE0 8008E1E0 860E002E */ lh $t6, 0x2e($s0) -/* 08EDE4 8008E1E4 3C188019 */ lui $t8, %hi(D_8018D920) # $t8, 0x8019 -/* 08EDE8 8008E1E8 2718D920 */ addiu $t8, %lo(D_8018D920) # addiu $t8, $t8, -0x26e0 -/* 08EDEC 8008E1EC 25CFFA50 */ addiu $t7, $t6, -0x5b0 -/* 08EDF0 8008E1F0 A60F002E */ sh $t7, 0x2e($s0) -/* 08EDF4 8008E1F4 00981021 */ addu $v0, $a0, $t8 -/* 08EDF8 8008E1F8 84590000 */ lh $t9, ($v0) -/* 08EDFC 8008E1FC 240105B0 */ li $at, 1456 -/* 08EE00 8008E200 3C053F80 */ lui $a1, 0x3f80 -/* 08EE04 8008E204 2728FA50 */ addiu $t0, $t9, -0x5b0 -/* 08EE08 8008E208 3103FFFF */ andi $v1, $t0, 0xffff -/* 08EE0C 8008E20C 0061001A */ div $zero, $v1, $at -/* 08EE10 8008E210 00004812 */ mflo $t1 -/* 08EE14 8008E214 00095400 */ sll $t2, $t1, 0x10 -/* 08EE18 8008E218 000A5C03 */ sra $t3, $t2, 0x10 -/* 08EE1C 8008E21C 15600018 */ bnez $t3, .L8008E280 -/* 08EE20 8008E220 A4480000 */ sh $t0, ($v0) -/* 08EE24 8008E224 860C00B2 */ lh $t4, 0xb2($s0) -/* 08EE28 8008E228 3C01FFFD */ lui $at, (0xFFFDFFFF >> 16) # lui $at, 0xfffd -/* 08EE2C 8008E22C 3C088016 */ lui $t0, %hi(D_80165190) # $t0, 0x8016 -/* 08EE30 8008E230 258DFFFF */ addiu $t5, $t4, -1 -/* 08EE34 8008E234 A60D00B2 */ sh $t5, 0xb2($s0) -/* 08EE38 8008E238 860E00B2 */ lh $t6, 0xb2($s0) -/* 08EE3C 8008E23C 24030001 */ li $v1, 1 -/* 08EE40 8008E240 3421FFFF */ ori $at, (0xFFFDFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 08EE44 8008E244 1DC0000E */ bgtz $t6, .L8008E280 -/* 08EE48 8008E248 25085190 */ addiu $t0, %lo(D_80165190) # addiu $t0, $t0, 0x5190 -/* 08EE4C 8008E24C 8E0F00BC */ lw $t7, 0xbc($s0) -/* 08EE50 8008E250 861900AE */ lh $t9, 0xae($s0) -/* 08EE54 8008E254 A60000A8 */ sh $zero, 0xa8($s0) -/* 08EE58 8008E258 01E1C024 */ and $t8, $t7, $at -/* 08EE5C 8008E25C AE1800BC */ sw $t8, 0xbc($s0) -/* 08EE60 8008E260 AE00007C */ sw $zero, 0x7c($s0) -/* 08EE64 8008E264 A60000C0 */ sh $zero, 0xc0($s0) -/* 08EE68 8008E268 00881021 */ addu $v0, $a0, $t0 -/* 08EE6C 8008E26C A619002E */ sh $t9, 0x2e($s0) -/* 08EE70 8008E270 A4430000 */ sh $v1, ($v0) -/* 08EE74 8008E274 A4430010 */ sh $v1, 0x10($v0) -/* 08EE78 8008E278 A4430020 */ sh $v1, 0x20($v0) -/* 08EE7C 8008E27C A4430030 */ sh $v1, 0x30($v0) -.L8008E280: -/* 08EE80 8008E280 0C00C7D2 */ jal func_80031F48 -/* 08EE84 8008E284 02002025 */ move $a0, $s0 -/* 08EE88 8008E288 10000049 */ b .L8008E3B0 -/* 08EE8C 8008E28C 8FBF001C */ lw $ra, 0x1c($sp) -.L8008E290: -/* 08EE90 8008E290 860900B0 */ lh $t1, 0xb0($s0) -/* 08EE94 8008E294 C604008C */ lwc1 $f4, 0x8c($s0) -/* 08EE98 8008E298 3C01800F */ lui $at, %hi(D_800EF590) -/* 08EE9C 8008E29C 252A0001 */ addiu $t2, $t1, 1 -/* 08EEA0 8008E2A0 A60A00B0 */ sh $t2, 0xb0($s0) -/* 08EEA4 8008E2A4 D428F590 */ ldc1 $f8, %lo(D_800EF590)($at) -/* 08EEA8 8008E2A8 460021A1 */ cvt.d.s $f6, $f4 -/* 08EEAC 8008E2AC 860200B0 */ lh $v0, 0xb0($s0) -/* 08EEB0 8008E2B0 46283282 */ mul.d $f10, $f6, $f8 -/* 08EEB4 8008E2B4 24030001 */ li $v1, 1 -/* 08EEB8 8008E2B8 46205420 */ cvt.s.d $f16, $f10 -/* 08EEBC 8008E2BC 1462000F */ bne $v1, $v0, .L8008E2FC -/* 08EEC0 8008E2C0 E610008C */ swc1 $f16, 0x8c($s0) -/* 08EEC4 8008E2C4 960B0000 */ lhu $t3, ($s0) -/* 08EEC8 8008E2C8 30C400FF */ andi $a0, $a2, 0xff -/* 08EECC 8008E2CC 3C012900 */ lui $at, (0x29008005 >> 16) # lui $at, 0x2900 -/* 08EED0 8008E2D0 316C4000 */ andi $t4, $t3, 0x4000 -/* 08EED4 8008E2D4 11800009 */ beqz $t4, .L8008E2FC -/* 08EED8 8008E2D8 00000000 */ nop -/* 08EEDC 8008E2DC 96050254 */ lhu $a1, 0x254($s0) -/* 08EEE0 8008E2E0 34218005 */ ori $at, (0x29008005 & 0xFFFF) # ori $at, $at, 0x8005 -/* 08EEE4 8008E2E4 A3A60027 */ sb $a2, 0x27($sp) -/* 08EEE8 8008E2E8 00056900 */ sll $t5, $a1, 4 -/* 08EEEC 8008E2EC 0C03243D */ jal func_800C90F4 -/* 08EEF0 8008E2F0 01A12821 */ addu $a1, $t5, $at -/* 08EEF4 8008E2F4 83A60027 */ lb $a2, 0x27($sp) -/* 08EEF8 8008E2F8 860200B0 */ lh $v0, 0xb0($s0) -.L8008E2FC: -/* 08EEFC 8008E2FC 0440001A */ bltz $v0, .L8008E368 -/* 08EF00 8008E300 284101CC */ slti $at, $v0, 0x1cc -/* 08EF04 8008E304 10200018 */ beqz $at, .L8008E368 -/* 08EF08 8008E308 26040224 */ addiu $a0, $s0, 0x224 -/* 08EF0C 8008E30C 3C053F33 */ lui $a1, (0x3F333333 >> 16) # lui $a1, 0x3f33 -/* 08EF10 8008E310 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc -/* 08EF14 8008E314 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 08EF18 8008E318 0C008973 */ jal move_f32_towards -/* 08EF1C 8008E31C 34A53333 */ ori $a1, (0x3F333333 & 0xFFFF) # ori $a1, $a1, 0x3333 -/* 08EF20 8008E320 960E0254 */ lhu $t6, 0x254($s0) -/* 08EF24 8008E324 3C01800E */ lui $at, %hi(gKartBoundingBoxSizeTable) -/* 08EF28 8008E328 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc -/* 08EF2C 8008E32C 000E7880 */ sll $t7, $t6, 2 -/* 08EF30 8008E330 002F0821 */ addu $at, $at, $t7 -/* 08EF34 8008E334 C43226B0 */ lwc1 $f18, %lo(gKartBoundingBoxSizeTable)($at) -/* 08EF38 8008E338 3C01800F */ lui $at, %hi(D_800EF598) -/* 08EF3C 8008E33C D426F598 */ ldc1 $f6, %lo(D_800EF598)($at) -/* 08EF40 8008E340 46009121 */ cvt.d.s $f4, $f18 -/* 08EF44 8008E344 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 08EF48 8008E348 46262202 */ mul.d $f8, $f4, $f6 -/* 08EF4C 8008E34C 26040070 */ addiu $a0, $s0, 0x70 -/* 08EF50 8008E350 462042A0 */ cvt.s.d $f10, $f8 -/* 08EF54 8008E354 44055000 */ mfc1 $a1, $f10 -/* 08EF58 8008E358 0C008973 */ jal move_f32_towards -/* 08EF5C 8008E35C 00000000 */ nop -/* 08EF60 8008E360 10000013 */ b .L8008E3B0 -/* 08EF64 8008E364 8FBF001C */ lw $ra, 0x1c($sp) -.L8008E368: -/* 08EF68 8008E368 00062E00 */ sll $a1, $a2, 0x18 -/* 08EF6C 8008E36C 0005C603 */ sra $t8, $a1, 0x18 -/* 08EF70 8008E370 03002825 */ move $a1, $t8 -/* 08EF74 8008E374 02002025 */ move $a0, $s0 -/* 08EF78 8008E378 0C0238F0 */ jal func_8008E3C0 -/* 08EF7C 8008E37C A3A60027 */ sb $a2, 0x27($sp) -/* 08EF80 8008E380 96190000 */ lhu $t9, ($s0) -/* 08EF84 8008E384 83A60027 */ lb $a2, 0x27($sp) -/* 08EF88 8008E388 33284000 */ andi $t0, $t9, 0x4000 -/* 08EF8C 8008E38C 11000007 */ beqz $t0, .L8008E3AC -/* 08EF90 8008E390 30C400FF */ andi $a0, $a2, 0xff -/* 08EF94 8008E394 96050254 */ lhu $a1, 0x254($s0) -/* 08EF98 8008E398 3C012900 */ lui $at, (0x29008008 >> 16) # lui $at, 0x2900 -/* 08EF9C 8008E39C 34218008 */ ori $at, (0x29008008 & 0xFFFF) # ori $at, $at, 0x8008 -/* 08EFA0 8008E3A0 00054900 */ sll $t1, $a1, 4 -/* 08EFA4 8008E3A4 0C03243D */ jal func_800C90F4 -/* 08EFA8 8008E3A8 01212821 */ addu $a1, $t1, $at -.L8008E3AC: -/* 08EFAC 8008E3AC 8FBF001C */ lw $ra, 0x1c($sp) -.L8008E3B0: -/* 08EFB0 8008E3B0 8FB00018 */ lw $s0, 0x18($sp) -/* 08EFB4 8008E3B4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 08EFB8 8008E3B8 03E00008 */ jr $ra -/* 08EFBC 8008E3BC 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_8008FF08.s b/asm/non_matchings/code_8008C1D0/func_8008FF08.s deleted file mode 100644 index 5a8b90145..000000000 --- a/asm/non_matchings/code_8008C1D0/func_8008FF08.s +++ /dev/null @@ -1,186 +0,0 @@ -glabel func_8008FF08 -/* 090B08 8008FF08 3C18800E */ lui $t8, %hi(gCurrentCourseId) # $t8, 0x800e -/* 090B0C 8008FF0C 8718C5A0 */ lh $t8, %lo(gCurrentCourseId)($t8) -/* 090B10 8008FF10 AFA50004 */ sw $a1, 4($sp) -/* 090B14 8008FF14 00057600 */ sll $t6, $a1, 0x18 -/* 090B18 8008FF18 2719FFFE */ addiu $t9, $t8, -2 -/* 090B1C 8008FF1C 2F210012 */ sltiu $at, $t9, 0x12 -/* 090B20 8008FF20 10200087 */ beqz $at, .L80090140 -/* 090B24 8008FF24 000E2E03 */ sra $a1, $t6, 0x18 -/* 090B28 8008FF28 0019C880 */ sll $t9, $t9, 2 -/* 090B2C 8008FF2C 3C01800F */ lui $at, %hi(jpt_800EF5B0) -/* 090B30 8008FF30 00390821 */ addu $at, $at, $t9 -/* 090B34 8008FF34 8C39F5B0 */ lw $t9, %lo(jpt_800EF5B0)($at) -/* 090B38 8008FF38 03200008 */ jr $t9 -/* 090B3C 8008FF3C 00000000 */ nop -glabel L8008FF40 -/* 090B40 8008FF40 00054040 */ sll $t0, $a1, 1 -/* 090B44 8008FF44 3C038016 */ lui $v1, %hi(gNearestWaypointByPlayerId) # 0x8016 -/* 090B48 8008FF48 00681821 */ addu $v1, $v1, $t0 -/* 090B4C 8008FF4C 94634438 */ lhu $v1, %lo(gNearestWaypointByPlayerId)($v1) # 0x4438($v1) -/* 090B50 8008FF50 00031400 */ sll $v0, $v1, 0x10 -/* 090B54 8008FF54 00024C03 */ sra $t1, $v0, 0x10 -/* 090B58 8008FF58 29210235 */ slti $at, $t1, 0x235 -/* 090B5C 8008FF5C 14200006 */ bnez $at, .L8008FF78 -/* 090B60 8008FF60 01201025 */ move $v0, $t1 -/* 090B64 8008FF64 29210247 */ slti $at, $t1, 0x247 -/* 090B68 8008FF68 10200003 */ beqz $at, .L8008FF78 -/* 090B6C 8008FF6C 240A0214 */ li $t2, 532 -/* 090B70 8008FF70 03E00008 */ jr $ra -/* 090B74 8008FF74 A48A0220 */ sh $t2, 0x220($a0) - -.L8008FF78: -/* 090B78 8008FF78 28410267 */ slti $at, $v0, 0x267 -/* 090B7C 8008FF7C 14200005 */ bnez $at, .L8008FF94 -/* 090B80 8008FF80 28410277 */ slti $at, $v0, 0x277 -/* 090B84 8008FF84 10200003 */ beqz $at, .L8008FF94 -/* 090B88 8008FF88 240B025B */ li $t3, 603 -/* 090B8C 8008FF8C 03E00008 */ jr $ra -/* 090B90 8008FF90 A48B0220 */ sh $t3, 0x220($a0) - -.L8008FF94: -/* 090B94 8008FF94 A4830220 */ sh $v1, 0x220($a0) -/* 090B98 8008FF98 84820220 */ lh $v0, 0x220($a0) -/* 090B9C 8008FF9C 3C0C8016 */ lui $t4, %hi(gWaypointCountByPathIndex) # $t4, 0x8016 -/* 090BA0 8008FFA0 04410073 */ bgez $v0, .L80090170 -/* 090BA4 8008FFA4 00000000 */ nop -/* 090BA8 8008FFA8 958C45C8 */ lhu $t4, %lo(gWaypointCountByPathIndex)($t4) -/* 090BAC 8008FFAC 01826821 */ addu $t5, $t4, $v0 -/* 090BB0 8008FFB0 03E00008 */ jr $ra -/* 090BB4 8008FFB4 A48D0220 */ sh $t5, 0x220($a0) - -glabel L8008FFB8 -/* 090BB8 8008FFB8 00057040 */ sll $t6, $a1, 1 -/* 090BBC 8008FFBC 3C038016 */ lui $v1, %hi(gNearestWaypointByPlayerId) # 0x8016 -/* 090BC0 8008FFC0 006E1821 */ addu $v1, $v1, $t6 -/* 090BC4 8008FFC4 94634438 */ lhu $v1, %lo(gNearestWaypointByPlayerId)($v1) # 0x4438($v1) -/* 090BC8 8008FFC8 00031400 */ sll $v0, $v1, 0x10 -/* 090BCC 8008FFCC 00027C03 */ sra $t7, $v0, 0x10 -/* 090BD0 8008FFD0 29E1012C */ slti $at, $t7, 0x12c -/* 090BD4 8008FFD4 14200005 */ bnez $at, .L8008FFEC -/* 090BD8 8008FFD8 29E1013C */ slti $at, $t7, 0x13c -/* 090BDC 8008FFDC 10200003 */ beqz $at, .L8008FFEC -/* 090BE0 8008FFE0 2418012C */ li $t8, 300 -/* 090BE4 8008FFE4 03E00008 */ jr $ra -/* 090BE8 8008FFE8 A4980220 */ sh $t8, 0x220($a0) - -.L8008FFEC: -/* 090BEC 8008FFEC A4830220 */ sh $v1, 0x220($a0) -/* 090BF0 8008FFF0 84820220 */ lh $v0, 0x220($a0) -/* 090BF4 8008FFF4 3C198016 */ lui $t9, %hi(gWaypointCountByPathIndex) # $t9, 0x8016 -/* 090BF8 8008FFF8 0441005D */ bgez $v0, .L80090170 -/* 090BFC 8008FFFC 00000000 */ nop -/* 090C00 80090000 973945C8 */ lhu $t9, %lo(gWaypointCountByPathIndex)($t9) -/* 090C04 80090004 03224021 */ addu $t0, $t9, $v0 -/* 090C08 80090008 03E00008 */ jr $ra -/* 090C0C 8009000C A4880220 */ sh $t0, 0x220($a0) - -glabel L80090010 -/* 090C10 80090010 00054840 */ sll $t1, $a1, 1 -/* 090C14 80090014 3C0A8016 */ lui $t2, %hi(D_80165320) # 0x8016 -/* 090C18 80090018 01495021 */ addu $t2, $t2, $t1 -/* 090C1C 8009001C 854A5320 */ lh $t2, %lo(D_80165320)($t2) # 0x5320($t2) -/* 090C20 80090020 03E00008 */ jr $ra -/* 090C24 80090024 A48A0220 */ sh $t2, 0x220($a0) - -glabel L80090028 -/* 090C28 80090028 00051840 */ sll $v1, $a1, 1 -/* 090C2C 8009002C 3C028016 */ lui $v0, %hi(gNearestWaypointByPlayerId) # 0x8016 -/* 090C30 80090030 00431021 */ addu $v0, $v0, $v1 -/* 090C34 80090034 84424438 */ lh $v0, %lo(gNearestWaypointByPlayerId)($v0) # 0x4438($v0) -/* 090C38 80090038 3C0C8016 */ lui $t4, %hi(D_80165320) # 0x8016 -/* 090C3C 8009003C 01836021 */ addu $t4, $t4, $v1 -/* 090C40 80090040 284100F0 */ slti $at, $v0, 0xf0 -/* 090C44 80090044 14200005 */ bnez $at, .L8009005C -/* 090C48 80090048 28410105 */ slti $at, $v0, 0x105 -/* 090C4C 8009004C 10200003 */ beqz $at, .L8009005C -/* 090C50 80090050 240B00F0 */ li $t3, 240 -/* 090C54 80090054 03E00008 */ jr $ra -/* 090C58 80090058 A48B0220 */ sh $t3, 0x220($a0) - -.L8009005C: -/* 090C5C 8009005C 858C5320 */ lh $t4, %lo(D_80165320)($t4) # 0x5320($t4) -/* 090C60 80090060 3C0D8016 */ lui $t5, %hi(gWaypointCountByPathIndex) # $t5, 0x8016 -/* 090C64 80090064 A48C0220 */ sh $t4, 0x220($a0) -/* 090C68 80090068 84820220 */ lh $v0, 0x220($a0) -/* 090C6C 8009006C 04410040 */ bgez $v0, .L80090170 -/* 090C70 80090070 00000000 */ nop -/* 090C74 80090074 95AD45C8 */ lhu $t5, %lo(gWaypointCountByPathIndex)($t5) -/* 090C78 80090078 01A27021 */ addu $t6, $t5, $v0 -/* 090C7C 8009007C 03E00008 */ jr $ra -/* 090C80 80090080 A48E0220 */ sh $t6, 0x220($a0) - -glabel L80090084 -/* 090C84 80090084 00051840 */ sll $v1, $a1, 1 -/* 090C88 80090088 3C028016 */ lui $v0, %hi(gNearestWaypointByPlayerId) # 0x8016 -/* 090C8C 8009008C 00431021 */ addu $v0, $v0, $v1 -/* 090C90 80090090 84424438 */ lh $v0, %lo(gNearestWaypointByPlayerId)($v0) # 0x4438($v0) -/* 090C94 80090094 3C188016 */ lui $t8, %hi(D_80165320) # 0x8016 -/* 090C98 80090098 0303C021 */ addu $t8, $t8, $v1 -/* 090C9C 8009009C 28410258 */ slti $at, $v0, 0x258 -/* 090CA0 800900A0 14200005 */ bnez $at, .L800900B8 -/* 090CA4 800900A4 284102A4 */ slti $at, $v0, 0x2a4 -/* 090CA8 800900A8 10200003 */ beqz $at, .L800900B8 -/* 090CAC 800900AC 240F0258 */ li $t7, 600 -/* 090CB0 800900B0 03E00008 */ jr $ra -/* 090CB4 800900B4 A48F0220 */ sh $t7, 0x220($a0) - -.L800900B8: -/* 090CB8 800900B8 87185320 */ lh $t8, %lo(D_80165320)($t8) # 0x5320($t8) -/* 090CBC 800900BC 3C198016 */ lui $t9, %hi(gWaypointCountByPathIndex) # $t9, 0x8016 -/* 090CC0 800900C0 A4980220 */ sh $t8, 0x220($a0) -/* 090CC4 800900C4 84820220 */ lh $v0, 0x220($a0) -/* 090CC8 800900C8 04410029 */ bgez $v0, .L80090170 -/* 090CCC 800900CC 00000000 */ nop -/* 090CD0 800900D0 973945C8 */ lhu $t9, %lo(gWaypointCountByPathIndex)($t9) -/* 090CD4 800900D4 03224021 */ addu $t0, $t9, $v0 -/* 090CD8 800900D8 03E00008 */ jr $ra -/* 090CDC 800900DC A4880220 */ sh $t0, 0x220($a0) - -glabel L800900E0 -/* 090CE0 800900E0 00054840 */ sll $t1, $a1, 1 -/* 090CE4 800900E4 3C038016 */ lui $v1, %hi(gNearestWaypointByPlayerId) # 0x8016 -/* 090CE8 800900E8 00691821 */ addu $v1, $v1, $t1 -/* 090CEC 800900EC 94634438 */ lhu $v1, %lo(gNearestWaypointByPlayerId)($v1) # 0x4438($v1) -/* 090CF0 800900F0 00031400 */ sll $v0, $v1, 0x10 -/* 090CF4 800900F4 00025403 */ sra $t2, $v0, 0x10 -/* 090CF8 800900F8 294100B9 */ slti $at, $t2, 0xb9 -/* 090CFC 800900FC 14200005 */ bnez $at, .L80090114 -/* 090D00 80090100 29410119 */ slti $at, $t2, 0x119 -/* 090D04 80090104 10200003 */ beqz $at, .L80090114 -/* 090D08 80090108 240B00B9 */ li $t3, 185 -/* 090D0C 8009010C 03E00008 */ jr $ra -/* 090D10 80090110 A48B0220 */ sh $t3, 0x220($a0) - -.L80090114: -/* 090D14 80090114 A4830220 */ sh $v1, 0x220($a0) -/* 090D18 80090118 84820220 */ lh $v0, 0x220($a0) -/* 090D1C 8009011C 3C0C8016 */ lui $t4, %hi(gWaypointCountByPathIndex) # $t4, 0x8016 -/* 090D20 80090120 04410013 */ bgez $v0, .L80090170 -/* 090D24 80090124 00000000 */ nop -/* 090D28 80090128 958C45C8 */ lhu $t4, %lo(gWaypointCountByPathIndex)($t4) -/* 090D2C 8009012C 01826821 */ addu $t5, $t4, $v0 -/* 090D30 80090130 03E00008 */ jr $ra -/* 090D34 80090134 A48D0220 */ sh $t5, 0x220($a0) - -glabel L80090138 -/* 090D38 80090138 03E00008 */ jr $ra -/* 090D3C 8009013C A4800220 */ sh $zero, 0x220($a0) - -.L80090140: -glabel L80090140 -/* 090D40 80090140 00057040 */ sll $t6, $a1, 1 -/* 090D44 80090144 3C0F8016 */ lui $t7, %hi(gNearestWaypointByPlayerId) # 0x8016 -/* 090D48 80090148 01EE7821 */ addu $t7, $t7, $t6 -/* 090D4C 8009014C 95EF4438 */ lhu $t7, %lo(gNearestWaypointByPlayerId)($t7) # 0x4438($t7) -/* 090D50 80090150 3C188016 */ lui $t8, %hi(gWaypointCountByPathIndex) # $t8, 0x8016 -/* 090D54 80090154 A48F0220 */ sh $t7, 0x220($a0) -/* 090D58 80090158 84820220 */ lh $v0, 0x220($a0) -/* 090D5C 8009015C 04410004 */ bgez $v0, .L80090170 -/* 090D60 80090160 00000000 */ nop -/* 090D64 80090164 971845C8 */ lhu $t8, %lo(gWaypointCountByPathIndex)($t8) -/* 090D68 80090168 0302C821 */ addu $t9, $t8, $v0 -/* 090D6C 8009016C A4990220 */ sh $t9, 0x220($a0) -.L80090170: -/* 090D70 80090170 03E00008 */ jr $ra -/* 090D74 80090174 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_80090178.s b/asm/non_matchings/code_8008C1D0/func_80090178.s index 77c27f727..40c8824be 100644 --- a/asm/non_matchings/code_8008C1D0/func_80090178.s +++ b/asm/non_matchings/code_8008C1D0/func_80090178.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel jpt_800EF5F8 +.word L80090474, L80090698, L80090698, L80090698 +.word L80090698, L80090698, L80090698, L80090698 +.word L80090698, L80090698, L80090698, L80090580 +.word L800905C4, L8009060C, L80090698, L80090650 + +.section .text + glabel func_80090178 /* 090D78 80090178 27BDFEF0 */ addiu $sp, $sp, -0x110 /* 090D7C 8009017C 3C18800E */ lui $t8, %hi(D_800E6F6C) # $t8, 0x800e diff --git a/asm/non_matchings/code_8008C1D0/func_80090970.s b/asm/non_matchings/code_8008C1D0/func_80090970.s index 934cf3b2b..5564a06d7 100644 --- a/asm/non_matchings/code_8008C1D0/func_80090970.s +++ b/asm/non_matchings/code_8008C1D0/func_80090970.s @@ -1,3 +1,22 @@ +.section .late_rodata + +glabel jpt_800EF638 +.word L800909D0, L80090B80, L80090C84, L80090CDC +.word L80090E08 + +.word 0x00000000 + +glabel D_800EF650 +.double 0.9 + +glabel D_800EF658 +.float 1820.0 + +glabel D_800EF65C +.float -1820.0 + +.section .text + glabel func_80090970 /* 091570 80090970 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 091574 80090974 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_8008C1D0/func_800910E4.s b/asm/non_matchings/code_8008C1D0/func_800910E4.s deleted file mode 100644 index dec75416c..000000000 --- a/asm/non_matchings/code_8008C1D0/func_800910E4.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_800910E4 -/* 091CE4 800910E4 848300CA */ lh $v1, 0xca($a0) -/* 091CE8 800910E8 24010002 */ li $at, 2 -/* 091CEC 800910EC 00001025 */ move $v0, $zero -/* 091CF0 800910F0 306E0002 */ andi $t6, $v1, 2 -/* 091CF4 800910F4 11C1000C */ beq $t6, $at, .L80091128 -/* 091CF8 800910F8 306F0008 */ andi $t7, $v1, 8 -/* 091CFC 800910FC 24010008 */ li $at, 8 -/* 091D00 80091100 11E10009 */ beq $t7, $at, .L80091128 -/* 091D04 80091104 00000000 */ nop -/* 091D08 80091108 94830000 */ lhu $v1, ($a0) -/* 091D0C 8009110C 30780040 */ andi $t8, $v1, 0x40 -/* 091D10 80091110 17000005 */ bnez $t8, .L80091128 -/* 091D14 80091114 30790800 */ andi $t9, $v1, 0x800 -/* 091D18 80091118 17200003 */ bnez $t9, .L80091128 -/* 091D1C 8009111C 30688000 */ andi $t0, $v1, 0x8000 -/* 091D20 80091120 55000004 */ bnel $t0, $zero, .L80091134 -/* 091D24 80091124 84890010 */ lh $t1, 0x10($a0) -.L80091128: -/* 091D28 80091128 03E00008 */ jr $ra -/* 091D2C 8009112C 24020001 */ li $v0, 1 - -/* 091D30 80091130 84890010 */ lh $t1, 0x10($a0) -.L80091134: -/* 091D34 80091134 252AFFF6 */ addiu $t2, $t1, -0xa -/* 091D38 80091138 2D410006 */ sltiu $at, $t2, 6 -/* 091D3C 8009113C 10200015 */ beqz $at, .L80091194 -/* 091D40 80091140 000A5080 */ sll $t2, $t2, 2 -/* 091D44 80091144 3C01800F */ lui $at, %hi(jpt_800EF660) -/* 091D48 80091148 002A0821 */ addu $at, $at, $t2 -/* 091D4C 8009114C 8C2AF660 */ lw $t2, %lo(jpt_800EF660)($at) -/* 091D50 80091150 01400008 */ jr $t2 -/* 091D54 80091154 00000000 */ nop -glabel L80091158 -/* 091D58 80091158 8C8B00BC */ lw $t3, 0xbc($a0) -/* 091D5C 8009115C 3C025F93 */ lui $v0, 0x5f93 -/* 091D60 80091160 316C0008 */ andi $t4, $t3, 8 -/* 091D64 80091164 11800003 */ beqz $t4, .L80091174 -/* 091D68 80091168 00000000 */ nop -/* 091D6C 8009116C 03E00008 */ jr $ra -/* 091D70 80091170 24020001 */ li $v0, 1 - -.L80091174: -/* 091D74 80091174 10000007 */ b .L80091194 -/* 091D78 80091178 34424EC4 */ ori $v0, $v0, 0x4ec4 -glabel L8009117C -/* 091D7C 8009117C 3C02DF93 */ lui $v0, (0xDF934EC4 >> 16) # lui $v0, 0xdf93 -/* 091D80 80091180 34424EC4 */ ori $v0, (0xDF934EC4 & 0xFFFF) # ori $v0, $v0, 0x4ec4 -glabel L80091184 -/* 091D84 80091184 3C01DF93 */ lui $at, (0xDF934EC4 >> 16) # lui $at, 0xdf93 -/* 091D88 80091188 34214EC4 */ ori $at, (0xDF934EC4 & 0xFFFF) # ori $at, $at, 0x4ec4 -/* 091D8C 8009118C 00416825 */ or $t5, $v0, $at -/* 091D90 80091190 01A01025 */ move $v0, $t5 -.L80091194: -/* 091D94 80091194 8C8E00BC */ lw $t6, 0xbc($a0) -/* 091D98 80091198 01C27824 */ and $t7, $t6, $v0 -/* 091D9C 8009119C 11E00003 */ beqz $t7, .L800911AC -/* 091DA0 800911A0 00001025 */ move $v0, $zero -/* 091DA4 800911A4 03E00008 */ jr $ra -/* 091DA8 800911A8 24020001 */ li $v0, 1 - -.L800911AC: -/* 091DAC 800911AC 03E00008 */ jr $ra -/* 091DB0 800911B0 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_80091298.s b/asm/non_matchings/code_8008C1D0/func_80091298.s index 0d6d8c11b..6c0fb9d45 100644 --- a/asm/non_matchings/code_8008C1D0/func_80091298.s +++ b/asm/non_matchings/code_8008C1D0/func_80091298.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_800EF680 +.double 1.08 + +.section .text + glabel func_80091298 /* 091E98 80091298 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 091E9C 8009129C 3C18800E */ lui $t8, %hi(D_800E706C) # $t8, 0x800e diff --git a/asm/non_matchings/code_80280650/func_8028088C.s b/asm/non_matchings/code_80280650/func_8028088C.s index 186ed2cd2..910c57565 100644 --- a/asm/non_matchings/code_80280650/func_8028088C.s +++ b/asm/non_matchings/code_80280650/func_8028088C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_80286B70 +.float 0.8 + +.section .text + glabel func_8028088C /* 123ECC 8028088C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 123ED0 80280890 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/code_80280650/func_8028101C.s b/asm/non_matchings/code_80280650/func_8028101C.s index 385b3576f..e0fd9d23d 100644 --- a/asm/non_matchings/code_80280650/func_8028101C.s +++ b/asm/non_matchings/code_80280650/func_8028101C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_80286B80 +.float 3000 + +.section .text + glabel func_8028101C /* 12465C 8028101C 27BDFF90 */ addiu $sp, $sp, -0x70 /* 124660 80281020 F7BE0038 */ sdc1 $f30, 0x38($sp) diff --git a/asm/non_matchings/code_80280650/func_8028118C.s b/asm/non_matchings/code_80280650/func_8028118C.s index bbadc2838..9f5397bba 100644 --- a/asm/non_matchings/code_80280650/func_8028118C.s +++ b/asm/non_matchings/code_80280650/func_8028118C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_80286B84 +.float 1.1 + +.section .text + glabel func_8028118C /* 1247CC 8028118C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 1247D0 80281190 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/memory/func_802AAB4C.s b/asm/non_matchings/code_802AAA70/func_802AAB4C.s similarity index 94% rename from asm/non_matchings/memory/func_802AAB4C.s rename to asm/non_matchings/code_802AAA70/func_802AAB4C.s index 3fddd334e..2e063f972 100644 --- a/asm/non_matchings/memory/func_802AAB4C.s +++ b/asm/non_matchings/code_802AAA70/func_802AAB4C.s @@ -1,3 +1,61 @@ +.section .late_rodata + +glabel D_802B9E00 +.float 1859.0 + +glabel D_802B9E04 +.float 1549.0 + +glabel D_802B9E08 +.float -1102.0 + +glabel D_802B9E0C +.float -1402.0 + +glabel D_802B9E10 +.float 2405.0 + +glabel D_802B9E14 +.float 2233.0 + +glabel D_802B9E18 +.float 0.8 + +glabel D_802B9E1C +.float -475.0 + +glabel D_802B9E20 +.float -33.9 + +glabel D_802B9E24 +.float -838.0 + +glabel D_802B9E28 +.float -475.0 + +glabel D_802B9E2C +.float -475.0 + +glabel D_802B9E30 +.float -993.0 + +glabel D_802B9E34 +.float -33.9 + +glabel D_802B9E38 +.float -475.0 + +glabel D_802B9E3C +.float -33.9 + +glabel D_802B9E40 +.float -475.0 + +glabel D_802B9E44 +.float -33.9 + +.section .text + glabel func_802AAB4C /* 11415C 802AAB4C 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e /* 114160 802AAB50 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) diff --git a/asm/non_matchings/memory/func_802AAE4C.s b/asm/non_matchings/code_802AAA70/func_802AAE4C.s similarity index 99% rename from asm/non_matchings/memory/func_802AAE4C.s rename to asm/non_matchings/code_802AAA70/func_802AAE4C.s index 953e46ae7..0bad6dc41 100644 --- a/asm/non_matchings/memory/func_802AAE4C.s +++ b/asm/non_matchings/code_802AAA70/func_802AAE4C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_802B9E48 +.float -0.9 + +.section .text + glabel func_802AAE4C /* 11445C 802AAE4C 27BDFF88 */ addiu $sp, $sp, -0x78 /* 114460 802AAE50 AFA5007C */ sw $a1, 0x7c($sp) diff --git a/asm/non_matchings/memory/func_802AB288.s b/asm/non_matchings/code_802AAA70/func_802AB288.s similarity index 100% rename from asm/non_matchings/memory/func_802AB288.s rename to asm/non_matchings/code_802AAA70/func_802AB288.s diff --git a/asm/non_matchings/memory/func_802AB6C4.s b/asm/non_matchings/code_802AAA70/func_802AB6C4.s similarity index 100% rename from asm/non_matchings/memory/func_802AB6C4.s rename to asm/non_matchings/code_802AAA70/func_802AB6C4.s diff --git a/asm/non_matchings/memory/func_802ABB04.s b/asm/non_matchings/code_802AAA70/func_802ABB04.s similarity index 100% rename from asm/non_matchings/memory/func_802ABB04.s rename to asm/non_matchings/code_802AAA70/func_802ABB04.s diff --git a/asm/non_matchings/memory/func_802AC22C.s b/asm/non_matchings/code_802AAA70/func_802AC22C.s similarity index 100% rename from asm/non_matchings/memory/func_802AC22C.s rename to asm/non_matchings/code_802AAA70/func_802AC22C.s diff --git a/asm/non_matchings/memory/func_802AC760.s b/asm/non_matchings/code_802AAA70/func_802AC760.s similarity index 100% rename from asm/non_matchings/memory/func_802AC760.s rename to asm/non_matchings/code_802AAA70/func_802AC760.s diff --git a/asm/non_matchings/memory/func_802ACBA4.s b/asm/non_matchings/code_802AAA70/func_802ACBA4.s similarity index 100% rename from asm/non_matchings/memory/func_802ACBA4.s rename to asm/non_matchings/code_802AAA70/func_802ACBA4.s diff --git a/asm/non_matchings/memory/func_802AD278.s b/asm/non_matchings/code_802AAA70/func_802AD278.s similarity index 100% rename from asm/non_matchings/memory/func_802AD278.s rename to asm/non_matchings/code_802AAA70/func_802AD278.s diff --git a/asm/non_matchings/memory/func_802AD950.s b/asm/non_matchings/code_802AAA70/func_802AD950.s similarity index 100% rename from asm/non_matchings/memory/func_802AD950.s rename to asm/non_matchings/code_802AAA70/func_802AD950.s diff --git a/asm/non_matchings/memory/func_802ADDC8.s b/asm/non_matchings/code_802AAA70/func_802ADDC8.s similarity index 100% rename from asm/non_matchings/memory/func_802ADDC8.s rename to asm/non_matchings/code_802AAA70/func_802ADDC8.s diff --git a/asm/non_matchings/memory/func_802AE1C0.s b/asm/non_matchings/code_802AAA70/func_802AE1C0.s similarity index 97% rename from asm/non_matchings/memory/func_802AE1C0.s rename to asm/non_matchings/code_802AAA70/func_802AE1C0.s index 0cc264b30..28ce65f2c 100644 --- a/asm/non_matchings/memory/func_802AE1C0.s +++ b/asm/non_matchings/code_802AAA70/func_802AE1C0.s @@ -1,3 +1,25 @@ +.section .late_rodata + +glabel D_802B9E4C +.float -3000.0 + +glabel D_802B9E50 +.float 3000.0 + +glabel D_802B9E54 +.float 3000.0 + +glabel D_802B9E58 +.float 3000.0 + +glabel D_802B9E5C +.float 3000.0 + +glabel D_802B9E60 +.float 3000.0 + +.section .text + glabel func_802AE1C0 /* 1177D0 802AE1C0 3C028016 */ lui $v0, %hi(D_8015F6EA) # $v0, 0x8016 /* 1177D4 802AE1C4 8442F6EA */ lh $v0, %lo(D_8015F6EA)($v0) diff --git a/asm/non_matchings/memory/func_802AE434.s b/asm/non_matchings/code_802AAA70/func_802AE434.s similarity index 99% rename from asm/non_matchings/memory/func_802AE434.s rename to asm/non_matchings/code_802AAA70/func_802AE434.s index 4654e1d92..ef36d505a 100644 --- a/asm/non_matchings/memory/func_802AE434.s +++ b/asm/non_matchings/code_802AAA70/func_802AE434.s @@ -1,3 +1,19 @@ +.section .late_rodata + +glabel D_802B9E64 +.float -0.9 + +glabel D_802B9E68 +.float 0.9 + +glabel D_802B9E6C +.float 0.1 + +glabel D_802B9E70 +.float -0.1 + +.section .text + glabel func_802AE434 /* 117A44 802AE434 3C0E8016 */ lui $t6, %hi(D_8015F588) # $t6, 0x8016 /* 117A48 802AE438 95CEF588 */ lhu $t6, %lo(D_8015F588)($t6) diff --git a/asm/non_matchings/memory/func_802AEB14.s b/asm/non_matchings/code_802AAA70/func_802AEB14.s similarity index 100% rename from asm/non_matchings/memory/func_802AEB14.s rename to asm/non_matchings/code_802AAA70/func_802AEB14.s diff --git a/asm/non_matchings/memory/func_802AEBA4.s b/asm/non_matchings/code_802AAA70/func_802AEBA4.s similarity index 100% rename from asm/non_matchings/memory/func_802AEBA4.s rename to asm/non_matchings/code_802AAA70/func_802AEBA4.s diff --git a/asm/non_matchings/memory/func_802AECA0.s b/asm/non_matchings/code_802AAA70/func_802AECA0.s similarity index 100% rename from asm/non_matchings/memory/func_802AECA0.s rename to asm/non_matchings/code_802AAA70/func_802AECA0.s diff --git a/asm/non_matchings/memory/func_802AED6C.s b/asm/non_matchings/code_802AAA70/func_802AED6C.s similarity index 100% rename from asm/non_matchings/memory/func_802AED6C.s rename to asm/non_matchings/code_802AAA70/func_802AED6C.s diff --git a/asm/non_matchings/memory/func_802AF314.s b/asm/non_matchings/code_802AAA70/func_802AF314.s similarity index 100% rename from asm/non_matchings/memory/func_802AF314.s rename to asm/non_matchings/code_802AAA70/func_802AF314.s diff --git a/asm/non_matchings/memory/func_802AF5D8.s b/asm/non_matchings/code_802AAA70/func_802AF5D8.s similarity index 100% rename from asm/non_matchings/memory/func_802AF5D8.s rename to asm/non_matchings/code_802AAA70/func_802AF5D8.s diff --git a/asm/non_matchings/memory/func_802AF83C.s b/asm/non_matchings/code_802AAA70/func_802AF83C.s similarity index 100% rename from asm/non_matchings/memory/func_802AF83C.s rename to asm/non_matchings/code_802AAA70/func_802AF83C.s diff --git a/asm/non_matchings/memory/func_802AF8BC.s b/asm/non_matchings/code_802AAA70/func_802AF8BC.s similarity index 100% rename from asm/non_matchings/memory/func_802AF8BC.s rename to asm/non_matchings/code_802AAA70/func_802AF8BC.s diff --git a/asm/non_matchings/memory/func_802AFA34.s b/asm/non_matchings/code_802AAA70/func_802AFA34.s similarity index 100% rename from asm/non_matchings/memory/func_802AFA34.s rename to asm/non_matchings/code_802AAA70/func_802AFA34.s diff --git a/asm/non_matchings/memory/process_shell_collision.s b/asm/non_matchings/code_802AAA70/process_shell_collision.s similarity index 100% rename from asm/non_matchings/memory/process_shell_collision.s rename to asm/non_matchings/code_802AAA70/process_shell_collision.s diff --git a/asm/non_matchings/math_util/func_802B6540.s b/asm/non_matchings/math_util/func_802B6540.s index ac468ecbf..9f2535063 100644 --- a/asm/non_matchings/math_util/func_802B6540.s +++ b/asm/non_matchings/math_util/func_802B6540.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_802B9FB8 +.double 3.141592653589793 + +glabel D_802B9FC0 +.double 360.0 + +.section .text + glabel func_802B6540 /* 11FB50 802B6540 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 11FB54 802B6544 AFB00020 */ sw $s0, 0x20($sp) diff --git a/asm/non_matchings/math_util/func_802B68F8.s b/asm/non_matchings/math_util/func_802B68F8.s index 1ca58e98b..e6d542219 100644 --- a/asm/non_matchings/math_util/func_802B68F8.s +++ b/asm/non_matchings/math_util/func_802B68F8.s @@ -1,3 +1,13 @@ +.section .late_rodata + +glabel D_802B9FC8 +.double 3.141592653589793 + +glabel D_802B9FD0 +.double 360.0 + +.section .text + glabel func_802B68F8 /* 11FF08 802B68F8 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 11FF0C 802B68FC 44866000 */ mtc1 $a2, $f12 diff --git a/asm/non_matchings/math_util/func_802B79F0.s b/asm/non_matchings/math_util/func_802B79F0.s index 2e7442ca8..1367f847c 100644 --- a/asm/non_matchings/math_util/func_802B79F0.s +++ b/asm/non_matchings/math_util/func_802B79F0.s @@ -1,3 +1,40 @@ +.section .late_rodata + +glabel D_802B9FDC +.float -0.01600503 + +glabel D_802B9FE0 +.float 0.002834060 + +glabel D_802B9FE4 +.float -0.074954450 + +glabel D_802B9FE8 +.float 0.042587612 + +glabel D_802B9FEC +.float -0.142025709 + +glabel D_802B9FF0 +.float 0.106367543 + +glabel D_802B9FF4 +.float -0.333330661 + +glabel D_802B9FF8 +.double 1.3375206719956623e-08 + +glabel D_802BA000 +.double 1.5707963267948966 + +glabel D_802BA008 +.double 1.5707963267948966 + +glabel D_802BA010 +.double 50.123870849609375 + +.section .text + glabel func_802B79F0 /* 121000 802B79F0 46007021 */ cvt.d.s $f0, $f14 /* 121004 802B79F4 460E6403 */ div.s $f16, $f12, $f14 diff --git a/asm/non_matchings/memory/display_list_unpack.s b/asm/non_matchings/memory/display_list_unpack.s index 3b724fc48..78ce49ece 100644 --- a/asm/non_matchings/memory/display_list_unpack.s +++ b/asm/non_matchings/memory/display_list_unpack.s @@ -1,3 +1,32 @@ +.section .late_rodata + +glabel jpt_802B9C94 +.word L802A9BB8, L802A9BDC, L802A9C00, L802A9C24 +.word L802A9C48, L802A9C6C, L802A9C90, L802A9CB4 +.word L802A9CD8, L802A9CFC, L802A9D20, L802A9D44 +.word L802A9D68, L802A9D8C, L802A9DB0, L802A9DD4 +.word L802A9DF8, L802A9E1C, L802A9E40, L802A9E64 +.word L802A9E88, L802A9EAC, L802A9EC8, L802A9EE4 +.word L802A9F38, L802A9F54, L802A9FC4, L802AA00C +.word L802AA030, L802AA054, L802AA078, L802AA09C +.word L802AA0C0, L802AA0E4, L802AA108, L802AA12C +.word L802AA150, L802AA174, L802AA198, L802AA1BC +.word L802AA1E0, L802AA684, L802AA714, L802AA780 +.word L802A9FE8, L802AA6F0, L802A9F00, L802A9F70 +.word L802AA6CC, L802A9B74, L802A9B74, L802AA204 +.word L802AA228, L802AA24C, L802AA270, L802AA294 +.word L802AA2B8, L802AA2DC, L802AA300, L802AA324 +.word L802AA348, L802AA36C, L802AA390, L802AA3B4 +.word L802AA3D8, L802AA3FC, L802AA420, L802AA444 +.word L802AA468, L802AA48C, L802AA4B0, L802AA4D4 +.word L802AA4F8, L802AA51C, L802AA540, L802AA564 +.word L802AA588, L802AA5AC, L802AA5D0, L802AA5F4 +.word L802AA618, L802AA63C, L802AA660, L802A9F1C +.word L802A9F8C, L802A9FA8, L802AA738, L802AA75C +.word L802AA6A8 + +.section .text + glabel display_list_unpack /* 113104 802A9AF4 00047602 */ srl $t6, $a0, 0x18 /* 113108 802A9AF8 000E7880 */ sll $t7, $t6, 2 diff --git a/asm/non_matchings/memory/func_802A8F80.s b/asm/non_matchings/memory/func_802A8F80.s index e76fd9098..4efa391df 100644 --- a/asm/non_matchings/memory/func_802A8F80.s +++ b/asm/non_matchings/memory/func_802A8F80.s @@ -1,3 +1,14 @@ +.section .late_rodata + +glabel jpt_802B9C30 +.word L802A8FE0, L802A9014, L802A902C, L802A9044 +.word L802A9060, L802A907C, L802A9094, L802A9094 +.word L802A9094, L802A9094, L802A9094, L802A9094 +.word L802A9094, L802A9094, L802A9094, L802A9094 +.word L802A9094, L802A9094, L802A8FF8 + +.section .text + glabel func_802A8F80 /* 112590 802A8F80 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 112594 802A8F84 3C19802C */ lui $t9, %hi(D_802B8D58) # $t9, 0x802c diff --git a/asm/non_matchings/memory/func_802A91E4.s b/asm/non_matchings/memory/func_802A91E4.s index 3fb0a21db..031252717 100644 --- a/asm/non_matchings/memory/func_802A91E4.s +++ b/asm/non_matchings/memory/func_802A91E4.s @@ -1,3 +1,11 @@ +.section .late_rodata + +glabel jpt_802B9C7C +.word L802A9250, L802A9268, L802A9280, L802A9298 +.word L802A92B4, L802A92D0 + +.section .text + glabel func_802A91E4 /* 1127F4 802A91E4 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 1127F8 802A91E8 3C19802C */ lui $t9, %hi(D_802B8D60) # $t9, 0x802c diff --git a/asm/non_matchings/race_logic/func_802903D8.s b/asm/non_matchings/race_logic/func_802903D8.s index ef372a085..1b3b24603 100644 --- a/asm/non_matchings/race_logic/func_802903D8.s +++ b/asm/non_matchings/race_logic/func_802903D8.s @@ -1,3 +1,21 @@ +.section .late_rodata + +glabel D_802B92A0 +.float 0.1 + +glabel D_802B92A4 +.float 0.2 + +glabel D_802B92A8 +.float 0.55 + +.word 0x00000000 + +glabel D_802B92B0 +.double 0.85 + +.section .text + glabel func_802903D8 /* 0F99E8 802903D8 27BDFF88 */ addiu $sp, $sp, -0x78 /* 0F99EC 802903DC AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/render_courses/func_8029122C.s b/asm/non_matchings/render_courses/func_8029122C.s index dba895068..fba6a6445 100644 --- a/asm/non_matchings/render_courses/func_8029122C.s +++ b/asm/non_matchings/render_courses/func_8029122C.s @@ -1,3 +1,27 @@ +.section .late_rodata + +glabel jpt_802B92C0 +.word L80291488, L802914F4, L80292454, L80292454 +.word L80291600, L80292454, L80292454, L80292454 +.word L80292454, L80292454, L80291870, L80291A6C +.word L80291B28, L80292454, L80292454, L80292454 +.word L80291D4C + +glabel jpt_802B9304 +.word L802916DC, L802916DC, L80291730, L80291730 +.word L80291730, L80291730, L80291730, L802916DC +.word L802916DC, L802916DC, L80291730, L80291730 +.word L80291730, L80291730, L80291730, L802916DC + +glabel jpt_802B9344 +.word L8029217C, L80292400, L80292400, L80292400 +.word L80292400, L80292400, L80292400, L80292400 +.word L80292400, L80292400, L80292400, L80292400 +.word L802921A0, L802922A0, L80292400, L80292400 +.word L80292358, L802923C0, L802923E0 + +.section .text + glabel func_8029122C /* 0FA83C 8029122C 27BDFD90 */ addiu $sp, $sp, -0x270 /* 0FA840 80291230 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/skybox/func_802A4A0C.s b/asm/non_matchings/skybox/func_802A4A0C.s index 0b7f9c6b8..03651c2e1 100644 --- a/asm/non_matchings/skybox/func_802A4A0C.s +++ b/asm/non_matchings/skybox/func_802A4A0C.s @@ -1,3 +1,10 @@ +.section .late_rodata + +glabel D_802B9BB0 +.float 30000.0 + +.section .text + glabel func_802A4A0C /* 10E01C 802A4A0C 27BDFEC0 */ addiu $sp, $sp, -0x140 /* 10E020 802A4A10 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/non_matchings/skybox/func_802A4D18.s b/asm/non_matchings/skybox/func_802A4D18.s deleted file mode 100644 index 55c4855cb..000000000 --- a/asm/non_matchings/skybox/func_802A4D18.s +++ /dev/null @@ -1,137 +0,0 @@ -glabel func_802A4D18 -/* 10E328 802A4D18 3C0E800E */ lui $t6, %hi(gGamestate) # $t6, 0x800e -/* 10E32C 802A4D1C 8DCEC50C */ lw $t6, %lo(gGamestate)($t6) -/* 10E330 802A4D20 24010004 */ li $at, 4 -/* 10E334 802A4D24 3C0F800E */ lui $t7, %hi(gCurrentCourseId) # $t7, 0x800e -/* 10E338 802A4D28 11C10009 */ beq $t6, $at, .L802A4D50 -/* 10E33C 802A4D2C 3C01802C */ lui $at, %hi(D_802B9BB4) # $at, 0x802c -/* 10E340 802A4D30 C4249BB4 */ lwc1 $f4, %lo(D_802B9BB4)($at) -/* 10E344 802A4D34 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E348 802A4D38 E424014C */ swc1 $f4, %lo(D_8015014C)($at) -/* 10E34C 802A4D3C 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 10E350 802A4D40 44813000 */ mtc1 $at, $f6 -/* 10E354 802A4D44 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E358 802A4D48 10000048 */ b .L802A4E6C -/* 10E35C 802A4D4C E4260150 */ swc1 $f6, %lo(D_80150150)($at) -.L802A4D50: -/* 10E360 802A4D50 95EFC5A0 */ lhu $t7, %lo(gCurrentCourseId)($t7) -/* 10E364 802A4D54 2DE10013 */ sltiu $at, $t7, 0x13 -/* 10E368 802A4D58 1020003C */ beqz $at, .L802A4E4C -/* 10E36C 802A4D5C 000F7880 */ sll $t7, $t7, 2 -/* 10E370 802A4D60 3C01802C */ lui $at, %hi(jtbl_802B9BB8) -/* 10E374 802A4D64 002F0821 */ addu $at, $at, $t7 -/* 10E378 802A4D68 8C2F9BB8 */ lw $t7, %lo(jtbl_802B9BB8)($at) -/* 10E37C 802A4D6C 01E00008 */ jr $t7 -/* 10E380 802A4D70 00000000 */ nop -glabel L802A4D74 -/* 10E384 802A4D74 3C01802C */ lui $at, %hi(D_802B9C04) # $at, 0x802c -/* 10E388 802A4D78 C4289C04 */ lwc1 $f8, %lo(D_802B9C04)($at) -/* 10E38C 802A4D7C 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E390 802A4D80 E428014C */ swc1 $f8, %lo(D_8015014C)($at) -/* 10E394 802A4D84 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 10E398 802A4D88 44815000 */ mtc1 $at, $f10 -/* 10E39C 802A4D8C 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E3A0 802A4D90 10000036 */ b .L802A4E6C -/* 10E3A4 802A4D94 E42A0150 */ swc1 $f10, %lo(D_80150150)($at) -glabel L802A4D98 -/* 10E3A8 802A4D98 3C01802C */ lui $at, %hi(D_802B9C08) # $at, 0x802c -/* 10E3AC 802A4D9C C4309C08 */ lwc1 $f16, %lo(D_802B9C08)($at) -/* 10E3B0 802A4DA0 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E3B4 802A4DA4 E430014C */ swc1 $f16, %lo(D_8015014C)($at) -/* 10E3B8 802A4DA8 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 10E3BC 802A4DAC 44819000 */ mtc1 $at, $f18 -/* 10E3C0 802A4DB0 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E3C4 802A4DB4 1000002D */ b .L802A4E6C -/* 10E3C8 802A4DB8 E4320150 */ swc1 $f18, %lo(D_80150150)($at) -glabel L802A4DBC -/* 10E3CC 802A4DBC 3C01802C */ lui $at, %hi(D_802B9C0C) # $at, 0x802c -/* 10E3D0 802A4DC0 C4249C0C */ lwc1 $f4, %lo(D_802B9C0C)($at) -/* 10E3D4 802A4DC4 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E3D8 802A4DC8 E424014C */ swc1 $f4, %lo(D_8015014C)($at) -/* 10E3DC 802A4DCC 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10E3E0 802A4DD0 44813000 */ mtc1 $at, $f6 -/* 10E3E4 802A4DD4 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E3E8 802A4DD8 10000024 */ b .L802A4E6C -/* 10E3EC 802A4DDC E4260150 */ swc1 $f6, %lo(D_80150150)($at) -glabel L802A4DE0 -/* 10E3F0 802A4DE0 3C014596 */ li $at, 0x45960000 # 4800.000000 -/* 10E3F4 802A4DE4 44814000 */ mtc1 $at, $f8 -/* 10E3F8 802A4DE8 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E3FC 802A4DEC E428014C */ swc1 $f8, %lo(D_8015014C)($at) -/* 10E400 802A4DF0 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 10E404 802A4DF4 44815000 */ mtc1 $at, $f10 -/* 10E408 802A4DF8 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E40C 802A4DFC 1000001B */ b .L802A4E6C -/* 10E410 802A4E00 E42A0150 */ swc1 $f10, %lo(D_80150150)($at) -glabel L802A4E04 -/* 10E414 802A4E04 3C01802C */ lui $at, %hi(D_802B9C10) # $at, 0x802c -/* 10E418 802A4E08 C4309C10 */ lwc1 $f16, %lo(D_802B9C10)($at) -/* 10E41C 802A4E0C 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E420 802A4E10 E430014C */ swc1 $f16, %lo(D_8015014C)($at) -/* 10E424 802A4E14 3C014110 */ li $at, 0x41100000 # 9.000000 -/* 10E428 802A4E18 44819000 */ mtc1 $at, $f18 -/* 10E42C 802A4E1C 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E430 802A4E20 10000012 */ b .L802A4E6C -/* 10E434 802A4E24 E4320150 */ swc1 $f18, %lo(D_80150150)($at) -glabel L802A4E28 -/* 10E438 802A4E28 3C01802C */ lui $at, %hi(D_802B9C14) # $at, 0x802c -/* 10E43C 802A4E2C C4249C14 */ lwc1 $f4, %lo(D_802B9C14)($at) -/* 10E440 802A4E30 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E444 802A4E34 E424014C */ swc1 $f4, %lo(D_8015014C)($at) -/* 10E448 802A4E38 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 10E44C 802A4E3C 44813000 */ mtc1 $at, $f6 -/* 10E450 802A4E40 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E454 802A4E44 10000009 */ b .L802A4E6C -/* 10E458 802A4E48 E4260150 */ swc1 $f6, %lo(D_80150150)($at) -.L802A4E4C: -/* 10E45C 802A4E4C 3C01802C */ lui $at, %hi(D_802B9C18) # $at, 0x802c -/* 10E460 802A4E50 C4289C18 */ lwc1 $f8, %lo(D_802B9C18)($at) -/* 10E464 802A4E54 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10E468 802A4E58 E428014C */ swc1 $f8, %lo(D_8015014C)($at) -/* 10E46C 802A4E5C 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 10E470 802A4E60 44815000 */ mtc1 $at, $f10 -/* 10E474 802A4E64 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10E478 802A4E68 E42A0150 */ swc1 $f10, %lo(D_80150150)($at) -.L802A4E6C: -/* 10E47C 802A4E6C 3C02800E */ lui $v0, %hi(gScreenModeSelection) # $v0, 0x800e -/* 10E480 802A4E70 8C42C530 */ lw $v0, %lo(gScreenModeSelection)($v0) -/* 10E484 802A4E74 3C01802C */ lui $at, %hi(D_802B9C1C) -/* 10E488 802A4E78 1040000A */ beqz $v0, .L802A4EA4 -/* 10E48C 802A4E7C 00000000 */ nop -/* 10E490 802A4E80 24010001 */ li $at, 1 -/* 10E494 802A4E84 10410010 */ beq $v0, $at, .L802A4EC8 -/* 10E498 802A4E88 24010002 */ li $at, 2 -/* 10E49C 802A4E8C 10410009 */ beq $v0, $at, .L802A4EB4 -/* 10E4A0 802A4E90 24010003 */ li $at, 3 -/* 10E4A4 802A4E94 10410011 */ beq $v0, $at, .L802A4EDC -/* 10E4A8 802A4E98 00000000 */ nop -/* 10E4AC 802A4E9C 03E00008 */ jr $ra -/* 10E4B0 802A4EA0 00000000 */ nop - -.L802A4EA4: -/* 10E4B4 802A4EA4 C4309C1C */ lwc1 $f16, %lo(D_802B9C1C)($at) -/* 10E4B8 802A4EA8 3C018015 */ lui $at, %hi(D_80150148) -/* 10E4BC 802A4EAC 03E00008 */ jr $ra -/* 10E4C0 802A4EB0 E4300148 */ swc1 $f16, %lo(D_80150148)($at) - -.L802A4EB4: -/* 10E4C4 802A4EB4 3C01802C */ lui $at, %hi(D_802B9C20) # $at, 0x802c -/* 10E4C8 802A4EB8 C4329C20 */ lwc1 $f18, %lo(D_802B9C20)($at) -/* 10E4CC 802A4EBC 3C018015 */ lui $at, %hi(D_80150148) -/* 10E4D0 802A4EC0 03E00008 */ jr $ra -/* 10E4D4 802A4EC4 E4320148 */ swc1 $f18, %lo(D_80150148)($at) - -.L802A4EC8: -/* 10E4D8 802A4EC8 3C01802C */ lui $at, %hi(D_802B9C24) # $at, 0x802c -/* 10E4DC 802A4ECC C4249C24 */ lwc1 $f4, %lo(D_802B9C24)($at) -/* 10E4E0 802A4ED0 3C018015 */ lui $at, %hi(D_80150148) -/* 10E4E4 802A4ED4 03E00008 */ jr $ra -/* 10E4E8 802A4ED8 E4240148 */ swc1 $f4, %lo(D_80150148)($at) - -.L802A4EDC: -/* 10E4EC 802A4EDC 3C01802C */ lui $at, %hi(D_802B9C28) # $at, 0x802c -/* 10E4F0 802A4EE0 C4269C28 */ lwc1 $f6, %lo(D_802B9C28)($at) -/* 10E4F4 802A4EE4 3C018015 */ lui $at, %hi(D_80150148) # $at, 0x8015 -/* 10E4F8 802A4EE8 E4260148 */ swc1 $f6, %lo(D_80150148)($at) -/* 10E4FC 802A4EEC 03E00008 */ jr $ra -/* 10E500 802A4EF0 00000000 */ nop diff --git a/asm/os/__osException.s b/asm/os/__osException.s index 12705b941..b7c7c2f7d 100644 --- a/asm/os/__osException.s +++ b/asm/os/__osException.s @@ -6,6 +6,19 @@ .include "macros.inc" +.section .rodata + +glabel D_800F3A00 +.byte 0x00, 0x14, 0x18, 0x18, 0x1c, 0x1c, 0x1c, 0x1c +.byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 +.byte 0x00, 0x04, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c +.byte 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 + +glabel jpt_800F3A20 +.word L800D1668, L800D1630, L800D1610, L800D1474 +.word L800D1420, L800D15B4, L800D13E8, L800D13F4 +.word L800D1400 + .section .text, "ax" diff --git a/ctx_includes.c b/ctx_includes.c index 4aa72792c..74d371b74 100644 --- a/ctx_includes.c +++ b/ctx_includes.c @@ -113,3 +113,4 @@ #include "src/code_80280650.h" #include "src/code_80281780.h" #include "src/code_80281C40.h" +#include "src/code_802AAA70.h" diff --git a/data/data_0DD0A0_0.s b/data/data_0DD0A0_0.s deleted file mode 100644 index bec76f4ed..000000000 --- a/data/data_0DD0A0_0.s +++ /dev/null @@ -1,65 +0,0 @@ -# Mario Kart 64 (U) disassembly and split file -# generated by n64split v0.4a - N64 ROM splitter - -.include "macros.inc" - -.section .data - -#glabel pAppNmiBuffer -#.word osAppNmiBuffer - -#glabel gIsMirrorMode -#.word 0x00000000 - -#glabel D_800DC608 -#.float 1.0 -#.word 0x00000000 - -#glabel D_800DC610 -#.word 0xafafaf00, 0xafafaf00, 0xff ffff00, 0xffffff00 -#.word 0x00007800, 0x00000000 - -#glabel D_800DC628 -#.word 0x73737300, 0x73737300 - -#glabel D_800DC630 -#.word 0xffffff00, 0xffffff00, 0x00007800, 0x00000000 -#.word 0x80000000 - -#glabel gCreditsCourseId -#.hword 0x0008, 0x0000 - -#glabel gPlaceItemBoxes -#.hword 0x0001, 0x0000 - -#glabel D_800DC64C -#.word 0x00000000, 0x00000000, 0x00000000 - -#glabel D_800DC658 -#.word 0x00000000, 0x00000000 - -glabel gEnableResourceMeters -.word 0x00000000 - -glabel D_800DC664 -.hword 0x0000, 0x0000 - -glabel D_800DC668 -.hword 0x0001, 0x0000 - -glabel D_800DC66C -.hword 0x0000, 0x0000 - -#glabel sCounter -#.word 0x00000000 - -#glabel crashScreenFont -#.byte 0x1c, 0x22, 0x26, 0x2a, 0x32, 0x22, 0x1c, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1c, 0x00 -#.byte 0x3c, 0x02, 0x02, 0x1c, 0x20, 0x20, 0x3e, 0x00, 0x3c, 0x02, 0x02, 0x1c, 0x02, 0x02, 0x3c, 0x00 -#.byte 0x24, 0x24, 0x24, 0x3e, 0x04, 0x04, 0x04, 0x00, 0x3e, 0x20, 0x20, 0x3c, 0x02, 0x02, 0x3c, 0x00 -#.byte 0x1c, 0x20, 0x20, 0x3c, 0x22, 0x22, 0x1c, 0x00, 0x3e, 0x22, 0x02, 0x04, 0x04, 0x08, 0x08, 0x00 -#.byte 0x1c, 0x22, 0x22, 0x1c, 0x22, 0x22, 0x1c, 0x00, 0x1c, 0x22, 0x22, 0x1c, 0x04, 0x04, 0x04, 0x00 -#.byte 0x1c, 0x22, 0x22, 0x3e, 0x22, 0x22, 0x22, 0x00, 0x3c, 0x22, 0x22, 0x3c, 0x22, 0x22, 0x3c, 0x00 -#.byte 0x0e, 0x10, 0x20, 0x20, 0x20, 0x10, 0x0e, 0x00, 0x38, 0x24, 0x22, 0x22, 0x22, 0x24, 0x38, 0x00 -#.byte 0x3e, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x3e, 0x00, 0x3e, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x20, 0x00 -#.byte 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00 diff --git a/data/data_0DD0A0_1.s b/data/data_0DD0A0_1.s index 95805f919..bca9e0475 100644 --- a/data/data_0DD0A0_1.s +++ b/data/data_0DD0A0_1.s @@ -296,20 +296,3 @@ glabel D_800DDB20 glabel D_800DDB24 .word 0x00000001 - -.word 0x00000000, 0x00000000 - -glabel D_800DDB30 -.float 0.4, 0.6, 0.275, 0.3 - -#glabel camera1 # p1 camera struct pointer -#.word cameras - -#glabel camera2 # p2 camera struct pointer -#.word D_801647A8 - -#glabel camera3 # p3 camera struct pointer -#.word D_80164860 - -#glabel camera4 # p4 camera struct pointer -#.word D_80164918 diff --git a/data/data_0DD0A0_2.s b/data/data_0DD0A0_2.s deleted file mode 100644 index b4cb28af1..000000000 --- a/data/data_0DD0A0_2.s +++ /dev/null @@ -1,411 +0,0 @@ -.include "macros.inc" - -.section .data - -glabel D_800E3810 -.hword 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000 - -glabel D_800E3820 -.hword 0x0000, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000 - -glabel D_800E3830 -.hword 0x0000, 0x0001, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000 - -glabel D_800E3840 -.hword 0x0000, 0x0001, 0x0002, 0x0004, 0x0005, 0x0006, 0x0007, 0x0000 - -glabel D_800E3850 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0005, 0x0006, 0x0007, 0x0000 - -glabel D_800E3860 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0006, 0x0007, 0x0000 - -glabel D_800E3870 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007, 0x0000 - -glabel D_800E3880 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0000 - -glabel D_800E3890 -.word D_800E3810, D_800E3820, D_800E3830, D_800E3840 -.word D_800E3850, D_800E3860, D_800E3870, D_800E3880 - -glabel D_800E38B0 -.hword 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E38BC -.hword 0x0001, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E38C8 -.hword 0x0001, 0x0002, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E38D4 -.hword 0x0001, 0x0002, 0x0003, 0x0005, 0x0006, 0x0007 - -glabel D_800E38E0 -.hword 0x0001, 0x0002, 0x0003, 0x0004, 0x0006, 0x0007 - -glabel D_800E38EC -.hword 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007 - -glabel D_800E38F8 -.hword 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006 - -glabel D_800E3904 -.hword 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E3910 -.hword 0x0000, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E391C -.hword 0x0000, 0x0002, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E3928 -.hword 0x0000, 0x0002, 0x0003, 0x0005, 0x0006, 0x0007 - -glabel D_800E3934 -.hword 0x0000, 0x0002, 0x0003, 0x0004, 0x0006, 0x0007 - -glabel D_800E3940 -.hword 0x0000, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007 - -glabel D_800E394C -.hword 0x0000, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006 - -glabel D_800E3958 -.hword 0x0001, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E3964 -.hword 0x0000, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E3970 -.hword 0x0000, 0x0001, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E397C -.hword 0x0000, 0x0001, 0x0003, 0x0005, 0x0006, 0x0007 - -glabel D_800E3988 -.hword 0x0000, 0x0001, 0x0003, 0x0004, 0x0006, 0x0007 - -glabel D_800E3994 -.hword 0x0000, 0x0001, 0x0003, 0x0004, 0x0005, 0x0007 - -glabel D_800E39A0 -.hword 0x0000, 0x0001, 0x0003, 0x0004, 0x0005, 0x0006 - -glabel D_800E39AC -.hword 0x0001, 0x0002, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E39B8 -.hword 0x0000, 0x0002, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E39C4 -.hword 0x0000, 0x0001, 0x0004, 0x0005, 0x0006, 0x0007 - -glabel D_800E39D0 -.hword 0x0000, 0x0001, 0x0002, 0x0005, 0x0006, 0x0007 - -glabel D_800E39DC -.hword 0x0000, 0x0001, 0x0002, 0x0004, 0x0006, 0x0007 - -glabel D_800E39E8 -.hword 0x0000, 0x0001, 0x0002, 0x0004, 0x0005, 0x0007 - -glabel D_800E39F4 -.hword 0x0000, 0x0001, 0x0002, 0x0004, 0x0005, 0x0006 - -glabel D_800E3A00 -.hword 0x0001, 0x0002, 0x0003, 0x0005, 0x0006, 0x0007 - -glabel D_800E3A0C -.hword 0x0000, 0x0002, 0x0003, 0x0005, 0x0006, 0x0007 - -glabel D_800E3A18 -.hword 0x0000, 0x0001, 0x0003, 0x0005, 0x0006, 0x0007 - -glabel D_800E3A24 -.hword 0x0000, 0x0001, 0x0002, 0x0005, 0x0006, 0x0007 - -glabel D_800E3A30 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0006, 0x0007 - -glabel D_800E3A3C -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0005, 0x0007 - -glabel D_800E3A48 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0005, 0x0006 - -glabel D_800E3A54 -.hword 0x0001, 0x0002, 0x0003, 0x0004, 0x0006, 0x0007 - -glabel D_800E3A60 -.hword 0x0000, 0x0002, 0x0003, 0x0004, 0x0006, 0x0007 - -glabel D_800E3A6C -.hword 0x0000, 0x0001, 0x0003, 0x0004, 0x0006, 0x0007 - -glabel D_800E3A78 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0006, 0x0007 - -glabel D_800E3A84 -.hword 0x0000, 0x0001, 0x0002, 0x0004, 0x0006, 0x0007 - -glabel D_800E3A90 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0007 - -glabel D_800E3A9C -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0006 - -glabel D_800E3AA8 -.hword 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007 - -glabel D_800E3AB4 -.hword 0x0000, 0x0002, 0x0003, 0x0004, 0x0005, 0x0007 - -glabel D_800E3AC0 -.hword 0x0000, 0x0001, 0x0003, 0x0004, 0x0005, 0x0007 - -glabel D_800E3ACC -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0005, 0x0007 - -glabel D_800E3AD8 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0007 - -glabel D_800E3AE4 -.hword 0x0000, 0x0001, 0x0002, 0x0004, 0x0005, 0x0007 - -glabel D_800E3AF0 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005 - -glabel D_800E3AFC -.hword 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006 - -glabel D_800E3B08 -.hword 0x0000, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006 - -glabel D_800E3B14 -.hword 0x0000, 0x0001, 0x0003, 0x0004, 0x0005, 0x0006 - -glabel D_800E3B20 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0005, 0x0006 - -glabel D_800E3B2C -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0006 - -glabel D_800E3B38 -.hword 0x0000, 0x0001, 0x0002, 0x0004, 0x0005, 0x0006 - -glabel D_800E3B44 -.hword 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005 - -glabel D_800E3B50 -.word D_800E38B0, D_800E38B0, D_800E38BC, D_800E38C8 -.word D_800E38D4, D_800E38E0, D_800E38EC, D_800E38F8 - -glabel D_800E3B70 -.word D_800E3904, D_800E3904, D_800E3910, D_800E391C -.word D_800E3928, D_800E3934, D_800E3940, D_800E394C - -glabel D_800E3B90 -.word D_800E3958, D_800E3964, D_800E3964, D_800E3970 -.word D_800E397C, D_800E3988, D_800E3994, D_800E39A0 - -glabel D_800E3BB0 -.word D_800E39AC, D_800E39B8, D_800E39C4, D_800E39C4 -.word D_800E39D0, D_800E39DC, D_800E39E8, D_800E39F4 - -glabel D_800E3BD0 -.word D_800E3A00, D_800E3A0C, D_800E3A18, D_800E3A24 -.word D_800E3A24, D_800E3A30, D_800E3A3C, D_800E3A48 - -glabel D_800E3BF0 -.word D_800E3A54, D_800E3A60, D_800E3A6C, D_800E3A84 -.word D_800E3A78, D_800E3A78, D_800E3A90, D_800E3A9C - -glabel D_800E3C10 -.word D_800E3AA8, D_800E3AB4, D_800E3AC0, D_800E3AE4 -.word D_800E3ACC, D_800E3AD8, D_800E3ACC, D_800E3AF0 - -glabel D_800E3C30 -.word D_800E3AFC, D_800E3B08, D_800E3B14, D_800E3B38 -.word D_800E3B20, D_800E3B2C, D_800E3B44, D_800E3B44 - -glabel D_800E3C50 -.word D_800E3B50, D_800E3B70, D_800E3B90, D_800E3BB0 -.word D_800E3BD0, D_800E3BF0, D_800E3C10, D_800E3C30 - -glabel D_800E3C70 -.hword 0x0003, 0x0016, 0x0026, 0x003c, 0x0050, 0x0069, 0x0090, 0x009d -.hword 0x00a9, 0x00cc - -glabel D_800E3C84 -.hword 0x000c, 0x0021, 0x002f, 0x0045, 0x005f, 0x007a, 0x0098, 0x00a5 -.hword 0x00b3, 0x00d5 - -glabel D_800E3C98 -.hword 0x0000, 0x00b6, 0x016c, 0x0222, 0x02d8, 0x038e, 0x0444, 0x04fa -.hword 0x05b0, 0x0666 - -glabel D_800E3CAC -.hword 0x002f, 0x0000, 0x0030, 0x0000, 0x0031, 0x0000, 0x0032, 0x0000 -.hword 0x0032, 0x0000, 0x0032, 0x0000, 0x0032, 0x0000 - -glabel D_800E3CC8 -.hword 0x0028, 0x0000, 0x002c, 0x0000, 0x0030, 0x0000, 0x0032, 0x0000 -.hword 0x0032, 0x0000, 0x0032, 0x0000, 0x0032, 0x0000, 0x0032, 0x0000 - -glabel D_800E3CE8 -.float 0.0, 0.0, 1.0 - -glabel D_800E3CF4 -.float 0.0, 0.0, 0.0 - -glabel D_800E3D00 -.float 0.0, 0.0, 0.0 - -glabel D_800E3D0C -.float 0.0, 0.0, 0.0 - -glabel D_800E3D18 -.float 0.825, 0.8, 0.725, 0.625 -.float 0.425, 0.3, 0.3, 0.3 -.float 0.3, 0.3, 0.3, 0.3 -.float 0.3, 0.3, 0.3, 0.3 -.float 0.3, 0.3, 0.3, 0.3 -.float 0.3, 0.3, 0.3 - -glabel D_800E3D74 -.float 0.0, 0.0, 1.0 - -glabel D_800E3D80 -.float 0.0, 0.0, 0.0 - -glabel D_800E3D8C -.float 0.0, 0.0, 0.0 - -glabel D_800E3D98 -.float 0.0, 0.0, 1.0 - -glabel D_800E3DA4 -.float 0.0, 0.0, 0.0 - -glabel D_800E3DB0 -.float 0.0, 0.0, 0.0 - -glabel D_800E3DBC -.float 0.0, 0.0, 0.0 - -glabel D_800E3DC8 -.float 0.0, 0.0, 1.0 - -glabel D_800E3DD4 -.float 0.0, 0.0, 0.0 - -glabel D_800E3DE0 -.float 0.0, 0.0, 0.0 - -glabel D_800E3DEC -.float 0.0, 0.0, 0.0 - -glabel D_800E3DF8 -.float 0.0, 0.5, 0.5, 0.5 -.float 0.5, 0.5, 0.5, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.5, 0.5, 0.5, 0.5 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 - -glabel D_800E4068 -.float 0.0, 0.1, 0.1, 0.2 -.float 0.3, 0.4, 0.5, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.6 -.float 0.5, 0.4, 0.4, 0.4 -.float 0.4, 0.4, 0.4, 0.4 -.float 0.4, 0.4, 0.4, 0.4 -.float 0.4, 0.4, 0.4, 0.4 -.float 0.5, 0.5, 0.5, 0.5 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.7, 0.7 -.float 0.7, 0.7, 0.7, 0.7 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.8, 0.8, 0.8, 0.8 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 -.float 0.6, 0.6, 0.6, 0.6 - -glabel D_800E4308 -.float 3.0, 3.0, 3.0, 3.0 -.float 3.0, 3.0, 3.0, 3.0 - -glabel D_800E4328 -.float 0.0, 0.0, 1.0 - -glabel D_800E4334 -.float 0.0, 0.0, 0.0 - -glabel D_800E4340 -.float 0.0, 0.0, 0.0 - -glabel D_800E434C -.float 0.0, 0.0, 0.0 - - diff --git a/data/data_0DD0A0_2_0.s b/data/data_0DD0A0_2_0.s index 725b95eee..4eb6e1d00 100644 --- a/data/data_0DD0A0_2_0.s +++ b/data/data_0DD0A0_2_0.s @@ -2,6 +2,7 @@ .section .data +# code_80071F00 begin? glabel D_800E43B0 # TODO: unused? .float 65536.0, 0.0, 1.0, 0.0 .float 0.0, 65536.0, 0.0, 1.0 @@ -1055,7 +1056,8 @@ glabel D_800E6F48 .byte 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00 - +# code_80071F00 end? +# code_8008C1D0 begin? glabel D_800E6F60 .hword 0x0444, 0x0444, 0x0888, 0x0666, 0x071c, 0x0000 @@ -1117,7 +1119,7 @@ glabel D_800E7080 glabel D_800E708C .float 0.0, -6.0, 4.0, 0.0 .word 0x00000000 - +# code_8008C1D0 end? glabel D_800E70A0 .hword 0x003d, 0x0011, 0x0000, 0x0000 .hword 0x0015, 0x003e, 0x0000, 0x0000 diff --git a/data/data_0DD0A0_2_1_0.s b/data/data_0DD0A0_2_1_0.s deleted file mode 100644 index b1819a606..000000000 --- a/data/data_0DD0A0_2_1_0.s +++ /dev/null @@ -1,87 +0,0 @@ -.include "macros.inc" - -.section .rodata - -#glabel D_800E94A4 -#.asciiz "Seq %d Loading Start\n" -#.balign 4 - -#glabel D_800E94BC -#.asciiz "Heap Overflow Error\n" -#.balign 4 - -#glabel D_800E94D4 -#.asciiz "SEQ %d ALREADY CACHED\n" -#.balign 4 - -#glabel D_800E94EC -#.asciiz "Ok,one bank slow load Start \n" -#.balign 4 - -#glabel D_800E950C -#.asciiz "Sorry,too many %d bank is none.fast load Start \n" -#.balign 4 - - - - - -glabel D_800E9540 -.asciiz "Seq %d:Default Load Id is %d\n" -.balign 4 - -glabel D_800E9560 -.asciiz "Seq Loading Start\n" -.balign 4 - -glabel D_800E9574 -.asciiz "Error:Before Sequence-SlowDma remain.\n" -.balign 4 - -glabel D_800E959C -.asciiz " Cancel Seq Start.\n" -.balign 4 - -glabel D_800E95B8 -.asciiz "SEQ %d ALREADY CACHED\n" -.balign 4 - -glabel D_800E95D0 -.asciiz "Clear Workarea %x -%x size %x \n" -.balign 4 - -glabel D_800E95F0 -.asciiz "AudioHeap is %x\n" -.balign 4 - -glabel D_800E9604 -.asciiz "Heap reset.Synth Change %x \n" -.balign 4 - -glabel D_800E9624 -.asciiz "Heap %x %x %x\n" -.balign 4 - -glabel D_800E9634 -.asciiz "Main Heap Initialize.\n" -.balign 4 - -glabel D_800E964C -.asciiz "---------- Init Completed. ------------\n" -.balign 4 - -glabel D_800E9678 -.asciiz " Syndrv :[%6d]\n" -.balign 4 - -glabel D_800E968C -.asciiz " Seqdrv :[%6d]\n" -.balign 4 - -glabel D_800E96A0 -.asciiz " audiodata :[%6d]\n" -.balign 4 - -glabel D_800E96B4 -.asciiz "---------------------------------------\n" -.balign 4 diff --git a/data/data_0DD0A0_3.s b/data/data_0DD0A0_3.s index 73c41f86f..bde79a057 100644 --- a/data/data_0DD0A0_3.s +++ b/data/data_0DD0A0_3.s @@ -1454,106 +1454,3 @@ glabel D_800ED4D0 glabel D_800ED4D4 .float -355.253997803 - -.word 0x00000000, 0x00000000 - -glabel jpt_800ED4E0 -.word L8001C524, L8001C524, L8001C9CC, L8001C524 -.word L8001C9CC, L8001C9CC, L8001C9CC, L8001C9CC -.word L8001C524, L8001C524, L8001C524 - -glabel D_800ED50C -.float 11.600000381 - -glabel D_800ED510 -.float 19.200000763 - -glabel D_800ED514 -.float 11.600000381 - -glabel D_800ED518 -.float 19.200000763 - -glabel D_800ED51C -.float 9.600000381 - -glabel D_800ED520 -.float 11.600000381 - -glabel D_800ED524 -.float 19.200000763 - -glabel D_800ED528 -.double 0.7 - -glabel D_800ED530 -.double 0.8 - -glabel D_800ED538 -.double 0.1 - -glabel D_800ED540 -.double 0.9 - -glabel D_800ED548 -.double 0.1 - -glabel D_800ED550 -.double 0.1 - -glabel D_800ED558 -.double 0.1 - -glabel D_800ED560 -.double 0.85 - -glabel D_800ED568 -.double 0.02 - -glabel D_800ED570 -.double 0.01 - -glabel D_800ED578 -.double 0.15 - -glabel D_800ED580 -.double 0.7 - -glabel D_800ED588 -.double 0.8 - -glabel D_800ED590 -.double 0.1 - -glabel D_800ED598 -.double 0.9 - -glabel D_800ED5A0 -.double 0.1 - -glabel D_800ED5A8 -.double 0.1 - -glabel D_800ED5B0 -.double 0.1 - -glabel D_800ED5B8 -.double 0.85 - -glabel D_800ED5C0 -.double 0.02 - -glabel D_800ED5C8 -.double 0.01 - -glabel D_800ED5D0 -.double 0.15 - -glabel jpt_800ED5D8 # jump table -.word L8001F4E0, L8001F54C, L8001F5DC, L8001F654 -.word L8001F6D8 - -.word 0x00000000 - -glabel D_800ED5F0 -.double 0.8 diff --git a/data/data_0DD0A0_3_0_0.s b/data/data_0DD0A0_3_0_0.s deleted file mode 100644 index 675a7f11d..000000000 --- a/data/data_0DD0A0_3_0_0.s +++ /dev/null @@ -1,717 +0,0 @@ -.include "macros.inc" - -.section .rodata - -# start rodata for code_80027D00 - -glabel jpt_800ED6F0 -.word L80027F38, L80027FC0, L80028048, L800280D0 -.word L80028854, L80028854, L80028854, L80028854 -.word L80028158, L80028854, L800281E0, L80028854 -.word L8002825C, L80028854, L80028854, L80028854 -.word L80028854, L80028854, L800282E4 - -glabel jpt_800ED73C -.word L80028424 -.word L800284AC, L80028534, L800285BC, L80028854 -.word L80028854, L80028854, L80028854, L80028644 -.word L80028854, L800286CC, L80028854, L80028748 -.word L80028854, L80028854, L80028854, L80028854 -.word L80028854, L800287D0 - -glabel D_800ED788 -.double 1.6 - -glabel D_800ED790 -.double 0.9 - -glabel D_800ED798 -.double 3.6 - -glabel D_800ED7A0 -.double 3.6 - -glabel D_800ED7A8 -.double 2.6 - -glabel D_800ED7B0 -.double 2.6 - -glabel D_800ED7B8 -.float 3500.0 - -glabel D_800ED7BC -.float 1100.0 - -glabel D_800ED7C0 -.float 1500.0 - -glabel D_800ED7C4 -.float 1900.0 - -glabel D_800ED7C8 -.float 550.0 -.word 0x00000000 - -glabel D_800ED7D0 -.double 4.2 - -glabel D_800ED7D8 -.double 0.6 - -glabel D_800ED7E0 -.double 0.925 - -glabel D_800ED7E8 -.double 0.1 - -glabel D_800ED7F0 -.float 4500.0 -.word 0x00000000 - -glabel D_800ED7F8 -.double 0.12 - -glabel D_800ED800 -.double 6000.0 - -glabel D_800ED808 -.double 0.6 - -glabel D_800ED810 -.double 0.12 - -glabel D_800ED818 -.double 6000.0 - -glabel D_800ED820 -.double 0.12 - -glabel D_800ED828 -.double 6000.0 - -glabel D_800ED830 -.double 0.02 - -glabel D_800ED838 -.float 2.8 -.word 0x00000000 - -glabel D_800ED840 -.double 0.08 - -glabel D_800ED848 -.double 0.1 - -glabel D_800ED850 -.double 6000.0 - -glabel D_800ED858 -.double 0.12 - -glabel D_800ED860 -.double 6000.0 - -glabel D_800ED868 -.double 0.2 - -glabel D_800ED870 -.double 0.08 - -glabel D_800ED878 -.double 0.12 - -glabel D_800ED880 -.float 0.06 - -glabel D_800ED884 -.float 0.06 - -glabel D_800ED888 -.double 0.13 - -glabel D_800ED890 -.double 0.2 - -glabel D_800ED898 -.double 0.12 - -glabel D_800ED8A0 -.double 6000.0 - -glabel D_800ED8A8 -.double 780.0 - -glabel D_800ED8B0 -.double 6500.0 - -glabel D_800ED8B8 -.float -1100.0 -.word 0x00000000 - -glabel D_800ED8C0 -.double 0.13 - -glabel D_800ED8C8 -.double 0.2 - -glabel D_800ED8D0 -.double 0.018 - -glabel D_800ED8D8 -.double 1.1 - -glabel D_800ED8E0 -.double 1.1 - -glabel D_800ED8E8 -.double 0.0125 - -glabel D_800ED8F0 -.double 1.2 - -glabel D_800ED8F8 -.double 0.025 - -glabel D_800ED900 -.double 1.2 - -glabel D_800ED908 -.double 0.7 - -glabel D_800ED910 -.double 0.7 - -glabel D_800ED918 -.double 0.004 - -glabel D_800ED920 -.double 0.004 - -glabel D_800ED928 -.double 0.7 - -glabel D_800ED930 -.double 0.0126 - -glabel D_800ED938 -.double 0.026 - -glabel D_800ED940 -.double -0.2 - -glabel D_800ED948 -.double -0.55 - -glabel D_800ED950 -.double 0.004 - -glabel D_800ED958 -.double 0.004 - -glabel D_800ED960 -.double 0.01 - -glabel D_800ED968 -.double 0.01 - -glabel D_800ED970 -.double 0.008 - -glabel D_800ED978 -.double 0.008 - -glabel D_800ED980 -.double 0.3 - -glabel D_800ED988 -.double 0.15 - -glabel D_800ED990 -.double 0.05 - -glabel D_800ED998 -.double 0.04 - -glabel D_800ED9A0 -.double -0.85 - -glabel D_800ED9A8 -.double -0.55 - -glabel D_800ED9B0 -.double 0.05 - -glabel D_800ED9B8 -.float 0.35 - -glabel D_800ED9BC -.float 0.55 - -glabel D_800ED9C0 -.float 0.94 - -glabel D_800ED9C4 -.float 0.85 - -glabel D_800ED9C8 -.float 0.46 - -glabel D_800ED9CC -.float 0.48 - -glabel D_800ED9D0 -.float 0.3 - -glabel D_800ED9D4 -.float 0.54 - -glabel D_800ED9D8 -.double 0.1 - -glabel D_800ED9E0 -.double 0.05 - -glabel D_800ED9E8 -.double 0.05 - -glabel D_800ED9F0 -.double 0.1 - -glabel D_800ED9F8 -.double 0.2 - -glabel D_800EDA00 -.double 0.2 - -glabel D_800EDA08 -.double 0.3 - -glabel D_800EDA10 -.double 0.3 - -glabel D_800EDA18 -.double 0.4 - -glabel D_800EDA20 -.double 0.4 - -glabel D_800EDA28 -.double 0.6 - -glabel D_800EDA30 -.double 0.6 - -glabel D_800EDA38 -.double 0.7 - -glabel D_800EDA40 -.double 0.7 - -glabel D_800EDA48 -.double 0.8 - -glabel D_800EDA50 -.double 0.8 - -glabel D_800EDA58 -.double 0.9 - -glabel D_800EDA60 -.double 0.9 - -glabel D_800EDA68 -.double 0.1 - -glabel D_800EDA70 -.double 0.05 - -glabel D_800EDA78 -.double 0.05 - -glabel D_800EDA80 -.double 0.1 - -glabel D_800EDA88 -.double 0.2 - -glabel D_800EDA90 -.double 0.2 - -glabel D_800EDA98 -.double 0.3 - -glabel D_800EDAA0 -.double 0.3 - -glabel D_800EDAA8 -.double 0.4 - -glabel D_800EDAB0 -.double 0.4 - -glabel D_800EDAB8 -.double 0.6 - -glabel D_800EDAC0 -.double 0.6 - -glabel D_800EDAC8 -.double 0.7 - -glabel D_800EDAD0 -.double 0.7 - -glabel D_800EDAD8 -.double 0.8 - -glabel D_800EDAE0 -.double 0.8 - -glabel D_800EDAE8 -.double 0.9 - -glabel D_800EDAF0 -.double 0.9 - -glabel D_800EDAF8 -.double 0.2 - -glabel D_800EDB00 -.double 0.02 - -glabel D_800EDB08 -.double 1.2 - -glabel D_800EDB10 -.double 0.1 - -glabel D_800EDB18 -.double 0.1 - -glabel D_800EDB20 -.double 0.2 - -glabel D_800EDB28 -.double 0.2 - -glabel D_800EDB30 -.double 0.3 - -glabel D_800EDB38 -.double 0.3 - -glabel D_800EDB40 -.double 0.4 - -glabel D_800EDB48 -.double 0.4 - -glabel D_800EDB50 -.double 0.6 - -glabel D_800EDB58 -.double 0.6 - -glabel D_800EDB60 -.double 0.7 - -glabel D_800EDB68 -.double 0.7 - -glabel D_800EDB70 -.double 0.8 - -glabel D_800EDB78 -.double 0.8 - -glabel D_800EDB80 -.double 0.9 - -glabel D_800EDB88 -.double 0.9 - -glabel D_800EDB90 -.float 0.9 -.word 0x00000000 - -glabel D_800EDB98 -.double 0.2 - -glabel D_800EDBA0 -.double 0.7 - -glabel D_800EDBA8 -.double 0.1 - -glabel D_800EDBB0 -.double 3.2 - -glabel D_800EDBB8 -.double 3.2 - -glabel D_800EDBC0 -.double 0.1 - -glabel D_800EDBC8 -.double 0.2 - -glabel D_800EDBD0 -.double 0.2 - -glabel D_800EDBD8 -.double 0.3 - -glabel D_800EDBE0 -.double 0.3 - -glabel D_800EDBE8 -.double 0.4 - -glabel D_800EDBF0 -.double 0.4 - -glabel D_800EDBF8 -.double 0.6 - -glabel D_800EDC00 -.double 0.6 - -glabel D_800EDC08 -.double 0.7 - -glabel D_800EDC10 -.double 0.7 - -glabel D_800EDC18 -.double 0.8 - -glabel D_800EDC20 -.double 2.8 - -glabel D_800EDC28 -.double 2.8 - -glabel D_800EDC30 -.double 0.8 - -glabel D_800EDC38 -.double 0.9 - -glabel D_800EDC40 -.double 0.9 - -glabel D_800EDC48 -.double 0.1 - -glabel D_800EDC50 -.double 3.2 - -glabel D_800EDC58 -.double 3.2 - -glabel D_800EDC60 -.double 0.1 - -glabel D_800EDC68 -.double 0.2 - -glabel D_800EDC70 -.double 0.2 - -glabel D_800EDC78 -.double 0.3 - -glabel D_800EDC80 -.double 0.3 - -glabel D_800EDC88 -.double 0.4 - -glabel D_800EDC90 -.double 0.4 - -glabel D_800EDC98 -.double 0.6 - -glabel D_800EDCA0 -.double 0.6 - -glabel D_800EDCA8 -.double 0.7 - -glabel D_800EDCB0 -.double 0.7 - -glabel D_800EDCB8 -.double 0.8 - -glabel D_800EDCC0 -.double 2.8 - -glabel D_800EDCC8 -.double 2.8 - -glabel D_800EDCD0 -.double 0.8 - -glabel D_800EDCD8 -.double 0.9 - -glabel D_800EDCE0 -.double 0.9 - -glabel D_800EDCE8 -.double 1.2 - -glabel D_800EDCF0 -.double 1.05 - -glabel D_800EDCF8 -.float 0.9 - -glabel D_800EDCFC -.float 0.9 - -glabel D_800EDD00 -.float 0.9 - -glabel D_800EDD04 -.float 0.9 - -glabel D_800EDD08 -.float 0.9 - -glabel D_800EDD0C -.float 1.05 - -glabel D_800EDD10 -.float 1.05 - -glabel D_800EDD14 -.float 1.05 - -glabel D_800EDD18 -.float 1.05 - -glabel D_800EDD1C -.float 1.05 - -glabel D_800EDD20 -.float 1.2 - -glabel D_800EDD24 -.float 1.2 - -glabel D_800EDD28 -.float 1.2 - -glabel D_800EDD2C -.float 1.2 - -glabel D_800EDD30 -.float 1.2 - -glabel D_800EDD34 -.float 1.6 - -glabel D_800EDD38 -.float 1.6 - -glabel D_800EDD3C -.float 1.6 - -glabel D_800EDD40 -.float 1.6 - -glabel D_800EDD44 -.float 1.6 - -glabel D_800EDD48 -.float 1.9 - -glabel D_800EDD4C -.float 1.9 - -glabel D_800EDD50 -.float 1.9 - -glabel D_800EDD54 -.float 1.9 - -glabel D_800EDD58 -.float 1.9 - -glabel D_800EDD5C -.float 1.9 - -glabel D_800EDD60 -.double 0.15 - -glabel D_800EDD68 -.double 1.6 - -glabel D_800EDD70 -.double 0.9 - -glabel D_800EDD78 -.double 0.65 - -glabel D_800EDD80 -.double 1.7 - -glabel D_800EDD88 -.double 0.8 - -glabel D_800EDD90 -.double 0.02 - -glabel D_800EDD98 -.double 0.01 - -glabel D_800EDDA0 -.double 0.05 - -glabel D_800EDDA8 -.double 0.1 - -glabel D_800EDDB0 -.double 0.15 - -glabel D_800EDDB8 -.double 0.1 - -glabel D_800EDDC0 -.double 0.05 - -glabel D_800EDDC8 -.double 0.02 - -glabel D_800EDDD0 -.double 0.01 - -glabel D_800EDDD8 -.double 0.05 - -glabel D_800EDDE0 -.double 0.1 - -glabel D_800EDDE8 -.double 0.15 - -glabel D_800EDDF0 -.double 0.1 - -glabel D_800EDDF8 -.double 0.05 - -glabel D_800EDE00 -.double 0.12 - -glabel D_800EDE08 -.double 6000.0 - -glabel D_800EDE10 -.double 0.02 - -# end of rodata for code_80027D00 \ No newline at end of file diff --git a/data/data_0DD0A0_3_1.s b/data/data_0DD0A0_3_1.s deleted file mode 100644 index a3df54fb6..000000000 --- a/data/data_0DD0A0_3_1.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macros.inc" - -.section .rodata - -glabel D_800F3A00 -.byte 0x00, 0x14, 0x18, 0x18, 0x1c, 0x1c, 0x1c, 0x1c -.byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 -.byte 0x00, 0x04, 0x08, 0x08, 0x0c, 0x0c, 0x0c, 0x0c -.byte 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10 - -glabel jpt_800F3A20 -.word L800D1668, L800D1630, L800D1610, L800D1474 -.word L800D1420, L800D15B4, L800D13E8, L800D13F4 -.word L800D1400 - -.word 0x00000000, 0x00000000, 0x00000000 - -# glabel D_800F3A50 -# .word L800D3480, L800D3374, L800D33B4, L800D34A0 -# .word L800D34A0, L800D33F0, L800D3438, 0x00000000 - diff --git a/data/data_121DA0_2_1.s b/data/data_121DA0_2_1.s deleted file mode 100644 index 5c346ba9d..000000000 --- a/data/data_121DA0_2_1.s +++ /dev/null @@ -1,110 +0,0 @@ -# Mario Kart 64 (U) disassembly and split file -# generated by n64split v0.4a - N64 ROM splitter - -.include "macros.inc" - -.section .data - -#glabel D_802B9200 -#.float 1.33333337 - -#glabel jpt_802B9204 -#.word L8028ECE0, L8028ED10, L8028ED40, L8028ED50 -#.word L8028ED00, L8028ED60, L8028ED30, L8028ECE0 -#.word L8028ECE0, L8028ED00, L8028ECF0, L8028ED20 -#.word L8028ED60, L8028ED70, L8028ECE0, L8028ED10 -#.word L8028ED90, L8028ED10, L8028ED80, L8028ED90 - - - -#glabel D_802B9254 -#.float 0.01666666 - -#glabel jpt_802B9258 -#.word L8028F4CC, L8028F4CC, L8028F4B0, L8028F4B0 -#.word L8028F4B0, L8028F4D4, L8028F4B0 - -#glabel D_802B9274 -#.float 0.017 - -#glabel D_802B9278 -#.float 0.028 - -#glabel jpt_802B927C -#.word L8028FD10, L8028FE90, L8028FFE4, L8029003C -#.word L80290088, L80290200, L802902CC, L80290304 - -#glabel D_802B929C -#.float 0.008 - -glabel D_802B92A0 -.float 0.1 - -glabel D_802B92A4 -.float 0.2 - -glabel D_802B92A8 -.float 0.55 - -.word 0 - -glabel D_802B92B0 -.double 0.85 - -.word 0x00000000, 0x00000000 - -glabel jpt_802B92C0 -.word L80291488, L802914F4, L80292454, L80292454 -.word L80291600, L80292454, L80292454, L80292454 -.word L80292454, L80292454, L80291870, L80291A6C -.word L80291B28, L80292454, L80292454, L80292454 -.word L80291D4C - -glabel jpt_802B9304 -.word L802916DC, L802916DC, L80291730, L80291730 -.word L80291730, L80291730, L80291730, L802916DC -.word L802916DC, L802916DC, L80291730, L80291730 -.word L80291730, L80291730, L80291730, L802916DC - -glabel jpt_802B9344 -.word L8029217C, L80292400, L80292400, L80292400 -.word L80292400, L80292400, L80292400, L80292400 -.word L80292400, L80292400, L80292400, L80292400 -.word L802921A0, L802922A0, L80292400, L80292400 -.word L80292358, L802923C0, L802923E0 - -#glabel jpt_802B9390 -#.word L802925EC, L802925EC, L80292610, L80292628 -#.word L80292660, L80292660, L80292694, L802926C4 -#.word L802926C4, L802926D8, L802926F4, L80292730 -#.word L80292750, L80292750, L80292758, L80292758 -#.word L802925EC - -#glabel jpt_802B93D4 -#.word L80293D24, L80293D74, L80293DCC, L80293E24 -#.word L80293E80, L80293ED8 - -#glabel jpt_802B93EC -#.word L80294DD8, L80294E28, L80294E7C, L80294ED0 -#.word L80294F28, L80294F7C - -#glabel jpt_802B9404 -#.word L802956C4, L802956F0, L8029571C, L80295748 -#.word L80295774, L802957A0, L802957CC, L802957F8 -#.word L80295824, L80295850, L8029587C, L802958A8 -#.word L802958D4, L80295900, L8029592C, L80295958 -#.word L80295984, L802959B0, L802959DC, L80295A08 - -#glabel jpt_802B9454 -#.word L80295AAC, L80295ABC, L80295ACC, L80295ADC -#.word L80295AEC, L80295AFC, L80295B0C, L80295B1C -#.word L80295B2C, L80295B3C, L80295B4C, L80295B5C -#.word L80295B6C, L80295B7C, L80295B8C, L80295B9C -#.word L80295BAC, L80295BBC, L80295BCC, L80295BDC - -#glabel jpt_802B94A4 -#.word L80295E3C, L80295EB0, L80295FA4, L80295FE8 -#.word L8029604C, L802960A0, L802960C8, L80296164 -#.word L8029618C, L802961C8, L80296204, L8029627C -#.word L802962B8, L80296324, L802963E0, L80296520 -#.word L80296560, L8029659C, L802965DC, L80296628 diff --git a/data/data_121DA0_2_2.s b/data/data_121DA0_2_2.s deleted file mode 100644 index 2e5ec0d03..000000000 --- a/data/data_121DA0_2_2.s +++ /dev/null @@ -1,178 +0,0 @@ -# Mario Kart 64 (U) disassembly and split file -# generated by n64split v0.4a - N64 ROM splitter - -.include "macros.inc" - -.section .data - -glabel D_802B9BB0 -.float 30000.0 - -# begin func_802A4D18 -glabel D_802B9BB4 -.float 6800.0 - -glabel jtbl_802B9BB8 -.word L802A4E04, L802A4D98, L802A4D74, L802A4D74 -.word L802A4E04, L802A4E04, L802A4DBC, L802A4E04 -.word L802A4E04, L802A4E04, L802A4E04, L802A4E28 -.word L802A4E04, L802A4D74, L802A4DE0, L802A4D74 -.word L802A4D74, L802A4D98, L802A4E04 - -glabel D_802B9C04 -.float 2700.0 - -glabel D_802B9C08 -.float 1500.0 - -glabel D_802B9C0C -.float 5000.0 - -glabel D_802B9C10 -.float 4500.0 - -glabel D_802B9C14 -.float 7000.0 - -glabel D_802B9C18 -.float 6800.0 - -glabel D_802B9C1C -.float 1.3333333730697632 - -glabel D_802B9C20 -.float 0.6666666865348816 - -glabel D_802B9C24 -.float 2.6666667461395264 - -glabel D_802B9C28 -.float 1.3333333730697632 -#end func_802A4D18 - -.word 0 - -glabel jpt_802B9C30 -.word L802A8FE0, L802A9014, L802A902C, L802A9044 -.word L802A9060, L802A907C, L802A9094, L802A9094 -.word L802A9094, L802A9094, L802A9094, L802A9094 -.word L802A9094, L802A9094, L802A9094, L802A9094 -.word L802A9094, L802A9094, L802A8FF8 - -glabel jpt_802B9C7C -.word L802A9250, L802A9268, L802A9280, L802A9298 -.word L802A92B4, L802A92D0 - -glabel jpt_802B9C94 -.word L802A9BB8, L802A9BDC, L802A9C00 -.word L802A9C24, L802A9C48, L802A9C6C, L802A9C90 -.word L802A9CB4, L802A9CD8, L802A9CFC, L802A9D20 -.word L802A9D44, L802A9D68, L802A9D8C, L802A9DB0 -.word L802A9DD4, L802A9DF8, L802A9E1C, L802A9E40 -.word L802A9E64, L802A9E88, L802A9EAC, L802A9EC8 -.word L802A9EE4, L802A9F38, L802A9F54, L802A9FC4 -.word L802AA00C, L802AA030, L802AA054, L802AA078 -.word L802AA09C, L802AA0C0, L802AA0E4, L802AA108 -.word L802AA12C, L802AA150, L802AA174, L802AA198 -.word L802AA1BC, L802AA1E0, L802AA684, L802AA714 -.word L802AA780, L802A9FE8, L802AA6F0, L802A9F00 -.word L802A9F70, L802AA6CC, L802A9B74, L802A9B74 -.word L802AA204, L802AA228, L802AA24C, L802AA270 -.word L802AA294, L802AA2B8, L802AA2DC, L802AA300 -.word L802AA324, L802AA348, L802AA36C, L802AA390 -.word L802AA3B4, L802AA3D8, L802AA3FC, L802AA420 -.word L802AA444, L802AA468, L802AA48C, L802AA4B0 -.word L802AA4D4, L802AA4F8, L802AA51C, L802AA540 -.word L802AA564, L802AA588, L802AA5AC, L802AA5D0 -.word L802AA5F4, L802AA618, L802AA63C, L802AA660 -.word L802A9F1C, L802A9F8C, L802A9FA8, L802AA738 -.word L802AA75C, L802AA6A8 - -.word 0, 0 - -glabel D_802B9E00 -.float 1859.0 - -glabel D_802B9E04 -.float 1549.0 - -glabel D_802B9E08 -.float -1102.0 - -glabel D_802B9E0C -.float -1402.0 - -glabel D_802B9E10 -.float 2405.0 - -glabel D_802B9E14 -.float 2233.0 - -glabel D_802B9E18 -.float 0.8 - -glabel D_802B9E1C -.float -475.0 - -glabel D_802B9E20 -.float -33.9 - -glabel D_802B9E24 -.float -838.0 - -glabel D_802B9E28 -.float -475.0 - -glabel D_802B9E2C -.float -475.0 - -glabel D_802B9E30 -.float -993.0 - -glabel D_802B9E34 -.float -33.9 - -glabel D_802B9E38 -.float -475.0 - -glabel D_802B9E3C -.float -33.9 - -glabel D_802B9E40 -.float -475.0 - -glabel D_802B9E44 -.float -33.9 - -glabel D_802B9E48 -.float -0.9 - -glabel D_802B9E4C -.float -3000.0 - -glabel D_802B9E50 -.float 3000.0 - -glabel D_802B9E54 -.float 3000.0 - -glabel D_802B9E58 -.float 3000.0 - -glabel D_802B9E5C -.float 3000.0 - -glabel D_802B9E60 -.float 3000.0 - -glabel D_802B9E64 -.float -0.9 - -glabel D_802B9E68 -.float 0.9 - -glabel D_802B9E6C -.float 0.1 - -glabel D_802B9E70 -.float -0.1 diff --git a/data/data_121DA0_2_3.s b/data/data_121DA0_2_3.s deleted file mode 100644 index 9d950b7dd..000000000 --- a/data/data_121DA0_2_3.s +++ /dev/null @@ -1,66 +0,0 @@ -# Mario Kart 64 (U) disassembly and split file -# generated by n64split v0.4a - N64 ROM splitter - -.include "macros.inc" - -.section .data - -glabel D_802B9FB0 -.double 0.017453292222222222 - -glabel D_802B9FB8 -.double 3.141592653589793 - -glabel D_802B9FC0 -.double 360.0 - -glabel D_802B9FC8 -.double 3.141592653589793 - -glabel D_802B9FD0 -.double 360.0 - -glabel D_802B9FD8 -.float 1000000.0 - -glabel D_802B9FDC -.float -0.01600503 - -glabel D_802B9FE0 -.float 0.002834060 - -glabel D_802B9FE4 -.float -0.074954450 - -glabel D_802B9FE8 -.float 0.042587612 - -glabel D_802B9FEC -.float -0.142025709 - -glabel D_802B9FF0 -.float 0.106367543 - -glabel D_802B9FF4 -.float -0.333330661 - -glabel D_802B9FF8 -.double 1.3375206719956623e-08 - -glabel D_802BA000 -.double 1.5707963267948966 - -glabel D_802BA008 -.double 1.5707963267948966 - -glabel D_802BA010 -.double 50.123870849609375 - -glabel D_802BA018 -.double 3.141592653589793 - -#glabel D_802BA020 -#.double 3.141592653589793 - -#glabel D_802BA028 -#.double 65535.0 diff --git a/data/data_audio.s b/data/data_audio.s deleted file mode 100644 index f6974ee57..000000000 --- a/data/data_audio.s +++ /dev/null @@ -1,191 +0,0 @@ -.include "macros.inc" - -.section .data - -glabel D_800E8E60 -.asciiz "Terminate-Canceled Channel %d,Phase %d\n" -.balign 4 - -glabel D_800E8E88 -.asciiz "Copy %d\n" -.balign 4 - -glabel D_800E8E94 -.asciiz "%d->%d\n" -.balign 4 - -glabel D_800E8E9C -.asciiz "pitch %x: delaybytes %d : olddelay %d\n" -.balign 4 - -glabel D_800E8EC4 -.asciiz "cont %x: delaybytes %d : olddelay %d\n" -.balign 4 - -.balign 0x10 - -glabel D_800E8EF0 -.asciiz "Warning:Kill Note %x \n" -.balign 4 - -glabel D_800E8F08 -.asciiz "Kill Voice %d (ID %d) %d\n" -.balign 4 - -glabel D_800E8F24 -.asciiz "Warning: Running Sequence's data disappear!\n" -.balign 4 - -glabel D_800E8F54 -.asciiz "Audio:Memory:Heap OverFlow : Not Allocate %d!\n" -.balign 4 - -glabel D_800E8F84 -.asciiz "Audio:Memory:DataHeap Not Allocate \n" -.balign 4 - -glabel D_800E8FAC -.asciiz "StayHeap Not Allocate %d\n" -.balign 4 - -glabel D_800E8FC8 -.asciiz "AutoHeap Not Allocate %d\n" -.balign 4 - -glabel D_800E8FE4 -.asciiz "Status ID0 : %d ID1 : %d\n" -.balign 4 - -glabel D_800E9000 -.asciiz "id 0 is Stopping\n" -.balign 4 - -glabel D_800E9014 -.asciiz "id 0 is Stop\n" -.balign 4 - -glabel D_800E9024 -.asciiz "id 1 is Stopping\n" -.balign 4 - -glabel D_800E9038 -.asciiz "id 1 is Stop\n" -.balign 4 - -glabel D_800E9048 -.asciiz "WARNING: NO FREE AUTOSEQ AREA.\n" -.balign 4 - -glabel D_800E9068 -.asciiz "WARNING: NO STOP AUTO AREA.\n" -.balign 4 - -glabel D_800E9088 -.asciiz " AND TRY FORCE TO STOP SIDE \n" -.balign 4 - -glabel D_800E90B0 -.asciiz "Check ID0 (seq ID %d) Useing ...\n" -.balign 4 - -glabel D_800E90D4 -.asciiz "Check ID1 (seq ID %d) Useing ...\n" -.balign 4 - -glabel D_800E90F8 -.asciiz "No Free Seq area.\n" -.balign 4 - -glabel D_800E910C -.asciiz "CH %d: ID %d\n" -.balign 4 - -glabel D_800E911C -.asciiz "TWO SIDES ARE LOADING... ALLOC CANCELED.\n" -.balign 4 - -glabel D_800E9148 -.asciiz "WARNING: Before Area Overlaid After." -.balign 4 - -glabel D_800E9170 -.asciiz "WARNING: After Area Overlaid Before." -.balign 4 - -glabel D_800E9198 -.asciiz "MEMORY:SzHeapAlloc ERROR: sza->side %d\n" -.balign 4 - -glabel D_800E91C0 -.asciiz "Audio:MEMORY:SzHeap Overflow error. (%d bytes)\n" -.balign 4 - -glabel D_800E91F0 -.asciiz "Auto Heap Unhit for ID %d\n" -.balign 4 - -glabel D_800E920C -.asciiz "Heap Reconstruct Start %x\n" -.balign 4 - -glabel D_800E9228 -.asciiz "AHPBASE %x\n" -.balign 4 - -glabel D_800E9234 -.asciiz "AHPCUR %x\n" -.balign 4 - -glabel D_800E9240 -.asciiz "HeapTop %x\n" -.balign 4 - -glabel D_800E924C -.asciiz "SynoutRate %d / %d \n" -.balign 4 - -glabel D_800E9264 -.asciiz "FXSIZE %d\n" -.balign 4 - -glabel D_800E9270 -.asciiz "FXCOMP %d\n" -.balign 4 - -glabel D_800E927C -.asciiz "FXDOWN %d\n" -.balign 4 - -glabel D_800E9288 -.asciiz "WaveCacheLen: %d\n" -.balign 4 - -glabel D_800E929C -.asciiz "SpecChange Finished\n" -.balign 4 - -glabel D_800E92B4 -.asciiz "Fbank Seq %x\n" -.balign 4 - -glabel D_800E92C4 -.asciiz "Already Load Type %d,ID %d\n" -.balign 4 - -glabel D_800E92E0 -.asciiz "Warning:Emem Over,not alloc %d\n" -.balign 4 - -glabel D_800E9300 -.asciiz "Write %d\n" -.balign 4 - -.balign 0x10 - -#glabel D_800E9310 -#.asciiz "Romcopy %x -> %x ,size %x\n" -#.balign 4 - -#glabel D_800E932C -#.asciiz "Romcopyend\n" -#.balign 4 diff --git a/data/data_credits_128480_1.s b/data/data_credits_128480_1.s deleted file mode 100644 index 453c67667..000000000 --- a/data/data_credits_128480_1.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macros.inc" - -.data - -glabel D_80286B70 -.word 0x3F4CCCCD - -glabel D_80286B74 -.word 0x3E4CCCCD - -glabel D_80286B78 -.word 0x3E4CCCCD - -glabel D_80286B7C -.word 0x3FEF5C2A - -glabel D_80286B80 -.word 0x453B8000 - -glabel D_80286B84 -.word 0x3F8CCCCD diff --git a/data/rodata_audio.s b/data/rodata_audio.s deleted file mode 100644 index f1753b146..000000000 --- a/data/rodata_audio.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macros.inc" - -.section .rodata - -# start audio data -# start heap.o -glabel D_800F2E80 -.float 262159.0 - -glabel jpt_800F2E84 -.word L800BA210, L800BA1E4, L800BA14C, L800BA094 -.word L800BA050 - -glabel D_800F2E98 -.float 0.001171875 - -glabel D_800F2E9C -.float 2880000.0 - -glabel D_800F2EA0 -.float 20.0304203 - -glabel D_800F2EA4 -.float 16.546 - -glabel D_800F2EA8 -.float 16.713 diff --git a/data/rodata_audio_2.s b/data/rodata_audio_2.s deleted file mode 100644 index 4182f7845..000000000 --- a/data/rodata_audio_2.s +++ /dev/null @@ -1,509 +0,0 @@ -.include "macros.inc" - -.section .rodata - -glabel jpt_800F2F10 -.word L800BF3E8, L800BF600, L800BF600, L800BF380 -.word L800BF348, L800BF600, L800BF600, L800BF3C8 -.word L800BF308, L800BF600, L800BF600, L800BF2D0 - -glabel jpt_800F2F40 -.word L800BF408, L800BF450, L800BF4B0, L800BF478 -.word L800BF478, L800BF4C4, L800BF534, L800BF5BC -.word L800BF450, L800BF408, L800BF5C4, L800BF5F0 - -glabel D_800F2F70 -.float 16129.0 - -glabel D_800F2F74 -.float 16129.0 - -glabel D_800F2F78 -.float 16129.0 - -glabel jpt_800F2F7C -.word L800BFA20, L800BFA28, L800BFA20, L800BFA28 -.word L800BFA20 - - - - - - - - - - - - - - - - - - - - - -glabel jpt_800F2F90 -.word L800C0124, L800C0078, L800C0140, L800C0150 -.word L800C0094, L800C035C, L800C03B4, L800C03EC -.word L800C03EC, L800C0438, L800C0448, L800C03EC -.word L800BFE40, L800BFE40, L800BFE40, L800C0468 -.word L800C048C, L800C049C, L800C01E8, L800C034C -.word L800BFE40, L800BFE40, L800C02B4, L800C0298 -.word L800C0288, L800C026C, L800C0254, L800C0238 -.word L800C021C, L800C01B4, L800C0160, L800C0184 -.word L800C0304, L800C02D0, L800C0338, L800C04BC -.word L800C04AC, L800C0518, L800C0528, L800C0590 -.word L800C0630, L800BFEC4, L800C00D0, L800C0608 -.word L800BFE40, L800BFE40, L800C0640, L800C0068 -.word L800C0040, L800BFFF8, L800BFFF8, L800BFFF8 -.word L800BFFA0, L800BFF90, L800BFF48, L800BFF10 -.word L800BFFA0, L800BFFA0, L800BFFA0, L800BFED4 -.word L800BFEB4, L800C0880, L800BFE7C - -glabel jpt_800F308C -.word L800C0684, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C07E4, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C0814, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C0830, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C0858, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C06EC, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C0708, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C06BC, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C06CC, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C0714, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C0760, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800BFE40, L800BFE40, L800BFE40, L800BFE40 -.word L800C077C - -glabel jpt_800F3350 -.word L800C0FF4, L800C0FE4, L800C0AE8, L800C0AE8 -.word L800C0FD4, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0FC4, L800C0F98, L800C0F98, L800C0F88 -.word L800C0F78, L800C0F4C, L800C0F30, L800C0F14 -.word L800C0AE8, L800C0EE8, L800C0DD4, L800C0E50 -.word L800C0D50, L800C0D50, L800C0D30, L800C0D2C -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0D1C, L800C0CF4, L800C0CAC, L800C0CAC -.word L800C0CAC, L800C0C54, L800C0AE8, L800C0C0C -.word L800C0BD4, L800C0C54, L800C0C54, L800C0C54 -.word L800C0B90, L800C0AE8, L800C0AE8, L800C0AE8 - -glabel jpt_800F3430 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C1084, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C1090, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C1098, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C10A0, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8, L800C0AE8, L800C0AE8, L800C0AE8 -.word L800C0AE8 - -.word 0x00000000, 0x00000000, 0x00000000 - -glabel D_800F35C0 -.float 3.333333333 - -glabel jpt_800F35C4 -.word L800C1A34, L800C1A34, L800C1A34, L800C1A34 -.word L800C1AEC, L800C1A34 - -# begin func_800C1E2C -glabel D_800F35DC -.float 0.1 -# end func_800C1E2C - -#begin func_800C1F8C -glabel D_800F35E0 -.float 100000.0 -#end func_800C1F8C - -#begin func_800C21E8 -glabel D_800F35E4 -.float 100000.0 -#end func_800C21E8 - -glabel D_800F35E8 -.float 0.85 - -glabel jpt_800F35EC -.word L800C2A80, L800C2AB8, L800C2AD8, L800C2CDC -.word L800C2E40, L800C2F04, L800C3008, L800C3118 -.word L800C3154, L800C31E4, L800C3218, L800C32B8 -.word L800C32EC, L800C3430, L800C3390, L800C33E0 - -glabel jpt_800F362C -.word L800C3DEC, L800C3E10, L800C3E30, L800C3E70 -.word L800C3E98, L800C3EBC, L800C3F04 - -glabel D_800F3648 -.float 100000.0 - -glabel jpt_800F364C -.word L800C423C, L800C4268, L800C42A4, L800C42C8 -.word L800C42FC, L800C4330 - -glabel D_800F3664 -.float 100000.0 - -glabel D_800F3668 -.float 100000.0 - -glabel D_800F366C -.float 4000000.0 - -glabel D_800F3670 -.float 10000000000.0 - -glabel D_800F3674 -.float 0.6 - -glabel D_800F3678 -.float 0.4 - -glabel D_800F367C -.float 0.005000 - -glabel D_800F3680 -.float 0.01 - -glabel D_800F3684 -.float 12000.0 - -glabel D_800F3688 -.float 0.03 - -glabel D_800F368C -.float 0.03 - -glabel D_800F3690 -.float 0.4 - -glabel jpt_800F3694 -.word L800C6544, L800C6618, L800C64E4, L800C65B8 -.word L800C65B8, L800C65B8, L800C65B8, L800C65B8 -.word L800C65B8, L800C65B8, L800C65B8, L800C65B8 -.word L800C6544, L800C6544, L800C6618, L800C6618 -.word L800C6544, L800C6618, L800C6618, L800C6618 -.word L800C6618, L800C65B8, L800C65B8, L800C65B8 -.word L800C6618, L800C6618, L800C6618, L800C6618 -.word L800C65B8, L800C65B8, L800C65B8 - -glabel D_800F3710 -.float 0.2 - -glabel D_800F3714 -.float 3500.0 - -glabel D_800F3718 -.float 3000.0 - -glabel D_800F371C -.float 0.4 - -glabel D_800F3720 -.float 0.2 - -glabel D_800F3724 -.float 0.06 - -glabel D_800F3728 -.float 0.56 - -glabel D_800F372C -.float 0.9 - -# begin func_800C6758 -glabel D_800F3730 -.float 0.6 - -glabel D_800F3734 -.float 13000.0 - -glabel D_800F3738 -.float 0.95 -# end func_800C6758 - -glabel jpt_800F373C -.word L800C69C8, L800C6A0C, L800C6910, L800C6C74 -.word L800C6CB8, L800C6CFC, L800C6D40, L800C6D84 -.word L800C6DC8, L800C6E0C, L800C6E50, L800C6E94 -.word L800C6FA4, L800C6E0C, L800C6A98, L800C6ADC -.word L800C6A50, L800C6958, L800C6990, L800C6B20 -.word L800C7070, L800C6FA4, L800C6FE8, L800C702C -.word L800C6B64, L800C6BA8, L800C6BEC, L800C6C30 -.word L800C6ED8, L800C6F1C, L800C6F60 - -glabel D_800F37B8 -.float 3500.0 - -glabel jpt_800F37BC -.word L800C718C, L800C7198, L800C71B0, L800C71BC -.word L800C71A4, L800C71F4, L800C71F4, L800C71C8 -.word L800C71F4, L800C71F4, L800C71F4, L800C71F4 -.word L800C71EC, L800C71F4, L800C71D4, L800C71E0 - -glabel jpt_800F37FC -.word L800C7238, L800C7244, L800C725C, L800C7268 -.word L800C7250, L800C7294, L800C7294, L800C7274 -.word L800C7294, L800C7294, L800C7294, L800C7294 -.word L800C7290, L800C7294, L800C7280, L800C7288 - -glabel jpt_800F383C -.word L800C72F8, L800C72B8, L800C742C, L800C73B8 -.word L800C7378, L800C742C, L800C7338, L800C7428 -.word L800C742C, L800C7418, L800C7420 - -glabel jpt_800F3868 -.word L800C7494, L800C7454, L800C75C8, L800C7554 -.word L800C7514, L800C75C8, L800C74D4, L800C75C4 -.word L800C75C8, L800C75B4, L800C75BC - -# begin func_800C8770 -glabel D_800F3894 -.float 0.7 - -glabel D_800F3898 -.float 0.1 - -glabel D_800F389C -.float 0.03 - -glabel D_800F38A0 -.float 0.16 - -glabel D_800F38A4 -.float 0.15 - -glabel D_800F38A8 -.float 0.03 -# end func_800C8770 - -glabel D_800F38AC -.float 0.012000 - -glabel D_800F38B0 -.float 0.85 - -glabel D_800F38B4 -.float 0.85 - -glabel jpt_800F38B8 -.word L800C9560, L800C9560, L800C95BC, L800C9618 -.word L800C9674, L800C96D0, L800C95BC, L800C96D0 - -glabel D_800F38D8 -.float 0.35 - -glabel D_800F38DC -.float 2.800000 - -glabel D_800F38E0 -.float 3844.0 - -glabel D_800F38E4 -.float -0.8 - -glabel D_800F38E8 -.float 1568.979614 - -glabel D_800F38EC -.float 1067.777832 - -glabel D_800F38F0 -.float 2766.064941 - -glabel D_800F38F4 -.float 0.6 - -glabel D_800F38F8 -.float 3.200000 - -glabel D_800F38FC -.float 3844.0 - -glabel D_800F3900 -.float -1.700000 - -glabel D_800F3904 -.float 1478.461548 - -glabel D_800F3908 -.float 784.489807 - -glabel D_800F390C -.float 12813.334961 - -glabel D_800F3910 -.float 0.6 - -glabel D_800F3914 -.float 2.800000 - -glabel D_800F3918 -.float 3844.0 - -glabel D_800F391C -.float -0.6 - -glabel D_800F3920 -.float 1747.272827 - -glabel D_800F3924 -.float 1130.588257 - -glabel D_800F3928 -.float 3844.000977 - -glabel D_800F392C -.float 0.2 - -glabel D_800F3930 -.float 3844.0 - -glabel D_800F3934 -.float -0.4 - -glabel D_800F3938 -.float 2135.555664 - -glabel D_800F393C -.float 1601.666626 - -glabel D_800F3940 -.float 3203.333008 - -glabel D_800F3944 -.float 0.4 - -glabel D_800F3948 -.float 2.400000 - -glabel D_800F394C -.float 3844.0 - -glabel D_800F3950 -.float -0.8 - -glabel D_800F3954 -.float 1922.0 - -glabel D_800F3958 -.float 1201.250000 - -glabel D_800F395C -.float 4805.0 - -# start func_800C9A88 data -glabel jpt_800F3960 -.word L800C9B3C, L800C9B3C, L800C9B68, L800C9B94 -.word L800C9BC0, L800C9BEC, L800C9B68, L800C9BEC - -glabel D_800F3980 -.float 0.35 - -glabel D_800F3984 -.float 1568.979614 - -glabel D_800F3988 -.float 0.6 - -glabel D_800F398C -.float 1478.461548 - -glabel D_800F3990 -.float 0.6 - -glabel D_800F3994 -.float 1747.272827 - -glabel D_800F3998 -.float 0.2 - -glabel D_800F399C -.float 2135.555664 - -glabel D_800F39A0 -.float 0.4 - -glabel D_800F39A4 -.float 1922.0 -# end func_800C9A88 data - -glabel D_800F39A8 -.float 0.55 - -glabel D_800F39AC -.float 0.45 - -glabel D_800F39B0 -.float 0.7 - -glabel D_800F39B4 -.float 0.1 - -.balign 16 - -glabel jpt_800F39C0 -.word L800CBE60, L800CBE78, L800CBE90, L800CBEA8 -.word L800CBEC0, L800CBECC, L800CBF08, L800CBEEC - - -# guRotateF rodata -#glabel D_800F39E0 -#.float 0.017453292 -#.balign 16 diff --git a/data/data_0DD0A0_3_0.s b/data/rodata_code_80091750.s similarity index 68% rename from data/data_0DD0A0_3_0.s rename to data/rodata_code_80091750.s index 02fb01ddd..27adfd5fc 100644 --- a/data/data_0DD0A0_3_0.s +++ b/data/rodata_code_80091750.s @@ -1,1390 +1,7 @@ .include "macros.inc" .section .rodata - -#glabel jpt_800EE0C0 -#.word L80058038, L80058048, L80058058, L80058068 -#.word L80058078 - -#glabel jpt_800EE0D4 -#.word L80058100, L80058110, L80058120, L80058130 -#.word L80058140, L80058150, L80058160, L80058170 -#.word L80058180, L80058190, L800581A0, L800581B0 - -#glabel jpt_800EE104 -#.word L800585A8, L800585B8, L800585C8, L800585D8 -#.word L800585E8, L80058630, L80058630, L80058630 -#.word L800585F8, L80058608, L80058618, L80058628 - -#glabel jpt_800EE134 -#.word L80058B00, L80058B00, L8005892C, L80058944 -#.word L80058980, L800589AC, L800589D0, L80058B00 -#.word L80058A38, L80058A58, L80058B00, L80058A7C -#.word L80058A8C, L80058AB8, L80058B00, L80058B00 -#.word L80058B00, L80058B00, L80058AE4 - -#glabel jpt_800EE180 -#.word L80058C88, L80058C98, L80058CB8, L80058CD8 -#.word L80058CF8, L80058DA4, L80058DA4, L80058DA4 -#.word L80058D18, L80058D38, L80058D58, L80058D78 - -#glabel jpt_800EE1B0 -#.word L80058E1C, L80058E2C, L80058E4C, L80058E6C -#.word L80058E8C, L80058F38, L80058F38, L80058F38 -#.word L80058EAC, L80058ECC, L80058EEC, L80058F0C - -# start code_80057C60 .late_rodata -glabel D_800EE1E0 -.float 0.6 - -glabel jpt_800EE1E4 -.word L8005A950, L8005A950, L8005A77C, L8005A794 -.word L8005A7EC, L8005A818, L8005A844, L8005A950 -.word L8005A89C, L8005A8BC, L8005A950, L8005A8E0 -.word L8005A8F0, L8005A91C, L8005A950, L8005A950 -.word L8005A950, L8005A950, L8005A948 - -glabel jpt_800EE230 -.word L8005AD64, L8005AB98, L8005ABE0, L8005AC20 -.word L8005AC60, L8005ACA0, L8005ACE0, L8005AD20 -.word L8005AD60 - -glabel jpt_800EE254 -.word L8005AF2C, L8005ADF4, L8005AE20, L8005AE4C -.word L8005AE78, L8005AEA4, L8005AED0, L8005AEFC -.word L8005AF28 - -glabel jpt_800EE278 -.word L8005B088, L8005AF50, L8005AF7C, L8005AFA8 -.word L8005AFD4, L8005B000, L8005B02C, L8005B058 -.word L8005B084 - -glabel jpt_800EE29C -.word L8005B1E4, L8005B0AC, L8005B0D8, L8005B104 -.word L8005B130, L8005B15C, L8005B188, L8005B1B4 -.word L8005B1E0 - -glabel jpt_800EE2C0 -.word L8005B378, L8005B240, L8005B26C, L8005B298 -.word L8005B2C4, L8005B2F0, L8005B31C, L8005B348 -.word L8005B374 - -glabel jpt_800EE2E4 -.word L8005B4D4, L8005B39C, L8005B3C8, L8005B3F4 -.word L8005B420, L8005B44C, L8005B478, L8005B4A4 -.word L8005B4D0 - -glabel jpt_800EE308 -.word L8005B630, L8005B4F8, L8005B524, L8005B550 -.word L8005B57C, L8005B5A8, L8005B5D4, L8005B600 -.word L8005B62C - -glabel jpt_800EE32C -.word L8005B78C, L8005B654, L8005B680, L8005B6AC -.word L8005B6D8, L8005B704, L8005B730, L8005B75C -.word L8005B788 - -glabel jpt_800EE350 -.word L8005BB2C, L8005BB40, L8005BB54, L8005BB84 -.word L8005BB98, L8005BBC8, L8005BBDC, L8005BC0C -.word L8005BC20, L8005BC50, L8005BC64, L8005BCF0 -.word L8005BD04, L8005BD54, L8005BD68, L8005BDB8 -.word L8005BDCC, L8005BE1C, L8005BE30, L8005BE80 -.word L8005BE94, L8005BEE4, L8005BEF8, L8005BF48 -.word L8005BF5C, L8005BFAC, L8005BFC0, L8005C000 -.word L8005C014, L8005C290, L8005C04C, L8005C290 -.word L8005C290, L8005C290, L8005C290, L8005C290 -.word L8005C290, L8005C290, L8005C290, L8005C290 -.word L8005C060, L8005C090, L8005C0A4, L8005C0D4 -.word L8005C0E8, L8005C118, L8005C12C, L8005C15C -.word L8005C170, L8005C1A0, L8005C1B4, L8005C1E4 -.word L8005C1F8, L8005C228, L8005C23C, L8005C26C -.word L8005C280 - -glabel jpt_800EE434 -.word L8005C290, L8005B974, L8005B988, L8005B9D0 -.word L8005B9E4, L8005BA08, L8005BA1C, L8005C290 -.word L8005C290, L8005C290, L8005C290, L8005C290 -.word L8005C290, L8005C290, L8005C290, L8005C290 -.word L8005C290, L8005C290, L8005C290, L8005C290 -.word L8005BA48, L8005BA68, L8005BA7C, L8005BA9C -.word L8005BAB0, L8005BAD0, L8005BAE4, L8005BB04 -.word L8005BB18 - -glabel D_800EE4A8 -.double 268.8 - -glabel jpt_800EE4B0 -.word L8005E870, L8005DBD8, L8005E25C, L8005E870 -.word L8005E6F0, L8005E870, L8005E0DC, L8005DEF0 -.word L8005EA7C, L8005E3DC, L8005E6F0, L8005EA7C -.word L8005E55C - -.word 0x00000000 - -glabel D_800EE4E8 -.double 0.04 - -glabel D_800EE4F0 -.double 0.04 - -glabel jpt_800EE4F8 -.word L8005F7E0, L8005EE2C, L8005F380, L8005F7E0 -.word L8005F6C8, L8005F7E0, L8005F268, L8005F0DC -.word L8005F8F4, L8005F498, L8005F6C8, L8005F8F4 -.word L8005F5B0 - -glabel jpt_800EE52C -.word L800603C8, L8005F9A0, L8005FF28, L800603C8 -.word L800602A0, L800603C8, L8005FE00, L8005FC60 -.word L800604EC, L80060050, L800602A0, L800604EC -.word L80060178 - -glabel D_800EE560 -.float 3000.0 -.word 0x00000000 - -glabel D_800EE568 -.double 0.1 - -glabel D_800EE570 -.float 5000.0 -.word 0x00000000 - -glabel D_800EE578 -.double 0.1 - -glabel D_800EE580 -.double 0.1 - -glabel D_800EE588 -.double -1.8 - -glabel D_800EE590 -.double -1.8 - -glabel D_800EE598 -.double -1.8 - -glabel D_800EE5A0 -.double -1.8 - -glabel D_800EE5A8 -.double -5.8 - -glabel D_800EE5B0 -.double -5.8 - -glabel D_800EE5B8 -.double 1.9 - -glabel D_800EE5C0 -.float 0.15 - -glabel D_800EE5C4 -.float 0.4 - -glabel jpt_800EE5C8 -.word L80062810, L80062528, L800626E0, L80062810 -.word L800627C4, L80062810, L80062694, L80062648 -.word L8006285C, L8006272C, L800627C4, L8006285C -.word L80062778 - -glabel D_800EE5FC -.float 0.2 - -glabel D_800EE600 -.float 0.2 - -glabel D_800EE604 -.float 0.2 - -glabel D_800EE608 -.float 0.2 - -glabel D_800EE60C -.float 0.1 - -glabel D_800EE610 -.double 0.07 - -glabel D_800EE618 -.double 0.3 - -glabel D_800EE620 -.double 0.1 - -glabel D_800EE628 -.double 0.1 - -glabel D_800EE630 -.double 0.3 - -glabel D_800EE638 -.float 5000.0 - -glabel D_800EE63C -.float 6000.0 - -glabel D_800EE640 -.double 0.06 - -glabel D_800EE648 -.double 0.3 - -glabel D_800EE650 -.double -5.8 - -glabel D_800EE658 -.double -5.8 - -glabel D_800EE660 -.double 0.05 - -glabel D_800EE668 -.double 0.08 - -glabel D_800EE670 -.double 0.2 - -glabel D_800EE678 -.double 0.1 - -glabel D_800EE680 -.float -1.8 - -glabel D_800EE684 -.float -1.8 - -glabel D_800EE688 -.float -1.8 - -glabel D_800EE68C -.float -1.8 - -glabel D_800EE690 -.double 0.3 - -glabel D_800EE698 -.double 0.15 - -glabel D_800EE6A0 -.double 0.2 - -glabel D_800EE6A8 -.double 0.06 - -glabel D_800EE6B0 -.double 0.2 - -glabel D_800EE6B8 -.double 0.1 - -glabel D_800EE6C0 -.double 0.4 - -glabel D_800EE6C8 -.double 0.1 - -glabel D_800EE6D0 -.double 0.35 - -glabel D_800EE6D8 -.double -1.2 - -glabel D_800EE6E0 -.double -1.2 - -glabel D_800EE6E8 -.double 0.2 - -glabel D_800EE6F0 -.double -0.7 - -glabel D_800EE6F8 -.double 0.2 - -glabel D_800EE700 -.double -0.6 - -glabel D_800EE708 -.double 0.1 - -glabel D_800EE710 -.double -0.8 - -glabel D_800EE718 -.double -0.8 - -glabel D_800EE720 -.double 0.06 - -glabel D_800EE728 -.double 0.1 - -glabel D_800EE730 -.double 0.3 - -glabel D_800EE738 -.double 0.04 - -glabel D_800EE740 -.double 1.2 - -glabel D_800EE748 -.double 0.1 - -glabel D_800EE750 -.double 0.4 - -glabel D_800EE758 -.double 0.8 - -glabel D_800EE760 -.double 1.2 - -glabel D_800EE768 -.double 1.8 - -glabel D_800EE770 -.double 0.15 - -glabel D_800EE778 -.double 1.2 - -glabel D_800EE780 -.float 1.2 -.word 0x00000000 - -glabel D_800EE788 -.double 0.8 - -glabel D_800EE790 -.double 0.4 - -glabel D_800EE798 -.double 0.08 - -glabel D_800EE7A0 -.double 0.2 - -glabel D_800EE7A8 -.double 1.2 - -glabel D_800EE7B0 -.float 1.2 -.word 0x00000000 - -glabel D_800EE7B8 -.double 0.4 - -glabel D_800EE7C0 -.double 1.4 - -glabel D_800EE7C8 -.double 0.8 - -glabel D_800EE7D0 -.float 0.1 -.word 0x00000000 - -glabel D_800EE7D8 -.double -3.8 - -glabel D_800EE7E0 -.double 0.0006 - -glabel D_800EE7E8 -.double -0.003 - -glabel D_800EE7F0 -.double 0.05 - -glabel D_800EE7F8 -.float 0.05 -.word 0x00000000 - -glabel D_800EE800 -.double -0.05 - -glabel D_800EE808 -.float -0.05 -.word 0x00000000 - -glabel D_800EE810 -.double 0.06 - -glabel D_800EE818 -.float 0.06 -.word 0x00000000 - -glabel D_800EE820 -.double -0.06 - -glabel D_800EE828 -.float -0.06 -.word 0x00000000 - -glabel D_800EE830 -.double -3.2 - -glabel D_800EE838 -.double 0.2 - -glabel D_800EE840 -.float 0.3 -.word 0x00000000 - -glabel D_800EE848 -.double 1.8 - -glabel D_800EE850 -.float 1.8 -.word 0x00000000 - -glabel D_800EE858 -.double 0.3 - -glabel D_800EE860 -.float 0.3 - -glabel jpt_800EE864 -.word L8006C734, L8006C750, L8006C76C, L8006C788 -.word L8006C7A4, L8006C9A4, L8006C9A4, L8006C9A4 -.word L8006C7C0, L8006C9A4, L8006C7DC - -glabel jpt_800EE890 -.word L8006CA50, L8006CA74, L8006CA98, L8006CABC -.word L8006CAE0, L8006CB04, L8006CB28, L8006CB4C -.word L8006CB70 - -glabel jpt_800EE8B4 -.word L8006CF38, L8006D184, L8006CF4C, L8006D184 -.word L8006CF60, L8006CF74, L8006CF88 - -glabel jpt_800EE8D0 -.word L8006D200, L8006D22C, L8006D258, L8006D284 -.word L8006D2B0 - -glabel jpt_800EE8E4 -.word L8006D628, L8006D69C, L8006D720, L8006D794 -.word L8006D808, L8006D87C, L8006D8F0, L8006D964 -.word L8006D628 - -glabel jpt_800EE908 -.word L8006D9F8, L8006DA6C, L8006DA6C, L8006DA6C -.word L8006DA6C, L8006DBC8, L8006DBC8, L8006DBC8 -.word L8006DAE0, L8006DBC8, L8006DB54 - -glabel jpt_800EE934 -.word L8006DED0, L8006DF00, L8006DF30, L8006DF60 -.word L8006DF90 - -glabel D_800EE948 -.float 1.6 - -glabel D_800EE94C -.float 1.6 - -# start code_8006E9C0 .late_rodata -glabel jpt_800EE950 -.word L8006F0E4, L8006F174, L8006F1AC, L8006F1E4 -.word L8006F248, L8006F2A4, L8006F2FC, L8006F360 -.word L8006F3E8, L8006F470, L8006F4D4, L8006F50C -.word L8006F578, L8006F600, L8006F640, L8006F678 -.word L8006F6A4, L8006F6D0, L8006F6FC, L8006F734 - -glabel D_800EE9A0 -.float 0.022 - -glabel D_800EE9A4 -.float 0.022 - -glabel D_800EE9A8 -.float 0.0174 - -glabel D_800EE9AC -.float 0.016 - -glabel D_800EE9B0 -.float 0.018 - -glabel D_800EE9B4 -.float 0.016 - -glabel D_800EE9B8 -.float 0.014 - -glabel D_800EE9BC -.float 0.014 - -glabel D_800EE9C0 -.float 0.0155 - -glabel D_800EE9C4 -.float 0.0155 - -glabel D_800EE9C8 -.float 0.013 - -glabel D_800EE9CC -.float 0.015 - -glabel D_800EE9D0 -.float 0.015 - -glabel D_800EE9D4 -.float 0.0103 - -glabel D_800EE9D8 -.float 0.0155 - -glabel D_800EE9DC -.float 0.0335 - -glabel D_800EE9E0 -.float 0.0445 - -glabel D_800EE9E4 -.float 0.0285 - -glabel D_800EE9E8 -.float 0.0155 - -glabel D_800EE9EC -.float 0.0257 - -glabel jpt_800EE9F0 -.word L800705A0, L800706EC, L800706EC, L800706EC -.word L800705B4, L800705C8, L80070640, L80070654 -.word L80070668, L8007067C, L80070690, L800706A4 -.word L800706B8, L800706CC, L800706E0 - -glabel jpt_800EEA2C -.word L800707CC -.word L80071400, L80070848, L80070AA8, L80070B30 -.word L80070C60, L80070DD8, L80070F10, L80070F8C -.word L80071024, L80071400, L800712A0, L80071348 -.word L80071378, L80071400, L80071400, L80071400 -.word L80071400, L800713E4 - -glabel D_800EEA78 -.float 0.7 -.word 0x00000000 - -# start code_80071F00 .late_rodata -glabel D_800EEA80 -.float 0.15 -.word 0x00000000 - -glabel D_800EEA88 -.double 180.0 - -glabel D_800EEA90 -.double 150.0 - -glabel D_800EEA98 -.double 0.8 - -glabel D_800EEAA0 -.double 0.2 - -glabel D_800EEAA8 -.double 0.4 - -glabel D_800EEAB0 -.double 0.0005 - -glabel D_800EEAB8 -.double 0.05 - -glabel D_800EEAC0 -.double 0.05 - -glabel D_800EEAC8 -.double 0.1 - -glabel D_800EEAD0 -.double 0.03 - -glabel D_800EEAD8 -.float 0.1 -.word 0x00000000 - -glabel D_800EEAE0 -.double 0.03 - -glabel D_800EEAE8 -.float 0.1 - -glabel jpt_800EEAEC -.word L80076524, L8007641C, L8007642C, L80076450 -.word L80076514 - -glabel jpt_800EEB00 -.word L80076AD8, L80076A28, L80076A38 -.word L80076A5C, L80076AC8 - -glabel D_800EEB14 -.float 0.3 - -glabel D_800EEB18 -.float 0.8 - -glabel D_800EEB1C -.float 0.05 - -glabel D_800EEB20 -.double 0.01 - -glabel D_800EEB28 -.double 0.01 - -glabel D_800EEB30 -.double 0.15 - -glabel D_800EEB38 -.float 0.1 - -glabel D_800EEB3C -.float 0.15 - -glabel D_800EEB40 -.double 0.01 - -glabel D_800EEB48 -.float 0.15 -.word 0x00000000 - -glabel D_800EEB50 -.double 0.03 - -glabel D_800EEB58 -.double 0.01 - -glabel D_800EEB60 -.double -0.3 - -glabel D_800EEB68 -.double 45.0 - -glabel D_800EEB70 -.double 0.03 - -glabel D_800EEB78 -.double 0.01 - -glabel D_800EEB80 -.double -0.6 - -glabel jpt_800EEB88 -.word L80078AFC, L80078B38, L80078B74, L80078BB0 -.word L80078BEC - -glabel jpt_800EEB9C -.word L80078CA4, L80078CDC, L80078D14 -.word L80078D54, L80078D8C - -glabel D_800EEBB0 -.double 1.7578125 - -glabel jpt_800EEBB8 -.word L80078E70, L80078F54, L80078F54, L80078F54 -.word L80078E84, L80078E98, L80078EA8, L80078EBC -.word L80078ED0, L80078EE4, L80078EF8, L80078F0C -.word L80078F20, L80078F34, L80078F48 - -glabel D_800EEBF4 -.float 0.15 - -glabel jpt_800EEBF8 -.word L8007962C, L800793C8, L800793D8, L80079424 -.word L80079454, L8007948C, L8007949C, L800794C0 -.word L800794FC, L80079520, L80079548, L80079580 -.word L800795BC, L800795E0, L80079614, L80079624 - -glabel D_800EEC38 -.float 5000.0 - -glabel D_800EEC3C -.float 0.15 - -glabel jpt_800EEC40 -.word L8007979C, L80079740, L80079750, L8007976C -.word L80079794 - -glabel D_800EEC54 -.float 0.15 - -glabel jpt_800EEC58 -.word L80079D04, L80079C4C, L80079C6C, L80079C84 -.word L80079CB8, L80079CD8 - -glabel jpt_800EEC70 -.word L80079E5C, L80079E88, L80079EAC, L80079F2C -.word L80079F40, L80079F9C, L80079FD4, L80079FE8 - -glabel D_800EEC90 -.float 5000.0 - -glabel D_800EEC94 -.float 0.15 - -glabel jpt_800EEC98 -.word L8007A218, L8007A168, L8007A178, L8007A194 -.word L8007A1A4, L8007A1CC, L8007A1DC, L8007A204 - -glabel D_800EECB8 -.float 5000.0 - -glabel D_800EECBC -.float 0.15 - -glabel jpt_800EECC0 -.word L8007A3E0, L8007A330, L8007A340, L8007A35C -.word L8007A36C, L8007A394, L8007A3A4, L8007A3CC - -glabel D_800EECE0 -.float 5000.0 - -glabel D_800EECE4 -.float 0.15 - -glabel jpt_800EECE8 -.word L8007A5C0, L8007A554, L8007A568, L8007A58C -.word L8007A5B8 - -glabel jpt_800EECFC -.word L8007AA30, L8007A9A0, L8007A9B8 -.word L8007A9D0, L8007A9E0, L8007A9F8, L8007AA10 -.word L8007AA28 - -glabel jpt_800EED1C -.word L8007ABE8, L8007AABC, L8007AAE8 -.word L8007AB14, L8007AB40, L8007AB6C, L8007AB98 -.word L8007ABC4 - -glabel jpt_800EED3C -.word L8007B998, L8007B41C, L8007B430 -.word L8007B5A4, L8007B5D0, L8007B5FC, L8007B628 -.word L8007B680, L8007B998, L8007B6A8, L8007B6D4 -.word L8007B6E8, L8007B834, L8007B998, L8007B998 -.word L8007B998, L8007B998, L8007B998, L8007B998 -.word L8007B998, L8007B844, L8007B894, L8007B998 -.word L8007B998, L8007B998, L8007B998, L8007B998 -.word L8007B998, L8007B998, L8007B998, L8007B8B0 -.word L8007B900, L8007B998, L8007B998, L8007B998 -.word L8007B998, L8007B998, L8007B998, L8007B998 -.word L8007B998, L8007B914, L8007B964, L8007B998 -.word L8007B998, L8007B998, L8007B998, L8007B998 -.word L8007B998, L8007B998, L8007B998, L8007B978 - -glabel D_800EEE08 -.double -1650.0 - -glabel D_800EEE10 -.float 0.2 -.word 0x00000000 - -glabel D_800EEE18 -.double 55.0 - -glabel jpt_800EEE20 -.word L8007BFA0, L8007BF0C, L8007BF1C, L8007BF4C -.word L8007BF68, L8007BF8C - -glabel jpt_800EEE38 -.word L8007C220, L8007C000 -.word L8007C040, L8007C060, L8007C0BC, L8007C0F8 -.word L8007C180, L8007C1B0, L8007C214 - -glabel D_800EEE5C -.float -0.2 - -glabel D_800EEE60 -.double 0.0015 - -glabel D_800EEE68 -.double 0.0015 - -glabel D_800EEE70 -.float 0.001 -.word 0x00000000 - -glabel D_800EEE78 -.double 0.004 - -glabel D_800EEE80 -.double 0.0002 - -glabel D_800EEE88 -.double 0.05 - -glabel D_800EEE90 -.double 0.01 - -glabel D_800EEE98 -.float 0.000001 - -glabel D_800EEE9C -.float 0.001 - -glabel D_800EEEA0 -.float 0.15 - -glabel jpt_800EEEA4 -.word L8007C798, L8007C704, L8007C734, L8007C764 -.word L8007C780 - -glabel D_800EEEB8 -.float 0.15 - -glabel jpt_800EEEBC -.word L8007CF70, L8007CF2C, L8007CF3C, L8007CF50 -.word L8007CF64 - -glabel jpt_800EEED0 -.word L8007D05C, L8007CFB8, L8007CFE4 -.word L8007D038, L8007D054 - -.word 0x00000000 - -glabel D_800EEEE8 -.double -1775.0 - -glabel D_800EEEF0 -.double 130.0 - -glabel D_800EEEF8 -.double -2500.0 - -glabel D_800EEF00 -.double 220.0 - -glabel D_800EEF08 -.double -2100.0 - -glabel D_800EEF10 -.double -290.0 - -glabel D_800EEF18 -.float 0.1 -.word 0x00000000 - -glabel D_800EEF20 -.double 2540.0 - -glabel D_800EEF28 -.double -2540.0 - -glabel D_800EEF30 -.double 2150.0 - -glabel D_800EEF38 -.double -2150.0 - -glabel D_800EEF40 -.float 1150.0 - -glabel D_800EEF44 -.float 1765.0 - -glabel D_800EEF48 -.float -1765.0 - -glabel jpt_800EEF4C -.word L8007E198, L8007E058, L8007E198, L8007E068 -.word L8007E084, L8007E154, L8007E180 - -glabel D_800EEF68 -.float -1371.0 - -glabel jpt_800EEF6C -.word L8007E4B4, L8007E42C, L8007E4B4, L8007E43C -.word L8007E454, L8007E4A8 - -glabel jpt_800EEF84 -.word L8007E8CC, L8007E8F4 -.word L8007E908, L8007E930, L8007E98C, L8007E9B4 -.word L8007EA44, L8007EA80, L8007EB88 - -glabel jpt_800EEFA8 -.word L8007E6E0 -.word L8007E748, L8007E82C, L8007E844, L8007E85C - -glabel jpt_800EEFBC -.word L8007EE24, L8007EDBC, L8007EDCC, L8007EDE0 -.word L8007EDF4 - -glabel jpt_800EEFD0 -.word L8007F26C, L8007F008, L8007F05C -.word L8007F084, L8007F26C, L8007F0B8, L8007F0E4 -.word L8007F10C, L8007F26C, L8007F144, L8007F170 -.word L8007F198, L8007F26C, L8007F1D0, L8007F200 -.word L8007F228, L8007F26C, L8007F260 - -glabel jpt_800EF018 -.word L8007F530 -.word L8007F2CC, L8007F320, L8007F348, L8007F530 -.word L8007F37C, L8007F3A8, L8007F3D0, L8007F530 -.word L8007F408, L8007F434, L8007F45C, L8007F530 -.word L8007F494, L8007F4C0, L8007F4E8, L8007F530 -.word L8007F524 - -glabel jpt_800EF060 -.word L8007FE94, L8007FBBC, L8007FBE4 -.word L8007FE94, L8007FDE0, L8007FE4C - -glabel D_800EF078 -.double -1000.0 - -glabel D_800EF080 -.double 1000.0 - -glabel jpt_800EF088 -.word L80080294, L80080248, L80080258, L8008026C -.word L80080280 - -glabel jpt_800EF09C -.word L80080500, L80080454, L80080464 -.word L800804AC, L800804E4 - -glabel D_800EF0B0 -.double 17.5 - -glabel D_800EF0B8 -.double 0.6 - -glabel D_800EF0C0 -.double 0.6 - -glabel D_800EF0C8 -.float 0.025 - -glabel jpt_800EF0CC -.word L80081318, L80081328, L80081338, L80081348 -.word L80081368, L80081358 - -glabel D_800EF0E4 -.float 0.15 - -glabel D_800EF0E8 -.double 0.8 - -glabel D_800EF0F0 -.double 0.01 - -glabel D_800EF0F8 -.double 4.8 - -glabel D_800EF100 -.double 0.1 - -glabel D_800EF108 -.float 0.15 - -glabel jpt_800EF10C -.word L80081A74, L80081970, L8008199C, L800819B0 -.word L800819D8, L800819F8, L80081A74, L80081A74 -.word L80081A74, L80081A74, L80081A08 - -glabel D_800EF138 -.double 0.184 - -glabel jpt_800EF140 -.word L80081D0C, L80081B70, L80081B80, L80081BC4 -.word L80081C0C, L80081D0C, L80081D0C, L80081D0C -.word L80081D0C, L80081D0C, L80081C44 - -glabel D_800EF16C -.float 0.2 - -glabel D_800EF170 -.double -360.0 - -glabel D_800EF178 -.double -1300.0 - -glabel D_800EF180 -.double 328.0 - -glabel D_800EF188 -.double 2541.0 - -glabel D_800EF190 -.double -985.0 - -glabel D_800EF198 -.double 1200.0 - -glabel D_800EF1A0 -.float 0.15 - -glabel jpt_800EF1A4 -.word L80082C84, L80082CFC, L80082D38, L80082D68 -.word L80082D94 - -glabel D_800EF1B8 -.float 0.8 - -glabel D_800EF1BC -.float 0.027 - -glabel D_800EF1C0 -.float 0.2 -.word 0x00000000 - -glabel D_800EF1C8 -.double 0.1 - -glabel jpt_800EF1D0 -.word L80083368, L80083298, L800832EC, L80083300 -.word L8008334C - -.word 0x00000000 - -glabel D_800EF1E8 -.double 0.001 - -glabel D_800EF1F0 -.double 0.05 - -glabel D_800EF1F8 -.double 2.6 - -glabel D_800EF200 -.double 0.1 - -glabel D_800EF208 -.float 0.1 - -glabel jpt_800EF20C -.word L80083A3C, L80083998, L800839A8, L800839BC -.word L80083A3C, L80083A3C, L80083A3C, L80083A3C -.word L80083A3C, L80083A3C, L800839D0, L800839EC -.word L80083A3C, L80083A3C, L80083A3C, L80083A3C -.word L80083A3C, L80083A3C, L80083A3C, L80083A3C -.word L80083A0C - -glabel D_800EF260 -.float 0.1 - -glabel jpt_800EF264 -.word L80083D30, L80083C54, L80083C64, L80083D30 -.word L80083D30, L80083D30, L80083D30, L80083D30 -.word L80083D30, L80083D30, L80083C78, L80083C9C -.word L80083CCC, L80083D14 - -glabel D_800EF29C -.float 0.001 - -glabel D_800EF2A0 -.float 0.0025 -.word 0x00000000 - -glabel D_800EF2A8 -.double 0.0002 - -glabel D_800EF2B0 -.double 0.04 - -glabel D_800EF2B8 -.double 0.05 - -glabel D_800EF2C0 -.double 0.1 - -glabel D_800EF2C8 -.float 0.2 -.word 0x00000000 - -glabel D_800EF2D0 -.double -383.0 - -glabel D_800EF2D8 -.double -2960.0 - -glabel D_800EF2E0 -.double -2490.0 - -glabel D_800EF2E8 -.double -2098.0 - -glabel D_800EF2F0 -.double -2080.0 - -glabel D_800EF2F8 -.float 0.08 - -glabel jpt_800EF2FC -.word L80084848, L80084904, L80084968, L800849CC -.word L80084A30, L80084A94 - -.word 0x00000000 - -glabel D_800EF318 -.double 146.0 - -glabel D_800EF320 -.double 380.0 - -glabel D_800EF328 -.float 0.15 -.word 0x00000000 - -glabel D_800EF330 -.double 380.0 - -glabel D_800EF338 -.double -2300.0 - -glabel D_800EF340 -.double -2500.0 - -glabel D_800EF348 -.double -535.0 - -glabel D_800EF350 -.double -250.0 - -glabel D_800EF358 -.float 0.04 - -glabel jpt_800EF35C -.word L80084C80, L80084BCC, L80084BDC, L80084C48 -.word L80084C6C - -glabel jpt_800EF370 -.word L80085000, L80084D7C, L80084DBC -.word L80084E5C, L80084F10, L80084F3C, L80084FAC - -glabel D_800EF38C -.float 0.4 - -glabel jpt_800EF390 -.word L80085104, L80085114, L80085124, L80085138 -.word L8008514C, L80085160 - -glabel D_800EF3A8 -.float 1.3 -.word 0x00000000 - -glabel D_800EF3B0 -.double -1250.0 - -glabel jpt_800EF3B8 -.word L80085588, L800855BC, L80085600, L80085614 -.word L8008565C, L80085670, L800856B4, L800856FC -.word L80085710 - -glabel D_800EF3DC -.float 0.03 - -glabel D_800EF3E0 -.float 0.03 -.word 0x00000000 - -glabel D_800EF3E8 -.double -1431.0 - -glabel jpt_800EF3F0 -.word L80085DA8, L80085CE0, L80085CF0, L80085D18 -.word L80085D38, L80085D48, L80085D70, L80085D80 -.word L80085DA0 - -.word 0x00000000 - -glabel D_800EF418 -.double 799.0 - -glabel jpt_800EF420 -.word L80085EE8, L80085E78, L80085E88, L80085EB0 -.word L80085ED0, L80085EE0 - -glabel D_800EF438 -.double -2013.0 - -glabel jpt_800EF440 -.word L80086064, L80085FB4, L80085FC4, L80085FEC -.word L80085FFC, L80086014, L80086024, L8008604C -.word L8008605C - -.word 0x00000000 - -glabel D_800EF468 -.double 0.1 - -glabel D_800EF470 -.float 0.005 - -glabel jpt_800EF474 -.word L80086BB0, L80086990, L800869A0, L80086A04 -.word L80086A18, L80086AFC, L80086B6C, L80086B8C - -glabel D_800EF494 -.float -0.4 - -.word 0x00000000, 0x00000000 - -glabel D_800EF4A0 -.float 0.025 - -glabel D_800EF4A4 -.float 0.075 - -glabel D_800EF4A8 -.float 0.15 - -glabel D_800EF4AC -.float 0.1 - -glabel D_800EF4B0 -.float 0.15 - -glabel D_800EF4B4 -.float 0.2 - -glabel D_800EF4B8 -.float 0.025 - -glabel D_800EF4BC -.float 0.075 - -glabel D_800EF4C0 -.float 0.1 - -glabel D_800EF4C4 -.float 0.15 - -glabel D_800EF4C8 -.float 0.06 - -glabel D_800EF4CC -.float 0.07 - -glabel D_800EF4D0 -.float 0.075 - -glabel D_800EF4D4 -.float 0.1 - -glabel D_800EF4D8 -.double 1.1 - -glabel D_800EF4E0 -.double 1.1 - -glabel D_800EF4E8 -.double 1.1 - -glabel D_800EF4F0 -.double 500.0 - -glabel D_800EF4F8 -.double 0.6666666666666666 - -glabel D_800EF500 -.double 0.16666666666666666 - -glabel D_800EF508 -.double 10000.0 - -glabel D_800EF510 -.double 10000.0 - -glabel jpt_800EF518 -.word L8008C1A8, L8008C040, L8008C060, L8008C088 -.word L8008C0B0, L8008C0F8, L8008C140, L8008C168 - -.word 0x00000000, 0x00000000 - -glabel D_800EF540 -.double 0.2 - -glabel D_800EF548 -.double 0.8 - -glabel D_800EF550 -.double 0.1 - -glabel D_800EF558 -.double 0.9 - -glabel D_800EF560 -.double 1.3 - -glabel D_800EF568 -.float 2002.0 - -glabel D_800EF56C -.float -2002.0 - -glabel D_800EF570 -.double 0.13 - -glabel D_800EF578 -.float 3458.0 -.word 0x00000000 - -glabel D_800EF580 -.double 0.085 - -glabel D_800EF588 -.double 0.6 - -glabel D_800EF590 -.double 0.6 - -glabel D_800EF598 -.double 0.9 - -glabel D_800EF5A0 -.double 0.7 - -glabel D_800EF5A8 -.double 0.05 - -glabel jpt_800EF5B0 -.word L8008FF40, L8008FFB8, L80090010, L80090028 -.word L80090140, L80090084, L80090140, L80090140 -.word L80090140, L80090140, L80090140, L80090010 -.word L80090140, L80090138, L80090138, L80090138 -.word L800900E0, L80090138 - -glabel jpt_800EF5F8 -.word L80090474, L80090698, L80090698, L80090698 -.word L80090698, L80090698, L80090698, L80090698 -.word L80090698, L80090698, L80090698, L80090580 -.word L800905C4, L8009060C, L80090698, L80090650 -glabel jpt_800EF638 -.word L800909D0, L80090B80, L80090C84, L80090CDC -.word L80090E08 - -.word 0x00000000 - -glabel D_800EF650 -.double 0.9 - -glabel D_800EF658 -.float 1820.0 - -glabel D_800EF65C -.float -1820.0 - -glabel jpt_800EF660 -.word L8009117C, L80091184, L80091158, L80091158 -.word L80091158, L80091158 - -glabel D_800EF678 -.float 0.002 - -glabel D_800EF67C -.float 2.6 - -glabel D_800EF680 -.double 1.08 -.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 #balign 64 instead ? - +# code_80091750 begin glabel gGlyphDisplayWidth .hword 0x000c, 0x000d, 0x000b, 0x000b, 0x000a, 0x000b, 0x000b, 0x000d .hword 0x0007, 0x000a, 0x000c, 0x000a, 0x0012, 0x000d, 0x000c, 0x000c @@ -4043,5 +2660,3 @@ glabel D_800F2B20 glabel D_800F2B28 .double 0.4 - -.balign 16 diff --git a/data/rodata_main.s b/data/rodata_main.s deleted file mode 100644 index 01a2037cd..000000000 --- a/data/rodata_main.s +++ /dev/null @@ -1,50 +0,0 @@ -.include "macros.inc" - -.section .rodata - -#.balign 4 -#glabel D_800EB5D0 -#.asciiz "SOUTH " - -#.balign 4 -#glabel D_800EB5D8 -#.asciiz "EAST " - -#.balign 4 -#glabel D_800EB5E0 -#.asciiz "NORTH " -#.balign 4 - -#glabel D_800EB5E8 -#.asciiz "WEST " - -#.balign 4 -#glabel D_800EB5F0 -#.asciiz "SOUTH " - -#.balign 4 -#glabel D_800EB5F8 -#.double 0.01666666 - -#glabel D_800EB600 -#.double 0.01666666 - -#glabel D_800EB608 -#.double 0.01666666 - -#glabel D_800EB610 -#.double 0.01666666 - -#glabel D_800EB618 -#.word L80001F0C, L80001F0C, L80001F0C, L80001F0C -#.word L80001F38, L80001F48, L80001F60, L80001EFC -#.word L80001F60, L80001F58 - -#glabel D_800EB640 -#.double 0.01666666 - -#glabel D_800EB648 -#.word L800026B4, L800026CC, L800026E4, L800026FC -#.word L80002714, L8000272C, L8000276C, L8000276C -#.word L8000276C, L8000274C -#glabel D_800EB670 diff --git a/include/waypoints.h b/include/waypoints.h index 80c80423e..aac722656 100644 --- a/include/waypoints.h +++ b/include/waypoints.h @@ -42,7 +42,7 @@ extern s32 D_80163448; // Shadows values from gPathIndexByPlayerId, but is an array extern u16 D_80165310[]; // Shadows values from gNearestWaypointByPlayerId, but is an array -extern u16 D_80165320[]; +extern s16 D_80165320[]; // Don't think this really belongs with waypoint stuff, but don't know where else to put it extern s16 D_80165330[]; // Shadows values from D_80164560 diff --git a/mk64.ld b/mk64.ld index b0437937e..a6fdd1b7f 100644 --- a/mk64.ld +++ b/mk64.ld @@ -236,7 +236,7 @@ SECTIONS BUILD_DIR/src/main.o(.data); BUILD_DIR/data/data_0DD0A0.o(.data); BUILD_DIR/src/code_800029B0.o(.data); - BUILD_DIR/data/data_0DD0A0_0.o(.data); + BUILD_DIR/src/profiler.o(.data); BUILD_DIR/src/crash_screen.o(.data); BUILD_DIR/src/staff_ghosts.o(.data); BUILD_DIR/data/data_0DD0A0_1.o(.data); @@ -246,16 +246,16 @@ SECTIONS BUILD_DIR/src/kart_dma.o(.data); BUILD_DIR/data/data_0DD0A0_1_2.o(.data); BUILD_DIR/src/kart_attributes.inc.o(.data); - BUILD_DIR/data/data_0DD0A0_2.o(.data); + BUILD_DIR/src/code_80027D00.o(.data); BUILD_DIR/src/spawn_players.o(.data); BUILD_DIR/data/data_0DD0A0_2_0.o(.data); BUILD_DIR/src/code_800AF9B0.o(.data); BUILD_DIR/src/menus.o(.data); BUILD_DIR/src/code_800B45E0.o(.data); BUILD_DIR/data/data_800E8700.o(.data); - BUILD_DIR/data/data_audio.o(.data); + BUILD_DIR/src/audio/synthesis.o(.data); + BUILD_DIR/src/audio/heap.o(.data); BUILD_DIR/src/audio/load.o(.data); - BUILD_DIR/data/data_0DD0A0_2_1_0.o(.rodata); BUILD_DIR/src/audio/playback.o(.data); BUILD_DIR/src/audio/effects.o(.data); BUILD_DIR/data/data_0DD0A0_2_1_1.o(.rodata); @@ -277,23 +277,31 @@ SECTIONS BUILD_DIR/src/main.o(.rodata); BUILD_DIR/src/code_800029B0.o(.rodata); BUILD_DIR/data/data_0DD0A0_3.o(.rodata); + BUILD_DIR/src/camera.o(.rodata); BUILD_DIR/src/code_8001F980.o(.rodata); - BUILD_DIR/data/data_0DD0A0_3_0_0.o(.rodata); + BUILD_DIR/src/code_80027D00.o(.rodata); BUILD_DIR/src/spawn_players.o(.rodata); BUILD_DIR/src/code_8003DC40.o(.rodata); BUILD_DIR/src/code_800431B0.o(.rodata); BUILD_DIR/src/code_80057C60.o(.rodata); - BUILD_DIR/data/data_0DD0A0_3_0.o(.rodata); + BUILD_DIR/src/code_8006E9C0.o(.rodata); + BUILD_DIR/src/code_80071F00.o(.rodata); + BUILD_DIR/src/code_80086E70.o(.rodata); + BUILD_DIR/src/code_8008C1D0.o(.rodata); + BUILD_DIR/data/rodata_code_80091750.o(.rodata); BUILD_DIR/src/code_800AF9B0.o(.rodata); BUILD_DIR/src/menus.o(.rodata); BUILD_DIR/src/code_800B45E0.o(.rodata); - BUILD_DIR/data/rodata_audio.o(.rodata); + BUILD_DIR/src/audio/heap.o(.rodata); + BUILD_DIR/src/audio/load.o(.rodata); BUILD_DIR/src/audio/playback.o(.rodata); BUILD_DIR/src/audio/effects.o(.rodata); - BUILD_DIR/data/rodata_audio_2.o(.rodata); + BUILD_DIR/src/audio/seqplayer.o(.rodata); + BUILD_DIR/src/audio/external.o(.rodata); + BUILD_DIR/src/audio/port_eu.o(.rodata); BUILD_DIR/src/os/guRotateF.o(.rodata); BUILD_DIR/src/os/guPerspectiveF.o(.rodata); - BUILD_DIR/data/data_0DD0A0_3_1.o(.rodata); + BUILD_DIR/asm/os/__osException.o(.rodata); BUILD_DIR/src/os/__osDevMgrMain.o(.rodata); BUILD_DIR/src/os/math/sinf.o(.rodata); BUILD_DIR/src/os/math/cosf.o(.rodata); @@ -312,7 +320,7 @@ SECTIONS BUILD_DIR/src/profiler.o(.bss); BUILD_DIR/src/crash_screen.o(.bss); - BUILD_DIR/asm/bss_80004740.o(.bss); + BUILD_DIR/src/code_80004740.o(.bss); BUILD_DIR/src/staff_ghosts.o(.bss); BUILD_DIR/asm/bss_80005FD0.o(.bss); BUILD_DIR/asm/bss_MainSeg.o(.bss); @@ -348,6 +356,7 @@ SECTIONS BUILD_DIR/src/actors.o(.text); BUILD_DIR/src/skybox_and_splitscreen.o(.text); BUILD_DIR/src/memory.o(.text); + BUILD_DIR/src/code_802AAA70.o(.text); BUILD_DIR/src/actors_extended.o(.text); BUILD_DIR/src/math_util.o(.text); BUILD_DIR/src/render_courses.o(.data); @@ -358,12 +367,12 @@ SECTIONS BUILD_DIR/src/actors_extended.o(.data); BUILD_DIR/src/race_logic.o(.data); BUILD_DIR/src/race_logic.o(.rodata); - BUILD_DIR/data/data_121DA0_2_1.o(.data); BUILD_DIR/src/render_courses.o(.rodata); BUILD_DIR/src/actors.o(.rodata); - BUILD_DIR/data/data_121DA0_2_2.o(.data); + BUILD_DIR/src/skybox_and_splitscreen.o(.rodata); + BUILD_DIR/src/memory.o(.rodata); + BUILD_DIR/src/code_802AAA70.o(.rodata); BUILD_DIR/src/actors_extended.o(.rodata); - BUILD_DIR/data/data_121DA0_2_3.o(.data); BUILD_DIR/src/math_util.o(.rodata); } END_SEG(code_8028DF00) @@ -400,7 +409,7 @@ SECTIONS BUILD_DIR/src/dl_unk_80284EE0.inc.o(.data); BUILD_DIR/src/credits_01.inc.o(.data); BUILD_DIR/src/ceremony_and_credits.o(.data); - BUILD_DIR/data/data_credits_128480_1.o(.data); + BUILD_DIR/src/code_80280650.o(.rodata); BUILD_DIR/src/camera_junk.o(.rodata); BUILD_DIR/data/data_credits_128480_2.o(.data); BUILD_DIR/src/ceremony_and_credits.o(.rodata); diff --git a/progress.py b/progress.py index 1a94fd830..7c3f7d3cd 100644 --- a/progress.py +++ b/progress.py @@ -90,6 +90,7 @@ seg2Files2 = [ ] seg3Files2 = [ "asm/non_matchings/code_80280650", + "asm/non_matchings/code_802AAA70", "asm/non_matchings/ceremony_and_credits", ] audioFiles2 = [ @@ -191,6 +192,7 @@ seg3Files = [ "build/us/src/code_80280650", "build/us/src/code_80281780", "build/us/src/code_80281C40", + "build/us/src/code_802AAA70", "build/us/src/ceremony_and_credits", ] segAudioFiles = [ diff --git a/src/actors.c b/src/actors.c index db61a51cb..3602a6dab 100644 --- a/src/actors.c +++ b/src/actors.c @@ -15,6 +15,7 @@ #include "code_80005FD0.h" #include "code_80071F00.h" #include "code_8008C1D0.h" +#include "code_802AAA70.h" #include #include "audio/external.h" #include "common_textures.h" diff --git a/src/actors_extended.c b/src/actors_extended.c index b0a84606c..16a913ecf 100644 --- a/src/actors_extended.c +++ b/src/actors_extended.c @@ -7,6 +7,7 @@ #include "waypoints.h" #include "code_80005FD0.h" #include "code_80091750.h" +#include "code_802AAA70.h" #include "actors.h" #include "actors_extended.h" #include "audio/external.h" diff --git a/src/audio/external.c b/src/audio/external.c index f5f07b19c..27a85c2c5 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -279,8 +279,6 @@ void func_800C1DA4(Camera *arg0, Vec3s arg1, struct Unk_8018EFD8 *arg2) { arg2->unk18[2] = func_80041724(temp_f12, temp_f14, arg1[1]); } -#ifdef NEEDS_RODATA -extern f32 D_800F35DC;// = 0.1f void func_800C1E2C(Camera *camera, Vec3f arg1, struct Unk_8018EFD8 *arg2) { f32 sp44; f32 temp_f6; @@ -316,13 +314,7 @@ void func_800C1E2C(Camera *camera, Vec3f arg1, struct Unk_8018EFD8 *arg2) { arg2->unk2C *= (((*arg2->unk24) / D_800EA06C[arg2->unk30].unk00[1]) + D_800EA06C[arg2->unk30].unk00[0]) + D_800E9F34[arg2->unk30]; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C1E2C.s") -#endif -#ifdef NEEDS_RODATA -// data/rodata_audio_2.s -extern f32 D_800F35E0;// = 100000.0f; void func_800C1F8C(void) { u8 var_s1; u8 var_a1; @@ -367,13 +359,7 @@ void func_800C1F8C(void) { } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C1F8C.s") -#endif -#ifdef NEEDS_RODATA -// data/rodata_audio_2.s -extern f32 D_800F35E4;// = 100000.0f; f32 *func_800C21E8(Vec3f arg0, u32 arg1) { u8 var_v0; f32 *ret; @@ -402,9 +388,6 @@ f32 *func_800C21E8(Vec3f arg0, u32 arg1) { } return ret; } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C21E8.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c @@ -3100,12 +3083,6 @@ void func_800C64A0(s32 playerId) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C64A0.s") #endif -#ifdef NEEDS_RODATA -// data/rodata_audio_2.s -extern f32 D_800F3730;// = 0.6f; -extern f32 D_800F3734;// = 13000.0f; -extern f32 D_800F3738;// = 0.95f - void func_800C6758(u8 playerId) { switch (D_800E9E74[playerId]) { /* irregular */ case 3: @@ -3121,9 +3098,6 @@ void func_800C6758(u8 playerId) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C6758.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c @@ -3978,15 +3952,6 @@ void func_800C86D8(u8 playerId) { } } -#ifdef NEEDS_RODATA -// data/rodata_audio_2.s -extern f32 D_800F3894;// = 0.7f; -extern f32 D_800F3898;// = 0.1f; -extern f32 D_800F389C;// = 0.03f; -extern f32 D_800F38A0;// = 0.16f; -extern f32 D_800F38A4;// = 0.15f; -extern f32 D_800F38A8;// = 0.03f; - void func_800C8770(u8 playerId) { if ((gPlayers[playerId].unk_0BC & 0x40000000) == 0x40000000) { D_800E9F24[playerId] = 1; @@ -4018,9 +3983,6 @@ void func_800C8770(u8 playerId) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8770.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -4037,11 +3999,6 @@ void func_800C8920(void) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8920.s") #endif -#ifdef NEEDS_RODATA -// data/rodata_audio_2.s -extern f32 D_800F38AC;// = 0.012f; -extern f32 D_800F38B0;// = 0.85f; - void func_800C89E4(void) { if (D_800EA180 != 0) { D_800EA180++; @@ -4064,9 +4021,6 @@ void func_800C89E4(void) { } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C89E4.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c @@ -4653,21 +4607,6 @@ void func_800C99E0(Vec3f arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C99E0.s") #endif -#ifdef NEEDS_RODATA -// data/rodata_audio_2.s -// jpt_800F3960 -extern f32 D_800F3980;// = 0.35f -extern f32 D_800F3984;// = 1568.979614f -extern f32 D_800F3988;// = 0.6f -extern f32 D_800F398C;// = 1478.461548f -extern f32 D_800F3990;// = 0.6f -extern f32 D_800F3994;// = 1747.272827f -extern f32 D_800F3998;// = 0.2f -extern f32 D_800F399C;// = 2135.555664f -extern f32 D_800F39A0;// = 0.4f -extern f32 D_800F39A4;// = 1922.0f - - void func_800C9A88(u8 playerId) { u8 var_s0; u32 soundBits; @@ -4719,9 +4658,6 @@ void func_800C9A88(u8 playerId) { } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9A88.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c diff --git a/src/audio/heap.c b/src/audio/heap.c index 8ccaa6461..9361d27ec 100644 --- a/src/audio/heap.c +++ b/src/audio/heap.c @@ -8,6 +8,52 @@ extern struct SoundAllocPool gNotesAndBuffersPool; +/** + * Given that (almost) all of these are format strings, it is highly likely + * that they are meant to be used in some sort of printf variant. But I don't + * care to try and figure out which function gets which string(s) + * So I've place them all here instead. +**/ +char heapAudioString00[] = "Warning:Kill Note %x \n"; +char heapAudioString01[] = "Kill Voice %d (ID %d) %d\n"; +char heapAudioString02[] = "Warning: Running Sequence's data disappear!\n"; +char heapAudioString03[] = "Audio:Memory:Heap OverFlow : Not Allocate %d!\n"; +char heapAudioString04[] = "Audio:Memory:DataHeap Not Allocate \n"; +char heapAudioString05[] = "StayHeap Not Allocate %d\n"; +char heapAudioString06[] = "AutoHeap Not Allocate %d\n"; +char heapAudioString07[] = "Status ID0 : %d ID1 : %d\n"; +char heapAudioString08[] = "id 0 is Stopping\n"; +char heapAudioString09[] = "id 0 is Stop\n"; +char heapAudioString10[] = "id 1 is Stopping\n"; +char heapAudioString11[] = "id 1 is Stop\n"; +char heapAudioString12[] = "WARNING: NO FREE AUTOSEQ AREA.\n"; +char heapAudioString13[] = "WARNING: NO STOP AUTO AREA.\n"; +char heapAudioString14[] = " AND TRY FORCE TO STOP SIDE \n"; +char heapAudioString15[] = "Check ID0 (seq ID %d) Useing ...\n"; +char heapAudioString16[] = "Check ID1 (seq ID %d) Useing ...\n"; +char heapAudioString17[] = "No Free Seq area.\n"; +char heapAudioString18[] = "CH %d: ID %d\n"; +char heapAudioString19[] = "TWO SIDES ARE LOADING... ALLOC CANCELED.\n"; +char heapAudioString20[] = "WARNING: Before Area Overlaid After."; +char heapAudioString21[] = "WARNING: After Area Overlaid Before."; +char heapAudioString22[] = "MEMORY:SzHeapAlloc ERROR: sza->side %d\n"; +char heapAudioString23[] = "Audio:MEMORY:SzHeap Overflow error. (%d bytes)\n"; +char heapAudioString24[] = "Auto Heap Unhit for ID %d\n"; +char heapAudioString25[] = "Heap Reconstruct Start %x\n"; +char heapAudioString26[] = "AHPBASE %x\n"; +char heapAudioString27[] = "AHPCUR %x\n"; +char heapAudioString28[] = "HeapTop %x\n"; +char heapAudioString29[] = "SynoutRate %d / %d \n"; +char heapAudioString30[] = "FXSIZE %d\n"; +char heapAudioString31[] = "FXCOMP %d\n"; +char heapAudioString32[] = "FXDOWN %d\n"; +char heapAudioString33[] = "WaveCacheLen: %d\n"; +char heapAudioString34[] = "SpecChange Finished\n"; +char heapAudioString35[] = "Fbank Seq %x\n"; +char heapAudioString36[] = "Already Load Type %d,ID %d\n"; +char heapAudioString37[] = "Warning:Emem Over,not alloc %d\n"; +char heapAudioString38[] = "Write %d\n"; + #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern u8 D_803B0380; @@ -69,11 +115,10 @@ void discard_bank(s32 bankId) { if (note->noteSubEu.bankId == bankId) { // (These prints are unclear. Arguments are picked semi-randomly.) - eu_stubbed_printf_1("Warning:Kill Note %x \n", i); + // eu_stubbed_printf_1("Warning:Kill Note %x \n", i); if (note->priority >= NOTE_PRIORITY_MIN) { - eu_stubbed_printf_3("Kill Voice %d (ID %d) %d\n", note->waveId, - bankId, note->priority); - eu_stubbed_printf_0("Warning: Running Sequence's data disappear!\n"); + // eu_stubbed_printf_3("Kill Voice %d (ID %d) %d\n", note->waveId, bankId, note->priority); + // eu_stubbed_printf_0("Warning: Running Sequence's data disappear!\n"); note->parentLayer->enabled = FALSE; // is 0x48, should be 0x44 note->parentLayer->finished = TRUE; } @@ -106,7 +151,7 @@ void *soundAlloc(struct SoundAllocPool *pool, u32 size) { *pos = 0; } } else { - eu_stubbed_printf_1("Heap OverFlow : Not Allocate %d!\n", size); + // eu_stubbed_printf_1("Heap OverFlow : Not Allocate %d!\n", size); return NULL; } pool->numAllocatedEntries++; diff --git a/src/audio/load.c b/src/audio/load.c index 88ecadf7a..9c4a81095 100644 --- a/src/audio/load.c +++ b/src/audio/load.c @@ -36,46 +36,63 @@ extern u8 sSampleDmaReuseQueueTail2; // sSampleDmaReuseQueueTail2 extern u8 sSampleDmaReuseQueueHead1; // sSampleDmaReuseQueueHead1 extern u8 sSampleDmaReuseQueueHead2; // sSampleDmaReuseQueueHead2 +/** + * Given that (almost) all of these are format strings, it is highly likely + * that they are meant to be used in some sort of printf variant. But I don't + * care to try and figure out which function gets which string(s) + * So I've place them all here instead. +**/ +char loadAudioString00[] = "Romcopy %x -> %x ,size %x\n"; +char loadAudioString01[] = "Romcopyend\n"; +char loadAudioString02[] = "CAUTION:WAVE CACHE FULL %d"; +char loadAudioString03[] = "LOAD Rom :%x -> Ram :%x Len:%x\n"; +char loadAudioString04[] = "BASE %x %x\n"; +char loadAudioString05[] = "LOAD %x %x %x\n"; +char loadAudioString06[] = "INSTTOP %x\n"; +char loadAudioString07[] = "INSTMAP[0] %x\n"; +char loadAudioString08[] = "already flags %d\n"; +char loadAudioString09[] = "already flags %d\n"; +char loadAudioString10[] = "ERR:SLOW BANK DMA BUSY\n"; +char loadAudioString11[] = "ERR:SLOW DMA BUSY\n"; +char loadAudioString12[] = "Check %d bank %d\n"; +char loadAudioString13[] = "Cache Check\n"; +char loadAudioString14[] = "NO BANK ERROR\n"; +char loadAudioString15[] = "BANK %d LOADING START\n"; +char loadAudioString16[] = "BANK %d LOAD MISS (NO MEMORY)!\n"; +char loadAudioString17[] = "BANK %d ALREADY CACHED\n"; +char loadAudioString18[] = "BANK LOAD MISS! FOR %d\n"; +char loadAudioString19[] = "Seq %d Loading Start\n"; +char loadAudioString20[] = "Heap Overflow Error\n"; +char loadAudioString21[] = "SEQ %d ALREADY CACHED\n"; +char loadAudioString22[] = "Ok,one bank slow load Start \n"; +char loadAudioString23[] = "Sorry,too many %d bank is none.fast load Start \n"; +char loadAudioString24[] = "Seq %d:Default Load Id is %d\n"; +char loadAudioString25[] = "Seq Loading Start\n"; +char loadAudioString26[] = "Error:Before Sequence-SlowDma remain.\n"; +char loadAudioString27[] = " Cancel Seq Start.\n"; +char loadAudioString28[] = "SEQ %d ALREADY CACHED\n"; +char loadAudioString29[] = "Clear Workarea %x -%x size %x \n"; +char loadAudioString30[] = "AudioHeap is %x\n"; +char loadAudioString31[] = "Heap reset.Synth Change %x \n"; +char loadAudioString32[] = "Heap %x %x %x\n"; +char loadAudioString33[] = "Main Heap Initialize.\n"; +char loadAudioString34[] = "---------- Init Completed. ------------\n"; +char loadAudioString35[] = " Syndrv :[%6d]\n"; +char loadAudioString36[] = " Seqdrv :[%6d]\n"; +char loadAudioString37[] = " audiodata :[%6d]\n"; +char loadAudioString38[] = "---------------------------------------\n"; + /** * Performs an immediate DMA copy */ void audio_dma_copy_immediate(uintptr_t devAddr, void *vAddr, size_t nbytes) { - eu_stubbed_printf_3("Romcopy %x -> %x ,size %x\n", devAddr, vAddr, nbytes); + // eu_stubbed_printf_3("Romcopy %x -> %x ,size %x\n", devAddr, vAddr, nbytes); osInvalDCache(vAddr, nbytes); osPiStartDma(&D_803B6740, OS_MESG_PRI_HIGH, OS_READ, devAddr, vAddr, nbytes, &D_803B6720); osRecvMesg(&D_803B6720, NULL, OS_MESG_BLOCK); - eu_stubbed_printf_0("Romcopyend\n"); + // eu_stubbed_printf_0("Romcopyend\n"); } -const char audioString34[] = "CAUTION:WAVE CACHE FULL %d"; -const char audioString35[] = "LOAD Rom :%x -> Ram :%x Len:%x\n"; -const char audioString36[] = "BASE %x %x\n"; -const char audioString37[] = "LOAD %x %x %x\n"; -const char audioString38[] = "INSTTOP %x\n"; -const char audioString39[] = "INSTMAP[0] %x\n"; -const char audioString40[] = "already flags %d\n"; -const char audioString41[] = "already flags %d\n"; -const char audioString42[] = "ERR:SLOW BANK DMA BUSY\n"; -const char audioString43[] = "ERR:SLOW DMA BUSY\n"; -const char audioString44[] = "Check %d bank %d\n"; -const char audioString45[] = "Cache Check\n"; -const char audioString46[] = "NO BANK ERROR\n"; -const char audioString47[] = "BANK %d LOADING START\n"; -const char audioString48[] = "BANK %d LOAD MISS (NO MEMORY)!\n"; -const char audioString49[] = "BANK %d ALREADY CACHED\n"; -const char audioString50[] = "BANK LOAD MISS! FOR %d\n"; - - -const char audioString51[] = "Seq %d Loading Start\n"; - -const char audioString52[] = "Heap Overflow Error\n"; - -const char asdf[] = "SEQ %d ALREADY CACHED\n"; -const char fdsa[] = "Ok,one bank slow load Start \n"; -const char af[] = "Sorry,too many %d bank is none.fast load Start \n"; - - - /** * Performs an asynchronus (normal priority) DMA copy */ diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c index 5a8f7da4e..f6dec69ec 100644 --- a/src/audio/synthesis.c +++ b/src/audio/synthesis.c @@ -49,8 +49,17 @@ f32 gLeftVolRampings; //f32 *gCurrentLeftVolRamping; // Points to any of the three left buffers above //f32 *gCurrentRightVolRamping; // Points to any of the three right buffers above -u8 audioString1[] = "pitch %x: delaybytes %d : olddelay %d\n"; -u8 audioString2[] = "cont %x: delaybytes %d : olddelay %d\n"; +/** + * Given that (almost) all of these are format strings, it is highly likely + * that they are meant to be used in some sort of printf variant. But I don't + * care to try and figure out which function gets which string(s) + * So I've place them all here instead. +**/ +char synthesisAudioString0[] = "Terminate-Canceled Channel %d,Phase %d\n"; +char synthesisAudioString1[] = "Copy %d\n"; +char synthesisAudioString2[] = "%d->%d\n"; +char synthesisAudioString3[] = "pitch %x: delaybytes %d : olddelay %d\n"; +char synthesisAudioString4[] = "cont %x: delaybytes %d : olddelay %d\n"; // Equivalent functionality as the US/JP version, // just that the reverb structure is chosen from an array with index diff --git a/src/camera.c b/src/camera.c index 7ea44085c..7c58c759e 100644 --- a/src/camera.c +++ b/src/camera.c @@ -8,6 +8,9 @@ #include "waypoints.h" #include "variables.h" #include "code_8001F980.h" +#include "code_802AAA70.h" + +f32 D_800DDB30[] = { 0.4f, 0.6f, 0.275f, 0.3f }; Camera cameras[4]; Camera *camera1 = &cameras[0]; diff --git a/src/camera.h b/src/camera.h index d29827c2e..e33fffa3a 100644 --- a/src/camera.h +++ b/src/camera.h @@ -67,6 +67,8 @@ extern f32 D_80164A30; extern f32 D_80164A90[]; extern f32 D_80164AA0[]; +extern f32 D_800DDB30[]; + extern Camera cameras[]; extern Camera *camera1; extern Camera *camera2; diff --git a/src/code_80004740.c b/src/code_80004740.c index e1253219d..ea3053463 100644 --- a/src/code_80004740.c +++ b/src/code_80004740.c @@ -6,6 +6,11 @@ #include "code_80004740.h" #include "memory.h" +Vec3s D_80162D70; +s16 D_80162D76; +s16 D_80162D78; +s16 D_80162D7A; + void func_80004740(Mtx *dest, Mat4 src) { #ifdef AVOID_UB // Avoid type-casting which is technically UB by calling the equivalent diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 8b57eb2fc..d9b214fce 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -10,6 +10,7 @@ #include "code_8001F980.h" #include "code_80027D00.h" #include "code_80071F00.h" +#include "code_802AAA70.h" #include "variables.h" #include #include "vehicles.h" diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 4f25f277f..1332993df 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -8,9 +8,316 @@ #include "code_8001F980.h" #include "code_80027D00.h" #include "code_8008C1D0.h" +#include "code_802AAA70.h" #include "waypoints.h" #include "audio/external.h" +s16 D_800E3810[] = { + 1, 2, 3, 4, 5, 6, 7, 0 +}; + +s16 D_800E3820[] = { + 0, 2, 3, 4, 5, 6, 7, 0 +}; + +s16 D_800E3830[] = { + 0, 1, 3, 4, 5, 6, 7, 0 +}; + +s16 D_800E3840[] = { + 0, 1, 2, 4, 5, 6, 7, 0 +}; + +s16 D_800E3850[] = { + 0, 1, 2, 3, 5, 6, 7, 0 +}; + +s16 D_800E3860[] = { + 0, 1, 2, 3, 4, 6, 7, 0 +}; + +s16 D_800E3870[] = { + 0, 1, 2, 3, 4, 5, 7, 0 +}; + +s16 D_800E3880[] = { + 0, 1, 2, 3, 4, 5, 6, 0 +}; + +s16 *D_800E3890[] = { + D_800E3810, D_800E3820, D_800E3830, D_800E3840, + D_800E3850, D_800E3860, D_800E3870, D_800E3880 +}; + +s16 D_800E38B0[] = { + 2, 3, 4, 5, 6, 7 +}; + +s16 D_800E38BC[] = { + 1, 3, 4, 5, 6, 7 +}; + +s16 D_800E38C8[] = { + 1, 2, 4, 5, 6, 7 +}; + +s16 D_800E38D4[] = { + 1, 2, 3, 5, 6, 7 +}; + +s16 D_800E38E0[] = { + 1, 2, 3, 4, 6, 7 +}; + +s16 D_800E38EC[] = { + 1, 2, 3, 4, 5, 7 +}; + +s16 D_800E38F8[] = { + 1, 2, 3, 4, 5, 6 +}; + +s16 D_800E3904[] = { + 2, 3, 4, 5, 6, 7 +}; + +s16 D_800E3910[] = { + 0, 3, 4, 5, 6, 7 +}; + +s16 D_800E391C[] = { + 0, 2, 4, 5, 6, 7 +}; + +s16 D_800E3928[] = { + 0, 2, 3, 5, 6, 7 +}; + +s16 D_800E3934[] = { + 0, 2, 3, 4, 6, 7 +}; + +s16 D_800E3940[] = { + 0, 2, 3, 4, 5, 7 +}; + +s16 D_800E394C[] = { + 0, 2, 3, 4, 5, 6 +}; + +s16 D_800E3958[] = { + 1, 3, 4, 5, 6, 7 +}; + +s16 D_800E3964[] = { + 0, 3, 4, 5, 6, 7 +}; + +s16 D_800E3970[] = { + 0, 1, 4, 5, 6, 7 +}; + +s16 D_800E397C[] = { + 0, 1, 3, 5, 6, 7 +}; + +s16 D_800E3988[] = { + 0, 1, 3, 4, 6, 7 +}; + +s16 D_800E3994[] = { + 0, 1, 3, 4, 5, 7 +}; + +s16 D_800E39A0[] = { + 0, 1, 3, 4, 5, 6 +}; + +s16 D_800E39AC[] = { + 1, 2, 4, 5, 6, 7 +}; + +s16 D_800E39B8[] = { + 0, 2, 4, 5, 6, 7 +}; + +s16 D_800E39C4[] = { + 0, 1, 4, 5, 6, 7 +}; + +s16 D_800E39D0[] = { + 0, 1, 2, 5, 6, 7 +}; + +s16 D_800E39DC[] = { + 0, 1, 2, 4, 6, 7 +}; + +s16 D_800E39E8[] = { + 0, 1, 2, 4, 5, 7 +}; + +s16 D_800E39F4[] = { + 0, 1, 2, 4, 5, 6 +}; + +s16 D_800E3A00[] = { + 1, 2, 3, 5, 6, 7 +}; + +s16 D_800E3A0C[] = { + 0, 2, 3, 5, 6, 7 +}; + +s16 D_800E3A18[] = { + 0, 1, 3, 5, 6, 7 +}; + +s16 D_800E3A24[] = { + 0, 1, 2, 5, 6, 7 +}; + +s16 D_800E3A30[] = { + 0, 1, 2, 3, 6, 7 +}; + +s16 D_800E3A3C[] = { + 0, 1, 2, 3, 5, 7 +}; + +s16 D_800E3A48[] = { + 0, 1, 2, 3, 5, 6 +}; + +s16 D_800E3A54[] = { + 1, 2, 3, 4, 6, 7 +}; + +s16 D_800E3A60[] = { + 0, 2, 3, 4, 6, 7 +}; + +s16 D_800E3A6C[] = { + 0, 1, 3, 4, 6, 7 +}; + +s16 D_800E3A78[] = { + 0, 1, 2, 3, 6, 7 +}; + +s16 D_800E3A84[] = { + 0, 1, 2, 4, 6, 7 +}; + +s16 D_800E3A90[] = { + 0, 1, 2, 3, 4, 7 +}; + +s16 D_800E3A9C[] = { + 0, 1, 2, 3, 4, 6 +}; + +s16 D_800E3AA8[] = { + 1, 2, 3, 4, 5, 7 +}; + +s16 D_800E3AB4[] = { + 0, 2, 3, 4, 5, 7 +}; + +s16 D_800E3AC0[] = { + 0, 1, 3, 4, 5, 7 +}; + +s16 D_800E3ACC[] = { + 0, 1, 2, 3, 5, 7 +}; + +s16 D_800E3AD8[] = { + 0, 1, 2, 3, 4, 7 +}; + +s16 D_800E3AE4[] = { + 0, 1, 2, 4, 5, 7 +}; + +s16 D_800E3AF0[] = { + 0, 1, 2, 3, 4, 5 +}; + +s16 D_800E3AFC[] = { + 1, 2, 3, 4, 5, 6 +}; + +s16 D_800E3B08[] = { + 0, 2, 3, 4, 5, 6 +}; + +s16 D_800E3B14[] = { + 0, 1, 3, 4, 5, 6 +}; + +s16 D_800E3B20[] = { + 0, 1, 2, 3, 5, 6 +}; + +s16 D_800E3B2C[] = { + 0, 1, 2, 3, 4, 6 +}; + +s16 D_800E3B38[] = { + 0, 1, 2, 4, 5, 6 +}; + +s16 D_800E3B44[] = { + 0, 1, 2, 3, 4, 5 +}; + +s16 *D_800E3B50[] = { + D_800E38B0, D_800E38B0, D_800E38BC, D_800E38C8, + D_800E38D4, D_800E38E0, D_800E38EC, D_800E38F8 +}; + +s16 *D_800E3B70[] = { + D_800E3904, D_800E3904, D_800E3910, D_800E391C, + D_800E3928, D_800E3934, D_800E3940, D_800E394C +}; + +s16 *D_800E3B90[] = { + D_800E3958, D_800E3964, D_800E3964, D_800E3970, + D_800E397C, D_800E3988, D_800E3994, D_800E39A0 +}; + +s16 *D_800E3BB0[] = { + D_800E39AC, D_800E39B8, D_800E39C4, D_800E39C4, + D_800E39D0, D_800E39DC, D_800E39E8, D_800E39F4 +}; + +s16 *D_800E3BD0[] = { + D_800E3A00, D_800E3A0C, D_800E3A18, D_800E3A24, + D_800E3A24, D_800E3A30, D_800E3A3C, D_800E3A48 +}; + +s16 *D_800E3BF0[] = { + D_800E3A54, D_800E3A60, D_800E3A6C, D_800E3A84, + D_800E3A78, D_800E3A78, D_800E3A90, D_800E3A9C +}; + +s16 *D_800E3C10[] = { + D_800E3AA8, D_800E3AB4, D_800E3AC0, D_800E3AE4, + D_800E3ACC, D_800E3AD8, D_800E3ACC, D_800E3AF0 +}; + +s16 *D_800E3C30[] = { + D_800E3AFC, D_800E3B08, D_800E3B14, D_800E3B38, + D_800E3B20, D_800E3B2C, D_800E3B44, D_800E3B44 +}; + +s16 **D_800E3C50[] = { + D_800E3B50, D_800E3B70, D_800E3B90, D_800E3BB0, + D_800E3BD0, D_800E3BF0, D_800E3C10, D_800E3C30 +}; + // func_80027D00 s32 get_player_index_for_player(Player *player) { s32 index; @@ -1360,26 +1667,26 @@ void func_8002AB70(Player *player) { } if ((player->unk_0BC & 0x100000) == 0x100000) { move_f32_towards(&player->unk_DAC, 20.0f, 1.0f); - player->kartGravity = D_800ED7B8; + player->kartGravity = 3500.0f; } if ((player->unk_0BC & 4) == 4) { move_f32_towards(&player->unk_DAC, 25.0f, 1.0f); player->kartGravity = 1800.0f; } if ((player->unk_0BC & 0x400) == 0x400) { - player->kartGravity = D_800ED7BC; + player->kartGravity = 1100.0f; } if (player->unk_0BC & 0x80000) { - player->kartGravity = D_800ED7C0; + player->kartGravity = 1500.0f; } if ((player->unk_044 & 0x800) != 0) { - player->kartGravity = D_800ED7C4; + player->kartGravity = 1900.0f; } if ((player->unk_0BC & 0x800000) == 0x800000) { player->kartGravity = 300.0f; } if ((player->unk_0BC & 0x01000000) == 0x01000000) { - player->kartGravity = D_800ED7C8; + player->kartGravity = 550.0f; } if ((player->unk_0BC & 0x02000000) == 0x02000000) { player->kartGravity = 800.0f; @@ -1479,12 +1786,6 @@ void func_8002AE38(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar } } -#ifdef NEEDS_RODATA -//data_0DD0A0_2.s -// Might be plain data? -extern u16 D_800E3C70[10];// = { 0x0003, 0x0016, 0x0026, 0x003c, 0x0050, 0x0069, 0x0090, 0x009d, 0x00a9, 0x00cc }; -extern u16 D_800E3C84[10];// = { 0x000c, 0x0021, 0x002f, 0x0045, 0x005f, 0x007a, 0x0098, 0x00a5, 0x00b3, 0x00d5 }; - void func_8002B218(Player *player) { u16 someIndex; u16 sp38[10] = { 0x0003, 0x0016, 0x0026, 0x003c, 0x0050, 0x0069, 0x0090, 0x009d, 0x00a9, 0x00cc }; @@ -1504,9 +1805,6 @@ void func_8002B218(Player *player) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002B218.s") -#endif void func_8002B308(Player *player, s8 arg1, s8 arg2) { if ((player->statusEffects & 2) == 2) { @@ -1745,12 +2043,7 @@ void func_8002BB9C(Player *player, f32 *arg1, f32 *arg2, f32 *arg3) { #else GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002BB9C.s") #endif - -#ifdef NEEDS_RODATA -// data_0DD0A0_2.s -// extern s32 D_800E3CAC; -// extern s32 D_800E3CC8; - + void func_8002BD58(Player *player) { s32 sp2C[7] = { 0x002f0000, 0x00300000, 0x00310000, 0x00320000, 0x00320000, 0x00320000, 0x00320000 }; s32 spC[8] = { 0x00280000, 0x002c0000, 0x00300000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000 }; @@ -1779,9 +2072,6 @@ void func_8002BD58(Player *player) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002BD58.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -3334,20 +3624,6 @@ void func_8002FCA8(Player *player, s8 arg1) { player->unk_208 = player->unk_088 - var_f12; } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0 -extern f64 D_800ED8D8;// = 1.1; -extern f64 D_800ED8E0;// = 1.1; -extern f64 D_800ED8E8;// = 1.0125; -extern f64 D_800ED8F0;// = 1.2; -extern f64 D_800ED8F8;// = 1.025; -extern f64 D_800ED900;// = 1.2; -extern f64 D_800ED908;// = 0.7; -extern f64 D_800ED910;// = 0.7; -extern f64 D_800ED918;// = 0.004; -extern f64 D_800ED920;// = 0.004; -extern f64 D_800ED928;// = 0.7; - void func_8002FE84(Player *player, f32 arg1) { f32 temp_f0_3; f32 var_f0; @@ -3393,27 +3669,6 @@ void func_8002FE84(Player *player, f32 arg1) { player->unk_098 = (temp_f0_3 * temp_f0_3) / 25.0f; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002FE84.s") -#endif - -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0 -extern f64 D_800ED940;// = -0.2 -extern f64 D_800ED948;// = -0.55 -extern f64 D_800ED950;// = 0.004 -extern f64 D_800ED958;// = 0.004 -extern f64 D_800ED960;// = 0.01 -extern f64 D_800ED968;// = 0.01 -extern f64 D_800ED970;// = 0.008 -extern f64 D_800ED978;// = 0.008 -extern f64 D_800ED980;// = 0.3 -extern f64 D_800ED988;// = 0.15 -extern f64 D_800ED990;// = 0.05 -extern f64 D_800ED998;// = 0.04 -extern f64 D_800ED9A0;// = -0.85 -extern f64 D_800ED9A8;// = -0.55 -extern f64 D_800ED9B0;// = 0.05 f32 func_80030150(Player *player, s8 arg1) { f32 var_f0; @@ -3427,8 +3682,10 @@ f32 func_80030150(Player *player, s8 arg1) { if ((player->unk_0BC & 0x200) != 0x200) { if ((s32) player->boundingBoxCorners[3].surfaceType >= 0xF) { // ??????? - } else + if(1) {} + } else { var_f0 += D_800E2E90[player->characterId][player->boundingBoxCorners[3].surfaceType]; + } if ((s32) player->boundingBoxCorners[2].surfaceType < 0xF) var_f0 += D_800E2E90[player->characterId][player->boundingBoxCorners[2].surfaceType]; @@ -3542,20 +3799,7 @@ f32 func_80030150(Player *player, s8 arg1) { func_8002FE84(player, var_f2); return (1.0f - player->unk_104) * var_f2; } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80030150.s") -#endif -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0 -extern f32 D_800ED9B8// = 0.35f; -extern f32 D_800ED9BC// = 0.55f; -extern f32 D_800ED9C0// = 0.94f; -extern f32 D_800ED9C4// = 0.85f; -extern f32 D_800ED9C8// = 0.46f; -extern f32 D_800ED9CC// = 0.48f; -extern f32 D_800ED9D0// = 0.3f; -extern f32 D_800ED9D4// = 0.54f; void func_80030A34(Player *player) { f32 var_f0; f32 var_f2; @@ -3604,9 +3848,6 @@ void func_80030A34(Player *player) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80030A34.s") -#endif // This is likely the function responsible for detecting triple-tap "A" for "fast" acceleration void func_80030C34(Player *player) { @@ -3738,77 +3979,70 @@ player->unk_214 is possibly the max-acceleration allowed No speculation on what player->unk_0C4 could be */ void func_80030FC8(Player *player) { - f64 some_multiplier; s32 player_index; player_index = get_player_index_for_player(player); if (D_80165460[player_index] == 0) { - if ((0.0 <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800ED9D8))) { - some_multiplier = D_800ED9E0; - player->unk_09C += gKartAccelerationTables[player->characterId][0] + (some_multiplier * (player->unk_0C4 / 182)); + if ((0.0 <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.1))) { + player->unk_09C += gKartAccelerationTables[player->characterId][0] + (0.05 * (player->unk_0C4 / 182)); } - some_multiplier = D_800ED9E8; - if (((player->unk_214 * D_800ED9F0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800ED9F8))) { - player->unk_09C += gKartAccelerationTables[player->characterId][1] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.1) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.2))) { + player->unk_09C += gKartAccelerationTables[player->characterId][1] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * D_800EDA00) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA08))) { - player->unk_09C += gKartAccelerationTables[player->characterId][2] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.2) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.3))) { + player->unk_09C += gKartAccelerationTables[player->characterId][2] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * D_800EDA10) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA18))) { - player->unk_09C += gKartAccelerationTables[player->characterId][3] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.3) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.4))) { + player->unk_09C += gKartAccelerationTables[player->characterId][3] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * D_800EDA20) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.5 ))) { - player->unk_09C += gKartAccelerationTables[player->characterId][4] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.4) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.5))) { + player->unk_09C += gKartAccelerationTables[player->characterId][4] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * 0.5) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA28))) { - player->unk_09C += gKartAccelerationTables[player->characterId][5] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.5) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.6))) { + player->unk_09C += gKartAccelerationTables[player->characterId][5] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * D_800EDA30) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA38))) { - player->unk_09C += gKartAccelerationTables[player->characterId][6] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.6) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.7))) { + player->unk_09C += gKartAccelerationTables[player->characterId][6] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * D_800EDA40) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA48))) { - player->unk_09C += gKartAccelerationTables[player->characterId][7] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.7) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.8))) { + player->unk_09C += gKartAccelerationTables[player->characterId][7] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * D_800EDA50) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA58))) { - player->unk_09C += gKartAccelerationTables[player->characterId][8] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.8) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.9))) { + player->unk_09C += gKartAccelerationTables[player->characterId][8] + (0.05 * (player->unk_0C4 / 182)); } - if (((player->unk_214 * D_800EDA60) <= player->unk_09C) && (player->unk_09C <= (player->unk_214 * 1.0 ))) { - player->unk_09C += gKartAccelerationTables[player->characterId][9] + (some_multiplier * (player->unk_0C4 / 182)); + if (((player->unk_214 * 0.9) <= player->unk_09C) && (player->unk_09C <= (player->unk_214 * 1.0))) { + player->unk_09C += gKartAccelerationTables[player->characterId][9] + (0.05 * (player->unk_0C4 / 182)); } } else { - if ((0.0 <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA68))) { - some_multiplier = D_800EDA70; - player->unk_09C += (gKartAccelerationTables[player->characterId][0] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if ((0.0 <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.1))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][0] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - some_multiplier = D_800EDA78; - if (((player->unk_214 * D_800EDA80) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA88))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][1] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.1) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.2))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][1] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * D_800EDA90) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDA98))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][2] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.2) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.3))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][2] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * D_800EDAA0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDAA8))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][3] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.3) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.4))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][3] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * D_800EDAB0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.5 ))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][4] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.4) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.5))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][4] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * 0.5) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDAB8))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][5] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.5) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.6))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][5] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * D_800EDAC0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDAC8))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][6] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.6) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.7))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][6] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * D_800EDAD0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDAD8))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][7] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.7) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.8))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][7] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * D_800EDAE0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDAE8))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][8] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; - // Only here to satisfy the compiler gods, may they bless us with byte-for-byte matches - if (1) { } if (1) { } if (1) { } if (1) { } if (1) { } + if (((player->unk_214 * 0.8) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.9))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][8] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } - if (((player->unk_214 * D_800EDAF0) <= player->unk_09C) && (player->unk_09C <= (player->unk_214 * 1.0 ))) { - player->unk_09C += (gKartAccelerationTables[player->characterId][9] + (some_multiplier * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; + if (((player->unk_214 * 0.9) <= player->unk_09C) && (player->unk_09C <= (player->unk_214 * 1.0))) { + player->unk_09C += (gKartAccelerationTables[player->characterId][9] + (0.05 * (player->unk_0C4 / 182))) * gKartTable800E36B0[player->characterId]; } } if (player->unk_09C < 0.0f) { @@ -3835,7 +4069,7 @@ void func_80031F48(Player *player, f32 arg1) { if (player->unk_09C <= 0.0f) { player->unk_09C = 0.0f; } - if (player->unk_094 < D_800EDAF8) { + if (player->unk_094 < 0.2) { player->unk_08C = 0.0f; } if (player->unk_214 <= player->unk_09C) { @@ -3973,10 +4207,6 @@ void func_8003221C(Player *player) { } } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0 -extern f64 D_800EDB00;// = 0.02; -extern f64 D_800EDB08;// = 1.2; void func_800323E4(Player *player) { s32 var_v1; f32 test; @@ -4046,31 +4276,6 @@ void func_800323E4(Player *player) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800323E4.s") -#endif - -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0 -extern f64 D_800EDB10// = 0.1; -extern f64 D_800EDB18// = 0.1; -extern f64 D_800EDB20// = 0.2; -extern f64 D_800EDB28// = 0.2; -extern f64 D_800EDB30// = 0.3; -extern f64 D_800EDB38// = 0.3; -extern f64 D_800EDB40// = 0.4; -extern f64 D_800EDB48// = 0.4; -extern f64 D_800EDB50// = 0.6; -extern f64 D_800EDB58// = 0.6; -extern f64 D_800EDB60// = 0.7; -extern f64 D_800EDB68// = 0.7; -extern f64 D_800EDB70// = 0.8; -extern f64 D_800EDB78// = 0.8; -extern f64 D_800EDB80// = 0.9; -extern f64 D_800EDB88// = 0.9; -extern f32 D_800EDB90// = 0.9; -extern s16 D_801656F0; -extern s32 gRaceFrameCounter; void func_80032700(Player *player) { s32 temp_v0; @@ -4127,69 +4332,59 @@ void func_80032700(Player *player) { player->unk_044 |= 0x20; player->unk_098 = (player->unk_09C * player->unk_09C) / 25.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80032700.s") -#endif void func_80032CB0(Player *player, f32 arg1) { player->unk_09C -= arg1; if (player->unk_09C <= 0.0f) { player->unk_09C = 0.0f; } - if (player->unk_094 < D_800EDB98) { + if (player->unk_094 < 0.2) { player->unk_08C = 0.0f; } if (player->unk_214 <= player->unk_09C) { player->unk_09C = player->unk_214; } - if ((f64) player->unk_09C <= (player->unk_214 * D_800EDBA0)) { - player->statusEffects &= 0xEFFFFFFF; + if ((f64) player->unk_09C <= (player->unk_214 * 0.7)) { + player->statusEffects &= ~0x10000000; } - player->statusEffects &= 0xFDFFFFFF; - player->unk_044 &= 0xFFDF; + player->statusEffects &= ~0x02000000; + player->unk_044 &= ~0x0020; player->unk_098 = (player->unk_09C * player->unk_09C) / 25.0f; } void func_80032D94(Player *player) { - f64 some_multiplier; UNUSED s32 player_index; player_index = get_player_index_for_player(player); - if ((0.0 <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDBA8))) { - some_multiplier = D_800EDBB0; - player->unk_09C += gKartAccelerationTables[player->characterId][0] * some_multiplier; + if ((0.0 <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.1))) { + player->unk_09C += gKartAccelerationTables[player->characterId][0] * 3.2; } - some_multiplier = D_800EDBB8; - if (((player->unk_214 * D_800EDBC0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDBC8))) { - player->unk_09C += gKartAccelerationTables[player->characterId][1] * some_multiplier; + if (((player->unk_214 * 0.1) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.2))) { + player->unk_09C += gKartAccelerationTables[player->characterId][1] * 3.2; } - if (((player->unk_214 * D_800EDBD0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDBD8))) { - player->unk_09C += gKartAccelerationTables[player->characterId][2] * some_multiplier; + if (((player->unk_214 * 0.2) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.3))) { + player->unk_09C += gKartAccelerationTables[player->characterId][2] * 3.2; } - if (((player->unk_214 * D_800EDBE0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDBE8))) { - player->unk_09C += gKartAccelerationTables[player->characterId][3] * some_multiplier; - if (1) { } if (1) { } if (1) { } if (1) { } if (1) { } + if (((player->unk_214 * 0.3) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.4))) { + player->unk_09C += gKartAccelerationTables[player->characterId][3] * 3.2; } - if (((player->unk_214 * D_800EDBF0) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.5 ))) { - player->unk_09C += gKartAccelerationTables[player->characterId][4] * some_multiplier; - if (1) { } if (1) { } if (1) { } if (1) { } if (1) { } + if (((player->unk_214 * 0.4) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.5))) { + player->unk_09C += gKartAccelerationTables[player->characterId][4] * 3.2; } - if (((player->unk_214 * 0.5) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDBF8))) { - player->unk_09C += gKartAccelerationTables[player->characterId][5] * some_multiplier; + if (((player->unk_214 * 0.5) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.6))) { + player->unk_09C += gKartAccelerationTables[player->characterId][5] * 3.2; } - if (((player->unk_214 * D_800EDC00) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDC08))) { - player->unk_09C += gKartAccelerationTables[player->characterId][6] * some_multiplier; + if (((player->unk_214 * 0.6) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.7))) { + player->unk_09C += gKartAccelerationTables[player->characterId][6] * 3.2; } - if (((player->unk_214 * D_800EDC10) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDC18))) { - some_multiplier = D_800EDC20; - player->unk_09C += gKartAccelerationTables[player->characterId][7] * some_multiplier; + if (((player->unk_214 * 0.7) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.8))) { + player->unk_09C += gKartAccelerationTables[player->characterId][7] * 2.8; } - some_multiplier = D_800EDC28; - if (((player->unk_214 * D_800EDC30) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDC38))) { - player->unk_09C += gKartAccelerationTables[player->characterId][8] * some_multiplier; + if (((player->unk_214 * 0.8) <= player->unk_09C) && (player->unk_09C < (player->unk_214 * 0.9))) { + player->unk_09C += gKartAccelerationTables[player->characterId][8] * 2.8; } - if (((player->unk_214 * D_800EDC40) <= player->unk_09C) && (player->unk_09C <= (player->unk_214 * 1.0 ))) { - player->unk_09C += gKartAccelerationTables[player->characterId][9] * some_multiplier; + if (((player->unk_214 * 0.9) <= player->unk_09C) && (player->unk_09C <= (player->unk_214 * 1.0))) { + player->unk_09C += gKartAccelerationTables[player->characterId][9] * 2.8; } if (player->unk_09C < 0.0f) { player->unk_09C = 0.0f; @@ -4208,29 +4403,6 @@ void func_80033280(Player *player, f32 arg1) { player->unk_098 = (player->unk_09C * player->unk_09C) / 25.0f; } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0 -extern f64 D_800EDC48// = 0.1; -extern f64 D_800EDC50// = 3.2; -extern f64 D_800EDC58// = 3.2; -extern f64 D_800EDC60// = 0.1; -extern f64 D_800EDC68// = 0.2; -extern f64 D_800EDC70// = 0.2; -extern f64 D_800EDC78// = 0.3; -extern f64 D_800EDC80// = 0.3; -extern f64 D_800EDC88// = 0.4; -extern f64 D_800EDC90// = 0.4; -extern f64 D_800EDC98// = 0.6; -extern f64 D_800EDCA0// = 0.6; -extern f64 D_800EDCA8// = 0.7; -extern f64 D_800EDCB0// = 0.7; -extern f64 D_800EDCB8// = 0.8; -extern f64 D_800EDCC0// = 2.8; -extern f64 D_800EDCC8// = 2.8; -extern f64 D_800EDCD0// = 0.8; -extern f64 D_800EDCD8// = 0.9; -extern f64 D_800EDCE0// = 0.9; - void func_800332E8(Player *player, s32 arg1) { if ((D_80165280[arg1] >= 0.0) && (D_80165280[arg1] < ((f64) player->unk_214 * 0.1))) { D_80165280[arg1] += gKartAccelerationTables[player->characterId][0] * 3.2; @@ -4268,9 +4440,6 @@ void func_800332E8(Player *player, s32 arg1) { } player->unk_098 = (D_80165280[arg1] * D_80165280[arg1]) / 25.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800332E8.s") -#endif void func_800337CC(Player *player, f32 arg1, s32 arg2) { player->unk_044 &= ~0x20; @@ -5057,13 +5226,6 @@ block_123: GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80033AE0.s") #endif -#ifdef NEEDS_RODATA -// data/data_0DD0A0_2.s -extern f32 D_800E4068[0xA8]; -extern f32 D_800E4308[8];// = { 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f, 3.0f }; -// data/data_0DD0A0_3_0_0.s -extern f64 D_800EDD88;// = 0.8; - void func_8003680C(Player *player, s16 arg1) { s32 sp304 = 0; f32 stackPadding0[6]; @@ -5157,9 +5319,6 @@ void func_8003680C(Player *player, s16 arg1) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8003680C.s") -#endif void func_80036C5C(Player *arg0) { if (((arg0->unk_094 / 18.0f) * 216.0f) > 20.0f) { @@ -5188,16 +5347,6 @@ void func_80036CB4(Player *player) { } } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0.s -extern f64 D_800EDD90;// = 0.02; -extern f64 D_800EDD98;// = 0.01; -extern f64 D_800EDDA0;// = 0.05; -extern f64 D_800EDDA8;// = 0.1; -extern f64 D_800EDDB0;// = 0.15; -extern f64 D_800EDDB8;// = 0.1; -extern f64 D_800EDDC0;// = 0.05; - void func_80036DB4(Player *player, Vec3f arg1, Vec3f arg2) { s16 thing; s16 stackPadding0; @@ -5252,19 +5401,6 @@ void func_80036DB4(Player *player, Vec3f arg1, Vec3f arg2) { arg2[1] = arg1[1]; arg2[2] = arg1[2]; } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80036DB4.s") -#endif - -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0_0.s -extern f64 D_800EDDC8;// = 0.02; -extern f64 D_800EDDD0;// = 0.01; -extern f64 D_800EDDD8;// = 0.05; -extern f64 D_800EDDE0;// = 0.1; -extern f64 D_800EDDE8;// = 0.15; -extern f64 D_800EDDF0;// = 0.1; -extern f64 D_800EDDF8;// = 0.05; void func_800371F4(Player *player, Vec3f arg1, Vec3f arg2) { s16 var_v0; @@ -5319,9 +5455,6 @@ void func_800371F4(Player *player, Vec3f arg1, Vec3f arg2) { arg2[1] = arg1[1]; arg2[2] = arg1[2]; } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800371F4.s") -#endif void func_80037614(Player *player, Vec3f arg1, Vec3f arg2) { f32 var_f12; diff --git a/src/code_80027D00.h b/src/code_80027D00.h index d34b56f2c..f8d898fc7 100644 --- a/src/code_80027D00.h +++ b/src/code_80027D00.h @@ -73,78 +73,87 @@ void func_80038BE4(Player*, s16); /* This is where I'd put my static data, if I had any */ +extern s16 D_800E3810[]; +extern s16 D_800E3820[]; +extern s16 D_800E3830[]; +extern s16 D_800E3840[]; +extern s16 D_800E3850[]; +extern s16 D_800E3860[]; +extern s16 D_800E3870[]; +extern s16 D_800E3880[]; +extern s16 *D_800E3890[]; + +extern s16 D_800E38B0[]; +extern s16 D_800E38BC[]; +extern s16 D_800E38C8[]; +extern s16 D_800E38D4[]; +extern s16 D_800E38E0[]; +extern s16 D_800E38EC[]; +extern s16 D_800E38F8[]; +extern s16 D_800E3904[]; +extern s16 D_800E3910[]; +extern s16 D_800E391C[]; +extern s16 D_800E3928[]; +extern s16 D_800E3934[]; +extern s16 D_800E3940[]; +extern s16 D_800E394C[]; +extern s16 D_800E3958[]; +extern s16 D_800E3964[]; +extern s16 D_800E3970[]; +extern s16 D_800E397C[]; +extern s16 D_800E3988[]; +extern s16 D_800E3994[]; +extern s16 D_800E39A0[]; +extern s16 D_800E39AC[]; +extern s16 D_800E39B8[]; +extern s16 D_800E39C4[]; +extern s16 D_800E39D0[]; +extern s16 D_800E39DC[]; +extern s16 D_800E39E8[]; +extern s16 D_800E39F4[]; +extern s16 D_800E3A00[]; +extern s16 D_800E3A0C[]; +extern s16 D_800E3A18[]; +extern s16 D_800E3A24[]; +extern s16 D_800E3A30[]; +extern s16 D_800E3A3C[]; +extern s16 D_800E3A48[]; +extern s16 D_800E3A54[]; +extern s16 D_800E3A60[]; +extern s16 D_800E3A6C[]; +extern s16 D_800E3A78[]; +extern s16 D_800E3A84[]; +extern s16 D_800E3A90[]; +extern s16 D_800E3A9C[]; +extern s16 D_800E3AA8[]; +extern s16 D_800E3AB4[]; +extern s16 D_800E3AC0[]; +extern s16 D_800E3ACC[]; +extern s16 D_800E3AD8[]; +extern s16 D_800E3AE4[]; +extern s16 D_800E3AF0[]; +extern s16 D_800E3AFC[]; +extern s16 D_800E3B08[]; +extern s16 D_800E3B14[]; +extern s16 D_800E3B20[]; +extern s16 D_800E3B2C[]; +extern s16 D_800E3B38[]; +extern s16 D_800E3B44[]; +extern s16 *D_800E3B50[]; +extern s16 *D_800E3B70[]; +extern s16 *D_800E3B90[]; +extern s16 *D_800E3BB0[]; +extern s16 *D_800E3BD0[]; +extern s16 *D_800E3BF0[]; +extern s16 *D_800E3C10[]; +extern s16 *D_800E3C30[]; +extern s16 **D_800E3C50[]; + extern s16 D_80164AF0; extern Player *D_801653C0[8]; -extern f32 D_800ED7B8; -extern f32 D_800ED7BC; -extern f32 D_800ED7C0; -extern f32 D_800ED7C4; -extern f32 D_800ED7C8; - -extern f64 D_800ED9D8; -extern f64 D_800ED9E0; -extern f64 D_800ED9E8; -extern f64 D_800ED9F0; -extern f64 D_800ED9F8; -extern f64 D_800EDA00; -extern f64 D_800EDA08; -extern f64 D_800EDA10; -extern f64 D_800EDA18; -extern f64 D_800EDA20; -extern f64 D_800EDA28; -extern f64 D_800EDA30; -extern f64 D_800EDA38; -extern f64 D_800EDA40; -extern f64 D_800EDA48; -extern f64 D_800EDA50; -extern f64 D_800EDA58; -extern f64 D_800EDA60; - -extern f64 D_800EDA68; -extern f64 D_800EDA70; -extern f64 D_800EDA78; -extern f64 D_800EDA80; -extern f64 D_800EDA88; -extern f64 D_800EDA90; -extern f64 D_800EDA98; -extern f64 D_800EDAA0; -extern f64 D_800EDAA8; -extern f64 D_800EDAB0; -extern f64 D_800EDAB8; -extern f64 D_800EDAC0; -extern f64 D_800EDAC8; -extern f64 D_800EDAD0; -extern f64 D_800EDAD8; -extern f64 D_800EDAE0; -extern f64 D_800EDAE8; -extern f64 D_800EDAF0; - -extern f64 D_800EDAF8; - -extern f64 D_800EDB98; -extern f64 D_800EDBA0; - -extern f64 D_800EDBA8; -extern f64 D_800EDBB0; -extern f64 D_800EDBB8; -extern f64 D_800EDBC0; -extern f64 D_800EDBC8; -extern f64 D_800EDBD0; -extern f64 D_800EDBD8; -extern f64 D_800EDBE0; -extern f64 D_800EDBE8; -extern f64 D_800EDBF0; -extern f64 D_800EDBF8; -extern f64 D_800EDC00; -extern f64 D_800EDC08; -extern f64 D_800EDC10; -extern f64 D_800EDC18; -extern f64 D_800EDC20; -extern f64 D_800EDC28; -extern f64 D_800EDC30; -extern f64 D_800EDC38; -extern f64 D_800EDC40; +extern s16 D_801656F0; +extern s32 gRaceFrameCounter; extern struct Controller *gControllerEight; extern struct Controller *gControllerFour; diff --git a/src/code_800431B0.c b/src/code_800431B0.c index 76f3a2046..0432f104d 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -13,6 +13,7 @@ #include "code_800431B0.h" #include "code_80071F00.h" #include "code_80091750.h" +#include "code_802AAA70.h" #include "main.h" void func_800431B0(Vec3f arg0, Vec3s arg1, f32 arg2, Vtx *vtx) { diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 44678c289..0305e10ae 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -3049,7 +3049,7 @@ void func_8005D898(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UN if (player->unk_22A >= 2) { func_8005D800(&player->unk_258[10 + arg1], 0xFF9600, 0x70); } - + if (player->unk_22A >= 2) { // Why not put this in previous if statement? player->unk_258[10 + arg1].unk_040 = 2; @@ -4091,9 +4091,6 @@ block_19: GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80060504.s") #endif -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -extern f64 D_800EE580;// = 0.1 void func_800608E0(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { f32 var_f0; f32 sp50; @@ -4121,9 +4118,6 @@ void func_800608E0(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { player->unk_258[arg1].unk_000[2] = player->pos[2] + sp48; player->unk_258[arg1].unk_000[1] = player->pos[1] + sp4C; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800608E0.s") -#endif void func_80060B14(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { if ((gCurrentCourseId != 0x0010) && (gCurrentCourseId != 0x000D)) { @@ -4135,13 +4129,6 @@ void func_80060B14(Player *player, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { } } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -extern f64 D_800EE588;// = -1.8; -extern f64 D_800EE590;// = -1.8; -extern f64 D_800EE598;// = -1.8; -extern f64 D_800EE5A0;// = -1.8; - void func_80060BCC(Player *player, s16 arg1, s32 arg2, s32 arg3) { s32 sp54; s32 stackPadding0; @@ -4177,9 +4164,6 @@ void func_80060BCC(Player *player, s16 arg1, s32 arg2, s32 arg3) { player->unk_258[arg1 + 10].unk_00C = (sp48 + 2.0f) / 10.0f; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80060BCC.s") -#endif void func_80060F50(Player* player, s16 arg1, UNUSED s8 arg2, s8 arg3) { func_8005D794(player, &player->unk_258[arg1], 0.0f, 0.0f, 0.0f, 0, 0); @@ -4191,8 +4175,8 @@ void func_80060F50(Player* player, s16 arg1, UNUSED s8 arg2, s8 arg3) { func_8005D800(&player->unk_258[arg1], 0xFFFFFF, 0xFF); } - player->unk_258[arg1].unk_000[2] = player->pos[2] + (coss(player->unk_258[arg1].unk_020) * D_800EE5A8); - player->unk_258[arg1].unk_000[0] = player->pos[0] + (sins(player->unk_258[arg1].unk_020) * D_800EE5B0); + player->unk_258[arg1].unk_000[2] = player->pos[2] + (coss(player->unk_258[arg1].unk_020) * -5.8); + player->unk_258[arg1].unk_000[0] = player->pos[0] + (sins(player->unk_258[arg1].unk_020) * -5.8); player->unk_258[arg1].unk_000[1] = D_801652A0[arg3]; player->unk_0DE &= ~0x0008; } @@ -4250,9 +4234,6 @@ void func_800612F8(Player *player, s32 arg1, s32 arg2, s32 arg3) { player->unk_046 &= ~0x0008; } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -extern f64 D_800EE5B8;// = 1.9; void func_80061430(Player *player, s32 arg1, s32 arg2, s32 arg3) { s32 var_s2; @@ -4272,9 +4253,6 @@ void func_80061430(Player *player, s32 arg1, s32 arg2, s32 arg3) { } player->unk_044 &= ~0x1000; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80061430.s") -#endif #ifdef NEEDS_RODATA // data_0DD0A0_2.s @@ -4535,10 +4513,6 @@ void func_80062484(Player* player, UnkPlayerStruct258* arg1, s32 arg2) { arg1->unk_01E = 0; } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -// jpt_800EE5C8 - void func_800624D8(Player *player, s32 arg1, s32 arg2, s32 arg3) { s32 var_s1; @@ -4628,16 +4602,13 @@ void func_800624D8(Player *player, s32 arg1, s32 arg2, s32 arg3) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800624D8.s") -#endif void func_800628C0(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { player->unk_258[20 + arg3].unk_01C = 1; player->unk_258[20 + arg3].unk_020 = -player->unk_02C[1]; player->unk_258[20 + arg3].unk_012 = 2; player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_00C = D_800EE5FC; + player->unk_258[20 + arg3].unk_00C = 0.2f; } void func_80062914(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { @@ -4653,7 +4624,7 @@ void func_80062968(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { player->unk_258[20 + arg3].unk_020 = -player->unk_02C[1]; player->unk_258[20 + arg3].unk_012 = 5; player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_00C = D_800EE600; + player->unk_258[20 + arg3].unk_00C = 0.2f; } void func_800629BC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { @@ -4661,14 +4632,14 @@ void func_800629BC(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { player->unk_258[20 + arg3].unk_020 = -player->unk_02C[1]; player->unk_258[20 + arg3].unk_012 = 6; player->unk_258[20 + arg3].unk_01E = 0; - player->unk_258[20 + arg3].unk_00C = D_800EE604; + player->unk_258[20 + arg3].unk_00C = 0.2f; player->unk_258[20 + arg3].unk_000[1] = 0.0f; } void func_80062A18(Player* player, s8 arg1, UNUSED s8 arg2, s8 arg3) { player->unk_258[20 + arg3].unk_01C = 1; player->unk_258[20 + arg3].unk_012 = 3; - player->unk_258[20 + arg1 /* arg1 instead of arg3 */].unk_00C = D_800EE608; + player->unk_258[20 + arg1 /* arg1 instead of arg3 */].unk_00C = 0.2f; player->unk_258[20 + arg3].unk_01E = 1; player->unk_258[20 + arg3].unk_020 = 0; player->unk_0B6 &= ~0x0080; @@ -4680,7 +4651,7 @@ void func_80062A18(Player* player, s8 arg1, UNUSED s8 arg2, s8 arg3) { void func_80062AA8(Player* player, UNUSED s8 arg1, UNUSED s8 arg2, s8 arg3) { player->unk_258[20 + arg3].unk_01C = 1; player->unk_258[20 + arg3].unk_012 = 5; - player->unk_258[20 + arg3].unk_00C = D_800EE60C; + player->unk_258[20 + arg3].unk_00C = 0.1f; player->unk_258[20 + arg3].unk_01E = 0; player->unk_258[20 + arg3].unk_000[1] = (player->pos[1] + player->boundingBoxSize) - 2.5; } @@ -4800,7 +4771,7 @@ void func_80062F98(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { ++player->unk_258[10 + arg1].unk_01E; player->unk_258[10 + arg1].unk_000[1] += temp_f0; if ((player->unk_0CA & 1) == 1) { - player->unk_258[10 + arg1].unk_000[1] += (temp_f0 + D_800EE648); + player->unk_258[10 + arg1].unk_000[1] += (temp_f0 + 0.3); if ((player->unk_258[10 + arg1].unk_01E == 0x10) || ((D_801652A0[arg2] - player->unk_258[10 + arg1].unk_000[1]) < 3.0f)) { player->unk_258[10 + arg1].unk_01C = 0; player->unk_258[10 + arg1].unk_01E = 0; @@ -4815,8 +4786,8 @@ void func_80062F98(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { void func_800630C0(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { ++player->unk_258[arg1].unk_01E; - player->unk_258[arg1].unk_000[2] = player->pos[2] + coss(player->unk_258[arg1].unk_020) * D_800EE650; - player->unk_258[arg1].unk_000[0] = player->pos[0] + sins(player->unk_258[arg1].unk_020) * D_800EE658; + player->unk_258[arg1].unk_000[2] = player->pos[2] + coss(player->unk_258[arg1].unk_020) * -5.8; + player->unk_258[arg1].unk_000[0] = player->pos[0] + sins(player->unk_258[arg1].unk_020) * -5.8; player->unk_258[arg1].unk_000[1] = D_801652A0[arg2]; if (player->unk_258[arg1].unk_01E == 15) { player->unk_258[arg1].unk_01C = 0; @@ -4861,7 +4832,7 @@ void func_80063268(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { player->unk_258[arg1].unk_000[0] = player->pos[0] + (sins((player->unk_258[arg1].unk_020 + player->unk_258[arg1].unk_040)) * 5.5); player->unk_258[arg1].unk_000[1] = ((player->pos[1] - 5.0f) + player->unk_258[arg1].unk_024); ++player->unk_258[arg1].unk_01E; - player->unk_258[arg1].unk_00C += D_800EE660; + player->unk_258[arg1].unk_00C += 0.05; player->unk_258[arg1].unk_03E -= 5; if ((s32) player->unk_258[arg1].unk_03E <= 0) { @@ -4898,7 +4869,7 @@ void func_80063408(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { player->unk_258[10 + arg1].unk_012 = 0; } - player->unk_258[10 + arg1].unk_00C += D_800EE668; + player->unk_258[10 + arg1].unk_00C += 0.08; if (player->unk_258[10 + arg1].unk_01E >= 4) { player->unk_258[10 + arg1].unk_03E -= 16; } @@ -4932,7 +4903,7 @@ void func_800635D4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { } ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += D_800EE670; + player->unk_258[10 + arg1].unk_000[1] += 0.2; if (((player->unk_0BC & 0x80) != 0) || ((player->unk_0BC & 0x40) != 0)) { player->unk_258[10 + arg1].unk_01C = 0; player->unk_258[10 + arg1].unk_01E = 0; @@ -4944,7 +4915,7 @@ void func_800635D4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { player->unk_258[10 + arg1].unk_012 = 0; } - player->unk_258[10 + arg1].unk_00C += D_800EE678; + player->unk_258[10 + arg1].unk_00C += 0.1; if (player->unk_258[10 + arg1].unk_040 == 0) { if (player->unk_258[10 + arg1].unk_01E >= 4) { player->unk_258[10 + arg1].unk_03E -= 12; @@ -4964,21 +4935,21 @@ void func_800635D4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { void func_800639DC(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { if (player->unk_258[10 + arg1].unk_010 == 1) { - player->unk_258[10 + arg1].unk_000[2] = player->boundingBoxCorners[2].cornerPos[2] + (D_800EE680 * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = player->boundingBoxCorners[2].cornerPos[0] + (D_800EE684 * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020); + player->unk_258[10 + arg1].unk_000[2] = player->boundingBoxCorners[2].cornerPos[2] + (-1.8f * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020); + player->unk_258[10 + arg1].unk_000[0] = player->boundingBoxCorners[2].cornerPos[0] + (-1.8f * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020); } else { - player->unk_258[10 + arg1].unk_000[2] = player->boundingBoxCorners[3].cornerPos[2] + (D_800EE688 * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020); - player->unk_258[10 + arg1].unk_000[0] = player->boundingBoxCorners[3].cornerPos[0] + (D_800EE68C * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020); + player->unk_258[10 + arg1].unk_000[2] = player->boundingBoxCorners[3].cornerPos[2] + (-1.8f * player->unk_258[10 + arg1].unk_01E) * coss(player->unk_258[10 + arg1].unk_020); + player->unk_258[10 + arg1].unk_000[0] = player->boundingBoxCorners[3].cornerPos[0] + (-1.8f * player->unk_258[10 + arg1].unk_01E) * sins(player->unk_258[10 + arg1].unk_020); } ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += D_800EE690; + player->unk_258[10 + arg1].unk_000[1] += 0.3; if (player->unk_258[10 + arg1].unk_01E == 8) { player->unk_258[10 + arg1].unk_01C = 0; player->unk_258[10 + arg1].unk_01E = 0; player->unk_258[10 + arg1].unk_012 = 0; } - player->unk_258[10 + arg1].unk_00C += D_800EE698; + player->unk_258[10 + arg1].unk_00C += 0.15; if (player->unk_258[10 + arg1].unk_040 == 0) { if ((s32) player->unk_258[10 + arg1].unk_01E >= 4) { --player->unk_258[10 + arg1].unk_03E; @@ -5007,7 +4978,7 @@ void func_80063BD4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { } ++player->unk_258[10 + arg1].unk_01E; - player->unk_258[10 + arg1].unk_000[1] += D_800EE6A0; + player->unk_258[10 + arg1].unk_000[1] += 0.2; if (player->unk_258[10 + arg1].unk_01E == 8) { player->unk_258[10 + arg1].unk_01C = 0; player->unk_258[10 + arg1].unk_01E = 0; @@ -5015,7 +4986,7 @@ void func_80063BD4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { } player->unk_258[10 + arg1].unk_018 = 2.0f; - player->unk_258[10 + arg1].unk_00C -= D_800EE6A8; + player->unk_258[10 + arg1].unk_00C -= 0.06; } void func_80063D58(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { @@ -5034,12 +5005,12 @@ void func_80063D58(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { player->unk_258[10 + arg1].unk_012 = 0; } - player->unk_258[10 + arg1].unk_00C += D_800EE6B0; + player->unk_258[10 + arg1].unk_00C += 0.2; if (player->unk_258[10 + arg1].unk_01E >= 4) { player->unk_258[10 + arg1].unk_03E -= 18; - player->unk_258[10 + arg1].unk_000[1] -= D_800EE6B8; + player->unk_258[10 + arg1].unk_000[1] -= 0.1; } else { - player->unk_258[10 + arg1].unk_000[1] += D_800EE6C0; + player->unk_258[10 + arg1].unk_000[1] += 0.4; } if (player->unk_258[10 + arg1].unk_03E <= 0) { @@ -5075,7 +5046,7 @@ void func_80064184(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { sp40 = D_801652A0[arg2] - player->pos[1] - 3.0f; if (((player->unk_0DE & 1) != 0) && (gCurrentCourseId != COURSE_KOOPA_BEACH)) { - sp40 = D_801652A0[arg2] - player->pos[1] + D_800EE6C8; + sp40 = D_801652A0[arg2] - player->pos[1] + 0.1; } func_80062B18(&sp44, &sp40, &sp3C, 0.0f, sp40, -4.0f + ((-player->unk_258[arg1].unk_01E * (player->unk_094 / 18.0f) * 216.0f) / 10.0f), -player->unk_258[arg1].unk_020, 2 * -player->unk_206); @@ -5089,7 +5060,7 @@ void func_80064184(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { player->unk_258[arg1].unk_012 = 0; } player->unk_258[arg1].unk_018 = 2.0f; - player->unk_258[arg1].unk_00C -= D_800EE6D0; + player->unk_258[arg1].unk_00C -= 0.35; if (player->unk_258[arg1].unk_00C < 0.0f) { player->unk_258[arg1].unk_00C = 0.0f; } @@ -5101,8 +5072,8 @@ void func_80064184(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3) { } void func_800643A8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { - player->unk_258[10 + arg1].unk_000[2] = player->pos[2] + (D_800EE6D8 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020)); - player->unk_258[10 + arg1].unk_000[0] = player->pos[0] + (D_800EE6E0 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020)); + player->unk_258[10 + arg1].unk_000[2] = player->pos[2] + (-1.2 * player->unk_258[10 + arg1].unk_01E * coss(player->unk_258[10 + arg1].unk_020)); + player->unk_258[10 + arg1].unk_000[0] = player->pos[0] + (-1.2 * player->unk_258[10 + arg1].unk_01E * sins(player->unk_258[10 + arg1].unk_020)); player->unk_258[10 + arg1].unk_000[1] = player->unk_258[10 + arg1].unk_000[1] + 0.5; ++player->unk_258[10 + arg1].unk_01E; @@ -5112,18 +5083,13 @@ void func_800643A8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { player->unk_258[10 + arg1].unk_012 = 0; } - player->unk_258[10 + arg1].unk_00C += D_800EE6E8; + player->unk_258[10 + arg1].unk_00C += 0.2; player->unk_258[10 + arg1].unk_03E -= 8; if (player->unk_258[10 + arg1].unk_03E <= 0) { player->unk_258[10 + arg1].unk_03E = 0; } } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -extern f64 D_800EE6F0;// = -0.7; -extern f64 D_800EE6F8;// = 0.2; - void func_800644E8(Player *player, s16 arg1, s32 arg2, s32 arg3) { f32 thing2; s32 stackPadding0; @@ -5151,14 +5117,6 @@ void func_800644E8(Player *player, s16 arg1, s32 arg2, s32 arg3) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800644E8.s") -#endif - -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -extern f64 D_800EE6F0;// = -0.6; -extern f64 D_800EE6F8;// = 0.1; void func_80064664(Player *player, s16 arg1, s32 arg2, s32 arg3) { f32 temp_f4; @@ -5184,15 +5142,12 @@ void func_80064664(Player *player, s16 arg1, s32 arg2, s32 arg3) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064664.s") -#endif void func_800647C8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { ++player->unk_258[30 + arg1].unk_01E; - player->unk_258[30 + arg1].unk_000[2] = player->pos[2] + ((D_800EE710 * (player->unk_258[30 + arg1].unk_01E)) * coss(player->unk_258[30 + arg1].unk_020)); - player->unk_258[30 + arg1].unk_000[0] = player->pos[0] + ((D_800EE718 * (player->unk_258[30 + arg1].unk_01E)) * sins(player->unk_258[30 + arg1].unk_020)); + player->unk_258[30 + arg1].unk_000[2] = player->pos[2] + ((-0.8 * (player->unk_258[30 + arg1].unk_01E)) * coss(player->unk_258[30 + arg1].unk_020)); + player->unk_258[30 + arg1].unk_000[0] = player->pos[0] + ((-0.8 * (player->unk_258[30 + arg1].unk_01E)) * sins(player->unk_258[30 + arg1].unk_020)); player->unk_258[30 + arg1].unk_000[1] = (player->unk_074 + 2.0f); if (player->unk_258[30 + arg1].unk_01E == 14) { @@ -5209,8 +5164,8 @@ void func_800647C8(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { void func_800648E4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { ++player->unk_258[30 + arg1].unk_01E; - player->unk_258[30 + arg1].unk_00C -= D_800EE720; - player->unk_258[30 + arg1].unk_000[1] += D_800EE728; + player->unk_258[30 + arg1].unk_00C -= 0.06; + player->unk_258[30 + arg1].unk_000[1] += 0.1; player->unk_258[30 + arg1].unk_03E -= 12; if (player->unk_258[30 + arg1].unk_03E <= 0) { @@ -5226,7 +5181,7 @@ void func_800648E4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { void func_80064988(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { ++player->unk_258[30 + arg1].unk_01E; - player->unk_258[30 + arg1].unk_000[1] -= D_800EE730; + player->unk_258[30 + arg1].unk_000[1] -= 0.3; if (player->unk_258[30 + arg1].unk_01E == 10) { player->unk_258[30 + arg1].unk_01C = 0; @@ -5242,7 +5197,7 @@ void func_800649F4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { player->unk_258[30 + arg1].unk_000[2] = player->unk_21C + (((-temp) * player->unk_258[30 + arg1].unk_01E) * coss(player->unk_258[30 + arg1].unk_020)); player->unk_258[30 + arg1].unk_000[0] = player->unk_218 + (((-temp) * player->unk_258[30 + arg1].unk_01E) * sins(player->unk_258[30 + arg1].unk_020)); player->unk_258[30 + arg1].unk_000[1] = player->pos[1] + player->unk_258[30 + arg1].unk_014; - player->unk_258[30 + arg1].unk_00C += D_800EE738; + player->unk_258[30 + arg1].unk_00C += 0.04; ++player->unk_258[30 + arg1].unk_01E; if (player->unk_258[30 + arg1].unk_01E == 12) { @@ -5261,11 +5216,11 @@ void func_800649F4(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { void func_80064B30(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { f32 temp; - temp = player->unk_258[30 + arg1].unk_018 * D_800EE740; + temp = player->unk_258[30 + arg1].unk_018 * 1.2; player->unk_258[30 + arg1].unk_000[2] = (player->pos[2] + (-temp * player->unk_258[30 + arg1].unk_01E) * (coss(player->unk_258[30 + arg1].unk_020))); player->unk_258[30 + arg1].unk_000[0] = (player->pos[0] + (-temp * player->unk_258[30 + arg1].unk_01E) * (sins(player->unk_258[30 + arg1].unk_020))); - player->unk_258[30 + arg1].unk_000[1] += D_800EE748; + player->unk_258[30 + arg1].unk_000[1] += 0.1; ++player->unk_258[30 + arg1].unk_01E; if (player->unk_258[30 + arg1].unk_01E == 10) { @@ -5294,7 +5249,7 @@ void func_80064C74(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { player->unk_258[30 + arg1].unk_000[2] = player->pos[2] + (coss(player->unk_258[30 + arg1].unk_020 - player->unk_02C[1] - player->unk_0C0) * 5.0f); player->unk_258[30 + arg1].unk_000[0] = player->pos[0] + (sins(player->unk_258[30 + arg1].unk_020 - player->unk_02C[1] - player->unk_0C0) * 5.0f); player->unk_258[30 + arg1].unk_000[1] = player->pos[1] - 1.0f; - player->unk_258[30 + arg1].unk_00C += D_800EE750; + player->unk_258[30 + arg1].unk_00C += 0.4; ++player->unk_258[30 + arg1].unk_01E; if (player->unk_258[30 + arg1].unk_01E == 10) { @@ -5322,7 +5277,7 @@ void func_80064DEC(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { player->unk_258[20 + arg3].unk_012 = 0; } - player->unk_258[20 + arg3].unk_00C += D_800EE758; + player->unk_258[20 + arg3].unk_00C += 0.8; if (player->unk_258[20 + arg3].unk_00C >= (f64) 2.5) { player->unk_258[20 + arg3].unk_00C = 2.5f; } @@ -5331,12 +5286,12 @@ void func_80064DEC(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { void func_80064EA4(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { ++player->unk_258[20 + arg3].unk_01E; if (player->unk_258[20 + arg3].unk_01E < 4) { - player->unk_258[20 + arg3].unk_00C += D_800EE760; + player->unk_258[20 + arg3].unk_00C += 1.2; if (player->unk_258[20 + arg3].unk_00C >= 3.5) { player->unk_258[20 + arg3].unk_00C = 3.5f; } } else { - player->unk_258[20 + arg3].unk_00C -= D_800EE768; + player->unk_258[20 + arg3].unk_00C -= 1.8; if (player->unk_258[20 + arg3].unk_00C <= 0.0f) { player->unk_0B6 &= ~0x1000; player->unk_258[20 + arg3].unk_01C = 0; @@ -5348,10 +5303,10 @@ void func_80064EA4(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { void func_80064F88(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { ++player->unk_258[20 + arg3].unk_01E; - player->unk_258[20 + arg3].unk_00C += D_800EE770; + player->unk_258[20 + arg3].unk_00C += 0.15; - if (D_800EE778 <= player->unk_258[20 + arg3].unk_00C) { - player->unk_258[20 + arg3].unk_00C = D_800EE780; + if (1.2 <= player->unk_258[20 + arg3].unk_00C) { + player->unk_258[20 + arg3].unk_00C = 1.2f; } if (player->unk_258[20 + arg3].unk_01E >= 12) { player->unk_0B6 &= ~0x0800; @@ -5364,8 +5319,8 @@ void func_80064F88(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { void func_80065030(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { ++player->unk_258[20 + arg3].unk_01E; - player->unk_258[20 + arg3].unk_000[1] += D_800EE788; - player->unk_258[20 + arg3].unk_00C += D_800EE790; + player->unk_258[20 + arg3].unk_000[1] += 0.8; + player->unk_258[20 + arg3].unk_00C += 0.4; if (player->unk_258[20 + arg3].unk_00C >= (f64) 1.5) { player->unk_258[20 + arg3].unk_00C = 1.5f; } @@ -5387,14 +5342,14 @@ void func_800650FC(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { } else { player->unk_258[20 + arg3].unk_020 -= 4732; } - + if (((player->unk_0BC & 0x80) != 0x80) && ((player->unk_0BC & 0x40) != 0x40)) { player->unk_258[20 + arg3].unk_01C = 0; player->unk_258[20 + arg3].unk_01E = 0; player->unk_258[20 + arg3].unk_012 = 0; } - player->unk_258[20 + arg3].unk_00C += D_800EE798; + player->unk_258[20 + arg3].unk_00C += 0.08; if (player->unk_258[20 + arg3].unk_00C >= 1.5) { player->unk_258[20 + arg3].unk_00C = 1.5f; } @@ -5403,12 +5358,12 @@ void func_800650FC(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { void func_800651F4(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { ++player->unk_258[20 + arg3].unk_01E; if (player->unk_258[20 + arg3].unk_01E < 8) { - player->unk_258[20 + arg3].unk_00C += D_800EE7A0; - if (D_800EE7A8 <= player->unk_258[20 + arg3].unk_00C) { - player->unk_258[20 + arg3].unk_00C = D_800EE7B0; + player->unk_258[20 + arg3].unk_00C += 0.2; + if (1.2 <= player->unk_258[20 + arg3].unk_00C) { + player->unk_258[20 + arg3].unk_00C = 1.2f; } } else { - player->unk_258[20 + arg3].unk_00C -= D_800EE7B8; + player->unk_258[20 + arg3].unk_00C -= 0.4; if (player->unk_258[20 + arg3].unk_00C <= 0.0f) { player->unk_0B6 &= ~0x0020; player->unk_258[20 + arg3].unk_01C = 0; @@ -10070,7 +10025,6 @@ void func_8006DC54(Player* player, s8 arg1, s8 arg2) { } } -#ifdef NEEDS_RODATA void func_8006DD3C(Player* arg0, s8 arg1, s8 arg2) { s16 temp_s0; s32 temp_v0; @@ -10111,15 +10065,12 @@ void func_8006DD3C(Player* arg0, s8 arg1, s8 arg2) { break; } if (arg0->unk_258[21].unk_012 == 5) { - func_80067D3C(arg0, arg2, D_8018D480, 1, D_800EE948, 0xFFFFFF); - func_8006801C(arg0, arg2, D_8018D484, 1, D_800EE94C, 0xFF); + func_80067D3C(arg0, arg2, D_8018D480, 1, 1.6f, 0xFFFFFF); + func_8006801C(arg0, arg2, D_8018D484, 1, 1.6f, 0xFF); } } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006DD3C.s") -#endif void func_8006E058(void) { switch (gActiveScreenMode) { diff --git a/src/code_80057C60.h b/src/code_80057C60.h index 58b8836c1..d435c1ad6 100644 --- a/src/code_80057C60.h +++ b/src/code_80057C60.h @@ -159,14 +159,14 @@ void func_800658A0(Player*, s8, s16, s8); void func_80066998(Player*, s8, s16, s8); -void func_80067964(Player*, s8, s32, s8, s32); +void func_80067964(Player*, s8, f32, s8, s32); void func_80067D3C(Player*, s8, s32, s32, f32, s32); void func_8006801C(Player*, s8, s32, s32, f32, s32); -void func_80068310(Player*, s8, s32, s8, s32); -void func_80068724(Player*, s8, s32, s8, s32); -void func_80068AA4(Player*, s8, s32, s8, s32); -void func_80068DA0(Player*, s8, s32, s8, s32); +void func_80068310(Player*, s8, f32, s8, s32); +void func_80068724(Player*, s8, f32, s8, s32); +void func_80068AA4(Player*, s8, f32, s8, s32); +void func_80068DA0(Player*, s8, f32, s8, s32); void func_8006A280(Player*, s8, s16, s8); void func_8006A7C0(Player*, f32, f32, s8, s8); @@ -233,62 +233,6 @@ extern struct UnkStruct_800DC5EC *D_800DC5F4; extern struct UnkStruct_800DC5EC *D_800DC5F8; extern u16 D_800DC5FC; -extern f64 D_800EE5A8; -extern f64 D_800EE5B0; -extern f32 D_800EE5FC; -extern f32 D_800EE600; -extern f32 D_800EE604; -extern f32 D_800EE608; -extern f32 D_800EE60C; -extern f64 D_800EE648; -extern f64 D_800EE650; -extern f64 D_800EE658; -extern f64 D_800EE660; -extern f64 D_800EE668; -extern f64 D_800EE670; -extern f64 D_800EE678; -extern f32 D_800EE680; -extern f32 D_800EE684; -extern f32 D_800EE688; -extern f32 D_800EE68C; -extern f64 D_800EE690; -extern f64 D_800EE698; -extern f64 D_800EE6A0; -extern f64 D_800EE6A8; -extern f64 D_800EE6B0; -extern f64 D_800EE6B8; -extern f64 D_800EE6C0; -extern f64 D_800EE6C8; -extern f64 D_800EE6D0; -extern f64 D_800EE6D8; -extern f64 D_800EE6E0; -extern f64 D_800EE6E8; -extern f64 D_800EE700; -extern f64 D_800EE708; -extern f64 D_800EE710; -extern f64 D_800EE718; -extern f64 D_800EE720; -extern f64 D_800EE728; -extern f64 D_800EE730; -extern f64 D_800EE738; -extern f64 D_800EE740; -extern f64 D_800EE748; -extern f64 D_800EE750; -extern f64 D_800EE758; -extern f64 D_800EE760; -extern f64 D_800EE768; -extern f64 D_800EE770; -extern f64 D_800EE778; -extern f32 D_800EE780; -extern f64 D_800EE788; -extern f64 D_800EE790; -extern f64 D_800EE798; -extern f64 D_800EE7A0; -extern f64 D_800EE7A8; -extern f32 D_800EE7B0; -extern f64 D_800EE7B8; -extern f32 D_800EE948; -extern f32 D_800EE94C; extern s32 D_80164394; extern s32 D_80164398; diff --git a/src/code_80071F00.c b/src/code_80071F00.c index cba30a91b..856d2fca4 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -1453,12 +1453,6 @@ void func_80074FD8(s32 objectIndex) { } } -#ifdef NEEDS_RODATA -extern f64 D_800EEAB0;// = 0.0005; -extern f64 D_800EEAB8;// = 0.05 -extern f64 D_800EEAC0;// = 0.05 -extern f64 D_800EEAC8;// = 0.1 - void func_800750D8(s32 objectIndex, s32 arg1, Vec3f arg2, s32 arg3, s32 arg4) { s32 sp24; s32 temp_v0; @@ -1481,9 +1475,6 @@ void func_800750D8(s32 objectIndex, s32 arg1, Vec3f arg2, s32 arg3, s32 arg4) { temp_v1->unk_0B2[1] = temp_v0 * 0x50; temp_v1->unk_0B2[2] = temp_v0 * 0x50; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800750D8.s") -#endif void func_80075304(Vec3f arg0, s32 arg1, s32 arg2, s32 arg3) { s32 var_s1; @@ -1593,9 +1584,9 @@ void func_80075714(s32 objectIndex) { func_80075698(objectIndex); break; case 2: - D_80165C18[objectIndex].unk_038[1] -= D_800EEAD0; + D_80165C18[objectIndex].unk_038[1] -= 0.03; f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], 100.0f, D_80165C18[objectIndex].unk_038[1]); - func_8007415C(objectIndex, &D_80165C18[objectIndex].unk_000, 0.55f, 1.0f, D_800EEAD8, 1, 0); + func_8007415C(objectIndex, &D_80165C18[objectIndex].unk_000, 0.55f, 1.0f, 0.1f, 1, 0); if (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) { func_80072488(objectIndex); } @@ -1733,9 +1724,9 @@ void func_80075B84(s32 arg0) { func_80075B08(arg0); break; case 2: - D_80165C18[arg0].unk_038[1] -= D_800EEAE0; + D_80165C18[arg0].unk_038[1] -= 0.03; f32_step_up_towards(&D_80165C18[arg0].unk_028[1], 100.0f, D_80165C18[arg0].unk_038[1]); - func_8007415C(arg0, &D_80165C18[arg0].unk_000, 0.55f, 1.0f, D_800EEAE8, 1, 0); + func_8007415C(arg0, &D_80165C18[arg0].unk_000, 0.55f, 1.0f, 0.1f, 1, 0); if (func_80073B00(arg0, &D_80165C18[arg0].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) { func_80072488(arg0); } @@ -1955,9 +1946,6 @@ void func_8007634C(s32 objectIndex) { func_80072488(objectIndex); } -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -// jpt_800EEAEC void func_800763CC(s32 objectIndex) { struct_80165C18_entry *temp_s0; @@ -1995,9 +1983,6 @@ void func_800763CC(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800763CC.s") -#endif void func_80076538(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -2139,9 +2124,6 @@ void func_80076958(s32 objectIndex) { func_80072488(objectIndex); } -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -// jpt_800EEB00 void func_800769D8(s32 objectIndex) { struct_80165C18_entry *temp_s0; @@ -2171,9 +2153,6 @@ void func_800769D8(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800769D8.s") -#endif void func_80076AEC(s32 objectIndex) { s32 thing; @@ -2225,10 +2204,6 @@ void func_80076B84(void) { } } -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -extern f32 D_800EEB14; // = 0.3f; - void func_80076C9C(s32 objectIndex, Vec3f arg1, s16 arg2) { struct_80165C18_entry *temp_v0; @@ -2244,9 +2219,6 @@ void func_80076C9C(s32 objectIndex, Vec3f arg1, s16 arg2) { func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076C9C.s") -#endif void func_80076D70(Vec3f arg0, f32 arg1, s16 arg2) { s32 temp_v0; @@ -2468,8 +2440,6 @@ void func_80077450(s32 objectIndex) { } } -#ifdef NEEDS_RODATA - void func_80077584(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -2486,9 +2456,6 @@ void func_80077584(s32 objectIndex) { func_80087710(objectIndex); func_8008BF18(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077584.s") -#endif void func_80077640(void) { s32 someIndex; @@ -2510,10 +2477,6 @@ void func_80077640(void) { } } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -extern f32 D_800EEB38;// = 0.1f; - void func_80077700(s32 objectIndex, Vec3f arg1, s32 arg2) { s32 stackPadding1; u16 stackPadding0; @@ -2555,9 +2518,6 @@ void func_80077700(s32 objectIndex, Vec3f arg1, s32 arg2) { func_8008B888(objectIndex, 0U, (arg2 * 0xFFFF) / 20, 0U); func_8008B8BC(objectIndex, temp_s0, sp3E, sp3C); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077700.s") -#endif s32 func_80077A54(Vec3f arg0, s32 arg1) { s32 temp_v0; @@ -2674,10 +2634,6 @@ loop_3: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077D5C.s") #endif -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -extern f32 D_800EEB3C;// = 0.15f; - void func_80077E20(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -2696,9 +2652,6 @@ void func_80077E20(s32 objectIndex) { temp_v0->unk_0A4 = 0; func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077E20.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -2841,10 +2794,6 @@ void func_80078170(s32 arg0, ? arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078170.s") #endif -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.x -extern f32 D_800EEB48;// = 0.15f; - void func_80078220(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -2856,19 +2805,6 @@ void func_80078220(s32 objectIndex) { func_80086EF0(objectIndex); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078220.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -extern f64 D_800EEB50; // = 0.03; -extern f64 D_800EEB58; // = 0.01; -extern f64 D_800EEB60; // = -0.3; -extern f64 D_800EEB68; // = 45.0; -extern f64 D_800EEB70; // = 0.03; -extern f64 D_800EEB78; // = 0.01; -extern f64 D_800EEB80; // = -0.6; void func_80078288(s32 objectIndex) { s16 sp3E; @@ -2924,9 +2860,6 @@ void func_80078288(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078288.s") -#endif void func_800786EC(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ @@ -4728,10 +4661,6 @@ void func_8007BBBC(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BBBC.s") #endif -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -extern f64 D_800EEE08;// -1650.0; - void func_8007BD04(s32 playerId) { s32 objectIndex; @@ -4743,9 +4672,6 @@ void func_8007BD04(s32 playerId) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BD04.s") -#endif void func_8007BDA8(void) { s32 pad; @@ -5522,15 +5448,6 @@ loop_5: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D070.s") #endif -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -extern f64 D_800EEEE8;// = -1775.0; -extern f64 D_800EEEF0;// = 130.0; -extern f64 D_800EEEF8;// = -2500.0; -extern f64 D_800EEF00;// = 220.0; -extern f64 D_800EEF08;// = -2100.0; -extern f64 D_800EEF10;// = -290.0; - void func_8007D360(s32 objectIndex, s32 arg1) { if (arg1 == 1) { D_80165C18[objectIndex].unk_010[0] = (f32) ((-1775.0 - random_int(0x001EU)) * (f64) D_8018D01C); @@ -5562,13 +5479,6 @@ void func_8007D360(s32 objectIndex, s32 arg1) { D_80165C18[objectIndex].unk_034 = (random_int(4U) + 5.0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D360.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_0D00A0_3_0.s -extern f32 D_800EEF18; // = 0.1f; void func_8007D6A8(s32 objectIndex, s32 arg1) { s32 stackPadding0; @@ -5582,9 +5492,6 @@ void func_8007D6A8(s32 objectIndex, s32 arg1) { func_800721C0(objectIndex, 0x00000200); temp_v0->unk_0C8 = 3; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D6A8.s") -#endif void func_8007D714(s32 arg0) { s32 var_v0; @@ -5640,13 +5547,6 @@ void func_8007D8AC(s32 arg0) { func_80086E70(arg0); } -#ifdef NEEDS_RODATA - -extern f64 D_800EEF20;// = 2540.0; -extern f64 D_800EEF28;// = -2540.0; -extern f64 D_800EEF30;// = 2150.0; -extern f64 D_800EEF38;// = -2150.0; - void func_8007D8D4(s32 objectIndex, s32 arg1) { switch (D_80165C18[objectIndex].unk_0A6) { case 1: @@ -5678,9 +5578,6 @@ void func_8007D8D4(s32 objectIndex, s32 arg1) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D8D4.s") -#endif void func_8007DA4C(s32 arg0) { func_8008781C(arg0); @@ -5799,10 +5696,6 @@ block_19: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007DB44.s") #endif -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -extern f32 D_800EEF40;// = 1150.0f; - void func_8007DDC0(s32 objectIndex) { f32 sp2C; struct_80165C18_entry *temp_s0; @@ -5842,9 +5735,6 @@ void func_8007DDC0(s32 objectIndex) { temp_s0->unk_0A4 = 2; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007DDC0.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -6007,10 +5897,6 @@ void func_8007E1F4(s32 objectIndex) { } } -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -extern f32 D_800EEF68;// -1371.0f; - void func_8007E358(s32 objectIndex) { D_80165C18[objectIndex].unk_004[0] = -1371.0f * D_8018D01C; D_80165C18[objectIndex].unk_004[1] = 31.0f; @@ -6021,13 +5907,6 @@ void func_8007E358(s32 objectIndex) { D_80165C18[objectIndex].unk_084[7] = 0; func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E358.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -// jpt_800EEF6C void func_8007E3EC(s32 objectIndex) { @@ -6060,9 +5939,6 @@ void func_8007E3EC(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E3EC.s") -#endif void func_8007E4C4(void) { s32 objectIndex = D_80183EA8; @@ -6392,10 +6268,6 @@ void func_8007EE5C(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EE5C.s") #endif -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -// jpt_800EEFD0 - void func_8007EFBC(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { case 1: @@ -6471,13 +6343,6 @@ void func_8007EFBC(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EFBC.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_0DD0A0_3_0.s -// jpt_800EF018 void func_8007F280(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -6554,9 +6419,6 @@ void func_8007F280(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007F280.s") -#endif void func_8007F544(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0DD) { /* irregular */ @@ -7716,10 +7578,6 @@ void func_80081848(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081848.s") #endif -#ifdef NEEDS_RODATA - -extern f64 D_800EF138;// = 0.184; - void func_80081924(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { case 1: @@ -7755,9 +7613,6 @@ void func_80081924(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081924.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -8340,7 +8195,6 @@ block_8: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082B34.s") #endif -#ifdef NEEDS_RODATA void func_80082C30(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { case 1: @@ -8381,9 +8235,6 @@ void func_80082C30(s32 objectIndex) { D_80165C18[objectIndex].unk_004[1] = (f32) (D_80165C18[objectIndex].unk_044 + 2.5); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082C30.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -8536,7 +8387,6 @@ void func_8008311C(s32 objectIndex, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008311C.s") #endif -#ifdef NEEDS_RODATA void func_80083248(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { case 0: @@ -8568,9 +8418,6 @@ void func_80083248(s32 objectIndex) { D_80165C18[objectIndex].unk_004[1] = D_80165C18[objectIndex].unk_044 + 6.0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083248.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -8762,7 +8609,6 @@ void func_80083868(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083868.s") #endif -#ifdef NEEDS_RODATA void func_80083948(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { case 1: @@ -8794,9 +8640,6 @@ void func_80083948(s32 objectIndex) { func_80073D0C(objectIndex, &D_80165C18[objectIndex].unk_0A0, -0x00001000, 0x00001000, 0x00000400, 1, -1); D_80165C18[objectIndex].unk_0B2[2] = D_80165C18[objectIndex].unk_0A0 + 0x8000; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083948.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -9613,7 +9456,6 @@ void func_800853DC(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800853DC.s") #endif -#ifdef NEEDS_RODATA void func_80085534(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { case 1: @@ -9664,9 +9506,6 @@ void func_80085534(s32 objectIndex) { func_800877C4(objectIndex); D_80165C18[objectIndex].unk_0BE[1] += 0x100; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085534.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -10125,10 +9964,6 @@ void func_8008629C(s32 objectIndex, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008629C.s") #endif -#ifdef NEEDS_RODATA - -extern f64 D_800EF468;// = 0.1; - void func_80086424(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { case 0: @@ -10151,9 +9986,6 @@ void func_80086424(s32 objectIndex) { } func_8008BF18(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086424.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc diff --git a/src/code_80071F00.h b/src/code_80071F00.h index 374d3ca13..545159e50 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -258,10 +258,6 @@ extern OSMesgQueue gDmaMesgQueue; extern OSMesg gMainReceivedMesg; extern OSIoMesg gDmaIoMesg; -extern f64 D_800EEAD0; -extern f32 D_800EEAD8; -extern f64 D_800EEAE0; -extern f32 D_800EEAE8; extern s32 D_80162DF8; extern s32 D_80165598; extern s16 D_80165740; diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 59e543b41..611f2d522 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -9,6 +9,7 @@ #include "memory.h" #include "code_80071F00.h" #include "code_80086E70.h" +#include "code_802AAA70.h" void func_80086E70(s32 arg0) { D_80165C18[arg0].unk_0AE = 1;// * 0xE0)) = 1; @@ -848,26 +849,6 @@ UNUSED void func_8008900C(Player *player) { player->unk_09C = 0.0f; } -#ifdef NEEDS_RODATA -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern Player *gPlayerOne; -extern s16 gCurrentCourseId; /* unable to generate initializer */ -// These are all .rodata -extern f32 D_800EF4A0; -extern f32 D_800EF4A4; -extern f32 D_800EF4A8; -extern f32 D_800EF4AC; -extern f32 D_800EF4B0; -extern f32 D_800EF4B4; -extern f32 D_800EF4B8; -extern f32 D_800EF4BC; -extern f32 D_800EF4C0; -extern f32 D_800EF4C4; -extern f32 D_800EF4C8; -extern f32 D_800EF4CC; -extern f32 D_800EF4D0; -extern f32 D_800EF4D4; - void func_80089020(s32 playerId, f32 *arg1) { f32 var_f0; f32 var_f2; @@ -879,7 +860,7 @@ void func_80089020(s32 playerId, f32 *arg1) { var_f2 = -*arg1; } if (player->unk_0BC & 0xC0) { - if (gCurrentCourseId == 0x000C) { + if (gCurrentCourseId == COURSE_SHERBET_LAND) { if (var_f2 <= 0.5) { var_f0 = 0.025f; } else if (var_f2 <= 2.0) { @@ -900,7 +881,7 @@ void func_80089020(s32 playerId, f32 *arg1) { var_f0 = 0.25f; } } - } else if (gCurrentCourseId == 0x000C) { + } else if (gCurrentCourseId == COURSE_SHERBET_LAND) { if (var_f2 <= 0.5) { var_f0 = 0.025f; } else if (var_f2 <= 2.0) { @@ -916,16 +897,13 @@ void func_80089020(s32 playerId, f32 *arg1) { } else if (var_f2 <= 3.0) { var_f0 = 0.07f; } else if (var_f2 <= 4.0) { - var_f0 = 0.1f; - } else { var_f0 = 0.075f; + } else { + var_f0 = 0.1f; } } f32_step_towards(arg1, 0.0f, var_f0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089020.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -1360,8 +1338,6 @@ UNUSED void func_8008A610(s32 objectIndex) { } } -#ifdef NEEDS_RODATA -extern f64 D_800EF4F0;// = 500.0; void func_8008A6DC(s32 objectIndex, f32 arg1) { u16 var_a2; s32 loopIndex; @@ -1382,9 +1358,6 @@ void func_8008A6DC(s32 objectIndex, f32 arg1) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A6DC.s") -#endif UNUSED void func_8008A810(s32 arg0) { func_8008A6DC(arg0, 500.0f); diff --git a/src/code_80086E70.h b/src/code_80086E70.h index 2e9c291e6..4c65f0380 100644 --- a/src/code_80086E70.h +++ b/src/code_80086E70.h @@ -137,6 +137,8 @@ extern s32 D_80183DA8; extern s32 D_80183DC8; extern f32 gVBlankTimer; extern UnkActorInner D_8018C3B0; +extern Player *gPlayerOne; extern Player *gPlayerOneCopy; +extern s16 gCurrentCourseId; #endif diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c index e4b802aa8..61ae4cbbf 100644 --- a/src/code_8008C1D0.c +++ b/src/code_8008C1D0.c @@ -748,14 +748,14 @@ void func_8008D9C0(Player* player) { if (player->unk_D98 == 1) { player->unk_D9C += player->unk_DA0; - if (D_800EF568 <= player->unk_D9C) { + if (2002.0f <= player->unk_D9C) { player->unk_DA0 = 10.0f; player->unk_D98 *= -1; } } if (player->unk_D98 == -1) { player->unk_D9C -= player->unk_DA0; - if (player->unk_D9C <= D_800EF56C) { + if (player->unk_D9C <= -2002.0f) { player->unk_DA0 = 10.0f; player->unk_D98 *= -1; } @@ -835,7 +835,7 @@ void func_8008DC08(Player* player, s8 arg1) { break; case 1: player->unk_DC4 = 4.5f; - player->pos[1] += D_800EF570; + player->pos[1] += 0.13; ++player->unk_238; if ((player->unk_046 & 0x80) != 0) { @@ -855,7 +855,7 @@ void func_8008DC08(Player* player, s8 arg1) { } player->unk_D9C += player->unk_DA0; - if (D_800EF578 <= player->unk_D9C) { + if (3458.0f <= player->unk_D9C) { player->unk_DA0 = 0.0f; break; } @@ -872,7 +872,7 @@ void func_8008DC08(Player* player, s8 arg1) { } player->unk_DC4 = 4.5f; - player->pos[1] -= D_800EF580; + player->pos[1] -= 0.085; if ((player->unk_0BC & 8) != 8) { D_8018D990[arg1] = 3; @@ -906,7 +906,7 @@ void func_8008DF98(Player* player, s8 arg1) { player->statusEffects &= ~0x4000; player->unk_0BC |= 0x40020000; player->unk_0BC &= ~0x10; - player->unk_08C *= D_800EF588; + player->unk_08C *= 0.6; player->unk_0B0 = 0; player->unk_224 = 1.0f; D_8018D930[arg1] = gCourseTimer; @@ -933,11 +933,6 @@ void func_8008DF98(Player* player, s8 arg1) { } } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -extern f64 D_800EF590;// = 0.6; -extern f64 D_800EF598;// = 0.9; - void func_8008E118(Player *player, s8 arg1) { s16 test; if (((player->unk_0BC & 0x8000) == 0x8000) && ((player->unk_0BC & 0x04000000) != 0x04000000)) { @@ -988,9 +983,6 @@ void func_8008E118(Player *player, s8 arg1) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008E118.s") -#endif void func_8008E3C0(Player* player, UNUSED s8 arg1) { move_f32_towards(&player->unk_224, 1.0f, 0.1f); @@ -1260,7 +1252,7 @@ void func_8008EDC0(Player* player) { player->unk_0BC &= ~0x00100000; player->boostPower = 0.0f; if (player->unk_0C2 >= 0x33) { - temp_f0 = D_800EF5A0; + temp_f0 = 0.7; player->unk_09C = (player->unk_09C * temp_f0); player->unk_08C = (player->unk_08C * temp_f0); } @@ -1333,7 +1325,7 @@ void func_8008F104(Player* player, s8 arg1) { void func_8008F1B8(Player* player, s8 arg1) { s16 temp; - player->unk_08C = (player->unk_210 * D_800EF5A8); + player->unk_08C = (player->unk_210 * 0.05); if (player->unk_0B2 < 0) { if ((player->unk_044 & 0x80) == 0x80) { player->unk_02C[1] += 182; @@ -1665,10 +1657,6 @@ void func_8008FEDC(Player* player, UNUSED s8 arg1) { player->kartHopAcceleration = 0.0f; } -#ifdef NEEDS_RODATA -// data_0DD0A0_3_0.s -// jpt_800EF5B0 - void func_8008FF08(Player *player, s8 playerId) { if(player->nearestWaypointId){} switch (gCurrentCourseId) { @@ -1742,9 +1730,6 @@ void func_8008FF08(Player *player, s8 playerId) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008FF08.s") -#endif #ifdef NEEDS_RODATA // data_0DD0A0_2_0.s @@ -2088,7 +2073,6 @@ void func_80090970(Player *player, s8 arg1, s8 arg2) { GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_80090970.s") #endif -#ifdef NEEDS_RODATA s32 func_800910E4(Player *arg0) { s32 phi_v0 = 0; if ((((((arg0->unk_0CA & 2) == 2) || ((arg0->unk_0CA & 8) == 8)) || ((arg0->unk_000 & 0x40) != 0)) || ((arg0->unk_000 & 0x800) != 0)) || ((arg0->unk_000 & 0x8000) == 0)) { @@ -2117,9 +2101,6 @@ func_800910E4_label: return 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_800910E4.s") -#endif void func_800911B4(Player* player, s8 arg1) { s32 temp_v0; @@ -2128,9 +2109,9 @@ void func_800911B4(Player* player, s8 arg1) { player->unk_044 |= 0x1800; player->unk_044 &= ~0x0400; player->unk_044 |= 0x2000; - player->kartHopJerk = D_800EF678; + player->kartHopJerk = 0.002f; player->kartHopAcceleration = 0.0f; - player->kartHopVelocity = D_800EF67C; + player->kartHopVelocity = 2.6f; player->unk_0B2 = 2; player->unk_0C0 = 0; player->unk_07C = 0; diff --git a/src/code_8008C1D0.h b/src/code_8008C1D0.h index 037ba393e..3e3153218 100644 --- a/src/code_8008C1D0.h +++ b/src/code_8008C1D0.h @@ -108,6 +108,7 @@ void func_8008FF08(Player*, s8); void func_80090178(Player*, s8, Vec3f, Vec3f); void func_80090778(Player*); void func_80090868(Player*); +s32 func_800910E4(Player*); void func_800911B4(Player*, s8); void func_80091298(Player*, s8); void func_80091440(s8); @@ -117,11 +118,9 @@ void func_800914A0(); void func_800098FC(u32, Player*); // audio/external.c void func_800C9250(u8); -void func_800CA24C(u8); void func_800CA59C(u8); void func_800CA730(u8); void func_800CA984(u8); -void func_800CAACC(u8); void func_800CAFC0(u8); void func_800CB064(u8); @@ -136,16 +135,6 @@ extern f32 D_800E37B0[]; extern f32 D_800E3790[]; extern f32 D_800E37D0[]; extern f32 D_800E37F0[]; -extern f32 D_800EF568; -extern f32 D_800EF56C; -extern f64 D_800EF570; -extern f32 D_800EF578; -extern f64 D_800EF580; -extern f64 D_800EF588; -extern f64 D_800EF5A0; -extern f64 D_800EF5A8; -extern f32 D_800EF678; -extern f32 D_800EF67C; extern u16 D_80152308; extern u16 D_8015F6F8; extern s16 D_80165190[4][8]; diff --git a/src/code_80280650.c b/src/code_80280650.c index 083cf5a89..cc29f9d17 100644 --- a/src/code_80280650.c +++ b/src/code_80280650.c @@ -141,15 +141,13 @@ s32 D_80284E40[] = { void func_8028093C(struct UnkStruct_80280658 *arg0) { struct UnkStruct_80280658 *temp_v0; - f32 temp_f0; if (arg0->unk44 < 0x1E) { arg0->unk14 += 2.5f; - arg0->unk10 += func_80280850(D_80286B74); - arg0->unk18 += func_80280850(D_80286B78); + arg0->unk10 += func_80280850(0.2f); + arg0->unk18 += func_80280850(0.2f); } else if (arg0->unk2C == 4) { temp_v0 = func_80280734(&D_80284E7C); - temp_f0 = D_80286B7C; temp_v0->unk10 = arg0->unk10; temp_v0->unk14 = arg0->unk14; temp_v0->unk18 = arg0->unk18; @@ -157,8 +155,8 @@ void func_8028093C(struct UnkStruct_80280658 *arg0) { temp_v0->unk3C = 0xFF; temp_v0->unk40 = -0x11; temp_v0->unk44 = 0x64; - temp_v0->unk34 = temp_f0; - temp_v0->unk38 = temp_f0; + temp_v0->unk34 = 1.8700001f; + temp_v0->unk38 = 1.8700001f; } } diff --git a/src/code_80280650.h b/src/code_80280650.h index e73e3e4e7..5c505af0a 100644 --- a/src/code_80280650.h +++ b/src/code_80280650.h @@ -92,9 +92,7 @@ void ending_sequence_loop(); extern struct UnkStruct_80280658 *D_802874F8; extern struct UnkStruct_80280658 *D_80284E7C; -extern f32 D_80286B74; -extern f32 D_80286B78; -extern f32 D_80286B7C; + extern s32 D_80284E88; extern s32 D_802874E0; extern s8 D_802874F4; diff --git a/src/code_802AAA70.c b/src/code_802AAA70.c new file mode 100644 index 000000000..1af3aa79c --- /dev/null +++ b/src/code_802AAA70.c @@ -0,0 +1,2796 @@ +#include "code_802AAA70.h" +#include "math_util.h" +#include "variables.h" +#include + +// Used for the choco mountain guard rail +void nullify_displaylist(uintptr_t addr) { + s32 segment = SEGMENT_NUMBER2(addr); + s32 offset = SEGMENT_OFFSET(addr); + + Gfx *macro; + + macro = VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset); + macro->words.w0 = G_ENDDL << 24; + macro->words.w1 = 0; +} + +void func_802AAAAC(UnkActorInner *arg0) { + arg0->unk36 = 0x1388; + arg0->unk38 = 0x1388; + arg0->unk3A = 0x1388; + arg0->unk30 = 0; + arg0->unk32 = 0; + arg0->unk34 = 0; + arg0->unk3C[0] = 0; + arg0->unk3C[1] = 0; + arg0->unk3C[2] = 0; + vec3f_set(arg0->unk48, 0.0f, 0.0f, 1.0f); + vec3f_set(arg0->unk54, 1.0f, 0.0f, 0.0f); + vec3f_set(arg0->unk60, 0.0f, 1.0f, 0.0f); +} + +#ifdef MIPS_TO_C +//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b +extern f32 D_8015F8E4; +static f32 D_802B9E00 = 1859.0f; +static f32 D_802B9E04 = 1549.0f; +static f32 D_802B9E08 = -1102.0f; +static f32 D_802B9E0C = -1402.0f; +static f32 D_802B9E10 = 2405.0f; +static f32 D_802B9E14 = 2233.0f; +static f32 D_802B9E18 = 0.8f; +static f32 D_802B9E1C = -475.0f; +static f32 D_802B9E20 = -33.9f; +static f32 D_802B9E24 = -838.0f; +static f32 D_802B9E28 = -475.0f; +static f32 D_802B9E2C = -475.0f; +static f32 D_802B9E30 = -993.0f; +static f32 D_802B9E34 = -33.9f; +static f32 D_802B9E38 = -475.0f; +static f32 D_802B9E3C = -33.9f; +static f32 D_802B9E40 = -475.0f; +static f32 D_802B9E44 = -33.9f; +s16 gCurrentCourseId; /* unable to generate initializer */ + +f32 func_802AAB4C(Player *player) { + f32 sp1C; + f32 sp18; + f32 temp_f0; + f32 temp_f2; + s16 temp_v0; + s32 temp_v1; + + temp_v0 = gCurrentCourseId; + temp_f0 = player->pos[0]; + temp_f2 = player->pos[2]; + switch (temp_v0) { /* irregular */ + case 2: + if (D_802B9E00 < temp_f0) { + goto block_43; + } + if (temp_f0 < D_802B9E04) { + goto block_43; + } + if (D_802B9E08 < temp_f2) { + goto block_43; + } + if (temp_f2 < D_802B9E0C) { +block_43: + default: + return D_8015F8E4; + } + return 20.0f; + case 6: + if (temp_f0 > 239.0f) { + goto block_43; + } + if (temp_f0 < 67.0f) { + goto block_43; + } + if (D_802B9E10 < temp_f2) { + goto block_43; + } + if (temp_f2 < D_802B9E14) { + goto block_43; + } + return D_802B9E18; + case 12: + if ((func_802ABD10(player->unk_110.unk3A) & 0xFF) == 5) { + return (f32) (D_8015F6EE - 0xA); + } + goto block_43; + case 18: + sp18 = temp_f2; + sp1C = temp_f0; + temp_v1 = func_802ABD40(player->unk_110.unk3A) & 0xFF; + if (temp_v1 == 0xFF) { + sp18 = temp_f2; + sp1C = temp_f0; + if ((func_802ABD10(player->unk_110.unk3A) & 0xFF) == 0xF) { + return D_802B9E1C; + } + if (temp_f0 > -478.0f) { + return D_802B9E20; + } + if (temp_f0 < D_802B9E24) { + return D_802B9E28; + } + if (temp_f2 > -436.0f) { + return D_802B9E2C; + } + if (temp_f2 < D_802B9E30) { + return D_802B9E34; + } + if (temp_f2 < temp_f0) { + return D_802B9E38; + } + return D_802B9E3C; + } + if (temp_v1 >= 0x14) { + return D_802B9E40; + } + return D_802B9E44; + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AAB4C.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +static f32 D_802B9E48 = -0.9f; + +s32 func_802AAE4C(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5) { + f32 sp6C; + f32 sp64; + f32 sp3C; + f32 sp2C; + f32 sp28; + f32 sp24; + f32 sp20; + f32 sp1C; + f32 sp18; + f32 sp14; + f32 sp10; + f32 spC; + f32 sp8; + Vtx *temp_a0; + Vtx *temp_a2; + Vtx *temp_a3; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f0_4; + f32 temp_f0_5; + f32 temp_f10; + f32 temp_f12; + f32 temp_f12_2; + f32 temp_f14; + f32 temp_f14_2; + f32 temp_f16; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f4; + f32 temp_f8; + mk64_surface_map_ram *temp_v1; + s32 var_v0; + s32 var_v0_2; + + temp_v1 = &D_8015F580[arg5]; + temp_f0 = temp_v1->gravity; + var_v0_2 = 1; + if (temp_f0 < D_802B9E48) { + return 0; + } + if (arg2 < (f32) temp_v1->vtx3[0]) { + return 0; + } + if (arg4 < (f32) temp_v1->vtx3[2]) { + return 0; + } + if ((f32) temp_v1->vtx2[0] < arg2) { + return 0; + } + if ((f32) temp_v1->vtx2[2] < arg4) { + return 0; + } + sp2C = temp_f0; + if (arg3 < ((f32) temp_v1->vtx3[1] - (arg1 * 3.0f))) { + return 0; + } + temp_a0 = temp_v1->vtxs[0]; + temp_a3 = temp_v1->vtxs[2]; + temp_a2 = temp_v1->vtxs[1]; + sp6C = (f32) temp_a3->v.ob[0]; + sp8 = arg4; + sp10 = arg2; + temp_f8 = (f32) temp_a0->v.ob[2] - arg4; + sp64 = (f32) temp_a3->v.ob[2]; + temp_f4 = (f32) temp_a2->v.ob[0] - arg2; + sp28 = temp_f8; + sp24 = temp_f4; + sp20 = (f32) temp_a0->v.ob[0] - arg2; + temp_f0_2 = temp_f8 * temp_f4; + sp8 = temp_f8; + spC = temp_f4; + sp1C = (f32) temp_a2->v.ob[2] - arg4; + temp_f2 = sp20 * sp1C; + temp_f10 = temp_f0_2 - temp_f2; + sp18 = temp_f10; + sp3C = temp_f10; + if (temp_f2 == temp_f0_2) { + sp14 = arg4; + temp_f0_3 = sp6C - sp10; + temp_f2_2 = sp64 - arg4; + if ((((sp1C * temp_f0_3) - (spC * temp_f2_2)) * ((temp_f2_2 * sp20) - (temp_f0_3 * sp8))) < 0.0f) { + var_v0_2 = 0; + } + } else { + temp_f2_3 = sp64 - arg4; + temp_f0_4 = sp6C - arg2; + temp_f14 = sp24 * temp_f2_3; + temp_f12 = sp1C * temp_f0_4; + if (temp_f14 == temp_f12) { + if ((sp3C * ((temp_f2_3 * sp20) - (temp_f0_4 * sp28))) < 0.0f) { + var_v0_2 = 0; + } + } else { + temp_f16 = temp_f12 - temp_f14; + if ((sp18 * temp_f16) < 0.0f) { + var_v0_2 = 0; + } else { + temp_f14_2 = temp_f0_4 * sp28; + temp_f12_2 = temp_f2_3 * sp20; + if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { + var_v0_2 = 0; + } + } + } + } + if (var_v0_2 == 0) { + return 0; + } + temp_f0_5 = ((temp_v1->height * arg2) + (sp2C * arg3) + (temp_v1->rotation * arg4) + temp_v1->height2) - arg1; + if (temp_f0_5 > 0.0f) { + if (temp_f0_5 < arg0->unk3C[2]) { + arg0->unk34 = 1; + arg0->unk3A = arg5; + arg0->unk3C[2] = temp_f0_5; + arg0->unk60[0] = temp_v1->height; + arg0->unk60[1] = temp_v1->gravity; + arg0->unk60[2] = temp_v1->rotation; + } + return 0; + } + var_v0 = 0; + if (temp_f0_5 > -16.0f) { + arg0->unk34 = 1; + arg0->unk3A = arg5; + arg0->unk3C[2] = temp_f0_5; + var_v0 = 1; + arg0->unk60[0] = temp_v1->height; + arg0->unk60[1] = temp_v1->gravity; + arg0->unk60[2] = temp_v1->rotation; + } + return var_v0; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AAE4C.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +s32 func_802AB288(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5) { + f32 sp70; + f32 sp6C; + f32 sp3C; + f32 sp2C; + f32 sp28; + f32 sp24; + f32 sp20; + f32 sp1C; + f32 sp14; + f32 sp10; + f32 spC; + f32 sp8; + Vtx *temp_a0; + Vtx *temp_a2; + Vtx *temp_a3; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f0_4; + f32 temp_f12; + f32 temp_f12_2; + f32 temp_f14; + f32 temp_f14_2; + f32 temp_f16; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f2_4; + f32 temp_f4; + f32 temp_f6; + f32 temp_f8; + mk64_surface_map_ram *temp_v1; + s32 var_v0; + s32 var_v0_2; + + temp_v1 = &D_8015F580[arg5]; + var_v0_2 = 1; + if (arg2 < (f32) temp_v1->vtx3[0]) { + return 0; + } + if ((f32) temp_v1->vtx2[0] < arg2) { + return 0; + } + if ((f32) temp_v1->vtx2[1] < arg3) { + return 0; + } + if (arg3 < (f32) temp_v1->vtx3[1]) { + return 0; + } + temp_f2 = arg1 * 3.0f; + if (arg4 < ((f32) temp_v1->vtx3[2] - temp_f2)) { + return 0; + } + if (((f32) temp_v1->vtx2[2] + temp_f2) < arg4) { + return 0; + } + temp_a0 = temp_v1->vtxs[0]; + temp_a3 = temp_v1->vtxs[2]; + temp_a2 = temp_v1->vtxs[1]; + sp70 = (f32) temp_a3->v.ob[0]; + sp8 = arg3; + sp10 = arg2; + temp_f4 = (f32) temp_a0->v.ob[1] - arg3; + sp6C = (f32) temp_a3->v.ob[1]; + temp_f8 = (f32) temp_a2->v.ob[0] - arg2; + sp2C = temp_f4; + sp28 = temp_f8; + sp24 = (f32) temp_a0->v.ob[0] - arg2; + temp_f0 = temp_f4 * temp_f8; + sp8 = temp_f4; + spC = temp_f8; + sp20 = (f32) temp_a2->v.ob[1] - arg3; + temp_f2_2 = sp24 * sp20; + temp_f6 = temp_f0 - temp_f2_2; + sp1C = temp_f6; + sp3C = temp_f6; + if (temp_f2_2 == temp_f0) { + sp14 = arg3; + temp_f0_2 = sp70 - sp10; + temp_f2_3 = sp6C - arg3; + if ((((sp20 * temp_f0_2) - (spC * temp_f2_3)) * ((temp_f2_3 * sp24) - (temp_f0_2 * sp8))) < 0.0f) { + var_v0_2 = 0; + } + } else { + temp_f2_4 = sp6C - arg3; + temp_f0_3 = sp70 - arg2; + temp_f14 = sp28 * temp_f2_4; + temp_f12 = sp20 * temp_f0_3; + if (temp_f14 == temp_f12) { + if ((sp3C * ((temp_f2_4 * sp24) - (temp_f0_3 * sp2C))) < 0.0f) { + var_v0_2 = 0; + } + } else { + temp_f16 = temp_f12 - temp_f14; + if ((sp1C * temp_f16) < 0.0f) { + var_v0_2 = 0; + } else { + temp_f14_2 = temp_f0_3 * sp2C; + temp_f12_2 = temp_f2_4 * sp24; + if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { + var_v0_2 = 0; + } + } + } + } + if (var_v0_2 == 0) { + return 0; + } + temp_f0_4 = ((temp_v1->height * arg2) + (temp_v1->gravity * arg3) + (temp_v1->rotation * arg4) + temp_v1->height2) - arg1; + if (temp_f0_4 > 0.0f) { + if (temp_f0_4 < arg0->unk3C[0]) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = temp_f0_4; + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + arg0->unk48[2] = temp_v1->rotation; + } + return 0; + } + var_v0 = 0; + if (temp_f0_4 > -16.0f) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = temp_f0_4; + var_v0 = 1; + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + arg0->unk48[2] = temp_v1->rotation; + } + return var_v0; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AB288.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +s32 func_802AB6C4(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5) { + f32 sp68; + f32 sp64; + f32 sp38; + f32 sp2C; + f32 sp28; + f32 sp24; + f32 sp20; + f32 sp1C; + f32 sp14; + f32 sp10; + f32 spC; + f32 sp8; + Vtx *temp_a0; + Vtx *temp_a2; + Vtx *temp_a3; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f0_4; + f32 temp_f0_5; + f32 temp_f10; + f32 temp_f12; + f32 temp_f12_2; + f32 temp_f14; + f32 temp_f14_2; + f32 temp_f16; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f4; + f32 temp_f6; + mk64_surface_map_ram *temp_v1; + s32 var_v0; + s32 var_v0_2; + + temp_v1 = &D_8015F580[arg5]; + var_v0_2 = 1; + if (arg4 < (f32) temp_v1->vtx3[2]) { + return 0; + } + if ((f32) temp_v1->vtx2[2] < arg4) { + return 0; + } + if ((f32) temp_v1->vtx2[1] < arg3) { + return 0; + } + if (arg3 < (f32) temp_v1->vtx3[1]) { + return 0; + } + temp_f0 = arg1 * 3.0f; + if (arg2 < ((f32) temp_v1->vtx3[0] - temp_f0)) { + return 0; + } + if (((f32) temp_v1->vtx2[0] + temp_f0) < arg2) { + return 0; + } + temp_a0 = temp_v1->vtxs[0]; + temp_a3 = temp_v1->vtxs[2]; + temp_a2 = temp_v1->vtxs[1]; + sp64 = (f32) temp_a3->v.ob[2]; + sp8 = arg3; + sp10 = arg4; + temp_f6 = (f32) temp_a0->v.ob[1] - arg3; + sp68 = (f32) temp_a3->v.ob[1]; + temp_f10 = (f32) temp_a2->v.ob[2] - arg4; + sp2C = temp_f6; + sp28 = temp_f10; + sp24 = (f32) temp_a0->v.ob[2] - arg4; + temp_f0_2 = temp_f6 * temp_f10; + sp8 = temp_f6; + spC = temp_f10; + sp20 = (f32) temp_a2->v.ob[1] - arg3; + temp_f2 = sp24 * sp20; + temp_f4 = temp_f0_2 - temp_f2; + sp1C = temp_f4; + sp38 = temp_f4; + if (temp_f2 == temp_f0_2) { + sp14 = arg3; + temp_f0_3 = sp64 - sp10; + temp_f2_2 = sp68 - arg3; + if ((((sp20 * temp_f0_3) - (spC * temp_f2_2)) * ((temp_f2_2 * sp24) - (temp_f0_3 * sp8))) < 0.0f) { + var_v0_2 = 0; + } + } else { + temp_f2_3 = sp68 - arg3; + temp_f0_4 = sp64 - arg4; + temp_f14 = sp28 * temp_f2_3; + temp_f12 = sp20 * temp_f0_4; + if (temp_f14 == temp_f12) { + if ((sp38 * ((temp_f2_3 * sp24) - (temp_f0_4 * sp2C))) < 0.0f) { + var_v0_2 = 0; + } + } else { + temp_f16 = temp_f12 - temp_f14; + if ((sp1C * temp_f16) < 0.0f) { + var_v0_2 = 0; + } else { + temp_f14_2 = temp_f0_4 * sp2C; + temp_f12_2 = temp_f2_3 * sp24; + if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { + var_v0_2 = 0; + } + } + } + } + if (var_v0_2 == 0) { + return 0; + } + temp_f0_5 = ((temp_v1->height * arg2) + (temp_v1->gravity * arg3) + (temp_v1->rotation * arg4) + temp_v1->height2) - arg1; + if (temp_f0_5 > 0.0f) { + if (temp_f0_5 < arg0->unk3C[1]) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = temp_f0_5; + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + arg0->unk54[2] = temp_v1->rotation; + } + return 0; + } + var_v0 = 0; + if (temp_f0_5 > -16.0f) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = temp_f0_5; + var_v0 = 1; + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + arg0->unk54[2] = temp_v1->rotation; + } + return var_v0; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AB6C4.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +s32 func_802ABB04(f32 arg0, f32 arg1, s32 arg2) { + f32 sp6C; + f32 sp64; + f32 sp60; + f32 sp58; + f32 sp3C; + f32 sp28; + f32 sp20; + f32 sp1C; + Vtx *temp_a0; + Vtx *temp_a1; + Vtx *temp_a3; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f10; + f32 temp_f12; + f32 temp_f14; + f32 temp_f16; + f32 temp_f16_2; + f32 temp_f18; + f32 temp_f20; + f32 temp_f22; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f6; + mk64_surface_map_ram *temp_v0; + s32 var_v1; + + temp_v0 = &D_8015F580[arg2 & 0xFFFF]; + temp_a1 = temp_v0->vtxs[1]; + temp_a0 = temp_v0->vtxs[0]; + var_v1 = 1; + sp60 = (f32) temp_a1->v.ob[0]; + temp_f20 = (f32) temp_a0->v.ob[2] - arg1; + sp58 = (f32) temp_a1->v.ob[2]; + temp_a3 = temp_v0->vtxs[2]; + temp_f22 = (f32) temp_a0->v.ob[0] - arg0; + sp6C = (f32) temp_a3->v.ob[0]; + temp_f10 = sp60 - arg0; + temp_f0 = temp_f20 * temp_f10; + sp28 = temp_f10; + sp64 = (f32) temp_a3->v.ob[2]; + temp_f6 = sp58 - arg1; + temp_f2 = temp_f22 * temp_f6; + sp20 = temp_f6; + sp1C = temp_f0 - temp_f2; + sp3C = sp1C; + if (temp_f2 == temp_f0) { + temp_f0_2 = sp6C - arg0; + temp_f2_2 = sp64 - arg1; + if ((((temp_f6 * temp_f0_2) - (temp_f10 * temp_f2_2)) * ((temp_f2_2 * temp_f22) - (temp_f0_2 * temp_f20))) < 0.0f) { + var_v1 = 0; + } + } else { + temp_f2_3 = sp64 - arg1; + temp_f0_3 = sp6C - arg0; + temp_f18 = sp28 * temp_f2_3; + temp_f16 = sp20 * temp_f0_3; + if (temp_f18 == temp_f16) { + if ((sp3C * ((temp_f2_3 * temp_f22) - (temp_f0_3 * temp_f20))) < 0.0f) { + var_v1 = 0; + } + } else { + temp_f12 = temp_f16 - temp_f18; + if ((sp1C * temp_f12) < 0.0f) { + var_v1 = 0; + } else { + temp_f16_2 = temp_f0_3 * temp_f20; + temp_f14 = temp_f2_3 * temp_f22; + if ((temp_f16_2 != temp_f14) && ((temp_f12 * (temp_f14 - temp_f16_2)) < 0.0f)) { + var_v1 = 0; + } + } + } + } + return var_v1; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802ABB04.s") +#endif + +s8 func_802ABD10(u16 arg0) { + mk64_surface_map_ram *tile = &D_8015F580[arg0]; + return tile->surfaceType; +} + +s16 func_802ABD40(u16 arg0) { + mk64_surface_map_ram *tile = &D_8015F580[arg0]; + return tile->flags & 0xFF; +} + +s16 func_802ABD7C(u16 arg0) { + mk64_surface_map_ram *tile = &D_8015F580[arg0]; + return tile->flags & 0x1000; +} + +s16 func_802ABDB8(u16 arg0) { + mk64_surface_map_ram *tile = &D_8015F580[arg0]; + return tile->flags & 0x400; +} + +s16 func_802ABDF4(u16 arg0) { + mk64_surface_map_ram *tile = &D_8015F580[arg0]; + return tile->flags & 0x800; +} + +f32 func_802ABE30(f32 arg0, f32 arg1, f32 arg2, u16 arg3) { + mk64_surface_map_ram *tile = &D_8015F580[arg3]; + if (tile->gravity == 0.0f) { + return arg1; + } + return ((tile->height * arg0) + (tile->rotation * arg2) + tile->height2) / -tile->gravity; +} + +f32 func_802ABEAC(UnkActorInner *arg0, Vec3f arg1) { + if (arg0->unk34 == 1) { + return func_802ABE30(arg1[0], arg1[1], arg1[2], arg0->unk3A); + } + if (arg0->unk30 == 1) { + return func_802ABE30(arg1[0], arg1[1], arg1[2], arg0->unk36); + } + if (arg0->unk32 == 1) { + return func_802ABE30(arg1[0], arg1[1], arg1[2], arg0->unk38); + } + return arg1[1]; +} + +#ifdef MIPS_TO_C +//generated by m2c commit 9841ff34ca242f5f14b2eab2b54a7a65ac47d80f +void process_shell_collision(f32 *arg0, f32 arg1, f32 *velocity, f32 arg3) { + f32 sp40; + f32 sp3C; + f32 sp38; + f32 sp24; + f32 spC; + f32 sp8; + f32 sp4; + f32 sp0; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f10; + f32 temp_f12; + f32 temp_f12_2; + f32 temp_f14; + f32 temp_f14_2; + f32 temp_f16_2; + f32 temp_f16_3; + f32 temp_f18; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f6; + f64 temp_f16; + + temp_f2 = velocity->unk0; + temp_f12 = velocity->unk4; + temp_f14 = velocity->unk8; + temp_f0 = sqrtf((temp_f2 * temp_f2) + (temp_f12 * temp_f12) + (temp_f14 * temp_f14)); + temp_f16 = (f64) temp_f0; + sp24 = temp_f0; + if ((temp_f16 > 4.5) || (temp_f16 < 3.5)) { + sp24 = 4.0f; + } + temp_f10 = arg0->unk8; + sp4 = temp_f10; + temp_f16_2 = arg0->unk0; + temp_f18 = arg0->unk4; + temp_f0_2 = (temp_f10 * temp_f14) + ((temp_f16_2 * temp_f2) + (temp_f18 * temp_f12)); + sp0 = temp_f16_2 * temp_f0_2; + spC = temp_f18 * temp_f0_2; + sp40 = temp_f2 - sp0; + sp3C = temp_f12 - spC; + temp_f6 = temp_f10 * temp_f0_2; + sp8 = temp_f6; + sp38 = temp_f14 - temp_f6; + temp_f2_2 = sp40 - sp0; + temp_f12_2 = sp3C - spC; + temp_f14_2 = sp38 - temp_f6; + temp_f16_3 = (1.0f / sqrtf((temp_f2_2 * temp_f2_2) + (temp_f12_2 * temp_f12_2) + (temp_f14_2 * temp_f14_2))) * sp24; + velocity->unk0 = temp_f2_2 * temp_f16_3; + velocity->unk4 = (f32) (temp_f12_2 * temp_f16_3); + velocity->unk8 = (f32) (temp_f14_2 * temp_f16_3); +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/process_shell_collision.s") +#endif + +void func_802AC098(UnkActorInner *arg0, f32 *velocity) { + if (arg0->unk3C[0] < 0.0f) { + process_shell_collision(arg0->unk48, arg0->unk3C[0], velocity, 2.0f); + } + + if (arg0->unk3C[1] < 0.0f) { + process_shell_collision(arg0->unk54, arg0->unk3C[1], velocity, 2.0f); + } +} + +void func_802AC114(Vec3f arg0, f32 arg1, Vec3f arg2, f32 arg3) { + f32 temp_f0; + f32 temp_f12; + f32 temp_f14; + f32 temp_f16; + f32 temp_f18; + f32 temp_f20; + f32 temp_f2; + f32 tmp1; + f32 tmp2; + f32 tmp3; + + temp_f0 = arg2[0]; + temp_f2 = arg2[1]; + temp_f12 = arg2[2]; + temp_f14 = -arg0[0]; + temp_f16 = -arg0[1]; + temp_f18 = -arg0[2]; + temp_f20 = (temp_f14 * temp_f0) + (temp_f16 * temp_f2) + (temp_f18 * temp_f12); + tmp1 = temp_f0 - (temp_f20 * temp_f14); + tmp2 = temp_f2 - (temp_f20 * temp_f16); + tmp3 = temp_f12 - (temp_f20 * temp_f18); + if (arg1 < -3.5) { + arg2[0] = tmp1 - (temp_f20 * temp_f14 * 0.5f); + arg2[1] = tmp2 - (temp_f20 * temp_f16 * 0.5f); + arg2[2] = tmp3 - (temp_f20 * temp_f18 * 0.5f); + } else { + arg2[0] = tmp1; + arg2[1] = tmp2; + arg2[2] = tmp3; + } +} + +#ifdef MIPS_TO_C +//generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 +mk64_surface_map_ram *func_802AAE4C(s16 *, ?, f32, f32, f32, s32); /* extern */ +mk64_surface_map_ram *func_802AB288(s16 *, ?, f32, f32, f32, s32); /* extern */ +mk64_surface_map_ram *func_802AB6C4(s16 *, ?, f32, f32, f32, s32); /* extern */ +extern u8 D_8014F110; +extern s32 D_8015F584; +extern s16 D_8015F6E8; +extern s16 D_8015F6EA; +extern s16 D_8015F6F0; +extern s16 D_8015F6F2; + +UNUSED mk64_surface_map_ram *func_802AC22C(void *arg0) { + f32 spE4; + f32 spE0; + f32 spDC; + s16 spD4; + s16 spD2; + s16 spD0; + s32 sp70; + f32 temp_f22; + f32 temp_f24; + f32 temp_f26; + s16 temp_v0_2; + s16 temp_v1; + s32 temp_at; + s32 temp_f4; + s32 temp_f6; + s32 temp_t3; + s32 var_s2; + u16 temp_s0; + u16 temp_v1_3; + u16 var_s1; + u16 var_v0; + u8 temp_v0; + void *temp_v1_2; + + spD0 = 0; + spD2 = 0; + spD4 = 0; + spDC = 1000.0f; + spE0 = 1000.0f; + spE4 = 1000.0f; + temp_v0 = arg0->unkD; + temp_f22 = arg0->unk0; + temp_f24 = arg0->unk4; + temp_f26 = arg0->unk8; + switch (temp_v0) { /* irregular */ + case 0x80: + if (func_802AB6C4(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) arg0->unkE) == (mk64_surface_map_ram *)1) { + arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, arg0->unkE); + return (mk64_surface_map_ram *)1; + } + default: +block_10: + temp_v0_2 = D_8015F6EA; + temp_v1 = D_8015F6F2; + temp_f4 = (s32) ((temp_f22 - (f32) temp_v0_2) / (f32) ((s32) (D_8015F6E8 - temp_v0_2) / 32)); + temp_f6 = (s32) ((temp_f26 - (f32) temp_v1) / (f32) ((s32) (D_8015F6F0 - temp_v1) / 32)); + if ((s16) temp_f4 < 0) { + return NULL; + } + if ((s16) temp_f6 < 0) { + return NULL; + } + if ((s16) temp_f4 >= 0x20) { + return NULL; + } + if ((s16) temp_f6 >= 0x20) { + return NULL; + } + temp_v1_2 = ((s16) ((s16) temp_f4 + ((s16) temp_f6 << 5)) * 4) + &D_8014F110; + var_v0 = temp_v1_2->unk2; + sp70 = (s32) var_v0; + if (var_v0 == 0) { + return NULL; + } + var_s1 = temp_v1_2->unk0; + var_s2 = 0; + if (sp70 > 0) { +loop_22: + temp_s0 = *(D_8015F584 + (var_s1 * 2)); + var_v0 = (u16) &D_8015F580[temp_s0]; + temp_v1_3 = var_v0->unk0; + if ((temp_v1_3 & 0x4000) != 0) { + if (arg0->unkE != temp_s0) { + var_v0 = func_802AAE4C(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) temp_s0); + if (var_v0 == (u16) (mk64_surface_map_ram *)1) { + arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); + arg0->unkD = 0x40U; + arg0->unkE = temp_s0; + arg0->unkC = (s8) D_8015F580[temp_s0].surfaceType; + if ((D_8015F580[temp_s0].flags & 0x1000) != 0) { + arg0->unk14 = (mk64_surface_map_ram *)1; + return (mk64_surface_map_ram *)1; + } + arg0->unk14 = NULL; + return (mk64_surface_map_ram *)1; + } + } + goto block_37; + } + if ((temp_v1_3 & 0x8000) != 0) { + if ((var_v0->unk1C != 1.0f) && (arg0->unkE != temp_s0)) { + var_v0 = func_802AB6C4(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) temp_s0); + if (var_v0 == (u16) (mk64_surface_map_ram *)1) { + arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); + arg0->unkD = 0x80U; + arg0->unkE = temp_s0; + arg0->unkC = (s8) D_8015F580[temp_s0].surfaceType; + return (mk64_surface_map_ram *)1; + } + } + goto block_37; + } + if ((var_v0->unk24 != 1.0f) && (arg0->unkE != temp_s0)) { + var_v0 = func_802AB288(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) temp_s0); + if (var_v0 == (u16) (mk64_surface_map_ram *)1) { + arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); + arg0->unkD = 0x20U; + arg0->unkE = temp_s0; + arg0->unkC = (s8) D_8015F580[temp_s0].surfaceType; + return (mk64_surface_map_ram *)1; + } + } +block_37: + temp_t3 = (var_s2 + 1) & 0xFFFF; + temp_at = temp_t3 < sp70; + var_s2 = temp_t3; + var_s1 = (var_s1 + 1) & 0xFFFF; + if (temp_at == 0) { + goto block_38; + } + goto loop_22; + } +block_38: + arg0->unk10 = temp_f24; + arg0->unkC = 0; + return (mk64_surface_map_ram *) var_v0; + case 0x40: + if (func_802AAE4C(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) arg0->unkE) == (mk64_surface_map_ram *)1) { + arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, arg0->unkE); + return (mk64_surface_map_ram *)1; + } + goto block_10; + case 0x20: + if (func_802AB288(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) arg0->unkE) == (mk64_surface_map_ram *)1) { + arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, arg0->unkE); + return (mk64_surface_map_ram *)1; + } + goto block_10; + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AC22C.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +s32 func_802AC760(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) { + f32 sp6C; + f32 sp64; + f32 sp38; + f32 sp28; + f32 sp24; + f32 sp20; + f32 sp1C; + f32 sp18; + f32 sp10; + f32 spC; + f32 sp8; + Vtx *temp_a0; + Vtx *temp_a2; + Vtx *temp_a3; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f0_4; + f32 temp_f10; + f32 temp_f12; + f32 temp_f12_2; + f32 temp_f12_3; + f32 temp_f14; + f32 temp_f14_2; + f32 temp_f14_3; + f32 temp_f16; + f32 temp_f16_2; + f32 temp_f18; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f2_4; + f32 temp_f4; + f32 temp_f6; + mk64_surface_map_ram *temp_v1; + s32 var_v0; + + temp_v1 = &D_8015F580[arg5]; + var_v0 = 1; + if (arg2 < (f32) temp_v1->vtx3[0]) { + return 0; + } + if (arg4 < (f32) temp_v1->vtx3[2]) { + return 0; + } + if ((f32) temp_v1->vtx2[0] < arg2) { + return 0; + } + if ((f32) temp_v1->vtx2[2] < arg4) { + return 0; + } + if (arg3 < ((f32) temp_v1->vtx3[1] - (arg1 * 3.0f))) { + return 0; + } + temp_a0 = temp_v1->vtxs[0]; + temp_a3 = temp_v1->vtxs[2]; + temp_a2 = temp_v1->vtxs[1]; + sp6C = (f32) temp_a3->v.ob[0]; + sp8 = arg4; + sp10 = arg2; + temp_f6 = (f32) temp_a0->v.ob[2] - arg4; + sp64 = (f32) temp_a3->v.ob[2]; + temp_f4 = (f32) temp_a2->v.ob[0] - arg2; + sp28 = temp_f6; + sp24 = temp_f4; + sp20 = (f32) temp_a0->v.ob[0] - arg2; + temp_f0 = temp_f6 * temp_f4; + sp8 = temp_f6; + spC = temp_f4; + temp_f18 = sp8; + sp1C = (f32) temp_a2->v.ob[2] - arg4; + temp_f2 = sp20 * sp1C; + temp_f10 = temp_f0 - temp_f2; + sp18 = temp_f10; + sp38 = temp_f10; + if (temp_f2 == temp_f0) { + sp8 = arg4; + temp_f0_2 = sp6C - sp10; + temp_f2_2 = sp64 - arg4; + if ((((sp1C * temp_f0_2) - (spC * temp_f2_2)) * ((temp_f2_2 * sp20) - (temp_f0_2 * temp_f18))) < 0.0f) { + var_v0 = 0; + } + } else { + temp_f2_3 = sp64 - arg4; + temp_f0_3 = sp6C - arg2; + temp_f14 = sp24 * temp_f2_3; + temp_f12 = sp1C * temp_f0_3; + if (temp_f14 == temp_f12) { + if ((sp38 * ((temp_f2_3 * sp20) - (temp_f0_3 * sp28))) < 0.0f) { + var_v0 = 0; + } + } else { + temp_f16 = temp_f12 - temp_f14; + if ((sp18 * temp_f16) < 0.0f) { + var_v0 = 0; + } else { + temp_f14_2 = temp_f0_3 * sp28; + temp_f12_2 = temp_f2_3 * sp20; + if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { + var_v0 = 0; + } + } + } + } + if (var_v0 == 0) { + return 0; + } + temp_f2_4 = temp_v1->height; + temp_f12_3 = temp_v1->gravity; + temp_f14_3 = temp_v1->rotation; + temp_f16_2 = temp_v1->height2; + temp_f0_4 = (temp_f2_4 * arg2) + (temp_f12_3 * arg3) + (temp_f14_3 * arg4) + temp_f16_2; + if (arg1 < temp_f0_4) { + if (temp_f0_4 < arg0->unk3C[2]) { + arg0->unk34 = 1; + arg0->unk3A = arg5; + arg0->unk3C[2] = temp_f0_4 - arg1; + arg0->unk60[0] = temp_v1->height; + arg0->unk60[1] = temp_v1->gravity; + arg0->unk60[2] = temp_v1->rotation; + } + return 0; + } + if (((temp_f2_4 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2) < 0.0f) { + return 0; + } + arg0->unk34 = 1; + arg0->unk3A = arg5; + arg0->unk3C[2] = temp_f0_4 - arg1; + arg0->unk60[0] = temp_v1->height; + arg0->unk60[1] = temp_v1->gravity; + arg0->unk60[2] = temp_v1->rotation; + return 1; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AC760.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +s32 func_802ACBA4(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) { + f32 sp70; + f32 sp6C; + f32 sp48; + f32 sp3C; + f32 sp2C; + f32 sp28; + f32 sp24; + f32 sp20; + f32 sp1C; + f32 sp14; + f32 sp10; + f32 spC; + f32 sp8; + Vtx *temp_a0; + Vtx *temp_a2; + Vtx *temp_a3; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f0_4; + f32 temp_f0_5; + f32 temp_f10; + f32 temp_f12; + f32 temp_f12_2; + f32 temp_f12_3; + f32 temp_f14; + f32 temp_f14_2; + f32 temp_f14_3; + f32 temp_f16; + f32 temp_f16_2; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f2_4; + f32 temp_f2_5; + f32 temp_f4; + f32 temp_f4_2; + f32 temp_f6; + f32 temp_f8; + f32 var_f10; + mk64_surface_map_ram *temp_v1; + s32 var_v0; + + temp_v1 = &D_8015F580[arg5]; + var_v0 = 1; + if (arg2 < (f32) temp_v1->vtx3[0]) { + return 0; + } + if ((f32) temp_v1->vtx2[0] < arg2) { + return 0; + } + if ((f32) temp_v1->vtx2[1] < arg3) { + return 0; + } + if (arg3 < (f32) temp_v1->vtx3[1]) { + return 0; + } + temp_f2 = arg1 * 3.0f; + if (arg4 < ((f32) temp_v1->vtx3[2] - temp_f2)) { + return 0; + } + if (((f32) temp_v1->vtx2[2] + temp_f2) < arg4) { + return 0; + } + temp_a0 = temp_v1->vtxs[0]; + temp_a3 = temp_v1->vtxs[2]; + temp_a2 = temp_v1->vtxs[1]; + sp70 = (f32) temp_a3->v.ob[0]; + sp8 = arg3; + sp10 = arg2; + temp_f10 = (f32) temp_a0->v.ob[1] - arg3; + sp6C = (f32) temp_a3->v.ob[1]; + temp_f6 = (f32) temp_a2->v.ob[0] - arg2; + sp2C = temp_f10; + sp28 = temp_f6; + sp24 = (f32) temp_a0->v.ob[0] - arg2; + temp_f0 = temp_f10 * temp_f6; + sp8 = temp_f10; + spC = temp_f6; + sp20 = (f32) temp_a2->v.ob[1] - arg3; + temp_f2_2 = sp24 * sp20; + temp_f4 = temp_f0 - temp_f2_2; + sp1C = temp_f4; + sp3C = temp_f4; + if (temp_f2_2 == temp_f0) { + sp14 = arg3; + temp_f0_2 = sp70 - sp10; + temp_f2_3 = sp6C - arg3; + if ((((sp20 * temp_f0_2) - (spC * temp_f2_3)) * ((temp_f2_3 * sp24) - (temp_f0_2 * sp8))) < 0.0f) { + var_v0 = 0; + } + } else { + temp_f2_4 = sp6C - arg3; + temp_f0_3 = sp70 - arg2; + temp_f14 = sp28 * temp_f2_4; + temp_f12 = sp20 * temp_f0_3; + if (temp_f14 == temp_f12) { + if ((sp3C * ((temp_f2_4 * sp24) - (temp_f0_3 * sp2C))) < 0.0f) { + var_v0 = 0; + } + } else { + temp_f16 = temp_f12 - temp_f14; + if ((sp1C * temp_f16) < 0.0f) { + var_v0 = 0; + } else { + temp_f14_2 = temp_f0_3 * sp2C; + temp_f12_2 = temp_f2_4 * sp24; + if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { + var_v0 = 0; + } + } + } + } + if (var_v0 == 0) { + return 0; + } + temp_f2_5 = temp_v1->height; + temp_f12_3 = temp_v1->gravity; + temp_f14_3 = temp_v1->rotation; + temp_f16_2 = temp_v1->height2; + temp_f0_4 = (temp_f2_5 * arg2) + (temp_f12_3 * arg3) + (temp_f14_3 * arg4) + temp_f16_2; + if (temp_v1->flags & 0x200) { + temp_f4_2 = (temp_f2_5 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; + sp48 = temp_f4_2; + if ((temp_f0_4 > 0.0f) && (temp_f4_2 > 0.0f)) { + if (temp_f0_4 < arg1) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = temp_f0_4 - arg1; + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + arg0->unk48[2] = temp_v1->rotation; + return 1; + } + return 0; + } + if ((temp_f0_4 < 0.0f) && (sp48 < 0.0f)) { + temp_f0_5 = temp_f0_4 * -1.0f; + if (temp_f0_5 < arg1) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = temp_f0_5 - arg1; + arg0->unk48[0] = -temp_v1->height; + arg0->unk48[1] = -temp_v1->gravity; + arg0->unk48[2] = -temp_v1->rotation; + return 1; + } + return 0; + } + if ((temp_f0_4 > 0.0f) && (sp48 < 0.0f)) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = -(temp_f0_4 + arg1); + arg0->unk48[0] = -temp_v1->height; + arg0->unk48[1] = -temp_v1->gravity; + var_f10 = -temp_v1->rotation; + arg0->unk48[2] = var_f10; + return 1; + } + if ((temp_f0_4 < 0.0f) && (sp48 > 0.0f)) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = temp_f0_4 + arg1; + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + arg0->unk48[2] = temp_v1->rotation; + return 1; + } + if (temp_f0_4 == 0.0f) { + if (sp48 >= 0.0f) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = sp48 + arg1; + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + arg0->unk48[2] = temp_v1->rotation; + return 1; + } + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = -(sp48 + arg1); + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + var_f10 = temp_v1->rotation; + arg0->unk48[2] = var_f10; + return 1; + } + return 0; + } + if (arg1 < temp_f0_4) { + if (temp_f0_4 < arg0->unk3C[0]) { + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = temp_f0_4 - arg1; + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + arg0->unk48[2] = temp_v1->rotation; + } + return 0; + } + temp_f8 = (temp_f2_5 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; + sp48 = temp_f8; + if (temp_f8 < 0.0f) { + return 0; + } + arg0->unk30 = 1; + arg0->unk36 = arg5; + arg0->unk3C[0] = temp_f0_4 - arg1; + arg0->unk48[0] = temp_v1->height; + arg0->unk48[1] = temp_v1->gravity; + var_f10 = temp_v1->rotation; +block_54: + arg0->unk48[2] = var_f10; + return 1; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802ACBA4.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +s32 func_802AD278(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) { + f32 sp68; + f32 sp64; + f32 sp44; + f32 sp38; + f32 sp2C; + f32 sp28; + f32 sp24; + f32 sp20; + f32 sp1C; + f32 sp14; + f32 sp10; + f32 spC; + f32 sp8; + Vtx *temp_a0; + Vtx *temp_a2; + Vtx *temp_a3; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f0_4; + f32 temp_f0_5; + f32 temp_f0_6; + f32 temp_f10; + f32 temp_f10_2; + f32 temp_f12; + f32 temp_f12_2; + f32 temp_f12_3; + f32 temp_f14; + f32 temp_f14_2; + f32 temp_f14_3; + f32 temp_f16; + f32 temp_f16_2; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f2_4; + f32 temp_f4; + f32 temp_f6; + f32 temp_f8; + f32 var_f8; + mk64_surface_map_ram *temp_v1; + s32 var_v0; + + temp_v1 = &D_8015F580[arg5]; + var_v0 = 1; + if (arg4 < (f32) temp_v1->vtx3[2]) { + return 0; + } + if ((f32) temp_v1->vtx2[2] < arg4) { + return 0; + } + if ((f32) temp_v1->vtx2[1] < arg3) { + return 0; + } + if (arg3 < (f32) temp_v1->vtx3[1]) { + return 0; + } + temp_f0 = arg1 * 3.0f; + if (arg2 < ((f32) temp_v1->vtx3[0] - temp_f0)) { + return 0; + } + if (((f32) temp_v1->vtx2[0] + temp_f0) < arg2) { + return 0; + } + temp_a0 = temp_v1->vtxs[0]; + temp_a3 = temp_v1->vtxs[2]; + temp_a2 = temp_v1->vtxs[1]; + sp64 = (f32) temp_a3->v.ob[2]; + sp8 = arg3; + sp10 = arg4; + temp_f8 = (f32) temp_a0->v.ob[1] - arg3; + sp68 = (f32) temp_a3->v.ob[1]; + temp_f6 = (f32) temp_a2->v.ob[2] - arg4; + sp2C = temp_f8; + sp28 = temp_f6; + sp24 = (f32) temp_a0->v.ob[2] - arg4; + temp_f0_2 = temp_f8 * temp_f6; + sp8 = temp_f8; + spC = temp_f6; + sp20 = (f32) temp_a2->v.ob[1] - arg3; + temp_f2 = sp24 * sp20; + temp_f10 = temp_f0_2 - temp_f2; + sp1C = temp_f10; + sp38 = temp_f10; + if (temp_f2 == temp_f0_2) { + sp14 = arg3; + temp_f0_3 = sp64 - sp10; + temp_f2_2 = sp68 - arg3; + if ((((sp20 * temp_f0_3) - (spC * temp_f2_2)) * ((temp_f2_2 * sp24) - (temp_f0_3 * sp8))) < 0.0f) { + var_v0 = 0; + } + } else { + temp_f2_3 = sp68 - arg3; + temp_f0_4 = sp64 - arg4; + temp_f14 = sp28 * temp_f2_3; + temp_f12 = sp20 * temp_f0_4; + if (temp_f14 == temp_f12) { + if ((sp38 * ((temp_f2_3 * sp24) - (temp_f0_4 * sp2C))) < 0.0f) { + var_v0 = 0; + } + } else { + temp_f16 = temp_f12 - temp_f14; + if ((sp1C * temp_f16) < 0.0f) { + var_v0 = 0; + } else { + temp_f14_2 = temp_f0_4 * sp2C; + temp_f12_2 = temp_f2_3 * sp24; + if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { + var_v0 = 0; + } + } + } + } + if (var_v0 == 0) { + return 0; + } + temp_f2_4 = temp_v1->height; + temp_f12_3 = temp_v1->gravity; + temp_f14_3 = temp_v1->rotation; + temp_f16_2 = temp_v1->height2; + temp_f0_5 = (temp_f2_4 * arg2) + (temp_f12_3 * arg3) + (temp_f14_3 * arg4) + temp_f16_2; + if (temp_v1->flags & 0x200) { + temp_f10_2 = (temp_f2_4 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; + sp44 = temp_f10_2; + if ((temp_f0_5 > 0.0f) && (temp_f10_2 > 0.0f)) { + if (temp_f0_5 < arg1) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = temp_f0_5 - arg1; + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + arg0->unk54[2] = temp_v1->rotation; + return 1; + } + return 0; + } + if ((temp_f0_5 < 0.0f) && (sp44 < 0.0f)) { + temp_f0_6 = temp_f0_5 * -1.0f; + if (temp_f0_6 < arg1) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = temp_f0_6 - arg1; + arg0->unk54[0] = -temp_v1->height; + arg0->unk54[1] = -temp_v1->gravity; + arg0->unk54[2] = -temp_v1->rotation; + return 1; + } + return 0; + } + if ((temp_f0_5 > 0.0f) && (sp44 < 0.0f)) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = -(temp_f0_5 + arg1); + arg0->unk54[0] = -temp_v1->height; + arg0->unk54[1] = -temp_v1->gravity; + var_f8 = -temp_v1->rotation; + arg0->unk54[2] = var_f8; + return 1; + } + if ((temp_f0_5 < 0.0f) && (sp44 > 0.0f)) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = temp_f0_5 + arg1; + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + arg0->unk54[2] = temp_v1->rotation; + return 1; + } + if (temp_f0_5 == 0.0f) { + if (sp44 >= 0.0f) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = sp44 + arg1; + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + arg0->unk54[2] = temp_v1->rotation; + return 1; + } + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = -(sp44 + arg1); + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + var_f8 = temp_v1->rotation; + arg0->unk54[2] = var_f8; + return 1; + } + return 0; + } + if (arg1 < temp_f0_5) { + if (temp_f0_5 < arg0->unk3C[1]) { + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = temp_f0_5 - arg1; + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + arg0->unk54[2] = temp_v1->rotation; + } + return 0; + } + temp_f4 = (temp_f2_4 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; + sp44 = temp_f4; + if (temp_f4 < 0.0f) { + return 0; + } + arg0->unk32 = 1; + arg0->unk38 = arg5; + arg0->unk3C[1] = temp_f0_5 - arg1; + arg0->unk54[0] = temp_v1->height; + arg0->unk54[1] = temp_v1->gravity; + var_f8 = temp_v1->rotation; + arg0->unk54[2] = var_f8; + return 1; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AD278.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit a8f43e46d33dcb7e04d9cdc44a10b3daf4c92c3b +s32 func_802AC760(f32, f32, f32, f32, f32, f32, f32, f32, f32); /* extern */ +s32 func_802ACBA4(UnkActorInner *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ +s32 func_802AD278(UnkActorInner *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ +extern u8 D_8014F110; +extern s32 D_8015F584; +extern s16 D_8015F6E8; +extern s16 D_8015F6EA; +extern s16 D_8015F6F0; +extern s16 D_8015F6F2; + +s32 func_802AD950(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { + s16 temp_v0_4; + s16 temp_v1; + s32 temp_f10; + s32 temp_f16; + s32 temp_t7; + u16 temp_s6; + u16 temp_v0; + u16 temp_v0_2; + u16 temp_v0_3; + u16 temp_v0_5; + u16 temp_v1_3; + void *temp_v1_2; + s32 phi_s4; + s32 phi_s4_2; + u16 phi_s2; + s32 phi_s3; + s32 phi_s4_3; + s32 phi_s4_4; + s32 phi_s4_5; + s32 phi_s4_6; + + arg0->unk30 = 0; + arg0->unk32 = 0; + arg0->unk34 = 0; + arg0->unk3C = 1000.0f; + arg0->unk40 = 1000.0f; + arg0->unk44 = 1000.0f; + temp_v0 = arg0->unk3A; + phi_s4_6 = 0; + if (((s32) temp_v0 < (s32) D_8015F588) && (func_802AC760(arg1, arg2, arg3, arg4, (bitwise f32) temp_v0, arg5, arg6, arg7) == 1)) { + phi_s4_6 = 0x00004000; + } + temp_v0_2 = arg0->unk36; + phi_s4_4 = phi_s4_6; + if (((s32) temp_v0_2 < (s32) D_8015F588) && (func_802ACBA4(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_2, arg5, arg6, arg7) == 1)) { + phi_s4_4 = (phi_s4_6 | 0x2000) & 0xFFFF; + } + temp_v0_3 = arg0->unk38; + phi_s4 = phi_s4_4; + if (((s32) temp_v0_3 < (s32) D_8015F588) && (func_802AD278(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_3, arg5, arg6, arg7) == 1)) { + phi_s4 = (phi_s4_4 | 0x8000) & 0xFFFF; + } + phi_s4_2 = phi_s4; + phi_s4_3 = phi_s4; + if (phi_s4 == 0x0000E000) { + goto block_39; + } + temp_v0_4 = D_8015F6EA; + temp_v1 = D_8015F6F2; + temp_f10 = (s32) ((arg2 - (f32) temp_v0_4) / (f32) ((s32) (D_8015F6E8 - temp_v0_4) / 32)); + temp_f16 = (s32) ((arg4 - (f32) temp_v1) / (f32) ((s32) (D_8015F6F0 - temp_v1) / 32)); + if ((s16) temp_f10 < 0) { + return 0; + } + if ((s16) temp_f16 < 0) { + return 0; + } + if ((s16) temp_f10 >= 0x20) { + return 0; + } + if ((s16) temp_f16 >= 0x20) { + return 0; + } + temp_v1_2 = ((s16) ((s16) temp_f10 + ((s16) temp_f16 << 5)) * 4) + &D_8014F110; + temp_s6 = temp_v1_2->unk2; + phi_s3 = 0; + if (temp_s6 == 0) { + + } else { + phi_s2 = temp_v1_2->unk0; + if ((s32) temp_s6 > 0) { +loop_22: + phi_s4_3 = phi_s4_2; + phi_s4_5 = phi_s4_2; + if (phi_s4_2 == 0x0000E000) { + + } else { + temp_v0_5 = *(D_8015F584 + (phi_s2 * 2)); + temp_v1_3 = D_8015F580[temp_v0_5].flags; + if ((temp_v1_3 & 0x4000) != 0) { + if (((phi_s4_2 & 0x4000) == 0) && (arg0->unk3A != temp_v0_5) && (func_802AC760((bitwise f32) arg0, arg1, arg2, arg3, arg4, (bitwise f32) temp_v0_5, arg5, arg6, arg7) == 1)) { + phi_s4_5 = (phi_s4_2 | 0x4000) & 0xFFFF; + } + } else if ((temp_v1_3 & 0x8000) != 0) { + if (((phi_s4_2 & 0x8000) == 0) && (arg0->unk38 != temp_v0_5) && (func_802AD278(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_5, arg5, arg6, arg7) == 1)) { + phi_s4_5 = (phi_s4_2 | 0x8000) & 0xFFFF; + } + } else if (((phi_s4_2 & 0x2000) == 0) && (arg0->unk36 != temp_v0_5) && (func_802ACBA4(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_5, arg5, arg6, arg7) == 1)) { + phi_s4_5 = (phi_s4_2 | 0x2000) & 0xFFFF; + } + temp_t7 = (phi_s3 + 1) & 0xFFFF; + phi_s4_2 = phi_s4_5; + phi_s2 = (phi_s2 + 1) & 0xFFFF; + phi_s3 = temp_t7; + phi_s4_3 = phi_s4_5; + if (temp_t7 < (s32) temp_s6) { + goto loop_22; + } + } + } + } +block_39: + return phi_s4_3; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AD950.s") +#endif + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +s32 func_802AAE4C(void *, f32, f32, f32, f32, s32); // extern +s32 func_802AB288(void *, void *, f32, f32, f32, s32); // extern +s32 func_802AB6C4(void *, void *, f32, f32, f32, s32); // extern +extern u8 D_8014F110; +extern s32 D_8015F584; + +s32 func_802ADDC8(void *arg0, void *arg1, f32 arg2, f32 arg3, f32 arg4) { + s16 temp_v0_4; + s16 temp_v1; + s32 temp_f4; + s32 temp_f6; + s32 temp_t7; + u16 temp_s6; + u16 temp_v0; + u16 temp_v0_2; + u16 temp_v0_3; + u16 temp_v0_5; + u16 temp_v1_3; + void *temp_v1_2; + s32 phi_s4; + s32 phi_s4_2; + u16 phi_s2; + s32 phi_s3; + s32 phi_s4_3; + s32 phi_s4_4; + s32 phi_s4_5; + s32 phi_s4_6; + + arg0->unk0 = 0; + arg0->unk2 = 0; + arg0->unk4 = 0; + arg0->unkC = 1000.0f; + arg0->unk10 = 1000.0f; + arg0->unk14 = 1000.0f; + temp_v0 = arg0->unkA; + phi_s4_6 = 0; + if ((temp_v0 < D_8015F588) && (func_802AAE4C(arg1, arg2, arg3, arg4, (bitwise f32) temp_v0) == 1)) { + phi_s4_6 = 0x4000; + } + temp_v0_2 = arg0->unk6; + phi_s4_4 = phi_s4_6; + if ((temp_v0_2 < D_8015F588) && (func_802AB288(arg0, arg1, arg2, arg3, arg4, temp_v0_2) == 1)) { + phi_s4_4 = (phi_s4_6 | 0x2000) & 0xFFFF; + } + temp_v0_3 = arg0->unk8; + phi_s4 = phi_s4_4; + if ((temp_v0_3 < D_8015F588) && (func_802AB6C4(arg0, arg1, arg2, arg3, arg4, temp_v0_3) == 1)) { + phi_s4 = (phi_s4_4 | 0x8000) & 0xFFFF; + } + phi_s4_2 = phi_s4; + phi_s4_3 = phi_s4; + if (phi_s4 == 0xE000) { + goto block_39; + } + temp_v0_4 = D_8015F6EA; + temp_v1 = D_8015F6F2; + temp_f4 = (arg2 - temp_v0_4) / ((D_8015F6E8 - temp_v0_4) / 0x20); + temp_f6 = (arg4 - temp_v1) / ((D_8015F6F0 - temp_v1) / 0x20); + if (temp_f4 < 0) { + return 0; + } + if (temp_f6 < 0) { + return 0; + } + if (temp_f4 >= 0x20) { + return 0; + } + if (temp_f6 >= 0x20) { + return 0; + } + temp_v1_2 = ((temp_f4 + (temp_f6 << 5)) * 4) + &D_8014F110; + temp_s6 = temp_v1_2->unk2; + phi_s3 = 0; + if (temp_s6 == 0) { + + } else { + phi_s2 = temp_v1_2->unk0; + if (temp_s6 > 0) { +loop_22: + phi_s4_3 = phi_s4_2; + phi_s4_5 = phi_s4_2; + if (phi_s4_2 == 0xE000) { + + } else { + temp_v0_5 = *(D_8015F584 + (phi_s2 * 2)); + temp_v1_3 = *(D_8015F580 + (temp_v0_5 * 0x2C)); + if ((temp_v1_3 & 0x4000) != 0) { + if (((phi_s4_2 & 0x4000) == 0) && (arg0->unkA != temp_v0_5) && (func_802AAE4C(arg0, (bitwise f32) arg1, arg2, arg3, arg4, temp_v0_5) == 1)) { + phi_s4_5 = (phi_s4_2 | 0x4000) & 0xFFFF; + } + } else if ((temp_v1_3 & 0x8000) != 0) { + if (((phi_s4_2 & 0x8000) == 0) && (arg0->unk8 != temp_v0_5) && (func_802AB6C4(arg0, arg1, arg2, arg3, arg4, temp_v0_5) == 1)) { + phi_s4_5 = (phi_s4_2 | 0x8000) & 0xFFFF; + } + } else if (((phi_s4_2 & 0x2000) == 0) && (arg0->unk6 != temp_v0_5) && (func_802AB288(arg0, arg1, arg2, arg3, arg4, temp_v0_5) == 1)) { + phi_s4_5 = (phi_s4_2 | 0x2000) & 0xFFFF; + } + temp_t7 = (phi_s3 + 1) & 0xFFFF; + phi_s4_2 = phi_s4_5; + phi_s2 = (phi_s2 + 1) & 0xFFFF; + phi_s3 = temp_t7; + phi_s4_3 = phi_s4_5; + if (temp_t7 < temp_s6) { + goto loop_22; + } + } + } + } +block_39: + return phi_s4_3; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802ADDC8.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-09-2022 +s32 func_802ABB04(f32, f32, s32); /* extern */ +extern ? D_8014F110; +extern s32 D_8015F584; +static f32 D_802B9E4C = -3000.0f; +static f32 D_802B9E50 = 3000.0f; +static f32 D_802B9E54 = 3000.0f; +static f32 D_802B9E58 = 3000.0f; +static f32 D_802B9E5C = 3000.0f; +static f32 D_802B9E60 = 3000.0f; + +f32 func_802AE1C0(f32 arg0, f32 arg1, f32 arg2) { + f32 temp_f0; + f32 var_f20; + s32 temp_at; + s32 temp_f4; + s32 temp_f6; + s32 temp_t0; + s32 temp_t9; + s32 var_s2; + u16 temp_s0; + u16 temp_t1; + u16 var_s1; + void *temp_t2; + + var_f20 = D_802B9E4C; + temp_f4 = (s32) ((arg0 - (f32) D_8015F6EA) / (f32) ((s32) (D_8015F6E8 - D_8015F6EA) / 32)); + temp_f6 = (s32) ((arg2 - (f32) D_8015F6F2) / (f32) ((s32) (D_8015F6F0 - D_8015F6F2) / 32)); + temp_t0 = (s16) temp_f6 << 5; + temp_t2 = ((s16) ((s16) temp_f4 + temp_t0) * 4) + &D_8014F110; + temp_t1 = temp_t2->unk2; + if ((s16) temp_f4 < 0) { + return D_802B9E50; + } + if ((s16) temp_f6 & 0x04000000) { + return D_802B9E54; + } + if ((s16) temp_f4 >= 0x20) { + return D_802B9E58; + } + if (temp_t0 >= 0x400) { + return D_802B9E5C; + } + if (temp_t1 == 0) { + return D_802B9E60; + } + var_s1 = temp_t2->unk0; + var_s2 = 0; + if ((s32) temp_t1 > 0) { + do { + temp_s0 = *(D_8015F584 + (var_s1 * 2)); + if ((D_8015F580[temp_s0].flags & 0x4000) && (func_802ABB04(arg0, arg2, temp_s0 & 0xFFFF) == 1)) { + temp_f0 = func_802ABE30(arg0, arg1, arg2, temp_s0 & 0xFFFF); + if ((temp_f0 <= arg1) && (var_f20 < temp_f0)) { + var_f20 = temp_f0; + } + } + temp_t9 = (var_s2 + 1) & 0xFFFF; + temp_at = temp_t9 < (s32) temp_t1; + var_s2 = temp_t9; + var_s1 = (var_s1 + 1) & 0xFFFF; + } while (temp_at != 0); + } + return var_f20; +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AE1C0.s") +#endif + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +extern s32 D_8015F59C; +extern s32 D_8015F5A0; +extern s32 D_8015F5A4; +extern s16 D_8015F6E8; +extern s16 D_8015F6EA; +extern s16 D_8015F6F0; +extern s16 D_8015F6F2; +extern s16 D_8015F6FA; +extern s16 D_8015F6FC; +static f32 D_802B9E64 = -0.9f; +static f32 D_802B9E68 = 0.9f; +static f32 D_802B9E6C = 0.1f; +static f32 D_802B9E70 = -0.1f; + +void func_802AE434(Vtx *arg0, Vtx *arg1, Vtx *arg2, s8 arg3, u16 arg4) { + s16 spBA; + s16 spB8; + s16 spB6; + s16 spB2; + s16 spAC; + s16 spAA; + f32 sp58; + f32 sp54; + f32 sp50; + f32 sp4C; + s16 sp4A; + s16 sp48; + s16 sp44; + s16 sp42; + Vtx *sp1C; /* compiler-managed */ + f64 sp10; + f64 sp8; + f64 sp0; + Vtx *temp_t1; + Vtx *temp_t2; + Vtx *temp_t6; + f32 temp_f0; + f32 temp_f18_2; + f32 temp_f4_2; + f64 temp_f12; + f64 temp_f14; + f64 temp_f16; + f64 temp_f18; + f64 temp_f2; + f64 temp_f4; + f64 temp_f8; + mk64_surface_map_ram *temp_t0; + s16 var_a0; + s16 var_a1; + s16 var_a2; + s16 var_a3; + s16 var_t1; + s16 var_t2; + s16 var_t3; + s16 var_t4; + s16 var_t5; + s16 var_v0; + s16 var_v1; + s32 temp_a0; + s32 temp_a1; + s32 temp_a2; + s32 temp_a3; + s32 temp_v0; + s32 temp_v1; + u16 temp_a0_2; + u16 temp_a3_2; + u16 temp_v1_2; + u16 var_a1_2; + u16 var_t8; + u16 var_t9; + + temp_t0 = &D_8015F580[D_8015F588]; + temp_t0->vtxs[0] = arg0; + temp_t0->vtxs[1] = arg1; + temp_t0->vtxs[2] = arg2; + if ((arg0->v.flag != 4) || (arg1->v.flag != 4) || (temp_t0->vtxs[2]->v.flag != 4)) { + temp_t6 = temp_t0->vtxs[0]; + sp1C = temp_t6; + temp_t1 = temp_t0->vtxs[1]; + temp_t2 = temp_t0->vtxs[2]; + var_a0 = temp_t6->v.ob[0]; + var_t3 = temp_t1->v.ob[0]; + var_a2 = temp_t6->v.ob[1]; + var_a1 = temp_t6->v.ob[2]; + var_a3 = temp_t1->v.ob[1]; + var_t4 = temp_t1->v.ob[2]; + var_t5 = temp_t2->v.ob[0]; + var_v0 = temp_t2->v.ob[1]; + var_v1 = temp_t2->v.ob[2]; + if ((var_a0 == var_t3) && (var_a1 == var_t4)) { + temp_t0->vtxs[2] = arg1; + temp_t0->vtxs[1] = arg2; + var_a0 = arg0->v.ob[0]; + var_a2 = arg0->v.ob[1]; + var_a1 = arg0->v.ob[2]; + var_t3 = arg1->v.ob[0]; + var_a3 = arg1->v.ob[1]; + var_t4 = arg1->v.ob[2]; + var_t5 = arg2->v.ob[0]; + var_v0 = arg2->v.ob[1]; + var_v1 = arg2->v.ob[2]; + } + if (var_a0 >= var_t3) { + if (var_a0 >= var_t5) { + sp4A = var_a0; + } else { + goto block_12; + } + } else if (var_t3 >= var_t5) { + sp4A = var_t3; + } else { +block_12: + sp4A = var_t5; + } + if (var_a1 >= var_t4) { + if (var_a1 >= var_v1) { + sp48 = var_a1; + } else { + goto block_19; + } + } else if (var_t4 >= var_v1) { + sp48 = var_t4; + } else { +block_19: + sp48 = var_v1; + } + if (var_a2 >= var_a3) { + if (var_a2 >= var_v0) { + sp42 = var_a2; + } else { + goto block_26; + } + } else if (var_a3 >= var_v0) { + sp42 = var_a3; + } else { +block_26: + sp42 = var_v0; + } + if (var_t3 >= var_a0) { + if (var_t5 >= var_a0) { + sp44 = var_a0; + } else { + goto block_33; + } + } else if (var_t5 >= var_t3) { + sp44 = var_t3; + } else { +block_33: + sp44 = var_t5; + } + if (var_a3 >= var_a2) { + if (var_v0 >= var_a2) { + var_t2 = var_a2; + } else { + var_t2 = var_v0; + } + } else if (var_v0 >= var_a3) { + var_t2 = var_a3; + } else { + var_t2 = var_v0; + } + if (var_t4 >= var_a1) { + if (var_v1 >= var_a1) { + var_t1 = var_a1; + } else { + var_t1 = var_v1; + } + } else if (var_v1 >= var_t4) { + var_t1 = var_t4; + } else { + var_t1 = var_v1; + } + spAA = var_v1; + spB8 = var_a2; + spB2 = var_a3; + spAC = var_v0; + temp_v0 = spB2 - spB8; + temp_v1 = spAA - var_t4; + spB6 = var_a1; + spBA = var_a0; + temp_a0 = var_t4 - spB6; + temp_a1 = spAC - spB2; + temp_a2 = var_t5 - var_t3; + temp_a3 = var_t3 - spBA; + temp_f12 = (f64) ((temp_v0 * temp_v1) - (temp_a0 * temp_a1)); + temp_f18 = temp_f12 * temp_f12; + sp10 = temp_f18; + temp_f14 = (f64) ((temp_a0 * temp_a2) - (temp_a3 * temp_v1)); + temp_f8 = temp_f14 * temp_f14; + sp8 = temp_f8; + temp_f16 = (f64) ((temp_a3 * temp_a1) - (temp_v0 * temp_a2)); + temp_f4 = temp_f16 * temp_f16; + sp0 = temp_f4; + temp_f2 = (f64) sqrtf((f32) (temp_f18 + temp_f8 + temp_f4)); + if ((temp_f2 != 0.0) && ((temp_f0 = (f32) ((f64) (f32) temp_f12 / temp_f2), sp58 = temp_f0, temp_f4_2 = (f32) ((f64) (f32) temp_f14 / temp_f2), sp1C = temp_f4_2, sp54 = temp_f4_2, temp_f18_2 = (f32) ((f64) (f32) temp_f16 / temp_f2), sp50 = temp_f18_2, sp4C = -(((f32) spBA * temp_f0) + (temp_f4_2 * (f32) spB8) + (temp_f18_2 * (f32) spB6)), (D_8015F59C == 0)) || (!(temp_f4_2 < D_802B9E64) && !(D_802B9E68 < temp_f4_2))) && ((D_8015F5A0 == 0) || !(sp1C < D_802B9E6C) || !(D_802B9E70 < sp1C))) { + temp_t0->vtx2[0] = sp4A; + temp_t0->vtx3[2] = var_t1; + temp_t0->vtx3[1] = var_t2; + temp_t0->vtx3[0] = sp44; + temp_t0->vtx2[1] = sp42; + temp_t0->vtx2[2] = sp48; + if (sp44 < D_8015F6EA) { + D_8015F6EA = sp44; + } + if (var_t2 < D_8015F6EE) { + D_8015F6EE = var_t2; + } + if (var_t1 < D_8015F6F2) { + D_8015F6F2 = var_t1; + } + if (D_8015F6E8 < sp4A) { + D_8015F6E8 = sp4A; + } + if (D_8015F6EC < sp42) { + D_8015F6EC = sp42; + } + if (D_8015F6F0 < sp48) { + D_8015F6F0 = sp48; + } + temp_t0->height = sp58; + temp_t0->gravity = sp54; + var_a1_2 = arg4; + temp_t0->rotation = sp50; + temp_t0->height2 = sp4C; + temp_t0->surfaceType = (u16) arg3; + D_8015F6FA = 0; + D_8015F6FC = 0; + temp_a3_2 = temp_t0->vtxs[0]->v.flag; + temp_v1_2 = temp_t0->vtxs[1]->v.flag; + temp_a0_2 = temp_t0->vtxs[2]->v.flag; + if ((temp_a3_2 == 1) && (temp_v1_2 == 1) && (temp_a0_2 == 1)) { + var_t8 = (arg4 | 0x400) & 0xFFFF; + goto block_81; + } + if ((temp_a3_2 == 2) && (temp_v1_2 == 2) && (temp_a0_2 == 2)) { + var_a1_2 = (arg4 | 0x800) & 0xFFFF; + } else if ((temp_a3_2 == 3) && (temp_v1_2 == 3) && (temp_a0_2 == 3)) { + var_a1_2 = (arg4 | 0x1000) & 0xFFFF; + } else if (D_8015F5A4 != 0) { + var_t8 = (arg4 | 0x200) & 0xFFFF; +block_81: + var_a1_2 = var_t8; + } + temp_t0->flags = var_a1_2; + if (sp10 <= sp8) { + var_t9 = var_a1_2 | 0x4000; + if (sp0 <= sp8) { + goto block_89; + } + } + if ((sp8 < sp10) && (sp0 <= sp10)) { + temp_t0->flags |= 0x8000; + } else { + var_t9 = temp_t0->flags | 0x2000; +block_89: + temp_t0->flags = var_t9; + } + D_8015F588 += 1; + } + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AE434.s") +#endif + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +void func_802AE434(s32, s32, s32, s8, s32); // extern +extern ? D_8015F668; + +void func_802AEB14(s32 arg0, s8 arg1, u16 arg2) { + func_802AE434(*(&D_8015F668 + ((((arg0 & 0xFF0000) >> 0x10) >> 1) * 4)), *(&D_8015F668 + ((((arg0 & 0xFF00) >> 8) >> 1) * 4)), *(&D_8015F668 + (((arg0 & 0xFF) >> 1) * 4)), arg1, arg2); +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AEB14.s") +#endif + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +void func_802AE434(s32, s32, s32, s8, s32); // extern +extern ? D_8015F668; + +void func_802AEBA4(s32 arg0, s32 arg1, s8 arg2, u16 arg3) { + s32 sp28; + s32 sp24; + s32 sp20; + + sp28 = *(&D_8015F668 + ((((arg1 & 0xFF0000) >> 0x10) >> 1) * 4)); + sp24 = *(&D_8015F668 + ((((arg1 & 0xFF00) >> 8) >> 1) * 4)); + sp20 = *(&D_8015F668 + (((arg1 & 0xFF) >> 1) * 4)); + func_802AE434(*(&D_8015F668 + ((((arg0 & 0xFF0000) >> 0x10) >> 1) * 4)), *(&D_8015F668 + ((((arg0 & 0xFF00) >> 8) >> 1) * 4)), *(&D_8015F668 + (((arg0 & 0xFF) >> 1) * 4)), arg2, arg3); + func_802AE434(sp28, sp24, sp20, arg2, arg3); +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AEBA4.s") +#endif + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +void func_802AE434(s32, s32, s32, s8, s32); // extern +extern ? D_8015F668; + +void func_802AECA0(s32 arg0, s8 arg1, u16 arg2) { + s32 sp2C; + s32 sp24; + s32 sp20; + s32 temp_a0; + s32 temp_a2; + + temp_a0 = *(&D_8015F668 + ((((arg0 & 0xFF0000) >> 0x10) >> 1) * 4)); + temp_a2 = *(&D_8015F668 + (((arg0 & 0xFF) >> 1) * 4)); + sp2C = temp_a0; + sp24 = temp_a2; + sp20 = *(&D_8015F668 + ((((arg0 & 0xFF000000) >> 0x18) >> 1) * 4)); + func_802AE434(temp_a0, *(&D_8015F668 + ((((arg0 & 0xFF00) >> 8) >> 1) * 4)), temp_a2, arg1, arg2); + func_802AE434(temp_a0, sp24, sp20, arg1, arg2); +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AECA0.s") +#endif + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +extern ? D_8015F668; +extern uintptr_t gSegmentTable; + +void func_802AED6C(u32 arg0, s32 arg1, s32 arg2) { + s32 temp_a2; + s32 temp_t0; + s32 temp_v0; + s32 temp_v0_2; + s32 temp_v0_3; + s32 temp_v0_4; + s32 temp_v0_5; + s32 temp_v1; + s32 temp_v1_2; + s32 phi_v0; + s32 *phi_a0; + s32 phi_v1; + s32 phi_v0_2; + void *phi_a0_2; + s32 phi_v1_2; + s32 phi_a2; + s32 phi_a2_2; + + temp_v0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; + phi_v0 = temp_v0; + phi_v1 = 0; + phi_v0_2 = temp_v0; + phi_a2 = arg2; + phi_v1_2 = 0; + phi_a2_2 = arg2; + if (arg1 != 0) { + temp_t0 = arg1 & 3; + if (temp_t0 != 0) { + phi_a0 = (arg2 * 4) + &D_8015F668; + do { + *phi_a0 = phi_v0; + temp_v1 = phi_v1 + 1; + temp_v0_2 = phi_v0 + 0x10; + temp_a2 = phi_a2_2 + 1; + phi_v0 = temp_v0_2; + phi_a0 += 4; + phi_v1 = temp_v1; + phi_v0_2 = temp_v0_2; + phi_a2 = temp_a2; + phi_v1_2 = temp_v1; + phi_a2_2 = temp_a2; + } while (temp_t0 != temp_v1); + if (temp_v1 != arg1) { + goto block_5; + } + } else { +block_5: + phi_a0_2 = (phi_a2 * 4) + &D_8015F668; + do { + phi_a0_2->unk0 = phi_v0_2; + temp_v0_3 = phi_v0_2 + 0x10; + phi_a0_2->unk4 = temp_v0_3; + temp_v0_4 = temp_v0_3 + 0x10; + phi_a0_2->unk8 = temp_v0_4; + temp_v0_5 = temp_v0_4 + 0x10; + phi_a0_2->unkC = temp_v0_5; + temp_v1_2 = phi_v1_2 + 4; + phi_v0_2 = temp_v0_5 + 0x10; + phi_a0_2 += 0x10; + phi_v1_2 = temp_v1_2; + } while (temp_v1_2 != arg1); + } + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AED6C.s") +#endif + +s32 func_802AEE1C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7) { + f32 temp_f0; + f32 temp_f18; + f32 temp_f2; + + temp_f0 = arg6 - arg4; + temp_f2 = arg7 - arg5; + if (temp_f0 == 0.0f) { + if (arg4 < arg0) { + return 0; + } + if (arg1 < arg4) { + return 0; + } + if (temp_f2 > 0.0f) { + if ((arg5 < arg2) && (arg3 < arg7)) { + return 1; + } + } else if ((arg7 < arg2) && (arg3 < arg5)) { + return 1; + } + } else { + if (temp_f2 == 0.0f) { + if (arg5 < arg2) { + return 0; + } + if (arg3 < arg5) { + return 0; + } + if (temp_f0 > 0.0f) { + if ((arg4 < arg0) && (arg1 < arg6)) { + return 1; + } + } else if ((arg6 < arg0) && (arg1 < arg4)) { + return 1; + } + } else { + temp_f18 = ((temp_f0 / temp_f2) * (arg2 - arg5)) + arg4; + if ((arg0 <= temp_f18) && (temp_f18 <= arg1)) { + return 1; + } + temp_f18 = ((temp_f0 / temp_f2) * (arg3 - arg5)) + arg4; + if ((arg0 <= temp_f18) && (temp_f18 <= arg1)) { + return 1; + } + temp_f18 = ((temp_f2 / temp_f0) * (arg0 - arg4)) + arg5; + if ((arg2 <= temp_f18) && (temp_f18 <= arg3)) { + return 1; + } + temp_f18 = ((temp_f2 / temp_f0) * (arg1 - arg4)) + arg5; + if ((arg2 <= temp_f18) && (temp_f18 <= arg3)) { + return 1; + } + } + } + return 0; +} + +s32 func_802AF0FC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u16 surfaceMapIndex) { + mk64_surface_map_ram *temp_v0; + s16 vx1; + s16 vz1; + s16 vx2; + s16 vz2; + s16 vx3; + s16 vz3; + + temp_v0 = &D_8015F580[surfaceMapIndex]; + vx1 = temp_v0->vtxs[0]->v.ob[0]; + vz1 = temp_v0->vtxs[0]->v.ob[2]; + vx2 = temp_v0->vtxs[1]->v.ob[0]; + vz2 = temp_v0->vtxs[1]->v.ob[2]; + vx3 = temp_v0->vtxs[2]->v.ob[0]; + vz3 = temp_v0->vtxs[2]->v.ob[2]; + if ((vx1 >= arg0) && (arg1 >= vx1) && (vz1 >= arg2) && (arg3 >= vz1)) { + return 1; + } + if ((vx2 >= arg0) && (arg1 >= vx2) && (vz2 >= arg2) && (arg3 >= vz2)) { + return 1; + } + if ((vx3 >= arg0) && (arg1 >= vx3) && (vz3 >= arg2) && (arg3 >= vz3)) { + return 1; + } + if (func_802AEE1C(arg0, arg1, arg2, arg3, vx1, vz1, vx2, vz2) == 1) { + return 1; + } + if (func_802AEE1C(arg0, arg1, arg2, arg3, vx2, vz2, vx3, vz3) == 1) { + return 1; + } + if (func_802AEE1C(arg0, arg1, arg2, arg3, vx3, vz3, vx1, vz1) == 1) { + return 1; + } + return 0; +} + +#ifdef MIPS_TO_C +//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c +extern ? D_8014F110; +extern s32 D_8015F584; +extern u16 D_8015F58A; +extern s16 D_8015F6E8; +extern s16 D_8015F6EA; +extern s16 D_8015F6F0; +extern s16 D_8015F6F2; +extern s32 gPrevLoadedAddress; + +void func_802AF314(void) { + s32 sp4C; + ? *var_v0; + s16 temp_a1; + s16 temp_a3; + s16 temp_s1; + s16 temp_s2; + s32 temp_fp; + s32 temp_s6; + s32 var_s0; + s32 var_s3; + s32 var_s5; + s32 var_s7; + void *temp_v0; + void *temp_v0_2; + + var_v0 = &D_8014F110; + do { + var_v0 += 0x10; + var_v0->unk-A = 0; + var_v0->unk-6 = 0; + var_v0->unk-2 = 0; + var_v0->unk-E = 0; + } while (var_v0 != &gNumActors); + D_8015F58A = 0; + D_8015F584 = gPrevLoadedAddress; + var_s7 = 0; + temp_s6 = (s32) (D_8015F6E8 - D_8015F6EA) / 32; + temp_fp = (s32) (D_8015F6F0 - D_8015F6F2) / 32; + do { + var_s5 = 0; + sp4C = temp_fp * var_s7; +loop_4: + var_s0 = 0; + var_s3 = 0; + temp_s1 = (D_8015F6EA + (temp_s6 * var_s5)) - 0x14; + temp_s2 = (D_8015F6F2 + sp4C) - 0x14; + if ((s32) D_8015F588 > 0) { + do { + temp_a3 = temp_s2 + temp_fp + 0x28; + temp_v0 = var_s3 + D_8015F580; + if ((temp_v0->unkE >= temp_s2) && (temp_a3 >= temp_v0->unk8)) { + temp_a1 = temp_s1 + temp_s6 + 0x28; + if ((temp_v0->unkA >= temp_s1) && (temp_a1 >= temp_v0->unk4)) { + if (func_802AF0FC(temp_s1, temp_a1, temp_s2, temp_a3, (u16) var_s0) == 1) { + temp_v0_2 = (((var_s7 << 5) + var_s5) * 4) + &D_8014F110; + if (temp_v0_2->unk2 == 0) { + temp_v0_2->unk0 = (u16) D_8015F58A; + } + temp_v0_2->unk2 = (u16) (temp_v0_2->unk2 + 1); + *(D_8015F584 + (D_8015F58A * 2)) = (s16) var_s0; + D_8015F58A += 1; + } + } + } + var_s0 += 1; + var_s3 += 0x2C; + } while (var_s0 < (s32) D_8015F588); + } + var_s5 += 1; + if (var_s5 != 0x20) { + goto loop_4; + } + var_s7 += 1; + } while (var_s7 != 0x20); +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AF314.s") +#endif + +void func_802AF588(s32 arg0) { + func_802AF5D8(arg0, -1, 0xFF); +} + +void func_802AF5AC(s32 arg0, s8 arg1) { + func_802AF5D8(arg0, arg1, 0xFF); +} + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +void func_802AEB14(u32, s8, s32); // extern +void func_802AEBA4(u32, u32, s8, s32); // extern +void func_802AECA0(u32, s8, s32); // extern +void func_802AED6C(u32, s32, u32); // extern +extern s16 D_8015F6FA; +extern s16 D_8015F6FC; +extern uintptr_t gSegmentTable; + +void func_802AF5D8(u32 arg0, s8 arg1, s32 arg2) { + s32 temp_s5; + s32 temp_v0; + u32 temp_s0; + u32 temp_s1; + void *phi_s3; + s32 phi_s6; + s32 phi_s6_2; + + D_8015F6FA = 0; + temp_s5 = arg2 & 0xFFFF; + D_8015F6FC = 0; + phi_s3 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; + phi_s6_2 = 0; +loop_1: + temp_s0 = phi_s3->unk0; + temp_s1 = phi_s3->unk4; + temp_v0 = temp_s0 & 0xFF000000; + if (temp_v0 == 0x6000000) { + func_802AF5D8(temp_s1, arg1, temp_s5 & 0xFFFF); + phi_s6 = phi_s6_2 + 1; + goto block_12; + } + if (temp_v0 == 0x4000000) { + func_802AED6C(temp_s1, (temp_s0 >> 0xA) & 0x3F, ((temp_s0 >> 0x10) & 0xFF) >> 1); + phi_s6 = phi_s6_2 + 1; + goto block_12; + } + if (temp_v0 == 0xBF000000) { + D_8015F58C += 1; + func_802AEB14(temp_s1, arg1, temp_s5 & 0xFFFF); + phi_s6 = phi_s6_2 + 1; + goto block_12; + } + if (temp_v0 == 0xB1000000) { + D_8015F58C += 2; + func_802AEBA4(temp_s0, temp_s1, arg1, temp_s5 & 0xFFFF); + phi_s6 = phi_s6_2 + 1; + goto block_12; + } + if (temp_v0 == 0xB5000000) { + D_8015F58C += 2; + func_802AECA0(temp_s1, arg1, temp_s5 & 0xFFFF); + phi_s6 = phi_s6_2 + 1; + goto block_12; + } + phi_s6 = phi_s6_2 + 1; + if (temp_v0 != 0xB8000000) { +block_12: + phi_s3 += 8; + phi_s6_2 = phi_s6; + if (phi_s6 != 0x1FFF) { + goto loop_1; + } + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AF5D8.s") +#endif + +void func_802AF7B4(uintptr_t addr, s32 uls, s32 ult) { + s32 segment = SEGMENT_NUMBER2(addr); + s32 offset = SEGMENT_OFFSET(addr); + Gfx *phi_v0 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset); + s32 gfxCommand; + + uls = (uls << 12) & 0xFFF000; + ult &= 0xFFF; + + while(1) { + + gfxCommand = phi_v0->words.w0 & 0xFF000000; + + if (gfxCommand == G_ENDDL << 24) { + break; + } else if (gfxCommand == (G_SETTILESIZE << 24)) { + phi_v0->words.w0 = 0xF2000000 | uls | ult; + + break; + } + phi_v0++; + } +} + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +extern uintptr_t gSegmentTable; + +void func_802AF83C(u32 arg0, u32 arg1, ? arg2, s8 arg3, u8 arg4, u8 arg5, u8 arg6) { + u32 temp_v1; + void *phi_v0; + u32 phi_v1; + + phi_v0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; + phi_v1 = 0; + if (arg1 != 0) { + do { + temp_v1 = phi_v1 + 1; + phi_v1 = temp_v1; + if (arg4 != 0) { + phi_v0->unkC = arg4; + phi_v0->unkD = arg5; + phi_v0->unkE = arg6; + } + phi_v0->unkF = arg3; + phi_v0 += 0x10; + } while (temp_v1 < arg1); + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AF83C.s") +#endif + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 +void func_802AF83C(u32, s32, u32, s8, s32, s32, s32); // extern +extern uintptr_t gSegmentTable; + +void func_802AF8BC(u32 arg0, s8 arg1, s32 arg2, s32 arg3, u8 arg4) { + s32 temp_s2; + s32 temp_s3; + s32 temp_v1; + u32 temp_a0; + u32 temp_v0; + void *phi_s0; + + temp_s2 = arg2 & 0xFF; + temp_s3 = arg3 & 0xFF; + phi_s0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; +loop_1: + temp_v0 = phi_s0->unk0; + temp_a0 = phi_s0->unk4; + temp_v1 = temp_v0 & 0xFF000000; + if (temp_v1 != 0xB8000000) { + if (temp_v1 == 0x6000000) { + func_802AF8BC(temp_a0, arg1, temp_s2 & 0xFF, temp_s3 & 0xFF, arg4); + phi_s0 += 8; + } else { + if (temp_v1 == 0x4000000) { + func_802AF83C(temp_a0, (temp_v0 >> 0xA) & 0x3F, ((temp_v0 >> 0x10) & 0xFF) >> 1, arg1, temp_s2, temp_s3, arg4); + } + phi_s0 += 8; + } + goto loop_1; + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AF8BC.s") +#endif + +void func_802AF9F0(Vec3f arg0, f32 arg1, Vec3f arg2) { + arg2[0] -= arg0[0] * arg1; + arg2[1] -= arg0[1] * arg1; + arg2[2] -= arg0[2] * arg1; +} + +#ifdef MIPS_TO_C +//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b +s32 func_802AC760(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ +s32 func_802ACBA4(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ +s32 func_802AD278(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ +extern ? D_8014F110; +extern s32 D_8015F584; +extern s16 D_8015F6E8; +extern s16 D_8015F6EA; +extern s16 D_8015F6F0; +extern s16 D_8015F6F2; + +s32 func_802AFA34(Player *player, KartBoundingBoxCorner *corner, f32 cornerPos[0], f32 cornerPos[1], f32 cornerPos[2]) { + f32 sp128; + f32 sp11C; + f32 sp110; + f32 sp10C; + f32 sp108; + f32 sp104; + s16 sp102; + s16 sp100; + s16 spFE; + s16 spFC; + s16 spFA; + s16 spF8; + f32 spD4; + s32 sp8C; + f32 temp_f0; + f32 temp_f0_2; + f32 temp_f0_3; + f32 temp_f0_4; + f32 temp_f0_5; + f32 temp_f0_6; + f32 temp_f20; + f32 temp_f22; + f32 temp_f24; + f32 temp_f26; + f32 temp_f2; + f32 temp_f2_2; + f32 temp_f2_3; + f32 temp_f2_4; + f32 temp_f2_5; + f32 temp_f2_6; + mk64_surface_map_ram *temp_v0_4; + s16 temp_v0_2; + s16 temp_v1; + s32 temp_at; + s32 temp_f10; + s32 temp_f16; + s32 temp_t6; + s32 var_s2; + u16 temp_s0; + u16 temp_v0_3; + u16 temp_v1_3; + u16 var_s1; + u8 temp_v0; + void *temp_v1_2; + + sp104 = 1000.0f; + sp108 = 1000.0f; + sp10C = 1000.0f; + temp_f20 = player->boundingBoxSize; + spFE = 0x1388; + sp100 = 0x1388; + sp102 = 0x1388; + spF8 = 0; + spFA = 0; + spFC = 0; + temp_v0 = corner->surfaceFlags; + temp_f22 = corner->cornerPos[0]; + temp_f24 = corner->cornerPos[1]; + temp_f26 = corner->cornerPos[2]; + switch (temp_v0) { /* irregular */ + case 0x80: + if (func_802AD278(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) corner->surfaceMapIndex, cornerPos[0], cornerPos[1], cornerPos[2]) == 1) { + temp_f0 = func_802ABE30(temp_f22, temp_f24, temp_f26, corner->surfaceMapIndex); + temp_f2 = player->pos[1]; + if (!(temp_f2 < temp_f0) && !((2.0f * temp_f20) < (temp_f2 - temp_f0))) { + corner->cornerGroundY = temp_f0; + func_802AF9F0(&sp11C, sp108, &corner->cornerPos[0]); + return 1; + } + } + default: +block_22: + temp_v0_2 = D_8015F6EA; + temp_v1 = D_8015F6F2; + temp_f10 = (s32) ((temp_f22 - (f32) temp_v0_2) / (f32) ((s32) (D_8015F6E8 - temp_v0_2) / 32)); + temp_f16 = (s32) ((temp_f26 - (f32) temp_v1) / (f32) ((s32) (D_8015F6F0 - temp_v1) / 32)); + if ((s16) temp_f10 < 0) { + goto block_57; + } + if ((s16) temp_f16 < 0) { + goto block_57; + } + if ((s16) temp_f10 >= 0x20) { + goto block_57; + } + if ((s16) temp_f16 >= 0x20) { + goto block_57; + } + temp_v1_2 = ((s16) ((s16) temp_f10 + ((s16) temp_f16 << 5)) * 4) + &D_8014F110; + temp_v0_3 = temp_v1_2->unk2; + sp8C = (s32) temp_v0_3; + if (temp_v0_3 == 0) { + goto block_57; + } + var_s1 = temp_v1_2->unk0; + var_s2 = 0; + if (sp8C > 0) { +loop_34: + temp_s0 = *(D_8015F584 + (var_s1 * 2)); + temp_v0_4 = &D_8015F580[temp_s0]; + temp_v1_3 = temp_v0_4->flags; + if (temp_v1_3 & 0x4000) { + if ((corner->surfaceMapIndex != temp_s0) && (func_802AC760(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) temp_s0, cornerPos[0], cornerPos[1], cornerPos[2]) == 1)) { + temp_f0_2 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); + temp_f2_2 = player->pos[1]; + if (!(temp_f2_2 < temp_f0_2) && !((2.0f * temp_f20) < (temp_f2_2 - temp_f0_2))) { + spD4 = temp_f0_2; + func_802AF9F0(&sp128, sp10C, &corner->cornerPos[0]); + corner->cornerGroundY = spD4; + corner->surfaceFlags = 0x40; + corner->surfaceMapIndex = temp_s0; + corner->surfaceType = (u8) D_8015F580[temp_s0].surfaceType; + if (D_8015F580[temp_s0].flags & 0x1000) { + corner->unk_14 = 1; + return 1; + } + corner->unk_14 = 0; + return 1; + } + } + goto block_55; + } + if (temp_v1_3 & 0x8000) { + if ((temp_v0_4->gravity != 0.0f) && (corner->surfaceMapIndex != temp_s0) && (func_802AD278(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) temp_s0, cornerPos[0], cornerPos[1], cornerPos[2]) == 1)) { + temp_f0_3 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); + temp_f2_3 = player->pos[1]; + if (!(temp_f2_3 < temp_f0_3) && !((2.0f * temp_f20) < (temp_f2_3 - temp_f0_3))) { + corner->cornerGroundY = temp_f0_3; + func_802AF9F0(&sp11C, sp108, &corner->cornerPos[0]); + corner->cornerGroundY = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); + corner->surfaceFlags = 0x80; + corner->surfaceMapIndex = temp_s0; + corner->surfaceType = (u8) D_8015F580[temp_s0].surfaceType; + return 1; + } + } + goto block_55; + } + if ((temp_v0_4->gravity != 0.0f) && (corner->surfaceMapIndex != temp_s0) && (func_802ACBA4(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) temp_s0, cornerPos[0], cornerPos[1], cornerPos[2]) == 1)) { + temp_f0_4 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); + temp_f2_4 = player->pos[1]; + if (!(temp_f2_4 < temp_f0_4) && !((2.0f * temp_f20) < (temp_f2_4 - temp_f0_4))) { + corner->cornerGroundY = temp_f0_4; + func_802AF9F0(&sp110, sp104, &corner->cornerPos[0]); + corner->surfaceFlags = 0x20; + corner->surfaceMapIndex = temp_s0; + corner->surfaceType = (u8) D_8015F580[temp_s0].surfaceType; + return 1; + } + } +block_55: + temp_t6 = (var_s2 + 1) & 0xFFFF; + temp_at = temp_t6 < sp8C; + var_s2 = temp_t6; + var_s1 = (var_s1 + 1) & 0xFFFF; + if (temp_at == 0) { + goto block_56; + } + goto loop_34; + } +block_56: + corner->cornerGroundY = temp_f24; + corner->surfaceType = 0; +block_57: + return 0; + case 0x40: + if (func_802AC760(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) corner->surfaceMapIndex, cornerPos[0], cornerPos[1], cornerPos[2]) == 1) { + temp_f0_5 = func_802ABE30(temp_f22, temp_f24, temp_f26, corner->surfaceMapIndex); + temp_f2_5 = player->pos[1]; + if (!(temp_f2_5 < temp_f0_5) && !((2.0f * temp_f20) < (temp_f2_5 - temp_f0_5))) { + corner->cornerGroundY = temp_f0_5; + func_802AF9F0(&sp128, sp10C, &corner->cornerPos[0]); + return 1; + } + } + goto block_22; + case 0x20: + if (func_802ACBA4(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) corner->surfaceMapIndex, cornerPos[0], cornerPos[1], cornerPos[2]) == 1) { + temp_f0_6 = func_802ABE30(temp_f22, temp_f24, temp_f26, corner->surfaceMapIndex); + temp_f2_6 = player->pos[1]; + if (!(temp_f2_6 < temp_f0_6) && !((2.0f * temp_f20) < (temp_f2_6 - temp_f0_6))) { + corner->cornerGroundY = temp_f0_6; + func_802AF9F0(&sp110, sp104, &corner->cornerPos[0]); + return 1; + } + } + goto block_22; + case 0x0: + goto block_22; + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802AAA70/func_802AFA34.s") +#endif diff --git a/src/code_802AAA70.h b/src/code_802AAA70.h new file mode 100644 index 000000000..6f838d459 --- /dev/null +++ b/src/code_802AAA70.h @@ -0,0 +1,31 @@ +#ifndef CODE_802AAA70_H +#define CODE_802AAA70_H + +#include "common_structs.h" + +void nullify_displaylist(uintptr_t); +void func_802AAAAC(UnkActorInner*); +s8 func_802ABD10(u16); +s16 func_802ABD40(u16); +s16 func_802ABD7C(u16); +s16 func_802ABDB8(u16); +s16 func_802ABDF4(u16); +f32 func_802ABE30(f32, f32, f32, u16); +f32 func_802ABEAC(UnkActorInner*, Vec3f); +void process_shell_collision(Vec3f, f32, Vec3f, f32); +void func_802AC098(UnkActorInner*, f32*); +void func_802AC114(Vec3f, f32, Vec3f, f32); +void func_802AD950(UnkActorInner*, f32, f32, f32, f32, f32, f32, f32); +s32 func_802ADDC8(UnkActorInner*, f32, f32, f32, f32); +f32 func_802AE1C0(f32, f32, f32); +s32 func_802AEE1C(s16, s16, s16, s16, s16, s16, s16, s16); +s32 func_802AF0FC(s16, s16, s16, s16, u16); +void func_802AF314(); +void func_802AF588(s32); +void func_802AF5AC(s32, s8); +void func_802AF5D8(u32, s8, s32); +void func_802AF7B4(uintptr_t, s32, s32); +void func_802AF8BC(uintptr_t, s8, u8, u8, u8); +void func_802AF9F0(Vec3f, f32, Vec3f); + +#endif diff --git a/src/main.h b/src/main.h index d6d7c8feb..adc737900 100644 --- a/src/main.h +++ b/src/main.h @@ -114,6 +114,4 @@ extern struct UnkStruct_800DC5EC *D_800DC5EC; extern u16 D_800DC5B0; extern s32 gPlayerWinningIndex; -extern s32 gEnableResourceMeters; - #endif diff --git a/src/math_util.c b/src/math_util.c index 93b2ff347..185d9ecb2 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -193,13 +193,13 @@ void mtxf_translate(Mat4 dest, Vec3f b) { dest[3][1] = b[1]; dest[3][2] = b[2]; } -extern f64 D_802B9FB0; // = 0.017453292222222222; + // Note the use of `2` which generates diff asm than just using floats (2.0f). void func_802B5564(Mat4 arg0, u16 *arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { f32 temp; s32 i, j; mtxf_identity(arg0); - arg2 *= D_802B9FB0; + arg2 *= 0.017453292222222222; temp = cosf(arg2 / 2) / sinf(arg2 / 2); arg0[0][0] = temp / arg3; arg0[1][1] = temp; @@ -1004,7 +1004,6 @@ GLOBAL_ASM("asm/non_matchings/math_util/func_802B75F8.s") * Helper function for atan2s. Does a look up of the arctangent of y/x assuming * the resulting angle is in range [0, 0x2000] (1/8 of a circle). */ -extern f32 D_802B9FD8; // = 1000000.0f; u16 atan2_lookup(f32 y, f32 x) { u16 ret; @@ -1012,7 +1011,7 @@ u16 atan2_lookup(f32 y, f32 x) { if (x == 0) { ret = gArctanTable[0]; } else { - if (D_802B9FD8 < y / x) { + if (1000000.0f < y / x) { if (y > 0.0f) { ret = 0x4000; } else { @@ -1125,10 +1124,8 @@ f32 func_802B79F0(f32 arg0, f32 arg1) { GLOBAL_ASM("asm/non_matchings/math_util/func_802B79F0.s") #endif -extern f64 D_802BA018; // = 3.141592653589793; - UNUSED u16 func_802B7B50(f32 arg0, f32 arg1) { - return ((func_802B79B8(arg0, arg1) * 32768.0f) / D_802BA018); + return ((func_802B79B8(arg0, arg1) * 32768.0f) / 3.141592653589793); } UNUSED void func_802B7C18(f32 arg0) { diff --git a/src/math_util.h b/src/math_util.h index 6f1fb086a..738857877 100644 --- a/src/math_util.h +++ b/src/math_util.h @@ -70,9 +70,6 @@ f32 coss(u16); s32 func_802B8058(u16, u16, u16); f32 func_802B80D0(Vec3f, Vec3f, u16, f32, f32, f32); -extern f64 D_802B9FB0; // = 0.017453292222222222; -extern f32 D_802B9FD8; // = 1000000.0f; -extern f64 D_802BA018; // = 3.141592653589793; extern u16 gRandomSeed16; #endif // MATH_UTIL_H diff --git a/src/math_util_2.c b/src/math_util_2.c index f9d8d0c0f..f84876bf5 100644 --- a/src/math_util_2.c +++ b/src/math_util_2.c @@ -8,6 +8,7 @@ #include "objects.h" #include "memory.h" +#include "code_802AAA70.h" #pragma intrinsic (sqrtf) diff --git a/src/memory.c b/src/memory.c index 8666d95cc..8775f3303 100644 --- a/src/memory.c +++ b/src/memory.c @@ -12,7 +12,6 @@ #include "variables.h" #include "common_structs.h" #include "math_util.h" -#include //#include "segment_symbols.h" #include "segments.h" @@ -1047,7 +1046,7 @@ loop_1: goto loop_1; case 0x10: func_802A884C(temp_s1, temp_s0, (s8) temp_a0); - goto loop_1; + goto loop_1; case 0x11: func_802A884C(temp_s1, temp_s0, (s8) temp_a0); goto loop_1; @@ -1383,2795 +1382,3 @@ s32 load_course(s32 courseId) { gPrevLoadedAddress = prevLoadedAddress_saved; return temp_v0; } - -// Used for the choco mountain guard rail -void nullify_displaylist(uintptr_t addr) { - s32 segment = SEGMENT_NUMBER2(addr); - s32 offset = SEGMENT_OFFSET(addr); - - Gfx *macro; - - macro = VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset); - macro->words.w0 = G_ENDDL << 24; - macro->words.w1 = 0; -} - -void func_802AAAAC(UnkActorInner *arg0) { - arg0->unk36 = 0x1388; - arg0->unk38 = 0x1388; - arg0->unk3A = 0x1388; - arg0->unk30 = 0; - arg0->unk32 = 0; - arg0->unk34 = 0; - arg0->unk3C[0] = 0; - arg0->unk3C[1] = 0; - arg0->unk3C[2] = 0; - vec3f_set(arg0->unk48, 0.0f, 0.0f, 1.0f); - vec3f_set(arg0->unk54, 1.0f, 0.0f, 0.0f); - vec3f_set(arg0->unk60, 0.0f, 1.0f, 0.0f); -} - -#ifdef MIPS_TO_C -//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b -extern f32 D_8015F8E4; -static f32 D_802B9E00 = 1859.0f; -static f32 D_802B9E04 = 1549.0f; -static f32 D_802B9E08 = -1102.0f; -static f32 D_802B9E0C = -1402.0f; -static f32 D_802B9E10 = 2405.0f; -static f32 D_802B9E14 = 2233.0f; -static f32 D_802B9E18 = 0.8f; -static f32 D_802B9E1C = -475.0f; -static f32 D_802B9E20 = -33.9f; -static f32 D_802B9E24 = -838.0f; -static f32 D_802B9E28 = -475.0f; -static f32 D_802B9E2C = -475.0f; -static f32 D_802B9E30 = -993.0f; -static f32 D_802B9E34 = -33.9f; -static f32 D_802B9E38 = -475.0f; -static f32 D_802B9E3C = -33.9f; -static f32 D_802B9E40 = -475.0f; -static f32 D_802B9E44 = -33.9f; -s16 gCurrentCourseId; /* unable to generate initializer */ - -f32 func_802AAB4C(Player *player) { - f32 sp1C; - f32 sp18; - f32 temp_f0; - f32 temp_f2; - s16 temp_v0; - s32 temp_v1; - - temp_v0 = gCurrentCourseId; - temp_f0 = player->pos[0]; - temp_f2 = player->pos[2]; - switch (temp_v0) { /* irregular */ - case 2: - if (D_802B9E00 < temp_f0) { - goto block_43; - } - if (temp_f0 < D_802B9E04) { - goto block_43; - } - if (D_802B9E08 < temp_f2) { - goto block_43; - } - if (temp_f2 < D_802B9E0C) { -block_43: - default: - return D_8015F8E4; - } - return 20.0f; - case 6: - if (temp_f0 > 239.0f) { - goto block_43; - } - if (temp_f0 < 67.0f) { - goto block_43; - } - if (D_802B9E10 < temp_f2) { - goto block_43; - } - if (temp_f2 < D_802B9E14) { - goto block_43; - } - return D_802B9E18; - case 12: - if ((func_802ABD10(player->unk_110.unk3A) & 0xFF) == 5) { - return (f32) (D_8015F6EE - 0xA); - } - goto block_43; - case 18: - sp18 = temp_f2; - sp1C = temp_f0; - temp_v1 = func_802ABD40(player->unk_110.unk3A) & 0xFF; - if (temp_v1 == 0xFF) { - sp18 = temp_f2; - sp1C = temp_f0; - if ((func_802ABD10(player->unk_110.unk3A) & 0xFF) == 0xF) { - return D_802B9E1C; - } - if (temp_f0 > -478.0f) { - return D_802B9E20; - } - if (temp_f0 < D_802B9E24) { - return D_802B9E28; - } - if (temp_f2 > -436.0f) { - return D_802B9E2C; - } - if (temp_f2 < D_802B9E30) { - return D_802B9E34; - } - if (temp_f2 < temp_f0) { - return D_802B9E38; - } - return D_802B9E3C; - } - if (temp_v1 >= 0x14) { - return D_802B9E40; - } - return D_802B9E44; - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AAB4C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -static f32 D_802B9E48 = -0.9f; - -s32 func_802AAE4C(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5) { - f32 sp6C; - f32 sp64; - f32 sp3C; - f32 sp2C; - f32 sp28; - f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp18; - f32 sp14; - f32 sp10; - f32 spC; - f32 sp8; - Vtx *temp_a0; - Vtx *temp_a2; - Vtx *temp_a3; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f0_5; - f32 temp_f10; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f14; - f32 temp_f14_2; - f32 temp_f16; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f4; - f32 temp_f8; - mk64_surface_map_ram *temp_v1; - s32 var_v0; - s32 var_v0_2; - - temp_v1 = &D_8015F580[arg5]; - temp_f0 = temp_v1->gravity; - var_v0_2 = 1; - if (temp_f0 < D_802B9E48) { - return 0; - } - if (arg2 < (f32) temp_v1->vtx3[0]) { - return 0; - } - if (arg4 < (f32) temp_v1->vtx3[2]) { - return 0; - } - if ((f32) temp_v1->vtx2[0] < arg2) { - return 0; - } - if ((f32) temp_v1->vtx2[2] < arg4) { - return 0; - } - sp2C = temp_f0; - if (arg3 < ((f32) temp_v1->vtx3[1] - (arg1 * 3.0f))) { - return 0; - } - temp_a0 = temp_v1->vtxs[0]; - temp_a3 = temp_v1->vtxs[2]; - temp_a2 = temp_v1->vtxs[1]; - sp6C = (f32) temp_a3->v.ob[0]; - sp8 = arg4; - sp10 = arg2; - temp_f8 = (f32) temp_a0->v.ob[2] - arg4; - sp64 = (f32) temp_a3->v.ob[2]; - temp_f4 = (f32) temp_a2->v.ob[0] - arg2; - sp28 = temp_f8; - sp24 = temp_f4; - sp20 = (f32) temp_a0->v.ob[0] - arg2; - temp_f0_2 = temp_f8 * temp_f4; - sp8 = temp_f8; - spC = temp_f4; - sp1C = (f32) temp_a2->v.ob[2] - arg4; - temp_f2 = sp20 * sp1C; - temp_f10 = temp_f0_2 - temp_f2; - sp18 = temp_f10; - sp3C = temp_f10; - if (temp_f2 == temp_f0_2) { - sp14 = arg4; - temp_f0_3 = sp6C - sp10; - temp_f2_2 = sp64 - arg4; - if ((((sp1C * temp_f0_3) - (spC * temp_f2_2)) * ((temp_f2_2 * sp20) - (temp_f0_3 * sp8))) < 0.0f) { - var_v0_2 = 0; - } - } else { - temp_f2_3 = sp64 - arg4; - temp_f0_4 = sp6C - arg2; - temp_f14 = sp24 * temp_f2_3; - temp_f12 = sp1C * temp_f0_4; - if (temp_f14 == temp_f12) { - if ((sp3C * ((temp_f2_3 * sp20) - (temp_f0_4 * sp28))) < 0.0f) { - var_v0_2 = 0; - } - } else { - temp_f16 = temp_f12 - temp_f14; - if ((sp18 * temp_f16) < 0.0f) { - var_v0_2 = 0; - } else { - temp_f14_2 = temp_f0_4 * sp28; - temp_f12_2 = temp_f2_3 * sp20; - if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { - var_v0_2 = 0; - } - } - } - } - if (var_v0_2 == 0) { - return 0; - } - temp_f0_5 = ((temp_v1->height * arg2) + (sp2C * arg3) + (temp_v1->rotation * arg4) + temp_v1->height2) - arg1; - if (temp_f0_5 > 0.0f) { - if (temp_f0_5 < arg0->unk3C[2]) { - arg0->unk34 = 1; - arg0->unk3A = arg5; - arg0->unk3C[2] = temp_f0_5; - arg0->unk60[0] = temp_v1->height; - arg0->unk60[1] = temp_v1->gravity; - arg0->unk60[2] = temp_v1->rotation; - } - return 0; - } - var_v0 = 0; - if (temp_f0_5 > -16.0f) { - arg0->unk34 = 1; - arg0->unk3A = arg5; - arg0->unk3C[2] = temp_f0_5; - var_v0 = 1; - arg0->unk60[0] = temp_v1->height; - arg0->unk60[1] = temp_v1->gravity; - arg0->unk60[2] = temp_v1->rotation; - } - return var_v0; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AAE4C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -s32 func_802AB288(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5) { - f32 sp70; - f32 sp6C; - f32 sp3C; - f32 sp2C; - f32 sp28; - f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp14; - f32 sp10; - f32 spC; - f32 sp8; - Vtx *temp_a0; - Vtx *temp_a2; - Vtx *temp_a3; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f14; - f32 temp_f14_2; - f32 temp_f16; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f2_4; - f32 temp_f4; - f32 temp_f6; - f32 temp_f8; - mk64_surface_map_ram *temp_v1; - s32 var_v0; - s32 var_v0_2; - - temp_v1 = &D_8015F580[arg5]; - var_v0_2 = 1; - if (arg2 < (f32) temp_v1->vtx3[0]) { - return 0; - } - if ((f32) temp_v1->vtx2[0] < arg2) { - return 0; - } - if ((f32) temp_v1->vtx2[1] < arg3) { - return 0; - } - if (arg3 < (f32) temp_v1->vtx3[1]) { - return 0; - } - temp_f2 = arg1 * 3.0f; - if (arg4 < ((f32) temp_v1->vtx3[2] - temp_f2)) { - return 0; - } - if (((f32) temp_v1->vtx2[2] + temp_f2) < arg4) { - return 0; - } - temp_a0 = temp_v1->vtxs[0]; - temp_a3 = temp_v1->vtxs[2]; - temp_a2 = temp_v1->vtxs[1]; - sp70 = (f32) temp_a3->v.ob[0]; - sp8 = arg3; - sp10 = arg2; - temp_f4 = (f32) temp_a0->v.ob[1] - arg3; - sp6C = (f32) temp_a3->v.ob[1]; - temp_f8 = (f32) temp_a2->v.ob[0] - arg2; - sp2C = temp_f4; - sp28 = temp_f8; - sp24 = (f32) temp_a0->v.ob[0] - arg2; - temp_f0 = temp_f4 * temp_f8; - sp8 = temp_f4; - spC = temp_f8; - sp20 = (f32) temp_a2->v.ob[1] - arg3; - temp_f2_2 = sp24 * sp20; - temp_f6 = temp_f0 - temp_f2_2; - sp1C = temp_f6; - sp3C = temp_f6; - if (temp_f2_2 == temp_f0) { - sp14 = arg3; - temp_f0_2 = sp70 - sp10; - temp_f2_3 = sp6C - arg3; - if ((((sp20 * temp_f0_2) - (spC * temp_f2_3)) * ((temp_f2_3 * sp24) - (temp_f0_2 * sp8))) < 0.0f) { - var_v0_2 = 0; - } - } else { - temp_f2_4 = sp6C - arg3; - temp_f0_3 = sp70 - arg2; - temp_f14 = sp28 * temp_f2_4; - temp_f12 = sp20 * temp_f0_3; - if (temp_f14 == temp_f12) { - if ((sp3C * ((temp_f2_4 * sp24) - (temp_f0_3 * sp2C))) < 0.0f) { - var_v0_2 = 0; - } - } else { - temp_f16 = temp_f12 - temp_f14; - if ((sp1C * temp_f16) < 0.0f) { - var_v0_2 = 0; - } else { - temp_f14_2 = temp_f0_3 * sp2C; - temp_f12_2 = temp_f2_4 * sp24; - if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { - var_v0_2 = 0; - } - } - } - } - if (var_v0_2 == 0) { - return 0; - } - temp_f0_4 = ((temp_v1->height * arg2) + (temp_v1->gravity * arg3) + (temp_v1->rotation * arg4) + temp_v1->height2) - arg1; - if (temp_f0_4 > 0.0f) { - if (temp_f0_4 < arg0->unk3C[0]) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = temp_f0_4; - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - arg0->unk48[2] = temp_v1->rotation; - } - return 0; - } - var_v0 = 0; - if (temp_f0_4 > -16.0f) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = temp_f0_4; - var_v0 = 1; - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - arg0->unk48[2] = temp_v1->rotation; - } - return var_v0; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AB288.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -s32 func_802AB6C4(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5) { - f32 sp68; - f32 sp64; - f32 sp38; - f32 sp2C; - f32 sp28; - f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp14; - f32 sp10; - f32 spC; - f32 sp8; - Vtx *temp_a0; - Vtx *temp_a2; - Vtx *temp_a3; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f0_5; - f32 temp_f10; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f14; - f32 temp_f14_2; - f32 temp_f16; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f4; - f32 temp_f6; - mk64_surface_map_ram *temp_v1; - s32 var_v0; - s32 var_v0_2; - - temp_v1 = &D_8015F580[arg5]; - var_v0_2 = 1; - if (arg4 < (f32) temp_v1->vtx3[2]) { - return 0; - } - if ((f32) temp_v1->vtx2[2] < arg4) { - return 0; - } - if ((f32) temp_v1->vtx2[1] < arg3) { - return 0; - } - if (arg3 < (f32) temp_v1->vtx3[1]) { - return 0; - } - temp_f0 = arg1 * 3.0f; - if (arg2 < ((f32) temp_v1->vtx3[0] - temp_f0)) { - return 0; - } - if (((f32) temp_v1->vtx2[0] + temp_f0) < arg2) { - return 0; - } - temp_a0 = temp_v1->vtxs[0]; - temp_a3 = temp_v1->vtxs[2]; - temp_a2 = temp_v1->vtxs[1]; - sp64 = (f32) temp_a3->v.ob[2]; - sp8 = arg3; - sp10 = arg4; - temp_f6 = (f32) temp_a0->v.ob[1] - arg3; - sp68 = (f32) temp_a3->v.ob[1]; - temp_f10 = (f32) temp_a2->v.ob[2] - arg4; - sp2C = temp_f6; - sp28 = temp_f10; - sp24 = (f32) temp_a0->v.ob[2] - arg4; - temp_f0_2 = temp_f6 * temp_f10; - sp8 = temp_f6; - spC = temp_f10; - sp20 = (f32) temp_a2->v.ob[1] - arg3; - temp_f2 = sp24 * sp20; - temp_f4 = temp_f0_2 - temp_f2; - sp1C = temp_f4; - sp38 = temp_f4; - if (temp_f2 == temp_f0_2) { - sp14 = arg3; - temp_f0_3 = sp64 - sp10; - temp_f2_2 = sp68 - arg3; - if ((((sp20 * temp_f0_3) - (spC * temp_f2_2)) * ((temp_f2_2 * sp24) - (temp_f0_3 * sp8))) < 0.0f) { - var_v0_2 = 0; - } - } else { - temp_f2_3 = sp68 - arg3; - temp_f0_4 = sp64 - arg4; - temp_f14 = sp28 * temp_f2_3; - temp_f12 = sp20 * temp_f0_4; - if (temp_f14 == temp_f12) { - if ((sp38 * ((temp_f2_3 * sp24) - (temp_f0_4 * sp2C))) < 0.0f) { - var_v0_2 = 0; - } - } else { - temp_f16 = temp_f12 - temp_f14; - if ((sp1C * temp_f16) < 0.0f) { - var_v0_2 = 0; - } else { - temp_f14_2 = temp_f0_4 * sp2C; - temp_f12_2 = temp_f2_3 * sp24; - if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { - var_v0_2 = 0; - } - } - } - } - if (var_v0_2 == 0) { - return 0; - } - temp_f0_5 = ((temp_v1->height * arg2) + (temp_v1->gravity * arg3) + (temp_v1->rotation * arg4) + temp_v1->height2) - arg1; - if (temp_f0_5 > 0.0f) { - if (temp_f0_5 < arg0->unk3C[1]) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = temp_f0_5; - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - arg0->unk54[2] = temp_v1->rotation; - } - return 0; - } - var_v0 = 0; - if (temp_f0_5 > -16.0f) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = temp_f0_5; - var_v0 = 1; - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - arg0->unk54[2] = temp_v1->rotation; - } - return var_v0; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AB6C4.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -s32 func_802ABB04(f32 arg0, f32 arg1, s32 arg2) { - f32 sp6C; - f32 sp64; - f32 sp60; - f32 sp58; - f32 sp3C; - f32 sp28; - f32 sp20; - f32 sp1C; - Vtx *temp_a0; - Vtx *temp_a1; - Vtx *temp_a3; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f10; - f32 temp_f12; - f32 temp_f14; - f32 temp_f16; - f32 temp_f16_2; - f32 temp_f18; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f6; - mk64_surface_map_ram *temp_v0; - s32 var_v1; - - temp_v0 = &D_8015F580[arg2 & 0xFFFF]; - temp_a1 = temp_v0->vtxs[1]; - temp_a0 = temp_v0->vtxs[0]; - var_v1 = 1; - sp60 = (f32) temp_a1->v.ob[0]; - temp_f20 = (f32) temp_a0->v.ob[2] - arg1; - sp58 = (f32) temp_a1->v.ob[2]; - temp_a3 = temp_v0->vtxs[2]; - temp_f22 = (f32) temp_a0->v.ob[0] - arg0; - sp6C = (f32) temp_a3->v.ob[0]; - temp_f10 = sp60 - arg0; - temp_f0 = temp_f20 * temp_f10; - sp28 = temp_f10; - sp64 = (f32) temp_a3->v.ob[2]; - temp_f6 = sp58 - arg1; - temp_f2 = temp_f22 * temp_f6; - sp20 = temp_f6; - sp1C = temp_f0 - temp_f2; - sp3C = sp1C; - if (temp_f2 == temp_f0) { - temp_f0_2 = sp6C - arg0; - temp_f2_2 = sp64 - arg1; - if ((((temp_f6 * temp_f0_2) - (temp_f10 * temp_f2_2)) * ((temp_f2_2 * temp_f22) - (temp_f0_2 * temp_f20))) < 0.0f) { - var_v1 = 0; - } - } else { - temp_f2_3 = sp64 - arg1; - temp_f0_3 = sp6C - arg0; - temp_f18 = sp28 * temp_f2_3; - temp_f16 = sp20 * temp_f0_3; - if (temp_f18 == temp_f16) { - if ((sp3C * ((temp_f2_3 * temp_f22) - (temp_f0_3 * temp_f20))) < 0.0f) { - var_v1 = 0; - } - } else { - temp_f12 = temp_f16 - temp_f18; - if ((sp1C * temp_f12) < 0.0f) { - var_v1 = 0; - } else { - temp_f16_2 = temp_f0_3 * temp_f20; - temp_f14 = temp_f2_3 * temp_f22; - if ((temp_f16_2 != temp_f14) && ((temp_f12 * (temp_f14 - temp_f16_2)) < 0.0f)) { - var_v1 = 0; - } - } - } - } - return var_v1; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802ABB04.s") -#endif - -s8 func_802ABD10(u16 arg0) { - mk64_surface_map_ram *tile = &D_8015F580[arg0]; - return tile->surfaceType; -} - -s16 func_802ABD40(u16 arg0) { - mk64_surface_map_ram *tile = &D_8015F580[arg0]; - return tile->flags & 0xFF; -} - -s16 func_802ABD7C(u16 arg0) { - mk64_surface_map_ram *tile = &D_8015F580[arg0]; - return tile->flags & 0x1000; -} - -s16 func_802ABDB8(u16 arg0) { - mk64_surface_map_ram *tile = &D_8015F580[arg0]; - return tile->flags & 0x400; -} - -s16 func_802ABDF4(u16 arg0) { - mk64_surface_map_ram *tile = &D_8015F580[arg0]; - return tile->flags & 0x800; -} - -f32 func_802ABE30(f32 arg0, f32 arg1, f32 arg2, u16 arg3) { - mk64_surface_map_ram *tile = &D_8015F580[arg3]; - if (tile->gravity == 0.0f) { - return arg1; - } - return ((tile->height * arg0) + (tile->rotation * arg2) + tile->height2) / -tile->gravity; -} - -f32 func_802ABEAC(UnkActorInner *arg0, Vec3f arg1) { - if (arg0->unk34 == 1) { - return func_802ABE30(arg1[0], arg1[1], arg1[2], arg0->unk3A); - } - if (arg0->unk30 == 1) { - return func_802ABE30(arg1[0], arg1[1], arg1[2], arg0->unk36); - } - if (arg0->unk32 == 1) { - return func_802ABE30(arg1[0], arg1[1], arg1[2], arg0->unk38); - } - return arg1[1]; -} - -#ifdef MIPS_TO_C -//generated by m2c commit 9841ff34ca242f5f14b2eab2b54a7a65ac47d80f -void process_shell_collision(f32 *arg0, f32 arg1, f32 *velocity, f32 arg3) { - f32 sp40; - f32 sp3C; - f32 sp38; - f32 sp24; - f32 spC; - f32 sp8; - f32 sp4; - f32 sp0; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f10; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f14; - f32 temp_f14_2; - f32 temp_f16_2; - f32 temp_f16_3; - f32 temp_f18; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f6; - f64 temp_f16; - - temp_f2 = velocity->unk0; - temp_f12 = velocity->unk4; - temp_f14 = velocity->unk8; - temp_f0 = sqrtf((temp_f2 * temp_f2) + (temp_f12 * temp_f12) + (temp_f14 * temp_f14)); - temp_f16 = (f64) temp_f0; - sp24 = temp_f0; - if ((temp_f16 > 4.5) || (temp_f16 < 3.5)) { - sp24 = 4.0f; - } - temp_f10 = arg0->unk8; - sp4 = temp_f10; - temp_f16_2 = arg0->unk0; - temp_f18 = arg0->unk4; - temp_f0_2 = (temp_f10 * temp_f14) + ((temp_f16_2 * temp_f2) + (temp_f18 * temp_f12)); - sp0 = temp_f16_2 * temp_f0_2; - spC = temp_f18 * temp_f0_2; - sp40 = temp_f2 - sp0; - sp3C = temp_f12 - spC; - temp_f6 = temp_f10 * temp_f0_2; - sp8 = temp_f6; - sp38 = temp_f14 - temp_f6; - temp_f2_2 = sp40 - sp0; - temp_f12_2 = sp3C - spC; - temp_f14_2 = sp38 - temp_f6; - temp_f16_3 = (1.0f / sqrtf((temp_f2_2 * temp_f2_2) + (temp_f12_2 * temp_f12_2) + (temp_f14_2 * temp_f14_2))) * sp24; - velocity->unk0 = temp_f2_2 * temp_f16_3; - velocity->unk4 = (f32) (temp_f12_2 * temp_f16_3); - velocity->unk8 = (f32) (temp_f14_2 * temp_f16_3); -} -#else -GLOBAL_ASM("asm/non_matchings/memory/process_shell_collision.s") -#endif - -void func_802AC098(UnkActorInner *arg0, f32 *velocity) { - if (arg0->unk3C[0] < 0.0f) { - process_shell_collision(arg0->unk48, arg0->unk3C[0], velocity, 2.0f); - } - - if (arg0->unk3C[1] < 0.0f) { - process_shell_collision(arg0->unk54, arg0->unk3C[1], velocity, 2.0f); - } -} - -void func_802AC114(Vec3f arg0, f32 arg1, Vec3f arg2, f32 arg3) { - f32 temp_f0; - f32 temp_f12; - f32 temp_f14; - f32 temp_f16; - f32 temp_f18; - f32 temp_f20; - f32 temp_f2; - f32 tmp1; - f32 tmp2; - f32 tmp3; - - temp_f0 = arg2[0]; - temp_f2 = arg2[1]; - temp_f12 = arg2[2]; - temp_f14 = -arg0[0]; - temp_f16 = -arg0[1]; - temp_f18 = -arg0[2]; - temp_f20 = (temp_f14 * temp_f0) + (temp_f16 * temp_f2) + (temp_f18 * temp_f12); - tmp1 = temp_f0 - (temp_f20 * temp_f14); - tmp2 = temp_f2 - (temp_f20 * temp_f16); - tmp3 = temp_f12 - (temp_f20 * temp_f18); - if (arg1 < -3.5) { - arg2[0] = tmp1 - (temp_f20 * temp_f14 * 0.5f); - arg2[1] = tmp2 - (temp_f20 * temp_f16 * 0.5f); - arg2[2] = tmp3 - (temp_f20 * temp_f18 * 0.5f); - } else { - arg2[0] = tmp1; - arg2[1] = tmp2; - arg2[2] = tmp3; - } -} - -#ifdef MIPS_TO_C -//generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -mk64_surface_map_ram *func_802AAE4C(s16 *, ?, f32, f32, f32, s32); /* extern */ -mk64_surface_map_ram *func_802AB288(s16 *, ?, f32, f32, f32, s32); /* extern */ -mk64_surface_map_ram *func_802AB6C4(s16 *, ?, f32, f32, f32, s32); /* extern */ -extern u8 D_8014F110; -extern s32 D_8015F584; -extern s16 D_8015F6E8; -extern s16 D_8015F6EA; -extern s16 D_8015F6F0; -extern s16 D_8015F6F2; - -UNUSED mk64_surface_map_ram *func_802AC22C(void *arg0) { - f32 spE4; - f32 spE0; - f32 spDC; - s16 spD4; - s16 spD2; - s16 spD0; - s32 sp70; - f32 temp_f22; - f32 temp_f24; - f32 temp_f26; - s16 temp_v0_2; - s16 temp_v1; - s32 temp_at; - s32 temp_f4; - s32 temp_f6; - s32 temp_t3; - s32 var_s2; - u16 temp_s0; - u16 temp_v1_3; - u16 var_s1; - u16 var_v0; - u8 temp_v0; - void *temp_v1_2; - - spD0 = 0; - spD2 = 0; - spD4 = 0; - spDC = 1000.0f; - spE0 = 1000.0f; - spE4 = 1000.0f; - temp_v0 = arg0->unkD; - temp_f22 = arg0->unk0; - temp_f24 = arg0->unk4; - temp_f26 = arg0->unk8; - switch (temp_v0) { /* irregular */ - case 0x80: - if (func_802AB6C4(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) arg0->unkE) == (mk64_surface_map_ram *)1) { - arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, arg0->unkE); - return (mk64_surface_map_ram *)1; - } - default: -block_10: - temp_v0_2 = D_8015F6EA; - temp_v1 = D_8015F6F2; - temp_f4 = (s32) ((temp_f22 - (f32) temp_v0_2) / (f32) ((s32) (D_8015F6E8 - temp_v0_2) / 32)); - temp_f6 = (s32) ((temp_f26 - (f32) temp_v1) / (f32) ((s32) (D_8015F6F0 - temp_v1) / 32)); - if ((s16) temp_f4 < 0) { - return NULL; - } - if ((s16) temp_f6 < 0) { - return NULL; - } - if ((s16) temp_f4 >= 0x20) { - return NULL; - } - if ((s16) temp_f6 >= 0x20) { - return NULL; - } - temp_v1_2 = ((s16) ((s16) temp_f4 + ((s16) temp_f6 << 5)) * 4) + &D_8014F110; - var_v0 = temp_v1_2->unk2; - sp70 = (s32) var_v0; - if (var_v0 == 0) { - return NULL; - } - var_s1 = temp_v1_2->unk0; - var_s2 = 0; - if (sp70 > 0) { -loop_22: - temp_s0 = *(D_8015F584 + (var_s1 * 2)); - var_v0 = (u16) &D_8015F580[temp_s0]; - temp_v1_3 = var_v0->unk0; - if ((temp_v1_3 & 0x4000) != 0) { - if (arg0->unkE != temp_s0) { - var_v0 = func_802AAE4C(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) temp_s0); - if (var_v0 == (u16) (mk64_surface_map_ram *)1) { - arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); - arg0->unkD = 0x40U; - arg0->unkE = temp_s0; - arg0->unkC = (s8) D_8015F580[temp_s0].surfaceType; - if ((D_8015F580[temp_s0].flags & 0x1000) != 0) { - arg0->unk14 = (mk64_surface_map_ram *)1; - return (mk64_surface_map_ram *)1; - } - arg0->unk14 = NULL; - return (mk64_surface_map_ram *)1; - } - } - goto block_37; - } - if ((temp_v1_3 & 0x8000) != 0) { - if ((var_v0->unk1C != 1.0f) && (arg0->unkE != temp_s0)) { - var_v0 = func_802AB6C4(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) temp_s0); - if (var_v0 == (u16) (mk64_surface_map_ram *)1) { - arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); - arg0->unkD = 0x80U; - arg0->unkE = temp_s0; - arg0->unkC = (s8) D_8015F580[temp_s0].surfaceType; - return (mk64_surface_map_ram *)1; - } - } - goto block_37; - } - if ((var_v0->unk24 != 1.0f) && (arg0->unkE != temp_s0)) { - var_v0 = func_802AB288(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) temp_s0); - if (var_v0 == (u16) (mk64_surface_map_ram *)1) { - arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); - arg0->unkD = 0x20U; - arg0->unkE = temp_s0; - arg0->unkC = (s8) D_8015F580[temp_s0].surfaceType; - return (mk64_surface_map_ram *)1; - } - } -block_37: - temp_t3 = (var_s2 + 1) & 0xFFFF; - temp_at = temp_t3 < sp70; - var_s2 = temp_t3; - var_s1 = (var_s1 + 1) & 0xFFFF; - if (temp_at == 0) { - goto block_38; - } - goto loop_22; - } -block_38: - arg0->unk10 = temp_f24; - arg0->unkC = 0; - return (mk64_surface_map_ram *) var_v0; - case 0x40: - if (func_802AAE4C(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) arg0->unkE) == (mk64_surface_map_ram *)1) { - arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, arg0->unkE); - return (mk64_surface_map_ram *)1; - } - goto block_10; - case 0x20: - if (func_802AB288(&spD0, 0x40A00000, temp_f22, temp_f24, temp_f26, (s32) arg0->unkE) == (mk64_surface_map_ram *)1) { - arg0->unk10 = func_802ABE30(temp_f22, temp_f24, temp_f26, arg0->unkE); - return (mk64_surface_map_ram *)1; - } - goto block_10; - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AC22C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -s32 func_802AC760(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) { - f32 sp6C; - f32 sp64; - f32 sp38; - f32 sp28; - f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp18; - f32 sp10; - f32 spC; - f32 sp8; - Vtx *temp_a0; - Vtx *temp_a2; - Vtx *temp_a3; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f10; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f12_3; - f32 temp_f14; - f32 temp_f14_2; - f32 temp_f14_3; - f32 temp_f16; - f32 temp_f16_2; - f32 temp_f18; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f2_4; - f32 temp_f4; - f32 temp_f6; - mk64_surface_map_ram *temp_v1; - s32 var_v0; - - temp_v1 = &D_8015F580[arg5]; - var_v0 = 1; - if (arg2 < (f32) temp_v1->vtx3[0]) { - return 0; - } - if (arg4 < (f32) temp_v1->vtx3[2]) { - return 0; - } - if ((f32) temp_v1->vtx2[0] < arg2) { - return 0; - } - if ((f32) temp_v1->vtx2[2] < arg4) { - return 0; - } - if (arg3 < ((f32) temp_v1->vtx3[1] - (arg1 * 3.0f))) { - return 0; - } - temp_a0 = temp_v1->vtxs[0]; - temp_a3 = temp_v1->vtxs[2]; - temp_a2 = temp_v1->vtxs[1]; - sp6C = (f32) temp_a3->v.ob[0]; - sp8 = arg4; - sp10 = arg2; - temp_f6 = (f32) temp_a0->v.ob[2] - arg4; - sp64 = (f32) temp_a3->v.ob[2]; - temp_f4 = (f32) temp_a2->v.ob[0] - arg2; - sp28 = temp_f6; - sp24 = temp_f4; - sp20 = (f32) temp_a0->v.ob[0] - arg2; - temp_f0 = temp_f6 * temp_f4; - sp8 = temp_f6; - spC = temp_f4; - temp_f18 = sp8; - sp1C = (f32) temp_a2->v.ob[2] - arg4; - temp_f2 = sp20 * sp1C; - temp_f10 = temp_f0 - temp_f2; - sp18 = temp_f10; - sp38 = temp_f10; - if (temp_f2 == temp_f0) { - sp8 = arg4; - temp_f0_2 = sp6C - sp10; - temp_f2_2 = sp64 - arg4; - if ((((sp1C * temp_f0_2) - (spC * temp_f2_2)) * ((temp_f2_2 * sp20) - (temp_f0_2 * temp_f18))) < 0.0f) { - var_v0 = 0; - } - } else { - temp_f2_3 = sp64 - arg4; - temp_f0_3 = sp6C - arg2; - temp_f14 = sp24 * temp_f2_3; - temp_f12 = sp1C * temp_f0_3; - if (temp_f14 == temp_f12) { - if ((sp38 * ((temp_f2_3 * sp20) - (temp_f0_3 * sp28))) < 0.0f) { - var_v0 = 0; - } - } else { - temp_f16 = temp_f12 - temp_f14; - if ((sp18 * temp_f16) < 0.0f) { - var_v0 = 0; - } else { - temp_f14_2 = temp_f0_3 * sp28; - temp_f12_2 = temp_f2_3 * sp20; - if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { - var_v0 = 0; - } - } - } - } - if (var_v0 == 0) { - return 0; - } - temp_f2_4 = temp_v1->height; - temp_f12_3 = temp_v1->gravity; - temp_f14_3 = temp_v1->rotation; - temp_f16_2 = temp_v1->height2; - temp_f0_4 = (temp_f2_4 * arg2) + (temp_f12_3 * arg3) + (temp_f14_3 * arg4) + temp_f16_2; - if (arg1 < temp_f0_4) { - if (temp_f0_4 < arg0->unk3C[2]) { - arg0->unk34 = 1; - arg0->unk3A = arg5; - arg0->unk3C[2] = temp_f0_4 - arg1; - arg0->unk60[0] = temp_v1->height; - arg0->unk60[1] = temp_v1->gravity; - arg0->unk60[2] = temp_v1->rotation; - } - return 0; - } - if (((temp_f2_4 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2) < 0.0f) { - return 0; - } - arg0->unk34 = 1; - arg0->unk3A = arg5; - arg0->unk3C[2] = temp_f0_4 - arg1; - arg0->unk60[0] = temp_v1->height; - arg0->unk60[1] = temp_v1->gravity; - arg0->unk60[2] = temp_v1->rotation; - return 1; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AC760.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -s32 func_802ACBA4(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) { - f32 sp70; - f32 sp6C; - f32 sp48; - f32 sp3C; - f32 sp2C; - f32 sp28; - f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp14; - f32 sp10; - f32 spC; - f32 sp8; - Vtx *temp_a0; - Vtx *temp_a2; - Vtx *temp_a3; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f0_5; - f32 temp_f10; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f12_3; - f32 temp_f14; - f32 temp_f14_2; - f32 temp_f14_3; - f32 temp_f16; - f32 temp_f16_2; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f2_4; - f32 temp_f2_5; - f32 temp_f4; - f32 temp_f4_2; - f32 temp_f6; - f32 temp_f8; - f32 var_f10; - mk64_surface_map_ram *temp_v1; - s32 var_v0; - - temp_v1 = &D_8015F580[arg5]; - var_v0 = 1; - if (arg2 < (f32) temp_v1->vtx3[0]) { - return 0; - } - if ((f32) temp_v1->vtx2[0] < arg2) { - return 0; - } - if ((f32) temp_v1->vtx2[1] < arg3) { - return 0; - } - if (arg3 < (f32) temp_v1->vtx3[1]) { - return 0; - } - temp_f2 = arg1 * 3.0f; - if (arg4 < ((f32) temp_v1->vtx3[2] - temp_f2)) { - return 0; - } - if (((f32) temp_v1->vtx2[2] + temp_f2) < arg4) { - return 0; - } - temp_a0 = temp_v1->vtxs[0]; - temp_a3 = temp_v1->vtxs[2]; - temp_a2 = temp_v1->vtxs[1]; - sp70 = (f32) temp_a3->v.ob[0]; - sp8 = arg3; - sp10 = arg2; - temp_f10 = (f32) temp_a0->v.ob[1] - arg3; - sp6C = (f32) temp_a3->v.ob[1]; - temp_f6 = (f32) temp_a2->v.ob[0] - arg2; - sp2C = temp_f10; - sp28 = temp_f6; - sp24 = (f32) temp_a0->v.ob[0] - arg2; - temp_f0 = temp_f10 * temp_f6; - sp8 = temp_f10; - spC = temp_f6; - sp20 = (f32) temp_a2->v.ob[1] - arg3; - temp_f2_2 = sp24 * sp20; - temp_f4 = temp_f0 - temp_f2_2; - sp1C = temp_f4; - sp3C = temp_f4; - if (temp_f2_2 == temp_f0) { - sp14 = arg3; - temp_f0_2 = sp70 - sp10; - temp_f2_3 = sp6C - arg3; - if ((((sp20 * temp_f0_2) - (spC * temp_f2_3)) * ((temp_f2_3 * sp24) - (temp_f0_2 * sp8))) < 0.0f) { - var_v0 = 0; - } - } else { - temp_f2_4 = sp6C - arg3; - temp_f0_3 = sp70 - arg2; - temp_f14 = sp28 * temp_f2_4; - temp_f12 = sp20 * temp_f0_3; - if (temp_f14 == temp_f12) { - if ((sp3C * ((temp_f2_4 * sp24) - (temp_f0_3 * sp2C))) < 0.0f) { - var_v0 = 0; - } - } else { - temp_f16 = temp_f12 - temp_f14; - if ((sp1C * temp_f16) < 0.0f) { - var_v0 = 0; - } else { - temp_f14_2 = temp_f0_3 * sp2C; - temp_f12_2 = temp_f2_4 * sp24; - if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { - var_v0 = 0; - } - } - } - } - if (var_v0 == 0) { - return 0; - } - temp_f2_5 = temp_v1->height; - temp_f12_3 = temp_v1->gravity; - temp_f14_3 = temp_v1->rotation; - temp_f16_2 = temp_v1->height2; - temp_f0_4 = (temp_f2_5 * arg2) + (temp_f12_3 * arg3) + (temp_f14_3 * arg4) + temp_f16_2; - if (temp_v1->flags & 0x200) { - temp_f4_2 = (temp_f2_5 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; - sp48 = temp_f4_2; - if ((temp_f0_4 > 0.0f) && (temp_f4_2 > 0.0f)) { - if (temp_f0_4 < arg1) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = temp_f0_4 - arg1; - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - arg0->unk48[2] = temp_v1->rotation; - return 1; - } - return 0; - } - if ((temp_f0_4 < 0.0f) && (sp48 < 0.0f)) { - temp_f0_5 = temp_f0_4 * -1.0f; - if (temp_f0_5 < arg1) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = temp_f0_5 - arg1; - arg0->unk48[0] = -temp_v1->height; - arg0->unk48[1] = -temp_v1->gravity; - arg0->unk48[2] = -temp_v1->rotation; - return 1; - } - return 0; - } - if ((temp_f0_4 > 0.0f) && (sp48 < 0.0f)) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = -(temp_f0_4 + arg1); - arg0->unk48[0] = -temp_v1->height; - arg0->unk48[1] = -temp_v1->gravity; - var_f10 = -temp_v1->rotation; - arg0->unk48[2] = var_f10; - return 1; - } - if ((temp_f0_4 < 0.0f) && (sp48 > 0.0f)) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = temp_f0_4 + arg1; - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - arg0->unk48[2] = temp_v1->rotation; - return 1; - } - if (temp_f0_4 == 0.0f) { - if (sp48 >= 0.0f) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = sp48 + arg1; - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - arg0->unk48[2] = temp_v1->rotation; - return 1; - } - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = -(sp48 + arg1); - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - var_f10 = temp_v1->rotation; - arg0->unk48[2] = var_f10; - return 1; - } - return 0; - } - if (arg1 < temp_f0_4) { - if (temp_f0_4 < arg0->unk3C[0]) { - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = temp_f0_4 - arg1; - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - arg0->unk48[2] = temp_v1->rotation; - } - return 0; - } - temp_f8 = (temp_f2_5 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; - sp48 = temp_f8; - if (temp_f8 < 0.0f) { - return 0; - } - arg0->unk30 = 1; - arg0->unk36 = arg5; - arg0->unk3C[0] = temp_f0_4 - arg1; - arg0->unk48[0] = temp_v1->height; - arg0->unk48[1] = temp_v1->gravity; - var_f10 = temp_v1->rotation; -block_54: - arg0->unk48[2] = var_f10; - return 1; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802ACBA4.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -s32 func_802AD278(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) { - f32 sp68; - f32 sp64; - f32 sp44; - f32 sp38; - f32 sp2C; - f32 sp28; - f32 sp24; - f32 sp20; - f32 sp1C; - f32 sp14; - f32 sp10; - f32 spC; - f32 sp8; - Vtx *temp_a0; - Vtx *temp_a2; - Vtx *temp_a3; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f0_5; - f32 temp_f0_6; - f32 temp_f10; - f32 temp_f10_2; - f32 temp_f12; - f32 temp_f12_2; - f32 temp_f12_3; - f32 temp_f14; - f32 temp_f14_2; - f32 temp_f14_3; - f32 temp_f16; - f32 temp_f16_2; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f2_4; - f32 temp_f4; - f32 temp_f6; - f32 temp_f8; - f32 var_f8; - mk64_surface_map_ram *temp_v1; - s32 var_v0; - - temp_v1 = &D_8015F580[arg5]; - var_v0 = 1; - if (arg4 < (f32) temp_v1->vtx3[2]) { - return 0; - } - if ((f32) temp_v1->vtx2[2] < arg4) { - return 0; - } - if ((f32) temp_v1->vtx2[1] < arg3) { - return 0; - } - if (arg3 < (f32) temp_v1->vtx3[1]) { - return 0; - } - temp_f0 = arg1 * 3.0f; - if (arg2 < ((f32) temp_v1->vtx3[0] - temp_f0)) { - return 0; - } - if (((f32) temp_v1->vtx2[0] + temp_f0) < arg2) { - return 0; - } - temp_a0 = temp_v1->vtxs[0]; - temp_a3 = temp_v1->vtxs[2]; - temp_a2 = temp_v1->vtxs[1]; - sp64 = (f32) temp_a3->v.ob[2]; - sp8 = arg3; - sp10 = arg4; - temp_f8 = (f32) temp_a0->v.ob[1] - arg3; - sp68 = (f32) temp_a3->v.ob[1]; - temp_f6 = (f32) temp_a2->v.ob[2] - arg4; - sp2C = temp_f8; - sp28 = temp_f6; - sp24 = (f32) temp_a0->v.ob[2] - arg4; - temp_f0_2 = temp_f8 * temp_f6; - sp8 = temp_f8; - spC = temp_f6; - sp20 = (f32) temp_a2->v.ob[1] - arg3; - temp_f2 = sp24 * sp20; - temp_f10 = temp_f0_2 - temp_f2; - sp1C = temp_f10; - sp38 = temp_f10; - if (temp_f2 == temp_f0_2) { - sp14 = arg3; - temp_f0_3 = sp64 - sp10; - temp_f2_2 = sp68 - arg3; - if ((((sp20 * temp_f0_3) - (spC * temp_f2_2)) * ((temp_f2_2 * sp24) - (temp_f0_3 * sp8))) < 0.0f) { - var_v0 = 0; - } - } else { - temp_f2_3 = sp68 - arg3; - temp_f0_4 = sp64 - arg4; - temp_f14 = sp28 * temp_f2_3; - temp_f12 = sp20 * temp_f0_4; - if (temp_f14 == temp_f12) { - if ((sp38 * ((temp_f2_3 * sp24) - (temp_f0_4 * sp2C))) < 0.0f) { - var_v0 = 0; - } - } else { - temp_f16 = temp_f12 - temp_f14; - if ((sp1C * temp_f16) < 0.0f) { - var_v0 = 0; - } else { - temp_f14_2 = temp_f0_4 * sp2C; - temp_f12_2 = temp_f2_3 * sp24; - if ((temp_f14_2 != temp_f12_2) && ((temp_f16 * (temp_f12_2 - temp_f14_2)) < 0.0f)) { - var_v0 = 0; - } - } - } - } - if (var_v0 == 0) { - return 0; - } - temp_f2_4 = temp_v1->height; - temp_f12_3 = temp_v1->gravity; - temp_f14_3 = temp_v1->rotation; - temp_f16_2 = temp_v1->height2; - temp_f0_5 = (temp_f2_4 * arg2) + (temp_f12_3 * arg3) + (temp_f14_3 * arg4) + temp_f16_2; - if (temp_v1->flags & 0x200) { - temp_f10_2 = (temp_f2_4 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; - sp44 = temp_f10_2; - if ((temp_f0_5 > 0.0f) && (temp_f10_2 > 0.0f)) { - if (temp_f0_5 < arg1) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = temp_f0_5 - arg1; - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - arg0->unk54[2] = temp_v1->rotation; - return 1; - } - return 0; - } - if ((temp_f0_5 < 0.0f) && (sp44 < 0.0f)) { - temp_f0_6 = temp_f0_5 * -1.0f; - if (temp_f0_6 < arg1) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = temp_f0_6 - arg1; - arg0->unk54[0] = -temp_v1->height; - arg0->unk54[1] = -temp_v1->gravity; - arg0->unk54[2] = -temp_v1->rotation; - return 1; - } - return 0; - } - if ((temp_f0_5 > 0.0f) && (sp44 < 0.0f)) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = -(temp_f0_5 + arg1); - arg0->unk54[0] = -temp_v1->height; - arg0->unk54[1] = -temp_v1->gravity; - var_f8 = -temp_v1->rotation; - arg0->unk54[2] = var_f8; - return 1; - } - if ((temp_f0_5 < 0.0f) && (sp44 > 0.0f)) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = temp_f0_5 + arg1; - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - arg0->unk54[2] = temp_v1->rotation; - return 1; - } - if (temp_f0_5 == 0.0f) { - if (sp44 >= 0.0f) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = sp44 + arg1; - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - arg0->unk54[2] = temp_v1->rotation; - return 1; - } - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = -(sp44 + arg1); - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - var_f8 = temp_v1->rotation; - arg0->unk54[2] = var_f8; - return 1; - } - return 0; - } - if (arg1 < temp_f0_5) { - if (temp_f0_5 < arg0->unk3C[1]) { - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = temp_f0_5 - arg1; - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - arg0->unk54[2] = temp_v1->rotation; - } - return 0; - } - temp_f4 = (temp_f2_4 * arg6) + (temp_f12_3 * arg7) + (temp_f14_3 * arg8) + temp_f16_2; - sp44 = temp_f4; - if (temp_f4 < 0.0f) { - return 0; - } - arg0->unk32 = 1; - arg0->unk38 = arg5; - arg0->unk3C[1] = temp_f0_5 - arg1; - arg0->unk54[0] = temp_v1->height; - arg0->unk54[1] = temp_v1->gravity; - var_f8 = temp_v1->rotation; - arg0->unk54[2] = var_f8; - return 1; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AD278.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit a8f43e46d33dcb7e04d9cdc44a10b3daf4c92c3b -s32 func_802AC760(f32, f32, f32, f32, f32, f32, f32, f32, f32); /* extern */ -s32 func_802ACBA4(UnkActorInner *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ -s32 func_802AD278(UnkActorInner *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ -extern u8 D_8014F110; -extern s32 D_8015F584; -extern s16 D_8015F6E8; -extern s16 D_8015F6EA; -extern s16 D_8015F6F0; -extern s16 D_8015F6F2; - -s32 func_802AD950(UnkActorInner *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { - s16 temp_v0_4; - s16 temp_v1; - s32 temp_f10; - s32 temp_f16; - s32 temp_t7; - u16 temp_s6; - u16 temp_v0; - u16 temp_v0_2; - u16 temp_v0_3; - u16 temp_v0_5; - u16 temp_v1_3; - void *temp_v1_2; - s32 phi_s4; - s32 phi_s4_2; - u16 phi_s2; - s32 phi_s3; - s32 phi_s4_3; - s32 phi_s4_4; - s32 phi_s4_5; - s32 phi_s4_6; - - arg0->unk30 = 0; - arg0->unk32 = 0; - arg0->unk34 = 0; - arg0->unk3C = 1000.0f; - arg0->unk40 = 1000.0f; - arg0->unk44 = 1000.0f; - temp_v0 = arg0->unk3A; - phi_s4_6 = 0; - if (((s32) temp_v0 < (s32) D_8015F588) && (func_802AC760(arg1, arg2, arg3, arg4, (bitwise f32) temp_v0, arg5, arg6, arg7) == 1)) { - phi_s4_6 = 0x00004000; - } - temp_v0_2 = arg0->unk36; - phi_s4_4 = phi_s4_6; - if (((s32) temp_v0_2 < (s32) D_8015F588) && (func_802ACBA4(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_2, arg5, arg6, arg7) == 1)) { - phi_s4_4 = (phi_s4_6 | 0x2000) & 0xFFFF; - } - temp_v0_3 = arg0->unk38; - phi_s4 = phi_s4_4; - if (((s32) temp_v0_3 < (s32) D_8015F588) && (func_802AD278(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_3, arg5, arg6, arg7) == 1)) { - phi_s4 = (phi_s4_4 | 0x8000) & 0xFFFF; - } - phi_s4_2 = phi_s4; - phi_s4_3 = phi_s4; - if (phi_s4 == 0x0000E000) { - goto block_39; - } - temp_v0_4 = D_8015F6EA; - temp_v1 = D_8015F6F2; - temp_f10 = (s32) ((arg2 - (f32) temp_v0_4) / (f32) ((s32) (D_8015F6E8 - temp_v0_4) / 32)); - temp_f16 = (s32) ((arg4 - (f32) temp_v1) / (f32) ((s32) (D_8015F6F0 - temp_v1) / 32)); - if ((s16) temp_f10 < 0) { - return 0; - } - if ((s16) temp_f16 < 0) { - return 0; - } - if ((s16) temp_f10 >= 0x20) { - return 0; - } - if ((s16) temp_f16 >= 0x20) { - return 0; - } - temp_v1_2 = ((s16) ((s16) temp_f10 + ((s16) temp_f16 << 5)) * 4) + &D_8014F110; - temp_s6 = temp_v1_2->unk2; - phi_s3 = 0; - if (temp_s6 == 0) { - - } else { - phi_s2 = temp_v1_2->unk0; - if ((s32) temp_s6 > 0) { -loop_22: - phi_s4_3 = phi_s4_2; - phi_s4_5 = phi_s4_2; - if (phi_s4_2 == 0x0000E000) { - - } else { - temp_v0_5 = *(D_8015F584 + (phi_s2 * 2)); - temp_v1_3 = D_8015F580[temp_v0_5].flags; - if ((temp_v1_3 & 0x4000) != 0) { - if (((phi_s4_2 & 0x4000) == 0) && (arg0->unk3A != temp_v0_5) && (func_802AC760((bitwise f32) arg0, arg1, arg2, arg3, arg4, (bitwise f32) temp_v0_5, arg5, arg6, arg7) == 1)) { - phi_s4_5 = (phi_s4_2 | 0x4000) & 0xFFFF; - } - } else if ((temp_v1_3 & 0x8000) != 0) { - if (((phi_s4_2 & 0x8000) == 0) && (arg0->unk38 != temp_v0_5) && (func_802AD278(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_5, arg5, arg6, arg7) == 1)) { - phi_s4_5 = (phi_s4_2 | 0x8000) & 0xFFFF; - } - } else if (((phi_s4_2 & 0x2000) == 0) && (arg0->unk36 != temp_v0_5) && (func_802ACBA4(arg0, arg1, arg2, arg3, arg4, (s32) temp_v0_5, arg5, arg6, arg7) == 1)) { - phi_s4_5 = (phi_s4_2 | 0x2000) & 0xFFFF; - } - temp_t7 = (phi_s3 + 1) & 0xFFFF; - phi_s4_2 = phi_s4_5; - phi_s2 = (phi_s2 + 1) & 0xFFFF; - phi_s3 = temp_t7; - phi_s4_3 = phi_s4_5; - if (temp_t7 < (s32) temp_s6) { - goto loop_22; - } - } - } - } -block_39: - return phi_s4_3; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AD950.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_802AAE4C(void *, f32, f32, f32, f32, s32); // extern -s32 func_802AB288(void *, void *, f32, f32, f32, s32); // extern -s32 func_802AB6C4(void *, void *, f32, f32, f32, s32); // extern -extern u8 D_8014F110; -extern s32 D_8015F584; - -s32 func_802ADDC8(void *arg0, void *arg1, f32 arg2, f32 arg3, f32 arg4) { - s16 temp_v0_4; - s16 temp_v1; - s32 temp_f4; - s32 temp_f6; - s32 temp_t7; - u16 temp_s6; - u16 temp_v0; - u16 temp_v0_2; - u16 temp_v0_3; - u16 temp_v0_5; - u16 temp_v1_3; - void *temp_v1_2; - s32 phi_s4; - s32 phi_s4_2; - u16 phi_s2; - s32 phi_s3; - s32 phi_s4_3; - s32 phi_s4_4; - s32 phi_s4_5; - s32 phi_s4_6; - - arg0->unk0 = 0; - arg0->unk2 = 0; - arg0->unk4 = 0; - arg0->unkC = 1000.0f; - arg0->unk10 = 1000.0f; - arg0->unk14 = 1000.0f; - temp_v0 = arg0->unkA; - phi_s4_6 = 0; - if ((temp_v0 < D_8015F588) && (func_802AAE4C(arg1, arg2, arg3, arg4, (bitwise f32) temp_v0) == 1)) { - phi_s4_6 = 0x4000; - } - temp_v0_2 = arg0->unk6; - phi_s4_4 = phi_s4_6; - if ((temp_v0_2 < D_8015F588) && (func_802AB288(arg0, arg1, arg2, arg3, arg4, temp_v0_2) == 1)) { - phi_s4_4 = (phi_s4_6 | 0x2000) & 0xFFFF; - } - temp_v0_3 = arg0->unk8; - phi_s4 = phi_s4_4; - if ((temp_v0_3 < D_8015F588) && (func_802AB6C4(arg0, arg1, arg2, arg3, arg4, temp_v0_3) == 1)) { - phi_s4 = (phi_s4_4 | 0x8000) & 0xFFFF; - } - phi_s4_2 = phi_s4; - phi_s4_3 = phi_s4; - if (phi_s4 == 0xE000) { - goto block_39; - } - temp_v0_4 = D_8015F6EA; - temp_v1 = D_8015F6F2; - temp_f4 = (arg2 - temp_v0_4) / ((D_8015F6E8 - temp_v0_4) / 0x20); - temp_f6 = (arg4 - temp_v1) / ((D_8015F6F0 - temp_v1) / 0x20); - if (temp_f4 < 0) { - return 0; - } - if (temp_f6 < 0) { - return 0; - } - if (temp_f4 >= 0x20) { - return 0; - } - if (temp_f6 >= 0x20) { - return 0; - } - temp_v1_2 = ((temp_f4 + (temp_f6 << 5)) * 4) + &D_8014F110; - temp_s6 = temp_v1_2->unk2; - phi_s3 = 0; - if (temp_s6 == 0) { - - } else { - phi_s2 = temp_v1_2->unk0; - if (temp_s6 > 0) { -loop_22: - phi_s4_3 = phi_s4_2; - phi_s4_5 = phi_s4_2; - if (phi_s4_2 == 0xE000) { - - } else { - temp_v0_5 = *(D_8015F584 + (phi_s2 * 2)); - temp_v1_3 = *(D_8015F580 + (temp_v0_5 * 0x2C)); - if ((temp_v1_3 & 0x4000) != 0) { - if (((phi_s4_2 & 0x4000) == 0) && (arg0->unkA != temp_v0_5) && (func_802AAE4C(arg0, (bitwise f32) arg1, arg2, arg3, arg4, temp_v0_5) == 1)) { - phi_s4_5 = (phi_s4_2 | 0x4000) & 0xFFFF; - } - } else if ((temp_v1_3 & 0x8000) != 0) { - if (((phi_s4_2 & 0x8000) == 0) && (arg0->unk8 != temp_v0_5) && (func_802AB6C4(arg0, arg1, arg2, arg3, arg4, temp_v0_5) == 1)) { - phi_s4_5 = (phi_s4_2 | 0x8000) & 0xFFFF; - } - } else if (((phi_s4_2 & 0x2000) == 0) && (arg0->unk6 != temp_v0_5) && (func_802AB288(arg0, arg1, arg2, arg3, arg4, temp_v0_5) == 1)) { - phi_s4_5 = (phi_s4_2 | 0x2000) & 0xFFFF; - } - temp_t7 = (phi_s3 + 1) & 0xFFFF; - phi_s4_2 = phi_s4_5; - phi_s2 = (phi_s2 + 1) & 0xFFFF; - phi_s3 = temp_t7; - phi_s4_3 = phi_s4_5; - if (temp_t7 < temp_s6) { - goto loop_22; - } - } - } - } -block_39: - return phi_s4_3; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802ADDC8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-09-2022 -s32 func_802ABB04(f32, f32, s32); /* extern */ -extern ? D_8014F110; -extern s32 D_8015F584; -static f32 D_802B9E4C = -3000.0f; -static f32 D_802B9E50 = 3000.0f; -static f32 D_802B9E54 = 3000.0f; -static f32 D_802B9E58 = 3000.0f; -static f32 D_802B9E5C = 3000.0f; -static f32 D_802B9E60 = 3000.0f; - -f32 func_802AE1C0(f32 arg0, f32 arg1, f32 arg2) { - f32 temp_f0; - f32 var_f20; - s32 temp_at; - s32 temp_f4; - s32 temp_f6; - s32 temp_t0; - s32 temp_t9; - s32 var_s2; - u16 temp_s0; - u16 temp_t1; - u16 var_s1; - void *temp_t2; - - var_f20 = D_802B9E4C; - temp_f4 = (s32) ((arg0 - (f32) D_8015F6EA) / (f32) ((s32) (D_8015F6E8 - D_8015F6EA) / 32)); - temp_f6 = (s32) ((arg2 - (f32) D_8015F6F2) / (f32) ((s32) (D_8015F6F0 - D_8015F6F2) / 32)); - temp_t0 = (s16) temp_f6 << 5; - temp_t2 = ((s16) ((s16) temp_f4 + temp_t0) * 4) + &D_8014F110; - temp_t1 = temp_t2->unk2; - if ((s16) temp_f4 < 0) { - return D_802B9E50; - } - if ((s16) temp_f6 & 0x04000000) { - return D_802B9E54; - } - if ((s16) temp_f4 >= 0x20) { - return D_802B9E58; - } - if (temp_t0 >= 0x400) { - return D_802B9E5C; - } - if (temp_t1 == 0) { - return D_802B9E60; - } - var_s1 = temp_t2->unk0; - var_s2 = 0; - if ((s32) temp_t1 > 0) { - do { - temp_s0 = *(D_8015F584 + (var_s1 * 2)); - if ((D_8015F580[temp_s0].flags & 0x4000) && (func_802ABB04(arg0, arg2, temp_s0 & 0xFFFF) == 1)) { - temp_f0 = func_802ABE30(arg0, arg1, arg2, temp_s0 & 0xFFFF); - if ((temp_f0 <= arg1) && (var_f20 < temp_f0)) { - var_f20 = temp_f0; - } - } - temp_t9 = (var_s2 + 1) & 0xFFFF; - temp_at = temp_t9 < (s32) temp_t1; - var_s2 = temp_t9; - var_s1 = (var_s1 + 1) & 0xFFFF; - } while (temp_at != 0); - } - return var_f20; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AE1C0.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -extern s32 D_8015F59C; -extern s32 D_8015F5A0; -extern s32 D_8015F5A4; -extern s16 D_8015F6E8; -extern s16 D_8015F6EA; -extern s16 D_8015F6F0; -extern s16 D_8015F6F2; -extern s16 D_8015F6FA; -extern s16 D_8015F6FC; -static f32 D_802B9E64 = -0.9f; -static f32 D_802B9E68 = 0.9f; -static f32 D_802B9E6C = 0.1f; -static f32 D_802B9E70 = -0.1f; - -void func_802AE434(Vtx *arg0, Vtx *arg1, Vtx *arg2, s8 arg3, u16 arg4) { - s16 spBA; - s16 spB8; - s16 spB6; - s16 spB2; - s16 spAC; - s16 spAA; - f32 sp58; - f32 sp54; - f32 sp50; - f32 sp4C; - s16 sp4A; - s16 sp48; - s16 sp44; - s16 sp42; - Vtx *sp1C; /* compiler-managed */ - f64 sp10; - f64 sp8; - f64 sp0; - Vtx *temp_t1; - Vtx *temp_t2; - Vtx *temp_t6; - f32 temp_f0; - f32 temp_f18_2; - f32 temp_f4_2; - f64 temp_f12; - f64 temp_f14; - f64 temp_f16; - f64 temp_f18; - f64 temp_f2; - f64 temp_f4; - f64 temp_f8; - mk64_surface_map_ram *temp_t0; - s16 var_a0; - s16 var_a1; - s16 var_a2; - s16 var_a3; - s16 var_t1; - s16 var_t2; - s16 var_t3; - s16 var_t4; - s16 var_t5; - s16 var_v0; - s16 var_v1; - s32 temp_a0; - s32 temp_a1; - s32 temp_a2; - s32 temp_a3; - s32 temp_v0; - s32 temp_v1; - u16 temp_a0_2; - u16 temp_a3_2; - u16 temp_v1_2; - u16 var_a1_2; - u16 var_t8; - u16 var_t9; - - temp_t0 = &D_8015F580[D_8015F588]; - temp_t0->vtxs[0] = arg0; - temp_t0->vtxs[1] = arg1; - temp_t0->vtxs[2] = arg2; - if ((arg0->v.flag != 4) || (arg1->v.flag != 4) || (temp_t0->vtxs[2]->v.flag != 4)) { - temp_t6 = temp_t0->vtxs[0]; - sp1C = temp_t6; - temp_t1 = temp_t0->vtxs[1]; - temp_t2 = temp_t0->vtxs[2]; - var_a0 = temp_t6->v.ob[0]; - var_t3 = temp_t1->v.ob[0]; - var_a2 = temp_t6->v.ob[1]; - var_a1 = temp_t6->v.ob[2]; - var_a3 = temp_t1->v.ob[1]; - var_t4 = temp_t1->v.ob[2]; - var_t5 = temp_t2->v.ob[0]; - var_v0 = temp_t2->v.ob[1]; - var_v1 = temp_t2->v.ob[2]; - if ((var_a0 == var_t3) && (var_a1 == var_t4)) { - temp_t0->vtxs[2] = arg1; - temp_t0->vtxs[1] = arg2; - var_a0 = arg0->v.ob[0]; - var_a2 = arg0->v.ob[1]; - var_a1 = arg0->v.ob[2]; - var_t3 = arg1->v.ob[0]; - var_a3 = arg1->v.ob[1]; - var_t4 = arg1->v.ob[2]; - var_t5 = arg2->v.ob[0]; - var_v0 = arg2->v.ob[1]; - var_v1 = arg2->v.ob[2]; - } - if (var_a0 >= var_t3) { - if (var_a0 >= var_t5) { - sp4A = var_a0; - } else { - goto block_12; - } - } else if (var_t3 >= var_t5) { - sp4A = var_t3; - } else { -block_12: - sp4A = var_t5; - } - if (var_a1 >= var_t4) { - if (var_a1 >= var_v1) { - sp48 = var_a1; - } else { - goto block_19; - } - } else if (var_t4 >= var_v1) { - sp48 = var_t4; - } else { -block_19: - sp48 = var_v1; - } - if (var_a2 >= var_a3) { - if (var_a2 >= var_v0) { - sp42 = var_a2; - } else { - goto block_26; - } - } else if (var_a3 >= var_v0) { - sp42 = var_a3; - } else { -block_26: - sp42 = var_v0; - } - if (var_t3 >= var_a0) { - if (var_t5 >= var_a0) { - sp44 = var_a0; - } else { - goto block_33; - } - } else if (var_t5 >= var_t3) { - sp44 = var_t3; - } else { -block_33: - sp44 = var_t5; - } - if (var_a3 >= var_a2) { - if (var_v0 >= var_a2) { - var_t2 = var_a2; - } else { - var_t2 = var_v0; - } - } else if (var_v0 >= var_a3) { - var_t2 = var_a3; - } else { - var_t2 = var_v0; - } - if (var_t4 >= var_a1) { - if (var_v1 >= var_a1) { - var_t1 = var_a1; - } else { - var_t1 = var_v1; - } - } else if (var_v1 >= var_t4) { - var_t1 = var_t4; - } else { - var_t1 = var_v1; - } - spAA = var_v1; - spB8 = var_a2; - spB2 = var_a3; - spAC = var_v0; - temp_v0 = spB2 - spB8; - temp_v1 = spAA - var_t4; - spB6 = var_a1; - spBA = var_a0; - temp_a0 = var_t4 - spB6; - temp_a1 = spAC - spB2; - temp_a2 = var_t5 - var_t3; - temp_a3 = var_t3 - spBA; - temp_f12 = (f64) ((temp_v0 * temp_v1) - (temp_a0 * temp_a1)); - temp_f18 = temp_f12 * temp_f12; - sp10 = temp_f18; - temp_f14 = (f64) ((temp_a0 * temp_a2) - (temp_a3 * temp_v1)); - temp_f8 = temp_f14 * temp_f14; - sp8 = temp_f8; - temp_f16 = (f64) ((temp_a3 * temp_a1) - (temp_v0 * temp_a2)); - temp_f4 = temp_f16 * temp_f16; - sp0 = temp_f4; - temp_f2 = (f64) sqrtf((f32) (temp_f18 + temp_f8 + temp_f4)); - if ((temp_f2 != 0.0) && ((temp_f0 = (f32) ((f64) (f32) temp_f12 / temp_f2), sp58 = temp_f0, temp_f4_2 = (f32) ((f64) (f32) temp_f14 / temp_f2), sp1C = temp_f4_2, sp54 = temp_f4_2, temp_f18_2 = (f32) ((f64) (f32) temp_f16 / temp_f2), sp50 = temp_f18_2, sp4C = -(((f32) spBA * temp_f0) + (temp_f4_2 * (f32) spB8) + (temp_f18_2 * (f32) spB6)), (D_8015F59C == 0)) || (!(temp_f4_2 < D_802B9E64) && !(D_802B9E68 < temp_f4_2))) && ((D_8015F5A0 == 0) || !(sp1C < D_802B9E6C) || !(D_802B9E70 < sp1C))) { - temp_t0->vtx2[0] = sp4A; - temp_t0->vtx3[2] = var_t1; - temp_t0->vtx3[1] = var_t2; - temp_t0->vtx3[0] = sp44; - temp_t0->vtx2[1] = sp42; - temp_t0->vtx2[2] = sp48; - if (sp44 < D_8015F6EA) { - D_8015F6EA = sp44; - } - if (var_t2 < D_8015F6EE) { - D_8015F6EE = var_t2; - } - if (var_t1 < D_8015F6F2) { - D_8015F6F2 = var_t1; - } - if (D_8015F6E8 < sp4A) { - D_8015F6E8 = sp4A; - } - if (D_8015F6EC < sp42) { - D_8015F6EC = sp42; - } - if (D_8015F6F0 < sp48) { - D_8015F6F0 = sp48; - } - temp_t0->height = sp58; - temp_t0->gravity = sp54; - var_a1_2 = arg4; - temp_t0->rotation = sp50; - temp_t0->height2 = sp4C; - temp_t0->surfaceType = (u16) arg3; - D_8015F6FA = 0; - D_8015F6FC = 0; - temp_a3_2 = temp_t0->vtxs[0]->v.flag; - temp_v1_2 = temp_t0->vtxs[1]->v.flag; - temp_a0_2 = temp_t0->vtxs[2]->v.flag; - if ((temp_a3_2 == 1) && (temp_v1_2 == 1) && (temp_a0_2 == 1)) { - var_t8 = (arg4 | 0x400) & 0xFFFF; - goto block_81; - } - if ((temp_a3_2 == 2) && (temp_v1_2 == 2) && (temp_a0_2 == 2)) { - var_a1_2 = (arg4 | 0x800) & 0xFFFF; - } else if ((temp_a3_2 == 3) && (temp_v1_2 == 3) && (temp_a0_2 == 3)) { - var_a1_2 = (arg4 | 0x1000) & 0xFFFF; - } else if (D_8015F5A4 != 0) { - var_t8 = (arg4 | 0x200) & 0xFFFF; -block_81: - var_a1_2 = var_t8; - } - temp_t0->flags = var_a1_2; - if (sp10 <= sp8) { - var_t9 = var_a1_2 | 0x4000; - if (sp0 <= sp8) { - goto block_89; - } - } - if ((sp8 < sp10) && (sp0 <= sp10)) { - temp_t0->flags |= 0x8000; - } else { - var_t9 = temp_t0->flags | 0x2000; -block_89: - temp_t0->flags = var_t9; - } - D_8015F588 += 1; - } - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AE434.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_802AE434(s32, s32, s32, s8, s32); // extern -extern ? D_8015F668; - -void func_802AEB14(s32 arg0, s8 arg1, u16 arg2) { - func_802AE434(*(&D_8015F668 + ((((arg0 & 0xFF0000) >> 0x10) >> 1) * 4)), *(&D_8015F668 + ((((arg0 & 0xFF00) >> 8) >> 1) * 4)), *(&D_8015F668 + (((arg0 & 0xFF) >> 1) * 4)), arg1, arg2); -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AEB14.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_802AE434(s32, s32, s32, s8, s32); // extern -extern ? D_8015F668; - -void func_802AEBA4(s32 arg0, s32 arg1, s8 arg2, u16 arg3) { - s32 sp28; - s32 sp24; - s32 sp20; - - sp28 = *(&D_8015F668 + ((((arg1 & 0xFF0000) >> 0x10) >> 1) * 4)); - sp24 = *(&D_8015F668 + ((((arg1 & 0xFF00) >> 8) >> 1) * 4)); - sp20 = *(&D_8015F668 + (((arg1 & 0xFF) >> 1) * 4)); - func_802AE434(*(&D_8015F668 + ((((arg0 & 0xFF0000) >> 0x10) >> 1) * 4)), *(&D_8015F668 + ((((arg0 & 0xFF00) >> 8) >> 1) * 4)), *(&D_8015F668 + (((arg0 & 0xFF) >> 1) * 4)), arg2, arg3); - func_802AE434(sp28, sp24, sp20, arg2, arg3); -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AEBA4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_802AE434(s32, s32, s32, s8, s32); // extern -extern ? D_8015F668; - -void func_802AECA0(s32 arg0, s8 arg1, u16 arg2) { - s32 sp2C; - s32 sp24; - s32 sp20; - s32 temp_a0; - s32 temp_a2; - - temp_a0 = *(&D_8015F668 + ((((arg0 & 0xFF0000) >> 0x10) >> 1) * 4)); - temp_a2 = *(&D_8015F668 + (((arg0 & 0xFF) >> 1) * 4)); - sp2C = temp_a0; - sp24 = temp_a2; - sp20 = *(&D_8015F668 + ((((arg0 & 0xFF000000) >> 0x18) >> 1) * 4)); - func_802AE434(temp_a0, *(&D_8015F668 + ((((arg0 & 0xFF00) >> 8) >> 1) * 4)), temp_a2, arg1, arg2); - func_802AE434(temp_a0, sp24, sp20, arg1, arg2); -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AECA0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_8015F668; -extern uintptr_t gSegmentTable; - -void func_802AED6C(u32 arg0, s32 arg1, s32 arg2) { - s32 temp_a2; - s32 temp_t0; - s32 temp_v0; - s32 temp_v0_2; - s32 temp_v0_3; - s32 temp_v0_4; - s32 temp_v0_5; - s32 temp_v1; - s32 temp_v1_2; - s32 phi_v0; - s32 *phi_a0; - s32 phi_v1; - s32 phi_v0_2; - void *phi_a0_2; - s32 phi_v1_2; - s32 phi_a2; - s32 phi_a2_2; - - temp_v0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; - phi_v0 = temp_v0; - phi_v1 = 0; - phi_v0_2 = temp_v0; - phi_a2 = arg2; - phi_v1_2 = 0; - phi_a2_2 = arg2; - if (arg1 != 0) { - temp_t0 = arg1 & 3; - if (temp_t0 != 0) { - phi_a0 = (arg2 * 4) + &D_8015F668; - do { - *phi_a0 = phi_v0; - temp_v1 = phi_v1 + 1; - temp_v0_2 = phi_v0 + 0x10; - temp_a2 = phi_a2_2 + 1; - phi_v0 = temp_v0_2; - phi_a0 += 4; - phi_v1 = temp_v1; - phi_v0_2 = temp_v0_2; - phi_a2 = temp_a2; - phi_v1_2 = temp_v1; - phi_a2_2 = temp_a2; - } while (temp_t0 != temp_v1); - if (temp_v1 != arg1) { - goto block_5; - } - } else { -block_5: - phi_a0_2 = (phi_a2 * 4) + &D_8015F668; - do { - phi_a0_2->unk0 = phi_v0_2; - temp_v0_3 = phi_v0_2 + 0x10; - phi_a0_2->unk4 = temp_v0_3; - temp_v0_4 = temp_v0_3 + 0x10; - phi_a0_2->unk8 = temp_v0_4; - temp_v0_5 = temp_v0_4 + 0x10; - phi_a0_2->unkC = temp_v0_5; - temp_v1_2 = phi_v1_2 + 4; - phi_v0_2 = temp_v0_5 + 0x10; - phi_a0_2 += 0x10; - phi_v1_2 = temp_v1_2; - } while (temp_v1_2 != arg1); - } - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AED6C.s") -#endif - -s32 func_802AEE1C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7) { - f32 temp_f0; - f32 temp_f18; - f32 temp_f2; - - temp_f0 = arg6 - arg4; - temp_f2 = arg7 - arg5; - if (temp_f0 == 0.0f) { - if (arg4 < arg0) { - return 0; - } - if (arg1 < arg4) { - return 0; - } - if (temp_f2 > 0.0f) { - if ((arg5 < arg2) && (arg3 < arg7)) { - return 1; - } - } else if ((arg7 < arg2) && (arg3 < arg5)) { - return 1; - } - } else { - if (temp_f2 == 0.0f) { - if (arg5 < arg2) { - return 0; - } - if (arg3 < arg5) { - return 0; - } - if (temp_f0 > 0.0f) { - if ((arg4 < arg0) && (arg1 < arg6)) { - return 1; - } - } else if ((arg6 < arg0) && (arg1 < arg4)) { - return 1; - } - } else { - temp_f18 = ((temp_f0 / temp_f2) * (arg2 - arg5)) + arg4; - if ((arg0 <= temp_f18) && (temp_f18 <= arg1)) { - return 1; - } - temp_f18 = ((temp_f0 / temp_f2) * (arg3 - arg5)) + arg4; - if ((arg0 <= temp_f18) && (temp_f18 <= arg1)) { - return 1; - } - temp_f18 = ((temp_f2 / temp_f0) * (arg0 - arg4)) + arg5; - if ((arg2 <= temp_f18) && (temp_f18 <= arg3)) { - return 1; - } - temp_f18 = ((temp_f2 / temp_f0) * (arg1 - arg4)) + arg5; - if ((arg2 <= temp_f18) && (temp_f18 <= arg3)) { - return 1; - } - } - } - return 0; -} - -s32 func_802AF0FC(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u16 surfaceMapIndex) { - mk64_surface_map_ram *temp_v0; - s16 vx1; - s16 vz1; - s16 vx2; - s16 vz2; - s16 vx3; - s16 vz3; - - temp_v0 = &D_8015F580[surfaceMapIndex]; - vx1 = temp_v0->vtxs[0]->v.ob[0]; - vz1 = temp_v0->vtxs[0]->v.ob[2]; - vx2 = temp_v0->vtxs[1]->v.ob[0]; - vz2 = temp_v0->vtxs[1]->v.ob[2]; - vx3 = temp_v0->vtxs[2]->v.ob[0]; - vz3 = temp_v0->vtxs[2]->v.ob[2]; - if ((vx1 >= arg0) && (arg1 >= vx1) && (vz1 >= arg2) && (arg3 >= vz1)) { - return 1; - } - if ((vx2 >= arg0) && (arg1 >= vx2) && (vz2 >= arg2) && (arg3 >= vz2)) { - return 1; - } - if ((vx3 >= arg0) && (arg1 >= vx3) && (vz3 >= arg2) && (arg3 >= vz3)) { - return 1; - } - if (func_802AEE1C(arg0, arg1, arg2, arg3, vx1, vz1, vx2, vz2) == 1) { - return 1; - } - if (func_802AEE1C(arg0, arg1, arg2, arg3, vx2, vz2, vx3, vz3) == 1) { - return 1; - } - if (func_802AEE1C(arg0, arg1, arg2, arg3, vx3, vz3, vx1, vz1) == 1) { - return 1; - } - return 0; -} - -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -extern ? D_8014F110; -extern s32 D_8015F584; -extern u16 D_8015F58A; -extern s16 D_8015F6E8; -extern s16 D_8015F6EA; -extern s16 D_8015F6F0; -extern s16 D_8015F6F2; -extern s32 gPrevLoadedAddress; - -void func_802AF314(void) { - s32 sp4C; - ? *var_v0; - s16 temp_a1; - s16 temp_a3; - s16 temp_s1; - s16 temp_s2; - s32 temp_fp; - s32 temp_s6; - s32 var_s0; - s32 var_s3; - s32 var_s5; - s32 var_s7; - void *temp_v0; - void *temp_v0_2; - - var_v0 = &D_8014F110; - do { - var_v0 += 0x10; - var_v0->unk-A = 0; - var_v0->unk-6 = 0; - var_v0->unk-2 = 0; - var_v0->unk-E = 0; - } while (var_v0 != &gNumActors); - D_8015F58A = 0; - D_8015F584 = gPrevLoadedAddress; - var_s7 = 0; - temp_s6 = (s32) (D_8015F6E8 - D_8015F6EA) / 32; - temp_fp = (s32) (D_8015F6F0 - D_8015F6F2) / 32; - do { - var_s5 = 0; - sp4C = temp_fp * var_s7; -loop_4: - var_s0 = 0; - var_s3 = 0; - temp_s1 = (D_8015F6EA + (temp_s6 * var_s5)) - 0x14; - temp_s2 = (D_8015F6F2 + sp4C) - 0x14; - if ((s32) D_8015F588 > 0) { - do { - temp_a3 = temp_s2 + temp_fp + 0x28; - temp_v0 = var_s3 + D_8015F580; - if ((temp_v0->unkE >= temp_s2) && (temp_a3 >= temp_v0->unk8)) { - temp_a1 = temp_s1 + temp_s6 + 0x28; - if ((temp_v0->unkA >= temp_s1) && (temp_a1 >= temp_v0->unk4)) { - if (func_802AF0FC(temp_s1, temp_a1, temp_s2, temp_a3, (u16) var_s0) == 1) { - temp_v0_2 = (((var_s7 << 5) + var_s5) * 4) + &D_8014F110; - if (temp_v0_2->unk2 == 0) { - temp_v0_2->unk0 = (u16) D_8015F58A; - } - temp_v0_2->unk2 = (u16) (temp_v0_2->unk2 + 1); - *(D_8015F584 + (D_8015F58A * 2)) = (s16) var_s0; - D_8015F58A += 1; - } - } - } - var_s0 += 1; - var_s3 += 0x2C; - } while (var_s0 < (s32) D_8015F588); - } - var_s5 += 1; - if (var_s5 != 0x20) { - goto loop_4; - } - var_s7 += 1; - } while (var_s7 != 0x20); -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AF314.s") -#endif - -void func_802AF588(s32 arg0) { - func_802AF5D8(arg0, -1, 0xFF); -} - -void func_802AF5AC(s32 arg0, s8 arg1) { - func_802AF5D8(arg0, arg1, 0xFF); -} - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_802AEB14(u32, s8, s32); // extern -void func_802AEBA4(u32, u32, s8, s32); // extern -void func_802AECA0(u32, s8, s32); // extern -void func_802AED6C(u32, s32, u32); // extern -extern s16 D_8015F6FA; -extern s16 D_8015F6FC; -extern uintptr_t gSegmentTable; - -void func_802AF5D8(u32 arg0, s8 arg1, s32 arg2) { - s32 temp_s5; - s32 temp_v0; - u32 temp_s0; - u32 temp_s1; - void *phi_s3; - s32 phi_s6; - s32 phi_s6_2; - - D_8015F6FA = 0; - temp_s5 = arg2 & 0xFFFF; - D_8015F6FC = 0; - phi_s3 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; - phi_s6_2 = 0; -loop_1: - temp_s0 = phi_s3->unk0; - temp_s1 = phi_s3->unk4; - temp_v0 = temp_s0 & 0xFF000000; - if (temp_v0 == 0x6000000) { - func_802AF5D8(temp_s1, arg1, temp_s5 & 0xFFFF); - phi_s6 = phi_s6_2 + 1; - goto block_12; - } - if (temp_v0 == 0x4000000) { - func_802AED6C(temp_s1, (temp_s0 >> 0xA) & 0x3F, ((temp_s0 >> 0x10) & 0xFF) >> 1); - phi_s6 = phi_s6_2 + 1; - goto block_12; - } - if (temp_v0 == 0xBF000000) { - D_8015F58C += 1; - func_802AEB14(temp_s1, arg1, temp_s5 & 0xFFFF); - phi_s6 = phi_s6_2 + 1; - goto block_12; - } - if (temp_v0 == 0xB1000000) { - D_8015F58C += 2; - func_802AEBA4(temp_s0, temp_s1, arg1, temp_s5 & 0xFFFF); - phi_s6 = phi_s6_2 + 1; - goto block_12; - } - if (temp_v0 == 0xB5000000) { - D_8015F58C += 2; - func_802AECA0(temp_s1, arg1, temp_s5 & 0xFFFF); - phi_s6 = phi_s6_2 + 1; - goto block_12; - } - phi_s6 = phi_s6_2 + 1; - if (temp_v0 != 0xB8000000) { -block_12: - phi_s3 += 8; - phi_s6_2 = phi_s6; - if (phi_s6 != 0x1FFF) { - goto loop_1; - } - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AF5D8.s") -#endif - -void func_802AF7B4(uintptr_t addr, s32 uls, s32 ult) { - s32 segment = SEGMENT_NUMBER2(addr); - s32 offset = SEGMENT_OFFSET(addr); - Gfx *phi_v0 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[segment] + offset); - s32 gfxCommand; - - uls = (uls << 12) & 0xFFF000; - ult &= 0xFFF; - - while(1) { - - gfxCommand = phi_v0->words.w0 & 0xFF000000; - - if (gfxCommand == G_ENDDL << 24) { - break; - } else if (gfxCommand == (G_SETTILESIZE << 24)) { - phi_v0->words.w0 = 0xF2000000 | uls | ult; - - break; - } - phi_v0++; - } -} - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern uintptr_t gSegmentTable; - -void func_802AF83C(u32 arg0, u32 arg1, ? arg2, s8 arg3, u8 arg4, u8 arg5, u8 arg6) { - u32 temp_v1; - void *phi_v0; - u32 phi_v1; - - phi_v0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; - phi_v1 = 0; - if (arg1 != 0) { - do { - temp_v1 = phi_v1 + 1; - phi_v1 = temp_v1; - if (arg4 != 0) { - phi_v0->unkC = arg4; - phi_v0->unkD = arg5; - phi_v0->unkE = arg6; - } - phi_v0->unkF = arg3; - phi_v0 += 0x10; - } while (temp_v1 < arg1); - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AF83C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_802AF83C(u32, s32, u32, s8, s32, s32, s32); // extern -extern uintptr_t gSegmentTable; - -void func_802AF8BC(u32 arg0, s8 arg1, s32 arg2, s32 arg3, u8 arg4) { - s32 temp_s2; - s32 temp_s3; - s32 temp_v1; - u32 temp_a0; - u32 temp_v0; - void *phi_s0; - - temp_s2 = arg2 & 0xFF; - temp_s3 = arg3 & 0xFF; - phi_s0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000; -loop_1: - temp_v0 = phi_s0->unk0; - temp_a0 = phi_s0->unk4; - temp_v1 = temp_v0 & 0xFF000000; - if (temp_v1 != 0xB8000000) { - if (temp_v1 == 0x6000000) { - func_802AF8BC(temp_a0, arg1, temp_s2 & 0xFF, temp_s3 & 0xFF, arg4); - phi_s0 += 8; - } else { - if (temp_v1 == 0x4000000) { - func_802AF83C(temp_a0, (temp_v0 >> 0xA) & 0x3F, ((temp_v0 >> 0x10) & 0xFF) >> 1, arg1, temp_s2, temp_s3, arg4); - } - phi_s0 += 8; - } - goto loop_1; - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AF8BC.s") -#endif - -void func_802AF9F0(Vec3f arg0, f32 arg1, Vec3f arg2) { - arg2[0] -= arg0[0] * arg1; - arg2[1] -= arg0[1] * arg1; - arg2[2] -= arg0[2] * arg1; -} - -#ifdef MIPS_TO_C -//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b -s32 func_802AC760(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ -s32 func_802ACBA4(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ -s32 func_802AD278(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */ -extern ? D_8014F110; -extern s32 D_8015F584; -extern s16 D_8015F6E8; -extern s16 D_8015F6EA; -extern s16 D_8015F6F0; -extern s16 D_8015F6F2; - -s32 func_802AFA34(Player *player, KartBoundingBoxCorner *corner, f32 cornerPos[0], f32 cornerPos[1], f32 cornerPos[2]) { - f32 sp128; - f32 sp11C; - f32 sp110; - f32 sp10C; - f32 sp108; - f32 sp104; - s16 sp102; - s16 sp100; - s16 spFE; - s16 spFC; - s16 spFA; - s16 spF8; - f32 spD4; - s32 sp8C; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - f32 temp_f0_4; - f32 temp_f0_5; - f32 temp_f0_6; - f32 temp_f20; - f32 temp_f22; - f32 temp_f24; - f32 temp_f26; - f32 temp_f2; - f32 temp_f2_2; - f32 temp_f2_3; - f32 temp_f2_4; - f32 temp_f2_5; - f32 temp_f2_6; - mk64_surface_map_ram *temp_v0_4; - s16 temp_v0_2; - s16 temp_v1; - s32 temp_at; - s32 temp_f10; - s32 temp_f16; - s32 temp_t6; - s32 var_s2; - u16 temp_s0; - u16 temp_v0_3; - u16 temp_v1_3; - u16 var_s1; - u8 temp_v0; - void *temp_v1_2; - - sp104 = 1000.0f; - sp108 = 1000.0f; - sp10C = 1000.0f; - temp_f20 = player->boundingBoxSize; - spFE = 0x1388; - sp100 = 0x1388; - sp102 = 0x1388; - spF8 = 0; - spFA = 0; - spFC = 0; - temp_v0 = corner->surfaceFlags; - temp_f22 = corner->cornerPos[0]; - temp_f24 = corner->cornerPos[1]; - temp_f26 = corner->cornerPos[2]; - switch (temp_v0) { /* irregular */ - case 0x80: - if (func_802AD278(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) corner->surfaceMapIndex, cornerPos[0], cornerPos[1], cornerPos[2]) == 1) { - temp_f0 = func_802ABE30(temp_f22, temp_f24, temp_f26, corner->surfaceMapIndex); - temp_f2 = player->pos[1]; - if (!(temp_f2 < temp_f0) && !((2.0f * temp_f20) < (temp_f2 - temp_f0))) { - corner->cornerGroundY = temp_f0; - func_802AF9F0(&sp11C, sp108, &corner->cornerPos[0]); - return 1; - } - } - default: -block_22: - temp_v0_2 = D_8015F6EA; - temp_v1 = D_8015F6F2; - temp_f10 = (s32) ((temp_f22 - (f32) temp_v0_2) / (f32) ((s32) (D_8015F6E8 - temp_v0_2) / 32)); - temp_f16 = (s32) ((temp_f26 - (f32) temp_v1) / (f32) ((s32) (D_8015F6F0 - temp_v1) / 32)); - if ((s16) temp_f10 < 0) { - goto block_57; - } - if ((s16) temp_f16 < 0) { - goto block_57; - } - if ((s16) temp_f10 >= 0x20) { - goto block_57; - } - if ((s16) temp_f16 >= 0x20) { - goto block_57; - } - temp_v1_2 = ((s16) ((s16) temp_f10 + ((s16) temp_f16 << 5)) * 4) + &D_8014F110; - temp_v0_3 = temp_v1_2->unk2; - sp8C = (s32) temp_v0_3; - if (temp_v0_3 == 0) { - goto block_57; - } - var_s1 = temp_v1_2->unk0; - var_s2 = 0; - if (sp8C > 0) { -loop_34: - temp_s0 = *(D_8015F584 + (var_s1 * 2)); - temp_v0_4 = &D_8015F580[temp_s0]; - temp_v1_3 = temp_v0_4->flags; - if (temp_v1_3 & 0x4000) { - if ((corner->surfaceMapIndex != temp_s0) && (func_802AC760(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) temp_s0, cornerPos[0], cornerPos[1], cornerPos[2]) == 1)) { - temp_f0_2 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); - temp_f2_2 = player->pos[1]; - if (!(temp_f2_2 < temp_f0_2) && !((2.0f * temp_f20) < (temp_f2_2 - temp_f0_2))) { - spD4 = temp_f0_2; - func_802AF9F0(&sp128, sp10C, &corner->cornerPos[0]); - corner->cornerGroundY = spD4; - corner->surfaceFlags = 0x40; - corner->surfaceMapIndex = temp_s0; - corner->surfaceType = (u8) D_8015F580[temp_s0].surfaceType; - if (D_8015F580[temp_s0].flags & 0x1000) { - corner->unk_14 = 1; - return 1; - } - corner->unk_14 = 0; - return 1; - } - } - goto block_55; - } - if (temp_v1_3 & 0x8000) { - if ((temp_v0_4->gravity != 0.0f) && (corner->surfaceMapIndex != temp_s0) && (func_802AD278(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) temp_s0, cornerPos[0], cornerPos[1], cornerPos[2]) == 1)) { - temp_f0_3 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); - temp_f2_3 = player->pos[1]; - if (!(temp_f2_3 < temp_f0_3) && !((2.0f * temp_f20) < (temp_f2_3 - temp_f0_3))) { - corner->cornerGroundY = temp_f0_3; - func_802AF9F0(&sp11C, sp108, &corner->cornerPos[0]); - corner->cornerGroundY = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); - corner->surfaceFlags = 0x80; - corner->surfaceMapIndex = temp_s0; - corner->surfaceType = (u8) D_8015F580[temp_s0].surfaceType; - return 1; - } - } - goto block_55; - } - if ((temp_v0_4->gravity != 0.0f) && (corner->surfaceMapIndex != temp_s0) && (func_802ACBA4(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) temp_s0, cornerPos[0], cornerPos[1], cornerPos[2]) == 1)) { - temp_f0_4 = func_802ABE30(temp_f22, temp_f24, temp_f26, temp_s0 & 0xFFFF); - temp_f2_4 = player->pos[1]; - if (!(temp_f2_4 < temp_f0_4) && !((2.0f * temp_f20) < (temp_f2_4 - temp_f0_4))) { - corner->cornerGroundY = temp_f0_4; - func_802AF9F0(&sp110, sp104, &corner->cornerPos[0]); - corner->surfaceFlags = 0x20; - corner->surfaceMapIndex = temp_s0; - corner->surfaceType = (u8) D_8015F580[temp_s0].surfaceType; - return 1; - } - } -block_55: - temp_t6 = (var_s2 + 1) & 0xFFFF; - temp_at = temp_t6 < sp8C; - var_s2 = temp_t6; - var_s1 = (var_s1 + 1) & 0xFFFF; - if (temp_at == 0) { - goto block_56; - } - goto loop_34; - } -block_56: - corner->cornerGroundY = temp_f24; - corner->surfaceType = 0; -block_57: - return 0; - case 0x40: - if (func_802AC760(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) corner->surfaceMapIndex, cornerPos[0], cornerPos[1], cornerPos[2]) == 1) { - temp_f0_5 = func_802ABE30(temp_f22, temp_f24, temp_f26, corner->surfaceMapIndex); - temp_f2_5 = player->pos[1]; - if (!(temp_f2_5 < temp_f0_5) && !((2.0f * temp_f20) < (temp_f2_5 - temp_f0_5))) { - corner->cornerGroundY = temp_f0_5; - func_802AF9F0(&sp128, sp10C, &corner->cornerPos[0]); - return 1; - } - } - goto block_22; - case 0x20: - if (func_802ACBA4(&spF8, temp_f20, temp_f22, temp_f24, temp_f26, (s32) corner->surfaceMapIndex, cornerPos[0], cornerPos[1], cornerPos[2]) == 1) { - temp_f0_6 = func_802ABE30(temp_f22, temp_f24, temp_f26, corner->surfaceMapIndex); - temp_f2_6 = player->pos[1]; - if (!(temp_f2_6 < temp_f0_6) && !((2.0f * temp_f20) < (temp_f2_6 - temp_f0_6))) { - corner->cornerGroundY = temp_f0_6; - func_802AF9F0(&sp110, sp104, &corner->cornerPos[0]); - return 1; - } - } - goto block_22; - case 0x0: - goto block_22; - } -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802AFA34.s") -#endif diff --git a/src/memory.h b/src/memory.h index 300dafd53..fb66e7cdf 100644 --- a/src/memory.h +++ b/src/memory.h @@ -86,30 +86,6 @@ void func_802A8EA8(Gfx*, u8, u8); void func_802A8F14(Gfx*, u8, u8); void func_802A94D8(Gfx*, u8, u8); void func_802A9544(Gfx*, u8, u8); -void nullify_displaylist(uintptr_t); -void func_802AAAAC(UnkActorInner*); -s8 func_802ABD10(u16); -s16 func_802ABD40(u16); -s16 func_802ABD7C(u16); -s16 func_802ABDB8(u16); -s16 func_802ABDF4(u16); -f32 func_802ABE30(f32, f32, f32, u16); -f32 func_802ABEAC(UnkActorInner*, Vec3f); -void process_shell_collision(Vec3f, f32, Vec3f, f32); -void func_802AC098(UnkActorInner*, f32*); -void func_802AC114(Vec3f, f32, Vec3f, f32); -void func_802AD950(UnkActorInner*, f32, f32, f32, f32, f32, f32, f32); -s32 func_802ADDC8(UnkActorInner*, f32, f32, f32, f32); -f32 func_802AE1C0(f32, f32, f32); -s32 func_802AEE1C(s16, s16, s16, s16, s16, s16, s16, s16); -s32 func_802AF0FC(s16, s16, s16, s16, u16); -void func_802AF314(); -void func_802AF588(s32); -void func_802AF5AC(s32, s8); -void func_802AF5D8(u32, s8, s32); -void func_802AF7B4(uintptr_t, s32, s32); -void func_802AF8BC(uintptr_t, s8, u8, u8, u8); -void func_802AF9F0(Vec3f, f32, Vec3f); // main.c extern struct D_80150158 gD_80150158[]; diff --git a/src/profiler.c b/src/profiler.c index 05b7fd424..dd674fc40 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -7,11 +7,14 @@ struct ProfilerFrameData gProfilerFrameData[2]; extern u32 D_800DC568; extern u32 D_800DC56C; -extern s16 D_800DC664; -extern s16 D_800DC668; // gCurrentFrameIndex1? -extern s16 D_800DC66C; // gCurrentFrameIndex2? extern Gfx *gDisplayListHead; +s32 gEnableResourceMeters = 0; + +s16 D_800DC664 = 0; +s16 D_800DC668 = 1; +s16 D_800DC66C = 0; + void profiler_log_thread5_time(enum ProfilerGameEvent eventID) { gProfilerFrameData[D_800DC668].gameTimes[eventID] = osGetTime(); diff --git a/src/profiler.h b/src/profiler.h index a291bd408..567f302be 100644 --- a/src/profiler.h +++ b/src/profiler.h @@ -45,4 +45,6 @@ void profiler_log_gfx_time(enum ProfilerGfxEvent eventID); void profiler_log_vblank_time(void); void draw_profiler(void); +extern s32 gEnableResourceMeters; + #endif /* PROFILER_H */ diff --git a/src/render_courses.c b/src/render_courses.c index d3f07441e..a8025e635 100644 --- a/src/render_courses.c +++ b/src/render_courses.c @@ -8,6 +8,7 @@ #include "math_util.h" #include "memory.h" #include "code_80281780.h" +#include "code_802AAA70.h" #include "render_courses.h" f32 gFloatArray802B8790[] = { diff --git a/src/skybox_and_splitscreen.c b/src/skybox_and_splitscreen.c index 384e8b1e7..fd3dc97a9 100644 --- a/src/skybox_and_splitscreen.c +++ b/src/skybox_and_splitscreen.c @@ -515,22 +515,6 @@ void func_802A4A0C(Vtx *arg0, struct UnkStruct_800DC5EC *arg1, s32 arg2, s32 arg GLOBAL_ASM("asm/non_matchings/skybox/func_802A4A0C.s") #endif -#ifdef NEEDS_RODATA -//generated by m2c commit 9841ff34ca242f5f14b2eab2b54a7a65ac47d80f -// data/data_121DA0_2_2.s -// jtbl_802B9BB8 -extern f32 D_802B9BB4;// = 6800.0f; -extern f32 D_802B9C04;// = 2700.0f; -extern f32 D_802B9C08;// = 1500.0f; -extern f32 D_802B9C0C;// = 5000.0f; -extern f32 D_802B9C10;// = 4500.0f; -extern f32 D_802B9C14;// = 7000.0f; -extern f32 D_802B9C18;// = 6800.0f; -extern f32 D_802B9C1C;// = 1.3333334f; -extern f32 D_802B9C20;// = 0.6666667f; -extern f32 D_802B9C24;// = 2.6666667f; -extern f32 D_802B9C28;// = 1.3333334f; - void func_802A4D18(void) { f32 var_f10; @@ -584,22 +568,19 @@ void func_802A4D18(void) { } switch (gScreenModeSelection) { /* switch 1; irregular */ case SCREEN_MODE_1P: /* switch 1 */ - D_80150148 = 1.333333f; + D_80150148 = 1.33333334f; return; case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: /* switch 1 */ - D_80150148 = 2.666666f; + D_80150148 = 0.66666667f; return; case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: /* switch 1 */ - D_80150148 = 0.666666f; + D_80150148 = 2.66666667f; return; case SCREEN_MODE_3P_4P_SPLITSCREEN: /* switch 1 */ - D_80150148 = 1.333333f; + D_80150148 = 1.33333334f; return; } } -#else -GLOBAL_ASM("asm/non_matchings/skybox/func_802A4D18.s") -#endif void func_802A4EF4(void) { switch(gActiveScreenMode) { diff --git a/src/spawn_players.c b/src/spawn_players.c index 22b5093ff..990ac5409 100644 --- a/src/spawn_players.c +++ b/src/spawn_players.c @@ -9,6 +9,7 @@ #include "math_util.h" #include "code_80027D00.h" #include "code_80057C60.h" +#include "code_802AAA70.h" #include "render_courses.h" #include "spawn_players.h" diff --git a/src/spawn_players.h b/src/spawn_players.h index a62cb2675..6853efb91 100644 --- a/src/spawn_players.h +++ b/src/spawn_players.h @@ -26,8 +26,6 @@ void func_8003D080(); void func_8003DB5C(); extern s16 D_80165560[]; -extern s32* D_800E3C50[]; -extern u16* D_800E3890[]; extern s16 D_80165340; diff --git a/tools/asm_processor/asm_processor.py b/tools/asm_processor/asm_processor.py index c750890d6..3c295a556 100644 --- a/tools/asm_processor/asm_processor.py +++ b/tools/asm_processor/asm_processor.py @@ -628,7 +628,7 @@ class GlobalAsmBlock: self.add_sized(self.count_quoted_size(line, z, real_line, output_enc), real_line) elif line.startswith('.byte'): self.add_sized(len(line.split(',')), real_line) - elif line.startswith('.half'): + elif line.startswith('.half') or line.startswith('.hword'): self.align2() self.add_sized(2*len(line.split(',')), real_line) elif line.startswith('.'):