From 84f211a2ae90f60002c7a7820853fb88b9c359fe Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Wed, 14 Oct 2020 22:56:47 -0400 Subject: [PATCH] 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;