From f959f0318470a2c6e0e9770ad2bf2c015be34a92 Mon Sep 17 00:00:00 2001 From: CoderStig <79828759+CoderStig@users.noreply.github.com> Date: Tue, 16 Nov 2021 02:39:33 -0700 Subject: [PATCH] Matched some memory.c and other (#55) * Matched some memory.c * And more --- .gitignore | 3 +- asm/bss_800029B0.s | 80 +- asm/bss_8001C4D0.s | 2258 +++++++++++++ asm/bss_8028DF00.s | 41 +- asm/bss_MainSeg.s | 2331 -------------- asm/bss_sptask_audio.s | 20 + .../audio/external/func_800C2474.s | 16 +- .../code_80005FD0/func_800061DC.s | 4 +- .../code_80005FD0/func_8000F628.s | 8 +- .../code_80005FD0/func_80014D30.s | 4 +- .../code_80005FD0/func_80015314.s | 4 +- .../code_80005FD0/func_80015544.s | 4 +- .../code_80005FD0/func_80015A9C.s | 4 +- .../code_80005FD0/func_800162CC.s | 4 +- .../code_80005FD0/func_80016C3C.s | 4 +- .../code_80005FD0/func_80017720.s | 4 +- .../code_80005FD0/func_80017F10.s | 4 +- .../code_80005FD0/func_80018718.s | 4 +- .../code_80005FD0/func_80019118.s | 4 +- .../code_80005FD0/func_80019890.s | 4 +- .../code_80005FD0/func_80019DF4.s | 4 +- .../code_80005FD0/func_80019ED0.s | 4 +- .../code_80005FD0/func_8001A348.s | 4 +- .../code_80005FD0/func_8001A3D8.s | 4 +- .../code_80005FD0/func_8001A588.s | 4 +- .../code_8001C4D0/func_8001C4D0.s | 8 +- .../code_8001C4D0/func_8001CA10.s | 6 - .../code_8001C4D0/func_8001CA24.s | 25 - .../code_8001C4D0/func_8001EE98.s | 16 +- .../code_8001C4D0/func_8001F394.s | 4 +- .../code_8001C4D0/func_8001F87C.s | 4 +- .../code_8001F980/func_80020524.s | 8 +- .../code_8001F980/func_8002088C.s | 8 +- .../code_8001F980/func_80020BF4.s | 8 +- .../code_8001F980/func_80020F1C.s | 8 +- .../code_8001F980/func_800212B4.s | 32 +- .../code_8001F980/func_800215DC.s | 32 +- .../code_8001F980/func_8002186C.s | 16 +- .../code_8001F980/func_800219BC.s | 16 +- .../code_8001F980/func_800248D0.s | 4 +- .../code_8001F980/func_800267AC.s | 4 +- .../code_80027040/func_80027040.s | 64 +- .../code_80027040/func_80027560.s | 32 +- .../code_80027040/func_80027A20.s | 32 +- .../code_80027D00/func_80028864.s | 28 +- .../code_800393C0/func_80039AE4.s | 188 -- .../code_800393C0/func_80039DA4.s | 111 - .../code_800393C0/func_80039F44.s | 416 --- .../code_800393C0/func_8003A59C.s | 287 -- .../code_800393C0/func_8003AE24.s | 162 - .../code_800393C0/func_8003B318.s | 163 - .../code_800393C0/func_8003B870.s | 175 - .../code_800393C0/func_8003BE30.s | 179 -- .../code_800393C0/func_8003CD78.s | 9 - .../code_800393C0/func_8003CD98.s | 192 -- .../code_800393C0/func_8003D080.s | 160 +- .../code_800393C0/func_8003DB5C.s | 59 - .../code_800393C0/spawn_player.s | 464 --- .../code_800393C0/spawn_players_2p_battle.s | 163 - .../code_800393C0/spawn_players_3p_battle.s | 184 -- .../code_800393C0/spawn_players_4p_battle.s | 198 -- .../code_800431B0/func_800523B8.s | 4 +- .../code_800431B0/func_80052590.s | 4 +- .../code_800431B0/func_80052F20.s | 4 +- .../code_800431B0/func_8005309C.s | 4 +- .../code_800431B0/func_800532A4.s | 4 +- .../code_800431B0/func_80053870.s | 4 +- .../code_800431B0/func_800540CC.s | 4 +- .../code_800431B0/func_800541BC.s | 4 +- .../code_800431B0/func_80054324.s | 4 +- .../code_800431B0/func_80054414.s | 4 +- .../code_800431B0/func_8005457C.s | 4 +- .../code_800431B0/func_80054938.s | 4 +- .../code_800431B0/func_80054BE8.s | 4 +- .../code_800431B0/func_80054D00.s | 4 +- .../code_800431B0/func_80054F04.s | 4 +- .../code_800431B0/func_80055458.s | 4 +- .../code_800431B0/func_800555BC.s | 4 +- .../code_800431B0/func_80055AB8.s | 4 +- .../code_800431B0/func_80055CCC.s | 4 +- .../code_800431B0/func_80056188.s | 4 +- .../code_800431B0/func_800563DC.s | 4 +- .../code_800431B0/func_80057114.s | 4 +- .../code_80057C60/func_800581C8.s | 69 - .../code_80057C60/func_800582CC.s | 52 - .../code_80057C60/func_80058394.s | 52 - .../code_80057C60/func_8005845C.s | 57 - .../code_80057C60/func_80058640.s | 49 - .../code_80057C60/func_800586FC.s | 43 - .../code_80057C60/func_800587A4.s | 43 - .../code_80057C60/func_8005884C.s | 43 - .../code_80057C60/func_80058BF4.s | 12 - .../code_80057C60/func_80058F48.s | 14 - .../code_80057C60/func_80058F78.s | 48 - .../code_80057C60/func_80059358.s | 3 - .../code_80057C60/func_80059820.s | 4 +- .../code_80057C60/func_80059AC8.s | 4 +- .../code_80057C60/func_80066BAC.s | 4 +- .../code_80057C60/func_8006AFD0.s | 4 +- .../code_80057C60/func_8006BB34.s | 16 +- .../code_8006E9C0/func_8006ED94.s | 16 +- .../code_80071F00/func_800744CC.s | 8 +- .../code_80071F00/func_80074510.s | 8 +- .../code_80071F00/func_80078288.s | 20 +- .../code_80071F00/func_80078C70.s | 20 +- .../code_80071F00/func_8007CC00.s | 4 +- .../code_80071F00/func_8007D804.s | 4 +- .../code_80071F00/func_8007E59C.s | 4 +- .../code_80071F00/func_80080A4C.s | 4 +- .../code_80071F00/func_80081D34.s | 4 +- .../code_80086E70/func_8008A1D0.s | 8 +- .../code_80086E70/func_8008A364.s | 4 +- .../code_80086E70/func_8008A454.s | 4 +- .../code_80086E70/func_8008A4CC.s | 8 +- .../code_80086E70/func_8008A6DC.s | 4 +- .../code_80086E70/func_8008BE0C.s | 4 +- .../code_8008C1D0/code_8008C1D0.s | 68 +- .../code_80091750/dma_copy_base_729a30.s | 8 +- .../code_80091750/dma_copy_base_7fa3c0.s | 8 +- .../code_80091750/func_80094660.s | 2 +- .../code_80091750/func_800947B4.s | 2 +- .../code_80091750/func_80099AEC.s | 4 +- .../code_80091750/func_80099EC4.s | 4 +- .../code_80091750/func_8009C918.s | 64 +- .../code_80280650/func_80280B50.s | 4 +- .../code_80280650/func_802812C8.s | 12 +- .../code_80281780/func_80281780.s | 74 - .../code_80281780/func_80281880.s | 18 - .../code_80281780/func_802818BC.s | 47 - .../load_ending_sequence_royalraceway.s | 183 -- .../code_8028DF00/code_8028DF00.s | 28 +- .../code_80290C20/load_surface_map.s | 4 +- .../code_802A3730/func_802A3730.s | 105 - .../code_802A3730/func_802A38B4.s | 83 - .../code_802A3730/func_802A39E0.s | 189 -- .../code_802A3730/func_802A3CB0.s | 100 - .../code_802A3730/func_802A3E3C.s | 211 -- .../code_802A3730/func_802A4160.s | 30 - .../code_802A3730/func_802A41D4.s | 76 - .../code_802A3730/func_802A4300.s | 138 - .../code_802A3730/func_802A450C.s | 230 -- .../code_802A3730/func_802A487C.s | 102 - .../code_802A3730/func_802A4D18.s | 4 +- .../code_802A3730/func_802A4EF4.s | 74 - .../code_802A3730/func_802A5004.s | 60 - .../code_802A3730/func_802A50EC.s | 60 - .../code_802A3730/func_802A51D4.s | 60 - .../code_802A3730/func_802A52BC.s | 60 - .../code_802A3730/func_802A53A4.s | 68 - .../code_802A3730/func_802A54A8.s | 60 - .../code_802A3730/func_802A5590.s | 60 - .../code_802A3730/func_802A5678.s | 60 - .../code_802A3730/func_802A5760.s | 149 - .../code_802A3730/func_802A59A4.s | 202 -- .../code_802A3730/func_802A5CB4.s | 196 -- .../code_802A3730/func_802A5FAC.s | 196 -- .../code_802A3730/func_802A62A4.s | 203 -- .../code_802A3730/func_802A65B8.s | 203 -- .../code_802A3730/func_802A68CC.s | 191 -- .../code_802A3730/func_802A6BB0.s | 191 -- .../code_802A3730/func_802A6E94.s | 191 -- .../code_802A3730/func_802A7178.s | 218 -- .../code_802A3730/func_802A74BC.s | 117 - asm/non_matchings/code_actors/func_80297230.s | 4 +- asm/non_matchings/code_actors/func_802972B8.s | 4 +- asm/non_matchings/code_actors/func_80297A50.s | 4 +- asm/non_matchings/code_actors/func_80298328.s | 4 +- asm/non_matchings/code_actors/func_802986B4.s | 8 +- asm/non_matchings/code_actors/func_80298D7C.s | 4 +- asm/non_matchings/code_actors/func_80299144.s | 4 +- asm/non_matchings/code_actors/func_8029930C.s | 4 +- asm/non_matchings/code_actors/func_802994D4.s | 4 +- asm/non_matchings/code_actors/func_8029969C.s | 4 +- asm/non_matchings/code_actors/func_80299864.s | 4 +- asm/non_matchings/code_actors/func_80299A2C.s | 4 +- asm/non_matchings/code_actors/func_80299BF4.s | 4 +- asm/non_matchings/code_actors/func_80299DBC.s | 4 +- asm/non_matchings/code_actors/func_80299EDC.s | 4 +- asm/non_matchings/code_actors/func_80299FFC.s | 4 +- asm/non_matchings/code_actors/func_8029A11C.s | 4 +- asm/non_matchings/code_actors/func_8029A3AC.s | 4 +- asm/non_matchings/code_actors/func_8029A8F4.s | 4 +- asm/non_matchings/code_actors/func_8029AC18.s | 4 +- asm/non_matchings/code_actors/func_8029AE1C.s | 4 +- asm/non_matchings/code_actors/func_8029B06C.s | 4 +- asm/non_matchings/code_actors/func_8029B2E4.s | 4 +- asm/non_matchings/code_actors/func_8029B4E0.s | 4 +- asm/non_matchings/code_actors/func_8029B6EC.s | 4 +- asm/non_matchings/code_actors/func_8029B8E8.s | 4 +- asm/non_matchings/code_actors/func_8029BFB0.s | 4 +- asm/non_matchings/code_actors/func_8029C3CC.s | 4 +- asm/non_matchings/code_actors/func_8029CA90.s | 4 +- asm/non_matchings/code_actors/func_802A171C.s | 4 +- asm/non_matchings/code_actors/func_802A1EA0.s | 4 +- asm/non_matchings/code_actors/func_802A269C.s | 4 +- asm/non_matchings/code_actors/func_802A27A0.s | 4 +- asm/non_matchings/code_actors/func_802A29BC.s | 4 +- asm/non_matchings/code_actors/func_802A2AD0.s | 4 +- asm/non_matchings/code_actors/func_802A2C78.s | 4 +- asm/non_matchings/memory/MIO0_0F.s | 56 - asm/non_matchings/memory/func_802A7C08.s | 60 - asm/non_matchings/memory/func_802A7D1C.s | 17 +- asm/non_matchings/memory/func_802A7D70.s | 44 - asm/non_matchings/memory/func_802A7E14.s | 40 - asm/non_matchings/memory/func_802A7EA4.s | 143 - asm/non_matchings/memory/func_802A80B0.s | 60 - asm/non_matchings/memory/func_802A8190.s | 94 - asm/non_matchings/memory/func_802A82E4.s | 135 - asm/non_matchings/memory/func_802A84F4.s | 55 - data/data_0DD0A0.s | 89 - data/data_0DD0A0_0.s | 65 + data/data_0DD0A0_1.s | 1638 +--------- data/data_0DD0A0_1_1.s | 1628 ++++++++++ data/data_0DD0A0_2.s | 4 +- data/data_121DA0.s | 230 +- data/data_121DA0_1.s | 54 + data/data_121DA0_2.s | 2 +- diff | 2 +- include/PR/gbi.h | 10 +- include/common_structs.h | 15 +- include/types.h | 42 +- include/variables.h | 8 +- mk64.ld | 14 +- src/audio/external.c | 8 +- src/code_800029B0.c | 17 +- src/code_80005FD0.c | 44 +- src/code_8001C4D0.c | 76 +- src/code_8001F980.c | 84 +- src/code_80027040.c | 44 +- src/code_80027D00.c | 56 +- src/code_800393C0.c | 85 +- src/code_800431B0.c | 44 +- src/code_80057C60.c | 356 +- src/code_8006E9C0.c | 10 +- src/code_80071F00.c | 32 +- src/code_80086E70.c | 10 +- src/code_80091750.c | 48 +- src/code_80280000.c | 58 +- src/code_80280650.c | 7 +- src/code_80281610.c | 46 +- src/code_80281780.c | 14 +- src/code_80281C40.c | 11 +- src/code_8028DF00.c | 4 +- src/code_80290C20.c | 2 +- src/code_80296A50.c | 70 +- src/code_802A3730.c | 2850 ++++++----------- src/main.c | 80 +- src/main.h | 4 + src/memory.c | 754 ++--- src/memory.h | 6 + src/staff_ghosts.c | 10 +- 251 files changed, 6736 insertions(+), 16183 deletions(-) create mode 100644 asm/bss_8001C4D0.s create mode 100644 asm/bss_sptask_audio.s delete mode 100644 asm/non_matchings/code_8001C4D0/func_8001CA10.s delete mode 100644 asm/non_matchings/code_8001C4D0/func_8001CA24.s delete mode 100644 asm/non_matchings/code_800393C0/func_80039AE4.s delete mode 100644 asm/non_matchings/code_800393C0/func_80039DA4.s delete mode 100644 asm/non_matchings/code_800393C0/func_80039F44.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003A59C.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003AE24.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003B318.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003B870.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003BE30.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003CD78.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003CD98.s delete mode 100644 asm/non_matchings/code_800393C0/func_8003DB5C.s delete mode 100644 asm/non_matchings/code_800393C0/spawn_player.s delete mode 100644 asm/non_matchings/code_800393C0/spawn_players_2p_battle.s delete mode 100644 asm/non_matchings/code_800393C0/spawn_players_3p_battle.s delete mode 100644 asm/non_matchings/code_800393C0/spawn_players_4p_battle.s delete mode 100644 asm/non_matchings/code_80057C60/func_800581C8.s delete mode 100644 asm/non_matchings/code_80057C60/func_800582CC.s delete mode 100644 asm/non_matchings/code_80057C60/func_80058394.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005845C.s delete mode 100644 asm/non_matchings/code_80057C60/func_80058640.s delete mode 100644 asm/non_matchings/code_80057C60/func_800586FC.s delete mode 100644 asm/non_matchings/code_80057C60/func_800587A4.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005884C.s delete mode 100644 asm/non_matchings/code_80057C60/func_80058BF4.s delete mode 100644 asm/non_matchings/code_80057C60/func_80058F48.s delete mode 100644 asm/non_matchings/code_80057C60/func_80058F78.s delete mode 100644 asm/non_matchings/code_80057C60/func_80059358.s delete mode 100644 asm/non_matchings/code_80281780/func_80281780.s delete mode 100644 asm/non_matchings/code_80281780/func_80281880.s delete mode 100644 asm/non_matchings/code_80281780/func_802818BC.s delete mode 100644 asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A3730.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A38B4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A39E0.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A3CB0.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A3E3C.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A4160.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A41D4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A4300.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A450C.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A487C.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A4EF4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A5004.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A50EC.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A51D4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A52BC.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A53A4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A54A8.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A5590.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A5678.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A5760.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A59A4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A5CB4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A5FAC.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A62A4.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A65B8.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A68CC.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A6BB0.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A6E94.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A7178.s delete mode 100644 asm/non_matchings/code_802A3730/func_802A74BC.s delete mode 100644 asm/non_matchings/memory/MIO0_0F.s delete mode 100644 asm/non_matchings/memory/func_802A7C08.s delete mode 100644 asm/non_matchings/memory/func_802A7D70.s delete mode 100644 asm/non_matchings/memory/func_802A7E14.s delete mode 100644 asm/non_matchings/memory/func_802A7EA4.s delete mode 100644 asm/non_matchings/memory/func_802A80B0.s delete mode 100644 asm/non_matchings/memory/func_802A8190.s delete mode 100644 asm/non_matchings/memory/func_802A82E4.s delete mode 100644 asm/non_matchings/memory/func_802A84F4.s create mode 100644 data/data_0DD0A0_0.s create mode 100644 data/data_0DD0A0_1_1.s create mode 100644 data/data_121DA0_1.s diff --git a/.gitignore b/.gitignore index a74abb96c..e78b49569 100755 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,8 @@ __pycache__/* doxygen/doxygen/* /build/* -nonmatchings/* # decomp permuter +# decomp permuter +/nonmatchings/* *.dump *.mio0 *.z64 diff --git a/asm/bss_800029B0.s b/asm/bss_800029B0.s index e6948f923..c8a7b8c77 100644 --- a/asm/bss_800029B0.s +++ b/asm/bss_800029B0.s @@ -1,65 +1,65 @@ .include "macros.inc" .section .bss -glabel D_8015F480 -.skip 44 +#glabel D_8015F480 +#.skip 44 -glabel D_8015F4AC -.skip 2 +#glabel D_8015F4AC +#.skip 2 -glabel D_8015F4AE -.skip 2 +#glabel D_8015F4AE +#.skip 2 -glabel D_8015F4B0 -.skip 2 +#glabel D_8015F4B0 +#.skip 2 -glabel D_8015F4B2 -.skip 14 +#glabel D_8015F4B2 +#.skip 14 -glabel D_8015F4C0 -.skip 44 +#glabel D_8015F4C0 # 2p wrapper +#.skip 44 -glabel D_8015F4EC -.skip 2 +#glabel D_8015F4EC +#.skip 2 -glabel D_8015F4EE -.skip 2 +#glabel D_8015F4EE +#.skip 2 -glabel D_8015F4F0 -.skip 2 +#glabel D_8015F4F0 +#.skip 2 -glabel D_8015F4F2 -.skip 14 +#glabel D_8015F4F2 +#.skip 14 -glabel D_8015F500 -.skip 44 +#glabel D_8015F500 #3p wrapper +#.skip 44 -glabel D_8015F52C -.skip 2 +#glabel D_8015F52C +#.skip 2 -glabel D_8015F52E -.skip 2 +#glabel D_8015F52E +#.skip 2 -glabel D_8015F530 -.skip 2 +#glabel D_8015F530 +#.skip 2 -glabel D_8015F532 -.skip 14 +#glabel D_8015F532 +#.skip 14 -glabel D_8015F540 -.skip 44 +#glabel D_8015F540 #4p wrapper +#.skip 44 -glabel D_8015F56C -.skip 2 +#glabel D_8015F56C +#.skip 2 -glabel D_8015F56E -.skip 2 +#glabel D_8015F56E +#.skip 2 -glabel D_8015F570 -.skip 2 +#glabel D_8015F570 +#.skip 2 -glabel D_8015F572 -.skip 14 +#glabel D_8015F572 # end of player wrapper +#.skip 14 glabel D_8015F580 .skip 4 diff --git a/asm/bss_8001C4D0.s b/asm/bss_8001C4D0.s new file mode 100644 index 000000000..ae64ceab3 --- /dev/null +++ b/asm/bss_8001C4D0.s @@ -0,0 +1,2258 @@ +.include "macros.inc" + +.section .bss + +.skip 8 #padding + +glabel D_801649D8 +.skip 16 + +glabel D_801649E8 +.skip 16 + +glabel D_801649F8 +.skip 16 + +glabel D_80164A08 +.skip 16 + +glabel D_80164A18 +.skip 16 + +glabel D_80164A28 +.skip 4 + +glabel D_80164A2C +.skip 4 + +glabel D_80164A30 +.skip 8 + +glabel D_80164A38 +.skip 16 + +glabel D_80164A48 +.skip 48 + +glabel D_80164A78 +.skip 16 + +glabel D_80164A88 +.skip 1 + +glabel D_80164A89 +.skip 7 + +glabel D_80164A90 +.skip 16 + +glabel D_80164AA0 +.skip 14 + +glabel D_80164AAE +.skip 2 + +glabel D_80164AB0 +.skip 14 + +glabel D_80164ABE +.skip 2 + +glabel D_80164AC0 +.skip 16 + +glabel D_80164AD0 +.skip 32 + +glabel D_80164AF0 +.skip 20 + +glabel D_80164B04 +.skip 4 + +glabel D_80164B08 +.skip 4 + +glabel D_80164B0C +.skip 4 + +glabel D_80164B10 +.skip 16 + +glabel D_80164B20 +.skip 16 + +glabel D_80164B30 +.skip 16 + +glabel D_80164B40 +.skip 16 + +glabel D_80164B50 +.skip 16 + +glabel D_80164B60 +.skip 32 + +glabel D_80164B80 +.skip 1184 + +glabel D_80165020 +.skip 80 + +glabel D_80165070 +.skip 96 + +glabel D_801650D0 +.skip 64 + +glabel D_80165110 +.skip 64 + +glabel D_80165150 +.skip 64 + +glabel D_80165190 +.skip 64 + +glabel D_801651D0 +.skip 1 + +glabel D_801651D1 +.skip 63 + +glabel D_80165210 +.skip 32 + +glabel D_80165230 +.skip 28 + +glabel D_8016524C +.skip 36 + +glabel D_80165270 +.skip 16 + +glabel D_80165280 +.skip 32 + +glabel D_801652A0 +.skip 32 + +glabel D_801652C0 +.skip 32 + +glabel D_801652E0 +.skip 32 + +glabel D_80165300 +.skip 16 + +glabel D_80165310 +.skip 16 + +glabel D_80165320 +.skip 16 + +glabel D_80165330 +.skip 16 + +glabel D_80165340 +.skip 128 + +glabel D_801653C0 +.skip 32 + +glabel D_801653E0 +.skip 32 + +glabel D_80165400 +.skip 32 + +glabel D_80165420 +.skip 32 + +glabel D_80165440 +.skip 32 + +glabel D_80165460 +.skip 32 + +glabel D_80165480 +.skip 32 + +glabel D_801654A0 +.skip 32 + +glabel D_801654C0 +.skip 32 + +glabel D_801654E0 +.skip 32 + +glabel D_80165500 +.skip 32 + +glabel D_80165520 +.skip 32 + +glabel D_80165540 +.skip 32 + +glabel D_80165560 +.skip 14 + +glabel D_8016556E +.skip 2 + +glabel D_80165570 +.skip 2 + +glabel D_80165572 +.skip 2 + +glabel D_80165574 +.skip 2 + +glabel D_80165576 +.skip 2 + +glabel D_80165578 +.skip 2 + +glabel D_8016557A +.skip 2 + +glabel D_8016557C +.skip 2 + +glabel D_8016557E +.skip 2 + +glabel D_80165580 +.skip 2 + +glabel D_80165582 +.skip 14 + +glabel D_80165590 +.skip 4 + +glabel D_80165594 +.skip 4 + +glabel D_80165598 +.skip 4 + +glabel D_8016559C +.skip 8 + +glabel D_801655A4 +.skip 8 + +glabel D_801655AC +.skip 8 + +glabel D_801655B4 +.skip 8 + +glabel D_801655BC +.skip 4 + +glabel D_801655C0 +.skip 4 + +glabel D_801655C4 +.skip 4 + +glabel D_801655C8 +.skip 4 + +glabel D_801655CC +.skip 12 + +glabel D_801655D8 +.skip 16 + +glabel D_801655E8 +.skip 8 + +glabel D_801655F0 +.skip 8 + +glabel D_801655F8 +.skip 16 + +glabel D_80165608 +.skip 16 + +glabel D_80165618 +.skip 16 + +glabel D_80165628 +.skip 16 + +glabel D_80165638 +.skip 16 + +glabel D_80165648 +.skip 12 + +glabel D_80165654 +.skip 4 + +glabel D_80165658 +.skip 32 + +glabel D_80165678 +.skip 56 + +glabel D_801656B0 +.skip 16 + +glabel D_801656C0 +.skip 16 + +glabel D_801656D0 +.skip 16 + +glabel D_801656E0 +.skip 16 + +glabel D_801656F0 +.skip 24 + +glabel D_80165708 +.skip 8 + +glabel D_80165710 +.skip 8 + +glabel D_80165718 +.skip 8 + +glabel D_80165720 +.skip 8 + +glabel D_80165728 +.skip 8 + +glabel D_80165730 +.skip 8 + +glabel D_80165738 +.skip 8 + +glabel D_80165740 +.skip 8 + +glabel D_80165748 +.skip 8 + +glabel D_80165750 +.skip 4 + +glabel D_80165754 +.skip 4 + +glabel D_80165758 +.skip 8 + +glabel D_80165760 +.skip 2 + +glabel D_80165762 +.skip 2 + +glabel D_80165764 +.skip 2 + +glabel D_80165766 +.skip 4 + +glabel D_8016576A +.skip 6 + +glabel D_80165770 +.skip 2 + +glabel D_80165772 +.skip 2 + +glabel D_80165774 +.skip 2 + +glabel D_80165776 +.skip 10 + +glabel D_80165780 +.skip 2 + +glabel D_80165782 +.skip 2 + +glabel D_80165784 +.skip 2 + +glabel D_80165786 +.skip 6 + +glabel D_8016578C +.skip 4 + +glabel D_80165790 +.skip 4 + +glabel D_80165794 +.skip 8 + +glabel D_8016579C +.skip 2 + +glabel D_8016579E +.skip 4 + +glabel D_801657A2 +.skip 12 + +glabel D_801657AE +.skip 2 + +glabel D_801657B0 +.skip 2 + +glabel D_801657B2 +.skip 2 + +glabel D_801657B4 +.skip 4 + +glabel D_801657B8 +.skip 1 + +glabel D_801657B9 +.skip 15 + +glabel D_801657C8 +.skip 8 + +glabel D_801657D0 +.skip 8 + +glabel D_801657D8 +.skip 9 + +glabel D_801657E1 +.skip 1 + +glabel D_801657E2 +.skip 1 + +glabel D_801657E3 +.skip 1 + +glabel D_801657E4 +.skip 1 + +glabel D_801657E5 +.skip 1 + +glabel D_801657E6 +.skip 1 + +glabel D_801657E7 +.skip 1 + +glabel D_801657E8 +.skip 8 + +glabel D_801657F0 +.skip 8 + +glabel D_801657F8 +.skip 4 + +glabel D_801657FC +.skip 4 + +glabel D_80165800 +.skip 1 + +glabel D_80165801 +.skip 3 + +glabel D_80165804 +.skip 4 + +glabel D_80165808 +.skip 4 + +glabel D_8016580C +.skip 4 + +glabel D_80165810 +.skip 4 + +glabel D_80165814 +.skip 4 + +glabel D_80165818 +.skip 4 + +glabel D_8016581C +.skip 4 + +glabel D_80165820 +.skip 8 + +glabel D_80165828 +.skip 4 + +glabel D_8016582C +.skip 6 + +glabel D_80165832 +.skip 2 + +glabel D_80165834 +.skip 12 + +glabel D_80165840 +.skip 32 + +glabel D_80165860 +.skip 12 + +glabel D_8016586C +.skip 12 + +glabel D_80165878 +.skip 4 + +glabel D_8016587C +.skip 4 + +glabel D_80165880 +.skip 8 + +glabel D_80165888 +.skip 8 + +glabel D_80165890 +.skip 8 + +glabel D_80165898 +.skip 4 + +glabel D_8016589C +.skip 12 + +glabel D_801658A8 +.skip 20 + +glabel D_801658BC +.skip 10 + +glabel D_801658C6 +.skip 8 + +glabel D_801658CE +.skip 8 + +glabel D_801658D6 +.skip 6 + +glabel D_801658DC +.skip 8 + +glabel D_801658E4 +.skip 8 + +glabel D_801658EC +.skip 8 + +glabel D_801658F4 +.skip 9 + +glabel D_801658FD +.skip 1 + +glabel D_801658FE +.skip 1 + +glabel D_801658FF +.skip 1 + +glabel D_80165900 +.skip 8 + +glabel D_80165908 +.skip 392 + +glabel D_80165A90 +.skip 392 + +glabel D_80165C18 +.skip 8 + +glabel D_80165C20 +.skip 8 + +glabel D_80165C28 +.skip 4 + +glabel D_80165C2C +.skip 4 + +glabel D_80165C30 +.skip 16 + +glabel D_80165C40 +.skip 20 + +glabel D_80165C54 +.skip 16 + +glabel D_80165C64 +.skip 8 + +glabel D_80165C6C +.skip 4 + +glabel D_80165C70 +.skip 36 + +glabel D_80165C94 +.skip 32 + +glabel D_80165CB4 +.skip 4 + +glabel D_80165CB8 +.skip 2 + +glabel D_80165CBA +.skip 2 + +glabel D_80165CBC +.skip 2 + +glabel D_80165CBE +.skip 8 + +glabel D_80165CC6 +.skip 2 + +glabel D_80165CC8 +.skip 16 + +glabel D_80165CD8 +.skip 10 + +glabel D_80165CE2 +.skip 1 + +glabel D_80165CE3 +.skip 1 + +glabel D_80165CE4 +.skip 1 + +glabel D_80165CE5 +.skip 2 + +glabel D_80165CE7 +.skip 3 + +glabel D_80165CEA +.skip 3 + +glabel D_80165CED +.skip 1 + +glabel D_80165CEE +.skip 1 + +glabel D_80165CEF +.skip 1 + +glabel D_80165CF0 +.skip 3 + +glabel D_80165CF3 +.skip 1 + +glabel D_80165CF4 +.skip 1 + +glabel D_80165CF5 +.skip 205 + +glabel D_80165DC2 +.skip 22 + +glabel D_80165DD8 +.skip 122752 + +glabel D_80183D58 +.skip 4 + +glabel D_80183D5C +.skip 4 + +glabel D_80183D60 +.skip 64 + +glabel D_80183DA0 +.skip 8 + +glabel D_80183DA8 +.skip 16 + +glabel D_80183DB8 +.skip 4 + +glabel D_80183DBC +.skip 4 + +glabel D_80183DC0 +.skip 4 + +glabel D_80183DC4 +.skip 4 + +glabel D_80183DC8 +.skip 16 + +glabel D_80183DD8 +.skip 28 + +glabel D_80183DF4 +.skip 68 + +glabel D_80183E38 +.skip 8 + +glabel D_80183E40 +.skip 4 + +glabel D_80183E44 +.skip 8 + +glabel D_80183E4C +.skip 4 + +glabel D_80183E50 +.skip 12 + +glabel D_80183E5C +.skip 16 + +glabel D_80183E6C +.skip 4 + +glabel D_80183E70 +.skip 12 + +glabel D_80183E7C +.skip 4 + +glabel D_80183E80 +.skip 4 + +glabel D_80183E84 +.skip 4 + +glabel D_80183E88 +.skip 4 + +glabel D_80183E8C +.skip 4 + +glabel D_80183E90 +.skip 4 + +glabel D_80183E94 +.skip 4 + +glabel D_80183E98 +.skip 8 + +glabel D_80183EA0 +.skip 4 + +glabel D_80183EA4 +.skip 4 + +glabel D_80183EA8 +.skip 4 + +glabel D_80183EAC +.skip 4 + +glabel D_80183EB0 +.skip 16 + +glabel D_80183EC0 +.skip 8 + +glabel D_80183EC8 +.skip 20 + +glabel D_80183EDC +.skip 16 + +glabel D_80183EEC +.skip 60 + +glabel D_80183F28 +.skip 4 + +glabel D_80183F2C +.skip 8 + +glabel D_80183F34 +.skip 8 + +glabel D_80183F3C +.skip 20 + +glabel D_80183F50 +.skip 4 + +glabel D_80183F54 +.skip 16 + +glabel D_80183F64 +.skip 16 + +glabel D_80183F74 +.skip 52 + +glabel D_80183FA8 +.skip 32768 + +glabel D_8018BFA8 +.skip 16 + +glabel D_8018BFB8 +.skip 24 + +glabel D_8018BFD0 +.skip 8 + +glabel D_8018BFD8 +.skip 80 + +glabel D_8018C028 +.skip 8 + +glabel D_8018C030 +.skip 128 + +glabel D_8018C0B0 +.skip 256 + +glabel D_8018C1B0 +.skip 40 + +glabel D_8018C1D8 +.skip 80 + +glabel D_8018C228 +.skip 4 + +glabel D_8018C22C +.skip 76 + +glabel D_8018C278 +.skip 312 + +glabel D_8018C3B0 +.skip 4 + +glabel D_8018C3B4 +.skip 6 + +glabel D_8018C3BA +.skip 54 + +glabel D_8018C3F0 +.skip 20 + +glabel D_8018C404 +.skip 140 + +glabel D_8018C490 +.skip 352 + +glabel D_8018C5F0 +.skip 64 + +glabel D_8018C630 +.skip 120 + +glabel D_8018C6A8 +.skip 8 + +glabel D_8018C6B0 +.skip 384 + +glabel D_8018C830 +.skip 64 + +glabel D_8018C870 +.skip 256 + +glabel D_8018C970 +.skip 256 + +glabel D_8018CA70 +.skip 4 + +glabel D_8018CA74 +.skip 4 + +glabel D_8018CA78 +.skip 24 + +glabel D_8018CA90 +.skip 30 + +glabel D_8018CAAE +.skip 2 + +glabel D_8018CAB0 +.skip 8 + +glabel D_8018CAB8 +.skip 6 + +glabel D_8018CABE +.skip 2 + +glabel D_8018CAC0 +.skip 2 + +glabel D_8018CAC2 +.skip 2 + +glabel D_8018CAC4 +.skip 2 + +glabel D_8018CAC6 +.skip 4 + +glabel D_8018CACA +.skip 2 + +glabel D_8018CACC +.skip 2 + +glabel D_8018CACE +.skip 18 + +glabel D_8018CAE0 +.skip 1 + +glabel D_8018CAE1 +.skip 1 + +glabel D_8018CAE2 +.skip 7 + +glabel D_8018CAE9 +.skip 8 + +glabel D_8018CAF1 +.skip 115 + +glabel D_8018CB64 +.skip 1 + +glabel D_8018CB65 +.skip 1 + +glabel D_8018CB66 +.skip 15 + +glabel D_8018CB75 +.skip 115 + +glabel D_8018CBE8 +.skip 1 + +glabel D_8018CBE9 +.skip 1 + +glabel D_8018CBEA +.skip 15 + +glabel D_8018CBF9 +.skip 115 + +glabel D_8018CC6C +.skip 1 + +glabel D_8018CC6D +.skip 1 + +glabel D_8018CC6E +.skip 15 + +glabel D_8018CC7D +.skip 3 + +glabel D_8018CC80 +.skip 400 + +glabel D_8018CE10 +.skip 20 + +glabel D_8018CE24 +.skip 236 + +glabel D_8018CF10 +.skip 4 + +glabel D_8018CF14 +.skip 4 + +glabel D_8018CF18 +.skip 4 + +glabel D_8018CF1C +.skip 4 + +glabel D_8018CF20 +.skip 4 + +glabel D_8018CF24 +.skip 4 + +glabel D_8018CF28 +.skip 32 + +glabel D_8018CF48 +.skip 8 + +glabel D_8018CF50 +.skip 16 + +glabel D_8018CF60 +.skip 8 + +glabel D_8018CF68 +.skip 16 + +glabel D_8018CF78 +.skip 8 + +glabel D_8018CF80 +.skip 16 + +glabel D_8018CF90 +.skip 8 + +glabel D_8018CF98 +.skip 16 + +glabel D_8018CFA8 +.skip 4 + +glabel D_8018CFAC +.skip 4 + +glabel D_8018CFB0 +.skip 4 + +glabel D_8018CFB4 +.skip 4 + +glabel D_8018CFB8 +.skip 4 + +glabel D_8018CFBC +.skip 4 + +glabel D_8018CFC0 +.skip 4 + +glabel D_8018CFC4 +.skip 4 + +glabel D_8018CFC8 +.skip 4 + +glabel D_8018CFCC +.skip 4 + +glabel D_8018CFD0 +.skip 4 + +glabel D_8018CFD4 +.skip 4 + +glabel D_8018CFD8 +.skip 8 + +glabel D_8018CFE0 +.skip 4 + +glabel D_8018CFE4 +.skip 4 + +glabel D_8018CFE8 +.skip 4 + +glabel D_8018CFEC +.skip 4 + +glabel D_8018CFF0 +.skip 4 + +glabel D_8018CFF4 +.skip 4 + +glabel D_8018CFF8 +.skip 8 + +glabel D_8018D000 +.skip 8 + +glabel D_8018D008 +.skip 4 + +glabel D_8018D00C +.skip 4 + +glabel D_8018D010 +.skip 8 + +glabel D_8018D018 +.skip 4 + +glabel D_8018D01C +.skip 4 + +glabel D_8018D020 +.skip 8 + +glabel D_8018D028 +.skip 4 + +glabel D_8018D02C +.skip 4 + +glabel D_8018D030 +.skip 4 + +glabel D_8018D034 +.skip 4 + +glabel D_8018D038 +.skip 4 + +glabel D_8018D03C +.skip 4 + +glabel D_8018D040 +.skip 4 + +glabel D_8018D044 +.skip 4 + +glabel D_8018D048 +.skip 8 + +glabel D_8018D050 +.skip 4 + +glabel D_8018D054 +.skip 4 + +glabel D_8018D058 +.skip 4 + +glabel D_8018D05C +.skip 4 + +glabel D_8018D060 +.skip 4 + +glabel D_8018D064 +.skip 4 + +glabel D_8018D068 +.skip 4 + +glabel D_8018D06C +.skip 4 + +glabel D_8018D070 +.skip 8 + +glabel D_8018D078 +.skip 4 + +glabel D_8018D07C +.skip 4 + +glabel D_8018D080 +.skip 4 + +glabel D_8018D084 +.skip 4 + +glabel D_8018D088 +.skip 4 + +glabel D_8018D08C +.skip 4 + +glabel D_8018D090 +.skip 4 + +glabel D_8018D094 +.skip 4 + +glabel D_8018D098 +.skip 8 + +glabel D_8018D0A0 +.skip 32 + +glabel D_8018D0C0 +.skip 8 + +glabel D_8018D0C8 +.skip 4 + +glabel D_8018D0CC +.skip 4 + +glabel D_8018D0D0 +.skip 4 + +glabel D_8018D0D4 +.skip 4 + +glabel D_8018D0D8 +.skip 4 + +glabel D_8018D0DC +.skip 4 + +glabel D_8018D0E0 +.skip 4 + +glabel D_8018D0E4 +.skip 4 + +glabel D_8018D0E8 +.skip 8 + +glabel D_8018D0F0 +.skip 32 + +glabel D_8018D110 +.skip 4 + +glabel D_8018D114 +.skip 12 + +glabel D_8018D120 +.skip 32 + +glabel D_8018D140 +.skip 16 + +glabel D_8018D150 +.skip 8 + +glabel D_8018D158 +.skip 8 + +glabel D_8018D160 +.skip 8 + +glabel D_8018D168 +.skip 4 + +glabel D_8018D16C +.skip 4 + +glabel D_8018D170 +.skip 4 + +glabel D_8018D174 +.skip 4 + +glabel D_8018D178 +.skip 4 + +glabel D_8018D17C +.skip 4 + +glabel D_8018D180 +.skip 4 + +glabel D_8018D184 +.skip 4 + +glabel D_8018D188 +.skip 4 + +glabel D_8018D18C +.skip 4 + +glabel D_8018D190 +.skip 8 + +glabel D_8018D198 +.skip 8 + +glabel D_8018D1A0 +.skip 8 + +glabel D_8018D1A8 +.skip 11 + +glabel D_8018D1B3 +.skip 1 + +glabel D_8018D1B4 +.skip 4 + +glabel D_8018D1B8 +.skip 12 + +glabel D_8018D1C4 +.skip 4 + +glabel D_8018D1C8 +.skip 4 + +glabel D_8018D1CC +.skip 4 + +glabel D_8018D1D0 +.skip 4 + +glabel D_8018D1D4 +.skip 4 + +glabel D_8018D1D8 +.skip 4 + +glabel D_8018D1DC +.skip 4 + +glabel D_8018D1E0 +.skip 8 + +glabel D_8018D1E8 +.skip 4 + +glabel D_8018D1EC +.skip 4 + +glabel D_8018D1F0 +.skip 8 + +glabel D_8018D1F8 +.skip 4 + +glabel D_8018D1FC +.skip 4 + +glabel D_8018D200 +.skip 4 + +glabel D_8018D204 +.skip 4 + +glabel D_8018D208 +.skip 4 + +glabel D_8018D20C +.skip 4 + +glabel D_8018D210 +.skip 4 + +glabel D_8018D214 +.skip 4 + +glabel D_8018D218 +.skip 4 + +glabel D_8018D21C +.skip 4 + +glabel D_8018D220 +.skip 4 + +glabel D_8018D224 +.skip 4 + +glabel D_8018D228 +.skip 4 + +glabel D_8018D22C +.skip 4 + +glabel D_8018D230 +.skip 16 + +glabel D_8018D240 +.skip 8 + +glabel D_8018D248 +.skip 88 + +glabel D_8018D2A0 +.skip 4 + +glabel D_8018D2A4 +.skip 8 + +glabel D_8018D2AC +.skip 4 + +glabel D_8018D2B0 +.skip 4 + +glabel D_8018D2B4 +.skip 4 + +glabel D_8018D2B8 +.skip 4 + +glabel D_8018D2BC +.skip 4 + +glabel D_8018D2C0 +.skip 8 + +glabel D_8018D2C8 +.skip 16 + +glabel D_8018D2D8 +.skip 8 + +glabel D_8018D2E0 +.skip 8 + +glabel D_8018D2E8 +.skip 8 + +glabel D_8018D2F0 +.skip 8 + +glabel D_8018D2F8 +.skip 8 + +glabel D_8018D300 +.skip 8 + +glabel D_8018D308 +.skip 8 + +glabel D_8018D310 +.skip 4 + +glabel D_8018D314 +.skip 4 + +glabel D_8018D318 +.skip 8 + +glabel D_8018D320 +.skip 96 + +glabel D_8018D380 +.skip 4 + +glabel D_8018D384 +.skip 4 + +glabel D_8018D388 +.skip 52 + +glabel D_8018D3BC +.skip 4 + +glabel D_8018D3C0 +.skip 4 + +glabel D_8018D3C4 +.skip 16 + +glabel D_8018D3D4 +.skip 4 + +glabel D_8018D3D8 +.skip 4 + +glabel D_8018D3DC +.skip 4 + +glabel D_8018D3E0 +.skip 4 + +glabel D_8018D3E4 +.skip 4 + +glabel D_8018D3E8 +.skip 4 + +glabel D_8018D3EC +.skip 4 + +glabel D_8018D3F0 +.skip 4 + +glabel D_8018D3F4 +.skip 4 + +glabel D_8018D3F8 +.skip 4 + +glabel gRaceFrameCounter # 0x8018D3FC +.word 0x00000000 + +glabel D_8018D400 +.skip 12 + +glabel D_8018D40C +.skip 4 + +glabel D_8018D410 +.skip 16 + +glabel D_8018D420 +.skip 4 + +glabel D_8018D424 +.skip 4 + +glabel D_8018D428 +.skip 4 + +glabel D_8018D42C +.skip 4 + +glabel D_8018D430 +.skip 4 + +glabel D_8018D434 +.skip 4 + +glabel D_8018D438 +.skip 4 + +glabel D_8018D43C +.skip 4 + +glabel D_8018D440 +.skip 4 + +glabel D_8018D444 +.skip 4 + +glabel D_8018D448 +.skip 4 + +glabel D_8018D44C +.skip 4 + +glabel D_8018D450 +.skip 4 + +glabel D_8018D454 +.skip 4 + +glabel D_8018D458 +.skip 4 + +glabel D_8018D45C +.skip 4 + +glabel D_8018D460 +.skip 4 + +glabel D_8018D464 +.skip 4 + +glabel D_8018D468 +.skip 4 + +glabel D_8018D46C +.skip 4 + +glabel D_8018D470 +.skip 4 + +glabel D_8018D474 +.skip 4 + +glabel D_8018D478 +.skip 8 + +glabel D_8018D480 +.skip 4 + +glabel D_8018D484 +.skip 4 + +glabel D_8018D488 +.skip 4 + +glabel D_8018D48C +.skip 4 + +glabel D_8018D490 +.skip 4 + +glabel D_8018D494 +.skip 4 + +glabel D_8018D498 +.skip 4 + +glabel D_8018D49C +.skip 4 + +glabel D_8018D4A0 +.skip 4 + +glabel D_8018D4A4 +.skip 4 + +glabel D_8018D4A8 +.skip 4 + +glabel D_8018D4AC +.skip 4 + +glabel D_8018D4B0 +.skip 4 + +glabel D_8018D4B4 +.skip 4 + +glabel D_8018D4B8 +.skip 4 + +glabel D_8018D4BC +.skip 4 + +glabel D_8018D4C0 +.skip 4 + +glabel D_8018D4C4 +.skip 4 + +glabel D_8018D4C8 +.skip 8 + +glabel D_8018D4D0 +.skip 96 + +glabel D_8018D530 +.skip 96 + +glabel D_8018D590 +.skip 96 + +glabel D_8018D5F0 +.skip 48 + +glabel D_8018D620 +.skip 48 + +glabel D_8018D650 +.skip 96 + +glabel D_8018D6B0 +.skip 96 + +glabel D_8018D710 +.skip 96 + +glabel D_8018D770 +.skip 48 + +glabel D_8018D7A0 +.skip 48 + +glabel D_8018D7D0 +.skip 48 + +glabel D_8018D800 +.skip 48 + +glabel D_8018D830 +.skip 48 + +glabel D_8018D860 +.skip 48 + +glabel D_8018D890 +.skip 48 + +glabel D_8018D8C0 +.skip 16 + +glabel D_8018D8D0 +.skip 48 + +glabel D_8018D900 +.skip 32 + +glabel D_8018D920 +.skip 16 + +glabel D_8018D930 +.skip 32 + +glabel D_8018D950 +.skip 32 + +glabel D_8018D970 +.skip 32 + +glabel D_8018D990 +.skip 32 + +glabel D_8018D9B0 +.skip 4 + +glabel D_8018D9B4 +.skip 4 + +glabel D_8018D9B8 +.skip 4 + +glabel D_8018D9BC +.skip 4 + +glabel D_8018D9C0 +.skip 8 + +glabel D_8018D9C8 +.skip 8 + +glabel D_8018D9D0 +.skip 1 + +glabel D_8018D9D1 +.skip 1 + +glabel D_8018D9D2 +.skip 1 + +glabel D_8018D9D3 +.skip 5 + +glabel D_8018D9D8 +.skip 1 + +glabel D_8018D9D9 +.skip 7 + +glabel D_8018D9E0 +.skip 1280 + +glabel D_8018DEE0 +.skip 4 + +glabel D_8018DEE4 +.skip 380 + +glabel D_8018E060 +.skip 136 + +glabel D_8018E0E8 +.skip 40 + +glabel D_8018E110 +.skip 8 + +glabel D_8018E118 +.skip 4 + +glabel D_8018E11C +.skip 8 + +glabel D_8018E124 +.skip 1588 + +glabel D_8018E758 +.skip 4 + +glabel D_8018E75C +.skip 4 + +glabel D_8018E760 +.skip 8 + +glabel D_8018E768 +.skip 64 + +glabel D_8018E7A8 +.skip 4 + +glabel D_8018E7AC +.skip 4 + +glabel D_8018E7B0 +.skip 1 + +glabel D_8018E7B1 +.skip 7 + +glabel D_8018E7B8 +.skip 16 + +glabel D_8018E7C8 +.skip 8 + +glabel D_8018E7D0 +.skip 16 + +glabel D_8018E7E0 +.skip 8 + +glabel D_8018E7E8 +.skip 8 + +glabel D_8018E7F0 +.skip 8 + +glabel D_8018E7F8 +.skip 2 + +glabel D_8018E7FA +.skip 6 + +glabel D_8018E800 +.skip 2 + +glabel D_8018E802 +.skip 14 + +glabel D_8018E810 +.skip 8 + +glabel D_8018E818 +.skip 2 + +glabel D_8018E81A +.skip 6 + +glabel D_8018E820 +.skip 2 + +glabel D_8018E822 +.skip 6 + +glabel D_8018E828 +.skip 2 + +glabel D_8018E82A +.skip 14 + +glabel D_8018E838 +.skip 4 + +glabel D_8018E83C +.skip 4 + +glabel D_8018E840 +.skip 16 + +glabel D_8018E850 +.skip 4 + +glabel D_8018E854 +.skip 4 + +glabel D_8018E858 +.skip 4 + +glabel D_8018E85C +.skip 4 + +glabel D_8018E860 +.skip 8 + +glabel D_8018E868 +.skip 104 + +glabel D_8018E8D0 +.skip 104 + +glabel D_8018E938 +.skip 508 + +glabel D_8018EB34 +.skip 4 + +glabel D_8018EB38 +.skip 64 + +glabel D_8018EB78 +.skip 4 + +glabel D_8018EB7C +.skip 4 + +glabel D_8018EB80 +.skip 4 + +glabel D_8018EB84 +.skip 4 + +glabel D_8018EB88 +.skip 8 + +glabel D_8018EB90 +.skip 18 + +glabel D_8018EBA2 +.skip 366 + +glabel D_8018ED10 +.skip 1 + +glabel D_8018ED11 +.skip 1 + +glabel D_8018ED12 +.skip 1 + +glabel D_8018ED13 +.skip 1 + +glabel D_8018ED14 +.skip 2 + +glabel D_8018ED16 +.skip 1 + +glabel D_8018ED17 +.skip 55 + +glabel D_8018ED4E +.skip 58 + +glabel D_8018ED88 +.skip 1 + +glabel D_8018ED89 +.skip 1 + +glabel D_8018ED8A +.skip 1 + +glabel D_8018ED8B +.skip 1 + +glabel D_8018ED8C +.skip 2 + +glabel D_8018ED8E +.skip 1 + +glabel D_8018ED8F +.skip 1 + +glabel D_8018ED90 +.skip 1 + +glabel D_8018ED91 +.skip 3 + +glabel D_8018ED94 +.skip 4 + +glabel D_8018ED98 +.skip 4 + +glabel D_8018ED9C +.skip 4 + +glabel D_8018EDA0 +.skip 4 + +glabel D_8018EDA4 +.skip 4 + +glabel D_8018EDA8 +.skip 4 + +glabel D_8018EDAC +.skip 4 + +glabel D_8018EDB0 +.skip 2 + +glabel D_8018EDB2 +.skip 2 + +glabel D_8018EDB4 +.skip 4 + +glabel D_8018EDB8 +.skip 4 + +glabel D_8018EDBC +.skip 4 + +glabel D_8018EDC0 +.skip 4 + +glabel D_8018EDC4 +.skip 4 + +glabel D_8018EDC8 +.skip 4 + +glabel D_8018EDCC +.skip 4 + +glabel D_8018EDD0 +.skip 4 + +glabel D_8018EDD4 +.skip 4 + +glabel D_8018EDD8 +.skip 4 + +glabel D_8018EDDC +.skip 4 + +glabel D_8018EDE0 +.skip 4 + +glabel gCharacterSelections # 0x8018EDE4 +.skip 1 + +glabel D_8018EDE5 +.skip 1 + +glabel D_8018EDE6 +.skip 1 + +glabel D_8018EDE7 +.skip 1 + +glabel D_8018EDE8 +.skip 1 + +glabel D_8018EDE9 +.skip 1 + +glabel D_8018EDEA +.skip 1 + +glabel D_8018EDEB +.skip 1 + +glabel D_8018EDEC +.skip 1 + +glabel D_8018EDED +.skip 1 + +glabel D_8018EDEE +.skip 1 + +glabel D_8018EDEF +.skip 1 + +glabel gPlayerCountSelection2 # 0x8018EDF0 +.skip 1 + +glabel D_8018EDF1 +.skip 1 + +glabel D_8018EDF2 +.skip 1 + +glabel D_8018EDF3 +.skip 1 + +glabel D_8018EDF4 +.skip 1 + +glabel D_8018EDF5 +.skip 1 + +glabel D_8018EDF6 +.skip 1 + +glabel D_8018EDF7 +.skip 1 + +glabel D_8018EDF8 +.skip 1 + +glabel D_8018EDF9 +.skip 1 + +glabel D_8018EDFA +.skip 1 + +glabel D_8018EDFB +.skip 1 + +glabel D_8018EDFC +.skip 4 + +glabel D_8018EE00 +.skip 4 + +glabel D_8018EE04 +.skip 4 + +glabel D_8018EE08 +.skip 1 + +glabel gCupSelection # 0x8018EE09 +.skip 1 + +glabel D_8018EE0A +.skip 1 + +glabel gCourseSelection # 0x8018EE0B +.skip 1 + +glabel D_8018EE0C +.skip 4 + +glabel D_8018EE10 +.skip 4 + +glabel D_8018EE14 +.skip 1 + +glabel D_8018EE15 +.skip 1 + +glabel D_8018EE16 +.skip 126 + +glabel D_8018EE94 +.skip 1 + +glabel D_8018EE95 +.skip 123 + +glabel D_8018EF10 +.skip 8 + +glabel D_8018EF18 +.skip 192 + +glabel D_8018EFD8 +.skip 3000 + +glabel D_8018FB90 +.skip 1 + +glabel D_8018FB91 +.skip 7 + +glabel D_8018FB98 +.skip 16 + +glabel D_8018FBA8 +.skip 48 + +glabel D_8018FBD8 +.skip 48 + +glabel D_8018FC08 +.skip 8 + +glabel D_8018FC10 +.skip 16 + +glabel D_8018FC20 +.skip 6144 + +glabel D_80191420 +.skip 36 + +glabel D_80191444 +.skip 5724 + +glabel D_80192AA0 +.skip 8 + +glabel D_80192AA8 +.skip 8 + +glabel D_80192AB0 +.skip 8 + +glabel D_80192AB8 +.skip 384 + +glabel D_80192C38 +.skip 4 + +glabel D_80192C3C +.skip 12 + +glabel D_80192C48 +.skip 96 + +glabel D_80192CA8 +.skip 30 + +glabel D_80192CC6 +.skip 10 + +glabel D_80192CD0 +.skip 1024 + +glabel D_801930D0 +.skip 584 + +glabel D_80193318 +.skip 1192 + +glabel D_801937C0 +.skip 24 + +glabel D_801937D8 +.skip 24 + +glabel D_801937F0 +.skip 24 + +glabel D_80193808 +.skip 24 + +glabel D_80193820 +.skip 2048 + +glabel D_80194020 +.skip 8 + +glabel D_80194028 +.skip 16 + +glabel D_80194038 +.skip 4 + +glabel D_8019403C +.skip 4 + +glabel D_80194040 +.skip 16 diff --git a/asm/bss_8028DF00.s b/asm/bss_8028DF00.s index a20460013..1084e99f1 100644 --- a/asm/bss_8028DF00.s +++ b/asm/bss_8028DF00.s @@ -20,23 +20,20 @@ glabel D_802BA060 glabel D_802BA260 .skip 16 -glabel D_802BA270 -.skip 4 +#glabel D_802BA270 +#.skip 4 -glabel D_802BA274 -.skip 4 - -glabel D_802BA278 -.skip 4 - -glabel D_802BA27C -.skip 4 - -glabel D_802BA280 -.skip 875776 # 16 +#glabel D_802BA274 +#.skip 4 # 4 +#glabel sPoolFreeSpace +#.skip 4 +#glabel sPoolListHeadL +#.skip 4 +#glabel sPoolListHeadR +#.skip 875776 # 16 #glabel D_802BA290 #.skip 22768 # 100592 @@ -58,21 +55,3 @@ glabel D_802BA280 #glabel gZBuffer #.skip 153600 - - - -#glabel gFramebuffer0 -#.skip 153600 - -#glabel gFramebuffer1 -#.skip 153600 - -#glabel gFramebuffer2 -#.skip 153600 - -## Audio - -glabel gGfxSPTaskOutputBuffer # 0x8038FF80 -.skip 129024 - -glabel gGfxSPTaskOutputBufferSize # 0x803AF780 diff --git a/asm/bss_MainSeg.s b/asm/bss_MainSeg.s index d76466ee6..c33cae128 100644 --- a/asm/bss_MainSeg.s +++ b/asm/bss_MainSeg.s @@ -370,2334 +370,3 @@ glabel D_801646CC glabel D_801646D0 .skip 32 - -glabel D_801646F0 -.skip 4 - -glabel D_801646F4 -.skip 4 - -glabel D_801646F8 -.skip 4 - -glabel D_801646FC -.skip 4 - -glabel D_80164700 -.skip 4 - -glabel D_80164704 -.skip 4 - -glabel D_80164708 -.skip 4 - -glabel D_8016470C -.skip 4 - -glabel D_80164710 -.skip 4 - -glabel D_80164714 -.skip 2 - -glabel D_80164716 -.skip 2 - -glabel D_80164718 -.skip 44 - -glabel D_80164744 -.skip 90 - -glabel D_8016479E -.skip 6 - -glabel D_801647A4 -.skip 4 - -glabel D_801647A8 -.skip 4 - -glabel D_801647AC -.skip 4 - -glabel D_801647B0 -.skip 4 - -glabel D_801647B4 -.skip 4 - -glabel D_801647B8 -.skip 4 - -glabel D_801647BC -.skip 4 - -glabel D_801647C0 -.skip 4 - -glabel D_801647C4 -.skip 4 - -glabel D_801647C8 -.skip 152 - -glabel D_80164860 -.skip 184 - -glabel D_80164918 -.skip 192 - -glabel D_801649D8 -.skip 16 - -glabel D_801649E8 -.skip 16 - -glabel D_801649F8 -.skip 16 - -glabel D_80164A08 -.skip 16 - -glabel D_80164A18 -.skip 16 - -glabel D_80164A28 -.skip 4 - -glabel D_80164A2C -.skip 4 - -glabel D_80164A30 -.skip 8 - -glabel D_80164A38 -.skip 16 - -glabel D_80164A48 -.skip 48 - -glabel D_80164A78 -.skip 16 - -glabel D_80164A88 -.skip 1 - -glabel D_80164A89 -.skip 7 - -glabel D_80164A90 -.skip 16 - -glabel D_80164AA0 -.skip 14 - -glabel D_80164AAE -.skip 2 - -glabel D_80164AB0 -.skip 14 - -glabel D_80164ABE -.skip 2 - -glabel D_80164AC0 -.skip 16 - -glabel D_80164AD0 -.skip 32 - -glabel D_80164AF0 -.skip 20 - -glabel D_80164B04 -.skip 4 - -glabel D_80164B08 -.skip 4 - -glabel D_80164B0C -.skip 4 - -glabel D_80164B10 -.skip 16 - -glabel D_80164B20 -.skip 16 - -glabel D_80164B30 -.skip 16 - -glabel D_80164B40 -.skip 16 - -glabel D_80164B50 -.skip 16 - -glabel D_80164B60 -.skip 32 - -glabel D_80164B80 -.skip 1184 - -glabel D_80165020 -.skip 80 - -glabel D_80165070 -.skip 96 - -glabel D_801650D0 -.skip 64 - -glabel D_80165110 -.skip 64 - -glabel D_80165150 -.skip 64 - -glabel D_80165190 -.skip 64 - -glabel D_801651D0 -.skip 1 - -glabel D_801651D1 -.skip 63 - -glabel D_80165210 -.skip 32 - -glabel D_80165230 -.skip 28 - -glabel D_8016524C -.skip 36 - -glabel D_80165270 -.skip 16 - -glabel D_80165280 -.skip 32 - -glabel D_801652A0 -.skip 32 - -glabel D_801652C0 -.skip 32 - -glabel D_801652E0 -.skip 32 - -glabel D_80165300 -.skip 16 - -glabel D_80165310 -.skip 16 - -glabel D_80165320 -.skip 16 - -glabel D_80165330 -.skip 16 - -glabel D_80165340 -.skip 128 - -glabel D_801653C0 -.skip 32 - -glabel D_801653E0 -.skip 32 - -glabel D_80165400 -.skip 32 - -glabel D_80165420 -.skip 32 - -glabel D_80165440 -.skip 32 - -glabel D_80165460 -.skip 32 - -glabel D_80165480 -.skip 32 - -glabel D_801654A0 -.skip 32 - -glabel D_801654C0 -.skip 32 - -glabel D_801654E0 -.skip 32 - -glabel D_80165500 -.skip 32 - -glabel D_80165520 -.skip 32 - -glabel D_80165540 -.skip 32 - -glabel D_80165560 -.skip 14 - -glabel D_8016556E -.skip 2 - -glabel D_80165570 -.skip 2 - -glabel D_80165572 -.skip 2 - -glabel D_80165574 -.skip 2 - -glabel D_80165576 -.skip 2 - -glabel D_80165578 -.skip 2 - -glabel D_8016557A -.skip 2 - -glabel D_8016557C -.skip 2 - -glabel D_8016557E -.skip 2 - -glabel D_80165580 -.skip 2 - -glabel D_80165582 -.skip 14 - -glabel D_80165590 -.skip 4 - -glabel D_80165594 -.skip 4 - -glabel D_80165598 -.skip 4 - -glabel D_8016559C -.skip 8 - -glabel D_801655A4 -.skip 8 - -glabel D_801655AC -.skip 8 - -glabel D_801655B4 -.skip 8 - -glabel D_801655BC -.skip 4 - -glabel D_801655C0 -.skip 4 - -glabel D_801655C4 -.skip 4 - -glabel D_801655C8 -.skip 4 - -glabel D_801655CC -.skip 12 - -glabel D_801655D8 -.skip 16 - -glabel D_801655E8 -.skip 8 - -glabel D_801655F0 -.skip 8 - -glabel D_801655F8 -.skip 16 - -glabel D_80165608 -.skip 16 - -glabel D_80165618 -.skip 16 - -glabel D_80165628 -.skip 16 - -glabel D_80165638 -.skip 16 - -glabel D_80165648 -.skip 12 - -glabel D_80165654 -.skip 4 - -glabel D_80165658 -.skip 32 - -glabel D_80165678 -.skip 56 - -glabel D_801656B0 -.skip 16 - -glabel D_801656C0 -.skip 16 - -glabel D_801656D0 -.skip 16 - -glabel D_801656E0 -.skip 16 - -glabel D_801656F0 -.skip 24 - -glabel D_80165708 -.skip 8 - -glabel D_80165710 -.skip 8 - -glabel D_80165718 -.skip 8 - -glabel D_80165720 -.skip 8 - -glabel D_80165728 -.skip 8 - -glabel D_80165730 -.skip 8 - -glabel D_80165738 -.skip 8 - -glabel D_80165740 -.skip 8 - -glabel D_80165748 -.skip 8 - -glabel D_80165750 -.skip 4 - -glabel D_80165754 -.skip 4 - -glabel D_80165758 -.skip 8 - -glabel D_80165760 -.skip 2 - -glabel D_80165762 -.skip 2 - -glabel D_80165764 -.skip 2 - -glabel D_80165766 -.skip 4 - -glabel D_8016576A -.skip 6 - -glabel D_80165770 -.skip 2 - -glabel D_80165772 -.skip 2 - -glabel D_80165774 -.skip 2 - -glabel D_80165776 -.skip 10 - -glabel D_80165780 -.skip 2 - -glabel D_80165782 -.skip 2 - -glabel D_80165784 -.skip 2 - -glabel D_80165786 -.skip 6 - -glabel D_8016578C -.skip 4 - -glabel D_80165790 -.skip 4 - -glabel D_80165794 -.skip 8 - -glabel D_8016579C -.skip 2 - -glabel D_8016579E -.skip 4 - -glabel D_801657A2 -.skip 12 - -glabel D_801657AE -.skip 2 - -glabel D_801657B0 -.skip 2 - -glabel D_801657B2 -.skip 2 - -glabel D_801657B4 -.skip 4 - -glabel D_801657B8 -.skip 1 - -glabel D_801657B9 -.skip 15 - -glabel D_801657C8 -.skip 8 - -glabel D_801657D0 -.skip 8 - -glabel D_801657D8 -.skip 9 - -glabel D_801657E1 -.skip 1 - -glabel D_801657E2 -.skip 1 - -glabel D_801657E3 -.skip 1 - -glabel D_801657E4 -.skip 1 - -glabel D_801657E5 -.skip 1 - -glabel D_801657E6 -.skip 1 - -glabel D_801657E7 -.skip 1 - -glabel D_801657E8 -.skip 8 - -glabel D_801657F0 -.skip 8 - -glabel D_801657F8 -.skip 4 - -glabel D_801657FC -.skip 4 - -glabel D_80165800 -.skip 1 - -glabel D_80165801 -.skip 3 - -glabel D_80165804 -.skip 4 - -glabel D_80165808 -.skip 4 - -glabel D_8016580C -.skip 4 - -glabel D_80165810 -.skip 4 - -glabel D_80165814 -.skip 4 - -glabel D_80165818 -.skip 4 - -glabel D_8016581C -.skip 4 - -glabel D_80165820 -.skip 8 - -glabel D_80165828 -.skip 4 - -glabel D_8016582C -.skip 6 - -glabel D_80165832 -.skip 2 - -glabel D_80165834 -.skip 12 - -glabel D_80165840 -.skip 32 - -glabel D_80165860 -.skip 12 - -glabel D_8016586C -.skip 12 - -glabel D_80165878 -.skip 4 - -glabel D_8016587C -.skip 4 - -glabel D_80165880 -.skip 8 - -glabel D_80165888 -.skip 8 - -glabel D_80165890 -.skip 8 - -glabel D_80165898 -.skip 4 - -glabel D_8016589C -.skip 12 - -glabel D_801658A8 -.skip 20 - -glabel D_801658BC -.skip 10 - -glabel D_801658C6 -.skip 8 - -glabel D_801658CE -.skip 8 - -glabel D_801658D6 -.skip 6 - -glabel D_801658DC -.skip 8 - -glabel D_801658E4 -.skip 8 - -glabel D_801658EC -.skip 8 - -glabel D_801658F4 -.skip 9 - -glabel D_801658FD -.skip 1 - -glabel D_801658FE -.skip 1 - -glabel D_801658FF -.skip 1 - -glabel D_80165900 -.skip 8 - -glabel D_80165908 -.skip 392 - -glabel D_80165A90 -.skip 392 - -glabel D_80165C18 -.skip 8 - -glabel D_80165C20 -.skip 8 - -glabel D_80165C28 -.skip 4 - -glabel D_80165C2C -.skip 4 - -glabel D_80165C30 -.skip 16 - -glabel D_80165C40 -.skip 20 - -glabel D_80165C54 -.skip 16 - -glabel D_80165C64 -.skip 8 - -glabel D_80165C6C -.skip 4 - -glabel D_80165C70 -.skip 36 - -glabel D_80165C94 -.skip 32 - -glabel D_80165CB4 -.skip 4 - -glabel D_80165CB8 -.skip 2 - -glabel D_80165CBA -.skip 2 - -glabel D_80165CBC -.skip 2 - -glabel D_80165CBE -.skip 8 - -glabel D_80165CC6 -.skip 2 - -glabel D_80165CC8 -.skip 16 - -glabel D_80165CD8 -.skip 10 - -glabel D_80165CE2 -.skip 1 - -glabel D_80165CE3 -.skip 1 - -glabel D_80165CE4 -.skip 1 - -glabel D_80165CE5 -.skip 2 - -glabel D_80165CE7 -.skip 3 - -glabel D_80165CEA -.skip 3 - -glabel D_80165CED -.skip 1 - -glabel D_80165CEE -.skip 1 - -glabel D_80165CEF -.skip 1 - -glabel D_80165CF0 -.skip 3 - -glabel D_80165CF3 -.skip 1 - -glabel D_80165CF4 -.skip 1 - -glabel D_80165CF5 -.skip 205 - -glabel D_80165DC2 -.skip 22 - -glabel D_80165DD8 -.skip 122752 - -glabel D_80183D58 -.skip 4 - -glabel D_80183D5C -.skip 4 - -glabel D_80183D60 -.skip 64 - -glabel D_80183DA0 -.skip 8 - -glabel D_80183DA8 -.skip 16 - -glabel D_80183DB8 -.skip 4 - -glabel D_80183DBC -.skip 4 - -glabel D_80183DC0 -.skip 4 - -glabel D_80183DC4 -.skip 4 - -glabel D_80183DC8 -.skip 16 - -glabel D_80183DD8 -.skip 28 - -glabel D_80183DF4 -.skip 68 - -glabel D_80183E38 -.skip 8 - -glabel D_80183E40 -.skip 4 - -glabel D_80183E44 -.skip 8 - -glabel D_80183E4C -.skip 4 - -glabel D_80183E50 -.skip 12 - -glabel D_80183E5C -.skip 16 - -glabel D_80183E6C -.skip 4 - -glabel D_80183E70 -.skip 12 - -glabel D_80183E7C -.skip 4 - -glabel D_80183E80 -.skip 4 - -glabel D_80183E84 -.skip 4 - -glabel D_80183E88 -.skip 4 - -glabel D_80183E8C -.skip 4 - -glabel D_80183E90 -.skip 4 - -glabel D_80183E94 -.skip 4 - -glabel D_80183E98 -.skip 8 - -glabel D_80183EA0 -.skip 4 - -glabel D_80183EA4 -.skip 4 - -glabel D_80183EA8 -.skip 4 - -glabel D_80183EAC -.skip 4 - -glabel D_80183EB0 -.skip 16 - -glabel D_80183EC0 -.skip 8 - -glabel D_80183EC8 -.skip 20 - -glabel D_80183EDC -.skip 16 - -glabel D_80183EEC -.skip 60 - -glabel D_80183F28 -.skip 4 - -glabel D_80183F2C -.skip 8 - -glabel D_80183F34 -.skip 8 - -glabel D_80183F3C -.skip 20 - -glabel D_80183F50 -.skip 4 - -glabel D_80183F54 -.skip 16 - -glabel D_80183F64 -.skip 16 - -glabel D_80183F74 -.skip 52 - -glabel D_80183FA8 -.skip 32768 - -glabel D_8018BFA8 -.skip 16 - -glabel D_8018BFB8 -.skip 24 - -glabel D_8018BFD0 -.skip 8 - -glabel D_8018BFD8 -.skip 80 - -glabel D_8018C028 -.skip 8 - -glabel D_8018C030 -.skip 128 - -glabel D_8018C0B0 -.skip 256 - -glabel D_8018C1B0 -.skip 40 - -glabel D_8018C1D8 -.skip 80 - -glabel D_8018C228 -.skip 4 - -glabel D_8018C22C -.skip 76 - -glabel D_8018C278 -.skip 312 - -glabel D_8018C3B0 -.skip 4 - -glabel D_8018C3B4 -.skip 6 - -glabel D_8018C3BA -.skip 54 - -glabel D_8018C3F0 -.skip 20 - -glabel D_8018C404 -.skip 140 - -glabel D_8018C490 -.skip 352 - -glabel D_8018C5F0 -.skip 64 - -glabel D_8018C630 -.skip 120 - -glabel D_8018C6A8 -.skip 8 - -glabel D_8018C6B0 -.skip 384 - -glabel D_8018C830 -.skip 64 - -glabel D_8018C870 -.skip 256 - -glabel D_8018C970 -.skip 256 - -glabel D_8018CA70 -.skip 4 - -glabel D_8018CA74 -.skip 4 - -glabel D_8018CA78 -.skip 24 - -glabel D_8018CA90 -.skip 30 - -glabel D_8018CAAE -.skip 2 - -glabel D_8018CAB0 -.skip 8 - -glabel D_8018CAB8 -.skip 6 - -glabel D_8018CABE -.skip 2 - -glabel D_8018CAC0 -.skip 2 - -glabel D_8018CAC2 -.skip 2 - -glabel D_8018CAC4 -.skip 2 - -glabel D_8018CAC6 -.skip 4 - -glabel D_8018CACA -.skip 2 - -glabel D_8018CACC -.skip 2 - -glabel D_8018CACE -.skip 18 - -glabel D_8018CAE0 -.skip 1 - -glabel D_8018CAE1 -.skip 1 - -glabel D_8018CAE2 -.skip 7 - -glabel D_8018CAE9 -.skip 8 - -glabel D_8018CAF1 -.skip 115 - -glabel D_8018CB64 -.skip 1 - -glabel D_8018CB65 -.skip 1 - -glabel D_8018CB66 -.skip 15 - -glabel D_8018CB75 -.skip 115 - -glabel D_8018CBE8 -.skip 1 - -glabel D_8018CBE9 -.skip 1 - -glabel D_8018CBEA -.skip 15 - -glabel D_8018CBF9 -.skip 115 - -glabel D_8018CC6C -.skip 1 - -glabel D_8018CC6D -.skip 1 - -glabel D_8018CC6E -.skip 15 - -glabel D_8018CC7D -.skip 3 - -glabel D_8018CC80 -.skip 400 - -glabel D_8018CE10 -.skip 20 - -glabel D_8018CE24 -.skip 236 - -glabel D_8018CF10 -.skip 4 - -glabel D_8018CF14 -.skip 4 - -glabel D_8018CF18 -.skip 4 - -glabel D_8018CF1C -.skip 4 - -glabel D_8018CF20 -.skip 4 - -glabel D_8018CF24 -.skip 4 - -glabel D_8018CF28 -.skip 32 - -glabel D_8018CF48 -.skip 8 - -glabel D_8018CF50 -.skip 16 - -glabel D_8018CF60 -.skip 8 - -glabel D_8018CF68 -.skip 16 - -glabel D_8018CF78 -.skip 8 - -glabel D_8018CF80 -.skip 16 - -glabel D_8018CF90 -.skip 8 - -glabel D_8018CF98 -.skip 16 - -glabel D_8018CFA8 -.skip 4 - -glabel D_8018CFAC -.skip 4 - -glabel D_8018CFB0 -.skip 4 - -glabel D_8018CFB4 -.skip 4 - -glabel D_8018CFB8 -.skip 4 - -glabel D_8018CFBC -.skip 4 - -glabel D_8018CFC0 -.skip 4 - -glabel D_8018CFC4 -.skip 4 - -glabel D_8018CFC8 -.skip 4 - -glabel D_8018CFCC -.skip 4 - -glabel D_8018CFD0 -.skip 4 - -glabel D_8018CFD4 -.skip 4 - -glabel D_8018CFD8 -.skip 8 - -glabel D_8018CFE0 -.skip 4 - -glabel D_8018CFE4 -.skip 4 - -glabel D_8018CFE8 -.skip 4 - -glabel D_8018CFEC -.skip 4 - -glabel D_8018CFF0 -.skip 4 - -glabel D_8018CFF4 -.skip 4 - -glabel D_8018CFF8 -.skip 8 - -glabel D_8018D000 -.skip 8 - -glabel D_8018D008 -.skip 4 - -glabel D_8018D00C -.skip 4 - -glabel D_8018D010 -.skip 8 - -glabel D_8018D018 -.skip 4 - -glabel D_8018D01C -.skip 4 - -glabel D_8018D020 -.skip 8 - -glabel D_8018D028 -.skip 4 - -glabel D_8018D02C -.skip 4 - -glabel D_8018D030 -.skip 4 - -glabel D_8018D034 -.skip 4 - -glabel D_8018D038 -.skip 4 - -glabel D_8018D03C -.skip 4 - -glabel D_8018D040 -.skip 4 - -glabel D_8018D044 -.skip 4 - -glabel D_8018D048 -.skip 8 - -glabel D_8018D050 -.skip 4 - -glabel D_8018D054 -.skip 4 - -glabel D_8018D058 -.skip 4 - -glabel D_8018D05C -.skip 4 - -glabel D_8018D060 -.skip 4 - -glabel D_8018D064 -.skip 4 - -glabel D_8018D068 -.skip 4 - -glabel D_8018D06C -.skip 4 - -glabel D_8018D070 -.skip 8 - -glabel D_8018D078 -.skip 4 - -glabel D_8018D07C -.skip 4 - -glabel D_8018D080 -.skip 4 - -glabel D_8018D084 -.skip 4 - -glabel D_8018D088 -.skip 4 - -glabel D_8018D08C -.skip 4 - -glabel D_8018D090 -.skip 4 - -glabel D_8018D094 -.skip 4 - -glabel D_8018D098 -.skip 8 - -glabel D_8018D0A0 -.skip 32 - -glabel D_8018D0C0 -.skip 8 - -glabel D_8018D0C8 -.skip 4 - -glabel D_8018D0CC -.skip 4 - -glabel D_8018D0D0 -.skip 4 - -glabel D_8018D0D4 -.skip 4 - -glabel D_8018D0D8 -.skip 4 - -glabel D_8018D0DC -.skip 4 - -glabel D_8018D0E0 -.skip 4 - -glabel D_8018D0E4 -.skip 4 - -glabel D_8018D0E8 -.skip 8 - -glabel D_8018D0F0 -.skip 32 - -glabel D_8018D110 -.skip 4 - -glabel D_8018D114 -.skip 12 - -glabel D_8018D120 -.skip 32 - -glabel D_8018D140 -.skip 16 - -glabel D_8018D150 -.skip 8 - -glabel D_8018D158 -.skip 8 - -glabel D_8018D160 -.skip 8 - -glabel D_8018D168 -.skip 4 - -glabel D_8018D16C -.skip 4 - -glabel D_8018D170 -.skip 4 - -glabel D_8018D174 -.skip 4 - -glabel D_8018D178 -.skip 4 - -glabel D_8018D17C -.skip 4 - -glabel D_8018D180 -.skip 4 - -glabel D_8018D184 -.skip 4 - -glabel D_8018D188 -.skip 4 - -glabel D_8018D18C -.skip 4 - -glabel D_8018D190 -.skip 8 - -glabel D_8018D198 -.skip 8 - -glabel D_8018D1A0 -.skip 8 - -glabel D_8018D1A8 -.skip 11 - -glabel D_8018D1B3 -.skip 1 - -glabel D_8018D1B4 -.skip 4 - -glabel D_8018D1B8 -.skip 12 - -glabel D_8018D1C4 -.skip 4 - -glabel D_8018D1C8 -.skip 4 - -glabel D_8018D1CC -.skip 4 - -glabel D_8018D1D0 -.skip 4 - -glabel D_8018D1D4 -.skip 4 - -glabel D_8018D1D8 -.skip 4 - -glabel D_8018D1DC -.skip 4 - -glabel D_8018D1E0 -.skip 8 - -glabel D_8018D1E8 -.skip 4 - -glabel D_8018D1EC -.skip 4 - -glabel D_8018D1F0 -.skip 8 - -glabel D_8018D1F8 -.skip 4 - -glabel D_8018D1FC -.skip 4 - -glabel D_8018D200 -.skip 4 - -glabel D_8018D204 -.skip 4 - -glabel D_8018D208 -.skip 4 - -glabel D_8018D20C -.skip 4 - -glabel D_8018D210 -.skip 4 - -glabel D_8018D214 -.skip 4 - -glabel D_8018D218 -.skip 4 - -glabel D_8018D21C -.skip 4 - -glabel D_8018D220 -.skip 4 - -glabel D_8018D224 -.skip 4 - -glabel D_8018D228 -.skip 4 - -glabel D_8018D22C -.skip 4 - -glabel D_8018D230 -.skip 16 - -glabel D_8018D240 -.skip 8 - -glabel D_8018D248 -.skip 88 - -glabel D_8018D2A0 -.skip 4 - -glabel D_8018D2A4 -.skip 8 - -glabel D_8018D2AC -.skip 4 - -glabel D_8018D2B0 -.skip 4 - -glabel D_8018D2B4 -.skip 4 - -glabel D_8018D2B8 -.skip 4 - -glabel D_8018D2BC -.skip 4 - -glabel D_8018D2C0 -.skip 8 - -glabel D_8018D2C8 -.skip 16 - -glabel D_8018D2D8 -.skip 8 - -glabel D_8018D2E0 -.skip 8 - -glabel D_8018D2E8 -.skip 8 - -glabel D_8018D2F0 -.skip 8 - -glabel D_8018D2F8 -.skip 8 - -glabel D_8018D300 -.skip 8 - -glabel D_8018D308 -.skip 8 - -glabel D_8018D310 -.skip 4 - -glabel D_8018D314 -.skip 4 - -glabel D_8018D318 -.skip 8 - -glabel D_8018D320 -.skip 96 - -glabel D_8018D380 -.skip 4 - -glabel D_8018D384 -.skip 4 - -glabel D_8018D388 -.skip 52 - -glabel D_8018D3BC -.skip 4 - -glabel D_8018D3C0 -.skip 4 - -glabel D_8018D3C4 -.skip 16 - -glabel D_8018D3D4 -.skip 4 - -glabel D_8018D3D8 -.skip 4 - -glabel D_8018D3DC -.skip 4 - -glabel D_8018D3E0 -.skip 4 - -glabel D_8018D3E4 -.skip 4 - -glabel D_8018D3E8 -.skip 4 - -glabel D_8018D3EC -.skip 4 - -glabel D_8018D3F0 -.skip 4 - -glabel D_8018D3F4 -.skip 4 - -glabel D_8018D3F8 -.skip 4 - -glabel gRaceFrameCounter # 0x8018D3FC -.word 0x00000000 - -glabel D_8018D400 -.skip 12 - -glabel D_8018D40C -.skip 4 - -glabel D_8018D410 -.skip 16 - -glabel D_8018D420 -.skip 4 - -glabel D_8018D424 -.skip 4 - -glabel D_8018D428 -.skip 4 - -glabel D_8018D42C -.skip 4 - -glabel D_8018D430 -.skip 4 - -glabel D_8018D434 -.skip 4 - -glabel D_8018D438 -.skip 4 - -glabel D_8018D43C -.skip 4 - -glabel D_8018D440 -.skip 4 - -glabel D_8018D444 -.skip 4 - -glabel D_8018D448 -.skip 4 - -glabel D_8018D44C -.skip 4 - -glabel D_8018D450 -.skip 4 - -glabel D_8018D454 -.skip 4 - -glabel D_8018D458 -.skip 4 - -glabel D_8018D45C -.skip 4 - -glabel D_8018D460 -.skip 4 - -glabel D_8018D464 -.skip 4 - -glabel D_8018D468 -.skip 4 - -glabel D_8018D46C -.skip 4 - -glabel D_8018D470 -.skip 4 - -glabel D_8018D474 -.skip 4 - -glabel D_8018D478 -.skip 8 - -glabel D_8018D480 -.skip 4 - -glabel D_8018D484 -.skip 4 - -glabel D_8018D488 -.skip 4 - -glabel D_8018D48C -.skip 4 - -glabel D_8018D490 -.skip 4 - -glabel D_8018D494 -.skip 4 - -glabel D_8018D498 -.skip 4 - -glabel D_8018D49C -.skip 4 - -glabel D_8018D4A0 -.skip 4 - -glabel D_8018D4A4 -.skip 4 - -glabel D_8018D4A8 -.skip 4 - -glabel D_8018D4AC -.skip 4 - -glabel D_8018D4B0 -.skip 4 - -glabel D_8018D4B4 -.skip 4 - -glabel D_8018D4B8 -.skip 4 - -glabel D_8018D4BC -.skip 4 - -glabel D_8018D4C0 -.skip 4 - -glabel D_8018D4C4 -.skip 4 - -glabel D_8018D4C8 -.skip 8 - -glabel D_8018D4D0 -.skip 96 - -glabel D_8018D530 -.skip 96 - -glabel D_8018D590 -.skip 96 - -glabel D_8018D5F0 -.skip 48 - -glabel D_8018D620 -.skip 48 - -glabel D_8018D650 -.skip 96 - -glabel D_8018D6B0 -.skip 96 - -glabel D_8018D710 -.skip 96 - -glabel D_8018D770 -.skip 48 - -glabel D_8018D7A0 -.skip 48 - -glabel D_8018D7D0 -.skip 48 - -glabel D_8018D800 -.skip 48 - -glabel D_8018D830 -.skip 48 - -glabel D_8018D860 -.skip 48 - -glabel D_8018D890 -.skip 48 - -glabel D_8018D8C0 -.skip 16 - -glabel D_8018D8D0 -.skip 48 - -glabel D_8018D900 -.skip 32 - -glabel D_8018D920 -.skip 16 - -glabel D_8018D930 -.skip 32 - -glabel D_8018D950 -.skip 32 - -glabel D_8018D970 -.skip 32 - -glabel D_8018D990 -.skip 32 - -glabel D_8018D9B0 -.skip 4 - -glabel D_8018D9B4 -.skip 4 - -glabel D_8018D9B8 -.skip 4 - -glabel D_8018D9BC -.skip 4 - -glabel D_8018D9C0 -.skip 8 - -glabel D_8018D9C8 -.skip 8 - -glabel D_8018D9D0 -.skip 1 - -glabel D_8018D9D1 -.skip 1 - -glabel D_8018D9D2 -.skip 1 - -glabel D_8018D9D3 -.skip 5 - -glabel D_8018D9D8 -.skip 1 - -glabel D_8018D9D9 -.skip 7 - -glabel D_8018D9E0 -.skip 1280 - -glabel D_8018DEE0 -.skip 4 - -glabel D_8018DEE4 -.skip 380 - -glabel D_8018E060 -.skip 136 - -glabel D_8018E0E8 -.skip 40 - -glabel D_8018E110 -.skip 8 - -glabel D_8018E118 -.skip 4 - -glabel D_8018E11C -.skip 8 - -glabel D_8018E124 -.skip 1588 - -glabel D_8018E758 -.skip 4 - -glabel D_8018E75C -.skip 4 - -glabel D_8018E760 -.skip 8 - -glabel D_8018E768 -.skip 64 - -glabel D_8018E7A8 -.skip 4 - -glabel D_8018E7AC -.skip 4 - -glabel D_8018E7B0 -.skip 1 - -glabel D_8018E7B1 -.skip 7 - -glabel D_8018E7B8 -.skip 16 - -glabel D_8018E7C8 -.skip 8 - -glabel D_8018E7D0 -.skip 16 - -glabel D_8018E7E0 -.skip 8 - -glabel D_8018E7E8 -.skip 8 - -glabel D_8018E7F0 -.skip 8 - -glabel D_8018E7F8 -.skip 2 - -glabel D_8018E7FA -.skip 6 - -glabel D_8018E800 -.skip 2 - -glabel D_8018E802 -.skip 14 - -glabel D_8018E810 -.skip 8 - -glabel D_8018E818 -.skip 2 - -glabel D_8018E81A -.skip 6 - -glabel D_8018E820 -.skip 2 - -glabel D_8018E822 -.skip 6 - -glabel D_8018E828 -.skip 2 - -glabel D_8018E82A -.skip 14 - -glabel D_8018E838 -.skip 4 - -glabel D_8018E83C -.skip 4 - -glabel D_8018E840 -.skip 16 - -glabel D_8018E850 -.skip 4 - -glabel D_8018E854 -.skip 4 - -glabel D_8018E858 -.skip 4 - -glabel D_8018E85C -.skip 4 - -glabel D_8018E860 -.skip 8 - -glabel D_8018E868 -.skip 104 - -glabel D_8018E8D0 -.skip 104 - -glabel D_8018E938 -.skip 508 - -glabel D_8018EB34 -.skip 4 - -glabel D_8018EB38 -.skip 64 - -glabel D_8018EB78 -.skip 4 - -glabel D_8018EB7C -.skip 4 - -glabel D_8018EB80 -.skip 4 - -glabel D_8018EB84 -.skip 4 - -glabel D_8018EB88 -.skip 8 - -glabel D_8018EB90 -.skip 18 - -glabel D_8018EBA2 -.skip 366 - -glabel D_8018ED10 -.skip 1 - -glabel D_8018ED11 -.skip 1 - -glabel D_8018ED12 -.skip 1 - -glabel D_8018ED13 -.skip 1 - -glabel D_8018ED14 -.skip 2 - -glabel D_8018ED16 -.skip 1 - -glabel D_8018ED17 -.skip 55 - -glabel D_8018ED4E -.skip 58 - -glabel D_8018ED88 -.skip 1 - -glabel D_8018ED89 -.skip 1 - -glabel D_8018ED8A -.skip 1 - -glabel D_8018ED8B -.skip 1 - -glabel D_8018ED8C -.skip 2 - -glabel D_8018ED8E -.skip 1 - -glabel D_8018ED8F -.skip 1 - -glabel D_8018ED90 -.skip 1 - -glabel D_8018ED91 -.skip 3 - -glabel D_8018ED94 -.skip 4 - -glabel D_8018ED98 -.skip 4 - -glabel D_8018ED9C -.skip 4 - -glabel D_8018EDA0 -.skip 4 - -glabel D_8018EDA4 -.skip 4 - -glabel D_8018EDA8 -.skip 4 - -glabel D_8018EDAC -.skip 4 - -glabel D_8018EDB0 -.skip 2 - -glabel D_8018EDB2 -.skip 2 - -glabel D_8018EDB4 -.skip 4 - -glabel D_8018EDB8 -.skip 4 - -glabel D_8018EDBC -.skip 4 - -glabel D_8018EDC0 -.skip 4 - -glabel D_8018EDC4 -.skip 4 - -glabel D_8018EDC8 -.skip 4 - -glabel D_8018EDCC -.skip 4 - -glabel D_8018EDD0 -.skip 4 - -glabel D_8018EDD4 -.skip 4 - -glabel D_8018EDD8 -.skip 4 - -glabel D_8018EDDC -.skip 4 - -glabel D_8018EDE0 -.skip 4 - -glabel gCharacterSelections # 0x8018EDE4 -.skip 1 - -glabel D_8018EDE5 -.skip 1 - -glabel D_8018EDE6 -.skip 1 - -glabel D_8018EDE7 -.skip 1 - -glabel D_8018EDE8 -.skip 1 - -glabel D_8018EDE9 -.skip 1 - -glabel D_8018EDEA -.skip 1 - -glabel D_8018EDEB -.skip 1 - -glabel D_8018EDEC -.skip 1 - -glabel D_8018EDED -.skip 1 - -glabel D_8018EDEE -.skip 1 - -glabel D_8018EDEF -.skip 1 - -glabel gPlayerCountSelection2 # 0x8018EDF0 -.skip 1 - -glabel D_8018EDF1 -.skip 1 - -glabel D_8018EDF2 -.skip 1 - -glabel D_8018EDF3 -.skip 1 - -glabel D_8018EDF4 -.skip 1 - -glabel D_8018EDF5 -.skip 1 - -glabel D_8018EDF6 -.skip 1 - -glabel D_8018EDF7 -.skip 1 - -glabel D_8018EDF8 -.skip 1 - -glabel D_8018EDF9 -.skip 1 - -glabel D_8018EDFA -.skip 1 - -glabel D_8018EDFB -.skip 1 - -glabel D_8018EDFC -.skip 4 - -glabel D_8018EE00 -.skip 4 - -glabel D_8018EE04 -.skip 4 - -glabel D_8018EE08 -.skip 1 - -glabel gCupSelection # 0x8018EE09 -.skip 1 - -glabel D_8018EE0A -.skip 1 - -glabel gCourseSelection # 0x8018EE0B -.skip 1 - -glabel D_8018EE0C -.skip 4 - -glabel D_8018EE10 -.skip 4 - -glabel D_8018EE14 -.skip 1 - -glabel D_8018EE15 -.skip 1 - -glabel D_8018EE16 -.skip 126 - -glabel D_8018EE94 -.skip 1 - -glabel D_8018EE95 -.skip 123 - -glabel D_8018EF10 -.skip 8 - -glabel D_8018EF18 -.skip 192 - -glabel D_8018EFD8 -.skip 3000 - -glabel D_8018FB90 -.skip 1 - -glabel D_8018FB91 -.skip 7 - -glabel D_8018FB98 -.skip 16 - -glabel D_8018FBA8 -.skip 48 - -glabel D_8018FBD8 -.skip 48 - -glabel D_8018FC08 -.skip 8 - -glabel D_8018FC10 -.skip 16 - -glabel D_8018FC20 -.skip 6144 - -glabel D_80191420 -.skip 36 - -glabel D_80191444 -.skip 5724 - -glabel D_80192AA0 -.skip 8 - -glabel D_80192AA8 -.skip 8 - -glabel D_80192AB0 -.skip 8 - -glabel D_80192AB8 -.skip 384 - -glabel D_80192C38 -.skip 4 - -glabel D_80192C3C -.skip 12 - -glabel D_80192C48 -.skip 96 - -glabel D_80192CA8 -.skip 30 - -glabel D_80192CC6 -.skip 10 - -glabel D_80192CD0 -.skip 1024 - -glabel D_801930D0 -.skip 584 - -glabel D_80193318 -.skip 1192 - -glabel D_801937C0 -.skip 24 - -glabel D_801937D8 -.skip 24 - -glabel D_801937F0 -.skip 24 - -glabel D_80193808 -.skip 24 - -glabel D_80193820 -.skip 2048 - -glabel D_80194020 -.skip 8 - -glabel D_80194028 -.skip 16 - -glabel D_80194038 -.skip 4 - -glabel D_8019403C -.skip 4 - -glabel D_80194040 -.skip 16 diff --git a/asm/bss_sptask_audio.s b/asm/bss_sptask_audio.s new file mode 100644 index 000000000..716ab4702 --- /dev/null +++ b/asm/bss_sptask_audio.s @@ -0,0 +1,20 @@ +.include "macros.inc" + +.section .bss + +.skip 875760 +#glabel gFramebuffer0 +#.skip 153600 + +#glabel gFramebuffer1 +#.skip 153600 + +#glabel gFramebuffer2 +#.skip 153600 + +## Audio + +glabel gGfxSPTaskOutputBuffer # 0x8038FF80 +.skip 129024 + +glabel gGfxSPTaskOutputBufferSize # 0x803AF780 \ No newline at end of file diff --git a/asm/non_matchings/audio/external/func_800C2474.s b/asm/non_matchings/audio/external/func_800C2474.s index 0a94a7c88..8ffe25f93 100644 --- a/asm/non_matchings/audio/external/func_800C2474.s +++ b/asm/non_matchings/audio/external/func_800C2474.s @@ -1,21 +1,21 @@ glabel func_800C2474 -/* 0C3074 800C2474 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 0C3078 800C2478 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 0C3074 800C2474 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 0C3078 800C2478 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 0C307C 800C247C 3C028019 */ lui $v0, %hi(D_8018FB98) # $v0, 0x8019 /* 0C3080 800C2480 3C018019 */ lui $at, %hi(D_8018EF10) # $at, 0x8019 /* 0C3084 800C2484 2442FB98 */ addiu $v0, %lo(D_8018FB98) # addiu $v0, $v0, -0x468 /* 0C3088 800C2488 A020EF10 */ sb $zero, %lo(D_8018EF10)($at) -/* 0C308C 800C248C 3C0F800E */ lui $t7, %hi(D_800DDB44) # $t7, 0x800e +/* 0C308C 800C248C 3C0F800E */ lui $t7, %hi(camera2) # $t7, 0x800e /* 0C3090 800C2490 AC4E0000 */ sw $t6, ($v0) -/* 0C3094 800C2494 8DEFDB44 */ lw $t7, %lo(D_800DDB44)($t7) -/* 0C3098 800C2498 3C18800E */ lui $t8, %hi(D_800DDB48) # $t8, 0x800e -/* 0C309C 800C249C 3C19800E */ lui $t9, %hi(D_800DDB4C) # $t9, 0x800e +/* 0C3094 800C2494 8DEFDB44 */ lw $t7, %lo(camera2)($t7) +/* 0C3098 800C2498 3C18800E */ lui $t8, %hi(camera3) # $t8, 0x800e +/* 0C309C 800C249C 3C19800E */ lui $t9, %hi(camera4) # $t9, 0x800e /* 0C30A0 800C24A0 AC4F0004 */ sw $t7, 4($v0) -/* 0C30A4 800C24A4 8F18DB48 */ lw $t8, %lo(D_800DDB48)($t8) +/* 0C30A4 800C24A4 8F18DB48 */ lw $t8, %lo(camera3)($t8) /* 0C30A8 800C24A8 3C018019 */ lui $at, %hi(D_8018FB91) # $at, 0x8019 /* 0C30AC 800C24AC 240E0001 */ li $t6, 1 /* 0C30B0 800C24B0 AC580008 */ sw $t8, 8($v0) -/* 0C30B4 800C24B4 8F39DB4C */ lw $t9, %lo(D_800DDB4C)($t9) +/* 0C30B4 800C24B4 8F39DB4C */ lw $t9, %lo(camera4)($t9) /* 0C30B8 800C24B8 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 0C30BC 800C24BC AFB00028 */ sw $s0, 0x28($sp) /* 0C30C0 800C24C0 AC59000C */ sw $t9, 0xc($v0) diff --git a/asm/non_matchings/code_80005FD0/func_800061DC.s b/asm/non_matchings/code_80005FD0/func_800061DC.s index ebeb8cafc..34b9f721d 100644 --- a/asm/non_matchings/code_80005FD0/func_800061DC.s +++ b/asm/non_matchings/code_80005FD0/func_800061DC.s @@ -29,7 +29,7 @@ glabel func_800061DC /* 006E38 80006238 3C0E800E */ lui $t6, %hi(D_800DC51C) /* 006E3C 8000623C 95CEC51C */ lhu $t6, %lo(D_800DC51C)($t6) /* 006E40 80006240 00C01825 */ move $v1, $a2 -/* 006E44 80006244 3C04800E */ lui $a0, %hi(D_800DDB40) +/* 006E44 80006244 3C04800E */ lui $a0, %hi(camera1) /* 006E48 80006248 15C00031 */ bnez $t6, .L80006310 /* 006E4C 8000624C 00002825 */ move $a1, $zero /* 006E50 80006250 3C028019 */ lui $v0, %hi(D_8018EDF3) # $v0, 0x8019 @@ -85,7 +85,7 @@ glabel func_800061DC /* 006F0C 8000630C D7B40008 */ ldc1 $f20, 8($sp) .L80006310: /* 006F10 80006310 184000AB */ blez $v0, .L800065C0 -/* 006F14 80006314 8C84DB40 */ lw $a0, %lo(D_800DDB40)($a0) +/* 006F14 80006314 8C84DB40 */ lw $a0, %lo(camera1)($a0) /* 006F18 80006318 30470003 */ andi $a3, $v0, 3 /* 006F1C 8000631C 10E00024 */ beqz $a3, .L800063B0 /* 006F20 80006320 00E03025 */ move $a2, $a3 diff --git a/asm/non_matchings/code_80005FD0/func_8000F628.s b/asm/non_matchings/code_80005FD0/func_8000F628.s index 90bd9511b..6a557e290 100644 --- a/asm/non_matchings/code_80005FD0/func_8000F628.s +++ b/asm/non_matchings/code_80005FD0/func_8000F628.s @@ -512,8 +512,8 @@ glabel func_8000F628 /* 0109FC 8000FDFC A640FFFE */ sh $zero, -2($s2) /* 010A00 8000FE00 1523001C */ bne $t1, $v1, .L8000FE74 /* 010A04 8000FE04 3C058016 */ lui $a1, %hi(D_80163344) # $a1, 0x8016 -/* 010A08 8000FE08 3C0E8016 */ lui $t6, %hi(D_8016479E) # $t6, 0x8016 -/* 010A0C 8000FE0C 85CE479E */ lh $t6, %lo(D_8016479E)($t6) +/* 010A08 8000FE08 3C0E8016 */ lui $t6, %hi(cameras+0xAE) # $t6, 0x8016 +/* 010A0C 8000FE0C 85CE479E */ lh $t6, %lo(cameras+0xAE)($t6) /* 010A10 8000FE10 24A53344 */ addiu $a1, %lo(D_80163344) # addiu $a1, $a1, 0x3344 /* 010A14 8000FE14 3C028016 */ lui $v0, %hi(D_80163346) # $v0, 0x8016 /* 010A18 8000FE18 31C3FFFF */ andi $v1, $t6, 0xffff @@ -521,9 +521,9 @@ glabel func_8000F628 /* 010A20 8000FE20 00D8C821 */ addu $t9, $a2, $t8 /* 010A24 8000FE24 A7270000 */ sh $a3, ($t9) /* 010A28 8000FE28 01187821 */ addu $t7, $t0, $t8 -/* 010A2C 8000FE2C 3C048016 */ lui $a0, %hi(D_801647A8) # $a0, 0x8016 +/* 010A2C 8000FE2C 3C048016 */ lui $a0, %hi(cameras+0xB8) # $a0, 0x8016 /* 010A30 8000FE30 A5E00000 */ sh $zero, ($t7) -/* 010A34 8000FE34 248447A8 */ addiu $a0, %lo(D_801647A8) # addiu $a0, $a0, 0x47a8 +/* 010A34 8000FE34 248447A8 */ addiu $a0, %lo(cameras+0xB8) # addiu $a0, $a0, 0x47a8 /* 010A38 8000FE38 24423346 */ addiu $v0, %lo(D_80163346) # addiu $v0, $v0, 0x3346 /* 010A3C 8000FE3C 02208025 */ move $s0, $s1 /* 010A40 8000FE40 A4AE0000 */ sh $t6, ($a1) diff --git a/asm/non_matchings/code_80005FD0/func_80014D30.s b/asm/non_matchings/code_80005FD0/func_80014D30.s index ef8e51fd4..d90d31133 100644 --- a/asm/non_matchings/code_80005FD0/func_80014D30.s +++ b/asm/non_matchings/code_80005FD0/func_80014D30.s @@ -30,8 +30,8 @@ glabel func_80014D30 /* 0159A0 80014DA0 01445023 */ subu $t2, $t2, $a0 /* 0159A4 80014DA4 000A50C0 */ sll $t2, $t2, 3 /* 0159A8 80014DA8 46809120 */ cvt.s.w $f4, $f18 -/* 0159AC 80014DAC 3C0C8016 */ lui $t4, %hi(D_801646F0) # $t4, 0x8016 -/* 0159B0 80014DB0 258C46F0 */ addiu $t4, %lo(D_801646F0) # addiu $t4, $t4, 0x46f0 +/* 0159AC 80014DAC 3C0C8016 */ lui $t4, %hi(cameras) # $t4, 0x8016 +/* 0159B0 80014DB0 258C46F0 */ addiu $t4, %lo(cameras) # addiu $t4, $t4, 0x46f0 /* 0159B4 80014DB4 254B0054 */ addiu $t3, $t2, 0x54 /* 0159B8 80014DB8 016C2021 */ addu $a0, $t3, $t4 /* 0159BC 80014DBC 460A4400 */ add.s $f16, $f8, $f10 diff --git a/asm/non_matchings/code_80005FD0/func_80015314.s b/asm/non_matchings/code_80005FD0/func_80015314.s index a249acd62..e40ec450d 100644 --- a/asm/non_matchings/code_80005FD0/func_80015314.s +++ b/asm/non_matchings/code_80005FD0/func_80015314.s @@ -10,10 +10,10 @@ glabel func_80015314 /* 015F34 80015334 8CA5C4DC */ lw $a1, %lo(D_800DC4DC)($a1) /* 015F38 80015338 000E7080 */ sll $t6, $t6, 2 /* 015F3C 8001533C 0006C080 */ sll $t8, $a2, 2 -/* 015F40 80015340 3C04800E */ lui $a0, %hi(D_800DDB40) +/* 015F40 80015340 3C04800E */ lui $a0, %hi(camera1) /* 015F44 80015344 01C77023 */ subu $t6, $t6, $a3 /* 015F48 80015348 0306C023 */ subu $t8, $t8, $a2 -/* 015F4C 8001534C 8C84DB40 */ lw $a0, %lo(D_800DDB40)($a0) +/* 015F4C 8001534C 8C84DB40 */ lw $a0, %lo(camera1)($a0) /* 015F50 80015350 000E70C0 */ sll $t6, $t6, 3 /* 015F54 80015354 0018C0C0 */ sll $t8, $t8, 3 /* 015F58 80015358 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80015544.s b/asm/non_matchings/code_80005FD0/func_80015544.s index 83822ae1f..4ee0a417f 100644 --- a/asm/non_matchings/code_80005FD0/func_80015544.s +++ b/asm/non_matchings/code_80005FD0/func_80015544.s @@ -88,14 +88,14 @@ glabel func_80015544 /* 016294 80015694 44815800 */ mtc1 $at, $f11 /* 016298 80015698 44805000 */ mtc1 $zero, $f10 /* 01629C 8001569C 46000321 */ cvt.d.s $f12, $f0 -/* 0162A0 800156A0 3C0B8016 */ lui $t3, %hi(D_801646F0) # $t3, 0x8016 +/* 0162A0 800156A0 3C0B8016 */ lui $t3, %hi(cameras) # $t3, 0x8016 /* 0162A4 800156A4 462A1481 */ sub.d $f18, $f2, $f10 /* 0162A8 800156A8 8FA40024 */ lw $a0, 0x24($sp) /* 0162AC 800156AC 8FA50020 */ lw $a1, 0x20($sp) /* 0162B0 800156B0 8FA8002C */ lw $t0, 0x2c($sp) /* 0162B4 800156B4 4632603C */ c.lt.d $f12, $f18 /* 0162B8 800156B8 3C01800F */ lui $at, %hi(D_800ED218) -/* 0162BC 800156BC 256B46F0 */ addiu $t3, %lo(D_801646F0) # addiu $t3, $t3, 0x46f0 +/* 0162BC 800156BC 256B46F0 */ addiu $t3, %lo(cameras) # addiu $t3, $t3, 0x46f0 /* 0162C0 800156C0 45030008 */ bc1tl .L800156E4 /* 0162C4 800156C4 3C014024 */ li $at, 0x40240000 # 2.562500 /* 0162C8 800156C8 D424D218 */ ldc1 $f4, %lo(D_800ED218)($at) diff --git a/asm/non_matchings/code_80005FD0/func_80015A9C.s b/asm/non_matchings/code_80005FD0/func_80015A9C.s index 7f225e324..4ccdae43e 100644 --- a/asm/non_matchings/code_80005FD0/func_80015A9C.s +++ b/asm/non_matchings/code_80005FD0/func_80015A9C.s @@ -99,7 +99,7 @@ glabel func_80015A9C /* 016818 80015C18 3C0E8016 */ lui $t6, %hi(D_80164648) # $t6, 0x8016 /* 01681C 80015C1C 25CE4648 */ addiu $t6, %lo(D_80164648) # addiu $t6, $t6, 0x4648 /* 016820 80015C20 004E4021 */ addu $t0, $v0, $t6 -/* 016824 80015C24 3C0B8016 */ lui $t3, %hi(D_801646F0) # $t3, 0x8016 +/* 016824 80015C24 3C0B8016 */ lui $t3, %hi(cameras) # $t3, 0x8016 /* 016828 80015C28 46000121 */ cvt.d.s $f4, $f0 /* 01682C 80015C2C E5000000 */ swc1 $f0, ($t0) /* 016830 80015C30 4626203C */ c.lt.d $f4, $f6 @@ -112,7 +112,7 @@ glabel func_80015A9C /* 01684C 80015C4C 8FB90030 */ lw $t9, 0x30($sp) .L80015C50: /* 016850 80015C50 C48A0000 */ lwc1 $f10, ($a0) -/* 016854 80015C54 256B46F0 */ addiu $t3, %lo(D_801646F0) # addiu $t3, $t3, 0x46f0 +/* 016854 80015C54 256B46F0 */ addiu $t3, %lo(cameras) # addiu $t3, $t3, 0x46f0 /* 016858 80015C58 00195080 */ sll $t2, $t9, 2 /* 01685C 80015C5C 01595023 */ subu $t2, $t2, $t9 /* 016860 80015C60 000A50C0 */ sll $t2, $t2, 3 diff --git a/asm/non_matchings/code_80005FD0/func_800162CC.s b/asm/non_matchings/code_80005FD0/func_800162CC.s index 6848dbe63..7b82fb294 100644 --- a/asm/non_matchings/code_80005FD0/func_800162CC.s +++ b/asm/non_matchings/code_80005FD0/func_800162CC.s @@ -99,10 +99,10 @@ glabel func_800162CC /* 017048 80016448 000D68C0 */ sll $t5, $t5, 3 /* 01704C 8001644C E4224658 */ swc1 $f2, %lo(D_80164658)($at) /* 017050 80016450 3C018016 */ lui $at, %hi(D_80164648) -/* 017054 80016454 3C0C8016 */ lui $t4, %hi(D_801646F0) # $t4, 0x8016 +/* 017054 80016454 3C0C8016 */ lui $t4, %hi(cameras) # $t4, 0x8016 /* 017058 80016458 01AB6823 */ subu $t5, $t5, $t3 /* 01705C 8001645C 000D68C0 */ sll $t5, $t5, 3 -/* 017060 80016460 258C46F0 */ addiu $t4, %lo(D_801646F0) # addiu $t4, $t4, 0x46f0 +/* 017060 80016460 258C46F0 */ addiu $t4, %lo(cameras) # addiu $t4, $t4, 0x46f0 /* 017064 80016464 00230821 */ addu $at, $at, $v1 /* 017068 80016468 01AC1021 */ addu $v0, $t5, $t4 /* 01706C 8001646C E4224648 */ swc1 $f2, %lo(D_80164648)($at) diff --git a/asm/non_matchings/code_80005FD0/func_80016C3C.s b/asm/non_matchings/code_80005FD0/func_80016C3C.s index 695c85d53..0bd5a6af0 100644 --- a/asm/non_matchings/code_80005FD0/func_80016C3C.s +++ b/asm/non_matchings/code_80005FD0/func_80016C3C.s @@ -247,11 +247,11 @@ glabel func_80016C3C /* 017BDC 80016FDC 000F6880 */ sll $t5, $t7, 2 /* 017BE0 80016FE0 01AF6823 */ subu $t5, $t5, $t7 /* 017BE4 80016FE4 000D68C0 */ sll $t5, $t5, 3 -/* 017BE8 80016FE8 3C0E8016 */ lui $t6, %hi(D_801646F0) # $t6, 0x8016 +/* 017BE8 80016FE8 3C0E8016 */ lui $t6, %hi(cameras) # $t6, 0x8016 /* 017BEC 80016FEC 46128382 */ mul.s $f14, $f16, $f18 /* 017BF0 80016FF0 01AF6823 */ subu $t5, $t5, $t7 /* 017BF4 80016FF4 000D68C0 */ sll $t5, $t5, 3 -/* 017BF8 80016FF8 25CE46F0 */ addiu $t6, %lo(D_801646F0) # addiu $t6, $t6, 0x46f0 +/* 017BF8 80016FF8 25CE46F0 */ addiu $t6, %lo(cameras) # addiu $t6, $t6, 0x46f0 /* 017BFC 80016FFC 01AE1021 */ addu $v0, $t5, $t6 /* 017C00 80017000 E442000C */ swc1 $f2, 0xc($v0) /* 017C04 80017004 E44C0014 */ swc1 $f12, 0x14($v0) diff --git a/asm/non_matchings/code_80005FD0/func_80017720.s b/asm/non_matchings/code_80005FD0/func_80017720.s index d588957b4..74605e59e 100644 --- a/asm/non_matchings/code_80005FD0/func_80017720.s +++ b/asm/non_matchings/code_80005FD0/func_80017720.s @@ -102,10 +102,10 @@ glabel func_80017720 /* 0184A8 800178A8 0018C0C0 */ sll $t8, $t8, 3 /* 0184AC 800178AC E4224658 */ swc1 $f2, %lo(D_80164658)($at) /* 0184B0 800178B0 3C018016 */ lui $at, %hi(D_80164648) -/* 0184B4 800178B4 3C0F8016 */ lui $t7, %hi(D_801646F0) # $t7, 0x8016 +/* 0184B4 800178B4 3C0F8016 */ lui $t7, %hi(cameras) # $t7, 0x8016 /* 0184B8 800178B8 030EC023 */ subu $t8, $t8, $t6 /* 0184BC 800178BC 0018C0C0 */ sll $t8, $t8, 3 -/* 0184C0 800178C0 25EF46F0 */ addiu $t7, %lo(D_801646F0) # addiu $t7, $t7, 0x46f0 +/* 0184C0 800178C0 25EF46F0 */ addiu $t7, %lo(cameras) # addiu $t7, $t7, 0x46f0 /* 0184C4 800178C4 00230821 */ addu $at, $at, $v1 /* 0184C8 800178C8 030F1021 */ addu $v0, $t8, $t7 /* 0184CC 800178CC E4224648 */ swc1 $f2, %lo(D_80164648)($at) diff --git a/asm/non_matchings/code_80005FD0/func_80017F10.s b/asm/non_matchings/code_80005FD0/func_80017F10.s index 2fef207ae..bb6bfee68 100644 --- a/asm/non_matchings/code_80005FD0/func_80017F10.s +++ b/asm/non_matchings/code_80005FD0/func_80017F10.s @@ -105,10 +105,10 @@ glabel func_80017F10 /* 018CA4 800180A4 0018C0C0 */ sll $t8, $t8, 3 /* 018CA8 800180A8 E4224658 */ swc1 $f2, %lo(D_80164658)($at) /* 018CAC 800180AC 3C018016 */ lui $at, %hi(D_80164648) -/* 018CB0 800180B0 3C0F8016 */ lui $t7, %hi(D_801646F0) # $t7, 0x8016 +/* 018CB0 800180B0 3C0F8016 */ lui $t7, %hi(cameras) # $t7, 0x8016 /* 018CB4 800180B4 030EC023 */ subu $t8, $t8, $t6 /* 018CB8 800180B8 0018C0C0 */ sll $t8, $t8, 3 -/* 018CBC 800180BC 25EF46F0 */ addiu $t7, %lo(D_801646F0) # addiu $t7, $t7, 0x46f0 +/* 018CBC 800180BC 25EF46F0 */ addiu $t7, %lo(cameras) # addiu $t7, $t7, 0x46f0 /* 018CC0 800180C0 00230821 */ addu $at, $at, $v1 /* 018CC4 800180C4 030F1021 */ addu $v0, $t8, $t7 /* 018CC8 800180C8 E4224648 */ swc1 $f2, %lo(D_80164648)($at) diff --git a/asm/non_matchings/code_80005FD0/func_80018718.s b/asm/non_matchings/code_80005FD0/func_80018718.s index 0a0bd2691..387d4b304 100644 --- a/asm/non_matchings/code_80005FD0/func_80018718.s +++ b/asm/non_matchings/code_80005FD0/func_80018718.s @@ -102,13 +102,13 @@ glabel func_80018718 /* 0194A0 800188A0 01AE6823 */ subu $t5, $t5, $t6 /* 0194A4 800188A4 000D68C0 */ sll $t5, $t5, 3 /* 0194A8 800188A8 00230821 */ addu $at, $at, $v1 -/* 0194AC 800188AC 3C0F8016 */ lui $t7, %hi(D_801646F0) # $t7, 0x8016 +/* 0194AC 800188AC 3C0F8016 */ lui $t7, %hi(cameras) # $t7, 0x8016 /* 0194B0 800188B0 E4224648 */ swc1 $f2, %lo(D_80164648)($at) /* 0194B4 800188B4 01AE6823 */ subu $t5, $t5, $t6 /* 0194B8 800188B8 3C018016 */ lui $at, %hi(D_8016448C) # $at, 0x8016 /* 0194BC 800188BC 240C0001 */ li $t4, 1 /* 0194C0 800188C0 000D68C0 */ sll $t5, $t5, 3 -/* 0194C4 800188C4 25EF46F0 */ addiu $t7, %lo(D_801646F0) # addiu $t7, $t7, 0x46f0 +/* 0194C4 800188C4 25EF46F0 */ addiu $t7, %lo(cameras) # addiu $t7, $t7, 0x46f0 /* 0194C8 800188C8 AC2C448C */ sw $t4, %lo(D_8016448C)($at) /* 0194CC 800188CC 01AF1021 */ addu $v0, $t5, $t7 /* 0194D0 800188D0 E4400000 */ swc1 $f0, ($v0) diff --git a/asm/non_matchings/code_80005FD0/func_80019118.s b/asm/non_matchings/code_80005FD0/func_80019118.s index da6b4c9a0..4d8c303d8 100644 --- a/asm/non_matchings/code_80005FD0/func_80019118.s +++ b/asm/non_matchings/code_80005FD0/func_80019118.s @@ -83,14 +83,14 @@ glabel func_80019118 /* 019E54 80019254 44815800 */ mtc1 $at, $f11 /* 019E58 80019258 44805000 */ mtc1 $zero, $f10 /* 019E5C 8001925C 46000321 */ cvt.d.s $f12, $f0 -/* 019E60 80019260 3C0F8016 */ lui $t7, %hi(D_801646F0) # $t7, 0x8016 +/* 019E60 80019260 3C0F8016 */ lui $t7, %hi(cameras) # $t7, 0x8016 /* 019E64 80019264 462A1481 */ sub.d $f18, $f2, $f10 /* 019E68 80019268 8FA40024 */ lw $a0, 0x24($sp) /* 019E6C 8001926C 8FA50020 */ lw $a1, 0x20($sp) /* 019E70 80019270 8FA7002C */ lw $a3, 0x2c($sp) /* 019E74 80019274 4632603C */ c.lt.d $f12, $f18 /* 019E78 80019278 3C01800F */ lui $at, %hi(D_800ED310) -/* 019E7C 8001927C 25EF46F0 */ addiu $t7, %lo(D_801646F0) # addiu $t7, $t7, 0x46f0 +/* 019E7C 8001927C 25EF46F0 */ addiu $t7, %lo(cameras) # addiu $t7, $t7, 0x46f0 /* 019E80 80019280 45030008 */ bc1tl .L800192A4 /* 019E84 80019284 3C014024 */ li $at, 0x40240000 # 2.562500 /* 019E88 80019288 D424D310 */ ldc1 $f4, %lo(D_800ED310)($at) diff --git a/asm/non_matchings/code_80005FD0/func_80019890.s b/asm/non_matchings/code_80005FD0/func_80019890.s index 8f1dd17d7..e613a16af 100644 --- a/asm/non_matchings/code_80005FD0/func_80019890.s +++ b/asm/non_matchings/code_80005FD0/func_80019890.s @@ -1,7 +1,7 @@ glabel func_80019890 -/* 01A490 80019890 3C0E800E */ lui $t6, %hi(D_800DDB40) +/* 01A490 80019890 3C0E800E */ lui $t6, %hi(camera1) /* 01A494 80019894 0005C080 */ sll $t8, $a1, 2 -/* 01A498 80019898 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 01A498 80019898 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 01A49C 8001989C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 01A4A0 800198A0 0305C023 */ subu $t8, $t8, $a1 /* 01A4A4 800198A4 0018C0C0 */ sll $t8, $t8, 3 diff --git a/asm/non_matchings/code_80005FD0/func_80019DF4.s b/asm/non_matchings/code_80005FD0/func_80019DF4.s index df7f15446..f81b462d9 100644 --- a/asm/non_matchings/code_80005FD0/func_80019DF4.s +++ b/asm/non_matchings/code_80005FD0/func_80019DF4.s @@ -9,9 +9,9 @@ glabel func_80019DF4 /* 01AA10 80019E10 85EF467A */ lh $t7, %lo(D_8016467A)($t7) /* 01AA14 80019E14 85CE4678 */ lh $t6, %lo(D_80164678)($t6) /* 01AA18 80019E18 3C028016 */ lui $v0, %hi(D_80164360) # $v0, 0x8016 -/* 01AA1C 80019E1C 3C08800E */ lui $t0, %hi(D_800DDB40) +/* 01AA1C 80019E1C 3C08800E */ lui $t0, %hi(camera1) /* 01AA20 80019E20 84424360 */ lh $v0, %lo(D_80164360)($v0) -/* 01AA24 80019E24 8D08DB40 */ lw $t0, %lo(D_800DDB40)($t0) +/* 01AA24 80019E24 8D08DB40 */ lw $t0, %lo(camera1)($t0) /* 01AA28 80019E28 A4394676 */ sh $t9, %lo(D_80164670+0x6)($at) /* 01AA2C 80019E2C A4384674 */ sh $t8, %lo(D_80164670+0x4)($at) /* 01AA30 80019E30 A42F4672 */ sh $t7, %lo(D_80164670+0x2)($at) diff --git a/asm/non_matchings/code_80005FD0/func_80019ED0.s b/asm/non_matchings/code_80005FD0/func_80019ED0.s index 3ef0d6b7c..4405ef704 100644 --- a/asm/non_matchings/code_80005FD0/func_80019ED0.s +++ b/asm/non_matchings/code_80005FD0/func_80019ED0.s @@ -24,8 +24,8 @@ glabel func_80019ED0 /* 01AB24 80019F24 3C13800E */ lui $s3, %hi(D_800DC5E8) /* 01AB28 80019F28 2673C5E8 */ addiu $s3, %lo(D_800DC5E8) # addiu $s3, $s3, -0x3a18 /* 01AB2C 80019F2C 8E620000 */ lw $v0, ($s3) -/* 01AB30 80019F30 3C0F800E */ lui $t7, %hi(D_800DDB40) -/* 01AB34 80019F34 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 01AB30 80019F30 3C0F800E */ lui $t7, %hi(camera1) +/* 01AB34 80019F34 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 01AB38 80019F38 3C018016 */ lui $at, %hi(D_80164360) # $at, 0x8016 /* 01AB3C 80019F3C 3C108016 */ lui $s0, %hi(D_80164678) # $s0, 0x8016 /* 01AB40 80019F40 3C128016 */ lui $s2, %hi(D_80164680) # $s2, 0x8016 diff --git a/asm/non_matchings/code_80005FD0/func_8001A348.s b/asm/non_matchings/code_80005FD0/func_8001A348.s index 05e3c8404..cc71484ed 100644 --- a/asm/non_matchings/code_80005FD0/func_8001A348.s +++ b/asm/non_matchings/code_80005FD0/func_8001A348.s @@ -4,14 +4,14 @@ glabel func_8001A348 /* 01AF50 8001A350 000E70C0 */ sll $t6, $t6, 3 /* 01AF54 8001A354 01C47023 */ subu $t6, $t6, $a0 /* 01AF58 8001A358 000E70C0 */ sll $t6, $t6, 3 -/* 01AF5C 8001A35C 3C0F8016 */ lui $t7, %hi(D_8016479E) # 0x8016 +/* 01AF5C 8001A35C 3C0F8016 */ lui $t7, %hi(cameras+0xAE) # 0x8016 /* 01AF60 8001A360 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 01AF64 8001A364 00803825 */ move $a3, $a0 /* 01AF68 8001A368 01EE7821 */ addu $t7, $t7, $t6 /* 01AF6C 8001A36C 0004C080 */ sll $t8, $a0, 2 /* 01AF70 8001A370 00041840 */ sll $v1, $a0, 1 /* 01AF74 8001A374 44856000 */ mtc1 $a1, $f12 -/* 01AF78 8001A378 85EF479E */ lh $t7, %lo(D_8016479E)($t7) # 0x479e($t7) +/* 01AF78 8001A378 85EF479E */ lh $t7, %lo(cameras+0xAE)($t7) # 0x479e($t7) /* 01AF7C 8001A37C 3C018016 */ lui $at, %hi(D_80164688) /* 01AF80 8001A380 3C048016 */ lui $a0, %hi(D_80164668) # 0x8016 /* 01AF84 8001A384 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8001A3D8.s b/asm/non_matchings/code_80005FD0/func_8001A3D8.s index 8a61e42a9..cc8245377 100644 --- a/asm/non_matchings/code_80005FD0/func_8001A3D8.s +++ b/asm/non_matchings/code_80005FD0/func_8001A3D8.s @@ -14,14 +14,14 @@ glabel func_8001A3D8 /* 01B008 8001A408 84480000 */ lh $t0, ($v0) /* 01B00C 8001A40C 01C47023 */ subu $t6, $t6, $a0 /* 01B010 8001A410 000E70C0 */ sll $t6, $t6, 3 -/* 01B014 8001A414 3C078016 */ lui $a3, %hi(D_8016479E) # 0x8016 +/* 01B014 8001A414 3C078016 */ lui $a3, %hi(cameras+0xAE) # 0x8016 /* 01B018 8001A418 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 01B01C 8001A41C 00EE3821 */ addu $a3, $a3, $t6 /* 01B020 8001A420 AFBF0014 */ sw $ra, 0x14($sp) /* 01B024 8001A424 AFA40018 */ sw $a0, 0x18($sp) /* 01B028 8001A428 00802825 */ move $a1, $a0 /* 01B02C 8001A42C 10C80004 */ beq $a2, $t0, .L8001A440 -/* 01B030 8001A430 84E7479E */ lh $a3, %lo(D_8016479E)($a3) # 0x479e($a3) +/* 01B030 8001A430 84E7479E */ lh $a3, %lo(cameras+0xAE)($a3) # 0x479e($a3) /* 01B034 8001A434 A4460000 */ sh $a2, ($v0) /* 01B038 8001A438 0C006624 */ jal func_80019890 /* 01B03C 8001A43C 00E02025 */ move $a0, $a3 diff --git a/asm/non_matchings/code_80005FD0/func_8001A588.s b/asm/non_matchings/code_80005FD0/func_8001A588.s index 693207b61..c6e8ec80a 100644 --- a/asm/non_matchings/code_80005FD0/func_8001A588.s +++ b/asm/non_matchings/code_80005FD0/func_8001A588.s @@ -258,10 +258,10 @@ glabel func_8001A588 /* 01B534 8001A934 84500004 */ lh $s0, 4($v0) /* 01B538 8001A938 01475023 */ subu $t2, $t2, $a3 /* 01B53C 8001A93C 000A50C0 */ sll $t2, $t2, 3 -/* 01B540 8001A940 3C018016 */ lui $at, %hi(D_8016479E) # 0x8016 +/* 01B540 8001A940 3C018016 */ lui $at, %hi(cameras+0xAE) # 0x8016 /* 01B544 8001A944 A4400000 */ sh $zero, ($v0) /* 01B548 8001A948 002A0821 */ addu $at, $at, $t2 -/* 01B54C 8001A94C A430479E */ sh $s0, %lo(D_8016479E)($at) # 0x479e($at) +/* 01B54C 8001A94C A430479E */ sh $s0, %lo(cameras+0xAE)($at) # 0x479e($at) /* 01B550 8001A950 84460002 */ lh $a2, 2($v0) /* 01B554 8001A954 00E02025 */ move $a0, $a3 /* 01B558 8001A958 0C0068F6 */ jal func_8001A3D8 diff --git a/asm/non_matchings/code_8001C4D0/func_8001C4D0.s b/asm/non_matchings/code_8001C4D0/func_8001C4D0.s index c2de45df8..71cd07682 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001C4D0.s +++ b/asm/non_matchings/code_8001C4D0/func_8001C4D0.s @@ -27,12 +27,12 @@ glabel L8001C524 /* 01D130 8001C530 0018C880 */ sll $t9, $t8, 2 /* 01D134 8001C534 0338C823 */ subu $t9, $t9, $t8 /* 01D138 8001C538 0019C8C0 */ sll $t9, $t9, 3 -/* 01D13C 8001C53C 3C0C8016 */ lui $t4, %hi(D_801646F0) # $t4, 0x8016 +/* 01D13C 8001C53C 3C0C8016 */ lui $t4, %hi(cameras) # $t4, 0x8016 /* 01D140 8001C540 3C014316 */ li $at, 0x43160000 # 150.000000 /* 01D144 8001C544 0338C823 */ subu $t9, $t9, $t8 /* 01D148 8001C548 44813000 */ mtc1 $at, $f6 /* 01D14C 8001C54C 0019C8C0 */ sll $t9, $t9, 3 -/* 01D150 8001C550 258C46F0 */ addiu $t4, %lo(D_801646F0) # addiu $t4, $t4, 0x46f0 +/* 01D150 8001C550 258C46F0 */ addiu $t4, %lo(cameras) # addiu $t4, $t4, 0x46f0 /* 01D154 8001C554 032C3821 */ addu $a3, $t9, $t4 /* 01D158 8001C558 3C014008 */ li $at, 0x40080000 # 2.125000 /* 01D15C 8001C55C 44815800 */ mtc1 $at, $f11 @@ -339,8 +339,8 @@ glabel L8001C524 glabel L8001C9CC /* 01D5CC 8001C9CC 8FB90054 */ lw $t9, 0x54($sp) .L8001C9D0: -/* 01D5D0 8001C9D0 3C0D8016 */ lui $t5, %hi(D_801646F0) # $t5, 0x8016 -/* 01D5D4 8001C9D4 25AD46F0 */ addiu $t5, %lo(D_801646F0) # addiu $t5, $t5, 0x46f0 +/* 01D5D0 8001C9D0 3C0D8016 */ lui $t5, %hi(cameras) # $t5, 0x8016 +/* 01D5D4 8001C9D4 25AD46F0 */ addiu $t5, %lo(cameras) # addiu $t5, $t5, 0x46f0 /* 01D5D8 8001C9D8 00196080 */ sll $t4, $t9, 2 /* 01D5DC 8001C9DC 01996023 */ subu $t4, $t4, $t9 /* 01D5E0 8001C9E0 000C60C0 */ sll $t4, $t4, 3 diff --git a/asm/non_matchings/code_8001C4D0/func_8001CA10.s b/asm/non_matchings/code_8001C4D0/func_8001CA10.s deleted file mode 100644 index 7f79b025b..000000000 --- a/asm/non_matchings/code_8001C4D0/func_8001CA10.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8001CA10 -/* 01D610 8001CA10 3C0140C0 */ li $at, 0x40C00000 # 6.000000 -/* 01D614 8001CA14 44812000 */ mtc1 $at, $f4 -/* 01D618 8001CA18 A480009C */ sh $zero, 0x9c($a0) -/* 01D61C 8001CA1C 03E00008 */ jr $ra -/* 01D620 8001CA20 E4840094 */ swc1 $f4, 0x94($a0) diff --git a/asm/non_matchings/code_8001C4D0/func_8001CA24.s b/asm/non_matchings/code_8001C4D0/func_8001CA24.s deleted file mode 100644 index a43578578..000000000 --- a/asm/non_matchings/code_8001C4D0/func_8001CA24.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_8001CA24 -/* 01D624 8001CA24 3C0E800E */ lui $t6, %hi(D_800DC4E0) # $t6, 0x800e -/* 01D628 8001CA28 8DCEC4E0 */ lw $t6, %lo(D_800DC4E0)($t6) -/* 01D62C 8001CA2C 44856000 */ mtc1 $a1, $f12 -/* 01D630 8001CA30 3C028016 */ lui $v0, %hi(D_801646F0) # $v0, 0x8016 -/* 01D634 8001CA34 148E0003 */ bne $a0, $t6, .L8001CA44 -/* 01D638 8001CA38 244246F0 */ addiu $v0, %lo(D_801646F0) # addiu $v0, $v0, 0x46f0 -/* 01D63C 8001CA3C 3C028016 */ lui $v0, %hi(D_801647A8) # $v0, 0x8016 -/* 01D640 8001CA40 244247A8 */ addiu $v0, %lo(D_801647A8) # addiu $v0, $v0, 0x47a8 -.L8001CA44: -/* 01D644 8001CA44 3C0F800E */ lui $t7, %hi(D_800DC4E4) # $t7, 0x800e -/* 01D648 8001CA48 8DEFC4E4 */ lw $t7, %lo(D_800DC4E4)($t7) -/* 01D64C 8001CA4C 3C18800E */ lui $t8, %hi(D_800DC4E8) # $t8, 0x800e -/* 01D650 8001CA50 148F0002 */ bne $a0, $t7, .L8001CA5C -/* 01D654 8001CA54 00000000 */ nop -/* 01D658 8001CA58 24420170 */ addiu $v0, $v0, 0x170 -.L8001CA5C: -/* 01D65C 8001CA5C 8F18C4E8 */ lw $t8, %lo(D_800DC4E8)($t8) -/* 01D660 8001CA60 54980003 */ bnel $a0, $t8, .L8001CA70 -/* 01D664 8001CA64 A440009C */ sh $zero, 0x9c($v0) -/* 01D668 8001CA68 24420228 */ addiu $v0, $v0, 0x228 -/* 01D66C 8001CA6C A440009C */ sh $zero, 0x9c($v0) -.L8001CA70: -/* 01D670 8001CA70 03E00008 */ jr $ra -/* 01D674 8001CA74 E44C0094 */ swc1 $f12, 0x94($v0) diff --git a/asm/non_matchings/code_8001C4D0/func_8001EE98.s b/asm/non_matchings/code_8001C4D0/func_8001EE98.s index c776dcb81..1ed89d128 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001EE98.s +++ b/asm/non_matchings/code_8001C4D0/func_8001EE98.s @@ -1,7 +1,7 @@ glabel func_8001EE98 /* 01FA98 8001EE98 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 01FA9C 8001EE9C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 01FAA0 8001EEA0 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 01FA9C 8001EE9C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 01FAA0 8001EEA0 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 01FAA4 8001EEA4 AFBF0024 */ sw $ra, 0x24($sp) /* 01FAA8 8001EEA8 AFB00020 */ sw $s0, 0x20($sp) /* 01FAAC 8001EEAC AFA40038 */ sw $a0, 0x38($sp) @@ -10,23 +10,23 @@ glabel func_8001EE98 /* 01FAB8 8001EEB8 AFA60040 */ sw $a2, 0x40($sp) /* 01FABC 8001EEBC AFA00034 */ sw $zero, 0x34($sp) .L8001EEC0: -/* 01FAC0 8001EEC0 3C19800E */ lui $t9, %hi(D_800DDB44) # $t9, 0x800e -/* 01FAC4 8001EEC4 8F39DB44 */ lw $t9, %lo(D_800DDB44)($t9) +/* 01FAC0 8001EEC0 3C19800E */ lui $t9, %hi(camera2) # $t9, 0x800e +/* 01FAC4 8001EEC4 8F39DB44 */ lw $t9, %lo(camera2)($t9) /* 01FAC8 8001EEC8 8FB8003C */ lw $t8, 0x3c($sp) /* 01FACC 8001EECC 8FB00034 */ lw $s0, 0x34($sp) /* 01FAD0 8001EED0 8FA8003C */ lw $t0, 0x3c($sp) /* 01FAD4 8001EED4 17190002 */ bne $t8, $t9, .L8001EEE0 -/* 01FAD8 8001EED8 3C09800E */ lui $t1, %hi(D_800DDB48) # $t1, 0x800e +/* 01FAD8 8001EED8 3C09800E */ lui $t1, %hi(camera3) # $t1, 0x800e /* 01FADC 8001EEDC 24100001 */ li $s0, 1 .L8001EEE0: -/* 01FAE0 8001EEE0 8D29DB48 */ lw $t1, %lo(D_800DDB48)($t1) +/* 01FAE0 8001EEE0 8D29DB48 */ lw $t1, %lo(camera3)($t1) /* 01FAE4 8001EEE4 8FAA003C */ lw $t2, 0x3c($sp) -/* 01FAE8 8001EEE8 3C0B800E */ lui $t3, %hi(D_800DDB4C) # $t3, 0x800e +/* 01FAE8 8001EEE8 3C0B800E */ lui $t3, %hi(camera4) # $t3, 0x800e /* 01FAEC 8001EEEC 15090002 */ bne $t0, $t1, .L8001EEF8 /* 01FAF0 8001EEF0 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 01FAF4 8001EEF4 24100002 */ li $s0, 2 .L8001EEF8: -/* 01FAF8 8001EEF8 8D6BDB4C */ lw $t3, %lo(D_800DDB4C)($t3) +/* 01FAF8 8001EEF8 8D6BDB4C */ lw $t3, %lo(camera4)($t3) /* 01FAFC 8001EEFC 24030001 */ li $v1, 1 /* 01FB00 8001EF00 8FAC0038 */ lw $t4, 0x38($sp) /* 01FB04 8001EF04 154B0002 */ bne $t2, $t3, .L8001EF10 diff --git a/asm/non_matchings/code_8001C4D0/func_8001F394.s b/asm/non_matchings/code_8001C4D0/func_8001F394.s index bb978f5ff..414885989 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001F394.s +++ b/asm/non_matchings/code_8001C4D0/func_8001F394.s @@ -334,8 +334,8 @@ glabel L8001F6D8 /* 020438 8001F838 46000086 */ mov.s $f2, $f0 .L8001F83C: /* 02043C 8001F83C 8FB9003C */ lw $t9, 0x3c($sp) -/* 020440 8001F840 3C0A8016 */ lui $t2, %hi(D_801646F0) # $t2, 0x8016 -/* 020444 8001F844 254A46F0 */ addiu $t2, %lo(D_801646F0) # addiu $t2, $t2, 0x46f0 +/* 020440 8001F840 3C0A8016 */ lui $t2, %hi(cameras) # $t2, 0x8016 +/* 020444 8001F844 254A46F0 */ addiu $t2, %lo(cameras) # addiu $t2, $t2, 0x46f0 /* 020448 8001F848 E7220000 */ swc1 $f2, ($t9) /* 02044C 8001F84C 8FA8002C */ lw $t0, 0x2c($sp) /* 020450 8001F850 00084880 */ sll $t1, $t0, 2 diff --git a/asm/non_matchings/code_8001C4D0/func_8001F87C.s b/asm/non_matchings/code_8001C4D0/func_8001F87C.s index 0bdd02835..8cc863abf 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001F87C.s +++ b/asm/non_matchings/code_8001C4D0/func_8001F87C.s @@ -14,14 +14,14 @@ glabel func_8001F87C /* 0204AC 8001F8AC 00403025 */ move $a2, $v0 /* 0204B0 8001F8B0 15E0002D */ bnez $t7, .L8001F968 /* 0204B4 8001F8B4 24126EC0 */ li $s2, 28352 -/* 0204B8 8001F8B8 3C108016 */ lui $s0, %hi(D_801646F0) # $s0, 0x8016 +/* 0204B8 8001F8B8 3C108016 */ lui $s0, %hi(cameras) # $s0, 0x8016 /* 0204BC 8001F8BC 3C0C8015 */ lui $t4, %hi(D_80152300) # $t4, 0x8015 /* 0204C0 8001F8C0 3C0A8016 */ lui $t2, %hi(D_80164A28) # $t2, 0x8016 /* 0204C4 8001F8C4 3C078016 */ lui $a3, %hi(D_80164A2C) # $a3, 0x8016 /* 0204C8 8001F8C8 24E74A2C */ addiu $a3, %lo(D_80164A2C) # addiu $a3, $a3, 0x4a2c /* 0204CC 8001F8CC 254A4A28 */ addiu $t2, %lo(D_80164A28) # addiu $t2, $t2, 0x4a28 /* 0204D0 8001F8D0 258C2300 */ addiu $t4, %lo(D_80152300) # addiu $t4, $t4, 0x2300 -/* 0204D4 8001F8D4 261046F0 */ addiu $s0, %lo(D_801646F0) # addiu $s0, $s0, 0x46f0 +/* 0204D4 8001F8D4 261046F0 */ addiu $s0, %lo(cameras) # addiu $s0, $s0, 0x46f0 /* 0204D8 8001F8D8 241100B8 */ li $s1, 184 /* 0204DC 8001F8DC 240D0001 */ li $t5, 1 /* 0204E0 8001F8E0 240B0002 */ li $t3, 2 diff --git a/asm/non_matchings/code_8001F980/func_80020524.s b/asm/non_matchings/code_8001F980/func_80020524.s index 08c3c1570..e522c138b 100644 --- a/asm/non_matchings/code_8001F980/func_80020524.s +++ b/asm/non_matchings/code_8001F980/func_80020524.s @@ -79,10 +79,10 @@ glabel func_80020524 /* 021258 80020658 0C01B96B */ jal func_8006E5AC /* 02125C 8002065C 00003025 */ move $a2, $zero .L80020660: -/* 021260 80020660 3C148015 */ lui $s4, %hi(D_8014EF58) # $s4, 0x8015 -/* 021264 80020664 3C158015 */ lui $s5, %hi(D_8014F098) # $s5, 0x8015 -/* 021268 80020668 26B5F098 */ addiu $s5, %lo(D_8014F098) # addiu $s5, $s5, -0xf68 -/* 02126C 8002066C 2694EF58 */ addiu $s4, %lo(D_8014EF58) # addiu $s4, $s4, -0x10a8 +/* 021260 80020660 3C148015 */ lui $s4, %hi(gDmaMesgQueue) # $s4, 0x8015 +/* 021264 80020664 3C158015 */ lui $s5, %hi(gMainReceivedMesg) # $s5, 0x8015 +/* 021268 80020668 26B5F098 */ addiu $s5, %lo(gMainReceivedMesg) # addiu $s5, $s5, -0xf68 +/* 02126C 8002066C 2694EF58 */ addiu $s4, %lo(gDmaMesgQueue) # addiu $s4, $s4, -0x10a8 /* 021270 80020670 02802025 */ move $a0, $s4 /* 021274 80020674 02A02825 */ move $a1, $s5 /* 021278 80020678 0C0335D4 */ jal osRecvMesg diff --git a/asm/non_matchings/code_8001F980/func_8002088C.s b/asm/non_matchings/code_8001F980/func_8002088C.s index 83e0313d9..c65549b93 100644 --- a/asm/non_matchings/code_8001F980/func_8002088C.s +++ b/asm/non_matchings/code_8001F980/func_8002088C.s @@ -79,10 +79,10 @@ glabel func_8002088C /* 0215C0 800209C0 0C01B98D */ jal func_8006E634 /* 0215C4 800209C4 24060001 */ li $a2, 1 .L800209C8: -/* 0215C8 800209C8 3C148015 */ lui $s4, %hi(D_8014EF58) # $s4, 0x8015 -/* 0215CC 800209CC 3C158015 */ lui $s5, %hi(D_8014F098) # $s5, 0x8015 -/* 0215D0 800209D0 26B5F098 */ addiu $s5, %lo(D_8014F098) # addiu $s5, $s5, -0xf68 -/* 0215D4 800209D4 2694EF58 */ addiu $s4, %lo(D_8014EF58) # addiu $s4, $s4, -0x10a8 +/* 0215C8 800209C8 3C148015 */ lui $s4, %hi(gDmaMesgQueue) # $s4, 0x8015 +/* 0215CC 800209CC 3C158015 */ lui $s5, %hi(gMainReceivedMesg) # $s5, 0x8015 +/* 0215D0 800209D0 26B5F098 */ addiu $s5, %lo(gMainReceivedMesg) # addiu $s5, $s5, -0xf68 +/* 0215D4 800209D4 2694EF58 */ addiu $s4, %lo(gDmaMesgQueue) # addiu $s4, $s4, -0x10a8 /* 0215D8 800209D8 02802025 */ move $a0, $s4 /* 0215DC 800209DC 02A02825 */ move $a1, $s5 /* 0215E0 800209E0 0C0335D4 */ jal osRecvMesg diff --git a/asm/non_matchings/code_8001F980/func_80020BF4.s b/asm/non_matchings/code_8001F980/func_80020BF4.s index 68a4a11a2..1a95d1950 100644 --- a/asm/non_matchings/code_8001F980/func_80020BF4.s +++ b/asm/non_matchings/code_8001F980/func_80020BF4.s @@ -54,10 +54,10 @@ glabel func_80020BF4 /* 0218C4 80020CC4 24050003 */ li $a1, 3 /* 0218C8 80020CC8 0C01B9AF */ jal func_8006E6BC /* 0218CC 80020CCC 24060002 */ li $a2, 2 -/* 0218D0 80020CD0 3C148015 */ lui $s4, %hi(D_8014EF58) # $s4, 0x8015 -/* 0218D4 80020CD4 3C158015 */ lui $s5, %hi(D_8014F098) # $s5, 0x8015 -/* 0218D8 80020CD8 26B5F098 */ addiu $s5, %lo(D_8014F098) # addiu $s5, $s5, -0xf68 -/* 0218DC 80020CDC 2694EF58 */ addiu $s4, %lo(D_8014EF58) # addiu $s4, $s4, -0x10a8 +/* 0218D0 80020CD0 3C148015 */ lui $s4, %hi(gDmaMesgQueue) # $s4, 0x8015 +/* 0218D4 80020CD4 3C158015 */ lui $s5, %hi(gMainReceivedMesg) # $s5, 0x8015 +/* 0218D8 80020CD8 26B5F098 */ addiu $s5, %lo(gMainReceivedMesg) # addiu $s5, $s5, -0xf68 +/* 0218DC 80020CDC 2694EF58 */ addiu $s4, %lo(gDmaMesgQueue) # addiu $s4, $s4, -0x10a8 /* 0218E0 80020CE0 02802025 */ move $a0, $s4 /* 0218E4 80020CE4 02A02825 */ move $a1, $s5 /* 0218E8 80020CE8 0C0335D4 */ jal osRecvMesg diff --git a/asm/non_matchings/code_8001F980/func_80020F1C.s b/asm/non_matchings/code_8001F980/func_80020F1C.s index 7224dab82..e411c37ee 100644 --- a/asm/non_matchings/code_8001F980/func_80020F1C.s +++ b/asm/non_matchings/code_8001F980/func_80020F1C.s @@ -54,10 +54,10 @@ glabel func_80020F1C /* 021BEC 80020FEC 24050003 */ li $a1, 3 /* 021BF0 80020FF0 0C01B9D1 */ jal func_8006E744 /* 021BF4 80020FF4 24060003 */ li $a2, 3 -/* 021BF8 80020FF8 3C148015 */ lui $s4, %hi(D_8014EF58) # $s4, 0x8015 -/* 021BFC 80020FFC 3C158015 */ lui $s5, %hi(D_8014F098) # $s5, 0x8015 -/* 021C00 80021000 26B5F098 */ addiu $s5, %lo(D_8014F098) # addiu $s5, $s5, -0xf68 -/* 021C04 80021004 2694EF58 */ addiu $s4, %lo(D_8014EF58) # addiu $s4, $s4, -0x10a8 +/* 021BF8 80020FF8 3C148015 */ lui $s4, %hi(gDmaMesgQueue) # $s4, 0x8015 +/* 021BFC 80020FFC 3C158015 */ lui $s5, %hi(gMainReceivedMesg) # $s5, 0x8015 +/* 021C00 80021000 26B5F098 */ addiu $s5, %lo(gMainReceivedMesg) # addiu $s5, $s5, -0xf68 +/* 021C04 80021004 2694EF58 */ addiu $s4, %lo(gDmaMesgQueue) # addiu $s4, $s4, -0x10a8 /* 021C08 80021008 02802025 */ move $a0, $s4 /* 021C0C 8002100C 02A02825 */ move $a1, $s5 /* 021C10 80021010 0C0335D4 */ jal osRecvMesg diff --git a/asm/non_matchings/code_8001F980/func_800212B4.s b/asm/non_matchings/code_8001F980/func_800212B4.s index 1c97310a4..bddee2542 100644 --- a/asm/non_matchings/code_8001F980/func_800212B4.s +++ b/asm/non_matchings/code_8001F980/func_800212B4.s @@ -41,30 +41,30 @@ glabel func_800212B4 /* 021F50 80021350 AD210018 */ sw $at, 0x18($t1) /* 021F54 80021354 3C01800E */ lui $at, %hi(D_800DDB58) # $at, 0x800e /* 021F58 80021358 AD2D001C */ sw $t5, 0x1c($t1) -/* 021F5C 8002135C 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e +/* 021F5C 8002135C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 021F60 80021360 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) -/* 021F64 80021364 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 021F64 80021364 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 021F68 80021368 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 021F6C 8002136C 00003025 */ move $a2, $zero /* 021F70 80021370 0C008000 */ jal func_80020000 /* 021F74 80021374 00003825 */ move $a3, $zero /* 021F78 80021378 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 021F7C 8002137C 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 021F80 80021380 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 021F7C 8002137C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 021F80 80021380 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 021F84 80021384 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 021F88 80021388 24060001 */ li $a2, 1 /* 021F8C 8002138C 0C008000 */ jal func_80020000 /* 021F90 80021390 00003825 */ move $a3, $zero /* 021F94 80021394 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 021F98 80021398 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 021F9C 8002139C 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 021F98 80021398 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 021F9C 8002139C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 021FA0 800213A0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 021FA4 800213A4 24060002 */ li $a2, 2 /* 021FA8 800213A8 0C008000 */ jal func_80020000 /* 021FAC 800213AC 00003825 */ move $a3, $zero /* 021FB0 800213B0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 021FB4 800213B4 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 021FB8 800213B8 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 021FB4 800213B4 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 021FB8 800213B8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 021FBC 800213BC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 021FC0 800213C0 24060003 */ li $a2, 3 /* 021FC4 800213C4 0C008000 */ jal func_80020000 @@ -74,29 +74,29 @@ glabel func_800212B4 /* 021FD4 800213D4 24010003 */ li $at, 3 /* 021FD8 800213D8 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e /* 021FDC 800213DC 1321001B */ beq $t9, $at, .L8002144C -/* 021FE0 800213E0 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e +/* 021FE0 800213E0 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 021FE4 800213E4 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 021FE8 800213E8 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 021FE8 800213E8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 021FEC 800213EC 24060004 */ li $a2, 4 /* 021FF0 800213F0 0C008000 */ jal func_80020000 /* 021FF4 800213F4 00003825 */ move $a3, $zero /* 021FF8 800213F8 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 021FFC 800213FC 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 022000 80021400 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 021FFC 800213FC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 022000 80021400 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 022004 80021404 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) /* 022008 80021408 24060005 */ li $a2, 5 /* 02200C 8002140C 0C008000 */ jal func_80020000 /* 022010 80021410 00003825 */ move $a3, $zero /* 022014 80021414 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 022018 80021418 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 02201C 8002141C 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 022018 80021418 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 02201C 8002141C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 022020 80021420 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) /* 022024 80021424 24060006 */ li $a2, 6 /* 022028 80021428 0C008000 */ jal func_80020000 /* 02202C 8002142C 00003825 */ move $a3, $zero /* 022030 80021430 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 022034 80021434 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 022038 80021438 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 022034 80021434 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 022038 80021438 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 02203C 8002143C 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) /* 022040 80021440 24060007 */ li $a2, 7 /* 022044 80021444 0C008000 */ jal func_80020000 diff --git a/asm/non_matchings/code_8001F980/func_800215DC.s b/asm/non_matchings/code_8001F980/func_800215DC.s index 116978872..afcebab9d 100644 --- a/asm/non_matchings/code_8001F980/func_800215DC.s +++ b/asm/non_matchings/code_8001F980/func_800215DC.s @@ -3,30 +3,30 @@ glabel func_800215DC /* 0221E0 800215E0 AFBF0014 */ sw $ra, 0x14($sp) /* 0221E4 800215E4 3C01800E */ lui $at, %hi(D_800DDB58) # $at, 0x800e /* 0221E8 800215E8 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 0221EC 800215EC 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e +/* 0221EC 800215EC 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 0221F0 800215F0 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) -/* 0221F4 800215F4 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 0221F4 800215F4 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 0221F8 800215F8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 0221FC 800215FC 00003025 */ move $a2, $zero /* 022200 80021600 0C008000 */ jal func_80020000 /* 022204 80021604 24070001 */ li $a3, 1 /* 022208 80021608 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 02220C 8002160C 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 022210 80021610 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 02220C 8002160C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 022210 80021610 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 022214 80021614 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 022218 80021618 24060001 */ li $a2, 1 /* 02221C 8002161C 0C008000 */ jal func_80020000 /* 022220 80021620 24070001 */ li $a3, 1 /* 022224 80021624 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022228 80021628 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 02222C 8002162C 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 022228 80021628 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 02222C 8002162C 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 022230 80021630 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 022234 80021634 24060002 */ li $a2, 2 /* 022238 80021638 0C008000 */ jal func_80020000 /* 02223C 8002163C 24070001 */ li $a3, 1 /* 022240 80021640 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 022244 80021644 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 022248 80021648 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 022244 80021644 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 022248 80021648 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 02224C 8002164C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 022250 80021650 24060003 */ li $a2, 3 /* 022254 80021654 0C008000 */ jal func_80020000 @@ -36,29 +36,29 @@ glabel func_800215DC /* 022264 80021664 24010003 */ li $at, 3 /* 022268 80021668 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e /* 02226C 8002166C 11C1001B */ beq $t6, $at, .L800216DC -/* 022270 80021670 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e +/* 022270 80021670 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 022274 80021674 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 022278 80021678 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 022278 80021678 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 02227C 8002167C 24060004 */ li $a2, 4 /* 022280 80021680 0C008000 */ jal func_80020000 /* 022284 80021684 24070001 */ li $a3, 1 /* 022288 80021688 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 02228C 8002168C 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 022290 80021690 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 02228C 8002168C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 022290 80021690 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 022294 80021694 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) /* 022298 80021698 24060005 */ li $a2, 5 /* 02229C 8002169C 0C008000 */ jal func_80020000 /* 0222A0 800216A0 24070001 */ li $a3, 1 /* 0222A4 800216A4 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 0222A8 800216A8 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 0222AC 800216AC 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 0222A8 800216A8 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 0222AC 800216AC 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 0222B0 800216B0 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) /* 0222B4 800216B4 24060006 */ li $a2, 6 /* 0222B8 800216B8 0C008000 */ jal func_80020000 /* 0222BC 800216BC 24070001 */ li $a3, 1 /* 0222C0 800216C0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 0222C4 800216C4 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 0222C8 800216C8 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 0222C4 800216C4 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 0222C8 800216C8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 0222CC 800216CC 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) /* 0222D0 800216D0 24060007 */ li $a2, 7 /* 0222D4 800216D4 0C008000 */ jal func_80020000 diff --git a/asm/non_matchings/code_8001F980/func_8002186C.s b/asm/non_matchings/code_8001F980/func_8002186C.s index 643bbf82d..713d6c853 100644 --- a/asm/non_matchings/code_8001F980/func_8002186C.s +++ b/asm/non_matchings/code_8001F980/func_8002186C.s @@ -3,30 +3,30 @@ glabel func_8002186C /* 022470 80021870 AFBF0014 */ sw $ra, 0x14($sp) /* 022474 80021874 3C01800E */ lui $at, %hi(D_800DDB58) # $at, 0x800e /* 022478 80021878 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 02247C 8002187C 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e +/* 02247C 8002187C 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 022480 80021880 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) -/* 022484 80021884 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 022484 80021884 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 022488 80021888 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 02248C 8002188C 00003025 */ move $a2, $zero /* 022490 80021890 0C008000 */ jal func_80020000 /* 022494 80021894 24070002 */ li $a3, 2 /* 022498 80021898 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 02249C 8002189C 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 0224A0 800218A0 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 02249C 8002189C 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 0224A0 800218A0 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 0224A4 800218A4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 0224A8 800218A8 24060001 */ li $a2, 1 /* 0224AC 800218AC 0C008000 */ jal func_80020000 /* 0224B0 800218B0 24070002 */ li $a3, 2 /* 0224B4 800218B4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0224B8 800218B8 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 0224BC 800218BC 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 0224B8 800218B8 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 0224BC 800218BC 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 0224C0 800218C0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 0224C4 800218C4 24060002 */ li $a2, 2 /* 0224C8 800218C8 0C008000 */ jal func_80020000 /* 0224CC 800218CC 24070002 */ li $a3, 2 /* 0224D0 800218D0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0224D4 800218D4 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 0224D8 800218D8 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 0224D4 800218D4 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 0224D8 800218D8 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 0224DC 800218DC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 0224E0 800218E0 24060003 */ li $a2, 3 /* 0224E4 800218E4 0C008000 */ jal func_80020000 diff --git a/asm/non_matchings/code_8001F980/func_800219BC.s b/asm/non_matchings/code_8001F980/func_800219BC.s index 5b6672f5d..72700d470 100644 --- a/asm/non_matchings/code_8001F980/func_800219BC.s +++ b/asm/non_matchings/code_8001F980/func_800219BC.s @@ -3,30 +3,30 @@ glabel func_800219BC /* 0225C0 800219C0 AFBF0014 */ sw $ra, 0x14($sp) /* 0225C4 800219C4 3C01800E */ lui $at, %hi(D_800DDB58) # $at, 0x800e /* 0225C8 800219C8 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 0225CC 800219CC 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e +/* 0225CC 800219CC 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 0225D0 800219D0 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) -/* 0225D4 800219D4 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 0225D4 800219D4 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 0225D8 800219D8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 0225DC 800219DC 00003025 */ move $a2, $zero /* 0225E0 800219E0 0C008000 */ jal func_80020000 /* 0225E4 800219E4 24070003 */ li $a3, 3 /* 0225E8 800219E8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0225EC 800219EC 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 0225F0 800219F0 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 0225EC 800219EC 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 0225F0 800219F0 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 0225F4 800219F4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 0225F8 800219F8 24060001 */ li $a2, 1 /* 0225FC 800219FC 0C008000 */ jal func_80020000 /* 022600 80021A00 24070003 */ li $a3, 3 /* 022604 80021A04 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022608 80021A08 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 02260C 80021A0C 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 022608 80021A08 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 02260C 80021A0C 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 022610 80021A10 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 022614 80021A14 24060002 */ li $a2, 2 /* 022618 80021A18 0C008000 */ jal func_80020000 /* 02261C 80021A1C 24070003 */ li $a3, 3 /* 022620 80021A20 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 022624 80021A24 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 022628 80021A28 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 022624 80021A24 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 022628 80021A28 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 02262C 80021A2C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 022630 80021A30 24060003 */ li $a2, 3 /* 022634 80021A34 0C008000 */ jal func_80020000 diff --git a/asm/non_matchings/code_8001F980/func_800248D0.s b/asm/non_matchings/code_8001F980/func_800248D0.s index 7af935095..40b4c54ec 100644 --- a/asm/non_matchings/code_8001F980/func_800248D0.s +++ b/asm/non_matchings/code_8001F980/func_800248D0.s @@ -73,7 +73,7 @@ glabel func_800248D0 /* 0255E8 800249E8 3324FFFF */ andi $a0, $t9, 0xffff /* 0255EC 800249EC 8FA20044 */ lw $v0, 0x44($sp) /* 0255F0 800249F0 24010008 */ li $at, 8 -/* 0255F4 800249F4 3C198016 */ lui $t9, %hi(D_80164714) # 0x8016 +/* 0255F4 800249F4 3C198016 */ lui $t9, %hi(cameras+0x24) # 0x8016 /* 0255F8 800249F8 844E00CC */ lh $t6, 0xcc($v0) /* 0255FC 800249FC 448E2000 */ mtc1 $t6, $f4 /* 025600 80024A00 8E0E00BC */ lw $t6, 0xbc($s0) @@ -92,7 +92,7 @@ glabel func_800248D0 /* 025634 80024A34 0311C023 */ subu $t8, $t8, $s1 /* 025638 80024A38 0018C0C0 */ sll $t8, $t8, 3 /* 02563C 80024A3C 0338C821 */ addu $t9, $t9, $t8 -/* 025640 80024A40 87394714 */ lh $t9, %lo(D_80164714)($t9) # 0x4714 +/* 025640 80024A40 87394714 */ lh $t9, %lo(cameras+0x24)($t9) # 0x4714 /* 025644 80024A44 272EC000 */ addiu $t6, $t9, -0x4000 /* 025648 80024A48 1000000B */ b .L80024A78 /* 02564C 80024A4C A7AE014C */ sh $t6, 0x14c($sp) diff --git a/asm/non_matchings/code_8001F980/func_800267AC.s b/asm/non_matchings/code_8001F980/func_800267AC.s index 6cd249943..7dfcc591b 100644 --- a/asm/non_matchings/code_8001F980/func_800267AC.s +++ b/asm/non_matchings/code_8001F980/func_800267AC.s @@ -121,8 +121,8 @@ glabel func_800267AC /* 027570 80026970 0C0095BD */ jal func_800256F4 /* 027574 80026974 83A7002F */ lb $a3, 0x2f($sp) .L80026978: -/* 027578 80026978 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 02757C 8002697C 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 027578 80026978 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 02757C 8002697C 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 027580 80026980 27A50034 */ addiu $a1, $sp, 0x34 /* 027584 80026984 0C0335D4 */ jal osRecvMesg /* 027588 80026988 24060001 */ li $a2, 1 diff --git a/asm/non_matchings/code_80027040/func_80027040.s b/asm/non_matchings/code_80027040/func_80027040.s index a7f0d42cd..b03593975 100644 --- a/asm/non_matchings/code_80027040/func_80027040.s +++ b/asm/non_matchings/code_80027040/func_80027040.s @@ -94,24 +94,24 @@ glabel func_80027040 /* 027DA8 800271A8 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 027DAC 800271AC 954ADEB0 */ lhu $t2, %lo(D_800DDEB0)($t2) /* 027DB0 800271B0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 027DB4 800271B4 3C098015 */ lui $t1, %hi(D_8014EF58) # $t1, 0x8015 +/* 027DB4 800271B4 3C098015 */ lui $t1, %hi(gDmaMesgQueue) # $t1, 0x8015 /* 027DB8 800271B8 3C080014 */ lui $t0, %hi(_kart_texturesSegmentRomStart) # $t0, 0x14 /* 027DBC 800271BC 25085470 */ addiu $t0, %lo(_kart_texturesSegmentRomStart) # addiu $t0, $t0, 0x5470 -/* 027DC0 800271C0 2529EF58 */ addiu $t1, %lo(D_8014EF58) # addiu $t1, $t1, -0x10a8 -/* 027DC4 800271C4 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 027DC0 800271C0 2529EF58 */ addiu $t1, %lo(gDmaMesgQueue) # addiu $t1, $t1, -0x10a8 +/* 027DC4 800271C4 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 027DC8 800271C8 01E1C024 */ and $t8, $t7, $at /* 027DCC 800271CC 03083821 */ addu $a3, $t8, $t0 -/* 027DD0 800271D0 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 027DD0 800271D0 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 027DD4 800271D4 AFA90018 */ sw $t1, 0x18($sp) /* 027DD8 800271D8 AFB00010 */ sw $s0, 0x10($sp) /* 027DDC 800271DC 00002825 */ move $a1, $zero /* 027DE0 800271E0 00003025 */ move $a2, $zero /* 027DE4 800271E4 0C03370C */ jal osPiStartDma /* 027DE8 800271E8 AFAA0014 */ sw $t2, 0x14($sp) -/* 027DEC 800271EC 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 027DF0 800271F0 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 027DF4 800271F4 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 027DF8 800271F8 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 027DEC 800271EC 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 027DF0 800271F0 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 027DF4 800271F4 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 027DF8 800271F8 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 027DFC 800271FC 0C0335D4 */ jal osRecvMesg /* 027E00 80027200 24060001 */ li $a2, 1 /* 027E04 80027204 100000D2 */ b .L80027550 @@ -162,24 +162,24 @@ glabel func_80027040 /* 027EB4 800272B4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 027EB8 800272B8 95EFDEB0 */ lhu $t7, %lo(D_800DDEB0)($t7) /* 027EBC 800272BC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 027EC0 800272C0 3C0E8015 */ lui $t6, %hi(D_8014EF58) # $t6, 0x8015 +/* 027EC0 800272C0 3C0E8015 */ lui $t6, %hi(gDmaMesgQueue) # $t6, 0x8015 /* 027EC4 800272C4 3C0D0014 */ lui $t5, %hi(_kart_texturesSegmentRomStart) # $t5, 0x14 /* 027EC8 800272C8 25AD5470 */ addiu $t5, %lo(_kart_texturesSegmentRomStart) # addiu $t5, $t5, 0x5470 -/* 027ECC 800272CC 25CEEF58 */ addiu $t6, %lo(D_8014EF58) # addiu $t6, $t6, -0x10a8 -/* 027ED0 800272D0 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 027ECC 800272CC 25CEEF58 */ addiu $t6, %lo(gDmaMesgQueue) # addiu $t6, $t6, -0x10a8 +/* 027ED0 800272D0 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 027ED4 800272D4 01216024 */ and $t4, $t1, $at /* 027ED8 800272D8 018D3821 */ addu $a3, $t4, $t5 -/* 027EDC 800272DC 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 027EDC 800272DC 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 027EE0 800272E0 AFAE0018 */ sw $t6, 0x18($sp) /* 027EE4 800272E4 AFB00010 */ sw $s0, 0x10($sp) /* 027EE8 800272E8 00002825 */ move $a1, $zero /* 027EEC 800272EC 00003025 */ move $a2, $zero /* 027EF0 800272F0 0C03370C */ jal osPiStartDma /* 027EF4 800272F4 AFAF0014 */ sw $t7, 0x14($sp) -/* 027EF8 800272F8 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 027EFC 800272FC 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 027F00 80027300 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 027F04 80027304 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 027EF8 800272F8 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 027EFC 800272FC 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 027F00 80027300 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 027F04 80027304 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 027F08 80027308 0C0335D4 */ jal osRecvMesg /* 027F0C 8002730C 24060001 */ li $a2, 1 /* 027F10 80027310 1000008F */ b .L80027550 @@ -234,25 +234,25 @@ glabel func_80027040 /* 027FCC 800273CC 8D6E0000 */ lw $t6, ($t3) /* 027FD0 800273D0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 027FD4 800273D4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 027FD8 800273D8 3C0A8015 */ lui $t2, %hi(D_8014EF58) # $t2, 0x8015 +/* 027FD8 800273D8 3C0A8015 */ lui $t2, %hi(gDmaMesgQueue) # $t2, 0x8015 /* 027FDC 800273DC 3C180014 */ lui $t8, %hi(_kart_texturesSegmentRomStart) # $t8, 0x14 /* 027FE0 800273E0 27185470 */ addiu $t8, %lo(_kart_texturesSegmentRomStart) # addiu $t8, $t8, 0x5470 -/* 027FE4 800273E4 254AEF58 */ addiu $t2, %lo(D_8014EF58) # addiu $t2, $t2, -0x10a8 +/* 027FE4 800273E4 254AEF58 */ addiu $t2, %lo(gDmaMesgQueue) # addiu $t2, $t2, -0x10a8 /* 027FE8 800273E8 24190900 */ li $t9, 2304 -/* 027FEC 800273EC 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 027FEC 800273EC 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 027FF0 800273F0 01C14024 */ and $t0, $t6, $at /* 027FF4 800273F4 01183821 */ addu $a3, $t0, $t8 -/* 027FF8 800273F8 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 027FF8 800273F8 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 027FFC 800273FC AFB90014 */ sw $t9, 0x14($sp) /* 028000 80027400 AFAA0018 */ sw $t2, 0x18($sp) /* 028004 80027404 AFB00010 */ sw $s0, 0x10($sp) /* 028008 80027408 00002825 */ move $a1, $zero /* 02800C 8002740C 0C03370C */ jal osPiStartDma /* 028010 80027410 00003025 */ move $a2, $zero -/* 028014 80027414 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 028018 80027418 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 02801C 8002741C 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 028020 80027420 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 028014 80027414 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 028018 80027418 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 02801C 8002741C 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 028020 80027420 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 028024 80027424 0C0335D4 */ jal osRecvMesg /* 028028 80027428 24060001 */ li $a2, 1 /* 02802C 8002742C 10000048 */ b .L80027550 @@ -308,24 +308,24 @@ glabel func_80027040 /* 0280F0 800274F0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 0280F4 800274F4 95CEDEB0 */ lhu $t6, %lo(D_800DDEB0)($t6) /* 0280F8 800274F8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 0280FC 800274FC 3C088015 */ lui $t0, %hi(D_8014EF58) # $t0, 0x8015 +/* 0280FC 800274FC 3C088015 */ lui $t0, %hi(gDmaMesgQueue) # $t0, 0x8015 /* 028100 80027500 3C0F0014 */ lui $t7, %hi(_kart_texturesSegmentRomStart) # $t7, 0x14 /* 028104 80027504 25EF5470 */ addiu $t7, %lo(_kart_texturesSegmentRomStart) # addiu $t7, $t7, 0x5470 -/* 028108 80027508 2508EF58 */ addiu $t0, %lo(D_8014EF58) # addiu $t0, $t0, -0x10a8 -/* 02810C 8002750C 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 028108 80027508 2508EF58 */ addiu $t0, %lo(gDmaMesgQueue) # addiu $t0, $t0, -0x10a8 +/* 02810C 8002750C 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 028110 80027510 01A14824 */ and $t1, $t5, $at /* 028114 80027514 012F3821 */ addu $a3, $t1, $t7 -/* 028118 80027518 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 028118 80027518 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 02811C 8002751C AFA80018 */ sw $t0, 0x18($sp) /* 028120 80027520 AFB00010 */ sw $s0, 0x10($sp) /* 028124 80027524 00002825 */ move $a1, $zero /* 028128 80027528 00003025 */ move $a2, $zero /* 02812C 8002752C 0C03370C */ jal osPiStartDma /* 028130 80027530 AFAE0014 */ sw $t6, 0x14($sp) -/* 028134 80027534 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 028138 80027538 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 02813C 8002753C 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 028140 80027540 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 028134 80027534 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 028138 80027538 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 02813C 8002753C 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 028140 80027540 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 028144 80027544 0C0335D4 */ jal osRecvMesg /* 028148 80027548 24060001 */ li $a2, 1 /* 02814C 8002754C 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code_80027040/func_80027560.s b/asm/non_matchings/code_80027040/func_80027560.s index 4ac4297fd..017b816ed 100644 --- a/asm/non_matchings/code_80027040/func_80027560.s +++ b/asm/non_matchings/code_80027040/func_80027560.s @@ -94,14 +94,14 @@ glabel func_80027560 /* 0282C8 800276C8 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 0282CC 800276CC 954ADEB0 */ lhu $t2, %lo(D_800DDEB0)($t2) /* 0282D0 800276D0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 0282D4 800276D4 3C098015 */ lui $t1, %hi(D_8014EF58) # $t1, 0x8015 +/* 0282D4 800276D4 3C098015 */ lui $t1, %hi(gDmaMesgQueue) # $t1, 0x8015 /* 0282D8 800276D8 3C080014 */ lui $t0, %hi(_kart_texturesSegmentRomStart) # $t0, 0x14 /* 0282DC 800276DC 25085470 */ addiu $t0, %lo(_kart_texturesSegmentRomStart) # addiu $t0, $t0, 0x5470 -/* 0282E0 800276E0 2529EF58 */ addiu $t1, %lo(D_8014EF58) # addiu $t1, $t1, -0x10a8 -/* 0282E4 800276E4 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 0282E0 800276E0 2529EF58 */ addiu $t1, %lo(gDmaMesgQueue) # addiu $t1, $t1, -0x10a8 +/* 0282E4 800276E4 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 0282E8 800276E8 01E1C024 */ and $t8, $t7, $at /* 0282EC 800276EC 03083821 */ addu $a3, $t8, $t0 -/* 0282F0 800276F0 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 0282F0 800276F0 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 0282F4 800276F4 AFA90018 */ sw $t1, 0x18($sp) /* 0282F8 800276F8 AFB00010 */ sw $s0, 0x10($sp) /* 0282FC 800276FC 00002825 */ move $a1, $zero @@ -156,14 +156,14 @@ glabel func_80027560 /* 0283BC 800277BC 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 0283C0 800277C0 95EFDEB0 */ lhu $t7, %lo(D_800DDEB0)($t7) /* 0283C4 800277C4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 0283C8 800277C8 3C0E8015 */ lui $t6, %hi(D_8014EF58) # $t6, 0x8015 +/* 0283C8 800277C8 3C0E8015 */ lui $t6, %hi(gDmaMesgQueue) # $t6, 0x8015 /* 0283CC 800277CC 3C0D0014 */ lui $t5, %hi(_kart_texturesSegmentRomStart) # $t5, 0x14 /* 0283D0 800277D0 25AD5470 */ addiu $t5, %lo(_kart_texturesSegmentRomStart) # addiu $t5, $t5, 0x5470 -/* 0283D4 800277D4 25CEEF58 */ addiu $t6, %lo(D_8014EF58) # addiu $t6, $t6, -0x10a8 -/* 0283D8 800277D8 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 0283D4 800277D4 25CEEF58 */ addiu $t6, %lo(gDmaMesgQueue) # addiu $t6, $t6, -0x10a8 +/* 0283D8 800277D8 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 0283DC 800277DC 01216024 */ and $t4, $t1, $at /* 0283E0 800277E0 018D3821 */ addu $a3, $t4, $t5 -/* 0283E4 800277E4 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 0283E4 800277E4 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 0283E8 800277E8 AFAE0018 */ sw $t6, 0x18($sp) /* 0283EC 800277EC AFB00010 */ sw $s0, 0x10($sp) /* 0283F0 800277F0 00002825 */ move $a1, $zero @@ -222,15 +222,15 @@ glabel func_80027560 /* 0284BC 800278BC 8D6E0000 */ lw $t6, ($t3) /* 0284C0 800278C0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 0284C4 800278C4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 0284C8 800278C8 3C0A8015 */ lui $t2, %hi(D_8014EF58) # $t2, 0x8015 +/* 0284C8 800278C8 3C0A8015 */ lui $t2, %hi(gDmaMesgQueue) # $t2, 0x8015 /* 0284CC 800278CC 3C180014 */ lui $t8, %hi(_kart_texturesSegmentRomStart) # $t8, 0x14 /* 0284D0 800278D0 27185470 */ addiu $t8, %lo(_kart_texturesSegmentRomStart) # addiu $t8, $t8, 0x5470 -/* 0284D4 800278D4 254AEF58 */ addiu $t2, %lo(D_8014EF58) # addiu $t2, $t2, -0x10a8 +/* 0284D4 800278D4 254AEF58 */ addiu $t2, %lo(gDmaMesgQueue) # addiu $t2, $t2, -0x10a8 /* 0284D8 800278D8 24190900 */ li $t9, 2304 -/* 0284DC 800278DC 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 0284DC 800278DC 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 0284E0 800278E0 01C14024 */ and $t0, $t6, $at /* 0284E4 800278E4 01183821 */ addu $a3, $t0, $t8 -/* 0284E8 800278E8 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 0284E8 800278E8 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 0284EC 800278EC AFB90014 */ sw $t9, 0x14($sp) /* 0284F0 800278F0 AFAA0018 */ sw $t2, 0x18($sp) /* 0284F4 800278F4 AFB00010 */ sw $s0, 0x10($sp) @@ -290,14 +290,14 @@ glabel func_80027560 /* 0285C8 800279C8 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 0285CC 800279CC 95CEDEB0 */ lhu $t6, %lo(D_800DDEB0)($t6) /* 0285D0 800279D0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 0285D4 800279D4 3C088015 */ lui $t0, %hi(D_8014EF58) # $t0, 0x8015 +/* 0285D4 800279D4 3C088015 */ lui $t0, %hi(gDmaMesgQueue) # $t0, 0x8015 /* 0285D8 800279D8 3C0F0014 */ lui $t7, %hi(_kart_texturesSegmentRomStart) # $t7, 0x14 /* 0285DC 800279DC 25EF5470 */ addiu $t7, %lo(_kart_texturesSegmentRomStart) # addiu $t7, $t7, 0x5470 -/* 0285E0 800279E0 2508EF58 */ addiu $t0, %lo(D_8014EF58) # addiu $t0, $t0, -0x10a8 -/* 0285E4 800279E4 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 0285E0 800279E0 2508EF58 */ addiu $t0, %lo(gDmaMesgQueue) # addiu $t0, $t0, -0x10a8 +/* 0285E4 800279E4 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 0285E8 800279E8 01A14824 */ and $t1, $t5, $at /* 0285EC 800279EC 012F3821 */ addu $a3, $t1, $t7 -/* 0285F0 800279F0 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 0285F0 800279F0 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 0285F4 800279F4 AFA80018 */ sw $t0, 0x18($sp) /* 0285F8 800279F8 AFB00010 */ sw $s0, 0x10($sp) /* 0285FC 800279FC 00002825 */ move $a1, $zero diff --git a/asm/non_matchings/code_80027040/func_80027A20.s b/asm/non_matchings/code_80027040/func_80027A20.s index ac96b40d7..4bd0e942f 100644 --- a/asm/non_matchings/code_80027040/func_80027A20.s +++ b/asm/non_matchings/code_80027040/func_80027A20.s @@ -44,24 +44,24 @@ glabel func_80027A20 /* 0286C4 80027AC4 00194080 */ sll $t0, $t9, 2 /* 0286C8 80027AC8 01284821 */ addu $t1, $t1, $t0 /* 0286CC 80027ACC 8D292340 */ lw $t1, %lo(gKartPalettes)($t1) -/* 0286D0 80027AD0 3C0D8015 */ lui $t5, %hi(D_8014EF58) # $t5, 0x8015 -/* 0286D4 80027AD4 25ADEF58 */ addiu $t5, %lo(D_8014EF58) # addiu $t5, $t5, -0x10a8 +/* 0286D0 80027AD0 3C0D8015 */ lui $t5, %hi(gDmaMesgQueue) # $t5, 0x8015 +/* 0286D4 80027AD4 25ADEF58 */ addiu $t5, %lo(gDmaMesgQueue) # addiu $t5, $t5, -0x10a8 /* 0286D8 80027AD8 258C5470 */ addiu $t4, %lo(_kart_texturesSegmentRomStart) # addiu $t4, $t4, 0x5470 -/* 0286DC 80027ADC 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 0286DC 80027ADC 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 0286E0 80027AE0 240A0200 */ li $t2, 512 /* 0286E4 80027AE4 01215824 */ and $t3, $t1, $at /* 0286E8 80027AE8 016C3821 */ addu $a3, $t3, $t4 /* 0286EC 80027AEC AFAA0014 */ sw $t2, 0x14($sp) -/* 0286F0 80027AF0 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 0286F0 80027AF0 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 0286F4 80027AF4 AFAD0018 */ sw $t5, 0x18($sp) /* 0286F8 80027AF8 AFB00010 */ sw $s0, 0x10($sp) /* 0286FC 80027AFC 00002825 */ move $a1, $zero /* 028700 80027B00 0C03370C */ jal osPiStartDma /* 028704 80027B04 00003025 */ move $a2, $zero -/* 028708 80027B08 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 02870C 80027B0C 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 028710 80027B10 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 028714 80027B14 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 028708 80027B08 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 02870C 80027B0C 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 028710 80027B10 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 028714 80027B14 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 028718 80027B18 0C0335D4 */ jal osRecvMesg /* 02871C 80027B1C 24060001 */ li $a2, 1 /* 028720 80027B20 1000002A */ b .L80027BCC @@ -87,24 +87,24 @@ glabel func_80027A20 /* 02876C 80027B6C 000D7080 */ sll $t6, $t5, 2 /* 028770 80027B70 01EE7821 */ addu $t7, $t7, $t6 /* 028774 80027B74 8DEF2340 */ lw $t7, %lo(gKartPalettes)($t7) -/* 028778 80027B78 3C098015 */ lui $t1, %hi(D_8014EF58) # $t1, 0x8015 -/* 02877C 80027B7C 2529EF58 */ addiu $t1, %lo(D_8014EF58) # addiu $t1, $t1, -0x10a8 +/* 028778 80027B78 3C098015 */ lui $t1, %hi(gDmaMesgQueue) # $t1, 0x8015 +/* 02877C 80027B7C 2529EF58 */ addiu $t1, %lo(gDmaMesgQueue) # addiu $t1, $t1, -0x10a8 /* 028780 80027B80 25085470 */ addiu $t0, %lo(_kart_texturesSegmentRomStart) # addiu $t0, $t0, 0x5470 -/* 028784 80027B84 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 028784 80027B84 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 028788 80027B88 24180200 */ li $t8, 512 /* 02878C 80027B8C 01E1C824 */ and $t9, $t7, $at /* 028790 80027B90 03283821 */ addu $a3, $t9, $t0 /* 028794 80027B94 AFB80014 */ sw $t8, 0x14($sp) -/* 028798 80027B98 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 028798 80027B98 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 02879C 80027B9C AFA90018 */ sw $t1, 0x18($sp) /* 0287A0 80027BA0 AFB00010 */ sw $s0, 0x10($sp) /* 0287A4 80027BA4 00002825 */ move $a1, $zero /* 0287A8 80027BA8 0C03370C */ jal osPiStartDma /* 0287AC 80027BAC 00003025 */ move $a2, $zero -/* 0287B0 80027BB0 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 0287B4 80027BB4 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 0287B8 80027BB8 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 0287BC 80027BBC 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 0287B0 80027BB0 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 0287B4 80027BB4 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 0287B8 80027BB8 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 0287BC 80027BBC 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 0287C0 80027BC0 0C0335D4 */ jal osRecvMesg /* 0287C4 80027BC4 24060001 */ li $a2, 1 /* 0287C8 80027BC8 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code_80027D00/func_80028864.s b/asm/non_matchings/code_80027D00/func_80028864.s index c7871561c..db17cec40 100644 --- a/asm/non_matchings/code_80027D00/func_80028864.s +++ b/asm/non_matchings/code_80027D00/func_80028864.s @@ -25,8 +25,8 @@ glabel func_80028864 /* 0294C0 800288C0 97AC001E */ lhu $t4, 0x1e($sp) .L800288C4: /* 0294C4 800288C4 85EF557C */ lh $t7, %lo(D_8016557C)($t7) -/* 0294C8 800288C8 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 0294CC 800288CC 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 0294C8 800288C8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 0294CC 800288CC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 0294D0 800288D0 448F2000 */ mtc1 $t7, $f4 /* 0294D4 800288D4 24070000 */ li $a3, 0 /* 0294D8 800288D8 AFA40020 */ sw $a0, 0x20($sp) @@ -41,8 +41,8 @@ glabel func_80028864 .L800288FC: /* 0294FC 800288FC 3C188016 */ lui $t8, %hi(D_8016557C) # $t8, 0x8016 /* 029500 80028900 8718557C */ lh $t8, %lo(D_8016557C)($t8) -/* 029504 80028904 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 029508 80028908 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 029504 80028904 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 029508 80028908 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 02950C 8002890C 44983000 */ mtc1 $t8, $f6 /* 029510 80028910 24070000 */ li $a3, 0 /* 029514 80028914 AFA40020 */ sw $a0, 0x20($sp) @@ -59,8 +59,8 @@ glabel func_80028864 .L80028940: /* 029540 80028940 3C198016 */ lui $t9, %hi(D_8016557C) # $t9, 0x8016 /* 029544 80028944 8739557C */ lh $t9, %lo(D_8016557C)($t9) -/* 029548 80028948 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 02954C 8002894C 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 029548 80028948 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 02954C 8002894C 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 029550 80028950 44994000 */ mtc1 $t9, $f8 /* 029554 80028954 24070000 */ li $a3, 0 /* 029558 80028958 AFA40020 */ sw $a0, 0x20($sp) @@ -74,8 +74,8 @@ glabel func_80028864 /* 029578 80028978 24030001 */ li $v1, 1 .L8002897C: /* 02957C 8002897C 8508557C */ lh $t0, %lo(D_8016557C)($t0) -/* 029580 80028980 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 029584 80028984 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 029580 80028980 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 029584 80028984 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 029588 80028988 44885000 */ mtc1 $t0, $f10 /* 02958C 8002898C 24070000 */ li $a3, 0 /* 029590 80028990 AFA40020 */ sw $a0, 0x20($sp) @@ -92,8 +92,8 @@ glabel func_80028864 .L800289BC: /* 0295BC 800289BC 3C098016 */ lui $t1, %hi(D_8016557C) # $t1, 0x8016 /* 0295C0 800289C0 8529557C */ lh $t1, %lo(D_8016557C)($t1) -/* 0295C4 800289C4 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 0295C8 800289C8 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 0295C4 800289C4 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 0295C8 800289C8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 0295CC 800289CC 44898000 */ mtc1 $t1, $f16 /* 0295D0 800289D0 24070000 */ li $a3, 0 /* 0295D4 800289D4 AFA40020 */ sw $a0, 0x20($sp) @@ -110,8 +110,8 @@ glabel func_80028864 .L80028A00: /* 029600 80028A00 3C0A8016 */ lui $t2, %hi(D_8016557C) # $t2, 0x8016 /* 029604 80028A04 854A557C */ lh $t2, %lo(D_8016557C)($t2) -/* 029608 80028A08 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 02960C 80028A0C 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 029608 80028A08 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 02960C 80028A0C 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 029610 80028A10 448A9000 */ mtc1 $t2, $f18 /* 029614 80028A14 24070000 */ li $a3, 0 /* 029618 80028A18 AFA40020 */ sw $a0, 0x20($sp) @@ -128,8 +128,8 @@ glabel func_80028864 .L80028A44: /* 029644 80028A44 3C0B8016 */ lui $t3, %hi(D_8016557C) # $t3, 0x8016 /* 029648 80028A48 856B557C */ lh $t3, %lo(D_8016557C)($t3) -/* 02964C 80028A4C 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 029650 80028A50 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 02964C 80028A4C 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 029650 80028A50 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 029654 80028A54 448B2000 */ mtc1 $t3, $f4 /* 029658 80028A58 24070000 */ li $a3, 0 /* 02965C 80028A5C AFA40020 */ sw $a0, 0x20($sp) diff --git a/asm/non_matchings/code_800393C0/func_80039AE4.s b/asm/non_matchings/code_800393C0/func_80039AE4.s deleted file mode 100644 index cf51cc0da..000000000 --- a/asm/non_matchings/code_800393C0/func_80039AE4.s +++ /dev/null @@ -1,188 +0,0 @@ -glabel func_80039AE4 -/* 03A6E4 80039AE4 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 03A6E8 80039AE8 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) -/* 03A6EC 80039AEC 24010001 */ li $at, 1 -/* 03A6F0 80039AF0 3C0E800E */ lui $t6, %hi(D_800DC50C) # $t6, 0x800e -/* 03A6F4 80039AF4 10400008 */ beqz $v0, .L80039B18 -/* 03A6F8 80039AF8 00000000 */ nop -/* 03A6FC 80039AFC 1041003E */ beq $v0, $at, .L80039BF8 -/* 03A700 80039B00 3C0D800E */ lui $t5, 0x800e -/* 03A704 80039B04 24010002 */ li $at, 2 -/* 03A708 80039B08 1041003B */ beq $v0, $at, .L80039BF8 -/* 03A70C 80039B0C 3C0A800E */ lui $t2, 0x800e -/* 03A710 80039B10 1000006F */ b .L80039CD0 -/* 03A714 80039B14 24020096 */ li $v0, 150 -.L80039B18: -/* 03A718 80039B18 8DCEC50C */ lw $t6, %lo(D_800DC50C)($t6) -/* 03A71C 80039B1C 24010005 */ li $at, 5 -/* 03A720 80039B20 24020384 */ li $v0, 900 -/* 03A724 80039B24 15C1001A */ bne $t6, $at, .L80039B90 -/* 03A728 80039B28 24030032 */ li $v1, 50 -/* 03A72C 80039B2C 240F0898 */ li $t7, 2200 -/* 03A730 80039B30 3C018016 */ lui $at, %hi(D_80165578) # $at, 0x8016 -/* 03A734 80039B34 A42F5578 */ sh $t7, %lo(D_80165578)($at) -/* 03A738 80039B38 3C018016 */ lui $at, %hi(D_8016557A) # $at, 0x8016 -/* 03A73C 80039B3C A420557A */ sh $zero, %lo(D_8016557A)($at) -/* 03A740 80039B40 24020384 */ li $v0, 900 -/* 03A744 80039B44 3C018016 */ lui $at, %hi(D_8016557C) # $at, 0x8016 -/* 03A748 80039B48 A422557C */ sh $v0, %lo(D_8016557C)($at) -/* 03A74C 80039B4C 3C018016 */ lui $at, %hi(D_8016557E) # $at, 0x8016 -/* 03A750 80039B50 A420557E */ sh $zero, %lo(D_8016557E)($at) -/* 03A754 80039B54 3C018016 */ lui $at, %hi(D_80165574) # $at, 0x8016 -/* 03A758 80039B58 A4225574 */ sh $v0, %lo(D_80165574)($at) -/* 03A75C 80039B5C 3C018016 */ lui $at, %hi(D_80165576) # $at, 0x8016 -/* 03A760 80039B60 A4205576 */ sh $zero, %lo(D_80165576)($at) -/* 03A764 80039B64 3C018016 */ lui $at, %hi(D_80165570) # $at, 0x8016 -/* 03A768 80039B68 2418035C */ li $t8, 860 -/* 03A76C 80039B6C A4385570 */ sh $t8, %lo(D_80165570)($at) -/* 03A770 80039B70 3C018016 */ lui $at, %hi(D_80165572) # $at, 0x8016 -/* 03A774 80039B74 A4205572 */ sh $zero, %lo(D_80165572)($at) -/* 03A778 80039B78 3C018016 */ lui $at, %hi(D_80165580) # $at, 0x8016 -/* 03A77C 80039B7C 241901F4 */ li $t9, 500 -/* 03A780 80039B80 A4395580 */ sh $t9, %lo(D_80165580)($at) -/* 03A784 80039B84 3C018016 */ lui $at, 0x8016 -/* 03A788 80039B88 03E00008 */ jr $ra -/* 03A78C 80039B8C A4205582 */ sh $zero, 0x5582($at) - -.L80039B90: -/* 03A790 80039B90 240804B0 */ li $t0, 1200 -/* 03A794 80039B94 3C018016 */ lui $at, %hi(D_80165578) # $at, 0x8016 -/* 03A798 80039B98 A4285578 */ sh $t0, %lo(D_80165578)($at) -/* 03A79C 80039B9C 3C018016 */ lui $at, %hi(D_8016557A) # $at, 0x8016 -/* 03A7A0 80039BA0 2409FFF6 */ li $t1, -10 -/* 03A7A4 80039BA4 A429557A */ sh $t1, %lo(D_8016557A)($at) -/* 03A7A8 80039BA8 3C018016 */ lui $at, %hi(D_8016557C) # $at, 0x8016 -/* 03A7AC 80039BAC A422557C */ sh $v0, %lo(D_8016557C)($at) -/* 03A7B0 80039BB0 3C018016 */ lui $at, %hi(D_8016557E) # $at, 0x8016 -/* 03A7B4 80039BB4 A423557E */ sh $v1, %lo(D_8016557E)($at) -/* 03A7B8 80039BB8 3C018016 */ lui $at, %hi(D_80165574) # $at, 0x8016 -/* 03A7BC 80039BBC 240A01F4 */ li $t2, 500 -/* 03A7C0 80039BC0 A42A5574 */ sh $t2, %lo(D_80165574)($at) -/* 03A7C4 80039BC4 3C018016 */ lui $at, %hi(D_80165576) # $at, 0x8016 -/* 03A7C8 80039BC8 A4205576 */ sh $zero, %lo(D_80165576)($at) -/* 03A7CC 80039BCC 3C018016 */ lui $at, %hi(D_80165570) # $at, 0x8016 -/* 03A7D0 80039BD0 240B015E */ li $t3, 350 -/* 03A7D4 80039BD4 A42B5570 */ sh $t3, %lo(D_80165570)($at) -/* 03A7D8 80039BD8 3C018016 */ lui $at, %hi(D_80165572) # $at, 0x8016 -/* 03A7DC 80039BDC A4205572 */ sh $zero, %lo(D_80165572)($at) -/* 03A7E0 80039BE0 3C018016 */ lui $at, %hi(D_80165580) # $at, 0x8016 -/* 03A7E4 80039BE4 240C00FA */ li $t4, 250 -/* 03A7E8 80039BE8 A42C5580 */ sh $t4, %lo(D_80165580)($at) -/* 03A7EC 80039BEC 3C018016 */ lui $at, 0x8016 -/* 03A7F0 80039BF0 03E00008 */ jr $ra -/* 03A7F4 80039BF4 A4205582 */ sh $zero, 0x5582($at) - -.L80039BF8: -/* 03A7F8 80039BF8 8DADC53C */ lw $t5, -0x3ac4($t5) -/* 03A7FC 80039BFC 24010003 */ li $at, 3 -/* 03A800 80039C00 24020096 */ li $v0, 150 -/* 03A804 80039C04 15A1001A */ bne $t5, $at, .L80039C70 -/* 03A808 80039C08 24030032 */ li $v1, 50 -/* 03A80C 80039C0C 240E0898 */ li $t6, 2200 -/* 03A810 80039C10 3C018016 */ lui $at, %hi(D_80165578) # $at, 0x8016 -/* 03A814 80039C14 A42E5578 */ sh $t6, %lo(D_80165578)($at) -/* 03A818 80039C18 3C018016 */ lui $at, %hi(D_8016557A) # $at, 0x8016 -/* 03A81C 80039C1C A420557A */ sh $zero, %lo(D_8016557A)($at) -/* 03A820 80039C20 3C018016 */ lui $at, %hi(D_8016557C) # $at, 0x8016 -/* 03A824 80039C24 240F0320 */ li $t7, 800 -/* 03A828 80039C28 A42F557C */ sh $t7, %lo(D_8016557C)($at) -/* 03A82C 80039C2C 3C018016 */ lui $at, %hi(D_8016557E) # $at, 0x8016 -/* 03A830 80039C30 A420557E */ sh $zero, %lo(D_8016557E)($at) -/* 03A834 80039C34 3C018016 */ lui $at, %hi(D_80165574) # $at, 0x8016 -/* 03A838 80039C38 24180190 */ li $t8, 400 -/* 03A83C 80039C3C A4385574 */ sh $t8, %lo(D_80165574)($at) -/* 03A840 80039C40 3C018016 */ lui $at, %hi(D_80165576) # $at, 0x8016 -/* 03A844 80039C44 A4205576 */ sh $zero, %lo(D_80165576)($at) -/* 03A848 80039C48 240200C8 */ li $v0, 200 -/* 03A84C 80039C4C 3C018016 */ lui $at, %hi(D_80165570) # $at, 0x8016 -/* 03A850 80039C50 A4225570 */ sh $v0, %lo(D_80165570)($at) -/* 03A854 80039C54 3C018016 */ lui $at, %hi(D_80165572) # $at, 0x8016 -/* 03A858 80039C58 A4205572 */ sh $zero, %lo(D_80165572)($at) -/* 03A85C 80039C5C 3C018016 */ lui $at, %hi(D_80165580) # $at, 0x8016 -/* 03A860 80039C60 A4225580 */ sh $v0, %lo(D_80165580)($at) -/* 03A864 80039C64 3C018016 */ lui $at, 0x8016 -/* 03A868 80039C68 03E00008 */ jr $ra -/* 03A86C 80039C6C A4205582 */ sh $zero, 0x5582($at) - -.L80039C70: -/* 03A870 80039C70 241904B0 */ li $t9, 1200 -/* 03A874 80039C74 3C018016 */ lui $at, %hi(D_80165578) # $at, 0x8016 -/* 03A878 80039C78 A4395578 */ sh $t9, %lo(D_80165578)($at) -/* 03A87C 80039C7C 3C018016 */ lui $at, %hi(D_8016557A) # $at, 0x8016 -/* 03A880 80039C80 A423557A */ sh $v1, %lo(D_8016557A)($at) -/* 03A884 80039C84 3C018016 */ lui $at, %hi(D_8016557C) # $at, 0x8016 -/* 03A888 80039C88 24080320 */ li $t0, 800 -/* 03A88C 80039C8C A428557C */ sh $t0, %lo(D_8016557C)($at) -/* 03A890 80039C90 3C018016 */ lui $at, %hi(D_8016557E) # $at, 0x8016 -/* 03A894 80039C94 A423557E */ sh $v1, %lo(D_8016557E)($at) -/* 03A898 80039C98 3C018016 */ lui $at, %hi(D_80165574) # $at, 0x8016 -/* 03A89C 80039C9C 24090190 */ li $t1, 400 -/* 03A8A0 80039CA0 A4295574 */ sh $t1, %lo(D_80165574)($at) -/* 03A8A4 80039CA4 3C018016 */ lui $at, %hi(D_80165576) # $at, 0x8016 -/* 03A8A8 80039CA8 A4205576 */ sh $zero, %lo(D_80165576)($at) -/* 03A8AC 80039CAC 3C018016 */ lui $at, %hi(D_80165570) # $at, 0x8016 -/* 03A8B0 80039CB0 A4225570 */ sh $v0, %lo(D_80165570)($at) -/* 03A8B4 80039CB4 3C018016 */ lui $at, %hi(D_80165572) # $at, 0x8016 -/* 03A8B8 80039CB8 A4205572 */ sh $zero, %lo(D_80165572)($at) -/* 03A8BC 80039CBC 3C018016 */ lui $at, %hi(D_80165580) # $at, 0x8016 -/* 03A8C0 80039CC0 A4225580 */ sh $v0, %lo(D_80165580)($at) -/* 03A8C4 80039CC4 3C018016 */ lui $at, 0x8016 -/* 03A8C8 80039CC8 03E00008 */ jr $ra -/* 03A8CC 80039CCC A4205582 */ sh $zero, 0x5582($at) - -.L80039CD0: -/* 03A8D0 80039CD0 8D4AC53C */ lw $t2, -0x3ac4($t2) -/* 03A8D4 80039CD4 24010003 */ li $at, 3 -/* 03A8D8 80039CD8 240E03E8 */ li $t6, 1000 -/* 03A8DC 80039CDC 1541001A */ bne $t2, $at, .L80039D48 -/* 03A8E0 80039CE0 240F0258 */ li $t7, 600 -/* 03A8E4 80039CE4 240B0898 */ li $t3, 2200 -/* 03A8E8 80039CE8 3C018016 */ lui $at, %hi(D_80165578) # $at, 0x8016 -/* 03A8EC 80039CEC A42B5578 */ sh $t3, %lo(D_80165578)($at) -/* 03A8F0 80039CF0 3C018016 */ lui $at, %hi(D_8016557A) # $at, 0x8016 -/* 03A8F4 80039CF4 A420557A */ sh $zero, %lo(D_8016557A)($at) -/* 03A8F8 80039CF8 3C018016 */ lui $at, %hi(D_8016557C) # $at, 0x8016 -/* 03A8FC 80039CFC 240C0320 */ li $t4, 800 -/* 03A900 80039D00 A42C557C */ sh $t4, %lo(D_8016557C)($at) -/* 03A904 80039D04 3C018016 */ lui $at, %hi(D_8016557E) # $at, 0x8016 -/* 03A908 80039D08 A420557E */ sh $zero, %lo(D_8016557E)($at) -/* 03A90C 80039D0C 3C018016 */ lui $at, %hi(D_80165574) # $at, 0x8016 -/* 03A910 80039D10 240D0190 */ li $t5, 400 -/* 03A914 80039D14 A42D5574 */ sh $t5, %lo(D_80165574)($at) -/* 03A918 80039D18 3C018016 */ lui $at, %hi(D_80165576) # $at, 0x8016 -/* 03A91C 80039D1C A4205576 */ sh $zero, %lo(D_80165576)($at) -/* 03A920 80039D20 240200C8 */ li $v0, 200 -/* 03A924 80039D24 3C018016 */ lui $at, %hi(D_80165570) # $at, 0x8016 -/* 03A928 80039D28 A4225570 */ sh $v0, %lo(D_80165570)($at) -/* 03A92C 80039D2C 3C018016 */ lui $at, %hi(D_80165572) # $at, 0x8016 -/* 03A930 80039D30 A4205572 */ sh $zero, %lo(D_80165572)($at) -/* 03A934 80039D34 3C018016 */ lui $at, %hi(D_80165580) # $at, 0x8016 -/* 03A938 80039D38 A4225580 */ sh $v0, %lo(D_80165580)($at) -/* 03A93C 80039D3C 3C018016 */ lui $at, 0x8016 -/* 03A940 80039D40 03E00008 */ jr $ra -/* 03A944 80039D44 A4205582 */ sh $zero, 0x5582($at) - -.L80039D48: -/* 03A948 80039D48 3C018016 */ lui $at, %hi(D_80165578) # $at, 0x8016 -/* 03A94C 80039D4C A42E5578 */ sh $t6, %lo(D_80165578)($at) -/* 03A950 80039D50 3C018016 */ lui $at, %hi(D_8016557A) # $at, 0x8016 -/* 03A954 80039D54 A420557A */ sh $zero, %lo(D_8016557A)($at) -/* 03A958 80039D58 3C018016 */ lui $at, %hi(D_8016557C) # $at, 0x8016 -/* 03A95C 80039D5C A42F557C */ sh $t7, %lo(D_8016557C)($at) -/* 03A960 80039D60 3C018016 */ lui $at, %hi(D_8016557E) # $at, 0x8016 -/* 03A964 80039D64 A420557E */ sh $zero, %lo(D_8016557E)($at) -/* 03A968 80039D68 3C018016 */ lui $at, %hi(D_80165574) # $at, 0x8016 -/* 03A96C 80039D6C 2418015E */ li $t8, 350 -/* 03A970 80039D70 A4385574 */ sh $t8, %lo(D_80165574)($at) -/* 03A974 80039D74 3C018016 */ lui $at, %hi(D_80165576) # $at, 0x8016 -/* 03A978 80039D78 A4205576 */ sh $zero, %lo(D_80165576)($at) -/* 03A97C 80039D7C 3C018016 */ lui $at, %hi(D_80165570) # $at, 0x8016 -/* 03A980 80039D80 A4225570 */ sh $v0, %lo(D_80165570)($at) -/* 03A984 80039D84 3C018016 */ lui $at, %hi(D_80165572) # $at, 0x8016 -/* 03A988 80039D88 A4205572 */ sh $zero, %lo(D_80165572)($at) -/* 03A98C 80039D8C 3C018016 */ lui $at, %hi(D_80165580) # $at, 0x8016 -/* 03A990 80039D90 A4225580 */ sh $v0, %lo(D_80165580)($at) -/* 03A994 80039D94 3C018016 */ lui $at, %hi(D_80165582) # $at, 0x8016 -/* 03A998 80039D98 A4205582 */ sh $zero, %lo(D_80165582)($at) -/* 03A99C 80039D9C 03E00008 */ jr $ra -/* 03A9A0 80039DA0 00000000 */ nop diff --git a/asm/non_matchings/code_800393C0/func_80039DA4.s b/asm/non_matchings/code_800393C0/func_80039DA4.s deleted file mode 100644 index daadbb221..000000000 --- a/asm/non_matchings/code_800393C0/func_80039DA4.s +++ /dev/null @@ -1,111 +0,0 @@ -glabel func_80039DA4 -/* 03A9A4 80039DA4 3C0F800E */ lui $t7, %hi(D_800E4360) # $t7, 0x800e -/* 03A9A8 80039DA8 25EF4360 */ addiu $t7, %lo(D_800E4360) # addiu $t7, $t7, 0x4360 -/* 03A9AC 80039DAC 8DE10000 */ lw $at, ($t7) -/* 03A9B0 80039DB0 8DE80004 */ lw $t0, 4($t7) -/* 03A9B4 80039DB4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 03A9B8 80039DB8 27AE002C */ addiu $t6, $sp, 0x2c -/* 03A9BC 80039DBC ADC10000 */ sw $at, ($t6) -/* 03A9C0 80039DC0 ADC80004 */ sw $t0, 4($t6) -/* 03A9C4 80039DC4 8DE8000C */ lw $t0, 0xc($t7) -/* 03A9C8 80039DC8 8DE10008 */ lw $at, 8($t7) -/* 03A9CC 80039DCC 3C09800E */ lui $t1, %hi(D_800E4380) # $t1, 0x800e -/* 03A9D0 80039DD0 ADC8000C */ sw $t0, 0xc($t6) -/* 03A9D4 80039DD4 ADC10008 */ sw $at, 8($t6) -/* 03A9D8 80039DD8 8DE10010 */ lw $at, 0x10($t7) -/* 03A9DC 80039DDC 8DE80014 */ lw $t0, 0x14($t7) -/* 03A9E0 80039DE0 25294380 */ addiu $t1, %lo(D_800E4380) # addiu $t1, $t1, 0x4380 -/* 03A9E4 80039DE4 ADC10010 */ sw $at, 0x10($t6) -/* 03A9E8 80039DE8 ADC80014 */ sw $t0, 0x14($t6) -/* 03A9EC 80039DEC 8DE8001C */ lw $t0, 0x1c($t7) -/* 03A9F0 80039DF0 8DE10018 */ lw $at, 0x18($t7) -/* 03A9F4 80039DF4 27A5000C */ addiu $a1, $sp, 0xc -/* 03A9F8 80039DF8 ADC8001C */ sw $t0, 0x1c($t6) -/* 03A9FC 80039DFC ADC10018 */ sw $at, 0x18($t6) -/* 03AA00 80039E00 8D210000 */ lw $at, ($t1) -/* 03AA04 80039E04 3C0D8019 */ lui $t5, %hi(gCourseSelection) # $t5, 0x8019 -/* 03AA08 80039E08 3C198016 */ lui $t9, %hi(D_8016556E) # $t9, 0x8016 -/* 03AA0C 80039E0C ACA10000 */ sw $at, ($a1) -/* 03AA10 80039E10 8D2C0004 */ lw $t4, 4($t1) -/* 03AA14 80039E14 3C18800E */ lui $t8, %hi(D_800DC51C) # $t8, 0x800e -/* 03AA18 80039E18 ACAC0004 */ sw $t4, 4($a1) -/* 03AA1C 80039E1C 8D210008 */ lw $at, 8($t1) -/* 03AA20 80039E20 ACA10008 */ sw $at, 8($a1) -/* 03AA24 80039E24 8D2C000C */ lw $t4, 0xc($t1) -/* 03AA28 80039E28 ACAC000C */ sw $t4, 0xc($a1) -/* 03AA2C 80039E2C 8D210010 */ lw $at, 0x10($t1) -/* 03AA30 80039E30 ACA10010 */ sw $at, 0x10($a1) -/* 03AA34 80039E34 8D2C0014 */ lw $t4, 0x14($t1) -/* 03AA38 80039E38 ACAC0014 */ sw $t4, 0x14($a1) -/* 03AA3C 80039E3C 8D210018 */ lw $at, 0x18($t1) -/* 03AA40 80039E40 ACA10018 */ sw $at, 0x18($a1) -/* 03AA44 80039E44 8D2C001C */ lw $t4, 0x1c($t1) -/* 03AA48 80039E48 ACAC001C */ sw $t4, 0x1c($a1) -/* 03AA4C 80039E4C 81ADEE0B */ lb $t5, %lo(gCourseSelection)($t5) -/* 03AA50 80039E50 15A00004 */ bnez $t5, .L80039E64 -/* 03AA54 80039E54 00000000 */ nop -/* 03AA58 80039E58 8739556E */ lh $t9, %lo(D_8016556E)($t9) -/* 03AA5C 80039E5C 1320000B */ beqz $t9, .L80039E8C -/* 03AA60 80039E60 00000000 */ nop -.L80039E64: -/* 03AA64 80039E64 9718C51C */ lhu $t8, %lo(D_800DC51C)($t8) -/* 03AA68 80039E68 24010001 */ li $at, 1 -/* 03AA6C 80039E6C 3C0E8019 */ lui $t6, %hi(D_8018EDEF) # $t6, 0x8019 -/* 03AA70 80039E70 13010006 */ beq $t8, $at, .L80039E8C -/* 03AA74 80039E74 00000000 */ nop -/* 03AA78 80039E78 81CEEDEF */ lb $t6, %lo(D_8018EDEF)($t6) -/* 03AA7C 80039E7C 24010040 */ li $at, 64 -/* 03AA80 80039E80 3C038016 */ lui $v1, %hi(D_80165270) # $v1, 0x8016 -/* 03AA84 80039E84 15C10012 */ bne $t6, $at, .L80039ED0 -/* 03AA88 80039E88 24635270 */ addiu $v1, %lo(D_80165270) # addiu $v1, $v1, 0x5270 -.L80039E8C: -/* 03AA8C 80039E8C 3C038016 */ lui $v1, %hi(D_80165270) # $v1, 0x8016 -/* 03AA90 80039E90 24635270 */ addiu $v1, %lo(D_80165270) # addiu $v1, $v1, 0x5270 -/* 03AA94 80039E94 27A4002C */ addiu $a0, $sp, 0x2c -/* 03AA98 80039E98 27A2004C */ addiu $v0, $sp, 0x4c -.L80039E9C: -/* 03AA9C 80039E9C 8C880004 */ lw $t0, 4($a0) -/* 03AAA0 80039EA0 8C8B0008 */ lw $t3, 8($a0) -/* 03AAA4 80039EA4 8C8A000C */ lw $t2, 0xc($a0) -/* 03AAA8 80039EA8 8C8F0000 */ lw $t7, ($a0) -/* 03AAAC 80039EAC 24840010 */ addiu $a0, $a0, 0x10 -/* 03AAB0 80039EB0 24630008 */ addiu $v1, $v1, 8 -/* 03AAB4 80039EB4 A468FFFA */ sh $t0, -6($v1) -/* 03AAB8 80039EB8 A46BFFFC */ sh $t3, -4($v1) -/* 03AABC 80039EBC A46AFFFE */ sh $t2, -2($v1) -/* 03AAC0 80039EC0 1482FFF6 */ bne $a0, $v0, .L80039E9C -/* 03AAC4 80039EC4 A46FFFF8 */ sh $t7, -8($v1) -/* 03AAC8 80039EC8 1000001C */ b .L80039F3C -/* 03AACC 80039ECC 00000000 */ nop -.L80039ED0: -/* 03AAD0 80039ED0 3C048016 */ lui $a0, %hi(D_801643B8) # $a0, 0x8016 -/* 03AAD4 80039ED4 3C028016 */ lui $v0, %hi(D_801643D8) # $v0, 0x8016 -/* 03AAD8 80039ED8 244243D8 */ addiu $v0, %lo(D_801643D8) # addiu $v0, $v0, 0x43d8 -/* 03AADC 80039EDC 248443B8 */ addiu $a0, %lo(D_801643B8) # addiu $a0, $a0, 0x43b8 -.L80039EE0: -/* 03AAE0 80039EE0 8C890000 */ lw $t1, ($a0) -/* 03AAE4 80039EE4 8C980004 */ lw $t8, 4($a0) -/* 03AAE8 80039EE8 8C8B0008 */ lw $t3, 8($a0) -/* 03AAEC 80039EEC 00096080 */ sll $t4, $t1, 2 -/* 03AAF0 80039EF0 00AC6821 */ addu $t5, $a1, $t4 -/* 03AAF4 80039EF4 8DB90000 */ lw $t9, ($t5) -/* 03AAF8 80039EF8 8C8D000C */ lw $t5, 0xc($a0) -/* 03AAFC 80039EFC 00187080 */ sll $t6, $t8, 2 -/* 03AB00 80039F00 A4790000 */ sh $t9, ($v1) -/* 03AB04 80039F04 00AE7821 */ addu $t7, $a1, $t6 -/* 03AB08 80039F08 000B5080 */ sll $t2, $t3, 2 -/* 03AB0C 80039F0C 000DC880 */ sll $t9, $t5, 2 -/* 03AB10 80039F10 00B9C021 */ addu $t8, $a1, $t9 -/* 03AB14 80039F14 00AA4821 */ addu $t1, $a1, $t2 -/* 03AB18 80039F18 8D2C0000 */ lw $t4, ($t1) -/* 03AB1C 80039F1C 8F0E0000 */ lw $t6, ($t8) -/* 03AB20 80039F20 8DE80000 */ lw $t0, ($t7) -/* 03AB24 80039F24 24840010 */ addiu $a0, $a0, 0x10 -/* 03AB28 80039F28 24630008 */ addiu $v1, $v1, 8 -/* 03AB2C 80039F2C A46CFFFC */ sh $t4, -4($v1) -/* 03AB30 80039F30 A46EFFFE */ sh $t6, -2($v1) -/* 03AB34 80039F34 1482FFEA */ bne $a0, $v0, .L80039EE0 -/* 03AB38 80039F38 A468FFFA */ sh $t0, -6($v1) -.L80039F3C: -/* 03AB3C 80039F3C 03E00008 */ jr $ra -/* 03AB40 80039F40 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_800393C0/func_80039F44.s b/asm/non_matchings/code_800393C0/func_80039F44.s deleted file mode 100644 index d43a1430f..000000000 --- a/asm/non_matchings/code_800393C0/func_80039F44.s +++ /dev/null @@ -1,416 +0,0 @@ -glabel func_80039F44 -/* 03AB44 80039F44 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 03AB48 80039F48 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 03AB4C 80039F4C 4486B000 */ mtc1 $a2, $f22 -/* 03AB50 80039F50 AFBF0044 */ sw $ra, 0x44($sp) -/* 03AB54 80039F54 AFB30040 */ sw $s3, 0x40($sp) -/* 03AB58 80039F58 AFB2003C */ sw $s2, 0x3c($sp) -/* 03AB5C 80039F5C 00809025 */ move $s2, $a0 -/* 03AB60 80039F60 00A09825 */ move $s3, $a1 -/* 03AB64 80039F64 AFB10038 */ sw $s1, 0x38($sp) -/* 03AB68 80039F68 AFB00034 */ sw $s0, 0x34($sp) -/* 03AB6C 80039F6C 0C00E769 */ jal func_80039DA4 -/* 03AB70 80039F70 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 03AB74 80039F74 3C0E8019 */ lui $t6, %hi(gCourseSelection) # $t6, 0x8019 -/* 03AB78 80039F78 81CEEE0B */ lb $t6, %lo(gCourseSelection)($t6) -/* 03AB7C 80039F7C 3C0F8016 */ lui $t7, %hi(D_8016556E) # $t7, 0x8016 -/* 03AB80 80039F80 3C02800E */ lui $v0, %hi(D_800DC51C) # $v0, 0x800e -/* 03AB84 80039F84 15C00004 */ bnez $t6, .L80039F98 -/* 03AB88 80039F88 00000000 */ nop -/* 03AB8C 80039F8C 85EF556E */ lh $t7, %lo(D_8016556E)($t7) -/* 03AB90 80039F90 11E00009 */ beqz $t7, .L80039FB8 -/* 03AB94 80039F94 00000000 */ nop -.L80039F98: -/* 03AB98 80039F98 9442C51C */ lhu $v0, %lo(D_800DC51C)($v0) -/* 03AB9C 80039F9C 24010001 */ li $at, 1 -/* 03ABA0 80039FA0 3C188019 */ lui $t8, %hi(D_8018EDEF) # $t8, 0x8019 -/* 03ABA4 80039FA4 10410004 */ beq $v0, $at, .L80039FB8 -/* 03ABA8 80039FA8 00000000 */ nop -/* 03ABAC 80039FAC 8318EDEF */ lb $t8, %lo(D_8018EDEF)($t8) -/* 03ABB0 80039FB0 24010040 */ li $at, 64 -/* 03ABB4 80039FB4 17010024 */ bne $t8, $at, .L8003A048 -.L80039FB8: -/* 03ABB8 80039FB8 3C10800F */ lui $s0, %hi(D_800E86A8) # $s0, 0x800f -/* 03ABBC 80039FBC 261086A8 */ addiu $s0, %lo(D_800E86A8) # addiu $s0, $s0, -0x7958 -.L80039FC0: -/* 03ABC0 80039FC0 0C0ADF8D */ jal random_int -/* 03ABC4 80039FC4 24040007 */ li $a0, 7 -/* 03ABC8 80039FC8 82030000 */ lb $v1, ($s0) -/* 03ABCC 80039FCC 00023400 */ sll $a2, $v0, 0x10 -/* 03ABD0 80039FD0 0006CC03 */ sra $t9, $a2, 0x10 -/* 03ABD4 80039FD4 1323FFFA */ beq $t9, $v1, .L80039FC0 -/* 03ABD8 80039FD8 03203025 */ move $a2, $t9 -/* 03ABDC 80039FDC 00034080 */ sll $t0, $v1, 2 -/* 03ABE0 80039FE0 3C05800E */ lui $a1, %hi(D_800E3890) -/* 03ABE4 80039FE4 3C018016 */ lui $at, %hi(D_80165560) # $at, 0x8016 -/* 03ABE8 80039FE8 00A82821 */ addu $a1, $a1, $t0 -/* 03ABEC 80039FEC 3C108016 */ lui $s0, %hi(D_80165560) # $s0, 0x8016 -/* 03ABF0 80039FF0 A4395560 */ sh $t9, %lo(D_80165560)($at) -/* 03ABF4 80039FF4 26105560 */ addiu $s0, %lo(D_80165560) # addiu $s0, $s0, 0x5560 -/* 03ABF8 80039FF8 8CA53890 */ lw $a1, %lo(D_800E3890)($a1) -/* 03ABFC 80039FFC 24020001 */ li $v0, 1 -/* 03AC00 8003A000 00021840 */ sll $v1, $v0, 1 -.L8003A004: -/* 03AC04 8003A004 00A34821 */ addu $t1, $a1, $v1 -/* 03AC08 8003A008 95240000 */ lhu $a0, ($t1) -/* 03AC0C 8003A00C 24420001 */ addiu $v0, $v0, 1 -/* 03AC10 8003A010 00026C00 */ sll $t5, $v0, 0x10 -/* 03AC14 8003A014 14C40005 */ bne $a2, $a0, .L8003A02C -/* 03AC18 8003A018 000D1403 */ sra $v0, $t5, 0x10 -/* 03AC1C 8003A01C 94AA0000 */ lhu $t2, ($a1) -/* 03AC20 8003A020 02035821 */ addu $t3, $s0, $v1 -/* 03AC24 8003A024 10000003 */ b .L8003A034 -/* 03AC28 8003A028 A56A0000 */ sh $t2, ($t3) -.L8003A02C: -/* 03AC2C 8003A02C 02036021 */ addu $t4, $s0, $v1 -/* 03AC30 8003A030 A5840000 */ sh $a0, ($t4) -.L8003A034: -/* 03AC34 8003A034 28410007 */ slti $at, $v0, 7 -/* 03AC38 8003A038 5420FFF2 */ bnel $at, $zero, .L8003A004 -/* 03AC3C 8003A03C 00021840 */ sll $v1, $v0, 1 -/* 03AC40 8003A040 3C02800E */ lui $v0, %hi(D_800DC51C) # $v0, 0x800e -/* 03AC44 8003A044 9442C51C */ lhu $v0, %lo(D_800DC51C)($v0) -.L8003A048: -/* 03AC48 8003A048 3C018016 */ lui $at, %hi(D_8016556E) # $at, 0x8016 -/* 03AC4C 8003A04C A420556E */ sh $zero, %lo(D_8016556E)($at) -/* 03AC50 8003A050 3C108016 */ lui $s0, %hi(D_80165560) # $s0, 0x8016 -/* 03AC54 8003A054 24010001 */ li $at, 1 -/* 03AC58 8003A058 3C03800F */ lui $v1, %hi(D_800E86A8) # $v1, 0x800f -/* 03AC5C 8003A05C 26105560 */ addiu $s0, %lo(D_80165560) # addiu $s0, $s0, 0x5560 -/* 03AC60 8003A060 1441008F */ bne $v0, $at, .L8003A2A0 -/* 03AC64 8003A064 806386A8 */ lb $v1, %lo(D_800E86A8)($v1) -/* 03AC68 8003A068 3C118016 */ lui $s1, %hi(D_80165270) # $s1, 0x8016 -/* 03AC6C 8003A06C 26315270 */ addiu $s1, %lo(D_80165270) # addiu $s1, $s1, 0x5270 -/* 03AC70 8003A070 86220000 */ lh $v0, ($s1) -/* 03AC74 8003A074 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03AC78 8003A078 4481A000 */ mtc1 $at, $f20 -/* 03AC7C 8003A07C 00027880 */ sll $t7, $v0, 2 -/* 03AC80 8003A080 024FC021 */ addu $t8, $s2, $t7 -/* 03AC84 8003A084 026FC821 */ addu $t9, $s3, $t7 -/* 03AC88 8003A088 8F270000 */ lw $a3, ($t9) -/* 03AC8C 8003A08C 8F060000 */ lw $a2, ($t8) -/* 03AC90 8003A090 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03AC94 8003A094 2408F000 */ li $t0, -4096 -/* 03AC98 8003A098 AFA8001C */ sw $t0, 0x1c($sp) -/* 03AC9C 8003A09C 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 03ACA0 8003A0A0 AFA30018 */ sw $v1, 0x18($sp) -/* 03ACA4 8003A0A4 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03ACA8 8003A0A8 01E01025 */ move $v0, $t7 -/* 03ACAC 8003A0AC 00002825 */ move $a1, $zero -/* 03ACB0 8003A0B0 0C00E4F0 */ jal spawn_player -/* 03ACB4 8003A0B4 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03ACB8 8003A0B8 86220002 */ lh $v0, 2($s1) -/* 03ACBC 8003A0BC 860C0000 */ lh $t4, ($s0) -/* 03ACC0 8003A0C0 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03ACC4 8003A0C4 00024880 */ sll $t1, $v0, 2 -/* 03ACC8 8003A0C8 02495021 */ addu $t2, $s2, $t1 -/* 03ACCC 8003A0CC 02695821 */ addu $t3, $s3, $t1 -/* 03ACD0 8003A0D0 8D670000 */ lw $a3, ($t3) -/* 03ACD4 8003A0D4 8D460000 */ lw $a2, ($t2) -/* 03ACD8 8003A0D8 240DB000 */ li $t5, -20480 -/* 03ACDC 8003A0DC AFAD001C */ sw $t5, 0x1c($sp) -/* 03ACE0 8003A0E0 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03ACE4 8003A0E4 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03ACE8 8003A0E8 01201025 */ move $v0, $t1 -/* 03ACEC 8003A0EC 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03ACF0 8003A0F0 24050001 */ li $a1, 1 -/* 03ACF4 8003A0F4 0C00E4F0 */ jal spawn_player -/* 03ACF8 8003A0F8 AFAC0018 */ sw $t4, 0x18($sp) -/* 03ACFC 8003A0FC 86220004 */ lh $v0, 4($s1) -/* 03AD00 8003A100 86190002 */ lh $t9, 2($s0) -/* 03AD04 8003A104 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03AD08 8003A108 00027080 */ sll $t6, $v0, 2 -/* 03AD0C 8003A10C 024E7821 */ addu $t7, $s2, $t6 -/* 03AD10 8003A110 026EC021 */ addu $t8, $s3, $t6 -/* 03AD14 8003A114 8F070000 */ lw $a3, ($t8) -/* 03AD18 8003A118 8DE60000 */ lw $a2, ($t7) -/* 03AD1C 8003A11C 2408B000 */ li $t0, -20480 -/* 03AD20 8003A120 AFA8001C */ sw $t0, 0x1c($sp) -/* 03AD24 8003A124 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AD28 8003A128 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AD2C 8003A12C 01C01025 */ move $v0, $t6 -/* 03AD30 8003A130 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03AD34 8003A134 24050002 */ li $a1, 2 -/* 03AD38 8003A138 0C00E4F0 */ jal spawn_player -/* 03AD3C 8003A13C AFB90018 */ sw $t9, 0x18($sp) -/* 03AD40 8003A140 86220006 */ lh $v0, 6($s1) -/* 03AD44 8003A144 860C0004 */ lh $t4, 4($s0) -/* 03AD48 8003A148 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03AD4C 8003A14C 00024880 */ sll $t1, $v0, 2 -/* 03AD50 8003A150 02495021 */ addu $t2, $s2, $t1 -/* 03AD54 8003A154 02695821 */ addu $t3, $s3, $t1 -/* 03AD58 8003A158 8D670000 */ lw $a3, ($t3) -/* 03AD5C 8003A15C 8D460000 */ lw $a2, ($t2) -/* 03AD60 8003A160 240DB000 */ li $t5, -20480 -/* 03AD64 8003A164 AFAD001C */ sw $t5, 0x1c($sp) -/* 03AD68 8003A168 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AD6C 8003A16C E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AD70 8003A170 01201025 */ move $v0, $t1 -/* 03AD74 8003A174 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03AD78 8003A178 24050003 */ li $a1, 3 -/* 03AD7C 8003A17C 0C00E4F0 */ jal spawn_player -/* 03AD80 8003A180 AFAC0018 */ sw $t4, 0x18($sp) -/* 03AD84 8003A184 86220008 */ lh $v0, 8($s1) -/* 03AD88 8003A188 86190006 */ lh $t9, 6($s0) -/* 03AD8C 8003A18C 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03AD90 8003A190 00027080 */ sll $t6, $v0, 2 -/* 03AD94 8003A194 024E7821 */ addu $t7, $s2, $t6 -/* 03AD98 8003A198 026EC021 */ addu $t8, $s3, $t6 -/* 03AD9C 8003A19C 8F070000 */ lw $a3, ($t8) -/* 03ADA0 8003A1A0 8DE60000 */ lw $a2, ($t7) -/* 03ADA4 8003A1A4 2408B000 */ li $t0, -20480 -/* 03ADA8 8003A1A8 AFA8001C */ sw $t0, 0x1c($sp) -/* 03ADAC 8003A1AC E7B40014 */ swc1 $f20, 0x14($sp) -/* 03ADB0 8003A1B0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03ADB4 8003A1B4 01C01025 */ move $v0, $t6 -/* 03ADB8 8003A1B8 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03ADBC 8003A1BC 24050004 */ li $a1, 4 -/* 03ADC0 8003A1C0 0C00E4F0 */ jal spawn_player -/* 03ADC4 8003A1C4 AFB90018 */ sw $t9, 0x18($sp) -/* 03ADC8 8003A1C8 8622000A */ lh $v0, 0xa($s1) -/* 03ADCC 8003A1CC 860C0008 */ lh $t4, 8($s0) -/* 03ADD0 8003A1D0 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03ADD4 8003A1D4 00024880 */ sll $t1, $v0, 2 -/* 03ADD8 8003A1D8 02495021 */ addu $t2, $s2, $t1 -/* 03ADDC 8003A1DC 02695821 */ addu $t3, $s3, $t1 -/* 03ADE0 8003A1E0 8D670000 */ lw $a3, ($t3) -/* 03ADE4 8003A1E4 8D460000 */ lw $a2, ($t2) -/* 03ADE8 8003A1E8 240DB000 */ li $t5, -20480 -/* 03ADEC 8003A1EC AFAD001C */ sw $t5, 0x1c($sp) -/* 03ADF0 8003A1F0 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03ADF4 8003A1F4 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03ADF8 8003A1F8 01201025 */ move $v0, $t1 -/* 03ADFC 8003A1FC 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03AE00 8003A200 24050005 */ li $a1, 5 -/* 03AE04 8003A204 0C00E4F0 */ jal spawn_player -/* 03AE08 8003A208 AFAC0018 */ sw $t4, 0x18($sp) -/* 03AE0C 8003A20C 8622000C */ lh $v0, 0xc($s1) -/* 03AE10 8003A210 8619000A */ lh $t9, 0xa($s0) -/* 03AE14 8003A214 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03AE18 8003A218 00027080 */ sll $t6, $v0, 2 -/* 03AE1C 8003A21C 024E7821 */ addu $t7, $s2, $t6 -/* 03AE20 8003A220 026EC021 */ addu $t8, $s3, $t6 -/* 03AE24 8003A224 8F070000 */ lw $a3, ($t8) -/* 03AE28 8003A228 8DE60000 */ lw $a2, ($t7) -/* 03AE2C 8003A22C 2408B000 */ li $t0, -20480 -/* 03AE30 8003A230 AFA8001C */ sw $t0, 0x1c($sp) -/* 03AE34 8003A234 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AE38 8003A238 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AE3C 8003A23C 01C01025 */ move $v0, $t6 -/* 03AE40 8003A240 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03AE44 8003A244 24050006 */ li $a1, 6 -/* 03AE48 8003A248 0C00E4F0 */ jal spawn_player -/* 03AE4C 8003A24C AFB90018 */ sw $t9, 0x18($sp) -/* 03AE50 8003A250 8622000E */ lh $v0, 0xe($s1) -/* 03AE54 8003A254 860C000C */ lh $t4, 0xc($s0) -/* 03AE58 8003A258 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03AE5C 8003A25C 00024880 */ sll $t1, $v0, 2 -/* 03AE60 8003A260 02495021 */ addu $t2, $s2, $t1 -/* 03AE64 8003A264 02695821 */ addu $t3, $s3, $t1 -/* 03AE68 8003A268 8D670000 */ lw $a3, ($t3) -/* 03AE6C 8003A26C 8D460000 */ lw $a2, ($t2) -/* 03AE70 8003A270 240DB000 */ li $t5, -20480 -/* 03AE74 8003A274 AFAD001C */ sw $t5, 0x1c($sp) -/* 03AE78 8003A278 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AE7C 8003A27C E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AE80 8003A280 01201025 */ move $v0, $t1 -/* 03AE84 8003A284 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03AE88 8003A288 24050007 */ li $a1, 7 -/* 03AE8C 8003A28C 0C00E4F0 */ jal spawn_player -/* 03AE90 8003A290 AFAC0018 */ sw $t4, 0x18($sp) -/* 03AE94 8003A294 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03AE98 8003A298 100000B5 */ b .L8003A570 -/* 03AE9C 8003A29C AC204A28 */ sw $zero, %lo(D_80164A28)($at) -.L8003A2A0: -/* 03AEA0 8003A2A0 3C118016 */ lui $s1, %hi(D_80165270) # $s1, 0x8016 -/* 03AEA4 8003A2A4 26315270 */ addiu $s1, %lo(D_80165270) # addiu $s1, $s1, 0x5270 -/* 03AEA8 8003A2A8 86220000 */ lh $v0, ($s1) -/* 03AEAC 8003A2AC 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03AEB0 8003A2B0 4481A000 */ mtc1 $at, $f20 -/* 03AEB4 8003A2B4 00027080 */ sll $t6, $v0, 2 -/* 03AEB8 8003A2B8 026EC021 */ addu $t8, $s3, $t6 -/* 03AEBC 8003A2BC 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03AEC0 8003A2C0 44813000 */ mtc1 $at, $f6 -/* 03AEC4 8003A2C4 C7040000 */ lwc1 $f4, ($t8) -/* 03AEC8 8003A2C8 024E7821 */ addu $t7, $s2, $t6 -/* 03AECC 8003A2CC 8DE60000 */ lw $a2, ($t7) -/* 03AED0 8003A2D0 46062200 */ add.s $f8, $f4, $f6 -/* 03AED4 8003A2D4 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03AED8 8003A2D8 2419E200 */ li $t9, -7680 -/* 03AEDC 8003A2DC AFB9001C */ sw $t9, 0x1c($sp) -/* 03AEE0 8003A2E0 44074000 */ mfc1 $a3, $f8 -/* 03AEE4 8003A2E4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 03AEE8 8003A2E8 AFA30018 */ sw $v1, 0x18($sp) -/* 03AEEC 8003A2EC E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AEF0 8003A2F0 01C01025 */ move $v0, $t6 -/* 03AEF4 8003A2F4 00002825 */ move $a1, $zero -/* 03AEF8 8003A2F8 0C00E4F0 */ jal spawn_player -/* 03AEFC 8003A2FC E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AF00 8003A300 86220002 */ lh $v0, 2($s1) -/* 03AF04 8003A304 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03AF08 8003A308 44818000 */ mtc1 $at, $f16 -/* 03AF0C 8003A30C 00024080 */ sll $t0, $v0, 2 -/* 03AF10 8003A310 02685021 */ addu $t2, $s3, $t0 -/* 03AF14 8003A314 C54A0000 */ lwc1 $f10, ($t2) -/* 03AF18 8003A318 02484821 */ addu $t1, $s2, $t0 -/* 03AF1C 8003A31C 8D260000 */ lw $a2, ($t1) -/* 03AF20 8003A320 46105480 */ add.s $f18, $f10, $f16 -/* 03AF24 8003A324 860B0000 */ lh $t3, ($s0) -/* 03AF28 8003A328 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03AF2C 8003A32C 240CB200 */ li $t4, -19968 -/* 03AF30 8003A330 44079000 */ mfc1 $a3, $f18 -/* 03AF34 8003A334 AFAC001C */ sw $t4, 0x1c($sp) -/* 03AF38 8003A338 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03AF3C 8003A33C E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AF40 8003A340 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AF44 8003A344 01001025 */ move $v0, $t0 -/* 03AF48 8003A348 24050001 */ li $a1, 1 -/* 03AF4C 8003A34C 0C00E4F0 */ jal spawn_player -/* 03AF50 8003A350 AFAB0018 */ sw $t3, 0x18($sp) -/* 03AF54 8003A354 86380004 */ lh $t8, 4($s1) -/* 03AF58 8003A358 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03AF5C 8003A35C 44813000 */ mtc1 $at, $f6 -/* 03AF60 8003A360 0018C880 */ sll $t9, $t8, 2 -/* 03AF64 8003A364 02794021 */ addu $t0, $s3, $t9 -/* 03AF68 8003A368 C5040000 */ lwc1 $f4, ($t0) -/* 03AF6C 8003A36C 862D0006 */ lh $t5, 6($s1) -/* 03AF70 8003A370 86090002 */ lh $t1, 2($s0) -/* 03AF74 8003A374 46062200 */ add.s $f8, $f4, $f6 -/* 03AF78 8003A378 000D7080 */ sll $t6, $t5, 2 -/* 03AF7C 8003A37C 024E7821 */ addu $t7, $s2, $t6 -/* 03AF80 8003A380 8DE60000 */ lw $a2, ($t7) -/* 03AF84 8003A384 44074000 */ mfc1 $a3, $f8 -/* 03AF88 8003A388 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03AF8C 8003A38C 240AB200 */ li $t2, -19968 -/* 03AF90 8003A390 AFAA001C */ sw $t2, 0x1c($sp) -/* 03AF94 8003A394 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03AF98 8003A398 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AF9C 8003A39C E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AFA0 8003A3A0 24050002 */ li $a1, 2 -/* 03AFA4 8003A3A4 0C00E4F0 */ jal spawn_player -/* 03AFA8 8003A3A8 AFA90018 */ sw $t1, 0x18($sp) -/* 03AFAC 8003A3AC 862E0006 */ lh $t6, 6($s1) -/* 03AFB0 8003A3B0 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03AFB4 8003A3B4 44818000 */ mtc1 $at, $f16 -/* 03AFB8 8003A3B8 000E7880 */ sll $t7, $t6, 2 -/* 03AFBC 8003A3BC 026FC021 */ addu $t8, $s3, $t7 -/* 03AFC0 8003A3C0 C70A0000 */ lwc1 $f10, ($t8) -/* 03AFC4 8003A3C4 862B0004 */ lh $t3, 4($s1) -/* 03AFC8 8003A3C8 86190004 */ lh $t9, 4($s0) -/* 03AFCC 8003A3CC 46105480 */ add.s $f18, $f10, $f16 -/* 03AFD0 8003A3D0 000B6080 */ sll $t4, $t3, 2 -/* 03AFD4 8003A3D4 024C6821 */ addu $t5, $s2, $t4 -/* 03AFD8 8003A3D8 8DA60000 */ lw $a2, ($t5) -/* 03AFDC 8003A3DC 44079000 */ mfc1 $a3, $f18 -/* 03AFE0 8003A3E0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03AFE4 8003A3E4 2408B200 */ li $t0, -19968 -/* 03AFE8 8003A3E8 AFA8001C */ sw $t0, 0x1c($sp) -/* 03AFEC 8003A3EC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03AFF0 8003A3F0 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03AFF4 8003A3F4 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03AFF8 8003A3F8 24050003 */ li $a1, 3 -/* 03AFFC 8003A3FC 0C00E4F0 */ jal spawn_player -/* 03B000 8003A400 AFB90018 */ sw $t9, 0x18($sp) -/* 03B004 8003A404 862C0008 */ lh $t4, 8($s1) -/* 03B008 8003A408 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03B00C 8003A40C 44813000 */ mtc1 $at, $f6 -/* 03B010 8003A410 000C6880 */ sll $t5, $t4, 2 -/* 03B014 8003A414 026D7021 */ addu $t6, $s3, $t5 -/* 03B018 8003A418 C5C40000 */ lwc1 $f4, ($t6) -/* 03B01C 8003A41C 8629000A */ lh $t1, 0xa($s1) -/* 03B020 8003A420 860F0006 */ lh $t7, 6($s0) -/* 03B024 8003A424 46062200 */ add.s $f8, $f4, $f6 -/* 03B028 8003A428 00095080 */ sll $t2, $t1, 2 -/* 03B02C 8003A42C 024A5821 */ addu $t3, $s2, $t2 -/* 03B030 8003A430 8D660000 */ lw $a2, ($t3) -/* 03B034 8003A434 44074000 */ mfc1 $a3, $f8 -/* 03B038 8003A438 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03B03C 8003A43C 2418B200 */ li $t8, -19968 -/* 03B040 8003A440 AFB8001C */ sw $t8, 0x1c($sp) -/* 03B044 8003A444 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03B048 8003A448 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03B04C 8003A44C E7B60010 */ swc1 $f22, 0x10($sp) -/* 03B050 8003A450 24050004 */ li $a1, 4 -/* 03B054 8003A454 0C00E4F0 */ jal spawn_player -/* 03B058 8003A458 AFAF0018 */ sw $t7, 0x18($sp) -/* 03B05C 8003A45C 862A000A */ lh $t2, 0xa($s1) -/* 03B060 8003A460 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03B064 8003A464 44818000 */ mtc1 $at, $f16 -/* 03B068 8003A468 000A5880 */ sll $t3, $t2, 2 -/* 03B06C 8003A46C 026B6021 */ addu $t4, $s3, $t3 -/* 03B070 8003A470 C58A0000 */ lwc1 $f10, ($t4) -/* 03B074 8003A474 86390008 */ lh $t9, 8($s1) -/* 03B078 8003A478 860D0008 */ lh $t5, 8($s0) -/* 03B07C 8003A47C 46105480 */ add.s $f18, $f10, $f16 -/* 03B080 8003A480 00194080 */ sll $t0, $t9, 2 -/* 03B084 8003A484 02484821 */ addu $t1, $s2, $t0 -/* 03B088 8003A488 8D260000 */ lw $a2, ($t1) -/* 03B08C 8003A48C 44079000 */ mfc1 $a3, $f18 -/* 03B090 8003A490 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03B094 8003A494 240EB200 */ li $t6, -19968 -/* 03B098 8003A498 AFAE001C */ sw $t6, 0x1c($sp) -/* 03B09C 8003A49C 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03B0A0 8003A4A0 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03B0A4 8003A4A4 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03B0A8 8003A4A8 24050005 */ li $a1, 5 -/* 03B0AC 8003A4AC 0C00E4F0 */ jal spawn_player -/* 03B0B0 8003A4B0 AFAD0018 */ sw $t5, 0x18($sp) -/* 03B0B4 8003A4B4 8628000C */ lh $t0, 0xc($s1) -/* 03B0B8 8003A4B8 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03B0BC 8003A4BC 44813000 */ mtc1 $at, $f6 -/* 03B0C0 8003A4C0 00084880 */ sll $t1, $t0, 2 -/* 03B0C4 8003A4C4 02695021 */ addu $t2, $s3, $t1 -/* 03B0C8 8003A4C8 C5440000 */ lwc1 $f4, ($t2) -/* 03B0CC 8003A4CC 862F000E */ lh $t7, 0xe($s1) -/* 03B0D0 8003A4D0 860B000A */ lh $t3, 0xa($s0) -/* 03B0D4 8003A4D4 46062200 */ add.s $f8, $f4, $f6 -/* 03B0D8 8003A4D8 000FC080 */ sll $t8, $t7, 2 -/* 03B0DC 8003A4DC 0258C821 */ addu $t9, $s2, $t8 -/* 03B0E0 8003A4E0 8F260000 */ lw $a2, ($t9) -/* 03B0E4 8003A4E4 44074000 */ mfc1 $a3, $f8 -/* 03B0E8 8003A4E8 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03B0EC 8003A4EC 240CB200 */ li $t4, -19968 -/* 03B0F0 8003A4F0 AFAC001C */ sw $t4, 0x1c($sp) -/* 03B0F4 8003A4F4 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03B0F8 8003A4F8 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03B0FC 8003A4FC E7B60010 */ swc1 $f22, 0x10($sp) -/* 03B100 8003A500 24050006 */ li $a1, 6 -/* 03B104 8003A504 0C00E4F0 */ jal spawn_player -/* 03B108 8003A508 AFAB0018 */ sw $t3, 0x18($sp) -/* 03B10C 8003A50C 8638000E */ lh $t8, 0xe($s1) -/* 03B110 8003A510 3C01437A */ li $at, 0x437A0000 # 250.000000 -/* 03B114 8003A514 44818000 */ mtc1 $at, $f16 -/* 03B118 8003A518 0018C880 */ sll $t9, $t8, 2 -/* 03B11C 8003A51C 02794021 */ addu $t0, $s3, $t9 -/* 03B120 8003A520 C50A0000 */ lwc1 $f10, ($t0) -/* 03B124 8003A524 862D000C */ lh $t5, 0xc($s1) -/* 03B128 8003A528 8609000C */ lh $t1, 0xc($s0) -/* 03B12C 8003A52C 46105480 */ add.s $f18, $f10, $f16 -/* 03B130 8003A530 000D7080 */ sll $t6, $t5, 2 -/* 03B134 8003A534 024E7821 */ addu $t7, $s2, $t6 -/* 03B138 8003A538 8DE60000 */ lw $a2, ($t7) -/* 03B13C 8003A53C 44079000 */ mfc1 $a3, $f18 -/* 03B140 8003A540 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03B144 8003A544 240AB200 */ li $t2, -19968 -/* 03B148 8003A548 AFAA001C */ sw $t2, 0x1c($sp) -/* 03B14C 8003A54C 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03B150 8003A550 E7B40014 */ swc1 $f20, 0x14($sp) -/* 03B154 8003A554 E7B60010 */ swc1 $f22, 0x10($sp) -/* 03B158 8003A558 24050007 */ li $a1, 7 -/* 03B15C 8003A55C 0C00E4F0 */ jal spawn_player -/* 03B160 8003A560 AFA90018 */ sw $t1, 0x18($sp) -/* 03B164 8003A564 240B0001 */ li $t3, 1 -/* 03B168 8003A568 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03B16C 8003A56C AC2B4A28 */ sw $t3, %lo(D_80164A28)($at) -.L8003A570: -/* 03B170 8003A570 0C00E6B9 */ jal func_80039AE4 -/* 03B174 8003A574 00000000 */ nop -/* 03B178 8003A578 8FBF0044 */ lw $ra, 0x44($sp) -/* 03B17C 8003A57C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 03B180 8003A580 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 03B184 8003A584 8FB00034 */ lw $s0, 0x34($sp) -/* 03B188 8003A588 8FB10038 */ lw $s1, 0x38($sp) -/* 03B18C 8003A58C 8FB2003C */ lw $s2, 0x3c($sp) -/* 03B190 8003A590 8FB30040 */ lw $s3, 0x40($sp) -/* 03B194 8003A594 03E00008 */ jr $ra -/* 03B198 8003A598 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_800393C0/func_8003A59C.s b/asm/non_matchings/code_800393C0/func_8003A59C.s deleted file mode 100644 index 528c63dfe..000000000 --- a/asm/non_matchings/code_800393C0/func_8003A59C.s +++ /dev/null @@ -1,287 +0,0 @@ -glabel func_8003A59C -/* 03B19C 8003A59C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 03B1A0 8003A5A0 AFB20040 */ sw $s2, 0x40($sp) -/* 03B1A4 8003A5A4 AFB1003C */ sw $s1, 0x3c($sp) -/* 03B1A8 8003A5A8 AFB00038 */ sw $s0, 0x38($sp) -/* 03B1AC 8003A5AC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 03B1B0 8003A5B0 AFBF0044 */ sw $ra, 0x44($sp) -/* 03B1B4 8003A5B4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 03B1B8 8003A5B8 4486A000 */ mtc1 $a2, $f20 -/* 03B1BC 8003A5BC 00808025 */ move $s0, $a0 -/* 03B1C0 8003A5C0 00A08825 */ move $s1, $a1 -/* 03B1C4 8003A5C4 3C12800F */ lui $s2, %hi(D_800E86A8) # $s2, 0x800f -/* 03B1C8 8003A5C8 265286A8 */ addiu $s2, %lo(D_800E86A8) # addiu $s2, $s2, -0x7958 -/* 03B1CC 8003A5CC 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03B1D0 8003A5D0 8E270008 */ lw $a3, 8($s1) -/* 03B1D4 8003A5D4 8E060008 */ lw $a2, 8($s0) -/* 03B1D8 8003A5D8 4481B000 */ mtc1 $at, $f22 -/* 03B1DC 8003A5DC 824E0000 */ lb $t6, ($s2) -/* 03B1E0 8003A5E0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03B1E4 8003A5E4 240F3000 */ li $t7, 12288 -/* 03B1E8 8003A5E8 AFAF001C */ sw $t7, 0x1c($sp) -/* 03B1EC 8003A5EC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03B1F0 8003A5F0 24050003 */ li $a1, 3 -/* 03B1F4 8003A5F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B1F8 8003A5F8 AFAE0018 */ sw $t6, 0x18($sp) -/* 03B1FC 8003A5FC 0C00E4F0 */ jal spawn_player -/* 03B200 8003A600 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B204 8003A604 8E06000C */ lw $a2, 0xc($s0) -/* 03B208 8003A608 8E27000C */ lw $a3, 0xc($s1) -/* 03B20C 8003A60C 82580000 */ lb $t8, ($s2) -/* 03B210 8003A610 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03B214 8003A614 24193000 */ li $t9, 12288 -/* 03B218 8003A618 AFB9001C */ sw $t9, 0x1c($sp) -/* 03B21C 8003A61C 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03B220 8003A620 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B224 8003A624 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B228 8003A628 24050004 */ li $a1, 4 -/* 03B22C 8003A62C 0C00E4F0 */ jal spawn_player -/* 03B230 8003A630 AFB80018 */ sw $t8, 0x18($sp) -/* 03B234 8003A634 8E060010 */ lw $a2, 0x10($s0) -/* 03B238 8003A638 8E270010 */ lw $a3, 0x10($s1) -/* 03B23C 8003A63C 82480000 */ lb $t0, ($s2) -/* 03B240 8003A640 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03B244 8003A644 24093000 */ li $t1, 12288 -/* 03B248 8003A648 AFA9001C */ sw $t1, 0x1c($sp) -/* 03B24C 8003A64C 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03B250 8003A650 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B254 8003A654 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B258 8003A658 24050005 */ li $a1, 5 -/* 03B25C 8003A65C 0C00E4F0 */ jal spawn_player -/* 03B260 8003A660 AFA80018 */ sw $t0, 0x18($sp) -/* 03B264 8003A664 8E060014 */ lw $a2, 0x14($s0) -/* 03B268 8003A668 8E270014 */ lw $a3, 0x14($s1) -/* 03B26C 8003A66C 824A0000 */ lb $t2, ($s2) -/* 03B270 8003A670 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03B274 8003A674 240B3000 */ li $t3, 12288 -/* 03B278 8003A678 AFAB001C */ sw $t3, 0x1c($sp) -/* 03B27C 8003A67C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03B280 8003A680 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B284 8003A684 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B288 8003A688 24050006 */ li $a1, 6 -/* 03B28C 8003A68C 0C00E4F0 */ jal spawn_player -/* 03B290 8003A690 AFAA0018 */ sw $t2, 0x18($sp) -/* 03B294 8003A694 8E060018 */ lw $a2, 0x18($s0) -/* 03B298 8003A698 8E270018 */ lw $a3, 0x18($s1) -/* 03B29C 8003A69C 824C0000 */ lb $t4, ($s2) -/* 03B2A0 8003A6A0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03B2A4 8003A6A4 240D3000 */ li $t5, 12288 -/* 03B2A8 8003A6A8 AFAD001C */ sw $t5, 0x1c($sp) -/* 03B2AC 8003A6AC 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03B2B0 8003A6B0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B2B4 8003A6B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B2B8 8003A6B8 24050007 */ li $a1, 7 -/* 03B2BC 8003A6BC 0C00E4F0 */ jal spawn_player -/* 03B2C0 8003A6C0 AFAC0018 */ sw $t4, 0x18($sp) -/* 03B2C4 8003A6C4 3C0E800E */ lui $t6, %hi(D_800DC51C) # $t6, 0x800e -/* 03B2C8 8003A6C8 95CEC51C */ lhu $t6, %lo(D_800DC51C)($t6) -/* 03B2CC 8003A6CC 24020001 */ li $v0, 1 -/* 03B2D0 8003A6D0 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03B2D4 8003A6D4 144E0026 */ bne $v0, $t6, .L8003A770 -/* 03B2D8 8003A6D8 3C0B8016 */ lui $t3, %hi(D_8015F890) # $t3, 0x8016 -/* 03B2DC 8003A6DC 8E060000 */ lw $a2, ($s0) -/* 03B2E0 8003A6E0 8E270000 */ lw $a3, ($s1) -/* 03B2E4 8003A6E4 824F0000 */ lb $t7, ($s2) -/* 03B2E8 8003A6E8 2418F000 */ li $t8, -4096 -/* 03B2EC 8003A6EC AFB8001C */ sw $t8, 0x1c($sp) -/* 03B2F0 8003A6F0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B2F4 8003A6F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B2F8 8003A6F8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 03B2FC 8003A6FC 00002825 */ move $a1, $zero -/* 03B300 8003A700 0C00E4F0 */ jal spawn_player -/* 03B304 8003A704 AFAF0018 */ sw $t7, 0x18($sp) -/* 03B308 8003A708 8E060000 */ lw $a2, ($s0) -/* 03B30C 8003A70C 8E270000 */ lw $a3, ($s1) -/* 03B310 8003A710 82590000 */ lb $t9, ($s2) -/* 03B314 8003A714 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03B318 8003A718 24083000 */ li $t0, 12288 -/* 03B31C 8003A71C AFA8001C */ sw $t0, 0x1c($sp) -/* 03B320 8003A720 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03B324 8003A724 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B328 8003A728 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B32C 8003A72C 24050001 */ li $a1, 1 -/* 03B330 8003A730 0C00E4F0 */ jal spawn_player -/* 03B334 8003A734 AFB90018 */ sw $t9, 0x18($sp) -/* 03B338 8003A738 8E060004 */ lw $a2, 4($s0) -/* 03B33C 8003A73C 8E270004 */ lw $a3, 4($s1) -/* 03B340 8003A740 82490000 */ lb $t1, ($s2) -/* 03B344 8003A744 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03B348 8003A748 240A3000 */ li $t2, 12288 -/* 03B34C 8003A74C AFAA001C */ sw $t2, 0x1c($sp) -/* 03B350 8003A750 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03B354 8003A754 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B358 8003A758 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B35C 8003A75C 24050002 */ li $a1, 2 -/* 03B360 8003A760 0C00E4F0 */ jal spawn_player -/* 03B364 8003A764 AFA90018 */ sw $t1, 0x18($sp) -/* 03B368 8003A768 10000096 */ b .L8003A9C4 -/* 03B36C 8003A76C 00000000 */ nop -.L8003A770: -/* 03B370 8003A770 956BF890 */ lhu $t3, %lo(D_8015F890)($t3) -/* 03B374 8003A774 3C04800E */ lui $a0, %hi(D_800DC4FC) # 0x800e -/* 03B378 8003A778 00002825 */ move $a1, $zero -/* 03B37C 8003A77C 104B004B */ beq $v0, $t3, .L8003A8AC -/* 03B380 8003A780 3C0E8016 */ lui $t6, %hi(D_80162DE8) # 0x8016 -/* 03B384 8003A784 8E060000 */ lw $a2, ($s0) -/* 03B388 8003A788 8E270000 */ lw $a3, ($s1) -/* 03B38C 8003A78C 824C0000 */ lb $t4, ($s2) -/* 03B390 8003A790 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03B394 8003A794 240DE000 */ li $t5, -8192 -/* 03B398 8003A798 AFAD001C */ sw $t5, 0x1c($sp) -/* 03B39C 8003A79C 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 03B3A0 8003A7A0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B3A4 8003A7A4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B3A8 8003A7A8 00002825 */ move $a1, $zero -/* 03B3AC 8003A7AC 0C00E4F0 */ jal spawn_player -/* 03B3B0 8003A7B0 AFAC0018 */ sw $t4, 0x18($sp) -/* 03B3B4 8003A7B4 3C0E8016 */ lui $t6, %hi(D_80162DD4) # $t6, 0x8016 -/* 03B3B8 8003A7B8 95CE2DD4 */ lhu $t6, %lo(D_80162DD4)($t6) -/* 03B3BC 8003A7BC 3C04800E */ lui $a0, %hi(D_800DC4E0) # 0x800e -/* 03B3C0 8003A7C0 24050001 */ li $a1, 1 -/* 03B3C4 8003A7C4 15C00010 */ bnez $t6, .L8003A808 -/* 03B3C8 8003A7C8 24083000 */ li $t0, 12288 -/* 03B3CC 8003A7CC 8E060000 */ lw $a2, ($s0) -/* 03B3D0 8003A7D0 8E270000 */ lw $a3, ($s1) -/* 03B3D4 8003A7D4 3C0F8016 */ lui $t7, %hi(D_80162DE0) # $t7, 0x8016 -/* 03B3D8 8003A7D8 8DEF2DE0 */ lw $t7, %lo(D_80162DE0)($t7) -/* 03B3DC 8003A7DC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03B3E0 8003A7E0 2418E100 */ li $t8, -7936 -/* 03B3E4 8003A7E4 AFB8001C */ sw $t8, 0x1c($sp) -/* 03B3E8 8003A7E8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03B3EC 8003A7EC E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B3F0 8003A7F0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B3F4 8003A7F4 24050001 */ li $a1, 1 -/* 03B3F8 8003A7F8 0C00E4F0 */ jal spawn_player -/* 03B3FC 8003A7FC AFAF0018 */ sw $t7, 0x18($sp) -/* 03B400 8003A800 1000000A */ b .L8003A82C -/* 03B404 8003A804 00000000 */ nop -.L8003A808: -/* 03B408 8003A808 8E060000 */ lw $a2, ($s0) -/* 03B40C 8003A80C 8E270000 */ lw $a3, ($s1) -/* 03B410 8003A810 82590000 */ lb $t9, ($s2) -/* 03B414 8003A814 AFA8001C */ sw $t0, 0x1c($sp) -/* 03B418 8003A818 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B41C 8003A81C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B420 8003A820 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) # -0x3b20($a0) -/* 03B424 8003A824 0C00E4F0 */ jal spawn_player -/* 03B428 8003A828 AFB90018 */ sw $t9, 0x18($sp) -.L8003A82C: -/* 03B42C 8003A82C 3C098016 */ lui $t1, %hi(D_80162DD6) # $t1, 0x8016 -/* 03B430 8003A830 95292DD6 */ lhu $t1, %lo(D_80162DD6)($t1) -/* 03B434 8003A834 3C04800E */ lui $a0, 0x800e -/* 03B438 8003A838 24050002 */ li $a1, 2 -/* 03B43C 8003A83C 15200010 */ bnez $t1, .L8003A880 -/* 03B440 8003A840 240D3000 */ li $t5, 12288 -/* 03B444 8003A844 8E060000 */ lw $a2, ($s0) -/* 03B448 8003A848 8E270000 */ lw $a3, ($s1) -/* 03B44C 8003A84C 3C0A8016 */ lui $t2, %hi(D_80162DE4) # $t2, 0x8016 -/* 03B450 8003A850 8D4A2DE4 */ lw $t2, %lo(D_80162DE4)($t2) -/* 03B454 8003A854 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03B458 8003A858 240BE100 */ li $t3, -7936 -/* 03B45C 8003A85C AFAB001C */ sw $t3, 0x1c($sp) -/* 03B460 8003A860 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03B464 8003A864 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B468 8003A868 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B46C 8003A86C 24050002 */ li $a1, 2 -/* 03B470 8003A870 0C00E4F0 */ jal spawn_player -/* 03B474 8003A874 AFAA0018 */ sw $t2, 0x18($sp) -/* 03B478 8003A878 10000052 */ b .L8003A9C4 -/* 03B47C 8003A87C 00000000 */ nop -.L8003A880: -/* 03B480 8003A880 8E060004 */ lw $a2, 4($s0) -/* 03B484 8003A884 8E270004 */ lw $a3, 4($s1) -/* 03B488 8003A888 824C0000 */ lb $t4, ($s2) -/* 03B48C 8003A88C AFAD001C */ sw $t5, 0x1c($sp) -/* 03B490 8003A890 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B494 8003A894 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B498 8003A898 8C84C4E4 */ lw $a0, -0x3b1c($a0) -/* 03B49C 8003A89C 0C00E4F0 */ jal spawn_player -/* 03B4A0 8003A8A0 AFAC0018 */ sw $t4, 0x18($sp) -/* 03B4A4 8003A8A4 10000047 */ b .L8003A9C4 -/* 03B4A8 8003A8A8 00000000 */ nop -.L8003A8AC: -/* 03B4AC 8003A8AC 8E060000 */ lw $a2, ($s0) -/* 03B4B0 8003A8B0 8E270000 */ lw $a3, ($s1) -/* 03B4B4 8003A8B4 8DCE2DE8 */ lw $t6, %lo(D_80162DE8)($t6) -/* 03B4B8 8003A8B8 240FE100 */ li $t7, -7936 -/* 03B4BC 8003A8BC AFAF001C */ sw $t7, 0x1c($sp) -/* 03B4C0 8003A8C0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B4C4 8003A8C4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B4C8 8003A8C8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) # -0x3b04($a0) -/* 03B4CC 8003A8CC 0C00E4F0 */ jal spawn_player -/* 03B4D0 8003A8D0 AFAE0018 */ sw $t6, 0x18($sp) -/* 03B4D4 8003A8D4 3C188016 */ lui $t8, %hi(D_80162DD8) # $t8, 0x8016 -/* 03B4D8 8003A8D8 97182DD8 */ lhu $t8, %lo(D_80162DD8)($t8) -/* 03B4DC 8003A8DC 3C04800E */ lui $a0, 0x800e -/* 03B4E0 8003A8E0 24050001 */ li $a1, 1 -/* 03B4E4 8003A8E4 17000010 */ bnez $t8, .L8003A928 -/* 03B4E8 8003A8E8 240A3000 */ li $t2, 12288 -/* 03B4EC 8003A8EC 8E060000 */ lw $a2, ($s0) -/* 03B4F0 8003A8F0 8E270000 */ lw $a3, ($s1) -/* 03B4F4 8003A8F4 3C198016 */ lui $t9, %hi(D_80162DE0) # $t9, 0x8016 -/* 03B4F8 8003A8F8 8F392DE0 */ lw $t9, %lo(D_80162DE0)($t9) -/* 03B4FC 8003A8FC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03B500 8003A900 2408E100 */ li $t0, -7936 -/* 03B504 8003A904 AFA8001C */ sw $t0, 0x1c($sp) -/* 03B508 8003A908 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03B50C 8003A90C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B510 8003A910 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B514 8003A914 24050001 */ li $a1, 1 -/* 03B518 8003A918 0C00E4F0 */ jal spawn_player -/* 03B51C 8003A91C AFB90018 */ sw $t9, 0x18($sp) -/* 03B520 8003A920 1000000A */ b .L8003A94C -/* 03B524 8003A924 00000000 */ nop -.L8003A928: -/* 03B528 8003A928 8E060000 */ lw $a2, ($s0) -/* 03B52C 8003A92C 8E270000 */ lw $a3, ($s1) -/* 03B530 8003A930 82490000 */ lb $t1, ($s2) -/* 03B534 8003A934 AFAA001C */ sw $t2, 0x1c($sp) -/* 03B538 8003A938 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B53C 8003A93C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B540 8003A940 8C84C4E0 */ lw $a0, -0x3b20($a0) -/* 03B544 8003A944 0C00E4F0 */ jal spawn_player -/* 03B548 8003A948 AFA90018 */ sw $t1, 0x18($sp) -.L8003A94C: -/* 03B54C 8003A94C 3C0B8016 */ lui $t3, %hi(D_80162DD6) # $t3, 0x8016 -/* 03B550 8003A950 956B2DD6 */ lhu $t3, %lo(D_80162DD6)($t3) -/* 03B554 8003A954 3C04800E */ lui $a0, 0x800e -/* 03B558 8003A958 24050002 */ li $a1, 2 -/* 03B55C 8003A95C 15600010 */ bnez $t3, .L8003A9A0 -/* 03B560 8003A960 240F3000 */ li $t7, 12288 -/* 03B564 8003A964 8E060000 */ lw $a2, ($s0) -/* 03B568 8003A968 8E270000 */ lw $a3, ($s1) -/* 03B56C 8003A96C 3C0C8016 */ lui $t4, %hi(D_80162DE4) # $t4, 0x8016 -/* 03B570 8003A970 8D8C2DE4 */ lw $t4, %lo(D_80162DE4)($t4) -/* 03B574 8003A974 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03B578 8003A978 240DE100 */ li $t5, -7936 -/* 03B57C 8003A97C AFAD001C */ sw $t5, 0x1c($sp) -/* 03B580 8003A980 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03B584 8003A984 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B588 8003A988 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B58C 8003A98C 24050002 */ li $a1, 2 -/* 03B590 8003A990 0C00E4F0 */ jal spawn_player -/* 03B594 8003A994 AFAC0018 */ sw $t4, 0x18($sp) -/* 03B598 8003A998 1000000A */ b .L8003A9C4 -/* 03B59C 8003A99C 00000000 */ nop -.L8003A9A0: -/* 03B5A0 8003A9A0 8E060004 */ lw $a2, 4($s0) -/* 03B5A4 8003A9A4 8E270004 */ lw $a3, 4($s1) -/* 03B5A8 8003A9A8 824E0000 */ lb $t6, ($s2) -/* 03B5AC 8003A9AC AFAF001C */ sw $t7, 0x1c($sp) -/* 03B5B0 8003A9B0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03B5B4 8003A9B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03B5B8 8003A9B8 8C84C4E4 */ lw $a0, -0x3b1c($a0) -/* 03B5BC 8003A9BC 0C00E4F0 */ jal spawn_player -/* 03B5C0 8003A9C0 AFAE0018 */ sw $t6, 0x18($sp) -.L8003A9C4: -/* 03B5C4 8003A9C4 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03B5C8 8003A9C8 0C00E6B9 */ jal func_80039AE4 -/* 03B5CC 8003A9CC AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03B5D0 8003A9D0 8FBF0044 */ lw $ra, 0x44($sp) -/* 03B5D4 8003A9D4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 03B5D8 8003A9D8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 03B5DC 8003A9DC 8FB00038 */ lw $s0, 0x38($sp) -/* 03B5E0 8003A9E0 8FB1003C */ lw $s1, 0x3c($sp) -/* 03B5E4 8003A9E4 8FB20040 */ lw $s2, 0x40($sp) -/* 03B5E8 8003A9E8 03E00008 */ jr $ra -/* 03B5EC 8003A9EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_800393C0/func_8003AE24.s b/asm/non_matchings/code_800393C0/func_8003AE24.s deleted file mode 100644 index 2bf04652e..000000000 --- a/asm/non_matchings/code_800393C0/func_8003AE24.s +++ /dev/null @@ -1,162 +0,0 @@ -glabel func_8003AE24 -/* 03BA24 8003AE24 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 03BA28 8003AE28 AFB20040 */ sw $s2, 0x40($sp) -/* 03BA2C 8003AE2C AFB1003C */ sw $s1, 0x3c($sp) -/* 03BA30 8003AE30 AFB00038 */ sw $s0, 0x38($sp) -/* 03BA34 8003AE34 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 03BA38 8003AE38 AFBF0044 */ sw $ra, 0x44($sp) -/* 03BA3C 8003AE3C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 03BA40 8003AE40 4486A000 */ mtc1 $a2, $f20 -/* 03BA44 8003AE44 00808025 */ move $s0, $a0 -/* 03BA48 8003AE48 00A08825 */ move $s1, $a1 -/* 03BA4C 8003AE4C 3C12800F */ lui $s2, %hi(D_800E86A8) # $s2, 0x800f -/* 03BA50 8003AE50 265286A8 */ addiu $s2, %lo(D_800E86A8) # addiu $s2, $s2, -0x7958 -/* 03BA54 8003AE54 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03BA58 8003AE58 8E270004 */ lw $a3, 4($s1) -/* 03BA5C 8003AE5C 8E060004 */ lw $a2, 4($s0) -/* 03BA60 8003AE60 4481B000 */ mtc1 $at, $f22 -/* 03BA64 8003AE64 824E0000 */ lb $t6, ($s2) -/* 03BA68 8003AE68 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03BA6C 8003AE6C 240F3000 */ li $t7, 12288 -/* 03BA70 8003AE70 AFAF001C */ sw $t7, 0x1c($sp) -/* 03BA74 8003AE74 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03BA78 8003AE78 24050002 */ li $a1, 2 -/* 03BA7C 8003AE7C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BA80 8003AE80 AFAE0018 */ sw $t6, 0x18($sp) -/* 03BA84 8003AE84 0C00E4F0 */ jal spawn_player -/* 03BA88 8003AE88 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BA8C 8003AE8C 8E060008 */ lw $a2, 8($s0) -/* 03BA90 8003AE90 8E270008 */ lw $a3, 8($s1) -/* 03BA94 8003AE94 82580000 */ lb $t8, ($s2) -/* 03BA98 8003AE98 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03BA9C 8003AE9C 24193000 */ li $t9, 12288 -/* 03BAA0 8003AEA0 AFB9001C */ sw $t9, 0x1c($sp) -/* 03BAA4 8003AEA4 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03BAA8 8003AEA8 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BAAC 8003AEAC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BAB0 8003AEB0 24050003 */ li $a1, 3 -/* 03BAB4 8003AEB4 0C00E4F0 */ jal spawn_player -/* 03BAB8 8003AEB8 AFB80018 */ sw $t8, 0x18($sp) -/* 03BABC 8003AEBC 8E06000C */ lw $a2, 0xc($s0) -/* 03BAC0 8003AEC0 8E27000C */ lw $a3, 0xc($s1) -/* 03BAC4 8003AEC4 82480000 */ lb $t0, ($s2) -/* 03BAC8 8003AEC8 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03BACC 8003AECC 24093000 */ li $t1, 12288 -/* 03BAD0 8003AED0 AFA9001C */ sw $t1, 0x1c($sp) -/* 03BAD4 8003AED4 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03BAD8 8003AED8 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BADC 8003AEDC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BAE0 8003AEE0 24050004 */ li $a1, 4 -/* 03BAE4 8003AEE4 0C00E4F0 */ jal spawn_player -/* 03BAE8 8003AEE8 AFA80018 */ sw $t0, 0x18($sp) -/* 03BAEC 8003AEEC 8E060010 */ lw $a2, 0x10($s0) -/* 03BAF0 8003AEF0 8E270010 */ lw $a3, 0x10($s1) -/* 03BAF4 8003AEF4 824A0000 */ lb $t2, ($s2) -/* 03BAF8 8003AEF8 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03BAFC 8003AEFC 240B3000 */ li $t3, 12288 -/* 03BB00 8003AF00 AFAB001C */ sw $t3, 0x1c($sp) -/* 03BB04 8003AF04 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03BB08 8003AF08 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BB0C 8003AF0C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BB10 8003AF10 24050005 */ li $a1, 5 -/* 03BB14 8003AF14 0C00E4F0 */ jal spawn_player -/* 03BB18 8003AF18 AFAA0018 */ sw $t2, 0x18($sp) -/* 03BB1C 8003AF1C 8E060014 */ lw $a2, 0x14($s0) -/* 03BB20 8003AF20 8E270014 */ lw $a3, 0x14($s1) -/* 03BB24 8003AF24 824C0000 */ lb $t4, ($s2) -/* 03BB28 8003AF28 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03BB2C 8003AF2C 240D3000 */ li $t5, 12288 -/* 03BB30 8003AF30 AFAD001C */ sw $t5, 0x1c($sp) -/* 03BB34 8003AF34 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03BB38 8003AF38 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BB3C 8003AF3C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BB40 8003AF40 24050006 */ li $a1, 6 -/* 03BB44 8003AF44 0C00E4F0 */ jal spawn_player -/* 03BB48 8003AF48 AFAC0018 */ sw $t4, 0x18($sp) -/* 03BB4C 8003AF4C 8E060018 */ lw $a2, 0x18($s0) -/* 03BB50 8003AF50 8E270018 */ lw $a3, 0x18($s1) -/* 03BB54 8003AF54 824E0000 */ lb $t6, ($s2) -/* 03BB58 8003AF58 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03BB5C 8003AF5C 240F3000 */ li $t7, 12288 -/* 03BB60 8003AF60 AFAF001C */ sw $t7, 0x1c($sp) -/* 03BB64 8003AF64 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03BB68 8003AF68 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BB6C 8003AF6C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BB70 8003AF70 24050007 */ li $a1, 7 -/* 03BB74 8003AF74 0C00E4F0 */ jal spawn_player -/* 03BB78 8003AF78 AFAE0018 */ sw $t6, 0x18($sp) -/* 03BB7C 8003AF7C 3C18800E */ lui $t8, %hi(D_800DC51C) # $t8, 0x800e -/* 03BB80 8003AF80 9718C51C */ lhu $t8, %lo(D_800DC51C)($t8) -/* 03BB84 8003AF84 24010001 */ li $at, 1 -/* 03BB88 8003AF88 3C04800E */ lui $a0, 0x800e -/* 03BB8C 8003AF8C 1701000F */ bne $t8, $at, .L8003AFCC -/* 03BB90 8003AF90 00002825 */ move $a1, $zero -/* 03BB94 8003AF94 8E060000 */ lw $a2, ($s0) -/* 03BB98 8003AF98 8E270000 */ lw $a3, ($s1) -/* 03BB9C 8003AF9C 82590000 */ lb $t9, ($s2) -/* 03BBA0 8003AFA0 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03BBA4 8003AFA4 2408F000 */ li $t0, -4096 -/* 03BBA8 8003AFA8 AFA8001C */ sw $t0, 0x1c($sp) -/* 03BBAC 8003AFAC 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 03BBB0 8003AFB0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BBB4 8003AFB4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BBB8 8003AFB8 00002825 */ move $a1, $zero -/* 03BBBC 8003AFBC 0C00E4F0 */ jal spawn_player -/* 03BBC0 8003AFC0 AFB90018 */ sw $t9, 0x18($sp) -/* 03BBC4 8003AFC4 1000000B */ b .L8003AFF4 -/* 03BBC8 8003AFC8 00000000 */ nop -.L8003AFCC: -/* 03BBCC 8003AFCC 8E060000 */ lw $a2, ($s0) -/* 03BBD0 8003AFD0 8E270000 */ lw $a3, ($s1) -/* 03BBD4 8003AFD4 82490000 */ lb $t1, ($s2) -/* 03BBD8 8003AFD8 240AE000 */ li $t2, -8192 -/* 03BBDC 8003AFDC AFAA001C */ sw $t2, 0x1c($sp) -/* 03BBE0 8003AFE0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BBE4 8003AFE4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BBE8 8003AFE8 8C84C4FC */ lw $a0, -0x3b04($a0) -/* 03BBEC 8003AFEC 0C00E4F0 */ jal spawn_player -/* 03BBF0 8003AFF0 AFA90018 */ sw $t1, 0x18($sp) -.L8003AFF4: -/* 03BBF4 8003AFF4 3C0B800E */ lui $t3, %hi(D_800DC51C) # $t3, 0x800e -/* 03BBF8 8003AFF8 956BC51C */ lhu $t3, %lo(D_800DC51C)($t3) -/* 03BBFC 8003AFFC 24010001 */ li $at, 1 -/* 03BC00 8003B000 3C04800E */ lui $a0, 0x800e -/* 03BC04 8003B004 1561000F */ bne $t3, $at, .L8003B044 -/* 03BC08 8003B008 24050001 */ li $a1, 1 -/* 03BC0C 8003B00C 8E060004 */ lw $a2, 4($s0) -/* 03BC10 8003B010 8E270004 */ lw $a3, 4($s1) -/* 03BC14 8003B014 824C0001 */ lb $t4, 1($s2) -/* 03BC18 8003B018 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03BC1C 8003B01C 240DF000 */ li $t5, -4096 -/* 03BC20 8003B020 AFAD001C */ sw $t5, 0x1c($sp) -/* 03BC24 8003B024 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03BC28 8003B028 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BC2C 8003B02C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BC30 8003B030 24050001 */ li $a1, 1 -/* 03BC34 8003B034 0C00E4F0 */ jal spawn_player -/* 03BC38 8003B038 AFAC0018 */ sw $t4, 0x18($sp) -/* 03BC3C 8003B03C 1000000B */ b .L8003B06C -/* 03BC40 8003B040 00000000 */ nop -.L8003B044: -/* 03BC44 8003B044 8E060004 */ lw $a2, 4($s0) -/* 03BC48 8003B048 8E270004 */ lw $a3, 4($s1) -/* 03BC4C 8003B04C 824E0001 */ lb $t6, 1($s2) -/* 03BC50 8003B050 240FE000 */ li $t7, -8192 -/* 03BC54 8003B054 AFAF001C */ sw $t7, 0x1c($sp) -/* 03BC58 8003B058 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BC5C 8003B05C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BC60 8003B060 8C84C4E0 */ lw $a0, -0x3b20($a0) -/* 03BC64 8003B064 0C00E4F0 */ jal spawn_player -/* 03BC68 8003B068 AFAE0018 */ sw $t6, 0x18($sp) -.L8003B06C: -/* 03BC6C 8003B06C 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03BC70 8003B070 0C00E6B9 */ jal func_80039AE4 -/* 03BC74 8003B074 AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03BC78 8003B078 8FBF0044 */ lw $ra, 0x44($sp) -/* 03BC7C 8003B07C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 03BC80 8003B080 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 03BC84 8003B084 8FB00038 */ lw $s0, 0x38($sp) -/* 03BC88 8003B088 8FB1003C */ lw $s1, 0x3c($sp) -/* 03BC8C 8003B08C 8FB20040 */ lw $s2, 0x40($sp) -/* 03BC90 8003B090 03E00008 */ jr $ra -/* 03BC94 8003B094 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_800393C0/func_8003B318.s b/asm/non_matchings/code_800393C0/func_8003B318.s deleted file mode 100644 index b5d27efe9..000000000 --- a/asm/non_matchings/code_800393C0/func_8003B318.s +++ /dev/null @@ -1,163 +0,0 @@ -glabel func_8003B318 -/* 03BF18 8003B318 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 03BF1C 8003B31C AFB20040 */ sw $s2, 0x40($sp) -/* 03BF20 8003B320 AFB1003C */ sw $s1, 0x3c($sp) -/* 03BF24 8003B324 AFB00038 */ sw $s0, 0x38($sp) -/* 03BF28 8003B328 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 03BF2C 8003B32C AFBF0044 */ sw $ra, 0x44($sp) -/* 03BF30 8003B330 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 03BF34 8003B334 4486A000 */ mtc1 $a2, $f20 -/* 03BF38 8003B338 00808025 */ move $s0, $a0 -/* 03BF3C 8003B33C 00A08825 */ move $s1, $a1 -/* 03BF40 8003B340 3C12800F */ lui $s2, %hi(D_800E86A8) # $s2, 0x800f -/* 03BF44 8003B344 265286A8 */ addiu $s2, %lo(D_800E86A8) # addiu $s2, $s2, -0x7958 -/* 03BF48 8003B348 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03BF4C 8003B34C 8E270000 */ lw $a3, ($s1) -/* 03BF50 8003B350 8E060000 */ lw $a2, ($s0) -/* 03BF54 8003B354 4481B000 */ mtc1 $at, $f22 -/* 03BF58 8003B358 824E0000 */ lb $t6, ($s2) -/* 03BF5C 8003B35C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03BF60 8003B360 240FE000 */ li $t7, -8192 -/* 03BF64 8003B364 AFAF001C */ sw $t7, 0x1c($sp) -/* 03BF68 8003B368 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03BF6C 8003B36C 00002825 */ move $a1, $zero -/* 03BF70 8003B370 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BF74 8003B374 AFAE0018 */ sw $t6, 0x18($sp) -/* 03BF78 8003B378 0C00E4F0 */ jal spawn_player -/* 03BF7C 8003B37C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BF80 8003B380 8E060004 */ lw $a2, 4($s0) -/* 03BF84 8003B384 8E270004 */ lw $a3, 4($s1) -/* 03BF88 8003B388 82580001 */ lb $t8, 1($s2) -/* 03BF8C 8003B38C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03BF90 8003B390 2419E000 */ li $t9, -8192 -/* 03BF94 8003B394 AFB9001C */ sw $t9, 0x1c($sp) -/* 03BF98 8003B398 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03BF9C 8003B39C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BFA0 8003B3A0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BFA4 8003B3A4 24050001 */ li $a1, 1 -/* 03BFA8 8003B3A8 0C00E4F0 */ jal spawn_player -/* 03BFAC 8003B3AC AFB80018 */ sw $t8, 0x18($sp) -/* 03BFB0 8003B3B0 8E060008 */ lw $a2, 8($s0) -/* 03BFB4 8003B3B4 8E270008 */ lw $a3, 8($s1) -/* 03BFB8 8003B3B8 82480002 */ lb $t0, 2($s2) -/* 03BFBC 8003B3BC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03BFC0 8003B3C0 2409E000 */ li $t1, -8192 -/* 03BFC4 8003B3C4 AFA9001C */ sw $t1, 0x1c($sp) -/* 03BFC8 8003B3C8 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03BFCC 8003B3CC E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BFD0 8003B3D0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BFD4 8003B3D4 24050002 */ li $a1, 2 -/* 03BFD8 8003B3D8 0C00E4F0 */ jal spawn_player -/* 03BFDC 8003B3DC AFA80018 */ sw $t0, 0x18($sp) -/* 03BFE0 8003B3E0 3C0A800E */ lui $t2, %hi(D_800DC51C) # $t2, 0x800e -/* 03BFE4 8003B3E4 954AC51C */ lhu $t2, %lo(D_800DC51C)($t2) -/* 03BFE8 8003B3E8 24010001 */ li $at, 1 -/* 03BFEC 8003B3EC 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03BFF0 8003B3F0 15410023 */ bne $t2, $at, .L8003B480 -/* 03BFF4 8003B3F4 00002825 */ move $a1, $zero -/* 03BFF8 8003B3F8 8E060000 */ lw $a2, ($s0) -/* 03BFFC 8003B3FC 8E270000 */ lw $a3, ($s1) -/* 03C000 8003B400 824B0000 */ lb $t3, ($s2) -/* 03C004 8003B404 240CF000 */ li $t4, -4096 -/* 03C008 8003B408 AFAC001C */ sw $t4, 0x1c($sp) -/* 03C00C 8003B40C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C010 8003B410 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C014 8003B414 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03C018 8003B418 0C00E4F0 */ jal spawn_player -/* 03C01C 8003B41C AFAB0018 */ sw $t3, 0x18($sp) -/* 03C020 8003B420 8E060004 */ lw $a2, 4($s0) -/* 03C024 8003B424 8E270004 */ lw $a3, 4($s1) -/* 03C028 8003B428 824D0001 */ lb $t5, 1($s2) -/* 03C02C 8003B42C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03C030 8003B430 240EF000 */ li $t6, -4096 -/* 03C034 8003B434 AFAE001C */ sw $t6, 0x1c($sp) -/* 03C038 8003B438 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03C03C 8003B43C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C040 8003B440 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C044 8003B444 24050001 */ li $a1, 1 -/* 03C048 8003B448 0C00E4F0 */ jal spawn_player -/* 03C04C 8003B44C AFAD0018 */ sw $t5, 0x18($sp) -/* 03C050 8003B450 8E060008 */ lw $a2, 8($s0) -/* 03C054 8003B454 8E270008 */ lw $a3, 8($s1) -/* 03C058 8003B458 824F0002 */ lb $t7, 2($s2) -/* 03C05C 8003B45C 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03C060 8003B460 2418F000 */ li $t8, -4096 -/* 03C064 8003B464 AFB8001C */ sw $t8, 0x1c($sp) -/* 03C068 8003B468 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03C06C 8003B46C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C070 8003B470 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C074 8003B474 24050002 */ li $a1, 2 -/* 03C078 8003B478 0C00E4F0 */ jal spawn_player -/* 03C07C 8003B47C AFAF0018 */ sw $t7, 0x18($sp) -.L8003B480: -/* 03C080 8003B480 8E06000C */ lw $a2, 0xc($s0) -/* 03C084 8003B484 8E27000C */ lw $a3, 0xc($s1) -/* 03C088 8003B488 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03C08C 8003B48C 24190003 */ li $t9, 3 -/* 03C090 8003B490 24083000 */ li $t0, 12288 -/* 03C094 8003B494 AFA8001C */ sw $t0, 0x1c($sp) -/* 03C098 8003B498 AFB90018 */ sw $t9, 0x18($sp) -/* 03C09C 8003B49C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03C0A0 8003B4A0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C0A4 8003B4A4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C0A8 8003B4A8 0C00E4F0 */ jal spawn_player -/* 03C0AC 8003B4AC 24050003 */ li $a1, 3 -/* 03C0B0 8003B4B0 8E060010 */ lw $a2, 0x10($s0) -/* 03C0B4 8003B4B4 8E270010 */ lw $a3, 0x10($s1) -/* 03C0B8 8003B4B8 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03C0BC 8003B4BC 24090004 */ li $t1, 4 -/* 03C0C0 8003B4C0 240A3000 */ li $t2, 12288 -/* 03C0C4 8003B4C4 AFAA001C */ sw $t2, 0x1c($sp) -/* 03C0C8 8003B4C8 AFA90018 */ sw $t1, 0x18($sp) -/* 03C0CC 8003B4CC 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03C0D0 8003B4D0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C0D4 8003B4D4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C0D8 8003B4D8 0C00E4F0 */ jal spawn_player -/* 03C0DC 8003B4DC 24050004 */ li $a1, 4 -/* 03C0E0 8003B4E0 8E060014 */ lw $a2, 0x14($s0) -/* 03C0E4 8003B4E4 8E270014 */ lw $a3, 0x14($s1) -/* 03C0E8 8003B4E8 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03C0EC 8003B4EC 240B0005 */ li $t3, 5 -/* 03C0F0 8003B4F0 240C3000 */ li $t4, 12288 -/* 03C0F4 8003B4F4 AFAC001C */ sw $t4, 0x1c($sp) -/* 03C0F8 8003B4F8 AFAB0018 */ sw $t3, 0x18($sp) -/* 03C0FC 8003B4FC 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03C100 8003B500 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C104 8003B504 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C108 8003B508 0C00E4F0 */ jal spawn_player -/* 03C10C 8003B50C 24050005 */ li $a1, 5 -/* 03C110 8003B510 8E060018 */ lw $a2, 0x18($s0) -/* 03C114 8003B514 8E270018 */ lw $a3, 0x18($s1) -/* 03C118 8003B518 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03C11C 8003B51C 240D0006 */ li $t5, 6 -/* 03C120 8003B520 240E3000 */ li $t6, 12288 -/* 03C124 8003B524 AFAE001C */ sw $t6, 0x1c($sp) -/* 03C128 8003B528 AFAD0018 */ sw $t5, 0x18($sp) -/* 03C12C 8003B52C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03C130 8003B530 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C134 8003B534 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C138 8003B538 0C00E4F0 */ jal spawn_player -/* 03C13C 8003B53C 24050006 */ li $a1, 6 -/* 03C140 8003B540 8E060000 */ lw $a2, ($s0) -/* 03C144 8003B544 8E270000 */ lw $a3, ($s1) -/* 03C148 8003B548 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03C14C 8003B54C 240F0007 */ li $t7, 7 -/* 03C150 8003B550 24183000 */ li $t8, 12288 -/* 03C154 8003B554 AFB8001C */ sw $t8, 0x1c($sp) -/* 03C158 8003B558 AFAF0018 */ sw $t7, 0x18($sp) -/* 03C15C 8003B55C 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03C160 8003B560 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C164 8003B564 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C168 8003B568 0C00E4F0 */ jal spawn_player -/* 03C16C 8003B56C 24050007 */ li $a1, 7 -/* 03C170 8003B570 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03C174 8003B574 0C00E6B9 */ jal func_80039AE4 -/* 03C178 8003B578 AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03C17C 8003B57C 8FBF0044 */ lw $ra, 0x44($sp) -/* 03C180 8003B580 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 03C184 8003B584 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 03C188 8003B588 8FB00038 */ lw $s0, 0x38($sp) -/* 03C18C 8003B58C 8FB1003C */ lw $s1, 0x3c($sp) -/* 03C190 8003B590 8FB20040 */ lw $s2, 0x40($sp) -/* 03C194 8003B594 03E00008 */ jr $ra -/* 03C198 8003B598 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_800393C0/func_8003B870.s b/asm/non_matchings/code_800393C0/func_8003B870.s deleted file mode 100644 index 15654e64d..000000000 --- a/asm/non_matchings/code_800393C0/func_8003B870.s +++ /dev/null @@ -1,175 +0,0 @@ -glabel func_8003B870 -/* 03C470 8003B870 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 03C474 8003B874 AFB20040 */ sw $s2, 0x40($sp) -/* 03C478 8003B878 AFB1003C */ sw $s1, 0x3c($sp) -/* 03C47C 8003B87C AFB00038 */ sw $s0, 0x38($sp) -/* 03C480 8003B880 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 03C484 8003B884 AFBF0044 */ sw $ra, 0x44($sp) -/* 03C488 8003B888 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 03C48C 8003B88C 4486A000 */ mtc1 $a2, $f20 -/* 03C490 8003B890 00808025 */ move $s0, $a0 -/* 03C494 8003B894 00A08825 */ move $s1, $a1 -/* 03C498 8003B898 3C12800F */ lui $s2, %hi(D_800E86A8) # $s2, 0x800f -/* 03C49C 8003B89C 265286A8 */ addiu $s2, %lo(D_800E86A8) # addiu $s2, $s2, -0x7958 -/* 03C4A0 8003B8A0 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C4A4 8003B8A4 8E270000 */ lw $a3, ($s1) -/* 03C4A8 8003B8A8 8E060000 */ lw $a2, ($s0) -/* 03C4AC 8003B8AC 4481B000 */ mtc1 $at, $f22 -/* 03C4B0 8003B8B0 824E0000 */ lb $t6, ($s2) -/* 03C4B4 8003B8B4 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03C4B8 8003B8B8 240FE000 */ li $t7, -8192 -/* 03C4BC 8003B8BC AFAF001C */ sw $t7, 0x1c($sp) -/* 03C4C0 8003B8C0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03C4C4 8003B8C4 00002825 */ move $a1, $zero -/* 03C4C8 8003B8C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C4CC 8003B8CC AFAE0018 */ sw $t6, 0x18($sp) -/* 03C4D0 8003B8D0 0C00E4F0 */ jal spawn_player -/* 03C4D4 8003B8D4 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C4D8 8003B8D8 8E060004 */ lw $a2, 4($s0) -/* 03C4DC 8003B8DC 8E270004 */ lw $a3, 4($s1) -/* 03C4E0 8003B8E0 82580001 */ lb $t8, 1($s2) -/* 03C4E4 8003B8E4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03C4E8 8003B8E8 2419E000 */ li $t9, -8192 -/* 03C4EC 8003B8EC AFB9001C */ sw $t9, 0x1c($sp) -/* 03C4F0 8003B8F0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03C4F4 8003B8F4 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C4F8 8003B8F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C4FC 8003B8FC 24050001 */ li $a1, 1 -/* 03C500 8003B900 0C00E4F0 */ jal spawn_player -/* 03C504 8003B904 AFB80018 */ sw $t8, 0x18($sp) -/* 03C508 8003B908 8E060008 */ lw $a2, 8($s0) -/* 03C50C 8003B90C 8E270008 */ lw $a3, 8($s1) -/* 03C510 8003B910 82480002 */ lb $t0, 2($s2) -/* 03C514 8003B914 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03C518 8003B918 2409E000 */ li $t1, -8192 -/* 03C51C 8003B91C AFA9001C */ sw $t1, 0x1c($sp) -/* 03C520 8003B920 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03C524 8003B924 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C528 8003B928 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C52C 8003B92C 24050002 */ li $a1, 2 -/* 03C530 8003B930 0C00E4F0 */ jal spawn_player -/* 03C534 8003B934 AFA80018 */ sw $t0, 0x18($sp) -/* 03C538 8003B938 8E06000C */ lw $a2, 0xc($s0) -/* 03C53C 8003B93C 8E27000C */ lw $a3, 0xc($s1) -/* 03C540 8003B940 824A0003 */ lb $t2, 3($s2) -/* 03C544 8003B944 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03C548 8003B948 240BE000 */ li $t3, -8192 -/* 03C54C 8003B94C AFAB001C */ sw $t3, 0x1c($sp) -/* 03C550 8003B950 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03C554 8003B954 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C558 8003B958 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C55C 8003B95C 24050003 */ li $a1, 3 -/* 03C560 8003B960 0C00E4F0 */ jal spawn_player -/* 03C564 8003B964 AFAA0018 */ sw $t2, 0x18($sp) -/* 03C568 8003B968 3C0C800E */ lui $t4, %hi(D_800DC51C) # $t4, 0x800e -/* 03C56C 8003B96C 958CC51C */ lhu $t4, %lo(D_800DC51C)($t4) -/* 03C570 8003B970 24010001 */ li $at, 1 -/* 03C574 8003B974 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03C578 8003B978 1581002F */ bne $t4, $at, .L8003BA38 -/* 03C57C 8003B97C 00002825 */ move $a1, $zero -/* 03C580 8003B980 8E060000 */ lw $a2, ($s0) -/* 03C584 8003B984 8E270000 */ lw $a3, ($s1) -/* 03C588 8003B988 824D0000 */ lb $t5, ($s2) -/* 03C58C 8003B98C 240EF000 */ li $t6, -4096 -/* 03C590 8003B990 AFAE001C */ sw $t6, 0x1c($sp) -/* 03C594 8003B994 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C598 8003B998 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C59C 8003B99C 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03C5A0 8003B9A0 0C00E4F0 */ jal spawn_player -/* 03C5A4 8003B9A4 AFAD0018 */ sw $t5, 0x18($sp) -/* 03C5A8 8003B9A8 8E060004 */ lw $a2, 4($s0) -/* 03C5AC 8003B9AC 8E270004 */ lw $a3, 4($s1) -/* 03C5B0 8003B9B0 824F0001 */ lb $t7, 1($s2) -/* 03C5B4 8003B9B4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03C5B8 8003B9B8 2418F000 */ li $t8, -4096 -/* 03C5BC 8003B9BC AFB8001C */ sw $t8, 0x1c($sp) -/* 03C5C0 8003B9C0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03C5C4 8003B9C4 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C5C8 8003B9C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C5CC 8003B9CC 24050001 */ li $a1, 1 -/* 03C5D0 8003B9D0 0C00E4F0 */ jal spawn_player -/* 03C5D4 8003B9D4 AFAF0018 */ sw $t7, 0x18($sp) -/* 03C5D8 8003B9D8 8E060008 */ lw $a2, 8($s0) -/* 03C5DC 8003B9DC 8E270008 */ lw $a3, 8($s1) -/* 03C5E0 8003B9E0 82590002 */ lb $t9, 2($s2) -/* 03C5E4 8003B9E4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03C5E8 8003B9E8 2408F000 */ li $t0, -4096 -/* 03C5EC 8003B9EC AFA8001C */ sw $t0, 0x1c($sp) -/* 03C5F0 8003B9F0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03C5F4 8003B9F4 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C5F8 8003B9F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C5FC 8003B9FC 24050002 */ li $a1, 2 -/* 03C600 8003BA00 0C00E4F0 */ jal spawn_player -/* 03C604 8003BA04 AFB90018 */ sw $t9, 0x18($sp) -/* 03C608 8003BA08 8E06000C */ lw $a2, 0xc($s0) -/* 03C60C 8003BA0C 8E27000C */ lw $a3, 0xc($s1) -/* 03C610 8003BA10 82490003 */ lb $t1, 3($s2) -/* 03C614 8003BA14 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03C618 8003BA18 240AF000 */ li $t2, -4096 -/* 03C61C 8003BA1C AFAA001C */ sw $t2, 0x1c($sp) -/* 03C620 8003BA20 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03C624 8003BA24 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C628 8003BA28 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C62C 8003BA2C 24050003 */ li $a1, 3 -/* 03C630 8003BA30 0C00E4F0 */ jal spawn_player -/* 03C634 8003BA34 AFA90018 */ sw $t1, 0x18($sp) -.L8003BA38: -/* 03C638 8003BA38 8E060010 */ lw $a2, 0x10($s0) -/* 03C63C 8003BA3C 8E270010 */ lw $a3, 0x10($s1) -/* 03C640 8003BA40 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03C644 8003BA44 240B0004 */ li $t3, 4 -/* 03C648 8003BA48 240C3000 */ li $t4, 12288 -/* 03C64C 8003BA4C AFAC001C */ sw $t4, 0x1c($sp) -/* 03C650 8003BA50 AFAB0018 */ sw $t3, 0x18($sp) -/* 03C654 8003BA54 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03C658 8003BA58 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C65C 8003BA5C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C660 8003BA60 0C00E4F0 */ jal spawn_player -/* 03C664 8003BA64 24050004 */ li $a1, 4 -/* 03C668 8003BA68 8E060014 */ lw $a2, 0x14($s0) -/* 03C66C 8003BA6C 8E270014 */ lw $a3, 0x14($s1) -/* 03C670 8003BA70 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03C674 8003BA74 240D0005 */ li $t5, 5 -/* 03C678 8003BA78 240E3000 */ li $t6, 12288 -/* 03C67C 8003BA7C AFAE001C */ sw $t6, 0x1c($sp) -/* 03C680 8003BA80 AFAD0018 */ sw $t5, 0x18($sp) -/* 03C684 8003BA84 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03C688 8003BA88 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C68C 8003BA8C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C690 8003BA90 0C00E4F0 */ jal spawn_player -/* 03C694 8003BA94 24050005 */ li $a1, 5 -/* 03C698 8003BA98 8E060018 */ lw $a2, 0x18($s0) -/* 03C69C 8003BA9C 8E270018 */ lw $a3, 0x18($s1) -/* 03C6A0 8003BAA0 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03C6A4 8003BAA4 240F0006 */ li $t7, 6 -/* 03C6A8 8003BAA8 24183000 */ li $t8, 12288 -/* 03C6AC 8003BAAC AFB8001C */ sw $t8, 0x1c($sp) -/* 03C6B0 8003BAB0 AFAF0018 */ sw $t7, 0x18($sp) -/* 03C6B4 8003BAB4 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03C6B8 8003BAB8 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C6BC 8003BABC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C6C0 8003BAC0 0C00E4F0 */ jal spawn_player -/* 03C6C4 8003BAC4 24050006 */ li $a1, 6 -/* 03C6C8 8003BAC8 8E060000 */ lw $a2, ($s0) -/* 03C6CC 8003BACC 8E270000 */ lw $a3, ($s1) -/* 03C6D0 8003BAD0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03C6D4 8003BAD4 24190007 */ li $t9, 7 -/* 03C6D8 8003BAD8 24083000 */ li $t0, 12288 -/* 03C6DC 8003BADC AFA8001C */ sw $t0, 0x1c($sp) -/* 03C6E0 8003BAE0 AFB90018 */ sw $t9, 0x18($sp) -/* 03C6E4 8003BAE4 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03C6E8 8003BAE8 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03C6EC 8003BAEC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C6F0 8003BAF0 0C00E4F0 */ jal spawn_player -/* 03C6F4 8003BAF4 24050007 */ li $a1, 7 -/* 03C6F8 8003BAF8 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03C6FC 8003BAFC 0C00E6B9 */ jal func_80039AE4 -/* 03C700 8003BB00 AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03C704 8003BB04 8FBF0044 */ lw $ra, 0x44($sp) -/* 03C708 8003BB08 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 03C70C 8003BB0C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 03C710 8003BB10 8FB00038 */ lw $s0, 0x38($sp) -/* 03C714 8003BB14 8FB1003C */ lw $s1, 0x3c($sp) -/* 03C718 8003BB18 8FB20040 */ lw $s2, 0x40($sp) -/* 03C71C 8003BB1C 03E00008 */ jr $ra -/* 03C720 8003BB20 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_800393C0/func_8003BE30.s b/asm/non_matchings/code_800393C0/func_8003BE30.s deleted file mode 100644 index 1d4f8e292..000000000 --- a/asm/non_matchings/code_800393C0/func_8003BE30.s +++ /dev/null @@ -1,179 +0,0 @@ -glabel func_8003BE30 -/* 03CA30 8003BE30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 03CA34 8003BE34 3C01800F */ lui $at, %hi(D_800EDE20) # $at, 0x800f -/* 03CA38 8003BE38 3C0E8019 */ lui $t6, %hi(D_8018D9D0) # $t6, 0x8019 -/* 03CA3C 8003BE3C 81CED9D0 */ lb $t6, %lo(D_8018D9D0)($t6) -/* 03CA40 8003BE40 C424DE20 */ lwc1 $f4, %lo(D_800EDE20)($at) -/* 03CA44 8003BE44 44803000 */ mtc1 $zero, $f6 -/* 03CA48 8003BE48 AFBF0024 */ sw $ra, 0x24($sp) -/* 03CA4C 8003BE4C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03CA50 8003BE50 3C06C52D */ lui $a2, (0xC52D2C62 >> 16) # lui $a2, 0xc52d -/* 03CA54 8003BE54 3C07C3AC */ lui $a3, (0xC3AC97F0 >> 16) # lui $a3, 0xc3ac -/* 03CA58 8003BE58 240FB000 */ li $t7, -20480 -/* 03CA5C 8003BE5C AFAF001C */ sw $t7, 0x1c($sp) -/* 03CA60 8003BE60 34E797F0 */ ori $a3, (0xC3AC97F0 & 0xFFFF) # ori $a3, $a3, 0x97f0 -/* 03CA64 8003BE64 34C62C62 */ ori $a2, (0xC52D2C62 & 0xFFFF) # ori $a2, $a2, 0x2c62 -/* 03CA68 8003BE68 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03CA6C 8003BE6C 00002825 */ move $a1, $zero -/* 03CA70 8003BE70 AFAE0018 */ sw $t6, 0x18($sp) -/* 03CA74 8003BE74 E7A40010 */ swc1 $f4, 0x10($sp) -/* 03CA78 8003BE78 0C00E4F0 */ jal spawn_player -/* 03CA7C 8003BE7C E7A60014 */ swc1 $f6, 0x14($sp) -/* 03CA80 8003BE80 3C01800F */ lui $at, %hi(D_800EDE24) # $at, 0x800f -/* 03CA84 8003BE84 C428DE24 */ lwc1 $f8, %lo(D_800EDE24)($at) -/* 03CA88 8003BE88 3C01800F */ lui $at, %hi(D_800EDE28) # $at, 0x800f -/* 03CA8C 8003BE8C 3C188019 */ lui $t8, %hi(D_8018D9D1) # $t8, 0x8019 -/* 03CA90 8003BE90 8318D9D1 */ lb $t8, %lo(D_8018D9D1)($t8) -/* 03CA94 8003BE94 C42ADE28 */ lwc1 $f10, %lo(D_800EDE28)($at) -/* 03CA98 8003BE98 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03CA9C 8003BE9C 3C06C566 */ lui $a2, (0xC566B819 >> 16) # lui $a2, 0xc566 -/* 03CAA0 8003BEA0 3C07C0DA */ lui $a3, (0xC0DA4DD3 >> 16) # lui $a3, 0xc0da -/* 03CAA4 8003BEA4 2419B000 */ li $t9, -20480 -/* 03CAA8 8003BEA8 AFB9001C */ sw $t9, 0x1c($sp) -/* 03CAAC 8003BEAC 34E74DD3 */ ori $a3, (0xC0DA4DD3 & 0xFFFF) # ori $a3, $a3, 0x4dd3 -/* 03CAB0 8003BEB0 34C6B819 */ ori $a2, (0xC566B819 & 0xFFFF) # ori $a2, $a2, 0xb819 -/* 03CAB4 8003BEB4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03CAB8 8003BEB8 24050001 */ li $a1, 1 -/* 03CABC 8003BEBC E7A80010 */ swc1 $f8, 0x10($sp) -/* 03CAC0 8003BEC0 AFB80018 */ sw $t8, 0x18($sp) -/* 03CAC4 8003BEC4 0C00E4F0 */ jal spawn_player -/* 03CAC8 8003BEC8 E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03CACC 8003BECC 3C01800F */ lui $at, %hi(D_800EDE2C) # $at, 0x800f -/* 03CAD0 8003BED0 C430DE2C */ lwc1 $f16, %lo(D_800EDE2C)($at) -/* 03CAD4 8003BED4 3C01800F */ lui $at, %hi(D_800EDE30) # $at, 0x800f -/* 03CAD8 8003BED8 3C088019 */ lui $t0, %hi(D_8018D9D2) # $t0, 0x8019 -/* 03CADC 8003BEDC 8108D9D2 */ lb $t0, %lo(D_8018D9D2)($t0) -/* 03CAE0 8003BEE0 C432DE30 */ lwc1 $f18, %lo(D_800EDE30)($at) -/* 03CAE4 8003BEE4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03CAE8 8003BEE8 3C06C559 */ lui $a2, (0xC5593073 >> 16) # lui $a2, 0xc559 -/* 03CAEC 8003BEEC 3C07C479 */ lui $a3, (0xC4799F0A >> 16) # lui $a3, 0xc479 -/* 03CAF0 8003BEF0 2409B000 */ li $t1, -20480 -/* 03CAF4 8003BEF4 AFA9001C */ sw $t1, 0x1c($sp) -/* 03CAF8 8003BEF8 34E79F0A */ ori $a3, (0xC4799F0A & 0xFFFF) # ori $a3, $a3, 0x9f0a -/* 03CAFC 8003BEFC 34C63073 */ ori $a2, (0xC5593073 & 0xFFFF) # ori $a2, $a2, 0x3073 -/* 03CB00 8003BF00 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03CB04 8003BF04 24050002 */ li $a1, 2 -/* 03CB08 8003BF08 E7B00010 */ swc1 $f16, 0x10($sp) -/* 03CB0C 8003BF0C AFA80018 */ sw $t0, 0x18($sp) -/* 03CB10 8003BF10 0C00E4F0 */ jal spawn_player -/* 03CB14 8003BF14 E7B20014 */ swc1 $f18, 0x14($sp) -/* 03CB18 8003BF18 3C028028 */ lui $v0, %hi(D_802874D8) # $v0, 0x8028 -/* 03CB1C 8003BF1C 244274D8 */ addiu $v0, %lo(D_802874D8) # addiu $v0, $v0, 0x74d8 -/* 03CB20 8003BF20 804A001D */ lb $t2, 0x1d($v0) -/* 03CB24 8003BF24 3C04800E */ lui $a0, 0x800e -/* 03CB28 8003BF28 24050003 */ li $a1, 3 -/* 03CB2C 8003BF2C 29410003 */ slti $at, $t2, 3 -/* 03CB30 8003BF30 14200015 */ bnez $at, .L8003BF88 -/* 03CB34 8003BF34 3C06C53D */ lui $a2, 0xc53d -/* 03CB38 8003BF38 3C01800F */ lui $at, %hi(D_800EDE34) # $at, 0x800f -/* 03CB3C 8003BF3C C424DE34 */ lwc1 $f4, %lo(D_800EDE34)($at) -/* 03CB40 8003BF40 3C01800F */ lui $at, %hi(D_800EDE38) # $at, 0x800f -/* 03CB44 8003BF44 C426DE38 */ lwc1 $f6, %lo(D_800EDE38)($at) -/* 03CB48 8003BF48 804B001E */ lb $t3, 0x1e($v0) -/* 03CB4C 8003BF4C 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03CB50 8003BF50 3C06C53D */ lui $a2, (0xC53D1C5A >> 16) # lui $a2, 0xc53d -/* 03CB54 8003BF54 3C0742DC */ lui $a3, (0x42DC13F8 >> 16) # lui $a3, 0x42dc -/* 03CB58 8003BF58 240CB000 */ li $t4, -20480 -/* 03CB5C 8003BF5C AFAC001C */ sw $t4, 0x1c($sp) -/* 03CB60 8003BF60 34E713F8 */ ori $a3, (0x42DC13F8 & 0xFFFF) # ori $a3, $a3, 0x13f8 -/* 03CB64 8003BF64 34C61C5A */ ori $a2, (0xC53D1C5A & 0xFFFF) # ori $a2, $a2, 0x1c5a -/* 03CB68 8003BF68 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03CB6C 8003BF6C 24050003 */ li $a1, 3 -/* 03CB70 8003BF70 E7A40010 */ swc1 $f4, 0x10($sp) -/* 03CB74 8003BF74 E7A60014 */ swc1 $f6, 0x14($sp) -/* 03CB78 8003BF78 0C00E4F0 */ jal spawn_player -/* 03CB7C 8003BF7C AFAB0018 */ sw $t3, 0x18($sp) -/* 03CB80 8003BF80 10000011 */ b .L8003BFC8 -/* 03CB84 8003BF84 00000000 */ nop -.L8003BF88: -/* 03CB88 8003BF88 3C01800F */ lui $at, %hi(D_800EDE3C) # $at, 0x800f -/* 03CB8C 8003BF8C C428DE3C */ lwc1 $f8, %lo(D_800EDE3C)($at) -/* 03CB90 8003BF90 3C01800F */ lui $at, %hi(D_800EDE40) # $at, 0x800f -/* 03CB94 8003BF94 3C0D8019 */ lui $t5, %hi(D_8018D9D3) # $t5, 0x8019 -/* 03CB98 8003BF98 81ADD9D3 */ lb $t5, %lo(D_8018D9D3)($t5) -/* 03CB9C 8003BF9C C42ADE40 */ lwc1 $f10, %lo(D_800EDE40)($at) -/* 03CBA0 8003BFA0 3C0742DC */ lui $a3, (0x42DC13F8 >> 16) # lui $a3, 0x42dc -/* 03CBA4 8003BFA4 240EB000 */ li $t6, -20480 -/* 03CBA8 8003BFA8 AFAE001C */ sw $t6, 0x1c($sp) -/* 03CBAC 8003BFAC 34E713F8 */ ori $a3, (0x42DC13F8 & 0xFFFF) # ori $a3, $a3, 0x13f8 -/* 03CBB0 8003BFB0 8C84C4E8 */ lw $a0, -0x3b18($a0) -/* 03CBB4 8003BFB4 34C61C5A */ ori $a2, (0xC53D1C5A & 0xFFFF) # ori $a2, $a2, 0x1c5a -/* 03CBB8 8003BFB8 E7A80010 */ swc1 $f8, 0x10($sp) -/* 03CBBC 8003BFBC AFAD0018 */ sw $t5, 0x18($sp) -/* 03CBC0 8003BFC0 0C00E4F0 */ jal spawn_player -/* 03CBC4 8003BFC4 E7AA0014 */ swc1 $f10, 0x14($sp) -.L8003BFC8: -/* 03CBC8 8003BFC8 3C01800F */ lui $at, %hi(D_800EDE44) # $at, 0x800f -/* 03CBCC 8003BFCC C430DE44 */ lwc1 $f16, %lo(D_800EDE44)($at) -/* 03CBD0 8003BFD0 44809000 */ mtc1 $zero, $f18 -/* 03CBD4 8003BFD4 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03CBD8 8003BFD8 3C06C52D */ lui $a2, (0xC52D2C62 >> 16) # lui $a2, 0xc52d -/* 03CBDC 8003BFDC 3C07C3AC */ lui $a3, (0xC3AC97F0 >> 16) # lui $a3, 0xc3ac -/* 03CBE0 8003BFE0 240F7000 */ li $t7, 28672 -/* 03CBE4 8003BFE4 AFAF001C */ sw $t7, 0x1c($sp) -/* 03CBE8 8003BFE8 34E797F0 */ ori $a3, (0xC3AC97F0 & 0xFFFF) # ori $a3, $a3, 0x97f0 -/* 03CBEC 8003BFEC 34C62C62 */ ori $a2, (0xC52D2C62 & 0xFFFF) # ori $a2, $a2, 0x2c62 -/* 03CBF0 8003BFF0 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03CBF4 8003BFF4 24050004 */ li $a1, 4 -/* 03CBF8 8003BFF8 AFA00018 */ sw $zero, 0x18($sp) -/* 03CBFC 8003BFFC E7B00010 */ swc1 $f16, 0x10($sp) -/* 03CC00 8003C000 0C00E4F0 */ jal spawn_player -/* 03CC04 8003C004 E7B20014 */ swc1 $f18, 0x14($sp) -/* 03CC08 8003C008 3C01800F */ lui $at, %hi(D_800EDE48) # $at, 0x800f -/* 03CC0C 8003C00C C424DE48 */ lwc1 $f4, %lo(D_800EDE48)($at) -/* 03CC10 8003C010 3C01800F */ lui $at, %hi(D_800EDE4C) # $at, 0x800f -/* 03CC14 8003C014 C426DE4C */ lwc1 $f6, %lo(D_800EDE4C)($at) -/* 03CC18 8003C018 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03CC1C 8003C01C 3C06C566 */ lui $a2, (0xC566B819 >> 16) # lui $a2, 0xc566 -/* 03CC20 8003C020 3C07C0DA */ lui $a3, (0xC0DA4DD3 >> 16) # lui $a3, 0xc0da -/* 03CC24 8003C024 24187000 */ li $t8, 28672 -/* 03CC28 8003C028 AFB8001C */ sw $t8, 0x1c($sp) -/* 03CC2C 8003C02C 34E74DD3 */ ori $a3, (0xC0DA4DD3 & 0xFFFF) # ori $a3, $a3, 0x4dd3 -/* 03CC30 8003C030 34C6B819 */ ori $a2, (0xC566B819 & 0xFFFF) # ori $a2, $a2, 0xb819 -/* 03CC34 8003C034 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03CC38 8003C038 24050005 */ li $a1, 5 -/* 03CC3C 8003C03C AFA00018 */ sw $zero, 0x18($sp) -/* 03CC40 8003C040 E7A40010 */ swc1 $f4, 0x10($sp) -/* 03CC44 8003C044 0C00E4F0 */ jal spawn_player -/* 03CC48 8003C048 E7A60014 */ swc1 $f6, 0x14($sp) -/* 03CC4C 8003C04C 3C01800F */ lui $at, %hi(D_800EDE50) # $at, 0x800f -/* 03CC50 8003C050 C428DE50 */ lwc1 $f8, %lo(D_800EDE50)($at) -/* 03CC54 8003C054 3C01800F */ lui $at, %hi(D_800EDE54) # $at, 0x800f -/* 03CC58 8003C058 C42ADE54 */ lwc1 $f10, %lo(D_800EDE54)($at) -/* 03CC5C 8003C05C 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03CC60 8003C060 3C06C559 */ lui $a2, (0xC5593073 >> 16) # lui $a2, 0xc559 -/* 03CC64 8003C064 3C07C479 */ lui $a3, (0xC4799F0A >> 16) # lui $a3, 0xc479 -/* 03CC68 8003C068 24197000 */ li $t9, 28672 -/* 03CC6C 8003C06C AFB9001C */ sw $t9, 0x1c($sp) -/* 03CC70 8003C070 34E79F0A */ ori $a3, (0xC4799F0A & 0xFFFF) # ori $a3, $a3, 0x9f0a -/* 03CC74 8003C074 34C63073 */ ori $a2, (0xC5593073 & 0xFFFF) # ori $a2, $a2, 0x3073 -/* 03CC78 8003C078 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03CC7C 8003C07C 24050006 */ li $a1, 6 -/* 03CC80 8003C080 AFA00018 */ sw $zero, 0x18($sp) -/* 03CC84 8003C084 E7A80010 */ swc1 $f8, 0x10($sp) -/* 03CC88 8003C088 0C00E4F0 */ jal spawn_player -/* 03CC8C 8003C08C E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03CC90 8003C090 3C01800F */ lui $at, %hi(D_800EDE58) # $at, 0x800f -/* 03CC94 8003C094 C430DE58 */ lwc1 $f16, %lo(D_800EDE58)($at) -/* 03CC98 8003C098 3C01800F */ lui $at, %hi(D_800EDE5C) # $at, 0x800f -/* 03CC9C 8003C09C C432DE5C */ lwc1 $f18, %lo(D_800EDE5C)($at) -/* 03CCA0 8003C0A0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03CCA4 8003C0A4 3C06C53D */ lui $a2, (0xC53D1C5A >> 16) # lui $a2, 0xc53d -/* 03CCA8 8003C0A8 3C0742DC */ lui $a3, (0x42DC13F8 >> 16) # lui $a3, 0x42dc -/* 03CCAC 8003C0AC 24087000 */ li $t0, 28672 -/* 03CCB0 8003C0B0 AFA8001C */ sw $t0, 0x1c($sp) -/* 03CCB4 8003C0B4 34E713F8 */ ori $a3, (0x42DC13F8 & 0xFFFF) # ori $a3, $a3, 0x13f8 -/* 03CCB8 8003C0B8 34C61C5A */ ori $a2, (0xC53D1C5A & 0xFFFF) # ori $a2, $a2, 0x1c5a -/* 03CCBC 8003C0BC 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03CCC0 8003C0C0 24050007 */ li $a1, 7 -/* 03CCC4 8003C0C4 AFA00018 */ sw $zero, 0x18($sp) -/* 03CCC8 8003C0C8 E7B00010 */ swc1 $f16, 0x10($sp) -/* 03CCCC 8003C0CC 0C00E4F0 */ jal spawn_player -/* 03CCD0 8003C0D0 E7B20014 */ swc1 $f18, 0x14($sp) -/* 03CCD4 8003C0D4 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03CCD8 8003C0D8 0C00E6B9 */ jal func_80039AE4 -/* 03CCDC 8003C0DC AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03CCE0 8003C0E0 8FBF0024 */ lw $ra, 0x24($sp) -/* 03CCE4 8003C0E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 03CCE8 8003C0E8 03E00008 */ jr $ra -/* 03CCEC 8003C0EC 00000000 */ nop diff --git a/asm/non_matchings/code_800393C0/func_8003CD78.s b/asm/non_matchings/code_800393C0/func_8003CD78.s deleted file mode 100644 index dc3cdecf2..000000000 --- a/asm/non_matchings/code_800393C0/func_8003CD78.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8003CD78 -/* 03D978 8003CD78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 03D97C 8003CD7C AFBF0014 */ sw $ra, 0x14($sp) -/* 03D980 8003CD80 0C00EF8C */ jal func_8003BE30 -/* 03D984 8003CD84 00000000 */ nop -/* 03D988 8003CD88 8FBF0014 */ lw $ra, 0x14($sp) -/* 03D98C 8003CD8C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 03D990 8003CD90 03E00008 */ jr $ra -/* 03D994 8003CD94 00000000 */ nop diff --git a/asm/non_matchings/code_800393C0/func_8003CD98.s b/asm/non_matchings/code_800393C0/func_8003CD98.s deleted file mode 100644 index 1fb14166f..000000000 --- a/asm/non_matchings/code_800393C0/func_8003CD98.s +++ /dev/null @@ -1,192 +0,0 @@ -glabel func_8003CD98 -/* 03D998 8003CD98 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 03D99C 8003CD9C AFBF002C */ sw $ra, 0x2c($sp) -/* 03D9A0 8003CDA0 AFB20028 */ sw $s2, 0x28($sp) -/* 03D9A4 8003CDA4 AFB10024 */ sw $s1, 0x24($sp) -/* 03D9A8 8003CDA8 AFB00020 */ sw $s0, 0x20($sp) -/* 03D9AC 8003CDAC AFA50034 */ sw $a1, 0x34($sp) -/* 03D9B0 8003CDB0 AFA60038 */ sw $a2, 0x38($sp) -/* 03D9B4 8003CDB4 AFA7003C */ sw $a3, 0x3c($sp) -/* 03D9B8 8003CDB8 94980000 */ lhu $t8, ($a0) -/* 03D9BC 8003CDBC 00078600 */ sll $s0, $a3, 0x18 -/* 03D9C0 8003CDC0 00068E00 */ sll $s1, $a2, 0x18 -/* 03D9C4 8003CDC4 00117603 */ sra $t6, $s1, 0x18 -/* 03D9C8 8003CDC8 00107E03 */ sra $t7, $s0, 0x18 -/* 03D9CC 8003CDCC 33198000 */ andi $t9, $t8, 0x8000 -/* 03D9D0 8003CDD0 01E08025 */ move $s0, $t7 -/* 03D9D4 8003CDD4 01C08825 */ move $s1, $t6 -/* 03D9D8 8003CDD8 132000A3 */ beqz $t9, .L8003D068 -/* 03D9DC 8003CDDC 00809025 */ move $s2, $a0 -/* 03D9E0 8003CDE0 15E00007 */ bnez $t7, .L8003CE00 -/* 03D9E4 8003CDE4 000F3600 */ sll $a2, $t7, 0x18 -/* 03D9E8 8003CDE8 000E3E00 */ sll $a3, $t6, 0x18 -/* 03D9EC 8003CDEC 00074E03 */ sra $t1, $a3, 0x18 -/* 03D9F0 8003CDF0 00064603 */ sra $t0, $a2, 0x18 -/* 03D9F4 8003CDF4 01003025 */ move $a2, $t0 -/* 03D9F8 8003CDF8 0C00B49A */ jal func_8002D268 -/* 03D9FC 8003CDFC 01203825 */ move $a3, $t1 -.L8003CE00: -/* 03DA00 8003CE00 00103600 */ sll $a2, $s0, 0x18 -/* 03DA04 8003CE04 00113E00 */ sll $a3, $s1, 0x18 -/* 03DA08 8003CE08 00075E03 */ sra $t3, $a3, 0x18 -/* 03DA0C 8003CE0C 00065603 */ sra $t2, $a2, 0x18 -/* 03DA10 8003CE10 01403025 */ move $a2, $t2 -/* 03DA14 8003CE14 01603825 */ move $a3, $t3 -/* 03DA18 8003CE18 02402025 */ move $a0, $s2 -/* 03DA1C 8003CE1C 0C00A4D3 */ jal func_8002934C -/* 03DA20 8003CE20 8FA50034 */ lw $a1, 0x34($sp) -/* 03DA24 8003CE24 12000003 */ beqz $s0, .L8003CE34 -/* 03DA28 8003CE28 24010001 */ li $at, 1 -/* 03DA2C 8003CE2C 16010036 */ bne $s0, $at, .L8003CF08 -/* 03DA30 8003CE30 02402025 */ move $a0, $s2 -.L8003CE34: -/* 03DA34 8003CE34 00112E00 */ sll $a1, $s1, 0x18 -/* 03DA38 8003CE38 00103600 */ sll $a2, $s0, 0x18 -/* 03DA3C 8003CE3C 00066E03 */ sra $t5, $a2, 0x18 -/* 03DA40 8003CE40 00056603 */ sra $t4, $a1, 0x18 -/* 03DA44 8003CE44 01802825 */ move $a1, $t4 -/* 03DA48 8003CE48 01A03025 */ move $a2, $t5 -/* 03DA4C 8003CE4C 02402025 */ move $a0, $s2 -/* 03DA50 8003CE50 0C009E88 */ jal func_80027A20 -/* 03DA54 8003CE54 00003825 */ move $a3, $zero -/* 03DA58 8003CE58 00112E00 */ sll $a1, $s1, 0x18 -/* 03DA5C 8003CE5C 00103600 */ sll $a2, $s0, 0x18 -/* 03DA60 8003CE60 00067E03 */ sra $t7, $a2, 0x18 -/* 03DA64 8003CE64 00057603 */ sra $t6, $a1, 0x18 -/* 03DA68 8003CE68 01C02825 */ move $a1, $t6 -/* 03DA6C 8003CE6C 01E03025 */ move $a2, $t7 -/* 03DA70 8003CE70 02402025 */ move $a0, $s2 -/* 03DA74 8003CE74 0C009E88 */ jal func_80027A20 -/* 03DA78 8003CE78 24070001 */ li $a3, 1 -/* 03DA7C 8003CE7C 00112E00 */ sll $a1, $s1, 0x18 -/* 03DA80 8003CE80 00103600 */ sll $a2, $s0, 0x18 -/* 03DA84 8003CE84 00103E00 */ sll $a3, $s0, 0x18 -/* 03DA88 8003CE88 00074603 */ sra $t0, $a3, 0x18 -/* 03DA8C 8003CE8C 0006CE03 */ sra $t9, $a2, 0x18 -/* 03DA90 8003CE90 0005C603 */ sra $t8, $a1, 0x18 -/* 03DA94 8003CE94 03002825 */ move $a1, $t8 -/* 03DA98 8003CE98 03203025 */ move $a2, $t9 -/* 03DA9C 8003CE9C 01003825 */ move $a3, $t0 -/* 03DAA0 8003CEA0 02402025 */ move $a0, $s2 -/* 03DAA4 8003CEA4 0C009C10 */ jal func_80027040 -/* 03DAA8 8003CEA8 AFA00010 */ sw $zero, 0x10($sp) -/* 03DAAC 8003CEAC 001048C0 */ sll $t1, $s0, 3 -/* 03DAB0 8003CEB0 001150C0 */ sll $t2, $s1, 3 -/* 03DAB4 8003CEB4 01515021 */ addu $t2, $t2, $s1 -/* 03DAB8 8003CEB8 01304821 */ addu $t1, $t1, $s0 -/* 03DABC 8003CEBC 000948C0 */ sll $t1, $t1, 3 -/* 03DAC0 8003CEC0 000A50C0 */ sll $t2, $t2, 3 -/* 03DAC4 8003CEC4 01515021 */ addu $t2, $t2, $s1 -/* 03DAC8 8003CEC8 01304821 */ addu $t1, $t1, $s0 -/* 03DACC 8003CECC 00094A00 */ sll $t1, $t1, 8 -/* 03DAD0 8003CED0 000A5140 */ sll $t2, $t2, 5 -/* 03DAD4 8003CED4 3C0C802E */ lui $t4, %hi(D_802DFB80) # $t4, 0x802e -/* 03DAD8 8003CED8 00106BC0 */ sll $t5, $s0, 0xf -/* 03DADC 8003CEDC 00117300 */ sll $t6, $s1, 0xc -/* 03DAE0 8003CEE0 3C18802C */ lui $t8, %hi(D_802BFB80) # $t8, 0x802c -/* 03DAE4 8003CEE4 2718FB80 */ addiu $t8, %lo(D_802BFB80) # addiu $t8, $t8, -0x480 -/* 03DAE8 8003CEE8 01AE7821 */ addu $t7, $t5, $t6 -/* 03DAEC 8003CEEC 258CFB80 */ addiu $t4, %lo(D_802DFB80) # addiu $t4, $t4, -0x480 -/* 03DAF0 8003CEF0 012A5821 */ addu $t3, $t1, $t2 -/* 03DAF4 8003CEF4 016C2021 */ addu $a0, $t3, $t4 -/* 03DAF8 8003CEF8 0C010034 */ jal mio0decode -/* 03DAFC 8003CEFC 01F82821 */ addu $a1, $t7, $t8 -/* 03DB00 8003CF00 10000038 */ b .L8003CFE4 -/* 03DB04 8003CF04 0010C040 */ sll $t8, $s0, 1 -.L8003CF08: -/* 03DB08 8003CF08 00112E00 */ sll $a1, $s1, 0x18 -/* 03DB0C 8003CF0C 00103600 */ sll $a2, $s0, 0x18 -/* 03DB10 8003CF10 00064603 */ sra $t0, $a2, 0x18 -/* 03DB14 8003CF14 0005CE03 */ sra $t9, $a1, 0x18 -/* 03DB18 8003CF18 03202825 */ move $a1, $t9 -/* 03DB1C 8003CF1C 01003025 */ move $a2, $t0 -/* 03DB20 8003CF20 0C009E88 */ jal func_80027A20 -/* 03DB24 8003CF24 00003825 */ move $a3, $zero -/* 03DB28 8003CF28 00112E00 */ sll $a1, $s1, 0x18 -/* 03DB2C 8003CF2C 00103600 */ sll $a2, $s0, 0x18 -/* 03DB30 8003CF30 00065603 */ sra $t2, $a2, 0x18 -/* 03DB34 8003CF34 00054E03 */ sra $t1, $a1, 0x18 -/* 03DB38 8003CF38 01202825 */ move $a1, $t1 -/* 03DB3C 8003CF3C 01403025 */ move $a2, $t2 -/* 03DB40 8003CF40 02402025 */ move $a0, $s2 -/* 03DB44 8003CF44 0C009E88 */ jal func_80027A20 -/* 03DB48 8003CF48 24070001 */ li $a3, 1 -/* 03DB4C 8003CF4C 26250004 */ addiu $a1, $s1, 4 -/* 03DB50 8003CF50 00103600 */ sll $a2, $s0, 0x18 -/* 03DB54 8003CF54 2607FFFE */ addiu $a3, $s0, -2 -/* 03DB58 8003CF58 00077600 */ sll $t6, $a3, 0x18 -/* 03DB5C 8003CF5C 00066E03 */ sra $t5, $a2, 0x18 -/* 03DB60 8003CF60 00055E00 */ sll $t3, $a1, 0x18 -/* 03DB64 8003CF64 000B2E03 */ sra $a1, $t3, 0x18 -/* 03DB68 8003CF68 01A03025 */ move $a2, $t5 -/* 03DB6C 8003CF6C 000E3E03 */ sra $a3, $t6, 0x18 -/* 03DB70 8003CF70 02402025 */ move $a0, $s2 -/* 03DB74 8003CF74 0C009C10 */ jal func_80027040 -/* 03DB78 8003CF78 AFA00010 */ sw $zero, 0x10($sp) -/* 03DB7C 8003CF7C 0010C0C0 */ sll $t8, $s0, 3 -/* 03DB80 8003CF80 0011C8C0 */ sll $t9, $s1, 3 -/* 03DB84 8003CF84 0331C821 */ addu $t9, $t9, $s1 -/* 03DB88 8003CF88 0310C021 */ addu $t8, $t8, $s0 -/* 03DB8C 8003CF8C 0018C0C0 */ sll $t8, $t8, 3 -/* 03DB90 8003CF90 0019C8C0 */ sll $t9, $t9, 3 -/* 03DB94 8003CF94 0331C821 */ addu $t9, $t9, $s1 -/* 03DB98 8003CF98 0310C021 */ addu $t8, $t8, $s0 -/* 03DB9C 8003CF9C 0018C200 */ sll $t8, $t8, 8 -/* 03DBA0 8003CFA0 0019C940 */ sll $t9, $t9, 5 -/* 03DBA4 8003CFA4 00105BC0 */ sll $t3, $s0, 0xf -/* 03DBA8 8003CFA8 00116300 */ sll $t4, $s1, 0xc -/* 03DBAC 8003CFAC 3C01FFFF */ lui $at, (0xFFFF4000 >> 16) # lui $at, 0xffff -/* 03DBB0 8003CFB0 34214000 */ ori $at, (0xFFFF4000 & 0xFFFF) # ori $at, $at, 0x4000 -/* 03DBB4 8003CFB4 016C6821 */ addu $t5, $t3, $t4 -/* 03DBB8 8003CFB8 03194021 */ addu $t0, $t8, $t9 -/* 03DBBC 8003CFBC 3C0A802E */ lui $t2, %hi(D_802DFB80) # $t2, 0x802e -/* 03DBC0 8003CFC0 3C0F802C */ lui $t7, %hi(D_802BFB80) # $t7, 0x802c -/* 03DBC4 8003CFC4 25EFFB80 */ addiu $t7, %lo(D_802BFB80) # addiu $t7, $t7, -0x480 -/* 03DBC8 8003CFC8 254AFB80 */ addiu $t2, %lo(D_802DFB80) # addiu $t2, $t2, -0x480 -/* 03DBCC 8003CFCC 25099280 */ addiu $t1, $t0, -0x6d80 -/* 03DBD0 8003CFD0 01A17021 */ addu $t6, $t5, $at -/* 03DBD4 8003CFD4 01CF2821 */ addu $a1, $t6, $t7 -/* 03DBD8 8003CFD8 0C010034 */ jal mio0decode -/* 03DBDC 8003CFDC 012A2021 */ addu $a0, $t1, $t2 -/* 03DBE0 8003CFE0 0010C040 */ sll $t8, $s0, 1 -.L8003CFE4: -/* 03DBE4 8003CFE4 02581821 */ addu $v1, $s2, $t8 -/* 03DBE8 8003CFE8 94790244 */ lhu $t9, 0x244($v1) -/* 03DBEC 8003CFEC 00111040 */ sll $v0, $s1, 1 -/* 03DBF0 8003CFF0 00104100 */ sll $t0, $s0, 4 -/* 03DBF4 8003CFF4 01024821 */ addu $t1, $t0, $v0 -/* 03DBF8 8003CFF8 3C018016 */ lui $at, 0x8016 -/* 03DBFC 8003CFFC 00290821 */ addu $at, $at, $t1 -/* 03DC00 8003D000 A43950D0 */ sh $t9, 0x50d0($at) -/* 03DC04 8003D004 946A024C */ lhu $t2, 0x24c($v1) -/* 03DC08 8003D008 00105900 */ sll $t3, $s0, 4 -/* 03DC0C 8003D00C 01626021 */ addu $t4, $t3, $v0 -/* 03DC10 8003D010 3C018016 */ lui $at, 0x8016 -/* 03DC14 8003D014 002C0821 */ addu $at, $at, $t4 -/* 03DC18 8003D018 A42A5110 */ sh $t2, 0x5110($at) -/* 03DC1C 8003D01C 864D00A8 */ lh $t5, 0xa8($s2) -/* 03DC20 8003D020 00107100 */ sll $t6, $s0, 4 -/* 03DC24 8003D024 01C27821 */ addu $t7, $t6, $v0 -/* 03DC28 8003D028 3C018016 */ lui $at, 0x8016 -/* 03DC2C 8003D02C 002F0821 */ addu $at, $at, $t7 -/* 03DC30 8003D030 0010C100 */ sll $t8, $s0, 4 -/* 03DC34 8003D034 A42D5150 */ sh $t5, 0x5150($at) -/* 03DC38 8003D038 3C018016 */ lui $at, 0x8016 -/* 03DC3C 8003D03C 03024021 */ addu $t0, $t8, $v0 -/* 03DC40 8003D040 00112E00 */ sll $a1, $s1, 0x18 -/* 03DC44 8003D044 00103600 */ sll $a2, $s0, 0x18 -/* 03DC48 8003D048 00280821 */ addu $at, $at, $t0 -/* 03DC4C 8003D04C 00064E03 */ sra $t1, $a2, 0x18 -/* 03DC50 8003D050 0005CE03 */ sra $t9, $a1, 0x18 -/* 03DC54 8003D054 A42051D0 */ sh $zero, 0x51d0($at) -/* 03DC58 8003D058 03202825 */ move $a1, $t9 -/* 03DC5C 8003D05C 01203025 */ move $a2, $t1 -/* 03DC60 8003D060 0C0099EB */ jal func_800267AC -/* 03DC64 8003D064 02402025 */ move $a0, $s2 -.L8003D068: -/* 03DC68 8003D068 8FBF002C */ lw $ra, 0x2c($sp) -/* 03DC6C 8003D06C 8FB00020 */ lw $s0, 0x20($sp) -/* 03DC70 8003D070 8FB10024 */ lw $s1, 0x24($sp) -/* 03DC74 8003D074 8FB20028 */ lw $s2, 0x28($sp) -/* 03DC78 8003D078 03E00008 */ jr $ra -/* 03DC7C 8003D07C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_800393C0/func_8003D080.s b/asm/non_matchings/code_800393C0/func_8003D080.s index c1ac9b433..b015705dc 100644 --- a/asm/non_matchings/code_800393C0/func_8003D080.s +++ b/asm/non_matchings/code_800393C0/func_8003D080.s @@ -431,57 +431,57 @@ glabel func_8003D080 /* 03E2E0 8003D6E0 1000011B */ b .L8003DB50 /* 03E2E4 8003D6E4 8FBF001C */ lw $ra, 0x1c($sp) .L8003D6E8: -/* 03E2E8 8003D6E8 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E2EC 8003D6EC 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E2E8 8003D6E8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E2EC 8003D6EC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E2F0 8003D6F0 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 03E2F4 8003D6F4 00003025 */ move $a2, $zero /* 03E2F8 8003D6F8 0C00F366 */ jal func_8003CD98 /* 03E2FC 8003D6FC 00003825 */ move $a3, $zero /* 03E300 8003D700 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03E304 8003D704 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E308 8003D708 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E304 8003D704 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E308 8003D708 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E30C 8003D70C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 03E310 8003D710 24060001 */ li $a2, 1 /* 03E314 8003D714 0C00F366 */ jal func_8003CD98 /* 03E318 8003D718 00003825 */ move $a3, $zero /* 03E31C 8003D71C 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03E320 8003D720 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E324 8003D724 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E320 8003D720 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E324 8003D724 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E328 8003D728 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 03E32C 8003D72C 24060002 */ li $a2, 2 /* 03E330 8003D730 0C00F366 */ jal func_8003CD98 /* 03E334 8003D734 00003825 */ move $a3, $zero /* 03E338 8003D738 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03E33C 8003D73C 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E340 8003D740 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E33C 8003D73C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E340 8003D740 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E344 8003D744 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 03E348 8003D748 24060003 */ li $a2, 3 /* 03E34C 8003D74C 0C00F366 */ jal func_8003CD98 /* 03E350 8003D750 00003825 */ move $a3, $zero /* 03E354 8003D754 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03E358 8003D758 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E35C 8003D75C 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E358 8003D758 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E35C 8003D75C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E360 8003D760 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) /* 03E364 8003D764 24060004 */ li $a2, 4 /* 03E368 8003D768 0C00F366 */ jal func_8003CD98 /* 03E36C 8003D76C 00003825 */ move $a3, $zero /* 03E370 8003D770 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03E374 8003D774 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E378 8003D778 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E374 8003D774 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E378 8003D778 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E37C 8003D77C 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) /* 03E380 8003D780 24060005 */ li $a2, 5 /* 03E384 8003D784 0C00F366 */ jal func_8003CD98 /* 03E388 8003D788 00003825 */ move $a3, $zero /* 03E38C 8003D78C 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03E390 8003D790 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E394 8003D794 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E390 8003D790 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E394 8003D794 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E398 8003D798 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) /* 03E39C 8003D79C 24060006 */ li $a2, 6 /* 03E3A0 8003D7A0 0C00F366 */ jal func_8003CD98 /* 03E3A4 8003D7A4 00003825 */ move $a3, $zero /* 03E3A8 8003D7A8 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03E3AC 8003D7AC 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E3B0 8003D7B0 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E3AC 8003D7AC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E3B0 8003D7B0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E3B4 8003D7B4 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) /* 03E3B8 8003D7B8 24060007 */ li $a2, 7 /* 03E3BC 8003D7BC 0C00F366 */ jal func_8003CD98 @@ -489,113 +489,113 @@ glabel func_8003D080 /* 03E3C4 8003D7C4 100000E2 */ b .L8003DB50 /* 03E3C8 8003D7C8 8FBF001C */ lw $ra, 0x1c($sp) .L8003D7CC: -/* 03E3CC 8003D7CC 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E3D0 8003D7D0 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E3CC 8003D7CC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E3D0 8003D7D0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E3D4 8003D7D4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) # -0x3b04($a0) /* 03E3D8 8003D7D8 00003025 */ move $a2, $zero /* 03E3DC 8003D7DC 0C00F366 */ jal func_8003CD98 /* 03E3E0 8003D7E0 00003825 */ move $a3, $zero /* 03E3E4 8003D7E4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03E3E8 8003D7E8 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E3EC 8003D7EC 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E3E8 8003D7E8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E3EC 8003D7EC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E3F0 8003D7F0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 03E3F4 8003D7F4 24060001 */ li $a2, 1 /* 03E3F8 8003D7F8 0C00F366 */ jal func_8003CD98 /* 03E3FC 8003D7FC 00003825 */ move $a3, $zero /* 03E400 8003D800 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03E404 8003D804 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E408 8003D808 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E404 8003D804 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E408 8003D808 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E40C 8003D80C 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 03E410 8003D810 24060002 */ li $a2, 2 /* 03E414 8003D814 0C00F366 */ jal func_8003CD98 /* 03E418 8003D818 00003825 */ move $a3, $zero /* 03E41C 8003D81C 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03E420 8003D820 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E424 8003D824 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E420 8003D820 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E424 8003D824 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E428 8003D828 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 03E42C 8003D82C 24060003 */ li $a2, 3 /* 03E430 8003D830 0C00F366 */ jal func_8003CD98 /* 03E434 8003D834 00003825 */ move $a3, $zero /* 03E438 8003D838 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03E43C 8003D83C 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E440 8003D840 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E43C 8003D83C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E440 8003D840 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E444 8003D844 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) /* 03E448 8003D848 24060004 */ li $a2, 4 /* 03E44C 8003D84C 0C00F366 */ jal func_8003CD98 /* 03E450 8003D850 00003825 */ move $a3, $zero /* 03E454 8003D854 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03E458 8003D858 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E45C 8003D85C 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E458 8003D858 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E45C 8003D85C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E460 8003D860 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) /* 03E464 8003D864 24060005 */ li $a2, 5 /* 03E468 8003D868 0C00F366 */ jal func_8003CD98 /* 03E46C 8003D86C 00003825 */ move $a3, $zero /* 03E470 8003D870 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03E474 8003D874 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E478 8003D878 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E474 8003D874 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E478 8003D878 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E47C 8003D87C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) /* 03E480 8003D880 24060006 */ li $a2, 6 /* 03E484 8003D884 0C00F366 */ jal func_8003CD98 /* 03E488 8003D888 00003825 */ move $a3, $zero /* 03E48C 8003D88C 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03E490 8003D890 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E494 8003D894 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E490 8003D890 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E494 8003D894 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E498 8003D898 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) /* 03E49C 8003D89C 24060007 */ li $a2, 7 /* 03E4A0 8003D8A0 0C00F366 */ jal func_8003CD98 /* 03E4A4 8003D8A4 00003825 */ move $a3, $zero /* 03E4A8 8003D8A8 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03E4AC 8003D8AC 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E4B0 8003D8B0 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E4AC 8003D8AC 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E4B0 8003D8B0 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E4B4 8003D8B4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 03E4B8 8003D8B8 00003025 */ move $a2, $zero /* 03E4BC 8003D8BC 0C00F366 */ jal func_8003CD98 /* 03E4C0 8003D8C0 24070001 */ li $a3, 1 /* 03E4C4 8003D8C4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03E4C8 8003D8C8 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E4CC 8003D8CC 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E4C8 8003D8C8 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E4CC 8003D8CC 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E4D0 8003D8D0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 03E4D4 8003D8D4 24060001 */ li $a2, 1 /* 03E4D8 8003D8D8 0C00F366 */ jal func_8003CD98 /* 03E4DC 8003D8DC 24070001 */ li $a3, 1 /* 03E4E0 8003D8E0 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03E4E4 8003D8E4 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E4E8 8003D8E8 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E4E4 8003D8E4 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E4E8 8003D8E8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E4EC 8003D8EC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 03E4F0 8003D8F0 24060002 */ li $a2, 2 /* 03E4F4 8003D8F4 0C00F366 */ jal func_8003CD98 /* 03E4F8 8003D8F8 24070001 */ li $a3, 1 /* 03E4FC 8003D8FC 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03E500 8003D900 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E504 8003D904 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E500 8003D900 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E504 8003D904 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E508 8003D908 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 03E50C 8003D90C 24060003 */ li $a2, 3 /* 03E510 8003D910 0C00F366 */ jal func_8003CD98 /* 03E514 8003D914 24070001 */ li $a3, 1 /* 03E518 8003D918 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03E51C 8003D91C 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E520 8003D920 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E51C 8003D91C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E520 8003D920 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E524 8003D924 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) /* 03E528 8003D928 24060004 */ li $a2, 4 /* 03E52C 8003D92C 0C00F366 */ jal func_8003CD98 /* 03E530 8003D930 24070001 */ li $a3, 1 /* 03E534 8003D934 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03E538 8003D938 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E53C 8003D93C 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E538 8003D938 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E53C 8003D93C 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E540 8003D940 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) /* 03E544 8003D944 24060005 */ li $a2, 5 /* 03E548 8003D948 0C00F366 */ jal func_8003CD98 /* 03E54C 8003D94C 24070001 */ li $a3, 1 /* 03E550 8003D950 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03E554 8003D954 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E558 8003D958 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E554 8003D954 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E558 8003D958 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E55C 8003D95C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) /* 03E560 8003D960 24060006 */ li $a2, 6 /* 03E564 8003D964 0C00F366 */ jal func_8003CD98 /* 03E568 8003D968 24070001 */ li $a3, 1 /* 03E56C 8003D96C 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03E570 8003D970 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E574 8003D974 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E570 8003D970 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E574 8003D974 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E578 8003D978 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) /* 03E57C 8003D97C 24060007 */ li $a2, 7 /* 03E580 8003D980 0C00F366 */ jal func_8003CD98 @@ -603,113 +603,113 @@ glabel func_8003D080 /* 03E588 8003D988 10000071 */ b .L8003DB50 /* 03E58C 8003D98C 8FBF001C */ lw $ra, 0x1c($sp) .L8003D990: -/* 03E590 8003D990 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E594 8003D994 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E590 8003D990 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E594 8003D994 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E598 8003D998 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) # -0x3b04($a0) /* 03E59C 8003D99C 00003025 */ move $a2, $zero /* 03E5A0 8003D9A0 0C00F366 */ jal func_8003CD98 /* 03E5A4 8003D9A4 00003825 */ move $a3, $zero /* 03E5A8 8003D9A8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03E5AC 8003D9AC 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E5B0 8003D9B0 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E5AC 8003D9AC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E5B0 8003D9B0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E5B4 8003D9B4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 03E5B8 8003D9B8 24060001 */ li $a2, 1 /* 03E5BC 8003D9BC 0C00F366 */ jal func_8003CD98 /* 03E5C0 8003D9C0 00003825 */ move $a3, $zero /* 03E5C4 8003D9C4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03E5C8 8003D9C8 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E5CC 8003D9CC 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E5C8 8003D9C8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E5CC 8003D9CC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E5D0 8003D9D0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 03E5D4 8003D9D4 24060002 */ li $a2, 2 /* 03E5D8 8003D9D8 0C00F366 */ jal func_8003CD98 /* 03E5DC 8003D9DC 00003825 */ move $a3, $zero /* 03E5E0 8003D9E0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03E5E4 8003D9E4 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 03E5E8 8003D9E8 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 03E5E4 8003D9E4 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 03E5E8 8003D9E8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 03E5EC 8003D9EC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 03E5F0 8003D9F0 24060003 */ li $a2, 3 /* 03E5F4 8003D9F4 0C00F366 */ jal func_8003CD98 /* 03E5F8 8003D9F8 00003825 */ move $a3, $zero /* 03E5FC 8003D9FC 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03E600 8003DA00 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E604 8003DA04 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E600 8003DA00 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E604 8003DA04 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E608 8003DA08 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 03E60C 8003DA0C 00003025 */ move $a2, $zero /* 03E610 8003DA10 0C00F366 */ jal func_8003CD98 /* 03E614 8003DA14 24070001 */ li $a3, 1 /* 03E618 8003DA18 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03E61C 8003DA1C 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E620 8003DA20 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E61C 8003DA1C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E620 8003DA20 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E624 8003DA24 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 03E628 8003DA28 24060001 */ li $a2, 1 /* 03E62C 8003DA2C 0C00F366 */ jal func_8003CD98 /* 03E630 8003DA30 24070001 */ li $a3, 1 /* 03E634 8003DA34 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03E638 8003DA38 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E63C 8003DA3C 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E638 8003DA38 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E63C 8003DA3C 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E640 8003DA40 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 03E644 8003DA44 24060002 */ li $a2, 2 /* 03E648 8003DA48 0C00F366 */ jal func_8003CD98 /* 03E64C 8003DA4C 24070001 */ li $a3, 1 /* 03E650 8003DA50 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03E654 8003DA54 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 03E658 8003DA58 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 03E654 8003DA54 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 03E658 8003DA58 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 03E65C 8003DA5C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 03E660 8003DA60 24060003 */ li $a2, 3 /* 03E664 8003DA64 0C00F366 */ jal func_8003CD98 /* 03E668 8003DA68 24070001 */ li $a3, 1 /* 03E66C 8003DA6C 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03E670 8003DA70 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 03E674 8003DA74 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 03E670 8003DA70 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 03E674 8003DA74 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 03E678 8003DA78 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 03E67C 8003DA7C 00003025 */ move $a2, $zero /* 03E680 8003DA80 0C00F366 */ jal func_8003CD98 /* 03E684 8003DA84 24070002 */ li $a3, 2 /* 03E688 8003DA88 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03E68C 8003DA8C 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 03E690 8003DA90 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 03E68C 8003DA8C 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 03E690 8003DA90 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 03E694 8003DA94 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 03E698 8003DA98 24060001 */ li $a2, 1 /* 03E69C 8003DA9C 0C00F366 */ jal func_8003CD98 /* 03E6A0 8003DAA0 24070002 */ li $a3, 2 /* 03E6A4 8003DAA4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03E6A8 8003DAA8 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 03E6AC 8003DAAC 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 03E6A8 8003DAA8 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 03E6AC 8003DAAC 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 03E6B0 8003DAB0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 03E6B4 8003DAB4 24060002 */ li $a2, 2 /* 03E6B8 8003DAB8 0C00F366 */ jal func_8003CD98 /* 03E6BC 8003DABC 24070002 */ li $a3, 2 /* 03E6C0 8003DAC0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03E6C4 8003DAC4 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 03E6C8 8003DAC8 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 03E6C4 8003DAC4 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 03E6C8 8003DAC8 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 03E6CC 8003DACC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 03E6D0 8003DAD0 24060003 */ li $a2, 3 /* 03E6D4 8003DAD4 0C00F366 */ jal func_8003CD98 /* 03E6D8 8003DAD8 24070002 */ li $a3, 2 /* 03E6DC 8003DADC 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 03E6E0 8003DAE0 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 03E6E4 8003DAE4 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 03E6E0 8003DAE0 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 03E6E4 8003DAE4 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 03E6E8 8003DAE8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 03E6EC 8003DAEC 00003025 */ move $a2, $zero /* 03E6F0 8003DAF0 0C00F366 */ jal func_8003CD98 /* 03E6F4 8003DAF4 24070003 */ li $a3, 3 /* 03E6F8 8003DAF8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03E6FC 8003DAFC 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 03E700 8003DB00 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 03E6FC 8003DAFC 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 03E700 8003DB00 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 03E704 8003DB04 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 03E708 8003DB08 24060001 */ li $a2, 1 /* 03E70C 8003DB0C 0C00F366 */ jal func_8003CD98 /* 03E710 8003DB10 24070003 */ li $a3, 3 /* 03E714 8003DB14 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03E718 8003DB18 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 03E71C 8003DB1C 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 03E718 8003DB18 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 03E71C 8003DB1C 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 03E720 8003DB20 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 03E724 8003DB24 24060002 */ li $a2, 2 /* 03E728 8003DB28 0C00F366 */ jal func_8003CD98 /* 03E72C 8003DB2C 24070003 */ li $a3, 3 /* 03E730 8003DB30 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03E734 8003DB34 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 03E738 8003DB38 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 03E734 8003DB34 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 03E738 8003DB38 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 03E73C 8003DB3C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 03E740 8003DB40 24060003 */ li $a2, 3 /* 03E744 8003DB44 0C00F366 */ jal func_8003CD98 diff --git a/asm/non_matchings/code_800393C0/func_8003DB5C.s b/asm/non_matchings/code_800393C0/func_8003DB5C.s deleted file mode 100644 index fa085fdaa..000000000 --- a/asm/non_matchings/code_800393C0/func_8003DB5C.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_8003DB5C -/* 03E75C 8003DB5C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 03E760 8003DB60 AFB10020 */ sw $s1, 0x20($sp) -/* 03E764 8003DB64 3C11800E */ lui $s1, %hi(D_800DC4DC) # $s1, 0x800e -/* 03E768 8003DB68 8E31C4DC */ lw $s1, %lo(D_800DC4DC)($s1) -/* 03E76C 8003DB6C AFBF002C */ sw $ra, 0x2c($sp) -/* 03E770 8003DB70 AFB30028 */ sw $s3, 0x28($sp) -/* 03E774 8003DB74 AFB20024 */ sw $s2, 0x24($sp) -/* 03E778 8003DB78 AFB0001C */ sw $s0, 0x1c($sp) -/* 03E77C 8003DB7C 240E0003 */ li $t6, 3 -/* 03E780 8003DB80 8627002E */ lh $a3, 0x2e($s1) -/* 03E784 8003DB84 8E26001C */ lw $a2, 0x1c($s1) -/* 03E788 8003DB88 C62E0018 */ lwc1 $f14, 0x18($s1) -/* 03E78C 8003DB8C C62C0014 */ lwc1 $f12, 0x14($s1) -/* 03E790 8003DB90 AFA00014 */ sw $zero, 0x14($sp) -/* 03E794 8003DB94 0C007134 */ jal func_8001C4D0 -/* 03E798 8003DB98 AFAE0010 */ sw $t6, 0x10($sp) -/* 03E79C 8003DB9C C62C0014 */ lwc1 $f12, 0x14($s1) -/* 03E7A0 8003DBA0 C62E0018 */ lwc1 $f14, 0x18($s1) -/* 03E7A4 8003DBA4 8E26001C */ lw $a2, 0x1c($s1) -/* 03E7A8 8003DBA8 8627002E */ lh $a3, 0x2e($s1) -/* 03E7AC 8003DBAC 240F0003 */ li $t7, 3 -/* 03E7B0 8003DBB0 24180001 */ li $t8, 1 -/* 03E7B4 8003DBB4 AFB80014 */ sw $t8, 0x14($sp) -/* 03E7B8 8003DBB8 0C007134 */ jal func_8001C4D0 -/* 03E7BC 8003DBBC AFAF0010 */ sw $t7, 0x10($sp) -/* 03E7C0 8003DBC0 00008025 */ move $s0, $zero -/* 03E7C4 8003DBC4 24130008 */ li $s3, 8 -.L8003DBC8: -/* 03E7C8 8003DBC8 00109600 */ sll $s2, $s0, 0x18 -/* 03E7CC 8003DBCC 0012CE03 */ sra $t9, $s2, 0x18 -/* 03E7D0 8003DBD0 00192E00 */ sll $a1, $t9, 0x18 -/* 03E7D4 8003DBD4 00054603 */ sra $t0, $a1, 0x18 -/* 03E7D8 8003DBD8 01002825 */ move $a1, $t0 -/* 03E7DC 8003DBDC 03209025 */ move $s2, $t9 -/* 03E7E0 8003DBE0 02202025 */ move $a0, $s1 -/* 03E7E4 8003DBE4 24060001 */ li $a2, 1 -/* 03E7E8 8003DBE8 0C009E88 */ jal func_80027A20 -/* 03E7EC 8003DBEC 00003825 */ move $a3, $zero -/* 03E7F0 8003DBF0 00122E00 */ sll $a1, $s2, 0x18 -/* 03E7F4 8003DBF4 00054E03 */ sra $t1, $a1, 0x18 -/* 03E7F8 8003DBF8 01202825 */ move $a1, $t1 -/* 03E7FC 8003DBFC 02202025 */ move $a0, $s1 -/* 03E800 8003DC00 24060001 */ li $a2, 1 -/* 03E804 8003DC04 0C009E88 */ jal func_80027A20 -/* 03E808 8003DC08 24070001 */ li $a3, 1 -/* 03E80C 8003DC0C 26100001 */ addiu $s0, $s0, 1 -/* 03E810 8003DC10 1613FFED */ bne $s0, $s3, .L8003DBC8 -/* 03E814 8003DC14 26310DD8 */ addiu $s1, $s1, 0xdd8 -/* 03E818 8003DC18 8FBF002C */ lw $ra, 0x2c($sp) -/* 03E81C 8003DC1C 8FB0001C */ lw $s0, 0x1c($sp) -/* 03E820 8003DC20 8FB10020 */ lw $s1, 0x20($sp) -/* 03E824 8003DC24 8FB20024 */ lw $s2, 0x24($sp) -/* 03E828 8003DC28 8FB30028 */ lw $s3, 0x28($sp) -/* 03E82C 8003DC2C 03E00008 */ jr $ra -/* 03E830 8003DC30 27BD0030 */ addiu $sp, $sp, 0x30 - -/* 03E834 8003DC34 00000000 */ nop -/* 03E838 8003DC38 00000000 */ nop diff --git a/asm/non_matchings/code_800393C0/spawn_player.s b/asm/non_matchings/code_800393C0/spawn_player.s deleted file mode 100644 index e949b6a3f..000000000 --- a/asm/non_matchings/code_800393C0/spawn_player.s +++ /dev/null @@ -1,464 +0,0 @@ -glabel spawn_player -/* 039FC0 800393C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 039FC4 800393C4 44802000 */ mtc1 $zero, $f4 -/* 039FC8 800393C8 AFBF0024 */ sw $ra, 0x24($sp) -/* 039FCC 800393CC AFB00020 */ sw $s0, 0x20($sp) -/* 039FD0 800393D0 AFA5002C */ sw $a1, 0x2c($sp) -/* 039FD4 800393D4 AFA70034 */ sw $a3, 0x34($sp) -/* 039FD8 800393D8 A4800000 */ sh $zero, ($a0) -/* 039FDC 800393DC E484008C */ swc1 $f4, 0x8c($a0) -/* 039FE0 800393E0 97AE0042 */ lhu $t6, 0x42($sp) -/* 039FE4 800393E4 3C01800E */ lui $at, %hi(gKartFrictionTable) -/* 039FE8 800393E8 A48000B6 */ sh $zero, 0xb6($a0) -/* 039FEC 800393EC 31C2FFFF */ andi $v0, $t6, 0xffff -/* 039FF0 800393F0 00027880 */ sll $t7, $v0, 2 -/* 039FF4 800393F4 002F0821 */ addu $at, $at, $t7 -/* 039FF8 800393F8 A48E0254 */ sh $t6, 0x254($a0) -/* 039FFC 800393FC C4262630 */ lwc1 $f6, %lo(gKartFrictionTable)($at) -/* 03A000 80039400 3C01800E */ lui $at, %hi(gKartBoundingBoxTable) -/* 03A004 80039404 002F0821 */ addu $at, $at, $t7 -/* 03A008 80039408 E48600FC */ swc1 $f6, 0xfc($a0) -/* 03A00C 8003940C C42826B0 */ lwc1 $f8, %lo(gKartBoundingBoxTable)($at) -/* 03A010 80039410 3C01800E */ lui $at, %hi(gKartGravityTable) -/* 03A014 80039414 002F0821 */ addu $at, $at, $t7 -/* 03A018 80039418 E4880070 */ swc1 $f8, 0x70($a0) -/* 03A01C 8003941C C42A2650 */ lwc1 $f10, %lo(gKartGravityTable)($at) -/* 03A020 80039420 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e -/* 03A024 80039424 44866000 */ mtc1 $a2, $f12 -/* 03A028 80039428 E48A0100 */ swc1 $f10, 0x100($a0) -/* 03A02C 8003942C 8C63C53C */ lw $v1, %lo(gModeSelection)($v1) -/* 03A030 80039430 00808025 */ move $s0, $a0 -/* 03A034 80039434 01E01025 */ move $v0, $t7 -/* 03A038 80039438 10600009 */ beqz $v1, .L80039460 -/* 03A03C 8003943C 24010001 */ li $at, 1 -/* 03A040 80039440 1061002A */ beq $v1, $at, .L800394EC -/* 03A044 80039444 24010002 */ li $at, 2 -/* 03A048 80039448 10610005 */ beq $v1, $at, .L80039460 -/* 03A04C 8003944C 24010003 */ li $at, 3 -/* 03A050 80039450 1061003B */ beq $v1, $at, .L80039540 -/* 03A054 80039454 3C0A800E */ lui $t2, %hi(D_800E2410) -/* 03A058 80039458 1000004D */ b .L80039590 -/* 03A05C 8003945C E60C0014 */ swc1 $f12, 0x14($s0) -.L80039460: -/* 03A060 80039460 3C03800E */ lui $v1, %hi(D_800DC548) # $v1, 0x800e -/* 03A064 80039464 2463C548 */ addiu $v1, %lo(D_800DC548) # addiu $v1, $v1, -0x3ab8 -/* 03A068 80039468 8C780000 */ lw $t8, ($v1) -/* 03A06C 8003946C 3C08800E */ lui $t0, %hi(D_800E2400) -/* 03A070 80039470 3C0C800E */ lui $t4, %hi(D_800E24B4) -/* 03A074 80039474 0018C880 */ sll $t9, $t8, 2 -/* 03A078 80039478 01194021 */ addu $t0, $t0, $t9 -/* 03A07C 8003947C 8D082400 */ lw $t0, %lo(D_800E2400)($t0) -/* 03A080 80039480 3C18800E */ lui $t8, %hi(D_800E2568) -/* 03A084 80039484 01024821 */ addu $t1, $t0, $v0 -/* 03A088 80039488 C5320000 */ lwc1 $f18, ($t1) -/* 03A08C 8003948C E6120084 */ swc1 $f18, 0x84($s0) -/* 03A090 80039490 8C6A0000 */ lw $t2, ($v1) -/* 03A094 80039494 000A5880 */ sll $t3, $t2, 2 -/* 03A098 80039498 018B6021 */ addu $t4, $t4, $t3 -/* 03A09C 8003949C 8D8C24B4 */ lw $t4, %lo(D_800E24B4)($t4) -/* 03A0A0 800394A0 3C0A800E */ lui $t2, %hi(D_800E261C) -/* 03A0A4 800394A4 01826821 */ addu $t5, $t4, $v0 -/* 03A0A8 800394A8 C5A40000 */ lwc1 $f4, ($t5) -/* 03A0AC 800394AC E6040088 */ swc1 $f4, 0x88($s0) -/* 03A0B0 800394B0 8C6E0000 */ lw $t6, ($v1) -/* 03A0B4 800394B4 000E7880 */ sll $t7, $t6, 2 -/* 03A0B8 800394B8 030FC021 */ addu $t8, $t8, $t7 -/* 03A0BC 800394BC 8F182568 */ lw $t8, %lo(D_800E2568)($t8) -/* 03A0C0 800394C0 0302C821 */ addu $t9, $t8, $v0 -/* 03A0C4 800394C4 C7260000 */ lwc1 $f6, ($t9) -/* 03A0C8 800394C8 E6060210 */ swc1 $f6, 0x210($s0) -/* 03A0CC 800394CC 8C680000 */ lw $t0, ($v1) -/* 03A0D0 800394D0 00084880 */ sll $t1, $t0, 2 -/* 03A0D4 800394D4 01495021 */ addu $t2, $t2, $t1 -/* 03A0D8 800394D8 8D4A261C */ lw $t2, %lo(D_800E261C)($t2) -/* 03A0DC 800394DC 01425821 */ addu $t3, $t2, $v0 -/* 03A0E0 800394E0 C5680000 */ lwc1 $f8, ($t3) -/* 03A0E4 800394E4 10000029 */ b .L8003958C -/* 03A0E8 800394E8 E6080214 */ swc1 $f8, 0x214($s0) -.L800394EC: -/* 03A0EC 800394EC 3C0C800E */ lui $t4, %hi(D_800E2404) # $t4, 0x800e -/* 03A0F0 800394F0 8D8C2404 */ lw $t4, %lo(D_800E2404)($t4) -/* 03A0F4 800394F4 3C0E800E */ lui $t6, %hi(D_800E24B8) # $t6, 0x800e -/* 03A0F8 800394F8 3C18800E */ lui $t8, %hi(D_800E256C) # $t8, 0x800e -/* 03A0FC 800394FC 01826821 */ addu $t5, $t4, $v0 -/* 03A100 80039500 C5AA0000 */ lwc1 $f10, ($t5) -/* 03A104 80039504 3C08800E */ lui $t0, %hi(D_800E2620) # $t0, 0x800e -/* 03A108 80039508 E60A0084 */ swc1 $f10, 0x84($s0) -/* 03A10C 8003950C 8DCE24B8 */ lw $t6, %lo(D_800E24B8)($t6) -/* 03A110 80039510 01C27821 */ addu $t7, $t6, $v0 -/* 03A114 80039514 C5F20000 */ lwc1 $f18, ($t7) -/* 03A118 80039518 E6120088 */ swc1 $f18, 0x88($s0) -/* 03A11C 8003951C 8F18256C */ lw $t8, %lo(D_800E256C)($t8) -/* 03A120 80039520 0302C821 */ addu $t9, $t8, $v0 -/* 03A124 80039524 C7240000 */ lwc1 $f4, ($t9) -/* 03A128 80039528 E6040210 */ swc1 $f4, 0x210($s0) -/* 03A12C 8003952C 8D082620 */ lw $t0, %lo(D_800E2620)($t0) -/* 03A130 80039530 01024821 */ addu $t1, $t0, $v0 -/* 03A134 80039534 C5260000 */ lwc1 $f6, ($t1) -/* 03A138 80039538 10000014 */ b .L8003958C -/* 03A13C 8003953C E6060214 */ swc1 $f6, 0x214($s0) -.L80039540: -/* 03A140 80039540 8D4A2410 */ lw $t2, %lo(D_800E2410)($t2) -/* 03A144 80039544 3C0C800E */ lui $t4, %hi(D_800E24C4) # $t4, 0x800e -/* 03A148 80039548 3C0E800E */ lui $t6, %hi(D_800E2578) # $t6, 0x800e -/* 03A14C 8003954C 01425821 */ addu $t3, $t2, $v0 -/* 03A150 80039550 C5680000 */ lwc1 $f8, ($t3) -/* 03A154 80039554 3C18800E */ lui $t8, %hi(D_800E262C) # $t8, 0x800e -/* 03A158 80039558 E6080084 */ swc1 $f8, 0x84($s0) -/* 03A15C 8003955C 8D8C24C4 */ lw $t4, %lo(D_800E24C4)($t4) -/* 03A160 80039560 01826821 */ addu $t5, $t4, $v0 -/* 03A164 80039564 C5AA0000 */ lwc1 $f10, ($t5) -/* 03A168 80039568 E60A0088 */ swc1 $f10, 0x88($s0) -/* 03A16C 8003956C 8DCE2578 */ lw $t6, %lo(D_800E2578)($t6) -/* 03A170 80039570 01C27821 */ addu $t7, $t6, $v0 -/* 03A174 80039574 C5F20000 */ lwc1 $f18, ($t7) -/* 03A178 80039578 E6120210 */ swc1 $f18, 0x210($s0) -/* 03A17C 8003957C 8F18262C */ lw $t8, %lo(D_800E262C)($t8) -/* 03A180 80039580 0302C821 */ addu $t9, $t8, $v0 -/* 03A184 80039584 C7240000 */ lwc1 $f4, ($t9) -/* 03A188 80039588 E6040214 */ swc1 $f4, 0x214($s0) -.L8003958C: -/* 03A18C 8003958C E60C0014 */ swc1 $f12, 0x14($s0) -.L80039590: -/* 03A190 80039590 3C014248 */ li $at, 0x42480000 # 50.000000 -/* 03A194 80039594 44814000 */ mtc1 $at, $f8 -/* 03A198 80039598 C7A60038 */ lwc1 $f6, 0x38($sp) -/* 03A19C 8003959C E7AC0030 */ swc1 $f12, 0x30($sp) -/* 03A1A0 800395A0 8FA60034 */ lw $a2, 0x34($sp) -/* 03A1A4 800395A4 0C0AB870 */ jal func_802AE1C0 -/* 03A1A8 800395A8 46083380 */ add.s $f14, $f6, $f8 -/* 03A1AC 800395AC C60A0070 */ lwc1 $f10, 0x70($s0) -/* 03A1B0 800395B0 C7B00034 */ lwc1 $f16, 0x34($sp) -/* 03A1B4 800395B4 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 03A1B8 800395B8 460A0300 */ add.s $f12, $f0, $f10 -/* 03A1BC 800395BC E610001C */ swc1 $f16, 0x1c($s0) -/* 03A1C0 800395C0 44817000 */ mtc1 $at, $f14 -/* 03A1C4 800395C4 3C018016 */ lui $at, %hi(D_80164510) -/* 03A1C8 800395C8 E60C0018 */ swc1 $f12, 0x18($s0) -/* 03A1CC 800395CC C7B20030 */ lwc1 $f18, 0x30($sp) -/* 03A1D0 800395D0 E60C0024 */ swc1 $f12, 0x24($s0) -/* 03A1D4 800395D4 44801000 */ mtc1 $zero, $f2 -/* 03A1D8 800395D8 E6120020 */ swc1 $f18, 0x20($s0) -/* 03A1DC 800395DC 83A2002F */ lb $v0, 0x2f($sp) -/* 03A1E0 800395E0 240BFFFF */ li $t3, -1 -/* 03A1E4 800395E4 240D00FF */ li $t5, 255 -/* 03A1E8 800395E8 00024080 */ sll $t0, $v0, 2 -/* 03A1EC 800395EC 00280821 */ addu $at, $at, $t0 -/* 03A1F0 800395F0 E42C4510 */ swc1 $f12, %lo(D_80164510)($at) -/* 03A1F4 800395F4 A600002C */ sh $zero, 0x2c($s0) -/* 03A1F8 800395F8 E6100028 */ swc1 $f16, 0x28($s0) -/* 03A1FC 800395FC E60E005C */ swc1 $f14, 0x5c($s0) -/* 03A200 80039600 E6020058 */ swc1 $f2, 0x58($s0) -/* 03A204 80039604 E6020060 */ swc1 $f2, 0x60($s0) -/* 03A208 80039608 E6020034 */ swc1 $f2, 0x34($s0) -/* 03A20C 8003960C E6020038 */ swc1 $f2, 0x38($s0) -/* 03A210 80039610 E602003C */ swc1 $f2, 0x3c($s0) -/* 03A214 80039614 C7A4003C */ lwc1 $f4, 0x3c($sp) -/* 03A218 80039618 A6000030 */ sh $zero, 0x30($s0) -/* 03A21C 8003961C A60000FA */ sh $zero, 0xfa($s0) -/* 03A220 80039620 4600218D */ trunc.w.s $f6, $f4 -/* 03A224 80039624 A6000002 */ sh $zero, 2($s0) -/* 03A228 80039628 AE0000BC */ sw $zero, 0xbc($s0) -/* 03A22C 8003962C A60000C0 */ sh $zero, 0xc0($s0) -/* 03A230 80039630 440A3000 */ mfc1 $t2, $f6 -/* 03A234 80039634 AE00007C */ sw $zero, 0x7c($s0) -/* 03A238 80039638 A600007A */ sh $zero, 0x7a($s0) -/* 03A23C 8003963C A6000006 */ sh $zero, 6($s0) -/* 03A240 80039640 A60B0008 */ sh $t3, 8($s0) -/* 03A244 80039644 E602008C */ swc1 $f2, 0x8c($s0) -/* 03A248 80039648 E6020090 */ swc1 $f2, 0x90($s0) -/* 03A24C 8003964C E6020094 */ swc1 $f2, 0x94($s0) -/* 03A250 80039650 E6020074 */ swc1 $f2, 0x74($s0) -/* 03A254 80039654 A60A002E */ sh $t2, 0x2e($s0) -/* 03A258 80039658 87AC0046 */ lh $t4, 0x46($sp) -/* 03A25C 8003965C A60000CA */ sh $zero, 0xca($s0) -/* 03A260 80039660 A60000DE */ sh $zero, 0xde($s0) -/* 03A264 80039664 A600010C */ sh $zero, 0x10c($s0) -/* 03A268 80039668 A60000E2 */ sh $zero, 0xe2($s0) -/* 03A26C 8003966C E60200E8 */ swc1 $f2, 0xe8($s0) -/* 03A270 80039670 E60200A0 */ swc1 $f2, 0xa0($s0) -/* 03A274 80039674 E6020104 */ swc1 $f2, 0x104($s0) -/* 03A278 80039678 E602009C */ swc1 $f2, 0x9c($s0) -/* 03A27C 8003967C E602020C */ swc1 $f2, 0x20c($s0) -/* 03A280 80039680 E6020DAC */ swc1 $f2, 0xdac($s0) -/* 03A284 80039684 A6000044 */ sh $zero, 0x44($s0) -/* 03A288 80039688 A6000046 */ sh $zero, 0x46($s0) -/* 03A28C 8003968C AE00000C */ sw $zero, 0xc($s0) -/* 03A290 80039690 A60D00C6 */ sh $t5, 0xc6($s0) -/* 03A294 80039694 A6000206 */ sh $zero, 0x206($s0) -/* 03A298 80039698 A60000C4 */ sh $zero, 0xc4($s0) -/* 03A29C 8003969C A6000D98 */ sh $zero, 0xd98($s0) -/* 03A2A0 800396A0 A6000D9A */ sh $zero, 0xd9a($s0) -/* 03A2A4 800396A4 A6000DA4 */ sh $zero, 0xda4($s0) -/* 03A2A8 800396A8 A6000DA6 */ sh $zero, 0xda6($s0) -/* 03A2AC 800396AC A6000DB4 */ sh $zero, 0xdb4($s0) -/* 03A2B0 800396B0 A6000DB6 */ sh $zero, 0xdb6($s0) -/* 03A2B4 800396B4 A6000DCC */ sh $zero, 0xdcc($s0) -/* 03A2B8 800396B8 A6000DCE */ sh $zero, 0xdce($s0) -/* 03A2BC 800396BC A6000DD0 */ sh $zero, 0xdd0($s0) -/* 03A2C0 800396C0 A6000DD2 */ sh $zero, 0xdd2($s0) -/* 03A2C4 800396C4 A6000DD4 */ sh $zero, 0xdd4($s0) -/* 03A2C8 800396C8 A6000042 */ sh $zero, 0x42($s0) -/* 03A2CC 800396CC A6000078 */ sh $zero, 0x78($s0) -/* 03A2D0 800396D0 A60000A8 */ sh $zero, 0xa8($s0) -/* 03A2D4 800396D4 A60000AA */ sh $zero, 0xaa($s0) -/* 03A2D8 800396D8 A60000AC */ sh $zero, 0xac($s0) -/* 03A2DC 800396DC A60000AE */ sh $zero, 0xae($s0) -/* 03A2E0 800396E0 A60000B0 */ sh $zero, 0xb0($s0) -/* 03A2E4 800396E4 A60000B2 */ sh $zero, 0xb2($s0) -/* 03A2E8 800396E8 A60000B4 */ sh $zero, 0xb4($s0) -/* 03A2EC 800396EC A60000C0 */ sh $zero, 0xc0($s0) -/* 03A2F0 800396F0 A60000C2 */ sh $zero, 0xc2($s0) -/* 03A2F4 800396F4 A60000C8 */ sh $zero, 0xc8($s0) -/* 03A2F8 800396F8 A60000CA */ sh $zero, 0xca($s0) -/* 03A2FC 800396FC A60000DC */ sh $zero, 0xdc($s0) -/* 03A300 80039700 A60000DE */ sh $zero, 0xde($s0) -/* 03A304 80039704 A60000E0 */ sh $zero, 0xe0($s0) -/* 03A308 80039708 A60000E2 */ sh $zero, 0xe2($s0) -/* 03A30C 8003970C A600010C */ sh $zero, 0x10c($s0) -/* 03A310 80039710 AE000200 */ sw $zero, 0x200($s0) -/* 03A314 80039714 A6000204 */ sh $zero, 0x204($s0) -/* 03A318 80039718 A6000220 */ sh $zero, 0x220($s0) -/* 03A31C 8003971C A6000228 */ sh $zero, 0x228($s0) -/* 03A320 80039720 A600022A */ sh $zero, 0x22a($s0) -/* 03A324 80039724 A6000234 */ sh $zero, 0x234($s0) -/* 03A328 80039728 A6000236 */ sh $zero, 0x236($s0) -/* 03A32C 8003972C A6000238 */ sh $zero, 0x238($s0) -/* 03A330 80039730 A600023A */ sh $zero, 0x23a($s0) -/* 03A334 80039734 AE000240 */ sw $zero, 0x240($s0) -/* 03A338 80039738 A6000256 */ sh $zero, 0x256($s0) -/* 03A33C 8003973C E60E0224 */ swc1 $f14, 0x224($s0) -/* 03A340 80039740 E60E0DAC */ swc1 $f14, 0xdac($s0) -/* 03A344 80039744 E6020064 */ swc1 $f2, 0x64($s0) -/* 03A348 80039748 E6020068 */ swc1 $f2, 0x68($s0) -/* 03A34C 8003974C E602006C */ swc1 $f2, 0x6c($s0) -/* 03A350 80039750 E6020080 */ swc1 $f2, 0x80($s0) -/* 03A354 80039754 E6020D9C */ swc1 $f2, 0xd9c($s0) -/* 03A358 80039758 E6020DA0 */ swc1 $f2, 0xda0($s0) -/* 03A35C 8003975C E6020DA8 */ swc1 $f2, 0xda8($s0) -/* 03A360 80039760 E6020DB0 */ swc1 $f2, 0xdb0($s0) -/* 03A364 80039764 E6020DB8 */ swc1 $f2, 0xdb8($s0) -/* 03A368 80039768 E6020DBC */ swc1 $f2, 0xdbc($s0) -/* 03A36C 8003976C E6020DC0 */ swc1 $f2, 0xdc0($s0) -/* 03A370 80039770 E6020DC4 */ swc1 $f2, 0xdc4($s0) -/* 03A374 80039774 E6020DC8 */ swc1 $f2, 0xdc8($s0) -/* 03A378 80039778 E6020084 */ swc1 $f2, 0x84($s0) -/* 03A37C 8003977C E6020088 */ swc1 $f2, 0x88($s0) -/* 03A380 80039780 E602008C */ swc1 $f2, 0x8c($s0) -/* 03A384 80039784 E6020090 */ swc1 $f2, 0x90($s0) -/* 03A388 80039788 E6020094 */ swc1 $f2, 0x94($s0) -/* 03A38C 8003978C E6020098 */ swc1 $f2, 0x98($s0) -/* 03A390 80039790 E602009C */ swc1 $f2, 0x9c($s0) -/* 03A394 80039794 E60200A0 */ swc1 $f2, 0xa0($s0) -/* 03A398 80039798 E60200A4 */ swc1 $f2, 0xa4($s0) -/* 03A39C 8003979C E60200B8 */ swc1 $f2, 0xb8($s0) -/* 03A3A0 800397A0 E60200E4 */ swc1 $f2, 0xe4($s0) -/* 03A3A4 800397A4 E60200E8 */ swc1 $f2, 0xe8($s0) -/* 03A3A8 800397A8 E60200EC */ swc1 $f2, 0xec($s0) -/* 03A3AC 800397AC E60200F0 */ swc1 $f2, 0xf0($s0) -/* 03A3B0 800397B0 E60200F4 */ swc1 $f2, 0xf4($s0) -/* 03A3B4 800397B4 E6020104 */ swc1 $f2, 0x104($s0) -/* 03A3B8 800397B8 E6020108 */ swc1 $f2, 0x108($s0) -/* 03A3BC 800397BC E60201F8 */ swc1 $f2, 0x1f8($s0) -/* 03A3C0 800397C0 E60201FC */ swc1 $f2, 0x1fc($s0) -/* 03A3C4 800397C4 E6020208 */ swc1 $f2, 0x208($s0) -/* 03A3C8 800397C8 E602020C */ swc1 $f2, 0x20c($s0) -/* 03A3CC 800397CC E6020210 */ swc1 $f2, 0x210($s0) -/* 03A3D0 800397D0 E6020218 */ swc1 $f2, 0x218($s0) -/* 03A3D4 800397D4 E602021C */ swc1 $f2, 0x21c($s0) -/* 03A3D8 800397D8 E602022C */ swc1 $f2, 0x22c($s0) -/* 03A3DC 800397DC E6020230 */ swc1 $f2, 0x230($s0) -/* 03A3E0 800397E0 E602023C */ swc1 $f2, 0x23c($s0) -/* 03A3E4 800397E4 A60C0000 */ sh $t4, ($s0) -/* 03A3E8 800397E8 83A7002F */ lb $a3, 0x2f($sp) -/* 03A3EC 800397EC 01001025 */ move $v0, $t0 -/* 03A3F0 800397F0 3C0F8016 */ lui $t7, %hi(D_801650D0) # $t7, 0x8016 -/* 03A3F4 800397F4 00077040 */ sll $t6, $a3, 1 -/* 03A3F8 800397F8 3C188016 */ lui $t8, %hi(D_80165110) # $t8, 0x8016 -/* 03A3FC 800397FC 3C198016 */ lui $t9, %hi(D_80165190) # $t9, 0x8016 -/* 03A400 80039800 3C088016 */ lui $t0, %hi(D_801651D0) # $t0, 0x8016 -/* 03A404 80039804 25EF50D0 */ addiu $t7, %lo(D_801650D0) # addiu $t7, $t7, 0x50d0 -/* 03A408 80039808 27185110 */ addiu $t8, %lo(D_80165110) # addiu $t8, $t8, 0x5110 -/* 03A40C 8003980C 27395190 */ addiu $t9, %lo(D_80165190) # addiu $t9, $t9, 0x5190 -/* 03A410 80039810 250851D0 */ addiu $t0, %lo(D_801651D0) # addiu $t0, $t0, 0x51d0 -/* 03A414 80039814 01CF1821 */ addu $v1, $t6, $t7 -/* 03A418 80039818 01D82021 */ addu $a0, $t6, $t8 -/* 03A41C 8003981C 01D92821 */ addu $a1, $t6, $t9 -/* 03A420 80039820 01C83021 */ addu $a2, $t6, $t0 -/* 03A424 80039824 3C018016 */ lui $at, 0x8016 -/* 03A428 80039828 A4600000 */ sh $zero, ($v1) -/* 03A42C 8003982C A4600010 */ sh $zero, 0x10($v1) -/* 03A430 80039830 A4600020 */ sh $zero, 0x20($v1) -/* 03A434 80039834 A4600030 */ sh $zero, 0x30($v1) -/* 03A438 80039838 A4800000 */ sh $zero, ($a0) -/* 03A43C 8003983C A4800010 */ sh $zero, 0x10($a0) -/* 03A440 80039840 A4800020 */ sh $zero, 0x20($a0) -/* 03A444 80039844 A4800030 */ sh $zero, 0x30($a0) -/* 03A448 80039848 A4A00000 */ sh $zero, ($a1) -/* 03A44C 8003984C A4A00010 */ sh $zero, 0x10($a1) -/* 03A450 80039850 A4A00020 */ sh $zero, 0x20($a1) -/* 03A454 80039854 A4A00030 */ sh $zero, 0x30($a1) -/* 03A458 80039858 A4C00000 */ sh $zero, ($a2) -/* 03A45C 8003985C A4C00010 */ sh $zero, 0x10($a2) -/* 03A460 80039860 A4C00020 */ sh $zero, 0x20($a2) -/* 03A464 80039864 A4C00030 */ sh $zero, 0x30($a2) -/* 03A468 80039868 00220821 */ addu $at, $at, $v0 -/* 03A46C 8003986C AC205420 */ sw $zero, 0x5420($at) -/* 03A470 80039870 3C018016 */ lui $at, 0x8016 -/* 03A474 80039874 00220821 */ addu $at, $at, $v0 -/* 03A478 80039878 AC205440 */ sw $zero, 0x5440($at) -/* 03A47C 8003987C 3C018016 */ lui $at, 0x8016 -/* 03A480 80039880 00220821 */ addu $at, $at, $v0 -/* 03A484 80039884 AC205460 */ sw $zero, 0x5460($at) -/* 03A488 80039888 3C018016 */ lui $at, 0x8016 -/* 03A48C 8003988C 00220821 */ addu $at, $at, $v0 -/* 03A490 80039890 AC205480 */ sw $zero, 0x5480($at) -/* 03A494 80039894 3C018016 */ lui $at, 0x8016 -/* 03A498 80039898 00220821 */ addu $at, $at, $v0 -/* 03A49C 8003989C AC2054E0 */ sw $zero, 0x54e0($at) -/* 03A4A0 800398A0 3C018016 */ lui $at, 0x8016 -/* 03A4A4 800398A4 00220821 */ addu $at, $at, $v0 -/* 03A4A8 800398A8 AC205500 */ sw $zero, 0x5500($at) -/* 03A4AC 800398AC 3C018016 */ lui $at, 0x8016 -/* 03A4B0 800398B0 00220821 */ addu $at, $at, $v0 -/* 03A4B4 800398B4 AC205520 */ sw $zero, 0x5520($at) -/* 03A4B8 800398B8 3C018016 */ lui $at, 0x8016 -/* 03A4BC 800398BC 00220821 */ addu $at, $at, $v0 -/* 03A4C0 800398C0 AC205540 */ sw $zero, 0x5540($at) -/* 03A4C4 800398C4 3C018019 */ lui $at, %hi(D_8018D900) # $at, 0x8019 -/* 03A4C8 800398C8 AC20D900 */ sw $zero, %lo(D_8018D900)($at) -/* 03A4CC 800398CC 3C018016 */ lui $at, 0x8016 -/* 03A4D0 800398D0 00220821 */ addu $at, $at, $v0 -/* 03A4D4 800398D4 AC2052E0 */ sw $zero, 0x52e0($at) -/* 03A4D8 800398D8 83A9002F */ lb $t1, 0x2f($sp) -/* 03A4DC 800398DC 3C018016 */ lui $at, 0x8016 -/* 03A4E0 800398E0 00220821 */ addu $at, $at, $v0 -/* 03A4E4 800398E4 AC2052C0 */ sw $zero, 0x52c0($at) -/* 03A4E8 800398E8 3C018016 */ lui $at, 0x8016 -/* 03A4EC 800398EC 00095080 */ sll $t2, $t1, 2 -/* 03A4F0 800398F0 002E0821 */ addu $at, $at, $t6 -/* 03A4F4 800398F4 3C0B8016 */ lui $t3, %hi(D_80165070) # $t3, 0x8016 -/* 03A4F8 800398F8 01495023 */ subu $t2, $t2, $t1 -/* 03A4FC 800398FC A4205020 */ sh $zero, 0x5020($at) -/* 03A500 80039900 000A5080 */ sll $t2, $t2, 2 -/* 03A504 80039904 256B5070 */ addiu $t3, %lo(D_80165070) # addiu $t3, $t3, 0x5070 -/* 03A508 80039908 014B1821 */ addu $v1, $t2, $t3 -/* 03A50C 8003990C 3C018016 */ lui $at, %hi(D_80165280) -/* 03A510 80039910 00220821 */ addu $at, $at, $v0 -/* 03A514 80039914 E4620000 */ swc1 $f2, ($v1) -/* 03A518 80039918 E4620004 */ swc1 $f2, 4($v1) -/* 03A51C 8003991C E4620008 */ swc1 $f2, 8($v1) -/* 03A520 80039920 E4225280 */ swc1 $f2, %lo(D_80165280)($at) -/* 03A524 80039924 3C018016 */ lui $at, %hi(D_801652A0) -/* 03A528 80039928 00220821 */ addu $at, $at, $v0 -/* 03A52C 8003992C E42252A0 */ swc1 $f2, %lo(D_801652A0)($at) -/* 03A530 80039930 3C018016 */ lui $at, 0x8016 -/* 03A534 80039934 00220821 */ addu $at, $at, $v0 -/* 03A538 80039938 AC2053E0 */ sw $zero, 0x53e0($at) -/* 03A53C 8003993C 3C018016 */ lui $at, 0x8016 -/* 03A540 80039940 00220821 */ addu $at, $at, $v0 -/* 03A544 80039944 AC205400 */ sw $zero, 0x5400($at) -/* 03A548 80039948 3C018016 */ lui $at, 0x8016 -/* 03A54C 8003994C 00220821 */ addu $at, $at, $v0 -/* 03A550 80039950 AC2054A0 */ sw $zero, 0x54a0($at) -/* 03A554 80039954 3C018016 */ lui $at, 0x8016 -/* 03A558 80039958 00220821 */ addu $at, $at, $v0 -/* 03A55C 8003995C AC2054C0 */ sw $zero, 0x54c0($at) -/* 03A560 80039960 3C018016 */ lui $at, %hi(D_80165340) # $at, 0x8016 -/* 03A564 80039964 A4205340 */ sh $zero, %lo(D_80165340)($at) -/* 03A568 80039968 01C03825 */ move $a3, $t6 -/* 03A56C 8003996C A20001A4 */ sb $zero, 0x1a4($s0) -/* 03A570 80039970 A20001BC */ sb $zero, 0x1bc($s0) -/* 03A574 80039974 A20001D4 */ sb $zero, 0x1d4($s0) -/* 03A578 80039978 A20001EC */ sb $zero, 0x1ec($s0) -/* 03A57C 8003997C A20001A5 */ sb $zero, 0x1a5($s0) -/* 03A580 80039980 A20001BD */ sb $zero, 0x1bd($s0) -/* 03A584 80039984 A20001D5 */ sb $zero, 0x1d5($s0) -/* 03A588 80039988 A20001ED */ sb $zero, 0x1ed($s0) -/* 03A58C 8003998C A60001A6 */ sh $zero, 0x1a6($s0) -/* 03A590 80039990 A60001BE */ sh $zero, 0x1be($s0) -/* 03A594 80039994 A60001D6 */ sh $zero, 0x1d6($s0) -/* 03A598 80039998 A60001EE */ sh $zero, 0x1ee($s0) -/* 03A59C 8003999C AE0001C4 */ sw $zero, 0x1c4($s0) -/* 03A5A0 800399A0 AE0001AC */ sw $zero, 0x1ac($s0) -/* 03A5A4 800399A4 AE0001DC */ sw $zero, 0x1dc($s0) -/* 03A5A8 800399A8 AE0001F4 */ sw $zero, 0x1f4($s0) -/* 03A5AC 800399AC A6000110 */ sh $zero, 0x110($s0) -/* 03A5B0 800399B0 A6000112 */ sh $zero, 0x112($s0) -/* 03A5B4 800399B4 A6000114 */ sh $zero, 0x114($s0) -/* 03A5B8 800399B8 A6000116 */ sh $zero, 0x116($s0) -/* 03A5BC 800399BC A6000118 */ sh $zero, 0x118($s0) -/* 03A5C0 800399C0 A600011A */ sh $zero, 0x11a($s0) -/* 03A5C4 800399C4 E6020198 */ swc1 $f2, 0x198($s0) -/* 03A5C8 800399C8 E602019C */ swc1 $f2, 0x19c($s0) -/* 03A5CC 800399CC E60201A0 */ swc1 $f2, 0x1a0($s0) -/* 03A5D0 800399D0 E60201B0 */ swc1 $f2, 0x1b0($s0) -/* 03A5D4 800399D4 E60201B4 */ swc1 $f2, 0x1b4($s0) -/* 03A5D8 800399D8 E60201B8 */ swc1 $f2, 0x1b8($s0) -/* 03A5DC 800399DC E60201C8 */ swc1 $f2, 0x1c8($s0) -/* 03A5E0 800399E0 E60201CC */ swc1 $f2, 0x1cc($s0) -/* 03A5E4 800399E4 E60201D0 */ swc1 $f2, 0x1d0($s0) -/* 03A5E8 800399E8 E60201E0 */ swc1 $f2, 0x1e0($s0) -/* 03A5EC 800399EC E60201E4 */ swc1 $f2, 0x1e4($s0) -/* 03A5F0 800399F0 E60201E8 */ swc1 $f2, 0x1e8($s0) -/* 03A5F4 800399F4 E60201A8 */ swc1 $f2, 0x1a8($s0) -/* 03A5F8 800399F8 E60201C0 */ swc1 $f2, 0x1c0($s0) -/* 03A5FC 800399FC E60201D8 */ swc1 $f2, 0x1d8($s0) -/* 03A600 80039A00 E60201F0 */ swc1 $f2, 0x1f0($s0) -/* 03A604 80039A04 E602011C */ swc1 $f2, 0x11c($s0) -/* 03A608 80039A08 E6020120 */ swc1 $f2, 0x120($s0) -/* 03A60C 80039A0C E6020124 */ swc1 $f2, 0x124($s0) -/* 03A610 80039A10 E6020128 */ swc1 $f2, 0x128($s0) -/* 03A614 80039A14 E602012C */ swc1 $f2, 0x12c($s0) -/* 03A618 80039A18 E6020130 */ swc1 $f2, 0x130($s0) -/* 03A61C 80039A1C E6020134 */ swc1 $f2, 0x134($s0) -/* 03A620 80039A20 E6020138 */ swc1 $f2, 0x138($s0) -/* 03A624 80039A24 E602013C */ swc1 $f2, 0x13c($s0) -/* 03A628 80039A28 E6020140 */ swc1 $f2, 0x140($s0) -/* 03A62C 80039A2C E6020144 */ swc1 $f2, 0x144($s0) -/* 03A630 80039A30 E6020148 */ swc1 $f2, 0x148($s0) -/* 03A634 80039A34 83AC002F */ lb $t4, 0x2f($sp) -/* 03A638 80039A38 3C018016 */ lui $at, 0x8016 -/* 03A63C 80039A3C 3C0E8019 */ lui $t6, %hi(D_8018CE10) # $t6, 0x8019 -/* 03A640 80039A40 00270821 */ addu $at, $at, $a3 -/* 03A644 80039A44 25CECE10 */ addiu $t6, %lo(D_8018CE10) # addiu $t6, $t6, -0x31f0 -/* 03A648 80039A48 000C6940 */ sll $t5, $t4, 5 -/* 03A64C 80039A4C A4205300 */ sh $zero, 0x5300($at) -/* 03A650 80039A50 01AE1021 */ addu $v0, $t5, $t6 -/* 03A654 80039A54 E4420004 */ swc1 $f2, 4($v0) -/* 03A658 80039A58 E442000C */ swc1 $f2, 0xc($v0) -/* 03A65C 80039A5C 0C0A56FE */ jal func_80295BF8 -/* 03A660 80039A60 83A4002F */ lb $a0, 0x2f($sp) -/* 03A664 80039A64 0C0175B0 */ jal func_8005D6C0 -/* 03A668 80039A68 02002025 */ move $a0, $s0 -/* 03A66C 80039A6C 02002025 */ move $a0, $s0 -/* 03A670 80039A70 0C01AE1F */ jal func_8006B87C -/* 03A674 80039A74 83A5002F */ lb $a1, 0x2f($sp) -/* 03A678 80039A78 3C0F800E */ lui $t7, %hi(gModeSelection) # $t7, 0x800e -/* 03A67C 80039A7C 8DEFC53C */ lw $t7, %lo(gModeSelection)($t7) -/* 03A680 80039A80 24010003 */ li $at, 3 -/* 03A684 80039A84 02002025 */ move $a0, $s0 -/* 03A688 80039A88 55E10004 */ bnel $t7, $at, .L80039A9C -/* 03A68C 80039A8C 8618002E */ lh $t8, 0x2e($s0) -/* 03A690 80039A90 0C01ADF9 */ jal func_8006B7E4 -/* 03A694 80039A94 83A5002F */ lb $a1, 0x2f($sp) -/* 03A698 80039A98 8618002E */ lh $t8, 0x2e($s0) -.L80039A9C: -/* 03A69C 80039A9C 8E050058 */ lw $a1, 0x58($s0) -/* 03A6A0 80039AA0 8E06005C */ lw $a2, 0x5c($s0) -/* 03A6A4 80039AA4 8E070060 */ lw $a3, 0x60($s0) -/* 03A6A8 80039AA8 26040150 */ addiu $a0, $s0, 0x150 -/* 03A6AC 80039AAC 0C0AD950 */ jal func_802B6540 -/* 03A6B0 80039AB0 AFB80010 */ sw $t8, 0x10($sp) -/* 03A6B4 80039AB4 8619002E */ lh $t9, 0x2e($s0) -/* 03A6B8 80039AB8 8E050058 */ lw $a1, 0x58($s0) -/* 03A6BC 80039ABC 8E06005C */ lw $a2, 0x5c($s0) -/* 03A6C0 80039AC0 8E070060 */ lw $a3, 0x60($s0) -/* 03A6C4 80039AC4 26040174 */ addiu $a0, $s0, 0x174 -/* 03A6C8 80039AC8 0C0AD950 */ jal func_802B6540 -/* 03A6CC 80039ACC AFB90010 */ sw $t9, 0x10($sp) -/* 03A6D0 80039AD0 8FBF0024 */ lw $ra, 0x24($sp) -/* 03A6D4 80039AD4 8FB00020 */ lw $s0, 0x20($sp) -/* 03A6D8 80039AD8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 03A6DC 80039ADC 03E00008 */ jr $ra -/* 03A6E0 80039AE0 00000000 */ nop diff --git a/asm/non_matchings/code_800393C0/spawn_players_2p_battle.s b/asm/non_matchings/code_800393C0/spawn_players_2p_battle.s deleted file mode 100644 index 1561b66d3..000000000 --- a/asm/non_matchings/code_800393C0/spawn_players_2p_battle.s +++ /dev/null @@ -1,163 +0,0 @@ -glabel spawn_players_2p_battle -/* 03BC98 8003B098 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 03BC9C 8003B09C 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 03BCA0 8003B0A0 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 03BCA4 8003B0A4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 03BCA8 8003B0A8 4486A000 */ mtc1 $a2, $f20 -/* 03BCAC 8003B0AC AFB10038 */ sw $s1, 0x38($sp) -/* 03BCB0 8003B0B0 AFB00034 */ sw $s0, 0x34($sp) -/* 03BCB4 8003B0B4 24010013 */ li $at, 19 -/* 03BCB8 8003B0B8 00808025 */ move $s0, $a0 -/* 03BCBC 8003B0BC 00A08825 */ move $s1, $a1 -/* 03BCC0 8003B0C0 AFBF003C */ sw $ra, 0x3c($sp) -/* 03BCC4 8003B0C4 15C10023 */ bne $t6, $at, .L8003B154 -/* 03BCC8 8003B0C8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 03BCCC 8003B0CC 8E060000 */ lw $a2, ($s0) -/* 03BCD0 8003B0D0 8E270000 */ lw $a3, ($s1) -/* 03BCD4 8003B0D4 3C01C680 */ li $at, 0xC6800000 # -16384.000000 -/* 03BCD8 8003B0D8 3C0F800F */ lui $t7, %hi(D_800E86A8) # $t7, 0x800f -/* 03BCDC 8003B0DC 81EF86A8 */ lb $t7, %lo(D_800E86A8)($t7) -/* 03BCE0 8003B0E0 44812000 */ mtc1 $at, $f4 -/* 03BCE4 8003B0E4 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03BCE8 8003B0E8 2418E000 */ li $t8, -8192 -/* 03BCEC 8003B0EC AFB8001C */ sw $t8, 0x1c($sp) -/* 03BCF0 8003B0F0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03BCF4 8003B0F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BCF8 8003B0F8 00002825 */ move $a1, $zero -/* 03BCFC 8003B0FC AFAF0018 */ sw $t7, 0x18($sp) -/* 03BD00 8003B100 0C00E4F0 */ jal spawn_player -/* 03BD04 8003B104 E7A40014 */ swc1 $f4, 0x14($sp) -/* 03BD08 8003B108 8E060004 */ lw $a2, 4($s0) -/* 03BD0C 8003B10C 8E270004 */ lw $a3, 4($s1) -/* 03BD10 8003B110 3C014680 */ li $at, 0x46800000 # 16384.000000 -/* 03BD14 8003B114 3C19800F */ lui $t9, %hi(D_800E86A9) # $t9, 0x800f -/* 03BD18 8003B118 833986A9 */ lb $t9, %lo(D_800E86A9)($t9) -/* 03BD1C 8003B11C 44813000 */ mtc1 $at, $f6 -/* 03BD20 8003B120 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03BD24 8003B124 2408E000 */ li $t0, -8192 -/* 03BD28 8003B128 AFA8001C */ sw $t0, 0x1c($sp) -/* 03BD2C 8003B12C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03BD30 8003B130 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BD34 8003B134 24050001 */ li $a1, 1 -/* 03BD38 8003B138 AFB90018 */ sw $t9, 0x18($sp) -/* 03BD3C 8003B13C 0C00E4F0 */ jal spawn_player -/* 03BD40 8003B140 E7A60014 */ swc1 $f6, 0x14($sp) -/* 03BD44 8003B144 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03BD48 8003B148 4481B000 */ mtc1 $at, $f22 -/* 03BD4C 8003B14C 1000001F */ b .L8003B1CC -/* 03BD50 8003B150 8E060008 */ lw $a2, 8($s0) -.L8003B154: -/* 03BD54 8003B154 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03BD58 8003B158 8E060000 */ lw $a2, ($s0) -/* 03BD5C 8003B15C 8E270000 */ lw $a3, ($s1) -/* 03BD60 8003B160 3C09800F */ lui $t1, %hi(D_800E86A8) # $t1, 0x800f -/* 03BD64 8003B164 4481B000 */ mtc1 $at, $f22 -/* 03BD68 8003B168 812986A8 */ lb $t1, %lo(D_800E86A8)($t1) -/* 03BD6C 8003B16C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03BD70 8003B170 240AE000 */ li $t2, -8192 -/* 03BD74 8003B174 AFAA001C */ sw $t2, 0x1c($sp) -/* 03BD78 8003B178 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03BD7C 8003B17C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BD80 8003B180 00002825 */ move $a1, $zero -/* 03BD84 8003B184 AFA90018 */ sw $t1, 0x18($sp) -/* 03BD88 8003B188 0C00E4F0 */ jal spawn_player -/* 03BD8C 8003B18C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BD90 8003B190 8E060004 */ lw $a2, 4($s0) -/* 03BD94 8003B194 8E270004 */ lw $a3, 4($s1) -/* 03BD98 8003B198 3C0B800F */ lui $t3, %hi(D_800E86A9) # $t3, 0x800f -/* 03BD9C 8003B19C 816B86A9 */ lb $t3, %lo(D_800E86A9)($t3) -/* 03BDA0 8003B1A0 44804000 */ mtc1 $zero, $f8 -/* 03BDA4 8003B1A4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03BDA8 8003B1A8 240CE000 */ li $t4, -8192 -/* 03BDAC 8003B1AC AFAC001C */ sw $t4, 0x1c($sp) -/* 03BDB0 8003B1B0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03BDB4 8003B1B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BDB8 8003B1B8 24050001 */ li $a1, 1 -/* 03BDBC 8003B1BC AFAB0018 */ sw $t3, 0x18($sp) -/* 03BDC0 8003B1C0 0C00E4F0 */ jal spawn_player -/* 03BDC4 8003B1C4 E7A80014 */ swc1 $f8, 0x14($sp) -/* 03BDC8 8003B1C8 8E060008 */ lw $a2, 8($s0) -.L8003B1CC: -/* 03BDCC 8003B1CC 8E270008 */ lw $a3, 8($s1) -/* 03BDD0 8003B1D0 3C0D800F */ lui $t5, %hi(D_800E86AA) # $t5, 0x800f -/* 03BDD4 8003B1D4 81AD86AA */ lb $t5, %lo(D_800E86AA)($t5) -/* 03BDD8 8003B1D8 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03BDDC 8003B1DC 240E6000 */ li $t6, 24576 -/* 03BDE0 8003B1E0 AFAE001C */ sw $t6, 0x1c($sp) -/* 03BDE4 8003B1E4 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03BDE8 8003B1E8 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BDEC 8003B1EC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BDF0 8003B1F0 24050002 */ li $a1, 2 -/* 03BDF4 8003B1F4 0C00E4F0 */ jal spawn_player -/* 03BDF8 8003B1F8 AFAD0018 */ sw $t5, 0x18($sp) -/* 03BDFC 8003B1FC 8E06000C */ lw $a2, 0xc($s0) -/* 03BE00 8003B200 8E27000C */ lw $a3, 0xc($s1) -/* 03BE04 8003B204 3C0F800F */ lui $t7, %hi(D_800E86AB) # $t7, 0x800f -/* 03BE08 8003B208 81EF86AB */ lb $t7, %lo(D_800E86AB)($t7) -/* 03BE0C 8003B20C 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03BE10 8003B210 24186000 */ li $t8, 24576 -/* 03BE14 8003B214 AFB8001C */ sw $t8, 0x1c($sp) -/* 03BE18 8003B218 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03BE1C 8003B21C E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BE20 8003B220 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BE24 8003B224 24050003 */ li $a1, 3 -/* 03BE28 8003B228 0C00E4F0 */ jal spawn_player -/* 03BE2C 8003B22C AFAF0018 */ sw $t7, 0x18($sp) -/* 03BE30 8003B230 8E060010 */ lw $a2, 0x10($s0) -/* 03BE34 8003B234 8E270010 */ lw $a3, 0x10($s1) -/* 03BE38 8003B238 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03BE3C 8003B23C 24190004 */ li $t9, 4 -/* 03BE40 8003B240 24083000 */ li $t0, 12288 -/* 03BE44 8003B244 AFA8001C */ sw $t0, 0x1c($sp) -/* 03BE48 8003B248 AFB90018 */ sw $t9, 0x18($sp) -/* 03BE4C 8003B24C 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03BE50 8003B250 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BE54 8003B254 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BE58 8003B258 0C00E4F0 */ jal spawn_player -/* 03BE5C 8003B25C 24050004 */ li $a1, 4 -/* 03BE60 8003B260 8E060014 */ lw $a2, 0x14($s0) -/* 03BE64 8003B264 8E270014 */ lw $a3, 0x14($s1) -/* 03BE68 8003B268 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03BE6C 8003B26C 24090005 */ li $t1, 5 -/* 03BE70 8003B270 240A3000 */ li $t2, 12288 -/* 03BE74 8003B274 AFAA001C */ sw $t2, 0x1c($sp) -/* 03BE78 8003B278 AFA90018 */ sw $t1, 0x18($sp) -/* 03BE7C 8003B27C 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03BE80 8003B280 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BE84 8003B284 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BE88 8003B288 0C00E4F0 */ jal spawn_player -/* 03BE8C 8003B28C 24050005 */ li $a1, 5 -/* 03BE90 8003B290 8E060018 */ lw $a2, 0x18($s0) -/* 03BE94 8003B294 8E270018 */ lw $a3, 0x18($s1) -/* 03BE98 8003B298 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03BE9C 8003B29C 240B0006 */ li $t3, 6 -/* 03BEA0 8003B2A0 240C3000 */ li $t4, 12288 -/* 03BEA4 8003B2A4 AFAC001C */ sw $t4, 0x1c($sp) -/* 03BEA8 8003B2A8 AFAB0018 */ sw $t3, 0x18($sp) -/* 03BEAC 8003B2AC 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03BEB0 8003B2B0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BEB4 8003B2B4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BEB8 8003B2B8 0C00E4F0 */ jal spawn_player -/* 03BEBC 8003B2BC 24050006 */ li $a1, 6 -/* 03BEC0 8003B2C0 8E060000 */ lw $a2, ($s0) -/* 03BEC4 8003B2C4 8E270000 */ lw $a3, ($s1) -/* 03BEC8 8003B2C8 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03BECC 8003B2CC 240D0007 */ li $t5, 7 -/* 03BED0 8003B2D0 240E3000 */ li $t6, 12288 -/* 03BED4 8003B2D4 AFAE001C */ sw $t6, 0x1c($sp) -/* 03BED8 8003B2D8 AFAD0018 */ sw $t5, 0x18($sp) -/* 03BEDC 8003B2DC 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03BEE0 8003B2E0 E7B60014 */ swc1 $f22, 0x14($sp) -/* 03BEE4 8003B2E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03BEE8 8003B2E8 0C00E4F0 */ jal spawn_player -/* 03BEEC 8003B2EC 24050007 */ li $a1, 7 -/* 03BEF0 8003B2F0 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03BEF4 8003B2F4 0C00E6B9 */ jal func_80039AE4 -/* 03BEF8 8003B2F8 AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03BEFC 8003B2FC 8FBF003C */ lw $ra, 0x3c($sp) -/* 03BF00 8003B300 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 03BF04 8003B304 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 03BF08 8003B308 8FB00034 */ lw $s0, 0x34($sp) -/* 03BF0C 8003B30C 8FB10038 */ lw $s1, 0x38($sp) -/* 03BF10 8003B310 03E00008 */ jr $ra -/* 03BF14 8003B314 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800393C0/spawn_players_3p_battle.s b/asm/non_matchings/code_800393C0/spawn_players_3p_battle.s deleted file mode 100644 index 3f4bb5cdd..000000000 --- a/asm/non_matchings/code_800393C0/spawn_players_3p_battle.s +++ /dev/null @@ -1,184 +0,0 @@ -glabel spawn_players_3p_battle -/* 03C19C 8003B59C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 03C1A0 8003B5A0 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 03C1A4 8003B5A4 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 03C1A8 8003B5A8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 03C1AC 8003B5AC 4486A000 */ mtc1 $a2, $f20 -/* 03C1B0 8003B5B0 AFB10030 */ sw $s1, 0x30($sp) -/* 03C1B4 8003B5B4 AFB0002C */ sw $s0, 0x2c($sp) -/* 03C1B8 8003B5B8 24010013 */ li $at, 19 -/* 03C1BC 8003B5BC 00808025 */ move $s0, $a0 -/* 03C1C0 8003B5C0 00A08825 */ move $s1, $a1 -/* 03C1C4 8003B5C4 15C1002F */ bne $t6, $at, .L8003B684 -/* 03C1C8 8003B5C8 AFBF0034 */ sw $ra, 0x34($sp) -/* 03C1CC 8003B5CC 8E060000 */ lw $a2, ($s0) -/* 03C1D0 8003B5D0 8E270000 */ lw $a3, ($s1) -/* 03C1D4 8003B5D4 3C01C680 */ li $at, 0xC6800000 # -16384.000000 -/* 03C1D8 8003B5D8 3C0F800F */ lui $t7, %hi(D_800E86A8) # $t7, 0x800f -/* 03C1DC 8003B5DC 81EF86A8 */ lb $t7, %lo(D_800E86A8)($t7) -/* 03C1E0 8003B5E0 44812000 */ mtc1 $at, $f4 -/* 03C1E4 8003B5E4 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03C1E8 8003B5E8 2418E000 */ li $t8, -8192 -/* 03C1EC 8003B5EC AFB8001C */ sw $t8, 0x1c($sp) -/* 03C1F0 8003B5F0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03C1F4 8003B5F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C1F8 8003B5F8 00002825 */ move $a1, $zero -/* 03C1FC 8003B5FC AFAF0018 */ sw $t7, 0x18($sp) -/* 03C200 8003B600 0C00E4F0 */ jal spawn_player -/* 03C204 8003B604 E7A40014 */ swc1 $f4, 0x14($sp) -/* 03C208 8003B608 8E060004 */ lw $a2, 4($s0) -/* 03C20C 8003B60C 8E270004 */ lw $a3, 4($s1) -/* 03C210 8003B610 3C014680 */ li $at, 0x46800000 # 16384.000000 -/* 03C214 8003B614 3C19800F */ lui $t9, %hi(D_800E86A9) # $t9, 0x800f -/* 03C218 8003B618 833986A9 */ lb $t9, %lo(D_800E86A9)($t9) -/* 03C21C 8003B61C 44813000 */ mtc1 $at, $f6 -/* 03C220 8003B620 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03C224 8003B624 2408E000 */ li $t0, -8192 -/* 03C228 8003B628 AFA8001C */ sw $t0, 0x1c($sp) -/* 03C22C 8003B62C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03C230 8003B630 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C234 8003B634 24050001 */ li $a1, 1 -/* 03C238 8003B638 AFB90018 */ sw $t9, 0x18($sp) -/* 03C23C 8003B63C 0C00E4F0 */ jal spawn_player -/* 03C240 8003B640 E7A60014 */ swc1 $f6, 0x14($sp) -/* 03C244 8003B644 8E060008 */ lw $a2, 8($s0) -/* 03C248 8003B648 8E270008 */ lw $a3, 8($s1) -/* 03C24C 8003B64C 3C09800F */ lui $t1, %hi(D_800E86AA) # $t1, 0x800f -/* 03C250 8003B650 812986AA */ lb $t1, %lo(D_800E86AA)($t1) -/* 03C254 8003B654 44804000 */ mtc1 $zero, $f8 -/* 03C258 8003B658 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03C25C 8003B65C 240AE000 */ li $t2, -8192 -/* 03C260 8003B660 AFAA001C */ sw $t2, 0x1c($sp) -/* 03C264 8003B664 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03C268 8003B668 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C26C 8003B66C 24050002 */ li $a1, 2 -/* 03C270 8003B670 AFA90018 */ sw $t1, 0x18($sp) -/* 03C274 8003B674 0C00E4F0 */ jal spawn_player -/* 03C278 8003B678 E7A80014 */ swc1 $f8, 0x14($sp) -/* 03C27C 8003B67C 1000002E */ b .L8003B738 -/* 03C280 8003B680 8E06000C */ lw $a2, 0xc($s0) -.L8003B684: -/* 03C284 8003B684 8E060000 */ lw $a2, ($s0) -/* 03C288 8003B688 8E270000 */ lw $a3, ($s1) -/* 03C28C 8003B68C 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C290 8003B690 3C0B800F */ lui $t3, %hi(D_800E86A8) # $t3, 0x800f -/* 03C294 8003B694 816B86A8 */ lb $t3, %lo(D_800E86A8)($t3) -/* 03C298 8003B698 44815000 */ mtc1 $at, $f10 -/* 03C29C 8003B69C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03C2A0 8003B6A0 240CE000 */ li $t4, -8192 -/* 03C2A4 8003B6A4 AFAC001C */ sw $t4, 0x1c($sp) -/* 03C2A8 8003B6A8 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03C2AC 8003B6AC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C2B0 8003B6B0 00002825 */ move $a1, $zero -/* 03C2B4 8003B6B4 AFAB0018 */ sw $t3, 0x18($sp) -/* 03C2B8 8003B6B8 0C00E4F0 */ jal spawn_player -/* 03C2BC 8003B6BC E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03C2C0 8003B6C0 8E060004 */ lw $a2, 4($s0) -/* 03C2C4 8003B6C4 8E270004 */ lw $a3, 4($s1) -/* 03C2C8 8003B6C8 3C0D800F */ lui $t5, %hi(D_800E86A9) # $t5, 0x800f -/* 03C2CC 8003B6CC 81AD86A9 */ lb $t5, %lo(D_800E86A9)($t5) -/* 03C2D0 8003B6D0 44808000 */ mtc1 $zero, $f16 -/* 03C2D4 8003B6D4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03C2D8 8003B6D8 240EE000 */ li $t6, -8192 -/* 03C2DC 8003B6DC AFAE001C */ sw $t6, 0x1c($sp) -/* 03C2E0 8003B6E0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03C2E4 8003B6E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C2E8 8003B6E8 24050001 */ li $a1, 1 -/* 03C2EC 8003B6EC AFAD0018 */ sw $t5, 0x18($sp) -/* 03C2F0 8003B6F0 0C00E4F0 */ jal spawn_player -/* 03C2F4 8003B6F4 E7B00014 */ swc1 $f16, 0x14($sp) -/* 03C2F8 8003B6F8 8E060008 */ lw $a2, 8($s0) -/* 03C2FC 8003B6FC 8E270008 */ lw $a3, 8($s1) -/* 03C300 8003B700 3C01C680 */ li $at, 0xC6800000 # -16384.000000 -/* 03C304 8003B704 3C0F800F */ lui $t7, %hi(D_800E86AA) # $t7, 0x800f -/* 03C308 8003B708 81EF86AA */ lb $t7, %lo(D_800E86AA)($t7) -/* 03C30C 8003B70C 44819000 */ mtc1 $at, $f18 -/* 03C310 8003B710 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03C314 8003B714 2418E000 */ li $t8, -8192 -/* 03C318 8003B718 AFB8001C */ sw $t8, 0x1c($sp) -/* 03C31C 8003B71C 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03C320 8003B720 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C324 8003B724 24050002 */ li $a1, 2 -/* 03C328 8003B728 AFAF0018 */ sw $t7, 0x18($sp) -/* 03C32C 8003B72C 0C00E4F0 */ jal spawn_player -/* 03C330 8003B730 E7B20014 */ swc1 $f18, 0x14($sp) -/* 03C334 8003B734 8E06000C */ lw $a2, 0xc($s0) -.L8003B738: -/* 03C338 8003B738 8E27000C */ lw $a3, 0xc($s1) -/* 03C33C 8003B73C 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C340 8003B740 44812000 */ mtc1 $at, $f4 -/* 03C344 8003B744 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03C348 8003B748 24190003 */ li $t9, 3 -/* 03C34C 8003B74C 24083000 */ li $t0, 12288 -/* 03C350 8003B750 AFA8001C */ sw $t0, 0x1c($sp) -/* 03C354 8003B754 AFB90018 */ sw $t9, 0x18($sp) -/* 03C358 8003B758 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03C35C 8003B75C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C360 8003B760 24050003 */ li $a1, 3 -/* 03C364 8003B764 0C00E4F0 */ jal spawn_player -/* 03C368 8003B768 E7A40014 */ swc1 $f4, 0x14($sp) -/* 03C36C 8003B76C 8E060010 */ lw $a2, 0x10($s0) -/* 03C370 8003B770 8E270010 */ lw $a3, 0x10($s1) -/* 03C374 8003B774 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C378 8003B778 44813000 */ mtc1 $at, $f6 -/* 03C37C 8003B77C 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03C380 8003B780 24090004 */ li $t1, 4 -/* 03C384 8003B784 240A3000 */ li $t2, 12288 -/* 03C388 8003B788 AFAA001C */ sw $t2, 0x1c($sp) -/* 03C38C 8003B78C AFA90018 */ sw $t1, 0x18($sp) -/* 03C390 8003B790 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03C394 8003B794 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C398 8003B798 24050004 */ li $a1, 4 -/* 03C39C 8003B79C 0C00E4F0 */ jal spawn_player -/* 03C3A0 8003B7A0 E7A60014 */ swc1 $f6, 0x14($sp) -/* 03C3A4 8003B7A4 8E060014 */ lw $a2, 0x14($s0) -/* 03C3A8 8003B7A8 8E270014 */ lw $a3, 0x14($s1) -/* 03C3AC 8003B7AC 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C3B0 8003B7B0 44814000 */ mtc1 $at, $f8 -/* 03C3B4 8003B7B4 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03C3B8 8003B7B8 240B0005 */ li $t3, 5 -/* 03C3BC 8003B7BC 240C3000 */ li $t4, 12288 -/* 03C3C0 8003B7C0 AFAC001C */ sw $t4, 0x1c($sp) -/* 03C3C4 8003B7C4 AFAB0018 */ sw $t3, 0x18($sp) -/* 03C3C8 8003B7C8 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03C3CC 8003B7CC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C3D0 8003B7D0 24050005 */ li $a1, 5 -/* 03C3D4 8003B7D4 0C00E4F0 */ jal spawn_player -/* 03C3D8 8003B7D8 E7A80014 */ swc1 $f8, 0x14($sp) -/* 03C3DC 8003B7DC 8E060018 */ lw $a2, 0x18($s0) -/* 03C3E0 8003B7E0 8E270018 */ lw $a3, 0x18($s1) -/* 03C3E4 8003B7E4 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C3E8 8003B7E8 44815000 */ mtc1 $at, $f10 -/* 03C3EC 8003B7EC 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03C3F0 8003B7F0 240D0006 */ li $t5, 6 -/* 03C3F4 8003B7F4 240E3000 */ li $t6, 12288 -/* 03C3F8 8003B7F8 AFAE001C */ sw $t6, 0x1c($sp) -/* 03C3FC 8003B7FC AFAD0018 */ sw $t5, 0x18($sp) -/* 03C400 8003B800 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03C404 8003B804 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C408 8003B808 24050006 */ li $a1, 6 -/* 03C40C 8003B80C 0C00E4F0 */ jal spawn_player -/* 03C410 8003B810 E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03C414 8003B814 8E060000 */ lw $a2, ($s0) -/* 03C418 8003B818 8E270000 */ lw $a3, ($s1) -/* 03C41C 8003B81C 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C420 8003B820 44818000 */ mtc1 $at, $f16 -/* 03C424 8003B824 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03C428 8003B828 240F0007 */ li $t7, 7 -/* 03C42C 8003B82C 24183000 */ li $t8, 12288 -/* 03C430 8003B830 AFB8001C */ sw $t8, 0x1c($sp) -/* 03C434 8003B834 AFAF0018 */ sw $t7, 0x18($sp) -/* 03C438 8003B838 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03C43C 8003B83C E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C440 8003B840 24050007 */ li $a1, 7 -/* 03C444 8003B844 0C00E4F0 */ jal spawn_player -/* 03C448 8003B848 E7B00014 */ swc1 $f16, 0x14($sp) -/* 03C44C 8003B84C 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03C450 8003B850 0C00E6B9 */ jal func_80039AE4 -/* 03C454 8003B854 AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03C458 8003B858 8FBF0034 */ lw $ra, 0x34($sp) -/* 03C45C 8003B85C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 03C460 8003B860 8FB0002C */ lw $s0, 0x2c($sp) -/* 03C464 8003B864 8FB10030 */ lw $s1, 0x30($sp) -/* 03C468 8003B868 03E00008 */ jr $ra -/* 03C46C 8003B86C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_800393C0/spawn_players_4p_battle.s b/asm/non_matchings/code_800393C0/spawn_players_4p_battle.s deleted file mode 100644 index f6cc4f16e..000000000 --- a/asm/non_matchings/code_800393C0/spawn_players_4p_battle.s +++ /dev/null @@ -1,198 +0,0 @@ -glabel spawn_players_4p_battle -/* 03C724 8003BB24 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 03C728 8003BB28 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 03C72C 8003BB2C 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 03C730 8003BB30 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 03C734 8003BB34 4486A000 */ mtc1 $a2, $f20 -/* 03C738 8003BB38 AFB10034 */ sw $s1, 0x34($sp) -/* 03C73C 8003BB3C AFB00030 */ sw $s0, 0x30($sp) -/* 03C740 8003BB40 24010013 */ li $at, 19 -/* 03C744 8003BB44 00808025 */ move $s0, $a0 -/* 03C748 8003BB48 00A08825 */ move $s1, $a1 -/* 03C74C 8003BB4C AFBF003C */ sw $ra, 0x3c($sp) -/* 03C750 8003BB50 15C1003C */ bne $t6, $at, .L8003BC44 -/* 03C754 8003BB54 AFB20038 */ sw $s2, 0x38($sp) -/* 03C758 8003BB58 3C12800F */ lui $s2, %hi(D_800E86A8) # $s2, 0x800f -/* 03C75C 8003BB5C 265286A8 */ addiu $s2, %lo(D_800E86A8) # addiu $s2, $s2, -0x7958 -/* 03C760 8003BB60 8E060000 */ lw $a2, ($s0) -/* 03C764 8003BB64 8E270000 */ lw $a3, ($s1) -/* 03C768 8003BB68 3C01C680 */ li $at, 0xC6800000 # -16384.000000 -/* 03C76C 8003BB6C 44812000 */ mtc1 $at, $f4 -/* 03C770 8003BB70 824F0000 */ lb $t7, ($s2) -/* 03C774 8003BB74 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03C778 8003BB78 2418E000 */ li $t8, -8192 -/* 03C77C 8003BB7C AFB8001C */ sw $t8, 0x1c($sp) -/* 03C780 8003BB80 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03C784 8003BB84 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C788 8003BB88 00002825 */ move $a1, $zero -/* 03C78C 8003BB8C AFAF0018 */ sw $t7, 0x18($sp) -/* 03C790 8003BB90 0C00E4F0 */ jal spawn_player -/* 03C794 8003BB94 E7A40014 */ swc1 $f4, 0x14($sp) -/* 03C798 8003BB98 8E060004 */ lw $a2, 4($s0) -/* 03C79C 8003BB9C 8E270004 */ lw $a3, 4($s1) -/* 03C7A0 8003BBA0 3C014680 */ li $at, 0x46800000 # 16384.000000 -/* 03C7A4 8003BBA4 44813000 */ mtc1 $at, $f6 -/* 03C7A8 8003BBA8 82590001 */ lb $t9, 1($s2) -/* 03C7AC 8003BBAC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03C7B0 8003BBB0 2408E000 */ li $t0, -8192 -/* 03C7B4 8003BBB4 AFA8001C */ sw $t0, 0x1c($sp) -/* 03C7B8 8003BBB8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03C7BC 8003BBBC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C7C0 8003BBC0 24050001 */ li $a1, 1 -/* 03C7C4 8003BBC4 AFB90018 */ sw $t9, 0x18($sp) -/* 03C7C8 8003BBC8 0C00E4F0 */ jal spawn_player -/* 03C7CC 8003BBCC E7A60014 */ swc1 $f6, 0x14($sp) -/* 03C7D0 8003BBD0 8E060008 */ lw $a2, 8($s0) -/* 03C7D4 8003BBD4 8E270008 */ lw $a3, 8($s1) -/* 03C7D8 8003BBD8 44804000 */ mtc1 $zero, $f8 -/* 03C7DC 8003BBDC 82490002 */ lb $t1, 2($s2) -/* 03C7E0 8003BBE0 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03C7E4 8003BBE4 240AE000 */ li $t2, -8192 -/* 03C7E8 8003BBE8 AFAA001C */ sw $t2, 0x1c($sp) -/* 03C7EC 8003BBEC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03C7F0 8003BBF0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C7F4 8003BBF4 24050002 */ li $a1, 2 -/* 03C7F8 8003BBF8 AFA90018 */ sw $t1, 0x18($sp) -/* 03C7FC 8003BBFC 0C00E4F0 */ jal spawn_player -/* 03C800 8003BC00 E7A80014 */ swc1 $f8, 0x14($sp) -/* 03C804 8003BC04 8E06000C */ lw $a2, 0xc($s0) -/* 03C808 8003BC08 8E27000C */ lw $a3, 0xc($s1) -/* 03C80C 8003BC0C 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C810 8003BC10 44815000 */ mtc1 $at, $f10 -/* 03C814 8003BC14 824B0003 */ lb $t3, 3($s2) -/* 03C818 8003BC18 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03C81C 8003BC1C 240CE000 */ li $t4, -8192 -/* 03C820 8003BC20 AFAC001C */ sw $t4, 0x1c($sp) -/* 03C824 8003BC24 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03C828 8003BC28 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C82C 8003BC2C 24050003 */ li $a1, 3 -/* 03C830 8003BC30 AFAB0018 */ sw $t3, 0x18($sp) -/* 03C834 8003BC34 0C00E4F0 */ jal spawn_player -/* 03C838 8003BC38 E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03C83C 8003BC3C 1000003B */ b .L8003BD2C -/* 03C840 8003BC40 8E060010 */ lw $a2, 0x10($s0) -.L8003BC44: -/* 03C844 8003BC44 3C12800F */ lui $s2, %hi(D_800E86A8) # $s2, 0x800f -/* 03C848 8003BC48 265286A8 */ addiu $s2, %lo(D_800E86A8) # addiu $s2, $s2, -0x7958 -/* 03C84C 8003BC4C 8E060000 */ lw $a2, ($s0) -/* 03C850 8003BC50 8E270000 */ lw $a3, ($s1) -/* 03C854 8003BC54 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C858 8003BC58 44818000 */ mtc1 $at, $f16 -/* 03C85C 8003BC5C 824D0000 */ lb $t5, ($s2) -/* 03C860 8003BC60 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 03C864 8003BC64 240EE000 */ li $t6, -8192 -/* 03C868 8003BC68 AFAE001C */ sw $t6, 0x1c($sp) -/* 03C86C 8003BC6C 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 03C870 8003BC70 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C874 8003BC74 00002825 */ move $a1, $zero -/* 03C878 8003BC78 AFAD0018 */ sw $t5, 0x18($sp) -/* 03C87C 8003BC7C 0C00E4F0 */ jal spawn_player -/* 03C880 8003BC80 E7B00014 */ swc1 $f16, 0x14($sp) -/* 03C884 8003BC84 8E060004 */ lw $a2, 4($s0) -/* 03C888 8003BC88 8E270004 */ lw $a3, 4($s1) -/* 03C88C 8003BC8C 44809000 */ mtc1 $zero, $f18 -/* 03C890 8003BC90 824F0001 */ lb $t7, 1($s2) -/* 03C894 8003BC94 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03C898 8003BC98 2418E000 */ li $t8, -8192 -/* 03C89C 8003BC9C AFB8001C */ sw $t8, 0x1c($sp) -/* 03C8A0 8003BCA0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 03C8A4 8003BCA4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C8A8 8003BCA8 24050001 */ li $a1, 1 -/* 03C8AC 8003BCAC AFAF0018 */ sw $t7, 0x18($sp) -/* 03C8B0 8003BCB0 0C00E4F0 */ jal spawn_player -/* 03C8B4 8003BCB4 E7B20014 */ swc1 $f18, 0x14($sp) -/* 03C8B8 8003BCB8 8E060008 */ lw $a2, 8($s0) -/* 03C8BC 8003BCBC 8E270008 */ lw $a3, 8($s1) -/* 03C8C0 8003BCC0 3C01C680 */ li $at, 0xC6800000 # -16384.000000 -/* 03C8C4 8003BCC4 44812000 */ mtc1 $at, $f4 -/* 03C8C8 8003BCC8 82590002 */ lb $t9, 2($s2) -/* 03C8CC 8003BCCC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 03C8D0 8003BCD0 2408E000 */ li $t0, -8192 -/* 03C8D4 8003BCD4 AFA8001C */ sw $t0, 0x1c($sp) -/* 03C8D8 8003BCD8 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 03C8DC 8003BCDC E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C8E0 8003BCE0 24050002 */ li $a1, 2 -/* 03C8E4 8003BCE4 AFB90018 */ sw $t9, 0x18($sp) -/* 03C8E8 8003BCE8 0C00E4F0 */ jal spawn_player -/* 03C8EC 8003BCEC E7A40014 */ swc1 $f4, 0x14($sp) -/* 03C8F0 8003BCF0 8E06000C */ lw $a2, 0xc($s0) -/* 03C8F4 8003BCF4 8E27000C */ lw $a3, 0xc($s1) -/* 03C8F8 8003BCF8 3C014680 */ li $at, 0x46800000 # 16384.000000 -/* 03C8FC 8003BCFC 44813000 */ mtc1 $at, $f6 -/* 03C900 8003BD00 82490003 */ lb $t1, 3($s2) -/* 03C904 8003BD04 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 03C908 8003BD08 240AE000 */ li $t2, -8192 -/* 03C90C 8003BD0C AFAA001C */ sw $t2, 0x1c($sp) -/* 03C910 8003BD10 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 03C914 8003BD14 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C918 8003BD18 24050003 */ li $a1, 3 -/* 03C91C 8003BD1C AFA90018 */ sw $t1, 0x18($sp) -/* 03C920 8003BD20 0C00E4F0 */ jal spawn_player -/* 03C924 8003BD24 E7A60014 */ swc1 $f6, 0x14($sp) -/* 03C928 8003BD28 8E060010 */ lw $a2, 0x10($s0) -.L8003BD2C: -/* 03C92C 8003BD2C 8E270010 */ lw $a3, 0x10($s1) -/* 03C930 8003BD30 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C934 8003BD34 44814000 */ mtc1 $at, $f8 -/* 03C938 8003BD38 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 03C93C 8003BD3C 240B0004 */ li $t3, 4 -/* 03C940 8003BD40 240C3000 */ li $t4, 12288 -/* 03C944 8003BD44 AFAC001C */ sw $t4, 0x1c($sp) -/* 03C948 8003BD48 AFAB0018 */ sw $t3, 0x18($sp) -/* 03C94C 8003BD4C 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) -/* 03C950 8003BD50 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C954 8003BD54 24050004 */ li $a1, 4 -/* 03C958 8003BD58 0C00E4F0 */ jal spawn_player -/* 03C95C 8003BD5C E7A80014 */ swc1 $f8, 0x14($sp) -/* 03C960 8003BD60 8E060014 */ lw $a2, 0x14($s0) -/* 03C964 8003BD64 8E270014 */ lw $a3, 0x14($s1) -/* 03C968 8003BD68 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C96C 8003BD6C 44815000 */ mtc1 $at, $f10 -/* 03C970 8003BD70 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 03C974 8003BD74 240D0005 */ li $t5, 5 -/* 03C978 8003BD78 240E3000 */ li $t6, 12288 -/* 03C97C 8003BD7C AFAE001C */ sw $t6, 0x1c($sp) -/* 03C980 8003BD80 AFAD0018 */ sw $t5, 0x18($sp) -/* 03C984 8003BD84 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) -/* 03C988 8003BD88 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C98C 8003BD8C 24050005 */ li $a1, 5 -/* 03C990 8003BD90 0C00E4F0 */ jal spawn_player -/* 03C994 8003BD94 E7AA0014 */ swc1 $f10, 0x14($sp) -/* 03C998 8003BD98 8E060018 */ lw $a2, 0x18($s0) -/* 03C99C 8003BD9C 8E270018 */ lw $a3, 0x18($s1) -/* 03C9A0 8003BDA0 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C9A4 8003BDA4 44818000 */ mtc1 $at, $f16 -/* 03C9A8 8003BDA8 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 03C9AC 8003BDAC 240F0006 */ li $t7, 6 -/* 03C9B0 8003BDB0 24183000 */ li $t8, 12288 -/* 03C9B4 8003BDB4 AFB8001C */ sw $t8, 0x1c($sp) -/* 03C9B8 8003BDB8 AFAF0018 */ sw $t7, 0x18($sp) -/* 03C9BC 8003BDBC 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) -/* 03C9C0 8003BDC0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C9C4 8003BDC4 24050006 */ li $a1, 6 -/* 03C9C8 8003BDC8 0C00E4F0 */ jal spawn_player -/* 03C9CC 8003BDCC E7B00014 */ swc1 $f16, 0x14($sp) -/* 03C9D0 8003BDD0 8E060000 */ lw $a2, ($s0) -/* 03C9D4 8003BDD4 8E270000 */ lw $a3, ($s1) -/* 03C9D8 8003BDD8 3C014700 */ li $at, 0x47000000 # 32768.000000 -/* 03C9DC 8003BDDC 44819000 */ mtc1 $at, $f18 -/* 03C9E0 8003BDE0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 03C9E4 8003BDE4 24190007 */ li $t9, 7 -/* 03C9E8 8003BDE8 24083000 */ li $t0, 12288 -/* 03C9EC 8003BDEC AFA8001C */ sw $t0, 0x1c($sp) -/* 03C9F0 8003BDF0 AFB90018 */ sw $t9, 0x18($sp) -/* 03C9F4 8003BDF4 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) -/* 03C9F8 8003BDF8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 03C9FC 8003BDFC 24050007 */ li $a1, 7 -/* 03CA00 8003BE00 0C00E4F0 */ jal spawn_player -/* 03CA04 8003BE04 E7B20014 */ swc1 $f18, 0x14($sp) -/* 03CA08 8003BE08 3C018016 */ lui $at, %hi(D_80164A28) # $at, 0x8016 -/* 03CA0C 8003BE0C 0C00E6B9 */ jal func_80039AE4 -/* 03CA10 8003BE10 AC204A28 */ sw $zero, %lo(D_80164A28)($at) -/* 03CA14 8003BE14 8FBF003C */ lw $ra, 0x3c($sp) -/* 03CA18 8003BE18 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 03CA1C 8003BE1C 8FB00030 */ lw $s0, 0x30($sp) -/* 03CA20 8003BE20 8FB10034 */ lw $s1, 0x34($sp) -/* 03CA24 8003BE24 8FB20038 */ lw $s2, 0x38($sp) -/* 03CA28 8003BE28 03E00008 */ jr $ra -/* 03CA2C 8003BE2C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_800523B8.s b/asm/non_matchings/code_800431B0/func_800523B8.s index 48351b704..f9123f78d 100644 --- a/asm/non_matchings/code_800431B0/func_800523B8.s +++ b/asm/non_matchings/code_800431B0/func_800523B8.s @@ -6,10 +6,10 @@ glabel func_800523B8 /* 052FC8 800523C8 3C088016 */ lui $t0, %hi(D_80165C18) # $t0, 0x8016 /* 052FCC 800523CC 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 052FD0 800523D0 000E70C0 */ sll $t6, $t6, 3 -/* 052FD4 800523D4 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e +/* 052FD4 800523D4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e /* 052FD8 800523D8 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 /* 052FDC 800523DC 0019C940 */ sll $t9, $t9, 5 -/* 052FE0 800523E0 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 052FE0 800523E0 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 052FE4 800523E4 01C57023 */ subu $t6, $t6, $a1 /* 052FE8 800523E8 03281821 */ addu $v1, $t9, $t0 /* 052FEC 800523EC AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/non_matchings/code_800431B0/func_80052590.s b/asm/non_matchings/code_800431B0/func_80052590.s index 9e7260c93..ac7e21a3d 100644 --- a/asm/non_matchings/code_800431B0/func_80052590.s +++ b/asm/non_matchings/code_800431B0/func_80052590.s @@ -8,9 +8,9 @@ glabel func_80052590 /* 0531A8 800525A8 0002C0C0 */ sll $t8, $v0, 3 /* 0531AC 800525AC 3C1E8016 */ lui $fp, %hi(D_80165C18) # $fp, 0x8016 /* 0531B0 800525B0 000E70C0 */ sll $t6, $t6, 3 -/* 0531B4 800525B4 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e +/* 0531B4 800525B4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e /* 0531B8 800525B8 0302C023 */ subu $t8, $t8, $v0 -/* 0531BC 800525BC 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 0531BC 800525BC 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 0531C0 800525C0 27DE5C18 */ addiu $fp, %lo(D_80165C18) # addiu $fp, $fp, 0x5c18 /* 0531C4 800525C4 AFB00020 */ sw $s0, 0x20($sp) /* 0531C8 800525C8 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_800431B0/func_80052F20.s b/asm/non_matchings/code_800431B0/func_80052F20.s index 632a5b9e8..a7232b616 100644 --- a/asm/non_matchings/code_800431B0/func_80052F20.s +++ b/asm/non_matchings/code_800431B0/func_80052F20.s @@ -2,8 +2,8 @@ glabel func_80052F20 /* 053B20 80052F20 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 053B24 80052F24 00047880 */ sll $t7, $a0, 2 /* 053B28 80052F28 01E47823 */ subu $t7, $t7, $a0 -/* 053B2C 80052F2C 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e -/* 053B30 80052F30 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 053B2C 80052F2C 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e +/* 053B30 80052F30 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 053B34 80052F34 000F78C0 */ sll $t7, $t7, 3 /* 053B38 80052F38 01E47823 */ subu $t7, $t7, $a0 /* 053B3C 80052F3C AFA40050 */ sw $a0, 0x50($sp) diff --git a/asm/non_matchings/code_800431B0/func_8005309C.s b/asm/non_matchings/code_800431B0/func_8005309C.s index 8294346c7..20ba8b1c3 100644 --- a/asm/non_matchings/code_800431B0/func_8005309C.s +++ b/asm/non_matchings/code_800431B0/func_8005309C.s @@ -2,8 +2,8 @@ glabel func_8005309C /* 053C9C 8005309C 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 053CA0 800530A0 00047880 */ sll $t7, $a0, 2 /* 053CA4 800530A4 01E47823 */ subu $t7, $t7, $a0 -/* 053CA8 800530A8 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e -/* 053CAC 800530AC 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 053CA8 800530A8 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e +/* 053CAC 800530AC 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 053CB0 800530B0 000F78C0 */ sll $t7, $t7, 3 /* 053CB4 800530B4 AFB60048 */ sw $s6, 0x48($sp) /* 053CB8 800530B8 AFB3003C */ sw $s3, 0x3c($sp) diff --git a/asm/non_matchings/code_800431B0/func_800532A4.s b/asm/non_matchings/code_800431B0/func_800532A4.s index bc853aebe..7cd10a406 100644 --- a/asm/non_matchings/code_800431B0/func_800532A4.s +++ b/asm/non_matchings/code_800431B0/func_800532A4.s @@ -7,9 +7,9 @@ glabel func_800532A4 /* 053EB8 800532B8 01E67823 */ subu $t7, $t7, $a2 /* 053EBC 800532BC 008E2021 */ addu $a0, $a0, $t6 /* 053EC0 800532C0 000F78C0 */ sll $t7, $t7, 3 -/* 053EC4 800532C4 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e +/* 053EC4 800532C4 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e /* 053EC8 800532C8 8C843DB8 */ lw $a0, %lo(D_80183DB8)($a0) # 0x3db8($a0) -/* 053ECC 800532CC 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 053ECC 800532CC 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 053ED0 800532D0 01E67823 */ subu $t7, $t7, $a2 /* 053ED4 800532D4 AFBF003C */ sw $ra, 0x3c($sp) /* 053ED8 800532D8 AFB10038 */ sw $s1, 0x38($sp) diff --git a/asm/non_matchings/code_800431B0/func_80053870.s b/asm/non_matchings/code_800431B0/func_80053870.s index 9eff55e14..bb31d33f2 100644 --- a/asm/non_matchings/code_800431B0/func_80053870.s +++ b/asm/non_matchings/code_800431B0/func_80053870.s @@ -2,8 +2,8 @@ glabel func_80053870 /* 054470 80053870 27BDFF68 */ addiu $sp, $sp, -0x98 /* 054474 80053874 00047080 */ sll $t6, $a0, 2 /* 054478 80053878 01C47023 */ subu $t6, $t6, $a0 -/* 05447C 8005387C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 054480 80053880 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 05447C 8005387C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 054480 80053880 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 054484 80053884 000E70C0 */ sll $t6, $t6, 3 /* 054488 80053888 01C47023 */ subu $t6, $t6, $a0 /* 05448C 8005388C 000E70C0 */ sll $t6, $t6, 3 diff --git a/asm/non_matchings/code_800431B0/func_800540CC.s b/asm/non_matchings/code_800431B0/func_800540CC.s index a2b53b360..12768b960 100644 --- a/asm/non_matchings/code_800431B0/func_800540CC.s +++ b/asm/non_matchings/code_800431B0/func_800540CC.s @@ -1,8 +1,8 @@ glabel func_800540CC /* 054CCC 800540CC 00057080 */ sll $t6, $a1, 2 /* 054CD0 800540D0 01C57023 */ subu $t6, $t6, $a1 -/* 054CD4 800540D4 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 054CD8 800540D8 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 054CD4 800540D4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 054CD8 800540D8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 054CDC 800540DC 000E70C0 */ sll $t6, $t6, 3 /* 054CE0 800540E0 01C57023 */ subu $t6, $t6, $a1 /* 054CE4 800540E4 000E70C0 */ sll $t6, $t6, 3 diff --git a/asm/non_matchings/code_800431B0/func_800541BC.s b/asm/non_matchings/code_800431B0/func_800541BC.s index 5cf930e82..c5f0f40a4 100644 --- a/asm/non_matchings/code_800431B0/func_800541BC.s +++ b/asm/non_matchings/code_800431B0/func_800541BC.s @@ -4,8 +4,8 @@ glabel func_800541BC /* 054DC4 800541C4 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 /* 054DC8 800541C8 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 054DCC 800541CC 01C47023 */ subu $t6, $t6, $a0 -/* 054DD0 800541D0 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 054DD4 800541D4 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 054DD0 800541D0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 054DD4 800541D4 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 054DD8 800541D8 8CE30000 */ lw $v1, ($a3) /* 054DDC 800541DC 000E70C0 */ sll $t6, $t6, 3 /* 054DE0 800541E0 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_800431B0/func_80054324.s b/asm/non_matchings/code_800431B0/func_80054324.s index b1dc231c2..d199399db 100644 --- a/asm/non_matchings/code_800431B0/func_80054324.s +++ b/asm/non_matchings/code_800431B0/func_80054324.s @@ -1,8 +1,8 @@ glabel func_80054324 /* 054F24 80054324 00057080 */ sll $t6, $a1, 2 /* 054F28 80054328 01C57023 */ subu $t6, $t6, $a1 -/* 054F2C 8005432C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 054F30 80054330 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 054F2C 8005432C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 054F30 80054330 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 054F34 80054334 000E70C0 */ sll $t6, $t6, 3 /* 054F38 80054338 01C57023 */ subu $t6, $t6, $a1 /* 054F3C 8005433C 000E70C0 */ sll $t6, $t6, 3 diff --git a/asm/non_matchings/code_800431B0/func_80054414.s b/asm/non_matchings/code_800431B0/func_80054414.s index 39559e267..557967a6d 100644 --- a/asm/non_matchings/code_800431B0/func_80054414.s +++ b/asm/non_matchings/code_800431B0/func_80054414.s @@ -4,8 +4,8 @@ glabel func_80054414 /* 05501C 8005441C 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 /* 055020 80054420 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 055024 80054424 01C47023 */ subu $t6, $t6, $a0 -/* 055028 80054428 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 05502C 8005442C 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 055028 80054428 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 05502C 8005442C 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 055030 80054430 8CE30000 */ lw $v1, ($a3) /* 055034 80054434 000E70C0 */ sll $t6, $t6, 3 /* 055038 80054438 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_800431B0/func_8005457C.s b/asm/non_matchings/code_800431B0/func_8005457C.s index 716ea2e9c..56b54c884 100644 --- a/asm/non_matchings/code_800431B0/func_8005457C.s +++ b/asm/non_matchings/code_800431B0/func_8005457C.s @@ -1,9 +1,9 @@ glabel func_8005457C /* 05517C 8005457C 00057080 */ sll $t6, $a1, 2 /* 055180 80054580 01C57023 */ subu $t6, $t6, $a1 -/* 055184 80054584 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e +/* 055184 80054584 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e /* 055188 80054588 3C198019 */ lui $t9, %hi(D_8018D120) # $t9, 0x8019 -/* 05518C 8005458C 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 05518C 8005458C 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 055190 80054590 8F39D120 */ lw $t9, %lo(D_8018D120)($t9) /* 055194 80054594 000E70C0 */ sll $t6, $t6, 3 /* 055198 80054598 01C57023 */ subu $t6, $t6, $a1 diff --git a/asm/non_matchings/code_800431B0/func_80054938.s b/asm/non_matchings/code_800431B0/func_80054938.s index 6e51f4763..1485b1c88 100644 --- a/asm/non_matchings/code_800431B0/func_80054938.s +++ b/asm/non_matchings/code_800431B0/func_80054938.s @@ -4,8 +4,8 @@ glabel func_80054938 /* 055540 80054940 00047080 */ sll $t6, $a0, 2 /* 055544 80054944 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 /* 055548 80054948 01C47023 */ subu $t6, $t6, $a0 -/* 05554C 8005494C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 055550 80054950 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 05554C 8005494C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 055550 80054950 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 055554 80054954 8CE30000 */ lw $v1, ($a3) /* 055558 80054958 000E70C0 */ sll $t6, $t6, 3 /* 05555C 8005495C 01C47023 */ subu $t6, $t6, $a0 diff --git a/asm/non_matchings/code_800431B0/func_80054BE8.s b/asm/non_matchings/code_800431B0/func_80054BE8.s index 9ad7b71d4..a2e03d0f9 100644 --- a/asm/non_matchings/code_800431B0/func_80054BE8.s +++ b/asm/non_matchings/code_800431B0/func_80054BE8.s @@ -4,8 +4,8 @@ glabel func_80054BE8 /* 0557F0 80054BF0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 /* 0557F4 80054BF4 8D030000 */ lw $v1, ($t0) /* 0557F8 80054BF8 00047080 */ sll $t6, $a0, 2 -/* 0557FC 80054BFC 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 055800 80054C00 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 0557FC 80054BFC 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 055800 80054C00 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 055804 80054C04 01C47023 */ subu $t6, $t6, $a0 /* 055808 80054C08 000E70C0 */ sll $t6, $t6, 3 /* 05580C 80054C0C 24780008 */ addiu $t8, $v1, 8 diff --git a/asm/non_matchings/code_800431B0/func_80054D00.s b/asm/non_matchings/code_800431B0/func_80054D00.s index 12a01949f..00c8ac6ed 100644 --- a/asm/non_matchings/code_800431B0/func_80054D00.s +++ b/asm/non_matchings/code_800431B0/func_80054D00.s @@ -6,9 +6,9 @@ glabel func_80054D00 /* 055910 80054D10 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 /* 055914 80054D14 0019C940 */ sll $t9, $t9, 5 /* 055918 80054D18 01C57023 */ subu $t6, $t6, $a1 -/* 05591C 80054D1C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e +/* 05591C 80054D1C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e /* 055920 80054D20 03281821 */ addu $v1, $t9, $t0 -/* 055924 80054D24 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 055924 80054D24 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 055928 80054D28 846900A6 */ lh $t1, 0xa6($v1) /* 05592C 80054D2C 000E70C0 */ sll $t6, $t6, 3 /* 055930 80054D30 01C57023 */ subu $t6, $t6, $a1 diff --git a/asm/non_matchings/code_800431B0/func_80054F04.s b/asm/non_matchings/code_800431B0/func_80054F04.s index 9806661de..0deb1ff1d 100644 --- a/asm/non_matchings/code_800431B0/func_80054F04.s +++ b/asm/non_matchings/code_800431B0/func_80054F04.s @@ -5,8 +5,8 @@ glabel func_80054F04 /* 055B10 80054F10 00047880 */ sll $t7, $a0, 2 /* 055B14 80054F14 26940298 */ addiu $s4, %lo(gDisplayListHead) # addiu $s4, $s4, 0x298 /* 055B18 80054F18 01E47823 */ subu $t7, $t7, $a0 -/* 055B1C 80054F1C 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e -/* 055B20 80054F20 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 055B1C 80054F1C 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e +/* 055B20 80054F20 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 055B24 80054F24 8E830000 */ lw $v1, ($s4) /* 055B28 80054F28 000F78C0 */ sll $t7, $t7, 3 /* 055B2C 80054F2C 01E47823 */ subu $t7, $t7, $a0 diff --git a/asm/non_matchings/code_800431B0/func_80055458.s b/asm/non_matchings/code_800431B0/func_80055458.s index 9d5d9e34d..c4a730e3f 100644 --- a/asm/non_matchings/code_800431B0/func_80055458.s +++ b/asm/non_matchings/code_800431B0/func_80055458.s @@ -12,8 +12,8 @@ glabel func_80055458 /* 056080 80055480 14200025 */ bnez $at, .L80055518 /* 056084 80055484 0005C880 */ sll $t9, $a1, 2 /* 056088 80055488 0325C823 */ subu $t9, $t9, $a1 -/* 05608C 8005548C 3C08800E */ lui $t0, %hi(D_800DDB40) # $t0, 0x800e -/* 056090 80055490 8D08DB40 */ lw $t0, %lo(D_800DDB40)($t0) +/* 05608C 8005548C 3C08800E */ lui $t0, %hi(camera1) # $t0, 0x800e +/* 056090 80055490 8D08DB40 */ lw $t0, %lo(camera1)($t0) /* 056094 80055494 0019C8C0 */ sll $t9, $t9, 3 /* 056098 80055498 0325C823 */ subu $t9, $t9, $a1 /* 05609C 8005549C 0019C8C0 */ sll $t9, $t9, 3 diff --git a/asm/non_matchings/code_800431B0/func_800555BC.s b/asm/non_matchings/code_800431B0/func_800555BC.s index 96320556e..ec97dbd77 100644 --- a/asm/non_matchings/code_800431B0/func_800555BC.s +++ b/asm/non_matchings/code_800431B0/func_800555BC.s @@ -12,8 +12,8 @@ glabel func_800555BC /* 0561E4 800555E4 14200025 */ bnez $at, .L8005567C /* 0561E8 800555E8 0005C880 */ sll $t9, $a1, 2 /* 0561EC 800555EC 0325C823 */ subu $t9, $t9, $a1 -/* 0561F0 800555F0 3C08800E */ lui $t0, %hi(D_800DDB40) # $t0, 0x800e -/* 0561F4 800555F4 8D08DB40 */ lw $t0, %lo(D_800DDB40)($t0) +/* 0561F0 800555F0 3C08800E */ lui $t0, %hi(camera1) # $t0, 0x800e +/* 0561F4 800555F4 8D08DB40 */ lw $t0, %lo(camera1)($t0) /* 0561F8 800555F8 0019C8C0 */ sll $t9, $t9, 3 /* 0561FC 800555FC 0325C823 */ subu $t9, $t9, $a1 /* 056200 80055600 0019C8C0 */ sll $t9, $t9, 3 diff --git a/asm/non_matchings/code_800431B0/func_80055AB8.s b/asm/non_matchings/code_800431B0/func_80055AB8.s index e86259ef9..70c17e647 100644 --- a/asm/non_matchings/code_800431B0/func_80055AB8.s +++ b/asm/non_matchings/code_800431B0/func_80055AB8.s @@ -9,8 +9,8 @@ glabel func_80055AB8 /* 0566D4 80055AD4 846A00A6 */ lh $t2, 0xa6($v1) /* 0566D8 80055AD8 01C57023 */ subu $t6, $t6, $a1 /* 0566DC 80055ADC 000E70C0 */ sll $t6, $t6, 3 -/* 0566E0 80055AE0 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 0566E4 80055AE4 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 0566E0 80055AE0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 0566E4 80055AE4 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 0566E8 80055AE8 01C57023 */ subu $t6, $t6, $a1 /* 0566EC 80055AEC 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 0566F0 80055AF0 000E70C0 */ sll $t6, $t6, 3 diff --git a/asm/non_matchings/code_800431B0/func_80055CCC.s b/asm/non_matchings/code_800431B0/func_80055CCC.s index 792c82f42..89fb78fe1 100644 --- a/asm/non_matchings/code_800431B0/func_80055CCC.s +++ b/asm/non_matchings/code_800431B0/func_80055CCC.s @@ -8,9 +8,9 @@ glabel func_80055CCC /* 0568E4 80055CE4 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 /* 0568E8 80055CE8 0019C940 */ sll $t9, $t9, 5 /* 0568EC 80055CEC 01C57023 */ subu $t6, $t6, $a1 -/* 0568F0 80055CF0 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e +/* 0568F0 80055CF0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e /* 0568F4 80055CF4 03288021 */ addu $s0, $t9, $t0 -/* 0568F8 80055CF8 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 0568F8 80055CF8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 0568FC 80055CFC 860900A6 */ lh $t1, 0xa6($s0) /* 056900 80055D00 000E70C0 */ sll $t6, $t6, 3 /* 056904 80055D04 01C57023 */ subu $t6, $t6, $a1 diff --git a/asm/non_matchings/code_800431B0/func_80056188.s b/asm/non_matchings/code_800431B0/func_80056188.s index 5c6068daf..c18eeddf8 100644 --- a/asm/non_matchings/code_800431B0/func_80056188.s +++ b/asm/non_matchings/code_800431B0/func_80056188.s @@ -2,8 +2,8 @@ glabel func_80056188 /* 056D88 80056188 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 056D8C 8005618C 00047080 */ sll $t6, $a0, 2 /* 056D90 80056190 01C47023 */ subu $t6, $t6, $a0 -/* 056D94 80056194 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 056D98 80056198 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 056D94 80056194 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 056D98 80056198 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 056D9C 8005619C 000E70C0 */ sll $t6, $t6, 3 /* 056DA0 800561A0 AFBE0050 */ sw $fp, 0x50($sp) /* 056DA4 800561A4 AFB50044 */ sw $s5, 0x44($sp) diff --git a/asm/non_matchings/code_800431B0/func_800563DC.s b/asm/non_matchings/code_800431B0/func_800563DC.s index 365381038..d425d06dd 100644 --- a/asm/non_matchings/code_800431B0/func_800563DC.s +++ b/asm/non_matchings/code_800431B0/func_800563DC.s @@ -16,8 +16,8 @@ glabel func_800563DC /* 057014 80056414 3C108016 */ lui $s0, %hi(D_801655CC) # $s0, 0x8016 /* 057018 80056418 8E1055CC */ lw $s0, %lo(D_801655CC)($s0) /* 05701C 8005641C 00057080 */ sll $t6, $a1, 2 -/* 057020 80056420 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 057024 80056424 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 057020 80056420 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 057024 80056424 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 057028 80056428 AFB30034 */ sw $s3, 0x34($sp) /* 05702C 8005642C 01C57023 */ subu $t6, $t6, $a1 /* 057030 80056430 46205420 */ cvt.s.d $f16, $f10 diff --git a/asm/non_matchings/code_800431B0/func_80057114.s b/asm/non_matchings/code_800431B0/func_80057114.s index f4894968d..cfa6d343f 100644 --- a/asm/non_matchings/code_800431B0/func_80057114.s +++ b/asm/non_matchings/code_800431B0/func_80057114.s @@ -20,8 +20,8 @@ glabel func_80057114 /* 057D58 80057158 001E7880 */ sll $t7, $fp, 2 /* 057D5C 8005715C 01FE7823 */ subu $t7, $t7, $fp /* 057D60 80057160 000F78C0 */ sll $t7, $t7, 3 -/* 057D64 80057164 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e -/* 057D68 80057168 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 057D64 80057164 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e +/* 057D68 80057168 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 057D6C 8005716C 01FE7823 */ subu $t7, $t7, $fp /* 057D70 80057170 000F78C0 */ sll $t7, $t7, 3 /* 057D74 80057174 17C00023 */ bnez $fp, .L80057204 diff --git a/asm/non_matchings/code_80057C60/func_800581C8.s b/asm/non_matchings/code_80057C60/func_800581C8.s deleted file mode 100644 index cf018a3ce..000000000 --- a/asm/non_matchings/code_80057C60/func_800581C8.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_800581C8 -/* 058DC8 800581C8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 058DCC 800581CC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 058DD0 800581D0 8C620000 */ lw $v0, ($v1) -/* 058DD4 800581D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 058DD8 800581D8 AFBF0014 */ sw $ra, 0x14($sp) -/* 058DDC 800581DC 244E0008 */ addiu $t6, $v0, 8 -/* 058DE0 800581E0 AC6E0000 */ sw $t6, ($v1) -/* 058DE4 800581E4 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 058DE8 800581E8 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 058DEC 800581EC 3C180008 */ lui $t8, 8 -/* 058DF0 800581F0 AC580004 */ sw $t8, 4($v0) -/* 058DF4 800581F4 AC4F0000 */ sw $t7, ($v0) -/* 058DF8 800581F8 8C620000 */ lw $v0, ($v1) -/* 058DFC 800581FC 3C0A0103 */ lui $t2, (0x01030040 >> 16) # lui $t2, 0x103 -/* 058E00 80058200 3C088015 */ lui $t0, %hi(gGfxPool) # $t0, 0x8015 -/* 058E04 80058204 24590008 */ addiu $t9, $v0, 8 -/* 058E08 80058208 AC790000 */ sw $t9, ($v1) -/* 058E0C 8005820C 354A0040 */ ori $t2, (0x01030040 & 0xFFFF) # ori $t2, $t2, 0x40 -/* 058E10 80058210 2508EF40 */ addiu $t0, %lo(gGfxPool) # addiu $t0, $t0, -0x10c0 -/* 058E14 80058214 AC4A0000 */ sw $t2, ($v0) -/* 058E18 80058218 8D0B0000 */ lw $t3, ($t0) -/* 058E1C 8005821C 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 058E20 80058220 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 058E24 80058224 256C0040 */ addiu $t4, $t3, 0x40 -/* 058E28 80058228 01896824 */ and $t5, $t4, $t1 -/* 058E2C 8005822C AC4D0004 */ sw $t5, 4($v0) -/* 058E30 80058230 8C620000 */ lw $v0, ($v1) -/* 058E34 80058234 3C0F0101 */ lui $t7, (0x01010040 >> 16) # lui $t7, 0x101 -/* 058E38 80058238 35EF0040 */ ori $t7, (0x01010040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 058E3C 8005823C 244E0008 */ addiu $t6, $v0, 8 -/* 058E40 80058240 AC6E0000 */ sw $t6, ($v1) -/* 058E44 80058244 AC4F0000 */ sw $t7, ($v0) -/* 058E48 80058248 8D180000 */ lw $t8, ($t0) -/* 058E4C 8005824C 00002025 */ move $a0, $zero -/* 058E50 80058250 271901C0 */ addiu $t9, $t8, 0x1c0 -/* 058E54 80058254 03295024 */ and $t2, $t9, $t1 -/* 058E58 80058258 0C0070F1 */ jal func_8001C3C4 -/* 058E5C 8005825C AC4A0004 */ sw $t2, 4($v0) -/* 058E60 80058260 3C0B800E */ lui $t3, %hi(D_800DC50C) # $t3, 0x800e -/* 058E64 80058264 8D6BC50C */ lw $t3, %lo(D_800DC50C)($t3) -/* 058E68 80058268 24010005 */ li $at, 5 -/* 058E6C 8005826C 3C0C800E */ lui $t4, %hi(D_800DC51C) # $t4, 0x800e -/* 058E70 80058270 1561000B */ bne $t3, $at, .L800582A0 -/* 058E74 80058274 00000000 */ nop -/* 058E78 80058278 0C0157D2 */ jal func_80055F48 -/* 058E7C 8005827C 00002025 */ move $a0, $zero -/* 058E80 80058280 0C015858 */ jal func_80056160 -/* 058E84 80058284 00002025 */ move $a0, $zero -/* 058E88 80058288 0C01485F */ jal func_8005217C -/* 058E8C 8005828C 00002025 */ move $a0, $zero -/* 058E90 80058290 0C0152FA */ jal func_80054BE8 -/* 058E94 80058294 00002025 */ move $a0, $zero -/* 058E98 80058298 10000009 */ b .L800582C0 -/* 058E9C 8005829C 8FBF0014 */ lw $ra, 0x14($sp) -.L800582A0: -/* 058EA0 800582A0 958CC51C */ lhu $t4, %lo(D_800DC51C)($t4) -/* 058EA4 800582A4 15800003 */ bnez $t4, .L800582B4 -/* 058EA8 800582A8 00000000 */ nop -/* 058EAC 800582AC 0C014CA9 */ jal func_800532A4 -/* 058EB0 800582B0 00002025 */ move $a0, $zero -.L800582B4: -/* 058EB4 800582B4 0C01623D */ jal func_800588F4 -/* 058EB8 800582B8 00002025 */ move $a0, $zero -/* 058EBC 800582BC 8FBF0014 */ lw $ra, 0x14($sp) -.L800582C0: -/* 058EC0 800582C0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 058EC4 800582C4 03E00008 */ jr $ra -/* 058EC8 800582C8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800582CC.s b/asm/non_matchings/code_80057C60/func_800582CC.s deleted file mode 100644 index 5d9d6552d..000000000 --- a/asm/non_matchings/code_80057C60/func_800582CC.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_800582CC -/* 058ECC 800582CC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 058ED0 800582D0 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 058ED4 800582D4 8C620000 */ lw $v0, ($v1) -/* 058ED8 800582D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 058EDC 800582DC AFBF0014 */ sw $ra, 0x14($sp) -/* 058EE0 800582E0 244E0008 */ addiu $t6, $v0, 8 -/* 058EE4 800582E4 AC6E0000 */ sw $t6, ($v1) -/* 058EE8 800582E8 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 058EEC 800582EC 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 058EF0 800582F0 3C180008 */ lui $t8, 8 -/* 058EF4 800582F4 AC580004 */ sw $t8, 4($v0) -/* 058EF8 800582F8 AC4F0000 */ sw $t7, ($v0) -/* 058EFC 800582FC 8C620000 */ lw $v0, ($v1) -/* 058F00 80058300 3C0A0103 */ lui $t2, (0x01030040 >> 16) # lui $t2, 0x103 -/* 058F04 80058304 3C088015 */ lui $t0, %hi(gGfxPool) # $t0, 0x8015 -/* 058F08 80058308 24590008 */ addiu $t9, $v0, 8 -/* 058F0C 8005830C AC790000 */ sw $t9, ($v1) -/* 058F10 80058310 354A0040 */ ori $t2, (0x01030040 & 0xFFFF) # ori $t2, $t2, 0x40 -/* 058F14 80058314 2508EF40 */ addiu $t0, %lo(gGfxPool) # addiu $t0, $t0, -0x10c0 -/* 058F18 80058318 AC4A0000 */ sw $t2, ($v0) -/* 058F1C 8005831C 8D0B0000 */ lw $t3, ($t0) -/* 058F20 80058320 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 058F24 80058324 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 058F28 80058328 256C0080 */ addiu $t4, $t3, 0x80 -/* 058F2C 8005832C 01896824 */ and $t5, $t4, $t1 -/* 058F30 80058330 AC4D0004 */ sw $t5, 4($v0) -/* 058F34 80058334 8C620000 */ lw $v0, ($v1) -/* 058F38 80058338 3C0F0101 */ lui $t7, (0x01010040 >> 16) # lui $t7, 0x101 -/* 058F3C 8005833C 35EF0040 */ ori $t7, (0x01010040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 058F40 80058340 244E0008 */ addiu $t6, $v0, 8 -/* 058F44 80058344 AC6E0000 */ sw $t6, ($v1) -/* 058F48 80058348 AC4F0000 */ sw $t7, ($v0) -/* 058F4C 8005834C 8D180000 */ lw $t8, ($t0) -/* 058F50 80058350 24040001 */ li $a0, 1 -/* 058F54 80058354 27190200 */ addiu $t9, $t8, 0x200 -/* 058F58 80058358 03295024 */ and $t2, $t9, $t1 -/* 058F5C 8005835C 0C0070F1 */ jal func_8001C3C4 -/* 058F60 80058360 AC4A0004 */ sw $t2, 4($v0) -/* 058F64 80058364 3C0B800E */ lui $t3, %hi(D_800DC51C) # $t3, 0x800e -/* 058F68 80058368 956BC51C */ lhu $t3, %lo(D_800DC51C)($t3) -/* 058F6C 8005836C 15600003 */ bnez $t3, .L8005837C -/* 058F70 80058370 00000000 */ nop -/* 058F74 80058374 0C014CA9 */ jal func_800532A4 -/* 058F78 80058378 24040001 */ li $a0, 1 -.L8005837C: -/* 058F7C 8005837C 0C01623D */ jal func_800588F4 -/* 058F80 80058380 24040001 */ li $a0, 1 -/* 058F84 80058384 8FBF0014 */ lw $ra, 0x14($sp) -/* 058F88 80058388 27BD0018 */ addiu $sp, $sp, 0x18 -/* 058F8C 8005838C 03E00008 */ jr $ra -/* 058F90 80058390 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80058394.s b/asm/non_matchings/code_80057C60/func_80058394.s deleted file mode 100644 index a04bdf995..000000000 --- a/asm/non_matchings/code_80057C60/func_80058394.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80058394 -/* 058F94 80058394 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 058F98 80058398 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 058F9C 8005839C 8C620000 */ lw $v0, ($v1) -/* 058FA0 800583A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 058FA4 800583A4 AFBF0014 */ sw $ra, 0x14($sp) -/* 058FA8 800583A8 244E0008 */ addiu $t6, $v0, 8 -/* 058FAC 800583AC AC6E0000 */ sw $t6, ($v1) -/* 058FB0 800583B0 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 058FB4 800583B4 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 058FB8 800583B8 3C180008 */ lui $t8, 8 -/* 058FBC 800583BC AC580004 */ sw $t8, 4($v0) -/* 058FC0 800583C0 AC4F0000 */ sw $t7, ($v0) -/* 058FC4 800583C4 8C620000 */ lw $v0, ($v1) -/* 058FC8 800583C8 3C0A0103 */ lui $t2, (0x01030040 >> 16) # lui $t2, 0x103 -/* 058FCC 800583CC 3C088015 */ lui $t0, %hi(gGfxPool) # $t0, 0x8015 -/* 058FD0 800583D0 24590008 */ addiu $t9, $v0, 8 -/* 058FD4 800583D4 AC790000 */ sw $t9, ($v1) -/* 058FD8 800583D8 354A0040 */ ori $t2, (0x01030040 & 0xFFFF) # ori $t2, $t2, 0x40 -/* 058FDC 800583DC 2508EF40 */ addiu $t0, %lo(gGfxPool) # addiu $t0, $t0, -0x10c0 -/* 058FE0 800583E0 AC4A0000 */ sw $t2, ($v0) -/* 058FE4 800583E4 8D0B0000 */ lw $t3, ($t0) -/* 058FE8 800583E8 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 058FEC 800583EC 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 058FF0 800583F0 256C00C0 */ addiu $t4, $t3, 0xc0 -/* 058FF4 800583F4 01896824 */ and $t5, $t4, $t1 -/* 058FF8 800583F8 AC4D0004 */ sw $t5, 4($v0) -/* 058FFC 800583FC 8C620000 */ lw $v0, ($v1) -/* 059000 80058400 3C0F0101 */ lui $t7, (0x01010040 >> 16) # lui $t7, 0x101 -/* 059004 80058404 35EF0040 */ ori $t7, (0x01010040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 059008 80058408 244E0008 */ addiu $t6, $v0, 8 -/* 05900C 8005840C AC6E0000 */ sw $t6, ($v1) -/* 059010 80058410 AC4F0000 */ sw $t7, ($v0) -/* 059014 80058414 8D180000 */ lw $t8, ($t0) -/* 059018 80058418 24040002 */ li $a0, 2 -/* 05901C 8005841C 27190240 */ addiu $t9, $t8, 0x240 -/* 059020 80058420 03295024 */ and $t2, $t9, $t1 -/* 059024 80058424 0C0070F1 */ jal func_8001C3C4 -/* 059028 80058428 AC4A0004 */ sw $t2, 4($v0) -/* 05902C 8005842C 3C0B800E */ lui $t3, %hi(D_800DC51C) # $t3, 0x800e -/* 059030 80058430 956BC51C */ lhu $t3, %lo(D_800DC51C)($t3) -/* 059034 80058434 15600003 */ bnez $t3, .L80058444 -/* 059038 80058438 00000000 */ nop -/* 05903C 8005843C 0C014CA9 */ jal func_800532A4 -/* 059040 80058440 24040002 */ li $a0, 2 -.L80058444: -/* 059044 80058444 0C01623D */ jal func_800588F4 -/* 059048 80058448 24040002 */ li $a0, 2 -/* 05904C 8005844C 8FBF0014 */ lw $ra, 0x14($sp) -/* 059050 80058450 27BD0018 */ addiu $sp, $sp, 0x18 -/* 059054 80058454 03E00008 */ jr $ra -/* 059058 80058458 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005845C.s b/asm/non_matchings/code_80057C60/func_8005845C.s deleted file mode 100644 index 9e42cf101..000000000 --- a/asm/non_matchings/code_80057C60/func_8005845C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_8005845C -/* 05905C 8005845C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 059060 80058460 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 059064 80058464 8C620000 */ lw $v0, ($v1) -/* 059068 80058468 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05906C 8005846C AFBF0014 */ sw $ra, 0x14($sp) -/* 059070 80058470 244E0008 */ addiu $t6, $v0, 8 -/* 059074 80058474 AC6E0000 */ sw $t6, ($v1) -/* 059078 80058478 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 05907C 8005847C 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 059080 80058480 3C180008 */ lui $t8, 8 -/* 059084 80058484 AC580004 */ sw $t8, 4($v0) -/* 059088 80058488 AC4F0000 */ sw $t7, ($v0) -/* 05908C 8005848C 8C620000 */ lw $v0, ($v1) -/* 059090 80058490 3C0A0103 */ lui $t2, (0x01030040 >> 16) # lui $t2, 0x103 -/* 059094 80058494 3C088015 */ lui $t0, %hi(gGfxPool) # $t0, 0x8015 -/* 059098 80058498 24590008 */ addiu $t9, $v0, 8 -/* 05909C 8005849C AC790000 */ sw $t9, ($v1) -/* 0590A0 800584A0 354A0040 */ ori $t2, (0x01030040 & 0xFFFF) # ori $t2, $t2, 0x40 -/* 0590A4 800584A4 2508EF40 */ addiu $t0, %lo(gGfxPool) # addiu $t0, $t0, -0x10c0 -/* 0590A8 800584A8 AC4A0000 */ sw $t2, ($v0) -/* 0590AC 800584AC 8D0B0000 */ lw $t3, ($t0) -/* 0590B0 800584B0 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 0590B4 800584B4 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 0590B8 800584B8 256C0100 */ addiu $t4, $t3, 0x100 -/* 0590BC 800584BC 01896824 */ and $t5, $t4, $t1 -/* 0590C0 800584C0 AC4D0004 */ sw $t5, 4($v0) -/* 0590C4 800584C4 8C620000 */ lw $v0, ($v1) -/* 0590C8 800584C8 3C0F0101 */ lui $t7, (0x01010040 >> 16) # lui $t7, 0x101 -/* 0590CC 800584CC 35EF0040 */ ori $t7, (0x01010040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 0590D0 800584D0 244E0008 */ addiu $t6, $v0, 8 -/* 0590D4 800584D4 AC6E0000 */ sw $t6, ($v1) -/* 0590D8 800584D8 AC4F0000 */ sw $t7, ($v0) -/* 0590DC 800584DC 8D180000 */ lw $t8, ($t0) -/* 0590E0 800584E0 24040003 */ li $a0, 3 -/* 0590E4 800584E4 27190280 */ addiu $t9, $t8, 0x280 -/* 0590E8 800584E8 03295024 */ and $t2, $t9, $t1 -/* 0590EC 800584EC 0C0070F1 */ jal func_8001C3C4 -/* 0590F0 800584F0 AC4A0004 */ sw $t2, 4($v0) -/* 0590F4 800584F4 3C0B800E */ lui $t3, %hi(D_800DC51C) # $t3, 0x800e -/* 0590F8 800584F8 956BC51C */ lhu $t3, %lo(D_800DC51C)($t3) -/* 0590FC 800584FC 3C0C800E */ lui $t4, %hi(gPlayerCountSelection1) # $t4, 0x800e -/* 059100 80058500 15600007 */ bnez $t3, .L80058520 -/* 059104 80058504 00000000 */ nop -/* 059108 80058508 8D8CC538 */ lw $t4, %lo(gPlayerCountSelection1)($t4) -/* 05910C 8005850C 24010004 */ li $at, 4 -/* 059110 80058510 15810003 */ bne $t4, $at, .L80058520 -/* 059114 80058514 00000000 */ nop -/* 059118 80058518 0C014CA9 */ jal func_800532A4 -/* 05911C 8005851C 24040003 */ li $a0, 3 -.L80058520: -/* 059120 80058520 0C01623D */ jal func_800588F4 -/* 059124 80058524 24040003 */ li $a0, 3 -/* 059128 80058528 8FBF0014 */ lw $ra, 0x14($sp) -/* 05912C 8005852C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 059130 80058530 03E00008 */ jr $ra -/* 059134 80058534 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80058640.s b/asm/non_matchings/code_80057C60/func_80058640.s deleted file mode 100644 index 8485c0162..000000000 --- a/asm/non_matchings/code_80057C60/func_80058640.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80058640 -/* 059240 80058640 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 059244 80058644 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 059248 80058648 8C620000 */ lw $v0, ($v1) -/* 05924C 8005864C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 059250 80058650 AFBF0014 */ sw $ra, 0x14($sp) -/* 059254 80058654 244E0008 */ addiu $t6, $v0, 8 -/* 059258 80058658 AC6E0000 */ sw $t6, ($v1) -/* 05925C 8005865C 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 059260 80058660 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 059264 80058664 3C180008 */ lui $t8, 8 -/* 059268 80058668 AC580004 */ sw $t8, 4($v0) -/* 05926C 8005866C AC4F0000 */ sw $t7, ($v0) -/* 059270 80058670 8C620000 */ lw $v0, ($v1) -/* 059274 80058674 3C090103 */ lui $t1, (0x01030040 >> 16) # lui $t1, 0x103 -/* 059278 80058678 3C078015 */ lui $a3, %hi(gGfxPool) # $a3, 0x8015 -/* 05927C 8005867C 24590008 */ addiu $t9, $v0, 8 -/* 059280 80058680 AC790000 */ sw $t9, ($v1) -/* 059284 80058684 35290040 */ ori $t1, (0x01030040 & 0xFFFF) # ori $t1, $t1, 0x40 -/* 059288 80058688 24E7EF40 */ addiu $a3, %lo(gGfxPool) # addiu $a3, $a3, -0x10c0 -/* 05928C 8005868C AC490000 */ sw $t1, ($v0) -/* 059290 80058690 8CEA0000 */ lw $t2, ($a3) -/* 059294 80058694 3C081FFF */ lui $t0, (0x1FFFFFFF >> 16) # lui $t0, 0x1fff -/* 059298 80058698 3508FFFF */ ori $t0, (0x1FFFFFFF & 0xFFFF) # ori $t0, $t0, 0xffff -/* 05929C 8005869C 254B0040 */ addiu $t3, $t2, 0x40 -/* 0592A0 800586A0 01686024 */ and $t4, $t3, $t0 -/* 0592A4 800586A4 AC4C0004 */ sw $t4, 4($v0) -/* 0592A8 800586A8 8C620000 */ lw $v0, ($v1) -/* 0592AC 800586AC 3C0E0101 */ lui $t6, (0x01010040 >> 16) # lui $t6, 0x101 -/* 0592B0 800586B0 35CE0040 */ ori $t6, (0x01010040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 0592B4 800586B4 244D0008 */ addiu $t5, $v0, 8 -/* 0592B8 800586B8 AC6D0000 */ sw $t5, ($v1) -/* 0592BC 800586BC AC4E0000 */ sw $t6, ($v0) -/* 0592C0 800586C0 8CEF0000 */ lw $t7, ($a3) -/* 0592C4 800586C4 3C09800E */ lui $t1, %hi(D_800DC50C) # $t1, 0x800e -/* 0592C8 800586C8 24010005 */ li $at, 5 -/* 0592CC 800586CC 25F801C0 */ addiu $t8, $t7, 0x1c0 -/* 0592D0 800586D0 0308C824 */ and $t9, $t8, $t0 -/* 0592D4 800586D4 AC590004 */ sw $t9, 4($v0) -/* 0592D8 800586D8 8D29C50C */ lw $t1, %lo(D_800DC50C)($t1) -/* 0592DC 800586DC 51210004 */ beql $t1, $at, .L800586F0 -/* 0592E0 800586E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0592E4 800586E4 0C0162D6 */ jal func_80058B58 -/* 0592E8 800586E8 00002025 */ move $a0, $zero -/* 0592EC 800586EC 8FBF0014 */ lw $ra, 0x14($sp) -.L800586F0: -/* 0592F0 800586F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0592F4 800586F4 03E00008 */ jr $ra -/* 0592F8 800586F8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800586FC.s b/asm/non_matchings/code_80057C60/func_800586FC.s deleted file mode 100644 index f5c2d347f..000000000 --- a/asm/non_matchings/code_80057C60/func_800586FC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_800586FC -/* 0592FC 800586FC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 059300 80058700 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 059304 80058704 8C620000 */ lw $v0, ($v1) -/* 059308 80058708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05930C 8005870C AFBF0014 */ sw $ra, 0x14($sp) -/* 059310 80058710 244E0008 */ addiu $t6, $v0, 8 -/* 059314 80058714 AC6E0000 */ sw $t6, ($v1) -/* 059318 80058718 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 05931C 8005871C 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 059320 80058720 3C180008 */ lui $t8, 8 -/* 059324 80058724 AC580004 */ sw $t8, 4($v0) -/* 059328 80058728 AC4F0000 */ sw $t7, ($v0) -/* 05932C 8005872C 8C620000 */ lw $v0, ($v1) -/* 059330 80058730 3C0A0103 */ lui $t2, (0x01030040 >> 16) # lui $t2, 0x103 -/* 059334 80058734 3C088015 */ lui $t0, %hi(gGfxPool) # $t0, 0x8015 -/* 059338 80058738 24590008 */ addiu $t9, $v0, 8 -/* 05933C 8005873C AC790000 */ sw $t9, ($v1) -/* 059340 80058740 354A0040 */ ori $t2, (0x01030040 & 0xFFFF) # ori $t2, $t2, 0x40 -/* 059344 80058744 2508EF40 */ addiu $t0, %lo(gGfxPool) # addiu $t0, $t0, -0x10c0 -/* 059348 80058748 AC4A0000 */ sw $t2, ($v0) -/* 05934C 8005874C 8D0B0000 */ lw $t3, ($t0) -/* 059350 80058750 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 059354 80058754 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 059358 80058758 256C0080 */ addiu $t4, $t3, 0x80 -/* 05935C 8005875C 01896824 */ and $t5, $t4, $t1 -/* 059360 80058760 AC4D0004 */ sw $t5, 4($v0) -/* 059364 80058764 8C620000 */ lw $v0, ($v1) -/* 059368 80058768 3C0F0101 */ lui $t7, (0x01010040 >> 16) # lui $t7, 0x101 -/* 05936C 8005876C 35EF0040 */ ori $t7, (0x01010040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 059370 80058770 244E0008 */ addiu $t6, $v0, 8 -/* 059374 80058774 AC6E0000 */ sw $t6, ($v1) -/* 059378 80058778 AC4F0000 */ sw $t7, ($v0) -/* 05937C 8005877C 8D180000 */ lw $t8, ($t0) -/* 059380 80058780 24040001 */ li $a0, 1 -/* 059384 80058784 27190200 */ addiu $t9, $t8, 0x200 -/* 059388 80058788 03295024 */ and $t2, $t9, $t1 -/* 05938C 8005878C 0C0162D6 */ jal func_80058B58 -/* 059390 80058790 AC4A0004 */ sw $t2, 4($v0) -/* 059394 80058794 8FBF0014 */ lw $ra, 0x14($sp) -/* 059398 80058798 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05939C 8005879C 03E00008 */ jr $ra -/* 0593A0 800587A0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800587A4.s b/asm/non_matchings/code_80057C60/func_800587A4.s deleted file mode 100644 index 350129af1..000000000 --- a/asm/non_matchings/code_80057C60/func_800587A4.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_800587A4 -/* 0593A4 800587A4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0593A8 800587A8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0593AC 800587AC 8C620000 */ lw $v0, ($v1) -/* 0593B0 800587B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0593B4 800587B4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0593B8 800587B8 244E0008 */ addiu $t6, $v0, 8 -/* 0593BC 800587BC AC6E0000 */ sw $t6, ($v1) -/* 0593C0 800587C0 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 0593C4 800587C4 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 0593C8 800587C8 3C180008 */ lui $t8, 8 -/* 0593CC 800587CC AC580004 */ sw $t8, 4($v0) -/* 0593D0 800587D0 AC4F0000 */ sw $t7, ($v0) -/* 0593D4 800587D4 8C620000 */ lw $v0, ($v1) -/* 0593D8 800587D8 3C0A0103 */ lui $t2, (0x01030040 >> 16) # lui $t2, 0x103 -/* 0593DC 800587DC 3C088015 */ lui $t0, %hi(gGfxPool) # $t0, 0x8015 -/* 0593E0 800587E0 24590008 */ addiu $t9, $v0, 8 -/* 0593E4 800587E4 AC790000 */ sw $t9, ($v1) -/* 0593E8 800587E8 354A0040 */ ori $t2, (0x01030040 & 0xFFFF) # ori $t2, $t2, 0x40 -/* 0593EC 800587EC 2508EF40 */ addiu $t0, %lo(gGfxPool) # addiu $t0, $t0, -0x10c0 -/* 0593F0 800587F0 AC4A0000 */ sw $t2, ($v0) -/* 0593F4 800587F4 8D0B0000 */ lw $t3, ($t0) -/* 0593F8 800587F8 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 0593FC 800587FC 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 059400 80058800 256C00C0 */ addiu $t4, $t3, 0xc0 -/* 059404 80058804 01896824 */ and $t5, $t4, $t1 -/* 059408 80058808 AC4D0004 */ sw $t5, 4($v0) -/* 05940C 8005880C 8C620000 */ lw $v0, ($v1) -/* 059410 80058810 3C0F0101 */ lui $t7, (0x01010040 >> 16) # lui $t7, 0x101 -/* 059414 80058814 35EF0040 */ ori $t7, (0x01010040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 059418 80058818 244E0008 */ addiu $t6, $v0, 8 -/* 05941C 8005881C AC6E0000 */ sw $t6, ($v1) -/* 059420 80058820 AC4F0000 */ sw $t7, ($v0) -/* 059424 80058824 8D180000 */ lw $t8, ($t0) -/* 059428 80058828 24040002 */ li $a0, 2 -/* 05942C 8005882C 27190240 */ addiu $t9, $t8, 0x240 -/* 059430 80058830 03295024 */ and $t2, $t9, $t1 -/* 059434 80058834 0C0162D6 */ jal func_80058B58 -/* 059438 80058838 AC4A0004 */ sw $t2, 4($v0) -/* 05943C 8005883C 8FBF0014 */ lw $ra, 0x14($sp) -/* 059440 80058840 27BD0018 */ addiu $sp, $sp, 0x18 -/* 059444 80058844 03E00008 */ jr $ra -/* 059448 80058848 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005884C.s b/asm/non_matchings/code_80057C60/func_8005884C.s deleted file mode 100644 index ad0ba4ddc..000000000 --- a/asm/non_matchings/code_80057C60/func_8005884C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8005884C -/* 05944C 8005884C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 059450 80058850 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 059454 80058854 8C620000 */ lw $v0, ($v1) -/* 059458 80058858 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05945C 8005885C AFBF0014 */ sw $ra, 0x14($sp) -/* 059460 80058860 244E0008 */ addiu $t6, $v0, 8 -/* 059464 80058864 AC6E0000 */ sw $t6, ($v1) -/* 059468 80058868 3C0FBA00 */ lui $t7, (0xBA001301 >> 16) # lui $t7, 0xba00 -/* 05946C 8005886C 35EF1301 */ ori $t7, (0xBA001301 & 0xFFFF) # ori $t7, $t7, 0x1301 -/* 059470 80058870 3C180008 */ lui $t8, 8 -/* 059474 80058874 AC580004 */ sw $t8, 4($v0) -/* 059478 80058878 AC4F0000 */ sw $t7, ($v0) -/* 05947C 8005887C 8C620000 */ lw $v0, ($v1) -/* 059480 80058880 3C0A0103 */ lui $t2, (0x01030040 >> 16) # lui $t2, 0x103 -/* 059484 80058884 3C088015 */ lui $t0, %hi(gGfxPool) # $t0, 0x8015 -/* 059488 80058888 24590008 */ addiu $t9, $v0, 8 -/* 05948C 8005888C AC790000 */ sw $t9, ($v1) -/* 059490 80058890 354A0040 */ ori $t2, (0x01030040 & 0xFFFF) # ori $t2, $t2, 0x40 -/* 059494 80058894 2508EF40 */ addiu $t0, %lo(gGfxPool) # addiu $t0, $t0, -0x10c0 -/* 059498 80058898 AC4A0000 */ sw $t2, ($v0) -/* 05949C 8005889C 8D0B0000 */ lw $t3, ($t0) -/* 0594A0 800588A0 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 0594A4 800588A4 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 0594A8 800588A8 256C0100 */ addiu $t4, $t3, 0x100 -/* 0594AC 800588AC 01896824 */ and $t5, $t4, $t1 -/* 0594B0 800588B0 AC4D0004 */ sw $t5, 4($v0) -/* 0594B4 800588B4 8C620000 */ lw $v0, ($v1) -/* 0594B8 800588B8 3C0F0101 */ lui $t7, (0x01010040 >> 16) # lui $t7, 0x101 -/* 0594BC 800588BC 35EF0040 */ ori $t7, (0x01010040 & 0xFFFF) # ori $t7, $t7, 0x40 -/* 0594C0 800588C0 244E0008 */ addiu $t6, $v0, 8 -/* 0594C4 800588C4 AC6E0000 */ sw $t6, ($v1) -/* 0594C8 800588C8 AC4F0000 */ sw $t7, ($v0) -/* 0594CC 800588CC 8D180000 */ lw $t8, ($t0) -/* 0594D0 800588D0 24040003 */ li $a0, 3 -/* 0594D4 800588D4 27190280 */ addiu $t9, $t8, 0x280 -/* 0594D8 800588D8 03295024 */ and $t2, $t9, $t1 -/* 0594DC 800588DC 0C0162D6 */ jal func_80058B58 -/* 0594E0 800588E0 AC4A0004 */ sw $t2, 4($v0) -/* 0594E4 800588E4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0594E8 800588E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0594EC 800588EC 03E00008 */ jr $ra -/* 0594F0 800588F0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80058BF4.s b/asm/non_matchings/code_80057C60/func_80058BF4.s deleted file mode 100644 index e73595960..000000000 --- a/asm/non_matchings/code_80057C60/func_80058BF4.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80058BF4 -/* 0597F4 80058BF4 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 0597F8 80058BF8 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 0597FC 80058BFC 8C830000 */ lw $v1, ($a0) -/* 059800 80058C00 3C180D00 */ lui $t8, %hi(D_0D0076F8) # $t8, 0xd00 -/* 059804 80058C04 271876F8 */ addiu $t8, %lo(D_0D0076F8) # addiu $t8, $t8, 0x76f8 -/* 059808 80058C08 246E0008 */ addiu $t6, $v1, 8 -/* 05980C 80058C0C AC8E0000 */ sw $t6, ($a0) -/* 059810 80058C10 3C0F0600 */ lui $t7, 0x600 -/* 059814 80058C14 AC6F0000 */ sw $t7, ($v1) -/* 059818 80058C18 03E00008 */ jr $ra -/* 05981C 80058C1C AC780004 */ sw $t8, 4($v1) diff --git a/asm/non_matchings/code_80057C60/func_80058F48.s b/asm/non_matchings/code_80057C60/func_80058F48.s deleted file mode 100644 index d87b7e791..000000000 --- a/asm/non_matchings/code_80057C60/func_80058F48.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80058F48 -/* 059B48 80058F48 3C0E8016 */ lui $t6, %hi(D_801657B0) # $t6, 0x8016 -/* 059B4C 80058F4C 81CE57B0 */ lb $t6, %lo(D_801657B0)($t6) -/* 059B50 80058F50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 059B54 80058F54 AFBF0014 */ sw $ra, 0x14($sp) -/* 059B58 80058F58 55C00004 */ bnel $t6, $zero, .L80058F6C -/* 059B5C 80058F5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 059B60 80058F60 0C0107BD */ jal func_80041EF4 -/* 059B64 80058F64 00000000 */ nop -/* 059B68 80058F68 8FBF0014 */ lw $ra, 0x14($sp) -.L80058F6C: -/* 059B6C 80058F6C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 059B70 80058F70 03E00008 */ jr $ra -/* 059B74 80058F74 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80058F78.s b/asm/non_matchings/code_80057C60/func_80058F78.s deleted file mode 100644 index 5c6cc74ca..000000000 --- a/asm/non_matchings/code_80057C60/func_80058F78.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80058F78 -/* 059B78 80058F78 3C0E8016 */ lui $t6, %hi(D_801657B0) # $t6, 0x8016 -/* 059B7C 80058F7C 81CE57B0 */ lb $t6, %lo(D_801657B0)($t6) -/* 059B80 80058F80 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 059B84 80058F84 AFBF0014 */ sw $ra, 0x14($sp) -/* 059B88 80058F88 55C00023 */ bnel $t6, $zero, .L80059018 -/* 059B8C 80058F8C 8FBF0014 */ lw $ra, 0x14($sp) -/* 059B90 80058F90 0C0107BD */ jal func_80041EF4 -/* 059B94 80058F94 00000000 */ nop -/* 059B98 80058F98 3C0F800E */ lui $t7, %hi(D_800DC51C) # $t7, 0x800e -/* 059B9C 80058F9C 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) -/* 059BA0 80058FA0 3C188019 */ lui $t8, %hi(D_8018D188) # $t8, 0x8019 -/* 059BA4 80058FA4 55E0001C */ bnel $t7, $zero, .L80059018 -/* 059BA8 80058FA8 8FBF0014 */ lw $ra, 0x14($sp) -/* 059BAC 80058FAC 8F18D188 */ lw $t8, %lo(D_8018D188)($t8) -/* 059BB0 80058FB0 3C198016 */ lui $t9, %hi(D_801657D8) # $t9, 0x8016 -/* 059BB4 80058FB4 53000018 */ beql $t8, $zero, .L80059018 -/* 059BB8 80058FB8 8FBF0014 */ lw $ra, 0x14($sp) -/* 059BBC 80058FBC 833957D8 */ lb $t9, %lo(D_801657D8)($t9) -/* 059BC0 80058FC0 57200015 */ bnel $t9, $zero, .L80059018 -/* 059BC4 80058FC4 8FBF0014 */ lw $ra, 0x14($sp) -/* 059BC8 80058FC8 0C01398E */ jal func_8004E638 -/* 059BCC 80058FCC 00002025 */ move $a0, $zero -/* 059BD0 80058FD0 3C088016 */ lui $t0, %hi(D_801657E4) # $t0, 0x8016 -/* 059BD4 80058FD4 810857E4 */ lb $t0, %lo(D_801657E4)($t0) -/* 059BD8 80058FD8 24010002 */ li $at, 2 -/* 059BDC 80058FDC 5101000E */ beql $t0, $at, .L80059018 -/* 059BE0 80058FE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 059BE4 80058FE4 0C013E9E */ jal func_8004FA78 -/* 059BE8 80058FE8 00002025 */ move $a0, $zero -/* 059BEC 80058FEC 0C0139E3 */ jal func_8004E78C -/* 059BF0 80058FF0 00002025 */ move $a0, $zero -/* 059BF4 80058FF4 0C013ACE */ jal func_8004EB38 -/* 059BF8 80058FF8 00002025 */ move $a0, $zero -/* 059BFC 80058FFC 3C098016 */ lui $t1, %hi(D_801657E6) # $t1, 0x8016 -/* 059C00 80059000 812957E6 */ lb $t1, %lo(D_801657E6)($t1) -/* 059C04 80059004 51200004 */ beql $t1, $zero, .L80059018 -/* 059C08 80059008 8FBF0014 */ lw $ra, 0x14($sp) -/* 059C0C 8005900C 0C013B50 */ jal func_8004ED40 -/* 059C10 80059010 00002025 */ move $a0, $zero -/* 059C14 80059014 8FBF0014 */ lw $ra, 0x14($sp) -.L80059018: -/* 059C18 80059018 27BD0018 */ addiu $sp, $sp, 0x18 -/* 059C1C 8005901C 03E00008 */ jr $ra -/* 059C20 80059020 00000000 */ nop - -/* 059C24 80059024 03E00008 */ jr $ra -/* 059C28 80059028 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80059358.s b/asm/non_matchings/code_80057C60/func_80059358.s deleted file mode 100644 index 10eb4ddca..000000000 --- a/asm/non_matchings/code_80057C60/func_80059358.s +++ /dev/null @@ -1,3 +0,0 @@ -glabel func_80059358 -/* 059F58 80059358 03E00008 */ jr $ra -/* 059F5C 8005935C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80059820.s b/asm/non_matchings/code_80057C60/func_80059820.s index b104343e9..9b1e790f6 100644 --- a/asm/non_matchings/code_80057C60/func_80059820.s +++ b/asm/non_matchings/code_80057C60/func_80059820.s @@ -14,8 +14,8 @@ glabel func_80059820 /* 05A450 80059850 01CFC021 */ addu $t8, $t6, $t7 /* 05A454 80059854 ACB80000 */ sw $t8, ($a1) /* 05A458 80059858 0324C823 */ subu $t9, $t9, $a0 -/* 05A45C 8005985C 3C08800E */ lui $t0, %hi(D_800DDB40) # $t0, 0x800e -/* 05A460 80059860 8D08DB40 */ lw $t0, %lo(D_800DDB40)($t0) +/* 05A45C 8005985C 3C08800E */ lui $t0, %hi(camera1) # $t0, 0x800e +/* 05A460 80059860 8D08DB40 */ lw $t0, %lo(camera1)($t0) /* 05A464 80059864 0019C8C0 */ sll $t9, $t9, 3 /* 05A468 80059868 0324C823 */ subu $t9, $t9, $a0 /* 05A46C 8005986C 0019C8C0 */ sll $t9, $t9, 3 diff --git a/asm/non_matchings/code_80057C60/func_80059AC8.s b/asm/non_matchings/code_80057C60/func_80059AC8.s index 0bd611b46..3fbd6646e 100644 --- a/asm/non_matchings/code_80057C60/func_80059AC8.s +++ b/asm/non_matchings/code_80057C60/func_80059AC8.s @@ -16,10 +16,10 @@ glabel func_80059AC8 /* 05A700 80059B00 2463D3FC */ addiu $v1, %lo(gRaceFrameCounter) # addiu $v1, $v1, -0x2c04 /* 05A704 80059B04 8C6F0000 */ lw $t7, ($v1) /* 05A708 80059B08 3C128019 */ lui $s2, %hi(D_8018CF68) # $s2, 0x8019 -/* 05A70C 80059B0C 3C13800E */ lui $s3, %hi(D_800DDB40) # $s3, 0x800e +/* 05A70C 80059B0C 3C13800E */ lui $s3, %hi(camera1) # $s3, 0x800e /* 05A710 80059B10 25F80001 */ addiu $t8, $t7, 1 /* 05A714 80059B14 AC780000 */ sw $t8, ($v1) -/* 05A718 80059B18 2673DB40 */ addiu $s3, %lo(D_800DDB40) # addiu $s3, $s3, -0x24c0 +/* 05A718 80059B18 2673DB40 */ addiu $s3, %lo(camera1) # addiu $s3, $s3, -0x24c0 /* 05A71C 80059B1C 2652CF68 */ addiu $s2, %lo(D_8018CF68) # addiu $s2, $s2, -0x3098 /* 05A720 80059B20 00008025 */ move $s0, $zero /* 05A724 80059B24 00008825 */ move $s1, $zero diff --git a/asm/non_matchings/code_80057C60/func_80066BAC.s b/asm/non_matchings/code_80057C60/func_80066BAC.s index e1ec15b28..89a19102d 100644 --- a/asm/non_matchings/code_80057C60/func_80066BAC.s +++ b/asm/non_matchings/code_80057C60/func_80066BAC.s @@ -69,7 +69,7 @@ glabel func_80066BAC /* 0678B0 80066CB0 01EE7823 */ subu $t7, $t7, $t6 /* 0678B4 80066CB4 46083280 */ add.s $f10, $f6, $f8 /* 0678B8 80066CB8 000F78C0 */ sll $t7, $t7, 3 -/* 0678BC 80066CBC 3C188016 */ lui $t8, %hi(D_80164714) +/* 0678BC 80066CBC 3C188016 */ lui $t8, %hi(cameras+0x24) /* 0678C0 80066CC0 8FBF0024 */ lw $ra, 0x24($sp) /* 0678C4 80066CC4 E7AA00DC */ swc1 $f10, 0xdc($sp) /* 0678C8 80066CC8 C6100124 */ lwc1 $f16, 0x124($s0) @@ -78,7 +78,7 @@ glabel func_80066BAC /* 0678D4 80066CD4 00000000 */ nop /* 0678D8 80066CD8 45020006 */ bc1fl .L80066CF4 /* 0678DC 80066CDC A7A000D4 */ sh $zero, 0xd4($sp) -/* 0678E0 80066CE0 87184714 */ lh $t8, %lo(D_80164714)($t8) +/* 0678E0 80066CE0 87184714 */ lh $t8, %lo(cameras+0x24)($t8) /* 0678E4 80066CE4 2719C000 */ addiu $t9, $t8, -0x4000 /* 0678E8 80066CE8 10000002 */ b .L80066CF4 /* 0678EC 80066CEC A7B900D4 */ sh $t9, 0xd4($sp) diff --git a/asm/non_matchings/code_80057C60/func_8006AFD0.s b/asm/non_matchings/code_80057C60/func_8006AFD0.s index f4f48cb5b..a8c49aa36 100644 --- a/asm/non_matchings/code_80057C60/func_8006AFD0.s +++ b/asm/non_matchings/code_80057C60/func_8006AFD0.s @@ -101,9 +101,9 @@ glabel func_8006AFD0 /* 06BD54 8006B154 0327C823 */ subu $t9, $t9, $a3 /* 06BD58 8006B158 0019C8C0 */ sll $t9, $t9, 3 /* 06BD5C 8006B15C 0327C823 */ subu $t9, $t9, $a3 -/* 06BD60 8006B160 3C188016 */ lui $t8, %hi(D_801646F0) # $t8, 0x8016 +/* 06BD60 8006B160 3C188016 */ lui $t8, %hi(cameras) # $t8, 0x8016 /* 06BD64 8006B164 0019C8C0 */ sll $t9, $t9, 3 -/* 06BD68 8006B168 271846F0 */ addiu $t8, %lo(D_801646F0) # addiu $t8, $t8, 0x46f0 +/* 06BD68 8006B168 271846F0 */ addiu $t8, %lo(cameras) # addiu $t8, $t8, 0x46f0 /* 06BD6C 8006B16C 03381021 */ addu $v0, $t9, $t8 /* 06BD70 8006B170 C44E0000 */ lwc1 $f14, ($v0) /* 06BD74 8006B174 C44C0008 */ lwc1 $f12, 8($v0) diff --git a/asm/non_matchings/code_80057C60/func_8006BB34.s b/asm/non_matchings/code_80057C60/func_8006BB34.s index 719ad87e2..ddd6d4f68 100644 --- a/asm/non_matchings/code_80057C60/func_8006BB34.s +++ b/asm/non_matchings/code_80057C60/func_8006BB34.s @@ -71,8 +71,8 @@ glabel func_8006BB34 /* 06C848 8006BC48 A7AE00E8 */ sh $t6, 0xe8($sp) /* 06C84C 8006BC4C A7AF00E6 */ sh $t7, 0xe6($sp) /* 06C850 8006BC50 C7040000 */ lwc1 $f4, ($t8) -/* 06C854 8006BC54 3C19800E */ lui $t9, %hi(D_800DDB40) # $t9, 0x800e -/* 06C858 8006BC58 8F39DB40 */ lw $t9, %lo(D_800DDB40)($t9) +/* 06C854 8006BC54 3C19800E */ lui $t9, %hi(camera1) # $t9, 0x800e +/* 06C858 8006BC58 8F39DB40 */ lw $t9, %lo(camera1)($t9) /* 06C85C 8006BC5C E7A400FC */ swc1 $f4, 0xfc($sp) /* 06C860 8006BC60 C7060004 */ lwc1 $f6, 4($t8) /* 06C864 8006BC64 87AF0152 */ lh $t7, 0x152($sp) @@ -363,8 +363,8 @@ glabel func_8006BB34 /* 06CCD4 8006C0D4 AFA60060 */ sw $a2, 0x60($sp) /* 06CCD8 8006C0D8 AFA70064 */ sw $a3, 0x64($sp) /* 06CCDC 8006C0DC C4840000 */ lwc1 $f4, ($a0) -/* 06CCE0 8006C0E0 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 06CCE4 8006C0E4 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 06CCE0 8006C0E0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 06CCE4 8006C0E4 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 06CCE8 8006C0E8 E7A4004C */ swc1 $f4, 0x4c($sp) /* 06CCEC 8006C0EC C4860004 */ lwc1 $f6, 4($a0) /* 06CCF0 8006C0F0 44856000 */ mtc1 $a1, $f12 @@ -479,8 +479,8 @@ glabel func_8006BB34 /* 06CEA0 8006C2A0 AFA60070 */ sw $a2, 0x70($sp) /* 06CEA4 8006C2A4 AFA70074 */ sw $a3, 0x74($sp) /* 06CEA8 8006C2A8 C4840000 */ lwc1 $f4, ($a0) -/* 06CEAC 8006C2AC 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 06CEB0 8006C2B0 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 06CEAC 8006C2AC 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 06CEB0 8006C2B0 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 06CEB4 8006C2B4 E7A4005C */ swc1 $f4, 0x5c($sp) /* 06CEB8 8006C2B8 C4860004 */ lwc1 $f6, 4($a0) /* 06CEBC 8006C2BC 44856000 */ mtc1 $a1, $f12 @@ -624,8 +624,8 @@ glabel func_8006BB34 /* 06D0E0 8006C4E0 AFA60060 */ sw $a2, 0x60($sp) /* 06D0E4 8006C4E4 AFA70064 */ sw $a3, 0x64($sp) /* 06D0E8 8006C4E8 C4840000 */ lwc1 $f4, ($a0) -/* 06D0EC 8006C4EC 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 06D0F0 8006C4F0 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 06D0EC 8006C4EC 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 06D0F0 8006C4F0 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 06D0F4 8006C4F4 E7A4004C */ swc1 $f4, 0x4c($sp) /* 06D0F8 8006C4F8 C4860004 */ lwc1 $f6, 4($a0) /* 06D0FC 8006C4FC 44856000 */ mtc1 $a1, $f12 diff --git a/asm/non_matchings/code_8006E9C0/func_8006ED94.s b/asm/non_matchings/code_8006E9C0/func_8006ED94.s index 96eb4a5fb..22b9b2894 100644 --- a/asm/non_matchings/code_8006E9C0/func_8006ED94.s +++ b/asm/non_matchings/code_8006E9C0/func_8006ED94.s @@ -16,23 +16,23 @@ glabel func_8006ED94 /* 06F9CC 8006EDCC 8FAA0038 */ lw $t2, 0x38($sp) /* 06F9D0 8006EDD0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 06F9D4 8006EDD4 3C080064 */ lui $t0, %hi(_other_texturesSegmentRomStart) # $t0, 0x64 -/* 06F9D8 8006EDD8 3C0B8015 */ lui $t3, %hi(D_8014EF58) # $t3, 0x8015 -/* 06F9DC 8006EDDC 256BEF58 */ addiu $t3, %lo(D_8014EF58) # addiu $t3, $t3, -0x10a8 +/* 06F9D8 8006EDD8 3C0B8015 */ lui $t3, %hi(gDmaMesgQueue) # $t3, 0x8015 +/* 06F9DC 8006EDDC 256BEF58 */ addiu $t3, %lo(gDmaMesgQueue) # addiu $t3, $t3, -0x10a8 /* 06F9E0 8006EDE0 25081F70 */ addiu $t0, %lo(_other_texturesSegmentRomStart) # addiu $t0, $t0, 0x1f70 -/* 06F9E4 8006EDE4 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 +/* 06F9E4 8006EDE4 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 /* 06F9E8 8006EDE8 0301C824 */ and $t9, $t8, $at /* 06F9EC 8006EDEC 03283821 */ addu $a3, $t9, $t0 -/* 06F9F0 8006EDF0 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 06F9F0 8006EDF0 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 06F9F4 8006EDF4 AFAB0018 */ sw $t3, 0x18($sp) /* 06F9F8 8006EDF8 00002825 */ move $a1, $zero /* 06F9FC 8006EDFC 00003025 */ move $a2, $zero /* 06FA00 8006EE00 AFA90010 */ sw $t1, 0x10($sp) /* 06FA04 8006EE04 0C03370C */ jal osPiStartDma /* 06FA08 8006EE08 AFAA0014 */ sw $t2, 0x14($sp) -/* 06FA0C 8006EE0C 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 06FA10 8006EE10 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 06FA14 8006EE14 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 06FA18 8006EE18 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 06FA0C 8006EE0C 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 06FA10 8006EE10 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 06FA14 8006EE14 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 06FA18 8006EE18 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 06FA1C 8006EE1C 0C0335D4 */ jal osRecvMesg /* 06FA20 8006EE20 24060001 */ li $a2, 1 /* 06FA24 8006EE24 8FA40028 */ lw $a0, 0x28($sp) diff --git a/asm/non_matchings/code_80071F00/func_800744CC.s b/asm/non_matchings/code_80071F00/func_800744CC.s index be66d5c40..fb60e3f6d 100644 --- a/asm/non_matchings/code_80071F00/func_800744CC.s +++ b/asm/non_matchings/code_80071F00/func_800744CC.s @@ -4,10 +4,10 @@ glabel func_800744CC /* 0750D4 800744D4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0750D8 800744D8 AFBF0014 */ sw $ra, 0x14($sp) /* 0750DC 800744DC 11C00008 */ beqz $t6, .L80074500 -/* 0750E0 800744E0 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 0750E4 800744E4 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 0750E8 800744E8 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 0750EC 800744EC 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 0750E0 800744E0 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 0750E4 800744E4 3C058015 */ lui $a1, %hi(gMainReceivedMesg) # $a1, 0x8015 +/* 0750E8 800744E8 24A5F098 */ addiu $a1, %lo(gMainReceivedMesg) # addiu $a1, $a1, -0xf68 +/* 0750EC 800744EC 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 0750F0 800744F0 0C0335D4 */ jal osRecvMesg /* 0750F4 800744F4 24060001 */ li $a2, 1 /* 0750F8 800744F8 3C018019 */ lui $at, %hi(D_8018D224) # $at, 0x8019 diff --git a/asm/non_matchings/code_80071F00/func_80074510.s b/asm/non_matchings/code_80071F00/func_80074510.s index 4842239d2..fbe72b2d3 100644 --- a/asm/non_matchings/code_80071F00/func_80074510.s +++ b/asm/non_matchings/code_80071F00/func_80074510.s @@ -7,10 +7,10 @@ glabel func_80074510 /* 075124 80074524 AFA60030 */ sw $a2, 0x30($sp) /* 075128 80074528 8FAE002C */ lw $t6, 0x2c($sp) /* 07512C 8007452C 8FAF0030 */ lw $t7, 0x30($sp) -/* 075130 80074530 3C188015 */ lui $t8, %hi(D_8014EF58) # $t8, 0x8015 -/* 075134 80074534 2718EF58 */ addiu $t8, %lo(D_8014EF58) # addiu $t8, $t8, -0x10a8 -/* 075138 80074538 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 -/* 07513C 8007453C 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 +/* 075130 80074530 3C188015 */ lui $t8, %hi(gDmaMesgQueue) # $t8, 0x8015 +/* 075134 80074534 2718EF58 */ addiu $t8, %lo(gDmaMesgQueue) # addiu $t8, $t8, -0x10a8 +/* 075138 80074538 3C048015 */ lui $a0, %hi(gDmaIoMesg) # $a0, 0x8015 +/* 07513C 8007453C 2484F0A0 */ addiu $a0, %lo(gDmaIoMesg) # addiu $a0, $a0, -0xf60 /* 075140 80074540 AFB80018 */ sw $t8, 0x18($sp) /* 075144 80074544 00002825 */ move $a1, $zero /* 075148 80074548 00003025 */ move $a2, $zero diff --git a/asm/non_matchings/code_80071F00/func_80078288.s b/asm/non_matchings/code_80071F00/func_80078288.s index 511edd794..425634ff4 100644 --- a/asm/non_matchings/code_80071F00/func_80078288.s +++ b/asm/non_matchings/code_80071F00/func_80078288.s @@ -61,8 +61,8 @@ glabel func_80078288 /* 078F70 80078370 00084C00 */ sll $t1, $t0, 0x10 /* 078F74 80078374 00095403 */ sra $t2, $t1, 0x10 /* 078F78 80078378 01EA001A */ div $zero, $t7, $t2 -/* 078F7C 8007837C 3C0C800E */ lui $t4, %hi(D_800DDB40) # $t4, 0x800e -/* 078F80 80078380 8D8CDB40 */ lw $t4, %lo(D_800DDB40)($t4) +/* 078F7C 8007837C 3C0C800E */ lui $t4, %hi(camera1) # $t4, 0x800e +/* 078F80 80078380 8D8CDB40 */ lw $t4, %lo(camera1)($t4) /* 078F84 80078384 00005812 */ mflo $t3 /* 078F88 80078388 858D0026 */ lh $t5, 0x26($t4) /* 078F8C 8007838C 15400002 */ bnez $t2, .L80078398 @@ -165,8 +165,8 @@ glabel func_80078288 /* 0790FC 800784FC A7AF003C */ sh $t7, 0x3c($sp) /* 079100 80078500 0C0ADF8D */ jal random_int /* 079104 80078504 24043000 */ li $a0, 12288 -/* 079108 80078508 3C0A800E */ lui $t2, %hi(D_800DDB40) # $t2, 0x800e -/* 07910C 8007850C 8D4ADB40 */ lw $t2, %lo(D_800DDB40)($t2) +/* 079108 80078508 3C0A800E */ lui $t2, %hi(camera1) # $t2, 0x800e +/* 07910C 8007850C 8D4ADB40 */ lw $t2, %lo(camera1)($t2) /* 079110 80078510 854C0026 */ lh $t4, 0x26($t2) /* 079114 80078514 004C2021 */ addu $a0, $v0, $t4 /* 079118 80078518 2484E800 */ addiu $a0, $a0, -0x1800 @@ -175,8 +175,8 @@ glabel func_80078288 /* 079124 80078524 0C0AE006 */ jal func_802B8018 /* 079128 80078528 A7AB0036 */ sh $t3, 0x36($sp) /* 07912C 8007852C 87AD003C */ lh $t5, 0x3c($sp) -/* 079130 80078530 3C02800E */ lui $v0, %hi(D_800DDB40) # $v0, 0x800e -/* 079134 80078534 8C42DB40 */ lw $v0, %lo(D_800DDB40)($v0) +/* 079130 80078530 3C02800E */ lui $v0, %hi(camera1) # $v0, 0x800e +/* 079134 80078534 8C42DB40 */ lw $v0, %lo(camera1)($v0) /* 079138 80078538 448D5000 */ mtc1 $t5, $f10 /* 07913C 8007853C 3C01800F */ lui $at, %hi(D_800EEB68) /* 079140 80078540 C4440000 */ lwc1 $f4, ($v0) @@ -194,8 +194,8 @@ glabel func_80078288 /* 079170 80078570 0C0AE00E */ jal func_802B8038 /* 079174 80078574 E6040014 */ swc1 $f4, 0x14($s0) /* 079178 80078578 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 07917C 8007857C 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 079180 80078580 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 07917C 8007857C 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 079180 80078580 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 079184 80078584 46020402 */ mul.s $f16, $f0, $f2 /* 079188 80078588 24040400 */ li $a0, 1024 /* 07918C 8007858C C5D20008 */ lwc1 $f18, 8($t6) @@ -277,8 +277,8 @@ glabel func_80078288 /* 0792B0 800786B0 0C021BF5 */ jal func_80086FD4 /* 0792B4 800786B4 8FA40040 */ lw $a0, 0x40($sp) .L800786B8: -/* 0792B8 800786B8 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 0792BC 800786BC 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 0792B8 800786B8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 0792BC 800786BC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 0792C0 800786C0 0C021CB6 */ jal func_800872D8 /* 0792C4 800786C4 8FA40040 */ lw $a0, 0x40($sp) /* 0792C8 800786C8 10000003 */ b .L800786D8 diff --git a/asm/non_matchings/code_80071F00/func_80078C70.s b/asm/non_matchings/code_80071F00/func_80078C70.s index 2c0ed9c75..6d43ff3a2 100644 --- a/asm/non_matchings/code_80071F00/func_80078C70.s +++ b/asm/non_matchings/code_80071F00/func_80078C70.s @@ -17,8 +17,8 @@ glabel L80078CA4 /* 0798A8 80078CA8 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) /* 0798AC 80078CAC 3C014220 */ li $at, 0x42200000 # 40.000000 /* 0798B0 80078CB0 44813000 */ mtc1 $at, $f6 -/* 0798B4 80078CB4 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 0798B8 80078CB8 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 0798B4 80078CB4 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 0798B8 80078CB8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 0798BC 80078CBC 46062200 */ add.s $f8, $f4, $f6 /* 0798C0 80078CC0 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 /* 0798C4 80078CC4 AFA0001C */ sw $zero, 0x1c($sp) @@ -32,8 +32,8 @@ glabel L80078CDC /* 0798E0 80078CE0 C4300130 */ lwc1 $f16, %lo(D_80150130)($at) /* 0798E4 80078CE4 3C014220 */ li $at, 0x42200000 # 40.000000 /* 0798E8 80078CE8 44819000 */ mtc1 $at, $f18 -/* 0798EC 80078CEC 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 0798F0 80078CF0 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 0798EC 80078CEC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 0798F0 80078CF0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 0798F4 80078CF4 46128100 */ add.s $f4, $f16, $f18 /* 0798F8 80078CF8 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 /* 0798FC 80078CFC AFA0001C */ sw $zero, 0x1c($sp) @@ -47,10 +47,10 @@ glabel L80078D14 /* 079918 80078D18 C4280134 */ lwc1 $f8, %lo(D_80150134)($at) /* 07991C 80078D1C 3C014220 */ li $at, 0x42200000 # 40.000000 /* 079920 80078D20 44815000 */ mtc1 $at, $f10 -/* 079924 80078D24 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e +/* 079924 80078D24 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 079928 80078D28 3C048019 */ lui $a0, %hi(D_8018D1F0) # $a0, 0x8019 /* 07992C 80078D2C 460A4400 */ add.s $f16, $f8, $f10 -/* 079930 80078D30 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 079930 80078D30 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 079934 80078D34 8C84D1F0 */ lw $a0, %lo(D_8018D1F0)($a0) /* 079938 80078D38 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 /* 07993C 80078D3C 4600848D */ trunc.w.s $f18, $f16 @@ -64,8 +64,8 @@ glabel L80078D54 /* 079958 80078D58 C4240130 */ lwc1 $f4, %lo(D_80150130)($at) /* 07995C 80078D5C 3C014220 */ li $at, 0x42200000 # 40.000000 /* 079960 80078D60 44813000 */ mtc1 $at, $f6 -/* 079964 80078D64 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 079968 80078D68 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 079964 80078D64 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 079968 80078D68 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 07996C 80078D6C 46062200 */ add.s $f8, $f4, $f6 /* 079970 80078D70 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 /* 079974 80078D74 AFA0001C */ sw $zero, 0x1c($sp) @@ -79,10 +79,10 @@ glabel L80078D8C /* 079990 80078D90 C4300134 */ lwc1 $f16, %lo(D_80150134)($at) /* 079994 80078D94 3C014220 */ li $at, 0x42200000 # 40.000000 /* 079998 80078D98 44819000 */ mtc1 $at, $f18 -/* 07999C 80078D9C 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e +/* 07999C 80078D9C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 0799A0 80078DA0 3C048019 */ lui $a0, %hi(D_8018D1F0) # $a0, 0x8019 /* 0799A4 80078DA4 46128100 */ add.s $f4, $f16, $f18 -/* 0799A8 80078DA8 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 0799A8 80078DA8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 0799AC 80078DAC 8C84D1F0 */ lw $a0, %lo(D_8018D1F0)($a0) /* 0799B0 80078DB0 3C018019 */ lui $at, %hi(D_8018D200) # $at, 0x8019 /* 0799B4 80078DB4 4600218D */ trunc.w.s $f6, $f4 diff --git a/asm/non_matchings/code_80071F00/func_8007CC00.s b/asm/non_matchings/code_80071F00/func_8007CC00.s index b510a7551..77e248f18 100644 --- a/asm/non_matchings/code_80071F00/func_8007CC00.s +++ b/asm/non_matchings/code_80071F00/func_8007CC00.s @@ -37,8 +37,8 @@ glabel func_8007CC00 /* 07D888 8007CC88 0C022DE3 */ jal func_8008B78C /* 07D88C 8007CC8C 02402025 */ move $a0, $s2 /* 07D890 8007CC90 820200D1 */ lb $v0, 0xd1($s0) -/* 07D894 8007CC94 3C09800E */ lui $t1, %hi(D_800DDB40) # $t1, 0x800e -/* 07D898 8007CC98 8D29DB40 */ lw $t1, %lo(D_800DDB40)($t1) +/* 07D894 8007CC94 3C09800E */ lui $t1, %hi(camera1) # $t1, 0x800e +/* 07D898 8007CC98 8D29DB40 */ lw $t1, %lo(camera1)($t1) /* 07D89C 8007CC9C 00570019 */ multu $v0, $s7 /* 07D8A0 8007CCA0 00024080 */ sll $t0, $v0, 2 /* 07D8A4 8007CCA4 01024023 */ subu $t0, $t0, $v0 diff --git a/asm/non_matchings/code_80071F00/func_8007D804.s b/asm/non_matchings/code_80071F00/func_8007D804.s index 8082bd399..6856ab117 100644 --- a/asm/non_matchings/code_80071F00/func_8007D804.s +++ b/asm/non_matchings/code_80071F00/func_8007D804.s @@ -14,8 +14,8 @@ glabel func_8007D804 /* 07E434 8007D834 00009025 */ move $s2, $zero /* 07E438 8007D838 19C00012 */ blez $t6, .L8007D884 /* 07E43C 8007D83C 00008825 */ move $s1, $zero -/* 07E440 8007D840 3C13800E */ lui $s3, %hi(D_800DDB40) # $s3, 0x800e -/* 07E444 8007D844 2673DB40 */ addiu $s3, %lo(D_800DDB40) # addiu $s3, $s3, -0x24c0 +/* 07E440 8007D840 3C13800E */ lui $s3, %hi(camera1) # $s3, 0x800e +/* 07E444 8007D844 2673DB40 */ addiu $s3, %lo(camera1) # addiu $s3, $s3, -0x24c0 /* 07E448 8007D848 00008025 */ move $s0, $zero /* 07E44C 8007D84C 8E6F0000 */ lw $t7, ($s3) .L8007D850: diff --git a/asm/non_matchings/code_80071F00/func_8007E59C.s b/asm/non_matchings/code_80071F00/func_8007E59C.s index 1e451779a..85d210bb2 100644 --- a/asm/non_matchings/code_80071F00/func_8007E59C.s +++ b/asm/non_matchings/code_80071F00/func_8007E59C.s @@ -9,12 +9,12 @@ glabel func_8007E59C /* 07F1B8 8007E5B8 AFB30024 */ sw $s3, 0x24($sp) /* 07F1BC 8007E5BC AFB20020 */ sw $s2, 0x20($sp) /* 07F1C0 8007E5C0 3C10800E */ lui $s0, %hi(D_800DC4DC) # $s0, 0x800e -/* 07F1C4 8007E5C4 3C11800E */ lui $s1, %hi(D_800DDB40) # $s1, 0x800e +/* 07F1C4 8007E5C4 3C11800E */ lui $s1, %hi(camera1) # $s1, 0x800e /* 07F1C8 8007E5C8 00809825 */ move $s3, $a0 /* 07F1CC 8007E5CC AFBF002C */ sw $ra, 0x2c($sp) /* 07F1D0 8007E5D0 00001825 */ move $v1, $zero /* 07F1D4 8007E5D4 8E10C4DC */ lw $s0, %lo(D_800DC4DC)($s0) -/* 07F1D8 8007E5D8 8E31DB40 */ lw $s1, %lo(D_800DDB40)($s1) +/* 07F1D8 8007E5D8 8E31DB40 */ lw $s1, %lo(camera1)($s1) /* 07F1DC 8007E5DC 19C0000E */ blez $t6, .L8007E618 /* 07F1E0 8007E5E0 00009025 */ move $s2, $zero /* 07F1E4 8007E5E4 02002825 */ move $a1, $s0 diff --git a/asm/non_matchings/code_80071F00/func_80080A4C.s b/asm/non_matchings/code_80071F00/func_80080A4C.s index 8e56bb750..4cbebed8a 100644 --- a/asm/non_matchings/code_80071F00/func_80080A4C.s +++ b/asm/non_matchings/code_80071F00/func_80080A4C.s @@ -3,9 +3,9 @@ glabel func_80080A4C /* 081650 80080A50 00057080 */ sll $t6, $a1, 2 /* 081654 80080A54 0325C823 */ subu $t9, $t9, $a1 /* 081658 80080A58 01C57023 */ subu $t6, $t6, $a1 -/* 08165C 80080A5C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e +/* 08165C 80080A5C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e /* 081660 80080A60 0019C900 */ sll $t9, $t9, 4 -/* 081664 80080A64 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 081664 80080A64 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 081668 80080A68 000E70C0 */ sll $t6, $t6, 3 /* 08166C 80080A6C 0325C823 */ subu $t9, $t9, $a1 /* 081670 80080A70 3C09800E */ lui $t1, %hi(D_800DC530) # $t1, 0x800e diff --git a/asm/non_matchings/code_80071F00/func_80081D34.s b/asm/non_matchings/code_80071F00/func_80081D34.s index bb577cc10..4ffee6c07 100644 --- a/asm/non_matchings/code_80071F00/func_80081D34.s +++ b/asm/non_matchings/code_80071F00/func_80081D34.s @@ -8,7 +8,7 @@ glabel func_80081D34 /* 08294C 80081D4C AFB30054 */ sw $s3, 0x54($sp) /* 082950 80081D50 AFB20050 */ sw $s2, 0x50($sp) /* 082954 80081D54 3C11800E */ lui $s1, %hi(D_800DC4DC) # $s1, 0x800e -/* 082958 80081D58 3C14800E */ lui $s4, %hi(D_800DDB40) # $s4, 0x800e +/* 082958 80081D58 3C14800E */ lui $s4, %hi(camera1) # $s4, 0x800e /* 08295C 80081D5C 00809825 */ move $s3, $a0 /* 082960 80081D60 AFBF006C */ sw $ra, 0x6c($sp) /* 082964 80081D64 AFBE0068 */ sw $fp, 0x68($sp) @@ -23,7 +23,7 @@ glabel func_80081D34 /* 082988 80081D88 F7B40018 */ sdc1 $f20, 0x18($sp) /* 08298C 80081D8C 0000A825 */ move $s5, $zero /* 082990 80081D90 8E31C4DC */ lw $s1, %lo(D_800DC4DC)($s1) -/* 082994 80081D94 8E94DB40 */ lw $s4, %lo(D_800DDB40)($s4) +/* 082994 80081D94 8E94DB40 */ lw $s4, %lo(camera1)($s4) /* 082998 80081D98 19C00065 */ blez $t6, .L80081F30 /* 08299C 80081D9C 00009025 */ move $s2, $zero /* 0829A0 80081DA0 3C0140A0 */ li $at, 0x40A00000 # 5.000000 diff --git a/asm/non_matchings/code_80086E70/func_8008A1D0.s b/asm/non_matchings/code_80086E70/func_8008A1D0.s index 6095ebd27..847f12db3 100644 --- a/asm/non_matchings/code_80086E70/func_8008A1D0.s +++ b/asm/non_matchings/code_80086E70/func_8008A1D0.s @@ -2,8 +2,8 @@ glabel func_8008A1D0 /* 08ADD0 8008A1D0 00057880 */ sll $t7, $a1, 2 /* 08ADD4 8008A1D4 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 08ADD8 8008A1D8 01E57823 */ subu $t7, $t7, $a1 -/* 08ADDC 8008A1DC 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e -/* 08ADE0 8008A1E0 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 08ADDC 8008A1DC 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e +/* 08ADE0 8008A1E0 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 08ADE4 8008A1E4 000F78C0 */ sll $t7, $t7, 3 /* 08ADE8 8008A1E8 01E57823 */ subu $t7, $t7, $a1 /* 08ADEC 8008A1EC 000F78C0 */ sll $t7, $t7, 3 @@ -69,8 +69,8 @@ glabel func_8008A1D0 /* 08AECC 8008A2CC 00057080 */ sll $t6, $a1, 2 /* 08AED0 8008A2D0 01C57023 */ subu $t6, $t6, $a1 -/* 08AED4 8008A2D4 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 08AED8 8008A2D8 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 08AED4 8008A2D4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 08AED8 8008A2D8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 08AEDC 8008A2DC 000E70C0 */ sll $t6, $t6, 3 /* 08AEE0 8008A2E0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 08AEE4 8008A2E4 01C57023 */ subu $t6, $t6, $a1 diff --git a/asm/non_matchings/code_80086E70/func_8008A364.s b/asm/non_matchings/code_80086E70/func_8008A364.s index 710c450b5..9f67fbd4c 100644 --- a/asm/non_matchings/code_80086E70/func_8008A364.s +++ b/asm/non_matchings/code_80086E70/func_8008A364.s @@ -2,8 +2,8 @@ glabel func_8008A364 /* 08AF64 8008A364 00057880 */ sll $t7, $a1, 2 /* 08AF68 8008A368 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 08AF6C 8008A36C 01E57823 */ subu $t7, $t7, $a1 -/* 08AF70 8008A370 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e -/* 08AF74 8008A374 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 08AF70 8008A370 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e +/* 08AF74 8008A374 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 08AF78 8008A378 000F78C0 */ sll $t7, $t7, 3 /* 08AF7C 8008A37C 01E57823 */ subu $t7, $t7, $a1 /* 08AF80 8008A380 000F78C0 */ sll $t7, $t7, 3 diff --git a/asm/non_matchings/code_80086E70/func_8008A454.s b/asm/non_matchings/code_80086E70/func_8008A454.s index 1e138760d..905cc0504 100644 --- a/asm/non_matchings/code_80086E70/func_8008A454.s +++ b/asm/non_matchings/code_80086E70/func_8008A454.s @@ -2,8 +2,8 @@ glabel func_8008A454 /* 08B054 8008A454 00057080 */ sll $t6, $a1, 2 /* 08B058 8008A458 01C57023 */ subu $t6, $t6, $a1 /* 08B05C 8008A45C 000E70C0 */ sll $t6, $t6, 3 -/* 08B060 8008A460 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 08B064 8008A464 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 08B060 8008A460 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 08B064 8008A464 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 08B068 8008A468 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 08B06C 8008A46C 01C57023 */ subu $t6, $t6, $a1 /* 08B070 8008A470 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80086E70/func_8008A4CC.s b/asm/non_matchings/code_80086E70/func_8008A4CC.s index 8ecb12b30..e8e357dcc 100644 --- a/asm/non_matchings/code_80086E70/func_8008A4CC.s +++ b/asm/non_matchings/code_80086E70/func_8008A4CC.s @@ -15,8 +15,8 @@ glabel func_8008A4CC /* 08B100 8008A500 3C050007 */ lui $a1, 7 /* 08B104 8008A504 3C0E800E */ lui $t6, %hi(gPlayerCountSelection1) # $t6, 0x800e /* 08B108 8008A508 8DCEC538 */ lw $t6, %lo(gPlayerCountSelection1)($t6) -/* 08B10C 8008A50C 3C14800E */ lui $s4, %hi(D_800DDB40) # $s4, 0x800e -/* 08B110 8008A510 8E94DB40 */ lw $s4, %lo(D_800DDB40)($s4) +/* 08B10C 8008A50C 3C14800E */ lui $s4, %hi(camera1) # $s4, 0x800e +/* 08B110 8008A510 8E94DB40 */ lw $s4, %lo(camera1)($s4) /* 08B114 8008A514 19C00032 */ blez $t6, .L8008A5E0 /* 08B118 8008A518 00009025 */ move $s2, $zero /* 08B11C 8008A51C 001178C0 */ sll $t7, $s1, 3 @@ -100,8 +100,8 @@ glabel func_8008A4CC /* 08B240 8008A640 3C15800E */ lui $s5, %hi(gPlayerCountSelection1) # $s5, 0x800e /* 08B244 8008A644 26B5C538 */ addiu $s5, %lo(gPlayerCountSelection1) # addiu $s5, $s5, -0x3ac8 /* 08B248 8008A648 8EAE0000 */ lw $t6, ($s5) -/* 08B24C 8008A64C 3C10800E */ lui $s0, %hi(D_800DDB40) # $s0, 0x800e -/* 08B250 8008A650 8E10DB40 */ lw $s0, %lo(D_800DDB40)($s0) +/* 08B24C 8008A64C 3C10800E */ lui $s0, %hi(camera1) # $s0, 0x800e +/* 08B250 8008A650 8E10DB40 */ lw $s0, %lo(camera1)($s0) /* 08B254 8008A654 19C00018 */ blez $t6, .L8008A6B8 /* 08B258 8008A658 00008825 */ move $s1, $zero /* 08B25C 8008A65C 001278C0 */ sll $t7, $s2, 3 diff --git a/asm/non_matchings/code_80086E70/func_8008A6DC.s b/asm/non_matchings/code_80086E70/func_8008A6DC.s index eed0ee878..86dc7472c 100644 --- a/asm/non_matchings/code_80086E70/func_8008A6DC.s +++ b/asm/non_matchings/code_80086E70/func_8008A6DC.s @@ -18,8 +18,8 @@ glabel func_8008A6DC /* 08B31C 8008A71C 3C16800E */ lui $s6, %hi(gPlayerCountSelection1) # $s6, 0x800e /* 08B320 8008A720 26D6C538 */ addiu $s6, %lo(gPlayerCountSelection1) # addiu $s6, $s6, -0x3ac8 /* 08B324 8008A724 8ECE0000 */ lw $t6, ($s6) -/* 08B328 8008A728 3C11800E */ lui $s1, %hi(D_800DDB40) # $s1, 0x800e -/* 08B32C 8008A72C 8E31DB40 */ lw $s1, %lo(D_800DDB40)($s1) +/* 08B328 8008A728 3C11800E */ lui $s1, %hi(camera1) # $s1, 0x800e +/* 08B32C 8008A72C 8E31DB40 */ lw $s1, %lo(camera1)($s1) /* 08B330 8008A730 19C0002A */ blez $t6, .L8008A7DC /* 08B334 8008A734 00009025 */ move $s2, $zero /* 08B338 8008A738 001078C0 */ sll $t7, $s0, 3 diff --git a/asm/non_matchings/code_80086E70/func_8008BE0C.s b/asm/non_matchings/code_80086E70/func_8008BE0C.s index bf14a2cb9..423f1e568 100644 --- a/asm/non_matchings/code_80086E70/func_8008BE0C.s +++ b/asm/non_matchings/code_80086E70/func_8008BE0C.s @@ -48,8 +48,8 @@ glabel func_8008BE0C /* 08CAC0 8008BEC0 A7A2001E */ sh $v0, 0x1e($sp) /* 08CAC4 8008BEC4 0C0ADF8D */ jal random_int /* 08CAC8 8008BEC8 97A4002A */ lhu $a0, 0x2a($sp) -/* 08CACC 8008BECC 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 08CAD0 8008BED0 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 08CACC 8008BECC 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 08CAD0 8008BED0 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 08CAD4 8008BED4 97A8002A */ lhu $t0, 0x2a($sp) /* 08CAD8 8008BED8 8FA40020 */ lw $a0, 0x20($sp) /* 08CADC 8008BEDC 85F80026 */ lh $t8, 0x26($t7) diff --git a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s index b793cca03..9a27b4b99 100644 --- a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s +++ b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s @@ -5230,10 +5230,10 @@ glabel func_800914A0 /* 092178 80091578 44800000 */ mtc1 $zero, $f0 /* 09217C 8009157C 95082308 */ lhu $t0, %lo(D_80152308)($t0) /* 092180 80091580 85670006 */ lh $a3, 6($t3) -/* 092184 80091584 3C058016 */ lui $a1, %hi(D_801646F0) # $a1, 0x8016 +/* 092184 80091584 3C058016 */ lui $a1, %hi(cameras) # $a1, 0x8016 /* 092188 80091588 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 09218C 8009158C 44812000 */ mtc1 $at, $f4 -/* 092190 80091590 24A546F0 */ addiu $a1, %lo(D_801646F0) # addiu $a1, $a1, 0x46f0 +/* 092190 80091590 24A546F0 */ addiu $a1, %lo(cameras) # addiu $a1, $a1, 0x46f0 /* 092194 80091594 00E81023 */ subu $v0, $a3, $t0 /* 092198 80091598 00021C00 */ sll $v1, $v0, 0x10 /* 09219C 8009159C E4A00018 */ swc1 $f0, 0x18($a1) @@ -5270,59 +5270,59 @@ glabel func_800914A0 /* 092210 80091610 8FAD0048 */ lw $t5, 0x48($sp) .L80091614: /* 092214 80091614 0008C8C0 */ sll $t9, $t0, 3 -/* 092218 80091618 3C018016 */ lui $at, %hi(D_801646F0) # $at, 0x8016 +/* 092218 80091618 3C018016 */ lui $at, %hi(cameras) # $at, 0x8016 /* 09221C 8009161C 032D1021 */ addu $v0, $t9, $t5 /* 092220 80091620 844B0000 */ lh $t3, ($v0) -/* 092224 80091624 3C048016 */ lui $a0, %hi(D_80164744) # $a0, 0x8016 -/* 092228 80091628 24844744 */ addiu $a0, %lo(D_80164744) # addiu $a0, $a0, 0x4744 +/* 092224 80091624 3C048016 */ lui $a0, %hi(cameras+0x54) # $a0, 0x8016 +/* 092228 80091628 24844744 */ addiu $a0, %lo(cameras+0x54) # addiu $a0, $a0, 0x4744 /* 09222C 8009162C 256C000A */ addiu $t4, $t3, 0xa /* 092230 80091630 448C3000 */ mtc1 $t4, $f6 /* 092234 80091634 3C0541A0 */ lui $a1, 0x41a0 /* 092238 80091638 46803220 */ cvt.s.w $f8, $f6 -/* 09223C 8009163C E42846F0 */ swc1 $f8, %lo(D_801646F0)($at) +/* 09223C 8009163C E42846F0 */ swc1 $f8, %lo(cameras)($at) /* 092240 80091640 84580002 */ lh $t8, 2($v0) -/* 092244 80091644 3C018016 */ lui $at, %hi(D_801646F4) # $at, 0x8016 +/* 092244 80091644 3C018016 */ lui $at, %hi(cameras+0x4) # $at, 0x8016 /* 092248 80091648 44064000 */ mfc1 $a2, $f8 /* 09224C 8009164C 270E0007 */ addiu $t6, $t8, 7 /* 092250 80091650 448E5000 */ mtc1 $t6, $f10 /* 092254 80091654 00000000 */ nop /* 092258 80091658 46805420 */ cvt.s.w $f16, $f10 -/* 09225C 8009165C E43046F4 */ swc1 $f16, %lo(D_801646F4)($at) +/* 09225C 8009165C E43046F4 */ swc1 $f16, %lo(cameras+0x4)($at) /* 092260 80091660 844F0004 */ lh $t7, 4($v0) -/* 092264 80091664 3C018016 */ lui $at, %hi(D_801646F8) # $at, 0x8016 +/* 092264 80091664 3C018016 */ lui $at, %hi(cameras+0x8) # $at, 0x8016 /* 092268 80091668 44078000 */ mfc1 $a3, $f16 /* 09226C 8009166C 25EAFFEC */ addiu $t2, $t7, -0x14 /* 092270 80091670 448A9000 */ mtc1 $t2, $f18 /* 092274 80091674 00000000 */ nop /* 092278 80091678 46809120 */ cvt.s.w $f4, $f18 -/* 09227C 8009167C E42446F8 */ swc1 $f4, %lo(D_801646F8)($at) +/* 09227C 8009167C E42446F8 */ swc1 $f4, %lo(cameras+0x8)($at) /* 092280 80091680 8D390000 */ lw $t9, ($t1) -/* 092284 80091684 3C018016 */ lui $at, %hi(D_801646FC) # $at, 0x8016 +/* 092284 80091684 3C018016 */ lui $at, %hi(cameras+0xC) # $at, 0x8016 /* 092288 80091688 C7260014 */ lwc1 $f6, 0x14($t9) -/* 09228C 8009168C E42646FC */ swc1 $f6, %lo(D_801646FC)($at) +/* 09228C 8009168C E42646FC */ swc1 $f6, %lo(cameras+0xC)($at) /* 092290 80091690 8D2D0000 */ lw $t5, ($t1) -/* 092294 80091694 3C018016 */ lui $at, %hi(D_80164700) # $at, 0x8016 +/* 092294 80091694 3C018016 */ lui $at, %hi(cameras+0x10) # $at, 0x8016 /* 092298 80091698 C5AA0018 */ lwc1 $f10, 0x18($t5) -/* 09229C 8009169C E42A4700 */ swc1 $f10, %lo(D_80164700)($at) +/* 09229C 8009169C E42A4700 */ swc1 $f10, %lo(cameras+0x10)($at) /* 0922A0 800916A0 8D2B0000 */ lw $t3, ($t1) -/* 0922A4 800916A4 3C018016 */ lui $at, %hi(D_80164704) # $at, 0x8016 +/* 0922A4 800916A4 3C018016 */ lui $at, %hi(cameras+0x14) # $at, 0x8016 /* 0922A8 800916A8 C572001C */ lwc1 $f18, 0x1c($t3) /* 0922AC 800916AC E7A40010 */ swc1 $f4, 0x10($sp) /* 0922B0 800916B0 0C0AB772 */ jal func_802ADDC8 -/* 0922B4 800916B4 E4324704 */ swc1 $f18, %lo(D_80164704)($at) -/* 0922B8 800916B8 3C018016 */ lui $at, %hi(D_801646FC) # $at, 0x8016 -/* 0922BC 800916BC C42646FC */ lwc1 $f6, %lo(D_801646FC)($at) -/* 0922C0 800916C0 3C018016 */ lui $at, %hi(D_801646F0) # $at, 0x8016 -/* 0922C4 800916C4 C42A46F0 */ lwc1 $f10, %lo(D_801646F0)($at) -/* 0922C8 800916C8 3C018016 */ lui $at, %hi(D_80164700) # $at, 0x8016 -/* 0922CC 800916CC C4324700 */ lwc1 $f18, %lo(D_80164700)($at) -/* 0922D0 800916D0 3C018016 */ lui $at, %hi(D_801646F4) # $at, 0x8016 -/* 0922D4 800916D4 C42846F4 */ lwc1 $f8, %lo(D_801646F4)($at) -/* 0922D8 800916D8 3C018016 */ lui $at, %hi(D_80164704) # $at, 0x8016 -/* 0922DC 800916DC C4244704 */ lwc1 $f4, %lo(D_80164704)($at) +/* 0922B4 800916B4 E4324704 */ swc1 $f18, %lo(cameras+0x14)($at) +/* 0922B8 800916B8 3C018016 */ lui $at, %hi(cameras+0xC) # $at, 0x8016 +/* 0922BC 800916BC C42646FC */ lwc1 $f6, %lo(cameras+0xC)($at) +/* 0922C0 800916C0 3C018016 */ lui $at, %hi(cameras) # $at, 0x8016 +/* 0922C4 800916C4 C42A46F0 */ lwc1 $f10, %lo(cameras)($at) +/* 0922C8 800916C8 3C018016 */ lui $at, %hi(cameras+0x10) # $at, 0x8016 +/* 0922CC 800916CC C4324700 */ lwc1 $f18, %lo(cameras+0x10)($at) +/* 0922D0 800916D0 3C018016 */ lui $at, %hi(cameras+0x4) # $at, 0x8016 +/* 0922D4 800916D4 C42846F4 */ lwc1 $f8, %lo(cameras+0x4)($at) +/* 0922D8 800916D8 3C018016 */ lui $at, %hi(cameras+0x14) # $at, 0x8016 +/* 0922DC 800916DC C4244704 */ lwc1 $f4, %lo(cameras+0x14)($at) /* 0922E0 800916E0 460A3301 */ sub.s $f12, $f6, $f10 -/* 0922E4 800916E4 3C018016 */ lui $at, %hi(D_801646F8) # $at, 0x8016 -/* 0922E8 800916E8 C42646F8 */ lwc1 $f6, %lo(D_801646F8)($at) +/* 0922E4 800916E4 3C018016 */ lui $at, %hi(cameras+0x8) # $at, 0x8016 +/* 0922E8 800916E8 C42646F8 */ lwc1 $f6, %lo(cameras+0x8)($at) /* 0922EC 800916EC 46089401 */ sub.s $f16, $f18, $f8 /* 0922F0 800916F0 E7AC0038 */ swc1 $f12, 0x38($sp) /* 0922F4 800916F4 46062381 */ sub.s $f14, $f4, $f6 @@ -5331,9 +5331,9 @@ glabel func_800914A0 /* 092300 80091700 E7AE0030 */ swc1 $f14, 0x30($sp) /* 092304 80091704 C7A00038 */ lwc1 $f0, 0x38($sp) /* 092308 80091708 C7AE0030 */ lwc1 $f14, 0x30($sp) -/* 09230C 8009170C 3C018016 */ lui $at, %hi(D_80164716) # $at, 0x8016 +/* 09230C 8009170C 3C018016 */ lui $at, %hi(cameras+0x26) # $at, 0x8016 /* 092310 80091710 46000282 */ mul.s $f10, $f0, $f0 -/* 092314 80091714 A4224716 */ sh $v0, %lo(D_80164716)($at) +/* 092314 80091714 A4224716 */ sh $v0, %lo(cameras+0x26)($at) /* 092318 80091718 460E7482 */ mul.s $f18, $f14, $f14 /* 09231C 8009171C 0C033850 */ jal sqrtf /* 092320 80091720 46125300 */ add.s $f12, $f10, $f18 @@ -5341,10 +5341,10 @@ glabel func_800914A0 /* 092328 80091728 0C0ADE0C */ jal func_802B7830 /* 09232C 8009172C C7AE0034 */ lwc1 $f14, 0x34($sp) /* 092330 80091730 8FBF001C */ lw $ra, 0x1c($sp) -/* 092334 80091734 3C018016 */ lui $at, %hi(D_80164714) # $at, 0x8016 -/* 092338 80091738 A4224714 */ sh $v0, %lo(D_80164714)($at) -/* 09233C 8009173C 3C018016 */ lui $at, %hi(D_80164718) # $at, 0x8016 -/* 092340 80091740 A4204718 */ sh $zero, %lo(D_80164718)($at) +/* 092334 80091734 3C018016 */ lui $at, %hi(cameras+0x24) # $at, 0x8016 +/* 092338 80091738 A4224714 */ sh $v0, %lo(cameras+0x24)($at) +/* 09233C 8009173C 3C018016 */ lui $at, %hi(cameras+0x28) # $at, 0x8016 +/* 092340 80091740 A4204718 */ sh $zero, %lo(cameras+0x28)($at) /* 092344 80091744 03E00008 */ jr $ra /* 092348 80091748 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/non_matchings/code_80091750/dma_copy_base_729a30.s b/asm/non_matchings/code_80091750/dma_copy_base_729a30.s index 67e21a79b..6a8a71149 100644 --- a/asm/non_matchings/code_80091750/dma_copy_base_729a30.s +++ b/asm/non_matchings/code_80091750/dma_copy_base_729a30.s @@ -12,8 +12,8 @@ glabel dma_copy_base_729a30 /* 099C28 80099028 8FA8004C */ lw $t0, 0x4c($sp) /* 099C2C 8009902C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 099C30 80099030 3C180073 */ lui $t8, %hi(_textures_0aSegmentRomStart) # $t8, 0x73 -/* 099C34 80099034 3C098015 */ lui $t1, %hi(D_8014EF58) # $t1, 0x8015 -/* 099C38 80099038 2529EF58 */ addiu $t1, %lo(D_8014EF58) # addiu $t1, $t1, -0x10a8 +/* 099C34 80099034 3C098015 */ lui $t1, %hi(gDmaMesgQueue) # $t1, 0x8015 +/* 099C38 80099038 2529EF58 */ addiu $t1, %lo(gDmaMesgQueue) # addiu $t1, $t1, -0x10a8 /* 099C3C 8009903C 27189A30 */ addiu $t8, %lo(_textures_0aSegmentRomStart) # addiu $t8, $t8, -0x65d0 /* 099C40 80099040 01C17824 */ and $t7, $t6, $at /* 099C44 80099044 01F83821 */ addu $a3, $t7, $t8 @@ -24,8 +24,8 @@ glabel dma_copy_base_729a30 /* 099C58 80099058 AFB90010 */ sw $t9, 0x10($sp) /* 099C5C 8009905C 0C03370C */ jal osPiStartDma /* 099C60 80099060 AFA80014 */ sw $t0, 0x14($sp) -/* 099C64 80099064 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 099C68 80099068 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 099C64 80099064 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 099C68 80099068 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 099C6C 8009906C 27A5002C */ addiu $a1, $sp, 0x2c /* 099C70 80099070 0C0335D4 */ jal osRecvMesg /* 099C74 80099074 24060001 */ li $a2, 1 diff --git a/asm/non_matchings/code_80091750/dma_copy_base_7fa3c0.s b/asm/non_matchings/code_80091750/dma_copy_base_7fa3c0.s index d4e36b59d..c3392779f 100644 --- a/asm/non_matchings/code_80091750/dma_copy_base_7fa3c0.s +++ b/asm/non_matchings/code_80091750/dma_copy_base_7fa3c0.s @@ -12,8 +12,8 @@ glabel dma_copy_base_7fa3c0 /* 099CB0 800990B0 8FA8004C */ lw $t0, 0x4c($sp) /* 099CB4 800990B4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 099CB8 800990B8 3C180080 */ lui $t8, %hi(_textures_0bSegmentRomStart) # $t8, 0x80 -/* 099CBC 800990BC 3C098015 */ lui $t1, %hi(D_8014EF58) # $t1, 0x8015 -/* 099CC0 800990C0 2529EF58 */ addiu $t1, %lo(D_8014EF58) # addiu $t1, $t1, -0x10a8 +/* 099CBC 800990BC 3C098015 */ lui $t1, %hi(gDmaMesgQueue) # $t1, 0x8015 +/* 099CC0 800990C0 2529EF58 */ addiu $t1, %lo(gDmaMesgQueue) # addiu $t1, $t1, -0x10a8 /* 099CC4 800990C4 2718A3C0 */ addiu $t8, %lo(_textures_0bSegmentRomStart) # addiu $t8, $t8, -0x5c40 /* 099CC8 800990C8 01C17824 */ and $t7, $t6, $at /* 099CCC 800990CC 01F83821 */ addu $a3, $t7, $t8 @@ -24,8 +24,8 @@ glabel dma_copy_base_7fa3c0 /* 099CE0 800990E0 AFB90010 */ sw $t9, 0x10($sp) /* 099CE4 800990E4 0C03370C */ jal osPiStartDma /* 099CE8 800990E8 AFA80014 */ sw $t0, 0x14($sp) -/* 099CEC 800990EC 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 099CF0 800990F0 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 +/* 099CEC 800990EC 3C048015 */ lui $a0, %hi(gDmaMesgQueue) # $a0, 0x8015 +/* 099CF0 800990F0 2484EF58 */ addiu $a0, %lo(gDmaMesgQueue) # addiu $a0, $a0, -0x10a8 /* 099CF4 800990F4 27A5002C */ addiu $a1, $sp, 0x2c /* 099CF8 800990F8 0C0335D4 */ jal osRecvMesg /* 099CFC 800990FC 24060001 */ li $a2, 1 diff --git a/asm/non_matchings/code_80091750/func_80094660.s b/asm/non_matchings/code_80091750/func_80094660.s index 981c18a6a..4e9b18eba 100644 --- a/asm/non_matchings/code_80091750/func_80094660.s +++ b/asm/non_matchings/code_80091750/func_80094660.s @@ -3,7 +3,7 @@ glabel func_80094660 /* 095264 80094664 AFBF0034 */ sw $ra, 0x34($sp) /* 095268 80094668 AFB00030 */ sw $s0, 0x30($sp) /* 09526C 8009466C AFA40058 */ sw $a0, 0x58($sp) -/* 095270 80094670 0C0A9F02 */ jal func_802A7C08 +/* 095270 80094670 0C0A9F02 */ jal move_segment_table_to_dmem /* 095274 80094674 AFA5005C */ sw $a1, 0x5c($sp) /* 095278 80094678 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 /* 09527C 8009467C 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 diff --git a/asm/non_matchings/code_80091750/func_800947B4.s b/asm/non_matchings/code_80091750/func_800947B4.s index 7cf4124be..13697ae67 100644 --- a/asm/non_matchings/code_80091750/func_800947B4.s +++ b/asm/non_matchings/code_80091750/func_800947B4.s @@ -4,7 +4,7 @@ glabel func_800947B4 /* 0953BC 800947BC AFB10030 */ sw $s1, 0x30($sp) /* 0953C0 800947C0 00808825 */ move $s1, $a0 /* 0953C4 800947C4 AFB0002C */ sw $s0, 0x2c($sp) -/* 0953C8 800947C8 0C0A9F02 */ jal func_802A7C08 +/* 0953C8 800947C8 0C0A9F02 */ jal move_segment_table_to_dmem /* 0953CC 800947CC AFA50084 */ sw $a1, 0x84($sp) /* 0953D0 800947D0 3C0142C8 */ li $at, 0x42C80000 # 100.000000 /* 0953D4 800947D4 44812000 */ mtc1 $at, $f4 diff --git a/asm/non_matchings/code_80091750/func_80099AEC.s b/asm/non_matchings/code_80091750/func_80099AEC.s index 9567ba281..70288ee74 100644 --- a/asm/non_matchings/code_80091750/func_80099AEC.s +++ b/asm/non_matchings/code_80091750/func_80099AEC.s @@ -57,10 +57,10 @@ glabel func_80099AEC /* 09A7B0 80099BB0 8E4A0004 */ lw $t2, 4($s2) /* 09A7B4 80099BB4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 09A7B8 80099BB8 8E8C0000 */ lw $t4, ($s4) -/* 09A7BC 80099BBC 3C168015 */ lui $s6, %hi(D_8014EF58) # $s6, 0x8015 +/* 09A7BC 80099BBC 3C168015 */ lui $s6, %hi(gDmaMesgQueue) # $s6, 0x8015 /* 09A7C0 80099BC0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 09A7C4 80099BC4 3C020073 */ lui $v0, %hi(_textures_0aSegmentRomStart) # $v0, 0x73 -/* 09A7C8 80099BC8 26D6EF58 */ addiu $s6, %lo(D_8014EF58) # addiu $s6, $s6, -0x10a8 +/* 09A7C8 80099BC8 26D6EF58 */ addiu $s6, %lo(gDmaMesgQueue) # addiu $s6, $s6, -0x10a8 /* 09A7CC 80099BCC 24429A30 */ addiu $v0, %lo(_textures_0aSegmentRomStart) # addiu $v0, $v0, -0x65d0 /* 09A7D0 80099BD0 01415824 */ and $t3, $t2, $at /* 09A7D4 80099BD4 004B3821 */ addu $a3, $v0, $t3 diff --git a/asm/non_matchings/code_80091750/func_80099EC4.s b/asm/non_matchings/code_80091750/func_80099EC4.s index ceefd39d9..b97708788 100644 --- a/asm/non_matchings/code_80091750/func_80099EC4.s +++ b/asm/non_matchings/code_80091750/func_80099EC4.s @@ -46,10 +46,10 @@ glabel func_80099EC4 /* 09AB64 80099F64 8E590004 */ lw $t9, 4($s2) /* 09AB68 80099F68 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* 09AB6C 80099F6C 8E690000 */ lw $t1, ($s3) -/* 09AB70 80099F70 3C158015 */ lui $s5, %hi(D_8014EF58) # $s5, 0x8015 +/* 09AB70 80099F70 3C158015 */ lui $s5, %hi(gDmaMesgQueue) # $s5, 0x8015 /* 09AB74 80099F74 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 09AB78 80099F78 3C1E0073 */ lui $fp, %hi(_textures_0aSegmentRomStart) # $fp, 0x73 -/* 09AB7C 80099F7C 26B5EF58 */ addiu $s5, %lo(D_8014EF58) # addiu $s5, $s5, -0x10a8 +/* 09AB7C 80099F7C 26B5EF58 */ addiu $s5, %lo(gDmaMesgQueue) # addiu $s5, $s5, -0x10a8 /* 09AB80 80099F80 27DE9A30 */ addiu $fp, %lo(_textures_0aSegmentRomStart) # addiu $fp, $fp, -0x65d0 /* 09AB84 80099F84 03214024 */ and $t0, $t9, $at /* 09AB88 80099F88 03C83821 */ addu $a3, $fp, $t0 diff --git a/asm/non_matchings/code_80091750/func_8009C918.s b/asm/non_matchings/code_80091750/func_8009C918.s index f73009683..8614a5b0d 100644 --- a/asm/non_matchings/code_80091750/func_8009C918.s +++ b/asm/non_matchings/code_80091750/func_8009C918.s @@ -1,55 +1,55 @@ glabel func_8009C918 -/* 09D518 8009C918 3C0E8016 */ lui $t6, %hi(D_8015F4B0) # $t6, 0x8016 -/* 09D51C 8009C91C 3C0F8016 */ lui $t7, %hi(D_8015F4B2) # $t7, 0x8016 -/* 09D520 8009C920 85CEF4B0 */ lh $t6, %lo(D_8015F4B0)($t6) -/* 09D524 8009C924 85EFF4B2 */ lh $t7, %lo(D_8015F4B2)($t7) +/* 09D518 8009C918 3C0E8016 */ lui $t6, %hi(D_8015F480+0x30) # $t6, 0x8016 +/* 09D51C 8009C91C 3C0F8016 */ lui $t7, %hi(D_8015F480+0x32) # $t7, 0x8016 +/* 09D520 8009C920 85CEF4B0 */ lh $t6, %lo(D_8015F480+0x30)($t6) +/* 09D524 8009C924 85EFF4B2 */ lh $t7, %lo(D_8015F480+0x32)($t7) /* 09D528 8009C928 3C018019 */ lui $at, %hi(D_8018E7E8) # $at, 0x8019 -/* 09D52C 8009C92C 3C188016 */ lui $t8, %hi(D_8015F4AC) # $t8, 0x8016 -/* 09D530 8009C930 3C198016 */ lui $t9, %hi(D_8015F4AE) # $t9, 0x8016 -/* 09D534 8009C934 8718F4AC */ lh $t8, %lo(D_8015F4AC)($t8) -/* 09D538 8009C938 8739F4AE */ lh $t9, %lo(D_8015F4AE)($t9) +/* 09D52C 8009C92C 3C188016 */ lui $t8, %hi(D_8015F480+0x2C) # $t8, 0x8016 +/* 09D530 8009C930 3C198016 */ lui $t9, %hi(D_8015F480+0x2E) # $t9, 0x8016 +/* 09D534 8009C934 8718F4AC */ lh $t8, %lo(D_8015F480+0x2C)($t8) +/* 09D538 8009C938 8739F4AE */ lh $t9, %lo(D_8015F480+0x2E)($t9) /* 09D53C 8009C93C A42EE7E8 */ sh $t6, %lo(D_8018E7E8)($at) /* 09D540 8009C940 A42FE7EA */ sh $t7, %lo(D_8018E7E8+0x2)($at) /* 09D544 8009C944 3C018019 */ lui $at, %hi(D_8018E810) # $at, 0x8019 -/* 09D548 8009C948 3C088016 */ lui $t0, %hi(D_8015F4F0) # $t0, 0x8016 -/* 09D54C 8009C94C 3C098016 */ lui $t1, %hi(D_8015F4F2) # $t1, 0x8016 -/* 09D550 8009C950 8529F4F2 */ lh $t1, %lo(D_8015F4F2)($t1) -/* 09D554 8009C954 8508F4F0 */ lh $t0, %lo(D_8015F4F0)($t0) +/* 09D548 8009C948 3C088016 */ lui $t0, %hi(D_8015F480+0x70) # $t0, 0x8016 +/* 09D54C 8009C94C 3C098016 */ lui $t1, %hi(D_8015F480+0x72) # $t1, 0x8016 +/* 09D550 8009C950 8529F4F2 */ lh $t1, %lo(D_8015F480+0x72)($t1) +/* 09D554 8009C954 8508F4F0 */ lh $t0, %lo(D_8015F480+0x70)($t0) /* 09D558 8009C958 A438E810 */ sh $t8, %lo(D_8018E810)($at) /* 09D55C 8009C95C A439E812 */ sh $t9, %lo(D_8018E810+0x2)($at) /* 09D560 8009C960 3C018019 */ lui $at, %hi(D_8018E7F0) # $at, 0x8019 -/* 09D564 8009C964 3C0A8016 */ lui $t2, %hi(D_8015F4EC) # $t2, 0x8016 -/* 09D568 8009C968 3C0B8016 */ lui $t3, %hi(D_8015F4EE) # $t3, 0x8016 -/* 09D56C 8009C96C 856BF4EE */ lh $t3, %lo(D_8015F4EE)($t3) -/* 09D570 8009C970 854AF4EC */ lh $t2, %lo(D_8015F4EC)($t2) +/* 09D564 8009C964 3C0A8016 */ lui $t2, %hi(D_8015F480+0x6C) # $t2, 0x8016 +/* 09D568 8009C968 3C0B8016 */ lui $t3, %hi(D_8015F480+0x6E) # $t3, 0x8016 +/* 09D56C 8009C96C 856BF4EE */ lh $t3, %lo(D_8015F480+0x6E)($t3) +/* 09D570 8009C970 854AF4EC */ lh $t2, %lo(D_8015F480+0x6C)($t2) /* 09D574 8009C974 A429E7F2 */ sh $t1, %lo(D_8018E7F0+0x2)($at) /* 09D578 8009C978 A428E7F0 */ sh $t0, %lo(D_8018E7F0)($at) /* 09D57C 8009C97C 3C018019 */ lui $at, %hi(D_8018E818) # $at, 0x8019 -/* 09D580 8009C980 3C0C8016 */ lui $t4, %hi(D_8015F530) # $t4, 0x8016 -/* 09D584 8009C984 3C0D8016 */ lui $t5, %hi(D_8015F532) # $t5, 0x8016 -/* 09D588 8009C988 85ADF532 */ lh $t5, %lo(D_8015F532)($t5) -/* 09D58C 8009C98C 858CF530 */ lh $t4, %lo(D_8015F530)($t4) +/* 09D580 8009C980 3C0C8016 */ lui $t4, %hi(D_8015F480+0xB0) # $t4, 0x8016 +/* 09D584 8009C984 3C0D8016 */ lui $t5, %hi(D_8015F480+0xB2) # $t5, 0x8016 +/* 09D588 8009C988 85ADF532 */ lh $t5, %lo(D_8015F480+0xB2)($t5) +/* 09D58C 8009C98C 858CF530 */ lh $t4, %lo(D_8015F480+0xB0)($t4) /* 09D590 8009C990 A42BE81A */ sh $t3, %lo(D_8018E81A)($at) /* 09D594 8009C994 A42AE818 */ sh $t2, %lo(D_8018E818)($at) /* 09D598 8009C998 3C018019 */ lui $at, %hi(D_8018E7F8) # $at, 0x8019 -/* 09D59C 8009C99C 3C0F8016 */ lui $t7, %hi(D_8015F52E) # $t7, 0x8016 -/* 09D5A0 8009C9A0 3C0E8016 */ lui $t6, %hi(D_8015F52C) # $t6, 0x8016 -/* 09D5A4 8009C9A4 85CEF52C */ lh $t6, %lo(D_8015F52C)($t6) -/* 09D5A8 8009C9A8 85EFF52E */ lh $t7, %lo(D_8015F52E)($t7) +/* 09D59C 8009C99C 3C0F8016 */ lui $t7, %hi(D_8015F480+0xAE) # $t7, 0x8016 +/* 09D5A0 8009C9A0 3C0E8016 */ lui $t6, %hi(D_8015F480+0xAC) # $t6, 0x8016 +/* 09D5A4 8009C9A4 85CEF52C */ lh $t6, %lo(D_8015F480+0xAC)($t6) +/* 09D5A8 8009C9A8 85EFF52E */ lh $t7, %lo(D_8015F480+0xAE)($t7) /* 09D5AC 8009C9AC A42DE7FA */ sh $t5, %lo(D_8018E7FA)($at) /* 09D5B0 8009C9B0 A42CE7F8 */ sh $t4, %lo(D_8018E7F8)($at) /* 09D5B4 8009C9B4 3C018019 */ lui $at, %hi(D_8018E822) # $at, 0x8019 -/* 09D5B8 8009C9B8 3C198016 */ lui $t9, %hi(D_8015F572) # $t9, 0x8016 -/* 09D5BC 8009C9BC 3C188016 */ lui $t8, %hi(D_8015F570) # $t8, 0x8016 -/* 09D5C0 8009C9C0 8718F570 */ lh $t8, %lo(D_8015F570)($t8) -/* 09D5C4 8009C9C4 8739F572 */ lh $t9, %lo(D_8015F572)($t9) +/* 09D5B8 8009C9B8 3C198016 */ lui $t9, %hi(D_8015F480+0xF2) # $t9, 0x8016 +/* 09D5BC 8009C9BC 3C188016 */ lui $t8, %hi(D_8015F480+0xF0) # $t8, 0x8016 +/* 09D5C0 8009C9C0 8718F570 */ lh $t8, %lo(D_8015F480+0xF0)($t8) +/* 09D5C4 8009C9C4 8739F572 */ lh $t9, %lo(D_8015F480+0xF2)($t9) /* 09D5C8 8009C9C8 A42EE820 */ sh $t6, %lo(D_8018E820)($at) /* 09D5CC 8009C9CC A42FE822 */ sh $t7, %lo(D_8018E822)($at) /* 09D5D0 8009C9D0 3C018019 */ lui $at, %hi(D_8018E802) # $at, 0x8019 -/* 09D5D4 8009C9D4 3C088016 */ lui $t0, %hi(D_8015F56C) # $t0, 0x8016 -/* 09D5D8 8009C9D8 3C098016 */ lui $t1, %hi(D_8015F56E) # $t1, 0x8016 -/* 09D5DC 8009C9DC 8529F56E */ lh $t1, %lo(D_8015F56E)($t1) -/* 09D5E0 8009C9E0 8508F56C */ lh $t0, %lo(D_8015F56C)($t0) +/* 09D5D4 8009C9D4 3C088016 */ lui $t0, %hi(D_8015F480+0xEC) # $t0, 0x8016 +/* 09D5D8 8009C9D8 3C098016 */ lui $t1, %hi(D_8015F480+0xEE) # $t1, 0x8016 +/* 09D5DC 8009C9DC 8529F56E */ lh $t1, %lo(D_8015F480+0xEE)($t1) +/* 09D5E0 8009C9E0 8508F56C */ lh $t0, %lo(D_8015F480+0xEC)($t0) /* 09D5E4 8009C9E4 A438E800 */ sh $t8, %lo(D_8018E800)($at) /* 09D5E8 8009C9E8 A439E802 */ sh $t9, %lo(D_8018E802)($at) /* 09D5EC 8009C9EC 3C018019 */ lui $at, %hi(D_8018E828) # $at, 0x8019 diff --git a/asm/non_matchings/code_80280650/func_80280B50.s b/asm/non_matchings/code_80280650/func_80280B50.s index cd7570a4c..bdf20bbe0 100644 --- a/asm/non_matchings/code_80280650/func_80280B50.s +++ b/asm/non_matchings/code_80280650/func_80280B50.s @@ -5,8 +5,8 @@ glabel func_80280B50 /* 12419C 80280B5C AFA60060 */ sw $a2, 0x60($sp) /* 1241A0 80280B60 AFA70064 */ sw $a3, 0x64($sp) /* 1241A4 80280B64 C4840000 */ lwc1 $f4, ($a0) -/* 1241A8 80280B68 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 1241AC 80280B6C 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 1241A8 80280B68 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 1241AC 80280B6C 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 1241B0 80280B70 E7A4004C */ swc1 $f4, 0x4c($sp) /* 1241B4 80280B74 C4860004 */ lwc1 $f6, 4($a0) /* 1241B8 80280B78 44856000 */ mtc1 $a1, $f12 diff --git a/asm/non_matchings/code_80280650/func_802812C8.s b/asm/non_matchings/code_80280650/func_802812C8.s index 1ae3b5cda..2b79c3131 100644 --- a/asm/non_matchings/code_80280650/func_802812C8.s +++ b/asm/non_matchings/code_80280650/func_802812C8.s @@ -1,6 +1,6 @@ glabel func_802812C8 -/* 124908 802812C8 3C028016 */ lui $v0, %hi(D_801646F0) # $v0, 0x8016 -/* 12490C 802812CC 244246F0 */ addiu $v0, %lo(D_801646F0) # addiu $v0, $v0, 0x46f0 +/* 124908 802812C8 3C028016 */ lui $v0, %hi(cameras) # $v0, 0x8016 +/* 12490C 802812CC 244246F0 */ addiu $v0, %lo(cameras) # addiu $v0, $v0, 0x46f0 /* 124910 802812D0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 124914 802812D4 C444000C */ lwc1 $f4, 0xc($v0) /* 124918 802812D8 C4460010 */ lwc1 $f6, 0x10($v0) @@ -31,10 +31,10 @@ glabel func_802812C8 /* 12497C 8028133C 8C4274E0 */ lw $v0, %lo(D_802874E0)($v0) /* 124980 80281340 2841012C */ slti $at, $v0, 0x12c /* 124984 80281344 10200011 */ beqz $at, .L8028138C -/* 124988 80281348 3C018016 */ lui $at, %hi(D_80164700) # $at, 0x8016 -/* 12498C 8028134C C4204700 */ lwc1 $f0, %lo(D_80164700)($at) -/* 124990 80281350 3C018016 */ lui $at, %hi(D_801646F4) # $at, 0x8016 -/* 124994 80281354 C42446F4 */ lwc1 $f4, %lo(D_801646F4)($at) +/* 124988 80281348 3C018016 */ lui $at, %hi(cameras+0x10) # $at, 0x8016 +/* 12498C 8028134C C4204700 */ lwc1 $f0, %lo(cameras+0x10)($at) +/* 124990 80281350 3C018016 */ lui $at, %hi(cameras+0x4) # $at, 0x8016 +/* 124994 80281354 C42446F4 */ lwc1 $f4, %lo(cameras+0x4)($at) /* 124998 80281358 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 12499C 8028135C 44814000 */ mtc1 $at, $f8 /* 1249A0 80281360 46040181 */ sub.s $f6, $f0, $f4 diff --git a/asm/non_matchings/code_80281780/func_80281780.s b/asm/non_matchings/code_80281780/func_80281780.s deleted file mode 100644 index f03d95b01..000000000 --- a/asm/non_matchings/code_80281780/func_80281780.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_80281780 -/* 124DC0 80281780 3C0E800E */ lui $t6, %hi(gEnableDebugMode) # $t6, 0x800e -/* 124DC4 80281784 95CEC520 */ lhu $t6, %lo(gEnableDebugMode)($t6) -/* 124DC8 80281788 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 124DCC 8028178C AFBF0014 */ sw $ra, 0x14($sp) -/* 124DD0 80281790 11C00037 */ beqz $t6, .L80281870 -/* 124DD4 80281794 3C0F800E */ lui $t7, %hi(D_800DC4BC) # $t7, 0x800e -/* 124DD8 80281798 8DEFC4BC */ lw $t7, %lo(D_800DC4BC)($t7) -/* 124DDC 8028179C 3C048028 */ lui $a0, %hi(D_80284ED0) # $a0, 0x8028 -/* 124DE0 802817A0 3C058019 */ lui $a1, %hi(D_8018D9D0) # $a1, 0x8019 -/* 124DE4 802817A4 95E20004 */ lhu $v0, 4($t7) -/* 124DE8 802817A8 24A5D9D0 */ addiu $a1, %lo(D_8018D9D0) # addiu $a1, $a1, -0x2630 -/* 124DEC 802817AC 24844ED0 */ addiu $a0, %lo(D_80284ED0) # addiu $a0, $a0, 0x4ed0 -/* 124DF0 802817B0 30580F0F */ andi $t8, $v0, 0xf0f -/* 124DF4 802817B4 1300002E */ beqz $t8, .L80281870 -/* 124DF8 802817B8 30590008 */ andi $t9, $v0, 8 -/* 124DFC 802817BC 13200005 */ beqz $t9, .L802817D4 -/* 124E00 802817C0 30490002 */ andi $t1, $v0, 2 -/* 124E04 802817C4 24080001 */ li $t0, 1 -/* 124E08 802817C8 3C01800F */ lui $at, %hi(D_800E86A8) # $at, 0x800f -/* 124E0C 802817CC 10000026 */ b .L80281868 -/* 124E10 802817D0 A02886A8 */ sb $t0, %lo(D_800E86A8)($at) -.L802817D4: -/* 124E14 802817D4 11200005 */ beqz $t1, .L802817EC -/* 124E18 802817D8 304B0001 */ andi $t3, $v0, 1 -/* 124E1C 802817DC 240A0002 */ li $t2, 2 -/* 124E20 802817E0 3C01800F */ lui $at, %hi(D_800E86A8) # $at, 0x800f -/* 124E24 802817E4 10000020 */ b .L80281868 -/* 124E28 802817E8 A02A86A8 */ sb $t2, %lo(D_800E86A8)($at) -.L802817EC: -/* 124E2C 802817EC 11600005 */ beqz $t3, .L80281804 -/* 124E30 802817F0 304D0004 */ andi $t5, $v0, 4 -/* 124E34 802817F4 240C0003 */ li $t4, 3 -/* 124E38 802817F8 3C01800F */ lui $at, %hi(D_800E86A8) # $at, 0x800f -/* 124E3C 802817FC 1000001A */ b .L80281868 -/* 124E40 80281800 A02C86A8 */ sb $t4, %lo(D_800E86A8)($at) -.L80281804: -/* 124E44 80281804 11A00005 */ beqz $t5, .L8028181C -/* 124E48 80281808 304F0800 */ andi $t7, $v0, 0x800 -/* 124E4C 8028180C 240E0004 */ li $t6, 4 -/* 124E50 80281810 3C01800F */ lui $at, %hi(D_800E86A8) # $at, 0x800f -/* 124E54 80281814 10000014 */ b .L80281868 -/* 124E58 80281818 A02E86A8 */ sb $t6, %lo(D_800E86A8)($at) -.L8028181C: -/* 124E5C 8028181C 11E00005 */ beqz $t7, .L80281834 -/* 124E60 80281820 30590200 */ andi $t9, $v0, 0x200 -/* 124E64 80281824 24180005 */ li $t8, 5 -/* 124E68 80281828 3C01800F */ lui $at, %hi(D_800E86A8) # $at, 0x800f -/* 124E6C 8028182C 1000000E */ b .L80281868 -/* 124E70 80281830 A03886A8 */ sb $t8, %lo(D_800E86A8)($at) -.L80281834: -/* 124E74 80281834 13200005 */ beqz $t9, .L8028184C -/* 124E78 80281838 30490100 */ andi $t1, $v0, 0x100 -/* 124E7C 8028183C 24080006 */ li $t0, 6 -/* 124E80 80281840 3C01800F */ lui $at, %hi(D_800E86A8) # $at, 0x800f -/* 124E84 80281844 10000008 */ b .L80281868 -/* 124E88 80281848 A02886A8 */ sb $t0, %lo(D_800E86A8)($at) -.L8028184C: -/* 124E8C 8028184C 11200005 */ beqz $t1, .L80281864 -/* 124E90 80281850 3C01800F */ lui $at, 0x800f -/* 124E94 80281854 240A0007 */ li $t2, 7 -/* 124E98 80281858 3C01800F */ lui $at, %hi(D_800E86A8) # $at, 0x800f -/* 124E9C 8028185C 10000002 */ b .L80281868 -/* 124EA0 80281860 A02A86A8 */ sb $t2, %lo(D_800E86A8)($at) -.L80281864: -/* 124EA4 80281864 A02086A8 */ sb $zero, %lo(D_800E86A8)($at) -.L80281868: -/* 124EA8 80281868 0C034D48 */ jal bcopy -/* 124EAC 8028186C 24060008 */ li $a2, 8 -.L80281870: -/* 124EB0 80281870 8FBF0014 */ lw $ra, 0x14($sp) -/* 124EB4 80281874 27BD0018 */ addiu $sp, $sp, 0x18 -/* 124EB8 80281878 03E00008 */ jr $ra -/* 124EBC 8028187C 00000000 */ nop diff --git a/asm/non_matchings/code_80281780/func_80281880.s b/asm/non_matchings/code_80281780/func_80281880.s deleted file mode 100644 index f31e9d804..000000000 --- a/asm/non_matchings/code_80281780/func_80281880.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80281880 -/* 124EC0 80281880 3C05800F */ lui $a1, 0x800f -/* 124EC4 80281884 00A42821 */ addu $a1, $a1, $a0 -/* 124EC8 80281888 3C028019 */ lui $v0, %hi(D_8018D9D0) # $v0, 0x8019 -/* 124ECC 8028188C 2442D9D0 */ addiu $v0, %lo(D_8018D9D0) # addiu $v0, $v0, -0x2630 -/* 124ED0 80281890 80A586A8 */ lb $a1, -0x7958($a1) -/* 124ED4 80281894 24040008 */ li $a0, 8 -/* 124ED8 80281898 00001825 */ move $v1, $zero -.L8028189C: -/* 124EDC 8028189C 804E0000 */ lb $t6, ($v0) -/* 124EE0 802818A0 11C50004 */ beq $t6, $a1, .L802818B4 -/* 124EE4 802818A4 00000000 */ nop -/* 124EE8 802818A8 24630001 */ addiu $v1, $v1, 1 -/* 124EEC 802818AC 1464FFFB */ bne $v1, $a0, .L8028189C -/* 124EF0 802818B0 24420001 */ addiu $v0, $v0, 1 -.L802818B4: -/* 124EF4 802818B4 03E00008 */ jr $ra -/* 124EF8 802818B8 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code_80281780/func_802818BC.s b/asm/non_matchings/code_80281780/func_802818BC.s deleted file mode 100644 index fe68e7bf9..000000000 --- a/asm/non_matchings/code_80281780/func_802818BC.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_802818BC -/* 124EFC 802818BC 3C0E8019 */ lui $t6, %hi(D_8018EDF3) # $t6, 0x8019 -/* 124F00 802818C0 81CEEDF3 */ lb $t6, %lo(D_8018EDF3)($t6) -/* 124F04 802818C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 124F08 802818C8 24010002 */ li $at, 2 -/* 124F0C 802818CC 11C1000A */ beq $t6, $at, .L802818F8 -/* 124F10 802818D0 AFBF0014 */ sw $ra, 0x14($sp) -/* 124F14 802818D4 0C0A0620 */ jal func_80281880 -/* 124F18 802818D8 00002025 */ move $a0, $zero -/* 124F1C 802818DC 3C038028 */ lui $v1, %hi(D_802874D8) # $v1, 0x8028 -/* 124F20 802818E0 246374D8 */ addiu $v1, %lo(D_802874D8) # addiu $v1, $v1, 0x74d8 -/* 124F24 802818E4 A062001D */ sb $v0, 0x1d($v1) -/* 124F28 802818E8 3C0F800F */ lui $t7, %hi(D_800E86A8) # $t7, 0x800f -/* 124F2C 802818EC 81EF86A8 */ lb $t7, %lo(D_800E86A8)($t7) -/* 124F30 802818F0 10000019 */ b .L80281958 -/* 124F34 802818F4 A06F001E */ sb $t7, 0x1e($v1) -.L802818F8: -/* 124F38 802818F8 0C0A0620 */ jal func_80281880 -/* 124F3C 802818FC 00002025 */ move $a0, $zero -/* 124F40 80281900 AFA2001C */ sw $v0, 0x1c($sp) -/* 124F44 80281904 AFA20024 */ sw $v0, 0x24($sp) -/* 124F48 80281908 0C0A0620 */ jal func_80281880 -/* 124F4C 8028190C 24040001 */ li $a0, 1 -/* 124F50 80281910 8FB8001C */ lw $t8, 0x1c($sp) -/* 124F54 80281914 0302082A */ slt $at, $t8, $v0 -/* 124F58 80281918 10200008 */ beqz $at, .L8028193C -/* 124F5C 8028191C 3C19800F */ lui $t9, %hi(D_800E86A8) # $t9, 0x800f -/* 124F60 80281920 833986A8 */ lb $t9, %lo(D_800E86A8)($t9) -/* 124F64 80281924 8FA80024 */ lw $t0, 0x24($sp) -/* 124F68 80281928 3C038028 */ lui $v1, %hi(D_802874D8) # $v1, 0x8028 -/* 124F6C 8028192C 246374D8 */ addiu $v1, %lo(D_802874D8) # addiu $v1, $v1, 0x74d8 -/* 124F70 80281930 A079001E */ sb $t9, 0x1e($v1) -/* 124F74 80281934 10000008 */ b .L80281958 -/* 124F78 80281938 A068001D */ sb $t0, 0x1d($v1) -.L8028193C: -/* 124F7C 8028193C 3C09800F */ lui $t1, %hi(D_800E86A9) # $t1, 0x800f -/* 124F80 80281940 812986A9 */ lb $t1, %lo(D_800E86A9)($t1) -/* 124F84 80281944 3C038028 */ lui $v1, %hi(D_802874D8) # $v1, 0x8028 -/* 124F88 80281948 246374D8 */ addiu $v1, %lo(D_802874D8) # addiu $v1, $v1, 0x74d8 -/* 124F8C 8028194C 3C018028 */ lui $at, %hi(D_802874F5) # $at, 0x8028 -/* 124F90 80281950 A069001E */ sb $t1, 0x1e($v1) -/* 124F94 80281954 A02274F5 */ sb $v0, %lo(D_802874F5)($at) -.L80281958: -/* 124F98 80281958 8FBF0014 */ lw $ra, 0x14($sp) -/* 124F9C 8028195C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 124FA0 80281960 03E00008 */ jr $ra -/* 124FA4 80281964 00000000 */ nop diff --git a/asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s b/asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s deleted file mode 100644 index cd7c2f8ee..000000000 --- a/asm/non_matchings/code_80281780/load_ending_sequence_royalraceway.s +++ /dev/null @@ -1,183 +0,0 @@ -glabel load_ending_sequence_royalraceway -/* 124FA8 80281968 240E0007 */ li $t6, 7 -/* 124FAC 8028196C 3C01800E */ lui $at, %hi(gCurrentCourseId) # $at, 0x800e -/* 124FB0 80281970 A42EC5A0 */ sh $t6, %lo(gCurrentCourseId)($at) -/* 124FB4 80281974 3C01800E */ lui $at, %hi(D_800DC5B4) # $at, 0x800e -/* 124FB8 80281978 240F0001 */ li $t7, 1 -/* 124FBC 8028197C A42FC5B4 */ sh $t7, %lo(D_800DC5B4)($at) -/* 124FC0 80281980 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e -/* 124FC4 80281984 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at) -/* 124FC8 80281988 3C018028 */ lui $at, %hi(D_80287550) # $at, 0x8028 -/* 124FCC 8028198C 3418FFFF */ li $t8, 65535 -/* 124FD0 80281990 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 124FD4 80281994 AC387550 */ sw $t8, %lo(D_80287550)($at) -/* 124FD8 80281998 AFBF0014 */ sw $ra, 0x14($sp) -/* 124FDC 8028199C 3C018028 */ lui $at, %hi(D_80287554) # $at, 0x8028 -/* 124FE0 802819A0 0C0A9346 */ jal func_802A4D18 -/* 124FE4 802819A4 AC207554 */ sw $zero, %lo(D_80287554)($at) -/* 124FE8 802819A8 0C0A9D2F */ jal func_802A74BC -/* 124FEC 802819AC 00000000 */ nop -/* 124FF0 802819B0 3C014270 */ li $at, 0x42700000 # 60.000000 -/* 124FF4 802819B4 44810000 */ mtc1 $at, $f0 -/* 124FF8 802819B8 3C018016 */ lui $at, %hi(D_801647A4) # $at, 0x8016 -/* 124FFC 802819BC 3C02800E */ lui $v0, %hi(D_800DC5EC) # $v0, 0x800e -/* 125000 802819C0 E42047A4 */ swc1 $f0, %lo(D_801647A4)($at) -/* 125004 802819C4 3C018015 */ lui $at, %hi(D_80150130) # $at, 0x8015 -/* 125008 802819C8 2442C5EC */ addiu $v0, %lo(D_800DC5EC) # addiu $v0, $v0, -0x3a14 -/* 12500C 802819CC E4200130 */ swc1 $f0, %lo(D_80150130)($at) -/* 125010 802819D0 8C480000 */ lw $t0, ($v0) -/* 125014 802819D4 24190140 */ li $t9, 320 -/* 125018 802819D8 240900F0 */ li $t1, 240 -/* 12501C 802819DC A519002C */ sh $t9, 0x2c($t0) -/* 125020 802819E0 8C4A0000 */ lw $t2, ($v0) -/* 125024 802819E4 240B00A0 */ li $t3, 160 -/* 125028 802819E8 240D0078 */ li $t5, 120 -/* 12502C 802819EC A549002E */ sh $t1, 0x2e($t2) -/* 125030 802819F0 8C4C0000 */ lw $t4, ($v0) -/* 125034 802819F4 3C0F8016 */ lui $t7, %hi(D_8015F734) # $t7, 0x8016 -/* 125038 802819F8 3C01800E */ lui $at, %hi(D_800DC530) # $at, 0x800e -/* 12503C 802819FC A58B0030 */ sh $t3, 0x30($t4) -/* 125040 80281A00 8C4E0000 */ lw $t6, ($v0) -/* 125044 80281A04 3C04800E */ lui $a0, %hi(gCurrentCourseId) # $a0, 0x800e -/* 125048 80281A08 A5CD0032 */ sh $t5, 0x32($t6) -/* 12504C 80281A0C 8DEFF734 */ lw $t7, %lo(D_8015F734)($t7) -/* 125050 80281A10 AC20C530 */ sw $zero, %lo(D_800DC530)($at) -/* 125054 80281A14 3C018016 */ lui $at, %hi(D_8015F728) # $at, 0x8016 -/* 125058 80281A18 AC2FF728 */ sw $t7, %lo(D_8015F728)($at) -/* 12505C 80281A1C 3C01800E */ lui $at, %hi(D_800DC52C) # $at, 0x800e -/* 125060 80281A20 AC20C52C */ sw $zero, %lo(D_800DC52C)($at) -/* 125064 80281A24 3C01800E */ lui $at, %hi(gModeSelection) # $at, 0x800e -/* 125068 80281A28 AC20C53C */ sw $zero, %lo(gModeSelection)($at) -/* 12506C 80281A2C 0C0AAA46 */ jal load_course -/* 125070 80281A30 8484C5A0 */ lh $a0, %lo(gCurrentCourseId)($a0) -/* 125074 80281A34 3C188016 */ lui $t8, %hi(D_8015F728) # $t8, 0x8016 -/* 125078 80281A38 8F18F728 */ lw $t8, %lo(D_8015F728)($t8) -/* 12507C 80281A3C 3C018016 */ lui $at, %hi(D_8015F730) # $at, 0x8016 -/* 125080 80281A40 3C040082 */ lui $a0, %hi(D_00821D10) # $a0, 0x82 -/* 125084 80281A44 3C050082 */ lui $a1, %hi(D_00825800) # $a1, 0x82 -/* 125088 80281A48 24A55800 */ addiu $a1, %lo(D_00825800) # addiu $a1, $a1, 0x5800 -/* 12508C 80281A4C 24841D10 */ addiu $a0, %lo(D_00821D10) # addiu $a0, $a0, 0x1d10 -/* 125090 80281A50 0C0AAA23 */ jal func_802AA88C -/* 125094 80281A54 AC38F730 */ sw $t8, %lo(D_8015F730)($at) -/* 125098 80281A58 2404000B */ li $a0, 11 -/* 12509C 80281A5C 0C0A9EE5 */ jal set_segment_base_addr -/* 1250A0 80281A60 00402825 */ move $a1, $v0 -/* 1250A4 80281A64 3C040083 */ lui $a0, %hi(D_00831DC0) # $a0, 0x83 -/* 1250A8 80281A68 3C050083 */ lui $a1, %hi(D_00835BA0) # $a1, 0x83 -/* 1250AC 80281A6C 24A55BA0 */ addiu $a1, %lo(D_00835BA0) # addiu $a1, $a1, 0x5ba0 -/* 1250B0 80281A70 0C0AAA23 */ jal func_802AA88C -/* 1250B4 80281A74 24841DC0 */ addiu $a0, %lo(D_00831DC0) # addiu $a0, $a0, 0x1dc0 -/* 1250B8 80281A78 24040006 */ li $a0, 6 -/* 1250BC 80281A7C 0C0A9EE5 */ jal set_segment_base_addr -/* 1250C0 80281A80 00402825 */ move $a1, $v0 -/* 1250C4 80281A84 3C01C4FA */ li $at, 0xC4FA0000 # -2000.000000 -/* 1250C8 80281A88 44812000 */ mtc1 $at, $f4 -/* 1250CC 80281A8C 3C018016 */ lui $at, %hi(D_8015F8E4) # $at, 0x8016 -/* 1250D0 80281A90 2403EA5F */ li $v1, -5537 -/* 1250D4 80281A94 E424F8E4 */ swc1 $f4, %lo(D_8015F8E4)($at) -/* 1250D8 80281A98 3C018016 */ lui $at, %hi(D_8015F6EA) # $at, 0x8016 -/* 1250DC 80281A9C A423F6EA */ sh $v1, %lo(D_8015F6EA)($at) -/* 1250E0 80281AA0 3C018016 */ lui $at, %hi(D_8015F6EE) # $at, 0x8016 -/* 1250E4 80281AA4 A423F6EE */ sh $v1, %lo(D_8015F6EE)($at) -/* 1250E8 80281AA8 3C018016 */ lui $at, %hi(D_8015F6F2) # $at, 0x8016 -/* 1250EC 80281AAC A423F6F2 */ sh $v1, %lo(D_8015F6F2)($at) -/* 1250F0 80281AB0 240615A1 */ li $a2, 5537 -/* 1250F4 80281AB4 3C018016 */ lui $at, %hi(D_8015F6E8) # $at, 0x8016 -/* 1250F8 80281AB8 A426F6E8 */ sh $a2, %lo(D_8015F6E8)($at) -/* 1250FC 80281ABC 3C018016 */ lui $at, %hi(D_8015F6EC) # $at, 0x8016 -/* 125100 80281AC0 A426F6EC */ sh $a2, %lo(D_8015F6EC)($at) -/* 125104 80281AC4 3C018016 */ lui $at, %hi(D_8015F6F0) # $at, 0x8016 -/* 125108 80281AC8 A426F6F0 */ sh $a2, %lo(D_8015F6F0)($at) -/* 12510C 80281ACC 3C018016 */ lui $at, %hi(D_8015F59C) # $at, 0x8016 -/* 125110 80281AD0 AC20F59C */ sw $zero, %lo(D_8015F59C)($at) -/* 125114 80281AD4 3C018016 */ lui $at, %hi(D_8015F5A0) # $at, 0x8016 -/* 125118 80281AD8 AC20F5A0 */ sw $zero, %lo(D_8015F5A0)($at) -/* 12511C 80281ADC 3C018016 */ lui $at, %hi(D_8015F58C) # $at, 0x8016 -/* 125120 80281AE0 AC20F58C */ sw $zero, %lo(D_8015F58C)($at) -/* 125124 80281AE4 3C018016 */ lui $at, %hi(D_8015F588) # $at, 0x8016 -/* 125128 80281AE8 A420F588 */ sh $zero, %lo(D_8015F588)($at) -/* 12512C 80281AEC 3C01800E */ lui $at, %hi(D_800DC5BC) # $at, 0x800e -/* 125130 80281AF0 A420C5BC */ sh $zero, %lo(D_800DC5BC)($at) -/* 125134 80281AF4 3C01800E */ lui $at, %hi(D_800DC5C8) # $at, 0x800e -/* 125138 80281AF8 3C198016 */ lui $t9, %hi(D_8015F728) # $t9, 0x8016 -/* 12513C 80281AFC 8F39F728 */ lw $t9, %lo(D_8015F728)($t9) -/* 125140 80281B00 A420C5C8 */ sh $zero, %lo(D_800DC5C8)($at) -/* 125144 80281B04 3C018016 */ lui $at, %hi(D_8015F580) # $at, 0x8016 -/* 125148 80281B08 3C040700 */ lui $a0, (0x070067E8 >> 16) # lui $a0, 0x700 -/* 12514C 80281B0C 348467E8 */ ori $a0, (0x070067E8 & 0xFFFF) # ori $a0, $a0, 0x67e8 -/* 125150 80281B10 2405FFFF */ li $a1, -1 -/* 125154 80281B14 0C0ABD6B */ jal func_802AF5AC -/* 125158 80281B18 AC39F580 */ sw $t9, %lo(D_8015F580)($at) -/* 12515C 80281B1C 3C040700 */ lui $a0, (0x0700AEF8 >> 16) # lui $a0, 0x700 -/* 125160 80281B20 3484AEF8 */ ori $a0, (0x0700AEF8 & 0xFFFF) # ori $a0, $a0, 0xaef8 -/* 125164 80281B24 0C0ABD6B */ jal func_802AF5AC -/* 125168 80281B28 2405FFFF */ li $a1, -1 -/* 12516C 80281B2C 3C040700 */ lui $a0, (0x0700A970 >> 16) # lui $a0, 0x700 -/* 125170 80281B30 3484A970 */ ori $a0, (0x0700A970 & 0xFFFF) # ori $a0, $a0, 0xa970 -/* 125174 80281B34 0C0ABD6B */ jal func_802AF5AC -/* 125178 80281B38 24050008 */ li $a1, 8 -/* 12517C 80281B3C 3C040700 */ lui $a0, (0x0700AC30 >> 16) # lui $a0, 0x700 -/* 125180 80281B40 3484AC30 */ ori $a0, (0x0700AC30 & 0xFFFF) # ori $a0, $a0, 0xac30 -/* 125184 80281B44 0C0ABD6B */ jal func_802AF5AC -/* 125188 80281B48 24050008 */ li $a1, 8 -/* 12518C 80281B4C 3C040700 */ lui $a0, (0x07000CE0 >> 16) # lui $a0, 0x700 -/* 125190 80281B50 34840CE0 */ ori $a0, (0x07000CE0 & 0xFFFF) # ori $a0, $a0, 0xce0 -/* 125194 80281B54 0C0ABD6B */ jal func_802AF5AC -/* 125198 80281B58 24050010 */ li $a1, 16 -/* 12519C 80281B5C 3C040700 */ lui $a0, (0x07000E88 >> 16) # lui $a0, 0x700 -/* 1251A0 80281B60 34840E88 */ ori $a0, (0x07000E88 & 0xFFFF) # ori $a0, $a0, 0xe88 -/* 1251A4 80281B64 0C0ABD6B */ jal func_802AF5AC -/* 1251A8 80281B68 24050010 */ li $a1, 16 -/* 1251AC 80281B6C 3C040700 */ lui $a0, (0x0700A618 >> 16) # lui $a0, 0x700 -/* 1251B0 80281B70 3484A618 */ ori $a0, (0x0700A618 & 0xFFFF) # ori $a0, $a0, 0xa618 -/* 1251B4 80281B74 0C0ABD6B */ jal func_802AF5AC -/* 1251B8 80281B78 2405FFFF */ li $a1, -1 -/* 1251BC 80281B7C 3C040700 */ lui $a0, (0x0700A618 >> 16) # lui $a0, 0x700 -/* 1251C0 80281B80 3484A618 */ ori $a0, (0x0700A618 & 0xFFFF) # ori $a0, $a0, 0xa618 -/* 1251C4 80281B84 0C0ABD6B */ jal func_802AF5AC -/* 1251C8 80281B88 2405FFFF */ li $a1, -1 -/* 1251CC 80281B8C 3C040700 */ lui $a0, (0x070023F8 >> 16) # lui $a0, 0x700 -/* 1251D0 80281B90 348423F8 */ ori $a0, (0x070023F8 & 0xFFFF) # ori $a0, $a0, 0x23f8 -/* 1251D4 80281B94 0C0ABD6B */ jal func_802AF5AC -/* 1251D8 80281B98 24050001 */ li $a1, 1 -/* 1251DC 80281B9C 3C040700 */ lui $a0, (0x07002478 >> 16) # lui $a0, 0x700 -/* 1251E0 80281BA0 34842478 */ ori $a0, (0x07002478 & 0xFFFF) # ori $a0, $a0, 0x2478 -/* 1251E4 80281BA4 0C0ABD6B */ jal func_802AF5AC -/* 1251E8 80281BA8 24050001 */ li $a1, 1 -/* 1251EC 80281BAC 0C0A571B */ jal func_80295C6C -/* 1251F0 80281BB0 00000000 */ nop -/* 1251F4 80281BB4 0C0A05E0 */ jal func_80281780 -/* 1251F8 80281BB8 00000000 */ nop -/* 1251FC 80281BBC 0C0A062F */ jal func_802818BC -/* 125200 80281BC0 00000000 */ nop -/* 125204 80281BC4 0C00F420 */ jal func_8003D080 -/* 125208 80281BC8 00000000 */ nop -/* 12520C 80281BCC 0C01BA70 */ jal func_8006E9C0 -/* 125210 80281BD0 00000000 */ nop -/* 125214 80281BD4 0C007017 */ jal func_8001C05C -/* 125218 80281BD8 00000000 */ nop -/* 12521C 80281BDC 0C0A03EC */ jal func_80280FB0 -/* 125220 80281BE0 00000000 */ nop -/* 125224 80281BE4 0C0A05AE */ jal func_802816B8 -/* 125228 80281BE8 00000000 */ nop -/* 12522C 80281BEC 0C024F98 */ jal func_80093E60 -/* 125230 80281BF0 00000000 */ nop -/* 125234 80281BF4 3C088016 */ lui $t0, %hi(gHeapEndPtr) # $t0, 0x8016 -/* 125238 80281BF8 3C098016 */ lui $t1, %hi(D_8015F728) # $t1, 0x8016 -/* 12523C 80281BFC 8D29F728 */ lw $t1, %lo(D_8015F728)($t1) -/* 125240 80281C00 8D08F72C */ lw $t0, %lo(gHeapEndPtr)($t0) -/* 125244 80281C04 3C01447A */ li $at, 0x447A0000 # 1000.000000 -/* 125248 80281C08 44815000 */ mtc1 $at, $f10 -/* 12524C 80281C0C 01095823 */ subu $t3, $t0, $t1 -/* 125250 80281C10 448B3000 */ mtc1 $t3, $f6 -/* 125254 80281C14 8FBF0014 */ lw $ra, 0x14($sp) -/* 125258 80281C18 3C028016 */ lui $v0, %hi(D_801625F8) # $v0, 0x8016 -/* 12525C 80281C1C 46803220 */ cvt.s.w $f8, $f6 -/* 125260 80281C20 244225F8 */ addiu $v0, %lo(D_801625F8) # addiu $v0, $v0, 0x25f8 -/* 125264 80281C24 AC4B0000 */ sw $t3, ($v0) -/* 125268 80281C28 3C018016 */ lui $at, %hi(D_801625FC) -/* 12526C 80281C2C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 125270 80281C30 460A4403 */ div.s $f16, $f8, $f10 -/* 125274 80281C34 03E00008 */ jr $ra -/* 125278 80281C38 E43025FC */ swc1 $f16, %lo(D_801625FC)($at) - diff --git a/asm/non_matchings/code_8028DF00/code_8028DF00.s b/asm/non_matchings/code_8028DF00/code_8028DF00.s index 828507fe4..6ccd530c8 100644 --- a/asm/non_matchings/code_8028DF00/code_8028DF00.s +++ b/asm/non_matchings/code_8028DF00/code_8028DF00.s @@ -1639,7 +1639,7 @@ glabel func_80290B14 /* 0FA134 80290B24 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e /* 0FA138 80290B28 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) /* 0FA13C 80290B2C 3C04800E */ lui $a0, %hi(D_800DC4FC) # 0x800e -/* 0FA140 80290B30 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e +/* 0FA140 80290B30 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 0FA144 80290B34 1040000B */ beqz $v0, .L80290B64 /* 0FA148 80290B38 00003025 */ move $a2, $zero /* 0FA14C 80290B3C 24010001 */ li $at, 1 @@ -1655,44 +1655,44 @@ glabel func_80290B14 .L80290B64: /* 0FA174 80290B64 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) /* 0FA178 80290B68 0C007BA6 */ jal func_8001EE98 -/* 0FA17C 80290B6C 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 0FA17C 80290B6C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 0FA180 80290B70 10000026 */ b .L80290C0C /* 0FA184 80290B74 8FBF0014 */ lw $ra, 0x14($sp) .L80290B78: -/* 0FA188 80290B78 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 0FA18C 80290B7C 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 0FA188 80290B78 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 0FA18C 80290B7C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 0FA190 80290B80 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) # -0x3b04($a0) /* 0FA194 80290B84 0C007BA6 */ jal func_8001EE98 /* 0FA198 80290B88 00003025 */ move $a2, $zero /* 0FA19C 80290B8C 3C04800E */ lui $a0, %hi(D_800DC500) # $a0, 0x800e -/* 0FA1A0 80290B90 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 0FA1A4 80290B94 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 0FA1A0 80290B90 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 0FA1A4 80290B94 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 0FA1A8 80290B98 8C84C500 */ lw $a0, %lo(D_800DC500)($a0) /* 0FA1AC 80290B9C 0C007BA6 */ jal func_8001EE98 /* 0FA1B0 80290BA0 24060001 */ li $a2, 1 /* 0FA1B4 80290BA4 10000019 */ b .L80290C0C /* 0FA1B8 80290BA8 8FBF0014 */ lw $ra, 0x14($sp) .L80290BAC: -/* 0FA1BC 80290BAC 3C05800E */ lui $a1, %hi(D_800DDB40) # $a1, 0x800e -/* 0FA1C0 80290BB0 8CA5DB40 */ lw $a1, %lo(D_800DDB40)($a1) +/* 0FA1BC 80290BAC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e +/* 0FA1C0 80290BB0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 0FA1C4 80290BB4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) # -0x3b04($a0) /* 0FA1C8 80290BB8 0C007BA6 */ jal func_8001EE98 /* 0FA1CC 80290BBC 00003025 */ move $a2, $zero /* 0FA1D0 80290BC0 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0FA1D4 80290BC4 3C05800E */ lui $a1, %hi(D_800DDB44) # $a1, 0x800e -/* 0FA1D8 80290BC8 8CA5DB44 */ lw $a1, %lo(D_800DDB44)($a1) +/* 0FA1D4 80290BC4 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e +/* 0FA1D8 80290BC8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 0FA1DC 80290BCC 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) /* 0FA1E0 80290BD0 0C007BA6 */ jal func_8001EE98 /* 0FA1E4 80290BD4 24060001 */ li $a2, 1 /* 0FA1E8 80290BD8 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0FA1EC 80290BDC 3C05800E */ lui $a1, %hi(D_800DDB48) # $a1, 0x800e -/* 0FA1F0 80290BE0 8CA5DB48 */ lw $a1, %lo(D_800DDB48)($a1) +/* 0FA1EC 80290BDC 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e +/* 0FA1F0 80290BE0 8CA5DB48 */ lw $a1, %lo(camera3)($a1) /* 0FA1F4 80290BE4 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) /* 0FA1F8 80290BE8 0C007BA6 */ jal func_8001EE98 /* 0FA1FC 80290BEC 24060002 */ li $a2, 2 /* 0FA200 80290BF0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0FA204 80290BF4 3C05800E */ lui $a1, %hi(D_800DDB4C) # $a1, 0x800e -/* 0FA208 80290BF8 8CA5DB4C */ lw $a1, %lo(D_800DDB4C)($a1) +/* 0FA204 80290BF4 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e +/* 0FA208 80290BF8 8CA5DB4C */ lw $a1, %lo(camera4)($a1) /* 0FA20C 80290BFC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) /* 0FA210 80290C00 0C007BA6 */ jal func_8001EE98 /* 0FA214 80290C04 24060003 */ li $a2, 3 diff --git a/asm/non_matchings/code_80290C20/load_surface_map.s b/asm/non_matchings/code_80290C20/load_surface_map.s index 3b73e0ec3..ec717697a 100644 --- a/asm/non_matchings/code_80290C20/load_surface_map.s +++ b/asm/non_matchings/code_80290C20/load_surface_map.s @@ -76,8 +76,8 @@ glabel load_surface_map /* 0FA4C4 80290EB4 24070003 */ li $a3, 3 .L80290EB8: /* 0FA4C8 80290EB8 A4A70036 */ sh $a3, 0x36($a1) -/* 0FA4CC 80290EBC 3C0D800E */ lui $t5, %hi(D_800DDB40) # $t5, 0x800e -/* 0FA4D0 80290EC0 8DADDB40 */ lw $t5, %lo(D_800DDB40)($t5) +/* 0FA4CC 80290EBC 3C0D800E */ lui $t5, %hi(camera1) # $t5, 0x800e +/* 0FA4D0 80290EC0 8DADDB40 */ lw $t5, %lo(camera1)($t5) /* 0FA4D4 80290EC4 240100B8 */ li $at, 184 /* 0FA4D8 80290EC8 3C198015 */ lui $t9, %hi(D_80152300) /* 0FA4DC 80290ECC 00CD7023 */ subu $t6, $a2, $t5 diff --git a/asm/non_matchings/code_802A3730/func_802A3730.s b/asm/non_matchings/code_802A3730/func_802A3730.s deleted file mode 100644 index 3ef9e2857..000000000 --- a/asm/non_matchings/code_802A3730/func_802A3730.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_802A3730 -/* 10CD40 802A3730 8482002C */ lh $v0, 0x2c($a0) -/* 10CD44 802A3734 8483002E */ lh $v1, 0x2e($a0) -/* 10CD48 802A3738 84850030 */ lh $a1, 0x30($a0) -/* 10CD4C 802A373C 00027040 */ sll $t6, $v0, 1 -/* 10CD50 802A3740 00037840 */ sll $t7, $v1, 1 -/* 10CD54 802A3744 84860032 */ lh $a2, 0x32($a0) -/* 10CD58 802A3748 01E01825 */ move $v1, $t7 -/* 10CD5C 802A374C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10CD60 802A3750 0005C080 */ sll $t8, $a1, 2 -/* 10CD64 802A3754 01C01025 */ move $v0, $t6 -/* 10CD68 802A3758 A48E0010 */ sh $t6, 0x10($a0) -/* 10CD6C 802A375C A48F0012 */ sh $t7, 0x12($a0) -/* 10CD70 802A3760 A4980018 */ sh $t8, 0x18($a0) -/* 10CD74 802A3764 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10CD78 802A3768 248D0010 */ addiu $t5, $a0, 0x10 -/* 10CD7C 802A376C 03002825 */ move $a1, $t8 -/* 10CD80 802A3770 01A17024 */ and $t6, $t5, $at -/* 10CD84 802A3774 240901FF */ li $t1, 511 -/* 10CD88 802A3778 0006C880 */ sll $t9, $a2, 2 -/* 10CD8C 802A377C 3C0A8015 */ lui $t2, %hi(gDisplayListHead) # $t2, 0x8015 -/* 10CD90 802A3780 A499001A */ sh $t9, 0x1a($a0) -/* 10CD94 802A3784 254A0298 */ addiu $t2, %lo(gDisplayListHead) # addiu $t2, $t2, 0x298 -/* 10CD98 802A3788 A4890014 */ sh $t1, 0x14($a0) -/* 10CD9C 802A378C A4800016 */ sh $zero, 0x16($a0) -/* 10CDA0 802A3790 A489001C */ sh $t1, 0x1c($a0) -/* 10CDA4 802A3794 A480001E */ sh $zero, 0x1e($a0) -/* 10CDA8 802A3798 8D480000 */ lw $t0, ($t2) -/* 10CDAC 802A379C 03203025 */ move $a2, $t9 -/* 10CDB0 802A37A0 3C0C0380 */ lui $t4, (0x03800010 >> 16) # lui $t4, 0x380 -/* 10CDB4 802A37A4 250B0008 */ addiu $t3, $t0, 8 -/* 10CDB8 802A37A8 AD4B0000 */ sw $t3, ($t2) -/* 10CDBC 802A37AC 358C0010 */ ori $t4, (0x03800010 & 0xFFFF) # ori $t4, $t4, 0x10 -/* 10CDC0 802A37B0 AD0C0000 */ sw $t4, ($t0) -/* 10CDC4 802A37B4 AD0E0004 */ sw $t6, 4($t0) -/* 10CDC8 802A37B8 01003825 */ move $a3, $t0 -/* 10CDCC 802A37BC 04410003 */ bgez $v0, .L802A37CC -/* 10CDD0 802A37C0 00027883 */ sra $t7, $v0, 2 -/* 10CDD4 802A37C4 24410003 */ addiu $at, $v0, 3 -/* 10CDD8 802A37C8 00017883 */ sra $t7, $at, 2 -.L802A37CC: -/* 10CDDC 802A37CC 01E01025 */ move $v0, $t7 -/* 10CDE0 802A37D0 04610003 */ bgez $v1, .L802A37E0 -/* 10CDE4 802A37D4 0003C083 */ sra $t8, $v1, 2 -/* 10CDE8 802A37D8 24610003 */ addiu $at, $v1, 3 -/* 10CDEC 802A37DC 0001C083 */ sra $t8, $at, 2 -.L802A37E0: -/* 10CDF0 802A37E0 03001825 */ move $v1, $t8 -/* 10CDF4 802A37E4 04A10003 */ bgez $a1, .L802A37F4 -/* 10CDF8 802A37E8 0005C883 */ sra $t9, $a1, 2 -/* 10CDFC 802A37EC 24A10003 */ addiu $at, $a1, 3 -/* 10CE00 802A37F0 0001C883 */ sra $t9, $at, 2 -.L802A37F4: -/* 10CE04 802A37F4 03202825 */ move $a1, $t9 -/* 10CE08 802A37F8 04C10003 */ bgez $a2, .L802A3808 -/* 10CE0C 802A37FC 00065883 */ sra $t3, $a2, 2 -/* 10CE10 802A3800 24C10003 */ addiu $at, $a2, 3 -/* 10CE14 802A3804 00015883 */ sra $t3, $at, 2 -.L802A3808: -/* 10CE18 802A3808 00A22021 */ addu $a0, $a1, $v0 -/* 10CE1C 802A380C 28810141 */ slti $at, $a0, 0x141 -/* 10CE20 802A3810 14200002 */ bnez $at, .L802A381C -/* 10CE24 802A3814 01603025 */ move $a2, $t3 -/* 10CE28 802A3818 24040140 */ li $a0, 320 -.L802A381C: -/* 10CE2C 802A381C 44845000 */ mtc1 $a0, $f10 -/* 10CE30 802A3820 00C31021 */ addu $v0, $a2, $v1 -/* 10CE34 802A3824 284100F1 */ slti $at, $v0, 0xf1 -/* 10CE38 802A3828 14200002 */ bnez $at, .L802A3834 -/* 10CE3C 802A382C 46805420 */ cvt.s.w $f16, $f10 -/* 10CE40 802A3830 240200F0 */ li $v0, 240 -.L802A3834: -/* 10CE44 802A3834 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 10CE48 802A3838 44810000 */ mtc1 $at, $f0 -/* 10CE4C 802A383C 44802000 */ mtc1 $zero, $f4 -/* 10CE50 802A3840 8D480000 */ lw $t0, ($t2) -/* 10CE54 802A3844 3C01ED00 */ lui $at, 0xed00 -/* 10CE58 802A3848 46002182 */ mul.s $f6, $f4, $f0 -/* 10CE5C 802A384C 250C0008 */ addiu $t4, $t0, 8 -/* 10CE60 802A3850 AD4C0000 */ sw $t4, ($t2) -/* 10CE64 802A3854 46008482 */ mul.s $f18, $f16, $f0 -/* 10CE68 802A3858 4600320D */ trunc.w.s $f8, $f6 -/* 10CE6C 802A385C 44823000 */ mtc1 $v0, $f6 -/* 10CE70 802A3860 4600910D */ trunc.w.s $f4, $f18 -/* 10CE74 802A3864 44054000 */ mfc1 $a1, $f8 -/* 10CE78 802A3868 46803220 */ cvt.s.w $f8, $f6 -/* 10CE7C 802A386C 30AE0FFF */ andi $t6, $a1, 0xfff -/* 10CE80 802A3870 000E7B00 */ sll $t7, $t6, 0xc -/* 10CE84 802A3874 01E1C025 */ or $t8, $t7, $at -/* 10CE88 802A3878 440C2000 */ mfc1 $t4, $f4 -/* 10CE8C 802A387C 030EC825 */ or $t9, $t8, $t6 -/* 10CE90 802A3880 46004282 */ mul.s $f10, $f8, $f0 -/* 10CE94 802A3884 AD190000 */ sw $t9, ($t0) -/* 10CE98 802A3888 318D0FFF */ andi $t5, $t4, 0xfff -/* 10CE9C 802A388C 000D7300 */ sll $t6, $t5, 0xc -/* 10CEA0 802A3890 4600540D */ trunc.w.s $f16, $f10 -/* 10CEA4 802A3894 44188000 */ mfc1 $t8, $f16 -/* 10CEA8 802A3898 00000000 */ nop -/* 10CEAC 802A389C 33190FFF */ andi $t9, $t8, 0xfff -/* 10CEB0 802A38A0 01D95825 */ or $t3, $t6, $t9 -/* 10CEB4 802A38A4 03E00008 */ jr $ra -/* 10CEB8 802A38A8 AD0B0004 */ sw $t3, 4($t0) - -/* 10CEBC 802A38AC 03E00008 */ jr $ra -/* 10CEC0 802A38B0 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A38B4.s b/asm/non_matchings/code_802A3730/func_802A38B4.s deleted file mode 100644 index 57708be49..000000000 --- a/asm/non_matchings/code_802A3730/func_802A38B4.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_802A38B4 -/* 10CEC4 802A38B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 10CEC8 802A38B8 AFBF0014 */ sw $ra, 0x14($sp) -/* 10CECC 802A38BC 0C0A8F8F */ jal func_802A3E3C -/* 10CED0 802A38C0 00000000 */ nop -/* 10CED4 802A38C4 0C0A9075 */ jal func_802A41D4 -/* 10CED8 802A38C8 00000000 */ nop -/* 10CEDC 802A38CC 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 10CEE0 802A38D0 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 10CEE4 802A38D4 8CA20000 */ lw $v0, ($a1) -/* 10CEE8 802A38D8 3C0FE900 */ lui $t7, 0xe900 -/* 10CEEC 802A38DC 3C07800E */ lui $a3, %hi(D_800DC5C4) # $a3, 0x800e -/* 10CEF0 802A38E0 244E0008 */ addiu $t6, $v0, 8 -/* 10CEF4 802A38E4 ACAE0000 */ sw $t6, ($a1) -/* 10CEF8 802A38E8 AC400004 */ sw $zero, 4($v0) -/* 10CEFC 802A38EC AC4F0000 */ sw $t7, ($v0) -/* 10CF00 802A38F0 8CA20000 */ lw $v0, ($a1) -/* 10CF04 802A38F4 3C19B800 */ lui $t9, 0xb800 -/* 10CF08 802A38F8 24E7C5C4 */ addiu $a3, %lo(D_800DC5C4) # addiu $a3, $a3, -0x3a3c -/* 10CF0C 802A38FC 24580008 */ addiu $t8, $v0, 8 -/* 10CF10 802A3900 ACB80000 */ sw $t8, ($a1) -/* 10CF14 802A3904 AC400004 */ sw $zero, 4($v0) -/* 10CF18 802A3908 AC590000 */ sw $t9, ($v0) -/* 10CF1C 802A390C 94E60000 */ lhu $a2, ($a3) -/* 10CF20 802A3910 24040001 */ li $a0, 1 -/* 10CF24 802A3914 3C028015 */ lui $v0, %hi(D_80150124) # $v0, 0x8015 -/* 10CF28 802A3918 10C00003 */ beqz $a2, .L802A3928 -/* 10CF2C 802A391C 24C8FFFF */ addiu $t0, $a2, -1 -/* 10CF30 802A3920 1000002B */ b .L802A39D0 -/* 10CF34 802A3924 A4E80000 */ sh $t0, ($a3) -.L802A3928: -/* 10CF38 802A3928 8C420124 */ lw $v0, %lo(D_80150124)($v0) -/* 10CF3C 802A392C 3C01800E */ lui $at, %hi(D_800DC524) # $at, 0x800e -/* 10CF40 802A3930 240900FF */ li $t1, 255 -/* 10CF44 802A3934 AC22C524 */ sw $v0, %lo(D_800DC524)($at) -/* 10CF48 802A3938 3C01800E */ lui $at, %hi(D_800DC50C) # $at, 0x800e -/* 10CF4C 802A393C AC29C50C */ sw $t1, %lo(D_800DC50C)($at) -/* 10CF50 802A3940 3C01800E */ lui $at, %hi(D_800DC5C0) # $at, 0x800e -/* 10CF54 802A3944 A420C5C0 */ sh $zero, %lo(D_800DC5C0)($at) -/* 10CF58 802A3948 A4E00000 */ sh $zero, ($a3) -/* 10CF5C 802A394C 3C01800F */ lui $at, %hi(D_800E86A4) # $at, 0x800f -/* 10CF60 802A3950 1040000B */ beqz $v0, .L802A3980 -/* 10CF64 802A3954 AC2486A4 */ sw $a0, %lo(D_800E86A4)($at) -/* 10CF68 802A3958 10440012 */ beq $v0, $a0, .L802A39A4 -/* 10CF6C 802A395C 240C000B */ li $t4, 11 -/* 10CF70 802A3960 24010002 */ li $at, 2 -/* 10CF74 802A3964 10410013 */ beq $v0, $at, .L802A39B4 -/* 10CF78 802A3968 240D000C */ li $t5, 12 -/* 10CF7C 802A396C 24010003 */ li $at, 3 -/* 10CF80 802A3970 10410014 */ beq $v0, $at, .L802A39C4 -/* 10CF84 802A3974 240E000D */ li $t6, 13 -/* 10CF88 802A3978 10000016 */ b .L802A39D4 -/* 10CF8C 802A397C 8FBF0014 */ lw $ra, 0x14($sp) -.L802A3980: -/* 10CF90 802A3980 3C02800F */ lui $v0, %hi(D_800E86A0) # $v0, 0x800f -/* 10CF94 802A3984 244286A0 */ addiu $v0, %lo(D_800E86A0) # addiu $v0, $v0, -0x7960 -/* 10CF98 802A3988 8C4A0000 */ lw $t2, ($v0) -/* 10CF9C 802A398C 24010008 */ li $at, 8 -/* 10CFA0 802A3990 240B000A */ li $t3, 10 -/* 10CFA4 802A3994 5141000F */ beql $t2, $at, .L802A39D4 -/* 10CFA8 802A3998 8FBF0014 */ lw $ra, 0x14($sp) -/* 10CFAC 802A399C 1000000C */ b .L802A39D0 -/* 10CFB0 802A39A0 AC4B0000 */ sw $t3, ($v0) -.L802A39A4: -/* 10CFB4 802A39A4 3C02800F */ lui $v0, %hi(D_800E86A0) # $v0, 0x800f -/* 10CFB8 802A39A8 244286A0 */ addiu $v0, %lo(D_800E86A0) # addiu $v0, $v0, -0x7960 -/* 10CFBC 802A39AC 10000008 */ b .L802A39D0 -/* 10CFC0 802A39B0 AC4C0000 */ sw $t4, ($v0) -.L802A39B4: -/* 10CFC4 802A39B4 3C02800F */ lui $v0, %hi(D_800E86A0) # $v0, 0x800f -/* 10CFC8 802A39B8 244286A0 */ addiu $v0, %lo(D_800E86A0) # addiu $v0, $v0, -0x7960 -/* 10CFCC 802A39BC 10000004 */ b .L802A39D0 -/* 10CFD0 802A39C0 AC4D0000 */ sw $t5, ($v0) -.L802A39C4: -/* 10CFD4 802A39C4 3C02800F */ lui $v0, %hi(D_800E86A0) # $v0, 0x800f -/* 10CFD8 802A39C8 244286A0 */ addiu $v0, %lo(D_800E86A0) # addiu $v0, $v0, -0x7960 -/* 10CFDC 802A39CC AC4E0000 */ sw $t6, ($v0) -.L802A39D0: -/* 10CFE0 802A39D0 8FBF0014 */ lw $ra, 0x14($sp) -.L802A39D4: -/* 10CFE4 802A39D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 10CFE8 802A39D8 03E00008 */ jr $ra -/* 10CFEC 802A39DC 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A39E0.s b/asm/non_matchings/code_802A3730/func_802A39E0.s deleted file mode 100644 index bde4dbe56..000000000 --- a/asm/non_matchings/code_802A3730/func_802A39E0.s +++ /dev/null @@ -1,189 +0,0 @@ -glabel func_802A39E0 -/* 10CFF0 802A39E0 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 10CFF4 802A39E4 AFB1000C */ sw $s1, 0xc($sp) -/* 10CFF8 802A39E8 AFB00008 */ sw $s0, 8($sp) -/* 10CFFC 802A39EC 8483002C */ lh $v1, 0x2c($a0) -/* 10D000 802A39F0 8486002E */ lh $a2, 0x2e($a0) -/* 10D004 802A39F4 84820030 */ lh $v0, 0x30($a0) -/* 10D008 802A39F8 04610003 */ bgez $v1, .L802A3A08 -/* 10D00C 802A39FC 00037043 */ sra $t6, $v1, 1 -/* 10D010 802A3A00 24610001 */ addiu $at, $v1, 1 -/* 10D014 802A3A04 00017043 */ sra $t6, $at, 1 -.L802A3A08: -/* 10D018 802A3A08 84850032 */ lh $a1, 0x32($a0) -/* 10D01C 802A3A0C 01C01825 */ move $v1, $t6 -/* 10D020 802A3A10 004E8023 */ subu $s0, $v0, $t6 -/* 10D024 802A3A14 04C10003 */ bgez $a2, .L802A3A24 -/* 10D028 802A3A18 00067843 */ sra $t7, $a2, 1 -/* 10D02C 802A3A1C 24C10001 */ addiu $at, $a2, 1 -/* 10D030 802A3A20 00017843 */ sra $t7, $at, 1 -.L802A3A24: -/* 10D034 802A3A24 00435821 */ addu $t3, $v0, $v1 -/* 10D038 802A3A28 00AF8823 */ subu $s1, $a1, $t7 -/* 10D03C 802A3A2C 06010002 */ bgez $s0, .L802A3A38 -/* 10D040 802A3A30 00AF6021 */ addu $t4, $a1, $t7 -/* 10D044 802A3A34 00008025 */ move $s0, $zero -.L802A3A38: -/* 10D048 802A3A38 06210002 */ bgez $s1, .L802A3A44 -/* 10D04C 802A3A3C 29610141 */ slti $at, $t3, 0x141 -/* 10D050 802A3A40 00008825 */ move $s1, $zero -.L802A3A44: -/* 10D054 802A3A44 14200002 */ bnez $at, .L802A3A50 -/* 10D058 802A3A48 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10D05C 802A3A4C 240B0140 */ li $t3, 320 -.L802A3A50: -/* 10D060 802A3A50 298100F1 */ slti $at, $t4, 0xf1 -/* 10D064 802A3A54 14200002 */ bnez $at, .L802A3A60 -/* 10D068 802A3A58 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10D06C 802A3A5C 240C00F0 */ li $t4, 240 -.L802A3A60: -/* 10D070 802A3A60 020B082A */ slt $at, $s0, $t3 -/* 10D074 802A3A64 14200002 */ bnez $at, .L802A3A70 -/* 10D078 802A3A68 3C19E700 */ lui $t9, 0xe700 -/* 10D07C 802A3A6C 260B0002 */ addiu $t3, $s0, 2 -.L802A3A70: -/* 10D080 802A3A70 022C082A */ slt $at, $s1, $t4 -/* 10D084 802A3A74 14200002 */ bnez $at, .L802A3A80 -/* 10D088 802A3A78 3C0FBA00 */ lui $t7, (0xBA001402 >> 16) # lui $t7, 0xba00 -/* 10D08C 802A3A7C 262C0002 */ addiu $t4, $s1, 2 -.L802A3A80: -/* 10D090 802A3A80 8C620000 */ lw $v0, ($v1) -/* 10D094 802A3A84 35EF1402 */ ori $t7, (0xBA001402 & 0xFFFF) # ori $t7, $t7, 0x1402 -/* 10D098 802A3A88 44902000 */ mtc1 $s0, $f4 -/* 10D09C 802A3A8C 24580008 */ addiu $t8, $v0, 8 -/* 10D0A0 802A3A90 AC780000 */ sw $t8, ($v1) -/* 10D0A4 802A3A94 AC400004 */ sw $zero, 4($v0) -/* 10D0A8 802A3A98 AC590000 */ sw $t9, ($v0) -/* 10D0AC 802A3A9C 8C620000 */ lw $v0, ($v1) -/* 10D0B0 802A3AA0 3C180030 */ lui $t8, 0x30 -/* 10D0B4 802A3AA4 468021A0 */ cvt.s.w $f6, $f4 -/* 10D0B8 802A3AA8 244E0008 */ addiu $t6, $v0, 8 -/* 10D0BC 802A3AAC AC6E0000 */ sw $t6, ($v1) -/* 10D0C0 802A3AB0 AC580004 */ sw $t8, 4($v0) -/* 10D0C4 802A3AB4 AC4F0000 */ sw $t7, ($v0) -/* 10D0C8 802A3AB8 8C620000 */ lw $v0, ($v1) -/* 10D0CC 802A3ABC 3C0EFE00 */ lui $t6, 0xfe00 -/* 10D0D0 802A3AC0 3C0F8015 */ lui $t7, %hi(D_801502B4) # $t7, 0x8015 -/* 10D0D4 802A3AC4 24590008 */ addiu $t9, $v0, 8 -/* 10D0D8 802A3AC8 AC790000 */ sw $t9, ($v1) -/* 10D0DC 802A3ACC AC4E0000 */ sw $t6, ($v0) -/* 10D0E0 802A3AD0 8DEF02B4 */ lw $t7, %lo(D_801502B4)($t7) -/* 10D0E4 802A3AD4 3C19FF10 */ lui $t9, (0xFF10013F >> 16) # lui $t9, 0xff10 -/* 10D0E8 802A3AD8 3739013F */ ori $t9, (0xFF10013F & 0xFFFF) # ori $t9, $t9, 0x13f -/* 10D0EC 802A3ADC AC4F0004 */ sw $t7, 4($v0) -/* 10D0F0 802A3AE0 8C620000 */ lw $v0, ($v1) -/* 10D0F4 802A3AE4 3C0E8015 */ lui $t6, %hi(D_801502B4) # $t6, 0x8015 -/* 10D0F8 802A3AE8 44918000 */ mtc1 $s1, $f16 -/* 10D0FC 802A3AEC 24580008 */ addiu $t8, $v0, 8 -/* 10D100 802A3AF0 AC780000 */ sw $t8, ($v1) -/* 10D104 802A3AF4 AC590000 */ sw $t9, ($v0) -/* 10D108 802A3AF8 8DCE02B4 */ lw $t6, %lo(D_801502B4)($t6) -/* 10D10C 802A3AFC 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 10D110 802A3B00 44810000 */ mtc1 $at, $f0 -/* 10D114 802A3B04 AC4E0004 */ sw $t6, 4($v0) -/* 10D118 802A3B08 8C620000 */ lw $v0, ($v1) -/* 10D11C 802A3B0C 468084A0 */ cvt.s.w $f18, $f16 -/* 10D120 802A3B10 46003202 */ mul.s $f8, $f6, $f0 -/* 10D124 802A3B14 244F0008 */ addiu $t7, $v0, 8 -/* 10D128 802A3B18 AC6F0000 */ sw $t7, ($v1) -/* 10D12C 802A3B1C 3C19FFFC */ lui $t9, (0xFFFCFFFC >> 16) # lui $t9, 0xfffc -/* 10D130 802A3B20 3739FFFC */ ori $t9, (0xFFFCFFFC & 0xFFFF) # ori $t9, $t9, 0xfffc -/* 10D134 802A3B24 3C18F700 */ lui $t8, 0xf700 -/* 10D138 802A3B28 AC580000 */ sw $t8, ($v0) -/* 10D13C 802A3B2C AC590004 */ sw $t9, 4($v0) -/* 10D140 802A3B30 8C620000 */ lw $v0, ($v1) -/* 10D144 802A3B34 46009102 */ mul.s $f4, $f18, $f0 -/* 10D148 802A3B38 4600428D */ trunc.w.s $f10, $f8 -/* 10D14C 802A3B3C 244E0008 */ addiu $t6, $v0, 8 -/* 10D150 802A3B40 AC6E0000 */ sw $t6, ($v1) -/* 10D154 802A3B44 3C0FE700 */ lui $t7, 0xe700 -/* 10D158 802A3B48 AC4F0000 */ sw $t7, ($v0) -/* 10D15C 802A3B4C AC400004 */ sw $zero, 4($v0) -/* 10D160 802A3B50 8C620000 */ lw $v0, ($v1) -/* 10D164 802A3B54 448B4000 */ mtc1 $t3, $f8 -/* 10D168 802A3B58 440E5000 */ mfc1 $t6, $f10 -/* 10D16C 802A3B5C 4600218D */ trunc.w.s $f6, $f4 -/* 10D170 802A3B60 24580008 */ addiu $t8, $v0, 8 -/* 10D174 802A3B64 448C2000 */ mtc1 $t4, $f4 -/* 10D178 802A3B68 468042A0 */ cvt.s.w $f10, $f8 -/* 10D17C 802A3B6C AC780000 */ sw $t8, ($v1) -/* 10D180 802A3B70 31CF0FFF */ andi $t7, $t6, 0xfff -/* 10D184 802A3B74 000FC300 */ sll $t8, $t7, 0xc -/* 10D188 802A3B78 440F3000 */ mfc1 $t7, $f6 -/* 10D18C 802A3B7C 468021A0 */ cvt.s.w $f6, $f4 -/* 10D190 802A3B80 46005402 */ mul.s $f16, $f10, $f0 -/* 10D194 802A3B84 3C01ED00 */ lui $at, 0xed00 -/* 10D198 802A3B88 0301C825 */ or $t9, $t8, $at -/* 10D19C 802A3B8C 31F80FFF */ andi $t8, $t7, 0xfff -/* 10D1A0 802A3B90 03387025 */ or $t6, $t9, $t8 -/* 10D1A4 802A3B94 46003202 */ mul.s $f8, $f6, $f0 -/* 10D1A8 802A3B98 AC4E0000 */ sw $t6, ($v0) -/* 10D1AC 802A3B9C 3C01F600 */ lui $at, 0xf600 -/* 10D1B0 802A3BA0 4600848D */ trunc.w.s $f18, $f16 -/* 10D1B4 802A3BA4 4600428D */ trunc.w.s $f10, $f8 -/* 10D1B8 802A3BA8 44199000 */ mfc1 $t9, $f18 -/* 10D1BC 802A3BAC 00000000 */ nop -/* 10D1C0 802A3BB0 33380FFF */ andi $t8, $t9, 0xfff -/* 10D1C4 802A3BB4 44195000 */ mfc1 $t9, $f10 -/* 10D1C8 802A3BB8 00187300 */ sll $t6, $t8, 0xc -/* 10D1CC 802A3BBC 33380FFF */ andi $t8, $t9, 0xfff -/* 10D1D0 802A3BC0 01D87825 */ or $t7, $t6, $t8 -/* 10D1D4 802A3BC4 AC4F0004 */ sw $t7, 4($v0) -/* 10D1D8 802A3BC8 8C620000 */ lw $v0, ($v1) -/* 10D1DC 802A3BCC 256EFFFF */ addiu $t6, $t3, -1 -/* 10D1E0 802A3BD0 31D803FF */ andi $t8, $t6, 0x3ff -/* 10D1E4 802A3BD4 00187B80 */ sll $t7, $t8, 0xe -/* 10D1E8 802A3BD8 24590008 */ addiu $t9, $v0, 8 -/* 10D1EC 802A3BDC AC790000 */ sw $t9, ($v1) -/* 10D1F0 802A3BE0 258EFFFF */ addiu $t6, $t4, -1 -/* 10D1F4 802A3BE4 31D803FF */ andi $t8, $t6, 0x3ff -/* 10D1F8 802A3BE8 01E1C825 */ or $t9, $t7, $at -/* 10D1FC 802A3BEC 00187880 */ sll $t7, $t8, 2 -/* 10D200 802A3BF0 032F7025 */ or $t6, $t9, $t7 -/* 10D204 802A3BF4 322F03FF */ andi $t7, $s1, 0x3ff -/* 10D208 802A3BF8 321803FF */ andi $t8, $s0, 0x3ff -/* 10D20C 802A3BFC AC4E0000 */ sw $t6, ($v0) -/* 10D210 802A3C00 000F7080 */ sll $t6, $t7, 2 -/* 10D214 802A3C04 0018CB80 */ sll $t9, $t8, 0xe -/* 10D218 802A3C08 032EC025 */ or $t8, $t9, $t6 -/* 10D21C 802A3C0C AC580004 */ sw $t8, 4($v0) -/* 10D220 802A3C10 8C620000 */ lw $v0, ($v1) -/* 10D224 802A3C14 3C19E700 */ lui $t9, 0xe700 -/* 10D228 802A3C18 3C18FF10 */ lui $t8, (0xFF10013F >> 16) # lui $t8, 0xff10 -/* 10D22C 802A3C1C 244F0008 */ addiu $t7, $v0, 8 -/* 10D230 802A3C20 AC6F0000 */ sw $t7, ($v1) -/* 10D234 802A3C24 AC400004 */ sw $zero, 4($v0) -/* 10D238 802A3C28 AC590000 */ sw $t9, ($v0) -/* 10D23C 802A3C2C 8C620000 */ lw $v0, ($v1) -/* 10D240 802A3C30 3718013F */ ori $t8, (0xFF10013F & 0xFFFF) # ori $t8, $t8, 0x13f -/* 10D244 802A3C34 3C0F800E */ lui $t7, %hi(sRenderingFramebuffer) # $t7, 0x800e -/* 10D248 802A3C38 244E0008 */ addiu $t6, $v0, 8 -/* 10D24C 802A3C3C AC6E0000 */ sw $t6, ($v1) -/* 10D250 802A3C40 AC580000 */ sw $t8, ($v0) -/* 10D254 802A3C44 95EFC560 */ lhu $t7, %lo(sRenderingFramebuffer)($t7) -/* 10D258 802A3C48 3C0E8015 */ lui $t6, %hi(gPhysicalFramebuffers) -/* 10D25C 802A3C4C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10D260 802A3C50 000FC880 */ sll $t9, $t7, 2 -/* 10D264 802A3C54 01D97021 */ addu $t6, $t6, $t9 -/* 10D268 802A3C58 8DCE02A8 */ lw $t6, %lo(gPhysicalFramebuffers)($t6) -/* 10D26C 802A3C5C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10D270 802A3C60 3C19BA00 */ lui $t9, (0xBA001402 >> 16) # lui $t9, 0xba00 -/* 10D274 802A3C64 01C1C024 */ and $t8, $t6, $at -/* 10D278 802A3C68 AC580004 */ sw $t8, 4($v0) -/* 10D27C 802A3C6C 8C620000 */ lw $v0, ($v1) -/* 10D280 802A3C70 37391402 */ ori $t9, (0xBA001402 & 0xFFFF) # ori $t9, $t9, 0x1402 -/* 10D284 802A3C74 3C18B900 */ lui $t8, (0xB9000201 >> 16) # lui $t8, 0xb900 -/* 10D288 802A3C78 244F0008 */ addiu $t7, $v0, 8 -/* 10D28C 802A3C7C AC6F0000 */ sw $t7, ($v1) -/* 10D290 802A3C80 AC400004 */ sw $zero, 4($v0) -/* 10D294 802A3C84 AC590000 */ sw $t9, ($v0) -/* 10D298 802A3C88 8C620000 */ lw $v0, ($v1) -/* 10D29C 802A3C8C 37180201 */ ori $t8, (0xB9000201 & 0xFFFF) # ori $t8, $t8, 0x201 -/* 10D2A0 802A3C90 244E0008 */ addiu $t6, $v0, 8 -/* 10D2A4 802A3C94 AC6E0000 */ sw $t6, ($v1) -/* 10D2A8 802A3C98 AC400004 */ sw $zero, 4($v0) -/* 10D2AC 802A3C9C AC580000 */ sw $t8, ($v0) -/* 10D2B0 802A3CA0 8FB1000C */ lw $s1, 0xc($sp) -/* 10D2B4 802A3CA4 8FB00008 */ lw $s0, 8($sp) -/* 10D2B8 802A3CA8 03E00008 */ jr $ra -/* 10D2BC 802A3CAC 27BD0010 */ addiu $sp, $sp, 0x10 diff --git a/asm/non_matchings/code_802A3730/func_802A3CB0.s b/asm/non_matchings/code_802A3730/func_802A3CB0.s deleted file mode 100644 index dc61d74d6..000000000 --- a/asm/non_matchings/code_802A3730/func_802A3CB0.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_802A3CB0 -/* 10D2C0 802A3CB0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10D2C4 802A3CB4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10D2C8 802A3CB8 8C620000 */ lw $v0, ($v1) -/* 10D2CC 802A3CBC 3C0FE700 */ lui $t7, 0xe700 -/* 10D2D0 802A3CC0 3C19BA00 */ lui $t9, (0xBA001402 >> 16) # lui $t9, 0xba00 -/* 10D2D4 802A3CC4 244E0008 */ addiu $t6, $v0, 8 -/* 10D2D8 802A3CC8 AC6E0000 */ sw $t6, ($v1) -/* 10D2DC 802A3CCC AC400004 */ sw $zero, 4($v0) -/* 10D2E0 802A3CD0 AC4F0000 */ sw $t7, ($v0) -/* 10D2E4 802A3CD4 8C620000 */ lw $v0, ($v1) -/* 10D2E8 802A3CD8 3C0E0030 */ lui $t6, 0x30 -/* 10D2EC 802A3CDC 37391402 */ ori $t9, (0xBA001402 & 0xFFFF) # ori $t9, $t9, 0x1402 -/* 10D2F0 802A3CE0 24580008 */ addiu $t8, $v0, 8 -/* 10D2F4 802A3CE4 AC780000 */ sw $t8, ($v1) -/* 10D2F8 802A3CE8 AC4E0004 */ sw $t6, 4($v0) -/* 10D2FC 802A3CEC AC590000 */ sw $t9, ($v0) -/* 10D300 802A3CF0 8C620000 */ lw $v0, ($v1) -/* 10D304 802A3CF4 3C18FE00 */ lui $t8, 0xfe00 -/* 10D308 802A3CF8 3C198015 */ lui $t9, %hi(D_801502B4) # $t9, 0x8015 -/* 10D30C 802A3CFC 244F0008 */ addiu $t7, $v0, 8 -/* 10D310 802A3D00 AC6F0000 */ sw $t7, ($v1) -/* 10D314 802A3D04 AC580000 */ sw $t8, ($v0) -/* 10D318 802A3D08 8F3902B4 */ lw $t9, %lo(D_801502B4)($t9) -/* 10D31C 802A3D0C 3C0FFF10 */ lui $t7, (0xFF10013F >> 16) # lui $t7, 0xff10 -/* 10D320 802A3D10 35EF013F */ ori $t7, (0xFF10013F & 0xFFFF) # ori $t7, $t7, 0x13f -/* 10D324 802A3D14 AC590004 */ sw $t9, 4($v0) -/* 10D328 802A3D18 8C620000 */ lw $v0, ($v1) -/* 10D32C 802A3D1C 3C188015 */ lui $t8, %hi(D_801502B4) # $t8, 0x8015 -/* 10D330 802A3D20 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10D334 802A3D24 244E0008 */ addiu $t6, $v0, 8 -/* 10D338 802A3D28 AC6E0000 */ sw $t6, ($v1) -/* 10D33C 802A3D2C AC4F0000 */ sw $t7, ($v0) -/* 10D340 802A3D30 8F1802B4 */ lw $t8, %lo(D_801502B4)($t8) -/* 10D344 802A3D34 3C0FFFFC */ lui $t7, (0xFFFCFFFC >> 16) # lui $t7, 0xfffc -/* 10D348 802A3D38 35EFFFFC */ ori $t7, (0xFFFCFFFC & 0xFFFF) # ori $t7, $t7, 0xfffc -/* 10D34C 802A3D3C AC580004 */ sw $t8, 4($v0) -/* 10D350 802A3D40 8C620000 */ lw $v0, ($v1) -/* 10D354 802A3D44 3C0EF700 */ lui $t6, 0xf700 -/* 10D358 802A3D48 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10D35C 802A3D4C 24590008 */ addiu $t9, $v0, 8 -/* 10D360 802A3D50 AC790000 */ sw $t9, ($v1) -/* 10D364 802A3D54 AC4F0004 */ sw $t7, 4($v0) -/* 10D368 802A3D58 AC4E0000 */ sw $t6, ($v0) -/* 10D36C 802A3D5C 8C620000 */ lw $v0, ($v1) -/* 10D370 802A3D60 3C19E700 */ lui $t9, 0xe700 -/* 10D374 802A3D64 3C0FED00 */ lui $t7, 0xed00 -/* 10D378 802A3D68 24580008 */ addiu $t8, $v0, 8 -/* 10D37C 802A3D6C AC780000 */ sw $t8, ($v1) -/* 10D380 802A3D70 AC400004 */ sw $zero, 4($v0) -/* 10D384 802A3D74 AC590000 */ sw $t9, ($v0) -/* 10D388 802A3D78 8C620000 */ lw $v0, ($v1) -/* 10D38C 802A3D7C 3C180050 */ lui $t8, (0x005003C0 >> 16) # lui $t8, 0x50 -/* 10D390 802A3D80 371803C0 */ ori $t8, (0x005003C0 & 0xFFFF) # ori $t8, $t8, 0x3c0 -/* 10D394 802A3D84 244E0008 */ addiu $t6, $v0, 8 -/* 10D398 802A3D88 AC6E0000 */ sw $t6, ($v1) -/* 10D39C 802A3D8C AC580004 */ sw $t8, 4($v0) -/* 10D3A0 802A3D90 AC4F0000 */ sw $t7, ($v0) -/* 10D3A4 802A3D94 8C620000 */ lw $v0, ($v1) -/* 10D3A8 802A3D98 3C0EF64F */ lui $t6, (0xF64FC3BC >> 16) # lui $t6, 0xf64f -/* 10D3AC 802A3D9C 35CEC3BC */ ori $t6, (0xF64FC3BC & 0xFFFF) # ori $t6, $t6, 0xc3bc -/* 10D3B0 802A3DA0 24590008 */ addiu $t9, $v0, 8 -/* 10D3B4 802A3DA4 AC790000 */ sw $t9, ($v1) -/* 10D3B8 802A3DA8 AC400004 */ sw $zero, 4($v0) -/* 10D3BC 802A3DAC AC4E0000 */ sw $t6, ($v0) -/* 10D3C0 802A3DB0 8C620000 */ lw $v0, ($v1) -/* 10D3C4 802A3DB4 3C18E700 */ lui $t8, 0xe700 -/* 10D3C8 802A3DB8 3C0EFF10 */ lui $t6, (0xFF10013F >> 16) # lui $t6, 0xff10 -/* 10D3CC 802A3DBC 244F0008 */ addiu $t7, $v0, 8 -/* 10D3D0 802A3DC0 AC6F0000 */ sw $t7, ($v1) -/* 10D3D4 802A3DC4 AC400004 */ sw $zero, 4($v0) -/* 10D3D8 802A3DC8 AC580000 */ sw $t8, ($v0) -/* 10D3DC 802A3DCC 8C620000 */ lw $v0, ($v1) -/* 10D3E0 802A3DD0 35CE013F */ ori $t6, (0xFF10013F & 0xFFFF) # ori $t6, $t6, 0x13f -/* 10D3E4 802A3DD4 3C0F800E */ lui $t7, %hi(sRenderingFramebuffer) # $t7, 0x800e -/* 10D3E8 802A3DD8 24590008 */ addiu $t9, $v0, 8 -/* 10D3EC 802A3DDC AC790000 */ sw $t9, ($v1) -/* 10D3F0 802A3DE0 AC4E0000 */ sw $t6, ($v0) -/* 10D3F4 802A3DE4 95EFC560 */ lhu $t7, %lo(sRenderingFramebuffer)($t7) -/* 10D3F8 802A3DE8 3C198015 */ lui $t9, %hi(gPhysicalFramebuffers) # 0x8015 -/* 10D3FC 802A3DEC 000FC080 */ sll $t8, $t7, 2 -/* 10D400 802A3DF0 0338C821 */ addu $t9, $t9, $t8 -/* 10D404 802A3DF4 8F3902A8 */ lw $t9, %lo(gPhysicalFramebuffers)($t9) -/* 10D408 802A3DF8 3C18BA00 */ lui $t8, (0xBA001402 >> 16) # lui $t8, 0xba00 -/* 10D40C 802A3DFC 37181402 */ ori $t8, (0xBA001402 & 0xFFFF) # ori $t8, $t8, 0x1402 -/* 10D410 802A3E00 03217024 */ and $t6, $t9, $at -/* 10D414 802A3E04 AC4E0004 */ sw $t6, 4($v0) -/* 10D418 802A3E08 8C620000 */ lw $v0, ($v1) -/* 10D41C 802A3E0C 3C0EB900 */ lui $t6, (0xB9000201 >> 16) # lui $t6, 0xb900 -/* 10D420 802A3E10 35CE0201 */ ori $t6, (0xB9000201 & 0xFFFF) # ori $t6, $t6, 0x201 -/* 10D424 802A3E14 244F0008 */ addiu $t7, $v0, 8 -/* 10D428 802A3E18 AC6F0000 */ sw $t7, ($v1) -/* 10D42C 802A3E1C AC400004 */ sw $zero, 4($v0) -/* 10D430 802A3E20 AC580000 */ sw $t8, ($v0) -/* 10D434 802A3E24 8C620000 */ lw $v0, ($v1) -/* 10D438 802A3E28 24590008 */ addiu $t9, $v0, 8 -/* 10D43C 802A3E2C AC790000 */ sw $t9, ($v1) -/* 10D440 802A3E30 AC400004 */ sw $zero, 4($v0) -/* 10D444 802A3E34 03E00008 */ jr $ra -/* 10D448 802A3E38 AC4E0000 */ sw $t6, ($v0) diff --git a/asm/non_matchings/code_802A3730/func_802A3E3C.s b/asm/non_matchings/code_802A3730/func_802A3E3C.s deleted file mode 100644 index 9b8d0d6c8..000000000 --- a/asm/non_matchings/code_802A3730/func_802A3E3C.s +++ /dev/null @@ -1,211 +0,0 @@ -glabel func_802A3E3C -/* 10D44C 802A3E3C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10D450 802A3E40 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10D454 802A3E44 8C620000 */ lw $v0, ($v1) -/* 10D458 802A3E48 3C0FE700 */ lui $t7, 0xe700 -/* 10D45C 802A3E4C 3C19BA00 */ lui $t9, (0xBA001701 >> 16) # lui $t9, 0xba00 -/* 10D460 802A3E50 244E0008 */ addiu $t6, $v0, 8 -/* 10D464 802A3E54 AC6E0000 */ sw $t6, ($v1) -/* 10D468 802A3E58 AC400004 */ sw $zero, 4($v0) -/* 10D46C 802A3E5C AC4F0000 */ sw $t7, ($v0) -/* 10D470 802A3E60 8C620000 */ lw $v0, ($v1) -/* 10D474 802A3E64 3C0E0080 */ lui $t6, 0x80 -/* 10D478 802A3E68 37391701 */ ori $t9, (0xBA001701 & 0xFFFF) # ori $t9, $t9, 0x1701 -/* 10D47C 802A3E6C 24580008 */ addiu $t8, $v0, 8 -/* 10D480 802A3E70 AC780000 */ sw $t8, ($v1) -/* 10D484 802A3E74 AC4E0004 */ sw $t6, 4($v0) -/* 10D488 802A3E78 AC590000 */ sw $t9, ($v0) -/* 10D48C 802A3E7C 8C620000 */ lw $v0, ($v1) -/* 10D490 802A3E80 3C190050 */ lui $t9, (0x005003C0 >> 16) # lui $t9, 0x50 -/* 10D494 802A3E84 373903C0 */ ori $t9, (0x005003C0 & 0xFFFF) # ori $t9, $t9, 0x3c0 -/* 10D498 802A3E88 244F0008 */ addiu $t7, $v0, 8 -/* 10D49C 802A3E8C AC6F0000 */ sw $t7, ($v1) -/* 10D4A0 802A3E90 3C18ED00 */ lui $t8, 0xed00 -/* 10D4A4 802A3E94 AC580000 */ sw $t8, ($v0) -/* 10D4A8 802A3E98 AC590004 */ sw $t9, 4($v0) -/* 10D4AC 802A3E9C 8C620000 */ lw $v0, ($v1) -/* 10D4B0 802A3EA0 3C18FFFE */ lui $t8, (0xFFFE793C >> 16) # lui $t8, 0xfffe -/* 10D4B4 802A3EA4 3C0FFCFF */ lui $t7, (0xFCFFFFFF >> 16) # lui $t7, 0xfcff -/* 10D4B8 802A3EA8 244E0008 */ addiu $t6, $v0, 8 -/* 10D4BC 802A3EAC AC6E0000 */ sw $t6, ($v1) -/* 10D4C0 802A3EB0 35EFFFFF */ ori $t7, (0xFCFFFFFF & 0xFFFF) # ori $t7, $t7, 0xffff -/* 10D4C4 802A3EB4 3718793C */ ori $t8, (0xFFFE793C & 0xFFFF) # ori $t8, $t8, 0x793c -/* 10D4C8 802A3EB8 AC580004 */ sw $t8, 4($v0) -/* 10D4CC 802A3EBC AC4F0000 */ sw $t7, ($v0) -/* 10D4D0 802A3EC0 8C620000 */ lw $v0, ($v1) -/* 10D4D4 802A3EC4 3C0EBA00 */ lui $t6, (0xBA001001 >> 16) # lui $t6, 0xba00 -/* 10D4D8 802A3EC8 35CE1001 */ ori $t6, (0xBA001001 & 0xFFFF) # ori $t6, $t6, 0x1001 -/* 10D4DC 802A3ECC 24590008 */ addiu $t9, $v0, 8 -/* 10D4E0 802A3ED0 AC790000 */ sw $t9, ($v1) -/* 10D4E4 802A3ED4 AC400004 */ sw $zero, 4($v0) -/* 10D4E8 802A3ED8 AC4E0000 */ sw $t6, ($v0) -/* 10D4EC 802A3EDC 8C620000 */ lw $v0, ($v1) -/* 10D4F0 802A3EE0 3C18BA00 */ lui $t8, (0xBA000E02 >> 16) # lui $t8, 0xba00 -/* 10D4F4 802A3EE4 37180E02 */ ori $t8, (0xBA000E02 & 0xFFFF) # ori $t8, $t8, 0xe02 -/* 10D4F8 802A3EE8 244F0008 */ addiu $t7, $v0, 8 -/* 10D4FC 802A3EEC AC6F0000 */ sw $t7, ($v1) -/* 10D500 802A3EF0 AC400004 */ sw $zero, 4($v0) -/* 10D504 802A3EF4 AC580000 */ sw $t8, ($v0) -/* 10D508 802A3EF8 8C620000 */ lw $v0, ($v1) -/* 10D50C 802A3EFC 3C0EBA00 */ lui $t6, (0xBA001102 >> 16) # lui $t6, 0xba00 -/* 10D510 802A3F00 35CE1102 */ ori $t6, (0xBA001102 & 0xFFFF) # ori $t6, $t6, 0x1102 -/* 10D514 802A3F04 24590008 */ addiu $t9, $v0, 8 -/* 10D518 802A3F08 AC790000 */ sw $t9, ($v1) -/* 10D51C 802A3F0C AC400004 */ sw $zero, 4($v0) -/* 10D520 802A3F10 AC4E0000 */ sw $t6, ($v0) -/* 10D524 802A3F14 8C620000 */ lw $v0, ($v1) -/* 10D528 802A3F18 3C18BA00 */ lui $t8, (0xBA001301 >> 16) # lui $t8, 0xba00 -/* 10D52C 802A3F1C 37181301 */ ori $t8, (0xBA001301 & 0xFFFF) # ori $t8, $t8, 0x1301 -/* 10D530 802A3F20 244F0008 */ addiu $t7, $v0, 8 -/* 10D534 802A3F24 AC6F0000 */ sw $t7, ($v1) -/* 10D538 802A3F28 3C190008 */ lui $t9, 8 -/* 10D53C 802A3F2C AC590004 */ sw $t9, 4($v0) -/* 10D540 802A3F30 AC580000 */ sw $t8, ($v0) -/* 10D544 802A3F34 8C620000 */ lw $v0, ($v1) -/* 10D548 802A3F38 3C0FBA00 */ lui $t7, (0xBA000C02 >> 16) # lui $t7, 0xba00 -/* 10D54C 802A3F3C 35EF0C02 */ ori $t7, (0xBA000C02 & 0xFFFF) # ori $t7, $t7, 0xc02 -/* 10D550 802A3F40 244E0008 */ addiu $t6, $v0, 8 -/* 10D554 802A3F44 AC6E0000 */ sw $t6, ($v1) -/* 10D558 802A3F48 24182000 */ li $t8, 8192 -/* 10D55C 802A3F4C AC580004 */ sw $t8, 4($v0) -/* 10D560 802A3F50 AC4F0000 */ sw $t7, ($v0) -/* 10D564 802A3F54 8C620000 */ lw $v0, ($v1) -/* 10D568 802A3F58 3C0EBA00 */ lui $t6, (0xBA000903 >> 16) # lui $t6, 0xba00 -/* 10D56C 802A3F5C 35CE0903 */ ori $t6, (0xBA000903 & 0xFFFF) # ori $t6, $t6, 0x903 -/* 10D570 802A3F60 24590008 */ addiu $t9, $v0, 8 -/* 10D574 802A3F64 AC790000 */ sw $t9, ($v1) -/* 10D578 802A3F68 240F0C00 */ li $t7, 3072 -/* 10D57C 802A3F6C AC4F0004 */ sw $t7, 4($v0) -/* 10D580 802A3F70 AC4E0000 */ sw $t6, ($v0) -/* 10D584 802A3F74 8C620000 */ lw $v0, ($v1) -/* 10D588 802A3F78 3C19BA00 */ lui $t9, (0xBA000801 >> 16) # lui $t9, 0xba00 -/* 10D58C 802A3F7C 37390801 */ ori $t9, (0xBA000801 & 0xFFFF) # ori $t9, $t9, 0x801 -/* 10D590 802A3F80 24580008 */ addiu $t8, $v0, 8 -/* 10D594 802A3F84 AC780000 */ sw $t8, ($v1) -/* 10D598 802A3F88 AC400004 */ sw $zero, 4($v0) -/* 10D59C 802A3F8C AC590000 */ sw $t9, ($v0) -/* 10D5A0 802A3F90 8C620000 */ lw $v0, ($v1) -/* 10D5A4 802A3F94 3C0FB900 */ lui $t7, (0xB9000002 >> 16) # lui $t7, 0xb900 -/* 10D5A8 802A3F98 35EF0002 */ ori $t7, (0xB9000002 & 0xFFFF) # ori $t7, $t7, 2 -/* 10D5AC 802A3F9C 244E0008 */ addiu $t6, $v0, 8 -/* 10D5B0 802A3FA0 AC6E0000 */ sw $t6, ($v1) -/* 10D5B4 802A3FA4 AC400004 */ sw $zero, 4($v0) -/* 10D5B8 802A3FA8 AC4F0000 */ sw $t7, ($v0) -/* 10D5BC 802A3FAC 8C620000 */ lw $v0, ($v1) -/* 10D5C0 802A3FB0 3C0E0F0A */ lui $t6, (0x0F0A4000 >> 16) # lui $t6, 0xf0a -/* 10D5C4 802A3FB4 3C19B900 */ lui $t9, (0xB900031D >> 16) # lui $t9, 0xb900 -/* 10D5C8 802A3FB8 24580008 */ addiu $t8, $v0, 8 -/* 10D5CC 802A3FBC AC780000 */ sw $t8, ($v1) -/* 10D5D0 802A3FC0 3739031D */ ori $t9, (0xB900031D & 0xFFFF) # ori $t9, $t9, 0x31d -/* 10D5D4 802A3FC4 35CE4000 */ ori $t6, (0x0F0A4000 & 0xFFFF) # ori $t6, $t6, 0x4000 -/* 10D5D8 802A3FC8 AC4E0004 */ sw $t6, 4($v0) -/* 10D5DC 802A3FCC AC590000 */ sw $t9, ($v0) -/* 10D5E0 802A3FD0 8C620000 */ lw $v0, ($v1) -/* 10D5E4 802A3FD4 3C18C000 */ lui $t8, 0xc000 -/* 10D5E8 802A3FD8 3C0EBA00 */ lui $t6, (0xBA000602 >> 16) # lui $t6, 0xba00 -/* 10D5EC 802A3FDC 244F0008 */ addiu $t7, $v0, 8 -/* 10D5F0 802A3FE0 AC6F0000 */ sw $t7, ($v1) -/* 10D5F4 802A3FE4 AC400004 */ sw $zero, 4($v0) -/* 10D5F8 802A3FE8 AC580000 */ sw $t8, ($v0) -/* 10D5FC 802A3FEC 8C620000 */ lw $v0, ($v1) -/* 10D600 802A3FF0 240F00C0 */ li $t7, 192 -/* 10D604 802A3FF4 35CE0602 */ ori $t6, (0xBA000602 & 0xFFFF) # ori $t6, $t6, 0x602 -/* 10D608 802A3FF8 24590008 */ addiu $t9, $v0, 8 -/* 10D60C 802A3FFC AC790000 */ sw $t9, ($v1) -/* 10D610 802A4000 AC4F0004 */ sw $t7, 4($v0) -/* 10D614 802A4004 AC4E0000 */ sw $t6, ($v0) -/* 10D618 802A4008 8C620000 */ lw $v0, ($v1) -/* 10D61C 802A400C 3C19E700 */ lui $t9, 0xe700 -/* 10D620 802A4010 3C0FBC00 */ lui $t7, (0xBC000404 >> 16) # lui $t7, 0xbc00 -/* 10D624 802A4014 24580008 */ addiu $t8, $v0, 8 -/* 10D628 802A4018 AC780000 */ sw $t8, ($v1) -/* 10D62C 802A401C AC400004 */ sw $zero, 4($v0) -/* 10D630 802A4020 AC590000 */ sw $t9, ($v0) -/* 10D634 802A4024 8C620000 */ lw $v0, ($v1) -/* 10D638 802A4028 24180001 */ li $t8, 1 -/* 10D63C 802A402C 35EF0404 */ ori $t7, (0xBC000404 & 0xFFFF) # ori $t7, $t7, 0x404 -/* 10D640 802A4030 244E0008 */ addiu $t6, $v0, 8 -/* 10D644 802A4034 AC6E0000 */ sw $t6, ($v1) -/* 10D648 802A4038 AC580004 */ sw $t8, 4($v0) -/* 10D64C 802A403C AC4F0000 */ sw $t7, ($v0) -/* 10D650 802A4040 8C620000 */ lw $v0, ($v1) -/* 10D654 802A4044 3C0EBC00 */ lui $t6, (0xBC000C04 >> 16) # lui $t6, 0xbc00 -/* 10D658 802A4048 35CE0C04 */ ori $t6, (0xBC000C04 & 0xFFFF) # ori $t6, $t6, 0xc04 -/* 10D65C 802A404C 24590008 */ addiu $t9, $v0, 8 -/* 10D660 802A4050 AC790000 */ sw $t9, ($v1) -/* 10D664 802A4054 240F0001 */ li $t7, 1 -/* 10D668 802A4058 AC4F0004 */ sw $t7, 4($v0) -/* 10D66C 802A405C AC4E0000 */ sw $t6, ($v0) -/* 10D670 802A4060 8C620000 */ lw $v0, ($v1) -/* 10D674 802A4064 3C19BC00 */ lui $t9, (0xBC001404 >> 16) # lui $t9, 0xbc00 -/* 10D678 802A4068 37391404 */ ori $t9, (0xBC001404 & 0xFFFF) # ori $t9, $t9, 0x1404 -/* 10D67C 802A406C 24580008 */ addiu $t8, $v0, 8 -/* 10D680 802A4070 AC780000 */ sw $t8, ($v1) -/* 10D684 802A4074 340EFFFF */ li $t6, 65535 -/* 10D688 802A4078 AC4E0004 */ sw $t6, 4($v0) -/* 10D68C 802A407C AC590000 */ sw $t9, ($v0) -/* 10D690 802A4080 8C620000 */ lw $v0, ($v1) -/* 10D694 802A4084 3C18BC00 */ lui $t8, (0xBC001C04 >> 16) # lui $t8, 0xbc00 -/* 10D698 802A4088 37181C04 */ ori $t8, (0xBC001C04 & 0xFFFF) # ori $t8, $t8, 0x1c04 -/* 10D69C 802A408C 244F0008 */ addiu $t7, $v0, 8 -/* 10D6A0 802A4090 AC6F0000 */ sw $t7, ($v1) -/* 10D6A4 802A4094 3419FFFF */ li $t9, 65535 -/* 10D6A8 802A4098 AC590004 */ sw $t9, 4($v0) -/* 10D6AC 802A409C 03E00008 */ jr $ra -/* 10D6B0 802A40A0 AC580000 */ sw $t8, ($v0) - -/* 10D6B4 802A40A4 03E00008 */ jr $ra -/* 10D6B8 802A40A8 00000000 */ nop - -/* 10D6BC 802A40AC 03E00008 */ jr $ra -/* 10D6C0 802A40B0 00000000 */ nop - -/* 10D6C4 802A40B4 03E00008 */ jr $ra -/* 10D6C8 802A40B8 00000000 */ nop - -/* 10D6CC 802A40BC 03E00008 */ jr $ra -/* 10D6D0 802A40C0 00000000 */ nop - -/* 10D6D4 802A40C4 03E00008 */ jr $ra -/* 10D6D8 802A40C8 00000000 */ nop - -/* 10D6DC 802A40CC 03E00008 */ jr $ra -/* 10D6E0 802A40D0 00000000 */ nop - -/* 10D6E4 802A40D4 03E00008 */ jr $ra -/* 10D6E8 802A40D8 00000000 */ nop - -/* 10D6EC 802A40DC 03E00008 */ jr $ra -/* 10D6F0 802A40E0 00000000 */ nop - -/* 10D6F4 802A40E4 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 10D6F8 802A40E8 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 10D6FC 802A40EC 8CC20000 */ lw $v0, ($a2) -/* 10D700 802A40F0 3C0F0380 */ lui $t7, (0x03800010 >> 16) # lui $t7, 0x380 -/* 10D704 802A40F4 35EF0010 */ ori $t7, (0x03800010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 10D708 802A40F8 244E0008 */ addiu $t6, $v0, 8 -/* 10D70C 802A40FC ACCE0000 */ sw $t6, ($a2) -/* 10D710 802A4100 3C18800E */ lui $t8, %hi(D_800DC5EC) # $t8, 0x800e -/* 10D714 802A4104 AC4F0000 */ sw $t7, ($v0) -/* 10D718 802A4108 8F18C5EC */ lw $t8, %lo(D_800DC5EC)($t8) -/* 10D71C 802A410C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10D720 802A4110 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10D724 802A4114 27190010 */ addiu $t9, $t8, 0x10 -/* 10D728 802A4118 03214024 */ and $t0, $t9, $at -/* 10D72C 802A411C AC480004 */ sw $t0, 4($v0) -/* 10D730 802A4120 8CC30000 */ lw $v1, ($a2) -/* 10D734 802A4124 3C0AB600 */ lui $t2, 0xb600 -/* 10D738 802A4128 240BFFFF */ li $t3, -1 -/* 10D73C 802A412C 24690008 */ addiu $t1, $v1, 8 -/* 10D740 802A4130 ACC90000 */ sw $t1, ($a2) -/* 10D744 802A4134 AC6B0004 */ sw $t3, 4($v1) -/* 10D748 802A4138 AC6A0000 */ sw $t2, ($v1) -/* 10D74C 802A413C 8CC30000 */ lw $v1, ($a2) -/* 10D750 802A4140 3C0E0082 */ lui $t6, (0x00822205 >> 16) # lui $t6, 0x82 -/* 10D754 802A4144 35CE2205 */ ori $t6, (0x00822205 & 0xFFFF) # ori $t6, $t6, 0x2205 -/* 10D758 802A4148 246C0008 */ addiu $t4, $v1, 8 -/* 10D75C 802A414C ACCC0000 */ sw $t4, ($a2) -/* 10D760 802A4150 3C0DB700 */ lui $t5, 0xb700 -/* 10D764 802A4154 AC6D0000 */ sw $t5, ($v1) -/* 10D768 802A4158 03E00008 */ jr $ra -/* 10D76C 802A415C AC6E0004 */ sw $t6, 4($v1) diff --git a/asm/non_matchings/code_802A3730/func_802A4160.s b/asm/non_matchings/code_802A3730/func_802A4160.s deleted file mode 100644 index 76ccf40c8..000000000 --- a/asm/non_matchings/code_802A3730/func_802A4160.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_802A4160 -/* 10D770 802A4160 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 10D774 802A4164 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 10D778 802A4168 8CC30000 */ lw $v1, ($a2) -/* 10D77C 802A416C 3C18802C */ lui $t8, %hi(D_802B8880) # $t8, 0x802c -/* 10D780 802A4170 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10D784 802A4174 246E0008 */ addiu $t6, $v1, 8 -/* 10D788 802A4178 ACCE0000 */ sw $t6, ($a2) -/* 10D78C 802A417C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10D790 802A4180 27188880 */ addiu $t8, %lo(D_802B8880) # addiu $t8, $t8, -0x7780 -/* 10D794 802A4184 3C0F0380 */ lui $t7, (0x03800010 >> 16) # lui $t7, 0x380 -/* 10D798 802A4188 35EF0010 */ ori $t7, (0x03800010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 10D79C 802A418C 0301C824 */ and $t9, $t8, $at -/* 10D7A0 802A4190 AC790004 */ sw $t9, 4($v1) -/* 10D7A4 802A4194 AC6F0000 */ sw $t7, ($v1) -/* 10D7A8 802A4198 8CC30000 */ lw $v1, ($a2) -/* 10D7AC 802A419C 3C09B600 */ lui $t1, 0xb600 -/* 10D7B0 802A41A0 240AFFFF */ li $t2, -1 -/* 10D7B4 802A41A4 24680008 */ addiu $t0, $v1, 8 -/* 10D7B8 802A41A8 ACC80000 */ sw $t0, ($a2) -/* 10D7BC 802A41AC AC6A0004 */ sw $t2, 4($v1) -/* 10D7C0 802A41B0 AC690000 */ sw $t1, ($v1) -/* 10D7C4 802A41B4 8CC30000 */ lw $v1, ($a2) -/* 10D7C8 802A41B8 3C0CB700 */ lui $t4, 0xb700 -/* 10D7CC 802A41BC 240D2204 */ li $t5, 8708 -/* 10D7D0 802A41C0 246B0008 */ addiu $t3, $v1, 8 -/* 10D7D4 802A41C4 ACCB0000 */ sw $t3, ($a2) -/* 10D7D8 802A41C8 AC6D0004 */ sw $t5, 4($v1) -/* 10D7DC 802A41CC 03E00008 */ jr $ra -/* 10D7E0 802A41D0 AC6C0000 */ sw $t4, ($v1) diff --git a/asm/non_matchings/code_802A3730/func_802A41D4.s b/asm/non_matchings/code_802A3730/func_802A41D4.s deleted file mode 100644 index 5220c646d..000000000 --- a/asm/non_matchings/code_802A3730/func_802A41D4.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_802A41D4 -/* 10D7E4 802A41D4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10D7E8 802A41D8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10D7EC 802A41DC 8C620000 */ lw $v0, ($v1) -/* 10D7F0 802A41E0 3C0FFF10 */ lui $t7, (0xFF10013F >> 16) # lui $t7, 0xff10 -/* 10D7F4 802A41E4 35EF013F */ ori $t7, (0xFF10013F & 0xFFFF) # ori $t7, $t7, 0x13f -/* 10D7F8 802A41E8 244E0008 */ addiu $t6, $v0, 8 -/* 10D7FC 802A41EC AC6E0000 */ sw $t6, ($v1) -/* 10D800 802A41F0 3C18800E */ lui $t8, %hi(sRenderingFramebuffer) # $t8, 0x800e -/* 10D804 802A41F4 AC4F0000 */ sw $t7, ($v0) -/* 10D808 802A41F8 9718C560 */ lhu $t8, %lo(sRenderingFramebuffer)($t8) -/* 10D80C 802A41FC 3C0D8015 */ lui $t5, %hi(gPhysicalFramebuffers) # 0x8015 -/* 10D810 802A4200 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10D814 802A4204 0018C880 */ sll $t9, $t8, 2 -/* 10D818 802A4208 01B96821 */ addu $t5, $t5, $t9 -/* 10D81C 802A420C 8DAD02A8 */ lw $t5, %lo(gPhysicalFramebuffers)($t5) -/* 10D820 802A4210 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10D824 802A4214 3C18F700 */ lui $t8, 0xf700 -/* 10D828 802A4218 01A17024 */ and $t6, $t5, $at -/* 10D82C 802A421C AC4E0004 */ sw $t6, 4($v0) -/* 10D830 802A4220 8C620000 */ lw $v0, ($v1) -/* 10D834 802A4224 3C19800E */ lui $t9, %hi(D_800DC5D0) # $t9, 0x800e -/* 10D838 802A4228 3C0CE700 */ lui $t4, 0xe700 -/* 10D83C 802A422C 244F0008 */ addiu $t7, $v0, 8 -/* 10D840 802A4230 AC6F0000 */ sw $t7, ($v1) -/* 10D844 802A4234 3C0F800E */ lui $t7, %hi(D_800DC5D4) # $t7, 0x800e -/* 10D848 802A4238 AC580000 */ sw $t8, ($v0) -/* 10D84C 802A423C 8DEFC5D4 */ lw $t7, %lo(D_800DC5D4)($t7) -/* 10D850 802A4240 8F39C5D0 */ lw $t9, %lo(D_800DC5D0)($t9) -/* 10D854 802A4244 000FC0C0 */ sll $t8, $t7, 3 -/* 10D858 802A4248 3C0F800E */ lui $t7, %hi(D_800DC5D8) # $t7, 0x800e -/* 10D85C 802A424C 8DEFC5D8 */ lw $t7, %lo(D_800DC5D8)($t7) -/* 10D860 802A4250 00196A00 */ sll $t5, $t9, 8 -/* 10D864 802A4254 331907C0 */ andi $t9, $t8, 0x7c0 -/* 10D868 802A4258 31AEF800 */ andi $t6, $t5, 0xf800 -/* 10D86C 802A425C 01D96825 */ or $t5, $t6, $t9 -/* 10D870 802A4260 000FC083 */ sra $t8, $t7, 2 -/* 10D874 802A4264 330E003E */ andi $t6, $t8, 0x3e -/* 10D878 802A4268 01AE3025 */ or $a2, $t5, $t6 -/* 10D87C 802A426C 34D90001 */ ori $t9, $a2, 1 -/* 10D880 802A4270 00197C00 */ sll $t7, $t9, 0x10 -/* 10D884 802A4274 01F9C025 */ or $t8, $t7, $t9 -/* 10D888 802A4278 AC580004 */ sw $t8, 4($v0) -/* 10D88C 802A427C 8C620000 */ lw $v0, ($v1) -/* 10D890 802A4280 3C0F0050 */ lui $t7, (0x005003C0 >> 16) # lui $t7, 0x50 -/* 10D894 802A4284 35EF03C0 */ ori $t7, (0x005003C0 & 0xFFFF) # ori $t7, $t7, 0x3c0 -/* 10D898 802A4288 244D0008 */ addiu $t5, $v0, 8 -/* 10D89C 802A428C AC6D0000 */ sw $t5, ($v1) -/* 10D8A0 802A4290 AC400004 */ sw $zero, 4($v0) -/* 10D8A4 802A4294 AC4C0000 */ sw $t4, ($v0) -/* 10D8A8 802A4298 8C620000 */ lw $v0, ($v1) -/* 10D8AC 802A429C 3C19ED00 */ lui $t9, 0xed00 -/* 10D8B0 802A42A0 3C0DF64F */ lui $t5, (0xF64FC3BC >> 16) # lui $t5, 0xf64f -/* 10D8B4 802A42A4 244E0008 */ addiu $t6, $v0, 8 -/* 10D8B8 802A42A8 AC6E0000 */ sw $t6, ($v1) -/* 10D8BC 802A42AC AC4F0004 */ sw $t7, 4($v0) -/* 10D8C0 802A42B0 AC590000 */ sw $t9, ($v0) -/* 10D8C4 802A42B4 8C620000 */ lw $v0, ($v1) -/* 10D8C8 802A42B8 35ADC3BC */ ori $t5, (0xF64FC3BC & 0xFFFF) # ori $t5, $t5, 0xc3bc -/* 10D8CC 802A42BC 3C0FBA00 */ lui $t7, (0xBA001402 >> 16) # lui $t7, 0xba00 -/* 10D8D0 802A42C0 24580008 */ addiu $t8, $v0, 8 -/* 10D8D4 802A42C4 AC780000 */ sw $t8, ($v1) -/* 10D8D8 802A42C8 AC400004 */ sw $zero, 4($v0) -/* 10D8DC 802A42CC AC4D0000 */ sw $t5, ($v0) -/* 10D8E0 802A42D0 8C620000 */ lw $v0, ($v1) -/* 10D8E4 802A42D4 35EF1402 */ ori $t7, (0xBA001402 & 0xFFFF) # ori $t7, $t7, 0x1402 -/* 10D8E8 802A42D8 244E0008 */ addiu $t6, $v0, 8 -/* 10D8EC 802A42DC AC6E0000 */ sw $t6, ($v1) -/* 10D8F0 802A42E0 AC400004 */ sw $zero, 4($v0) -/* 10D8F4 802A42E4 AC4C0000 */ sw $t4, ($v0) -/* 10D8F8 802A42E8 8C620000 */ lw $v0, ($v1) -/* 10D8FC 802A42EC 24590008 */ addiu $t9, $v0, 8 -/* 10D900 802A42F0 AC790000 */ sw $t9, ($v1) -/* 10D904 802A42F4 AC400004 */ sw $zero, 4($v0) -/* 10D908 802A42F8 03E00008 */ jr $ra -/* 10D90C 802A42FC AC4F0000 */ sw $t7, ($v0) diff --git a/asm/non_matchings/code_802A3730/func_802A4300.s b/asm/non_matchings/code_802A3730/func_802A4300.s deleted file mode 100644 index 60a4331c7..000000000 --- a/asm/non_matchings/code_802A3730/func_802A4300.s +++ /dev/null @@ -1,138 +0,0 @@ -glabel func_802A4300 -/* 10D910 802A4300 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e -/* 10D914 802A4304 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) -/* 10D918 802A4308 3C0F800E */ lui $t7, %hi(D_800DC5B0) # $t7, 0x800e -/* 10D91C 802A430C 11C0007D */ beqz $t6, .L802A4504 -/* 10D920 802A4310 00000000 */ nop -/* 10D924 802A4314 95EFC5B0 */ lhu $t7, %lo(D_800DC5B0)($t7) -/* 10D928 802A4318 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10D92C 802A431C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10D930 802A4320 15E00078 */ bnez $t7, .L802A4504 -/* 10D934 802A4324 00000000 */ nop -/* 10D938 802A4328 8C620000 */ lw $v0, ($v1) -/* 10D93C 802A432C 3C0DE700 */ lui $t5, 0xe700 -/* 10D940 802A4330 3C0EBA00 */ lui $t6, (0xBA001402 >> 16) # lui $t6, 0xba00 -/* 10D944 802A4334 24580008 */ addiu $t8, $v0, 8 -/* 10D948 802A4338 AC780000 */ sw $t8, ($v1) -/* 10D94C 802A433C AC400004 */ sw $zero, 4($v0) -/* 10D950 802A4340 AC4D0000 */ sw $t5, ($v0) -/* 10D954 802A4344 8C620000 */ lw $v0, ($v1) -/* 10D958 802A4348 35CE1402 */ ori $t6, (0xBA001402 & 0xFFFF) # ori $t6, $t6, 0x1402 -/* 10D95C 802A434C 3C0F0030 */ lui $t7, 0x30 -/* 10D960 802A4350 24590008 */ addiu $t9, $v0, 8 -/* 10D964 802A4354 AC790000 */ sw $t9, ($v1) -/* 10D968 802A4358 AC4F0004 */ sw $t7, 4($v0) -/* 10D96C 802A435C AC4E0000 */ sw $t6, ($v0) -/* 10D970 802A4360 8C620000 */ lw $v0, ($v1) -/* 10D974 802A4364 3C19FF10 */ lui $t9, (0xFF10013F >> 16) # lui $t9, 0xff10 -/* 10D978 802A4368 3739013F */ ori $t9, (0xFF10013F & 0xFFFF) # ori $t9, $t9, 0x13f -/* 10D97C 802A436C 24580008 */ addiu $t8, $v0, 8 -/* 10D980 802A4370 AC780000 */ sw $t8, ($v1) -/* 10D984 802A4374 3C0E800E */ lui $t6, %hi(sRenderingFramebuffer) # $t6, 0x800e -/* 10D988 802A4378 AC590000 */ sw $t9, ($v0) -/* 10D98C 802A437C 95CEC560 */ lhu $t6, %lo(sRenderingFramebuffer)($t6) -/* 10D990 802A4380 3C188015 */ lui $t8, %hi(gPhysicalFramebuffers) -/* 10D994 802A4384 3C0C1FFF */ lui $t4, (0x1FFFFFFF >> 16) # lui $t4, 0x1fff -/* 10D998 802A4388 000E7880 */ sll $t7, $t6, 2 -/* 10D99C 802A438C 030FC021 */ addu $t8, $t8, $t7 -/* 10D9A0 802A4390 8F1802A8 */ lw $t8, %lo(gPhysicalFramebuffers)($t8) -/* 10D9A4 802A4394 358CFFFF */ ori $t4, (0x1FFFFFFF & 0xFFFF) # ori $t4, $t4, 0xffff -/* 10D9A8 802A4398 3C0FF700 */ lui $t7, 0xf700 -/* 10D9AC 802A439C 030CC824 */ and $t9, $t8, $t4 -/* 10D9B0 802A43A0 AC590004 */ sw $t9, 4($v0) -/* 10D9B4 802A43A4 8C620000 */ lw $v0, ($v1) -/* 10D9B8 802A43A8 3C180001 */ lui $t8, (0x00010001 >> 16) # lui $t8, 1 -/* 10D9BC 802A43AC 37180001 */ ori $t8, (0x00010001 & 0xFFFF) # ori $t8, $t8, 1 -/* 10D9C0 802A43B0 244E0008 */ addiu $t6, $v0, 8 -/* 10D9C4 802A43B4 AC6E0000 */ sw $t6, ($v1) -/* 10D9C8 802A43B8 AC580004 */ sw $t8, 4($v0) -/* 10D9CC 802A43BC AC4F0000 */ sw $t7, ($v0) -/* 10D9D0 802A43C0 8C620000 */ lw $v0, ($v1) -/* 10D9D4 802A43C4 3C0F802C */ lui $t7, %hi(D_802B8880) # $t7, 0x802c -/* 10D9D8 802A43C8 25EF8880 */ addiu $t7, %lo(D_802B8880) # addiu $t7, $t7, -0x7780 -/* 10D9DC 802A43CC 24590008 */ addiu $t9, $v0, 8 -/* 10D9E0 802A43D0 AC790000 */ sw $t9, ($v1) -/* 10D9E4 802A43D4 3C0E0380 */ lui $t6, (0x03800010 >> 16) # lui $t6, 0x380 -/* 10D9E8 802A43D8 35CE0010 */ ori $t6, (0x03800010 & 0xFFFF) # ori $t6, $t6, 0x10 -/* 10D9EC 802A43DC 01ECC024 */ and $t8, $t7, $t4 -/* 10D9F0 802A43E0 AC580004 */ sw $t8, 4($v0) -/* 10D9F4 802A43E4 AC4E0000 */ sw $t6, ($v0) -/* 10D9F8 802A43E8 8C620000 */ lw $v0, ($v1) -/* 10D9FC 802A43EC 3C0F0050 */ lui $t7, (0x005003C0 >> 16) # lui $t7, 0x50 -/* 10DA00 802A43F0 35EF03C0 */ ori $t7, (0x005003C0 & 0xFFFF) # ori $t7, $t7, 0x3c0 -/* 10DA04 802A43F4 24590008 */ addiu $t9, $v0, 8 -/* 10DA08 802A43F8 AC790000 */ sw $t9, ($v1) -/* 10DA0C 802A43FC 3C0EED00 */ lui $t6, 0xed00 -/* 10DA10 802A4400 AC4E0000 */ sw $t6, ($v0) -/* 10DA14 802A4404 AC4F0004 */ sw $t7, 4($v0) -/* 10DA18 802A4408 8C620000 */ lw $v0, ($v1) -/* 10DA1C 802A440C 3C0B800E */ lui $t3, %hi(D_800DC52C) # $t3, 0x800e -/* 10DA20 802A4410 24010001 */ li $at, 1 -/* 10DA24 802A4414 24580008 */ addiu $t8, $v0, 8 -/* 10DA28 802A4418 AC780000 */ sw $t8, ($v1) -/* 10DA2C 802A441C AC400004 */ sw $zero, 4($v0) -/* 10DA30 802A4420 AC4D0000 */ sw $t5, ($v0) -/* 10DA34 802A4424 8D6BC52C */ lw $t3, %lo(D_800DC52C)($t3) -/* 10DA38 802A4428 3C19F64F */ lui $t9, 0xf64f -/* 10DA3C 802A442C 11610011 */ beq $t3, $at, .L802A4474 -/* 10DA40 802A4430 24010002 */ li $at, 2 -/* 10DA44 802A4434 11610006 */ beq $t3, $at, .L802A4450 -/* 10DA48 802A4438 3C0EF627 */ lui $t6, (0xF627C3BC >> 16) # lui $t6, 0xf627 -/* 10DA4C 802A443C 24010003 */ li $at, 3 -/* 10DA50 802A4440 11610014 */ beq $t3, $at, .L802A4494 -/* 10DA54 802A4444 3C18F627 */ lui $t8, 0xf627 -/* 10DA58 802A4448 10000023 */ b .L802A44D8 -/* 10DA5C 802A444C 8C620000 */ lw $v0, ($v1) -.L802A4450: -/* 10DA60 802A4450 8C620000 */ lw $v0, ($v1) -/* 10DA64 802A4454 3C0F0027 */ lui $t7, (0x00274000 >> 16) # lui $t7, 0x27 -/* 10DA68 802A4458 35EF4000 */ ori $t7, (0x00274000 & 0xFFFF) # ori $t7, $t7, 0x4000 -/* 10DA6C 802A445C 24590008 */ addiu $t9, $v0, 8 -/* 10DA70 802A4460 AC790000 */ sw $t9, ($v1) -/* 10DA74 802A4464 35CEC3BC */ ori $t6, (0xF627C3BC & 0xFFFF) # ori $t6, $t6, 0xc3bc -/* 10DA78 802A4468 AC4E0000 */ sw $t6, ($v0) -/* 10DA7C 802A446C 10000019 */ b .L802A44D4 -/* 10DA80 802A4470 AC4F0004 */ sw $t7, 4($v0) -.L802A4474: -/* 10DA84 802A4474 8C620000 */ lw $v0, ($v1) -/* 10DA88 802A4478 3739C1E4 */ ori $t9, $t9, 0xc1e4 -/* 10DA8C 802A447C 240E01DC */ li $t6, 476 -/* 10DA90 802A4480 24580008 */ addiu $t8, $v0, 8 -/* 10DA94 802A4484 AC780000 */ sw $t8, ($v1) -/* 10DA98 802A4488 AC4E0004 */ sw $t6, 4($v0) -/* 10DA9C 802A448C 10000011 */ b .L802A44D4 -/* 10DAA0 802A4490 AC590000 */ sw $t9, ($v0) -.L802A4494: -/* 10DAA4 802A4494 8C620000 */ lw $v0, ($v1) -/* 10DAA8 802A4498 3C190027 */ lui $t9, (0x00274000 >> 16) # lui $t9, 0x27 -/* 10DAAC 802A449C 37394000 */ ori $t9, (0x00274000 & 0xFFFF) # ori $t9, $t9, 0x4000 -/* 10DAB0 802A44A0 244F0008 */ addiu $t7, $v0, 8 -/* 10DAB4 802A44A4 AC6F0000 */ sw $t7, ($v1) -/* 10DAB8 802A44A8 3718C3BC */ ori $t8, $t8, 0xc3bc -/* 10DABC 802A44AC AC580000 */ sw $t8, ($v0) -/* 10DAC0 802A44B0 AC590004 */ sw $t9, 4($v0) -/* 10DAC4 802A44B4 8C620000 */ lw $v0, ($v1) -/* 10DAC8 802A44B8 3C0FF64F */ lui $t7, (0xF64FC1E4 >> 16) # lui $t7, 0xf64f -/* 10DACC 802A44BC 35EFC1E4 */ ori $t7, (0xF64FC1E4 & 0xFFFF) # ori $t7, $t7, 0xc1e4 -/* 10DAD0 802A44C0 244E0008 */ addiu $t6, $v0, 8 -/* 10DAD4 802A44C4 AC6E0000 */ sw $t6, ($v1) -/* 10DAD8 802A44C8 241801DC */ li $t8, 476 -/* 10DADC 802A44CC AC580004 */ sw $t8, 4($v0) -/* 10DAE0 802A44D0 AC4F0000 */ sw $t7, ($v0) -.L802A44D4: -/* 10DAE4 802A44D4 8C620000 */ lw $v0, ($v1) -.L802A44D8: -/* 10DAE8 802A44D8 3C0FBA00 */ lui $t7, (0xBA001402 >> 16) # lui $t7, 0xba00 -/* 10DAEC 802A44DC 35EF1402 */ ori $t7, (0xBA001402 & 0xFFFF) # ori $t7, $t7, 0x1402 -/* 10DAF0 802A44E0 24590008 */ addiu $t9, $v0, 8 -/* 10DAF4 802A44E4 AC790000 */ sw $t9, ($v1) -/* 10DAF8 802A44E8 AC400004 */ sw $zero, 4($v0) -/* 10DAFC 802A44EC AC4D0000 */ sw $t5, ($v0) -/* 10DB00 802A44F0 8C620000 */ lw $v0, ($v1) -/* 10DB04 802A44F4 244E0008 */ addiu $t6, $v0, 8 -/* 10DB08 802A44F8 AC6E0000 */ sw $t6, ($v1) -/* 10DB0C 802A44FC AC400004 */ sw $zero, 4($v0) -/* 10DB10 802A4500 AC4F0000 */ sw $t7, ($v0) -.L802A4504: -/* 10DB14 802A4504 03E00008 */ jr $ra -/* 10DB18 802A4508 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A450C.s b/asm/non_matchings/code_802A3730/func_802A450C.s deleted file mode 100644 index d2eb2e9bc..000000000 --- a/asm/non_matchings/code_802A3730/func_802A450C.s +++ /dev/null @@ -1,230 +0,0 @@ -glabel func_802A450C -/* 10DB1C 802A450C 3C0E800E */ lui $t6, %hi(D_800DC5BC) # $t6, 0x800e -/* 10DB20 802A4510 95CEC5BC */ lhu $t6, %lo(D_800DC5BC)($t6) -/* 10DB24 802A4514 3C03800E */ lui $v1, %hi(gCurrentCourseId) # $v1, 0x800e -/* 10DB28 802A4518 00802825 */ move $a1, $a0 -/* 10DB2C 802A451C 11C00040 */ beqz $t6, .L802A4620 -/* 10DB30 802A4520 2463C5A0 */ addiu $v1, %lo(gCurrentCourseId) # addiu $v1, $v1, -0x3a60 -/* 10DB34 802A4524 3C068016 */ lui $a2, %hi(D_801625EC) # $a2, 0x8016 -/* 10DB38 802A4528 24C625EC */ addiu $a2, %lo(D_801625EC) # addiu $a2, $a2, 0x25ec -/* 10DB3C 802A452C 8CC20000 */ lw $v0, ($a2) -/* 10DB40 802A4530 3C078016 */ lui $a3, %hi(D_801625F4) # $a3, 0x8016 -/* 10DB44 802A4534 24E725F4 */ addiu $a3, %lo(D_801625F4) # addiu $a3, $a3, 0x25f4 -/* 10DB48 802A4538 04410003 */ bgez $v0, .L802A4548 -/* 10DB4C 802A453C 3C088016 */ lui $t0, %hi(D_801625F0) # $t0, 0x8016 -/* 10DB50 802A4540 ACC00000 */ sw $zero, ($a2) -/* 10DB54 802A4544 00001025 */ move $v0, $zero -.L802A4548: -/* 10DB58 802A4548 8CE30000 */ lw $v1, ($a3) -/* 10DB5C 802A454C 28410100 */ slti $at, $v0, 0x100 -/* 10DB60 802A4550 250825F0 */ addiu $t0, %lo(D_801625F0) # addiu $t0, $t0, 0x25f0 -/* 10DB64 802A4554 04610003 */ bgez $v1, .L802A4564 -/* 10DB68 802A4558 240200FF */ li $v0, 255 -/* 10DB6C 802A455C ACE00000 */ sw $zero, ($a3) -/* 10DB70 802A4560 00001825 */ move $v1, $zero -.L802A4564: -/* 10DB74 802A4564 8D040000 */ lw $a0, ($t0) -/* 10DB78 802A4568 04810003 */ bgez $a0, .L802A4578 -/* 10DB7C 802A456C 00000000 */ nop -/* 10DB80 802A4570 AD000000 */ sw $zero, ($t0) -/* 10DB84 802A4574 00002025 */ move $a0, $zero -.L802A4578: -/* 10DB88 802A4578 54200003 */ bnel $at, $zero, .L802A4588 -/* 10DB8C 802A457C 28610100 */ slti $at, $v1, 0x100 -/* 10DB90 802A4580 ACC20000 */ sw $v0, ($a2) -/* 10DB94 802A4584 28610100 */ slti $at, $v1, 0x100 -.L802A4588: -/* 10DB98 802A4588 14200002 */ bnez $at, .L802A4594 -/* 10DB9C 802A458C 240200FF */ li $v0, 255 -/* 10DBA0 802A4590 ACE20000 */ sw $v0, ($a3) -.L802A4594: -/* 10DBA4 802A4594 28810100 */ slti $at, $a0, 0x100 -/* 10DBA8 802A4598 14200002 */ bnez $at, .L802A45A4 -/* 10DBAC 802A459C 00A01825 */ move $v1, $a1 -/* 10DBB0 802A45A0 AD020000 */ sw $v0, ($t0) -.L802A45A4: -/* 10DBB4 802A45A4 00001025 */ move $v0, $zero -/* 10DBB8 802A45A8 24040008 */ li $a0, 8 -.L802A45AC: -/* 10DBBC 802A45AC 84CF0002 */ lh $t7, 2($a2) -/* 10DBC0 802A45B0 24420004 */ addiu $v0, $v0, 4 -/* 10DBC4 802A45B4 24630040 */ addiu $v1, $v1, 0x40 -/* 10DBC8 802A45B8 A06FFFCC */ sb $t7, -0x34($v1) -/* 10DBCC 802A45BC 84F80002 */ lh $t8, 2($a3) -/* 10DBD0 802A45C0 A078FFCD */ sb $t8, -0x33($v1) -/* 10DBD4 802A45C4 85190002 */ lh $t9, 2($t0) -/* 10DBD8 802A45C8 A079FFCE */ sb $t9, -0x32($v1) -/* 10DBDC 802A45CC 84C90002 */ lh $t1, 2($a2) -/* 10DBE0 802A45D0 A069FFDC */ sb $t1, -0x24($v1) -/* 10DBE4 802A45D4 84EA0002 */ lh $t2, 2($a3) -/* 10DBE8 802A45D8 A06AFFDD */ sb $t2, -0x23($v1) -/* 10DBEC 802A45DC 850B0002 */ lh $t3, 2($t0) -/* 10DBF0 802A45E0 A06BFFDE */ sb $t3, -0x22($v1) -/* 10DBF4 802A45E4 84CC0002 */ lh $t4, 2($a2) -/* 10DBF8 802A45E8 A06CFFEC */ sb $t4, -0x14($v1) -/* 10DBFC 802A45EC 84ED0002 */ lh $t5, 2($a3) -/* 10DC00 802A45F0 A06DFFED */ sb $t5, -0x13($v1) -/* 10DC04 802A45F4 850E0002 */ lh $t6, 2($t0) -/* 10DC08 802A45F8 A06EFFEE */ sb $t6, -0x12($v1) -/* 10DC0C 802A45FC 84CF0002 */ lh $t7, 2($a2) -/* 10DC10 802A4600 A06FFFFC */ sb $t7, -4($v1) -/* 10DC14 802A4604 84F80002 */ lh $t8, 2($a3) -/* 10DC18 802A4608 A078FFFD */ sb $t8, -3($v1) -/* 10DC1C 802A460C 85190002 */ lh $t9, 2($t0) -/* 10DC20 802A4610 1444FFE6 */ bne $v0, $a0, .L802A45AC -/* 10DC24 802A4614 A079FFFE */ sb $t9, -2($v1) -/* 10DC28 802A4618 03E00008 */ jr $ra -/* 10DC2C 802A461C 00000000 */ nop - -.L802A4620: -/* 10DC30 802A4620 84690000 */ lh $t1, ($v1) -/* 10DC34 802A4624 2404000C */ li $a0, 12 -/* 10DC38 802A4628 3C02802C */ lui $v0, %hi(sSkyColors) # $v0, 0x802c -/* 10DC3C 802A462C 01240019 */ multu $t1, $a0 -/* 10DC40 802A4630 24428AD0 */ addiu $v0, %lo(sSkyColors) # addiu $v0, $v0, -0x7530 -/* 10DC44 802A4634 3C06802C */ lui $a2, %hi(D_802B8BCC) # $a2, 0x802c -/* 10DC48 802A4638 24C68BCC */ addiu $a2, %lo(D_802B8BCC) # addiu $a2, $a2, -0x7434 -/* 10DC4C 802A463C 00005012 */ mflo $t2 -/* 10DC50 802A4640 004A5821 */ addu $t3, $v0, $t2 -/* 10DC54 802A4644 856C0000 */ lh $t4, ($t3) -/* 10DC58 802A4648 A0AC000C */ sb $t4, 0xc($a1) -/* 10DC5C 802A464C 846D0000 */ lh $t5, ($v1) -/* 10DC60 802A4650 01A40019 */ multu $t5, $a0 -/* 10DC64 802A4654 00007012 */ mflo $t6 -/* 10DC68 802A4658 004E7821 */ addu $t7, $v0, $t6 -/* 10DC6C 802A465C 85F80002 */ lh $t8, 2($t7) -/* 10DC70 802A4660 A0B8000D */ sb $t8, 0xd($a1) -/* 10DC74 802A4664 84790000 */ lh $t9, ($v1) -/* 10DC78 802A4668 03240019 */ multu $t9, $a0 -/* 10DC7C 802A466C 00004812 */ mflo $t1 -/* 10DC80 802A4670 00495021 */ addu $t2, $v0, $t1 -/* 10DC84 802A4674 854B0004 */ lh $t3, 4($t2) -/* 10DC88 802A4678 A0AB000E */ sb $t3, 0xe($a1) -/* 10DC8C 802A467C 846C0000 */ lh $t4, ($v1) -/* 10DC90 802A4680 01840019 */ multu $t4, $a0 -/* 10DC94 802A4684 00006812 */ mflo $t5 -/* 10DC98 802A4688 004D7021 */ addu $t6, $v0, $t5 -/* 10DC9C 802A468C 85CF0006 */ lh $t7, 6($t6) -/* 10DCA0 802A4690 A0AF001C */ sb $t7, 0x1c($a1) -/* 10DCA4 802A4694 84780000 */ lh $t8, ($v1) -/* 10DCA8 802A4698 03040019 */ multu $t8, $a0 -/* 10DCAC 802A469C 0000C812 */ mflo $t9 -/* 10DCB0 802A46A0 00594821 */ addu $t1, $v0, $t9 -/* 10DCB4 802A46A4 852A0008 */ lh $t2, 8($t1) -/* 10DCB8 802A46A8 A0AA001D */ sb $t2, 0x1d($a1) -/* 10DCBC 802A46AC 846B0000 */ lh $t3, ($v1) -/* 10DCC0 802A46B0 01640019 */ multu $t3, $a0 -/* 10DCC4 802A46B4 00006012 */ mflo $t4 -/* 10DCC8 802A46B8 004C6821 */ addu $t5, $v0, $t4 -/* 10DCCC 802A46BC 85AE000A */ lh $t6, 0xa($t5) -/* 10DCD0 802A46C0 A0AE001E */ sb $t6, 0x1e($a1) -/* 10DCD4 802A46C4 846F0000 */ lh $t7, ($v1) -/* 10DCD8 802A46C8 01E40019 */ multu $t7, $a0 -/* 10DCDC 802A46CC 0000C012 */ mflo $t8 -/* 10DCE0 802A46D0 0058C821 */ addu $t9, $v0, $t8 -/* 10DCE4 802A46D4 87290006 */ lh $t1, 6($t9) -/* 10DCE8 802A46D8 A0A9002C */ sb $t1, 0x2c($a1) -/* 10DCEC 802A46DC 846A0000 */ lh $t2, ($v1) -/* 10DCF0 802A46E0 01440019 */ multu $t2, $a0 -/* 10DCF4 802A46E4 00005812 */ mflo $t3 -/* 10DCF8 802A46E8 004B6021 */ addu $t4, $v0, $t3 -/* 10DCFC 802A46EC 858D0008 */ lh $t5, 8($t4) -/* 10DD00 802A46F0 A0AD002D */ sb $t5, 0x2d($a1) -/* 10DD04 802A46F4 846E0000 */ lh $t6, ($v1) -/* 10DD08 802A46F8 01C40019 */ multu $t6, $a0 -/* 10DD0C 802A46FC 00007812 */ mflo $t7 -/* 10DD10 802A4700 004FC021 */ addu $t8, $v0, $t7 -/* 10DD14 802A4704 8719000A */ lh $t9, 0xa($t8) -/* 10DD18 802A4708 A0B9002E */ sb $t9, 0x2e($a1) -/* 10DD1C 802A470C 84690000 */ lh $t1, ($v1) -/* 10DD20 802A4710 01240019 */ multu $t1, $a0 -/* 10DD24 802A4714 00005012 */ mflo $t2 -/* 10DD28 802A4718 004A5821 */ addu $t3, $v0, $t2 -/* 10DD2C 802A471C 856C0000 */ lh $t4, ($t3) -/* 10DD30 802A4720 A0AC003C */ sb $t4, 0x3c($a1) -/* 10DD34 802A4724 846D0000 */ lh $t5, ($v1) -/* 10DD38 802A4728 01A40019 */ multu $t5, $a0 -/* 10DD3C 802A472C 00007012 */ mflo $t6 -/* 10DD40 802A4730 004E7821 */ addu $t7, $v0, $t6 -/* 10DD44 802A4734 85F80002 */ lh $t8, 2($t7) -/* 10DD48 802A4738 A0B8003D */ sb $t8, 0x3d($a1) -/* 10DD4C 802A473C 84790000 */ lh $t9, ($v1) -/* 10DD50 802A4740 03240019 */ multu $t9, $a0 -/* 10DD54 802A4744 00004812 */ mflo $t1 -/* 10DD58 802A4748 00495021 */ addu $t2, $v0, $t1 -/* 10DD5C 802A474C 854B0004 */ lh $t3, 4($t2) -/* 10DD60 802A4750 A0AB003E */ sb $t3, 0x3e($a1) -/* 10DD64 802A4754 846C0000 */ lh $t4, ($v1) -/* 10DD68 802A4758 01840019 */ multu $t4, $a0 -/* 10DD6C 802A475C 00006812 */ mflo $t5 -/* 10DD70 802A4760 00CD7021 */ addu $t6, $a2, $t5 -/* 10DD74 802A4764 85CF0000 */ lh $t7, ($t6) -/* 10DD78 802A4768 A0AF004C */ sb $t7, 0x4c($a1) -/* 10DD7C 802A476C 84780000 */ lh $t8, ($v1) -/* 10DD80 802A4770 03040019 */ multu $t8, $a0 -/* 10DD84 802A4774 0000C812 */ mflo $t9 -/* 10DD88 802A4778 00D94821 */ addu $t1, $a2, $t9 -/* 10DD8C 802A477C 852A0002 */ lh $t2, 2($t1) -/* 10DD90 802A4780 A0AA004D */ sb $t2, 0x4d($a1) -/* 10DD94 802A4784 846B0000 */ lh $t3, ($v1) -/* 10DD98 802A4788 01640019 */ multu $t3, $a0 -/* 10DD9C 802A478C 00006012 */ mflo $t4 -/* 10DDA0 802A4790 00CC6821 */ addu $t5, $a2, $t4 -/* 10DDA4 802A4794 85AE0004 */ lh $t6, 4($t5) -/* 10DDA8 802A4798 A0AE004E */ sb $t6, 0x4e($a1) -/* 10DDAC 802A479C 846F0000 */ lh $t7, ($v1) -/* 10DDB0 802A47A0 01E40019 */ multu $t7, $a0 -/* 10DDB4 802A47A4 0000C012 */ mflo $t8 -/* 10DDB8 802A47A8 00D8C821 */ addu $t9, $a2, $t8 -/* 10DDBC 802A47AC 87290006 */ lh $t1, 6($t9) -/* 10DDC0 802A47B0 A0A9005C */ sb $t1, 0x5c($a1) -/* 10DDC4 802A47B4 846A0000 */ lh $t2, ($v1) -/* 10DDC8 802A47B8 01440019 */ multu $t2, $a0 -/* 10DDCC 802A47BC 00005812 */ mflo $t3 -/* 10DDD0 802A47C0 00CB6021 */ addu $t4, $a2, $t3 -/* 10DDD4 802A47C4 858D0008 */ lh $t5, 8($t4) -/* 10DDD8 802A47C8 A0AD005D */ sb $t5, 0x5d($a1) -/* 10DDDC 802A47CC 846E0000 */ lh $t6, ($v1) -/* 10DDE0 802A47D0 01C40019 */ multu $t6, $a0 -/* 10DDE4 802A47D4 00007812 */ mflo $t7 -/* 10DDE8 802A47D8 00CFC021 */ addu $t8, $a2, $t7 -/* 10DDEC 802A47DC 8719000A */ lh $t9, 0xa($t8) -/* 10DDF0 802A47E0 A0B9005E */ sb $t9, 0x5e($a1) -/* 10DDF4 802A47E4 84690000 */ lh $t1, ($v1) -/* 10DDF8 802A47E8 01240019 */ multu $t1, $a0 -/* 10DDFC 802A47EC 00005012 */ mflo $t2 -/* 10DE00 802A47F0 00CA5821 */ addu $t3, $a2, $t2 -/* 10DE04 802A47F4 856C0006 */ lh $t4, 6($t3) -/* 10DE08 802A47F8 A0AC006C */ sb $t4, 0x6c($a1) -/* 10DE0C 802A47FC 846D0000 */ lh $t5, ($v1) -/* 10DE10 802A4800 01A40019 */ multu $t5, $a0 -/* 10DE14 802A4804 00007012 */ mflo $t6 -/* 10DE18 802A4808 00CE7821 */ addu $t7, $a2, $t6 -/* 10DE1C 802A480C 85F80008 */ lh $t8, 8($t7) -/* 10DE20 802A4810 A0B8006D */ sb $t8, 0x6d($a1) -/* 10DE24 802A4814 84790000 */ lh $t9, ($v1) -/* 10DE28 802A4818 03240019 */ multu $t9, $a0 -/* 10DE2C 802A481C 00004812 */ mflo $t1 -/* 10DE30 802A4820 00C95021 */ addu $t2, $a2, $t1 -/* 10DE34 802A4824 854B000A */ lh $t3, 0xa($t2) -/* 10DE38 802A4828 A0AB006E */ sb $t3, 0x6e($a1) -/* 10DE3C 802A482C 846C0000 */ lh $t4, ($v1) -/* 10DE40 802A4830 01840019 */ multu $t4, $a0 -/* 10DE44 802A4834 00006812 */ mflo $t5 -/* 10DE48 802A4838 00CD7021 */ addu $t6, $a2, $t5 -/* 10DE4C 802A483C 85CF0000 */ lh $t7, ($t6) -/* 10DE50 802A4840 A0AF007C */ sb $t7, 0x7c($a1) -/* 10DE54 802A4844 84780000 */ lh $t8, ($v1) -/* 10DE58 802A4848 03040019 */ multu $t8, $a0 -/* 10DE5C 802A484C 0000C812 */ mflo $t9 -/* 10DE60 802A4850 00D94821 */ addu $t1, $a2, $t9 -/* 10DE64 802A4854 852A0002 */ lh $t2, 2($t1) -/* 10DE68 802A4858 A0AA007D */ sb $t2, 0x7d($a1) -/* 10DE6C 802A485C 846B0000 */ lh $t3, ($v1) -/* 10DE70 802A4860 01640019 */ multu $t3, $a0 -/* 10DE74 802A4864 00006012 */ mflo $t4 -/* 10DE78 802A4868 00CC6821 */ addu $t5, $a2, $t4 -/* 10DE7C 802A486C 85AE0004 */ lh $t6, 4($t5) -/* 10DE80 802A4870 A0AE007E */ sb $t6, 0x7e($a1) -/* 10DE84 802A4874 03E00008 */ jr $ra -/* 10DE88 802A4878 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A487C.s b/asm/non_matchings/code_802A3730/func_802A487C.s deleted file mode 100644 index 95362e376..000000000 --- a/asm/non_matchings/code_802A3730/func_802A487C.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel func_802A487C -/* 10DE8C 802A487C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 10DE90 802A4880 AFBF0024 */ sw $ra, 0x24($sp) -/* 10DE94 802A4884 AFA40028 */ sw $a0, 0x28($sp) -/* 10DE98 802A4888 AFA5002C */ sw $a1, 0x2c($sp) -/* 10DE9C 802A488C AFA60030 */ sw $a2, 0x30($sp) -/* 10DEA0 802A4890 0C0A8F8F */ jal func_802A3E3C -/* 10DEA4 802A4894 AFA70034 */ sw $a3, 0x34($sp) -/* 10DEA8 802A4898 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 10DEAC 802A489C 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 10DEB0 802A48A0 2401000D */ li $at, 13 -/* 10DEB4 802A48A4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10DEB8 802A48A8 11C10054 */ beq $t6, $at, .L802A49FC -/* 10DEBC 802A48AC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10DEC0 802A48B0 8C620000 */ lw $v0, ($v1) -/* 10DEC4 802A48B4 3C18B900 */ lui $t8, (0xB900031D >> 16) # lui $t8, 0xb900 -/* 10DEC8 802A48B8 3C190F0A */ lui $t9, (0x0F0A4000 >> 16) # lui $t9, 0xf0a -/* 10DECC 802A48BC 244F0008 */ addiu $t7, $v0, 8 -/* 10DED0 802A48C0 AC6F0000 */ sw $t7, ($v1) -/* 10DED4 802A48C4 37394000 */ ori $t9, (0x0F0A4000 & 0xFFFF) # ori $t9, $t9, 0x4000 -/* 10DED8 802A48C8 3718031D */ ori $t8, (0xB900031D & 0xFFFF) # ori $t8, $t8, 0x31d -/* 10DEDC 802A48CC AC580000 */ sw $t8, ($v0) -/* 10DEE0 802A48D0 AC590004 */ sw $t9, 4($v0) -/* 10DEE4 802A48D4 8C620000 */ lw $v0, ($v1) -/* 10DEE8 802A48D8 3C014370 */ li $at, 0x43700000 # 240.000000 -/* 10DEEC 802A48DC 44812000 */ mtc1 $at, $f4 -/* 10DEF0 802A48E0 244A0008 */ addiu $t2, $v0, 8 -/* 10DEF4 802A48E4 AC6A0000 */ sw $t2, ($v1) -/* 10DEF8 802A48E8 3C0C0002 */ lui $t4, (0x00020001 >> 16) # lui $t4, 2 -/* 10DEFC 802A48EC 44800000 */ mtc1 $zero, $f0 -/* 10DF00 802A48F0 358C0001 */ ori $t4, (0x00020001 & 0xFFFF) # ori $t4, $t4, 1 -/* 10DF04 802A48F4 3C0BB600 */ lui $t3, 0xb600 -/* 10DF08 802A48F8 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 10DF0C 802A48FC 44813000 */ mtc1 $at, $f6 -/* 10DF10 802A4900 AC4B0000 */ sw $t3, ($v0) -/* 10DF14 802A4904 AC4C0004 */ sw $t4, 4($v0) -/* 10DF18 802A4908 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10DF1C 802A490C 44814000 */ mtc1 $at, $f8 -/* 10DF20 802A4910 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 10DF24 802A4914 44050000 */ mfc1 $a1, $f0 -/* 10DF28 802A4918 44070000 */ mfc1 $a3, $f0 -/* 10DF2C 802A491C 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 10DF30 802A4920 3C0643A0 */ lui $a2, 0x43a0 -/* 10DF34 802A4924 E7A40010 */ swc1 $f4, 0x10($sp) -/* 10DF38 802A4928 E7A00014 */ swc1 $f0, 0x14($sp) -/* 10DF3C 802A492C E7A60018 */ swc1 $f6, 0x18($sp) -/* 10DF40 802A4930 0C0338A9 */ jal guOrtho -/* 10DF44 802A4934 E7A8001C */ swc1 $f8, 0x1c($sp) -/* 10DF48 802A4938 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10DF4C 802A493C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10DF50 802A4940 8C620000 */ lw $v0, ($v1) -/* 10DF54 802A4944 3C0EB400 */ lui $t6, 0xb400 -/* 10DF58 802A4948 340FFFFF */ li $t7, 65535 -/* 10DF5C 802A494C 244D0008 */ addiu $t5, $v0, 8 -/* 10DF60 802A4950 AC6D0000 */ sw $t5, ($v1) -/* 10DF64 802A4954 AC4F0004 */ sw $t7, 4($v0) -/* 10DF68 802A4958 AC4E0000 */ sw $t6, ($v0) -/* 10DF6C 802A495C 8C620000 */ lw $v0, ($v1) -/* 10DF70 802A4960 3C190103 */ lui $t9, (0x01030040 >> 16) # lui $t9, 0x103 -/* 10DF74 802A4964 37390040 */ ori $t9, (0x01030040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 10DF78 802A4968 24580008 */ addiu $t8, $v0, 8 -/* 10DF7C 802A496C AC780000 */ sw $t8, ($v1) -/* 10DF80 802A4970 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 10DF84 802A4974 AC590000 */ sw $t9, ($v0) -/* 10DF88 802A4978 8D4AEF40 */ lw $t2, %lo(gGfxPool)($t2) -/* 10DF8C 802A497C 3C091FFF */ lui $t1, (0x1FFFFFFF >> 16) # lui $t1, 0x1fff -/* 10DF90 802A4980 3529FFFF */ ori $t1, (0x1FFFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* 10DF94 802A4984 01495824 */ and $t3, $t2, $t1 -/* 10DF98 802A4988 AC4B0004 */ sw $t3, 4($v0) -/* 10DF9C 802A498C 8C620000 */ lw $v0, ($v1) -/* 10DFA0 802A4990 3C0E0D01 */ lui $t6, %hi(D_0D008E98) # $t6, 0xd01 -/* 10DFA4 802A4994 25CE8E98 */ addiu $t6, %lo(D_0D008E98) # addiu $t6, $t6, -0x7168 -/* 10DFA8 802A4998 244C0008 */ addiu $t4, $v0, 8 -/* 10DFAC 802A499C AC6C0000 */ sw $t4, ($v1) -/* 10DFB0 802A49A0 3C0D0102 */ lui $t5, (0x01020040 >> 16) # lui $t5, 0x102 -/* 10DFB4 802A49A4 35AD0040 */ ori $t5, (0x01020040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 10DFB8 802A49A8 01C97824 */ and $t7, $t6, $t1 -/* 10DFBC 802A49AC AC4F0004 */ sw $t7, 4($v0) -/* 10DFC0 802A49B0 AC4D0000 */ sw $t5, ($v0) -/* 10DFC4 802A49B4 8C620000 */ lw $v0, ($v1) -/* 10DFC8 802A49B8 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 10DFCC 802A49BC 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 10DFD0 802A49C0 24580008 */ addiu $t8, $v0, 8 -/* 10DFD4 802A49C4 AC780000 */ sw $t8, ($v1) -/* 10DFD8 802A49C8 AC590000 */ sw $t9, ($v0) -/* 10DFDC 802A49CC 8FAA0028 */ lw $t2, 0x28($sp) -/* 10DFE0 802A49D0 3C0DB100 */ lui $t5, (0xB1000602 >> 16) # lui $t5, 0xb100 -/* 10DFE4 802A49D4 3C0E0002 */ lui $t6, (0x00020604 >> 16) # lui $t6, 2 -/* 10DFE8 802A49D8 254B0040 */ addiu $t3, $t2, 0x40 -/* 10DFEC 802A49DC AC4B0004 */ sw $t3, 4($v0) -/* 10DFF0 802A49E0 8C620000 */ lw $v0, ($v1) -/* 10DFF4 802A49E4 35CE0604 */ ori $t6, (0x00020604 & 0xFFFF) # ori $t6, $t6, 0x604 -/* 10DFF8 802A49E8 35AD0602 */ ori $t5, (0xB1000602 & 0xFFFF) # ori $t5, $t5, 0x602 -/* 10DFFC 802A49EC 244C0008 */ addiu $t4, $v0, 8 -/* 10E000 802A49F0 AC6C0000 */ sw $t4, ($v1) -/* 10E004 802A49F4 AC4E0004 */ sw $t6, 4($v0) -/* 10E008 802A49F8 AC4D0000 */ sw $t5, ($v0) -.L802A49FC: -/* 10E00C 802A49FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 10E010 802A4A00 27BD0028 */ addiu $sp, $sp, 0x28 -/* 10E014 802A4A04 03E00008 */ jr $ra -/* 10E018 802A4A08 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A4D18.s b/asm/non_matchings/code_802A3730/func_802A4D18.s index c4a19e963..56463da6c 100644 --- a/asm/non_matchings/code_802A3730/func_802A4D18.s +++ b/asm/non_matchings/code_802A3730/func_802A4D18.s @@ -18,9 +18,9 @@ glabel func_802A4D18 /* 10E364 802A4D54 2DE10013 */ sltiu $at, $t7, 0x13 /* 10E368 802A4D58 1020003C */ beqz $at, .L802A4E4C /* 10E36C 802A4D5C 000F7880 */ sll $t7, $t7, 2 -/* 10E370 802A4D60 3C01802C */ lui $at, %hi(D_802B9BB8) +/* 10E370 802A4D60 3C01802C */ lui $at, %hi(jtbl_802B9BB8) /* 10E374 802A4D64 002F0821 */ addu $at, $at, $t7 -/* 10E378 802A4D68 8C2F9BB8 */ lw $t7, %lo(D_802B9BB8)($at) +/* 10E378 802A4D68 8C2F9BB8 */ lw $t7, %lo(jtbl_802B9BB8)($at) /* 10E37C 802A4D6C 01E00008 */ jr $t7 /* 10E380 802A4D70 00000000 */ nop glabel L802A4D74 diff --git a/asm/non_matchings/code_802A3730/func_802A4EF4.s b/asm/non_matchings/code_802A3730/func_802A4EF4.s deleted file mode 100644 index 59239c573..000000000 --- a/asm/non_matchings/code_802A3730/func_802A4EF4.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_802A4EF4 -/* 10E504 802A4EF4 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e -/* 10E508 802A4EF8 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) -/* 10E50C 802A4EFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 10E510 802A4F00 AFBF0014 */ sw $ra, 0x14($sp) -/* 10E514 802A4F04 1040000C */ beqz $v0, .L802A4F38 -/* 10E518 802A4F08 3C04800E */ lui $a0, %hi(D_800DC4DC) # 0x800e -/* 10E51C 802A4F0C 24010001 */ li $at, 1 -/* 10E520 802A4F10 1041001A */ beq $v0, $at, .L802A4F7C -/* 10E524 802A4F14 3C04800E */ lui $a0, %hi(D_800DC4DC) # 0x800e -/* 10E528 802A4F18 24010002 */ li $at, 2 -/* 10E52C 802A4F1C 1041000C */ beq $v0, $at, .L802A4F50 -/* 10E530 802A4F20 3C04800E */ lui $a0, %hi(D_800DC4DC) # 0x800e -/* 10E534 802A4F24 24010003 */ li $at, 3 -/* 10E538 802A4F28 1041001F */ beq $v0, $at, .L802A4FA8 -/* 10E53C 802A4F2C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 10E540 802A4F30 10000031 */ b .L802A4FF8 -/* 10E544 802A4F34 8FBF0014 */ lw $ra, 0x14($sp) -.L802A4F38: -/* 10E548 802A4F38 3C058015 */ lui $a1, %hi(D_80150130) # $a1, 0x8015 -/* 10E54C 802A4F3C 24A50130 */ addiu $a1, %lo(D_80150130) # addiu $a1, $a1, 0x130 -/* 10E550 802A4F40 0C007CE5 */ jal func_8001F394 -/* 10E554 802A4F44 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 10E558 802A4F48 1000002B */ b .L802A4FF8 -/* 10E55C 802A4F4C 8FBF0014 */ lw $ra, 0x14($sp) -.L802A4F50: -/* 10E560 802A4F50 3C058015 */ lui $a1, %hi(D_80150130) # $a1, 0x8015 -/* 10E564 802A4F54 24A50130 */ addiu $a1, %lo(D_80150130) # addiu $a1, $a1, 0x130 -/* 10E568 802A4F58 0C007CE5 */ jal func_8001F394 -/* 10E56C 802A4F5C 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) # -0x3b24($a0) -/* 10E570 802A4F60 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 10E574 802A4F64 3C058015 */ lui $a1, %hi(D_80150134) # $a1, 0x8015 -/* 10E578 802A4F68 24A50134 */ addiu $a1, %lo(D_80150134) # addiu $a1, $a1, 0x134 -/* 10E57C 802A4F6C 0C007CE5 */ jal func_8001F394 -/* 10E580 802A4F70 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 10E584 802A4F74 10000020 */ b .L802A4FF8 -/* 10E588 802A4F78 8FBF0014 */ lw $ra, 0x14($sp) -.L802A4F7C: -/* 10E58C 802A4F7C 3C058015 */ lui $a1, %hi(D_80150130) # $a1, 0x8015 -/* 10E590 802A4F80 24A50130 */ addiu $a1, %lo(D_80150130) # addiu $a1, $a1, 0x130 -/* 10E594 802A4F84 0C007CE5 */ jal func_8001F394 -/* 10E598 802A4F88 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) # -0x3b24($a0) -/* 10E59C 802A4F8C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 10E5A0 802A4F90 3C058015 */ lui $a1, %hi(D_80150134) # $a1, 0x8015 -/* 10E5A4 802A4F94 24A50134 */ addiu $a1, %lo(D_80150134) # addiu $a1, $a1, 0x134 -/* 10E5A8 802A4F98 0C007CE5 */ jal func_8001F394 -/* 10E5AC 802A4F9C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 10E5B0 802A4FA0 10000015 */ b .L802A4FF8 -/* 10E5B4 802A4FA4 8FBF0014 */ lw $ra, 0x14($sp) -.L802A4FA8: -/* 10E5B8 802A4FA8 3C058015 */ lui $a1, %hi(D_80150130) # $a1, 0x8015 -/* 10E5BC 802A4FAC 24A50130 */ addiu $a1, %lo(D_80150130) # addiu $a1, $a1, 0x130 -/* 10E5C0 802A4FB0 0C007CE5 */ jal func_8001F394 -/* 10E5C4 802A4FB4 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) # -0x3b24($a0) -/* 10E5C8 802A4FB8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 10E5CC 802A4FBC 3C058015 */ lui $a1, %hi(D_80150134) # $a1, 0x8015 -/* 10E5D0 802A4FC0 24A50134 */ addiu $a1, %lo(D_80150134) # addiu $a1, $a1, 0x134 -/* 10E5D4 802A4FC4 0C007CE5 */ jal func_8001F394 -/* 10E5D8 802A4FC8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 10E5DC 802A4FCC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 10E5E0 802A4FD0 3C058015 */ lui $a1, %hi(D_80150138) # $a1, 0x8015 -/* 10E5E4 802A4FD4 24A50138 */ addiu $a1, %lo(D_80150138) # addiu $a1, $a1, 0x138 -/* 10E5E8 802A4FD8 0C007CE5 */ jal func_8001F394 -/* 10E5EC 802A4FDC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) -/* 10E5F0 802A4FE0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 10E5F4 802A4FE4 3C058015 */ lui $a1, %hi(D_8015013C) # $a1, 0x8015 -/* 10E5F8 802A4FE8 24A5013C */ addiu $a1, %lo(D_8015013C) # addiu $a1, $a1, 0x13c -/* 10E5FC 802A4FEC 0C007CE5 */ jal func_8001F394 -/* 10E600 802A4FF0 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 10E604 802A4FF4 8FBF0014 */ lw $ra, 0x14($sp) -.L802A4FF8: -/* 10E608 802A4FF8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 10E60C 802A4FFC 03E00008 */ jr $ra -/* 10E610 802A5000 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A5004.s b/asm/non_matchings/code_802A3730/func_802A5004.s deleted file mode 100644 index 3c65187bd..000000000 --- a/asm/non_matchings/code_802A3730/func_802A5004.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A5004 -/* 10E614 802A5004 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10E618 802A5008 AFBF001C */ sw $ra, 0x1c($sp) -/* 10E61C 802A500C 0C0A8F8F */ jal func_802A3E3C -/* 10E620 802A5010 00000000 */ nop -/* 10E624 802A5014 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10E628 802A5018 0C0A8DCC */ jal func_802A3730 -/* 10E62C 802A501C 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10E630 802A5020 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 10E634 802A5024 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 10E638 802A5028 8CC20000 */ lw $v0, ($a2) -/* 10E63C 802A502C 3C0FB600 */ lui $t7, 0xb600 -/* 10E640 802A5030 2418FFFF */ li $t8, -1 -/* 10E644 802A5034 244E0008 */ addiu $t6, $v0, 8 -/* 10E648 802A5038 ACCE0000 */ sw $t6, ($a2) -/* 10E64C 802A503C AC580004 */ sw $t8, 4($v0) -/* 10E650 802A5040 AC4F0000 */ sw $t7, ($v0) -/* 10E654 802A5044 8CC20000 */ lw $v0, ($a2) -/* 10E658 802A5048 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10E65C 802A504C 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10E660 802A5050 24590008 */ addiu $t9, $v0, 8 -/* 10E664 802A5054 ACD90000 */ sw $t9, ($a2) -/* 10E668 802A5058 3C08B700 */ lui $t0, 0xb700 -/* 10E66C 802A505C 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10E670 802A5060 AC480000 */ sw $t0, ($v0) -/* 10E674 802A5064 AC490004 */ sw $t1, 4($v0) -/* 10E678 802A5068 0C0A8E78 */ jal func_802A39E0 -/* 10E67C 802A506C 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10E680 802A5070 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10E684 802A5074 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10E688 802A5078 3C04802C */ lui $a0, %hi(D_802B8910) # $a0, 0x802c -/* 10E68C 802A507C 24848910 */ addiu $a0, %lo(D_802B8910) # addiu $a0, $a0, -0x76f0 -/* 10E690 802A5080 11400016 */ beqz $t2, .L802A50DC -/* 10E694 802A5084 3C05800E */ lui $a1, %hi(D_800DC5F0) # $a1, 0x800e -/* 10E698 802A5088 3C0B8015 */ lui $t3, %hi(D_80150134) # $t3, 0x8015 -/* 10E69C 802A508C 256B0134 */ addiu $t3, %lo(D_80150134) # addiu $t3, $t3, 0x134 -/* 10E6A0 802A5090 AFAB0010 */ sw $t3, 0x10($sp) -/* 10E6A4 802A5094 8CA5C5F0 */ lw $a1, %lo(D_800DC5F0)($a1) -/* 10E6A8 802A5098 24060140 */ li $a2, 320 -/* 10E6AC 802A509C 0C0A9283 */ jal func_802A4A0C -/* 10E6B0 802A50A0 240700F0 */ li $a3, 240 -/* 10E6B4 802A50A4 0C015FF1 */ jal func_80057FC4 -/* 10E6B8 802A50A8 24040002 */ li $a0, 2 -/* 10E6BC 802A50AC 3C0C8015 */ lui $t4, %hi(D_80150134) # $t4, 0x8015 -/* 10E6C0 802A50B0 258C0134 */ addiu $t4, %lo(D_80150134) # addiu $t4, $t4, 0x134 -/* 10E6C4 802A50B4 3C04802C */ lui $a0, %hi(D_802B8910) # $a0, 0x802c -/* 10E6C8 802A50B8 3C05800E */ lui $a1, %hi(D_800DC5F0) # $a1, 0x800e -/* 10E6CC 802A50BC 8CA5C5F0 */ lw $a1, %lo(D_800DC5F0)($a1) -/* 10E6D0 802A50C0 24848910 */ addiu $a0, %lo(D_802B8910) # addiu $a0, $a0, -0x76f0 -/* 10E6D4 802A50C4 AFAC0010 */ sw $t4, 0x10($sp) -/* 10E6D8 802A50C8 24060140 */ li $a2, 320 -/* 10E6DC 802A50CC 0C0A921F */ jal func_802A487C -/* 10E6E0 802A50D0 240700F0 */ li $a3, 240 -/* 10E6E4 802A50D4 0C024E8C */ jal func_80093A30 -/* 10E6E8 802A50D8 24040002 */ li $a0, 2 -.L802A50DC: -/* 10E6EC 802A50DC 8FBF001C */ lw $ra, 0x1c($sp) -/* 10E6F0 802A50E0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10E6F4 802A50E4 03E00008 */ jr $ra -/* 10E6F8 802A50E8 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A50EC.s b/asm/non_matchings/code_802A3730/func_802A50EC.s deleted file mode 100644 index affb4e19c..000000000 --- a/asm/non_matchings/code_802A3730/func_802A50EC.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A50EC -/* 10E6FC 802A50EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10E700 802A50F0 AFBF001C */ sw $ra, 0x1c($sp) -/* 10E704 802A50F4 0C0A8F8F */ jal func_802A3E3C -/* 10E708 802A50F8 00000000 */ nop -/* 10E70C 802A50FC 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10E710 802A5100 0C0A8DCC */ jal func_802A3730 -/* 10E714 802A5104 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10E718 802A5108 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 10E71C 802A510C 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 10E720 802A5110 8CC20000 */ lw $v0, ($a2) -/* 10E724 802A5114 3C0FB600 */ lui $t7, 0xb600 -/* 10E728 802A5118 2418FFFF */ li $t8, -1 -/* 10E72C 802A511C 244E0008 */ addiu $t6, $v0, 8 -/* 10E730 802A5120 ACCE0000 */ sw $t6, ($a2) -/* 10E734 802A5124 AC580004 */ sw $t8, 4($v0) -/* 10E738 802A5128 AC4F0000 */ sw $t7, ($v0) -/* 10E73C 802A512C 8CC20000 */ lw $v0, ($a2) -/* 10E740 802A5130 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10E744 802A5134 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10E748 802A5138 24590008 */ addiu $t9, $v0, 8 -/* 10E74C 802A513C ACD90000 */ sw $t9, ($a2) -/* 10E750 802A5140 3C08B700 */ lui $t0, 0xb700 -/* 10E754 802A5144 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10E758 802A5148 AC480000 */ sw $t0, ($v0) -/* 10E75C 802A514C AC490004 */ sw $t1, 4($v0) -/* 10E760 802A5150 0C0A8E78 */ jal func_802A39E0 -/* 10E764 802A5154 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10E768 802A5158 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10E76C 802A515C 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10E770 802A5160 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10E774 802A5164 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10E778 802A5168 11400016 */ beqz $t2, .L802A51C4 -/* 10E77C 802A516C 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10E780 802A5170 3C0B8015 */ lui $t3, %hi(D_80150130) # $t3, 0x8015 -/* 10E784 802A5174 256B0130 */ addiu $t3, %lo(D_80150130) # addiu $t3, $t3, 0x130 -/* 10E788 802A5178 AFAB0010 */ sw $t3, 0x10($sp) -/* 10E78C 802A517C 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10E790 802A5180 24060140 */ li $a2, 320 -/* 10E794 802A5184 0C0A9283 */ jal func_802A4A0C -/* 10E798 802A5188 240700F0 */ li $a3, 240 -/* 10E79C 802A518C 0C015FF1 */ jal func_80057FC4 -/* 10E7A0 802A5190 24040001 */ li $a0, 1 -/* 10E7A4 802A5194 3C0C8015 */ lui $t4, %hi(D_80150130) # $t4, 0x8015 -/* 10E7A8 802A5198 258C0130 */ addiu $t4, %lo(D_80150130) # addiu $t4, $t4, 0x130 -/* 10E7AC 802A519C 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10E7B0 802A51A0 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10E7B4 802A51A4 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10E7B8 802A51A8 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10E7BC 802A51AC AFAC0010 */ sw $t4, 0x10($sp) -/* 10E7C0 802A51B0 24060140 */ li $a2, 320 -/* 10E7C4 802A51B4 0C0A921F */ jal func_802A487C -/* 10E7C8 802A51B8 240700F0 */ li $a3, 240 -/* 10E7CC 802A51BC 0C024E8C */ jal func_80093A30 -/* 10E7D0 802A51C0 24040001 */ li $a0, 1 -.L802A51C4: -/* 10E7D4 802A51C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 10E7D8 802A51C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10E7DC 802A51CC 03E00008 */ jr $ra -/* 10E7E0 802A51D0 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A51D4.s b/asm/non_matchings/code_802A3730/func_802A51D4.s deleted file mode 100644 index 42b5f57eb..000000000 --- a/asm/non_matchings/code_802A3730/func_802A51D4.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A51D4 -/* 10E7E4 802A51D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10E7E8 802A51D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 10E7EC 802A51DC 0C0A8F8F */ jal func_802A3E3C -/* 10E7F0 802A51E0 00000000 */ nop -/* 10E7F4 802A51E4 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10E7F8 802A51E8 0C0A8E78 */ jal func_802A39E0 -/* 10E7FC 802A51EC 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10E800 802A51F0 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10E804 802A51F4 0C0A8DCC */ jal func_802A3730 -/* 10E808 802A51F8 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10E80C 802A51FC 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 10E810 802A5200 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 10E814 802A5204 8CA20000 */ lw $v0, ($a1) -/* 10E818 802A5208 3C0FB600 */ lui $t7, 0xb600 -/* 10E81C 802A520C 2418FFFF */ li $t8, -1 -/* 10E820 802A5210 244E0008 */ addiu $t6, $v0, 8 -/* 10E824 802A5214 ACAE0000 */ sw $t6, ($a1) -/* 10E828 802A5218 AC580004 */ sw $t8, 4($v0) -/* 10E82C 802A521C AC4F0000 */ sw $t7, ($v0) -/* 10E830 802A5220 8CA20000 */ lw $v0, ($a1) -/* 10E834 802A5224 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10E838 802A5228 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10E83C 802A522C 24590008 */ addiu $t9, $v0, 8 -/* 10E840 802A5230 ACB90000 */ sw $t9, ($a1) -/* 10E844 802A5234 3C08B700 */ lui $t0, 0xb700 -/* 10E848 802A5238 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10E84C 802A523C AC480000 */ sw $t0, ($v0) -/* 10E850 802A5240 AC490004 */ sw $t1, 4($v0) -/* 10E854 802A5244 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10E858 802A5248 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10E85C 802A524C 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10E860 802A5250 11400016 */ beqz $t2, .L802A52AC -/* 10E864 802A5254 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10E868 802A5258 3C0B8015 */ lui $t3, %hi(D_80150130) # $t3, 0x8015 -/* 10E86C 802A525C 256B0130 */ addiu $t3, %lo(D_80150130) # addiu $t3, $t3, 0x130 -/* 10E870 802A5260 AFAB0010 */ sw $t3, 0x10($sp) -/* 10E874 802A5264 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10E878 802A5268 24060140 */ li $a2, 320 -/* 10E87C 802A526C 0C0A9283 */ jal func_802A4A0C -/* 10E880 802A5270 240700F0 */ li $a3, 240 -/* 10E884 802A5274 0C015FF1 */ jal func_80057FC4 -/* 10E888 802A5278 24040003 */ li $a0, 3 -/* 10E88C 802A527C 3C0C8015 */ lui $t4, %hi(D_80150130) # $t4, 0x8015 -/* 10E890 802A5280 258C0130 */ addiu $t4, %lo(D_80150130) # addiu $t4, $t4, 0x130 -/* 10E894 802A5284 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10E898 802A5288 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10E89C 802A528C 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10E8A0 802A5290 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10E8A4 802A5294 AFAC0010 */ sw $t4, 0x10($sp) -/* 10E8A8 802A5298 24060140 */ li $a2, 320 -/* 10E8AC 802A529C 0C0A921F */ jal func_802A487C -/* 10E8B0 802A52A0 240700F0 */ li $a3, 240 -/* 10E8B4 802A52A4 0C024E8C */ jal func_80093A30 -/* 10E8B8 802A52A8 24040003 */ li $a0, 3 -.L802A52AC: -/* 10E8BC 802A52AC 8FBF001C */ lw $ra, 0x1c($sp) -/* 10E8C0 802A52B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10E8C4 802A52B4 03E00008 */ jr $ra -/* 10E8C8 802A52B8 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A52BC.s b/asm/non_matchings/code_802A3730/func_802A52BC.s deleted file mode 100644 index d8378e9e7..000000000 --- a/asm/non_matchings/code_802A3730/func_802A52BC.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A52BC -/* 10E8CC 802A52BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10E8D0 802A52C0 AFBF001C */ sw $ra, 0x1c($sp) -/* 10E8D4 802A52C4 0C0A8F8F */ jal func_802A3E3C -/* 10E8D8 802A52C8 00000000 */ nop -/* 10E8DC 802A52CC 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10E8E0 802A52D0 0C0A8E78 */ jal func_802A39E0 -/* 10E8E4 802A52D4 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10E8E8 802A52D8 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10E8EC 802A52DC 0C0A8DCC */ jal func_802A3730 -/* 10E8F0 802A52E0 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10E8F4 802A52E4 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 10E8F8 802A52E8 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 10E8FC 802A52EC 8CA20000 */ lw $v0, ($a1) -/* 10E900 802A52F0 3C0FB600 */ lui $t7, 0xb600 -/* 10E904 802A52F4 2418FFFF */ li $t8, -1 -/* 10E908 802A52F8 244E0008 */ addiu $t6, $v0, 8 -/* 10E90C 802A52FC ACAE0000 */ sw $t6, ($a1) -/* 10E910 802A5300 AC580004 */ sw $t8, 4($v0) -/* 10E914 802A5304 AC4F0000 */ sw $t7, ($v0) -/* 10E918 802A5308 8CA20000 */ lw $v0, ($a1) -/* 10E91C 802A530C 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10E920 802A5310 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10E924 802A5314 24590008 */ addiu $t9, $v0, 8 -/* 10E928 802A5318 ACB90000 */ sw $t9, ($a1) -/* 10E92C 802A531C 3C08B700 */ lui $t0, 0xb700 -/* 10E930 802A5320 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10E934 802A5324 AC480000 */ sw $t0, ($v0) -/* 10E938 802A5328 AC490004 */ sw $t1, 4($v0) -/* 10E93C 802A532C 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10E940 802A5330 3C04802C */ lui $a0, %hi(D_802B8910) # $a0, 0x802c -/* 10E944 802A5334 24848910 */ addiu $a0, %lo(D_802B8910) # addiu $a0, $a0, -0x76f0 -/* 10E948 802A5338 11400016 */ beqz $t2, .L802A5394 -/* 10E94C 802A533C 3C05800E */ lui $a1, %hi(D_800DC5F0) # $a1, 0x800e -/* 10E950 802A5340 3C0B8015 */ lui $t3, %hi(D_80150134) # $t3, 0x8015 -/* 10E954 802A5344 256B0134 */ addiu $t3, %lo(D_80150134) # addiu $t3, $t3, 0x134 -/* 10E958 802A5348 AFAB0010 */ sw $t3, 0x10($sp) -/* 10E95C 802A534C 8CA5C5F0 */ lw $a1, %lo(D_800DC5F0)($a1) -/* 10E960 802A5350 24060140 */ li $a2, 320 -/* 10E964 802A5354 0C0A9283 */ jal func_802A4A0C -/* 10E968 802A5358 240700F0 */ li $a3, 240 -/* 10E96C 802A535C 0C015FF1 */ jal func_80057FC4 -/* 10E970 802A5360 24040004 */ li $a0, 4 -/* 10E974 802A5364 3C0C8015 */ lui $t4, %hi(D_80150134) # $t4, 0x8015 -/* 10E978 802A5368 258C0134 */ addiu $t4, %lo(D_80150134) # addiu $t4, $t4, 0x134 -/* 10E97C 802A536C 3C04802C */ lui $a0, %hi(D_802B8910) # $a0, 0x802c -/* 10E980 802A5370 3C05800E */ lui $a1, %hi(D_800DC5F0) # $a1, 0x800e -/* 10E984 802A5374 8CA5C5F0 */ lw $a1, %lo(D_800DC5F0)($a1) -/* 10E988 802A5378 24848910 */ addiu $a0, %lo(D_802B8910) # addiu $a0, $a0, -0x76f0 -/* 10E98C 802A537C AFAC0010 */ sw $t4, 0x10($sp) -/* 10E990 802A5380 24060140 */ li $a2, 320 -/* 10E994 802A5384 0C0A921F */ jal func_802A487C -/* 10E998 802A5388 240700F0 */ li $a3, 240 -/* 10E99C 802A538C 0C024E8C */ jal func_80093A30 -/* 10E9A0 802A5390 24040004 */ li $a0, 4 -.L802A5394: -/* 10E9A4 802A5394 8FBF001C */ lw $ra, 0x1c($sp) -/* 10E9A8 802A5398 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10E9AC 802A539C 03E00008 */ jr $ra -/* 10E9B0 802A53A0 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A53A4.s b/asm/non_matchings/code_802A3730/func_802A53A4.s deleted file mode 100644 index 0b304f550..000000000 --- a/asm/non_matchings/code_802A3730/func_802A53A4.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_802A53A4 -/* 10E9B4 802A53A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10E9B8 802A53A8 AFBF001C */ sw $ra, 0x1c($sp) -/* 10E9BC 802A53AC 0C0A9F02 */ jal func_802A7C08 -/* 10E9C0 802A53B0 00000000 */ nop -/* 10E9C4 802A53B4 0C0A8F8F */ jal func_802A3E3C -/* 10E9C8 802A53B8 00000000 */ nop -/* 10E9CC 802A53BC 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10E9D0 802A53C0 0C0A8DCC */ jal func_802A3730 -/* 10E9D4 802A53C4 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10E9D8 802A53C8 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 10E9DC 802A53CC 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 10E9E0 802A53D0 8CA20000 */ lw $v0, ($a1) -/* 10E9E4 802A53D4 3C0FB600 */ lui $t7, 0xb600 -/* 10E9E8 802A53D8 2418FFFF */ li $t8, -1 -/* 10E9EC 802A53DC 244E0008 */ addiu $t6, $v0, 8 -/* 10E9F0 802A53E0 ACAE0000 */ sw $t6, ($a1) -/* 10E9F4 802A53E4 AC580004 */ sw $t8, 4($v0) -/* 10E9F8 802A53E8 AC4F0000 */ sw $t7, ($v0) -/* 10E9FC 802A53EC 8CA20000 */ lw $v0, ($a1) -/* 10EA00 802A53F0 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10EA04 802A53F4 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10EA08 802A53F8 24590008 */ addiu $t9, $v0, 8 -/* 10EA0C 802A53FC ACB90000 */ sw $t9, ($a1) -/* 10EA10 802A5400 3C08B700 */ lui $t0, 0xb700 -/* 10EA14 802A5404 AC480000 */ sw $t0, ($v0) -/* 10EA18 802A5408 0C0A8F2C */ jal func_802A3CB0 -/* 10EA1C 802A540C AC490004 */ sw $t1, 4($v0) -/* 10EA20 802A5410 0C0A9075 */ jal func_802A41D4 -/* 10EA24 802A5414 00000000 */ nop -/* 10EA28 802A5418 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10EA2C 802A541C 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10EA30 802A5420 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10EA34 802A5424 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10EA38 802A5428 1140001B */ beqz $t2, .L802A5498 -/* 10EA3C 802A542C 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10EA40 802A5430 3C0B8015 */ lui $t3, %hi(D_80150130) # $t3, 0x8015 -/* 10EA44 802A5434 256B0130 */ addiu $t3, %lo(D_80150130) # addiu $t3, $t3, 0x130 -/* 10EA48 802A5438 AFAB0010 */ sw $t3, 0x10($sp) -/* 10EA4C 802A543C 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10EA50 802A5440 24060140 */ li $a2, 320 -/* 10EA54 802A5444 0C0A9283 */ jal func_802A4A0C -/* 10EA58 802A5448 240700F0 */ li $a3, 240 -/* 10EA5C 802A544C 3C0C800E */ lui $t4, %hi(D_800DC50C) # $t4, 0x800e -/* 10EA60 802A5450 8D8CC50C */ lw $t4, %lo(D_800DC50C)($t4) -/* 10EA64 802A5454 24010009 */ li $at, 9 -/* 10EA68 802A5458 11810003 */ beq $t4, $at, .L802A5468 -/* 10EA6C 802A545C 00000000 */ nop -/* 10EA70 802A5460 0C015FF1 */ jal func_80057FC4 -/* 10EA74 802A5464 00002025 */ move $a0, $zero -.L802A5468: -/* 10EA78 802A5468 3C0D8015 */ lui $t5, %hi(D_80150130) # $t5, 0x8015 -/* 10EA7C 802A546C 25AD0130 */ addiu $t5, %lo(D_80150130) # addiu $t5, $t5, 0x130 -/* 10EA80 802A5470 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10EA84 802A5474 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10EA88 802A5478 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10EA8C 802A547C 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10EA90 802A5480 AFAD0010 */ sw $t5, 0x10($sp) -/* 10EA94 802A5484 24060140 */ li $a2, 320 -/* 10EA98 802A5488 0C0A921F */ jal func_802A487C -/* 10EA9C 802A548C 240700F0 */ li $a3, 240 -/* 10EAA0 802A5490 0C024E8C */ jal func_80093A30 -/* 10EAA4 802A5494 00002025 */ move $a0, $zero -.L802A5498: -/* 10EAA8 802A5498 8FBF001C */ lw $ra, 0x1c($sp) -/* 10EAAC 802A549C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10EAB0 802A54A0 03E00008 */ jr $ra -/* 10EAB4 802A54A4 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A54A8.s b/asm/non_matchings/code_802A3730/func_802A54A8.s deleted file mode 100644 index 460280a1d..000000000 --- a/asm/non_matchings/code_802A3730/func_802A54A8.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A54A8 -/* 10EAB8 802A54A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10EABC 802A54AC AFBF001C */ sw $ra, 0x1c($sp) -/* 10EAC0 802A54B0 0C0A8F8F */ jal func_802A3E3C -/* 10EAC4 802A54B4 00000000 */ nop -/* 10EAC8 802A54B8 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10EACC 802A54BC 0C0A8E78 */ jal func_802A39E0 -/* 10EAD0 802A54C0 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10EAD4 802A54C4 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10EAD8 802A54C8 0C0A8DCC */ jal func_802A3730 -/* 10EADC 802A54CC 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10EAE0 802A54D0 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 10EAE4 802A54D4 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 10EAE8 802A54D8 8CA20000 */ lw $v0, ($a1) -/* 10EAEC 802A54DC 3C0FB600 */ lui $t7, 0xb600 -/* 10EAF0 802A54E0 2418FFFF */ li $t8, -1 -/* 10EAF4 802A54E4 244E0008 */ addiu $t6, $v0, 8 -/* 10EAF8 802A54E8 ACAE0000 */ sw $t6, ($a1) -/* 10EAFC 802A54EC AC580004 */ sw $t8, 4($v0) -/* 10EB00 802A54F0 AC4F0000 */ sw $t7, ($v0) -/* 10EB04 802A54F4 8CA20000 */ lw $v0, ($a1) -/* 10EB08 802A54F8 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10EB0C 802A54FC 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10EB10 802A5500 24590008 */ addiu $t9, $v0, 8 -/* 10EB14 802A5504 ACB90000 */ sw $t9, ($a1) -/* 10EB18 802A5508 3C08B700 */ lui $t0, 0xb700 -/* 10EB1C 802A550C 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10EB20 802A5510 AC480000 */ sw $t0, ($v0) -/* 10EB24 802A5514 AC490004 */ sw $t1, 4($v0) -/* 10EB28 802A5518 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10EB2C 802A551C 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10EB30 802A5520 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10EB34 802A5524 11400016 */ beqz $t2, .L802A5580 -/* 10EB38 802A5528 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10EB3C 802A552C 3C0B8015 */ lui $t3, %hi(D_80150130) # $t3, 0x8015 -/* 10EB40 802A5530 256B0130 */ addiu $t3, %lo(D_80150130) # addiu $t3, $t3, 0x130 -/* 10EB44 802A5534 AFAB0010 */ sw $t3, 0x10($sp) -/* 10EB48 802A5538 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10EB4C 802A553C 24060140 */ li $a2, 320 -/* 10EB50 802A5540 0C0A9283 */ jal func_802A4A0C -/* 10EB54 802A5544 240700F0 */ li $a3, 240 -/* 10EB58 802A5548 0C015FF1 */ jal func_80057FC4 -/* 10EB5C 802A554C 24040008 */ li $a0, 8 -/* 10EB60 802A5550 3C0C8015 */ lui $t4, %hi(D_80150130) # $t4, 0x8015 -/* 10EB64 802A5554 258C0130 */ addiu $t4, %lo(D_80150130) # addiu $t4, $t4, 0x130 -/* 10EB68 802A5558 3C04802C */ lui $a0, %hi(D_802B8890) # $a0, 0x802c -/* 10EB6C 802A555C 3C05800E */ lui $a1, %hi(D_800DC5EC) # $a1, 0x800e -/* 10EB70 802A5560 8CA5C5EC */ lw $a1, %lo(D_800DC5EC)($a1) -/* 10EB74 802A5564 24848890 */ addiu $a0, %lo(D_802B8890) # addiu $a0, $a0, -0x7770 -/* 10EB78 802A5568 AFAC0010 */ sw $t4, 0x10($sp) -/* 10EB7C 802A556C 24060140 */ li $a2, 320 -/* 10EB80 802A5570 0C0A921F */ jal func_802A487C -/* 10EB84 802A5574 240700F0 */ li $a3, 240 -/* 10EB88 802A5578 0C024E8C */ jal func_80093A30 -/* 10EB8C 802A557C 24040008 */ li $a0, 8 -.L802A5580: -/* 10EB90 802A5580 8FBF001C */ lw $ra, 0x1c($sp) -/* 10EB94 802A5584 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10EB98 802A5588 03E00008 */ jr $ra -/* 10EB9C 802A558C 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A5590.s b/asm/non_matchings/code_802A3730/func_802A5590.s deleted file mode 100644 index 55104916b..000000000 --- a/asm/non_matchings/code_802A3730/func_802A5590.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A5590 -/* 10EBA0 802A5590 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10EBA4 802A5594 AFBF001C */ sw $ra, 0x1c($sp) -/* 10EBA8 802A5598 0C0A8F8F */ jal func_802A3E3C -/* 10EBAC 802A559C 00000000 */ nop -/* 10EBB0 802A55A0 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10EBB4 802A55A4 0C0A8E78 */ jal func_802A39E0 -/* 10EBB8 802A55A8 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10EBBC 802A55AC 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10EBC0 802A55B0 0C0A8DCC */ jal func_802A3730 -/* 10EBC4 802A55B4 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10EBC8 802A55B8 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 10EBCC 802A55BC 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 10EBD0 802A55C0 8CA20000 */ lw $v0, ($a1) -/* 10EBD4 802A55C4 3C0FB600 */ lui $t7, 0xb600 -/* 10EBD8 802A55C8 2418FFFF */ li $t8, -1 -/* 10EBDC 802A55CC 244E0008 */ addiu $t6, $v0, 8 -/* 10EBE0 802A55D0 ACAE0000 */ sw $t6, ($a1) -/* 10EBE4 802A55D4 AC580004 */ sw $t8, 4($v0) -/* 10EBE8 802A55D8 AC4F0000 */ sw $t7, ($v0) -/* 10EBEC 802A55DC 8CA20000 */ lw $v0, ($a1) -/* 10EBF0 802A55E0 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10EBF4 802A55E4 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10EBF8 802A55E8 24590008 */ addiu $t9, $v0, 8 -/* 10EBFC 802A55EC ACB90000 */ sw $t9, ($a1) -/* 10EC00 802A55F0 3C08B700 */ lui $t0, 0xb700 -/* 10EC04 802A55F4 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10EC08 802A55F8 AC480000 */ sw $t0, ($v0) -/* 10EC0C 802A55FC AC490004 */ sw $t1, 4($v0) -/* 10EC10 802A5600 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10EC14 802A5604 3C04802C */ lui $a0, %hi(D_802B8910) # $a0, 0x802c -/* 10EC18 802A5608 24848910 */ addiu $a0, %lo(D_802B8910) # addiu $a0, $a0, -0x76f0 -/* 10EC1C 802A560C 11400016 */ beqz $t2, .L802A5668 -/* 10EC20 802A5610 3C05800E */ lui $a1, %hi(D_800DC5F0) # $a1, 0x800e -/* 10EC24 802A5614 3C0B8015 */ lui $t3, %hi(D_80150134) # $t3, 0x8015 -/* 10EC28 802A5618 256B0134 */ addiu $t3, %lo(D_80150134) # addiu $t3, $t3, 0x134 -/* 10EC2C 802A561C AFAB0010 */ sw $t3, 0x10($sp) -/* 10EC30 802A5620 8CA5C5F0 */ lw $a1, %lo(D_800DC5F0)($a1) -/* 10EC34 802A5624 24060140 */ li $a2, 320 -/* 10EC38 802A5628 0C0A9283 */ jal func_802A4A0C -/* 10EC3C 802A562C 240700F0 */ li $a3, 240 -/* 10EC40 802A5630 0C015FF1 */ jal func_80057FC4 -/* 10EC44 802A5634 24040009 */ li $a0, 9 -/* 10EC48 802A5638 3C0C8015 */ lui $t4, %hi(D_80150134) # $t4, 0x8015 -/* 10EC4C 802A563C 258C0134 */ addiu $t4, %lo(D_80150134) # addiu $t4, $t4, 0x134 -/* 10EC50 802A5640 3C04802C */ lui $a0, %hi(D_802B8910) # $a0, 0x802c -/* 10EC54 802A5644 3C05800E */ lui $a1, %hi(D_800DC5F0) # $a1, 0x800e -/* 10EC58 802A5648 8CA5C5F0 */ lw $a1, %lo(D_800DC5F0)($a1) -/* 10EC5C 802A564C 24848910 */ addiu $a0, %lo(D_802B8910) # addiu $a0, $a0, -0x76f0 -/* 10EC60 802A5650 AFAC0010 */ sw $t4, 0x10($sp) -/* 10EC64 802A5654 24060140 */ li $a2, 320 -/* 10EC68 802A5658 0C0A921F */ jal func_802A487C -/* 10EC6C 802A565C 240700F0 */ li $a3, 240 -/* 10EC70 802A5660 0C024E8C */ jal func_80093A30 -/* 10EC74 802A5664 24040009 */ li $a0, 9 -.L802A5668: -/* 10EC78 802A5668 8FBF001C */ lw $ra, 0x1c($sp) -/* 10EC7C 802A566C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10EC80 802A5670 03E00008 */ jr $ra -/* 10EC84 802A5674 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A5678.s b/asm/non_matchings/code_802A3730/func_802A5678.s deleted file mode 100644 index e0e5f7de6..000000000 --- a/asm/non_matchings/code_802A3730/func_802A5678.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A5678 -/* 10EC88 802A5678 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10EC8C 802A567C AFBF001C */ sw $ra, 0x1c($sp) -/* 10EC90 802A5680 0C0A8F8F */ jal func_802A3E3C -/* 10EC94 802A5684 00000000 */ nop -/* 10EC98 802A5688 3C04800E */ lui $a0, %hi(D_800DC5F4) # $a0, 0x800e -/* 10EC9C 802A568C 0C0A8E78 */ jal func_802A39E0 -/* 10ECA0 802A5690 8C84C5F4 */ lw $a0, %lo(D_800DC5F4)($a0) -/* 10ECA4 802A5694 3C04800E */ lui $a0, %hi(D_800DC5F4) # $a0, 0x800e -/* 10ECA8 802A5698 0C0A8DCC */ jal func_802A3730 -/* 10ECAC 802A569C 8C84C5F4 */ lw $a0, %lo(D_800DC5F4)($a0) -/* 10ECB0 802A56A0 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 10ECB4 802A56A4 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 10ECB8 802A56A8 8CA20000 */ lw $v0, ($a1) -/* 10ECBC 802A56AC 3C0FB600 */ lui $t7, 0xb600 -/* 10ECC0 802A56B0 2418FFFF */ li $t8, -1 -/* 10ECC4 802A56B4 244E0008 */ addiu $t6, $v0, 8 -/* 10ECC8 802A56B8 ACAE0000 */ sw $t6, ($a1) -/* 10ECCC 802A56BC AC580004 */ sw $t8, 4($v0) -/* 10ECD0 802A56C0 AC4F0000 */ sw $t7, ($v0) -/* 10ECD4 802A56C4 8CA20000 */ lw $v0, ($a1) -/* 10ECD8 802A56C8 3C090080 */ lui $t1, (0x00800204 >> 16) # lui $t1, 0x80 -/* 10ECDC 802A56CC 35290204 */ ori $t1, (0x00800204 & 0xFFFF) # ori $t1, $t1, 0x204 -/* 10ECE0 802A56D0 24590008 */ addiu $t9, $v0, 8 -/* 10ECE4 802A56D4 ACB90000 */ sw $t9, ($a1) -/* 10ECE8 802A56D8 3C08B700 */ lui $t0, 0xb700 -/* 10ECEC 802A56DC 3C0A800E */ lui $t2, %hi(D_800DC5B4) # $t2, 0x800e -/* 10ECF0 802A56E0 AC480000 */ sw $t0, ($v0) -/* 10ECF4 802A56E4 AC490004 */ sw $t1, 4($v0) -/* 10ECF8 802A56E8 954AC5B4 */ lhu $t2, %lo(D_800DC5B4)($t2) -/* 10ECFC 802A56EC 3C04802C */ lui $a0, %hi(D_802B8990) # $a0, 0x802c -/* 10ED00 802A56F0 24848990 */ addiu $a0, %lo(D_802B8990) # addiu $a0, $a0, -0x7670 -/* 10ED04 802A56F4 11400016 */ beqz $t2, .L802A5750 -/* 10ED08 802A56F8 3C05800E */ lui $a1, %hi(D_800DC5F4) # $a1, 0x800e -/* 10ED0C 802A56FC 3C0B8015 */ lui $t3, %hi(D_80150138) # $t3, 0x8015 -/* 10ED10 802A5700 256B0138 */ addiu $t3, %lo(D_80150138) # addiu $t3, $t3, 0x138 -/* 10ED14 802A5704 AFAB0010 */ sw $t3, 0x10($sp) -/* 10ED18 802A5708 8CA5C5F4 */ lw $a1, %lo(D_800DC5F4)($a1) -/* 10ED1C 802A570C 24060140 */ li $a2, 320 -/* 10ED20 802A5710 0C0A9283 */ jal func_802A4A0C -/* 10ED24 802A5714 240700F0 */ li $a3, 240 -/* 10ED28 802A5718 0C015FF1 */ jal func_80057FC4 -/* 10ED2C 802A571C 2404000A */ li $a0, 10 -/* 10ED30 802A5720 3C0C8015 */ lui $t4, %hi(D_80150138) # $t4, 0x8015 -/* 10ED34 802A5724 258C0138 */ addiu $t4, %lo(D_80150138) # addiu $t4, $t4, 0x138 -/* 10ED38 802A5728 3C04802C */ lui $a0, %hi(D_802B8990) # $a0, 0x802c -/* 10ED3C 802A572C 3C05800E */ lui $a1, %hi(D_800DC5F4) # $a1, 0x800e -/* 10ED40 802A5730 8CA5C5F4 */ lw $a1, %lo(D_800DC5F4)($a1) -/* 10ED44 802A5734 24848990 */ addiu $a0, %lo(D_802B8990) # addiu $a0, $a0, -0x7670 -/* 10ED48 802A5738 AFAC0010 */ sw $t4, 0x10($sp) -/* 10ED4C 802A573C 24060140 */ li $a2, 320 -/* 10ED50 802A5740 0C0A921F */ jal func_802A487C -/* 10ED54 802A5744 240700F0 */ li $a3, 240 -/* 10ED58 802A5748 0C024E8C */ jal func_80093A30 -/* 10ED5C 802A574C 2404000A */ li $a0, 10 -.L802A5750: -/* 10ED60 802A5750 8FBF001C */ lw $ra, 0x1c($sp) -/* 10ED64 802A5754 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10ED68 802A5758 03E00008 */ jr $ra -/* 10ED6C 802A575C 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A5760.s b/asm/non_matchings/code_802A3730/func_802A5760.s deleted file mode 100644 index e0b0841ae..000000000 --- a/asm/non_matchings/code_802A3730/func_802A5760.s +++ /dev/null @@ -1,149 +0,0 @@ -glabel func_802A5760 -/* 10ED70 802A5760 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 10ED74 802A5764 AFBF001C */ sw $ra, 0x1c($sp) -/* 10ED78 802A5768 0C0A8F8F */ jal func_802A3E3C -/* 10ED7C 802A576C 00000000 */ nop -/* 10ED80 802A5770 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10ED84 802A5774 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10ED88 802A5778 8C620000 */ lw $v0, ($v1) -/* 10ED8C 802A577C 3C0FB600 */ lui $t7, 0xb600 -/* 10ED90 802A5780 2418FFFF */ li $t8, -1 -/* 10ED94 802A5784 244E0008 */ addiu $t6, $v0, 8 -/* 10ED98 802A5788 AC6E0000 */ sw $t6, ($v1) -/* 10ED9C 802A578C AC580004 */ sw $t8, 4($v0) -/* 10EDA0 802A5790 AC4F0000 */ sw $t7, ($v0) -/* 10EDA4 802A5794 8C620000 */ lw $v0, ($v1) -/* 10EDA8 802A5798 3C0F0080 */ lui $t7, (0x00800204 >> 16) # lui $t7, 0x80 -/* 10EDAC 802A579C 35EF0204 */ ori $t7, (0x00800204 & 0xFFFF) # ori $t7, $t7, 0x204 -/* 10EDB0 802A57A0 24590008 */ addiu $t9, $v0, 8 -/* 10EDB4 802A57A4 AC790000 */ sw $t9, ($v1) -/* 10EDB8 802A57A8 3C0EB700 */ lui $t6, 0xb700 -/* 10EDBC 802A57AC 3C18800E */ lui $t8, %hi(gPlayerCountSelection1) # $t8, 0x800e -/* 10EDC0 802A57B0 AC4E0000 */ sw $t6, ($v0) -/* 10EDC4 802A57B4 AC4F0004 */ sw $t7, 4($v0) -/* 10EDC8 802A57B8 8F18C538 */ lw $t8, %lo(gPlayerCountSelection1)($t8) -/* 10EDCC 802A57BC 24010003 */ li $at, 3 -/* 10EDD0 802A57C0 3C04800E */ lui $a0, %hi(D_800DC5F8) # 0x800e -/* 10EDD4 802A57C4 17010053 */ bne $t8, $at, .L802A5914 -/* 10EDD8 802A57C8 00000000 */ nop -/* 10EDDC 802A57CC 8C620000 */ lw $v0, ($v1) -/* 10EDE0 802A57D0 3C0EE700 */ lui $t6, 0xe700 -/* 10EDE4 802A57D4 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 10EDE8 802A57D8 24590008 */ addiu $t9, $v0, 8 -/* 10EDEC 802A57DC AC790000 */ sw $t9, ($v1) -/* 10EDF0 802A57E0 AC400004 */ sw $zero, 4($v0) -/* 10EDF4 802A57E4 AC4E0000 */ sw $t6, ($v0) -/* 10EDF8 802A57E8 0C0A8E78 */ jal func_802A39E0 -/* 10EDFC 802A57EC 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 10EE00 802A57F0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 10EE04 802A57F4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 10EE08 802A57F8 8C620000 */ lw $v0, ($v1) -/* 10EE0C 802A57FC 3C0DBA00 */ lui $t5, (0xBA001402 >> 16) # lui $t5, 0xba00 -/* 10EE10 802A5800 35AD1402 */ ori $t5, (0xBA001402 & 0xFFFF) # ori $t5, $t5, 0x1402 -/* 10EE14 802A5804 244F0008 */ addiu $t7, $v0, 8 -/* 10EE18 802A5808 AC6F0000 */ sw $t7, ($v1) -/* 10EE1C 802A580C 3C180030 */ lui $t8, 0x30 -/* 10EE20 802A5810 AC580004 */ sw $t8, 4($v0) -/* 10EE24 802A5814 AC4D0000 */ sw $t5, ($v0) -/* 10EE28 802A5818 8C620000 */ lw $v0, ($v1) -/* 10EE2C 802A581C 3C0EFF10 */ lui $t6, (0xFF10013F >> 16) # lui $t6, 0xff10 -/* 10EE30 802A5820 35CE013F */ ori $t6, (0xFF10013F & 0xFFFF) # ori $t6, $t6, 0x13f -/* 10EE34 802A5824 24590008 */ addiu $t9, $v0, 8 -/* 10EE38 802A5828 AC790000 */ sw $t9, ($v1) -/* 10EE3C 802A582C 3C0F800E */ lui $t7, %hi(sRenderingFramebuffer) # $t7, 0x800e -/* 10EE40 802A5830 AC4E0000 */ sw $t6, ($v0) -/* 10EE44 802A5834 95EFC560 */ lhu $t7, %lo(sRenderingFramebuffer)($t7) -/* 10EE48 802A5838 3C198015 */ lui $t9, %hi(gPhysicalFramebuffers) # 0x8015 -/* 10EE4C 802A583C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10EE50 802A5840 000FC080 */ sll $t8, $t7, 2 -/* 10EE54 802A5844 0338C821 */ addu $t9, $t9, $t8 -/* 10EE58 802A5848 8F3902A8 */ lw $t9, %lo(gPhysicalFramebuffers)($t9) -/* 10EE5C 802A584C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10EE60 802A5850 3C18F700 */ lui $t8, 0xf700 -/* 10EE64 802A5854 03217024 */ and $t6, $t9, $at -/* 10EE68 802A5858 AC4E0004 */ sw $t6, 4($v0) -/* 10EE6C 802A585C 8C620000 */ lw $v0, ($v1) -/* 10EE70 802A5860 3C190001 */ lui $t9, (0x00010001 >> 16) # lui $t9, 1 -/* 10EE74 802A5864 37390001 */ ori $t9, (0x00010001 & 0xFFFF) # ori $t9, $t9, 1 -/* 10EE78 802A5868 244F0008 */ addiu $t7, $v0, 8 -/* 10EE7C 802A586C AC6F0000 */ sw $t7, ($v1) -/* 10EE80 802A5870 AC590004 */ sw $t9, 4($v0) -/* 10EE84 802A5874 AC580000 */ sw $t8, ($v0) -/* 10EE88 802A5878 8C620000 */ lw $v0, ($v1) -/* 10EE8C 802A587C 3C1FE700 */ lui $ra, 0xe700 -/* 10EE90 802A5880 3C18ED28 */ lui $t8, (0xED2801E0 >> 16) # lui $t8, 0xed28 -/* 10EE94 802A5884 244E0008 */ addiu $t6, $v0, 8 -/* 10EE98 802A5888 AC6E0000 */ sw $t6, ($v1) -/* 10EE9C 802A588C AC400004 */ sw $zero, 4($v0) -/* 10EEA0 802A5890 AC5F0000 */ sw $ra, ($v0) -/* 10EEA4 802A5894 8C620000 */ lw $v0, ($v1) -/* 10EEA8 802A5898 3C190050 */ lui $t9, (0x005003C0 >> 16) # lui $t9, 0x50 -/* 10EEAC 802A589C 373903C0 */ ori $t9, (0x005003C0 & 0xFFFF) # ori $t9, $t9, 0x3c0 -/* 10EEB0 802A58A0 244F0008 */ addiu $t7, $v0, 8 -/* 10EEB4 802A58A4 AC6F0000 */ sw $t7, ($v1) -/* 10EEB8 802A58A8 371801E0 */ ori $t8, (0xED2801E0 & 0xFFFF) # ori $t8, $t8, 0x1e0 -/* 10EEBC 802A58AC AC580000 */ sw $t8, ($v0) -/* 10EEC0 802A58B0 AC590004 */ sw $t9, 4($v0) -/* 10EEC4 802A58B4 8C620000 */ lw $v0, ($v1) -/* 10EEC8 802A58B8 3C180028 */ lui $t8, (0x002801E0 >> 16) # lui $t8, 0x28 -/* 10EECC 802A58BC 3C0FF64F */ lui $t7, (0xF64FC3BC >> 16) # lui $t7, 0xf64f -/* 10EED0 802A58C0 244E0008 */ addiu $t6, $v0, 8 -/* 10EED4 802A58C4 AC6E0000 */ sw $t6, ($v1) -/* 10EED8 802A58C8 35EFC3BC */ ori $t7, (0xF64FC3BC & 0xFFFF) # ori $t7, $t7, 0xc3bc -/* 10EEDC 802A58CC 371801E0 */ ori $t8, (0x002801E0 & 0xFFFF) # ori $t8, $t8, 0x1e0 -/* 10EEE0 802A58D0 AC580004 */ sw $t8, 4($v0) -/* 10EEE4 802A58D4 AC4F0000 */ sw $t7, ($v0) -/* 10EEE8 802A58D8 8C620000 */ lw $v0, ($v1) -/* 10EEEC 802A58DC 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 10EEF0 802A58E0 24590008 */ addiu $t9, $v0, 8 -/* 10EEF4 802A58E4 AC790000 */ sw $t9, ($v1) -/* 10EEF8 802A58E8 AC400004 */ sw $zero, 4($v0) -/* 10EEFC 802A58EC AC5F0000 */ sw $ra, ($v0) -/* 10EF00 802A58F0 8C620000 */ lw $v0, ($v1) -/* 10EF04 802A58F4 244E0008 */ addiu $t6, $v0, 8 -/* 10EF08 802A58F8 AC6E0000 */ sw $t6, ($v1) -/* 10EF0C 802A58FC AC400004 */ sw $zero, 4($v0) -/* 10EF10 802A5900 AC4D0000 */ sw $t5, ($v0) -/* 10EF14 802A5904 0C0A8DCC */ jal func_802A3730 -/* 10EF18 802A5908 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 10EF1C 802A590C 10000022 */ b .L802A5998 -/* 10EF20 802A5910 8FBF001C */ lw $ra, 0x1c($sp) -.L802A5914: -/* 10EF24 802A5914 0C0A8DCC */ jal func_802A3730 -/* 10EF28 802A5918 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) # -0x3a08($a0) -/* 10EF2C 802A591C 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 10EF30 802A5920 0C0A8E78 */ jal func_802A39E0 -/* 10EF34 802A5924 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 10EF38 802A5928 3C0F800E */ lui $t7, %hi(D_800DC5B4) # $t7, 0x800e -/* 10EF3C 802A592C 95EFC5B4 */ lhu $t7, %lo(D_800DC5B4)($t7) -/* 10EF40 802A5930 3C04802C */ lui $a0, %hi(D_802B8A10) # $a0, 0x802c -/* 10EF44 802A5934 24848A10 */ addiu $a0, %lo(D_802B8A10) # addiu $a0, $a0, -0x75f0 -/* 10EF48 802A5938 11E00016 */ beqz $t7, .L802A5994 -/* 10EF4C 802A593C 3C05800E */ lui $a1, %hi(D_800DC5F8) # $a1, 0x800e -/* 10EF50 802A5940 3C188015 */ lui $t8, %hi(D_8015013C) # $t8, 0x8015 -/* 10EF54 802A5944 2718013C */ addiu $t8, %lo(D_8015013C) # addiu $t8, $t8, 0x13c -/* 10EF58 802A5948 AFB80010 */ sw $t8, 0x10($sp) -/* 10EF5C 802A594C 8CA5C5F8 */ lw $a1, %lo(D_800DC5F8)($a1) -/* 10EF60 802A5950 24060140 */ li $a2, 320 -/* 10EF64 802A5954 0C0A9283 */ jal func_802A4A0C -/* 10EF68 802A5958 240700F0 */ li $a3, 240 -/* 10EF6C 802A595C 0C015FF1 */ jal func_80057FC4 -/* 10EF70 802A5960 2404000B */ li $a0, 11 -/* 10EF74 802A5964 3C198015 */ lui $t9, %hi(D_8015013C) # $t9, 0x8015 -/* 10EF78 802A5968 2739013C */ addiu $t9, %lo(D_8015013C) # addiu $t9, $t9, 0x13c -/* 10EF7C 802A596C 3C04802C */ lui $a0, %hi(D_802B8A10) # $a0, 0x802c -/* 10EF80 802A5970 3C05800E */ lui $a1, %hi(D_800DC5F8) # $a1, 0x800e -/* 10EF84 802A5974 8CA5C5F8 */ lw $a1, %lo(D_800DC5F8)($a1) -/* 10EF88 802A5978 24848A10 */ addiu $a0, %lo(D_802B8A10) # addiu $a0, $a0, -0x75f0 -/* 10EF8C 802A597C AFB90010 */ sw $t9, 0x10($sp) -/* 10EF90 802A5980 24060140 */ li $a2, 320 -/* 10EF94 802A5984 0C0A921F */ jal func_802A487C -/* 10EF98 802A5988 240700F0 */ li $a3, 240 -/* 10EF9C 802A598C 0C024E8C */ jal func_80093A30 -/* 10EFA0 802A5990 2404000B */ li $a0, 11 -.L802A5994: -/* 10EFA4 802A5994 8FBF001C */ lw $ra, 0x1c($sp) -.L802A5998: -/* 10EFA8 802A5998 27BD0020 */ addiu $sp, $sp, 0x20 -/* 10EFAC 802A599C 03E00008 */ jr $ra -/* 10EFB0 802A59A0 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A59A4.s b/asm/non_matchings/code_802A3730/func_802A59A4.s deleted file mode 100644 index 8920eb074..000000000 --- a/asm/non_matchings/code_802A3730/func_802A59A4.s +++ /dev/null @@ -1,202 +0,0 @@ -glabel func_802A59A4 -/* 10EFB4 802A59A4 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* 10EFB8 802A59A8 AFBF0034 */ sw $ra, 0x34($sp) -/* 10EFBC 802A59AC 0C0A94E9 */ jal func_802A53A4 -/* 10EFC0 802A59B0 AFB00030 */ sw $s0, 0x30($sp) -/* 10EFC4 802A59B4 0C0A8F8F */ jal func_802A3E3C -/* 10EFC8 802A59B8 00000000 */ nop -/* 10EFCC 802A59BC 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10EFD0 802A59C0 0C0A8DCC */ jal func_802A3730 -/* 10EFD4 802A59C4 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10EFD8 802A59C8 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 10EFDC 802A59CC 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 10EFE0 802A59D0 8E020000 */ lw $v0, ($s0) -/* 10EFE4 802A59D4 3C180002 */ lui $t8, (0x00022205 >> 16) # lui $t8, 2 -/* 10EFE8 802A59D8 37182205 */ ori $t8, (0x00022205 & 0xFFFF) # ori $t8, $t8, 0x2205 -/* 10EFEC 802A59DC 244E0008 */ addiu $t6, $v0, 8 -/* 10EFF0 802A59E0 AE0E0000 */ sw $t6, ($s0) -/* 10EFF4 802A59E4 3C0FB700 */ lui $t7, 0xb700 -/* 10EFF8 802A59E8 AC4F0000 */ sw $t7, ($v0) -/* 10EFFC 802A59EC AC580004 */ sw $t8, 4($v0) -/* 10F000 802A59F0 8E020000 */ lw $v0, ($s0) -/* 10F004 802A59F4 3C0AB900 */ lui $t2, (0xB900031D >> 16) # lui $t2, 0xb900 -/* 10F008 802A59F8 3C0B0055 */ lui $t3, (0x00552078 >> 16) # lui $t3, 0x55 -/* 10F00C 802A59FC 24590008 */ addiu $t9, $v0, 8 -/* 10F010 802A5A00 AE190000 */ sw $t9, ($s0) -/* 10F014 802A5A04 356B2078 */ ori $t3, (0x00552078 & 0xFFFF) # ori $t3, $t3, 0x2078 -/* 10F018 802A5A08 354A031D */ ori $t2, (0xB900031D & 0xFFFF) # ori $t2, $t2, 0x31d -/* 10F01C 802A5A0C 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10F020 802A5A10 AC4A0000 */ sw $t2, ($v0) -/* 10F024 802A5A14 AC4B0004 */ sw $t3, 4($v0) -/* 10F028 802A5A18 C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 10F02C 802A5A1C 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10F030 802A5A20 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 10F034 802A5A24 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10F038 802A5A28 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 10F03C 802A5A2C 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 10F040 802A5A30 44814000 */ mtc1 $at, $f8 -/* 10F044 802A5A34 3C068015 */ lui $a2, %hi(D_80150130) # $a2, 0x8015 -/* 10F048 802A5A38 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 10F04C 802A5A3C 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 10F050 802A5A40 8CC60130 */ lw $a2, %lo(D_80150130)($a2) -/* 10F054 802A5A44 27A500AA */ addiu $a1, $sp, 0xaa -/* 10F058 802A5A48 E7A40010 */ swc1 $f4, 0x10($sp) -/* 10F05C 802A5A4C E7A60014 */ swc1 $f6, 0x14($sp) -/* 10F060 802A5A50 24840040 */ addiu $a0, $a0, 0x40 -/* 10F064 802A5A54 0C033CCC */ jal guPerspective -/* 10F068 802A5A58 E7A80018 */ swc1 $f8, 0x18($sp) -/* 10F06C 802A5A5C 8E020000 */ lw $v0, ($s0) -/* 10F070 802A5A60 3C0DB400 */ lui $t5, 0xb400 -/* 10F074 802A5A64 3C180103 */ lui $t8, (0x01030040 >> 16) # lui $t8, 0x103 -/* 10F078 802A5A68 244C0008 */ addiu $t4, $v0, 8 -/* 10F07C 802A5A6C AE0C0000 */ sw $t4, ($s0) -/* 10F080 802A5A70 AC4D0000 */ sw $t5, ($v0) -/* 10F084 802A5A74 97AE00AA */ lhu $t6, 0xaa($sp) -/* 10F088 802A5A78 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 10F08C 802A5A7C 37180040 */ ori $t8, (0x01030040 & 0xFFFF) # ori $t8, $t8, 0x40 -/* 10F090 802A5A80 AC4E0004 */ sw $t6, 4($v0) -/* 10F094 802A5A84 8E020000 */ lw $v0, ($s0) -/* 10F098 802A5A88 2529EF40 */ addiu $t1, %lo(gGfxPool) # addiu $t1, $t1, -0x10c0 -/* 10F09C 802A5A8C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F0A0 802A5A90 244F0008 */ addiu $t7, $v0, 8 -/* 10F0A4 802A5A94 AE0F0000 */ sw $t7, ($s0) -/* 10F0A8 802A5A98 AC580000 */ sw $t8, ($v0) -/* 10F0AC 802A5A9C 8D390000 */ lw $t9, ($t1) -/* 10F0B0 802A5AA0 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F0B4 802A5AA4 3C058016 */ lui $a1, %hi(D_801646F0) # $a1, 0x8016 -/* 10F0B8 802A5AA8 272A0040 */ addiu $t2, $t9, 0x40 -/* 10F0BC 802A5AAC 01415824 */ and $t3, $t2, $at -/* 10F0C0 802A5AB0 AC4B0004 */ sw $t3, 4($v0) -/* 10F0C4 802A5AB4 3C018016 */ lui $at, %hi(D_801646FC) # $at, 0x8016 -/* 10F0C8 802A5AB8 C42A46FC */ lwc1 $f10, %lo(D_801646FC)($at) -/* 10F0CC 802A5ABC 3C018016 */ lui $at, %hi(D_80164700) # $at, 0x8016 -/* 10F0D0 802A5AC0 C4304700 */ lwc1 $f16, %lo(D_80164700)($at) -/* 10F0D4 802A5AC4 3C018016 */ lui $at, %hi(D_80164704) # $at, 0x8016 -/* 10F0D8 802A5AC8 C4324704 */ lwc1 $f18, %lo(D_80164704)($at) -/* 10F0DC 802A5ACC 3C018016 */ lui $at, %hi(D_80164708) # $at, 0x8016 -/* 10F0E0 802A5AD0 C4244708 */ lwc1 $f4, %lo(D_80164708)($at) -/* 10F0E4 802A5AD4 3C018016 */ lui $at, %hi(D_8016470C) # $at, 0x8016 -/* 10F0E8 802A5AD8 C426470C */ lwc1 $f6, %lo(D_8016470C)($at) -/* 10F0EC 802A5ADC 3C018016 */ lui $at, %hi(D_80164710) # $at, 0x8016 -/* 10F0F0 802A5AE0 C4284710 */ lwc1 $f8, %lo(D_80164710)($at) -/* 10F0F4 802A5AE4 8D240000 */ lw $a0, ($t1) -/* 10F0F8 802A5AE8 3C068016 */ lui $a2, %hi(D_801646F4) # $a2, 0x8016 -/* 10F0FC 802A5AEC 3C078016 */ lui $a3, %hi(D_801646F8) # $a3, 0x8016 -/* 10F100 802A5AF0 8CE746F8 */ lw $a3, %lo(D_801646F8)($a3) -/* 10F104 802A5AF4 8CC646F4 */ lw $a2, %lo(D_801646F4)($a2) -/* 10F108 802A5AF8 8CA546F0 */ lw $a1, %lo(D_801646F0)($a1) -/* 10F10C 802A5AFC E7AA0010 */ swc1 $f10, 0x10($sp) -/* 10F110 802A5B00 E7B00014 */ swc1 $f16, 0x14($sp) -/* 10F114 802A5B04 E7B20018 */ swc1 $f18, 0x18($sp) -/* 10F118 802A5B08 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 10F11C 802A5B0C E7A60020 */ swc1 $f6, 0x20($sp) -/* 10F120 802A5B10 E7A80024 */ swc1 $f8, 0x24($sp) -/* 10F124 802A5B14 0C033D92 */ jal guLookAt -/* 10F128 802A5B18 248401C0 */ addiu $a0, $a0, 0x1c0 -/* 10F12C 802A5B1C 3C0C800E */ lui $t4, %hi(D_800DC5C8) # $t4, 0x800e -/* 10F130 802A5B20 958CC5C8 */ lhu $t4, %lo(D_800DC5C8)($t4) -/* 10F134 802A5B24 55800016 */ bnel $t4, $zero, .L802A5B80 -/* 10F138 802A5B28 8E020000 */ lw $v0, ($s0) -/* 10F13C 802A5B2C 8E020000 */ lw $v0, ($s0) -/* 10F140 802A5B30 3C0E0101 */ lui $t6, (0x01010040 >> 16) # lui $t6, 0x101 -/* 10F144 802A5B34 35CE0040 */ ori $t6, (0x01010040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 10F148 802A5B38 244D0008 */ addiu $t5, $v0, 8 -/* 10F14C 802A5B3C AE0D0000 */ sw $t5, ($s0) -/* 10F150 802A5B40 3C0F8015 */ lui $t7, %hi(gGfxPool) # $t7, 0x8015 -/* 10F154 802A5B44 AC4E0000 */ sw $t6, ($v0) -/* 10F158 802A5B48 8DEFEF40 */ lw $t7, %lo(gGfxPool)($t7) -/* 10F15C 802A5B4C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F160 802A5B50 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F164 802A5B54 25F801C0 */ addiu $t8, $t7, 0x1c0 -/* 10F168 802A5B58 0301C824 */ and $t9, $t8, $at -/* 10F16C 802A5B5C 27A4005C */ addiu $a0, $sp, 0x5c -/* 10F170 802A5B60 0C0AD4F2 */ jal func_802B53C8 -/* 10F174 802A5B64 AC590004 */ sw $t9, 4($v0) -/* 10F178 802A5B68 27A4005C */ addiu $a0, $sp, 0x5c -/* 10F17C 802A5B6C 0C0AD3FE */ jal func_802B4FF8 -/* 10F180 802A5B70 00002825 */ move $a1, $zero -/* 10F184 802A5B74 1000000E */ b .L802A5BB0 -/* 10F188 802A5B78 00000000 */ nop -/* 10F18C 802A5B7C 8E020000 */ lw $v0, ($s0) -.L802A5B80: -/* 10F190 802A5B80 3C0B0102 */ lui $t3, (0x01020040 >> 16) # lui $t3, 0x102 -/* 10F194 802A5B84 356B0040 */ ori $t3, (0x01020040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 10F198 802A5B88 244A0008 */ addiu $t2, $v0, 8 -/* 10F19C 802A5B8C AE0A0000 */ sw $t2, ($s0) -/* 10F1A0 802A5B90 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 10F1A4 802A5B94 AC4B0000 */ sw $t3, ($v0) -/* 10F1A8 802A5B98 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 10F1AC 802A5B9C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F1B0 802A5BA0 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F1B4 802A5BA4 258D01C0 */ addiu $t5, $t4, 0x1c0 -/* 10F1B8 802A5BA8 01A17024 */ and $t6, $t5, $at -/* 10F1BC 802A5BAC AC4E0004 */ sw $t6, 4($v0) -.L802A5BB0: -/* 10F1C0 802A5BB0 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F1C4 802A5BB4 0C0A568E */ jal func_80295A38 -/* 10F1C8 802A5BB8 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F1CC 802A5BBC 3C0F800E */ lui $t7, %hi(D_800DC5C8) # $t7, 0x800e -/* 10F1D0 802A5BC0 95EFC5C8 */ lhu $t7, %lo(D_800DC5C8)($t7) -/* 10F1D4 802A5BC4 24010001 */ li $at, 1 -/* 10F1D8 802A5BC8 15E10013 */ bne $t7, $at, .L802A5C18 -/* 10F1DC 802A5BCC 00000000 */ nop -/* 10F1E0 802A5BD0 8E020000 */ lw $v0, ($s0) -/* 10F1E4 802A5BD4 3C190101 */ lui $t9, (0x01010040 >> 16) # lui $t9, 0x101 -/* 10F1E8 802A5BD8 37390040 */ ori $t9, (0x01010040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 10F1EC 802A5BDC 24580008 */ addiu $t8, $v0, 8 -/* 10F1F0 802A5BE0 AE180000 */ sw $t8, ($s0) -/* 10F1F4 802A5BE4 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 10F1F8 802A5BE8 AC590000 */ sw $t9, ($v0) -/* 10F1FC 802A5BEC 8D4AEF40 */ lw $t2, %lo(gGfxPool)($t2) -/* 10F200 802A5BF0 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F204 802A5BF4 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F208 802A5BF8 254B01C0 */ addiu $t3, $t2, 0x1c0 -/* 10F20C 802A5BFC 01616024 */ and $t4, $t3, $at -/* 10F210 802A5C00 27A4005C */ addiu $a0, $sp, 0x5c -/* 10F214 802A5C04 0C0AD4F2 */ jal func_802B53C8 -/* 10F218 802A5C08 AC4C0004 */ sw $t4, 4($v0) -/* 10F21C 802A5C0C 27A4005C */ addiu $a0, $sp, 0x5c -/* 10F220 802A5C10 0C0AD3FE */ jal func_802B4FF8 -/* 10F224 802A5C14 00002825 */ move $a1, $zero -.L802A5C18: -/* 10F228 802A5C18 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F22C 802A5C1C 0C0A8C02 */ jal func_802A3008 -/* 10F230 802A5C20 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F234 802A5C24 0C016024 */ jal func_80058090 -/* 10F238 802A5C28 00002025 */ move $a0, $zero -/* 10F23C 802A5C2C 0C0084AD */ jal func_800212B4 -/* 10F240 802A5C30 00000000 */ nop -/* 10F244 802A5C34 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F248 802A5C38 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F24C 802A5C3C 0C0A448B */ jal func_8029122C -/* 10F250 802A5C40 00002825 */ move $a1, $zero -/* 10F254 802A5C44 0C0086C3 */ jal func_80021B0C -/* 10F258 802A5C48 00000000 */ nop -/* 10F25C 802A5C4C 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F260 802A5C50 0C0A8BCD */ jal func_802A2F34 -/* 10F264 802A5C54 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F268 802A5C58 0C01614E */ jal func_80058538 -/* 10F26C 802A5C5C 00002025 */ move $a0, $zero -/* 10F270 802A5C60 0C0162FD */ jal func_80058BF4 -/* 10F274 802A5C64 00000000 */ nop -/* 10F278 802A5C68 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 10F27C 802A5C6C 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 10F280 802A5C70 960D0000 */ lhu $t5, ($s0) -/* 10F284 802A5C74 11A00003 */ beqz $t5, .L802A5C84 -/* 10F288 802A5C78 00000000 */ nop -/* 10F28C 802A5C7C 0C016308 */ jal func_80058C20 -/* 10F290 802A5C80 00002025 */ move $a0, $zero -.L802A5C84: -/* 10F294 802A5C84 0C024E97 */ jal func_80093A5C -/* 10F298 802A5C88 00002025 */ move $a0, $zero -/* 10F29C 802A5C8C 960E0000 */ lhu $t6, ($s0) -/* 10F2A0 802A5C90 51C00004 */ beql $t6, $zero, .L802A5CA4 -/* 10F2A4 802A5C94 8FBF0034 */ lw $ra, 0x34($sp) -/* 10F2A8 802A5C98 0C01636D */ jal func_80058DB4 -/* 10F2AC 802A5C9C 00002025 */ move $a0, $zero -/* 10F2B0 802A5CA0 8FBF0034 */ lw $ra, 0x34($sp) -.L802A5CA4: -/* 10F2B4 802A5CA4 8FB00030 */ lw $s0, 0x30($sp) -/* 10F2B8 802A5CA8 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 10F2BC 802A5CAC 03E00008 */ jr $ra -/* 10F2C0 802A5CB0 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A5CB4.s b/asm/non_matchings/code_802A3730/func_802A5CB4.s deleted file mode 100644 index 8981bb52c..000000000 --- a/asm/non_matchings/code_802A3730/func_802A5CB4.s +++ /dev/null @@ -1,196 +0,0 @@ -glabel func_802A5CB4 -/* 10F2C4 802A5CB4 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 10F2C8 802A5CB8 AFBF0034 */ sw $ra, 0x34($sp) -/* 10F2CC 802A5CBC 0C0A943B */ jal func_802A50EC -/* 10F2D0 802A5CC0 AFB00030 */ sw $s0, 0x30($sp) -/* 10F2D4 802A5CC4 0C0A8F8F */ jal func_802A3E3C -/* 10F2D8 802A5CC8 00000000 */ nop -/* 10F2DC 802A5CCC 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F2E0 802A5CD0 0C0A8DCC */ jal func_802A3730 -/* 10F2E4 802A5CD4 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F2E8 802A5CD8 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 10F2EC 802A5CDC 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 10F2F0 802A5CE0 8E020000 */ lw $v0, ($s0) -/* 10F2F4 802A5CE4 3C0FB700 */ lui $t7, 0xb700 -/* 10F2F8 802A5CE8 24182205 */ li $t8, 8709 -/* 10F2FC 802A5CEC 244E0008 */ addiu $t6, $v0, 8 -/* 10F300 802A5CF0 AE0E0000 */ sw $t6, ($s0) -/* 10F304 802A5CF4 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10F308 802A5CF8 AC580004 */ sw $t8, 4($v0) -/* 10F30C 802A5CFC AC4F0000 */ sw $t7, ($v0) -/* 10F310 802A5D00 C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 10F314 802A5D04 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10F318 802A5D08 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 10F31C 802A5D0C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10F320 802A5D10 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 10F324 802A5D14 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 10F328 802A5D18 44814000 */ mtc1 $at, $f8 -/* 10F32C 802A5D1C 3C068015 */ lui $a2, %hi(D_80150130) # $a2, 0x8015 -/* 10F330 802A5D20 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 10F334 802A5D24 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 10F338 802A5D28 8CC60130 */ lw $a2, %lo(D_80150130)($a2) -/* 10F33C 802A5D2C 27A5009A */ addiu $a1, $sp, 0x9a -/* 10F340 802A5D30 E7A40010 */ swc1 $f4, 0x10($sp) -/* 10F344 802A5D34 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10F348 802A5D38 24840040 */ addiu $a0, $a0, 0x40 -/* 10F34C 802A5D3C 0C033CCC */ jal guPerspective -/* 10F350 802A5D40 E7A80018 */ swc1 $f8, 0x18($sp) -/* 10F354 802A5D44 8E020000 */ lw $v0, ($s0) -/* 10F358 802A5D48 3C0AB400 */ lui $t2, 0xb400 -/* 10F35C 802A5D4C 3C0D0103 */ lui $t5, (0x01030040 >> 16) # lui $t5, 0x103 -/* 10F360 802A5D50 24590008 */ addiu $t9, $v0, 8 -/* 10F364 802A5D54 AE190000 */ sw $t9, ($s0) -/* 10F368 802A5D58 AC4A0000 */ sw $t2, ($v0) -/* 10F36C 802A5D5C 97AB009A */ lhu $t3, 0x9a($sp) -/* 10F370 802A5D60 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 10F374 802A5D64 35AD0040 */ ori $t5, (0x01030040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 10F378 802A5D68 AC4B0004 */ sw $t3, 4($v0) -/* 10F37C 802A5D6C 8E020000 */ lw $v0, ($s0) -/* 10F380 802A5D70 2529EF40 */ addiu $t1, %lo(gGfxPool) # addiu $t1, $t1, -0x10c0 -/* 10F384 802A5D74 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F388 802A5D78 244C0008 */ addiu $t4, $v0, 8 -/* 10F38C 802A5D7C AE0C0000 */ sw $t4, ($s0) -/* 10F390 802A5D80 AC4D0000 */ sw $t5, ($v0) -/* 10F394 802A5D84 8D2E0000 */ lw $t6, ($t1) -/* 10F398 802A5D88 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F39C 802A5D8C 3C058016 */ lui $a1, %hi(D_801646F0) # $a1, 0x8016 -/* 10F3A0 802A5D90 25CF0040 */ addiu $t7, $t6, 0x40 -/* 10F3A4 802A5D94 01E1C024 */ and $t8, $t7, $at -/* 10F3A8 802A5D98 AC580004 */ sw $t8, 4($v0) -/* 10F3AC 802A5D9C 3C018016 */ lui $at, %hi(D_801646FC) # $at, 0x8016 -/* 10F3B0 802A5DA0 C42A46FC */ lwc1 $f10, %lo(D_801646FC)($at) -/* 10F3B4 802A5DA4 3C018016 */ lui $at, %hi(D_80164700) # $at, 0x8016 -/* 10F3B8 802A5DA8 C4304700 */ lwc1 $f16, %lo(D_80164700)($at) -/* 10F3BC 802A5DAC 3C018016 */ lui $at, %hi(D_80164704) # $at, 0x8016 -/* 10F3C0 802A5DB0 C4324704 */ lwc1 $f18, %lo(D_80164704)($at) -/* 10F3C4 802A5DB4 3C018016 */ lui $at, %hi(D_80164708) # $at, 0x8016 -/* 10F3C8 802A5DB8 C4244708 */ lwc1 $f4, %lo(D_80164708)($at) -/* 10F3CC 802A5DBC 3C018016 */ lui $at, %hi(D_8016470C) # $at, 0x8016 -/* 10F3D0 802A5DC0 C426470C */ lwc1 $f6, %lo(D_8016470C)($at) -/* 10F3D4 802A5DC4 3C018016 */ lui $at, %hi(D_80164710) # $at, 0x8016 -/* 10F3D8 802A5DC8 C4284710 */ lwc1 $f8, %lo(D_80164710)($at) -/* 10F3DC 802A5DCC 8D240000 */ lw $a0, ($t1) -/* 10F3E0 802A5DD0 3C068016 */ lui $a2, %hi(D_801646F4) # $a2, 0x8016 -/* 10F3E4 802A5DD4 3C078016 */ lui $a3, %hi(D_801646F8) # $a3, 0x8016 -/* 10F3E8 802A5DD8 8CE746F8 */ lw $a3, %lo(D_801646F8)($a3) -/* 10F3EC 802A5DDC 8CC646F4 */ lw $a2, %lo(D_801646F4)($a2) -/* 10F3F0 802A5DE0 8CA546F0 */ lw $a1, %lo(D_801646F0)($a1) -/* 10F3F4 802A5DE4 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 10F3F8 802A5DE8 E7B00014 */ swc1 $f16, 0x14($sp) -/* 10F3FC 802A5DEC E7B20018 */ swc1 $f18, 0x18($sp) -/* 10F400 802A5DF0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 10F404 802A5DF4 E7A60020 */ swc1 $f6, 0x20($sp) -/* 10F408 802A5DF8 E7A80024 */ swc1 $f8, 0x24($sp) -/* 10F40C 802A5DFC 0C033D92 */ jal guLookAt -/* 10F410 802A5E00 248401C0 */ addiu $a0, $a0, 0x1c0 -/* 10F414 802A5E04 3C19800E */ lui $t9, %hi(D_800DC5C8) # $t9, 0x800e -/* 10F418 802A5E08 9739C5C8 */ lhu $t9, %lo(D_800DC5C8)($t9) -/* 10F41C 802A5E0C 57200016 */ bnel $t9, $zero, .L802A5E68 -/* 10F420 802A5E10 8E020000 */ lw $v0, ($s0) -/* 10F424 802A5E14 8E020000 */ lw $v0, ($s0) -/* 10F428 802A5E18 3C0B0101 */ lui $t3, (0x01010040 >> 16) # lui $t3, 0x101 -/* 10F42C 802A5E1C 356B0040 */ ori $t3, (0x01010040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 10F430 802A5E20 244A0008 */ addiu $t2, $v0, 8 -/* 10F434 802A5E24 AE0A0000 */ sw $t2, ($s0) -/* 10F438 802A5E28 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 10F43C 802A5E2C AC4B0000 */ sw $t3, ($v0) -/* 10F440 802A5E30 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 10F444 802A5E34 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F448 802A5E38 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F44C 802A5E3C 258D01C0 */ addiu $t5, $t4, 0x1c0 -/* 10F450 802A5E40 01A17024 */ and $t6, $t5, $at -/* 10F454 802A5E44 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F458 802A5E48 0C0AD4F2 */ jal func_802B53C8 -/* 10F45C 802A5E4C AC4E0004 */ sw $t6, 4($v0) -/* 10F460 802A5E50 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F464 802A5E54 0C0AD3FE */ jal func_802B4FF8 -/* 10F468 802A5E58 00002825 */ move $a1, $zero -/* 10F46C 802A5E5C 1000000E */ b .L802A5E98 -/* 10F470 802A5E60 00000000 */ nop -/* 10F474 802A5E64 8E020000 */ lw $v0, ($s0) -.L802A5E68: -/* 10F478 802A5E68 3C180102 */ lui $t8, (0x01020040 >> 16) # lui $t8, 0x102 -/* 10F47C 802A5E6C 37180040 */ ori $t8, (0x01020040 & 0xFFFF) # ori $t8, $t8, 0x40 -/* 10F480 802A5E70 244F0008 */ addiu $t7, $v0, 8 -/* 10F484 802A5E74 AE0F0000 */ sw $t7, ($s0) -/* 10F488 802A5E78 3C198015 */ lui $t9, %hi(gGfxPool) # $t9, 0x8015 -/* 10F48C 802A5E7C AC580000 */ sw $t8, ($v0) -/* 10F490 802A5E80 8F39EF40 */ lw $t9, %lo(gGfxPool)($t9) -/* 10F494 802A5E84 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F498 802A5E88 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F49C 802A5E8C 272A01C0 */ addiu $t2, $t9, 0x1c0 -/* 10F4A0 802A5E90 01415824 */ and $t3, $t2, $at -/* 10F4A4 802A5E94 AC4B0004 */ sw $t3, 4($v0) -.L802A5E98: -/* 10F4A8 802A5E98 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F4AC 802A5E9C 0C0A568E */ jal func_80295A38 -/* 10F4B0 802A5EA0 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F4B4 802A5EA4 3C0C800E */ lui $t4, %hi(D_800DC5C8) # $t4, 0x800e -/* 10F4B8 802A5EA8 958CC5C8 */ lhu $t4, %lo(D_800DC5C8)($t4) -/* 10F4BC 802A5EAC 24010001 */ li $at, 1 -/* 10F4C0 802A5EB0 15810013 */ bne $t4, $at, .L802A5F00 -/* 10F4C4 802A5EB4 00000000 */ nop -/* 10F4C8 802A5EB8 8E020000 */ lw $v0, ($s0) -/* 10F4CC 802A5EBC 3C0E0101 */ lui $t6, (0x01010040 >> 16) # lui $t6, 0x101 -/* 10F4D0 802A5EC0 35CE0040 */ ori $t6, (0x01010040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 10F4D4 802A5EC4 244D0008 */ addiu $t5, $v0, 8 -/* 10F4D8 802A5EC8 AE0D0000 */ sw $t5, ($s0) -/* 10F4DC 802A5ECC 3C0F8015 */ lui $t7, %hi(gGfxPool) # $t7, 0x8015 -/* 10F4E0 802A5ED0 AC4E0000 */ sw $t6, ($v0) -/* 10F4E4 802A5ED4 8DEFEF40 */ lw $t7, %lo(gGfxPool)($t7) -/* 10F4E8 802A5ED8 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F4EC 802A5EDC 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F4F0 802A5EE0 25F801C0 */ addiu $t8, $t7, 0x1c0 -/* 10F4F4 802A5EE4 0301C824 */ and $t9, $t8, $at -/* 10F4F8 802A5EE8 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F4FC 802A5EEC 0C0AD4F2 */ jal func_802B53C8 -/* 10F500 802A5EF0 AC590004 */ sw $t9, 4($v0) -/* 10F504 802A5EF4 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F508 802A5EF8 0C0AD3FE */ jal func_802B4FF8 -/* 10F50C 802A5EFC 00002825 */ move $a1, $zero -.L802A5F00: -/* 10F510 802A5F00 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F514 802A5F04 0C0A8C02 */ jal func_802A3008 -/* 10F518 802A5F08 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F51C 802A5F0C 0C016024 */ jal func_80058090 -/* 10F520 802A5F10 24040001 */ li $a0, 1 -/* 10F524 802A5F14 0C0084AD */ jal func_800212B4 -/* 10F528 802A5F18 00000000 */ nop -/* 10F52C 802A5F1C 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F530 802A5F20 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F534 802A5F24 0C0A448B */ jal func_8029122C -/* 10F538 802A5F28 00002825 */ move $a1, $zero -/* 10F53C 802A5F2C 0C0086C3 */ jal func_80021B0C -/* 10F540 802A5F30 00000000 */ nop -/* 10F544 802A5F34 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F548 802A5F38 0C0A8BCD */ jal func_802A2F34 -/* 10F54C 802A5F3C 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F550 802A5F40 0C01614E */ jal func_80058538 -/* 10F554 802A5F44 24040001 */ li $a0, 1 -/* 10F558 802A5F48 0C0162FD */ jal func_80058BF4 -/* 10F55C 802A5F4C 00000000 */ nop -/* 10F560 802A5F50 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 10F564 802A5F54 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 10F568 802A5F58 960A0000 */ lhu $t2, ($s0) -/* 10F56C 802A5F5C 11400003 */ beqz $t2, .L802A5F6C -/* 10F570 802A5F60 00000000 */ nop -/* 10F574 802A5F64 0C016308 */ jal func_80058C20 -/* 10F578 802A5F68 24040001 */ li $a0, 1 -.L802A5F6C: -/* 10F57C 802A5F6C 0C024E97 */ jal func_80093A5C -/* 10F580 802A5F70 24040001 */ li $a0, 1 -/* 10F584 802A5F74 960B0000 */ lhu $t3, ($s0) -/* 10F588 802A5F78 11600003 */ beqz $t3, .L802A5F88 -/* 10F58C 802A5F7C 00000000 */ nop -/* 10F590 802A5F80 0C01636D */ jal func_80058DB4 -/* 10F594 802A5F84 24040001 */ li $a0, 1 -.L802A5F88: -/* 10F598 802A5F88 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 10F59C 802A5F8C 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 10F5A0 802A5F90 8C4C0000 */ lw $t4, ($v0) -/* 10F5A4 802A5F94 8FBF0034 */ lw $ra, 0x34($sp) -/* 10F5A8 802A5F98 8FB00030 */ lw $s0, 0x30($sp) -/* 10F5AC 802A5F9C 258D0001 */ addiu $t5, $t4, 1 -/* 10F5B0 802A5FA0 AC4D0000 */ sw $t5, ($v0) -/* 10F5B4 802A5FA4 03E00008 */ jr $ra -/* 10F5B8 802A5FA8 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/non_matchings/code_802A3730/func_802A5FAC.s b/asm/non_matchings/code_802A3730/func_802A5FAC.s deleted file mode 100644 index 39c159a48..000000000 --- a/asm/non_matchings/code_802A3730/func_802A5FAC.s +++ /dev/null @@ -1,196 +0,0 @@ -glabel func_802A5FAC -/* 10F5BC 802A5FAC 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 10F5C0 802A5FB0 AFBF0034 */ sw $ra, 0x34($sp) -/* 10F5C4 802A5FB4 0C0A9401 */ jal func_802A5004 -/* 10F5C8 802A5FB8 AFB00030 */ sw $s0, 0x30($sp) -/* 10F5CC 802A5FBC 0C0A8F8F */ jal func_802A3E3C -/* 10F5D0 802A5FC0 00000000 */ nop -/* 10F5D4 802A5FC4 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10F5D8 802A5FC8 0C0A8DCC */ jal func_802A3730 -/* 10F5DC 802A5FCC 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10F5E0 802A5FD0 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 10F5E4 802A5FD4 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 10F5E8 802A5FD8 8E020000 */ lw $v0, ($s0) -/* 10F5EC 802A5FDC 3C0FB700 */ lui $t7, 0xb700 -/* 10F5F0 802A5FE0 24182205 */ li $t8, 8709 -/* 10F5F4 802A5FE4 244E0008 */ addiu $t6, $v0, 8 -/* 10F5F8 802A5FE8 AE0E0000 */ sw $t6, ($s0) -/* 10F5FC 802A5FEC 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10F600 802A5FF0 AC580004 */ sw $t8, 4($v0) -/* 10F604 802A5FF4 AC4F0000 */ sw $t7, ($v0) -/* 10F608 802A5FF8 C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 10F60C 802A5FFC 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10F610 802A6000 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 10F614 802A6004 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10F618 802A6008 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 10F61C 802A600C 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 10F620 802A6010 44814000 */ mtc1 $at, $f8 -/* 10F624 802A6014 3C068015 */ lui $a2, %hi(D_80150134) # $a2, 0x8015 -/* 10F628 802A6018 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 10F62C 802A601C 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 10F630 802A6020 8CC60134 */ lw $a2, %lo(D_80150134)($a2) -/* 10F634 802A6024 27A5009A */ addiu $a1, $sp, 0x9a -/* 10F638 802A6028 E7A40010 */ swc1 $f4, 0x10($sp) -/* 10F63C 802A602C E7A60014 */ swc1 $f6, 0x14($sp) -/* 10F640 802A6030 24840080 */ addiu $a0, $a0, 0x80 -/* 10F644 802A6034 0C033CCC */ jal guPerspective -/* 10F648 802A6038 E7A80018 */ swc1 $f8, 0x18($sp) -/* 10F64C 802A603C 8E020000 */ lw $v0, ($s0) -/* 10F650 802A6040 3C0AB400 */ lui $t2, 0xb400 -/* 10F654 802A6044 3C0D0103 */ lui $t5, (0x01030040 >> 16) # lui $t5, 0x103 -/* 10F658 802A6048 24590008 */ addiu $t9, $v0, 8 -/* 10F65C 802A604C AE190000 */ sw $t9, ($s0) -/* 10F660 802A6050 AC4A0000 */ sw $t2, ($v0) -/* 10F664 802A6054 97AB009A */ lhu $t3, 0x9a($sp) -/* 10F668 802A6058 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 10F66C 802A605C 35AD0040 */ ori $t5, (0x01030040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 10F670 802A6060 AC4B0004 */ sw $t3, 4($v0) -/* 10F674 802A6064 8E020000 */ lw $v0, ($s0) -/* 10F678 802A6068 2529EF40 */ addiu $t1, %lo(gGfxPool) # addiu $t1, $t1, -0x10c0 -/* 10F67C 802A606C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F680 802A6070 244C0008 */ addiu $t4, $v0, 8 -/* 10F684 802A6074 AE0C0000 */ sw $t4, ($s0) -/* 10F688 802A6078 AC4D0000 */ sw $t5, ($v0) -/* 10F68C 802A607C 8D2E0000 */ lw $t6, ($t1) -/* 10F690 802A6080 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F694 802A6084 3C058016 */ lui $a1, %hi(D_801647A8) # $a1, 0x8016 -/* 10F698 802A6088 25CF0080 */ addiu $t7, $t6, 0x80 -/* 10F69C 802A608C 01E1C024 */ and $t8, $t7, $at -/* 10F6A0 802A6090 AC580004 */ sw $t8, 4($v0) -/* 10F6A4 802A6094 3C018016 */ lui $at, %hi(D_801647B4) # $at, 0x8016 -/* 10F6A8 802A6098 C42A47B4 */ lwc1 $f10, %lo(D_801647B4)($at) -/* 10F6AC 802A609C 3C018016 */ lui $at, %hi(D_801647B8) # $at, 0x8016 -/* 10F6B0 802A60A0 C43047B8 */ lwc1 $f16, %lo(D_801647B8)($at) -/* 10F6B4 802A60A4 3C018016 */ lui $at, %hi(D_801647BC) # $at, 0x8016 -/* 10F6B8 802A60A8 C43247BC */ lwc1 $f18, %lo(D_801647BC)($at) -/* 10F6BC 802A60AC 3C018016 */ lui $at, %hi(D_801647C0) # $at, 0x8016 -/* 10F6C0 802A60B0 C42447C0 */ lwc1 $f4, %lo(D_801647C0)($at) -/* 10F6C4 802A60B4 3C018016 */ lui $at, %hi(D_801647C4) # $at, 0x8016 -/* 10F6C8 802A60B8 C42647C4 */ lwc1 $f6, %lo(D_801647C4)($at) -/* 10F6CC 802A60BC 3C018016 */ lui $at, %hi(D_801647C8) # $at, 0x8016 -/* 10F6D0 802A60C0 C42847C8 */ lwc1 $f8, %lo(D_801647C8)($at) -/* 10F6D4 802A60C4 8D240000 */ lw $a0, ($t1) -/* 10F6D8 802A60C8 3C068016 */ lui $a2, %hi(D_801647AC) # $a2, 0x8016 -/* 10F6DC 802A60CC 3C078016 */ lui $a3, %hi(D_801647B0) # $a3, 0x8016 -/* 10F6E0 802A60D0 8CE747B0 */ lw $a3, %lo(D_801647B0)($a3) -/* 10F6E4 802A60D4 8CC647AC */ lw $a2, %lo(D_801647AC)($a2) -/* 10F6E8 802A60D8 8CA547A8 */ lw $a1, %lo(D_801647A8)($a1) -/* 10F6EC 802A60DC E7AA0010 */ swc1 $f10, 0x10($sp) -/* 10F6F0 802A60E0 E7B00014 */ swc1 $f16, 0x14($sp) -/* 10F6F4 802A60E4 E7B20018 */ swc1 $f18, 0x18($sp) -/* 10F6F8 802A60E8 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 10F6FC 802A60EC E7A60020 */ swc1 $f6, 0x20($sp) -/* 10F700 802A60F0 E7A80024 */ swc1 $f8, 0x24($sp) -/* 10F704 802A60F4 0C033D92 */ jal guLookAt -/* 10F708 802A60F8 24840200 */ addiu $a0, $a0, 0x200 -/* 10F70C 802A60FC 3C19800E */ lui $t9, %hi(D_800DC5C8) # $t9, 0x800e -/* 10F710 802A6100 9739C5C8 */ lhu $t9, %lo(D_800DC5C8)($t9) -/* 10F714 802A6104 57200016 */ bnel $t9, $zero, .L802A6160 -/* 10F718 802A6108 8E020000 */ lw $v0, ($s0) -/* 10F71C 802A610C 8E020000 */ lw $v0, ($s0) -/* 10F720 802A6110 3C0B0101 */ lui $t3, (0x01010040 >> 16) # lui $t3, 0x101 -/* 10F724 802A6114 356B0040 */ ori $t3, (0x01010040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 10F728 802A6118 244A0008 */ addiu $t2, $v0, 8 -/* 10F72C 802A611C AE0A0000 */ sw $t2, ($s0) -/* 10F730 802A6120 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 10F734 802A6124 AC4B0000 */ sw $t3, ($v0) -/* 10F738 802A6128 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 10F73C 802A612C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F740 802A6130 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F744 802A6134 258D0200 */ addiu $t5, $t4, 0x200 -/* 10F748 802A6138 01A17024 */ and $t6, $t5, $at -/* 10F74C 802A613C 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F750 802A6140 0C0AD4F2 */ jal func_802B53C8 -/* 10F754 802A6144 AC4E0004 */ sw $t6, 4($v0) -/* 10F758 802A6148 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F75C 802A614C 0C0AD3FE */ jal func_802B4FF8 -/* 10F760 802A6150 00002825 */ move $a1, $zero -/* 10F764 802A6154 1000000E */ b .L802A6190 -/* 10F768 802A6158 00000000 */ nop -/* 10F76C 802A615C 8E020000 */ lw $v0, ($s0) -.L802A6160: -/* 10F770 802A6160 3C180102 */ lui $t8, (0x01020040 >> 16) # lui $t8, 0x102 -/* 10F774 802A6164 37180040 */ ori $t8, (0x01020040 & 0xFFFF) # ori $t8, $t8, 0x40 -/* 10F778 802A6168 244F0008 */ addiu $t7, $v0, 8 -/* 10F77C 802A616C AE0F0000 */ sw $t7, ($s0) -/* 10F780 802A6170 3C198015 */ lui $t9, %hi(gGfxPool) # $t9, 0x8015 -/* 10F784 802A6174 AC580000 */ sw $t8, ($v0) -/* 10F788 802A6178 8F39EF40 */ lw $t9, %lo(gGfxPool)($t9) -/* 10F78C 802A617C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F790 802A6180 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F794 802A6184 272A0200 */ addiu $t2, $t9, 0x200 -/* 10F798 802A6188 01415824 */ and $t3, $t2, $at -/* 10F79C 802A618C AC4B0004 */ sw $t3, 4($v0) -.L802A6190: -/* 10F7A0 802A6190 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10F7A4 802A6194 0C0A568E */ jal func_80295A38 -/* 10F7A8 802A6198 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10F7AC 802A619C 3C0C800E */ lui $t4, %hi(D_800DC5C8) # $t4, 0x800e -/* 10F7B0 802A61A0 958CC5C8 */ lhu $t4, %lo(D_800DC5C8)($t4) -/* 10F7B4 802A61A4 24010001 */ li $at, 1 -/* 10F7B8 802A61A8 15810013 */ bne $t4, $at, .L802A61F8 -/* 10F7BC 802A61AC 00000000 */ nop -/* 10F7C0 802A61B0 8E020000 */ lw $v0, ($s0) -/* 10F7C4 802A61B4 3C0E0101 */ lui $t6, (0x01010040 >> 16) # lui $t6, 0x101 -/* 10F7C8 802A61B8 35CE0040 */ ori $t6, (0x01010040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 10F7CC 802A61BC 244D0008 */ addiu $t5, $v0, 8 -/* 10F7D0 802A61C0 AE0D0000 */ sw $t5, ($s0) -/* 10F7D4 802A61C4 3C0F8015 */ lui $t7, %hi(gGfxPool) # $t7, 0x8015 -/* 10F7D8 802A61C8 AC4E0000 */ sw $t6, ($v0) -/* 10F7DC 802A61CC 8DEFEF40 */ lw $t7, %lo(gGfxPool)($t7) -/* 10F7E0 802A61D0 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F7E4 802A61D4 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F7E8 802A61D8 25F80200 */ addiu $t8, $t7, 0x200 -/* 10F7EC 802A61DC 0301C824 */ and $t9, $t8, $at -/* 10F7F0 802A61E0 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F7F4 802A61E4 0C0AD4F2 */ jal func_802B53C8 -/* 10F7F8 802A61E8 AC590004 */ sw $t9, 4($v0) -/* 10F7FC 802A61EC 27A40058 */ addiu $a0, $sp, 0x58 -/* 10F800 802A61F0 0C0AD3FE */ jal func_802B4FF8 -/* 10F804 802A61F4 00002825 */ move $a1, $zero -.L802A61F8: -/* 10F808 802A61F8 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10F80C 802A61FC 0C0A8C02 */ jal func_802A3008 -/* 10F810 802A6200 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10F814 802A6204 0C016024 */ jal func_80058090 -/* 10F818 802A6208 24040002 */ li $a0, 2 -/* 10F81C 802A620C 0C008577 */ jal func_800215DC -/* 10F820 802A6210 00000000 */ nop -/* 10F824 802A6214 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10F828 802A6218 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10F82C 802A621C 0C0A448B */ jal func_8029122C -/* 10F830 802A6220 24050001 */ li $a1, 1 -/* 10F834 802A6224 0C00871E */ jal func_80021C78 -/* 10F838 802A6228 00000000 */ nop -/* 10F83C 802A622C 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10F840 802A6230 0C0A8BCD */ jal func_802A2F34 -/* 10F844 802A6234 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10F848 802A6238 0C0162FD */ jal func_80058BF4 -/* 10F84C 802A623C 00000000 */ nop -/* 10F850 802A6240 0C01614E */ jal func_80058538 -/* 10F854 802A6244 24040002 */ li $a0, 2 -/* 10F858 802A6248 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 10F85C 802A624C 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 10F860 802A6250 960A0000 */ lhu $t2, ($s0) -/* 10F864 802A6254 11400003 */ beqz $t2, .L802A6264 -/* 10F868 802A6258 00000000 */ nop -/* 10F86C 802A625C 0C016308 */ jal func_80058C20 -/* 10F870 802A6260 24040002 */ li $a0, 2 -.L802A6264: -/* 10F874 802A6264 0C024E97 */ jal func_80093A5C -/* 10F878 802A6268 24040002 */ li $a0, 2 -/* 10F87C 802A626C 960B0000 */ lhu $t3, ($s0) -/* 10F880 802A6270 11600003 */ beqz $t3, .L802A6280 -/* 10F884 802A6274 00000000 */ nop -/* 10F888 802A6278 0C01636D */ jal func_80058DB4 -/* 10F88C 802A627C 24040002 */ li $a0, 2 -.L802A6280: -/* 10F890 802A6280 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 10F894 802A6284 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 10F898 802A6288 8C4C0000 */ lw $t4, ($v0) -/* 10F89C 802A628C 8FBF0034 */ lw $ra, 0x34($sp) -/* 10F8A0 802A6290 8FB00030 */ lw $s0, 0x30($sp) -/* 10F8A4 802A6294 258D0001 */ addiu $t5, $t4, 1 -/* 10F8A8 802A6298 AC4D0000 */ sw $t5, ($v0) -/* 10F8AC 802A629C 03E00008 */ jr $ra -/* 10F8B0 802A62A0 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/non_matchings/code_802A3730/func_802A62A4.s b/asm/non_matchings/code_802A3730/func_802A62A4.s deleted file mode 100644 index 9f88e2302..000000000 --- a/asm/non_matchings/code_802A3730/func_802A62A4.s +++ /dev/null @@ -1,203 +0,0 @@ -glabel func_802A62A4 -/* 10F8B4 802A62A4 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 10F8B8 802A62A8 AFBF0034 */ sw $ra, 0x34($sp) -/* 10F8BC 802A62AC 0C0A9475 */ jal func_802A51D4 -/* 10F8C0 802A62B0 AFB00030 */ sw $s0, 0x30($sp) -/* 10F8C4 802A62B4 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 10F8C8 802A62B8 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 10F8CC 802A62BC 8E020000 */ lw $v0, ($s0) -/* 10F8D0 802A62C0 3C180002 */ lui $t8, (0x00022204 >> 16) # lui $t8, 2 -/* 10F8D4 802A62C4 37182204 */ ori $t8, (0x00022204 & 0xFFFF) # ori $t8, $t8, 0x2204 -/* 10F8D8 802A62C8 244E0008 */ addiu $t6, $v0, 8 -/* 10F8DC 802A62CC AE0E0000 */ sw $t6, ($s0) -/* 10F8E0 802A62D0 3C0FB700 */ lui $t7, 0xb700 -/* 10F8E4 802A62D4 AC4F0000 */ sw $t7, ($v0) -/* 10F8E8 802A62D8 0C0A8F8F */ jal func_802A3E3C -/* 10F8EC 802A62DC AC580004 */ sw $t8, 4($v0) -/* 10F8F0 802A62E0 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10F8F4 802A62E4 0C0A8DCC */ jal func_802A3730 -/* 10F8F8 802A62E8 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10F8FC 802A62EC 8E020000 */ lw $v0, ($s0) -/* 10F900 802A62F0 3C0AB700 */ lui $t2, 0xb700 -/* 10F904 802A62F4 240B2205 */ li $t3, 8709 -/* 10F908 802A62F8 24590008 */ addiu $t9, $v0, 8 -/* 10F90C 802A62FC AE190000 */ sw $t9, ($s0) -/* 10F910 802A6300 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10F914 802A6304 AC4B0004 */ sw $t3, 4($v0) -/* 10F918 802A6308 AC4A0000 */ sw $t2, ($v0) -/* 10F91C 802A630C C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 10F920 802A6310 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10F924 802A6314 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 10F928 802A6318 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10F92C 802A631C 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 10F930 802A6320 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 10F934 802A6324 44814000 */ mtc1 $at, $f8 -/* 10F938 802A6328 3C068015 */ lui $a2, %hi(D_80150130) # $a2, 0x8015 -/* 10F93C 802A632C 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 10F940 802A6330 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 10F944 802A6334 8CC60130 */ lw $a2, %lo(D_80150130)($a2) -/* 10F948 802A6338 27A5009A */ addiu $a1, $sp, 0x9a -/* 10F94C 802A633C E7A40010 */ swc1 $f4, 0x10($sp) -/* 10F950 802A6340 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10F954 802A6344 24840040 */ addiu $a0, $a0, 0x40 -/* 10F958 802A6348 0C033CCC */ jal guPerspective -/* 10F95C 802A634C E7A80018 */ swc1 $f8, 0x18($sp) -/* 10F960 802A6350 8E020000 */ lw $v0, ($s0) -/* 10F964 802A6354 3C0DB400 */ lui $t5, 0xb400 -/* 10F968 802A6358 3C180103 */ lui $t8, (0x01030040 >> 16) # lui $t8, 0x103 -/* 10F96C 802A635C 244C0008 */ addiu $t4, $v0, 8 -/* 10F970 802A6360 AE0C0000 */ sw $t4, ($s0) -/* 10F974 802A6364 AC4D0000 */ sw $t5, ($v0) -/* 10F978 802A6368 97AE009A */ lhu $t6, 0x9a($sp) -/* 10F97C 802A636C 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 10F980 802A6370 37180040 */ ori $t8, (0x01030040 & 0xFFFF) # ori $t8, $t8, 0x40 -/* 10F984 802A6374 AC4E0004 */ sw $t6, 4($v0) -/* 10F988 802A6378 8E020000 */ lw $v0, ($s0) -/* 10F98C 802A637C 2529EF40 */ addiu $t1, %lo(gGfxPool) # addiu $t1, $t1, -0x10c0 -/* 10F990 802A6380 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10F994 802A6384 244F0008 */ addiu $t7, $v0, 8 -/* 10F998 802A6388 AE0F0000 */ sw $t7, ($s0) -/* 10F99C 802A638C AC580000 */ sw $t8, ($v0) -/* 10F9A0 802A6390 8D390000 */ lw $t9, ($t1) -/* 10F9A4 802A6394 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10F9A8 802A6398 3C058016 */ lui $a1, %hi(D_801646F0) # $a1, 0x8016 -/* 10F9AC 802A639C 272A0040 */ addiu $t2, $t9, 0x40 -/* 10F9B0 802A63A0 01415824 */ and $t3, $t2, $at -/* 10F9B4 802A63A4 AC4B0004 */ sw $t3, 4($v0) -/* 10F9B8 802A63A8 3C018016 */ lui $at, %hi(D_801646FC) # $at, 0x8016 -/* 10F9BC 802A63AC C42A46FC */ lwc1 $f10, %lo(D_801646FC)($at) -/* 10F9C0 802A63B0 3C018016 */ lui $at, %hi(D_80164700) # $at, 0x8016 -/* 10F9C4 802A63B4 C4304700 */ lwc1 $f16, %lo(D_80164700)($at) -/* 10F9C8 802A63B8 3C018016 */ lui $at, %hi(D_80164704) # $at, 0x8016 -/* 10F9CC 802A63BC C4324704 */ lwc1 $f18, %lo(D_80164704)($at) -/* 10F9D0 802A63C0 3C018016 */ lui $at, %hi(D_80164708) # $at, 0x8016 -/* 10F9D4 802A63C4 C4244708 */ lwc1 $f4, %lo(D_80164708)($at) -/* 10F9D8 802A63C8 3C018016 */ lui $at, %hi(D_8016470C) # $at, 0x8016 -/* 10F9DC 802A63CC C426470C */ lwc1 $f6, %lo(D_8016470C)($at) -/* 10F9E0 802A63D0 3C018016 */ lui $at, %hi(D_80164710) # $at, 0x8016 -/* 10F9E4 802A63D4 C4284710 */ lwc1 $f8, %lo(D_80164710)($at) -/* 10F9E8 802A63D8 8D240000 */ lw $a0, ($t1) -/* 10F9EC 802A63DC 3C068016 */ lui $a2, %hi(D_801646F4) # $a2, 0x8016 -/* 10F9F0 802A63E0 3C078016 */ lui $a3, %hi(D_801646F8) # $a3, 0x8016 -/* 10F9F4 802A63E4 8CE746F8 */ lw $a3, %lo(D_801646F8)($a3) -/* 10F9F8 802A63E8 8CC646F4 */ lw $a2, %lo(D_801646F4)($a2) -/* 10F9FC 802A63EC 8CA546F0 */ lw $a1, %lo(D_801646F0)($a1) -/* 10FA00 802A63F0 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 10FA04 802A63F4 E7B00014 */ swc1 $f16, 0x14($sp) -/* 10FA08 802A63F8 E7B20018 */ swc1 $f18, 0x18($sp) -/* 10FA0C 802A63FC E7A4001C */ swc1 $f4, 0x1c($sp) -/* 10FA10 802A6400 E7A60020 */ swc1 $f6, 0x20($sp) -/* 10FA14 802A6404 E7A80024 */ swc1 $f8, 0x24($sp) -/* 10FA18 802A6408 0C033D92 */ jal guLookAt -/* 10FA1C 802A640C 248401C0 */ addiu $a0, $a0, 0x1c0 -/* 10FA20 802A6410 3C0C800E */ lui $t4, %hi(D_800DC5C8) # $t4, 0x800e -/* 10FA24 802A6414 958CC5C8 */ lhu $t4, %lo(D_800DC5C8)($t4) -/* 10FA28 802A6418 55800016 */ bnel $t4, $zero, .L802A6474 -/* 10FA2C 802A641C 8E020000 */ lw $v0, ($s0) -/* 10FA30 802A6420 8E020000 */ lw $v0, ($s0) -/* 10FA34 802A6424 3C0E0101 */ lui $t6, (0x01010040 >> 16) # lui $t6, 0x101 -/* 10FA38 802A6428 35CE0040 */ ori $t6, (0x01010040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 10FA3C 802A642C 244D0008 */ addiu $t5, $v0, 8 -/* 10FA40 802A6430 AE0D0000 */ sw $t5, ($s0) -/* 10FA44 802A6434 3C0F8015 */ lui $t7, %hi(gGfxPool) # $t7, 0x8015 -/* 10FA48 802A6438 AC4E0000 */ sw $t6, ($v0) -/* 10FA4C 802A643C 8DEFEF40 */ lw $t7, %lo(gGfxPool)($t7) -/* 10FA50 802A6440 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FA54 802A6444 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FA58 802A6448 25F801C0 */ addiu $t8, $t7, 0x1c0 -/* 10FA5C 802A644C 0301C824 */ and $t9, $t8, $at -/* 10FA60 802A6450 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FA64 802A6454 0C0AD4F2 */ jal func_802B53C8 -/* 10FA68 802A6458 AC590004 */ sw $t9, 4($v0) -/* 10FA6C 802A645C 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FA70 802A6460 0C0AD3FE */ jal func_802B4FF8 -/* 10FA74 802A6464 00002825 */ move $a1, $zero -/* 10FA78 802A6468 1000000E */ b .L802A64A4 -/* 10FA7C 802A646C 00000000 */ nop -/* 10FA80 802A6470 8E020000 */ lw $v0, ($s0) -.L802A6474: -/* 10FA84 802A6474 3C0B0102 */ lui $t3, (0x01020040 >> 16) # lui $t3, 0x102 -/* 10FA88 802A6478 356B0040 */ ori $t3, (0x01020040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 10FA8C 802A647C 244A0008 */ addiu $t2, $v0, 8 -/* 10FA90 802A6480 AE0A0000 */ sw $t2, ($s0) -/* 10FA94 802A6484 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 10FA98 802A6488 AC4B0000 */ sw $t3, ($v0) -/* 10FA9C 802A648C 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 10FAA0 802A6490 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FAA4 802A6494 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FAA8 802A6498 258D01C0 */ addiu $t5, $t4, 0x1c0 -/* 10FAAC 802A649C 01A17024 */ and $t6, $t5, $at -/* 10FAB0 802A64A0 AC4E0004 */ sw $t6, 4($v0) -.L802A64A4: -/* 10FAB4 802A64A4 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10FAB8 802A64A8 0C0A568E */ jal func_80295A38 -/* 10FABC 802A64AC 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10FAC0 802A64B0 3C0F800E */ lui $t7, %hi(D_800DC5C8) # $t7, 0x800e -/* 10FAC4 802A64B4 95EFC5C8 */ lhu $t7, %lo(D_800DC5C8)($t7) -/* 10FAC8 802A64B8 24010001 */ li $at, 1 -/* 10FACC 802A64BC 15E10013 */ bne $t7, $at, .L802A650C -/* 10FAD0 802A64C0 00000000 */ nop -/* 10FAD4 802A64C4 8E020000 */ lw $v0, ($s0) -/* 10FAD8 802A64C8 3C190101 */ lui $t9, (0x01010040 >> 16) # lui $t9, 0x101 -/* 10FADC 802A64CC 37390040 */ ori $t9, (0x01010040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 10FAE0 802A64D0 24580008 */ addiu $t8, $v0, 8 -/* 10FAE4 802A64D4 AE180000 */ sw $t8, ($s0) -/* 10FAE8 802A64D8 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 10FAEC 802A64DC AC590000 */ sw $t9, ($v0) -/* 10FAF0 802A64E0 8D4AEF40 */ lw $t2, %lo(gGfxPool)($t2) -/* 10FAF4 802A64E4 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FAF8 802A64E8 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FAFC 802A64EC 254B01C0 */ addiu $t3, $t2, 0x1c0 -/* 10FB00 802A64F0 01616024 */ and $t4, $t3, $at -/* 10FB04 802A64F4 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FB08 802A64F8 0C0AD4F2 */ jal func_802B53C8 -/* 10FB0C 802A64FC AC4C0004 */ sw $t4, 4($v0) -/* 10FB10 802A6500 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FB14 802A6504 0C0AD3FE */ jal func_802B4FF8 -/* 10FB18 802A6508 00002825 */ move $a1, $zero -.L802A650C: -/* 10FB1C 802A650C 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10FB20 802A6510 0C0A8C02 */ jal func_802A3008 -/* 10FB24 802A6514 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10FB28 802A6518 0C016024 */ jal func_80058090 -/* 10FB2C 802A651C 24040003 */ li $a0, 3 -/* 10FB30 802A6520 0C0084AD */ jal func_800212B4 -/* 10FB34 802A6524 00000000 */ nop -/* 10FB38 802A6528 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10FB3C 802A652C 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10FB40 802A6530 0C0A448B */ jal func_8029122C -/* 10FB44 802A6534 00002825 */ move $a1, $zero -/* 10FB48 802A6538 0C0086C3 */ jal func_80021B0C -/* 10FB4C 802A653C 00000000 */ nop -/* 10FB50 802A6540 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10FB54 802A6544 0C0A8BCD */ jal func_802A2F34 -/* 10FB58 802A6548 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10FB5C 802A654C 0C01614E */ jal func_80058538 -/* 10FB60 802A6550 24040003 */ li $a0, 3 -/* 10FB64 802A6554 0C0162FD */ jal func_80058BF4 -/* 10FB68 802A6558 00000000 */ nop -/* 10FB6C 802A655C 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 10FB70 802A6560 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 10FB74 802A6564 960D0000 */ lhu $t5, ($s0) -/* 10FB78 802A6568 11A00003 */ beqz $t5, .L802A6578 -/* 10FB7C 802A656C 00000000 */ nop -/* 10FB80 802A6570 0C016308 */ jal func_80058C20 -/* 10FB84 802A6574 24040003 */ li $a0, 3 -.L802A6578: -/* 10FB88 802A6578 0C024E97 */ jal func_80093A5C -/* 10FB8C 802A657C 24040003 */ li $a0, 3 -/* 10FB90 802A6580 960E0000 */ lhu $t6, ($s0) -/* 10FB94 802A6584 11C00003 */ beqz $t6, .L802A6594 -/* 10FB98 802A6588 00000000 */ nop -/* 10FB9C 802A658C 0C01636D */ jal func_80058DB4 -/* 10FBA0 802A6590 24040003 */ li $a0, 3 -.L802A6594: -/* 10FBA4 802A6594 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 10FBA8 802A6598 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 10FBAC 802A659C 8C4F0000 */ lw $t7, ($v0) -/* 10FBB0 802A65A0 8FBF0034 */ lw $ra, 0x34($sp) -/* 10FBB4 802A65A4 8FB00030 */ lw $s0, 0x30($sp) -/* 10FBB8 802A65A8 25F80001 */ addiu $t8, $t7, 1 -/* 10FBBC 802A65AC AC580000 */ sw $t8, ($v0) -/* 10FBC0 802A65B0 03E00008 */ jr $ra -/* 10FBC4 802A65B4 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/non_matchings/code_802A3730/func_802A65B8.s b/asm/non_matchings/code_802A3730/func_802A65B8.s deleted file mode 100644 index 1a7b6e67f..000000000 --- a/asm/non_matchings/code_802A3730/func_802A65B8.s +++ /dev/null @@ -1,203 +0,0 @@ -glabel func_802A65B8 -/* 10FBC8 802A65B8 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 10FBCC 802A65BC AFBF0034 */ sw $ra, 0x34($sp) -/* 10FBD0 802A65C0 0C0A94AF */ jal func_802A52BC -/* 10FBD4 802A65C4 AFB00030 */ sw $s0, 0x30($sp) -/* 10FBD8 802A65C8 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 10FBDC 802A65CC 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 10FBE0 802A65D0 8E020000 */ lw $v0, ($s0) -/* 10FBE4 802A65D4 3C180002 */ lui $t8, (0x00022204 >> 16) # lui $t8, 2 -/* 10FBE8 802A65D8 37182204 */ ori $t8, (0x00022204 & 0xFFFF) # ori $t8, $t8, 0x2204 -/* 10FBEC 802A65DC 244E0008 */ addiu $t6, $v0, 8 -/* 10FBF0 802A65E0 AE0E0000 */ sw $t6, ($s0) -/* 10FBF4 802A65E4 3C0FB700 */ lui $t7, 0xb700 -/* 10FBF8 802A65E8 AC4F0000 */ sw $t7, ($v0) -/* 10FBFC 802A65EC 0C0A8F8F */ jal func_802A3E3C -/* 10FC00 802A65F0 AC580004 */ sw $t8, 4($v0) -/* 10FC04 802A65F4 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10FC08 802A65F8 0C0A8DCC */ jal func_802A3730 -/* 10FC0C 802A65FC 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10FC10 802A6600 8E020000 */ lw $v0, ($s0) -/* 10FC14 802A6604 3C0AB700 */ lui $t2, 0xb700 -/* 10FC18 802A6608 240B2205 */ li $t3, 8709 -/* 10FC1C 802A660C 24590008 */ addiu $t9, $v0, 8 -/* 10FC20 802A6610 AE190000 */ sw $t9, ($s0) -/* 10FC24 802A6614 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10FC28 802A6618 AC4B0004 */ sw $t3, 4($v0) -/* 10FC2C 802A661C AC4A0000 */ sw $t2, ($v0) -/* 10FC30 802A6620 C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 10FC34 802A6624 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10FC38 802A6628 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 10FC3C 802A662C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10FC40 802A6630 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 10FC44 802A6634 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 10FC48 802A6638 44814000 */ mtc1 $at, $f8 -/* 10FC4C 802A663C 3C068015 */ lui $a2, %hi(D_80150134) # $a2, 0x8015 -/* 10FC50 802A6640 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 10FC54 802A6644 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 10FC58 802A6648 8CC60134 */ lw $a2, %lo(D_80150134)($a2) -/* 10FC5C 802A664C 27A5009A */ addiu $a1, $sp, 0x9a -/* 10FC60 802A6650 E7A40010 */ swc1 $f4, 0x10($sp) -/* 10FC64 802A6654 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10FC68 802A6658 24840080 */ addiu $a0, $a0, 0x80 -/* 10FC6C 802A665C 0C033CCC */ jal guPerspective -/* 10FC70 802A6660 E7A80018 */ swc1 $f8, 0x18($sp) -/* 10FC74 802A6664 8E020000 */ lw $v0, ($s0) -/* 10FC78 802A6668 3C0DB400 */ lui $t5, 0xb400 -/* 10FC7C 802A666C 3C180103 */ lui $t8, (0x01030040 >> 16) # lui $t8, 0x103 -/* 10FC80 802A6670 244C0008 */ addiu $t4, $v0, 8 -/* 10FC84 802A6674 AE0C0000 */ sw $t4, ($s0) -/* 10FC88 802A6678 AC4D0000 */ sw $t5, ($v0) -/* 10FC8C 802A667C 97AE009A */ lhu $t6, 0x9a($sp) -/* 10FC90 802A6680 3C098015 */ lui $t1, %hi(gGfxPool) # $t1, 0x8015 -/* 10FC94 802A6684 37180040 */ ori $t8, (0x01030040 & 0xFFFF) # ori $t8, $t8, 0x40 -/* 10FC98 802A6688 AC4E0004 */ sw $t6, 4($v0) -/* 10FC9C 802A668C 8E020000 */ lw $v0, ($s0) -/* 10FCA0 802A6690 2529EF40 */ addiu $t1, %lo(gGfxPool) # addiu $t1, $t1, -0x10c0 -/* 10FCA4 802A6694 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FCA8 802A6698 244F0008 */ addiu $t7, $v0, 8 -/* 10FCAC 802A669C AE0F0000 */ sw $t7, ($s0) -/* 10FCB0 802A66A0 AC580000 */ sw $t8, ($v0) -/* 10FCB4 802A66A4 8D390000 */ lw $t9, ($t1) -/* 10FCB8 802A66A8 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FCBC 802A66AC 3C058016 */ lui $a1, %hi(D_801647A8) # $a1, 0x8016 -/* 10FCC0 802A66B0 272A0080 */ addiu $t2, $t9, 0x80 -/* 10FCC4 802A66B4 01415824 */ and $t3, $t2, $at -/* 10FCC8 802A66B8 AC4B0004 */ sw $t3, 4($v0) -/* 10FCCC 802A66BC 3C018016 */ lui $at, %hi(D_801647B4) # $at, 0x8016 -/* 10FCD0 802A66C0 C42A47B4 */ lwc1 $f10, %lo(D_801647B4)($at) -/* 10FCD4 802A66C4 3C018016 */ lui $at, %hi(D_801647B8) # $at, 0x8016 -/* 10FCD8 802A66C8 C43047B8 */ lwc1 $f16, %lo(D_801647B8)($at) -/* 10FCDC 802A66CC 3C018016 */ lui $at, %hi(D_801647BC) # $at, 0x8016 -/* 10FCE0 802A66D0 C43247BC */ lwc1 $f18, %lo(D_801647BC)($at) -/* 10FCE4 802A66D4 3C018016 */ lui $at, %hi(D_801647C0) # $at, 0x8016 -/* 10FCE8 802A66D8 C42447C0 */ lwc1 $f4, %lo(D_801647C0)($at) -/* 10FCEC 802A66DC 3C018016 */ lui $at, %hi(D_801647C4) # $at, 0x8016 -/* 10FCF0 802A66E0 C42647C4 */ lwc1 $f6, %lo(D_801647C4)($at) -/* 10FCF4 802A66E4 3C018016 */ lui $at, %hi(D_801647C8) # $at, 0x8016 -/* 10FCF8 802A66E8 C42847C8 */ lwc1 $f8, %lo(D_801647C8)($at) -/* 10FCFC 802A66EC 8D240000 */ lw $a0, ($t1) -/* 10FD00 802A66F0 3C068016 */ lui $a2, %hi(D_801647AC) # $a2, 0x8016 -/* 10FD04 802A66F4 3C078016 */ lui $a3, %hi(D_801647B0) # $a3, 0x8016 -/* 10FD08 802A66F8 8CE747B0 */ lw $a3, %lo(D_801647B0)($a3) -/* 10FD0C 802A66FC 8CC647AC */ lw $a2, %lo(D_801647AC)($a2) -/* 10FD10 802A6700 8CA547A8 */ lw $a1, %lo(D_801647A8)($a1) -/* 10FD14 802A6704 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 10FD18 802A6708 E7B00014 */ swc1 $f16, 0x14($sp) -/* 10FD1C 802A670C E7B20018 */ swc1 $f18, 0x18($sp) -/* 10FD20 802A6710 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 10FD24 802A6714 E7A60020 */ swc1 $f6, 0x20($sp) -/* 10FD28 802A6718 E7A80024 */ swc1 $f8, 0x24($sp) -/* 10FD2C 802A671C 0C033D92 */ jal guLookAt -/* 10FD30 802A6720 24840200 */ addiu $a0, $a0, 0x200 -/* 10FD34 802A6724 3C0C800E */ lui $t4, %hi(D_800DC5C8) # $t4, 0x800e -/* 10FD38 802A6728 958CC5C8 */ lhu $t4, %lo(D_800DC5C8)($t4) -/* 10FD3C 802A672C 55800016 */ bnel $t4, $zero, .L802A6788 -/* 10FD40 802A6730 8E020000 */ lw $v0, ($s0) -/* 10FD44 802A6734 8E020000 */ lw $v0, ($s0) -/* 10FD48 802A6738 3C0E0101 */ lui $t6, (0x01010040 >> 16) # lui $t6, 0x101 -/* 10FD4C 802A673C 35CE0040 */ ori $t6, (0x01010040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 10FD50 802A6740 244D0008 */ addiu $t5, $v0, 8 -/* 10FD54 802A6744 AE0D0000 */ sw $t5, ($s0) -/* 10FD58 802A6748 3C0F8015 */ lui $t7, %hi(gGfxPool) # $t7, 0x8015 -/* 10FD5C 802A674C AC4E0000 */ sw $t6, ($v0) -/* 10FD60 802A6750 8DEFEF40 */ lw $t7, %lo(gGfxPool)($t7) -/* 10FD64 802A6754 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FD68 802A6758 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FD6C 802A675C 25F80200 */ addiu $t8, $t7, 0x200 -/* 10FD70 802A6760 0301C824 */ and $t9, $t8, $at -/* 10FD74 802A6764 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FD78 802A6768 0C0AD4F2 */ jal func_802B53C8 -/* 10FD7C 802A676C AC590004 */ sw $t9, 4($v0) -/* 10FD80 802A6770 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FD84 802A6774 0C0AD3FE */ jal func_802B4FF8 -/* 10FD88 802A6778 00002825 */ move $a1, $zero -/* 10FD8C 802A677C 1000000E */ b .L802A67B8 -/* 10FD90 802A6780 00000000 */ nop -/* 10FD94 802A6784 8E020000 */ lw $v0, ($s0) -.L802A6788: -/* 10FD98 802A6788 3C0B0102 */ lui $t3, (0x01020040 >> 16) # lui $t3, 0x102 -/* 10FD9C 802A678C 356B0040 */ ori $t3, (0x01020040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 10FDA0 802A6790 244A0008 */ addiu $t2, $v0, 8 -/* 10FDA4 802A6794 AE0A0000 */ sw $t2, ($s0) -/* 10FDA8 802A6798 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 10FDAC 802A679C AC4B0000 */ sw $t3, ($v0) -/* 10FDB0 802A67A0 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 10FDB4 802A67A4 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FDB8 802A67A8 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FDBC 802A67AC 258D0200 */ addiu $t5, $t4, 0x200 -/* 10FDC0 802A67B0 01A17024 */ and $t6, $t5, $at -/* 10FDC4 802A67B4 AC4E0004 */ sw $t6, 4($v0) -.L802A67B8: -/* 10FDC8 802A67B8 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10FDCC 802A67BC 0C0A568E */ jal func_80295A38 -/* 10FDD0 802A67C0 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10FDD4 802A67C4 3C0F800E */ lui $t7, %hi(D_800DC5C8) # $t7, 0x800e -/* 10FDD8 802A67C8 95EFC5C8 */ lhu $t7, %lo(D_800DC5C8)($t7) -/* 10FDDC 802A67CC 24010001 */ li $at, 1 -/* 10FDE0 802A67D0 15E10013 */ bne $t7, $at, .L802A6820 -/* 10FDE4 802A67D4 00000000 */ nop -/* 10FDE8 802A67D8 8E020000 */ lw $v0, ($s0) -/* 10FDEC 802A67DC 3C190101 */ lui $t9, (0x01010040 >> 16) # lui $t9, 0x101 -/* 10FDF0 802A67E0 37390040 */ ori $t9, (0x01010040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 10FDF4 802A67E4 24580008 */ addiu $t8, $v0, 8 -/* 10FDF8 802A67E8 AE180000 */ sw $t8, ($s0) -/* 10FDFC 802A67EC 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 10FE00 802A67F0 AC590000 */ sw $t9, ($v0) -/* 10FE04 802A67F4 8D4AEF40 */ lw $t2, %lo(gGfxPool)($t2) -/* 10FE08 802A67F8 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FE0C 802A67FC 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FE10 802A6800 254B0200 */ addiu $t3, $t2, 0x200 -/* 10FE14 802A6804 01616024 */ and $t4, $t3, $at -/* 10FE18 802A6808 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FE1C 802A680C 0C0AD4F2 */ jal func_802B53C8 -/* 10FE20 802A6810 AC4C0004 */ sw $t4, 4($v0) -/* 10FE24 802A6814 27A40058 */ addiu $a0, $sp, 0x58 -/* 10FE28 802A6818 0C0AD3FE */ jal func_802B4FF8 -/* 10FE2C 802A681C 00002825 */ move $a1, $zero -.L802A6820: -/* 10FE30 802A6820 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10FE34 802A6824 0C0A8C02 */ jal func_802A3008 -/* 10FE38 802A6828 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10FE3C 802A682C 0C016024 */ jal func_80058090 -/* 10FE40 802A6830 24040004 */ li $a0, 4 -/* 10FE44 802A6834 0C008577 */ jal func_800215DC -/* 10FE48 802A6838 00000000 */ nop -/* 10FE4C 802A683C 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10FE50 802A6840 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10FE54 802A6844 0C0A448B */ jal func_8029122C -/* 10FE58 802A6848 24050001 */ li $a1, 1 -/* 10FE5C 802A684C 0C00871E */ jal func_80021C78 -/* 10FE60 802A6850 00000000 */ nop -/* 10FE64 802A6854 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 10FE68 802A6858 0C0A8BCD */ jal func_802A2F34 -/* 10FE6C 802A685C 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 10FE70 802A6860 0C01614E */ jal func_80058538 -/* 10FE74 802A6864 24040004 */ li $a0, 4 -/* 10FE78 802A6868 0C0162FD */ jal func_80058BF4 -/* 10FE7C 802A686C 00000000 */ nop -/* 10FE80 802A6870 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 10FE84 802A6874 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 10FE88 802A6878 960D0000 */ lhu $t5, ($s0) -/* 10FE8C 802A687C 11A00003 */ beqz $t5, .L802A688C -/* 10FE90 802A6880 00000000 */ nop -/* 10FE94 802A6884 0C016308 */ jal func_80058C20 -/* 10FE98 802A6888 24040004 */ li $a0, 4 -.L802A688C: -/* 10FE9C 802A688C 0C024E97 */ jal func_80093A5C -/* 10FEA0 802A6890 24040004 */ li $a0, 4 -/* 10FEA4 802A6894 960E0000 */ lhu $t6, ($s0) -/* 10FEA8 802A6898 11C00003 */ beqz $t6, .L802A68A8 -/* 10FEAC 802A689C 00000000 */ nop -/* 10FEB0 802A68A0 0C01636D */ jal func_80058DB4 -/* 10FEB4 802A68A4 24040004 */ li $a0, 4 -.L802A68A8: -/* 10FEB8 802A68A8 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 10FEBC 802A68AC 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 10FEC0 802A68B0 8C4F0000 */ lw $t7, ($v0) -/* 10FEC4 802A68B4 8FBF0034 */ lw $ra, 0x34($sp) -/* 10FEC8 802A68B8 8FB00030 */ lw $s0, 0x30($sp) -/* 10FECC 802A68BC 25F80001 */ addiu $t8, $t7, 1 -/* 10FED0 802A68C0 AC580000 */ sw $t8, ($v0) -/* 10FED4 802A68C4 03E00008 */ jr $ra -/* 10FED8 802A68C8 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/non_matchings/code_802A3730/func_802A68CC.s b/asm/non_matchings/code_802A3730/func_802A68CC.s deleted file mode 100644 index b25e41225..000000000 --- a/asm/non_matchings/code_802A3730/func_802A68CC.s +++ /dev/null @@ -1,191 +0,0 @@ -glabel func_802A68CC -/* 10FEDC 802A68CC 3C03800E */ lui $v1, %hi(D_800DDB40) # $v1, 0x800e -/* 10FEE0 802A68D0 8C63DB40 */ lw $v1, %lo(D_800DDB40)($v1) -/* 10FEE4 802A68D4 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 10FEE8 802A68D8 AFBF0034 */ sw $ra, 0x34($sp) -/* 10FEEC 802A68DC AFB00030 */ sw $s0, 0x30($sp) -/* 10FEF0 802A68E0 0C0A952A */ jal func_802A54A8 -/* 10FEF4 802A68E4 AFA300A4 */ sw $v1, 0xa4($sp) -/* 10FEF8 802A68E8 0C0A8F8F */ jal func_802A3E3C -/* 10FEFC 802A68EC 00000000 */ nop -/* 10FF00 802A68F0 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 10FF04 802A68F4 0C0A8DCC */ jal func_802A3730 -/* 10FF08 802A68F8 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 10FF0C 802A68FC 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 10FF10 802A6900 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 10FF14 802A6904 8E020000 */ lw $v0, ($s0) -/* 10FF18 802A6908 3C0FB700 */ lui $t7, 0xb700 -/* 10FF1C 802A690C 24182205 */ li $t8, 8709 -/* 10FF20 802A6910 244E0008 */ addiu $t6, $v0, 8 -/* 10FF24 802A6914 AE0E0000 */ sw $t6, ($s0) -/* 10FF28 802A6918 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 10FF2C 802A691C AC580004 */ sw $t8, 4($v0) -/* 10FF30 802A6920 AC4F0000 */ sw $t7, ($v0) -/* 10FF34 802A6924 C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 10FF38 802A6928 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 10FF3C 802A692C C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 10FF40 802A6930 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 10FF44 802A6934 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 10FF48 802A6938 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 10FF4C 802A693C 44814000 */ mtc1 $at, $f8 -/* 10FF50 802A6940 3C068015 */ lui $a2, %hi(D_80150130) # $a2, 0x8015 -/* 10FF54 802A6944 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 10FF58 802A6948 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 10FF5C 802A694C 8CC60130 */ lw $a2, %lo(D_80150130)($a2) -/* 10FF60 802A6950 27A5009A */ addiu $a1, $sp, 0x9a -/* 10FF64 802A6954 E7A40010 */ swc1 $f4, 0x10($sp) -/* 10FF68 802A6958 E7A60014 */ swc1 $f6, 0x14($sp) -/* 10FF6C 802A695C 24840040 */ addiu $a0, $a0, 0x40 -/* 10FF70 802A6960 0C033CCC */ jal guPerspective -/* 10FF74 802A6964 E7A80018 */ swc1 $f8, 0x18($sp) -/* 10FF78 802A6968 8E020000 */ lw $v0, ($s0) -/* 10FF7C 802A696C 8FA300A4 */ lw $v1, 0xa4($sp) -/* 10FF80 802A6970 3C0BB400 */ lui $t3, 0xb400 -/* 10FF84 802A6974 24590008 */ addiu $t9, $v0, 8 -/* 10FF88 802A6978 AE190000 */ sw $t9, ($s0) -/* 10FF8C 802A697C AC4B0000 */ sw $t3, ($v0) -/* 10FF90 802A6980 97AC009A */ lhu $t4, 0x9a($sp) -/* 10FF94 802A6984 3C0E0103 */ lui $t6, (0x01030040 >> 16) # lui $t6, 0x103 -/* 10FF98 802A6988 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 10FF9C 802A698C AC4C0004 */ sw $t4, 4($v0) -/* 10FFA0 802A6990 8E020000 */ lw $v0, ($s0) -/* 10FFA4 802A6994 35CE0040 */ ori $t6, (0x01030040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 10FFA8 802A6998 254AEF40 */ addiu $t2, %lo(gGfxPool) # addiu $t2, $t2, -0x10c0 -/* 10FFAC 802A699C 244D0008 */ addiu $t5, $v0, 8 -/* 10FFB0 802A69A0 AE0D0000 */ sw $t5, ($s0) -/* 10FFB4 802A69A4 AC4E0000 */ sw $t6, ($v0) -/* 10FFB8 802A69A8 8D4F0000 */ lw $t7, ($t2) -/* 10FFBC 802A69AC 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 10FFC0 802A69B0 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 10FFC4 802A69B4 25F80040 */ addiu $t8, $t7, 0x40 -/* 10FFC8 802A69B8 0301C824 */ and $t9, $t8, $at -/* 10FFCC 802A69BC AC590004 */ sw $t9, 4($v0) -/* 10FFD0 802A69C0 C46A000C */ lwc1 $f10, 0xc($v1) -/* 10FFD4 802A69C4 8C670008 */ lw $a3, 8($v1) -/* 10FFD8 802A69C8 8C660004 */ lw $a2, 4($v1) -/* 10FFDC 802A69CC 8C650000 */ lw $a1, ($v1) -/* 10FFE0 802A69D0 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 10FFE4 802A69D4 C4700010 */ lwc1 $f16, 0x10($v1) -/* 10FFE8 802A69D8 8D440000 */ lw $a0, ($t2) -/* 10FFEC 802A69DC E7B00014 */ swc1 $f16, 0x14($sp) -/* 10FFF0 802A69E0 C4720014 */ lwc1 $f18, 0x14($v1) -/* 10FFF4 802A69E4 248401C0 */ addiu $a0, $a0, 0x1c0 -/* 10FFF8 802A69E8 E7B20018 */ swc1 $f18, 0x18($sp) -/* 10FFFC 802A69EC C4640018 */ lwc1 $f4, 0x18($v1) -/* 110000 802A69F0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 110004 802A69F4 C466001C */ lwc1 $f6, 0x1c($v1) -/* 110008 802A69F8 E7A60020 */ swc1 $f6, 0x20($sp) -/* 11000C 802A69FC C4680020 */ lwc1 $f8, 0x20($v1) -/* 110010 802A6A00 0C033D92 */ jal guLookAt -/* 110014 802A6A04 E7A80024 */ swc1 $f8, 0x24($sp) -/* 110018 802A6A08 3C0B800E */ lui $t3, %hi(D_800DC5C8) # $t3, 0x800e -/* 11001C 802A6A0C 956BC5C8 */ lhu $t3, %lo(D_800DC5C8)($t3) -/* 110020 802A6A10 55600016 */ bnel $t3, $zero, .L802A6A6C -/* 110024 802A6A14 8E020000 */ lw $v0, ($s0) -/* 110028 802A6A18 8E020000 */ lw $v0, ($s0) -/* 11002C 802A6A1C 3C0D0101 */ lui $t5, (0x01010040 >> 16) # lui $t5, 0x101 -/* 110030 802A6A20 35AD0040 */ ori $t5, (0x01010040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 110034 802A6A24 244C0008 */ addiu $t4, $v0, 8 -/* 110038 802A6A28 AE0C0000 */ sw $t4, ($s0) -/* 11003C 802A6A2C 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 110040 802A6A30 AC4D0000 */ sw $t5, ($v0) -/* 110044 802A6A34 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 110048 802A6A38 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 11004C 802A6A3C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 110050 802A6A40 25CF01C0 */ addiu $t7, $t6, 0x1c0 -/* 110054 802A6A44 01E1C024 */ and $t8, $t7, $at -/* 110058 802A6A48 27A40058 */ addiu $a0, $sp, 0x58 -/* 11005C 802A6A4C 0C0AD4F2 */ jal func_802B53C8 -/* 110060 802A6A50 AC580004 */ sw $t8, 4($v0) -/* 110064 802A6A54 27A40058 */ addiu $a0, $sp, 0x58 -/* 110068 802A6A58 0C0AD3FE */ jal func_802B4FF8 -/* 11006C 802A6A5C 00002825 */ move $a1, $zero -/* 110070 802A6A60 1000000E */ b .L802A6A9C -/* 110074 802A6A64 00000000 */ nop -/* 110078 802A6A68 8E020000 */ lw $v0, ($s0) -.L802A6A6C: -/* 11007C 802A6A6C 3C0B0102 */ lui $t3, (0x01020040 >> 16) # lui $t3, 0x102 -/* 110080 802A6A70 356B0040 */ ori $t3, (0x01020040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 110084 802A6A74 24590008 */ addiu $t9, $v0, 8 -/* 110088 802A6A78 AE190000 */ sw $t9, ($s0) -/* 11008C 802A6A7C 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 110090 802A6A80 AC4B0000 */ sw $t3, ($v0) -/* 110094 802A6A84 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 110098 802A6A88 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 11009C 802A6A8C 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1100A0 802A6A90 258D01C0 */ addiu $t5, $t4, 0x1c0 -/* 1100A4 802A6A94 01A17024 */ and $t6, $t5, $at -/* 1100A8 802A6A98 AC4E0004 */ sw $t6, 4($v0) -.L802A6A9C: -/* 1100AC 802A6A9C 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 1100B0 802A6AA0 0C0A568E */ jal func_80295A38 -/* 1100B4 802A6AA4 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 1100B8 802A6AA8 3C0F800E */ lui $t7, %hi(D_800DC5C8) # $t7, 0x800e -/* 1100BC 802A6AAC 95EFC5C8 */ lhu $t7, %lo(D_800DC5C8)($t7) -/* 1100C0 802A6AB0 24010001 */ li $at, 1 -/* 1100C4 802A6AB4 15E10013 */ bne $t7, $at, .L802A6B04 -/* 1100C8 802A6AB8 00000000 */ nop -/* 1100CC 802A6ABC 8E020000 */ lw $v0, ($s0) -/* 1100D0 802A6AC0 3C190101 */ lui $t9, (0x01010040 >> 16) # lui $t9, 0x101 -/* 1100D4 802A6AC4 37390040 */ ori $t9, (0x01010040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 1100D8 802A6AC8 24580008 */ addiu $t8, $v0, 8 -/* 1100DC 802A6ACC AE180000 */ sw $t8, ($s0) -/* 1100E0 802A6AD0 3C0B8015 */ lui $t3, %hi(gGfxPool) # $t3, 0x8015 -/* 1100E4 802A6AD4 AC590000 */ sw $t9, ($v0) -/* 1100E8 802A6AD8 8D6BEF40 */ lw $t3, %lo(gGfxPool)($t3) -/* 1100EC 802A6ADC 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1100F0 802A6AE0 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1100F4 802A6AE4 256C01C0 */ addiu $t4, $t3, 0x1c0 -/* 1100F8 802A6AE8 01816824 */ and $t5, $t4, $at -/* 1100FC 802A6AEC 27A40058 */ addiu $a0, $sp, 0x58 -/* 110100 802A6AF0 0C0AD4F2 */ jal func_802B53C8 -/* 110104 802A6AF4 AC4D0004 */ sw $t5, 4($v0) -/* 110108 802A6AF8 27A40058 */ addiu $a0, $sp, 0x58 -/* 11010C 802A6AFC 0C0AD3FE */ jal func_802B4FF8 -/* 110110 802A6B00 00002825 */ move $a1, $zero -.L802A6B04: -/* 110114 802A6B04 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 110118 802A6B08 0C0A8C02 */ jal func_802A3008 -/* 11011C 802A6B0C 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 110120 802A6B10 0C016024 */ jal func_80058090 -/* 110124 802A6B14 24040008 */ li $a0, 8 -/* 110128 802A6B18 0C0084AD */ jal func_800212B4 -/* 11012C 802A6B1C 00000000 */ nop -/* 110130 802A6B20 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 110134 802A6B24 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 110138 802A6B28 0C0A448B */ jal func_8029122C -/* 11013C 802A6B2C 00002825 */ move $a1, $zero -/* 110140 802A6B30 0C0086C3 */ jal func_80021B0C -/* 110144 802A6B34 00000000 */ nop -/* 110148 802A6B38 3C04800E */ lui $a0, %hi(D_800DC5EC) # $a0, 0x800e -/* 11014C 802A6B3C 0C0A8BCD */ jal func_802A2F34 -/* 110150 802A6B40 8C84C5EC */ lw $a0, %lo(D_800DC5EC)($a0) -/* 110154 802A6B44 0C01614E */ jal func_80058538 -/* 110158 802A6B48 24040008 */ li $a0, 8 -/* 11015C 802A6B4C 0C0162FD */ jal func_80058BF4 -/* 110160 802A6B50 00000000 */ nop -/* 110164 802A6B54 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 110168 802A6B58 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 11016C 802A6B5C 960E0000 */ lhu $t6, ($s0) -/* 110170 802A6B60 11C00003 */ beqz $t6, .L802A6B70 -/* 110174 802A6B64 00000000 */ nop -/* 110178 802A6B68 0C016308 */ jal func_80058C20 -/* 11017C 802A6B6C 24040008 */ li $a0, 8 -.L802A6B70: -/* 110180 802A6B70 0C024E97 */ jal func_80093A5C -/* 110184 802A6B74 24040008 */ li $a0, 8 -/* 110188 802A6B78 960F0000 */ lhu $t7, ($s0) -/* 11018C 802A6B7C 11E00003 */ beqz $t7, .L802A6B8C -/* 110190 802A6B80 00000000 */ nop -/* 110194 802A6B84 0C01636D */ jal func_80058DB4 -/* 110198 802A6B88 24040008 */ li $a0, 8 -.L802A6B8C: -/* 11019C 802A6B8C 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 1101A0 802A6B90 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 1101A4 802A6B94 8C580000 */ lw $t8, ($v0) -/* 1101A8 802A6B98 8FBF0034 */ lw $ra, 0x34($sp) -/* 1101AC 802A6B9C 8FB00030 */ lw $s0, 0x30($sp) -/* 1101B0 802A6BA0 27190001 */ addiu $t9, $t8, 1 -/* 1101B4 802A6BA4 AC590000 */ sw $t9, ($v0) -/* 1101B8 802A6BA8 03E00008 */ jr $ra -/* 1101BC 802A6BAC 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/non_matchings/code_802A3730/func_802A6BB0.s b/asm/non_matchings/code_802A3730/func_802A6BB0.s deleted file mode 100644 index 8cbbccd9d..000000000 --- a/asm/non_matchings/code_802A3730/func_802A6BB0.s +++ /dev/null @@ -1,191 +0,0 @@ -glabel func_802A6BB0 -/* 1101C0 802A6BB0 3C03800E */ lui $v1, %hi(D_800DDB44) # $v1, 0x800e -/* 1101C4 802A6BB4 8C63DB44 */ lw $v1, %lo(D_800DDB44)($v1) -/* 1101C8 802A6BB8 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 1101CC 802A6BBC AFBF0034 */ sw $ra, 0x34($sp) -/* 1101D0 802A6BC0 AFB00030 */ sw $s0, 0x30($sp) -/* 1101D4 802A6BC4 0C0A9564 */ jal func_802A5590 -/* 1101D8 802A6BC8 AFA300A4 */ sw $v1, 0xa4($sp) -/* 1101DC 802A6BCC 0C0A8F8F */ jal func_802A3E3C -/* 1101E0 802A6BD0 00000000 */ nop -/* 1101E4 802A6BD4 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 1101E8 802A6BD8 0C0A8DCC */ jal func_802A3730 -/* 1101EC 802A6BDC 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 1101F0 802A6BE0 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 1101F4 802A6BE4 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 1101F8 802A6BE8 8E020000 */ lw $v0, ($s0) -/* 1101FC 802A6BEC 3C0FB700 */ lui $t7, 0xb700 -/* 110200 802A6BF0 24182205 */ li $t8, 8709 -/* 110204 802A6BF4 244E0008 */ addiu $t6, $v0, 8 -/* 110208 802A6BF8 AE0E0000 */ sw $t6, ($s0) -/* 11020C 802A6BFC 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 110210 802A6C00 AC580004 */ sw $t8, 4($v0) -/* 110214 802A6C04 AC4F0000 */ sw $t7, ($v0) -/* 110218 802A6C08 C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 11021C 802A6C0C 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 110220 802A6C10 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 110224 802A6C14 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 110228 802A6C18 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 11022C 802A6C1C 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 110230 802A6C20 44814000 */ mtc1 $at, $f8 -/* 110234 802A6C24 3C068015 */ lui $a2, %hi(D_80150134) # $a2, 0x8015 -/* 110238 802A6C28 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 11023C 802A6C2C 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 110240 802A6C30 8CC60134 */ lw $a2, %lo(D_80150134)($a2) -/* 110244 802A6C34 27A5009A */ addiu $a1, $sp, 0x9a -/* 110248 802A6C38 E7A40010 */ swc1 $f4, 0x10($sp) -/* 11024C 802A6C3C E7A60014 */ swc1 $f6, 0x14($sp) -/* 110250 802A6C40 24840080 */ addiu $a0, $a0, 0x80 -/* 110254 802A6C44 0C033CCC */ jal guPerspective -/* 110258 802A6C48 E7A80018 */ swc1 $f8, 0x18($sp) -/* 11025C 802A6C4C 8E020000 */ lw $v0, ($s0) -/* 110260 802A6C50 8FA300A4 */ lw $v1, 0xa4($sp) -/* 110264 802A6C54 3C0BB400 */ lui $t3, 0xb400 -/* 110268 802A6C58 24590008 */ addiu $t9, $v0, 8 -/* 11026C 802A6C5C AE190000 */ sw $t9, ($s0) -/* 110270 802A6C60 AC4B0000 */ sw $t3, ($v0) -/* 110274 802A6C64 97AC009A */ lhu $t4, 0x9a($sp) -/* 110278 802A6C68 3C0E0103 */ lui $t6, (0x01030040 >> 16) # lui $t6, 0x103 -/* 11027C 802A6C6C 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 110280 802A6C70 AC4C0004 */ sw $t4, 4($v0) -/* 110284 802A6C74 8E020000 */ lw $v0, ($s0) -/* 110288 802A6C78 35CE0040 */ ori $t6, (0x01030040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 11028C 802A6C7C 254AEF40 */ addiu $t2, %lo(gGfxPool) # addiu $t2, $t2, -0x10c0 -/* 110290 802A6C80 244D0008 */ addiu $t5, $v0, 8 -/* 110294 802A6C84 AE0D0000 */ sw $t5, ($s0) -/* 110298 802A6C88 AC4E0000 */ sw $t6, ($v0) -/* 11029C 802A6C8C 8D4F0000 */ lw $t7, ($t2) -/* 1102A0 802A6C90 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1102A4 802A6C94 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1102A8 802A6C98 25F80080 */ addiu $t8, $t7, 0x80 -/* 1102AC 802A6C9C 0301C824 */ and $t9, $t8, $at -/* 1102B0 802A6CA0 AC590004 */ sw $t9, 4($v0) -/* 1102B4 802A6CA4 C46A000C */ lwc1 $f10, 0xc($v1) -/* 1102B8 802A6CA8 8C670008 */ lw $a3, 8($v1) -/* 1102BC 802A6CAC 8C660004 */ lw $a2, 4($v1) -/* 1102C0 802A6CB0 8C650000 */ lw $a1, ($v1) -/* 1102C4 802A6CB4 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 1102C8 802A6CB8 C4700010 */ lwc1 $f16, 0x10($v1) -/* 1102CC 802A6CBC 8D440000 */ lw $a0, ($t2) -/* 1102D0 802A6CC0 E7B00014 */ swc1 $f16, 0x14($sp) -/* 1102D4 802A6CC4 C4720014 */ lwc1 $f18, 0x14($v1) -/* 1102D8 802A6CC8 24840200 */ addiu $a0, $a0, 0x200 -/* 1102DC 802A6CCC E7B20018 */ swc1 $f18, 0x18($sp) -/* 1102E0 802A6CD0 C4640018 */ lwc1 $f4, 0x18($v1) -/* 1102E4 802A6CD4 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 1102E8 802A6CD8 C466001C */ lwc1 $f6, 0x1c($v1) -/* 1102EC 802A6CDC E7A60020 */ swc1 $f6, 0x20($sp) -/* 1102F0 802A6CE0 C4680020 */ lwc1 $f8, 0x20($v1) -/* 1102F4 802A6CE4 0C033D92 */ jal guLookAt -/* 1102F8 802A6CE8 E7A80024 */ swc1 $f8, 0x24($sp) -/* 1102FC 802A6CEC 3C0B800E */ lui $t3, %hi(D_800DC5C8) # $t3, 0x800e -/* 110300 802A6CF0 956BC5C8 */ lhu $t3, %lo(D_800DC5C8)($t3) -/* 110304 802A6CF4 55600016 */ bnel $t3, $zero, .L802A6D50 -/* 110308 802A6CF8 8E020000 */ lw $v0, ($s0) -/* 11030C 802A6CFC 8E020000 */ lw $v0, ($s0) -/* 110310 802A6D00 3C0D0101 */ lui $t5, (0x01010040 >> 16) # lui $t5, 0x101 -/* 110314 802A6D04 35AD0040 */ ori $t5, (0x01010040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 110318 802A6D08 244C0008 */ addiu $t4, $v0, 8 -/* 11031C 802A6D0C AE0C0000 */ sw $t4, ($s0) -/* 110320 802A6D10 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 110324 802A6D14 AC4D0000 */ sw $t5, ($v0) -/* 110328 802A6D18 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 11032C 802A6D1C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 110330 802A6D20 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 110334 802A6D24 25CF0200 */ addiu $t7, $t6, 0x200 -/* 110338 802A6D28 01E1C024 */ and $t8, $t7, $at -/* 11033C 802A6D2C 27A40058 */ addiu $a0, $sp, 0x58 -/* 110340 802A6D30 0C0AD4F2 */ jal func_802B53C8 -/* 110344 802A6D34 AC580004 */ sw $t8, 4($v0) -/* 110348 802A6D38 27A40058 */ addiu $a0, $sp, 0x58 -/* 11034C 802A6D3C 0C0AD3FE */ jal func_802B4FF8 -/* 110350 802A6D40 00002825 */ move $a1, $zero -/* 110354 802A6D44 1000000E */ b .L802A6D80 -/* 110358 802A6D48 00000000 */ nop -/* 11035C 802A6D4C 8E020000 */ lw $v0, ($s0) -.L802A6D50: -/* 110360 802A6D50 3C0B0102 */ lui $t3, (0x01020040 >> 16) # lui $t3, 0x102 -/* 110364 802A6D54 356B0040 */ ori $t3, (0x01020040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 110368 802A6D58 24590008 */ addiu $t9, $v0, 8 -/* 11036C 802A6D5C AE190000 */ sw $t9, ($s0) -/* 110370 802A6D60 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 110374 802A6D64 AC4B0000 */ sw $t3, ($v0) -/* 110378 802A6D68 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 11037C 802A6D6C 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 110380 802A6D70 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 110384 802A6D74 258D0200 */ addiu $t5, $t4, 0x200 -/* 110388 802A6D78 01A17024 */ and $t6, $t5, $at -/* 11038C 802A6D7C AC4E0004 */ sw $t6, 4($v0) -.L802A6D80: -/* 110390 802A6D80 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 110394 802A6D84 0C0A568E */ jal func_80295A38 -/* 110398 802A6D88 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 11039C 802A6D8C 3C0F800E */ lui $t7, %hi(D_800DC5C8) # $t7, 0x800e -/* 1103A0 802A6D90 95EFC5C8 */ lhu $t7, %lo(D_800DC5C8)($t7) -/* 1103A4 802A6D94 24010001 */ li $at, 1 -/* 1103A8 802A6D98 15E10013 */ bne $t7, $at, .L802A6DE8 -/* 1103AC 802A6D9C 00000000 */ nop -/* 1103B0 802A6DA0 8E020000 */ lw $v0, ($s0) -/* 1103B4 802A6DA4 3C190101 */ lui $t9, (0x01010040 >> 16) # lui $t9, 0x101 -/* 1103B8 802A6DA8 37390040 */ ori $t9, (0x01010040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 1103BC 802A6DAC 24580008 */ addiu $t8, $v0, 8 -/* 1103C0 802A6DB0 AE180000 */ sw $t8, ($s0) -/* 1103C4 802A6DB4 3C0B8015 */ lui $t3, %hi(gGfxPool) # $t3, 0x8015 -/* 1103C8 802A6DB8 AC590000 */ sw $t9, ($v0) -/* 1103CC 802A6DBC 8D6BEF40 */ lw $t3, %lo(gGfxPool)($t3) -/* 1103D0 802A6DC0 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1103D4 802A6DC4 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1103D8 802A6DC8 256C0200 */ addiu $t4, $t3, 0x200 -/* 1103DC 802A6DCC 01816824 */ and $t5, $t4, $at -/* 1103E0 802A6DD0 27A40058 */ addiu $a0, $sp, 0x58 -/* 1103E4 802A6DD4 0C0AD4F2 */ jal func_802B53C8 -/* 1103E8 802A6DD8 AC4D0004 */ sw $t5, 4($v0) -/* 1103EC 802A6DDC 27A40058 */ addiu $a0, $sp, 0x58 -/* 1103F0 802A6DE0 0C0AD3FE */ jal func_802B4FF8 -/* 1103F4 802A6DE4 00002825 */ move $a1, $zero -.L802A6DE8: -/* 1103F8 802A6DE8 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 1103FC 802A6DEC 0C0A8C02 */ jal func_802A3008 -/* 110400 802A6DF0 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 110404 802A6DF4 0C016024 */ jal func_80058090 -/* 110408 802A6DF8 24040009 */ li $a0, 9 -/* 11040C 802A6DFC 0C008577 */ jal func_800215DC -/* 110410 802A6E00 00000000 */ nop -/* 110414 802A6E04 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 110418 802A6E08 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 11041C 802A6E0C 0C0A448B */ jal func_8029122C -/* 110420 802A6E10 24050001 */ li $a1, 1 -/* 110424 802A6E14 0C00871E */ jal func_80021C78 -/* 110428 802A6E18 00000000 */ nop -/* 11042C 802A6E1C 3C04800E */ lui $a0, %hi(D_800DC5F0) # $a0, 0x800e -/* 110430 802A6E20 0C0A8BCD */ jal func_802A2F34 -/* 110434 802A6E24 8C84C5F0 */ lw $a0, %lo(D_800DC5F0)($a0) -/* 110438 802A6E28 0C01614E */ jal func_80058538 -/* 11043C 802A6E2C 24040009 */ li $a0, 9 -/* 110440 802A6E30 0C0162FD */ jal func_80058BF4 -/* 110444 802A6E34 00000000 */ nop -/* 110448 802A6E38 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 11044C 802A6E3C 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 110450 802A6E40 960E0000 */ lhu $t6, ($s0) -/* 110454 802A6E44 11C00003 */ beqz $t6, .L802A6E54 -/* 110458 802A6E48 00000000 */ nop -/* 11045C 802A6E4C 0C016308 */ jal func_80058C20 -/* 110460 802A6E50 24040009 */ li $a0, 9 -.L802A6E54: -/* 110464 802A6E54 0C024E97 */ jal func_80093A5C -/* 110468 802A6E58 24040009 */ li $a0, 9 -/* 11046C 802A6E5C 960F0000 */ lhu $t7, ($s0) -/* 110470 802A6E60 11E00003 */ beqz $t7, .L802A6E70 -/* 110474 802A6E64 00000000 */ nop -/* 110478 802A6E68 0C01636D */ jal func_80058DB4 -/* 11047C 802A6E6C 24040009 */ li $a0, 9 -.L802A6E70: -/* 110480 802A6E70 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 110484 802A6E74 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 110488 802A6E78 8C580000 */ lw $t8, ($v0) -/* 11048C 802A6E7C 8FBF0034 */ lw $ra, 0x34($sp) -/* 110490 802A6E80 8FB00030 */ lw $s0, 0x30($sp) -/* 110494 802A6E84 27190001 */ addiu $t9, $t8, 1 -/* 110498 802A6E88 AC590000 */ sw $t9, ($v0) -/* 11049C 802A6E8C 03E00008 */ jr $ra -/* 1104A0 802A6E90 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/non_matchings/code_802A3730/func_802A6E94.s b/asm/non_matchings/code_802A3730/func_802A6E94.s deleted file mode 100644 index dd380cdc9..000000000 --- a/asm/non_matchings/code_802A3730/func_802A6E94.s +++ /dev/null @@ -1,191 +0,0 @@ -glabel func_802A6E94 -/* 1104A4 802A6E94 3C03800E */ lui $v1, %hi(D_800DDB48) # $v1, 0x800e -/* 1104A8 802A6E98 8C63DB48 */ lw $v1, %lo(D_800DDB48)($v1) -/* 1104AC 802A6E9C 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 1104B0 802A6EA0 AFBF0034 */ sw $ra, 0x34($sp) -/* 1104B4 802A6EA4 AFB00030 */ sw $s0, 0x30($sp) -/* 1104B8 802A6EA8 0C0A959E */ jal func_802A5678 -/* 1104BC 802A6EAC AFA300A4 */ sw $v1, 0xa4($sp) -/* 1104C0 802A6EB0 0C0A8F8F */ jal func_802A3E3C -/* 1104C4 802A6EB4 00000000 */ nop -/* 1104C8 802A6EB8 3C04800E */ lui $a0, %hi(D_800DC5F4) # $a0, 0x800e -/* 1104CC 802A6EBC 0C0A8DCC */ jal func_802A3730 -/* 1104D0 802A6EC0 8C84C5F4 */ lw $a0, %lo(D_800DC5F4)($a0) -/* 1104D4 802A6EC4 3C108015 */ lui $s0, %hi(gDisplayListHead) # $s0, 0x8015 -/* 1104D8 802A6EC8 26100298 */ addiu $s0, %lo(gDisplayListHead) # addiu $s0, $s0, 0x298 -/* 1104DC 802A6ECC 8E020000 */ lw $v0, ($s0) -/* 1104E0 802A6ED0 3C0FB700 */ lui $t7, 0xb700 -/* 1104E4 802A6ED4 24182205 */ li $t8, 8709 -/* 1104E8 802A6ED8 244E0008 */ addiu $t6, $v0, 8 -/* 1104EC 802A6EDC AE0E0000 */ sw $t6, ($s0) -/* 1104F0 802A6EE0 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 1104F4 802A6EE4 AC580004 */ sw $t8, 4($v0) -/* 1104F8 802A6EE8 AC4F0000 */ sw $t7, ($v0) -/* 1104FC 802A6EEC C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 110500 802A6EF0 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 110504 802A6EF4 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 110508 802A6EF8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 11050C 802A6EFC 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 110510 802A6F00 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 110514 802A6F04 44814000 */ mtc1 $at, $f8 -/* 110518 802A6F08 3C068015 */ lui $a2, %hi(D_80150138) # $a2, 0x8015 -/* 11051C 802A6F0C 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 110520 802A6F10 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 110524 802A6F14 8CC60138 */ lw $a2, %lo(D_80150138)($a2) -/* 110528 802A6F18 27A5009A */ addiu $a1, $sp, 0x9a -/* 11052C 802A6F1C E7A40010 */ swc1 $f4, 0x10($sp) -/* 110530 802A6F20 E7A60014 */ swc1 $f6, 0x14($sp) -/* 110534 802A6F24 248400C0 */ addiu $a0, $a0, 0xc0 -/* 110538 802A6F28 0C033CCC */ jal guPerspective -/* 11053C 802A6F2C E7A80018 */ swc1 $f8, 0x18($sp) -/* 110540 802A6F30 8E020000 */ lw $v0, ($s0) -/* 110544 802A6F34 8FA300A4 */ lw $v1, 0xa4($sp) -/* 110548 802A6F38 3C0BB400 */ lui $t3, 0xb400 -/* 11054C 802A6F3C 24590008 */ addiu $t9, $v0, 8 -/* 110550 802A6F40 AE190000 */ sw $t9, ($s0) -/* 110554 802A6F44 AC4B0000 */ sw $t3, ($v0) -/* 110558 802A6F48 97AC009A */ lhu $t4, 0x9a($sp) -/* 11055C 802A6F4C 3C0E0103 */ lui $t6, (0x01030040 >> 16) # lui $t6, 0x103 -/* 110560 802A6F50 3C0A8015 */ lui $t2, %hi(gGfxPool) # $t2, 0x8015 -/* 110564 802A6F54 AC4C0004 */ sw $t4, 4($v0) -/* 110568 802A6F58 8E020000 */ lw $v0, ($s0) -/* 11056C 802A6F5C 35CE0040 */ ori $t6, (0x01030040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 110570 802A6F60 254AEF40 */ addiu $t2, %lo(gGfxPool) # addiu $t2, $t2, -0x10c0 -/* 110574 802A6F64 244D0008 */ addiu $t5, $v0, 8 -/* 110578 802A6F68 AE0D0000 */ sw $t5, ($s0) -/* 11057C 802A6F6C AC4E0000 */ sw $t6, ($v0) -/* 110580 802A6F70 8D4F0000 */ lw $t7, ($t2) -/* 110584 802A6F74 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 110588 802A6F78 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 11058C 802A6F7C 25F800C0 */ addiu $t8, $t7, 0xc0 -/* 110590 802A6F80 0301C824 */ and $t9, $t8, $at -/* 110594 802A6F84 AC590004 */ sw $t9, 4($v0) -/* 110598 802A6F88 C46A000C */ lwc1 $f10, 0xc($v1) -/* 11059C 802A6F8C 8C670008 */ lw $a3, 8($v1) -/* 1105A0 802A6F90 8C660004 */ lw $a2, 4($v1) -/* 1105A4 802A6F94 8C650000 */ lw $a1, ($v1) -/* 1105A8 802A6F98 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 1105AC 802A6F9C C4700010 */ lwc1 $f16, 0x10($v1) -/* 1105B0 802A6FA0 8D440000 */ lw $a0, ($t2) -/* 1105B4 802A6FA4 E7B00014 */ swc1 $f16, 0x14($sp) -/* 1105B8 802A6FA8 C4720014 */ lwc1 $f18, 0x14($v1) -/* 1105BC 802A6FAC 24840240 */ addiu $a0, $a0, 0x240 -/* 1105C0 802A6FB0 E7B20018 */ swc1 $f18, 0x18($sp) -/* 1105C4 802A6FB4 C4640018 */ lwc1 $f4, 0x18($v1) -/* 1105C8 802A6FB8 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 1105CC 802A6FBC C466001C */ lwc1 $f6, 0x1c($v1) -/* 1105D0 802A6FC0 E7A60020 */ swc1 $f6, 0x20($sp) -/* 1105D4 802A6FC4 C4680020 */ lwc1 $f8, 0x20($v1) -/* 1105D8 802A6FC8 0C033D92 */ jal guLookAt -/* 1105DC 802A6FCC E7A80024 */ swc1 $f8, 0x24($sp) -/* 1105E0 802A6FD0 3C0B800E */ lui $t3, %hi(D_800DC5C8) # $t3, 0x800e -/* 1105E4 802A6FD4 956BC5C8 */ lhu $t3, %lo(D_800DC5C8)($t3) -/* 1105E8 802A6FD8 55600016 */ bnel $t3, $zero, .L802A7034 -/* 1105EC 802A6FDC 8E020000 */ lw $v0, ($s0) -/* 1105F0 802A6FE0 8E020000 */ lw $v0, ($s0) -/* 1105F4 802A6FE4 3C0D0101 */ lui $t5, (0x01010040 >> 16) # lui $t5, 0x101 -/* 1105F8 802A6FE8 35AD0040 */ ori $t5, (0x01010040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 1105FC 802A6FEC 244C0008 */ addiu $t4, $v0, 8 -/* 110600 802A6FF0 AE0C0000 */ sw $t4, ($s0) -/* 110604 802A6FF4 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 110608 802A6FF8 AC4D0000 */ sw $t5, ($v0) -/* 11060C 802A6FFC 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 110610 802A7000 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 110614 802A7004 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 110618 802A7008 25CF0240 */ addiu $t7, $t6, 0x240 -/* 11061C 802A700C 01E1C024 */ and $t8, $t7, $at -/* 110620 802A7010 27A40058 */ addiu $a0, $sp, 0x58 -/* 110624 802A7014 0C0AD4F2 */ jal func_802B53C8 -/* 110628 802A7018 AC580004 */ sw $t8, 4($v0) -/* 11062C 802A701C 27A40058 */ addiu $a0, $sp, 0x58 -/* 110630 802A7020 0C0AD3FE */ jal func_802B4FF8 -/* 110634 802A7024 00002825 */ move $a1, $zero -/* 110638 802A7028 1000000E */ b .L802A7064 -/* 11063C 802A702C 00000000 */ nop -/* 110640 802A7030 8E020000 */ lw $v0, ($s0) -.L802A7034: -/* 110644 802A7034 3C0B0102 */ lui $t3, (0x01020040 >> 16) # lui $t3, 0x102 -/* 110648 802A7038 356B0040 */ ori $t3, (0x01020040 & 0xFFFF) # ori $t3, $t3, 0x40 -/* 11064C 802A703C 24590008 */ addiu $t9, $v0, 8 -/* 110650 802A7040 AE190000 */ sw $t9, ($s0) -/* 110654 802A7044 3C0C8015 */ lui $t4, %hi(gGfxPool) # $t4, 0x8015 -/* 110658 802A7048 AC4B0000 */ sw $t3, ($v0) -/* 11065C 802A704C 8D8CEF40 */ lw $t4, %lo(gGfxPool)($t4) -/* 110660 802A7050 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 110664 802A7054 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 110668 802A7058 258D0240 */ addiu $t5, $t4, 0x240 -/* 11066C 802A705C 01A17024 */ and $t6, $t5, $at -/* 110670 802A7060 AC4E0004 */ sw $t6, 4($v0) -.L802A7064: -/* 110674 802A7064 3C04800E */ lui $a0, %hi(D_800DC5F4) # $a0, 0x800e -/* 110678 802A7068 0C0A568E */ jal func_80295A38 -/* 11067C 802A706C 8C84C5F4 */ lw $a0, %lo(D_800DC5F4)($a0) -/* 110680 802A7070 3C0F800E */ lui $t7, %hi(D_800DC5C8) # $t7, 0x800e -/* 110684 802A7074 95EFC5C8 */ lhu $t7, %lo(D_800DC5C8)($t7) -/* 110688 802A7078 24010001 */ li $at, 1 -/* 11068C 802A707C 15E10013 */ bne $t7, $at, .L802A70CC -/* 110690 802A7080 00000000 */ nop -/* 110694 802A7084 8E020000 */ lw $v0, ($s0) -/* 110698 802A7088 3C190101 */ lui $t9, (0x01010040 >> 16) # lui $t9, 0x101 -/* 11069C 802A708C 37390040 */ ori $t9, (0x01010040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 1106A0 802A7090 24580008 */ addiu $t8, $v0, 8 -/* 1106A4 802A7094 AE180000 */ sw $t8, ($s0) -/* 1106A8 802A7098 3C0B8015 */ lui $t3, %hi(gGfxPool) # $t3, 0x8015 -/* 1106AC 802A709C AC590000 */ sw $t9, ($v0) -/* 1106B0 802A70A0 8D6BEF40 */ lw $t3, %lo(gGfxPool)($t3) -/* 1106B4 802A70A4 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1106B8 802A70A8 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1106BC 802A70AC 256C0240 */ addiu $t4, $t3, 0x240 -/* 1106C0 802A70B0 01816824 */ and $t5, $t4, $at -/* 1106C4 802A70B4 27A40058 */ addiu $a0, $sp, 0x58 -/* 1106C8 802A70B8 0C0AD4F2 */ jal func_802B53C8 -/* 1106CC 802A70BC AC4D0004 */ sw $t5, 4($v0) -/* 1106D0 802A70C0 27A40058 */ addiu $a0, $sp, 0x58 -/* 1106D4 802A70C4 0C0AD3FE */ jal func_802B4FF8 -/* 1106D8 802A70C8 00002825 */ move $a1, $zero -.L802A70CC: -/* 1106DC 802A70CC 3C04800E */ lui $a0, %hi(D_800DC5F4) # $a0, 0x800e -/* 1106E0 802A70D0 0C0A8C02 */ jal func_802A3008 -/* 1106E4 802A70D4 8C84C5F4 */ lw $a0, %lo(D_800DC5F4)($a0) -/* 1106E8 802A70D8 0C016024 */ jal func_80058090 -/* 1106EC 802A70DC 2404000A */ li $a0, 10 -/* 1106F0 802A70E0 0C00861B */ jal func_8002186C -/* 1106F4 802A70E4 00000000 */ nop -/* 1106F8 802A70E8 3C04800E */ lui $a0, %hi(D_800DC5F4) # $a0, 0x800e -/* 1106FC 802A70EC 8C84C5F4 */ lw $a0, %lo(D_800DC5F4)($a0) -/* 110700 802A70F0 0C0A448B */ jal func_8029122C -/* 110704 802A70F4 24050002 */ li $a1, 2 -/* 110708 802A70F8 0C008750 */ jal func_80021D40 -/* 11070C 802A70FC 00000000 */ nop -/* 110710 802A7100 3C04800E */ lui $a0, %hi(D_800DC5F4) # $a0, 0x800e -/* 110714 802A7104 0C0A8BCD */ jal func_802A2F34 -/* 110718 802A7108 8C84C5F4 */ lw $a0, %lo(D_800DC5F4)($a0) -/* 11071C 802A710C 0C01614E */ jal func_80058538 -/* 110720 802A7110 2404000A */ li $a0, 10 -/* 110724 802A7114 0C0162FD */ jal func_80058BF4 -/* 110728 802A7118 00000000 */ nop -/* 11072C 802A711C 3C10800E */ lui $s0, %hi(D_800DC5B8) # $s0, 0x800e -/* 110730 802A7120 2610C5B8 */ addiu $s0, %lo(D_800DC5B8) # addiu $s0, $s0, -0x3a48 -/* 110734 802A7124 960E0000 */ lhu $t6, ($s0) -/* 110738 802A7128 11C00003 */ beqz $t6, .L802A7138 -/* 11073C 802A712C 00000000 */ nop -/* 110740 802A7130 0C016308 */ jal func_80058C20 -/* 110744 802A7134 2404000A */ li $a0, 10 -.L802A7138: -/* 110748 802A7138 0C024E97 */ jal func_80093A5C -/* 11074C 802A713C 2404000A */ li $a0, 10 -/* 110750 802A7140 960F0000 */ lhu $t7, ($s0) -/* 110754 802A7144 11E00003 */ beqz $t7, .L802A7154 -/* 110758 802A7148 00000000 */ nop -/* 11075C 802A714C 0C01636D */ jal func_80058DB4 -/* 110760 802A7150 2404000A */ li $a0, 10 -.L802A7154: -/* 110764 802A7154 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 110768 802A7158 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 11076C 802A715C 8C580000 */ lw $t8, ($v0) -/* 110770 802A7160 8FBF0034 */ lw $ra, 0x34($sp) -/* 110774 802A7164 8FB00030 */ lw $s0, 0x30($sp) -/* 110778 802A7168 27190001 */ addiu $t9, $t8, 1 -/* 11077C 802A716C AC590000 */ sw $t9, ($v0) -/* 110780 802A7170 03E00008 */ jr $ra -/* 110784 802A7174 27BD00A8 */ addiu $sp, $sp, 0xa8 diff --git a/asm/non_matchings/code_802A3730/func_802A7178.s b/asm/non_matchings/code_802A3730/func_802A7178.s deleted file mode 100644 index 525a2f52c..000000000 --- a/asm/non_matchings/code_802A3730/func_802A7178.s +++ /dev/null @@ -1,218 +0,0 @@ -glabel func_802A7178 -/* 110788 802A7178 3C03800E */ lui $v1, %hi(D_800DDB4C) # $v1, 0x800e -/* 11078C 802A717C 8C63DB4C */ lw $v1, %lo(D_800DDB4C)($v1) -/* 110790 802A7180 27BDFF60 */ addiu $sp, $sp, -0xa0 -/* 110794 802A7184 AFBF002C */ sw $ra, 0x2c($sp) -/* 110798 802A7188 0C0A95D8 */ jal func_802A5760 -/* 11079C 802A718C AFA3009C */ sw $v1, 0x9c($sp) -/* 1107A0 802A7190 3C0E800E */ lui $t6, %hi(gPlayerCountSelection1) # $t6, 0x800e -/* 1107A4 802A7194 8DCEC538 */ lw $t6, %lo(gPlayerCountSelection1)($t6) -/* 1107A8 802A7198 24010003 */ li $at, 3 -/* 1107AC 802A719C 8FA3009C */ lw $v1, 0x9c($sp) -/* 1107B0 802A71A0 15C1000F */ bne $t6, $at, .L802A71E0 -/* 1107B4 802A71A4 00000000 */ nop -/* 1107B8 802A71A8 0C024E97 */ jal func_80093A5C -/* 1107BC 802A71AC 2404000B */ li $a0, 11 -/* 1107C0 802A71B0 3C0F800E */ lui $t7, %hi(D_800DC5B8) # $t7, 0x800e -/* 1107C4 802A71B4 95EFC5B8 */ lhu $t7, %lo(D_800DC5B8)($t7) -/* 1107C8 802A71B8 11E00003 */ beqz $t7, .L802A71C8 -/* 1107CC 802A71BC 00000000 */ nop -/* 1107D0 802A71C0 0C01636D */ jal func_80058DB4 -/* 1107D4 802A71C4 2404000B */ li $a0, 11 -.L802A71C8: -/* 1107D8 802A71C8 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 1107DC 802A71CC 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 1107E0 802A71D0 8C580000 */ lw $t8, ($v0) -/* 1107E4 802A71D4 27190001 */ addiu $t9, $t8, 1 -/* 1107E8 802A71D8 100000B4 */ b .L802A74AC -/* 1107EC 802A71DC AC590000 */ sw $t9, ($v0) -.L802A71E0: -/* 1107F0 802A71E0 0C0A8F8F */ jal func_802A3E3C -/* 1107F4 802A71E4 AFA3009C */ sw $v1, 0x9c($sp) -/* 1107F8 802A71E8 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 1107FC 802A71EC 0C0A8DCC */ jal func_802A3730 -/* 110800 802A71F0 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 110804 802A71F4 3C0A8015 */ lui $t2, %hi(gDisplayListHead) # $t2, 0x8015 -/* 110808 802A71F8 254A0298 */ addiu $t2, %lo(gDisplayListHead) # addiu $t2, $t2, 0x298 -/* 11080C 802A71FC 8D420000 */ lw $v0, ($t2) -/* 110810 802A7200 3C0DB700 */ lui $t5, 0xb700 -/* 110814 802A7204 240E2205 */ li $t6, 8709 -/* 110818 802A7208 244C0008 */ addiu $t4, $v0, 8 -/* 11081C 802A720C AD4C0000 */ sw $t4, ($t2) -/* 110820 802A7210 3C018015 */ lui $at, %hi(D_80150150) # $at, 0x8015 -/* 110824 802A7214 AC4E0004 */ sw $t6, 4($v0) -/* 110828 802A7218 AC4D0000 */ sw $t5, ($v0) -/* 11082C 802A721C C4240150 */ lwc1 $f4, %lo(D_80150150)($at) -/* 110830 802A7220 3C018015 */ lui $at, %hi(D_8015014C) # $at, 0x8015 -/* 110834 802A7224 C426014C */ lwc1 $f6, %lo(D_8015014C)($at) -/* 110838 802A7228 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 11083C 802A722C 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015 -/* 110840 802A7230 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0) -/* 110844 802A7234 44814000 */ mtc1 $at, $f8 -/* 110848 802A7238 3C068015 */ lui $a2, %hi(D_8015013C) # $a2, 0x8015 -/* 11084C 802A723C 3C078015 */ lui $a3, %hi(D_80150148) # $a3, 0x8015 -/* 110850 802A7240 8CE70148 */ lw $a3, %lo(D_80150148)($a3) -/* 110854 802A7244 8CC6013C */ lw $a2, %lo(D_8015013C)($a2) -/* 110858 802A7248 27A50092 */ addiu $a1, $sp, 0x92 -/* 11085C 802A724C E7A40010 */ swc1 $f4, 0x10($sp) -/* 110860 802A7250 E7A60014 */ swc1 $f6, 0x14($sp) -/* 110864 802A7254 24840100 */ addiu $a0, $a0, 0x100 -/* 110868 802A7258 0C033CCC */ jal guPerspective -/* 11086C 802A725C E7A80018 */ swc1 $f8, 0x18($sp) -/* 110870 802A7260 3C0A8015 */ lui $t2, %hi(gDisplayListHead) # $t2, 0x8015 -/* 110874 802A7264 254A0298 */ addiu $t2, %lo(gDisplayListHead) # addiu $t2, $t2, 0x298 -/* 110878 802A7268 8D420000 */ lw $v0, ($t2) -/* 11087C 802A726C 8FA3009C */ lw $v1, 0x9c($sp) -/* 110880 802A7270 3C18B400 */ lui $t8, 0xb400 -/* 110884 802A7274 244F0008 */ addiu $t7, $v0, 8 -/* 110888 802A7278 AD4F0000 */ sw $t7, ($t2) -/* 11088C 802A727C AC580000 */ sw $t8, ($v0) -/* 110890 802A7280 97B90092 */ lhu $t9, 0x92($sp) -/* 110894 802A7284 3C0D0103 */ lui $t5, (0x01030040 >> 16) # lui $t5, 0x103 -/* 110898 802A7288 3C0B8015 */ lui $t3, %hi(gGfxPool) # $t3, 0x8015 -/* 11089C 802A728C AC590004 */ sw $t9, 4($v0) -/* 1108A0 802A7290 8D420000 */ lw $v0, ($t2) -/* 1108A4 802A7294 35AD0040 */ ori $t5, (0x01030040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 1108A8 802A7298 256BEF40 */ addiu $t3, %lo(gGfxPool) # addiu $t3, $t3, -0x10c0 -/* 1108AC 802A729C 244C0008 */ addiu $t4, $v0, 8 -/* 1108B0 802A72A0 AD4C0000 */ sw $t4, ($t2) -/* 1108B4 802A72A4 AC4D0000 */ sw $t5, ($v0) -/* 1108B8 802A72A8 8D6E0000 */ lw $t6, ($t3) -/* 1108BC 802A72AC 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1108C0 802A72B0 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1108C4 802A72B4 25CF0100 */ addiu $t7, $t6, 0x100 -/* 1108C8 802A72B8 01E1C024 */ and $t8, $t7, $at -/* 1108CC 802A72BC AC580004 */ sw $t8, 4($v0) -/* 1108D0 802A72C0 C46A000C */ lwc1 $f10, 0xc($v1) -/* 1108D4 802A72C4 8C670008 */ lw $a3, 8($v1) -/* 1108D8 802A72C8 8C660004 */ lw $a2, 4($v1) -/* 1108DC 802A72CC 8C650000 */ lw $a1, ($v1) -/* 1108E0 802A72D0 E7AA0010 */ swc1 $f10, 0x10($sp) -/* 1108E4 802A72D4 C4700010 */ lwc1 $f16, 0x10($v1) -/* 1108E8 802A72D8 8D640000 */ lw $a0, ($t3) -/* 1108EC 802A72DC E7B00014 */ swc1 $f16, 0x14($sp) -/* 1108F0 802A72E0 C4720014 */ lwc1 $f18, 0x14($v1) -/* 1108F4 802A72E4 24840280 */ addiu $a0, $a0, 0x280 -/* 1108F8 802A72E8 E7B20018 */ swc1 $f18, 0x18($sp) -/* 1108FC 802A72EC C4640018 */ lwc1 $f4, 0x18($v1) -/* 110900 802A72F0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 110904 802A72F4 C466001C */ lwc1 $f6, 0x1c($v1) -/* 110908 802A72F8 E7A60020 */ swc1 $f6, 0x20($sp) -/* 11090C 802A72FC C4680020 */ lwc1 $f8, 0x20($v1) -/* 110910 802A7300 0C033D92 */ jal guLookAt -/* 110914 802A7304 E7A80024 */ swc1 $f8, 0x24($sp) -/* 110918 802A7308 3C19800E */ lui $t9, %hi(D_800DC5C8) # $t9, 0x800e -/* 11091C 802A730C 9739C5C8 */ lhu $t9, %lo(D_800DC5C8)($t9) -/* 110920 802A7310 3C0A8015 */ lui $t2, %hi(gDisplayListHead) # $t2, 0x8015 -/* 110924 802A7314 254A0298 */ addiu $t2, %lo(gDisplayListHead) # addiu $t2, $t2, 0x298 -/* 110928 802A7318 57200016 */ bnel $t9, $zero, .L802A7374 -/* 11092C 802A731C 8D420000 */ lw $v0, ($t2) -/* 110930 802A7320 8D420000 */ lw $v0, ($t2) -/* 110934 802A7324 3C0D0101 */ lui $t5, (0x01010040 >> 16) # lui $t5, 0x101 -/* 110938 802A7328 35AD0040 */ ori $t5, (0x01010040 & 0xFFFF) # ori $t5, $t5, 0x40 -/* 11093C 802A732C 244C0008 */ addiu $t4, $v0, 8 -/* 110940 802A7330 AD4C0000 */ sw $t4, ($t2) -/* 110944 802A7334 3C0E8015 */ lui $t6, %hi(gGfxPool) # $t6, 0x8015 -/* 110948 802A7338 AC4D0000 */ sw $t5, ($v0) -/* 11094C 802A733C 8DCEEF40 */ lw $t6, %lo(gGfxPool)($t6) -/* 110950 802A7340 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 110954 802A7344 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 110958 802A7348 25CF0280 */ addiu $t7, $t6, 0x280 -/* 11095C 802A734C 01E1C024 */ and $t8, $t7, $at -/* 110960 802A7350 27A40050 */ addiu $a0, $sp, 0x50 -/* 110964 802A7354 0C0AD4F2 */ jal func_802B53C8 -/* 110968 802A7358 AC580004 */ sw $t8, 4($v0) -/* 11096C 802A735C 27A40050 */ addiu $a0, $sp, 0x50 -/* 110970 802A7360 0C0AD3FE */ jal func_802B4FF8 -/* 110974 802A7364 00002825 */ move $a1, $zero -/* 110978 802A7368 1000000E */ b .L802A73A4 -/* 11097C 802A736C 00000000 */ nop -/* 110980 802A7370 8D420000 */ lw $v0, ($t2) -.L802A7374: -/* 110984 802A7374 3C0C0102 */ lui $t4, (0x01020040 >> 16) # lui $t4, 0x102 -/* 110988 802A7378 358C0040 */ ori $t4, (0x01020040 & 0xFFFF) # ori $t4, $t4, 0x40 -/* 11098C 802A737C 24590008 */ addiu $t9, $v0, 8 -/* 110990 802A7380 AD590000 */ sw $t9, ($t2) -/* 110994 802A7384 3C0D8015 */ lui $t5, %hi(gGfxPool) # $t5, 0x8015 -/* 110998 802A7388 AC4C0000 */ sw $t4, ($v0) -/* 11099C 802A738C 8DADEF40 */ lw $t5, %lo(gGfxPool)($t5) -/* 1109A0 802A7390 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1109A4 802A7394 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1109A8 802A7398 25AE0280 */ addiu $t6, $t5, 0x280 -/* 1109AC 802A739C 01C17824 */ and $t7, $t6, $at -/* 1109B0 802A73A0 AC4F0004 */ sw $t7, 4($v0) -.L802A73A4: -/* 1109B4 802A73A4 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 1109B8 802A73A8 0C0A568E */ jal func_80295A38 -/* 1109BC 802A73AC 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 1109C0 802A73B0 3C18800E */ lui $t8, %hi(D_800DC5C8) # $t8, 0x800e -/* 1109C4 802A73B4 9718C5C8 */ lhu $t8, %lo(D_800DC5C8)($t8) -/* 1109C8 802A73B8 3C0A8015 */ lui $t2, %hi(gDisplayListHead) # $t2, 0x8015 -/* 1109CC 802A73BC 24010001 */ li $at, 1 -/* 1109D0 802A73C0 17010013 */ bne $t8, $at, .L802A7410 -/* 1109D4 802A73C4 254A0298 */ addiu $t2, %lo(gDisplayListHead) # addiu $t2, $t2, 0x298 -/* 1109D8 802A73C8 8D420000 */ lw $v0, ($t2) -/* 1109DC 802A73CC 3C0C0101 */ lui $t4, (0x01010040 >> 16) # lui $t4, 0x101 -/* 1109E0 802A73D0 358C0040 */ ori $t4, (0x01010040 & 0xFFFF) # ori $t4, $t4, 0x40 -/* 1109E4 802A73D4 24590008 */ addiu $t9, $v0, 8 -/* 1109E8 802A73D8 AD590000 */ sw $t9, ($t2) -/* 1109EC 802A73DC 3C0D8015 */ lui $t5, %hi(gGfxPool) # $t5, 0x8015 -/* 1109F0 802A73E0 AC4C0000 */ sw $t4, ($v0) -/* 1109F4 802A73E4 8DADEF40 */ lw $t5, %lo(gGfxPool)($t5) -/* 1109F8 802A73E8 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 1109FC 802A73EC 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 110A00 802A73F0 25AE0280 */ addiu $t6, $t5, 0x280 -/* 110A04 802A73F4 01C17824 */ and $t7, $t6, $at -/* 110A08 802A73F8 27A40050 */ addiu $a0, $sp, 0x50 -/* 110A0C 802A73FC 0C0AD4F2 */ jal func_802B53C8 -/* 110A10 802A7400 AC4F0004 */ sw $t7, 4($v0) -/* 110A14 802A7404 27A40050 */ addiu $a0, $sp, 0x50 -/* 110A18 802A7408 0C0AD3FE */ jal func_802B4FF8 -/* 110A1C 802A740C 00002825 */ move $a1, $zero -.L802A7410: -/* 110A20 802A7410 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 110A24 802A7414 0C0A8C02 */ jal func_802A3008 -/* 110A28 802A7418 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 110A2C 802A741C 0C016024 */ jal func_80058090 -/* 110A30 802A7420 2404000B */ li $a0, 11 -/* 110A34 802A7424 0C00866F */ jal func_800219BC -/* 110A38 802A7428 00000000 */ nop -/* 110A3C 802A742C 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 110A40 802A7430 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 110A44 802A7434 0C0A448B */ jal func_8029122C -/* 110A48 802A7438 24050003 */ li $a1, 3 -/* 110A4C 802A743C 0C00876A */ jal func_80021DA8 -/* 110A50 802A7440 00000000 */ nop -/* 110A54 802A7444 3C04800E */ lui $a0, %hi(D_800DC5F8) # $a0, 0x800e -/* 110A58 802A7448 0C0A8BCD */ jal func_802A2F34 -/* 110A5C 802A744C 8C84C5F8 */ lw $a0, %lo(D_800DC5F8)($a0) -/* 110A60 802A7450 0C01614E */ jal func_80058538 -/* 110A64 802A7454 2404000B */ li $a0, 11 -/* 110A68 802A7458 0C0162FD */ jal func_80058BF4 -/* 110A6C 802A745C 00000000 */ nop -/* 110A70 802A7460 3C18800E */ lui $t8, %hi(D_800DC5B8) # $t8, 0x800e -/* 110A74 802A7464 9718C5B8 */ lhu $t8, %lo(D_800DC5B8)($t8) -/* 110A78 802A7468 13000003 */ beqz $t8, .L802A7478 -/* 110A7C 802A746C 00000000 */ nop -/* 110A80 802A7470 0C016308 */ jal func_80058C20 -/* 110A84 802A7474 2404000B */ li $a0, 11 -.L802A7478: -/* 110A88 802A7478 0C024E97 */ jal func_80093A5C -/* 110A8C 802A747C 2404000B */ li $a0, 11 -/* 110A90 802A7480 3C19800E */ lui $t9, %hi(D_800DC5B8) # $t9, 0x800e -/* 110A94 802A7484 9739C5B8 */ lhu $t9, %lo(D_800DC5B8)($t9) -/* 110A98 802A7488 13200003 */ beqz $t9, .L802A7498 -/* 110A9C 802A748C 00000000 */ nop -/* 110AA0 802A7490 0C01636D */ jal func_80058DB4 -/* 110AA4 802A7494 2404000B */ li $a0, 11 -.L802A7498: -/* 110AA8 802A7498 3C028016 */ lui $v0, %hi(D_8015F788) # $v0, 0x8016 -/* 110AAC 802A749C 2442F788 */ addiu $v0, %lo(D_8015F788) # addiu $v0, $v0, -0x878 -/* 110AB0 802A74A0 8C4C0000 */ lw $t4, ($v0) -/* 110AB4 802A74A4 258D0001 */ addiu $t5, $t4, 1 -/* 110AB8 802A74A8 AC4D0000 */ sw $t5, ($v0) -.L802A74AC: -/* 110ABC 802A74AC 8FBF002C */ lw $ra, 0x2c($sp) -/* 110AC0 802A74B0 27BD00A0 */ addiu $sp, $sp, 0xa0 -/* 110AC4 802A74B4 03E00008 */ jr $ra -/* 110AC8 802A74B8 00000000 */ nop diff --git a/asm/non_matchings/code_802A3730/func_802A74BC.s b/asm/non_matchings/code_802A3730/func_802A74BC.s deleted file mode 100644 index 8ec6cc8df..000000000 --- a/asm/non_matchings/code_802A3730/func_802A74BC.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_802A74BC -/* 110ACC 802A74BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 110AD0 802A74C0 AFB5001C */ sw $s5, 0x1c($sp) -/* 110AD4 802A74C4 AFB40018 */ sw $s4, 0x18($sp) -/* 110AD8 802A74C8 AFB30014 */ sw $s3, 0x14($sp) -/* 110ADC 802A74CC AFB20010 */ sw $s2, 0x10($sp) -/* 110AE0 802A74D0 AFB1000C */ sw $s1, 0xc($sp) -/* 110AE4 802A74D4 AFB00008 */ sw $s0, 8($sp) -/* 110AE8 802A74D8 3C028016 */ lui $v0, %hi(D_8015F480) # $v0, 0x8016 -/* 110AEC 802A74DC 3C03800F */ lui $v1, %hi(gPlayers) # $v1, 0x800f -/* 110AF0 802A74E0 3C048016 */ lui $a0, %hi(D_801646F0) # $a0, 0x8016 -/* 110AF4 802A74E4 3C058016 */ lui $a1, %hi(D_8015F790) # $a1, 0x8016 -/* 110AF8 802A74E8 3C0B800E */ lui $t3, %hi(D_800DC52C) # $t3, 0x800e -/* 110AFC 802A74EC 3C08800F */ lui $t0, %hi(gControllers) # $t0, 0x800f -/* 110B00 802A74F0 2442F480 */ addiu $v0, %lo(D_8015F480) # addiu $v0, $v0, -0xb80 -/* 110B04 802A74F4 24636990 */ addiu $v1, %lo(gPlayers) # addiu $v1, $v1, 0x6990 -/* 110B08 802A74F8 248446F0 */ addiu $a0, %lo(D_801646F0) # addiu $a0, $a0, 0x46f0 -/* 110B0C 802A74FC 24A5F790 */ addiu $a1, %lo(D_8015F790) # addiu $a1, $a1, -0x870 -/* 110B10 802A7500 25086910 */ addiu $t0, %lo(gControllers) # addiu $t0, $t0, 0x6910 -/* 110B14 802A7504 256BC52C */ addiu $t3, %lo(D_800DC52C) # addiu $t3, $t3, -0x3ad4 -/* 110B18 802A7508 24100050 */ li $s0, 80 -/* 110B1C 802A750C 2411003C */ li $s1, 60 -/* 110B20 802A7510 241200F0 */ li $s2, 240 -/* 110B24 802A7514 241300B4 */ li $s3, 180 -/* 110B28 802A7518 24140078 */ li $s4, 120 -/* 110B2C 802A751C 241500A0 */ li $s5, 160 -/* 110B30 802A7520 00003025 */ move $a2, $zero -/* 110B34 802A7524 240D0003 */ li $t5, 3 -/* 110B38 802A7528 240C0002 */ li $t4, 2 -/* 110B3C 802A752C 240A0001 */ li $t2, 1 -/* 110B40 802A7530 24090004 */ li $t1, 4 -.L802A7534: -/* 110B44 802A7534 AC480000 */ sw $t0, ($v0) -/* 110B48 802A7538 AC440004 */ sw $a0, 4($v0) -/* 110B4C 802A753C AC430008 */ sw $v1, 8($v0) -/* 110B50 802A7540 AC45000C */ sw $a1, 0xc($v0) -/* 110B54 802A7544 A449002C */ sh $t1, 0x2c($v0) -/* 110B58 802A7548 A449002E */ sh $t1, 0x2e($v0) -/* 110B5C 802A754C A44A0038 */ sh $t2, 0x38($v0) -/* 110B60 802A7550 8D670000 */ lw $a3, ($t3) -/* 110B64 802A7554 24630DD8 */ addiu $v1, $v1, 0xdd8 -/* 110B68 802A7558 248400B8 */ addiu $a0, $a0, 0xb8 -/* 110B6C 802A755C 10E00009 */ beqz $a3, .L802A7584 -/* 110B70 802A7560 24A50040 */ addiu $a1, $a1, 0x40 -/* 110B74 802A7564 10EA0016 */ beq $a3, $t2, .L802A75C0 -/* 110B78 802A7568 00000000 */ nop -/* 110B7C 802A756C 10EC000A */ beq $a3, $t4, .L802A7598 -/* 110B80 802A7570 00000000 */ nop -/* 110B84 802A7574 10ED001C */ beq $a3, $t5, .L802A75E8 -/* 110B88 802A7578 00000000 */ nop -/* 110B8C 802A757C 1000002C */ b .L802A7630 -/* 110B90 802A7580 24C60001 */ addiu $a2, $a2, 1 -.L802A7584: -/* 110B94 802A7584 14C00002 */ bnez $a2, .L802A7590 -/* 110B98 802A7588 00000000 */ nop -/* 110B9C 802A758C A4550030 */ sh $s5, 0x30($v0) -.L802A7590: -/* 110BA0 802A7590 10000026 */ b .L802A762C -/* 110BA4 802A7594 A4540032 */ sh $s4, 0x32($v0) -.L802A7598: -/* 110BA8 802A7598 14C00004 */ bnez $a2, .L802A75AC -/* 110BAC 802A759C 00000000 */ nop -/* 110BB0 802A75A0 A4500030 */ sh $s0, 0x30($v0) -/* 110BB4 802A75A4 10000021 */ b .L802A762C -/* 110BB8 802A75A8 A4540032 */ sh $s4, 0x32($v0) -.L802A75AC: -/* 110BBC 802A75AC 54CA0020 */ bnel $a2, $t2, .L802A7630 -/* 110BC0 802A75B0 24C60001 */ addiu $a2, $a2, 1 -/* 110BC4 802A75B4 A4520030 */ sh $s2, 0x30($v0) -/* 110BC8 802A75B8 1000001C */ b .L802A762C -/* 110BCC 802A75BC A4540032 */ sh $s4, 0x32($v0) -.L802A75C0: -/* 110BD0 802A75C0 14C00004 */ bnez $a2, .L802A75D4 -/* 110BD4 802A75C4 00000000 */ nop -/* 110BD8 802A75C8 A4550030 */ sh $s5, 0x30($v0) -/* 110BDC 802A75CC 10000017 */ b .L802A762C -/* 110BE0 802A75D0 A4510032 */ sh $s1, 0x32($v0) -.L802A75D4: -/* 110BE4 802A75D4 54CA0016 */ bnel $a2, $t2, .L802A7630 -/* 110BE8 802A75D8 24C60001 */ addiu $a2, $a2, 1 -/* 110BEC 802A75DC A4550030 */ sh $s5, 0x30($v0) -/* 110BF0 802A75E0 10000012 */ b .L802A762C -/* 110BF4 802A75E4 A4530032 */ sh $s3, 0x32($v0) -.L802A75E8: -/* 110BF8 802A75E8 14C00004 */ bnez $a2, .L802A75FC -/* 110BFC 802A75EC 00000000 */ nop -/* 110C00 802A75F0 A4500030 */ sh $s0, 0x30($v0) -/* 110C04 802A75F4 1000000D */ b .L802A762C -/* 110C08 802A75F8 A4510032 */ sh $s1, 0x32($v0) -.L802A75FC: -/* 110C0C 802A75FC 14CA0004 */ bne $a2, $t2, .L802A7610 -/* 110C10 802A7600 00000000 */ nop -/* 110C14 802A7604 A4520030 */ sh $s2, 0x30($v0) -/* 110C18 802A7608 10000008 */ b .L802A762C -/* 110C1C 802A760C A4510032 */ sh $s1, 0x32($v0) -.L802A7610: -/* 110C20 802A7610 54CC0005 */ bnel $a2, $t4, .L802A7628 -/* 110C24 802A7614 A4520030 */ sh $s2, 0x30($v0) -/* 110C28 802A7618 A4500030 */ sh $s0, 0x30($v0) -/* 110C2C 802A761C 10000003 */ b .L802A762C -/* 110C30 802A7620 A4530032 */ sh $s3, 0x32($v0) -/* 110C34 802A7624 A4520030 */ sh $s2, 0x30($v0) -.L802A7628: -/* 110C38 802A7628 A4530032 */ sh $s3, 0x32($v0) -.L802A762C: -/* 110C3C 802A762C 24C60001 */ addiu $a2, $a2, 1 -.L802A7630: -/* 110C40 802A7630 14C9FFC0 */ bne $a2, $t1, .L802A7534 -/* 110C44 802A7634 24420040 */ addiu $v0, $v0, 0x40 -/* 110C48 802A7638 8FB00008 */ lw $s0, 8($sp) -/* 110C4C 802A763C 8FB1000C */ lw $s1, 0xc($sp) -/* 110C50 802A7640 8FB20010 */ lw $s2, 0x10($sp) -/* 110C54 802A7644 8FB30014 */ lw $s3, 0x14($sp) -/* 110C58 802A7648 8FB40018 */ lw $s4, 0x18($sp) -/* 110C5C 802A764C 8FB5001C */ lw $s5, 0x1c($sp) -/* 110C60 802A7650 03E00008 */ jr $ra -/* 110C64 802A7654 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_actors/func_80297230.s b/asm/non_matchings/code_actors/func_80297230.s index e4a07c5d6..10a667f1b 100644 --- a/asm/non_matchings/code_actors/func_80297230.s +++ b/asm/non_matchings/code_actors/func_80297230.s @@ -1,6 +1,6 @@ glabel func_80297230 -/* 100840 80297230 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 100844 80297234 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 100840 80297230 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 100844 80297234 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 100848 80297238 240100B8 */ li $at, 184 /* 10084C 8029723C 008E1023 */ subu $v0, $a0, $t6 /* 100850 80297240 0041001A */ div $zero, $v0, $at diff --git a/asm/non_matchings/code_actors/func_802972B8.s b/asm/non_matchings/code_actors/func_802972B8.s index 73c8bf4db..572bf8687 100644 --- a/asm/non_matchings/code_actors/func_802972B8.s +++ b/asm/non_matchings/code_actors/func_802972B8.s @@ -1,6 +1,6 @@ glabel func_802972B8 -/* 1008C8 802972B8 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 1008CC 802972BC 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 1008C8 802972B8 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 1008CC 802972BC 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 1008D0 802972C0 240100B8 */ li $at, 184 /* 1008D4 802972C4 008E1023 */ subu $v0, $a0, $t6 /* 1008D8 802972C8 0041001A */ div $zero, $v0, $at diff --git a/asm/non_matchings/code_actors/func_80297A50.s b/asm/non_matchings/code_actors/func_80297A50.s index ebaa3ba39..256794784 100644 --- a/asm/non_matchings/code_actors/func_80297A50.s +++ b/asm/non_matchings/code_actors/func_80297A50.s @@ -1,6 +1,6 @@ glabel func_80297A50 -/* 101060 80297A50 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 101064 80297A54 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 101060 80297A50 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 101064 80297A54 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 101068 80297A58 240100B8 */ li $at, 184 /* 10106C 80297A5C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 101070 80297A60 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_80298328.s b/asm/non_matchings/code_actors/func_80298328.s index 657f66069..ae8511ff3 100644 --- a/asm/non_matchings/code_actors/func_80298328.s +++ b/asm/non_matchings/code_actors/func_80298328.s @@ -1,6 +1,6 @@ glabel func_80298328 -/* 101938 80298328 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 10193C 8029832C 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 101938 80298328 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 10193C 8029832C 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 101940 80298330 240100B8 */ li $at, 184 /* 101944 80298334 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 101948 80298338 008E4023 */ subu $t0, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_802986B4.s b/asm/non_matchings/code_actors/func_802986B4.s index 824aa9297..c02d2d4e6 100644 --- a/asm/non_matchings/code_actors/func_802986B4.s +++ b/asm/non_matchings/code_actors/func_802986B4.s @@ -74,8 +74,8 @@ glabel func_802986B4 /* 101DE4 802987D4 27B70088 */ addiu $s7, $sp, 0x88 /* 101DE8 802987D8 3C120600 */ lui $s2, 0x600 .L802987DC: -/* 101DEC 802987DC 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 101DF0 802987E0 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 101DEC 802987DC 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 101DF0 802987E0 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 101DF4 802987E4 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016 /* 101DF8 802987E8 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at) /* 101DFC 802987EC 240100B8 */ li $at, 184 @@ -196,8 +196,8 @@ glabel L80298970 /* 101FA8 80298998 00000000 */ nop /* 101FAC 8029899C 8FA9009C */ lw $t1, 0x9c($sp) .L802989A0: -/* 101FB0 802989A0 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 101FB4 802989A4 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 101FB0 802989A0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 101FB4 802989A4 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 101FB8 802989A8 568F0038 */ bnel $s4, $t7, .L80298A8C /* 101FBC 802989AC 8FBF0054 */ lw $ra, 0x54($sp) /* 101FC0 802989B0 12A00035 */ beqz $s5, .L80298A88 diff --git a/asm/non_matchings/code_actors/func_80298D7C.s b/asm/non_matchings/code_actors/func_80298D7C.s index f1f2177b4..ba9f1ff60 100644 --- a/asm/non_matchings/code_actors/func_80298D7C.s +++ b/asm/non_matchings/code_actors/func_80298D7C.s @@ -78,9 +78,9 @@ glabel func_80298D7C /* 1024B4 80298EA4 241E0006 */ li $fp, 6 /* 1024B8 80298EA8 11A10098 */ beq $t5, $at, .L8029910C /* 1024BC 80298EAC 27B700D4 */ addiu $s7, $sp, 0xd4 -/* 1024C0 80298EB0 3C16800E */ lui $s6, %hi(D_800DDB40) # $s6, 0x800e +/* 1024C0 80298EB0 3C16800E */ lui $s6, %hi(camera1) # $s6, 0x800e /* 1024C4 80298EB4 4480A000 */ mtc1 $zero, $f20 -/* 1024C8 80298EB8 26D6DB40 */ addiu $s6, %lo(D_800DDB40) # addiu $s6, $s6, -0x24c0 +/* 1024C8 80298EB8 26D6DB40 */ addiu $s6, %lo(camera1) # addiu $s6, $s6, -0x24c0 /* 1024CC 80298EBC 3C130600 */ lui $s3, 0x600 /* 1024D0 80298EC0 86300006 */ lh $s0, 6($s1) .L80298EC4: diff --git a/asm/non_matchings/code_actors/func_80299144.s b/asm/non_matchings/code_actors/func_80299144.s index fecdd3813..e5923208e 100644 --- a/asm/non_matchings/code_actors/func_80299144.s +++ b/asm/non_matchings/code_actors/func_80299144.s @@ -9,8 +9,8 @@ glabel func_80299144 /* 102770 80299160 304E0800 */ andi $t6, $v0, 0x800 /* 102774 80299164 15C00064 */ bnez $t6, .L802992F8 /* 102778 80299168 24070000 */ li $a3, 0 -/* 10277C 8029916C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 102780 80299170 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 10277C 8029916C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 102780 80299170 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 102784 80299174 240100B8 */ li $at, 184 /* 102788 80299178 94860026 */ lhu $a2, 0x26($a0) /* 10278C 8029917C 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_8029930C.s b/asm/non_matchings/code_actors/func_8029930C.s index 9ce3ed08a..8486059b8 100644 --- a/asm/non_matchings/code_actors/func_8029930C.s +++ b/asm/non_matchings/code_actors/func_8029930C.s @@ -9,8 +9,8 @@ glabel func_8029930C /* 102938 80299328 304E0800 */ andi $t6, $v0, 0x800 /* 10293C 8029932C 15C00064 */ bnez $t6, .L802994C0 /* 102940 80299330 24070000 */ li $a3, 0 -/* 102944 80299334 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 102948 80299338 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 102944 80299334 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 102948 80299338 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 10294C 8029933C 240100B8 */ li $at, 184 /* 102950 80299340 94860026 */ lhu $a2, 0x26($a0) /* 102954 80299344 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_802994D4.s b/asm/non_matchings/code_actors/func_802994D4.s index 3ef442133..93a001916 100644 --- a/asm/non_matchings/code_actors/func_802994D4.s +++ b/asm/non_matchings/code_actors/func_802994D4.s @@ -9,8 +9,8 @@ glabel func_802994D4 /* 102B00 802994F0 304E0800 */ andi $t6, $v0, 0x800 /* 102B04 802994F4 15C00064 */ bnez $t6, .L80299688 /* 102B08 802994F8 24070000 */ li $a3, 0 -/* 102B0C 802994FC 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 102B10 80299500 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 102B0C 802994FC 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 102B10 80299500 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 102B14 80299504 240100B8 */ li $at, 184 /* 102B18 80299508 94860026 */ lhu $a2, 0x26($a0) /* 102B1C 8029950C 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_8029969C.s b/asm/non_matchings/code_actors/func_8029969C.s index b8c6f672b..1d73160aa 100644 --- a/asm/non_matchings/code_actors/func_8029969C.s +++ b/asm/non_matchings/code_actors/func_8029969C.s @@ -9,8 +9,8 @@ glabel func_8029969C /* 102CC8 802996B8 304E0800 */ andi $t6, $v0, 0x800 /* 102CCC 802996BC 15C00064 */ bnez $t6, .L80299850 /* 102CD0 802996C0 24070000 */ li $a3, 0 -/* 102CD4 802996C4 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 102CD8 802996C8 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 102CD4 802996C4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 102CD8 802996C8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 102CDC 802996CC 240100B8 */ li $at, 184 /* 102CE0 802996D0 94860026 */ lhu $a2, 0x26($a0) /* 102CE4 802996D4 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_80299864.s b/asm/non_matchings/code_actors/func_80299864.s index f846b5a77..6a8811c39 100644 --- a/asm/non_matchings/code_actors/func_80299864.s +++ b/asm/non_matchings/code_actors/func_80299864.s @@ -9,8 +9,8 @@ glabel func_80299864 /* 102E90 80299880 304E0800 */ andi $t6, $v0, 0x800 /* 102E94 80299884 15C00064 */ bnez $t6, .L80299A18 /* 102E98 80299888 24070000 */ li $a3, 0 -/* 102E9C 8029988C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 102EA0 80299890 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 102E9C 8029988C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 102EA0 80299890 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 102EA4 80299894 240100B8 */ li $at, 184 /* 102EA8 80299898 94860026 */ lhu $a2, 0x26($a0) /* 102EAC 8029989C 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_80299A2C.s b/asm/non_matchings/code_actors/func_80299A2C.s index 47482c503..7dc380a98 100644 --- a/asm/non_matchings/code_actors/func_80299A2C.s +++ b/asm/non_matchings/code_actors/func_80299A2C.s @@ -9,8 +9,8 @@ glabel func_80299A2C /* 103058 80299A48 304E0800 */ andi $t6, $v0, 0x800 /* 10305C 80299A4C 15C00064 */ bnez $t6, .L80299BE0 /* 103060 80299A50 24070000 */ li $a3, 0 -/* 103064 80299A54 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 103068 80299A58 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 103064 80299A54 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 103068 80299A58 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 10306C 80299A5C 240100B8 */ li $at, 184 /* 103070 80299A60 94860026 */ lhu $a2, 0x26($a0) /* 103074 80299A64 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_80299BF4.s b/asm/non_matchings/code_actors/func_80299BF4.s index 41565dc66..28243051c 100644 --- a/asm/non_matchings/code_actors/func_80299BF4.s +++ b/asm/non_matchings/code_actors/func_80299BF4.s @@ -9,8 +9,8 @@ glabel func_80299BF4 /* 103220 80299C10 304E0800 */ andi $t6, $v0, 0x800 /* 103224 80299C14 15C00064 */ bnez $t6, .L80299DA8 /* 103228 80299C18 24070000 */ li $a3, 0 -/* 10322C 80299C1C 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 103230 80299C20 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 10322C 80299C1C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 103230 80299C20 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 103234 80299C24 240100B8 */ li $at, 184 /* 103238 80299C28 94860026 */ lhu $a2, 0x26($a0) /* 10323C 80299C2C 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_80299DBC.s b/asm/non_matchings/code_actors/func_80299DBC.s index 5ca2c4ba1..dd0d29a14 100644 --- a/asm/non_matchings/code_actors/func_80299DBC.s +++ b/asm/non_matchings/code_actors/func_80299DBC.s @@ -9,8 +9,8 @@ glabel func_80299DBC /* 1033E8 80299DD8 304E0800 */ andi $t6, $v0, 0x800 /* 1033EC 80299DDC 15C0003A */ bnez $t6, .L80299EC8 /* 1033F0 80299DE0 24070000 */ li $a3, 0 -/* 1033F4 80299DE4 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 1033F8 80299DE8 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 1033F4 80299DE4 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 1033F8 80299DE8 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 1033FC 80299DEC 240100B8 */ li $at, 184 /* 103400 80299DF0 94860026 */ lhu $a2, 0x26($a0) /* 103404 80299DF4 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_80299EDC.s b/asm/non_matchings/code_actors/func_80299EDC.s index ff570b5f5..68162ab68 100644 --- a/asm/non_matchings/code_actors/func_80299EDC.s +++ b/asm/non_matchings/code_actors/func_80299EDC.s @@ -9,8 +9,8 @@ glabel func_80299EDC /* 103508 80299EF8 304E0800 */ andi $t6, $v0, 0x800 /* 10350C 80299EFC 15C0003A */ bnez $t6, .L80299FE8 /* 103510 80299F00 24070000 */ li $a3, 0 -/* 103514 80299F04 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 103518 80299F08 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 103514 80299F04 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 103518 80299F08 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 10351C 80299F0C 240100B8 */ li $at, 184 /* 103520 80299F10 94860026 */ lhu $a2, 0x26($a0) /* 103524 80299F14 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_80299FFC.s b/asm/non_matchings/code_actors/func_80299FFC.s index d03eca85e..1848a24a1 100644 --- a/asm/non_matchings/code_actors/func_80299FFC.s +++ b/asm/non_matchings/code_actors/func_80299FFC.s @@ -9,8 +9,8 @@ glabel func_80299FFC /* 103628 8029A018 304E0800 */ andi $t6, $v0, 0x800 /* 10362C 8029A01C 15C0003A */ bnez $t6, .L8029A108 /* 103630 8029A020 24070000 */ li $a3, 0 -/* 103634 8029A024 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 103638 8029A028 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 103634 8029A024 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 103638 8029A028 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 10363C 8029A02C 240100B8 */ li $at, 184 /* 103640 8029A030 94860026 */ lhu $a2, 0x26($a0) /* 103644 8029A034 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_8029A11C.s b/asm/non_matchings/code_actors/func_8029A11C.s index c34d3cf3f..33bb11547 100644 --- a/asm/non_matchings/code_actors/func_8029A11C.s +++ b/asm/non_matchings/code_actors/func_8029A11C.s @@ -9,8 +9,8 @@ glabel func_8029A11C /* 103748 8029A138 304E0800 */ andi $t6, $v0, 0x800 /* 10374C 8029A13C 15C0003A */ bnez $t6, .L8029A228 /* 103750 8029A140 24070000 */ li $a3, 0 -/* 103754 8029A144 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 103758 8029A148 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 103754 8029A144 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 103758 8029A148 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 10375C 8029A14C 240100B8 */ li $at, 184 /* 103760 8029A150 94860026 */ lhu $a2, 0x26($a0) /* 103764 8029A154 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_8029A3AC.s b/asm/non_matchings/code_actors/func_8029A3AC.s index b5ade6f27..73f78dfbc 100644 --- a/asm/non_matchings/code_actors/func_8029A3AC.s +++ b/asm/non_matchings/code_actors/func_8029A3AC.s @@ -18,14 +18,14 @@ glabel func_8029A3AC /* 1039FC 8029A3EC 8DED0014 */ lw $t5, 0x14($t7) /* 103A00 8029A3F0 ADC10010 */ sw $at, 0x10($t6) /* 103A04 8029A3F4 8DE10018 */ lw $at, 0x18($t7) -/* 103A08 8029A3F8 3C19800E */ lui $t9, %hi(D_800DDB40) # $t9, 0x800e +/* 103A08 8029A3F8 3C19800E */ lui $t9, %hi(camera1) # $t9, 0x800e /* 103A0C 8029A3FC ADCD0014 */ sw $t5, 0x14($t6) /* 103A10 8029A400 ADC10018 */ sw $at, 0x18($t6) /* 103A14 8029A404 95E1001C */ lhu $at, 0x1c($t7) /* 103A18 8029A408 00C08025 */ move $s0, $a2 /* 103A1C 8029A40C 24C50018 */ addiu $a1, $a2, 0x18 /* 103A20 8029A410 A5C1001C */ sh $at, 0x1c($t6) -/* 103A24 8029A414 8F39DB40 */ lw $t9, %lo(D_800DDB40)($t9) +/* 103A24 8029A414 8F39DB40 */ lw $t9, %lo(camera1)($t9) /* 103A28 8029A418 240100B8 */ li $at, 184 /* 103A2C 8029A41C 94860026 */ lhu $a2, 0x26($a0) /* 103A30 8029A420 0099C023 */ subu $t8, $a0, $t9 diff --git a/asm/non_matchings/code_actors/func_8029A8F4.s b/asm/non_matchings/code_actors/func_8029A8F4.s index 97624b557..a52012627 100644 --- a/asm/non_matchings/code_actors/func_8029A8F4.s +++ b/asm/non_matchings/code_actors/func_8029A8F4.s @@ -1,6 +1,6 @@ glabel func_8029A8F4 -/* 103F04 8029A8F4 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 103F08 8029A8F8 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 103F04 8029A8F4 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 103F08 8029A8F8 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 103F0C 8029A8FC 240100B8 */ li $at, 184 /* 103F10 8029A900 27BDFF70 */ addiu $sp, $sp, -0x90 /* 103F14 8029A904 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029AC18.s b/asm/non_matchings/code_actors/func_8029AC18.s index 15c618a82..9d70ec68a 100644 --- a/asm/non_matchings/code_actors/func_8029AC18.s +++ b/asm/non_matchings/code_actors/func_8029AC18.s @@ -1,6 +1,6 @@ glabel func_8029AC18 -/* 104228 8029AC18 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 10422C 8029AC1C 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 104228 8029AC18 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 10422C 8029AC1C 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 104230 8029AC20 240100B8 */ li $at, 184 /* 104234 8029AC24 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 104238 8029AC28 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029AE1C.s b/asm/non_matchings/code_actors/func_8029AE1C.s index f65c1283f..97309693c 100644 --- a/asm/non_matchings/code_actors/func_8029AE1C.s +++ b/asm/non_matchings/code_actors/func_8029AE1C.s @@ -11,8 +11,8 @@ glabel func_8029AE1C /* 104450 8029AE40 29C10019 */ slti $at, $t6, 0x19 /* 104454 8029AE44 14200084 */ bnez $at, .L8029B058 .L8029AE48: -/* 104458 8029AE48 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 10445C 8029AE4C 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 104458 8029AE48 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 10445C 8029AE4C 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 104460 8029AE50 240100B8 */ li $at, 184 /* 104464 8029AE54 8FA5013C */ lw $a1, 0x13c($sp) /* 104468 8029AE58 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_8029B06C.s b/asm/non_matchings/code_actors/func_8029B06C.s index b23e8a6d2..6a0082c4e 100644 --- a/asm/non_matchings/code_actors/func_8029B06C.s +++ b/asm/non_matchings/code_actors/func_8029B06C.s @@ -1,6 +1,6 @@ glabel func_8029B06C -/* 10467C 8029B06C 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 104680 8029B070 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 10467C 8029B06C 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 104680 8029B070 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 104684 8029B074 240100B8 */ li $at, 184 /* 104688 8029B078 27BDFED0 */ addiu $sp, $sp, -0x130 /* 10468C 8029B07C 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029B2E4.s b/asm/non_matchings/code_actors/func_8029B2E4.s index a352259f4..f4b829b4d 100644 --- a/asm/non_matchings/code_actors/func_8029B2E4.s +++ b/asm/non_matchings/code_actors/func_8029B2E4.s @@ -1,6 +1,6 @@ glabel func_8029B2E4 -/* 1048F4 8029B2E4 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 1048F8 8029B2E8 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 1048F4 8029B2E4 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 1048F8 8029B2E8 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 1048FC 8029B2EC 240100B8 */ li $at, 184 /* 104900 8029B2F0 27BDFEE0 */ addiu $sp, $sp, -0x120 /* 104904 8029B2F4 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029B4E0.s b/asm/non_matchings/code_actors/func_8029B4E0.s index e0a36434a..200a60c11 100644 --- a/asm/non_matchings/code_actors/func_8029B4E0.s +++ b/asm/non_matchings/code_actors/func_8029B4E0.s @@ -1,6 +1,6 @@ glabel func_8029B4E0 -/* 104AF0 8029B4E0 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 104AF4 8029B4E4 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 104AF0 8029B4E0 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 104AF4 8029B4E4 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 104AF8 8029B4E8 240100B8 */ li $at, 184 /* 104AFC 8029B4EC 27BDFEE0 */ addiu $sp, $sp, -0x120 /* 104B00 8029B4F0 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029B6EC.s b/asm/non_matchings/code_actors/func_8029B6EC.s index 8d9ec0439..42130d79c 100644 --- a/asm/non_matchings/code_actors/func_8029B6EC.s +++ b/asm/non_matchings/code_actors/func_8029B6EC.s @@ -1,6 +1,6 @@ glabel func_8029B6EC -/* 104CFC 8029B6EC 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 104D00 8029B6F0 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 104CFC 8029B6EC 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 104D00 8029B6F0 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 104D04 8029B6F4 240100B8 */ li $at, 184 /* 104D08 8029B6F8 27BDFEE0 */ addiu $sp, $sp, -0x120 /* 104D0C 8029B6FC 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029B8E8.s b/asm/non_matchings/code_actors/func_8029B8E8.s index b13f9adae..a33b4176e 100644 --- a/asm/non_matchings/code_actors/func_8029B8E8.s +++ b/asm/non_matchings/code_actors/func_8029B8E8.s @@ -1,6 +1,6 @@ glabel func_8029B8E8 -/* 104EF8 8029B8E8 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 104EFC 8029B8EC 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 104EF8 8029B8E8 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 104EFC 8029B8EC 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 104F00 8029B8F0 240100B8 */ li $at, 184 /* 104F04 8029B8F4 27BDFE88 */ addiu $sp, $sp, -0x178 /* 104F08 8029B8F8 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029BFB0.s b/asm/non_matchings/code_actors/func_8029BFB0.s index d2d507f7e..5d0d4ac08 100644 --- a/asm/non_matchings/code_actors/func_8029BFB0.s +++ b/asm/non_matchings/code_actors/func_8029BFB0.s @@ -1,6 +1,6 @@ glabel func_8029BFB0 -/* 1055C0 8029BFB0 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 1055C4 8029BFB4 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 1055C0 8029BFB0 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 1055C4 8029BFB4 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 1055C8 8029BFB8 240100B8 */ li $at, 184 /* 1055CC 8029BFBC 27BDFEC0 */ addiu $sp, $sp, -0x140 /* 1055D0 8029BFC0 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029C3CC.s b/asm/non_matchings/code_actors/func_8029C3CC.s index 8a8c9d6d5..57a2d75fd 100644 --- a/asm/non_matchings/code_actors/func_8029C3CC.s +++ b/asm/non_matchings/code_actors/func_8029C3CC.s @@ -1,6 +1,6 @@ glabel func_8029C3CC -/* 1059DC 8029C3CC 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 1059E0 8029C3D0 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 1059DC 8029C3CC 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 1059E0 8029C3D0 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 1059E4 8029C3D4 240100B8 */ li $at, 184 /* 1059E8 8029C3D8 27BDFE98 */ addiu $sp, $sp, -0x168 /* 1059EC 8029C3DC 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_8029CA90.s b/asm/non_matchings/code_actors/func_8029CA90.s index 36b383648..9636dbf1c 100644 --- a/asm/non_matchings/code_actors/func_8029CA90.s +++ b/asm/non_matchings/code_actors/func_8029CA90.s @@ -7,8 +7,8 @@ glabel func_8029CA90 /* 1060B4 8029CAA4 24A50018 */ addiu $a1, $a1, 0x18 /* 1060B8 8029CAA8 15C00055 */ bnez $t6, .L8029CC00 /* 1060BC 8029CAAC 3C0743C8 */ lui $a3, 0x43c8 -/* 1060C0 8029CAB0 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 1060C4 8029CAB4 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 1060C0 8029CAB0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 1060C4 8029CAB4 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 1060C8 8029CAB8 240100B8 */ li $at, 184 /* 1060CC 8029CABC 94860026 */ lhu $a2, 0x26($a0) /* 1060D0 8029CAC0 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_802A171C.s b/asm/non_matchings/code_actors/func_802A171C.s index c8e697bf8..83dd0ed2e 100644 --- a/asm/non_matchings/code_actors/func_802A171C.s +++ b/asm/non_matchings/code_actors/func_802A171C.s @@ -1,6 +1,6 @@ glabel func_802A171C -/* 10AD2C 802A171C 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 10AD30 802A1720 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 10AD2C 802A171C 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 10AD30 802A1720 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 10AD34 802A1724 27BDFE78 */ addiu $sp, $sp, -0x188 /* 10AD38 802A1728 AFB00020 */ sw $s0, 0x20($sp) /* 10AD3C 802A172C 00808025 */ move $s0, $a0 diff --git a/asm/non_matchings/code_actors/func_802A1EA0.s b/asm/non_matchings/code_actors/func_802A1EA0.s index 0c88dd369..6b603f7f1 100644 --- a/asm/non_matchings/code_actors/func_802A1EA0.s +++ b/asm/non_matchings/code_actors/func_802A1EA0.s @@ -1,6 +1,6 @@ glabel func_802A1EA0 -/* 10B4B0 802A1EA0 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 10B4B4 802A1EA4 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 10B4B0 802A1EA0 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 10B4B4 802A1EA4 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 10B4B8 802A1EA8 240100B8 */ li $at, 184 /* 10B4BC 802A1EAC 27BDFE78 */ addiu $sp, $sp, -0x188 /* 10B4C0 802A1EB0 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_802A269C.s b/asm/non_matchings/code_actors/func_802A269C.s index fb8c4cbad..9fe5b2d73 100644 --- a/asm/non_matchings/code_actors/func_802A269C.s +++ b/asm/non_matchings/code_actors/func_802A269C.s @@ -1,6 +1,6 @@ glabel func_802A269C -/* 10BCAC 802A269C 3C0E800E */ lui $t6, %hi(D_800DDB40) # $t6, 0x800e -/* 10BCB0 802A26A0 8DCEDB40 */ lw $t6, %lo(D_800DDB40)($t6) +/* 10BCAC 802A269C 3C0E800E */ lui $t6, %hi(camera1) # $t6, 0x800e +/* 10BCB0 802A26A0 8DCEDB40 */ lw $t6, %lo(camera1)($t6) /* 10BCB4 802A26A4 240100B8 */ li $at, 184 /* 10BCB8 802A26A8 27BDFF88 */ addiu $sp, $sp, -0x78 /* 10BCBC 802A26AC 008E7823 */ subu $t7, $a0, $t6 diff --git a/asm/non_matchings/code_actors/func_802A27A0.s b/asm/non_matchings/code_actors/func_802A27A0.s index 4c24cb077..558059f2e 100644 --- a/asm/non_matchings/code_actors/func_802A27A0.s +++ b/asm/non_matchings/code_actors/func_802A27A0.s @@ -9,8 +9,8 @@ glabel func_802A27A0 /* 10BDCC 802A27BC AFA500A4 */ sw $a1, 0xa4($sp) /* 10BDD0 802A27C0 11C1001B */ beq $t6, $at, .L802A2830 /* 10BDD4 802A27C4 AFA700AC */ sw $a3, 0xac($sp) -/* 10BDD8 802A27C8 3C0F800E */ lui $t7, %hi(D_800DDB40) # $t7, 0x800e -/* 10BDDC 802A27CC 8DEFDB40 */ lw $t7, %lo(D_800DDB40)($t7) +/* 10BDD8 802A27C8 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e +/* 10BDDC 802A27CC 8DEFDB40 */ lw $t7, %lo(camera1)($t7) /* 10BDE0 802A27D0 240100B8 */ li $at, 184 /* 10BDE4 802A27D4 24C50018 */ addiu $a1, $a2, 0x18 /* 10BDE8 802A27D8 008FC023 */ subu $t8, $a0, $t7 diff --git a/asm/non_matchings/code_actors/func_802A29BC.s b/asm/non_matchings/code_actors/func_802A29BC.s index a0d41a507..6d5b262bd 100644 --- a/asm/non_matchings/code_actors/func_802A29BC.s +++ b/asm/non_matchings/code_actors/func_802A29BC.s @@ -8,8 +8,8 @@ glabel func_802A29BC /* 10BFE4 802A29D4 24070000 */ li $a3, 0 /* 10BFE8 802A29D8 304F0800 */ andi $t7, $v0, 0x800 /* 10BFEC 802A29DC 15E00038 */ bnez $t7, .L802A2AC0 -/* 10BFF0 802A29E0 3C18800E */ lui $t8, %hi(D_800DDB40) # $t8, 0x800e -/* 10BFF4 802A29E4 8F18DB40 */ lw $t8, %lo(D_800DDB40)($t8) +/* 10BFF0 802A29E0 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e +/* 10BFF4 802A29E4 8F18DB40 */ lw $t8, %lo(camera1)($t8) /* 10BFF8 802A29E8 240100B8 */ li $at, 184 /* 10BFFC 802A29EC 94860026 */ lhu $a2, 0x26($a0) /* 10C000 802A29F0 0098C823 */ subu $t9, $a0, $t8 diff --git a/asm/non_matchings/code_actors/func_802A2AD0.s b/asm/non_matchings/code_actors/func_802A2AD0.s index 74c2a176d..56a859b18 100644 --- a/asm/non_matchings/code_actors/func_802A2AD0.s +++ b/asm/non_matchings/code_actors/func_802A2AD0.s @@ -6,12 +6,12 @@ glabel func_802A2AD0 /* 10C0F0 802A2AE0 25EF8864 */ addiu $t7, %lo(D_802B8864) # addiu $t7, $t7, -0x779c /* 10C0F4 802A2AE4 8DE10000 */ lw $at, ($t7) /* 10C0F8 802A2AE8 27AE0080 */ addiu $t6, $sp, 0x80 -/* 10C0FC 802A2AEC 3C09800E */ lui $t1, %hi(D_800DDB40) # $t1, 0x800e +/* 10C0FC 802A2AEC 3C09800E */ lui $t1, %hi(camera1) # $t1, 0x800e /* 10C100 802A2AF0 ADC10000 */ sw $at, ($t6) /* 10C104 802A2AF4 95E10004 */ lhu $at, 4($t7) /* 10C108 802A2AF8 24070000 */ li $a3, 0 /* 10C10C 802A2AFC A5C10004 */ sh $at, 4($t6) -/* 10C110 802A2B00 8D29DB40 */ lw $t1, %lo(D_800DDB40)($t1) +/* 10C110 802A2B00 8D29DB40 */ lw $t1, %lo(camera1)($t1) /* 10C114 802A2B04 240100B8 */ li $at, 184 /* 10C118 802A2B08 8FA5008C */ lw $a1, 0x8c($sp) /* 10C11C 802A2B0C 00895023 */ subu $t2, $a0, $t1 diff --git a/asm/non_matchings/code_actors/func_802A2C78.s b/asm/non_matchings/code_actors/func_802A2C78.s index 805d1fee9..1d28da99a 100644 --- a/asm/non_matchings/code_actors/func_802A2C78.s +++ b/asm/non_matchings/code_actors/func_802A2C78.s @@ -10,7 +10,7 @@ glabel func_802A2C78 /* 10C2A8 802A2C98 24070000 */ li $a3, 0 /* 10C2AC 802A2C9C ADC10000 */ sw $at, ($t6) /* 10C2B0 802A2CA0 95E10004 */ lhu $at, 4($t7) -/* 10C2B4 802A2CA4 3C19800E */ lui $t9, %hi(D_800DDB40) # $t9, 0x800e +/* 10C2B4 802A2CA4 3C19800E */ lui $t9, %hi(camera1) # $t9, 0x800e /* 10C2B8 802A2CA8 A5C10004 */ sh $at, 4($t6) /* 10C2BC 802A2CAC 8FAC00B8 */ lw $t4, 0xb8($sp) /* 10C2C0 802A2CB0 8FA500B8 */ lw $a1, 0xb8($sp) @@ -20,7 +20,7 @@ glabel func_802A2C78 /* 10C2D0 802A2CC0 304D0800 */ andi $t5, $v0, 0x800 /* 10C2D4 802A2CC4 55A00098 */ bnel $t5, $zero, .L802A2F28 /* 10C2D8 802A2CC8 8FBF001C */ lw $ra, 0x1c($sp) -/* 10C2DC 802A2CCC 8F39DB40 */ lw $t9, %lo(D_800DDB40)($t9) +/* 10C2DC 802A2CCC 8F39DB40 */ lw $t9, %lo(camera1)($t9) /* 10C2E0 802A2CD0 94860026 */ lhu $a2, 0x26($a0) /* 10C2E4 802A2CD4 AFA50020 */ sw $a1, 0x20($sp) /* 10C2E8 802A2CD8 0099C023 */ subu $t8, $a0, $t9 diff --git a/asm/non_matchings/memory/MIO0_0F.s b/asm/non_matchings/memory/MIO0_0F.s deleted file mode 100644 index f70d451d5..000000000 --- a/asm/non_matchings/memory/MIO0_0F.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel MIO0_0F -/* 111BDC 802A85CC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 111BE0 802A85D0 AFA40030 */ sw $a0, 0x30($sp) -/* 111BE4 802A85D4 2402FFF0 */ li $v0, -16 -/* 111BE8 802A85D8 3C188016 */ lui $t8, %hi(gHeapEndPtr) # $t8, 0x8016 -/* 111BEC 802A85DC 3C048016 */ lui $a0, %hi(gPrevLoadedAddress) # $a0, 0x8016 -/* 111BF0 802A85E0 8F18F72C */ lw $t8, %lo(gHeapEndPtr)($t8) -/* 111BF4 802A85E4 8C84F728 */ lw $a0, %lo(gPrevLoadedAddress)($a0) -/* 111BF8 802A85E8 24AE000F */ addiu $t6, $a1, 0xf -/* 111BFC 802A85EC 24CF000F */ addiu $t7, $a2, 0xf -/* 111C00 802A85F0 AFBF0024 */ sw $ra, 0x24($sp) -/* 111C04 802A85F4 01C22824 */ and $a1, $t6, $v0 -/* 111C08 802A85F8 01E23024 */ and $a2, $t7, $v0 -/* 111C0C 802A85FC AFA60038 */ sw $a2, 0x38($sp) -/* 111C10 802A8600 AFA50034 */ sw $a1, 0x34($sp) -/* 111C14 802A8604 AFB8002C */ sw $t8, 0x2c($sp) -/* 111C18 802A8608 0C0336E0 */ jal osInvalDCache -/* 111C1C 802A860C AFA40028 */ sw $a0, 0x28($sp) -/* 111C20 802A8610 8FB90030 */ lw $t9, 0x30($sp) -/* 111C24 802A8614 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* 111C28 802A8618 8FAA0028 */ lw $t2, 0x28($sp) -/* 111C2C 802A861C 8FAB0034 */ lw $t3, 0x34($sp) -/* 111C30 802A8620 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 111C34 802A8624 3C090064 */ lui $t1, %hi(_other_texturesSegmentRomStart) # $t1, 0x64 -/* 111C38 802A8628 3C0C8015 */ lui $t4, %hi(D_8014EF58) # $t4, 0x8015 -/* 111C3C 802A862C 258CEF58 */ addiu $t4, %lo(D_8014EF58) # addiu $t4, $t4, -0x10a8 -/* 111C40 802A8630 25291F70 */ addiu $t1, %lo(_other_texturesSegmentRomStart) # addiu $t1, $t1, 0x1f70 -/* 111C44 802A8634 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 -/* 111C48 802A8638 03214024 */ and $t0, $t9, $at -/* 111C4C 802A863C 01093821 */ addu $a3, $t0, $t1 -/* 111C50 802A8640 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 -/* 111C54 802A8644 AFAC0018 */ sw $t4, 0x18($sp) -/* 111C58 802A8648 00002825 */ move $a1, $zero -/* 111C5C 802A864C 00003025 */ move $a2, $zero -/* 111C60 802A8650 AFAA0010 */ sw $t2, 0x10($sp) -/* 111C64 802A8654 0C03370C */ jal osPiStartDma -/* 111C68 802A8658 AFAB0014 */ sw $t3, 0x14($sp) -/* 111C6C 802A865C 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 111C70 802A8660 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 111C74 802A8664 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 111C78 802A8668 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 -/* 111C7C 802A866C 0C0335D4 */ jal osRecvMesg -/* 111C80 802A8670 24060001 */ li $a2, 1 -/* 111C84 802A8674 8FA40028 */ lw $a0, 0x28($sp) -/* 111C88 802A8678 0C010034 */ jal mio0decode -/* 111C8C 802A867C 8FA5002C */ lw $a1, 0x2c($sp) -/* 111C90 802A8680 3C038016 */ lui $v1, %hi(gHeapEndPtr) # $v1, 0x8016 -/* 111C94 802A8684 2463F72C */ addiu $v1, %lo(gHeapEndPtr) # addiu $v1, $v1, -0x8d4 -/* 111C98 802A8688 8C6D0000 */ lw $t5, ($v1) -/* 111C9C 802A868C 8FAE0038 */ lw $t6, 0x38($sp) -/* 111CA0 802A8690 8FBF0024 */ lw $ra, 0x24($sp) -/* 111CA4 802A8694 8FA2002C */ lw $v0, 0x2c($sp) -/* 111CA8 802A8698 01AE7821 */ addu $t7, $t5, $t6 -/* 111CAC 802A869C AC6F0000 */ sw $t7, ($v1) -/* 111CB0 802A86A0 03E00008 */ jr $ra -/* 111CB4 802A86A4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/memory/func_802A7C08.s b/asm/non_matchings/memory/func_802A7C08.s deleted file mode 100644 index a990f8429..000000000 --- a/asm/non_matchings/memory/func_802A7C08.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A7C08 -/* 111218 802A7C08 3C058015 */ lui $a1, %hi(gSegmentTable) # $a1, 0x8015 -/* 11121C 802A7C0C 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 111220 802A7C10 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 111224 802A7C14 24A50258 */ addiu $a1, %lo(gSegmentTable) # addiu $a1, $a1, 0x258 -/* 111228 802A7C18 00002025 */ move $a0, $zero -/* 11122C 802A7C1C 24060004 */ li $a2, 4 -/* 111230 802A7C20 24070008 */ li $a3, 8 -/* 111234 802A7C24 2408000C */ li $t0, 12 -/* 111238 802A7C28 240B004C */ li $t3, 76 -/* 11123C 802A7C2C 3C0ABC00 */ lui $t2, 0xbc00 -.L802A7C30: -/* 111240 802A7C30 8D230000 */ lw $v1, ($t1) -/* 111244 802A7C34 308FFFFF */ andi $t7, $a0, 0xffff -/* 111248 802A7C38 000FC200 */ sll $t8, $t7, 8 -/* 11124C 802A7C3C 030AC825 */ or $t9, $t8, $t2 -/* 111250 802A7C40 246E0008 */ addiu $t6, $v1, 8 -/* 111254 802A7C44 AD2E0000 */ sw $t6, ($t1) -/* 111258 802A7C48 372C0006 */ ori $t4, $t9, 6 -/* 11125C 802A7C4C AC6C0000 */ sw $t4, ($v1) -/* 111260 802A7C50 8CAD0000 */ lw $t5, ($a1) -/* 111264 802A7C54 30CFFFFF */ andi $t7, $a2, 0xffff -/* 111268 802A7C58 000FC200 */ sll $t8, $t7, 8 -/* 11126C 802A7C5C AC6D0004 */ sw $t5, 4($v1) -/* 111270 802A7C60 8D230000 */ lw $v1, ($t1) -/* 111274 802A7C64 030AC825 */ or $t9, $t8, $t2 -/* 111278 802A7C68 372C0006 */ ori $t4, $t9, 6 -/* 11127C 802A7C6C 246E0008 */ addiu $t6, $v1, 8 -/* 111280 802A7C70 AD2E0000 */ sw $t6, ($t1) -/* 111284 802A7C74 AC6C0000 */ sw $t4, ($v1) -/* 111288 802A7C78 8CAD0004 */ lw $t5, 4($a1) -/* 11128C 802A7C7C 30EFFFFF */ andi $t7, $a3, 0xffff -/* 111290 802A7C80 000FC200 */ sll $t8, $t7, 8 -/* 111294 802A7C84 AC6D0004 */ sw $t5, 4($v1) -/* 111298 802A7C88 8D230000 */ lw $v1, ($t1) -/* 11129C 802A7C8C 030AC825 */ or $t9, $t8, $t2 -/* 1112A0 802A7C90 372C0006 */ ori $t4, $t9, 6 -/* 1112A4 802A7C94 246E0008 */ addiu $t6, $v1, 8 -/* 1112A8 802A7C98 AD2E0000 */ sw $t6, ($t1) -/* 1112AC 802A7C9C AC6C0000 */ sw $t4, ($v1) -/* 1112B0 802A7CA0 8CAD0008 */ lw $t5, 8($a1) -/* 1112B4 802A7CA4 310FFFFF */ andi $t7, $t0, 0xffff -/* 1112B8 802A7CA8 000FC200 */ sll $t8, $t7, 8 -/* 1112BC 802A7CAC AC6D0004 */ sw $t5, 4($v1) -/* 1112C0 802A7CB0 8D230000 */ lw $v1, ($t1) -/* 1112C4 802A7CB4 030AC825 */ or $t9, $t8, $t2 -/* 1112C8 802A7CB8 372C0006 */ ori $t4, $t9, 6 -/* 1112CC 802A7CBC 246E0008 */ addiu $t6, $v1, 8 -/* 1112D0 802A7CC0 AD2E0000 */ sw $t6, ($t1) -/* 1112D4 802A7CC4 AC6C0000 */ sw $t4, ($v1) -/* 1112D8 802A7CC8 8CAD000C */ lw $t5, 0xc($a1) -/* 1112DC 802A7CCC 25080010 */ addiu $t0, $t0, 0x10 -/* 1112E0 802A7CD0 24E70010 */ addiu $a3, $a3, 0x10 -/* 1112E4 802A7CD4 24C60010 */ addiu $a2, $a2, 0x10 -/* 1112E8 802A7CD8 24840010 */ addiu $a0, $a0, 0x10 -/* 1112EC 802A7CDC 24A50010 */ addiu $a1, $a1, 0x10 -/* 1112F0 802A7CE0 150BFFD3 */ bne $t0, $t3, .L802A7C30 -/* 1112F4 802A7CE4 AC6D0004 */ sw $t5, 4($v1) -/* 1112F8 802A7CE8 03E00008 */ jr $ra -/* 1112FC 802A7CEC 00000000 */ nop diff --git a/asm/non_matchings/memory/func_802A7D1C.s b/asm/non_matchings/memory/func_802A7D1C.s index 9bac52a05..c42efeeed 100644 --- a/asm/non_matchings/memory/func_802A7D1C.s +++ b/asm/non_matchings/memory/func_802A7D1C.s @@ -1,19 +1,4 @@ -glabel func_802A7D1C -/* 11132C 802A7D1C 3C068016 */ lui $a2, %hi(D_8015F724) # $a2, 0x8016 -/* 111330 802A7D20 3C078016 */ lui $a3, %hi(gPrevLoadedAddress) # $a3, 0x8016 -/* 111334 802A7D24 24E7F728 */ addiu $a3, %lo(gPrevLoadedAddress) # addiu $a3, $a3, -0x8d8 -/* 111338 802A7D28 24C6F724 */ addiu $a2, %lo(D_8015F724) # addiu $a2, $a2, -0x8dc -/* 11133C 802A7D2C 8CCF0000 */ lw $t7, ($a2) -/* 111340 802A7D30 8CE20000 */ lw $v0, ($a3) -/* 111344 802A7D34 2484000F */ addiu $a0, $a0, 0xf -/* 111348 802A7D38 2401FFF0 */ li $at, -16 -/* 11134C 802A7D3C 00817024 */ and $t6, $a0, $at -/* 111350 802A7D40 01EEC023 */ subu $t8, $t7, $t6 -/* 111354 802A7D44 004EC821 */ addu $t9, $v0, $t6 -/* 111358 802A7D48 ACD80000 */ sw $t8, ($a2) -/* 11135C 802A7D4C 03E00008 */ jr $ra -/* 111360 802A7D50 ACF90000 */ sw $t9, ($a3) - +glabel func_802A7D54 /* 111364 802A7D54 3C0F8015 */ lui $t7, %hi(D_80150158) # $t7, 0x8015 /* 111368 802A7D58 25EF0158 */ addiu $t7, %lo(D_80150158) # addiu $t7, $t7, 0x158 /* 11136C 802A7D5C 00047100 */ sll $t6, $a0, 4 diff --git a/asm/non_matchings/memory/func_802A7D70.s b/asm/non_matchings/memory/func_802A7D70.s deleted file mode 100644 index 6c4c2a581..000000000 --- a/asm/non_matchings/memory/func_802A7D70.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_802A7D70 -/* 111380 802A7D70 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 111384 802A7D74 AFBF0014 */ sw $ra, 0x14($sp) -/* 111388 802A7D78 AFA40028 */ sw $a0, 0x28($sp) -/* 11138C 802A7D7C 00A43023 */ subu $a2, $a1, $a0 -/* 111390 802A7D80 00C02025 */ move $a0, $a2 -/* 111394 802A7D84 0C0A9F47 */ jal func_802A7D1C -/* 111398 802A7D88 AFA6001C */ sw $a2, 0x1c($sp) -/* 11139C 802A7D8C 8FA6001C */ lw $a2, 0x1c($sp) -/* 1113A0 802A7D90 10400005 */ beqz $v0, .L802A7DA8 -/* 1113A4 802A7D94 00402025 */ move $a0, $v0 -/* 1113A8 802A7D98 8FA50028 */ lw $a1, 0x28($sp) -/* 1113AC 802A7D9C 0C000456 */ jal dma_copy -/* 1113B0 802A7DA0 AFA20024 */ sw $v0, 0x24($sp) -/* 1113B4 802A7DA4 8FA40024 */ lw $a0, 0x24($sp) -.L802A7DA8: -/* 1113B8 802A7DA8 8FBF0014 */ lw $ra, 0x14($sp) -/* 1113BC 802A7DAC 27BD0028 */ addiu $sp, $sp, 0x28 -/* 1113C0 802A7DB0 00801025 */ move $v0, $a0 -/* 1113C4 802A7DB4 03E00008 */ jr $ra -/* 1113C8 802A7DB8 00000000 */ nop - -/* 1113CC 802A7DBC 2402FFF0 */ li $v0, -16 -/* 1113D0 802A7DC0 248E000F */ addiu $t6, $a0, 0xf -/* 1113D4 802A7DC4 01C22024 */ and $a0, $t6, $v0 -/* 1113D8 802A7DC8 00A22824 */ and $a1, $a1, $v0 -/* 1113DC 802A7DCC 00A47823 */ subu $t7, $a1, $a0 -/* 1113E0 802A7DD0 25F8FFF0 */ addiu $t8, $t7, -0x10 -/* 1113E4 802A7DD4 3C01802C */ lui $at, %hi(D_802BA278) # $at, 0x802c -/* 1113E8 802A7DD8 3C03802C */ lui $v1, %hi(D_802BA27C) # $v1, 0x802c -/* 1113EC 802A7DDC 3C06802C */ lui $a2, %hi(D_802BA280) # $a2, 0x802c -/* 1113F0 802A7DE0 AC38A278 */ sw $t8, %lo(D_802BA278)($at) -/* 1113F4 802A7DE4 24C6A280 */ addiu $a2, %lo(D_802BA280) # addiu $a2, $a2, -0x5d80 -/* 1113F8 802A7DE8 2463A27C */ addiu $v1, %lo(D_802BA27C) # addiu $v1, $v1, -0x5d84 -/* 1113FC 802A7DEC AC640000 */ sw $a0, ($v1) -/* 111400 802A7DF0 ACC50000 */ sw $a1, ($a2) -/* 111404 802A7DF4 AC800000 */ sw $zero, ($a0) -/* 111408 802A7DF8 8C680000 */ lw $t0, ($v1) -/* 11140C 802A7DFC AD000004 */ sw $zero, 4($t0) -/* 111410 802A7E00 8CC90000 */ lw $t1, ($a2) -/* 111414 802A7E04 AD200000 */ sw $zero, ($t1) -/* 111418 802A7E08 8CCA0000 */ lw $t2, ($a2) -/* 11141C 802A7E0C 03E00008 */ jr $ra -/* 111420 802A7E10 AD400004 */ sw $zero, 4($t2) diff --git a/asm/non_matchings/memory/func_802A7E14.s b/asm/non_matchings/memory/func_802A7E14.s deleted file mode 100644 index 7fcabea82..000000000 --- a/asm/non_matchings/memory/func_802A7E14.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_802A7E14 -/* 111424 802A7E14 3C06802C */ lui $a2, %hi(D_802BA278) # $a2, 0x802c -/* 111428 802A7E18 24C6A278 */ addiu $a2, %lo(D_802BA278) # addiu $a2, $a2, -0x5d88 -/* 11142C 802A7E1C 8CC20000 */ lw $v0, ($a2) -/* 111430 802A7E20 2484000F */ addiu $a0, $a0, 0xf -/* 111434 802A7E24 2401FFF0 */ li $at, -16 -/* 111438 802A7E28 00817024 */ and $t6, $a0, $at -/* 11143C 802A7E2C 25C40008 */ addiu $a0, $t6, 8 -/* 111440 802A7E30 0044082B */ sltu $at, $v0, $a0 -/* 111444 802A7E34 14200019 */ bnez $at, .L802A7E9C -/* 111448 802A7E38 00001825 */ move $v1, $zero -/* 11144C 802A7E3C 00447823 */ subu $t7, $v0, $a0 -/* 111450 802A7E40 14A0000D */ bnez $a1, .L802A7E78 -/* 111454 802A7E44 ACCF0000 */ sw $t7, ($a2) -/* 111458 802A7E48 3C06802C */ lui $a2, %hi(D_802BA27C) # $a2, 0x802c -/* 11145C 802A7E4C 24C6A27C */ addiu $a2, %lo(D_802BA27C) # addiu $a2, $a2, -0x5d84 -/* 111460 802A7E50 8CC50000 */ lw $a1, ($a2) -/* 111464 802A7E54 00A41021 */ addu $v0, $a1, $a0 -/* 111468 802A7E58 ACA20004 */ sw $v0, 4($a1) -/* 11146C 802A7E5C 8CD80000 */ lw $t8, ($a2) -/* 111470 802A7E60 AC580000 */ sw $t8, ($v0) -/* 111474 802A7E64 8CC30000 */ lw $v1, ($a2) -/* 111478 802A7E68 ACC20000 */ sw $v0, ($a2) -/* 11147C 802A7E6C 24630008 */ addiu $v1, $v1, 8 -/* 111480 802A7E70 03E00008 */ jr $ra -/* 111484 802A7E74 00601025 */ move $v0, $v1 - -.L802A7E78: -/* 111488 802A7E78 3C06802C */ lui $a2, %hi(D_802BA280) # $a2, 0x802c -/* 11148C 802A7E7C 24C6A280 */ addiu $a2, %lo(D_802BA280) # addiu $a2, $a2, -0x5d80 -/* 111490 802A7E80 8CC50000 */ lw $a1, ($a2) -/* 111494 802A7E84 00A41023 */ subu $v0, $a1, $a0 -/* 111498 802A7E88 ACA20000 */ sw $v0, ($a1) -/* 11149C 802A7E8C 8CD90000 */ lw $t9, ($a2) -/* 1114A0 802A7E90 24430008 */ addiu $v1, $v0, 8 -/* 1114A4 802A7E94 AC590004 */ sw $t9, 4($v0) -/* 1114A8 802A7E98 ACC20000 */ sw $v0, ($a2) -.L802A7E9C: -/* 1114AC 802A7E9C 03E00008 */ jr $ra -/* 1114B0 802A7EA0 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/memory/func_802A7EA4.s b/asm/non_matchings/memory/func_802A7EA4.s deleted file mode 100644 index 2ae2d3f78..000000000 --- a/asm/non_matchings/memory/func_802A7EA4.s +++ /dev/null @@ -1,143 +0,0 @@ -glabel func_802A7EA4 -/* 1114B4 802A7EA4 3C05802C */ lui $a1, %hi(D_802BA27C) # $a1, 0x802c -/* 1114B8 802A7EA8 24A5A27C */ addiu $a1, %lo(D_802BA27C) # addiu $a1, $a1, -0x5d84 -/* 1114BC 802A7EAC 8CAE0000 */ lw $t6, ($a1) -/* 1114C0 802A7EB0 2482FFF8 */ addiu $v0, $a0, -8 -/* 1114C4 802A7EB4 00401825 */ move $v1, $v0 -/* 1114C8 802A7EB8 004E082B */ sltu $at, $v0, $t6 -/* 1114CC 802A7EBC 50200016 */ beql $at, $zero, .L802A7F18 -/* 1114D0 802A7EC0 8C4B0000 */ lw $t3, ($v0) -/* 1114D4 802A7EC4 8C4F0004 */ lw $t7, 4($v0) -/* 1114D8 802A7EC8 3C01802C */ lui $at, %hi(D_802BA27C) # $at, 0x802c -/* 1114DC 802A7ECC 11E00006 */ beqz $t7, .L802A7EE8 -/* 1114E0 802A7ED0 00000000 */ nop -/* 1114E4 802A7ED4 8C640004 */ lw $a0, 4($v1) -/* 1114E8 802A7ED8 00801825 */ move $v1, $a0 -.L802A7EDC: -/* 1114EC 802A7EDC 8C840004 */ lw $a0, 4($a0) -/* 1114F0 802A7EE0 5480FFFE */ bnel $a0, $zero, .L802A7EDC -/* 1114F4 802A7EE4 00801825 */ move $v1, $a0 -.L802A7EE8: -/* 1114F8 802A7EE8 AC22A27C */ sw $v0, %lo(D_802BA27C)($at) -/* 1114FC 802A7EEC 8CB80000 */ lw $t8, ($a1) -/* 111500 802A7EF0 3C04802C */ lui $a0, %hi(D_802BA278) # $a0, 0x802c -/* 111504 802A7EF4 2484A278 */ addiu $a0, %lo(D_802BA278) # addiu $a0, $a0, -0x5d88 -/* 111508 802A7EF8 AF000004 */ sw $zero, 4($t8) -/* 11150C 802A7EFC 8C990000 */ lw $t9, ($a0) -/* 111510 802A7F00 8CA90000 */ lw $t1, ($a1) -/* 111514 802A7F04 03234021 */ addu $t0, $t9, $v1 -/* 111518 802A7F08 01095023 */ subu $t2, $t0, $t1 -/* 11151C 802A7F0C 10000017 */ b .L802A7F6C -/* 111520 802A7F10 AC8A0000 */ sw $t2, ($a0) -/* 111524 802A7F14 8C4B0000 */ lw $t3, ($v0) -.L802A7F18: -/* 111528 802A7F18 3C05802C */ lui $a1, %hi(D_802BA280) # $a1, 0x802c -/* 11152C 802A7F1C 51600007 */ beql $t3, $zero, .L802A7F3C -/* 111530 802A7F20 8C4C0004 */ lw $t4, 4($v0) -/* 111534 802A7F24 8C640000 */ lw $a0, ($v1) -/* 111538 802A7F28 00801825 */ move $v1, $a0 -.L802A7F2C: -/* 11153C 802A7F2C 8C840000 */ lw $a0, ($a0) -/* 111540 802A7F30 5480FFFE */ bnel $a0, $zero, .L802A7F2C -/* 111544 802A7F34 00801825 */ move $v1, $a0 -/* 111548 802A7F38 8C4C0004 */ lw $t4, 4($v0) -.L802A7F3C: -/* 11154C 802A7F3C 3C01802C */ lui $at, %hi(D_802BA280) # $at, 0x802c -/* 111550 802A7F40 24A5A280 */ addiu $a1, %lo(D_802BA280) # addiu $a1, $a1, -0x5d80 -/* 111554 802A7F44 AC2CA280 */ sw $t4, %lo(D_802BA280)($at) -/* 111558 802A7F48 8CAD0000 */ lw $t5, ($a1) -/* 11155C 802A7F4C 3C04802C */ lui $a0, %hi(D_802BA278) # $a0, 0x802c -/* 111560 802A7F50 2484A278 */ addiu $a0, %lo(D_802BA278) # addiu $a0, $a0, -0x5d88 -/* 111564 802A7F54 ADA00000 */ sw $zero, ($t5) -/* 111568 802A7F58 8C8E0000 */ lw $t6, ($a0) -/* 11156C 802A7F5C 8CAF0000 */ lw $t7, ($a1) -/* 111570 802A7F60 01CFC021 */ addu $t8, $t6, $t7 -/* 111574 802A7F64 0303C823 */ subu $t9, $t8, $v1 -/* 111578 802A7F68 AC990000 */ sw $t9, ($a0) -.L802A7F6C: -/* 11157C 802A7F6C 03E00008 */ jr $ra -/* 111580 802A7F70 8C820000 */ lw $v0, ($a0) - -/* 111584 802A7F74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 111588 802A7F78 AFBF0014 */ sw $ra, 0x14($sp) -/* 11158C 802A7F7C AFA5001C */ sw $a1, 0x1c($sp) -/* 111590 802A7F80 3C0E802C */ lui $t6, %hi(D_802BA27C) # $t6, 0x802c -/* 111594 802A7F84 8DCEA27C */ lw $t6, %lo(D_802BA27C)($t6) -/* 111598 802A7F88 8C8FFFFC */ lw $t7, -4($a0) -/* 11159C 802A7F8C 00001825 */ move $v1, $zero -/* 1115A0 802A7F90 55CF0008 */ bnel $t6, $t7, .L802A7FB4 -/* 1115A4 802A7F94 8FBF0014 */ lw $ra, 0x14($sp) -/* 1115A8 802A7F98 0C0A9FA9 */ jal func_802A7EA4 -/* 1115AC 802A7F9C 00000000 */ nop -/* 1115B0 802A7FA0 8FA4001C */ lw $a0, 0x1c($sp) -/* 1115B4 802A7FA4 0C0A9F85 */ jal func_802A7E14 -/* 1115B8 802A7FA8 00002825 */ move $a1, $zero -/* 1115BC 802A7FAC 00401825 */ move $v1, $v0 -/* 1115C0 802A7FB0 8FBF0014 */ lw $ra, 0x14($sp) -.L802A7FB4: -/* 1115C4 802A7FB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 1115C8 802A7FB8 00601025 */ move $v0, $v1 -/* 1115CC 802A7FBC 03E00008 */ jr $ra -/* 1115D0 802A7FC0 00000000 */ nop - -/* 1115D4 802A7FC4 3C02802C */ lui $v0, %hi(D_802BA278) # $v0, 0x802c -/* 1115D8 802A7FC8 8C42A278 */ lw $v0, %lo(D_802BA278)($v0) -/* 1115DC 802A7FCC 03E00008 */ jr $ra -/* 1115E0 802A7FD0 2442FFF8 */ addiu $v0, $v0, -8 - -/* 1115E4 802A7FD4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 1115E8 802A7FD8 3C03802C */ lui $v1, %hi(D_802B8CD0) # $v1, 0x802c -/* 1115EC 802A7FDC 24638CD0 */ addiu $v1, %lo(D_802B8CD0) # addiu $v1, $v1, -0x7330 -/* 1115F0 802A7FE0 3C0F802C */ lui $t7, %hi(D_802BA278) # $t7, 0x802c -/* 1115F4 802A7FE4 3C18802C */ lui $t8, %hi(D_802BA27C) # $t8, 0x802c -/* 1115F8 802A7FE8 3C19802C */ lui $t9, %hi(D_802BA280) # $t9, 0x802c -/* 1115FC 802A7FEC 8C6E0000 */ lw $t6, ($v1) -/* 111600 802A7FF0 8DEFA278 */ lw $t7, %lo(D_802BA278)($t7) -/* 111604 802A7FF4 8F18A27C */ lw $t8, %lo(D_802BA27C)($t8) -/* 111608 802A7FF8 8F39A280 */ lw $t9, %lo(D_802BA280)($t9) -/* 11160C 802A7FFC AFBF0014 */ sw $ra, 0x14($sp) -/* 111610 802A8000 24040010 */ li $a0, 16 -/* 111614 802A8004 00002825 */ move $a1, $zero -/* 111618 802A8008 AFAE0024 */ sw $t6, 0x24($sp) -/* 11161C 802A800C AFAF0020 */ sw $t7, 0x20($sp) -/* 111620 802A8010 AFB8001C */ sw $t8, 0x1c($sp) -/* 111624 802A8014 0C0A9F85 */ jal func_802A7E14 -/* 111628 802A8018 AFB90018 */ sw $t9, 0x18($sp) -/* 11162C 802A801C 8FA80020 */ lw $t0, 0x20($sp) -/* 111630 802A8020 3C03802C */ lui $v1, %hi(D_802B8CD0) # $v1, 0x802c -/* 111634 802A8024 24638CD0 */ addiu $v1, %lo(D_802B8CD0) # addiu $v1, $v1, -0x7330 -/* 111638 802A8028 AC620000 */ sw $v0, ($v1) -/* 11163C 802A802C AC480000 */ sw $t0, ($v0) -/* 111640 802A8030 8C6B0000 */ lw $t3, ($v1) -/* 111644 802A8034 8FAA001C */ lw $t2, 0x1c($sp) -/* 111648 802A8038 3C02802C */ lui $v0, %hi(D_802BA278) # $v0, 0x802c -/* 11164C 802A803C AD6A0004 */ sw $t2, 4($t3) -/* 111650 802A8040 8C6D0000 */ lw $t5, ($v1) -/* 111654 802A8044 8FAC0018 */ lw $t4, 0x18($sp) -/* 111658 802A8048 ADAC0008 */ sw $t4, 8($t5) -/* 11165C 802A804C 8C6F0000 */ lw $t7, ($v1) -/* 111660 802A8050 8FAE0024 */ lw $t6, 0x24($sp) -/* 111664 802A8054 ADEE000C */ sw $t6, 0xc($t7) -/* 111668 802A8058 8FBF0014 */ lw $ra, 0x14($sp) -/* 11166C 802A805C 8C42A278 */ lw $v0, %lo(D_802BA278)($v0) -/* 111670 802A8060 27BD0028 */ addiu $sp, $sp, 0x28 -/* 111674 802A8064 03E00008 */ jr $ra -/* 111678 802A8068 00000000 */ nop - -/* 11167C 802A806C 3C05802C */ lui $a1, %hi(D_802B8CD0) # $a1, 0x802c -/* 111680 802A8070 24A58CD0 */ addiu $a1, %lo(D_802B8CD0) # addiu $a1, $a1, -0x7330 -/* 111684 802A8074 8CA30000 */ lw $v1, ($a1) -/* 111688 802A8078 3C04802C */ lui $a0, %hi(D_802BA278) # $a0, 0x802c -/* 11168C 802A807C 2484A278 */ addiu $a0, %lo(D_802BA278) # addiu $a0, $a0, -0x5d88 -/* 111690 802A8080 8C6E0000 */ lw $t6, ($v1) -/* 111694 802A8084 3C01802C */ lui $at, %hi(D_802BA27C) # $at, 0x802c -/* 111698 802A8088 AC8E0000 */ sw $t6, ($a0) -/* 11169C 802A808C 8C6F0004 */ lw $t7, 4($v1) -/* 1116A0 802A8090 AC2FA27C */ sw $t7, %lo(D_802BA27C)($at) -/* 1116A4 802A8094 8C780008 */ lw $t8, 8($v1) -/* 1116A8 802A8098 3C01802C */ lui $at, %hi(D_802BA280) # $at, 0x802c -/* 1116AC 802A809C AC38A280 */ sw $t8, %lo(D_802BA280)($at) -/* 1116B0 802A80A0 8C79000C */ lw $t9, 0xc($v1) -/* 1116B4 802A80A4 8C820000 */ lw $v0, ($a0) -/* 1116B8 802A80A8 03E00008 */ jr $ra -/* 1116BC 802A80AC ACB90000 */ sw $t9, ($a1) diff --git a/asm/non_matchings/memory/func_802A80B0.s b/asm/non_matchings/memory/func_802A80B0.s deleted file mode 100644 index bb4357cf0..000000000 --- a/asm/non_matchings/memory/func_802A80B0.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_802A80B0 -/* 1116C0 802A80B0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 1116C4 802A80B4 AFA40038 */ sw $a0, 0x38($sp) -/* 1116C8 802A80B8 AFBF0024 */ sw $ra, 0x24($sp) -/* 1116CC 802A80BC 00A42023 */ subu $a0, $a1, $a0 -/* 1116D0 802A80C0 AFA4002C */ sw $a0, 0x2c($sp) -/* 1116D4 802A80C4 0C0A9F85 */ jal func_802A7E14 -/* 1116D8 802A80C8 00C02825 */ move $a1, $a2 -/* 1116DC 802A80CC 10400017 */ beqz $v0, .L802A812C -/* 1116E0 802A80D0 AFA20034 */ sw $v0, 0x34($sp) -/* 1116E4 802A80D4 00402025 */ move $a0, $v0 -/* 1116E8 802A80D8 0C0336E0 */ jal osInvalDCache -/* 1116EC 802A80DC 8FA5002C */ lw $a1, 0x2c($sp) -/* 1116F0 802A80E0 8FAF0034 */ lw $t7, 0x34($sp) -/* 1116F4 802A80E4 8FB8002C */ lw $t8, 0x2c($sp) -/* 1116F8 802A80E8 3C198015 */ lui $t9, %hi(D_8014EF58) # $t9, 0x8015 -/* 1116FC 802A80EC 2739EF58 */ addiu $t9, %lo(D_8014EF58) # addiu $t9, $t9, -0x10a8 -/* 111700 802A80F0 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 -/* 111704 802A80F4 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 -/* 111708 802A80F8 AFB90018 */ sw $t9, 0x18($sp) -/* 11170C 802A80FC 00002825 */ move $a1, $zero -/* 111710 802A8100 00003025 */ move $a2, $zero -/* 111714 802A8104 8FA70038 */ lw $a3, 0x38($sp) -/* 111718 802A8108 AFAF0010 */ sw $t7, 0x10($sp) -/* 11171C 802A810C 0C03370C */ jal osPiStartDma -/* 111720 802A8110 AFB80014 */ sw $t8, 0x14($sp) -/* 111724 802A8114 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 111728 802A8118 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 11172C 802A811C 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 111730 802A8120 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 -/* 111734 802A8124 0C0335D4 */ jal osRecvMesg -/* 111738 802A8128 24060001 */ li $a2, 1 -.L802A812C: -/* 11173C 802A812C 8FBF0024 */ lw $ra, 0x24($sp) -/* 111740 802A8130 8FA20034 */ lw $v0, 0x34($sp) -/* 111744 802A8134 27BD0038 */ addiu $sp, $sp, 0x38 -/* 111748 802A8138 03E00008 */ jr $ra -/* 11174C 802A813C 00000000 */ nop - -/* 111750 802A8140 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 111754 802A8144 AFA40020 */ sw $a0, 0x20($sp) -/* 111758 802A8148 AFA50024 */ sw $a1, 0x24($sp) -/* 11175C 802A814C 00A02025 */ move $a0, $a1 -/* 111760 802A8150 AFBF0014 */ sw $ra, 0x14($sp) -/* 111764 802A8154 AFA60028 */ sw $a2, 0x28($sp) -/* 111768 802A8158 00C02825 */ move $a1, $a2 -/* 11176C 802A815C 0C0AA02C */ jal func_802A80B0 -/* 111770 802A8160 00E03025 */ move $a2, $a3 -/* 111774 802A8164 10400005 */ beqz $v0, .L802A817C -/* 111778 802A8168 00402825 */ move $a1, $v0 -/* 11177C 802A816C 8FA40020 */ lw $a0, 0x20($sp) -/* 111780 802A8170 0C0A9EE5 */ jal set_segment_base_addr -/* 111784 802A8174 AFA2001C */ sw $v0, 0x1c($sp) -/* 111788 802A8178 8FA5001C */ lw $a1, 0x1c($sp) -.L802A817C: -/* 11178C 802A817C 8FBF0014 */ lw $ra, 0x14($sp) -/* 111790 802A8180 27BD0020 */ addiu $sp, $sp, 0x20 -/* 111794 802A8184 00A01025 */ move $v0, $a1 -/* 111798 802A8188 03E00008 */ jr $ra -/* 11179C 802A818C 00000000 */ nop diff --git a/asm/non_matchings/memory/func_802A8190.s b/asm/non_matchings/memory/func_802A8190.s deleted file mode 100644 index b72839b2b..000000000 --- a/asm/non_matchings/memory/func_802A8190.s +++ /dev/null @@ -1,94 +0,0 @@ -glabel func_802A8190 -/* 1117A0 802A8190 3C0F802C */ lui $t7, %hi(D_802B8CD4) # $t7, 0x802c -/* 1117A4 802A8194 25EF8CD4 */ addiu $t7, %lo(D_802B8CD4) # addiu $t7, $t7, -0x732c -/* 1117A8 802A8198 00047100 */ sll $t6, $a0, 4 -/* 1117AC 802A819C 01CF1021 */ addu $v0, $t6, $t7 -/* 1117B0 802A81A0 84580002 */ lh $t8, 2($v0) -/* 1117B4 802A81A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 1117B8 802A81A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 1117BC 802A81AC 00A03025 */ move $a2, $a1 -/* 1117C0 802A81B0 8C440004 */ lw $a0, 4($v0) -/* 1117C4 802A81B4 8C450008 */ lw $a1, 8($v0) -/* 1117C8 802A81B8 0C0AA02C */ jal func_802A80B0 -/* 1117CC 802A81BC AFB80018 */ sw $t8, 0x18($sp) -/* 1117D0 802A81C0 10400005 */ beqz $v0, .L802A81D8 -/* 1117D4 802A81C4 00402825 */ move $a1, $v0 -/* 1117D8 802A81C8 8FA40018 */ lw $a0, 0x18($sp) -/* 1117DC 802A81CC 0C0A9EE5 */ jal set_segment_base_addr -/* 1117E0 802A81D0 AFA20024 */ sw $v0, 0x24($sp) -/* 1117E4 802A81D4 8FA50024 */ lw $a1, 0x24($sp) -.L802A81D8: -/* 1117E8 802A81D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 1117EC 802A81DC 27BD0028 */ addiu $sp, $sp, 0x28 -/* 1117F0 802A81E0 00A01025 */ move $v0, $a1 -/* 1117F4 802A81E4 03E00008 */ jr $ra -/* 1117F8 802A81E8 00000000 */ nop - -/* 1117FC 802A81EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 111800 802A81F0 AFB1001C */ sw $s1, 0x1c($sp) -/* 111804 802A81F4 AFB20020 */ sw $s2, 0x20($sp) -/* 111808 802A81F8 AFB00018 */ sw $s0, 0x18($sp) -/* 11180C 802A81FC 3C11802C */ lui $s1, %hi(D_802B8CD4) # $s1, 0x802c -/* 111810 802A8200 AFBF0024 */ sw $ra, 0x24($sp) -/* 111814 802A8204 26318CD4 */ addiu $s1, %lo(D_802B8CD4) # addiu $s1, $s1, -0x732c -/* 111818 802A8208 00008025 */ move $s0, $zero -/* 11181C 802A820C 24120003 */ li $s2, 3 -.L802A8210: -/* 111820 802A8210 862E0000 */ lh $t6, ($s1) -/* 111824 802A8214 02002025 */ move $a0, $s0 -/* 111828 802A8218 31CF0001 */ andi $t7, $t6, 1 -/* 11182C 802A821C 51E00004 */ beql $t7, $zero, .L802A8230 -/* 111830 802A8220 26100001 */ addiu $s0, $s0, 1 -/* 111834 802A8224 0C0AA064 */ jal func_802A8190 -/* 111838 802A8228 00002825 */ move $a1, $zero -/* 11183C 802A822C 26100001 */ addiu $s0, $s0, 1 -.L802A8230: -/* 111840 802A8230 1612FFF7 */ bne $s0, $s2, .L802A8210 -/* 111844 802A8234 26310010 */ addiu $s1, $s1, 0x10 -/* 111848 802A8238 8FBF0024 */ lw $ra, 0x24($sp) -/* 11184C 802A823C 8FB00018 */ lw $s0, 0x18($sp) -/* 111850 802A8240 8FB1001C */ lw $s1, 0x1c($sp) -/* 111854 802A8244 8FB20020 */ lw $s2, 0x20($sp) -/* 111858 802A8248 03E00008 */ jr $ra -/* 11185C 802A824C 27BD0028 */ addiu $sp, $sp, 0x28 - -/* 111860 802A8250 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 111864 802A8254 24860003 */ addiu $a2, $a0, 3 -/* 111868 802A8258 2401FFFC */ li $at, -4 -/* 11186C 802A825C AFBF0014 */ sw $ra, 0x14($sp) -/* 111870 802A8260 00C17024 */ and $t6, $a2, $at -/* 111874 802A8264 25C40010 */ addiu $a0, $t6, 0x10 -/* 111878 802A8268 AFAE0020 */ sw $t6, 0x20($sp) -/* 11187C 802A826C 0C0A9F85 */ jal func_802A7E14 -/* 111880 802A8270 AFA00018 */ sw $zero, 0x18($sp) -/* 111884 802A8274 8FA60020 */ lw $a2, 0x20($sp) -/* 111888 802A8278 10400007 */ beqz $v0, .L802A8298 -/* 11188C 802A827C 8FA70018 */ lw $a3, 0x18($sp) -/* 111890 802A8280 24430010 */ addiu $v1, $v0, 0x10 -/* 111894 802A8284 00403825 */ move $a3, $v0 -/* 111898 802A8288 AC460000 */ sw $a2, ($v0) -/* 11189C 802A828C AC430004 */ sw $v1, 4($v0) -/* 1118A0 802A8290 AC400008 */ sw $zero, 8($v0) -/* 1118A4 802A8294 AC43000C */ sw $v1, 0xc($v0) -.L802A8298: -/* 1118A8 802A8298 8FBF0014 */ lw $ra, 0x14($sp) -/* 1118AC 802A829C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 1118B0 802A82A0 00E01025 */ move $v0, $a3 -/* 1118B4 802A82A4 03E00008 */ jr $ra -/* 1118B8 802A82A8 00000000 */ nop - -/* 1118BC 802A82AC 3C058015 */ lui $a1, %hi(D_801502A0) # $a1, 0x8015 -/* 1118C0 802A82B0 24A502A0 */ addiu $a1, %lo(D_801502A0) # addiu $a1, $a1, 0x2a0 -/* 1118C4 802A82B4 8CAE0000 */ lw $t6, ($a1) -/* 1118C8 802A82B8 3C0F8015 */ lui $t7, %hi(gDisplayListHead) # $t7, 0x8015 -/* 1118CC 802A82BC 8DEF0298 */ lw $t7, %lo(gDisplayListHead)($t7) -/* 1118D0 802A82C0 01C41023 */ subu $v0, $t6, $a0 -/* 1118D4 802A82C4 00001825 */ move $v1, $zero -/* 1118D8 802A82C8 004F082B */ sltu $at, $v0, $t7 -/* 1118DC 802A82CC 14200003 */ bnez $at, .L802A82DC -/* 1118E0 802A82D0 00000000 */ nop -/* 1118E4 802A82D4 ACA20000 */ sw $v0, ($a1) -/* 1118E8 802A82D8 00401825 */ move $v1, $v0 -.L802A82DC: -/* 1118EC 802A82DC 03E00008 */ jr $ra -/* 1118F0 802A82E0 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/memory/func_802A82E4.s b/asm/non_matchings/memory/func_802A82E4.s deleted file mode 100644 index e6b8be8a4..000000000 --- a/asm/non_matchings/memory/func_802A82E4.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel func_802A82E4 -/* 1118F4 802A82E4 00A03825 */ move $a3, $a1 -/* 1118F8 802A82E8 00802825 */ move $a1, $a0 -/* 1118FC 802A82EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 111900 802A82F0 AFA40028 */ sw $a0, 0x28($sp) -/* 111904 802A82F4 3C048016 */ lui $a0, %hi(gPrevLoadedAddress) # $a0, 0x8016 -/* 111908 802A82F8 00E53023 */ subu $a2, $a3, $a1 -/* 11190C 802A82FC 8C84F728 */ lw $a0, %lo(gPrevLoadedAddress)($a0) -/* 111910 802A8300 24C6000F */ addiu $a2, $a2, 0xf -/* 111914 802A8304 2401FFF0 */ li $at, -16 -/* 111918 802A8308 AFBF0014 */ sw $ra, 0x14($sp) -/* 11191C 802A830C 00C17024 */ and $t6, $a2, $at -/* 111920 802A8310 01C03025 */ move $a2, $t6 -/* 111924 802A8314 AFAE001C */ sw $t6, 0x1c($sp) -/* 111928 802A8318 0C000456 */ jal dma_copy -/* 11192C 802A831C AFA40024 */ sw $a0, 0x24($sp) -/* 111930 802A8320 3C0F8016 */ lui $t7, %hi(gPrevLoadedAddress) # $t7, 0x8016 -/* 111934 802A8324 8FA6001C */ lw $a2, 0x1c($sp) -/* 111938 802A8328 8DEFF728 */ lw $t7, %lo(gPrevLoadedAddress)($t7) -/* 11193C 802A832C 8FBF0014 */ lw $ra, 0x14($sp) -/* 111940 802A8330 8FA20024 */ lw $v0, 0x24($sp) -/* 111944 802A8334 3C018016 */ lui $at, %hi(gPrevLoadedAddress) # $at, 0x8016 -/* 111948 802A8338 01E6C021 */ addu $t8, $t7, $a2 -/* 11194C 802A833C AC38F728 */ sw $t8, %lo(gPrevLoadedAddress)($at) -/* 111950 802A8340 03E00008 */ jr $ra -/* 111954 802A8344 27BD0028 */ addiu $sp, $sp, 0x28 - -/* 111958 802A8348 00A60019 */ multu $a1, $a2 -/* 11195C 802A834C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 111960 802A8350 AFB00028 */ sw $s0, 0x28($sp) -/* 111964 802A8354 3C028016 */ lui $v0, %hi(gPrevLoadedAddress) # $v0, 0x8016 -/* 111968 802A8358 8C42F728 */ lw $v0, %lo(gPrevLoadedAddress)($v0) -/* 11196C 802A835C 2401FFF0 */ li $at, -16 -/* 111970 802A8360 AFA40040 */ sw $a0, 0x40($sp) -/* 111974 802A8364 AFBF002C */ sw $ra, 0x2c($sp) -/* 111978 802A8368 AFA20034 */ sw $v0, 0x34($sp) -/* 11197C 802A836C 00008012 */ mflo $s0 -/* 111980 802A8370 2610000F */ addiu $s0, $s0, 0xf -/* 111984 802A8374 02012824 */ and $a1, $s0, $at -/* 111988 802A8378 00452021 */ addu $a0, $v0, $a1 -/* 11198C 802A837C 00A08025 */ move $s0, $a1 -/* 111990 802A8380 0C0336E0 */ jal osInvalDCache -/* 111994 802A8384 AFA40030 */ sw $a0, 0x30($sp) -/* 111998 802A8388 8FAF0040 */ lw $t7, 0x40($sp) -/* 11199C 802A838C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* 1119A0 802A8390 8FA80030 */ lw $t0, 0x30($sp) -/* 1119A4 802A8394 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 1119A8 802A8398 3C190064 */ lui $t9, %hi(_other_texturesSegmentRomStart) # $t9, 0x64 -/* 1119AC 802A839C 3C098015 */ lui $t1, %hi(D_8014EF58) # $t1, 0x8015 -/* 1119B0 802A83A0 2529EF58 */ addiu $t1, %lo(D_8014EF58) # addiu $t1, $t1, -0x10a8 -/* 1119B4 802A83A4 27391F70 */ addiu $t9, %lo(_other_texturesSegmentRomStart) # addiu $t9, $t9, 0x1f70 -/* 1119B8 802A83A8 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 -/* 1119BC 802A83AC 01E1C024 */ and $t8, $t7, $at -/* 1119C0 802A83B0 03193821 */ addu $a3, $t8, $t9 -/* 1119C4 802A83B4 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 -/* 1119C8 802A83B8 AFA90018 */ sw $t1, 0x18($sp) -/* 1119CC 802A83BC 00002825 */ move $a1, $zero -/* 1119D0 802A83C0 00003025 */ move $a2, $zero -/* 1119D4 802A83C4 AFB00014 */ sw $s0, 0x14($sp) -/* 1119D8 802A83C8 0C03370C */ jal osPiStartDma -/* 1119DC 802A83CC AFA80010 */ sw $t0, 0x10($sp) -/* 1119E0 802A83D0 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 1119E4 802A83D4 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 1119E8 802A83D8 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 1119EC 802A83DC 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 -/* 1119F0 802A83E0 0C0335D4 */ jal osRecvMesg -/* 1119F4 802A83E4 24060001 */ li $a2, 1 -/* 1119F8 802A83E8 8FA40030 */ lw $a0, 0x30($sp) -/* 1119FC 802A83EC 0C01000C */ jal func_80040030 -/* 111A00 802A83F0 8FA50034 */ lw $a1, 0x34($sp) -/* 111A04 802A83F4 3C0A8016 */ lui $t2, %hi(gPrevLoadedAddress) # $t2, 0x8016 -/* 111A08 802A83F8 8D4AF728 */ lw $t2, %lo(gPrevLoadedAddress)($t2) -/* 111A0C 802A83FC 8FBF002C */ lw $ra, 0x2c($sp) -/* 111A10 802A8400 3C018016 */ lui $at, %hi(gPrevLoadedAddress) # $at, 0x8016 -/* 111A14 802A8404 01505821 */ addu $t3, $t2, $s0 -/* 111A18 802A8408 8FB00028 */ lw $s0, 0x28($sp) -/* 111A1C 802A840C 8FA20034 */ lw $v0, 0x34($sp) -/* 111A20 802A8410 AC2BF728 */ sw $t3, %lo(gPrevLoadedAddress)($at) -/* 111A24 802A8414 03E00008 */ jr $ra -/* 111A28 802A8418 27BD0040 */ addiu $sp, $sp, 0x40 - -/* 111A2C 802A841C 3C028016 */ lui $v0, %hi(gPrevLoadedAddress) # $v0, 0x8016 -/* 111A30 802A8420 8C42F728 */ lw $v0, %lo(gPrevLoadedAddress)($v0) -/* 111A34 802A8424 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 111A38 802A8428 AFA40030 */ sw $a0, 0x30($sp) -/* 111A3C 802A842C 2403FFF0 */ li $v1, -16 -/* 111A40 802A8430 24AE000F */ addiu $t6, $a1, 0xf -/* 111A44 802A8434 24CF000F */ addiu $t7, $a2, 0xf -/* 111A48 802A8438 00462021 */ addu $a0, $v0, $a2 -/* 111A4C 802A843C AFBF0024 */ sw $ra, 0x24($sp) -/* 111A50 802A8440 01C32824 */ and $a1, $t6, $v1 -/* 111A54 802A8444 01E33024 */ and $a2, $t7, $v1 -/* 111A58 802A8448 AFA60038 */ sw $a2, 0x38($sp) -/* 111A5C 802A844C AFA50034 */ sw $a1, 0x34($sp) -/* 111A60 802A8450 AFA40028 */ sw $a0, 0x28($sp) -/* 111A64 802A8454 0C0336E0 */ jal osInvalDCache -/* 111A68 802A8458 AFA2002C */ sw $v0, 0x2c($sp) -/* 111A6C 802A845C 8FB80030 */ lw $t8, 0x30($sp) -/* 111A70 802A8460 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* 111A74 802A8464 8FA90028 */ lw $t1, 0x28($sp) -/* 111A78 802A8468 8FAA0034 */ lw $t2, 0x34($sp) -/* 111A7C 802A846C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 111A80 802A8470 3C080064 */ lui $t0, %hi(_other_texturesSegmentRomStart) # $t0, 0x64 -/* 111A84 802A8474 3C0B8015 */ lui $t3, %hi(D_8014EF58) # $t3, 0x8015 -/* 111A88 802A8478 256BEF58 */ addiu $t3, %lo(D_8014EF58) # addiu $t3, $t3, -0x10a8 -/* 111A8C 802A847C 25081F70 */ addiu $t0, %lo(_other_texturesSegmentRomStart) # addiu $t0, $t0, 0x1f70 -/* 111A90 802A8480 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 -/* 111A94 802A8484 0301C824 */ and $t9, $t8, $at -/* 111A98 802A8488 03283821 */ addu $a3, $t9, $t0 -/* 111A9C 802A848C 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 -/* 111AA0 802A8490 AFAB0018 */ sw $t3, 0x18($sp) -/* 111AA4 802A8494 00002825 */ move $a1, $zero -/* 111AA8 802A8498 00003025 */ move $a2, $zero -/* 111AAC 802A849C AFA90010 */ sw $t1, 0x10($sp) -/* 111AB0 802A84A0 0C03370C */ jal osPiStartDma -/* 111AB4 802A84A4 AFAA0014 */ sw $t2, 0x14($sp) -/* 111AB8 802A84A8 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 111ABC 802A84AC 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 111AC0 802A84B0 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 111AC4 802A84B4 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 -/* 111AC8 802A84B8 0C0335D4 */ jal osRecvMesg -/* 111ACC 802A84BC 24060001 */ li $a2, 1 -/* 111AD0 802A84C0 8FA40028 */ lw $a0, 0x28($sp) -/* 111AD4 802A84C4 0C01000C */ jal func_80040030 -/* 111AD8 802A84C8 8FA5002C */ lw $a1, 0x2c($sp) -/* 111ADC 802A84CC 3C038016 */ lui $v1, %hi(gPrevLoadedAddress) # $v1, 0x8016 -/* 111AE0 802A84D0 2463F728 */ addiu $v1, %lo(gPrevLoadedAddress) # addiu $v1, $v1, -0x8d8 -/* 111AE4 802A84D4 8C6C0000 */ lw $t4, ($v1) -/* 111AE8 802A84D8 8FAD0038 */ lw $t5, 0x38($sp) -/* 111AEC 802A84DC 8FBF0024 */ lw $ra, 0x24($sp) -/* 111AF0 802A84E0 8FA2002C */ lw $v0, 0x2c($sp) -/* 111AF4 802A84E4 018D7021 */ addu $t6, $t4, $t5 -/* 111AF8 802A84E8 AC6E0000 */ sw $t6, ($v1) -/* 111AFC 802A84EC 03E00008 */ jr $ra -/* 111B00 802A84F0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/memory/func_802A84F4.s b/asm/non_matchings/memory/func_802A84F4.s deleted file mode 100644 index 7a1ab8c9f..000000000 --- a/asm/non_matchings/memory/func_802A84F4.s +++ /dev/null @@ -1,55 +0,0 @@ -glabel func_802A84F4 -/* 111B04 802A84F4 3C028016 */ lui $v0, %hi(gPrevLoadedAddress) # $v0, 0x8016 -/* 111B08 802A84F8 8C42F728 */ lw $v0, %lo(gPrevLoadedAddress)($v0) -/* 111B0C 802A84FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 111B10 802A8500 AFA40030 */ sw $a0, 0x30($sp) -/* 111B14 802A8504 2403FFF0 */ li $v1, -16 -/* 111B18 802A8508 24AE000F */ addiu $t6, $a1, 0xf -/* 111B1C 802A850C 24CF000F */ addiu $t7, $a2, 0xf -/* 111B20 802A8510 00462021 */ addu $a0, $v0, $a2 -/* 111B24 802A8514 AFBF0024 */ sw $ra, 0x24($sp) -/* 111B28 802A8518 01C32824 */ and $a1, $t6, $v1 -/* 111B2C 802A851C 01E33024 */ and $a2, $t7, $v1 -/* 111B30 802A8520 AFA60038 */ sw $a2, 0x38($sp) -/* 111B34 802A8524 AFA50034 */ sw $a1, 0x34($sp) -/* 111B38 802A8528 AFA40028 */ sw $a0, 0x28($sp) -/* 111B3C 802A852C 0C0336E0 */ jal osInvalDCache -/* 111B40 802A8530 AFA2002C */ sw $v0, 0x2c($sp) -/* 111B44 802A8534 8FB80030 */ lw $t8, 0x30($sp) -/* 111B48 802A8538 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* 111B4C 802A853C 8FA90028 */ lw $t1, 0x28($sp) -/* 111B50 802A8540 8FAA0034 */ lw $t2, 0x34($sp) -/* 111B54 802A8544 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 111B58 802A8548 3C080064 */ lui $t0, %hi(_other_texturesSegmentRomStart) # $t0, 0x64 -/* 111B5C 802A854C 3C0B8015 */ lui $t3, %hi(D_8014EF58) # $t3, 0x8015 -/* 111B60 802A8550 256BEF58 */ addiu $t3, %lo(D_8014EF58) # addiu $t3, $t3, -0x10a8 -/* 111B64 802A8554 25081F70 */ addiu $t0, %lo(_other_texturesSegmentRomStart) # addiu $t0, $t0, 0x1f70 -/* 111B68 802A8558 3C048015 */ lui $a0, %hi(D_8014F0A0) # $a0, 0x8015 -/* 111B6C 802A855C 0301C824 */ and $t9, $t8, $at -/* 111B70 802A8560 03283821 */ addu $a3, $t9, $t0 -/* 111B74 802A8564 2484F0A0 */ addiu $a0, %lo(D_8014F0A0) # addiu $a0, $a0, -0xf60 -/* 111B78 802A8568 AFAB0018 */ sw $t3, 0x18($sp) -/* 111B7C 802A856C 00002825 */ move $a1, $zero -/* 111B80 802A8570 00003025 */ move $a2, $zero -/* 111B84 802A8574 AFA90010 */ sw $t1, 0x10($sp) -/* 111B88 802A8578 0C03370C */ jal osPiStartDma -/* 111B8C 802A857C AFAA0014 */ sw $t2, 0x14($sp) -/* 111B90 802A8580 3C048015 */ lui $a0, %hi(D_8014EF58) # $a0, 0x8015 -/* 111B94 802A8584 3C058015 */ lui $a1, %hi(D_8014F098) # $a1, 0x8015 -/* 111B98 802A8588 24A5F098 */ addiu $a1, %lo(D_8014F098) # addiu $a1, $a1, -0xf68 -/* 111B9C 802A858C 2484EF58 */ addiu $a0, %lo(D_8014EF58) # addiu $a0, $a0, -0x10a8 -/* 111BA0 802A8590 0C0335D4 */ jal osRecvMesg -/* 111BA4 802A8594 24060001 */ li $a2, 1 -/* 111BA8 802A8598 8FA40028 */ lw $a0, 0x28($sp) -/* 111BAC 802A859C 0C010034 */ jal mio0decode -/* 111BB0 802A85A0 8FA5002C */ lw $a1, 0x2c($sp) -/* 111BB4 802A85A4 3C038016 */ lui $v1, %hi(gPrevLoadedAddress) # $v1, 0x8016 -/* 111BB8 802A85A8 2463F728 */ addiu $v1, %lo(gPrevLoadedAddress) # addiu $v1, $v1, -0x8d8 -/* 111BBC 802A85AC 8C6C0000 */ lw $t4, ($v1) -/* 111BC0 802A85B0 8FAD0038 */ lw $t5, 0x38($sp) -/* 111BC4 802A85B4 8FBF0024 */ lw $ra, 0x24($sp) -/* 111BC8 802A85B8 8FA2002C */ lw $v0, 0x2c($sp) -/* 111BCC 802A85BC 018D7021 */ addu $t6, $t4, $t5 -/* 111BD0 802A85C0 AC6E0000 */ sw $t6, ($v1) -/* 111BD4 802A85C4 03E00008 */ jr $ra -/* 111BD8 802A85C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/data/data_0DD0A0.s b/data/data_0DD0A0.s index cac29e4c3..b4ad8e181 100644 --- a/data/data_0DD0A0.s +++ b/data/data_0DD0A0.s @@ -49,92 +49,3 @@ glabel D_800DC5D8 glabel D_800DC5DC .word 0x00000040 - -glabel D_800DC5E0 -.word 0x00000020 - -glabel D_800DC5E4 -.hword 0x0000, 0x0000 - -glabel D_800DC5E8 # TODO: D_800DC5E8 accessed as word, D_800DC5EB as u8 -.byte 0x00 -glabel D_800DC5E9 -.byte 0x00 -glabel D_800DC5EA -.byte 0x00 -glabel D_800DC5EB -.byte 0x00 - -glabel D_800DC5EC -.word D_8015F480 - -glabel D_800DC5F0 -.word D_8015F4C0 - -glabel D_800DC5F4 -.word D_8015F500 - -glabel D_800DC5F8 -.word D_8015F540 - -glabel D_800DC5FC -.hword 0x0000, 0x0000 - -glabel D_800DC600 -.word osAppNmiBuffer - -glabel gIsMirrorMode -.word 0x00000000 - -glabel D_800DC608 -.float 1.0 -.word 0x00000000 - -glabel D_800DC610 -.word 0xafafaf00, 0xafafaf00, 0xffffff00, 0xffffff00 -.word 0x00007800, 0x00000000 - -glabel D_800DC628 -.word 0x73737300, 0x73737300 - -glabel D_800DC630 -.word 0xffffff00, 0xffffff00, 0x00007800, 0x00000000 -.word 0x80000000 - -glabel D_800DC644 -.hword 0x0008, 0x0000 - -glabel D_800DC648 -.hword 0x0001, 0x0000 - -glabel D_800DC64C -.word 0x00000000, 0x00000000, 0x00000000 - -glabel D_800DC658 -.word 0x00000000, 0x00000000 - -glabel gEnableResourceMeters -.word 0x00000000 - -glabel D_800DC664 -.hword 0x0000, 0x0000 - -glabel D_800DC668 -.hword 0x0001, 0x0000 - -glabel D_800DC66C -.hword 0x0000, 0x0000 - -#glabel D_800DC670 -#.word 0x00000000 - -#glabel crashScreenFont -#.byte 0x1c, 0x22, 0x26, 0x2a, 0x32, 0x22, 0x1c, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1c, 0x00 -#.byte 0x3c, 0x02, 0x02, 0x1c, 0x20, 0x20, 0x3e, 0x00, 0x3c, 0x02, 0x02, 0x1c, 0x02, 0x02, 0x3c, 0x00 -#.byte 0x24, 0x24, 0x24, 0x3e, 0x04, 0x04, 0x04, 0x00, 0x3e, 0x20, 0x20, 0x3c, 0x02, 0x02, 0x3c, 0x00 -#.byte 0x1c, 0x20, 0x20, 0x3c, 0x22, 0x22, 0x1c, 0x00, 0x3e, 0x22, 0x02, 0x04, 0x04, 0x08, 0x08, 0x00 -#.byte 0x1c, 0x22, 0x22, 0x1c, 0x22, 0x22, 0x1c, 0x00, 0x1c, 0x22, 0x22, 0x1c, 0x04, 0x04, 0x04, 0x00 -#.byte 0x1c, 0x22, 0x22, 0x3e, 0x22, 0x22, 0x22, 0x00, 0x3c, 0x22, 0x22, 0x3c, 0x22, 0x22, 0x3c, 0x00 -#.byte 0x0e, 0x10, 0x20, 0x20, 0x20, 0x10, 0x0e, 0x00, 0x38, 0x24, 0x22, 0x22, 0x22, 0x24, 0x38, 0x00 -#.byte 0x3e, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x3e, 0x00, 0x3e, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x20, 0x00 -#.byte 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00 diff --git a/data/data_0DD0A0_0.s b/data/data_0DD0A0_0.s new file mode 100644 index 000000000..db8ea1546 --- /dev/null +++ b/data/data_0DD0A0_0.s @@ -0,0 +1,65 @@ +# Mario Kart 64 (U) disassembly and split file +# generated by n64split v0.4a - N64 ROM splitter + +.include "macros.inc" + +.section .data + +glabel D_800DC600 +.word osAppNmiBuffer + +glabel gIsMirrorMode +.word 0x00000000 + +glabel D_800DC608 +.float 1.0 +.word 0x00000000 + +glabel D_800DC610 +.word 0xafafaf00, 0xafafaf00, 0xffffff00, 0xffffff00 +.word 0x00007800, 0x00000000 + +glabel D_800DC628 +.word 0x73737300, 0x73737300 + +glabel D_800DC630 +.word 0xffffff00, 0xffffff00, 0x00007800, 0x00000000 +.word 0x80000000 + +glabel D_800DC644 +.hword 0x0008, 0x0000 + +glabel D_800DC648 +.hword 0x0001, 0x0000 + +glabel D_800DC64C +.word 0x00000000, 0x00000000, 0x00000000 + +glabel D_800DC658 +.word 0x00000000, 0x00000000 + +glabel gEnableResourceMeters +.word 0x00000000 + +glabel D_800DC664 +.hword 0x0000, 0x0000 + +glabel D_800DC668 +.hword 0x0001, 0x0000 + +glabel D_800DC66C +.hword 0x0000, 0x0000 + +#glabel D_800DC670 +#.word 0x00000000 + +#glabel crashScreenFont +#.byte 0x1c, 0x22, 0x26, 0x2a, 0x32, 0x22, 0x1c, 0x00, 0x18, 0x08, 0x08, 0x08, 0x08, 0x08, 0x1c, 0x00 +#.byte 0x3c, 0x02, 0x02, 0x1c, 0x20, 0x20, 0x3e, 0x00, 0x3c, 0x02, 0x02, 0x1c, 0x02, 0x02, 0x3c, 0x00 +#.byte 0x24, 0x24, 0x24, 0x3e, 0x04, 0x04, 0x04, 0x00, 0x3e, 0x20, 0x20, 0x3c, 0x02, 0x02, 0x3c, 0x00 +#.byte 0x1c, 0x20, 0x20, 0x3c, 0x22, 0x22, 0x1c, 0x00, 0x3e, 0x22, 0x02, 0x04, 0x04, 0x08, 0x08, 0x00 +#.byte 0x1c, 0x22, 0x22, 0x1c, 0x22, 0x22, 0x1c, 0x00, 0x1c, 0x22, 0x22, 0x1c, 0x04, 0x04, 0x04, 0x00 +#.byte 0x1c, 0x22, 0x22, 0x3e, 0x22, 0x22, 0x22, 0x00, 0x3c, 0x22, 0x22, 0x3c, 0x22, 0x22, 0x3c, 0x00 +#.byte 0x0e, 0x10, 0x20, 0x20, 0x20, 0x10, 0x0e, 0x00, 0x38, 0x24, 0x22, 0x22, 0x22, 0x24, 0x38, 0x00 +#.byte 0x3e, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x3e, 0x00, 0x3e, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x20, 0x00 +#.byte 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00 diff --git a/data/data_0DD0A0_1.s b/data/data_0DD0A0_1.s index 0ce73d009..70ce57fab 100644 --- a/data/data_0DD0A0_1.s +++ b/data/data_0DD0A0_1.s @@ -309,1636 +309,14 @@ glabel D_800DDB24 glabel D_800DDB30 .float 0.4, 0.6, 0.275, 0.3 -glabel D_800DDB40 # p1 camera struct pointer -.word D_801646F0 +#glabel camera1 # p1 camera struct pointer +#.word cameras -glabel D_800DDB44 # p2 camera struct pointer -.word D_801647A8 +#glabel camera2 # p2 camera struct pointer +#.word D_801647A8 -glabel D_800DDB48 # p3 camera struct pointer -.word D_80164860 +#glabel camera3 # p3 camera struct pointer +#.word D_80164860 -glabel D_800DDB4C # p4 camera struct pointer -.word D_80164918 - -glabel D_800DDB50 -.byte 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02 - -glabel D_800DDB58 -.word 0x00000000, gFramebuffer0, gFramebuffer1, gFramebuffer2 - -glabel D_800DDB68 -.word D_800ED600, D_800ED608, D_800ED610, D_800ED618 -.word D_800ED620, D_800ED628, D_800ED630, D_800ED638 - -glabel D_800DDB88 -.word D_800ED640, D_800ED648, D_800ED650, D_800ED658 -.word D_800ED660, D_800ED668, D_800ED670, D_800ED678 -.word 0x00000000, 0x00000000, 0x00000000 - -glabel D_800DDBB4 -.word D_800E49C0, D_800E4AC0, D_800E4BC0, D_800E4CC0 -.word D_800E4DC0, D_800E4EC0, D_800E4FD0, D_800E50D0 - -glabel D_800DDBD4 -.float 0.75, 0.75, 0.75, 0.75 -.float 0.75, 0.75, 0.75, 0.75 - -glabel gKartMarioWheels0 -.word gKartMario168Wheel0, gKartMario147Wheel0, gKartMario126Wheel0, gKartMario105Wheel0 -.word gKartMario084Wheel0, gKartMario063Wheel0, gKartMario042Wheel0, gKartMario021Wheel0 -.word gKartMario000Wheel0 - -glabel gKartMarioWheels1 -.word gKartMario269Wheel0, gKartMario269Wheel0, gKartMario249Wheel0, gKartMario229Wheel0 -.word gKartMario229Wheel0, gKartMario229Wheel0, gKartMario209Wheel0, gKartMario189Wheel0 -.word gKartMario189Wheel0 - -glabel gKartLuigiWheels0 -.word gKartLuigi168Wheel0, gKartLuigi147Wheel0, gKartLuigi126Wheel0, gKartLuigi105Wheel0 -.word gKartLuigi084Wheel0, gKartLuigi063Wheel0, gKartLuigi042Wheel0, gKartLuigi021Wheel0 -.word gKartLuigi000Wheel0 - -glabel gKartLuigiWheels1 -.word gKartLuigi269Wheel0, gKartLuigi269Wheel0, gKartLuigi249Wheel0, gKartLuigi229Wheel0 -.word gKartLuigi229Wheel0, gKartLuigi229Wheel0, gKartLuigi209Wheel0, gKartLuigi189Wheel0 -.word gKartLuigi189Wheel0 - -glabel gKartBowserWheels0 -.word gKartBowser168Wheel0, gKartBowser147Wheel0, gKartBowser126Wheel0, gKartBowser105Wheel0 -.word gKartBowser084Wheel0, gKartBowser063Wheel0, gKartBowser042Wheel0, gKartBowser021Wheel0 -.word gKartBowser000Wheel0 - -glabel gKartBowserWheels1 -.word gKartBowser269Wheel0, gKartBowser269Wheel0, gKartBowser249Wheel0, gKartBowser229Wheel0 -.word gKartBowser229Wheel0, gKartBowser229Wheel0, gKartBowser209Wheel0, gKartBowser189Wheel0 -.word gKartBowser189Wheel0 - -glabel gKartToadWheels0 -.word gKartToad168Wheel0, gKartToad147Wheel0, gKartToad126Wheel0, gKartToad105Wheel0 -.word gKartToad084Wheel0, gKartToad063Wheel0, gKartToad042Wheel0, gKartToad021Wheel0 -.word gKartToad000Wheel0 - -glabel gKartToadWheels1 -.word gKartToad269Wheel0, gKartToad269Wheel0, gKartToad249Wheel0, gKartToad229Wheel0 -.word gKartToad229Wheel0, gKartToad229Wheel0, gKartToad209Wheel0, gKartToad189Wheel0 -.word gKartToad189Wheel0 - -glabel gKartYoshiWheels0 -.word gKartYoshi168Wheel0, gKartYoshi147Wheel0, gKartYoshi126Wheel0, gKartYoshi105Wheel0 -.word gKartYoshi084Wheel0, gKartYoshi063Wheel0, gKartYoshi042Wheel0, gKartYoshi021Wheel0 -.word gKartYoshi000Wheel0 - -glabel gKartYoshiWheels1 -.word gKartYoshi269Wheel0, gKartYoshi269Wheel0, gKartYoshi249Wheel0, gKartYoshi229Wheel0 -.word gKartYoshi229Wheel0, gKartYoshi229Wheel0, gKartYoshi209Wheel0, gKartYoshi189Wheel0 -.word gKartYoshi189Wheel0 - -glabel gKartDKWheels0 -.word gKartDK168Wheel0, gKartDK147Wheel0, gKartDK126Wheel0, gKartDK105Wheel0 -.word gKartDK084Wheel0, gKartDK063Wheel0, gKartDK042Wheel0, gKartDK021Wheel0 -.word gKartDK000Wheel0 - -glabel gKartDKWheels1 -.word gKartDK269Wheel0, gKartDK269Wheel0, gKartDK249Wheel0, gKartDK229Wheel0 -.word gKartDK229Wheel0, gKartDK229Wheel0, gKartDK209Wheel0, gKartDK189Wheel0 -.word gKartDK189Wheel0 - -glabel gKartPeachWheels0 -.word gKartPeach168Wheel0, gKartPeach147Wheel0, gKartPeach126Wheel0, gKartPeach105Wheel0 -.word gKartPeach084Wheel0, gKartPeach063Wheel0, gKartPeach042Wheel0, gKartPeach021Wheel0 -.word gKartPeach000Wheel0 - -glabel gKartPeachWheels1 -.word gKartPeach269Wheel0, gKartPeach269Wheel0, gKartPeach249Wheel0, gKartPeach229Wheel0 -.word gKartPeach229Wheel0, gKartPeach229Wheel0, gKartPeach209Wheel0, gKartPeach189Wheel0 -.word gKartPeach189Wheel0 - -glabel gKartWarioWheels0 -.word gKartWario168Wheel0, gKartWario147Wheel0, gKartWario126Wheel0, gKartWario105Wheel0 -.word gKartWario084Wheel0, gKartWario063Wheel0, gKartWario042Wheel0, gKartWario021Wheel0 -.word gKartWario000Wheel0 - -glabel gKartWarioWheels1 -.word gKartWario269Wheel0, gKartWario269Wheel0, gKartWario249Wheel0, gKartWario229Wheel0 -.word gKartWario229Wheel0, gKartWario229Wheel0, gKartWario209Wheel0, gKartWario189Wheel0 -.word gKartWario189Wheel0 - -glabel D_800DDE34 -.word gKartMarioWheels0, gKartLuigiWheels0, gKartYoshiWheels0, gKartToadWheels0 -.word gKartDKWheels0, gKartWarioWheels0, gKartPeachWheels0, gKartBowserWheels0 - -glabel D_800DDE54 -.word gKartMarioWheels1, gKartLuigiWheels1, gKartYoshiWheels1, gKartToadWheels1 -.word gKartDKWheels1, gKartWarioWheels1, gKartPeachWheels1, gKartBowserWheels1 - -glabel D_800DDE74 -.word 0x00000060, 0x00000080, 0x000000c0, 0x00000100 -.word 0x00000120, 0x00000180, 0x00000200, 0x00000220 - -glabel D_800DDE94 -.word 0x00000240, 0x00000000 - -glabel D_800DDE9C -.word 0x41100000, 0x40e00000, 0x40a00000 - -.word 0x00000000, 0x00000000 - -glabel D_800DDEB0 -.hword 0x06c0, 0x06e0, 0x06e0, 0x0680, 0x07c0, 0x0700, 0x0680, 0x0910 - -glabel gKartMarioGroup0 -.word gKartMario000, gKartMario001, gKartMario002, gKartMario003 -.word gKartMario004, gKartMario005, gKartMario006, gKartMario007 -.word gKartMario008, gKartMario009, gKartMario010, gKartMario011 -.word gKartMario012, gKartMario013, gKartMario014, gKartMario015 -.word gKartMario016, gKartMario017, gKartMario018, gKartMario019 -.word gKartMario020, gKartMario195, gKartMario196, gKartMario197 -.word gKartMario198, gKartMario199, gKartMario200, gKartMario201 -.word gKartMario202, gKartMario203, gKartMario204, gKartMario205 -.word gKartMario206, gKartMario207, gKartMario208 - -glabel gKartMarioGroup1 -.word gKartMario021, gKartMario022, gKartMario023, gKartMario024 -.word gKartMario025, gKartMario026, gKartMario027, gKartMario028 -.word gKartMario029, gKartMario030, gKartMario031, gKartMario032 -.word gKartMario033, gKartMario034, gKartMario035, gKartMario036 -.word gKartMario037, gKartMario038, gKartMario039, gKartMario040 -.word gKartMario041, gKartMario195, gKartMario196, gKartMario197 -.word gKartMario198, gKartMario199, gKartMario200, gKartMario201 -.word gKartMario202, gKartMario203, gKartMario204, gKartMario205 -.word gKartMario206, gKartMario207, gKartMario208 - -glabel gKartMarioGroup2 -.word gKartMario042, gKartMario043, gKartMario044, gKartMario045 -.word gKartMario046, gKartMario047, gKartMario048, gKartMario049 -.word gKartMario050, gKartMario051, gKartMario052, gKartMario053 -.word gKartMario054, gKartMario055, gKartMario056, gKartMario057 -.word gKartMario058, gKartMario059, gKartMario060, gKartMario061 -.word gKartMario062, gKartMario215, gKartMario216, gKartMario217 -.word gKartMario218, gKartMario219, gKartMario220, gKartMario221 -.word gKartMario222, gKartMario223, gKartMario224, gKartMario225 -.word gKartMario226, gKartMario227, gKartMario228 - -glabel gKartMarioGroup3 -.word gKartMario063, gKartMario064, gKartMario065, gKartMario066 -.word gKartMario067, gKartMario068, gKartMario069, gKartMario070 -.word gKartMario071, gKartMario072, gKartMario073, gKartMario074 -.word gKartMario075, gKartMario076, gKartMario077, gKartMario078 -.word gKartMario079, gKartMario080, gKartMario081, gKartMario082 -.word gKartMario083, gKartMario235, gKartMario236, gKartMario237 -.word gKartMario238, gKartMario239, gKartMario240, gKartMario241 -.word gKartMario242, gKartMario243, gKartMario244, gKartMario245 -.word gKartMario246, gKartMario247, gKartMario248 - -glabel gKartMarioGroup4 -.word gKartMario084, gKartMario085, gKartMario086, gKartMario087 -.word gKartMario088, gKartMario089, gKartMario090, gKartMario091 -.word gKartMario092, gKartMario093, gKartMario094, gKartMario095 -.word gKartMario096, gKartMario097, gKartMario098, gKartMario099 -.word gKartMario100, gKartMario101, gKartMario102, gKartMario103 -.word gKartMario104, gKartMario235, gKartMario236, gKartMario237 -.word gKartMario238, gKartMario239, gKartMario240, gKartMario241 -.word gKartMario242, gKartMario243, gKartMario244, gKartMario245 -.word gKartMario246, gKartMario247, gKartMario248 - -glabel gKartMarioGroup5 -.word gKartMario105, gKartMario106, gKartMario107, gKartMario108 -.word gKartMario109, gKartMario110, gKartMario111, gKartMario112 -.word gKartMario113, gKartMario114, gKartMario115, gKartMario116 -.word gKartMario117, gKartMario118, gKartMario119, gKartMario120 -.word gKartMario121, gKartMario122, gKartMario123, gKartMario124 -.word gKartMario125, gKartMario235, gKartMario236, gKartMario237 -.word gKartMario238, gKartMario239, gKartMario240, gKartMario241 -.word gKartMario242, gKartMario243, gKartMario244, gKartMario245 -.word gKartMario246, gKartMario247, gKartMario248 - -glabel gKartMarioGroup6 -.word gKartMario126, gKartMario127, gKartMario128, gKartMario129 -.word gKartMario130, gKartMario131, gKartMario132, gKartMario133 -.word gKartMario134, gKartMario135, gKartMario136, gKartMario137 -.word gKartMario138, gKartMario139, gKartMario140, gKartMario141 -.word gKartMario142, gKartMario143, gKartMario144, gKartMario145 -.word gKartMario146, gKartMario255, gKartMario256, gKartMario257 -.word gKartMario258, gKartMario259, gKartMario260, gKartMario261 -.word gKartMario262, gKartMario263, gKartMario264, gKartMario265 -.word gKartMario266, gKartMario267, gKartMario268 - -glabel gKartMarioGroup7 -.word gKartMario147, gKartMario148, gKartMario149, gKartMario150 -.word gKartMario151, gKartMario152, gKartMario153, gKartMario154 -.word gKartMario155, gKartMario156, gKartMario157, gKartMario158 -.word gKartMario159, gKartMario160, gKartMario161, gKartMario162 -.word gKartMario163, gKartMario164, gKartMario165, gKartMario166 -.word gKartMario167, gKartMario275, gKartMario276, gKartMario277 -.word gKartMario278, gKartMario279, gKartMario280, gKartMario281 -.word gKartMario282, gKartMario283, gKartMario284, gKartMario285 -.word gKartMario286, gKartMario287, gKartMario288 - -glabel gKartMarioGroup8 -.word gKartMario168, gKartMario169, gKartMario170, gKartMario171 -.word gKartMario172, gKartMario173, gKartMario174, gKartMario175 -.word gKartMario176, gKartMario177, gKartMario178, gKartMario179 -.word gKartMario180, gKartMario181, gKartMario182, gKartMario183 -.word gKartMario184, gKartMario185, gKartMario186, gKartMario187 -.word gKartMario188, gKartMario275, gKartMario276, gKartMario277 -.word gKartMario278, gKartMario279, gKartMario280, gKartMario281 -.word gKartMario282, gKartMario283, gKartMario284, gKartMario285 -.word gKartMario286, gKartMario287, gKartMario288 - -glabel gKartMarioGroup9 -.word gKartMario189, gKartMario190, gKartMario191, gKartMario192 -.word gKartMario193, gKartMario194, gKartMario195, gKartMario196 -.word gKartMario197, gKartMario198, gKartMario199, gKartMario200 -.word gKartMario201, gKartMario202, gKartMario203, gKartMario204 -.word gKartMario205, gKartMario206, gKartMario207, gKartMario208 - -glabel gKartMarioGroup10 -.word gKartMario189, gKartMario190, gKartMario191, gKartMario192 -.word gKartMario193, gKartMario194, gKartMario195, gKartMario196 -.word gKartMario197, gKartMario198, gKartMario199, gKartMario200 -.word gKartMario201, gKartMario202, gKartMario203, gKartMario204 -.word gKartMario205, gKartMario206, gKartMario207, gKartMario208 - -glabel gKartMarioGroup11 -.word gKartMario209, gKartMario210, gKartMario211, gKartMario212 -.word gKartMario213, gKartMario214, gKartMario215, gKartMario216 -.word gKartMario217, gKartMario218, gKartMario219, gKartMario220 -.word gKartMario221, gKartMario222, gKartMario223, gKartMario224 -.word gKartMario225, gKartMario226, gKartMario227, gKartMario228 - -glabel gKartMarioGroup12 -.word gKartMario229, gKartMario230, gKartMario231, gKartMario232 -.word gKartMario233, gKartMario234, gKartMario235, gKartMario236 -.word gKartMario237, gKartMario238, gKartMario239, gKartMario240 -.word gKartMario241, gKartMario242, gKartMario243, gKartMario244 -.word gKartMario245, gKartMario246, gKartMario247, gKartMario248 - -glabel gKartMarioGroup13 -.word gKartMario229, gKartMario230, gKartMario231, gKartMario232 -.word gKartMario233, gKartMario234, gKartMario235, gKartMario236 -.word gKartMario237, gKartMario238, gKartMario239, gKartMario240 -.word gKartMario241, gKartMario242, gKartMario243, gKartMario244 -.word gKartMario245, gKartMario246, gKartMario247, gKartMario248 - -glabel gKartMarioGroup14 -.word gKartMario229, gKartMario230, gKartMario231, gKartMario232 -.word gKartMario233, gKartMario234, gKartMario235, gKartMario236 -.word gKartMario237, gKartMario238, gKartMario239, gKartMario240 -.word gKartMario241, gKartMario242, gKartMario243, gKartMario244 -.word gKartMario245, gKartMario246, gKartMario247, gKartMario248 - -glabel gKartMarioGroup15 -.word gKartMario249, gKartMario250, gKartMario251, gKartMario252 -.word gKartMario253, gKartMario254, gKartMario255, gKartMario256 -.word gKartMario257, gKartMario258, gKartMario259, gKartMario260 -.word gKartMario261, gKartMario262, gKartMario263, gKartMario264 -.word gKartMario265, gKartMario266, gKartMario267, gKartMario268 - -glabel gKartMarioGroup16 -.word gKartMario269, gKartMario270, gKartMario271, gKartMario272 -.word gKartMario273, gKartMario274, gKartMario275, gKartMario276 -.word gKartMario277, gKartMario278, gKartMario279, gKartMario280 -.word gKartMario281, gKartMario282, gKartMario283, gKartMario284 -.word gKartMario285, gKartMario286, gKartMario287, gKartMario288 - -glabel gKartMarioGroup17 -.word gKartMario269, gKartMario270, gKartMario271, gKartMario272 -.word gKartMario273, gKartMario274, gKartMario275, gKartMario276 -.word gKartMario277, gKartMario278, gKartMario279, gKartMario280 -.word gKartMario281, gKartMario282, gKartMario283, gKartMario284 -.word gKartMario285, gKartMario286, gKartMario287, gKartMario288 - -glabel gKartToadGroup0 -.word gKartToad000, gKartToad001, gKartToad002, gKartToad003 -.word gKartToad004, gKartToad005, gKartToad006, gKartToad007 -.word gKartToad008, gKartToad009, gKartToad010, gKartToad011 -.word gKartToad012, gKartToad013, gKartToad014, gKartToad015 -.word gKartToad016, gKartToad017, gKartToad018, gKartToad019 -.word gKartToad020, gKartToad195, gKartToad196, gKartToad197 -.word gKartToad198, gKartToad199, gKartToad200, gKartToad201 -.word gKartToad202, gKartToad203, gKartToad204, gKartToad205 -.word gKartToad206, gKartToad207, gKartToad208 - -glabel gKartToadGroup1 -.word gKartToad021, gKartToad022, gKartToad023, gKartToad024 -.word gKartToad025, gKartToad026, gKartToad027, gKartToad028 -.word gKartToad029, gKartToad030, gKartToad031, gKartToad032 -.word gKartToad033, gKartToad034, gKartToad035, gKartToad036 -.word gKartToad037, gKartToad038, gKartToad039, gKartToad040 -.word gKartToad041, gKartToad195, gKartToad196, gKartToad197 -.word gKartToad198, gKartToad199, gKartToad200, gKartToad201 -.word gKartToad202, gKartToad203, gKartToad204, gKartToad205 -.word gKartToad206, gKartToad207, gKartToad208 - -glabel gKartToadGroup2 -.word gKartToad042, gKartToad043, gKartToad044, gKartToad045 -.word gKartToad046, gKartToad047, gKartToad048, gKartToad049 -.word gKartToad050, gKartToad051, gKartToad052, gKartToad053 -.word gKartToad054, gKartToad055, gKartToad056, gKartToad057 -.word gKartToad058, gKartToad059, gKartToad060, gKartToad061 -.word gKartToad062, gKartToad215, gKartToad216, gKartToad217 -.word gKartToad218, gKartToad219, gKartToad220, gKartToad221 -.word gKartToad222, gKartToad223, gKartToad224, gKartToad225 -.word gKartToad226, gKartToad227, gKartToad228 - -glabel gKartToadGroup3 -.word gKartToad063, gKartToad064, gKartToad065, gKartToad066 -.word gKartToad067, gKartToad068, gKartToad069, gKartToad070 -.word gKartToad071, gKartToad072, gKartToad073, gKartToad074 -.word gKartToad075, gKartToad076, gKartToad077, gKartToad078 -.word gKartToad079, gKartToad080, gKartToad081, gKartToad082 -.word gKartToad083, gKartToad235, gKartToad236, gKartToad237 -.word gKartToad238, gKartToad239, gKartToad240, gKartToad241 -.word gKartToad242, gKartToad243, gKartToad244, gKartToad245 -.word gKartToad246, gKartToad247, gKartToad248 - -glabel gKartToadGroup4 -.word gKartToad084, gKartToad085, gKartToad086, gKartToad087 -.word gKartToad088, gKartToad089, gKartToad090, gKartToad091 -.word gKartToad092, gKartToad093, gKartToad094, gKartToad095 -.word gKartToad096, gKartToad097, gKartToad098, gKartToad099 -.word gKartToad100, gKartToad101, gKartToad102, gKartToad103 -.word gKartToad104, gKartToad235, gKartToad236, gKartToad237 -.word gKartToad238, gKartToad239, gKartToad240, gKartToad241 -.word gKartToad242, gKartToad243, gKartToad244, gKartToad245 -.word gKartToad246, gKartToad247, gKartToad248 - -glabel gKartToadGroup5 -.word gKartToad105, gKartToad106, gKartToad107, gKartToad108 -.word gKartToad109, gKartToad110, gKartToad111, gKartToad112 -.word gKartToad113, gKartToad114, gKartToad115, gKartToad116 -.word gKartToad117, gKartToad118, gKartToad119, gKartToad120 -.word gKartToad121, gKartToad122, gKartToad123, gKartToad124 -.word gKartToad125, gKartToad235, gKartToad236, gKartToad237 -.word gKartToad238, gKartToad239, gKartToad240, gKartToad241 -.word gKartToad242, gKartToad243, gKartToad244, gKartToad245 -.word gKartToad246, gKartToad247, gKartToad248 - -glabel gKartToadGroup6 -.word gKartToad126, gKartToad127, gKartToad128, gKartToad129 -.word gKartToad130, gKartToad131, gKartToad132, gKartToad133 -.word gKartToad134, gKartToad135, gKartToad136, gKartToad137 -.word gKartToad138, gKartToad139, gKartToad140, gKartToad141 -.word gKartToad142, gKartToad143, gKartToad144, gKartToad145 -.word gKartToad146, gKartToad255, gKartToad256, gKartToad257 -.word gKartToad258, gKartToad259, gKartToad260, gKartToad261 -.word gKartToad262, gKartToad263, gKartToad264, gKartToad265 -.word gKartToad266, gKartToad267, gKartToad268 - -glabel gKartToadGroup7 -.word gKartToad147, gKartToad148, gKartToad149, gKartToad150 -.word gKartToad151, gKartToad152, gKartToad153, gKartToad154 -.word gKartToad155, gKartToad156, gKartToad157, gKartToad158 -.word gKartToad159, gKartToad160, gKartToad161, gKartToad162 -.word gKartToad163, gKartToad164, gKartToad165, gKartToad166 -.word gKartToad167, gKartToad275, gKartToad276, gKartToad277 -.word gKartToad278, gKartToad279, gKartToad280, gKartToad281 -.word gKartToad282, gKartToad283, gKartToad284, gKartToad285 -.word gKartToad286, gKartToad287, gKartToad288 - -glabel gKartToadGroup8 -.word gKartToad168, gKartToad169, gKartToad170, gKartToad171 -.word gKartToad172, gKartToad173, gKartToad174, gKartToad175 -.word gKartToad176, gKartToad177, gKartToad178, gKartToad179 -.word gKartToad180, gKartToad181, gKartToad182, gKartToad183 -.word gKartToad184, gKartToad185, gKartToad186, gKartToad187 -.word gKartToad188, gKartToad275, gKartToad276, gKartToad277 -.word gKartToad278, gKartToad279, gKartToad280, gKartToad281 -.word gKartToad282, gKartToad283, gKartToad284, gKartToad285 -.word gKartToad286, gKartToad287, gKartToad288 - -glabel gKartToadGroup9 -.word gKartToad189, gKartToad190, gKartToad191, gKartToad192 -.word gKartToad193, gKartToad194, gKartToad195, gKartToad196 -.word gKartToad197, gKartToad198, gKartToad199, gKartToad200 -.word gKartToad201, gKartToad202, gKartToad203, gKartToad204 -.word gKartToad205, gKartToad206, gKartToad207, gKartToad208 - -glabel gKartToadGroup10 -.word gKartToad189, gKartToad190, gKartToad191, gKartToad192 -.word gKartToad193, gKartToad194, gKartToad195, gKartToad196 -.word gKartToad197, gKartToad198, gKartToad199, gKartToad200 -.word gKartToad201, gKartToad202, gKartToad203, gKartToad204 -.word gKartToad205, gKartToad206, gKartToad207, gKartToad208 - -glabel gKartToadGroup11 -.word gKartToad209, gKartToad210, gKartToad211, gKartToad212 -.word gKartToad213, gKartToad214, gKartToad215, gKartToad216 -.word gKartToad217, gKartToad218, gKartToad219, gKartToad220 -.word gKartToad221, gKartToad222, gKartToad223, gKartToad224 -.word gKartToad225, gKartToad226, gKartToad227, gKartToad228 - -glabel gKartToadGroup12 -.word gKartToad229, gKartToad230, gKartToad231, gKartToad232 -.word gKartToad233, gKartToad234, gKartToad235, gKartToad236 -.word gKartToad237, gKartToad238, gKartToad239, gKartToad240 -.word gKartToad241, gKartToad242, gKartToad243, gKartToad244 -.word gKartToad245, gKartToad246, gKartToad247, gKartToad248 - -glabel gKartToadGroup13 -.word gKartToad229, gKartToad230, gKartToad231, gKartToad232 -.word gKartToad233, gKartToad234, gKartToad235, gKartToad236 -.word gKartToad237, gKartToad238, gKartToad239, gKartToad240 -.word gKartToad241, gKartToad242, gKartToad243, gKartToad244 -.word gKartToad245, gKartToad246, gKartToad247, gKartToad248 - -glabel gKartToadGroup14 -.word gKartToad229, gKartToad230, gKartToad231, gKartToad232 -.word gKartToad233, gKartToad234, gKartToad235, gKartToad236 -.word gKartToad237, gKartToad238, gKartToad239, gKartToad240 -.word gKartToad241, gKartToad242, gKartToad243, gKartToad244 -.word gKartToad245, gKartToad246, gKartToad247, gKartToad248 - -glabel gKartToadGroup15 -.word gKartToad249, gKartToad250, gKartToad251, gKartToad252 -.word gKartToad253, gKartToad254, gKartToad255, gKartToad256 -.word gKartToad257, gKartToad258, gKartToad259, gKartToad260 -.word gKartToad261, gKartToad262, gKartToad263, gKartToad264 -.word gKartToad265, gKartToad266, gKartToad267, gKartToad268 - -glabel gKartToadGroup16 -.word gKartToad269, gKartToad270, gKartToad271, gKartToad272 -.word gKartToad273, gKartToad274, gKartToad275, gKartToad276 -.word gKartToad277, gKartToad278, gKartToad279, gKartToad280 -.word gKartToad281, gKartToad282, gKartToad283, gKartToad284 -.word gKartToad285, gKartToad286, gKartToad287, gKartToad288 - -glabel gKartToadGroup17 -.word gKartToad269, gKartToad270, gKartToad271, gKartToad272 -.word gKartToad273, gKartToad274, gKartToad275, gKartToad276 -.word gKartToad277, gKartToad278, gKartToad279, gKartToad280 -.word gKartToad281, gKartToad282, gKartToad283, gKartToad284 -.word gKartToad285, gKartToad286, gKartToad287, gKartToad288 - -glabel gKartLuigiGroup0 -.word gKartLuigi000, gKartLuigi001, gKartLuigi002, gKartLuigi003 -.word gKartLuigi004, gKartLuigi005, gKartLuigi006, gKartLuigi007 -.word gKartLuigi008, gKartLuigi009, gKartLuigi010, gKartLuigi011 -.word gKartLuigi012, gKartLuigi013, gKartLuigi014, gKartLuigi015 -.word gKartLuigi016, gKartLuigi017, gKartLuigi018, gKartLuigi019 -.word gKartLuigi020, gKartLuigi195, gKartLuigi196, gKartLuigi197 -.word gKartLuigi198, gKartLuigi199, gKartLuigi200, gKartLuigi201 -.word gKartLuigi202, gKartLuigi203, gKartLuigi204, gKartLuigi205 -.word gKartLuigi206, gKartLuigi207, gKartLuigi208 - -glabel gKartLuigiGroup1 -.word gKartLuigi021, gKartLuigi022, gKartLuigi023, gKartLuigi024 -.word gKartLuigi025, gKartLuigi026, gKartLuigi027, gKartLuigi028 -.word gKartLuigi029, gKartLuigi030, gKartLuigi031, gKartLuigi032 -.word gKartLuigi033, gKartLuigi034, gKartLuigi035, gKartLuigi036 -.word gKartLuigi037, gKartLuigi038, gKartLuigi039, gKartLuigi040 -.word gKartLuigi041, gKartLuigi195, gKartLuigi196, gKartLuigi197 -.word gKartLuigi198, gKartLuigi199, gKartLuigi200, gKartLuigi201 -.word gKartLuigi202, gKartLuigi203, gKartLuigi204, gKartLuigi205 -.word gKartLuigi206, gKartLuigi207, gKartLuigi208 - -glabel gKartLuigiGroup2 -.word gKartLuigi042, gKartLuigi043, gKartLuigi044, gKartLuigi045 -.word gKartLuigi046, gKartLuigi047, gKartLuigi048, gKartLuigi049 -.word gKartLuigi050, gKartLuigi051, gKartLuigi052, gKartLuigi053 -.word gKartLuigi054, gKartLuigi055, gKartLuigi056, gKartLuigi057 -.word gKartLuigi058, gKartLuigi059, gKartLuigi060, gKartLuigi061 -.word gKartLuigi062, gKartLuigi215, gKartLuigi216, gKartLuigi217 -.word gKartLuigi218, gKartLuigi219, gKartLuigi220, gKartLuigi221 -.word gKartLuigi222, gKartLuigi223, gKartLuigi224, gKartLuigi225 -.word gKartLuigi226, gKartLuigi227, gKartLuigi228 - -glabel gKartLuigiGroup3 -.word gKartLuigi063, gKartLuigi064, gKartLuigi065, gKartLuigi066 -.word gKartLuigi067, gKartLuigi068, gKartLuigi069, gKartLuigi070 -.word gKartLuigi071, gKartLuigi072, gKartLuigi073, gKartLuigi074 -.word gKartLuigi075, gKartLuigi076, gKartLuigi077, gKartLuigi078 -.word gKartLuigi079, gKartLuigi080, gKartLuigi081, gKartLuigi082 -.word gKartLuigi083, gKartLuigi235, gKartLuigi236, gKartLuigi237 -.word gKartLuigi238, gKartLuigi239, gKartLuigi240, gKartLuigi241 -.word gKartLuigi242, gKartLuigi243, gKartLuigi244, gKartLuigi245 -.word gKartLuigi246, gKartLuigi247, gKartLuigi248 - -glabel gKartLuigiGroup4 -.word gKartLuigi084, gKartLuigi085, gKartLuigi086, gKartLuigi087 -.word gKartLuigi088, gKartLuigi089, gKartLuigi090, gKartLuigi091 -.word gKartLuigi092, gKartLuigi093, gKartLuigi094, gKartLuigi095 -.word gKartLuigi096, gKartLuigi097, gKartLuigi098, gKartLuigi099 -.word gKartLuigi100, gKartLuigi101, gKartLuigi102, gKartLuigi103 -.word gKartLuigi104, gKartLuigi235, gKartLuigi236, gKartLuigi237 -.word gKartLuigi238, gKartLuigi239, gKartLuigi240, gKartLuigi241 -.word gKartLuigi242, gKartLuigi243, gKartLuigi244, gKartLuigi245 -.word gKartLuigi246, gKartLuigi247, gKartLuigi248 - -glabel gKartLuigiGroup5 -.word gKartLuigi105, gKartLuigi106, gKartLuigi107, gKartLuigi108 -.word gKartLuigi109, gKartLuigi110, gKartLuigi111, gKartLuigi112 -.word gKartLuigi113, gKartLuigi114, gKartLuigi115, gKartLuigi116 -.word gKartLuigi117, gKartLuigi118, gKartLuigi119, gKartLuigi120 -.word gKartLuigi121, gKartLuigi122, gKartLuigi123, gKartLuigi124 -.word gKartLuigi125, gKartLuigi235, gKartLuigi236, gKartLuigi237 -.word gKartLuigi238, gKartLuigi239, gKartLuigi240, gKartLuigi241 -.word gKartLuigi242, gKartLuigi243, gKartLuigi244, gKartLuigi245 -.word gKartLuigi246, gKartLuigi247, gKartLuigi248 - -glabel gKartLuigiGroup6 -.word gKartLuigi126, gKartLuigi127, gKartLuigi128, gKartLuigi129 -.word gKartLuigi130, gKartLuigi131, gKartLuigi132, gKartLuigi133 -.word gKartLuigi134, gKartLuigi135, gKartLuigi136, gKartLuigi137 -.word gKartLuigi138, gKartLuigi139, gKartLuigi140, gKartLuigi141 -.word gKartLuigi142, gKartLuigi143, gKartLuigi144, gKartLuigi145 -.word gKartLuigi146, gKartLuigi255, gKartLuigi256, gKartLuigi257 -.word gKartLuigi258, gKartLuigi259, gKartLuigi260, gKartLuigi261 -.word gKartLuigi262, gKartLuigi263, gKartLuigi264, gKartLuigi265 -.word gKartLuigi266, gKartLuigi267, gKartLuigi268 - -glabel gKartLuigiGroup7 -.word gKartLuigi147, gKartLuigi148, gKartLuigi149, gKartLuigi150 -.word gKartLuigi151, gKartLuigi152, gKartLuigi153, gKartLuigi154 -.word gKartLuigi155, gKartLuigi156, gKartLuigi157, gKartLuigi158 -.word gKartLuigi159, gKartLuigi160, gKartLuigi161, gKartLuigi162 -.word gKartLuigi163, gKartLuigi164, gKartLuigi165, gKartLuigi166 -.word gKartLuigi167, gKartLuigi275, gKartLuigi276, gKartLuigi277 -.word gKartLuigi278, gKartLuigi279, gKartLuigi280, gKartLuigi281 -.word gKartLuigi282, gKartLuigi283, gKartLuigi284, gKartLuigi285 -.word gKartLuigi286, gKartLuigi287, gKartLuigi288 - -glabel gKartLuigiGroup8 -.word gKartLuigi168, gKartLuigi169, gKartLuigi170, gKartLuigi171 -.word gKartLuigi172, gKartLuigi173, gKartLuigi174, gKartLuigi175 -.word gKartLuigi176, gKartLuigi177, gKartLuigi178, gKartLuigi179 -.word gKartLuigi180, gKartLuigi181, gKartLuigi182, gKartLuigi183 -.word gKartLuigi184, gKartLuigi185, gKartLuigi186, gKartLuigi187 -.word gKartLuigi188, gKartLuigi275, gKartLuigi276, gKartLuigi277 -.word gKartLuigi278, gKartLuigi279, gKartLuigi280, gKartLuigi281 -.word gKartLuigi282, gKartLuigi283, gKartLuigi284, gKartLuigi285 -.word gKartLuigi286, gKartLuigi287, gKartLuigi288 - -glabel gKartLuigiGroup9 -.word gKartLuigi189, gKartLuigi190, gKartLuigi191, gKartLuigi192 -.word gKartLuigi193, gKartLuigi194, gKartLuigi195, gKartLuigi196 -.word gKartLuigi197, gKartLuigi198, gKartLuigi199, gKartLuigi200 -.word gKartLuigi201, gKartLuigi202, gKartLuigi203, gKartLuigi204 -.word gKartLuigi205, gKartLuigi206, gKartLuigi207, gKartLuigi208 - -glabel gKartLuigiGroup10 -.word gKartLuigi189, gKartLuigi190, gKartLuigi191, gKartLuigi192 -.word gKartLuigi193, gKartLuigi194, gKartLuigi195, gKartLuigi196 -.word gKartLuigi197, gKartLuigi198, gKartLuigi199, gKartLuigi200 -.word gKartLuigi201, gKartLuigi202, gKartLuigi203, gKartLuigi204 -.word gKartLuigi205, gKartLuigi206, gKartLuigi207, gKartLuigi208 - -glabel gKartLuigiGroup11 -.word gKartLuigi209, gKartLuigi210, gKartLuigi211, gKartLuigi212 -.word gKartLuigi213, gKartLuigi214, gKartLuigi215, gKartLuigi216 -.word gKartLuigi217, gKartLuigi218, gKartLuigi219, gKartLuigi220 -.word gKartLuigi221, gKartLuigi222, gKartLuigi223, gKartLuigi224 -.word gKartLuigi225, gKartLuigi226, gKartLuigi227, gKartLuigi228 - -glabel gKartLuigiGroup12 -.word gKartLuigi229, gKartLuigi230, gKartLuigi231, gKartLuigi232 -.word gKartLuigi233, gKartLuigi234, gKartLuigi235, gKartLuigi236 -.word gKartLuigi237, gKartLuigi238, gKartLuigi239, gKartLuigi240 -.word gKartLuigi241, gKartLuigi242, gKartLuigi243, gKartLuigi244 -.word gKartLuigi245, gKartLuigi246, gKartLuigi247, gKartLuigi248 - -glabel gKartLuigiGroup13 -.word gKartLuigi229, gKartLuigi230, gKartLuigi231, gKartLuigi232 -.word gKartLuigi233, gKartLuigi234, gKartLuigi235, gKartLuigi236 -.word gKartLuigi237, gKartLuigi238, gKartLuigi239, gKartLuigi240 -.word gKartLuigi241, gKartLuigi242, gKartLuigi243, gKartLuigi244 -.word gKartLuigi245, gKartLuigi246, gKartLuigi247, gKartLuigi248 - -glabel gKartLuigiGroup14 -.word gKartLuigi229, gKartLuigi230, gKartLuigi231, gKartLuigi232 -.word gKartLuigi233, gKartLuigi234, gKartLuigi235, gKartLuigi236 -.word gKartLuigi237, gKartLuigi238, gKartLuigi239, gKartLuigi240 -.word gKartLuigi241, gKartLuigi242, gKartLuigi243, gKartLuigi244 -.word gKartLuigi245, gKartLuigi246, gKartLuigi247, gKartLuigi248 - -glabel gKartLuigiGroup15 -.word gKartLuigi249, gKartLuigi250, gKartLuigi251, gKartLuigi252 -.word gKartLuigi253, gKartLuigi254, gKartLuigi255, gKartLuigi256 -.word gKartLuigi257, gKartLuigi258, gKartLuigi259, gKartLuigi260 -.word gKartLuigi261, gKartLuigi262, gKartLuigi263, gKartLuigi264 -.word gKartLuigi265, gKartLuigi266, gKartLuigi267, gKartLuigi268 - -glabel gKartLuigiGroup16 -.word gKartLuigi269, gKartLuigi270, gKartLuigi271, gKartLuigi272 -.word gKartLuigi273, gKartLuigi274, gKartLuigi275, gKartLuigi276 -.word gKartLuigi277, gKartLuigi278, gKartLuigi279, gKartLuigi280 -.word gKartLuigi281, gKartLuigi282, gKartLuigi283, gKartLuigi284 -.word gKartLuigi285, gKartLuigi286, gKartLuigi287, gKartLuigi288 - -glabel gKartLuigiGroup17 -.word gKartLuigi269, gKartLuigi270, gKartLuigi271, gKartLuigi272 -.word gKartLuigi273, gKartLuigi274, gKartLuigi275, gKartLuigi276 -.word gKartLuigi277, gKartLuigi278, gKartLuigi279, gKartLuigi280 -.word gKartLuigi281, gKartLuigi282, gKartLuigi283, gKartLuigi284 -.word gKartLuigi285, gKartLuigi286, gKartLuigi287, gKartLuigi288 - -glabel gKartYoshiGroup0 -.word gKartYoshi000, gKartYoshi001, gKartYoshi002, gKartYoshi003 -.word gKartYoshi004, gKartYoshi005, gKartYoshi006, gKartYoshi007 -.word gKartYoshi008, gKartYoshi009, gKartYoshi010, gKartYoshi011 -.word gKartYoshi012, gKartYoshi013, gKartYoshi014, gKartYoshi015 -.word gKartYoshi016, gKartYoshi017, gKartYoshi018, gKartYoshi019 -.word gKartYoshi020, gKartYoshi195, gKartYoshi196, gKartYoshi197 -.word gKartYoshi198, gKartYoshi199, gKartYoshi200, gKartYoshi201 -.word gKartYoshi202, gKartYoshi203, gKartYoshi204, gKartYoshi205 -.word gKartYoshi206, gKartYoshi207, gKartYoshi208 - -glabel gKartYoshiGroup1 -.word gKartYoshi021, gKartYoshi022, gKartYoshi023, gKartYoshi024 -.word gKartYoshi025, gKartYoshi026, gKartYoshi027, gKartYoshi028 -.word gKartYoshi029, gKartYoshi030, gKartYoshi031, gKartYoshi032 -.word gKartYoshi033, gKartYoshi034, gKartYoshi035, gKartYoshi036 -.word gKartYoshi037, gKartYoshi038, gKartYoshi039, gKartYoshi040 -.word gKartYoshi041, gKartYoshi195, gKartYoshi196, gKartYoshi197 -.word gKartYoshi198, gKartYoshi199, gKartYoshi200, gKartYoshi201 -.word gKartYoshi202, gKartYoshi203, gKartYoshi204, gKartYoshi205 -.word gKartYoshi206, gKartYoshi207, gKartYoshi208 - -glabel gKartYoshiGroup2 -.word gKartYoshi042, gKartYoshi043, gKartYoshi044, gKartYoshi045 -.word gKartYoshi046, gKartYoshi047, gKartYoshi048, gKartYoshi049 -.word gKartYoshi050, gKartYoshi051, gKartYoshi052, gKartYoshi053 -.word gKartYoshi054, gKartYoshi055, gKartYoshi056, gKartYoshi057 -.word gKartYoshi058, gKartYoshi059, gKartYoshi060, gKartYoshi061 -.word gKartYoshi062, gKartYoshi215, gKartYoshi216, gKartYoshi217 -.word gKartYoshi218, gKartYoshi219, gKartYoshi220, gKartYoshi221 -.word gKartYoshi222, gKartYoshi223, gKartYoshi224, gKartYoshi225 -.word gKartYoshi226, gKartYoshi227, gKartYoshi228 - -glabel gKartYoshiGroup3 -.word gKartYoshi063, gKartYoshi064, gKartYoshi065, gKartYoshi066 -.word gKartYoshi067, gKartYoshi068, gKartYoshi069, gKartYoshi070 -.word gKartYoshi071, gKartYoshi072, gKartYoshi073, gKartYoshi074 -.word gKartYoshi075, gKartYoshi076, gKartYoshi077, gKartYoshi078 -.word gKartYoshi079, gKartYoshi080, gKartYoshi081, gKartYoshi082 -.word gKartYoshi083, gKartYoshi235, gKartYoshi236, gKartYoshi237 -.word gKartYoshi238, gKartYoshi239, gKartYoshi240, gKartYoshi241 -.word gKartYoshi242, gKartYoshi243, gKartYoshi244, gKartYoshi245 -.word gKartYoshi246, gKartYoshi247, gKartYoshi248 - -glabel gKartYoshiGroup4 -.word gKartYoshi084, gKartYoshi085, gKartYoshi086, gKartYoshi087 -.word gKartYoshi088, gKartYoshi089, gKartYoshi090, gKartYoshi091 -.word gKartYoshi092, gKartYoshi093, gKartYoshi094, gKartYoshi095 -.word gKartYoshi096, gKartYoshi097, gKartYoshi098, gKartYoshi099 -.word gKartYoshi100, gKartYoshi101, gKartYoshi102, gKartYoshi103 -.word gKartYoshi104, gKartYoshi235, gKartYoshi236, gKartYoshi237 -.word gKartYoshi238, gKartYoshi239, gKartYoshi240, gKartYoshi241 -.word gKartYoshi242, gKartYoshi243, gKartYoshi244, gKartYoshi245 -.word gKartYoshi246, gKartYoshi247, gKartYoshi248 - -glabel gKartYoshiGroup5 -.word gKartYoshi105, gKartYoshi106, gKartYoshi107, gKartYoshi108 -.word gKartYoshi109, gKartYoshi110, gKartYoshi111, gKartYoshi112 -.word gKartYoshi113, gKartYoshi114, gKartYoshi115, gKartYoshi116 -.word gKartYoshi117, gKartYoshi118, gKartYoshi119, gKartYoshi120 -.word gKartYoshi121, gKartYoshi122, gKartYoshi123, gKartYoshi124 -.word gKartYoshi125, gKartYoshi235, gKartYoshi236, gKartYoshi237 -.word gKartYoshi238, gKartYoshi239, gKartYoshi240, gKartYoshi241 -.word gKartYoshi242, gKartYoshi243, gKartYoshi244, gKartYoshi245 -.word gKartYoshi246, gKartYoshi247, gKartYoshi248 - -glabel gKartYoshiGroup6 -.word gKartYoshi126, gKartYoshi127, gKartYoshi128, gKartYoshi129 -.word gKartYoshi130, gKartYoshi131, gKartYoshi132, gKartYoshi133 -.word gKartYoshi134, gKartYoshi135, gKartYoshi136, gKartYoshi137 -.word gKartYoshi138, gKartYoshi139, gKartYoshi140, gKartYoshi141 -.word gKartYoshi142, gKartYoshi143, gKartYoshi144, gKartYoshi145 -.word gKartYoshi146, gKartYoshi255, gKartYoshi256, gKartYoshi257 -.word gKartYoshi258, gKartYoshi259, gKartYoshi260, gKartYoshi261 -.word gKartYoshi262, gKartYoshi263, gKartYoshi264, gKartYoshi265 -.word gKartYoshi266, gKartYoshi267, gKartYoshi268 - -glabel gKartYoshiGroup7 -.word gKartYoshi147, gKartYoshi148, gKartYoshi149, gKartYoshi150 -.word gKartYoshi151, gKartYoshi152, gKartYoshi153, gKartYoshi154 -.word gKartYoshi155, gKartYoshi156, gKartYoshi157, gKartYoshi158 -.word gKartYoshi159, gKartYoshi160, gKartYoshi161, gKartYoshi162 -.word gKartYoshi163, gKartYoshi164, gKartYoshi165, gKartYoshi166 -.word gKartYoshi167, gKartYoshi275, gKartYoshi276, gKartYoshi277 -.word gKartYoshi278, gKartYoshi279, gKartYoshi280, gKartYoshi281 -.word gKartYoshi282, gKartYoshi283, gKartYoshi284, gKartYoshi285 -.word gKartYoshi286, gKartYoshi287, gKartYoshi288 - -glabel gKartYoshiGroup8 -.word gKartYoshi168, gKartYoshi169, gKartYoshi170, gKartYoshi171 -.word gKartYoshi172, gKartYoshi173, gKartYoshi174, gKartYoshi175 -.word gKartYoshi176, gKartYoshi177, gKartYoshi178, gKartYoshi179 -.word gKartYoshi180, gKartYoshi181, gKartYoshi182, gKartYoshi183 -.word gKartYoshi184, gKartYoshi185, gKartYoshi186, gKartYoshi187 -.word gKartYoshi188, gKartYoshi275, gKartYoshi276, gKartYoshi277 -.word gKartYoshi278, gKartYoshi279, gKartYoshi280, gKartYoshi281 -.word gKartYoshi282, gKartYoshi283, gKartYoshi284, gKartYoshi285 -.word gKartYoshi286, gKartYoshi287, gKartYoshi288 - -glabel gKartYoshiGroup9 -.word gKartYoshi189, gKartYoshi190, gKartYoshi191, gKartYoshi192 -.word gKartYoshi193, gKartYoshi194, gKartYoshi195, gKartYoshi196 -.word gKartYoshi197, gKartYoshi198, gKartYoshi199, gKartYoshi200 -.word gKartYoshi201, gKartYoshi202, gKartYoshi203, gKartYoshi204 -.word gKartYoshi205, gKartYoshi206, gKartYoshi207, gKartYoshi208 - -glabel gKartYoshiGroup10 -.word gKartYoshi189, gKartYoshi190, gKartYoshi191, gKartYoshi192 -.word gKartYoshi193, gKartYoshi194, gKartYoshi195, gKartYoshi196 -.word gKartYoshi197, gKartYoshi198, gKartYoshi199, gKartYoshi200 -.word gKartYoshi201, gKartYoshi202, gKartYoshi203, gKartYoshi204 -.word gKartYoshi205, gKartYoshi206, gKartYoshi207, gKartYoshi208 - -glabel gKartYoshiGroup11 -.word gKartYoshi209, gKartYoshi210, gKartYoshi211, gKartYoshi212 -.word gKartYoshi213, gKartYoshi214, gKartYoshi215, gKartYoshi216 -.word gKartYoshi217, gKartYoshi218, gKartYoshi219, gKartYoshi220 -.word gKartYoshi221, gKartYoshi222, gKartYoshi223, gKartYoshi224 -.word gKartYoshi225, gKartYoshi226, gKartYoshi227, gKartYoshi228 - -glabel gKartYoshiGroup12 -.word gKartYoshi229, gKartYoshi230, gKartYoshi231, gKartYoshi232 -.word gKartYoshi233, gKartYoshi234, gKartYoshi235, gKartYoshi236 -.word gKartYoshi237, gKartYoshi238, gKartYoshi239, gKartYoshi240 -.word gKartYoshi241, gKartYoshi242, gKartYoshi243, gKartYoshi244 -.word gKartYoshi245, gKartYoshi246, gKartYoshi247, gKartYoshi248 - -glabel gKartYoshiGroup13 -.word gKartYoshi229, gKartYoshi230, gKartYoshi231, gKartYoshi232 -.word gKartYoshi233, gKartYoshi234, gKartYoshi235, gKartYoshi236 -.word gKartYoshi237, gKartYoshi238, gKartYoshi239, gKartYoshi240 -.word gKartYoshi241, gKartYoshi242, gKartYoshi243, gKartYoshi244 -.word gKartYoshi245, gKartYoshi246, gKartYoshi247, gKartYoshi248 - -glabel gKartYoshiGroup14 -.word gKartYoshi229, gKartYoshi230, gKartYoshi231, gKartYoshi232 -.word gKartYoshi233, gKartYoshi234, gKartYoshi235, gKartYoshi236 -.word gKartYoshi237, gKartYoshi238, gKartYoshi239, gKartYoshi240 -.word gKartYoshi241, gKartYoshi242, gKartYoshi243, gKartYoshi244 -.word gKartYoshi245, gKartYoshi246, gKartYoshi247, gKartYoshi248 - -glabel gKartYoshiGroup15 -.word gKartYoshi249, gKartYoshi250, gKartYoshi251, gKartYoshi252 -.word gKartYoshi253, gKartYoshi254, gKartYoshi255, gKartYoshi256 -.word gKartYoshi257, gKartYoshi258, gKartYoshi259, gKartYoshi260 -.word gKartYoshi261, gKartYoshi262, gKartYoshi263, gKartYoshi264 -.word gKartYoshi265, gKartYoshi266, gKartYoshi267, gKartYoshi268 - -glabel gKartYoshiGroup16 -.word gKartYoshi269, gKartYoshi270, gKartYoshi271, gKartYoshi272 -.word gKartYoshi273, gKartYoshi274, gKartYoshi275, gKartYoshi276 -.word gKartYoshi277, gKartYoshi278, gKartYoshi279, gKartYoshi280 -.word gKartYoshi281, gKartYoshi282, gKartYoshi283, gKartYoshi284 -.word gKartYoshi285, gKartYoshi286, gKartYoshi287, gKartYoshi288 - -glabel gKartYoshiGroup17 -.word gKartYoshi269, gKartYoshi270, gKartYoshi271, gKartYoshi272 -.word gKartYoshi273, gKartYoshi274, gKartYoshi275, gKartYoshi276 -.word gKartYoshi277, gKartYoshi278, gKartYoshi279, gKartYoshi280 -.word gKartYoshi281, gKartYoshi282, gKartYoshi283, gKartYoshi284 -.word gKartYoshi285, gKartYoshi286, gKartYoshi287, gKartYoshi288 - -glabel gKartDKGroup0 -.word gKartDK000, gKartDK001, gKartDK002, gKartDK003 -.word gKartDK004, gKartDK005, gKartDK006, gKartDK007 -.word gKartDK008, gKartDK009, gKartDK010, gKartDK011 -.word gKartDK012, gKartDK013, gKartDK014, gKartDK015 -.word gKartDK016, gKartDK017, gKartDK018, gKartDK019 -.word gKartDK020, gKartDK195, gKartDK196, gKartDK197 -.word gKartDK198, gKartDK199, gKartDK200, gKartDK201 -.word gKartDK202, gKartDK203, gKartDK204, gKartDK205 -.word gKartDK206, gKartDK207, gKartDK208 - -glabel gKartDKGroup1 -.word gKartDK021, gKartDK022, gKartDK023, gKartDK024 -.word gKartDK025, gKartDK026, gKartDK027, gKartDK028 -.word gKartDK029, gKartDK030, gKartDK031, gKartDK032 -.word gKartDK033, gKartDK034, gKartDK035, gKartDK036 -.word gKartDK037, gKartDK038, gKartDK039, gKartDK040 -.word gKartDK041, gKartDK195, gKartDK196, gKartDK197 -.word gKartDK198, gKartDK199, gKartDK200, gKartDK201 -.word gKartDK202, gKartDK203, gKartDK204, gKartDK205 -.word gKartDK206, gKartDK207, gKartDK208 - -glabel gKartDKGroup2 -.word gKartDK042, gKartDK043, gKartDK044, gKartDK045 -.word gKartDK046, gKartDK047, gKartDK048, gKartDK049 -.word gKartDK050, gKartDK051, gKartDK052, gKartDK053 -.word gKartDK054, gKartDK055, gKartDK056, gKartDK057 -.word gKartDK058, gKartDK059, gKartDK060, gKartDK061 -.word gKartDK062, gKartDK215, gKartDK216, gKartDK217 -.word gKartDK218, gKartDK219, gKartDK220, gKartDK221 -.word gKartDK222, gKartDK223, gKartDK224, gKartDK225 -.word gKartDK226, gKartDK227, gKartDK228 - -glabel gKartDKGroup3 -.word gKartDK063, gKartDK064, gKartDK065, gKartDK066 -.word gKartDK067, gKartDK068, gKartDK069, gKartDK070 -.word gKartDK071, gKartDK072, gKartDK073, gKartDK074 -.word gKartDK075, gKartDK076, gKartDK077, gKartDK078 -.word gKartDK079, gKartDK080, gKartDK081, gKartDK082 -.word gKartDK083, gKartDK235, gKartDK236, gKartDK237 -.word gKartDK238, gKartDK239, gKartDK240, gKartDK241 -.word gKartDK242, gKartDK243, gKartDK244, gKartDK245 -.word gKartDK246, gKartDK247, gKartDK248 - -glabel gKartDKGroup4 -.word gKartDK084, gKartDK085, gKartDK086, gKartDK087 -.word gKartDK088, gKartDK089, gKartDK090, gKartDK091 -.word gKartDK092, gKartDK093, gKartDK094, gKartDK095 -.word gKartDK096, gKartDK097, gKartDK098, gKartDK099 -.word gKartDK100, gKartDK101, gKartDK102, gKartDK103 -.word gKartDK104, gKartDK235, gKartDK236, gKartDK237 -.word gKartDK238, gKartDK239, gKartDK240, gKartDK241 -.word gKartDK242, gKartDK243, gKartDK244, gKartDK245 -.word gKartDK246, gKartDK247, gKartDK248 - -glabel gKartDKGroup5 -.word gKartDK105, gKartDK106, gKartDK107, gKartDK108 -.word gKartDK109, gKartDK110, gKartDK111, gKartDK112 -.word gKartDK113, gKartDK114, gKartDK115, gKartDK116 -.word gKartDK117, gKartDK118, gKartDK119, gKartDK120 -.word gKartDK121, gKartDK122, gKartDK123, gKartDK124 -.word gKartDK125, gKartDK235, gKartDK236, gKartDK237 -.word gKartDK238, gKartDK239, gKartDK240, gKartDK241 -.word gKartDK242, gKartDK243, gKartDK244, gKartDK245 -.word gKartDK246, gKartDK247, gKartDK248 - -glabel gKartDKGroup6 -.word gKartDK126, gKartDK127, gKartDK128, gKartDK129 -.word gKartDK130, gKartDK131, gKartDK132, gKartDK133 -.word gKartDK134, gKartDK135, gKartDK136, gKartDK137 -.word gKartDK138, gKartDK139, gKartDK140, gKartDK141 -.word gKartDK142, gKartDK143, gKartDK144, gKartDK145 -.word gKartDK146, gKartDK255, gKartDK256, gKartDK257 -.word gKartDK258, gKartDK259, gKartDK260, gKartDK261 -.word gKartDK262, gKartDK263, gKartDK264, gKartDK265 -.word gKartDK266, gKartDK267, gKartDK268 - -glabel gKartDKGroup7 -.word gKartDK147, gKartDK148, gKartDK149, gKartDK150 -.word gKartDK151, gKartDK152, gKartDK153, gKartDK154 -.word gKartDK155, gKartDK156, gKartDK157, gKartDK158 -.word gKartDK159, gKartDK160, gKartDK161, gKartDK162 -.word gKartDK163, gKartDK164, gKartDK165, gKartDK166 -.word gKartDK167, gKartDK275, gKartDK276, gKartDK277 -.word gKartDK278, gKartDK279, gKartDK280, gKartDK281 -.word gKartDK282, gKartDK283, gKartDK284, gKartDK285 -.word gKartDK286, gKartDK287, gKartDK288 - -glabel gKartDKGroup8 -.word gKartDK168, gKartDK169, gKartDK170, gKartDK171 -.word gKartDK172, gKartDK173, gKartDK174, gKartDK175 -.word gKartDK176, gKartDK177, gKartDK178, gKartDK179 -.word gKartDK180, gKartDK181, gKartDK182, gKartDK183 -.word gKartDK184, gKartDK185, gKartDK186, gKartDK187 -.word gKartDK188, gKartDK275, gKartDK276, gKartDK277 -.word gKartDK278, gKartDK279, gKartDK280, gKartDK281 -.word gKartDK282, gKartDK283, gKartDK284, gKartDK285 -.word gKartDK286, gKartDK287, gKartDK288 - -glabel gKartDKGroup9 -.word gKartDK189, gKartDK190, gKartDK191, gKartDK192 -.word gKartDK193, gKartDK194, gKartDK195, gKartDK196 -.word gKartDK197, gKartDK198, gKartDK199, gKartDK200 -.word gKartDK201, gKartDK202, gKartDK203, gKartDK204 -.word gKartDK205, gKartDK206, gKartDK207, gKartDK208 - -glabel gKartDKGroup10 -.word gKartDK189, gKartDK190, gKartDK191, gKartDK192 -.word gKartDK193, gKartDK194, gKartDK195, gKartDK196 -.word gKartDK197, gKartDK198, gKartDK199, gKartDK200 -.word gKartDK201, gKartDK202, gKartDK203, gKartDK204 -.word gKartDK205, gKartDK206, gKartDK207, gKartDK208 - -glabel gKartDKGroup11 -.word gKartDK209, gKartDK210, gKartDK211, gKartDK212 -.word gKartDK213, gKartDK214, gKartDK215, gKartDK216 -.word gKartDK217, gKartDK218, gKartDK219, gKartDK220 -.word gKartDK221, gKartDK222, gKartDK223, gKartDK224 -.word gKartDK225, gKartDK226, gKartDK227, gKartDK228 - -glabel gKartDKGroup12 -.word gKartDK229, gKartDK230, gKartDK231, gKartDK232 -.word gKartDK233, gKartDK234, gKartDK235, gKartDK236 -.word gKartDK237, gKartDK238, gKartDK239, gKartDK240 -.word gKartDK241, gKartDK242, gKartDK243, gKartDK244 -.word gKartDK245, gKartDK246, gKartDK247, gKartDK248 - -glabel gKartDKGroup13 -.word gKartDK229, gKartDK230, gKartDK231, gKartDK232 -.word gKartDK233, gKartDK234, gKartDK235, gKartDK236 -.word gKartDK237, gKartDK238, gKartDK239, gKartDK240 -.word gKartDK241, gKartDK242, gKartDK243, gKartDK244 -.word gKartDK245, gKartDK246, gKartDK247, gKartDK248 - -glabel gKartDKGroup14 -.word gKartDK229, gKartDK230, gKartDK231, gKartDK232 -.word gKartDK233, gKartDK234, gKartDK235, gKartDK236 -.word gKartDK237, gKartDK238, gKartDK239, gKartDK240 -.word gKartDK241, gKartDK242, gKartDK243, gKartDK244 -.word gKartDK245, gKartDK246, gKartDK247, gKartDK248 - -glabel gKartDKGroup15 -.word gKartDK249, gKartDK250, gKartDK251, gKartDK252 -.word gKartDK253, gKartDK254, gKartDK255, gKartDK256 -.word gKartDK257, gKartDK258, gKartDK259, gKartDK260 -.word gKartDK261, gKartDK262, gKartDK263, gKartDK264 -.word gKartDK265, gKartDK266, gKartDK267, gKartDK268 - -glabel gKartDKGroup16 -.word gKartDK269, gKartDK270, gKartDK271, gKartDK272 -.word gKartDK273, gKartDK274, gKartDK275, gKartDK276 -.word gKartDK277, gKartDK278, gKartDK279, gKartDK280 -.word gKartDK281, gKartDK282, gKartDK283, gKartDK284 -.word gKartDK285, gKartDK286, gKartDK287, gKartDK288 - -glabel gKartDKGroup17 -.word gKartDK269, gKartDK270, gKartDK271, gKartDK272 -.word gKartDK273, gKartDK274, gKartDK275, gKartDK276 -.word gKartDK277, gKartDK278, gKartDK279, gKartDK280 -.word gKartDK281, gKartDK282, gKartDK283, gKartDK284 -.word gKartDK285, gKartDK286, gKartDK287, gKartDK288 - -glabel gKartBowserGroup0 -.word gKartBowser000, gKartBowser001, gKartBowser002, gKartBowser003 -.word gKartBowser004, gKartBowser005, gKartBowser006, gKartBowser007 -.word gKartBowser008, gKartBowser009, gKartBowser010, gKartBowser011 -.word gKartBowser012, gKartBowser013, gKartBowser014, gKartBowser015 -.word gKartBowser016, gKartBowser017, gKartBowser018, gKartBowser019 -.word gKartBowser020, gKartBowser195, gKartBowser196, gKartBowser197 -.word gKartBowser198, gKartBowser199, gKartBowser200, gKartBowser201 -.word gKartBowser202, gKartBowser203, gKartBowser204, gKartBowser205 -.word gKartBowser206, gKartBowser207, gKartBowser208 - -glabel gKartBowserGroup1 -.word gKartBowser021, gKartBowser022, gKartBowser023, gKartBowser024 -.word gKartBowser025, gKartBowser026, gKartBowser027, gKartBowser028 -.word gKartBowser029, gKartBowser030, gKartBowser031, gKartBowser032 -.word gKartBowser033, gKartBowser034, gKartBowser035, gKartBowser036 -.word gKartBowser037, gKartBowser038, gKartBowser039, gKartBowser040 -.word gKartBowser041, gKartBowser195, gKartBowser196, gKartBowser197 -.word gKartBowser198, gKartBowser199, gKartBowser200, gKartBowser201 -.word gKartBowser202, gKartBowser203, gKartBowser204, gKartBowser205 -.word gKartBowser206, gKartBowser207, gKartBowser208 - -glabel gKartBowserGroup2 -.word gKartBowser042, gKartBowser043, gKartBowser044, gKartBowser045 -.word gKartBowser046, gKartBowser047, gKartBowser048, gKartBowser049 -.word gKartBowser050, gKartBowser051, gKartBowser052, gKartBowser053 -.word gKartBowser054, gKartBowser055, gKartBowser056, gKartBowser057 -.word gKartBowser058, gKartBowser059, gKartBowser060, gKartBowser061 -.word gKartBowser062, gKartBowser215, gKartBowser216, gKartBowser217 -.word gKartBowser218, gKartBowser219, gKartBowser220, gKartBowser221 -.word gKartBowser222, gKartBowser223, gKartBowser224, gKartBowser225 -.word gKartBowser226, gKartBowser227, gKartBowser228 - -glabel gKartBowserGroup3 -.word gKartBowser063, gKartBowser064, gKartBowser065, gKartBowser066 -.word gKartBowser067, gKartBowser068, gKartBowser069, gKartBowser070 -.word gKartBowser071, gKartBowser072, gKartBowser073, gKartBowser074 -.word gKartBowser075, gKartBowser076, gKartBowser077, gKartBowser078 -.word gKartBowser079, gKartBowser080, gKartBowser081, gKartBowser082 -.word gKartBowser083, gKartBowser235, gKartBowser236, gKartBowser237 -.word gKartBowser238, gKartBowser239, gKartBowser240, gKartBowser241 -.word gKartBowser242, gKartBowser243, gKartBowser244, gKartBowser245 -.word gKartBowser246, gKartBowser247, gKartBowser248 - -glabel gKartBowserGroup4 -.word gKartBowser084, gKartBowser085, gKartBowser086, gKartBowser087 -.word gKartBowser088, gKartBowser089, gKartBowser090, gKartBowser091 -.word gKartBowser092, gKartBowser093, gKartBowser094, gKartBowser095 -.word gKartBowser096, gKartBowser097, gKartBowser098, gKartBowser099 -.word gKartBowser100, gKartBowser101, gKartBowser102, gKartBowser103 -.word gKartBowser104, gKartBowser235, gKartBowser236, gKartBowser237 -.word gKartBowser238, gKartBowser239, gKartBowser240, gKartBowser241 -.word gKartBowser242, gKartBowser243, gKartBowser244, gKartBowser245 -.word gKartBowser246, gKartBowser247, gKartBowser248 - -glabel gKartBowserGroup5 -.word gKartBowser105, gKartBowser106, gKartBowser107, gKartBowser108 -.word gKartBowser109, gKartBowser110, gKartBowser111, gKartBowser112 -.word gKartBowser113, gKartBowser114, gKartBowser115, gKartBowser116 -.word gKartBowser117, gKartBowser118, gKartBowser119, gKartBowser120 -.word gKartBowser121, gKartBowser122, gKartBowser123, gKartBowser124 -.word gKartBowser125, gKartBowser235, gKartBowser236, gKartBowser237 -.word gKartBowser238, gKartBowser239, gKartBowser240, gKartBowser241 -.word gKartBowser242, gKartBowser243, gKartBowser244, gKartBowser245 -.word gKartBowser246, gKartBowser247, gKartBowser248 - -glabel gKartBowserGroup6 -.word gKartBowser126, gKartBowser127, gKartBowser128, gKartBowser129 -.word gKartBowser130, gKartBowser131, gKartBowser132, gKartBowser133 -.word gKartBowser134, gKartBowser135, gKartBowser136, gKartBowser137 -.word gKartBowser138, gKartBowser139, gKartBowser140, gKartBowser141 -.word gKartBowser142, gKartBowser143, gKartBowser144, gKartBowser145 -.word gKartBowser146, gKartBowser255, gKartBowser256, gKartBowser257 -.word gKartBowser258, gKartBowser259, gKartBowser260, gKartBowser261 -.word gKartBowser262, gKartBowser263, gKartBowser264, gKartBowser265 -.word gKartBowser266, gKartBowser267, gKartBowser268 - -glabel gKartBowserGroup7 -.word gKartBowser147, gKartBowser148, gKartBowser149, gKartBowser150 -.word gKartBowser151, gKartBowser152, gKartBowser153, gKartBowser154 -.word gKartBowser155, gKartBowser156, gKartBowser157, gKartBowser158 -.word gKartBowser159, gKartBowser160, gKartBowser161, gKartBowser162 -.word gKartBowser163, gKartBowser164, gKartBowser165, gKartBowser166 -.word gKartBowser167, gKartBowser275, gKartBowser276, gKartBowser277 -.word gKartBowser278, gKartBowser279, gKartBowser280, gKartBowser281 -.word gKartBowser282, gKartBowser283, gKartBowser284, gKartBowser285 -.word gKartBowser286, gKartBowser287, gKartBowser288 - -glabel gKartBowserGroup8 -.word gKartBowser168, gKartBowser169, gKartBowser170, gKartBowser171 -.word gKartBowser172, gKartBowser173, gKartBowser174, gKartBowser175 -.word gKartBowser176, gKartBowser177, gKartBowser178, gKartBowser179 -.word gKartBowser180, gKartBowser181, gKartBowser182, gKartBowser183 -.word gKartBowser184, gKartBowser185, gKartBowser186, gKartBowser187 -.word gKartBowser188, gKartBowser275, gKartBowser276, gKartBowser277 -.word gKartBowser278, gKartBowser279, gKartBowser280, gKartBowser281 -.word gKartBowser282, gKartBowser283, gKartBowser284, gKartBowser285 -.word gKartBowser286, gKartBowser287, gKartBowser288 - -glabel gKartBowserGroup9 -.word gKartBowser189, gKartBowser190, gKartBowser191, gKartBowser192 -.word gKartBowser193, gKartBowser194, gKartBowser195, gKartBowser196 -.word gKartBowser197, gKartBowser198, gKartBowser199, gKartBowser200 -.word gKartBowser201, gKartBowser202, gKartBowser203, gKartBowser204 -.word gKartBowser205, gKartBowser206, gKartBowser207, gKartBowser208 - -glabel gKartBowserGroup10 -.word gKartBowser189, gKartBowser190, gKartBowser191, gKartBowser192 -.word gKartBowser193, gKartBowser194, gKartBowser195, gKartBowser196 -.word gKartBowser197, gKartBowser198, gKartBowser199, gKartBowser200 -.word gKartBowser201, gKartBowser202, gKartBowser203, gKartBowser204 -.word gKartBowser205, gKartBowser206, gKartBowser207, gKartBowser208 - -glabel gKartBowserGroup11 -.word gKartBowser209, gKartBowser210, gKartBowser211, gKartBowser212 -.word gKartBowser213, gKartBowser214, gKartBowser215, gKartBowser216 -.word gKartBowser217, gKartBowser218, gKartBowser219, gKartBowser220 -.word gKartBowser221, gKartBowser222, gKartBowser223, gKartBowser224 -.word gKartBowser225, gKartBowser226, gKartBowser227, gKartBowser228 - -glabel gKartBowserGroup12 -.word gKartBowser229, gKartBowser230, gKartBowser231, gKartBowser232 -.word gKartBowser233, gKartBowser234, gKartBowser235, gKartBowser236 -.word gKartBowser237, gKartBowser238, gKartBowser239, gKartBowser240 -.word gKartBowser241, gKartBowser242, gKartBowser243, gKartBowser244 -.word gKartBowser245, gKartBowser246, gKartBowser247, gKartBowser248 - -glabel gKartBowserGroup13 -.word gKartBowser229, gKartBowser230, gKartBowser231, gKartBowser232 -.word gKartBowser233, gKartBowser234, gKartBowser235, gKartBowser236 -.word gKartBowser237, gKartBowser238, gKartBowser239, gKartBowser240 -.word gKartBowser241, gKartBowser242, gKartBowser243, gKartBowser244 -.word gKartBowser245, gKartBowser246, gKartBowser247, gKartBowser248 - -glabel gKartBowserGroup14 -.word gKartBowser229, gKartBowser230, gKartBowser231, gKartBowser232 -.word gKartBowser233, gKartBowser234, gKartBowser235, gKartBowser236 -.word gKartBowser237, gKartBowser238, gKartBowser239, gKartBowser240 -.word gKartBowser241, gKartBowser242, gKartBowser243, gKartBowser244 -.word gKartBowser245, gKartBowser246, gKartBowser247, gKartBowser248 - -glabel gKartBowserGroup15 -.word gKartBowser249, gKartBowser250, gKartBowser251, gKartBowser252 -.word gKartBowser253, gKartBowser254, gKartBowser255, gKartBowser256 -.word gKartBowser257, gKartBowser258, gKartBowser259, gKartBowser260 -.word gKartBowser261, gKartBowser262, gKartBowser263, gKartBowser264 -.word gKartBowser265, gKartBowser266, gKartBowser267, gKartBowser268 - -glabel gKartBowserGroup16 -.word gKartBowser269, gKartBowser270, gKartBowser271, gKartBowser272 -.word gKartBowser273, gKartBowser274, gKartBowser275, gKartBowser276 -.word gKartBowser277, gKartBowser278, gKartBowser279, gKartBowser280 -.word gKartBowser281, gKartBowser282, gKartBowser283, gKartBowser284 -.word gKartBowser285, gKartBowser286, gKartBowser287, gKartBowser288 - -glabel gKartBowserGroup17 -.word gKartBowser269, gKartBowser270, gKartBowser271, gKartBowser272 -.word gKartBowser273, gKartBowser274, gKartBowser275, gKartBowser276 -.word gKartBowser277, gKartBowser278, gKartBowser279, gKartBowser280 -.word gKartBowser281, gKartBowser282, gKartBowser283, gKartBowser284 -.word gKartBowser285, gKartBowser286, gKartBowser287, gKartBowser288 - -glabel gKartPeachGroup0 -.word gKartPeach000, gKartPeach001, gKartPeach002, gKartPeach003 -.word gKartPeach004, gKartPeach005, gKartPeach006, gKartPeach007 -.word gKartPeach008, gKartPeach009, gKartPeach010, gKartPeach011 -.word gKartPeach012, gKartPeach013, gKartPeach014, gKartPeach015 -.word gKartPeach016, gKartPeach017, gKartPeach018, gKartPeach019 -.word gKartPeach020, gKartPeach195, gKartPeach196, gKartPeach197 -.word gKartPeach198, gKartPeach199, gKartPeach200, gKartPeach201 -.word gKartPeach202, gKartPeach203, gKartPeach204, gKartPeach205 -.word gKartPeach206, gKartPeach207, gKartPeach208 - -glabel gKartPeachGroup1 -.word gKartPeach021, gKartPeach022, gKartPeach023, gKartPeach024 -.word gKartPeach025, gKartPeach026, gKartPeach027, gKartPeach028 -.word gKartPeach029, gKartPeach030, gKartPeach031, gKartPeach032 -.word gKartPeach033, gKartPeach034, gKartPeach035, gKartPeach036 -.word gKartPeach037, gKartPeach038, gKartPeach039, gKartPeach040 -.word gKartPeach041, gKartPeach195, gKartPeach196, gKartPeach197 -.word gKartPeach198, gKartPeach199, gKartPeach200, gKartPeach201 -.word gKartPeach202, gKartPeach203, gKartPeach204, gKartPeach205 -.word gKartPeach206, gKartPeach207, gKartPeach208 - -glabel gKartPeachGroup2 -.word gKartPeach042, gKartPeach043, gKartPeach044, gKartPeach045 -.word gKartPeach046, gKartPeach047, gKartPeach048, gKartPeach049 -.word gKartPeach050, gKartPeach051, gKartPeach052, gKartPeach053 -.word gKartPeach054, gKartPeach055, gKartPeach056, gKartPeach057 -.word gKartPeach058, gKartPeach059, gKartPeach060, gKartPeach061 -.word gKartPeach062, gKartPeach215, gKartPeach216, gKartPeach217 -.word gKartPeach218, gKartPeach219, gKartPeach220, gKartPeach221 -.word gKartPeach222, gKartPeach223, gKartPeach224, gKartPeach225 -.word gKartPeach226, gKartPeach227, gKartPeach228 - -glabel gKartPeachGroup3 -.word gKartPeach063, gKartPeach064, gKartPeach065, gKartPeach066 -.word gKartPeach067, gKartPeach068, gKartPeach069, gKartPeach070 -.word gKartPeach071, gKartPeach072, gKartPeach073, gKartPeach074 -.word gKartPeach075, gKartPeach076, gKartPeach077, gKartPeach078 -.word gKartPeach079, gKartPeach080, gKartPeach081, gKartPeach082 -.word gKartPeach083, gKartPeach235, gKartPeach236, gKartPeach237 -.word gKartPeach238, gKartPeach239, gKartPeach240, gKartPeach241 -.word gKartPeach242, gKartPeach243, gKartPeach244, gKartPeach245 -.word gKartPeach246, gKartPeach247, gKartPeach248 - -glabel gKartPeachGroup4 -.word gKartPeach084, gKartPeach085, gKartPeach086, gKartPeach087 -.word gKartPeach088, gKartPeach089, gKartPeach090, gKartPeach091 -.word gKartPeach092, gKartPeach093, gKartPeach094, gKartPeach095 -.word gKartPeach096, gKartPeach097, gKartPeach098, gKartPeach099 -.word gKartPeach100, gKartPeach101, gKartPeach102, gKartPeach103 -.word gKartPeach104, gKartPeach235, gKartPeach236, gKartPeach237 -.word gKartPeach238, gKartPeach239, gKartPeach240, gKartPeach241 -.word gKartPeach242, gKartPeach243, gKartPeach244, gKartPeach245 -.word gKartPeach246, gKartPeach247, gKartPeach248 - -glabel gKartPeachGroup5 -.word gKartPeach105, gKartPeach106, gKartPeach107, gKartPeach108 -.word gKartPeach109, gKartPeach110, gKartPeach111, gKartPeach112 -.word gKartPeach113, gKartPeach114, gKartPeach115, gKartPeach116 -.word gKartPeach117, gKartPeach118, gKartPeach119, gKartPeach120 -.word gKartPeach121, gKartPeach122, gKartPeach123, gKartPeach124 -.word gKartPeach125, gKartPeach235, gKartPeach236, gKartPeach237 -.word gKartPeach238, gKartPeach239, gKartPeach240, gKartPeach241 -.word gKartPeach242, gKartPeach243, gKartPeach244, gKartPeach245 -.word gKartPeach246, gKartPeach247, gKartPeach248 - -glabel gKartPeachGroup6 -.word gKartPeach126, gKartPeach127, gKartPeach128, gKartPeach129 -.word gKartPeach130, gKartPeach131, gKartPeach132, gKartPeach133 -.word gKartPeach134, gKartPeach135, gKartPeach136, gKartPeach137 -.word gKartPeach138, gKartPeach139, gKartPeach140, gKartPeach141 -.word gKartPeach142, gKartPeach143, gKartPeach144, gKartPeach145 -.word gKartPeach146, gKartPeach255, gKartPeach256, gKartPeach257 -.word gKartPeach258, gKartPeach259, gKartPeach260, gKartPeach261 -.word gKartPeach262, gKartPeach263, gKartPeach264, gKartPeach265 -.word gKartPeach266, gKartPeach267, gKartPeach268 - -glabel gKartPeachGroup7 -.word gKartPeach147, gKartPeach148, gKartPeach149, gKartPeach150 -.word gKartPeach151, gKartPeach152, gKartPeach153, gKartPeach154 -.word gKartPeach155, gKartPeach156, gKartPeach157, gKartPeach158 -.word gKartPeach159, gKartPeach160, gKartPeach161, gKartPeach162 -.word gKartPeach163, gKartPeach164, gKartPeach165, gKartPeach166 -.word gKartPeach167, gKartPeach275, gKartPeach276, gKartPeach277 -.word gKartPeach278, gKartPeach279, gKartPeach280, gKartPeach281 -.word gKartPeach282, gKartPeach283, gKartPeach284, gKartPeach285 -.word gKartPeach286, gKartPeach287, gKartPeach288 - -glabel gKartPeachGroup8 -.word gKartPeach168, gKartPeach169, gKartPeach170, gKartPeach171 -.word gKartPeach172, gKartPeach173, gKartPeach174, gKartPeach175 -.word gKartPeach176, gKartPeach177, gKartPeach178, gKartPeach179 -.word gKartPeach180, gKartPeach181, gKartPeach182, gKartPeach183 -.word gKartPeach184, gKartPeach185, gKartPeach186, gKartPeach187 -.word gKartPeach188, gKartPeach275, gKartPeach276, gKartPeach277 -.word gKartPeach278, gKartPeach279, gKartPeach280, gKartPeach281 -.word gKartPeach282, gKartPeach283, gKartPeach284, gKartPeach285 -.word gKartPeach286, gKartPeach287, gKartPeach288 - -glabel gKartPeachGroup9 -.word gKartPeach189, gKartPeach190, gKartPeach191, gKartPeach192 -.word gKartPeach193, gKartPeach194, gKartPeach195, gKartPeach196 -.word gKartPeach197, gKartPeach198, gKartPeach199, gKartPeach200 -.word gKartPeach201, gKartPeach202, gKartPeach203, gKartPeach204 -.word gKartPeach205, gKartPeach206, gKartPeach207, gKartPeach208 - -glabel gKartPeachGroup10 -.word gKartPeach189, gKartPeach190, gKartPeach191, gKartPeach192 -.word gKartPeach193, gKartPeach194, gKartPeach195, gKartPeach196 -.word gKartPeach197, gKartPeach198, gKartPeach199, gKartPeach200 -.word gKartPeach201, gKartPeach202, gKartPeach203, gKartPeach204 -.word gKartPeach205, gKartPeach206, gKartPeach207, gKartPeach208 - -glabel gKartPeachGroup11 -.word gKartPeach209, gKartPeach210, gKartPeach211, gKartPeach212 -.word gKartPeach213, gKartPeach214, gKartPeach215, gKartPeach216 -.word gKartPeach217, gKartPeach218, gKartPeach219, gKartPeach220 -.word gKartPeach221, gKartPeach222, gKartPeach223, gKartPeach224 -.word gKartPeach225, gKartPeach226, gKartPeach227, gKartPeach228 - -glabel gKartPeachGroup12 -.word gKartPeach229, gKartPeach230, gKartPeach231, gKartPeach232 -.word gKartPeach233, gKartPeach234, gKartPeach235, gKartPeach236 -.word gKartPeach237, gKartPeach238, gKartPeach239, gKartPeach240 -.word gKartPeach241, gKartPeach242, gKartPeach243, gKartPeach244 -.word gKartPeach245, gKartPeach246, gKartPeach247, gKartPeach248 - -glabel gKartPeachGroup13 -.word gKartPeach229, gKartPeach230, gKartPeach231, gKartPeach232 -.word gKartPeach233, gKartPeach234, gKartPeach235, gKartPeach236 -.word gKartPeach237, gKartPeach238, gKartPeach239, gKartPeach240 -.word gKartPeach241, gKartPeach242, gKartPeach243, gKartPeach244 -.word gKartPeach245, gKartPeach246, gKartPeach247, gKartPeach248 - -glabel gKartPeachGroup14 -.word gKartPeach229, gKartPeach230, gKartPeach231, gKartPeach232 -.word gKartPeach233, gKartPeach234, gKartPeach235, gKartPeach236 -.word gKartPeach237, gKartPeach238, gKartPeach239, gKartPeach240 -.word gKartPeach241, gKartPeach242, gKartPeach243, gKartPeach244 -.word gKartPeach245, gKartPeach246, gKartPeach247, gKartPeach248 - -glabel gKartPeachGroup15 -.word gKartPeach249, gKartPeach250, gKartPeach251, gKartPeach252 -.word gKartPeach253, gKartPeach254, gKartPeach255, gKartPeach256 -.word gKartPeach257, gKartPeach258, gKartPeach259, gKartPeach260 -.word gKartPeach261, gKartPeach262, gKartPeach263, gKartPeach264 -.word gKartPeach265, gKartPeach266, gKartPeach267, gKartPeach268 - -glabel gKartPeachGroup16 -.word gKartPeach269, gKartPeach270, gKartPeach271, gKartPeach272 -.word gKartPeach273, gKartPeach274, gKartPeach275, gKartPeach276 -.word gKartPeach277, gKartPeach278, gKartPeach279, gKartPeach280 -.word gKartPeach281, gKartPeach282, gKartPeach283, gKartPeach284 -.word gKartPeach285, gKartPeach286, gKartPeach287, gKartPeach288 - -glabel gKartPeachGroup17 -.word gKartPeach269, gKartPeach270, gKartPeach271, gKartPeach272 -.word gKartPeach273, gKartPeach274, gKartPeach275, gKartPeach276 -.word gKartPeach277, gKartPeach278, gKartPeach279, gKartPeach280 -.word gKartPeach281, gKartPeach282, gKartPeach283, gKartPeach284 -.word gKartPeach285, gKartPeach286, gKartPeach287, gKartPeach288 - -glabel gKartWarioGroup0 -.word gKartWario000, gKartWario001, gKartWario002, gKartWario003 -.word gKartWario004, gKartWario005, gKartWario006, gKartWario007 -.word gKartWario008, gKartWario009, gKartWario010, gKartWario011 -.word gKartWario012, gKartWario013, gKartWario014, gKartWario015 -.word gKartWario016, gKartWario017, gKartWario018, gKartWario019 -.word gKartWario020, gKartWario195, gKartWario196, gKartWario197 -.word gKartWario198, gKartWario199, gKartWario200, gKartWario201 -.word gKartWario202, gKartWario203, gKartWario204, gKartWario205 -.word gKartWario206, gKartWario207, gKartWario208 - -glabel gKartWarioGroup1 -.word gKartWario021, gKartWario022, gKartWario023, gKartWario024 -.word gKartWario025, gKartWario026, gKartWario027, gKartWario028 -.word gKartWario029, gKartWario030, gKartWario031, gKartWario032 -.word gKartWario033, gKartWario034, gKartWario035, gKartWario036 -.word gKartWario037, gKartWario038, gKartWario039, gKartWario040 -.word gKartWario041, gKartWario195, gKartWario196, gKartWario197 -.word gKartWario198, gKartWario199, gKartWario200, gKartWario201 -.word gKartWario202, gKartWario203, gKartWario204, gKartWario205 -.word gKartWario206, gKartWario207, gKartWario208 - -glabel gKartWarioGroup2 -.word gKartWario042, gKartWario043, gKartWario044, gKartWario045 -.word gKartWario046, gKartWario047, gKartWario048, gKartWario049 -.word gKartWario050, gKartWario051, gKartWario052, gKartWario053 -.word gKartWario054, gKartWario055, gKartWario056, gKartWario057 -.word gKartWario058, gKartWario059, gKartWario060, gKartWario061 -.word gKartWario062, gKartWario215, gKartWario216, gKartWario217 -.word gKartWario218, gKartWario219, gKartWario220, gKartWario221 -.word gKartWario222, gKartWario223, gKartWario224, gKartWario225 -.word gKartWario226, gKartWario227, gKartWario228 - -glabel gKartWarioGroup3 -.word gKartWario063, gKartWario064, gKartWario065, gKartWario066 -.word gKartWario067, gKartWario068, gKartWario069, gKartWario070 -.word gKartWario071, gKartWario072, gKartWario073, gKartWario074 -.word gKartWario075, gKartWario076, gKartWario077, gKartWario078 -.word gKartWario079, gKartWario080, gKartWario081, gKartWario082 -.word gKartWario083, gKartWario235, gKartWario236, gKartWario237 -.word gKartWario238, gKartWario239, gKartWario240, gKartWario241 -.word gKartWario242, gKartWario243, gKartWario244, gKartWario245 -.word gKartWario246, gKartWario247, gKartWario248 - -glabel gKartWarioGroup4 -.word gKartWario084, gKartWario085, gKartWario086, gKartWario087 -.word gKartWario088, gKartWario089, gKartWario090, gKartWario091 -.word gKartWario092, gKartWario093, gKartWario094, gKartWario095 -.word gKartWario096, gKartWario097, gKartWario098, gKartWario099 -.word gKartWario100, gKartWario101, gKartWario102, gKartWario103 -.word gKartWario104, gKartWario235, gKartWario236, gKartWario237 -.word gKartWario238, gKartWario239, gKartWario240, gKartWario241 -.word gKartWario242, gKartWario243, gKartWario244, gKartWario245 -.word gKartWario246, gKartWario247, gKartWario248 - -glabel gKartWarioGroup5 -.word gKartWario105, gKartWario106, gKartWario107, gKartWario108 -.word gKartWario109, gKartWario110, gKartWario111, gKartWario112 -.word gKartWario113, gKartWario114, gKartWario115, gKartWario116 -.word gKartWario117, gKartWario118, gKartWario119, gKartWario120 -.word gKartWario121, gKartWario122, gKartWario123, gKartWario124 -.word gKartWario125, gKartWario235, gKartWario236, gKartWario237 -.word gKartWario238, gKartWario239, gKartWario240, gKartWario241 -.word gKartWario242, gKartWario243, gKartWario244, gKartWario245 -.word gKartWario246, gKartWario247, gKartWario248 - -glabel gKartWarioGroup6 -.word gKartWario126, gKartWario127, gKartWario128, gKartWario129 -.word gKartWario130, gKartWario131, gKartWario132, gKartWario133 -.word gKartWario134, gKartWario135, gKartWario136, gKartWario137 -.word gKartWario138, gKartWario139, gKartWario140, gKartWario141 -.word gKartWario142, gKartWario143, gKartWario144, gKartWario145 -.word gKartWario146, gKartWario255, gKartWario256, gKartWario257 -.word gKartWario258, gKartWario259, gKartWario260, gKartWario261 -.word gKartWario262, gKartWario263, gKartWario264, gKartWario265 -.word gKartWario266, gKartWario267, gKartWario268 - -glabel gKartWarioGroup7 -.word gKartWario147, gKartWario148, gKartWario149, gKartWario150 -.word gKartWario151, gKartWario152, gKartWario153, gKartWario154 -.word gKartWario155, gKartWario156, gKartWario157, gKartWario158 -.word gKartWario159, gKartWario160, gKartWario161, gKartWario162 -.word gKartWario163, gKartWario164, gKartWario165, gKartWario166 -.word gKartWario167, gKartWario275, gKartWario276, gKartWario277 -.word gKartWario278, gKartWario279, gKartWario280, gKartWario281 -.word gKartWario282, gKartWario283, gKartWario284, gKartWario285 -.word gKartWario286, gKartWario287, gKartWario288 - -glabel gKartWarioGroup8 -.word gKartWario168, gKartWario169, gKartWario170, gKartWario171 -.word gKartWario172, gKartWario173, gKartWario174, gKartWario175 -.word gKartWario176, gKartWario177, gKartWario178, gKartWario179 -.word gKartWario180, gKartWario181, gKartWario182, gKartWario183 -.word gKartWario184, gKartWario185, gKartWario186, gKartWario187 -.word gKartWario188, gKartWario275, gKartWario276, gKartWario277 -.word gKartWario278, gKartWario279, gKartWario280, gKartWario281 -.word gKartWario282, gKartWario283, gKartWario284, gKartWario285 -.word gKartWario286, gKartWario287, gKartWario288 - -glabel gKartWarioGroup9 -.word gKartWario189, gKartWario190, gKartWario191, gKartWario192 -.word gKartWario193, gKartWario194, gKartWario195, gKartWario196 -.word gKartWario197, gKartWario198, gKartWario199, gKartWario200 -.word gKartWario201, gKartWario202, gKartWario203, gKartWario204 -.word gKartWario205, gKartWario206, gKartWario207, gKartWario208 - -glabel gKartWarioGroup10 -.word gKartWario189, gKartWario190, gKartWario191, gKartWario192 -.word gKartWario193, gKartWario194, gKartWario195, gKartWario196 -.word gKartWario197, gKartWario198, gKartWario199, gKartWario200 -.word gKartWario201, gKartWario202, gKartWario203, gKartWario204 -.word gKartWario205, gKartWario206, gKartWario207, gKartWario208 - -glabel gKartWarioGroup11 -.word gKartWario209, gKartWario210, gKartWario211, gKartWario212 -.word gKartWario213, gKartWario214, gKartWario215, gKartWario216 -.word gKartWario217, gKartWario218, gKartWario219, gKartWario220 -.word gKartWario221, gKartWario222, gKartWario223, gKartWario224 -.word gKartWario225, gKartWario226, gKartWario227, gKartWario228 - -glabel gKartWarioGroup12 -.word gKartWario229, gKartWario230, gKartWario231, gKartWario232 -.word gKartWario233, gKartWario234, gKartWario235, gKartWario236 -.word gKartWario237, gKartWario238, gKartWario239, gKartWario240 -.word gKartWario241, gKartWario242, gKartWario243, gKartWario244 -.word gKartWario245, gKartWario246, gKartWario247, gKartWario248 - -glabel gKartWarioGroup13 -.word gKartWario229, gKartWario230, gKartWario231, gKartWario232 -.word gKartWario233, gKartWario234, gKartWario235, gKartWario236 -.word gKartWario237, gKartWario238, gKartWario239, gKartWario240 -.word gKartWario241, gKartWario242, gKartWario243, gKartWario244 -.word gKartWario245, gKartWario246, gKartWario247, gKartWario248 - -glabel gKartWarioGroup14 -.word gKartWario229, gKartWario230, gKartWario231, gKartWario232 -.word gKartWario233, gKartWario234, gKartWario235, gKartWario236 -.word gKartWario237, gKartWario238, gKartWario239, gKartWario240 -.word gKartWario241, gKartWario242, gKartWario243, gKartWario244 -.word gKartWario245, gKartWario246, gKartWario247, gKartWario248 - -glabel gKartWarioGroup15 -.word gKartWario249, gKartWario250, gKartWario251, gKartWario252 -.word gKartWario253, gKartWario254, gKartWario255, gKartWario256 -.word gKartWario257, gKartWario258, gKartWario259, gKartWario260 -.word gKartWario261, gKartWario262, gKartWario263, gKartWario264 -.word gKartWario265, gKartWario266, gKartWario267, gKartWario268 - -glabel gKartWarioGroup16 -.word gKartWario269, gKartWario270, gKartWario271, gKartWario272 -.word gKartWario273, gKartWario274, gKartWario275, gKartWario276 -.word gKartWario277, gKartWario278, gKartWario279, gKartWario280 -.word gKartWario281, gKartWario282, gKartWario283, gKartWario284 -.word gKartWario285, gKartWario286, gKartWario287, gKartWario288 - -glabel gKartWarioGroup17 -.word gKartWario269, gKartWario270, gKartWario271, gKartWario272 -.word gKartWario273, gKartWario274, gKartWario275, gKartWario276 -.word gKartWario277, gKartWario278, gKartWario279, gKartWario280 -.word gKartWario281, gKartWario282, gKartWario283, gKartWario284 -.word gKartWario285, gKartWario286, gKartWario287, gKartWario288 - -glabel gKartMarioTable0 -.word gKartMarioGroup8, gKartMarioGroup7, gKartMarioGroup6, gKartMarioGroup5 -.word gKartMarioGroup4, gKartMarioGroup3, gKartMarioGroup2, gKartMarioGroup1 -.word gKartMarioGroup0 - -glabel gKartLuigiTable0 -.word gKartLuigiGroup8, gKartLuigiGroup7, gKartLuigiGroup6, gKartLuigiGroup5 -.word gKartLuigiGroup4, gKartLuigiGroup3, gKartLuigiGroup2, gKartLuigiGroup1 -.word gKartLuigiGroup0 - -glabel gKartYoshiTable0 -.word gKartYoshiGroup8, gKartYoshiGroup7, gKartYoshiGroup6, gKartYoshiGroup5 -.word gKartYoshiGroup4, gKartYoshiGroup3, gKartYoshiGroup2, gKartYoshiGroup1 -.word gKartYoshiGroup0 - -glabel gKartToadTable0 -.word gKartToadGroup8, gKartToadGroup7, gKartToadGroup6, gKartToadGroup5 -.word gKartToadGroup4, gKartToadGroup3, gKartToadGroup2, gKartToadGroup1 -.word gKartToadGroup0 - -glabel gKartDKTable0 -.word gKartDKGroup8, gKartDKGroup7, gKartDKGroup6, gKartDKGroup5 -.word gKartDKGroup4, gKartDKGroup3, gKartDKGroup2, gKartDKGroup1 -.word gKartDKGroup0 - -glabel gKartWarioTable0 -.word gKartWarioGroup8, gKartWarioGroup7, gKartWarioGroup6, gKartWarioGroup5 -.word gKartWarioGroup4, gKartWarioGroup3, gKartWarioGroup2, gKartWarioGroup1 -.word gKartWarioGroup0 - -glabel gKartPeachTable0 -.word gKartPeachGroup8, gKartPeachGroup7, gKartPeachGroup6, gKartPeachGroup5 -.word gKartPeachGroup4, gKartPeachGroup3, gKartPeachGroup2, gKartPeachGroup1 -.word gKartPeachGroup0 - -glabel gKartBowserTable0 -.word gKartBowserGroup8, gKartBowserGroup7, gKartBowserGroup6, gKartBowserGroup5 -.word gKartBowserGroup4, gKartBowserGroup3, gKartBowserGroup2, gKartBowserGroup1 -.word gKartBowserGroup0 - -glabel gKartMarioTable1 -.word gKartMarioGroup17, gKartMarioGroup16, gKartMarioGroup15, gKartMarioGroup14 -.word gKartMarioGroup13, gKartMarioGroup12, gKartMarioGroup11, gKartMarioGroup10 -.word gKartMarioGroup9 - -glabel gKartLuigiTable1 -.word gKartLuigiGroup17, gKartLuigiGroup16, gKartLuigiGroup15, gKartLuigiGroup14 -.word gKartLuigiGroup13, gKartLuigiGroup12, gKartLuigiGroup11, gKartLuigiGroup10 -.word gKartLuigiGroup9 - -glabel gKartYoshiTable1 -.word gKartYoshiGroup17, gKartYoshiGroup16, gKartYoshiGroup15, gKartYoshiGroup14 -.word gKartYoshiGroup13, gKartYoshiGroup12, gKartYoshiGroup11, gKartYoshiGroup10 -.word gKartYoshiGroup9 - -glabel gKartToadTable1 -.word gKartToadGroup17, gKartToadGroup16, gKartToadGroup15, gKartToadGroup14 -.word gKartToadGroup13, gKartToadGroup12, gKartToadGroup11, gKartToadGroup10 -.word gKartToadGroup9 - -glabel gKartDKTable1 -.word gKartDKGroup17, gKartDKGroup16, gKartDKGroup15, gKartDKGroup14 -.word gKartDKGroup13, gKartDKGroup12, gKartDKGroup11, gKartDKGroup10 -.word gKartDKGroup9 - -glabel gKartWarioTable1 -.word gKartWarioGroup17, gKartWarioGroup16, gKartWarioGroup15, gKartWarioGroup14 -.word gKartWarioGroup13, gKartWarioGroup12, gKartWarioGroup11, gKartWarioGroup10 -.word gKartWarioGroup9 - -glabel gKartPeachTable1 -.word gKartPeachGroup17, gKartPeachGroup16, gKartPeachGroup15, gKartPeachGroup14 -.word gKartPeachGroup13, gKartPeachGroup12, gKartPeachGroup11, gKartPeachGroup10 -.word gKartPeachGroup9 - -glabel gKartBowserTable1 -.word gKartBowserGroup17, gKartBowserGroup16, gKartBowserGroup15, gKartBowserGroup14 -.word gKartBowserGroup13, gKartBowserGroup12, gKartBowserGroup11, gKartBowserGroup10 -.word gKartBowserGroup9 - -glabel gKartTextureTable0 -.word gKartMarioTable0 -.word gKartLuigiTable0 -.word gKartYoshiTable0 -.word gKartToadTable0 -.word gKartDKTable0 -.word gKartWarioTable0 -.word gKartPeachTable0 -.word gKartBowserTable0 - -glabel gKartTextureTable1 -.word gKartMarioTable1 -.word gKartLuigiTable1 -.word gKartYoshiTable1 -.word gKartToadTable1 -.word gKartDKTable1 -.word gKartWarioTable1 -.word gKartPeachTable1 -.word gKartBowserTable1 - -glabel gKartMarioGroup18 -.word gKartMario289, gKartMario290, gKartMario291, gKartMario292 -.word gKartMario293, gKartMario294, gKartMario295, gKartMario296 -.word gKartMario297, gKartMario298, gKartMario299, gKartMario300 -.word gKartMario301, gKartMario302, gKartMario303, gKartMario304 -.word gKartMario305, gKartMario306, gKartMario307, gKartMario308 -.word gKartMario309, gKartMario310, gKartMario311, gKartMario312 -.word gKartMario313, gKartMario314, gKartMario315, gKartMario316 -.word gKartMario317, gKartMario318, gKartMario319, gKartMario320 - -glabel gKartLuigiGroup18 -.word gKartLuigi289, gKartLuigi290, gKartLuigi291, gKartLuigi292 -.word gKartLuigi293, gKartLuigi294, gKartLuigi295, gKartLuigi296 -.word gKartLuigi297, gKartLuigi298, gKartLuigi299, gKartLuigi300 -.word gKartLuigi301, gKartLuigi302, gKartLuigi303, gKartLuigi304 -.word gKartLuigi305, gKartLuigi306, gKartLuigi307, gKartLuigi308 -.word gKartLuigi309, gKartLuigi310, gKartLuigi311, gKartLuigi312 -.word gKartLuigi313, gKartLuigi314, gKartLuigi315, gKartLuigi316 -.word gKartLuigi317, gKartLuigi318, gKartLuigi319, gKartLuigi320 - -glabel gKartBowserGroup18 -.word gKartBowser289, gKartBowser290, gKartBowser291, gKartBowser292 -.word gKartBowser293, gKartBowser294, gKartBowser295, gKartBowser296 -.word gKartBowser297, gKartBowser298, gKartBowser299, gKartBowser300 -.word gKartBowser301, gKartBowser302, gKartBowser303, gKartBowser304 -.word gKartBowser305, gKartBowser306, gKartBowser307, gKartBowser308 -.word gKartBowser309, gKartBowser310, gKartBowser311, gKartBowser312 -.word gKartBowser313, gKartBowser314, gKartBowser315, gKartBowser316 -.word gKartBowser317, gKartBowser318, gKartBowser319, gKartBowser320 - -glabel gKartToadGroup18 -.word gKartToad289, gKartToad290, gKartToad291, gKartToad292 -.word gKartToad293, gKartToad294, gKartToad295, gKartToad296 -.word gKartToad297, gKartToad298, gKartToad299, gKartToad300 -.word gKartToad301, gKartToad302, gKartToad303, gKartToad304 -.word gKartToad305, gKartToad306, gKartToad307, gKartToad308 -.word gKartToad309, gKartToad310, gKartToad311, gKartToad312 -.word gKartToad313, gKartToad314, gKartToad315, gKartToad316 -.word gKartToad317, gKartToad318, gKartToad319, gKartToad320 - -glabel gKartYoshiGroup18 -.word gKartYoshi289, gKartYoshi290, gKartYoshi291, gKartYoshi292 -.word gKartYoshi293, gKartYoshi294, gKartYoshi295, gKartYoshi296 -.word gKartYoshi297, gKartYoshi298, gKartYoshi299, gKartYoshi300 -.word gKartYoshi301, gKartYoshi302, gKartYoshi303, gKartYoshi304 -.word gKartYoshi305, gKartYoshi306, gKartYoshi307, gKartYoshi308 -.word gKartYoshi309, gKartYoshi310, gKartYoshi311, gKartYoshi312 -.word gKartYoshi313, gKartYoshi314, gKartYoshi315, gKartYoshi316 -.word gKartYoshi317, gKartYoshi318, gKartYoshi319, gKartYoshi320 - -glabel gKartDKGroup18 -.word gKartDK289, gKartDK290, gKartDK291, gKartDK292 -.word gKartDK293, gKartDK294, gKartDK295, gKartDK296 -.word gKartDK297, gKartDK298, gKartDK299, gKartDK300 -.word gKartDK301, gKartDK302, gKartDK303, gKartDK304 -.word gKartDK305, gKartDK306, gKartDK307, gKartDK308 -.word gKartDK309, gKartDK310, gKartDK311, gKartDK312 -.word gKartDK313, gKartDK314, gKartDK315, gKartDK316 -.word gKartDK317, gKartDK318, gKartDK319, gKartDK320 - -glabel gKartPeachGroup18 -.word gKartPeach289, gKartPeach290, gKartPeach291, gKartPeach292 -.word gKartPeach293, gKartPeach294, gKartPeach295, gKartPeach296 -.word gKartPeach297, gKartPeach298, gKartPeach299, gKartPeach300 -.word gKartPeach301, gKartPeach302, gKartPeach303, gKartPeach304 -.word gKartPeach305, gKartPeach306, gKartPeach307, gKartPeach308 -.word gKartPeach309, gKartPeach310, gKartPeach311, gKartPeach312 -.word gKartPeach313, gKartPeach314, gKartPeach315, gKartPeach316 -.word gKartPeach317, gKartPeach318, gKartPeach319, gKartPeach320 - -glabel gKartWarioGroup18 -.word gKartWario289, gKartWario290, gKartWario291, gKartWario292 -.word gKartWario293, gKartWario294, gKartWario295, gKartWario296 -.word gKartWario297, gKartWario298, gKartWario299, gKartWario300 -.word gKartWario301, gKartWario302, gKartWario303, gKartWario304 -.word gKartWario305, gKartWario306, gKartWario307, gKartWario308 -.word gKartWario309, gKartWario310, gKartWario311, gKartWario312 -.word gKartWario313, gKartWario314, gKartWario315, gKartWario316 -.word gKartWario317, gKartWario318, gKartWario319, gKartWario320 - -glabel gKartTextureGroup18s -.word gKartMarioGroup18 -.word gKartLuigiGroup18 -.word gKartYoshiGroup18 -.word gKartToadGroup18 -.word gKartDKGroup18 -.word gKartWarioGroup18 -.word gKartPeachGroup18 -.word gKartBowserGroup18 - -glabel gKartPalettes -.word gKartMarioPalette -.word gKartLuigiPalette -.word gKartYoshiPalette -.word gKartToadPalette -.word gKartDKPalette -.word gKartWarioPalette -.word gKartPeachPalette -.word gKartBowserPalette +#glabel camera4 # p4 camera struct pointer +#.word D_80164918 diff --git a/data/data_0DD0A0_1_1.s b/data/data_0DD0A0_1_1.s new file mode 100644 index 000000000..0ac7fd0e3 --- /dev/null +++ b/data/data_0DD0A0_1_1.s @@ -0,0 +1,1628 @@ +# Mario Kart 64 (U) disassembly and split file +# generated by n64split v0.4a - N64 ROM splitter + +.include "macros.inc" + +.section .data + +glabel D_800DDB50 +.byte 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02 + +glabel D_800DDB58 +.word 0x00000000, gFramebuffer0, gFramebuffer1, gFramebuffer2 + +glabel D_800DDB68 +.word D_800ED600, D_800ED608, D_800ED610, D_800ED618 +.word D_800ED620, D_800ED628, D_800ED630, D_800ED638 + +glabel D_800DDB88 +.word D_800ED640, D_800ED648, D_800ED650, D_800ED658 +.word D_800ED660, D_800ED668, D_800ED670, D_800ED678 +.word 0x00000000, 0x00000000, 0x00000000 + +glabel D_800DDBB4 +.word D_800E49C0, D_800E4AC0, D_800E4BC0, D_800E4CC0 +.word D_800E4DC0, D_800E4EC0, D_800E4FD0, D_800E50D0 + +glabel D_800DDBD4 +.float 0.75, 0.75, 0.75, 0.75 +.float 0.75, 0.75, 0.75, 0.75 + +glabel gKartMarioWheels0 +.word gKartMario168Wheel0, gKartMario147Wheel0, gKartMario126Wheel0, gKartMario105Wheel0 +.word gKartMario084Wheel0, gKartMario063Wheel0, gKartMario042Wheel0, gKartMario021Wheel0 +.word gKartMario000Wheel0 + +glabel gKartMarioWheels1 +.word gKartMario269Wheel0, gKartMario269Wheel0, gKartMario249Wheel0, gKartMario229Wheel0 +.word gKartMario229Wheel0, gKartMario229Wheel0, gKartMario209Wheel0, gKartMario189Wheel0 +.word gKartMario189Wheel0 + +glabel gKartLuigiWheels0 +.word gKartLuigi168Wheel0, gKartLuigi147Wheel0, gKartLuigi126Wheel0, gKartLuigi105Wheel0 +.word gKartLuigi084Wheel0, gKartLuigi063Wheel0, gKartLuigi042Wheel0, gKartLuigi021Wheel0 +.word gKartLuigi000Wheel0 + +glabel gKartLuigiWheels1 +.word gKartLuigi269Wheel0, gKartLuigi269Wheel0, gKartLuigi249Wheel0, gKartLuigi229Wheel0 +.word gKartLuigi229Wheel0, gKartLuigi229Wheel0, gKartLuigi209Wheel0, gKartLuigi189Wheel0 +.word gKartLuigi189Wheel0 + +glabel gKartBowserWheels0 +.word gKartBowser168Wheel0, gKartBowser147Wheel0, gKartBowser126Wheel0, gKartBowser105Wheel0 +.word gKartBowser084Wheel0, gKartBowser063Wheel0, gKartBowser042Wheel0, gKartBowser021Wheel0 +.word gKartBowser000Wheel0 + +glabel gKartBowserWheels1 +.word gKartBowser269Wheel0, gKartBowser269Wheel0, gKartBowser249Wheel0, gKartBowser229Wheel0 +.word gKartBowser229Wheel0, gKartBowser229Wheel0, gKartBowser209Wheel0, gKartBowser189Wheel0 +.word gKartBowser189Wheel0 + +glabel gKartToadWheels0 +.word gKartToad168Wheel0, gKartToad147Wheel0, gKartToad126Wheel0, gKartToad105Wheel0 +.word gKartToad084Wheel0, gKartToad063Wheel0, gKartToad042Wheel0, gKartToad021Wheel0 +.word gKartToad000Wheel0 + +glabel gKartToadWheels1 +.word gKartToad269Wheel0, gKartToad269Wheel0, gKartToad249Wheel0, gKartToad229Wheel0 +.word gKartToad229Wheel0, gKartToad229Wheel0, gKartToad209Wheel0, gKartToad189Wheel0 +.word gKartToad189Wheel0 + +glabel gKartYoshiWheels0 +.word gKartYoshi168Wheel0, gKartYoshi147Wheel0, gKartYoshi126Wheel0, gKartYoshi105Wheel0 +.word gKartYoshi084Wheel0, gKartYoshi063Wheel0, gKartYoshi042Wheel0, gKartYoshi021Wheel0 +.word gKartYoshi000Wheel0 + +glabel gKartYoshiWheels1 +.word gKartYoshi269Wheel0, gKartYoshi269Wheel0, gKartYoshi249Wheel0, gKartYoshi229Wheel0 +.word gKartYoshi229Wheel0, gKartYoshi229Wheel0, gKartYoshi209Wheel0, gKartYoshi189Wheel0 +.word gKartYoshi189Wheel0 + +glabel gKartDKWheels0 +.word gKartDK168Wheel0, gKartDK147Wheel0, gKartDK126Wheel0, gKartDK105Wheel0 +.word gKartDK084Wheel0, gKartDK063Wheel0, gKartDK042Wheel0, gKartDK021Wheel0 +.word gKartDK000Wheel0 + +glabel gKartDKWheels1 +.word gKartDK269Wheel0, gKartDK269Wheel0, gKartDK249Wheel0, gKartDK229Wheel0 +.word gKartDK229Wheel0, gKartDK229Wheel0, gKartDK209Wheel0, gKartDK189Wheel0 +.word gKartDK189Wheel0 + +glabel gKartPeachWheels0 +.word gKartPeach168Wheel0, gKartPeach147Wheel0, gKartPeach126Wheel0, gKartPeach105Wheel0 +.word gKartPeach084Wheel0, gKartPeach063Wheel0, gKartPeach042Wheel0, gKartPeach021Wheel0 +.word gKartPeach000Wheel0 + +glabel gKartPeachWheels1 +.word gKartPeach269Wheel0, gKartPeach269Wheel0, gKartPeach249Wheel0, gKartPeach229Wheel0 +.word gKartPeach229Wheel0, gKartPeach229Wheel0, gKartPeach209Wheel0, gKartPeach189Wheel0 +.word gKartPeach189Wheel0 + +glabel gKartWarioWheels0 +.word gKartWario168Wheel0, gKartWario147Wheel0, gKartWario126Wheel0, gKartWario105Wheel0 +.word gKartWario084Wheel0, gKartWario063Wheel0, gKartWario042Wheel0, gKartWario021Wheel0 +.word gKartWario000Wheel0 + +glabel gKartWarioWheels1 +.word gKartWario269Wheel0, gKartWario269Wheel0, gKartWario249Wheel0, gKartWario229Wheel0 +.word gKartWario229Wheel0, gKartWario229Wheel0, gKartWario209Wheel0, gKartWario189Wheel0 +.word gKartWario189Wheel0 + +glabel D_800DDE34 +.word gKartMarioWheels0, gKartLuigiWheels0, gKartYoshiWheels0, gKartToadWheels0 +.word gKartDKWheels0, gKartWarioWheels0, gKartPeachWheels0, gKartBowserWheels0 + +glabel D_800DDE54 +.word gKartMarioWheels1, gKartLuigiWheels1, gKartYoshiWheels1, gKartToadWheels1 +.word gKartDKWheels1, gKartWarioWheels1, gKartPeachWheels1, gKartBowserWheels1 + +glabel D_800DDE74 +.word 0x00000060, 0x00000080, 0x000000c0, 0x00000100 +.word 0x00000120, 0x00000180, 0x00000200, 0x00000220 + +glabel D_800DDE94 +.word 0x00000240, 0x00000000 + +glabel D_800DDE9C +.word 0x41100000, 0x40e00000, 0x40a00000 + +.word 0x00000000, 0x00000000 + +glabel D_800DDEB0 +.hword 0x06c0, 0x06e0, 0x06e0, 0x0680, 0x07c0, 0x0700, 0x0680, 0x0910 + +glabel gKartMarioGroup0 +.word gKartMario000, gKartMario001, gKartMario002, gKartMario003 +.word gKartMario004, gKartMario005, gKartMario006, gKartMario007 +.word gKartMario008, gKartMario009, gKartMario010, gKartMario011 +.word gKartMario012, gKartMario013, gKartMario014, gKartMario015 +.word gKartMario016, gKartMario017, gKartMario018, gKartMario019 +.word gKartMario020, gKartMario195, gKartMario196, gKartMario197 +.word gKartMario198, gKartMario199, gKartMario200, gKartMario201 +.word gKartMario202, gKartMario203, gKartMario204, gKartMario205 +.word gKartMario206, gKartMario207, gKartMario208 + +glabel gKartMarioGroup1 +.word gKartMario021, gKartMario022, gKartMario023, gKartMario024 +.word gKartMario025, gKartMario026, gKartMario027, gKartMario028 +.word gKartMario029, gKartMario030, gKartMario031, gKartMario032 +.word gKartMario033, gKartMario034, gKartMario035, gKartMario036 +.word gKartMario037, gKartMario038, gKartMario039, gKartMario040 +.word gKartMario041, gKartMario195, gKartMario196, gKartMario197 +.word gKartMario198, gKartMario199, gKartMario200, gKartMario201 +.word gKartMario202, gKartMario203, gKartMario204, gKartMario205 +.word gKartMario206, gKartMario207, gKartMario208 + +glabel gKartMarioGroup2 +.word gKartMario042, gKartMario043, gKartMario044, gKartMario045 +.word gKartMario046, gKartMario047, gKartMario048, gKartMario049 +.word gKartMario050, gKartMario051, gKartMario052, gKartMario053 +.word gKartMario054, gKartMario055, gKartMario056, gKartMario057 +.word gKartMario058, gKartMario059, gKartMario060, gKartMario061 +.word gKartMario062, gKartMario215, gKartMario216, gKartMario217 +.word gKartMario218, gKartMario219, gKartMario220, gKartMario221 +.word gKartMario222, gKartMario223, gKartMario224, gKartMario225 +.word gKartMario226, gKartMario227, gKartMario228 + +glabel gKartMarioGroup3 +.word gKartMario063, gKartMario064, gKartMario065, gKartMario066 +.word gKartMario067, gKartMario068, gKartMario069, gKartMario070 +.word gKartMario071, gKartMario072, gKartMario073, gKartMario074 +.word gKartMario075, gKartMario076, gKartMario077, gKartMario078 +.word gKartMario079, gKartMario080, gKartMario081, gKartMario082 +.word gKartMario083, gKartMario235, gKartMario236, gKartMario237 +.word gKartMario238, gKartMario239, gKartMario240, gKartMario241 +.word gKartMario242, gKartMario243, gKartMario244, gKartMario245 +.word gKartMario246, gKartMario247, gKartMario248 + +glabel gKartMarioGroup4 +.word gKartMario084, gKartMario085, gKartMario086, gKartMario087 +.word gKartMario088, gKartMario089, gKartMario090, gKartMario091 +.word gKartMario092, gKartMario093, gKartMario094, gKartMario095 +.word gKartMario096, gKartMario097, gKartMario098, gKartMario099 +.word gKartMario100, gKartMario101, gKartMario102, gKartMario103 +.word gKartMario104, gKartMario235, gKartMario236, gKartMario237 +.word gKartMario238, gKartMario239, gKartMario240, gKartMario241 +.word gKartMario242, gKartMario243, gKartMario244, gKartMario245 +.word gKartMario246, gKartMario247, gKartMario248 + +glabel gKartMarioGroup5 +.word gKartMario105, gKartMario106, gKartMario107, gKartMario108 +.word gKartMario109, gKartMario110, gKartMario111, gKartMario112 +.word gKartMario113, gKartMario114, gKartMario115, gKartMario116 +.word gKartMario117, gKartMario118, gKartMario119, gKartMario120 +.word gKartMario121, gKartMario122, gKartMario123, gKartMario124 +.word gKartMario125, gKartMario235, gKartMario236, gKartMario237 +.word gKartMario238, gKartMario239, gKartMario240, gKartMario241 +.word gKartMario242, gKartMario243, gKartMario244, gKartMario245 +.word gKartMario246, gKartMario247, gKartMario248 + +glabel gKartMarioGroup6 +.word gKartMario126, gKartMario127, gKartMario128, gKartMario129 +.word gKartMario130, gKartMario131, gKartMario132, gKartMario133 +.word gKartMario134, gKartMario135, gKartMario136, gKartMario137 +.word gKartMario138, gKartMario139, gKartMario140, gKartMario141 +.word gKartMario142, gKartMario143, gKartMario144, gKartMario145 +.word gKartMario146, gKartMario255, gKartMario256, gKartMario257 +.word gKartMario258, gKartMario259, gKartMario260, gKartMario261 +.word gKartMario262, gKartMario263, gKartMario264, gKartMario265 +.word gKartMario266, gKartMario267, gKartMario268 + +glabel gKartMarioGroup7 +.word gKartMario147, gKartMario148, gKartMario149, gKartMario150 +.word gKartMario151, gKartMario152, gKartMario153, gKartMario154 +.word gKartMario155, gKartMario156, gKartMario157, gKartMario158 +.word gKartMario159, gKartMario160, gKartMario161, gKartMario162 +.word gKartMario163, gKartMario164, gKartMario165, gKartMario166 +.word gKartMario167, gKartMario275, gKartMario276, gKartMario277 +.word gKartMario278, gKartMario279, gKartMario280, gKartMario281 +.word gKartMario282, gKartMario283, gKartMario284, gKartMario285 +.word gKartMario286, gKartMario287, gKartMario288 + +glabel gKartMarioGroup8 +.word gKartMario168, gKartMario169, gKartMario170, gKartMario171 +.word gKartMario172, gKartMario173, gKartMario174, gKartMario175 +.word gKartMario176, gKartMario177, gKartMario178, gKartMario179 +.word gKartMario180, gKartMario181, gKartMario182, gKartMario183 +.word gKartMario184, gKartMario185, gKartMario186, gKartMario187 +.word gKartMario188, gKartMario275, gKartMario276, gKartMario277 +.word gKartMario278, gKartMario279, gKartMario280, gKartMario281 +.word gKartMario282, gKartMario283, gKartMario284, gKartMario285 +.word gKartMario286, gKartMario287, gKartMario288 + +glabel gKartMarioGroup9 +.word gKartMario189, gKartMario190, gKartMario191, gKartMario192 +.word gKartMario193, gKartMario194, gKartMario195, gKartMario196 +.word gKartMario197, gKartMario198, gKartMario199, gKartMario200 +.word gKartMario201, gKartMario202, gKartMario203, gKartMario204 +.word gKartMario205, gKartMario206, gKartMario207, gKartMario208 + +glabel gKartMarioGroup10 +.word gKartMario189, gKartMario190, gKartMario191, gKartMario192 +.word gKartMario193, gKartMario194, gKartMario195, gKartMario196 +.word gKartMario197, gKartMario198, gKartMario199, gKartMario200 +.word gKartMario201, gKartMario202, gKartMario203, gKartMario204 +.word gKartMario205, gKartMario206, gKartMario207, gKartMario208 + +glabel gKartMarioGroup11 +.word gKartMario209, gKartMario210, gKartMario211, gKartMario212 +.word gKartMario213, gKartMario214, gKartMario215, gKartMario216 +.word gKartMario217, gKartMario218, gKartMario219, gKartMario220 +.word gKartMario221, gKartMario222, gKartMario223, gKartMario224 +.word gKartMario225, gKartMario226, gKartMario227, gKartMario228 + +glabel gKartMarioGroup12 +.word gKartMario229, gKartMario230, gKartMario231, gKartMario232 +.word gKartMario233, gKartMario234, gKartMario235, gKartMario236 +.word gKartMario237, gKartMario238, gKartMario239, gKartMario240 +.word gKartMario241, gKartMario242, gKartMario243, gKartMario244 +.word gKartMario245, gKartMario246, gKartMario247, gKartMario248 + +glabel gKartMarioGroup13 +.word gKartMario229, gKartMario230, gKartMario231, gKartMario232 +.word gKartMario233, gKartMario234, gKartMario235, gKartMario236 +.word gKartMario237, gKartMario238, gKartMario239, gKartMario240 +.word gKartMario241, gKartMario242, gKartMario243, gKartMario244 +.word gKartMario245, gKartMario246, gKartMario247, gKartMario248 + +glabel gKartMarioGroup14 +.word gKartMario229, gKartMario230, gKartMario231, gKartMario232 +.word gKartMario233, gKartMario234, gKartMario235, gKartMario236 +.word gKartMario237, gKartMario238, gKartMario239, gKartMario240 +.word gKartMario241, gKartMario242, gKartMario243, gKartMario244 +.word gKartMario245, gKartMario246, gKartMario247, gKartMario248 + +glabel gKartMarioGroup15 +.word gKartMario249, gKartMario250, gKartMario251, gKartMario252 +.word gKartMario253, gKartMario254, gKartMario255, gKartMario256 +.word gKartMario257, gKartMario258, gKartMario259, gKartMario260 +.word gKartMario261, gKartMario262, gKartMario263, gKartMario264 +.word gKartMario265, gKartMario266, gKartMario267, gKartMario268 + +glabel gKartMarioGroup16 +.word gKartMario269, gKartMario270, gKartMario271, gKartMario272 +.word gKartMario273, gKartMario274, gKartMario275, gKartMario276 +.word gKartMario277, gKartMario278, gKartMario279, gKartMario280 +.word gKartMario281, gKartMario282, gKartMario283, gKartMario284 +.word gKartMario285, gKartMario286, gKartMario287, gKartMario288 + +glabel gKartMarioGroup17 +.word gKartMario269, gKartMario270, gKartMario271, gKartMario272 +.word gKartMario273, gKartMario274, gKartMario275, gKartMario276 +.word gKartMario277, gKartMario278, gKartMario279, gKartMario280 +.word gKartMario281, gKartMario282, gKartMario283, gKartMario284 +.word gKartMario285, gKartMario286, gKartMario287, gKartMario288 + +glabel gKartToadGroup0 +.word gKartToad000, gKartToad001, gKartToad002, gKartToad003 +.word gKartToad004, gKartToad005, gKartToad006, gKartToad007 +.word gKartToad008, gKartToad009, gKartToad010, gKartToad011 +.word gKartToad012, gKartToad013, gKartToad014, gKartToad015 +.word gKartToad016, gKartToad017, gKartToad018, gKartToad019 +.word gKartToad020, gKartToad195, gKartToad196, gKartToad197 +.word gKartToad198, gKartToad199, gKartToad200, gKartToad201 +.word gKartToad202, gKartToad203, gKartToad204, gKartToad205 +.word gKartToad206, gKartToad207, gKartToad208 + +glabel gKartToadGroup1 +.word gKartToad021, gKartToad022, gKartToad023, gKartToad024 +.word gKartToad025, gKartToad026, gKartToad027, gKartToad028 +.word gKartToad029, gKartToad030, gKartToad031, gKartToad032 +.word gKartToad033, gKartToad034, gKartToad035, gKartToad036 +.word gKartToad037, gKartToad038, gKartToad039, gKartToad040 +.word gKartToad041, gKartToad195, gKartToad196, gKartToad197 +.word gKartToad198, gKartToad199, gKartToad200, gKartToad201 +.word gKartToad202, gKartToad203, gKartToad204, gKartToad205 +.word gKartToad206, gKartToad207, gKartToad208 + +glabel gKartToadGroup2 +.word gKartToad042, gKartToad043, gKartToad044, gKartToad045 +.word gKartToad046, gKartToad047, gKartToad048, gKartToad049 +.word gKartToad050, gKartToad051, gKartToad052, gKartToad053 +.word gKartToad054, gKartToad055, gKartToad056, gKartToad057 +.word gKartToad058, gKartToad059, gKartToad060, gKartToad061 +.word gKartToad062, gKartToad215, gKartToad216, gKartToad217 +.word gKartToad218, gKartToad219, gKartToad220, gKartToad221 +.word gKartToad222, gKartToad223, gKartToad224, gKartToad225 +.word gKartToad226, gKartToad227, gKartToad228 + +glabel gKartToadGroup3 +.word gKartToad063, gKartToad064, gKartToad065, gKartToad066 +.word gKartToad067, gKartToad068, gKartToad069, gKartToad070 +.word gKartToad071, gKartToad072, gKartToad073, gKartToad074 +.word gKartToad075, gKartToad076, gKartToad077, gKartToad078 +.word gKartToad079, gKartToad080, gKartToad081, gKartToad082 +.word gKartToad083, gKartToad235, gKartToad236, gKartToad237 +.word gKartToad238, gKartToad239, gKartToad240, gKartToad241 +.word gKartToad242, gKartToad243, gKartToad244, gKartToad245 +.word gKartToad246, gKartToad247, gKartToad248 + +glabel gKartToadGroup4 +.word gKartToad084, gKartToad085, gKartToad086, gKartToad087 +.word gKartToad088, gKartToad089, gKartToad090, gKartToad091 +.word gKartToad092, gKartToad093, gKartToad094, gKartToad095 +.word gKartToad096, gKartToad097, gKartToad098, gKartToad099 +.word gKartToad100, gKartToad101, gKartToad102, gKartToad103 +.word gKartToad104, gKartToad235, gKartToad236, gKartToad237 +.word gKartToad238, gKartToad239, gKartToad240, gKartToad241 +.word gKartToad242, gKartToad243, gKartToad244, gKartToad245 +.word gKartToad246, gKartToad247, gKartToad248 + +glabel gKartToadGroup5 +.word gKartToad105, gKartToad106, gKartToad107, gKartToad108 +.word gKartToad109, gKartToad110, gKartToad111, gKartToad112 +.word gKartToad113, gKartToad114, gKartToad115, gKartToad116 +.word gKartToad117, gKartToad118, gKartToad119, gKartToad120 +.word gKartToad121, gKartToad122, gKartToad123, gKartToad124 +.word gKartToad125, gKartToad235, gKartToad236, gKartToad237 +.word gKartToad238, gKartToad239, gKartToad240, gKartToad241 +.word gKartToad242, gKartToad243, gKartToad244, gKartToad245 +.word gKartToad246, gKartToad247, gKartToad248 + +glabel gKartToadGroup6 +.word gKartToad126, gKartToad127, gKartToad128, gKartToad129 +.word gKartToad130, gKartToad131, gKartToad132, gKartToad133 +.word gKartToad134, gKartToad135, gKartToad136, gKartToad137 +.word gKartToad138, gKartToad139, gKartToad140, gKartToad141 +.word gKartToad142, gKartToad143, gKartToad144, gKartToad145 +.word gKartToad146, gKartToad255, gKartToad256, gKartToad257 +.word gKartToad258, gKartToad259, gKartToad260, gKartToad261 +.word gKartToad262, gKartToad263, gKartToad264, gKartToad265 +.word gKartToad266, gKartToad267, gKartToad268 + +glabel gKartToadGroup7 +.word gKartToad147, gKartToad148, gKartToad149, gKartToad150 +.word gKartToad151, gKartToad152, gKartToad153, gKartToad154 +.word gKartToad155, gKartToad156, gKartToad157, gKartToad158 +.word gKartToad159, gKartToad160, gKartToad161, gKartToad162 +.word gKartToad163, gKartToad164, gKartToad165, gKartToad166 +.word gKartToad167, gKartToad275, gKartToad276, gKartToad277 +.word gKartToad278, gKartToad279, gKartToad280, gKartToad281 +.word gKartToad282, gKartToad283, gKartToad284, gKartToad285 +.word gKartToad286, gKartToad287, gKartToad288 + +glabel gKartToadGroup8 +.word gKartToad168, gKartToad169, gKartToad170, gKartToad171 +.word gKartToad172, gKartToad173, gKartToad174, gKartToad175 +.word gKartToad176, gKartToad177, gKartToad178, gKartToad179 +.word gKartToad180, gKartToad181, gKartToad182, gKartToad183 +.word gKartToad184, gKartToad185, gKartToad186, gKartToad187 +.word gKartToad188, gKartToad275, gKartToad276, gKartToad277 +.word gKartToad278, gKartToad279, gKartToad280, gKartToad281 +.word gKartToad282, gKartToad283, gKartToad284, gKartToad285 +.word gKartToad286, gKartToad287, gKartToad288 + +glabel gKartToadGroup9 +.word gKartToad189, gKartToad190, gKartToad191, gKartToad192 +.word gKartToad193, gKartToad194, gKartToad195, gKartToad196 +.word gKartToad197, gKartToad198, gKartToad199, gKartToad200 +.word gKartToad201, gKartToad202, gKartToad203, gKartToad204 +.word gKartToad205, gKartToad206, gKartToad207, gKartToad208 + +glabel gKartToadGroup10 +.word gKartToad189, gKartToad190, gKartToad191, gKartToad192 +.word gKartToad193, gKartToad194, gKartToad195, gKartToad196 +.word gKartToad197, gKartToad198, gKartToad199, gKartToad200 +.word gKartToad201, gKartToad202, gKartToad203, gKartToad204 +.word gKartToad205, gKartToad206, gKartToad207, gKartToad208 + +glabel gKartToadGroup11 +.word gKartToad209, gKartToad210, gKartToad211, gKartToad212 +.word gKartToad213, gKartToad214, gKartToad215, gKartToad216 +.word gKartToad217, gKartToad218, gKartToad219, gKartToad220 +.word gKartToad221, gKartToad222, gKartToad223, gKartToad224 +.word gKartToad225, gKartToad226, gKartToad227, gKartToad228 + +glabel gKartToadGroup12 +.word gKartToad229, gKartToad230, gKartToad231, gKartToad232 +.word gKartToad233, gKartToad234, gKartToad235, gKartToad236 +.word gKartToad237, gKartToad238, gKartToad239, gKartToad240 +.word gKartToad241, gKartToad242, gKartToad243, gKartToad244 +.word gKartToad245, gKartToad246, gKartToad247, gKartToad248 + +glabel gKartToadGroup13 +.word gKartToad229, gKartToad230, gKartToad231, gKartToad232 +.word gKartToad233, gKartToad234, gKartToad235, gKartToad236 +.word gKartToad237, gKartToad238, gKartToad239, gKartToad240 +.word gKartToad241, gKartToad242, gKartToad243, gKartToad244 +.word gKartToad245, gKartToad246, gKartToad247, gKartToad248 + +glabel gKartToadGroup14 +.word gKartToad229, gKartToad230, gKartToad231, gKartToad232 +.word gKartToad233, gKartToad234, gKartToad235, gKartToad236 +.word gKartToad237, gKartToad238, gKartToad239, gKartToad240 +.word gKartToad241, gKartToad242, gKartToad243, gKartToad244 +.word gKartToad245, gKartToad246, gKartToad247, gKartToad248 + +glabel gKartToadGroup15 +.word gKartToad249, gKartToad250, gKartToad251, gKartToad252 +.word gKartToad253, gKartToad254, gKartToad255, gKartToad256 +.word gKartToad257, gKartToad258, gKartToad259, gKartToad260 +.word gKartToad261, gKartToad262, gKartToad263, gKartToad264 +.word gKartToad265, gKartToad266, gKartToad267, gKartToad268 + +glabel gKartToadGroup16 +.word gKartToad269, gKartToad270, gKartToad271, gKartToad272 +.word gKartToad273, gKartToad274, gKartToad275, gKartToad276 +.word gKartToad277, gKartToad278, gKartToad279, gKartToad280 +.word gKartToad281, gKartToad282, gKartToad283, gKartToad284 +.word gKartToad285, gKartToad286, gKartToad287, gKartToad288 + +glabel gKartToadGroup17 +.word gKartToad269, gKartToad270, gKartToad271, gKartToad272 +.word gKartToad273, gKartToad274, gKartToad275, gKartToad276 +.word gKartToad277, gKartToad278, gKartToad279, gKartToad280 +.word gKartToad281, gKartToad282, gKartToad283, gKartToad284 +.word gKartToad285, gKartToad286, gKartToad287, gKartToad288 + +glabel gKartLuigiGroup0 +.word gKartLuigi000, gKartLuigi001, gKartLuigi002, gKartLuigi003 +.word gKartLuigi004, gKartLuigi005, gKartLuigi006, gKartLuigi007 +.word gKartLuigi008, gKartLuigi009, gKartLuigi010, gKartLuigi011 +.word gKartLuigi012, gKartLuigi013, gKartLuigi014, gKartLuigi015 +.word gKartLuigi016, gKartLuigi017, gKartLuigi018, gKartLuigi019 +.word gKartLuigi020, gKartLuigi195, gKartLuigi196, gKartLuigi197 +.word gKartLuigi198, gKartLuigi199, gKartLuigi200, gKartLuigi201 +.word gKartLuigi202, gKartLuigi203, gKartLuigi204, gKartLuigi205 +.word gKartLuigi206, gKartLuigi207, gKartLuigi208 + +glabel gKartLuigiGroup1 +.word gKartLuigi021, gKartLuigi022, gKartLuigi023, gKartLuigi024 +.word gKartLuigi025, gKartLuigi026, gKartLuigi027, gKartLuigi028 +.word gKartLuigi029, gKartLuigi030, gKartLuigi031, gKartLuigi032 +.word gKartLuigi033, gKartLuigi034, gKartLuigi035, gKartLuigi036 +.word gKartLuigi037, gKartLuigi038, gKartLuigi039, gKartLuigi040 +.word gKartLuigi041, gKartLuigi195, gKartLuigi196, gKartLuigi197 +.word gKartLuigi198, gKartLuigi199, gKartLuigi200, gKartLuigi201 +.word gKartLuigi202, gKartLuigi203, gKartLuigi204, gKartLuigi205 +.word gKartLuigi206, gKartLuigi207, gKartLuigi208 + +glabel gKartLuigiGroup2 +.word gKartLuigi042, gKartLuigi043, gKartLuigi044, gKartLuigi045 +.word gKartLuigi046, gKartLuigi047, gKartLuigi048, gKartLuigi049 +.word gKartLuigi050, gKartLuigi051, gKartLuigi052, gKartLuigi053 +.word gKartLuigi054, gKartLuigi055, gKartLuigi056, gKartLuigi057 +.word gKartLuigi058, gKartLuigi059, gKartLuigi060, gKartLuigi061 +.word gKartLuigi062, gKartLuigi215, gKartLuigi216, gKartLuigi217 +.word gKartLuigi218, gKartLuigi219, gKartLuigi220, gKartLuigi221 +.word gKartLuigi222, gKartLuigi223, gKartLuigi224, gKartLuigi225 +.word gKartLuigi226, gKartLuigi227, gKartLuigi228 + +glabel gKartLuigiGroup3 +.word gKartLuigi063, gKartLuigi064, gKartLuigi065, gKartLuigi066 +.word gKartLuigi067, gKartLuigi068, gKartLuigi069, gKartLuigi070 +.word gKartLuigi071, gKartLuigi072, gKartLuigi073, gKartLuigi074 +.word gKartLuigi075, gKartLuigi076, gKartLuigi077, gKartLuigi078 +.word gKartLuigi079, gKartLuigi080, gKartLuigi081, gKartLuigi082 +.word gKartLuigi083, gKartLuigi235, gKartLuigi236, gKartLuigi237 +.word gKartLuigi238, gKartLuigi239, gKartLuigi240, gKartLuigi241 +.word gKartLuigi242, gKartLuigi243, gKartLuigi244, gKartLuigi245 +.word gKartLuigi246, gKartLuigi247, gKartLuigi248 + +glabel gKartLuigiGroup4 +.word gKartLuigi084, gKartLuigi085, gKartLuigi086, gKartLuigi087 +.word gKartLuigi088, gKartLuigi089, gKartLuigi090, gKartLuigi091 +.word gKartLuigi092, gKartLuigi093, gKartLuigi094, gKartLuigi095 +.word gKartLuigi096, gKartLuigi097, gKartLuigi098, gKartLuigi099 +.word gKartLuigi100, gKartLuigi101, gKartLuigi102, gKartLuigi103 +.word gKartLuigi104, gKartLuigi235, gKartLuigi236, gKartLuigi237 +.word gKartLuigi238, gKartLuigi239, gKartLuigi240, gKartLuigi241 +.word gKartLuigi242, gKartLuigi243, gKartLuigi244, gKartLuigi245 +.word gKartLuigi246, gKartLuigi247, gKartLuigi248 + +glabel gKartLuigiGroup5 +.word gKartLuigi105, gKartLuigi106, gKartLuigi107, gKartLuigi108 +.word gKartLuigi109, gKartLuigi110, gKartLuigi111, gKartLuigi112 +.word gKartLuigi113, gKartLuigi114, gKartLuigi115, gKartLuigi116 +.word gKartLuigi117, gKartLuigi118, gKartLuigi119, gKartLuigi120 +.word gKartLuigi121, gKartLuigi122, gKartLuigi123, gKartLuigi124 +.word gKartLuigi125, gKartLuigi235, gKartLuigi236, gKartLuigi237 +.word gKartLuigi238, gKartLuigi239, gKartLuigi240, gKartLuigi241 +.word gKartLuigi242, gKartLuigi243, gKartLuigi244, gKartLuigi245 +.word gKartLuigi246, gKartLuigi247, gKartLuigi248 + +glabel gKartLuigiGroup6 +.word gKartLuigi126, gKartLuigi127, gKartLuigi128, gKartLuigi129 +.word gKartLuigi130, gKartLuigi131, gKartLuigi132, gKartLuigi133 +.word gKartLuigi134, gKartLuigi135, gKartLuigi136, gKartLuigi137 +.word gKartLuigi138, gKartLuigi139, gKartLuigi140, gKartLuigi141 +.word gKartLuigi142, gKartLuigi143, gKartLuigi144, gKartLuigi145 +.word gKartLuigi146, gKartLuigi255, gKartLuigi256, gKartLuigi257 +.word gKartLuigi258, gKartLuigi259, gKartLuigi260, gKartLuigi261 +.word gKartLuigi262, gKartLuigi263, gKartLuigi264, gKartLuigi265 +.word gKartLuigi266, gKartLuigi267, gKartLuigi268 + +glabel gKartLuigiGroup7 +.word gKartLuigi147, gKartLuigi148, gKartLuigi149, gKartLuigi150 +.word gKartLuigi151, gKartLuigi152, gKartLuigi153, gKartLuigi154 +.word gKartLuigi155, gKartLuigi156, gKartLuigi157, gKartLuigi158 +.word gKartLuigi159, gKartLuigi160, gKartLuigi161, gKartLuigi162 +.word gKartLuigi163, gKartLuigi164, gKartLuigi165, gKartLuigi166 +.word gKartLuigi167, gKartLuigi275, gKartLuigi276, gKartLuigi277 +.word gKartLuigi278, gKartLuigi279, gKartLuigi280, gKartLuigi281 +.word gKartLuigi282, gKartLuigi283, gKartLuigi284, gKartLuigi285 +.word gKartLuigi286, gKartLuigi287, gKartLuigi288 + +glabel gKartLuigiGroup8 +.word gKartLuigi168, gKartLuigi169, gKartLuigi170, gKartLuigi171 +.word gKartLuigi172, gKartLuigi173, gKartLuigi174, gKartLuigi175 +.word gKartLuigi176, gKartLuigi177, gKartLuigi178, gKartLuigi179 +.word gKartLuigi180, gKartLuigi181, gKartLuigi182, gKartLuigi183 +.word gKartLuigi184, gKartLuigi185, gKartLuigi186, gKartLuigi187 +.word gKartLuigi188, gKartLuigi275, gKartLuigi276, gKartLuigi277 +.word gKartLuigi278, gKartLuigi279, gKartLuigi280, gKartLuigi281 +.word gKartLuigi282, gKartLuigi283, gKartLuigi284, gKartLuigi285 +.word gKartLuigi286, gKartLuigi287, gKartLuigi288 + +glabel gKartLuigiGroup9 +.word gKartLuigi189, gKartLuigi190, gKartLuigi191, gKartLuigi192 +.word gKartLuigi193, gKartLuigi194, gKartLuigi195, gKartLuigi196 +.word gKartLuigi197, gKartLuigi198, gKartLuigi199, gKartLuigi200 +.word gKartLuigi201, gKartLuigi202, gKartLuigi203, gKartLuigi204 +.word gKartLuigi205, gKartLuigi206, gKartLuigi207, gKartLuigi208 + +glabel gKartLuigiGroup10 +.word gKartLuigi189, gKartLuigi190, gKartLuigi191, gKartLuigi192 +.word gKartLuigi193, gKartLuigi194, gKartLuigi195, gKartLuigi196 +.word gKartLuigi197, gKartLuigi198, gKartLuigi199, gKartLuigi200 +.word gKartLuigi201, gKartLuigi202, gKartLuigi203, gKartLuigi204 +.word gKartLuigi205, gKartLuigi206, gKartLuigi207, gKartLuigi208 + +glabel gKartLuigiGroup11 +.word gKartLuigi209, gKartLuigi210, gKartLuigi211, gKartLuigi212 +.word gKartLuigi213, gKartLuigi214, gKartLuigi215, gKartLuigi216 +.word gKartLuigi217, gKartLuigi218, gKartLuigi219, gKartLuigi220 +.word gKartLuigi221, gKartLuigi222, gKartLuigi223, gKartLuigi224 +.word gKartLuigi225, gKartLuigi226, gKartLuigi227, gKartLuigi228 + +glabel gKartLuigiGroup12 +.word gKartLuigi229, gKartLuigi230, gKartLuigi231, gKartLuigi232 +.word gKartLuigi233, gKartLuigi234, gKartLuigi235, gKartLuigi236 +.word gKartLuigi237, gKartLuigi238, gKartLuigi239, gKartLuigi240 +.word gKartLuigi241, gKartLuigi242, gKartLuigi243, gKartLuigi244 +.word gKartLuigi245, gKartLuigi246, gKartLuigi247, gKartLuigi248 + +glabel gKartLuigiGroup13 +.word gKartLuigi229, gKartLuigi230, gKartLuigi231, gKartLuigi232 +.word gKartLuigi233, gKartLuigi234, gKartLuigi235, gKartLuigi236 +.word gKartLuigi237, gKartLuigi238, gKartLuigi239, gKartLuigi240 +.word gKartLuigi241, gKartLuigi242, gKartLuigi243, gKartLuigi244 +.word gKartLuigi245, gKartLuigi246, gKartLuigi247, gKartLuigi248 + +glabel gKartLuigiGroup14 +.word gKartLuigi229, gKartLuigi230, gKartLuigi231, gKartLuigi232 +.word gKartLuigi233, gKartLuigi234, gKartLuigi235, gKartLuigi236 +.word gKartLuigi237, gKartLuigi238, gKartLuigi239, gKartLuigi240 +.word gKartLuigi241, gKartLuigi242, gKartLuigi243, gKartLuigi244 +.word gKartLuigi245, gKartLuigi246, gKartLuigi247, gKartLuigi248 + +glabel gKartLuigiGroup15 +.word gKartLuigi249, gKartLuigi250, gKartLuigi251, gKartLuigi252 +.word gKartLuigi253, gKartLuigi254, gKartLuigi255, gKartLuigi256 +.word gKartLuigi257, gKartLuigi258, gKartLuigi259, gKartLuigi260 +.word gKartLuigi261, gKartLuigi262, gKartLuigi263, gKartLuigi264 +.word gKartLuigi265, gKartLuigi266, gKartLuigi267, gKartLuigi268 + +glabel gKartLuigiGroup16 +.word gKartLuigi269, gKartLuigi270, gKartLuigi271, gKartLuigi272 +.word gKartLuigi273, gKartLuigi274, gKartLuigi275, gKartLuigi276 +.word gKartLuigi277, gKartLuigi278, gKartLuigi279, gKartLuigi280 +.word gKartLuigi281, gKartLuigi282, gKartLuigi283, gKartLuigi284 +.word gKartLuigi285, gKartLuigi286, gKartLuigi287, gKartLuigi288 + +glabel gKartLuigiGroup17 +.word gKartLuigi269, gKartLuigi270, gKartLuigi271, gKartLuigi272 +.word gKartLuigi273, gKartLuigi274, gKartLuigi275, gKartLuigi276 +.word gKartLuigi277, gKartLuigi278, gKartLuigi279, gKartLuigi280 +.word gKartLuigi281, gKartLuigi282, gKartLuigi283, gKartLuigi284 +.word gKartLuigi285, gKartLuigi286, gKartLuigi287, gKartLuigi288 + +glabel gKartYoshiGroup0 +.word gKartYoshi000, gKartYoshi001, gKartYoshi002, gKartYoshi003 +.word gKartYoshi004, gKartYoshi005, gKartYoshi006, gKartYoshi007 +.word gKartYoshi008, gKartYoshi009, gKartYoshi010, gKartYoshi011 +.word gKartYoshi012, gKartYoshi013, gKartYoshi014, gKartYoshi015 +.word gKartYoshi016, gKartYoshi017, gKartYoshi018, gKartYoshi019 +.word gKartYoshi020, gKartYoshi195, gKartYoshi196, gKartYoshi197 +.word gKartYoshi198, gKartYoshi199, gKartYoshi200, gKartYoshi201 +.word gKartYoshi202, gKartYoshi203, gKartYoshi204, gKartYoshi205 +.word gKartYoshi206, gKartYoshi207, gKartYoshi208 + +glabel gKartYoshiGroup1 +.word gKartYoshi021, gKartYoshi022, gKartYoshi023, gKartYoshi024 +.word gKartYoshi025, gKartYoshi026, gKartYoshi027, gKartYoshi028 +.word gKartYoshi029, gKartYoshi030, gKartYoshi031, gKartYoshi032 +.word gKartYoshi033, gKartYoshi034, gKartYoshi035, gKartYoshi036 +.word gKartYoshi037, gKartYoshi038, gKartYoshi039, gKartYoshi040 +.word gKartYoshi041, gKartYoshi195, gKartYoshi196, gKartYoshi197 +.word gKartYoshi198, gKartYoshi199, gKartYoshi200, gKartYoshi201 +.word gKartYoshi202, gKartYoshi203, gKartYoshi204, gKartYoshi205 +.word gKartYoshi206, gKartYoshi207, gKartYoshi208 + +glabel gKartYoshiGroup2 +.word gKartYoshi042, gKartYoshi043, gKartYoshi044, gKartYoshi045 +.word gKartYoshi046, gKartYoshi047, gKartYoshi048, gKartYoshi049 +.word gKartYoshi050, gKartYoshi051, gKartYoshi052, gKartYoshi053 +.word gKartYoshi054, gKartYoshi055, gKartYoshi056, gKartYoshi057 +.word gKartYoshi058, gKartYoshi059, gKartYoshi060, gKartYoshi061 +.word gKartYoshi062, gKartYoshi215, gKartYoshi216, gKartYoshi217 +.word gKartYoshi218, gKartYoshi219, gKartYoshi220, gKartYoshi221 +.word gKartYoshi222, gKartYoshi223, gKartYoshi224, gKartYoshi225 +.word gKartYoshi226, gKartYoshi227, gKartYoshi228 + +glabel gKartYoshiGroup3 +.word gKartYoshi063, gKartYoshi064, gKartYoshi065, gKartYoshi066 +.word gKartYoshi067, gKartYoshi068, gKartYoshi069, gKartYoshi070 +.word gKartYoshi071, gKartYoshi072, gKartYoshi073, gKartYoshi074 +.word gKartYoshi075, gKartYoshi076, gKartYoshi077, gKartYoshi078 +.word gKartYoshi079, gKartYoshi080, gKartYoshi081, gKartYoshi082 +.word gKartYoshi083, gKartYoshi235, gKartYoshi236, gKartYoshi237 +.word gKartYoshi238, gKartYoshi239, gKartYoshi240, gKartYoshi241 +.word gKartYoshi242, gKartYoshi243, gKartYoshi244, gKartYoshi245 +.word gKartYoshi246, gKartYoshi247, gKartYoshi248 + +glabel gKartYoshiGroup4 +.word gKartYoshi084, gKartYoshi085, gKartYoshi086, gKartYoshi087 +.word gKartYoshi088, gKartYoshi089, gKartYoshi090, gKartYoshi091 +.word gKartYoshi092, gKartYoshi093, gKartYoshi094, gKartYoshi095 +.word gKartYoshi096, gKartYoshi097, gKartYoshi098, gKartYoshi099 +.word gKartYoshi100, gKartYoshi101, gKartYoshi102, gKartYoshi103 +.word gKartYoshi104, gKartYoshi235, gKartYoshi236, gKartYoshi237 +.word gKartYoshi238, gKartYoshi239, gKartYoshi240, gKartYoshi241 +.word gKartYoshi242, gKartYoshi243, gKartYoshi244, gKartYoshi245 +.word gKartYoshi246, gKartYoshi247, gKartYoshi248 + +glabel gKartYoshiGroup5 +.word gKartYoshi105, gKartYoshi106, gKartYoshi107, gKartYoshi108 +.word gKartYoshi109, gKartYoshi110, gKartYoshi111, gKartYoshi112 +.word gKartYoshi113, gKartYoshi114, gKartYoshi115, gKartYoshi116 +.word gKartYoshi117, gKartYoshi118, gKartYoshi119, gKartYoshi120 +.word gKartYoshi121, gKartYoshi122, gKartYoshi123, gKartYoshi124 +.word gKartYoshi125, gKartYoshi235, gKartYoshi236, gKartYoshi237 +.word gKartYoshi238, gKartYoshi239, gKartYoshi240, gKartYoshi241 +.word gKartYoshi242, gKartYoshi243, gKartYoshi244, gKartYoshi245 +.word gKartYoshi246, gKartYoshi247, gKartYoshi248 + +glabel gKartYoshiGroup6 +.word gKartYoshi126, gKartYoshi127, gKartYoshi128, gKartYoshi129 +.word gKartYoshi130, gKartYoshi131, gKartYoshi132, gKartYoshi133 +.word gKartYoshi134, gKartYoshi135, gKartYoshi136, gKartYoshi137 +.word gKartYoshi138, gKartYoshi139, gKartYoshi140, gKartYoshi141 +.word gKartYoshi142, gKartYoshi143, gKartYoshi144, gKartYoshi145 +.word gKartYoshi146, gKartYoshi255, gKartYoshi256, gKartYoshi257 +.word gKartYoshi258, gKartYoshi259, gKartYoshi260, gKartYoshi261 +.word gKartYoshi262, gKartYoshi263, gKartYoshi264, gKartYoshi265 +.word gKartYoshi266, gKartYoshi267, gKartYoshi268 + +glabel gKartYoshiGroup7 +.word gKartYoshi147, gKartYoshi148, gKartYoshi149, gKartYoshi150 +.word gKartYoshi151, gKartYoshi152, gKartYoshi153, gKartYoshi154 +.word gKartYoshi155, gKartYoshi156, gKartYoshi157, gKartYoshi158 +.word gKartYoshi159, gKartYoshi160, gKartYoshi161, gKartYoshi162 +.word gKartYoshi163, gKartYoshi164, gKartYoshi165, gKartYoshi166 +.word gKartYoshi167, gKartYoshi275, gKartYoshi276, gKartYoshi277 +.word gKartYoshi278, gKartYoshi279, gKartYoshi280, gKartYoshi281 +.word gKartYoshi282, gKartYoshi283, gKartYoshi284, gKartYoshi285 +.word gKartYoshi286, gKartYoshi287, gKartYoshi288 + +glabel gKartYoshiGroup8 +.word gKartYoshi168, gKartYoshi169, gKartYoshi170, gKartYoshi171 +.word gKartYoshi172, gKartYoshi173, gKartYoshi174, gKartYoshi175 +.word gKartYoshi176, gKartYoshi177, gKartYoshi178, gKartYoshi179 +.word gKartYoshi180, gKartYoshi181, gKartYoshi182, gKartYoshi183 +.word gKartYoshi184, gKartYoshi185, gKartYoshi186, gKartYoshi187 +.word gKartYoshi188, gKartYoshi275, gKartYoshi276, gKartYoshi277 +.word gKartYoshi278, gKartYoshi279, gKartYoshi280, gKartYoshi281 +.word gKartYoshi282, gKartYoshi283, gKartYoshi284, gKartYoshi285 +.word gKartYoshi286, gKartYoshi287, gKartYoshi288 + +glabel gKartYoshiGroup9 +.word gKartYoshi189, gKartYoshi190, gKartYoshi191, gKartYoshi192 +.word gKartYoshi193, gKartYoshi194, gKartYoshi195, gKartYoshi196 +.word gKartYoshi197, gKartYoshi198, gKartYoshi199, gKartYoshi200 +.word gKartYoshi201, gKartYoshi202, gKartYoshi203, gKartYoshi204 +.word gKartYoshi205, gKartYoshi206, gKartYoshi207, gKartYoshi208 + +glabel gKartYoshiGroup10 +.word gKartYoshi189, gKartYoshi190, gKartYoshi191, gKartYoshi192 +.word gKartYoshi193, gKartYoshi194, gKartYoshi195, gKartYoshi196 +.word gKartYoshi197, gKartYoshi198, gKartYoshi199, gKartYoshi200 +.word gKartYoshi201, gKartYoshi202, gKartYoshi203, gKartYoshi204 +.word gKartYoshi205, gKartYoshi206, gKartYoshi207, gKartYoshi208 + +glabel gKartYoshiGroup11 +.word gKartYoshi209, gKartYoshi210, gKartYoshi211, gKartYoshi212 +.word gKartYoshi213, gKartYoshi214, gKartYoshi215, gKartYoshi216 +.word gKartYoshi217, gKartYoshi218, gKartYoshi219, gKartYoshi220 +.word gKartYoshi221, gKartYoshi222, gKartYoshi223, gKartYoshi224 +.word gKartYoshi225, gKartYoshi226, gKartYoshi227, gKartYoshi228 + +glabel gKartYoshiGroup12 +.word gKartYoshi229, gKartYoshi230, gKartYoshi231, gKartYoshi232 +.word gKartYoshi233, gKartYoshi234, gKartYoshi235, gKartYoshi236 +.word gKartYoshi237, gKartYoshi238, gKartYoshi239, gKartYoshi240 +.word gKartYoshi241, gKartYoshi242, gKartYoshi243, gKartYoshi244 +.word gKartYoshi245, gKartYoshi246, gKartYoshi247, gKartYoshi248 + +glabel gKartYoshiGroup13 +.word gKartYoshi229, gKartYoshi230, gKartYoshi231, gKartYoshi232 +.word gKartYoshi233, gKartYoshi234, gKartYoshi235, gKartYoshi236 +.word gKartYoshi237, gKartYoshi238, gKartYoshi239, gKartYoshi240 +.word gKartYoshi241, gKartYoshi242, gKartYoshi243, gKartYoshi244 +.word gKartYoshi245, gKartYoshi246, gKartYoshi247, gKartYoshi248 + +glabel gKartYoshiGroup14 +.word gKartYoshi229, gKartYoshi230, gKartYoshi231, gKartYoshi232 +.word gKartYoshi233, gKartYoshi234, gKartYoshi235, gKartYoshi236 +.word gKartYoshi237, gKartYoshi238, gKartYoshi239, gKartYoshi240 +.word gKartYoshi241, gKartYoshi242, gKartYoshi243, gKartYoshi244 +.word gKartYoshi245, gKartYoshi246, gKartYoshi247, gKartYoshi248 + +glabel gKartYoshiGroup15 +.word gKartYoshi249, gKartYoshi250, gKartYoshi251, gKartYoshi252 +.word gKartYoshi253, gKartYoshi254, gKartYoshi255, gKartYoshi256 +.word gKartYoshi257, gKartYoshi258, gKartYoshi259, gKartYoshi260 +.word gKartYoshi261, gKartYoshi262, gKartYoshi263, gKartYoshi264 +.word gKartYoshi265, gKartYoshi266, gKartYoshi267, gKartYoshi268 + +glabel gKartYoshiGroup16 +.word gKartYoshi269, gKartYoshi270, gKartYoshi271, gKartYoshi272 +.word gKartYoshi273, gKartYoshi274, gKartYoshi275, gKartYoshi276 +.word gKartYoshi277, gKartYoshi278, gKartYoshi279, gKartYoshi280 +.word gKartYoshi281, gKartYoshi282, gKartYoshi283, gKartYoshi284 +.word gKartYoshi285, gKartYoshi286, gKartYoshi287, gKartYoshi288 + +glabel gKartYoshiGroup17 +.word gKartYoshi269, gKartYoshi270, gKartYoshi271, gKartYoshi272 +.word gKartYoshi273, gKartYoshi274, gKartYoshi275, gKartYoshi276 +.word gKartYoshi277, gKartYoshi278, gKartYoshi279, gKartYoshi280 +.word gKartYoshi281, gKartYoshi282, gKartYoshi283, gKartYoshi284 +.word gKartYoshi285, gKartYoshi286, gKartYoshi287, gKartYoshi288 + +glabel gKartDKGroup0 +.word gKartDK000, gKartDK001, gKartDK002, gKartDK003 +.word gKartDK004, gKartDK005, gKartDK006, gKartDK007 +.word gKartDK008, gKartDK009, gKartDK010, gKartDK011 +.word gKartDK012, gKartDK013, gKartDK014, gKartDK015 +.word gKartDK016, gKartDK017, gKartDK018, gKartDK019 +.word gKartDK020, gKartDK195, gKartDK196, gKartDK197 +.word gKartDK198, gKartDK199, gKartDK200, gKartDK201 +.word gKartDK202, gKartDK203, gKartDK204, gKartDK205 +.word gKartDK206, gKartDK207, gKartDK208 + +glabel gKartDKGroup1 +.word gKartDK021, gKartDK022, gKartDK023, gKartDK024 +.word gKartDK025, gKartDK026, gKartDK027, gKartDK028 +.word gKartDK029, gKartDK030, gKartDK031, gKartDK032 +.word gKartDK033, gKartDK034, gKartDK035, gKartDK036 +.word gKartDK037, gKartDK038, gKartDK039, gKartDK040 +.word gKartDK041, gKartDK195, gKartDK196, gKartDK197 +.word gKartDK198, gKartDK199, gKartDK200, gKartDK201 +.word gKartDK202, gKartDK203, gKartDK204, gKartDK205 +.word gKartDK206, gKartDK207, gKartDK208 + +glabel gKartDKGroup2 +.word gKartDK042, gKartDK043, gKartDK044, gKartDK045 +.word gKartDK046, gKartDK047, gKartDK048, gKartDK049 +.word gKartDK050, gKartDK051, gKartDK052, gKartDK053 +.word gKartDK054, gKartDK055, gKartDK056, gKartDK057 +.word gKartDK058, gKartDK059, gKartDK060, gKartDK061 +.word gKartDK062, gKartDK215, gKartDK216, gKartDK217 +.word gKartDK218, gKartDK219, gKartDK220, gKartDK221 +.word gKartDK222, gKartDK223, gKartDK224, gKartDK225 +.word gKartDK226, gKartDK227, gKartDK228 + +glabel gKartDKGroup3 +.word gKartDK063, gKartDK064, gKartDK065, gKartDK066 +.word gKartDK067, gKartDK068, gKartDK069, gKartDK070 +.word gKartDK071, gKartDK072, gKartDK073, gKartDK074 +.word gKartDK075, gKartDK076, gKartDK077, gKartDK078 +.word gKartDK079, gKartDK080, gKartDK081, gKartDK082 +.word gKartDK083, gKartDK235, gKartDK236, gKartDK237 +.word gKartDK238, gKartDK239, gKartDK240, gKartDK241 +.word gKartDK242, gKartDK243, gKartDK244, gKartDK245 +.word gKartDK246, gKartDK247, gKartDK248 + +glabel gKartDKGroup4 +.word gKartDK084, gKartDK085, gKartDK086, gKartDK087 +.word gKartDK088, gKartDK089, gKartDK090, gKartDK091 +.word gKartDK092, gKartDK093, gKartDK094, gKartDK095 +.word gKartDK096, gKartDK097, gKartDK098, gKartDK099 +.word gKartDK100, gKartDK101, gKartDK102, gKartDK103 +.word gKartDK104, gKartDK235, gKartDK236, gKartDK237 +.word gKartDK238, gKartDK239, gKartDK240, gKartDK241 +.word gKartDK242, gKartDK243, gKartDK244, gKartDK245 +.word gKartDK246, gKartDK247, gKartDK248 + +glabel gKartDKGroup5 +.word gKartDK105, gKartDK106, gKartDK107, gKartDK108 +.word gKartDK109, gKartDK110, gKartDK111, gKartDK112 +.word gKartDK113, gKartDK114, gKartDK115, gKartDK116 +.word gKartDK117, gKartDK118, gKartDK119, gKartDK120 +.word gKartDK121, gKartDK122, gKartDK123, gKartDK124 +.word gKartDK125, gKartDK235, gKartDK236, gKartDK237 +.word gKartDK238, gKartDK239, gKartDK240, gKartDK241 +.word gKartDK242, gKartDK243, gKartDK244, gKartDK245 +.word gKartDK246, gKartDK247, gKartDK248 + +glabel gKartDKGroup6 +.word gKartDK126, gKartDK127, gKartDK128, gKartDK129 +.word gKartDK130, gKartDK131, gKartDK132, gKartDK133 +.word gKartDK134, gKartDK135, gKartDK136, gKartDK137 +.word gKartDK138, gKartDK139, gKartDK140, gKartDK141 +.word gKartDK142, gKartDK143, gKartDK144, gKartDK145 +.word gKartDK146, gKartDK255, gKartDK256, gKartDK257 +.word gKartDK258, gKartDK259, gKartDK260, gKartDK261 +.word gKartDK262, gKartDK263, gKartDK264, gKartDK265 +.word gKartDK266, gKartDK267, gKartDK268 + +glabel gKartDKGroup7 +.word gKartDK147, gKartDK148, gKartDK149, gKartDK150 +.word gKartDK151, gKartDK152, gKartDK153, gKartDK154 +.word gKartDK155, gKartDK156, gKartDK157, gKartDK158 +.word gKartDK159, gKartDK160, gKartDK161, gKartDK162 +.word gKartDK163, gKartDK164, gKartDK165, gKartDK166 +.word gKartDK167, gKartDK275, gKartDK276, gKartDK277 +.word gKartDK278, gKartDK279, gKartDK280, gKartDK281 +.word gKartDK282, gKartDK283, gKartDK284, gKartDK285 +.word gKartDK286, gKartDK287, gKartDK288 + +glabel gKartDKGroup8 +.word gKartDK168, gKartDK169, gKartDK170, gKartDK171 +.word gKartDK172, gKartDK173, gKartDK174, gKartDK175 +.word gKartDK176, gKartDK177, gKartDK178, gKartDK179 +.word gKartDK180, gKartDK181, gKartDK182, gKartDK183 +.word gKartDK184, gKartDK185, gKartDK186, gKartDK187 +.word gKartDK188, gKartDK275, gKartDK276, gKartDK277 +.word gKartDK278, gKartDK279, gKartDK280, gKartDK281 +.word gKartDK282, gKartDK283, gKartDK284, gKartDK285 +.word gKartDK286, gKartDK287, gKartDK288 + +glabel gKartDKGroup9 +.word gKartDK189, gKartDK190, gKartDK191, gKartDK192 +.word gKartDK193, gKartDK194, gKartDK195, gKartDK196 +.word gKartDK197, gKartDK198, gKartDK199, gKartDK200 +.word gKartDK201, gKartDK202, gKartDK203, gKartDK204 +.word gKartDK205, gKartDK206, gKartDK207, gKartDK208 + +glabel gKartDKGroup10 +.word gKartDK189, gKartDK190, gKartDK191, gKartDK192 +.word gKartDK193, gKartDK194, gKartDK195, gKartDK196 +.word gKartDK197, gKartDK198, gKartDK199, gKartDK200 +.word gKartDK201, gKartDK202, gKartDK203, gKartDK204 +.word gKartDK205, gKartDK206, gKartDK207, gKartDK208 + +glabel gKartDKGroup11 +.word gKartDK209, gKartDK210, gKartDK211, gKartDK212 +.word gKartDK213, gKartDK214, gKartDK215, gKartDK216 +.word gKartDK217, gKartDK218, gKartDK219, gKartDK220 +.word gKartDK221, gKartDK222, gKartDK223, gKartDK224 +.word gKartDK225, gKartDK226, gKartDK227, gKartDK228 + +glabel gKartDKGroup12 +.word gKartDK229, gKartDK230, gKartDK231, gKartDK232 +.word gKartDK233, gKartDK234, gKartDK235, gKartDK236 +.word gKartDK237, gKartDK238, gKartDK239, gKartDK240 +.word gKartDK241, gKartDK242, gKartDK243, gKartDK244 +.word gKartDK245, gKartDK246, gKartDK247, gKartDK248 + +glabel gKartDKGroup13 +.word gKartDK229, gKartDK230, gKartDK231, gKartDK232 +.word gKartDK233, gKartDK234, gKartDK235, gKartDK236 +.word gKartDK237, gKartDK238, gKartDK239, gKartDK240 +.word gKartDK241, gKartDK242, gKartDK243, gKartDK244 +.word gKartDK245, gKartDK246, gKartDK247, gKartDK248 + +glabel gKartDKGroup14 +.word gKartDK229, gKartDK230, gKartDK231, gKartDK232 +.word gKartDK233, gKartDK234, gKartDK235, gKartDK236 +.word gKartDK237, gKartDK238, gKartDK239, gKartDK240 +.word gKartDK241, gKartDK242, gKartDK243, gKartDK244 +.word gKartDK245, gKartDK246, gKartDK247, gKartDK248 + +glabel gKartDKGroup15 +.word gKartDK249, gKartDK250, gKartDK251, gKartDK252 +.word gKartDK253, gKartDK254, gKartDK255, gKartDK256 +.word gKartDK257, gKartDK258, gKartDK259, gKartDK260 +.word gKartDK261, gKartDK262, gKartDK263, gKartDK264 +.word gKartDK265, gKartDK266, gKartDK267, gKartDK268 + +glabel gKartDKGroup16 +.word gKartDK269, gKartDK270, gKartDK271, gKartDK272 +.word gKartDK273, gKartDK274, gKartDK275, gKartDK276 +.word gKartDK277, gKartDK278, gKartDK279, gKartDK280 +.word gKartDK281, gKartDK282, gKartDK283, gKartDK284 +.word gKartDK285, gKartDK286, gKartDK287, gKartDK288 + +glabel gKartDKGroup17 +.word gKartDK269, gKartDK270, gKartDK271, gKartDK272 +.word gKartDK273, gKartDK274, gKartDK275, gKartDK276 +.word gKartDK277, gKartDK278, gKartDK279, gKartDK280 +.word gKartDK281, gKartDK282, gKartDK283, gKartDK284 +.word gKartDK285, gKartDK286, gKartDK287, gKartDK288 + +glabel gKartBowserGroup0 +.word gKartBowser000, gKartBowser001, gKartBowser002, gKartBowser003 +.word gKartBowser004, gKartBowser005, gKartBowser006, gKartBowser007 +.word gKartBowser008, gKartBowser009, gKartBowser010, gKartBowser011 +.word gKartBowser012, gKartBowser013, gKartBowser014, gKartBowser015 +.word gKartBowser016, gKartBowser017, gKartBowser018, gKartBowser019 +.word gKartBowser020, gKartBowser195, gKartBowser196, gKartBowser197 +.word gKartBowser198, gKartBowser199, gKartBowser200, gKartBowser201 +.word gKartBowser202, gKartBowser203, gKartBowser204, gKartBowser205 +.word gKartBowser206, gKartBowser207, gKartBowser208 + +glabel gKartBowserGroup1 +.word gKartBowser021, gKartBowser022, gKartBowser023, gKartBowser024 +.word gKartBowser025, gKartBowser026, gKartBowser027, gKartBowser028 +.word gKartBowser029, gKartBowser030, gKartBowser031, gKartBowser032 +.word gKartBowser033, gKartBowser034, gKartBowser035, gKartBowser036 +.word gKartBowser037, gKartBowser038, gKartBowser039, gKartBowser040 +.word gKartBowser041, gKartBowser195, gKartBowser196, gKartBowser197 +.word gKartBowser198, gKartBowser199, gKartBowser200, gKartBowser201 +.word gKartBowser202, gKartBowser203, gKartBowser204, gKartBowser205 +.word gKartBowser206, gKartBowser207, gKartBowser208 + +glabel gKartBowserGroup2 +.word gKartBowser042, gKartBowser043, gKartBowser044, gKartBowser045 +.word gKartBowser046, gKartBowser047, gKartBowser048, gKartBowser049 +.word gKartBowser050, gKartBowser051, gKartBowser052, gKartBowser053 +.word gKartBowser054, gKartBowser055, gKartBowser056, gKartBowser057 +.word gKartBowser058, gKartBowser059, gKartBowser060, gKartBowser061 +.word gKartBowser062, gKartBowser215, gKartBowser216, gKartBowser217 +.word gKartBowser218, gKartBowser219, gKartBowser220, gKartBowser221 +.word gKartBowser222, gKartBowser223, gKartBowser224, gKartBowser225 +.word gKartBowser226, gKartBowser227, gKartBowser228 + +glabel gKartBowserGroup3 +.word gKartBowser063, gKartBowser064, gKartBowser065, gKartBowser066 +.word gKartBowser067, gKartBowser068, gKartBowser069, gKartBowser070 +.word gKartBowser071, gKartBowser072, gKartBowser073, gKartBowser074 +.word gKartBowser075, gKartBowser076, gKartBowser077, gKartBowser078 +.word gKartBowser079, gKartBowser080, gKartBowser081, gKartBowser082 +.word gKartBowser083, gKartBowser235, gKartBowser236, gKartBowser237 +.word gKartBowser238, gKartBowser239, gKartBowser240, gKartBowser241 +.word gKartBowser242, gKartBowser243, gKartBowser244, gKartBowser245 +.word gKartBowser246, gKartBowser247, gKartBowser248 + +glabel gKartBowserGroup4 +.word gKartBowser084, gKartBowser085, gKartBowser086, gKartBowser087 +.word gKartBowser088, gKartBowser089, gKartBowser090, gKartBowser091 +.word gKartBowser092, gKartBowser093, gKartBowser094, gKartBowser095 +.word gKartBowser096, gKartBowser097, gKartBowser098, gKartBowser099 +.word gKartBowser100, gKartBowser101, gKartBowser102, gKartBowser103 +.word gKartBowser104, gKartBowser235, gKartBowser236, gKartBowser237 +.word gKartBowser238, gKartBowser239, gKartBowser240, gKartBowser241 +.word gKartBowser242, gKartBowser243, gKartBowser244, gKartBowser245 +.word gKartBowser246, gKartBowser247, gKartBowser248 + +glabel gKartBowserGroup5 +.word gKartBowser105, gKartBowser106, gKartBowser107, gKartBowser108 +.word gKartBowser109, gKartBowser110, gKartBowser111, gKartBowser112 +.word gKartBowser113, gKartBowser114, gKartBowser115, gKartBowser116 +.word gKartBowser117, gKartBowser118, gKartBowser119, gKartBowser120 +.word gKartBowser121, gKartBowser122, gKartBowser123, gKartBowser124 +.word gKartBowser125, gKartBowser235, gKartBowser236, gKartBowser237 +.word gKartBowser238, gKartBowser239, gKartBowser240, gKartBowser241 +.word gKartBowser242, gKartBowser243, gKartBowser244, gKartBowser245 +.word gKartBowser246, gKartBowser247, gKartBowser248 + +glabel gKartBowserGroup6 +.word gKartBowser126, gKartBowser127, gKartBowser128, gKartBowser129 +.word gKartBowser130, gKartBowser131, gKartBowser132, gKartBowser133 +.word gKartBowser134, gKartBowser135, gKartBowser136, gKartBowser137 +.word gKartBowser138, gKartBowser139, gKartBowser140, gKartBowser141 +.word gKartBowser142, gKartBowser143, gKartBowser144, gKartBowser145 +.word gKartBowser146, gKartBowser255, gKartBowser256, gKartBowser257 +.word gKartBowser258, gKartBowser259, gKartBowser260, gKartBowser261 +.word gKartBowser262, gKartBowser263, gKartBowser264, gKartBowser265 +.word gKartBowser266, gKartBowser267, gKartBowser268 + +glabel gKartBowserGroup7 +.word gKartBowser147, gKartBowser148, gKartBowser149, gKartBowser150 +.word gKartBowser151, gKartBowser152, gKartBowser153, gKartBowser154 +.word gKartBowser155, gKartBowser156, gKartBowser157, gKartBowser158 +.word gKartBowser159, gKartBowser160, gKartBowser161, gKartBowser162 +.word gKartBowser163, gKartBowser164, gKartBowser165, gKartBowser166 +.word gKartBowser167, gKartBowser275, gKartBowser276, gKartBowser277 +.word gKartBowser278, gKartBowser279, gKartBowser280, gKartBowser281 +.word gKartBowser282, gKartBowser283, gKartBowser284, gKartBowser285 +.word gKartBowser286, gKartBowser287, gKartBowser288 + +glabel gKartBowserGroup8 +.word gKartBowser168, gKartBowser169, gKartBowser170, gKartBowser171 +.word gKartBowser172, gKartBowser173, gKartBowser174, gKartBowser175 +.word gKartBowser176, gKartBowser177, gKartBowser178, gKartBowser179 +.word gKartBowser180, gKartBowser181, gKartBowser182, gKartBowser183 +.word gKartBowser184, gKartBowser185, gKartBowser186, gKartBowser187 +.word gKartBowser188, gKartBowser275, gKartBowser276, gKartBowser277 +.word gKartBowser278, gKartBowser279, gKartBowser280, gKartBowser281 +.word gKartBowser282, gKartBowser283, gKartBowser284, gKartBowser285 +.word gKartBowser286, gKartBowser287, gKartBowser288 + +glabel gKartBowserGroup9 +.word gKartBowser189, gKartBowser190, gKartBowser191, gKartBowser192 +.word gKartBowser193, gKartBowser194, gKartBowser195, gKartBowser196 +.word gKartBowser197, gKartBowser198, gKartBowser199, gKartBowser200 +.word gKartBowser201, gKartBowser202, gKartBowser203, gKartBowser204 +.word gKartBowser205, gKartBowser206, gKartBowser207, gKartBowser208 + +glabel gKartBowserGroup10 +.word gKartBowser189, gKartBowser190, gKartBowser191, gKartBowser192 +.word gKartBowser193, gKartBowser194, gKartBowser195, gKartBowser196 +.word gKartBowser197, gKartBowser198, gKartBowser199, gKartBowser200 +.word gKartBowser201, gKartBowser202, gKartBowser203, gKartBowser204 +.word gKartBowser205, gKartBowser206, gKartBowser207, gKartBowser208 + +glabel gKartBowserGroup11 +.word gKartBowser209, gKartBowser210, gKartBowser211, gKartBowser212 +.word gKartBowser213, gKartBowser214, gKartBowser215, gKartBowser216 +.word gKartBowser217, gKartBowser218, gKartBowser219, gKartBowser220 +.word gKartBowser221, gKartBowser222, gKartBowser223, gKartBowser224 +.word gKartBowser225, gKartBowser226, gKartBowser227, gKartBowser228 + +glabel gKartBowserGroup12 +.word gKartBowser229, gKartBowser230, gKartBowser231, gKartBowser232 +.word gKartBowser233, gKartBowser234, gKartBowser235, gKartBowser236 +.word gKartBowser237, gKartBowser238, gKartBowser239, gKartBowser240 +.word gKartBowser241, gKartBowser242, gKartBowser243, gKartBowser244 +.word gKartBowser245, gKartBowser246, gKartBowser247, gKartBowser248 + +glabel gKartBowserGroup13 +.word gKartBowser229, gKartBowser230, gKartBowser231, gKartBowser232 +.word gKartBowser233, gKartBowser234, gKartBowser235, gKartBowser236 +.word gKartBowser237, gKartBowser238, gKartBowser239, gKartBowser240 +.word gKartBowser241, gKartBowser242, gKartBowser243, gKartBowser244 +.word gKartBowser245, gKartBowser246, gKartBowser247, gKartBowser248 + +glabel gKartBowserGroup14 +.word gKartBowser229, gKartBowser230, gKartBowser231, gKartBowser232 +.word gKartBowser233, gKartBowser234, gKartBowser235, gKartBowser236 +.word gKartBowser237, gKartBowser238, gKartBowser239, gKartBowser240 +.word gKartBowser241, gKartBowser242, gKartBowser243, gKartBowser244 +.word gKartBowser245, gKartBowser246, gKartBowser247, gKartBowser248 + +glabel gKartBowserGroup15 +.word gKartBowser249, gKartBowser250, gKartBowser251, gKartBowser252 +.word gKartBowser253, gKartBowser254, gKartBowser255, gKartBowser256 +.word gKartBowser257, gKartBowser258, gKartBowser259, gKartBowser260 +.word gKartBowser261, gKartBowser262, gKartBowser263, gKartBowser264 +.word gKartBowser265, gKartBowser266, gKartBowser267, gKartBowser268 + +glabel gKartBowserGroup16 +.word gKartBowser269, gKartBowser270, gKartBowser271, gKartBowser272 +.word gKartBowser273, gKartBowser274, gKartBowser275, gKartBowser276 +.word gKartBowser277, gKartBowser278, gKartBowser279, gKartBowser280 +.word gKartBowser281, gKartBowser282, gKartBowser283, gKartBowser284 +.word gKartBowser285, gKartBowser286, gKartBowser287, gKartBowser288 + +glabel gKartBowserGroup17 +.word gKartBowser269, gKartBowser270, gKartBowser271, gKartBowser272 +.word gKartBowser273, gKartBowser274, gKartBowser275, gKartBowser276 +.word gKartBowser277, gKartBowser278, gKartBowser279, gKartBowser280 +.word gKartBowser281, gKartBowser282, gKartBowser283, gKartBowser284 +.word gKartBowser285, gKartBowser286, gKartBowser287, gKartBowser288 + +glabel gKartPeachGroup0 +.word gKartPeach000, gKartPeach001, gKartPeach002, gKartPeach003 +.word gKartPeach004, gKartPeach005, gKartPeach006, gKartPeach007 +.word gKartPeach008, gKartPeach009, gKartPeach010, gKartPeach011 +.word gKartPeach012, gKartPeach013, gKartPeach014, gKartPeach015 +.word gKartPeach016, gKartPeach017, gKartPeach018, gKartPeach019 +.word gKartPeach020, gKartPeach195, gKartPeach196, gKartPeach197 +.word gKartPeach198, gKartPeach199, gKartPeach200, gKartPeach201 +.word gKartPeach202, gKartPeach203, gKartPeach204, gKartPeach205 +.word gKartPeach206, gKartPeach207, gKartPeach208 + +glabel gKartPeachGroup1 +.word gKartPeach021, gKartPeach022, gKartPeach023, gKartPeach024 +.word gKartPeach025, gKartPeach026, gKartPeach027, gKartPeach028 +.word gKartPeach029, gKartPeach030, gKartPeach031, gKartPeach032 +.word gKartPeach033, gKartPeach034, gKartPeach035, gKartPeach036 +.word gKartPeach037, gKartPeach038, gKartPeach039, gKartPeach040 +.word gKartPeach041, gKartPeach195, gKartPeach196, gKartPeach197 +.word gKartPeach198, gKartPeach199, gKartPeach200, gKartPeach201 +.word gKartPeach202, gKartPeach203, gKartPeach204, gKartPeach205 +.word gKartPeach206, gKartPeach207, gKartPeach208 + +glabel gKartPeachGroup2 +.word gKartPeach042, gKartPeach043, gKartPeach044, gKartPeach045 +.word gKartPeach046, gKartPeach047, gKartPeach048, gKartPeach049 +.word gKartPeach050, gKartPeach051, gKartPeach052, gKartPeach053 +.word gKartPeach054, gKartPeach055, gKartPeach056, gKartPeach057 +.word gKartPeach058, gKartPeach059, gKartPeach060, gKartPeach061 +.word gKartPeach062, gKartPeach215, gKartPeach216, gKartPeach217 +.word gKartPeach218, gKartPeach219, gKartPeach220, gKartPeach221 +.word gKartPeach222, gKartPeach223, gKartPeach224, gKartPeach225 +.word gKartPeach226, gKartPeach227, gKartPeach228 + +glabel gKartPeachGroup3 +.word gKartPeach063, gKartPeach064, gKartPeach065, gKartPeach066 +.word gKartPeach067, gKartPeach068, gKartPeach069, gKartPeach070 +.word gKartPeach071, gKartPeach072, gKartPeach073, gKartPeach074 +.word gKartPeach075, gKartPeach076, gKartPeach077, gKartPeach078 +.word gKartPeach079, gKartPeach080, gKartPeach081, gKartPeach082 +.word gKartPeach083, gKartPeach235, gKartPeach236, gKartPeach237 +.word gKartPeach238, gKartPeach239, gKartPeach240, gKartPeach241 +.word gKartPeach242, gKartPeach243, gKartPeach244, gKartPeach245 +.word gKartPeach246, gKartPeach247, gKartPeach248 + +glabel gKartPeachGroup4 +.word gKartPeach084, gKartPeach085, gKartPeach086, gKartPeach087 +.word gKartPeach088, gKartPeach089, gKartPeach090, gKartPeach091 +.word gKartPeach092, gKartPeach093, gKartPeach094, gKartPeach095 +.word gKartPeach096, gKartPeach097, gKartPeach098, gKartPeach099 +.word gKartPeach100, gKartPeach101, gKartPeach102, gKartPeach103 +.word gKartPeach104, gKartPeach235, gKartPeach236, gKartPeach237 +.word gKartPeach238, gKartPeach239, gKartPeach240, gKartPeach241 +.word gKartPeach242, gKartPeach243, gKartPeach244, gKartPeach245 +.word gKartPeach246, gKartPeach247, gKartPeach248 + +glabel gKartPeachGroup5 +.word gKartPeach105, gKartPeach106, gKartPeach107, gKartPeach108 +.word gKartPeach109, gKartPeach110, gKartPeach111, gKartPeach112 +.word gKartPeach113, gKartPeach114, gKartPeach115, gKartPeach116 +.word gKartPeach117, gKartPeach118, gKartPeach119, gKartPeach120 +.word gKartPeach121, gKartPeach122, gKartPeach123, gKartPeach124 +.word gKartPeach125, gKartPeach235, gKartPeach236, gKartPeach237 +.word gKartPeach238, gKartPeach239, gKartPeach240, gKartPeach241 +.word gKartPeach242, gKartPeach243, gKartPeach244, gKartPeach245 +.word gKartPeach246, gKartPeach247, gKartPeach248 + +glabel gKartPeachGroup6 +.word gKartPeach126, gKartPeach127, gKartPeach128, gKartPeach129 +.word gKartPeach130, gKartPeach131, gKartPeach132, gKartPeach133 +.word gKartPeach134, gKartPeach135, gKartPeach136, gKartPeach137 +.word gKartPeach138, gKartPeach139, gKartPeach140, gKartPeach141 +.word gKartPeach142, gKartPeach143, gKartPeach144, gKartPeach145 +.word gKartPeach146, gKartPeach255, gKartPeach256, gKartPeach257 +.word gKartPeach258, gKartPeach259, gKartPeach260, gKartPeach261 +.word gKartPeach262, gKartPeach263, gKartPeach264, gKartPeach265 +.word gKartPeach266, gKartPeach267, gKartPeach268 + +glabel gKartPeachGroup7 +.word gKartPeach147, gKartPeach148, gKartPeach149, gKartPeach150 +.word gKartPeach151, gKartPeach152, gKartPeach153, gKartPeach154 +.word gKartPeach155, gKartPeach156, gKartPeach157, gKartPeach158 +.word gKartPeach159, gKartPeach160, gKartPeach161, gKartPeach162 +.word gKartPeach163, gKartPeach164, gKartPeach165, gKartPeach166 +.word gKartPeach167, gKartPeach275, gKartPeach276, gKartPeach277 +.word gKartPeach278, gKartPeach279, gKartPeach280, gKartPeach281 +.word gKartPeach282, gKartPeach283, gKartPeach284, gKartPeach285 +.word gKartPeach286, gKartPeach287, gKartPeach288 + +glabel gKartPeachGroup8 +.word gKartPeach168, gKartPeach169, gKartPeach170, gKartPeach171 +.word gKartPeach172, gKartPeach173, gKartPeach174, gKartPeach175 +.word gKartPeach176, gKartPeach177, gKartPeach178, gKartPeach179 +.word gKartPeach180, gKartPeach181, gKartPeach182, gKartPeach183 +.word gKartPeach184, gKartPeach185, gKartPeach186, gKartPeach187 +.word gKartPeach188, gKartPeach275, gKartPeach276, gKartPeach277 +.word gKartPeach278, gKartPeach279, gKartPeach280, gKartPeach281 +.word gKartPeach282, gKartPeach283, gKartPeach284, gKartPeach285 +.word gKartPeach286, gKartPeach287, gKartPeach288 + +glabel gKartPeachGroup9 +.word gKartPeach189, gKartPeach190, gKartPeach191, gKartPeach192 +.word gKartPeach193, gKartPeach194, gKartPeach195, gKartPeach196 +.word gKartPeach197, gKartPeach198, gKartPeach199, gKartPeach200 +.word gKartPeach201, gKartPeach202, gKartPeach203, gKartPeach204 +.word gKartPeach205, gKartPeach206, gKartPeach207, gKartPeach208 + +glabel gKartPeachGroup10 +.word gKartPeach189, gKartPeach190, gKartPeach191, gKartPeach192 +.word gKartPeach193, gKartPeach194, gKartPeach195, gKartPeach196 +.word gKartPeach197, gKartPeach198, gKartPeach199, gKartPeach200 +.word gKartPeach201, gKartPeach202, gKartPeach203, gKartPeach204 +.word gKartPeach205, gKartPeach206, gKartPeach207, gKartPeach208 + +glabel gKartPeachGroup11 +.word gKartPeach209, gKartPeach210, gKartPeach211, gKartPeach212 +.word gKartPeach213, gKartPeach214, gKartPeach215, gKartPeach216 +.word gKartPeach217, gKartPeach218, gKartPeach219, gKartPeach220 +.word gKartPeach221, gKartPeach222, gKartPeach223, gKartPeach224 +.word gKartPeach225, gKartPeach226, gKartPeach227, gKartPeach228 + +glabel gKartPeachGroup12 +.word gKartPeach229, gKartPeach230, gKartPeach231, gKartPeach232 +.word gKartPeach233, gKartPeach234, gKartPeach235, gKartPeach236 +.word gKartPeach237, gKartPeach238, gKartPeach239, gKartPeach240 +.word gKartPeach241, gKartPeach242, gKartPeach243, gKartPeach244 +.word gKartPeach245, gKartPeach246, gKartPeach247, gKartPeach248 + +glabel gKartPeachGroup13 +.word gKartPeach229, gKartPeach230, gKartPeach231, gKartPeach232 +.word gKartPeach233, gKartPeach234, gKartPeach235, gKartPeach236 +.word gKartPeach237, gKartPeach238, gKartPeach239, gKartPeach240 +.word gKartPeach241, gKartPeach242, gKartPeach243, gKartPeach244 +.word gKartPeach245, gKartPeach246, gKartPeach247, gKartPeach248 + +glabel gKartPeachGroup14 +.word gKartPeach229, gKartPeach230, gKartPeach231, gKartPeach232 +.word gKartPeach233, gKartPeach234, gKartPeach235, gKartPeach236 +.word gKartPeach237, gKartPeach238, gKartPeach239, gKartPeach240 +.word gKartPeach241, gKartPeach242, gKartPeach243, gKartPeach244 +.word gKartPeach245, gKartPeach246, gKartPeach247, gKartPeach248 + +glabel gKartPeachGroup15 +.word gKartPeach249, gKartPeach250, gKartPeach251, gKartPeach252 +.word gKartPeach253, gKartPeach254, gKartPeach255, gKartPeach256 +.word gKartPeach257, gKartPeach258, gKartPeach259, gKartPeach260 +.word gKartPeach261, gKartPeach262, gKartPeach263, gKartPeach264 +.word gKartPeach265, gKartPeach266, gKartPeach267, gKartPeach268 + +glabel gKartPeachGroup16 +.word gKartPeach269, gKartPeach270, gKartPeach271, gKartPeach272 +.word gKartPeach273, gKartPeach274, gKartPeach275, gKartPeach276 +.word gKartPeach277, gKartPeach278, gKartPeach279, gKartPeach280 +.word gKartPeach281, gKartPeach282, gKartPeach283, gKartPeach284 +.word gKartPeach285, gKartPeach286, gKartPeach287, gKartPeach288 + +glabel gKartPeachGroup17 +.word gKartPeach269, gKartPeach270, gKartPeach271, gKartPeach272 +.word gKartPeach273, gKartPeach274, gKartPeach275, gKartPeach276 +.word gKartPeach277, gKartPeach278, gKartPeach279, gKartPeach280 +.word gKartPeach281, gKartPeach282, gKartPeach283, gKartPeach284 +.word gKartPeach285, gKartPeach286, gKartPeach287, gKartPeach288 + +glabel gKartWarioGroup0 +.word gKartWario000, gKartWario001, gKartWario002, gKartWario003 +.word gKartWario004, gKartWario005, gKartWario006, gKartWario007 +.word gKartWario008, gKartWario009, gKartWario010, gKartWario011 +.word gKartWario012, gKartWario013, gKartWario014, gKartWario015 +.word gKartWario016, gKartWario017, gKartWario018, gKartWario019 +.word gKartWario020, gKartWario195, gKartWario196, gKartWario197 +.word gKartWario198, gKartWario199, gKartWario200, gKartWario201 +.word gKartWario202, gKartWario203, gKartWario204, gKartWario205 +.word gKartWario206, gKartWario207, gKartWario208 + +glabel gKartWarioGroup1 +.word gKartWario021, gKartWario022, gKartWario023, gKartWario024 +.word gKartWario025, gKartWario026, gKartWario027, gKartWario028 +.word gKartWario029, gKartWario030, gKartWario031, gKartWario032 +.word gKartWario033, gKartWario034, gKartWario035, gKartWario036 +.word gKartWario037, gKartWario038, gKartWario039, gKartWario040 +.word gKartWario041, gKartWario195, gKartWario196, gKartWario197 +.word gKartWario198, gKartWario199, gKartWario200, gKartWario201 +.word gKartWario202, gKartWario203, gKartWario204, gKartWario205 +.word gKartWario206, gKartWario207, gKartWario208 + +glabel gKartWarioGroup2 +.word gKartWario042, gKartWario043, gKartWario044, gKartWario045 +.word gKartWario046, gKartWario047, gKartWario048, gKartWario049 +.word gKartWario050, gKartWario051, gKartWario052, gKartWario053 +.word gKartWario054, gKartWario055, gKartWario056, gKartWario057 +.word gKartWario058, gKartWario059, gKartWario060, gKartWario061 +.word gKartWario062, gKartWario215, gKartWario216, gKartWario217 +.word gKartWario218, gKartWario219, gKartWario220, gKartWario221 +.word gKartWario222, gKartWario223, gKartWario224, gKartWario225 +.word gKartWario226, gKartWario227, gKartWario228 + +glabel gKartWarioGroup3 +.word gKartWario063, gKartWario064, gKartWario065, gKartWario066 +.word gKartWario067, gKartWario068, gKartWario069, gKartWario070 +.word gKartWario071, gKartWario072, gKartWario073, gKartWario074 +.word gKartWario075, gKartWario076, gKartWario077, gKartWario078 +.word gKartWario079, gKartWario080, gKartWario081, gKartWario082 +.word gKartWario083, gKartWario235, gKartWario236, gKartWario237 +.word gKartWario238, gKartWario239, gKartWario240, gKartWario241 +.word gKartWario242, gKartWario243, gKartWario244, gKartWario245 +.word gKartWario246, gKartWario247, gKartWario248 + +glabel gKartWarioGroup4 +.word gKartWario084, gKartWario085, gKartWario086, gKartWario087 +.word gKartWario088, gKartWario089, gKartWario090, gKartWario091 +.word gKartWario092, gKartWario093, gKartWario094, gKartWario095 +.word gKartWario096, gKartWario097, gKartWario098, gKartWario099 +.word gKartWario100, gKartWario101, gKartWario102, gKartWario103 +.word gKartWario104, gKartWario235, gKartWario236, gKartWario237 +.word gKartWario238, gKartWario239, gKartWario240, gKartWario241 +.word gKartWario242, gKartWario243, gKartWario244, gKartWario245 +.word gKartWario246, gKartWario247, gKartWario248 + +glabel gKartWarioGroup5 +.word gKartWario105, gKartWario106, gKartWario107, gKartWario108 +.word gKartWario109, gKartWario110, gKartWario111, gKartWario112 +.word gKartWario113, gKartWario114, gKartWario115, gKartWario116 +.word gKartWario117, gKartWario118, gKartWario119, gKartWario120 +.word gKartWario121, gKartWario122, gKartWario123, gKartWario124 +.word gKartWario125, gKartWario235, gKartWario236, gKartWario237 +.word gKartWario238, gKartWario239, gKartWario240, gKartWario241 +.word gKartWario242, gKartWario243, gKartWario244, gKartWario245 +.word gKartWario246, gKartWario247, gKartWario248 + +glabel gKartWarioGroup6 +.word gKartWario126, gKartWario127, gKartWario128, gKartWario129 +.word gKartWario130, gKartWario131, gKartWario132, gKartWario133 +.word gKartWario134, gKartWario135, gKartWario136, gKartWario137 +.word gKartWario138, gKartWario139, gKartWario140, gKartWario141 +.word gKartWario142, gKartWario143, gKartWario144, gKartWario145 +.word gKartWario146, gKartWario255, gKartWario256, gKartWario257 +.word gKartWario258, gKartWario259, gKartWario260, gKartWario261 +.word gKartWario262, gKartWario263, gKartWario264, gKartWario265 +.word gKartWario266, gKartWario267, gKartWario268 + +glabel gKartWarioGroup7 +.word gKartWario147, gKartWario148, gKartWario149, gKartWario150 +.word gKartWario151, gKartWario152, gKartWario153, gKartWario154 +.word gKartWario155, gKartWario156, gKartWario157, gKartWario158 +.word gKartWario159, gKartWario160, gKartWario161, gKartWario162 +.word gKartWario163, gKartWario164, gKartWario165, gKartWario166 +.word gKartWario167, gKartWario275, gKartWario276, gKartWario277 +.word gKartWario278, gKartWario279, gKartWario280, gKartWario281 +.word gKartWario282, gKartWario283, gKartWario284, gKartWario285 +.word gKartWario286, gKartWario287, gKartWario288 + +glabel gKartWarioGroup8 +.word gKartWario168, gKartWario169, gKartWario170, gKartWario171 +.word gKartWario172, gKartWario173, gKartWario174, gKartWario175 +.word gKartWario176, gKartWario177, gKartWario178, gKartWario179 +.word gKartWario180, gKartWario181, gKartWario182, gKartWario183 +.word gKartWario184, gKartWario185, gKartWario186, gKartWario187 +.word gKartWario188, gKartWario275, gKartWario276, gKartWario277 +.word gKartWario278, gKartWario279, gKartWario280, gKartWario281 +.word gKartWario282, gKartWario283, gKartWario284, gKartWario285 +.word gKartWario286, gKartWario287, gKartWario288 + +glabel gKartWarioGroup9 +.word gKartWario189, gKartWario190, gKartWario191, gKartWario192 +.word gKartWario193, gKartWario194, gKartWario195, gKartWario196 +.word gKartWario197, gKartWario198, gKartWario199, gKartWario200 +.word gKartWario201, gKartWario202, gKartWario203, gKartWario204 +.word gKartWario205, gKartWario206, gKartWario207, gKartWario208 + +glabel gKartWarioGroup10 +.word gKartWario189, gKartWario190, gKartWario191, gKartWario192 +.word gKartWario193, gKartWario194, gKartWario195, gKartWario196 +.word gKartWario197, gKartWario198, gKartWario199, gKartWario200 +.word gKartWario201, gKartWario202, gKartWario203, gKartWario204 +.word gKartWario205, gKartWario206, gKartWario207, gKartWario208 + +glabel gKartWarioGroup11 +.word gKartWario209, gKartWario210, gKartWario211, gKartWario212 +.word gKartWario213, gKartWario214, gKartWario215, gKartWario216 +.word gKartWario217, gKartWario218, gKartWario219, gKartWario220 +.word gKartWario221, gKartWario222, gKartWario223, gKartWario224 +.word gKartWario225, gKartWario226, gKartWario227, gKartWario228 + +glabel gKartWarioGroup12 +.word gKartWario229, gKartWario230, gKartWario231, gKartWario232 +.word gKartWario233, gKartWario234, gKartWario235, gKartWario236 +.word gKartWario237, gKartWario238, gKartWario239, gKartWario240 +.word gKartWario241, gKartWario242, gKartWario243, gKartWario244 +.word gKartWario245, gKartWario246, gKartWario247, gKartWario248 + +glabel gKartWarioGroup13 +.word gKartWario229, gKartWario230, gKartWario231, gKartWario232 +.word gKartWario233, gKartWario234, gKartWario235, gKartWario236 +.word gKartWario237, gKartWario238, gKartWario239, gKartWario240 +.word gKartWario241, gKartWario242, gKartWario243, gKartWario244 +.word gKartWario245, gKartWario246, gKartWario247, gKartWario248 + +glabel gKartWarioGroup14 +.word gKartWario229, gKartWario230, gKartWario231, gKartWario232 +.word gKartWario233, gKartWario234, gKartWario235, gKartWario236 +.word gKartWario237, gKartWario238, gKartWario239, gKartWario240 +.word gKartWario241, gKartWario242, gKartWario243, gKartWario244 +.word gKartWario245, gKartWario246, gKartWario247, gKartWario248 + +glabel gKartWarioGroup15 +.word gKartWario249, gKartWario250, gKartWario251, gKartWario252 +.word gKartWario253, gKartWario254, gKartWario255, gKartWario256 +.word gKartWario257, gKartWario258, gKartWario259, gKartWario260 +.word gKartWario261, gKartWario262, gKartWario263, gKartWario264 +.word gKartWario265, gKartWario266, gKartWario267, gKartWario268 + +glabel gKartWarioGroup16 +.word gKartWario269, gKartWario270, gKartWario271, gKartWario272 +.word gKartWario273, gKartWario274, gKartWario275, gKartWario276 +.word gKartWario277, gKartWario278, gKartWario279, gKartWario280 +.word gKartWario281, gKartWario282, gKartWario283, gKartWario284 +.word gKartWario285, gKartWario286, gKartWario287, gKartWario288 + +glabel gKartWarioGroup17 +.word gKartWario269, gKartWario270, gKartWario271, gKartWario272 +.word gKartWario273, gKartWario274, gKartWario275, gKartWario276 +.word gKartWario277, gKartWario278, gKartWario279, gKartWario280 +.word gKartWario281, gKartWario282, gKartWario283, gKartWario284 +.word gKartWario285, gKartWario286, gKartWario287, gKartWario288 + +glabel gKartMarioTable0 +.word gKartMarioGroup8, gKartMarioGroup7, gKartMarioGroup6, gKartMarioGroup5 +.word gKartMarioGroup4, gKartMarioGroup3, gKartMarioGroup2, gKartMarioGroup1 +.word gKartMarioGroup0 + +glabel gKartLuigiTable0 +.word gKartLuigiGroup8, gKartLuigiGroup7, gKartLuigiGroup6, gKartLuigiGroup5 +.word gKartLuigiGroup4, gKartLuigiGroup3, gKartLuigiGroup2, gKartLuigiGroup1 +.word gKartLuigiGroup0 + +glabel gKartYoshiTable0 +.word gKartYoshiGroup8, gKartYoshiGroup7, gKartYoshiGroup6, gKartYoshiGroup5 +.word gKartYoshiGroup4, gKartYoshiGroup3, gKartYoshiGroup2, gKartYoshiGroup1 +.word gKartYoshiGroup0 + +glabel gKartToadTable0 +.word gKartToadGroup8, gKartToadGroup7, gKartToadGroup6, gKartToadGroup5 +.word gKartToadGroup4, gKartToadGroup3, gKartToadGroup2, gKartToadGroup1 +.word gKartToadGroup0 + +glabel gKartDKTable0 +.word gKartDKGroup8, gKartDKGroup7, gKartDKGroup6, gKartDKGroup5 +.word gKartDKGroup4, gKartDKGroup3, gKartDKGroup2, gKartDKGroup1 +.word gKartDKGroup0 + +glabel gKartWarioTable0 +.word gKartWarioGroup8, gKartWarioGroup7, gKartWarioGroup6, gKartWarioGroup5 +.word gKartWarioGroup4, gKartWarioGroup3, gKartWarioGroup2, gKartWarioGroup1 +.word gKartWarioGroup0 + +glabel gKartPeachTable0 +.word gKartPeachGroup8, gKartPeachGroup7, gKartPeachGroup6, gKartPeachGroup5 +.word gKartPeachGroup4, gKartPeachGroup3, gKartPeachGroup2, gKartPeachGroup1 +.word gKartPeachGroup0 + +glabel gKartBowserTable0 +.word gKartBowserGroup8, gKartBowserGroup7, gKartBowserGroup6, gKartBowserGroup5 +.word gKartBowserGroup4, gKartBowserGroup3, gKartBowserGroup2, gKartBowserGroup1 +.word gKartBowserGroup0 + +glabel gKartMarioTable1 +.word gKartMarioGroup17, gKartMarioGroup16, gKartMarioGroup15, gKartMarioGroup14 +.word gKartMarioGroup13, gKartMarioGroup12, gKartMarioGroup11, gKartMarioGroup10 +.word gKartMarioGroup9 + +glabel gKartLuigiTable1 +.word gKartLuigiGroup17, gKartLuigiGroup16, gKartLuigiGroup15, gKartLuigiGroup14 +.word gKartLuigiGroup13, gKartLuigiGroup12, gKartLuigiGroup11, gKartLuigiGroup10 +.word gKartLuigiGroup9 + +glabel gKartYoshiTable1 +.word gKartYoshiGroup17, gKartYoshiGroup16, gKartYoshiGroup15, gKartYoshiGroup14 +.word gKartYoshiGroup13, gKartYoshiGroup12, gKartYoshiGroup11, gKartYoshiGroup10 +.word gKartYoshiGroup9 + +glabel gKartToadTable1 +.word gKartToadGroup17, gKartToadGroup16, gKartToadGroup15, gKartToadGroup14 +.word gKartToadGroup13, gKartToadGroup12, gKartToadGroup11, gKartToadGroup10 +.word gKartToadGroup9 + +glabel gKartDKTable1 +.word gKartDKGroup17, gKartDKGroup16, gKartDKGroup15, gKartDKGroup14 +.word gKartDKGroup13, gKartDKGroup12, gKartDKGroup11, gKartDKGroup10 +.word gKartDKGroup9 + +glabel gKartWarioTable1 +.word gKartWarioGroup17, gKartWarioGroup16, gKartWarioGroup15, gKartWarioGroup14 +.word gKartWarioGroup13, gKartWarioGroup12, gKartWarioGroup11, gKartWarioGroup10 +.word gKartWarioGroup9 + +glabel gKartPeachTable1 +.word gKartPeachGroup17, gKartPeachGroup16, gKartPeachGroup15, gKartPeachGroup14 +.word gKartPeachGroup13, gKartPeachGroup12, gKartPeachGroup11, gKartPeachGroup10 +.word gKartPeachGroup9 + +glabel gKartBowserTable1 +.word gKartBowserGroup17, gKartBowserGroup16, gKartBowserGroup15, gKartBowserGroup14 +.word gKartBowserGroup13, gKartBowserGroup12, gKartBowserGroup11, gKartBowserGroup10 +.word gKartBowserGroup9 + +glabel gKartTextureTable0 +.word gKartMarioTable0 +.word gKartLuigiTable0 +.word gKartYoshiTable0 +.word gKartToadTable0 +.word gKartDKTable0 +.word gKartWarioTable0 +.word gKartPeachTable0 +.word gKartBowserTable0 + +glabel gKartTextureTable1 +.word gKartMarioTable1 +.word gKartLuigiTable1 +.word gKartYoshiTable1 +.word gKartToadTable1 +.word gKartDKTable1 +.word gKartWarioTable1 +.word gKartPeachTable1 +.word gKartBowserTable1 + +glabel gKartMarioGroup18 +.word gKartMario289, gKartMario290, gKartMario291, gKartMario292 +.word gKartMario293, gKartMario294, gKartMario295, gKartMario296 +.word gKartMario297, gKartMario298, gKartMario299, gKartMario300 +.word gKartMario301, gKartMario302, gKartMario303, gKartMario304 +.word gKartMario305, gKartMario306, gKartMario307, gKartMario308 +.word gKartMario309, gKartMario310, gKartMario311, gKartMario312 +.word gKartMario313, gKartMario314, gKartMario315, gKartMario316 +.word gKartMario317, gKartMario318, gKartMario319, gKartMario320 + +glabel gKartLuigiGroup18 +.word gKartLuigi289, gKartLuigi290, gKartLuigi291, gKartLuigi292 +.word gKartLuigi293, gKartLuigi294, gKartLuigi295, gKartLuigi296 +.word gKartLuigi297, gKartLuigi298, gKartLuigi299, gKartLuigi300 +.word gKartLuigi301, gKartLuigi302, gKartLuigi303, gKartLuigi304 +.word gKartLuigi305, gKartLuigi306, gKartLuigi307, gKartLuigi308 +.word gKartLuigi309, gKartLuigi310, gKartLuigi311, gKartLuigi312 +.word gKartLuigi313, gKartLuigi314, gKartLuigi315, gKartLuigi316 +.word gKartLuigi317, gKartLuigi318, gKartLuigi319, gKartLuigi320 + +glabel gKartBowserGroup18 +.word gKartBowser289, gKartBowser290, gKartBowser291, gKartBowser292 +.word gKartBowser293, gKartBowser294, gKartBowser295, gKartBowser296 +.word gKartBowser297, gKartBowser298, gKartBowser299, gKartBowser300 +.word gKartBowser301, gKartBowser302, gKartBowser303, gKartBowser304 +.word gKartBowser305, gKartBowser306, gKartBowser307, gKartBowser308 +.word gKartBowser309, gKartBowser310, gKartBowser311, gKartBowser312 +.word gKartBowser313, gKartBowser314, gKartBowser315, gKartBowser316 +.word gKartBowser317, gKartBowser318, gKartBowser319, gKartBowser320 + +glabel gKartToadGroup18 +.word gKartToad289, gKartToad290, gKartToad291, gKartToad292 +.word gKartToad293, gKartToad294, gKartToad295, gKartToad296 +.word gKartToad297, gKartToad298, gKartToad299, gKartToad300 +.word gKartToad301, gKartToad302, gKartToad303, gKartToad304 +.word gKartToad305, gKartToad306, gKartToad307, gKartToad308 +.word gKartToad309, gKartToad310, gKartToad311, gKartToad312 +.word gKartToad313, gKartToad314, gKartToad315, gKartToad316 +.word gKartToad317, gKartToad318, gKartToad319, gKartToad320 + +glabel gKartYoshiGroup18 +.word gKartYoshi289, gKartYoshi290, gKartYoshi291, gKartYoshi292 +.word gKartYoshi293, gKartYoshi294, gKartYoshi295, gKartYoshi296 +.word gKartYoshi297, gKartYoshi298, gKartYoshi299, gKartYoshi300 +.word gKartYoshi301, gKartYoshi302, gKartYoshi303, gKartYoshi304 +.word gKartYoshi305, gKartYoshi306, gKartYoshi307, gKartYoshi308 +.word gKartYoshi309, gKartYoshi310, gKartYoshi311, gKartYoshi312 +.word gKartYoshi313, gKartYoshi314, gKartYoshi315, gKartYoshi316 +.word gKartYoshi317, gKartYoshi318, gKartYoshi319, gKartYoshi320 + +glabel gKartDKGroup18 +.word gKartDK289, gKartDK290, gKartDK291, gKartDK292 +.word gKartDK293, gKartDK294, gKartDK295, gKartDK296 +.word gKartDK297, gKartDK298, gKartDK299, gKartDK300 +.word gKartDK301, gKartDK302, gKartDK303, gKartDK304 +.word gKartDK305, gKartDK306, gKartDK307, gKartDK308 +.word gKartDK309, gKartDK310, gKartDK311, gKartDK312 +.word gKartDK313, gKartDK314, gKartDK315, gKartDK316 +.word gKartDK317, gKartDK318, gKartDK319, gKartDK320 + +glabel gKartPeachGroup18 +.word gKartPeach289, gKartPeach290, gKartPeach291, gKartPeach292 +.word gKartPeach293, gKartPeach294, gKartPeach295, gKartPeach296 +.word gKartPeach297, gKartPeach298, gKartPeach299, gKartPeach300 +.word gKartPeach301, gKartPeach302, gKartPeach303, gKartPeach304 +.word gKartPeach305, gKartPeach306, gKartPeach307, gKartPeach308 +.word gKartPeach309, gKartPeach310, gKartPeach311, gKartPeach312 +.word gKartPeach313, gKartPeach314, gKartPeach315, gKartPeach316 +.word gKartPeach317, gKartPeach318, gKartPeach319, gKartPeach320 + +glabel gKartWarioGroup18 +.word gKartWario289, gKartWario290, gKartWario291, gKartWario292 +.word gKartWario293, gKartWario294, gKartWario295, gKartWario296 +.word gKartWario297, gKartWario298, gKartWario299, gKartWario300 +.word gKartWario301, gKartWario302, gKartWario303, gKartWario304 +.word gKartWario305, gKartWario306, gKartWario307, gKartWario308 +.word gKartWario309, gKartWario310, gKartWario311, gKartWario312 +.word gKartWario313, gKartWario314, gKartWario315, gKartWario316 +.word gKartWario317, gKartWario318, gKartWario319, gKartWario320 + +glabel gKartTextureGroup18s +.word gKartMarioGroup18 +.word gKartLuigiGroup18 +.word gKartYoshiGroup18 +.word gKartToadGroup18 +.word gKartDKGroup18 +.word gKartWarioGroup18 +.word gKartPeachGroup18 +.word gKartBowserGroup18 + +glabel gKartPalettes +.word gKartMarioPalette +.word gKartLuigiPalette +.word gKartYoshiPalette +.word gKartToadPalette +.word gKartDKPalette +.word gKartWarioPalette +.word gKartPeachPalette +.word gKartBowserPalette diff --git a/data/data_0DD0A0_2.s b/data/data_0DD0A0_2.s index 78f30d321..5a91fcf0c 100644 --- a/data/data_0DD0A0_2.s +++ b/data/data_0DD0A0_2.s @@ -2279,10 +2279,10 @@ glabel D_800E8688 .word 0x28281400 # light brightness (stops) .word 0x00000000, 0x00000000, 0x00000000 -glabel D_800E86A0 +glabel D_800E86A0 # menu counter .word 0x00000008 -glabel D_800E86A4 +glabel D_800E86A4 # on change menu? .word 0x00000000 glabel D_800E86A8 diff --git a/data/data_121DA0.s b/data/data_121DA0.s index 9cb3258c9..7f56e4f33 100644 --- a/data/data_121DA0.s +++ b/data/data_121DA0.s @@ -94,151 +94,103 @@ glabel D_802B886C glabel D_802B8874 .float 0.0, 5.0, 10.0 -glabel D_802B8880 # Vp viewport -.hword 640, 480, 511, 0 -.hword 640, 480, 511, 0 +#glabel D_802B8880 # Vp viewport +#.hword 640, 480, 511, 0 +#.hword 640, 480, 511, 0 -glabel D_802B8890 -vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#glabel D_802B8890 +#vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -glabel D_802B8910 -vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#glabel D_802B8910 +#vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -glabel D_802B8990 -vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#glabel D_802B8990 +#vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -glabel D_802B8A10 -vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF -vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF -vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF -vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#glabel D_802B8A10 +#vertex 320, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 120, -1, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF +#vertex 0, 240, -1, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF +#vertex 320, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF +#vertex 320, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 0, -1, 0, 0, 0x78, 0xFF, 0x78, 0xFF +#vertex 0, 120, -1, 0, 0, 0x00, 0xDC, 0x00, 0xFF -glabel D_802B8A90 # unreferenced F3D -.word 0xe7000000, 0x00000000, 0xb900031d, 0x0f0a4000 -.word 0xba001402, 0x00300000, 0xf7000000, 0x00000000 -.word 0xf64fc3bc, 0x00000000, 0xe7000000, 0x00000000 -.word 0xba001402, 0x00000000, 0xb8000000, 0x00000000 +#glabel D_802B8A90 # unreferenced F3D +#.word 0xe7000000, 0x00000000, 0xb900031d, 0x0f0a4000 +#.word 0xba001402, 0x00300000, 0xf7000000, 0x00000000 +#.word 0xf64fc3bc, 0x00000000, 0xe7000000, 0x00000000 +#.word 0xba001402, 0x00000000, 0xb8000000, 0x00000000 -glabel sSkyColors # table of entries 12-bytes -.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 -.hword 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff -.hword 0x0030, 0x0608, 0xc178, 0x0000, 0x0000, 0x0000 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x0071, 0x0046, 0x00ff, 0x00ff, 0x00b8, 0x0063 -.hword 0x001c, 0x000b, 0x005a, 0x0000, 0x0063, 0x00a4 -.hword 0x0030, 0x0698, 0xd378, 0x00d8, 0x1be8, 0x7df8 -.hword 0x00ee, 0x0090, 0x00ff, 0x00ff, 0x00e0, 0x00f0 -.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 -.hword 0x0000, 0x0012, 0x00ff, 0x00c5, 0x00d3, 0x00ff -.hword 0x0000, 0x0002, 0x005e, 0x00d1, 0x0041, 0x0017 -.hword 0x00c3, 0x00e7, 0x00ff, 0x00ff, 0x00c0, 0x0000 -.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x0014, 0x001e, 0x0038, 0x0028, 0x003c, 0x006e -.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x0071, 0x0046, 0x00ff, 0x00ff, 0x00b8, 0x0063 -.hword 0x00ff, 0x00ae, 0x0000, 0x00ff, 0x00e5, 0x007c -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x00ee, 0x0090, 0x00ff, 0x00ff, 0x00e0, 0x00f0 +#glabel sSkyColors # table of entries 12-bytes +#.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 +#.hword 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff +#.hword 0x0030, 0x0608, 0xc178, 0x0000, 0x0000, 0x0000 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x0071, 0x0046, 0x00ff, 0x00ff, 0x00b8, 0x0063 +#.hword 0x001c, 0x000b, 0x005a, 0x0000, 0x0063, 0x00a4 +#.hword 0x0030, 0x0698, 0xd378, 0x00d8, 0x1be8, 0x7df8 +#.hword 0x00ee, 0x0090, 0x00ff, 0x00ff, 0x00e0, 0x00f0 +#.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 +#.hword 0x0000, 0x0012, 0x00ff, 0x00c5, 0x00d3, 0x00ff +#.hword 0x0000, 0x0002, 0x005e, 0x00d1, 0x0041, 0x0017 +#.hword 0x00c3, 0x00e7, 0x00ff, 0x00ff, 0x00c0, 0x0000 +#.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x0014, 0x001e, 0x0038, 0x0028, 0x003c, 0x006e +#.hword 0x0080, 0x10b8, 0x17f8, 0x00d8, 0x1be8, 0x7df8 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x0071, 0x0046, 0x00ff, 0x00ff, 0x00b8, 0x0063 +#.hword 0x00ff, 0x00ae, 0x0000, 0x00ff, 0x00e5, 0x007c +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x00ee, 0x0090, 0x00ff, 0x00ff, 0x00e0, 0x00f0 -glabel D_802B8BCC # table of entries 12-bytes -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x005f, 0x0028, 0x000f, 0x0000, 0x0000, 0x0000 -.hword 0x0000, 0x0063, 0x00a4, 0x0000, 0x0000, 0x0000 -.hword 0x0030, 0x0698, 0xd378, 0x0000, 0x0000, 0x0000 -.hword 0x00ff, 0x00e0, 0x00f0, 0x0000, 0x0000, 0x0000 -.hword 0x00d8, 0x1be8, 0x7df8, 0x0000, 0x0000, 0x0000 -.hword 0x00ff, 0x00b8, 0x0063, 0x0000, 0x0000, 0x0000 -.hword 0x00d1, 0x0041, 0x0017, 0x0000, 0x0000, 0x0000 -.hword 0x00ff, 0x00c0, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x00d8, 0x1be8, 0x7df8, 0x0080, 0x10b8, 0x17f8 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x00d8, 0x1be8, 0x7df8, 0x0000, 0x0000, 0x0000 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x00ff, 0x00e0, 0x00f0, 0x0000, 0x0000, 0x0000 -.hword 0x0016, 0x0091, 0x0016, 0x0000, 0x0000, 0x0000 -.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -.hword 0x00ff, 0x00e0, 0x00f0, 0x0000, 0x0000, 0x0000 +#glabel D_802B8BCC # table of entries 12-bytes +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff, 0x00ff +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x005f, 0x0028, 0x000f, 0x0000, 0x0000, 0x0000 +#.hword 0x0000, 0x0063, 0x00a4, 0x0000, 0x0000, 0x0000 +#.hword 0x0030, 0x0698, 0xd378, 0x0000, 0x0000, 0x0000 +#.hword 0x00ff, 0x00e0, 0x00f0, 0x0000, 0x0000, 0x0000 +#.hword 0x00d8, 0x1be8, 0x7df8, 0x0000, 0x0000, 0x0000 +#.hword 0x00ff, 0x00b8, 0x0063, 0x0000, 0x0000, 0x0000 +#.hword 0x00d1, 0x0041, 0x0017, 0x0000, 0x0000, 0x0000 +#.hword 0x00ff, 0x00c0, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x00d8, 0x1be8, 0x7df8, 0x0080, 0x10b8, 0x17f8 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x00d8, 0x1be8, 0x7df8, 0x0000, 0x0000, 0x0000 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x00ff, 0x00e0, 0x00f0, 0x0000, 0x0000, 0x0000 +#.hword 0x0016, 0x0091, 0x0016, 0x0000, 0x0000, 0x0000 +#.hword 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +#.hword 0x00ff, 0x00e0, 0x00f0, 0x0000, 0x0000, 0x0000 -.word 0, 0 # fill +#.word 0, 0 # fill -glabel D_802B8CD0 -.word 0 - -glabel D_802B8CD4 # array of structs hhww, only one? -.hword 0, 0 -.word 0, 0 -.word 0 # struct fill - -.word 0 # fill - -glabel D_802B8CE8 -.word 0xbc000002, 0x80000040 -glabel D_802B8CF0 -.word 0xb7000000, 0x00002000 -glabel D_802B8CF8 -.word 0xb6000000, 0x00002000 -glabel D_802B8D00 -.word 0xbe000000, 0x00000140 -glabel D_802B8D08 -.word 0xfc121824, 0xff33ffff -glabel D_802B8D10 -.word 0xfc127e24, 0xfffff3f9 -glabel D_802B8D18 -.word 0xfcffffff, 0xfffe793c -glabel D_802B8D20 -.word 0xfc127e24, 0xfffff3f9 -glabel D_802B8D28 -.word 0xfcffffff, 0xfffcf279 - -glabel D_802B8D30 -.word 0xb900031d, 0x00552078 -glabel D_802B8D38 -.word 0xb900031d, 0x00553078 -glabel D_802B8D40 -.word 0xb900031d, 0x005049d8 -glabel D_802B8D48 -.word 0xb900031d, 0x00442d58 -glabel D_802B8D50 -.word 0xb900031d, 0x00404dd8 -glabel D_802B8D58 -.word 0xe8000000, 0x00000000 -glabel D_802B8D60 -.word 0xe8000000, 0x00000000 -glabel D_802B8D68 -.word 0xe6000000, 0x00000000 -glabel D_802B8D70 -.word 0xbb000001, 0xffffffff - -glabel D_802B8D78 -.word 0xbb000000, 0x00010001 +#glabel gMainPoolState +#.word 0 diff --git a/data/data_121DA0_1.s b/data/data_121DA0_1.s new file mode 100644 index 000000000..1c426a551 --- /dev/null +++ b/data/data_121DA0_1.s @@ -0,0 +1,54 @@ +# Mario Kart 64 (U) disassembly and split file +# generated by n64split v0.4a - N64 ROM splitter + +.include "macros.inc" + +.section .data + +#glabel D_802B8CD4 # array of structs hhww, only one? +#.hword 0, 0 +#.word 0, 0 +#.word 0 # struct fill + +#.word 0 # fill + +#glabel D_802B8CE8 +#.word 0xbc000002, 0x80000040 +glabel D_802B8CF0 +.word 0xb7000000, 0x00002000 +glabel D_802B8CF8 +.word 0xb6000000, 0x00002000 +glabel D_802B8D00 +.word 0xbe000000, 0x00000140 +glabel D_802B8D08 +.word 0xfc121824, 0xff33ffff +glabel D_802B8D10 +.word 0xfc127e24, 0xfffff3f9 +glabel D_802B8D18 +.word 0xfcffffff, 0xfffe793c +glabel D_802B8D20 +.word 0xfc127e24, 0xfffff3f9 +glabel D_802B8D28 +.word 0xfcffffff, 0xfffcf279 + +glabel D_802B8D30 +.word 0xb900031d, 0x00552078 +glabel D_802B8D38 +.word 0xb900031d, 0x00553078 +glabel D_802B8D40 +.word 0xb900031d, 0x005049d8 +glabel D_802B8D48 +.word 0xb900031d, 0x00442d58 +glabel D_802B8D50 +.word 0xb900031d, 0x00404dd8 +glabel D_802B8D58 +.word 0xe8000000, 0x00000000 +glabel D_802B8D60 +.word 0xe8000000, 0x00000000 +glabel D_802B8D68 +.word 0xe6000000, 0x00000000 +glabel D_802B8D70 +.word 0xbb000001, 0xffffffff + +glabel D_802B8D78 +.word 0xbb000000, 0x00010001 diff --git a/data/data_121DA0_2.s b/data/data_121DA0_2.s index 42bf62f1d..58365aeed 100644 --- a/data/data_121DA0_2.s +++ b/data/data_121DA0_2.s @@ -652,7 +652,7 @@ glabel D_802B9BB0 glabel D_802B9BB4 .float 6800.0 -glabel D_802B9BB8 +glabel jtbl_802B9BB8 .word L802A4E04, L802A4D98, L802A4D74, L802A4D74 .word L802A4E04, L802A4E04, L802A4DBC, L802A4E04 .word L802A4E04, L802A4E04, L802A4E04, L802A4E28 diff --git a/diff b/diff index 7bd6152f5..854a8c72d 100755 --- a/diff +++ b/diff @@ -1,3 +1,3 @@ #!/bin/bash -python3 tools/asm-differ/diff.py $1 +python3 tools/asm-differ/diff.py $1 $2 $3 $4 $5 diff --git a/include/PR/gbi.h b/include/PR/gbi.h index 18679e9e3..342bc7080 100644 --- a/include/PR/gbi.h +++ b/include/PR/gbi.h @@ -2284,12 +2284,12 @@ typedef union { /* * r should be one of: FRUSTRATIO_1, FRUSTRATIO_2, FRUSTRATIO_3, ... FRUSTRATIO_6 */ -#define gSPClipRatio(pkt, r) \ +#define gSPClipRatio(pkt) \ { \ - gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNX, FR_NEG_##r); \ - gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNY, FR_NEG_##r); \ - gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPX, FR_POS_##r); \ - gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPY, FR_POS_##r); \ + gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNX, FR_NEG_FRUSTRATIO_1); \ + gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RNY, FR_NEG_FRUSTRATIO_1); \ + gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPX, FR_POS_FRUSTRATIO_1); \ + gMoveWd(pkt, G_MW_CLIP, G_MWO_CLIP_RPY, FR_POS_FRUSTRATIO_1); \ } #define gsSPClipRatio(r) \ diff --git a/include/common_structs.h b/include/common_structs.h index 81f6b309e..06e89fd07 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -68,8 +68,9 @@ typedef struct { f32 angleX; f32 angleY; f32 angleZ; - s32 rotX; - s32 rotY; // unused? + s16 rotX; + s16 rotX2; + s16 rotY; // unused? s16 rotZ; s32 unk3; // zero s32 unk4; // 0x4119999A @@ -97,15 +98,17 @@ typedef struct { f32 unkAngleZ; s32 unk21; // zero f32 collision; - s32 unk22; // zero - s32 unk23; // zero - s32 unk24; // zero + f32 unk22; // zero + s16 unk23; // confirmed s16 + s16 unk24; // zero + s16 unk24_and_a_half; s32 unk25; // zero s32 unk26; // zero // need another s16 here? s32 unk27; // 8 s16 unk28; // zero - s32 unk29; // 422 + f32 unk29; // 422 + f32 unk30; } Camera; typedef struct { diff --git a/include/types.h b/include/types.h index 9a43a2ef4..1835346dd 100644 --- a/include/types.h +++ b/include/types.h @@ -2,6 +2,7 @@ #define TYPES_H #include +#include enum SpTaskState { SPTASK_STATE_NOT_STARTED, @@ -25,6 +26,13 @@ struct VblankHandler OSMesg msg; }; +struct D_80150158 { + s16 unk0; + s32 unk4; + s32 unk8; + s32 unkC; +}; + struct Controller { s16 rawStickX; s16 rawStickY; @@ -37,24 +45,22 @@ struct Controller { }; struct UnkStruct_800DC5EC { - u32 unk0; - u32 unk4; - u32 unk8; - u32 unkC; - u32 unk10; - u32 unk14; - u32 unk18; - u32 unk1C; - u32 unk20; - u32 unk24; - u32 unk28; - u16 unk2C; - u16 unk2E; - u16 unk30; - u16 unk32; - u16 unk34; - u16 unk36; - s16 unk38; + struct Controller *controllers; // gControllers ptr 800F6910 + Camera *camera; // Player camera ptr + Player *player; // Player ptr 800F6990 + s32 unkC; // unk struct? + Vp viewport; + s32 pad[2]; + u32 cameraHeight; + s16 screenWidth; + s16 screenHeight; + s16 screenStartX; + s16 screenStartY; + s16 unk3C; + s16 playerDirection; + s16 pathCounter; + s16 unk42; + s32 pad2; }; struct UnkStruct_800DDB40 { diff --git a/include/variables.h b/include/variables.h index 83a37f6fd..38b3a057b 100644 --- a/include/variables.h +++ b/include/variables.h @@ -82,10 +82,10 @@ extern s32 D_80165400[]; extern s32 D_801654A0[]; extern s32 D_801654C0[]; extern s16 D_80165300[]; -extern s32 D_800DDB40; -extern s32 D_800DDB44; -extern s32 D_800DDB48; -extern s32 D_800DDB4C; +extern Camera *camera1; +extern Camera *camera2; +extern Camera *camera3; +extern Camera *camera4; extern s32 D_8016524C; #endif diff --git a/mk64.ld b/mk64.ld index a815c7058..a7d9cbf37 100644 --- a/mk64.ld +++ b/mk64.ld @@ -218,9 +218,14 @@ SECTIONS BUILD_DIR/data/rsp.o(.text); BUILD_DIR/src/main.o(.data); BUILD_DIR/data/data_0DD0A0.o(.data); + BUILD_DIR/src/code_800029B0.o(.data); + + BUILD_DIR/data/data_0DD0A0_0.o(.data); BUILD_DIR/src/crash_screen.o(.data); BUILD_DIR/src/staff_ghosts.o(.data); BUILD_DIR/data/data_0DD0A0_1.o(.data); + BUILD_DIR/src/code_8001C4D0.o(.data); + BUILD_DIR/data/data_0DD0A0_1_1.o(.data); BUILD_DIR/src/kart_attributes.inc.o(.data); BUILD_DIR/data/data_0DD0A0_2.o(.rodata); BUILD_DIR/src/os/osInitialize.o(.data*); @@ -257,7 +262,7 @@ SECTIONS BEGIN_NOLOAD(main) { BUILD_DIR/src/main.o(.bss); - + BUILD_DIR/src/code_800029B0.o(.bss); BUILD_DIR/asm/bss_800029B0.o(.bss); BUILD_DIR/src/profiler.o(.bss); @@ -267,6 +272,8 @@ SECTIONS BUILD_DIR/src/staff_ghosts.o(.bss); BUILD_DIR/asm/bss_80005FD0.o(.bss); BUILD_DIR/asm/bss_MainSeg.o(.bss); + BUILD_DIR/src/code_8001C4D0.o(.bss); + BUILD_DIR/asm/bss_8001C4D0.o(.bss); BUILD_DIR/src/os/osCreateViManager.o(.bss); BUILD_DIR/src/os/osCreatePiManager.o(.bss); BUILD_DIR/src/os/osSetEventMesg.o(.bss); @@ -311,6 +318,9 @@ SECTIONS BUILD_DIR/src/code_802B0210.o(.text); BUILD_DIR/src/math_util.o(.text); BUILD_DIR/data/data_121DA0.o(.data); + BUILD_DIR/src/code_802A3730.o(.data); + BUILD_DIR/src/memory.o(.data); + BUILD_DIR/data/data_121DA0_1.o(.data); BUILD_DIR/courses/courseTable.inc.o(.data); BUILD_DIR/data/data_121DA0_2.o(.data); //BUILD_DIR/src/code_8028DF00.o(.rodata); @@ -320,6 +330,8 @@ SECTIONS BEGIN_NOLOAD(code_8028DF00) { BUILD_DIR/src/code_8028DF00.o(.bss); BUILD_DIR/asm/bss_8028DF00.o(.bss); + BUILD_DIR/src/memory.o(.bss); + BUILD_DIR/asm/bss_sptask_audio.o(.bss); } END_NOLOAD(code_8028DF00) diff --git a/src/audio/external.c b/src/audio/external.c index ba08c4a6b..f0677bc1b 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -656,10 +656,10 @@ void func_800C2474(void) { s32 phi_v0_4; D_8018EF10 = 0; - D_8018FB98.unk0 = D_800DDB40; - D_8018FB98.unk4 = D_800DDB44; - D_8018FB98.unk8 = D_800DDB48; - D_8018FB98.unkC = D_800DDB4C; + D_8018FB98.unk0 = camera1; + D_8018FB98.unk4 = camera2; + D_8018FB98.unk8 = camera3; + D_8018FB98.unkC = camera4; D_8018FB91 = 0; D_8018FB90 = 1; D_800EA0F4 = 0; diff --git a/src/code_800029B0.c b/src/code_800029B0.c index 4032f2221..c6e3e5f54 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -22,7 +22,7 @@ struct UnkStruct8015F8D0 { extern struct UnkStruct8015F8D0 D_8015F8D0; -extern struct Controller (*D_800DC4BC)[]; +extern struct Controller *D_800DC4BC[]; extern s32 D_800DC510; extern s16 D_8015F6FE; @@ -93,6 +93,21 @@ extern struct UnkStruct800DC658 D_800DC658; extern s16 D_800DC5BC, D_800DC5C8; extern u16 D_80150110; + +s32 D_800DC5E0 = 32; + +s16 D_800DC5E4 = 0; + +// TODO: D_800DC5E8 accessed as word, D_800DC5EB as u8 +s32 D_800DC5E8 = 0; + +struct UnkStruct_800DC5EC D_8015F480[4]; +struct UnkStruct_800DC5EC *D_800DC5EC = &D_8015F480[0]; +struct UnkStruct_800DC5EC *D_800DC5F0 = &D_8015F480[1]; +struct UnkStruct_800DC5EC *D_800DC5F4 = &D_8015F480[2]; +struct UnkStruct_800DC5EC *D_800DC5F8 = &D_8015F480[3]; +s16 D_800DC5FC = 0; + void func_800029B0(void) { switch(D_800DC5A8) { case 0: diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index d40d745d2..e35d4627c 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -184,7 +184,7 @@ s32 func_800061DC(void *arg0, f32 arg1, s32 arg2) { } while (temp_a1 < temp_v0_2); } } else { - temp_a0 = D_800DDB40; + temp_a0 = camera1; phi_a0_2 = temp_a0; phi_a0_3 = temp_a0; if (phi_v0 > 0) { @@ -9387,13 +9387,13 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014D08.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_802ADDC8(void *, ?, f32, f32, f32); // extern extern ? D_80164668; -extern ? D_801646F0; +extern ? cameras; void func_80014D30(s32 arg0, s32 arg1) { void *temp_v0; temp_v0 = (&D_80164550)[arg1] + (*(&D_80164668 + (arg0 * 2)) * 8); - func_802ADDC8((arg0 * 0xB8) + 0x54 + &D_801646F0, 0x41200000, temp_v0->unk0, temp_v0->unk2 + 30.0f, temp_v0->unk4); + func_802ADDC8((arg0 * 0xB8) + 0x54 + &cameras, 0x41200000, temp_v0->unk0, temp_v0->unk2 + 30.0f, temp_v0->unk4); } #else GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014D30.s") @@ -9652,7 +9652,7 @@ void func_80015314(s32 arg0, ? arg1, s32 arg2) { void *temp_a0; temp_a1 = &D_800DC4DC[arg0]; - temp_a0 = D_800DDB40 + (arg2 * 0xB8); + temp_a0 = camera1 + (arg2 * 0xB8); temp_a0->unk2C = temp_a1->unk_02E; func_80015390(temp_a0, temp_a1, 0, arg0); } @@ -9729,7 +9729,7 @@ extern ? D_80164638; extern ? D_80164648; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; void func_80015544(s32 arg0, f32 arg1, s32 arg2, s16 arg3) { s32 sp2C; @@ -9780,7 +9780,7 @@ void func_80015544(s32 arg0, f32 arg1, s32 arg2, s16 arg3) { phi_v1 = temp_v1_2; } *(&D_80164648 + temp_t7) = 0.0f; - temp_v0 = (arg2 * 0xB8) + &D_801646F0; + temp_v0 = (arg2 * 0xB8) + &cameras; temp_v0->unk0 = *temp_a0; temp_v0->unk4 = *phi_v1; temp_v0->unk8 = *temp_a1; @@ -9910,7 +9910,7 @@ extern ? D_80164638; extern ? D_80164648; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; extern ? gPlayers; void func_80015A9C(s32 arg0, f32 arg1, s32 arg2, s16 arg3) { @@ -9952,7 +9952,7 @@ void func_80015A9C(s32 arg0, f32 arg1, s32 arg2, s16 arg3) { if (temp_f0 < 0.0) { *temp_t0 = 0.0f; } - temp_v0 = (arg2 * 0xB8) + &D_801646F0; + temp_v0 = (arg2 * 0xB8) + &cameras; temp_v0->unk0 = *temp_a0; temp_v0->unk4 = *temp_a1; temp_v0->unk8 = *temp_a2_2; @@ -10172,7 +10172,7 @@ extern ? D_80164648; extern ? D_80164658; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; extern ? gPlayers; void func_800162CC(s32 arg0, f32 arg1, s32 arg2, s16 arg3) { @@ -10209,7 +10209,7 @@ void func_800162CC(s32 arg0, f32 arg1, s32 arg2, s16 arg3) { *temp_a1 = D_80162FA0.unk8; temp_f2 = *(&gPlayers + 0x94 + (arg0 * 0xDD8)); *(&D_80164658 + temp_t8) = temp_f2; - temp_v0 = (arg2 * 0xB8) + &D_801646F0; + temp_v0 = (arg2 * 0xB8) + &cameras; *(&D_80164648 + temp_t8) = temp_f2; temp_v0->unk0 = temp_f0; temp_v0->unk4 = *temp_a0; @@ -10246,7 +10246,7 @@ extern ? D_80164648; extern ? D_80164658; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; void func_80016C3C(s32 arg0, ? arg1, s32 arg2) { f32 sp5C; @@ -10324,7 +10324,7 @@ void func_80016C3C(s32 arg0, ? arg1, s32 arg2) { func_8000BBD8((bitwise s32) temp_f12, sp44, *phi_s2, 0); temp_v1_3 = *temp_s1; temp_t7 = D_80164550; - temp_v0_2 = (arg2 * 0xB8) + &D_801646F0; + temp_v0_2 = (arg2 * 0xB8) + &cameras; temp_v0_2->unkC = temp_f2 + (D_80162FA0.unk0 * 0.5); temp_v0_2->unk14 = temp_f12 + (D_80162FA0.unk8 * 0.5); temp_v0_2->unk10 = (((temp_t7 + (((temp_v1_3 + 6) % temp_s0) * 8))->unk2 + (temp_t7 + (((temp_v1_3 + 5) % temp_s0) * 8))->unk2) * 0.5f) + 8.0; @@ -10531,7 +10531,7 @@ extern ? D_80164648; extern ? D_80164658; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; extern ? gPlayers; void func_80017720(s32 arg0, ? arg1, s32 arg2, s16 arg3) { @@ -10570,7 +10570,7 @@ void func_80017720(s32 arg0, ? arg1, s32 arg2, s16 arg3) { *temp_a1 = D_80162FA0.unk8; temp_f2 = *(&gPlayers + 0x94 + (arg0 * 0xDD8)); *(&D_80164658 + temp_t8) = temp_f2; - temp_v0 = (arg2 * 0xB8) + &D_801646F0; + temp_v0 = (arg2 * 0xB8) + &cameras; *(&D_80164648 + temp_t8) = temp_f2; temp_v0->unk0 = temp_f0_2; temp_v0->unk4 = *temp_a0; @@ -10605,7 +10605,7 @@ extern ? D_80164648; extern ? D_80164658; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; extern ? gPlayers; void func_80017F10(s32 arg0, ? arg1, s32 arg2, s16 arg3) { @@ -10646,7 +10646,7 @@ void func_80017F10(s32 arg0, ? arg1, s32 arg2, s16 arg3) { *temp_a1 = D_80162FA0.unk8; temp_f2 = *(&gPlayers + 0x94 + (arg0 * 0xDD8)); *(&D_80164658 + temp_t9) = temp_f2; - temp_v0_2 = (arg2 * 0xB8) + &D_801646F0; + temp_v0_2 = (arg2 * 0xB8) + &cameras; *(&D_80164648 + temp_t9) = temp_f2; temp_v0_2->unk0 = temp_f0_2; temp_v0_2->unk4 = *temp_a0; @@ -10682,7 +10682,7 @@ extern ? D_80164648; extern ? D_80164658; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; extern ? gPlayers; void func_80018718(s32 arg0, ? arg1, s32 arg2, s16 arg3) { @@ -10722,7 +10722,7 @@ void func_80018718(s32 arg0, ? arg1, s32 arg2, s16 arg3) { *(&D_80164658 + temp_t9) = temp_f2; *(&D_80164648 + temp_t9) = temp_f2; D_8016448C = 1; - temp_v0_2 = (arg2 * 0xB8) + &D_801646F0; + temp_v0_2 = (arg2 * 0xB8) + &cameras; temp_v0_2->unk0 = temp_f0_2; temp_v0_2->unk4 = *temp_a0; temp_v0_2->unk8 = *temp_a1; @@ -11013,7 +11013,7 @@ extern ? D_80164638; extern ? D_80164648; extern ? D_80164668; extern ? D_80164688; -extern ? D_801646F0; +extern ? cameras; void func_80019118(s32 arg0, f32 arg1, s32 arg2, ? arg3) { s32 sp2C; @@ -11065,7 +11065,7 @@ void func_80019118(s32 arg0, f32 arg1, s32 arg2, ? arg3) { phi_v1 = temp_v1; } *(&D_80164648 + temp_t6) = 0.0f; - temp_v0_2 = (arg2 * 0xB8) + &D_801646F0; + temp_v0_2 = (arg2 * 0xB8) + &cameras; temp_v0_2->unk0 = *temp_a0; temp_v0_2->unk4 = *phi_v1; temp_v0_2->unk8 = *temp_a1; @@ -11439,7 +11439,7 @@ void func_80019DF4(void) { D_80164670 = D_8016467C; D_80164670 = D_8016467A; D_80164670 = D_80164678; - D_800DDB40->unkAE = D_80164360; + camera1->unkAE = D_80164360; D_80164678 = 1; D_801646CC = 2; } @@ -11502,7 +11502,7 @@ void func_80019ED0(void) { } while (temp_s0 < &D_80164680); temp_v0_2 = D_800DC5E8; D_80164360 = temp_v0_2; - D_800DDB40->unkAE = temp_v0_2; + camera1->unkAE = temp_v0_2; phi_s2 = &D_80164680; phi_s1 = 0; phi_s0_2 = &D_80164678; diff --git a/src/code_8001C4D0.c b/src/code_8001C4D0.c index f312350f5..e8eb98572 100644 --- a/src/code_8001C4D0.c +++ b/src/code_8001C4D0.c @@ -1,5 +1,25 @@ #include #include +#include + +//f32 D_801646C0; +//f32 D_801646C4; +//f32 D_801646C8; +//f32 D_801646CC; +//s8 D_801646D0[2]; + +Camera cameras[4]; +Camera *camera1 = &cameras[0]; +Camera *camera2 = &cameras[1]; +Camera *camera3 = &cameras[2]; +Camera *camera4 = &cameras[3]; +//s32 test; + + +extern Player *D_800DC4E0; +extern Player *D_800DC4E4; +extern Player *D_800DC4E8; + #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -15,49 +35,31 @@ the instruction, which has a name starting with "jtbl"/"jpt_". GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001C4D0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8001CA10(void *arg0) { - arg0->unk9C = 0; - arg0->unk94 = 6.0f; +void func_8001CA10(Camera *camera) { + camera->unk24_and_a_half = 0; + camera->unk22 = 6.0f; } -#else -GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001CA10.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_801646F0; -extern ? D_801647A8; +void func_8001CA24(Player *arg0, f32 arg1) { + Camera *camera = &cameras[0]; -void func_8001CA24(s32 arg0, f32 arg1) { - ? *phi_v0; - ? *phi_v0_2; - ? *phi_v0_3; - - phi_v0_3 = &D_801646F0; if (arg0 == D_800DC4E0) { - phi_v0_3 = &D_801647A8; + camera += 1; } - phi_v0_2 = phi_v0_3; if (arg0 == D_800DC4E4) { - phi_v0_2 = phi_v0_3 + 0x170; + camera += 2; } - phi_v0 = phi_v0_2; if (arg0 == D_800DC4E8) { - phi_v0 = phi_v0_2 + 0x228; + camera += 3; } - phi_v0->unk9C = 0; - phi_v0->unk94 = arg1; + camera->unk24_and_a_half = 0; + camera->unk22 = arg1; } -#else -GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001CA24.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800225CC(f32 *, ?, ?); // extern -? func_802B63B8(f32 *, f32 *); // extern +//? func_800225CC(f32 *, ?, ?); // extern +//? func_802B63B8(f32 *, f32 *); // extern extern u16 D_801645C8; extern f32 D_80164A30; @@ -102,7 +104,7 @@ void func_8001CA78(s32 arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32 * arg2->unk4 = arg2->unk4 + (((sp60 + (temp_s2->unk2 + D_80164A30)) - arg1->unk10) * 1.0f); arg2->unk8 = arg2->unk8 + (((sp64 + (bitwise f32) D_8016524C) - arg1->unk14) * 1.0f); func_802B63B8(&sp68, &sp74); - if (gCurrentCourseId == 0xA) { + if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) { phi_f14_2 = sp68; } else { phi_f14_2 = sp68 + temp_s2->unk0; @@ -1067,18 +1069,18 @@ void func_8001EE98(void *arg0, s32 arg1, s8 arg2) { s32 phi_s0; s8 phi_v1; - if (arg1 == D_800DDB40) { + if (arg1 == camera1) { sp34 = 0; } phi_s0 = sp34; - if (arg1 == D_800DDB44) { + if (arg1 == camera2) { phi_s0 = 1; } - if (arg1 == D_800DDB48) { + if (arg1 == camera3) { phi_s0 = 2; } phi_v1 = 1; - if (arg1 == D_800DDB4C) { + if (arg1 == camera4) { phi_s0 = 3; } temp_v0 = gModeSelection; @@ -1205,7 +1207,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001F394.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern ? D_80152300; -extern ? D_801646F0; +extern ? cameras; extern s32 D_80164A2C; void func_8001F87C(s32 arg0) { @@ -1228,7 +1230,7 @@ loop_3: if ((phi_a1 == 0x60E8) && (D_80164A2C == 0x3C)) { D_80164A28 = 2; *(&D_80152300 + (arg0 * 2)) = 1; - temp_v0_2 = &D_801646F0 + (arg0 * 0xB8); + temp_v0_2 = &cameras + (arg0 * 0xB8); temp_v0_2->unk26 = phi_a2->unk_02E; temp_v0_2->unk2C = phi_a2->unk_02E; } diff --git a/src/code_8001F980.c b/src/code_8001F980.c index bfddd5663..e7ec3a14d 100644 --- a/src/code_8001F980.c +++ b/src/code_8001F980.c @@ -338,8 +338,8 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80020000.s") ? func_80027560(s32, s8, s8, s8, s32); // extern ? func_8006E5AC(Player *, ?, ?); // extern extern s32 D_800DDB58; -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; +extern OSMesgQueue gDmaMesgQueue; +extern void *gMainReceivedMesg; extern ? D_80164AAE; extern s16 D_80164AB0; extern ? D_80164ABE; @@ -377,7 +377,7 @@ void func_80020524(void) { func_8006E5AC(D_800DC4F4, 6, 0); func_8006E5AC(D_800DC4F8, 7, 0); } - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; if (D_800DDB58 >= 2) { do { @@ -391,7 +391,7 @@ void func_80020524(void) { temp_v1_3 = temp_s1->unk-2; temp_a2 = *(&D_801651D0[temp_v0_3] + (temp_v1_3 * 2)); mio0decode(D_802DFB80 + (temp_a2 * 0x9200) + (temp_v0_3 * 0x4900) + (temp_v1_3 * 0x920), &D_802BFB80[(temp_a2 << 0x10) + (temp_v0_3 << 0xF) + (temp_v1_3 << 0xC)]); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); temp_s0 = phi_s0 + 1; phi_s0 = temp_s0; } while (temp_s0 < D_800DDB58); @@ -411,8 +411,8 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80020524.s") ? func_80027560(s32, s8, s8, s8, s32); // extern ? func_8006E634(Player *, ?, ?); // extern extern s32 D_800DDB58; -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; +extern OSMesgQueue gDmaMesgQueue; +extern void *gMainReceivedMesg; extern ? D_80164AAE; extern s16 D_80164AB0; extern ? D_80164ABE; @@ -450,7 +450,7 @@ void func_8002088C(void) { func_8006E634(D_800DC4F4, 6, 1); func_8006E634(D_800DC4F8, 7, 1); } - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; if (D_800DDB58 >= 2) { do { @@ -464,7 +464,7 @@ void func_8002088C(void) { temp_v1_3 = temp_s1->unk-2; temp_a2 = *(&D_801651D0[temp_v0_3] + (temp_v1_3 * 2)); mio0decode(D_802DFB80 + (temp_a2 * 0x9200) + (temp_v0_3 * 0x4900) + (temp_v1_3 * 0x920), &D_802BFB80[(temp_a2 << 0x10) + (temp_v0_3 << 0xF) + (temp_v1_3 << 0xC)]); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); temp_s0 = phi_s0 + 1; phi_s0 = temp_s0; } while (temp_s0 < D_800DDB58); @@ -484,8 +484,8 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_8002088C.s") ? func_80027560(s32, s8, s8, s8, s32); // extern ? func_8006E6BC(Player *, ?, ?); // extern extern s32 D_800DDB58; -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; +extern OSMesgQueue gDmaMesgQueue; +extern void *gMainReceivedMesg; extern ? D_80164AAE; extern s16 D_80164AB0; extern ? D_80164ABE; @@ -517,7 +517,7 @@ void func_80020BF4(void) { func_8006E6BC(D_800DC4E0, 1, 2); func_8006E6BC(D_800DC4E4, 2, 2); func_8006E6BC(D_800DC4E8, 3, 2); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; if (D_800DDB58 >= 2) { do { @@ -531,7 +531,7 @@ void func_80020BF4(void) { temp_v1_3 = temp_s1->unk-2; temp_a2 = *(&D_801651D0[temp_v0_3] + (temp_v1_3 * 2)); mio0decode((D_802DFB80 + (temp_a2 * 0x9200) + (temp_v0_3 * 0x4900) + (temp_v1_3 * 0x920)) - 0x6D80, &D_802BFB80[(temp_a2 << 0x10) + (temp_v0_3 << 0xF) + (temp_v1_3 << 0xC) + 0xFFFF4000]); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); temp_s0 = phi_s0 + 1; phi_s0 = temp_s0; } while (temp_s0 < D_800DDB58); @@ -551,8 +551,8 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80020BF4.s") ? func_80027560(s32, s8, s8, s8, s32); // extern ? func_8006E744(Player *, ?, ?); // extern extern s32 D_800DDB58; -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; +extern OSMesgQueue gDmaMesgQueue; +extern void *gMainReceivedMesg; extern ? D_80164AAE; extern s16 D_80164AB0; extern ? D_80164ABE; @@ -584,7 +584,7 @@ void func_80020F1C(void) { func_8006E744(D_800DC4E0, 1, 3); func_8006E744(D_800DC4E4, 2, 3); func_8006E744(D_800DC4E8, 3, 3); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; if (D_800DDB58 >= 2) { do { @@ -598,7 +598,7 @@ void func_80020F1C(void) { temp_v1_3 = temp_s1->unk-2; temp_a2 = *(&D_801651D0[temp_v0_3] + (temp_v1_3 * 2)); mio0decode((D_802DFB80 + (temp_a2 * 0x9200) + (temp_v0_3 * 0x4900) + (temp_v1_3 * 0x920)) - 0x6D80, &D_802BFB80[(temp_a2 << 0x10) + (temp_v0_3 << 0xF) + (temp_v1_3 << 0xC) + 0xFFFF4000]); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); temp_s0 = phi_s0 + 1; phi_s0 = temp_s0; } while (temp_s0 < D_800DDB58); @@ -662,15 +662,15 @@ void func_800212B4(void) { sp1C.unk18 = D_800DDB88.unk18; sp1C.unk1C = D_800DDB88.unk1C; D_800DDB58 = 0; - func_80020000(D_800DC4FC, D_800DDB40, 0, 0); - func_80020000(D_800DC4E0, D_800DDB40, 1, 0); - func_80020000(D_800DC4E4, D_800DDB40, 2, 0); - func_80020000(D_800DC4E8, D_800DDB40, 3, 0); + func_80020000(D_800DC4FC, camera1, 0, 0); + func_80020000(D_800DC4E0, camera1, 1, 0); + func_80020000(D_800DC4E4, camera1, 2, 0); + func_80020000(D_800DC4E8, camera1, 3, 0); if (D_800DC52C != 3) { - func_80020000(D_800DC4EC, D_800DDB40, 4, 0); - func_80020000(D_800DC4F0, D_800DDB40, 5, 0); - func_80020000(D_800DC4F4, D_800DDB40, 6, 0); - func_80020000(D_800DC4F8, D_800DDB40, 7, 0); + func_80020000(D_800DC4EC, camera1, 4, 0); + func_80020000(D_800DC4F0, camera1, 5, 0); + func_80020000(D_800DC4F4, camera1, 6, 0); + func_80020000(D_800DC4F8, camera1, 7, 0); } func_80021244(D_800DC4DC, 0, 0); func_80021244(D_800DC4E0, 1, 0); @@ -712,15 +712,15 @@ extern s32 D_800DDB58; void func_800215DC(void) { D_800DDB58 = 0; - func_80020000(D_800DC4FC, D_800DDB44, 0, 1); - func_80020000(D_800DC4E0, D_800DDB44, 1, 1); - func_80020000(D_800DC4E4, D_800DDB44, 2, 1); - func_80020000(D_800DC4E8, D_800DDB44, 3, 1); + func_80020000(D_800DC4FC, camera2, 0, 1); + func_80020000(D_800DC4E0, camera2, 1, 1); + func_80020000(D_800DC4E4, camera2, 2, 1); + func_80020000(D_800DC4E8, camera2, 3, 1); if (D_800DC52C != 3) { - func_80020000(D_800DC4EC, D_800DDB44, 4, 1); - func_80020000(D_800DC4F0, D_800DDB44, 5, 1); - func_80020000(D_800DC4F4, D_800DDB44, 6, 1); - func_80020000(D_800DC4F8, D_800DDB44, 7, 1); + func_80020000(D_800DC4EC, camera2, 4, 1); + func_80020000(D_800DC4F0, camera2, 5, 1); + func_80020000(D_800DC4F4, camera2, 6, 1); + func_80020000(D_800DC4F8, camera2, 7, 1); } func_80021244(D_800DC4DC, 0, 1); func_80021244(D_800DC4E0, 1, 1); @@ -762,10 +762,10 @@ extern s32 D_800DDB58; void func_8002186C(void) { D_800DDB58 = 0; - func_80020000(D_800DC4FC, D_800DDB48, 0, 2); - func_80020000(D_800DC4E0, D_800DDB48, 1, 2); - func_80020000(D_800DC4E4, D_800DDB48, 2, 2); - func_80020000(D_800DC4E8, D_800DDB48, 3, 2); + func_80020000(D_800DC4FC, camera3, 0, 2); + func_80020000(D_800DC4E0, camera3, 1, 2); + func_80020000(D_800DC4E4, camera3, 2, 2); + func_80020000(D_800DC4E8, camera3, 3, 2); func_80021244(D_800DC4DC, 0, 2); func_80021244(D_800DC4E0, 1, 2); func_80021244(D_800DC4E4, 2, 2); @@ -794,10 +794,10 @@ extern s32 D_800DDB58; void func_800219BC(void) { D_800DDB58 = 0; - func_80020000(D_800DC4FC, D_800DDB4C, 0, 3); - func_80020000(D_800DC4E0, D_800DDB4C, 1, 3); - func_80020000(D_800DC4E4, D_800DDB4C, 2, 3); - func_80020000(D_800DC4E8, D_800DDB4C, 3, 3); + func_80020000(D_800DC4FC, camera4, 0, 3); + func_80020000(D_800DC4E0, camera4, 1, 3); + func_80020000(D_800DC4E4, camera4, 2, 3); + func_80020000(D_800DC4E8, camera4, 3, 3); func_80021244(D_800DC4DC, 0, 3); func_80021244(D_800DC4E0, 1, 3); func_80021244(D_800DC4E4, 2, 3); @@ -3187,7 +3187,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800262E0.s") ? func_80025DE8(Player *, s8, s8, s8); // extern ? func_800262E0(Player *, s8, s8, s8); // extern ? func_80026B4C(s8, s8, s8); // extern -extern OSMesgQueue D_8014EF58; +extern OSMesgQueue gDmaMesgQueue; extern ? D_801651D1; void func_800267AC(Player *player, s8 arg1, s8 arg2) { @@ -3225,7 +3225,7 @@ void func_800267AC(Player *player, s8 arg1, s8 arg2) { } else { func_800256F4(player, arg1, arg2, sp2F); } - osRecvMesg(&D_8014EF58, &sp34, 1); + osRecvMesg(&gDmaMesgQueue, &sp34, 1); if ((sp28 == (player->unk_002 & sp28)) && (player->unk_0F8 == 9) && ((player->unk_0CA & 1) != 1) && (player->unk_124 <= 30.0f)) { func_800262E0(player, arg1, arg2, sp2F); } diff --git a/src/code_80027040.c b/src/code_80027040.c index b54de6c33..fea840d2b 100644 --- a/src/code_80027040.c +++ b/src/code_80027040.c @@ -2,9 +2,9 @@ #include #include "common_structs.h" -extern OSIoMesg D_8014F0A0; -extern OSMesgQueue D_8014EF58; -extern OSMesg D_8014F098; +extern OSIoMesg gDmaIoMesg; +extern OSMesgQueue gDmaMesgQueue; +extern OSMesg gMainReceivedMesg; extern u8 _kart_texturesSegmentRomStart[]; extern u32 gKartPalettes[]; @@ -37,13 +37,13 @@ void func_80027040(Player *player, s8 arg1, s8 arg2, s8 arg3, s32 arg4) { if (player->unk_244[arg2] == 0) { temp_s0 = (arg4 * 0x9200) + (arg3 * 0x4900) + (arg1 * 0x920) + D_802DFB80; osInvalDCache(temp_s0, D_800DDEB0[player->unk_254]); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureTable0[player->unk_254][player->unk_24C[arg2]][player->unk_244[arg2]] & 0xFFFFFF], temp_s0, D_800DDEB0[temp_v0], &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureTable0[player->unk_254][player->unk_24C[arg2]][player->unk_244[arg2]] & 0xFFFFFF], temp_s0, D_800DDEB0[temp_v0], &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); } else { temp_s0 = (arg4 * 0x9200) + (arg3 * 0x4900) + (arg1 * 0x920) + D_802DFB80; osInvalDCache(temp_s0, D_800DDEB0[player->unk_254]); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureTable1[player->unk_254][player->unk_24C[arg2]][player->unk_244[arg2]] & 0xFFFFFF], temp_s0, D_800DDEB0[temp_v0], &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureTable1[player->unk_254][player->unk_24C[arg2]][player->unk_244[arg2]] & 0xFFFFFF], temp_s0, D_800DDEB0[temp_v0], &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); } } else if ((temp_v0 & 0x400) == 0x400 || @@ -53,13 +53,13 @@ void func_80027040(Player *player, s8 arg1, s8 arg2, s8 arg3, s32 arg4) { ) { temp_s0 = (arg4 * 0x9200) + (arg3 * 0x4900) + (arg1 * 0x920) + D_802DFB80; osInvalDCache(temp_s0, 0x780); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureGroup18s[player->unk_254][player->unk_0A8 >> 8] & 0xFFFFFF], temp_s0, 0x900, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureGroup18s[player->unk_254][player->unk_0A8 >> 8] & 0xFFFFFF], temp_s0, 0x900, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); } else { temp_s0 = (arg4 * 0x9200) + (arg3 * 0x4900) + (arg1 * 0x920) + D_802DFB80; osInvalDCache(temp_s0, D_800DDEB0[player->unk_254]); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureTable0[player->unk_254][player->unk_24C[arg2]][player->unk_244[arg2]] & 0xFFFFFF], temp_s0, D_800DDEB0[temp_v0], &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartTextureTable0[player->unk_254][player->unk_24C[arg2]][player->unk_244[arg2]] & 0xFFFFFF], temp_s0, D_800DDEB0[temp_v0], &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); } } #else @@ -92,14 +92,14 @@ block_6: sp30 = temp_v1_2; osInvalDCache(temp_s0_4, *(&D_800DDEB0 + (arg0->unk254 * 2))); temp_v0 = arg0->unk254; - osPiStartDma(&D_8014F0A0, 0, 0, (*(*(*(&gKartTextureTable0 + (temp_v0 * 4)) + (temp_v1_2->unk24C * 4)) + (temp_v1_2->unk244 * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0_4, *(&D_800DDEB0 + (temp_v0 * 2)), &D_8014EF58); + osPiStartDma(&gDmaIoMesg, 0, 0, (*(*(*(&gKartTextureTable0 + (temp_v0 * 4)) + (temp_v1_2->unk24C * 4)) + (temp_v1_2->unk244 * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0_4, *(&D_800DDEB0 + (temp_v0 * 2)), &gDmaMesgQueue); return; } temp_s0_3 = (arg4 * 0x9200) + (temp_a3 * 0x4900) + (arg1 * 0x920) + D_802DFB80; sp30 = temp_v1_2; osInvalDCache(temp_s0_3, *(&D_800DDEB0 + (arg0->unk254 * 2))); temp_v0 = arg0->unk254; - osPiStartDma(&D_8014F0A0, 0, 0, (*(*(*(&gKartTextureTable1 + (temp_v0 * 4)) + (temp_v1_2->unk24C * 4)) + (temp_v1_2->unk244 * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0_3, *(&D_800DDEB0 + (temp_v0 * 2)), &D_8014EF58); + osPiStartDma(&gDmaIoMesg, 0, 0, (*(*(*(&gKartTextureTable1 + (temp_v0 * 4)) + (temp_v1_2->unk24C * 4)) + (temp_v1_2->unk244 * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0_3, *(&D_800DDEB0 + (temp_v0 * 2)), &gDmaMesgQueue); return; } if ((temp_v0 & 0x40) == 0x40) { @@ -121,7 +121,7 @@ block_6: block_13: temp_s0_2 = (arg4 * 0x9200) + (temp_a3 * 0x4900) + (arg1 * 0x920) + D_802DFB80; osInvalDCache(temp_s0_2, 0x780); - osPiStartDma(&D_8014F0A0, 0, 0, (*(*(&gKartTextureGroup18s + (arg0->unk254 * 4)) + ((arg0->unkA8 >> 8) * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0_2, 0x900, &D_8014EF58); + osPiStartDma(&gDmaIoMesg, 0, 0, (*(*(&gKartTextureGroup18s + (arg0->unk254 * 4)) + ((arg0->unkA8 >> 8) * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0_2, 0x900, &gDmaMesgQueue); return; } if ((temp_v0 & 0x1000000) == 0x1000000) { @@ -137,7 +137,7 @@ block_13: osInvalDCache(temp_s0, *(&D_800DDEB0 + (arg0->unk254 * 2))); temp_v0 = arg0->unk254; temp_v1 = arg0 + (arg2 * 2); - osPiStartDma(&D_8014F0A0, 0, 0, (*(*(*(&gKartTextureTable0 + (temp_v0 * 4)) + (temp_v1->unk24C * 4)) + (temp_v1->unk244 * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0, *(&D_800DDEB0 + (temp_v0 * 2)), &D_8014EF58); + osPiStartDma(&gDmaIoMesg, 0, 0, (*(*(*(&gKartTextureTable0 + (temp_v0 * 4)) + (temp_v1->unk24C * 4)) + (temp_v1->unk244 * 4)) & 0xFFFFFF) + &_kart_texturesSegmentRomStart, temp_s0, *(&D_800DDEB0 + (temp_v0 * 2)), &gDmaMesgQueue); } #else GLOBAL_ASM("asm/non_matchings/code_80027040/func_80027560.s") @@ -151,13 +151,13 @@ void func_80027A20(Player *player, s8 arg1, s8 arg2, s8 arg3) { switch(D_800DC52C) { case 0: case 1: case 2: osInvalDCache(temp_s0, 0x200); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[gKartPalettes[player->unk_254] & 0x00FFFFFF], temp_s0, 0x200, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartPalettes[player->unk_254] & 0x00FFFFFF], temp_s0, 0x200, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); break; case 3: osInvalDCache(temp_s0, 0x200); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[gKartPalettes[player->unk_254] & 0x00FFFFFF], temp_s0, 0x200, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[gKartPalettes[player->unk_254] & 0x00FFFFFF], temp_s0, 0x200, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); break; default: break; } @@ -168,11 +168,11 @@ GLOBAL_ASM("asm/non_matchings/code_80027040/func_80027A20.s") void func_80027BDC(s32 arg0, s32 arg1, void *vAddr, u16 size) { osInvalDCache(vAddr, size); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[arg1 & 0x00FFFFFF], vAddr, size, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[arg1 & 0x00FFFFFF], vAddr, size, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); } void func_80027C74(s32 arg0, s32 arg1, void *vAddr, u16 size) { osInvalDCache(vAddr, size); - osPiStartDma(&D_8014F0A0, 0, 0, &_kart_texturesSegmentRomStart[arg1 & 0x00FFFFFF], vAddr, size, &D_8014EF58); + osPiStartDma(&gDmaIoMesg, 0, 0, &_kart_texturesSegmentRomStart[arg1 & 0x00FFFFFF], vAddr, size, &gDmaMesgQueue); } diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 46580ae35..b5d5b90dd 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -12,7 +12,7 @@ extern Player *D_800DC4F4; extern Player *D_800DC4F8; extern Player *D_800DC4FC; -extern Camera *D_800DDB40; +extern Camera *camera1; s32 func_80027D00(Player *arg0) { s32 phi_v1; @@ -145,7 +145,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) { if (temp_v0_2 != 3) { } else { - temp_v0_3 = func_8001FB0C(D_800DDB40, D_8016557C, 0.0f); + temp_v0_3 = func_8001FB0C(camera1, D_8016557C, 0.0f); temp_a0 = arg0; sp1E = temp_v0_3; phi_a0 = temp_a0; @@ -153,7 +153,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) { } else { arg0 = temp_a0; - temp_v0_4 = func_8001FB0C(temp_a0, (bitwise f32) D_800DDB44, D_8016557C, 0); + temp_v0_4 = func_8001FB0C(temp_a0, (bitwise f32) camera2, D_8016557C, 0); temp_a0_2 = arg0; sp1E = temp_v0_4; phi_a0 = temp_a0_2; @@ -161,7 +161,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) { } else { arg0 = temp_a0_2; - temp_v0_5 = func_8001FB0C(temp_a0_2, (bitwise f32) D_800DDB48, D_8016557C, 0); + temp_v0_5 = func_8001FB0C(temp_a0_2, (bitwise f32) camera3, D_8016557C, 0); temp_a0_3 = arg0; sp1E = temp_v0_5; phi_a0 = temp_a0_3; @@ -169,7 +169,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) { } else { arg0 = temp_a0_3; - sp1E = func_8001FB0C(temp_a0_3, (bitwise f32) D_800DDB4C, D_8016557C, 0); + sp1E = func_8001FB0C(temp_a0_3, (bitwise f32) camera4, D_8016557C, 0); phi_a0 = arg0; } } @@ -177,7 +177,7 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) { goto block_17; } } else { - temp_v0_6 = func_8001FB0C(D_800DDB40, D_8016557C, 0.0f); + temp_v0_6 = func_8001FB0C(camera1, D_8016557C, 0.0f); temp_a0_4 = arg0; sp1E = temp_v0_6; phi_a0 = temp_a0_4; @@ -185,13 +185,13 @@ void func_80028864(Player *arg0, s32 arg1, s8 arg2, s8 arg3) { } else { arg0 = temp_a0_4; - sp1E = func_8001FB0C(temp_a0_4, (bitwise f32) D_800DDB44, D_8016557C, 0); + sp1E = func_8001FB0C(temp_a0_4, (bitwise f32) camera2, D_8016557C, 0); phi_a0 = arg0; } goto block_17; } } else { - sp1E = func_8001FB0C(D_800DDB40, D_8016557C, 0.0f); + sp1E = func_8001FB0C(camera1, D_8016557C, 0.0f); phi_a0 = arg0; block_17: } @@ -319,26 +319,26 @@ extern s16 D_80164AF0; void func_80028F70(void) { D_80164AF0 = 0; - func_80028E70(D_800DC4FC, D_800DDB40, 0, 0); - func_80028E70(D_800DC4E0, D_800DDB40, 1, 0); - func_80028E70(D_800DC4E4, D_800DDB40, 2, 0); - func_80028E70(D_800DC4E8, D_800DDB40, 3, 0); - func_80028E70(D_800DC4EC, D_800DDB40, 4, 0); - func_80028E70(D_800DC4F0, D_800DDB40, 5, 0); - func_80028E70(D_800DC4F4, D_800DDB40, 6, 0); - func_80028E70(D_800DC4F8, D_800DDB40, 7, 0); + func_80028E70(D_800DC4FC, camera1, 0, 0); + func_80028E70(D_800DC4E0, camera1, 1, 0); + func_80028E70(D_800DC4E4, camera1, 2, 0); + func_80028E70(D_800DC4E8, camera1, 3, 0); + func_80028E70(D_800DC4EC, camera1, 4, 0); + func_80028E70(D_800DC4F0, camera1, 5, 0); + func_80028E70(D_800DC4F4, camera1, 6, 0); + func_80028E70(D_800DC4F8, camera1, 7, 0); } void func_80029060(void) { D_80164AF0 = 0; - func_80028E70(D_800DC4FC, D_800DDB40, 0, 0); - func_80028E70(D_800DC4E0, D_800DDB40, 1, 0); - func_80028E70(D_800DC4E4, D_800DDB40, 2, 0); - func_80028E70(D_800DC4E8, D_800DDB40, 3, 0); - func_80028E70(D_800DC4EC, D_800DDB40, 4, 0); - func_80028E70(D_800DC4F0, D_800DDB40, 5, 0); - func_80028E70(D_800DC4F4, D_800DDB40, 6, 0); - func_80028E70(D_800DC4F8, D_800DDB40, 7, 0); + func_80028E70(D_800DC4FC, camera1, 0, 0); + func_80028E70(D_800DC4E0, camera1, 1, 0); + func_80028E70(D_800DC4E4, camera1, 2, 0); + func_80028E70(D_800DC4E8, camera1, 3, 0); + func_80028E70(D_800DC4EC, camera1, 4, 0); + func_80028E70(D_800DC4F0, camera1, 5, 0); + func_80028E70(D_800DC4F4, camera1, 6, 0); + func_80028E70(D_800DC4F8, camera1, 7, 0); } void func_80029150(void) { @@ -347,10 +347,10 @@ void func_80029150(void) { void func_80029158(void) { D_80164AF0 = 0; - func_80028E70(D_800DC4FC, D_800DDB40, 0, 0); - func_80028E70(D_800DC4E0, D_800DDB40, 1, 0); - func_80028E70(D_800DC4E4, D_800DDB40, 2, 0); - func_80028E70(D_800DC4E8, D_800DDB40, 3, 0); + func_80028E70(D_800DC4FC, camera1, 0, 0); + func_80028E70(D_800DC4E0, camera1, 1, 0); + func_80028E70(D_800DC4E4, camera1, 2, 0); + func_80028E70(D_800DC4E8, camera1, 3, 0); } void func_800291E8(void) { diff --git a/src/code_800393C0.c b/src/code_800393C0.c index 064724830..2bef19567 100644 --- a/src/code_800393C0.c +++ b/src/code_800393C0.c @@ -9,6 +9,11 @@ extern struct_D_800E261C D_800E24B4; extern struct_D_800E261C D_800E2568; extern s16 D_80165340; +extern Camera *camera1; +extern Camera *camera2; +extern Camera *camera3; +extern Camera *camera4; + //GLOBAL_ASM("asm/non_matchings/code_800393C0/spawn_player.s") void spawn_player(Player *player, s8 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, u16 arg6, s16 arg7) { @@ -1168,53 +1173,53 @@ void func_8003D080(void) { switch (D_800DC52C) { case 0: - func_8003CD98(D_800DC4E0, D_800DDB40, 0, 0); - func_8003CD98(D_800DC4E0, D_800DDB40, 1, 0); - func_8003CD98(D_800DC4E4, D_800DDB40, 2, 0); - func_8003CD98(D_800DC4E8, D_800DDB40, 3, 0); - func_8003CD98(D_800DC4EC, D_800DDB40, 4, 0); - func_8003CD98(D_800DC4F0, D_800DDB40, 5, 0); - func_8003CD98(D_800DC4F4, D_800DDB40, 6, 0); - func_8003CD98(D_800DC4F8, D_800DDB40, 7, 0); + func_8003CD98(D_800DC4E0, camera1, 0, 0); + func_8003CD98(D_800DC4E0, camera1, 1, 0); + func_8003CD98(D_800DC4E4, camera1, 2, 0); + func_8003CD98(D_800DC4E8, camera1, 3, 0); + func_8003CD98(D_800DC4EC, camera1, 4, 0); + func_8003CD98(D_800DC4F0, camera1, 5, 0); + func_8003CD98(D_800DC4F4, camera1, 6, 0); + func_8003CD98(D_800DC4F8, camera1, 7, 0); break; case 1: case 2: - func_8003CD98(D_800DC4FC, D_800DDB40, 0, 0); - func_8003CD98(D_800DC4E0, D_800DDB40, 1, 0); - func_8003CD98(D_800DC4E4, D_800DDB40, 2, 0); - func_8003CD98(D_800DC4E8, D_800DDB40, 3, 0); - func_8003CD98(D_800DC4EC, D_800DDB40, 4, 0); - func_8003CD98(D_800DC4F0, D_800DDB40, 5, 0); - func_8003CD98(D_800DC4F4, D_800DDB40, 6, 0); - func_8003CD98(D_800DC4F8, D_800DDB40, 7, 0); - func_8003CD98(D_800DC4FC, D_800DDB44, 0, 1); - func_8003CD98(D_800DC4E0, D_800DDB44, 1, 1); - func_8003CD98(D_800DC4E4, D_800DDB44, 2, 1); - func_8003CD98(D_800DC4E8, D_800DDB44, 3, 1); - func_8003CD98(D_800DC4EC, D_800DDB44, 4, 1); - func_8003CD98(D_800DC4F0, D_800DDB44, 5, 1); - func_8003CD98(D_800DC4F4, D_800DDB44, 6, 1); - func_8003CD98(D_800DC4F8, D_800DDB44, 7, 1); + func_8003CD98(D_800DC4FC, camera1, 0, 0); + func_8003CD98(D_800DC4E0, camera1, 1, 0); + func_8003CD98(D_800DC4E4, camera1, 2, 0); + func_8003CD98(D_800DC4E8, camera1, 3, 0); + func_8003CD98(D_800DC4EC, camera1, 4, 0); + func_8003CD98(D_800DC4F0, camera1, 5, 0); + func_8003CD98(D_800DC4F4, camera1, 6, 0); + func_8003CD98(D_800DC4F8, camera1, 7, 0); + func_8003CD98(D_800DC4FC, camera2, 0, 1); + func_8003CD98(D_800DC4E0, camera2, 1, 1); + func_8003CD98(D_800DC4E4, camera2, 2, 1); + func_8003CD98(D_800DC4E8, camera2, 3, 1); + func_8003CD98(D_800DC4EC, camera2, 4, 1); + func_8003CD98(D_800DC4F0, camera2, 5, 1); + func_8003CD98(D_800DC4F4, camera2, 6, 1); + func_8003CD98(D_800DC4F8, camera2, 7, 1); break; case 3: - func_8003CD98(D_800DC4FC, D_800DDB40, 0, 0); - func_8003CD98(D_800DC4E0, D_800DDB40, 1, 0); - func_8003CD98(D_800DC4E4, D_800DDB40, 2, 0); - func_8003CD98(D_800DC4E8, D_800DDB40, 3, 0); - func_8003CD98(D_800DC4FC, D_800DDB44, 0, 1); - func_8003CD98(D_800DC4E0, D_800DDB44, 1, 1); - func_8003CD98(D_800DC4E4, D_800DDB44, 2, 1); - func_8003CD98(D_800DC4E8, D_800DDB44, 3, 1); - func_8003CD98(D_800DC4FC, D_800DDB48, 0, 2); - func_8003CD98(D_800DC4E0, D_800DDB48, 1, 2); - func_8003CD98(D_800DC4E4, D_800DDB48, 2, 2); - func_8003CD98(D_800DC4E8, D_800DDB48, 3, 2); - func_8003CD98(D_800DC4FC, D_800DDB4C, 0, 3); - func_8003CD98(D_800DC4E0, D_800DDB4C, 1, 3); - func_8003CD98(D_800DC4E4, D_800DDB4C, 2, 3); - func_8003CD98(D_800DC4E8, D_800DDB4C, 3, 3); + func_8003CD98(D_800DC4FC, camera1, 0, 0); + func_8003CD98(D_800DC4E0, camera1, 1, 0); + func_8003CD98(D_800DC4E4, camera1, 2, 0); + func_8003CD98(D_800DC4E8, camera1, 3, 0); + func_8003CD98(D_800DC4FC, camera2, 0, 1); + func_8003CD98(D_800DC4E0, camera2, 1, 1); + func_8003CD98(D_800DC4E4, camera2, 2, 1); + func_8003CD98(D_800DC4E8, camera2, 3, 1); + func_8003CD98(D_800DC4FC, camera3, 0, 2); + func_8003CD98(D_800DC4E0, camera3, 1, 2); + func_8003CD98(D_800DC4E4, camera3, 2, 2); + func_8003CD98(D_800DC4E8, camera3, 3, 2); + func_8003CD98(D_800DC4FC, camera4, 0, 3); + func_8003CD98(D_800DC4E0, camera4, 1, 3); + func_8003CD98(D_800DC4E4, camera4, 2, 3); + func_8003CD98(D_800DC4E8, camera4, 3, 3); break; } } diff --git a/src/code_800431B0.c b/src/code_800431B0.c index 2ec7dea0f..9f2332c76 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -7124,7 +7124,7 @@ void func_800523B8(s32 arg0, s32 arg1, u32 arg2) { temp_v1 = (arg0 * 0xE0) + &D_80165C18; sp3C = temp_v1; - temp_v0 = func_800418AC(temp_v1->unk4, temp_v1->unkC, (arg1 * 0xB8) + D_800DDB40); + temp_v0 = func_800418AC(temp_v1->unk4, temp_v1->unkC, (arg1 * 0xB8) + camera1); temp_a0 = temp_v1 + 4; sp38 = temp_a0; temp_v1->unkB4 = temp_v0; @@ -7203,7 +7203,7 @@ void func_80052590(s32 arg0) { s32 *phi_s1_2; temp_s0 = &D_80165C18 + (D_80183EA0 * 0xE0); - temp_s7 = (arg0 * 0xB8) + D_800DDB40; + temp_s7 = (arg0 * 0xB8) + camera1; func_80046F60(temp_s0->unk60, temp_s0->unk64, 0x20, 0x40, 5); D_80183E80.unk0 = temp_s0->unkB2; D_80183E80.unk4 = temp_s0->unkB6; @@ -7574,7 +7574,7 @@ void func_80052F20(s32 arg0) { void *temp_v1_2; s32 *phi_s2; - sp44 = (arg0 * 0xB8) + D_800DDB40; + sp44 = (arg0 * 0xB8) + camera1; func_80046E60(&D_06006D20, &D_06006F20, 0x20, 0x20); phi_s2 = &D_8018C3F0; do { @@ -7626,7 +7626,7 @@ void func_8005309C(s32 arg0) { s32 *phi_s3; s32 phi_s4; - temp_fp = (arg0 * 0xB8) + D_800DDB40; + temp_fp = (arg0 * 0xB8) + camera1; phi_s3 = &D_80183EA0; phi_s4 = 0; do { @@ -7707,7 +7707,7 @@ void func_800532A4(s32 arg0) { temp_t7 = temp_a2 * 0xB8; arg0 = temp_a2; sp44 = temp_a0; - temp_s1 = temp_t7 + D_800DDB40; + temp_s1 = temp_t7 + camera1; if (func_8007223C(temp_a0, 0x10, temp_a2) != 0) { temp_s0 = (sp44 * 0xE0) + &D_80165C18; temp_s0->unkB2 = 0; @@ -7923,7 +7923,7 @@ void func_80053870(s32 arg0) { s32 *phi_a3; s32 *phi_s3; - sp84 = (arg0 * 0xB8) + D_800DDB40; + sp84 = (arg0 * 0xB8) + camera1; if (arg0 == 0) { phi_s0 = &D_80183EA0; phi_s2 = 0; @@ -8207,7 +8207,7 @@ void func_800540CC(s32 arg0, s32 arg1) { s16 temp_a0; void *temp_v1; - sp2C = (arg1 * 0xB8) + D_800DDB40; + sp2C = (arg1 * 0xB8) + camera1; if (arg0 != -1) { temp_v1 = (arg0 * 0xE0) + &D_80165C18; if ((temp_v1->unkA6 >= 2) && (temp_v1->unkD5 == 1) && (D_8018D120 < 0x2EF)) { @@ -8251,7 +8251,7 @@ void func_800541BC(s32 arg0) { s32 *phi_s0_2; temp_v1 = gDisplayListHead; - sp3C = (arg0 * 0xB8) + D_800DDB40; + sp3C = (arg0 * 0xB8) + camera1; gDisplayListHead = temp_v1 + 8; temp_v1->unk0 = 0x6000000; temp_v1->unk4 = &D_0D007AE0; @@ -8297,7 +8297,7 @@ void func_80054324(s32 arg0, s32 arg1) { s16 temp_a3; void *temp_v1; - sp2C = (arg1 * 0xB8) + D_800DDB40; + sp2C = (arg1 * 0xB8) + camera1; if (arg0 != -1) { temp_v1 = (arg0 * 0xE0) + &D_80165C18; if ((temp_v1->unkA6 >= 2) && (temp_v1->unkD5 == 6) && (D_8018D120 < 0x2EF)) { @@ -8342,7 +8342,7 @@ void func_80054414(s32 arg0) { s32 *phi_s0_2; temp_v1 = gDisplayListHead; - sp3C = (arg0 * 0xB8) + D_800DDB40; + sp3C = (arg0 * 0xB8) + camera1; gDisplayListHead = temp_v1 + 8; temp_v1->unk0 = 0x6000000; temp_v1->unk4 = &D_0D007AE0; @@ -8386,7 +8386,7 @@ void func_8005457C(s32 arg0, s32 arg1) { s32 sp34; void *temp_s0; - sp34 = (arg1 * 0xB8) + D_800DDB40; + sp34 = (arg1 * 0xB8) + camera1; if (D_8018D120 < 0x2EF) { temp_s0 = (arg0 * 0xE0) + &D_80165C18; if (temp_s0->unkD5 == 9) { @@ -8522,7 +8522,7 @@ void func_80054938(s32 arg0) { s32 *phi_s2; temp_v1 = gDisplayListHead; - sp54 = (arg0 * 0xB8) + D_800DDB40; + sp54 = (arg0 * 0xB8) + camera1; gDisplayListHead = temp_v1 + 8; temp_v1->unk0 = 0x6000000; temp_v1->unk4 = &D_0D007AE0; @@ -8614,7 +8614,7 @@ void func_80054BE8(s32 arg0) { gDisplayListHead = temp_v1 + 8; temp_v1->unk0 = 0x6000000; temp_v1->unk4 = &D_0D007AE0; - temp_s5 = (arg0 * 0xB8) + D_800DDB40; + temp_s5 = (arg0 * 0xB8) + camera1; func_800444B0(D_8018D488, 0x20, 0x20); func_8004B35C(0xFF, 0xFF, 0, 0xFF); D_80183E80 = 0; @@ -8648,7 +8648,7 @@ void func_80054D00(s32 arg0, s32 arg1) { void *temp_v1; temp_v1 = (arg0 * 0xE0) + &D_80165C18; - sp3C = (arg1 * 0xB8) + D_800DDB40; + sp3C = (arg1 * 0xB8) + camera1; if (temp_v1->unkA6 >= 3) { sp38 = temp_v1; func_8008A364(0x2AAB, 0x12C); @@ -8744,7 +8744,7 @@ void func_80054F04(s32 arg0) { s32 *phi_s2; temp_v1 = gDisplayListHead; - sp44 = (arg0 * 0xB8) + D_800DDB40; + sp44 = (arg0 * 0xB8) + camera1; gDisplayListHead = temp_v1 + 8; temp_v1->unk0 = 0x6000000; temp_v1->unk4 = &D_0D0079C8; @@ -8967,7 +8967,7 @@ void func_80055458(s32 arg0, s32 arg1) { temp_v1 = (arg0 * 0xE0) + &D_80165C18; if (temp_v1->unkA6 >= 2) { - sp34 = (arg1 * 0xB8) + D_800DDB40; + sp34 = (arg1 * 0xB8) + camera1; sp30 = temp_v1; func_8004A6EC(0x3F000000); temp_v1->unkB4 = func_800418AC(temp_v1->unk4, temp_v1->unkC, sp34); @@ -9020,7 +9020,7 @@ void func_800555BC(s32 arg0, s32 arg1) { temp_v1 = (arg0 * 0xE0) + &D_80165C18; if (temp_v1->unkA6 >= 2) { - sp34 = (arg1 * 0xB8) + D_800DDB40; + sp34 = (arg1 * 0xB8) + camera1; sp30 = temp_v1; func_8004A870(0x3F333333); temp_v1->unkB4 = func_800418AC(temp_v1->unk4, temp_v1->unkC, sp34); @@ -9218,7 +9218,7 @@ void func_80055AB8(s32 arg0, s32 arg1) { void *temp_v1; temp_v1 = (arg0 * 0xE0) + &D_80165C18; - temp_a2 = (arg1 * 0xB8) + D_800DDB40; + temp_a2 = (arg1 * 0xB8) + camera1; if (temp_v1->unkA6 >= 2) { sp34 = temp_v1; sp3C = temp_a2; @@ -9299,7 +9299,7 @@ void func_80055CCC(s32 arg0, s32 arg1) { void *temp_v1_2; temp_s0 = (arg0 * 0xE0) + &D_80165C18; - sp24 = (arg1 * 0xB8) + D_800DDB40; + sp24 = (arg1 * 0xB8) + camera1; if (temp_s0->unkA6 >= 2) { func_8008A454(0x12C); func_8004A6EC(arg0, (20.0 / (temp_s0->unk8 - temp_s0->unk44)) + 0.5); @@ -9488,7 +9488,7 @@ void func_80056188(s32 arg0) { void *temp_s0; s32 *phi_s2; - temp_s3 = (arg0 * 0xB8) + D_800DDB40; + temp_s3 = (arg0 * 0xB8) + camera1; phi_s2 = &D_80183EA0; do { temp_s1 = *phi_s2; @@ -9594,7 +9594,7 @@ void func_800563DC(s32 arg0, s32 arg1, ? arg2) { D_80183E80.unk0 = 0; D_80183E40.unk0 = temp_f12; D_80183E40.unk8 = temp_f14; - D_80183E80.unk2 = func_800418AC(temp_f12, temp_f14, (arg1 * 0xB8) + D_800DDB40); + D_80183E80.unk2 = func_800418AC(temp_f12, temp_f14, (arg1 * 0xB8) + camera1); D_80183E80.unk4 = 0x8000; func_80042E00(&D_80183E40, &D_80183E80, 0x3E4CCCCD); temp_v0_2 = gDisplayListHead; @@ -9936,7 +9936,7 @@ void func_80057114(s32 arg0) { if (D_800DC50C == 5) { phi_fp = 0; } - temp_s7 = (phi_fp * 0xB8) + D_800DDB40; + temp_s7 = (phi_fp * 0xB8) + camera1; if (phi_fp == 0) { phi_s1 = &D_80183DD8; phi_s2 = 0; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 952414c62..0fb32bd9f 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -1,10 +1,17 @@ #include #include +#include +#include +#include +#include #include extern Mtx *D_80183D60; extern Vp D_802B8880; extern Gfx *gDisplayListHead; +extern struct GfxPool *gGfxPool; +extern s32 gPlayerCountSelection1; +extern s16 gCurrentCourseId; // UI Code? void func_80057C60(void) { @@ -81,34 +88,14 @@ the instruction, which has a name starting with "jtbl"/"jpt_". GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058090.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8001C3C4(?); // extern -? func_8005217C(?); // extern -? func_800532A4(?); // extern -? func_80054BE8(?); // extern -? func_80055F48(?); // extern -? func_80056160(?); // extern -? func_800588F4(?); // extern -extern void *gDisplayListHead; - +extern s32 D_800DC50C; +extern u16 D_800DC51C; void func_800581C8(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[8] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_8001C3C4(0); if (D_800DC50C == 5) { func_80055F48(0); @@ -122,111 +109,41 @@ void func_800581C8(void) { } func_800588F4(0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800581C8.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8001C3C4(?); // extern -? func_800532A4(?); // extern -? func_800588F4(?); // extern -extern void *gDisplayListHead; void func_800582CC(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[16] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_8001C3C4(1); if (D_800DC51C == 0) { func_800532A4(1); } func_800588F4(1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800582CC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8001C3C4(?); // extern -? func_800532A4(?); // extern -? func_800588F4(?); // extern -extern void *gDisplayListHead; void func_80058394(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[24] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[72] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[24]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[72]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_8001C3C4(2); if (D_800DC51C == 0) { func_800532A4(2); } func_800588F4(2); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058394.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8001C3C4(?); // extern -? func_800532A4(?); // extern -? func_800588F4(?); // extern -extern void *gDisplayListHead; void func_8005845C(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[32] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[80] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[32]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[80]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_8001C3C4(3); if ((D_800DC51C == 0) && (gPlayerCountSelection1 == 4)) { func_800532A4(3); } func_800588F4(3); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005845C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -241,120 +158,37 @@ the instruction, which has a name starting with "jtbl"/"jpt_". #else GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058538.s") #endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80058B58(?, struct GfxPool **); // extern -extern void *gDisplayListHead; +void func_80058B58(s32 arg0); void func_80058640(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[8] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); if (D_800DC50C != 5) { - func_80058B58(0, &gGfxPool); + func_80058B58(0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058640.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80058B58(?); // extern -extern void *gDisplayListHead; void func_800586FC(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[16] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_80058B58(1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800586FC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80058B58(?); // extern -extern void *gDisplayListHead; void func_800587A4(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[24] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[72] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[24]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[72]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_80058B58(2); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800587A4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80058B58(?); // extern -extern void *gDisplayListHead; void func_8005884C(void) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x80000; - temp_v0->unk0 = 0xBA001301; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0x1030040; - temp_v0_2->unk4 = &gGfxPool->buffer[32] & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1010040; - temp_v0_3->unk4 = &gGfxPool->buffer[80] & 0x1FFFFFFF; + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[32]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[80]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_80058B58(3); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005884C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -372,51 +206,41 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800588F4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800517C8(); // extern -? func_80052C60(); // extern + extern u16 D_8015F894; -void func_80058B58(void) { - s16 temp_v0; +void func_80058B58(s32 arg0) { + //s16 temp_v0; - temp_v0 = gCurrentCourseId; - if (temp_v0 != 5) { - if (temp_v0 != 0xC) { - return; + //temp_v0 = gCurrentCourseId; + if (gCurrentCourseId != COURSE_FRAPPE_SNOWLAND) { + if (gCurrentCourseId != COURSE_SHERBET_LAND) { + + } else { + func_80052C60(); } - func_80052C60(); - // Duplicate return node #9. Try simplifying control flow for better match - return; - } - if (D_800DC50C != 9) { - if ((D_8015F894 == 0) && (gPlayerCountSelection1 == 1)) { - func_800517C8(); - return; + return;// Duplicate return node #9. Try simplifying control flow for better match + } + if (D_800DC50C != 9) { + if ((D_8015F894 == 0) && (gPlayerCountSelection1 == COURSE_CHOCO_MOUNTAIN)) { + func_800517C8(); + //return; + } + //return; } - return; - } - func_800517C8(); + func_800517C8(); + + //return arg0; } #else GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058B58.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_0D0076F8; -extern void *gDisplayListHead; +extern u8 D_0D0076F8; void func_80058BF4(void) { - void *temp_v1; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = 0x6000000; - temp_v1->unk4 = &D_0D0076F8; + gSPDisplayList(gDisplayListHead++, &D_0D0076F8); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058BF4.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -446,9 +270,6 @@ the instruction, which has a name starting with "jtbl"/"jpt_". GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058DB4.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80041EF4(); // extern extern s8 D_801657B0; void func_80058F48(void) { @@ -456,19 +277,7 @@ void func_80058F48(void) { func_80041EF4(); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058F48.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80041EF4(); // extern -? func_8004E638(?); // extern -? func_8004E78C(?); // extern -? func_8004EB38(?); // extern -? func_8004ED40(?); // extern -? func_8004FA78(?); // extern -extern s8 D_801657B0; extern s8 D_801657D8; extern s8 D_801657E4; extern s8 D_801657E6; @@ -490,18 +299,41 @@ void func_80058F78(void) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80058F78.s") -#endif + +void func_80059024(void) { + +} #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004EB30(?); // extern -extern s32 D_8018D2AC; +extern s32 D_8018D2AC; +// needs rodata void func_8005902C(void) { s32 temp_v0; + switch(gPlayerCountSelection1) { + case 0: + break; + case 1: + break; + case 2: + func_8004EB30(0); + func_8004EB30(1); + break; + case 3: + func_8004EB30(0); + func_8004EB30(1); + func_8004EB30(2); + break; + case 4: + func_8004EB30(0); + func_8004EB30(1); + func_8004EB30(2); + func_8004EB30(3); + break; + } +/* if (D_8018D2AC != 0) { temp_v0 = gPlayerCountSelection1; if (temp_v0 != 2) { @@ -524,6 +356,7 @@ void func_8005902C(void) { func_8004EB30(0); func_8004EB30(1); } + */ } #else GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005902C.s") @@ -644,14 +477,9 @@ void func_800591B4(void) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800591B4.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 void func_80059358(void) { } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059358.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -942,7 +770,7 @@ void func_80059820(s32 arg0) { void *temp_v0; D_8018CF1C = &D_800DC4DC[arg0]; - D_8018CF14 = (arg0 * 0xB8) + D_800DDB40; + D_8018CF14 = (arg0 * 0xB8) + camera1; temp_v1 = D_8018CF1C; temp_v0 = (arg0 * 0x84) + &D_8018CA70; temp_v0->unk2C = temp_v1->posX; @@ -1083,7 +911,7 @@ void func_80059AC8(void) { phi_s2 = &D_8018CF68; phi_s0 = 0; do { - *phi_s2 = func_8008A890(phi_s1 + D_800DDB40); + *phi_s2 = func_8008A890(phi_s1 + camera1); func_800892E0(phi_s0); temp_s0 = phi_s0 + 1; phi_s1 += 0xB8; @@ -8539,7 +8367,7 @@ extern f64 D_800EE848; extern f32 D_800EE850; extern f64 D_800EE858; extern f32 D_800EE860; -extern ? D_801646F0; +extern ? cameras; extern s16 D_80164AF0; extern s32 D_8018D4BC; extern s32 D_8018D4C0; @@ -8657,7 +8485,7 @@ void func_8006AFD0(void *arg0, s8 arg1, s16 arg2, s8 arg3) { if (arg3 == arg1) { phi_f20_2 = D_800EE840; } else { - temp_v0_2 = (arg3 * 0xB8) + &D_801646F0; + temp_v0_2 = (arg3 * 0xB8) + &cameras; temp_f20 = arg0->unk14 - temp_v0_2->unk0; temp_f0 = arg0->unk1C - temp_v0_2->unk8; if (D_800DC52C != 3) { @@ -9064,7 +8892,7 @@ void func_8006BB34(void *arg0, s32 arg1, s16 arg2, s16 arg3) { spF4 = 0; sp104 = arg0->unk8; spF8 = arg2; - spF6 = D_800DDB40->unk26; + spF6 = camera1->unk26; func_80021E10(&sp108, temp_a1, temp_a2, arg3); func_80021F84(&sp108, arg1); func_80022180(gGfxPool + (D_80164AF0 << 6) + 0xFAC0, &sp108); diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index 0e65155c5..dfc72f424 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -216,9 +216,9 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006ED60.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; -extern OSIoMesg D_8014F0A0; +extern OSMesgQueue gDmaMesgQueue; +extern void *gMainReceivedMesg; +extern OSIoMesg gDmaIoMesg; extern ? _other_texturesSegmentRomStart; u8 *func_8006ED94(s32 arg0, u8 *arg1, u32 arg2, s32 arg3) { @@ -231,8 +231,8 @@ u8 *func_8006ED94(s32 arg0, u8 *arg1, u32 arg2, s32 arg3) { arg2 = temp_a1; sp28 = temp_a0; osInvalDCache(temp_a0, temp_a1); - osPiStartDma(&D_8014F0A0, 0, 0, (arg0 & 0xFFFFFF) + &_other_texturesSegmentRomStart, sp28, arg2, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, (arg0 & 0xFFFFFF) + &_other_texturesSegmentRomStart, sp28, arg2, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); mio0decode(temp_a0, arg1); return arg1; } diff --git a/src/code_80071F00.c b/src/code_80071F00.c index 4c827a61b..0820575ea 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -1761,13 +1761,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800744A0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; +extern OSMesgQueue gDmaMesgQueue; +extern void *gMainReceivedMesg; extern s32 D_8018D224; void func_800744CC(void) { if (D_8018D224 != 0) { - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); D_8018D224 = 0; } } @@ -1778,13 +1778,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800744CC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800744CC(); // extern -extern OSMesgQueue D_8014EF58; -extern OSIoMesg D_8014F0A0; +extern OSMesgQueue gDmaMesgQueue; +extern OSIoMesg gDmaIoMesg; extern s32 D_8018D224; void func_80074510(u32 arg0, void *arg1, u32 arg2) { func_800744CC(); - osPiStartDma(&D_8014F0A0, 0, 0, arg0, arg1, arg2, &D_8014EF58); + osPiStartDma(&gDmaIoMesg, 0, 0, arg0, arg1, arg2, &gDmaMesgQueue); D_8018D224 = 1; } #else @@ -4470,14 +4470,14 @@ void func_80078288(s32 arg0) { if (temp_s0->unk8 <= 0.0) { func_80086FD4(arg0); } - temp_s0->unkB4 = func_800872D8(arg0, D_800DDB40); + temp_s0->unkB4 = func_800872D8(arg0, camera1); return; } if (D_800DC50C != 9) { sp3A = ((D_800DC4FC->unk_094 / 18.0f) * 216.0f) / 2.0f; sp3E = (random_int(0xF) - sp3A) + 0x2D; sp3C = random_int(0x12C) + 0x1E; - temp_t6 = (((random_int(0x3000) - 0x1800) / ((sp3A / 0xF) + 1)) + D_800DDB40->unk26) & 0xFFFF; + temp_t6 = (((random_int(0x3000) - 0x1800) / ((sp3A / 0xF) + 1)) + camera1->unk26) & 0xFFFF; temp_a0 = temp_t6; sp36 = temp_t6; temp_v0_2 = D_800DC4FC; @@ -4507,15 +4507,15 @@ void func_80078288(s32 arg0) { return; } sp3C = random_int(0x64) + 0x28; - temp_t3 = ((random_int(0x3000) + D_800DDB40->unk26) - 0x1800) & 0xFFFF; + temp_t3 = ((random_int(0x3000) + camera1->unk26) - 0x1800) & 0xFFFF; temp_a0_2 = temp_t3; sp36 = temp_t3; - temp_v0_5 = D_800DDB40; + temp_v0_5 = camera1; temp_f2_2 = sp3C; temp_s0->unk10 = (func_802B8018(temp_a0_2) * temp_f2_2) + temp_v0_5->unk0; sp24 = temp_f2_2; temp_s0->unk14 = temp_v0_5->unk4 + D_800EEB68; - temp_s0->unk18 = (func_802B8038(sp36) * temp_f2_2) + D_800DDB40->unk8; + temp_s0->unk18 = (func_802B8038(sp36) * temp_f2_2) + camera1->unk8; temp_s0->unkC4 = random_int(0x400) + 0x100; temp_v0_6 = random_int(0x64); temp_f8_2 = temp_v0_6; @@ -6461,7 +6461,7 @@ void func_8007CC00(void) { func_8007C684(temp_s2); func_8008B78C(temp_s2); temp_v0 = temp_s0->unkD1; - temp_t4 = (0x8000 - ((temp_v0 * 0xB8) + D_800DDB40)->unk26) & 0xFFFF; + temp_t4 = (0x8000 - ((temp_v0 * 0xB8) + camera1)->unk26) & 0xFFFF; temp_s1 = temp_t4; temp_s3 = &D_800DC4DC[temp_v0]; temp_f20 = func_802B8038(temp_t4 & 0xFFFF); @@ -6745,7 +6745,7 @@ s32 func_8007D804(s32 arg0) { phi_s0 = 0; do { phi_s2_2 = phi_s2_3; - if (func_8008A140(arg0, phi_s0 + D_800DDB40, 0x4000) != 0) { + if (func_8008A140(arg0, phi_s0 + camera1, 0x4000) != 0) { phi_s2_2 = phi_s2_3 + 1; } temp_s1 = phi_s1 + 1; @@ -7236,7 +7236,7 @@ s32 func_8007E59C(s32 arg0) { s32 phi_v1; phi_s0 = D_800DC4DC; - phi_s1 = D_800DDB40; + phi_s1 = camera1; phi_s2 = 0; phi_v1 = 0; if (gPlayerCountSelection1 > 0) { @@ -8168,7 +8168,7 @@ void func_80080A4C(s32 arg0, s32 arg1) { Player *temp_a3; void *temp_v0; - sp1C = (arg1 * 0xB8) + D_800DDB40; + sp1C = (arg1 * 0xB8) + camera1; temp_a3 = &D_800DC4DC[arg1]; if (D_800DC530 != 3) { sp18 = temp_a3; @@ -8723,7 +8723,7 @@ void func_80081D34(s32 arg0) { phi_s1 = D_800DC4DC; phi_s2 = 0; - phi_s4 = D_800DDB40; + phi_s4 = camera1; phi_s5 = 0; phi_s5_2 = 0; if (D_8018D158 > 0) { diff --git a/src/code_80086E70.c b/src/code_80086E70.c index eb6a5227d..32b2a37d9 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -1720,7 +1720,7 @@ void func_8008A1D0(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { u32 temp_v0; ? phi_a2; - sp24 = (arg1 * 0xB8) + D_800DDB40; + sp24 = (arg1 * 0xB8) + camera1; func_800721E8(0x140000); temp_v0 = func_8008896C(arg0, sp24); if (temp_v0 < 0x2711) { @@ -1758,7 +1758,7 @@ u32 func_8008A364(s32 arg0, s32 arg1, u16 arg2, s32 arg3) { u16 phi_a2; u32 phi_v1; - sp24 = (arg1 * 0xB8) + D_800DDB40; + sp24 = (arg1 * 0xB8) + camera1; func_800721E8(0x60000); temp_v0 = func_8008896C(arg0, sp24); phi_v1 = temp_v0; @@ -1794,7 +1794,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A364.s") u32 func_8008896C(s32); // extern void func_8008A454(s32 arg0, s32 arg1, s32 arg2) { - if (func_8008896C((arg1 * 0xB8) + D_800DDB40) < (arg2 * arg2)) { + if (func_8008896C((arg1 * 0xB8) + camera1) < (arg2 * arg2)) { func_800721C0(arg0, 0x20); return; } @@ -1823,7 +1823,7 @@ void func_8008A4CC(s32 arg0) { func_800721E8(0x70000); phi_s2 = 0; - phi_s4 = D_800DDB40; + phi_s4 = camera1; if (gPlayerCountSelection1 > 0) { temp_s3 = (arg0 * 0xE0) + &D_80165C18; do { @@ -1868,7 +1868,7 @@ void func_8008A6DC(s32 arg0, f32 arg1) { s32 phi_s2; func_800721E8(0x60000); - phi_s1 = D_800DDB40; + phi_s1 = camera1; phi_s2 = 0; if (gPlayerCountSelection1 > 0) { temp_f22 = D_800EF4F0; diff --git a/src/code_80091750.c b/src/code_80091750.c index ff78f246b..174614a07 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -1686,7 +1686,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800942D0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800942D0(); // extern -? func_802A7C08(); // extern +? move_segment_table_to_dmem(); // extern extern s32 D_8018EDC0; extern void *gDisplayListHead; @@ -1698,7 +1698,7 @@ void func_80094660(Mtx *arg0, ? arg1) { void *temp_v0_4; void *temp_v0_5; - func_802A7C08(); + move_segment_table_to_dmem(); temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; temp_v0->unk4 = 0x80000; @@ -1730,7 +1730,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80094660.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800B0004(); // extern -? func_802A7C08(); // extern +? move_segment_table_to_dmem(); // extern extern ? D_02007650; extern ? D_02007FC8; extern s32 D_8018EDC0; @@ -1771,7 +1771,7 @@ void func_800947B4(s32 arg0, ? arg1) { void *temp_v0_8; void *temp_v0_9; - func_802A7C08(); + move_segment_table_to_dmem(); temp_a0 = arg0 + 0x40; sp50 = temp_a0; guPerspective(temp_a0, &sp7E, 45.0f, 1.3333334f, 100.0f, 12800.0f, 1.0f); @@ -3961,7 +3961,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80098FC8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; +extern OSMesgQueue gDmaMesgQueue; extern ? _textures_0aSegmentRomStart; void dma_copy_base_729a30(s32 arg0, u32 arg1, void *arg2) { @@ -3969,8 +3969,8 @@ void dma_copy_base_729a30(s32 arg0, u32 arg1, void *arg2) { void *sp2C; osInvalDCache(arg2, arg1); - osPiStartDma(&sp30, 0, 0, (arg0 & 0xFFFFFF) + &_textures_0aSegmentRomStart, arg2, arg1, &D_8014EF58); - osRecvMesg(&D_8014EF58, &sp2C, 1); + osPiStartDma(&sp30, 0, 0, (arg0 & 0xFFFFFF) + &_textures_0aSegmentRomStart, arg2, arg1, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &sp2C, 1); } #else GLOBAL_ASM("asm/non_matchings/code_80091750/dma_copy_base_729a30.s") @@ -3978,7 +3978,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/dma_copy_base_729a30.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; +extern OSMesgQueue gDmaMesgQueue; extern ? _textures_0bSegmentRomStart; void dma_copy_base_7fa3c0(s32 arg0, u32 arg1, void *arg2) { @@ -3986,8 +3986,8 @@ void dma_copy_base_7fa3c0(s32 arg0, u32 arg1, void *arg2) { void *sp2C; osInvalDCache(arg2, arg1); - osPiStartDma(&sp30, 0, 0, (arg0 & 0xFFFFFF) + &_textures_0bSegmentRomStart, arg2, arg1, &D_8014EF58); - osRecvMesg(&D_8014EF58, &sp2C, 1); + osPiStartDma(&sp30, 0, 0, (arg0 & 0xFFFFFF) + &_textures_0bSegmentRomStart, arg2, arg1, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &sp2C, 1); } #else GLOBAL_ASM("asm/non_matchings/code_80091750/dma_copy_base_7fa3c0.s") @@ -4319,7 +4319,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099A94.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; +extern OSMesgQueue gDmaMesgQueue; extern s32 D_8018D9B0; extern void *D_8018D9B4; extern void *D_8018E060; @@ -4372,8 +4372,8 @@ void func_80099AEC(void) { } osInvalDCache(D_8018D9B4, phi_s0_2); sp58 = &_textures_0aSegmentRomStart; - osPiStartDma(&sp6C, 0, 0, &_textures_0aSegmentRomStart + (temp_s2->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_2, &D_8014EF58); - osRecvMesg(&D_8014EF58, &sp68, 1); + osPiStartDma(&sp6C, 0, 0, &_textures_0aSegmentRomStart + (temp_s2->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_2, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &sp68, 1); loop_9: temp_v0 = phi_s1->unk8; phi_s5 = phi_s5_3; @@ -4390,14 +4390,14 @@ loop_9: phi_s0_4 = ((phi_s0_3 / 8) * 8) + 8; } osInvalDCache(temp_t7 + D_8018D9B4, phi_s0_4); - osPiStartDma(&sp6C, 0, 0, sp58 + (temp_v0->unk4 & 0xFFFFFF), temp_t7 + D_8018D9B4, phi_s0_4, &D_8014EF58); + osPiStartDma(&sp6C, 0, 0, sp58 + (temp_v0->unk4 & 0xFFFFFF), temp_t7 + D_8018D9B4, phi_s0_4, &gDmaMesgQueue); } mio0decode(D_8018D9B4, (((phi_s1->unk4 * 8) + &D_8018E118)->unk4 * 2) + D_8018D9B0); phi_s1->unk0 = 0; temp_s1 = phi_s1 + 8; phi_s5_2 = phi_s5; if (phi_s5 == 0) { - osRecvMesg(&D_8014EF58, &sp68, 1); + osRecvMesg(&gDmaMesgQueue, &sp68, 1); temp_v0_2 = temp_s1->unk8; if (temp_v0_2 == 0) { phi_s5_2 = phi_s5 + 1; @@ -4411,14 +4411,14 @@ loop_9: phi_s0_6 = ((phi_s0_5 / 8) * 8) + 8; } osInvalDCache(D_8018D9B4, phi_s0_6); - osPiStartDma(&sp6C, 0, 0, sp58 + (temp_v0_2->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_6, &D_8014EF58); + osPiStartDma(&sp6C, 0, 0, sp58 + (temp_v0_2->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_6, &gDmaMesgQueue); } mio0decode((sp60 * 4) + D_8018D9B4, (((temp_s1->unk4 * 8) + &D_8018E118)->unk4 * 2) + D_8018D9B0); temp_s1->unk0 = 0; phi_s1 = temp_s1 + 8; phi_s5_3 = phi_s5_2; if (phi_s5_2 == 0) { - osRecvMesg(&D_8014EF58, &sp68, 1); + osRecvMesg(&gDmaMesgQueue, &sp68, 1); goto loop_9; } } @@ -4470,7 +4470,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099E60.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; +extern OSMesgQueue gDmaMesgQueue; extern void *D_8018D9B4; extern void *D_8018E0E8; extern ? _textures_0aSegmentRomStart; @@ -4514,8 +4514,8 @@ void func_80099EC4(void) { phi_s0_2 = ((phi_s0 / 8) * 8) + 8; } osInvalDCache(D_8018D9B4, phi_s0_2); - osPiStartDma(&sp68, 0, 0, &_textures_0aSegmentRomStart + (temp_s2->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_2, &D_8014EF58); - osRecvMesg(&D_8014EF58, &sp64, 1); + osPiStartDma(&sp68, 0, 0, &_textures_0aSegmentRomStart + (temp_s2->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_2, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &sp64, 1); loop_6: temp_v0 = phi_s1->unk8; phi_s4 = phi_s4_3; @@ -4531,7 +4531,7 @@ loop_6: phi_s0_4 = ((phi_s0_3 / 8) * 8) + 8; } osInvalDCache(D_8018D9B4 + 0x1400, phi_s0_4); - osPiStartDma(&sp68, 0, 0, &_textures_0aSegmentRomStart + (temp_v0->unk4 & 0xFFFFFF), D_8018D9B4 + 0x1400, phi_s0_4, &D_8014EF58); + osPiStartDma(&sp68, 0, 0, &_textures_0aSegmentRomStart + (temp_v0->unk4 & 0xFFFFFF), D_8018D9B4 + 0x1400, phi_s0_4, &gDmaMesgQueue); } temp_v0_2 = phi_s1->unk4; mio0decode(D_8018D9B4, D_802BFB80 + (phi_s1->unk6 << 0x10) + ((temp_v0_2 / 2) << 0xF) + ((temp_v0_2 % 2) << 0xD) + 0x4000); @@ -4539,7 +4539,7 @@ loop_6: temp_s1 = phi_s1 + 8; phi_s4_2 = phi_s4; if (phi_s4 == 0) { - osRecvMesg(&D_8014EF58, &sp64, 1); + osRecvMesg(&gDmaMesgQueue, &sp64, 1); temp_v0_3 = temp_s1->unk8; if (temp_v0_3 == 0) { phi_s4_2 = phi_s4 + 1; @@ -4553,7 +4553,7 @@ loop_6: phi_s0_6 = ((phi_s0_5 / 8) * 8) + 8; } osInvalDCache(D_8018D9B4, phi_s0_6); - osPiStartDma(&sp68, 0, 0, &_textures_0aSegmentRomStart + (temp_v0_3->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_6, &D_8014EF58); + osPiStartDma(&sp68, 0, 0, &_textures_0aSegmentRomStart + (temp_v0_3->unk4 & 0xFFFFFF), D_8018D9B4, phi_s0_6, &gDmaMesgQueue); } temp_v0_4 = temp_s1->unk4; mio0decode(D_8018D9B4 + 0x1400, D_802BFB80 + (temp_s1->unk6 << 0x10) + ((temp_v0_4 / 2) << 0xF) + ((temp_v0_4 % 2) << 0xD) + 0x4000); @@ -4561,7 +4561,7 @@ loop_6: phi_s1 = temp_s1 + 8; phi_s4_3 = phi_s4_2; if (phi_s4_2 == 0) { - osRecvMesg(&D_8014EF58, &sp64, 1); + osRecvMesg(&gDmaMesgQueue, &sp64, 1); goto loop_6; } } diff --git a/src/code_80280000.c b/src/code_80280000.c index 497c99665..a044934fe 100644 --- a/src/code_80280000.c +++ b/src/code_80280000.c @@ -8,8 +8,8 @@ extern Gfx *gDisplayListHead; -extern f32 D_801646F0, D_801646F4, D_801646F8, D_801646FC, - D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710; +extern Camera cameras[];//, *camera1, *camera2, *camera3, *camera4; + extern f32 D_80150130, D_80150148, D_8015014C, D_80150150; extern s16 D_800DC644; @@ -38,7 +38,8 @@ void func_80280000(void) { } void func_80280038(void) { - u16 sp44[38]; + Camera *camera = &cameras[0]; + u16 sp44[36]; D_80150112 = 0; D_80164AF0 = 0; @@ -51,7 +52,7 @@ void func_80280038(void) { guPerspective(&gGfxPool->buffer[8], &sp44[37], D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); gDPHalf1(gDisplayListHead++, sp44[37]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - guLookAt(&gGfxPool->buffer[56], D_801646F0, D_801646F4, D_801646F8, D_801646FC, D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710); + guLookAt(&gGfxPool->buffer[56], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); gCurrentCourseId = D_800DC644; func_802B53C8(&sp44); @@ -78,7 +79,8 @@ void func_80280268(s32 arg0) { } void func_802802AC(void) { - f32 sp20; + Camera *camera = &cameras[0]; + f32 temp_f12; f32 temp; f32 temp_f14; @@ -89,18 +91,18 @@ void func_802802AC(void) { if (D_800DC5C4 == 0) { D_800DC5C0 = 0; D_800DC524 = 9; - D_800DC50C = 0xFF; + D_800DC50C = 255; } } else { D_802874FC = 0; - func_80283648(&D_801646F0); - temp_f12 = D_801646FC - D_801646F0; - temp = D_80164700 - D_801646F4; - temp_f14 = D_80164704 - D_801646F8; - D_80164716 = func_802B7830(temp_f12, temp_f14); - D_80164714 = func_802B7830(sqrtf((temp_f12 * temp_f12) + (temp_f14 * temp_f14)), temp); - D_80164718 = 0; + func_80283648(camera); + temp_f12 = camera->unk - camera->posX; + temp = camera->unk1 - camera->posY; + temp_f14 = camera->unk2 - camera->posZ; + camera->rotX2 = func_802B7830(temp_f12, temp_f14); + camera->rotX = func_802B7830(sqrtf((temp_f12 * temp_f12) + (temp_f14 * temp_f14)), temp); + camera->rotY = 0; if (D_802874A0 != 0) { D_800DC5E4++; } else { @@ -113,19 +115,19 @@ void func_802802AC(void) { } void func_80280420(void) { - s32 temp_t1; + Camera *camera = &cameras[0]; gCurrentCourseId = D_800DC644; D_800DC5B4 = 1; D_800DC518 = 1; func_802A4D18(); func_802A74BC(); - D_801647A4 = 60.0f; + camera->unk30 = 60.0f; D_80150130 = 60.0f; - D_800DC5EC->unk2C = 0x140; - D_800DC5EC->unk2E = 0xF0; - D_800DC5EC->unk30 = 0xA0; - D_800DC5EC->unk32 = 0x78; + D_800DC5EC->screenWidth = 320; + D_800DC5EC->screenHeight = 240; + D_800DC5EC->screenStartX = 160; + D_800DC5EC->screenStartY = 120; D_800DC530 = 0; D_800DC52C = 0; gPrevLoadedAddress = D_8015F734; @@ -145,15 +147,15 @@ void func_80280420(void) { D_800DC5BC = 0; D_800DC5C8 = 0; D_8015F580 = gPrevLoadedAddress; - D_801646F0 = 1400.0f; - D_801646F4 = 300.0f; - D_801646F8 = 1400.0f; - D_801646FC = 0.0f; - D_80164700 = 0.0f; - D_80164704 = 0.0f; - D_80164708 = 0.0f; - D_8016470C = 1.0f; - D_80164710 = 0.0f; + camera->posX = 1400.0f; + camera->posY = 300.0f; + camera->posZ = 1400.0f; + camera->unk = 0.0f; + camera->unk1 = 0.0f; + camera->unk2 = 0.0f; + camera->angleX = 0.0f; + camera->angleY = 1.0f; + camera->angleZ = 0.0f; func_80283430(); func_80003040(); func_8006E9C0(); diff --git a/src/code_80280650.c b/src/code_80280650.c index 4f37c3b1b..fa618a633 100644 --- a/src/code_80280650.c +++ b/src/code_80280650.c @@ -297,7 +297,7 @@ void func_80280B50(void *arg0, ? arg1, s32 arg2, s16 arg3) { sp44 = 0; sp54 = arg0->unk8; sp48 = 0; - sp46 = D_800DDB40->unk26; + sp46 = camera1->unk26; func_80280A28(arg1, &sp4C, temp_a1, arg1); temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; @@ -553,9 +553,8 @@ GLOBAL_ASM("asm/non_matchings/code_80280650/func_8028118C.s") ? func_8028101C(?, s32, ?); // extern ? func_8028118C(?, s32, ?); // extern ? guLookAtF(? *, s32, s32, s32, f32, f32, f32, f32, f32, f32); // extern -extern ? D_801646F0; +extern ? cameras; extern f32 D_801646F4; -extern f32 D_80164700; extern s16 D_802874C4; extern s32 D_802874E0; extern s8 D_802874F5; @@ -568,7 +567,7 @@ void func_802812C8(void) { s32 phi_v0; s32 phi_v0_2; - guLookAtF(&D_80287500, D_801646F0.unk0, D_801646F0.unk4, D_801646F0.unk8, D_801646F0.unkC, D_801646F0.unk10, D_801646F0.unk14, D_801646F0.unk18, D_801646F0.unk1C, D_801646F0.unk20); + guLookAtF(&D_80287500, cameras.unk0, cameras.unk4, cameras.unk8, cameras.unkC, cameras.unk10, cameras.unk14, cameras.unk18, cameras.unk1C, cameras.unk20); if (D_802874F5 < 3) { temp_v0 = D_802874E0; phi_v0 = temp_v0; diff --git a/src/code_80281610.c b/src/code_80281610.c index e1096d5f8..3d2dab433 100644 --- a/src/code_80281610.c +++ b/src/code_80281610.c @@ -1,28 +1,26 @@ #include #include +#include -// guLookAt params -extern f32 D_801646F0, D_801646F4, D_801646F8, D_801646FC, - D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710; - -extern u16 D_80164714, D_80164716; -extern u16 D_80164718; +extern Camera cameras[]; extern u16 func_802B7830(f32, f32); void func_80281610(void) { - f32 sp1C; + Camera *camera = &cameras[0]; + //f32 sp1C; f32 temp_f12; f32 temp; f32 temp_f14; - func_80283648(&D_801646F0); - temp_f12 = D_801646FC - D_801646F0; - temp = D_80164700 - D_801646F4; - temp_f14 = D_80164704 - D_801646F8; - D_80164716 = func_802B7830(temp_f12, temp_f14); - D_80164714 = func_802B7830(sqrtf((temp_f12 * temp_f12) + (temp_f14 * temp_f14)), temp); - D_80164718 = 0; + func_80283648(camera); + + temp_f12 = camera->unk - camera->posX; + temp = camera->unk1 - camera->posY; + temp_f14 = camera->unk2 - camera->posZ; + camera->rotX2 = func_802B7830(temp_f12, temp_f14); + camera->rotX = func_802B7830(sqrtf((temp_f12 * temp_f12) + (temp_f14 * temp_f14)), temp); + camera->rotY = 0; } // guPerspective params @@ -31,18 +29,16 @@ extern f32 D_80150130, D_80150148, D_8015014C, D_80150150; // rodata that has not been found extern const f32 D_80286B90, D_80286B94, D_80286B98, D_80286B9C, D_80286BA0; -// Two functions have evidence that this weird thing here is 8 floats, -// but over here they need to be array-indexed to match void func_802816B8(void) { - (((f32 *)(&D_801646F0))[0]) = D_80286B90; - (((f32 *)(&D_801646F0))[1]) = 19.0f; - (((f32 *)(&D_801646F0))[2]) = D_80286B94; - (((f32 *)(&D_801646F0))[3]) = D_80286B98; - (((f32 *)(&D_801646F0))[4]) = 21.0f; - (((f32 *)(&D_801646F0))[5]) = -528.0f; - (((f32 *)(&D_801646F0))[6]) = 0.0f; - (((f32 *)(&D_801646F0))[7]) = 1.0f; - (((f32 *)(&D_801646F0))[8]) = 0.0f; + cameras[0].posX = D_80286B90; + cameras[0].posY = 19.0f; + cameras[0].posZ = D_80286B94; + cameras[0].unk = D_80286B98; + cameras[0].unk1 = 21.0f; + cameras[0].unk2 = -528.0f; + cameras[0].angleX = 0.0f; + cameras[0].angleY = 1.0f; + cameras[0].angleZ = 0.0f; D_80150130 = 40.0f; D_80150148 = D_80286B9C; D_80150150 = 3.0f; diff --git a/src/code_80281780.c b/src/code_80281780.c index 27a26410f..27dc1b188 100644 --- a/src/code_80281780.c +++ b/src/code_80281780.c @@ -5,6 +5,8 @@ #include "code_80281780.h" +extern Camera cameras[]; + extern s32 gPrevLoadedAddress; // unk4 is buttonDown? @@ -71,6 +73,8 @@ void func_802818BC(void) { } void load_ending_sequence_royalraceway(void) { + Camera *camera = &cameras[0]; + gCurrentCourseId = COURSE_ROYAL_RACEWAY; D_800DC5B4 = (u16)1; gIsMirrorMode = 0; @@ -78,12 +82,12 @@ void load_ending_sequence_royalraceway(void) { D_80287554 = 0; func_802A4D18(); func_802A74BC(); - D_801647A4 = 60.0f; + camera->unk30 = 60.0f; D_80150130 = 60.0f; - D_800DC5EC->unk2C = (u16)0x140; - D_800DC5EC->unk2E = (u16)0xF0; - D_800DC5EC->unk30 = (u16)0xA0; - D_800DC5EC->unk32 = (u16)0x78; + D_800DC5EC->screenWidth = 320; + D_800DC5EC->screenHeight = 240; + D_800DC5EC->screenStartX = 160; + D_800DC5EC->screenStartY = 120; D_800DC530 = 0; gPrevLoadedAddress = (s32) D_8015F734; D_800DC52C = 0; diff --git a/src/code_80281C40.c b/src/code_80281C40.c index a8c37d09f..c6e78d30f 100644 --- a/src/code_80281C40.c +++ b/src/code_80281C40.c @@ -21,8 +21,9 @@ extern u16 D_800DC5C0; extern u32 D_800DC524; extern Gfx D_00284F70[]; extern Gfx D_00284EE0[]; -extern f32 D_801646F0, D_801646F4, D_801646F8, D_801646FC, - D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710; + +extern Camera cameras[]; + extern f32 D_80150130, D_80150148, D_8015014C, D_80150150; @@ -47,7 +48,8 @@ void func_80281CB4(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void func_80281D00(void) { // could be a struct, // but for now we have the oddest way to match this function - u16 sp64[48]; + Camera *camera = &cameras[0]; + u16 sp64[46]; func_802A53A4(); func_802A3E3C(); @@ -65,14 +67,13 @@ void func_80281D00(void) { guPerspective((Mtx*) &gGfxPool->buffer[8], &sp64[39], D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); gDPHalf1(gDisplayListHead++, sp64[39]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - guLookAt((Mtx*) &gGfxPool->buffer[56], D_801646F0, D_801646F4, D_801646F8, D_801646FC, D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710); + guLookAt((Mtx*) &gGfxPool->buffer[56], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_802B53C8(&sp64[6]); func_802B4FF8(&sp64[6], 0); gSPDisplayList(gDisplayListHead++, &D_00284F70); func_800212B4(); gSPDisplayList(gDisplayListHead++, &D_00284EE0); - // sp38 = &D_00284EE0; func_80281438(); func_80058090(0); func_80021B0C(); diff --git a/src/code_8028DF00.c b/src/code_8028DF00.c index 8955e149d..97cbbbe00 100644 --- a/src/code_8028DF00.c +++ b/src/code_8028DF00.c @@ -14,7 +14,7 @@ extern struct Controller *D_800DC4D4; extern unsigned char *D_8015F8C4; extern unsigned char *D_8015F8C8; extern unsigned char *D_8015F8CC; -extern u8 D_800DC5EB; +//extern u8 D_800DC5EB; extern s16 D_8018D8C0[]; extern s32 D_8016348C; extern s8 gCourseSelection; @@ -138,7 +138,7 @@ void func_8028E028(void) { *(D_8015F8CC + D_800DC5E8) += 1; break; } - func_800CA118(D_800DC5EB); + func_800CA118((u8) D_800DC5E8); D_800DC510 = 5; D_802BA038 = 10; } diff --git a/src/code_80290C20.c b/src/code_80290C20.c index c28c0e90d..fd4d9b53f 100644 --- a/src/code_80290C20.c +++ b/src/code_80290C20.c @@ -116,7 +116,7 @@ void load_surface_map(u32 arg0, void *arg1) { } } arg1->unk36 = phi_a3; - if (*(&D_80152300 + (((temp_a2 - D_800DDB40) / 0xB8) * 2)) == 1) { + if (*(&D_80152300 + (((temp_a2 - camera1) / 0xB8) * 2)) == 1) { sp34 = temp_t1; sp22 = phi_a3; sp30 = temp_a2; diff --git a/src/code_80296A50.c b/src/code_80296A50.c index 6fef3d29c..e5c13a06b 100644 --- a/src/code_80296A50.c +++ b/src/code_80296A50.c @@ -5,7 +5,7 @@ #include #include "actor_types.h" -extern Camera *D_800DDB40; +extern Camera *camera1; #ifdef MIPS_TO_C void func_80296A50(s32 arg0, s32 arg3) { @@ -165,7 +165,7 @@ GLOBAL_ASM("asm/non_matchings/code_actors/func_80296D10.s") // 801646F0 // 80161B68 // Actor leave screen void func_80297230(Camera *arg0, Item *arg1) { - switch(arg0 - D_800DDB40) { // / 0xB8 + switch(arg0 - camera1) { // / 0xB8 case 0: arg1->unk2 &= 0xFFFE; break; @@ -186,7 +186,7 @@ void func_80297230(Camera *arg0, Item *arg1) { //#ifdef MIPS_TO_C void func_802972B8(Camera *arg0, Item *arg1) { - switch(arg0 - D_800DDB40) { + switch(arg0 - camera1) { case 0: arg1->unk2 = (s16) (arg1->unk2 | 1); break; @@ -679,7 +679,7 @@ void func_80298328(void *arg0, void *arg1, void *arg2) { s32 phi_t4; s16 phi_t4_2; - temp_lo = (arg0 - D_800DDB40) / 0xB8; + temp_lo = (arg0 - camera1) / 0xB8; if ((arg2->unk2 & 0x800) == 0) { sp36 = temp_lo; temp_f0 = func_802B80D0(arg2 + 0x18, arg0->unk26, 0, (&D_80150130)[temp_lo], D_802B9624); @@ -1015,7 +1015,7 @@ loop_5: if ((temp_s0 & 0x800) != 0) { goto block_29; } - if (((temp_s0 & 0x400) != 0) && ((D_800DC5FC == 0) || (arg0 == D_800DDB40))) { + if (((temp_s0 & 0x400) != 0) && ((D_800DC5FC == 0) || (arg0 == camera1))) { phi_s1->unk2 = phi_s1->unk2 + 0xA; if (phi_s1->unk2 >= 0x321) { phi_s1->unk6 = phi_s1->unk6 | 0x800; @@ -1026,7 +1026,7 @@ loop_5: spD8 = phi_s1->unk2; spDC = phi_s1->unk4; temp_t0 = temp_s0 & 0xF; - if (func_802B80D0(arg0, temp_a1, arg0->unk26, 0.0f, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], phi_f22) < 0.0f) { + if (func_802B80D0(arg0, temp_a1, arg0->unk26, 0.0f, (&D_80150130)[(arg0 - camera1) / 0xB8], phi_f22) < 0.0f) { goto block_29; } if (temp_t0 == 6) { @@ -1124,7 +1124,7 @@ void func_80299144(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9658); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9658); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B965C)) { func_8029794C(sp28, arg2 + 0x10, 0x40400000, arg1); @@ -1199,7 +1199,7 @@ void func_8029930C(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9660); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9660); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9664)) { func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); @@ -1274,7 +1274,7 @@ void func_802994D4(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9668); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9668); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B966C)) { func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); @@ -1348,7 +1348,7 @@ void func_8029969C(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9670); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9670); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < 600.0f)) { func_8029794C(sp28, arg2 + 0x10, 0x40A00000, arg1); @@ -1423,7 +1423,7 @@ void func_80299864(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9674); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9674); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9678)) { func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); @@ -1498,7 +1498,7 @@ void func_80299A2C(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B967C); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B967C); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9680)) { func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); @@ -1573,7 +1573,7 @@ void func_80299BF4(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp4A = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9684); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9684); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9688)) { func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); @@ -1641,7 +1641,7 @@ void func_80299DBC(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B968C); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B968C); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9690)) { func_8029794C(sp28, arg2 + 0x10, 0x40333333, arg1); @@ -1685,7 +1685,7 @@ void func_80299EDC(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9694); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9694); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9698)) { func_8029794C(sp28, arg2 + 0x10, 0x3F800000, arg1); @@ -1729,7 +1729,7 @@ void func_80299FFC(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B969C); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B969C); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B96A0)) { func_8029794C(sp28, arg2 + 0x10, 0x3F800000, arg1); @@ -1773,7 +1773,7 @@ void func_8029A11C(void *arg0, void *arg1, void *arg2) { if ((temp_v0 & 0x800) == 0) { sp28 = temp_a1; sp32 = temp_v0; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B96A4); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96A4); if (!(temp_f0 < 0.0f)) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B96A8)) { func_8029794C(sp28, arg2 + 0x10, 0x3F4CCCCD, arg1); @@ -1898,7 +1898,7 @@ void func_8029A3AC(void *arg0, void *arg1, void *arg2) { sp58.unk14 = D_802B87E8.unk14; sp58.unk18 = D_802B87E8.unk18; sp58.unk1C = D_802B87E8.unk1C; - temp_f0 = func_802B80D0(arg2 + 0x18, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B96AC); + temp_f0 = func_802B80D0(arg2 + 0x18, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96AC); if (temp_f0 < 0.0f) { func_80297230(arg0, arg2); return; @@ -2126,7 +2126,7 @@ void func_8029A8F4(void *arg0, ? arg1, void *arg2) { temp_a1 = arg2 + 0x18; sp2C = temp_a1; - if (func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B96B4) < 0.0f) { + if (func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96B4) < 0.0f) { func_80297230(arg0, arg2); return; } @@ -2276,7 +2276,7 @@ void func_8029AE1C(void *arg0, void *arg1, ? arg2, s32 arg3) { if ((temp_t6 < 0x15) || (temp_t6 >= 0x19)) { temp_a1 = arg1 + 0x18; sp30 = temp_a1; - if (!(func_802B80D0(temp_a1, arg0->unk26, 0x47AFC800, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B96DC) < 0.0f)) { + if (!(func_802B80D0(temp_a1, arg0->unk26, 0x47AFC800, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96DC) < 0.0f)) { temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; temp_v0->unk4 = 0x80000040; @@ -2374,7 +2374,7 @@ void func_8029B06C(void *arg0, void *arg1) { temp_a1 = arg1 + 0x18; sp24 = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B96E0); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96E0); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f)) { temp_v0 = gDisplayListHead; @@ -2485,7 +2485,7 @@ void func_8029B2E4(void *arg0, s32 arg1) { temp_a1 = arg1 + 0x18; sp24 = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B96F0); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B96F0); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), (func_802B4FF8(&spC8, 0) != 0))) { if (D_800DC52C == 0) { @@ -2562,7 +2562,7 @@ void func_8029B4E0(void *arg0, s32 arg1) { temp_a1 = arg1 + 0x18; sp24 = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9700); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9700); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), func_802B5F00(&spC8, 0x3DCCCCCD), (func_802B4FF8(&spC8, 0) != 0))) { if (D_800DC52C == 0) { @@ -2638,7 +2638,7 @@ void func_8029B6EC(void *arg0, s32 arg1) { temp_a1 = arg1 + 0x18; sp24 = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9710); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9710); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f) && (temp_v0 = gDisplayListHead, gDisplayListHead = temp_v0 + 8, temp_v0->unk4 = -1, temp_v0->unk0 = 0xBB000001, temp_v0_2 = gDisplayListHead, gDisplayListHead = temp_v0_2 + 8, temp_v0_2->unk4 = 0x20000, temp_v0_2->unk0 = 0xB6000000, sp44 = temp_f2, func_802B5F74(&spC8, temp_a1, arg1 + 0x10), (func_802B4FF8(&spC8, 0) != 0))) { if (D_800DC52C == 0) { @@ -2745,7 +2745,7 @@ void func_8029B8E8(void *arg0, void *arg1) { temp_a1 = arg1 + 0x18; sp30 = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9720); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9720); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f)) { temp_v0 = gDisplayListHead; @@ -2966,7 +2966,7 @@ void func_8029BFB0(void *arg0, void *arg1) { temp_a1 = arg1 + 0x18; sp30 = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x441C4000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9730); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x441C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9730); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f)) { temp_v0 = gDisplayListHead; @@ -3132,7 +3132,7 @@ void func_8029C3CC(void *arg0, void *arg1) { temp_a1 = arg1 + 0x18; sp2C = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x44FD2000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9740); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x44FD2000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9740); temp_f2 = temp_f0; if (!(temp_f0 < 0.0f)) { temp_v0 = gDisplayListHead; @@ -3334,7 +3334,7 @@ void func_8029CA90(void *arg0, void *arg1) { temp_a1 = arg1 + 0x18; if (arg1->unk4 == 0) { sp2C = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x43C80000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9750); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0x43C80000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9750); if (!(temp_f0 < 0.0f)) { if ((temp_f0 < D_802B9754) && (arg1->unk34 == 1)) { sp8C = arg1->unk18; @@ -5148,7 +5148,7 @@ void func_802A171C(void *arg0, void *arg1) { temp_a1 = arg1 + 0x18; sp38 = temp_a1; - if (func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B99E0) < 0.0f) { + if (func_802B80D0(temp_a1, arg0->unk26, 0x451C4000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B99E0) < 0.0f) { func_80297230(arg0, arg1); return; } @@ -5437,7 +5437,7 @@ void func_802A1EA0(void *arg0, void *arg1) { temp_a1 = arg1 + 0x18; sp38 = temp_a1; - temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9A00); + temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9A00); if (!(temp_f0 < 0.0f) && !(D_802B9A04 < temp_f0)) { temp_a0 = arg1->unk6; phi_a0 = temp_a0; @@ -5690,7 +5690,7 @@ void func_802A269C(void *arg0, s32 arg1) { temp_a1 = arg1 + 0x18; sp24 = temp_a1; - if (!(func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9A28) < 0.0f)) { + if (!(func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9A28) < 0.0f)) { temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; temp_v0->unk4 = 0x200; @@ -5743,7 +5743,7 @@ void func_802A27A0(void *arg0, ? *arg1, void *arg2, u16 arg3) { f32 phi_f2; if (D_800DC50C != 9) { - temp_f0 = func_802B80D0(arg2 + 0x18, arg0->unk26, 0x43480000, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9A2C); + temp_f0 = func_802B80D0(arg2 + 0x18, arg0->unk26, 0x43480000, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9A2C); phi_f2 = temp_f0; if (temp_f0 < 0.0f) { return; @@ -5822,7 +5822,7 @@ void func_802A29BC(void *arg0, ? arg1, void *arg2) { temp_a1 = arg2 + 0x18; if ((arg2->unk2 & 0x800) == 0) { sp28 = temp_a1; - if (!(func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9A34) < 0.0f)) { + if (!(func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9A34) < 0.0f)) { temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; temp_v0->unk4 = 0x200; @@ -5874,7 +5874,7 @@ void func_802A2AD0(void *arg0, void *arg1) { sp80.unk4 = D_802B8864.unk4; temp_a1 = arg1 + 0x18; sp20 = temp_a1; - if (!(func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9A38) < 0.0f)) { + if (!(func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9A38) < 0.0f)) { func_802B5F74(&sp40, temp_a1, arg1 + 0x10); if (func_802B4FF8(&sp40, 0) != 0) { temp_v0 = gDisplayListHead; @@ -5960,7 +5960,7 @@ void func_802A2C78(void *arg0, ? arg1, void *arg2) { spA8.unk4 = D_802B886C.unk4; temp_v0 = arg2->unk2; temp_a1 = arg2 + 0x18; - if (((temp_v0 & 0x800) == 0) && (sp20 = temp_a1, sp62 = temp_v0, temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - D_800DDB40) / 0xB8], D_802B9A3C), !(temp_f0 < 0.0f))) { + if (((temp_v0 & 0x800) == 0) && (sp20 = temp_a1, sp62 = temp_v0, temp_f0 = func_802B80D0(temp_a1, arg0->unk26, 0, (&D_80150130)[(arg0 - camera1) / 0xB8], D_802B9A3C), !(temp_f0 < 0.0f))) { if (((temp_v0 & 0x400) == 0) && (temp_f0 < D_802B9A40)) { func_8029794C(sp20, arg2 + 0x10, 0x40000000); } diff --git a/src/code_802A3730.c b/src/code_802A3730.c index e952f7e95..b8b133124 100644 --- a/src/code_802A3730.c +++ b/src/code_802A3730.c @@ -1,773 +1,495 @@ #include #include +#include +#include +#include +#include +#include +#include -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; +void func_802A41D4(); -void func_802A3730(void *arg0) { - s16 temp_t6; - s16 temp_t7; - s16 temp_t8; - s16 temp_t9; - s32 temp_a0; - s32 temp_t6_2; - s32 temp_v0; - void *temp_t0; - void *temp_t0_2; - s32 phi_a0; - s32 phi_v0; +extern Gfx *gDisplayListHead; - temp_t6 = arg0->unk2C * 2; - temp_t7 = arg0->unk2E * 2; - temp_t8 = arg0->unk30 * 4; - arg0->unk10 = temp_t6; - arg0->unk12 = temp_t7; - arg0->unk18 = temp_t8; - temp_t9 = arg0->unk32 * 4; - arg0->unk1A = temp_t9; - arg0->unk14 = 0x1FF; - arg0->unk16 = 0; - arg0->unk1C = 0x1FF; - arg0->unk1E = 0; - temp_t0 = gDisplayListHead; - gDisplayListHead = temp_t0 + 8; - temp_t0->unk0 = 0x3800010; - temp_t0->unk4 = (arg0 + 0x10) & 0x1FFFFFFF; - temp_a0 = (temp_t8 / 4) + (temp_t6 / 4); - phi_a0 = temp_a0; - if (temp_a0 >= 0x141) { - phi_a0 = 0x140; - } - temp_v0 = (temp_t9 / 4) + (temp_t7 / 4); - phi_v0 = temp_v0; - if (temp_v0 >= 0xF1) { - phi_v0 = 0xF0; - } - temp_t0_2 = gDisplayListHead; - gDisplayListHead = temp_t0_2 + 8; - temp_t6_2 = (0.0f * 4.0f) & 0xFFF; - temp_t0_2->unk0 = (temp_t6_2 << 0xC) | 0xED000000 | temp_t6_2; - temp_t0_2->unk4 = (((phi_a0 * 4.0f) & 0xFFF) << 0xC) | ((phi_v0 * 4.0f) & 0xFFF); -} -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A3730.s") -#endif +extern struct UnkStruct_800DC5EC *D_800DC5EC; +extern struct UnkStruct_800DC5EC *D_800DC5F0; +extern struct UnkStruct_800DC5EC *D_800DC5F4; +extern struct UnkStruct_800DC5EC *D_800DC5F8; -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_802A3E3C(); // extern -? func_802A41D4(); // extern +extern u16 D_800DC5B0; + +void func_802A3E3C(); extern s32 D_800DC524; extern s16 D_800DC5C0; extern u16 D_800DC5C4; extern s32 D_800E86A0; extern s32 D_800E86A4; extern s32 D_80150124; -extern void *gDisplayListHead; + +extern s32 D_801502B4; +extern uintptr_t *gPhysicalFramebuffers[]; +extern u16 sRenderingFramebuffer; + + +Vp D_802B8880[] = { + {640, 480, 511, 0, + 640, 480, 511, 0}, +}; + +Vtx D_802B8890[] = { + { SCREEN_WIDTH, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, + { SCREEN_WIDTH, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, +}; + +Vtx D_802B8910[] = { + { SCREEN_WIDTH, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, + { SCREEN_WIDTH, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, +}; + +Vtx D_802B8990[] = { + { SCREEN_WIDTH, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, + { SCREEN_WIDTH, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, +}; + +Vtx D_802B8A10[] = { + { SCREEN_WIDTH, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x1E, 0x1E, 0xFF, 0xFF}, + { 0, SCREEN_HEIGHT, -1, 0, 0, 0, 0xC8, 0xC8, 0xFF, 0xFF}, + { SCREEN_WIDTH, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, + { SCREEN_WIDTH, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 0, -1, 0, 0, 0, 0x78, 0xFF, 0x78, 0xFF}, + { 0, 120, -1, 0, 0, 0, 0x00, 0xDC, 0x00, 0xFF}, +}; + +void func_802A3730(struct UnkStruct_800DC5EC *arg0) { + s32 ulx; + s32 uly; + s32 lrx; + s32 lry; + s32 screenWidth = arg0->screenWidth * 2; + s32 screenHeight = arg0->screenHeight * 2; + s32 screenStartX = arg0->screenStartX * 4; + s32 screenStartY = arg0->screenStartY * 4; + + arg0->viewport.vp.vscale[0] = screenWidth; + arg0->viewport.vp.vscale[1] = screenHeight; + arg0->viewport.vp.vscale[2] = 511; + arg0->viewport.vp.vscale[3] = 0; + + arg0->viewport.vp.vtrans[0] = screenStartX; + arg0->viewport.vp.vtrans[1] = screenStartY; + arg0->viewport.vp.vtrans[2] = 511; + arg0->viewport.vp.vtrans[3] = 0; + + gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&arg0->viewport)); + + screenWidth /= 4; + screenHeight /= 4; + + screenStartX /= 4; + screenStartY /= 4; + + lrx = screenStartX + screenWidth; + if (lrx > SCREEN_WIDTH) { + lrx = SCREEN_WIDTH; + } + + lry = screenStartY + screenHeight; + if (lry > SCREEN_HEIGHT) { + lry = SCREEN_HEIGHT; + } + ulx = 0; + uly = 0; + + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); +} + +UNUSED void func_802A38AC(void) { + +} void func_802A38B4(void) { s32 temp_v0_3; - u16 temp_a2; void *temp_v0; void *temp_v0_2; func_802A3E3C(); func_802A41D4(); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0; - temp_v0->unk0 = 0xE9000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0; - temp_v0_2->unk0 = 0xB8000000; - temp_a2 = D_800DC5C4; - if (temp_a2 != 0) { - D_800DC5C4 = temp_a2 - 1; + + gDPFullSync(gDisplayListHead++); + gSPEndDisplayList(gDisplayListHead++); + + if (D_800DC5C4 != 0) { + D_800DC5C4--; return; } - temp_v0_3 = D_80150124; - D_800DC524 = temp_v0_3; - D_800DC50C = 0xFF; + D_800DC524 = D_80150124; + D_800DC50C = 255; D_800DC5C0 = 0; D_800DC5C4 = 0; D_800E86A4 = 1; - if (temp_v0_3 != 0) { - if (temp_v0_3 != 1) { - if (temp_v0_3 != 2) { - if (temp_v0_3 != 3) { - return; - } - D_800E86A0 = 0xD; - // Duplicate return node #12. Try simplifying control flow for better match - return; + + switch(D_80150124) { + case 0: + if (D_800E86A0 != 8) { + D_800E86A0 = 10; } - D_800E86A0 = 0xC; - return; - } - D_800E86A0 = 0xB; - return; - } - if (D_800E86A0 != 8) { - D_800E86A0 = 0xA; + break; + case 1: + D_800E86A0 = 11; + break; + case 2: + D_800E86A0 = 12; + break; + case 3: + D_800E86A0 = 13; + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A38B4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_801502B4; -extern void *gDisplayListHead; -extern ? gPhysicalFramebuffers; -extern u16 sRenderingFramebuffer; +void func_802A39E0(struct UnkStruct_800DC5EC *arg0) { + s32 ulx = arg0->screenStartX - (arg0->screenWidth / 2); + s32 uly = arg0->screenStartY - (arg0->screenHeight / 2); + s32 lrx = arg0->screenStartX + (arg0->screenWidth / 2); + s32 lry = arg0->screenStartY + (arg0->screenHeight / 2); -void func_802A39E0(void *arg0) { - s16 temp_a1; - s16 temp_v0; - s32 temp_s0; - s32 temp_s1; - s32 temp_t3; - s32 temp_t4; - s32 temp_t6; - s32 temp_t7; - void *temp_v0_10; - void *temp_v0_11; - void *temp_v0_12; - void *temp_v0_13; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; - void *temp_v0_9; - s32 phi_s0; - s32 phi_t3; - s32 phi_s1; - s32 phi_t4; - s32 phi_t3_2; - s32 phi_t4_2; + if (ulx < 0) { + ulx = 0; + } + if (uly < 0) { + uly = 0; + } + if (lrx > SCREEN_WIDTH) { + lrx = SCREEN_WIDTH; + } + if (lry > SCREEN_HEIGHT) { + lry = SCREEN_HEIGHT; + } + if (ulx >= lrx) { + lrx = ulx + 2; + } + if (uly >= lry) { + lry = uly + 2; + } - temp_v0 = arg0->unk30; - temp_t6 = arg0->unk2C / 2; - temp_a1 = arg0->unk32; - temp_s0 = temp_v0 - temp_t6; - temp_t7 = arg0->unk2E / 2; - temp_t3 = temp_v0 + temp_t6; - temp_s1 = temp_a1 - temp_t7; - temp_t4 = temp_a1 + temp_t7; - phi_s0 = temp_s0; - phi_t3 = temp_t3; - phi_s1 = temp_s1; - phi_t4 = temp_t4; - if (temp_s0 < 0) { - phi_s0 = 0; - } - if (temp_s1 < 0) { - phi_s1 = 0; - } - if (temp_t3 >= 0x141) { - phi_t3 = 0x140; - } - phi_t3_2 = phi_t3; - if (temp_t4 >= 0xF1) { - phi_t4 = 0xF0; - } - phi_t4_2 = phi_t4; - if (phi_s0 >= phi_t3) { - phi_t3_2 = phi_s0 + 2; - } - if (phi_s1 >= phi_t4) { - phi_t4_2 = phi_s1 + 2; - } - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0; - temp_v0_2->unk0 = 0xE7000000; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0x300000; - temp_v0_3->unk0 = 0xBA001402; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xFE000000; - temp_v0_4->unk4 = D_801502B4; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0xFF10013F; - temp_v0_5->unk4 = D_801502B4; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0xF7000000; - temp_v0_6->unk4 = 0xFFFCFFFC; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_7->unk4 = 0; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk0 = (((phi_s0 * 4.0f) & 0xFFF) << 0xC) | 0xED000000 | ((phi_s1 * 4.0f) & 0xFFF); - temp_v0_8->unk4 = (((phi_t3_2 * 4.0f) & 0xFFF) << 0xC) | ((phi_t4_2 * 4.0f) & 0xFFF); - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->unk0 = (((phi_t3_2 - 1) & 0x3FF) << 0xE) | 0xF6000000 | (((phi_t4_2 - 1) & 0x3FF) * 4); - temp_v0_9->unk4 = ((phi_s0 & 0x3FF) << 0xE) | ((phi_s1 & 0x3FF) * 4); - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->unk4 = 0; - temp_v0_10->unk0 = 0xE7000000; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->unk0 = 0xFF10013F; - temp_v0_11->unk4 = *(&gPhysicalFramebuffers + (sRenderingFramebuffer * 4)) & 0x1FFFFFFF; - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->unk4 = 0; - temp_v0_12->unk0 = 0xBA001402; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->unk4 = 0; - temp_v0_13->unk0 = 0xB9000201; + gDPPipeSync(gDisplayListHead++); + gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetDepthImage(gDisplayListHead++, D_801502B4); + gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_801502B4); + gDPSetFillColor(gDisplayListHead++, 0xFFFCFFFC); + gDPPipeSync(gDisplayListHead++); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + + gDPFillRectangle(gDisplayListHead++, ulx, uly, lrx - 1, lry -1); + + gDPPipeSync(gDisplayListHead++); + gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(gPhysicalFramebuffers[sRenderingFramebuffer])); // 0x1FFFFFFF + gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); + gDPSetDepthSource(gDisplayListHead++, G_ZS_PIXEL); } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A39E0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_801502B4; -extern void *gDisplayListHead; -extern ? gPhysicalFramebuffers; -extern u16 sRenderingFramebuffer; void func_802A3CB0(void) { - void *temp_v0; - void *temp_v0_10; - void *temp_v0_11; - void *temp_v0_12; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; - void *temp_v0_9; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0; - temp_v0->unk0 = 0xE7000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0x300000; - temp_v0_2->unk0 = 0xBA001402; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xFE000000; - temp_v0_3->unk4 = D_801502B4; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xFF10013F; - temp_v0_4->unk4 = D_801502B4; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = 0xFFFCFFFC; - temp_v0_5->unk0 = 0xF7000000; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0; - temp_v0_6->unk0 = 0xE7000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0x5003C0; - temp_v0_7->unk0 = 0xED000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk4 = 0; - temp_v0_8->unk0 = 0xF64FC3BC; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->unk4 = 0; - temp_v0_9->unk0 = 0xE7000000; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->unk0 = 0xFF10013F; - temp_v0_10->unk4 = *(&gPhysicalFramebuffers + (sRenderingFramebuffer * 4)) & 0x1FFFFFFF; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->unk4 = 0; - temp_v0_11->unk0 = 0xBA001402; - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->unk4 = 0; - temp_v0_12->unk0 = 0xB9000201; + gDPPipeSync(gDisplayListHead++); + gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetDepthImage(gDisplayListHead++, D_801502B4); + gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, D_801502B4); + gDPSetFillColor(gDisplayListHead++, 0xFFFCFFFC); + gDPPipeSync(gDisplayListHead++); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPFillRectangle(gDisplayListHead++, 0, 0, 319, 239); + gDPPipeSync(gDisplayListHead++); + gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(gPhysicalFramebuffers[sRenderingFramebuffer])); + gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); + gDPSetDepthSource(gDisplayListHead++, G_ZS_PIXEL); } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A3CB0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; void func_802A3E3C(void) { - void *temp_v0; - void *temp_v0_10; - void *temp_v0_11; - void *temp_v0_12; - void *temp_v0_13; - void *temp_v0_14; - void *temp_v0_15; - void *temp_v0_16; - void *temp_v0_17; - void *temp_v0_18; - void *temp_v0_19; - void *temp_v0_20; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; - void *temp_v0_9; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0; - temp_v0->unk0 = 0xE7000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0x800000; - temp_v0_2->unk0 = 0xBA001701; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xED000000; - temp_v0_3->unk4 = 0x5003C0; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0xFFFE793C; - temp_v0_4->unk0 = 0xFCFFFFFF; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xBA001001; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0; - temp_v0_6->unk0 = 0xBA000E02; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0; - temp_v0_7->unk0 = 0xBA001102; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk4 = 0x80000; - temp_v0_8->unk0 = 0xBA001301; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->unk4 = 0x2000; - temp_v0_9->unk0 = 0xBA000C02; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->unk4 = 0xC00; - temp_v0_10->unk0 = 0xBA000903; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->unk4 = 0; - temp_v0_11->unk0 = 0xBA000801; - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->unk4 = 0; - temp_v0_12->unk0 = 0xB9000002; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->unk4 = 0xF0A4000; - temp_v0_13->unk0 = 0xB900031D; - temp_v0_14 = gDisplayListHead; - gDisplayListHead = temp_v0_14 + 8; - temp_v0_14->unk4 = 0; - temp_v0_14->unk0 = 0xC0000000; - temp_v0_15 = gDisplayListHead; - gDisplayListHead = temp_v0_15 + 8; - temp_v0_15->unk4 = 0xC0; - temp_v0_15->unk0 = 0xBA000602; - temp_v0_16 = gDisplayListHead; - gDisplayListHead = temp_v0_16 + 8; - temp_v0_16->unk4 = 0; - temp_v0_16->unk0 = 0xE7000000; - temp_v0_17 = gDisplayListHead; - gDisplayListHead = temp_v0_17 + 8; - temp_v0_17->unk4 = 1; - temp_v0_17->unk0 = 0xBC000404; - temp_v0_18 = gDisplayListHead; - gDisplayListHead = temp_v0_18 + 8; - temp_v0_18->unk4 = 1; - temp_v0_18->unk0 = 0xBC000C04; - temp_v0_19 = gDisplayListHead; - gDisplayListHead = temp_v0_19 + 8; - temp_v0_19->unk4 = 0xFFFF; - temp_v0_19->unk0 = 0xBC001404; - temp_v0_20 = gDisplayListHead; - gDisplayListHead = temp_v0_20 + 8; - temp_v0_20->unk4 = 0xFFFF; - temp_v0_20->unk0 = 0xBC001C04; + gDPPipeSync(gDisplayListHead++); + gDPPipelineMode(gDisplayListHead++, G_PM_1PRIMITIVE); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE); + gDPSetTextureLOD(gDisplayListHead++, G_TL_TILE); + gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE); + gDPSetTextureDetail(gDisplayListHead++, G_TD_CLAMP); + gDPSetTexturePersp(gDisplayListHead++, G_TP_PERSP); + gDPSetTextureFilter(gDisplayListHead++, G_TF_BILERP); + gDPSetTextureConvert(gDisplayListHead++, G_TC_FILT); + gDPSetCombineKey(gDisplayListHead++, G_CK_NONE); + gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); + gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gDPNoOp(gDisplayListHead++); + gDPSetColorDither(gDisplayListHead++, G_CD_DISABLE); + gDPPipeSync(gDisplayListHead++); + gSPClipRatio(gDisplayListHead++); + // FRUSTRATIO_1 } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A3E3C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_802B8880; -extern void *gDisplayListHead; +UNUSED void func_802A40A4(void) {} +UNUSED void func_802A40AC(void) {} +UNUSED void func_802A40B4(void) {} +UNUSED void func_802A40BC(void) {} +UNUSED void func_802A40C4(void) {} +UNUSED void func_802A40CC(void) {} +UNUSED void func_802A40D4(void) {} +UNUSED void func_802A40DC(void) {} + +UNUSED s32 func_802A40E4(void) { + gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_800DC5EC->viewport)); + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | + G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH | G_CLIPPING); +} void func_802A4160(void) { - void *temp_v1; - void *temp_v1_2; - void *temp_v1_3; + gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_802B8880)); + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk4 = &D_802B8880 & 0x1FFFFFFF; - temp_v1->unk0 = 0x3800010; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk4 = -1; - temp_v1_2->unk0 = 0xB6000000; - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->unk4 = 0x2204; - temp_v1_3->unk0 = 0xB7000000; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A4160.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s32 D_800DC5D0; extern s32 D_800DC5D4; extern s32 D_800DC5D8; -extern void *gDisplayListHead; -extern ? gPhysicalFramebuffers; -extern u16 sRenderingFramebuffer; + void func_802A41D4(void) { - s32 temp_t9; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xFF10013F; - temp_v0->unk4 = *(&gPhysicalFramebuffers + (sRenderingFramebuffer * 4)) & 0x1FFFFFFF; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xF7000000; - temp_t9 = ((D_800DC5D0 << 8) & 0xF800) | ((D_800DC5D4 * 8) & 0x7C0) | ((D_800DC5D8 >> 2) & 0x3E) | 1; - temp_v0_2->unk4 = (temp_t9 << 0x10) | temp_t9; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE7000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0x5003C0; - temp_v0_4->unk0 = 0xED000000; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = 0; - temp_v0_5->unk0 = 0xF64FC3BC; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0; - temp_v0_6->unk0 = 0xE7000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0; - temp_v0_7->unk0 = 0xBA001402; + gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(gPhysicalFramebuffers[sRenderingFramebuffer])); + gDPSetFillColor(gDisplayListHead++, ((D_800DC5D0 << 8 & 0xF800 | (D_800DC5D4 * 8) & 0x7C0 | D_800DC5D8 >> 2 & 0x3E | 1) << 16) | + (D_800DC5D0 << 8 & 0xF800 | (D_800DC5D4 * 8) & 0x7C0 | (D_800DC5D8 >> 2) & 0x3E | 1)); + gDPPipeSync(gDisplayListHead++); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPFillRectangle(gDisplayListHead++, 0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1); + gDPPipeSync(gDisplayListHead++); + gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A41D4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern u16 D_800DC5B0; -extern ? D_802B8880; -extern void *gDisplayListHead; -extern ? gPhysicalFramebuffers; -extern u16 sRenderingFramebuffer; void func_802A4300(void) { - s32 temp_t3; - void *temp_v0; - void *temp_v0_10; - void *temp_v0_11; - void *temp_v0_12; - void *temp_v0_13; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; - void *temp_v0_9; - if ((D_800DC52C != 0) && (D_800DC5B0 == 0)) { - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0; - temp_v0->unk0 = 0xE7000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0x300000; - temp_v0_2->unk0 = 0xBA001402; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xFF10013F; - temp_v0_3->unk4 = *(&gPhysicalFramebuffers + (sRenderingFramebuffer * 4)) & 0x1FFFFFFF; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0x10001; - temp_v0_4->unk0 = 0xF7000000; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = &D_802B8880 & 0x1FFFFFFF; - temp_v0_5->unk0 = 0x3800010; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0xED000000; - temp_v0_6->unk4 = 0x5003C0; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_t3 = D_800DC52C; - if (temp_t3 != 1) { - if (temp_t3 != 2) { - if (temp_t3 != 3) { - - } else { - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk0 = 0xF627C3BC; - temp_v0_8->unk4 = 0x274000; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->unk4 = 0x1DC; - temp_v0_9->unk0 = 0xF64FC1E4; - } - } else { - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->unk0 = 0xF627C3BC; - temp_v0_10->unk4 = 0x274000; - } - } else { - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->unk4 = 0x1DC; - temp_v0_11->unk0 = 0xF64FC1E4; - } - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->unk4 = 0; - temp_v0_12->unk0 = 0xE7000000; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->unk4 = 0; - temp_v0_13->unk0 = 0xBA001402; - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A4300.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_801625EC; -extern ? D_801625F0; -extern ? D_801625F4; -extern ? D_802B8BCC; -extern ? sSkyColors; - -void func_802A450C(void *arg0) { - s32 temp_a0; - s32 temp_v0; - s32 temp_v0_2; - s32 temp_v1; - void *temp_v1_2; - s32 phi_v0; - s32 phi_v1; - s32 phi_a0; - void *phi_v1_2; - s32 phi_v0_2; - - if (D_800DC5BC != 0) { - temp_v0 = D_801625EC.unk0; - phi_v0 = temp_v0; - if (temp_v0 < 0) { - D_801625EC.unk0 = 0; - phi_v0 = 0; - } - temp_v1 = D_801625F4.unk0; - phi_v1 = temp_v1; - if (temp_v1 < 0) { - D_801625F4.unk0 = 0; - phi_v1 = 0; - } - temp_a0 = D_801625F0.unk0; - phi_a0 = temp_a0; - if (temp_a0 < 0) { - D_801625F0.unk0 = 0; - phi_a0 = 0; - } - if (phi_v0 >= 0x100) { - D_801625EC.unk0 = 0xFF; - } - if (phi_v1 >= 0x100) { - D_801625F4.unk0 = 0xFF; - } - phi_v1_2 = arg0; - if (phi_a0 >= 0x100) { - D_801625F0.unk0 = 0xFF; - } - phi_v0_2 = 0; - do { - temp_v0_2 = phi_v0_2 + 4; - temp_v1_2 = phi_v1_2 + 0x40; - temp_v1_2->unk-34 = D_801625EC.unk2; - temp_v1_2->unk-33 = D_801625F4.unk2; - temp_v1_2->unk-32 = D_801625F0.unk2; - temp_v1_2->unk-24 = D_801625EC.unk2; - temp_v1_2->unk-23 = D_801625F4.unk2; - temp_v1_2->unk-22 = D_801625F0.unk2; - temp_v1_2->unk-14 = D_801625EC.unk2; - temp_v1_2->unk-13 = D_801625F4.unk2; - temp_v1_2->unk-12 = D_801625F0.unk2; - temp_v1_2->unk-4 = D_801625EC.unk2; - temp_v1_2->unk-3 = D_801625F4.unk2; - temp_v1_2->unk-2 = D_801625F0.unk2; - phi_v1_2 = temp_v1_2; - phi_v0_2 = temp_v0_2; - } while (temp_v0_2 != 8); + if ( D_800DC52C == 0) { + return; + } + if (D_800DC5B0 != 0) { return; } - arg0->unkC = *(&sSkyColors + (gCurrentCourseId * 0xC)); - arg0->unkD = (&sSkyColors + (gCurrentCourseId * 0xC))->unk2; - arg0->unkE = (&sSkyColors + (gCurrentCourseId * 0xC))->unk4; - arg0->unk1C = (&sSkyColors + (gCurrentCourseId * 0xC))->unk6; - arg0->unk1D = (&sSkyColors + (gCurrentCourseId * 0xC))->unk8; - arg0->unk1E = (&sSkyColors + (gCurrentCourseId * 0xC))->unkA; - arg0->unk2C = (&sSkyColors + (gCurrentCourseId * 0xC))->unk6; - arg0->unk2D = (&sSkyColors + (gCurrentCourseId * 0xC))->unk8; - arg0->unk2E = (&sSkyColors + (gCurrentCourseId * 0xC))->unkA; - arg0->unk3C = *(&sSkyColors + (gCurrentCourseId * 0xC)); - arg0->unk3D = (&sSkyColors + (gCurrentCourseId * 0xC))->unk2; - arg0->unk3E = (&sSkyColors + (gCurrentCourseId * 0xC))->unk4; - arg0->unk4C = *(&D_802B8BCC + (gCurrentCourseId * 0xC)); - arg0->unk4D = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk2; - arg0->unk4E = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk4; - arg0->unk5C = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk6; - arg0->unk5D = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk8; - arg0->unk5E = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unkA; - arg0->unk6C = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk6; - arg0->unk6D = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk8; - arg0->unk6E = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unkA; - arg0->unk7C = *(&D_802B8BCC + (gCurrentCourseId * 0xC)); - arg0->unk7D = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk2; - arg0->unk7E = (&D_802B8BCC + (gCurrentCourseId * 0xC))->unk4; + + gDPPipeSync(gDisplayListHead++); + gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(gPhysicalFramebuffers[sRenderingFramebuffer])); + gDPSetFillColor(gDisplayListHead++, 0x00010001); + gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_802B8880)); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPPipeSync(gDisplayListHead++); + + switch(D_800DC52C) { + case 2: + gDPFillRectangle(gDisplayListHead++, 157, 0, 159, 239); + break; + case 1: + gDPFillRectangle(gDisplayListHead++, 0, 119, 319, 121); + break; + case 3: + gDPFillRectangle(gDisplayListHead++, 157, 0, 159, 239); + gDPFillRectangle(gDisplayListHead++, 0, 119, 319, 121); + break; + } + gDPPipeSync(gDisplayListHead++); + gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); + } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A450C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_802A3E3C(); // extern -extern ? D_0D008E98; -extern void *gDisplayListHead; +extern s32 D_801625EC; +extern s32 D_801625F0; +extern s32 D_801625F4; -void func_802A487C(s32 arg0, ? arg1, ? arg2, ? arg3) { - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; +struct Skybox { + s16 unk0; + s16 unk2; + s16 unk4; + s16 unk6; + s16 unk8; + s16 unkA; +}; + +// unreferenced F3D. Perhaps goes in an unused func? +s32 D_802B8A90[] = { + 0xe7000000, 0x00000000, 0xb900031d, 0x0f0a4000, + 0xba001402, 0x00300000, 0xf7000000, 0x00000000, + 0xf64fc3bc, 0x00000000, 0xe7000000, 0x00000000, + 0xba001402, 0x00000000, 0xb8000000, 0x00000000, +}; + +struct Skybox sSkyColors[21] = { + {128, 4280, 6136, 216, 7144, 32248}, + {255, 255, 255, 255, 255, 255}, + {48, 1544, 49528, 0, 0, 0}, + {0, 0, 0, 0, 0, 0}, + {113, 70, 255, 255, 184, 99}, + {28, 11, 90, 0, 99, 164}, + {48, 1688, 54136, 216, 7144, 32248}, + {238, 144, 255, 255, 224, 240}, + {128, 4280, 6136, 216, 7144, 32248}, + {0, 18, 255, 197, 211, 255}, + {0, 2, 94, 209, 65, 23}, + {195, 231, 255, 255, 0xc0, 0}, + {128, 4280, 6136, 216, 7144, 32248}, + {0, 0, 0, 0, 0, 0}, + {20, 30, 56, 40, 60, 110}, + {128, 4280, 6136, 216, 7144, 32248}, + {0, 0, 0, 0, 0, 0}, + {113, 70, 255, 255, 184, 99}, + {255, 174, 0, 255, 229, 124}, + {0, 0, 0, 0, 0, 0}, + {238, 144, 255, 255, 224, 240}, +}; + +struct Skybox D_802B8BCC[21] = { + {0, 0, 0, 0, 0, 0}, + {255, 255, 255, 255, 255, 255}, + {0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0}, + {95, 40, 15, 0, 0, 0}, + {0, 99, 164, 0, 0, 0}, + {48, 1688, 54136, 0, 0, 0}, + {255, 224, 240, 0, 0, 0}, + {216, 7144, 32248, 0, 0, 0}, + {255, 184, 99, 0, 0, 0}, + {209, 65, 23, 0, 0, 0}, + {255, 192, 0, 0, 0, 0}, + {216, 7144, 32248, 128, 4280, 6136}, + {0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0}, + {216, 7144, 32248, 0, 0, 0}, + {0, 0, 0, 0, 0, 0}, + {255, 224, 240, 0, 0, 0}, + {22, 145, 22, 0, 0, 0}, + {0, 0, 0, 0, 0, 0}, + {255, 224, 240, 0, 0, 0}, +}; +extern u16 D_800DC5BC; + +void func_802A450C(Vtx *skybox) { + s32 i; + + if (D_800DC5BC != 0) { + + if (D_801625EC < 0) { + D_801625EC = 0; + } + + if (D_801625F4 < 0) { + D_801625F4 = 0; + } + + if (D_801625F0 < 0) { + D_801625F0 = 0; + } + + if (D_801625EC > 255) { + D_801625EC = 255; + } + + if (D_801625F4 > 255) { + D_801625F4 = 255; + } + + if (D_801625F0 > 255) { + D_801625F0 = 255; + } + + for (i = 0; i < 8; i++) { + + skybox[i].v.cn[0] = (s16) D_801625EC; + skybox[i].v.cn[1] = (s16) D_801625F4; + skybox[i].v.cn[2] = (s16) D_801625F0; + } + return; + } + skybox[0].v.cn[0] = sSkyColors[gCurrentCourseId].unk0; + skybox[0].v.cn[1] = sSkyColors[gCurrentCourseId].unk2; + skybox[0].v.cn[2] = sSkyColors[gCurrentCourseId].unk4; + skybox[1].v.cn[0] = sSkyColors[gCurrentCourseId].unk6; + skybox[1].v.cn[1] = sSkyColors[gCurrentCourseId].unk8; + skybox[1].v.cn[2] = sSkyColors[gCurrentCourseId].unkA; + skybox[2].v.cn[0] = sSkyColors[gCurrentCourseId].unk6; + skybox[2].v.cn[1] = sSkyColors[gCurrentCourseId].unk8; + skybox[2].v.cn[2] = sSkyColors[gCurrentCourseId].unkA; + skybox[3].v.cn[0] = sSkyColors[gCurrentCourseId].unk0; + skybox[3].v.cn[1] = sSkyColors[gCurrentCourseId].unk2; + skybox[3].v.cn[2] = sSkyColors[gCurrentCourseId].unk4; + skybox[4].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk0; + skybox[4].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk2; + skybox[4].v.cn[2] = D_802B8BCC[gCurrentCourseId].unk4; + skybox[5].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk6; + skybox[5].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk8; + skybox[5].v.cn[2] = D_802B8BCC[gCurrentCourseId].unkA; + skybox[6].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk6; + skybox[6].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk8; + skybox[6].v.cn[2] = D_802B8BCC[gCurrentCourseId].unkA; + skybox[7].v.cn[0] = D_802B8BCC[gCurrentCourseId].unk0; + skybox[7].v.cn[1] = D_802B8BCC[gCurrentCourseId].unk2; + skybox[7].v.cn[2] = D_802B8BCC[gCurrentCourseId].unk4; +} + +extern Mtx *D_0D008E98; +extern struct GfxPool *gGfxPool; + +void func_802A487C(Vtx *arg0, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s32 arg3, UNUSED s32 arg4) { func_802A3E3C(); - if (gCurrentCourseId != 0xD) { - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xB900031D; - temp_v0->unk4 = 0xF0A4000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB6000000; - temp_v0_2->unk4 = 0x20001; - guOrtho(gGfxPool, 0.0f, 320.0f, 0.0f, 240.0f, 0.0f, 5.0f, 1.0f); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0xFFFF; - temp_v0_3->unk0 = 0xB4000000; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1030040; - temp_v0_4->unk4 = gGfxPool & 0x1FFFFFFF; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = &D_0D008E98 & 0x1FFFFFFF; - temp_v0_5->unk0 = 0x1020040; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x400103F; - temp_v0_6->unk4 = arg0 + 0x40; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0x20604; - temp_v0_7->unk0 = 0xB1000602; + if (gCurrentCourseId != COURSE_RAINBOW_ROAD) { + + gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gSPClearGeometryMode(gDisplayListHead++, G_ZBUFFER | G_LIGHTING); + guOrtho((Mtx *)&gGfxPool->buffer, 0.0f, 320.0f, 0.0f, 240.0f, 0.0f, 5.0f, 1.0f); + gDPHalf1(gDisplayListHead++, 0xFFFF); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(gDisplayListHead++, &arg0[4], 4, 0); + gSP2Triangles(gDisplayListHead++, 0, 3, 1, 0, 1, 3, 2, 0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A487C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_802A3E3C(); // extern -? func_802A450C(); // extern -? func_802B5564(? *, ? *, s32, s32, f32, f32, f32); // extern -? func_802B5794(? *, void *, void *); // extern -? func_802B6434(f32 *, ? *); // extern -? func_802B71CC(? *, ? *, ? *); // extern -extern ? D_0D008E98; +//? func_802A3E3C(); // extern +//? func_802A450C(); // extern +//? func_802B5564(? *, ? *, s32, s32, f32, f32, f32); // extern +//? func_802B5794(? *, void *, void *); // extern +//? func_802B6434(f32 *, ? *); // extern +//? func_802B71CC(? *, ? *, ? *); // extern + extern s32 D_80150148; extern f32 D_8015014C; extern f32 D_80150150; extern f32 D_802B9BB0; -extern void *gDisplayListHead; +// gControllers +void func_802A4A0C(Vtx *arg0, struct UnkStruct_800DC5EC *arg1, s32 arg2, s32 arg3) { + Camera *sp13C = arg1->camera; + s32 sp128; + s32 spE8; + s32 spA8; + s32 sp68; -void func_802A4A0C(void *arg0, void *arg1, ? arg2, ? arg3) { - void *sp13C; - ? sp128; - ? spE8; - ? spA8; - ? sp68; f32 sp64; f32 sp60; f32 sp5C; @@ -778,23 +500,14 @@ void func_802A4A0C(void *arg0, void *arg1, ? arg2, ? arg3) { f32 temp_f18; f32 temp_f6; s16 temp_t5; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; - void *temp_v0_9; - sp13C = arg1->unk4; - func_802A450C(); + func_802A450C(arg0); sp64 = D_802B9BB0; sp5C = 0.0f; sp60 = 0.0f; - func_802B5564(&spE8, &sp128, sp13C->unkB4, D_80150148, D_80150150, D_8015014C, 1.0f); - func_802B5794(&spA8, sp13C, sp13C + 0xC); + + func_802B5564(&spE8, &sp128, sp13C->unk30, D_80150148, D_80150150, D_8015014C, 1.0f); + func_802B5794(&spA8, sp13C, sp13C->unk); func_802B71CC(&sp68, &spE8, &spA8); sp58 = spA4 + ((sp74 * sp5C) + (sp84 * sp60) + (sp94 * sp64)); func_802B6434(&sp5C, &sp68); @@ -808,6 +521,112 @@ void func_802A4A0C(void *arg0, void *arg1, ? arg2, ? arg3) { sp5C = temp_f10; sp60 = temp_f16; temp_t5 = 0x78 - temp_f16; + arg1->pathCounter = temp_t5; + arg0->v.ob[0] = temp_t5;//->unk12 = temp_t5; + arg0->v.ob[1] = temp_t5; // = temp_t5; //unk22 + arg0->v.ob[4] = temp_t5;//unk42 = temp_t5; + arg0->v.ob[7] = temp_t5;//unk72 = temp_t5; + func_802A3E3C(); + + gDPSetRenderMode(gDisplayListHead++, G_RM_OPA_SURF, G_RM_OPA_SURF2); + gSPClearGeometryMode(gDisplayListHead++, G_ZBUFFER | G_LIGHTING); + guOrtho(&gGfxPool->buffer, 0.0f, 320.0f, 0.0f, 240.0f, 0.0f, 5.0f, 1.0f); + gDPHalf1(gDisplayListHead++, 0xFFFF); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPVertex(gDisplayListHead++, &arg0, 4, 0); + gSP2Triangles(gDisplayListHead++, 0, 3, 1, 0, 1, 3, 2, 0); + +/* + temp_v0->unk0 = 0xB900031D; + temp_v0->unk4 = 0xF0A4000; + + temp_v0_2->unk0 = 0xB6000000; + temp_v0_2->unk4 = 0x20001; + + guOrtho(gGfxPool, 0.0f, 320.0f, 0.0f, 240.0f, 0.0f, 5.0f, 1.0f); + + temp_v0_3->unk4 = 0xFFFF; + temp_v0_3->unk0 = 0xB4000000; + + temp_v0_4->unk0 = 0x1030040; + temp_v0_4->unk4 = gGfxPool & 0x1FFFFFFF; + temp_v0_5 = gDisplayListHead; + gDisplayListHead = temp_v0_5 + 8; + temp_v0_5->unk4 = &D_0D008E98 & 0x1FFFFFFF; + temp_v0_5->unk0 = 0x1020040; + + temp_v0_6->unk4 = arg0; + temp_v0_6->unk0 = 0x400103F; + + temp_v0_7->unk0 = 0xB1000602; + temp_v0_7->unk4 = 0x20604; +*/ + if (gCurrentCourseId == COURSE_RAINBOW_ROAD) { + + gSPVertex(gDisplayListHead++, &arg0[4], 4, 0); + gSP2Triangles(gDisplayListHead++, 0, 3, 1, 0, 0, 0, 0, 0); + +/* + temp_v0_8->unk4 = arg0 + 0x40; + temp_v0_8->unk0 = 0x400103F; + + temp_v0_9->unk4 = 0x20604; + temp_v0_9->unk0 = 0xB1000602; + */ + } +} +#else +GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A4A0C.s") +#endif + +/* +void func_802A4A0C(Vtx *arg0, void *arg1, ? arg2, ? arg3) { + void *sp13C; + ? sp128; + ? spE8; + ? spA8; + ? sp68; + f32 sp64; + f32 sp60; + f32 sp5C; + f32 sp58; + Gfx *temp_v0; + Gfx *temp_v0_2; + Gfx *temp_v0_3; + Gfx *temp_v0_4; + Gfx *temp_v0_5; + Gfx *temp_v0_6; + Gfx *temp_v0_7; + Gfx *temp_v0_8; + Gfx *temp_v0_9; + f32 temp_f0; + f32 temp_f10; + f32 temp_f16; + f32 temp_f18; + f32 temp_f6; + s16 temp_t5; + + sp13C = arg1->unk4; + func_802A450C(arg0); + sp64 = D_802B9BB0; + sp5C = 0.0f; + sp60 = 0.0f; + func_802B5564(&spE8, &sp128, sp13C->unkB4, D_80150148, D_80150150, D_8015014C, 1.0f); + func_802B5794(&spA8, sp13C, sp13C + 0xC); + func_802B71CC(&sp68, &spE8, &spA8); + sp58 = spA4 + ((sp74 * sp5C) + (sp84 * sp60) + (sp94 * sp64)); + func_802B6434(&sp5C, &sp68); + temp_f0 = (f32) (1.0 / (f64) sp58); + temp_f18 = sp5C * temp_f0; + temp_f6 = sp60 * temp_f0; + temp_f10 = temp_f18 * 160.0f; + sp5C = temp_f18; + temp_f16 = temp_f6 * 120.0f; + sp60 = temp_f6; + sp5C = temp_f10; + sp60 = temp_f16; + temp_t5 = 0x78 - (s32) temp_f16; arg1->unk28 = temp_t5; arg0->unk12 = temp_t5; arg0->unk22 = temp_t5; @@ -816,284 +635,234 @@ void func_802A4A0C(void *arg0, void *arg1, ? arg2, ? arg3) { func_802A3E3C(); temp_v0 = gDisplayListHead; gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xB900031D; - temp_v0->unk4 = 0xF0A4000; + temp_v0->words.w0 = 0xB900031D; + temp_v0->words.w1 = 0xF0A4000; temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB6000000; - temp_v0_2->unk4 = 0x20001; - guOrtho(gGfxPool, 0.0f, 320.0f, 0.0f, 240.0f, 0.0f, 5.0f, 1.0f); + temp_v0_2->words.w0 = 0xB6000000; + temp_v0_2->words.w1 = 0x20001; + guOrtho((Mtx *) gGfxPool, 0.0f, 320.0f, 0.0f, 240.0f, 0.0f, 5.0f, 1.0f); temp_v0_3 = gDisplayListHead; gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0xFFFF; - temp_v0_3->unk0 = 0xB4000000; + temp_v0_3->words.w1 = 0xFFFF; + temp_v0_3->words.w0 = 0xB4000000; temp_v0_4 = gDisplayListHead; gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1030040; - temp_v0_4->unk4 = gGfxPool & 0x1FFFFFFF; + temp_v0_4->words.w0 = 0x1030040; + temp_v0_4->words.w1 = (s32) gGfxPool & 0x1FFFFFFF; temp_v0_5 = gDisplayListHead; gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk4 = &D_0D008E98 & 0x1FFFFFFF; - temp_v0_5->unk0 = 0x1020040; + temp_v0_5->words.w1 = (s32) &D_0D008E98 & 0x1FFFFFFF; + temp_v0_5->words.w0 = 0x1020040; temp_v0_6 = gDisplayListHead; gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = arg0; - temp_v0_6->unk0 = 0x400103F; + temp_v0_6->words.w1 = (u32) arg0; + temp_v0_6->words.w0 = 0x400103F; temp_v0_7 = gDisplayListHead; gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0xB1000602; - temp_v0_7->unk4 = 0x20604; + temp_v0_7->words.w0 = 0xB1000602; + temp_v0_7->words.w1 = 0x20604; if (gCurrentCourseId == 0xD) { temp_v0_8 = gDisplayListHead; gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk4 = arg0 + 0x40; - temp_v0_8->unk0 = 0x400103F; + temp_v0_8->words.w1 = (u32) (arg0 + 0x40); + temp_v0_8->words.w0 = 0x400103F; temp_v0_9 = gDisplayListHead; gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->unk4 = 0x20604; - temp_v0_9->unk0 = 0xB1000602; + temp_v0_9->words.w1 = 0x20604; + temp_v0_9->words.w0 = 0xB1000602; } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A4A0C.s") -#endif + +*/ #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -/* -Failed to decompile function func_802A4D18: +extern s32 D_800DC530; +void func_802A4D18(void) { + f32 phi_f10; -Unable to determine jump table for jr instruction at func_802A4D18.s line 24. + if (D_800DC50C != 4) { + D_8015014C = 6800.0f; // D_802B9BB4 + D_80150150 = 3.0f; + } else { + //if (gCurrentCourseId < COURSE_BIG_DONUT) { + switch (gCurrentCourseId) { + case 2: + case 3: + case 13: + case 15: + case 16: + D_8015014C = 2700.0f; // D_802B9C04 + phi_f10 = 2.0f; + goto block_11; + case 1: + case 17: + D_8015014C = 1500.0f; // D_802B9C08 + D_80150150 = 2.0f; + break; + case 6: + D_8015014C = 5000.0f; // D_802B9C0C + D_80150150 = 1.0f; + break; + case 14: + D_8015014C = 4800.0f; + phi_f10 = 10.0f; + goto block_11; + case 0: + case 4: + case 5: + case 7: + case 8: + case 9: + case 10: + case 12: + case 18: + D_8015014C = 4500.0f; // D_802B9C10 + D_80150150 = 9.0f; + break; + case 11: + D_8015014C = 7000.0f; // D_802B9C14; + D_80150150 = 10.0f; + break; + //} endofswitch + //} else { + default: + D_8015014C = 6800.0f; // D_802B9C18 + phi_f10 = 3.0f; + + D_80150150 = phi_f10; + } + } + + switch(D_800DC530) { + case 0: + D_80150148 = 1.3333333730697632f; // D_802B9C1C + break; + case 1: + D_80150148 = (f32) 2.6666667461395264f; // D_802B9C24 + break; + case 2: + D_80150148 = 0.6666666865348816f; // D_802B9C20 + break; + case 3: + D_80150148 = 1.3333333730697632f; // D_802B9C28 + break; + } +} -There must be a read of a variable in the same block as -the instruction, which has a name starting with "jtbl"/"jpt_". -*/ #else GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A4D18.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8001F394(Player *, f32 *); // extern extern f32 D_80150134; extern f32 D_80150138; extern f32 D_8015013C; -void func_802A4EF4(void) { - s32 temp_v0; +extern f32 D_80150130; - temp_v0 = D_800DC52C; - if (temp_v0 != 0) { - if (temp_v0 != 1) { - if (temp_v0 != 2) { - if (temp_v0 != 3) { - return; - } - func_8001F394(D_800DC4DC, &D_80150130); - func_8001F394(D_800DC4E0, &D_80150134); - func_8001F394(D_800DC4E4, &D_80150138); - func_8001F394(D_800DC4E8, &D_8015013C); - return; - } +void func_802A4EF4(void) { + switch(D_800DC52C) { + case 0: + func_8001F394(D_800DC4DC, &D_80150130); + break; + + case 2: func_8001F394(D_800DC4DC, &D_80150130); func_8001F394(D_800DC4E0, &D_80150134); - return; - } - func_8001F394(D_800DC4DC, &D_80150130); - func_8001F394(D_800DC4E0, &D_80150134); - return; + break; + case 1: + func_8001F394(D_800DC4DC, &D_80150130); + func_8001F394(D_800DC4E0, &D_80150134); + break; + case 3: + func_8001F394(D_800DC4DC, &D_80150130); + func_8001F394(D_800DC4E0, &D_80150134); + func_8001F394(D_800DC4E4, &D_80150138); + func_8001F394(D_800DC4E8, &D_8015013C); + break; } - func_8001F394(D_800DC4DC, &D_80150130); } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A4EF4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(s32); // extern -? func_802A39E0(s32); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, s32, ?, ?, ? *); // extern -? func_802A4A0C(? *, s32, ?, ?, ? *); // extern -extern s32 D_800DC5F0; -extern ? D_80150134; -extern ? D_802B8910; -extern void *gDisplayListHead; +extern u16 D_800DC5B4; void func_802A5004(void) { - void *temp_v0; - void *temp_v0_2; func_802A3E3C(); func_802A3730(D_800DC5F0); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + func_802A39E0(D_800DC5F0); if (D_800DC5B4 != 0) { - func_802A4A0C(&D_802B8910, D_800DC5F0, 0x140, 0xF0, &D_80150134); + func_802A4A0C(&D_802B8910, D_800DC5F0, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150134); func_80057FC4(2); - func_802A487C(&D_802B8910, D_800DC5F0, 0x140, 0xF0, &D_80150134); + func_802A487C(&D_802B8910, D_800DC5F0, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150134); func_80093A30(2); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A5004.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A39E0(struct UnkStruct_800DC5EC *); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -? func_802A4A0C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -extern ? D_802B8890; -extern void *gDisplayListHead; void func_802A50EC(void) { - void *temp_v0; - void *temp_v0_2; func_802A3E3C(); func_802A3730(D_800DC5EC); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + func_802A39E0(D_800DC5EC); if (D_800DC5B4 != 0) { - func_802A4A0C(&D_802B8890, D_800DC5EC, 0x140, 0xF0, &D_80150130); + func_802A4A0C(&D_802B8890, D_800DC5EC, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150130); func_80057FC4(1); - func_802A487C(&D_802B8890, D_800DC5EC, 0x140, 0xF0, &D_80150130); + func_802A487C(&D_802B8890, D_800DC5EC, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150130); func_80093A30(1); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A50EC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A39E0(struct UnkStruct_800DC5EC *); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -? func_802A4A0C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -extern ? D_802B8890; -extern void *gDisplayListHead; void func_802A51D4(void) { - void *temp_v0; - void *temp_v0_2; func_802A3E3C(); func_802A39E0(D_800DC5EC); func_802A3730(D_800DC5EC); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + if (D_800DC5B4 != 0) { - func_802A4A0C(&D_802B8890, D_800DC5EC, 0x140, 0xF0, &D_80150130); + func_802A4A0C(&D_802B8890, D_800DC5EC, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150130); func_80057FC4(3); - func_802A487C(&D_802B8890, D_800DC5EC, 0x140, 0xF0, &D_80150130); + func_802A487C(&D_802B8890, D_800DC5EC, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150130); func_80093A30(3); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A51D4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(s32); // extern -? func_802A39E0(s32); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, s32, ?, ?, ? *); // extern -? func_802A4A0C(? *, s32, ?, ?, ? *); // extern -extern s32 D_800DC5F0; -extern ? D_80150134; -extern ? D_802B8910; -extern void *gDisplayListHead; void func_802A52BC(void) { - void *temp_v0; - void *temp_v0_2; func_802A3E3C(); func_802A39E0(D_800DC5F0); func_802A3730(D_800DC5F0); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + if (D_800DC5B4 != 0) { - func_802A4A0C(&D_802B8910, D_800DC5F0, 0x140, 0xF0, &D_80150134); + func_802A4A0C(&D_802B8910, D_800DC5F0, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150134); func_80057FC4(4); - func_802A487C(&D_802B8910, D_800DC5F0, 0x140, 0xF0, &D_80150134); + func_802A487C(&D_802B8910, D_800DC5F0, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150134); func_80093A30(4); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A52BC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A3CB0(); // extern -? func_802A3E3C(); // extern -? func_802A41D4(); // extern -? func_802A487C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -? func_802A4A0C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -? func_802A7C08(); // extern -extern ? D_802B8890; -extern void *gDisplayListHead; void func_802A53A4(void) { - void *temp_v0; - void *temp_v0_2; - func_802A7C08(); + move_segment_table_to_dmem(); func_802A3E3C(); func_802A3730(D_800DC5EC); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + func_802A3CB0(); func_802A41D4(); if (D_800DC5B4 != 0) { @@ -1105,37 +874,16 @@ void func_802A53A4(void) { func_80093A30(0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A53A4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A39E0(struct UnkStruct_800DC5EC *); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -? func_802A4A0C(? *, struct UnkStruct_800DC5EC *, ?, ?, f32 *); // extern -extern ? D_802B8890; -extern void *gDisplayListHead; void func_802A54A8(void) { - void *temp_v0; - void *temp_v0_2; func_802A3E3C(); func_802A39E0(D_800DC5EC); func_802A3730(D_800DC5EC); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + if (D_800DC5B4 != 0) { func_802A4A0C(&D_802B8890, D_800DC5EC, 0x140, 0xF0, &D_80150130); func_80057FC4(8); @@ -1143,269 +891,117 @@ void func_802A54A8(void) { func_80093A30(8); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A54A8.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(s32); // extern -? func_802A39E0(s32); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, s32, ?, ?, ? *); // extern -? func_802A4A0C(? *, s32, ?, ?, ? *); // extern -extern s32 D_800DC5F0; -extern ? D_80150134; -extern ? D_802B8910; -extern void *gDisplayListHead; void func_802A5590(void) { - void *temp_v0; - void *temp_v0_2; func_802A3E3C(); func_802A39E0(D_800DC5F0); func_802A3730(D_800DC5F0); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + if (D_800DC5B4 != 0) { - func_802A4A0C(&D_802B8910, D_800DC5F0, 0x140, 0xF0, &D_80150134); + func_802A4A0C(&D_802B8910, D_800DC5F0, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150134); func_80057FC4(9); - func_802A487C(&D_802B8910, D_800DC5F0, 0x140, 0xF0, &D_80150134); + func_802A487C(&D_802B8910, D_800DC5F0, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150134); func_80093A30(9); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A5590.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(s32); // extern -? func_802A39E0(s32); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, s32, ?, ?, ? *); // extern -? func_802A4A0C(? *, s32, ?, ?, ? *); // extern -extern s32 D_800DC5F4; -extern ? D_80150138; -extern ? D_802B8990; -extern void *gDisplayListHead; void func_802A5678(void) { - void *temp_v0; - void *temp_v0_2; func_802A3E3C(); func_802A39E0(D_800DC5F4); func_802A3730(D_800DC5F4); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + if (D_800DC5B4 != 0) { - func_802A4A0C(&D_802B8990, D_800DC5F4, 0x140, 0xF0, &D_80150138); - func_80057FC4(0xA); - func_802A487C(&D_802B8990, D_800DC5F4, 0x140, 0xF0, &D_80150138); - func_80093A30(0xA); + func_802A4A0C(&D_802B8990, D_800DC5F4, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150138); + func_80057FC4(10); + func_802A487C(&D_802B8990, D_800DC5F4, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150138); + func_80093A30(10); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A5678.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80057FC4(?); // extern -? func_80093A30(?); // extern -? func_802A3730(s32); // extern -? func_802A39E0(s32); // extern -? func_802A3E3C(); // extern -? func_802A487C(? *, s32, ?, ?, ? *); // extern -? func_802A4A0C(? *, s32, ?, ?, ? *); // extern -extern s32 D_800DC5F8; -extern ? D_8015013C; -extern ? D_802B8A10; -extern void *gDisplayListHead; -extern ? gPhysicalFramebuffers; -extern u16 sRenderingFramebuffer; + void func_802A5760(void) { - void *temp_v0; - void *temp_v0_10; - void *temp_v0_11; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - void *temp_v0_8; - void *temp_v0_9; func_802A3E3C(); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = -1; - temp_v0->unk0 = 0xB6000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB7000000; - temp_v0_2->unk4 = 0x800204; + + gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); + if (gPlayerCountSelection1 == 3) { - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk4 = 0; - temp_v0_3->unk0 = 0xE7000000; + + gDPPipeSync(gDisplayListHead++); func_802A39E0(D_800DC5F8); - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk4 = 0x300000; - temp_v0_4->unk0 = 0xBA001402; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0xFF10013F; - temp_v0_5->unk4 = *(&gPhysicalFramebuffers + (sRenderingFramebuffer * 4)) & 0x1FFFFFFF; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0x10001; - temp_v0_6->unk0 = 0xF7000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk4 = 0; - temp_v0_7->unk0 = 0xE7000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->unk0 = 0xED2801E0; - temp_v0_8->unk4 = 0x5003C0; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->unk4 = 0x2801E0; - temp_v0_9->unk0 = 0xF64FC3BC; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->unk4 = 0; - temp_v0_10->unk0 = 0xE7000000; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->unk4 = 0; - temp_v0_11->unk0 = 0xBA001402; + gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); + gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(gPhysicalFramebuffers[sRenderingFramebuffer])); + gDPSetFillColor(gDisplayListHead++, 0x00010001); + gDPPipeSync(gDisplayListHead++); + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 160, 120, SCREEN_WIDTH, SCREEN_HEIGHT); + gDPFillRectangle(gDisplayListHead++, 160, 120, SCREEN_WIDTH-1, SCREEN_HEIGHT-1); + gDPPipeSync(gDisplayListHead++); + gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); + func_802A3730(D_800DC5F8); - return; - } - func_802A3730(D_800DC5F8); - func_802A39E0(D_800DC5F8); - if (D_800DC5B4 != 0) { - func_802A4A0C(&D_802B8A10, D_800DC5F8, 0x140, 0xF0, &D_8015013C); - func_80057FC4(0xB); - func_802A487C(&D_802B8A10, D_800DC5F8, 0x140, 0xF0, &D_8015013C); - func_80093A30(0xB); + + } else { + func_802A3730(D_800DC5F8); + func_802A39E0(D_800DC5F8); + + if (D_800DC5B4 != 0) { + func_802A4A0C(&D_802B8A10, D_800DC5F8, SCREEN_WIDTH, SCREEN_HEIGHT, &D_8015013C); + func_80057FC4(11); + func_802A487C(&D_802B8A10, D_800DC5F8, SCREEN_WIDTH, SCREEN_HEIGHT, &D_8015013C); + func_80093A30(11); + } } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A5760.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800212B4(); // extern -? func_80021B0C(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(struct UnkStruct_800DC5EC *, ?); // extern -? func_80295A38(struct UnkStruct_800DC5EC *); // extern -? func_802A2F34(struct UnkStruct_800DC5EC *); // extern -? func_802A3008(struct UnkStruct_800DC5EC *); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A3E3C(); // extern -? func_802A53A4(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; extern f32 D_80150148; -extern f32 D_8015014C; extern f32 D_80150150; -extern f32 D_801646F0; -extern f32 D_801646F4; -extern f32 D_801646F8; -extern f32 D_801646FC; -extern f32 D_80164700; -extern f32 D_80164704; -extern f32 D_80164708; -extern f32 D_8016470C; -extern f32 D_80164710; -extern void *gDisplayListHead; +extern f32 D_8015014C; + + +extern u16 D_800DC5C8; +extern u16 D_800DC5B8; +extern Camera cameras[]; void func_802A59A4(void) { - u16 spAA; - ? sp5C; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; + Camera *camera = &cameras[0]; + u16 spAA[32]; + s32 sp5C[8]; func_802A53A4(); func_802A3E3C(); func_802A3730(D_800DC5EC); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xB7000000; - temp_v0->unk4 = 0x22205; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB900031D; - temp_v0_2->unk4 = 0x552078; - guPerspective(&gGfxPool->buffer[8], &spAA, D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xB4000000; - temp_v0_3->unk4 = spAA; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1030040; - temp_v0_4->unk4 = &gGfxPool->buffer[8] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[56], D_801646F0, D_801646F4, D_801646F8, D_801646FC, D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710); + + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH); + gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + guPerspective(&gGfxPool->buffer[8], &spAA[23], D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, spAA[23]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + guLookAt(&gGfxPool->buffer[56], camera->posX, camera->posY, camera->posZ, + camera->unk, camera->unk1, camera->unk2, camera->angleX, + camera->angleY, camera->angleZ); if (D_800DC5C8 == 0) { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1010040; - temp_v0_5->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; - func_802B53C8(&sp5C); - func_802B4FF8(&sp5C, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp5C); + func_802B4FF8(sp5C, 0); } else { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1020040; - temp_v0_6->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5EC); if (D_800DC5C8 == 1) { - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0x1010040; - temp_v0_7->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; - func_802B53C8(&sp5C); - func_802B4FF8(&sp5C, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp5C); + func_802B4FF8(sp5C, 0); } func_802A3008(D_800DC5EC); func_80058090(0); @@ -1423,93 +1019,40 @@ void func_802A59A4(void) { func_80058DB4(0); } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A59A4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800212B4(); // extern -? func_80021B0C(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(struct UnkStruct_800DC5EC *, ?); // extern -? func_80295A38(struct UnkStruct_800DC5EC *); // extern -? func_802A2F34(struct UnkStruct_800DC5EC *); // extern -? func_802A3008(struct UnkStruct_800DC5EC *); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A3E3C(); // extern -? func_802A50EC(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; extern s32 D_8015F788; -extern f32 D_801646F0; -extern f32 D_801646F4; -extern f32 D_801646F8; -extern f32 D_801646FC; -extern f32 D_80164700; -extern f32 D_80164704; -extern f32 D_80164708; -extern f32 D_8016470C; -extern f32 D_80164710; -extern void *gDisplayListHead; void func_802A5CB4(void) { - u16 sp9A; - ? sp58; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; + Camera *camera = &cameras[0]; + u16 sp9A[22]; + s32 sp58[8]; func_802A50EC(); func_802A3E3C(); func_802A3730(D_800DC5EC); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x2205; - temp_v0->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[8], &sp9A, D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB4000000; - temp_v0_2->unk4 = sp9A; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1030040; - temp_v0_3->unk4 = &gGfxPool->buffer[8] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[56], D_801646F0, D_801646F4, D_801646F8, D_801646FC, D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710); + + + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[8], &sp9A[17], D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp9A[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guLookAt(&gGfxPool->buffer[56], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); + if (D_800DC5C8 == 0) { - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1010040; - temp_v0_4->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } else { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1020040; - temp_v0_5->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5EC); if (D_800DC5C8 == 1) { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1010040; - temp_v0_6->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } func_802A3008(D_800DC5EC); func_80058090(1); @@ -1526,97 +1069,38 @@ void func_802A5CB4(void) { if (D_800DC5B8 != 0) { func_80058DB4(1); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A5CB4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800215DC(); // extern -? func_80021C78(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(s32, ?); // extern -? func_80295A38(s32); // extern -? func_802A2F34(s32); // extern -? func_802A3008(s32); // extern -? func_802A3730(s32); // extern -? func_802A3E3C(); // extern -? func_802A5004(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern s32 D_800DC5F0; -extern f32 D_80150134; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; -extern s32 D_8015F788; -extern f32 D_801647A8; -extern f32 D_801647AC; -extern f32 D_801647B0; -extern f32 D_801647B4; -extern f32 D_801647B8; -extern f32 D_801647BC; -extern f32 D_801647C0; -extern f32 D_801647C4; -extern f32 D_801647C8; -extern void *gDisplayListHead; void func_802A5FAC(void) { - u16 sp9A; - ? sp58; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; + Camera *camera = &cameras[1]; + u16 sp9A[22]; + s32 sp58[8]; func_802A5004(); func_802A3E3C(); func_802A3730(D_800DC5F0); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x2205; - temp_v0->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[16], &sp9A, D_80150134, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB4000000; - temp_v0_2->unk4 = sp9A; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1030040; - temp_v0_3->unk4 = &gGfxPool->buffer[16] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[64], D_801647A8, D_801647AC, D_801647B0, D_801647B4, D_801647B8, D_801647BC, D_801647C0, D_801647C4, D_801647C8); + + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[16], &sp9A[17], D_80150134, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp9A[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guLookAt(&gGfxPool->buffer[64], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); + + //D_801647A8, D_801647AC, D_801647B0, D_801647B4, D_801647B8, D_801647BC, D_801647C0, D_801647C4, D_801647C8); + if (D_800DC5C8 == 0) { - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1010040; - temp_v0_4->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } else { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1020040; - temp_v0_5->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5F0); if (D_800DC5C8 == 1) { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1010040; - temp_v0_6->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } func_802A3008(D_800DC5F0); func_80058090(2); @@ -1633,100 +1117,37 @@ void func_802A5FAC(void) { if (D_800DC5B8 != 0) { func_80058DB4(2); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A5FAC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800212B4(); // extern -? func_80021B0C(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(struct UnkStruct_800DC5EC *, ?); // extern -? func_80295A38(struct UnkStruct_800DC5EC *); // extern -? func_802A2F34(struct UnkStruct_800DC5EC *); // extern -? func_802A3008(struct UnkStruct_800DC5EC *); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A3E3C(); // extern -? func_802A51D4(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; -extern s32 D_8015F788; -extern f32 D_801646F0; -extern f32 D_801646F4; -extern f32 D_801646F8; -extern f32 D_801646FC; -extern f32 D_80164700; -extern f32 D_80164704; -extern f32 D_80164708; -extern f32 D_8016470C; -extern f32 D_80164710; -extern void *gDisplayListHead; void func_802A62A4(void) { - u16 sp9A; - ? sp58; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; + Camera *camera = &cameras[0]; + u16 sp9A[22]; + s32 sp58[8]; func_802A51D4(); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xB7000000; - temp_v0->unk4 = 0x22204; + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH); func_802A3E3C(); func_802A3730(D_800DC5EC); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0x2205; - temp_v0_2->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[8], &sp9A, D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xB4000000; - temp_v0_3->unk4 = sp9A; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1030040; - temp_v0_4->unk4 = &gGfxPool->buffer[8] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[56], D_801646F0, D_801646F4, D_801646F8, D_801646FC, D_80164700, D_80164704, D_80164708, D_8016470C, D_80164710); + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[8], &sp9A[17], D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp9A[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guLookAt(&gGfxPool->buffer[56], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); + if (D_800DC5C8 == 0) { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1010040; - temp_v0_5->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } else { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1020040; - temp_v0_6->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5EC); if (D_800DC5C8 == 1) { - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0x1010040; - temp_v0_7->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } func_802A3008(D_800DC5EC); func_80058090(3); @@ -1743,100 +1164,35 @@ void func_802A62A4(void) { if (D_800DC5B8 != 0) { func_80058DB4(3); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A62A4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800215DC(); // extern -? func_80021C78(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(s32, ?); // extern -? func_80295A38(s32); // extern -? func_802A2F34(s32); // extern -? func_802A3008(s32); // extern -? func_802A3730(s32); // extern -? func_802A3E3C(); // extern -? func_802A52BC(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern s32 D_800DC5F0; -extern f32 D_80150134; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; -extern s32 D_8015F788; -extern f32 D_801647A8; -extern f32 D_801647AC; -extern f32 D_801647B0; -extern f32 D_801647B4; -extern f32 D_801647B8; -extern f32 D_801647BC; -extern f32 D_801647C0; -extern f32 D_801647C4; -extern f32 D_801647C8; -extern void *gDisplayListHead; void func_802A65B8(void) { - u16 sp9A; - ? sp58; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; + Camera *camera = &cameras[1]; + u16 sp9A[22]; + s32 sp58[8]; func_802A52BC(); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xB7000000; - temp_v0->unk4 = 0x22204; + + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH); func_802A3E3C(); func_802A3730(D_800DC5F0); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk4 = 0x2205; - temp_v0_2->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[16], &sp9A, D_80150134, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xB4000000; - temp_v0_3->unk4 = sp9A; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1030040; - temp_v0_4->unk4 = &gGfxPool->buffer[16] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[64], D_801647A8, D_801647AC, D_801647B0, D_801647B4, D_801647B8, D_801647BC, D_801647C0, D_801647C4, D_801647C8); + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[16], &sp9A[17], D_80150134, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp9A[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guLookAt(&gGfxPool->buffer[64], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); + if (D_800DC5C8 == 0) { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1010040; - temp_v0_5->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } else { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1020040; - temp_v0_6->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5F0); if (D_800DC5C8 == 1) { - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0x1010040; - temp_v0_7->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_802B53C8(&sp58); func_802B4FF8(&sp58, 0); } @@ -1855,88 +1211,34 @@ void func_802A65B8(void) { if (D_800DC5B8 != 0) { func_80058DB4(4); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A65B8.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800212B4(); // extern -? func_80021B0C(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(struct UnkStruct_800DC5EC *, ?); // extern -? func_80295A38(struct UnkStruct_800DC5EC *); // extern -? func_802A2F34(struct UnkStruct_800DC5EC *); // extern -? func_802A3008(struct UnkStruct_800DC5EC *); // extern -? func_802A3730(struct UnkStruct_800DC5EC *); // extern -? func_802A3E3C(); // extern -? func_802A54A8(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; -extern s32 D_8015F788; -extern void *gDisplayListHead; void func_802A68CC(void) { - s32 spA4; - u16 sp9A; - ? sp58; - s32 temp_v1; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; + Camera *camera = camera1; + u16 sp9A[22]; + s32 sp58[8]; - temp_v1 = D_800DDB40; - spA4 = temp_v1; func_802A54A8(); func_802A3E3C(); func_802A3730(D_800DC5EC); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x2205; - temp_v0->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[8], &sp9A, D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB4000000; - temp_v0_2->unk4 = sp9A; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1030040; - temp_v0_3->unk4 = &gGfxPool->buffer[8] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[56], temp_v1->unk0, temp_v1->unk4, temp_v1->unk8, temp_v1->unkC, temp_v1->unk10, temp_v1->unk14, temp_v1->unk18, temp_v1->unk1C, temp_v1->unk20); + + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[8], &sp9A[17], D_80150130, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp9A[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guLookAt(&gGfxPool->buffer[56], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); + if (D_800DC5C8 == 0) { - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1010040; - temp_v0_4->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_802B53C8(&sp58); func_802B4FF8(&sp58, 0); } else { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1020040; - temp_v0_5->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5EC); if (D_800DC5C8 == 1) { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1010040; - temp_v0_6->unk4 = &gGfxPool->buffer[56] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); func_802B53C8(&sp58); func_802B4FF8(&sp58, 0); } @@ -1955,92 +1257,36 @@ void func_802A68CC(void) { if (D_800DC5B8 != 0) { func_80058DB4(8); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A68CC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800215DC(); // extern -? func_80021C78(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(s32, ?); // extern -? func_80295A38(s32); // extern -? func_802A2F34(s32); // extern -? func_802A3008(s32); // extern -? func_802A3730(s32); // extern -? func_802A3E3C(); // extern -? func_802A5590(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern s32 D_800DC5F0; -extern f32 D_80150134; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; -extern s32 D_8015F788; -extern void *gDisplayListHead; void func_802A6BB0(void) { - s32 spA4; - u16 sp9A; - ? sp58; - s32 temp_v1; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; + Camera *camera = camera2; + u16 sp9A[22]; + s32 sp58[8]; - temp_v1 = D_800DDB44; - spA4 = temp_v1; func_802A5590(); func_802A3E3C(); func_802A3730(D_800DC5F0); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x2205; - temp_v0->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[16], &sp9A, D_80150134, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB4000000; - temp_v0_2->unk4 = sp9A; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1030040; - temp_v0_3->unk4 = &gGfxPool->buffer[16] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[64], temp_v1->unk0, temp_v1->unk4, temp_v1->unk8, temp_v1->unkC, temp_v1->unk10, temp_v1->unk14, temp_v1->unk18, temp_v1->unk1C, temp_v1->unk20); + + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[16], &sp9A[17], D_80150134, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp9A[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + guLookAt(&gGfxPool->buffer[64], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); if (D_800DC5C8 == 0) { - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1010040; - temp_v0_4->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } else { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1020040; - temp_v0_5->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5F0); if (D_800DC5C8 == 1) { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1010040; - temp_v0_6->unk4 = &gGfxPool->buffer[64] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } func_802A3008(D_800DC5F0); func_80058090(9); @@ -2057,307 +1303,181 @@ void func_802A6BB0(void) { if (D_800DC5B8 != 0) { func_80058DB4(9); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A6BB0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8002186C(); // extern -? func_80021D40(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(s32, ?); // extern -? func_80295A38(s32); // extern -? func_802A2F34(s32); // extern -? func_802A3008(s32); // extern -? func_802A3730(s32); // extern -? func_802A3E3C(); // extern -? func_802A5678(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern s32 D_800DC5F4; -extern f32 D_80150138; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; -extern s32 D_8015F788; -extern void *gDisplayListHead; void func_802A6E94(void) { - s32 spA4; - u16 sp9A; - ? sp58; - s32 temp_v1; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; + Camera *camera = camera3; + u16 sp9A[22]; + s32 sp58[8]; - temp_v1 = D_800DDB48; - spA4 = temp_v1; func_802A5678(); func_802A3E3C(); func_802A3730(D_800DC5F4); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x2205; - temp_v0->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[24], &sp9A, D_80150138, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB4000000; - temp_v0_2->unk4 = sp9A; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1030040; - temp_v0_3->unk4 = &gGfxPool->buffer[24] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[72], temp_v1->unk0, temp_v1->unk4, temp_v1->unk8, temp_v1->unkC, temp_v1->unk10, temp_v1->unk14, temp_v1->unk18, temp_v1->unk1C, temp_v1->unk20); + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[24], &sp9A[17], D_80150138, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp9A[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[24]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guLookAt(&gGfxPool->buffer[72], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); if (D_800DC5C8 == 0) { - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1010040; - temp_v0_4->unk4 = &gGfxPool->buffer[72] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[72]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } else { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1020040; - temp_v0_5->unk4 = &gGfxPool->buffer[72] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[72]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5F4); if (D_800DC5C8 == 1) { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1010040; - temp_v0_6->unk4 = &gGfxPool->buffer[72] & 0x1FFFFFFF; - func_802B53C8(&sp58); - func_802B4FF8(&sp58, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[72]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp58); + func_802B4FF8(sp58, 0); } func_802A3008(D_800DC5F4); - func_80058090(0xA); + func_80058090(10); func_8002186C(); func_8029122C(D_800DC5F4, 2); func_80021D40(); func_802A2F34(D_800DC5F4); - func_80058538(0xA); + func_80058538(10); func_80058BF4(); if (D_800DC5B8 != 0) { - func_80058C20(0xA); + func_80058C20(10); } - func_80093A5C(0xA); + func_80093A5C(10); if (D_800DC5B8 != 0) { - func_80058DB4(0xA); + func_80058DB4(10); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A6E94.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800219BC(); // extern -? func_80021DA8(); // extern -? func_80058090(?); // extern -? func_80058538(?); // extern -? func_80058BF4(); // extern -? func_80058C20(?); // extern -? func_80058DB4(?); // extern -? func_80093A5C(?); // extern -? func_8029122C(s32, ?); // extern -? func_80295A38(s32); // extern -? func_802A2F34(s32); // extern -? func_802A3008(s32); // extern -? func_802A3730(s32); // extern -? func_802A3E3C(); // extern -? func_802A5760(); // extern -? func_802B4FF8(? *, ?); // extern -? func_802B53C8(? *); // extern -extern u16 D_800DC5B8; -extern s32 D_800DC5F8; -extern f32 D_8015013C; -extern f32 D_80150148; -extern f32 D_8015014C; -extern f32 D_80150150; -extern s32 D_8015F788; -extern void *gDisplayListHead; void func_802A7178(void) { - s32 sp9C; - u16 sp92; - ? sp50; - s32 temp_v1; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; + Camera *camera = camera4; + u16 sp92[22]; + s32 sp50[8]; - temp_v1 = D_800DDB4C; - sp9C = temp_v1; func_802A5760(); if (gPlayerCountSelection1 == 3) { - func_80093A5C(0xB); + func_80093A5C(11); if (D_800DC5B8 != 0) { - func_80058DB4(0xB); + func_80058DB4(11); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; return; } - sp9C = temp_v1; + func_802A3E3C(); func_802A3730(D_800DC5F8); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk4 = 0x2205; - temp_v0->unk0 = 0xB7000000; - guPerspective(&gGfxPool->buffer[32], &sp92, D_8015013C, D_80150148, D_80150150, D_8015014C, 1.0f); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xB4000000; - temp_v0_2->unk4 = sp92; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0x1030040; - temp_v0_3->unk4 = &gGfxPool->buffer[32] & 0x1FFFFFFF; - guLookAt(&gGfxPool->buffer[80], temp_v1->unk0, temp_v1->unk4, temp_v1->unk8, temp_v1->unkC, temp_v1->unk10, temp_v1->unk14, temp_v1->unk18, temp_v1->unk1C, temp_v1->unk20); + + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH); + guPerspective(&gGfxPool->buffer[32], &sp92[17], D_8015013C, D_80150148, D_80150150, D_8015014C, 1.0f); + gDPHalf1(gDisplayListHead++, sp92[17]); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[32]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + guLookAt(&gGfxPool->buffer[80], camera->posX, camera->posY, camera->posZ, camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); if (D_800DC5C8 == 0) { - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0x1010040; - temp_v0_4->unk4 = &gGfxPool->buffer[80] & 0x1FFFFFFF; - func_802B53C8(&sp50); - func_802B4FF8(&sp50, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[80]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp50); + func_802B4FF8(sp50, 0); } else { - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0x1020040; - temp_v0_5->unk4 = &gGfxPool->buffer[80] & 0x1FFFFFFF; + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[80]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } func_80295A38(D_800DC5F8); if (D_800DC5C8 == 1) { - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk0 = 0x1010040; - temp_v0_6->unk4 = &gGfxPool->buffer[80] & 0x1FFFFFFF; - func_802B53C8(&sp50); - func_802B4FF8(&sp50, 0); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[80]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + func_802B53C8(sp50); + func_802B4FF8(sp50, 0); } func_802A3008(D_800DC5F8); - func_80058090(0xB); + func_80058090(11); func_800219BC(); func_8029122C(D_800DC5F8, 3); func_80021DA8(); func_802A2F34(D_800DC5F8); - func_80058538(0xB); + func_80058538(11); func_80058BF4(); if (D_800DC5B8 != 0) { - func_80058C20(0xB); + func_80058C20(11); } func_80093A5C(0xB); if (D_800DC5B8 != 0) { - func_80058DB4(0xB); + func_80058DB4(11); } - D_8015F788 = D_8015F788 + 1; + D_8015F788 += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A7178.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_8015F480; -extern ? D_8015F790; -extern ? D_801646F0; -extern ? gControllers; -extern ? gPlayers; +extern struct UnkStruct_800DC5EC D_8015F480[]; +extern s32 D_8015F790[]; + +extern struct Controller gControllers[]; +extern Player gPlayers[]; void func_802A74BC(void) { - s32 temp_a2; - s32 temp_a3; - ? *phi_v0; - ? *phi_a0; - ? *phi_v1; - ? *phi_a1; - s32 phi_a2; + struct UnkStruct_800DC5EC *wrapper = &D_8015F480[0]; + Player *player = &gPlayers[0]; + Camera *camera = &cameras[0]; + struct Controller *controller = &gControllers[0]; - phi_v0 = &D_8015F480; - phi_a0 = &D_801646F0; - phi_v1 = &gPlayers; - phi_a1 = &D_8015F790; - phi_a2 = 0; - do { - phi_v0->unk0 = &gControllers; - phi_v0->unk4 = phi_a0; - phi_v0->unk8 = phi_v1; - phi_v0->unkC = phi_a1; - phi_v0->unk2C = 4; - phi_v0->unk2E = 4; - phi_v0->unk38 = 1; - temp_a3 = D_800DC52C; - phi_a0 += 0xB8; - phi_v1 += 0xDD8; - phi_a1 += 0x40; - if (temp_a3 != 0) { - if (temp_a3 != 1) { - if (temp_a3 != 2) { - if (temp_a3 != 3) { + // struct? size = 0x10. unk++ doesn't work cause s32 too small. + s32 *unk = &D_8015F790[0]; + s32 i; - } else if (phi_a2 == 0) { - phi_v0->unk30 = 0x50; - phi_v0->unk32 = 0x3C; - } else if (phi_a2 == 1) { - phi_v0->unk30 = 0xF0; - phi_v0->unk32 = 0x3C; - } else { - if (phi_a2 == 2) { - phi_v0->unk30 = 0x50; - } else { - phi_v0->unk30 = 0xF0; - } - goto block_24; - } - } else if (phi_a2 == 0) { - phi_v0->unk30 = 0x50; - phi_v0->unk32 = 0x78; - } else if (phi_a2 == 1) { - phi_v0->unk30 = 0xF0; - phi_v0->unk32 = 0x78; + for (i = 0; i < 4; i++) { + wrapper->controllers = controller; + wrapper->camera = camera; + wrapper->player = player; + wrapper->unkC = unk; + wrapper->screenWidth = 4; + wrapper->screenHeight = 4; + wrapper->pathCounter = 1; + + + switch(D_800DC52C) { + case 0: + if (i == 0) { + wrapper->screenStartX = 160; } - } else if (phi_a2 == 0) { - phi_v0->unk30 = 0xA0; - phi_v0->unk32 = 0x3C; - } else if (phi_a2 == 1) { - phi_v0->unk30 = 0xA0; -block_24: - phi_v0->unk32 = 0xB4; - } - } else { - if (phi_a2 == 0) { - phi_v0->unk30 = 0xA0; - } - phi_v0->unk32 = 0x78; + wrapper->screenStartY = 120; + break; + case 2: + if (i == 0) { + wrapper->screenStartX = 80; + wrapper->screenStartY = 120; + } else if (i == 1) { + wrapper->screenStartX = 240; + wrapper->screenStartY = 120; + } + break; + case 1: + if (i == 0) { + wrapper->screenStartX = 160; + wrapper->screenStartY = 60; + } else if (i == 1) { + wrapper->screenStartX = 160; + wrapper->screenStartY = 180; + } + break; + case 3: + if (i == 0) { + wrapper->screenStartX = 80; + wrapper->screenStartY = 60; + } else if (i == 1) { + wrapper->screenStartX = 240; + wrapper->screenStartY = 60; + } else if (i == 2) { + wrapper->screenStartX = 80; + wrapper->screenStartY = 180; + } else { + wrapper->screenStartX = 240; + wrapper->screenStartY = 180; + } + break; } - temp_a2 = phi_a2 + 1; - phi_v0 += 0x40; - phi_a2 = temp_a2; - } while (temp_a2 != 4); + player++; + camera++; + wrapper++; + unk += 0x10; + } } -#else -GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A74BC.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -2457,38 +1577,36 @@ GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A7658.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_802A7658(s32, s32, ?, ?, s32, s32); // extern +//? func_802A7658(s32, s32, ?, ?, s32, s32); // extern extern s32 D_800DC5DC; extern s32 D_800DC5E0; -extern ? gPhysicalFramebuffers; -extern ? gSegmentTable; -extern s16 sRenderedFramebuffer; +extern uintptr_t gSegmentTable[]; +extern u16 sRenderedFramebuffer; void func_802A7728(void) { s16 temp_v0; - s32 *temp_s1; - s16 phi_v0; + //uintptr_t temp_s1; if (D_800DC52C == 3) { D_800DC5DC = 0; } else { - D_800DC5DC = 0x80; + D_800DC5DC = 128; } D_800DC5E0 = 0; - temp_v0 = sRenderedFramebuffer - 1; - phi_v0 = temp_v0; + temp_v0 = (s16) sRenderedFramebuffer - 1; + //temp_s1 = gSegmentTable; if (temp_v0 < 0) { - phi_v0 = 2; - } else if (temp_v0 >= 3) { - phi_v0 = 0; + temp_v0 = 2; + } else if (temp_v0 > 2) { + temp_v0 = 0; } - temp_s1 = (phi_v0 * 4) + &gPhysicalFramebuffers; - func_802A7658(D_800DC5DC, D_800DC5E0, 0x40, 0x20, *temp_s1 | 0x80000000, (gSegmentTable.unk14 + 0x8800) | 0x80000000); - func_802A7658(D_800DC5DC + 0x40, D_800DC5E0, 0x40, 0x20, *temp_s1 | 0x80000000, (gSegmentTable.unk14 + 0x9800) | 0x80000000); - func_802A7658(D_800DC5DC, D_800DC5E0 + 0x20, 0x40, 0x20, *temp_s1 | 0x80000000, (gSegmentTable.unk14 + 0xA800) | 0x80000000); - func_802A7658(D_800DC5DC + 0x40, D_800DC5E0 + 0x20, 0x40, 0x20, *temp_s1 | 0x80000000, (gSegmentTable.unk14 + 0xB800) | 0x80000000); - func_802A7658(D_800DC5DC, D_800DC5E0 + 0x40, 0x40, 0x20, *temp_s1 | 0x80000000, (gSegmentTable.unk14 + 0xC800) | 0x80000000); - func_802A7658(D_800DC5DC + 0x40, D_800DC5E0 + 0x40, 0x40, 0x20, *temp_s1 | 0x80000000, (gSegmentTable.unk14 + 0xD800) | 0x80000000); + //temp_s1 = VIRTUAL_TO_PHYSICAL2(gPhysicalFramebuffers[temp_v0]); + func_802A7658(D_800DC5DC, D_800DC5E0, 64, 32, VIRTUAL_TO_PHYSICAL2(gPhysicalFramebuffers[temp_v0]), (u16 *)VIRTUAL_TO_PHYSICAL2(gSegmentTable+0x8800)); + func_802A7658(D_800DC5DC + 64, D_800DC5E0, 64, 32, VIRTUAL_TO_PHYSICAL2(gPhysicalFramebuffers[temp_v0]), (u16 *)VIRTUAL_TO_PHYSICAL2(gSegmentTable[0x9800])); + func_802A7658(D_800DC5DC, D_800DC5E0 + 32, 64, 32, VIRTUAL_TO_PHYSICAL2(gPhysicalFramebuffers[temp_v0]), (u16 *)VIRTUAL_TO_PHYSICAL2(gSegmentTable[0xA800])); + func_802A7658(D_800DC5DC + 64, D_800DC5E0 + 32, 64, 32, VIRTUAL_TO_PHYSICAL2(gPhysicalFramebuffers[temp_v0]), (u16 *)VIRTUAL_TO_PHYSICAL2(gSegmentTable[0xB800])); + func_802A7658(D_800DC5DC, D_800DC5E0 + 64, 64, 32, VIRTUAL_TO_PHYSICAL2(gPhysicalFramebuffers[temp_v0]), (u16 *)VIRTUAL_TO_PHYSICAL2(gSegmentTable[0xC800])); + func_802A7658(D_800DC5DC + 64, D_800DC5E0 + 64, 64, 32, VIRTUAL_TO_PHYSICAL2(gPhysicalFramebuffers[temp_v0]), (u16 *)VIRTUAL_TO_PHYSICAL2(gSegmentTable[0xD800])); } #else GLOBAL_ASM("asm/non_matchings/code_802A3730/func_802A7728.s") diff --git a/src/main.c b/src/main.c index 8771ee79a..f6a77d1cb 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ void func_8008C214(void); void func_80091B78(void); void func_802A4D18(void); -void func_802A7C08(void); +void move_segment_table_to_dmem(void); void func_802A3E3C(void); void func_802A4160(void); void func_802A41D4(void); @@ -84,15 +84,15 @@ struct GfxPool *gGfxPool; s32 gfxPool_padding; // is this necessary? struct VblankHandler D_8014EF48; struct VblankHandler sSoundVblankHandler; -OSMesgQueue D_8014EF58, D_8014EF70, D_8014EF88, unused_gMsgQueue, gIntrMesgQueue, D_8014EFD0; +OSMesgQueue gDmaMesgQueue, D_8014EF70, D_8014EF88, unused_gMsgQueue, gIntrMesgQueue, D_8014EFD0; OSMesgQueue sSoundMesgQueue; OSMesg sSoundMesgBuf; OSMesg D_8014F004, D_8014F008; OSMesg D_8014F00C[1]; UNUSED OSMesg D_8014F010, D_8014F014; OSMesg D_8014F018[16], D_8014F058[16]; -OSMesg D_8014F098; -OSIoMesg D_8014F0A0; +OSMesg gMainReceivedMesg; +OSIoMesg gDmaIoMesg; OSMesgQueue gSIEventMesgQueue; OSMesg gSIEventMesgBuf[3]; @@ -124,11 +124,12 @@ f32 D_8015014C; f32 D_80150150; UNUSED f32 D_80150154; -s32 D_80150158[63]; +struct D_80150158 gD_80150158[16]; uintptr_t gSegmentTable[16]; Gfx *gDisplayListHead; struct SPTask *gGfxSPTask; -s32 D_801502A0[2]; +s32 D_801502A0; +s32 D_801502A4; uintptr_t gPhysicalFramebuffers[3]; u32 D_801502B4; UNUSED u32 D_801502B8; @@ -231,13 +232,12 @@ extern u16 D_800DC5C0; extern s32 D_8015F788; extern s16 D_801625E8; extern struct UnkStruct_800DC5EC *D_800DC5EC; -//extern struct UnkStruct_800DDB40 *D_800DDB40; -extern Camera *D_800DDB40; -extern Camera *D_800DDB44; -extern Camera *D_800DDB48; -extern Camera *D_800DDB4C; +extern Camera *camera1; +extern Camera *camera2; +extern Camera *camera3; +extern Camera *camera4; extern u16 D_800DC5B0; extern s32 D_800DC5E8; @@ -290,7 +290,7 @@ void thread1_idle(void *arg0) { } void setup_mesg_queues(void) { - osCreateMesgQueue(&D_8014EF58, &D_8014F004, 1); + osCreateMesgQueue(&gDmaMesgQueue, &D_8014F004, 1); osCreateMesgQueue(&D_8014EFD0, &D_8014F058, 0x10); osCreateMesgQueue(&gIntrMesgQueue, &D_8014F018, 0x10); osViSetEvent(&gIntrMesgQueue, (OSMesg) 0x66, 1); @@ -430,7 +430,7 @@ void send_display_list(struct SPTask *spTask) { } void func_80000CA8(void) { - func_802A7C08(); + move_segment_table_to_dmem(); func_802A3E3C(); func_802A4160(); func_802A41D4(); @@ -484,13 +484,13 @@ void config_gfx_pool(void) { void display_and_vsync(void) { profiler_log_thread5_time(2); - osRecvMesg(&D_8014EF88, &D_8014F098, 1); + osRecvMesg(&D_8014EF88, &gMainReceivedMesg, 1); send_display_list(&gGfxPool->spTask); profiler_log_thread5_time(3); - osRecvMesg(&D_8014EF70, &D_8014F098, 1); + osRecvMesg(&D_8014EF70, &gMainReceivedMesg, 1); osViSwapBuffer((void *) PHYSICAL_TO_VIRTUAL(gPhysicalFramebuffers[sRenderedFramebuffer])); profiler_log_thread5_time(4); - osRecvMesg(&D_8014EF70, &D_8014F098, 1); + osRecvMesg(&D_8014EF70, &gMainReceivedMesg, 1); func_800046AC(gPhysicalFramebuffers[sRenderedFramebuffer]); if (++sRenderedFramebuffer == 3) { sRenderedFramebuffer = 0; @@ -521,15 +521,15 @@ void dma_copy(u8 *dest, u8 *arg1, u32 size) { osInvalDCache(dest, size); while(size > 0x100) { - osPiStartDma(&D_8014F0A0, 0, 0, (unsigned long)arg1, dest, 0x100, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, arg1, dest, 0x100, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); size -= 0x100; arg1 += 0x100; dest += 0x100; } if (size != 0) { - osPiStartDma(&D_8014F0A0, 0, 0, (unsigned long)arg1, dest, size, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, arg1, dest, size, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); } } @@ -548,14 +548,14 @@ void init_game(void) { func_802A7CF0(&D_801978D0, 0x80242F00); func_80000BEC(); osInvalDCache(SEG_802BA370, 0x5810); - osPiStartDma(&D_8014F0A0, 0, 0, &_data_802BA370SegmentRomStart, SEG_802BA370, 0x5810, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_data_802BA370SegmentRomStart, SEG_802BA370, 0x5810, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); set_segment_base_addr(2, func_802A7D70(&_data_segment2SegmentRomStart, &_data_segment2SegmentRomEnd)); sp2C = (u32)&_common_texturesSegmentRomEnd - (u32)&_common_texturesSegmentRomStart; sp2C = ALIGN16(sp2C); texture_seg = SEG_8028DF00-sp2C; - osPiStartDma(&D_8014F0A0, 0, 0, &_common_texturesSegmentRomStart, texture_seg, sp2C, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_common_texturesSegmentRomStart, texture_seg, sp2C, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); sp40 = *(u32 *)(texture_seg + 4); sp40 = ALIGN16(sp40); @@ -574,9 +574,9 @@ void func_80001404(void) { void func_8000142C(void) { s16 i; - s32 pad0; + s32 pad; u16 temp_v0; - f32 pad = 0; + f32 pad2 = 0; D_80150112 = 0; D_80164AF0 = 0; @@ -608,7 +608,7 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, D_800DDB40, 0); + func_8001EE98(D_800DC4FC, camera1, 0); func_80028F70(); func_8028F474(); func_80059AC8(); @@ -635,8 +635,8 @@ void func_8000142C(void) { D_800DC514 = 0; } - temp_v0 = D_800DDB40->rotX; - D_801625E8 = D_800DC5EC->unk38; + temp_v0 = camera1->rotX2; + D_801625E8 = D_800DC5EC->pathCounter; if (temp_v0 < 0x2000) { func_80057A50(40, 100, "SOUTH ", D_801625E8); } else if (temp_v0 < 0x6000) { @@ -673,9 +673,9 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, D_800DDB40, 0); + func_8001EE98(D_800DC4FC, camera1, 0); func_80029060(); - func_8001EE98(D_800DC500, D_800DDB44, 1); + func_8001EE98(D_800DC500, camera2, 1); func_80029150(); func_8028F474(); func_80059AC8(); @@ -688,7 +688,7 @@ void func_8000142C(void) { func_8005A070(); profiler_log_thread5_time(1); sNumVBlanks = 0; - func_802A7C08(); + move_segment_table_to_dmem(); func_802A3E3C(); if (D_800DC5B0 != 0) { func_802A41D4(); @@ -719,9 +719,9 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, D_800DDB40, 0); + func_8001EE98(D_800DC4FC, camera1, 0); func_80029060(); - func_8001EE98(D_800DC500, D_800DDB44, 1); + func_8001EE98(D_800DC500, camera2, 1); func_80029150(); func_8028F474(); func_80059AC8(); @@ -734,7 +734,7 @@ void func_8000142C(void) { profiler_log_thread5_time(1); sNumVBlanks = (u16)0; func_8005A070(); - func_802A7C08(); + move_segment_table_to_dmem(); func_802A3E3C(); if (D_800DC5B0 != 0) { func_802A41D4(); @@ -786,13 +786,13 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, D_800DDB40, 0); + func_8001EE98(D_800DC4FC, camera1, 0); func_80029158(); - func_8001EE98(D_800DC4E0, D_800DDB44, 1); + func_8001EE98(D_800DC4E0, camera2, 1); func_800291E8(); - func_8001EE98(D_800DC4E4, D_800DDB48, 2); + func_8001EE98(D_800DC4E4, camera3, 2); func_800291F0(); - func_8001EE98(D_800DC4E8, D_800DDB4C, 3); + func_8001EE98(D_800DC4E8, camera4, 3); func_800291F8(); func_8028F474(); func_80059AC8(); @@ -805,7 +805,7 @@ void func_8000142C(void) { func_8005A070(); sNumVBlanks = 0; profiler_log_thread5_time(1); - func_802A7C08(); + move_segment_table_to_dmem(); func_802A3E3C(); if (D_800DC5B0 != 0) { func_802A41D4(); diff --git a/src/main.h b/src/main.h index 1cd29a46b..0398c1730 100644 --- a/src/main.h +++ b/src/main.h @@ -12,4 +12,8 @@ struct GfxPool { extern struct GfxPool *gGfxPool; +extern OSIoMesg gDmaIoMesg; +extern OSMesg gMainReceivedMesg; +extern OSMesgQueue gDmaMesgQueue; + #endif diff --git a/src/memory.c b/src/memory.c index 3412e4414..605e2791a 100644 --- a/src/memory.c +++ b/src/memory.c @@ -2,40 +2,69 @@ #include #include #include "types.h" -#include "memory.h" // Includes from SM64 //#include "buffers/buffers.h" //#include "decompress.h" //#include "game_init.h" -//#include "main.h" +#include "main.h" +#include "memory.h" //#include "segment_symbols.h" //#include "segments.h" -extern uintptr_t gSegmentTable[32]; -u32 sPoolFreeSpace; -u8 *sPoolStart; -u8 *sPoolEnd; -struct MainPoolBlock *sPoolListHeadL; -struct MainPoolBlock *sPoolListHeadR; +#define ALIGN4(val) (((val) + 0x3) & ~0x3) +#define ALIGN16(val) (((val) + 0xF) & ~0xF) +#define ALIGN32(val) (((val) + 0xF) & ~0xF) -extern s32 gPrevLoadedAddress; -extern s32 gPrevMainThreadTask; - -extern s32 gDisplayListHead; -extern u32 D_8015F724; -extern u32 D_802BA278; +struct MainPoolState { + u32 freeSpace; + struct MainPoolBlock *listHeadL; + struct MainPoolBlock *listHeadR; + struct MainPoolState *prev; +}; struct MainPoolBlock { struct MainPoolBlock *prev; struct MainPoolBlock *next; }; -#define ALIGN16(val) (((val) + 0xF) & ~0xF) -#define ALIGN32(val) (((val) + 0xF) & ~0xF) +extern uintptr_t gSegmentTable[16]; +extern s32 D_801502A0; +s32 D_802BA270; +s32 D_802BA274; +u32 sPoolFreeSpace; +struct MainPoolBlock *sPoolListHeadL; +struct MainPoolBlock *sPoolListHeadR; + +extern u32 gPrevLoadedAddress; +extern s32 gPrevMainThreadTask; + +extern Gfx *gDisplayListHead; +extern u32 D_8015F724; +extern u32 gHeapEndPtr; +extern u32 gIsMirrorMode; + +extern struct D_80150158 gD_80150158[]; + +struct MainPoolState *gMainPoolState = NULL; + +struct UnkStruct_802B8CD4 { + s16 unk0; + s16 unk2; + s32 unk4; + s32 unk8; + s32 fill; +}; + +struct UnkStruct_802B8CD4 D_802B8CD4[] = { + 0 +}; +s32 D_802B8CE4 = 0; // pad +s32 D_802B8CE8[] = {0xBC000002, 0x80000040}; + s32 func_802A7B70(s32 segment) { s32 old; old = gPrevLoadedAddress; @@ -56,7 +85,7 @@ void *get_segment_base_addr(s32 segment) { s32 lookup_item(u32 segment) { return (gSegmentTable[segment >> 0x18] + (segment & 0xFFFFFF)) | 0x80000000; } -/* + void move_segment_table_to_dmem(void) { s32 i; @@ -64,414 +93,389 @@ void move_segment_table_to_dmem(void) { gSPSegment(gDisplayListHead++, i, gSegmentTable[i]); } } -void func_802A7CF0(u32 start, u32 end) { - sPoolStart = (u8 *) ALIGN32((uintptr_t) start); - sPoolEnd = (u8 *) ALIGN32((uintptr_t) end); - D_8015F724 = (u32) end - start; - gPrevLoadedAddress = (u32) start; +void func_802A7CF0(s32 start, s32 end) { + + start = ALIGN32(start); + end &= ~0xF; + + D_8015F724 = (end - start) - 0x10; + gPrevLoadedAddress = start; } + + s32 func_802A7D1C(s32 arg0) { - s32 temp_t6; - s32 temp_v0; + s32 addr; - temp_v0 = gPrevLoadedAddress; - temp_t6 = (arg0 + 0xF) & -0x10; - D_8015F724 = (s32) (D_8015F724 - temp_t6); - gPrevLoadedAddress = (s32) (temp_v0 + temp_t6); - return temp_v0; + arg0 = ALIGN32(arg0); + D_8015F724 -= arg0; + addr = gPrevLoadedAddress; + gPrevLoadedAddress += arg0; + + return addr; } -*/ -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *gDisplayListHead; -extern ? gSegmentTable; - -void func_802A7C08(void) { - s32 temp_t0; - void *temp_v1; - void *temp_v1_2; - void *temp_v1_3; - void *temp_v1_4; - s32 phi_a0; - ? *phi_a1; - s32 phi_a2; - s32 phi_a3; - s32 phi_t0; - - phi_a0 = 0; - phi_a1 = &gSegmentTable; - phi_a2 = 4; - phi_a3 = 8; - phi_t0 = 0xC; - do { - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->unk0 = ((phi_a0 & 0xFFFF) << 8) | 0xBC000000 | 6; - temp_v1->unk4 = phi_a1->unk0; - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->unk0 = ((phi_a2 & 0xFFFF) << 8) | 0xBC000000 | 6; - temp_v1_2->unk4 = phi_a1->unk4; - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->unk0 = ((phi_a3 & 0xFFFF) << 8) | 0xBC000000 | 6; - temp_v1_3->unk4 = phi_a1->unk8; - temp_v1_4 = gDisplayListHead; - gDisplayListHead = temp_v1_4 + 8; - temp_v1_4->unk0 = ((phi_t0 & 0xFFFF) << 8) | 0xBC000000 | 6; - temp_t0 = phi_t0 + 0x10; - temp_v1_4->unk4 = phi_a1->unkC; - phi_a0 += 0x10; - phi_a1 += 0x10; - phi_a2 += 0x10; - phi_a3 += 0x10; - phi_t0 = temp_t0; - } while (temp_t0 != 0x4C); +UNUSED void func_802A7D54(s32 arg0, s32 arg1) { + gD_80150158[arg0].unk0 = arg0; + gD_80150158[arg0].unk8 = arg1; } -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A7C08.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_8015F724; -extern s32 gPrevLoadedAddress; - -void func_802A7CF0(s32 arg0, s32 arg1) { - s32 temp_a0; - - temp_a0 = (arg0 + 0xF) & ~0xF; - D_8015F724 = ((arg1 & ~0xF) - temp_a0) - 0x10; - gPrevLoadedAddress = temp_a0; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A7CF0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_8015F724; -extern s32 gPrevLoadedAddress; - -void func_802A7D1C(s32 arg0) { - s32 temp_t6; - - temp_t6 = (arg0 + 0xF) & ~0xF; - D_8015F724 = D_8015F724 - temp_t6; - gPrevLoadedAddress = gPrevLoadedAddress + temp_t6; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A7D1C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? dma_copy(s32, s32, s32); // extern -s32 func_802A7D1C(s32, s32); // extern +void dma_copy(s32, s32, s32); // extern +s32 func_802A7D1C(s32 arg0); // extern s32 func_802A7D70(s32 arg0, s32 arg1) { - s32 sp24; - s32 sp1C; - s32 temp_a2; s32 temp_v0; - s32 phi_a0; + s32 temp_a2 = arg1 - arg0; - temp_a2 = arg1 - arg0; - sp1C = temp_a2; - temp_v0 = func_802A7D1C(temp_a2, temp_a2); - phi_a0 = temp_v0; + temp_v0 = func_802A7D1C(temp_a2); if (temp_v0 != 0) { - sp24 = temp_v0; dma_copy(temp_v0, arg0, temp_a2); - phi_a0 = sp24; } - return phi_a0; + return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A7D70.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern u32 D_802BA278; -extern ? *D_802BA27C; -extern ? *D_802BA280; +UNUSED void main_pool_init(u32 start, u32 end) { + start = ALIGN16(start); + end = ALIGN16(end - 15); -void *func_802A7E14(s32 arg0, s32 arg1) { - ? *temp_a1; - ? *temp_a1_2; - ? *temp_v0_2; - ? *temp_v0_3; - ? *temp_v1; - u32 temp_a0; - u32 temp_v0; - void *phi_v1; + sPoolFreeSpace = (end - start) - 16; - temp_v0 = D_802BA278; - temp_a0 = ((arg0 + 0xF) & ~0xF) + 8; - phi_v1 = NULL; - if (temp_v0 >= temp_a0) { - D_802BA278 = temp_v0 - temp_a0; - if (arg1 == 0) { - temp_a1 = D_802BA27C; - temp_v0_2 = temp_a1 + temp_a0; - temp_a1->unk4 = temp_v0_2; - *temp_v0_2 = D_802BA27C; - temp_v1 = D_802BA27C; - D_802BA27C = temp_v0_2; - return temp_v1 + 8; + sPoolListHeadL = (struct MainPoolBlock *) start; + sPoolListHeadR = (struct MainPoolBlock *) end; + sPoolListHeadL->prev = NULL; + sPoolListHeadL->next = NULL; + sPoolListHeadR->prev = NULL; + sPoolListHeadR->next = NULL; +} + +/** + * Allocate a block of memory from the pool of given size, and from the + * specified side of the pool (MEMORY_POOL_LEFT or MEMORY_POOL_RIGHT). + * If there is not enough space, return NULL. + */ +void *main_pool_alloc(u32 size, u32 side) { + struct MainPoolBlock *newListHead; + void *addr = NULL; + + size = ALIGN16(size) + 8; + if (sPoolFreeSpace >= size) { + sPoolFreeSpace -= size; + if (side == MEMORY_POOL_LEFT) { + newListHead = (struct MainPoolBlock *) ((u8 *) sPoolListHeadL + size); + sPoolListHeadL->next = newListHead; + newListHead->prev = sPoolListHeadL; + addr = (u8 *) sPoolListHeadL + 8; + sPoolListHeadL = newListHead; + } else { + newListHead = (struct MainPoolBlock *) ((u8 *) sPoolListHeadR - size); + sPoolListHeadR->prev = newListHead; + newListHead->next = sPoolListHeadR; + sPoolListHeadR = newListHead; + addr = (u8 *) sPoolListHeadR + 8; } - temp_a1_2 = D_802BA280; - temp_v0_3 = temp_a1_2 - temp_a0; - *temp_a1_2 = temp_v0_3; - temp_v0_3->unk4 = D_802BA280; - D_802BA280 = temp_v0_3; - phi_v1 = temp_v0_3 + 8; - // Duplicate return node #4. Try simplifying control flow for better match - return phi_v1; + } + return addr; +} +/** + * Free a block of memory that was allocated from the pool. The block must be + * the most recently allocated block from its end of the pool, otherwise all + * newer blocks are freed as well. + * Return the amount of free space left in the pool. + */ +u32 main_pool_free(void *addr) { + struct MainPoolBlock *block = (struct MainPoolBlock *) ((u8 *) addr - 8); + struct MainPoolBlock *oldListHead = (struct MainPoolBlock *) ((u8 *) addr - 8); + + if (oldListHead < sPoolListHeadL) { + while (oldListHead->next != NULL) { + oldListHead = oldListHead->next; + } + sPoolListHeadL = block; + sPoolListHeadL->next = NULL; + sPoolFreeSpace += (uintptr_t) oldListHead - (uintptr_t) sPoolListHeadL; + } else { + while (oldListHead->prev != NULL) { + oldListHead = oldListHead->prev; + } + sPoolListHeadR = block->next; + sPoolListHeadR->prev = NULL; + sPoolFreeSpace += (uintptr_t) sPoolListHeadR - (uintptr_t) oldListHead; + } + return sPoolFreeSpace; +} +// main_pool_realloc +UNUSED void *main_pool_realloc(void *addr, u32 size) { + void *newAddr = NULL; + struct MainPoolBlock *block = (struct MainPoolBlock *) ((u8 *) addr - 8); + + if (block->next == sPoolListHeadL) { + main_pool_free(addr); + newAddr = main_pool_alloc(size, MEMORY_POOL_LEFT); + } + return newAddr; +} + +UNUSED s32 main_pool_available(void) { + return sPoolFreeSpace - 8; +} + +UNUSED u32 main_pool_push_state(void) { + struct MainPoolState *prevState = gMainPoolState; + u32 freeSpace = sPoolFreeSpace; + struct MainPoolBlock *lhead = sPoolListHeadL; + struct MainPoolBlock *rhead = sPoolListHeadR; + + gMainPoolState = main_pool_alloc(sizeof(*gMainPoolState), MEMORY_POOL_LEFT); + gMainPoolState->freeSpace = freeSpace; + gMainPoolState->listHeadL = lhead; + gMainPoolState->listHeadR = rhead; + gMainPoolState->prev = prevState; + return sPoolFreeSpace; +} + +/** + * Restore pool state from a previous call to main_pool_push_state. Return the + * amount of free space left in the pool. + */ +UNUSED u32 main_pool_pop_state(void) { + sPoolFreeSpace = gMainPoolState->freeSpace; + sPoolListHeadL = gMainPoolState->listHeadL; + sPoolListHeadR = gMainPoolState->listHeadR; + gMainPoolState = gMainPoolState->prev; + return sPoolFreeSpace; +} +// similar to sm64 dma_read +void *func_802A80B0(u8 *dest, u8 *srcStart, u8 *srcEnd) { + u32 addr; + u32 size = srcStart - dest; + addr = main_pool_alloc(size, srcEnd); + + if (addr != 0) { + + osInvalDCache(addr, size); + osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, dest, addr, size, + &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK); + } + return addr; +} + +// replaces call to dynamic_dma_read with dma_read. +UNUSED void *load_segment(s32 segment, u8 *srcStart, u8 *srcEnd, u32 side) { + void *addr = func_802A80B0(srcStart, srcEnd, side); + + if (addr != NULL) { + set_segment_base_addr(segment, addr); + } + return addr; +} + +// Similar to sm64 load_to_fixed_pool_addr? +void *func_802A8190(s32 arg0, s32 arg1) { + //u32 srcSize = ALIGN16(srcEnd - srcStart); + //u32 destSize = ALIGN16((u8 *) sPoolListHeadR - destAddr); + u32 addr; + u32 temp_v0 = D_802B8CD4[arg0].unk4; + u32 temp_v1 = D_802B8CD4[arg0].unk8; + u32 temp_v2 = D_802B8CD4[arg0].unk2; + addr = func_802A80B0(temp_v0, temp_v1, arg1); + + //dest = main_pool_alloc(destSize, MEMORY_POOL_RIGHT); + if (addr != 0) { + + set_segment_base_addr(temp_v2, addr); + } + return addr; +} + +UNUSED void func_802A81EC(void) { + u32 addr; + s32 temp_s0; + s16 *phi_s1; + s32 phi_s0; + + phi_s1 = &D_802B8CD4; + phi_s0 = 0; + do { + if ((*phi_s1 & 1) != 0) { + func_802A8190(phi_s0, 0); + } + temp_s0 = phi_s0 + 1; + phi_s1 += 8; + phi_s0 = temp_s0; + } while (phi_s0 != 3); +} + +UNUSED struct AllocOnlyPool *alloc_only_pool_init(u32 size, u32 side) { + void *addr; + struct AllocOnlyPool *subPool = NULL; + + size = ALIGN4(size); + addr = main_pool_alloc(size + sizeof(struct AllocOnlyPool), side); + if (addr != NULL) { + subPool = (struct AllocOnlyPool *) addr; + subPool->totalSpace = size; + subPool->usedSpace = (u8 *) addr + sizeof(struct AllocOnlyPool); + subPool->startPtr = 0; + subPool->freePtr = (u8 *) addr + sizeof(struct AllocOnlyPool); + } + return subPool; +} + +UNUSED u32 func_802A82AC(s32 arg0) { + u32 temp_v0; + u32 phi_v1; + + temp_v0 = D_801502A0 - arg0; + phi_v1 = 0; + if (temp_v0 >= (u32) gDisplayListHead) { + D_801502A0 = temp_v0; + phi_v1 = temp_v0; } return phi_v1; } -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A7E14.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_802BA278; -extern u32 D_802BA27C; -extern s32 *D_802BA280; - -s32 func_802A7EA4(s32 arg0) { - ? *temp_a0_2; - s32 *temp_a0; - u32 temp_v0; - s32 *phi_a0; - u32 phi_v1; - ? *phi_a0_2; - u32 phi_v1_2; - - temp_v0 = arg0 - 8; - phi_v1 = temp_v0; - phi_v1_2 = temp_v0; - if (temp_v0 < D_802BA27C) { - if (temp_v0->unk4 != 0) { - phi_a0 = temp_v0->unk4; - do { - temp_a0 = phi_a0->unk4; - phi_a0 = temp_a0; - phi_v1 = phi_a0; - } while (temp_a0 != 0); - } - D_802BA27C = temp_v0; - D_802BA27C->unk4 = 0; - D_802BA278 = (D_802BA278 + phi_v1) - D_802BA27C; - } else { - if (temp_v0->unk0 != 0) { - phi_a0_2 = temp_v0->unk0; - do { - temp_a0_2 = *phi_a0_2; - phi_a0_2 = temp_a0_2; - phi_v1_2 = phi_a0_2; - } while (temp_a0_2 != 0); - } - D_802BA280 = temp_v0->unk4; - *D_802BA280 = 0; - D_802BA278 = (D_802BA278 + D_802BA280) - phi_v1_2; - } - return D_802BA278; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A7EA4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void *func_802A7E14(u32, ?); // extern -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; -extern OSIoMesg D_8014F0A0; - -void *func_802A80B0(u32 arg0, s32 arg1, ? arg2) { - void *sp34; - u32 sp2C; - u32 temp_a0; - void *temp_v0; - - temp_a0 = arg1 - arg0; - sp2C = temp_a0; - temp_v0 = func_802A7E14(temp_a0, arg2); - sp34 = temp_v0; - if (temp_v0 != 0) { - osInvalDCache(temp_v0, sp2C); - osPiStartDma(&D_8014F0A0, 0, 0, arg0, sp34, sp2C, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); - } - return sp34; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A80B0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_802A80B0(s32, s32, ?); // extern -extern ? D_802B8CD4; - -s32 func_802A8190(s32 arg0, ? arg1) { - s32 sp24; - s32 sp18; - s32 temp_v0_2; - void *temp_v0; - s32 phi_a1; - - temp_v0 = (arg0 * 0x10) + &D_802B8CD4; - sp18 = temp_v0->unk2; - temp_v0_2 = func_802A80B0(temp_v0->unk4, temp_v0->unk8, arg1); - phi_a1 = temp_v0_2; - if (temp_v0_2 != 0) { - sp24 = temp_v0_2; - set_segment_base_addr(sp18, temp_v0_2); - phi_a1 = sp24; - } - return phi_a1; -} -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A8190.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? dma_copy(s32, s32, s32, s32); // extern -extern s32 gPrevLoadedAddress; s32 func_802A82E4(s32 arg0, s32 arg1) { s32 sp24; s32 sp1C; - s32 temp_a0; - s32 temp_t6; - temp_a0 = gPrevLoadedAddress; - temp_t6 = ((arg1 - arg0) + 0xF) & ~0xF; - sp1C = temp_t6; - sp24 = temp_a0; - dma_copy(temp_a0, arg0, temp_t6, arg1); - gPrevLoadedAddress = gPrevLoadedAddress + sp1C; + sp1C = ALIGN16(arg1 - arg0); + sp24 = gPrevLoadedAddress; + dma_copy(sp24, arg0, sp1C); + gPrevLoadedAddress += sp1C; return sp24; } -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A82E4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; -extern OSIoMesg D_8014F0A0; -extern ? _other_texturesSegmentRomStart; -extern u8 *gPrevLoadedAddress; +extern u8 _other_texturesSegmentRomStart[]; +// unused mio0 decode func. +UNUSED s32 func_802A8348(s32 arg0, s32 arg1, s32 arg2) { + s32 offset; + UNUSED s32 *pad; + s32 oldAddr; + s32 newAddr; + + offset = ALIGN16(arg1 * arg2); + oldAddr = gPrevLoadedAddress; + newAddr = oldAddr + offset; + pad = &newAddr; + osInvalDCache(newAddr, offset); + osPiStartDma(&gDmaIoMesg, 0, 0, &_other_texturesSegmentRomStart[arg0 & 0xFFFFFF], newAddr, offset, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); + + func_80040030(newAddr, oldAddr); + gPrevLoadedAddress += offset; + return oldAddr; +} -u8 *func_802A84F4(s32 arg0, u32 arg1, s32 arg2) { - u8 *sp2C; - void *sp28; - u32 temp_a1; +UNUSED s32 func_802A841C(s32 arg0, s32 arg1, s32 arg2) { + s32 temp_v0; + s32 temp_a0; + temp_v0 = gPrevLoadedAddress; + temp_a0 = temp_v0 + arg2; + arg1 = ALIGN16(arg1); + arg2 = ALIGN16(arg2); + + osInvalDCache(temp_a0, arg1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_other_texturesSegmentRomStart[arg0 & 0xFFFFFF],temp_a0, arg1, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); + func_80040030(temp_a0, temp_v0); + gPrevLoadedAddress += arg2; + return temp_v0; +} + +s32 func_802A84F4(s32 arg0, u32 arg1, u32 arg2) { u8 *temp_v0; - void *temp_a0; + u32 temp_a0; temp_v0 = gPrevLoadedAddress; temp_a0 = temp_v0 + arg2; - temp_a1 = (arg1 + 0xF) & ~0xF; - arg2 = (arg2 + 0xF) & ~0xF; - arg1 = temp_a1; - sp28 = temp_a0; - sp2C = temp_v0; - osInvalDCache(temp_a0, temp_a1); - osPiStartDma(&D_8014F0A0, 0, 0, (arg0 & 0xFFFFFF) + &_other_texturesSegmentRomStart, sp28, arg1, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); - mio0decode(temp_a0, sp2C); - gPrevLoadedAddress = &gPrevLoadedAddress[arg2]; + arg1 = ALIGN16(arg1); + arg2 = ALIGN16(arg2); + osInvalDCache(temp_a0, arg1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_other_texturesSegmentRomStart[arg0 & 0xFFFFFF], temp_a0, arg1, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, (int) 1); + mio0decode(temp_a0, temp_v0); + gPrevLoadedAddress += arg2; return temp_v0; } -#else -GLOBAL_ASM("asm/non_matchings/memory/func_802A84F4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern OSMesgQueue D_8014EF58; -extern void *D_8014F098; -extern OSIoMesg D_8014F0A0; -extern ? _other_texturesSegmentRomStart; -extern void *gPrevLoadedAddress; +u32 MIO0_0F(s32 arg0, u32 arg1, u32 arg2) { + u32 oldHeapEndPtr; + u8 *temp_v0; + u32 temp_a0; -void *MIO0_0F(s32 arg0, u32 arg1, s32 arg2) { - void *sp2C; - void *sp28; - u32 temp_a1; - void *temp_a0; + arg1 = ALIGN16(arg1); + arg2 = ALIGN16(arg2); + oldHeapEndPtr = gHeapEndPtr; + temp_v0 = gPrevLoadedAddress; - temp_a0 = gPrevLoadedAddress; - temp_a1 = (arg1 + 0xF) & ~0xF; - arg2 = (arg2 + 0xF) & ~0xF; - arg1 = temp_a1; - sp2C = gHeapEndPtr; - sp28 = temp_a0; - osInvalDCache(temp_a0, temp_a1); - osPiStartDma(&D_8014F0A0, 0, 0, (arg0 & 0xFFFFFF) + &_other_texturesSegmentRomStart, sp28, arg1, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); - mio0decode(temp_a0, sp2C); + osInvalDCache(temp_v0, arg1); + osPiStartDma(&gDmaIoMesg, 0, 0, &_other_texturesSegmentRomStart[arg0 & 0xFFFFFF], temp_v0, arg1, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); + mio0decode(temp_v0, oldHeapEndPtr); gHeapEndPtr += arg2; - return sp2C; + return oldHeapEndPtr; } -#else -GLOBAL_ASM("asm/non_matchings/memory/MIO0_0F.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern f32 D_800DC608; +// 802A86C0, 00000010 +struct UnkStruct_802A86A8 { + s8 unk0; + s8 unk1; + s8 unk2; + s8 unk3; + s16 unk4; + s16 unk6; + s16 unk8; + s16 unkA; + s16 unkC; + s16 unkE; -void func_802A86A8(void *arg0, u32 arg1) { +}; + +void func_802A86A8(struct UnkStruct_802A86A8 *arg0, u32 arg1) { s8 temp_a0; s8 temp_a3; u32 temp_a2; - void *temp_v0; - void *temp_v1; - void *temp_v1_2; - void *phi_v0; - void *phi_v1; + struct UnkStruct_802A86A8 *temp_v0; + u32 temp_v1; + struct UnkStruct_802A86A8 *temp_v1_2; + struct UnkStruct_802A86A8 *phi_v0; + s8 phi_v1; u32 phi_a2; temp_v1 = gHeapEndPtr - (((arg1 * 0x10) + 0xF) & ~0xF); gHeapEndPtr = temp_v1; phi_v0 = arg0; - phi_a2 = 0; + phi_a2 = 0; + // phi_v1 = temp_v1; + + if (arg1 != 0) { - phi_v1 = temp_v1; do { if (gIsMirrorMode != 0) { - *phi_v1 = -phi_v0->unk0; + phi_v1 = -phi_v0->unk0; } else { - *phi_v1 = phi_v0->unk0; + phi_v1 = phi_v0->unk0; } temp_a2 = phi_a2 + 1; temp_v1_2 = phi_v1 + 0x10; temp_v0 = phi_v0 + 0xE; - temp_v1_2->unk-E = phi_v0->unk2 * D_800DC608; - temp_a0 = temp_v0->unk-4; - temp_a3 = temp_v0->unk-3; - temp_v1_2->unk-C = temp_v0->unk-A; - temp_v1_2->unk-8 = temp_v0->unk-8; - temp_v1_2->unk-4 = temp_a0 & 0xFC; - temp_v1_2->unk-3 = temp_a3 & 0xFC; - temp_v1_2->unk-6 = temp_v0->unk-6; - temp_v1_2->unk-2 = temp_v0->unk-2; - temp_v1_2->unk-A = (temp_a0 & 3) | ((temp_a3 * 4) & 0xC); - temp_v1_2->unk-1 = 0xFF; + temp_v1_2->unkE = phi_v0->unk2 * D_800DC608; + temp_a0 = temp_v0->unk4; + temp_a3 = temp_v0->unk3; + temp_v1_2->unkC = temp_v0->unkA; + temp_v1_2->unk8 = temp_v0->unk8; + temp_v1_2->unk4 = temp_a0 & 0xFC; + temp_v1_2->unk3 = temp_a3 & 0xFC; + temp_v1_2->unk6 = temp_v0->unk6; + temp_v1_2->unk2 = temp_v0->unk2; + temp_v1_2->unkA = (temp_a0 & 3) | ((temp_a3 * 4) & 0xC); + temp_v1_2->unk1 = 0xFF; phi_v0 = temp_v0; - phi_v1 = temp_v1_2; + // phi_v1 = temp_v1_2; phi_a2 = temp_a2; } while (temp_a2 < arg1); } @@ -482,20 +486,26 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802A86A8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_802A86A8(u8 *, s32); // extern -extern u8 *gPrevLoadedAddress; -extern ? gSegmentTable; +//? func_802A86A8(u8 *, s32); // extern +void func_802A87A8(s32 arg0, u32 arg1) { + //u8 *sp18; + u8 temp_v0; + u32 endptr; + u32 *addr; -void func_802A87A8(u32 arg0, s32 arg1) { - u8 *sp18; - u8 *temp_v0; + temp_v0 = ALIGN16(arg1 * 0x18); + gPrevLoadedAddress += temp_v0; + addr = VIRTUAL_TO_PHYSICAL2(&gSegmentTable[((arg0 >> 0x18) * 4)] + arg0); + // &gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000 + //sp18 = temp_v0; + mio0decode(addr, temp_v0); + func_802A86A8(temp_v0, arg1); + endptr = gHeapEndPtr; + set_segment_base_addr(4, endptr); +} + +UNUSED void func_802A8844(void) { - temp_v0 = gPrevLoadedAddress; - gPrevLoadedAddress = temp_v0 + (((arg1 * 0x18) + 0xF) & ~0xF); - sp18 = temp_v0; - mio0decode(*(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000, temp_v0); - func_802A86A8(sp18, arg1); - set_segment_base_addr(4, gHeapEndPtr); } #else GLOBAL_ASM("asm/non_matchings/memory/func_802A87A8.s") diff --git a/src/memory.h b/src/memory.h index 244194123..bac6864ba 100644 --- a/src/memory.h +++ b/src/memory.h @@ -12,6 +12,12 @@ uintptr_t set_segment_base_addr(s32 segment, void *addr); void *get_segment_base_addr(s32 segment); s32 lookup_item(u32 segment); +struct AllocOnlyPool { + s32 totalSpace; + s32 usedSpace; + u8 *startPtr; + u8 *freePtr; +}; #endif // MEMORY_H diff --git a/src/staff_ghosts.c b/src/staff_ghosts.c index 116b343fc..bd416fc24 100644 --- a/src/staff_ghosts.c +++ b/src/staff_ghosts.c @@ -57,10 +57,10 @@ extern u8 D_802DAB80[20480]; u32 *D_800DC710 = &D_802D2B80[0]; u32 *D_800DC714 = &D_802DAB80[0]; -extern OSIoMesg *D_8014F0A0; +extern OSIoMesg *gDmaIoMesg; extern u8 _kart_texturesSegmentRomStart; -extern OSMesgQueue D_8014EF58; -extern OSMesg D_8014F098; +extern OSMesgQueue gDmaMesgQueue; +extern OSMesg gMainReceivedMesg; extern s16 gCurrentCourseId; extern s32 gModeSelection; @@ -88,8 +88,8 @@ extern s32 D_80164398; void func_80004EF0(void) { D_80162DA4 = &D_802D2B80[0]; osInvalDCache(&D_80162DA4[0], 0x4000); - osPiStartDma(&D_8014F0A0, 0, 0, (D_80162DC4 & 0xFFFFFF) + &_kart_texturesSegmentRomStart, D_80162DA4, 0x4000, &D_8014EF58); - osRecvMesg(&D_8014EF58, &D_8014F098, 1); + osPiStartDma(&gDmaIoMesg, 0, 0, (D_80162DC4 & 0xFFFFFF) + &_kart_texturesSegmentRomStart, D_80162DA4, 0x4000, &gDmaMesgQueue); + osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); D_80162D9C = (*D_80162DA4 & 0xFF0000); D_80162DA0 = 0; }