From 0552ce26d5ec795bdebeb09a605179299782e01a Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 11 Mar 2021 03:08:22 -0500 Subject: [PATCH] Support for "addu" in place of move pseudoinstruction (#206) * addu support * some libultra decomp * reorganization * reorg * comments --- include/include_asm.h | 3 + include/move_addu.inc | 3 + include/variables.h | 1 + src/code_4ac90_len_3910.c | 301 ++++++++++++++++++ src/os/code_3FEA0.c | 21 +- src/os/code_3c220_len_a0.c | 3 - src/os/code_3c2c0_len_50.c | 3 - src/os/code_3cb20_len_130.c | 5 - src/os/code_3cc50_len_80.c | 3 - src/os/code_3cd00_len_5f0.c | 21 +- src/os/code_409b0_len_140.c | 3 - src/os/code_40af0_len_130.c | 3 - src/os/code_47c60_len_f0.c | 6 +- src/os/code_4ac90_len_3910.c | 301 ------------------ src/os/osEPiLinkHandle.c | 3 + src/os/osEPiReadIo.c | 11 +- src/os/osEPiStartDma.c | 23 ++ src/os/osEPiWriteIo.c | 6 +- src/os/osJamMesg.c | 3 + src/os/osRecvMesg.c | 3 + src/os/osSetThreadPri.c | 6 +- ver/us/asm/data/code_6FA70.data.s | 54 ---- .../code_4ac90_len_3910/func_8006F890.s | 0 .../code_4ac90_len_3910/func_8006F8F0.s | 0 .../code_4ac90_len_3910/func_8006F950.s | 0 .../code_4ac90_len_3910/func_8006F9B0.s | 0 .../code_4ac90_len_3910/func_8006FA10.s | 0 .../code_4ac90_len_3910/func_8006FA70.s | 0 .../code_4ac90_len_3910/func_8006FB90.s | 0 .../code_4ac90_len_3910/func_8006FBF0.s | 0 .../code_4ac90_len_3910/func_8006FC50.s | 0 .../code_4ac90_len_3910/func_8006FCB0.s | 0 .../code_4ac90_len_3910/func_8006FD10.s | 0 .../code_4ac90_len_3910/func_8006FD70.s | 0 .../code_4ac90_len_3910/func_8006FDD0.s | 0 .../code_4ac90_len_3910/func_8006FE30.s | 0 .../code_4ac90_len_3910/func_8006FEF0.s | 0 .../code_4ac90_len_3910/func_8006FF50.s | 0 .../code_4ac90_len_3910/func_8006FFB0.s | 0 .../code_4ac90_len_3910/func_80070010.s | 0 .../code_4ac90_len_3910/func_80070070.s | 0 .../code_4ac90_len_3910/func_800700D0.s | 0 .../code_4ac90_len_3910/func_80070130.s | 0 .../code_4ac90_len_3910/func_80070190.s | 0 .../code_4ac90_len_3910/func_800701F0.s | 0 .../code_4ac90_len_3910/func_80070250.s | 0 .../code_4ac90_len_3910/func_800702B0.s | 0 .../code_4ac90_len_3910/func_80070310.s | 0 .../code_4ac90_len_3910/func_80070370.s | 0 .../code_4ac90_len_3910/func_800703D0.s | 0 .../code_4ac90_len_3910/func_80070430.s | 0 .../code_4ac90_len_3910/func_80070490.s | 0 .../code_4ac90_len_3910/func_800704F0.s | 0 .../code_4ac90_len_3910/func_80070550.s | 0 .../code_4ac90_len_3910/func_800705B0.s | 0 .../code_4ac90_len_3910/func_80070610.s | 0 .../code_4ac90_len_3910/func_80070670.s | 0 .../code_4ac90_len_3910/func_800706D0.s | 0 .../code_4ac90_len_3910/func_80070730.s | 0 .../code_4ac90_len_3910/func_80070850.s | 0 .../code_4ac90_len_3910/func_800708B0.s | 0 .../code_4ac90_len_3910/func_80070910.s | 0 .../code_4ac90_len_3910/func_80070970.s | 0 .../code_4ac90_len_3910/func_800709D0.s | 0 .../code_4ac90_len_3910/func_80070A30.s | 0 .../code_4ac90_len_3910/func_80070A90.s | 0 .../code_4ac90_len_3910/func_80070AF0.s | 0 .../code_4ac90_len_3910/func_80070B50.s | 0 .../code_4ac90_len_3910/func_80070BB0.s | 0 .../code_4ac90_len_3910/func_80070C10.s | 0 .../code_4ac90_len_3910/func_80070C70.s | 0 .../code_4ac90_len_3910/func_80070CD0.s | 0 .../code_4ac90_len_3910/func_80070D30.s | 0 .../code_4ac90_len_3910/func_80070D90.s | 0 .../code_4ac90_len_3910/func_80070DF0.s | 0 .../code_4ac90_len_3910/func_80070E50.s | 0 .../code_4ac90_len_3910/func_80070EB0.s | 0 .../code_4ac90_len_3910/func_80070F10.s | 0 .../code_4ac90_len_3910/func_80070F70.s | 0 .../code_4ac90_len_3910/func_80070FD0.s | 0 .../code_4ac90_len_3910/func_80071030.s | 0 .../code_4ac90_len_3910/func_80071090.s | 0 .../code_4ac90_len_3910/func_800710F0.s | 0 .../code_4ac90_len_3910/func_80071150.s | 0 .../code_4ac90_len_3910/func_800711B0.s | 0 .../code_4ac90_len_3910/func_80071210.s | 0 .../code_4ac90_len_3910/func_80071270.s | 0 .../code_4ac90_len_3910/func_800712D0.s | 0 .../code_4ac90_len_3910/func_80071330.s | 0 .../code_4ac90_len_3910/func_80071390.s | 0 .../code_4ac90_len_3910/func_800713F0.s | 0 .../code_4ac90_len_3910/func_80071450.s | 0 .../code_4ac90_len_3910/func_800714B0.s | 0 .../code_4ac90_len_3910/func_80071510.s | 0 .../code_4ac90_len_3910/func_80071570.s | 0 .../code_4ac90_len_3910/func_800715D0.s | 0 .../code_4ac90_len_3910/func_80071630.s | 0 .../code_4ac90_len_3910/func_80071690.s | 0 .../code_4ac90_len_3910/func_800716F0.s | 0 .../code_4ac90_len_3910/func_80071750.s | 0 .../code_4ac90_len_3910/func_800717B0.s | 0 .../code_4ac90_len_3910/func_80071810.s | 0 .../code_4ac90_len_3910/func_80071870.s | 0 .../code_4ac90_len_3910/func_800718D0.s | 0 .../code_4ac90_len_3910/func_80071930.s | 0 .../code_4ac90_len_3910/func_80071990.s | 0 .../code_4ac90_len_3910/func_800719F0.s | 0 .../code_4ac90_len_3910/func_80071A50.s | 0 .../code_4ac90_len_3910/func_80071AB0.s | 0 .../code_4ac90_len_3910/func_80071B10.s | 0 .../code_4ac90_len_3910/func_80071B70.s | 0 .../code_4ac90_len_3910/func_80071BD0.s | 0 .../code_4ac90_len_3910/func_80071C30.s | 0 .../code_4ac90_len_3910/func_80071C90.s | 0 .../code_4ac90_len_3910/func_80071CF0.s | 0 .../code_4ac90_len_3910/func_80071D50.s | 0 .../code_4ac90_len_3910/func_80071DB0.s | 0 .../code_4ac90_len_3910/func_80071E10.s | 0 .../code_4ac90_len_3910/func_80071E70.s | 0 .../code_4ac90_len_3910/func_80071ED0.s | 0 .../code_4ac90_len_3910/func_80071F30.s | 0 .../code_4ac90_len_3910/func_80071F90.s | 0 .../code_4ac90_len_3910/func_80071FF0.s | 0 .../code_4ac90_len_3910/func_80072050.s | 0 .../code_4ac90_len_3910/func_800720B0.s | 0 .../code_4ac90_len_3910/func_80072110.s | 0 .../code_4ac90_len_3910/func_80072170.s | 0 .../code_4ac90_len_3910/func_800721D0.s | 0 .../code_4ac90_len_3910/func_80072230.s | 0 .../code_4ac90_len_3910/func_80072290.s | 0 .../code_4ac90_len_3910/func_800722F0.s | 0 .../code_4ac90_len_3910/func_80072350.s | 0 .../code_4ac90_len_3910/func_800723B0.s | 0 .../code_4ac90_len_3910/func_80072410.s | 0 .../code_4ac90_len_3910/func_80072470.s | 0 .../code_4ac90_len_3910/func_800724D0.s | 0 .../code_4ac90_len_3910/func_80072530.s | 0 .../code_4ac90_len_3910/func_80072590.s | 0 .../code_4ac90_len_3910/func_800725F0.s | 0 .../code_4ac90_len_3910/func_80072650.s | 0 .../code_4ac90_len_3910/func_800726B0.s | 0 .../code_4ac90_len_3910/func_80072710.s | 0 .../code_4ac90_len_3910/func_80072770.s | 0 .../code_4ac90_len_3910/func_800727D0.s | 0 .../code_4ac90_len_3910/func_80072830.s | 0 .../code_4ac90_len_3910/func_80072890.s | 0 .../code_4ac90_len_3910/func_800728F0.s | 0 .../code_4ac90_len_3910/func_80072950.s | 0 .../code_4ac90_len_3910/func_800729B0.s | 0 .../code_4ac90_len_3910/func_80072A10.s | 0 .../code_4ac90_len_3910/func_80072A70.s | 0 .../code_4ac90_len_3910/func_80072AD0.s | 0 .../code_4ac90_len_3910/func_80072B30.s | 0 .../code_4ac90_len_3910/func_80072BB0.s | 0 .../code_4ac90_len_3910/func_80072BCC.s | 0 .../code_4ac90_len_3910/func_80072CDC.s | 0 .../code_4ac90_len_3910/func_80072CF4.s | 0 .../{os => }/code_4ac90_len_3910/fx_emote.s | 0 .../code_4ac90_len_3910/fx_sleep_bubble.s | 0 .../{os => }/code_4ac90_len_3910/fx_sweat.s | 0 .../code_4ac90_len_3910/fx_walk_large.s | 0 .../code_4ac90_len_3910/fx_walk_normal.s | 0 .../code_4ac90_len_3910/load_battle.s | 0 .../code_4ac90_len_3910/load_battle_section.s | 0 .../code_4ac90_len_3910/load_demo_battle.s | 0 .../code_4ac90_len_3910/set_battle_stage.s | 0 .../code_4ac90_len_3910/setup_demo_player.s | 0 .../code_7900D0/func_802A1000_7900D0.s | 47 --- .../code_7900D0/func_802A10AC_79017C.s | 52 --- .../code_7900D0/func_802A116C_79023C.s | 47 --- .../code_7900D0/func_802A137C_79044C.s | 44 --- .../code_7900D0/func_802A1414_7904E4.s | 39 --- .../code_7900D0/func_802A153C_79060C.s | 68 ---- .../asm/nonmatchings/os/code_3FEA0/sprintf.s | 27 -- .../os/code_3c220_len_a0/osEPiStartDma.s | 49 --- .../os/code_3cd00_len_5f0/osContStartQuery.s | 37 --- .../os/code_47c60_len_f0/osContDataCrc.s | 43 --- .../osEPiLinkHandle.s | 0 .../osJamMesg.s | 0 .../osRecvMesg.s | 0 .../os/osSetThreadPri/osSetThreadPri.s | 59 ---- .../code_3cb20_len_130 => os}/osInvalDCache.s | 6 + .../code_3cb20_len_130 => os}/osInvalICache.s | 6 + .../osWritebackDCache.s | 6 + ver/us/asm/os/osWritebackDCacheAll.s | 23 +- ver/us/splat.yaml | 33 +- ver/us/symbol_addrs.txt | 177 +++++++++- 187 files changed, 611 insertions(+), 938 deletions(-) create mode 100644 include/move_addu.inc create mode 100644 src/code_4ac90_len_3910.c delete mode 100644 src/os/code_3c220_len_a0.c delete mode 100644 src/os/code_3c2c0_len_50.c delete mode 100644 src/os/code_3cb20_len_130.c delete mode 100644 src/os/code_3cc50_len_80.c delete mode 100644 src/os/code_409b0_len_140.c delete mode 100644 src/os/code_40af0_len_130.c delete mode 100644 src/os/code_4ac90_len_3910.c create mode 100644 src/os/osEPiLinkHandle.c create mode 100644 src/os/osEPiStartDma.c create mode 100644 src/os/osJamMesg.c create mode 100644 src/os/osRecvMesg.c rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006F890.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006F8F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006F950.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006F9B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FA10.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FA70.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FB90.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FBF0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FC50.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FCB0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FD10.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FD70.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FDD0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FE30.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FEF0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FF50.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_8006FFB0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070010.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070070.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800700D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070130.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070190.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800701F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070250.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800702B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070310.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070370.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800703D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070430.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070490.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800704F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070550.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800705B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070610.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070670.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800706D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070730.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070850.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800708B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070910.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070970.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800709D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070A30.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070A90.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070AF0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070B50.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070BB0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070C10.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070C70.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070CD0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070D30.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070D90.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070DF0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070E50.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070EB0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070F10.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070F70.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80070FD0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071030.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071090.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800710F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071150.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800711B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071210.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071270.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800712D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071330.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071390.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800713F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071450.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800714B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071510.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071570.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800715D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071630.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071690.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800716F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071750.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800717B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071810.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071870.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800718D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071930.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071990.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800719F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071A50.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071AB0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071B10.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071B70.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071BD0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071C30.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071C90.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071CF0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071D50.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071DB0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071E10.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071E70.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071ED0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071F30.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071F90.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80071FF0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072050.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800720B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072110.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072170.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800721D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072230.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072290.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800722F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072350.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800723B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072410.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072470.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800724D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072530.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072590.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800725F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072650.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800726B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072710.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072770.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800727D0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072830.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072890.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800728F0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072950.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_800729B0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072A10.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072A70.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072AD0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072B30.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072BB0.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072BCC.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072CDC.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/func_80072CF4.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/fx_emote.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/fx_sleep_bubble.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/fx_sweat.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/fx_walk_large.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/fx_walk_normal.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/load_battle.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/load_battle_section.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/load_demo_battle.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/set_battle_stage.s (100%) rename ver/us/asm/nonmatchings/{os => }/code_4ac90_len_3910/setup_demo_player.s (100%) delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A137C_79044C.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A1414_7904E4.s delete mode 100644 ver/us/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s delete mode 100644 ver/us/asm/nonmatchings/os/code_3FEA0/sprintf.s delete mode 100644 ver/us/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s delete mode 100644 ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s delete mode 100644 ver/us/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s rename ver/us/asm/nonmatchings/os/{code_3c2c0_len_50 => osEPiLinkHandle}/osEPiLinkHandle.s (100%) rename ver/us/asm/nonmatchings/os/{code_409b0_len_140 => osJamMesg}/osJamMesg.s (100%) rename ver/us/asm/nonmatchings/os/{code_40af0_len_130 => osRecvMesg}/osRecvMesg.s (100%) delete mode 100644 ver/us/asm/nonmatchings/os/osSetThreadPri/osSetThreadPri.s rename ver/us/asm/{nonmatchings/os/code_3cb20_len_130 => os}/osInvalDCache.s (94%) rename ver/us/asm/{nonmatchings/os/code_3cb20_len_130 => os}/osInvalICache.s (93%) rename ver/us/asm/{nonmatchings/os/code_3cc50_len_80 => os}/osWritebackDCache.s (93%) diff --git a/include/include_asm.h b/include/include_asm.h index 98ceb92165..5fca5b481b 100644 --- a/include/include_asm.h +++ b/include/include_asm.h @@ -11,6 +11,9 @@ TYPE __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"ver/"STRINGIFY(VERSION)"/asm/nonmatchings/"FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); } #endif __asm__( ".include \"include/macro.inc\"\n"); +#ifdef MOVE_ADDU +__asm__( ".include \"include/move_addu.inc\"\n"); +#endif #else #define INCLUDE_ASM(TYPE, FOLDER, NAME, ARGS...) #endif diff --git a/include/move_addu.inc b/include/move_addu.inc new file mode 100644 index 0000000000..c8bf6aea79 --- /dev/null +++ b/include/move_addu.inc @@ -0,0 +1,3 @@ +.macro move a, b + addu \a, \b, $zero +.endm diff --git a/include/variables.h b/include/variables.h index bbc18523a1..656fd3d038 100644 --- a/include/variables.h +++ b/include/variables.h @@ -294,6 +294,7 @@ extern s32 D_800B8590; extern OSThread* __osActiveQueue; extern OSThread* __osRunningThread; extern OSThread* __osRunQueue; +extern OSDevMgr __osPiDevMgr; // gfx extern DisplayContext* gDisplayContext; diff --git a/src/code_4ac90_len_3910.c b/src/code_4ac90_len_3910.c new file mode 100644 index 0000000000..8c4410a25c --- /dev/null +++ b/src/code_4ac90_len_3910.c @@ -0,0 +1,301 @@ +#include "common.h" + +extern EffectTableEntry D_8007F210[135]; + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006F890); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_8006F8F0, f32 arg0, f32 arg1, f32 arg2); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006F950); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006F9B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FA10); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FA70); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", fx_walk_large); + +INCLUDE_ASM(void, "code_4ac90_len_3910", fx_walk_normal, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FB90); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FBF0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FC50); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FCB0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FD10); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FD70); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FDD0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FE30); + +INCLUDE_ASM(void, "code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, + f32 arg6, s32 arg7, s32* arg8); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FF50); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FFB0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070010); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070070); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800700D0); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070130, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070190, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, f32 arg5, + s32 arg6, s32 arg7); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_800701F0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070250); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800702B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070310); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070370); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800703D0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070430); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070490); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800704F0); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070550, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, + s32 arg6, s32 arg7); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800705B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070610); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070670); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800706D0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070730); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", fx_sweat); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", fx_sleep_bubble); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070850); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800708B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070910); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070970, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_800709D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070A30); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070A90, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070AF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070B50, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070BB0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070C10); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070C70); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070CD0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070D30); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070D90); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070DF0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070E50); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070EB0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070F10); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070F70); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070FD0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071030); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80071090, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800710F0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071150); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800711B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071210); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071270); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800712D0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071330); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071390); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800713F0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071450); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800714B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071510); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071570); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800715D0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071630); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071690); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800716F0); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800717B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071810); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071870); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_800718D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071930); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071990); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800719F0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071A50); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071AB0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071B10); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071B70); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071BD0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071C30); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071C90); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071CF0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071D50); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071DB0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071E10); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071E70); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071ED0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071F30); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071F90); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80071FF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072050); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_800720B0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072110); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072170); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800721D0); + +INCLUDE_ASM(UNK_TYPE, "code_4ac90_len_3910", func_80072230, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, + s32 arg5); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072290); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800722F0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072350); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800723B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072410); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072470); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800724D0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072530); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072590); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800725F0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072650); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800726B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072710); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072770); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800727D0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072830); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072890); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800728F0); + +INCLUDE_ASM(void, "code_4ac90_len_3910", func_80072950, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 time); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800729B0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072A10); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072A70); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072AD0); + +// FILE SPLIT +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072B30); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072BB0); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072BCC); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", load_battle_section); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", load_battle); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", set_battle_stage); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072CDC); + +void func_80072CEC(){ +} + +INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072CF4); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", setup_demo_player); + +INCLUDE_ASM(s32, "code_4ac90_len_3910", load_demo_battle); diff --git a/src/os/code_3FEA0.c b/src/os/code_3FEA0.c index 36d5ac3065..cb0abbf4fb 100644 --- a/src/os/code_3FEA0.c +++ b/src/os/code_3FEA0.c @@ -1,4 +1,9 @@ +#define MOVE_ADDU + #include "common.h" +#include "stdlib/stdarg.h" + +s32 proutSprintf(); char spaces[] = " "; char zeroes[] = "00000000000000000000000000000000"; @@ -7,6 +12,20 @@ INCLUDE_ASM(s32, "os/code_3FEA0", _Printf); INCLUDE_ASM(s32, "os/code_3FEA0", _Putfld); -INCLUDE_ASM(int, "os/code_3FEA0", sprintf, char* s, const char* fmt, ...); +int sprintf(char* s, const char* fmt, ...) { + s32 ret; + va_list argp; + va_start(argp, fmt); + + ret = _Printf(&proutSprintf, s, fmt, argp); + + if (ret < 0) { + return ret; + } + + s[ret] = 0; + return ret; +} + INCLUDE_ASM(s32, "os/code_3FEA0", proutSprintf); diff --git a/src/os/code_3c220_len_a0.c b/src/os/code_3c220_len_a0.c deleted file mode 100644 index 5f3f95e52f..0000000000 --- a/src/os/code_3c220_len_a0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3c220_len_a0", osEPiStartDma, OSPiHandle* handle, OSIoMesg* mesg, s32 unk); diff --git a/src/os/code_3c2c0_len_50.c b/src/os/code_3c2c0_len_50.c deleted file mode 100644 index 13d7824cb4..0000000000 --- a/src/os/code_3c2c0_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3c2c0_len_50", osEPiLinkHandle, OSPiHandle* handle); diff --git a/src/os/code_3cb20_len_130.c b/src/os/code_3cb20_len_130.c deleted file mode 100644 index 17c4d9a176..0000000000 --- a/src/os/code_3cb20_len_130.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_3cb20_len_130", osInvalDCache, void* buf, s32 size); - -INCLUDE_ASM(void, "os/code_3cb20_len_130", osInvalICache, void* buf, s32 size); diff --git a/src/os/code_3cc50_len_80.c b/src/os/code_3cc50_len_80.c deleted file mode 100644 index 289d67ba64..0000000000 --- a/src/os/code_3cc50_len_80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_3cc50_len_80", osWritebackDCache, void* buf, s32 size); diff --git a/src/os/code_3cd00_len_5f0.c b/src/os/code_3cd00_len_5f0.c index fcd23ad7e7..0d6643b435 100644 --- a/src/os/code_3cd00_len_5f0.c +++ b/src/os/code_3cd00_len_5f0.c @@ -1,6 +1,25 @@ +#define MOVE_ADDU + #include "common.h" -INCLUDE_ASM(s32, "os/code_3cd00_len_5f0", osContStartQuery, OSMesgQueue* queue); +extern u8 D_8009A61C; +extern s32 D_800B0ED0; + +s32 osContStartQuery(OSMesgQueue* mq) { + s32 ret; + + __osSiGetAccess(); + if (D_8009A61C != 0) { + osPackRequestData(0); + osSiRawStartDma(1, &D_800B0ED0); + osRecvMesg(mq, NULL, 1); + } + ret = osSiRawStartDma(0, &D_800B0ED0); + D_8009A61C = 0; + __osSiRelAccess(); + + return ret; +} INCLUDE_ASM(void, "os/code_3cd00_len_5f0", osContGetQuery, OSContStatus* status); diff --git a/src/os/code_409b0_len_140.c b/src/os/code_409b0_len_140.c deleted file mode 100644 index da73a1ab93..0000000000 --- a/src/os/code_409b0_len_140.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_409b0_len_140", osJamMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); diff --git a/src/os/code_40af0_len_130.c b/src/os/code_40af0_len_130.c deleted file mode 100644 index 8a375486b3..0000000000 --- a/src/os/code_40af0_len_130.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_40af0_len_130", osRecvMesg, OSMesgQueue* queue, OSMesg* mesg, s32 unk); diff --git a/src/os/code_47c60_len_f0.c b/src/os/code_47c60_len_f0.c index a3f19475bf..a60f6372f6 100644 --- a/src/os/code_47c60_len_f0.c +++ b/src/os/code_47c60_len_f0.c @@ -1,8 +1,9 @@ +#define MOVE_ADDU + #include "common.h" INCLUDE_ASM(s32, "os/code_47c60_len_f0", osContAddressCrc); -#ifdef MOVE_ISSUE u8 osContDataCrc(u8* data) { s32 ret; u32 bit; @@ -34,6 +35,3 @@ u8 osContDataCrc(u8* data) { } while (byte < 8U); return ret; } -#else -INCLUDE_ASM(s32, "os/code_47c60_len_f0", osContDataCrc); -#endif diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c deleted file mode 100644 index acf538aa7f..0000000000 --- a/src/os/code_4ac90_len_3910.c +++ /dev/null @@ -1,301 +0,0 @@ -#include "common.h" - -extern EffectTableEntry D_8007F210[135]; - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006F890); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006F8F0, f32 arg0, f32 arg1, f32 arg2); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006F950); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006F9B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FA10); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FA70); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_walk_large); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_walk_normal, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FB90); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FBF0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FC50); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FCB0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FD10); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FD70); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FDD0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - f32 arg6, s32 arg7, s32* arg8); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FF50); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FFB0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070010); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070070); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800700D0); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070130, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070190, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, f32 arg5, - s32 arg6, s32 arg7); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_800701F0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070250); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800702B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070310); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070370); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800703D0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070430); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070490); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800704F0); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070550, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - s32 arg6, s32 arg7); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800705B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070610); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070670); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800706D0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070730); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_sweat); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_sleep_bubble); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070850); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800708B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070910); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070970, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_800709D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070A30); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070A90, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070AF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070B50, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80070BB0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070C10); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070C70); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070CD0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070D30); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070D90); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070DF0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070E50); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070EB0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070F10); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070F70); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070FD0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071030); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80071090, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800710F0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071150); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800711B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071210); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071270); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800712D0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071330); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071390); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800713F0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071450); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800714B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071510); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071570); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800715D0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071630); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071690); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800716F0); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800717B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071810); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071870); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_800718D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071930); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071990); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800719F0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071A50); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071AB0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071B10); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071B70); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071BD0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071C30); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071C90); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071CF0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071D50); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071DB0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071E10); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071E70); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071ED0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071F30); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071F90); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80071FF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072050); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_800720B0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072110); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072170); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800721D0); - -INCLUDE_ASM(UNK_TYPE, "os/code_4ac90_len_3910", func_80072230, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, - s32 arg5); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072290); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800722F0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072350); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800723B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072410); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072470); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800724D0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072530); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072590); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800725F0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072650); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800726B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072710); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072770); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800727D0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072830); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072890); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800728F0); - -INCLUDE_ASM(void, "os/code_4ac90_len_3910", func_80072950, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 time); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800729B0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072A10); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072A70); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072AD0); - -// FILE SPLIT -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072B30); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BB0); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BCC); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", load_battle_section); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", load_battle); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", set_battle_stage); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CDC); - -void func_80072CEC(){ -} - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CF4); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", setup_demo_player); - -INCLUDE_ASM(s32, "os/code_4ac90_len_3910", load_demo_battle); diff --git a/src/os/osEPiLinkHandle.c b/src/os/osEPiLinkHandle.c new file mode 100644 index 0000000000..50048acbd0 --- /dev/null +++ b/src/os/osEPiLinkHandle.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/osEPiLinkHandle", osEPiLinkHandle, OSPiHandle* handle); diff --git a/src/os/osEPiReadIo.c b/src/os/osEPiReadIo.c index e7c8e44a87..851813a1d9 100644 --- a/src/os/osEPiReadIo.c +++ b/src/os/osEPiReadIo.c @@ -1,3 +1,12 @@ +#define MOVE_ADDU + #include "common.h" -INCLUDE_ASM(s32, "os/osEPiReadIo", osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); +s32 osEPiReadIo(OSPiHandle* pihandle, u32 devAddr, u32* data) { + s32 ret; + + __osPiGetAccess(); + ret = osEPiRawReadIo(pihandle, devAddr, data); + __osPiRelAccess(); + return ret; +} diff --git a/src/os/osEPiStartDma.c b/src/os/osEPiStartDma.c new file mode 100644 index 0000000000..f8c6c08511 --- /dev/null +++ b/src/os/osEPiStartDma.c @@ -0,0 +1,23 @@ +#define MOVE_ADDU + +#include "common.h" + +s32 osEPiStartDma(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) { + if (!__osPiDevMgr.active) { + return -1; + } + + mb->piHandle = pihandle; + + if (direction == OS_READ) { + mb->hdr.type = OS_MESG_TYPE_EDMAREAD; + } else { + mb->hdr.type = OS_MESG_TYPE_EDMAWRITE; + } + + if (mb->hdr.pri != OS_MESG_PRI_HIGH) { + return osSendMesg(osPiGetCmdQueue(), mb, 0); + } else { + return osJamMesg(osPiGetCmdQueue(), mb, 0); + } +} diff --git a/src/os/osEPiWriteIo.c b/src/os/osEPiWriteIo.c index 8b1aaf1adb..5d74c5be91 100644 --- a/src/os/osEPiWriteIo.c +++ b/src/os/osEPiWriteIo.c @@ -1,6 +1,7 @@ +#define MOVE_ADDU + #include "common.h" -#ifdef MOVE_ISSUE s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { register s32 ret; @@ -10,6 +11,3 @@ s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { return ret; } -#else -INCLUDE_ASM(s32, "os/osEPiWriteIo", osEPiWriteIo, OSPiHandle* handle, u32 devAddr, u32 data); -#endif diff --git a/src/os/osJamMesg.c b/src/os/osJamMesg.c new file mode 100644 index 0000000000..3b7894b6c5 --- /dev/null +++ b/src/os/osJamMesg.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/osJamMesg", osJamMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); diff --git a/src/os/osRecvMesg.c b/src/os/osRecvMesg.c new file mode 100644 index 0000000000..4114309b68 --- /dev/null +++ b/src/os/osRecvMesg.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/osRecvMesg", osRecvMesg, OSMesgQueue* queue, OSMesg* mesg, s32 unk); diff --git a/src/os/osSetThreadPri.c b/src/os/osSetThreadPri.c index 6f799c89f3..f485d967e1 100644 --- a/src/os/osSetThreadPri.c +++ b/src/os/osSetThreadPri.c @@ -1,3 +1,5 @@ +#define MOVE_ADDU + #include "common.h" struct __osThreadTail { @@ -11,7 +13,6 @@ OSThread* __osActiveQueue = (OSThread*)&__osThreadTail; OSThread* __osRunningThread = NULL; OSThread* __osFaultedThread = NULL; -#ifdef MOVE_ISSUE void osSetThreadPri(OSThread* thread, OSPri pri) { register u32 prevInt = __osDisableInt(); @@ -33,6 +34,3 @@ void osSetThreadPri(OSThread* thread, OSPri pri) { __osRestoreInt(prevInt); } -#else -INCLUDE_ASM(void, "os/osSetThreadPri", osSetThreadPri, OSThread* thread, OSPri pri); -#endif diff --git a/ver/us/asm/data/code_6FA70.data.s b/ver/us/asm/data/code_6FA70.data.s index 913722e0ff..1cc3da27ce 100644 --- a/ver/us/asm/data/code_6FA70.data.s +++ b/ver/us/asm/data/code_6FA70.data.s @@ -2,60 +2,6 @@ .section .data -#glabel __osCurrentHandle -#.word 0x800B4518, 0x800B1B08 - -#glabel D_80093D78 -#.word 0x00000000, 0x00000000 - -#glabel D_80093D80 -#.word 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -#glabel __osPiAccessQueueEnabled -#.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -#glabel hdwrBugFlag -#.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -#glabel __osContinitialized -#.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -#glabel dtor -#.float 0.017453292, 0.0, 0.0, 0.0 - -#glabel D_80093DD0 -#.float 0.017453292, 0.0, 0.0, 0.0 - -#glabel sintable -#.short 0x0000, 0x0032, 0x0064, 0x0096, 0x00C9, 0x00FB, 0x012D, 0x0160, 0x0192, 0x01C4, 0x01F7, 0x0229, 0x025B, 0x028E, 0x02C0, 0x02F2, 0x0324, 0x0357, 0x0389, 0x03BB, 0x03EE, 0x0420, 0x0452, 0x0484, 0x04B7, 0x04E9, 0x051B, 0x054E, 0x0580, 0x05B2, 0x05E4, 0x0617, 0x0649, 0x067B, 0x06AD, 0x06E0, 0x0712, 0x0744, 0x0776, 0x07A9, 0x07DB, 0x080D, 0x083F, 0x0871, 0x08A4, 0x08D6, 0x0908, 0x093A, 0x096C, 0x099F, 0x09D1, 0x0A03, 0x0A35, 0x0A67, 0x0A99, 0x0ACB, 0x0AFE, 0x0B30, 0x0B62, 0x0B94, 0x0BC6, 0x0BF8, 0x0C2A, 0x0C5C, 0x0C8E, 0x0CC0, 0x0CF2, 0x0D25, 0x0D57, 0x0D89, 0x0DBB, 0x0DED, 0x0E1F, 0x0E51, 0x0E83, 0x0EB5, 0x0EE7, 0x0F19, 0x0F4B, 0x0F7C, 0x0FAE, 0x0FE0, 0x1012, 0x1044, 0x1076, 0x10A8, 0x10DA, 0x110C, 0x113E, 0x116F, 0x11A1, 0x11D3, 0x1205, 0x1237, 0x1269, 0x129A, 0x12CC, 0x12FE, 0x1330, 0x1361, 0x1393, 0x13C5, 0x13F6, 0x1428, 0x145A, 0x148C, 0x14BD, 0x14EF, 0x1520, 0x1552, 0x1584, 0x15B5, 0x15E7, 0x1618, 0x164A, 0x167B, 0x16AD, 0x16DF, 0x1710, 0x1741, 0x1773, 0x17A4, 0x17D6, 0x1807, 0x1839, 0x186A, 0x189B, 0x18CD, 0x18FE, 0x1930, 0x1961, 0x1992, 0x19C3, 0x19F5, 0x1A26, 0x1A57, 0x1A88, 0x1ABA, 0x1AEB, 0x1B1C, 0x1B4D, 0x1B7E, 0x1BAF, 0x1BE1, 0x1C12, 0x1C43, 0x1C74, 0x1CA5, 0x1CD6, 0x1D07, 0x1D38, 0x1D69, 0x1D9A, 0x1DCB, 0x1DFC, 0x1E2D, 0x1E5D, 0x1E8E, 0x1EBF, 0x1EF0, 0x1F21, 0x1F52, 0x1F82, 0x1FB3, 0x1FE4, 0x2015, 0x2045, 0x2076, 0x20A7, 0x20D7, 0x2108, 0x2139, 0x2169, 0x219A, 0x21CA, 0x21FB, 0x222B, 0x225C, 0x228C, 0x22BD, 0x22ED, 0x231D, 0x234E, 0x237E, 0x23AE, 0x23DF, 0x240F, 0x243F, 0x2470, 0x24A0, 0x24D0, 0x2500, 0x2530, 0x2560, 0x2591, 0x25C1, 0x25F1, 0x2621, 0x2651, 0x2681, 0x26B1, 0x26E1, 0x2711, 0x2740, 0x2770, 0x27A0, 0x27D0, 0x2800, 0x2830, 0x285F, 0x288F, 0x28BF, 0x28EE, 0x291E, 0x294E, 0x297D, 0x29AD, 0x29DD, 0x2A0C, 0x2A3C, 0x2A6B, 0x2A9B, 0x2ACA, 0x2AF9, 0x2B29, 0x2B58, 0x2B87, 0x2BB7, 0x2BE6, 0x2C15, 0x2C44, 0x2C74, 0x2CA3, 0x2CD2, 0x2D01, 0x2D30, 0x2D5F, 0x2D8E, 0x2DBD, 0x2DEC, 0x2E1B, 0x2E4A, 0x2E79, 0x2EA8, 0x2ED7, 0x2F06, 0x2F34, 0x2F63, 0x2F92, 0x2FC0, 0x2FEF, 0x301E, 0x304C, 0x307B, 0x30A9, 0x30D8, 0x3107, 0x3135, 0x3163, 0x3192, 0x31C0, 0x31EF, 0x321D, 0x324B, 0x3279, 0x32A8, 0x32D6, 0x3304, 0x3332, 0x3360, 0x338E, 0x33BC, 0x33EA, 0x3418, 0x3446, 0x3474, 0x34A2, 0x34D0, 0x34FE, 0x352B, 0x3559, 0x3587, 0x35B5, 0x35E2, 0x3610, 0x363D, 0x366B, 0x3698, 0x36C6, 0x36F3, 0x3721, 0x374E, 0x377C, 0x37A9, 0x37D6, 0x3803, 0x3831, 0x385E, 0x388B, 0x38B8, 0x38E5, 0x3912, 0x393F, 0x396C, 0x3999, 0x39C6, 0x39F3, 0x3A20, 0x3A4D, 0x3A79, 0x3AA6, 0x3AD3, 0x3B00, 0x3B2C, 0x3B59, 0x3B85, 0x3BB2, 0x3BDE, 0x3C0B, 0x3C37, 0x3C64, 0x3C90, 0x3CBC, 0x3CE9, 0x3D15, 0x3D41, 0x3D6D, 0x3D99, 0x3DC5, 0x3DF1, 0x3E1D, 0x3E49, 0x3E75, 0x3EA1, 0x3ECD, 0x3EF9, 0x3F25, 0x3F50, 0x3F7C, 0x3FA8, 0x3FD3, 0x3FFF, 0x402B, 0x4056, 0x4082, 0x40AD, 0x40D8, 0x4104, 0x412F, 0x415A, 0x4186, 0x41B1, 0x41DC, 0x4207, 0x4232, 0x425D, 0x4288, 0x42B3, 0x42DE, 0x4309, 0x4334, 0x435F, 0x4389, 0x43B4, 0x43DF, 0x4409, 0x4434, 0x445F, 0x4489, 0x44B4, 0x44DE, 0x4508, 0x4533, 0x455D, 0x4587, 0x45B1, 0x45DC, 0x4606, 0x4630, 0x465A, 0x4684, 0x46AE, 0x46D8, 0x4702, 0x472C, 0x4755, 0x477F, 0x47A9, 0x47D2, 0x47FC, 0x4826, 0x484F, 0x4879, 0x48A2, 0x48CC, 0x48F5, 0x491E, 0x4948, 0x4971, 0x499A, 0x49C3, 0x49EC, 0x4A15, 0x4A3E, 0x4A67, 0x4A90, 0x4AB9, 0x4AE2, 0x4B0B, 0x4B33, 0x4B5C, 0x4B85, 0x4BAD, 0x4BD6, 0x4BFE, 0x4C27, 0x4C4F, 0x4C78, 0x4CA0, 0x4CC8, 0x4CF0, 0x4D19, 0x4D41, 0x4D69, 0x4D91, 0x4DB9, 0x4DE1, 0x4E09, 0x4E31, 0x4E58, 0x4E80, 0x4EA8, 0x4ED0, 0x4EF7, 0x4F1F, 0x4F46, 0x4F6E, 0x4F95, 0x4FBD, 0x4FE4, 0x500B, 0x5032, 0x505A, 0x5081, 0x50A8, 0x50CF, 0x50F6, 0x511D, 0x5144, 0x516B, 0x5191, 0x51B8, 0x51DF, 0x5205, 0x522C, 0x5253, 0x5279, 0x52A0, 0x52C6, 0x52EC, 0x5313, 0x5339, 0x535F, 0x5385, 0x53AB, 0x53D1, 0x53F7, 0x541D, 0x5443, 0x5469, 0x548F, 0x54B5, 0x54DA, 0x5500, 0x5525, 0x554B, 0x5571, 0x5596, 0x55BB, 0x55E1, 0x5606, 0x562B, 0x5650, 0x5675, 0x569B, 0x56C0, 0x56E5, 0x5709, 0x572E, 0x5753, 0x5778, 0x579D, 0x57C1, 0x57E6, 0x580A, 0x582F, 0x5853, 0x5878, 0x589C, 0x58C0, 0x58E5, 0x5909, 0x592D, 0x5951, 0x5975, 0x5999, 0x59BD, 0x59E1, 0x5A04, 0x5A28, 0x5A4C, 0x5A6F, 0x5A93, 0x5AB7, 0x5ADA, 0x5AFD, 0x5B21, 0x5B44, 0x5B67, 0x5B8B, 0x5BAE, 0x5BD1, 0x5BF4, 0x5C17, 0x5C3A, 0x5C5D, 0x5C7F, 0x5CA2, 0x5CC5, 0x5CE7, 0x5D0A, 0x5D2D, 0x5D4F, 0x5D71, 0x5D94, 0x5DB6, 0x5DD8, 0x5DFA, 0x5E1D, 0x5E3F, 0x5E61, 0x5E83, 0x5EA5, 0x5EC6, 0x5EE8, 0x5F0A, 0x5F2C, 0x5F4D, 0x5F6F, 0x5F90, 0x5FB2, 0x5FD3, 0x5FF4, 0x6016, 0x6037, 0x6058, 0x6079, 0x609A, 0x60BB, 0x60DC, 0x60FD, 0x611E, 0x613E, 0x615F, 0x6180, 0x61A0, 0x61C1, 0x61E1, 0x6202, 0x6222, 0x6242, 0x6263, 0x6283, 0x62A3, 0x62C3, 0x62E3, 0x6303, 0x6323, 0x6342, 0x6362, 0x6382, 0x63A1, 0x63C1, 0x63E0, 0x6400, 0x641F, 0x643F, 0x645E, 0x647D, 0x649C, 0x64BB, 0x64DA, 0x64F9, 0x6518, 0x6537, 0x6556, 0x6574, 0x6593, 0x65B2, 0x65D0, 0x65EF, 0x660D, 0x662B, 0x664A, 0x6668, 0x6686, 0x66A4, 0x66C2, 0x66E0, 0x66FE, 0x671C, 0x673A, 0x6757, 0x6775, 0x6792, 0x67B0, 0x67CD, 0x67EB, 0x6808, 0x6825, 0x6843, 0x6860, 0x687D, 0x689A, 0x68B7, 0x68D4, 0x68F1, 0x690D, 0x692A, 0x6947, 0x6963, 0x6980, 0x699C, 0x69B9, 0x69D5, 0x69F1, 0x6A0E, 0x6A2A, 0x6A46, 0x6A62, 0x6A7E, 0x6A9A, 0x6AB5, 0x6AD1, 0x6AED, 0x6B08, 0x6B24, 0x6B40, 0x6B5B, 0x6B76, 0x6B92, 0x6BAD, 0x6BC8, 0x6BE3, 0x6BFE, 0x6C19, 0x6C34, 0x6C4F, 0x6C6A, 0x6C84, 0x6C9F, 0x6CBA, 0x6CD4, 0x6CEF, 0x6D09, 0x6D23, 0x6D3E, 0x6D58, 0x6D72, 0x6D8C, 0x6DA6, 0x6DC0, 0x6DDA, 0x6DF3, 0x6E0D, 0x6E27, 0x6E40, 0x6E5A, 0x6E73, 0x6E8D, 0x6EA6, 0x6EBF, 0x6ED9, 0x6EF2, 0x6F0B, 0x6F24, 0x6F3D, 0x6F55, 0x6F6E, 0x6F87, 0x6FA0, 0x6FB8, 0x6FD1, 0x6FE9, 0x7002, 0x701A, 0x7032, 0x704A, 0x7062, 0x707A, 0x7092, 0x70AA, 0x70C2, 0x70DA, 0x70F2, 0x7109, 0x7121, 0x7138, 0x7150, 0x7167, 0x717E, 0x7196, 0x71AD, 0x71C4, 0x71DB, 0x71F2, 0x7209, 0x7220, 0x7236, 0x724D, 0x7264, 0x727A, 0x7291, 0x72A7, 0x72BD, 0x72D4, 0x72EA, 0x7300, 0x7316, 0x732C, 0x7342, 0x7358, 0x736E, 0x7383, 0x7399, 0x73AE, 0x73C4, 0x73D9, 0x73EF, 0x7404, 0x7419, 0x742E, 0x7443, 0x7458, 0x746D, 0x7482, 0x7497, 0x74AC, 0x74C0, 0x74D5, 0x74EA, 0x74FE, 0x7512, 0x7527, 0x753B, 0x754F, 0x7563, 0x7577, 0x758B, 0x759F, 0x75B3, 0x75C7, 0x75DA, 0x75EE, 0x7601, 0x7615, 0x7628, 0x763B, 0x764F, 0x7662, 0x7675, 0x7688, 0x769B, 0x76AE, 0x76C1, 0x76D3, 0x76E6, 0x76F9, 0x770B, 0x771E, 0x7730, 0x7742, 0x7754, 0x7767, 0x7779, 0x778B, 0x779D, 0x77AF, 0x77C0, 0x77D2, 0x77E4, 0x77F5, 0x7807, 0x7818, 0x782A, 0x783B, 0x784C, 0x785D, 0x786E, 0x787F, 0x7890, 0x78A1, 0x78B2, 0x78C3, 0x78D3, 0x78E4, 0x78F4, 0x7905, 0x7915, 0x7925, 0x7936, 0x7946, 0x7956, 0x7966, 0x7976, 0x7985, 0x7995, 0x79A5, 0x79B5, 0x79C4, 0x79D4, 0x79E3, 0x79F2, 0x7A02, 0x7A11, 0x7A20, 0x7A2F, 0x7A3E, 0x7A4D, 0x7A5B, 0x7A6A, 0x7A79, 0x7A87, 0x7A96, 0x7AA4, 0x7AB3, 0x7AC1, 0x7ACF, 0x7ADD, 0x7AEB, 0x7AF9, 0x7B07, 0x7B15, 0x7B23, 0x7B31, 0x7B3E, 0x7B4C, 0x7B59, 0x7B67, 0x7B74, 0x7B81, 0x7B8E, 0x7B9B, 0x7BA8, 0x7BB5, 0x7BC2, 0x7BCF, 0x7BDC, 0x7BE8, 0x7BF5, 0x7C02, 0x7C0E, 0x7C1A, 0x7C27, 0x7C33, 0x7C3F, 0x7C4B, 0x7C57, 0x7C63, 0x7C6F, 0x7C7A, 0x7C86, 0x7C92, 0x7C9D, 0x7CA9, 0x7CB4, 0x7CBF, 0x7CCB, 0x7CD6, 0x7CE1, 0x7CEC, 0x7CF7, 0x7D02, 0x7D0C, 0x7D17, 0x7D22, 0x7D2C, 0x7D37, 0x7D41, 0x7D4B, 0x7D56, 0x7D60, 0x7D6A, 0x7D74, 0x7D7E, 0x7D88, 0x7D91, 0x7D9B, 0x7DA5, 0x7DAE, 0x7DB8, 0x7DC1, 0x7DCB, 0x7DD4, 0x7DDD, 0x7DE6, 0x7DEF, 0x7DF8, 0x7E01, 0x7E0A, 0x7E13, 0x7E1B, 0x7E24, 0x7E2C, 0x7E35, 0x7E3D, 0x7E45, 0x7E4D, 0x7E56, 0x7E5E, 0x7E66, 0x7E6D, 0x7E75, 0x7E7D, 0x7E85, 0x7E8C, 0x7E94, 0x7E9B, 0x7EA3, 0x7EAA, 0x7EB1, 0x7EB8, 0x7EBF, 0x7EC6, 0x7ECD, 0x7ED4, 0x7EDB, 0x7EE1, 0x7EE8, 0x7EEE, 0x7EF5, 0x7EFB, 0x7F01, 0x7F08, 0x7F0E, 0x7F14, 0x7F1A, 0x7F20, 0x7F25, 0x7F2B, 0x7F31, 0x7F36, 0x7F3C, 0x7F41, 0x7F47, 0x7F4C, 0x7F51, 0x7F56, 0x7F5B, 0x7F60, 0x7F65, 0x7F6A, 0x7F6F, 0x7F74, 0x7F78, 0x7F7D, 0x7F81, 0x7F85, 0x7F8A, 0x7F8E, 0x7F92, 0x7F96, 0x7F9A, 0x7F9E, 0x7FA2, 0x7FA6, 0x7FA9, 0x7FAD, 0x7FB0, 0x7FB4, 0x7FB7, 0x7FBA, 0x7FBE, 0x7FC1, 0x7FC4, 0x7FC7, 0x7FCA, 0x7FCC, 0x7FCF, 0x7FD2, 0x7FD4, 0x7FD7, 0x7FD9, 0x7FDC, 0x7FDE, 0x7FE0, 0x7FE2, 0x7FE4, 0x7FE6, 0x7FE8, 0x7FEA, 0x7FEC, 0x7FED, 0x7FEF, 0x7FF1, 0x7FF2, 0x7FF3, 0x7FF5, 0x7FF6, 0x7FF7, 0x7FF8, 0x7FF9, 0x7FFA, 0x7FFB, 0x7FFB, 0x7FFC, 0x7FFD, 0x7FFD, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFE, 0x7FFF - -#glabel spaces -#.ascii " \0\0\0\0" - -#glabel zeroes -#.word 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x30303030, 0x00000000, 0x00000000, 0x00000000 - -#glabel __osPreNMI -#.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -#glabel __osSiAccessQueueEnabled -#.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -#glabel __osThreadTail -#.word 0x00000000, 0xFFFFFFFF - -#glabel __osRunQueue -#.word __osThreadTail - -#glabel __osActiveQueue -#.word __osThreadTail - -#glabel __osRunningThread -#.word 0x00000000 - -#glabel __osFaultedThread -#.word 0x00000000, 0x00000000, 0x00000000 - glabel D_80094670 .word 0x800D9210, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072B30.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072B30.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BB0.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072BB0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BB0.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072BB0.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072BCC.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072BCC.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072CDC.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072CDC.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CF4.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072CF4.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CF4.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072CF4.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/load_battle.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/load_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/load_battle.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/load_battle.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/load_battle_section.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/load_battle_section.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/load_battle_section.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/load_battle_section.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/load_demo_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/load_demo_battle.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/set_battle_stage.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/set_battle_stage.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/set_battle_stage.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/set_battle_stage.s diff --git a/ver/us/asm/nonmatchings/os/code_4ac90_len_3910/setup_demo_player.s b/ver/us/asm/nonmatchings/code_4ac90_len_3910/setup_demo_player.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4ac90_len_3910/setup_demo_player.s rename to ver/us/asm/nonmatchings/code_4ac90_len_3910/setup_demo_player.s diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s deleted file mode 100644 index 2bd9e4d7d0..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1000_7900D0 -/* 7900D0 802A1000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7900D4 802A1004 AFB1001C */ sw $s1, 0x1c($sp) -/* 7900D8 802A1008 0080882D */ daddu $s1, $a0, $zero -/* 7900DC 802A100C AFBF0024 */ sw $ra, 0x24($sp) -/* 7900E0 802A1010 AFB20020 */ sw $s2, 0x20($sp) -/* 7900E4 802A1014 AFB00018 */ sw $s0, 0x18($sp) -/* 7900E8 802A1018 8E30000C */ lw $s0, 0xc($s1) -/* 7900EC 802A101C 8E050000 */ lw $a1, ($s0) -/* 7900F0 802A1020 0C0B1EAF */ jal get_variable -/* 7900F4 802A1024 26100004 */ addiu $s0, $s0, 4 -/* 7900F8 802A1028 8E050000 */ lw $a1, ($s0) -/* 7900FC 802A102C 26100004 */ addiu $s0, $s0, 4 -/* 790100 802A1030 0220202D */ daddu $a0, $s1, $zero -/* 790104 802A1034 0C0B1EAF */ jal get_variable -/* 790108 802A1038 0040902D */ daddu $s2, $v0, $zero -/* 79010C 802A103C 0220202D */ daddu $a0, $s1, $zero -/* 790110 802A1040 8E050000 */ lw $a1, ($s0) -/* 790114 802A1044 0C0B1EAF */ jal get_variable -/* 790118 802A1048 0040802D */ daddu $s0, $v0, $zero -/* 79011C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 790120 802A1050 00000000 */ nop -/* 790124 802A1054 468010A0 */ cvt.s.w $f2, $f2 -/* 790128 802A1058 44051000 */ mfc1 $a1, $f2 -/* 79012C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 790130 802A1060 00000000 */ nop -/* 790134 802A1064 468010A0 */ cvt.s.w $f2, $f2 -/* 790138 802A1068 44061000 */ mfc1 $a2, $f2 -/* 79013C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 790140 802A1070 00000000 */ nop -/* 790144 802A1074 468010A0 */ cvt.s.w $f2, $f2 -/* 790148 802A1078 3C014220 */ lui $at, 0x4220 -/* 79014C 802A107C 44810000 */ mtc1 $at, $f0 -/* 790150 802A1080 44071000 */ mfc1 $a3, $f2 -/* 790154 802A1084 0000202D */ daddu $a0, $zero, $zero -/* 790158 802A1088 0C01BFBC */ jal func_8006FEF0 -/* 79015C 802A108C E7A00010 */ swc1 $f0, 0x10($sp) -/* 790160 802A1090 8FBF0024 */ lw $ra, 0x24($sp) -/* 790164 802A1094 8FB20020 */ lw $s2, 0x20($sp) -/* 790168 802A1098 8FB1001C */ lw $s1, 0x1c($sp) -/* 79016C 802A109C 8FB00018 */ lw $s0, 0x18($sp) -/* 790170 802A10A0 24020002 */ addiu $v0, $zero, 2 -/* 790174 802A10A4 03E00008 */ jr $ra -/* 790178 802A10A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s deleted file mode 100644 index dd970cc23b..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A10AC_79017C -/* 79017C 802A10AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 790180 802A10B0 AFB10024 */ sw $s1, 0x24($sp) -/* 790184 802A10B4 0080882D */ daddu $s1, $a0, $zero -/* 790188 802A10B8 AFBF002C */ sw $ra, 0x2c($sp) -/* 79018C 802A10BC AFB20028 */ sw $s2, 0x28($sp) -/* 790190 802A10C0 AFB00020 */ sw $s0, 0x20($sp) -/* 790194 802A10C4 8E30000C */ lw $s0, 0xc($s1) -/* 790198 802A10C8 8E050000 */ lw $a1, ($s0) -/* 79019C 802A10CC 0C0B1EAF */ jal get_variable -/* 7901A0 802A10D0 26100004 */ addiu $s0, $s0, 4 -/* 7901A4 802A10D4 8E050000 */ lw $a1, ($s0) -/* 7901A8 802A10D8 26100004 */ addiu $s0, $s0, 4 -/* 7901AC 802A10DC 0220202D */ daddu $a0, $s1, $zero -/* 7901B0 802A10E0 0C0B1EAF */ jal get_variable -/* 7901B4 802A10E4 0040902D */ daddu $s2, $v0, $zero -/* 7901B8 802A10E8 0220202D */ daddu $a0, $s1, $zero -/* 7901BC 802A10EC 8E050000 */ lw $a1, ($s0) -/* 7901C0 802A10F0 0C0B1EAF */ jal get_variable -/* 7901C4 802A10F4 0040802D */ daddu $s0, $v0, $zero -/* 7901C8 802A10F8 24040005 */ addiu $a0, $zero, 5 -/* 7901CC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7901D0 802A1100 00000000 */ nop -/* 7901D4 802A1104 468010A0 */ cvt.s.w $f2, $f2 -/* 7901D8 802A1108 44051000 */ mfc1 $a1, $f2 -/* 7901DC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7901E0 802A1110 00000000 */ nop -/* 7901E4 802A1114 468010A0 */ cvt.s.w $f2, $f2 -/* 7901E8 802A1118 44061000 */ mfc1 $a2, $f2 -/* 7901EC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7901F0 802A1120 00000000 */ nop -/* 7901F4 802A1124 468010A0 */ cvt.s.w $f2, $f2 -/* 7901F8 802A1128 3C014248 */ lui $at, 0x4248 -/* 7901FC 802A112C 44810000 */ mtc1 $at, $f0 -/* 790200 802A1130 44071000 */ mfc1 $a3, $f2 -/* 790204 802A1134 24030028 */ addiu $v1, $zero, 0x28 -/* 790208 802A1138 AFA30018 */ sw $v1, 0x18($sp) -/* 79020C 802A113C 2403001E */ addiu $v1, $zero, 0x1e -/* 790210 802A1140 AFA3001C */ sw $v1, 0x1c($sp) -/* 790214 802A1144 E7A00010 */ swc1 $f0, 0x10($sp) -/* 790218 802A1148 0C01C154 */ jal func_80070550 -/* 79021C 802A114C E7A00014 */ swc1 $f0, 0x14($sp) -/* 790220 802A1150 8FBF002C */ lw $ra, 0x2c($sp) -/* 790224 802A1154 8FB20028 */ lw $s2, 0x28($sp) -/* 790228 802A1158 8FB10024 */ lw $s1, 0x24($sp) -/* 79022C 802A115C 8FB00020 */ lw $s0, 0x20($sp) -/* 790230 802A1160 24020002 */ addiu $v0, $zero, 2 -/* 790234 802A1164 03E00008 */ jr $ra -/* 790238 802A1168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s deleted file mode 100644 index 166b5eea14..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A116C_79023C -/* 79023C 802A116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 790240 802A1170 AFB1001C */ sw $s1, 0x1c($sp) -/* 790244 802A1174 0080882D */ daddu $s1, $a0, $zero -/* 790248 802A1178 AFBF0024 */ sw $ra, 0x24($sp) -/* 79024C 802A117C AFB20020 */ sw $s2, 0x20($sp) -/* 790250 802A1180 AFB00018 */ sw $s0, 0x18($sp) -/* 790254 802A1184 8E30000C */ lw $s0, 0xc($s1) -/* 790258 802A1188 8E050000 */ lw $a1, ($s0) -/* 79025C 802A118C 0C0B1EAF */ jal get_variable -/* 790260 802A1190 26100004 */ addiu $s0, $s0, 4 -/* 790264 802A1194 8E050000 */ lw $a1, ($s0) -/* 790268 802A1198 26100004 */ addiu $s0, $s0, 4 -/* 79026C 802A119C 0220202D */ daddu $a0, $s1, $zero -/* 790270 802A11A0 0C0B1EAF */ jal get_variable -/* 790274 802A11A4 0040902D */ daddu $s2, $v0, $zero -/* 790278 802A11A8 0220202D */ daddu $a0, $s1, $zero -/* 79027C 802A11AC 8E050000 */ lw $a1, ($s0) -/* 790280 802A11B0 0C0B1EAF */ jal get_variable -/* 790284 802A11B4 0040802D */ daddu $s0, $v0, $zero -/* 790288 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79028C 802A11BC 00000000 */ nop -/* 790290 802A11C0 468010A0 */ cvt.s.w $f2, $f2 -/* 790294 802A11C4 44051000 */ mfc1 $a1, $f2 -/* 790298 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79029C 802A11CC 00000000 */ nop -/* 7902A0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 -/* 7902A4 802A11D4 44061000 */ mfc1 $a2, $f2 -/* 7902A8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 7902AC 802A11DC 00000000 */ nop -/* 7902B0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 -/* 7902B4 802A11E4 3C0141F0 */ lui $at, 0x41f0 -/* 7902B8 802A11E8 44810000 */ mtc1 $at, $f0 -/* 7902BC 802A11EC 44071000 */ mfc1 $a3, $f2 -/* 7902C0 802A11F0 0000202D */ daddu $a0, $zero, $zero -/* 7902C4 802A11F4 0C01BFBC */ jal func_8006FEF0 -/* 7902C8 802A11F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7902CC 802A11FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 7902D0 802A1200 8FB20020 */ lw $s2, 0x20($sp) -/* 7902D4 802A1204 8FB1001C */ lw $s1, 0x1c($sp) -/* 7902D8 802A1208 8FB00018 */ lw $s0, 0x18($sp) -/* 7902DC 802A120C 24020002 */ addiu $v0, $zero, 2 -/* 7902E0 802A1210 03E00008 */ jr $ra -/* 7902E4 802A1214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A137C_79044C.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A137C_79044C.s deleted file mode 100644 index 193156efda..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A137C_79044C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A137C_79044C -/* 79044C 802A137C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 790450 802A1380 AFB00010 */ sw $s0, 0x10($sp) -/* 790454 802A1384 0080802D */ daddu $s0, $a0, $zero -/* 790458 802A1388 10A0000D */ beqz $a1, .L802A13C0 -/* 79045C 802A138C AFBF0014 */ sw $ra, 0x14($sp) -/* 790460 802A1390 0C04760B */ jal func_8011D82C -/* 790464 802A1394 24040001 */ addiu $a0, $zero, 1 -/* 790468 802A1398 0000202D */ daddu $a0, $zero, $zero -/* 79046C 802A139C 0080282D */ daddu $a1, $a0, $zero -/* 790470 802A13A0 0080302D */ daddu $a2, $a0, $zero -/* 790474 802A13A4 0080382D */ daddu $a3, $a0, $zero -/* 790478 802A13A8 3C038015 */ lui $v1, %hi(D_801512F0) -/* 79047C 802A13AC 8C6312F0 */ lw $v1, %lo(D_801512F0)($v1) -/* 790480 802A13B0 24020001 */ addiu $v0, $zero, 1 -/* 790484 802A13B4 0C046F97 */ jal set_background_color_blend -/* 790488 802A13B8 A0620000 */ sb $v0, ($v1) -/* 79048C 802A13BC AE000070 */ sw $zero, 0x70($s0) -.L802A13C0: -/* 790490 802A13C0 0000202D */ daddu $a0, $zero, $zero -/* 790494 802A13C4 0080282D */ daddu $a1, $a0, $zero -/* 790498 802A13C8 92070073 */ lbu $a3, 0x73($s0) -/* 79049C 802A13CC 0C046F97 */ jal set_background_color_blend -/* 7904A0 802A13D0 0080302D */ daddu $a2, $a0, $zero -/* 7904A4 802A13D4 8E020070 */ lw $v0, 0x70($s0) -/* 7904A8 802A13D8 2442000A */ addiu $v0, $v0, 0xa -/* 7904AC 802A13DC AE020070 */ sw $v0, 0x70($s0) -/* 7904B0 802A13E0 284200E6 */ slti $v0, $v0, 0xe6 -/* 7904B4 802A13E4 14400007 */ bnez $v0, .L802A1404 -/* 7904B8 802A13E8 0000102D */ daddu $v0, $zero, $zero -/* 7904BC 802A13EC 0000202D */ daddu $a0, $zero, $zero -/* 7904C0 802A13F0 0080282D */ daddu $a1, $a0, $zero -/* 7904C4 802A13F4 0080302D */ daddu $a2, $a0, $zero -/* 7904C8 802A13F8 0C046F97 */ jal set_background_color_blend -/* 7904CC 802A13FC 240700E6 */ addiu $a3, $zero, 0xe6 -/* 7904D0 802A1400 24020002 */ addiu $v0, $zero, 2 -.L802A1404: -/* 7904D4 802A1404 8FBF0014 */ lw $ra, 0x14($sp) -/* 7904D8 802A1408 8FB00010 */ lw $s0, 0x10($sp) -/* 7904DC 802A140C 03E00008 */ jr $ra -/* 7904E0 802A1410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A1414_7904E4.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A1414_7904E4.s deleted file mode 100644 index 90c76bef9a..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A1414_7904E4.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A1414_7904E4 -/* 7904E4 802A1414 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7904E8 802A1418 AFB00010 */ sw $s0, 0x10($sp) -/* 7904EC 802A141C 0080802D */ daddu $s0, $a0, $zero -/* 7904F0 802A1420 10A00003 */ beqz $a1, .L802A1430 -/* 7904F4 802A1424 AFBF0014 */ sw $ra, 0x14($sp) -/* 7904F8 802A1428 24020014 */ addiu $v0, $zero, 0x14 -/* 7904FC 802A142C AE020070 */ sw $v0, 0x70($s0) -.L802A1430: -/* 790500 802A1430 0000202D */ daddu $a0, $zero, $zero -/* 790504 802A1434 0080282D */ daddu $a1, $a0, $zero -/* 790508 802A1438 8E020070 */ lw $v0, 0x70($s0) -/* 79050C 802A143C 0080302D */ daddu $a2, $a0, $zero -/* 790510 802A1440 00023880 */ sll $a3, $v0, 2 -/* 790514 802A1444 00E23821 */ addu $a3, $a3, $v0 -/* 790518 802A1448 00073840 */ sll $a3, $a3, 1 -/* 79051C 802A144C 0C046F97 */ jal set_background_color_blend -/* 790520 802A1450 30E700FE */ andi $a3, $a3, 0xfe -/* 790524 802A1454 8E020070 */ lw $v0, 0x70($s0) -/* 790528 802A1458 2442FFFF */ addiu $v0, $v0, -1 -/* 79052C 802A145C 10400003 */ beqz $v0, .L802A146C -/* 790530 802A1460 AE020070 */ sw $v0, 0x70($s0) -/* 790534 802A1464 080A8521 */ j .L802A1484 -/* 790538 802A1468 0000102D */ daddu $v0, $zero, $zero -.L802A146C: -/* 79053C 802A146C 0000202D */ daddu $a0, $zero, $zero -/* 790540 802A1470 0080282D */ daddu $a1, $a0, $zero -/* 790544 802A1474 0080302D */ daddu $a2, $a0, $zero -/* 790548 802A1478 0C046F97 */ jal set_background_color_blend -/* 79054C 802A147C 0080382D */ daddu $a3, $a0, $zero -/* 790550 802A1480 24020002 */ addiu $v0, $zero, 2 -.L802A1484: -/* 790554 802A1484 8FBF0014 */ lw $ra, 0x14($sp) -/* 790558 802A1488 8FB00010 */ lw $s0, 0x10($sp) -/* 79055C 802A148C 03E00008 */ jr $ra -/* 790560 802A1490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s b/ver/us/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s deleted file mode 100644 index a7adcd814c..0000000000 --- a/ver/us/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A153C_79060C -/* 79060C 802A153C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 790610 802A1540 AFBF0018 */ sw $ra, 0x18($sp) -/* 790614 802A1544 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 790618 802A1548 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 79061C 802A154C 0C00A67F */ jal rand_int -/* 790620 802A1550 240400C8 */ addiu $a0, $zero, 0xc8 -/* 790624 802A1554 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 790628 802A1558 4482B000 */ mtc1 $v0, $f22 -/* 79062C 802A155C 00000000 */ nop -/* 790630 802A1560 4680B5A0 */ cvt.s.w $f22, $f22 -/* 790634 802A1564 0C00A67F */ jal rand_int -/* 790638 802A1568 24040078 */ addiu $a0, $zero, 0x78 -/* 79063C 802A156C 24420007 */ addiu $v0, $v0, 7 -/* 790640 802A1570 4482A000 */ mtc1 $v0, $f20 -/* 790644 802A1574 00000000 */ nop -/* 790648 802A1578 4680A520 */ cvt.s.w $f20, $f20 -/* 79064C 802A157C 0C00A67F */ jal rand_int -/* 790650 802A1580 24040032 */ addiu $a0, $zero, 0x32 -/* 790654 802A1584 24040002 */ addiu $a0, $zero, 2 -/* 790658 802A1588 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 79065C 802A158C 44821000 */ mtc1 $v0, $f2 -/* 790660 802A1590 00000000 */ nop -/* 790664 802A1594 468010A0 */ cvt.s.w $f2, $f2 -/* 790668 802A1598 44071000 */ mfc1 $a3, $f2 -/* 79066C 802A159C 4405B000 */ mfc1 $a1, $f22 -/* 790670 802A15A0 4406A000 */ mfc1 $a2, $f20 -/* 790674 802A15A4 3C014000 */ lui $at, 0x4000 -/* 790678 802A15A8 44810000 */ mtc1 $at, $f0 -/* 79067C 802A15AC 24020014 */ addiu $v0, $zero, 0x14 -/* 790680 802A15B0 AFA20014 */ sw $v0, 0x14($sp) -/* 790684 802A15B4 0C01C88C */ jal func_80072230 -/* 790688 802A15B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 79068C 802A15BC 0C00A67F */ jal rand_int -/* 790690 802A15C0 240400C8 */ addiu $a0, $zero, 0xc8 -/* 790694 802A15C4 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 790698 802A15C8 4482B000 */ mtc1 $v0, $f22 -/* 79069C 802A15CC 00000000 */ nop -/* 7906A0 802A15D0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7906A4 802A15D4 0C00A67F */ jal rand_int -/* 7906A8 802A15D8 24040078 */ addiu $a0, $zero, 0x78 -/* 7906AC 802A15DC 24420007 */ addiu $v0, $v0, 7 -/* 7906B0 802A15E0 4482A000 */ mtc1 $v0, $f20 -/* 7906B4 802A15E4 00000000 */ nop -/* 7906B8 802A15E8 4680A520 */ cvt.s.w $f20, $f20 -/* 7906BC 802A15EC 0C00A67F */ jal rand_int -/* 7906C0 802A15F0 24040032 */ addiu $a0, $zero, 0x32 -/* 7906C4 802A15F4 2442FFE7 */ addiu $v0, $v0, -0x19 -/* 7906C8 802A15F8 44821000 */ mtc1 $v0, $f2 -/* 7906CC 802A15FC 00000000 */ nop -/* 7906D0 802A1600 468010A0 */ cvt.s.w $f2, $f2 -/* 7906D4 802A1604 4405B000 */ mfc1 $a1, $f22 -/* 7906D8 802A1608 4406A000 */ mfc1 $a2, $f20 -/* 7906DC 802A160C 3C014220 */ lui $at, 0x4220 -/* 7906E0 802A1610 44810000 */ mtc1 $at, $f0 -/* 7906E4 802A1614 44071000 */ mfc1 $a3, $f2 -/* 7906E8 802A1618 24040004 */ addiu $a0, $zero, 4 -/* 7906EC 802A161C 0C01BFBC */ jal func_8006FEF0 -/* 7906F0 802A1620 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7906F4 802A1624 8FBF0018 */ lw $ra, 0x18($sp) -/* 7906F8 802A1628 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 7906FC 802A162C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 790700 802A1630 24020002 */ addiu $v0, $zero, 2 -/* 790704 802A1634 03E00008 */ jr $ra -/* 790708 802A1638 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/os/code_3FEA0/sprintf.s b/ver/us/asm/nonmatchings/os/code_3FEA0/sprintf.s deleted file mode 100644 index 0df744877e..0000000000 --- a/ver/us/asm/nonmatchings/os/code_3FEA0/sprintf.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel sprintf -/* 408F0 800654F0 AFA50004 */ sw $a1, 4($sp) -/* 408F4 800654F4 AFA60008 */ sw $a2, 8($sp) -/* 408F8 800654F8 AFA7000C */ sw $a3, 0xc($sp) -/* 408FC 800654FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 40900 80065500 AFB00010 */ sw $s0, 0x10($sp) -/* 40904 80065504 00808021 */ addu $s0, $a0, $zero -/* 40908 80065508 00A03021 */ addu $a2, $a1, $zero -/* 4090C 8006550C 3C048006 */ lui $a0, %hi(proutSprintf) -/* 40910 80065510 24845548 */ addiu $a0, $a0, %lo(proutSprintf) -/* 40914 80065514 02002821 */ addu $a1, $s0, $zero -/* 40918 80065518 AFBF0014 */ sw $ra, 0x14($sp) -/* 4091C 8006551C 0C0192A8 */ jal _Printf -/* 40920 80065520 27A70020 */ addiu $a3, $sp, 0x20 -/* 40924 80065524 00401821 */ addu $v1, $v0, $zero -/* 40928 80065528 04600002 */ bltz $v1, .L80065534 -/* 4092C 8006552C 02031021 */ addu $v0, $s0, $v1 -/* 40930 80065530 A0400000 */ sb $zero, ($v0) -.L80065534: -/* 40934 80065534 00601021 */ addu $v0, $v1, $zero -/* 40938 80065538 8FBF0014 */ lw $ra, 0x14($sp) -/* 4093C 8006553C 8FB00010 */ lw $s0, 0x10($sp) -/* 40940 80065540 03E00008 */ jr $ra -/* 40944 80065544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s b/ver/us/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s deleted file mode 100644 index 54a6d20ca3..0000000000 --- a/ver/us/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osEPiStartDma -/* 3C220 80060E20 3C028009 */ lui $v0, %hi(__osPiDevMgr) -/* 3C224 80060E24 8C423D50 */ lw $v0, %lo(__osPiDevMgr)($v0) -/* 3C228 80060E28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3C22C 80060E2C AFB00010 */ sw $s0, 0x10($sp) -/* 3C230 80060E30 00A08021 */ addu $s0, $a1, $zero -/* 3C234 80060E34 14400003 */ bnez $v0, .L80060E44 -/* 3C238 80060E38 AFBF0014 */ sw $ra, 0x14($sp) -/* 3C23C 80060E3C 080183A9 */ j .L80060EA4 -/* 3C240 80060E40 2402FFFF */ addiu $v0, $zero, -1 -.L80060E44: -/* 3C244 80060E44 14C00003 */ bnez $a2, .L80060E54 -/* 3C248 80060E48 AE040014 */ sw $a0, 0x14($s0) -/* 3C24C 80060E4C 08018396 */ j .L80060E58 -/* 3C250 80060E50 2402000F */ addiu $v0, $zero, 0xf -.L80060E54: -/* 3C254 80060E54 24020010 */ addiu $v0, $zero, 0x10 -.L80060E58: -/* 3C258 80060E58 A6020000 */ sh $v0, ($s0) -/* 3C25C 80060E5C 92030002 */ lbu $v1, 2($s0) -/* 3C260 80060E60 24020001 */ addiu $v0, $zero, 1 -/* 3C264 80060E64 14620009 */ bne $v1, $v0, .L80060E8C -/* 3C268 80060E68 00000000 */ nop -/* 3C26C 80060E6C 0C01AD54 */ jal osPiGetCmdQueue -/* 3C270 80060E70 00000000 */ nop -/* 3C274 80060E74 00402021 */ addu $a0, $v0, $zero -/* 3C278 80060E78 02002821 */ addu $a1, $s0, $zero -/* 3C27C 80060E7C 0C01956C */ jal osJamMesg -/* 3C280 80060E80 00003021 */ addu $a2, $zero, $zero -/* 3C284 80060E84 080183A9 */ j .L80060EA4 -/* 3C288 80060E88 00000000 */ nop -.L80060E8C: -/* 3C28C 80060E8C 0C01AD54 */ jal osPiGetCmdQueue -/* 3C290 80060E90 00000000 */ nop -/* 3C294 80060E94 00402021 */ addu $a0, $v0, $zero -/* 3C298 80060E98 02002821 */ addu $a1, $s0, $zero -/* 3C29C 80060E9C 0C019608 */ jal osSendMesg -/* 3C2A0 80060EA0 00003021 */ addu $a2, $zero, $zero -.L80060EA4: -/* 3C2A4 80060EA4 8FBF0014 */ lw $ra, 0x14($sp) -/* 3C2A8 80060EA8 8FB00010 */ lw $s0, 0x10($sp) -/* 3C2AC 80060EAC 03E00008 */ jr $ra -/* 3C2B0 80060EB0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3C2B4 80060EB4 00000000 */ nop -/* 3C2B8 80060EB8 00000000 */ nop -/* 3C2BC 80060EBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s b/ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s deleted file mode 100644 index fb534ac5c1..0000000000 --- a/ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osContStartQuery -/* 3CD00 80061900 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3CD04 80061904 AFB00010 */ sw $s0, 0x10($sp) -/* 3CD08 80061908 AFBF0014 */ sw $ra, 0x14($sp) -/* 3CD0C 8006190C 0C019771 */ jal __osSiGetAccess -/* 3CD10 80061910 00808021 */ addu $s0, $a0, $zero -/* 3CD14 80061914 3C02800A */ lui $v0, %hi(D_8009A61C) -/* 3CD18 80061918 9042A61C */ lbu $v0, %lo(D_8009A61C)($v0) -/* 3CD1C 8006191C 1040000B */ beqz $v0, .L8006194C -/* 3CD20 80061920 00000000 */ nop -/* 3CD24 80061924 0C018774 */ jal osPackRequestData -/* 3CD28 80061928 00002021 */ addu $a0, $zero, $zero -/* 3CD2C 8006192C 3C05800B */ lui $a1, %hi(D_800B0ED0) -/* 3CD30 80061930 24A50ED0 */ addiu $a1, $a1, %lo(D_800B0ED0) -/* 3CD34 80061934 0C019730 */ jal osSiRawStartDma -/* 3CD38 80061938 24040001 */ addiu $a0, $zero, 1 -/* 3CD3C 8006193C 02002021 */ addu $a0, $s0, $zero -/* 3CD40 80061940 00002821 */ addu $a1, $zero, $zero -/* 3CD44 80061944 0C0195BC */ jal osRecvMesg -/* 3CD48 80061948 24060001 */ addiu $a2, $zero, 1 -.L8006194C: -/* 3CD4C 8006194C 3C05800B */ lui $a1, %hi(D_800B0ED0) -/* 3CD50 80061950 24A50ED0 */ addiu $a1, $a1, %lo(D_800B0ED0) -/* 3CD54 80061954 0C019730 */ jal osSiRawStartDma -/* 3CD58 80061958 00002021 */ addu $a0, $zero, $zero -/* 3CD5C 8006195C 3C01800A */ lui $at, %hi(D_8009A61C) -/* 3CD60 80061960 A020A61C */ sb $zero, %lo(D_8009A61C)($at) -/* 3CD64 80061964 0C01978C */ jal __osSiRelAccess -/* 3CD68 80061968 00408021 */ addu $s0, $v0, $zero -/* 3CD6C 8006196C 02001021 */ addu $v0, $s0, $zero -/* 3CD70 80061970 8FBF0014 */ lw $ra, 0x14($sp) -/* 3CD74 80061974 8FB00010 */ lw $s0, 0x10($sp) -/* 3CD78 80061978 03E00008 */ jr $ra -/* 3CD7C 8006197C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s b/ver/us/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s deleted file mode 100644 index 799d09f182..0000000000 --- a/ver/us/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osContDataCrc -/* 47CCC 8006C8CC 00001821 */ addu $v1, $zero, $zero -/* 47CD0 8006C8D0 24060020 */ addiu $a2, $zero, 0x20 -.L8006C8D4: -/* 47CD4 8006C8D4 24050080 */ addiu $a1, $zero, 0x80 -/* 47CD8 8006C8D8 90870000 */ lbu $a3, ($a0) -/* 47CDC 8006C8DC 00E51024 */ and $v0, $a3, $a1 -.L8006C8E0: -/* 47CE0 8006C8E0 10400006 */ beqz $v0, .L8006C8FC -/* 47CE4 8006C8E4 00031840 */ sll $v1, $v1, 1 -/* 47CE8 8006C8E8 30620100 */ andi $v0, $v1, 0x100 -/* 47CEC 8006C8EC 50400006 */ beql $v0, $zero, .L8006C908 -/* 47CF0 8006C8F0 24630001 */ addiu $v1, $v1, 1 -/* 47CF4 8006C8F4 0801B242 */ j .L8006C908 -/* 47CF8 8006C8F8 38630084 */ xori $v1, $v1, 0x84 -.L8006C8FC: -/* 47CFC 8006C8FC 30620100 */ andi $v0, $v1, 0x100 -/* 47D00 8006C900 54400001 */ bnel $v0, $zero, .L8006C908 -/* 47D04 8006C904 38630085 */ xori $v1, $v1, 0x85 -.L8006C908: -/* 47D08 8006C908 00052842 */ srl $a1, $a1, 1 -/* 47D0C 8006C90C 14A0FFF4 */ bnez $a1, .L8006C8E0 -/* 47D10 8006C910 00E51024 */ and $v0, $a3, $a1 -/* 47D14 8006C914 24C6FFFF */ addiu $a2, $a2, -1 -/* 47D18 8006C918 14C0FFEE */ bnez $a2, .L8006C8D4 -/* 47D1C 8006C91C 24840001 */ addiu $a0, $a0, 1 -/* 47D20 8006C920 00031840 */ sll $v1, $v1, 1 -.L8006C924: -/* 47D24 8006C924 30620100 */ andi $v0, $v1, 0x100 -/* 47D28 8006C928 54400001 */ bnel $v0, $zero, .L8006C930 -/* 47D2C 8006C92C 38630085 */ xori $v1, $v1, 0x85 -.L8006C930: -/* 47D30 8006C930 24C60001 */ addiu $a2, $a2, 1 -/* 47D34 8006C934 2CC20008 */ sltiu $v0, $a2, 8 -/* 47D38 8006C938 5440FFFA */ bnel $v0, $zero, .L8006C924 -/* 47D3C 8006C93C 00031840 */ sll $v1, $v1, 1 -/* 47D40 8006C940 03E00008 */ jr $ra -/* 47D44 8006C944 306200FF */ andi $v0, $v1, 0xff -/* 47D48 8006C948 00000000 */ nop -/* 47D4C 8006C94C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s b/ver/us/asm/nonmatchings/os/osEPiLinkHandle/osEPiLinkHandle.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s rename to ver/us/asm/nonmatchings/os/osEPiLinkHandle/osEPiLinkHandle.s diff --git a/ver/us/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s b/ver/us/asm/nonmatchings/os/osJamMesg/osJamMesg.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s rename to ver/us/asm/nonmatchings/os/osJamMesg/osJamMesg.s diff --git a/ver/us/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s b/ver/us/asm/nonmatchings/os/osRecvMesg/osRecvMesg.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s rename to ver/us/asm/nonmatchings/os/osRecvMesg/osRecvMesg.s diff --git a/ver/us/asm/nonmatchings/os/osSetThreadPri/osSetThreadPri.s b/ver/us/asm/nonmatchings/os/osSetThreadPri/osSetThreadPri.s deleted file mode 100644 index 9f83bd26fc..0000000000 --- a/ver/us/asm/nonmatchings/os/osSetThreadPri/osSetThreadPri.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osSetThreadPri -/* 41350 80065F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 41354 80065F54 AFB00010 */ sw $s0, 0x10($sp) -/* 41358 80065F58 00808021 */ addu $s0, $a0, $zero -/* 4135C 80065F5C AFB10014 */ sw $s1, 0x14($sp) -/* 41360 80065F60 00A08821 */ addu $s1, $a1, $zero -/* 41364 80065F64 AFBF001C */ sw $ra, 0x1c($sp) -/* 41368 80065F68 0C01ACD8 */ jal __osDisableInt -/* 4136C 80065F6C AFB20018 */ sw $s2, 0x18($sp) -/* 41370 80065F70 16000003 */ bnez $s0, .L80065F80 -/* 41374 80065F74 00409021 */ addu $s2, $v0, $zero -/* 41378 80065F78 3C108009 */ lui $s0, %hi(__osRunningThread) -/* 4137C 80065F7C 8E104660 */ lw $s0, %lo(__osRunningThread)($s0) -.L80065F80: -/* 41380 80065F80 8E020004 */ lw $v0, 4($s0) -/* 41384 80065F84 1051001C */ beq $v0, $s1, .L80065FF8 -/* 41388 80065F88 00000000 */ nop -/* 4138C 80065F8C 3C028009 */ lui $v0, %hi(__osRunningThread) -/* 41390 80065F90 8C424660 */ lw $v0, %lo(__osRunningThread)($v0) -/* 41394 80065F94 1202000B */ beq $s0, $v0, .L80065FC4 -/* 41398 80065F98 AE110004 */ sw $s1, 4($s0) -/* 4139C 80065F9C 96030010 */ lhu $v1, 0x10($s0) -/* 413A0 80065FA0 24020001 */ addiu $v0, $zero, 1 -/* 413A4 80065FA4 10620007 */ beq $v1, $v0, .L80065FC4 -/* 413A8 80065FA8 00000000 */ nop -/* 413AC 80065FAC 8E040008 */ lw $a0, 8($s0) -/* 413B0 80065FB0 0C019880 */ jal __osDequeueThread -/* 413B4 80065FB4 02002821 */ addu $a1, $s0, $zero -/* 413B8 80065FB8 8E040008 */ lw $a0, 8($s0) -/* 413BC 80065FBC 0C01AC5D */ jal __osEnqueueThread -/* 413C0 80065FC0 02002821 */ addu $a1, $s0, $zero -.L80065FC4: -/* 413C4 80065FC4 3C048009 */ lui $a0, %hi(__osRunningThread) -/* 413C8 80065FC8 8C844660 */ lw $a0, %lo(__osRunningThread)($a0) -/* 413CC 80065FCC 3C028009 */ lui $v0, %hi(__osRunQueue) -/* 413D0 80065FD0 8C424658 */ lw $v0, %lo(__osRunQueue)($v0) -/* 413D4 80065FD4 8C830004 */ lw $v1, 4($a0) -/* 413D8 80065FD8 8C420004 */ lw $v0, 4($v0) -/* 413DC 80065FDC 0062182A */ slt $v1, $v1, $v0 -/* 413E0 80065FE0 10600005 */ beqz $v1, .L80065FF8 -/* 413E4 80065FE4 24020002 */ addiu $v0, $zero, 2 -/* 413E8 80065FE8 A4820010 */ sh $v0, 0x10($a0) -/* 413EC 80065FEC 3C048009 */ lui $a0, %hi(__osRunQueue) -/* 413F0 80065FF0 0C01AC1B */ jal __osEnqueueAndYield -/* 413F4 80065FF4 24844658 */ addiu $a0, $a0, %lo(__osRunQueue) -.L80065FF8: -/* 413F8 80065FF8 0C01ACF4 */ jal __osRestoreInt -/* 413FC 80065FFC 02402021 */ addu $a0, $s2, $zero -/* 41400 80066000 8FBF001C */ lw $ra, 0x1c($sp) -/* 41404 80066004 8FB20018 */ lw $s2, 0x18($sp) -/* 41408 80066008 8FB10014 */ lw $s1, 0x14($sp) -/* 4140C 8006600C 8FB00010 */ lw $s0, 0x10($sp) -/* 41410 80066010 03E00008 */ jr $ra -/* 41414 80066014 27BD0020 */ addiu $sp, $sp, 0x20 -/* 41418 80066018 00000000 */ nop -/* 4141C 8006601C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s b/ver/us/asm/os/osInvalDCache.s similarity index 94% rename from ver/us/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s rename to ver/us/asm/os/osInvalDCache.s index ba527fe1ed..ace5b3679c 100644 --- a/ver/us/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s +++ b/ver/us/asm/os/osInvalDCache.s @@ -1,5 +1,11 @@ +.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, "ax" glabel osInvalDCache /* 3CB20 80061720 18A00020 */ blez $a1, .L800617A4 diff --git a/ver/us/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s b/ver/us/asm/os/osInvalICache.s similarity index 93% rename from ver/us/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s rename to ver/us/asm/os/osInvalICache.s index 82aedb0276..cdc52d4d6c 100644 --- a/ver/us/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s +++ b/ver/us/asm/os/osInvalICache.s @@ -1,5 +1,11 @@ +.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, "ax" glabel osInvalICache /* 3CBD0 800617D0 18A00011 */ blez $a1, .L80061818 diff --git a/ver/us/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s b/ver/us/asm/os/osWritebackDCache.s similarity index 93% rename from ver/us/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s rename to ver/us/asm/os/osWritebackDCache.s index 30f37e3156..c179717552 100644 --- a/ver/us/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s +++ b/ver/us/asm/os/osWritebackDCache.s @@ -1,5 +1,11 @@ +.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, "ax" glabel osWritebackDCache /* 3CC50 80061850 18A00011 */ blez $a1, .L80061898 diff --git a/ver/us/asm/os/osWritebackDCacheAll.s b/ver/us/asm/os/osWritebackDCacheAll.s index 98551c551a..3c7414c752 100644 --- a/ver/us/asm/os/osWritebackDCacheAll.s +++ b/ver/us/asm/os/osWritebackDCacheAll.s @@ -1,18 +1,23 @@ .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, "ax" glabel osWritebackDCacheAll - lui $t0, 0x8000 - addiu $t2, $zero, 0x2000 - addu $t1, $t0, $t2 - addiu $t1, $t1, -0x10 +/* 3CCD0 800618D0 3C088000 */ lui $t0, 0x8000 +/* 3CCD4 800618D4 240A2000 */ addiu $t2, $zero, 0x2000 +/* 3CCD8 800618D8 010A4821 */ addu $t1, $t0, $t2 +/* 3CCDC 800618DC 2529FFF0 */ addiu $t1, $t1, -0x10 .L800618E0: - cache 1, ($t0) - sltu $at, $t0, $t1 - bnez $at, .L800618E0 - addiu $t0, $t0, 0x10 - jr $ra +/* 3CCE0 800618E0 BD010000 */ cache 1, ($t0) +/* 3CCE4 800618E4 0109082B */ sltu $at, $t0, $t1 +/* 3CCE8 800618E8 1420FFFD */ bnez $at, .L800618E0 +/* 3CCEC 800618EC 25080010 */ addiu $t0, $t0, 0x10 +/* 3CCF0 800618F0 03E00008 */ jr $ra +/* 3CCF4 800618F4 00000000 */ nop +/* 3CCF8 800618F8 00000000 */ nop +/* 3CCFC 800618FC 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index bb7b029e38..71fd5eec45 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -96,7 +96,7 @@ segments: - [0x3b2f0, c, os/nusys/nuContRmbCheck] - [0x3b390, c, os/nusys/nuContRmbModeSet] - [0x3b4a0, c, os/nusys/code_3B4A0] - - [0x3B5F0, c, os/nusys/nuGfxThread] # End of nusys + - [0x3B5F0, c, os/nusys/nuGfxThread] - [0x3b710, c, os/code_3b710_len_40] - [0x3b750, c, os/code_3b750_len_20] - [0x3b770, c, os/code_3b770_len_80] @@ -105,19 +105,20 @@ segments: - [0x3bd20, c, os/code_3bd20_len_c0] - [0x3BD40, hasm, os/osSetIntMask] - [0x3bde0, c, os/osCreatePiManager] - - [0x3C160, c, os/osEPiWriteIo] - - [0x3c1c0, c, os/osEPiReadIo] - - [0x3c220, c, os/code_3c220_len_a0] - - [0x3c2c0, c, os/code_3c2c0_len_50] + - [0x3C160, c, os/osEPiWriteIo] # MOVE_ADDU + - [0x3c1c0, c, os/osEPiReadIo] # MOVE_ADDU + - [0x3c220, c, os/osEPiStartDma] # MOVE_ADDU + - [0x3c2c0, c, os/osEPiLinkHandle] - [0x3c310, c, os/osCartRomInit] - [0x3c490, c, os/code_3c490_len_3c0] - [0x3c850, c, os/code_3c850_len_f0] - [0x3c940, c, os/code_3c940_len_140] - [0x3ca80, c, os/code_3ca80_len_a0] - - [0x3cb20, c, os/code_3cb20_len_130] - - [0x3cc50, c, os/code_3cc50_len_80] + - [0x3CB20, hasm, os/osInvalDCache] + - [0x3CBD0, hasm, os/osInvalICache] + - [0x3cc50, hasm, os/osWritebackDCache] - [0x3ccd0, hasm, os/osWritebackDCacheAll] - - [0x3cd00, c, os/code_3cd00_len_5f0] + - [0x3cd00, c, os/code_3cd00_len_5f0] # MOVE_ADDU - [0x3CF80, c, os/controller] - [0x3D290, c, os/osVirtualToPhysical] - [0x3d2f0, c, os/code_3d2f0_len_10] @@ -132,10 +133,10 @@ segments: - [0x3f6d0, c, os/code_3f6d0_len_320] - [0x3f9f0, c, os/sins] - [0x3fa50, c, os/code_3fa50_len_f60] - - [0x3FEA0, c, os/code_3FEA0] + - [0x3FEA0, c, os/code_3FEA0] # MOVE_ADDU - [0x40980, c, os/osCreateMesgQueue] - - [0x409b0, c, os/code_409b0_len_140] - - [0x40af0, c, os/code_40af0_len_130] + - [0x409b0, c, os/osJamMesg] + - [0x40af0, c, os/osRecvMesg] - [0x40c20, c, os/code_40c20_len_1f0] - [0x40E00, hasm, os/osGetCount] - [0x40E10, c, os/code_40E10] @@ -145,7 +146,7 @@ segments: - [0x41170, c, os/code_41170_len_f0] - [0x41260, c, os/osCreateThread] - [0x41330, c, os/osGetThreadPri] - - [0x41350, c, os/osSetThreadPri] + - [0x41350, c, os/osSetThreadPri] # MOVE_ADDU - [0x41420, c, os/code_41420_len_120] - [0x41540, c, os/code_41540_len_c0] - [0x41600, c, os/code_41600_len_40] @@ -214,7 +215,7 @@ segments: - [0x47ae0, c, os/code_47ae0_len_e0] - [0x47bc0, c, os/code_47bc0_len_50] - [0x47c10, c, os/code_47c10_len_50] - - [0x47c60, c, os/code_47c60_len_f0] + - [0x47c60, c, os/code_47c60_len_f0] # MOVE_ADDU - [0x47d50, c, os/code_47d50_len_e0] - [0x47e30, c, os/code_47e30_len_60] - [0x47e90, c, os/code_47e90_len_110] @@ -228,9 +229,9 @@ segments: - [0x49C70, c, os/code_49C70] - [0x4a140, c, os/code_4a140_len_70] - [0x4a1b0, c, os/code_4a1b0_len_40] - - [0x4a1f0, c, os/code_4a1f0_len_170] - - [0x4a360, c, os/code_4a360_len_930] - - [0x4ac90, c, os/code_4ac90_len_3910] + - [0x4a1f0, c, os/code_4a1f0_len_170] # yay0 decompression - some or all is hand-written + - [0x4a360, c, os/code_4a360_len_930] # osFlash* - IDO O2 -g + - [0x4ac90, c, code_4ac90_len_3910] - [0x4E5A0, data, code_1000_len_60] - [0x4F410, .data, code_1370_len_7d0] - [0x4F420, .data, code_1b40_len_20b0] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 097e59c601..0798add364 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1312,7 +1312,74 @@ D_80093CE4 = 0x80093CE4; // type:data rom:0x6F0E4 nuContRmbCallBack = 0x80093D00; // rom:0x6F100 nuGfxFunc = 0x80093D10; // rom:0x6F110 nuGfxPreNMIFunc = 0x80093D14; // rom:0x6F114 +D_80093D20 = 0x80093D20; // type:data rom:0x6F120 +D_80093D24 = 0x80093D24; // type:data rom:0x6F124 +D_80093D34 = 0x80093D34; // type:data rom:0x6F134 +nuContCallBack = 0x80093D38; // type:data rom:0x6F138 +D_80093D80 = 0x80093D80; // type:data rom:0x6F180 +hdwrBugFlag = 0x80093DA0; // type:data rom:0x6F1A0 +dtor = 0x80093DC0; // type:data rom:0x6F1C0 +D_80093DD0 = 0x80093DD0; // type:data rom:0x6F1D0 +spaces = 0x800945E0; // type:data rom:0x6F9E0 +zeroes = 0x80094604; // type:data rom:0x6FA04 osViModeTable = 0x800946A0; // rom:0x6FAA0 +D_80097DC8 = 0x80097DC8; // type:data rom:0x731C8 +D_80097DD0 = 0x80097DD0; // type:data rom:0x731D0 +D_80097DD8 = 0x80097DD8; // type:data rom:0x731D8 +D_80097DE0 = 0x80097DE0; // type:data rom:0x731E0 +D_80097DE8 = 0x80097DE8; // type:data rom:0x731E8 +D_80097DF0 = 0x80097DF0; // type:data rom:0x731F0 +D_80097E00 = 0x80097E00; // type:data rom:0x73200 +D_80097E08 = 0x80097E08; // type:data rom:0x73208 +D_80097E10 = 0x80097E10; // type:data rom:0x73210 +D_80097E18 = 0x80097E18; // type:data rom:0x73218 +D_80097E20 = 0x80097E20; // type:data rom:0x73220 +D_80098034 = 0x80098034; // type:data rom:0x73434 +D_80098040 = 0x80098040; // type:data rom:0x73440 +D_80098050 = 0x80098050; // type:data rom:0x73450 +D_8009805C = 0x8009805C; // type:data rom:0x7345C +D_80098064 = 0x80098064; // type:data rom:0x73464 +D_80098074 = 0x80098074; // type:data rom:0x73474 +D_80098094 = 0x80098094; // type:data rom:0x73494 +D_800980B4 = 0x800980B4; // type:data rom:0x734B4 +D_800980D4 = 0x800980D4; // type:data rom:0x734D4 +D_800980F4 = 0x800980F4; // type:data rom:0x734F4 +D_80098114 = 0x80098114; // type:data rom:0x73514 +D_80098134 = 0x80098134; // type:data rom:0x73534 +D_80098154 = 0x80098154; // type:data rom:0x73554 +D_80098174 = 0x80098174; // type:data rom:0x73574 +D_80098194 = 0x80098194; // type:data rom:0x73594 +D_800981B4 = 0x800981B4; // type:data rom:0x735B4 +D_800981C8 = 0x800981C8; // type:data rom:0x735C8 +D_80098200 = 0x80098200; // type:data rom:0x73600 +D_80098208 = 0x80098208; // type:data rom:0x73608 +D_80098250 = 0x80098250; // type:data rom:0x73650 +D_80098258 = 0x80098258; // type:data rom:0x73658 +D_80098260 = 0x80098260; // type:data rom:0x73660 +D_80098268 = 0x80098268; // type:data rom:0x73668 +D_80098270 = 0x80098270; // type:data rom:0x73670 +D_80098278 = 0x80098278; // type:data rom:0x73678 +D_80098280 = 0x80098280; // type:data rom:0x73680 +D_80098288 = 0x80098288; // type:data rom:0x73688 +D_80098390 = 0x80098390; // type:data rom:0x73790 +D_8009839C = 0x8009839C; // type:data rom:0x7379C +D_80098480 = 0x80098480; // type:data rom:0x73880 +D_80098488 = 0x80098488; // type:data rom:0x73888 +D_80098490 = 0x80098490; // type:data rom:0x73890 +D_80098498 = 0x80098498; // type:data rom:0x73898 +D_800984A0 = 0x800984A0; // type:data rom:0x738A0 +D_800984A8 = 0x800984A8; // type:data rom:0x738A8 +D_800984B0 = 0x800984B0; // type:data rom:0x738B0 +D_800984B8 = 0x800984B8; // type:data rom:0x738B8 +D_800984C0 = 0x800984C0; // type:data rom:0x738C0 +D_800984E0 = 0x800984E0; // type:data rom:0x738E0 +D_80098520 = 0x80098520; // type:data rom:0x73920 +D_80098528 = 0x80098528; // type:data rom:0x73928 +D_80098530 = 0x80098530; // type:data rom:0x73930 +D_80098538 = 0x80098538; // type:data rom:0x73938 +D_80098540 = 0x80098540; // type:data rom:0x73940 +D_800985F0 = 0x800985F0; // type:data rom:0x739F0 +D_80098670 = 0x80098670; // type:data rom:0x73A70 D_80098710 = 0x80098710; // type:data rom:0x73B10 D_80098718 = 0x80098718; // type:data rom:0x73B18 D_80098720 = 0x80098720; // type:data rom:0x73B20 @@ -1321,6 +1388,39 @@ D_80098930 = 0x80098930; // type:data rom:0x73D30 D_80098938 = 0x80098938; // type:data rom:0x73D38 D_80098968 = 0x80098968; // type:data rom:0x73D68 D_80098990 = 0x80098990; // type:data rom:0x73D90 +D_80098A10 = 0x80098A10; // type:data rom:0x73E10 +D_80098A1C = 0x80098A1C; // type:data rom:0x73E1C +D_80098A24 = 0x80098A24; // type:data rom:0x73E24 +D_80099B40 = 0x80099B40; // type:data rom:0x74F40 +D_80099B50 = 0x80099B50; // type:data rom:0x74F50 +D_80099B58 = 0x80099B58; // type:data rom:0x74F58 +D_80099B60 = 0x80099B60; // type:data rom:0x74F60 +D_80099B68 = 0x80099B68; // type:data rom:0x74F68 +D_80099B70 = 0x80099B70; // type:data rom:0x74F70 +D_80099B78 = 0x80099B78; // type:data rom:0x74F78 +D_80099B80 = 0x80099B80; // type:data rom:0x74F80 +D_80099B88 = 0x80099B88; // type:data rom:0x74F88 +D_80099B90 = 0x80099B90; // type:data rom:0x74F90 +D_80099BA0 = 0x80099BA0; // type:data rom:0x74FA0 +D_80099BA8 = 0x80099BA8; // type:data rom:0x74FA8 +D_80099BB0 = 0x80099BB0; // type:data rom:0x74FB0 +D_80099BB8 = 0x80099BB8; // type:data rom:0x74FB8 +D_80099BC0 = 0x80099BC0; // type:data rom:0x74FC0 +D_80099BC8 = 0x80099BC8; // type:data rom:0x74FC8 +D_80099BD0 = 0x80099BD0; // type:data rom:0x74FD0 +D_80099BD8 = 0x80099BD8; // type:data rom:0x74FD8 +D_80099BE0 = 0x80099BE0; // type:data rom:0x74FE0 +D_80099BE8 = 0x80099BE8; // type:data rom:0x74FE8 +D_80099BF0 = 0x80099BF0; // type:data rom:0x74FF0 +D_80099BF8 = 0x80099BF8; // type:data rom:0x74FF8 +D_80099C10 = 0x80099C10; // type:data rom:0x75010 +D_80099D70 = 0x80099D70; // type:data rom:0x75170 +D_80099DD0 = 0x80099DD0; // type:data rom:0x751D0 +D_80099E18 = 0x80099E18; // type:data rom:0x75218 +D_80099E1C = 0x80099E1C; // type:data rom:0x7521C +D_80099E20 = 0x80099E20; // type:data rom:0x75220 +D_80099E28 = 0x80099E28; // type:data rom:0x75228 +D_80099E30 = 0x80099E30; // type:data rom:0x75230 func_800DC500 = 0x800DC500; // type:func rom:0x759B0 func_800DC778 = 0x800DC778; // type:func rom:0x75C28 func_800DCB7C = 0x800DCB7C; // type:func rom:0x7602C @@ -1649,7 +1749,7 @@ D_800F802C = 0x800F802C; // type:data rom:0x914DC D_800F8030 = 0x800F8030; // type:data rom:0x914E0 D_800F8034 = 0x800F8034; // type:data rom:0x914E4 D_800F803A = 0x800F803A; // type:data rom:0x914EA -wPartners = 0x800F803C; // rom:0x914EC type:data size:0x300 +wPartners = 0x800F803C; // type:data rom:0x914EC size:0x300 D_80108A64 = 0x80108A64; // type:data rom:0xA1F14 update_entities = 0x8010F6D0; // type:func rom:0xA5DD0 update_shadows = 0x8010FA98; // type:func rom:0xA6198 @@ -2171,6 +2271,56 @@ func_8014AF8C = 0x8014AF8C; // type:func rom:0xE168C func_8014AFA0 = 0x8014AFA0; // type:func rom:0xE16A0 gCloudyFlowerFieldsBg = 0x8014F120; // type:data rom:0xE5820 gSunnyFlowerFieldsBg = 0x8014F128; // type:data rom:0xE5828 +D_8014F130 = 0x8014F130; // type:data rom:0xE5830 +D_8014F134 = 0x8014F134; // type:data rom:0xE5834 +D_8014F140 = 0x8014F140; // type:data rom:0xE5840 +D_8014F150 = 0x8014F150; // type:data rom:0xE5850 +D_8014F250 = 0x8014F250; // type:data rom:0xE5950 +D_8014F298 = 0x8014F298; // type:data rom:0xE5998 +D_8014F2A0 = 0x8014F2A0; // type:data rom:0xE59A0 +D_8014F2A4 = 0x8014F2A4; // type:data rom:0xE59A4 +D_8014F2A8 = 0x8014F2A8; // type:data rom:0xE59A8 +D_8014F2B4 = 0x8014F2B4; // type:data rom:0xE59B4 +D_8014F2BD = 0x8014F2BD; // type:data rom:0xE59BD +D_8014F2C0 = 0x8014F2C0; // type:data rom:0xE59C0 +D_8014F2D0 = 0x8014F2D0; // type:data rom:0xE59D0 +D_8014F48C = 0x8014F48C; // type:data rom:0xE5B8C +D_8014F494 = 0x8014F494; // type:data rom:0xE5B94 +D_8014F49C = 0x8014F49C; // type:data rom:0xE5B9C +D_8014F4A4 = 0x8014F4A4; // type:data rom:0xE5BA4 +D_8014F4AC = 0x8014F4AC; // type:data rom:0xE5BAC +D_8014F4B4 = 0x8014F4B4; // type:data rom:0xE5BB4 +D_8014F4BC = 0x8014F4BC; // type:data rom:0xE5BBC +D_8014F4C4 = 0x8014F4C4; // type:data rom:0xE5BC4 +D_8014F4CC = 0x8014F4CC; // type:data rom:0xE5BCC +D_8014F4D4 = 0x8014F4D4; // type:data rom:0xE5BD4 +D_8014F4DC = 0x8014F4DC; // type:data rom:0xE5BDC +D_8014F4E4 = 0x8014F4E4; // type:data rom:0xE5BE4 +D_8014F4EC = 0x8014F4EC; // type:data rom:0xE5BEC +D_8014F4F4 = 0x8014F4F4; // type:data rom:0xE5BF4 +D_8014F4FC = 0x8014F4FC; // type:data rom:0xE5BFC +D_8014F504 = 0x8014F504; // type:data rom:0xE5C04 +D_8014F50C = 0x8014F50C; // type:data rom:0xE5C0C +D_8014F514 = 0x8014F514; // type:data rom:0xE5C14 +D_8014F51C = 0x8014F51C; // type:data rom:0xE5C1C +D_8014F524 = 0x8014F524; // type:data rom:0xE5C24 +D_8014F52C = 0x8014F52C; // type:data rom:0xE5C2C +D_8014F538 = 0x8014F538; // type:data rom:0xE5C38 +D_8014F540 = 0x8014F540; // type:data rom:0xE5C40 +D_8014F548 = 0x8014F548; // type:data rom:0xE5C48 +D_8014F554 = 0x8014F554; // type:data rom:0xE5C54 +D_8014F55C = 0x8014F55C; // type:data rom:0xE5C5C +D_8014F564 = 0x8014F564; // type:data rom:0xE5C64 +D_8014F56C = 0x8014F56C; // type:data rom:0xE5C6C +D_8014F574 = 0x8014F574; // type:data rom:0xE5C74 +D_8014F57C = 0x8014F57C; // type:data rom:0xE5C7C +D_8014F584 = 0x8014F584; // type:data rom:0xE5C84 +D_8014F58C = 0x8014F58C; // type:data rom:0xE5C8C +D_8014F594 = 0x8014F594; // type:data rom:0xE5C94 +D_8014F59C = 0x8014F59C; // type:data rom:0xE5C9C +D_8014F5A4 = 0x8014F5A4; // type:data rom:0xE5CA4 +D_8014F6B4 = 0x8014F6B4; // type:data rom:0xE5DB4 +D_8014F6F0 = 0x8014F6F0; // type:data rom:0xE5DF0 gSongsUsingVariationFlag = 0x8014F720; // rom:0xE5E20 D_8014F738 = 0x8014F738; // rom:0xE5E38 sort_scripts = 0x802C3000; // type:func rom:0xE79B0 @@ -14819,6 +14969,7 @@ D_8000030C = 0x8000030C; // type:data D_80000318 = 0x80000318; // type:data D_8000031C = 0x8000031C; // type:data D_80026AC7 = 0x80026AC7; // type:data +func_8002AF70 = 0x8002AF70; // type:func D_8004AA85 = 0x8004AA85; // type:data ai = 0x8006AD64; // si = 0x8006AD90; // @@ -14909,21 +15060,13 @@ gAreas = 0x800934F0; // type:data size:0x1D0 rdpstateinit_dl = 0x80093BB8; // type:data D_80094900 = 0x80094900; // type:data gBattleAreas = 0x80095A30; // type:data size:0x600 +D_80097D30 = 0x80097D30; // type:data D_80097D60 = 0x80097D60; // type:data D_80097D68 = 0x80097D68; // type:data D_80097D70 = 0x80097D70; // type:data D_80097D78 = 0x80097D78; // type:data D_80097D80 = 0x80097D80; // type:data D_80097D88 = 0x80097D88; // type:data -D_80097DC8 = 0x80097DC8; // type:data -D_80097DD0 = 0x80097DD0; // type:data -D_80097DD8 = 0x80097DD8; // type:data -D_80097DE0 = 0x80097DE0; // type:data -D_80097DE8 = 0x80097DE8; // type:data -D_80097DF0 = 0x80097DF0; // type:data -D_80098A10 = 0x80098A10; // type:data -D_80098A1C = 0x80098A1C; // type:data -D_80098A24 = 0x80098A24; // type:data D_80099E40 = 0x80099E40; // type:data D_80099F40 = 0x80099F40; // type:data D_8009A040 = 0x8009A040; // type:data @@ -15168,6 +15311,7 @@ D_800B0ED0 = 0x800B0ED0; // type:data D_800B0F08 = 0x800B0F08; // type:data D_800B0F0C = 0x800B0F0C; // type:data gCurrentEncounter = 0x800B0F10; // size:0xB0 +LeoDiskHandle = 0x800B1B08; // type:data D_800B1B0C = 0x800B1B0C; // type:data D_800B1B0D = 0x800B1B0D; // type:data D_800B1B0E = 0x800B1B0E; // type:data @@ -15199,6 +15343,7 @@ D_800B4318 = 0x800B4318; // type:data gOsPiMessageQueue = 0x800B4380; // type:data D_800B4398 = 0x800B4398; // type:data D_800B4514 = 0x800B4514; // type:data +CartRomHandle = 0x800B4518; // type:data D_800B451C = 0x800B451C; // type:data D_800B451D = 0x800B451D; // type:data D_800B451E = 0x800B451E; // type:data @@ -15217,7 +15362,7 @@ D_800D91DC = 0x800D91DC; // type:data D_800D91E0 = 0x800D91E0; // type:data D_800D91F8 = 0x800D91F8; // type:data D_800D9230 = 0x800D9230; // type:data -D_800D9248 = 0x800D9248; // type:data // struct:ALHeap +D_800D9248 = 0x800D9248; // type:data struct:ALHeap D_800D9278 = 0x800D9278; // type:data D_800D95E8 = 0x800D95E8; // type:data D_800D9620 = 0x800D9620; // type:data @@ -17031,6 +17176,15 @@ gWorldMapVars = 0x802DBCA8; // size:0x40 gBattleMapVars = 0x802DBCE8; // size:0x40 D_802DBD28 = 0x802DBD28; // type:data gBattleMapFlags = 0x802DBD34; // size:0xC +D_802DF390 = 0x802DF390; // type:data +D_802DF3D0 = 0x802DF3D0; // type:data +D_802DF3E0 = 0x802DF3E0; // type:data +D_802DF3F0 = 0x802DF3F0; // type:data +D_802DF428 = 0x802DF428; // type:data +D_802DF460 = 0x802DF460; // type:data +D_802DF490 = 0x802DF490; // type:data +D_802DF4C0 = 0x802DF4C0; // type:data +D_802DF4C4 = 0x802DF4C4; // type:data D_802DF524 = 0x802DF524; // type:data D_802DF530 = 0x802DF530; // type:data D_802DF540 = 0x802DF540; // type:data @@ -17179,6 +17333,7 @@ D_A4300004 = 0xA4300004; // type:data D_A4300008 = 0xA4300008; // type:data D_A430000C = 0xA430000C; // type:data D_A4400010 = 0xA4400010; // type:data +D_A4500004 = 0xA4500004; // type:data D_A450000C = 0xA450000C; // type:data D_A4600004 = 0xA4600004; // type:data D_A460000C = 0xA460000C; // type:data