From 84f211a2ae90f60002c7a7820853fb88b9c359fe Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 22:56:47 -0400 Subject: [PATCH 01/10] First pass --- asm/header.s | 30 +- .../code_1000_len_60/entry_point.s | 4 +- .../code_1060_len_310/func_80025C60.s | 4 +- .../code_1060_len_310/func_80025D74.s | 12 +- asm/nonmatchings/code_135EE0/func_80242BAC.s | 4 +- asm/nonmatchings/code_135EE0/func_80242D04.s | 4 +- asm/nonmatchings/code_135EE0/func_80242F90.s | 4 +- asm/nonmatchings/code_135EE0/func_80242FBC.s | 4 +- asm/nonmatchings/code_135EE0/func_80242FF4.s | 4 +- asm/nonmatchings/code_135EE0/func_80243090.s | 4 +- asm/nonmatchings/code_135EE0/func_802430E4.s | 4 +- asm/nonmatchings/code_135EE0/func_8024313C.s | 4 +- asm/nonmatchings/code_135EE0/func_80243188.s | 4 +- asm/nonmatchings/code_135EE0/func_80243238.s | 4 +- asm/nonmatchings/code_135EE0/func_802432E8.s | 4 +- asm/nonmatchings/code_135EE0/func_80243388.s | 4 +- asm/nonmatchings/code_135EE0/pause_init.s | 4 +- .../code_135EE0/pause_tabs_update.s | 8 +- .../code_1370_len_7d0/boot_main.s | 73 +- .../code_1370_len_7d0/func_80026164.s | 4 +- .../code_1370_len_7d0/gfxRetrace_Callback.s | 73 ++ asm/nonmatchings/code_163400/func_80242E00.s | 4 +- asm/nonmatchings/code_163400/func_8024330C.s | 4 +- asm/nonmatchings/code_163400/func_80243380.s | 4 +- asm/nonmatchings/code_163400/func_802433F4.s | 4 +- asm/nonmatchings/code_163400/func_80243468.s | 4 +- asm/nonmatchings/code_163400/func_80243550.s | 4 +- asm/nonmatchings/code_163400/func_802435C4.s | 4 +- asm/nonmatchings/code_163400/func_80243628.s | 4 +- asm/nonmatchings/code_163400/func_8024368C.s | 4 +- asm/nonmatchings/code_163400/func_802436F0.s | 4 +- asm/nonmatchings/code_163400/func_80243754.s | 4 +- asm/nonmatchings/code_163400/func_802437B8.s | 4 +- asm/nonmatchings/code_163400/func_8024381C.s | 4 +- asm/nonmatchings/code_163400/func_80243898.s | 4 +- asm/nonmatchings/code_163400/func_80243908.s | 4 +- asm/nonmatchings/code_163400/func_80243B10.s | 4 +- asm/nonmatchings/code_163400/func_80243CCC.s | 4 +- asm/nonmatchings/code_163400/func_80243EEC.s | 4 +- asm/nonmatchings/code_163400/func_80245808.s | 16 +- asm/nonmatchings/code_163400/func_80245A40.s | 40 +- asm/nonmatchings/code_167570/func_802471EC.s | 32 +- asm/nonmatchings/code_168590/func_80248170.s | 4 +- asm/nonmatchings/code_168590/func_80248A80.s | 8 +- asm/nonmatchings/code_168590/func_80248BF4.s | 16 +- .../code_16c8e0/draw_main_battle_ui.s | 2 +- asm/nonmatchings/code_16c8e0/func_8023F088.s | 4 +- asm/nonmatchings/code_16c8e0/func_80246B2C.s | 6 + asm/nonmatchings/code_16c8e0/pause_cleanup.s | 6 + .../code_1a1f0_len_5390/func_80041F10.s | 4 +- .../code_1b40_len_20b0/func_80027E10.s | 12 +- .../code_25f00_len_940/func_8004AE08.s | 4 +- asm/nonmatchings/code_316d90/func_802AE000.s | 8 +- .../code_3bf0_len_6f0/update_input.s | 144 ++-- .../code_42e0_len_1f60/func_80029860.s | 4 +- .../code_8230_len_1ae0/func_8002D160.s | 16 +- .../code_8230_len_1ae0/nuSiMgrInit.s | 4 +- .../code_a5dd0_len_114e0/AssignAreaFlag.s | 4 +- .../code_a5dd0_len_114e0/AssignBlockFlag.s | 4 +- .../code_a5dd0_len_114e0/AssignCrateFlag.s | 4 +- .../code_a5dd0_len_114e0/AssignPanelFlag.s | 4 +- .../code_a5dd0_len_114e0/AssignScript.s | 4 +- .../code_a5dd0_len_114e0/MakeEntity.s | 4 +- .../code_a5dd0_len_114e0/func_80111E9C.s | 4 +- .../code_a5dd0_len_114e0/func_80111F2C.s | 4 +- .../code_a5dd0_len_114e0/func_8011C80C.s | 4 +- .../code_a5dd0_len_114e0/func_8011CFBC.s | 4 +- .../update_item_entity_temp.s | 12 +- .../code_cd180_len_38f0/func_80138E54.s | 16 +- .../code_d5a50_len_5fd0/func_80143C48.s | 4 +- .../code_ddaf0_len_c50/func_80147414.s | 4 +- .../code_ddaf0_len_c50/func_80147474.s | 4 +- .../code_ddaf0_len_c50/func_80147574.s | 4 +- .../code_ddaf0_len_c50/func_80147650.s | 4 +- .../code_ddaf0_len_c50/func_80147698.s | 8 +- .../code_ddaf0_len_c50/func_80147AC4.s | 4 +- .../code_ddaf0_len_c50/func_80147D70.s | 8 +- .../code_ddaf0_len_c50/func_80147E48.s | 4 +- .../code_ddaf0_len_c50/func_80147E7C.s | 4 +- .../code_ddaf0_len_c50/func_80147EC4.s | 4 +- .../code_ddaf0_len_c50/func_80147F30.s | 4 +- .../set_ui_panel_properties.s | 4 +- .../code_e79b0_len_1920/func_802C39F8.s | 12 +- .../code_e79b0_len_1920/start_child_script.s | 12 +- .../code_e79b0_len_1920/start_script.s | 12 +- .../start_script_in_group.s | 12 +- .../code_e79b0_len_1920/update_scripts.s | 4 +- .../os/code_39cb0_len_100/nuBoot.s | 4 +- .../os/code_3b4a0_len_270/nuGfxThread.s | 12 +- .../code_3b4a0_len_270/nuPiReadRomOverlay.s | 4 +- .../os/code_3b910_len_410/contQuery.s | 4 +- .../os/code_3b910_len_410/contReadData.s | 8 +- .../os/code_3b910_len_410/contReadNW.s | 12 +- .../os/code_3b910_len_410/contRetrace.s | 12 +- .../os/code_43200_len_7c0/__osMotorAccess.s | 1 - .../os/code_45a50_len_3a0/osInitialize.s | 4 +- .../os/code_45df0_len_970/IP6_Hdlr.s | 7 - .../os/code_45df0_len_970/IP7_Hdlr.s | 7 - .../os/code_45df0_len_970/NoMoreRcpInts.s | 7 - asm/nonmatchings/os/code_45df0_len_970/ai.s | 15 - asm/nonmatchings/os/code_45df0_len_970/cart.s | 23 - .../os/code_45df0_len_970/counter.s | 13 - asm/nonmatchings/os/code_45df0_len_970/dp.s | 13 - .../os/code_45df0_len_970/endrcp.s | 44 -- .../os/code_45df0_len_970/enqueueRunning.s | 10 - .../os/code_45df0_len_970/firstnmi.s | 17 - .../os/code_45df0_len_970/func_8006A9F0.s | 8 - .../os/code_45df0_len_970/handle_CPU.s | 17 - .../os/code_45df0_len_970/handle_break.s | 10 - .../os/code_45df0_len_970/handle_interrupt.s | 5 - .../os/code_45df0_len_970/next_interrupt.s | 19 - .../os/code_45df0_len_970/noEnqueue.s | 6 - .../os/code_45df0_len_970/osCleanupThread.s | 8 - .../os/code_45df0_len_970/osDispatchThread.s | 100 --- .../os/code_45df0_len_970/osEnqueueAndYield.s | 71 -- .../os/code_45df0_len_970/osEnqueueThread.s | 24 - .../code_45df0_len_970/osExceptionPreamble.s | 17 - .../os/code_45df0_len_970/osNop.s | 6 - .../os/code_45df0_len_970/osPopThread.s | 8 - .../os/code_45df0_len_970/panic.s | 16 - asm/nonmatchings/os/code_45df0_len_970/pi.s | 27 - .../os/code_45df0_len_970/prenmi.s | 16 - asm/nonmatchings/os/code_45df0_len_970/rcp.s | 29 - .../os/code_45df0_len_970/redispatch.s | 17 - .../os/code_45df0_len_970/savecontext.s | 68 -- .../os/code_45df0_len_970/savercp.s | 18 - .../os/code_45df0_len_970/send_done.s | 35 - .../os/code_45df0_len_970/send_mesg.s | 22 - asm/nonmatchings/os/code_45df0_len_970/si.s | 14 - .../os/code_45df0_len_970/sp_other_break.s | 8 - asm/nonmatchings/os/code_45df0_len_970/sw1.s | 13 - asm/nonmatchings/os/code_45df0_len_970/sw2.s | 13 - asm/nonmatchings/os/code_45df0_len_970/vi.s | 14 - .../os/code_47e90_len_110/osViInit.s | 4 +- .../os/code_7e40_len_3f0/nuGfxTaskMgr.s | 8 +- .../os/code_7e40_len_3f0/nuGfxTaskMgrInit.s | 4 +- .../os/code_7e40_len_3f0/nuGfxTaskStart.s | 8 +- .../os/nusys/nuContPakMgr/contRmbControl.s | 141 ++++ .../os/nusys/nuContRmbMgr/func_8005FB10.s | 109 +++ .../nuContRmbMgr/nuContRmbMgrInit.s | 4 +- .../os/{ => nusys}/nuGfxSetCfb/nuGfxSetCfb.s | 0 .../nuSched}/nuScEventHandler.s | 12 +- .../nuSched}/nuScExecuteAudio.s | 4 +- .../nuSched}/nuScExecuteGraphics.s | 5 +- .../nuSched}/nuScGetAudioMQ.s | 0 .../nuSched}/nuScGetFrameRate.s | 0 .../nuSched}/nuScGetGfxMQ.s | 0 .../nuSched}/nuScSetFrameBufferNum.s | 0 .../nuSched}/nuScWaitTaskReady.s | 0 asm/os/code_45df0_len_970.s | 660 ++++++++++++++++++ src/code_1370_len_7d0.c | 2 + src/os/code_45df0_len_970.c | 75 -- src/os/nusys/nuContRmbMgr.c | 2 +- src/os/nusys/nuGfxSetCfb.c | 2 +- src/os/nusys/nuSched.c | 16 +- tools/splat.yaml | 4 +- tools/{func_addrs.txt => symbol_addrs.txt} | 54 +- undefined_funcs.txt | 3 + 158 files changed, 1424 insertions(+), 1361 deletions(-) create mode 100644 asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s create mode 100644 asm/nonmatchings/code_16c8e0/func_80246B2C.s create mode 100644 asm/nonmatchings/code_16c8e0/pause_cleanup.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/ai.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/cart.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/counter.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/dp.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/endrcp.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/firstnmi.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/handle_break.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/osNop.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/osPopThread.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/panic.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/pi.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/prenmi.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/rcp.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/redispatch.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/savecontext.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/savercp.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/send_done.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/send_mesg.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/si.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/sw1.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/sw2.s delete mode 100644 asm/nonmatchings/os/code_45df0_len_970/vi.s create mode 100644 asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s create mode 100644 asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s rename asm/nonmatchings/os/{ => nusys}/nuContRmbMgr/nuContRmbMgrInit.s (90%) rename asm/nonmatchings/os/{ => nusys}/nuGfxSetCfb/nuGfxSetCfb.s (100%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScEventHandler.s (90%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScExecuteAudio.s (97%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScExecuteGraphics.s (96%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScGetAudioMQ.s (100%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScGetFrameRate.s (100%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScGetGfxMQ.s (100%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScSetFrameBufferNum.s (100%) rename asm/nonmatchings/os/{code_39db0_len_8a0 => nusys/nuSched}/nuScWaitTaskReady.s (100%) create mode 100644 asm/os/code_45df0_len_970.s delete mode 100644 src/os/code_45df0_len_970.c rename tools/{func_addrs.txt => symbol_addrs.txt} (98%) create mode 100644 undefined_funcs.txt diff --git a/asm/header.s b/asm/header.s index fc11460090..5f7c867390 100644 --- a/asm/header.s +++ b/asm/header.s @@ -1,16 +1,16 @@ -.section .text_0, "a" -.byte 0x80, 0x37, 0x12, 0x40 # PI BSD Domain 1 register -.word 0x0000000F # clock rate setting -.word 0x80125C00 # entry point -.word 0x0000144B # release -.word 0x65EEE53A # checksum1 -.word 0xED7D733C # checksum2 -.word 0x00000000 # unknown -.word 0x00000000 # unknown -.ascii "PAPER MARIO " # ROM name: 20 bytes -.word 0x00000000 # unknown -.word 0x0000004E # cartridge -.ascii "MQ" # cartridge ID -.ascii "E" # country -.byte 0x00 # version +.section .header, "a" +.word 0x80371240 /* PI PSD Domain 1 register */ +.word 0x0000000F /* Clockrate setting */ +.word 0x80125C00 /* Entrypoint address */ +.word 0x0000144B /* Revision */ +.word 0x65EEE53A /* Checksum 1 */ +.word 0xED7D733C /* Checksum 2 */ +.word 0x00000000 /* Unknown 1 */ +.word 0x00000000 /* Unknown 2 */ +.ascii "PAPER MARIO " /* Internal ROM name */ +.word 0x00000000 /* Unknown 3 */ +.word 0x0000004E /* Cartridge */ +.ascii "MQ" /* Cartridge ID */ +.ascii "E" /* Country code */ +.byte 00 /* Version */ diff --git a/asm/nonmatchings/code_1000_len_60/entry_point.s b/asm/nonmatchings/code_1000_len_60/entry_point.s index 470ca54998..bb2aea4940 100644 --- a/asm/nonmatchings/code_1000_len_60/entry_point.s +++ b/asm/nonmatchings/code_1000_len_60/entry_point.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel entry_point -/* 1000 80025C00 3C08800A */ lui $t0, 0x800a -/* 1004 80025C04 2508A5B0 */ addiu $t0, $t0, -0x5a50 +/* 1000 80025C00 3C08800A */ lui $t0, %hi(D_8009A5B0) +/* 1004 80025C04 2508A5B0 */ addiu $t0, $t0, %lo(D_8009A5B0) /* 1008 80025C08 3C090004 */ lui $t1, 4 /* 100C 80025C0C 25291F50 */ addiu $t1, $t1, 0x1f50 .L80025C10: diff --git a/asm/nonmatchings/code_1060_len_310/func_80025C60.s b/asm/nonmatchings/code_1060_len_310/func_80025C60.s index 1187c728ff..f57ce2f17f 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025C60.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025C60.s @@ -6,8 +6,8 @@ glabel func_80025C60 /* 1064 80025C64 3C05B3FF */ lui $a1, 0xb3ff /* 1068 80025C68 34A50014 */ ori $a1, $a1, 0x14 /* 106C 80025C6C AFB00010 */ sw $s0, 0x10($sp) -/* 1070 80025C70 3C10800A */ lui $s0, 0x800a -/* 1074 80025C74 2610A638 */ addiu $s0, $s0, -0x59c8 +/* 1070 80025C70 3C10800A */ lui $s0, %hi(carthandle) +/* 1074 80025C74 2610A638 */ addiu $s0, $s0, %lo(carthandle) /* 1078 80025C78 AFBF0014 */ sw $ra, 0x14($sp) /* 107C 80025C7C 8E040000 */ lw $a0, ($s0) /* 1080 80025C80 0C018358 */ jal osEPiWriteIo diff --git a/asm/nonmatchings/code_1060_len_310/func_80025D74.s b/asm/nonmatchings/code_1060_len_310/func_80025D74.s index 829c8059c7..ed05a829a7 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025D74.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025D74.s @@ -9,8 +9,8 @@ glabel func_80025D74 /* 1184 80025D84 00C0A02D */ daddu $s4, $a2, $zero /* 1188 80025D88 3C05B3FF */ lui $a1, 0xb3ff /* 118C 80025D8C AFB1001C */ sw $s1, 0x1c($sp) -/* 1190 80025D90 3C11800A */ lui $s1, 0x800a -/* 1194 80025D94 2631A638 */ addiu $s1, $s1, -0x59c8 +/* 1190 80025D90 3C11800A */ lui $s1, %hi(carthandle) +/* 1194 80025D94 2631A638 */ addiu $s1, $s1, %lo(carthandle) /* 1198 80025D98 AFB00018 */ sw $s0, 0x18($sp) /* 119C 80025D9C 27B00010 */ addiu $s0, $sp, 0x10 /* 11A0 80025DA0 AFBF003C */ sw $ra, 0x3c($sp) @@ -66,8 +66,8 @@ glabel func_80025D74 /* 1260 80025E60 37DEFFFC */ ori $fp, $fp, 0xfffc /* 1264 80025E64 3C17B3FF */ lui $s7, 0xb3ff /* 1268 80025E68 36F70020 */ ori $s7, $s7, 0x20 -/* 126C 80025E6C 3C15800A */ lui $s5, 0x800a -/* 1270 80025E70 26B5A638 */ addiu $s5, $s5, -0x59c8 +/* 126C 80025E6C 3C15800A */ lui $s5, %hi(carthandle) +/* 1270 80025E70 26B5A638 */ addiu $s5, $s5, %lo(carthandle) /* 1274 80025E74 3C16FFFF */ lui $s6, 0xffff /* 1278 80025E78 36D60020 */ ori $s6, $s6, 0x20 .L80025E7C: @@ -104,8 +104,8 @@ glabel func_80025D74 /* 12F0 80025EF0 1680FFE2 */ bnez $s4, .L80025E7C /* 12F4 80025EF4 26730001 */ addiu $s3, $s3, 1 .L80025EF8: -/* 12F8 80025EF8 3C04800A */ lui $a0, 0x800a -/* 12FC 80025EFC 8C84A638 */ lw $a0, -0x59c8($a0) +/* 12F8 80025EF8 3C04800A */ lui $a0, %hi(carthandle) +/* 12FC 80025EFC 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 1300 80025F00 3C05B3FF */ lui $a1, 0xb3ff /* 1304 80025F04 34A50014 */ ori $a1, $a1, 0x14 /* 1308 80025F08 0C018358 */ jal osEPiWriteIo diff --git a/asm/nonmatchings/code_135EE0/func_80242BAC.s b/asm/nonmatchings/code_135EE0/func_80242BAC.s index 94df5b6b7a..90a8f02ff0 100644 --- a/asm/nonmatchings/code_135EE0/func_80242BAC.s +++ b/asm/nonmatchings/code_135EE0/func_80242BAC.s @@ -8,8 +8,8 @@ glabel func_80242BAC /* 135EF8 80242BB8 AFB3001C */ sw $s3, 0x1c($sp) /* 135EFC 80242BBC 00C0982D */ daddu $s3, $a2, $zero /* 135F00 80242BC0 AFB40020 */ sw $s4, 0x20($sp) -/* 135F04 80242BC4 3C148016 */ lui $s4, 0x8016 -/* 135F08 80242BC8 26949D50 */ addiu $s4, $s4, -0x62b0 +/* 135F04 80242BC4 3C148016 */ lui $s4, %hi(D_80159D50) +/* 135F08 80242BC8 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) /* 135F0C 80242BCC 00042140 */ sll $a0, $a0, 5 /* 135F10 80242BD0 AFB20018 */ sw $s2, 0x18($sp) /* 135F14 80242BD4 3C128025 */ lui $s2, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/func_80242D04.s b/asm/nonmatchings/code_135EE0/func_80242D04.s index cc6fbe8c42..1a84a1331e 100644 --- a/asm/nonmatchings/code_135EE0/func_80242D04.s +++ b/asm/nonmatchings/code_135EE0/func_80242D04.s @@ -8,8 +8,8 @@ glabel func_80242D04 /* 136050 80242D10 AFB3001C */ sw $s3, 0x1c($sp) /* 136054 80242D14 00C0982D */ daddu $s3, $a2, $zero /* 136058 80242D18 AFB40020 */ sw $s4, 0x20($sp) -/* 13605C 80242D1C 3C148016 */ lui $s4, 0x8016 -/* 136060 80242D20 26949D50 */ addiu $s4, $s4, -0x62b0 +/* 13605C 80242D1C 3C148016 */ lui $s4, %hi(D_80159D50) +/* 136060 80242D20 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) /* 136064 80242D24 00042140 */ sll $a0, $a0, 5 /* 136068 80242D28 AFB10014 */ sw $s1, 0x14($sp) /* 13606C 80242D2C 3C118025 */ lui $s1, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/func_80242F90.s b/asm/nonmatchings/code_135EE0/func_80242F90.s index 3e8ab0814d..42eec96db7 100644 --- a/asm/nonmatchings/code_135EE0/func_80242F90.s +++ b/asm/nonmatchings/code_135EE0/func_80242F90.s @@ -6,8 +6,8 @@ glabel func_80242F90 /* 1362D4 80242F94 8FA30028 */ lw $v1, 0x28($sp) /* 1362D8 80242F98 00042140 */ sll $a0, $a0, 5 /* 1362DC 80242F9C AC620000 */ sw $v0, ($v1) -/* 1362E0 80242FA0 3C028016 */ lui $v0, 0x8016 -/* 1362E4 80242FA4 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 1362E0 80242FA0 3C028016 */ lui $v0, %hi(D_80159D50) +/* 1362E4 80242FA4 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 1362E8 80242FA8 00822021 */ addu $a0, $a0, $v0 /* 1362EC 80242FAC 90820000 */ lbu $v0, ($a0) /* 1362F0 80242FB0 304200F3 */ andi $v0, $v0, 0xf3 diff --git a/asm/nonmatchings/code_135EE0/func_80242FBC.s b/asm/nonmatchings/code_135EE0/func_80242FBC.s index 599a9f8c4a..8e09144dd8 100644 --- a/asm/nonmatchings/code_135EE0/func_80242FBC.s +++ b/asm/nonmatchings/code_135EE0/func_80242FBC.s @@ -9,8 +9,8 @@ glabel func_80242FBC /* 13630C 80242FCC AC620000 */ sw $v0, ($v1) /* 136310 80242FD0 24020050 */ addiu $v0, $zero, 0x50 /* 136314 80242FD4 ACA20000 */ sw $v0, ($a1) -/* 136318 80242FD8 3C028016 */ lui $v0, 0x8016 -/* 13631C 80242FDC 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 136318 80242FD8 3C028016 */ lui $v0, %hi(D_80159D50) +/* 13631C 80242FDC 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 136320 80242FE0 00822021 */ addu $a0, $a0, $v0 /* 136324 80242FE4 90820000 */ lbu $v0, ($a0) /* 136328 80242FE8 304200F3 */ andi $v0, $v0, 0xf3 diff --git a/asm/nonmatchings/code_135EE0/func_80242FF4.s b/asm/nonmatchings/code_135EE0/func_80242FF4.s index 4f71c7bef5..c67e046e6a 100644 --- a/asm/nonmatchings/code_135EE0/func_80242FF4.s +++ b/asm/nonmatchings/code_135EE0/func_80242FF4.s @@ -3,8 +3,8 @@ glabel func_80242FF4 /* 136334 80242FF4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 136338 80242FF8 3C038016 */ lui $v1, 0x8016 -/* 13633C 80242FFC 24639D50 */ addiu $v1, $v1, -0x62b0 +/* 136338 80242FF8 3C038016 */ lui $v1, %hi(D_80159D50) +/* 13633C 80242FFC 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* 136340 80243000 00041140 */ sll $v0, $a0, 5 /* 136344 80243004 AFB00010 */ sw $s0, 0x10($sp) /* 136348 80243008 00438021 */ addu $s0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/func_80243090.s b/asm/nonmatchings/code_135EE0/func_80243090.s index 84250668f7..ca51a0a82b 100644 --- a/asm/nonmatchings/code_135EE0/func_80243090.s +++ b/asm/nonmatchings/code_135EE0/func_80243090.s @@ -3,8 +3,8 @@ glabel func_80243090 /* 1363D0 80243090 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1363D4 80243094 3C028016 */ lui $v0, 0x8016 -/* 1363D8 80243098 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 1363D4 80243094 3C028016 */ lui $v0, %hi(D_80159D50) +/* 1363D8 80243098 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 1363DC 8024309C 00041940 */ sll $v1, $a0, 5 /* 1363E0 802430A0 AFB00010 */ sw $s0, 0x10($sp) /* 1363E4 802430A4 00628021 */ addu $s0, $v1, $v0 diff --git a/asm/nonmatchings/code_135EE0/func_802430E4.s b/asm/nonmatchings/code_135EE0/func_802430E4.s index c8a4ec3552..ff476afe6a 100644 --- a/asm/nonmatchings/code_135EE0/func_802430E4.s +++ b/asm/nonmatchings/code_135EE0/func_802430E4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802430E4 -/* 136424 802430E4 3C028016 */ lui $v0, 0x8016 -/* 136428 802430E8 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 136424 802430E4 3C028016 */ lui $v0, %hi(D_80159D50) +/* 136428 802430E8 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 13642C 802430EC 00042140 */ sll $a0, $a0, 5 /* 136430 802430F0 00822021 */ addu $a0, $a0, $v0 /* 136434 802430F4 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_8024313C.s b/asm/nonmatchings/code_135EE0/func_8024313C.s index 6ccf07738b..121d8f1a63 100644 --- a/asm/nonmatchings/code_135EE0/func_8024313C.s +++ b/asm/nonmatchings/code_135EE0/func_8024313C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024313C -/* 13647C 8024313C 3C028016 */ lui $v0, 0x8016 -/* 136480 80243140 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 13647C 8024313C 3C028016 */ lui $v0, %hi(D_80159D50) +/* 136480 80243140 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 136484 80243144 00042140 */ sll $a0, $a0, 5 /* 136488 80243148 00822021 */ addu $a0, $a0, $v0 /* 13648C 8024314C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_80243188.s b/asm/nonmatchings/code_135EE0/func_80243188.s index 49f485084b..9846e0494a 100644 --- a/asm/nonmatchings/code_135EE0/func_80243188.s +++ b/asm/nonmatchings/code_135EE0/func_80243188.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243188 -/* 1364C8 80243188 3C028016 */ lui $v0, 0x8016 -/* 1364CC 8024318C 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 1364C8 80243188 3C028016 */ lui $v0, %hi(D_80159D50) +/* 1364CC 8024318C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 1364D0 80243190 00042140 */ sll $a0, $a0, 5 /* 1364D4 80243194 00822021 */ addu $a0, $a0, $v0 /* 1364D8 80243198 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_80243238.s b/asm/nonmatchings/code_135EE0/func_80243238.s index 4cb4c4f708..c4eb8d00c1 100644 --- a/asm/nonmatchings/code_135EE0/func_80243238.s +++ b/asm/nonmatchings/code_135EE0/func_80243238.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243238 -/* 136578 80243238 3C028016 */ lui $v0, 0x8016 -/* 13657C 8024323C 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 136578 80243238 3C028016 */ lui $v0, %hi(D_80159D50) +/* 13657C 8024323C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 136580 80243240 00042140 */ sll $a0, $a0, 5 /* 136584 80243244 00822021 */ addu $a0, $a0, $v0 /* 136588 80243248 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_802432E8.s b/asm/nonmatchings/code_135EE0/func_802432E8.s index aa296ce7e9..650da83a89 100644 --- a/asm/nonmatchings/code_135EE0/func_802432E8.s +++ b/asm/nonmatchings/code_135EE0/func_802432E8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802432E8 -/* 136628 802432E8 3C028016 */ lui $v0, 0x8016 -/* 13662C 802432EC 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 136628 802432E8 3C028016 */ lui $v0, %hi(D_80159D50) +/* 13662C 802432EC 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 136630 802432F0 00042140 */ sll $a0, $a0, 5 /* 136634 802432F4 00822021 */ addu $a0, $a0, $v0 /* 136638 802432F8 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/func_80243388.s b/asm/nonmatchings/code_135EE0/func_80243388.s index 122104da08..a32a8c4050 100644 --- a/asm/nonmatchings/code_135EE0/func_80243388.s +++ b/asm/nonmatchings/code_135EE0/func_80243388.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243388 -/* 1366C8 80243388 3C028016 */ lui $v0, 0x8016 -/* 1366CC 8024338C 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 1366C8 80243388 3C028016 */ lui $v0, %hi(D_80159D50) +/* 1366CC 8024338C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 1366D0 80243390 00042140 */ sll $a0, $a0, 5 /* 1366D4 80243394 00822021 */ addu $a0, $a0, $v0 /* 1366D8 80243398 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_135EE0/pause_init.s b/asm/nonmatchings/code_135EE0/pause_init.s index c0061728db..27c9badbb3 100644 --- a/asm/nonmatchings/code_135EE0/pause_init.s +++ b/asm/nonmatchings/code_135EE0/pause_init.s @@ -81,8 +81,8 @@ glabel pause_init /* 1374C0 80244180 26100004 */ addiu $s0, $s0, 4 /* 1374C4 80244184 241400E1 */ addiu $s4, $zero, 0xe1 /* 1374C8 80244188 24110006 */ addiu $s1, $zero, 6 -/* 1374CC 8024418C 3C158016 */ lui $s5, 0x8016 -/* 1374D0 80244190 26B59D50 */ addiu $s5, $s5, -0x62b0 +/* 1374CC 8024418C 3C158016 */ lui $s5, %hi(D_80159D50) +/* 1374D0 80244190 26B59D50 */ addiu $s5, $s5, %lo(D_80159D50) /* 1374D4 80244194 241303C0 */ addiu $s3, $zero, 0x3c0 /* 1374D8 80244198 2412001E */ addiu $s2, $zero, 0x1e /* 1374DC 8024419C 3C108025 */ lui $s0, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_update.s b/asm/nonmatchings/code_135EE0/pause_tabs_update.s index 3f6eb5ef33..2c019dbf61 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_update.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_update.s @@ -114,8 +114,8 @@ glabel pause_tabs_update /* 138A90 80245750 24E7EF80 */ addiu $a3, $a3, -0x1080 /* 138A94 80245754 3C068025 */ lui $a2, 0x8025 /* 138A98 80245758 24C6F1D0 */ addiu $a2, $a2, -0xe30 -/* 138A9C 8024575C 3C058016 */ lui $a1, 0x8016 -/* 138AA0 80245760 24A59D50 */ addiu $a1, $a1, -0x62b0 +/* 138A9C 8024575C 3C058016 */ lui $a1, %hi(D_80159D50) +/* 138AA0 80245760 24A59D50 */ addiu $a1, $a1, %lo(D_80159D50) /* 138AA4 80245764 3C038025 */ lui $v1, 0x8025 /* 138AA8 80245768 2463F1E0 */ addiu $v1, $v1, -0xe20 /* 138AAC 8024576C 02061021 */ addu $v0, $s0, $a2 @@ -164,8 +164,8 @@ glabel pause_tabs_update /* 138B48 80245808 90420000 */ lbu $v0, ($v0) /* 138B4C 8024580C 50400017 */ beql $v0, $zero, .L8024586C /* 138B50 80245810 26100001 */ addiu $s0, $s0, 1 -/* 138B54 80245814 3C088016 */ lui $t0, 0x8016 -/* 138B58 80245818 25089D50 */ addiu $t0, $t0, -0x62b0 +/* 138B54 80245814 3C088016 */ lui $t0, %hi(D_80159D50) +/* 138B58 80245818 25089D50 */ addiu $t0, $t0, %lo(D_80159D50) /* 138B5C 8024581C 92220000 */ lbu $v0, ($s1) /* 138B60 80245820 82630001 */ lb $v1, 1($s3) /* 138B64 80245824 00021140 */ sll $v0, $v0, 5 diff --git a/asm/nonmatchings/code_1370_len_7d0/boot_main.s b/asm/nonmatchings/code_1370_len_7d0/boot_main.s index 781ff51d1d..3599e4726d 100644 --- a/asm/nonmatchings/code_1370_len_7d0/boot_main.s +++ b/asm/nonmatchings/code_1370_len_7d0/boot_main.s @@ -3,8 +3,8 @@ glabel boot_main /* 1370 80025F70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1374 80025F74 3C038000 */ lui $v1, 0x8000 -/* 1378 80025F78 8C630300 */ lw $v1, 0x300($v1) +/* 1374 80025F74 3C038000 */ lui $v1, %hi(osTvType) +/* 1378 80025F78 8C630300 */ lw $v1, %lo(osTvType)($v1) /* 137C 80025F7C 24020001 */ addiu $v0, $zero, 1 /* 1380 80025F80 14620005 */ bne $v1, $v0, .L80025F98 /* 1384 80025F84 AFBF0010 */ sw $ra, 0x10($sp) @@ -66,72 +66,3 @@ glabel boot_main .L80026054: /* 1454 80026054 08009815 */ j .L80026054 /* 1458 80026058 00000000 */ nop -/* 145C 8002605C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 1460 80026060 AFB10014 */ sw $s1, 0x14($sp) -/* 1464 80026064 3C118007 */ lui $s1, 0x8007 -/* 1468 80026068 26313E00 */ addiu $s1, $s1, 0x3e00 -/* 146C 8002606C AFBF0018 */ sw $ra, 0x18($sp) -/* 1470 80026070 AFB00010 */ sw $s0, 0x10($sp) -/* 1474 80026074 8E230000 */ lw $v1, ($s1) -/* 1478 80026078 10600022 */ beqz $v1, .L80026104 -/* 147C 8002607C 0080802D */ daddu $s0, $a0, $zero -/* 1480 80026080 24020001 */ addiu $v0, $zero, 1 -/* 1484 80026084 14620016 */ bne $v1, $v0, .L800260E0 -/* 1488 80026088 00000000 */ nop -/* 148C 8002608C 0C017CB4 */ jal nuGfxTaskAllEndWait -/* 1490 80026090 00000000 */ nop -/* 1494 80026094 16000012 */ bnez $s0, .L800260E0 -/* 1498 80026098 00000000 */ nop -/* 149C 8002609C 0C019A6C */ jal osViGetCurrentFramebuffer -/* 14A0 800260A0 00000000 */ nop -/* 14A4 800260A4 3C10800A */ lui $s0, 0x800a -/* 14A8 800260A8 2610A680 */ addiu $s0, $s0, -0x5980 -/* 14AC 800260AC 0200202D */ daddu $a0, $s0, $zero -/* 14B0 800260B0 AE020008 */ sw $v0, 8($s0) -/* 14B4 800260B4 AE020004 */ sw $v0, 4($s0) -/* 14B8 800260B8 AE020000 */ sw $v0, ($s0) -/* 14BC 800260BC 3C018007 */ lui $at, 0x8007 -/* 14C0 800260C0 AC223E04 */ sw $v0, 0x3e04($at) -/* 14C4 800260C4 0C017CBC */ jal nuGfxSetCfb -/* 14C8 800260C8 24050003 */ addiu $a1, $zero, 3 -/* 14CC 800260CC 8E040000 */ lw $a0, ($s0) -/* 14D0 800260D0 0C019C08 */ jal osViSwapBuffer -/* 14D4 800260D4 00000000 */ nop -/* 14D8 800260D8 24020002 */ addiu $v0, $zero, 2 -/* 14DC 800260DC AE220000 */ sw $v0, ($s1) -.L800260E0: -/* 14E0 800260E0 3C038007 */ lui $v1, 0x8007 -/* 14E4 800260E4 8C633E00 */ lw $v1, 0x3e00($v1) -/* 14E8 800260E8 24020002 */ addiu $v0, $zero, 2 -/* 14EC 800260EC 14620018 */ bne $v1, $v0, .L80026150 -/* 14F0 800260F0 00000000 */ nop -/* 14F4 800260F4 0C009859 */ jal func_80026164 -/* 14F8 800260F8 00000000 */ nop -/* 14FC 800260FC 08009854 */ j .L80026150 -/* 1500 80026100 00000000 */ nop -.L80026104: -/* 1504 80026104 3C038007 */ lui $v1, 0x8007 -/* 1508 80026108 24633E0A */ addiu $v1, $v1, 0x3e0a -/* 150C 8002610C 94620000 */ lhu $v0, ($v1) -/* 1510 80026110 38420001 */ xori $v0, $v0, 1 -/* 1514 80026114 1440000E */ bnez $v0, .L80026150 -/* 1518 80026118 A4620000 */ sh $v0, ($v1) -/* 151C 8002611C 0C0099D0 */ jal step_game_loop -/* 1520 80026120 00000000 */ nop -/* 1524 80026124 3C038007 */ lui $v1, 0x8007 -/* 1528 80026128 24633E08 */ addiu $v1, $v1, 0x3e08 -/* 152C 8002612C 24020001 */ addiu $v0, $zero, 1 -/* 1530 80026130 A4620000 */ sh $v0, ($v1) -/* 1534 80026134 2A020003 */ slti $v0, $s0, 3 -/* 1538 80026138 10400005 */ beqz $v0, .L80026150 -/* 153C 8002613C 00000000 */ nop -/* 1540 80026140 0C009A7B */ jal func_800269EC -/* 1544 80026144 A4600000 */ sh $zero, ($v1) -/* 1548 80026148 0C009AC2 */ jal gfx_draw_frame -/* 154C 8002614C 00000000 */ nop -.L80026150: -/* 1550 80026150 8FBF0018 */ lw $ra, 0x18($sp) -/* 1554 80026154 8FB10014 */ lw $s1, 0x14($sp) -/* 1558 80026158 8FB00010 */ lw $s0, 0x10($sp) -/* 155C 8002615C 03E00008 */ jr $ra -/* 1560 80026160 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s index 6fe9499b4a..117d235ced 100644 --- a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s +++ b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s @@ -48,8 +48,8 @@ glabel func_80026164 /* 1610 80026210 26100008 */ addiu $s0, $s0, 8 /* 1614 80026214 AE500000 */ sw $s0, ($s2) /* 1618 80026218 ACA20000 */ sw $v0, ($a1) -/* 161C 8002621C 3C02800A */ lui $v0, 0x800a -/* 1620 80026220 8C42A5DC */ lw $v0, -0x5a24($v0) +/* 161C 8002621C 3C02800A */ lui $v0, %hi(nuGfxZBuffer) +/* 1620 80026220 8C42A5DC */ lw $v0, %lo(nuGfxZBuffer)($v0) /* 1624 80026224 0220202D */ daddu $a0, $s1, $zero /* 1628 80026228 00431021 */ addu $v0, $v0, $v1 /* 162C 8002622C ACA20004 */ sw $v0, 4($a1) diff --git a/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s new file mode 100644 index 0000000000..cfb736f641 --- /dev/null +++ b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s @@ -0,0 +1,73 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel gfxRetrace_Callback +/* 145C 8002605C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 1460 80026060 AFB10014 */ sw $s1, 0x14($sp) +/* 1464 80026064 3C118007 */ lui $s1, 0x8007 +/* 1468 80026068 26313E00 */ addiu $s1, $s1, 0x3e00 +/* 146C 8002606C AFBF0018 */ sw $ra, 0x18($sp) +/* 1470 80026070 AFB00010 */ sw $s0, 0x10($sp) +/* 1474 80026074 8E230000 */ lw $v1, ($s1) +/* 1478 80026078 10600022 */ beqz $v1, .L80026104 +/* 147C 8002607C 0080802D */ daddu $s0, $a0, $zero +/* 1480 80026080 24020001 */ addiu $v0, $zero, 1 +/* 1484 80026084 14620016 */ bne $v1, $v0, .L800260E0 +/* 1488 80026088 00000000 */ nop +/* 148C 8002608C 0C017CB4 */ jal nuGfxTaskAllEndWait +/* 1490 80026090 00000000 */ nop +/* 1494 80026094 16000012 */ bnez $s0, .L800260E0 +/* 1498 80026098 00000000 */ nop +/* 149C 8002609C 0C019A6C */ jal osViGetCurrentFramebuffer +/* 14A0 800260A0 00000000 */ nop +/* 14A4 800260A4 3C10800A */ lui $s0, 0x800a +/* 14A8 800260A8 2610A680 */ addiu $s0, $s0, -0x5980 +/* 14AC 800260AC 0200202D */ daddu $a0, $s0, $zero +/* 14B0 800260B0 AE020008 */ sw $v0, 8($s0) +/* 14B4 800260B4 AE020004 */ sw $v0, 4($s0) +/* 14B8 800260B8 AE020000 */ sw $v0, ($s0) +/* 14BC 800260BC 3C018007 */ lui $at, 0x8007 +/* 14C0 800260C0 AC223E04 */ sw $v0, 0x3e04($at) +/* 14C4 800260C4 0C017CBC */ jal nuGfxSetCfb +/* 14C8 800260C8 24050003 */ addiu $a1, $zero, 3 +/* 14CC 800260CC 8E040000 */ lw $a0, ($s0) +/* 14D0 800260D0 0C019C08 */ jal osViSwapBuffer +/* 14D4 800260D4 00000000 */ nop +/* 14D8 800260D8 24020002 */ addiu $v0, $zero, 2 +/* 14DC 800260DC AE220000 */ sw $v0, ($s1) +.L800260E0: +/* 14E0 800260E0 3C038007 */ lui $v1, 0x8007 +/* 14E4 800260E4 8C633E00 */ lw $v1, 0x3e00($v1) +/* 14E8 800260E8 24020002 */ addiu $v0, $zero, 2 +/* 14EC 800260EC 14620018 */ bne $v1, $v0, .L80026150 +/* 14F0 800260F0 00000000 */ nop +/* 14F4 800260F4 0C009859 */ jal func_80026164 +/* 14F8 800260F8 00000000 */ nop +/* 14FC 800260FC 08009854 */ j .L80026150 +/* 1500 80026100 00000000 */ nop +.L80026104: +/* 1504 80026104 3C038007 */ lui $v1, 0x8007 +/* 1508 80026108 24633E0A */ addiu $v1, $v1, 0x3e0a +/* 150C 8002610C 94620000 */ lhu $v0, ($v1) +/* 1510 80026110 38420001 */ xori $v0, $v0, 1 +/* 1514 80026114 1440000E */ bnez $v0, .L80026150 +/* 1518 80026118 A4620000 */ sh $v0, ($v1) +/* 151C 8002611C 0C0099D0 */ jal step_game_loop +/* 1520 80026120 00000000 */ nop +/* 1524 80026124 3C038007 */ lui $v1, 0x8007 +/* 1528 80026128 24633E08 */ addiu $v1, $v1, 0x3e08 +/* 152C 8002612C 24020001 */ addiu $v0, $zero, 1 +/* 1530 80026130 A4620000 */ sh $v0, ($v1) +/* 1534 80026134 2A020003 */ slti $v0, $s0, 3 +/* 1538 80026138 10400005 */ beqz $v0, .L80026150 +/* 153C 8002613C 00000000 */ nop +/* 1540 80026140 0C009A7B */ jal func_800269EC +/* 1544 80026144 A4600000 */ sh $zero, ($v1) +/* 1548 80026148 0C009AC2 */ jal gfx_draw_frame +/* 154C 8002614C 00000000 */ nop +.L80026150: +/* 1550 80026150 8FBF0018 */ lw $ra, 0x18($sp) +/* 1554 80026154 8FB10014 */ lw $s1, 0x14($sp) +/* 1558 80026158 8FB00010 */ lw $s0, 0x10($sp) +/* 155C 8002615C 03E00008 */ jr $ra +/* 1560 80026160 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_163400/func_80242E00.s b/asm/nonmatchings/code_163400/func_80242E00.s index 4afea7341c..aab21f5ff2 100644 --- a/asm/nonmatchings/code_163400/func_80242E00.s +++ b/asm/nonmatchings/code_163400/func_80242E00.s @@ -8,8 +8,8 @@ glabel func_80242E00 /* 16366C 80242E0C AFB3001C */ sw $s3, 0x1c($sp) /* 163670 80242E10 00C0982D */ daddu $s3, $a2, $zero /* 163674 80242E14 AFB40020 */ sw $s4, 0x20($sp) -/* 163678 80242E18 3C148016 */ lui $s4, 0x8016 -/* 16367C 80242E1C 26949D50 */ addiu $s4, $s4, -0x62b0 +/* 163678 80242E18 3C148016 */ lui $s4, %hi(D_80159D50) +/* 16367C 80242E1C 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) /* 163680 80242E20 00042140 */ sll $a0, $a0, 5 /* 163684 80242E24 AFB10014 */ sw $s1, 0x14($sp) /* 163688 80242E28 3C118025 */ lui $s1, 0x8025 diff --git a/asm/nonmatchings/code_163400/func_8024330C.s b/asm/nonmatchings/code_163400/func_8024330C.s index 409df5ba46..4c05384b3a 100644 --- a/asm/nonmatchings/code_163400/func_8024330C.s +++ b/asm/nonmatchings/code_163400/func_8024330C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024330C -/* 163B6C 8024330C 3C028016 */ lui $v0, 0x8016 -/* 163B70 80243310 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163B6C 8024330C 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163B70 80243310 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163B74 80243314 00042140 */ sll $a0, $a0, 5 /* 163B78 80243318 00822021 */ addu $a0, $a0, $v0 /* 163B7C 8024331C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243380.s b/asm/nonmatchings/code_163400/func_80243380.s index 519baf5796..7d5ecd0e96 100644 --- a/asm/nonmatchings/code_163400/func_80243380.s +++ b/asm/nonmatchings/code_163400/func_80243380.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243380 -/* 163BE0 80243380 3C028016 */ lui $v0, 0x8016 -/* 163BE4 80243384 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163BE0 80243380 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163BE4 80243384 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163BE8 80243388 00042140 */ sll $a0, $a0, 5 /* 163BEC 8024338C 00822021 */ addu $a0, $a0, $v0 /* 163BF0 80243390 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802433F4.s b/asm/nonmatchings/code_163400/func_802433F4.s index 5f0a2a6b54..dc5c8d949d 100644 --- a/asm/nonmatchings/code_163400/func_802433F4.s +++ b/asm/nonmatchings/code_163400/func_802433F4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802433F4 -/* 163C54 802433F4 3C028016 */ lui $v0, 0x8016 -/* 163C58 802433F8 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163C54 802433F4 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163C58 802433F8 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163C5C 802433FC 00042140 */ sll $a0, $a0, 5 /* 163C60 80243400 00822021 */ addu $a0, $a0, $v0 /* 163C64 80243404 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243468.s b/asm/nonmatchings/code_163400/func_80243468.s index 66def808b7..2508991a8e 100644 --- a/asm/nonmatchings/code_163400/func_80243468.s +++ b/asm/nonmatchings/code_163400/func_80243468.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243468 -/* 163CC8 80243468 3C028016 */ lui $v0, 0x8016 -/* 163CCC 8024346C 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163CC8 80243468 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163CCC 8024346C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163CD0 80243470 00042140 */ sll $a0, $a0, 5 /* 163CD4 80243474 00822021 */ addu $a0, $a0, $v0 /* 163CD8 80243478 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243550.s b/asm/nonmatchings/code_163400/func_80243550.s index 12f262a71e..28b54e6ffb 100644 --- a/asm/nonmatchings/code_163400/func_80243550.s +++ b/asm/nonmatchings/code_163400/func_80243550.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243550 -/* 163DB0 80243550 3C028016 */ lui $v0, 0x8016 -/* 163DB4 80243554 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163DB0 80243550 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163DB4 80243554 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163DB8 80243558 00042140 */ sll $a0, $a0, 5 /* 163DBC 8024355C 00822021 */ addu $a0, $a0, $v0 /* 163DC0 80243560 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802435C4.s b/asm/nonmatchings/code_163400/func_802435C4.s index 7ebf6d3cf8..15d49436b8 100644 --- a/asm/nonmatchings/code_163400/func_802435C4.s +++ b/asm/nonmatchings/code_163400/func_802435C4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802435C4 -/* 163E24 802435C4 3C028016 */ lui $v0, 0x8016 -/* 163E28 802435C8 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163E24 802435C4 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163E28 802435C8 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163E2C 802435CC 00042140 */ sll $a0, $a0, 5 /* 163E30 802435D0 00822021 */ addu $a0, $a0, $v0 /* 163E34 802435D4 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243628.s b/asm/nonmatchings/code_163400/func_80243628.s index 8372430ec0..95b467d432 100644 --- a/asm/nonmatchings/code_163400/func_80243628.s +++ b/asm/nonmatchings/code_163400/func_80243628.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243628 -/* 163E88 80243628 3C028016 */ lui $v0, 0x8016 -/* 163E8C 8024362C 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163E88 80243628 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163E8C 8024362C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163E90 80243630 00042140 */ sll $a0, $a0, 5 /* 163E94 80243634 00822021 */ addu $a0, $a0, $v0 /* 163E98 80243638 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_8024368C.s b/asm/nonmatchings/code_163400/func_8024368C.s index ac1114e977..e44b7fd750 100644 --- a/asm/nonmatchings/code_163400/func_8024368C.s +++ b/asm/nonmatchings/code_163400/func_8024368C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024368C -/* 163EEC 8024368C 3C028016 */ lui $v0, 0x8016 -/* 163EF0 80243690 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163EEC 8024368C 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163EF0 80243690 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163EF4 80243694 00042140 */ sll $a0, $a0, 5 /* 163EF8 80243698 00822021 */ addu $a0, $a0, $v0 /* 163EFC 8024369C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802436F0.s b/asm/nonmatchings/code_163400/func_802436F0.s index 5741d50359..e58f52492f 100644 --- a/asm/nonmatchings/code_163400/func_802436F0.s +++ b/asm/nonmatchings/code_163400/func_802436F0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802436F0 -/* 163F50 802436F0 3C028016 */ lui $v0, 0x8016 -/* 163F54 802436F4 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163F50 802436F0 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163F54 802436F4 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163F58 802436F8 00042140 */ sll $a0, $a0, 5 /* 163F5C 802436FC 00822021 */ addu $a0, $a0, $v0 /* 163F60 80243700 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243754.s b/asm/nonmatchings/code_163400/func_80243754.s index 847b5d47dd..72d51212fe 100644 --- a/asm/nonmatchings/code_163400/func_80243754.s +++ b/asm/nonmatchings/code_163400/func_80243754.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243754 -/* 163FB4 80243754 3C028016 */ lui $v0, 0x8016 -/* 163FB8 80243758 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 163FB4 80243754 3C028016 */ lui $v0, %hi(D_80159D50) +/* 163FB8 80243758 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 163FBC 8024375C 00042140 */ sll $a0, $a0, 5 /* 163FC0 80243760 00822021 */ addu $a0, $a0, $v0 /* 163FC4 80243764 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_802437B8.s b/asm/nonmatchings/code_163400/func_802437B8.s index afe85c0f62..9fd3074c64 100644 --- a/asm/nonmatchings/code_163400/func_802437B8.s +++ b/asm/nonmatchings/code_163400/func_802437B8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802437B8 -/* 164018 802437B8 3C028016 */ lui $v0, 0x8016 -/* 16401C 802437BC 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 164018 802437B8 3C028016 */ lui $v0, %hi(D_80159D50) +/* 16401C 802437BC 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 164020 802437C0 00042140 */ sll $a0, $a0, 5 /* 164024 802437C4 00822021 */ addu $a0, $a0, $v0 /* 164028 802437C8 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_8024381C.s b/asm/nonmatchings/code_163400/func_8024381C.s index cb06f46299..1844c7d6b8 100644 --- a/asm/nonmatchings/code_163400/func_8024381C.s +++ b/asm/nonmatchings/code_163400/func_8024381C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8024381C -/* 16407C 8024381C 3C028016 */ lui $v0, 0x8016 -/* 164080 80243820 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 16407C 8024381C 3C028016 */ lui $v0, %hi(D_80159D50) +/* 164080 80243820 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 164084 80243824 00042140 */ sll $a0, $a0, 5 /* 164088 80243828 00822021 */ addu $a0, $a0, $v0 /* 16408C 8024382C 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243898.s b/asm/nonmatchings/code_163400/func_80243898.s index 549f22de5c..55c53df53c 100644 --- a/asm/nonmatchings/code_163400/func_80243898.s +++ b/asm/nonmatchings/code_163400/func_80243898.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243898 -/* 1640F8 80243898 3C028016 */ lui $v0, 0x8016 -/* 1640FC 8024389C 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 1640F8 80243898 3C028016 */ lui $v0, %hi(D_80159D50) +/* 1640FC 8024389C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 164100 802438A0 00042140 */ sll $a0, $a0, 5 /* 164104 802438A4 00822021 */ addu $a0, $a0, $v0 /* 164108 802438A8 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243908.s b/asm/nonmatchings/code_163400/func_80243908.s index 9e56656070..4bc9f5f13b 100644 --- a/asm/nonmatchings/code_163400/func_80243908.s +++ b/asm/nonmatchings/code_163400/func_80243908.s @@ -3,8 +3,8 @@ glabel func_80243908 /* 164168 80243908 00C0482D */ daddu $t1, $a2, $zero -/* 16416C 8024390C 3C028016 */ lui $v0, 0x8016 -/* 164170 80243910 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 16416C 8024390C 3C028016 */ lui $v0, %hi(D_80159D50) +/* 164170 80243910 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 164174 80243914 00042140 */ sll $a0, $a0, 5 /* 164178 80243918 00824021 */ addu $t0, $a0, $v0 /* 16417C 8024391C 81050003 */ lb $a1, 3($t0) diff --git a/asm/nonmatchings/code_163400/func_80243B10.s b/asm/nonmatchings/code_163400/func_80243B10.s index 44f1d2f2e6..09099d8c85 100644 --- a/asm/nonmatchings/code_163400/func_80243B10.s +++ b/asm/nonmatchings/code_163400/func_80243B10.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80243B10 -/* 164370 80243B10 3C028016 */ lui $v0, 0x8016 -/* 164374 80243B14 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 164370 80243B10 3C028016 */ lui $v0, %hi(D_80159D50) +/* 164374 80243B14 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 164378 80243B18 00042140 */ sll $a0, $a0, 5 /* 16437C 80243B1C 00822021 */ addu $a0, $a0, $v0 /* 164380 80243B20 9082001C */ lbu $v0, 0x1c($a0) diff --git a/asm/nonmatchings/code_163400/func_80243CCC.s b/asm/nonmatchings/code_163400/func_80243CCC.s index ed1616196b..6809e077ca 100644 --- a/asm/nonmatchings/code_163400/func_80243CCC.s +++ b/asm/nonmatchings/code_163400/func_80243CCC.s @@ -17,8 +17,8 @@ glabel func_80243CCC /* 16455C 80243CFC 35084340 */ ori $t0, $t0, 0x4340 /* 164560 80243D00 3C05800A */ lui $a1, 0x800a /* 164564 80243D04 24A5A66C */ addiu $a1, $a1, -0x5994 -/* 164568 80243D08 3C038016 */ lui $v1, 0x8016 -/* 16456C 80243D0C 24639D50 */ addiu $v1, $v1, -0x62b0 +/* 164568 80243D08 3C038016 */ lui $v1, %hi(D_80159D50) +/* 16456C 80243D0C 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* 164570 80243D10 00042140 */ sll $a0, $a0, 5 /* 164574 80243D14 AFB40038 */ sw $s4, 0x38($sp) /* 164578 80243D18 0083A021 */ addu $s4, $a0, $v1 diff --git a/asm/nonmatchings/code_163400/func_80243EEC.s b/asm/nonmatchings/code_163400/func_80243EEC.s index 0d472d012a..cf5efef35d 100644 --- a/asm/nonmatchings/code_163400/func_80243EEC.s +++ b/asm/nonmatchings/code_163400/func_80243EEC.s @@ -3,8 +3,8 @@ glabel func_80243EEC /* 16474C 80243EEC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 164750 80243EF0 3C028016 */ lui $v0, 0x8016 -/* 164754 80243EF4 24429D50 */ addiu $v0, $v0, -0x62b0 +/* 164750 80243EF0 3C028016 */ lui $v0, %hi(D_80159D50) +/* 164754 80243EF4 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* 164758 80243EF8 00042140 */ sll $a0, $a0, 5 /* 16475C 80243EFC 00822021 */ addu $a0, $a0, $v0 /* 164760 80243F00 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_163400/func_80245808.s b/asm/nonmatchings/code_163400/func_80245808.s index 24eae96b50..b2e29c2125 100644 --- a/asm/nonmatchings/code_163400/func_80245808.s +++ b/asm/nonmatchings/code_163400/func_80245808.s @@ -61,22 +61,22 @@ glabel func_80245808 /* 166140 802458E0 24020002 */ addiu $v0, $zero, 2 /* 166144 802458E4 14620006 */ bne $v1, $v0, .L80245900 /* 166148 802458E8 24020001 */ addiu $v0, $zero, 1 -/* 16614C 802458EC 3C038016 */ lui $v1, 0x8016 -/* 166150 802458F0 24639D50 */ addiu $v1, $v1, -0x62b0 +/* 16614C 802458EC 3C038016 */ lui $v1, %hi(D_80159D50) +/* 166150 802458F0 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* 166154 802458F4 A46205AE */ sh $v0, 0x5ae($v1) /* 166158 802458F8 08091644 */ j .L80245910 /* 16615C 802458FC 240200D3 */ addiu $v0, $zero, 0xd3 .L80245900: -/* 166160 80245900 3C038016 */ lui $v1, 0x8016 -/* 166164 80245904 24639D50 */ addiu $v1, $v1, -0x62b0 +/* 166160 80245900 3C038016 */ lui $v1, %hi(D_80159D50) +/* 166164 80245904 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* 166168 80245908 A46205AE */ sh $v0, 0x5ae($v1) /* 16616C 8024590C 240200A2 */ addiu $v0, $zero, 0xa2 .L80245910: /* 166170 80245910 A46205B0 */ sh $v0, 0x5b0($v1) /* 166174 80245914 24020019 */ addiu $v0, $zero, 0x19 /* 166178 80245918 A46205B2 */ sh $v0, 0x5b2($v1) -/* 16617C 8024591C 3C048016 */ lui $a0, 0x8016 -/* 166180 80245920 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 16617C 8024591C 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166180 80245920 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 166184 80245924 948205B0 */ lhu $v0, 0x5b0($a0) /* 166188 80245928 00021400 */ sll $v0, $v0, 0x10 /* 16618C 8024592C 00021C03 */ sra $v1, $v0, 0x10 @@ -100,8 +100,8 @@ glabel func_80245808 .L80245974: /* 1661D4 80245974 240200A0 */ addiu $v0, $zero, 0xa0 /* 1661D8 80245978 00451023 */ subu $v0, $v0, $a1 -/* 1661DC 8024597C 3C048016 */ lui $a0, 0x8016 -/* 1661E0 80245980 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 1661DC 8024597C 3C048016 */ lui $a0, %hi(D_80159D50) +/* 1661E0 80245980 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L80245984: /* 1661E4 80245984 A4C20000 */ sh $v0, ($a2) /* 1661E8 80245988 948206D0 */ lhu $v0, 0x6d0($a0) diff --git a/asm/nonmatchings/code_163400/func_80245A40.s b/asm/nonmatchings/code_163400/func_80245A40.s index 1f5e8ad5b9..2969ec0089 100644 --- a/asm/nonmatchings/code_163400/func_80245A40.s +++ b/asm/nonmatchings/code_163400/func_80245A40.s @@ -457,8 +457,8 @@ glabel func_80245A40 /* 166958 802460F8 24040032 */ addiu $a0, $zero, 0x32 /* 16695C 802460FC 0C051F9F */ jal func_80147E7C /* 166960 80246100 24050001 */ addiu $a1, $zero, 1 -/* 166964 80246104 3C048016 */ lui $a0, 0x8016 -/* 166968 80246108 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 166964 80246104 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166968 80246108 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 16696C 8024610C 2402008F */ addiu $v0, $zero, 0x8f /* 166970 80246110 A482064E */ sh $v0, 0x64e($a0) /* 166974 80246114 24020045 */ addiu $v0, $zero, 0x45 @@ -481,8 +481,8 @@ glabel func_80245A40 /* 1669B8 80246158 2463FFDE */ addiu $v1, $v1, -0x22 .L8024615C: /* 1669BC 8024615C 2403007E */ addiu $v1, $zero, 0x7e -/* 1669C0 80246160 3C048016 */ lui $a0, 0x8016 -/* 1669C4 80246164 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 1669C0 80246160 3C048016 */ lui $a0, %hi(D_80159D50) +/* 1669C4 80246164 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L80246168: /* 1669C8 80246168 2402FFE3 */ addiu $v0, $zero, -0x1d /* 1669CC 8024616C A4A30000 */ sh $v1, ($a1) @@ -560,8 +560,8 @@ glabel func_80245A40 /* 166AE0 80246280 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 166AE4 80246284 0C051F9F */ jal func_80147E7C /* 166AE8 80246288 24040032 */ addiu $a0, $zero, 0x32 -/* 166AEC 8024628C 3C048016 */ lui $a0, 0x8016 -/* 166AF0 80246290 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 166AEC 8024628C 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166AF0 80246290 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 166AF4 80246294 24020079 */ addiu $v0, $zero, 0x79 /* 166AF8 80246298 A482064E */ sh $v0, 0x64e($a0) /* 166AFC 8024629C 24020045 */ addiu $v0, $zero, 0x45 @@ -584,8 +584,8 @@ glabel func_80245A40 /* 166B40 802462E0 2463FFDE */ addiu $v1, $v1, -0x22 .L802462E4: /* 166B44 802462E4 2403007E */ addiu $v1, $zero, 0x7e -/* 166B48 802462E8 3C048016 */ lui $a0, 0x8016 -/* 166B4C 802462EC 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 166B48 802462E8 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166B4C 802462EC 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L802462F0: /* 166B50 802462F0 2402FFE3 */ addiu $v0, $zero, -0x1d /* 166B54 802462F4 A4A30000 */ sh $v1, ($a1) @@ -706,8 +706,8 @@ glabel func_80245A40 /* 166D08 802464A8 3C018025 */ lui $at, 0x8025 /* 166D0C 802464AC A022C098 */ sb $v0, -0x3f68($at) /* 166D10 802464B0 24020002 */ addiu $v0, $zero, 2 -/* 166D14 802464B4 3C048016 */ lui $a0, 0x8016 -/* 166D18 802464B8 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 166D14 802464B4 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166D18 802464B8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 166D1C 802464BC 3C038025 */ lui $v1, 0x8025 /* 166D20 802464C0 8C639B8C */ lw $v1, -0x6474($v1) /* 166D24 802464C4 A0620004 */ sb $v0, 4($v1) @@ -731,8 +731,8 @@ glabel func_80245A40 /* 166D6C 8024650C 2463FFB3 */ addiu $v1, $v1, -0x4d .L80246510: /* 166D70 80246510 24030053 */ addiu $v1, $zero, 0x53 -/* 166D74 80246514 3C048016 */ lui $a0, 0x8016 -/* 166D78 80246518 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 166D74 80246514 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166D78 80246518 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L8024651C: /* 166D7C 8024651C A4A30000 */ sh $v1, ($a1) /* 166D80 80246520 948205F2 */ lhu $v0, 0x5f2($a0) @@ -812,8 +812,8 @@ glabel func_80245A40 /* 166E9C 8024663C 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 166EA0 80246640 0C051F9F */ jal func_80147E7C /* 166EA4 80246644 24040032 */ addiu $a0, $zero, 0x32 -/* 166EA8 80246648 3C048016 */ lui $a0, 0x8016 -/* 166EAC 8024664C 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 166EA8 80246648 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166EAC 8024664C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 166EB0 80246650 24020079 */ addiu $v0, $zero, 0x79 /* 166EB4 80246654 A482064E */ sh $v0, 0x64e($a0) /* 166EB8 80246658 24020045 */ addiu $v0, $zero, 0x45 @@ -836,8 +836,8 @@ glabel func_80245A40 /* 166EFC 8024669C 2463FFDE */ addiu $v1, $v1, -0x22 .L802466A0: /* 166F00 802466A0 2403007E */ addiu $v1, $zero, 0x7e -/* 166F04 802466A4 3C048016 */ lui $a0, 0x8016 -/* 166F08 802466A8 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 166F04 802466A4 3C048016 */ lui $a0, %hi(D_80159D50) +/* 166F08 802466A8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L802466AC: /* 166F0C 802466AC 2402FFD5 */ addiu $v0, $zero, -0x2b /* 166F10 802466B0 A4A30000 */ sh $v1, ($a1) @@ -927,8 +927,8 @@ glabel func_80245A40 /* 167050 802467F0 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 167054 802467F4 0C051F9F */ jal func_80147E7C /* 167058 802467F8 24040032 */ addiu $a0, $zero, 0x32 -/* 16705C 802467FC 3C048016 */ lui $a0, 0x8016 -/* 167060 80246800 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 16705C 802467FC 3C048016 */ lui $a0, %hi(D_80159D50) +/* 167060 80246800 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 167064 80246804 2402007F */ addiu $v0, $zero, 0x7f /* 167068 80246808 A482064E */ sh $v0, 0x64e($a0) /* 16706C 8024680C 24020045 */ addiu $v0, $zero, 0x45 @@ -951,8 +951,8 @@ glabel func_80245A40 /* 1670B0 80246850 2463FFDE */ addiu $v1, $v1, -0x22 .L80246854: /* 1670B4 80246854 2403007E */ addiu $v1, $zero, 0x7e -/* 1670B8 80246858 3C048016 */ lui $a0, 0x8016 -/* 1670BC 8024685C 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 1670B8 80246858 3C048016 */ lui $a0, %hi(D_80159D50) +/* 1670BC 8024685C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L80246860: /* 1670C0 80246860 2402FFCE */ addiu $v0, $zero, -0x32 /* 1670C4 80246864 A4A30000 */ sh $v1, ($a1) diff --git a/asm/nonmatchings/code_167570/func_802471EC.s b/asm/nonmatchings/code_167570/func_802471EC.s index 354246c8a6..eb4c69fd35 100644 --- a/asm/nonmatchings/code_167570/func_802471EC.s +++ b/asm/nonmatchings/code_167570/func_802471EC.s @@ -107,8 +107,8 @@ glabel func_802471EC /* 167BD0 80247370 24020002 */ addiu $v0, $zero, 2 /* 167BD4 80247374 3C038025 */ lui $v1, 0x8025 /* 167BD8 80247378 8C639B8C */ lw $v1, -0x6474($v1) -/* 167BDC 8024737C 3C048016 */ lui $a0, 0x8016 -/* 167BE0 80247380 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 167BDC 8024737C 3C048016 */ lui $a0, %hi(D_80159D50) +/* 167BE0 80247380 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 167BE4 80247384 3C018025 */ lui $at, 0x8025 /* 167BE8 80247388 A022C098 */ sb $v0, -0x3f68($at) /* 167BEC 8024738C 240200B6 */ addiu $v0, $zero, 0xb6 @@ -132,8 +132,8 @@ glabel func_802471EC /* 167C34 802473D4 2463FFA5 */ addiu $v1, $v1, -0x5b .L802473D8: /* 167C38 802473D8 24030045 */ addiu $v1, $zero, 0x45 -/* 167C3C 802473DC 3C048016 */ lui $a0, 0x8016 -/* 167C40 802473E0 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 167C3C 802473DC 3C048016 */ lui $a0, %hi(D_80159D50) +/* 167C40 802473E0 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L802473E4: /* 167C44 802473E4 A4A30000 */ sh $v1, ($a1) /* 167C48 802473E8 948205F2 */ lhu $v0, 0x5f2($a0) @@ -206,8 +206,8 @@ glabel func_802471EC /* 167D48 802474E8 3C018025 */ lui $at, 0x8025 /* 167D4C 802474EC A022C098 */ sb $v0, -0x3f68($at) /* 167D50 802474F0 24020002 */ addiu $v0, $zero, 2 -/* 167D54 802474F4 3C048016 */ lui $a0, 0x8016 -/* 167D58 802474F8 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 167D54 802474F4 3C048016 */ lui $a0, %hi(D_80159D50) +/* 167D58 802474F8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 167D5C 802474FC 3C038025 */ lui $v1, 0x8025 /* 167D60 80247500 8C639B8C */ lw $v1, -0x6474($v1) /* 167D64 80247504 A0620004 */ sb $v0, 4($v1) @@ -231,8 +231,8 @@ glabel func_802471EC /* 167DAC 8024754C 2463FFB3 */ addiu $v1, $v1, -0x4d .L80247550: /* 167DB0 80247550 24030053 */ addiu $v1, $zero, 0x53 -/* 167DB4 80247554 3C048016 */ lui $a0, 0x8016 -/* 167DB8 80247558 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 167DB4 80247554 3C048016 */ lui $a0, %hi(D_80159D50) +/* 167DB8 80247558 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L8024755C: /* 167DBC 8024755C A4A30000 */ sh $v1, ($a1) /* 167DC0 80247560 948205F2 */ lhu $v0, 0x5f2($a0) @@ -306,8 +306,8 @@ glabel func_802471EC /* 167EC8 80247668 3C018025 */ lui $at, 0x8025 /* 167ECC 8024766C A022C098 */ sb $v0, -0x3f68($at) /* 167ED0 80247670 24020001 */ addiu $v0, $zero, 1 -/* 167ED4 80247674 3C048016 */ lui $a0, 0x8016 -/* 167ED8 80247678 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 167ED4 80247674 3C048016 */ lui $a0, %hi(D_80159D50) +/* 167ED8 80247678 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 167EDC 8024767C 3C038025 */ lui $v1, 0x8025 /* 167EE0 80247680 8C639B8C */ lw $v1, -0x6474($v1) /* 167EE4 80247684 A0620004 */ sb $v0, 4($v1) @@ -331,8 +331,8 @@ glabel func_802471EC /* 167F2C 802476CC 2463FFB4 */ addiu $v1, $v1, -0x4c .L802476D0: /* 167F30 802476D0 24030054 */ addiu $v1, $zero, 0x54 -/* 167F34 802476D4 3C048016 */ lui $a0, 0x8016 -/* 167F38 802476D8 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 167F34 802476D4 3C048016 */ lui $a0, %hi(D_80159D50) +/* 167F38 802476D8 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L802476DC: /* 167F3C 802476DC A4A30000 */ sh $v1, ($a1) /* 167F40 802476E0 948205F2 */ lhu $v0, 0x5f2($a0) @@ -501,8 +501,8 @@ glabel func_802471EC /* 1681BC 8024795C 3C018025 */ lui $at, 0x8025 /* 1681C0 80247960 A022C098 */ sb $v0, -0x3f68($at) /* 1681C4 80247964 24020003 */ addiu $v0, $zero, 3 -/* 1681C8 80247968 3C048016 */ lui $a0, 0x8016 -/* 1681CC 8024796C 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 1681C8 80247968 3C048016 */ lui $a0, %hi(D_80159D50) +/* 1681CC 8024796C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 1681D0 80247970 3C038025 */ lui $v1, 0x8025 /* 1681D4 80247974 8C639B8C */ lw $v1, -0x6474($v1) /* 1681D8 80247978 A0620004 */ sb $v0, 4($v1) @@ -526,8 +526,8 @@ glabel func_802471EC /* 168220 802479C0 2463FFA4 */ addiu $v1, $v1, -0x5c .L802479C4: /* 168224 802479C4 24030044 */ addiu $v1, $zero, 0x44 -/* 168228 802479C8 3C048016 */ lui $a0, 0x8016 -/* 16822C 802479CC 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 168228 802479C8 3C048016 */ lui $a0, %hi(D_80159D50) +/* 16822C 802479CC 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L802479D0: /* 168230 802479D0 A4A30000 */ sh $v1, ($a1) /* 168234 802479D4 948205F2 */ lhu $v0, 0x5f2($a0) diff --git a/asm/nonmatchings/code_168590/func_80248170.s b/asm/nonmatchings/code_168590/func_80248170.s index 550d67aeca..99782af619 100644 --- a/asm/nonmatchings/code_168590/func_80248170.s +++ b/asm/nonmatchings/code_168590/func_80248170.s @@ -3,8 +3,8 @@ glabel func_80248170 /* 1689D0 80248170 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1689D4 80248174 3C038016 */ lui $v1, 0x8016 -/* 1689D8 80248178 24639D50 */ addiu $v1, $v1, -0x62b0 +/* 1689D4 80248174 3C038016 */ lui $v1, %hi(D_80159D50) +/* 1689D8 80248178 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* 1689DC 8024817C 00041140 */ sll $v0, $a0, 5 /* 1689E0 80248180 00432821 */ addu $a1, $v0, $v1 /* 1689E4 80248184 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_168590/func_80248A80.s b/asm/nonmatchings/code_168590/func_80248A80.s index 2369fcf3f9..4060e530fa 100644 --- a/asm/nonmatchings/code_168590/func_80248A80.s +++ b/asm/nonmatchings/code_168590/func_80248A80.s @@ -38,8 +38,8 @@ glabel func_80248A80 /* 16935C 80248AFC 2484A190 */ addiu $a0, $a0, -0x5e70 /* 169360 80248B00 0C051FCC */ jal func_80147F30 /* 169364 80248B04 24050002 */ addiu $a1, $zero, 2 -/* 169368 80248B08 3C048016 */ lui $a0, 0x8016 -/* 16936C 80248B0C 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 169368 80248B08 3C048016 */ lui $a0, %hi(D_80159D50) +/* 16936C 80248B0C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 169370 80248B10 94820610 */ lhu $v0, 0x610($a0) /* 169374 80248B14 00021400 */ sll $v0, $v0, 0x10 /* 169378 80248B18 00021C03 */ sra $v1, $v0, 0x10 @@ -63,8 +63,8 @@ glabel func_80248A80 .L80248B60: /* 1693C0 80248B60 240200A0 */ addiu $v0, $zero, 0xa0 /* 1693C4 80248B64 00451023 */ subu $v0, $v0, $a1 -/* 1693C8 80248B68 3C048016 */ lui $a0, 0x8016 -/* 1693CC 80248B6C 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 1693C8 80248B68 3C048016 */ lui $a0, %hi(D_80159D50) +/* 1693CC 80248B6C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L80248B70: /* 1693D0 80248B70 A4C20000 */ sh $v0, ($a2) /* 1693D4 80248B74 94820630 */ lhu $v0, 0x630($a0) diff --git a/asm/nonmatchings/code_168590/func_80248BF4.s b/asm/nonmatchings/code_168590/func_80248BF4.s index c6391d109a..7c3d00f25f 100644 --- a/asm/nonmatchings/code_168590/func_80248BF4.s +++ b/asm/nonmatchings/code_168590/func_80248BF4.s @@ -227,8 +227,8 @@ glabel func_80248BF4 /* 16978C 80248F2C 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 169790 80248F30 0C051F9F */ jal func_80147E7C /* 169794 80248F34 24040032 */ addiu $a0, $zero, 0x32 -/* 169798 80248F38 3C048016 */ lui $a0, 0x8016 -/* 16979C 80248F3C 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 169798 80248F38 3C048016 */ lui $a0, %hi(D_80159D50) +/* 16979C 80248F3C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 1697A0 80248F40 24020079 */ addiu $v0, $zero, 0x79 /* 1697A4 80248F44 A482064E */ sh $v0, 0x64e($a0) /* 1697A8 80248F48 24020045 */ addiu $v0, $zero, 0x45 @@ -251,8 +251,8 @@ glabel func_80248BF4 /* 1697EC 80248F8C 2463FFDE */ addiu $v1, $v1, -0x22 .L80248F90: /* 1697F0 80248F90 2403007E */ addiu $v1, $zero, 0x7e -/* 1697F4 80248F94 3C048016 */ lui $a0, 0x8016 -/* 1697F8 80248F98 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 1697F4 80248F94 3C048016 */ lui $a0, %hi(D_80159D50) +/* 1697F8 80248F98 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L80248F9C: /* 1697FC 80248F9C 2402FFBA */ addiu $v0, $zero, -0x46 /* 169800 80248FA0 A4A30000 */ sh $v1, ($a1) @@ -429,8 +429,8 @@ glabel func_80248BF4 /* 169A7C 8024921C 24A53CCC */ addiu $a1, $a1, 0x3ccc /* 169A80 80249220 0C051F9F */ jal func_80147E7C /* 169A84 80249224 24040032 */ addiu $a0, $zero, 0x32 -/* 169A88 80249228 3C048016 */ lui $a0, 0x8016 -/* 169A8C 8024922C 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 169A88 80249228 3C048016 */ lui $a0, %hi(D_80159D50) +/* 169A8C 8024922C 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* 169A90 80249230 24020079 */ addiu $v0, $zero, 0x79 /* 169A94 80249234 A482064E */ sh $v0, 0x64e($a0) /* 169A98 80249238 24020045 */ addiu $v0, $zero, 0x45 @@ -453,8 +453,8 @@ glabel func_80248BF4 /* 169ADC 8024927C 2463FFDE */ addiu $v1, $v1, -0x22 .L80249280: /* 169AE0 80249280 2403007E */ addiu $v1, $zero, 0x7e -/* 169AE4 80249284 3C048016 */ lui $a0, 0x8016 -/* 169AE8 80249288 24849D50 */ addiu $a0, $a0, -0x62b0 +/* 169AE4 80249284 3C048016 */ lui $a0, %hi(D_80159D50) +/* 169AE8 80249288 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L8024928C: /* 169AEC 8024928C 2402FFBA */ addiu $v0, $zero, -0x46 /* 169AF0 80249290 A4A30000 */ sh $v1, ($a1) diff --git a/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s b/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s index e8ebdf3068..83a53dda77 100644 --- a/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s +++ b/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s @@ -110,7 +110,7 @@ glabel draw_main_battle_ui /* 16D4F4 8023EC14 00000000 */ nop /* 16D4F8 8023EC18 0808FB4E */ j .L8023ED38 /* 16D4FC 8023EC1C 00000000 */ nop -/* 16D500 8023EC20 0C091ACB */ jal func_80246B2C_code +/* 16D500 8023EC20 0C091ACB */ jal func_80246B2C /* 16D504 8023EC24 00000000 */ nop /* 16D508 8023EC28 0808FB4E */ j .L8023ED38 /* 16D50C 8023EC2C 00000000 */ nop diff --git a/asm/nonmatchings/code_16c8e0/func_8023F088.s b/asm/nonmatchings/code_16c8e0/func_8023F088.s index 3a3c207cea..1e4a92d5ce 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023F088.s +++ b/asm/nonmatchings/code_16c8e0/func_8023F088.s @@ -808,8 +808,8 @@ glabel func_8023F088 /* 16E5B8 8023FCD8 AE180090 */ sw $t8, 0x90($s0) /* 16E5BC 8023FCDC AE030094 */ sw $v1, 0x94($s0) /* 16E5C0 8023FCE0 AFC20000 */ sw $v0, ($fp) -/* 16E5C4 8023FCE4 3C04800A */ lui $a0, 0x800a -/* 16E5C8 8023FCE8 8C84A5DC */ lw $a0, -0x5a24($a0) +/* 16E5C4 8023FCE4 3C04800A */ lui $a0, %hi(nuGfxZBuffer) +/* 16E5C8 8023FCE8 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) /* 16E5CC 8023FCEC 260200A8 */ addiu $v0, $s0, 0xa8 /* 16E5D0 8023FCF0 AE190098 */ sw $t9, 0x98($s0) /* 16E5D4 8023FCF4 AE03009C */ sw $v1, 0x9c($s0) diff --git a/asm/nonmatchings/code_16c8e0/func_80246B2C.s b/asm/nonmatchings/code_16c8e0/func_80246B2C.s new file mode 100644 index 0000000000..fca63b0631 --- /dev/null +++ b/asm/nonmatchings/code_16c8e0/func_80246B2C.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80246B2C +/* 17540C 80246B2C 03E00008 */ jr $ra +/* 175410 80246B30 00000000 */ nop diff --git a/asm/nonmatchings/code_16c8e0/pause_cleanup.s b/asm/nonmatchings/code_16c8e0/pause_cleanup.s new file mode 100644 index 0000000000..ad1542f85c --- /dev/null +++ b/asm/nonmatchings/code_16c8e0/pause_cleanup.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel pause_cleanup +/* 172FE8 80244708 03E00008 */ jr $ra +/* 172FEC 8024470C 00000000 */ nop diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s index 1046e19a88..38a28f818c 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s @@ -296,8 +296,8 @@ glabel func_80041F10 /* 1D74C 8004234C 080108E2 */ j .L80042388 /* 1D750 80042350 AED2009C */ sw $s2, 0x9c($s6) .L80042354: -/* 1D754 80042354 3C048007 */ lui $a0, 0x8007 -/* 1D758 80042358 24847E38 */ addiu $a0, $a0, 0x7e38 +/* 1D754 80042354 3C048007 */ lui $a0, %hi(SCRIPT_NpcDefeat) +/* 1D758 80042358 24847E38 */ addiu $a0, $a0, %lo(SCRIPT_NpcDefeat) /* 1D75C 8004235C 0000302D */ daddu $a2, $zero, $zero /* 1D760 80042360 0C0B0D74 */ jal start_script_in_group /* 1D764 80042364 00C0382D */ daddu $a3, $a2, $zero diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s index 9ccca36fef..1de6afb001 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s @@ -126,8 +126,8 @@ glabel func_80027E10 .L80027FEC: /* 33EC 80027FEC 3C02800A */ lui $v0, 0x800a /* 33F0 80027FF0 8C42A658 */ lw $v0, -0x59a8($v0) -/* 33F4 80027FF4 3C06800A */ lui $a2, 0x800a -/* 33F8 80027FF8 8CC6A5DC */ lw $a2, -0x5a24($a2) +/* 33F4 80027FF4 3C06800A */ lui $a2, %hi(nuGfxZBuffer) +/* 33F8 80027FF8 8CC6A5DC */ lw $a2, %lo(nuGfxZBuffer)($a2) /* 33FC 80027FFC 8C440000 */ lw $a0, ($v0) /* 3400 80028000 0C009E6D */ jal func_800279B4 /* 3404 80028004 8C450004 */ lw $a1, 4($v0) @@ -271,8 +271,8 @@ glabel func_80027E10 /* 3620 80028220 26940018 */ addiu $s4, $s4, 0x18 /* 3624 80028224 27390001 */ addiu $t9, $t9, 1 /* 3628 80028228 8E430000 */ lw $v1, ($s2) -/* 362C 8002822C 3C02800A */ lui $v0, 0x800a -/* 3630 80028230 8C42A5DC */ lw $v0, -0x5a24($v0) +/* 362C 8002822C 3C02800A */ lui $v0, %hi(nuGfxZBuffer) +/* 3630 80028230 8C42A5DC */ lw $v0, %lo(nuGfxZBuffer)($v0) /* 3634 80028234 0060202D */ daddu $a0, $v1, $zero /* 3638 80028238 24630008 */ addiu $v1, $v1, 8 /* 363C 8002823C 00531021 */ addu $v0, $v0, $s3 @@ -374,8 +374,8 @@ glabel func_80027E10 /* 37B4 800283B4 0200282D */ daddu $a1, $s0, $zero /* 37B8 800283B8 26100008 */ addiu $s0, $s0, 8 /* 37BC 800283BC AE300000 */ sw $s0, ($s1) -/* 37C0 800283C0 3C03800A */ lui $v1, 0x800a -/* 37C4 800283C4 8C63A5DC */ lw $v1, -0x5a24($v1) +/* 37C0 800283C0 3C03800A */ lui $v1, %hi(nuGfxZBuffer) +/* 37C4 800283C4 8C63A5DC */ lw $v1, %lo(nuGfxZBuffer)($v1) /* 37C8 800283C8 3C12F700 */ lui $s2, 0xf700 /* 37CC 800283CC ACA20000 */ sw $v0, ($a1) /* 37D0 800283D0 3C028000 */ lui $v0, 0x8000 diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s b/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s index dc8b6cb665..ace94f98b5 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s @@ -267,8 +267,8 @@ glabel func_8004AE08 /* 265C8 8004B1C8 AE22000C */ sw $v0, 0xc($s1) /* 265CC 8004B1CC AC830000 */ sw $v1, ($a0) /* 265D0 8004B1D0 A0A00002 */ sb $zero, 2($a1) -/* 265D4 8004B1D4 3C04800A */ lui $a0, 0x800a -/* 265D8 8004B1D8 8C84A638 */ lw $a0, -0x59c8($a0) +/* 265D4 8004B1D4 3C04800A */ lui $a0, %hi(carthandle) +/* 265D8 8004B1D8 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 265DC 8004B1DC 3C02800A */ lui $v0, 0x800a /* 265E0 8004B1E0 24423640 */ addiu $v0, $v0, 0x3640 /* 265E4 8004B1E4 ACA20004 */ sw $v0, 4($a1) diff --git a/asm/nonmatchings/code_316d90/func_802AE000.s b/asm/nonmatchings/code_316d90/func_802AE000.s index f504cf4c1e..0fe30848fd 100644 --- a/asm/nonmatchings/code_316d90/func_802AE000.s +++ b/asm/nonmatchings/code_316d90/func_802AE000.s @@ -12,8 +12,8 @@ glabel func_802AE000 /* 316DAC 802AE01C 0000802D */ daddu $s0, $zero, $zero /* 316DB0 802AE020 3C05B000 */ lui $a1, 0xb000 /* 316DB4 802AE024 34A50800 */ ori $a1, $a1, 0x800 -/* 316DB8 802AE028 3C04800A */ lui $a0, 0x800a -/* 316DBC 802AE02C 8C84A638 */ lw $a0, -0x59c8($a0) +/* 316DB8 802AE028 3C04800A */ lui $a0, %hi(carthandle) +/* 316DBC 802AE02C 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 316DC0 802AE030 27A60010 */ addiu $a2, $sp, 0x10 /* 316DC4 802AE034 AFB20020 */ sw $s2, 0x20($sp) /* 316DC8 802AE038 0200902D */ daddu $s2, $s0, $zero @@ -39,8 +39,8 @@ glabel func_802AE000 /* 316E18 802AE088 0060B02D */ daddu $s6, $v1, $zero .L802AE08C: /* 316E1C 802AE08C 0220282D */ daddu $a1, $s1, $zero -/* 316E20 802AE090 3C04800A */ lui $a0, 0x800a -/* 316E24 802AE094 8C84A638 */ lw $a0, -0x59c8($a0) +/* 316E20 802AE090 3C04800A */ lui $a0, %hi(carthandle) +/* 316E24 802AE094 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 316E28 802AE098 02A0F809 */ jalr $s5 /* 316E2C 802AE09C 27A60010 */ addiu $a2, $sp, 0x10 /* 316E30 802AE0A0 8FA30010 */ lw $v1, 0x10($sp) diff --git a/asm/nonmatchings/code_3bf0_len_6f0/update_input.s b/asm/nonmatchings/code_3bf0_len_6f0/update_input.s index 77dcc5f490..2774978724 100644 --- a/asm/nonmatchings/code_3bf0_len_6f0/update_input.s +++ b/asm/nonmatchings/code_3bf0_len_6f0/update_input.s @@ -110,23 +110,23 @@ glabel update_input /* 3DF8 800289F8 00431024 */ and $v0, $v0, $v1 /* 3DFC 800289FC 14400005 */ bnez $v0, .L80028A14 /* 3E00 80028A00 00832025 */ or $a0, $a0, $v1 -/* 3E04 80028A04 3C01800A */ lui $at, 0x800a -/* 3E08 80028A08 A425A6A0 */ sh $a1, -0x5960($at) +/* 3E04 80028A04 3C01800A */ lui $at, %hi(D_8009A6A0) +/* 3E08 80028A08 A425A6A0 */ sh $a1, %lo(D_8009A6A0)($at) /* 3E0C 80028A0C 0800A295 */ j .L80028A54 /* 3E10 80028A10 00051400 */ sll $v0, $a1, 0x10 .L80028A14: -/* 3E14 80028A14 3C02800A */ lui $v0, 0x800a -/* 3E18 80028A18 8442A6A4 */ lh $v0, -0x595c($v0) +/* 3E14 80028A14 3C02800A */ lui $v0, %hi(D_8009A6A4) +/* 3E18 80028A18 8442A6A4 */ lh $v0, %lo(D_8009A6A4)($v0) /* 3E1C 80028A1C 14400006 */ bnez $v0, .L80028A38 /* 3E20 80028A20 00000000 */ nop -/* 3E24 80028A24 3C03800A */ lui $v1, 0x800a -/* 3E28 80028A28 2463A6A0 */ addiu $v1, $v1, -0x5960 +/* 3E24 80028A24 3C03800A */ lui $v1, %hi(D_8009A6A0) +/* 3E28 80028A28 2463A6A0 */ addiu $v1, $v1, %lo(D_8009A6A0) /* 3E2C 80028A2C 84620000 */ lh $v0, ($v1) /* 3E30 80028A30 0800A292 */ j .L80028A48 /* 3E34 80028A34 0046102A */ slt $v0, $v0, $a2 .L80028A38: -/* 3E38 80028A38 3C03800A */ lui $v1, 0x800a -/* 3E3C 80028A3C 2463A6A0 */ addiu $v1, $v1, -0x5960 +/* 3E38 80028A38 3C03800A */ lui $v1, %hi(D_8009A6A0) +/* 3E3C 80028A3C 2463A6A0 */ addiu $v1, $v1, %lo(D_8009A6A0) /* 3E40 80028A40 84620000 */ lh $v0, ($v1) /* 3E44 80028A44 00C2102A */ slt $v0, $a2, $v0 .L80028A48: @@ -147,23 +147,23 @@ glabel update_input /* 3E78 80028A78 00431024 */ and $v0, $v0, $v1 /* 3E7C 80028A7C 14400005 */ bnez $v0, .L80028A94 /* 3E80 80028A80 00832025 */ or $a0, $a0, $v1 -/* 3E84 80028A84 3C01800A */ lui $at, 0x800a -/* 3E88 80028A88 A425A6A0 */ sh $a1, -0x5960($at) +/* 3E84 80028A84 3C01800A */ lui $at, %hi(D_8009A6A0) +/* 3E88 80028A88 A425A6A0 */ sh $a1, %lo(D_8009A6A0)($at) /* 3E8C 80028A8C 0800A2B5 */ j .L80028AD4 /* 3E90 80028A90 0100102D */ daddu $v0, $t0, $zero .L80028A94: -/* 3E94 80028A94 3C02800A */ lui $v0, 0x800a -/* 3E98 80028A98 8442A6A4 */ lh $v0, -0x595c($v0) +/* 3E94 80028A94 3C02800A */ lui $v0, %hi(D_8009A6A4) +/* 3E98 80028A98 8442A6A4 */ lh $v0, %lo(D_8009A6A4)($v0) /* 3E9C 80028A9C 14400006 */ bnez $v0, .L80028AB8 /* 3EA0 80028AA0 00000000 */ nop -/* 3EA4 80028AA4 3C03800A */ lui $v1, 0x800a -/* 3EA8 80028AA8 2463A6A0 */ addiu $v1, $v1, -0x5960 +/* 3EA4 80028AA4 3C03800A */ lui $v1, %hi(D_8009A6A0) +/* 3EA8 80028AA8 2463A6A0 */ addiu $v1, $v1, %lo(D_8009A6A0) /* 3EAC 80028AAC 84620000 */ lh $v0, ($v1) /* 3EB0 80028AB0 0800A2B2 */ j .L80028AC8 /* 3EB4 80028AB4 00C2102A */ slt $v0, $a2, $v0 .L80028AB8: -/* 3EB8 80028AB8 3C03800A */ lui $v1, 0x800a -/* 3EBC 80028ABC 2463A6A0 */ addiu $v1, $v1, -0x5960 +/* 3EB8 80028AB8 3C03800A */ lui $v1, %hi(D_8009A6A0) +/* 3EBC 80028ABC 2463A6A0 */ addiu $v1, $v1, %lo(D_8009A6A0) /* 3EC0 80028AC0 84620000 */ lh $v0, ($v1) /* 3EC4 80028AC4 0046102A */ slt $v0, $v0, $a2 .L80028AC8: @@ -174,10 +174,10 @@ glabel update_input .L80028AD4: /* 3ED4 80028AD4 14400005 */ bnez $v0, .L80028AEC /* 3ED8 80028AD8 00071400 */ sll $v0, $a3, 0x10 -/* 3EDC 80028ADC 3C01800A */ lui $at, 0x800a -/* 3EE0 80028AE0 A420A6A4 */ sh $zero, -0x595c($at) -/* 3EE4 80028AE4 3C01800A */ lui $at, 0x800a -/* 3EE8 80028AE8 A425A6A0 */ sh $a1, -0x5960($at) +/* 3EDC 80028ADC 3C01800A */ lui $at, %hi(D_8009A6A4) +/* 3EE0 80028AE0 A420A6A4 */ sh $zero, %lo(D_8009A6A4)($at) +/* 3EE4 80028AE4 3C01800A */ lui $at, %hi(D_8009A6A0) +/* 3EE8 80028AE8 A425A6A0 */ sh $a1, %lo(D_8009A6A0)($at) .L80028AEC: /* 3EEC 80028AEC 00023403 */ sra $a2, $v0, 0x10 /* 3EF0 80028AF0 28C20021 */ slti $v0, $a2, 0x21 @@ -191,23 +191,23 @@ glabel update_input /* 3F10 80028B10 00431024 */ and $v0, $v0, $v1 /* 3F14 80028B14 14400005 */ bnez $v0, .L80028B2C /* 3F18 80028B18 00832025 */ or $a0, $a0, $v1 -/* 3F1C 80028B1C 3C01800A */ lui $at, 0x800a -/* 3F20 80028B20 A427A6A2 */ sh $a3, -0x595e($at) +/* 3F1C 80028B1C 3C01800A */ lui $at, %hi(D_8009A6A2) +/* 3F20 80028B20 A427A6A2 */ sh $a3, %lo(D_8009A6A2)($at) /* 3F24 80028B24 0800A2DB */ j .L80028B6C /* 3F28 80028B28 00071400 */ sll $v0, $a3, 0x10 .L80028B2C: -/* 3F2C 80028B2C 3C02800A */ lui $v0, 0x800a -/* 3F30 80028B30 8442A6A6 */ lh $v0, -0x595a($v0) +/* 3F2C 80028B2C 3C02800A */ lui $v0, %hi(D_8009A6A6) +/* 3F30 80028B30 8442A6A6 */ lh $v0, %lo(D_8009A6A6)($v0) /* 3F34 80028B34 14400006 */ bnez $v0, .L80028B50 /* 3F38 80028B38 00000000 */ nop -/* 3F3C 80028B3C 3C03800A */ lui $v1, 0x800a -/* 3F40 80028B40 2463A6A2 */ addiu $v1, $v1, -0x595e +/* 3F3C 80028B3C 3C03800A */ lui $v1, %hi(D_8009A6A2) +/* 3F40 80028B40 2463A6A2 */ addiu $v1, $v1, %lo(D_8009A6A2) /* 3F44 80028B44 84620000 */ lh $v0, ($v1) /* 3F48 80028B48 0800A2D8 */ j .L80028B60 /* 3F4C 80028B4C 0046102A */ slt $v0, $v0, $a2 .L80028B50: -/* 3F50 80028B50 3C03800A */ lui $v1, 0x800a -/* 3F54 80028B54 2463A6A2 */ addiu $v1, $v1, -0x595e +/* 3F50 80028B50 3C03800A */ lui $v1, %hi(D_8009A6A2) +/* 3F54 80028B54 2463A6A2 */ addiu $v1, $v1, %lo(D_8009A6A2) /* 3F58 80028B58 84620000 */ lh $v0, ($v1) /* 3F5C 80028B5C 00C2102A */ slt $v0, $a2, $v0 .L80028B60: @@ -228,17 +228,17 @@ glabel update_input /* 3F90 80028B90 00431024 */ and $v0, $v0, $v1 /* 3F94 80028B94 14400005 */ bnez $v0, .L80028BAC /* 3F98 80028B98 00832025 */ or $a0, $a0, $v1 -/* 3F9C 80028B9C 3C01800A */ lui $at, 0x800a -/* 3FA0 80028BA0 A427A6A2 */ sh $a3, -0x595e($at) +/* 3F9C 80028B9C 3C01800A */ lui $at, %hi(D_8009A6A2) +/* 3FA0 80028BA0 A427A6A2 */ sh $a3, %lo(D_8009A6A2)($at) /* 3FA4 80028BA4 0800A309 */ j .L80028C24 /* 3FA8 80028BA8 0100102D */ daddu $v0, $t0, $zero .L80028BAC: -/* 3FAC 80028BAC 3C02800A */ lui $v0, 0x800a -/* 3FB0 80028BB0 8442A6A6 */ lh $v0, -0x595a($v0) +/* 3FAC 80028BAC 3C02800A */ lui $v0, %hi(D_8009A6A6) +/* 3FB0 80028BB0 8442A6A6 */ lh $v0, %lo(D_8009A6A6)($v0) /* 3FB4 80028BB4 14400014 */ bnez $v0, .L80028C08 /* 3FB8 80028BB8 00000000 */ nop -/* 3FBC 80028BBC 3C03800A */ lui $v1, 0x800a -/* 3FC0 80028BC0 2463A6A2 */ addiu $v1, $v1, -0x595e +/* 3FBC 80028BBC 3C03800A */ lui $v1, %hi(D_8009A6A2) +/* 3FC0 80028BC0 2463A6A2 */ addiu $v1, $v1, %lo(D_8009A6A2) /* 3FC4 80028BC4 84620000 */ lh $v0, ($v1) /* 3FC8 80028BC8 0800A306 */ j .L80028C18 /* 3FCC 80028BCC 00C2102A */ slt $v0, $a2, $v0 @@ -259,8 +259,8 @@ glabel update_input /* 4000 80028C00 0800A3AB */ j .L80028EAC /* 4004 80028C04 ACA00020 */ sw $zero, 0x20($a1) .L80028C08: -/* 4008 80028C08 3C03800A */ lui $v1, 0x800a -/* 400C 80028C0C 2463A6A2 */ addiu $v1, $v1, -0x595e +/* 4008 80028C08 3C03800A */ lui $v1, %hi(D_8009A6A2) +/* 400C 80028C0C 2463A6A2 */ addiu $v1, $v1, %lo(D_8009A6A2) /* 4010 80028C10 84620000 */ lh $v0, ($v1) /* 4014 80028C14 0046102A */ slt $v0, $v0, $a2 .L80028C18: @@ -271,23 +271,23 @@ glabel update_input .L80028C24: /* 4024 80028C24 14400005 */ bnez $v0, .L80028C3C /* 4028 80028C28 00051400 */ sll $v0, $a1, 0x10 -/* 402C 80028C2C 3C01800A */ lui $at, 0x800a -/* 4030 80028C30 A420A6A6 */ sh $zero, -0x595a($at) -/* 4034 80028C34 3C01800A */ lui $at, 0x800a -/* 4038 80028C38 A427A6A2 */ sh $a3, -0x595e($at) +/* 402C 80028C2C 3C01800A */ lui $at, %hi(D_8009A6A6) +/* 4030 80028C30 A420A6A6 */ sh $zero, %lo(D_8009A6A6)($at) +/* 4034 80028C34 3C01800A */ lui $at, %hi(D_8009A6A2) +/* 4038 80028C38 A427A6A2 */ sh $a3, %lo(D_8009A6A2)($at) .L80028C3C: /* 403C 80028C3C 00023403 */ sra $a2, $v0, 0x10 /* 4040 80028C40 28C20021 */ slti $v0, $a2, 0x21 /* 4044 80028C44 1440001C */ bnez $v0, .L80028CB8 /* 4048 80028C48 00051400 */ sll $v0, $a1, 0x10 -/* 404C 80028C4C 3C08800A */ lui $t0, 0x800a -/* 4050 80028C50 2508A6A4 */ addiu $t0, $t0, -0x595c +/* 404C 80028C4C 3C08800A */ lui $t0, %hi(D_8009A6A4) +/* 4050 80028C50 2508A6A4 */ addiu $t0, $t0, %lo(D_8009A6A4) /* 4054 80028C54 85030000 */ lh $v1, ($t0) /* 4058 80028C58 24020001 */ addiu $v0, $zero, 1 /* 405C 80028C5C 1462000A */ bne $v1, $v0, .L80028C88 /* 4060 80028C60 00000000 */ nop -/* 4064 80028C64 3C02800A */ lui $v0, 0x800a -/* 4068 80028C68 8442A6A0 */ lh $v0, -0x5960($v0) +/* 4064 80028C64 3C02800A */ lui $v0, %hi(D_8009A6A0) +/* 4068 80028C68 8442A6A0 */ lh $v0, %lo(D_8009A6A0)($v0) /* 406C 80028C6C 00C21023 */ subu $v0, $a2, $v0 /* 4070 80028C70 28420011 */ slti $v0, $v0, 0x11 /* 4074 80028C74 14400004 */ bnez $v0, .L80028C88 @@ -296,8 +296,8 @@ glabel update_input /* 4080 80028C80 00822024 */ and $a0, $a0, $v0 /* 4084 80028C84 A5000000 */ sh $zero, ($t0) .L80028C88: -/* 4088 80028C88 3C03800A */ lui $v1, 0x800a -/* 408C 80028C8C 8463A6A0 */ lh $v1, -0x5960($v1) +/* 4088 80028C88 3C03800A */ lui $v1, %hi(D_8009A6A0) +/* 408C 80028C8C 8463A6A0 */ lh $v1, %lo(D_8009A6A0)($v1) /* 4090 80028C90 00051400 */ sll $v0, $a1, 0x10 /* 4094 80028C94 00021403 */ sra $v0, $v0, 0x10 /* 4098 80028C98 00621823 */ subu $v1, $v1, $v0 @@ -305,21 +305,21 @@ glabel update_input /* 40A0 80028CA0 14600005 */ bnez $v1, .L80028CB8 /* 40A4 80028CA4 00051400 */ sll $v0, $a1, 0x10 /* 40A8 80028CA8 24020001 */ addiu $v0, $zero, 1 -/* 40AC 80028CAC 3C01800A */ lui $at, 0x800a -/* 40B0 80028CB0 A422A6A4 */ sh $v0, -0x595c($at) +/* 40AC 80028CAC 3C01800A */ lui $at, %hi(D_8009A6A4) +/* 40B0 80028CB0 A422A6A4 */ sh $v0, %lo(D_8009A6A4)($at) /* 40B4 80028CB4 00051400 */ sll $v0, $a1, 0x10 .L80028CB8: /* 40B8 80028CB8 00023403 */ sra $a2, $v0, 0x10 /* 40BC 80028CBC 28C2FFE0 */ slti $v0, $a2, -0x20 /* 40C0 80028CC0 1040001B */ beqz $v0, .L80028D30 /* 40C4 80028CC4 24020001 */ addiu $v0, $zero, 1 -/* 40C8 80028CC8 3C08800A */ lui $t0, 0x800a -/* 40CC 80028CCC 2508A6A4 */ addiu $t0, $t0, -0x595c +/* 40C8 80028CC8 3C08800A */ lui $t0, %hi(D_8009A6A4) +/* 40CC 80028CCC 2508A6A4 */ addiu $t0, $t0, %lo(D_8009A6A4) /* 40D0 80028CD0 85030000 */ lh $v1, ($t0) /* 40D4 80028CD4 1462000C */ bne $v1, $v0, .L80028D08 /* 40D8 80028CD8 00051400 */ sll $v0, $a1, 0x10 -/* 40DC 80028CDC 3C02800A */ lui $v0, 0x800a -/* 40E0 80028CE0 8442A6A0 */ lh $v0, -0x5960($v0) +/* 40DC 80028CDC 3C02800A */ lui $v0, %hi(D_8009A6A0) +/* 40E0 80028CE0 8442A6A0 */ lh $v0, %lo(D_8009A6A0)($v0) /* 40E4 80028CE4 00461023 */ subu $v0, $v0, $a2 /* 40E8 80028CE8 28420011 */ slti $v0, $v0, 0x11 /* 40EC 80028CEC 14400006 */ bnez $v0, .L80028D08 @@ -330,16 +330,16 @@ glabel update_input /* 4100 80028D00 A5000000 */ sh $zero, ($t0) /* 4104 80028D04 00051400 */ sll $v0, $a1, 0x10 .L80028D08: -/* 4108 80028D08 3C03800A */ lui $v1, 0x800a -/* 410C 80028D0C 8463A6A0 */ lh $v1, -0x5960($v1) +/* 4108 80028D08 3C03800A */ lui $v1, %hi(D_8009A6A0) +/* 410C 80028D0C 8463A6A0 */ lh $v1, %lo(D_8009A6A0)($v1) /* 4110 80028D10 00021403 */ sra $v0, $v0, 0x10 /* 4114 80028D14 00431023 */ subu $v0, $v0, $v1 /* 4118 80028D18 28420011 */ slti $v0, $v0, 0x11 /* 411C 80028D1C 14400005 */ bnez $v0, .L80028D34 /* 4120 80028D20 00071400 */ sll $v0, $a3, 0x10 /* 4124 80028D24 24020001 */ addiu $v0, $zero, 1 -/* 4128 80028D28 3C01800A */ lui $at, 0x800a -/* 412C 80028D2C A422A6A4 */ sh $v0, -0x595c($at) +/* 4128 80028D28 3C01800A */ lui $at, %hi(D_8009A6A4) +/* 412C 80028D2C A422A6A4 */ sh $v0, %lo(D_8009A6A4)($at) .L80028D30: /* 4130 80028D30 00071400 */ sll $v0, $a3, 0x10 .L80028D34: @@ -347,14 +347,14 @@ glabel update_input /* 4138 80028D38 28A20021 */ slti $v0, $a1, 0x21 /* 413C 80028D3C 1440001C */ bnez $v0, .L80028DB0 /* 4140 80028D40 00071400 */ sll $v0, $a3, 0x10 -/* 4144 80028D44 3C06800A */ lui $a2, 0x800a -/* 4148 80028D48 24C6A6A6 */ addiu $a2, $a2, -0x595a +/* 4144 80028D44 3C06800A */ lui $a2, %hi(D_8009A6A6) +/* 4148 80028D48 24C6A6A6 */ addiu $a2, $a2, %lo(D_8009A6A6) /* 414C 80028D4C 84C30000 */ lh $v1, ($a2) /* 4150 80028D50 24020001 */ addiu $v0, $zero, 1 /* 4154 80028D54 1462000A */ bne $v1, $v0, .L80028D80 /* 4158 80028D58 00000000 */ nop -/* 415C 80028D5C 3C02800A */ lui $v0, 0x800a -/* 4160 80028D60 8442A6A2 */ lh $v0, -0x595e($v0) +/* 415C 80028D5C 3C02800A */ lui $v0, %hi(D_8009A6A2) +/* 4160 80028D60 8442A6A2 */ lh $v0, %lo(D_8009A6A2)($v0) /* 4164 80028D64 00A21023 */ subu $v0, $a1, $v0 /* 4168 80028D68 28420011 */ slti $v0, $v0, 0x11 /* 416C 80028D6C 14400004 */ bnez $v0, .L80028D80 @@ -363,8 +363,8 @@ glabel update_input /* 4178 80028D78 00822024 */ and $a0, $a0, $v0 /* 417C 80028D7C A4C00000 */ sh $zero, ($a2) .L80028D80: -/* 4180 80028D80 3C03800A */ lui $v1, 0x800a -/* 4184 80028D84 8463A6A2 */ lh $v1, -0x595e($v1) +/* 4180 80028D80 3C03800A */ lui $v1, %hi(D_8009A6A2) +/* 4184 80028D84 8463A6A2 */ lh $v1, %lo(D_8009A6A2)($v1) /* 4188 80028D88 00071400 */ sll $v0, $a3, 0x10 /* 418C 80028D8C 00021403 */ sra $v0, $v0, 0x10 /* 4190 80028D90 00621823 */ subu $v1, $v1, $v0 @@ -372,21 +372,21 @@ glabel update_input /* 4198 80028D98 14600005 */ bnez $v1, .L80028DB0 /* 419C 80028D9C 00071400 */ sll $v0, $a3, 0x10 /* 41A0 80028DA0 24020001 */ addiu $v0, $zero, 1 -/* 41A4 80028DA4 3C01800A */ lui $at, 0x800a -/* 41A8 80028DA8 A422A6A6 */ sh $v0, -0x595a($at) +/* 41A4 80028DA4 3C01800A */ lui $at, %hi(D_8009A6A6) +/* 41A8 80028DA8 A422A6A6 */ sh $v0, %lo(D_8009A6A6)($at) /* 41AC 80028DAC 00071400 */ sll $v0, $a3, 0x10 .L80028DB0: /* 41B0 80028DB0 00022C03 */ sra $a1, $v0, 0x10 /* 41B4 80028DB4 28A2FFE0 */ slti $v0, $a1, -0x20 /* 41B8 80028DB8 1040001A */ beqz $v0, .L80028E24 /* 41BC 80028DBC 24020001 */ addiu $v0, $zero, 1 -/* 41C0 80028DC0 3C06800A */ lui $a2, 0x800a -/* 41C4 80028DC4 24C6A6A6 */ addiu $a2, $a2, -0x595a +/* 41C0 80028DC0 3C06800A */ lui $a2, %hi(D_8009A6A6) +/* 41C4 80028DC4 24C6A6A6 */ addiu $a2, $a2, %lo(D_8009A6A6) /* 41C8 80028DC8 84C30000 */ lh $v1, ($a2) /* 41CC 80028DCC 1462000C */ bne $v1, $v0, .L80028E00 /* 41D0 80028DD0 00071400 */ sll $v0, $a3, 0x10 -/* 41D4 80028DD4 3C02800A */ lui $v0, 0x800a -/* 41D8 80028DD8 8442A6A2 */ lh $v0, -0x595e($v0) +/* 41D4 80028DD4 3C02800A */ lui $v0, %hi(D_8009A6A2) +/* 41D8 80028DD8 8442A6A2 */ lh $v0, %lo(D_8009A6A2)($v0) /* 41DC 80028DDC 00451023 */ subu $v0, $v0, $a1 /* 41E0 80028DE0 28420011 */ slti $v0, $v0, 0x11 /* 41E4 80028DE4 14400006 */ bnez $v0, .L80028E00 @@ -397,15 +397,15 @@ glabel update_input /* 41F8 80028DF8 A4C00000 */ sh $zero, ($a2) /* 41FC 80028DFC 00071400 */ sll $v0, $a3, 0x10 .L80028E00: -/* 4200 80028E00 3C03800A */ lui $v1, 0x800a -/* 4204 80028E04 8463A6A2 */ lh $v1, -0x595e($v1) +/* 4200 80028E00 3C03800A */ lui $v1, %hi(D_8009A6A2) +/* 4204 80028E04 8463A6A2 */ lh $v1, %lo(D_8009A6A2)($v1) /* 4208 80028E08 00021403 */ sra $v0, $v0, 0x10 /* 420C 80028E0C 00431023 */ subu $v0, $v0, $v1 /* 4210 80028E10 28420011 */ slti $v0, $v0, 0x11 /* 4214 80028E14 14400003 */ bnez $v0, .L80028E24 /* 4218 80028E18 24020001 */ addiu $v0, $zero, 1 -/* 421C 80028E1C 3C01800A */ lui $at, 0x800a -/* 4220 80028E20 A422A6A6 */ sh $v0, -0x595a($at) +/* 421C 80028E1C 3C01800A */ lui $at, %hi(D_8009A6A6) +/* 4220 80028E20 A422A6A6 */ sh $v0, %lo(D_8009A6A6)($at) .L80028E24: /* 4224 80028E24 3C058007 */ lui $a1, %hi(gGameStatusPtr) /* 4228 80028E28 8CA5419C */ lw $a1, %lo(gGameStatusPtr)($a1) diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s b/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s index f29c025cfc..e3bbeaaab3 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s @@ -21,8 +21,8 @@ glabel func_80029860 /* 4CA0 800298A0 0C019560 */ jal osCreateMesgQueue /* 4CA4 800298A4 24060001 */ addiu $a2, $zero, 1 /* 4CA8 800298A8 27A50010 */ addiu $a1, $sp, 0x10 -/* 4CAC 800298AC 3C04800A */ lui $a0, 0x800a -/* 4CB0 800298B0 8C84A638 */ lw $a0, -0x59c8($a0) +/* 4CAC 800298AC 3C04800A */ lui $a0, %hi(carthandle) +/* 4CB0 800298B0 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 4CB4 800298B4 24060001 */ addiu $a2, $zero, 1 /* 4CB8 800298B8 A3A00012 */ sb $zero, 0x12($sp) /* 4CBC 800298BC AFB00014 */ sw $s0, 0x14($sp) diff --git a/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s b/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s index a8aba37723..11d372c2f3 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s +++ b/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s @@ -16,8 +16,8 @@ glabel func_8002D160 /* 858C 8002D18C 0000802D */ daddu $s0, $zero, $zero /* 8590 8002D190 3C05B000 */ lui $a1, 0xb000 /* 8594 8002D194 34A50D10 */ ori $a1, $a1, 0xd10 -/* 8598 8002D198 3C04800A */ lui $a0, 0x800a -/* 859C 8002D19C 8C84A638 */ lw $a0, -0x59c8($a0) +/* 8598 8002D198 3C04800A */ lui $a0, %hi(carthandle) +/* 859C 8002D19C 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 85A0 8002D1A0 27A60010 */ addiu $a2, $sp, 0x10 /* 85A4 8002D1A4 AFB20020 */ sw $s2, 0x20($sp) /* 85A8 8002D1A8 0200902D */ daddu $s2, $s0, $zero @@ -41,8 +41,8 @@ glabel func_8002D160 /* 85F0 8002D1F0 0060B82D */ daddu $s7, $v1, $zero .L8002D1F4: /* 85F4 8002D1F4 0220282D */ daddu $a1, $s1, $zero -/* 85F8 8002D1F8 3C04800A */ lui $a0, 0x800a -/* 85FC 8002D1FC 8C84A638 */ lw $a0, -0x59c8($a0) +/* 85F8 8002D1F8 3C04800A */ lui $a0, %hi(carthandle) +/* 85FC 8002D1FC 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 8600 8002D200 0280F809 */ jalr $s4 /* 8604 8002D204 27A60010 */ addiu $a2, $sp, 0x10 /* 8608 8002D208 8FA30010 */ lw $v1, 0x10($sp) @@ -96,8 +96,8 @@ glabel func_8002D160 /* 86B8 8002D2B8 3C05B000 */ lui $a1, 0xb000 /* 86BC 8002D2BC 34A50E38 */ ori $a1, $a1, 0xe38 /* 86C0 8002D2C0 27A60014 */ addiu $a2, $sp, 0x14 -/* 86C4 8002D2C4 3C04800A */ lui $a0, 0x800a -/* 86C8 8002D2C8 8C84A638 */ lw $a0, -0x59c8($a0) +/* 86C4 8002D2C4 3C04800A */ lui $a0, %hi(carthandle) +/* 86C8 8002D2C8 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 86CC 8002D2CC 3C148006 */ lui $s4, 0x8006 /* 86D0 8002D2D0 26940DC0 */ addiu $s4, $s4, 0xdc0 /* 86D4 8002D2D4 0280F809 */ jalr $s4 @@ -114,8 +114,8 @@ glabel func_8002D160 /* 8700 8002D300 0060B82D */ daddu $s7, $v1, $zero .L8002D304: /* 8704 8002D304 0220282D */ daddu $a1, $s1, $zero -/* 8708 8002D308 3C04800A */ lui $a0, 0x800a -/* 870C 8002D30C 8C84A638 */ lw $a0, -0x59c8($a0) +/* 8708 8002D308 3C04800A */ lui $a0, %hi(carthandle) +/* 870C 8002D30C 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 8710 8002D310 0280F809 */ jalr $s4 /* 8714 8002D314 27A60014 */ addiu $a2, $sp, 0x14 /* 8718 8002D318 8FA30014 */ lw $v1, 0x14($sp) diff --git a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s index cc3eac02b8..fab4d2d726 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s +++ b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s @@ -4,8 +4,8 @@ glabel nuSiMgrInit /* 8230 8002CE30 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 8234 8002CE34 AFB00030 */ sw $s0, 0x30($sp) -/* 8238 8002CE38 3C10800E */ lui $s0, 0x800e -/* 823C 8002CE3C 2610AC78 */ addiu $s0, $s0, -0x5388 +/* 8238 8002CE38 3C10800E */ lui $s0, %hi(nuSiMesgQ) +/* 823C 8002CE3C 2610AC78 */ addiu $s0, $s0, %lo(nuSiMesgQ) /* 8240 8002CE40 0200202D */ daddu $a0, $s0, $zero /* 8244 8002CE44 3C05800A */ lui $a1, 0x800a /* 8248 8002CE48 24A5E6F0 */ addiu $a1, $a1, -0x1910 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s index fd8b2299bd..52a3c48baa 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s @@ -11,8 +11,8 @@ glabel AssignAreaFlag /* A8710 80112010 8C83000C */ lw $v1, 0xc($a0) /* A8714 80112014 0C0B1EAF */ jal get_variable /* A8718 80112018 8C650000 */ lw $a1, ($v1) -/* A871C 8011201C 3C048015 */ lui $a0, 0x8015 -/* A8720 80112020 8C8412EC */ lw $a0, 0x12ec($a0) +/* A871C 8011201C 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) +/* A8720 80112020 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A8724 80112024 0C04417A */ jal get_entity_by_index /* A8728 80112028 0040802D */ daddu $s0, $v0, $zero /* A872C 8011202C 0040882D */ daddu $s1, $v0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s index 58512bdf66..b4e4dd6374 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s @@ -10,8 +10,8 @@ glabel AssignBlockFlag /* A8780 80112080 8C83000C */ lw $v1, 0xc($a0) /* A8784 80112084 0C0B1F6A */ jal get_variable_index /* A8788 80112088 8C650000 */ lw $a1, ($v1) -/* A878C 8011208C 3C048015 */ lui $a0, 0x8015 -/* A8790 80112090 8C8412EC */ lw $a0, 0x12ec($a0) +/* A878C 8011208C 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) +/* A8790 80112090 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A8794 80112094 0C04417A */ jal get_entity_by_index /* A8798 80112098 0040802D */ daddu $s0, $v0, $zero /* A879C 8011209C 8C430040 */ lw $v1, 0x40($v0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s index 634eb1ce5e..3f9e4175fd 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s @@ -10,8 +10,8 @@ glabel AssignCrateFlag /* A8884 80112184 AFB00010 */ sw $s0, 0x10($sp) /* A8888 80112188 14A2000B */ bne $a1, $v0, .L801121B8 /* A888C 8011218C 8E30000C */ lw $s0, 0xc($s1) -/* A8890 80112190 3C048015 */ lui $a0, 0x8015 -/* A8894 80112194 8C8412EC */ lw $a0, 0x12ec($a0) +/* A8890 80112190 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) +/* A8894 80112194 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A8898 80112198 0C04417A */ jal get_entity_by_index /* A889C 8011219C 00000000 */ nop /* A88A0 801121A0 8E050000 */ lw $a1, ($s0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s index b62b3199a7..6b34b3d452 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s @@ -10,8 +10,8 @@ glabel AssignPanelFlag /* A8828 80112128 AFB00010 */ sw $s0, 0x10($sp) /* A882C 8011212C 14A2000B */ bne $a1, $v0, .L8011215C /* A8830 80112130 8E30000C */ lw $s0, 0xc($s1) -/* A8834 80112134 3C048015 */ lui $a0, 0x8015 -/* A8838 80112138 8C8412EC */ lw $a0, 0x12ec($a0) +/* A8834 80112134 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) +/* A8838 80112138 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A883C 8011213C 0C04417A */ jal get_entity_by_index /* A8840 80112140 00000000 */ nop /* A8844 80112144 8E050000 */ lw $a1, ($s0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s index 6ead8f223e..21a3355998 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s @@ -10,8 +10,8 @@ glabel AssignScript /* A86C4 80111FC4 8C83000C */ lw $v1, 0xc($a0) /* A86C8 80111FC8 0C0B1EAF */ jal get_variable /* A86CC 80111FCC 8C650000 */ lw $a1, ($v1) -/* A86D0 80111FD0 3C048015 */ lui $a0, 0x8015 -/* A86D4 80111FD4 8C8412EC */ lw $a0, 0x12ec($a0) +/* A86D0 80111FD0 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) +/* A86D4 80111FD4 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A86D8 80111FD8 0C04417A */ jal get_entity_by_index /* A86DC 80111FDC 0040802D */ daddu $s0, $v0, $zero /* A86E0 80111FE0 AC500028 */ sw $s0, 0x28($v0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s b/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s index d983cc48e1..e2f8561032 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s @@ -78,8 +78,8 @@ glabel MakeEntity /* A8554 80111E54 AFA2001C */ sw $v0, 0x1c($sp) /* A8558 80111E58 0040182D */ daddu $v1, $v0, $zero /* A855C 80111E5C 24020002 */ addiu $v0, $zero, 2 -/* A8560 80111E60 3C018015 */ lui $at, 0x8015 -/* A8564 80111E64 AC2312EC */ sw $v1, 0x12ec($at) +/* A8560 80111E60 3C018015 */ lui $at, %hi(gLastCreatedEntityIndex) +/* A8564 80111E64 AC2312EC */ sw $v1, %lo(gLastCreatedEntityIndex)($at) /* A8568 80111E68 AE430084 */ sw $v1, 0x84($s2) .L80111E6C: /* A856C 80111E6C 8FBF004C */ lw $ra, 0x4c($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s index 90be8e785d..bcaf858fa7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s @@ -5,8 +5,8 @@ glabel func_80111E9C /* A859C 80111E9C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A85A0 80111EA0 AFB00010 */ sw $s0, 0x10($sp) /* A85A4 80111EA4 0080802D */ daddu $s0, $a0, $zero -/* A85A8 80111EA8 3C048015 */ lui $a0, 0x8015 -/* A85AC 80111EAC 8C8412EC */ lw $a0, 0x12ec($a0) +/* A85A8 80111EA8 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) +/* A85AC 80111EAC 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A85B0 80111EB0 AFBF0014 */ sw $ra, 0x14($sp) /* A85B4 80111EB4 0C04417A */ jal get_entity_by_index /* A85B8 80111EB8 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s index 4201c78ae6..62d6185a24 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111F2C.s @@ -5,8 +5,8 @@ glabel func_80111F2C /* A862C 80111F2C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A8630 80111F30 AFB00010 */ sw $s0, 0x10($sp) /* A8634 80111F34 0080802D */ daddu $s0, $a0, $zero -/* A8638 80111F38 3C048015 */ lui $a0, 0x8015 -/* A863C 80111F3C 8C8412EC */ lw $a0, 0x12ec($a0) +/* A8638 80111F38 3C048015 */ lui $a0, %hi(gLastCreatedEntityIndex) +/* A863C 80111F3C 8C8412EC */ lw $a0, %lo(gLastCreatedEntityIndex)($a0) /* A8640 80111F40 AFBF0014 */ sw $ra, 0x14($sp) /* A8644 80111F44 0C04417A */ jal get_entity_by_index /* A8648 80111F48 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s index 5f5329f80d..7b261e37aa 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s @@ -185,8 +185,8 @@ glabel func_8011C80C /* B31D4 8011CAD4 000421C0 */ sll $a0, $a0, 7 /* B31D8 8011CAD8 3C13E700 */ lui $s3, 0xe700 /* B31DC 8011CADC 8E320000 */ lw $s2, ($s1) -/* B31E0 8011CAE0 3C02800A */ lui $v0, 0x800a -/* B31E4 8011CAE4 8C42A5DC */ lw $v0, -0x5a24($v0) +/* B31E0 8011CAE0 3C02800A */ lui $v0, %hi(nuGfxZBuffer) +/* B31E4 8011CAE4 8C42A5DC */ lw $v0, %lo(nuGfxZBuffer)($v0) /* B31E8 8011CAE8 0240182D */ daddu $v1, $s2, $zero /* B31EC 8011CAEC 26520008 */ addiu $s2, $s2, 8 /* B31F0 8011CAF0 00442021 */ addu $a0, $v0, $a0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s index d20abe3ec1..18a0ac6c96 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s @@ -166,8 +166,8 @@ glabel func_8011CFBC /* B3938 8011D238 000421C0 */ sll $a0, $a0, 7 /* B393C 8011D23C 3C13E700 */ lui $s3, 0xe700 /* B3940 8011D240 8E320000 */ lw $s2, ($s1) -/* B3944 8011D244 3C02800A */ lui $v0, 0x800a -/* B3948 8011D248 8C42A5DC */ lw $v0, -0x5a24($v0) +/* B3944 8011D244 3C02800A */ lui $v0, %hi(nuGfxZBuffer) +/* B3948 8011D248 8C42A5DC */ lw $v0, %lo(nuGfxZBuffer)($v0) /* B394C 8011D24C 0240182D */ daddu $v1, $s2, $zero /* B3950 8011D250 26520008 */ addiu $s2, $s2, 8 /* B3954 8011D254 00442021 */ addu $a0, $v0, $a0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s index f214835fff..a976d26f12 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s @@ -517,8 +517,8 @@ glabel update_item_entity_temp /* CC53C 80135E3C 24020003 */ addiu $v0, $zero, 3 /* CC540 80135E40 0804D8DF */ j .L8013637C /* CC544 80135E44 A222001A */ sb $v0, 0x1a($s1) -/* CC548 80135E48 3C038016 */ lui $v1, 0x8016 -/* CC54C 80135E4C 24639D50 */ addiu $v1, $v1, -0x62b0 +/* CC548 80135E48 3C038016 */ lui $v1, %hi(D_80159D50) +/* CC54C 80135E4C 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* CC550 80135E50 90620180 */ lbu $v0, 0x180($v1) /* CC554 80135E54 30420008 */ andi $v0, $v0, 8 /* CC558 80135E58 14400148 */ bnez $v0, .L8013637C @@ -702,8 +702,8 @@ glabel update_item_entity_temp /* CC800 80136100 AC2068E4 */ sw $zero, 0x68e4($at) /* CC804 80136104 0804D8DF */ j .L8013637C /* CC808 80136108 A222001A */ sb $v0, 0x1a($s1) -/* CC80C 8013610C 3C038016 */ lui $v1, 0x8016 -/* CC810 80136110 24639D50 */ addiu $v1, $v1, -0x62b0 +/* CC80C 8013610C 3C038016 */ lui $v1, %hi(D_80159D50) +/* CC810 80136110 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* CC814 80136114 90620180 */ lbu $v0, 0x180($v1) /* CC818 80136118 30420008 */ andi $v0, $v0, 8 /* CC81C 8013611C 14400097 */ bnez $v0, .L8013637C @@ -818,8 +818,8 @@ glabel update_item_entity_temp /* CC9C4 801362C4 2402000E */ addiu $v0, $zero, 0xe /* CC9C8 801362C8 0804D8DF */ j .L8013637C /* CC9CC 801362CC A222001A */ sb $v0, 0x1a($s1) -/* CC9D0 801362D0 3C038016 */ lui $v1, 0x8016 -/* CC9D4 801362D4 24639D50 */ addiu $v1, $v1, -0x62b0 +/* CC9D0 801362D0 3C038016 */ lui $v1, %hi(D_80159D50) +/* CC9D4 801362D4 24639D50 */ addiu $v1, $v1, %lo(D_80159D50) /* CC9D8 801362D8 90620180 */ lbu $v0, 0x180($v1) /* CC9DC 801362DC 30420008 */ andi $v0, $v0, 8 /* CC9E0 801362E0 14400026 */ bnez $v0, .L8013637C diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index db2caa579e..96c649dd58 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s @@ -163,8 +163,8 @@ glabel func_80138E54 /* CF7C4 801390C4 3C09FF18 */ lui $t1, 0xff18 /* CF7C8 801390C8 3529003F */ ori $t1, $t1, 0x3f /* CF7CC 801390CC 8E500000 */ lw $s0, ($s2) -/* CF7D0 801390D0 3C04800A */ lui $a0, 0x800a -/* CF7D4 801390D4 8C84A5DC */ lw $a0, -0x5a24($a0) +/* CF7D0 801390D0 3C04800A */ lui $a0, %hi(nuGfxZBuffer) +/* CF7D4 801390D4 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) /* CF7D8 801390D8 96820000 */ lhu $v0, ($s4) /* CF7DC 801390DC 0200282D */ daddu $a1, $s0, $zero /* CF7E0 801390E0 26100008 */ addiu $s0, $s0, 8 @@ -408,8 +408,8 @@ glabel func_80138E54 /* CFB88 80139488 24120040 */ addiu $s2, $zero, 0x40 /* CFB8C 8013948C 02A0102D */ daddu $v0, $s5, $zero /* CFB90 80139490 8E300000 */ lw $s0, ($s1) -/* CFB94 80139494 3C04800A */ lui $a0, 0x800a -/* CFB98 80139498 8C84A5DC */ lw $a0, -0x5a24($a0) +/* CFB94 80139494 3C04800A */ lui $a0, %hi(nuGfxZBuffer) +/* CFB98 80139498 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) /* CFB9C 8013949C 0200182D */ daddu $v1, $s0, $zero /* CFBA0 801394A0 26100008 */ addiu $s0, $s0, 8 /* CFBA4 801394A4 AE300000 */ sw $s0, ($s1) @@ -446,8 +446,8 @@ glabel func_80138E54 /* CFC1C 8013951C 34A5003F */ ori $a1, $a1, 0x3f /* CFC20 80139520 00132300 */ sll $a0, $s3, 0xc /* CFC24 80139524 8E220000 */ lw $v0, ($s1) -/* CFC28 80139528 3C03800A */ lui $v1, 0x800a -/* CFC2C 8013952C 8C63A5DC */ lw $v1, -0x5a24($v1) +/* CFC28 80139528 3C03800A */ lui $v1, %hi(nuGfxZBuffer) +/* CFC2C 8013952C 8C63A5DC */ lw $v1, %lo(nuGfxZBuffer)($v1) /* CFC30 80139530 0040802D */ daddu $s0, $v0, $zero /* CFC34 80139534 24420008 */ addiu $v0, $v0, 8 /* CFC38 80139538 00642021 */ addu $a0, $v1, $a0 @@ -530,8 +530,8 @@ glabel func_80138E54 /* CFD6C 8013966C 36B5001C */ ori $s5, $s5, 0x1c /* CFD70 80139670 3C16800A */ lui $s6, 0x800a /* CFD74 80139674 26D6A66C */ addiu $s6, $s6, -0x5994 -/* CFD78 80139678 3C13800A */ lui $s3, 0x800a -/* CFD7C 8013967C 2673A5DC */ addiu $s3, $s3, -0x5a24 +/* CFD78 80139678 3C13800A */ lui $s3, %hi(nuGfxZBuffer) +/* CFD7C 8013967C 2673A5DC */ addiu $s3, $s3, %lo(nuGfxZBuffer) /* CFD80 80139680 8EC20000 */ lw $v0, ($s6) /* CFD84 80139684 8E640000 */ lw $a0, ($s3) /* CFD88 80139688 0040882D */ daddu $s1, $v0, $zero diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s index 962b459c94..cb02371226 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s @@ -115,8 +115,8 @@ glabel func_80143C48 /* DA500 80143E00 AE0D0040 */ sw $t5, 0x40($s0) /* DA504 80143E04 AE420000 */ sw $v0, ($s2) /* DA508 80143E08 AE0E0048 */ sw $t6, 0x48($s0) -/* DA50C 80143E0C 3C04800A */ lui $a0, 0x800a -/* DA510 80143E10 8C84A5DC */ lw $a0, -0x5a24($a0) +/* DA50C 80143E0C 3C04800A */ lui $a0, %hi(nuGfxZBuffer) +/* DA510 80143E10 8C84A5DC */ lw $a0, %lo(nuGfxZBuffer)($a0) /* DA514 80143E14 26020058 */ addiu $v0, $s0, 0x58 /* DA518 80143E18 AE03004C */ sw $v1, 0x4c($s0) /* DA51C 80143E1C AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s index 50fb1d53dc..6a271950bb 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s @@ -3,8 +3,8 @@ glabel func_80147414 /* DDB14 80147414 0000302D */ daddu $a2, $zero, $zero -/* DDB18 80147418 3C058016 */ lui $a1, 0x8016 -/* DDB1C 8014741C 24A59D50 */ addiu $a1, $a1, -0x62b0 +/* DDB18 80147418 3C058016 */ lui $a1, %hi(D_80159D50) +/* DDB1C 8014741C 24A59D50 */ addiu $a1, $a1, %lo(D_80159D50) /* DDB20 80147420 24A4001C */ addiu $a0, $a1, 0x1c .L80147424: /* DDB24 80147424 90A30000 */ lbu $v1, ($a1) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s index 2f5a75adc3..2df65039c5 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147474.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147474 -/* DDB74 80147474 3C028016 */ lui $v0, 0x8016 -/* DDB78 80147478 24429D50 */ addiu $v0, $v0, -0x62b0 +/* DDB74 80147474 3C028016 */ lui $v0, %hi(D_80159D50) +/* DDB78 80147478 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* DDB7C 8014747C 00042140 */ sll $a0, $a0, 5 /* DDB80 80147480 00822021 */ addu $a0, $a0, $v0 /* DDB84 80147484 8FA70014 */ lw $a3, 0x14($sp) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s index d15cf9d605..e01bf5dd49 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147574.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147574 -/* DDC74 80147574 3C028016 */ lui $v0, 0x8016 -/* DDC78 80147578 24429D50 */ addiu $v0, $v0, -0x62b0 +/* DDC74 80147574 3C028016 */ lui $v0, %hi(D_80159D50) +/* DDC78 80147578 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* DDC7C 8014757C 00042140 */ sll $a0, $a0, 5 /* DDC80 80147580 00822021 */ addu $a0, $a0, $v0 /* DDC84 80147584 9086001C */ lbu $a2, 0x1c($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s index 5df3ae95fe..29c0a6d606 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147650.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147650 -/* DDD50 80147650 3C028016 */ lui $v0, 0x8016 -/* DDD54 80147654 24429D50 */ addiu $v0, $v0, -0x62b0 +/* DDD50 80147650 3C028016 */ lui $v0, %hi(D_80159D50) +/* DDD54 80147654 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* DDD58 80147658 00042140 */ sll $a0, $a0, 5 /* DDD5C 8014765C 00822021 */ addu $a0, $a0, $v0 /* DDD60 80147660 9083001C */ lbu $v1, 0x1c($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s index 0a9b8ba8f3..4bf44cd849 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s @@ -13,8 +13,8 @@ glabel func_80147698 /* DDDB8 801476B8 00171140 */ sll $v0, $s7, 5 /* DDDBC 801476BC F7B400E8 */ sdc1 $f20, 0xe8($sp) /* DDDC0 801476C0 4480A000 */ mtc1 $zero, $f20 -/* DDDC4 801476C4 3C0B8016 */ lui $t3, 0x8016 -/* DDDC8 801476C8 256B9D50 */ addiu $t3, $t3, -0x62b0 +/* DDDC4 801476C4 3C0B8016 */ lui $t3, %hi(D_80159D50) +/* DDDC8 801476C8 256B9D50 */ addiu $t3, $t3, %lo(D_80159D50) /* DDDCC 801476CC AFBE00E0 */ sw $fp, 0xe0($sp) /* DDDD0 801476D0 004BF021 */ addu $fp, $v0, $t3 /* DDDD4 801476D4 AFBF00E4 */ sw $ra, 0xe4($sp) @@ -30,8 +30,8 @@ glabel func_80147698 /* DDDF8 801476F8 064200E2 */ bltzl $s2, .L80147A84 /* DDDFC 801476FC 26D60001 */ addiu $s6, $s6, 1 /* DDE00 80147700 00121140 */ sll $v0, $s2, 5 -/* DDE04 80147704 3C0B8016 */ lui $t3, 0x8016 -/* DDE08 80147708 256B9D50 */ addiu $t3, $t3, -0x62b0 +/* DDE04 80147704 3C0B8016 */ lui $t3, %hi(D_80159D50) +/* DDE08 80147708 256B9D50 */ addiu $t3, $t3, %lo(D_80159D50) /* DDE0C 8014770C 004B8821 */ addu $s1, $v0, $t3 /* DDE10 80147710 92220000 */ lbu $v0, ($s1) /* DDE14 80147714 504000DB */ beql $v0, $zero, .L80147A84 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s index 8b5984e953..9a34a58ba7 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s @@ -16,8 +16,8 @@ glabel func_80147AC4 /* DE1EC 80147AEC 0461FFFD */ bgez $v1, .L80147AE4 /* DE1F0 80147AF0 24420004 */ addiu $v0, $v0, 4 /* DE1F4 80147AF4 0000182D */ daddu $v1, $zero, $zero -/* DE1F8 80147AF8 3C048016 */ lui $a0, 0x8016 -/* DE1FC 80147AFC 24849D50 */ addiu $a0, $a0, -0x62b0 +/* DE1F8 80147AF8 3C048016 */ lui $a0, %hi(D_80159D50) +/* DE1FC 80147AFC 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) /* DE200 80147B00 27A50020 */ addiu $a1, $sp, 0x20 .L80147B04: /* DE204 80147B04 90820000 */ lbu $v0, ($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s index 2a5ecca025..d7c65b0525 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s @@ -21,8 +21,8 @@ glabel func_80147D70 /* DE4A8 80147DA8 03A31821 */ addu $v1, $sp, $v1 /* DE4AC 80147DAC AC640000 */ sw $a0, ($v1) /* DE4B0 80147DB0 0000302D */ daddu $a2, $zero, $zero -/* DE4B4 80147DB4 3C058016 */ lui $a1, 0x8016 -/* DE4B8 80147DB8 24A59D50 */ addiu $a1, $a1, -0x62b0 +/* DE4B4 80147DB4 3C058016 */ lui $a1, %hi(D_80159D50) +/* DE4B8 80147DB8 24A59D50 */ addiu $a1, $a1, %lo(D_80159D50) /* DE4BC 80147DBC 0040382D */ daddu $a3, $v0, $zero .L80147DC0: /* DE4C0 80147DC0 90A20000 */ lbu $v0, ($a1) @@ -47,8 +47,8 @@ glabel func_80147D70 /* DE504 80147E04 0060302D */ daddu $a2, $v1, $zero /* DE508 80147E08 03A0382D */ daddu $a3, $sp, $zero /* DE50C 80147E0C 2405FFFF */ addiu $a1, $zero, -1 -/* DE510 80147E10 3C048016 */ lui $a0, 0x8016 -/* DE514 80147E14 24849D50 */ addiu $a0, $a0, -0x62b0 +/* DE510 80147E10 3C048016 */ lui $a0, %hi(D_80159D50) +/* DE514 80147E14 24849D50 */ addiu $a0, $a0, %lo(D_80159D50) .L80147E18: /* DE518 80147E18 8CE20000 */ lw $v0, ($a3) /* DE51C 80147E1C 10450005 */ beq $v0, $a1, .L80147E34 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s index 6da18f3fbc..86afab7a37 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147E48 -/* DE548 80147E48 3C028016 */ lui $v0, 0x8016 -/* DE54C 80147E4C 24429D50 */ addiu $v0, $v0, -0x62b0 +/* DE548 80147E48 3C028016 */ lui $v0, %hi(D_80159D50) +/* DE54C 80147E4C 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* DE550 80147E50 00042140 */ sll $a0, $a0, 5 /* DE554 80147E54 00822021 */ addu $a0, $a0, $v0 /* DE558 80147E58 90830000 */ lbu $v1, ($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s index e17227bc6f..b361c825ae 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147E7C -/* DE57C 80147E7C 3C028016 */ lui $v0, 0x8016 -/* DE580 80147E80 24429D50 */ addiu $v0, $v0, -0x62b0 +/* DE57C 80147E7C 3C028016 */ lui $v0, %hi(D_80159D50) +/* DE580 80147E80 24429D50 */ addiu $v0, $v0, %lo(D_80159D50) /* DE584 80147E84 00042140 */ sll $a0, $a0, 5 /* DE588 80147E88 00822021 */ addu $a0, $a0, $v0 /* DE58C 80147E8C 90830000 */ lbu $v1, ($a0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s index c493ffdb6a..b30974f028 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80147EC4 -/* DE5C4 80147EC4 3C068016 */ lui $a2, 0x8016 -/* DE5C8 80147EC8 24C69D50 */ addiu $a2, $a2, -0x62b0 +/* DE5C4 80147EC4 3C068016 */ lui $a2, %hi(D_80159D50) +/* DE5C8 80147EC8 24C69D50 */ addiu $a2, $a2, %lo(D_80159D50) /* DE5CC 80147ECC 0000282D */ daddu $a1, $zero, $zero /* DE5D0 80147ED0 3C028015 */ lui $v0, 0x8015 /* DE5D4 80147ED4 2442F2C0 */ addiu $v0, $v0, -0xd40 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s index 4cd8eab0c1..f69f7d32c2 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s @@ -18,8 +18,8 @@ glabel func_80147F30 /* DE664 80147F64 2416FFFF */ addiu $s6, $zero, -1 /* DE668 80147F68 3C158015 */ lui $s5, 0x8015 /* DE66C 80147F6C 26B5F150 */ addiu $s5, $s5, -0xeb0 -/* DE670 80147F70 3C148016 */ lui $s4, 0x8016 -/* DE674 80147F74 26949D50 */ addiu $s4, $s4, -0x62b0 +/* DE670 80147F70 3C148016 */ lui $s4, %hi(D_80159D50) +/* DE674 80147F74 26949D50 */ addiu $s4, $s4, %lo(D_80159D50) /* DE678 80147F78 2490001C */ addiu $s0, $a0, 0x1c .L80147F7C: /* DE67C 80147F7C 8602FFEC */ lh $v0, -0x14($s0) diff --git a/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s b/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s index 2bf2c38a47..a321c82c89 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/set_ui_panel_properties.s @@ -4,8 +4,8 @@ glabel set_ui_panel_properties /* DE3C8 80147CC8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DE3CC 80147CCC 0080582D */ daddu $t3, $a0, $zero -/* DE3D0 80147CD0 3C0A8016 */ lui $t2, 0x8016 -/* DE3D4 80147CD4 254A9D50 */ addiu $t2, $t2, -0x62b0 +/* DE3D0 80147CD0 3C0A8016 */ lui $t2, %hi(D_80159D50) +/* DE3D4 80147CD4 254A9D50 */ addiu $t2, $t2, %lo(D_80159D50) /* DE3D8 80147CD8 8FA90030 */ lw $t1, 0x30($sp) /* DE3DC 80147CDC 000B1140 */ sll $v0, $t3, 5 /* DE3E0 80147CE0 AFB00010 */ sw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s b/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s index 6254775f2f..8bc33938d4 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s +++ b/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s @@ -60,8 +60,8 @@ glabel func_802C39F8 /* E846C 802C3ABC AE11006C */ sw $s1, 0x6c($s0) /* E8470 802C3AC0 AE000068 */ sw $zero, 0x68($s0) /* E8474 802C3AC4 92220003 */ lbu $v0, 3($s1) -/* E8478 802C3AC8 3C04802E */ lui $a0, 0x802e -/* E847C 802C3ACC 24849CA0 */ addiu $a0, $a0, -0x6360 +/* E8478 802C3AC8 3C04802E */ lui $a0, %hi(gStaticScriptCounter) +/* E847C 802C3ACC 24849CA0 */ addiu $a0, $a0, %lo(gStaticScriptCounter) /* E8480 802C3AD0 A2020003 */ sb $v0, 3($s0) /* E8484 802C3AD4 8C820000 */ lw $v0, ($a0) /* E8488 802C3AD8 AE020144 */ sw $v0, 0x144($s0) @@ -118,9 +118,9 @@ glabel func_802C39F8 /* E854C 802C3B9C 24A5AC98 */ addiu $a1, $a1, %lo(gScriptListCount) /* E8550 802C3BA0 8CA20000 */ lw $v0, ($a1) /* E8554 802C3BA4 00022080 */ sll $a0, $v0, 2 -/* E8558 802C3BA8 3C01802E */ lui $at, 0x802e +/* E8558 802C3BA8 3C01802E */ lui $at, %hi(gScriptIndexList) /* E855C 802C3BAC 00240821 */ addu $at, $at, $a0 -/* E8560 802C3BB0 AC34A898 */ sw $s4, -0x5768($at) +/* E8560 802C3BB0 AC34A898 */ sw $s4, %lo(gScriptIndexList)($at) /* E8564 802C3BB4 8E030144 */ lw $v1, 0x144($s0) /* E8568 802C3BB8 24420001 */ addiu $v0, $v0, 1 /* E856C 802C3BBC ACA20000 */ sw $v0, ($a1) @@ -128,8 +128,8 @@ glabel func_802C39F8 /* E8574 802C3BC4 00240821 */ addu $at, $at, $a0 /* E8578 802C3BC8 AC23AA98 */ sw $v1, %lo(gScriptIdList)($at) .L802C3BCC: -/* E857C 802C3BCC 3C03802E */ lui $v1, 0x802e -/* E8580 802C3BD0 24639CA0 */ addiu $v1, $v1, -0x6360 +/* E857C 802C3BCC 3C03802E */ lui $v1, %hi(gStaticScriptCounter) +/* E8580 802C3BD0 24639CA0 */ addiu $v1, $v1, %lo(gStaticScriptCounter) /* E8584 802C3BD4 8C620000 */ lw $v0, ($v1) /* E8588 802C3BD8 14400002 */ bnez $v0, .L802C3BE4 /* E858C 802C3BDC 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s index 9cb10702eb..f698e69eb0 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s @@ -64,8 +64,8 @@ glabel start_child_script /* E824C 802C389C AE000068 */ sw $zero, 0x68($s0) /* E8250 802C38A0 AE00006C */ sw $zero, 0x6c($s0) /* E8254 802C38A4 92220003 */ lbu $v0, 3($s1) -/* E8258 802C38A8 3C04802E */ lui $a0, 0x802e -/* E825C 802C38AC 24849CA0 */ addiu $a0, $a0, -0x6360 +/* E8258 802C38A8 3C04802E */ lui $a0, %hi(gStaticScriptCounter) +/* E825C 802C38AC 24849CA0 */ addiu $a0, $a0, %lo(gStaticScriptCounter) /* E8260 802C38B0 24420001 */ addiu $v0, $v0, 1 /* E8264 802C38B4 A2020003 */ sb $v0, 3($s0) /* E8268 802C38B8 8C820000 */ lw $v0, ($a0) @@ -123,9 +123,9 @@ glabel start_child_script /* E8330 802C3980 24A5AC98 */ addiu $a1, $a1, %lo(gScriptListCount) /* E8334 802C3984 8CA20000 */ lw $v0, ($a1) /* E8338 802C3988 00022080 */ sll $a0, $v0, 2 -/* E833C 802C398C 3C01802E */ lui $at, 0x802e +/* E833C 802C398C 3C01802E */ lui $at, %hi(gScriptIndexList) /* E8340 802C3990 00240821 */ addu $at, $at, $a0 -/* E8344 802C3994 AC33A898 */ sw $s3, -0x5768($at) +/* E8344 802C3994 AC33A898 */ sw $s3, %lo(gScriptIndexList)($at) /* E8348 802C3998 8E030144 */ lw $v1, 0x144($s0) /* E834C 802C399C 24420001 */ addiu $v0, $v0, 1 /* E8350 802C39A0 ACA20000 */ sw $v0, ($a1) @@ -135,8 +135,8 @@ glabel start_child_script .L802C39B0: /* E8360 802C39B0 0C0B0CE4 */ jal func_802C3390 /* E8364 802C39B4 0200202D */ daddu $a0, $s0, $zero -/* E8368 802C39B8 3C03802E */ lui $v1, 0x802e -/* E836C 802C39BC 24639CA0 */ addiu $v1, $v1, -0x6360 +/* E8368 802C39B8 3C03802E */ lui $v1, %hi(gStaticScriptCounter) +/* E836C 802C39BC 24639CA0 */ addiu $v1, $v1, %lo(gStaticScriptCounter) /* E8370 802C39C0 8C620000 */ lw $v0, ($v1) /* E8374 802C39C4 14400004 */ bnez $v0, .L802C39D8 /* E8378 802C39C8 0200102D */ daddu $v0, $s0, $zero diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_script.s b/asm/nonmatchings/code_e79b0_len_1920/start_script.s index 371bfd3a7d..f3958ff505 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_script.s @@ -50,8 +50,8 @@ glabel start_script /* E7E30 802C3480 00000000 */ nop .L802C3484: /* E7E34 802C3484 36620001 */ ori $v0, $s3, 1 -/* E7E38 802C3488 3C03802E */ lui $v1, 0x802e -/* E7E3C 802C348C 24639CA0 */ addiu $v1, $v1, -0x6360 +/* E7E38 802C3488 3C03802E */ lui $v1, %hi(gStaticScriptCounter) +/* E7E3C 802C348C 24639CA0 */ addiu $v1, $v1, %lo(gStaticScriptCounter) /* E7E40 802C3490 A2020000 */ sb $v0, ($s0) /* E7E44 802C3494 A2000002 */ sb $zero, 2($s0) /* E7E48 802C3498 A2140003 */ sb $s4, 3($s0) @@ -107,9 +107,9 @@ glabel start_script /* E7F08 802C3558 24A5AC98 */ addiu $a1, $a1, %lo(gScriptListCount) /* E7F0C 802C355C 8CA20000 */ lw $v0, ($a1) /* E7F10 802C3560 00022080 */ sll $a0, $v0, 2 -/* E7F14 802C3564 3C01802E */ lui $at, 0x802e +/* E7F14 802C3564 3C01802E */ lui $at, %hi(gScriptIndexList) /* E7F18 802C3568 00240821 */ addu $at, $at, $a0 -/* E7F1C 802C356C AC32A898 */ sw $s2, -0x5768($at) +/* E7F1C 802C356C AC32A898 */ sw $s2, %lo(gScriptIndexList)($at) /* E7F20 802C3570 8E030144 */ lw $v1, 0x144($s0) /* E7F24 802C3574 24420001 */ addiu $v0, $v0, 1 /* E7F28 802C3578 ACA20000 */ sw $v0, ($a1) @@ -119,8 +119,8 @@ glabel start_script .L802C3588: /* E7F38 802C3588 0C0B0CE4 */ jal func_802C3390 /* E7F3C 802C358C 0200202D */ daddu $a0, $s0, $zero -/* E7F40 802C3590 3C03802E */ lui $v1, 0x802e -/* E7F44 802C3594 24639CA0 */ addiu $v1, $v1, -0x6360 +/* E7F40 802C3590 3C03802E */ lui $v1, %hi(gStaticScriptCounter) +/* E7F44 802C3594 24639CA0 */ addiu $v1, $v1, %lo(gStaticScriptCounter) /* E7F48 802C3598 8C620000 */ lw $v0, ($v1) /* E7F4C 802C359C 14400004 */ bnez $v0, .L802C35B0 /* E7F50 802C35A0 0200102D */ daddu $v0, $s0, $zero diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s b/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s index 022a1a52a4..70e977f9ea 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s @@ -52,8 +52,8 @@ glabel start_script_in_group /* E8028 802C3678 00000000 */ nop .L802C367C: /* E802C 802C367C 36620001 */ ori $v0, $s3, 1 -/* E8030 802C3680 3C03802E */ lui $v1, 0x802e -/* E8034 802C3684 24639CA0 */ addiu $v1, $v1, -0x6360 +/* E8030 802C3680 3C03802E */ lui $v1, %hi(gStaticScriptCounter) +/* E8034 802C3684 24639CA0 */ addiu $v1, $v1, %lo(gStaticScriptCounter) /* E8038 802C3688 A2020000 */ sb $v0, ($s0) /* E803C 802C368C A2000002 */ sb $zero, 2($s0) /* E8040 802C3690 A2140003 */ sb $s4, 3($s0) @@ -108,9 +108,9 @@ glabel start_script_in_group /* E80FC 802C374C 24A5AC98 */ addiu $a1, $a1, %lo(gScriptListCount) /* E8100 802C3750 8CA20000 */ lw $v0, ($a1) /* E8104 802C3754 00022080 */ sll $a0, $v0, 2 -/* E8108 802C3758 3C01802E */ lui $at, 0x802e +/* E8108 802C3758 3C01802E */ lui $at, %hi(gScriptIndexList) /* E810C 802C375C 00240821 */ addu $at, $at, $a0 -/* E8110 802C3760 AC32A898 */ sw $s2, -0x5768($at) +/* E8110 802C3760 AC32A898 */ sw $s2, %lo(gScriptIndexList)($at) /* E8114 802C3764 8E030144 */ lw $v1, 0x144($s0) /* E8118 802C3768 24420001 */ addiu $v0, $v0, 1 /* E811C 802C376C ACA20000 */ sw $v0, ($a1) @@ -120,8 +120,8 @@ glabel start_script_in_group .L802C377C: /* E812C 802C377C 0C0B0CE4 */ jal func_802C3390 /* E8130 802C3780 0200202D */ daddu $a0, $s0, $zero -/* E8134 802C3784 3C03802E */ lui $v1, 0x802e -/* E8138 802C3788 24639CA0 */ addiu $v1, $v1, -0x6360 +/* E8134 802C3784 3C03802E */ lui $v1, %hi(gStaticScriptCounter) +/* E8138 802C3788 24639CA0 */ addiu $v1, $v1, %lo(gStaticScriptCounter) /* E813C 802C378C 8C620000 */ lw $v0, ($v1) /* E8140 802C3790 14400004 */ bnez $v0, .L802C37A4 /* E8144 802C3794 0200102D */ daddu $v0, $s0, $zero diff --git a/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s b/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s index f9dd62f99f..32607712cf 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s +++ b/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s @@ -32,8 +32,8 @@ glabel update_scripts /* E8790 802C3DE0 2415FFFF */ addiu $s5, $zero, -1 /* E8794 802C3DE4 3C14802E */ lui $s4, %hi(gScriptIdList) /* E8798 802C3DE8 2694AA98 */ addiu $s4, $s4, %lo(gScriptIdList) -/* E879C 802C3DEC 3C13802E */ lui $s3, 0x802e -/* E87A0 802C3DF0 2673A898 */ addiu $s3, $s3, -0x5768 +/* E879C 802C3DEC 3C13802E */ lui $s3, %hi(gScriptIndexList) +/* E87A0 802C3DF0 2673A898 */ addiu $s3, $s3, %lo(gScriptIndexList) .L802C3DF4: /* E87A4 802C3DF4 8E620000 */ lw $v0, ($s3) /* E87A8 802C3DF8 3C03802E */ lui $v1, %hi(gCurrentScriptListPtr) diff --git a/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s b/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s index 79796a39cf..6575915f85 100644 --- a/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s +++ b/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s @@ -9,8 +9,8 @@ glabel nuBoot /* 39CC0 8005E8C0 3C10800A */ lui $s0, 0x800a /* 39CC4 8005E8C4 26104270 */ addiu $s0, $s0, 0x4270 /* 39CC8 8005E8C8 0200202D */ daddu $a0, $s0, $zero -/* 39CCC 8005E8CC 3C02800A */ lui $v0, 0x800a -/* 39CD0 8005E8D0 244265D0 */ addiu $v0, $v0, 0x65d0 +/* 39CCC 8005E8CC 3C02800A */ lui $v0, %hi(nuScStack) +/* 39CD0 8005E8D0 244265D0 */ addiu $v0, $v0, %lo(nuScStack) /* 39CD4 8005E8D4 AFA20010 */ sw $v0, 0x10($sp) /* 39CD8 8005E8D8 2402000A */ addiu $v0, $zero, 0xa /* 39CDC 8005E8DC 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s index c9c0aba6bc..94beff961d 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s @@ -34,19 +34,19 @@ glabel nuGfxThread /* 3B6B8 800602B8 080180A3 */ j .L8006028C /* 3B6BC 800602BC 00000000 */ nop .L800602C0: -/* 3B6C0 800602C0 3C028009 */ lui $v0, 0x8009 -/* 3B6C4 800602C4 8C423D10 */ lw $v0, 0x3d10($v0) +/* 3B6C0 800602C0 3C028009 */ lui $v0, %hi(nuGfxFunc) +/* 3B6C4 800602C4 8C423D10 */ lw $v0, %lo(nuGfxFunc)($v0) /* 3B6C8 800602C8 1040FFF0 */ beqz $v0, .L8006028C /* 3B6CC 800602CC 00000000 */ nop -/* 3B6D0 800602D0 3C04800A */ lui $a0, 0x800a -/* 3B6D4 800602D4 8C84A618 */ lw $a0, -0x59e8($a0) +/* 3B6D0 800602D0 3C04800A */ lui $a0, %hi(nuGfxTaskSpool) +/* 3B6D4 800602D4 8C84A618 */ lw $a0, %lo(nuGfxTaskSpool)($a0) /* 3B6D8 800602D8 0040F809 */ jalr $v0 /* 3B6DC 800602DC 00000000 */ nop /* 3B6E0 800602E0 080180A3 */ j .L8006028C /* 3B6E4 800602E4 00000000 */ nop .L800602E8: -/* 3B6E8 800602E8 3C028009 */ lui $v0, 0x8009 -/* 3B6EC 800602EC 8C423D14 */ lw $v0, 0x3d14($v0) +/* 3B6E8 800602E8 3C028009 */ lui $v0, %hi(nuGfxPreNMIFunc) +/* 3B6EC 800602EC 8C423D14 */ lw $v0, %lo(nuGfxPreNMIFunc)($v0) /* 3B6F0 800602F0 1040FFE6 */ beqz $v0, .L8006028C /* 3B6F4 800602F4 00000000 */ nop /* 3B6F8 800602F8 0040F809 */ jalr $v0 diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s index ce717b8f1e..ae204d2236 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s @@ -40,8 +40,8 @@ glabel nuPiReadRomOverlay /* 3B568 80060168 24104000 */ addiu $s0, $zero, 0x4000 .L8006016C: /* 3B56C 8006016C 27A50010 */ addiu $a1, $sp, 0x10 -/* 3B570 80060170 3C04800A */ lui $a0, 0x800a -/* 3B574 80060174 8C84A638 */ lw $a0, -0x59c8($a0) +/* 3B570 80060170 3C04800A */ lui $a0, %hi(carthandle) +/* 3B574 80060174 8C84A638 */ lw $a0, %lo(carthandle)($a0) /* 3B578 80060178 0000302D */ daddu $a2, $zero, $zero /* 3B57C 8006017C AFB30018 */ sw $s3, 0x18($sp) /* 3B580 80060180 AFB2001C */ sw $s2, 0x1c($sp) diff --git a/asm/nonmatchings/os/code_3b910_len_410/contQuery.s b/asm/nonmatchings/os/code_3b910_len_410/contQuery.s index 165ebe811e..6e918c2d7b 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contQuery.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contQuery.s @@ -4,8 +4,8 @@ glabel contQuery /* 3BC70 80060870 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3BC74 80060874 AFB00010 */ sw $s0, 0x10($sp) -/* 3BC78 80060878 3C10800E */ lui $s0, 0x800e -/* 3BC7C 8006087C 2610AC78 */ addiu $s0, $s0, -0x5388 +/* 3BC78 80060878 3C10800E */ lui $s0, %hi(nuSiMesgQ) +/* 3BC7C 8006087C 2610AC78 */ addiu $s0, $s0, %lo(nuSiMesgQ) /* 3BC80 80060880 AFBF0014 */ sw $ra, 0x14($sp) /* 3BC84 80060884 0C018640 */ jal osContStartQuery /* 3BC88 80060888 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/os/code_3b910_len_410/contReadData.s b/asm/nonmatchings/os/code_3b910_len_410/contReadData.s index 9f50fa0340..b75930ce6b 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contReadData.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contReadData.s @@ -6,14 +6,14 @@ glabel contReadData /* 3BB3C 8006073C AFBF0014 */ sw $ra, 0x14($sp) /* 3BB40 80060740 AFB00010 */ sw $s0, 0x10($sp) /* 3BB44 80060744 8C90000C */ lw $s0, 0xc($a0) -/* 3BB48 80060748 3C04800E */ lui $a0, 0x800e -/* 3BB4C 8006074C 2484AC78 */ addiu $a0, $a0, -0x5388 +/* 3BB48 80060748 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3BB4C 8006074C 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BB50 80060750 0C018668 */ jal osContStartReadData /* 3BB54 80060754 00000000 */ nop /* 3BB58 80060758 14400012 */ bnez $v0, .L800607A4 /* 3BB5C 8006075C 0000282D */ daddu $a1, $zero, $zero -/* 3BB60 80060760 3C04800E */ lui $a0, 0x800e -/* 3BB64 80060764 2484AC78 */ addiu $a0, $a0, -0x5388 +/* 3BB60 80060760 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3BB64 80060764 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BB68 80060768 0C0195BC */ jal osRecvMesg /* 3BB6C 8006076C 24060001 */ addiu $a2, $zero, 1 /* 3BB70 80060770 3C04800E */ lui $a0, 0x800e diff --git a/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s b/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s index 8a7fba3227..e56c9dbde9 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s @@ -11,14 +11,14 @@ glabel contReadNW /* 3BBCC 800607CC AFBF0014 */ sw $ra, 0x14($sp) /* 3BBD0 800607D0 0C0195BC */ jal osRecvMesg /* 3BBD4 800607D4 00A0302D */ daddu $a2, $a1, $zero -/* 3BBD8 800607D8 3C04800E */ lui $a0, 0x800e -/* 3BBDC 800607DC 2484AC78 */ addiu $a0, $a0, -0x5388 +/* 3BBD8 800607D8 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3BBDC 800607DC 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BBE0 800607E0 0C018668 */ jal osContStartReadData /* 3BBE4 800607E4 00000000 */ nop /* 3BBE8 800607E8 14400013 */ bnez $v0, .L80060838 /* 3BBEC 800607EC 0000282D */ daddu $a1, $zero, $zero -/* 3BBF0 800607F0 3C04800E */ lui $a0, 0x800e -/* 3BBF4 800607F4 2484AC78 */ addiu $a0, $a0, -0x5388 +/* 3BBF0 800607F0 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3BBF4 800607F4 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BBF8 800607F8 0C0195BC */ jal osRecvMesg /* 3BBFC 800607FC 24060001 */ addiu $a2, $zero, 1 /* 3BC00 80060800 3C04800E */ lui $a0, 0x800e @@ -26,9 +26,9 @@ glabel contReadNW /* 3BC08 80060808 0000282D */ daddu $a1, $zero, $zero /* 3BC0C 8006080C 0C019608 */ jal osSendMesg /* 3BC10 80060810 24060001 */ addiu $a2, $zero, 1 -/* 3BC14 80060814 3C04800B */ lui $a0, 0x800b +/* 3BC14 80060814 3C04800B */ lui $a0, %hi(nuContData) /* 3BC18 80060818 0C01868A */ jal osContGetReadData -/* 3BC1C 8006081C 24841D68 */ addiu $a0, $a0, 0x1d68 +/* 3BC1C 8006081C 24841D68 */ addiu $a0, $a0, %lo(nuContData) /* 3BC20 80060820 3C04800E */ lui $a0, 0x800e /* 3BC24 80060824 2484C040 */ addiu $a0, $a0, -0x3fc0 /* 3BC28 80060828 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s b/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s index b2705c352f..11b8262d2a 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s @@ -14,14 +14,14 @@ glabel contRetrace /* 3BA80 80060680 0000282D */ daddu $a1, $zero, $zero /* 3BA84 80060684 0C0195BC */ jal osRecvMesg /* 3BA88 80060688 00A0302D */ daddu $a2, $a1, $zero -/* 3BA8C 8006068C 3C04800E */ lui $a0, 0x800e -/* 3BA90 80060690 2484AC78 */ addiu $a0, $a0, -0x5388 +/* 3BA8C 8006068C 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3BA90 80060690 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BA94 80060694 0C018668 */ jal osContStartReadData /* 3BA98 80060698 00000000 */ nop /* 3BA9C 8006069C 14400016 */ bnez $v0, .L800606F8 /* 3BAA0 800606A0 0000282D */ daddu $a1, $zero, $zero -/* 3BAA4 800606A4 3C04800E */ lui $a0, 0x800e -/* 3BAA8 800606A8 2484AC78 */ addiu $a0, $a0, -0x5388 +/* 3BAA4 800606A4 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3BAA8 800606A8 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BAAC 800606AC 0C0195BC */ jal osRecvMesg /* 3BAB0 800606B0 24060001 */ addiu $a2, $zero, 1 /* 3BAB4 800606B4 3C02800A */ lui $v0, 0x800a @@ -33,9 +33,9 @@ glabel contRetrace /* 3BACC 800606CC 2484C040 */ addiu $a0, $a0, -0x3fc0 /* 3BAD0 800606D0 0C019608 */ jal osSendMesg /* 3BAD4 800606D4 24060001 */ addiu $a2, $zero, 1 -/* 3BAD8 800606D8 3C04800B */ lui $a0, 0x800b +/* 3BAD8 800606D8 3C04800B */ lui $a0, %hi(nuContData) /* 3BADC 800606DC 0C01868A */ jal osContGetReadData -/* 3BAE0 800606E0 24841D68 */ addiu $a0, $a0, 0x1d68 +/* 3BAE0 800606E0 24841D68 */ addiu $a0, $a0, %lo(nuContData) /* 3BAE4 800606E4 3C04800E */ lui $a0, 0x800e /* 3BAE8 800606E8 2484C040 */ addiu $a0, $a0, -0x3fc0 /* 3BAEC 800606EC 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s b/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s index bbe23df549..98a2fc619e 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s @@ -20,7 +20,6 @@ glabel __osMotorAccess /* 4323C 80067E3C 00449021 */ addu $s2, $v0, $a0 /* 43240 80067E40 08019FCA */ j .L80067F28 /* 43244 80067E44 24020005 */ addiu $v0, $zero, 5 - .L80067E48: /* 43248 80067E48 0C019771 */ jal osSiGetAccess /* 4324C 80067E4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s index 07ad8254b5..1b0649ee82 100644 --- a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s +++ b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s @@ -153,8 +153,8 @@ glabel osInitialize /* 45D50 8006A950 0C01925C */ jal bzero /* 45D54 8006A954 24050040 */ addiu $a1, $zero, 0x40 .L8006A958: -/* 45D58 8006A958 3C038000 */ lui $v1, 0x8000 -/* 45D5C 8006A95C 8C630300 */ lw $v1, 0x300($v1) +/* 45D58 8006A958 3C038000 */ lui $v1, %hi(osTvType) +/* 45D5C 8006A95C 8C630300 */ lw $v1, %lo(osTvType)($v1) /* 45D60 8006A960 54600004 */ bnel $v1, $zero, .L8006A974 /* 45D64 8006A964 24020002 */ addiu $v0, $zero, 2 /* 45D68 8006A968 3C0202F5 */ lui $v0, 0x2f5 diff --git a/asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s b/asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s deleted file mode 100644 index 5761ee5ded..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel IP6_Hdlr -/* 46044 8006AC44 2401DFFF */ addiu $at, $zero, -0x2001 -/* 46048 8006AC48 1000FFF0 */ b next_interrupt -/* 4604C 8006AC4C 02018024 */ and $s0, $s0, $at diff --git a/asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s b/asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s deleted file mode 100644 index 4eeb3416e5..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel IP7_Hdlr -/* 46050 8006AC50 2401BFFF */ addiu $at, $zero, -0x4001 -/* 46054 8006AC54 1000FFED */ b next_interrupt -/* 46058 8006AC58 02018024 */ and $s0, $s0, $at diff --git a/asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s b/asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s deleted file mode 100644 index f60eca7cb2..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel NoMoreRcpInts -/* 46230 8006AE30 2401FBFF */ addiu $at, $zero, -0x401 -/* 46234 8006AE34 1000FF75 */ b next_interrupt -/* 46238 8006AE38 02018024 */ and $s0, $s0, $at diff --git a/asm/nonmatchings/os/code_45df0_len_970/ai.s b/asm/nonmatchings/os/code_45df0_len_970/ai.s deleted file mode 100644 index 3e36a22fca..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/ai.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel ai -/* 46164 8006AD64 32290004 */ andi $t1, $s1, 4 -/* 46168 8006AD68 11200009 */ beqz $t1, si -/* 4616C 8006AD6C 00000000 */ nop -/* 46170 8006AD70 3231003B */ andi $s1, $s1, 0x3b -/* 46174 8006AD74 24090001 */ addiu $t1, $zero, 1 -/* 46178 8006AD78 3C01A450 */ lui $at, 0xa450 -/* 4617C 8006AD7C AC29000C */ sw $t1, 0xc($at) -/* 46180 8006AD80 0C01ABDF */ jal send_mesg -/* 46184 8006AD84 24040030 */ addiu $a0, $zero, 0x30 -/* 46188 8006AD88 12200029 */ beqz $s1, NoMoreRcpInts -/* 4618C 8006AD8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/cart.s b/asm/nonmatchings/os/code_45df0_len_970/cart.s deleted file mode 100644 index afbae0501d..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/cart.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel cart -/* 46080 8006AC80 2401F7FF */ addiu $at, $zero, -0x801 -/* 46084 8006AC84 02018024 */ and $s0, $s0, $at -/* 46088 8006AC88 3C098009 */ lui $t1, 0x8009 -/* 4608C 8006AC8C 25295910 */ addiu $t1, $t1, 0x5910 -/* 46090 8006AC90 21290008 */ addi $t1, $t1, 8 -/* 46094 8006AC94 8D2A0000 */ lw $t2, ($t1) -/* 46098 8006AC98 11400007 */ beqz $t2, .L8006ACB8 -/* 4609C 8006AC9C 00000000 */ nop -/* 460A0 8006ACA0 0140F809 */ jalr $t2 -/* 460A4 8006ACA4 8D3D0004 */ lw $sp, 4($t1) -/* 460A8 8006ACA8 10400003 */ beqz $v0, .L8006ACB8 -/* 460AC 8006ACAC 00000000 */ nop -/* 460B0 8006ACB0 10000093 */ b redispatch -/* 460B4 8006ACB4 00000000 */ nop -.L8006ACB8: -/* 460B8 8006ACB8 0C01ABDF */ jal send_mesg -/* 460BC 8006ACBC 24040010 */ addiu $a0, $zero, 0x10 -/* 460C0 8006ACC0 1000FFD2 */ b next_interrupt -/* 460C4 8006ACC4 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/counter.s b/asm/nonmatchings/os/code_45df0_len_970/counter.s deleted file mode 100644 index e58d2eb000..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/counter.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel counter -/* 4605C 8006AC5C 40095800 */ mfc0 $t1, $11 -/* 46060 8006AC60 40895800 */ mtc0 $t1, $11 -/* 46064 8006AC64 24040018 */ addiu $a0, $zero, 0x18 -/* 46068 8006AC68 0C01ABDF */ jal send_mesg -/* 4606C 8006AC6C 00000000 */ nop -/* 46070 8006AC70 3C01FFFF */ lui $at, 0xffff -/* 46074 8006AC74 34217FFF */ ori $at, $at, 0x7fff -/* 46078 8006AC78 1000FFE4 */ b next_interrupt -/* 4607C 8006AC7C 02018024 */ and $s0, $s0, $at diff --git a/asm/nonmatchings/os/code_45df0_len_970/dp.s b/asm/nonmatchings/os/code_45df0_len_970/dp.s deleted file mode 100644 index 8b2ed360ab..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/dp.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel dp -/* 4620C 8006AE0C 32290020 */ andi $t1, $s1, 0x20 -/* 46210 8006AE10 11200007 */ beqz $t1, NoMoreRcpInts -/* 46214 8006AE14 00000000 */ nop -/* 46218 8006AE18 3231001F */ andi $s1, $s1, 0x1f -/* 4621C 8006AE1C 24090800 */ addiu $t1, $zero, 0x800 -/* 46220 8006AE20 3C01A430 */ lui $at, 0xa430 -/* 46224 8006AE24 AC290000 */ sw $t1, ($at) -/* 46228 8006AE28 0C01ABDF */ jal send_mesg -/* 4622C 8006AE2C 24040048 */ addiu $a0, $zero, 0x48 diff --git a/asm/nonmatchings/os/code_45df0_len_970/endrcp.s b/asm/nonmatchings/os/code_45df0_len_970/endrcp.s deleted file mode 100644 index 6db26e8e31..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/endrcp.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel endrcp -/* 45F6C 8006AB6C AF490128 */ sw $t1, 0x128($k0) -/* 45F70 8006AB70 40087000 */ mfc0 $t0, $14 -/* 45F74 8006AB74 AF48011C */ sw $t0, 0x11c($k0) -/* 45F78 8006AB78 8F480018 */ lw $t0, 0x18($k0) -/* 45F7C 8006AB7C 11000014 */ beqz $t0, .L8006ABD0 -/* 45F80 8006AB80 00000000 */ nop -/* 45F84 8006AB84 4448F800 */ cfc1 $t0, $31 -/* 45F88 8006AB88 00000000 */ nop -/* 45F8C 8006AB8C AF48012C */ sw $t0, 0x12c($k0) -/* 45F90 8006AB90 F7400130 */ sdc1 $f0, 0x130($k0) -/* 45F94 8006AB94 F7420138 */ sdc1 $f2, 0x138($k0) -/* 45F98 8006AB98 F7440140 */ sdc1 $f4, 0x140($k0) -/* 45F9C 8006AB9C F7460148 */ sdc1 $f6, 0x148($k0) -/* 45FA0 8006ABA0 F7480150 */ sdc1 $f8, 0x150($k0) -/* 45FA4 8006ABA4 F74A0158 */ sdc1 $f10, 0x158($k0) -/* 45FA8 8006ABA8 F74C0160 */ sdc1 $f12, 0x160($k0) -/* 45FAC 8006ABAC F74E0168 */ sdc1 $f14, 0x168($k0) -/* 45FB0 8006ABB0 F7500170 */ sdc1 $f16, 0x170($k0) -/* 45FB4 8006ABB4 F7520178 */ sdc1 $f18, 0x178($k0) -/* 45FB8 8006ABB8 F7540180 */ sdc1 $f20, 0x180($k0) -/* 45FBC 8006ABBC F7560188 */ sdc1 $f22, 0x188($k0) -/* 45FC0 8006ABC0 F7580190 */ sdc1 $f24, 0x190($k0) -/* 45FC4 8006ABC4 F75A0198 */ sdc1 $f26, 0x198($k0) -/* 45FC8 8006ABC8 F75C01A0 */ sdc1 $f28, 0x1a0($k0) -/* 45FCC 8006ABCC F75E01A8 */ sdc1 $f30, 0x1a8($k0) -.L8006ABD0: -/* 45FD0 8006ABD0 40086800 */ mfc0 $t0, $13 -/* 45FD4 8006ABD4 AF480120 */ sw $t0, 0x120($k0) -/* 45FD8 8006ABD8 24090002 */ addiu $t1, $zero, 2 -/* 45FDC 8006ABDC A7490010 */ sh $t1, 0x10($k0) -/* 45FE0 8006ABE0 3109007C */ andi $t1, $t0, 0x7c -/* 45FE4 8006ABE4 240A0024 */ addiu $t2, $zero, 0x24 -/* 45FE8 8006ABE8 112A00BF */ beq $t1, $t2, handle_break -/* 45FEC 8006ABEC 00000000 */ nop -/* 45FF0 8006ABF0 240A002C */ addiu $t2, $zero, 0x2c -/* 45FF4 8006ABF4 112A0110 */ beq $t1, $t2, handle_CPU -/* 45FF8 8006ABF8 00000000 */ nop -/* 45FFC 8006ABFC 240A0000 */ addiu $t2, $zero, 0 -/* 46000 8006AC00 152A00D2 */ bne $t1, $t2, panic -/* 46004 8006AC04 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s b/asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s deleted file mode 100644 index 31993954bf..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel enqueueRunning -/* 46334 8006AF34 3C098009 */ lui $t1, 0x8009 -/* 46338 8006AF38 25294658 */ addiu $t1, $t1, 0x4658 -/* 4633C 8006AF3C 8D2A0000 */ lw $t2, ($t1) -/* 46340 8006AF40 AF4A0000 */ sw $t2, ($k0) -/* 46344 8006AF44 0801AC75 */ j osDispatchThread -/* 46348 8006AF48 AD3A0000 */ sw $k0, ($t1) diff --git a/asm/nonmatchings/os/code_45df0_len_970/firstnmi.s b/asm/nonmatchings/os/code_45df0_len_970/firstnmi.s deleted file mode 100644 index 8ee1d94eee..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/firstnmi.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel firstnmi -/* 4626C 8006AE6C 240A0001 */ addiu $t2, $zero, 1 -/* 46270 8006AE70 AD2A0000 */ sw $t2, ($t1) -/* 46274 8006AE74 0C01ABDF */ jal send_mesg -/* 46278 8006AE78 24040070 */ addiu $a0, $zero, 0x70 -/* 4627C 8006AE7C 2401EFFF */ addiu $at, $zero, -0x1001 -/* 46280 8006AE80 02018024 */ and $s0, $s0, $at -/* 46284 8006AE84 3C0A8009 */ lui $t2, 0x8009 -/* 46288 8006AE88 8D4A4658 */ lw $t2, 0x4658($t2) -/* 4628C 8006AE8C 8D5B0118 */ lw $k1, 0x118($t2) -/* 46290 8006AE90 2401EFFF */ addiu $at, $zero, -0x1001 -/* 46294 8006AE94 0361D824 */ and $k1, $k1, $at -/* 46298 8006AE98 10000019 */ b redispatch -/* 4629C 8006AE9C AD5B0118 */ sw $k1, 0x118($t2) diff --git a/asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s b/asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s deleted file mode 100644 index 87d74d87e3..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8006A9F0 -/* 45DF0 8006A9F0 3C1A8007 */ lui $k0, 0x8007 -/* 45DF4 8006A9F4 275AAA00 */ addiu $k0, $k0, -0x5600 -/* 45DF8 8006A9F8 03400008 */ jr $k0 -/* 45DFC 8006A9FC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s b/asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s deleted file mode 100644 index c817e3ef26..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel handle_CPU -/* 46438 8006B038 3C013000 */ lui $at, 0x3000 -/* 4643C 8006B03C 01014824 */ and $t1, $t0, $at -/* 46440 8006B040 00094F02 */ srl $t1, $t1, 0x1c -/* 46444 8006B044 240A0001 */ addiu $t2, $zero, 1 -/* 46448 8006B048 152AFFC0 */ bne $t1, $t2, panic -/* 4644C 8006B04C 00000000 */ nop -/* 46450 8006B050 24090001 */ addiu $t1, $zero, 1 -/* 46454 8006B054 AF490018 */ sw $t1, 0x18($k0) -/* 46458 8006B058 8F5B0118 */ lw $k1, 0x118($k0) -/* 4645C 8006B05C 3C012000 */ lui $at, 0x2000 -/* 46460 8006B060 0361D825 */ or $k1, $k1, $at -/* 46464 8006B064 1000FFB3 */ b enqueueRunning -/* 46468 8006B068 AF5B0118 */ sw $k1, 0x118($k0) diff --git a/asm/nonmatchings/os/code_45df0_len_970/handle_break.s b/asm/nonmatchings/os/code_45df0_len_970/handle_break.s deleted file mode 100644 index 20dd4617ff..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/handle_break.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel handle_break -/* 462E8 8006AEE8 24090001 */ addiu $t1, $zero, 1 -/* 462EC 8006AEEC A7490012 */ sh $t1, 0x12($k0) -/* 462F0 8006AEF0 0C01ABDF */ jal send_mesg -/* 462F4 8006AEF4 24040050 */ addiu $a0, $zero, 0x50 -/* 462F8 8006AEF8 10000001 */ b redispatch -/* 462FC 8006AEFC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s b/asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s deleted file mode 100644 index 14caf50460..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s +++ /dev/null @@ -1,5 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel handle_interrupt -/* 46008 8006AC08 03688024 */ and $s0, $k1, $t0 diff --git a/asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s b/asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s deleted file mode 100644 index a6984f9923..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel next_interrupt -/* 4600C 8006AC0C 3209FF00 */ andi $t1, $s0, 0xff00 -/* 46010 8006AC10 00095302 */ srl $t2, $t1, 0xc -/* 46014 8006AC14 15400003 */ bnez $t2, .L8006AC24 -/* 46018 8006AC18 00000000 */ nop -/* 4601C 8006AC1C 00095202 */ srl $t2, $t1, 8 -/* 46020 8006AC20 214A0010 */ addi $t2, $t2, 0x10 -.L8006AC24: -/* 46024 8006AC24 3C01800A */ lui $at, 0x800a -/* 46028 8006AC28 002A0821 */ addu $at, $at, $t2 -/* 4602C 8006AC2C 902A9D80 */ lbu $t2, -0x6280($at) -/* 46030 8006AC30 3C01800A */ lui $at, 0x800a -/* 46034 8006AC34 002A0821 */ addu $at, $at, $t2 -/* 46038 8006AC38 8C2A9DA0 */ lw $t2, -0x6260($at) -/* 4603C 8006AC3C 01400008 */ jr $t2 -/* 46040 8006AC40 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s b/asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s deleted file mode 100644 index cf6ebafed5..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel noEnqueue -/* 4656C 8006B16C 0801AC75 */ j osDispatchThread -/* 46570 8006B170 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s b/asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s deleted file mode 100644 index 73fccd312a..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osCleanupThread -/* 46750 8006B350 00002021 */ addu $a0, $zero, $zero -/* 46754 8006B354 0C01B254 */ jal osDestroyThread -/* 46758 8006B358 00000000 */ nop -/* 4675C 8006B35C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s b/asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s deleted file mode 100644 index fc025230c3..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osDispatchThread -/* 465D4 8006B1D4 3C048009 */ lui $a0, 0x8009 -/* 465D8 8006B1D8 0C01AC6F */ jal osPopThread -/* 465DC 8006B1DC 24844658 */ addiu $a0, $a0, 0x4658 -/* 465E0 8006B1E0 3C018009 */ lui $at, 0x8009 -/* 465E4 8006B1E4 AC224660 */ sw $v0, 0x4660($at) -/* 465E8 8006B1E8 24080004 */ addiu $t0, $zero, 4 -/* 465EC 8006B1EC A4480010 */ sh $t0, 0x10($v0) -/* 465F0 8006B1F0 0040D021 */ addu $k0, $v0, $zero -/* 465F4 8006B1F4 8F5B0118 */ lw $k1, 0x118($k0) -/* 465F8 8006B1F8 3C088009 */ lui $t0, 0x8009 -/* 465FC 8006B1FC 25085900 */ addiu $t0, $t0, 0x5900 -/* 46600 8006B200 8D080000 */ lw $t0, ($t0) -/* 46604 8006B204 3108FF00 */ andi $t0, $t0, 0xff00 -/* 46608 8006B208 3369FF00 */ andi $t1, $k1, 0xff00 -/* 4660C 8006B20C 01284824 */ and $t1, $t1, $t0 -/* 46610 8006B210 3C01FFFF */ lui $at, 0xffff -/* 46614 8006B214 342100FF */ ori $at, $at, 0xff -/* 46618 8006B218 0361D824 */ and $k1, $k1, $at -/* 4661C 8006B21C 0369D825 */ or $k1, $k1, $t1 -/* 46620 8006B220 409B6000 */ mtc0 $k1, $12 -/* 46624 8006B224 DF410020 */ ld $at, 0x20($k0) -/* 46628 8006B228 DF420028 */ ld $v0, 0x28($k0) -/* 4662C 8006B22C DF430030 */ ld $v1, 0x30($k0) -/* 46630 8006B230 DF440038 */ ld $a0, 0x38($k0) -/* 46634 8006B234 DF450040 */ ld $a1, 0x40($k0) -/* 46638 8006B238 DF460048 */ ld $a2, 0x48($k0) -/* 4663C 8006B23C DF470050 */ ld $a3, 0x50($k0) -/* 46640 8006B240 DF480058 */ ld $t0, 0x58($k0) -/* 46644 8006B244 DF490060 */ ld $t1, 0x60($k0) -/* 46648 8006B248 DF4A0068 */ ld $t2, 0x68($k0) -/* 4664C 8006B24C DF4B0070 */ ld $t3, 0x70($k0) -/* 46650 8006B250 DF4C0078 */ ld $t4, 0x78($k0) -/* 46654 8006B254 DF4D0080 */ ld $t5, 0x80($k0) -/* 46658 8006B258 DF4E0088 */ ld $t6, 0x88($k0) -/* 4665C 8006B25C DF4F0090 */ ld $t7, 0x90($k0) -/* 46660 8006B260 DF500098 */ ld $s0, 0x98($k0) -/* 46664 8006B264 DF5100A0 */ ld $s1, 0xa0($k0) -/* 46668 8006B268 DF5200A8 */ ld $s2, 0xa8($k0) -/* 4666C 8006B26C DF5300B0 */ ld $s3, 0xb0($k0) -/* 46670 8006B270 DF5400B8 */ ld $s4, 0xb8($k0) -/* 46674 8006B274 DF5500C0 */ ld $s5, 0xc0($k0) -/* 46678 8006B278 DF5600C8 */ ld $s6, 0xc8($k0) -/* 4667C 8006B27C DF5700D0 */ ld $s7, 0xd0($k0) -/* 46680 8006B280 DF5800D8 */ ld $t8, 0xd8($k0) -/* 46684 8006B284 DF5900E0 */ ld $t9, 0xe0($k0) -/* 46688 8006B288 DF5C00E8 */ ld $gp, 0xe8($k0) -/* 4668C 8006B28C DF5D00F0 */ ld $sp, 0xf0($k0) -/* 46690 8006B290 DF5E00F8 */ ld $fp, 0xf8($k0) -/* 46694 8006B294 DF5F0100 */ ld $ra, 0x100($k0) -/* 46698 8006B298 DF5B0108 */ ld $k1, 0x108($k0) -/* 4669C 8006B29C 03600013 */ mtlo $k1 -/* 466A0 8006B2A0 DF5B0110 */ ld $k1, 0x110($k0) -/* 466A4 8006B2A4 03600011 */ mthi $k1 -/* 466A8 8006B2A8 8F5B011C */ lw $k1, 0x11c($k0) -/* 466AC 8006B2AC 409B7000 */ mtc0 $k1, $14 -/* 466B0 8006B2B0 8F5B0018 */ lw $k1, 0x18($k0) -/* 466B4 8006B2B4 13600013 */ beqz $k1, .L8006B304 -/* 466B8 8006B2B8 00000000 */ nop -/* 466BC 8006B2BC 8F5B012C */ lw $k1, 0x12c($k0) -/* 466C0 8006B2C0 44DBF800 */ ctc1 $k1, $31 -/* 466C4 8006B2C4 D7400130 */ ldc1 $f0, 0x130($k0) -/* 466C8 8006B2C8 D7420138 */ ldc1 $f2, 0x138($k0) -/* 466CC 8006B2CC D7440140 */ ldc1 $f4, 0x140($k0) -/* 466D0 8006B2D0 D7460148 */ ldc1 $f6, 0x148($k0) -/* 466D4 8006B2D4 D7480150 */ ldc1 $f8, 0x150($k0) -/* 466D8 8006B2D8 D74A0158 */ ldc1 $f10, 0x158($k0) -/* 466DC 8006B2DC D74C0160 */ ldc1 $f12, 0x160($k0) -/* 466E0 8006B2E0 D74E0168 */ ldc1 $f14, 0x168($k0) -/* 466E4 8006B2E4 D7500170 */ ldc1 $f16, 0x170($k0) -/* 466E8 8006B2E8 D7520178 */ ldc1 $f18, 0x178($k0) -/* 466EC 8006B2EC D7540180 */ ldc1 $f20, 0x180($k0) -/* 466F0 8006B2F0 D7560188 */ ldc1 $f22, 0x188($k0) -/* 466F4 8006B2F4 D7580190 */ ldc1 $f24, 0x190($k0) -/* 466F8 8006B2F8 D75A0198 */ ldc1 $f26, 0x198($k0) -/* 466FC 8006B2FC D75C01A0 */ ldc1 $f28, 0x1a0($k0) -/* 46700 8006B300 D75E01A8 */ ldc1 $f30, 0x1a8($k0) -.L8006B304: -/* 46704 8006B304 8F5B0128 */ lw $k1, 0x128($k0) -/* 46708 8006B308 3C1A8009 */ lui $k0, 0x8009 -/* 4670C 8006B30C 275A5900 */ addiu $k0, $k0, 0x5900 -/* 46710 8006B310 8F5A0000 */ lw $k0, ($k0) -/* 46714 8006B314 001AD402 */ srl $k0, $k0, 0x10 -/* 46718 8006B318 037AD824 */ and $k1, $k1, $k0 -/* 4671C 8006B31C 001BD840 */ sll $k1, $k1, 1 -/* 46720 8006B320 3C1A800A */ lui $k0, 0x800a -/* 46724 8006B324 275A9AA0 */ addiu $k0, $k0, -0x6560 -/* 46728 8006B328 037AD821 */ addu $k1, $k1, $k0 -/* 4672C 8006B32C 977B0000 */ lhu $k1, ($k1) -/* 46730 8006B330 3C1AA430 */ lui $k0, 0xa430 -/* 46734 8006B334 375A000C */ ori $k0, $k0, 0xc -/* 46738 8006B338 AF5B0000 */ sw $k1, ($k0) -/* 4673C 8006B33C 00000000 */ nop -/* 46740 8006B340 00000000 */ nop -/* 46744 8006B344 00000000 */ nop -/* 46748 8006B348 00000000 */ nop -/* 4674C 8006B34C 42000018 */ eret diff --git a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s b/asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s deleted file mode 100644 index 13824d8ed4..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osEnqueueAndYield -/* 4646C 8006B06C 3C058009 */ lui $a1, 0x8009 -/* 46470 8006B070 8CA54660 */ lw $a1, 0x4660($a1) -/* 46474 8006B074 40086000 */ mfc0 $t0, $12 -/* 46478 8006B078 35080002 */ ori $t0, $t0, 2 -/* 4647C 8006B07C ACA80118 */ sw $t0, 0x118($a1) -/* 46480 8006B080 FCB00098 */ sd $s0, 0x98($a1) -/* 46484 8006B084 FCB100A0 */ sd $s1, 0xa0($a1) -/* 46488 8006B088 FCB200A8 */ sd $s2, 0xa8($a1) -/* 4648C 8006B08C FCB300B0 */ sd $s3, 0xb0($a1) -/* 46490 8006B090 FCB400B8 */ sd $s4, 0xb8($a1) -/* 46494 8006B094 FCB500C0 */ sd $s5, 0xc0($a1) -/* 46498 8006B098 FCB600C8 */ sd $s6, 0xc8($a1) -/* 4649C 8006B09C FCB700D0 */ sd $s7, 0xd0($a1) -/* 464A0 8006B0A0 FCBC00E8 */ sd $gp, 0xe8($a1) -/* 464A4 8006B0A4 FCBD00F0 */ sd $sp, 0xf0($a1) -/* 464A8 8006B0A8 FCBE00F8 */ sd $fp, 0xf8($a1) -/* 464AC 8006B0AC FCBF0100 */ sd $ra, 0x100($a1) -/* 464B0 8006B0B0 ACBF011C */ sw $ra, 0x11c($a1) -/* 464B4 8006B0B4 8CBB0018 */ lw $k1, 0x18($a1) -/* 464B8 8006B0B8 1360000A */ beqz $k1, .L8006B0E4 -/* 464BC 8006B0BC 00000000 */ nop -/* 464C0 8006B0C0 445BF800 */ cfc1 $k1, $31 -/* 464C4 8006B0C4 00000000 */ nop -/* 464C8 8006B0C8 ACBB012C */ sw $k1, 0x12c($a1) -/* 464CC 8006B0CC F4B40180 */ sdc1 $f20, 0x180($a1) -/* 464D0 8006B0D0 F4B60188 */ sdc1 $f22, 0x188($a1) -/* 464D4 8006B0D4 F4B80190 */ sdc1 $f24, 0x190($a1) -/* 464D8 8006B0D8 F4BA0198 */ sdc1 $f26, 0x198($a1) -/* 464DC 8006B0DC F4BC01A0 */ sdc1 $f28, 0x1a0($a1) -/* 464E0 8006B0E0 F4BE01A8 */ sdc1 $f30, 0x1a8($a1) -.L8006B0E4: -/* 464E4 8006B0E4 8CBB0118 */ lw $k1, 0x118($a1) -/* 464E8 8006B0E8 3369FF00 */ andi $t1, $k1, 0xff00 -/* 464EC 8006B0EC 1120000D */ beqz $t1, .L8006B124 -/* 464F0 8006B0F0 00000000 */ nop -/* 464F4 8006B0F4 3C088009 */ lui $t0, 0x8009 -/* 464F8 8006B0F8 25085900 */ addiu $t0, $t0, 0x5900 -/* 464FC 8006B0FC 8D080000 */ lw $t0, ($t0) -/* 46500 8006B100 2401FFFF */ addiu $at, $zero, -1 -/* 46504 8006B104 01014026 */ xor $t0, $t0, $at -/* 46508 8006B108 3108FF00 */ andi $t0, $t0, 0xff00 -/* 4650C 8006B10C 01284825 */ or $t1, $t1, $t0 -/* 46510 8006B110 3C01FFFF */ lui $at, 0xffff -/* 46514 8006B114 342100FF */ ori $at, $at, 0xff -/* 46518 8006B118 0361D824 */ and $k1, $k1, $at -/* 4651C 8006B11C 0369D825 */ or $k1, $k1, $t1 -/* 46520 8006B120 ACBB0118 */ sw $k1, 0x118($a1) -.L8006B124: -/* 46524 8006B124 3C1BA430 */ lui $k1, 0xa430 -/* 46528 8006B128 8F7B000C */ lw $k1, 0xc($k1) -/* 4652C 8006B12C 1360000B */ beqz $k1, .L8006B15C -/* 46530 8006B130 00000000 */ nop -/* 46534 8006B134 3C1A8009 */ lui $k0, 0x8009 -/* 46538 8006B138 275A5900 */ addiu $k0, $k0, 0x5900 -/* 4653C 8006B13C 8F5A0000 */ lw $k0, ($k0) -/* 46540 8006B140 001AD402 */ srl $k0, $k0, 0x10 -/* 46544 8006B144 2401FFFF */ addiu $at, $zero, -1 -/* 46548 8006B148 0341D026 */ xor $k0, $k0, $at -/* 4654C 8006B14C 335A003F */ andi $k0, $k0, 0x3f -/* 46550 8006B150 8CA80128 */ lw $t0, 0x128($a1) -/* 46554 8006B154 0348D024 */ and $k0, $k0, $t0 -/* 46558 8006B158 037AD825 */ or $k1, $k1, $k0 -.L8006B15C: -/* 4655C 8006B15C 10800003 */ beqz $a0, noEnqueue -/* 46560 8006B160 ACBB0128 */ sw $k1, 0x128($a1) -/* 46564 8006B164 0C01AC5D */ jal osEnqueueThread -/* 46568 8006B168 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s b/asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s deleted file mode 100644 index 82e501fbaf..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osEnqueueThread -/* 46574 8006B174 0080C821 */ addu $t9, $a0, $zero -/* 46578 8006B178 8C980000 */ lw $t8, ($a0) -/* 4657C 8006B17C 8CAF0004 */ lw $t7, 4($a1) -/* 46580 8006B180 8F0E0004 */ lw $t6, 4($t8) -/* 46584 8006B184 01CF082A */ slt $at, $t6, $t7 -/* 46588 8006B188 14200007 */ bnez $at, .L8006B1A8 -/* 4658C 8006B18C 00000000 */ nop -.L8006B190: -/* 46590 8006B190 0300C821 */ addu $t9, $t8, $zero -/* 46594 8006B194 8F180000 */ lw $t8, ($t8) -/* 46598 8006B198 8F0E0004 */ lw $t6, 4($t8) -/* 4659C 8006B19C 01CF082A */ slt $at, $t6, $t7 -/* 465A0 8006B1A0 1020FFFB */ beqz $at, .L8006B190 -/* 465A4 8006B1A4 00000000 */ nop -.L8006B1A8: -/* 465A8 8006B1A8 8F380000 */ lw $t8, ($t9) -/* 465AC 8006B1AC ACB80000 */ sw $t8, ($a1) -/* 465B0 8006B1B0 AF250000 */ sw $a1, ($t9) -/* 465B4 8006B1B4 03E00008 */ jr $ra -/* 465B8 8006B1B8 ACA40008 */ sw $a0, 8($a1) diff --git a/asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s b/asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s deleted file mode 100644 index 157d5a2d9f..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osExceptionPreamble -/* 45E00 8006AA00 3C1A800B */ lui $k0, 0x800b -/* 45E04 8006AA04 275A0D08 */ addiu $k0, $k0, 0xd08 -/* 45E08 8006AA08 FF410020 */ sd $at, 0x20($k0) -/* 45E0C 8006AA0C 401B6000 */ mfc0 $k1, $12 -/* 45E10 8006AA10 AF5B0118 */ sw $k1, 0x118($k0) -/* 45E14 8006AA14 2401FFFC */ addiu $at, $zero, -4 -/* 45E18 8006AA18 0361D824 */ and $k1, $k1, $at -/* 45E1C 8006AA1C 409B6000 */ mtc0 $k1, $12 -/* 45E20 8006AA20 FF480058 */ sd $t0, 0x58($k0) -/* 45E24 8006AA24 FF490060 */ sd $t1, 0x60($k0) -/* 45E28 8006AA28 FF4A0068 */ sd $t2, 0x68($k0) -/* 45E2C 8006AA2C AF400018 */ sw $zero, 0x18($k0) -/* 45E30 8006AA30 40086800 */ mfc0 $t0, $13 diff --git a/asm/nonmatchings/os/code_45df0_len_970/osNop.s b/asm/nonmatchings/os/code_45df0_len_970/osNop.s deleted file mode 100644 index 9fe0afb7f8..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/osNop.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osNop -/* 465CC 8006B1CC 03E00008 */ jr $ra -/* 465D0 8006B1D0 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/osPopThread.s b/asm/nonmatchings/os/code_45df0_len_970/osPopThread.s deleted file mode 100644 index a881d0949b..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/osPopThread.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osPopThread -/* 465BC 8006B1BC 8C820000 */ lw $v0, ($a0) -/* 465C0 8006B1C0 8C590000 */ lw $t9, ($v0) -/* 465C4 8006B1C4 03E00008 */ jr $ra -/* 465C8 8006B1C8 AC990000 */ sw $t9, ($a0) diff --git a/asm/nonmatchings/os/code_45df0_len_970/panic.s b/asm/nonmatchings/os/code_45df0_len_970/panic.s deleted file mode 100644 index caaa5e2b16..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/panic.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel panic -/* 4634C 8006AF4C 3C018009 */ lui $at, 0x8009 -/* 46350 8006AF50 AC3A4664 */ sw $k0, 0x4664($at) -/* 46354 8006AF54 24090001 */ addiu $t1, $zero, 1 -/* 46358 8006AF58 A7490010 */ sh $t1, 0x10($k0) -/* 4635C 8006AF5C 24090002 */ addiu $t1, $zero, 2 -/* 46360 8006AF60 A7490012 */ sh $t1, 0x12($k0) -/* 46364 8006AF64 400A4000 */ mfc0 $t2, $8 -/* 46368 8006AF68 AF4A0124 */ sw $t2, 0x124($k0) -/* 4636C 8006AF6C 0C01ABDF */ jal send_mesg -/* 46370 8006AF70 24040060 */ addiu $a0, $zero, 0x60 -/* 46374 8006AF74 0801AC75 */ j osDispatchThread -/* 46378 8006AF78 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/pi.s b/asm/nonmatchings/os/code_45df0_len_970/pi.s deleted file mode 100644 index 55aed09206..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/pi.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pi -/* 461B8 8006ADB8 32290010 */ andi $t1, $s1, 0x10 -/* 461BC 8006ADBC 11200013 */ beqz $t1, dp -/* 461C0 8006ADC0 00000000 */ nop -/* 461C4 8006ADC4 3231002F */ andi $s1, $s1, 0x2f -/* 461C8 8006ADC8 24090002 */ addiu $t1, $zero, 2 -/* 461CC 8006ADCC 3C01A460 */ lui $at, 0xa460 -/* 461D0 8006ADD0 AC290010 */ sw $t1, 0x10($at) -/* 461D4 8006ADD4 3C098009 */ lui $t1, 0x8009 -/* 461D8 8006ADD8 25295938 */ addiu $t1, $t1, 0x5938 -/* 461DC 8006ADDC 8D2A0000 */ lw $t2, ($t1) -/* 461E0 8006ADE0 11400006 */ beqz $t2, .L8006ADFC -/* 461E4 8006ADE4 00000000 */ nop -/* 461E8 8006ADE8 8D3D0004 */ lw $sp, 4($t1) -/* 461EC 8006ADEC 0140F809 */ jalr $t2 -/* 461F0 8006ADF0 00402021 */ addu $a0, $v0, $zero -/* 461F4 8006ADF4 14400003 */ bnez $v0, .L8006AE04 -/* 461F8 8006ADF8 00000000 */ nop -.L8006ADFC: -/* 461FC 8006ADFC 0C01ABDF */ jal send_mesg -/* 46200 8006AE00 24040040 */ addiu $a0, $zero, 0x40 -.L8006AE04: -/* 46204 8006AE04 1220000A */ beqz $s1, NoMoreRcpInts -/* 46208 8006AE08 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/prenmi.s b/asm/nonmatchings/os/code_45df0_len_970/prenmi.s deleted file mode 100644 index 1095d81749..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/prenmi.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel prenmi -/* 4623C 8006AE3C 8F5B0118 */ lw $k1, 0x118($k0) -/* 46240 8006AE40 2401EFFF */ addiu $at, $zero, -0x1001 -/* 46244 8006AE44 0361D824 */ and $k1, $k1, $at -/* 46248 8006AE48 AF5B0118 */ sw $k1, 0x118($k0) -/* 4624C 8006AE4C 3C098009 */ lui $t1, 0x8009 -/* 46250 8006AE50 252958FC */ addiu $t1, $t1, 0x58fc -/* 46254 8006AE54 8D2A0000 */ lw $t2, ($t1) -/* 46258 8006AE58 11400004 */ beqz $t2, firstnmi -/* 4625C 8006AE5C 00000000 */ nop -/* 46260 8006AE60 2401EFFF */ addiu $at, $zero, -0x1001 -/* 46264 8006AE64 10000026 */ b redispatch -/* 46268 8006AE68 02018024 */ and $s0, $s0, $at diff --git a/asm/nonmatchings/os/code_45df0_len_970/rcp.s b/asm/nonmatchings/os/code_45df0_len_970/rcp.s deleted file mode 100644 index 3232575206..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/rcp.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel rcp -/* 460C8 8006ACC8 3C11A430 */ lui $s1, 0xa430 -/* 460CC 8006ACCC 8E310008 */ lw $s1, 8($s1) -/* 460D0 8006ACD0 3C088009 */ lui $t0, 0x8009 -/* 460D4 8006ACD4 25085900 */ addiu $t0, $t0, 0x5900 -/* 460D8 8006ACD8 8D080000 */ lw $t0, ($t0) -/* 460DC 8006ACDC 00084402 */ srl $t0, $t0, 0x10 -/* 460E0 8006ACE0 02288824 */ and $s1, $s1, $t0 -/* 460E4 8006ACE4 32290001 */ andi $t1, $s1, 1 -/* 460E8 8006ACE8 11200014 */ beqz $t1, vi -/* 460EC 8006ACEC 00000000 */ nop -/* 460F0 8006ACF0 3231003E */ andi $s1, $s1, 0x3e -/* 460F4 8006ACF4 3C0CA404 */ lui $t4, 0xa404 -/* 460F8 8006ACF8 8D8C0010 */ lw $t4, 0x10($t4) -/* 460FC 8006ACFC 34098008 */ ori $t1, $zero, 0x8008 -/* 46100 8006AD00 3C01A404 */ lui $at, 0xa404 -/* 46104 8006AD04 AC290010 */ sw $t1, 0x10($at) -/* 46108 8006AD08 318C0300 */ andi $t4, $t4, 0x300 -/* 4610C 8006AD0C 11800007 */ beqz $t4, sp_other_break -/* 46110 8006AD10 00000000 */ nop -/* 46114 8006AD14 0C01ABDF */ jal send_mesg -/* 46118 8006AD18 24040020 */ addiu $a0, $zero, 0x20 -/* 4611C 8006AD1C 12200044 */ beqz $s1, NoMoreRcpInts -/* 46120 8006AD20 00000000 */ nop -/* 46124 8006AD24 10000005 */ b vi -/* 46128 8006AD28 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/redispatch.s b/asm/nonmatchings/os/code_45df0_len_970/redispatch.s deleted file mode 100644 index 5c183b3d1c..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/redispatch.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel redispatch -/* 46300 8006AF00 8F490004 */ lw $t1, 4($k0) -/* 46304 8006AF04 3C0A8009 */ lui $t2, 0x8009 -/* 46308 8006AF08 8D4A4658 */ lw $t2, 0x4658($t2) -/* 4630C 8006AF0C 8D4B0004 */ lw $t3, 4($t2) -/* 46310 8006AF10 012B082A */ slt $at, $t1, $t3 -/* 46314 8006AF14 10200007 */ beqz $at, enqueueRunning -/* 46318 8006AF18 00000000 */ nop -/* 4631C 8006AF1C 03402821 */ addu $a1, $k0, $zero -/* 46320 8006AF20 3C048009 */ lui $a0, 0x8009 -/* 46324 8006AF24 0C01AC5D */ jal osEnqueueThread -/* 46328 8006AF28 24844658 */ addiu $a0, $a0, 0x4658 -/* 4632C 8006AF2C 0801AC75 */ j osDispatchThread -/* 46330 8006AF30 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/savecontext.s b/asm/nonmatchings/os/code_45df0_len_970/savecontext.s deleted file mode 100644 index bc85fc3371..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/savecontext.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel savecontext -/* 45E34 8006AA34 03404021 */ addu $t0, $k0, $zero -/* 45E38 8006AA38 3C1A8009 */ lui $k0, 0x8009 -/* 45E3C 8006AA3C 8F5A4660 */ lw $k0, 0x4660($k0) -/* 45E40 8006AA40 DD090020 */ ld $t1, 0x20($t0) -/* 45E44 8006AA44 FF490020 */ sd $t1, 0x20($k0) -/* 45E48 8006AA48 DD090118 */ ld $t1, 0x118($t0) -/* 45E4C 8006AA4C FF490118 */ sd $t1, 0x118($k0) -/* 45E50 8006AA50 DD090058 */ ld $t1, 0x58($t0) -/* 45E54 8006AA54 FF490058 */ sd $t1, 0x58($k0) -/* 45E58 8006AA58 DD090060 */ ld $t1, 0x60($t0) -/* 45E5C 8006AA5C FF490060 */ sd $t1, 0x60($k0) -/* 45E60 8006AA60 DD090068 */ ld $t1, 0x68($t0) -/* 45E64 8006AA64 FF490068 */ sd $t1, 0x68($k0) -/* 45E68 8006AA68 FF420028 */ sd $v0, 0x28($k0) -/* 45E6C 8006AA6C FF430030 */ sd $v1, 0x30($k0) -/* 45E70 8006AA70 FF440038 */ sd $a0, 0x38($k0) -/* 45E74 8006AA74 FF450040 */ sd $a1, 0x40($k0) -/* 45E78 8006AA78 FF460048 */ sd $a2, 0x48($k0) -/* 45E7C 8006AA7C FF470050 */ sd $a3, 0x50($k0) -/* 45E80 8006AA80 FF4B0070 */ sd $t3, 0x70($k0) -/* 45E84 8006AA84 FF4C0078 */ sd $t4, 0x78($k0) -/* 45E88 8006AA88 FF4D0080 */ sd $t5, 0x80($k0) -/* 45E8C 8006AA8C FF4E0088 */ sd $t6, 0x88($k0) -/* 45E90 8006AA90 FF4F0090 */ sd $t7, 0x90($k0) -/* 45E94 8006AA94 FF500098 */ sd $s0, 0x98($k0) -/* 45E98 8006AA98 FF5100A0 */ sd $s1, 0xa0($k0) -/* 45E9C 8006AA9C FF5200A8 */ sd $s2, 0xa8($k0) -/* 45EA0 8006AAA0 FF5300B0 */ sd $s3, 0xb0($k0) -/* 45EA4 8006AAA4 FF5400B8 */ sd $s4, 0xb8($k0) -/* 45EA8 8006AAA8 FF5500C0 */ sd $s5, 0xc0($k0) -/* 45EAC 8006AAAC FF5600C8 */ sd $s6, 0xc8($k0) -/* 45EB0 8006AAB0 FF5700D0 */ sd $s7, 0xd0($k0) -/* 45EB4 8006AAB4 FF5800D8 */ sd $t8, 0xd8($k0) -/* 45EB8 8006AAB8 FF5900E0 */ sd $t9, 0xe0($k0) -/* 45EBC 8006AABC FF5C00E8 */ sd $gp, 0xe8($k0) -/* 45EC0 8006AAC0 FF5D00F0 */ sd $sp, 0xf0($k0) -/* 45EC4 8006AAC4 FF5E00F8 */ sd $fp, 0xf8($k0) -/* 45EC8 8006AAC8 FF5F0100 */ sd $ra, 0x100($k0) -/* 45ECC 8006AACC 00004012 */ mflo $t0 -/* 45ED0 8006AAD0 FF480108 */ sd $t0, 0x108($k0) -/* 45ED4 8006AAD4 00004010 */ mfhi $t0 -/* 45ED8 8006AAD8 FF480110 */ sd $t0, 0x110($k0) -/* 45EDC 8006AADC 8F5B0118 */ lw $k1, 0x118($k0) -/* 45EE0 8006AAE0 3369FF00 */ andi $t1, $k1, 0xff00 -/* 45EE4 8006AAE4 11200013 */ beqz $t1, savercp -/* 45EE8 8006AAE8 00000000 */ nop -/* 45EEC 8006AAEC 3C088009 */ lui $t0, 0x8009 -/* 45EF0 8006AAF0 25085900 */ addiu $t0, $t0, 0x5900 -/* 45EF4 8006AAF4 8D080000 */ lw $t0, ($t0) -/* 45EF8 8006AAF8 2401FFFF */ addiu $at, $zero, -1 -/* 45EFC 8006AAFC 01015026 */ xor $t2, $t0, $at -/* 45F00 8006AB00 314AFF00 */ andi $t2, $t2, 0xff00 -/* 45F04 8006AB04 012A6025 */ or $t4, $t1, $t2 -/* 45F08 8006AB08 3C01FFFF */ lui $at, 0xffff -/* 45F0C 8006AB0C 342100FF */ ori $at, $at, 0xff -/* 45F10 8006AB10 03615824 */ and $t3, $k1, $at -/* 45F14 8006AB14 016C5825 */ or $t3, $t3, $t4 -/* 45F18 8006AB18 AF4B0118 */ sw $t3, 0x118($k0) -/* 45F1C 8006AB1C 3108FF00 */ andi $t0, $t0, 0xff00 -/* 45F20 8006AB20 01284824 */ and $t1, $t1, $t0 -/* 45F24 8006AB24 3C01FFFF */ lui $at, 0xffff -/* 45F28 8006AB28 342100FF */ ori $at, $at, 0xff -/* 45F2C 8006AB2C 0361D824 */ and $k1, $k1, $at -/* 45F30 8006AB30 0369D825 */ or $k1, $k1, $t1 diff --git a/asm/nonmatchings/os/code_45df0_len_970/savercp.s b/asm/nonmatchings/os/code_45df0_len_970/savercp.s deleted file mode 100644 index 198725714b..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/savercp.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel savercp -/* 45F34 8006AB34 3C09A430 */ lui $t1, 0xa430 -/* 45F38 8006AB38 8D29000C */ lw $t1, 0xc($t1) -/* 45F3C 8006AB3C 1120000B */ beqz $t1, endrcp -/* 45F40 8006AB40 00000000 */ nop -/* 45F44 8006AB44 3C088009 */ lui $t0, 0x8009 -/* 45F48 8006AB48 25085900 */ addiu $t0, $t0, 0x5900 -/* 45F4C 8006AB4C 8D080000 */ lw $t0, ($t0) -/* 45F50 8006AB50 00084402 */ srl $t0, $t0, 0x10 -/* 45F54 8006AB54 2401FFFF */ addiu $at, $zero, -1 -/* 45F58 8006AB58 01014026 */ xor $t0, $t0, $at -/* 45F5C 8006AB5C 3108003F */ andi $t0, $t0, 0x3f -/* 45F60 8006AB60 8F4C0128 */ lw $t4, 0x128($k0) -/* 45F64 8006AB64 010C4024 */ and $t0, $t0, $t4 -/* 45F68 8006AB68 01284825 */ or $t1, $t1, $t0 diff --git a/asm/nonmatchings/os/code_45df0_len_970/send_done.s b/asm/nonmatchings/os/code_45df0_len_970/send_done.s deleted file mode 100644 index ae0f66db3e..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/send_done.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel send_done -/* 463C4 8006AFC4 2401FFFF */ addiu $at, $zero, -1 -/* 463C8 8006AFC8 15810004 */ bne $t4, $at, .L8006AFDC -/* 463CC 8006AFCC 3C018000 */ lui $at, 0x8000 -/* 463D0 8006AFD0 15A10002 */ bne $t5, $at, .L8006AFDC -/* 463D4 8006AFD4 00000000 */ nop -/* 463D8 8006AFD8 0006000D */ break 6 -.L8006AFDC: -/* 463DC 8006AFDC 00006810 */ mfhi $t5 -/* 463E0 8006AFE0 8D2C0014 */ lw $t4, 0x14($t1) -/* 463E4 8006AFE4 24010004 */ addiu $at, $zero, 4 -/* 463E8 8006AFE8 01A10018 */ mult $t5, $at -/* 463EC 8006AFEC 00006812 */ mflo $t5 -/* 463F0 8006AFF0 018D6021 */ addu $t4, $t4, $t5 -/* 463F4 8006AFF4 8D4D0004 */ lw $t5, 4($t2) -/* 463F8 8006AFF8 AD8D0000 */ sw $t5, ($t4) -/* 463FC 8006AFFC 256A0001 */ addiu $t2, $t3, 1 -/* 46400 8006B000 AD2A0008 */ sw $t2, 8($t1) -/* 46404 8006B004 8D2A0000 */ lw $t2, ($t1) -/* 46408 8006B008 8D4B0000 */ lw $t3, ($t2) -/* 4640C 8006B00C 11600008 */ beqz $t3, .L8006B030 -/* 46410 8006B010 00000000 */ nop -/* 46414 8006B014 0C01AC6F */ jal osPopThread -/* 46418 8006B018 01202021 */ addu $a0, $t1, $zero -/* 4641C 8006B01C 00405021 */ addu $t2, $v0, $zero -/* 46420 8006B020 01402821 */ addu $a1, $t2, $zero -/* 46424 8006B024 3C048009 */ lui $a0, 0x8009 -/* 46428 8006B028 0C01AC5D */ jal osEnqueueThread -/* 4642C 8006B02C 24844658 */ addiu $a0, $a0, 0x4658 -.L8006B030: -/* 46430 8006B030 02400008 */ jr $s2 -/* 46434 8006B034 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/send_mesg.s b/asm/nonmatchings/os/code_45df0_len_970/send_mesg.s deleted file mode 100644 index 519fe4cb9a..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/send_mesg.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel send_mesg -/* 4637C 8006AF7C 03E09021 */ addu $s2, $ra, $zero -/* 46380 8006AF80 3C0A800E */ lui $t2, 0x800e -/* 46384 8006AF84 254A9F80 */ addiu $t2, $t2, -0x6080 -/* 46388 8006AF88 01445021 */ addu $t2, $t2, $a0 -/* 4638C 8006AF8C 8D490000 */ lw $t1, ($t2) -/* 46390 8006AF90 11200027 */ beqz $t1, .L8006B030 -/* 46394 8006AF94 00000000 */ nop -/* 46398 8006AF98 8D2B0008 */ lw $t3, 8($t1) -/* 4639C 8006AF9C 8D2C0010 */ lw $t4, 0x10($t1) -/* 463A0 8006AFA0 016C082A */ slt $at, $t3, $t4 -/* 463A4 8006AFA4 10200022 */ beqz $at, .L8006B030 -/* 463A8 8006AFA8 00000000 */ nop -/* 463AC 8006AFAC 8D2D000C */ lw $t5, 0xc($t1) -/* 463B0 8006AFB0 01AB6821 */ addu $t5, $t5, $t3 -/* 463B4 8006AFB4 01AC001A */ div $zero, $t5, $t4 -/* 463B8 8006AFB8 15800002 */ bnez $t4, send_done -/* 463BC 8006AFBC 00000000 */ nop -/* 463C0 8006AFC0 0007000D */ break 7 diff --git a/asm/nonmatchings/os/code_45df0_len_970/si.s b/asm/nonmatchings/os/code_45df0_len_970/si.s deleted file mode 100644 index 9c5562f60e..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/si.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel si -/* 46190 8006AD90 32290002 */ andi $t1, $s1, 2 -/* 46194 8006AD94 11200008 */ beqz $t1, pi -/* 46198 8006AD98 00000000 */ nop -/* 4619C 8006AD9C 3231003D */ andi $s1, $s1, 0x3d -/* 461A0 8006ADA0 3C01A480 */ lui $at, 0xa480 -/* 461A4 8006ADA4 AC200018 */ sw $zero, 0x18($at) -/* 461A8 8006ADA8 0C01ABDF */ jal send_mesg -/* 461AC 8006ADAC 24040028 */ addiu $a0, $zero, 0x28 -/* 461B0 8006ADB0 1220001F */ beqz $s1, NoMoreRcpInts -/* 461B4 8006ADB4 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s b/asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s deleted file mode 100644 index e3d37f1f8c..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel sp_other_break -/* 4612C 8006AD2C 0C01ABDF */ jal send_mesg -/* 46130 8006AD30 24040058 */ addiu $a0, $zero, 0x58 -/* 46134 8006AD34 1220003E */ beqz $s1, NoMoreRcpInts -/* 46138 8006AD38 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45df0_len_970/sw1.s b/asm/nonmatchings/os/code_45df0_len_970/sw1.s deleted file mode 100644 index f0fecacb18..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/sw1.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel sw1 -/* 462C4 8006AEC4 2401FEFF */ addiu $at, $zero, -0x101 -/* 462C8 8006AEC8 01014024 */ and $t0, $t0, $at -/* 462CC 8006AECC 40886800 */ mtc0 $t0, $13 -/* 462D0 8006AED0 24040000 */ addiu $a0, $zero, 0 -/* 462D4 8006AED4 0C01ABDF */ jal send_mesg -/* 462D8 8006AED8 00000000 */ nop -/* 462DC 8006AEDC 2401FEFF */ addiu $at, $zero, -0x101 -/* 462E0 8006AEE0 1000FF4A */ b next_interrupt -/* 462E4 8006AEE4 02018024 */ and $s0, $s0, $at diff --git a/asm/nonmatchings/os/code_45df0_len_970/sw2.s b/asm/nonmatchings/os/code_45df0_len_970/sw2.s deleted file mode 100644 index 342da76ba2..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/sw2.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel sw2 -/* 462A0 8006AEA0 2401FDFF */ addiu $at, $zero, -0x201 -/* 462A4 8006AEA4 01014024 */ and $t0, $t0, $at -/* 462A8 8006AEA8 40886800 */ mtc0 $t0, $13 -/* 462AC 8006AEAC 24040008 */ addiu $a0, $zero, 8 -/* 462B0 8006AEB0 0C01ABDF */ jal send_mesg -/* 462B4 8006AEB4 00000000 */ nop -/* 462B8 8006AEB8 2401FDFF */ addiu $at, $zero, -0x201 -/* 462BC 8006AEBC 1000FF53 */ b next_interrupt -/* 462C0 8006AEC0 02018024 */ and $s0, $s0, $at diff --git a/asm/nonmatchings/os/code_45df0_len_970/vi.s b/asm/nonmatchings/os/code_45df0_len_970/vi.s deleted file mode 100644 index ce02dae73e..0000000000 --- a/asm/nonmatchings/os/code_45df0_len_970/vi.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel vi -/* 4613C 8006AD3C 32290008 */ andi $t1, $s1, 8 -/* 46140 8006AD40 11200008 */ beqz $t1, ai -/* 46144 8006AD44 00000000 */ nop -/* 46148 8006AD48 32310037 */ andi $s1, $s1, 0x37 -/* 4614C 8006AD4C 3C01A440 */ lui $at, 0xa440 -/* 46150 8006AD50 AC200010 */ sw $zero, 0x10($at) -/* 46154 8006AD54 0C01ABDF */ jal send_mesg -/* 46158 8006AD58 24040038 */ addiu $a0, $zero, 0x38 -/* 4615C 8006AD5C 12200034 */ beqz $s1, NoMoreRcpInts -/* 46160 8006AD60 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47e90_len_110/osViInit.s b/asm/nonmatchings/os/code_47e90_len_110/osViInit.s index f93dff3231..d7e1fadb1b 100644 --- a/asm/nonmatchings/os/code_47e90_len_110/osViInit.s +++ b/asm/nonmatchings/os/code_47e90_len_110/osViInit.s @@ -10,8 +10,8 @@ glabel osViInit /* 47EA4 8006CAA4 AFBF0014 */ sw $ra, 0x14($sp) /* 47EA8 8006CAA8 0C01925C */ jal bzero /* 47EAC 8006CAAC 24050060 */ addiu $a1, $zero, 0x60 -/* 47EB0 8006CAB0 3C038000 */ lui $v1, 0x8000 -/* 47EB4 8006CAB4 8C630300 */ lw $v1, 0x300($v1) +/* 47EB0 8006CAB0 3C038000 */ lui $v1, %hi(osTvType) +/* 47EB4 8006CAB4 8C630300 */ lw $v1, %lo(osTvType)($v1) /* 47EB8 8006CAB8 3C018009 */ lui $at, 0x8009 /* 47EBC 8006CABC AC3059D0 */ sw $s0, 0x59d0($at) /* 47EC0 8006CAC0 26100030 */ addiu $s0, $s0, 0x30 diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s index a1f29543d9..002c2d2a09 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s @@ -16,10 +16,10 @@ glabel nuGfxTaskMgr /* 7E6C 8002CA6C AFB00018 */ sw $s0, 0x18($sp) /* 7E70 8002CA70 24130004 */ addiu $s3, $zero, 4 /* 7E74 8002CA74 24120008 */ addiu $s2, $zero, 8 -/* 7E78 8002CA78 3C11800A */ lui $s1, 0x800a -/* 7E7C 8002CA7C 2631A5F8 */ addiu $s1, $s1, -0x5a08 -/* 7E80 8002CA80 3C10800A */ lui $s0, 0x800a -/* 7E84 8002CA84 2610A618 */ addiu $s0, $s0, -0x59e8 +/* 7E78 8002CA78 3C11800A */ lui $s1, %hi(nuGfxDisplay) +/* 7E7C 8002CA7C 2631A5F8 */ addiu $s1, $s1, %lo(nuGfxDisplay) +/* 7E80 8002CA80 3C10800A */ lui $s0, %hi(nuGfxTaskSpool) +/* 7E84 8002CA84 2610A618 */ addiu $s0, $s0, %lo(nuGfxTaskSpool) .L8002CA88: /* 7E88 8002CA88 3C04800E */ lui $a0, 0x800e /* 7E8C 8002CA8C 2484AC90 */ addiu $a0, $a0, -0x5370 diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s index 61ccce642e..2643a4e4ba 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s @@ -9,8 +9,8 @@ glabel nuGfxTaskMgrInit /* 7F48 8002CB48 24020004 */ addiu $v0, $zero, 4 /* 7F4C 8002CB4C 3C01800A */ lui $at, 0x800a /* 7F50 8002CB50 A422C516 */ sh $v0, -0x3aea($at) -/* 7F54 8002CB54 3C02800A */ lui $v0, 0x800a -/* 7F58 8002CB58 2442A618 */ addiu $v0, $v0, -0x59e8 +/* 7F54 8002CB54 3C02800A */ lui $v0, %hi(nuGfxTaskSpool) +/* 7F58 8002CB58 2442A618 */ addiu $v0, $v0, %lo(nuGfxTaskSpool) /* 7F5C 8002CB5C AFBF0038 */ sw $ra, 0x38($sp) /* 7F60 8002CB60 AFB70034 */ sw $s7, 0x34($sp) /* 7F64 8002CB64 AFB60030 */ sw $s6, 0x30($sp) diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s index 6535ee369b..b408da5d98 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s @@ -11,8 +11,8 @@ glabel nuGfxTaskStart /* 80DC 8002CCDC 8D480000 */ lw $t0, ($t2) /* 80E0 8002CCE0 000630C0 */ sll $a2, $a2, 3 /* 80E4 8002CCE4 AD020014 */ sw $v0, 0x14($t0) -/* 80E8 8002CCE8 3C02800A */ lui $v0, 0x800a -/* 80EC 8002CCEC 8C42A610 */ lw $v0, -0x59f0($v0) +/* 80E8 8002CCE8 3C02800A */ lui $v0, %hi(D_8009A610) +/* 80EC 8002CCEC 8C42A610 */ lw $v0, %lo(D_8009A610)($v0) /* 80F0 8002CCF0 3C0B800A */ lui $t3, 0x800a /* 80F4 8002CCF4 256BA64C */ addiu $t3, $t3, -0x59b4 /* 80F8 8002CCF8 AD040040 */ sw $a0, 0x40($t0) @@ -71,8 +71,8 @@ glabel nuGfxTaskStart .L8002CDC0: /* 81C0 8002CDC0 0C018250 */ jal osSetIntMask /* 81C4 8002CDC4 24040001 */ addiu $a0, $zero, 1 -/* 81C8 8002CDC8 3C05800A */ lui $a1, 0x800a -/* 81CC 8002CDCC 24A5A618 */ addiu $a1, $a1, -0x59e8 +/* 81C8 8002CDC8 3C05800A */ lui $a1, %hi(nuGfxTaskSpool) +/* 81CC 8002CDCC 24A5A618 */ addiu $a1, $a1, %lo(nuGfxTaskSpool) /* 81D0 8002CDD0 8CA30000 */ lw $v1, ($a1) /* 81D4 8002CDD4 0040202D */ daddu $a0, $v0, $zero /* 81D8 8002CDD8 24630001 */ addiu $v1, $v1, 1 diff --git a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s b/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s new file mode 100644 index 0000000000..c1209db8fe --- /dev/null +++ b/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s @@ -0,0 +1,141 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel contRmbControl +/* 3AD20 8005F920 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 3AD24 8005F924 AFB20018 */ sw $s2, 0x18($sp) +/* 3AD28 8005F928 0080902D */ daddu $s2, $a0, $zero +/* 3AD2C 8005F92C 00A0302D */ daddu $a2, $a1, $zero +/* 3AD30 8005F930 AFB00010 */ sw $s0, 0x10($sp) +/* 3AD34 8005F934 AFBF0020 */ sw $ra, 0x20($sp) +/* 3AD38 8005F938 AFB3001C */ sw $s3, 0x1c($sp) +/* 3AD3C 8005F93C AFB10014 */ sw $s1, 0x14($sp) +/* 3AD40 8005F940 92430006 */ lbu $v1, 6($s2) +/* 3AD44 8005F944 24130002 */ addiu $s3, $zero, 2 +/* 3AD48 8005F948 10730069 */ beq $v1, $s3, .L8005FAF0 +/* 3AD4C 8005F94C 0000802D */ daddu $s0, $zero, $zero +/* 3AD50 8005F950 28620003 */ slti $v0, $v1, 3 +/* 3AD54 8005F954 10400005 */ beqz $v0, .L8005F96C +/* 3AD58 8005F958 24020001 */ addiu $v0, $zero, 1 +/* 3AD5C 8005F95C 1062000A */ beq $v1, $v0, .L8005F988 +/* 3AD60 8005F960 0200102D */ daddu $v0, $s0, $zero +/* 3AD64 8005F964 08017EBD */ j .L8005FAF4 +/* 3AD68 8005F968 00000000 */ nop +.L8005F96C: +/* 3AD6C 8005F96C 24020003 */ addiu $v0, $zero, 3 +/* 3AD70 8005F970 10620018 */ beq $v1, $v0, .L8005F9D4 +/* 3AD74 8005F974 24020004 */ addiu $v0, $zero, 4 +/* 3AD78 8005F978 10620048 */ beq $v1, $v0, .L8005FA9C +/* 3AD7C 8005F97C 0200102D */ daddu $v0, $s0, $zero +/* 3AD80 8005F980 08017EBD */ j .L8005FAF4 +/* 3AD84 8005F984 00000000 */ nop +.L8005F988: +/* 3AD88 8005F988 96420004 */ lhu $v0, 4($s2) +/* 3AD8C 8005F98C 1040000C */ beqz $v0, .L8005F9C0 +/* 3AD90 8005F990 00062040 */ sll $a0, $a2, 1 +/* 3AD94 8005F994 00862021 */ addu $a0, $a0, $a2 +/* 3AD98 8005F998 00042080 */ sll $a0, $a0, 2 +/* 3AD9C 8005F99C 00862021 */ addu $a0, $a0, $a2 +/* 3ADA0 8005F9A0 000420C0 */ sll $a0, $a0, 3 +/* 3ADA4 8005F9A4 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3ADA8 8005F9A8 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3ADAC 8005F9AC 00822021 */ addu $a0, $a0, $v0 +/* 3ADB0 8005F9B0 0C019F80 */ jal __osMotorAccess +/* 3ADB4 8005F9B4 0000282D */ daddu $a1, $zero, $zero +/* 3ADB8 8005F9B8 08017E71 */ j .L8005F9C4 +/* 3ADBC 8005F9BC 0040802D */ daddu $s0, $v0, $zero +.L8005F9C0: +/* 3ADC0 8005F9C0 A2530006 */ sb $s3, 6($s2) +.L8005F9C4: +/* 3ADC4 8005F9C4 96420004 */ lhu $v0, 4($s2) +/* 3ADC8 8005F9C8 2442FFFF */ addiu $v0, $v0, -1 +/* 3ADCC 8005F9CC 08017EBC */ j .L8005FAF0 +/* 3ADD0 8005F9D0 A6420004 */ sh $v0, 4($s2) +.L8005F9D4: +/* 3ADD4 8005F9D4 96420002 */ lhu $v0, 2($s2) +/* 3ADD8 8005F9D8 1040001F */ beqz $v0, .L8005FA58 +/* 3ADDC 8005F9DC 00062040 */ sll $a0, $a2, 1 +/* 3ADE0 8005F9E0 96420004 */ lhu $v0, 4($s2) +/* 3ADE4 8005F9E4 96430000 */ lhu $v1, ($s2) +/* 3ADE8 8005F9E8 00431021 */ addu $v0, $v0, $v1 +/* 3ADEC 8005F9EC 304300FF */ andi $v1, $v0, 0xff +/* 3ADF0 8005F9F0 3042FFFF */ andi $v0, $v0, 0xffff +/* 3ADF4 8005F9F4 00021202 */ srl $v0, $v0, 8 +/* 3ADF8 8005F9F8 1040000B */ beqz $v0, .L8005FA28 +/* 3ADFC 8005F9FC A6430004 */ sh $v1, 4($s2) +/* 3AE00 8005FA00 00062040 */ sll $a0, $a2, 1 +/* 3AE04 8005FA04 00862021 */ addu $a0, $a0, $a2 +/* 3AE08 8005FA08 00042080 */ sll $a0, $a0, 2 +/* 3AE0C 8005FA0C 00862021 */ addu $a0, $a0, $a2 +/* 3AE10 8005FA10 000420C0 */ sll $a0, $a0, 3 +/* 3AE14 8005FA14 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3AE18 8005FA18 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3AE1C 8005FA1C 00822021 */ addu $a0, $a0, $v0 +/* 3AE20 8005FA20 08017E92 */ j .L8005FA48 +/* 3AE24 8005FA24 24050001 */ addiu $a1, $zero, 1 +.L8005FA28: +/* 3AE28 8005FA28 00862021 */ addu $a0, $a0, $a2 +/* 3AE2C 8005FA2C 00042080 */ sll $a0, $a0, 2 +/* 3AE30 8005FA30 00862021 */ addu $a0, $a0, $a2 +/* 3AE34 8005FA34 000420C0 */ sll $a0, $a0, 3 +/* 3AE38 8005FA38 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3AE3C 8005FA3C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3AE40 8005FA40 00822021 */ addu $a0, $a0, $v0 +/* 3AE44 8005FA44 0000282D */ daddu $a1, $zero, $zero +.L8005FA48: +/* 3AE48 8005FA48 0C019F80 */ jal __osMotorAccess +/* 3AE4C 8005FA4C 00000000 */ nop +/* 3AE50 8005FA50 08017EA3 */ j .L8005FA8C +/* 3AE54 8005FA54 0040802D */ daddu $s0, $v0, $zero +.L8005FA58: +/* 3AE58 8005FA58 00862021 */ addu $a0, $a0, $a2 +/* 3AE5C 8005FA5C 00042080 */ sll $a0, $a0, 2 +/* 3AE60 8005FA60 00862021 */ addu $a0, $a0, $a2 +/* 3AE64 8005FA64 000420C0 */ sll $a0, $a0, 3 +/* 3AE68 8005FA68 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3AE6C 8005FA6C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3AE70 8005FA70 00822021 */ addu $a0, $a0, $v0 +/* 3AE74 8005FA74 0C019F80 */ jal __osMotorAccess +/* 3AE78 8005FA78 0000282D */ daddu $a1, $zero, $zero +/* 3AE7C 8005FA7C 0040802D */ daddu $s0, $v0, $zero +/* 3AE80 8005FA80 24020001 */ addiu $v0, $zero, 1 +/* 3AE84 8005FA84 A2420006 */ sb $v0, 6($s2) +/* 3AE88 8005FA88 A6530004 */ sh $s3, 4($s2) +.L8005FA8C: +/* 3AE8C 8005FA8C 96420002 */ lhu $v0, 2($s2) +/* 3AE90 8005FA90 2442FFFF */ addiu $v0, $v0, -1 +/* 3AE94 8005FA94 08017EBC */ j .L8005FAF0 +/* 3AE98 8005FA98 A6420002 */ sh $v0, 2($s2) +.L8005FA9C: +/* 3AE9C 8005FA9C 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3AEA0 8005FAA0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) +/* 3AEA4 8005FAA4 00061040 */ sll $v0, $a2, 1 +/* 3AEA8 8005FAA8 00461021 */ addu $v0, $v0, $a2 +/* 3AEAC 8005FAAC 00021080 */ sll $v0, $v0, 2 +/* 3AEB0 8005FAB0 00461021 */ addu $v0, $v0, $a2 +/* 3AEB4 8005FAB4 000210C0 */ sll $v0, $v0, 3 +/* 3AEB8 8005FAB8 3C03800E */ lui $v1, %hi(nuContPfs) +/* 3AEBC 8005FABC 2463AAD8 */ addiu $v1, $v1, %lo(nuContPfs) +/* 3AEC0 8005FAC0 00438821 */ addu $s1, $v0, $v1 +/* 3AEC4 8005FAC4 0C019FD1 */ jal osMotorInit +/* 3AEC8 8005FAC8 0220282D */ daddu $a1, $s1, $zero +/* 3AECC 8005FACC 0040802D */ daddu $s0, $v0, $zero +/* 3AED0 8005FAD0 16000005 */ bnez $s0, .L8005FAE8 +/* 3AED4 8005FAD4 24020001 */ addiu $v0, $zero, 1 +/* 3AED8 8005FAD8 0220202D */ daddu $a0, $s1, $zero +/* 3AEDC 8005FADC 0C019F80 */ jal __osMotorAccess +/* 3AEE0 8005FAE0 0000282D */ daddu $a1, $zero, $zero +/* 3AEE4 8005FAE4 24020001 */ addiu $v0, $zero, 1 +.L8005FAE8: +/* 3AEE8 8005FAE8 A2420006 */ sb $v0, 6($s2) +/* 3AEEC 8005FAEC A6530004 */ sh $s3, 4($s2) +.L8005FAF0: +/* 3AEF0 8005FAF0 0200102D */ daddu $v0, $s0, $zero +.L8005FAF4: +/* 3AEF4 8005FAF4 8FBF0020 */ lw $ra, 0x20($sp) +/* 3AEF8 8005FAF8 8FB3001C */ lw $s3, 0x1c($sp) +/* 3AEFC 8005FAFC 8FB20018 */ lw $s2, 0x18($sp) +/* 3AF00 8005FB00 8FB10014 */ lw $s1, 0x14($sp) +/* 3AF04 8005FB04 8FB00010 */ lw $s0, 0x10($sp) +/* 3AF08 8005FB08 03E00008 */ jr $ra +/* 3AF0C 8005FB0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s b/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s new file mode 100644 index 0000000000..e071375137 --- /dev/null +++ b/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8005FB10 +/* 3AF10 8005FB10 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 3AF14 8005FB14 AFB10014 */ sw $s1, 0x14($sp) +/* 3AF18 8005FB18 0000882D */ daddu $s1, $zero, $zero +/* 3AF1C 8005FB1C AFB40020 */ sw $s4, 0x20($sp) +/* 3AF20 8005FB20 24140002 */ addiu $s4, $zero, 2 +/* 3AF24 8005FB24 AFB50024 */ sw $s5, 0x24($sp) +/* 3AF28 8005FB28 24150001 */ addiu $s5, $zero, 1 +/* 3AF2C 8005FB2C AFB3001C */ sw $s3, 0x1c($sp) +/* 3AF30 8005FB30 0220982D */ daddu $s3, $s1, $zero +/* 3AF34 8005FB34 AFB20018 */ sw $s2, 0x18($sp) +/* 3AF38 8005FB38 0220902D */ daddu $s2, $s1, $zero +/* 3AF3C 8005FB3C AFBF0028 */ sw $ra, 0x28($sp) +/* 3AF40 8005FB40 AFB00010 */ sw $s0, 0x10($sp) +.L8005FB44: +/* 3AF44 8005FB44 3C02800B */ lui $v0, %hi(nuContRmbCtl) +/* 3AF48 8005FB48 24421D40 */ addiu $v0, $v0, %lo(nuContRmbCtl) +/* 3AF4C 8005FB4C 02428021 */ addu $s0, $s2, $v0 +/* 3AF50 8005FB50 92030007 */ lbu $v1, 7($s0) +/* 3AF54 8005FB54 10740015 */ beq $v1, $s4, .L8005FBAC +/* 3AF58 8005FB58 28620003 */ slti $v0, $v1, 3 +/* 3AF5C 8005FB5C 50400007 */ beql $v0, $zero, .L8005FB7C +/* 3AF60 8005FB60 28620083 */ slti $v0, $v1, 0x83 +/* 3AF64 8005FB64 5060003B */ beql $v1, $zero, .L8005FC54 +/* 3AF68 8005FB68 26730068 */ addiu $s3, $s3, 0x68 +/* 3AF6C 8005FB6C 10750009 */ beq $v1, $s5, .L8005FB94 +/* 3AF70 8005FB70 0200202D */ daddu $a0, $s0, $zero +/* 3AF74 8005FB74 08017F15 */ j .L8005FC54 +/* 3AF78 8005FB78 26730068 */ addiu $s3, $s3, 0x68 +.L8005FB7C: +/* 3AF7C 8005FB7C 10400034 */ beqz $v0, .L8005FC50 +/* 3AF80 8005FB80 28620081 */ slti $v0, $v1, 0x81 +/* 3AF84 8005FB84 54400033 */ bnel $v0, $zero, .L8005FC54 +/* 3AF88 8005FB88 26730068 */ addiu $s3, $s3, 0x68 +/* 3AF8C 8005FB8C 08017F0E */ j .L8005FC38 +/* 3AF90 8005FB90 00000000 */ nop +.L8005FB94: +/* 3AF94 8005FB94 0C017E48 */ jal contRmbControl +/* 3AF98 8005FB98 0220282D */ daddu $a1, $s1, $zero +/* 3AF9C 8005FB9C 5440002C */ bnel $v0, $zero, .L8005FC50 +/* 3AFA0 8005FBA0 A2000007 */ sb $zero, 7($s0) +/* 3AFA4 8005FBA4 08017F15 */ j .L8005FC54 +/* 3AFA8 8005FBA8 26730068 */ addiu $s3, $s3, 0x68 +.L8005FBAC: +/* 3AFAC 8005FBAC 92020008 */ lbu $v0, 8($s0) +/* 3AFB0 8005FBB0 14400019 */ bnez $v0, .L8005FC18 +/* 3AFB4 8005FBB4 0200202D */ daddu $a0, $s0, $zero +/* 3AFB8 8005FBB8 96030004 */ lhu $v1, 4($s0) +/* 3AFBC 8005FBBC 3C028009 */ lui $v0, %hi(nuContRmbSearchTime) +/* 3AFC0 8005FBC0 8C423CE0 */ lw $v0, %lo(nuContRmbSearchTime)($v0) +/* 3AFC4 8005FBC4 14400002 */ bnez $v0, .L8005FBD0 +/* 3AFC8 8005FBC8 0062001B */ divu $zero, $v1, $v0 +/* 3AFCC 8005FBCC 0007000D */ break 7 +.L8005FBD0: +/* 3AFD0 8005FBD0 00001010 */ mfhi $v0 +/* 3AFD4 8005FBD4 1440000C */ bnez $v0, .L8005FC08 +/* 3AFD8 8005FBD8 00000000 */ nop +/* 3AFDC 8005FBDC 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3AFE0 8005FBE0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) +/* 3AFE4 8005FBE4 3C05800E */ lui $a1, %hi(nuContPfs) +/* 3AFE8 8005FBE8 24A5AAD8 */ addiu $a1, $a1, %lo(nuContPfs) +/* 3AFEC 8005FBEC 02652821 */ addu $a1, $s3, $a1 +/* 3AFF0 8005FBF0 0C019FD1 */ jal osMotorInit +/* 3AFF4 8005FBF4 0220302D */ daddu $a2, $s1, $zero +/* 3AFF8 8005FBF8 14400003 */ bnez $v0, .L8005FC08 +/* 3AFFC 8005FBFC 00000000 */ nop +/* 3B000 8005FC00 A2150008 */ sb $s5, 8($s0) +/* 3B004 8005FC04 A2140009 */ sb $s4, 9($s0) +.L8005FC08: +/* 3B008 8005FC08 96020004 */ lhu $v0, 4($s0) +/* 3B00C 8005FC0C 24420001 */ addiu $v0, $v0, 1 +/* 3B010 8005FC10 08017F14 */ j .L8005FC50 +/* 3B014 8005FC14 A6020004 */ sh $v0, 4($s0) +.L8005FC18: +/* 3B018 8005FC18 0C017E48 */ jal contRmbControl +/* 3B01C 8005FC1C 0220282D */ daddu $a1, $s1, $zero +/* 3B020 8005FC20 5040000C */ beql $v0, $zero, .L8005FC54 +/* 3B024 8005FC24 26730068 */ addiu $s3, $s3, 0x68 +/* 3B028 8005FC28 A6110004 */ sh $s1, 4($s0) +/* 3B02C 8005FC2C A2000008 */ sb $zero, 8($s0) +/* 3B030 8005FC30 08017F14 */ j .L8005FC50 +/* 3B034 8005FC34 A2000009 */ sb $zero, 9($s0) +.L8005FC38: +/* 3B038 8005FC38 92020009 */ lbu $v0, 9($s0) +/* 3B03C 8005FC3C 54540005 */ bnel $v0, $s4, .L8005FC54 +/* 3B040 8005FC40 26730068 */ addiu $s3, $s3, 0x68 +/* 3B044 8005FC44 0200202D */ daddu $a0, $s0, $zero +/* 3B048 8005FC48 0C017E48 */ jal contRmbControl +/* 3B04C 8005FC4C 0220282D */ daddu $a1, $s1, $zero +.L8005FC50: +/* 3B050 8005FC50 26730068 */ addiu $s3, $s3, 0x68 +.L8005FC54: +/* 3B054 8005FC54 26310001 */ addiu $s1, $s1, 1 +/* 3B058 8005FC58 2E220004 */ sltiu $v0, $s1, 4 +/* 3B05C 8005FC5C 1440FFB9 */ bnez $v0, .L8005FB44 +/* 3B060 8005FC60 2652000A */ addiu $s2, $s2, 0xa +/* 3B064 8005FC64 8FBF0028 */ lw $ra, 0x28($sp) +/* 3B068 8005FC68 8FB50024 */ lw $s5, 0x24($sp) +/* 3B06C 8005FC6C 8FB40020 */ lw $s4, 0x20($sp) +/* 3B070 8005FC70 8FB3001C */ lw $s3, 0x1c($sp) +/* 3B074 8005FC74 8FB20018 */ lw $s2, 0x18($sp) +/* 3B078 8005FC78 8FB10014 */ lw $s1, 0x14($sp) +/* 3B07C 8005FC7C 8FB00010 */ lw $s0, 0x10($sp) +/* 3B080 8005FC80 0000102D */ daddu $v0, $zero, $zero +/* 3B084 8005FC84 03E00008 */ jr $ra +/* 3B088 8005FC88 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/os/nuContRmbMgr/nuContRmbMgrInit.s b/asm/nonmatchings/os/nusys/nuContRmbMgr/nuContRmbMgrInit.s similarity index 90% rename from asm/nonmatchings/os/nuContRmbMgr/nuContRmbMgrInit.s rename to asm/nonmatchings/os/nusys/nuContRmbMgr/nuContRmbMgrInit.s index 1af429506c..501fb72843 100644 --- a/asm/nonmatchings/os/nuContRmbMgr/nuContRmbMgrInit.s +++ b/asm/nonmatchings/os/nusys/nuContRmbMgr/nuContRmbMgrInit.s @@ -21,9 +21,9 @@ glabel nuContRmbMgrInit /* 3B0C8 8005FCC8 2C820004 */ sltiu $v0, $a0, 4 /* 3B0CC 8005FCCC 1440FFF4 */ bnez $v0, .L8005FCA0 /* 3B0D0 8005FCD0 2463000A */ addiu $v1, $v1, 0xa -/* 3B0D4 8005FCD4 3C048009 */ lui $a0, 0x8009 +/* 3B0D4 8005FCD4 3C048009 */ lui $a0, %hi(nuContRmbCallBack) /* 3B0D8 8005FCD8 0C0180FC */ jal nuSiCallBackAdd -/* 3B0DC 8005FCDC 24843D00 */ addiu $a0, $a0, 0x3d00 +/* 3B0DC 8005FCDC 24843D00 */ addiu $a0, $a0, %lo(nuContRmbCallBack) /* 3B0E0 8005FCE0 8FBF0010 */ lw $ra, 0x10($sp) /* 3B0E4 8005FCE4 03E00008 */ jr $ra /* 3B0E8 8005FCE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/nuGfxSetCfb/nuGfxSetCfb.s b/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s similarity index 100% rename from asm/nonmatchings/os/nuGfxSetCfb/nuGfxSetCfb.s rename to asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventHandler.s b/asm/nonmatchings/os/nusys/nuSched/nuScEventHandler.s similarity index 90% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScEventHandler.s rename to asm/nonmatchings/os/nusys/nuSched/nuScEventHandler.s index 7fbd28018c..6ec4fd00d0 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventHandler.s +++ b/asm/nonmatchings/os/nusys/nuSched/nuScEventHandler.s @@ -38,8 +38,8 @@ glabel nuScEventHandler /* 3A41C 8005F01C AC223B94 */ sw $v0, 0x3b94($at) /* 3A420 8005F020 0C017C30 */ jal nuScEventBroadcast /* 3A424 8005F024 2624FF8C */ addiu $a0, $s1, -0x74 -/* 3A428 8005F028 3C02800A */ lui $v0, 0x800a -/* 3A42C 8005F02C 9042A5B0 */ lbu $v0, -0x5a50($v0) +/* 3A428 8005F028 3C02800A */ lui $v0, %hi(D_8009A5B0) +/* 3A42C 8005F02C 9042A5B0 */ lbu $v0, %lo(D_8009A5B0)($v0) /* 3A430 8005F030 1040FFEC */ beqz $v0, .L8005EFE4 /* 3A434 8005F034 0220202D */ daddu $a0, $s1, $zero /* 3A438 8005F038 12000003 */ beqz $s0, .L8005F048 @@ -47,9 +47,9 @@ glabel nuScEventHandler /* 3A440 8005F040 08017BF9 */ j .L8005EFE4 /* 3A444 8005F044 2610FFFF */ addiu $s0, $s0, -1 .L8005F048: -/* 3A448 8005F048 3C01800A */ lui $at, 0x800a +/* 3A448 8005F048 3C01800A */ lui $at, %hi(D_8009A5B0) /* 3A44C 8005F04C 0C01A98C */ jal osAfterPreNMI -/* 3A450 8005F050 A022A5B0 */ sb $v0, -0x5a50($at) +/* 3A450 8005F050 A022A5B0 */ sb $v0, %lo(D_8009A5B0)($at) /* 3A454 8005F054 3C013F80 */ lui $at, 0x3f80 /* 3A458 8005F058 44816000 */ mtc1 $at, $f12 /* 3A45C 8005F05C 0C019BF4 */ jal osViSetYScale @@ -59,8 +59,8 @@ glabel nuScEventHandler /* 3A46C 8005F06C 08017BF9 */ j .L8005EFE4 /* 3A470 8005F070 0220202D */ daddu $a0, $s1, $zero .L8005F074: -/* 3A474 8005F074 3C01800A */ lui $at, 0x800a -/* 3A478 8005F078 A032A5B0 */ sb $s2, -0x5a50($at) +/* 3A474 8005F074 3C01800A */ lui $at, %hi(D_8009A5B0) +/* 3A478 8005F078 A032A5B0 */ sb $s2, %lo(D_8009A5B0)($at) /* 3A47C 8005F07C 0C017C30 */ jal nuScEventBroadcast /* 3A480 8005F080 2624FF8E */ addiu $a0, $s1, -0x72 /* 3A484 8005F084 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteAudio.s b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteAudio.s similarity index 97% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteAudio.s rename to asm/nonmatchings/os/nusys/nuSched/nuScExecuteAudio.s index 62f7e9fa26..131489f3d5 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteAudio.s +++ b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteAudio.s @@ -20,8 +20,8 @@ glabel nuScExecuteAudio /* 3A018 8005EC18 27A50010 */ addiu $a1, $sp, 0x10 /* 3A01C 8005EC1C 0C0195BC */ jal osRecvMesg /* 3A020 8005EC20 24060001 */ addiu $a2, $zero, 1 -/* 3A024 8005EC24 3C02800A */ lui $v0, 0x800a -/* 3A028 8005EC28 9042A5B0 */ lbu $v0, -0x5a50($v0) +/* 3A024 8005EC24 3C02800A */ lui $v0, %hi(D_8009A5B0) +/* 3A028 8005EC28 9042A5B0 */ lbu $v0, %lo(D_8009A5B0)($v0) /* 3A02C 8005EC2C 30420002 */ andi $v0, $v0, 2 /* 3A030 8005EC30 14400031 */ bnez $v0, .L8005ECF8 /* 3A034 8005EC34 00000000 */ nop diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteGraphics.s b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteGraphics.s similarity index 96% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteGraphics.s rename to asm/nonmatchings/os/nusys/nuSched/nuScExecuteGraphics.s index 0858f9d641..1ea6a3fffb 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteGraphics.s +++ b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteGraphics.s @@ -2,7 +2,6 @@ .set noreorder # don't insert nops after branches glabel nuScExecuteGraphics - /* 3A114 8005ED14 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 3A118 8005ED18 AFB00018 */ sw $s0, 0x18($sp) /* 3A11C 8005ED1C 3C10800E */ lui $s0, 0x800e @@ -15,8 +14,8 @@ glabel nuScExecuteGraphics /* 3A134 8005ED34 27A50010 */ addiu $a1, $sp, 0x10 /* 3A138 8005ED38 0C0195BC */ jal osRecvMesg /* 3A13C 8005ED3C 24060001 */ addiu $a2, $zero, 1 -/* 3A140 8005ED40 3C02800A */ lui $v0, 0x800a -/* 3A144 8005ED44 9042A5B0 */ lbu $v0, -0x5a50($v0) +/* 3A140 8005ED40 3C02800A */ lui $v0, %hi(D_8009A5B0) +/* 3A144 8005ED44 9042A5B0 */ lbu $v0, %lo(D_8009A5B0)($v0) /* 3A148 8005ED48 30420002 */ andi $v0, $v0, 2 /* 3A14C 8005ED4C 14400032 */ bnez $v0, .L8005EE18 /* 3A150 8005ED50 00000000 */ nop diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetAudioMQ.s b/asm/nonmatchings/os/nusys/nuSched/nuScGetAudioMQ.s similarity index 100% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScGetAudioMQ.s rename to asm/nonmatchings/os/nusys/nuSched/nuScGetAudioMQ.s diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetFrameRate.s b/asm/nonmatchings/os/nusys/nuSched/nuScGetFrameRate.s similarity index 100% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScGetFrameRate.s rename to asm/nonmatchings/os/nusys/nuSched/nuScGetFrameRate.s diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetGfxMQ.s b/asm/nonmatchings/os/nusys/nuSched/nuScGetGfxMQ.s similarity index 100% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScGetGfxMQ.s rename to asm/nonmatchings/os/nusys/nuSched/nuScGetGfxMQ.s diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScSetFrameBufferNum.s b/asm/nonmatchings/os/nusys/nuSched/nuScSetFrameBufferNum.s similarity index 100% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScSetFrameBufferNum.s rename to asm/nonmatchings/os/nusys/nuSched/nuScSetFrameBufferNum.s diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScWaitTaskReady.s b/asm/nonmatchings/os/nusys/nuSched/nuScWaitTaskReady.s similarity index 100% rename from asm/nonmatchings/os/code_39db0_len_8a0/nuScWaitTaskReady.s rename to asm/nonmatchings/os/nusys/nuSched/nuScWaitTaskReady.s diff --git a/asm/os/code_45df0_len_970.s b/asm/os/code_45df0_len_970.s new file mode 100644 index 0000000000..e86d69c867 --- /dev/null +++ b/asm/os/code_45df0_len_970.s @@ -0,0 +1,660 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +.section .text_1000, "ax" + +glabel func_8006A9F0 +/* 45DF0 8006A9F0 3C1A8007 */ lui $k0, 0x8007 +/* 45DF4 8006A9F4 275AAA00 */ addiu $k0, $k0, -0x5600 +/* 45DF8 8006A9F8 03400008 */ jr $k0 +/* 45DFC 8006A9FC 00000000 */ nop + +glabel osExceptionPreamble +/* 45E00 8006AA00 3C1A800B */ lui $k0, 0x800b +/* 45E04 8006AA04 275A0D08 */ addiu $k0, $k0, 0xd08 +/* 45E08 8006AA08 FF410020 */ sd $at, 0x20($k0) +/* 45E0C 8006AA0C 401B6000 */ mfc0 $k1, $12 +/* 45E10 8006AA10 AF5B0118 */ sw $k1, 0x118($k0) +/* 45E14 8006AA14 2401FFFC */ addiu $at, $zero, -4 +/* 45E18 8006AA18 0361D824 */ and $k1, $k1, $at +/* 45E1C 8006AA1C 409B6000 */ mtc0 $k1, $12 +/* 45E20 8006AA20 FF480058 */ sd $t0, 0x58($k0) +/* 45E24 8006AA24 FF490060 */ sd $t1, 0x60($k0) +/* 45E28 8006AA28 FF4A0068 */ sd $t2, 0x68($k0) +/* 45E2C 8006AA2C AF400018 */ sw $zero, 0x18($k0) +/* 45E30 8006AA30 40086800 */ mfc0 $t0, $13 + +glabel func_8006AA34 +/* 45E34 8006AA34 03404021 */ addu $t0, $k0, $zero +/* 45E38 8006AA38 3C1A8009 */ lui $k0, 0x8009 +/* 45E3C 8006AA3C 8F5A4660 */ lw $k0, 0x4660($k0) +/* 45E40 8006AA40 DD090020 */ ld $t1, 0x20($t0) +/* 45E44 8006AA44 FF490020 */ sd $t1, 0x20($k0) +/* 45E48 8006AA48 DD090118 */ ld $t1, 0x118($t0) +/* 45E4C 8006AA4C FF490118 */ sd $t1, 0x118($k0) +/* 45E50 8006AA50 DD090058 */ ld $t1, 0x58($t0) +/* 45E54 8006AA54 FF490058 */ sd $t1, 0x58($k0) +/* 45E58 8006AA58 DD090060 */ ld $t1, 0x60($t0) +/* 45E5C 8006AA5C FF490060 */ sd $t1, 0x60($k0) +/* 45E60 8006AA60 DD090068 */ ld $t1, 0x68($t0) +/* 45E64 8006AA64 FF490068 */ sd $t1, 0x68($k0) +/* 45E68 8006AA68 FF420028 */ sd $v0, 0x28($k0) +/* 45E6C 8006AA6C FF430030 */ sd $v1, 0x30($k0) +/* 45E70 8006AA70 FF440038 */ sd $a0, 0x38($k0) +/* 45E74 8006AA74 FF450040 */ sd $a1, 0x40($k0) +/* 45E78 8006AA78 FF460048 */ sd $a2, 0x48($k0) +/* 45E7C 8006AA7C FF470050 */ sd $a3, 0x50($k0) +/* 45E80 8006AA80 FF4B0070 */ sd $t3, 0x70($k0) +/* 45E84 8006AA84 FF4C0078 */ sd $t4, 0x78($k0) +/* 45E88 8006AA88 FF4D0080 */ sd $t5, 0x80($k0) +/* 45E8C 8006AA8C FF4E0088 */ sd $t6, 0x88($k0) +/* 45E90 8006AA90 FF4F0090 */ sd $t7, 0x90($k0) +/* 45E94 8006AA94 FF500098 */ sd $s0, 0x98($k0) +/* 45E98 8006AA98 FF5100A0 */ sd $s1, 0xa0($k0) +/* 45E9C 8006AA9C FF5200A8 */ sd $s2, 0xa8($k0) +/* 45EA0 8006AAA0 FF5300B0 */ sd $s3, 0xb0($k0) +/* 45EA4 8006AAA4 FF5400B8 */ sd $s4, 0xb8($k0) +/* 45EA8 8006AAA8 FF5500C0 */ sd $s5, 0xc0($k0) +/* 45EAC 8006AAAC FF5600C8 */ sd $s6, 0xc8($k0) +/* 45EB0 8006AAB0 FF5700D0 */ sd $s7, 0xd0($k0) +/* 45EB4 8006AAB4 FF5800D8 */ sd $t8, 0xd8($k0) +/* 45EB8 8006AAB8 FF5900E0 */ sd $t9, 0xe0($k0) +/* 45EBC 8006AABC FF5C00E8 */ sd $gp, 0xe8($k0) +/* 45EC0 8006AAC0 FF5D00F0 */ sd $sp, 0xf0($k0) +/* 45EC4 8006AAC4 FF5E00F8 */ sd $fp, 0xf8($k0) +/* 45EC8 8006AAC8 FF5F0100 */ sd $ra, 0x100($k0) +/* 45ECC 8006AACC 00004012 */ mflo $t0 +/* 45ED0 8006AAD0 FF480108 */ sd $t0, 0x108($k0) +/* 45ED4 8006AAD4 00004010 */ mfhi $t0 +/* 45ED8 8006AAD8 FF480110 */ sd $t0, 0x110($k0) +/* 45EDC 8006AADC 8F5B0118 */ lw $k1, 0x118($k0) +/* 45EE0 8006AAE0 3369FF00 */ andi $t1, $k1, 0xff00 +/* 45EE4 8006AAE4 11200013 */ beqz $t1, .L8006AB34 +/* 45EE8 8006AAE8 00000000 */ nop +/* 45EEC 8006AAEC 3C088009 */ lui $t0, 0x8009 +/* 45EF0 8006AAF0 25085900 */ addiu $t0, $t0, 0x5900 +/* 45EF4 8006AAF4 8D080000 */ lw $t0, ($t0) +/* 45EF8 8006AAF8 2401FFFF */ addiu $at, $zero, -1 +/* 45EFC 8006AAFC 01015026 */ xor $t2, $t0, $at +/* 45F00 8006AB00 314AFF00 */ andi $t2, $t2, 0xff00 +/* 45F04 8006AB04 012A6025 */ or $t4, $t1, $t2 +/* 45F08 8006AB08 3C01FFFF */ lui $at, 0xffff +/* 45F0C 8006AB0C 342100FF */ ori $at, $at, 0xff +/* 45F10 8006AB10 03615824 */ and $t3, $k1, $at +/* 45F14 8006AB14 016C5825 */ or $t3, $t3, $t4 +/* 45F18 8006AB18 AF4B0118 */ sw $t3, 0x118($k0) +/* 45F1C 8006AB1C 3108FF00 */ andi $t0, $t0, 0xff00 +/* 45F20 8006AB20 01284824 */ and $t1, $t1, $t0 +/* 45F24 8006AB24 3C01FFFF */ lui $at, 0xffff +/* 45F28 8006AB28 342100FF */ ori $at, $at, 0xff +/* 45F2C 8006AB2C 0361D824 */ and $k1, $k1, $at +/* 45F30 8006AB30 0369D825 */ or $k1, $k1, $t1 +.L8006AB34: +/* 45F34 8006AB34 3C09A430 */ lui $t1, 0xa430 +/* 45F38 8006AB38 8D29000C */ lw $t1, 0xc($t1) +/* 45F3C 8006AB3C 1120000B */ beqz $t1, .L8006AB6C +/* 45F40 8006AB40 00000000 */ nop +/* 45F44 8006AB44 3C088009 */ lui $t0, 0x8009 +/* 45F48 8006AB48 25085900 */ addiu $t0, $t0, 0x5900 +/* 45F4C 8006AB4C 8D080000 */ lw $t0, ($t0) +/* 45F50 8006AB50 00084402 */ srl $t0, $t0, 0x10 +/* 45F54 8006AB54 2401FFFF */ addiu $at, $zero, -1 +/* 45F58 8006AB58 01014026 */ xor $t0, $t0, $at +/* 45F5C 8006AB5C 3108003F */ andi $t0, $t0, 0x3f +/* 45F60 8006AB60 8F4C0128 */ lw $t4, 0x128($k0) +/* 45F64 8006AB64 010C4024 */ and $t0, $t0, $t4 +/* 45F68 8006AB68 01284825 */ or $t1, $t1, $t0 +.L8006AB6C: +/* 45F6C 8006AB6C AF490128 */ sw $t1, 0x128($k0) +/* 45F70 8006AB70 40087000 */ mfc0 $t0, $14 +/* 45F74 8006AB74 AF48011C */ sw $t0, 0x11c($k0) +/* 45F78 8006AB78 8F480018 */ lw $t0, 0x18($k0) +/* 45F7C 8006AB7C 11000014 */ beqz $t0, .L8006ABD0 +/* 45F80 8006AB80 00000000 */ nop +/* 45F84 8006AB84 4448F800 */ cfc1 $t0, $31 +/* 45F88 8006AB88 00000000 */ nop +/* 45F8C 8006AB8C AF48012C */ sw $t0, 0x12c($k0) +/* 45F90 8006AB90 F7400130 */ sdc1 $f0, 0x130($k0) +/* 45F94 8006AB94 F7420138 */ sdc1 $f2, 0x138($k0) +/* 45F98 8006AB98 F7440140 */ sdc1 $f4, 0x140($k0) +/* 45F9C 8006AB9C F7460148 */ sdc1 $f6, 0x148($k0) +/* 45FA0 8006ABA0 F7480150 */ sdc1 $f8, 0x150($k0) +/* 45FA4 8006ABA4 F74A0158 */ sdc1 $f10, 0x158($k0) +/* 45FA8 8006ABA8 F74C0160 */ sdc1 $f12, 0x160($k0) +/* 45FAC 8006ABAC F74E0168 */ sdc1 $f14, 0x168($k0) +/* 45FB0 8006ABB0 F7500170 */ sdc1 $f16, 0x170($k0) +/* 45FB4 8006ABB4 F7520178 */ sdc1 $f18, 0x178($k0) +/* 45FB8 8006ABB8 F7540180 */ sdc1 $f20, 0x180($k0) +/* 45FBC 8006ABBC F7560188 */ sdc1 $f22, 0x188($k0) +/* 45FC0 8006ABC0 F7580190 */ sdc1 $f24, 0x190($k0) +/* 45FC4 8006ABC4 F75A0198 */ sdc1 $f26, 0x198($k0) +/* 45FC8 8006ABC8 F75C01A0 */ sdc1 $f28, 0x1a0($k0) +/* 45FCC 8006ABCC F75E01A8 */ sdc1 $f30, 0x1a8($k0) +.L8006ABD0: +/* 45FD0 8006ABD0 40086800 */ mfc0 $t0, $13 +/* 45FD4 8006ABD4 AF480120 */ sw $t0, 0x120($k0) +/* 45FD8 8006ABD8 24090002 */ addiu $t1, $zero, 2 +/* 45FDC 8006ABDC A7490010 */ sh $t1, 0x10($k0) +/* 45FE0 8006ABE0 3109007C */ andi $t1, $t0, 0x7c +/* 45FE4 8006ABE4 240A0024 */ addiu $t2, $zero, 0x24 +/* 45FE8 8006ABE8 112A00BF */ beq $t1, $t2, .L8006AEE8 +/* 45FEC 8006ABEC 00000000 */ nop +/* 45FF0 8006ABF0 240A002C */ addiu $t2, $zero, 0x2c +/* 45FF4 8006ABF4 112A0110 */ beq $t1, $t2, handle_CPU +/* 45FF8 8006ABF8 00000000 */ nop +/* 45FFC 8006ABFC 240A0000 */ addiu $t2, $zero, 0 +/* 46000 8006AC00 152A00D2 */ bne $t1, $t2, .L8006AF4C +/* 46004 8006AC04 00000000 */ nop +/* 46008 8006AC08 03688024 */ and $s0, $k1, $t0 +.L8006AC0C: +/* 4600C 8006AC0C 3209FF00 */ andi $t1, $s0, 0xff00 +/* 46010 8006AC10 00095302 */ srl $t2, $t1, 0xc +/* 46014 8006AC14 15400003 */ bnez $t2, .L8006AC24 +/* 46018 8006AC18 00000000 */ nop +/* 4601C 8006AC1C 00095202 */ srl $t2, $t1, 8 +/* 46020 8006AC20 214A0010 */ addi $t2, $t2, 0x10 +.L8006AC24: +/* 46024 8006AC24 3C01800A */ lui $at, 0x800a +/* 46028 8006AC28 002A0821 */ addu $at, $at, $t2 +/* 4602C 8006AC2C 902A9D80 */ lbu $t2, -0x6280($at) +/* 46030 8006AC30 3C01800A */ lui $at, 0x800a +/* 46034 8006AC34 002A0821 */ addu $at, $at, $t2 +/* 46038 8006AC38 8C2A9DA0 */ lw $t2, -0x6260($at) +/* 4603C 8006AC3C 01400008 */ jr $t2 +/* 46040 8006AC40 00000000 */ nop +/* 46044 8006AC44 2401DFFF */ addiu $at, $zero, -0x2001 +/* 46048 8006AC48 1000FFF0 */ b .L8006AC0C +/* 4604C 8006AC4C 02018024 */ and $s0, $s0, $at +/* 46050 8006AC50 2401BFFF */ addiu $at, $zero, -0x4001 +/* 46054 8006AC54 1000FFED */ b .L8006AC0C +/* 46058 8006AC58 02018024 */ and $s0, $s0, $at +/* 4605C 8006AC5C 40095800 */ mfc0 $t1, $11 +/* 46060 8006AC60 40895800 */ mtc0 $t1, $11 +/* 46064 8006AC64 24040018 */ addiu $a0, $zero, 0x18 +/* 46068 8006AC68 0C01ABDF */ jal send_mesg +/* 4606C 8006AC6C 00000000 */ nop +/* 46070 8006AC70 3C01FFFF */ lui $at, 0xffff +/* 46074 8006AC74 34217FFF */ ori $at, $at, 0x7fff +/* 46078 8006AC78 1000FFE4 */ b .L8006AC0C +/* 4607C 8006AC7C 02018024 */ and $s0, $s0, $at +/* 46080 8006AC80 2401F7FF */ addiu $at, $zero, -0x801 +/* 46084 8006AC84 02018024 */ and $s0, $s0, $at +/* 46088 8006AC88 3C098009 */ lui $t1, 0x8009 +/* 4608C 8006AC8C 25295910 */ addiu $t1, $t1, 0x5910 +/* 46090 8006AC90 21290008 */ addi $t1, $t1, 8 +/* 46094 8006AC94 8D2A0000 */ lw $t2, ($t1) +/* 46098 8006AC98 11400007 */ beqz $t2, .L8006ACB8 +/* 4609C 8006AC9C 00000000 */ nop +/* 460A0 8006ACA0 0140F809 */ jalr $t2 +/* 460A4 8006ACA4 8D3D0004 */ lw $sp, 4($t1) +/* 460A8 8006ACA8 10400003 */ beqz $v0, .L8006ACB8 +/* 460AC 8006ACAC 00000000 */ nop +/* 460B0 8006ACB0 10000093 */ b .L8006AF00 +/* 460B4 8006ACB4 00000000 */ nop +.L8006ACB8: +/* 460B8 8006ACB8 0C01ABDF */ jal send_mesg +/* 460BC 8006ACBC 24040010 */ addiu $a0, $zero, 0x10 +/* 460C0 8006ACC0 1000FFD2 */ b .L8006AC0C +/* 460C4 8006ACC4 00000000 */ nop +/* 460C8 8006ACC8 3C11A430 */ lui $s1, 0xa430 +/* 460CC 8006ACCC 8E310008 */ lw $s1, 8($s1) +/* 460D0 8006ACD0 3C088009 */ lui $t0, 0x8009 +/* 460D4 8006ACD4 25085900 */ addiu $t0, $t0, 0x5900 +/* 460D8 8006ACD8 8D080000 */ lw $t0, ($t0) +/* 460DC 8006ACDC 00084402 */ srl $t0, $t0, 0x10 +/* 460E0 8006ACE0 02288824 */ and $s1, $s1, $t0 +/* 460E4 8006ACE4 32290001 */ andi $t1, $s1, 1 +/* 460E8 8006ACE8 11200014 */ beqz $t1, .L8006AD3C +/* 460EC 8006ACEC 00000000 */ nop +/* 460F0 8006ACF0 3231003E */ andi $s1, $s1, 0x3e +/* 460F4 8006ACF4 3C0CA404 */ lui $t4, 0xa404 +/* 460F8 8006ACF8 8D8C0010 */ lw $t4, 0x10($t4) +/* 460FC 8006ACFC 34098008 */ ori $t1, $zero, 0x8008 +/* 46100 8006AD00 3C01A404 */ lui $at, 0xa404 +/* 46104 8006AD04 AC290010 */ sw $t1, 0x10($at) +/* 46108 8006AD08 318C0300 */ andi $t4, $t4, 0x300 +/* 4610C 8006AD0C 11800007 */ beqz $t4, .L8006AD2C +/* 46110 8006AD10 00000000 */ nop +/* 46114 8006AD14 0C01ABDF */ jal send_mesg +/* 46118 8006AD18 24040020 */ addiu $a0, $zero, 0x20 +/* 4611C 8006AD1C 12200044 */ beqz $s1, .L8006AE30 +/* 46120 8006AD20 00000000 */ nop +/* 46124 8006AD24 10000005 */ b .L8006AD3C +/* 46128 8006AD28 00000000 */ nop +.L8006AD2C: +/* 4612C 8006AD2C 0C01ABDF */ jal send_mesg +/* 46130 8006AD30 24040058 */ addiu $a0, $zero, 0x58 +/* 46134 8006AD34 1220003E */ beqz $s1, .L8006AE30 +/* 46138 8006AD38 00000000 */ nop +.L8006AD3C: +/* 4613C 8006AD3C 32290008 */ andi $t1, $s1, 8 +/* 46140 8006AD40 11200008 */ beqz $t1, .L8006AD64 +/* 46144 8006AD44 00000000 */ nop +/* 46148 8006AD48 32310037 */ andi $s1, $s1, 0x37 +/* 4614C 8006AD4C 3C01A440 */ lui $at, 0xa440 +/* 46150 8006AD50 AC200010 */ sw $zero, 0x10($at) +/* 46154 8006AD54 0C01ABDF */ jal send_mesg +/* 46158 8006AD58 24040038 */ addiu $a0, $zero, 0x38 +/* 4615C 8006AD5C 12200034 */ beqz $s1, .L8006AE30 +/* 46160 8006AD60 00000000 */ nop +.L8006AD64: +/* 46164 8006AD64 32290004 */ andi $t1, $s1, 4 +/* 46168 8006AD68 11200009 */ beqz $t1, .L8006AD90 +/* 4616C 8006AD6C 00000000 */ nop +/* 46170 8006AD70 3231003B */ andi $s1, $s1, 0x3b +/* 46174 8006AD74 24090001 */ addiu $t1, $zero, 1 +/* 46178 8006AD78 3C01A450 */ lui $at, 0xa450 +/* 4617C 8006AD7C AC29000C */ sw $t1, 0xc($at) +/* 46180 8006AD80 0C01ABDF */ jal send_mesg +/* 46184 8006AD84 24040030 */ addiu $a0, $zero, 0x30 +/* 46188 8006AD88 12200029 */ beqz $s1, .L8006AE30 +/* 4618C 8006AD8C 00000000 */ nop +.L8006AD90: +/* 46190 8006AD90 32290002 */ andi $t1, $s1, 2 +/* 46194 8006AD94 11200008 */ beqz $t1, .L8006ADB8 +/* 46198 8006AD98 00000000 */ nop +/* 4619C 8006AD9C 3231003D */ andi $s1, $s1, 0x3d +/* 461A0 8006ADA0 3C01A480 */ lui $at, 0xa480 +/* 461A4 8006ADA4 AC200018 */ sw $zero, 0x18($at) +/* 461A8 8006ADA8 0C01ABDF */ jal send_mesg +/* 461AC 8006ADAC 24040028 */ addiu $a0, $zero, 0x28 +/* 461B0 8006ADB0 1220001F */ beqz $s1, .L8006AE30 +/* 461B4 8006ADB4 00000000 */ nop +.L8006ADB8: +/* 461B8 8006ADB8 32290010 */ andi $t1, $s1, 0x10 +/* 461BC 8006ADBC 11200013 */ beqz $t1, .L8006AE0C +/* 461C0 8006ADC0 00000000 */ nop +/* 461C4 8006ADC4 3231002F */ andi $s1, $s1, 0x2f +/* 461C8 8006ADC8 24090002 */ addiu $t1, $zero, 2 +/* 461CC 8006ADCC 3C01A460 */ lui $at, 0xa460 +/* 461D0 8006ADD0 AC290010 */ sw $t1, 0x10($at) +/* 461D4 8006ADD4 3C098009 */ lui $t1, 0x8009 +/* 461D8 8006ADD8 25295938 */ addiu $t1, $t1, 0x5938 +/* 461DC 8006ADDC 8D2A0000 */ lw $t2, ($t1) +/* 461E0 8006ADE0 11400006 */ beqz $t2, .L8006ADFC +/* 461E4 8006ADE4 00000000 */ nop +/* 461E8 8006ADE8 8D3D0004 */ lw $sp, 4($t1) +/* 461EC 8006ADEC 0140F809 */ jalr $t2 +/* 461F0 8006ADF0 00402021 */ addu $a0, $v0, $zero +/* 461F4 8006ADF4 14400003 */ bnez $v0, .L8006AE04 +/* 461F8 8006ADF8 00000000 */ nop +.L8006ADFC: +/* 461FC 8006ADFC 0C01ABDF */ jal send_mesg +/* 46200 8006AE00 24040040 */ addiu $a0, $zero, 0x40 +.L8006AE04: +/* 46204 8006AE04 1220000A */ beqz $s1, .L8006AE30 +/* 46208 8006AE08 00000000 */ nop +.L8006AE0C: +/* 4620C 8006AE0C 32290020 */ andi $t1, $s1, 0x20 +/* 46210 8006AE10 11200007 */ beqz $t1, .L8006AE30 +/* 46214 8006AE14 00000000 */ nop +/* 46218 8006AE18 3231001F */ andi $s1, $s1, 0x1f +/* 4621C 8006AE1C 24090800 */ addiu $t1, $zero, 0x800 +/* 46220 8006AE20 3C01A430 */ lui $at, 0xa430 +/* 46224 8006AE24 AC290000 */ sw $t1, ($at) +/* 46228 8006AE28 0C01ABDF */ jal send_mesg +/* 4622C 8006AE2C 24040048 */ addiu $a0, $zero, 0x48 +.L8006AE30: +/* 46230 8006AE30 2401FBFF */ addiu $at, $zero, -0x401 +/* 46234 8006AE34 1000FF75 */ b .L8006AC0C +/* 46238 8006AE38 02018024 */ and $s0, $s0, $at +/* 4623C 8006AE3C 8F5B0118 */ lw $k1, 0x118($k0) +/* 46240 8006AE40 2401EFFF */ addiu $at, $zero, -0x1001 +/* 46244 8006AE44 0361D824 */ and $k1, $k1, $at +/* 46248 8006AE48 AF5B0118 */ sw $k1, 0x118($k0) +/* 4624C 8006AE4C 3C098009 */ lui $t1, 0x8009 +/* 46250 8006AE50 252958FC */ addiu $t1, $t1, 0x58fc +/* 46254 8006AE54 8D2A0000 */ lw $t2, ($t1) +/* 46258 8006AE58 11400004 */ beqz $t2, .L8006AE6C +/* 4625C 8006AE5C 00000000 */ nop +/* 46260 8006AE60 2401EFFF */ addiu $at, $zero, -0x1001 +/* 46264 8006AE64 10000026 */ b .L8006AF00 +/* 46268 8006AE68 02018024 */ and $s0, $s0, $at +.L8006AE6C: +/* 4626C 8006AE6C 240A0001 */ addiu $t2, $zero, 1 +/* 46270 8006AE70 AD2A0000 */ sw $t2, ($t1) +/* 46274 8006AE74 0C01ABDF */ jal send_mesg +/* 46278 8006AE78 24040070 */ addiu $a0, $zero, 0x70 +/* 4627C 8006AE7C 2401EFFF */ addiu $at, $zero, -0x1001 +/* 46280 8006AE80 02018024 */ and $s0, $s0, $at +/* 46284 8006AE84 3C0A8009 */ lui $t2, 0x8009 +/* 46288 8006AE88 8D4A4658 */ lw $t2, 0x4658($t2) +/* 4628C 8006AE8C 8D5B0118 */ lw $k1, 0x118($t2) +/* 46290 8006AE90 2401EFFF */ addiu $at, $zero, -0x1001 +/* 46294 8006AE94 0361D824 */ and $k1, $k1, $at +/* 46298 8006AE98 10000019 */ b .L8006AF00 +/* 4629C 8006AE9C AD5B0118 */ sw $k1, 0x118($t2) +/* 462A0 8006AEA0 2401FDFF */ addiu $at, $zero, -0x201 +/* 462A4 8006AEA4 01014024 */ and $t0, $t0, $at +/* 462A8 8006AEA8 40886800 */ mtc0 $t0, $13 +/* 462AC 8006AEAC 24040008 */ addiu $a0, $zero, 8 +/* 462B0 8006AEB0 0C01ABDF */ jal send_mesg +/* 462B4 8006AEB4 00000000 */ nop +/* 462B8 8006AEB8 2401FDFF */ addiu $at, $zero, -0x201 +/* 462BC 8006AEBC 1000FF53 */ b .L8006AC0C +/* 462C0 8006AEC0 02018024 */ and $s0, $s0, $at +/* 462C4 8006AEC4 2401FEFF */ addiu $at, $zero, -0x101 +/* 462C8 8006AEC8 01014024 */ and $t0, $t0, $at +/* 462CC 8006AECC 40886800 */ mtc0 $t0, $13 +/* 462D0 8006AED0 24040000 */ addiu $a0, $zero, 0 +/* 462D4 8006AED4 0C01ABDF */ jal send_mesg +/* 462D8 8006AED8 00000000 */ nop +/* 462DC 8006AEDC 2401FEFF */ addiu $at, $zero, -0x101 +/* 462E0 8006AEE0 1000FF4A */ b .L8006AC0C +/* 462E4 8006AEE4 02018024 */ and $s0, $s0, $at +.L8006AEE8: +/* 462E8 8006AEE8 24090001 */ addiu $t1, $zero, 1 +/* 462EC 8006AEEC A7490012 */ sh $t1, 0x12($k0) +/* 462F0 8006AEF0 0C01ABDF */ jal send_mesg +/* 462F4 8006AEF4 24040050 */ addiu $a0, $zero, 0x50 +/* 462F8 8006AEF8 10000001 */ b .L8006AF00 +/* 462FC 8006AEFC 00000000 */ nop +.L8006AF00: +/* 46300 8006AF00 8F490004 */ lw $t1, 4($k0) +/* 46304 8006AF04 3C0A8009 */ lui $t2, 0x8009 +/* 46308 8006AF08 8D4A4658 */ lw $t2, 0x4658($t2) +/* 4630C 8006AF0C 8D4B0004 */ lw $t3, 4($t2) +/* 46310 8006AF10 012B082A */ slt $at, $t1, $t3 +/* 46314 8006AF14 10200007 */ beqz $at, .L8006AF34 +/* 46318 8006AF18 00000000 */ nop +/* 4631C 8006AF1C 03402821 */ addu $a1, $k0, $zero +/* 46320 8006AF20 3C048009 */ lui $a0, 0x8009 +/* 46324 8006AF24 0C01AC5D */ jal osEnqueueThread +/* 46328 8006AF28 24844658 */ addiu $a0, $a0, 0x4658 +/* 4632C 8006AF2C 0801AC75 */ j osDispatchThread +/* 46330 8006AF30 00000000 */ nop +.L8006AF34: +/* 46334 8006AF34 3C098009 */ lui $t1, 0x8009 +/* 46338 8006AF38 25294658 */ addiu $t1, $t1, 0x4658 +/* 4633C 8006AF3C 8D2A0000 */ lw $t2, ($t1) +/* 46340 8006AF40 AF4A0000 */ sw $t2, ($k0) +/* 46344 8006AF44 0801AC75 */ j osDispatchThread +/* 46348 8006AF48 AD3A0000 */ sw $k0, ($t1) +.L8006AF4C: +/* 4634C 8006AF4C 3C018009 */ lui $at, 0x8009 +/* 46350 8006AF50 AC3A4664 */ sw $k0, 0x4664($at) +/* 46354 8006AF54 24090001 */ addiu $t1, $zero, 1 +/* 46358 8006AF58 A7490010 */ sh $t1, 0x10($k0) +/* 4635C 8006AF5C 24090002 */ addiu $t1, $zero, 2 +/* 46360 8006AF60 A7490012 */ sh $t1, 0x12($k0) +/* 46364 8006AF64 400A4000 */ mfc0 $t2, $8 +/* 46368 8006AF68 AF4A0124 */ sw $t2, 0x124($k0) +/* 4636C 8006AF6C 0C01ABDF */ jal send_mesg +/* 46370 8006AF70 24040060 */ addiu $a0, $zero, 0x60 +/* 46374 8006AF74 0801AC75 */ j osDispatchThread +/* 46378 8006AF78 00000000 */ nop + +glabel send_mesg +/* 4637C 8006AF7C 03E09021 */ addu $s2, $ra, $zero +/* 46380 8006AF80 3C0A800E */ lui $t2, 0x800e +/* 46384 8006AF84 254A9F80 */ addiu $t2, $t2, -0x6080 +/* 46388 8006AF88 01445021 */ addu $t2, $t2, $a0 +/* 4638C 8006AF8C 8D490000 */ lw $t1, ($t2) +/* 46390 8006AF90 11200027 */ beqz $t1, .L8006B030 +/* 46394 8006AF94 00000000 */ nop +/* 46398 8006AF98 8D2B0008 */ lw $t3, 8($t1) +/* 4639C 8006AF9C 8D2C0010 */ lw $t4, 0x10($t1) +/* 463A0 8006AFA0 016C082A */ slt $at, $t3, $t4 +/* 463A4 8006AFA4 10200022 */ beqz $at, .L8006B030 +/* 463A8 8006AFA8 00000000 */ nop +/* 463AC 8006AFAC 8D2D000C */ lw $t5, 0xc($t1) +/* 463B0 8006AFB0 01AB6821 */ addu $t5, $t5, $t3 +/* 463B4 8006AFB4 01AC001A */ div $zero, $t5, $t4 +/* 463B8 8006AFB8 15800002 */ bnez $t4, .L8006AFC4 +/* 463BC 8006AFBC 00000000 */ nop +/* 463C0 8006AFC0 0007000D */ break 7 +.L8006AFC4: +/* 463C4 8006AFC4 2401FFFF */ addiu $at, $zero, -1 +/* 463C8 8006AFC8 15810004 */ bne $t4, $at, .L8006AFDC +/* 463CC 8006AFCC 3C018000 */ lui $at, 0x8000 +/* 463D0 8006AFD0 15A10002 */ bne $t5, $at, .L8006AFDC +/* 463D4 8006AFD4 00000000 */ nop +/* 463D8 8006AFD8 0006000D */ break 6 +.L8006AFDC: +/* 463DC 8006AFDC 00006810 */ mfhi $t5 +/* 463E0 8006AFE0 8D2C0014 */ lw $t4, 0x14($t1) +/* 463E4 8006AFE4 24010004 */ addiu $at, $zero, 4 +/* 463E8 8006AFE8 01A10018 */ mult $t5, $at +/* 463EC 8006AFEC 00006812 */ mflo $t5 +/* 463F0 8006AFF0 018D6021 */ addu $t4, $t4, $t5 +/* 463F4 8006AFF4 8D4D0004 */ lw $t5, 4($t2) +/* 463F8 8006AFF8 AD8D0000 */ sw $t5, ($t4) +/* 463FC 8006AFFC 256A0001 */ addiu $t2, $t3, 1 +/* 46400 8006B000 AD2A0008 */ sw $t2, 8($t1) +/* 46404 8006B004 8D2A0000 */ lw $t2, ($t1) +/* 46408 8006B008 8D4B0000 */ lw $t3, ($t2) +/* 4640C 8006B00C 11600008 */ beqz $t3, .L8006B030 +/* 46410 8006B010 00000000 */ nop +/* 46414 8006B014 0C01AC6F */ jal osPopThread +/* 46418 8006B018 01202021 */ addu $a0, $t1, $zero +/* 4641C 8006B01C 00405021 */ addu $t2, $v0, $zero +/* 46420 8006B020 01402821 */ addu $a1, $t2, $zero +/* 46424 8006B024 3C048009 */ lui $a0, 0x8009 +/* 46428 8006B028 0C01AC5D */ jal osEnqueueThread +/* 4642C 8006B02C 24844658 */ addiu $a0, $a0, 0x4658 +.L8006B030: +/* 46430 8006B030 02400008 */ jr $s2 +/* 46434 8006B034 00000000 */ nop + +glabel handle_CPU +/* 46438 8006B038 3C013000 */ lui $at, 0x3000 +/* 4643C 8006B03C 01014824 */ and $t1, $t0, $at +/* 46440 8006B040 00094F02 */ srl $t1, $t1, 0x1c +/* 46444 8006B044 240A0001 */ addiu $t2, $zero, 1 +/* 46448 8006B048 152AFFC0 */ bne $t1, $t2, .L8006AF4C +/* 4644C 8006B04C 00000000 */ nop +/* 46450 8006B050 24090001 */ addiu $t1, $zero, 1 +/* 46454 8006B054 AF490018 */ sw $t1, 0x18($k0) +/* 46458 8006B058 8F5B0118 */ lw $k1, 0x118($k0) +/* 4645C 8006B05C 3C012000 */ lui $at, 0x2000 +/* 46460 8006B060 0361D825 */ or $k1, $k1, $at +/* 46464 8006B064 1000FFB3 */ b .L8006AF34 +/* 46468 8006B068 AF5B0118 */ sw $k1, 0x118($k0) + +glabel osEnqueueAndYield +/* 4646C 8006B06C 3C058009 */ lui $a1, 0x8009 +/* 46470 8006B070 8CA54660 */ lw $a1, 0x4660($a1) +/* 46474 8006B074 40086000 */ mfc0 $t0, $12 +/* 46478 8006B078 35080002 */ ori $t0, $t0, 2 +/* 4647C 8006B07C ACA80118 */ sw $t0, 0x118($a1) +/* 46480 8006B080 FCB00098 */ sd $s0, 0x98($a1) +/* 46484 8006B084 FCB100A0 */ sd $s1, 0xa0($a1) +/* 46488 8006B088 FCB200A8 */ sd $s2, 0xa8($a1) +/* 4648C 8006B08C FCB300B0 */ sd $s3, 0xb0($a1) +/* 46490 8006B090 FCB400B8 */ sd $s4, 0xb8($a1) +/* 46494 8006B094 FCB500C0 */ sd $s5, 0xc0($a1) +/* 46498 8006B098 FCB600C8 */ sd $s6, 0xc8($a1) +/* 4649C 8006B09C FCB700D0 */ sd $s7, 0xd0($a1) +/* 464A0 8006B0A0 FCBC00E8 */ sd $gp, 0xe8($a1) +/* 464A4 8006B0A4 FCBD00F0 */ sd $sp, 0xf0($a1) +/* 464A8 8006B0A8 FCBE00F8 */ sd $fp, 0xf8($a1) +/* 464AC 8006B0AC FCBF0100 */ sd $ra, 0x100($a1) +/* 464B0 8006B0B0 ACBF011C */ sw $ra, 0x11c($a1) +/* 464B4 8006B0B4 8CBB0018 */ lw $k1, 0x18($a1) +/* 464B8 8006B0B8 1360000A */ beqz $k1, .L8006B0E4 +/* 464BC 8006B0BC 00000000 */ nop +/* 464C0 8006B0C0 445BF800 */ cfc1 $k1, $31 +/* 464C4 8006B0C4 00000000 */ nop +/* 464C8 8006B0C8 ACBB012C */ sw $k1, 0x12c($a1) +/* 464CC 8006B0CC F4B40180 */ sdc1 $f20, 0x180($a1) +/* 464D0 8006B0D0 F4B60188 */ sdc1 $f22, 0x188($a1) +/* 464D4 8006B0D4 F4B80190 */ sdc1 $f24, 0x190($a1) +/* 464D8 8006B0D8 F4BA0198 */ sdc1 $f26, 0x198($a1) +/* 464DC 8006B0DC F4BC01A0 */ sdc1 $f28, 0x1a0($a1) +/* 464E0 8006B0E0 F4BE01A8 */ sdc1 $f30, 0x1a8($a1) +.L8006B0E4: +/* 464E4 8006B0E4 8CBB0118 */ lw $k1, 0x118($a1) +/* 464E8 8006B0E8 3369FF00 */ andi $t1, $k1, 0xff00 +/* 464EC 8006B0EC 1120000D */ beqz $t1, .L8006B124 +/* 464F0 8006B0F0 00000000 */ nop +/* 464F4 8006B0F4 3C088009 */ lui $t0, 0x8009 +/* 464F8 8006B0F8 25085900 */ addiu $t0, $t0, 0x5900 +/* 464FC 8006B0FC 8D080000 */ lw $t0, ($t0) +/* 46500 8006B100 2401FFFF */ addiu $at, $zero, -1 +/* 46504 8006B104 01014026 */ xor $t0, $t0, $at +/* 46508 8006B108 3108FF00 */ andi $t0, $t0, 0xff00 +/* 4650C 8006B10C 01284825 */ or $t1, $t1, $t0 +/* 46510 8006B110 3C01FFFF */ lui $at, 0xffff +/* 46514 8006B114 342100FF */ ori $at, $at, 0xff +/* 46518 8006B118 0361D824 */ and $k1, $k1, $at +/* 4651C 8006B11C 0369D825 */ or $k1, $k1, $t1 +/* 46520 8006B120 ACBB0118 */ sw $k1, 0x118($a1) +.L8006B124: +/* 46524 8006B124 3C1BA430 */ lui $k1, 0xa430 +/* 46528 8006B128 8F7B000C */ lw $k1, 0xc($k1) +/* 4652C 8006B12C 1360000B */ beqz $k1, .L8006B15C +/* 46530 8006B130 00000000 */ nop +/* 46534 8006B134 3C1A8009 */ lui $k0, 0x8009 +/* 46538 8006B138 275A5900 */ addiu $k0, $k0, 0x5900 +/* 4653C 8006B13C 8F5A0000 */ lw $k0, ($k0) +/* 46540 8006B140 001AD402 */ srl $k0, $k0, 0x10 +/* 46544 8006B144 2401FFFF */ addiu $at, $zero, -1 +/* 46548 8006B148 0341D026 */ xor $k0, $k0, $at +/* 4654C 8006B14C 335A003F */ andi $k0, $k0, 0x3f +/* 46550 8006B150 8CA80128 */ lw $t0, 0x128($a1) +/* 46554 8006B154 0348D024 */ and $k0, $k0, $t0 +/* 46558 8006B158 037AD825 */ or $k1, $k1, $k0 +.L8006B15C: +/* 4655C 8006B15C 10800003 */ beqz $a0, .L8006B16C +/* 46560 8006B160 ACBB0128 */ sw $k1, 0x128($a1) +/* 46564 8006B164 0C01AC5D */ jal osEnqueueThread +/* 46568 8006B168 00000000 */ nop +.L8006B16C: +/* 4656C 8006B16C 0801AC75 */ j osDispatchThread +/* 46570 8006B170 00000000 */ nop + +glabel osEnqueueThread +/* 46574 8006B174 0080C821 */ addu $t9, $a0, $zero +/* 46578 8006B178 8C980000 */ lw $t8, ($a0) +/* 4657C 8006B17C 8CAF0004 */ lw $t7, 4($a1) +/* 46580 8006B180 8F0E0004 */ lw $t6, 4($t8) +/* 46584 8006B184 01CF082A */ slt $at, $t6, $t7 +/* 46588 8006B188 14200007 */ bnez $at, .L8006B1A8 +/* 4658C 8006B18C 00000000 */ nop +.L8006B190: +/* 46590 8006B190 0300C821 */ addu $t9, $t8, $zero +/* 46594 8006B194 8F180000 */ lw $t8, ($t8) +/* 46598 8006B198 8F0E0004 */ lw $t6, 4($t8) +/* 4659C 8006B19C 01CF082A */ slt $at, $t6, $t7 +/* 465A0 8006B1A0 1020FFFB */ beqz $at, .L8006B190 +/* 465A4 8006B1A4 00000000 */ nop +.L8006B1A8: +/* 465A8 8006B1A8 8F380000 */ lw $t8, ($t9) +/* 465AC 8006B1AC ACB80000 */ sw $t8, ($a1) +/* 465B0 8006B1B0 AF250000 */ sw $a1, ($t9) +/* 465B4 8006B1B4 03E00008 */ jr $ra +/* 465B8 8006B1B8 ACA40008 */ sw $a0, 8($a1) + +glabel osPopThread +/* 465BC 8006B1BC 8C820000 */ lw $v0, ($a0) +/* 465C0 8006B1C0 8C590000 */ lw $t9, ($v0) +/* 465C4 8006B1C4 03E00008 */ jr $ra +/* 465C8 8006B1C8 AC990000 */ sw $t9, ($a0) +/* 465CC 8006B1CC 03E00008 */ jr $ra +/* 465D0 8006B1D0 00000000 */ nop + +glabel osDispatchThread +/* 465D4 8006B1D4 3C048009 */ lui $a0, 0x8009 +/* 465D8 8006B1D8 0C01AC6F */ jal osPopThread +/* 465DC 8006B1DC 24844658 */ addiu $a0, $a0, 0x4658 +/* 465E0 8006B1E0 3C018009 */ lui $at, 0x8009 +/* 465E4 8006B1E4 AC224660 */ sw $v0, 0x4660($at) +/* 465E8 8006B1E8 24080004 */ addiu $t0, $zero, 4 +/* 465EC 8006B1EC A4480010 */ sh $t0, 0x10($v0) +/* 465F0 8006B1F0 0040D021 */ addu $k0, $v0, $zero +/* 465F4 8006B1F4 8F5B0118 */ lw $k1, 0x118($k0) +/* 465F8 8006B1F8 3C088009 */ lui $t0, 0x8009 +/* 465FC 8006B1FC 25085900 */ addiu $t0, $t0, 0x5900 +/* 46600 8006B200 8D080000 */ lw $t0, ($t0) +/* 46604 8006B204 3108FF00 */ andi $t0, $t0, 0xff00 +/* 46608 8006B208 3369FF00 */ andi $t1, $k1, 0xff00 +/* 4660C 8006B20C 01284824 */ and $t1, $t1, $t0 +/* 46610 8006B210 3C01FFFF */ lui $at, 0xffff +/* 46614 8006B214 342100FF */ ori $at, $at, 0xff +/* 46618 8006B218 0361D824 */ and $k1, $k1, $at +/* 4661C 8006B21C 0369D825 */ or $k1, $k1, $t1 +/* 46620 8006B220 409B6000 */ mtc0 $k1, $12 +/* 46624 8006B224 DF410020 */ ld $at, 0x20($k0) +/* 46628 8006B228 DF420028 */ ld $v0, 0x28($k0) +/* 4662C 8006B22C DF430030 */ ld $v1, 0x30($k0) +/* 46630 8006B230 DF440038 */ ld $a0, 0x38($k0) +/* 46634 8006B234 DF450040 */ ld $a1, 0x40($k0) +/* 46638 8006B238 DF460048 */ ld $a2, 0x48($k0) +/* 4663C 8006B23C DF470050 */ ld $a3, 0x50($k0) +/* 46640 8006B240 DF480058 */ ld $t0, 0x58($k0) +/* 46644 8006B244 DF490060 */ ld $t1, 0x60($k0) +/* 46648 8006B248 DF4A0068 */ ld $t2, 0x68($k0) +/* 4664C 8006B24C DF4B0070 */ ld $t3, 0x70($k0) +/* 46650 8006B250 DF4C0078 */ ld $t4, 0x78($k0) +/* 46654 8006B254 DF4D0080 */ ld $t5, 0x80($k0) +/* 46658 8006B258 DF4E0088 */ ld $t6, 0x88($k0) +/* 4665C 8006B25C DF4F0090 */ ld $t7, 0x90($k0) +/* 46660 8006B260 DF500098 */ ld $s0, 0x98($k0) +/* 46664 8006B264 DF5100A0 */ ld $s1, 0xa0($k0) +/* 46668 8006B268 DF5200A8 */ ld $s2, 0xa8($k0) +/* 4666C 8006B26C DF5300B0 */ ld $s3, 0xb0($k0) +/* 46670 8006B270 DF5400B8 */ ld $s4, 0xb8($k0) +/* 46674 8006B274 DF5500C0 */ ld $s5, 0xc0($k0) +/* 46678 8006B278 DF5600C8 */ ld $s6, 0xc8($k0) +/* 4667C 8006B27C DF5700D0 */ ld $s7, 0xd0($k0) +/* 46680 8006B280 DF5800D8 */ ld $t8, 0xd8($k0) +/* 46684 8006B284 DF5900E0 */ ld $t9, 0xe0($k0) +/* 46688 8006B288 DF5C00E8 */ ld $gp, 0xe8($k0) +/* 4668C 8006B28C DF5D00F0 */ ld $sp, 0xf0($k0) +/* 46690 8006B290 DF5E00F8 */ ld $fp, 0xf8($k0) +/* 46694 8006B294 DF5F0100 */ ld $ra, 0x100($k0) +/* 46698 8006B298 DF5B0108 */ ld $k1, 0x108($k0) +/* 4669C 8006B29C 03600013 */ mtlo $k1 +/* 466A0 8006B2A0 DF5B0110 */ ld $k1, 0x110($k0) +/* 466A4 8006B2A4 03600011 */ mthi $k1 +/* 466A8 8006B2A8 8F5B011C */ lw $k1, 0x11c($k0) +/* 466AC 8006B2AC 409B7000 */ mtc0 $k1, $14 +/* 466B0 8006B2B0 8F5B0018 */ lw $k1, 0x18($k0) +/* 466B4 8006B2B4 13600013 */ beqz $k1, .L8006B304 +/* 466B8 8006B2B8 00000000 */ nop +/* 466BC 8006B2BC 8F5B012C */ lw $k1, 0x12c($k0) +/* 466C0 8006B2C0 44DBF800 */ ctc1 $k1, $31 +/* 466C4 8006B2C4 D7400130 */ ldc1 $f0, 0x130($k0) +/* 466C8 8006B2C8 D7420138 */ ldc1 $f2, 0x138($k0) +/* 466CC 8006B2CC D7440140 */ ldc1 $f4, 0x140($k0) +/* 466D0 8006B2D0 D7460148 */ ldc1 $f6, 0x148($k0) +/* 466D4 8006B2D4 D7480150 */ ldc1 $f8, 0x150($k0) +/* 466D8 8006B2D8 D74A0158 */ ldc1 $f10, 0x158($k0) +/* 466DC 8006B2DC D74C0160 */ ldc1 $f12, 0x160($k0) +/* 466E0 8006B2E0 D74E0168 */ ldc1 $f14, 0x168($k0) +/* 466E4 8006B2E4 D7500170 */ ldc1 $f16, 0x170($k0) +/* 466E8 8006B2E8 D7520178 */ ldc1 $f18, 0x178($k0) +/* 466EC 8006B2EC D7540180 */ ldc1 $f20, 0x180($k0) +/* 466F0 8006B2F0 D7560188 */ ldc1 $f22, 0x188($k0) +/* 466F4 8006B2F4 D7580190 */ ldc1 $f24, 0x190($k0) +/* 466F8 8006B2F8 D75A0198 */ ldc1 $f26, 0x198($k0) +/* 466FC 8006B2FC D75C01A0 */ ldc1 $f28, 0x1a0($k0) +/* 46700 8006B300 D75E01A8 */ ldc1 $f30, 0x1a8($k0) +.L8006B304: +/* 46704 8006B304 8F5B0128 */ lw $k1, 0x128($k0) +/* 46708 8006B308 3C1A8009 */ lui $k0, 0x8009 +/* 4670C 8006B30C 275A5900 */ addiu $k0, $k0, 0x5900 +/* 46710 8006B310 8F5A0000 */ lw $k0, ($k0) +/* 46714 8006B314 001AD402 */ srl $k0, $k0, 0x10 +/* 46718 8006B318 037AD824 */ and $k1, $k1, $k0 +/* 4671C 8006B31C 001BD840 */ sll $k1, $k1, 1 +/* 46720 8006B320 3C1A800A */ lui $k0, 0x800a +/* 46724 8006B324 275A9AA0 */ addiu $k0, $k0, -0x6560 +/* 46728 8006B328 037AD821 */ addu $k1, $k1, $k0 +/* 4672C 8006B32C 977B0000 */ lhu $k1, ($k1) +/* 46730 8006B330 3C1AA430 */ lui $k0, 0xa430 +/* 46734 8006B334 375A000C */ ori $k0, $k0, 0xc +/* 46738 8006B338 AF5B0000 */ sw $k1, ($k0) +/* 4673C 8006B33C 00000000 */ nop +/* 46740 8006B340 00000000 */ nop +/* 46744 8006B344 00000000 */ nop +/* 46748 8006B348 00000000 */ nop +/* 4674C 8006B34C 42000018 */ eret +/* 46750 8006B350 00002021 */ addu $a0, $zero, $zero +/* 46754 8006B354 0C01B254 */ jal osDestroyThread +/* 46758 8006B358 00000000 */ nop +/* 4675C 8006B35C 00000000 */ nop diff --git a/src/code_1370_len_7d0.c b/src/code_1370_len_7d0.c index 42f1924ee7..9b0c84a15d 100644 --- a/src/code_1370_len_7d0.c +++ b/src/code_1370_len_7d0.c @@ -2,6 +2,8 @@ INCLUDE_ASM(s32, "code_1370_len_7d0", boot_main); +INCLUDE_ASM(s32, "code_1370_len_7d0", gfxRetrace_Callback); + INCLUDE_ASM(s32, "code_1370_len_7d0", func_80026164); INCLUDE_ASM(s32, "code_1370_len_7d0", gfxPreNMI_Callback); diff --git a/src/os/code_45df0_len_970.c b/src/os/code_45df0_len_970.c deleted file mode 100644 index f0a4ec3410..0000000000 --- a/src/os/code_45df0_len_970.c +++ /dev/null @@ -1,75 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_45df0_len_970", func_8006A9F0); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", osExceptionPreamble); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", savecontext); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", savercp); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", endrcp); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", handle_interrupt); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", next_interrupt); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", IP6_Hdlr); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", IP7_Hdlr); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", counter); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", cart); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", rcp); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", sp_other_break); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", vi); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", ai); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", si); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", pi); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", dp); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", NoMoreRcpInts); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", prenmi); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", firstnmi); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", sw2); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", sw1); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", handle_break); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", redispatch); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", enqueueRunning); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", panic); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", send_mesg); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", send_done); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", handle_CPU); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", osEnqueueAndYield); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", noEnqueue); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", osEnqueueThread); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", osPopThread); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", osNop); - -INCLUDE_ASM(s32, "os/code_45df0_len_970", osDispatchThread); - -INCLUDE_ASM(void, "os/code_45df0_len_970", osCleanupThread); diff --git a/src/os/nusys/nuContRmbMgr.c b/src/os/nusys/nuContRmbMgr.c index 76fc26520e..f3670cf31f 100644 --- a/src/os/nusys/nuContRmbMgr.c +++ b/src/os/nusys/nuContRmbMgr.c @@ -108,7 +108,7 @@ void nuContRmbMgrInit(void) { nuSiCallBackAdd(&nuContRmbCallBack); } #else -INCLUDE_ASM(void, "os/nuContRmbMgr", nuContRmbMgrInit); +INCLUDE_ASM(void, "os/nusys/nuContRmbMgr", nuContRmbMgrInit); #endif void nuContRmbMgrRemove(void) { diff --git a/src/os/nusys/nuGfxSetCfb.c b/src/os/nusys/nuGfxSetCfb.c index 7822178a42..74e84166f5 100644 --- a/src/os/nusys/nuGfxSetCfb.c +++ b/src/os/nusys/nuGfxSetCfb.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(void, "os/nuGfxSetCfb", nuGfxSetCfb); +INCLUDE_ASM(void, "os/nusys/nuGfxSetCfb", nuGfxSetCfb); diff --git a/src/os/nusys/nuSched.c b/src/os/nusys/nuSched.c index f19d3e4056..5abdc85cea 100644 --- a/src/os/nusys/nuSched.c +++ b/src/os/nusys/nuSched.c @@ -59,9 +59,9 @@ void nuScCreateScheduler(u8 videoMode, u8 numFields) { osStartThread(&nusched.graphicsThread); } -INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteAudio); +INCLUDE_ASM(void, "os/nusys/nuSched", nuScExecuteAudio); -INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScExecuteGraphics); +INCLUDE_ASM(void, "os/nusys/nuSched", nuScExecuteGraphics); void nuScAddClient(NUScClient* c, OSMesgQueue* mq, NUScMsg msgType) { s32 mask; @@ -116,7 +116,7 @@ OSMesgQueue* nuScGetGfxMQ(void) { return &nusched.graphicsRequestMQ; } #else -INCLUDE_ASM(OSMesgQueue*, "os/code_39db0_len_8a0", nuScGetGfxMQ, void); +INCLUDE_ASM(OSMesgQueue*, "os/nusys/nuSched", nuScGetGfxMQ, void); #endif #ifdef NON_MATCHING @@ -125,7 +125,7 @@ OSMesgQueue* nuScGetAudioMQ(void) { return &nusched.audioRequestMQ; } #else -INCLUDE_ASM(OSMesgQueue*, "os/code_39db0_len_8a0", nuScGetAudioMQ, void); +INCLUDE_ASM(OSMesgQueue*, "os/nusys/nuSched", nuScGetAudioMQ, void); #endif #ifdef NON_MATCHING @@ -134,7 +134,7 @@ void nuScSetFrameBufferNum(u8 frameBufferNum) { nusched.frameBufferNum = frameBufferNum; } #else -INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScSetFrameBufferNum, u8 frameBufferNum); +INCLUDE_ASM(void, "os/nusys/nuSched", nuScSetFrameBufferNum, u8 frameBufferNum); #endif #ifdef NON_MATCHING @@ -143,10 +143,10 @@ s32 nuScGetFrameRate(void) { return nusched.frameRate; } #else -INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetFrameRate, void); +INCLUDE_ASM(s32, "os/nusys/nuSched", nuScGetFrameRate, void); #endif -INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScEventHandler); +INCLUDE_ASM(void, "os/nusys/nuSched", nuScEventHandler); static void nuScEventBroadcast(NUScMsg* msg) { NUScClient* clientList = nusched.clientList; @@ -159,4 +159,4 @@ static void nuScEventBroadcast(NUScMsg* msg) { } } -INCLUDE_ASM(void, "os/code_39db0_len_8a0", nuScWaitTaskReady); +INCLUDE_ASM(void, "os/nusys/nuSched", nuScWaitTaskReady); diff --git a/tools/splat.yaml b/tools/splat.yaml index 3227266968..397a6cbea1 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -6,7 +6,7 @@ options: compiler: "GCC" segments: - name: header - type: code + type: header start: 0x00 vram: 0 files: @@ -165,7 +165,7 @@ segments: - [0x457c0, "c", "os/code_457c0_len_270"] - [0x45a30, "c", "os/code_45a30_len_20"] - [0x45a50, "c", "os/code_45a50_len_3a0"] - - [0x45df0, "c", "os/code_45df0_len_970"] + - [0x45df0, "hasm", "os/code_45df0_len_970"] - [0x46760, "c", "os/code_46760_len_90"] - [0x467f0, "c", "os/code_467f0_len_90"] - [0x46880, "c", "os/code_46880_len_260"] diff --git a/tools/func_addrs.txt b/tools/symbol_addrs.txt similarity index 98% rename from tools/func_addrs.txt rename to tools/symbol_addrs.txt index b15786733a..9bda7ecc1d 100644 --- a/tools/func_addrs.txt +++ b/tools/symbol_addrs.txt @@ -264,8 +264,6 @@ HasMerleeCasts;0x8003F3F4 HasMerleeCastsLeft;0x802619C8 HealActor;0x80270CA4 HidePlayerShadow;0x802D0DA0 -!IP6_Hdlr;0x8006AC44 -!IP7_Hdlr;0x8006AC50 IdleFlyToGoal;0x8027BBB8 IdleJumpToGoal;0x8027910C IdleRunToGoal;0x8027A264 @@ -316,7 +314,6 @@ MultiplyVec2ByActorScale;0x80254048 MultiplyVec3ByActorScale;0x802540DC NOP_npc_callback;0x80038470 NOP_state;0x80112B90 -!NoMoreRcpInts;0x8006AE30 NpcFaceNpc;0x802CEE80 NpcFacePlayer;0x802CECC8 NpcFlyTo;0x802CE6FC @@ -675,7 +672,6 @@ cam_target_actor;0x8024E43C can_pause;0x800E69DC can_switch_to_player;0x802A5818 cancel_message;0x80125B08 -!cart;0x8006AC80 check_block_input;0x80268ECC check_input_hammer;0x800E60E0 check_input_jump;0x800E6160 @@ -731,8 +727,10 @@ contReadData;0x80060738 contReadNW;0x800607B4 contRetrace;0x8006065C contRmbCheckMesg;0x8005FD10 -contRmbControl;0x8005FB10 +contRmbForceStopEndMesg;0x8005FE54 +contRmbForceStopMesg;0x8005FE0C contRmbStartMesg;0x8005FD58 +contRmbStopMesg;0x8005FDE4 copy_matrix;0x80029720 corrupted;0x8006D1D8 corrupted_init;0x8006D080 @@ -742,7 +740,6 @@ cosine;0x800293D4 coss;0x80061F00 count_power_plus;0x80263B10 count_targets;0x80269660 -!counter;0x8006AC5C crash_create_monitor;0x8002C8B0 crash_delay_msec;0x8002BF40 crash_monitor_thread;0x8002C81C @@ -844,10 +841,8 @@ enable_player_shadow;0x800E00B0 enable_player_static_collisions;0x800E0140 enable_world_fog;0x8011BB50 end_battle;0x80244A50 -!endrcp;0x8006AB6C enemy_create_target_list;0x80263048 enforce_hpfp_limits;0x800E786C -!enqueueRunning;0x8006AF34 entity_get_collision_flags;0x801108B8 entity_init_BlueSwitch;0x802E2380 entity_init_Chest;0x802E7D84 @@ -874,7 +869,6 @@ fio_serialize_state;0x8002B630 fio_validate_file_checksum;0x8002B0F8 fio_validate_header_checksums;0x8002AF70 fio_write_flash;0x8002B948 -!firstnmi;0x8006AE6C fixed_var_to_float;0x802C4920 float_to_fixed_var;0x802C496C free_icon;0x801448F4 @@ -958,7 +952,7 @@ get_variable_index_alt;0x802C7F20 get_world_fog_color;0x8011BBD8 get_world_fog_distance;0x8011BBB4 gfxPreNMI_Callback;0x8002670C -gfxRetrace_Callback;0x8002605C +!gfxRetrace_Callback;0x8002605C gfx_draw_frame;0x80026B08 goto_map;0x802CA304 gravity_use_fall_parms;0x800E306C @@ -994,9 +988,6 @@ guScale;0x80067700 guScaleF;0x800677C0 guTranslate;0x80067820 guTranslateF;0x80067900 -!handle_CPU;0x8006B038 -!handle_break;0x8006AEE8 -!handle_interrupt;0x8006AC08 has_full_fp;0x800EA37C has_full_hp;0x800EA360 heap_free;0x8002AD2C @@ -1102,8 +1093,6 @@ move_player;0x800E2778 mtx_ident_mirror_y;0x80038478 mtx_mirror_y;0x80254288 next_demo_scene;0x800380F4 -!next_interrupt;0x8006AC0C -!noEnqueue;0x8006B16C npc_do_other_npc_collision;0x8003900C npc_do_player_collision;0x800392D8 npc_do_world_collision;0x80038AFC @@ -1153,7 +1142,7 @@ nuScCreateScheduler;0x8005E9B0 !nuScEventBroadcast;0x8005F0C0 nuScEventHandler;0x8005EFA8 nuScExecuteAudio;0x8005EBE0 -nuScExecuteGraphics;0x8005ED14 +!nuScExecuteGraphics;0x8005ED14 nuScGetAudioMQ;0x8005EF84 nuScGetFrameRate;0x8005EF9C nuScGetGfxMQ;0x8005EF78 @@ -1179,7 +1168,6 @@ osAiSetNextBuffer;0x80061680 osCartRomInit;0x80060F10 osCheckId;0x80069DD4 osCheckPackId;0x80069AA4 -!osCleanupThread;0x8006B350 osContAddressCrc;0x8006C860 osContDataCrc;0x8006C8CC osContGetInitData;0x80061D1C @@ -1198,7 +1186,6 @@ osDequeueThread;0x80066200 osDestroyThread;0x8006C950 osDevMgrMain;0x80061090 __osDisableInt;0x8006B360 -!osDispatchThread;0x8006B1D4 osDispatchThreadSave;0x8006B1F4 osEPiLinkHandle;0x80060EC0 osEPiRawReadIo;0x8006B570 @@ -1207,8 +1194,6 @@ osEPiRawWriteIo;0x8006B6E0 osEPiReadIo;0x80060DC0 osEPiStartDma;0x80060E20 osEPiWriteIo;0x80060D60 -!osEnqueueAndYield;0x8006B06C -!osEnqueueThread;0x8006B174 osExceptionPreamble;0x8006AA00 osFlashAllErase;0x8006F308 osFlashClearStatus;0x8006F29C @@ -1234,10 +1219,9 @@ osInvalICache;0x800617D0 osJamMesg;0x800655B0 osMapTLB;0x800667A0 osMapTLBRdb;0x8006CA30 -osMotorAccess;0x80067E00 +__osMotorAccess;0x80067E00 osMotorInit;0x80067F44 -osMotorStop;0x8005F920 -!osNop;0x8006B1CC +contRmbControl;0x8005F920 osPackReadData;0x80061AC4 osPackRequestData;0x80061DD0 osPfsAllocateFile;0x80068190 @@ -1266,7 +1250,6 @@ osPiGetAccess;0x800614A4 osPiGetCmdQueue;0x8006B550 osPiRawStartDma;0x8006B480 osPiRelAccess;0x80061510 -!osPopThread;0x8006B1BC osProbeTLB;0x80066860 osRecvMesg;0x800656F0 osRepairPackId;0x800697B8 @@ -1324,7 +1307,6 @@ osVirtualToPhysical;0x80061E90 osWritebackDCache;0x80061850 osWritebackDCacheAll;0x800618D0 osYieldThread;0x80066240 -!panic;0x8006AF4C parent_collider_to_model;0x8005B780 partner_can_use_ability;0x800EB42C partner_get_ride_script;0x800EB638 @@ -1439,7 +1421,6 @@ player_create_target_list;0x8026302C player_enter_blue_pipe;0x802E8CCC player_jump;0x802D14E0 poll_rumble;0x80028EE0 -!prenmi;0x8006AE3C proutSprintf;0x80065548 push_entity_matrix;0x802E8E4C queue_render_task;0x8011D910 @@ -1447,7 +1428,6 @@ rand_int;0x800299FC read_background_size;0x80145E28 recover_fp;0x800EA264 recover_hp;0x800EA2CC -!redispatch;0x8006AF00 remove_actor_decoration;0x80267234 remove_all_effects;0x8005A4E0 remove_consumable;0x800EA47C @@ -1488,9 +1468,6 @@ round;0x80029AC4 save_game_at_player_position;0x802E11A0 save_ground_pos;0x800E54E0 save_tattle_flags;0x80253D10 -!savercp;0x8006AB34 -!send_done;0x8006AFC4 -!send_mesg;0x8006AF7C set_action_state;0x800E5DA4 set_actor_current_position;0x80269C24 set_actor_home_position;0x80269D20 @@ -1673,7 +1650,6 @@ sin_rad;0x8002A16C sins;0x800645F0 sort_items;0x800E76CC sort_scripts;0x802C3000 -!sp_other_break;0x8006AD2C spawn_drops;0x80048280 spr_appendMDL_component;0x802DC8F4 spr_draw_component;0x802DCEDC @@ -1725,8 +1701,6 @@ suspend_all_script;0x802C4420 suspend_group_others;0x802C46A8 suspend_group_script;0x802C42D8 suspend_group_script_index;0x802C44F8 -!sw1;0x8006AEC4 -!sw2;0x8006AEA0 switch_order;0x80243918 switch_to_partner;0x80242F00 switch_to_player;0x80242AC8 @@ -1895,10 +1869,10 @@ func_802B71E8;0x802B71E8 func_802BD7DC;0x802BD7DC func_802BE070;0x802BE070 !func_8006AA34;0x8006AA34 -!vi;0x8006AD3C -!ai;0x8006AD64 -!si;0x8006AD90 -!pi;0x8006ADB8 -!dp;0x8006AE0C -!rcp;0x8006ACC8 -!savecontext;0x8006AA34 +SetTattleString;0x80045A58 +!osEnqueueAndYield;0x8006B06C +!osPopThread;0x8006B1BC +!osDispatchThread;0x8006B1D4 +!osEnqueueThread;0x8006B174 +!send_mesg;0x8006AF7C +!handle_CPU;0x8006B038 diff --git a/undefined_funcs.txt b/undefined_funcs.txt new file mode 100644 index 0000000000..5507ebeee6 --- /dev/null +++ b/undefined_funcs.txt @@ -0,0 +1,3 @@ +func_8006AF7C = 0x8006AF7C; +func_8006B174 = 0x8006B174; +func_8006B1BC = 0x8006B1BC; From 4deae1a8e05058c3ca46601ca45376911687ec49 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 22:59:30 -0400 Subject: [PATCH 02/10] remove contRmbControl --- .../os/nusys/nuContPakMgr/contRmbControl.s | 141 ------------------ 1 file changed, 141 deletions(-) delete mode 100644 asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s diff --git a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s b/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s deleted file mode 100644 index c1209db8fe..0000000000 --- a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s +++ /dev/null @@ -1,141 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contRmbControl -/* 3AD20 8005F920 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3AD24 8005F924 AFB20018 */ sw $s2, 0x18($sp) -/* 3AD28 8005F928 0080902D */ daddu $s2, $a0, $zero -/* 3AD2C 8005F92C 00A0302D */ daddu $a2, $a1, $zero -/* 3AD30 8005F930 AFB00010 */ sw $s0, 0x10($sp) -/* 3AD34 8005F934 AFBF0020 */ sw $ra, 0x20($sp) -/* 3AD38 8005F938 AFB3001C */ sw $s3, 0x1c($sp) -/* 3AD3C 8005F93C AFB10014 */ sw $s1, 0x14($sp) -/* 3AD40 8005F940 92430006 */ lbu $v1, 6($s2) -/* 3AD44 8005F944 24130002 */ addiu $s3, $zero, 2 -/* 3AD48 8005F948 10730069 */ beq $v1, $s3, .L8005FAF0 -/* 3AD4C 8005F94C 0000802D */ daddu $s0, $zero, $zero -/* 3AD50 8005F950 28620003 */ slti $v0, $v1, 3 -/* 3AD54 8005F954 10400005 */ beqz $v0, .L8005F96C -/* 3AD58 8005F958 24020001 */ addiu $v0, $zero, 1 -/* 3AD5C 8005F95C 1062000A */ beq $v1, $v0, .L8005F988 -/* 3AD60 8005F960 0200102D */ daddu $v0, $s0, $zero -/* 3AD64 8005F964 08017EBD */ j .L8005FAF4 -/* 3AD68 8005F968 00000000 */ nop -.L8005F96C: -/* 3AD6C 8005F96C 24020003 */ addiu $v0, $zero, 3 -/* 3AD70 8005F970 10620018 */ beq $v1, $v0, .L8005F9D4 -/* 3AD74 8005F974 24020004 */ addiu $v0, $zero, 4 -/* 3AD78 8005F978 10620048 */ beq $v1, $v0, .L8005FA9C -/* 3AD7C 8005F97C 0200102D */ daddu $v0, $s0, $zero -/* 3AD80 8005F980 08017EBD */ j .L8005FAF4 -/* 3AD84 8005F984 00000000 */ nop -.L8005F988: -/* 3AD88 8005F988 96420004 */ lhu $v0, 4($s2) -/* 3AD8C 8005F98C 1040000C */ beqz $v0, .L8005F9C0 -/* 3AD90 8005F990 00062040 */ sll $a0, $a2, 1 -/* 3AD94 8005F994 00862021 */ addu $a0, $a0, $a2 -/* 3AD98 8005F998 00042080 */ sll $a0, $a0, 2 -/* 3AD9C 8005F99C 00862021 */ addu $a0, $a0, $a2 -/* 3ADA0 8005F9A0 000420C0 */ sll $a0, $a0, 3 -/* 3ADA4 8005F9A4 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3ADA8 8005F9A8 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3ADAC 8005F9AC 00822021 */ addu $a0, $a0, $v0 -/* 3ADB0 8005F9B0 0C019F80 */ jal __osMotorAccess -/* 3ADB4 8005F9B4 0000282D */ daddu $a1, $zero, $zero -/* 3ADB8 8005F9B8 08017E71 */ j .L8005F9C4 -/* 3ADBC 8005F9BC 0040802D */ daddu $s0, $v0, $zero -.L8005F9C0: -/* 3ADC0 8005F9C0 A2530006 */ sb $s3, 6($s2) -.L8005F9C4: -/* 3ADC4 8005F9C4 96420004 */ lhu $v0, 4($s2) -/* 3ADC8 8005F9C8 2442FFFF */ addiu $v0, $v0, -1 -/* 3ADCC 8005F9CC 08017EBC */ j .L8005FAF0 -/* 3ADD0 8005F9D0 A6420004 */ sh $v0, 4($s2) -.L8005F9D4: -/* 3ADD4 8005F9D4 96420002 */ lhu $v0, 2($s2) -/* 3ADD8 8005F9D8 1040001F */ beqz $v0, .L8005FA58 -/* 3ADDC 8005F9DC 00062040 */ sll $a0, $a2, 1 -/* 3ADE0 8005F9E0 96420004 */ lhu $v0, 4($s2) -/* 3ADE4 8005F9E4 96430000 */ lhu $v1, ($s2) -/* 3ADE8 8005F9E8 00431021 */ addu $v0, $v0, $v1 -/* 3ADEC 8005F9EC 304300FF */ andi $v1, $v0, 0xff -/* 3ADF0 8005F9F0 3042FFFF */ andi $v0, $v0, 0xffff -/* 3ADF4 8005F9F4 00021202 */ srl $v0, $v0, 8 -/* 3ADF8 8005F9F8 1040000B */ beqz $v0, .L8005FA28 -/* 3ADFC 8005F9FC A6430004 */ sh $v1, 4($s2) -/* 3AE00 8005FA00 00062040 */ sll $a0, $a2, 1 -/* 3AE04 8005FA04 00862021 */ addu $a0, $a0, $a2 -/* 3AE08 8005FA08 00042080 */ sll $a0, $a0, 2 -/* 3AE0C 8005FA0C 00862021 */ addu $a0, $a0, $a2 -/* 3AE10 8005FA10 000420C0 */ sll $a0, $a0, 3 -/* 3AE14 8005FA14 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE18 8005FA18 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE1C 8005FA1C 00822021 */ addu $a0, $a0, $v0 -/* 3AE20 8005FA20 08017E92 */ j .L8005FA48 -/* 3AE24 8005FA24 24050001 */ addiu $a1, $zero, 1 -.L8005FA28: -/* 3AE28 8005FA28 00862021 */ addu $a0, $a0, $a2 -/* 3AE2C 8005FA2C 00042080 */ sll $a0, $a0, 2 -/* 3AE30 8005FA30 00862021 */ addu $a0, $a0, $a2 -/* 3AE34 8005FA34 000420C0 */ sll $a0, $a0, 3 -/* 3AE38 8005FA38 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE3C 8005FA3C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE40 8005FA40 00822021 */ addu $a0, $a0, $v0 -/* 3AE44 8005FA44 0000282D */ daddu $a1, $zero, $zero -.L8005FA48: -/* 3AE48 8005FA48 0C019F80 */ jal __osMotorAccess -/* 3AE4C 8005FA4C 00000000 */ nop -/* 3AE50 8005FA50 08017EA3 */ j .L8005FA8C -/* 3AE54 8005FA54 0040802D */ daddu $s0, $v0, $zero -.L8005FA58: -/* 3AE58 8005FA58 00862021 */ addu $a0, $a0, $a2 -/* 3AE5C 8005FA5C 00042080 */ sll $a0, $a0, 2 -/* 3AE60 8005FA60 00862021 */ addu $a0, $a0, $a2 -/* 3AE64 8005FA64 000420C0 */ sll $a0, $a0, 3 -/* 3AE68 8005FA68 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE6C 8005FA6C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE70 8005FA70 00822021 */ addu $a0, $a0, $v0 -/* 3AE74 8005FA74 0C019F80 */ jal __osMotorAccess -/* 3AE78 8005FA78 0000282D */ daddu $a1, $zero, $zero -/* 3AE7C 8005FA7C 0040802D */ daddu $s0, $v0, $zero -/* 3AE80 8005FA80 24020001 */ addiu $v0, $zero, 1 -/* 3AE84 8005FA84 A2420006 */ sb $v0, 6($s2) -/* 3AE88 8005FA88 A6530004 */ sh $s3, 4($s2) -.L8005FA8C: -/* 3AE8C 8005FA8C 96420002 */ lhu $v0, 2($s2) -/* 3AE90 8005FA90 2442FFFF */ addiu $v0, $v0, -1 -/* 3AE94 8005FA94 08017EBC */ j .L8005FAF0 -/* 3AE98 8005FA98 A6420002 */ sh $v0, 2($s2) -.L8005FA9C: -/* 3AE9C 8005FA9C 3C04800E */ lui $a0, %hi(nuSiMesgQ) -/* 3AEA0 8005FAA0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) -/* 3AEA4 8005FAA4 00061040 */ sll $v0, $a2, 1 -/* 3AEA8 8005FAA8 00461021 */ addu $v0, $v0, $a2 -/* 3AEAC 8005FAAC 00021080 */ sll $v0, $v0, 2 -/* 3AEB0 8005FAB0 00461021 */ addu $v0, $v0, $a2 -/* 3AEB4 8005FAB4 000210C0 */ sll $v0, $v0, 3 -/* 3AEB8 8005FAB8 3C03800E */ lui $v1, %hi(nuContPfs) -/* 3AEBC 8005FABC 2463AAD8 */ addiu $v1, $v1, %lo(nuContPfs) -/* 3AEC0 8005FAC0 00438821 */ addu $s1, $v0, $v1 -/* 3AEC4 8005FAC4 0C019FD1 */ jal osMotorInit -/* 3AEC8 8005FAC8 0220282D */ daddu $a1, $s1, $zero -/* 3AECC 8005FACC 0040802D */ daddu $s0, $v0, $zero -/* 3AED0 8005FAD0 16000005 */ bnez $s0, .L8005FAE8 -/* 3AED4 8005FAD4 24020001 */ addiu $v0, $zero, 1 -/* 3AED8 8005FAD8 0220202D */ daddu $a0, $s1, $zero -/* 3AEDC 8005FADC 0C019F80 */ jal __osMotorAccess -/* 3AEE0 8005FAE0 0000282D */ daddu $a1, $zero, $zero -/* 3AEE4 8005FAE4 24020001 */ addiu $v0, $zero, 1 -.L8005FAE8: -/* 3AEE8 8005FAE8 A2420006 */ sb $v0, 6($s2) -/* 3AEEC 8005FAEC A6530004 */ sh $s3, 4($s2) -.L8005FAF0: -/* 3AEF0 8005FAF0 0200102D */ daddu $v0, $s0, $zero -.L8005FAF4: -/* 3AEF4 8005FAF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 3AEF8 8005FAF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 3AEFC 8005FAFC 8FB20018 */ lw $s2, 0x18($sp) -/* 3AF00 8005FB00 8FB10014 */ lw $s1, 0x14($sp) -/* 3AF04 8005FB04 8FB00010 */ lw $s0, 0x10($sp) -/* 3AF08 8005FB08 03E00008 */ jr $ra -/* 3AF0C 8005FB0C 27BD0028 */ addiu $sp, $sp, 0x28 From 12c8605fcf287de004abbf0d9f3bbf6df2e74106 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 23:20:51 -0400 Subject: [PATCH 03/10] Split files --- .../pause_items_cleanup.s | 0 .../pause_items_comparator.s | 0 .../pause_items_draw_contents.s | 0 .../pause_items_get_column.s | 0 .../pause_items_get_pos_x.s | 0 .../pause_items_get_pos_y.s | 0 .../pause_items_get_row.s | 0 .../pause_items_handle_input.s | 0 .../pause_items_init.s | 0 .../pause_items_is_visible.s | 0 .../pause_items_load_items.s | 0 .../pause_items_scroll_offset_y.s | 0 .../pause_items_update.s | 0 .../pause_partners_cleanup.s | 0 .../pause_partners_draw_contents.s | 0 .../pause_partners_draw_movelist.s | 0 .../pause_partners_draw_movelist_flower.s | 0 .../pause_partners_draw_movelist_title.s | 0 .../pause_partners_draw_title.s | 0 .../pause_partners_handle_input.s | 0 .../pause_partners_init.s | 0 .../pause_partners_load_portrait.s | 0 .../pause_partners_update.s | 0 .../pause_spirits_cleanup.s | 0 .../pause_spirits_draw_contents.s | 0 .../pause_spirits_draw_title.s | 0 .../pause_spirits_handle_input.s | 0 .../pause_spirits_init.s | 0 .../pause_spirits_update.s | 0 .../func_8024D930.s | 0 .../pause_map_cleanup.s | 0 .../pause_map_draw_border_arrows.s | 0 .../pause_map_draw_contents.s | 0 .../pause_map_draw_title.s | 0 .../pause_map_handle_input.s | 0 .../pause_map_init.s | 0 .../pause_map_update.s | 0 .../pause_draw_menu_label.s | 0 .../pause_get_menu_string.s | 0 .../code_163400/pause_set_cursor_opacity.s | 144 ++++++++++++++++++ .../func_80244C30.s | 0 .../func_80244CEC.s | 0 .../func_80244D60.s | 0 .../func_80244DD0.s | 0 .../func_80244E54.s | 0 .../func_80244F44.s | 0 .../func_80244FD4.s | 0 .../func_8024544C.s | 0 .../func_80245588.s | 0 .../func_802455D8.s | 0 .../func_80245628.s | 0 .../func_80245678.s | 0 .../func_802456C8.s | 0 .../func_80245718.s | 0 .../func_80245768.s | 0 .../func_802457B8.s | 0 .../func_80245808.s | 0 .../func_80245A40.s | 0 .../func_80246B2C.s | 0 .../func_80246CBC.s | 0 src/code_135EE0.c | 82 ---------- src/code_13CAF0.c | 51 +++++++ src/code_13FD40.c | 13 ++ src/code_140C70.c | 17 +++ src/code_1421C0.c | 5 + src/code_163400.c | 40 ----- src/code_165490.c | 41 +++++ tools/splat.yaml | 15 +- 68 files changed, 281 insertions(+), 127 deletions(-) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_comparator.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_column.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_pos_x.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_pos_y.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_get_row.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_is_visible.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_load_items.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_scroll_offset_y.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_items_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_movelist.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_movelist_flower.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_movelist_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_draw_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_load_portrait.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13CAF0}/pause_partners_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_draw_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_13FD40}/pause_spirits_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/func_8024D930.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_cleanup.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_draw_border_arrows.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_draw_contents.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_draw_title.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_handle_input.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_init.s (100%) rename asm/nonmatchings/{code_135EE0 => code_140C70}/pause_map_update.s (100%) rename asm/nonmatchings/{code_135EE0 => code_1421C0}/pause_draw_menu_label.s (100%) rename asm/nonmatchings/{code_135EE0 => code_1421C0}/pause_get_menu_string.s (100%) create mode 100644 asm/nonmatchings/code_163400/pause_set_cursor_opacity.s rename asm/nonmatchings/{code_163400 => code_165490}/func_80244C30.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244CEC.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244D60.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244DD0.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244E54.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244F44.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80244FD4.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_8024544C.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245588.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_802455D8.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245628.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245678.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_802456C8.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245718.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245768.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_802457B8.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245808.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80245A40.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80246B2C.s (100%) rename asm/nonmatchings/{code_163400 => code_165490}/func_80246CBC.s (100%) create mode 100644 src/code_13CAF0.c create mode 100644 src/code_13FD40.c create mode 100644 src/code_140C70.c create mode 100644 src/code_1421C0.c create mode 100644 src/code_165490.c diff --git a/asm/nonmatchings/code_135EE0/pause_items_cleanup.s b/asm/nonmatchings/code_13CAF0/pause_items_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_cleanup.s rename to asm/nonmatchings/code_13CAF0/pause_items_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_comparator.s b/asm/nonmatchings/code_13CAF0/pause_items_comparator.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_comparator.s rename to asm/nonmatchings/code_13CAF0/pause_items_comparator.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_draw_contents.s rename to asm/nonmatchings/code_13CAF0/pause_items_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_column.s b/asm/nonmatchings/code_13CAF0/pause_items_get_column.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_column.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_column.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_pos_x.s b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_pos_x.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_pos_x.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_pos_y.s b/asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_pos_y.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_pos_y.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_get_row.s b/asm/nonmatchings/code_13CAF0/pause_items_get_row.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_get_row.s rename to asm/nonmatchings/code_13CAF0/pause_items_get_row.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_items_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_handle_input.s rename to asm/nonmatchings/code_13CAF0/pause_items_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_init.s b/asm/nonmatchings/code_13CAF0/pause_items_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_init.s rename to asm/nonmatchings/code_13CAF0/pause_items_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_is_visible.s b/asm/nonmatchings/code_13CAF0/pause_items_is_visible.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_is_visible.s rename to asm/nonmatchings/code_13CAF0/pause_items_is_visible.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_load_items.s b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_load_items.s rename to asm/nonmatchings/code_13CAF0/pause_items_load_items.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_scroll_offset_y.s b/asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_scroll_offset_y.s rename to asm/nonmatchings/code_13CAF0/pause_items_scroll_offset_y.s diff --git a/asm/nonmatchings/code_135EE0/pause_items_update.s b/asm/nonmatchings/code_13CAF0/pause_items_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_items_update.s rename to asm/nonmatchings/code_13CAF0/pause_items_update.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_cleanup.s b/asm/nonmatchings/code_13CAF0/pause_partners_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_cleanup.s rename to asm/nonmatchings/code_13CAF0/pause_partners_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_contents.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_contents.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_movelist.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_movelist.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_flower.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_flower.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_flower.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_flower.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_title.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_movelist_title.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_movelist_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_draw_title.s b/asm/nonmatchings/code_13CAF0/pause_partners_draw_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_draw_title.s rename to asm/nonmatchings/code_13CAF0/pause_partners_draw_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_handle_input.s b/asm/nonmatchings/code_13CAF0/pause_partners_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_handle_input.s rename to asm/nonmatchings/code_13CAF0/pause_partners_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_init.s b/asm/nonmatchings/code_13CAF0/pause_partners_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_init.s rename to asm/nonmatchings/code_13CAF0/pause_partners_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_load_portrait.s b/asm/nonmatchings/code_13CAF0/pause_partners_load_portrait.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_load_portrait.s rename to asm/nonmatchings/code_13CAF0/pause_partners_load_portrait.s diff --git a/asm/nonmatchings/code_135EE0/pause_partners_update.s b/asm/nonmatchings/code_13CAF0/pause_partners_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_partners_update.s rename to asm/nonmatchings/code_13CAF0/pause_partners_update.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_cleanup.s b/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_cleanup.s rename to asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_draw_contents.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_draw_contents.s rename to asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_draw_title.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_draw_title.s rename to asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_handle_input.s b/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_handle_input.s rename to asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_init.s b/asm/nonmatchings/code_13FD40/pause_spirits_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_init.s rename to asm/nonmatchings/code_13FD40/pause_spirits_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_spirits_update.s b/asm/nonmatchings/code_13FD40/pause_spirits_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_spirits_update.s rename to asm/nonmatchings/code_13FD40/pause_spirits_update.s diff --git a/asm/nonmatchings/code_135EE0/func_8024D930.s b/asm/nonmatchings/code_140C70/func_8024D930.s similarity index 100% rename from asm/nonmatchings/code_135EE0/func_8024D930.s rename to asm/nonmatchings/code_140C70/func_8024D930.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_cleanup.s b/asm/nonmatchings/code_140C70/pause_map_cleanup.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_cleanup.s rename to asm/nonmatchings/code_140C70/pause_map_cleanup.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_draw_border_arrows.s b/asm/nonmatchings/code_140C70/pause_map_draw_border_arrows.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_draw_border_arrows.s rename to asm/nonmatchings/code_140C70/pause_map_draw_border_arrows.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_draw_contents.s b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_draw_contents.s rename to asm/nonmatchings/code_140C70/pause_map_draw_contents.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_draw_title.s b/asm/nonmatchings/code_140C70/pause_map_draw_title.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_draw_title.s rename to asm/nonmatchings/code_140C70/pause_map_draw_title.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_handle_input.s b/asm/nonmatchings/code_140C70/pause_map_handle_input.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_handle_input.s rename to asm/nonmatchings/code_140C70/pause_map_handle_input.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_init.s b/asm/nonmatchings/code_140C70/pause_map_init.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_init.s rename to asm/nonmatchings/code_140C70/pause_map_init.s diff --git a/asm/nonmatchings/code_135EE0/pause_map_update.s b/asm/nonmatchings/code_140C70/pause_map_update.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_map_update.s rename to asm/nonmatchings/code_140C70/pause_map_update.s diff --git a/asm/nonmatchings/code_135EE0/pause_draw_menu_label.s b/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_draw_menu_label.s rename to asm/nonmatchings/code_1421C0/pause_draw_menu_label.s diff --git a/asm/nonmatchings/code_135EE0/pause_get_menu_string.s b/asm/nonmatchings/code_1421C0/pause_get_menu_string.s similarity index 100% rename from asm/nonmatchings/code_135EE0/pause_get_menu_string.s rename to asm/nonmatchings/code_1421C0/pause_get_menu_string.s diff --git a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s new file mode 100644 index 0000000000..055d931cbd --- /dev/null +++ b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel pause_set_cursor_opacity +/* 163400 80242BA0 2882F581 */ slti $v0, $a0, -0xa7f +/* 163404 80242BA4 8FA90014 */ lw $t1, 0x14($sp) +/* 163408 80242BA8 8FAA0018 */ lw $t2, 0x18($sp) +/* 16340C 80242BAC 8FAB001C */ lw $t3, 0x1c($sp) +/* 163410 80242BB0 8FAC0020 */ lw $t4, 0x20($sp) +/* 163414 80242BB4 14400075 */ bnez $v0, .L80242D8C +/* 163418 80242BB8 28A2F581 */ slti $v0, $a1, -0xa7f +/* 16341C 80242BBC 14400073 */ bnez $v0, .L80242D8C +/* 163420 80242BC0 00000000 */ nop +/* 163424 80242BC4 18C00071 */ blez $a2, .L80242D8C +/* 163428 80242BC8 00000000 */ nop +/* 16342C 80242BCC 18E0006F */ blez $a3, .L80242D8C +/* 163430 80242BD0 28820500 */ slti $v0, $a0, 0x500 +/* 163434 80242BD4 1040006D */ beqz $v0, .L80242D8C +/* 163438 80242BD8 28A203C0 */ slti $v0, $a1, 0x3c0 +/* 16343C 80242BDC 1040006B */ beqz $v0, .L80242D8C +/* 163440 80242BE0 28C20A80 */ slti $v0, $a2, 0xa80 +/* 163444 80242BE4 10400069 */ beqz $v0, .L80242D8C +/* 163448 80242BE8 28E20A80 */ slti $v0, $a3, 0xa80 +/* 16344C 80242BEC 10400067 */ beqz $v0, .L80242D8C +/* 163450 80242BF0 00000000 */ nop +/* 163454 80242BF4 3C02800A */ lui $v0, 0x800a +/* 163458 80242BF8 2442A66C */ addiu $v0, $v0, -0x5994 +/* 16345C 80242BFC 8C480000 */ lw $t0, ($v0) +/* 163460 80242C00 25030008 */ addiu $v1, $t0, 8 +/* 163464 80242C04 AC430000 */ sw $v1, ($v0) +/* 163468 80242C08 00061400 */ sll $v0, $a2, 0x10 +/* 16346C 80242C0C 00021403 */ sra $v0, $v0, 0x10 +/* 163470 80242C10 18400005 */ blez $v0, .L80242C28 +/* 163474 80242C14 30420FFF */ andi $v0, $v0, 0xfff +/* 163478 80242C18 00021300 */ sll $v0, $v0, 0xc +/* 16347C 80242C1C 3C03E400 */ lui $v1, 0xe400 +/* 163480 80242C20 08090B0B */ j .L80242C2C +/* 163484 80242C24 00431825 */ or $v1, $v0, $v1 +.L80242C28: +/* 163488 80242C28 3C03E400 */ lui $v1, 0xe400 +.L80242C2C: +/* 16348C 80242C2C 00071400 */ sll $v0, $a3, 0x10 +/* 163490 80242C30 00021403 */ sra $v0, $v0, 0x10 +/* 163494 80242C34 18400004 */ blez $v0, .L80242C48 +/* 163498 80242C38 AD030000 */ sw $v1, ($t0) +/* 16349C 80242C3C 30420FFF */ andi $v0, $v0, 0xfff +/* 1634A0 80242C40 00621025 */ or $v0, $v1, $v0 +/* 1634A4 80242C44 AD020000 */ sw $v0, ($t0) +.L80242C48: +/* 1634A8 80242C48 8FA20010 */ lw $v0, 0x10($sp) +/* 1634AC 80242C4C 30420007 */ andi $v0, $v0, 7 +/* 1634B0 80242C50 00021E00 */ sll $v1, $v0, 0x18 +/* 1634B4 80242C54 00041400 */ sll $v0, $a0, 0x10 +/* 1634B8 80242C58 00023403 */ sra $a2, $v0, 0x10 +/* 1634BC 80242C5C 18C00003 */ blez $a2, .L80242C6C +/* 1634C0 80242C60 30C20FFF */ andi $v0, $a2, 0xfff +/* 1634C4 80242C64 00021300 */ sll $v0, $v0, 0xc +/* 1634C8 80242C68 00621825 */ or $v1, $v1, $v0 +.L80242C6C: +/* 1634CC 80242C6C 00051400 */ sll $v0, $a1, 0x10 +/* 1634D0 80242C70 00021403 */ sra $v0, $v0, 0x10 +/* 1634D4 80242C74 18400004 */ blez $v0, .L80242C88 +/* 1634D8 80242C78 AD030004 */ sw $v1, 4($t0) +/* 1634DC 80242C7C 30420FFF */ andi $v0, $v0, 0xfff +/* 1634E0 80242C80 00621025 */ or $v0, $v1, $v0 +/* 1634E4 80242C84 AD020004 */ sw $v0, 4($t0) +.L80242C88: +/* 1634E8 80242C88 3C03800A */ lui $v1, 0x800a +/* 1634EC 80242C8C 2463A66C */ addiu $v1, $v1, -0x5994 +/* 1634F0 80242C90 8C620000 */ lw $v0, ($v1) +/* 1634F4 80242C94 0040202D */ daddu $a0, $v0, $zero +/* 1634F8 80242C98 24420008 */ addiu $v0, $v0, 8 +/* 1634FC 80242C9C AC620000 */ sw $v0, ($v1) +/* 163500 80242CA0 3C02E100 */ lui $v0, 0xe100 +/* 163504 80242CA4 AC820000 */ sw $v0, ($a0) +/* 163508 80242CA8 04C10012 */ bgez $a2, .L80242CF4 +/* 16350C 80242CAC 24840004 */ addiu $a0, $a0, 4 +/* 163510 80242CB0 000B1400 */ sll $v0, $t3, 0x10 +/* 163514 80242CB4 00021403 */ sra $v0, $v0, 0x10 +/* 163518 80242CB8 04410007 */ bgez $v0, .L80242CD8 +/* 16351C 80242CBC 00C20018 */ mult $a2, $v0 +/* 163520 80242CC0 00006812 */ mflo $t5 +/* 163524 80242CC4 000D11C3 */ sra $v0, $t5, 7 +/* 163528 80242CC8 04410008 */ bgez $v0, .L80242CEC +/* 16352C 80242CCC 01221023 */ subu $v0, $t1, $v0 +/* 163530 80242CD0 08090B3A */ j .L80242CE8 +/* 163534 80242CD4 0000102D */ daddu $v0, $zero, $zero +.L80242CD8: +/* 163538 80242CD8 00006812 */ mflo $t5 +/* 16353C 80242CDC 000D11C3 */ sra $v0, $t5, 7 +/* 163540 80242CE0 5C400001 */ bgtzl $v0, .L80242CE8 +/* 163544 80242CE4 0000102D */ daddu $v0, $zero, $zero +.L80242CE8: +/* 163548 80242CE8 01221023 */ subu $v0, $t1, $v0 +.L80242CEC: +/* 16354C 80242CEC 08090B3E */ j .L80242CF8 +/* 163550 80242CF0 00023400 */ sll $a2, $v0, 0x10 +.L80242CF4: +/* 163554 80242CF4 00093400 */ sll $a2, $t1, 0x10 +.L80242CF8: +/* 163558 80242CF8 04A10016 */ bgez $a1, .L80242D54 +/* 16355C 80242CFC 3142FFFF */ andi $v0, $t2, 0xffff +/* 163560 80242D00 000C1400 */ sll $v0, $t4, 0x10 +/* 163564 80242D04 00021C03 */ sra $v1, $v0, 0x10 +/* 163568 80242D08 0461000A */ bgez $v1, .L80242D34 +/* 16356C 80242D0C 00051400 */ sll $v0, $a1, 0x10 +/* 163570 80242D10 00021403 */ sra $v0, $v0, 0x10 +/* 163574 80242D14 00430018 */ mult $v0, $v1 +/* 163578 80242D18 00006812 */ mflo $t5 +/* 16357C 80242D1C 000D11C3 */ sra $v0, $t5, 7 +/* 163580 80242D20 04420001 */ bltzl $v0, .L80242D28 +/* 163584 80242D24 0000102D */ daddu $v0, $zero, $zero +.L80242D28: +/* 163588 80242D28 01421023 */ subu $v0, $t2, $v0 +/* 16358C 80242D2C 08090B55 */ j .L80242D54 +/* 163590 80242D30 3042FFFF */ andi $v0, $v0, 0xffff +.L80242D34: +/* 163594 80242D34 00021403 */ sra $v0, $v0, 0x10 +/* 163598 80242D38 00430018 */ mult $v0, $v1 +/* 16359C 80242D3C 00006812 */ mflo $t5 +/* 1635A0 80242D40 000D11C3 */ sra $v0, $t5, 7 +/* 1635A4 80242D44 5C400001 */ bgtzl $v0, .L80242D4C +/* 1635A8 80242D48 0000102D */ daddu $v0, $zero, $zero +.L80242D4C: +/* 1635AC 80242D4C 01421023 */ subu $v0, $t2, $v0 +/* 1635B0 80242D50 3042FFFF */ andi $v0, $v0, 0xffff +.L80242D54: +/* 1635B4 80242D54 00C21025 */ or $v0, $a2, $v0 +/* 1635B8 80242D58 AC820000 */ sw $v0, ($a0) +/* 1635BC 80242D5C 3C03800A */ lui $v1, 0x800a +/* 1635C0 80242D60 2463A66C */ addiu $v1, $v1, -0x5994 +/* 1635C4 80242D64 8C620000 */ lw $v0, ($v1) +/* 1635C8 80242D68 0040202D */ daddu $a0, $v0, $zero +/* 1635CC 80242D6C 24420008 */ addiu $v0, $v0, 8 +/* 1635D0 80242D70 AC620000 */ sw $v0, ($v1) +/* 1635D4 80242D74 3C02F100 */ lui $v0, 0xf100 +/* 1635D8 80242D78 AC820000 */ sw $v0, ($a0) +/* 1635DC 80242D7C 000B1400 */ sll $v0, $t3, 0x10 +/* 1635E0 80242D80 3183FFFF */ andi $v1, $t4, 0xffff +/* 1635E4 80242D84 00431025 */ or $v0, $v0, $v1 +/* 1635E8 80242D88 AC820004 */ sw $v0, 4($a0) +.L80242D8C: +/* 1635EC 80242D8C 03E00008 */ jr $ra +/* 1635F0 80242D90 00000000 */ nop diff --git a/asm/nonmatchings/code_163400/func_80244C30.s b/asm/nonmatchings/code_165490/func_80244C30.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244C30.s rename to asm/nonmatchings/code_165490/func_80244C30.s diff --git a/asm/nonmatchings/code_163400/func_80244CEC.s b/asm/nonmatchings/code_165490/func_80244CEC.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244CEC.s rename to asm/nonmatchings/code_165490/func_80244CEC.s diff --git a/asm/nonmatchings/code_163400/func_80244D60.s b/asm/nonmatchings/code_165490/func_80244D60.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244D60.s rename to asm/nonmatchings/code_165490/func_80244D60.s diff --git a/asm/nonmatchings/code_163400/func_80244DD0.s b/asm/nonmatchings/code_165490/func_80244DD0.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244DD0.s rename to asm/nonmatchings/code_165490/func_80244DD0.s diff --git a/asm/nonmatchings/code_163400/func_80244E54.s b/asm/nonmatchings/code_165490/func_80244E54.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244E54.s rename to asm/nonmatchings/code_165490/func_80244E54.s diff --git a/asm/nonmatchings/code_163400/func_80244F44.s b/asm/nonmatchings/code_165490/func_80244F44.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244F44.s rename to asm/nonmatchings/code_165490/func_80244F44.s diff --git a/asm/nonmatchings/code_163400/func_80244FD4.s b/asm/nonmatchings/code_165490/func_80244FD4.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80244FD4.s rename to asm/nonmatchings/code_165490/func_80244FD4.s diff --git a/asm/nonmatchings/code_163400/func_8024544C.s b/asm/nonmatchings/code_165490/func_8024544C.s similarity index 100% rename from asm/nonmatchings/code_163400/func_8024544C.s rename to asm/nonmatchings/code_165490/func_8024544C.s diff --git a/asm/nonmatchings/code_163400/func_80245588.s b/asm/nonmatchings/code_165490/func_80245588.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245588.s rename to asm/nonmatchings/code_165490/func_80245588.s diff --git a/asm/nonmatchings/code_163400/func_802455D8.s b/asm/nonmatchings/code_165490/func_802455D8.s similarity index 100% rename from asm/nonmatchings/code_163400/func_802455D8.s rename to asm/nonmatchings/code_165490/func_802455D8.s diff --git a/asm/nonmatchings/code_163400/func_80245628.s b/asm/nonmatchings/code_165490/func_80245628.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245628.s rename to asm/nonmatchings/code_165490/func_80245628.s diff --git a/asm/nonmatchings/code_163400/func_80245678.s b/asm/nonmatchings/code_165490/func_80245678.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245678.s rename to asm/nonmatchings/code_165490/func_80245678.s diff --git a/asm/nonmatchings/code_163400/func_802456C8.s b/asm/nonmatchings/code_165490/func_802456C8.s similarity index 100% rename from asm/nonmatchings/code_163400/func_802456C8.s rename to asm/nonmatchings/code_165490/func_802456C8.s diff --git a/asm/nonmatchings/code_163400/func_80245718.s b/asm/nonmatchings/code_165490/func_80245718.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245718.s rename to asm/nonmatchings/code_165490/func_80245718.s diff --git a/asm/nonmatchings/code_163400/func_80245768.s b/asm/nonmatchings/code_165490/func_80245768.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245768.s rename to asm/nonmatchings/code_165490/func_80245768.s diff --git a/asm/nonmatchings/code_163400/func_802457B8.s b/asm/nonmatchings/code_165490/func_802457B8.s similarity index 100% rename from asm/nonmatchings/code_163400/func_802457B8.s rename to asm/nonmatchings/code_165490/func_802457B8.s diff --git a/asm/nonmatchings/code_163400/func_80245808.s b/asm/nonmatchings/code_165490/func_80245808.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245808.s rename to asm/nonmatchings/code_165490/func_80245808.s diff --git a/asm/nonmatchings/code_163400/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80245A40.s rename to asm/nonmatchings/code_165490/func_80245A40.s diff --git a/asm/nonmatchings/code_163400/func_80246B2C.s b/asm/nonmatchings/code_165490/func_80246B2C.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80246B2C.s rename to asm/nonmatchings/code_165490/func_80246B2C.s diff --git a/asm/nonmatchings/code_163400/func_80246CBC.s b/asm/nonmatchings/code_165490/func_80246CBC.s similarity index 100% rename from asm/nonmatchings/code_163400/func_80246CBC.s rename to asm/nonmatchings/code_165490/func_80246CBC.s diff --git a/src/code_135EE0.c b/src/code_135EE0.c index a07973bc6a..3ce4094fd3 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -125,85 +125,3 @@ INCLUDE_ASM(s32, "code_135EE0", pause_badges_handle_input); INCLUDE_ASM(s32, "code_135EE0", pause_badges_update); INCLUDE_ASM(s32, "code_135EE0", pause_badges_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_comparator); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_pos_x); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_pos_y); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_column); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_get_row); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_is_visible); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_scroll_offset_y); - -s32 pause_items_scroll_offset_x(s32 beforeX) { - return beforeX; -} - -INCLUDE_ASM(s32, "code_135EE0", pause_items_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_load_items); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_items_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_load_portrait); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist_flower); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_partners_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_draw_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_spirits_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", func_8024D930); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_border_arrows); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_contents); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_title); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_init); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_handle_input); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_update); - -INCLUDE_ASM(s32, "code_135EE0", pause_map_cleanup); - -INCLUDE_ASM(s32, "code_135EE0", pause_get_menu_string); - -INCLUDE_ASM(s32, "code_135EE0", pause_draw_menu_label); diff --git a/src/code_13CAF0.c b/src/code_13CAF0.c new file mode 100644 index 0000000000..d3cb67d706 --- /dev/null +++ b/src/code_13CAF0.c @@ -0,0 +1,51 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_comparator); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_pos_x); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_pos_y); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_column); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_get_row); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_is_visible); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_scroll_offset_y); + +s32 pause_items_scroll_offset_x(s32 beforeX) { + return beforeX; +} + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_draw_contents); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_load_items); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_init); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_handle_input); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_update); + +INCLUDE_ASM(s32, "code_13CAF0", pause_items_cleanup); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_load_portrait); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_contents); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_title); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist_title); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_draw_movelist_flower); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_init); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_handle_input); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_update); + +INCLUDE_ASM(s32, "code_13CAF0", pause_partners_cleanup); diff --git a/src/code_13FD40.c b/src/code_13FD40.c new file mode 100644 index 0000000000..7236b71867 --- /dev/null +++ b/src/code_13FD40.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_draw_contents); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_draw_title); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_init); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_handle_input); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_update); + +INCLUDE_ASM(s32, "code_13FD40", pause_spirits_cleanup); diff --git a/src/code_140C70.c b/src/code_140C70.c new file mode 100644 index 0000000000..9a563af08c --- /dev/null +++ b/src/code_140C70.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_140C70", func_8024D930); + +INCLUDE_ASM(s32, "code_140C70", pause_map_draw_border_arrows); + +INCLUDE_ASM(s32, "code_140C70", pause_map_draw_contents); + +INCLUDE_ASM(s32, "code_140C70", pause_map_draw_title); + +INCLUDE_ASM(s32, "code_140C70", pause_map_init); + +INCLUDE_ASM(s32, "code_140C70", pause_map_handle_input); + +INCLUDE_ASM(s32, "code_140C70", pause_map_update); + +INCLUDE_ASM(s32, "code_140C70", pause_map_cleanup); diff --git a/src/code_1421C0.c b/src/code_1421C0.c new file mode 100644 index 0000000000..7b7b7870f2 --- /dev/null +++ b/src/code_1421C0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1421C0", pause_get_menu_string); + +INCLUDE_ASM(s32, "code_1421C0", pause_draw_menu_label); diff --git a/src/code_163400.c b/src/code_163400.c index f65f205101..a7e62caa97 100644 --- a/src/code_163400.c +++ b/src/code_163400.c @@ -57,43 +57,3 @@ INCLUDE_ASM(s32, "code_163400", func_802448E0); INCLUDE_ASM(s32, "code_163400", func_80244B00); INCLUDE_ASM(s32, "code_163400", func_80244BC4); - -INCLUDE_ASM(s32, "code_163400", func_80244C30); - -INCLUDE_ASM(s32, "code_163400", func_80244CEC); - -INCLUDE_ASM(s32, "code_163400", func_80244D60); - -INCLUDE_ASM(s32, "code_163400", func_80244DD0); - -INCLUDE_ASM(s32, "code_163400", func_80244E54); - -INCLUDE_ASM(s32, "code_163400", func_80244F44); - -INCLUDE_ASM(s32, "code_163400", func_80244FD4); - -INCLUDE_ASM(s32, "code_163400", func_8024544C); - -INCLUDE_ASM(s32, "code_163400", func_80245588); - -INCLUDE_ASM(s32, "code_163400", func_802455D8); - -INCLUDE_ASM(s32, "code_163400", func_80245628); - -INCLUDE_ASM(s32, "code_163400", func_80245678); - -INCLUDE_ASM(s32, "code_163400", func_802456C8); - -INCLUDE_ASM(s32, "code_163400", func_80245718); - -INCLUDE_ASM(s32, "code_163400", func_80245768); - -INCLUDE_ASM(s32, "code_163400", func_802457B8); - -INCLUDE_ASM(s32, "code_163400", func_80245808); - -INCLUDE_ASM(s32, "code_163400", func_80245A40); - -INCLUDE_ASM(s32, "code_163400", func_80246B2C); - -INCLUDE_ASM(s32, "code_163400", func_80246CBC); diff --git a/src/code_165490.c b/src/code_165490.c new file mode 100644 index 0000000000..fb8cba3afa --- /dev/null +++ b/src/code_165490.c @@ -0,0 +1,41 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_165490", func_80244C30); + +INCLUDE_ASM(s32, "code_165490", func_80244CEC); + +INCLUDE_ASM(s32, "code_165490", func_80244D60); + +INCLUDE_ASM(s32, "code_165490", func_80244DD0); + +INCLUDE_ASM(s32, "code_165490", func_80244E54); + +INCLUDE_ASM(s32, "code_165490", func_80244F44); + +INCLUDE_ASM(s32, "code_165490", func_80244FD4); + +INCLUDE_ASM(s32, "code_165490", func_8024544C); + +INCLUDE_ASM(s32, "code_165490", func_80245588); + +INCLUDE_ASM(s32, "code_165490", func_802455D8); + +INCLUDE_ASM(s32, "code_165490", func_80245628); + +INCLUDE_ASM(s32, "code_165490", func_80245678); + +INCLUDE_ASM(s32, "code_165490", func_802456C8); + +INCLUDE_ASM(s32, "code_165490", func_80245718); + +INCLUDE_ASM(s32, "code_165490", func_80245768); + +INCLUDE_ASM(s32, "code_165490", func_802457B8); + +INCLUDE_ASM(s32, "code_165490", func_80245808); + +INCLUDE_ASM(s32, "code_165490", func_80245A40); + +INCLUDE_ASM(s32, "code_165490", func_80246B2C); + +INCLUDE_ASM(s32, "code_165490", func_80246CBC); diff --git a/tools/splat.yaml b/tools/splat.yaml index 397a6cbea1..3527fc8cb5 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -277,17 +277,22 @@ segments: start: 0x135EE0 vram: 0x80242BA0 files: - - [0x135EE0, "c", "code_135EE0"] + - [0x135EE0, "c"] + - [0x13CAF0, "c"] + - [0x13FD40, "c"] + - [0x140C70, "c"] + - [0x1421C0, "c"] - [0x1422A0, "bin"] - name: code type: code start: 0x163400 vram: 0x80242BA0 files: - - [0x163400, "c", "code_163400"] - - [0x167570, "c", "code_167570"] - - [0x168590, "c", "code_168590"] - - [0x169BE0, "c", "code_169BE0"] + - [0x163400, "c"] + - [0x165490, "c"] + - [0x167570, "c"] + - [0x168590, "c"] + - [0x169BE0, "c"] - [0x16A3E0, "bin"] - name: code type: code From 5d75311b4177967b940df26bc20ce48baf143e7c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 23:22:17 -0400 Subject: [PATCH 04/10] removing func_8005FB10.s --- .../os/nusys/nuContRmbMgr/func_8005FB10.s | 109 ------------------ 1 file changed, 109 deletions(-) delete mode 100644 asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s diff --git a/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s b/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s deleted file mode 100644 index e071375137..0000000000 --- a/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005FB10 -/* 3AF10 8005FB10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 3AF14 8005FB14 AFB10014 */ sw $s1, 0x14($sp) -/* 3AF18 8005FB18 0000882D */ daddu $s1, $zero, $zero -/* 3AF1C 8005FB1C AFB40020 */ sw $s4, 0x20($sp) -/* 3AF20 8005FB20 24140002 */ addiu $s4, $zero, 2 -/* 3AF24 8005FB24 AFB50024 */ sw $s5, 0x24($sp) -/* 3AF28 8005FB28 24150001 */ addiu $s5, $zero, 1 -/* 3AF2C 8005FB2C AFB3001C */ sw $s3, 0x1c($sp) -/* 3AF30 8005FB30 0220982D */ daddu $s3, $s1, $zero -/* 3AF34 8005FB34 AFB20018 */ sw $s2, 0x18($sp) -/* 3AF38 8005FB38 0220902D */ daddu $s2, $s1, $zero -/* 3AF3C 8005FB3C AFBF0028 */ sw $ra, 0x28($sp) -/* 3AF40 8005FB40 AFB00010 */ sw $s0, 0x10($sp) -.L8005FB44: -/* 3AF44 8005FB44 3C02800B */ lui $v0, %hi(nuContRmbCtl) -/* 3AF48 8005FB48 24421D40 */ addiu $v0, $v0, %lo(nuContRmbCtl) -/* 3AF4C 8005FB4C 02428021 */ addu $s0, $s2, $v0 -/* 3AF50 8005FB50 92030007 */ lbu $v1, 7($s0) -/* 3AF54 8005FB54 10740015 */ beq $v1, $s4, .L8005FBAC -/* 3AF58 8005FB58 28620003 */ slti $v0, $v1, 3 -/* 3AF5C 8005FB5C 50400007 */ beql $v0, $zero, .L8005FB7C -/* 3AF60 8005FB60 28620083 */ slti $v0, $v1, 0x83 -/* 3AF64 8005FB64 5060003B */ beql $v1, $zero, .L8005FC54 -/* 3AF68 8005FB68 26730068 */ addiu $s3, $s3, 0x68 -/* 3AF6C 8005FB6C 10750009 */ beq $v1, $s5, .L8005FB94 -/* 3AF70 8005FB70 0200202D */ daddu $a0, $s0, $zero -/* 3AF74 8005FB74 08017F15 */ j .L8005FC54 -/* 3AF78 8005FB78 26730068 */ addiu $s3, $s3, 0x68 -.L8005FB7C: -/* 3AF7C 8005FB7C 10400034 */ beqz $v0, .L8005FC50 -/* 3AF80 8005FB80 28620081 */ slti $v0, $v1, 0x81 -/* 3AF84 8005FB84 54400033 */ bnel $v0, $zero, .L8005FC54 -/* 3AF88 8005FB88 26730068 */ addiu $s3, $s3, 0x68 -/* 3AF8C 8005FB8C 08017F0E */ j .L8005FC38 -/* 3AF90 8005FB90 00000000 */ nop -.L8005FB94: -/* 3AF94 8005FB94 0C017E48 */ jal contRmbControl -/* 3AF98 8005FB98 0220282D */ daddu $a1, $s1, $zero -/* 3AF9C 8005FB9C 5440002C */ bnel $v0, $zero, .L8005FC50 -/* 3AFA0 8005FBA0 A2000007 */ sb $zero, 7($s0) -/* 3AFA4 8005FBA4 08017F15 */ j .L8005FC54 -/* 3AFA8 8005FBA8 26730068 */ addiu $s3, $s3, 0x68 -.L8005FBAC: -/* 3AFAC 8005FBAC 92020008 */ lbu $v0, 8($s0) -/* 3AFB0 8005FBB0 14400019 */ bnez $v0, .L8005FC18 -/* 3AFB4 8005FBB4 0200202D */ daddu $a0, $s0, $zero -/* 3AFB8 8005FBB8 96030004 */ lhu $v1, 4($s0) -/* 3AFBC 8005FBBC 3C028009 */ lui $v0, %hi(nuContRmbSearchTime) -/* 3AFC0 8005FBC0 8C423CE0 */ lw $v0, %lo(nuContRmbSearchTime)($v0) -/* 3AFC4 8005FBC4 14400002 */ bnez $v0, .L8005FBD0 -/* 3AFC8 8005FBC8 0062001B */ divu $zero, $v1, $v0 -/* 3AFCC 8005FBCC 0007000D */ break 7 -.L8005FBD0: -/* 3AFD0 8005FBD0 00001010 */ mfhi $v0 -/* 3AFD4 8005FBD4 1440000C */ bnez $v0, .L8005FC08 -/* 3AFD8 8005FBD8 00000000 */ nop -/* 3AFDC 8005FBDC 3C04800E */ lui $a0, %hi(nuSiMesgQ) -/* 3AFE0 8005FBE0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) -/* 3AFE4 8005FBE4 3C05800E */ lui $a1, %hi(nuContPfs) -/* 3AFE8 8005FBE8 24A5AAD8 */ addiu $a1, $a1, %lo(nuContPfs) -/* 3AFEC 8005FBEC 02652821 */ addu $a1, $s3, $a1 -/* 3AFF0 8005FBF0 0C019FD1 */ jal osMotorInit -/* 3AFF4 8005FBF4 0220302D */ daddu $a2, $s1, $zero -/* 3AFF8 8005FBF8 14400003 */ bnez $v0, .L8005FC08 -/* 3AFFC 8005FBFC 00000000 */ nop -/* 3B000 8005FC00 A2150008 */ sb $s5, 8($s0) -/* 3B004 8005FC04 A2140009 */ sb $s4, 9($s0) -.L8005FC08: -/* 3B008 8005FC08 96020004 */ lhu $v0, 4($s0) -/* 3B00C 8005FC0C 24420001 */ addiu $v0, $v0, 1 -/* 3B010 8005FC10 08017F14 */ j .L8005FC50 -/* 3B014 8005FC14 A6020004 */ sh $v0, 4($s0) -.L8005FC18: -/* 3B018 8005FC18 0C017E48 */ jal contRmbControl -/* 3B01C 8005FC1C 0220282D */ daddu $a1, $s1, $zero -/* 3B020 8005FC20 5040000C */ beql $v0, $zero, .L8005FC54 -/* 3B024 8005FC24 26730068 */ addiu $s3, $s3, 0x68 -/* 3B028 8005FC28 A6110004 */ sh $s1, 4($s0) -/* 3B02C 8005FC2C A2000008 */ sb $zero, 8($s0) -/* 3B030 8005FC30 08017F14 */ j .L8005FC50 -/* 3B034 8005FC34 A2000009 */ sb $zero, 9($s0) -.L8005FC38: -/* 3B038 8005FC38 92020009 */ lbu $v0, 9($s0) -/* 3B03C 8005FC3C 54540005 */ bnel $v0, $s4, .L8005FC54 -/* 3B040 8005FC40 26730068 */ addiu $s3, $s3, 0x68 -/* 3B044 8005FC44 0200202D */ daddu $a0, $s0, $zero -/* 3B048 8005FC48 0C017E48 */ jal contRmbControl -/* 3B04C 8005FC4C 0220282D */ daddu $a1, $s1, $zero -.L8005FC50: -/* 3B050 8005FC50 26730068 */ addiu $s3, $s3, 0x68 -.L8005FC54: -/* 3B054 8005FC54 26310001 */ addiu $s1, $s1, 1 -/* 3B058 8005FC58 2E220004 */ sltiu $v0, $s1, 4 -/* 3B05C 8005FC5C 1440FFB9 */ bnez $v0, .L8005FB44 -/* 3B060 8005FC60 2652000A */ addiu $s2, $s2, 0xa -/* 3B064 8005FC64 8FBF0028 */ lw $ra, 0x28($sp) -/* 3B068 8005FC68 8FB50024 */ lw $s5, 0x24($sp) -/* 3B06C 8005FC6C 8FB40020 */ lw $s4, 0x20($sp) -/* 3B070 8005FC70 8FB3001C */ lw $s3, 0x1c($sp) -/* 3B074 8005FC74 8FB20018 */ lw $s2, 0x18($sp) -/* 3B078 8005FC78 8FB10014 */ lw $s1, 0x14($sp) -/* 3B07C 8005FC7C 8FB00010 */ lw $s0, 0x10($sp) -/* 3B080 8005FC80 0000102D */ daddu $v0, $zero, $zero -/* 3B084 8005FC84 03E00008 */ jr $ra -/* 3B088 8005FC88 27BD0030 */ addiu $sp, $sp, 0x30 From 46f1d49601e7e7c2b77765131be96e57fde0b4e9 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 23:49:49 -0400 Subject: [PATCH 05/10] Splitting remaining files --- .../DisablePartnerBlur.s | 0 .../EnablePartnerBlur.s | 0 .../begin_battle.s | 0 .../{code_16c8e0 => code_16F740}/end_battle.s | 0 .../func_80240E60.s | 0 .../func_80240FDC.s | 0 .../func_80241190.s | 0 .../func_80241AB8.s | 0 .../func_80241B14.s | 0 .../func_80242FE0.s | 0 .../func_802439D8.s | 0 .../func_80243FDC.s | 0 .../func_80244008.s | 0 .../func_80244710.s | 0 .../func_80244D90.s | 0 .../func_80244E38.s | 0 .../func_80245440.s | 0 .../func_80246B2C.s | 0 .../func_8024721C.s | 0 .../func_80247B04.s | 0 .../func_802480F0.s | 0 .../func_80248190.s | 0 .../func_802485FC.s | 0 .../func_80248660.s | 0 .../func_80248AA4.s | 0 .../func_80248B08.s | 0 .../func_80248D78.s | 0 .../pause_cleanup.s | 0 .../switch_order.s | 0 .../switch_to_partner.s | 0 .../switch_to_player.s | 0 .../update_end_player_turn.s | 0 .../update_enemy_action.s | 0 .../update_enemy_change_turn.s | 0 .../update_heroes_start_turn.s | 0 .../update_partner_action.s | 0 .../update_player_action.s | 0 .../update_player_change_turn.s | 0 .../update_run_away.s | 0 .../update_swap_partner.s | 0 .../AddBattleCamOffsetZ.s | 0 .../AddBattleCamZoom.s | 0 .../BattleCamTargetActor.s | 0 .../FreezeBattleCam.s | 0 .../MoveBattleCamOver.s | 0 .../SetBattleCamOffsetZ.s | 0 .../SetBattleCamTarget.s | 0 .../SetBattleCamYaw.s | 0 .../SetBattleCamZoom.s | 0 .../UseCamPreset.s | 0 .../add_cam_zoom.s | 0 .../cam_target_actor.s | 0 .../func_80248DD0.s | 0 .../func_80248DE4.s | 0 .../func_80249804.s | 0 .../func_8024A214.s | 0 .../func_8024A990.s | 0 .../func_8024AFE4.s | 0 .../func_8024B5FC.s | 0 .../func_8024B9A0.s | 0 .../func_8024BDA4.s | 0 .../func_8024C180.s | 0 .../func_8024C570.s | 0 .../func_8024C944.s | 0 .../func_8024CB68.s | 0 .../func_8024CE9C.s | 0 .../func_8024E3D8.s | 0 .../func_8024E40C.s | 0 .../func_8024E45C.s | 0 .../func_8024E484.s | 0 .../func_8024E554.s | 0 .../func_8024E584.s | 0 .../func_8024E60C.s | 0 .../func_8024E664.s | 0 .../func_8024E6B4.s | 0 .../func_8024E748.s | 0 .../func_8024E820.s | 0 .../func_8024E9B0.s | 0 .../func_8024EB84.s | 0 .../func_8024ECF8.s | 0 .../func_8024EDA4.s | 0 .../move_cam_over.s | 0 .../set_cam_target_pos.s | 0 .../set_cam_zoffset.s | 0 .../set_cam_zoom.s | 0 .../unfreeze_cam.s | 0 .../use_cam_preset.s | 0 .../ForceCloseMessageBox.s | 0 .../IsMessageBoxDisplayed.s | 0 .../SetMessageBoxDuration.s | 0 .../ShowMessageBox.s | 0 .../ShowVariableMessageBox.s | 0 .../WaitForMessageBoxDone.s | 0 .../close_action_command_instruction_popup.s | 0 .../create_popup.s | 0 .../func_8024EDC0.s | 0 .../func_8024EDEC.s | 0 .../func_8024EE48.s | 0 .../func_8024EEA8.s | 0 .../func_8024EF08.s | 0 .../func_8024EFA4.s | 0 .../func_8024EFE0.s | 0 .../func_8024F394.s | 0 .../func_8024F5AC.s | 0 .../func_8024F768.s | 0 .../func_8024F7C8.s | 0 .../func_8024F84C.s | 0 .../func_8024F940.s | 0 .../func_8024FAE8.s | 0 .../func_8024FAFC.s | 0 .../func_8024FB3C.s | 0 .../func_80250818.s | 0 .../func_80251434.s | 0 .../func_80251454.s | 0 .../func_80251474.s | 0 .../is_popup_displayed.s | 0 .../set_popup_duration.s | 0 .../show_battle_message.s | 0 .../show_message_popup.s | 0 .../show_variable_battle_message.s | 0 .../ItemAfflictEnemy.s | 0 .../ItemCheckHit.s | 0 .../ItemDamageEnemy.s | 0 .../calc_item_check_hit.s | 0 .../calc_item_damage_enemy.s | 0 .../func_80252B3C.s | 0 .../{code_16c8e0 => code_181810}/ActorSpeak.s | 0 .../ApplyShrinkFromOwner.s | 0 .../EndActorSpeech.s | 0 .../LoadBattleDmaData.s | 0 .../MakeStatusField.s | 0 .../MultiplyByActorScale.s | 0 .../MultiplyVec2ByActorScale.s | 0 .../MultiplyVec3ByActorScale.s | 0 .../OverrideBattleDmaDest.s | 0 .../PlayLoopingSoundAtActor.s | 0 .../PlaySoundAtActor.s | 0 .../PlaySoundAtPart.s | 0 .../SetForegroundModelsVisible.s | 0 .../SetForegroundModelsVisibleUnchecked.s | 0 .../ShowBattleChoice.s | 0 .../StartRumble.s | 0 .../StopLoopingSoundAtActor.s | 0 .../func_802535B4.s | 0 .../func_802536A8.s | 0 .../func_80253734.s | 0 .../func_802537C0.s | 0 .../func_80253B30.s | 0 .../func_80253FB0.s | 0 .../is_actor_hp_bar_visible.s | 0 .../is_actortype_hpbar_visible.s | 0 .../load_tattle_flags.s | 0 .../save_tattle_flags.s | 0 .../_remove_part_decoration.s | 0 .../disable_actor_blur.s | 0 .../disable_partner_blur.s | 0 .../disable_player_blur.s | 0 .../enable_actor_blur.s | 0 .../enable_partner_blur.s | 0 .../enable_player_blur.s | 0 .../func_80254250.s | 0 .../func_80254610.s | 0 .../func_802546B0.s | 0 .../func_80254950.s | 0 .../func_802549A0.s | 0 .../func_802549C0.s | 0 .../func_802549F4.s | 0 .../func_80254C50.s | 0 .../func_802550BC.s | 0 .../func_802552EC.s | 0 .../func_8025593C.s | 0 .../func_8025595C.s | 0 .../func_8025597C.s | 0 .../func_8025599C.s | 0 .../func_80255FE0.s | 0 .../func_802571F0.s | 0 .../func_80257B28.s | 0 .../func_80257B48.s | 0 .../func_80257B68.s | 0 .../func_80257B88.s | 0 .../func_80257DA4.s | 0 .../func_80258E14.s | 0 .../func_802591EC.s | 0 .../func_80259494.s | 0 .../func_8025950C.s | 0 .../func_802596C0.s | 0 .../func_802597B0.s | 0 .../func_8025995C.s | 0 .../func_80259A48.s | 0 .../func_80259AAC.s | 0 .../func_80259D9C.s | 0 .../func_8025A2C4.s | 0 .../func_8025A50C.s | 0 .../func_8025A74C.s | 0 .../func_8025AA80.s | 0 .../func_8025AD90.s | 0 .../func_8025B1A8.s | 0 .../func_8025B5C0.s | 0 .../func_8025BAA0.s | 0 .../func_8025C120.s | 0 .../func_8025C840.s | 0 .../func_8025C8A0.s | 0 .../func_8025C918.s | 0 .../func_8025CCC8.s | 0 .../func_8025CD28.s | 0 .../func_8025CD40.s | 0 .../func_8025CEC8.s | 0 .../func_8025D160.s | 0 .../func_8025D290.s | 0 .../func_8025D2B0.s | 0 .../func_8025D3CC.s | 0 .../func_8025D4A0.s | 0 .../func_8025D4C8.s | 0 .../func_8025D620.s | 0 .../func_8025D640.s | 0 .../func_8025D6FC.s | 0 .../func_8025D71C.s | 0 .../func_8025D810.s | 0 .../func_8025D830.s | 0 .../func_8025D8EC.s | 0 .../func_8025D90C.s | 0 .../func_8025DA68.s | 0 .../func_8025DBD0.s | 0 .../func_8025DD40.s | 0 .../func_8025DD60.s | 0 .../func_8025DE88.s | 0 .../mtx_mirror_y.s | 0 .../reset_actor_blur.s | 0 .../reset_partner_blur.s | 0 .../update_actor_shadow.s | 0 .../update_enemy_shadows.s | 0 .../update_hero_shadows.s | 0 .../update_player_actor_shadow.s | 0 .../func_8025DEB0.s | 0 .../func_8025DEC4.s | 0 .../func_8025E030.s | 0 .../func_8025E044.s | 0 .../func_8025E108.s | 0 .../func_8025E14C.s | 0 .../func_8025E190.s | 0 .../func_8025FF8C.s | 0 .../func_802601BC.s | 0 .../func_80260948.s | 0 .../func_80260A20.s | 0 .../FXRecoverFP.s | 0 .../FXRecoverHP.s | 0 .../HasMerleeCastsLeft.s | 0 .../IncrementPlayerFP.s | 0 .../IncrementPlayerHP.s | 0 .../activate_defend_command.s | 0 .../func_80260A60.s | 0 .../func_80260AD4.s | 0 .../func_80260B70.s | 0 .../func_80260BF4.s | 0 .../func_80260DB8.s | 0 .../func_80260DD8.s | 0 .../func_80260E38.s | 0 .../func_80260E5C.s | 0 .../func_80260E90.s | 0 .../func_80261064.s | 0 .../func_802610CC.s | 0 .../func_80261164.s | 0 .../func_802611E8.s | 0 .../func_8026127C.s | 0 .../func_80261388.s | 0 .../func_802613A8.s | 0 .../func_802613BC.s | 0 .../func_80261478.s | 0 .../func_80261530.s | 0 .../func_802615C8.s | 0 .../func_80261648.s | 0 .../func_802616B4.s | 0 .../func_802616F4.s | 0 .../func_802619B4.s | 0 .../func_802619E8.s | 0 .../func_80261B40.s | 0 .../func_80261D98.s | 0 .../func_80261DD4.s | 0 .../func_80261DF4.s | 0 .../func_80261FB4.s | 0 .../func_802620F8.s | 0 .../func_80262130.s | 0 .../func_8026220C.s | 0 .../StartRumbleWithParams.s | 0 .../add_actor_decoration.s | 0 .../add_part_decoration.s | 0 .../add_xz_vec3f.s | 0 .../add_xz_vec3f_copy1.s | 0 .../add_xz_vec3f_copy2.s | 0 .../count_power_plus.s | 0 .../create_actor.s | 0 .../create_part_shadow.s | 0 .../create_target_list.s | 0 .../deduct_current_move_fp.s | 0 .../enemy_create_target_list.s | 0 .../func_80263064.s | 0 .../func_80263230.s | 0 .../func_8026324C.s | 0 .../func_80263268.s | 0 .../func_80263300.s | 0 .../func_802633E8.s | 0 .../func_80263434.s | 0 .../func_80263464.s | 0 .../func_802634B8.s | 0 .../func_802636E4.s | 0 .../func_80263914.s | 0 .../func_80263C60.s | 0 .../func_80263CC4.s | 0 .../func_80263E08.s | 0 .../func_80263FE8.s | 0 .../func_80264084.s | 0 .../func_80265CE8.s | 0 .../func_80265D44.s | 0 .../func_802664DC.s | 0 .../func_80266684.s | 0 .../func_802666E4.s | 0 .../func_802667F0.s | 0 .../func_80266970.s | 0 .../func_80266978.s | 0 .../func_80266ADC.s | 0 .../func_80266AF8.s | 0 .../func_80266B14.s | 0 .../func_80266D6C.s | 0 .../func_80266DAC.s | 0 .../func_80266E14.s | 0 .../func_80266E40.s | 0 .../func_80266EA8.s | 0 .../func_80266EE8.s | 0 .../func_80266F60.s | 0 .../func_80266F8C.s | 0 .../func_80266FD8.s | 0 .../func_80267018.s | 0 .../func_8026709C.s | 0 .../func_802670C8.s | 0 .../func_802673E4.s | 0 .../func_8026777C.s | 0 .../func_8026787C.s | 0 .../func_80267A3C.s | 0 .../get_actor_part.s | 0 .../get_defense.s | 0 .../heroes_is_ability_active.s | 0 .../hide_foreground_models.s | 0 .../hide_foreground_models_unchecked.s | 0 .../inflict_partner_ko.s | 0 .../inflict_status.s | 0 .../inflict_status_set_duration.s | 0 .../load_partner_actor.s | 0 .../load_player_actor.s | 0 .../lookup_defense.s | 0 .../lookup_status_chance.s | 0 .../lookup_status_duration_mod.s | 0 .../play_movement_dust_effects.s | 0 .../player_create_target_list.s | 0 .../remove_actor_decoration.s | 0 .../remove_part_decoration.s | 0 .../remove_part_shadow.s | 0 .../remove_player_buffs.s | 0 .../reset_all_actor_sounds.s | 0 .../set_actor_yaw.s | 0 .../set_animation.s | 0 .../set_animation_rate.s | 0 .../set_part_yaw.s | 0 .../show_damage_popup.s | 0 .../show_foreground_models.s | 0 .../show_foreground_models_unchecked.s | 0 .../start_rumble_type.s | 0 .../try_inflict_status.s | 0 .../LoadFreeItemScript.s | 0 .../LoadItemScript.s | 0 .../LoadMoveScript.s | 0 .../CloseActionCommandInfo.s | 0 .../GetActionSuccess.s | 0 .../GetActionSuccessCopy.s | 0 .../GetBlockResult.s | 0 .../LoadActionCommand.s | 0 .../SetActionSuccess.s | 0 .../check_block_input.s | 0 .../func_80268224.s | 0 .../func_80268284.s | 0 .../func_80268770.s | 0 .../func_80268798.s | 0 .../func_802687BC.s | 0 .../func_802687E4.s | 0 .../func_8026880C.s | 0 .../func_80268834.s | 0 .../func_80268858.s | 0 .../func_80268938.s | 0 .../func_80268AF8.s | 0 .../func_80268C9C.s | 0 .../func_80268E88.s | 0 .../func_80269118.s | 0 .../func_80269160.s | 0 .../func_8026919C.s | 0 .../func_802691C8.s | 0 .../func_802692EC.s | 0 .../func_80269318.s | 0 .../func_80269344.s | 0 .../func_80269370.s | 0 .../func_8026939C.s | 0 .../func_802693F0.s | 0 .../func_80269470.s | 0 .../func_802694A4.s | 0 .../func_80269524.s | 0 .../func_80269550.s | 0 .../func_802695A8.s | 0 .../func_802695D4.s | 0 .../func_80269600.s | 0 .../func_8026962C.s | 0 .../AddActorDecoration.s | 0 .../AddActorPos.s | 0 .../AddActorVar.s | 0 .../{code_16c8e0 => code_197F40}/AddGoalPos.s | 0 .../AddPartDispOffset.s | 0 .../AddPartMovementVar.s | 0 .../BoostAttack.s | 0 .../BoostDefense.s | 0 .../CancelablePlayerRunToGoal.s | 0 .../CheckButtonDown.s | 0 .../CheckButtonHeld.s | 0 .../CheckButtonPress.s | 0 .../ChooseNextTarget.s | 0 .../{code_16c8e0 => code_197F40}/CopyBuffs.s | 0 .../CountPlayerTargets.s | 0 .../CreatePartShadow.s | 0 .../DidActionSucceed.s | 0 .../DispatchDamagePlayerEvent.s | 0 .../ElectrifyActor.s | 0 .../EnablePlayerBlur.s | 0 .../EnemyCreateTargetList.s | 0 .../ForceHomePos.s | 0 .../GetActorAttackBoost.s | 0 .../GetActorDefenseBoost.s | 0 .../GetActorFlags.s | 0 .../GetActorPos.s | 0 .../GetActorRotation.s | 0 .../GetActorScale.s | 0 .../GetActorVar.s | 0 .../GetActorYaw.s | 0 .../GetAnimation.s | 0 .../GetBattleFlags.s | 0 .../GetBattleFlags2.s | 0 .../GetBattlePhase.s | 0 .../GetBattleState.s | 0 .../GetBattleVar.s | 0 .../GetDistanceToGoal.s | 0 .../{code_16c8e0 => code_197F40}/GetGoalPos.s | 0 .../{code_16c8e0 => code_197F40}/GetHomePos.s | 0 .../GetIdleGoal.s | 0 .../GetIndexFromHome.s | 0 .../GetIndexFromPos.s | 0 .../GetLastElement.s | 0 .../GetMenuSelection.s | 0 .../{code_16c8e0 => code_197F40}/GetOwnerID.s | 0 .../GetOwnerTarget.s | 0 .../GetPartDispOffset.s | 0 .../GetPartEventFlags.s | 0 .../GetPartFlags.s | 0 .../GetPartMovementVar.s | 0 .../GetPartOffset.s | 0 .../{code_16c8e0 => code_197F40}/GetPartPos.s | 0 .../GetPartRotation.s | 0 .../GetPartScale.s | 0 .../GetPartTarget.s | 0 .../GetPartTargetFlags.s | 0 .../{code_16c8e0 => code_197F40}/GetPartYaw.s | 0 .../GetPlayerActorID.s | 0 .../GetPlayerHP.s | 0 .../GetStatusFlags.s | 0 .../GetTargetListLength.s | 0 .../HPBarToCurrent.s | 0 .../HPBarToHome.s | 0 .../{code_16c8e0 => code_197F40}/HealActor.s | 0 .../InitTargetIterator.s | 0 .../LoadBattleSection.s | 0 .../ModifyActorDecoration.s | 0 .../PlayerCreateTargetList.s | 0 .../PlayerDamageEnemy.s | 0 .../PlayerFallToGoal.s | 0 .../PlayerLandJump.s | 0 .../PlayerPowerBounceEnemy.s | 0 .../PlayerRunToGoal.s | 0 .../PlayerTestEnemy.s | 0 .../RemoveActorDecoration.s | 0 .../RemovePartShadow.s | 0 .../RemovePlayerBuffs.s | 0 .../ResetActorSounds.s | 0 .../ResetAllActorSounds.s | 0 .../SetActorDispOffset.s | 0 .../SetActorFlagBits.s | 0 .../SetActorFlags.s | 0 .../SetActorIdleJumpGravity.s | 0 .../SetActorIdleSpeed.s | 0 .../SetActorJumpGravity.s | 0 .../SetActorPos.s | 0 .../SetActorRotation.s | 0 .../SetActorRotationOffset.s | 0 .../SetActorScale.s | 0 .../SetActorScaleModifier.s | 0 .../SetActorSounds.s | 0 .../SetActorSpeed.s | 0 .../SetActorType.s | 0 .../SetActorVar.s | 0 .../SetActorYaw.s | 0 .../SetAnimation.s | 0 .../SetAnimationRate.s | 0 .../SetBattleFlagBits.s | 0 .../SetBattleFlagBits2.s | 0 .../SetBattleInputButtons.s | 0 .../SetBattleInputMask.s | 0 .../SetBattleVar.s | 0 .../SetEnemyTargetOffset.s | 0 .../{code_16c8e0 => code_197F40}/SetGoalPos.s | 0 .../SetGoalToFirstTarget.s | 0 .../SetGoalToHome.s | 0 .../SetGoalToIndex.s | 0 .../SetGoalToTarget.s | 0 .../{code_16c8e0 => code_197F40}/SetHomePos.s | 0 .../SetIdleGoal.s | 0 .../SetIdleGoalToHome.s | 0 .../SetJumpAnimations.s | 0 .../{code_16c8e0 => code_197F40}/SetOwnerID.s | 0 .../SetOwnerTarget.s | 0 .../SetPartAlpha.s | 0 .../SetPartDispOffset.s | 0 .../SetPartEventBits.s | 0 .../SetPartEventFlags.s | 0 .../SetPartFlagBits.s | 0 .../SetPartFlags.s | 0 .../SetPartGoalToTarget.s | 0 .../SetPartJumpGravity.s | 0 .../SetPartMoveSpeed.s | 0 .../SetPartMovementVar.s | 0 .../{code_16c8e0 => code_197F40}/SetPartPos.s | 0 .../SetPartRotation.s | 0 .../SetPartRotationOffset.s | 0 .../SetPartScale.s | 0 .../SetPartSounds.s | 0 .../SetPartTargetFlagBits.s | 0 .../SetPartTargetFlags.s | 0 .../{code_16c8e0 => code_197F40}/SetPartYaw.s | 0 .../ShowShockEffect.s | 0 .../SummonEnemy.s | 0 .../UseIdleAnimation.s | 0 .../VanishActor.s | 0 .../WaitForBuffDone.s | 0 .../calc_player_damage_enemy.s | 0 .../calc_player_test_enemy.s | 0 .../count_targets.s | 0 .../dispatch_damage_event_player.s | 0 .../dispatch_damage_event_player_0.s | 0 .../dispatch_damage_event_player_1.s | 0 .../dispatch_event_player.s | 0 .../dispatch_event_player_continue_turn.s | 0 .../func_80269E80.s | 0 .../func_80269EAC.s | 0 .../func_8026BF48.s | 0 .../func_8026D51C.s | 0 .../func_8026D5A4.s | 0 .../func_8026D8EC.s | 0 .../func_8026D940.s | 0 .../func_8026DA94.s | 0 .../func_8026DEF0.s | 0 .../func_8026DF88.s | 0 .../func_8026E020.s | 0 .../func_8026E038.s | 0 .../func_8026E16C.s | 0 .../func_8026E198.s | 0 .../func_8026E208.s | 0 .../func_8026E260.s | 0 .../func_8026E558.s | 0 .../func_8026E914.s | 0 .../func_8026E9A0.s | 0 .../func_8026EA7C.s | 0 .../func_8026EB20.s | 0 .../func_8026EBF8.s | 0 .../func_8026ED20.s | 0 .../func_8026EDE4.s | 0 .../func_8026F1A0.s | 0 .../func_8026F60C.s | 0 .../func_80271210.s | 0 .../func_80271258.s | 0 .../func_802712A0.s | 0 .../func_80271328.s | 0 .../func_802713B0.s | 0 .../func_8027143C.s | 0 .../func_80271484.s | 0 .../func_80271588.s | 0 .../func_80273444.s | 0 .../func_802749D8.s | 0 .../func_802749F8.s | 0 .../func_80274A18.s | 0 .../func_802752AC.s | 0 .../func_80275F00.s | 0 .../func_80276EFC.s | 0 .../func_80276F1C.s | 0 .../{code_16c8e0 => code_197F40}/get_actor.s | 0 .../get_nearest_home_index.s | 0 .../set_actor_current_position.s | 0 .../set_actor_home_position.s | 0 .../set_goal_pos_to_part.s | 0 .../set_part_absolute_position.s | 0 .../set_part_goal_to_actor_part.s | 0 .../AfflictActor.s | 0 .../BindHandleEvent.s | 0 .../{code_16c8e0 => code_1A5830}/BindIdle.s | 0 .../BindNextTurn.s | 0 .../BindTakeTurn.s | 0 .../ClearStatusEffects.s | 0 .../CopyStatusEffects.s | 0 .../DispatchDamageEvent.s | 0 .../DispatchEvent.s | 0 .../DropStarPoints.s | 0 .../EnableActorBlur.s | 0 .../EnableActorGlow.s | 0 .../EnableIdleScript.s | 0 .../EnemyDamageTarget.s | 0 .../EnemyFollowupAfflictTarget.s | 0 .../EnemyTestTarget.s | 0 .../{code_16c8e0 => code_1A5830}/FallPartTo.s | 0 .../{code_16c8e0 => code_1A5830}/FallToGoal.s | 0 .../{code_16c8e0 => code_1A5830}/FlyPartTo.s | 0 .../{code_16c8e0 => code_1A5830}/FlyToGoal.s | 0 .../{code_16c8e0 => code_1A5830}/GetActorHP.s | 0 .../GetActorSize.s | 0 .../GetCurrentActorType.s | 0 .../GetEncounterState.s | 0 .../GetEnemyMaxHP.s | 0 .../GetLastDamage.s | 0 .../GetLastEvent.s | 0 .../GetOriginalActorType.s | 0 .../IdleFlyToGoal.s | 0 .../IdleJumpToGoal.s | 0 .../IdleRunToGoal.s | 0 .../{code_16c8e0 => code_1A5830}/JumpPartTo.s | 0 .../{code_16c8e0 => code_1A5830}/JumpToGoal.s | 0 .../JumpToGoalSimple2.s | 0 .../JumpWithBounce.s | 0 .../{code_16c8e0 => code_1A5830}/LandJump.s | 0 .../LandJumpPart.s | 0 .../PauseTakeTurn.s | 0 .../RemoveActor.s | 0 .../ResumeTakeTurn.s | 0 .../{code_16c8e0 => code_1A5830}/RunPartTo.s | 0 .../{code_16c8e0 => code_1A5830}/RunToGoal.s | 0 .../SetActorSize.s | 0 .../SetDefenseTable.s | 0 .../{code_16c8e0 => code_1A5830}/SetEnemyHP.s | 0 .../SetIdleAnimations.s | 0 .../SetPartSize.s | 0 .../SetStatusTable.s | 0 .../SetTargetActor.s | 0 .../SetTargetOffset.s | 0 .../WasStatusInflicted.s | 0 .../{code_16c8e0 => code_1A5830}/YieldTurn.s | 0 .../calc_enemy_damage_target.s | 0 .../calc_enemy_test_target.s | 0 .../dispatch_damage_event_actor.s | 0 .../dispatch_damage_event_actor_0.s | 0 .../dispatch_damage_event_actor_1.s | 0 .../dispatch_event_actor.s | 0 .../dispatch_event_general.s | 0 .../func_80276F50.s | 0 .../func_8027CC10.s | 0 .../func_8027D2D8.s | 0 .../func_8027D32C.s | 0 .../func_8027D434.s | 0 .../func_8027D4C8.s | 0 .../func_8027D628.s | 0 .../func_8027D75C.s | 0 .../play_hit_sound.s | 0 .../update_lerp_battle.s | 0 .../DeletePartner.s | 0 .../MakeOwnerTargetIndex.s | 0 .../PartnerAfflictEnemy.s | 0 .../PartnerDamageEnemy.s | 0 .../PartnerPowerBounceEnemy.s | 0 .../PartnerTestEnemy.s | 0 .../calc_partner_damage_enemy.s | 0 .../calc_partner_test_enemy.s | 0 .../dispatch_damage_event_partner.s | 0 .../dispatch_damage_event_partner_0.s | 0 .../dispatch_damage_event_partner_1.s | 0 .../dispatch_event_partner.s | 0 .../dispatch_event_partner_continue_turn.s | 0 .../func_8027FC90.s | 0 .../func_8028070C.s | 0 .../func_802807D0.s | 0 .../func_80280818.s | 0 .../ActorAddMovePos.s | 0 .../GetDamageIntensity.s | 0 .../LoadStarPowerScript.s | 0 .../os/nusys/nuContRmbMgr/func_8005FB10.s | 109 ++ include/functions.h | 1 + src/code_16F740.c | 140 ++ src/code_16c8e0.c | 1493 ----------------- src/code_1776B0.c | 95 ++ src/code_17D6A0.c | 67 + src/code_17FEB0.c | 13 + src/code_181810.c | 55 + src/code_182B30.c | 179 ++ src/code_18C790.c | 23 + src/code_18F340.c | 79 + src/code_190B20.c | 169 ++ src/code_1967B0.c | 7 + src/code_196AA0.c | 77 + src/code_197F40.c | 408 +++++ src/code_1A5830.c | 139 ++ src/code_1AC760.c | 50 + src/code_1AF120.c | 5 + src/code_1AF230.c | 3 + tools/splat.yaml | 16 + 711 files changed, 1635 insertions(+), 1493 deletions(-) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/DisablePartnerBlur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/EnablePartnerBlur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/begin_battle.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/end_battle.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80240E60.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80240FDC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80241190.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80241AB8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80241B14.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80242FE0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_802439D8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80243FDC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80244008.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80244710.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80244D90.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80244E38.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80245440.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80246B2C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_8024721C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80247B04.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_802480F0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80248190.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_802485FC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80248660.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80248AA4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80248B08.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/func_80248D78.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/pause_cleanup.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/switch_order.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/switch_to_partner.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/switch_to_player.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_end_player_turn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_enemy_action.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_enemy_change_turn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_heroes_start_turn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_partner_action.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_player_action.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_player_change_turn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_run_away.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_16F740}/update_swap_partner.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/AddBattleCamOffsetZ.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/AddBattleCamZoom.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/BattleCamTargetActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/FreezeBattleCam.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/MoveBattleCamOver.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/SetBattleCamOffsetZ.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/SetBattleCamTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/SetBattleCamYaw.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/SetBattleCamZoom.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/UseCamPreset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/add_cam_zoom.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/cam_target_actor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_80248DD0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_80248DE4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_80249804.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024A214.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024A990.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024AFE4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024B5FC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024B9A0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024BDA4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024C180.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024C570.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024C944.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024CB68.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024CE9C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E3D8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E40C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E45C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E484.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E554.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E584.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E60C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E664.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E6B4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E748.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E820.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024E9B0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024EB84.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024ECF8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/func_8024EDA4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/move_cam_over.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/set_cam_target_pos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/set_cam_zoffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/set_cam_zoom.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/unfreeze_cam.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1776B0}/use_cam_preset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/ForceCloseMessageBox.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/IsMessageBoxDisplayed.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/SetMessageBoxDuration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/ShowMessageBox.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/ShowVariableMessageBox.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/WaitForMessageBoxDone.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/close_action_command_instruction_popup.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/create_popup.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024EDC0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024EDEC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024EE48.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024EEA8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024EF08.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024EFA4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024EFE0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024F394.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024F5AC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024F768.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024F7C8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024F84C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024F940.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024FAE8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024FAFC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_8024FB3C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_80250818.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_80251434.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_80251454.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/func_80251474.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/is_popup_displayed.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/set_popup_duration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/show_battle_message.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/show_message_popup.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17D6A0}/show_variable_battle_message.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17FEB0}/ItemAfflictEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17FEB0}/ItemCheckHit.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17FEB0}/ItemDamageEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17FEB0}/calc_item_check_hit.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17FEB0}/calc_item_damage_enemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_17FEB0}/func_80252B3C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/ActorSpeak.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/ApplyShrinkFromOwner.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/EndActorSpeech.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/LoadBattleDmaData.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/MakeStatusField.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/MultiplyByActorScale.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/MultiplyVec2ByActorScale.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/MultiplyVec3ByActorScale.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/OverrideBattleDmaDest.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/PlayLoopingSoundAtActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/PlaySoundAtActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/PlaySoundAtPart.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/SetForegroundModelsVisible.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/SetForegroundModelsVisibleUnchecked.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/ShowBattleChoice.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/StartRumble.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/StopLoopingSoundAtActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/func_802535B4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/func_802536A8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/func_80253734.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/func_802537C0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/func_80253B30.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/func_80253FB0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/is_actor_hp_bar_visible.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/is_actortype_hpbar_visible.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/load_tattle_flags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_181810}/save_tattle_flags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/_remove_part_decoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/disable_actor_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/disable_partner_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/disable_player_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/enable_actor_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/enable_partner_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/enable_player_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80254250.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80254610.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802546B0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80254950.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802549A0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802549C0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802549F4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80254C50.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802550BC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802552EC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025593C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025595C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025597C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025599C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80255FE0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802571F0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80257B28.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80257B48.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80257B68.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80257B88.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80257DA4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80258E14.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802591EC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80259494.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025950C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802596C0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_802597B0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025995C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80259A48.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80259AAC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_80259D9C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025A2C4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025A50C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025A74C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025AA80.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025AD90.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025B1A8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025B5C0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025BAA0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025C120.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025C840.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025C8A0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025C918.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025CCC8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025CD28.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025CD40.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025CEC8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D160.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D290.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D2B0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D3CC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D4A0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D4C8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D620.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D640.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D6FC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D71C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D810.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D830.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D8EC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025D90C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025DA68.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025DBD0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025DD40.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025DD60.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/func_8025DE88.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/mtx_mirror_y.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/reset_actor_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/reset_partner_blur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/update_actor_shadow.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/update_enemy_shadows.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/update_hero_shadows.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_182B30}/update_player_actor_shadow.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025DEB0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025DEC4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025E030.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025E044.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025E108.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025E14C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025E190.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_8025FF8C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_802601BC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_80260948.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18C790}/func_80260A20.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/FXRecoverFP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/FXRecoverHP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/HasMerleeCastsLeft.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/IncrementPlayerFP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/IncrementPlayerHP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/activate_defend_command.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260A60.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260AD4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260B70.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260BF4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260DB8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260DD8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260E38.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260E5C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80260E90.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261064.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802610CC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261164.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802611E8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_8026127C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261388.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802613A8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802613BC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261478.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261530.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802615C8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261648.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802616B4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802616F4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802619B4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802619E8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261B40.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261D98.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261DD4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261DF4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80261FB4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_802620F8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_80262130.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_18F340}/func_8026220C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/StartRumbleWithParams.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/add_actor_decoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/add_part_decoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/add_xz_vec3f.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/add_xz_vec3f_copy1.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/add_xz_vec3f_copy2.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/count_power_plus.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/create_actor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/create_part_shadow.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/create_target_list.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/deduct_current_move_fp.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/enemy_create_target_list.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263064.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263230.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_8026324C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263268.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263300.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802633E8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263434.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263464.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802634B8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802636E4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263914.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263C60.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263CC4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263E08.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80263FE8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80264084.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80265CE8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80265D44.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802664DC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266684.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802666E4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802667F0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266970.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266978.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266ADC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266AF8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266B14.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266D6C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266DAC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266E14.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266E40.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266EA8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266EE8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266F60.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266F8C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80266FD8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80267018.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_8026709C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802670C8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_802673E4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_8026777C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_8026787C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/func_80267A3C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/get_actor_part.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/get_defense.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/heroes_is_ability_active.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/hide_foreground_models.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/hide_foreground_models_unchecked.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/inflict_partner_ko.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/inflict_status.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/inflict_status_set_duration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/load_partner_actor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/load_player_actor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/lookup_defense.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/lookup_status_chance.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/lookup_status_duration_mod.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/play_movement_dust_effects.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/player_create_target_list.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/remove_actor_decoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/remove_part_decoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/remove_part_shadow.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/remove_player_buffs.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/reset_all_actor_sounds.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/set_actor_yaw.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/set_animation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/set_animation_rate.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/set_part_yaw.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/show_damage_popup.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/show_foreground_models.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/show_foreground_models_unchecked.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/start_rumble_type.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_190B20}/try_inflict_status.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1967B0}/LoadFreeItemScript.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1967B0}/LoadItemScript.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1967B0}/LoadMoveScript.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/CloseActionCommandInfo.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/GetActionSuccess.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/GetActionSuccessCopy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/GetBlockResult.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/LoadActionCommand.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/SetActionSuccess.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/check_block_input.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268224.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268284.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268770.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268798.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802687BC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802687E4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_8026880C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268834.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268858.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268938.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268AF8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268C9C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80268E88.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269118.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269160.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_8026919C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802691C8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802692EC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269318.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269344.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269370.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_8026939C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802693F0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269470.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802694A4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269524.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269550.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802695A8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_802695D4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_80269600.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_196AA0}/func_8026962C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/AddActorDecoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/AddActorPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/AddActorVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/AddGoalPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/AddPartDispOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/AddPartMovementVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/BoostAttack.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/BoostDefense.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/CancelablePlayerRunToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/CheckButtonDown.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/CheckButtonHeld.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/CheckButtonPress.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/ChooseNextTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/CopyBuffs.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/CountPlayerTargets.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/CreatePartShadow.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/DidActionSucceed.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/DispatchDamagePlayerEvent.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/ElectrifyActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/EnablePlayerBlur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/EnemyCreateTargetList.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/ForceHomePos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorAttackBoost.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorDefenseBoost.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorRotation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorScale.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetActorYaw.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetAnimation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetBattleFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetBattleFlags2.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetBattlePhase.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetBattleState.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetBattleVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetDistanceToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetGoalPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetHomePos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetIdleGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetIndexFromHome.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetIndexFromPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetLastElement.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetMenuSelection.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetOwnerID.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetOwnerTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartDispOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartEventFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartMovementVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartRotation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartScale.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartTargetFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPartYaw.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPlayerActorID.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetPlayerHP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetStatusFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/GetTargetListLength.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/HPBarToCurrent.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/HPBarToHome.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/HealActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/InitTargetIterator.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/LoadBattleSection.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/ModifyActorDecoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/PlayerCreateTargetList.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/PlayerDamageEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/PlayerFallToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/PlayerLandJump.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/PlayerPowerBounceEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/PlayerRunToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/PlayerTestEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/RemoveActorDecoration.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/RemovePartShadow.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/RemovePlayerBuffs.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/ResetActorSounds.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/ResetAllActorSounds.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorDispOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorFlagBits.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorIdleJumpGravity.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorIdleSpeed.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorJumpGravity.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorRotation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorRotationOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorScale.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorScaleModifier.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorSounds.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorSpeed.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorType.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetActorYaw.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetAnimation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetAnimationRate.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetBattleFlagBits.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetBattleFlagBits2.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetBattleInputButtons.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetBattleInputMask.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetBattleVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetEnemyTargetOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetGoalPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetGoalToFirstTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetGoalToHome.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetGoalToIndex.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetGoalToTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetHomePos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetIdleGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetIdleGoalToHome.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetJumpAnimations.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetOwnerID.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetOwnerTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartAlpha.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartDispOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartEventBits.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartEventFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartFlagBits.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartGoalToTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartJumpGravity.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartMoveSpeed.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartMovementVar.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartPos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartRotation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartRotationOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartScale.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartSounds.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartTargetFlagBits.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartTargetFlags.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SetPartYaw.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/ShowShockEffect.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/SummonEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/UseIdleAnimation.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/VanishActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/WaitForBuffDone.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/calc_player_damage_enemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/calc_player_test_enemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/count_targets.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/dispatch_damage_event_player.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/dispatch_damage_event_player_0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/dispatch_damage_event_player_1.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/dispatch_event_player.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/dispatch_event_player_continue_turn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80269E80.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80269EAC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026BF48.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026D51C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026D5A4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026D8EC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026D940.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026DA94.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026DEF0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026DF88.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E020.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E038.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E16C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E198.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E208.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E260.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E558.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E914.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026E9A0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026EA7C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026EB20.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026EBF8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026ED20.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026EDE4.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026F1A0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8026F60C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80271210.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80271258.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_802712A0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80271328.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_802713B0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_8027143C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80271484.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80271588.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80273444.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_802749D8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_802749F8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80274A18.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_802752AC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80275F00.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80276EFC.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/func_80276F1C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/get_actor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/get_nearest_home_index.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/set_actor_current_position.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/set_actor_home_position.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/set_goal_pos_to_part.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/set_part_absolute_position.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_197F40}/set_part_goal_to_actor_part.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/AfflictActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/BindHandleEvent.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/BindIdle.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/BindNextTurn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/BindTakeTurn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/ClearStatusEffects.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/CopyStatusEffects.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/DispatchDamageEvent.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/DispatchEvent.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/DropStarPoints.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/EnableActorBlur.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/EnableActorGlow.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/EnableIdleScript.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/EnemyDamageTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/EnemyFollowupAfflictTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/EnemyTestTarget.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/FallPartTo.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/FallToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/FlyPartTo.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/FlyToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetActorHP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetActorSize.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetCurrentActorType.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetEncounterState.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetEnemyMaxHP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetLastDamage.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetLastEvent.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/GetOriginalActorType.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/IdleFlyToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/IdleJumpToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/IdleRunToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/JumpPartTo.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/JumpToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/JumpToGoalSimple2.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/JumpWithBounce.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/LandJump.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/LandJumpPart.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/PauseTakeTurn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/RemoveActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/ResumeTakeTurn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/RunPartTo.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/RunToGoal.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetActorSize.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetDefenseTable.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetEnemyHP.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetIdleAnimations.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetPartSize.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetStatusTable.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetTargetActor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/SetTargetOffset.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/WasStatusInflicted.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/YieldTurn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/calc_enemy_damage_target.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/calc_enemy_test_target.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/dispatch_damage_event_actor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/dispatch_damage_event_actor_0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/dispatch_damage_event_actor_1.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/dispatch_event_actor.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/dispatch_event_general.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_80276F50.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_8027CC10.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_8027D2D8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_8027D32C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_8027D434.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_8027D4C8.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_8027D628.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/func_8027D75C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/play_hit_sound.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1A5830}/update_lerp_battle.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/DeletePartner.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/MakeOwnerTargetIndex.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/PartnerAfflictEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/PartnerDamageEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/PartnerPowerBounceEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/PartnerTestEnemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/calc_partner_damage_enemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/calc_partner_test_enemy.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/dispatch_damage_event_partner.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/dispatch_damage_event_partner_0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/dispatch_damage_event_partner_1.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/dispatch_event_partner.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/dispatch_event_partner_continue_turn.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/func_8027FC90.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/func_8028070C.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/func_802807D0.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AC760}/func_80280818.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AF120}/ActorAddMovePos.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AF120}/GetDamageIntensity.s (100%) rename asm/nonmatchings/{code_16c8e0 => code_1AF230}/LoadStarPowerScript.s (100%) create mode 100644 asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s create mode 100644 src/code_16F740.c create mode 100644 src/code_1776B0.c create mode 100644 src/code_17D6A0.c create mode 100644 src/code_17FEB0.c create mode 100644 src/code_181810.c create mode 100644 src/code_182B30.c create mode 100644 src/code_18C790.c create mode 100644 src/code_18F340.c create mode 100644 src/code_190B20.c create mode 100644 src/code_1967B0.c create mode 100644 src/code_196AA0.c create mode 100644 src/code_197F40.c create mode 100644 src/code_1A5830.c create mode 100644 src/code_1AC760.c create mode 100644 src/code_1AF120.c create mode 100644 src/code_1AF230.c diff --git a/asm/nonmatchings/code_16c8e0/DisablePartnerBlur.s b/asm/nonmatchings/code_16F740/DisablePartnerBlur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/DisablePartnerBlur.s rename to asm/nonmatchings/code_16F740/DisablePartnerBlur.s diff --git a/asm/nonmatchings/code_16c8e0/EnablePartnerBlur.s b/asm/nonmatchings/code_16F740/EnablePartnerBlur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnablePartnerBlur.s rename to asm/nonmatchings/code_16F740/EnablePartnerBlur.s diff --git a/asm/nonmatchings/code_16c8e0/begin_battle.s b/asm/nonmatchings/code_16F740/begin_battle.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/begin_battle.s rename to asm/nonmatchings/code_16F740/begin_battle.s diff --git a/asm/nonmatchings/code_16c8e0/end_battle.s b/asm/nonmatchings/code_16F740/end_battle.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/end_battle.s rename to asm/nonmatchings/code_16F740/end_battle.s diff --git a/asm/nonmatchings/code_16c8e0/func_80240E60.s b/asm/nonmatchings/code_16F740/func_80240E60.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80240E60.s rename to asm/nonmatchings/code_16F740/func_80240E60.s diff --git a/asm/nonmatchings/code_16c8e0/func_80240FDC.s b/asm/nonmatchings/code_16F740/func_80240FDC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80240FDC.s rename to asm/nonmatchings/code_16F740/func_80240FDC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80241190.s b/asm/nonmatchings/code_16F740/func_80241190.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80241190.s rename to asm/nonmatchings/code_16F740/func_80241190.s diff --git a/asm/nonmatchings/code_16c8e0/func_80241AB8.s b/asm/nonmatchings/code_16F740/func_80241AB8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80241AB8.s rename to asm/nonmatchings/code_16F740/func_80241AB8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80241B14.s b/asm/nonmatchings/code_16F740/func_80241B14.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80241B14.s rename to asm/nonmatchings/code_16F740/func_80241B14.s diff --git a/asm/nonmatchings/code_16c8e0/func_80242FE0.s b/asm/nonmatchings/code_16F740/func_80242FE0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80242FE0.s rename to asm/nonmatchings/code_16F740/func_80242FE0.s diff --git a/asm/nonmatchings/code_16c8e0/func_802439D8.s b/asm/nonmatchings/code_16F740/func_802439D8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802439D8.s rename to asm/nonmatchings/code_16F740/func_802439D8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80243FDC.s b/asm/nonmatchings/code_16F740/func_80243FDC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80243FDC.s rename to asm/nonmatchings/code_16F740/func_80243FDC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80244008.s b/asm/nonmatchings/code_16F740/func_80244008.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80244008.s rename to asm/nonmatchings/code_16F740/func_80244008.s diff --git a/asm/nonmatchings/code_16c8e0/func_80244710.s b/asm/nonmatchings/code_16F740/func_80244710.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80244710.s rename to asm/nonmatchings/code_16F740/func_80244710.s diff --git a/asm/nonmatchings/code_16c8e0/func_80244D90.s b/asm/nonmatchings/code_16F740/func_80244D90.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80244D90.s rename to asm/nonmatchings/code_16F740/func_80244D90.s diff --git a/asm/nonmatchings/code_16c8e0/func_80244E38.s b/asm/nonmatchings/code_16F740/func_80244E38.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80244E38.s rename to asm/nonmatchings/code_16F740/func_80244E38.s diff --git a/asm/nonmatchings/code_16c8e0/func_80245440.s b/asm/nonmatchings/code_16F740/func_80245440.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80245440.s rename to asm/nonmatchings/code_16F740/func_80245440.s diff --git a/asm/nonmatchings/code_16c8e0/func_80246B2C.s b/asm/nonmatchings/code_16F740/func_80246B2C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80246B2C.s rename to asm/nonmatchings/code_16F740/func_80246B2C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024721C.s b/asm/nonmatchings/code_16F740/func_8024721C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024721C.s rename to asm/nonmatchings/code_16F740/func_8024721C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80247B04.s b/asm/nonmatchings/code_16F740/func_80247B04.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80247B04.s rename to asm/nonmatchings/code_16F740/func_80247B04.s diff --git a/asm/nonmatchings/code_16c8e0/func_802480F0.s b/asm/nonmatchings/code_16F740/func_802480F0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802480F0.s rename to asm/nonmatchings/code_16F740/func_802480F0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80248190.s b/asm/nonmatchings/code_16F740/func_80248190.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80248190.s rename to asm/nonmatchings/code_16F740/func_80248190.s diff --git a/asm/nonmatchings/code_16c8e0/func_802485FC.s b/asm/nonmatchings/code_16F740/func_802485FC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802485FC.s rename to asm/nonmatchings/code_16F740/func_802485FC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80248660.s b/asm/nonmatchings/code_16F740/func_80248660.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80248660.s rename to asm/nonmatchings/code_16F740/func_80248660.s diff --git a/asm/nonmatchings/code_16c8e0/func_80248AA4.s b/asm/nonmatchings/code_16F740/func_80248AA4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80248AA4.s rename to asm/nonmatchings/code_16F740/func_80248AA4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80248B08.s b/asm/nonmatchings/code_16F740/func_80248B08.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80248B08.s rename to asm/nonmatchings/code_16F740/func_80248B08.s diff --git a/asm/nonmatchings/code_16c8e0/func_80248D78.s b/asm/nonmatchings/code_16F740/func_80248D78.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80248D78.s rename to asm/nonmatchings/code_16F740/func_80248D78.s diff --git a/asm/nonmatchings/code_16c8e0/pause_cleanup.s b/asm/nonmatchings/code_16F740/pause_cleanup.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/pause_cleanup.s rename to asm/nonmatchings/code_16F740/pause_cleanup.s diff --git a/asm/nonmatchings/code_16c8e0/switch_order.s b/asm/nonmatchings/code_16F740/switch_order.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/switch_order.s rename to asm/nonmatchings/code_16F740/switch_order.s diff --git a/asm/nonmatchings/code_16c8e0/switch_to_partner.s b/asm/nonmatchings/code_16F740/switch_to_partner.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/switch_to_partner.s rename to asm/nonmatchings/code_16F740/switch_to_partner.s diff --git a/asm/nonmatchings/code_16c8e0/switch_to_player.s b/asm/nonmatchings/code_16F740/switch_to_player.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/switch_to_player.s rename to asm/nonmatchings/code_16F740/switch_to_player.s diff --git a/asm/nonmatchings/code_16c8e0/update_end_player_turn.s b/asm/nonmatchings/code_16F740/update_end_player_turn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_end_player_turn.s rename to asm/nonmatchings/code_16F740/update_end_player_turn.s diff --git a/asm/nonmatchings/code_16c8e0/update_enemy_action.s b/asm/nonmatchings/code_16F740/update_enemy_action.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_enemy_action.s rename to asm/nonmatchings/code_16F740/update_enemy_action.s diff --git a/asm/nonmatchings/code_16c8e0/update_enemy_change_turn.s b/asm/nonmatchings/code_16F740/update_enemy_change_turn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_enemy_change_turn.s rename to asm/nonmatchings/code_16F740/update_enemy_change_turn.s diff --git a/asm/nonmatchings/code_16c8e0/update_heroes_start_turn.s b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_heroes_start_turn.s rename to asm/nonmatchings/code_16F740/update_heroes_start_turn.s diff --git a/asm/nonmatchings/code_16c8e0/update_partner_action.s b/asm/nonmatchings/code_16F740/update_partner_action.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_partner_action.s rename to asm/nonmatchings/code_16F740/update_partner_action.s diff --git a/asm/nonmatchings/code_16c8e0/update_player_action.s b/asm/nonmatchings/code_16F740/update_player_action.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_player_action.s rename to asm/nonmatchings/code_16F740/update_player_action.s diff --git a/asm/nonmatchings/code_16c8e0/update_player_change_turn.s b/asm/nonmatchings/code_16F740/update_player_change_turn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_player_change_turn.s rename to asm/nonmatchings/code_16F740/update_player_change_turn.s diff --git a/asm/nonmatchings/code_16c8e0/update_run_away.s b/asm/nonmatchings/code_16F740/update_run_away.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_run_away.s rename to asm/nonmatchings/code_16F740/update_run_away.s diff --git a/asm/nonmatchings/code_16c8e0/update_swap_partner.s b/asm/nonmatchings/code_16F740/update_swap_partner.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_swap_partner.s rename to asm/nonmatchings/code_16F740/update_swap_partner.s diff --git a/asm/nonmatchings/code_16c8e0/AddBattleCamOffsetZ.s b/asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddBattleCamOffsetZ.s rename to asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s diff --git a/asm/nonmatchings/code_16c8e0/AddBattleCamZoom.s b/asm/nonmatchings/code_1776B0/AddBattleCamZoom.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddBattleCamZoom.s rename to asm/nonmatchings/code_1776B0/AddBattleCamZoom.s diff --git a/asm/nonmatchings/code_16c8e0/BattleCamTargetActor.s b/asm/nonmatchings/code_1776B0/BattleCamTargetActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/BattleCamTargetActor.s rename to asm/nonmatchings/code_1776B0/BattleCamTargetActor.s diff --git a/asm/nonmatchings/code_16c8e0/FreezeBattleCam.s b/asm/nonmatchings/code_1776B0/FreezeBattleCam.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/FreezeBattleCam.s rename to asm/nonmatchings/code_1776B0/FreezeBattleCam.s diff --git a/asm/nonmatchings/code_16c8e0/MoveBattleCamOver.s b/asm/nonmatchings/code_1776B0/MoveBattleCamOver.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/MoveBattleCamOver.s rename to asm/nonmatchings/code_1776B0/MoveBattleCamOver.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamOffsetZ.s b/asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleCamOffsetZ.s rename to asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamTarget.s b/asm/nonmatchings/code_1776B0/SetBattleCamTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleCamTarget.s rename to asm/nonmatchings/code_1776B0/SetBattleCamTarget.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamYaw.s b/asm/nonmatchings/code_1776B0/SetBattleCamYaw.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleCamYaw.s rename to asm/nonmatchings/code_1776B0/SetBattleCamYaw.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamZoom.s b/asm/nonmatchings/code_1776B0/SetBattleCamZoom.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleCamZoom.s rename to asm/nonmatchings/code_1776B0/SetBattleCamZoom.s diff --git a/asm/nonmatchings/code_16c8e0/UseCamPreset.s b/asm/nonmatchings/code_1776B0/UseCamPreset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/UseCamPreset.s rename to asm/nonmatchings/code_1776B0/UseCamPreset.s diff --git a/asm/nonmatchings/code_16c8e0/add_cam_zoom.s b/asm/nonmatchings/code_1776B0/add_cam_zoom.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/add_cam_zoom.s rename to asm/nonmatchings/code_1776B0/add_cam_zoom.s diff --git a/asm/nonmatchings/code_16c8e0/cam_target_actor.s b/asm/nonmatchings/code_1776B0/cam_target_actor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/cam_target_actor.s rename to asm/nonmatchings/code_1776B0/cam_target_actor.s diff --git a/asm/nonmatchings/code_16c8e0/func_80248DD0.s b/asm/nonmatchings/code_1776B0/func_80248DD0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80248DD0.s rename to asm/nonmatchings/code_1776B0/func_80248DD0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80248DE4.s b/asm/nonmatchings/code_1776B0/func_80248DE4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80248DE4.s rename to asm/nonmatchings/code_1776B0/func_80248DE4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80249804.s b/asm/nonmatchings/code_1776B0/func_80249804.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80249804.s rename to asm/nonmatchings/code_1776B0/func_80249804.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024A214.s b/asm/nonmatchings/code_1776B0/func_8024A214.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024A214.s rename to asm/nonmatchings/code_1776B0/func_8024A214.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024A990.s b/asm/nonmatchings/code_1776B0/func_8024A990.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024A990.s rename to asm/nonmatchings/code_1776B0/func_8024A990.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024AFE4.s b/asm/nonmatchings/code_1776B0/func_8024AFE4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024AFE4.s rename to asm/nonmatchings/code_1776B0/func_8024AFE4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024B5FC.s b/asm/nonmatchings/code_1776B0/func_8024B5FC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024B5FC.s rename to asm/nonmatchings/code_1776B0/func_8024B5FC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024B9A0.s b/asm/nonmatchings/code_1776B0/func_8024B9A0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024B9A0.s rename to asm/nonmatchings/code_1776B0/func_8024B9A0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024BDA4.s b/asm/nonmatchings/code_1776B0/func_8024BDA4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024BDA4.s rename to asm/nonmatchings/code_1776B0/func_8024BDA4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024C180.s b/asm/nonmatchings/code_1776B0/func_8024C180.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024C180.s rename to asm/nonmatchings/code_1776B0/func_8024C180.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024C570.s b/asm/nonmatchings/code_1776B0/func_8024C570.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024C570.s rename to asm/nonmatchings/code_1776B0/func_8024C570.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024C944.s b/asm/nonmatchings/code_1776B0/func_8024C944.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024C944.s rename to asm/nonmatchings/code_1776B0/func_8024C944.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024CB68.s b/asm/nonmatchings/code_1776B0/func_8024CB68.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024CB68.s rename to asm/nonmatchings/code_1776B0/func_8024CB68.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024CE9C.s b/asm/nonmatchings/code_1776B0/func_8024CE9C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024CE9C.s rename to asm/nonmatchings/code_1776B0/func_8024CE9C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E3D8.s b/asm/nonmatchings/code_1776B0/func_8024E3D8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E3D8.s rename to asm/nonmatchings/code_1776B0/func_8024E3D8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E40C.s b/asm/nonmatchings/code_1776B0/func_8024E40C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E40C.s rename to asm/nonmatchings/code_1776B0/func_8024E40C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E45C.s b/asm/nonmatchings/code_1776B0/func_8024E45C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E45C.s rename to asm/nonmatchings/code_1776B0/func_8024E45C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E484.s b/asm/nonmatchings/code_1776B0/func_8024E484.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E484.s rename to asm/nonmatchings/code_1776B0/func_8024E484.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E554.s b/asm/nonmatchings/code_1776B0/func_8024E554.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E554.s rename to asm/nonmatchings/code_1776B0/func_8024E554.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E584.s b/asm/nonmatchings/code_1776B0/func_8024E584.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E584.s rename to asm/nonmatchings/code_1776B0/func_8024E584.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E60C.s b/asm/nonmatchings/code_1776B0/func_8024E60C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E60C.s rename to asm/nonmatchings/code_1776B0/func_8024E60C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E664.s b/asm/nonmatchings/code_1776B0/func_8024E664.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E664.s rename to asm/nonmatchings/code_1776B0/func_8024E664.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E6B4.s b/asm/nonmatchings/code_1776B0/func_8024E6B4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E6B4.s rename to asm/nonmatchings/code_1776B0/func_8024E6B4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E748.s b/asm/nonmatchings/code_1776B0/func_8024E748.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E748.s rename to asm/nonmatchings/code_1776B0/func_8024E748.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E820.s b/asm/nonmatchings/code_1776B0/func_8024E820.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E820.s rename to asm/nonmatchings/code_1776B0/func_8024E820.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024E9B0.s b/asm/nonmatchings/code_1776B0/func_8024E9B0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024E9B0.s rename to asm/nonmatchings/code_1776B0/func_8024E9B0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EB84.s b/asm/nonmatchings/code_1776B0/func_8024EB84.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EB84.s rename to asm/nonmatchings/code_1776B0/func_8024EB84.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024ECF8.s b/asm/nonmatchings/code_1776B0/func_8024ECF8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024ECF8.s rename to asm/nonmatchings/code_1776B0/func_8024ECF8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EDA4.s b/asm/nonmatchings/code_1776B0/func_8024EDA4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EDA4.s rename to asm/nonmatchings/code_1776B0/func_8024EDA4.s diff --git a/asm/nonmatchings/code_16c8e0/move_cam_over.s b/asm/nonmatchings/code_1776B0/move_cam_over.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/move_cam_over.s rename to asm/nonmatchings/code_1776B0/move_cam_over.s diff --git a/asm/nonmatchings/code_16c8e0/set_cam_target_pos.s b/asm/nonmatchings/code_1776B0/set_cam_target_pos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_cam_target_pos.s rename to asm/nonmatchings/code_1776B0/set_cam_target_pos.s diff --git a/asm/nonmatchings/code_16c8e0/set_cam_zoffset.s b/asm/nonmatchings/code_1776B0/set_cam_zoffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_cam_zoffset.s rename to asm/nonmatchings/code_1776B0/set_cam_zoffset.s diff --git a/asm/nonmatchings/code_16c8e0/set_cam_zoom.s b/asm/nonmatchings/code_1776B0/set_cam_zoom.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_cam_zoom.s rename to asm/nonmatchings/code_1776B0/set_cam_zoom.s diff --git a/asm/nonmatchings/code_16c8e0/unfreeze_cam.s b/asm/nonmatchings/code_1776B0/unfreeze_cam.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/unfreeze_cam.s rename to asm/nonmatchings/code_1776B0/unfreeze_cam.s diff --git a/asm/nonmatchings/code_16c8e0/use_cam_preset.s b/asm/nonmatchings/code_1776B0/use_cam_preset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/use_cam_preset.s rename to asm/nonmatchings/code_1776B0/use_cam_preset.s diff --git a/asm/nonmatchings/code_16c8e0/ForceCloseMessageBox.s b/asm/nonmatchings/code_17D6A0/ForceCloseMessageBox.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ForceCloseMessageBox.s rename to asm/nonmatchings/code_17D6A0/ForceCloseMessageBox.s diff --git a/asm/nonmatchings/code_16c8e0/IsMessageBoxDisplayed.s b/asm/nonmatchings/code_17D6A0/IsMessageBoxDisplayed.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/IsMessageBoxDisplayed.s rename to asm/nonmatchings/code_17D6A0/IsMessageBoxDisplayed.s diff --git a/asm/nonmatchings/code_16c8e0/SetMessageBoxDuration.s b/asm/nonmatchings/code_17D6A0/SetMessageBoxDuration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetMessageBoxDuration.s rename to asm/nonmatchings/code_17D6A0/SetMessageBoxDuration.s diff --git a/asm/nonmatchings/code_16c8e0/ShowMessageBox.s b/asm/nonmatchings/code_17D6A0/ShowMessageBox.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ShowMessageBox.s rename to asm/nonmatchings/code_17D6A0/ShowMessageBox.s diff --git a/asm/nonmatchings/code_16c8e0/ShowVariableMessageBox.s b/asm/nonmatchings/code_17D6A0/ShowVariableMessageBox.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ShowVariableMessageBox.s rename to asm/nonmatchings/code_17D6A0/ShowVariableMessageBox.s diff --git a/asm/nonmatchings/code_16c8e0/WaitForMessageBoxDone.s b/asm/nonmatchings/code_17D6A0/WaitForMessageBoxDone.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/WaitForMessageBoxDone.s rename to asm/nonmatchings/code_17D6A0/WaitForMessageBoxDone.s diff --git a/asm/nonmatchings/code_16c8e0/close_action_command_instruction_popup.s b/asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/close_action_command_instruction_popup.s rename to asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s diff --git a/asm/nonmatchings/code_16c8e0/create_popup.s b/asm/nonmatchings/code_17D6A0/create_popup.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/create_popup.s rename to asm/nonmatchings/code_17D6A0/create_popup.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EDC0.s b/asm/nonmatchings/code_17D6A0/func_8024EDC0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EDC0.s rename to asm/nonmatchings/code_17D6A0/func_8024EDC0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EDEC.s b/asm/nonmatchings/code_17D6A0/func_8024EDEC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EDEC.s rename to asm/nonmatchings/code_17D6A0/func_8024EDEC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EE48.s b/asm/nonmatchings/code_17D6A0/func_8024EE48.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EE48.s rename to asm/nonmatchings/code_17D6A0/func_8024EE48.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EEA8.s b/asm/nonmatchings/code_17D6A0/func_8024EEA8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EEA8.s rename to asm/nonmatchings/code_17D6A0/func_8024EEA8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EF08.s b/asm/nonmatchings/code_17D6A0/func_8024EF08.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EF08.s rename to asm/nonmatchings/code_17D6A0/func_8024EF08.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EFA4.s b/asm/nonmatchings/code_17D6A0/func_8024EFA4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EFA4.s rename to asm/nonmatchings/code_17D6A0/func_8024EFA4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024EFE0.s b/asm/nonmatchings/code_17D6A0/func_8024EFE0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024EFE0.s rename to asm/nonmatchings/code_17D6A0/func_8024EFE0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024F394.s b/asm/nonmatchings/code_17D6A0/func_8024F394.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024F394.s rename to asm/nonmatchings/code_17D6A0/func_8024F394.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024F5AC.s b/asm/nonmatchings/code_17D6A0/func_8024F5AC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024F5AC.s rename to asm/nonmatchings/code_17D6A0/func_8024F5AC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024F768.s b/asm/nonmatchings/code_17D6A0/func_8024F768.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024F768.s rename to asm/nonmatchings/code_17D6A0/func_8024F768.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024F7C8.s b/asm/nonmatchings/code_17D6A0/func_8024F7C8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024F7C8.s rename to asm/nonmatchings/code_17D6A0/func_8024F7C8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024F84C.s b/asm/nonmatchings/code_17D6A0/func_8024F84C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024F84C.s rename to asm/nonmatchings/code_17D6A0/func_8024F84C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024F940.s b/asm/nonmatchings/code_17D6A0/func_8024F940.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024F940.s rename to asm/nonmatchings/code_17D6A0/func_8024F940.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024FAE8.s b/asm/nonmatchings/code_17D6A0/func_8024FAE8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024FAE8.s rename to asm/nonmatchings/code_17D6A0/func_8024FAE8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024FAFC.s b/asm/nonmatchings/code_17D6A0/func_8024FAFC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024FAFC.s rename to asm/nonmatchings/code_17D6A0/func_8024FAFC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8024FB3C.s b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8024FB3C.s rename to asm/nonmatchings/code_17D6A0/func_8024FB3C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80250818.s b/asm/nonmatchings/code_17D6A0/func_80250818.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80250818.s rename to asm/nonmatchings/code_17D6A0/func_80250818.s diff --git a/asm/nonmatchings/code_16c8e0/func_80251434.s b/asm/nonmatchings/code_17D6A0/func_80251434.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80251434.s rename to asm/nonmatchings/code_17D6A0/func_80251434.s diff --git a/asm/nonmatchings/code_16c8e0/func_80251454.s b/asm/nonmatchings/code_17D6A0/func_80251454.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80251454.s rename to asm/nonmatchings/code_17D6A0/func_80251454.s diff --git a/asm/nonmatchings/code_16c8e0/func_80251474.s b/asm/nonmatchings/code_17D6A0/func_80251474.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80251474.s rename to asm/nonmatchings/code_17D6A0/func_80251474.s diff --git a/asm/nonmatchings/code_16c8e0/is_popup_displayed.s b/asm/nonmatchings/code_17D6A0/is_popup_displayed.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/is_popup_displayed.s rename to asm/nonmatchings/code_17D6A0/is_popup_displayed.s diff --git a/asm/nonmatchings/code_16c8e0/set_popup_duration.s b/asm/nonmatchings/code_17D6A0/set_popup_duration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_popup_duration.s rename to asm/nonmatchings/code_17D6A0/set_popup_duration.s diff --git a/asm/nonmatchings/code_16c8e0/show_battle_message.s b/asm/nonmatchings/code_17D6A0/show_battle_message.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/show_battle_message.s rename to asm/nonmatchings/code_17D6A0/show_battle_message.s diff --git a/asm/nonmatchings/code_16c8e0/show_message_popup.s b/asm/nonmatchings/code_17D6A0/show_message_popup.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/show_message_popup.s rename to asm/nonmatchings/code_17D6A0/show_message_popup.s diff --git a/asm/nonmatchings/code_16c8e0/show_variable_battle_message.s b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/show_variable_battle_message.s rename to asm/nonmatchings/code_17D6A0/show_variable_battle_message.s diff --git a/asm/nonmatchings/code_16c8e0/ItemAfflictEnemy.s b/asm/nonmatchings/code_17FEB0/ItemAfflictEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ItemAfflictEnemy.s rename to asm/nonmatchings/code_17FEB0/ItemAfflictEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/ItemCheckHit.s b/asm/nonmatchings/code_17FEB0/ItemCheckHit.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ItemCheckHit.s rename to asm/nonmatchings/code_17FEB0/ItemCheckHit.s diff --git a/asm/nonmatchings/code_16c8e0/ItemDamageEnemy.s b/asm/nonmatchings/code_17FEB0/ItemDamageEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ItemDamageEnemy.s rename to asm/nonmatchings/code_17FEB0/ItemDamageEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/calc_item_check_hit.s b/asm/nonmatchings/code_17FEB0/calc_item_check_hit.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_item_check_hit.s rename to asm/nonmatchings/code_17FEB0/calc_item_check_hit.s diff --git a/asm/nonmatchings/code_16c8e0/calc_item_damage_enemy.s b/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_item_damage_enemy.s rename to asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s diff --git a/asm/nonmatchings/code_16c8e0/func_80252B3C.s b/asm/nonmatchings/code_17FEB0/func_80252B3C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80252B3C.s rename to asm/nonmatchings/code_17FEB0/func_80252B3C.s diff --git a/asm/nonmatchings/code_16c8e0/ActorSpeak.s b/asm/nonmatchings/code_181810/ActorSpeak.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ActorSpeak.s rename to asm/nonmatchings/code_181810/ActorSpeak.s diff --git a/asm/nonmatchings/code_16c8e0/ApplyShrinkFromOwner.s b/asm/nonmatchings/code_181810/ApplyShrinkFromOwner.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ApplyShrinkFromOwner.s rename to asm/nonmatchings/code_181810/ApplyShrinkFromOwner.s diff --git a/asm/nonmatchings/code_16c8e0/EndActorSpeech.s b/asm/nonmatchings/code_181810/EndActorSpeech.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EndActorSpeech.s rename to asm/nonmatchings/code_181810/EndActorSpeech.s diff --git a/asm/nonmatchings/code_16c8e0/LoadBattleDmaData.s b/asm/nonmatchings/code_181810/LoadBattleDmaData.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LoadBattleDmaData.s rename to asm/nonmatchings/code_181810/LoadBattleDmaData.s diff --git a/asm/nonmatchings/code_16c8e0/MakeStatusField.s b/asm/nonmatchings/code_181810/MakeStatusField.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/MakeStatusField.s rename to asm/nonmatchings/code_181810/MakeStatusField.s diff --git a/asm/nonmatchings/code_16c8e0/MultiplyByActorScale.s b/asm/nonmatchings/code_181810/MultiplyByActorScale.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/MultiplyByActorScale.s rename to asm/nonmatchings/code_181810/MultiplyByActorScale.s diff --git a/asm/nonmatchings/code_16c8e0/MultiplyVec2ByActorScale.s b/asm/nonmatchings/code_181810/MultiplyVec2ByActorScale.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/MultiplyVec2ByActorScale.s rename to asm/nonmatchings/code_181810/MultiplyVec2ByActorScale.s diff --git a/asm/nonmatchings/code_16c8e0/MultiplyVec3ByActorScale.s b/asm/nonmatchings/code_181810/MultiplyVec3ByActorScale.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/MultiplyVec3ByActorScale.s rename to asm/nonmatchings/code_181810/MultiplyVec3ByActorScale.s diff --git a/asm/nonmatchings/code_16c8e0/OverrideBattleDmaDest.s b/asm/nonmatchings/code_181810/OverrideBattleDmaDest.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/OverrideBattleDmaDest.s rename to asm/nonmatchings/code_181810/OverrideBattleDmaDest.s diff --git a/asm/nonmatchings/code_16c8e0/PlayLoopingSoundAtActor.s b/asm/nonmatchings/code_181810/PlayLoopingSoundAtActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayLoopingSoundAtActor.s rename to asm/nonmatchings/code_181810/PlayLoopingSoundAtActor.s diff --git a/asm/nonmatchings/code_16c8e0/PlaySoundAtActor.s b/asm/nonmatchings/code_181810/PlaySoundAtActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlaySoundAtActor.s rename to asm/nonmatchings/code_181810/PlaySoundAtActor.s diff --git a/asm/nonmatchings/code_16c8e0/PlaySoundAtPart.s b/asm/nonmatchings/code_181810/PlaySoundAtPart.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlaySoundAtPart.s rename to asm/nonmatchings/code_181810/PlaySoundAtPart.s diff --git a/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisible.s b/asm/nonmatchings/code_181810/SetForegroundModelsVisible.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetForegroundModelsVisible.s rename to asm/nonmatchings/code_181810/SetForegroundModelsVisible.s diff --git a/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisibleUnchecked.s b/asm/nonmatchings/code_181810/SetForegroundModelsVisibleUnchecked.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetForegroundModelsVisibleUnchecked.s rename to asm/nonmatchings/code_181810/SetForegroundModelsVisibleUnchecked.s diff --git a/asm/nonmatchings/code_16c8e0/ShowBattleChoice.s b/asm/nonmatchings/code_181810/ShowBattleChoice.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ShowBattleChoice.s rename to asm/nonmatchings/code_181810/ShowBattleChoice.s diff --git a/asm/nonmatchings/code_16c8e0/StartRumble.s b/asm/nonmatchings/code_181810/StartRumble.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/StartRumble.s rename to asm/nonmatchings/code_181810/StartRumble.s diff --git a/asm/nonmatchings/code_16c8e0/StopLoopingSoundAtActor.s b/asm/nonmatchings/code_181810/StopLoopingSoundAtActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/StopLoopingSoundAtActor.s rename to asm/nonmatchings/code_181810/StopLoopingSoundAtActor.s diff --git a/asm/nonmatchings/code_16c8e0/func_802535B4.s b/asm/nonmatchings/code_181810/func_802535B4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802535B4.s rename to asm/nonmatchings/code_181810/func_802535B4.s diff --git a/asm/nonmatchings/code_16c8e0/func_802536A8.s b/asm/nonmatchings/code_181810/func_802536A8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802536A8.s rename to asm/nonmatchings/code_181810/func_802536A8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80253734.s b/asm/nonmatchings/code_181810/func_80253734.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80253734.s rename to asm/nonmatchings/code_181810/func_80253734.s diff --git a/asm/nonmatchings/code_16c8e0/func_802537C0.s b/asm/nonmatchings/code_181810/func_802537C0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802537C0.s rename to asm/nonmatchings/code_181810/func_802537C0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80253B30.s b/asm/nonmatchings/code_181810/func_80253B30.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80253B30.s rename to asm/nonmatchings/code_181810/func_80253B30.s diff --git a/asm/nonmatchings/code_16c8e0/func_80253FB0.s b/asm/nonmatchings/code_181810/func_80253FB0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80253FB0.s rename to asm/nonmatchings/code_181810/func_80253FB0.s diff --git a/asm/nonmatchings/code_16c8e0/is_actor_hp_bar_visible.s b/asm/nonmatchings/code_181810/is_actor_hp_bar_visible.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/is_actor_hp_bar_visible.s rename to asm/nonmatchings/code_181810/is_actor_hp_bar_visible.s diff --git a/asm/nonmatchings/code_16c8e0/is_actortype_hpbar_visible.s b/asm/nonmatchings/code_181810/is_actortype_hpbar_visible.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/is_actortype_hpbar_visible.s rename to asm/nonmatchings/code_181810/is_actortype_hpbar_visible.s diff --git a/asm/nonmatchings/code_16c8e0/load_tattle_flags.s b/asm/nonmatchings/code_181810/load_tattle_flags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/load_tattle_flags.s rename to asm/nonmatchings/code_181810/load_tattle_flags.s diff --git a/asm/nonmatchings/code_16c8e0/save_tattle_flags.s b/asm/nonmatchings/code_181810/save_tattle_flags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/save_tattle_flags.s rename to asm/nonmatchings/code_181810/save_tattle_flags.s diff --git a/asm/nonmatchings/code_16c8e0/_remove_part_decoration.s b/asm/nonmatchings/code_182B30/_remove_part_decoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/_remove_part_decoration.s rename to asm/nonmatchings/code_182B30/_remove_part_decoration.s diff --git a/asm/nonmatchings/code_16c8e0/disable_actor_blur.s b/asm/nonmatchings/code_182B30/disable_actor_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/disable_actor_blur.s rename to asm/nonmatchings/code_182B30/disable_actor_blur.s diff --git a/asm/nonmatchings/code_16c8e0/disable_partner_blur.s b/asm/nonmatchings/code_182B30/disable_partner_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/disable_partner_blur.s rename to asm/nonmatchings/code_182B30/disable_partner_blur.s diff --git a/asm/nonmatchings/code_16c8e0/disable_player_blur.s b/asm/nonmatchings/code_182B30/disable_player_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/disable_player_blur.s rename to asm/nonmatchings/code_182B30/disable_player_blur.s diff --git a/asm/nonmatchings/code_16c8e0/enable_actor_blur.s b/asm/nonmatchings/code_182B30/enable_actor_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/enable_actor_blur.s rename to asm/nonmatchings/code_182B30/enable_actor_blur.s diff --git a/asm/nonmatchings/code_16c8e0/enable_partner_blur.s b/asm/nonmatchings/code_182B30/enable_partner_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/enable_partner_blur.s rename to asm/nonmatchings/code_182B30/enable_partner_blur.s diff --git a/asm/nonmatchings/code_16c8e0/enable_player_blur.s b/asm/nonmatchings/code_182B30/enable_player_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/enable_player_blur.s rename to asm/nonmatchings/code_182B30/enable_player_blur.s diff --git a/asm/nonmatchings/code_16c8e0/func_80254250.s b/asm/nonmatchings/code_182B30/func_80254250.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80254250.s rename to asm/nonmatchings/code_182B30/func_80254250.s diff --git a/asm/nonmatchings/code_16c8e0/func_80254610.s b/asm/nonmatchings/code_182B30/func_80254610.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80254610.s rename to asm/nonmatchings/code_182B30/func_80254610.s diff --git a/asm/nonmatchings/code_16c8e0/func_802546B0.s b/asm/nonmatchings/code_182B30/func_802546B0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802546B0.s rename to asm/nonmatchings/code_182B30/func_802546B0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80254950.s b/asm/nonmatchings/code_182B30/func_80254950.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80254950.s rename to asm/nonmatchings/code_182B30/func_80254950.s diff --git a/asm/nonmatchings/code_16c8e0/func_802549A0.s b/asm/nonmatchings/code_182B30/func_802549A0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802549A0.s rename to asm/nonmatchings/code_182B30/func_802549A0.s diff --git a/asm/nonmatchings/code_16c8e0/func_802549C0.s b/asm/nonmatchings/code_182B30/func_802549C0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802549C0.s rename to asm/nonmatchings/code_182B30/func_802549C0.s diff --git a/asm/nonmatchings/code_16c8e0/func_802549F4.s b/asm/nonmatchings/code_182B30/func_802549F4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802549F4.s rename to asm/nonmatchings/code_182B30/func_802549F4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80254C50.s b/asm/nonmatchings/code_182B30/func_80254C50.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80254C50.s rename to asm/nonmatchings/code_182B30/func_80254C50.s diff --git a/asm/nonmatchings/code_16c8e0/func_802550BC.s b/asm/nonmatchings/code_182B30/func_802550BC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802550BC.s rename to asm/nonmatchings/code_182B30/func_802550BC.s diff --git a/asm/nonmatchings/code_16c8e0/func_802552EC.s b/asm/nonmatchings/code_182B30/func_802552EC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802552EC.s rename to asm/nonmatchings/code_182B30/func_802552EC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025593C.s b/asm/nonmatchings/code_182B30/func_8025593C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025593C.s rename to asm/nonmatchings/code_182B30/func_8025593C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025595C.s b/asm/nonmatchings/code_182B30/func_8025595C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025595C.s rename to asm/nonmatchings/code_182B30/func_8025595C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025597C.s b/asm/nonmatchings/code_182B30/func_8025597C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025597C.s rename to asm/nonmatchings/code_182B30/func_8025597C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025599C.s b/asm/nonmatchings/code_182B30/func_8025599C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025599C.s rename to asm/nonmatchings/code_182B30/func_8025599C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80255FE0.s b/asm/nonmatchings/code_182B30/func_80255FE0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80255FE0.s rename to asm/nonmatchings/code_182B30/func_80255FE0.s diff --git a/asm/nonmatchings/code_16c8e0/func_802571F0.s b/asm/nonmatchings/code_182B30/func_802571F0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802571F0.s rename to asm/nonmatchings/code_182B30/func_802571F0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80257B28.s b/asm/nonmatchings/code_182B30/func_80257B28.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80257B28.s rename to asm/nonmatchings/code_182B30/func_80257B28.s diff --git a/asm/nonmatchings/code_16c8e0/func_80257B48.s b/asm/nonmatchings/code_182B30/func_80257B48.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80257B48.s rename to asm/nonmatchings/code_182B30/func_80257B48.s diff --git a/asm/nonmatchings/code_16c8e0/func_80257B68.s b/asm/nonmatchings/code_182B30/func_80257B68.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80257B68.s rename to asm/nonmatchings/code_182B30/func_80257B68.s diff --git a/asm/nonmatchings/code_16c8e0/func_80257B88.s b/asm/nonmatchings/code_182B30/func_80257B88.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80257B88.s rename to asm/nonmatchings/code_182B30/func_80257B88.s diff --git a/asm/nonmatchings/code_16c8e0/func_80257DA4.s b/asm/nonmatchings/code_182B30/func_80257DA4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80257DA4.s rename to asm/nonmatchings/code_182B30/func_80257DA4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80258E14.s b/asm/nonmatchings/code_182B30/func_80258E14.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80258E14.s rename to asm/nonmatchings/code_182B30/func_80258E14.s diff --git a/asm/nonmatchings/code_16c8e0/func_802591EC.s b/asm/nonmatchings/code_182B30/func_802591EC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802591EC.s rename to asm/nonmatchings/code_182B30/func_802591EC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80259494.s b/asm/nonmatchings/code_182B30/func_80259494.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80259494.s rename to asm/nonmatchings/code_182B30/func_80259494.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025950C.s b/asm/nonmatchings/code_182B30/func_8025950C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025950C.s rename to asm/nonmatchings/code_182B30/func_8025950C.s diff --git a/asm/nonmatchings/code_16c8e0/func_802596C0.s b/asm/nonmatchings/code_182B30/func_802596C0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802596C0.s rename to asm/nonmatchings/code_182B30/func_802596C0.s diff --git a/asm/nonmatchings/code_16c8e0/func_802597B0.s b/asm/nonmatchings/code_182B30/func_802597B0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802597B0.s rename to asm/nonmatchings/code_182B30/func_802597B0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025995C.s b/asm/nonmatchings/code_182B30/func_8025995C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025995C.s rename to asm/nonmatchings/code_182B30/func_8025995C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80259A48.s b/asm/nonmatchings/code_182B30/func_80259A48.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80259A48.s rename to asm/nonmatchings/code_182B30/func_80259A48.s diff --git a/asm/nonmatchings/code_16c8e0/func_80259AAC.s b/asm/nonmatchings/code_182B30/func_80259AAC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80259AAC.s rename to asm/nonmatchings/code_182B30/func_80259AAC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80259D9C.s b/asm/nonmatchings/code_182B30/func_80259D9C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80259D9C.s rename to asm/nonmatchings/code_182B30/func_80259D9C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025A2C4.s b/asm/nonmatchings/code_182B30/func_8025A2C4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025A2C4.s rename to asm/nonmatchings/code_182B30/func_8025A2C4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025A50C.s b/asm/nonmatchings/code_182B30/func_8025A50C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025A50C.s rename to asm/nonmatchings/code_182B30/func_8025A50C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025A74C.s b/asm/nonmatchings/code_182B30/func_8025A74C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025A74C.s rename to asm/nonmatchings/code_182B30/func_8025A74C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025AA80.s b/asm/nonmatchings/code_182B30/func_8025AA80.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025AA80.s rename to asm/nonmatchings/code_182B30/func_8025AA80.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025AD90.s b/asm/nonmatchings/code_182B30/func_8025AD90.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025AD90.s rename to asm/nonmatchings/code_182B30/func_8025AD90.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025B1A8.s b/asm/nonmatchings/code_182B30/func_8025B1A8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025B1A8.s rename to asm/nonmatchings/code_182B30/func_8025B1A8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025B5C0.s b/asm/nonmatchings/code_182B30/func_8025B5C0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025B5C0.s rename to asm/nonmatchings/code_182B30/func_8025B5C0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025BAA0.s b/asm/nonmatchings/code_182B30/func_8025BAA0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025BAA0.s rename to asm/nonmatchings/code_182B30/func_8025BAA0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025C120.s b/asm/nonmatchings/code_182B30/func_8025C120.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025C120.s rename to asm/nonmatchings/code_182B30/func_8025C120.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025C840.s b/asm/nonmatchings/code_182B30/func_8025C840.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025C840.s rename to asm/nonmatchings/code_182B30/func_8025C840.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025C8A0.s b/asm/nonmatchings/code_182B30/func_8025C8A0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025C8A0.s rename to asm/nonmatchings/code_182B30/func_8025C8A0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025C918.s b/asm/nonmatchings/code_182B30/func_8025C918.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025C918.s rename to asm/nonmatchings/code_182B30/func_8025C918.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025CCC8.s b/asm/nonmatchings/code_182B30/func_8025CCC8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025CCC8.s rename to asm/nonmatchings/code_182B30/func_8025CCC8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025CD28.s b/asm/nonmatchings/code_182B30/func_8025CD28.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025CD28.s rename to asm/nonmatchings/code_182B30/func_8025CD28.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025CD40.s b/asm/nonmatchings/code_182B30/func_8025CD40.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025CD40.s rename to asm/nonmatchings/code_182B30/func_8025CD40.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025CEC8.s b/asm/nonmatchings/code_182B30/func_8025CEC8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025CEC8.s rename to asm/nonmatchings/code_182B30/func_8025CEC8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D160.s b/asm/nonmatchings/code_182B30/func_8025D160.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D160.s rename to asm/nonmatchings/code_182B30/func_8025D160.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D290.s b/asm/nonmatchings/code_182B30/func_8025D290.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D290.s rename to asm/nonmatchings/code_182B30/func_8025D290.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D2B0.s b/asm/nonmatchings/code_182B30/func_8025D2B0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D2B0.s rename to asm/nonmatchings/code_182B30/func_8025D2B0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D3CC.s b/asm/nonmatchings/code_182B30/func_8025D3CC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D3CC.s rename to asm/nonmatchings/code_182B30/func_8025D3CC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D4A0.s b/asm/nonmatchings/code_182B30/func_8025D4A0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D4A0.s rename to asm/nonmatchings/code_182B30/func_8025D4A0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D4C8.s b/asm/nonmatchings/code_182B30/func_8025D4C8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D4C8.s rename to asm/nonmatchings/code_182B30/func_8025D4C8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D620.s b/asm/nonmatchings/code_182B30/func_8025D620.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D620.s rename to asm/nonmatchings/code_182B30/func_8025D620.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D640.s b/asm/nonmatchings/code_182B30/func_8025D640.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D640.s rename to asm/nonmatchings/code_182B30/func_8025D640.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D6FC.s b/asm/nonmatchings/code_182B30/func_8025D6FC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D6FC.s rename to asm/nonmatchings/code_182B30/func_8025D6FC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D71C.s b/asm/nonmatchings/code_182B30/func_8025D71C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D71C.s rename to asm/nonmatchings/code_182B30/func_8025D71C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D810.s b/asm/nonmatchings/code_182B30/func_8025D810.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D810.s rename to asm/nonmatchings/code_182B30/func_8025D810.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D830.s b/asm/nonmatchings/code_182B30/func_8025D830.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D830.s rename to asm/nonmatchings/code_182B30/func_8025D830.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D8EC.s b/asm/nonmatchings/code_182B30/func_8025D8EC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D8EC.s rename to asm/nonmatchings/code_182B30/func_8025D8EC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025D90C.s b/asm/nonmatchings/code_182B30/func_8025D90C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025D90C.s rename to asm/nonmatchings/code_182B30/func_8025D90C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025DA68.s b/asm/nonmatchings/code_182B30/func_8025DA68.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025DA68.s rename to asm/nonmatchings/code_182B30/func_8025DA68.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025DBD0.s b/asm/nonmatchings/code_182B30/func_8025DBD0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025DBD0.s rename to asm/nonmatchings/code_182B30/func_8025DBD0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025DD40.s b/asm/nonmatchings/code_182B30/func_8025DD40.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025DD40.s rename to asm/nonmatchings/code_182B30/func_8025DD40.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025DD60.s b/asm/nonmatchings/code_182B30/func_8025DD60.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025DD60.s rename to asm/nonmatchings/code_182B30/func_8025DD60.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025DE88.s b/asm/nonmatchings/code_182B30/func_8025DE88.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025DE88.s rename to asm/nonmatchings/code_182B30/func_8025DE88.s diff --git a/asm/nonmatchings/code_16c8e0/mtx_mirror_y.s b/asm/nonmatchings/code_182B30/mtx_mirror_y.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/mtx_mirror_y.s rename to asm/nonmatchings/code_182B30/mtx_mirror_y.s diff --git a/asm/nonmatchings/code_16c8e0/reset_actor_blur.s b/asm/nonmatchings/code_182B30/reset_actor_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/reset_actor_blur.s rename to asm/nonmatchings/code_182B30/reset_actor_blur.s diff --git a/asm/nonmatchings/code_16c8e0/reset_partner_blur.s b/asm/nonmatchings/code_182B30/reset_partner_blur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/reset_partner_blur.s rename to asm/nonmatchings/code_182B30/reset_partner_blur.s diff --git a/asm/nonmatchings/code_16c8e0/update_actor_shadow.s b/asm/nonmatchings/code_182B30/update_actor_shadow.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_actor_shadow.s rename to asm/nonmatchings/code_182B30/update_actor_shadow.s diff --git a/asm/nonmatchings/code_16c8e0/update_enemy_shadows.s b/asm/nonmatchings/code_182B30/update_enemy_shadows.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_enemy_shadows.s rename to asm/nonmatchings/code_182B30/update_enemy_shadows.s diff --git a/asm/nonmatchings/code_16c8e0/update_hero_shadows.s b/asm/nonmatchings/code_182B30/update_hero_shadows.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_hero_shadows.s rename to asm/nonmatchings/code_182B30/update_hero_shadows.s diff --git a/asm/nonmatchings/code_16c8e0/update_player_actor_shadow.s b/asm/nonmatchings/code_182B30/update_player_actor_shadow.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_player_actor_shadow.s rename to asm/nonmatchings/code_182B30/update_player_actor_shadow.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025DEB0.s b/asm/nonmatchings/code_18C790/func_8025DEB0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025DEB0.s rename to asm/nonmatchings/code_18C790/func_8025DEB0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025DEC4.s b/asm/nonmatchings/code_18C790/func_8025DEC4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025DEC4.s rename to asm/nonmatchings/code_18C790/func_8025DEC4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025E030.s b/asm/nonmatchings/code_18C790/func_8025E030.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025E030.s rename to asm/nonmatchings/code_18C790/func_8025E030.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025E044.s b/asm/nonmatchings/code_18C790/func_8025E044.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025E044.s rename to asm/nonmatchings/code_18C790/func_8025E044.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025E108.s b/asm/nonmatchings/code_18C790/func_8025E108.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025E108.s rename to asm/nonmatchings/code_18C790/func_8025E108.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025E14C.s b/asm/nonmatchings/code_18C790/func_8025E14C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025E14C.s rename to asm/nonmatchings/code_18C790/func_8025E14C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025E190.s rename to asm/nonmatchings/code_18C790/func_8025E190.s diff --git a/asm/nonmatchings/code_16c8e0/func_8025FF8C.s b/asm/nonmatchings/code_18C790/func_8025FF8C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8025FF8C.s rename to asm/nonmatchings/code_18C790/func_8025FF8C.s diff --git a/asm/nonmatchings/code_16c8e0/func_802601BC.s b/asm/nonmatchings/code_18C790/func_802601BC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802601BC.s rename to asm/nonmatchings/code_18C790/func_802601BC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260948.s b/asm/nonmatchings/code_18C790/func_80260948.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260948.s rename to asm/nonmatchings/code_18C790/func_80260948.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260A20.s b/asm/nonmatchings/code_18C790/func_80260A20.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260A20.s rename to asm/nonmatchings/code_18C790/func_80260A20.s diff --git a/asm/nonmatchings/code_16c8e0/FXRecoverFP.s b/asm/nonmatchings/code_18F340/FXRecoverFP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/FXRecoverFP.s rename to asm/nonmatchings/code_18F340/FXRecoverFP.s diff --git a/asm/nonmatchings/code_16c8e0/FXRecoverHP.s b/asm/nonmatchings/code_18F340/FXRecoverHP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/FXRecoverHP.s rename to asm/nonmatchings/code_18F340/FXRecoverHP.s diff --git a/asm/nonmatchings/code_16c8e0/HasMerleeCastsLeft.s b/asm/nonmatchings/code_18F340/HasMerleeCastsLeft.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/HasMerleeCastsLeft.s rename to asm/nonmatchings/code_18F340/HasMerleeCastsLeft.s diff --git a/asm/nonmatchings/code_16c8e0/IncrementPlayerFP.s b/asm/nonmatchings/code_18F340/IncrementPlayerFP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/IncrementPlayerFP.s rename to asm/nonmatchings/code_18F340/IncrementPlayerFP.s diff --git a/asm/nonmatchings/code_16c8e0/IncrementPlayerHP.s b/asm/nonmatchings/code_18F340/IncrementPlayerHP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/IncrementPlayerHP.s rename to asm/nonmatchings/code_18F340/IncrementPlayerHP.s diff --git a/asm/nonmatchings/code_16c8e0/activate_defend_command.s b/asm/nonmatchings/code_18F340/activate_defend_command.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/activate_defend_command.s rename to asm/nonmatchings/code_18F340/activate_defend_command.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260A60.s b/asm/nonmatchings/code_18F340/func_80260A60.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260A60.s rename to asm/nonmatchings/code_18F340/func_80260A60.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260AD4.s b/asm/nonmatchings/code_18F340/func_80260AD4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260AD4.s rename to asm/nonmatchings/code_18F340/func_80260AD4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260B70.s b/asm/nonmatchings/code_18F340/func_80260B70.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260B70.s rename to asm/nonmatchings/code_18F340/func_80260B70.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260BF4.s b/asm/nonmatchings/code_18F340/func_80260BF4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260BF4.s rename to asm/nonmatchings/code_18F340/func_80260BF4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260DB8.s b/asm/nonmatchings/code_18F340/func_80260DB8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260DB8.s rename to asm/nonmatchings/code_18F340/func_80260DB8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260DD8.s b/asm/nonmatchings/code_18F340/func_80260DD8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260DD8.s rename to asm/nonmatchings/code_18F340/func_80260DD8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260E38.s b/asm/nonmatchings/code_18F340/func_80260E38.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260E38.s rename to asm/nonmatchings/code_18F340/func_80260E38.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260E5C.s b/asm/nonmatchings/code_18F340/func_80260E5C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260E5C.s rename to asm/nonmatchings/code_18F340/func_80260E5C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80260E90.s b/asm/nonmatchings/code_18F340/func_80260E90.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80260E90.s rename to asm/nonmatchings/code_18F340/func_80260E90.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261064.s b/asm/nonmatchings/code_18F340/func_80261064.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261064.s rename to asm/nonmatchings/code_18F340/func_80261064.s diff --git a/asm/nonmatchings/code_16c8e0/func_802610CC.s b/asm/nonmatchings/code_18F340/func_802610CC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802610CC.s rename to asm/nonmatchings/code_18F340/func_802610CC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261164.s b/asm/nonmatchings/code_18F340/func_80261164.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261164.s rename to asm/nonmatchings/code_18F340/func_80261164.s diff --git a/asm/nonmatchings/code_16c8e0/func_802611E8.s b/asm/nonmatchings/code_18F340/func_802611E8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802611E8.s rename to asm/nonmatchings/code_18F340/func_802611E8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026127C.s b/asm/nonmatchings/code_18F340/func_8026127C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026127C.s rename to asm/nonmatchings/code_18F340/func_8026127C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261388.s b/asm/nonmatchings/code_18F340/func_80261388.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261388.s rename to asm/nonmatchings/code_18F340/func_80261388.s diff --git a/asm/nonmatchings/code_16c8e0/func_802613A8.s b/asm/nonmatchings/code_18F340/func_802613A8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802613A8.s rename to asm/nonmatchings/code_18F340/func_802613A8.s diff --git a/asm/nonmatchings/code_16c8e0/func_802613BC.s b/asm/nonmatchings/code_18F340/func_802613BC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802613BC.s rename to asm/nonmatchings/code_18F340/func_802613BC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261478.s b/asm/nonmatchings/code_18F340/func_80261478.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261478.s rename to asm/nonmatchings/code_18F340/func_80261478.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261530.s b/asm/nonmatchings/code_18F340/func_80261530.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261530.s rename to asm/nonmatchings/code_18F340/func_80261530.s diff --git a/asm/nonmatchings/code_16c8e0/func_802615C8.s b/asm/nonmatchings/code_18F340/func_802615C8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802615C8.s rename to asm/nonmatchings/code_18F340/func_802615C8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261648.s b/asm/nonmatchings/code_18F340/func_80261648.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261648.s rename to asm/nonmatchings/code_18F340/func_80261648.s diff --git a/asm/nonmatchings/code_16c8e0/func_802616B4.s b/asm/nonmatchings/code_18F340/func_802616B4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802616B4.s rename to asm/nonmatchings/code_18F340/func_802616B4.s diff --git a/asm/nonmatchings/code_16c8e0/func_802616F4.s b/asm/nonmatchings/code_18F340/func_802616F4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802616F4.s rename to asm/nonmatchings/code_18F340/func_802616F4.s diff --git a/asm/nonmatchings/code_16c8e0/func_802619B4.s b/asm/nonmatchings/code_18F340/func_802619B4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802619B4.s rename to asm/nonmatchings/code_18F340/func_802619B4.s diff --git a/asm/nonmatchings/code_16c8e0/func_802619E8.s b/asm/nonmatchings/code_18F340/func_802619E8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802619E8.s rename to asm/nonmatchings/code_18F340/func_802619E8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261B40.s b/asm/nonmatchings/code_18F340/func_80261B40.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261B40.s rename to asm/nonmatchings/code_18F340/func_80261B40.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261D98.s b/asm/nonmatchings/code_18F340/func_80261D98.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261D98.s rename to asm/nonmatchings/code_18F340/func_80261D98.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261DD4.s b/asm/nonmatchings/code_18F340/func_80261DD4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261DD4.s rename to asm/nonmatchings/code_18F340/func_80261DD4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261DF4.s b/asm/nonmatchings/code_18F340/func_80261DF4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261DF4.s rename to asm/nonmatchings/code_18F340/func_80261DF4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80261FB4.s b/asm/nonmatchings/code_18F340/func_80261FB4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80261FB4.s rename to asm/nonmatchings/code_18F340/func_80261FB4.s diff --git a/asm/nonmatchings/code_16c8e0/func_802620F8.s b/asm/nonmatchings/code_18F340/func_802620F8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802620F8.s rename to asm/nonmatchings/code_18F340/func_802620F8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80262130.s b/asm/nonmatchings/code_18F340/func_80262130.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80262130.s rename to asm/nonmatchings/code_18F340/func_80262130.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026220C.s b/asm/nonmatchings/code_18F340/func_8026220C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026220C.s rename to asm/nonmatchings/code_18F340/func_8026220C.s diff --git a/asm/nonmatchings/code_16c8e0/StartRumbleWithParams.s b/asm/nonmatchings/code_190B20/StartRumbleWithParams.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/StartRumbleWithParams.s rename to asm/nonmatchings/code_190B20/StartRumbleWithParams.s diff --git a/asm/nonmatchings/code_16c8e0/add_actor_decoration.s b/asm/nonmatchings/code_190B20/add_actor_decoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/add_actor_decoration.s rename to asm/nonmatchings/code_190B20/add_actor_decoration.s diff --git a/asm/nonmatchings/code_16c8e0/add_part_decoration.s b/asm/nonmatchings/code_190B20/add_part_decoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/add_part_decoration.s rename to asm/nonmatchings/code_190B20/add_part_decoration.s diff --git a/asm/nonmatchings/code_16c8e0/add_xz_vec3f.s b/asm/nonmatchings/code_190B20/add_xz_vec3f.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/add_xz_vec3f.s rename to asm/nonmatchings/code_190B20/add_xz_vec3f.s diff --git a/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy1.s b/asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy1.s rename to asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s diff --git a/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy2.s b/asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy2.s rename to asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s diff --git a/asm/nonmatchings/code_16c8e0/count_power_plus.s b/asm/nonmatchings/code_190B20/count_power_plus.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/count_power_plus.s rename to asm/nonmatchings/code_190B20/count_power_plus.s diff --git a/asm/nonmatchings/code_16c8e0/create_actor.s b/asm/nonmatchings/code_190B20/create_actor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/create_actor.s rename to asm/nonmatchings/code_190B20/create_actor.s diff --git a/asm/nonmatchings/code_16c8e0/create_part_shadow.s b/asm/nonmatchings/code_190B20/create_part_shadow.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/create_part_shadow.s rename to asm/nonmatchings/code_190B20/create_part_shadow.s diff --git a/asm/nonmatchings/code_16c8e0/create_target_list.s b/asm/nonmatchings/code_190B20/create_target_list.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/create_target_list.s rename to asm/nonmatchings/code_190B20/create_target_list.s diff --git a/asm/nonmatchings/code_16c8e0/deduct_current_move_fp.s b/asm/nonmatchings/code_190B20/deduct_current_move_fp.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/deduct_current_move_fp.s rename to asm/nonmatchings/code_190B20/deduct_current_move_fp.s diff --git a/asm/nonmatchings/code_16c8e0/enemy_create_target_list.s b/asm/nonmatchings/code_190B20/enemy_create_target_list.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/enemy_create_target_list.s rename to asm/nonmatchings/code_190B20/enemy_create_target_list.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263064.s b/asm/nonmatchings/code_190B20/func_80263064.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263064.s rename to asm/nonmatchings/code_190B20/func_80263064.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263230.s b/asm/nonmatchings/code_190B20/func_80263230.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263230.s rename to asm/nonmatchings/code_190B20/func_80263230.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026324C.s b/asm/nonmatchings/code_190B20/func_8026324C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026324C.s rename to asm/nonmatchings/code_190B20/func_8026324C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263268.s b/asm/nonmatchings/code_190B20/func_80263268.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263268.s rename to asm/nonmatchings/code_190B20/func_80263268.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263300.s b/asm/nonmatchings/code_190B20/func_80263300.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263300.s rename to asm/nonmatchings/code_190B20/func_80263300.s diff --git a/asm/nonmatchings/code_16c8e0/func_802633E8.s b/asm/nonmatchings/code_190B20/func_802633E8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802633E8.s rename to asm/nonmatchings/code_190B20/func_802633E8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263434.s b/asm/nonmatchings/code_190B20/func_80263434.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263434.s rename to asm/nonmatchings/code_190B20/func_80263434.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263464.s b/asm/nonmatchings/code_190B20/func_80263464.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263464.s rename to asm/nonmatchings/code_190B20/func_80263464.s diff --git a/asm/nonmatchings/code_16c8e0/func_802634B8.s b/asm/nonmatchings/code_190B20/func_802634B8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802634B8.s rename to asm/nonmatchings/code_190B20/func_802634B8.s diff --git a/asm/nonmatchings/code_16c8e0/func_802636E4.s b/asm/nonmatchings/code_190B20/func_802636E4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802636E4.s rename to asm/nonmatchings/code_190B20/func_802636E4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263914.s b/asm/nonmatchings/code_190B20/func_80263914.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263914.s rename to asm/nonmatchings/code_190B20/func_80263914.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263C60.s b/asm/nonmatchings/code_190B20/func_80263C60.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263C60.s rename to asm/nonmatchings/code_190B20/func_80263C60.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263CC4.s b/asm/nonmatchings/code_190B20/func_80263CC4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263CC4.s rename to asm/nonmatchings/code_190B20/func_80263CC4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263E08.s b/asm/nonmatchings/code_190B20/func_80263E08.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263E08.s rename to asm/nonmatchings/code_190B20/func_80263E08.s diff --git a/asm/nonmatchings/code_16c8e0/func_80263FE8.s b/asm/nonmatchings/code_190B20/func_80263FE8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80263FE8.s rename to asm/nonmatchings/code_190B20/func_80263FE8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80264084.s b/asm/nonmatchings/code_190B20/func_80264084.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80264084.s rename to asm/nonmatchings/code_190B20/func_80264084.s diff --git a/asm/nonmatchings/code_16c8e0/func_80265CE8.s b/asm/nonmatchings/code_190B20/func_80265CE8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80265CE8.s rename to asm/nonmatchings/code_190B20/func_80265CE8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80265D44.s b/asm/nonmatchings/code_190B20/func_80265D44.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80265D44.s rename to asm/nonmatchings/code_190B20/func_80265D44.s diff --git a/asm/nonmatchings/code_16c8e0/func_802664DC.s b/asm/nonmatchings/code_190B20/func_802664DC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802664DC.s rename to asm/nonmatchings/code_190B20/func_802664DC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266684.s b/asm/nonmatchings/code_190B20/func_80266684.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266684.s rename to asm/nonmatchings/code_190B20/func_80266684.s diff --git a/asm/nonmatchings/code_16c8e0/func_802666E4.s b/asm/nonmatchings/code_190B20/func_802666E4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802666E4.s rename to asm/nonmatchings/code_190B20/func_802666E4.s diff --git a/asm/nonmatchings/code_16c8e0/func_802667F0.s b/asm/nonmatchings/code_190B20/func_802667F0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802667F0.s rename to asm/nonmatchings/code_190B20/func_802667F0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266970.s b/asm/nonmatchings/code_190B20/func_80266970.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266970.s rename to asm/nonmatchings/code_190B20/func_80266970.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266978.s b/asm/nonmatchings/code_190B20/func_80266978.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266978.s rename to asm/nonmatchings/code_190B20/func_80266978.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266ADC.s b/asm/nonmatchings/code_190B20/func_80266ADC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266ADC.s rename to asm/nonmatchings/code_190B20/func_80266ADC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266AF8.s b/asm/nonmatchings/code_190B20/func_80266AF8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266AF8.s rename to asm/nonmatchings/code_190B20/func_80266AF8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266B14.s b/asm/nonmatchings/code_190B20/func_80266B14.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266B14.s rename to asm/nonmatchings/code_190B20/func_80266B14.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266D6C.s b/asm/nonmatchings/code_190B20/func_80266D6C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266D6C.s rename to asm/nonmatchings/code_190B20/func_80266D6C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266DAC.s b/asm/nonmatchings/code_190B20/func_80266DAC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266DAC.s rename to asm/nonmatchings/code_190B20/func_80266DAC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266E14.s b/asm/nonmatchings/code_190B20/func_80266E14.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266E14.s rename to asm/nonmatchings/code_190B20/func_80266E14.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266E40.s b/asm/nonmatchings/code_190B20/func_80266E40.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266E40.s rename to asm/nonmatchings/code_190B20/func_80266E40.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266EA8.s b/asm/nonmatchings/code_190B20/func_80266EA8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266EA8.s rename to asm/nonmatchings/code_190B20/func_80266EA8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266EE8.s b/asm/nonmatchings/code_190B20/func_80266EE8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266EE8.s rename to asm/nonmatchings/code_190B20/func_80266EE8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266F60.s b/asm/nonmatchings/code_190B20/func_80266F60.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266F60.s rename to asm/nonmatchings/code_190B20/func_80266F60.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266F8C.s b/asm/nonmatchings/code_190B20/func_80266F8C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266F8C.s rename to asm/nonmatchings/code_190B20/func_80266F8C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80266FD8.s b/asm/nonmatchings/code_190B20/func_80266FD8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80266FD8.s rename to asm/nonmatchings/code_190B20/func_80266FD8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80267018.s b/asm/nonmatchings/code_190B20/func_80267018.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80267018.s rename to asm/nonmatchings/code_190B20/func_80267018.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026709C.s b/asm/nonmatchings/code_190B20/func_8026709C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026709C.s rename to asm/nonmatchings/code_190B20/func_8026709C.s diff --git a/asm/nonmatchings/code_16c8e0/func_802670C8.s b/asm/nonmatchings/code_190B20/func_802670C8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802670C8.s rename to asm/nonmatchings/code_190B20/func_802670C8.s diff --git a/asm/nonmatchings/code_16c8e0/func_802673E4.s b/asm/nonmatchings/code_190B20/func_802673E4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802673E4.s rename to asm/nonmatchings/code_190B20/func_802673E4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026777C.s b/asm/nonmatchings/code_190B20/func_8026777C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026777C.s rename to asm/nonmatchings/code_190B20/func_8026777C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026787C.s b/asm/nonmatchings/code_190B20/func_8026787C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026787C.s rename to asm/nonmatchings/code_190B20/func_8026787C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80267A3C.s b/asm/nonmatchings/code_190B20/func_80267A3C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80267A3C.s rename to asm/nonmatchings/code_190B20/func_80267A3C.s diff --git a/asm/nonmatchings/code_16c8e0/get_actor_part.s b/asm/nonmatchings/code_190B20/get_actor_part.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/get_actor_part.s rename to asm/nonmatchings/code_190B20/get_actor_part.s diff --git a/asm/nonmatchings/code_16c8e0/get_defense.s b/asm/nonmatchings/code_190B20/get_defense.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/get_defense.s rename to asm/nonmatchings/code_190B20/get_defense.s diff --git a/asm/nonmatchings/code_16c8e0/heroes_is_ability_active.s b/asm/nonmatchings/code_190B20/heroes_is_ability_active.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/heroes_is_ability_active.s rename to asm/nonmatchings/code_190B20/heroes_is_ability_active.s diff --git a/asm/nonmatchings/code_16c8e0/hide_foreground_models.s b/asm/nonmatchings/code_190B20/hide_foreground_models.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/hide_foreground_models.s rename to asm/nonmatchings/code_190B20/hide_foreground_models.s diff --git a/asm/nonmatchings/code_16c8e0/hide_foreground_models_unchecked.s b/asm/nonmatchings/code_190B20/hide_foreground_models_unchecked.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/hide_foreground_models_unchecked.s rename to asm/nonmatchings/code_190B20/hide_foreground_models_unchecked.s diff --git a/asm/nonmatchings/code_16c8e0/inflict_partner_ko.s b/asm/nonmatchings/code_190B20/inflict_partner_ko.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/inflict_partner_ko.s rename to asm/nonmatchings/code_190B20/inflict_partner_ko.s diff --git a/asm/nonmatchings/code_16c8e0/inflict_status.s b/asm/nonmatchings/code_190B20/inflict_status.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/inflict_status.s rename to asm/nonmatchings/code_190B20/inflict_status.s diff --git a/asm/nonmatchings/code_16c8e0/inflict_status_set_duration.s b/asm/nonmatchings/code_190B20/inflict_status_set_duration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/inflict_status_set_duration.s rename to asm/nonmatchings/code_190B20/inflict_status_set_duration.s diff --git a/asm/nonmatchings/code_16c8e0/load_partner_actor.s b/asm/nonmatchings/code_190B20/load_partner_actor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/load_partner_actor.s rename to asm/nonmatchings/code_190B20/load_partner_actor.s diff --git a/asm/nonmatchings/code_16c8e0/load_player_actor.s b/asm/nonmatchings/code_190B20/load_player_actor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/load_player_actor.s rename to asm/nonmatchings/code_190B20/load_player_actor.s diff --git a/asm/nonmatchings/code_16c8e0/lookup_defense.s b/asm/nonmatchings/code_190B20/lookup_defense.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/lookup_defense.s rename to asm/nonmatchings/code_190B20/lookup_defense.s diff --git a/asm/nonmatchings/code_16c8e0/lookup_status_chance.s b/asm/nonmatchings/code_190B20/lookup_status_chance.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/lookup_status_chance.s rename to asm/nonmatchings/code_190B20/lookup_status_chance.s diff --git a/asm/nonmatchings/code_16c8e0/lookup_status_duration_mod.s b/asm/nonmatchings/code_190B20/lookup_status_duration_mod.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/lookup_status_duration_mod.s rename to asm/nonmatchings/code_190B20/lookup_status_duration_mod.s diff --git a/asm/nonmatchings/code_16c8e0/play_movement_dust_effects.s b/asm/nonmatchings/code_190B20/play_movement_dust_effects.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/play_movement_dust_effects.s rename to asm/nonmatchings/code_190B20/play_movement_dust_effects.s diff --git a/asm/nonmatchings/code_16c8e0/player_create_target_list.s b/asm/nonmatchings/code_190B20/player_create_target_list.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/player_create_target_list.s rename to asm/nonmatchings/code_190B20/player_create_target_list.s diff --git a/asm/nonmatchings/code_16c8e0/remove_actor_decoration.s b/asm/nonmatchings/code_190B20/remove_actor_decoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/remove_actor_decoration.s rename to asm/nonmatchings/code_190B20/remove_actor_decoration.s diff --git a/asm/nonmatchings/code_16c8e0/remove_part_decoration.s b/asm/nonmatchings/code_190B20/remove_part_decoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/remove_part_decoration.s rename to asm/nonmatchings/code_190B20/remove_part_decoration.s diff --git a/asm/nonmatchings/code_16c8e0/remove_part_shadow.s b/asm/nonmatchings/code_190B20/remove_part_shadow.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/remove_part_shadow.s rename to asm/nonmatchings/code_190B20/remove_part_shadow.s diff --git a/asm/nonmatchings/code_16c8e0/remove_player_buffs.s b/asm/nonmatchings/code_190B20/remove_player_buffs.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/remove_player_buffs.s rename to asm/nonmatchings/code_190B20/remove_player_buffs.s diff --git a/asm/nonmatchings/code_16c8e0/reset_all_actor_sounds.s b/asm/nonmatchings/code_190B20/reset_all_actor_sounds.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/reset_all_actor_sounds.s rename to asm/nonmatchings/code_190B20/reset_all_actor_sounds.s diff --git a/asm/nonmatchings/code_16c8e0/set_actor_yaw.s b/asm/nonmatchings/code_190B20/set_actor_yaw.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_actor_yaw.s rename to asm/nonmatchings/code_190B20/set_actor_yaw.s diff --git a/asm/nonmatchings/code_16c8e0/set_animation.s b/asm/nonmatchings/code_190B20/set_animation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_animation.s rename to asm/nonmatchings/code_190B20/set_animation.s diff --git a/asm/nonmatchings/code_16c8e0/set_animation_rate.s b/asm/nonmatchings/code_190B20/set_animation_rate.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_animation_rate.s rename to asm/nonmatchings/code_190B20/set_animation_rate.s diff --git a/asm/nonmatchings/code_16c8e0/set_part_yaw.s b/asm/nonmatchings/code_190B20/set_part_yaw.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_part_yaw.s rename to asm/nonmatchings/code_190B20/set_part_yaw.s diff --git a/asm/nonmatchings/code_16c8e0/show_damage_popup.s b/asm/nonmatchings/code_190B20/show_damage_popup.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/show_damage_popup.s rename to asm/nonmatchings/code_190B20/show_damage_popup.s diff --git a/asm/nonmatchings/code_16c8e0/show_foreground_models.s b/asm/nonmatchings/code_190B20/show_foreground_models.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/show_foreground_models.s rename to asm/nonmatchings/code_190B20/show_foreground_models.s diff --git a/asm/nonmatchings/code_16c8e0/show_foreground_models_unchecked.s b/asm/nonmatchings/code_190B20/show_foreground_models_unchecked.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/show_foreground_models_unchecked.s rename to asm/nonmatchings/code_190B20/show_foreground_models_unchecked.s diff --git a/asm/nonmatchings/code_16c8e0/start_rumble_type.s b/asm/nonmatchings/code_190B20/start_rumble_type.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/start_rumble_type.s rename to asm/nonmatchings/code_190B20/start_rumble_type.s diff --git a/asm/nonmatchings/code_16c8e0/try_inflict_status.s b/asm/nonmatchings/code_190B20/try_inflict_status.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/try_inflict_status.s rename to asm/nonmatchings/code_190B20/try_inflict_status.s diff --git a/asm/nonmatchings/code_16c8e0/LoadFreeItemScript.s b/asm/nonmatchings/code_1967B0/LoadFreeItemScript.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LoadFreeItemScript.s rename to asm/nonmatchings/code_1967B0/LoadFreeItemScript.s diff --git a/asm/nonmatchings/code_16c8e0/LoadItemScript.s b/asm/nonmatchings/code_1967B0/LoadItemScript.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LoadItemScript.s rename to asm/nonmatchings/code_1967B0/LoadItemScript.s diff --git a/asm/nonmatchings/code_16c8e0/LoadMoveScript.s b/asm/nonmatchings/code_1967B0/LoadMoveScript.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LoadMoveScript.s rename to asm/nonmatchings/code_1967B0/LoadMoveScript.s diff --git a/asm/nonmatchings/code_16c8e0/CloseActionCommandInfo.s b/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CloseActionCommandInfo.s rename to asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s diff --git a/asm/nonmatchings/code_16c8e0/GetActionSuccess.s b/asm/nonmatchings/code_196AA0/GetActionSuccess.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActionSuccess.s rename to asm/nonmatchings/code_196AA0/GetActionSuccess.s diff --git a/asm/nonmatchings/code_16c8e0/GetActionSuccessCopy.s b/asm/nonmatchings/code_196AA0/GetActionSuccessCopy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActionSuccessCopy.s rename to asm/nonmatchings/code_196AA0/GetActionSuccessCopy.s diff --git a/asm/nonmatchings/code_16c8e0/GetBlockResult.s b/asm/nonmatchings/code_196AA0/GetBlockResult.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetBlockResult.s rename to asm/nonmatchings/code_196AA0/GetBlockResult.s diff --git a/asm/nonmatchings/code_16c8e0/LoadActionCommand.s b/asm/nonmatchings/code_196AA0/LoadActionCommand.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LoadActionCommand.s rename to asm/nonmatchings/code_196AA0/LoadActionCommand.s diff --git a/asm/nonmatchings/code_16c8e0/SetActionSuccess.s b/asm/nonmatchings/code_196AA0/SetActionSuccess.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActionSuccess.s rename to asm/nonmatchings/code_196AA0/SetActionSuccess.s diff --git a/asm/nonmatchings/code_16c8e0/check_block_input.s b/asm/nonmatchings/code_196AA0/check_block_input.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/check_block_input.s rename to asm/nonmatchings/code_196AA0/check_block_input.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268224.s b/asm/nonmatchings/code_196AA0/func_80268224.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268224.s rename to asm/nonmatchings/code_196AA0/func_80268224.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268284.s b/asm/nonmatchings/code_196AA0/func_80268284.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268284.s rename to asm/nonmatchings/code_196AA0/func_80268284.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268770.s b/asm/nonmatchings/code_196AA0/func_80268770.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268770.s rename to asm/nonmatchings/code_196AA0/func_80268770.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268798.s b/asm/nonmatchings/code_196AA0/func_80268798.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268798.s rename to asm/nonmatchings/code_196AA0/func_80268798.s diff --git a/asm/nonmatchings/code_16c8e0/func_802687BC.s b/asm/nonmatchings/code_196AA0/func_802687BC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802687BC.s rename to asm/nonmatchings/code_196AA0/func_802687BC.s diff --git a/asm/nonmatchings/code_16c8e0/func_802687E4.s b/asm/nonmatchings/code_196AA0/func_802687E4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802687E4.s rename to asm/nonmatchings/code_196AA0/func_802687E4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026880C.s b/asm/nonmatchings/code_196AA0/func_8026880C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026880C.s rename to asm/nonmatchings/code_196AA0/func_8026880C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268834.s b/asm/nonmatchings/code_196AA0/func_80268834.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268834.s rename to asm/nonmatchings/code_196AA0/func_80268834.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268858.s b/asm/nonmatchings/code_196AA0/func_80268858.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268858.s rename to asm/nonmatchings/code_196AA0/func_80268858.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268938.s b/asm/nonmatchings/code_196AA0/func_80268938.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268938.s rename to asm/nonmatchings/code_196AA0/func_80268938.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268AF8.s b/asm/nonmatchings/code_196AA0/func_80268AF8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268AF8.s rename to asm/nonmatchings/code_196AA0/func_80268AF8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268C9C.s b/asm/nonmatchings/code_196AA0/func_80268C9C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268C9C.s rename to asm/nonmatchings/code_196AA0/func_80268C9C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80268E88.s b/asm/nonmatchings/code_196AA0/func_80268E88.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80268E88.s rename to asm/nonmatchings/code_196AA0/func_80268E88.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269118.s b/asm/nonmatchings/code_196AA0/func_80269118.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269118.s rename to asm/nonmatchings/code_196AA0/func_80269118.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269160.s b/asm/nonmatchings/code_196AA0/func_80269160.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269160.s rename to asm/nonmatchings/code_196AA0/func_80269160.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026919C.s b/asm/nonmatchings/code_196AA0/func_8026919C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026919C.s rename to asm/nonmatchings/code_196AA0/func_8026919C.s diff --git a/asm/nonmatchings/code_16c8e0/func_802691C8.s b/asm/nonmatchings/code_196AA0/func_802691C8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802691C8.s rename to asm/nonmatchings/code_196AA0/func_802691C8.s diff --git a/asm/nonmatchings/code_16c8e0/func_802692EC.s b/asm/nonmatchings/code_196AA0/func_802692EC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802692EC.s rename to asm/nonmatchings/code_196AA0/func_802692EC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269318.s b/asm/nonmatchings/code_196AA0/func_80269318.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269318.s rename to asm/nonmatchings/code_196AA0/func_80269318.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269344.s b/asm/nonmatchings/code_196AA0/func_80269344.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269344.s rename to asm/nonmatchings/code_196AA0/func_80269344.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269370.s b/asm/nonmatchings/code_196AA0/func_80269370.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269370.s rename to asm/nonmatchings/code_196AA0/func_80269370.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026939C.s b/asm/nonmatchings/code_196AA0/func_8026939C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026939C.s rename to asm/nonmatchings/code_196AA0/func_8026939C.s diff --git a/asm/nonmatchings/code_16c8e0/func_802693F0.s b/asm/nonmatchings/code_196AA0/func_802693F0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802693F0.s rename to asm/nonmatchings/code_196AA0/func_802693F0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269470.s b/asm/nonmatchings/code_196AA0/func_80269470.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269470.s rename to asm/nonmatchings/code_196AA0/func_80269470.s diff --git a/asm/nonmatchings/code_16c8e0/func_802694A4.s b/asm/nonmatchings/code_196AA0/func_802694A4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802694A4.s rename to asm/nonmatchings/code_196AA0/func_802694A4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269524.s b/asm/nonmatchings/code_196AA0/func_80269524.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269524.s rename to asm/nonmatchings/code_196AA0/func_80269524.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269550.s b/asm/nonmatchings/code_196AA0/func_80269550.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269550.s rename to asm/nonmatchings/code_196AA0/func_80269550.s diff --git a/asm/nonmatchings/code_16c8e0/func_802695A8.s b/asm/nonmatchings/code_196AA0/func_802695A8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802695A8.s rename to asm/nonmatchings/code_196AA0/func_802695A8.s diff --git a/asm/nonmatchings/code_16c8e0/func_802695D4.s b/asm/nonmatchings/code_196AA0/func_802695D4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802695D4.s rename to asm/nonmatchings/code_196AA0/func_802695D4.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269600.s b/asm/nonmatchings/code_196AA0/func_80269600.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269600.s rename to asm/nonmatchings/code_196AA0/func_80269600.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026962C.s b/asm/nonmatchings/code_196AA0/func_8026962C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026962C.s rename to asm/nonmatchings/code_196AA0/func_8026962C.s diff --git a/asm/nonmatchings/code_16c8e0/AddActorDecoration.s b/asm/nonmatchings/code_197F40/AddActorDecoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddActorDecoration.s rename to asm/nonmatchings/code_197F40/AddActorDecoration.s diff --git a/asm/nonmatchings/code_16c8e0/AddActorPos.s b/asm/nonmatchings/code_197F40/AddActorPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddActorPos.s rename to asm/nonmatchings/code_197F40/AddActorPos.s diff --git a/asm/nonmatchings/code_16c8e0/AddActorVar.s b/asm/nonmatchings/code_197F40/AddActorVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddActorVar.s rename to asm/nonmatchings/code_197F40/AddActorVar.s diff --git a/asm/nonmatchings/code_16c8e0/AddGoalPos.s b/asm/nonmatchings/code_197F40/AddGoalPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddGoalPos.s rename to asm/nonmatchings/code_197F40/AddGoalPos.s diff --git a/asm/nonmatchings/code_16c8e0/AddPartDispOffset.s b/asm/nonmatchings/code_197F40/AddPartDispOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddPartDispOffset.s rename to asm/nonmatchings/code_197F40/AddPartDispOffset.s diff --git a/asm/nonmatchings/code_16c8e0/AddPartMovementVar.s b/asm/nonmatchings/code_197F40/AddPartMovementVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AddPartMovementVar.s rename to asm/nonmatchings/code_197F40/AddPartMovementVar.s diff --git a/asm/nonmatchings/code_16c8e0/BoostAttack.s b/asm/nonmatchings/code_197F40/BoostAttack.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/BoostAttack.s rename to asm/nonmatchings/code_197F40/BoostAttack.s diff --git a/asm/nonmatchings/code_16c8e0/BoostDefense.s b/asm/nonmatchings/code_197F40/BoostDefense.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/BoostDefense.s rename to asm/nonmatchings/code_197F40/BoostDefense.s diff --git a/asm/nonmatchings/code_16c8e0/CancelablePlayerRunToGoal.s b/asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CancelablePlayerRunToGoal.s rename to asm/nonmatchings/code_197F40/CancelablePlayerRunToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/CheckButtonDown.s b/asm/nonmatchings/code_197F40/CheckButtonDown.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CheckButtonDown.s rename to asm/nonmatchings/code_197F40/CheckButtonDown.s diff --git a/asm/nonmatchings/code_16c8e0/CheckButtonHeld.s b/asm/nonmatchings/code_197F40/CheckButtonHeld.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CheckButtonHeld.s rename to asm/nonmatchings/code_197F40/CheckButtonHeld.s diff --git a/asm/nonmatchings/code_16c8e0/CheckButtonPress.s b/asm/nonmatchings/code_197F40/CheckButtonPress.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CheckButtonPress.s rename to asm/nonmatchings/code_197F40/CheckButtonPress.s diff --git a/asm/nonmatchings/code_16c8e0/ChooseNextTarget.s b/asm/nonmatchings/code_197F40/ChooseNextTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ChooseNextTarget.s rename to asm/nonmatchings/code_197F40/ChooseNextTarget.s diff --git a/asm/nonmatchings/code_16c8e0/CopyBuffs.s b/asm/nonmatchings/code_197F40/CopyBuffs.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CopyBuffs.s rename to asm/nonmatchings/code_197F40/CopyBuffs.s diff --git a/asm/nonmatchings/code_16c8e0/CountPlayerTargets.s b/asm/nonmatchings/code_197F40/CountPlayerTargets.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CountPlayerTargets.s rename to asm/nonmatchings/code_197F40/CountPlayerTargets.s diff --git a/asm/nonmatchings/code_16c8e0/CreatePartShadow.s b/asm/nonmatchings/code_197F40/CreatePartShadow.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CreatePartShadow.s rename to asm/nonmatchings/code_197F40/CreatePartShadow.s diff --git a/asm/nonmatchings/code_16c8e0/DidActionSucceed.s b/asm/nonmatchings/code_197F40/DidActionSucceed.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/DidActionSucceed.s rename to asm/nonmatchings/code_197F40/DidActionSucceed.s diff --git a/asm/nonmatchings/code_16c8e0/DispatchDamagePlayerEvent.s b/asm/nonmatchings/code_197F40/DispatchDamagePlayerEvent.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/DispatchDamagePlayerEvent.s rename to asm/nonmatchings/code_197F40/DispatchDamagePlayerEvent.s diff --git a/asm/nonmatchings/code_16c8e0/ElectrifyActor.s b/asm/nonmatchings/code_197F40/ElectrifyActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ElectrifyActor.s rename to asm/nonmatchings/code_197F40/ElectrifyActor.s diff --git a/asm/nonmatchings/code_16c8e0/EnablePlayerBlur.s b/asm/nonmatchings/code_197F40/EnablePlayerBlur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnablePlayerBlur.s rename to asm/nonmatchings/code_197F40/EnablePlayerBlur.s diff --git a/asm/nonmatchings/code_16c8e0/EnemyCreateTargetList.s b/asm/nonmatchings/code_197F40/EnemyCreateTargetList.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnemyCreateTargetList.s rename to asm/nonmatchings/code_197F40/EnemyCreateTargetList.s diff --git a/asm/nonmatchings/code_16c8e0/ForceHomePos.s b/asm/nonmatchings/code_197F40/ForceHomePos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ForceHomePos.s rename to asm/nonmatchings/code_197F40/ForceHomePos.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorAttackBoost.s b/asm/nonmatchings/code_197F40/GetActorAttackBoost.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorAttackBoost.s rename to asm/nonmatchings/code_197F40/GetActorAttackBoost.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorDefenseBoost.s b/asm/nonmatchings/code_197F40/GetActorDefenseBoost.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorDefenseBoost.s rename to asm/nonmatchings/code_197F40/GetActorDefenseBoost.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorFlags.s b/asm/nonmatchings/code_197F40/GetActorFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorFlags.s rename to asm/nonmatchings/code_197F40/GetActorFlags.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorPos.s b/asm/nonmatchings/code_197F40/GetActorPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorPos.s rename to asm/nonmatchings/code_197F40/GetActorPos.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorRotation.s b/asm/nonmatchings/code_197F40/GetActorRotation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorRotation.s rename to asm/nonmatchings/code_197F40/GetActorRotation.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorScale.s b/asm/nonmatchings/code_197F40/GetActorScale.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorScale.s rename to asm/nonmatchings/code_197F40/GetActorScale.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorVar.s b/asm/nonmatchings/code_197F40/GetActorVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorVar.s rename to asm/nonmatchings/code_197F40/GetActorVar.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorYaw.s b/asm/nonmatchings/code_197F40/GetActorYaw.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorYaw.s rename to asm/nonmatchings/code_197F40/GetActorYaw.s diff --git a/asm/nonmatchings/code_16c8e0/GetAnimation.s b/asm/nonmatchings/code_197F40/GetAnimation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetAnimation.s rename to asm/nonmatchings/code_197F40/GetAnimation.s diff --git a/asm/nonmatchings/code_16c8e0/GetBattleFlags.s b/asm/nonmatchings/code_197F40/GetBattleFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetBattleFlags.s rename to asm/nonmatchings/code_197F40/GetBattleFlags.s diff --git a/asm/nonmatchings/code_16c8e0/GetBattleFlags2.s b/asm/nonmatchings/code_197F40/GetBattleFlags2.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetBattleFlags2.s rename to asm/nonmatchings/code_197F40/GetBattleFlags2.s diff --git a/asm/nonmatchings/code_16c8e0/GetBattlePhase.s b/asm/nonmatchings/code_197F40/GetBattlePhase.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetBattlePhase.s rename to asm/nonmatchings/code_197F40/GetBattlePhase.s diff --git a/asm/nonmatchings/code_16c8e0/GetBattleState.s b/asm/nonmatchings/code_197F40/GetBattleState.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetBattleState.s rename to asm/nonmatchings/code_197F40/GetBattleState.s diff --git a/asm/nonmatchings/code_16c8e0/GetBattleVar.s b/asm/nonmatchings/code_197F40/GetBattleVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetBattleVar.s rename to asm/nonmatchings/code_197F40/GetBattleVar.s diff --git a/asm/nonmatchings/code_16c8e0/GetDistanceToGoal.s b/asm/nonmatchings/code_197F40/GetDistanceToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetDistanceToGoal.s rename to asm/nonmatchings/code_197F40/GetDistanceToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/GetGoalPos.s b/asm/nonmatchings/code_197F40/GetGoalPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetGoalPos.s rename to asm/nonmatchings/code_197F40/GetGoalPos.s diff --git a/asm/nonmatchings/code_16c8e0/GetHomePos.s b/asm/nonmatchings/code_197F40/GetHomePos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetHomePos.s rename to asm/nonmatchings/code_197F40/GetHomePos.s diff --git a/asm/nonmatchings/code_16c8e0/GetIdleGoal.s b/asm/nonmatchings/code_197F40/GetIdleGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetIdleGoal.s rename to asm/nonmatchings/code_197F40/GetIdleGoal.s diff --git a/asm/nonmatchings/code_16c8e0/GetIndexFromHome.s b/asm/nonmatchings/code_197F40/GetIndexFromHome.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetIndexFromHome.s rename to asm/nonmatchings/code_197F40/GetIndexFromHome.s diff --git a/asm/nonmatchings/code_16c8e0/GetIndexFromPos.s b/asm/nonmatchings/code_197F40/GetIndexFromPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetIndexFromPos.s rename to asm/nonmatchings/code_197F40/GetIndexFromPos.s diff --git a/asm/nonmatchings/code_16c8e0/GetLastElement.s b/asm/nonmatchings/code_197F40/GetLastElement.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetLastElement.s rename to asm/nonmatchings/code_197F40/GetLastElement.s diff --git a/asm/nonmatchings/code_16c8e0/GetMenuSelection.s b/asm/nonmatchings/code_197F40/GetMenuSelection.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetMenuSelection.s rename to asm/nonmatchings/code_197F40/GetMenuSelection.s diff --git a/asm/nonmatchings/code_16c8e0/GetOwnerID.s b/asm/nonmatchings/code_197F40/GetOwnerID.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetOwnerID.s rename to asm/nonmatchings/code_197F40/GetOwnerID.s diff --git a/asm/nonmatchings/code_16c8e0/GetOwnerTarget.s b/asm/nonmatchings/code_197F40/GetOwnerTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetOwnerTarget.s rename to asm/nonmatchings/code_197F40/GetOwnerTarget.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartDispOffset.s b/asm/nonmatchings/code_197F40/GetPartDispOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartDispOffset.s rename to asm/nonmatchings/code_197F40/GetPartDispOffset.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartEventFlags.s b/asm/nonmatchings/code_197F40/GetPartEventFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartEventFlags.s rename to asm/nonmatchings/code_197F40/GetPartEventFlags.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartFlags.s b/asm/nonmatchings/code_197F40/GetPartFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartFlags.s rename to asm/nonmatchings/code_197F40/GetPartFlags.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartMovementVar.s b/asm/nonmatchings/code_197F40/GetPartMovementVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartMovementVar.s rename to asm/nonmatchings/code_197F40/GetPartMovementVar.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartOffset.s b/asm/nonmatchings/code_197F40/GetPartOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartOffset.s rename to asm/nonmatchings/code_197F40/GetPartOffset.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartPos.s b/asm/nonmatchings/code_197F40/GetPartPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartPos.s rename to asm/nonmatchings/code_197F40/GetPartPos.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartRotation.s b/asm/nonmatchings/code_197F40/GetPartRotation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartRotation.s rename to asm/nonmatchings/code_197F40/GetPartRotation.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartScale.s b/asm/nonmatchings/code_197F40/GetPartScale.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartScale.s rename to asm/nonmatchings/code_197F40/GetPartScale.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartTarget.s b/asm/nonmatchings/code_197F40/GetPartTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartTarget.s rename to asm/nonmatchings/code_197F40/GetPartTarget.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartTargetFlags.s b/asm/nonmatchings/code_197F40/GetPartTargetFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartTargetFlags.s rename to asm/nonmatchings/code_197F40/GetPartTargetFlags.s diff --git a/asm/nonmatchings/code_16c8e0/GetPartYaw.s b/asm/nonmatchings/code_197F40/GetPartYaw.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPartYaw.s rename to asm/nonmatchings/code_197F40/GetPartYaw.s diff --git a/asm/nonmatchings/code_16c8e0/GetPlayerActorID.s b/asm/nonmatchings/code_197F40/GetPlayerActorID.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPlayerActorID.s rename to asm/nonmatchings/code_197F40/GetPlayerActorID.s diff --git a/asm/nonmatchings/code_16c8e0/GetPlayerHP.s b/asm/nonmatchings/code_197F40/GetPlayerHP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetPlayerHP.s rename to asm/nonmatchings/code_197F40/GetPlayerHP.s diff --git a/asm/nonmatchings/code_16c8e0/GetStatusFlags.s b/asm/nonmatchings/code_197F40/GetStatusFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetStatusFlags.s rename to asm/nonmatchings/code_197F40/GetStatusFlags.s diff --git a/asm/nonmatchings/code_16c8e0/GetTargetListLength.s b/asm/nonmatchings/code_197F40/GetTargetListLength.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetTargetListLength.s rename to asm/nonmatchings/code_197F40/GetTargetListLength.s diff --git a/asm/nonmatchings/code_16c8e0/HPBarToCurrent.s b/asm/nonmatchings/code_197F40/HPBarToCurrent.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/HPBarToCurrent.s rename to asm/nonmatchings/code_197F40/HPBarToCurrent.s diff --git a/asm/nonmatchings/code_16c8e0/HPBarToHome.s b/asm/nonmatchings/code_197F40/HPBarToHome.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/HPBarToHome.s rename to asm/nonmatchings/code_197F40/HPBarToHome.s diff --git a/asm/nonmatchings/code_16c8e0/HealActor.s b/asm/nonmatchings/code_197F40/HealActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/HealActor.s rename to asm/nonmatchings/code_197F40/HealActor.s diff --git a/asm/nonmatchings/code_16c8e0/InitTargetIterator.s b/asm/nonmatchings/code_197F40/InitTargetIterator.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/InitTargetIterator.s rename to asm/nonmatchings/code_197F40/InitTargetIterator.s diff --git a/asm/nonmatchings/code_16c8e0/LoadBattleSection.s b/asm/nonmatchings/code_197F40/LoadBattleSection.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LoadBattleSection.s rename to asm/nonmatchings/code_197F40/LoadBattleSection.s diff --git a/asm/nonmatchings/code_16c8e0/ModifyActorDecoration.s b/asm/nonmatchings/code_197F40/ModifyActorDecoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ModifyActorDecoration.s rename to asm/nonmatchings/code_197F40/ModifyActorDecoration.s diff --git a/asm/nonmatchings/code_16c8e0/PlayerCreateTargetList.s b/asm/nonmatchings/code_197F40/PlayerCreateTargetList.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayerCreateTargetList.s rename to asm/nonmatchings/code_197F40/PlayerCreateTargetList.s diff --git a/asm/nonmatchings/code_16c8e0/PlayerDamageEnemy.s b/asm/nonmatchings/code_197F40/PlayerDamageEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayerDamageEnemy.s rename to asm/nonmatchings/code_197F40/PlayerDamageEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/PlayerFallToGoal.s b/asm/nonmatchings/code_197F40/PlayerFallToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayerFallToGoal.s rename to asm/nonmatchings/code_197F40/PlayerFallToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/PlayerLandJump.s b/asm/nonmatchings/code_197F40/PlayerLandJump.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayerLandJump.s rename to asm/nonmatchings/code_197F40/PlayerLandJump.s diff --git a/asm/nonmatchings/code_16c8e0/PlayerPowerBounceEnemy.s b/asm/nonmatchings/code_197F40/PlayerPowerBounceEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayerPowerBounceEnemy.s rename to asm/nonmatchings/code_197F40/PlayerPowerBounceEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/PlayerRunToGoal.s b/asm/nonmatchings/code_197F40/PlayerRunToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayerRunToGoal.s rename to asm/nonmatchings/code_197F40/PlayerRunToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/PlayerTestEnemy.s b/asm/nonmatchings/code_197F40/PlayerTestEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PlayerTestEnemy.s rename to asm/nonmatchings/code_197F40/PlayerTestEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/RemoveActorDecoration.s b/asm/nonmatchings/code_197F40/RemoveActorDecoration.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/RemoveActorDecoration.s rename to asm/nonmatchings/code_197F40/RemoveActorDecoration.s diff --git a/asm/nonmatchings/code_16c8e0/RemovePartShadow.s b/asm/nonmatchings/code_197F40/RemovePartShadow.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/RemovePartShadow.s rename to asm/nonmatchings/code_197F40/RemovePartShadow.s diff --git a/asm/nonmatchings/code_16c8e0/RemovePlayerBuffs.s b/asm/nonmatchings/code_197F40/RemovePlayerBuffs.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/RemovePlayerBuffs.s rename to asm/nonmatchings/code_197F40/RemovePlayerBuffs.s diff --git a/asm/nonmatchings/code_16c8e0/ResetActorSounds.s b/asm/nonmatchings/code_197F40/ResetActorSounds.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ResetActorSounds.s rename to asm/nonmatchings/code_197F40/ResetActorSounds.s diff --git a/asm/nonmatchings/code_16c8e0/ResetAllActorSounds.s b/asm/nonmatchings/code_197F40/ResetAllActorSounds.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ResetAllActorSounds.s rename to asm/nonmatchings/code_197F40/ResetAllActorSounds.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorDispOffset.s b/asm/nonmatchings/code_197F40/SetActorDispOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorDispOffset.s rename to asm/nonmatchings/code_197F40/SetActorDispOffset.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorFlagBits.s b/asm/nonmatchings/code_197F40/SetActorFlagBits.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorFlagBits.s rename to asm/nonmatchings/code_197F40/SetActorFlagBits.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorFlags.s b/asm/nonmatchings/code_197F40/SetActorFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorFlags.s rename to asm/nonmatchings/code_197F40/SetActorFlags.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorIdleJumpGravity.s b/asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorIdleJumpGravity.s rename to asm/nonmatchings/code_197F40/SetActorIdleJumpGravity.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorIdleSpeed.s b/asm/nonmatchings/code_197F40/SetActorIdleSpeed.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorIdleSpeed.s rename to asm/nonmatchings/code_197F40/SetActorIdleSpeed.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorJumpGravity.s b/asm/nonmatchings/code_197F40/SetActorJumpGravity.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorJumpGravity.s rename to asm/nonmatchings/code_197F40/SetActorJumpGravity.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorPos.s b/asm/nonmatchings/code_197F40/SetActorPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorPos.s rename to asm/nonmatchings/code_197F40/SetActorPos.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorRotation.s b/asm/nonmatchings/code_197F40/SetActorRotation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorRotation.s rename to asm/nonmatchings/code_197F40/SetActorRotation.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorRotationOffset.s b/asm/nonmatchings/code_197F40/SetActorRotationOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorRotationOffset.s rename to asm/nonmatchings/code_197F40/SetActorRotationOffset.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorScale.s b/asm/nonmatchings/code_197F40/SetActorScale.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorScale.s rename to asm/nonmatchings/code_197F40/SetActorScale.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorScaleModifier.s b/asm/nonmatchings/code_197F40/SetActorScaleModifier.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorScaleModifier.s rename to asm/nonmatchings/code_197F40/SetActorScaleModifier.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorSounds.s b/asm/nonmatchings/code_197F40/SetActorSounds.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorSounds.s rename to asm/nonmatchings/code_197F40/SetActorSounds.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorSpeed.s b/asm/nonmatchings/code_197F40/SetActorSpeed.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorSpeed.s rename to asm/nonmatchings/code_197F40/SetActorSpeed.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorType.s b/asm/nonmatchings/code_197F40/SetActorType.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorType.s rename to asm/nonmatchings/code_197F40/SetActorType.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorVar.s b/asm/nonmatchings/code_197F40/SetActorVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorVar.s rename to asm/nonmatchings/code_197F40/SetActorVar.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorYaw.s b/asm/nonmatchings/code_197F40/SetActorYaw.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorYaw.s rename to asm/nonmatchings/code_197F40/SetActorYaw.s diff --git a/asm/nonmatchings/code_16c8e0/SetAnimation.s b/asm/nonmatchings/code_197F40/SetAnimation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetAnimation.s rename to asm/nonmatchings/code_197F40/SetAnimation.s diff --git a/asm/nonmatchings/code_16c8e0/SetAnimationRate.s b/asm/nonmatchings/code_197F40/SetAnimationRate.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetAnimationRate.s rename to asm/nonmatchings/code_197F40/SetAnimationRate.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleFlagBits.s b/asm/nonmatchings/code_197F40/SetBattleFlagBits.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleFlagBits.s rename to asm/nonmatchings/code_197F40/SetBattleFlagBits.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleFlagBits2.s b/asm/nonmatchings/code_197F40/SetBattleFlagBits2.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleFlagBits2.s rename to asm/nonmatchings/code_197F40/SetBattleFlagBits2.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleInputButtons.s b/asm/nonmatchings/code_197F40/SetBattleInputButtons.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleInputButtons.s rename to asm/nonmatchings/code_197F40/SetBattleInputButtons.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleInputMask.s b/asm/nonmatchings/code_197F40/SetBattleInputMask.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleInputMask.s rename to asm/nonmatchings/code_197F40/SetBattleInputMask.s diff --git a/asm/nonmatchings/code_16c8e0/SetBattleVar.s b/asm/nonmatchings/code_197F40/SetBattleVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetBattleVar.s rename to asm/nonmatchings/code_197F40/SetBattleVar.s diff --git a/asm/nonmatchings/code_16c8e0/SetEnemyTargetOffset.s b/asm/nonmatchings/code_197F40/SetEnemyTargetOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetEnemyTargetOffset.s rename to asm/nonmatchings/code_197F40/SetEnemyTargetOffset.s diff --git a/asm/nonmatchings/code_16c8e0/SetGoalPos.s b/asm/nonmatchings/code_197F40/SetGoalPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetGoalPos.s rename to asm/nonmatchings/code_197F40/SetGoalPos.s diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToFirstTarget.s b/asm/nonmatchings/code_197F40/SetGoalToFirstTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetGoalToFirstTarget.s rename to asm/nonmatchings/code_197F40/SetGoalToFirstTarget.s diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToHome.s b/asm/nonmatchings/code_197F40/SetGoalToHome.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetGoalToHome.s rename to asm/nonmatchings/code_197F40/SetGoalToHome.s diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToIndex.s b/asm/nonmatchings/code_197F40/SetGoalToIndex.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetGoalToIndex.s rename to asm/nonmatchings/code_197F40/SetGoalToIndex.s diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToTarget.s b/asm/nonmatchings/code_197F40/SetGoalToTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetGoalToTarget.s rename to asm/nonmatchings/code_197F40/SetGoalToTarget.s diff --git a/asm/nonmatchings/code_16c8e0/SetHomePos.s b/asm/nonmatchings/code_197F40/SetHomePos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetHomePos.s rename to asm/nonmatchings/code_197F40/SetHomePos.s diff --git a/asm/nonmatchings/code_16c8e0/SetIdleGoal.s b/asm/nonmatchings/code_197F40/SetIdleGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetIdleGoal.s rename to asm/nonmatchings/code_197F40/SetIdleGoal.s diff --git a/asm/nonmatchings/code_16c8e0/SetIdleGoalToHome.s b/asm/nonmatchings/code_197F40/SetIdleGoalToHome.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetIdleGoalToHome.s rename to asm/nonmatchings/code_197F40/SetIdleGoalToHome.s diff --git a/asm/nonmatchings/code_16c8e0/SetJumpAnimations.s b/asm/nonmatchings/code_197F40/SetJumpAnimations.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetJumpAnimations.s rename to asm/nonmatchings/code_197F40/SetJumpAnimations.s diff --git a/asm/nonmatchings/code_16c8e0/SetOwnerID.s b/asm/nonmatchings/code_197F40/SetOwnerID.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetOwnerID.s rename to asm/nonmatchings/code_197F40/SetOwnerID.s diff --git a/asm/nonmatchings/code_16c8e0/SetOwnerTarget.s b/asm/nonmatchings/code_197F40/SetOwnerTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetOwnerTarget.s rename to asm/nonmatchings/code_197F40/SetOwnerTarget.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartAlpha.s b/asm/nonmatchings/code_197F40/SetPartAlpha.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartAlpha.s rename to asm/nonmatchings/code_197F40/SetPartAlpha.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartDispOffset.s b/asm/nonmatchings/code_197F40/SetPartDispOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartDispOffset.s rename to asm/nonmatchings/code_197F40/SetPartDispOffset.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartEventBits.s b/asm/nonmatchings/code_197F40/SetPartEventBits.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartEventBits.s rename to asm/nonmatchings/code_197F40/SetPartEventBits.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartEventFlags.s b/asm/nonmatchings/code_197F40/SetPartEventFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartEventFlags.s rename to asm/nonmatchings/code_197F40/SetPartEventFlags.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartFlagBits.s b/asm/nonmatchings/code_197F40/SetPartFlagBits.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartFlagBits.s rename to asm/nonmatchings/code_197F40/SetPartFlagBits.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartFlags.s b/asm/nonmatchings/code_197F40/SetPartFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartFlags.s rename to asm/nonmatchings/code_197F40/SetPartFlags.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartGoalToTarget.s b/asm/nonmatchings/code_197F40/SetPartGoalToTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartGoalToTarget.s rename to asm/nonmatchings/code_197F40/SetPartGoalToTarget.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartJumpGravity.s b/asm/nonmatchings/code_197F40/SetPartJumpGravity.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartJumpGravity.s rename to asm/nonmatchings/code_197F40/SetPartJumpGravity.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartMoveSpeed.s b/asm/nonmatchings/code_197F40/SetPartMoveSpeed.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartMoveSpeed.s rename to asm/nonmatchings/code_197F40/SetPartMoveSpeed.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartMovementVar.s b/asm/nonmatchings/code_197F40/SetPartMovementVar.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartMovementVar.s rename to asm/nonmatchings/code_197F40/SetPartMovementVar.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartPos.s b/asm/nonmatchings/code_197F40/SetPartPos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartPos.s rename to asm/nonmatchings/code_197F40/SetPartPos.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartRotation.s b/asm/nonmatchings/code_197F40/SetPartRotation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartRotation.s rename to asm/nonmatchings/code_197F40/SetPartRotation.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartRotationOffset.s b/asm/nonmatchings/code_197F40/SetPartRotationOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartRotationOffset.s rename to asm/nonmatchings/code_197F40/SetPartRotationOffset.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartScale.s b/asm/nonmatchings/code_197F40/SetPartScale.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartScale.s rename to asm/nonmatchings/code_197F40/SetPartScale.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartSounds.s b/asm/nonmatchings/code_197F40/SetPartSounds.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartSounds.s rename to asm/nonmatchings/code_197F40/SetPartSounds.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartTargetFlagBits.s b/asm/nonmatchings/code_197F40/SetPartTargetFlagBits.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartTargetFlagBits.s rename to asm/nonmatchings/code_197F40/SetPartTargetFlagBits.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartTargetFlags.s b/asm/nonmatchings/code_197F40/SetPartTargetFlags.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartTargetFlags.s rename to asm/nonmatchings/code_197F40/SetPartTargetFlags.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartYaw.s b/asm/nonmatchings/code_197F40/SetPartYaw.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartYaw.s rename to asm/nonmatchings/code_197F40/SetPartYaw.s diff --git a/asm/nonmatchings/code_16c8e0/ShowShockEffect.s b/asm/nonmatchings/code_197F40/ShowShockEffect.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ShowShockEffect.s rename to asm/nonmatchings/code_197F40/ShowShockEffect.s diff --git a/asm/nonmatchings/code_16c8e0/SummonEnemy.s b/asm/nonmatchings/code_197F40/SummonEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SummonEnemy.s rename to asm/nonmatchings/code_197F40/SummonEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/UseIdleAnimation.s b/asm/nonmatchings/code_197F40/UseIdleAnimation.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/UseIdleAnimation.s rename to asm/nonmatchings/code_197F40/UseIdleAnimation.s diff --git a/asm/nonmatchings/code_16c8e0/VanishActor.s b/asm/nonmatchings/code_197F40/VanishActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/VanishActor.s rename to asm/nonmatchings/code_197F40/VanishActor.s diff --git a/asm/nonmatchings/code_16c8e0/WaitForBuffDone.s b/asm/nonmatchings/code_197F40/WaitForBuffDone.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/WaitForBuffDone.s rename to asm/nonmatchings/code_197F40/WaitForBuffDone.s diff --git a/asm/nonmatchings/code_16c8e0/calc_player_damage_enemy.s b/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_player_damage_enemy.s rename to asm/nonmatchings/code_197F40/calc_player_damage_enemy.s diff --git a/asm/nonmatchings/code_16c8e0/calc_player_test_enemy.s b/asm/nonmatchings/code_197F40/calc_player_test_enemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_player_test_enemy.s rename to asm/nonmatchings/code_197F40/calc_player_test_enemy.s diff --git a/asm/nonmatchings/code_16c8e0/count_targets.s b/asm/nonmatchings/code_197F40/count_targets.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/count_targets.s rename to asm/nonmatchings/code_197F40/count_targets.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player.s b/asm/nonmatchings/code_197F40/dispatch_damage_event_player.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_player.s rename to asm/nonmatchings/code_197F40/dispatch_damage_event_player.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_0.s b/asm/nonmatchings/code_197F40/dispatch_damage_event_player_0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_0.s rename to asm/nonmatchings/code_197F40/dispatch_damage_event_player_0.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_1.s b/asm/nonmatchings/code_197F40/dispatch_damage_event_player_1.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_1.s rename to asm/nonmatchings/code_197F40/dispatch_damage_event_player_1.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_player.s b/asm/nonmatchings/code_197F40/dispatch_event_player.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_event_player.s rename to asm/nonmatchings/code_197F40/dispatch_event_player.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_player_continue_turn.s b/asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_event_player_continue_turn.s rename to asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269E80.s b/asm/nonmatchings/code_197F40/func_80269E80.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269E80.s rename to asm/nonmatchings/code_197F40/func_80269E80.s diff --git a/asm/nonmatchings/code_16c8e0/func_80269EAC.s b/asm/nonmatchings/code_197F40/func_80269EAC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80269EAC.s rename to asm/nonmatchings/code_197F40/func_80269EAC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026BF48.s b/asm/nonmatchings/code_197F40/func_8026BF48.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026BF48.s rename to asm/nonmatchings/code_197F40/func_8026BF48.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026D51C.s b/asm/nonmatchings/code_197F40/func_8026D51C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026D51C.s rename to asm/nonmatchings/code_197F40/func_8026D51C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026D5A4.s b/asm/nonmatchings/code_197F40/func_8026D5A4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026D5A4.s rename to asm/nonmatchings/code_197F40/func_8026D5A4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026D8EC.s b/asm/nonmatchings/code_197F40/func_8026D8EC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026D8EC.s rename to asm/nonmatchings/code_197F40/func_8026D8EC.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026D940.s b/asm/nonmatchings/code_197F40/func_8026D940.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026D940.s rename to asm/nonmatchings/code_197F40/func_8026D940.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026DA94.s b/asm/nonmatchings/code_197F40/func_8026DA94.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026DA94.s rename to asm/nonmatchings/code_197F40/func_8026DA94.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026DEF0.s b/asm/nonmatchings/code_197F40/func_8026DEF0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026DEF0.s rename to asm/nonmatchings/code_197F40/func_8026DEF0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026DF88.s b/asm/nonmatchings/code_197F40/func_8026DF88.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026DF88.s rename to asm/nonmatchings/code_197F40/func_8026DF88.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E020.s b/asm/nonmatchings/code_197F40/func_8026E020.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E020.s rename to asm/nonmatchings/code_197F40/func_8026E020.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E038.s b/asm/nonmatchings/code_197F40/func_8026E038.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E038.s rename to asm/nonmatchings/code_197F40/func_8026E038.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E16C.s b/asm/nonmatchings/code_197F40/func_8026E16C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E16C.s rename to asm/nonmatchings/code_197F40/func_8026E16C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E198.s b/asm/nonmatchings/code_197F40/func_8026E198.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E198.s rename to asm/nonmatchings/code_197F40/func_8026E198.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E208.s b/asm/nonmatchings/code_197F40/func_8026E208.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E208.s rename to asm/nonmatchings/code_197F40/func_8026E208.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E260.s b/asm/nonmatchings/code_197F40/func_8026E260.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E260.s rename to asm/nonmatchings/code_197F40/func_8026E260.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E558.s b/asm/nonmatchings/code_197F40/func_8026E558.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E558.s rename to asm/nonmatchings/code_197F40/func_8026E558.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E914.s b/asm/nonmatchings/code_197F40/func_8026E914.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E914.s rename to asm/nonmatchings/code_197F40/func_8026E914.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026E9A0.s b/asm/nonmatchings/code_197F40/func_8026E9A0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026E9A0.s rename to asm/nonmatchings/code_197F40/func_8026E9A0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026EA7C.s b/asm/nonmatchings/code_197F40/func_8026EA7C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026EA7C.s rename to asm/nonmatchings/code_197F40/func_8026EA7C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026EB20.s b/asm/nonmatchings/code_197F40/func_8026EB20.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026EB20.s rename to asm/nonmatchings/code_197F40/func_8026EB20.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026EBF8.s b/asm/nonmatchings/code_197F40/func_8026EBF8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026EBF8.s rename to asm/nonmatchings/code_197F40/func_8026EBF8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026ED20.s b/asm/nonmatchings/code_197F40/func_8026ED20.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026ED20.s rename to asm/nonmatchings/code_197F40/func_8026ED20.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026EDE4.s b/asm/nonmatchings/code_197F40/func_8026EDE4.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026EDE4.s rename to asm/nonmatchings/code_197F40/func_8026EDE4.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026F1A0.s b/asm/nonmatchings/code_197F40/func_8026F1A0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026F1A0.s rename to asm/nonmatchings/code_197F40/func_8026F1A0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8026F60C.s b/asm/nonmatchings/code_197F40/func_8026F60C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8026F60C.s rename to asm/nonmatchings/code_197F40/func_8026F60C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80271210.s b/asm/nonmatchings/code_197F40/func_80271210.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80271210.s rename to asm/nonmatchings/code_197F40/func_80271210.s diff --git a/asm/nonmatchings/code_16c8e0/func_80271258.s b/asm/nonmatchings/code_197F40/func_80271258.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80271258.s rename to asm/nonmatchings/code_197F40/func_80271258.s diff --git a/asm/nonmatchings/code_16c8e0/func_802712A0.s b/asm/nonmatchings/code_197F40/func_802712A0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802712A0.s rename to asm/nonmatchings/code_197F40/func_802712A0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80271328.s b/asm/nonmatchings/code_197F40/func_80271328.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80271328.s rename to asm/nonmatchings/code_197F40/func_80271328.s diff --git a/asm/nonmatchings/code_16c8e0/func_802713B0.s b/asm/nonmatchings/code_197F40/func_802713B0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802713B0.s rename to asm/nonmatchings/code_197F40/func_802713B0.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027143C.s b/asm/nonmatchings/code_197F40/func_8027143C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027143C.s rename to asm/nonmatchings/code_197F40/func_8027143C.s diff --git a/asm/nonmatchings/code_16c8e0/func_80271484.s b/asm/nonmatchings/code_197F40/func_80271484.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80271484.s rename to asm/nonmatchings/code_197F40/func_80271484.s diff --git a/asm/nonmatchings/code_16c8e0/func_80271588.s b/asm/nonmatchings/code_197F40/func_80271588.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80271588.s rename to asm/nonmatchings/code_197F40/func_80271588.s diff --git a/asm/nonmatchings/code_16c8e0/func_80273444.s b/asm/nonmatchings/code_197F40/func_80273444.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80273444.s rename to asm/nonmatchings/code_197F40/func_80273444.s diff --git a/asm/nonmatchings/code_16c8e0/func_802749D8.s b/asm/nonmatchings/code_197F40/func_802749D8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802749D8.s rename to asm/nonmatchings/code_197F40/func_802749D8.s diff --git a/asm/nonmatchings/code_16c8e0/func_802749F8.s b/asm/nonmatchings/code_197F40/func_802749F8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802749F8.s rename to asm/nonmatchings/code_197F40/func_802749F8.s diff --git a/asm/nonmatchings/code_16c8e0/func_80274A18.s b/asm/nonmatchings/code_197F40/func_80274A18.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80274A18.s rename to asm/nonmatchings/code_197F40/func_80274A18.s diff --git a/asm/nonmatchings/code_16c8e0/func_802752AC.s b/asm/nonmatchings/code_197F40/func_802752AC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802752AC.s rename to asm/nonmatchings/code_197F40/func_802752AC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80275F00.s b/asm/nonmatchings/code_197F40/func_80275F00.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80275F00.s rename to asm/nonmatchings/code_197F40/func_80275F00.s diff --git a/asm/nonmatchings/code_16c8e0/func_80276EFC.s b/asm/nonmatchings/code_197F40/func_80276EFC.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80276EFC.s rename to asm/nonmatchings/code_197F40/func_80276EFC.s diff --git a/asm/nonmatchings/code_16c8e0/func_80276F1C.s b/asm/nonmatchings/code_197F40/func_80276F1C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80276F1C.s rename to asm/nonmatchings/code_197F40/func_80276F1C.s diff --git a/asm/nonmatchings/code_16c8e0/get_actor.s b/asm/nonmatchings/code_197F40/get_actor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/get_actor.s rename to asm/nonmatchings/code_197F40/get_actor.s diff --git a/asm/nonmatchings/code_16c8e0/get_nearest_home_index.s b/asm/nonmatchings/code_197F40/get_nearest_home_index.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/get_nearest_home_index.s rename to asm/nonmatchings/code_197F40/get_nearest_home_index.s diff --git a/asm/nonmatchings/code_16c8e0/set_actor_current_position.s b/asm/nonmatchings/code_197F40/set_actor_current_position.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_actor_current_position.s rename to asm/nonmatchings/code_197F40/set_actor_current_position.s diff --git a/asm/nonmatchings/code_16c8e0/set_actor_home_position.s b/asm/nonmatchings/code_197F40/set_actor_home_position.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_actor_home_position.s rename to asm/nonmatchings/code_197F40/set_actor_home_position.s diff --git a/asm/nonmatchings/code_16c8e0/set_goal_pos_to_part.s b/asm/nonmatchings/code_197F40/set_goal_pos_to_part.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_goal_pos_to_part.s rename to asm/nonmatchings/code_197F40/set_goal_pos_to_part.s diff --git a/asm/nonmatchings/code_16c8e0/set_part_absolute_position.s b/asm/nonmatchings/code_197F40/set_part_absolute_position.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_part_absolute_position.s rename to asm/nonmatchings/code_197F40/set_part_absolute_position.s diff --git a/asm/nonmatchings/code_16c8e0/set_part_goal_to_actor_part.s b/asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/set_part_goal_to_actor_part.s rename to asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s diff --git a/asm/nonmatchings/code_16c8e0/AfflictActor.s b/asm/nonmatchings/code_1A5830/AfflictActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/AfflictActor.s rename to asm/nonmatchings/code_1A5830/AfflictActor.s diff --git a/asm/nonmatchings/code_16c8e0/BindHandleEvent.s b/asm/nonmatchings/code_1A5830/BindHandleEvent.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/BindHandleEvent.s rename to asm/nonmatchings/code_1A5830/BindHandleEvent.s diff --git a/asm/nonmatchings/code_16c8e0/BindIdle.s b/asm/nonmatchings/code_1A5830/BindIdle.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/BindIdle.s rename to asm/nonmatchings/code_1A5830/BindIdle.s diff --git a/asm/nonmatchings/code_16c8e0/BindNextTurn.s b/asm/nonmatchings/code_1A5830/BindNextTurn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/BindNextTurn.s rename to asm/nonmatchings/code_1A5830/BindNextTurn.s diff --git a/asm/nonmatchings/code_16c8e0/BindTakeTurn.s b/asm/nonmatchings/code_1A5830/BindTakeTurn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/BindTakeTurn.s rename to asm/nonmatchings/code_1A5830/BindTakeTurn.s diff --git a/asm/nonmatchings/code_16c8e0/ClearStatusEffects.s b/asm/nonmatchings/code_1A5830/ClearStatusEffects.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ClearStatusEffects.s rename to asm/nonmatchings/code_1A5830/ClearStatusEffects.s diff --git a/asm/nonmatchings/code_16c8e0/CopyStatusEffects.s b/asm/nonmatchings/code_1A5830/CopyStatusEffects.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/CopyStatusEffects.s rename to asm/nonmatchings/code_1A5830/CopyStatusEffects.s diff --git a/asm/nonmatchings/code_16c8e0/DispatchDamageEvent.s b/asm/nonmatchings/code_1A5830/DispatchDamageEvent.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/DispatchDamageEvent.s rename to asm/nonmatchings/code_1A5830/DispatchDamageEvent.s diff --git a/asm/nonmatchings/code_16c8e0/DispatchEvent.s b/asm/nonmatchings/code_1A5830/DispatchEvent.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/DispatchEvent.s rename to asm/nonmatchings/code_1A5830/DispatchEvent.s diff --git a/asm/nonmatchings/code_16c8e0/DropStarPoints.s b/asm/nonmatchings/code_1A5830/DropStarPoints.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/DropStarPoints.s rename to asm/nonmatchings/code_1A5830/DropStarPoints.s diff --git a/asm/nonmatchings/code_16c8e0/EnableActorBlur.s b/asm/nonmatchings/code_1A5830/EnableActorBlur.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnableActorBlur.s rename to asm/nonmatchings/code_1A5830/EnableActorBlur.s diff --git a/asm/nonmatchings/code_16c8e0/EnableActorGlow.s b/asm/nonmatchings/code_1A5830/EnableActorGlow.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnableActorGlow.s rename to asm/nonmatchings/code_1A5830/EnableActorGlow.s diff --git a/asm/nonmatchings/code_16c8e0/EnableIdleScript.s b/asm/nonmatchings/code_1A5830/EnableIdleScript.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnableIdleScript.s rename to asm/nonmatchings/code_1A5830/EnableIdleScript.s diff --git a/asm/nonmatchings/code_16c8e0/EnemyDamageTarget.s b/asm/nonmatchings/code_1A5830/EnemyDamageTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnemyDamageTarget.s rename to asm/nonmatchings/code_1A5830/EnemyDamageTarget.s diff --git a/asm/nonmatchings/code_16c8e0/EnemyFollowupAfflictTarget.s b/asm/nonmatchings/code_1A5830/EnemyFollowupAfflictTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnemyFollowupAfflictTarget.s rename to asm/nonmatchings/code_1A5830/EnemyFollowupAfflictTarget.s diff --git a/asm/nonmatchings/code_16c8e0/EnemyTestTarget.s b/asm/nonmatchings/code_1A5830/EnemyTestTarget.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/EnemyTestTarget.s rename to asm/nonmatchings/code_1A5830/EnemyTestTarget.s diff --git a/asm/nonmatchings/code_16c8e0/FallPartTo.s b/asm/nonmatchings/code_1A5830/FallPartTo.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/FallPartTo.s rename to asm/nonmatchings/code_1A5830/FallPartTo.s diff --git a/asm/nonmatchings/code_16c8e0/FallToGoal.s b/asm/nonmatchings/code_1A5830/FallToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/FallToGoal.s rename to asm/nonmatchings/code_1A5830/FallToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/FlyPartTo.s b/asm/nonmatchings/code_1A5830/FlyPartTo.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/FlyPartTo.s rename to asm/nonmatchings/code_1A5830/FlyPartTo.s diff --git a/asm/nonmatchings/code_16c8e0/FlyToGoal.s b/asm/nonmatchings/code_1A5830/FlyToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/FlyToGoal.s rename to asm/nonmatchings/code_1A5830/FlyToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorHP.s b/asm/nonmatchings/code_1A5830/GetActorHP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorHP.s rename to asm/nonmatchings/code_1A5830/GetActorHP.s diff --git a/asm/nonmatchings/code_16c8e0/GetActorSize.s b/asm/nonmatchings/code_1A5830/GetActorSize.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetActorSize.s rename to asm/nonmatchings/code_1A5830/GetActorSize.s diff --git a/asm/nonmatchings/code_16c8e0/GetCurrentActorType.s b/asm/nonmatchings/code_1A5830/GetCurrentActorType.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetCurrentActorType.s rename to asm/nonmatchings/code_1A5830/GetCurrentActorType.s diff --git a/asm/nonmatchings/code_16c8e0/GetEncounterState.s b/asm/nonmatchings/code_1A5830/GetEncounterState.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetEncounterState.s rename to asm/nonmatchings/code_1A5830/GetEncounterState.s diff --git a/asm/nonmatchings/code_16c8e0/GetEnemyMaxHP.s b/asm/nonmatchings/code_1A5830/GetEnemyMaxHP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetEnemyMaxHP.s rename to asm/nonmatchings/code_1A5830/GetEnemyMaxHP.s diff --git a/asm/nonmatchings/code_16c8e0/GetLastDamage.s b/asm/nonmatchings/code_1A5830/GetLastDamage.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetLastDamage.s rename to asm/nonmatchings/code_1A5830/GetLastDamage.s diff --git a/asm/nonmatchings/code_16c8e0/GetLastEvent.s b/asm/nonmatchings/code_1A5830/GetLastEvent.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetLastEvent.s rename to asm/nonmatchings/code_1A5830/GetLastEvent.s diff --git a/asm/nonmatchings/code_16c8e0/GetOriginalActorType.s b/asm/nonmatchings/code_1A5830/GetOriginalActorType.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetOriginalActorType.s rename to asm/nonmatchings/code_1A5830/GetOriginalActorType.s diff --git a/asm/nonmatchings/code_16c8e0/IdleFlyToGoal.s b/asm/nonmatchings/code_1A5830/IdleFlyToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/IdleFlyToGoal.s rename to asm/nonmatchings/code_1A5830/IdleFlyToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/IdleJumpToGoal.s b/asm/nonmatchings/code_1A5830/IdleJumpToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/IdleJumpToGoal.s rename to asm/nonmatchings/code_1A5830/IdleJumpToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/IdleRunToGoal.s b/asm/nonmatchings/code_1A5830/IdleRunToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/IdleRunToGoal.s rename to asm/nonmatchings/code_1A5830/IdleRunToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/JumpPartTo.s b/asm/nonmatchings/code_1A5830/JumpPartTo.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/JumpPartTo.s rename to asm/nonmatchings/code_1A5830/JumpPartTo.s diff --git a/asm/nonmatchings/code_16c8e0/JumpToGoal.s b/asm/nonmatchings/code_1A5830/JumpToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/JumpToGoal.s rename to asm/nonmatchings/code_1A5830/JumpToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/JumpToGoalSimple2.s b/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/JumpToGoalSimple2.s rename to asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s diff --git a/asm/nonmatchings/code_16c8e0/JumpWithBounce.s b/asm/nonmatchings/code_1A5830/JumpWithBounce.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/JumpWithBounce.s rename to asm/nonmatchings/code_1A5830/JumpWithBounce.s diff --git a/asm/nonmatchings/code_16c8e0/LandJump.s b/asm/nonmatchings/code_1A5830/LandJump.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LandJump.s rename to asm/nonmatchings/code_1A5830/LandJump.s diff --git a/asm/nonmatchings/code_16c8e0/LandJumpPart.s b/asm/nonmatchings/code_1A5830/LandJumpPart.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LandJumpPart.s rename to asm/nonmatchings/code_1A5830/LandJumpPart.s diff --git a/asm/nonmatchings/code_16c8e0/PauseTakeTurn.s b/asm/nonmatchings/code_1A5830/PauseTakeTurn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PauseTakeTurn.s rename to asm/nonmatchings/code_1A5830/PauseTakeTurn.s diff --git a/asm/nonmatchings/code_16c8e0/RemoveActor.s b/asm/nonmatchings/code_1A5830/RemoveActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/RemoveActor.s rename to asm/nonmatchings/code_1A5830/RemoveActor.s diff --git a/asm/nonmatchings/code_16c8e0/ResumeTakeTurn.s b/asm/nonmatchings/code_1A5830/ResumeTakeTurn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ResumeTakeTurn.s rename to asm/nonmatchings/code_1A5830/ResumeTakeTurn.s diff --git a/asm/nonmatchings/code_16c8e0/RunPartTo.s b/asm/nonmatchings/code_1A5830/RunPartTo.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/RunPartTo.s rename to asm/nonmatchings/code_1A5830/RunPartTo.s diff --git a/asm/nonmatchings/code_16c8e0/RunToGoal.s b/asm/nonmatchings/code_1A5830/RunToGoal.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/RunToGoal.s rename to asm/nonmatchings/code_1A5830/RunToGoal.s diff --git a/asm/nonmatchings/code_16c8e0/SetActorSize.s b/asm/nonmatchings/code_1A5830/SetActorSize.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetActorSize.s rename to asm/nonmatchings/code_1A5830/SetActorSize.s diff --git a/asm/nonmatchings/code_16c8e0/SetDefenseTable.s b/asm/nonmatchings/code_1A5830/SetDefenseTable.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetDefenseTable.s rename to asm/nonmatchings/code_1A5830/SetDefenseTable.s diff --git a/asm/nonmatchings/code_16c8e0/SetEnemyHP.s b/asm/nonmatchings/code_1A5830/SetEnemyHP.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetEnemyHP.s rename to asm/nonmatchings/code_1A5830/SetEnemyHP.s diff --git a/asm/nonmatchings/code_16c8e0/SetIdleAnimations.s b/asm/nonmatchings/code_1A5830/SetIdleAnimations.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetIdleAnimations.s rename to asm/nonmatchings/code_1A5830/SetIdleAnimations.s diff --git a/asm/nonmatchings/code_16c8e0/SetPartSize.s b/asm/nonmatchings/code_1A5830/SetPartSize.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetPartSize.s rename to asm/nonmatchings/code_1A5830/SetPartSize.s diff --git a/asm/nonmatchings/code_16c8e0/SetStatusTable.s b/asm/nonmatchings/code_1A5830/SetStatusTable.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetStatusTable.s rename to asm/nonmatchings/code_1A5830/SetStatusTable.s diff --git a/asm/nonmatchings/code_16c8e0/SetTargetActor.s b/asm/nonmatchings/code_1A5830/SetTargetActor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetTargetActor.s rename to asm/nonmatchings/code_1A5830/SetTargetActor.s diff --git a/asm/nonmatchings/code_16c8e0/SetTargetOffset.s b/asm/nonmatchings/code_1A5830/SetTargetOffset.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/SetTargetOffset.s rename to asm/nonmatchings/code_1A5830/SetTargetOffset.s diff --git a/asm/nonmatchings/code_16c8e0/WasStatusInflicted.s b/asm/nonmatchings/code_1A5830/WasStatusInflicted.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/WasStatusInflicted.s rename to asm/nonmatchings/code_1A5830/WasStatusInflicted.s diff --git a/asm/nonmatchings/code_16c8e0/YieldTurn.s b/asm/nonmatchings/code_1A5830/YieldTurn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/YieldTurn.s rename to asm/nonmatchings/code_1A5830/YieldTurn.s diff --git a/asm/nonmatchings/code_16c8e0/calc_enemy_damage_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_enemy_damage_target.s rename to asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s diff --git a/asm/nonmatchings/code_16c8e0/calc_enemy_test_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_test_target.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_enemy_test_target.s rename to asm/nonmatchings/code_1A5830/calc_enemy_test_target.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor.s b/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor.s rename to asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_0.s b/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor_0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_0.s rename to asm/nonmatchings/code_1A5830/dispatch_damage_event_actor_0.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_1.s b/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor_1.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_1.s rename to asm/nonmatchings/code_1A5830/dispatch_damage_event_actor_1.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_actor.s b/asm/nonmatchings/code_1A5830/dispatch_event_actor.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_event_actor.s rename to asm/nonmatchings/code_1A5830/dispatch_event_actor.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_general.s b/asm/nonmatchings/code_1A5830/dispatch_event_general.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_event_general.s rename to asm/nonmatchings/code_1A5830/dispatch_event_general.s diff --git a/asm/nonmatchings/code_16c8e0/func_80276F50.s b/asm/nonmatchings/code_1A5830/func_80276F50.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80276F50.s rename to asm/nonmatchings/code_1A5830/func_80276F50.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027CC10.s b/asm/nonmatchings/code_1A5830/func_8027CC10.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027CC10.s rename to asm/nonmatchings/code_1A5830/func_8027CC10.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027D2D8.s b/asm/nonmatchings/code_1A5830/func_8027D2D8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027D2D8.s rename to asm/nonmatchings/code_1A5830/func_8027D2D8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027D32C.s b/asm/nonmatchings/code_1A5830/func_8027D32C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027D32C.s rename to asm/nonmatchings/code_1A5830/func_8027D32C.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027D434.s b/asm/nonmatchings/code_1A5830/func_8027D434.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027D434.s rename to asm/nonmatchings/code_1A5830/func_8027D434.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027D4C8.s b/asm/nonmatchings/code_1A5830/func_8027D4C8.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027D4C8.s rename to asm/nonmatchings/code_1A5830/func_8027D4C8.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027D628.s b/asm/nonmatchings/code_1A5830/func_8027D628.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027D628.s rename to asm/nonmatchings/code_1A5830/func_8027D628.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027D75C.s b/asm/nonmatchings/code_1A5830/func_8027D75C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027D75C.s rename to asm/nonmatchings/code_1A5830/func_8027D75C.s diff --git a/asm/nonmatchings/code_16c8e0/play_hit_sound.s b/asm/nonmatchings/code_1A5830/play_hit_sound.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/play_hit_sound.s rename to asm/nonmatchings/code_1A5830/play_hit_sound.s diff --git a/asm/nonmatchings/code_16c8e0/update_lerp_battle.s b/asm/nonmatchings/code_1A5830/update_lerp_battle.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/update_lerp_battle.s rename to asm/nonmatchings/code_1A5830/update_lerp_battle.s diff --git a/asm/nonmatchings/code_16c8e0/DeletePartner.s b/asm/nonmatchings/code_1AC760/DeletePartner.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/DeletePartner.s rename to asm/nonmatchings/code_1AC760/DeletePartner.s diff --git a/asm/nonmatchings/code_16c8e0/MakeOwnerTargetIndex.s b/asm/nonmatchings/code_1AC760/MakeOwnerTargetIndex.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/MakeOwnerTargetIndex.s rename to asm/nonmatchings/code_1AC760/MakeOwnerTargetIndex.s diff --git a/asm/nonmatchings/code_16c8e0/PartnerAfflictEnemy.s b/asm/nonmatchings/code_1AC760/PartnerAfflictEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PartnerAfflictEnemy.s rename to asm/nonmatchings/code_1AC760/PartnerAfflictEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/PartnerDamageEnemy.s b/asm/nonmatchings/code_1AC760/PartnerDamageEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PartnerDamageEnemy.s rename to asm/nonmatchings/code_1AC760/PartnerDamageEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/PartnerPowerBounceEnemy.s b/asm/nonmatchings/code_1AC760/PartnerPowerBounceEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PartnerPowerBounceEnemy.s rename to asm/nonmatchings/code_1AC760/PartnerPowerBounceEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/PartnerTestEnemy.s b/asm/nonmatchings/code_1AC760/PartnerTestEnemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/PartnerTestEnemy.s rename to asm/nonmatchings/code_1AC760/PartnerTestEnemy.s diff --git a/asm/nonmatchings/code_16c8e0/calc_partner_damage_enemy.s b/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_partner_damage_enemy.s rename to asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s diff --git a/asm/nonmatchings/code_16c8e0/calc_partner_test_enemy.s b/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/calc_partner_test_enemy.s rename to asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner.s b/asm/nonmatchings/code_1AC760/dispatch_damage_event_partner.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner.s rename to asm/nonmatchings/code_1AC760/dispatch_damage_event_partner.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_0.s b/asm/nonmatchings/code_1AC760/dispatch_damage_event_partner_0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_0.s rename to asm/nonmatchings/code_1AC760/dispatch_damage_event_partner_0.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_1.s b/asm/nonmatchings/code_1AC760/dispatch_damage_event_partner_1.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_1.s rename to asm/nonmatchings/code_1AC760/dispatch_damage_event_partner_1.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_partner.s b/asm/nonmatchings/code_1AC760/dispatch_event_partner.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_event_partner.s rename to asm/nonmatchings/code_1AC760/dispatch_event_partner.s diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_partner_continue_turn.s b/asm/nonmatchings/code_1AC760/dispatch_event_partner_continue_turn.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/dispatch_event_partner_continue_turn.s rename to asm/nonmatchings/code_1AC760/dispatch_event_partner_continue_turn.s diff --git a/asm/nonmatchings/code_16c8e0/func_8027FC90.s b/asm/nonmatchings/code_1AC760/func_8027FC90.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8027FC90.s rename to asm/nonmatchings/code_1AC760/func_8027FC90.s diff --git a/asm/nonmatchings/code_16c8e0/func_8028070C.s b/asm/nonmatchings/code_1AC760/func_8028070C.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_8028070C.s rename to asm/nonmatchings/code_1AC760/func_8028070C.s diff --git a/asm/nonmatchings/code_16c8e0/func_802807D0.s b/asm/nonmatchings/code_1AC760/func_802807D0.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_802807D0.s rename to asm/nonmatchings/code_1AC760/func_802807D0.s diff --git a/asm/nonmatchings/code_16c8e0/func_80280818.s b/asm/nonmatchings/code_1AC760/func_80280818.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/func_80280818.s rename to asm/nonmatchings/code_1AC760/func_80280818.s diff --git a/asm/nonmatchings/code_16c8e0/ActorAddMovePos.s b/asm/nonmatchings/code_1AF120/ActorAddMovePos.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/ActorAddMovePos.s rename to asm/nonmatchings/code_1AF120/ActorAddMovePos.s diff --git a/asm/nonmatchings/code_16c8e0/GetDamageIntensity.s b/asm/nonmatchings/code_1AF120/GetDamageIntensity.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/GetDamageIntensity.s rename to asm/nonmatchings/code_1AF120/GetDamageIntensity.s diff --git a/asm/nonmatchings/code_16c8e0/LoadStarPowerScript.s b/asm/nonmatchings/code_1AF230/LoadStarPowerScript.s similarity index 100% rename from asm/nonmatchings/code_16c8e0/LoadStarPowerScript.s rename to asm/nonmatchings/code_1AF230/LoadStarPowerScript.s diff --git a/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s b/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s new file mode 100644 index 0000000000..e071375137 --- /dev/null +++ b/asm/nonmatchings/os/nusys/nuContRmbMgr/func_8005FB10.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8005FB10 +/* 3AF10 8005FB10 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 3AF14 8005FB14 AFB10014 */ sw $s1, 0x14($sp) +/* 3AF18 8005FB18 0000882D */ daddu $s1, $zero, $zero +/* 3AF1C 8005FB1C AFB40020 */ sw $s4, 0x20($sp) +/* 3AF20 8005FB20 24140002 */ addiu $s4, $zero, 2 +/* 3AF24 8005FB24 AFB50024 */ sw $s5, 0x24($sp) +/* 3AF28 8005FB28 24150001 */ addiu $s5, $zero, 1 +/* 3AF2C 8005FB2C AFB3001C */ sw $s3, 0x1c($sp) +/* 3AF30 8005FB30 0220982D */ daddu $s3, $s1, $zero +/* 3AF34 8005FB34 AFB20018 */ sw $s2, 0x18($sp) +/* 3AF38 8005FB38 0220902D */ daddu $s2, $s1, $zero +/* 3AF3C 8005FB3C AFBF0028 */ sw $ra, 0x28($sp) +/* 3AF40 8005FB40 AFB00010 */ sw $s0, 0x10($sp) +.L8005FB44: +/* 3AF44 8005FB44 3C02800B */ lui $v0, %hi(nuContRmbCtl) +/* 3AF48 8005FB48 24421D40 */ addiu $v0, $v0, %lo(nuContRmbCtl) +/* 3AF4C 8005FB4C 02428021 */ addu $s0, $s2, $v0 +/* 3AF50 8005FB50 92030007 */ lbu $v1, 7($s0) +/* 3AF54 8005FB54 10740015 */ beq $v1, $s4, .L8005FBAC +/* 3AF58 8005FB58 28620003 */ slti $v0, $v1, 3 +/* 3AF5C 8005FB5C 50400007 */ beql $v0, $zero, .L8005FB7C +/* 3AF60 8005FB60 28620083 */ slti $v0, $v1, 0x83 +/* 3AF64 8005FB64 5060003B */ beql $v1, $zero, .L8005FC54 +/* 3AF68 8005FB68 26730068 */ addiu $s3, $s3, 0x68 +/* 3AF6C 8005FB6C 10750009 */ beq $v1, $s5, .L8005FB94 +/* 3AF70 8005FB70 0200202D */ daddu $a0, $s0, $zero +/* 3AF74 8005FB74 08017F15 */ j .L8005FC54 +/* 3AF78 8005FB78 26730068 */ addiu $s3, $s3, 0x68 +.L8005FB7C: +/* 3AF7C 8005FB7C 10400034 */ beqz $v0, .L8005FC50 +/* 3AF80 8005FB80 28620081 */ slti $v0, $v1, 0x81 +/* 3AF84 8005FB84 54400033 */ bnel $v0, $zero, .L8005FC54 +/* 3AF88 8005FB88 26730068 */ addiu $s3, $s3, 0x68 +/* 3AF8C 8005FB8C 08017F0E */ j .L8005FC38 +/* 3AF90 8005FB90 00000000 */ nop +.L8005FB94: +/* 3AF94 8005FB94 0C017E48 */ jal contRmbControl +/* 3AF98 8005FB98 0220282D */ daddu $a1, $s1, $zero +/* 3AF9C 8005FB9C 5440002C */ bnel $v0, $zero, .L8005FC50 +/* 3AFA0 8005FBA0 A2000007 */ sb $zero, 7($s0) +/* 3AFA4 8005FBA4 08017F15 */ j .L8005FC54 +/* 3AFA8 8005FBA8 26730068 */ addiu $s3, $s3, 0x68 +.L8005FBAC: +/* 3AFAC 8005FBAC 92020008 */ lbu $v0, 8($s0) +/* 3AFB0 8005FBB0 14400019 */ bnez $v0, .L8005FC18 +/* 3AFB4 8005FBB4 0200202D */ daddu $a0, $s0, $zero +/* 3AFB8 8005FBB8 96030004 */ lhu $v1, 4($s0) +/* 3AFBC 8005FBBC 3C028009 */ lui $v0, %hi(nuContRmbSearchTime) +/* 3AFC0 8005FBC0 8C423CE0 */ lw $v0, %lo(nuContRmbSearchTime)($v0) +/* 3AFC4 8005FBC4 14400002 */ bnez $v0, .L8005FBD0 +/* 3AFC8 8005FBC8 0062001B */ divu $zero, $v1, $v0 +/* 3AFCC 8005FBCC 0007000D */ break 7 +.L8005FBD0: +/* 3AFD0 8005FBD0 00001010 */ mfhi $v0 +/* 3AFD4 8005FBD4 1440000C */ bnez $v0, .L8005FC08 +/* 3AFD8 8005FBD8 00000000 */ nop +/* 3AFDC 8005FBDC 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3AFE0 8005FBE0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) +/* 3AFE4 8005FBE4 3C05800E */ lui $a1, %hi(nuContPfs) +/* 3AFE8 8005FBE8 24A5AAD8 */ addiu $a1, $a1, %lo(nuContPfs) +/* 3AFEC 8005FBEC 02652821 */ addu $a1, $s3, $a1 +/* 3AFF0 8005FBF0 0C019FD1 */ jal osMotorInit +/* 3AFF4 8005FBF4 0220302D */ daddu $a2, $s1, $zero +/* 3AFF8 8005FBF8 14400003 */ bnez $v0, .L8005FC08 +/* 3AFFC 8005FBFC 00000000 */ nop +/* 3B000 8005FC00 A2150008 */ sb $s5, 8($s0) +/* 3B004 8005FC04 A2140009 */ sb $s4, 9($s0) +.L8005FC08: +/* 3B008 8005FC08 96020004 */ lhu $v0, 4($s0) +/* 3B00C 8005FC0C 24420001 */ addiu $v0, $v0, 1 +/* 3B010 8005FC10 08017F14 */ j .L8005FC50 +/* 3B014 8005FC14 A6020004 */ sh $v0, 4($s0) +.L8005FC18: +/* 3B018 8005FC18 0C017E48 */ jal contRmbControl +/* 3B01C 8005FC1C 0220282D */ daddu $a1, $s1, $zero +/* 3B020 8005FC20 5040000C */ beql $v0, $zero, .L8005FC54 +/* 3B024 8005FC24 26730068 */ addiu $s3, $s3, 0x68 +/* 3B028 8005FC28 A6110004 */ sh $s1, 4($s0) +/* 3B02C 8005FC2C A2000008 */ sb $zero, 8($s0) +/* 3B030 8005FC30 08017F14 */ j .L8005FC50 +/* 3B034 8005FC34 A2000009 */ sb $zero, 9($s0) +.L8005FC38: +/* 3B038 8005FC38 92020009 */ lbu $v0, 9($s0) +/* 3B03C 8005FC3C 54540005 */ bnel $v0, $s4, .L8005FC54 +/* 3B040 8005FC40 26730068 */ addiu $s3, $s3, 0x68 +/* 3B044 8005FC44 0200202D */ daddu $a0, $s0, $zero +/* 3B048 8005FC48 0C017E48 */ jal contRmbControl +/* 3B04C 8005FC4C 0220282D */ daddu $a1, $s1, $zero +.L8005FC50: +/* 3B050 8005FC50 26730068 */ addiu $s3, $s3, 0x68 +.L8005FC54: +/* 3B054 8005FC54 26310001 */ addiu $s1, $s1, 1 +/* 3B058 8005FC58 2E220004 */ sltiu $v0, $s1, 4 +/* 3B05C 8005FC5C 1440FFB9 */ bnez $v0, .L8005FB44 +/* 3B060 8005FC60 2652000A */ addiu $s2, $s2, 0xa +/* 3B064 8005FC64 8FBF0028 */ lw $ra, 0x28($sp) +/* 3B068 8005FC68 8FB50024 */ lw $s5, 0x24($sp) +/* 3B06C 8005FC6C 8FB40020 */ lw $s4, 0x20($sp) +/* 3B070 8005FC70 8FB3001C */ lw $s3, 0x1c($sp) +/* 3B074 8005FC74 8FB20018 */ lw $s2, 0x18($sp) +/* 3B078 8005FC78 8FB10014 */ lw $s1, 0x14($sp) +/* 3B07C 8005FC7C 8FB00010 */ lw $s0, 0x10($sp) +/* 3B080 8005FC80 0000102D */ daddu $v0, $zero, $zero +/* 3B084 8005FC84 03E00008 */ jr $ra +/* 3B088 8005FC88 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/include/functions.h b/include/functions.h index 31ba98407f..d3f7c13411 100644 --- a/include/functions.h +++ b/include/functions.h @@ -35,6 +35,7 @@ s32 is_trigger_bound(Trigger*, Bytecode* script); Trigger* create_trigger(TriggerDefinition* def); s32 _bound_script_trigger_handler(Trigger* trigger); +Actor* get_actor(s32 actorID); s32 func_800494C0(Npc* npc, s32 arg1, s32 arg2); diff --git a/src/code_16F740.c b/src/code_16F740.c new file mode 100644 index 0000000000..e5697c4789 --- /dev/null +++ b/src/code_16F740.c @@ -0,0 +1,140 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_16F740", func_80240E60); + +INCLUDE_ASM(s32, "code_16F740", func_80240FDC); + +INCLUDE_ASM(s32, "code_16F740", func_80241190); + +INCLUDE_ASM(s32, "code_16F740", begin_battle); + +INCLUDE_ASM(s32, "code_16F740", func_80241AB8); + +INCLUDE_ASM(s32, "code_16F740", func_80241B14); + +void func_8024201C(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_heroes_start_turn); + +void func_80242AC0(void) { +} + +INCLUDE_ASM(s32, "code_16F740", switch_to_player); + +void func_80242BA8(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_end_player_turn); + +void func_80242EF8(void) { +} + +INCLUDE_ASM(s32, "code_16F740", switch_to_partner); + +void func_80242FD8(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_80242FE0); + +void func_80243910(void) { +} + +INCLUDE_ASM(s32, "code_16F740", switch_order); + +void func_802439D0(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_802439D8); + +void func_80243FD4(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_80243FDC); + +void func_80244000(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_80244008); + +void func_80244708(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_80244710); + +void func_80244A48(void) { +} + +INCLUDE_ASM(s32, "code_16F740", end_battle); + +INCLUDE_ASM(s32, "code_16F740", func_80244D90); + +INCLUDE_ASM(s32, "code_16F740", func_80244E38); + +void func_80244EF8(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_run_away); + +void func_80245438(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_80245440); + +void func_802456B0(void) { +} + +INCLUDE_ASM(s32, "code_16F740", EnablePartnerBlur); + +INCLUDE_ASM(s32, "code_16F740", DisablePartnerBlur); + +INCLUDE_ASM(s32, "code_16F740", update_swap_partner); + +void func_80245AC8(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_player_action); + +void func_80246448(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_player_change_turn); + +void func_80246B2C_code(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_partner_action); + +void func_80247214(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_8024721C); + +void func_802472A4(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_enemy_change_turn); + +void func_80247568(void) { +} + +INCLUDE_ASM(s32, "code_16F740", update_enemy_action); + +void func_80247AFC(void) { +} + +INCLUDE_ASM(s32, "code_16F740", func_80247B04); + +INCLUDE_ASM(s32, "code_16F740", func_802480F0); + +INCLUDE_ASM(s32, "code_16F740", func_80248190); + +INCLUDE_ASM(s32, "code_16F740", func_802485FC); + +INCLUDE_ASM(s32, "code_16F740", func_80248660); + +INCLUDE_ASM(s32, "code_16F740", func_80248AA4); + +INCLUDE_ASM(s32, "code_16F740", func_80248B08); + +INCLUDE_ASM(s32, "code_16F740", func_80248D78); diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index 82c26376a8..e02684f020 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -36,1496 +36,3 @@ INCLUDE_ASM(s32, "code_16c8e0", func_80240AA8); INCLUDE_ASM(s32, "code_16c8e0", delete_actor); INCLUDE_ASM(s32, "code_16c8e0", delete_player_actor); - -INCLUDE_ASM(s32, "code_16c8e0", func_80240E60); - -INCLUDE_ASM(s32, "code_16c8e0", func_80240FDC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80241190); - -INCLUDE_ASM(s32, "code_16c8e0", begin_battle); - -INCLUDE_ASM(s32, "code_16c8e0", func_80241AB8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80241B14); - -void func_8024201C(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_heroes_start_turn); - -void func_80242AC0(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", switch_to_player); - -void func_80242BA8(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_end_player_turn); - -void func_80242EF8(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", switch_to_partner); - -void func_80242FD8(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_80242FE0); - -void func_80243910(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", switch_order); - -void func_802439D0(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_802439D8); - -void func_80243FD4(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_80243FDC); - -void func_80244000(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_80244008); - -void func_80244708(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_80244710); - -void func_80244A48(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", end_battle); - -INCLUDE_ASM(s32, "code_16c8e0", func_80244D90); - -INCLUDE_ASM(s32, "code_16c8e0", func_80244E38); - -void func_80244EF8(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_run_away); - -void func_80245438(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_80245440); - -void func_802456B0(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", EnablePartnerBlur); - -INCLUDE_ASM(s32, "code_16c8e0", DisablePartnerBlur); - -INCLUDE_ASM(s32, "code_16c8e0", update_swap_partner); - -void func_80245AC8(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_player_action); - -void func_80246448(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_player_change_turn); - -void func_80246B2C_code(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_partner_action); - -void func_80247214(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_8024721C); - -void func_802472A4(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_enemy_change_turn); - -void func_80247568(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", update_enemy_action); - -void func_80247AFC(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_80247B04); - -INCLUDE_ASM(s32, "code_16c8e0", func_802480F0); - -INCLUDE_ASM(s32, "code_16c8e0", func_80248190); - -INCLUDE_ASM(s32, "code_16c8e0", func_802485FC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80248660); - -INCLUDE_ASM(s32, "code_16c8e0", func_80248AA4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80248B08); - -INCLUDE_ASM(s32, "code_16c8e0", func_80248D78); - -INCLUDE_ASM(s32, "code_16c8e0", func_80248DD0); - -INCLUDE_ASM(s32, "code_16c8e0", func_80248DE4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80249804); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024A214); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024A990); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024AFE4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024B5FC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024B9A0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024BDA4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024C180); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024C570); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024C944); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024CB68); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024CE9C); - -INCLUDE_ASM(s32, "code_16c8e0", use_cam_preset); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E3D8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E40C); - -INCLUDE_ASM(s32, "code_16c8e0", cam_target_actor); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E45C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E484); - -INCLUDE_ASM(s32, "code_16c8e0", move_cam_over); - -INCLUDE_ASM(s32, "code_16c8e0", set_cam_target_pos); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E554); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E584); - -INCLUDE_ASM(s32, "code_16c8e0", set_cam_zoom); - -INCLUDE_ASM(s32, "code_16c8e0", add_cam_zoom); - -INCLUDE_ASM(s32, "code_16c8e0", set_cam_zoffset); - -INCLUDE_ASM(s32, "code_16c8e0", unfreeze_cam); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E60C); - -INCLUDE_ASM(s32, "code_16c8e0", UseCamPreset); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E664); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E6B4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E748); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E820); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamTarget); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024E9B0); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamOffsetZ); - -INCLUDE_ASM(s32, "code_16c8e0", AddBattleCamOffsetZ); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamYaw); - -INCLUDE_ASM(s32, "code_16c8e0", BattleCamTargetActor); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EB84); - -INCLUDE_ASM(s32, "code_16c8e0", MoveBattleCamOver); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamZoom); - -INCLUDE_ASM(s32, "code_16c8e0", AddBattleCamZoom); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024ECF8); - -INCLUDE_ASM(s32, "code_16c8e0", FreezeBattleCam); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EDA4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EDC0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EDEC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EE48); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EEA8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EF08); - -INCLUDE_ASM(s32, "code_16c8e0", create_popup); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EFA4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024EFE0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024F394); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024F5AC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024F768); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024F7C8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024F84C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024F940); - -INCLUDE_ASM(s32, "code_16c8e0", show_battle_message); - -INCLUDE_ASM(s32, "code_16c8e0", show_variable_battle_message); - -INCLUDE_ASM(s32, "code_16c8e0", is_popup_displayed); - -INCLUDE_ASM(s32, "code_16c8e0", set_popup_duration); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024FAE8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024FAFC); - -INCLUDE_ASM(s32, "code_16c8e0", close_action_command_instruction_popup); - -INCLUDE_ASM(s32, "code_16c8e0", func_8024FB3C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80250818); - -INCLUDE_ASM(s32, "code_16c8e0", show_message_popup); - -INCLUDE_ASM(s32, "code_16c8e0", ShowMessageBox); - -INCLUDE_ASM(s32, "code_16c8e0", ShowVariableMessageBox); - -INCLUDE_ASM(s32, "code_16c8e0", IsMessageBoxDisplayed); - -INCLUDE_ASM(s32, "code_16c8e0", WaitForMessageBoxDone); - -INCLUDE_ASM(s32, "code_16c8e0", ForceCloseMessageBox); - -INCLUDE_ASM(s32, "code_16c8e0", SetMessageBoxDuration); - -INCLUDE_ASM(s32, "code_16c8e0", func_80251434); - -INCLUDE_ASM(s32, "code_16c8e0", func_80251454); - -INCLUDE_ASM(s32, "code_16c8e0", func_80251474); - -INCLUDE_ASM(s32, "code_16c8e0", calc_item_check_hit); - -INCLUDE_ASM(s32, "code_16c8e0", calc_item_damage_enemy); - -INCLUDE_ASM(s32, "code_16c8e0", ItemDamageEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", ItemAfflictEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", func_80252B3C); - -INCLUDE_ASM(s32, "code_16c8e0", ItemCheckHit); - -INCLUDE_ASM(s32, "code_16c8e0", ActorSpeak); - -INCLUDE_ASM(s32, "code_16c8e0", EndActorSpeech); - -INCLUDE_ASM(s32, "code_16c8e0", ShowBattleChoice); - -INCLUDE_ASM(s32, "code_16c8e0", func_802535B4); - -INCLUDE_ASM(s32, "code_16c8e0", OverrideBattleDmaDest); - -INCLUDE_ASM(s32, "code_16c8e0", LoadBattleDmaData); - -INCLUDE_ASM(s32, "code_16c8e0", func_802536A8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80253734); - -INCLUDE_ASM(s32, "code_16c8e0", func_802537C0); - -INCLUDE_ASM(s32, "code_16c8e0", PlaySoundAtActor); - -INCLUDE_ASM(s32, "code_16c8e0", PlaySoundAtPart); - -INCLUDE_ASM(s32, "code_16c8e0", PlayLoopingSoundAtActor); - -INCLUDE_ASM(s32, "code_16c8e0", StopLoopingSoundAtActor); - -INCLUDE_ASM(s32, "code_16c8e0", SetForegroundModelsVisibleUnchecked); - -INCLUDE_ASM(s32, "code_16c8e0", SetForegroundModelsVisible); - -INCLUDE_ASM(s32, "code_16c8e0", func_80253B30); - -INCLUDE_ASM(s32, "code_16c8e0", MakeStatusField); - -INCLUDE_ASM(s32, "code_16c8e0", is_actor_hp_bar_visible); - -INCLUDE_ASM(s32, "code_16c8e0", is_actortype_hpbar_visible); - -INCLUDE_ASM(s32, "code_16c8e0", save_tattle_flags); - -INCLUDE_ASM(s32, "code_16c8e0", load_tattle_flags); - -INCLUDE_ASM(s32, "code_16c8e0", func_80253FB0); - -INCLUDE_ASM(s32, "code_16c8e0", MultiplyByActorScale); - -INCLUDE_ASM(s32, "code_16c8e0", MultiplyVec2ByActorScale); - -INCLUDE_ASM(s32, "code_16c8e0", MultiplyVec3ByActorScale); - -INCLUDE_ASM(s32, "code_16c8e0", ApplyShrinkFromOwner); - -INCLUDE_ASM(s32, "code_16c8e0", StartRumble); - -INCLUDE_ASM(s32, "code_16c8e0", func_80254250); - -INCLUDE_ASM(s32, "code_16c8e0", mtx_mirror_y); - -INCLUDE_ASM(s32, "code_16c8e0", enable_actor_blur); - -INCLUDE_ASM(s32, "code_16c8e0", disable_actor_blur); - -INCLUDE_ASM(s32, "code_16c8e0", reset_actor_blur); - -INCLUDE_ASM(s32, "code_16c8e0", func_80254610); - -INCLUDE_ASM(s32, "code_16c8e0", enable_partner_blur); - -INCLUDE_ASM(s32, "code_16c8e0", disable_partner_blur); - -INCLUDE_ASM(s32, "code_16c8e0", reset_partner_blur); - -INCLUDE_ASM(s32, "code_16c8e0", func_802546B0); - -INCLUDE_ASM(s32, "code_16c8e0", enable_player_blur); - -INCLUDE_ASM(s32, "code_16c8e0", disable_player_blur); - -INCLUDE_ASM(s32, "code_16c8e0", func_80254950); - -INCLUDE_ASM(s32, "code_16c8e0", func_802549A0); - -INCLUDE_ASM(s32, "code_16c8e0", func_802549C0); - -INCLUDE_ASM(s32, "code_16c8e0", func_802549F4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80254C50); - -INCLUDE_ASM(s32, "code_16c8e0", func_802550BC); - -INCLUDE_ASM(s32, "code_16c8e0", func_802552EC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025593C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025595C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025597C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025599C); - -INCLUDE_ASM(s32, "code_16c8e0", update_actor_shadow); - -INCLUDE_ASM(s32, "code_16c8e0", update_enemy_shadows); - -INCLUDE_ASM(s32, "code_16c8e0", update_hero_shadows); - -void func_80255FD8(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_80255FE0); - -INCLUDE_ASM(s32, "code_16c8e0", func_802571F0); - -INCLUDE_ASM(s32, "code_16c8e0", func_80257B28); - -INCLUDE_ASM(s32, "code_16c8e0", func_80257B48); - -INCLUDE_ASM(s32, "code_16c8e0", func_80257B68); - -INCLUDE_ASM(s32, "code_16c8e0", func_80257B88); - -INCLUDE_ASM(s32, "code_16c8e0", update_player_actor_shadow); - -INCLUDE_ASM(s32, "code_16c8e0", func_80257DA4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80258E14); - -INCLUDE_ASM(s32, "code_16c8e0", func_802591EC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80259494); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025950C); - -INCLUDE_ASM(s32, "code_16c8e0", func_802596C0); - -INCLUDE_ASM(s32, "code_16c8e0", func_802597B0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025995C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80259A48); - -INCLUDE_ASM(s32, "code_16c8e0", func_80259AAC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80259D9C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025A2C4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025A50C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025A74C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025AA80); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025AD90); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025B1A8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025B5C0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025BAA0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025C120); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025C840); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025C8A0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025C918); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025CCC8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025CD28); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025CD40); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025CEC8); - -INCLUDE_ASM(s32, "code_16c8e0", _remove_part_decoration); - -void func_8025D150(void) { -} - -void func_8025D158(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D160); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D290); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D2B0); - -void func_8025D3C4(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D3CC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D4A0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D4C8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D620); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D640); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D6FC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D71C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D810); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D830); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D8EC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025D90C); - -void func_8025DA60(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_8025DA68); - -void func_8025DBC8(void) { -} - -INCLUDE_ASM(s32, "code_16c8e0", func_8025DBD0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025DD40); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025DD60); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025DE88); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025DEB0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025DEC4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025E030); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025E044); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025E108); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025E14C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025E190); - -INCLUDE_ASM(s32, "code_16c8e0", func_8025FF8C); - -INCLUDE_ASM(s32, "code_16c8e0", func_802601BC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260948); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260A20); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260A60); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260AD4); - -INCLUDE_ASM(s32, "code_16c8e0", activate_defend_command); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260B70); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260BF4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260DB8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260DD8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260E38); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260E5C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80260E90); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261064); - -INCLUDE_ASM(s32, "code_16c8e0", func_802610CC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261164); - -INCLUDE_ASM(s32, "code_16c8e0", func_802611E8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026127C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261388); - -INCLUDE_ASM(s32, "code_16c8e0", func_802613A8); - -INCLUDE_ASM(s32, "code_16c8e0", func_802613BC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261478); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261530); - -INCLUDE_ASM(s32, "code_16c8e0", func_802615C8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261648); - -INCLUDE_ASM(s32, "code_16c8e0", func_802616B4); - -INCLUDE_ASM(s32, "code_16c8e0", func_802616F4); - -INCLUDE_ASM(s32, "code_16c8e0", func_802619B4); - -INCLUDE_ASM(s32, "code_16c8e0", HasMerleeCastsLeft); - -INCLUDE_ASM(s32, "code_16c8e0", func_802619E8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261B40); - -INCLUDE_ASM(s32, "code_16c8e0", FXRecoverHP); - -INCLUDE_ASM(s32, "code_16c8e0", FXRecoverFP); - -INCLUDE_ASM(s32, "code_16c8e0", IncrementPlayerHP); - -INCLUDE_ASM(s32, "code_16c8e0", IncrementPlayerFP); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261D98); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261DD4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261DF4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80261FB4); - -INCLUDE_ASM(s32, "code_16c8e0", func_802620F8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80262130); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026220C); - -INCLUDE_ASM(s32, "code_16c8e0", create_target_list); - -INCLUDE_ASM(s32, "code_16c8e0", player_create_target_list); - -INCLUDE_ASM(s32, "code_16c8e0", enemy_create_target_list); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263064); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263230); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026324C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263268); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263300); - -INCLUDE_ASM(s32, "code_16c8e0", func_802633E8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263434); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263464); - -INCLUDE_ASM(s32, "code_16c8e0", func_802634B8); - -INCLUDE_ASM(s32, "code_16c8e0", func_802636E4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263914); - -INCLUDE_ASM(s32, "code_16c8e0", count_power_plus); - -INCLUDE_ASM(s32, "code_16c8e0", deduct_current_move_fp); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263C60); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263CC4); - -INCLUDE_ASM(s32, "code_16c8e0", set_animation); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263E08); - -INCLUDE_ASM(s32, "code_16c8e0", set_animation_rate); - -INCLUDE_ASM(s32, "code_16c8e0", set_actor_yaw); - -INCLUDE_ASM(s32, "code_16c8e0", set_part_yaw); - -INCLUDE_ASM(s32, "code_16c8e0", func_80263FE8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80264084); - -INCLUDE_ASM(s32, "code_16c8e0", add_xz_vec3f); - -INCLUDE_ASM(s32, "code_16c8e0", add_xz_vec3f_copy1); - -INCLUDE_ASM(s32, "code_16c8e0", add_xz_vec3f_copy2); - -INCLUDE_ASM(s32, "code_16c8e0", play_movement_dust_effects); - -INCLUDE_ASM(s32, "code_16c8e0", get_actor_part); - -INCLUDE_ASM(s32, "code_16c8e0", load_player_actor); - -INCLUDE_ASM(s32, "code_16c8e0", load_partner_actor); - -INCLUDE_ASM(s32, "code_16c8e0", create_actor); - -INCLUDE_ASM(s32, "code_16c8e0", func_80265CE8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80265D44); - -INCLUDE_ASM(s32, "code_16c8e0", lookup_defense); - -INCLUDE_ASM(s32, "code_16c8e0", lookup_status_chance); - -INCLUDE_ASM(s32, "code_16c8e0", lookup_status_duration_mod); - -INCLUDE_ASM(s32, "code_16c8e0", inflict_status); - -INCLUDE_ASM(s32, "code_16c8e0", inflict_partner_ko); - -INCLUDE_ASM(s32, "code_16c8e0", get_defense); - -INCLUDE_ASM(s32, "code_16c8e0", func_802664DC); - -INCLUDE_ASM(s32, "code_16c8e0", show_damage_popup); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266684); - -INCLUDE_ASM(s32, "code_16c8e0", func_802666E4); - -INCLUDE_ASM(s32, "code_16c8e0", func_802667F0); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266970); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266978); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266ADC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266AF8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266B14); - -INCLUDE_ASM(s32, "code_16c8e0", try_inflict_status); - -INCLUDE_ASM(s32, "code_16c8e0", inflict_status_set_duration); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266D6C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266DAC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266E14); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266E40); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266EA8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266EE8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266F60); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266F8C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80266FD8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80267018); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026709C); - -INCLUDE_ASM(s32, "code_16c8e0", func_802670C8); - -INCLUDE_ASM(s32, "code_16c8e0", add_part_decoration); - -INCLUDE_ASM(s32, "code_16c8e0", add_actor_decoration); - -INCLUDE_ASM(s32, "code_16c8e0", remove_part_decoration); - -INCLUDE_ASM(s32, "code_16c8e0", remove_actor_decoration); - -INCLUDE_ASM(s32, "code_16c8e0", heroes_is_ability_active); - -INCLUDE_ASM(s32, "code_16c8e0", create_part_shadow); - -INCLUDE_ASM(s32, "code_16c8e0", remove_part_shadow); - -INCLUDE_ASM(s32, "code_16c8e0", func_802673E4); - -INCLUDE_ASM(s32, "code_16c8e0", remove_player_buffs); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026777C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026787C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80267A3C); - -INCLUDE_ASM(s32, "code_16c8e0", reset_all_actor_sounds); - -INCLUDE_ASM(s32, "code_16c8e0", hide_foreground_models_unchecked); - -INCLUDE_ASM(s32, "code_16c8e0", show_foreground_models_unchecked); - -INCLUDE_ASM(s32, "code_16c8e0", hide_foreground_models); - -INCLUDE_ASM(s32, "code_16c8e0", show_foreground_models); - -INCLUDE_ASM(s32, "code_16c8e0", StartRumbleWithParams); - -INCLUDE_ASM(s32, "code_16c8e0", start_rumble_type); - -INCLUDE_ASM(s32, "code_16c8e0", LoadItemScript); - -INCLUDE_ASM(s32, "code_16c8e0", LoadFreeItemScript); - -INCLUDE_ASM(s32, "code_16c8e0", LoadMoveScript); - -INCLUDE_ASM(s32, "code_16c8e0", LoadActionCommand); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268224); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268284); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268770); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268798); - -INCLUDE_ASM(s32, "code_16c8e0", func_802687BC); - -INCLUDE_ASM(s32, "code_16c8e0", func_802687E4); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026880C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268834); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268858); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268938); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268AF8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268C9C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80268E88); - -INCLUDE_ASM(s32, "code_16c8e0", check_block_input); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269118); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269160); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026919C); - -INCLUDE_ASM(s32, "code_16c8e0", func_802691C8); - -INCLUDE_ASM(s32, "code_16c8e0", GetActionSuccess); - -INCLUDE_ASM(s32, "code_16c8e0", SetActionSuccess); - -INCLUDE_ASM(s32, "code_16c8e0", func_802692EC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269318); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269344); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269370); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026939C); - -INCLUDE_ASM(s32, "code_16c8e0", func_802693F0); - -INCLUDE_ASM(s32, "code_16c8e0", CloseActionCommandInfo); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269470); - -INCLUDE_ASM(s32, "code_16c8e0", func_802694A4); - -INCLUDE_ASM(s32, "code_16c8e0", GetActionSuccessCopy); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269524); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269550); - -INCLUDE_ASM(s32, "code_16c8e0", GetBlockResult); - -INCLUDE_ASM(s32, "code_16c8e0", func_802695A8); - -INCLUDE_ASM(s32, "code_16c8e0", func_802695D4); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269600); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026962C); - -INCLUDE_ASM(s32, "code_16c8e0", count_targets); - -INCLUDE_ASM(s32, "code_16c8e0", get_nearest_home_index); - -INCLUDE_ASM(s32, "code_16c8e0", set_goal_pos_to_part); - -INCLUDE_ASM(s32, "code_16c8e0", set_part_goal_to_actor_part); - -INCLUDE_ASM(s32, "code_16c8e0", set_actor_current_position); - -INCLUDE_ASM(s32, "code_16c8e0", set_part_absolute_position); - -INCLUDE_ASM(s32, "code_16c8e0", set_actor_home_position); - -INCLUDE_ASM(Actor*, "code_16c8e0", get_actor, s32 actorID); - -INCLUDE_ASM(s32, "code_16c8e0", LoadBattleSection); - -INCLUDE_ASM(s32, "code_16c8e0", GetBattlePhase); - -INCLUDE_ASM(s32, "code_16c8e0", GetLastElement); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269E80); - -INCLUDE_ASM(s32, "code_16c8e0", func_80269EAC); - -INCLUDE_ASM(s32, "code_16c8e0", SetGoalToHome); - -INCLUDE_ASM(s32, "code_16c8e0", SetIdleGoalToHome); - -INCLUDE_ASM(s32, "code_16c8e0", SetGoalToIndex); - -INCLUDE_ASM(s32, "code_16c8e0", GetIndexFromPos); - -INCLUDE_ASM(s32, "code_16c8e0", GetIndexFromHome); - -INCLUDE_ASM(s32, "code_16c8e0", CountPlayerTargets); - -INCLUDE_ASM(s32, "code_16c8e0", ForceHomePos); - -INCLUDE_ASM(s32, "code_16c8e0", SetHomePos); - -INCLUDE_ASM(s32, "code_16c8e0", SetGoalToTarget); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartGoalToTarget); - -INCLUDE_ASM(s32, "code_16c8e0", SetGoalToFirstTarget); - -INCLUDE_ASM(s32, "code_16c8e0", SetGoalPos); - -INCLUDE_ASM(s32, "code_16c8e0", SetIdleGoal); - -INCLUDE_ASM(s32, "code_16c8e0", AddGoalPos); - -INCLUDE_ASM(s32, "code_16c8e0", GetGoalPos); - -INCLUDE_ASM(s32, "code_16c8e0", GetIdleGoal); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartTarget); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorPos); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartOffset); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartPos); - -INCLUDE_ASM(s32, "code_16c8e0", GetHomePos); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorPos); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartPos); - -INCLUDE_ASM(s32, "code_16c8e0", SetEnemyTargetOffset); - -INCLUDE_ASM(s32, "code_16c8e0", SetAnimation); - -INCLUDE_ASM(s32, "code_16c8e0", GetAnimation); - -INCLUDE_ASM(s32, "code_16c8e0", SetAnimationRate); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorYaw); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorYaw); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartYaw); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartYaw); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorJumpGravity); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorIdleJumpGravity); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorSpeed); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorIdleSpeed); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartJumpGravity); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartMoveSpeed); - -INCLUDE_ASM(s32, "code_16c8e0", SetJumpAnimations); - -INCLUDE_ASM(s32, "code_16c8e0", AddActorPos); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorDispOffset); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartDispOffset); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartDispOffset); - -INCLUDE_ASM(s32, "code_16c8e0", AddPartDispOffset); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026BF48); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorVar); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorVar); - -INCLUDE_ASM(s32, "code_16c8e0", AddActorVar); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartMovementVar); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartMovementVar); - -INCLUDE_ASM(s32, "code_16c8e0", AddPartMovementVar); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorRotation); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorRotationOffset); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorRotation); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartRotation); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartRotationOffset); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartRotation); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorScale); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorScaleModifier); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorScale); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartScale); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartScale); - -INCLUDE_ASM(s32, "code_16c8e0", GetBattleFlags); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleFlagBits); - -INCLUDE_ASM(s32, "code_16c8e0", GetBattleFlags2); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleFlagBits2); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorFlags); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorFlagBits); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorFlags); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartFlags); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartFlagBits); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartTargetFlags); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartTargetFlagBits); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartFlags); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartTargetFlags); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartEventFlags); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartEventBits); - -INCLUDE_ASM(s32, "code_16c8e0", GetPartEventFlags); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026D51C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026D5A4); - -INCLUDE_ASM(s32, "code_16c8e0", HPBarToHome); - -INCLUDE_ASM(s32, "code_16c8e0", HPBarToCurrent); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026D8EC); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026D940); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026DA94); - -INCLUDE_ASM(s32, "code_16c8e0", SummonEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", GetOwnerID); - -INCLUDE_ASM(s32, "code_16c8e0", SetOwnerID); - -ApiStatus ActorExists(ScriptInstance* script, s32 isInitialCall) { - Bytecode isExist; - Actor* partner = gBattleStatus.partnerActor; - Bytecode* args = script->ptrReadPos; - ActorId actorID = get_variable(script, *args++); - - if (actorID == -0x7F) { - actorID = script->ownerActorID; - } - - isExist = get_actor(actorID) != NULL; - if ((actorID == ActorId_PARTNER) && (partner == NULL)) { - isExist = FALSE; - } - - set_variable(script, *args++, isExist); - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "code_16c8e0", func_8026DEF0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026DF88); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E020); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E038); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleInputMask); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleInputButtons); - -INCLUDE_ASM(s32, "code_16c8e0", CheckButtonPress); - -INCLUDE_ASM(s32, "code_16c8e0", CheckButtonHeld); - -INCLUDE_ASM(s32, "code_16c8e0", CheckButtonDown); - -INCLUDE_ASM(s32, "code_16c8e0", GetBattleState); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E16C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E198); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E208); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E260); - -INCLUDE_ASM(s32, "code_16c8e0", PlayerCreateTargetList); - -INCLUDE_ASM(s32, "code_16c8e0", EnemyCreateTargetList); - -INCLUDE_ASM(s32, "code_16c8e0", InitTargetIterator); - -INCLUDE_ASM(s32, "code_16c8e0", SetOwnerTarget); - -INCLUDE_ASM(s32, "code_16c8e0", ChooseNextTarget); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E558); - -INCLUDE_ASM(s32, "code_16c8e0", GetTargetListLength); - -INCLUDE_ASM(s32, "code_16c8e0", GetOwnerTarget); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E914); - -INCLUDE_ASM(s32, "code_16c8e0", GetPlayerActorID); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026E9A0); - -INCLUDE_ASM(s32, "code_16c8e0", GetDistanceToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026EA7C); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026EB20); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026EBF8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026ED20); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026EDE4); - -INCLUDE_ASM(s32, "code_16c8e0", AddActorDecoration); - -INCLUDE_ASM(s32, "code_16c8e0", RemoveActorDecoration); - -INCLUDE_ASM(s32, "code_16c8e0", ModifyActorDecoration); - -INCLUDE_ASM(s32, "code_16c8e0", UseIdleAnimation); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026F1A0); - -INCLUDE_ASM(s32, "code_16c8e0", GetStatusFlags); - -INCLUDE_ASM(s32, "code_16c8e0", RemovePlayerBuffs); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartAlpha); - -INCLUDE_ASM(s32, "code_16c8e0", CreatePartShadow); - -INCLUDE_ASM(s32, "code_16c8e0", RemovePartShadow); - -INCLUDE_ASM(s32, "code_16c8e0", func_8026F60C); - -INCLUDE_ASM(s32, "code_16c8e0", SetBattleVar); - -INCLUDE_ASM(s32, "code_16c8e0", GetBattleVar); - -INCLUDE_ASM(s32, "code_16c8e0", ResetAllActorSounds); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorSounds); - -INCLUDE_ASM(s32, "code_16c8e0", ResetActorSounds); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartSounds); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorType); - -INCLUDE_ASM(s32, "code_16c8e0", ShowShockEffect); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorAttackBoost); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorDefenseBoost); - -INCLUDE_ASM(s32, "code_16c8e0", BoostAttack); - -INCLUDE_ASM(s32, "code_16c8e0", BoostDefense); - -INCLUDE_ASM(s32, "code_16c8e0", VanishActor); - -INCLUDE_ASM(s32, "code_16c8e0", ElectrifyActor); - -INCLUDE_ASM(s32, "code_16c8e0", HealActor); - -INCLUDE_ASM(s32, "code_16c8e0", WaitForBuffDone); - -INCLUDE_ASM(s32, "code_16c8e0", CopyBuffs); - -INCLUDE_ASM(s32, "code_16c8e0", func_80271210); - -INCLUDE_ASM(s32, "code_16c8e0", func_80271258); - -INCLUDE_ASM(s32, "code_16c8e0", func_802712A0); - -INCLUDE_ASM(s32, "code_16c8e0", func_80271328); - -INCLUDE_ASM(s32, "code_16c8e0", func_802713B0); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027143C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80271484); - -INCLUDE_ASM(s32, "code_16c8e0", func_80271588); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_player); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_player_continue_turn); - -INCLUDE_ASM(s32, "code_16c8e0", calc_player_test_enemy); - -INCLUDE_ASM(s32, "code_16c8e0", calc_player_damage_enemy); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_player); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_player_0); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_player_1); - -INCLUDE_ASM(s32, "code_16c8e0", GetMenuSelection); - -INCLUDE_ASM(s32, "code_16c8e0", func_80273444); - -INCLUDE_ASM(s32, "code_16c8e0", PlayerFallToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", PlayerLandJump); - -INCLUDE_ASM(s32, "code_16c8e0", PlayerRunToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", CancelablePlayerRunToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", GetPlayerHP); - -INCLUDE_ASM(s32, "code_16c8e0", PlayerDamageEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", PlayerPowerBounceEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", PlayerTestEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", DispatchDamagePlayerEvent); - -INCLUDE_ASM(s32, "code_16c8e0", EnablePlayerBlur); - -INCLUDE_ASM(s32, "code_16c8e0", func_802749D8); - -INCLUDE_ASM(s32, "code_16c8e0", func_802749F8); - -INCLUDE_ASM(s32, "code_16c8e0", func_80274A18); - -INCLUDE_ASM(s32, "code_16c8e0", func_802752AC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80275F00); - -INCLUDE_ASM(s32, "code_16c8e0", DidActionSucceed); - -INCLUDE_ASM(s32, "code_16c8e0", func_80276EFC); - -INCLUDE_ASM(s32, "code_16c8e0", func_80276F1C); - -INCLUDE_ASM(s32, "code_16c8e0", func_80276F50); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_general); - -INCLUDE_ASM(s32, "code_16c8e0", play_hit_sound); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_actor); - -INCLUDE_ASM(s32, "code_16c8e0", calc_enemy_test_target); - -INCLUDE_ASM(s32, "code_16c8e0", calc_enemy_damage_target); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_actor); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_actor_0); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_actor_1); - -INCLUDE_ASM(s32, "code_16c8e0", BindTakeTurn); - -INCLUDE_ASM(s32, "code_16c8e0", PauseTakeTurn); - -INCLUDE_ASM(s32, "code_16c8e0", ResumeTakeTurn); - -INCLUDE_ASM(s32, "code_16c8e0", BindIdle); - -INCLUDE_ASM(s32, "code_16c8e0", EnableIdleScript); - -INCLUDE_ASM(s32, "code_16c8e0", BindHandleEvent); - -INCLUDE_ASM(s32, "code_16c8e0", BindNextTurn); - -INCLUDE_ASM(s32, "code_16c8e0", JumpToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", IdleJumpToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", JumpToGoalSimple2); - -INCLUDE_ASM(s32, "code_16c8e0", JumpWithBounce); - -INCLUDE_ASM(s32, "code_16c8e0", LandJump); - -INCLUDE_ASM(s32, "code_16c8e0", FallToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", RunToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", IdleRunToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", JumpPartTo); - -INCLUDE_ASM(s32, "code_16c8e0", FallPartTo); - -INCLUDE_ASM(s32, "code_16c8e0", LandJumpPart); - -INCLUDE_ASM(s32, "code_16c8e0", RunPartTo); - -INCLUDE_ASM(s32, "code_16c8e0", update_lerp_battle); - -INCLUDE_ASM(s32, "code_16c8e0", FlyToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", IdleFlyToGoal); - -INCLUDE_ASM(s32, "code_16c8e0", FlyPartTo); - -INCLUDE_ASM(s32, "code_16c8e0", GetLastEvent); - -INCLUDE_ASM(s32, "code_16c8e0", SetTargetActor); - -INCLUDE_ASM(s32, "code_16c8e0", SetEnemyHP); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorHP); - -INCLUDE_ASM(s32, "code_16c8e0", GetEnemyMaxHP); - -INCLUDE_ASM(s32, "code_16c8e0", RemoveActor); - -INCLUDE_ASM(s32, "code_16c8e0", DropStarPoints); - -INCLUDE_ASM(s32, "code_16c8e0", SetDefenseTable); - -INCLUDE_ASM(s32, "code_16c8e0", SetStatusTable); - -INCLUDE_ASM(s32, "code_16c8e0", SetIdleAnimations); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027CC10); - -INCLUDE_ASM(s32, "code_16c8e0", EnemyDamageTarget); - -INCLUDE_ASM(s32, "code_16c8e0", EnemyFollowupAfflictTarget); - -INCLUDE_ASM(s32, "code_16c8e0", EnemyTestTarget); - -INCLUDE_ASM(s32, "code_16c8e0", DispatchDamageEvent); - -INCLUDE_ASM(s32, "code_16c8e0", DispatchEvent); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027D2D8); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027D32C); - -INCLUDE_ASM(s32, "code_16c8e0", SetTargetOffset); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027D434); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027D4C8); - -INCLUDE_ASM(s32, "code_16c8e0", EnableActorBlur); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027D628); - -INCLUDE_ASM(s32, "code_16c8e0", AfflictActor); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027D75C); - -INCLUDE_ASM(s32, "code_16c8e0", GetEncounterState); - -INCLUDE_ASM(s32, "code_16c8e0", YieldTurn); - -INCLUDE_ASM(s32, "code_16c8e0", SetActorSize); - -INCLUDE_ASM(s32, "code_16c8e0", GetActorSize); - -INCLUDE_ASM(s32, "code_16c8e0", SetPartSize); - -INCLUDE_ASM(s32, "code_16c8e0", GetOriginalActorType); - -INCLUDE_ASM(s32, "code_16c8e0", GetCurrentActorType); - -INCLUDE_ASM(s32, "code_16c8e0", GetLastDamage); - -INCLUDE_ASM(s32, "code_16c8e0", EnableActorGlow); - -INCLUDE_ASM(s32, "code_16c8e0", WasStatusInflicted); - -INCLUDE_ASM(s32, "code_16c8e0", CopyStatusEffects); - -INCLUDE_ASM(s32, "code_16c8e0", ClearStatusEffects); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_partner); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_partner_continue_turn); - -INCLUDE_ASM(s32, "code_16c8e0", calc_partner_test_enemy); - -INCLUDE_ASM(s32, "code_16c8e0", calc_partner_damage_enemy); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_partner); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_partner_0); - -INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_partner_1); - -INCLUDE_ASM(s32, "code_16c8e0", MakeOwnerTargetIndex); - -INCLUDE_ASM(s32, "code_16c8e0", func_8027FC90); - -ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 actorID = get_variable(script, *args++); - Bytecode* outVar; - - if (actorID == -0x7F) { - actorID = script->ownerActorID; - } - - outVar = *args++; - set_variable(script, outVar, get_actor(actorID)->staticActorData->level); - - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "code_16c8e0", PartnerDamageEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", PartnerAfflictEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", PartnerPowerBounceEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", PartnerTestEnemy); - -INCLUDE_ASM(s32, "code_16c8e0", func_8028070C); - -INCLUDE_ASM(s32, "code_16c8e0", DeletePartner); - -INCLUDE_ASM(s32, "code_16c8e0", func_802807D0); - -INCLUDE_ASM(s32, "code_16c8e0", func_80280818); - -INCLUDE_ASM(s32, "code_16c8e0", GetDamageIntensity); - -INCLUDE_ASM(s32, "code_16c8e0", ActorAddMovePos); - -INCLUDE_ASM(s32, "code_16c8e0", LoadStarPowerScript); diff --git a/src/code_1776B0.c b/src/code_1776B0.c new file mode 100644 index 0000000000..4188c1ec21 --- /dev/null +++ b/src/code_1776B0.c @@ -0,0 +1,95 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1776B0", func_80248DD0); + +INCLUDE_ASM(s32, "code_1776B0", func_80248DE4); + +INCLUDE_ASM(s32, "code_1776B0", func_80249804); + +INCLUDE_ASM(s32, "code_1776B0", func_8024A214); + +INCLUDE_ASM(s32, "code_1776B0", func_8024A990); + +INCLUDE_ASM(s32, "code_1776B0", func_8024AFE4); + +INCLUDE_ASM(s32, "code_1776B0", func_8024B5FC); + +INCLUDE_ASM(s32, "code_1776B0", func_8024B9A0); + +INCLUDE_ASM(s32, "code_1776B0", func_8024BDA4); + +INCLUDE_ASM(s32, "code_1776B0", func_8024C180); + +INCLUDE_ASM(s32, "code_1776B0", func_8024C570); + +INCLUDE_ASM(s32, "code_1776B0", func_8024C944); + +INCLUDE_ASM(s32, "code_1776B0", func_8024CB68); + +INCLUDE_ASM(s32, "code_1776B0", func_8024CE9C); + +INCLUDE_ASM(s32, "code_1776B0", use_cam_preset); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E3D8); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E40C); + +INCLUDE_ASM(s32, "code_1776B0", cam_target_actor); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E45C); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E484); + +INCLUDE_ASM(s32, "code_1776B0", move_cam_over); + +INCLUDE_ASM(s32, "code_1776B0", set_cam_target_pos); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E554); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E584); + +INCLUDE_ASM(s32, "code_1776B0", set_cam_zoom); + +INCLUDE_ASM(s32, "code_1776B0", add_cam_zoom); + +INCLUDE_ASM(s32, "code_1776B0", set_cam_zoffset); + +INCLUDE_ASM(s32, "code_1776B0", unfreeze_cam); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E60C); + +INCLUDE_ASM(s32, "code_1776B0", UseCamPreset); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E664); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E6B4); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E748); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E820); + +INCLUDE_ASM(s32, "code_1776B0", SetBattleCamTarget); + +INCLUDE_ASM(s32, "code_1776B0", func_8024E9B0); + +INCLUDE_ASM(s32, "code_1776B0", SetBattleCamOffsetZ); + +INCLUDE_ASM(s32, "code_1776B0", AddBattleCamOffsetZ); + +INCLUDE_ASM(s32, "code_1776B0", SetBattleCamYaw); + +INCLUDE_ASM(s32, "code_1776B0", BattleCamTargetActor); + +INCLUDE_ASM(s32, "code_1776B0", func_8024EB84); + +INCLUDE_ASM(s32, "code_1776B0", MoveBattleCamOver); + +INCLUDE_ASM(s32, "code_1776B0", SetBattleCamZoom); + +INCLUDE_ASM(s32, "code_1776B0", AddBattleCamZoom); + +INCLUDE_ASM(s32, "code_1776B0", func_8024ECF8); + +INCLUDE_ASM(s32, "code_1776B0", FreezeBattleCam); + +INCLUDE_ASM(s32, "code_1776B0", func_8024EDA4); diff --git a/src/code_17D6A0.c b/src/code_17D6A0.c new file mode 100644 index 0000000000..350593456f --- /dev/null +++ b/src/code_17D6A0.c @@ -0,0 +1,67 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_17D6A0", func_8024EDC0); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024EDEC); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024EE48); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024EEA8); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024EF08); + +INCLUDE_ASM(s32, "code_17D6A0", create_popup); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024EFA4); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024EFE0); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024F394); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024F5AC); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024F768); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024F7C8); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024F84C); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024F940); + +INCLUDE_ASM(s32, "code_17D6A0", show_battle_message); + +INCLUDE_ASM(s32, "code_17D6A0", show_variable_battle_message); + +INCLUDE_ASM(s32, "code_17D6A0", is_popup_displayed); + +INCLUDE_ASM(s32, "code_17D6A0", set_popup_duration); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024FAE8); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024FAFC); + +INCLUDE_ASM(s32, "code_17D6A0", close_action_command_instruction_popup); + +INCLUDE_ASM(s32, "code_17D6A0", func_8024FB3C); + +INCLUDE_ASM(s32, "code_17D6A0", func_80250818); + +INCLUDE_ASM(s32, "code_17D6A0", show_message_popup); + +INCLUDE_ASM(s32, "code_17D6A0", ShowMessageBox); + +INCLUDE_ASM(s32, "code_17D6A0", ShowVariableMessageBox); + +INCLUDE_ASM(s32, "code_17D6A0", IsMessageBoxDisplayed); + +INCLUDE_ASM(s32, "code_17D6A0", WaitForMessageBoxDone); + +INCLUDE_ASM(s32, "code_17D6A0", ForceCloseMessageBox); + +INCLUDE_ASM(s32, "code_17D6A0", SetMessageBoxDuration); + +INCLUDE_ASM(s32, "code_17D6A0", func_80251434); + +INCLUDE_ASM(s32, "code_17D6A0", func_80251454); + +INCLUDE_ASM(s32, "code_17D6A0", func_80251474); diff --git a/src/code_17FEB0.c b/src/code_17FEB0.c new file mode 100644 index 0000000000..5e3abcac4f --- /dev/null +++ b/src/code_17FEB0.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_17FEB0", calc_item_check_hit); + +INCLUDE_ASM(s32, "code_17FEB0", calc_item_damage_enemy); + +INCLUDE_ASM(s32, "code_17FEB0", ItemDamageEnemy); + +INCLUDE_ASM(s32, "code_17FEB0", ItemAfflictEnemy); + +INCLUDE_ASM(s32, "code_17FEB0", func_80252B3C); + +INCLUDE_ASM(s32, "code_17FEB0", ItemCheckHit); diff --git a/src/code_181810.c b/src/code_181810.c new file mode 100644 index 0000000000..03e25e75f9 --- /dev/null +++ b/src/code_181810.c @@ -0,0 +1,55 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_181810", ActorSpeak); + +INCLUDE_ASM(s32, "code_181810", EndActorSpeech); + +INCLUDE_ASM(s32, "code_181810", ShowBattleChoice); + +INCLUDE_ASM(s32, "code_181810", func_802535B4); + +INCLUDE_ASM(s32, "code_181810", OverrideBattleDmaDest); + +INCLUDE_ASM(s32, "code_181810", LoadBattleDmaData); + +INCLUDE_ASM(s32, "code_181810", func_802536A8); + +INCLUDE_ASM(s32, "code_181810", func_80253734); + +INCLUDE_ASM(s32, "code_181810", func_802537C0); + +INCLUDE_ASM(s32, "code_181810", PlaySoundAtActor); + +INCLUDE_ASM(s32, "code_181810", PlaySoundAtPart); + +INCLUDE_ASM(s32, "code_181810", PlayLoopingSoundAtActor); + +INCLUDE_ASM(s32, "code_181810", StopLoopingSoundAtActor); + +INCLUDE_ASM(s32, "code_181810", SetForegroundModelsVisibleUnchecked); + +INCLUDE_ASM(s32, "code_181810", SetForegroundModelsVisible); + +INCLUDE_ASM(s32, "code_181810", func_80253B30); + +INCLUDE_ASM(s32, "code_181810", MakeStatusField); + +INCLUDE_ASM(s32, "code_181810", is_actor_hp_bar_visible); + +INCLUDE_ASM(s32, "code_181810", is_actortype_hpbar_visible); + +INCLUDE_ASM(s32, "code_181810", save_tattle_flags); + +INCLUDE_ASM(s32, "code_181810", load_tattle_flags); + +INCLUDE_ASM(s32, "code_181810", func_80253FB0); + +INCLUDE_ASM(s32, "code_181810", MultiplyByActorScale); + +INCLUDE_ASM(s32, "code_181810", MultiplyVec2ByActorScale); + +INCLUDE_ASM(s32, "code_181810", MultiplyVec3ByActorScale); + +INCLUDE_ASM(s32, "code_181810", ApplyShrinkFromOwner); + +INCLUDE_ASM(s32, "code_181810", StartRumble); diff --git a/src/code_182B30.c b/src/code_182B30.c new file mode 100644 index 0000000000..976284a370 --- /dev/null +++ b/src/code_182B30.c @@ -0,0 +1,179 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_182B30", func_80254250); + +INCLUDE_ASM(s32, "code_182B30", mtx_mirror_y); + +INCLUDE_ASM(s32, "code_182B30", enable_actor_blur); + +INCLUDE_ASM(s32, "code_182B30", disable_actor_blur); + +INCLUDE_ASM(s32, "code_182B30", reset_actor_blur); + +INCLUDE_ASM(s32, "code_182B30", func_80254610); + +INCLUDE_ASM(s32, "code_182B30", enable_partner_blur); + +INCLUDE_ASM(s32, "code_182B30", disable_partner_blur); + +INCLUDE_ASM(s32, "code_182B30", reset_partner_blur); + +INCLUDE_ASM(s32, "code_182B30", func_802546B0); + +INCLUDE_ASM(s32, "code_182B30", enable_player_blur); + +INCLUDE_ASM(s32, "code_182B30", disable_player_blur); + +INCLUDE_ASM(s32, "code_182B30", func_80254950); + +INCLUDE_ASM(s32, "code_182B30", func_802549A0); + +INCLUDE_ASM(s32, "code_182B30", func_802549C0); + +INCLUDE_ASM(s32, "code_182B30", func_802549F4); + +INCLUDE_ASM(s32, "code_182B30", func_80254C50); + +INCLUDE_ASM(s32, "code_182B30", func_802550BC); + +INCLUDE_ASM(s32, "code_182B30", func_802552EC); + +INCLUDE_ASM(s32, "code_182B30", func_8025593C); + +INCLUDE_ASM(s32, "code_182B30", func_8025595C); + +INCLUDE_ASM(s32, "code_182B30", func_8025597C); + +INCLUDE_ASM(s32, "code_182B30", func_8025599C); + +INCLUDE_ASM(s32, "code_182B30", update_actor_shadow); + +INCLUDE_ASM(s32, "code_182B30", update_enemy_shadows); + +INCLUDE_ASM(s32, "code_182B30", update_hero_shadows); + +void func_80255FD8(void) { +} + +INCLUDE_ASM(s32, "code_182B30", func_80255FE0); + +INCLUDE_ASM(s32, "code_182B30", func_802571F0); + +INCLUDE_ASM(s32, "code_182B30", func_80257B28); + +INCLUDE_ASM(s32, "code_182B30", func_80257B48); + +INCLUDE_ASM(s32, "code_182B30", func_80257B68); + +INCLUDE_ASM(s32, "code_182B30", func_80257B88); + +INCLUDE_ASM(s32, "code_182B30", update_player_actor_shadow); + +INCLUDE_ASM(s32, "code_182B30", func_80257DA4); + +INCLUDE_ASM(s32, "code_182B30", func_80258E14); + +INCLUDE_ASM(s32, "code_182B30", func_802591EC); + +INCLUDE_ASM(s32, "code_182B30", func_80259494); + +INCLUDE_ASM(s32, "code_182B30", func_8025950C); + +INCLUDE_ASM(s32, "code_182B30", func_802596C0); + +INCLUDE_ASM(s32, "code_182B30", func_802597B0); + +INCLUDE_ASM(s32, "code_182B30", func_8025995C); + +INCLUDE_ASM(s32, "code_182B30", func_80259A48); + +INCLUDE_ASM(s32, "code_182B30", func_80259AAC); + +INCLUDE_ASM(s32, "code_182B30", func_80259D9C); + +INCLUDE_ASM(s32, "code_182B30", func_8025A2C4); + +INCLUDE_ASM(s32, "code_182B30", func_8025A50C); + +INCLUDE_ASM(s32, "code_182B30", func_8025A74C); + +INCLUDE_ASM(s32, "code_182B30", func_8025AA80); + +INCLUDE_ASM(s32, "code_182B30", func_8025AD90); + +INCLUDE_ASM(s32, "code_182B30", func_8025B1A8); + +INCLUDE_ASM(s32, "code_182B30", func_8025B5C0); + +INCLUDE_ASM(s32, "code_182B30", func_8025BAA0); + +INCLUDE_ASM(s32, "code_182B30", func_8025C120); + +INCLUDE_ASM(s32, "code_182B30", func_8025C840); + +INCLUDE_ASM(s32, "code_182B30", func_8025C8A0); + +INCLUDE_ASM(s32, "code_182B30", func_8025C918); + +INCLUDE_ASM(s32, "code_182B30", func_8025CCC8); + +INCLUDE_ASM(s32, "code_182B30", func_8025CD28); + +INCLUDE_ASM(s32, "code_182B30", func_8025CD40); + +INCLUDE_ASM(s32, "code_182B30", func_8025CEC8); + +INCLUDE_ASM(s32, "code_182B30", _remove_part_decoration); + +void func_8025D150(void) { +} + +void func_8025D158(void) { +} + +INCLUDE_ASM(s32, "code_182B30", func_8025D160); + +INCLUDE_ASM(s32, "code_182B30", func_8025D290); + +INCLUDE_ASM(s32, "code_182B30", func_8025D2B0); + +void func_8025D3C4(void) { +} + +INCLUDE_ASM(s32, "code_182B30", func_8025D3CC); + +INCLUDE_ASM(s32, "code_182B30", func_8025D4A0); + +INCLUDE_ASM(s32, "code_182B30", func_8025D4C8); + +INCLUDE_ASM(s32, "code_182B30", func_8025D620); + +INCLUDE_ASM(s32, "code_182B30", func_8025D640); + +INCLUDE_ASM(s32, "code_182B30", func_8025D6FC); + +INCLUDE_ASM(s32, "code_182B30", func_8025D71C); + +INCLUDE_ASM(s32, "code_182B30", func_8025D810); + +INCLUDE_ASM(s32, "code_182B30", func_8025D830); + +INCLUDE_ASM(s32, "code_182B30", func_8025D8EC); + +INCLUDE_ASM(s32, "code_182B30", func_8025D90C); + +void func_8025DA60(void) { +} + +INCLUDE_ASM(s32, "code_182B30", func_8025DA68); + +void func_8025DBC8(void) { +} + +INCLUDE_ASM(s32, "code_182B30", func_8025DBD0); + +INCLUDE_ASM(s32, "code_182B30", func_8025DD40); + +INCLUDE_ASM(s32, "code_182B30", func_8025DD60); + +INCLUDE_ASM(s32, "code_182B30", func_8025DE88); diff --git a/src/code_18C790.c b/src/code_18C790.c new file mode 100644 index 0000000000..bffbd3fee5 --- /dev/null +++ b/src/code_18C790.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_18C790", func_8025DEB0); + +INCLUDE_ASM(s32, "code_18C790", func_8025DEC4); + +INCLUDE_ASM(s32, "code_18C790", func_8025E030); + +INCLUDE_ASM(s32, "code_18C790", func_8025E044); + +INCLUDE_ASM(s32, "code_18C790", func_8025E108); + +INCLUDE_ASM(s32, "code_18C790", func_8025E14C); + +INCLUDE_ASM(s32, "code_18C790", func_8025E190); + +INCLUDE_ASM(s32, "code_18C790", func_8025FF8C); + +INCLUDE_ASM(s32, "code_18C790", func_802601BC); + +INCLUDE_ASM(s32, "code_18C790", func_80260948); + +INCLUDE_ASM(s32, "code_18C790", func_80260A20); diff --git a/src/code_18F340.c b/src/code_18F340.c new file mode 100644 index 0000000000..b49f406471 --- /dev/null +++ b/src/code_18F340.c @@ -0,0 +1,79 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_18F340", func_80260A60); + +INCLUDE_ASM(s32, "code_18F340", func_80260AD4); + +INCLUDE_ASM(s32, "code_18F340", activate_defend_command); + +INCLUDE_ASM(s32, "code_18F340", func_80260B70); + +INCLUDE_ASM(s32, "code_18F340", func_80260BF4); + +INCLUDE_ASM(s32, "code_18F340", func_80260DB8); + +INCLUDE_ASM(s32, "code_18F340", func_80260DD8); + +INCLUDE_ASM(s32, "code_18F340", func_80260E38); + +INCLUDE_ASM(s32, "code_18F340", func_80260E5C); + +INCLUDE_ASM(s32, "code_18F340", func_80260E90); + +INCLUDE_ASM(s32, "code_18F340", func_80261064); + +INCLUDE_ASM(s32, "code_18F340", func_802610CC); + +INCLUDE_ASM(s32, "code_18F340", func_80261164); + +INCLUDE_ASM(s32, "code_18F340", func_802611E8); + +INCLUDE_ASM(s32, "code_18F340", func_8026127C); + +INCLUDE_ASM(s32, "code_18F340", func_80261388); + +INCLUDE_ASM(s32, "code_18F340", func_802613A8); + +INCLUDE_ASM(s32, "code_18F340", func_802613BC); + +INCLUDE_ASM(s32, "code_18F340", func_80261478); + +INCLUDE_ASM(s32, "code_18F340", func_80261530); + +INCLUDE_ASM(s32, "code_18F340", func_802615C8); + +INCLUDE_ASM(s32, "code_18F340", func_80261648); + +INCLUDE_ASM(s32, "code_18F340", func_802616B4); + +INCLUDE_ASM(s32, "code_18F340", func_802616F4); + +INCLUDE_ASM(s32, "code_18F340", func_802619B4); + +INCLUDE_ASM(s32, "code_18F340", HasMerleeCastsLeft); + +INCLUDE_ASM(s32, "code_18F340", func_802619E8); + +INCLUDE_ASM(s32, "code_18F340", func_80261B40); + +INCLUDE_ASM(s32, "code_18F340", FXRecoverHP); + +INCLUDE_ASM(s32, "code_18F340", FXRecoverFP); + +INCLUDE_ASM(s32, "code_18F340", IncrementPlayerHP); + +INCLUDE_ASM(s32, "code_18F340", IncrementPlayerFP); + +INCLUDE_ASM(s32, "code_18F340", func_80261D98); + +INCLUDE_ASM(s32, "code_18F340", func_80261DD4); + +INCLUDE_ASM(s32, "code_18F340", func_80261DF4); + +INCLUDE_ASM(s32, "code_18F340", func_80261FB4); + +INCLUDE_ASM(s32, "code_18F340", func_802620F8); + +INCLUDE_ASM(s32, "code_18F340", func_80262130); + +INCLUDE_ASM(s32, "code_18F340", func_8026220C); diff --git a/src/code_190B20.c b/src/code_190B20.c new file mode 100644 index 0000000000..9c0995c3df --- /dev/null +++ b/src/code_190B20.c @@ -0,0 +1,169 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_190B20", create_target_list); + +INCLUDE_ASM(s32, "code_190B20", player_create_target_list); + +INCLUDE_ASM(s32, "code_190B20", enemy_create_target_list); + +INCLUDE_ASM(s32, "code_190B20", func_80263064); + +INCLUDE_ASM(s32, "code_190B20", func_80263230); + +INCLUDE_ASM(s32, "code_190B20", func_8026324C); + +INCLUDE_ASM(s32, "code_190B20", func_80263268); + +INCLUDE_ASM(s32, "code_190B20", func_80263300); + +INCLUDE_ASM(s32, "code_190B20", func_802633E8); + +INCLUDE_ASM(s32, "code_190B20", func_80263434); + +INCLUDE_ASM(s32, "code_190B20", func_80263464); + +INCLUDE_ASM(s32, "code_190B20", func_802634B8); + +INCLUDE_ASM(s32, "code_190B20", func_802636E4); + +INCLUDE_ASM(s32, "code_190B20", func_80263914); + +INCLUDE_ASM(s32, "code_190B20", count_power_plus); + +INCLUDE_ASM(s32, "code_190B20", deduct_current_move_fp); + +INCLUDE_ASM(s32, "code_190B20", func_80263C60); + +INCLUDE_ASM(s32, "code_190B20", func_80263CC4); + +INCLUDE_ASM(s32, "code_190B20", set_animation); + +INCLUDE_ASM(s32, "code_190B20", func_80263E08); + +INCLUDE_ASM(s32, "code_190B20", set_animation_rate); + +INCLUDE_ASM(s32, "code_190B20", set_actor_yaw); + +INCLUDE_ASM(s32, "code_190B20", set_part_yaw); + +INCLUDE_ASM(s32, "code_190B20", func_80263FE8); + +INCLUDE_ASM(s32, "code_190B20", func_80264084); + +INCLUDE_ASM(s32, "code_190B20", add_xz_vec3f); + +INCLUDE_ASM(s32, "code_190B20", add_xz_vec3f_copy1); + +INCLUDE_ASM(s32, "code_190B20", add_xz_vec3f_copy2); + +INCLUDE_ASM(s32, "code_190B20", play_movement_dust_effects); + +INCLUDE_ASM(s32, "code_190B20", get_actor_part); + +INCLUDE_ASM(s32, "code_190B20", load_player_actor); + +INCLUDE_ASM(s32, "code_190B20", load_partner_actor); + +INCLUDE_ASM(s32, "code_190B20", create_actor); + +INCLUDE_ASM(s32, "code_190B20", func_80265CE8); + +INCLUDE_ASM(s32, "code_190B20", func_80265D44); + +INCLUDE_ASM(s32, "code_190B20", lookup_defense); + +INCLUDE_ASM(s32, "code_190B20", lookup_status_chance); + +INCLUDE_ASM(s32, "code_190B20", lookup_status_duration_mod); + +INCLUDE_ASM(s32, "code_190B20", inflict_status); + +INCLUDE_ASM(s32, "code_190B20", inflict_partner_ko); + +INCLUDE_ASM(s32, "code_190B20", get_defense); + +INCLUDE_ASM(s32, "code_190B20", func_802664DC); + +INCLUDE_ASM(s32, "code_190B20", show_damage_popup); + +INCLUDE_ASM(s32, "code_190B20", func_80266684); + +INCLUDE_ASM(s32, "code_190B20", func_802666E4); + +INCLUDE_ASM(s32, "code_190B20", func_802667F0); + +INCLUDE_ASM(s32, "code_190B20", func_80266970); + +INCLUDE_ASM(s32, "code_190B20", func_80266978); + +INCLUDE_ASM(s32, "code_190B20", func_80266ADC); + +INCLUDE_ASM(s32, "code_190B20", func_80266AF8); + +INCLUDE_ASM(s32, "code_190B20", func_80266B14); + +INCLUDE_ASM(s32, "code_190B20", try_inflict_status); + +INCLUDE_ASM(s32, "code_190B20", inflict_status_set_duration); + +INCLUDE_ASM(s32, "code_190B20", func_80266D6C); + +INCLUDE_ASM(s32, "code_190B20", func_80266DAC); + +INCLUDE_ASM(s32, "code_190B20", func_80266E14); + +INCLUDE_ASM(s32, "code_190B20", func_80266E40); + +INCLUDE_ASM(s32, "code_190B20", func_80266EA8); + +INCLUDE_ASM(s32, "code_190B20", func_80266EE8); + +INCLUDE_ASM(s32, "code_190B20", func_80266F60); + +INCLUDE_ASM(s32, "code_190B20", func_80266F8C); + +INCLUDE_ASM(s32, "code_190B20", func_80266FD8); + +INCLUDE_ASM(s32, "code_190B20", func_80267018); + +INCLUDE_ASM(s32, "code_190B20", func_8026709C); + +INCLUDE_ASM(s32, "code_190B20", func_802670C8); + +INCLUDE_ASM(s32, "code_190B20", add_part_decoration); + +INCLUDE_ASM(s32, "code_190B20", add_actor_decoration); + +INCLUDE_ASM(s32, "code_190B20", remove_part_decoration); + +INCLUDE_ASM(s32, "code_190B20", remove_actor_decoration); + +INCLUDE_ASM(s32, "code_190B20", heroes_is_ability_active); + +INCLUDE_ASM(s32, "code_190B20", create_part_shadow); + +INCLUDE_ASM(s32, "code_190B20", remove_part_shadow); + +INCLUDE_ASM(s32, "code_190B20", func_802673E4); + +INCLUDE_ASM(s32, "code_190B20", remove_player_buffs); + +INCLUDE_ASM(s32, "code_190B20", func_8026777C); + +INCLUDE_ASM(s32, "code_190B20", func_8026787C); + +INCLUDE_ASM(s32, "code_190B20", func_80267A3C); + +INCLUDE_ASM(s32, "code_190B20", reset_all_actor_sounds); + +INCLUDE_ASM(s32, "code_190B20", hide_foreground_models_unchecked); + +INCLUDE_ASM(s32, "code_190B20", show_foreground_models_unchecked); + +INCLUDE_ASM(s32, "code_190B20", hide_foreground_models); + +INCLUDE_ASM(s32, "code_190B20", show_foreground_models); + +INCLUDE_ASM(s32, "code_190B20", StartRumbleWithParams); + +INCLUDE_ASM(s32, "code_190B20", start_rumble_type); diff --git a/src/code_1967B0.c b/src/code_1967B0.c new file mode 100644 index 0000000000..b4f2db5f5e --- /dev/null +++ b/src/code_1967B0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1967B0", LoadItemScript); + +INCLUDE_ASM(s32, "code_1967B0", LoadFreeItemScript); + +INCLUDE_ASM(s32, "code_1967B0", LoadMoveScript); diff --git a/src/code_196AA0.c b/src/code_196AA0.c new file mode 100644 index 0000000000..baf90e6bf9 --- /dev/null +++ b/src/code_196AA0.c @@ -0,0 +1,77 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_196AA0", LoadActionCommand); + +INCLUDE_ASM(s32, "code_196AA0", func_80268224); + +INCLUDE_ASM(s32, "code_196AA0", func_80268284); + +INCLUDE_ASM(s32, "code_196AA0", func_80268770); + +INCLUDE_ASM(s32, "code_196AA0", func_80268798); + +INCLUDE_ASM(s32, "code_196AA0", func_802687BC); + +INCLUDE_ASM(s32, "code_196AA0", func_802687E4); + +INCLUDE_ASM(s32, "code_196AA0", func_8026880C); + +INCLUDE_ASM(s32, "code_196AA0", func_80268834); + +INCLUDE_ASM(s32, "code_196AA0", func_80268858); + +INCLUDE_ASM(s32, "code_196AA0", func_80268938); + +INCLUDE_ASM(s32, "code_196AA0", func_80268AF8); + +INCLUDE_ASM(s32, "code_196AA0", func_80268C9C); + +INCLUDE_ASM(s32, "code_196AA0", func_80268E88); + +INCLUDE_ASM(s32, "code_196AA0", check_block_input); + +INCLUDE_ASM(s32, "code_196AA0", func_80269118); + +INCLUDE_ASM(s32, "code_196AA0", func_80269160); + +INCLUDE_ASM(s32, "code_196AA0", func_8026919C); + +INCLUDE_ASM(s32, "code_196AA0", func_802691C8); + +INCLUDE_ASM(s32, "code_196AA0", GetActionSuccess); + +INCLUDE_ASM(s32, "code_196AA0", SetActionSuccess); + +INCLUDE_ASM(s32, "code_196AA0", func_802692EC); + +INCLUDE_ASM(s32, "code_196AA0", func_80269318); + +INCLUDE_ASM(s32, "code_196AA0", func_80269344); + +INCLUDE_ASM(s32, "code_196AA0", func_80269370); + +INCLUDE_ASM(s32, "code_196AA0", func_8026939C); + +INCLUDE_ASM(s32, "code_196AA0", func_802693F0); + +INCLUDE_ASM(s32, "code_196AA0", CloseActionCommandInfo); + +INCLUDE_ASM(s32, "code_196AA0", func_80269470); + +INCLUDE_ASM(s32, "code_196AA0", func_802694A4); + +INCLUDE_ASM(s32, "code_196AA0", GetActionSuccessCopy); + +INCLUDE_ASM(s32, "code_196AA0", func_80269524); + +INCLUDE_ASM(s32, "code_196AA0", func_80269550); + +INCLUDE_ASM(s32, "code_196AA0", GetBlockResult); + +INCLUDE_ASM(s32, "code_196AA0", func_802695A8); + +INCLUDE_ASM(s32, "code_196AA0", func_802695D4); + +INCLUDE_ASM(s32, "code_196AA0", func_80269600); + +INCLUDE_ASM(s32, "code_196AA0", func_8026962C); diff --git a/src/code_197F40.c b/src/code_197F40.c new file mode 100644 index 0000000000..42a8a8f4f5 --- /dev/null +++ b/src/code_197F40.c @@ -0,0 +1,408 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_197F40", count_targets); + +INCLUDE_ASM(s32, "code_197F40", get_nearest_home_index); + +INCLUDE_ASM(s32, "code_197F40", set_goal_pos_to_part); + +INCLUDE_ASM(s32, "code_197F40", set_part_goal_to_actor_part); + +INCLUDE_ASM(s32, "code_197F40", set_actor_current_position); + +INCLUDE_ASM(s32, "code_197F40", set_part_absolute_position); + +INCLUDE_ASM(s32, "code_197F40", set_actor_home_position); + +INCLUDE_ASM(Actor*, "code_197F40", get_actor, s32 actorID); + +INCLUDE_ASM(s32, "code_197F40", LoadBattleSection); + +INCLUDE_ASM(s32, "code_197F40", GetBattlePhase); + +INCLUDE_ASM(s32, "code_197F40", GetLastElement); + +INCLUDE_ASM(s32, "code_197F40", func_80269E80); + +INCLUDE_ASM(s32, "code_197F40", func_80269EAC); + +INCLUDE_ASM(s32, "code_197F40", SetGoalToHome); + +INCLUDE_ASM(s32, "code_197F40", SetIdleGoalToHome); + +INCLUDE_ASM(s32, "code_197F40", SetGoalToIndex); + +INCLUDE_ASM(s32, "code_197F40", GetIndexFromPos); + +INCLUDE_ASM(s32, "code_197F40", GetIndexFromHome); + +INCLUDE_ASM(s32, "code_197F40", CountPlayerTargets); + +INCLUDE_ASM(s32, "code_197F40", ForceHomePos); + +INCLUDE_ASM(s32, "code_197F40", SetHomePos); + +INCLUDE_ASM(s32, "code_197F40", SetGoalToTarget); + +INCLUDE_ASM(s32, "code_197F40", SetPartGoalToTarget); + +INCLUDE_ASM(s32, "code_197F40", SetGoalToFirstTarget); + +INCLUDE_ASM(s32, "code_197F40", SetGoalPos); + +INCLUDE_ASM(s32, "code_197F40", SetIdleGoal); + +INCLUDE_ASM(s32, "code_197F40", AddGoalPos); + +INCLUDE_ASM(s32, "code_197F40", GetGoalPos); + +INCLUDE_ASM(s32, "code_197F40", GetIdleGoal); + +INCLUDE_ASM(s32, "code_197F40", GetPartTarget); + +INCLUDE_ASM(s32, "code_197F40", GetActorPos); + +INCLUDE_ASM(s32, "code_197F40", GetPartOffset); + +INCLUDE_ASM(s32, "code_197F40", GetPartPos); + +INCLUDE_ASM(s32, "code_197F40", GetHomePos); + +INCLUDE_ASM(s32, "code_197F40", SetActorPos); + +INCLUDE_ASM(s32, "code_197F40", SetPartPos); + +INCLUDE_ASM(s32, "code_197F40", SetEnemyTargetOffset); + +INCLUDE_ASM(s32, "code_197F40", SetAnimation); + +INCLUDE_ASM(s32, "code_197F40", GetAnimation); + +INCLUDE_ASM(s32, "code_197F40", SetAnimationRate); + +INCLUDE_ASM(s32, "code_197F40", SetActorYaw); + +INCLUDE_ASM(s32, "code_197F40", GetActorYaw); + +INCLUDE_ASM(s32, "code_197F40", SetPartYaw); + +INCLUDE_ASM(s32, "code_197F40", GetPartYaw); + +INCLUDE_ASM(s32, "code_197F40", SetActorJumpGravity); + +INCLUDE_ASM(s32, "code_197F40", SetActorIdleJumpGravity); + +INCLUDE_ASM(s32, "code_197F40", SetActorSpeed); + +INCLUDE_ASM(s32, "code_197F40", SetActorIdleSpeed); + +INCLUDE_ASM(s32, "code_197F40", SetPartJumpGravity); + +INCLUDE_ASM(s32, "code_197F40", SetPartMoveSpeed); + +INCLUDE_ASM(s32, "code_197F40", SetJumpAnimations); + +INCLUDE_ASM(s32, "code_197F40", AddActorPos); + +INCLUDE_ASM(s32, "code_197F40", SetActorDispOffset); + +INCLUDE_ASM(s32, "code_197F40", GetPartDispOffset); + +INCLUDE_ASM(s32, "code_197F40", SetPartDispOffset); + +INCLUDE_ASM(s32, "code_197F40", AddPartDispOffset); + +INCLUDE_ASM(s32, "code_197F40", func_8026BF48); + +INCLUDE_ASM(s32, "code_197F40", GetActorVar); + +INCLUDE_ASM(s32, "code_197F40", SetActorVar); + +INCLUDE_ASM(s32, "code_197F40", AddActorVar); + +INCLUDE_ASM(s32, "code_197F40", GetPartMovementVar); + +INCLUDE_ASM(s32, "code_197F40", SetPartMovementVar); + +INCLUDE_ASM(s32, "code_197F40", AddPartMovementVar); + +INCLUDE_ASM(s32, "code_197F40", SetActorRotation); + +INCLUDE_ASM(s32, "code_197F40", SetActorRotationOffset); + +INCLUDE_ASM(s32, "code_197F40", GetActorRotation); + +INCLUDE_ASM(s32, "code_197F40", SetPartRotation); + +INCLUDE_ASM(s32, "code_197F40", SetPartRotationOffset); + +INCLUDE_ASM(s32, "code_197F40", GetPartRotation); + +INCLUDE_ASM(s32, "code_197F40", SetActorScale); + +INCLUDE_ASM(s32, "code_197F40", SetActorScaleModifier); + +INCLUDE_ASM(s32, "code_197F40", GetActorScale); + +INCLUDE_ASM(s32, "code_197F40", SetPartScale); + +INCLUDE_ASM(s32, "code_197F40", GetPartScale); + +INCLUDE_ASM(s32, "code_197F40", GetBattleFlags); + +INCLUDE_ASM(s32, "code_197F40", SetBattleFlagBits); + +INCLUDE_ASM(s32, "code_197F40", GetBattleFlags2); + +INCLUDE_ASM(s32, "code_197F40", SetBattleFlagBits2); + +INCLUDE_ASM(s32, "code_197F40", SetActorFlags); + +INCLUDE_ASM(s32, "code_197F40", SetActorFlagBits); + +INCLUDE_ASM(s32, "code_197F40", GetActorFlags); + +INCLUDE_ASM(s32, "code_197F40", SetPartFlags); + +INCLUDE_ASM(s32, "code_197F40", SetPartFlagBits); + +INCLUDE_ASM(s32, "code_197F40", SetPartTargetFlags); + +INCLUDE_ASM(s32, "code_197F40", SetPartTargetFlagBits); + +INCLUDE_ASM(s32, "code_197F40", GetPartFlags); + +INCLUDE_ASM(s32, "code_197F40", GetPartTargetFlags); + +INCLUDE_ASM(s32, "code_197F40", SetPartEventFlags); + +INCLUDE_ASM(s32, "code_197F40", SetPartEventBits); + +INCLUDE_ASM(s32, "code_197F40", GetPartEventFlags); + +INCLUDE_ASM(s32, "code_197F40", func_8026D51C); + +INCLUDE_ASM(s32, "code_197F40", func_8026D5A4); + +INCLUDE_ASM(s32, "code_197F40", HPBarToHome); + +INCLUDE_ASM(s32, "code_197F40", HPBarToCurrent); + +INCLUDE_ASM(s32, "code_197F40", func_8026D8EC); + +INCLUDE_ASM(s32, "code_197F40", func_8026D940); + +INCLUDE_ASM(s32, "code_197F40", func_8026DA94); + +INCLUDE_ASM(s32, "code_197F40", SummonEnemy); + +INCLUDE_ASM(s32, "code_197F40", GetOwnerID); + +INCLUDE_ASM(s32, "code_197F40", SetOwnerID); + +ApiStatus ActorExists(ScriptInstance* script, s32 isInitialCall) { + Bytecode isExist; + Actor* partner = gBattleStatus.partnerActor; + Bytecode* args = script->ptrReadPos; + ActorId actorID = get_variable(script, *args++); + + if (actorID == -0x7F) { + actorID = script->ownerActorID; + } + + isExist = get_actor(actorID) != NULL; + if ((actorID == ActorId_PARTNER) && (partner == NULL)) { + isExist = FALSE; + } + + set_variable(script, *args++, isExist); + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_197F40", func_8026DEF0); + +INCLUDE_ASM(s32, "code_197F40", func_8026DF88); + +INCLUDE_ASM(s32, "code_197F40", func_8026E020); + +INCLUDE_ASM(s32, "code_197F40", func_8026E038); + +INCLUDE_ASM(s32, "code_197F40", SetBattleInputMask); + +INCLUDE_ASM(s32, "code_197F40", SetBattleInputButtons); + +INCLUDE_ASM(s32, "code_197F40", CheckButtonPress); + +INCLUDE_ASM(s32, "code_197F40", CheckButtonHeld); + +INCLUDE_ASM(s32, "code_197F40", CheckButtonDown); + +INCLUDE_ASM(s32, "code_197F40", GetBattleState); + +INCLUDE_ASM(s32, "code_197F40", func_8026E16C); + +INCLUDE_ASM(s32, "code_197F40", func_8026E198); + +INCLUDE_ASM(s32, "code_197F40", func_8026E208); + +INCLUDE_ASM(s32, "code_197F40", func_8026E260); + +INCLUDE_ASM(s32, "code_197F40", PlayerCreateTargetList); + +INCLUDE_ASM(s32, "code_197F40", EnemyCreateTargetList); + +INCLUDE_ASM(s32, "code_197F40", InitTargetIterator); + +INCLUDE_ASM(s32, "code_197F40", SetOwnerTarget); + +INCLUDE_ASM(s32, "code_197F40", ChooseNextTarget); + +INCLUDE_ASM(s32, "code_197F40", func_8026E558); + +INCLUDE_ASM(s32, "code_197F40", GetTargetListLength); + +INCLUDE_ASM(s32, "code_197F40", GetOwnerTarget); + +INCLUDE_ASM(s32, "code_197F40", func_8026E914); + +INCLUDE_ASM(s32, "code_197F40", GetPlayerActorID); + +INCLUDE_ASM(s32, "code_197F40", func_8026E9A0); + +INCLUDE_ASM(s32, "code_197F40", GetDistanceToGoal); + +INCLUDE_ASM(s32, "code_197F40", func_8026EA7C); + +INCLUDE_ASM(s32, "code_197F40", func_8026EB20); + +INCLUDE_ASM(s32, "code_197F40", func_8026EBF8); + +INCLUDE_ASM(s32, "code_197F40", func_8026ED20); + +INCLUDE_ASM(s32, "code_197F40", func_8026EDE4); + +INCLUDE_ASM(s32, "code_197F40", AddActorDecoration); + +INCLUDE_ASM(s32, "code_197F40", RemoveActorDecoration); + +INCLUDE_ASM(s32, "code_197F40", ModifyActorDecoration); + +INCLUDE_ASM(s32, "code_197F40", UseIdleAnimation); + +INCLUDE_ASM(s32, "code_197F40", func_8026F1A0); + +INCLUDE_ASM(s32, "code_197F40", GetStatusFlags); + +INCLUDE_ASM(s32, "code_197F40", RemovePlayerBuffs); + +INCLUDE_ASM(s32, "code_197F40", SetPartAlpha); + +INCLUDE_ASM(s32, "code_197F40", CreatePartShadow); + +INCLUDE_ASM(s32, "code_197F40", RemovePartShadow); + +INCLUDE_ASM(s32, "code_197F40", func_8026F60C); + +INCLUDE_ASM(s32, "code_197F40", SetBattleVar); + +INCLUDE_ASM(s32, "code_197F40", GetBattleVar); + +INCLUDE_ASM(s32, "code_197F40", ResetAllActorSounds); + +INCLUDE_ASM(s32, "code_197F40", SetActorSounds); + +INCLUDE_ASM(s32, "code_197F40", ResetActorSounds); + +INCLUDE_ASM(s32, "code_197F40", SetPartSounds); + +INCLUDE_ASM(s32, "code_197F40", SetActorType); + +INCLUDE_ASM(s32, "code_197F40", ShowShockEffect); + +INCLUDE_ASM(s32, "code_197F40", GetActorAttackBoost); + +INCLUDE_ASM(s32, "code_197F40", GetActorDefenseBoost); + +INCLUDE_ASM(s32, "code_197F40", BoostAttack); + +INCLUDE_ASM(s32, "code_197F40", BoostDefense); + +INCLUDE_ASM(s32, "code_197F40", VanishActor); + +INCLUDE_ASM(s32, "code_197F40", ElectrifyActor); + +INCLUDE_ASM(s32, "code_197F40", HealActor); + +INCLUDE_ASM(s32, "code_197F40", WaitForBuffDone); + +INCLUDE_ASM(s32, "code_197F40", CopyBuffs); + +INCLUDE_ASM(s32, "code_197F40", func_80271210); + +INCLUDE_ASM(s32, "code_197F40", func_80271258); + +INCLUDE_ASM(s32, "code_197F40", func_802712A0); + +INCLUDE_ASM(s32, "code_197F40", func_80271328); + +INCLUDE_ASM(s32, "code_197F40", func_802713B0); + +INCLUDE_ASM(s32, "code_197F40", func_8027143C); + +INCLUDE_ASM(s32, "code_197F40", func_80271484); + +INCLUDE_ASM(s32, "code_197F40", func_80271588); + +INCLUDE_ASM(s32, "code_197F40", dispatch_event_player); + +INCLUDE_ASM(s32, "code_197F40", dispatch_event_player_continue_turn); + +INCLUDE_ASM(s32, "code_197F40", calc_player_test_enemy); + +INCLUDE_ASM(s32, "code_197F40", calc_player_damage_enemy); + +INCLUDE_ASM(s32, "code_197F40", dispatch_damage_event_player); + +INCLUDE_ASM(s32, "code_197F40", dispatch_damage_event_player_0); + +INCLUDE_ASM(s32, "code_197F40", dispatch_damage_event_player_1); + +INCLUDE_ASM(s32, "code_197F40", GetMenuSelection); + +INCLUDE_ASM(s32, "code_197F40", func_80273444); + +INCLUDE_ASM(s32, "code_197F40", PlayerFallToGoal); + +INCLUDE_ASM(s32, "code_197F40", PlayerLandJump); + +INCLUDE_ASM(s32, "code_197F40", PlayerRunToGoal); + +INCLUDE_ASM(s32, "code_197F40", CancelablePlayerRunToGoal); + +INCLUDE_ASM(s32, "code_197F40", GetPlayerHP); + +INCLUDE_ASM(s32, "code_197F40", PlayerDamageEnemy); + +INCLUDE_ASM(s32, "code_197F40", PlayerPowerBounceEnemy); + +INCLUDE_ASM(s32, "code_197F40", PlayerTestEnemy); + +INCLUDE_ASM(s32, "code_197F40", DispatchDamagePlayerEvent); + +INCLUDE_ASM(s32, "code_197F40", EnablePlayerBlur); + +INCLUDE_ASM(s32, "code_197F40", func_802749D8); + +INCLUDE_ASM(s32, "code_197F40", func_802749F8); + +INCLUDE_ASM(s32, "code_197F40", func_80274A18); + +INCLUDE_ASM(s32, "code_197F40", func_802752AC); + +INCLUDE_ASM(s32, "code_197F40", func_80275F00); + +INCLUDE_ASM(s32, "code_197F40", DidActionSucceed); + +INCLUDE_ASM(s32, "code_197F40", func_80276EFC); + +INCLUDE_ASM(s32, "code_197F40", func_80276F1C); diff --git a/src/code_1A5830.c b/src/code_1A5830.c new file mode 100644 index 0000000000..673fe07dc7 --- /dev/null +++ b/src/code_1A5830.c @@ -0,0 +1,139 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1A5830", func_80276F50); + +INCLUDE_ASM(s32, "code_1A5830", dispatch_event_general); + +INCLUDE_ASM(s32, "code_1A5830", play_hit_sound); + +INCLUDE_ASM(s32, "code_1A5830", dispatch_event_actor); + +INCLUDE_ASM(s32, "code_1A5830", calc_enemy_test_target); + +INCLUDE_ASM(s32, "code_1A5830", calc_enemy_damage_target); + +INCLUDE_ASM(s32, "code_1A5830", dispatch_damage_event_actor); + +INCLUDE_ASM(s32, "code_1A5830", dispatch_damage_event_actor_0); + +INCLUDE_ASM(s32, "code_1A5830", dispatch_damage_event_actor_1); + +INCLUDE_ASM(s32, "code_1A5830", BindTakeTurn); + +INCLUDE_ASM(s32, "code_1A5830", PauseTakeTurn); + +INCLUDE_ASM(s32, "code_1A5830", ResumeTakeTurn); + +INCLUDE_ASM(s32, "code_1A5830", BindIdle); + +INCLUDE_ASM(s32, "code_1A5830", EnableIdleScript); + +INCLUDE_ASM(s32, "code_1A5830", BindHandleEvent); + +INCLUDE_ASM(s32, "code_1A5830", BindNextTurn); + +INCLUDE_ASM(s32, "code_1A5830", JumpToGoal); + +INCLUDE_ASM(s32, "code_1A5830", IdleJumpToGoal); + +INCLUDE_ASM(s32, "code_1A5830", JumpToGoalSimple2); + +INCLUDE_ASM(s32, "code_1A5830", JumpWithBounce); + +INCLUDE_ASM(s32, "code_1A5830", LandJump); + +INCLUDE_ASM(s32, "code_1A5830", FallToGoal); + +INCLUDE_ASM(s32, "code_1A5830", RunToGoal); + +INCLUDE_ASM(s32, "code_1A5830", IdleRunToGoal); + +INCLUDE_ASM(s32, "code_1A5830", JumpPartTo); + +INCLUDE_ASM(s32, "code_1A5830", FallPartTo); + +INCLUDE_ASM(s32, "code_1A5830", LandJumpPart); + +INCLUDE_ASM(s32, "code_1A5830", RunPartTo); + +INCLUDE_ASM(s32, "code_1A5830", update_lerp_battle); + +INCLUDE_ASM(s32, "code_1A5830", FlyToGoal); + +INCLUDE_ASM(s32, "code_1A5830", IdleFlyToGoal); + +INCLUDE_ASM(s32, "code_1A5830", FlyPartTo); + +INCLUDE_ASM(s32, "code_1A5830", GetLastEvent); + +INCLUDE_ASM(s32, "code_1A5830", SetTargetActor); + +INCLUDE_ASM(s32, "code_1A5830", SetEnemyHP); + +INCLUDE_ASM(s32, "code_1A5830", GetActorHP); + +INCLUDE_ASM(s32, "code_1A5830", GetEnemyMaxHP); + +INCLUDE_ASM(s32, "code_1A5830", RemoveActor); + +INCLUDE_ASM(s32, "code_1A5830", DropStarPoints); + +INCLUDE_ASM(s32, "code_1A5830", SetDefenseTable); + +INCLUDE_ASM(s32, "code_1A5830", SetStatusTable); + +INCLUDE_ASM(s32, "code_1A5830", SetIdleAnimations); + +INCLUDE_ASM(s32, "code_1A5830", func_8027CC10); + +INCLUDE_ASM(s32, "code_1A5830", EnemyDamageTarget); + +INCLUDE_ASM(s32, "code_1A5830", EnemyFollowupAfflictTarget); + +INCLUDE_ASM(s32, "code_1A5830", EnemyTestTarget); + +INCLUDE_ASM(s32, "code_1A5830", DispatchDamageEvent); + +INCLUDE_ASM(s32, "code_1A5830", DispatchEvent); + +INCLUDE_ASM(s32, "code_1A5830", func_8027D2D8); + +INCLUDE_ASM(s32, "code_1A5830", func_8027D32C); + +INCLUDE_ASM(s32, "code_1A5830", SetTargetOffset); + +INCLUDE_ASM(s32, "code_1A5830", func_8027D434); + +INCLUDE_ASM(s32, "code_1A5830", func_8027D4C8); + +INCLUDE_ASM(s32, "code_1A5830", EnableActorBlur); + +INCLUDE_ASM(s32, "code_1A5830", func_8027D628); + +INCLUDE_ASM(s32, "code_1A5830", AfflictActor); + +INCLUDE_ASM(s32, "code_1A5830", func_8027D75C); + +INCLUDE_ASM(s32, "code_1A5830", GetEncounterState); + +INCLUDE_ASM(s32, "code_1A5830", YieldTurn); + +INCLUDE_ASM(s32, "code_1A5830", SetActorSize); + +INCLUDE_ASM(s32, "code_1A5830", GetActorSize); + +INCLUDE_ASM(s32, "code_1A5830", SetPartSize); + +INCLUDE_ASM(s32, "code_1A5830", GetOriginalActorType); + +INCLUDE_ASM(s32, "code_1A5830", GetCurrentActorType); + +INCLUDE_ASM(s32, "code_1A5830", GetLastDamage); + +INCLUDE_ASM(s32, "code_1A5830", EnableActorGlow); + +INCLUDE_ASM(s32, "code_1A5830", WasStatusInflicted); + +INCLUDE_ASM(s32, "code_1A5830", CopyStatusEffects); + +INCLUDE_ASM(s32, "code_1A5830", ClearStatusEffects); diff --git a/src/code_1AC760.c b/src/code_1AC760.c new file mode 100644 index 0000000000..0ddc07c968 --- /dev/null +++ b/src/code_1AC760.c @@ -0,0 +1,50 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1AC760", dispatch_event_partner); + +INCLUDE_ASM(s32, "code_1AC760", dispatch_event_partner_continue_turn); + +INCLUDE_ASM(s32, "code_1AC760", calc_partner_test_enemy); + +INCLUDE_ASM(s32, "code_1AC760", calc_partner_damage_enemy); + +INCLUDE_ASM(s32, "code_1AC760", dispatch_damage_event_partner); + +INCLUDE_ASM(s32, "code_1AC760", dispatch_damage_event_partner_0); + +INCLUDE_ASM(s32, "code_1AC760", dispatch_damage_event_partner_1); + +INCLUDE_ASM(s32, "code_1AC760", MakeOwnerTargetIndex); + +INCLUDE_ASM(s32, "code_1AC760", func_8027FC90); + +ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 actorID = get_variable(script, *args++); + Bytecode* outVar; + + if (actorID == -0x7F) { + actorID = script->ownerActorID; + } + + outVar = *args++; + set_variable(script, outVar, get_actor(actorID)->staticActorData->level); + + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_1AC760", PartnerDamageEnemy); + +INCLUDE_ASM(s32, "code_1AC760", PartnerAfflictEnemy); + +INCLUDE_ASM(s32, "code_1AC760", PartnerPowerBounceEnemy); + +INCLUDE_ASM(s32, "code_1AC760", PartnerTestEnemy); + +INCLUDE_ASM(s32, "code_1AC760", func_8028070C); + +INCLUDE_ASM(s32, "code_1AC760", DeletePartner); + +INCLUDE_ASM(s32, "code_1AC760", func_802807D0); + +INCLUDE_ASM(s32, "code_1AC760", func_80280818); diff --git a/src/code_1AF120.c b/src/code_1AF120.c new file mode 100644 index 0000000000..91d2a4adbe --- /dev/null +++ b/src/code_1AF120.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1AF120", GetDamageIntensity); + +INCLUDE_ASM(s32, "code_1AF120", ActorAddMovePos); diff --git a/src/code_1AF230.c b/src/code_1AF230.c new file mode 100644 index 0000000000..2afbdfa2de --- /dev/null +++ b/src/code_1AF230.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "code_1AF230", LoadStarPowerScript); diff --git a/tools/splat.yaml b/tools/splat.yaml index 3527fc8cb5..bbf8296212 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -300,6 +300,22 @@ segments: vram: 0x8023E000 files: - [0x16C8E0, "c", "code_16c8e0"] + - [0x16F740, "c"] + - [0x1776B0, "c"] + - [0x17D6A0, "c"] + - [0x17FEB0, "c"] + - [0x181810, "c"] + - [0x182B30, "c"] + - [0x18C790, "c"] + - [0x18F340, "c"] + - [0x190B20, "c"] + - [0x1967B0, "c"] + - [0x196AA0, "c"] + - [0x197F40, "c"] + - [0x1A5830, "c"] + - [0x1AC760, "c"] + - [0x1AF120, "c"] + - [0x1AF230, "c"] - [0x1AF2C0, "bin"] - [0x1CC310, "bin"] # icon images and palettes, vram unknown - name: code From 4ad8d4cf5cedd93f874db9fca24f8d27b1237369 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 23:51:26 -0400 Subject: [PATCH 06/10] Splat update --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 968477e3cc..44358d9ddc 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 968477e3cc7b26514196abae0ff0e3f10a45d31e +Subproject commit 44358d9ddc731beafd06a14984d288eab8a305ad From 3b40b9b28d5d1fb44f54af5f9e54abef64f8b8e5 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 15 Oct 2020 00:18:54 -0400 Subject: [PATCH 07/10] Asm update --- Makefile | 2 +- .../code_11a50_len_7a0/begin_state_intro.s | 96 ++++++------ .../code_11a50_len_7a0/step_intro.s | 64 ++++---- .../code_1370_len_7d0/boot_main.s | 30 ++-- .../code_6e40_len_500/render_curtains.s | 38 ++--- .../os/nusys/nuContPakMgr/contRmbControl.s | 141 ++++++++++++++++++ tools/n64splat | 2 +- tools/splat.yaml | 1 + 8 files changed, 258 insertions(+), 116 deletions(-) create mode 100644 asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s diff --git a/Makefile b/Makefile index 3dc7c960ed..3df2b8bec2 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ CPPFLAGS = -Iinclude -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 ASFLAGS = -EB -Iinclude -march=vr4300 -mtune=vr4300 OLDASFLAGS = -EB -Iinclude -G 0 CFLAGS = -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections +LDFLAGS = -T undefined_syms.txt -T undefined_funcs.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections ######################## Targets ############################# diff --git a/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s b/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s index 7c5178bfca..25b09b7093 100644 --- a/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s +++ b/asm/nonmatchings/code_11a50_len_7a0/begin_state_intro.s @@ -30,25 +30,25 @@ glabel begin_state_intro /* 11AB0 800366B0 0C00CDF4 */ jal intro_logos_set_fade_alpha /* 11AB4 800366B4 0000202D */ daddu $a0, $zero, $zero /* 11AB8 800366B8 240200FF */ addiu $v0, $zero, 0xff -/* 11ABC 800366BC 3C01800A */ lui $at, 0x800a -/* 11AC0 800366C0 A4220954 */ sh $v0, 0x954($at) +/* 11ABC 800366BC 3C01800A */ lui $at, %hi(D_800A0954) +/* 11AC0 800366C0 A4220954 */ sh $v0, %lo(D_800A0954)($at) /* 11AC4 800366C4 24020010 */ addiu $v0, $zero, 0x10 -/* 11AC8 800366C8 3C01800A */ lui $at, 0x800a -/* 11ACC 800366CC A4220956 */ sh $v0, 0x956($at) +/* 11AC8 800366C8 3C01800A */ lui $at, %hi(D_800A0956) +/* 11ACC 800366CC A4220956 */ sh $v0, %lo(D_800A0956)($at) /* 11AD0 800366D0 24020004 */ addiu $v0, $zero, 4 -/* 11AD4 800366D4 3C01800A */ lui $at, 0x800a -/* 11AD8 800366D8 A4220958 */ sh $v0, 0x958($at) +/* 11AD4 800366D4 3C01800A */ lui $at, %hi(D_800A0958) +/* 11AD8 800366D8 A4220958 */ sh $v0, %lo(D_800A0958)($at) /* 11ADC 800366DC 240200D0 */ addiu $v0, $zero, 0xd0 -/* 11AE0 800366E0 3C01800A */ lui $at, 0x800a -/* 11AE4 800366E4 AC200960 */ sw $zero, 0x960($at) -/* 11AE8 800366E8 3C01800A */ lui $at, 0x800a -/* 11AEC 800366EC A422095A */ sh $v0, 0x95a($at) -/* 11AF0 800366F0 3C01800A */ lui $at, 0x800a -/* 11AF4 800366F4 A422095C */ sh $v0, 0x95c($at) -/* 11AF8 800366F8 3C01800A */ lui $at, 0x800a -/* 11AFC 800366FC A422095E */ sh $v0, 0x95e($at) -/* 11B00 80036700 3C01800A */ lui $at, 0x800a -/* 11B04 80036704 AC200964 */ sw $zero, 0x964($at) +/* 11AE0 800366E0 3C01800A */ lui $at, %hi(D_800A0960) +/* 11AE4 800366E4 AC200960 */ sw $zero, %lo(D_800A0960)($at) +/* 11AE8 800366E8 3C01800A */ lui $at, %hi(D_800A095A) +/* 11AEC 800366EC A422095A */ sh $v0, %lo(D_800A095A)($at) +/* 11AF0 800366F0 3C01800A */ lui $at, %hi(D_800A095C) +/* 11AF4 800366F4 A422095C */ sh $v0, %lo(D_800A095C)($at) +/* 11AF8 800366F8 3C01800A */ lui $at, %hi(D_800A095E) +/* 11AFC 800366FC A422095E */ sh $v0, %lo(D_800A095E)($at) +/* 11B00 80036700 3C01800A */ lui $at, %hi(D_800A0964) +/* 11B04 80036704 AC200964 */ sw $zero, %lo(D_800A0964)($at) /* 11B08 80036708 8E230000 */ lw $v1, ($s1) /* 11B0C 8003670C 24020005 */ addiu $v0, $zero, 5 /* 11B10 80036710 A4620086 */ sh $v0, 0x86($v1) @@ -61,22 +61,22 @@ glabel begin_state_intro /* 11B28 80036728 0000202D */ daddu $a0, $zero, $zero /* 11B2C 8003672C 2402000C */ addiu $v0, $zero, 0xc /* 11B30 80036730 24040004 */ addiu $a0, $zero, 4 -/* 11B34 80036734 3C01800A */ lui $at, 0x800a -/* 11B38 80036738 A4200954 */ sh $zero, 0x954($at) -/* 11B3C 8003673C 3C01800A */ lui $at, 0x800a -/* 11B40 80036740 A4220956 */ sh $v0, 0x956($at) -/* 11B44 80036744 3C01800A */ lui $at, 0x800a -/* 11B48 80036748 A4240958 */ sh $a0, 0x958($at) -/* 11B4C 8003674C 3C01800A */ lui $at, 0x800a -/* 11B50 80036750 AC300960 */ sw $s0, 0x960($at) -/* 11B54 80036754 3C01800A */ lui $at, 0x800a -/* 11B58 80036758 A420095A */ sh $zero, 0x95a($at) -/* 11B5C 8003675C 3C01800A */ lui $at, 0x800a -/* 11B60 80036760 A420095C */ sh $zero, 0x95c($at) -/* 11B64 80036764 3C01800A */ lui $at, 0x800a -/* 11B68 80036768 A420095E */ sh $zero, 0x95e($at) -/* 11B6C 8003676C 3C01800A */ lui $at, 0x800a -/* 11B70 80036770 AC200964 */ sw $zero, 0x964($at) +/* 11B34 80036734 3C01800A */ lui $at, %hi(D_800A0954) +/* 11B38 80036738 A4200954 */ sh $zero, %lo(D_800A0954)($at) +/* 11B3C 8003673C 3C01800A */ lui $at, %hi(D_800A0956) +/* 11B40 80036740 A4220956 */ sh $v0, %lo(D_800A0956)($at) +/* 11B44 80036744 3C01800A */ lui $at, %hi(D_800A0958) +/* 11B48 80036748 A4240958 */ sh $a0, %lo(D_800A0958)($at) +/* 11B4C 8003674C 3C01800A */ lui $at, %hi(D_800A0960) +/* 11B50 80036750 AC300960 */ sw $s0, %lo(D_800A0960)($at) +/* 11B54 80036754 3C01800A */ lui $at, %hi(D_800A095A) +/* 11B58 80036758 A420095A */ sh $zero, %lo(D_800A095A)($at) +/* 11B5C 8003675C 3C01800A */ lui $at, %hi(D_800A095C) +/* 11B60 80036760 A420095C */ sh $zero, %lo(D_800A095C)($at) +/* 11B64 80036764 3C01800A */ lui $at, %hi(D_800A095E) +/* 11B68 80036768 A420095E */ sh $zero, %lo(D_800A095E)($at) +/* 11B6C 8003676C 3C01800A */ lui $at, %hi(D_800A0964) +/* 11B70 80036770 AC200964 */ sw $zero, %lo(D_800A0964)($at) /* 11B74 80036774 8E220000 */ lw $v0, ($s1) /* 11B78 80036778 24030005 */ addiu $v1, $zero, 5 /* 11B7C 8003677C A4430086 */ sh $v1, 0x86($v0) @@ -91,15 +91,15 @@ glabel begin_state_intro /* 11B9C 8003679C 2402FFFF */ addiu $v0, $zero, -1 /* 11BA0 800367A0 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 11BA4 800367A4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 11BA8 800367A8 3C048007 */ lui $a0, 0x8007 -/* 11BAC 800367AC 248479B0 */ addiu $a0, $a0, 0x79b0 +/* 11BA8 800367A8 3C048007 */ lui $a0, %hi(D_800779B0) +/* 11BAC 800367AC 248479B0 */ addiu $a0, $a0, %lo(D_800779B0) /* 11BB0 800367B0 A06200A8 */ sb $v0, 0xa8($v1) /* 11BB4 800367B4 90820000 */ lbu $v0, ($a0) /* 11BB8 800367B8 24030006 */ addiu $v1, $zero, 6 -/* 11BBC 800367BC 3C01800A */ lui $at, 0x800a -/* 11BC0 800367C0 A4230956 */ sh $v1, 0x956($at) -/* 11BC4 800367C4 3C01800A */ lui $at, 0x800a -/* 11BC8 800367C8 A4230958 */ sh $v1, 0x958($at) +/* 11BBC 800367BC 3C01800A */ lui $at, %hi(D_800A0956) +/* 11BC0 800367C0 A4230956 */ sh $v1, %lo(D_800A0956)($at) +/* 11BC4 800367C4 3C01800A */ lui $at, %hi(D_800A0958) +/* 11BC8 800367C8 A4230958 */ sh $v1, %lo(D_800A0958)($at) /* 11BCC 800367CC 24420001 */ addiu $v0, $v0, 1 /* 11BD0 800367D0 A0820000 */ sb $v0, ($a0) /* 11BD4 800367D4 304200FF */ andi $v0, $v0, 0xff @@ -108,23 +108,23 @@ glabel begin_state_intro /* 11BE0 800367E0 A0800000 */ sb $zero, ($a0) .L800367E4: /* 11BE4 800367E4 24020003 */ addiu $v0, $zero, 3 -/* 11BE8 800367E8 3C01800A */ lui $at, 0x800a -/* 11BEC 800367EC AC220964 */ sw $v0, 0x964($at) +/* 11BE8 800367E8 3C01800A */ lui $at, %hi(D_800A0964) +/* 11BEC 800367EC AC220964 */ sw $v0, %lo(D_800A0964)($at) .L800367F0: -/* 11BF0 800367F0 3C02800A */ lui $v0, 0x800a -/* 11BF4 800367F4 84420954 */ lh $v0, 0x954($v0) -/* 11BF8 800367F8 3C04800A */ lui $a0, 0x800a -/* 11BFC 800367FC 90840963 */ lbu $a0, 0x963($a0) +/* 11BF0 800367F0 3C02800A */ lui $v0, %hi(D_800A0954) +/* 11BF4 800367F4 84420954 */ lh $v0, %lo(D_800A0954)($v0) +/* 11BF8 800367F8 3C04800A */ lui $a0, %hi(D_800A0963) +/* 11BFC 800367FC 90840963 */ lbu $a0, %lo(D_800A0963)($a0) /* 11C00 80036800 44820000 */ mtc1 $v0, $f0 /* 11C04 80036804 00000000 */ nop /* 11C08 80036808 46800020 */ cvt.s.w $f0, $f0 /* 11C0C 8003680C 44050000 */ mfc1 $a1, $f0 /* 11C10 80036810 0C04DF69 */ jal func_80137DA4 /* 11C14 80036814 00000000 */ nop -/* 11C18 80036818 3C05800A */ lui $a1, 0x800a -/* 11C1C 8003681C 90A5095B */ lbu $a1, 0x95b($a1) -/* 11C20 80036820 3C06800A */ lui $a2, 0x800a -/* 11C24 80036824 90C6095D */ lbu $a2, 0x95d($a2) +/* 11C18 80036818 3C05800A */ lui $a1, %hi(D_800A095B) +/* 11C1C 8003681C 90A5095B */ lbu $a1, %lo(D_800A095B)($a1) +/* 11C20 80036820 3C06800A */ lui $a2, %hi(D_800A095F) +/* 11C24 80036824 90C6095D */ lbu $a2, %lo(D_800A095F)($a2) /* 11C28 80036828 3C07800A */ lui $a3, 0x800a /* 11C2C 8003682C 90E7095F */ lbu $a3, 0x95f($a3) /* 11C30 80036830 0C04DF84 */ jal func_80137E10 diff --git a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s index 3ba237452c..be878a96df 100644 --- a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s +++ b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s @@ -15,8 +15,8 @@ glabel step_intro /* 11C7C 8003687C 804300A8 */ lb $v1, 0xa8($v0) /* 11C80 80036880 1064002F */ beq $v1, $a0, .L80036940 /* 11C84 80036884 8C450010 */ lw $a1, 0x10($v0) -/* 11C88 80036888 3C03800A */ lui $v1, 0x800a -/* 11C8C 8003688C 24630964 */ addiu $v1, $v1, 0x964 +/* 11C88 80036888 3C03800A */ lui $v1, %hi(D_800A0964) +/* 11C8C 8003688C 24630964 */ addiu $v1, $v1, %lo(D_800A0964) /* 11C90 80036890 8C620000 */ lw $v0, ($v1) /* 11C94 80036894 14400004 */ bnez $v0, .L800368A8 /* 11C98 80036898 30A2F000 */ andi $v0, $a1, 0xf000 @@ -24,8 +24,8 @@ glabel step_intro /* 11CA0 800368A0 24020001 */ addiu $v0, $zero, 1 /* 11CA4 800368A4 AC620000 */ sw $v0, ($v1) .L800368A8: -/* 11CA8 800368A8 3C03800A */ lui $v1, 0x800a -/* 11CAC 800368AC 8C630964 */ lw $v1, 0x964($v1) +/* 11CA8 800368A8 3C03800A */ lui $v1, %hi(D_800A0964) +/* 11CAC 800368AC 8C630964 */ lw $v1, %lo(D_800A0964)($v1) /* 11CB0 800368B0 24020001 */ addiu $v0, $zero, 1 /* 11CB4 800368B4 14620010 */ bne $v1, $v0, .L800368F8 /* 11CB8 800368B8 24020002 */ addiu $v0, $zero, 2 @@ -43,8 +43,8 @@ glabel step_intro /* 11CE8 800368E8 0800DA4C */ j .L80036930 /* 11CEC 800368EC 24020064 */ addiu $v0, $zero, 0x64 .L800368F0: -/* 11CF0 800368F0 3C03800A */ lui $v1, 0x800a -/* 11CF4 800368F4 8C630964 */ lw $v1, 0x964($v1) +/* 11CF0 800368F0 3C03800A */ lui $v1, %hi(D_800A0964) +/* 11CF4 800368F4 8C630964 */ lw $v1, %lo(D_800A0964)($v1) .L800368F8: /* 11CF8 800368F8 14620011 */ bne $v1, $v0, .L80036940 /* 11CFC 800368FC 00000000 */ nop @@ -92,8 +92,8 @@ glabel step_intro /* 11D98 80036998 44806000 */ mtc1 $zero, $f12 /* 11D9C 8003699C 0C00AFC5 */ jal set_curtain_fade_goal /* 11DA0 800369A0 00000000 */ nop -/* 11DA4 800369A4 3C04800A */ lui $a0, 0x800a -/* 11DA8 800369A8 84840956 */ lh $a0, 0x956($a0) +/* 11DA4 800369A4 3C04800A */ lui $a0, %hi(D_800A0956) +/* 11DA8 800369A8 84840956 */ lh $a0, %lo(D_800A0956)($a0) /* 11DAC 800369AC 0C00CE0C */ jal intro_logos_fade_out /* 11DB0 800369B0 00000000 */ nop /* 11DB4 800369B4 104000F0 */ beqz $v0, .L80036D78 @@ -105,11 +105,11 @@ glabel step_intro /* 11DCC 800369CC 0800DB5E */ j .L80036D78 /* 11DD0 800369D0 00000000 */ nop .L800369D4: -/* 11DD4 800369D4 3C05800A */ lui $a1, 0x800a -/* 11DD8 800369D8 24A50954 */ addiu $a1, $a1, 0x954 +/* 11DD4 800369D4 3C05800A */ lui $a1, %hi(D_800A0954) +/* 11DD8 800369D8 24A50954 */ addiu $a1, $a1, %lo(D_800A0954) /* 11DDC 800369DC 94A20000 */ lhu $v0, ($a1) -/* 11DE0 800369E0 3C03800A */ lui $v1, 0x800a -/* 11DE4 800369E4 94630956 */ lhu $v1, 0x956($v1) +/* 11DE0 800369E0 3C03800A */ lui $v1, %hi(D_800A0956) +/* 11DE4 800369E4 94630956 */ lhu $v1, %lo(D_800A0956)($v1) /* 11DE8 800369E8 00431021 */ addu $v0, $v0, $v1 /* 11DEC 800369EC A4A20000 */ sh $v0, ($a1) /* 11DF0 800369F0 00021400 */ sll $v0, $v0, 0x10 @@ -132,8 +132,8 @@ glabel step_intro /* 11E34 80036A34 AC230950 */ sw $v1, 0x950($at) /* 11E38 80036A38 34420008 */ ori $v0, $v0, 8 /* 11E3C 80036A3C AC820000 */ sw $v0, ($a0) -/* 11E40 80036A40 3C03800A */ lui $v1, 0x800a -/* 11E44 80036A44 8C630960 */ lw $v1, 0x960($v1) +/* 11E40 80036A40 3C03800A */ lui $v1, %hi(D_800A0960) +/* 11E44 80036A44 8C630960 */ lw $v1, %lo(D_800A0960)($v1) /* 11E48 80036A48 2402000E */ addiu $v0, $zero, 0xe /* 11E4C 80036A4C 106200CA */ beq $v1, $v0, .L80036D78 /* 11E50 80036A50 00000000 */ nop @@ -263,8 +263,8 @@ glabel step_intro /* 12034 80036C34 A06200AC */ sb $v0, 0xac($v1) /* 12038 80036C38 0800DB5E */ j .L80036D78 /* 1203C 80036C3C 00000000 */ nop -/* 12040 80036C40 3C04800A */ lui $a0, 0x800a -/* 12044 80036C44 24840960 */ addiu $a0, $a0, 0x960 +/* 12040 80036C40 3C04800A */ lui $a0, %hi(D_800A0960) +/* 12044 80036C44 24840960 */ addiu $a0, $a0, %lo(D_800A0960) /* 12048 80036C48 8C830000 */ lw $v1, ($a0) /* 1204C 80036C4C 2402000E */ addiu $v0, $zero, 0xe /* 12050 80036C50 14620004 */ bne $v1, $v0, .L80036C64 @@ -276,13 +276,13 @@ glabel step_intro /* 12064 80036C64 3C04800A */ lui $a0, %hi(D_8009A650) /* 12068 80036C68 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 1206C 80036C6C 2405FFF7 */ addiu $a1, $zero, -9 -/* 12070 80036C70 3C03800A */ lui $v1, 0x800a -/* 12074 80036C74 94630958 */ lhu $v1, 0x958($v1) +/* 12070 80036C70 3C03800A */ lui $v1, %hi(D_800A0958) +/* 12074 80036C74 94630958 */ lhu $v1, %lo(D_800A0958)($v1) /* 12078 80036C78 3C06800B */ lui $a2, %hi(gCameras) /* 1207C 80036C7C 24C61D80 */ addiu $a2, $a2, %lo(gCameras) /* 12080 80036C80 00431023 */ subu $v0, $v0, $v1 -/* 12084 80036C84 3C01800A */ lui $at, 0x800a -/* 12088 80036C88 A4220954 */ sh $v0, 0x954($at) +/* 12084 80036C84 3C01800A */ lui $at, %hi(D_800A0954) +/* 12088 80036C88 A4220954 */ sh $v0, %lo(D_800A0954)($at) /* 1208C 80036C8C 8C830000 */ lw $v1, ($a0) /* 12090 80036C90 94C20000 */ lhu $v0, ($a2) /* 12094 80036C94 00651824 */ and $v1, $v1, $a1 @@ -319,8 +319,8 @@ glabel step_intro /* 12110 80036D10 00000000 */ nop /* 12114 80036D14 0C00E64C */ jal update_npcs /* 12118 80036D18 00000000 */ nop -/* 1211C 80036D1C 3C04800A */ lui $a0, 0x800a -/* 12120 80036D20 24840954 */ addiu $a0, $a0, 0x954 +/* 1211C 80036D1C 3C04800A */ lui $a0, %hi(D_800A0954) +/* 12120 80036D20 24840954 */ addiu $a0, $a0, %lo(D_800A0954) /* 12124 80036D24 84820000 */ lh $v0, ($a0) /* 12128 80036D28 1440000C */ bnez $v0, .L80036D5C /* 1212C 80036D2C 94830000 */ lhu $v1, ($a0) @@ -336,28 +336,28 @@ glabel step_intro /* 12154 80036D54 0800DB5E */ j .L80036D78 /* 12158 80036D58 00000000 */ nop .L80036D5C: -/* 1215C 80036D5C 3C02800A */ lui $v0, 0x800a -/* 12160 80036D60 94420958 */ lhu $v0, 0x958($v0) +/* 1215C 80036D5C 3C02800A */ lui $v0, %hi(D_800A0958) +/* 12160 80036D60 94420958 */ lhu $v0, %lo(D_800A0958)($v0) /* 12164 80036D64 00621023 */ subu $v0, $v1, $v0 /* 12168 80036D68 A4820000 */ sh $v0, ($a0) /* 1216C 80036D6C 00021400 */ sll $v0, $v0, 0x10 /* 12170 80036D70 04420001 */ bltzl $v0, .L80036D78 /* 12174 80036D74 A4800000 */ sh $zero, ($a0) .L80036D78: -/* 12178 80036D78 3C02800A */ lui $v0, 0x800a -/* 1217C 80036D7C 84420954 */ lh $v0, 0x954($v0) -/* 12180 80036D80 3C04800A */ lui $a0, 0x800a -/* 12184 80036D84 90840963 */ lbu $a0, 0x963($a0) +/* 12178 80036D78 3C02800A */ lui $v0, %hi(D_800A0954) +/* 1217C 80036D7C 84420954 */ lh $v0, %lo(D_800A0954)($v0) +/* 12180 80036D80 3C04800A */ lui $a0, %hi(D_800A0963) +/* 12184 80036D84 90840963 */ lbu $a0, %lo(D_800A0963)($a0) /* 12188 80036D88 44820000 */ mtc1 $v0, $f0 /* 1218C 80036D8C 00000000 */ nop /* 12190 80036D90 46800020 */ cvt.s.w $f0, $f0 /* 12194 80036D94 44050000 */ mfc1 $a1, $f0 /* 12198 80036D98 0C04DF69 */ jal func_80137DA4 /* 1219C 80036D9C 00000000 */ nop -/* 121A0 80036DA0 3C05800A */ lui $a1, 0x800a -/* 121A4 80036DA4 90A5095B */ lbu $a1, 0x95b($a1) -/* 121A8 80036DA8 3C06800A */ lui $a2, 0x800a -/* 121AC 80036DAC 90C6095D */ lbu $a2, 0x95d($a2) +/* 121A0 80036DA0 3C05800A */ lui $a1, %hi(D_800A095B) +/* 121A4 80036DA4 90A5095B */ lbu $a1, %lo(D_800A095B)($a1) +/* 121A8 80036DA8 3C06800A */ lui $a2, %hi(D_800A095F) +/* 121AC 80036DAC 90C6095D */ lbu $a2, %lo(D_800A095F)($a2) /* 121B0 80036DB0 3C07800A */ lui $a3, 0x800a /* 121B4 80036DB4 90E7095F */ lbu $a3, 0x95f($a3) /* 121B8 80036DB8 0C04DF84 */ jal func_80137E10 diff --git a/asm/nonmatchings/code_1370_len_7d0/boot_main.s b/asm/nonmatchings/code_1370_len_7d0/boot_main.s index 344e0f810e..3599e4726d 100644 --- a/asm/nonmatchings/code_1370_len_7d0/boot_main.s +++ b/asm/nonmatchings/code_1370_len_7d0/boot_main.s @@ -11,52 +11,52 @@ glabel boot_main /* 1388 80025F88 3C048009 */ lui $a0, 0x8009 /* 138C 80025F8C 24845820 */ addiu $a0, $a0, 0x5820 /* 1390 80025F90 080097EB */ j .L80025FAC -/* 1394 80025F94 00000000 */ nop +/* 1394 80025F94 00000000 */ nop .L80025F98: /* 1398 80025F98 24020002 */ addiu $v0, $zero, 2 /* 139C 80025F9C 14620009 */ bne $v1, $v0, .L80025FC4 -/* 13A0 80025FA0 00000000 */ nop +/* 13A0 80025FA0 00000000 */ nop /* 13A4 80025FA4 3C048009 */ lui $a0, 0x8009 /* 13A8 80025FA8 24845870 */ addiu $a0, $a0, 0x5870 .L80025FAC: /* 13AC 80025FAC 0C019B84 */ jal osViSetMode -/* 13B0 80025FB0 00000000 */ nop +/* 13B0 80025FB0 00000000 */ nop /* 13B4 80025FB4 0C019B98 */ jal osViSetSpecialFeatures /* 13B8 80025FB8 2404005A */ addiu $a0, $zero, 0x5a /* 13BC 80025FBC 080097F3 */ j .L80025FCC -/* 13C0 80025FC0 00000000 */ nop +/* 13C0 80025FC0 00000000 */ nop .L80025FC4: /* 13C4 80025FC4 080097F1 */ j .L80025FC4 -/* 13C8 80025FC8 00000000 */ nop +/* 13C8 80025FC8 00000000 */ nop .L80025FCC: /* 13CC 80025FCC 0C017D00 */ jal nuGfxDisplayOff -/* 13D0 80025FD0 00000000 */ nop +/* 13D0 80025FD0 00000000 */ nop /* 13D4 80025FD4 0C00B22C */ jal crash_create_monitor -/* 13D8 80025FD8 00000000 */ nop +/* 13D8 80025FD8 00000000 */ nop /* 13DC 80025FDC 0C009718 */ jal func_80025C60 -/* 13E0 80025FE0 00000000 */ nop +/* 13E0 80025FE0 00000000 */ nop /* 13E4 80025FE4 0C017D58 */ jal nuGfxInit -/* 13E8 80025FE8 00000000 */ nop +/* 13E8 80025FE8 00000000 */ nop /* 13EC 80025FEC 0C017D84 */ jal nuContInit -/* 13F0 80025FF0 00000000 */ nop +/* 13F0 80025FF0 00000000 */ nop /* 13F4 80025FF4 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 13F8 80025FF8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 13FC 80025FFC 0C00B458 */ jal func_8002D160 /* 1400 80026000 A0620073 */ sb $v0, 0x73($v1) /* 1404 80026004 0C0AC800 */ jal func_802B2000 -/* 1408 80026008 00000000 */ nop +/* 1408 80026008 00000000 */ nop /* 140C 8002600C 0C0AC80F */ jal func_802B203C -/* 1410 80026010 00000000 */ nop +/* 1410 80026010 00000000 */ nop /* 1414 80026014 3C048002 */ lui $a0, 0x8002 /* 1418 80026018 2484605C */ addiu $a0, $a0, 0x605c /* 141C 8002601C 0C017C94 */ jal nuGfxFuncSet -/* 1420 80026020 00000000 */ nop +/* 1420 80026020 00000000 */ nop /* 1424 80026024 3C048002 */ lui $a0, 0x8002 /* 1428 80026028 2484670C */ addiu $a0, $a0, 0x670c /* 142C 8002602C 0C017CA4 */ jal nuGfxPreNMIFuncSet -/* 1430 80026030 00000000 */ nop +/* 1430 80026030 00000000 */ nop /* 1434 80026034 0C019680 */ jal osGetCount -/* 1438 80026038 00000000 */ nop +/* 1438 80026038 00000000 */ nop /* 143C 8002603C 3C048007 */ lui $a0, %hi(gRandSeed) /* 1440 80026040 24844410 */ addiu $a0, $a0, %lo(gRandSeed) /* 1444 80026044 8C830000 */ lw $v1, ($a0) diff --git a/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/asm/nonmatchings/code_6e40_len_500/render_curtains.s index dcd30f0a70..d3c59fb917 100644 --- a/asm/nonmatchings/code_6e40_len_500/render_curtains.s +++ b/asm/nonmatchings/code_6e40_len_500/render_curtains.s @@ -17,15 +17,15 @@ glabel render_curtains /* 6EB0 8002BAB0 F7B40080 */ sdc1 $f20, 0x80($sp) /* 6EB4 8002BAB4 C6440000 */ lwc1 $f4, ($s2) /* 6EB8 8002BAB8 46040032 */ c.eq.s $f0, $f4 -/* 6EBC 8002BABC 00000000 */ nop +/* 6EBC 8002BABC 00000000 */ nop /* 6EC0 8002BAC0 4501000B */ bc1t .L8002BAF0 -/* 6EC4 8002BAC4 00000000 */ nop +/* 6EC4 8002BAC4 00000000 */ nop /* 6EC8 8002BAC8 46040001 */ sub.s $f0, $f0, $f4 /* 6ECC 8002BACC 3C018009 */ lui $at, 0x8009 /* 6ED0 8002BAD0 D4227E00 */ ldc1 $f2, 0x7e00($at) /* 6ED4 8002BAD4 46000021 */ cvt.d.s $f0, $f0 /* 6ED8 8002BAD8 46220002 */ mul.d $f0, $f0, $f2 -/* 6EDC 8002BADC 00000000 */ nop +/* 6EDC 8002BADC 00000000 */ nop /* 6EE0 8002BAE0 460020A1 */ cvt.d.s $f2, $f4 /* 6EE4 8002BAE4 46201080 */ add.d $f2, $f2, $f0 /* 6EE8 8002BAE8 462010A0 */ cvt.s.d $f2, $f2 @@ -37,15 +37,15 @@ glabel render_curtains /* 6EFC 8002BAFC C420BA9C */ lwc1 $f0, -0x4564($at) /* 6F00 8002BB00 C6640000 */ lwc1 $f4, ($s3) /* 6F04 8002BB04 46040032 */ c.eq.s $f0, $f4 -/* 6F08 8002BB08 00000000 */ nop +/* 6F08 8002BB08 00000000 */ nop /* 6F0C 8002BB0C 4501000B */ bc1t .L8002BB3C -/* 6F10 8002BB10 00000000 */ nop +/* 6F10 8002BB10 00000000 */ nop /* 6F14 8002BB14 46040001 */ sub.s $f0, $f0, $f4 /* 6F18 8002BB18 3C018009 */ lui $at, 0x8009 /* 6F1C 8002BB1C D4227E08 */ ldc1 $f2, 0x7e08($at) /* 6F20 8002BB20 46000021 */ cvt.d.s $f0, $f0 /* 6F24 8002BB24 46220002 */ mul.d $f0, $f0, $f2 -/* 6F28 8002BB28 00000000 */ nop +/* 6F28 8002BB28 00000000 */ nop /* 6F2C 8002BB2C 460020A1 */ cvt.d.s $f2, $f4 /* 6F30 8002BB30 46201080 */ add.d $f2, $f2, $f0 /* 6F34 8002BB34 462010A0 */ cvt.s.d $f2, $f2 @@ -56,7 +56,7 @@ glabel render_curtains /* 6F44 8002BB44 D4227E10 */ ldc1 $f2, 0x7e10($at) /* 6F48 8002BB48 46000021 */ cvt.d.s $f0, $f0 /* 6F4C 8002BB4C 4622003C */ c.lt.d $f0, $f2 -/* 6F50 8002BB50 00000000 */ nop +/* 6F50 8002BB50 00000000 */ nop /* 6F54 8002BB54 45000087 */ bc1f .L8002BD74 /* 6F58 8002BB58 3C03FF10 */ lui $v1, 0xff10 /* 6F5C 8002BB5C 3463013F */ ori $v1, $v1, 0x13f @@ -121,7 +121,7 @@ glabel render_curtains /* 7048 8002BC48 AC640000 */ sw $a0, ($v1) /* 704C 8002BC4C 46200120 */ cvt.s.d $f4, $f0 /* 7050 8002BC50 4614203C */ c.lt.s $f4, $f20 -/* 7054 8002BC54 00000000 */ nop +/* 7054 8002BC54 00000000 */ nop /* 7058 8002BC58 45000002 */ bc1f .L8002BC64 /* 705C 8002BC5C AC700004 */ sw $s0, 4($v1) /* 7060 8002BC60 4600A106 */ mov.s $f4, $f20 @@ -132,7 +132,7 @@ glabel render_curtains /* 7070 8002BC70 44050000 */ mfc1 $a1, $f0 /* 7074 8002BC74 46002021 */ cvt.d.s $f0, $f4 /* 7078 8002BC78 46220002 */ mul.d $f0, $f0, $f2 -/* 707C 8002BC7C 00000000 */ nop +/* 707C 8002BC7C 00000000 */ nop /* 7080 8002BC80 27A40020 */ addiu $a0, $sp, 0x20 /* 7084 8002BC84 3C01C3A0 */ lui $at, 0xc3a0 /* 7088 8002BC88 44811000 */ mtc1 $at, $f2 @@ -175,7 +175,7 @@ glabel render_curtains /* 711C 8002BD1C AE220000 */ sw $v0, ($s1) /* 7120 8002BD20 24020040 */ addiu $v0, $zero, 0x40 /* 7124 8002BD24 46001082 */ mul.s $f2, $f2, $f0 -/* 7128 8002BD28 00000000 */ nop +/* 7128 8002BD28 00000000 */ nop /* 712C 8002BD2C ACA20014 */ sw $v0, 0x14($a1) /* 7130 8002BD30 24A20020 */ addiu $v0, $a1, 0x20 /* 7134 8002BD34 ACA40010 */ sw $a0, 0x10($a1) @@ -185,7 +185,7 @@ glabel render_curtains /* 7144 8002BD44 ACA0001C */ sw $zero, 0x1c($a1) /* 7148 8002BD48 4600018D */ trunc.w.s $f6, $f0 /* 714C 8002BD4C 44023000 */ mfc1 $v0, $f6 -/* 7150 8002BD50 00000000 */ nop +/* 7150 8002BD50 00000000 */ nop /* 7154 8002BD54 304200FF */ andi $v0, $v0, 0xff /* 7158 8002BD58 00021E00 */ sll $v1, $v0, 0x18 /* 715C 8002BD5C 00022400 */ sll $a0, $v0, 0x10 @@ -198,9 +198,9 @@ glabel render_curtains /* 7174 8002BD74 3C02800A */ lui $v0, %hi(gCurtainDrawCallback) /* 7178 8002BD78 8C42BAA0 */ lw $v0, %lo(gCurtainDrawCallback)($v0) /* 717C 8002BD7C 10400003 */ beqz $v0, .L8002BD8C -/* 7180 8002BD80 00000000 */ nop +/* 7180 8002BD80 00000000 */ nop /* 7184 8002BD84 0040F809 */ jalr $v0 -/* 7188 8002BD88 00000000 */ nop +/* 7188 8002BD88 00000000 */ nop .L8002BD8C: /* 718C 8002BD8C 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 7190 8002BD90 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) @@ -208,25 +208,25 @@ glabel render_curtains /* 7198 8002BD98 90420073 */ lbu $v0, 0x73($v0) /* 719C 8002BD9C 30420001 */ andi $v0, $v0, 1 /* 71A0 8002BDA0 14400044 */ bnez $v0, .L8002BEB4 -/* 71A4 8002BDA4 00000000 */ nop +/* 71A4 8002BDA4 00000000 */ nop /* 71A8 8002BDA8 0C00CD4A */ jal get_game_mode -/* 71AC 8002BDAC 00000000 */ nop +/* 71AC 8002BDAC 00000000 */ nop /* 71B0 8002BDB0 00021400 */ sll $v0, $v0, 0x10 /* 71B4 8002BDB4 00021403 */ sra $v0, $v0, 0x10 /* 71B8 8002BDB8 24030010 */ addiu $v1, $zero, 0x10 /* 71BC 8002BDBC 1043000C */ beq $v0, $v1, .L8002BDF0 -/* 71C0 8002BDC0 00000000 */ nop +/* 71C0 8002BDC0 00000000 */ nop /* 71C4 8002BDC4 0C00CD4A */ jal get_game_mode -/* 71C8 8002BDC8 00000000 */ nop +/* 71C8 8002BDC8 00000000 */ nop /* 71CC 8002BDCC 00021400 */ sll $v0, $v0, 0x10 /* 71D0 8002BDD0 00021403 */ sra $v0, $v0, 0x10 /* 71D4 8002BDD4 24030002 */ addiu $v1, $zero, 2 /* 71D8 8002BDD8 10430005 */ beq $v0, $v1, .L8002BDF0 -/* 71DC 8002BDDC 00000000 */ nop +/* 71DC 8002BDDC 00000000 */ nop /* 71E0 8002BDE0 8E020000 */ lw $v0, ($s0) /* 71E4 8002BDE4 80420071 */ lb $v0, 0x71($v0) /* 71E8 8002BDE8 10400032 */ beqz $v0, .L8002BEB4 -/* 71EC 8002BDEC 00000000 */ nop +/* 71EC 8002BDEC 00000000 */ nop .L8002BDF0: /* 71F0 8002BDF0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 71F4 8002BDF4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s b/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s new file mode 100644 index 0000000000..c1209db8fe --- /dev/null +++ b/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s @@ -0,0 +1,141 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel contRmbControl +/* 3AD20 8005F920 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 3AD24 8005F924 AFB20018 */ sw $s2, 0x18($sp) +/* 3AD28 8005F928 0080902D */ daddu $s2, $a0, $zero +/* 3AD2C 8005F92C 00A0302D */ daddu $a2, $a1, $zero +/* 3AD30 8005F930 AFB00010 */ sw $s0, 0x10($sp) +/* 3AD34 8005F934 AFBF0020 */ sw $ra, 0x20($sp) +/* 3AD38 8005F938 AFB3001C */ sw $s3, 0x1c($sp) +/* 3AD3C 8005F93C AFB10014 */ sw $s1, 0x14($sp) +/* 3AD40 8005F940 92430006 */ lbu $v1, 6($s2) +/* 3AD44 8005F944 24130002 */ addiu $s3, $zero, 2 +/* 3AD48 8005F948 10730069 */ beq $v1, $s3, .L8005FAF0 +/* 3AD4C 8005F94C 0000802D */ daddu $s0, $zero, $zero +/* 3AD50 8005F950 28620003 */ slti $v0, $v1, 3 +/* 3AD54 8005F954 10400005 */ beqz $v0, .L8005F96C +/* 3AD58 8005F958 24020001 */ addiu $v0, $zero, 1 +/* 3AD5C 8005F95C 1062000A */ beq $v1, $v0, .L8005F988 +/* 3AD60 8005F960 0200102D */ daddu $v0, $s0, $zero +/* 3AD64 8005F964 08017EBD */ j .L8005FAF4 +/* 3AD68 8005F968 00000000 */ nop +.L8005F96C: +/* 3AD6C 8005F96C 24020003 */ addiu $v0, $zero, 3 +/* 3AD70 8005F970 10620018 */ beq $v1, $v0, .L8005F9D4 +/* 3AD74 8005F974 24020004 */ addiu $v0, $zero, 4 +/* 3AD78 8005F978 10620048 */ beq $v1, $v0, .L8005FA9C +/* 3AD7C 8005F97C 0200102D */ daddu $v0, $s0, $zero +/* 3AD80 8005F980 08017EBD */ j .L8005FAF4 +/* 3AD84 8005F984 00000000 */ nop +.L8005F988: +/* 3AD88 8005F988 96420004 */ lhu $v0, 4($s2) +/* 3AD8C 8005F98C 1040000C */ beqz $v0, .L8005F9C0 +/* 3AD90 8005F990 00062040 */ sll $a0, $a2, 1 +/* 3AD94 8005F994 00862021 */ addu $a0, $a0, $a2 +/* 3AD98 8005F998 00042080 */ sll $a0, $a0, 2 +/* 3AD9C 8005F99C 00862021 */ addu $a0, $a0, $a2 +/* 3ADA0 8005F9A0 000420C0 */ sll $a0, $a0, 3 +/* 3ADA4 8005F9A4 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3ADA8 8005F9A8 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3ADAC 8005F9AC 00822021 */ addu $a0, $a0, $v0 +/* 3ADB0 8005F9B0 0C019F80 */ jal __osMotorAccess +/* 3ADB4 8005F9B4 0000282D */ daddu $a1, $zero, $zero +/* 3ADB8 8005F9B8 08017E71 */ j .L8005F9C4 +/* 3ADBC 8005F9BC 0040802D */ daddu $s0, $v0, $zero +.L8005F9C0: +/* 3ADC0 8005F9C0 A2530006 */ sb $s3, 6($s2) +.L8005F9C4: +/* 3ADC4 8005F9C4 96420004 */ lhu $v0, 4($s2) +/* 3ADC8 8005F9C8 2442FFFF */ addiu $v0, $v0, -1 +/* 3ADCC 8005F9CC 08017EBC */ j .L8005FAF0 +/* 3ADD0 8005F9D0 A6420004 */ sh $v0, 4($s2) +.L8005F9D4: +/* 3ADD4 8005F9D4 96420002 */ lhu $v0, 2($s2) +/* 3ADD8 8005F9D8 1040001F */ beqz $v0, .L8005FA58 +/* 3ADDC 8005F9DC 00062040 */ sll $a0, $a2, 1 +/* 3ADE0 8005F9E0 96420004 */ lhu $v0, 4($s2) +/* 3ADE4 8005F9E4 96430000 */ lhu $v1, ($s2) +/* 3ADE8 8005F9E8 00431021 */ addu $v0, $v0, $v1 +/* 3ADEC 8005F9EC 304300FF */ andi $v1, $v0, 0xff +/* 3ADF0 8005F9F0 3042FFFF */ andi $v0, $v0, 0xffff +/* 3ADF4 8005F9F4 00021202 */ srl $v0, $v0, 8 +/* 3ADF8 8005F9F8 1040000B */ beqz $v0, .L8005FA28 +/* 3ADFC 8005F9FC A6430004 */ sh $v1, 4($s2) +/* 3AE00 8005FA00 00062040 */ sll $a0, $a2, 1 +/* 3AE04 8005FA04 00862021 */ addu $a0, $a0, $a2 +/* 3AE08 8005FA08 00042080 */ sll $a0, $a0, 2 +/* 3AE0C 8005FA0C 00862021 */ addu $a0, $a0, $a2 +/* 3AE10 8005FA10 000420C0 */ sll $a0, $a0, 3 +/* 3AE14 8005FA14 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3AE18 8005FA18 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3AE1C 8005FA1C 00822021 */ addu $a0, $a0, $v0 +/* 3AE20 8005FA20 08017E92 */ j .L8005FA48 +/* 3AE24 8005FA24 24050001 */ addiu $a1, $zero, 1 +.L8005FA28: +/* 3AE28 8005FA28 00862021 */ addu $a0, $a0, $a2 +/* 3AE2C 8005FA2C 00042080 */ sll $a0, $a0, 2 +/* 3AE30 8005FA30 00862021 */ addu $a0, $a0, $a2 +/* 3AE34 8005FA34 000420C0 */ sll $a0, $a0, 3 +/* 3AE38 8005FA38 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3AE3C 8005FA3C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3AE40 8005FA40 00822021 */ addu $a0, $a0, $v0 +/* 3AE44 8005FA44 0000282D */ daddu $a1, $zero, $zero +.L8005FA48: +/* 3AE48 8005FA48 0C019F80 */ jal __osMotorAccess +/* 3AE4C 8005FA4C 00000000 */ nop +/* 3AE50 8005FA50 08017EA3 */ j .L8005FA8C +/* 3AE54 8005FA54 0040802D */ daddu $s0, $v0, $zero +.L8005FA58: +/* 3AE58 8005FA58 00862021 */ addu $a0, $a0, $a2 +/* 3AE5C 8005FA5C 00042080 */ sll $a0, $a0, 2 +/* 3AE60 8005FA60 00862021 */ addu $a0, $a0, $a2 +/* 3AE64 8005FA64 000420C0 */ sll $a0, $a0, 3 +/* 3AE68 8005FA68 3C02800E */ lui $v0, %hi(nuContPfs) +/* 3AE6C 8005FA6C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) +/* 3AE70 8005FA70 00822021 */ addu $a0, $a0, $v0 +/* 3AE74 8005FA74 0C019F80 */ jal __osMotorAccess +/* 3AE78 8005FA78 0000282D */ daddu $a1, $zero, $zero +/* 3AE7C 8005FA7C 0040802D */ daddu $s0, $v0, $zero +/* 3AE80 8005FA80 24020001 */ addiu $v0, $zero, 1 +/* 3AE84 8005FA84 A2420006 */ sb $v0, 6($s2) +/* 3AE88 8005FA88 A6530004 */ sh $s3, 4($s2) +.L8005FA8C: +/* 3AE8C 8005FA8C 96420002 */ lhu $v0, 2($s2) +/* 3AE90 8005FA90 2442FFFF */ addiu $v0, $v0, -1 +/* 3AE94 8005FA94 08017EBC */ j .L8005FAF0 +/* 3AE98 8005FA98 A6420002 */ sh $v0, 2($s2) +.L8005FA9C: +/* 3AE9C 8005FA9C 3C04800E */ lui $a0, %hi(nuSiMesgQ) +/* 3AEA0 8005FAA0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) +/* 3AEA4 8005FAA4 00061040 */ sll $v0, $a2, 1 +/* 3AEA8 8005FAA8 00461021 */ addu $v0, $v0, $a2 +/* 3AEAC 8005FAAC 00021080 */ sll $v0, $v0, 2 +/* 3AEB0 8005FAB0 00461021 */ addu $v0, $v0, $a2 +/* 3AEB4 8005FAB4 000210C0 */ sll $v0, $v0, 3 +/* 3AEB8 8005FAB8 3C03800E */ lui $v1, %hi(nuContPfs) +/* 3AEBC 8005FABC 2463AAD8 */ addiu $v1, $v1, %lo(nuContPfs) +/* 3AEC0 8005FAC0 00438821 */ addu $s1, $v0, $v1 +/* 3AEC4 8005FAC4 0C019FD1 */ jal osMotorInit +/* 3AEC8 8005FAC8 0220282D */ daddu $a1, $s1, $zero +/* 3AECC 8005FACC 0040802D */ daddu $s0, $v0, $zero +/* 3AED0 8005FAD0 16000005 */ bnez $s0, .L8005FAE8 +/* 3AED4 8005FAD4 24020001 */ addiu $v0, $zero, 1 +/* 3AED8 8005FAD8 0220202D */ daddu $a0, $s1, $zero +/* 3AEDC 8005FADC 0C019F80 */ jal __osMotorAccess +/* 3AEE0 8005FAE0 0000282D */ daddu $a1, $zero, $zero +/* 3AEE4 8005FAE4 24020001 */ addiu $v0, $zero, 1 +.L8005FAE8: +/* 3AEE8 8005FAE8 A2420006 */ sb $v0, 6($s2) +/* 3AEEC 8005FAEC A6530004 */ sh $s3, 4($s2) +.L8005FAF0: +/* 3AEF0 8005FAF0 0200102D */ daddu $v0, $s0, $zero +.L8005FAF4: +/* 3AEF4 8005FAF4 8FBF0020 */ lw $ra, 0x20($sp) +/* 3AEF8 8005FAF8 8FB3001C */ lw $s3, 0x1c($sp) +/* 3AEFC 8005FAFC 8FB20018 */ lw $s2, 0x18($sp) +/* 3AF00 8005FB00 8FB10014 */ lw $s1, 0x14($sp) +/* 3AF04 8005FB04 8FB00010 */ lw $s0, 0x10($sp) +/* 3AF08 8005FB08 03E00008 */ jr $ra +/* 3AF0C 8005FB0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/tools/n64splat b/tools/n64splat index 44358d9ddc..4dd385463b 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 44358d9ddc731beafd06a14984d288eab8a305ad +Subproject commit 4dd385463bd3ae269ee356b1b2627328ab719fb0 diff --git a/tools/splat.yaml b/tools/splat.yaml index bbf8296212..ba3b82d461 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -4,6 +4,7 @@ options: find-file-boundaries: True pycparser_flags: ["-Iinclude", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", "-DSPLAT"] compiler: "GCC" + mnemonic_ljust: 10 segments: - name: header type: header From 8c9e999bfc2fa3e69f3f5aa7ee788512a15adeb2 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 15 Oct 2020 00:24:44 -0400 Subject: [PATCH 08/10] Cleanup --- .../code_163400/pause_set_cursor_opacity.s | 144 ------------------ .../os/nusys/nuContPakMgr/contRmbControl.s | 141 ----------------- 2 files changed, 285 deletions(-) delete mode 100644 asm/nonmatchings/code_163400/pause_set_cursor_opacity.s delete mode 100644 asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s diff --git a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s b/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s deleted file mode 100644 index 055d931cbd..0000000000 --- a/asm/nonmatchings/code_163400/pause_set_cursor_opacity.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_set_cursor_opacity -/* 163400 80242BA0 2882F581 */ slti $v0, $a0, -0xa7f -/* 163404 80242BA4 8FA90014 */ lw $t1, 0x14($sp) -/* 163408 80242BA8 8FAA0018 */ lw $t2, 0x18($sp) -/* 16340C 80242BAC 8FAB001C */ lw $t3, 0x1c($sp) -/* 163410 80242BB0 8FAC0020 */ lw $t4, 0x20($sp) -/* 163414 80242BB4 14400075 */ bnez $v0, .L80242D8C -/* 163418 80242BB8 28A2F581 */ slti $v0, $a1, -0xa7f -/* 16341C 80242BBC 14400073 */ bnez $v0, .L80242D8C -/* 163420 80242BC0 00000000 */ nop -/* 163424 80242BC4 18C00071 */ blez $a2, .L80242D8C -/* 163428 80242BC8 00000000 */ nop -/* 16342C 80242BCC 18E0006F */ blez $a3, .L80242D8C -/* 163430 80242BD0 28820500 */ slti $v0, $a0, 0x500 -/* 163434 80242BD4 1040006D */ beqz $v0, .L80242D8C -/* 163438 80242BD8 28A203C0 */ slti $v0, $a1, 0x3c0 -/* 16343C 80242BDC 1040006B */ beqz $v0, .L80242D8C -/* 163440 80242BE0 28C20A80 */ slti $v0, $a2, 0xa80 -/* 163444 80242BE4 10400069 */ beqz $v0, .L80242D8C -/* 163448 80242BE8 28E20A80 */ slti $v0, $a3, 0xa80 -/* 16344C 80242BEC 10400067 */ beqz $v0, .L80242D8C -/* 163450 80242BF0 00000000 */ nop -/* 163454 80242BF4 3C02800A */ lui $v0, 0x800a -/* 163458 80242BF8 2442A66C */ addiu $v0, $v0, -0x5994 -/* 16345C 80242BFC 8C480000 */ lw $t0, ($v0) -/* 163460 80242C00 25030008 */ addiu $v1, $t0, 8 -/* 163464 80242C04 AC430000 */ sw $v1, ($v0) -/* 163468 80242C08 00061400 */ sll $v0, $a2, 0x10 -/* 16346C 80242C0C 00021403 */ sra $v0, $v0, 0x10 -/* 163470 80242C10 18400005 */ blez $v0, .L80242C28 -/* 163474 80242C14 30420FFF */ andi $v0, $v0, 0xfff -/* 163478 80242C18 00021300 */ sll $v0, $v0, 0xc -/* 16347C 80242C1C 3C03E400 */ lui $v1, 0xe400 -/* 163480 80242C20 08090B0B */ j .L80242C2C -/* 163484 80242C24 00431825 */ or $v1, $v0, $v1 -.L80242C28: -/* 163488 80242C28 3C03E400 */ lui $v1, 0xe400 -.L80242C2C: -/* 16348C 80242C2C 00071400 */ sll $v0, $a3, 0x10 -/* 163490 80242C30 00021403 */ sra $v0, $v0, 0x10 -/* 163494 80242C34 18400004 */ blez $v0, .L80242C48 -/* 163498 80242C38 AD030000 */ sw $v1, ($t0) -/* 16349C 80242C3C 30420FFF */ andi $v0, $v0, 0xfff -/* 1634A0 80242C40 00621025 */ or $v0, $v1, $v0 -/* 1634A4 80242C44 AD020000 */ sw $v0, ($t0) -.L80242C48: -/* 1634A8 80242C48 8FA20010 */ lw $v0, 0x10($sp) -/* 1634AC 80242C4C 30420007 */ andi $v0, $v0, 7 -/* 1634B0 80242C50 00021E00 */ sll $v1, $v0, 0x18 -/* 1634B4 80242C54 00041400 */ sll $v0, $a0, 0x10 -/* 1634B8 80242C58 00023403 */ sra $a2, $v0, 0x10 -/* 1634BC 80242C5C 18C00003 */ blez $a2, .L80242C6C -/* 1634C0 80242C60 30C20FFF */ andi $v0, $a2, 0xfff -/* 1634C4 80242C64 00021300 */ sll $v0, $v0, 0xc -/* 1634C8 80242C68 00621825 */ or $v1, $v1, $v0 -.L80242C6C: -/* 1634CC 80242C6C 00051400 */ sll $v0, $a1, 0x10 -/* 1634D0 80242C70 00021403 */ sra $v0, $v0, 0x10 -/* 1634D4 80242C74 18400004 */ blez $v0, .L80242C88 -/* 1634D8 80242C78 AD030004 */ sw $v1, 4($t0) -/* 1634DC 80242C7C 30420FFF */ andi $v0, $v0, 0xfff -/* 1634E0 80242C80 00621025 */ or $v0, $v1, $v0 -/* 1634E4 80242C84 AD020004 */ sw $v0, 4($t0) -.L80242C88: -/* 1634E8 80242C88 3C03800A */ lui $v1, 0x800a -/* 1634EC 80242C8C 2463A66C */ addiu $v1, $v1, -0x5994 -/* 1634F0 80242C90 8C620000 */ lw $v0, ($v1) -/* 1634F4 80242C94 0040202D */ daddu $a0, $v0, $zero -/* 1634F8 80242C98 24420008 */ addiu $v0, $v0, 8 -/* 1634FC 80242C9C AC620000 */ sw $v0, ($v1) -/* 163500 80242CA0 3C02E100 */ lui $v0, 0xe100 -/* 163504 80242CA4 AC820000 */ sw $v0, ($a0) -/* 163508 80242CA8 04C10012 */ bgez $a2, .L80242CF4 -/* 16350C 80242CAC 24840004 */ addiu $a0, $a0, 4 -/* 163510 80242CB0 000B1400 */ sll $v0, $t3, 0x10 -/* 163514 80242CB4 00021403 */ sra $v0, $v0, 0x10 -/* 163518 80242CB8 04410007 */ bgez $v0, .L80242CD8 -/* 16351C 80242CBC 00C20018 */ mult $a2, $v0 -/* 163520 80242CC0 00006812 */ mflo $t5 -/* 163524 80242CC4 000D11C3 */ sra $v0, $t5, 7 -/* 163528 80242CC8 04410008 */ bgez $v0, .L80242CEC -/* 16352C 80242CCC 01221023 */ subu $v0, $t1, $v0 -/* 163530 80242CD0 08090B3A */ j .L80242CE8 -/* 163534 80242CD4 0000102D */ daddu $v0, $zero, $zero -.L80242CD8: -/* 163538 80242CD8 00006812 */ mflo $t5 -/* 16353C 80242CDC 000D11C3 */ sra $v0, $t5, 7 -/* 163540 80242CE0 5C400001 */ bgtzl $v0, .L80242CE8 -/* 163544 80242CE4 0000102D */ daddu $v0, $zero, $zero -.L80242CE8: -/* 163548 80242CE8 01221023 */ subu $v0, $t1, $v0 -.L80242CEC: -/* 16354C 80242CEC 08090B3E */ j .L80242CF8 -/* 163550 80242CF0 00023400 */ sll $a2, $v0, 0x10 -.L80242CF4: -/* 163554 80242CF4 00093400 */ sll $a2, $t1, 0x10 -.L80242CF8: -/* 163558 80242CF8 04A10016 */ bgez $a1, .L80242D54 -/* 16355C 80242CFC 3142FFFF */ andi $v0, $t2, 0xffff -/* 163560 80242D00 000C1400 */ sll $v0, $t4, 0x10 -/* 163564 80242D04 00021C03 */ sra $v1, $v0, 0x10 -/* 163568 80242D08 0461000A */ bgez $v1, .L80242D34 -/* 16356C 80242D0C 00051400 */ sll $v0, $a1, 0x10 -/* 163570 80242D10 00021403 */ sra $v0, $v0, 0x10 -/* 163574 80242D14 00430018 */ mult $v0, $v1 -/* 163578 80242D18 00006812 */ mflo $t5 -/* 16357C 80242D1C 000D11C3 */ sra $v0, $t5, 7 -/* 163580 80242D20 04420001 */ bltzl $v0, .L80242D28 -/* 163584 80242D24 0000102D */ daddu $v0, $zero, $zero -.L80242D28: -/* 163588 80242D28 01421023 */ subu $v0, $t2, $v0 -/* 16358C 80242D2C 08090B55 */ j .L80242D54 -/* 163590 80242D30 3042FFFF */ andi $v0, $v0, 0xffff -.L80242D34: -/* 163594 80242D34 00021403 */ sra $v0, $v0, 0x10 -/* 163598 80242D38 00430018 */ mult $v0, $v1 -/* 16359C 80242D3C 00006812 */ mflo $t5 -/* 1635A0 80242D40 000D11C3 */ sra $v0, $t5, 7 -/* 1635A4 80242D44 5C400001 */ bgtzl $v0, .L80242D4C -/* 1635A8 80242D48 0000102D */ daddu $v0, $zero, $zero -.L80242D4C: -/* 1635AC 80242D4C 01421023 */ subu $v0, $t2, $v0 -/* 1635B0 80242D50 3042FFFF */ andi $v0, $v0, 0xffff -.L80242D54: -/* 1635B4 80242D54 00C21025 */ or $v0, $a2, $v0 -/* 1635B8 80242D58 AC820000 */ sw $v0, ($a0) -/* 1635BC 80242D5C 3C03800A */ lui $v1, 0x800a -/* 1635C0 80242D60 2463A66C */ addiu $v1, $v1, -0x5994 -/* 1635C4 80242D64 8C620000 */ lw $v0, ($v1) -/* 1635C8 80242D68 0040202D */ daddu $a0, $v0, $zero -/* 1635CC 80242D6C 24420008 */ addiu $v0, $v0, 8 -/* 1635D0 80242D70 AC620000 */ sw $v0, ($v1) -/* 1635D4 80242D74 3C02F100 */ lui $v0, 0xf100 -/* 1635D8 80242D78 AC820000 */ sw $v0, ($a0) -/* 1635DC 80242D7C 000B1400 */ sll $v0, $t3, 0x10 -/* 1635E0 80242D80 3183FFFF */ andi $v1, $t4, 0xffff -/* 1635E4 80242D84 00431025 */ or $v0, $v0, $v1 -/* 1635E8 80242D88 AC820004 */ sw $v0, 4($a0) -.L80242D8C: -/* 1635EC 80242D8C 03E00008 */ jr $ra -/* 1635F0 80242D90 00000000 */ nop diff --git a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s b/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s deleted file mode 100644 index c1209db8fe..0000000000 --- a/asm/nonmatchings/os/nusys/nuContPakMgr/contRmbControl.s +++ /dev/null @@ -1,141 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contRmbControl -/* 3AD20 8005F920 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3AD24 8005F924 AFB20018 */ sw $s2, 0x18($sp) -/* 3AD28 8005F928 0080902D */ daddu $s2, $a0, $zero -/* 3AD2C 8005F92C 00A0302D */ daddu $a2, $a1, $zero -/* 3AD30 8005F930 AFB00010 */ sw $s0, 0x10($sp) -/* 3AD34 8005F934 AFBF0020 */ sw $ra, 0x20($sp) -/* 3AD38 8005F938 AFB3001C */ sw $s3, 0x1c($sp) -/* 3AD3C 8005F93C AFB10014 */ sw $s1, 0x14($sp) -/* 3AD40 8005F940 92430006 */ lbu $v1, 6($s2) -/* 3AD44 8005F944 24130002 */ addiu $s3, $zero, 2 -/* 3AD48 8005F948 10730069 */ beq $v1, $s3, .L8005FAF0 -/* 3AD4C 8005F94C 0000802D */ daddu $s0, $zero, $zero -/* 3AD50 8005F950 28620003 */ slti $v0, $v1, 3 -/* 3AD54 8005F954 10400005 */ beqz $v0, .L8005F96C -/* 3AD58 8005F958 24020001 */ addiu $v0, $zero, 1 -/* 3AD5C 8005F95C 1062000A */ beq $v1, $v0, .L8005F988 -/* 3AD60 8005F960 0200102D */ daddu $v0, $s0, $zero -/* 3AD64 8005F964 08017EBD */ j .L8005FAF4 -/* 3AD68 8005F968 00000000 */ nop -.L8005F96C: -/* 3AD6C 8005F96C 24020003 */ addiu $v0, $zero, 3 -/* 3AD70 8005F970 10620018 */ beq $v1, $v0, .L8005F9D4 -/* 3AD74 8005F974 24020004 */ addiu $v0, $zero, 4 -/* 3AD78 8005F978 10620048 */ beq $v1, $v0, .L8005FA9C -/* 3AD7C 8005F97C 0200102D */ daddu $v0, $s0, $zero -/* 3AD80 8005F980 08017EBD */ j .L8005FAF4 -/* 3AD84 8005F984 00000000 */ nop -.L8005F988: -/* 3AD88 8005F988 96420004 */ lhu $v0, 4($s2) -/* 3AD8C 8005F98C 1040000C */ beqz $v0, .L8005F9C0 -/* 3AD90 8005F990 00062040 */ sll $a0, $a2, 1 -/* 3AD94 8005F994 00862021 */ addu $a0, $a0, $a2 -/* 3AD98 8005F998 00042080 */ sll $a0, $a0, 2 -/* 3AD9C 8005F99C 00862021 */ addu $a0, $a0, $a2 -/* 3ADA0 8005F9A0 000420C0 */ sll $a0, $a0, 3 -/* 3ADA4 8005F9A4 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3ADA8 8005F9A8 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3ADAC 8005F9AC 00822021 */ addu $a0, $a0, $v0 -/* 3ADB0 8005F9B0 0C019F80 */ jal __osMotorAccess -/* 3ADB4 8005F9B4 0000282D */ daddu $a1, $zero, $zero -/* 3ADB8 8005F9B8 08017E71 */ j .L8005F9C4 -/* 3ADBC 8005F9BC 0040802D */ daddu $s0, $v0, $zero -.L8005F9C0: -/* 3ADC0 8005F9C0 A2530006 */ sb $s3, 6($s2) -.L8005F9C4: -/* 3ADC4 8005F9C4 96420004 */ lhu $v0, 4($s2) -/* 3ADC8 8005F9C8 2442FFFF */ addiu $v0, $v0, -1 -/* 3ADCC 8005F9CC 08017EBC */ j .L8005FAF0 -/* 3ADD0 8005F9D0 A6420004 */ sh $v0, 4($s2) -.L8005F9D4: -/* 3ADD4 8005F9D4 96420002 */ lhu $v0, 2($s2) -/* 3ADD8 8005F9D8 1040001F */ beqz $v0, .L8005FA58 -/* 3ADDC 8005F9DC 00062040 */ sll $a0, $a2, 1 -/* 3ADE0 8005F9E0 96420004 */ lhu $v0, 4($s2) -/* 3ADE4 8005F9E4 96430000 */ lhu $v1, ($s2) -/* 3ADE8 8005F9E8 00431021 */ addu $v0, $v0, $v1 -/* 3ADEC 8005F9EC 304300FF */ andi $v1, $v0, 0xff -/* 3ADF0 8005F9F0 3042FFFF */ andi $v0, $v0, 0xffff -/* 3ADF4 8005F9F4 00021202 */ srl $v0, $v0, 8 -/* 3ADF8 8005F9F8 1040000B */ beqz $v0, .L8005FA28 -/* 3ADFC 8005F9FC A6430004 */ sh $v1, 4($s2) -/* 3AE00 8005FA00 00062040 */ sll $a0, $a2, 1 -/* 3AE04 8005FA04 00862021 */ addu $a0, $a0, $a2 -/* 3AE08 8005FA08 00042080 */ sll $a0, $a0, 2 -/* 3AE0C 8005FA0C 00862021 */ addu $a0, $a0, $a2 -/* 3AE10 8005FA10 000420C0 */ sll $a0, $a0, 3 -/* 3AE14 8005FA14 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE18 8005FA18 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE1C 8005FA1C 00822021 */ addu $a0, $a0, $v0 -/* 3AE20 8005FA20 08017E92 */ j .L8005FA48 -/* 3AE24 8005FA24 24050001 */ addiu $a1, $zero, 1 -.L8005FA28: -/* 3AE28 8005FA28 00862021 */ addu $a0, $a0, $a2 -/* 3AE2C 8005FA2C 00042080 */ sll $a0, $a0, 2 -/* 3AE30 8005FA30 00862021 */ addu $a0, $a0, $a2 -/* 3AE34 8005FA34 000420C0 */ sll $a0, $a0, 3 -/* 3AE38 8005FA38 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE3C 8005FA3C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE40 8005FA40 00822021 */ addu $a0, $a0, $v0 -/* 3AE44 8005FA44 0000282D */ daddu $a1, $zero, $zero -.L8005FA48: -/* 3AE48 8005FA48 0C019F80 */ jal __osMotorAccess -/* 3AE4C 8005FA4C 00000000 */ nop -/* 3AE50 8005FA50 08017EA3 */ j .L8005FA8C -/* 3AE54 8005FA54 0040802D */ daddu $s0, $v0, $zero -.L8005FA58: -/* 3AE58 8005FA58 00862021 */ addu $a0, $a0, $a2 -/* 3AE5C 8005FA5C 00042080 */ sll $a0, $a0, 2 -/* 3AE60 8005FA60 00862021 */ addu $a0, $a0, $a2 -/* 3AE64 8005FA64 000420C0 */ sll $a0, $a0, 3 -/* 3AE68 8005FA68 3C02800E */ lui $v0, %hi(nuContPfs) -/* 3AE6C 8005FA6C 2442AAD8 */ addiu $v0, $v0, %lo(nuContPfs) -/* 3AE70 8005FA70 00822021 */ addu $a0, $a0, $v0 -/* 3AE74 8005FA74 0C019F80 */ jal __osMotorAccess -/* 3AE78 8005FA78 0000282D */ daddu $a1, $zero, $zero -/* 3AE7C 8005FA7C 0040802D */ daddu $s0, $v0, $zero -/* 3AE80 8005FA80 24020001 */ addiu $v0, $zero, 1 -/* 3AE84 8005FA84 A2420006 */ sb $v0, 6($s2) -/* 3AE88 8005FA88 A6530004 */ sh $s3, 4($s2) -.L8005FA8C: -/* 3AE8C 8005FA8C 96420002 */ lhu $v0, 2($s2) -/* 3AE90 8005FA90 2442FFFF */ addiu $v0, $v0, -1 -/* 3AE94 8005FA94 08017EBC */ j .L8005FAF0 -/* 3AE98 8005FA98 A6420002 */ sh $v0, 2($s2) -.L8005FA9C: -/* 3AE9C 8005FA9C 3C04800E */ lui $a0, %hi(nuSiMesgQ) -/* 3AEA0 8005FAA0 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) -/* 3AEA4 8005FAA4 00061040 */ sll $v0, $a2, 1 -/* 3AEA8 8005FAA8 00461021 */ addu $v0, $v0, $a2 -/* 3AEAC 8005FAAC 00021080 */ sll $v0, $v0, 2 -/* 3AEB0 8005FAB0 00461021 */ addu $v0, $v0, $a2 -/* 3AEB4 8005FAB4 000210C0 */ sll $v0, $v0, 3 -/* 3AEB8 8005FAB8 3C03800E */ lui $v1, %hi(nuContPfs) -/* 3AEBC 8005FABC 2463AAD8 */ addiu $v1, $v1, %lo(nuContPfs) -/* 3AEC0 8005FAC0 00438821 */ addu $s1, $v0, $v1 -/* 3AEC4 8005FAC4 0C019FD1 */ jal osMotorInit -/* 3AEC8 8005FAC8 0220282D */ daddu $a1, $s1, $zero -/* 3AECC 8005FACC 0040802D */ daddu $s0, $v0, $zero -/* 3AED0 8005FAD0 16000005 */ bnez $s0, .L8005FAE8 -/* 3AED4 8005FAD4 24020001 */ addiu $v0, $zero, 1 -/* 3AED8 8005FAD8 0220202D */ daddu $a0, $s1, $zero -/* 3AEDC 8005FADC 0C019F80 */ jal __osMotorAccess -/* 3AEE0 8005FAE0 0000282D */ daddu $a1, $zero, $zero -/* 3AEE4 8005FAE4 24020001 */ addiu $v0, $zero, 1 -.L8005FAE8: -/* 3AEE8 8005FAE8 A2420006 */ sb $v0, 6($s2) -/* 3AEEC 8005FAEC A6530004 */ sh $s3, 4($s2) -.L8005FAF0: -/* 3AEF0 8005FAF0 0200102D */ daddu $v0, $s0, $zero -.L8005FAF4: -/* 3AEF4 8005FAF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 3AEF8 8005FAF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 3AEFC 8005FAFC 8FB20018 */ lw $s2, 0x18($sp) -/* 3AF00 8005FB00 8FB10014 */ lw $s1, 0x14($sp) -/* 3AF04 8005FB04 8FB00010 */ lw $s0, 0x10($sp) -/* 3AF08 8005FB08 03E00008 */ jr $ra -/* 3AF0C 8005FB0C 27BD0028 */ addiu $sp, $sp, 0x28 From a285afc7563c97145b4980d54daee6dde69baf56 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 15 Oct 2020 00:43:07 -0400 Subject: [PATCH 09/10] Use all symbols in symbol_addrs.txt --- .../code_1000_len_60/entry_point.s | 4 +- .../code_109660_len_1270/func_802E8F94.s | 4 +- .../code_135EE0/pause_badges_count_all.s | 4 +- .../code_135EE0/pause_badges_count_equipped.s | 4 +- asm/nonmatchings/code_135EE0/pause_init.s | 4 +- .../code_1370_len_7d0/boot_main.s | 8 +- .../code_13870_len_6980/_create_npc.s | 8 +- .../code_13870_len_6980/render_npcs.s | 8 +- .../code_13CAF0/pause_items_load_items.s | 4 +- asm/nonmatchings/code_163400/func_80244030.s | 4 +- asm/nonmatchings/code_163400/func_802448E0.s | 12 +- asm/nonmatchings/code_163400/func_80244B00.s | 4 +- asm/nonmatchings/code_165490/func_80245A40.s | 16 +-- asm/nonmatchings/code_168590/func_80248024.s | 8 +- asm/nonmatchings/code_16F740/begin_battle.s | 12 +- asm/nonmatchings/code_16F740/func_80242FE0.s | 4 +- asm/nonmatchings/code_16F740/func_80244008.s | 4 +- asm/nonmatchings/code_16F740/func_80244E38.s | 4 +- asm/nonmatchings/code_16F740/func_80245440.s | 8 +- asm/nonmatchings/code_16F740/func_80247B04.s | 4 +- .../code_16F740/update_heroes_start_turn.s | 12 +- .../code_16F740/update_player_action.s | 12 +- .../code_16F740/update_player_change_turn.s | 4 +- .../code_16F740/update_run_away.s | 8 +- .../code_16F740/update_swap_partner.s | 8 +- .../code_17D6A0/show_battle_message.s | 4 +- .../show_variable_battle_message.s | 4 +- .../code_17FEB0/calc_item_damage_enemy.s | 28 ++-- asm/nonmatchings/code_18C790/func_8025E190.s | 4 +- .../code_197F40/calc_player_damage_enemy.s | 28 ++-- .../code_197F40/dispatch_event_player.s | 4 +- .../dispatch_event_player_continue_turn.s | 4 +- .../code_1A5830/calc_enemy_damage_target.s | 28 ++-- .../code_1AC760/calc_partner_damage_enemy.s | 28 ++-- .../code_25f00_len_940/func_8004AB00.s | 4 +- .../code_25f00_len_940/func_8004AE08.s | 117 ----------------- .../code_25f00_len_940/nuAuDmaCallBack.s | 121 ++++++++++++++++++ .../code_25f00_len_940/nuAuDmaNew.s | 4 +- asm/nonmatchings/code_316d90/func_802AE000.s | 4 +- .../code_7340_len_b00/crash_create_monitor.s | 4 +- .../code_759b0_len_61b0/render_player_model.s | 8 +- asm/nonmatchings/code_7e0e80/MakeShop.s | 4 +- .../code_8230_len_1ae0/func_8002D160.s | 8 +- .../code_8230_len_1ae0/nuSiMgrInit.s | 4 +- .../code_8a860_len_3f30/func_800F1A10.s | 32 ++--- asm/nonmatchings/code_ED510/EnableGroup.s | 4 +- asm/nonmatchings/code_ED510/RotateGroup.s | 4 +- asm/nonmatchings/code_ED510/ScaleGroup.s | 4 +- asm/nonmatchings/code_ED510/TranslateGroup.s | 4 +- .../code_a5dd0_len_114e0/_set_game_mode.s | 20 +-- .../code_a5dd0_len_114e0/func_80112BBC.s | 20 +-- .../code_a5dd0_len_114e0/func_80112D84.s | 4 +- .../code_a5dd0_len_114e0/render_models.s | 8 +- .../bind_dynamic_entity_3.s | 8 +- .../bind_dynamic_entity_7.s | 8 +- .../bind_dynamic_entity_B.s | 8 +- .../clear_item_entity_data.s | 4 +- .../code_b72b0_len_15ed0/draw_item_entities.s | 4 +- .../code_dbd70_len_700/create_trigger.s | 4 +- .../code_e92d0_len_5da0/si_handle_bind_lock.s | 4 +- .../code_ebd0_len_6a0/step_battle.s | 4 +- .../code_ef070_len_3400/exec_ShakeCam1.s | 4 +- .../code_ef070_len_3400/exec_ShakeCamX.s | 4 +- .../code_ef070_len_3400/func_802CD4B4.s | 4 +- .../os/code_39cb0_len_100/boot_idle.s | 4 +- .../os/code_39cb0_len_100/nuBoot.s | 4 +- .../os/code_3b4a0_len_270/nuGfxThreadStart.s | 4 +- .../os/code_3bde0_len_3e0/osCreatePiManager.s | 12 +- .../os/code_3fa50_len_f60/sprintf.s | 4 +- .../os/code_41e70_len_340/osCreateViManager.s | 4 +- .../os/code_7e40_len_3f0/nuGfxTaskMgrInit.s | 4 +- src/code_25f00_len_940.c | 2 + tools/symbol_addrs.txt | 2 +- undefined_syms.txt | 28 ++++ 74 files changed, 420 insertions(+), 386 deletions(-) create mode 100644 asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s diff --git a/asm/nonmatchings/code_1000_len_60/entry_point.s b/asm/nonmatchings/code_1000_len_60/entry_point.s index bb2aea4940..047147a0d0 100644 --- a/asm/nonmatchings/code_1000_len_60/entry_point.s +++ b/asm/nonmatchings/code_1000_len_60/entry_point.s @@ -15,8 +15,8 @@ glabel entry_point /* 1024 80025C24 00000000 */ nop /* 1028 80025C28 3C1D800B */ lui $sp, 0x800b /* 102C 80025C2C 27BD6590 */ addiu $sp, $sp, 0x6590 -/* 1030 80025C30 3C0A8006 */ lui $t2, 0x8006 -/* 1034 80025C34 254AE8B0 */ addiu $t2, $t2, -0x1750 +/* 1030 80025C30 3C0A8006 */ lui $t2, %hi(nuBoot) +/* 1034 80025C34 254AE8B0 */ addiu $t2, $t2, %lo(nuBoot) /* 1038 80025C38 01400008 */ jr $t2 /* 103C 80025C3C 00000000 */ nop /* 1040 80025C40 00000000 */ nop diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s b/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s index 1762b44148..ef4b7a566a 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E8F94.s @@ -13,8 +13,8 @@ glabel func_802E8F94 /* 10A834 802E8FB4 8C430000 */ lw $v1, ($v0) /* 10A838 802E8FB8 8C440004 */ lw $a0, 4($v0) /* 10A83C 802E8FBC 8C450008 */ lw $a1, 8($v0) -/* 10A840 802E8FC0 3C02802F */ lui $v0, 0x802f -/* 10A844 802E8FC4 24428E4C */ addiu $v0, $v0, -0x71b4 +/* 10A840 802E8FC0 3C02802F */ lui $v0, %hi(push_entity_matrix) +/* 10A844 802E8FC4 24428E4C */ addiu $v0, $v0, %lo(push_entity_matrix) /* 10A848 802E8FC8 8E300040 */ lw $s0, 0x40($s1) /* 10A84C 802E8FCC 2632004C */ addiu $s2, $s1, 0x4c /* 10A850 802E8FD0 AE22003C */ sw $v0, 0x3c($s1) diff --git a/asm/nonmatchings/code_135EE0/pause_badges_count_all.s b/asm/nonmatchings/code_135EE0/pause_badges_count_all.s index f4e96fdf13..1cfabf6433 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_count_all.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_count_all.s @@ -7,8 +7,8 @@ glabel pause_badges_count_all /* 13A39C 8024705C 3C108011 */ lui $s0, %hi(gPlayerData) /* 13A3A0 80247060 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) /* 13A3A4 80247064 260400B4 */ addiu $a0, $s0, 0xb4 -/* 13A3A8 80247068 3C068024 */ lui $a2, 0x8024 -/* 13A3AC 8024706C 24C66FE0 */ addiu $a2, $a2, 0x6fe0 +/* 13A3A8 80247068 3C068024 */ lui $a2, %hi(pause_badges_comparator) +/* 13A3AC 8024706C 24C66FE0 */ addiu $a2, $a2, %lo(pause_badges_comparator) /* 13A3B0 80247070 AFBF0014 */ sw $ra, 0x14($sp) /* 13A3B4 80247074 0C091293 */ jal pause_sort_item_list /* 13A3B8 80247078 24050080 */ addiu $a1, $zero, 0x80 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_count_equipped.s b/asm/nonmatchings/code_135EE0/pause_badges_count_equipped.s index 688e913f41..64e295f392 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_count_equipped.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_count_equipped.s @@ -7,8 +7,8 @@ glabel pause_badges_count_equipped /* 13A3F8 802470B8 3C108011 */ lui $s0, %hi(gPlayerData) /* 13A3FC 802470BC 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) /* 13A400 802470C0 26040208 */ addiu $a0, $s0, 0x208 -/* 13A404 802470C4 3C068024 */ lui $a2, 0x8024 -/* 13A408 802470C8 24C66FE0 */ addiu $a2, $a2, 0x6fe0 +/* 13A404 802470C4 3C068024 */ lui $a2, %hi(pause_badges_comparator) +/* 13A408 802470C8 24C66FE0 */ addiu $a2, $a2, %lo(pause_badges_comparator) /* 13A40C 802470CC AFBF0014 */ sw $ra, 0x14($sp) /* 13A410 802470D0 0C091293 */ jal pause_sort_item_list /* 13A414 802470D4 24050040 */ addiu $a1, $zero, 0x40 diff --git a/asm/nonmatchings/code_135EE0/pause_init.s b/asm/nonmatchings/code_135EE0/pause_init.s index 27c9badbb3..d408c67985 100644 --- a/asm/nonmatchings/code_135EE0/pause_init.s +++ b/asm/nonmatchings/code_135EE0/pause_init.s @@ -7,8 +7,8 @@ glabel pause_init /* 1373A8 80244068 24841340 */ addiu $a0, $a0, 0x1340 /* 1373AC 8024406C 3C050013 */ lui $a1, 0x13 /* 1373B0 80244070 24A55EE0 */ addiu $a1, $a1, 0x5ee0 -/* 1373B4 80244074 3C068024 */ lui $a2, 0x8024 -/* 1373B8 80244078 24C6E000 */ addiu $a2, $a2, -0x2000 +/* 1373B4 80244074 3C068024 */ lui $a2, %hi(get_dpad_input_radial) +/* 1373B8 80244078 24C6E000 */ addiu $a2, $a2, %lo(get_dpad_input_radial) /* 1373BC 8024407C AFBF0028 */ sw $ra, 0x28($sp) /* 1373C0 80244080 AFB50024 */ sw $s5, 0x24($sp) /* 1373C4 80244084 AFB40020 */ sw $s4, 0x20($sp) diff --git a/asm/nonmatchings/code_1370_len_7d0/boot_main.s b/asm/nonmatchings/code_1370_len_7d0/boot_main.s index 3599e4726d..ed8fbef4ba 100644 --- a/asm/nonmatchings/code_1370_len_7d0/boot_main.s +++ b/asm/nonmatchings/code_1370_len_7d0/boot_main.s @@ -47,12 +47,12 @@ glabel boot_main /* 1408 80026008 00000000 */ nop /* 140C 8002600C 0C0AC80F */ jal func_802B203C /* 1410 80026010 00000000 */ nop -/* 1414 80026014 3C048002 */ lui $a0, 0x8002 -/* 1418 80026018 2484605C */ addiu $a0, $a0, 0x605c +/* 1414 80026014 3C048002 */ lui $a0, %hi(gfxRetrace_Callback) +/* 1418 80026018 2484605C */ addiu $a0, $a0, %lo(gfxRetrace_Callback) /* 141C 8002601C 0C017C94 */ jal nuGfxFuncSet /* 1420 80026020 00000000 */ nop -/* 1424 80026024 3C048002 */ lui $a0, 0x8002 -/* 1428 80026028 2484670C */ addiu $a0, $a0, 0x670c +/* 1424 80026024 3C048002 */ lui $a0, %hi(gfxPreNMI_Callback) +/* 1428 80026028 2484670C */ addiu $a0, $a0, %lo(gfxPreNMI_Callback) /* 142C 8002602C 0C017CA4 */ jal nuGfxPreNMIFuncSet /* 1430 80026030 00000000 */ nop /* 1434 80026034 0C019680 */ jal osGetCount diff --git a/asm/nonmatchings/code_13870_len_6980/_create_npc.s b/asm/nonmatchings/code_13870_len_6980/_create_npc.s index d88a7e54a5..049bf5e712 100644 --- a/asm/nonmatchings/code_13870_len_6980/_create_npc.s +++ b/asm/nonmatchings/code_13870_len_6980/_create_npc.s @@ -127,15 +127,15 @@ glabel _create_npc /* 13B60 80038760 8E420008 */ lw $v0, 8($s2) /* 13B64 80038764 14400004 */ bnez $v0, .L80038778 /* 13B68 80038768 AE020004 */ sw $v0, 4($s0) -/* 13B6C 8003876C 3C028004 */ lui $v0, 0x8004 -/* 13B70 80038770 24428470 */ addiu $v0, $v0, -0x7b90 +/* 13B6C 8003876C 3C028004 */ lui $v0, %hi(NOP_npc_callback) +/* 13B70 80038770 24428470 */ addiu $v0, $v0, %lo(NOP_npc_callback) /* 13B74 80038774 AE020004 */ sw $v0, 4($s0) .L80038778: /* 13B78 80038778 8E42000C */ lw $v0, 0xc($s2) /* 13B7C 8003877C 14400004 */ bnez $v0, .L80038790 /* 13B80 80038780 AE020008 */ sw $v0, 8($s0) -/* 13B84 80038784 3C028004 */ lui $v0, 0x8004 -/* 13B88 80038788 24428470 */ addiu $v0, $v0, -0x7b90 +/* 13B84 80038784 3C028004 */ lui $v0, %hi(NOP_npc_callback) +/* 13B88 80038788 24428470 */ addiu $v0, $v0, %lo(NOP_npc_callback) /* 13B8C 8003878C AE020008 */ sw $v0, 8($s0) .L80038790: /* 13B90 80038790 16800015 */ bnez $s4, .L800387E8 diff --git a/asm/nonmatchings/code_13870_len_6980/render_npcs.s b/asm/nonmatchings/code_13870_len_6980/render_npcs.s index 37e87e77b9..f27bc279c0 100644 --- a/asm/nonmatchings/code_13870_len_6980/render_npcs.s +++ b/asm/nonmatchings/code_13870_len_6980/render_npcs.s @@ -102,8 +102,8 @@ glabel render_npcs /* 15D64 8003A964 4600A007 */ neg.s $f0, $f20 /* 15D68 8003A968 4600018D */ trunc.w.s $f6, $f0 /* 15D6C 8003A96C E6260004 */ swc1 $f6, 4($s1) -/* 15D70 8003A970 3C028004 */ lui $v0, 0x8004 -/* 15D74 8003A974 24429FD0 */ addiu $v0, $v0, -0x6030 +/* 15D70 8003A970 3C028004 */ lui $v0, %hi(appendGfx_npc) +/* 15D74 8003A974 24429FD0 */ addiu $v0, $v0, %lo(appendGfx_npc) /* 15D78 8003A978 AE300008 */ sw $s0, 8($s1) /* 15D7C 8003A97C AE22000C */ sw $v0, 0xc($s1) /* 15D80 8003A980 820200AA */ lb $v0, 0xaa($s0) @@ -139,8 +139,8 @@ glabel render_npcs /* 15DEC 8003A9EC 4600018D */ trunc.w.s $f6, $f0 /* 15DF0 8003A9F0 E6260004 */ swc1 $f6, 4($s1) /* 15DF4 8003A9F4 0220202D */ daddu $a0, $s1, $zero -/* 15DF8 8003A9F8 3C028004 */ lui $v0, 0x8004 -/* 15DFC 8003A9FC 2442AE38 */ addiu $v0, $v0, -0x51c8 +/* 15DF8 8003A9F8 3C028004 */ lui $v0, %hi(appedGfx_npc_blur) +/* 15DFC 8003A9FC 2442AE38 */ addiu $v0, $v0, %lo(appedGfx_npc_blur) /* 15E00 8003AA00 AE22000C */ sw $v0, 0xc($s1) /* 15E04 8003AA04 24020011 */ addiu $v0, $zero, 0x11 /* 15E08 8003AA08 AE300008 */ sw $s0, 8($s1) diff --git a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s index ff4019eb65..e89c3d6663 100644 --- a/asm/nonmatchings/code_13CAF0/pause_items_load_items.s +++ b/asm/nonmatchings/code_13CAF0/pause_items_load_items.s @@ -57,8 +57,8 @@ glabel pause_items_load_items .L8024A594: /* 13D8D4 8024A594 3C048027 */ lui $a0, 0x8027 /* 13D8D8 8024A598 24840400 */ addiu $a0, $a0, 0x400 -/* 13D8DC 8024A59C 3C068025 */ lui $a2, 0x8025 -/* 13D8E0 8024A5A0 24C697B0 */ addiu $a2, $a2, -0x6850 +/* 13D8DC 8024A59C 3C068025 */ lui $a2, %hi(pause_items_comparator) +/* 13D8E0 8024A5A0 24C697B0 */ addiu $a2, $a2, %lo(pause_items_comparator) /* 13D8E4 8024A5A4 0C091293 */ jal pause_sort_item_list /* 13D8E8 8024A5A8 0200282D */ daddu $a1, $s0, $zero .L8024A5AC: diff --git a/asm/nonmatchings/code_163400/func_80244030.s b/asm/nonmatchings/code_163400/func_80244030.s index 75a562a18f..e187e47cbe 100644 --- a/asm/nonmatchings/code_163400/func_80244030.s +++ b/asm/nonmatchings/code_163400/func_80244030.s @@ -17,8 +17,8 @@ glabel func_80244030 /* 1648C0 80244060 50400001 */ beql $v0, $zero, .L80244068 /* 1648C4 80244064 240500FF */ addiu $a1, $zero, 0xff .L80244068: -/* 1648C8 80244068 3C108025 */ lui $s0, 0x8025 -/* 1648CC 8024406C 2610C0A0 */ addiu $s0, $s0, -0x3f60 +/* 1648C8 80244068 3C108025 */ lui $s0, %hi(pause_partners_draw_movelist_flower) +/* 1648CC 8024406C 2610C0A0 */ addiu $s0, $s0, %lo(pause_partners_draw_movelist_flower) /* 1648D0 80244070 0C0513AC */ jal icon_set_opacity /* 1648D4 80244074 8E040000 */ lw $a0, ($s0) /* 1648D8 80244078 8E040000 */ lw $a0, ($s0) diff --git a/asm/nonmatchings/code_163400/func_802448E0.s b/asm/nonmatchings/code_163400/func_802448E0.s index 50b75ab3fc..dd04400f8d 100644 --- a/asm/nonmatchings/code_163400/func_802448E0.s +++ b/asm/nonmatchings/code_163400/func_802448E0.s @@ -9,8 +9,8 @@ glabel func_802448E0 /* 165150 802448F0 24841340 */ addiu $a0, $a0, 0x1340 /* 165154 802448F4 3C050013 */ lui $a1, 0x13 /* 165158 802448F8 24A55EE0 */ addiu $a1, $a1, 0x5ee0 -/* 16515C 802448FC 3C068024 */ lui $a2, 0x8024 -/* 165160 80244900 24C6E000 */ addiu $a2, $a2, -0x2000 +/* 16515C 802448FC 3C068024 */ lui $a2, %hi(get_dpad_input_radial) +/* 165160 80244900 24C6E000 */ addiu $a2, $a2, %lo(get_dpad_input_radial) /* 165164 80244904 AFBF0028 */ sw $ra, 0x28($sp) /* 165168 80244908 AFB50024 */ sw $s5, 0x24($sp) /* 16516C 8024490C AFB3001C */ sw $s3, 0x1c($sp) @@ -19,8 +19,8 @@ glabel func_802448E0 /* 165178 80244918 0C00A5CF */ jal dma_copy /* 16517C 8024491C AFB00010 */ sw $s0, 0x10($sp) /* 165180 80244920 0000802D */ daddu $s0, $zero, $zero -/* 165184 80244924 3C128025 */ lui $s2, 0x8025 -/* 165188 80244928 2652C0A0 */ addiu $s2, $s2, -0x3f60 +/* 165184 80244924 3C128025 */ lui $s2, %hi(pause_partners_draw_movelist_flower) +/* 165188 80244928 2652C0A0 */ addiu $s2, $s2, %lo(pause_partners_draw_movelist_flower) /* 16518C 8024492C 3C118025 */ lui $s1, 0x8025 /* 165190 80244930 26319B80 */ addiu $s1, $s1, -0x6480 .L80244934: @@ -35,8 +35,8 @@ glabel func_802448E0 /* 1651B4 80244954 AE440000 */ sw $a0, ($s2) /* 1651B8 80244958 1A00FFF6 */ blez $s0, .L80244934 /* 1651BC 8024495C 26520004 */ addiu $s2, $s2, 4 -/* 1651C0 80244960 3C028025 */ lui $v0, 0x8025 -/* 1651C4 80244964 8C42C0A0 */ lw $v0, -0x3f60($v0) +/* 1651C0 80244960 3C028025 */ lui $v0, %hi(pause_partners_draw_movelist_flower) +/* 1651C4 80244964 8C42C0A0 */ lw $v0, %lo(pause_partners_draw_movelist_flower)($v0) /* 1651C8 80244968 3C018025 */ lui $at, 0x8025 /* 1651CC 8024496C AC22C088 */ sw $v0, -0x3f78($at) /* 1651D0 80244970 16800004 */ bnez $s4, .L80244984 diff --git a/asm/nonmatchings/code_163400/func_80244B00.s b/asm/nonmatchings/code_163400/func_80244B00.s index 1fc21657a5..db4ea721f6 100644 --- a/asm/nonmatchings/code_163400/func_80244B00.s +++ b/asm/nonmatchings/code_163400/func_80244B00.s @@ -6,8 +6,8 @@ glabel func_80244B00 /* 165364 80244B04 AFB00010 */ sw $s0, 0x10($sp) /* 165368 80244B08 0000802D */ daddu $s0, $zero, $zero /* 16536C 80244B0C AFB10014 */ sw $s1, 0x14($sp) -/* 165370 80244B10 3C118025 */ lui $s1, 0x8025 -/* 165374 80244B14 2631C0A0 */ addiu $s1, $s1, -0x3f60 +/* 165370 80244B10 3C118025 */ lui $s1, %hi(pause_partners_draw_movelist_flower) +/* 165374 80244B14 2631C0A0 */ addiu $s1, $s1, %lo(pause_partners_draw_movelist_flower) /* 165378 80244B18 AFBF0018 */ sw $ra, 0x18($sp) .L80244B1C: /* 16537C 80244B1C 8E240000 */ lw $a0, ($s1) diff --git a/asm/nonmatchings/code_165490/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s index 2969ec0089..99f6f96480 100644 --- a/asm/nonmatchings/code_165490/func_80245A40.s +++ b/asm/nonmatchings/code_165490/func_80245A40.s @@ -534,8 +534,8 @@ glabel func_80245A40 /* 166A7C 8024621C 0C051F9F */ jal func_80147E7C /* 166A80 80246220 24040034 */ addiu $a0, $zero, 0x34 /* 166A84 80246224 24040035 */ addiu $a0, $zero, 0x35 -/* 166A88 80246228 3C108024 */ lui $s0, 0x8024 -/* 166A8C 8024622C 261034DC */ addiu $s0, $s0, 0x34dc +/* 166A88 80246228 3C108024 */ lui $s0, %hi(pause_update_cursor) +/* 166A8C 8024622C 261034DC */ addiu $s0, $s0, %lo(pause_update_cursor) /* 166A90 80246230 0C051F9F */ jal func_80147E7C /* 166A94 80246234 0200282D */ daddu $a1, $s0, $zero /* 166A98 80246238 24040037 */ addiu $a0, $zero, 0x37 @@ -637,8 +637,8 @@ glabel func_80245A40 /* 166C04 802463A4 0C051F9F */ jal func_80147E7C /* 166C08 802463A8 24040034 */ addiu $a0, $zero, 0x34 /* 166C0C 802463AC 24040035 */ addiu $a0, $zero, 0x35 -/* 166C10 802463B0 3C108024 */ lui $s0, 0x8024 -/* 166C14 802463B4 261034DC */ addiu $s0, $s0, 0x34dc +/* 166C10 802463B0 3C108024 */ lui $s0, %hi(pause_update_cursor) +/* 166C14 802463B4 261034DC */ addiu $s0, $s0, %lo(pause_update_cursor) /* 166C18 802463B8 0C051F9F */ jal func_80147E7C /* 166C1C 802463BC 0200282D */ daddu $a1, $s0, $zero /* 166C20 802463C0 24040037 */ addiu $a0, $zero, 0x37 @@ -1080,8 +1080,8 @@ glabel func_80245A40 /* 167290 80246A30 0C051F9F */ jal func_80147E7C /* 167294 80246A34 24040034 */ addiu $a0, $zero, 0x34 /* 167298 80246A38 24040035 */ addiu $a0, $zero, 0x35 -/* 16729C 80246A3C 3C108024 */ lui $s0, 0x8024 -/* 1672A0 80246A40 261034DC */ addiu $s0, $s0, 0x34dc +/* 16729C 80246A3C 3C108024 */ lui $s0, %hi(pause_update_cursor) +/* 1672A0 80246A40 261034DC */ addiu $s0, $s0, %lo(pause_update_cursor) /* 1672A4 80246A44 0C051F9F */ jal func_80147E7C /* 1672A8 80246A48 0200282D */ daddu $a1, $s0, $zero /* 1672AC 80246A4C 24040037 */ addiu $a0, $zero, 0x37 @@ -1103,8 +1103,8 @@ glabel func_80245A40 /* 1672EC 80246A8C 0C051F9F */ jal func_80147E7C /* 1672F0 80246A90 24040034 */ addiu $a0, $zero, 0x34 /* 1672F4 80246A94 24040035 */ addiu $a0, $zero, 0x35 -/* 1672F8 80246A98 3C108024 */ lui $s0, 0x8024 -/* 1672FC 80246A9C 261034DC */ addiu $s0, $s0, 0x34dc +/* 1672F8 80246A98 3C108024 */ lui $s0, %hi(pause_update_cursor) +/* 1672FC 80246A9C 261034DC */ addiu $s0, $s0, %lo(pause_update_cursor) /* 167300 80246AA0 0C051F9F */ jal func_80147E7C /* 167304 80246AA4 0200282D */ daddu $a1, $s0, $zero /* 167308 80246AA8 24040037 */ addiu $a0, $zero, 0x37 diff --git a/asm/nonmatchings/code_168590/func_80248024.s b/asm/nonmatchings/code_168590/func_80248024.s index 575e9fc72b..a6925ffa9e 100644 --- a/asm/nonmatchings/code_168590/func_80248024.s +++ b/asm/nonmatchings/code_168590/func_80248024.s @@ -41,8 +41,8 @@ glabel func_80248024 /* 16890C 802480AC 0C051F9F */ jal func_80147E7C /* 168910 802480B0 24040034 */ addiu $a0, $zero, 0x34 /* 168914 802480B4 24040035 */ addiu $a0, $zero, 0x35 -/* 168918 802480B8 3C108024 */ lui $s0, 0x8024 -/* 16891C 802480BC 261034DC */ addiu $s0, $s0, 0x34dc +/* 168918 802480B8 3C108024 */ lui $s0, %hi(pause_update_cursor) +/* 16891C 802480BC 261034DC */ addiu $s0, $s0, %lo(pause_update_cursor) /* 168920 802480C0 0C051F9F */ jal func_80147E7C /* 168924 802480C4 0200282D */ daddu $a1, $s0, $zero /* 168928 802480C8 24040037 */ addiu $a0, $zero, 0x37 @@ -62,8 +62,8 @@ glabel func_80248024 /* 16895C 802480FC 0C051F9F */ jal func_80147E7C /* 168960 80248100 24040034 */ addiu $a0, $zero, 0x34 /* 168964 80248104 24040035 */ addiu $a0, $zero, 0x35 -/* 168968 80248108 3C108024 */ lui $s0, 0x8024 -/* 16896C 8024810C 261034DC */ addiu $s0, $s0, 0x34dc +/* 168968 80248108 3C108024 */ lui $s0, %hi(pause_update_cursor) +/* 16896C 8024810C 261034DC */ addiu $s0, $s0, %lo(pause_update_cursor) /* 168970 80248110 0C051F9F */ jal func_80147E7C /* 168974 80248114 0200282D */ daddu $a1, $s0, $zero /* 168978 80248118 24040037 */ addiu $a0, $zero, 0x37 diff --git a/asm/nonmatchings/code_16F740/begin_battle.s b/asm/nonmatchings/code_16F740/begin_battle.s index 0a306b1679..c53a3a2cd7 100644 --- a/asm/nonmatchings/code_16F740/begin_battle.s +++ b/asm/nonmatchings/code_16F740/begin_battle.s @@ -485,12 +485,12 @@ glabel begin_battle /* 1701EC 8024190C 8C42C074 */ lw $v0, -0x3f8c($v0) /* 1701F0 80241910 8E9000D8 */ lw $s0, 0xd8($s4) /* 1701F4 80241914 30420040 */ andi $v0, $v0, 0x40 -/* 1701F8 80241918 3C048028 */ lui $a0, 0x8028 -/* 1701FC 8024191C 24844A40 */ addiu $a0, $a0, 0x4a40 +/* 1701F8 80241918 3C048028 */ lui $a0, %hi(MarioEnterStage) +/* 1701FC 8024191C 24844A40 */ addiu $a0, $a0, %lo(MarioEnterStage) /* 170200 80241920 10400003 */ beqz $v0, .L80241930 /* 170204 80241924 2405000A */ addiu $a1, $zero, 0xa -/* 170208 80241928 3C048028 */ lui $a0, 0x8028 -/* 17020C 8024192C 24844D04 */ addiu $a0, $a0, 0x4d04 +/* 170208 80241928 3C048028 */ lui $a0, %hi(PeachEnterStage) +/* 17020C 8024192C 24844D04 */ addiu $a0, $a0, %lo(PeachEnterStage) .L80241930: /* 170210 80241930 0C0B0CF8 */ jal start_script /* 170214 80241934 0000302D */ daddu $a2, $zero, $zero @@ -511,8 +511,8 @@ glabel begin_battle /* 17024C 8024196C 2404002D */ addiu $a0, $zero, 0x2d /* 170250 80241970 1040000C */ beqz $v0, .L802419A4 /* 170254 80241974 2405000A */ addiu $a1, $zero, 0xa -/* 170258 80241978 3C048029 */ lui $a0, 0x8029 -/* 17025C 8024197C 2484907C */ addiu $a0, $a0, -0x6f84 +/* 170258 80241978 3C048029 */ lui $a0, %hi(DoDizzyAttack) +/* 17025C 8024197C 2484907C */ addiu $a0, $a0, %lo(DoDizzyAttack) /* 170260 80241980 8E9000E0 */ lw $s0, 0xe0($s4) /* 170264 80241984 0C0B0CF8 */ jal start_script /* 170268 80241988 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_16F740/func_80242FE0.s b/asm/nonmatchings/code_16F740/func_80242FE0.s index 15b0c73169..1669faf357 100644 --- a/asm/nonmatchings/code_16F740/func_80242FE0.s +++ b/asm/nonmatchings/code_16F740/func_80242FE0.s @@ -493,8 +493,8 @@ glabel func_80242FE0 /* 171FD8 802436F8 24020002 */ addiu $v0, $zero, 2 /* 171FDC 802436FC 14620011 */ bne $v1, $v0, .L80243744 /* 171FE0 80243700 3C04F7FF */ lui $a0, 0xf7ff -/* 171FE4 80243704 3C048028 */ lui $a0, 0x8028 -/* 171FE8 80243708 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 171FE4 80243704 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 171FE8 80243708 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 171FEC 8024370C 2405000A */ addiu $a1, $zero, 0xa /* 171FF0 80243710 0000302D */ daddu $a2, $zero, $zero /* 171FF4 80243714 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/code_16F740/func_80244008.s b/asm/nonmatchings/code_16F740/func_80244008.s index 08b823bef4..0cbde5f4d2 100644 --- a/asm/nonmatchings/code_16F740/func_80244008.s +++ b/asm/nonmatchings/code_16F740/func_80244008.s @@ -348,8 +348,8 @@ glabel func_80244008 /* 172DEC 8024450C 08091150 */ j .L80244540 /* 172DF0 80244510 A2A2028A */ sb $v0, 0x28a($s5) .L80244514: -/* 172DF4 80244514 3C048028 */ lui $a0, 0x8028 -/* 172DF8 80244518 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 172DF4 80244514 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 172DF8 80244518 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 172DFC 8024451C 0000302D */ daddu $a2, $zero, $zero /* 172E00 80244520 24020016 */ addiu $v0, $zero, 0x16 /* 172E04 80244524 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_16F740/func_80244E38.s b/asm/nonmatchings/code_16F740/func_80244E38.s index d8080d7ec6..e09f22a138 100644 --- a/asm/nonmatchings/code_16F740/func_80244E38.s +++ b/asm/nonmatchings/code_16F740/func_80244E38.s @@ -20,8 +20,8 @@ glabel func_80244E38 /* 173754 80244E74 080913B8 */ j .L80244EE0 /* 173758 80244E78 00000000 */ nop .L80244E7C: -/* 17375C 80244E7C 3C048028 */ lui $a0, 0x8028 -/* 173760 80244E80 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 17375C 80244E7C 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 173760 80244E80 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 173764 80244E84 24020006 */ addiu $v0, $zero, 6 /* 173768 80244E88 2405000A */ addiu $a1, $zero, 0xa /* 17376C 80244E8C 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_16F740/func_80245440.s b/asm/nonmatchings/code_16F740/func_80245440.s index 38dc0d6475..615366fbef 100644 --- a/asm/nonmatchings/code_16F740/func_80245440.s +++ b/asm/nonmatchings/code_16F740/func_80245440.s @@ -70,8 +70,8 @@ glabel func_80245440 /* 173E14 80245534 24040019 */ addiu $a0, $zero, 0x19 /* 173E18 80245538 0C09390F */ jal cam_target_actor /* 173E1C 8024553C 0000202D */ daddu $a0, $zero, $zero -/* 173E20 80245540 3C048028 */ lui $a0, 0x8028 -/* 173E24 80245544 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 173E20 80245540 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 173E24 80245544 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 173E28 80245548 2405000A */ addiu $a1, $zero, 0xa /* 173E2C 8024554C 0000302D */ daddu $a2, $zero, $zero /* 173E30 80245550 24020004 */ addiu $v0, $zero, 4 @@ -111,8 +111,8 @@ glabel func_80245440 /* 173EB0 802455D0 24040095 */ addiu $a0, $zero, 0x95 /* 173EB4 802455D4 04400017 */ bltz $v0, .L80245634 /* 173EB8 802455D8 2405000A */ addiu $a1, $zero, 0xa -/* 173EBC 802455DC 3C048028 */ lui $a0, 0x8028 -/* 173EC0 802455E0 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 173EBC 802455DC 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 173EC0 802455E0 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 173EC4 802455E4 0000302D */ daddu $a2, $zero, $zero /* 173EC8 802455E8 24020008 */ addiu $v0, $zero, 8 /* 173ECC 802455EC 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_16F740/func_80247B04.s b/asm/nonmatchings/code_16F740/func_80247B04.s index 7bde905d03..869eea5937 100644 --- a/asm/nonmatchings/code_16F740/func_80247B04.s +++ b/asm/nonmatchings/code_16F740/func_80247B04.s @@ -192,8 +192,8 @@ glabel func_80247B04 /* 17669C 80247DBC 0000202D */ daddu $a0, $zero, $zero /* 1766A0 80247DC0 0C098F18 */ jal func_80263C60 /* 1766A4 80247DC4 00000000 */ nop -/* 1766A8 80247DC8 3C048028 */ lui $a0, 0x8028 -/* 1766AC 80247DCC 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 1766A8 80247DC8 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 1766AC 80247DCC 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 1766B0 80247DD0 2405000A */ addiu $a1, $zero, 0xa /* 1766B4 80247DD4 0000302D */ daddu $a2, $zero, $zero /* 1766B8 80247DD8 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s index ec0210943b..cfd2d12154 100644 --- a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s +++ b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s @@ -605,8 +605,8 @@ glabel update_heroes_start_turn /* 1711B4 802428D4 2403FFFF */ addiu $v1, $zero, -1 /* 1711B8 802428D8 1443000E */ bne $v0, $v1, .L80242914 /* 1711BC 802428DC 2405000A */ addiu $a1, $zero, 0xa -/* 1711C0 802428E0 3C048029 */ lui $a0, 0x8029 -/* 1711C4 802428E4 24849110 */ addiu $a0, $a0, -0x6ef0 +/* 1711C0 802428E0 3C048029 */ lui $a0, %hi(RegainAbility) +/* 1711C4 802428E4 24849110 */ addiu $a0, $a0, %lo(RegainAbility) /* 1711C8 802428E8 0C0B0CF8 */ jal start_script /* 1711CC 802428EC 0000302D */ daddu $a2, $zero, $zero /* 1711D0 802428F0 0040182D */ daddu $v1, $v0, $zero @@ -629,8 +629,8 @@ glabel update_heroes_start_turn /* 171210 80242930 2403FFFF */ addiu $v1, $zero, -1 /* 171214 80242934 1443000F */ bne $v0, $v1, .L80242974 /* 171218 80242938 2405000A */ addiu $a1, $zero, 0xa -/* 17121C 8024293C 3C048029 */ lui $a0, 0x8029 -/* 171220 80242940 24849110 */ addiu $a0, $a0, -0x6ef0 +/* 17121C 8024293C 3C048029 */ lui $a0, %hi(RegainAbility) +/* 171220 80242940 24849110 */ addiu $a0, $a0, %lo(RegainAbility) /* 171224 80242944 0C0B0CF8 */ jal start_script /* 171228 80242948 0000302D */ daddu $a2, $zero, $zero /* 17122C 8024294C 0040182D */ daddu $v1, $v0, $zero @@ -654,8 +654,8 @@ glabel update_heroes_start_turn /* 171270 80242990 2403FFFF */ addiu $v1, $zero, -1 /* 171274 80242994 14430011 */ bne $v0, $v1, .L802429DC /* 171278 80242998 2402001E */ addiu $v0, $zero, 0x1e -/* 17127C 8024299C 3C048029 */ lui $a0, 0x8029 -/* 171280 802429A0 24849110 */ addiu $a0, $a0, -0x6ef0 +/* 17127C 8024299C 3C048029 */ lui $a0, %hi(RegainAbility) +/* 171280 802429A0 24849110 */ addiu $a0, $a0, %lo(RegainAbility) /* 171284 802429A4 2405000A */ addiu $a1, $zero, 0xa /* 171288 802429A8 0C0B0CF8 */ jal start_script /* 17128C 802429AC 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_16F740/update_player_action.s b/asm/nonmatchings/code_16F740/update_player_action.s index 2e6f45b0e2..6542a0611d 100644 --- a/asm/nonmatchings/code_16F740/update_player_action.s +++ b/asm/nonmatchings/code_16F740/update_player_action.s @@ -91,8 +91,8 @@ glabel update_player_action /* 1744F4 80245C14 8290008A */ lb $s0, 0x8a($s4) /* 1744F8 80245C18 1602001C */ bne $s0, $v0, .L80245C8C /* 1744FC 80245C1C 24020003 */ addiu $v0, $zero, 3 -/* 174500 80245C20 3C048028 */ lui $a0, 0x8028 -/* 174504 80245C24 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 174500 80245C20 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 174504 80245C24 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 174508 80245C28 2405000A */ addiu $a1, $zero, 0xa /* 17450C 80245C2C 0000302D */ daddu $a2, $zero, $zero /* 174510 80245C30 24020003 */ addiu $v0, $zero, 3 @@ -225,12 +225,12 @@ glabel update_player_action /* 1746DC 80245DFC AE020000 */ sw $v0, ($s0) /* 1746E0 80245E00 8E020004 */ lw $v0, 4($s0) /* 1746E4 80245E04 30420040 */ andi $v0, $v0, 0x40 -/* 1746E8 80245E08 3C048028 */ lui $a0, 0x8028 -/* 1746EC 80245E0C 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 1746E8 80245E08 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 1746EC 80245E0C 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 1746F0 80245E10 10400003 */ beqz $v0, .L80245E20 /* 1746F4 80245E14 A28001A7 */ sb $zero, 0x1a7($s4) -/* 1746F8 80245E18 3C048028 */ lui $a0, 0x8028 -/* 1746FC 80245E1C 24845010 */ addiu $a0, $a0, 0x5010 +/* 1746F8 80245E18 3C048028 */ lui $a0, %hi(PeachScriptDispatcher) +/* 1746FC 80245E1C 24845010 */ addiu $a0, $a0, %lo(PeachScriptDispatcher) .L80245E20: /* 174700 80245E20 2405000A */ addiu $a1, $zero, 0xa /* 174704 80245E24 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_16F740/update_player_change_turn.s b/asm/nonmatchings/code_16F740/update_player_change_turn.s index 9cf2b3f549..7503c9db22 100644 --- a/asm/nonmatchings/code_16F740/update_player_change_turn.s +++ b/asm/nonmatchings/code_16F740/update_player_change_turn.s @@ -111,8 +111,8 @@ glabel update_player_change_turn /* 174EBC 802465DC 080919A8 */ j .L802466A0 /* 174EC0 802465E0 00000000 */ nop .L802465E4: -/* 174EC4 802465E4 3C048028 */ lui $a0, 0x8028 -/* 174EC8 802465E8 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 174EC4 802465E4 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 174EC8 802465E8 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 174ECC 802465EC 2405000A */ addiu $a1, $zero, 0xa /* 174ED0 802465F0 0000302D */ daddu $a2, $zero, $zero /* 174ED4 802465F4 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_16F740/update_run_away.s b/asm/nonmatchings/code_16F740/update_run_away.s index 902f28eabc..de5bfa5e5a 100644 --- a/asm/nonmatchings/code_16F740/update_run_away.s +++ b/asm/nonmatchings/code_16F740/update_run_away.s @@ -92,8 +92,8 @@ glabel update_run_away /* 17392C 8024504C 24020064 */ addiu $v0, $zero, 0x64 /* 173930 80245050 AE620088 */ sw $v0, 0x88($s3) .L80245054: -/* 173934 80245054 3C048028 */ lui $a0, 0x8028 -/* 173938 80245058 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 173934 80245054 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 173938 80245058 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 17393C 8024505C 2405000A */ addiu $a1, $zero, 0xa /* 173940 80245060 0000302D */ daddu $a2, $zero, $zero /* 173944 80245064 24020003 */ addiu $v0, $zero, 3 @@ -295,8 +295,8 @@ glabel update_run_away /* 173C14 80245334 08091505 */ j .L80245414 /* 173C18 80245338 00000000 */ nop .L8024533C: -/* 173C1C 8024533C 3C048028 */ lui $a0, 0x8028 -/* 173C20 80245340 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 173C1C 8024533C 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 173C20 80245340 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 173C24 80245344 2405000A */ addiu $a1, $zero, 0xa /* 173C28 80245348 0000302D */ daddu $a2, $zero, $zero /* 173C2C 8024534C 24020007 */ addiu $v0, $zero, 7 diff --git a/asm/nonmatchings/code_16F740/update_swap_partner.s b/asm/nonmatchings/code_16F740/update_swap_partner.s index fddb64d022..d5d9e14d77 100644 --- a/asm/nonmatchings/code_16F740/update_swap_partner.s +++ b/asm/nonmatchings/code_16F740/update_swap_partner.s @@ -90,8 +90,8 @@ glabel update_swap_partner .L80245844: /* 174124 80245844 0C098EF2 */ jal deduct_current_move_fp /* 174128 80245848 00000000 */ nop -/* 17412C 8024584C 3C048028 */ lui $a0, 0x8028 -/* 174130 80245850 24840A34 */ addiu $a0, $a0, 0xa34 +/* 17412C 8024584C 3C048028 */ lui $a0, %hi(BtlPutPartnerAway) +/* 174130 80245850 24840A34 */ addiu $a0, $a0, %lo(BtlPutPartnerAway) /* 174134 80245854 2405000A */ addiu $a1, $zero, 0xa /* 174138 80245858 0C0B0CF8 */ jal start_script /* 17413C 8024585C 0000302D */ daddu $a2, $zero, $zero @@ -158,8 +158,8 @@ glabel update_swap_partner /* 174230 80245950 00000000 */ nop /* 174234 80245954 AE2001D4 */ sw $zero, 0x1d4($s1) .L80245958: -/* 174238 80245958 3C048028 */ lui $a0, 0x8028 -/* 17423C 8024595C 24840B6C */ addiu $a0, $a0, 0xb6c +/* 174238 80245958 3C048028 */ lui $a0, %hi(BtlBringPartnerOut) +/* 17423C 8024595C 24840B6C */ addiu $a0, $a0, %lo(BtlBringPartnerOut) /* 174240 80245960 2405000A */ addiu $a1, $zero, 0xa /* 174244 80245964 0C0B0CF8 */ jal start_script /* 174248 80245968 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_17D6A0/show_battle_message.s b/asm/nonmatchings/code_17D6A0/show_battle_message.s index a132544ff3..56742bc2ea 100644 --- a/asm/nonmatchings/code_17D6A0/show_battle_message.s +++ b/asm/nonmatchings/code_17D6A0/show_battle_message.s @@ -15,8 +15,8 @@ glabel show_battle_message /* 17E268 8024F988 3C028025 */ lui $v0, 0x8025 /* 17E26C 8024F98C 2442FB3C */ addiu $v0, $v0, -0x4c4 /* 17E270 8024F990 AC620004 */ sw $v0, 4($v1) -/* 17E274 8024F994 3C028025 */ lui $v0, 0x8025 -/* 17E278 8024F998 24420EA4 */ addiu $v0, $v0, 0xea4 +/* 17E274 8024F994 3C028025 */ lui $v0, %hi(show_message_popup) +/* 17E278 8024F998 24420EA4 */ addiu $v0, $v0, %lo(show_message_popup) /* 17E27C 8024F99C AC62000C */ sw $v0, 0xc($v1) /* 17E280 8024F9A0 24020001 */ addiu $v0, $zero, 1 /* 17E284 8024F9A4 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s index 7b106b6944..5846ec215a 100644 --- a/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s +++ b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s @@ -17,8 +17,8 @@ glabel show_variable_battle_message /* 17E314 8024FA34 3C028025 */ lui $v0, 0x8025 /* 17E318 8024FA38 2442FB3C */ addiu $v0, $v0, -0x4c4 /* 17E31C 8024FA3C AC620004 */ sw $v0, 4($v1) -/* 17E320 8024FA40 3C028025 */ lui $v0, 0x8025 -/* 17E324 8024FA44 24420EA4 */ addiu $v0, $v0, 0xea4 +/* 17E320 8024FA40 3C028025 */ lui $v0, %hi(show_message_popup) +/* 17E324 8024FA44 24420EA4 */ addiu $v0, $v0, %lo(show_message_popup) /* 17E328 8024FA48 AC62000C */ sw $v0, 0xc($v1) /* 17E32C 8024FA4C 24020001 */ addiu $v0, $zero, 1 /* 17E330 8024FA50 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s b/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s index 5fe153b557..8f33a1dc9d 100644 --- a/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s +++ b/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s @@ -898,8 +898,8 @@ glabel calc_item_damage_enemy /* 180C6C 8025238C 00000000 */ nop /* 180C70 80252390 12A00016 */ beqz $s5, .L802523EC /* 180C74 80252394 00000000 */ nop -/* 180C78 80252398 3C048029 */ lui $a0, 0x8029 -/* 180C7C 8025239C 248445E0 */ addiu $a0, $a0, 0x45e0 +/* 180C78 80252398 3C048029 */ lui $a0, %hi(DoSleepHit) +/* 180C7C 8025239C 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 180C80 802523A0 2405000A */ addiu $a1, $zero, 0xa /* 180C84 802523A4 0C0B0CF8 */ jal start_script /* 180C88 802523A8 0000302D */ daddu $a2, $zero, $zero @@ -927,8 +927,8 @@ glabel calc_item_damage_enemy /* 180CDC 802523FC 00000000 */ nop /* 180CE0 80252400 12A00016 */ beqz $s5, .L8025245C /* 180CE4 80252404 00000000 */ nop -/* 180CE8 80252408 3C048029 */ lui $a0, 0x8029 -/* 180CEC 8025240C 248445FC */ addiu $a0, $a0, 0x45fc +/* 180CE8 80252408 3C048029 */ lui $a0, %hi(DoDizzyHit) +/* 180CEC 8025240C 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 180CF0 80252410 2405000A */ addiu $a1, $zero, 0xa /* 180CF4 80252414 0C0B0CF8 */ jal start_script /* 180CF8 80252418 0000302D */ daddu $a2, $zero, $zero @@ -956,8 +956,8 @@ glabel calc_item_damage_enemy /* 180D4C 8025246C 00000000 */ nop /* 180D50 80252470 12A00016 */ beqz $s5, .L802524CC /* 180D54 80252474 00000000 */ nop -/* 180D58 80252478 3C048029 */ lui $a0, 0x8029 -/* 180D5C 8025247C 24844618 */ addiu $a0, $a0, 0x4618 +/* 180D58 80252478 3C048029 */ lui $a0, %hi(DoParalyzeHit) +/* 180D5C 8025247C 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 180D60 80252480 2405000A */ addiu $a1, $zero, 0xa /* 180D64 80252484 0C0B0CF8 */ jal start_script /* 180D68 80252488 0000302D */ daddu $a2, $zero, $zero @@ -985,8 +985,8 @@ glabel calc_item_damage_enemy /* 180DBC 802524DC 00000000 */ nop /* 180DC0 802524E0 12A00016 */ beqz $s5, .L8025253C /* 180DC4 802524E4 00000000 */ nop -/* 180DC8 802524E8 3C048029 */ lui $a0, 0x8029 -/* 180DCC 802524EC 24844634 */ addiu $a0, $a0, 0x4634 +/* 180DC8 802524E8 3C048029 */ lui $a0, %hi(DoPoisonHit) +/* 180DCC 802524EC 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 180DD0 802524F0 2405000A */ addiu $a1, $zero, 0xa /* 180DD4 802524F4 0C0B0CF8 */ jal start_script /* 180DD8 802524F8 0000302D */ daddu $a2, $zero, $zero @@ -1014,8 +1014,8 @@ glabel calc_item_damage_enemy /* 180E2C 8025254C 00000000 */ nop /* 180E30 80252550 12A00016 */ beqz $s5, .L802525AC /* 180E34 80252554 00000000 */ nop -/* 180E38 80252558 3C048029 */ lui $a0, 0x8029 -/* 180E3C 8025255C 24844650 */ addiu $a0, $a0, 0x4650 +/* 180E38 80252558 3C048029 */ lui $a0, %hi(DoStopHit) +/* 180E3C 8025255C 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 180E40 80252560 2405000A */ addiu $a1, $zero, 0xa /* 180E44 80252564 0C0B0CF8 */ jal start_script /* 180E48 80252568 0000302D */ daddu $a2, $zero, $zero @@ -1042,8 +1042,8 @@ glabel calc_item_damage_enemy /* 180E98 802525B8 00000000 */ nop /* 180E9C 802525BC 12A00017 */ beqz $s5, .L8025261C /* 180EA0 802525C0 00000000 */ nop -/* 180EA4 802525C4 3C048029 */ lui $a0, 0x8029 -/* 180EA8 802525C8 2484466C */ addiu $a0, $a0, 0x466c +/* 180EA4 802525C4 3C048029 */ lui $a0, %hi(DoFreezeHit) +/* 180EA8 802525C8 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 180EAC 802525CC 2405000A */ addiu $a1, $zero, 0xa /* 180EB0 802525D0 0C0B0CF8 */ jal start_script /* 180EB4 802525D4 0000302D */ daddu $a2, $zero, $zero @@ -1072,8 +1072,8 @@ glabel calc_item_damage_enemy /* 180F0C 8025262C 00000000 */ nop /* 180F10 80252630 12A00017 */ beqz $s5, .L80252690 /* 180F14 80252634 00000000 */ nop -/* 180F18 80252638 3C048029 */ lui $a0, 0x8029 -/* 180F1C 8025263C 248446B8 */ addiu $a0, $a0, 0x46b8 +/* 180F18 80252638 3C048029 */ lui $a0, %hi(DoShinkHit) +/* 180F1C 8025263C 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 180F20 80252640 2405000A */ addiu $a1, $zero, 0xa /* 180F24 80252644 0C0B0CF8 */ jal start_script /* 180F28 80252648 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_18C790/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s index 93e96f4818..25536adca0 100644 --- a/asm/nonmatchings/code_18C790/func_8025E190.s +++ b/asm/nonmatchings/code_18C790/func_8025E190.s @@ -242,8 +242,8 @@ glabel func_8025E190 /* 18CDFC 8025E51C 00441024 */ and $v0, $v0, $a0 /* 18CE00 8025E520 AE420000 */ sw $v0, ($s2) .L8025E524: -/* 18CE04 8025E524 3C048028 */ lui $a0, 0x8028 -/* 18CE08 8025E528 24844EBC */ addiu $a0, $a0, 0x4ebc +/* 18CE04 8025E524 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) +/* 18CE08 8025E528 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 18CE0C 8025E52C 2405000A */ addiu $a1, $zero, 0xa /* 18CE10 8025E530 0000302D */ daddu $a2, $zero, $zero /* 18CE14 8025E534 24020005 */ addiu $v0, $zero, 5 diff --git a/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s b/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s index d0728efc3d..f650702386 100644 --- a/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s +++ b/asm/nonmatchings/code_197F40/calc_player_damage_enemy.s @@ -1436,8 +1436,8 @@ glabel calc_player_damage_enemy /* 1A1668 80272D88 00000000 */ nop /* 1A166C 80272D8C 12E00016 */ beqz $s7, .L80272DE8 /* 1A1670 80272D90 00000000 */ nop -/* 1A1674 80272D94 3C048029 */ lui $a0, 0x8029 -/* 1A1678 80272D98 248445E0 */ addiu $a0, $a0, 0x45e0 +/* 1A1674 80272D94 3C048029 */ lui $a0, %hi(DoSleepHit) +/* 1A1678 80272D98 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 1A167C 80272D9C 2405000A */ addiu $a1, $zero, 0xa /* 1A1680 80272DA0 0C0B0CF8 */ jal start_script /* 1A1684 80272DA4 0000302D */ daddu $a2, $zero, $zero @@ -1465,8 +1465,8 @@ glabel calc_player_damage_enemy /* 1A16D8 80272DF8 00000000 */ nop /* 1A16DC 80272DFC 12E00016 */ beqz $s7, .L80272E58 /* 1A16E0 80272E00 00000000 */ nop -/* 1A16E4 80272E04 3C048029 */ lui $a0, 0x8029 -/* 1A16E8 80272E08 248445FC */ addiu $a0, $a0, 0x45fc +/* 1A16E4 80272E04 3C048029 */ lui $a0, %hi(DoDizzyHit) +/* 1A16E8 80272E08 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 1A16EC 80272E0C 2405000A */ addiu $a1, $zero, 0xa /* 1A16F0 80272E10 0C0B0CF8 */ jal start_script /* 1A16F4 80272E14 0000302D */ daddu $a2, $zero, $zero @@ -1494,8 +1494,8 @@ glabel calc_player_damage_enemy /* 1A1748 80272E68 00000000 */ nop /* 1A174C 80272E6C 12E00016 */ beqz $s7, .L80272EC8 /* 1A1750 80272E70 00000000 */ nop -/* 1A1754 80272E74 3C048029 */ lui $a0, 0x8029 -/* 1A1758 80272E78 24844618 */ addiu $a0, $a0, 0x4618 +/* 1A1754 80272E74 3C048029 */ lui $a0, %hi(DoParalyzeHit) +/* 1A1758 80272E78 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 1A175C 80272E7C 2405000A */ addiu $a1, $zero, 0xa /* 1A1760 80272E80 0C0B0CF8 */ jal start_script /* 1A1764 80272E84 0000302D */ daddu $a2, $zero, $zero @@ -1523,8 +1523,8 @@ glabel calc_player_damage_enemy /* 1A17B8 80272ED8 00000000 */ nop /* 1A17BC 80272EDC 12E00016 */ beqz $s7, .L80272F38 /* 1A17C0 80272EE0 00000000 */ nop -/* 1A17C4 80272EE4 3C048029 */ lui $a0, 0x8029 -/* 1A17C8 80272EE8 24844634 */ addiu $a0, $a0, 0x4634 +/* 1A17C4 80272EE4 3C048029 */ lui $a0, %hi(DoPoisonHit) +/* 1A17C8 80272EE8 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 1A17CC 80272EEC 2405000A */ addiu $a1, $zero, 0xa /* 1A17D0 80272EF0 0C0B0CF8 */ jal start_script /* 1A17D4 80272EF4 0000302D */ daddu $a2, $zero, $zero @@ -1552,8 +1552,8 @@ glabel calc_player_damage_enemy /* 1A1828 80272F48 00000000 */ nop /* 1A182C 80272F4C 12E00016 */ beqz $s7, .L80272FA8 /* 1A1830 80272F50 00000000 */ nop -/* 1A1834 80272F54 3C048029 */ lui $a0, 0x8029 -/* 1A1838 80272F58 24844650 */ addiu $a0, $a0, 0x4650 +/* 1A1834 80272F54 3C048029 */ lui $a0, %hi(DoStopHit) +/* 1A1838 80272F58 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 1A183C 80272F5C 2405000A */ addiu $a1, $zero, 0xa /* 1A1840 80272F60 0C0B0CF8 */ jal start_script /* 1A1844 80272F64 0000302D */ daddu $a2, $zero, $zero @@ -1580,8 +1580,8 @@ glabel calc_player_damage_enemy /* 1A1894 80272FB4 00000000 */ nop /* 1A1898 80272FB8 12E00017 */ beqz $s7, .L80273018 /* 1A189C 80272FBC 00000000 */ nop -/* 1A18A0 80272FC0 3C048029 */ lui $a0, 0x8029 -/* 1A18A4 80272FC4 2484466C */ addiu $a0, $a0, 0x466c +/* 1A18A0 80272FC0 3C048029 */ lui $a0, %hi(DoFreezeHit) +/* 1A18A4 80272FC4 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 1A18A8 80272FC8 2405000A */ addiu $a1, $zero, 0xa /* 1A18AC 80272FCC 0C0B0CF8 */ jal start_script /* 1A18B0 80272FD0 0000302D */ daddu $a2, $zero, $zero @@ -1610,8 +1610,8 @@ glabel calc_player_damage_enemy /* 1A1908 80273028 00000000 */ nop /* 1A190C 8027302C 12E00017 */ beqz $s7, .L8027308C /* 1A1910 80273030 00000000 */ nop -/* 1A1914 80273034 3C048029 */ lui $a0, 0x8029 -/* 1A1918 80273038 248446B8 */ addiu $a0, $a0, 0x46b8 +/* 1A1914 80273034 3C048029 */ lui $a0, %hi(DoShinkHit) +/* 1A1918 80273038 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 1A191C 8027303C 2405000A */ addiu $a1, $zero, 0xa /* 1A1920 80273040 0C0B0CF8 */ jal start_script /* 1A1924 80273044 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_197F40/dispatch_event_player.s b/asm/nonmatchings/code_197F40/dispatch_event_player.s index a8992cb329..d7bc3042ee 100644 --- a/asm/nonmatchings/code_197F40/dispatch_event_player.s +++ b/asm/nonmatchings/code_197F40/dispatch_event_player.s @@ -11,8 +11,8 @@ glabel dispatch_event_player /* 19FF50 80271670 AFB20018 */ sw $s2, 0x18($sp) /* 19FF54 80271674 AFB10014 */ sw $s1, 0x14($sp) /* 19FF58 80271678 A20401F0 */ sb $a0, 0x1f0($s0) -/* 19FF5C 8027167C 3C048028 */ lui $a0, 0x8028 -/* 19FF60 80271680 248452D4 */ addiu $a0, $a0, 0x52d4 +/* 19FF5C 8027167C 3C048028 */ lui $a0, %hi(HandleEvent_Player) +/* 19FF60 80271680 248452D4 */ addiu $a0, $a0, %lo(HandleEvent_Player) /* 19FF64 80271684 8E1101D8 */ lw $s1, 0x1d8($s0) /* 19FF68 80271688 8E1201E8 */ lw $s2, 0x1e8($s0) /* 19FF6C 8027168C 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s b/asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s index 77612cbc5f..99fff8c4dc 100644 --- a/asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s +++ b/asm/nonmatchings/code_197F40/dispatch_event_player_continue_turn.s @@ -11,8 +11,8 @@ glabel dispatch_event_player_continue_turn /* 19FFDC 802716FC AFB20018 */ sw $s2, 0x18($sp) /* 19FFE0 80271700 AFB10014 */ sw $s1, 0x14($sp) /* 19FFE4 80271704 A20401F0 */ sb $a0, 0x1f0($s0) -/* 19FFE8 80271708 3C048028 */ lui $a0, 0x8028 -/* 19FFEC 8027170C 248452D4 */ addiu $a0, $a0, 0x52d4 +/* 19FFE8 80271708 3C048028 */ lui $a0, %hi(HandleEvent_Player) +/* 19FFEC 8027170C 248452D4 */ addiu $a0, $a0, %lo(HandleEvent_Player) /* 19FFF0 80271710 8E1101D8 */ lw $s1, 0x1d8($s0) /* 19FFF4 80271714 8E1201E8 */ lw $s2, 0x1e8($s0) /* 19FFF8 80271718 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s index 7bf40feb72..f6181bec33 100644 --- a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s +++ b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s @@ -1032,8 +1032,8 @@ glabel calc_enemy_damage_target /* 1A6B8C 802782AC 00000000 */ nop /* 1A6B90 802782B0 12A00016 */ beqz $s5, .L8027830C /* 1A6B94 802782B4 00000000 */ nop -/* 1A6B98 802782B8 3C048029 */ lui $a0, 0x8029 -/* 1A6B9C 802782BC 248445E0 */ addiu $a0, $a0, 0x45e0 +/* 1A6B98 802782B8 3C048029 */ lui $a0, %hi(DoSleepHit) +/* 1A6B9C 802782BC 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 1A6BA0 802782C0 2405000A */ addiu $a1, $zero, 0xa /* 1A6BA4 802782C4 0C0B0CF8 */ jal start_script /* 1A6BA8 802782C8 0000302D */ daddu $a2, $zero, $zero @@ -1061,8 +1061,8 @@ glabel calc_enemy_damage_target /* 1A6BFC 8027831C 00000000 */ nop /* 1A6C00 80278320 12A00016 */ beqz $s5, .L8027837C /* 1A6C04 80278324 00000000 */ nop -/* 1A6C08 80278328 3C048029 */ lui $a0, 0x8029 -/* 1A6C0C 8027832C 248445FC */ addiu $a0, $a0, 0x45fc +/* 1A6C08 80278328 3C048029 */ lui $a0, %hi(DoDizzyHit) +/* 1A6C0C 8027832C 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 1A6C10 80278330 2405000A */ addiu $a1, $zero, 0xa /* 1A6C14 80278334 0C0B0CF8 */ jal start_script /* 1A6C18 80278338 0000302D */ daddu $a2, $zero, $zero @@ -1090,8 +1090,8 @@ glabel calc_enemy_damage_target /* 1A6C6C 8027838C 00000000 */ nop /* 1A6C70 80278390 12A00016 */ beqz $s5, .L802783EC /* 1A6C74 80278394 00000000 */ nop -/* 1A6C78 80278398 3C048029 */ lui $a0, 0x8029 -/* 1A6C7C 8027839C 24844618 */ addiu $a0, $a0, 0x4618 +/* 1A6C78 80278398 3C048029 */ lui $a0, %hi(DoParalyzeHit) +/* 1A6C7C 8027839C 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 1A6C80 802783A0 2405000A */ addiu $a1, $zero, 0xa /* 1A6C84 802783A4 0C0B0CF8 */ jal start_script /* 1A6C88 802783A8 0000302D */ daddu $a2, $zero, $zero @@ -1119,8 +1119,8 @@ glabel calc_enemy_damage_target /* 1A6CDC 802783FC 00000000 */ nop /* 1A6CE0 80278400 12A00016 */ beqz $s5, .L8027845C /* 1A6CE4 80278404 00000000 */ nop -/* 1A6CE8 80278408 3C048029 */ lui $a0, 0x8029 -/* 1A6CEC 8027840C 24844634 */ addiu $a0, $a0, 0x4634 +/* 1A6CE8 80278408 3C048029 */ lui $a0, %hi(DoPoisonHit) +/* 1A6CEC 8027840C 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 1A6CF0 80278410 2405000A */ addiu $a1, $zero, 0xa /* 1A6CF4 80278414 0C0B0CF8 */ jal start_script /* 1A6CF8 80278418 0000302D */ daddu $a2, $zero, $zero @@ -1148,8 +1148,8 @@ glabel calc_enemy_damage_target /* 1A6D4C 8027846C 00000000 */ nop /* 1A6D50 80278470 12A00016 */ beqz $s5, .L802784CC /* 1A6D54 80278474 00000000 */ nop -/* 1A6D58 80278478 3C048029 */ lui $a0, 0x8029 -/* 1A6D5C 8027847C 24844650 */ addiu $a0, $a0, 0x4650 +/* 1A6D58 80278478 3C048029 */ lui $a0, %hi(DoStopHit) +/* 1A6D5C 8027847C 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 1A6D60 80278480 2405000A */ addiu $a1, $zero, 0xa /* 1A6D64 80278484 0C0B0CF8 */ jal start_script /* 1A6D68 80278488 0000302D */ daddu $a2, $zero, $zero @@ -1176,8 +1176,8 @@ glabel calc_enemy_damage_target /* 1A6DB8 802784D8 00000000 */ nop /* 1A6DBC 802784DC 12A00017 */ beqz $s5, .L8027853C /* 1A6DC0 802784E0 00000000 */ nop -/* 1A6DC4 802784E4 3C048029 */ lui $a0, 0x8029 -/* 1A6DC8 802784E8 2484466C */ addiu $a0, $a0, 0x466c +/* 1A6DC4 802784E4 3C048029 */ lui $a0, %hi(DoFreezeHit) +/* 1A6DC8 802784E8 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 1A6DCC 802784EC 2405000A */ addiu $a1, $zero, 0xa /* 1A6DD0 802784F0 0C0B0CF8 */ jal start_script /* 1A6DD4 802784F4 0000302D */ daddu $a2, $zero, $zero @@ -1206,8 +1206,8 @@ glabel calc_enemy_damage_target /* 1A6E2C 8027854C 00000000 */ nop /* 1A6E30 80278550 12A00017 */ beqz $s5, .L802785B0 /* 1A6E34 80278554 00000000 */ nop -/* 1A6E38 80278558 3C048029 */ lui $a0, 0x8029 -/* 1A6E3C 8027855C 248446B8 */ addiu $a0, $a0, 0x46b8 +/* 1A6E38 80278558 3C048029 */ lui $a0, %hi(DoShinkHit) +/* 1A6E3C 8027855C 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 1A6E40 80278560 2405000A */ addiu $a1, $zero, 0xa /* 1A6E44 80278564 0C0B0CF8 */ jal start_script /* 1A6E48 80278568 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s b/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s index 4016a4f861..359dad6bb8 100644 --- a/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s +++ b/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s @@ -1304,8 +1304,8 @@ glabel calc_partner_damage_enemy /* 1ADE6C 8027F58C 00000000 */ nop /* 1ADE70 8027F590 12A00016 */ beqz $s5, .L8027F5EC /* 1ADE74 8027F594 00000000 */ nop -/* 1ADE78 8027F598 3C048029 */ lui $a0, 0x8029 -/* 1ADE7C 8027F59C 248445E0 */ addiu $a0, $a0, 0x45e0 +/* 1ADE78 8027F598 3C048029 */ lui $a0, %hi(DoSleepHit) +/* 1ADE7C 8027F59C 248445E0 */ addiu $a0, $a0, %lo(DoSleepHit) /* 1ADE80 8027F5A0 2405000A */ addiu $a1, $zero, 0xa /* 1ADE84 8027F5A4 0C0B0CF8 */ jal start_script /* 1ADE88 8027F5A8 0000302D */ daddu $a2, $zero, $zero @@ -1333,8 +1333,8 @@ glabel calc_partner_damage_enemy /* 1ADEDC 8027F5FC 00000000 */ nop /* 1ADEE0 8027F600 12A00016 */ beqz $s5, .L8027F65C /* 1ADEE4 8027F604 00000000 */ nop -/* 1ADEE8 8027F608 3C048029 */ lui $a0, 0x8029 -/* 1ADEEC 8027F60C 248445FC */ addiu $a0, $a0, 0x45fc +/* 1ADEE8 8027F608 3C048029 */ lui $a0, %hi(DoDizzyHit) +/* 1ADEEC 8027F60C 248445FC */ addiu $a0, $a0, %lo(DoDizzyHit) /* 1ADEF0 8027F610 2405000A */ addiu $a1, $zero, 0xa /* 1ADEF4 8027F614 0C0B0CF8 */ jal start_script /* 1ADEF8 8027F618 0000302D */ daddu $a2, $zero, $zero @@ -1362,8 +1362,8 @@ glabel calc_partner_damage_enemy /* 1ADF4C 8027F66C 00000000 */ nop /* 1ADF50 8027F670 12A00016 */ beqz $s5, .L8027F6CC /* 1ADF54 8027F674 00000000 */ nop -/* 1ADF58 8027F678 3C048029 */ lui $a0, 0x8029 -/* 1ADF5C 8027F67C 24844618 */ addiu $a0, $a0, 0x4618 +/* 1ADF58 8027F678 3C048029 */ lui $a0, %hi(DoParalyzeHit) +/* 1ADF5C 8027F67C 24844618 */ addiu $a0, $a0, %lo(DoParalyzeHit) /* 1ADF60 8027F680 2405000A */ addiu $a1, $zero, 0xa /* 1ADF64 8027F684 0C0B0CF8 */ jal start_script /* 1ADF68 8027F688 0000302D */ daddu $a2, $zero, $zero @@ -1391,8 +1391,8 @@ glabel calc_partner_damage_enemy /* 1ADFBC 8027F6DC 00000000 */ nop /* 1ADFC0 8027F6E0 12A00016 */ beqz $s5, .L8027F73C /* 1ADFC4 8027F6E4 00000000 */ nop -/* 1ADFC8 8027F6E8 3C048029 */ lui $a0, 0x8029 -/* 1ADFCC 8027F6EC 24844634 */ addiu $a0, $a0, 0x4634 +/* 1ADFC8 8027F6E8 3C048029 */ lui $a0, %hi(DoPoisonHit) +/* 1ADFCC 8027F6EC 24844634 */ addiu $a0, $a0, %lo(DoPoisonHit) /* 1ADFD0 8027F6F0 2405000A */ addiu $a1, $zero, 0xa /* 1ADFD4 8027F6F4 0C0B0CF8 */ jal start_script /* 1ADFD8 8027F6F8 0000302D */ daddu $a2, $zero, $zero @@ -1420,8 +1420,8 @@ glabel calc_partner_damage_enemy /* 1AE02C 8027F74C 00000000 */ nop /* 1AE030 8027F750 12A00016 */ beqz $s5, .L8027F7AC /* 1AE034 8027F754 00000000 */ nop -/* 1AE038 8027F758 3C048029 */ lui $a0, 0x8029 -/* 1AE03C 8027F75C 24844650 */ addiu $a0, $a0, 0x4650 +/* 1AE038 8027F758 3C048029 */ lui $a0, %hi(DoStopHit) +/* 1AE03C 8027F75C 24844650 */ addiu $a0, $a0, %lo(DoStopHit) /* 1AE040 8027F760 2405000A */ addiu $a1, $zero, 0xa /* 1AE044 8027F764 0C0B0CF8 */ jal start_script /* 1AE048 8027F768 0000302D */ daddu $a2, $zero, $zero @@ -1448,8 +1448,8 @@ glabel calc_partner_damage_enemy /* 1AE098 8027F7B8 00000000 */ nop /* 1AE09C 8027F7BC 12A00017 */ beqz $s5, .L8027F81C /* 1AE0A0 8027F7C0 00000000 */ nop -/* 1AE0A4 8027F7C4 3C048029 */ lui $a0, 0x8029 -/* 1AE0A8 8027F7C8 2484466C */ addiu $a0, $a0, 0x466c +/* 1AE0A4 8027F7C4 3C048029 */ lui $a0, %hi(DoFreezeHit) +/* 1AE0A8 8027F7C8 2484466C */ addiu $a0, $a0, %lo(DoFreezeHit) /* 1AE0AC 8027F7CC 2405000A */ addiu $a1, $zero, 0xa /* 1AE0B0 8027F7D0 0C0B0CF8 */ jal start_script /* 1AE0B4 8027F7D4 0000302D */ daddu $a2, $zero, $zero @@ -1478,8 +1478,8 @@ glabel calc_partner_damage_enemy /* 1AE10C 8027F82C 00000000 */ nop /* 1AE110 8027F830 12A00017 */ beqz $s5, .L8027F890 /* 1AE114 8027F834 00000000 */ nop -/* 1AE118 8027F838 3C048029 */ lui $a0, 0x8029 -/* 1AE11C 8027F83C 248446B8 */ addiu $a0, $a0, 0x46b8 +/* 1AE118 8027F838 3C048029 */ lui $a0, %hi(DoShinkHit) +/* 1AE11C 8027F83C 248446B8 */ addiu $a0, $a0, %lo(DoShinkHit) /* 1AE120 8027F840 2405000A */ addiu $a1, $zero, 0xa /* 1AE124 8027F844 0C0B0CF8 */ jal start_script /* 1AE128 8027F848 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s index 259c33229f..f38b87b07d 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s @@ -45,8 +45,8 @@ glabel func_8004AB00 /* 25FA0 8004ABA0 00620019 */ multu $v1, $v0 /* 25FA4 8004ABA4 A3A00024 */ sb $zero, 0x24($sp) /* 25FA8 8004ABA8 AFB0002C */ sw $s0, 0x2c($sp) -/* 25FAC 8004ABAC 3C028005 */ lui $v0, 0x8005 -/* 25FB0 8004ABB0 2442B224 */ addiu $v0, $v0, -0x4ddc +/* 25FAC 8004ABAC 3C028005 */ lui $v0, %hi(nuAuDmaNew) +/* 25FB0 8004ABB0 2442B224 */ addiu $v0, $v0, %lo(nuAuDmaNew) /* 25FB4 8004ABB4 AFA20028 */ sw $v0, 0x28($sp) /* 25FB8 8004ABB8 00001810 */ mfhi $v1 /* 25FBC 8004ABBC 000319C2 */ srl $v1, $v1, 7 diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s b/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s index ace94f98b5..871d57ee35 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s @@ -171,120 +171,3 @@ glabel func_8004AE08 /* 26468 8004B068 24420001 */ addiu $v0, $v0, 1 /* 2646C 8004B06C 08012BA8 */ j .L8004AEA0 /* 26470 8004B070 A2E20000 */ sb $v0, ($s7) -/* 26474 8004B074 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 26478 8004B078 AFB3001C */ sw $s3, 0x1c($sp) -/* 2647C 8004B07C 0080982D */ daddu $s3, $a0, $zero -/* 26480 8004B080 30E700FF */ andi $a3, $a3, 0xff -/* 26484 8004B084 AFBF0020 */ sw $ra, 0x20($sp) -/* 26488 8004B088 AFB20018 */ sw $s2, 0x18($sp) -/* 2648C 8004B08C AFB10014 */ sw $s1, 0x14($sp) -/* 26490 8004B090 14E00005 */ bnez $a3, .L8004B0A8 -/* 26494 8004B094 AFB00010 */ sw $s0, 0x10($sp) -/* 26498 8004B098 0C0187A4 */ jal osVirtualToPhysical -/* 2649C 8004B09C 00000000 */ nop -/* 264A0 8004B0A0 08012C82 */ j .L8004B208 -/* 264A4 8004B0A4 00000000 */ nop -.L8004B0A8: -/* 264A8 8004B0A8 0000802D */ daddu $s0, $zero, $zero -/* 264AC 8004B0AC 3C11800A */ lui $s1, 0x800a -/* 264B0 8004B0B0 8E313BD4 */ lw $s1, 0x3bd4($s1) -/* 264B4 8004B0B4 1220000B */ beqz $s1, .L8004B0E4 -/* 264B8 8004B0B8 02652821 */ addu $a1, $s3, $a1 -.L8004B0BC: -/* 264BC 8004B0BC 8E220008 */ lw $v0, 8($s1) -/* 264C0 8004B0C0 24430500 */ addiu $v1, $v0, 0x500 -/* 264C4 8004B0C4 0262102B */ sltu $v0, $s3, $v0 -/* 264C8 8004B0C8 14400006 */ bnez $v0, .L8004B0E4 -/* 264CC 8004B0CC 0065102A */ slt $v0, $v1, $a1 -/* 264D0 8004B0D0 1040001F */ beqz $v0, .L8004B150 -/* 264D4 8004B0D4 0220802D */ daddu $s0, $s1, $zero -/* 264D8 8004B0D8 8E310000 */ lw $s1, ($s1) -/* 264DC 8004B0DC 1620FFF7 */ bnez $s1, .L8004B0BC -/* 264E0 8004B0E0 00000000 */ nop -.L8004B0E4: -/* 264E4 8004B0E4 3C12800A */ lui $s2, 0x800a -/* 264E8 8004B0E8 26523BD0 */ addiu $s2, $s2, 0x3bd0 -/* 264EC 8004B0EC 8E510008 */ lw $s1, 8($s2) -/* 264F0 8004B0F0 16200006 */ bnez $s1, .L8004B10C -/* 264F4 8004B0F4 0220202D */ daddu $a0, $s1, $zero -/* 264F8 8004B0F8 8E440004 */ lw $a0, 4($s2) -/* 264FC 8004B0FC 0C0187A4 */ jal osVirtualToPhysical -/* 26500 8004B100 00000000 */ nop -/* 26504 8004B104 08012C82 */ j .L8004B208 -/* 26508 8004B108 00000000 */ nop -.L8004B10C: -/* 2650C 8004B10C 8E220000 */ lw $v0, ($s1) -/* 26510 8004B110 0C012D03 */ jal alUnlink -/* 26514 8004B114 AE420008 */ sw $v0, 8($s2) -/* 26518 8004B118 12000005 */ beqz $s0, .L8004B130 -/* 2651C 8004B11C 0220202D */ daddu $a0, $s1, $zero -/* 26520 8004B120 0C012CFB */ jal alLink -/* 26524 8004B124 0200282D */ daddu $a1, $s0, $zero -/* 26528 8004B128 08012C61 */ j .L8004B184 -/* 2652C 8004B12C 00000000 */ nop -.L8004B130: -/* 26530 8004B130 8E450004 */ lw $a1, 4($s2) -/* 26534 8004B134 10A00010 */ beqz $a1, .L8004B178 -/* 26538 8004B138 00A0802D */ daddu $s0, $a1, $zero -/* 2653C 8004B13C AE510004 */ sw $s1, 4($s2) -/* 26540 8004B140 AE300000 */ sw $s0, ($s1) -/* 26544 8004B144 AE200004 */ sw $zero, 4($s1) -/* 26548 8004B148 08012C61 */ j .L8004B184 -/* 2654C 8004B14C AE110004 */ sw $s1, 4($s0) -.L8004B150: -/* 26550 8004B150 8E240010 */ lw $a0, 0x10($s1) -/* 26554 8004B154 8E220008 */ lw $v0, 8($s1) -/* 26558 8004B158 3C038008 */ lui $v1, 0x8008 -/* 2655C 8004B15C 8C63817C */ lw $v1, -0x7e84($v1) -/* 26560 8004B160 00932021 */ addu $a0, $a0, $s3 -/* 26564 8004B164 00822023 */ subu $a0, $a0, $v0 -/* 26568 8004B168 0C0187A4 */ jal osVirtualToPhysical -/* 2656C 8004B16C AE23000C */ sw $v1, 0xc($s1) -/* 26570 8004B170 08012C82 */ j .L8004B208 -/* 26574 8004B174 00000000 */ nop -.L8004B178: -/* 26578 8004B178 AE510004 */ sw $s1, 4($s2) -/* 2657C 8004B17C AE200000 */ sw $zero, ($s1) -/* 26580 8004B180 AE200004 */ sw $zero, 4($s1) -.L8004B184: -/* 26584 8004B184 3C048008 */ lui $a0, 0x8008 -/* 26588 8004B188 24848178 */ addiu $a0, $a0, -0x7e88 -/* 2658C 8004B18C 32700001 */ andi $s0, $s3, 1 -/* 26590 8004B190 02709823 */ subu $s3, $s3, $s0 -/* 26594 8004B194 3C02800A */ lui $v0, 0x800a -/* 26598 8004B198 24423720 */ addiu $v0, $v0, 0x3720 -/* 2659C 8004B19C 8C830000 */ lw $v1, ($a0) -/* 265A0 8004B1A0 8E320010 */ lw $s2, 0x10($s1) -/* 265A4 8004B1A4 0000302D */ daddu $a2, $zero, $zero -/* 265A8 8004B1A8 AE330008 */ sw $s3, 8($s1) -/* 265AC 8004B1AC 00032840 */ sll $a1, $v1, 1 -/* 265B0 8004B1B0 00A32821 */ addu $a1, $a1, $v1 -/* 265B4 8004B1B4 000528C0 */ sll $a1, $a1, 3 -/* 265B8 8004B1B8 00A22821 */ addu $a1, $a1, $v0 -/* 265BC 8004B1BC 3C028008 */ lui $v0, 0x8008 -/* 265C0 8004B1C0 8C42817C */ lw $v0, -0x7e84($v0) -/* 265C4 8004B1C4 24630001 */ addiu $v1, $v1, 1 -/* 265C8 8004B1C8 AE22000C */ sw $v0, 0xc($s1) -/* 265CC 8004B1CC AC830000 */ sw $v1, ($a0) -/* 265D0 8004B1D0 A0A00002 */ sb $zero, 2($a1) -/* 265D4 8004B1D4 3C04800A */ lui $a0, %hi(carthandle) -/* 265D8 8004B1D8 8C84A638 */ lw $a0, %lo(carthandle)($a0) -/* 265DC 8004B1DC 3C02800A */ lui $v0, 0x800a -/* 265E0 8004B1E0 24423640 */ addiu $v0, $v0, 0x3640 -/* 265E4 8004B1E4 ACA20004 */ sw $v0, 4($a1) -/* 265E8 8004B1E8 24020500 */ addiu $v0, $zero, 0x500 -/* 265EC 8004B1EC ACB20008 */ sw $s2, 8($a1) -/* 265F0 8004B1F0 ACB3000C */ sw $s3, 0xc($a1) -/* 265F4 8004B1F4 0C018388 */ jal osEPiStartDma -/* 265F8 8004B1F8 ACA20010 */ sw $v0, 0x10($a1) -/* 265FC 8004B1FC 0C0187A4 */ jal osVirtualToPhysical -/* 26600 8004B200 0240202D */ daddu $a0, $s2, $zero -/* 26604 8004B204 00501021 */ addu $v0, $v0, $s0 -.L8004B208: -/* 26608 8004B208 8FBF0020 */ lw $ra, 0x20($sp) -/* 2660C 8004B20C 8FB3001C */ lw $s3, 0x1c($sp) -/* 26610 8004B210 8FB20018 */ lw $s2, 0x18($sp) -/* 26614 8004B214 8FB10014 */ lw $s1, 0x14($sp) -/* 26618 8004B218 8FB00010 */ lw $s0, 0x10($sp) -/* 2661C 8004B21C 03E00008 */ jr $ra -/* 26620 8004B220 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s new file mode 100644 index 0000000000..d1cb950fea --- /dev/null +++ b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel nuAuDmaCallBack +/* 26474 8004B074 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 26478 8004B078 AFB3001C */ sw $s3, 0x1c($sp) +/* 2647C 8004B07C 0080982D */ daddu $s3, $a0, $zero +/* 26480 8004B080 30E700FF */ andi $a3, $a3, 0xff +/* 26484 8004B084 AFBF0020 */ sw $ra, 0x20($sp) +/* 26488 8004B088 AFB20018 */ sw $s2, 0x18($sp) +/* 2648C 8004B08C AFB10014 */ sw $s1, 0x14($sp) +/* 26490 8004B090 14E00005 */ bnez $a3, .L8004B0A8 +/* 26494 8004B094 AFB00010 */ sw $s0, 0x10($sp) +/* 26498 8004B098 0C0187A4 */ jal osVirtualToPhysical +/* 2649C 8004B09C 00000000 */ nop +/* 264A0 8004B0A0 08012C82 */ j .L8004B208 +/* 264A4 8004B0A4 00000000 */ nop +.L8004B0A8: +/* 264A8 8004B0A8 0000802D */ daddu $s0, $zero, $zero +/* 264AC 8004B0AC 3C11800A */ lui $s1, 0x800a +/* 264B0 8004B0B0 8E313BD4 */ lw $s1, 0x3bd4($s1) +/* 264B4 8004B0B4 1220000B */ beqz $s1, .L8004B0E4 +/* 264B8 8004B0B8 02652821 */ addu $a1, $s3, $a1 +.L8004B0BC: +/* 264BC 8004B0BC 8E220008 */ lw $v0, 8($s1) +/* 264C0 8004B0C0 24430500 */ addiu $v1, $v0, 0x500 +/* 264C4 8004B0C4 0262102B */ sltu $v0, $s3, $v0 +/* 264C8 8004B0C8 14400006 */ bnez $v0, .L8004B0E4 +/* 264CC 8004B0CC 0065102A */ slt $v0, $v1, $a1 +/* 264D0 8004B0D0 1040001F */ beqz $v0, .L8004B150 +/* 264D4 8004B0D4 0220802D */ daddu $s0, $s1, $zero +/* 264D8 8004B0D8 8E310000 */ lw $s1, ($s1) +/* 264DC 8004B0DC 1620FFF7 */ bnez $s1, .L8004B0BC +/* 264E0 8004B0E0 00000000 */ nop +.L8004B0E4: +/* 264E4 8004B0E4 3C12800A */ lui $s2, 0x800a +/* 264E8 8004B0E8 26523BD0 */ addiu $s2, $s2, 0x3bd0 +/* 264EC 8004B0EC 8E510008 */ lw $s1, 8($s2) +/* 264F0 8004B0F0 16200006 */ bnez $s1, .L8004B10C +/* 264F4 8004B0F4 0220202D */ daddu $a0, $s1, $zero +/* 264F8 8004B0F8 8E440004 */ lw $a0, 4($s2) +/* 264FC 8004B0FC 0C0187A4 */ jal osVirtualToPhysical +/* 26500 8004B100 00000000 */ nop +/* 26504 8004B104 08012C82 */ j .L8004B208 +/* 26508 8004B108 00000000 */ nop +.L8004B10C: +/* 2650C 8004B10C 8E220000 */ lw $v0, ($s1) +/* 26510 8004B110 0C012D03 */ jal alUnlink +/* 26514 8004B114 AE420008 */ sw $v0, 8($s2) +/* 26518 8004B118 12000005 */ beqz $s0, .L8004B130 +/* 2651C 8004B11C 0220202D */ daddu $a0, $s1, $zero +/* 26520 8004B120 0C012CFB */ jal alLink +/* 26524 8004B124 0200282D */ daddu $a1, $s0, $zero +/* 26528 8004B128 08012C61 */ j .L8004B184 +/* 2652C 8004B12C 00000000 */ nop +.L8004B130: +/* 26530 8004B130 8E450004 */ lw $a1, 4($s2) +/* 26534 8004B134 10A00010 */ beqz $a1, .L8004B178 +/* 26538 8004B138 00A0802D */ daddu $s0, $a1, $zero +/* 2653C 8004B13C AE510004 */ sw $s1, 4($s2) +/* 26540 8004B140 AE300000 */ sw $s0, ($s1) +/* 26544 8004B144 AE200004 */ sw $zero, 4($s1) +/* 26548 8004B148 08012C61 */ j .L8004B184 +/* 2654C 8004B14C AE110004 */ sw $s1, 4($s0) +.L8004B150: +/* 26550 8004B150 8E240010 */ lw $a0, 0x10($s1) +/* 26554 8004B154 8E220008 */ lw $v0, 8($s1) +/* 26558 8004B158 3C038008 */ lui $v1, 0x8008 +/* 2655C 8004B15C 8C63817C */ lw $v1, -0x7e84($v1) +/* 26560 8004B160 00932021 */ addu $a0, $a0, $s3 +/* 26564 8004B164 00822023 */ subu $a0, $a0, $v0 +/* 26568 8004B168 0C0187A4 */ jal osVirtualToPhysical +/* 2656C 8004B16C AE23000C */ sw $v1, 0xc($s1) +/* 26570 8004B170 08012C82 */ j .L8004B208 +/* 26574 8004B174 00000000 */ nop +.L8004B178: +/* 26578 8004B178 AE510004 */ sw $s1, 4($s2) +/* 2657C 8004B17C AE200000 */ sw $zero, ($s1) +/* 26580 8004B180 AE200004 */ sw $zero, 4($s1) +.L8004B184: +/* 26584 8004B184 3C048008 */ lui $a0, 0x8008 +/* 26588 8004B188 24848178 */ addiu $a0, $a0, -0x7e88 +/* 2658C 8004B18C 32700001 */ andi $s0, $s3, 1 +/* 26590 8004B190 02709823 */ subu $s3, $s3, $s0 +/* 26594 8004B194 3C02800A */ lui $v0, 0x800a +/* 26598 8004B198 24423720 */ addiu $v0, $v0, 0x3720 +/* 2659C 8004B19C 8C830000 */ lw $v1, ($a0) +/* 265A0 8004B1A0 8E320010 */ lw $s2, 0x10($s1) +/* 265A4 8004B1A4 0000302D */ daddu $a2, $zero, $zero +/* 265A8 8004B1A8 AE330008 */ sw $s3, 8($s1) +/* 265AC 8004B1AC 00032840 */ sll $a1, $v1, 1 +/* 265B0 8004B1B0 00A32821 */ addu $a1, $a1, $v1 +/* 265B4 8004B1B4 000528C0 */ sll $a1, $a1, 3 +/* 265B8 8004B1B8 00A22821 */ addu $a1, $a1, $v0 +/* 265BC 8004B1BC 3C028008 */ lui $v0, 0x8008 +/* 265C0 8004B1C0 8C42817C */ lw $v0, -0x7e84($v0) +/* 265C4 8004B1C4 24630001 */ addiu $v1, $v1, 1 +/* 265C8 8004B1C8 AE22000C */ sw $v0, 0xc($s1) +/* 265CC 8004B1CC AC830000 */ sw $v1, ($a0) +/* 265D0 8004B1D0 A0A00002 */ sb $zero, 2($a1) +/* 265D4 8004B1D4 3C04800A */ lui $a0, %hi(carthandle) +/* 265D8 8004B1D8 8C84A638 */ lw $a0, %lo(carthandle)($a0) +/* 265DC 8004B1DC 3C02800A */ lui $v0, 0x800a +/* 265E0 8004B1E0 24423640 */ addiu $v0, $v0, 0x3640 +/* 265E4 8004B1E4 ACA20004 */ sw $v0, 4($a1) +/* 265E8 8004B1E8 24020500 */ addiu $v0, $zero, 0x500 +/* 265EC 8004B1EC ACB20008 */ sw $s2, 8($a1) +/* 265F0 8004B1F0 ACB3000C */ sw $s3, 0xc($a1) +/* 265F4 8004B1F4 0C018388 */ jal osEPiStartDma +/* 265F8 8004B1F8 ACA20010 */ sw $v0, 0x10($a1) +/* 265FC 8004B1FC 0C0187A4 */ jal osVirtualToPhysical +/* 26600 8004B200 0240202D */ daddu $a0, $s2, $zero +/* 26604 8004B204 00501021 */ addu $v0, $v0, $s0 +.L8004B208: +/* 26608 8004B208 8FBF0020 */ lw $ra, 0x20($sp) +/* 2660C 8004B20C 8FB3001C */ lw $s3, 0x1c($sp) +/* 26610 8004B210 8FB20018 */ lw $s2, 0x18($sp) +/* 26614 8004B214 8FB10014 */ lw $s1, 0x14($sp) +/* 26618 8004B218 8FB00010 */ lw $s0, 0x10($sp) +/* 2661C 8004B21C 03E00008 */ jr $ra +/* 26620 8004B220 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s b/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s index 6b13c253c7..40c88cf264 100644 --- a/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s +++ b/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s @@ -14,8 +14,8 @@ glabel nuAuDmaNew /* 26648 8004B248 AC600004 */ sw $zero, 4($v1) /* 2664C 8004B24C A0620000 */ sb $v0, ($v1) .L8004B250: -/* 26650 8004B250 3C028005 */ lui $v0, 0x8005 -/* 26654 8004B254 2442B074 */ addiu $v0, $v0, -0x4f8c +/* 26650 8004B250 3C028005 */ lui $v0, %hi(nuAuDmaCallBack) +/* 26654 8004B254 2442B074 */ addiu $v0, $v0, %lo(nuAuDmaCallBack) /* 26658 8004B258 3C018008 */ lui $at, 0x8008 /* 2665C 8004B25C AC208178 */ sw $zero, -0x7e88($at) /* 26660 8004B260 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_316d90/func_802AE000.s b/asm/nonmatchings/code_316d90/func_802AE000.s index 0fe30848fd..862f79f4cf 100644 --- a/asm/nonmatchings/code_316d90/func_802AE000.s +++ b/asm/nonmatchings/code_316d90/func_802AE000.s @@ -18,8 +18,8 @@ glabel func_802AE000 /* 316DC4 802AE034 AFB20020 */ sw $s2, 0x20($sp) /* 316DC8 802AE038 0200902D */ daddu $s2, $s0, $zero /* 316DCC 802AE03C AFB5002C */ sw $s5, 0x2c($sp) -/* 316DD0 802AE040 3C158006 */ lui $s5, 0x8006 -/* 316DD4 802AE044 26B50DC0 */ addiu $s5, $s5, 0xdc0 +/* 316DD0 802AE040 3C158006 */ lui $s5, %hi(osEPiReadIo) +/* 316DD4 802AE044 26B50DC0 */ addiu $s5, $s5, %lo(osEPiReadIo) /* 316DD8 802AE048 AFBF003C */ sw $ra, 0x3c($sp) /* 316DDC 802AE04C AFBE0038 */ sw $fp, 0x38($sp) /* 316DE0 802AE050 AFB70034 */ sw $s7, 0x34($sp) diff --git a/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s b/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s index 286b2fbd8d..2a1d60f475 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s @@ -27,8 +27,8 @@ glabel crash_create_monitor /* 7D08 8002C908 AE0209CC */ sw $v0, 0x9cc($s0) /* 7D0C 8002C90C 0200202D */ daddu $a0, $s0, $zero /* 7D10 8002C910 24050002 */ addiu $a1, $zero, 2 -/* 7D14 8002C914 3C068003 */ lui $a2, 0x8003 -/* 7D18 8002C918 24C6C81C */ addiu $a2, $a2, -0x37e4 +/* 7D14 8002C914 3C068003 */ lui $a2, %hi(crash_monitor_thread) +/* 7D18 8002C918 24C6C81C */ addiu $a2, $a2, %lo(crash_monitor_thread) /* 7D1C 8002C91C 24020080 */ addiu $v0, $zero, 0x80 /* 7D20 8002C920 0000382D */ daddu $a3, $zero, $zero /* 7D24 8002C924 AFB10010 */ sw $s1, 0x10($sp) diff --git a/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s b/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s index 7318f983f9..bcf02b1457 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s +++ b/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s @@ -88,15 +88,15 @@ glabel render_player_model /* 7A74C 800E129C 00021023 */ negu $v0, $v0 /* 7A750 800E12A0 AE220004 */ sw $v0, 4($s1) /* 7A754 800E12A4 820200BE */ lb $v0, 0xbe($s0) -/* 7A758 800E12A8 3C04800E */ lui $a0, 0x800e -/* 7A75C 800E12AC 24841704 */ addiu $a0, $a0, 0x1704 +/* 7A758 800E12A8 3C04800E */ lui $a0, %hi(appendGfx_player_spin) +/* 7A75C 800E12AC 24841704 */ addiu $a0, $a0, %lo(appendGfx_player_spin) /* 7A760 800E12B0 AE220000 */ sw $v0, ($s1) /* 7A764 800E12B4 8E020000 */ lw $v0, ($s0) /* 7A768 800E12B8 00431024 */ and $v0, $v0, $v1 /* 7A76C 800E12BC 54400004 */ bnel $v0, $zero, .L800E12D0 /* 7A770 800E12C0 AE24000C */ sw $a0, 0xc($s1) -/* 7A774 800E12C4 3C04800E */ lui $a0, 0x800e -/* 7A778 800E12C8 248412F4 */ addiu $a0, $a0, 0x12f4 +/* 7A774 800E12C4 3C04800E */ lui $a0, %hi(appendGfx_player) +/* 7A778 800E12C8 248412F4 */ addiu $a0, $a0, %lo(appendGfx_player) /* 7A77C 800E12CC AE24000C */ sw $a0, 0xc($s1) .L800E12D0: /* 7A780 800E12D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/code_7e0e80/MakeShop.s b/asm/nonmatchings/code_7e0e80/MakeShop.s index ae07b3fa65..a65ddabbd8 100644 --- a/asm/nonmatchings/code_7e0e80/MakeShop.s +++ b/asm/nonmatchings/code_7e0e80/MakeShop.s @@ -175,8 +175,8 @@ glabel MakeShop /* 7E296C 80281AEC 8E840020 */ lw $a0, 0x20($s4) /* 7E2970 80281AF0 0C05128B */ jal clear_icon_flags /* 7E2974 80281AF4 34058000 */ ori $a1, $zero, 0x8000 -/* 7E2978 80281AF8 3C058028 */ lui $a1, 0x8028 -/* 7E297C 80281AFC 24A51524 */ addiu $a1, $a1, 0x1524 +/* 7E2978 80281AF8 3C058028 */ lui $a1, %hi(draw_shop_items) +/* 7E297C 80281AFC 24A51524 */ addiu $a1, $a1, %lo(draw_shop_items) /* 7E2980 80281B00 0C048C8F */ jal bind_dynamic_entity_7 /* 7E2984 80281B04 0000202D */ daddu $a0, $zero, $zero /* 7E2988 80281B08 0C048D8F */ jal get_dynamic_entity diff --git a/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s b/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s index 11d372c2f3..c8fa3d5775 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s +++ b/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s @@ -22,8 +22,8 @@ glabel func_8002D160 /* 85A4 8002D1A4 AFB20020 */ sw $s2, 0x20($sp) /* 85A8 8002D1A8 0200902D */ daddu $s2, $s0, $zero /* 85AC 8002D1AC AFB40028 */ sw $s4, 0x28($sp) -/* 85B0 8002D1B0 3C148006 */ lui $s4, 0x8006 -/* 85B4 8002D1B4 26940DC0 */ addiu $s4, $s4, 0xdc0 +/* 85B0 8002D1B0 3C148006 */ lui $s4, %hi(osEPiReadIo) +/* 85B4 8002D1B4 26940DC0 */ addiu $s4, $s4, %lo(osEPiReadIo) /* 85B8 8002D1B8 AFBF003C */ sw $ra, 0x3c($sp) /* 85BC 8002D1BC AFBE0038 */ sw $fp, 0x38($sp) /* 85C0 8002D1C0 AFB70034 */ sw $s7, 0x34($sp) @@ -98,8 +98,8 @@ glabel func_8002D160 /* 86C0 8002D2C0 27A60014 */ addiu $a2, $sp, 0x14 /* 86C4 8002D2C4 3C04800A */ lui $a0, %hi(carthandle) /* 86C8 8002D2C8 8C84A638 */ lw $a0, %lo(carthandle)($a0) -/* 86CC 8002D2CC 3C148006 */ lui $s4, 0x8006 -/* 86D0 8002D2D0 26940DC0 */ addiu $s4, $s4, 0xdc0 +/* 86CC 8002D2CC 3C148006 */ lui $s4, %hi(osEPiReadIo) +/* 86D0 8002D2D0 26940DC0 */ addiu $s4, $s4, %lo(osEPiReadIo) /* 86D4 8002D2D4 0280F809 */ jalr $s4 /* 86D8 8002D2D8 0200902D */ daddu $s2, $s0, $zero /* 86DC 8002D2DC 3C110031 */ lui $s1, 0x31 diff --git a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s index fab4d2d726..451f89a870 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s +++ b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s @@ -50,8 +50,8 @@ glabel nuSiMgrInit /* 82DC 8002CEDC 2610E710 */ addiu $s0, $s0, -0x18f0 /* 82E0 8002CEE0 0200202D */ daddu $a0, $s0, $zero /* 82E4 8002CEE4 24050006 */ addiu $a1, $zero, 6 -/* 82E8 8002CEE8 3C068003 */ lui $a2, 0x8003 -/* 82EC 8002CEEC 24C6CFD0 */ addiu $a2, $a2, -0x3030 +/* 82E8 8002CEE8 3C068003 */ lui $a2, %hi(nuSiMgrThread) +/* 82EC 8002CEEC 24C6CFD0 */ addiu $a2, $a2, %lo(nuSiMgrThread) /* 82F0 8002CEF0 3C02800A */ lui $v0, 0x800a /* 82F4 8002CEF4 244208C0 */ addiu $v0, $v0, 0x8c0 /* 82F8 8002CEF8 AFA20010 */ sw $v0, 0x10($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s index f08a291e20..63998ff469 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s @@ -316,8 +316,8 @@ glabel func_800F1A10 /* 8B36C 800F1EBC AFA20010 */ sw $v0, 0x10($sp) /* 8B370 800F1EC0 24020015 */ addiu $v0, $zero, 0x15 /* 8B374 800F1EC4 AFA20014 */ sw $v0, 0x14($sp) -/* 8B378 800F1EC8 3C02800F */ lui $v0, 0x800f -/* 8B37C 800F1ECC 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B378 800F1EC8 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B37C 800F1ECC 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B380 800F1ED0 AFA20018 */ sw $v0, 0x18($sp) /* 8B384 800F1ED4 2402000E */ addiu $v0, $zero, 0xe /* 8B388 800F1ED8 AFA0001C */ sw $zero, 0x1c($sp) @@ -378,8 +378,8 @@ glabel func_800F1A10 /* 8B464 800F1FB4 AFA20010 */ sw $v0, 0x10($sp) /* 8B468 800F1FB8 24020015 */ addiu $v0, $zero, 0x15 /* 8B46C 800F1FBC AFA20014 */ sw $v0, 0x14($sp) -/* 8B470 800F1FC0 3C02800F */ lui $v0, 0x800f -/* 8B474 800F1FC4 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B470 800F1FC0 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B474 800F1FC4 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B478 800F1FC8 AFA20018 */ sw $v0, 0x18($sp) /* 8B47C 800F1FCC 2402000E */ addiu $v0, $zero, 0xe /* 8B480 800F1FD0 AFA0001C */ sw $zero, 0x1c($sp) @@ -440,8 +440,8 @@ glabel func_800F1A10 /* 8B55C 800F20AC AFA20010 */ sw $v0, 0x10($sp) /* 8B560 800F20B0 24020015 */ addiu $v0, $zero, 0x15 /* 8B564 800F20B4 AFA20014 */ sw $v0, 0x14($sp) -/* 8B568 800F20B8 3C02800F */ lui $v0, 0x800f -/* 8B56C 800F20BC 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B568 800F20B8 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B56C 800F20BC 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B570 800F20C0 AFA20018 */ sw $v0, 0x18($sp) /* 8B574 800F20C4 2402000E */ addiu $v0, $zero, 0xe /* 8B578 800F20C8 AFA0001C */ sw $zero, 0x1c($sp) @@ -480,8 +480,8 @@ glabel func_800F1A10 /* 8B5FC 800F214C AFA20010 */ sw $v0, 0x10($sp) /* 8B600 800F2150 24020015 */ addiu $v0, $zero, 0x15 /* 8B604 800F2154 AFA20014 */ sw $v0, 0x14($sp) -/* 8B608 800F2158 3C02800F */ lui $v0, 0x800f -/* 8B60C 800F215C 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B608 800F2158 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B60C 800F215C 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B610 800F2160 AFA20018 */ sw $v0, 0x18($sp) /* 8B614 800F2164 2402000E */ addiu $v0, $zero, 0xe /* 8B618 800F2168 AFA0001C */ sw $zero, 0x1c($sp) @@ -520,8 +520,8 @@ glabel func_800F1A10 /* 8B69C 800F21EC AFA20010 */ sw $v0, 0x10($sp) /* 8B6A0 800F21F0 24020015 */ addiu $v0, $zero, 0x15 /* 8B6A4 800F21F4 AFA20014 */ sw $v0, 0x14($sp) -/* 8B6A8 800F21F8 3C02800F */ lui $v0, 0x800f -/* 8B6AC 800F21FC 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B6A8 800F21F8 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B6AC 800F21FC 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B6B0 800F2200 AFA20018 */ sw $v0, 0x18($sp) /* 8B6B4 800F2204 2402000E */ addiu $v0, $zero, 0xe /* 8B6B8 800F2208 AFA0001C */ sw $zero, 0x1c($sp) @@ -560,8 +560,8 @@ glabel func_800F1A10 /* 8B73C 800F228C AFA20010 */ sw $v0, 0x10($sp) /* 8B740 800F2290 24020015 */ addiu $v0, $zero, 0x15 /* 8B744 800F2294 AFA20014 */ sw $v0, 0x14($sp) -/* 8B748 800F2298 3C02800F */ lui $v0, 0x800f -/* 8B74C 800F229C 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B748 800F2298 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B74C 800F229C 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B750 800F22A0 AFA20018 */ sw $v0, 0x18($sp) /* 8B754 800F22A4 2402000E */ addiu $v0, $zero, 0xe /* 8B758 800F22A8 AFA0001C */ sw $zero, 0x1c($sp) @@ -600,8 +600,8 @@ glabel func_800F1A10 /* 8B7DC 800F232C AFA20010 */ sw $v0, 0x10($sp) /* 8B7E0 800F2330 24020015 */ addiu $v0, $zero, 0x15 /* 8B7E4 800F2334 AFA20014 */ sw $v0, 0x14($sp) -/* 8B7E8 800F2338 3C02800F */ lui $v0, 0x800f -/* 8B7EC 800F233C 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B7E8 800F2338 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B7EC 800F233C 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B7F0 800F2340 AFA20018 */ sw $v0, 0x18($sp) /* 8B7F4 800F2344 2402000E */ addiu $v0, $zero, 0xe /* 8B7F8 800F2348 AFA0001C */ sw $zero, 0x1c($sp) @@ -641,8 +641,8 @@ glabel func_800F1A10 /* 8B87C 800F23CC AFA20010 */ sw $v0, 0x10($sp) /* 8B880 800F23D0 24020015 */ addiu $v0, $zero, 0x15 /* 8B884 800F23D4 AFA20014 */ sw $v0, 0x14($sp) -/* 8B888 800F23D8 3C02800F */ lui $v0, 0x800f -/* 8B88C 800F23DC 24424648 */ addiu $v0, $v0, 0x4648 +/* 8B888 800F23D8 3C02800F */ lui $v0, %hi(draw_submenu_title) +/* 8B88C 800F23DC 24424648 */ addiu $v0, $v0, %lo(draw_submenu_title) /* 8B890 800F23E0 AFA20018 */ sw $v0, 0x18($sp) /* 8B894 800F23E4 2402000E */ addiu $v0, $zero, 0xe /* 8B898 800F23E8 AFA0001C */ sw $zero, 0x1c($sp) diff --git a/asm/nonmatchings/code_ED510/EnableGroup.s b/asm/nonmatchings/code_ED510/EnableGroup.s index cee068d5b9..931b234703 100644 --- a/asm/nonmatchings/code_ED510/EnableGroup.s +++ b/asm/nonmatchings/code_ED510/EnableGroup.s @@ -17,8 +17,8 @@ glabel EnableGroup /* EE578 802C9BC8 2402FFFF */ addiu $v0, $zero, -1 /* EE57C 802C9BCC 16020007 */ bne $s0, $v0, .L802C9BEC /* EE580 802C9BD0 00000000 */ nop -/* EE584 802C9BD4 3C04802D */ lui $a0, 0x802d -/* EE588 802C9BD8 24849288 */ addiu $a0, $a0, -0x6d78 +/* EE584 802C9BD4 3C04802D */ lui $a0, %hi(EnableModel) +/* EE588 802C9BD8 24849288 */ addiu $a0, $a0, %lo(EnableModel) /* EE58C 802C9BDC 0C0B2568 */ jal func_802C95A0 /* EE590 802C9BE0 0240282D */ daddu $a1, $s2, $zero /* EE594 802C9BE4 080B2716 */ j .L802C9C58 diff --git a/asm/nonmatchings/code_ED510/RotateGroup.s b/asm/nonmatchings/code_ED510/RotateGroup.s index d60491d691..48266e33cb 100644 --- a/asm/nonmatchings/code_ED510/RotateGroup.s +++ b/asm/nonmatchings/code_ED510/RotateGroup.s @@ -21,8 +21,8 @@ glabel RotateGroup /* EE2C8 802C9918 2402FFFF */ addiu $v0, $zero, -1 /* EE2CC 802C991C 16420007 */ bne $s2, $v0, .L802C993C /* EE2D0 802C9920 26100004 */ addiu $s0, $s0, 4 -/* EE2D4 802C9924 3C04802D */ lui $a0, 0x802d -/* EE2D8 802C9928 24848C64 */ addiu $a0, $a0, -0x739c +/* EE2D4 802C9924 3C04802D */ lui $a0, %hi(RotateModel) +/* EE2D8 802C9928 24848C64 */ addiu $a0, $a0, %lo(RotateModel) /* EE2DC 802C992C 0C0B2568 */ jal func_802C95A0 /* EE2E0 802C9930 0220282D */ daddu $a1, $s1, $zero /* EE2E4 802C9934 080B267D */ j .L802C99F4 diff --git a/asm/nonmatchings/code_ED510/ScaleGroup.s b/asm/nonmatchings/code_ED510/ScaleGroup.s index 8328eec8e9..8b443c44af 100644 --- a/asm/nonmatchings/code_ED510/ScaleGroup.s +++ b/asm/nonmatchings/code_ED510/ScaleGroup.s @@ -20,8 +20,8 @@ glabel ScaleGroup /* EE408 802C9A58 2402FFFF */ addiu $v0, $zero, -1 /* EE40C 802C9A5C 16220007 */ bne $s1, $v0, .L802C9A7C /* EE410 802C9A60 26100004 */ addiu $s0, $s0, 4 -/* EE414 802C9A64 3C04802D */ lui $a0, 0x802d -/* EE418 802C9A68 24848D88 */ addiu $a0, $a0, -0x7278 +/* EE414 802C9A64 3C04802D */ lui $a0, %hi(ScaleModel) +/* EE418 802C9A68 24848D88 */ addiu $a0, $a0, %lo(ScaleModel) /* EE41C 802C9A6C 0C0B2568 */ jal func_802C95A0 /* EE420 802C9A70 0240282D */ daddu $a1, $s2, $zero /* EE424 802C9A74 080B26C7 */ j .L802C9B1C diff --git a/asm/nonmatchings/code_ED510/TranslateGroup.s b/asm/nonmatchings/code_ED510/TranslateGroup.s index 05cc11c740..5f5e450f10 100644 --- a/asm/nonmatchings/code_ED510/TranslateGroup.s +++ b/asm/nonmatchings/code_ED510/TranslateGroup.s @@ -20,8 +20,8 @@ glabel TranslateGroup /* EE1A0 802C97F0 2402FFFF */ addiu $v0, $zero, -1 /* EE1A4 802C97F4 16220007 */ bne $s1, $v0, .L802C9814 /* EE1A8 802C97F8 26100004 */ addiu $s0, $s0, 4 -/* EE1AC 802C97FC 3C04802D */ lui $a0, 0x802d -/* EE1B0 802C9800 24848B60 */ addiu $a0, $a0, -0x74a0 +/* EE1AC 802C97FC 3C04802D */ lui $a0, %hi(TranslateModel) +/* EE1B0 802C9800 24848B60 */ addiu $a0, $a0, %lo(TranslateModel) /* EE1B4 802C9804 0C0B2568 */ jal func_802C95A0 /* EE1B8 802C9808 0240282D */ daddu $a1, $s2, $zero /* EE1BC 802C980C 080B262D */ j .L802C98B4 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s b/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s index 8ff96dd1d5..de2b2b337d 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/_set_game_mode.s @@ -28,34 +28,34 @@ glabel _set_game_mode /* A93FC 80112CFC AE00000C */ sw $zero, 0xc($s0) /* A9400 80112D00 14600004 */ bnez $v1, .L80112D14 /* A9404 80112D04 AE020010 */ sw $v0, 0x10($s0) -/* A9408 80112D08 3C028011 */ lui $v0, 0x8011 -/* A940C 80112D0C 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9408 80112D08 3C028011 */ lui $v0, %hi(NOP_state) +/* A940C 80112D0C 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9410 80112D10 AE020004 */ sw $v0, 4($s0) .L80112D14: /* A9414 80112D14 8E020008 */ lw $v0, 8($s0) /* A9418 80112D18 14400004 */ bnez $v0, .L80112D2C /* A941C 80112D1C 00000000 */ nop -/* A9420 80112D20 3C028011 */ lui $v0, 0x8011 -/* A9424 80112D24 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9420 80112D20 3C028011 */ lui $v0, %hi(NOP_state) +/* A9424 80112D24 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9428 80112D28 AE020008 */ sw $v0, 8($s0) .L80112D2C: /* A942C 80112D2C 8E02000C */ lw $v0, 0xc($s0) /* A9430 80112D30 14400004 */ bnez $v0, .L80112D44 /* A9434 80112D34 00000000 */ nop -/* A9438 80112D38 3C028011 */ lui $v0, 0x8011 -/* A943C 80112D3C 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9438 80112D38 3C028011 */ lui $v0, %hi(NOP_state) +/* A943C 80112D3C 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9440 80112D40 AE02000C */ sw $v0, 0xc($s0) .L80112D44: /* A9444 80112D44 8E020010 */ lw $v0, 0x10($s0) /* A9448 80112D48 14400004 */ bnez $v0, .L80112D5C /* A944C 80112D4C 00000000 */ nop -/* A9450 80112D50 3C028011 */ lui $v0, 0x8011 -/* A9454 80112D54 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9450 80112D50 3C028011 */ lui $v0, %hi(NOP_state) +/* A9454 80112D54 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9458 80112D58 AE020010 */ sw $v0, 0x10($s0) .L80112D5C: /* A945C 80112D5C 8E030004 */ lw $v1, 4($s0) -/* A9460 80112D60 3C028011 */ lui $v0, 0x8011 -/* A9464 80112D64 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9460 80112D60 3C028011 */ lui $v0, %hi(NOP_state) +/* A9464 80112D64 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9468 80112D68 0060F809 */ jalr $v1 /* A946C 80112D6C AE020014 */ sw $v0, 0x14($s0) /* A9470 80112D70 0200102D */ daddu $v0, $s0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s index 2e249965da..9d22d36834 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112BBC.s @@ -34,34 +34,34 @@ glabel func_80112BBC /* A9320 80112C20 AE00000C */ sw $zero, 0xc($s0) /* A9324 80112C24 14600004 */ bnez $v1, .L80112C38 /* A9328 80112C28 AE020010 */ sw $v0, 0x10($s0) -/* A932C 80112C2C 3C028011 */ lui $v0, 0x8011 -/* A9330 80112C30 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A932C 80112C2C 3C028011 */ lui $v0, %hi(NOP_state) +/* A9330 80112C30 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9334 80112C34 AE020004 */ sw $v0, 4($s0) .L80112C38: /* A9338 80112C38 8E020008 */ lw $v0, 8($s0) /* A933C 80112C3C 14400004 */ bnez $v0, .L80112C50 /* A9340 80112C40 00000000 */ nop -/* A9344 80112C44 3C028011 */ lui $v0, 0x8011 -/* A9348 80112C48 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9344 80112C44 3C028011 */ lui $v0, %hi(NOP_state) +/* A9348 80112C48 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A934C 80112C4C AE020008 */ sw $v0, 8($s0) .L80112C50: /* A9350 80112C50 8E02000C */ lw $v0, 0xc($s0) /* A9354 80112C54 14400004 */ bnez $v0, .L80112C68 /* A9358 80112C58 00000000 */ nop -/* A935C 80112C5C 3C028011 */ lui $v0, 0x8011 -/* A9360 80112C60 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A935C 80112C5C 3C028011 */ lui $v0, %hi(NOP_state) +/* A9360 80112C60 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A9364 80112C64 AE02000C */ sw $v0, 0xc($s0) .L80112C68: /* A9368 80112C68 8E020010 */ lw $v0, 0x10($s0) /* A936C 80112C6C 14400004 */ bnez $v0, .L80112C80 /* A9370 80112C70 00000000 */ nop -/* A9374 80112C74 3C028011 */ lui $v0, 0x8011 -/* A9378 80112C78 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9374 80112C74 3C028011 */ lui $v0, %hi(NOP_state) +/* A9378 80112C78 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A937C 80112C7C AE020010 */ sw $v0, 0x10($s0) .L80112C80: /* A9380 80112C80 8E030004 */ lw $v1, 4($s0) -/* A9384 80112C84 3C028011 */ lui $v0, 0x8011 -/* A9388 80112C88 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A9384 80112C84 3C028011 */ lui $v0, %hi(NOP_state) +/* A9388 80112C88 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A938C 80112C8C 0060F809 */ jalr $v1 /* A9390 80112C90 AE020014 */ sw $v0, 0x14($s0) /* A9394 80112C94 0200102D */ daddu $v0, $s0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s index 84b6992e7d..50f2f96554 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s @@ -19,8 +19,8 @@ glabel func_80112D84 /* A94B4 80112DB4 34420020 */ ori $v0, $v0, 0x20 /* A94B8 80112DB8 14A00004 */ bnez $a1, .L80112DCC /* A94BC 80112DBC A4620000 */ sh $v0, ($v1) -/* A94C0 80112DC0 3C028011 */ lui $v0, 0x8011 -/* A94C4 80112DC4 24422B90 */ addiu $v0, $v0, 0x2b90 +/* A94C0 80112DC0 3C028011 */ lui $v0, %hi(NOP_state) +/* A94C4 80112DC4 24422B90 */ addiu $v0, $v0, %lo(NOP_state) /* A94C8 80112DC8 AC620014 */ sw $v0, 0x14($v1) .L80112DCC: /* A94CC 80112DCC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s index 5923f45666..865dc52cef 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s @@ -1007,13 +1007,13 @@ glabel render_models /* AE200 80117B00 24020005 */ addiu $v0, $zero, 5 /* AE204 80117B04 14620005 */ bne $v1, $v0, .L80117B1C /* AE208 80117B08 00000000 */ nop -/* AE20C 80117B0C 3C028011 */ lui $v0, 0x8011 -/* AE210 80117B10 24427C94 */ addiu $v0, $v0, 0x7c94 +/* AE20C 80117B0C 3C028011 */ lui $v0, %hi(appendGfx_model_group) +/* AE210 80117B10 24427C94 */ addiu $v0, $v0, %lo(appendGfx_model_group) /* AE214 80117B14 08045ECA */ j .L80117B28 /* AE218 80117B18 AE22000C */ sw $v0, 0xc($s1) .L80117B1C: -/* AE21C 80117B1C 3C028011 */ lui $v0, 0x8011 -/* AE220 80117B20 24423090 */ addiu $v0, $v0, 0x3090 +/* AE21C 80117B1C 3C028011 */ lui $v0, %hi(appendGfx_model) +/* AE220 80117B20 24423090 */ addiu $v0, $v0, %lo(appendGfx_model) /* AE224 80117B24 AE22000C */ sw $v0, 0xc($s1) .L80117B28: /* AE228 80117B28 00041023 */ negu $v0, $a0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s index d94006a5db..c9b911a237 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_3.s @@ -45,14 +45,14 @@ glabel bind_dynamic_entity_3 /* B98E0 801231E0 AC820000 */ sw $v0, ($a0) /* B98E4 801231E4 16200004 */ bnez $s1, .L801231F8 /* B98E8 801231E8 AC910004 */ sw $s1, 4($a0) -/* B98EC 801231EC 3C028012 */ lui $v0, 0x8012 -/* B98F0 801231F0 244230B0 */ addiu $v0, $v0, 0x30b0 +/* B98EC 801231EC 3C028012 */ lui $v0, %hi(stub_dynamic_entity_delegate) +/* B98F0 801231F0 244230B0 */ addiu $v0, $v0, %lo(stub_dynamic_entity_delegate) /* B98F4 801231F4 AC820004 */ sw $v0, 4($a0) .L801231F8: /* B98F8 801231F8 16400004 */ bnez $s2, .L8012320C /* B98FC 801231FC AC920008 */ sw $s2, 8($a0) -/* B9900 80123200 3C028012 */ lui $v0, 0x8012 -/* B9904 80123204 244230B0 */ addiu $v0, $v0, 0x30b0 +/* B9900 80123200 3C028012 */ lui $v0, %hi(stub_dynamic_entity_delegate) +/* B9904 80123204 244230B0 */ addiu $v0, $v0, %lo(stub_dynamic_entity_delegate) /* B9908 80123208 AC820008 */ sw $v0, 8($a0) .L8012320C: /* B990C 8012320C 3C028007 */ lui $v0, %hi(gGameStatusPtr) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s index 2f2f1c7eba..e99c7361d6 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_7.s @@ -45,14 +45,14 @@ glabel bind_dynamic_entity_7 /* B99C4 801232C4 AC820000 */ sw $v0, ($a0) /* B99C8 801232C8 16200004 */ bnez $s1, .L801232DC /* B99CC 801232CC AC910004 */ sw $s1, 4($a0) -/* B99D0 801232D0 3C028012 */ lui $v0, 0x8012 -/* B99D4 801232D4 244230B0 */ addiu $v0, $v0, 0x30b0 +/* B99D0 801232D0 3C028012 */ lui $v0, %hi(stub_dynamic_entity_delegate) +/* B99D4 801232D4 244230B0 */ addiu $v0, $v0, %lo(stub_dynamic_entity_delegate) /* B99D8 801232D8 AC820004 */ sw $v0, 4($a0) .L801232DC: /* B99DC 801232DC 16400004 */ bnez $s2, .L801232F0 /* B99E0 801232E0 AC920008 */ sw $s2, 8($a0) -/* B99E4 801232E4 3C028012 */ lui $v0, 0x8012 -/* B99E8 801232E8 244230B0 */ addiu $v0, $v0, 0x30b0 +/* B99E4 801232E4 3C028012 */ lui $v0, %hi(stub_dynamic_entity_delegate) +/* B99E8 801232E8 244230B0 */ addiu $v0, $v0, %lo(stub_dynamic_entity_delegate) /* B99EC 801232EC AC820008 */ sw $v0, 8($a0) .L801232F0: /* B99F0 801232F0 3C028007 */ lui $v0, %hi(gGameStatusPtr) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s index 5199bf3700..b22ad2e002 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/bind_dynamic_entity_B.s @@ -45,14 +45,14 @@ glabel bind_dynamic_entity_B /* B9AA8 801233A8 AC820000 */ sw $v0, ($a0) /* B9AAC 801233AC 16200004 */ bnez $s1, .L801233C0 /* B9AB0 801233B0 AC910004 */ sw $s1, 4($a0) -/* B9AB4 801233B4 3C028012 */ lui $v0, 0x8012 -/* B9AB8 801233B8 244230B0 */ addiu $v0, $v0, 0x30b0 +/* B9AB4 801233B4 3C028012 */ lui $v0, %hi(stub_dynamic_entity_delegate) +/* B9AB8 801233B8 244230B0 */ addiu $v0, $v0, %lo(stub_dynamic_entity_delegate) /* B9ABC 801233BC AC820004 */ sw $v0, 4($a0) .L801233C0: /* B9AC0 801233C0 16400004 */ bnez $s2, .L801233D4 /* B9AC4 801233C4 AC920008 */ sw $s2, 8($a0) -/* B9AC8 801233C8 3C028012 */ lui $v0, 0x8012 -/* B9ACC 801233CC 244230B0 */ addiu $v0, $v0, 0x30b0 +/* B9AC8 801233C8 3C028012 */ lui $v0, %hi(stub_dynamic_entity_delegate) +/* B9ACC 801233CC 244230B0 */ addiu $v0, $v0, %lo(stub_dynamic_entity_delegate) /* B9AD0 801233D0 AC820008 */ sw $v0, 8($a0) .L801233D4: /* B9AD4 801233D4 3C028007 */ lui $v0, %hi(gGameStatusPtr) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s index 93955f56d9..03f5662ac1 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s @@ -46,8 +46,8 @@ glabel clear_item_entity_data /* C7788 80131088 3C018015 */ lui $at, 0x8015 /* C778C 8013108C AC205D88 */ sw $zero, 0x5d88($at) .L80131090: -/* C7790 80131090 3C058013 */ lui $a1, 0x8013 -/* C7794 80131094 24A52C80 */ addiu $a1, $a1, 0x2c80 +/* C7790 80131090 3C058013 */ lui $a1, %hi(draw_item_entities) +/* C7794 80131094 24A52C80 */ addiu $a1, $a1, %lo(draw_item_entities) /* C7798 80131098 0C048C56 */ jal bind_dynamic_entity_3 /* C779C 8013109C 0000202D */ daddu $a0, $zero, $zero /* C77A0 801310A0 3C058013 */ lui $a1, 0x8013 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s index 7e7cc737cd..dda32134a2 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s @@ -51,8 +51,8 @@ glabel draw_item_entities /* C9430 80132D30 2402000D */ addiu $v0, $zero, 0xd .L80132D34: /* C9434 80132D34 AE020000 */ sw $v0, ($s0) -/* C9438 80132D38 3C028013 */ lui $v0, 0x8013 -/* C943C 80132D3C 244221A4 */ addiu $v0, $v0, 0x21a4 +/* C9438 80132D38 3C028013 */ lui $v0, %hi(appendGfx_item_entity) +/* C943C 80132D3C 244221A4 */ addiu $v0, $v0, %lo(appendGfx_item_entity) /* C9440 80132D40 0200202D */ daddu $a0, $s0, $zero /* C9444 80132D44 AE050008 */ sw $a1, 8($s0) /* C9448 80132D48 AE02000C */ sw $v0, 0xc($s0) diff --git a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s index 7f5f46a6d7..ee08772979 100644 --- a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s +++ b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s @@ -60,8 +60,8 @@ glabel create_trigger /* DBF30 80145830 8E22000C */ lw $v0, 0xc($s1) /* DBF34 80145834 14400004 */ bnez $v0, .L80145848 /* DBF38 80145838 ACC2000C */ sw $v0, 0xc($a2) -/* DBF3C 8014583C 3C028014 */ lui $v0, 0x8014 -/* DBF40 80145840 24425670 */ addiu $v0, $v0, 0x5670 +/* DBF3C 8014583C 3C028014 */ lui $v0, %hi(default_trigger_function_handler) +/* DBF40 80145840 24425670 */ addiu $v0, $v0, %lo(default_trigger_function_handler) /* DBF44 80145844 ACC2000C */ sw $v0, 0xc($a2) .L80145848: /* DBF48 80145848 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s index b7609f04ae..b6fe55457a 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s @@ -40,8 +40,8 @@ glabel si_handle_bind_lock /* EB590 802C6BE0 AFA20018 */ sw $v0, 0x18($sp) /* EB594 802C6BE4 27A40010 */ addiu $a0, $sp, 0x10 /* EB598 802C6BE8 A7A20014 */ sh $v0, 0x14($sp) -/* EB59C 802C6BEC 3C02802C */ lui $v0, 0x802c -/* EB5A0 802C6BF0 24426AD0 */ addiu $v0, $v0, 0x6ad0 +/* EB59C 802C6BEC 3C02802C */ lui $v0, %hi(si_standard_trigger_executor) +/* EB5A0 802C6BF0 24426AD0 */ addiu $v0, $v0, %lo(si_standard_trigger_executor) /* EB5A4 802C6BF4 AFB0002C */ sw $s0, 0x2c($sp) /* EB5A8 802C6BF8 AFA2001C */ sw $v0, 0x1c($sp) /* EB5AC 802C6BFC AFB40024 */ sw $s4, 0x24($sp) diff --git a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s index 417cc690ee..19df40a1f6 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s @@ -112,8 +112,8 @@ glabel step_battle /* EE80 80033A80 2484C8E0 */ addiu $a0, $a0, -0x3720 /* EE84 80033A84 3C05001D */ lui $a1, 0x1d /* EE88 80033A88 24A5C310 */ addiu $a1, $a1, -0x3cf0 -/* EE8C 80033A8C 3C068024 */ lui $a2, 0x8024 -/* EE90 80033A90 24C6E000 */ addiu $a2, $a2, -0x2000 +/* EE8C 80033A8C 3C068024 */ lui $a2, %hi(get_dpad_input_radial) +/* EE90 80033A90 24C6E000 */ addiu $a2, $a2, %lo(get_dpad_input_radial) /* EE94 80033A94 0C00A5CF */ jal dma_copy /* EE98 80033A98 00000000 */ nop /* EE9C 80033A9C 0C08F84C */ jal initialize_battle diff --git a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s index d5349f43c5..f7643044c1 100644 --- a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s +++ b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s @@ -9,8 +9,8 @@ glabel exec_ShakeCam1 /* EFF2C 802CB57C 00A0882D */ daddu $s1, $a1, $zero /* EFF30 802CB580 AFB20018 */ sw $s2, 0x18($sp) /* EFF34 802CB584 00C0902D */ daddu $s2, $a2, $zero -/* EFF38 802CB588 3C04802E */ lui $a0, 0x802e -/* EFF3C 802CB58C 24849CB0 */ addiu $a0, $a0, -0x6350 +/* EFF38 802CB588 3C04802E */ lui $a0, %hi(ShakeCam1) +/* EFF3C 802CB58C 24849CB0 */ addiu $a0, $a0, %lo(ShakeCam1) /* EFF40 802CB590 24050001 */ addiu $a1, $zero, 1 /* EFF44 802CB594 0000302D */ daddu $a2, $zero, $zero /* EFF48 802CB598 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s index 9ae49fc3a4..7aba260f26 100644 --- a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s +++ b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s @@ -9,8 +9,8 @@ glabel exec_ShakeCamX /* EFF88 802CB5D8 00A0902D */ daddu $s2, $a1, $zero /* EFF8C 802CB5DC AFB3001C */ sw $s3, 0x1c($sp) /* EFF90 802CB5E0 00C0982D */ daddu $s3, $a2, $zero -/* EFF94 802CB5E4 3C04802E */ lui $a0, 0x802e -/* EFF98 802CB5E8 24849CE8 */ addiu $a0, $a0, -0x6318 +/* EFF94 802CB5E4 3C04802E */ lui $a0, %hi(ShakeCamX) +/* EFF98 802CB5E8 24849CE8 */ addiu $a0, $a0, %lo(ShakeCamX) /* EFF9C 802CB5EC 24050001 */ addiu $a1, $zero, 1 /* EFFA0 802CB5F0 0000302D */ daddu $a2, $zero, $zero /* EFFA4 802CB5F4 F7B40028 */ sdc1 $f20, 0x28($sp) diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s index c616b2b588..c06a97357c 100644 --- a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s +++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s @@ -48,9 +48,9 @@ glabel func_802CD4B4 /* F1EFC 802CD54C 26100004 */ addiu $s0, $s0, 4 /* F1F00 802CD550 3C04802D */ lui $a0, 0x802d /* F1F04 802CD554 2484CAC0 */ addiu $a0, $a0, -0x3540 -/* F1F08 802CD558 3C05802D */ lui $a1, 0x802d +/* F1F08 802CD558 3C05802D */ lui $a1, %hi(draw_anim_models) /* F1F0C 802CD55C 0C048C56 */ jal bind_dynamic_entity_3 -/* F1F10 802CD560 24A5CB18 */ addiu $a1, $a1, -0x34e8 +/* F1F10 802CD560 24A5CB18 */ addiu $a1, $a1, %lo(draw_anim_models) /* F1F14 802CD564 8FBF001C */ lw $ra, 0x1c($sp) /* F1F18 802CD568 8FB20018 */ lw $s2, 0x18($sp) /* F1F1C 802CD56C 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s b/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s index 10a8d2914b..ce2332078a 100644 --- a/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s +++ b/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s @@ -21,8 +21,8 @@ glabel boot_idle /* 39D4C 8005E94C 24428590 */ addiu $v0, $v0, -0x7a70 /* 39D50 8005E950 AFA20010 */ sw $v0, 0x10($sp) /* 39D54 8005E954 2402000A */ addiu $v0, $zero, 0xa -/* 39D58 8005E958 3C068002 */ lui $a2, 0x8002 -/* 39D5C 8005E95C 24C65F70 */ addiu $a2, $a2, 0x5f70 +/* 39D58 8005E958 3C068002 */ lui $a2, %hi(boot_main) +/* 39D5C 8005E95C 24C65F70 */ addiu $a2, $a2, %lo(boot_main) /* 39D60 8005E960 0000382D */ daddu $a3, $zero, $zero /* 39D64 8005E964 0C019798 */ jal osCreateThread /* 39D68 8005E968 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s b/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s index 6575915f85..10da6b92f2 100644 --- a/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s +++ b/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s @@ -14,8 +14,8 @@ glabel nuBoot /* 39CD4 8005E8D4 AFA20010 */ sw $v0, 0x10($sp) /* 39CD8 8005E8D8 2402000A */ addiu $v0, $zero, 0xa /* 39CDC 8005E8DC 24050001 */ addiu $a1, $zero, 1 -/* 39CE0 8005E8E0 3C068006 */ lui $a2, 0x8006 -/* 39CE4 8005E8E4 24C6E90C */ addiu $a2, $a2, -0x16f4 +/* 39CE0 8005E8E0 3C068006 */ lui $a2, %hi(boot_idle) +/* 39CE4 8005E8E4 24C6E90C */ addiu $a2, $a2, %lo(boot_idle) /* 39CE8 8005E8E8 0000382D */ daddu $a3, $zero, $zero /* 39CEC 8005E8EC 0C019798 */ jal osCreateThread /* 39CF0 8005E8F0 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s index e999e1d6e7..4a7d54b1ff 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s @@ -12,8 +12,8 @@ glabel nuGfxThreadStart /* 3B60C 8006020C AFA20010 */ sw $v0, 0x10($sp) /* 3B610 80060210 24020032 */ addiu $v0, $zero, 0x32 /* 3B614 80060214 24050004 */ addiu $a1, $zero, 4 -/* 3B618 80060218 3C068006 */ lui $a2, 0x8006 -/* 3B61C 8006021C 24C60248 */ addiu $a2, $a2, 0x248 +/* 3B618 80060218 3C068006 */ lui $a2, %hi(nuGfxThread) +/* 3B61C 8006021C 24C60248 */ addiu $a2, $a2, %lo(nuGfxThread) /* 3B620 80060220 0000382D */ daddu $a3, $zero, $zero /* 3B624 80060224 AFBF001C */ sw $ra, 0x1c($sp) /* 3B628 80060228 0C019798 */ jal osCreateThread diff --git a/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s b/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s index 6030612408..4575e55c54 100644 --- a/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s +++ b/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s @@ -57,20 +57,20 @@ glabel osCreatePiManager /* 3BEA8 80060AA8 2631E6E0 */ addiu $s1, $s1, -0x1920 /* 3BEAC 80060AAC 02202021 */ addu $a0, $s1, $zero /* 3BEB0 80060AB0 00002821 */ addu $a1, $zero, $zero -/* 3BEB4 80060AB4 3C068006 */ lui $a2, 0x8006 -/* 3BEB8 80060AB8 24C61090 */ addiu $a2, $a2, 0x1090 +/* 3BEB4 80060AB4 3C068006 */ lui $a2, %hi(osDevMgrMain) +/* 3BEB8 80060AB8 24C61090 */ addiu $a2, $a2, %lo(osDevMgrMain) /* 3BEBC 80060ABC 24030001 */ addiu $v1, $zero, 1 /* 3BEC0 80060AC0 AE830000 */ sw $v1, ($s4) /* 3BEC4 80060AC4 3C03800B */ lui $v1, 0x800b /* 3BEC8 80060AC8 24634380 */ addiu $v1, $v1, 0x4380 /* 3BECC 80060ACC 3C018009 */ lui $at, 0x8009 /* 3BED0 80060AD0 AC233D60 */ sw $v1, 0x3d60($at) -/* 3BED4 80060AD4 3C038007 */ lui $v1, 0x8007 -/* 3BED8 80060AD8 2463B480 */ addiu $v1, $v1, -0x4b80 +/* 3BED4 80060AD4 3C038007 */ lui $v1, %hi(osPiRawStartDma) +/* 3BED8 80060AD8 2463B480 */ addiu $v1, $v1, %lo(osPiRawStartDma) /* 3BEDC 80060ADC 3C018009 */ lui $at, 0x8009 /* 3BEE0 80060AE0 AC233D64 */ sw $v1, 0x3d64($at) -/* 3BEE4 80060AE4 3C038006 */ lui $v1, 0x8006 -/* 3BEE8 80060AE8 24630B70 */ addiu $v1, $v1, 0xb70 +/* 3BEE4 80060AE4 3C038006 */ lui $v1, %hi(osEPiRawStartDma) +/* 3BEE8 80060AE8 24630B70 */ addiu $v1, $v1, %lo(osEPiRawStartDma) /* 3BEEC 80060AEC 3C018009 */ lui $at, 0x8009 /* 3BEF0 80060AF0 AC233D68 */ sw $v1, 0x3d68($at) /* 3BEF4 80060AF4 3C03800B */ lui $v1, 0x800b diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s b/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s index e9dbaeb29e..0df744877e 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s @@ -9,8 +9,8 @@ glabel sprintf /* 40900 80065500 AFB00010 */ sw $s0, 0x10($sp) /* 40904 80065504 00808021 */ addu $s0, $a0, $zero /* 40908 80065508 00A03021 */ addu $a2, $a1, $zero -/* 4090C 8006550C 3C048006 */ lui $a0, 0x8006 -/* 40910 80065510 24845548 */ addiu $a0, $a0, 0x5548 +/* 4090C 8006550C 3C048006 */ lui $a0, %hi(proutSprintf) +/* 40910 80065510 24845548 */ addiu $a0, $a0, %lo(proutSprintf) /* 40914 80065514 02002821 */ addu $a1, $s0, $zero /* 40918 80065518 AFBF0014 */ sw $ra, 0x14($sp) /* 4091C 8006551C 0C0192A8 */ jal _Printf diff --git a/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s b/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s index 30ef942a8a..c41aab0411 100644 --- a/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s +++ b/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s @@ -65,8 +65,8 @@ glabel osCreateViManager /* 41F5C 80066B5C 2610F918 */ addiu $s0, $s0, -0x6e8 /* 41F60 80066B60 02002021 */ addu $a0, $s0, $zero /* 41F64 80066B64 00002821 */ addu $a1, $zero, $zero -/* 41F68 80066B68 3C068006 */ lui $a2, 0x8006 -/* 41F6C 80066B6C 24C66C10 */ addiu $a2, $a2, 0x6c10 +/* 41F68 80066B68 3C068006 */ lui $a2, %hi(viMgrMain) +/* 41F6C 80066B6C 24C66C10 */ addiu $a2, $a2, %lo(viMgrMain) /* 41F70 80066B70 24030001 */ addiu $v1, $zero, 1 /* 41F74 80066B74 AE830000 */ sw $v1, ($s4) /* 41F78 80066B78 3C03800B */ lui $v1, 0x800b diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s index 2643a4e4ba..415ba82cad 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s @@ -27,8 +27,8 @@ glabel nuGfxTaskMgrInit /* 7F90 8002CB90 2610C518 */ addiu $s0, $s0, -0x3ae8 /* 7F94 8002CB94 0200202D */ daddu $a0, $s0, $zero /* 7F98 8002CB98 24050005 */ addiu $a1, $zero, 5 -/* 7F9C 8002CB9C 3C068003 */ lui $a2, 0x8003 -/* 7FA0 8002CBA0 24C6CA40 */ addiu $a2, $a2, -0x35c0 +/* 7F9C 8002CB9C 3C068003 */ lui $a2, %hi(nuGfxTaskMgr) +/* 7FA0 8002CBA0 24C6CA40 */ addiu $a2, $a2, %lo(nuGfxTaskMgr) /* 7FA4 8002CBA4 3C02800A */ lui $v0, 0x800a /* 7FA8 8002CBA8 2442E6D0 */ addiu $v0, $v0, -0x1930 /* 7FAC 8002CBAC AFA20010 */ sw $v0, 0x10($sp) diff --git a/src/code_25f00_len_940.c b/src/code_25f00_len_940.c index d460528198..ed6722ee5a 100644 --- a/src/code_25f00_len_940.c +++ b/src/code_25f00_len_940.c @@ -6,6 +6,8 @@ INCLUDE_ASM(s32, "code_25f00_len_940", func_8004ADD0); INCLUDE_ASM(s32, "code_25f00_len_940", func_8004AE08); +INCLUDE_ASM(s32, "code_25f00_len_940", nuAuDmaCallBack); + INCLUDE_ASM(s32, "code_25f00_len_940", nuAuDmaNew); INCLUDE_ASM(s32, "code_25f00_len_940", nuAuCleanDMABuffers); diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 9bda7ecc1d..c95eaa23d2 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -1098,7 +1098,7 @@ npc_do_player_collision;0x800392D8 npc_do_world_collision;0x80038AFC npc_move_heading;0x8003AA54 nuAuCleanDMABuffers;0x8004B268 -nuAuDmaCallBack;0x8004B074 +!nuAuDmaCallBack;0x8004B074 nuAuDmaNew;0x8004B224 nuBoot;0x8005E8B0 nuContDataClose;0x8006060C diff --git a/undefined_syms.txt b/undefined_syms.txt index b52d37138f..bbf62f937c 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -213,6 +213,34 @@ gCurrentSaveFile = 0x800DACC0; gMapFlags = 0x802DA480; gMapVars = 0x802DA484; +MarioEnterStage = 0x80284A40; +PeachEnterStage = 0x80284D04; +HandleEvent_Player = 0x802852D4; +PlayerScriptDispatcher = 0x80284EBC; +PeachScriptDispatcher = 0x80285010; +BtlBringPartnerOut = 0x80280B6C; +BtlPutPartnerAway = 0x80280A34; +RegainAbility = 0x80289110; +DoDizzyAttack = 0x8028907C; +DoDizzyHit = 0x802945FC; +DoFreezeHit = 0x8029466C; +DoImmune = 0x8029AC70; +DoJumpBack = 0x8029BD70; +DoNormalHit = 0x80299044; +DoNpcDefeat = 0x8004462C; +DoParalyzeHit = 0x80294618; +DoPoisonHit = 0x80294634; +DoRecover = 0x8029BFA0; +DoReturnHome = 0x8029BEB8; +DoScareAway = 0x8029B22C; +DoShinkHit = 0x802946B8; +DoShockHit = 0x8029A6FC; +DoSleepHit = 0x802945E0; +DoSpinSmashHit = 0x8029B998; +DoStopHit = 0x80294650; +ShakeCam1 = 0x802D9CB0; +ShakeCamX = 0x802D9CE8; + func_802A91F8 = 0x802A91F8; func_802A9208 = 0x802A9208; func_802A9228 = 0x802A9228; From 25e6443aad724a62b3e34c15c13cde392ea7e143 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 15 Oct 2020 00:46:55 -0400 Subject: [PATCH 10/10] splat update --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 4dd385463b..7abe8ac584 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 4dd385463bd3ae269ee356b1b2627328ab719fb0 +Subproject commit 7abe8ac584c09cd1da6cdd5919b1904edcb7126a