From 9f2330e25919ceb09c965f0f2072a3ca4ee35572 Mon Sep 17 00:00:00 2001 From: AloXado320 <38191089+AloXado320@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:24:43 -0500 Subject: [PATCH] Migrate some rodata files to C, for files in NEEDS_RODATA state (#427) * Migrate some rodata files to C, for file on NEEDS_RODATA state * clarify odd texture variable, split unused vertices * Remove unused file --- asm/bss_8001C4D0.s | 1 - .../code_80057C60/func_80066714.s | 163 ------- .../code_80057C60/func_80066BAC.s | 445 ------------------ .../code_80057C60/func_80067964.s | 248 ---------- .../code_80057C60/func_80068310.s | 263 ----------- .../code_80057C60/func_80068724.s | 226 --------- .../code_80057C60/func_80068AA4.s | 193 -------- .../code_80057C60/func_80068DA0.s | 264 ----------- .../code_80057C60/func_800691B8.s | 165 ------- .../code_80057C60/func_80069444.s | 164 ------- .../code_80057C60/func_800696CC.s | 157 ------ .../code_80057C60/func_80069938.s | 158 ------- .../code_80057C60/func_80069DB8.s | 155 ------ .../code_80057C60/func_8006A280.s | 165 ------- .../code_80057C60/func_8006C294.s | 146 ------ .../code_80057C60/render_balloon.s | 370 --------------- .../hud_renderer/func_8004E78C.s | 30 -- .../hud_renderer/func_8004EB38.s | 135 ------ .../hud_renderer/func_8005217C.s | 16 +- .../hud_renderer/func_800528EC.s | 4 +- .../hud_renderer/func_80052C60.s | 4 +- .../hud_renderer/func_80052E30.s | 4 +- .../hud_renderer/func_800534E8.s | 139 ------ .../hud_renderer/func_80053870.s | 4 +- data/data_800E8700.s | 166 ------- data/data_code_80071F00.s | 131 ------ mk64.ld | 5 +- src/code_80057C60.c | 145 +----- src/code_80057C60.h | 16 + src/code_80071F00.c | 60 +++ src/code_80071F00.h | 1 + src/data_800E45C0.c | 75 +++ src/data_800E8700.c | 214 +++++++++ src/hud_renderer.c | 61 +-- 34 files changed, 424 insertions(+), 4069 deletions(-) delete mode 100644 asm/non_matchings/code_80057C60/func_80066714.s delete mode 100644 asm/non_matchings/code_80057C60/func_80066BAC.s delete mode 100644 asm/non_matchings/code_80057C60/func_80067964.s delete mode 100644 asm/non_matchings/code_80057C60/func_80068310.s delete mode 100644 asm/non_matchings/code_80057C60/func_80068724.s delete mode 100644 asm/non_matchings/code_80057C60/func_80068AA4.s delete mode 100644 asm/non_matchings/code_80057C60/func_80068DA0.s delete mode 100644 asm/non_matchings/code_80057C60/func_800691B8.s delete mode 100644 asm/non_matchings/code_80057C60/func_80069444.s delete mode 100644 asm/non_matchings/code_80057C60/func_800696CC.s delete mode 100644 asm/non_matchings/code_80057C60/func_80069938.s delete mode 100644 asm/non_matchings/code_80057C60/func_80069DB8.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006A280.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006C294.s delete mode 100644 asm/non_matchings/code_80057C60/render_balloon.s delete mode 100644 asm/non_matchings/hud_renderer/func_8004E78C.s delete mode 100644 asm/non_matchings/hud_renderer/func_8004EB38.s delete mode 100644 asm/non_matchings/hud_renderer/func_800534E8.s delete mode 100644 data/data_800E8700.s delete mode 100644 data/data_code_80071F00.s create mode 100644 src/data_800E45C0.c create mode 100644 src/data_800E8700.c diff --git a/asm/bss_8001C4D0.s b/asm/bss_8001C4D0.s index 03d7fc73b..f5d583cba 100644 --- a/asm/bss_8001C4D0.s +++ b/asm/bss_8001C4D0.s @@ -595,7 +595,6 @@ glabel D_80165A90 glabel D_80165C18 .skip 164 -# Currently referenced in func_800534E8.s, but that function is in NEEDS_RODATA state glabel D_80165CBC .skip 2 diff --git a/asm/non_matchings/code_80057C60/func_80066714.s b/asm/non_matchings/code_80057C60/func_80066714.s deleted file mode 100644 index fa833b678..000000000 --- a/asm/non_matchings/code_80057C60/func_80066714.s +++ /dev/null @@ -1,163 +0,0 @@ -glabel func_80066714 -/* 067314 80066714 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 067318 80066718 AFA60070 */ sw $a2, 0x70($sp) -/* 06731C 8006671C 00067400 */ sll $t6, $a2, 0x10 -/* 067320 80066720 000E3403 */ sra $a2, $t6, 0x10 -/* 067324 80066724 000678C0 */ sll $t7, $a2, 3 -/* 067328 80066728 01E67821 */ addu $t7, $t7, $a2 -/* 06732C 8006672C AFA70074 */ sw $a3, 0x74($sp) -/* 067330 80066730 0007C600 */ sll $t8, $a3, 0x18 -/* 067334 80066734 000F78C0 */ sll $t7, $t7, 3 -/* 067338 80066738 00183E03 */ sra $a3, $t8, 0x18 -/* 06733C 8006673C AFBF0014 */ sw $ra, 0x14($sp) -/* 067340 80066740 AFA40068 */ sw $a0, 0x68($sp) -/* 067344 80066744 AFA5006C */ sw $a1, 0x6c($sp) -/* 067348 80066748 008F1021 */ addu $v0, $a0, $t7 -/* 06734C 8006674C 84580544 */ lh $t8, 0x544($v0) -/* 067350 80066750 24010001 */ li $at, 1 -/* 067354 80066754 00807025 */ move $t6, $a0 -/* 067358 80066758 5701008C */ bnel $t8, $at, .L8006698C -/* 06735C 8006675C 8FBF0014 */ lw $ra, 0x14($sp) -/* 067360 80066760 84590560 */ lh $t9, 0x560($v0) -/* 067364 80066764 27A50054 */ addiu $a1, $sp, 0x54 -/* 067368 80066768 A7B90052 */ sh $t9, 0x52($sp) -/* 06736C 8006676C 844F0562 */ lh $t7, 0x562($v0) -/* 067370 80066770 A7AF0050 */ sh $t7, 0x50($sp) -/* 067374 80066774 84580564 */ lh $t8, 0x564($v0) -/* 067378 80066778 00077840 */ sll $t7, $a3, 1 -/* 06737C 8006677C A7B8004E */ sh $t8, 0x4e($sp) -/* 067380 80066780 84590566 */ lh $t9, 0x566($v0) -/* 067384 80066784 008FC021 */ addu $t8, $a0, $t7 -/* 067388 80066788 27A4005C */ addiu $a0, $sp, 0x5c -/* 06738C 8006678C A7B9004C */ sh $t9, 0x4c($sp) -/* 067390 80066790 C4440528 */ lwc1 $f4, 0x528($v0) -/* 067394 80066794 E7A4005C */ swc1 $f4, 0x5c($sp) -/* 067398 80066798 C446052C */ lwc1 $f6, 0x52c($v0) -/* 06739C 8006679C E7A60060 */ swc1 $f6, 0x60($sp) -/* 0673A0 800667A0 C4480530 */ lwc1 $f8, 0x530($v0) -/* 0673A4 800667A4 A7A00054 */ sh $zero, 0x54($sp) -/* 0673A8 800667A8 E7A80064 */ swc1 $f8, 0x64($sp) -/* 0673AC 800667AC 87190048 */ lh $t9, 0x48($t8) -/* 0673B0 800667B0 A7A00058 */ sh $zero, 0x58($sp) -/* 0673B4 800667B4 A7B90056 */ sh $t9, 0x56($sp) -/* 0673B8 800667B8 C5D00224 */ lwc1 $f16, 0x224($t6) -/* 0673BC 800667BC C44A0534 */ lwc1 $f10, 0x534($v0) -/* 0673C0 800667C0 46105482 */ mul.s $f18, $f10, $f16 -/* 0673C4 800667C4 44069000 */ mfc1 $a2, $f18 -/* 0673C8 800667C8 0C0194B5 */ jal func_800652D4 -/* 0673CC 800667CC 00000000 */ nop -/* 0673D0 800667D0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0673D4 800667D4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0673D8 800667D8 8C620000 */ lw $v0, ($v1) -/* 0673DC 800667DC 3C190D01 */ lui $t9, %hi(D_0D008C90) # $t9, 0xd01 -/* 0673E0 800667E0 27398C90 */ addiu $t9, %lo(D_0D008C90) # addiu $t9, $t9, -0x7370 -/* 0673E4 800667E4 244F0008 */ addiu $t7, $v0, 8 -/* 0673E8 800667E8 AC6F0000 */ sw $t7, ($v1) -/* 0673EC 800667EC 3C180600 */ lui $t8, 0x600 -/* 0673F0 800667F0 AC580000 */ sw $t8, ($v0) -/* 0673F4 800667F4 AC590004 */ sw $t9, 4($v0) -/* 0673F8 800667F8 8C620000 */ lw $v0, ($v1) -/* 0673FC 800667FC 3C0FBA00 */ lui $t7, (0xBA000E02 >> 16) # lui $t7, 0xba00 -/* 067400 80066800 35EF0E02 */ ori $t7, (0xBA000E02 & 0xFFFF) # ori $t7, $t7, 0xe02 -/* 067404 80066804 244E0008 */ addiu $t6, $v0, 8 -/* 067408 80066808 AC6E0000 */ sw $t6, ($v1) -/* 06740C 8006680C AC400004 */ sw $zero, 4($v0) -/* 067410 80066810 AC4F0000 */ sw $t7, ($v0) -/* 067414 80066814 8C620000 */ lw $v0, ($v1) -/* 067418 80066818 3C0E0D00 */ lui $t6, %hi(D_0D000200) # $t6, 0xd00 -/* 06741C 8006681C 25CE0200 */ addiu $t6, %lo(D_0D000200) # addiu $t6, $t6, 0x200 -/* 067420 80066820 24580008 */ addiu $t8, $v0, 8 -/* 067424 80066824 AC780000 */ sw $t8, ($v1) -/* 067428 80066828 3C19FD10 */ lui $t9, 0xfd10 -/* 06742C 8006682C AC590000 */ sw $t9, ($v0) -/* 067430 80066830 AC4E0004 */ sw $t6, 4($v0) -/* 067434 80066834 8C620000 */ lw $v0, ($v1) -/* 067438 80066838 3C190708 */ lui $t9, (0x07080200 >> 16) # lui $t9, 0x708 -/* 06743C 8006683C 37390200 */ ori $t9, (0x07080200 & 0xFFFF) # ori $t9, $t9, 0x200 -/* 067440 80066840 244F0008 */ addiu $t7, $v0, 8 -/* 067444 80066844 AC6F0000 */ sw $t7, ($v1) -/* 067448 80066848 3C18F510 */ lui $t8, 0xf510 -/* 06744C 8006684C AC580000 */ sw $t8, ($v0) -/* 067450 80066850 AC590004 */ sw $t9, 4($v0) -/* 067454 80066854 8C620000 */ lw $v0, ($v1) -/* 067458 80066858 3C0FE600 */ lui $t7, 0xe600 -/* 06745C 8006685C 3C19F300 */ lui $t9, 0xf300 -/* 067460 80066860 244E0008 */ addiu $t6, $v0, 8 -/* 067464 80066864 AC6E0000 */ sw $t6, ($v1) -/* 067468 80066868 AC400004 */ sw $zero, 4($v0) -/* 06746C 8006686C AC4F0000 */ sw $t7, ($v0) -/* 067470 80066870 8C620000 */ lw $v0, ($v1) -/* 067474 80066874 3C0E077F */ lui $t6, (0x077FF100 >> 16) # lui $t6, 0x77f -/* 067478 80066878 35CEF100 */ ori $t6, (0x077FF100 & 0xFFFF) # ori $t6, $t6, 0xf100 -/* 06747C 8006687C 24580008 */ addiu $t8, $v0, 8 -/* 067480 80066880 AC780000 */ sw $t8, ($v1) -/* 067484 80066884 AC4E0004 */ sw $t6, 4($v0) -/* 067488 80066888 AC590000 */ sw $t9, ($v0) -/* 06748C 8006688C 8C620000 */ lw $v0, ($v1) -/* 067490 80066890 3C18E700 */ lui $t8, 0xe700 -/* 067494 80066894 3C0EF510 */ lui $t6, (0xF5101000 >> 16) # lui $t6, 0xf510 -/* 067498 80066898 244F0008 */ addiu $t7, $v0, 8 -/* 06749C 8006689C AC6F0000 */ sw $t7, ($v1) -/* 0674A0 800668A0 AC400004 */ sw $zero, 4($v0) -/* 0674A4 800668A4 AC580000 */ sw $t8, ($v0) -/* 0674A8 800668A8 8C620000 */ lw $v0, ($v1) -/* 0674AC 800668AC 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 0674B0 800668B0 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 0674B4 800668B4 24590008 */ addiu $t9, $v0, 8 -/* 0674B8 800668B8 AC790000 */ sw $t9, ($v1) -/* 0674BC 800668BC AFA2002C */ sw $v0, 0x2c($sp) -/* 0674C0 800668C0 35CE1000 */ ori $t6, (0xF5101000 & 0xFFFF) # ori $t6, $t6, 0x1000 -/* 0674C4 800668C4 AC4E0000 */ sw $t6, ($v0) -/* 0674C8 800668C8 AC580004 */ sw $t8, 4($v0) -/* 0674CC 800668CC 8C620000 */ lw $v0, ($v1) -/* 0674D0 800668D0 3C0F0007 */ lui $t7, (0x0007C0FC >> 16) # lui $t7, 7 -/* 0674D4 800668D4 35EFC0FC */ ori $t7, (0x0007C0FC & 0xFFFF) # ori $t7, $t7, 0xc0fc -/* 0674D8 800668D8 24590008 */ addiu $t9, $v0, 8 -/* 0674DC 800668DC AC790000 */ sw $t9, ($v1) -/* 0674E0 800668E0 AFA20028 */ sw $v0, 0x28($sp) -/* 0674E4 800668E4 3C0EF200 */ lui $t6, 0xf200 -/* 0674E8 800668E8 AC4E0000 */ sw $t6, ($v0) -/* 0674EC 800668EC AC4F0004 */ sw $t7, 4($v0) -/* 0674F0 800668F0 87A7004C */ lh $a3, 0x4c($sp) -/* 0674F4 800668F4 87A6004E */ lh $a2, 0x4e($sp) -/* 0674F8 800668F8 87A50050 */ lh $a1, 0x50($sp) -/* 0674FC 800668FC 0C012CD7 */ jal func_8004B35C -/* 067500 80066900 87A40052 */ lh $a0, 0x52($sp) -/* 067504 80066904 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 067508 80066908 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06750C 8006690C 8C620000 */ lw $v0, ($v1) -/* 067510 80066910 3C0EB900 */ lui $t6, (0xB900031D >> 16) # lui $t6, 0xb900 -/* 067514 80066914 3C0F0050 */ lui $t7, (0x00504A50 >> 16) # lui $t7, 0x50 -/* 067518 80066918 24590008 */ addiu $t9, $v0, 8 -/* 06751C 8006691C AC790000 */ sw $t9, ($v1) -/* 067520 80066920 35EF4A50 */ ori $t7, (0x00504A50 & 0xFFFF) # ori $t7, $t7, 0x4a50 -/* 067524 80066924 35CE031D */ ori $t6, (0xB900031D & 0xFFFF) # ori $t6, $t6, 0x31d -/* 067528 80066928 AC4E0000 */ sw $t6, ($v0) -/* 06752C 8006692C AC4F0004 */ sw $t7, 4($v0) -/* 067530 80066930 8C620000 */ lw $v0, ($v1) -/* 067534 80066934 3C0E800F */ lui $t6, %hi(D_800E8B00) # $t6, 0x800f -/* 067538 80066938 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 06753C 8006693C 24580008 */ addiu $t8, $v0, 8 -/* 067540 80066940 AC780000 */ sw $t8, ($v1) -/* 067544 80066944 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 067548 80066948 25CE8B00 */ addiu $t6, %lo(D_800E8B00) # addiu $t6, $t6, -0x7500 -/* 06754C 8006694C AC4E0004 */ sw $t6, 4($v0) -/* 067550 80066950 AC590000 */ sw $t9, ($v0) -/* 067554 80066954 8C620000 */ lw $v0, ($v1) -/* 067558 80066958 3C190D01 */ lui $t9, %hi(D_0D008DA0) # $t9, 0xd01 -/* 06755C 8006695C 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 067560 80066960 244F0008 */ addiu $t7, $v0, 8 -/* 067564 80066964 AC6F0000 */ sw $t7, ($v1) -/* 067568 80066968 27398DA0 */ addiu $t9, %lo(D_0D008DA0) # addiu $t9, $t9, -0x7260 -/* 06756C 8006696C 3C180600 */ lui $t8, 0x600 -/* 067570 80066970 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 067574 80066974 AC580000 */ sw $t8, ($v0) -/* 067578 80066978 AC590004 */ sw $t9, 4($v0) -/* 06757C 8006697C 84EE0000 */ lh $t6, ($a3) -/* 067580 80066980 25CF0001 */ addiu $t7, $t6, 1 -/* 067584 80066984 A4EF0000 */ sh $t7, ($a3) -/* 067588 80066988 8FBF0014 */ lw $ra, 0x14($sp) -.L8006698C: -/* 06758C 8006698C 27BD0068 */ addiu $sp, $sp, 0x68 -/* 067590 80066990 03E00008 */ jr $ra -/* 067594 80066994 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80066BAC.s b/asm/non_matchings/code_80057C60/func_80066BAC.s deleted file mode 100644 index 603553e69..000000000 --- a/asm/non_matchings/code_80057C60/func_80066BAC.s +++ /dev/null @@ -1,445 +0,0 @@ -glabel func_80066BAC -/* 0677AC 80066BAC 27BDFF18 */ addiu $sp, $sp, -0xe8 -/* 0677B0 80066BB0 00067400 */ sll $t6, $a2, 0x10 -/* 0677B4 80066BB4 000E7C03 */ sra $t7, $t6, 0x10 -/* 0677B8 80066BB8 000FC0C0 */ sll $t8, $t7, 3 -/* 0677BC 80066BBC 030FC021 */ addu $t8, $t8, $t7 -/* 0677C0 80066BC0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0677C4 80066BC4 0018C0C0 */ sll $t8, $t8, 3 -/* 0677C8 80066BC8 AFB00018 */ sw $s0, 0x18($sp) -/* 0677CC 80066BCC AFA500EC */ sw $a1, 0xec($sp) -/* 0677D0 80066BD0 AFA600F0 */ sw $a2, 0xf0($sp) -/* 0677D4 80066BD4 AFA700F4 */ sw $a3, 0xf4($sp) -/* 0677D8 80066BD8 0098F821 */ addu $ra, $a0, $t8 -/* 0677DC 80066BDC 87F90274 */ lh $t9, 0x274($ra) -/* 0677E0 80066BE0 24010001 */ li $at, 1 -/* 0677E4 80066BE4 00808025 */ move $s0, $a0 -/* 0677E8 80066BE8 572101A1 */ bnel $t9, $at, .L80067270 -/* 0677EC 80066BEC 8FBF001C */ lw $ra, 0x1c($sp) -/* 0677F0 80066BF0 87EE0290 */ lh $t6, 0x290($ra) -/* 0677F4 80066BF4 240100FF */ li $at, 255 -/* 0677F8 80066BF8 11C1019C */ beq $t6, $at, .L8006726C -/* 0677FC 80066BFC 3C014396 */ li $at, 0x43960000 # 300.000000 -/* 067800 80066C00 44813000 */ mtc1 $at, $f6 -/* 067804 80066C04 C4840124 */ lwc1 $f4, 0x124($a0) -/* 067808 80066C08 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 06780C 80066C0C 4604303E */ c.le.s $f6, $f4 -/* 067810 80066C10 00000000 */ nop -/* 067814 80066C14 45020008 */ bc1fl .L80066C38 -/* 067818 80066C18 C6120018 */ lwc1 $f18, 0x18($s0) -/* 06781C 80066C1C 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 067820 80066C20 44815000 */ mtc1 $at, $f10 -/* 067824 80066C24 C4880018 */ lwc1 $f8, 0x18($a0) -/* 067828 80066C28 460A4400 */ add.s $f16, $f8, $f10 -/* 06782C 80066C2C 10000006 */ b .L80066C48 -/* 067830 80066C30 E7B000E0 */ swc1 $f16, 0xe0($sp) -/* 067834 80066C34 C6120018 */ lwc1 $f18, 0x18($s0) -.L80066C38: -/* 067838 80066C38 44812000 */ mtc1 $at, $f4 -/* 06783C 80066C3C 00000000 */ nop -/* 067840 80066C40 46049181 */ sub.s $f6, $f18, $f4 -/* 067844 80066C44 E7A600E0 */ swc1 $f6, 0xe0($sp) -.L80066C48: -/* 067848 80066C48 83AF00F7 */ lb $t7, 0xf7($sp) -/* 06784C 80066C4C 000FC040 */ sll $t8, $t7, 1 -/* 067850 80066C50 02181021 */ addu $v0, $s0, $t8 -/* 067854 80066C54 94440048 */ lhu $a0, 0x48($v0) -/* 067858 80066C58 AFBF0024 */ sw $ra, 0x24($sp) -/* 06785C 80066C5C 0C0AE00E */ jal coss -/* 067860 80066C60 AFA20020 */ sw $v0, 0x20($sp) -/* 067864 80066C64 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 067868 80066C68 44814000 */ mtc1 $at, $f8 -/* 06786C 80066C6C C610001C */ lwc1 $f16, 0x1c($s0) -/* 067870 80066C70 8FB90020 */ lw $t9, 0x20($sp) -/* 067874 80066C74 46080282 */ mul.s $f10, $f0, $f8 -/* 067878 80066C78 46105480 */ add.s $f18, $f10, $f16 -/* 06787C 80066C7C E7B200E4 */ swc1 $f18, 0xe4($sp) -/* 067880 80066C80 0C0AE006 */ jal sins -/* 067884 80066C84 97240048 */ lhu $a0, 0x48($t9) -/* 067888 80066C88 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 06788C 80066C8C 44812000 */ mtc1 $at, $f4 -/* 067890 80066C90 C6080014 */ lwc1 $f8, 0x14($s0) -/* 067894 80066C94 83AE00F7 */ lb $t6, 0xf7($sp) -/* 067898 80066C98 46040182 */ mul.s $f6, $f0, $f4 -/* 06789C 80066C9C 3C014396 */ li $at, 0x43960000 # 300.000000 -/* 0678A0 80066CA0 44819000 */ mtc1 $at, $f18 -/* 0678A4 80066CA4 000E7880 */ sll $t7, $t6, 2 -/* 0678A8 80066CA8 01EE7823 */ subu $t7, $t7, $t6 -/* 0678AC 80066CAC 000F78C0 */ sll $t7, $t7, 3 -/* 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(cameras+0x24) -/* 0678C0 80066CC0 8FBF0024 */ lw $ra, 0x24($sp) -/* 0678C4 80066CC4 E7AA00DC */ swc1 $f10, 0xdc($sp) -/* 0678C8 80066CC8 C6100124 */ lwc1 $f16, 0x124($s0) -/* 0678CC 80066CCC 030FC021 */ addu $t8, $t8, $t7 -/* 0678D0 80066CD0 4610903E */ c.le.s $f18, $f16 -/* 0678D4 80066CD4 00000000 */ nop -/* 0678D8 80066CD8 45020006 */ bc1fl .L80066CF4 -/* 0678DC 80066CDC A7A000D4 */ sh $zero, 0xd4($sp) -/* 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) -/* 0678F0 80066CF0 A7A000D4 */ sh $zero, 0xd4($sp) -.L80066CF4: -/* 0678F4 80066CF4 8FAE0020 */ lw $t6, 0x20($sp) -/* 0678F8 80066CF8 27A400DC */ addiu $a0, $sp, 0xdc -/* 0678FC 80066CFC 27A500D4 */ addiu $a1, $sp, 0xd4 -/* 067900 80066D00 85CF0048 */ lh $t7, 0x48($t6) -/* 067904 80066D04 A7A000D8 */ sh $zero, 0xd8($sp) -/* 067908 80066D08 A7AF00D6 */ sh $t7, 0xd6($sp) -/* 06790C 80066D0C C6060224 */ lwc1 $f6, 0x224($s0) -/* 067910 80066D10 C7E40264 */ lwc1 $f4, 0x264($ra) -/* 067914 80066D14 AFBF0024 */ sw $ra, 0x24($sp) -/* 067918 80066D18 46062202 */ mul.s $f8, $f4, $f6 -/* 06791C 80066D1C 44064000 */ mfc1 $a2, $f8 -/* 067920 80066D20 0C0194B5 */ jal func_800652D4 -/* 067924 80066D24 00000000 */ nop -/* 067928 80066D28 8FBF0024 */ lw $ra, 0x24($sp) -/* 06792C 80066D2C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 067930 80066D30 3C0E0D01 */ lui $t6, %hi(D_0D008DB8) # $t6, 0xd01 -/* 067934 80066D34 87F80290 */ lh $t8, 0x290($ra) -/* 067938 80066D38 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06793C 80066D3C 3C100600 */ lui $s0, 0x600 -/* 067940 80066D40 170000A5 */ bnez $t8, .L80066FD8 -/* 067944 80066D44 3C190D01 */ lui $t9, 0xd01 -/* 067948 80066D48 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06794C 80066D4C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 067950 80066D50 8C620000 */ lw $v0, ($v1) -/* 067954 80066D54 3C100600 */ lui $s0, 0x600 -/* 067958 80066D58 25CE8DB8 */ addiu $t6, %lo(D_0D008DB8) # addiu $t6, $t6, -0x7248 -/* 06795C 80066D5C 24590008 */ addiu $t9, $v0, 8 -/* 067960 80066D60 AC790000 */ sw $t9, ($v1) -/* 067964 80066D64 AC4E0004 */ sw $t6, 4($v0) -/* 067968 80066D68 AC500000 */ sw $s0, ($v0) -/* 06796C 80066D6C 8C620000 */ lw $v0, ($v1) -/* 067970 80066D70 3C18FC12 */ lui $t8, (0xFC127E24 >> 16) # lui $t8, 0xfc12 -/* 067974 80066D74 37187E24 */ ori $t8, (0xFC127E24 & 0xFFFF) # ori $t8, $t8, 0x7e24 -/* 067978 80066D78 244F0008 */ addiu $t7, $v0, 8 -/* 06797C 80066D7C AC6F0000 */ sw $t7, ($v1) -/* 067980 80066D80 2419F3F9 */ li $t9, -3079 -/* 067984 80066D84 AC590004 */ sw $t9, 4($v0) -/* 067988 80066D88 AC580000 */ sw $t8, ($v0) -/* 06798C 80066D8C 8C620000 */ lw $v0, ($v1) -/* 067990 80066D90 3C180050 */ lui $t8, (0x00504B50 >> 16) # lui $t8, 0x50 -/* 067994 80066D94 3C0FB900 */ lui $t7, (0xB900031D >> 16) # lui $t7, 0xb900 -/* 067998 80066D98 244E0008 */ addiu $t6, $v0, 8 -/* 06799C 80066D9C AC6E0000 */ sw $t6, ($v1) -/* 0679A0 80066DA0 35EF031D */ ori $t7, (0xB900031D & 0xFFFF) # ori $t7, $t7, 0x31d -/* 0679A4 80066DA4 37184B50 */ ori $t8, (0x00504B50 & 0xFFFF) # ori $t8, $t8, 0x4b50 -/* 0679A8 80066DA8 AC580004 */ sw $t8, 4($v0) -/* 0679AC 80066DAC AC4F0000 */ sw $t7, ($v0) -/* 0679B0 80066DB0 8C620000 */ lw $v0, ($v1) -/* 0679B4 80066DB4 3C0EFD70 */ lui $t6, 0xfd70 -/* 0679B8 80066DB8 3C0F8019 */ lui $t7, %hi(D_8018D4C4) # $t7, 0x8019 -/* 0679BC 80066DBC 24590008 */ addiu $t9, $v0, 8 -/* 0679C0 80066DC0 AC790000 */ sw $t9, ($v1) -/* 0679C4 80066DC4 AC4E0000 */ sw $t6, ($v0) -/* 0679C8 80066DC8 8DEFD4C4 */ lw $t7, %lo(D_8018D4C4)($t7) -/* 0679CC 80066DCC 3C0E0700 */ lui $t6, 0x700 -/* 0679D0 80066DD0 3C19F570 */ lui $t9, 0xf570 -/* 0679D4 80066DD4 AC4F0004 */ sw $t7, 4($v0) -/* 0679D8 80066DD8 8C620000 */ lw $v0, ($v1) -/* 0679DC 80066DDC 3C0D0400 */ lui $t5, (0x0400103F >> 16) # lui $t5, 0x400 -/* 0679E0 80066DE0 35AD103F */ ori $t5, (0x0400103F & 0xFFFF) # ori $t5, $t5, 0x103f -/* 0679E4 80066DE4 24580008 */ addiu $t8, $v0, 8 -/* 0679E8 80066DE8 AC780000 */ sw $t8, ($v1) -/* 0679EC 80066DEC AC4E0004 */ sw $t6, 4($v0) -/* 0679F0 80066DF0 AC590000 */ sw $t9, ($v0) -/* 0679F4 80066DF4 8C620000 */ lw $v0, ($v1) -/* 0679F8 80066DF8 3C18E600 */ lui $t8, 0xe600 -/* 0679FC 80066DFC 3C0EF300 */ lui $t6, 0xf300 -/* 067A00 80066E00 244F0008 */ addiu $t7, $v0, 8 -/* 067A04 80066E04 AC6F0000 */ sw $t7, ($v1) -/* 067A08 80066E08 AC400004 */ sw $zero, 4($v0) -/* 067A0C 80066E0C AC580000 */ sw $t8, ($v0) -/* 067A10 80066E10 8C620000 */ lw $v0, ($v1) -/* 067A14 80066E14 3C0F073F */ lui $t7, (0x073FF200 >> 16) # lui $t7, 0x73f -/* 067A18 80066E18 35EFF200 */ ori $t7, (0x073FF200 & 0xFFFF) # ori $t7, $t7, 0xf200 -/* 067A1C 80066E1C 24590008 */ addiu $t9, $v0, 8 -/* 067A20 80066E20 AC790000 */ sw $t9, ($v1) -/* 067A24 80066E24 AC4F0004 */ sw $t7, 4($v0) -/* 067A28 80066E28 AC4E0000 */ sw $t6, ($v0) -/* 067A2C 80066E2C 8C620000 */ lw $v0, ($v1) -/* 067A30 80066E30 3C19E700 */ lui $t9, 0xe700 -/* 067A34 80066E34 3C0FF568 */ lui $t7, (0xF5680800 >> 16) # lui $t7, 0xf568 -/* 067A38 80066E38 24580008 */ addiu $t8, $v0, 8 -/* 067A3C 80066E3C AC780000 */ sw $t8, ($v1) -/* 067A40 80066E40 AC400004 */ sw $zero, 4($v0) -/* 067A44 80066E44 AC590000 */ sw $t9, ($v0) -/* 067A48 80066E48 8C620000 */ lw $v0, ($v1) -/* 067A4C 80066E4C 35EF0800 */ ori $t7, (0xF5680800 & 0xFFFF) # ori $t7, $t7, 0x800 -/* 067A50 80066E50 3C19F200 */ lui $t9, 0xf200 -/* 067A54 80066E54 244E0008 */ addiu $t6, $v0, 8 -/* 067A58 80066E58 AC6E0000 */ sw $t6, ($v1) -/* 067A5C 80066E5C AC400004 */ sw $zero, 4($v0) -/* 067A60 80066E60 AC4F0000 */ sw $t7, ($v0) -/* 067A64 80066E64 8C620000 */ lw $v0, ($v1) -/* 067A68 80066E68 3C0E0007 */ lui $t6, (0x0007C0FC >> 16) # lui $t6, 7 -/* 067A6C 80066E6C 35CEC0FC */ ori $t6, (0x0007C0FC & 0xFFFF) # ori $t6, $t6, 0xc0fc -/* 067A70 80066E70 24580008 */ addiu $t8, $v0, 8 -/* 067A74 80066E74 AC780000 */ sw $t8, ($v1) -/* 067A78 80066E78 AC4E0004 */ sw $t6, 4($v0) -/* 067A7C 80066E7C AC590000 */ sw $t9, ($v0) -/* 067A80 80066E80 8C620000 */ lw $v0, ($v1) -/* 067A84 80066E84 3C0E800F */ lui $t6, %hi(D_800E8900) # $t6, 0x800f -/* 067A88 80066E88 25CE8900 */ addiu $t6, %lo(D_800E8900) # addiu $t6, $t6, -0x7700 -/* 067A8C 80066E8C 244F0008 */ addiu $t7, $v0, 8 -/* 067A90 80066E90 AC6F0000 */ sw $t7, ($v1) -/* 067A94 80066E94 AC4D0000 */ sw $t5, ($v0) -/* 067A98 80066E98 87F80290 */ lh $t8, 0x290($ra) -/* 067A9C 80066E9C 0018C900 */ sll $t9, $t8, 4 -/* 067AA0 80066EA0 032E7821 */ addu $t7, $t9, $t6 -/* 067AA4 80066EA4 AC4F0004 */ sw $t7, 4($v0) -/* 067AA8 80066EA8 8C620000 */ lw $v0, ($v1) -/* 067AAC 80066EAC 3C190D01 */ lui $t9, %hi(D_0D008C78) # $t9, 0xd01 -/* 067AB0 80066EB0 27398C78 */ addiu $t9, %lo(D_0D008C78) # addiu $t9, $t9, -0x7388 -/* 067AB4 80066EB4 24580008 */ addiu $t8, $v0, 8 -/* 067AB8 80066EB8 AC780000 */ sw $t8, ($v1) -/* 067ABC 80066EBC AC590004 */ sw $t9, 4($v0) -/* 067AC0 80066EC0 AC500000 */ sw $s0, ($v0) -/* 067AC4 80066EC4 8C620000 */ lw $v0, ($v1) -/* 067AC8 80066EC8 3C0FFD70 */ lui $t7, 0xfd70 -/* 067ACC 80066ECC 3C188019 */ lui $t8, %hi(D_8018D4C8) # $t8, 0x8019 -/* 067AD0 80066ED0 244E0008 */ addiu $t6, $v0, 8 -/* 067AD4 80066ED4 AC6E0000 */ sw $t6, ($v1) -/* 067AD8 80066ED8 AC4F0000 */ sw $t7, ($v0) -/* 067ADC 80066EDC 8F18D4C8 */ lw $t8, %lo(D_8018D4C8)($t8) -/* 067AE0 80066EE0 3C0F0700 */ lui $t7, 0x700 -/* 067AE4 80066EE4 3C0EF570 */ lui $t6, 0xf570 -/* 067AE8 80066EE8 AC580004 */ sw $t8, 4($v0) -/* 067AEC 80066EEC 8C620000 */ lw $v0, ($v1) -/* 067AF0 80066EF0 24590008 */ addiu $t9, $v0, 8 -/* 067AF4 80066EF4 AC790000 */ sw $t9, ($v1) -/* 067AF8 80066EF8 AC4F0004 */ sw $t7, 4($v0) -/* 067AFC 80066EFC AC4E0000 */ sw $t6, ($v0) -/* 067B00 80066F00 8C620000 */ lw $v0, ($v1) -/* 067B04 80066F04 3C19E600 */ lui $t9, 0xe600 -/* 067B08 80066F08 3C0FF300 */ lui $t7, 0xf300 -/* 067B0C 80066F0C 24580008 */ addiu $t8, $v0, 8 -/* 067B10 80066F10 AC780000 */ sw $t8, ($v1) -/* 067B14 80066F14 AC400004 */ sw $zero, 4($v0) -/* 067B18 80066F18 AC590000 */ sw $t9, ($v0) -/* 067B1C 80066F1C 8C620000 */ lw $v0, ($v1) -/* 067B20 80066F20 3C18073F */ lui $t8, (0x073FF200 >> 16) # lui $t8, 0x73f -/* 067B24 80066F24 3718F200 */ ori $t8, (0x073FF200 & 0xFFFF) # ori $t8, $t8, 0xf200 -/* 067B28 80066F28 244E0008 */ addiu $t6, $v0, 8 -/* 067B2C 80066F2C AC6E0000 */ sw $t6, ($v1) -/* 067B30 80066F30 AC580004 */ sw $t8, 4($v0) -/* 067B34 80066F34 AC4F0000 */ sw $t7, ($v0) -/* 067B38 80066F38 8C620000 */ lw $v0, ($v1) -/* 067B3C 80066F3C 3C0EE700 */ lui $t6, 0xe700 -/* 067B40 80066F40 3C18F568 */ lui $t8, (0xF5680800 >> 16) # lui $t8, 0xf568 -/* 067B44 80066F44 24590008 */ addiu $t9, $v0, 8 -/* 067B48 80066F48 AC790000 */ sw $t9, ($v1) -/* 067B4C 80066F4C AC400004 */ sw $zero, 4($v0) -/* 067B50 80066F50 AC4E0000 */ sw $t6, ($v0) -/* 067B54 80066F54 8C620000 */ lw $v0, ($v1) -/* 067B58 80066F58 37180800 */ ori $t8, (0xF5680800 & 0xFFFF) # ori $t8, $t8, 0x800 -/* 067B5C 80066F5C 3C0EF200 */ lui $t6, 0xf200 -/* 067B60 80066F60 244F0008 */ addiu $t7, $v0, 8 -/* 067B64 80066F64 AC6F0000 */ sw $t7, ($v1) -/* 067B68 80066F68 AC400004 */ sw $zero, 4($v0) -/* 067B6C 80066F6C AC580000 */ sw $t8, ($v0) -/* 067B70 80066F70 8C620000 */ lw $v0, ($v1) -/* 067B74 80066F74 3C0F0007 */ lui $t7, (0x0007C0FC >> 16) # lui $t7, 7 -/* 067B78 80066F78 35EFC0FC */ ori $t7, (0x0007C0FC & 0xFFFF) # ori $t7, $t7, 0xc0fc -/* 067B7C 80066F7C 24590008 */ addiu $t9, $v0, 8 -/* 067B80 80066F80 AC790000 */ sw $t9, ($v1) -/* 067B84 80066F84 AC4F0004 */ sw $t7, 4($v0) -/* 067B88 80066F88 AC4E0000 */ sw $t6, ($v0) -/* 067B8C 80066F8C 8C620000 */ lw $v0, ($v1) -/* 067B90 80066F90 24580008 */ addiu $t8, $v0, 8 -/* 067B94 80066F94 AC780000 */ sw $t8, ($v1) -/* 067B98 80066F98 AC4D0000 */ sw $t5, ($v0) -/* 067B9C 80066F9C 87F90290 */ lh $t9, 0x290($ra) -/* 067BA0 80066FA0 3C18800F */ lui $t8, %hi(D_800E8900) # $t8, 0x800f -/* 067BA4 80066FA4 27188900 */ addiu $t8, %lo(D_800E8900) # addiu $t8, $t8, -0x7700 -/* 067BA8 80066FA8 00197100 */ sll $t6, $t9, 4 -/* 067BAC 80066FAC 25CF0040 */ addiu $t7, $t6, 0x40 -/* 067BB0 80066FB0 01F8C821 */ addu $t9, $t7, $t8 -/* 067BB4 80066FB4 AC590004 */ sw $t9, 4($v0) -/* 067BB8 80066FB8 8C620000 */ lw $v0, ($v1) -/* 067BBC 80066FBC 3C0F0D01 */ lui $t7, %hi(D_0D008DA0) # $t7, 0xd01 -/* 067BC0 80066FC0 25EF8DA0 */ addiu $t7, %lo(D_0D008DA0) # addiu $t7, $t7, -0x7260 -/* 067BC4 80066FC4 244E0008 */ addiu $t6, $v0, 8 -/* 067BC8 80066FC8 AC6E0000 */ sw $t6, ($v1) -/* 067BCC 80066FCC AC4F0004 */ sw $t7, 4($v0) -/* 067BD0 80066FD0 100000A1 */ b .L80067258 -/* 067BD4 80066FD4 AC500000 */ sw $s0, ($v0) -.L80066FD8: -/* 067BD8 80066FD8 8C620000 */ lw $v0, ($v1) -/* 067BDC 80066FDC 27398DB8 */ addiu $t9, $t9, -0x7248 -/* 067BE0 80066FE0 3C0FFC12 */ lui $t7, (0xFC127E24 >> 16) # lui $t7, 0xfc12 -/* 067BE4 80066FE4 24580008 */ addiu $t8, $v0, 8 -/* 067BE8 80066FE8 AC780000 */ sw $t8, ($v1) -/* 067BEC 80066FEC AC590004 */ sw $t9, 4($v0) -/* 067BF0 80066FF0 AC500000 */ sw $s0, ($v0) -/* 067BF4 80066FF4 8C620000 */ lw $v0, ($v1) -/* 067BF8 80066FF8 2418F3F9 */ li $t8, -3079 -/* 067BFC 80066FFC 35EF7E24 */ ori $t7, (0xFC127E24 & 0xFFFF) # ori $t7, $t7, 0x7e24 -/* 067C00 80067000 244E0008 */ addiu $t6, $v0, 8 -/* 067C04 80067004 AC6E0000 */ sw $t6, ($v1) -/* 067C08 80067008 AC580004 */ sw $t8, 4($v0) -/* 067C0C 8006700C AC4F0000 */ sw $t7, ($v0) -/* 067C10 80067010 8C620000 */ lw $v0, ($v1) -/* 067C14 80067014 3C0F0050 */ lui $t7, (0x00504B50 >> 16) # lui $t7, 0x50 -/* 067C18 80067018 3C0EB900 */ lui $t6, (0xB900031D >> 16) # lui $t6, 0xb900 -/* 067C1C 8006701C 24590008 */ addiu $t9, $v0, 8 -/* 067C20 80067020 AC790000 */ sw $t9, ($v1) -/* 067C24 80067024 35CE031D */ ori $t6, (0xB900031D & 0xFFFF) # ori $t6, $t6, 0x31d -/* 067C28 80067028 35EF4B50 */ ori $t7, (0x00504B50 & 0xFFFF) # ori $t7, $t7, 0x4b50 -/* 067C2C 8006702C AC4F0004 */ sw $t7, 4($v0) -/* 067C30 80067030 AC4E0000 */ sw $t6, ($v0) -/* 067C34 80067034 8C620000 */ lw $v0, ($v1) -/* 067C38 80067038 3C19FD70 */ lui $t9, 0xfd70 -/* 067C3C 8006703C 3C0E8019 */ lui $t6, %hi(D_8018D4C8) # $t6, 0x8019 -/* 067C40 80067040 24580008 */ addiu $t8, $v0, 8 -/* 067C44 80067044 AC780000 */ sw $t8, ($v1) -/* 067C48 80067048 AC590000 */ sw $t9, ($v0) -/* 067C4C 8006704C 8DCED4C8 */ lw $t6, %lo(D_8018D4C8)($t6) -/* 067C50 80067050 3C190700 */ lui $t9, 0x700 -/* 067C54 80067054 3C18F570 */ lui $t8, 0xf570 -/* 067C58 80067058 AC4E0004 */ sw $t6, 4($v0) -/* 067C5C 8006705C 8C620000 */ lw $v0, ($v1) -/* 067C60 80067060 3C0D0400 */ lui $t5, (0x0400103F >> 16) # lui $t5, 0x400 -/* 067C64 80067064 35AD103F */ ori $t5, (0x0400103F & 0xFFFF) # ori $t5, $t5, 0x103f -/* 067C68 80067068 244F0008 */ addiu $t7, $v0, 8 -/* 067C6C 8006706C AC6F0000 */ sw $t7, ($v1) -/* 067C70 80067070 AC590004 */ sw $t9, 4($v0) -/* 067C74 80067074 AC580000 */ sw $t8, ($v0) -/* 067C78 80067078 8C620000 */ lw $v0, ($v1) -/* 067C7C 8006707C 3C0FE600 */ lui $t7, 0xe600 -/* 067C80 80067080 3C19F300 */ lui $t9, 0xf300 -/* 067C84 80067084 244E0008 */ addiu $t6, $v0, 8 -/* 067C88 80067088 AC6E0000 */ sw $t6, ($v1) -/* 067C8C 8006708C AC400004 */ sw $zero, 4($v0) -/* 067C90 80067090 AC4F0000 */ sw $t7, ($v0) -/* 067C94 80067094 8C620000 */ lw $v0, ($v1) -/* 067C98 80067098 3C0E073F */ lui $t6, (0x073FF200 >> 16) # lui $t6, 0x73f -/* 067C9C 8006709C 35CEF200 */ ori $t6, (0x073FF200 & 0xFFFF) # ori $t6, $t6, 0xf200 -/* 067CA0 800670A0 24580008 */ addiu $t8, $v0, 8 -/* 067CA4 800670A4 AC780000 */ sw $t8, ($v1) -/* 067CA8 800670A8 AC4E0004 */ sw $t6, 4($v0) -/* 067CAC 800670AC AC590000 */ sw $t9, ($v0) -/* 067CB0 800670B0 8C620000 */ lw $v0, ($v1) -/* 067CB4 800670B4 3C18E700 */ lui $t8, 0xe700 -/* 067CB8 800670B8 3C0EF568 */ lui $t6, (0xF5680800 >> 16) # lui $t6, 0xf568 -/* 067CBC 800670BC 244F0008 */ addiu $t7, $v0, 8 -/* 067CC0 800670C0 AC6F0000 */ sw $t7, ($v1) -/* 067CC4 800670C4 AC400004 */ sw $zero, 4($v0) -/* 067CC8 800670C8 AC580000 */ sw $t8, ($v0) -/* 067CCC 800670CC 8C620000 */ lw $v0, ($v1) -/* 067CD0 800670D0 35CE0800 */ ori $t6, (0xF5680800 & 0xFFFF) # ori $t6, $t6, 0x800 -/* 067CD4 800670D4 3C18F200 */ lui $t8, 0xf200 -/* 067CD8 800670D8 24590008 */ addiu $t9, $v0, 8 -/* 067CDC 800670DC AC790000 */ sw $t9, ($v1) -/* 067CE0 800670E0 AC400004 */ sw $zero, 4($v0) -/* 067CE4 800670E4 AC4E0000 */ sw $t6, ($v0) -/* 067CE8 800670E8 8C620000 */ lw $v0, ($v1) -/* 067CEC 800670EC 3C190007 */ lui $t9, (0x0007C0FC >> 16) # lui $t9, 7 -/* 067CF0 800670F0 3739C0FC */ ori $t9, (0x0007C0FC & 0xFFFF) # ori $t9, $t9, 0xc0fc -/* 067CF4 800670F4 244F0008 */ addiu $t7, $v0, 8 -/* 067CF8 800670F8 AC6F0000 */ sw $t7, ($v1) -/* 067CFC 800670FC AC590004 */ sw $t9, 4($v0) -/* 067D00 80067100 AC580000 */ sw $t8, ($v0) -/* 067D04 80067104 8C620000 */ lw $v0, ($v1) -/* 067D08 80067108 3C19800F */ lui $t9, %hi(D_800E8900) # $t9, 0x800f -/* 067D0C 8006710C 27398900 */ addiu $t9, %lo(D_800E8900) # addiu $t9, $t9, -0x7700 -/* 067D10 80067110 244E0008 */ addiu $t6, $v0, 8 -/* 067D14 80067114 AC6E0000 */ sw $t6, ($v1) -/* 067D18 80067118 AC4D0000 */ sw $t5, ($v0) -/* 067D1C 8006711C 87EF0290 */ lh $t7, 0x290($ra) -/* 067D20 80067120 000FC100 */ sll $t8, $t7, 4 -/* 067D24 80067124 03197021 */ addu $t6, $t8, $t9 -/* 067D28 80067128 AC4E0004 */ sw $t6, 4($v0) -/* 067D2C 8006712C 8C620000 */ lw $v0, ($v1) -/* 067D30 80067130 3C180D01 */ lui $t8, %hi(D_0D008C78) # $t8, 0xd01 -/* 067D34 80067134 27188C78 */ addiu $t8, %lo(D_0D008C78) # addiu $t8, $t8, -0x7388 -/* 067D38 80067138 244F0008 */ addiu $t7, $v0, 8 -/* 067D3C 8006713C AC6F0000 */ sw $t7, ($v1) -/* 067D40 80067140 AC580004 */ sw $t8, 4($v0) -/* 067D44 80067144 AC500000 */ sw $s0, ($v0) -/* 067D48 80067148 8C620000 */ lw $v0, ($v1) -/* 067D4C 8006714C 3C0EFD70 */ lui $t6, 0xfd70 -/* 067D50 80067150 3C0F8019 */ lui $t7, %hi(D_8018D4C4) # $t7, 0x8019 -/* 067D54 80067154 24590008 */ addiu $t9, $v0, 8 -/* 067D58 80067158 AC790000 */ sw $t9, ($v1) -/* 067D5C 8006715C AC4E0000 */ sw $t6, ($v0) -/* 067D60 80067160 8DEFD4C4 */ lw $t7, %lo(D_8018D4C4)($t7) -/* 067D64 80067164 3C0E0700 */ lui $t6, 0x700 -/* 067D68 80067168 3C19F570 */ lui $t9, 0xf570 -/* 067D6C 8006716C AC4F0004 */ sw $t7, 4($v0) -/* 067D70 80067170 8C620000 */ lw $v0, ($v1) -/* 067D74 80067174 24580008 */ addiu $t8, $v0, 8 -/* 067D78 80067178 AC780000 */ sw $t8, ($v1) -/* 067D7C 8006717C AC4E0004 */ sw $t6, 4($v0) -/* 067D80 80067180 AC590000 */ sw $t9, ($v0) -/* 067D84 80067184 8C620000 */ lw $v0, ($v1) -/* 067D88 80067188 3C18E600 */ lui $t8, 0xe600 -/* 067D8C 8006718C 3C0EF300 */ lui $t6, 0xf300 -/* 067D90 80067190 244F0008 */ addiu $t7, $v0, 8 -/* 067D94 80067194 AC6F0000 */ sw $t7, ($v1) -/* 067D98 80067198 AC400004 */ sw $zero, 4($v0) -/* 067D9C 8006719C AC580000 */ sw $t8, ($v0) -/* 067DA0 800671A0 8C620000 */ lw $v0, ($v1) -/* 067DA4 800671A4 3C0F073F */ lui $t7, (0x073FF200 >> 16) # lui $t7, 0x73f -/* 067DA8 800671A8 35EFF200 */ ori $t7, (0x073FF200 & 0xFFFF) # ori $t7, $t7, 0xf200 -/* 067DAC 800671AC 24590008 */ addiu $t9, $v0, 8 -/* 067DB0 800671B0 AC790000 */ sw $t9, ($v1) -/* 067DB4 800671B4 AC4F0004 */ sw $t7, 4($v0) -/* 067DB8 800671B8 AC4E0000 */ sw $t6, ($v0) -/* 067DBC 800671BC 8C620000 */ lw $v0, ($v1) -/* 067DC0 800671C0 3C19E700 */ lui $t9, 0xe700 -/* 067DC4 800671C4 3C0FF568 */ lui $t7, (0xF5680800 >> 16) # lui $t7, 0xf568 -/* 067DC8 800671C8 24580008 */ addiu $t8, $v0, 8 -/* 067DCC 800671CC AC780000 */ sw $t8, ($v1) -/* 067DD0 800671D0 AC400004 */ sw $zero, 4($v0) -/* 067DD4 800671D4 AC590000 */ sw $t9, ($v0) -/* 067DD8 800671D8 8C620000 */ lw $v0, ($v1) -/* 067DDC 800671DC 35EF0800 */ ori $t7, (0xF5680800 & 0xFFFF) # ori $t7, $t7, 0x800 -/* 067DE0 800671E0 3C19F200 */ lui $t9, 0xf200 -/* 067DE4 800671E4 244E0008 */ addiu $t6, $v0, 8 -/* 067DE8 800671E8 AC6E0000 */ sw $t6, ($v1) -/* 067DEC 800671EC AC400004 */ sw $zero, 4($v0) -/* 067DF0 800671F0 AC4F0000 */ sw $t7, ($v0) -/* 067DF4 800671F4 8C620000 */ lw $v0, ($v1) -/* 067DF8 800671F8 3C0E0007 */ lui $t6, (0x0007C0FC >> 16) # lui $t6, 7 -/* 067DFC 800671FC 35CEC0FC */ ori $t6, (0x0007C0FC & 0xFFFF) # ori $t6, $t6, 0xc0fc -/* 067E00 80067200 24580008 */ addiu $t8, $v0, 8 -/* 067E04 80067204 AC780000 */ sw $t8, ($v1) -/* 067E08 80067208 AC4E0004 */ sw $t6, 4($v0) -/* 067E0C 8006720C AC590000 */ sw $t9, ($v0) -/* 067E10 80067210 8C620000 */ lw $v0, ($v1) -/* 067E14 80067214 244F0008 */ addiu $t7, $v0, 8 -/* 067E18 80067218 AC6F0000 */ sw $t7, ($v1) -/* 067E1C 8006721C AC4D0000 */ sw $t5, ($v0) -/* 067E20 80067220 87F80290 */ lh $t8, 0x290($ra) -/* 067E24 80067224 3C0F800F */ lui $t7, %hi(D_800E8900) # $t7, 0x800f -/* 067E28 80067228 25EF8900 */ addiu $t7, %lo(D_800E8900) # addiu $t7, $t7, -0x7700 -/* 067E2C 8006722C 0018C900 */ sll $t9, $t8, 4 -/* 067E30 80067230 272E0040 */ addiu $t6, $t9, 0x40 -/* 067E34 80067234 01CFC021 */ addu $t8, $t6, $t7 -/* 067E38 80067238 AC580004 */ sw $t8, 4($v0) -/* 067E3C 8006723C 8C620000 */ lw $v0, ($v1) -/* 067E40 80067240 3C0E0D01 */ lui $t6, %hi(D_0D008DA0) # $t6, 0xd01 -/* 067E44 80067244 25CE8DA0 */ addiu $t6, %lo(D_0D008DA0) # addiu $t6, $t6, -0x7260 -/* 067E48 80067248 24590008 */ addiu $t9, $v0, 8 -/* 067E4C 8006724C AC790000 */ sw $t9, ($v1) -/* 067E50 80067250 AC4E0004 */ sw $t6, 4($v0) -/* 067E54 80067254 AC500000 */ sw $s0, ($v0) -.L80067258: -/* 067E58 80067258 3C028016 */ lui $v0, %hi(gMatrixEffectCount) # $v0, 0x8016 -/* 067E5C 8006725C 24424AF0 */ addiu $v0, %lo(gMatrixEffectCount) # addiu $v0, $v0, 0x4af0 -/* 067E60 80067260 844F0000 */ lh $t7, ($v0) -/* 067E64 80067264 25F80001 */ addiu $t8, $t7, 1 -/* 067E68 80067268 A4580000 */ sh $t8, ($v0) -.L8006726C: -/* 067E6C 8006726C 8FBF001C */ lw $ra, 0x1c($sp) -.L80067270: -/* 067E70 80067270 8FB00018 */ lw $s0, 0x18($sp) -/* 067E74 80067274 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 067E78 80067278 03E00008 */ jr $ra -/* 067E7C 8006727C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80067964.s b/asm/non_matchings/code_80057C60/func_80067964.s deleted file mode 100644 index 27ef32aaf..000000000 --- a/asm/non_matchings/code_80057C60/func_80067964.s +++ /dev/null @@ -1,248 +0,0 @@ -glabel func_80067964 -/* 068564 80067964 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 068568 80067968 83AE00BB */ lb $t6, 0xbb($sp) -/* 06856C 8006796C AFBF0014 */ sw $ra, 0x14($sp) -/* 068570 80067970 AFA400A8 */ sw $a0, 0xa8($sp) -/* 068574 80067974 000E78C0 */ sll $t7, $t6, 3 -/* 068578 80067978 01EE7821 */ addu $t7, $t7, $t6 -/* 06857C 8006797C 000F78C0 */ sll $t7, $t7, 3 -/* 068580 80067980 AFA500AC */ sw $a1, 0xac($sp) -/* 068584 80067984 AFA700B4 */ sw $a3, 0xb4($sp) -/* 068588 80067988 008F1021 */ addu $v0, $a0, $t7 -/* 06858C 8006798C 84580814 */ lh $t8, 0x814($v0) -/* 068590 80067990 44866000 */ mtc1 $a2, $f12 -/* 068594 80067994 24010001 */ li $at, 1 -/* 068598 80067998 170100E4 */ bne $t8, $at, .L80067D2C -/* 06859C 8006799C 00803825 */ move $a3, $a0 -/* 0685A0 800679A0 C44407F8 */ lwc1 $f4, 0x7f8($v0) -/* 0685A4 800679A4 27A4009C */ addiu $a0, $sp, 0x9c -/* 0685A8 800679A8 27A50094 */ addiu $a1, $sp, 0x94 -/* 0685AC 800679AC E7A4009C */ swc1 $f4, 0x9c($sp) -/* 0685B0 800679B0 C44607FC */ lwc1 $f6, 0x7fc($v0) -/* 0685B4 800679B4 E7A600A0 */ swc1 $f6, 0xa0($sp) -/* 0685B8 800679B8 C4480800 */ lwc1 $f8, 0x800($v0) -/* 0685BC 800679BC A7A00094 */ sh $zero, 0x94($sp) -/* 0685C0 800679C0 E7A800A4 */ swc1 $f8, 0xa4($sp) -/* 0685C4 800679C4 84590818 */ lh $t9, 0x818($v0) -/* 0685C8 800679C8 A7A00098 */ sh $zero, 0x98($sp) -/* 0685CC 800679CC A7B90096 */ sh $t9, 0x96($sp) -/* 0685D0 800679D0 C4EA0224 */ lwc1 $f10, 0x224($a3) -/* 0685D4 800679D4 460C5402 */ mul.s $f16, $f10, $f12 -/* 0685D8 800679D8 44068000 */ mfc1 $a2, $f16 -/* 0685DC 800679DC 0C0194B5 */ jal func_800652D4 -/* 0685E0 800679E0 00000000 */ nop -/* 0685E4 800679E4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0685E8 800679E8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0685EC 800679EC 8C620000 */ lw $v0, ($v1) -/* 0685F0 800679F0 3C0F0D01 */ lui $t7, %hi(D_0D008C90) # $t7, 0xd01 -/* 0685F4 800679F4 3C1F0600 */ lui $ra, 0x600 -/* 0685F8 800679F8 244E0008 */ addiu $t6, $v0, 8 -/* 0685FC 800679FC AC6E0000 */ sw $t6, ($v1) -/* 068600 80067A00 25EF8C90 */ addiu $t7, %lo(D_0D008C90) # addiu $t7, $t7, -0x7370 -/* 068604 80067A04 AC4F0004 */ sw $t7, 4($v0) -/* 068608 80067A08 AC5F0000 */ sw $ra, ($v0) -/* 06860C 80067A0C 8C620000 */ lw $v0, ($v1) -/* 068610 80067A10 240E3000 */ li $t6, 12288 -/* 068614 80067A14 3C19B600 */ lui $t9, 0xb600 -/* 068618 80067A18 24580008 */ addiu $t8, $v0, 8 -/* 06861C 80067A1C AC780000 */ sw $t8, ($v1) -/* 068620 80067A20 AC4E0004 */ sw $t6, 4($v0) -/* 068624 80067A24 AC590000 */ sw $t9, ($v0) -/* 068628 80067A28 8C620000 */ lw $v0, ($v1) -/* 06862C 80067A2C 3C19800E */ lui $t9, %hi(D_800E52D0) # $t9, 0x800e -/* 068630 80067A30 273952D0 */ addiu $t9, %lo(D_800E52D0) # addiu $t9, $t9, 0x52d0 -/* 068634 80067A34 244F0008 */ addiu $t7, $v0, 8 -/* 068638 80067A38 AC6F0000 */ sw $t7, ($v1) -/* 06863C 80067A3C 3C18FD10 */ lui $t8, 0xfd10 -/* 068640 80067A40 AC580000 */ sw $t8, ($v0) -/* 068644 80067A44 AC590004 */ sw $t9, 4($v0) -/* 068648 80067A48 8C620000 */ lw $v0, ($v1) -/* 06864C 80067A4C 3C0FE800 */ lui $t7, 0xe800 -/* 068650 80067A50 3C19F500 */ lui $t9, (0xF5000100 >> 16) # lui $t9, 0xf500 -/* 068654 80067A54 244E0008 */ addiu $t6, $v0, 8 -/* 068658 80067A58 AC6E0000 */ sw $t6, ($v1) -/* 06865C 80067A5C AC400004 */ sw $zero, 4($v0) -/* 068660 80067A60 AC4F0000 */ sw $t7, ($v0) -/* 068664 80067A64 8C620000 */ lw $v0, ($v1) -/* 068668 80067A68 3C0E0700 */ lui $t6, 0x700 -/* 06866C 80067A6C 37390100 */ ori $t9, (0xF5000100 & 0xFFFF) # ori $t9, $t9, 0x100 -/* 068670 80067A70 24580008 */ addiu $t8, $v0, 8 -/* 068674 80067A74 AC780000 */ sw $t8, ($v1) -/* 068678 80067A78 AC4E0004 */ sw $t6, 4($v0) -/* 06867C 80067A7C AC590000 */ sw $t9, ($v0) -/* 068680 80067A80 8C620000 */ lw $v0, ($v1) -/* 068684 80067A84 3C18E600 */ lui $t8, 0xe600 -/* 068688 80067A88 3C0EF000 */ lui $t6, 0xf000 -/* 06868C 80067A8C 244F0008 */ addiu $t7, $v0, 8 -/* 068690 80067A90 AC6F0000 */ sw $t7, ($v1) -/* 068694 80067A94 AC400004 */ sw $zero, 4($v0) -/* 068698 80067A98 AC580000 */ sw $t8, ($v0) -/* 06869C 80067A9C 8C620000 */ lw $v0, ($v1) -/* 0686A0 80067AA0 3C0F073F */ lui $t7, (0x073FC000 >> 16) # lui $t7, 0x73f -/* 0686A4 80067AA4 35EFC000 */ ori $t7, (0x073FC000 & 0xFFFF) # ori $t7, $t7, 0xc000 -/* 0686A8 80067AA8 24590008 */ addiu $t9, $v0, 8 -/* 0686AC 80067AAC AC790000 */ sw $t9, ($v1) -/* 0686B0 80067AB0 AC4F0004 */ sw $t7, 4($v0) -/* 0686B4 80067AB4 AC4E0000 */ sw $t6, ($v0) -/* 0686B8 80067AB8 8C620000 */ lw $v0, ($v1) -/* 0686BC 80067ABC 3C19E700 */ lui $t9, 0xe700 -/* 0686C0 80067AC0 3C0FBA00 */ lui $t7, (0xBA000E02 >> 16) # lui $t7, 0xba00 -/* 0686C4 80067AC4 24580008 */ addiu $t8, $v0, 8 -/* 0686C8 80067AC8 AC780000 */ sw $t8, ($v1) -/* 0686CC 80067ACC AC400004 */ sw $zero, 4($v0) -/* 0686D0 80067AD0 AC590000 */ sw $t9, ($v0) -/* 0686D4 80067AD4 8C620000 */ lw $v0, ($v1) -/* 0686D8 80067AD8 34188000 */ li $t8, 32768 -/* 0686DC 80067ADC 35EF0E02 */ ori $t7, (0xBA000E02 & 0xFFFF) # ori $t7, $t7, 0xe02 -/* 0686E0 80067AE0 244E0008 */ addiu $t6, $v0, 8 -/* 0686E4 80067AE4 AC6E0000 */ sw $t6, ($v1) -/* 0686E8 80067AE8 AC580004 */ sw $t8, 4($v0) -/* 0686EC 80067AEC AC4F0000 */ sw $t7, ($v0) -/* 0686F0 80067AF0 8C620000 */ lw $v0, ($v1) -/* 0686F4 80067AF4 3C0EFD50 */ lui $t6, 0xfd50 -/* 0686F8 80067AF8 3C0F8019 */ lui $t7, %hi(D_8018D4AC) # $t7, 0x8019 -/* 0686FC 80067AFC 24590008 */ addiu $t9, $v0, 8 -/* 068700 80067B00 AC790000 */ sw $t9, ($v1) -/* 068704 80067B04 AC4E0000 */ sw $t6, ($v0) -/* 068708 80067B08 8DEFD4AC */ lw $t7, %lo(D_8018D4AC)($t7) -/* 06870C 80067B0C 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 068710 80067B10 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 068714 80067B14 AC4F0004 */ sw $t7, 4($v0) -/* 068718 80067B18 8C620000 */ lw $v0, ($v1) -/* 06871C 80067B1C 3C19F550 */ lui $t9, 0xf550 -/* 068720 80067B20 3C0B8016 */ lui $t3, %hi(gMatrixEffectCount) # $t3, 0x8016 -/* 068724 80067B24 24580008 */ addiu $t8, $v0, 8 -/* 068728 80067B28 AC780000 */ sw $t8, ($v1) -/* 06872C 80067B2C AC4E0004 */ sw $t6, 4($v0) -/* 068730 80067B30 AC590000 */ sw $t9, ($v0) -/* 068734 80067B34 8C620000 */ lw $v0, ($v1) -/* 068738 80067B38 3C18E600 */ lui $t8, 0xe600 -/* 06873C 80067B3C 3C0EF300 */ lui $t6, 0xf300 -/* 068740 80067B40 244F0008 */ addiu $t7, $v0, 8 -/* 068744 80067B44 AC6F0000 */ sw $t7, ($v1) -/* 068748 80067B48 AC400004 */ sw $zero, 4($v0) -/* 06874C 80067B4C AC580000 */ sw $t8, ($v0) -/* 068750 80067B50 8C620000 */ lw $v0, ($v1) -/* 068754 80067B54 3C0F073F */ lui $t7, (0x073FF100 >> 16) # lui $t7, 0x73f -/* 068758 80067B58 35EFF100 */ ori $t7, (0x073FF100 & 0xFFFF) # ori $t7, $t7, 0xf100 -/* 06875C 80067B5C 24590008 */ addiu $t9, $v0, 8 -/* 068760 80067B60 AC790000 */ sw $t9, ($v1) -/* 068764 80067B64 AC4F0004 */ sw $t7, 4($v0) -/* 068768 80067B68 AC4E0000 */ sw $t6, ($v0) -/* 06876C 80067B6C 8C620000 */ lw $v0, ($v1) -/* 068770 80067B70 3C19E700 */ lui $t9, 0xe700 -/* 068774 80067B74 3C0FF548 */ lui $t7, (0xF5481000 >> 16) # lui $t7, 0xf548 -/* 068778 80067B78 24580008 */ addiu $t8, $v0, 8 -/* 06877C 80067B7C AC780000 */ sw $t8, ($v1) -/* 068780 80067B80 AC400004 */ sw $zero, 4($v0) -/* 068784 80067B84 AC590000 */ sw $t9, ($v0) -/* 068788 80067B88 8C620000 */ lw $v0, ($v1) -/* 06878C 80067B8C 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 068790 80067B90 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 068794 80067B94 244E0008 */ addiu $t6, $v0, 8 -/* 068798 80067B98 AC6E0000 */ sw $t6, ($v1) -/* 06879C 80067B9C 35EF1000 */ ori $t7, (0xF5481000 & 0xFFFF) # ori $t7, $t7, 0x1000 -/* 0687A0 80067BA0 AC4F0000 */ sw $t7, ($v0) -/* 0687A4 80067BA4 AC580004 */ sw $t8, 4($v0) -/* 0687A8 80067BA8 8C620000 */ lw $v0, ($v1) -/* 0687AC 80067BAC 3C0F000F */ lui $t7, (0x000FC07C >> 16) # lui $t7, 0xf -/* 0687B0 80067BB0 35EFC07C */ ori $t7, (0x000FC07C & 0xFFFF) # ori $t7, $t7, 0xc07c -/* 0687B4 80067BB4 24590008 */ addiu $t9, $v0, 8 -/* 0687B8 80067BB8 AC790000 */ sw $t9, ($v1) -/* 0687BC 80067BBC 3C0EF200 */ lui $t6, 0xf200 -/* 0687C0 80067BC0 AC4E0000 */ sw $t6, ($v0) -/* 0687C4 80067BC4 AC4F0004 */ sw $t7, 4($v0) -/* 0687C8 80067BC8 8C620000 */ lw $v0, ($v1) -/* 0687CC 80067BCC 3C0E800F */ lui $t6, %hi(D_800E8840) # $t6, 0x800f -/* 0687D0 80067BD0 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 0687D4 80067BD4 24580008 */ addiu $t8, $v0, 8 -/* 0687D8 80067BD8 AC780000 */ sw $t8, ($v1) -/* 0687DC 80067BDC 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 0687E0 80067BE0 25CE8840 */ addiu $t6, %lo(D_800E8840) # addiu $t6, $t6, -0x77c0 -/* 0687E4 80067BE4 AC4E0004 */ sw $t6, 4($v0) -/* 0687E8 80067BE8 AC590000 */ sw $t9, ($v0) -/* 0687EC 80067BEC 8C620000 */ lw $v0, ($v1) -/* 0687F0 80067BF0 3C180D01 */ lui $t8, %hi(D_0D008C78) # $t8, 0xd01 -/* 0687F4 80067BF4 27188C78 */ addiu $t8, %lo(D_0D008C78) # addiu $t8, $t8, -0x7388 -/* 0687F8 80067BF8 244F0008 */ addiu $t7, $v0, 8 -/* 0687FC 80067BFC AC6F0000 */ sw $t7, ($v1) -/* 068800 80067C00 AC580004 */ sw $t8, 4($v0) -/* 068804 80067C04 AC5F0000 */ sw $ra, ($v0) -/* 068808 80067C08 8C620000 */ lw $v0, ($v1) -/* 06880C 80067C0C 3C0EFD50 */ lui $t6, 0xfd50 -/* 068810 80067C10 3C0F8019 */ lui $t7, %hi(D_8018D4B0) # $t7, 0x8019 -/* 068814 80067C14 24590008 */ addiu $t9, $v0, 8 -/* 068818 80067C18 AC790000 */ sw $t9, ($v1) -/* 06881C 80067C1C AC4E0000 */ sw $t6, ($v0) -/* 068820 80067C20 8DEFD4B0 */ lw $t7, %lo(D_8018D4B0)($t7) -/* 068824 80067C24 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 068828 80067C28 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 06882C 80067C2C AC4F0004 */ sw $t7, 4($v0) -/* 068830 80067C30 8C620000 */ lw $v0, ($v1) -/* 068834 80067C34 3C19F550 */ lui $t9, 0xf550 -/* 068838 80067C38 256B4AF0 */ addiu $t3, %lo(gMatrixEffectCount) # addiu $t3, $t3, 0x4af0 -/* 06883C 80067C3C 24580008 */ addiu $t8, $v0, 8 -/* 068840 80067C40 AC780000 */ sw $t8, ($v1) -/* 068844 80067C44 AC4E0004 */ sw $t6, 4($v0) -/* 068848 80067C48 AC590000 */ sw $t9, ($v0) -/* 06884C 80067C4C 8C620000 */ lw $v0, ($v1) -/* 068850 80067C50 3C18E600 */ lui $t8, 0xe600 -/* 068854 80067C54 3C0EF300 */ lui $t6, 0xf300 -/* 068858 80067C58 244F0008 */ addiu $t7, $v0, 8 -/* 06885C 80067C5C AC6F0000 */ sw $t7, ($v1) -/* 068860 80067C60 AC400004 */ sw $zero, 4($v0) -/* 068864 80067C64 AC580000 */ sw $t8, ($v0) -/* 068868 80067C68 8C620000 */ lw $v0, ($v1) -/* 06886C 80067C6C 3C0F073F */ lui $t7, (0x073FF100 >> 16) # lui $t7, 0x73f -/* 068870 80067C70 35EFF100 */ ori $t7, (0x073FF100 & 0xFFFF) # ori $t7, $t7, 0xf100 -/* 068874 80067C74 24590008 */ addiu $t9, $v0, 8 -/* 068878 80067C78 AC790000 */ sw $t9, ($v1) -/* 06887C 80067C7C AC4F0004 */ sw $t7, 4($v0) -/* 068880 80067C80 AC4E0000 */ sw $t6, ($v0) -/* 068884 80067C84 8C620000 */ lw $v0, ($v1) -/* 068888 80067C88 3C19E700 */ lui $t9, 0xe700 -/* 06888C 80067C8C 3C0FF548 */ lui $t7, (0xF5481000 >> 16) # lui $t7, 0xf548 -/* 068890 80067C90 24580008 */ addiu $t8, $v0, 8 -/* 068894 80067C94 AC780000 */ sw $t8, ($v1) -/* 068898 80067C98 AC400004 */ sw $zero, 4($v0) -/* 06889C 80067C9C AC590000 */ sw $t9, ($v0) -/* 0688A0 80067CA0 8C620000 */ lw $v0, ($v1) -/* 0688A4 80067CA4 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 0688A8 80067CA8 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 0688AC 80067CAC 244E0008 */ addiu $t6, $v0, 8 -/* 0688B0 80067CB0 AC6E0000 */ sw $t6, ($v1) -/* 0688B4 80067CB4 35EF1000 */ ori $t7, (0xF5481000 & 0xFFFF) # ori $t7, $t7, 0x1000 -/* 0688B8 80067CB8 AC4F0000 */ sw $t7, ($v0) -/* 0688BC 80067CBC AC580004 */ sw $t8, 4($v0) -/* 0688C0 80067CC0 8C620000 */ lw $v0, ($v1) -/* 0688C4 80067CC4 3C0F000F */ lui $t7, (0x000FC07C >> 16) # lui $t7, 0xf -/* 0688C8 80067CC8 35EFC07C */ ori $t7, (0x000FC07C & 0xFFFF) # ori $t7, $t7, 0xc07c -/* 0688CC 80067CCC 24590008 */ addiu $t9, $v0, 8 -/* 0688D0 80067CD0 AC790000 */ sw $t9, ($v1) -/* 0688D4 80067CD4 3C0EF200 */ lui $t6, 0xf200 -/* 0688D8 80067CD8 AC4E0000 */ sw $t6, ($v0) -/* 0688DC 80067CDC AC4F0004 */ sw $t7, 4($v0) -/* 0688E0 80067CE0 8C620000 */ lw $v0, ($v1) -/* 0688E4 80067CE4 3C0E800F */ lui $t6, %hi(D_800E8800) # $t6, 0x800f -/* 0688E8 80067CE8 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 0688EC 80067CEC 24580008 */ addiu $t8, $v0, 8 -/* 0688F0 80067CF0 AC780000 */ sw $t8, ($v1) -/* 0688F4 80067CF4 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 0688F8 80067CF8 25CE8800 */ addiu $t6, %lo(D_800E8800) # addiu $t6, $t6, -0x7800 -/* 0688FC 80067CFC AC4E0004 */ sw $t6, 4($v0) -/* 068900 80067D00 AC590000 */ sw $t9, ($v0) -/* 068904 80067D04 8C620000 */ lw $v0, ($v1) -/* 068908 80067D08 3C180D01 */ lui $t8, %hi(D_0D008DA0) # $t8, 0xd01 -/* 06890C 80067D0C 27188DA0 */ addiu $t8, %lo(D_0D008DA0) # addiu $t8, $t8, -0x7260 -/* 068910 80067D10 244F0008 */ addiu $t7, $v0, 8 -/* 068914 80067D14 AC6F0000 */ sw $t7, ($v1) -/* 068918 80067D18 AC580004 */ sw $t8, 4($v0) -/* 06891C 80067D1C AC5F0000 */ sw $ra, ($v0) -/* 068920 80067D20 85790000 */ lh $t9, ($t3) -/* 068924 80067D24 272E0001 */ addiu $t6, $t9, 1 -/* 068928 80067D28 A56E0000 */ sh $t6, ($t3) -.L80067D2C: -/* 06892C 80067D2C 8FBF0014 */ lw $ra, 0x14($sp) -/* 068930 80067D30 27BD00A8 */ addiu $sp, $sp, 0xa8 -/* 068934 80067D34 03E00008 */ jr $ra -/* 068938 80067D38 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80068310.s b/asm/non_matchings/code_80057C60/func_80068310.s deleted file mode 100644 index 0802bfbbe..000000000 --- a/asm/non_matchings/code_80057C60/func_80068310.s +++ /dev/null @@ -1,263 +0,0 @@ -glabel func_80068310 -/* 068F10 80068310 27BDFF18 */ addiu $sp, $sp, -0xe8 -/* 068F14 80068314 83B800FB */ lb $t8, 0xfb($sp) -/* 068F18 80068318 00077600 */ sll $t6, $a3, 0x18 -/* 068F1C 8006831C 000E7E03 */ sra $t7, $t6, 0x18 -/* 068F20 80068320 0018C8C0 */ sll $t9, $t8, 3 -/* 068F24 80068324 0338C821 */ addu $t9, $t9, $t8 -/* 068F28 80068328 0019C8C0 */ sll $t9, $t9, 3 -/* 068F2C 8006832C AFBF001C */ sw $ra, 0x1c($sp) -/* 068F30 80068330 AFB00018 */ sw $s0, 0x18($sp) -/* 068F34 80068334 AFA500EC */ sw $a1, 0xec($sp) -/* 068F38 80068338 AFA600F0 */ sw $a2, 0xf0($sp) -/* 068F3C 8006833C AFA700F4 */ sw $a3, 0xf4($sp) -/* 068F40 80068340 00991021 */ addu $v0, $a0, $t9 -/* 068F44 80068344 844E0814 */ lh $t6, 0x814($v0) -/* 068F48 80068348 24010001 */ li $at, 1 -/* 068F4C 8006834C 00808025 */ move $s0, $a0 -/* 068F50 80068350 55C100F0 */ bnel $t6, $at, .L80068714 -/* 068F54 80068354 8FBF001C */ lw $ra, 0x1c($sp) -/* 068F58 80068358 C44407FC */ lwc1 $f4, 0x7fc($v0) -/* 068F5C 8006835C 000F7840 */ sll $t7, $t7, 1 -/* 068F60 80068360 008F1821 */ addu $v1, $a0, $t7 -/* 068F64 80068364 E7A400A0 */ swc1 $f4, 0xa0($sp) -/* 068F68 80068368 94640048 */ lhu $a0, 0x48($v1) -/* 068F6C 8006836C AFA30024 */ sw $v1, 0x24($sp) -/* 068F70 80068370 0C0AE00E */ jal coss -/* 068F74 80068374 AFA20028 */ sw $v0, 0x28($sp) -/* 068F78 80068378 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 068F7C 8006837C 44813000 */ mtc1 $at, $f6 -/* 068F80 80068380 C60A001C */ lwc1 $f10, 0x1c($s0) -/* 068F84 80068384 8FB80024 */ lw $t8, 0x24($sp) -/* 068F88 80068388 46060202 */ mul.s $f8, $f0, $f6 -/* 068F8C 8006838C 460A4400 */ add.s $f16, $f8, $f10 -/* 068F90 80068390 E7B000A4 */ swc1 $f16, 0xa4($sp) -/* 068F94 80068394 0C0AE006 */ jal sins -/* 068F98 80068398 97040048 */ lhu $a0, 0x48($t8) -/* 068F9C 8006839C 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 068FA0 800683A0 44819000 */ mtc1 $at, $f18 -/* 068FA4 800683A4 C6060014 */ lwc1 $f6, 0x14($s0) -/* 068FA8 800683A8 8FB90024 */ lw $t9, 0x24($sp) -/* 068FAC 800683AC 46120102 */ mul.s $f4, $f0, $f18 -/* 068FB0 800683B0 A7A00094 */ sh $zero, 0x94($sp) -/* 068FB4 800683B4 8FA20028 */ lw $v0, 0x28($sp) -/* 068FB8 800683B8 27A4009C */ addiu $a0, $sp, 0x9c -/* 068FBC 800683BC 27A50094 */ addiu $a1, $sp, 0x94 -/* 068FC0 800683C0 46062200 */ add.s $f8, $f4, $f6 -/* 068FC4 800683C4 E7A8009C */ swc1 $f8, 0x9c($sp) -/* 068FC8 800683C8 872E0048 */ lh $t6, 0x48($t9) -/* 068FCC 800683CC A7A00098 */ sh $zero, 0x98($sp) -/* 068FD0 800683D0 A7AE0096 */ sh $t6, 0x96($sp) -/* 068FD4 800683D4 C6100224 */ lwc1 $f16, 0x224($s0) -/* 068FD8 800683D8 C44A0804 */ lwc1 $f10, 0x804($v0) -/* 068FDC 800683DC 46105482 */ mul.s $f18, $f10, $f16 -/* 068FE0 800683E0 44069000 */ mfc1 $a2, $f18 -/* 068FE4 800683E4 0C0194B5 */ jal func_800652D4 -/* 068FE8 800683E8 00000000 */ nop -/* 068FEC 800683EC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 068FF0 800683F0 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 068FF4 800683F4 8C620000 */ lw $v0, ($v1) -/* 068FF8 800683F8 3C180D01 */ lui $t8, %hi(D_0D008C90) # $t8, 0xd01 -/* 068FFC 800683FC 3C1F0600 */ lui $ra, 0x600 -/* 069000 80068400 244F0008 */ addiu $t7, $v0, 8 -/* 069004 80068404 AC6F0000 */ sw $t7, ($v1) -/* 069008 80068408 27188C90 */ addiu $t8, %lo(D_0D008C90) # addiu $t8, $t8, -0x7370 -/* 06900C 8006840C AC580004 */ sw $t8, 4($v0) -/* 069010 80068410 AC5F0000 */ sw $ra, ($v0) -/* 069014 80068414 8C620000 */ lw $v0, ($v1) -/* 069018 80068418 3C0F800E */ lui $t7, %hi(D_800E52D0) # $t7, 0x800e -/* 06901C 8006841C 25EF52D0 */ addiu $t7, %lo(D_800E52D0) # addiu $t7, $t7, 0x52d0 -/* 069020 80068420 24590008 */ addiu $t9, $v0, 8 -/* 069024 80068424 AC790000 */ sw $t9, ($v1) -/* 069028 80068428 3C0EFD10 */ lui $t6, 0xfd10 -/* 06902C 8006842C AC4E0000 */ sw $t6, ($v0) -/* 069030 80068430 AC4F0004 */ sw $t7, 4($v0) -/* 069034 80068434 8C620000 */ lw $v0, ($v1) -/* 069038 80068438 3C19E800 */ lui $t9, 0xe800 -/* 06903C 8006843C 3C0FF500 */ lui $t7, (0xF5000100 >> 16) # lui $t7, 0xf500 -/* 069040 80068440 24580008 */ addiu $t8, $v0, 8 -/* 069044 80068444 AC780000 */ sw $t8, ($v1) -/* 069048 80068448 AC400004 */ sw $zero, 4($v0) -/* 06904C 8006844C AC590000 */ sw $t9, ($v0) -/* 069050 80068450 8C620000 */ lw $v0, ($v1) -/* 069054 80068454 3C180700 */ lui $t8, 0x700 -/* 069058 80068458 35EF0100 */ ori $t7, (0xF5000100 & 0xFFFF) # ori $t7, $t7, 0x100 -/* 06905C 8006845C 244E0008 */ addiu $t6, $v0, 8 -/* 069060 80068460 AC6E0000 */ sw $t6, ($v1) -/* 069064 80068464 AC580004 */ sw $t8, 4($v0) -/* 069068 80068468 AC4F0000 */ sw $t7, ($v0) -/* 06906C 8006846C 8C620000 */ lw $v0, ($v1) -/* 069070 80068470 3C10E600 */ lui $s0, 0xe600 -/* 069074 80068474 3C18073F */ lui $t8, (0x073FC000 >> 16) # lui $t8, 0x73f -/* 069078 80068478 24590008 */ addiu $t9, $v0, 8 -/* 06907C 8006847C AC790000 */ sw $t9, ($v1) -/* 069080 80068480 AC400004 */ sw $zero, 4($v0) -/* 069084 80068484 AC500000 */ sw $s0, ($v0) -/* 069088 80068488 8C620000 */ lw $v0, ($v1) -/* 06908C 8006848C 3718C000 */ ori $t8, (0x073FC000 & 0xFFFF) # ori $t8, $t8, 0xc000 -/* 069090 80068490 3C0FF000 */ lui $t7, 0xf000 -/* 069094 80068494 244E0008 */ addiu $t6, $v0, 8 -/* 069098 80068498 AC6E0000 */ sw $t6, ($v1) -/* 06909C 8006849C AC580004 */ sw $t8, 4($v0) -/* 0690A0 800684A0 AC4F0000 */ sw $t7, ($v0) -/* 0690A4 800684A4 8C620000 */ lw $v0, ($v1) -/* 0690A8 800684A8 3C0EE700 */ lui $t6, 0xe700 -/* 0690AC 800684AC 3C18BA00 */ lui $t8, (0xBA000E02 >> 16) # lui $t8, 0xba00 -/* 0690B0 800684B0 24590008 */ addiu $t9, $v0, 8 -/* 0690B4 800684B4 AC790000 */ sw $t9, ($v1) -/* 0690B8 800684B8 AC400004 */ sw $zero, 4($v0) -/* 0690BC 800684BC AC4E0000 */ sw $t6, ($v0) -/* 0690C0 800684C0 8C620000 */ lw $v0, ($v1) -/* 0690C4 800684C4 34198000 */ li $t9, 32768 -/* 0690C8 800684C8 37180E02 */ ori $t8, (0xBA000E02 & 0xFFFF) # ori $t8, $t8, 0xe02 -/* 0690CC 800684CC 244F0008 */ addiu $t7, $v0, 8 -/* 0690D0 800684D0 AC6F0000 */ sw $t7, ($v1) -/* 0690D4 800684D4 AC590004 */ sw $t9, 4($v0) -/* 0690D8 800684D8 AC580000 */ sw $t8, ($v0) -/* 0690DC 800684DC 8C620000 */ lw $v0, ($v1) -/* 0690E0 800684E0 3C0FFD50 */ lui $t7, 0xfd50 -/* 0690E4 800684E4 3C188019 */ lui $t8, %hi(D_8018D4B4) # $t8, 0x8019 -/* 0690E8 800684E8 244E0008 */ addiu $t6, $v0, 8 -/* 0690EC 800684EC AC6E0000 */ sw $t6, ($v1) -/* 0690F0 800684F0 AC4F0000 */ sw $t7, ($v0) -/* 0690F4 800684F4 8F18D4B4 */ lw $t8, %lo(D_8018D4B4)($t8) -/* 0690F8 800684F8 3C0F0708 */ lui $t7, (0x07080200 >> 16) # lui $t7, 0x708 -/* 0690FC 800684FC 35EF0200 */ ori $t7, (0x07080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 069100 80068500 AC580004 */ sw $t8, 4($v0) -/* 069104 80068504 8C620000 */ lw $v0, ($v1) -/* 069108 80068508 3C0EF550 */ lui $t6, 0xf550 -/* 06910C 8006850C 3C0A8016 */ lui $t2, %hi(gMatrixEffectCount) # $t2, 0x8016 -/* 069110 80068510 24590008 */ addiu $t9, $v0, 8 -/* 069114 80068514 AC790000 */ sw $t9, ($v1) -/* 069118 80068518 AC4F0004 */ sw $t7, 4($v0) -/* 06911C 8006851C AC4E0000 */ sw $t6, ($v0) -/* 069120 80068520 8C620000 */ lw $v0, ($v1) -/* 069124 80068524 3C0F073F */ lui $t7, (0x073FF100 >> 16) # lui $t7, 0x73f -/* 069128 80068528 35EFF100 */ ori $t7, (0x073FF100 & 0xFFFF) # ori $t7, $t7, 0xf100 -/* 06912C 8006852C 24580008 */ addiu $t8, $v0, 8 -/* 069130 80068530 AC780000 */ sw $t8, ($v1) -/* 069134 80068534 AC400004 */ sw $zero, 4($v0) -/* 069138 80068538 AC500000 */ sw $s0, ($v0) -/* 06913C 8006853C 8C620000 */ lw $v0, ($v1) -/* 069140 80068540 3C0EF300 */ lui $t6, 0xf300 -/* 069144 80068544 254A4AF0 */ addiu $t2, %lo(gMatrixEffectCount) # addiu $t2, $t2, 0x4af0 -/* 069148 80068548 24590008 */ addiu $t9, $v0, 8 -/* 06914C 8006854C AC790000 */ sw $t9, ($v1) -/* 069150 80068550 AC4F0004 */ sw $t7, 4($v0) -/* 069154 80068554 AC4E0000 */ sw $t6, ($v0) -/* 069158 80068558 8C620000 */ lw $v0, ($v1) -/* 06915C 8006855C 3C19E700 */ lui $t9, 0xe700 -/* 069160 80068560 3C0FF548 */ lui $t7, (0xF5481000 >> 16) # lui $t7, 0xf548 -/* 069164 80068564 24580008 */ addiu $t8, $v0, 8 -/* 069168 80068568 AC780000 */ sw $t8, ($v1) -/* 06916C 8006856C AC400004 */ sw $zero, 4($v0) -/* 069170 80068570 AC590000 */ sw $t9, ($v0) -/* 069174 80068574 8C620000 */ lw $v0, ($v1) -/* 069178 80068578 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 06917C 8006857C 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 069180 80068580 244E0008 */ addiu $t6, $v0, 8 -/* 069184 80068584 AC6E0000 */ sw $t6, ($v1) -/* 069188 80068588 35EF1000 */ ori $t7, (0xF5481000 & 0xFFFF) # ori $t7, $t7, 0x1000 -/* 06918C 8006858C AC4F0000 */ sw $t7, ($v0) -/* 069190 80068590 AC580004 */ sw $t8, 4($v0) -/* 069194 80068594 8C620000 */ lw $v0, ($v1) -/* 069198 80068598 3C0F000F */ lui $t7, (0x000FC07C >> 16) # lui $t7, 0xf -/* 06919C 8006859C 35EFC07C */ ori $t7, (0x000FC07C & 0xFFFF) # ori $t7, $t7, 0xc07c -/* 0691A0 800685A0 24590008 */ addiu $t9, $v0, 8 -/* 0691A4 800685A4 AC790000 */ sw $t9, ($v1) -/* 0691A8 800685A8 3C0EF200 */ lui $t6, 0xf200 -/* 0691AC 800685AC AC4E0000 */ sw $t6, ($v0) -/* 0691B0 800685B0 AC4F0004 */ sw $t7, 4($v0) -/* 0691B4 800685B4 8C620000 */ lw $v0, ($v1) -/* 0691B8 800685B8 3C0E800F */ lui $t6, %hi(D_800E8880) # $t6, 0x800f -/* 0691BC 800685BC 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 0691C0 800685C0 24580008 */ addiu $t8, $v0, 8 -/* 0691C4 800685C4 AC780000 */ sw $t8, ($v1) -/* 0691C8 800685C8 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 0691CC 800685CC 25CE8880 */ addiu $t6, %lo(D_800E8880) # addiu $t6, $t6, -0x7780 -/* 0691D0 800685D0 AC4E0004 */ sw $t6, 4($v0) -/* 0691D4 800685D4 AC590000 */ sw $t9, ($v0) -/* 0691D8 800685D8 8C620000 */ lw $v0, ($v1) -/* 0691DC 800685DC 3C180D01 */ lui $t8, %hi(D_0D008C78) # $t8, 0xd01 -/* 0691E0 800685E0 27188C78 */ addiu $t8, %lo(D_0D008C78) # addiu $t8, $t8, -0x7388 -/* 0691E4 800685E4 244F0008 */ addiu $t7, $v0, 8 -/* 0691E8 800685E8 AC6F0000 */ sw $t7, ($v1) -/* 0691EC 800685EC AC580004 */ sw $t8, 4($v0) -/* 0691F0 800685F0 AC5F0000 */ sw $ra, ($v0) -/* 0691F4 800685F4 8C620000 */ lw $v0, ($v1) -/* 0691F8 800685F8 3C0EFD50 */ lui $t6, 0xfd50 -/* 0691FC 800685FC 3C0F8019 */ lui $t7, %hi(D_8018D4B8) # $t7, 0x8019 -/* 069200 80068600 24590008 */ addiu $t9, $v0, 8 -/* 069204 80068604 AC790000 */ sw $t9, ($v1) -/* 069208 80068608 AC4E0000 */ sw $t6, ($v0) -/* 06920C 8006860C 8DEFD4B8 */ lw $t7, %lo(D_8018D4B8)($t7) -/* 069210 80068610 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 069214 80068614 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 069218 80068618 AC4F0004 */ sw $t7, 4($v0) -/* 06921C 8006861C 8C620000 */ lw $v0, ($v1) -/* 069220 80068620 3C19F550 */ lui $t9, 0xf550 -/* 069224 80068624 24580008 */ addiu $t8, $v0, 8 -/* 069228 80068628 AC780000 */ sw $t8, ($v1) -/* 06922C 8006862C AC4E0004 */ sw $t6, 4($v0) -/* 069230 80068630 AC590000 */ sw $t9, ($v0) -/* 069234 80068634 8C620000 */ lw $v0, ($v1) -/* 069238 80068638 3C0E073F */ lui $t6, (0x073FF100 >> 16) # lui $t6, 0x73f -/* 06923C 8006863C 35CEF100 */ ori $t6, (0x073FF100 & 0xFFFF) # ori $t6, $t6, 0xf100 -/* 069240 80068640 244F0008 */ addiu $t7, $v0, 8 -/* 069244 80068644 AC6F0000 */ sw $t7, ($v1) -/* 069248 80068648 AC400004 */ sw $zero, 4($v0) -/* 06924C 8006864C AC500000 */ sw $s0, ($v0) -/* 069250 80068650 8C620000 */ lw $v0, ($v1) -/* 069254 80068654 3C19F300 */ lui $t9, 0xf300 -/* 069258 80068658 24580008 */ addiu $t8, $v0, 8 -/* 06925C 8006865C AC780000 */ sw $t8, ($v1) -/* 069260 80068660 AC4E0004 */ sw $t6, 4($v0) -/* 069264 80068664 AC590000 */ sw $t9, ($v0) -/* 069268 80068668 8C620000 */ lw $v0, ($v1) -/* 06926C 8006866C 3C18E700 */ lui $t8, 0xe700 -/* 069270 80068670 3C0EF548 */ lui $t6, (0xF5481000 >> 16) # lui $t6, 0xf548 -/* 069274 80068674 244F0008 */ addiu $t7, $v0, 8 -/* 069278 80068678 AC6F0000 */ sw $t7, ($v1) -/* 06927C 8006867C AC400004 */ sw $zero, 4($v0) -/* 069280 80068680 AC580000 */ sw $t8, ($v0) -/* 069284 80068684 8C620000 */ lw $v0, ($v1) -/* 069288 80068688 3C0F0008 */ lui $t7, (0x00080200 >> 16) # lui $t7, 8 -/* 06928C 8006868C 35EF0200 */ ori $t7, (0x00080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 069290 80068690 24590008 */ addiu $t9, $v0, 8 -/* 069294 80068694 AC790000 */ sw $t9, ($v1) -/* 069298 80068698 35CE1000 */ ori $t6, (0xF5481000 & 0xFFFF) # ori $t6, $t6, 0x1000 -/* 06929C 8006869C AC4E0000 */ sw $t6, ($v0) -/* 0692A0 800686A0 AC4F0004 */ sw $t7, 4($v0) -/* 0692A4 800686A4 8C620000 */ lw $v0, ($v1) -/* 0692A8 800686A8 3C0E000F */ lui $t6, (0x000FC07C >> 16) # lui $t6, 0xf -/* 0692AC 800686AC 35CEC07C */ ori $t6, (0x000FC07C & 0xFFFF) # ori $t6, $t6, 0xc07c -/* 0692B0 800686B0 24580008 */ addiu $t8, $v0, 8 -/* 0692B4 800686B4 AC780000 */ sw $t8, ($v1) -/* 0692B8 800686B8 3C19F200 */ lui $t9, 0xf200 -/* 0692BC 800686BC AC590000 */ sw $t9, ($v0) -/* 0692C0 800686C0 AC4E0004 */ sw $t6, 4($v0) -/* 0692C4 800686C4 8C620000 */ lw $v0, ($v1) -/* 0692C8 800686C8 3C19800F */ lui $t9, %hi(D_800E88C0) # $t9, 0x800f -/* 0692CC 800686CC 3C180400 */ lui $t8, (0x0400103F >> 16) # lui $t8, 0x400 -/* 0692D0 800686D0 244F0008 */ addiu $t7, $v0, 8 -/* 0692D4 800686D4 AC6F0000 */ sw $t7, ($v1) -/* 0692D8 800686D8 3718103F */ ori $t8, (0x0400103F & 0xFFFF) # ori $t8, $t8, 0x103f -/* 0692DC 800686DC 273988C0 */ addiu $t9, %lo(D_800E88C0) # addiu $t9, $t9, -0x7740 -/* 0692E0 800686E0 AC590004 */ sw $t9, 4($v0) -/* 0692E4 800686E4 AC580000 */ sw $t8, ($v0) -/* 0692E8 800686E8 8C620000 */ lw $v0, ($v1) -/* 0692EC 800686EC 3C0F0D01 */ lui $t7, %hi(D_0D008DA0) # $t7, 0xd01 -/* 0692F0 800686F0 25EF8DA0 */ addiu $t7, %lo(D_0D008DA0) # addiu $t7, $t7, -0x7260 -/* 0692F4 800686F4 244E0008 */ addiu $t6, $v0, 8 -/* 0692F8 800686F8 AC6E0000 */ sw $t6, ($v1) -/* 0692FC 800686FC AC4F0004 */ sw $t7, 4($v0) -/* 069300 80068700 AC5F0000 */ sw $ra, ($v0) -/* 069304 80068704 85580000 */ lh $t8, ($t2) -/* 069308 80068708 27190001 */ addiu $t9, $t8, 1 -/* 06930C 8006870C A5590000 */ sh $t9, ($t2) -/* 069310 80068710 8FBF001C */ lw $ra, 0x1c($sp) -.L80068714: -/* 069314 80068714 8FB00018 */ lw $s0, 0x18($sp) -/* 069318 80068718 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 06931C 8006871C 03E00008 */ jr $ra -/* 069320 80068720 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80068724.s b/asm/non_matchings/code_80057C60/func_80068724.s deleted file mode 100644 index 1cc32a599..000000000 --- a/asm/non_matchings/code_80057C60/func_80068724.s +++ /dev/null @@ -1,226 +0,0 @@ -glabel func_80068724 -/* 069324 80068724 27BDFF30 */ addiu $sp, $sp, -0xd0 -/* 069328 80068728 83B800E3 */ lb $t8, 0xe3($sp) -/* 06932C 8006872C 00077600 */ sll $t6, $a3, 0x18 -/* 069330 80068730 000E7E03 */ sra $t7, $t6, 0x18 -/* 069334 80068734 0018C8C0 */ sll $t9, $t8, 3 -/* 069338 80068738 0338C821 */ addu $t9, $t9, $t8 -/* 06933C 8006873C 0019C8C0 */ sll $t9, $t9, 3 -/* 069340 80068740 AFBF001C */ sw $ra, 0x1c($sp) -/* 069344 80068744 AFB00018 */ sw $s0, 0x18($sp) -/* 069348 80068748 AFA500D4 */ sw $a1, 0xd4($sp) -/* 06934C 8006874C AFA600D8 */ sw $a2, 0xd8($sp) -/* 069350 80068750 AFA700DC */ sw $a3, 0xdc($sp) -/* 069354 80068754 00991021 */ addu $v0, $a0, $t9 -/* 069358 80068758 844E0814 */ lh $t6, 0x814($v0) -/* 06935C 8006875C 24010001 */ li $at, 1 -/* 069360 80068760 00808025 */ move $s0, $a0 -/* 069364 80068764 15C100CA */ bne $t6, $at, .L80068A90 -/* 069368 80068768 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 06936C 8006876C 44813000 */ mtc1 $at, $f6 -/* 069370 80068770 C4840018 */ lwc1 $f4, 0x18($a0) -/* 069374 80068774 000F7840 */ sll $t7, $t7, 1 -/* 069378 80068778 008F1821 */ addu $v1, $a0, $t7 -/* 06937C 8006877C 46062201 */ sub.s $f8, $f4, $f6 -/* 069380 80068780 E7A80088 */ swc1 $f8, 0x88($sp) -/* 069384 80068784 94640048 */ lhu $a0, 0x48($v1) -/* 069388 80068788 AFA30020 */ sw $v1, 0x20($sp) -/* 06938C 8006878C 0C0AE00E */ jal coss -/* 069390 80068790 AFA20024 */ sw $v0, 0x24($sp) -/* 069394 80068794 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 069398 80068798 44815000 */ mtc1 $at, $f10 -/* 06939C 8006879C C612001C */ lwc1 $f18, 0x1c($s0) -/* 0693A0 800687A0 8FB80020 */ lw $t8, 0x20($sp) -/* 0693A4 800687A4 460A0402 */ mul.s $f16, $f0, $f10 -/* 0693A8 800687A8 46128100 */ add.s $f4, $f16, $f18 -/* 0693AC 800687AC E7A4008C */ swc1 $f4, 0x8c($sp) -/* 0693B0 800687B0 0C0AE006 */ jal sins -/* 0693B4 800687B4 97040048 */ lhu $a0, 0x48($t8) -/* 0693B8 800687B8 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 0693BC 800687BC 44813000 */ mtc1 $at, $f6 -/* 0693C0 800687C0 C60A0014 */ lwc1 $f10, 0x14($s0) -/* 0693C4 800687C4 8FB90020 */ lw $t9, 0x20($sp) -/* 0693C8 800687C8 46060202 */ mul.s $f8, $f0, $f6 -/* 0693CC 800687CC A7A0007C */ sh $zero, 0x7c($sp) -/* 0693D0 800687D0 8FA20024 */ lw $v0, 0x24($sp) -/* 0693D4 800687D4 27A40084 */ addiu $a0, $sp, 0x84 -/* 0693D8 800687D8 27A5007C */ addiu $a1, $sp, 0x7c -/* 0693DC 800687DC 460A4400 */ add.s $f16, $f8, $f10 -/* 0693E0 800687E0 E7B00084 */ swc1 $f16, 0x84($sp) -/* 0693E4 800687E4 872E0048 */ lh $t6, 0x48($t9) -/* 0693E8 800687E8 A7A00080 */ sh $zero, 0x80($sp) -/* 0693EC 800687EC A7AE007E */ sh $t6, 0x7e($sp) -/* 0693F0 800687F0 C6040224 */ lwc1 $f4, 0x224($s0) -/* 0693F4 800687F4 C4520804 */ lwc1 $f18, 0x804($v0) -/* 0693F8 800687F8 46049182 */ mul.s $f6, $f18, $f4 -/* 0693FC 800687FC 44063000 */ mfc1 $a2, $f6 -/* 069400 80068800 0C0194B5 */ jal func_800652D4 -/* 069404 80068804 00000000 */ nop -/* 069408 80068808 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06940C 8006880C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 069410 80068810 8C620000 */ lw $v0, ($v1) -/* 069414 80068814 3C180D01 */ lui $t8, %hi(D_0D008DB8) # $t8, 0xd01 -/* 069418 80068818 3C1F0600 */ lui $ra, 0x600 -/* 06941C 8006881C 244F0008 */ addiu $t7, $v0, 8 -/* 069420 80068820 AC6F0000 */ sw $t7, ($v1) -/* 069424 80068824 27188DB8 */ addiu $t8, %lo(D_0D008DB8) # addiu $t8, $t8, -0x7248 -/* 069428 80068828 AC580004 */ sw $t8, 4($v0) -/* 06942C 8006882C AC5F0000 */ sw $ra, ($v0) -/* 069430 80068830 8C620000 */ lw $v0, ($v1) -/* 069434 80068834 3C0EFC12 */ lui $t6, (0xFC127E24 >> 16) # lui $t6, 0xfc12 -/* 069438 80068838 35CE7E24 */ ori $t6, (0xFC127E24 & 0xFFFF) # ori $t6, $t6, 0x7e24 -/* 06943C 8006883C 24590008 */ addiu $t9, $v0, 8 -/* 069440 80068840 AC790000 */ sw $t9, ($v1) -/* 069444 80068844 240FF3F9 */ li $t7, -3079 -/* 069448 80068848 AC4F0004 */ sw $t7, 4($v0) -/* 06944C 8006884C AC4E0000 */ sw $t6, ($v0) -/* 069450 80068850 8C620000 */ lw $v0, ($v1) -/* 069454 80068854 3C0E0050 */ lui $t6, (0x00504B50 >> 16) # lui $t6, 0x50 -/* 069458 80068858 3C19B900 */ lui $t9, (0xB900031D >> 16) # lui $t9, 0xb900 -/* 06945C 8006885C 24580008 */ addiu $t8, $v0, 8 -/* 069460 80068860 AC780000 */ sw $t8, ($v1) -/* 069464 80068864 3739031D */ ori $t9, (0xB900031D & 0xFFFF) # ori $t9, $t9, 0x31d -/* 069468 80068868 35CE4B50 */ ori $t6, (0x00504B50 & 0xFFFF) # ori $t6, $t6, 0x4b50 -/* 06946C 8006886C AC4E0004 */ sw $t6, 4($v0) -/* 069470 80068870 AC590000 */ sw $t9, ($v0) -/* 069474 80068874 8C620000 */ lw $v0, ($v1) -/* 069478 80068878 3C18FD70 */ lui $t8, 0xfd70 -/* 06947C 8006887C 3C198019 */ lui $t9, %hi(D_8018D4C4) # $t9, 0x8019 -/* 069480 80068880 244F0008 */ addiu $t7, $v0, 8 -/* 069484 80068884 AC6F0000 */ sw $t7, ($v1) -/* 069488 80068888 AC580000 */ sw $t8, ($v0) -/* 06948C 8006888C 8F39D4C4 */ lw $t9, %lo(D_8018D4C4)($t9) -/* 069490 80068890 3C180700 */ lui $t8, 0x700 -/* 069494 80068894 3C0FF570 */ lui $t7, 0xf570 -/* 069498 80068898 AC590004 */ sw $t9, 4($v0) -/* 06949C 8006889C 8C620000 */ lw $v0, ($v1) -/* 0694A0 800688A0 3C100400 */ lui $s0, (0x0400103F >> 16) # lui $s0, 0x400 -/* 0694A4 800688A4 3610103F */ ori $s0, (0x0400103F & 0xFFFF) # ori $s0, $s0, 0x103f -/* 0694A8 800688A8 244E0008 */ addiu $t6, $v0, 8 -/* 0694AC 800688AC AC6E0000 */ sw $t6, ($v1) -/* 0694B0 800688B0 AC580004 */ sw $t8, 4($v0) -/* 0694B4 800688B4 AC4F0000 */ sw $t7, ($v0) -/* 0694B8 800688B8 8C620000 */ lw $v0, ($v1) -/* 0694BC 800688BC 3C0EE600 */ lui $t6, 0xe600 -/* 0694C0 800688C0 3C18F300 */ lui $t8, 0xf300 -/* 0694C4 800688C4 24590008 */ addiu $t9, $v0, 8 -/* 0694C8 800688C8 AC790000 */ sw $t9, ($v1) -/* 0694CC 800688CC AC400004 */ sw $zero, 4($v0) -/* 0694D0 800688D0 AC4E0000 */ sw $t6, ($v0) -/* 0694D4 800688D4 8C620000 */ lw $v0, ($v1) -/* 0694D8 800688D8 3C19073F */ lui $t9, (0x073FF200 >> 16) # lui $t9, 0x73f -/* 0694DC 800688DC 3739F200 */ ori $t9, (0x073FF200 & 0xFFFF) # ori $t9, $t9, 0xf200 -/* 0694E0 800688E0 244F0008 */ addiu $t7, $v0, 8 -/* 0694E4 800688E4 AC6F0000 */ sw $t7, ($v1) -/* 0694E8 800688E8 AC590004 */ sw $t9, 4($v0) -/* 0694EC 800688EC AC580000 */ sw $t8, ($v0) -/* 0694F0 800688F0 8C620000 */ lw $v0, ($v1) -/* 0694F4 800688F4 3C0FE700 */ lui $t7, 0xe700 -/* 0694F8 800688F8 3C19F568 */ lui $t9, (0xF5680800 >> 16) # lui $t9, 0xf568 -/* 0694FC 800688FC 244E0008 */ addiu $t6, $v0, 8 -/* 069500 80068900 AC6E0000 */ sw $t6, ($v1) -/* 069504 80068904 AC400004 */ sw $zero, 4($v0) -/* 069508 80068908 AC4F0000 */ sw $t7, ($v0) -/* 06950C 8006890C 8C620000 */ lw $v0, ($v1) -/* 069510 80068910 37390800 */ ori $t9, (0xF5680800 & 0xFFFF) # ori $t9, $t9, 0x800 -/* 069514 80068914 3C0FF200 */ lui $t7, 0xf200 -/* 069518 80068918 24580008 */ addiu $t8, $v0, 8 -/* 06951C 8006891C AC780000 */ sw $t8, ($v1) -/* 069520 80068920 AC400004 */ sw $zero, 4($v0) -/* 069524 80068924 AC590000 */ sw $t9, ($v0) -/* 069528 80068928 8C620000 */ lw $v0, ($v1) -/* 06952C 8006892C 3C180007 */ lui $t8, (0x0007C0FC >> 16) # lui $t8, 7 -/* 069530 80068930 3718C0FC */ ori $t8, (0x0007C0FC & 0xFFFF) # ori $t8, $t8, 0xc0fc -/* 069534 80068934 244E0008 */ addiu $t6, $v0, 8 -/* 069538 80068938 AC6E0000 */ sw $t6, ($v1) -/* 06953C 8006893C AC580004 */ sw $t8, 4($v0) -/* 069540 80068940 AC4F0000 */ sw $t7, ($v0) -/* 069544 80068944 8C620000 */ lw $v0, ($v1) -/* 069548 80068948 3C0E800F */ lui $t6, %hi(D_800E8A00) # $t6, 0x800f -/* 06954C 8006894C 25CE8A00 */ addiu $t6, %lo(D_800E8A00) # addiu $t6, $t6, -0x7600 -/* 069550 80068950 24590008 */ addiu $t9, $v0, 8 -/* 069554 80068954 AC790000 */ sw $t9, ($v1) -/* 069558 80068958 AC4E0004 */ sw $t6, 4($v0) -/* 06955C 8006895C AC500000 */ sw $s0, ($v0) -/* 069560 80068960 8C620000 */ lw $v0, ($v1) -/* 069564 80068964 3C180D01 */ lui $t8, %hi(D_0D008C78) # $t8, 0xd01 -/* 069568 80068968 27188C78 */ addiu $t8, %lo(D_0D008C78) # addiu $t8, $t8, -0x7388 -/* 06956C 8006896C 244F0008 */ addiu $t7, $v0, 8 -/* 069570 80068970 AC6F0000 */ sw $t7, ($v1) -/* 069574 80068974 AC580004 */ sw $t8, 4($v0) -/* 069578 80068978 AC5F0000 */ sw $ra, ($v0) -/* 06957C 8006897C 8C620000 */ lw $v0, ($v1) -/* 069580 80068980 3C0EFD70 */ lui $t6, 0xfd70 -/* 069584 80068984 3C0F8019 */ lui $t7, %hi(D_8018D4C8) # $t7, 0x8019 -/* 069588 80068988 24590008 */ addiu $t9, $v0, 8 -/* 06958C 8006898C AC790000 */ sw $t9, ($v1) -/* 069590 80068990 AC4E0000 */ sw $t6, ($v0) -/* 069594 80068994 8DEFD4C8 */ lw $t7, %lo(D_8018D4C8)($t7) -/* 069598 80068998 3C0E0700 */ lui $t6, 0x700 -/* 06959C 8006899C 3C19F570 */ lui $t9, 0xf570 -/* 0695A0 800689A0 AC4F0004 */ sw $t7, 4($v0) -/* 0695A4 800689A4 8C620000 */ lw $v0, ($v1) -/* 0695A8 800689A8 3C058016 */ lui $a1, %hi(gMatrixEffectCount) # $a1, 0x8016 -/* 0695AC 800689AC 24A54AF0 */ addiu $a1, %lo(gMatrixEffectCount) # addiu $a1, $a1, 0x4af0 -/* 0695B0 800689B0 24580008 */ addiu $t8, $v0, 8 -/* 0695B4 800689B4 AC780000 */ sw $t8, ($v1) -/* 0695B8 800689B8 AC4E0004 */ sw $t6, 4($v0) -/* 0695BC 800689BC AC590000 */ sw $t9, ($v0) -/* 0695C0 800689C0 8C620000 */ lw $v0, ($v1) -/* 0695C4 800689C4 3C18E600 */ lui $t8, 0xe600 -/* 0695C8 800689C8 3C0EF300 */ lui $t6, 0xf300 -/* 0695CC 800689CC 244F0008 */ addiu $t7, $v0, 8 -/* 0695D0 800689D0 AC6F0000 */ sw $t7, ($v1) -/* 0695D4 800689D4 AC400004 */ sw $zero, 4($v0) -/* 0695D8 800689D8 AC580000 */ sw $t8, ($v0) -/* 0695DC 800689DC 8C620000 */ lw $v0, ($v1) -/* 0695E0 800689E0 3C0F073F */ lui $t7, (0x073FF200 >> 16) # lui $t7, 0x73f -/* 0695E4 800689E4 35EFF200 */ ori $t7, (0x073FF200 & 0xFFFF) # ori $t7, $t7, 0xf200 -/* 0695E8 800689E8 24590008 */ addiu $t9, $v0, 8 -/* 0695EC 800689EC AC790000 */ sw $t9, ($v1) -/* 0695F0 800689F0 AC4F0004 */ sw $t7, 4($v0) -/* 0695F4 800689F4 AC4E0000 */ sw $t6, ($v0) -/* 0695F8 800689F8 8C620000 */ lw $v0, ($v1) -/* 0695FC 800689FC 3C19E700 */ lui $t9, 0xe700 -/* 069600 80068A00 3C0FF568 */ lui $t7, (0xF5680800 >> 16) # lui $t7, 0xf568 -/* 069604 80068A04 24580008 */ addiu $t8, $v0, 8 -/* 069608 80068A08 AC780000 */ sw $t8, ($v1) -/* 06960C 80068A0C AC400004 */ sw $zero, 4($v0) -/* 069610 80068A10 AC590000 */ sw $t9, ($v0) -/* 069614 80068A14 8C620000 */ lw $v0, ($v1) -/* 069618 80068A18 35EF0800 */ ori $t7, (0xF5680800 & 0xFFFF) # ori $t7, $t7, 0x800 -/* 06961C 80068A1C 3C19F200 */ lui $t9, 0xf200 -/* 069620 80068A20 244E0008 */ addiu $t6, $v0, 8 -/* 069624 80068A24 AC6E0000 */ sw $t6, ($v1) -/* 069628 80068A28 AC400004 */ sw $zero, 4($v0) -/* 06962C 80068A2C AC4F0000 */ sw $t7, ($v0) -/* 069630 80068A30 8C620000 */ lw $v0, ($v1) -/* 069634 80068A34 3C0E0007 */ lui $t6, (0x0007C0FC >> 16) # lui $t6, 7 -/* 069638 80068A38 35CEC0FC */ ori $t6, (0x0007C0FC & 0xFFFF) # ori $t6, $t6, 0xc0fc -/* 06963C 80068A3C 24580008 */ addiu $t8, $v0, 8 -/* 069640 80068A40 AC780000 */ sw $t8, ($v1) -/* 069644 80068A44 AC4E0004 */ sw $t6, 4($v0) -/* 069648 80068A48 AC590000 */ sw $t9, ($v0) -/* 06964C 80068A4C 8C620000 */ lw $v0, ($v1) -/* 069650 80068A50 3C18800F */ lui $t8, %hi(D_800E8A40) # $t8, 0x800f -/* 069654 80068A54 27188A40 */ addiu $t8, %lo(D_800E8A40) # addiu $t8, $t8, -0x75c0 -/* 069658 80068A58 244F0008 */ addiu $t7, $v0, 8 -/* 06965C 80068A5C AC6F0000 */ sw $t7, ($v1) -/* 069660 80068A60 AC580004 */ sw $t8, 4($v0) -/* 069664 80068A64 AC500000 */ sw $s0, ($v0) -/* 069668 80068A68 8C620000 */ lw $v0, ($v1) -/* 06966C 80068A6C 3C0E0D01 */ lui $t6, %hi(D_0D008DA0) # $t6, 0xd01 -/* 069670 80068A70 25CE8DA0 */ addiu $t6, %lo(D_0D008DA0) # addiu $t6, $t6, -0x7260 -/* 069674 80068A74 24590008 */ addiu $t9, $v0, 8 -/* 069678 80068A78 AC790000 */ sw $t9, ($v1) -/* 06967C 80068A7C AC4E0004 */ sw $t6, 4($v0) -/* 069680 80068A80 AC5F0000 */ sw $ra, ($v0) -/* 069684 80068A84 84AF0000 */ lh $t7, ($a1) -/* 069688 80068A88 25F80001 */ addiu $t8, $t7, 1 -/* 06968C 80068A8C A4B80000 */ sh $t8, ($a1) -.L80068A90: -/* 069690 80068A90 8FBF001C */ lw $ra, 0x1c($sp) -/* 069694 80068A94 8FB00018 */ lw $s0, 0x18($sp) -/* 069698 80068A98 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 06969C 80068A9C 03E00008 */ jr $ra -/* 0696A0 80068AA0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80068AA4.s b/asm/non_matchings/code_80057C60/func_80068AA4.s deleted file mode 100644 index 2a7542f4d..000000000 --- a/asm/non_matchings/code_80057C60/func_80068AA4.s +++ /dev/null @@ -1,193 +0,0 @@ -glabel func_80068AA4 -/* 0696A4 80068AA4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 0696A8 80068AA8 83B80083 */ lb $t8, 0x83($sp) -/* 0696AC 80068AAC 00077600 */ sll $t6, $a3, 0x18 -/* 0696B0 80068AB0 000E7E03 */ sra $t7, $t6, 0x18 -/* 0696B4 80068AB4 0018C8C0 */ sll $t9, $t8, 3 -/* 0696B8 80068AB8 0338C821 */ addu $t9, $t9, $t8 -/* 0696BC 80068ABC 0019C8C0 */ sll $t9, $t9, 3 -/* 0696C0 80068AC0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0696C4 80068AC4 AFB00018 */ sw $s0, 0x18($sp) -/* 0696C8 80068AC8 AFA50074 */ sw $a1, 0x74($sp) -/* 0696CC 80068ACC AFA60078 */ sw $a2, 0x78($sp) -/* 0696D0 80068AD0 AFA7007C */ sw $a3, 0x7c($sp) -/* 0696D4 80068AD4 00991021 */ addu $v0, $a0, $t9 -/* 0696D8 80068AD8 844E0814 */ lh $t6, 0x814($v0) -/* 0696DC 80068ADC 24010001 */ li $at, 1 -/* 0696E0 80068AE0 00808025 */ move $s0, $a0 -/* 0696E4 80068AE4 15C100A9 */ bne $t6, $at, .L80068D8C -/* 0696E8 80068AE8 000F7840 */ sll $t7, $t7, 1 -/* 0696EC 80068AEC 008F1821 */ addu $v1, $a0, $t7 -/* 0696F0 80068AF0 94780244 */ lhu $t8, 0x244($v1) -/* 0696F4 80068AF4 2B01000D */ slti $at, $t8, 0xd -/* 0696F8 80068AF8 102000A4 */ beqz $at, .L80068D8C -/* 0696FC 80068AFC 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 069700 80068B00 44813000 */ mtc1 $at, $f6 -/* 069704 80068B04 C4840018 */ lwc1 $f4, 0x18($a0) -/* 069708 80068B08 46062201 */ sub.s $f8, $f4, $f6 -/* 06970C 80068B0C E7A80068 */ swc1 $f8, 0x68($sp) -/* 069710 80068B10 94640048 */ lhu $a0, 0x48($v1) -/* 069714 80068B14 AFA30024 */ sw $v1, 0x24($sp) -/* 069718 80068B18 0C0AE00E */ jal coss -/* 06971C 80068B1C AFA20028 */ sw $v0, 0x28($sp) -/* 069720 80068B20 8FA20028 */ lw $v0, 0x28($sp) -/* 069724 80068B24 3C01C004 */ li $at, 0xC0040000 # -2.062500 -/* 069728 80068B28 44815800 */ mtc1 $at, $f11 -/* 06972C 80068B2C 84590816 */ lh $t9, 0x816($v0) -/* 069730 80068B30 44805000 */ mtc1 $zero, $f10 -/* 069734 80068B34 460001A1 */ cvt.d.s $f6, $f0 -/* 069738 80068B38 44998000 */ mtc1 $t9, $f16 -/* 06973C 80068B3C 8FA30024 */ lw $v1, 0x24($sp) -/* 069740 80068B40 468084A1 */ cvt.d.w $f18, $f16 -/* 069744 80068B44 C610001C */ lwc1 $f16, 0x1c($s0) -/* 069748 80068B48 46325102 */ mul.d $f4, $f10, $f18 -/* 06974C 80068B4C 460082A1 */ cvt.d.s $f10, $f16 -/* 069750 80068B50 46243202 */ mul.d $f8, $f6, $f4 -/* 069754 80068B54 462A4480 */ add.d $f18, $f8, $f10 -/* 069758 80068B58 462091A0 */ cvt.s.d $f6, $f18 -/* 06975C 80068B5C E7A6006C */ swc1 $f6, 0x6c($sp) -/* 069760 80068B60 0C0AE006 */ jal sins -/* 069764 80068B64 94640048 */ lhu $a0, 0x48($v1) -/* 069768 80068B68 8FA20028 */ lw $v0, 0x28($sp) -/* 06976C 80068B6C 3C01C004 */ li $at, 0xC0040000 # -2.062500 -/* 069770 80068B70 44812800 */ mtc1 $at, $f5 -/* 069774 80068B74 844E0816 */ lh $t6, 0x816($v0) -/* 069778 80068B78 44802000 */ mtc1 $zero, $f4 -/* 06977C 80068B7C 460004A1 */ cvt.d.s $f18, $f0 -/* 069780 80068B80 448E8000 */ mtc1 $t6, $f16 -/* 069784 80068B84 8FA30024 */ lw $v1, 0x24($sp) -/* 069788 80068B88 27A40064 */ addiu $a0, $sp, 0x64 -/* 06978C 80068B8C 46808221 */ cvt.d.w $f8, $f16 -/* 069790 80068B90 C6100014 */ lwc1 $f16, 0x14($s0) -/* 069794 80068B94 A7A0005C */ sh $zero, 0x5c($sp) -/* 069798 80068B98 27A5005C */ addiu $a1, $sp, 0x5c -/* 06979C 80068B9C 46282282 */ mul.d $f10, $f4, $f8 -/* 0697A0 80068BA0 46008121 */ cvt.d.s $f4, $f16 -/* 0697A4 80068BA4 462A9182 */ mul.d $f6, $f18, $f10 -/* 0697A8 80068BA8 46243200 */ add.d $f8, $f6, $f4 -/* 0697AC 80068BAC 462044A0 */ cvt.s.d $f18, $f8 -/* 0697B0 80068BB0 E7B20064 */ swc1 $f18, 0x64($sp) -/* 0697B4 80068BB4 846F0048 */ lh $t7, 0x48($v1) -/* 0697B8 80068BB8 A7A00060 */ sh $zero, 0x60($sp) -/* 0697BC 80068BBC A7AF005E */ sh $t7, 0x5e($sp) -/* 0697C0 80068BC0 C6100224 */ lwc1 $f16, 0x224($s0) -/* 0697C4 80068BC4 C44A0804 */ lwc1 $f10, 0x804($v0) -/* 0697C8 80068BC8 46105182 */ mul.s $f6, $f10, $f16 -/* 0697CC 80068BCC 44063000 */ mfc1 $a2, $f6 -/* 0697D0 80068BD0 0C0194B5 */ jal func_800652D4 -/* 0697D4 80068BD4 00000000 */ nop -/* 0697D8 80068BD8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0697DC 80068BDC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0697E0 80068BE0 8C620000 */ lw $v0, ($v1) -/* 0697E4 80068BE4 3C0E0D01 */ lui $t6, %hi(D_0D008D58) # $t6, 0xd01 -/* 0697E8 80068BE8 25CE8D58 */ addiu $t6, %lo(D_0D008D58) # addiu $t6, $t6, -0x72a8 -/* 0697EC 80068BEC 24580008 */ addiu $t8, $v0, 8 -/* 0697F0 80068BF0 AC780000 */ sw $t8, ($v1) -/* 0697F4 80068BF4 3C190600 */ lui $t9, 0x600 -/* 0697F8 80068BF8 AC590000 */ sw $t9, ($v0) -/* 0697FC 80068BFC AC4E0004 */ sw $t6, 4($v0) -/* 069800 80068C00 8C620000 */ lw $v0, ($v1) -/* 069804 80068C04 3C18BA00 */ lui $t8, (0xBA000E02 >> 16) # lui $t8, 0xba00 -/* 069808 80068C08 37180E02 */ ori $t8, (0xBA000E02 & 0xFFFF) # ori $t8, $t8, 0xe02 -/* 06980C 80068C0C 244F0008 */ addiu $t7, $v0, 8 -/* 069810 80068C10 AC6F0000 */ sw $t7, ($v1) -/* 069814 80068C14 AC400004 */ sw $zero, 4($v0) -/* 069818 80068C18 AC580000 */ sw $t8, ($v0) -/* 06981C 80068C1C 8C620000 */ lw $v0, ($v1) -/* 069820 80068C20 3C0EFD70 */ lui $t6, 0xfd70 -/* 069824 80068C24 3C0F8019 */ lui $t7, %hi(D_8018D4A0) # $t7, 0x8019 -/* 069828 80068C28 24590008 */ addiu $t9, $v0, 8 -/* 06982C 80068C2C AC790000 */ sw $t9, ($v1) -/* 069830 80068C30 AC4E0000 */ sw $t6, ($v0) -/* 069834 80068C34 8DEFD4A0 */ lw $t7, %lo(D_8018D4A0)($t7) -/* 069838 80068C38 3C0E0708 */ lui $t6, (0x07080200 >> 16) # lui $t6, 0x708 -/* 06983C 80068C3C 35CE0200 */ ori $t6, (0x07080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 069840 80068C40 AC4F0004 */ sw $t7, 4($v0) -/* 069844 80068C44 8C620000 */ lw $v0, ($v1) -/* 069848 80068C48 3C19F570 */ lui $t9, 0xf570 -/* 06984C 80068C4C 240400FF */ li $a0, 255 -/* 069850 80068C50 24580008 */ addiu $t8, $v0, 8 -/* 069854 80068C54 AC780000 */ sw $t8, ($v1) -/* 069858 80068C58 AC4E0004 */ sw $t6, 4($v0) -/* 06985C 80068C5C AC590000 */ sw $t9, ($v0) -/* 069860 80068C60 8C620000 */ lw $v0, ($v1) -/* 069864 80068C64 3C18E600 */ lui $t8, 0xe600 -/* 069868 80068C68 3C0EF300 */ lui $t6, 0xf300 -/* 06986C 80068C6C 244F0008 */ addiu $t7, $v0, 8 -/* 069870 80068C70 AC6F0000 */ sw $t7, ($v1) -/* 069874 80068C74 AC400004 */ sw $zero, 4($v0) -/* 069878 80068C78 AC580000 */ sw $t8, ($v0) -/* 06987C 80068C7C 8C620000 */ lw $v0, ($v1) -/* 069880 80068C80 3C0F073F */ lui $t7, (0x073FF100 >> 16) # lui $t7, 0x73f -/* 069884 80068C84 35EFF100 */ ori $t7, (0x073FF100 & 0xFFFF) # ori $t7, $t7, 0xf100 -/* 069888 80068C88 24590008 */ addiu $t9, $v0, 8 -/* 06988C 80068C8C AC790000 */ sw $t9, ($v1) -/* 069890 80068C90 AC4F0004 */ sw $t7, 4($v0) -/* 069894 80068C94 AC4E0000 */ sw $t6, ($v0) -/* 069898 80068C98 8C620000 */ lw $v0, ($v1) -/* 06989C 80068C9C 3C19E700 */ lui $t9, 0xe700 -/* 0698A0 80068CA0 3C0FF568 */ lui $t7, (0xF5681000 >> 16) # lui $t7, 0xf568 -/* 0698A4 80068CA4 24580008 */ addiu $t8, $v0, 8 -/* 0698A8 80068CA8 AC780000 */ sw $t8, ($v1) -/* 0698AC 80068CAC AC400004 */ sw $zero, 4($v0) -/* 0698B0 80068CB0 AC590000 */ sw $t9, ($v0) -/* 0698B4 80068CB4 8C620000 */ lw $v0, ($v1) -/* 0698B8 80068CB8 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 0698BC 80068CBC 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 0698C0 80068CC0 244E0008 */ addiu $t6, $v0, 8 -/* 0698C4 80068CC4 AC6E0000 */ sw $t6, ($v1) -/* 0698C8 80068CC8 35EF1000 */ ori $t7, (0xF5681000 & 0xFFFF) # ori $t7, $t7, 0x1000 -/* 0698CC 80068CCC AC4F0000 */ sw $t7, ($v0) -/* 0698D0 80068CD0 AC580004 */ sw $t8, 4($v0) -/* 0698D4 80068CD4 8C620000 */ lw $v0, ($v1) -/* 0698D8 80068CD8 3C18000F */ lui $t8, (0x000FC07C >> 16) # lui $t8, 0xf -/* 0698DC 80068CDC 3718C07C */ ori $t8, (0x000FC07C & 0xFFFF) # ori $t8, $t8, 0xc07c -/* 0698E0 80068CE0 24590008 */ addiu $t9, $v0, 8 -/* 0698E4 80068CE4 AC790000 */ sw $t9, ($v1) -/* 0698E8 80068CE8 3C0EF200 */ lui $t6, 0xf200 -/* 0698EC 80068CEC AFA20038 */ sw $v0, 0x38($sp) -/* 0698F0 80068CF0 240500FF */ li $a1, 255 -/* 0698F4 80068CF4 240600FF */ li $a2, 255 -/* 0698F8 80068CF8 240700FF */ li $a3, 255 -/* 0698FC 80068CFC AC580004 */ sw $t8, 4($v0) -/* 069900 80068D00 0C012CD7 */ jal func_8004B35C -/* 069904 80068D04 AC4E0000 */ sw $t6, ($v0) -/* 069908 80068D08 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06990C 80068D0C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 069910 80068D10 8C620000 */ lw $v0, ($v1) -/* 069914 80068D14 3C0EB900 */ lui $t6, (0xB900031D >> 16) # lui $t6, 0xb900 -/* 069918 80068D18 3C180050 */ lui $t8, (0x00504B50 >> 16) # lui $t8, 0x50 -/* 06991C 80068D1C 24590008 */ addiu $t9, $v0, 8 -/* 069920 80068D20 AC790000 */ sw $t9, ($v1) -/* 069924 80068D24 37184B50 */ ori $t8, (0x00504B50 & 0xFFFF) # ori $t8, $t8, 0x4b50 -/* 069928 80068D28 35CE031D */ ori $t6, (0xB900031D & 0xFFFF) # ori $t6, $t6, 0x31d -/* 06992C 80068D2C AC4E0000 */ sw $t6, ($v0) -/* 069930 80068D30 AC580004 */ sw $t8, 4($v0) -/* 069934 80068D34 8C620000 */ lw $v0, ($v1) -/* 069938 80068D38 3C0E800F */ lui $t6, %hi(D_800E8B40) # $t6, 0x800f -/* 06993C 80068D3C 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 069940 80068D40 244F0008 */ addiu $t7, $v0, 8 -/* 069944 80068D44 AC6F0000 */ sw $t7, ($v1) -/* 069948 80068D48 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 06994C 80068D4C 25CE8B40 */ addiu $t6, %lo(D_800E8B40) # addiu $t6, $t6, -0x74c0 -/* 069950 80068D50 AC4E0004 */ sw $t6, 4($v0) -/* 069954 80068D54 AC590000 */ sw $t9, ($v0) -/* 069958 80068D58 8C620000 */ lw $v0, ($v1) -/* 06995C 80068D5C 3C190D01 */ lui $t9, %hi(D_0D008DA0) # $t9, 0xd01 -/* 069960 80068D60 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 069964 80068D64 24580008 */ addiu $t8, $v0, 8 -/* 069968 80068D68 AC780000 */ sw $t8, ($v1) -/* 06996C 80068D6C 27398DA0 */ addiu $t9, %lo(D_0D008DA0) # addiu $t9, $t9, -0x7260 -/* 069970 80068D70 3C0F0600 */ lui $t7, 0x600 -/* 069974 80068D74 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 069978 80068D78 AC4F0000 */ sw $t7, ($v0) -/* 06997C 80068D7C AC590004 */ sw $t9, 4($v0) -/* 069980 80068D80 84EE0000 */ lh $t6, ($a3) -/* 069984 80068D84 25D80001 */ addiu $t8, $t6, 1 -/* 069988 80068D88 A4F80000 */ sh $t8, ($a3) -.L80068D8C: -/* 06998C 80068D8C 8FBF001C */ lw $ra, 0x1c($sp) -/* 069990 80068D90 8FB00018 */ lw $s0, 0x18($sp) -/* 069994 80068D94 27BD0070 */ addiu $sp, $sp, 0x70 -/* 069998 80068D98 03E00008 */ jr $ra -/* 06999C 80068D9C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80068DA0.s b/asm/non_matchings/code_80057C60/func_80068DA0.s deleted file mode 100644 index 7dcf6bb0b..000000000 --- a/asm/non_matchings/code_80057C60/func_80068DA0.s +++ /dev/null @@ -1,264 +0,0 @@ -glabel func_80068DA0 -/* 0699A0 80068DA0 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* 0699A4 80068DA4 83B800BB */ lb $t8, 0xbb($sp) -/* 0699A8 80068DA8 00077600 */ sll $t6, $a3, 0x18 -/* 0699AC 80068DAC 000E7E03 */ sra $t7, $t6, 0x18 -/* 0699B0 80068DB0 0018C8C0 */ sll $t9, $t8, 3 -/* 0699B4 80068DB4 0338C821 */ addu $t9, $t9, $t8 -/* 0699B8 80068DB8 0019C8C0 */ sll $t9, $t9, 3 -/* 0699BC 80068DBC AFBF001C */ sw $ra, 0x1c($sp) -/* 0699C0 80068DC0 AFB00018 */ sw $s0, 0x18($sp) -/* 0699C4 80068DC4 AFA500AC */ sw $a1, 0xac($sp) -/* 0699C8 80068DC8 AFA600B0 */ sw $a2, 0xb0($sp) -/* 0699CC 80068DCC AFA700B4 */ sw $a3, 0xb4($sp) -/* 0699D0 80068DD0 00991821 */ addu $v1, $a0, $t9 -/* 0699D4 80068DD4 846E0814 */ lh $t6, 0x814($v1) -/* 0699D8 80068DD8 24010001 */ li $at, 1 -/* 0699DC 80068DDC 00808025 */ move $s0, $a0 -/* 0699E0 80068DE0 15C100F0 */ bne $t6, $at, .L800691A4 -/* 0699E4 80068DE4 000F7840 */ sll $t7, $t7, 1 -/* 0699E8 80068DE8 008F1021 */ addu $v0, $a0, $t7 -/* 0699EC 80068DEC 94580244 */ lhu $t8, 0x244($v0) -/* 0699F0 80068DF0 2B01000D */ slti $at, $t8, 0xd -/* 0699F4 80068DF4 102000EB */ beqz $at, .L800691A4 -/* 0699F8 80068DF8 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 0699FC 80068DFC 44813000 */ mtc1 $at, $f6 -/* 069A00 80068E00 C4840018 */ lwc1 $f4, 0x18($a0) -/* 069A04 80068E04 C46A07FC */ lwc1 $f10, 0x7fc($v1) -/* 069A08 80068E08 46062201 */ sub.s $f8, $f4, $f6 -/* 069A0C 80068E0C 46085400 */ add.s $f16, $f10, $f8 -/* 069A10 80068E10 E7B000A0 */ swc1 $f16, 0xa0($sp) -/* 069A14 80068E14 94440048 */ lhu $a0, 0x48($v0) -/* 069A18 80068E18 AFA30028 */ sw $v1, 0x28($sp) -/* 069A1C 80068E1C 0C0AE00E */ jal coss -/* 069A20 80068E20 AFA20024 */ sw $v0, 0x24($sp) -/* 069A24 80068E24 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 069A28 80068E28 44819000 */ mtc1 $at, $f18 -/* 069A2C 80068E2C C606001C */ lwc1 $f6, 0x1c($s0) -/* 069A30 80068E30 8FA20024 */ lw $v0, 0x24($sp) -/* 069A34 80068E34 46120102 */ mul.s $f4, $f0, $f18 -/* 069A38 80068E38 46062280 */ add.s $f10, $f4, $f6 -/* 069A3C 80068E3C E7AA00A4 */ swc1 $f10, 0xa4($sp) -/* 069A40 80068E40 0C0AE006 */ jal sins -/* 069A44 80068E44 94440048 */ lhu $a0, 0x48($v0) -/* 069A48 80068E48 3C01C120 */ li $at, 0xC1200000 # -10.000000 -/* 069A4C 80068E4C 44814000 */ mtc1 $at, $f8 -/* 069A50 80068E50 C6120014 */ lwc1 $f18, 0x14($s0) -/* 069A54 80068E54 8FA20024 */ lw $v0, 0x24($sp) -/* 069A58 80068E58 46080402 */ mul.s $f16, $f0, $f8 -/* 069A5C 80068E5C A7A00094 */ sh $zero, 0x94($sp) -/* 069A60 80068E60 8FA30028 */ lw $v1, 0x28($sp) -/* 069A64 80068E64 27A4009C */ addiu $a0, $sp, 0x9c -/* 069A68 80068E68 27A50094 */ addiu $a1, $sp, 0x94 -/* 069A6C 80068E6C 46128100 */ add.s $f4, $f16, $f18 -/* 069A70 80068E70 E7A4009C */ swc1 $f4, 0x9c($sp) -/* 069A74 80068E74 84590048 */ lh $t9, 0x48($v0) -/* 069A78 80068E78 A7A00098 */ sh $zero, 0x98($sp) -/* 069A7C 80068E7C A7B90096 */ sh $t9, 0x96($sp) -/* 069A80 80068E80 C60A0224 */ lwc1 $f10, 0x224($s0) -/* 069A84 80068E84 C4660804 */ lwc1 $f6, 0x804($v1) -/* 069A88 80068E88 460A3202 */ mul.s $f8, $f6, $f10 -/* 069A8C 80068E8C 44064000 */ mfc1 $a2, $f8 -/* 069A90 80068E90 0C0194B5 */ jal func_800652D4 -/* 069A94 80068E94 00000000 */ nop -/* 069A98 80068E98 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 069A9C 80068E9C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 069AA0 80068EA0 8C620000 */ lw $v0, ($v1) -/* 069AA4 80068EA4 3C0F0D01 */ lui $t7, %hi(D_0D008C90) # $t7, 0xd01 -/* 069AA8 80068EA8 3C1F0600 */ lui $ra, 0x600 -/* 069AAC 80068EAC 244E0008 */ addiu $t6, $v0, 8 -/* 069AB0 80068EB0 AC6E0000 */ sw $t6, ($v1) -/* 069AB4 80068EB4 25EF8C90 */ addiu $t7, %lo(D_0D008C90) # addiu $t7, $t7, -0x7370 -/* 069AB8 80068EB8 AC4F0004 */ sw $t7, 4($v0) -/* 069ABC 80068EBC AC5F0000 */ sw $ra, ($v0) -/* 069AC0 80068EC0 8C620000 */ lw $v0, ($v1) -/* 069AC4 80068EC4 3C0E800E */ lui $t6, %hi(D_800E52D0) # $t6, 0x800e -/* 069AC8 80068EC8 25CE52D0 */ addiu $t6, %lo(D_800E52D0) # addiu $t6, $t6, 0x52d0 -/* 069ACC 80068ECC 24580008 */ addiu $t8, $v0, 8 -/* 069AD0 80068ED0 AC780000 */ sw $t8, ($v1) -/* 069AD4 80068ED4 3C19FD10 */ lui $t9, 0xfd10 -/* 069AD8 80068ED8 AC590000 */ sw $t9, ($v0) -/* 069ADC 80068EDC AC4E0004 */ sw $t6, 4($v0) -/* 069AE0 80068EE0 8C620000 */ lw $v0, ($v1) -/* 069AE4 80068EE4 3C18E800 */ lui $t8, 0xe800 -/* 069AE8 80068EE8 3C0EF500 */ lui $t6, (0xF5000100 >> 16) # lui $t6, 0xf500 -/* 069AEC 80068EEC 244F0008 */ addiu $t7, $v0, 8 -/* 069AF0 80068EF0 AC6F0000 */ sw $t7, ($v1) -/* 069AF4 80068EF4 AC400004 */ sw $zero, 4($v0) -/* 069AF8 80068EF8 AC580000 */ sw $t8, ($v0) -/* 069AFC 80068EFC 8C620000 */ lw $v0, ($v1) -/* 069B00 80068F00 3C100700 */ lui $s0, 0x700 -/* 069B04 80068F04 35CE0100 */ ori $t6, (0xF5000100 & 0xFFFF) # ori $t6, $t6, 0x100 -/* 069B08 80068F08 24590008 */ addiu $t9, $v0, 8 -/* 069B0C 80068F0C AC790000 */ sw $t9, ($v1) -/* 069B10 80068F10 AC500004 */ sw $s0, 4($v0) -/* 069B14 80068F14 AC4E0000 */ sw $t6, ($v0) -/* 069B18 80068F18 8C620000 */ lw $v0, ($v1) -/* 069B1C 80068F1C 3C18E600 */ lui $t8, 0xe600 -/* 069B20 80068F20 3C0EF000 */ lui $t6, 0xf000 -/* 069B24 80068F24 244F0008 */ addiu $t7, $v0, 8 -/* 069B28 80068F28 AC6F0000 */ sw $t7, ($v1) -/* 069B2C 80068F2C AC400004 */ sw $zero, 4($v0) -/* 069B30 80068F30 AC580000 */ sw $t8, ($v0) -/* 069B34 80068F34 8C620000 */ lw $v0, ($v1) -/* 069B38 80068F38 3C0F073F */ lui $t7, (0x073FC000 >> 16) # lui $t7, 0x73f -/* 069B3C 80068F3C 35EFC000 */ ori $t7, (0x073FC000 & 0xFFFF) # ori $t7, $t7, 0xc000 -/* 069B40 80068F40 24590008 */ addiu $t9, $v0, 8 -/* 069B44 80068F44 AC790000 */ sw $t9, ($v1) -/* 069B48 80068F48 AC4F0004 */ sw $t7, 4($v0) -/* 069B4C 80068F4C AC4E0000 */ sw $t6, ($v0) -/* 069B50 80068F50 8C620000 */ lw $v0, ($v1) -/* 069B54 80068F54 3C19E700 */ lui $t9, 0xe700 -/* 069B58 80068F58 3C0FBA00 */ lui $t7, (0xBA000E02 >> 16) # lui $t7, 0xba00 -/* 069B5C 80068F5C 24580008 */ addiu $t8, $v0, 8 -/* 069B60 80068F60 AC780000 */ sw $t8, ($v1) -/* 069B64 80068F64 AC400004 */ sw $zero, 4($v0) -/* 069B68 80068F68 AC590000 */ sw $t9, ($v0) -/* 069B6C 80068F6C 8C620000 */ lw $v0, ($v1) -/* 069B70 80068F70 34188000 */ li $t8, 32768 -/* 069B74 80068F74 35EF0E02 */ ori $t7, (0xBA000E02 & 0xFFFF) # ori $t7, $t7, 0xe02 -/* 069B78 80068F78 244E0008 */ addiu $t6, $v0, 8 -/* 069B7C 80068F7C AC6E0000 */ sw $t6, ($v1) -/* 069B80 80068F80 AC580004 */ sw $t8, 4($v0) -/* 069B84 80068F84 AC4F0000 */ sw $t7, ($v0) -/* 069B88 80068F88 8C620000 */ lw $v0, ($v1) -/* 069B8C 80068F8C 3C0EFD50 */ lui $t6, 0xfd50 -/* 069B90 80068F90 3C0F8019 */ lui $t7, %hi(D_8018D4A4) # $t7, 0x8019 -/* 069B94 80068F94 24590008 */ addiu $t9, $v0, 8 -/* 069B98 80068F98 AC790000 */ sw $t9, ($v1) -/* 069B9C 80068F9C AC4E0000 */ sw $t6, ($v0) -/* 069BA0 80068FA0 8DEFD4A4 */ lw $t7, %lo(D_8018D4A4)($t7) -/* 069BA4 80068FA4 3C19F550 */ lui $t9, 0xf550 -/* 069BA8 80068FA8 3C0A8016 */ lui $t2, %hi(gMatrixEffectCount) # $t2, 0x8016 -/* 069BAC 80068FAC AC4F0004 */ sw $t7, 4($v0) -/* 069BB0 80068FB0 8C620000 */ lw $v0, ($v1) -/* 069BB4 80068FB4 3C0FE600 */ lui $t7, 0xe600 -/* 069BB8 80068FB8 254A4AF0 */ addiu $t2, %lo(gMatrixEffectCount) # addiu $t2, $t2, 0x4af0 -/* 069BBC 80068FBC 24580008 */ addiu $t8, $v0, 8 -/* 069BC0 80068FC0 AC780000 */ sw $t8, ($v1) -/* 069BC4 80068FC4 AC500004 */ sw $s0, 4($v0) -/* 069BC8 80068FC8 AC590000 */ sw $t9, ($v0) -/* 069BCC 80068FCC 8C620000 */ lw $v0, ($v1) -/* 069BD0 80068FD0 3C19F300 */ lui $t9, 0xf300 -/* 069BD4 80068FD4 244E0008 */ addiu $t6, $v0, 8 -/* 069BD8 80068FD8 AC6E0000 */ sw $t6, ($v1) -/* 069BDC 80068FDC AC400004 */ sw $zero, 4($v0) -/* 069BE0 80068FE0 AC4F0000 */ sw $t7, ($v0) -/* 069BE4 80068FE4 8C620000 */ lw $v0, ($v1) -/* 069BE8 80068FE8 3C0E073F */ lui $t6, (0x073FF100 >> 16) # lui $t6, 0x73f -/* 069BEC 80068FEC 35CEF100 */ ori $t6, (0x073FF100 & 0xFFFF) # ori $t6, $t6, 0xf100 -/* 069BF0 80068FF0 24580008 */ addiu $t8, $v0, 8 -/* 069BF4 80068FF4 AC780000 */ sw $t8, ($v1) -/* 069BF8 80068FF8 AC4E0004 */ sw $t6, 4($v0) -/* 069BFC 80068FFC AC590000 */ sw $t9, ($v0) -/* 069C00 80069000 8C620000 */ lw $v0, ($v1) -/* 069C04 80069004 3C18E700 */ lui $t8, 0xe700 -/* 069C08 80069008 3C0EF548 */ lui $t6, (0xF5481000 >> 16) # lui $t6, 0xf548 -/* 069C0C 8006900C 244F0008 */ addiu $t7, $v0, 8 -/* 069C10 80069010 AC6F0000 */ sw $t7, ($v1) -/* 069C14 80069014 AC400004 */ sw $zero, 4($v0) -/* 069C18 80069018 AC580000 */ sw $t8, ($v0) -/* 069C1C 8006901C 8C620000 */ lw $v0, ($v1) -/* 069C20 80069020 35CE1000 */ ori $t6, (0xF5481000 & 0xFFFF) # ori $t6, $t6, 0x1000 -/* 069C24 80069024 3C18F200 */ lui $t8, 0xf200 -/* 069C28 80069028 24590008 */ addiu $t9, $v0, 8 -/* 069C2C 8006902C AC790000 */ sw $t9, ($v1) -/* 069C30 80069030 AC400004 */ sw $zero, 4($v0) -/* 069C34 80069034 AC4E0000 */ sw $t6, ($v0) -/* 069C38 80069038 8C620000 */ lw $v0, ($v1) -/* 069C3C 8006903C 3C19000F */ lui $t9, (0x000FC07C >> 16) # lui $t9, 0xf -/* 069C40 80069040 3739C07C */ ori $t9, (0x000FC07C & 0xFFFF) # ori $t9, $t9, 0xc07c -/* 069C44 80069044 244F0008 */ addiu $t7, $v0, 8 -/* 069C48 80069048 AC6F0000 */ sw $t7, ($v1) -/* 069C4C 8006904C AC590004 */ sw $t9, 4($v0) -/* 069C50 80069050 AC580000 */ sw $t8, ($v0) -/* 069C54 80069054 8C620000 */ lw $v0, ($v1) -/* 069C58 80069058 3C18800F */ lui $t8, %hi(D_800E8B80) # $t8, 0x800f -/* 069C5C 8006905C 3C0F0400 */ lui $t7, (0x0400103F >> 16) # lui $t7, 0x400 -/* 069C60 80069060 244E0008 */ addiu $t6, $v0, 8 -/* 069C64 80069064 AC6E0000 */ sw $t6, ($v1) -/* 069C68 80069068 35EF103F */ ori $t7, (0x0400103F & 0xFFFF) # ori $t7, $t7, 0x103f -/* 069C6C 8006906C 27188B80 */ addiu $t8, %lo(D_800E8B80) # addiu $t8, $t8, -0x7480 -/* 069C70 80069070 AC580004 */ sw $t8, 4($v0) -/* 069C74 80069074 AC4F0000 */ sw $t7, ($v0) -/* 069C78 80069078 8C620000 */ lw $v0, ($v1) -/* 069C7C 8006907C 3C0E0D01 */ lui $t6, %hi(D_0D008C78) # $t6, 0xd01 -/* 069C80 80069080 25CE8C78 */ addiu $t6, %lo(D_0D008C78) # addiu $t6, $t6, -0x7388 -/* 069C84 80069084 24590008 */ addiu $t9, $v0, 8 -/* 069C88 80069088 AC790000 */ sw $t9, ($v1) -/* 069C8C 8006908C AC4E0004 */ sw $t6, 4($v0) -/* 069C90 80069090 AC5F0000 */ sw $ra, ($v0) -/* 069C94 80069094 8C620000 */ lw $v0, ($v1) -/* 069C98 80069098 3C18FD50 */ lui $t8, 0xfd50 -/* 069C9C 8006909C 3C198019 */ lui $t9, %hi(D_8018D4A8) # $t9, 0x8019 -/* 069CA0 800690A0 244F0008 */ addiu $t7, $v0, 8 -/* 069CA4 800690A4 AC6F0000 */ sw $t7, ($v1) -/* 069CA8 800690A8 AC580000 */ sw $t8, ($v0) -/* 069CAC 800690AC 8F39D4A8 */ lw $t9, %lo(D_8018D4A8)($t9) -/* 069CB0 800690B0 3C0FF550 */ lui $t7, 0xf550 -/* 069CB4 800690B4 AC590004 */ sw $t9, 4($v0) -/* 069CB8 800690B8 8C620000 */ lw $v0, ($v1) -/* 069CBC 800690BC 3C19E600 */ lui $t9, 0xe600 -/* 069CC0 800690C0 244E0008 */ addiu $t6, $v0, 8 -/* 069CC4 800690C4 AC6E0000 */ sw $t6, ($v1) -/* 069CC8 800690C8 AC500004 */ sw $s0, 4($v0) -/* 069CCC 800690CC AC4F0000 */ sw $t7, ($v0) -/* 069CD0 800690D0 8C620000 */ lw $v0, ($v1) -/* 069CD4 800690D4 3C0FF300 */ lui $t7, 0xf300 -/* 069CD8 800690D8 24580008 */ addiu $t8, $v0, 8 -/* 069CDC 800690DC AC780000 */ sw $t8, ($v1) -/* 069CE0 800690E0 AC400004 */ sw $zero, 4($v0) -/* 069CE4 800690E4 AC590000 */ sw $t9, ($v0) -/* 069CE8 800690E8 8C620000 */ lw $v0, ($v1) -/* 069CEC 800690EC 3C18073F */ lui $t8, (0x073FF100 >> 16) # lui $t8, 0x73f -/* 069CF0 800690F0 3718F100 */ ori $t8, (0x073FF100 & 0xFFFF) # ori $t8, $t8, 0xf100 -/* 069CF4 800690F4 244E0008 */ addiu $t6, $v0, 8 -/* 069CF8 800690F8 AC6E0000 */ sw $t6, ($v1) -/* 069CFC 800690FC AC580004 */ sw $t8, 4($v0) -/* 069D00 80069100 AC4F0000 */ sw $t7, ($v0) -/* 069D04 80069104 8C620000 */ lw $v0, ($v1) -/* 069D08 80069108 3C0EE700 */ lui $t6, 0xe700 -/* 069D0C 8006910C 3C18F548 */ lui $t8, (0xF5481000 >> 16) # lui $t8, 0xf548 -/* 069D10 80069110 24590008 */ addiu $t9, $v0, 8 -/* 069D14 80069114 AC790000 */ sw $t9, ($v1) -/* 069D18 80069118 AC400004 */ sw $zero, 4($v0) -/* 069D1C 8006911C AC4E0000 */ sw $t6, ($v0) -/* 069D20 80069120 8C620000 */ lw $v0, ($v1) -/* 069D24 80069124 37181000 */ ori $t8, (0xF5481000 & 0xFFFF) # ori $t8, $t8, 0x1000 -/* 069D28 80069128 3C0EF200 */ lui $t6, 0xf200 -/* 069D2C 8006912C 244F0008 */ addiu $t7, $v0, 8 -/* 069D30 80069130 AC6F0000 */ sw $t7, ($v1) -/* 069D34 80069134 AC400004 */ sw $zero, 4($v0) -/* 069D38 80069138 AC580000 */ sw $t8, ($v0) -/* 069D3C 8006913C 8C620000 */ lw $v0, ($v1) -/* 069D40 80069140 3C0F000F */ lui $t7, (0x000FC07C >> 16) # lui $t7, 0xf -/* 069D44 80069144 35EFC07C */ ori $t7, (0x000FC07C & 0xFFFF) # ori $t7, $t7, 0xc07c -/* 069D48 80069148 24590008 */ addiu $t9, $v0, 8 -/* 069D4C 8006914C AC790000 */ sw $t9, ($v1) -/* 069D50 80069150 AC4F0004 */ sw $t7, 4($v0) -/* 069D54 80069154 AC4E0000 */ sw $t6, ($v0) -/* 069D58 80069158 8C620000 */ lw $v0, ($v1) -/* 069D5C 8006915C 3C0E800F */ lui $t6, %hi(D_800E8BC0) # $t6, 0x800f -/* 069D60 80069160 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 069D64 80069164 24580008 */ addiu $t8, $v0, 8 -/* 069D68 80069168 AC780000 */ sw $t8, ($v1) -/* 069D6C 8006916C 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 069D70 80069170 25CE8BC0 */ addiu $t6, %lo(D_800E8BC0) # addiu $t6, $t6, -0x7440 -/* 069D74 80069174 AC4E0004 */ sw $t6, 4($v0) -/* 069D78 80069178 AC590000 */ sw $t9, ($v0) -/* 069D7C 8006917C 8C620000 */ lw $v0, ($v1) -/* 069D80 80069180 3C180D01 */ lui $t8, %hi(D_0D008DA0) # $t8, 0xd01 -/* 069D84 80069184 27188DA0 */ addiu $t8, %lo(D_0D008DA0) # addiu $t8, $t8, -0x7260 -/* 069D88 80069188 244F0008 */ addiu $t7, $v0, 8 -/* 069D8C 8006918C AC6F0000 */ sw $t7, ($v1) -/* 069D90 80069190 AC580004 */ sw $t8, 4($v0) -/* 069D94 80069194 AC5F0000 */ sw $ra, ($v0) -/* 069D98 80069198 85590000 */ lh $t9, ($t2) -/* 069D9C 8006919C 272E0001 */ addiu $t6, $t9, 1 -/* 069DA0 800691A0 A54E0000 */ sh $t6, ($t2) -.L800691A4: -/* 069DA4 800691A4 8FBF001C */ lw $ra, 0x1c($sp) -/* 069DA8 800691A8 8FB00018 */ lw $s0, 0x18($sp) -/* 069DAC 800691AC 27BD00A8 */ addiu $sp, $sp, 0xa8 -/* 069DB0 800691B0 03E00008 */ jr $ra -/* 069DB4 800691B4 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800691B8.s b/asm/non_matchings/code_80057C60/func_800691B8.s deleted file mode 100644 index 6d333c6e9..000000000 --- a/asm/non_matchings/code_80057C60/func_800691B8.s +++ /dev/null @@ -1,165 +0,0 @@ -glabel func_800691B8 -/* 069DB8 800691B8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 069DBC 800691BC AFA60070 */ sw $a2, 0x70($sp) -/* 069DC0 800691C0 00067400 */ sll $t6, $a2, 0x10 -/* 069DC4 800691C4 000E3403 */ sra $a2, $t6, 0x10 -/* 069DC8 800691C8 000678C0 */ sll $t7, $a2, 3 -/* 069DCC 800691CC 01E67821 */ addu $t7, $t7, $a2 -/* 069DD0 800691D0 AFA70074 */ sw $a3, 0x74($sp) -/* 069DD4 800691D4 0007C600 */ sll $t8, $a3, 0x18 -/* 069DD8 800691D8 000F78C0 */ sll $t7, $t7, 3 -/* 069DDC 800691DC 00183E03 */ sra $a3, $t8, 0x18 -/* 069DE0 800691E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 069DE4 800691E4 AFA40068 */ sw $a0, 0x68($sp) -/* 069DE8 800691E8 AFA5006C */ sw $a1, 0x6c($sp) -/* 069DEC 800691EC 008F1021 */ addu $v0, $a0, $t7 -/* 069DF0 800691F0 84580AE4 */ lh $t8, 0xae4($v0) -/* 069DF4 800691F4 24010001 */ li $at, 1 -/* 069DF8 800691F8 5701008F */ bnel $t8, $at, .L80069438 -/* 069DFC 800691FC 8FBF0014 */ lw $ra, 0x14($sp) -/* 069E00 80069200 84590B06 */ lh $t9, 0xb06($v0) -/* 069E04 80069204 00077840 */ sll $t7, $a3, 1 -/* 069E08 80069208 008FC021 */ addu $t8, $a0, $t7 -/* 069E0C 8006920C A7B90052 */ sh $t9, 0x52($sp) -/* 069E10 80069210 C4440AC8 */ lwc1 $f4, 0xac8($v0) -/* 069E14 80069214 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 069E18 80069218 44819800 */ mtc1 $at, $f19 -/* 069E1C 8006921C E7A4005C */ swc1 $f4, 0x5c($sp) -/* 069E20 80069220 C4460ACC */ lwc1 $f6, 0xacc($v0) -/* 069E24 80069224 44809000 */ mtc1 $zero, $f18 -/* 069E28 80069228 27A4005C */ addiu $a0, $sp, 0x5c -/* 069E2C 8006922C E7A60060 */ swc1 $f6, 0x60($sp) -/* 069E30 80069230 C4480AD0 */ lwc1 $f8, 0xad0($v0) -/* 069E34 80069234 A7A00054 */ sh $zero, 0x54($sp) -/* 069E38 80069238 27A50054 */ addiu $a1, $sp, 0x54 -/* 069E3C 8006923C E7A80064 */ swc1 $f8, 0x64($sp) -/* 069E40 80069240 87190048 */ lh $t9, 0x48($t8) -/* 069E44 80069244 A7B90056 */ sh $t9, 0x56($sp) -/* 069E48 80069248 844E0B02 */ lh $t6, 0xb02($v0) -/* 069E4C 8006924C 25CF1C71 */ addiu $t7, $t6, 0x1c71 -/* 069E50 80069250 A44F0B02 */ sh $t7, 0xb02($v0) -/* 069E54 80069254 84580B02 */ lh $t8, 0xb02($v0) -/* 069E58 80069258 8FB90068 */ lw $t9, 0x68($sp) -/* 069E5C 8006925C A7B80058 */ sh $t8, 0x58($sp) -/* 069E60 80069260 C72A0224 */ lwc1 $f10, 0x224($t9) -/* 069E64 80069264 46005421 */ cvt.d.s $f16, $f10 -/* 069E68 80069268 46328102 */ mul.d $f4, $f16, $f18 -/* 069E6C 8006926C 462021A0 */ cvt.s.d $f6, $f4 -/* 069E70 80069270 44063000 */ mfc1 $a2, $f6 -/* 069E74 80069274 0C0194B5 */ jal func_800652D4 -/* 069E78 80069278 00000000 */ nop -/* 069E7C 8006927C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 069E80 80069280 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 069E84 80069284 8C620000 */ lw $v0, ($v1) -/* 069E88 80069288 3C180D01 */ lui $t8, %hi(D_0D008D58) # $t8, 0xd01 -/* 069E8C 8006928C 27188D58 */ addiu $t8, %lo(D_0D008D58) # addiu $t8, $t8, -0x72a8 -/* 069E90 80069290 244E0008 */ addiu $t6, $v0, 8 -/* 069E94 80069294 AC6E0000 */ sw $t6, ($v1) -/* 069E98 80069298 3C0F0600 */ lui $t7, 0x600 -/* 069E9C 8006929C AC4F0000 */ sw $t7, ($v0) -/* 069EA0 800692A0 AC580004 */ sw $t8, 4($v0) -/* 069EA4 800692A4 8C620000 */ lw $v0, ($v1) -/* 069EA8 800692A8 3C0EBA00 */ lui $t6, (0xBA000E02 >> 16) # lui $t6, 0xba00 -/* 069EAC 800692AC 35CE0E02 */ ori $t6, (0xBA000E02 & 0xFFFF) # ori $t6, $t6, 0xe02 -/* 069EB0 800692B0 24590008 */ addiu $t9, $v0, 8 -/* 069EB4 800692B4 AC790000 */ sw $t9, ($v1) -/* 069EB8 800692B8 AC400004 */ sw $zero, 4($v0) -/* 069EBC 800692BC AC4E0000 */ sw $t6, ($v0) -/* 069EC0 800692C0 8C620000 */ lw $v0, ($v1) -/* 069EC4 800692C4 3C18FD70 */ lui $t8, 0xfd70 -/* 069EC8 800692C8 3C198019 */ lui $t9, %hi(D_8018D488) # $t9, 0x8019 -/* 069ECC 800692CC 244F0008 */ addiu $t7, $v0, 8 -/* 069ED0 800692D0 AC6F0000 */ sw $t7, ($v1) -/* 069ED4 800692D4 AC580000 */ sw $t8, ($v0) -/* 069ED8 800692D8 8F39D488 */ lw $t9, %lo(D_8018D488)($t9) -/* 069EDC 800692DC 3C180708 */ lui $t8, (0x07080200 >> 16) # lui $t8, 0x708 -/* 069EE0 800692E0 37180200 */ ori $t8, (0x07080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 069EE4 800692E4 AC590004 */ sw $t9, 4($v0) -/* 069EE8 800692E8 8C620000 */ lw $v0, ($v1) -/* 069EEC 800692EC 3C0FF570 */ lui $t7, 0xf570 -/* 069EF0 800692F0 240400FF */ li $a0, 255 -/* 069EF4 800692F4 244E0008 */ addiu $t6, $v0, 8 -/* 069EF8 800692F8 AC6E0000 */ sw $t6, ($v1) -/* 069EFC 800692FC AC580004 */ sw $t8, 4($v0) -/* 069F00 80069300 AC4F0000 */ sw $t7, ($v0) -/* 069F04 80069304 8C620000 */ lw $v0, ($v1) -/* 069F08 80069308 3C0EE600 */ lui $t6, 0xe600 -/* 069F0C 8006930C 3C18F300 */ lui $t8, 0xf300 -/* 069F10 80069310 24590008 */ addiu $t9, $v0, 8 -/* 069F14 80069314 AC790000 */ sw $t9, ($v1) -/* 069F18 80069318 AC400004 */ sw $zero, 4($v0) -/* 069F1C 8006931C AC4E0000 */ sw $t6, ($v0) -/* 069F20 80069320 8C620000 */ lw $v0, ($v1) -/* 069F24 80069324 3C19071F */ lui $t9, (0x071FF200 >> 16) # lui $t9, 0x71f -/* 069F28 80069328 3739F200 */ ori $t9, (0x071FF200 & 0xFFFF) # ori $t9, $t9, 0xf200 -/* 069F2C 8006932C 244F0008 */ addiu $t7, $v0, 8 -/* 069F30 80069330 AC6F0000 */ sw $t7, ($v1) -/* 069F34 80069334 AC590004 */ sw $t9, 4($v0) -/* 069F38 80069338 AC580000 */ sw $t8, ($v0) -/* 069F3C 8006933C 8C620000 */ lw $v0, ($v1) -/* 069F40 80069340 3C0FE700 */ lui $t7, 0xe700 -/* 069F44 80069344 3C19F568 */ lui $t9, (0xF5680800 >> 16) # lui $t9, 0xf568 -/* 069F48 80069348 244E0008 */ addiu $t6, $v0, 8 -/* 069F4C 8006934C AC6E0000 */ sw $t6, ($v1) -/* 069F50 80069350 AC400004 */ sw $zero, 4($v0) -/* 069F54 80069354 AC4F0000 */ sw $t7, ($v0) -/* 069F58 80069358 8C620000 */ lw $v0, ($v1) -/* 069F5C 8006935C 3C0F0008 */ lui $t7, (0x00080200 >> 16) # lui $t7, 8 -/* 069F60 80069360 35EF0200 */ ori $t7, (0x00080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 069F64 80069364 24580008 */ addiu $t8, $v0, 8 -/* 069F68 80069368 AC780000 */ sw $t8, ($v1) -/* 069F6C 8006936C AFA20030 */ sw $v0, 0x30($sp) -/* 069F70 80069370 37390800 */ ori $t9, (0xF5680800 & 0xFFFF) # ori $t9, $t9, 0x800 -/* 069F74 80069374 AC590000 */ sw $t9, ($v0) -/* 069F78 80069378 AC4F0004 */ sw $t7, 4($v0) -/* 069F7C 8006937C 8C620000 */ lw $v0, ($v1) -/* 069F80 80069380 3C0E0007 */ lui $t6, (0x0007C07C >> 16) # lui $t6, 7 -/* 069F84 80069384 35CEC07C */ ori $t6, (0x0007C07C & 0xFFFF) # ori $t6, $t6, 0xc07c -/* 069F88 80069388 24580008 */ addiu $t8, $v0, 8 -/* 069F8C 8006938C AC780000 */ sw $t8, ($v1) -/* 069F90 80069390 AFA2002C */ sw $v0, 0x2c($sp) -/* 069F94 80069394 3C19F200 */ lui $t9, 0xf200 -/* 069F98 80069398 AC590000 */ sw $t9, ($v0) -/* 069F9C 8006939C AC4E0004 */ sw $t6, 4($v0) -/* 069FA0 800693A0 87A70052 */ lh $a3, 0x52($sp) -/* 069FA4 800693A4 240500FF */ li $a1, 255 -/* 069FA8 800693A8 0C012CD7 */ jal func_8004B35C -/* 069FAC 800693AC 00003025 */ move $a2, $zero -/* 069FB0 800693B0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 069FB4 800693B4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 069FB8 800693B8 8C620000 */ lw $v0, ($v1) -/* 069FBC 800693BC 3C19B900 */ lui $t9, (0xB900031D >> 16) # lui $t9, 0xb900 -/* 069FC0 800693C0 3C0E0050 */ lui $t6, (0x00504B50 >> 16) # lui $t6, 0x50 -/* 069FC4 800693C4 24580008 */ addiu $t8, $v0, 8 -/* 069FC8 800693C8 AC780000 */ sw $t8, ($v1) -/* 069FCC 800693CC 35CE4B50 */ ori $t6, (0x00504B50 & 0xFFFF) # ori $t6, $t6, 0x4b50 -/* 069FD0 800693D0 3739031D */ ori $t9, (0xB900031D & 0xFFFF) # ori $t9, $t9, 0x31d -/* 069FD4 800693D4 AC590000 */ sw $t9, ($v0) -/* 069FD8 800693D8 AC4E0004 */ sw $t6, 4($v0) -/* 069FDC 800693DC 8C620000 */ lw $v0, ($v1) -/* 069FE0 800693E0 3C19800F */ lui $t9, %hi(D_800E87C0) # $t9, 0x800f -/* 069FE4 800693E4 3C180400 */ lui $t8, (0x0400103F >> 16) # lui $t8, 0x400 -/* 069FE8 800693E8 244F0008 */ addiu $t7, $v0, 8 -/* 069FEC 800693EC AC6F0000 */ sw $t7, ($v1) -/* 069FF0 800693F0 3718103F */ ori $t8, (0x0400103F & 0xFFFF) # ori $t8, $t8, 0x103f -/* 069FF4 800693F4 273987C0 */ addiu $t9, %lo(D_800E87C0) # addiu $t9, $t9, -0x7840 -/* 069FF8 800693F8 AC590004 */ sw $t9, 4($v0) -/* 069FFC 800693FC AC580000 */ sw $t8, ($v0) -/* 06A000 80069400 8C620000 */ lw $v0, ($v1) -/* 06A004 80069404 3C180D01 */ lui $t8, %hi(D_0D008DA0) # $t8, 0xd01 -/* 06A008 80069408 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 06A00C 8006940C 244E0008 */ addiu $t6, $v0, 8 -/* 06A010 80069410 AC6E0000 */ sw $t6, ($v1) -/* 06A014 80069414 27188DA0 */ addiu $t8, %lo(D_0D008DA0) # addiu $t8, $t8, -0x7260 -/* 06A018 80069418 3C0F0600 */ lui $t7, 0x600 -/* 06A01C 8006941C 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 06A020 80069420 AC4F0000 */ sw $t7, ($v0) -/* 06A024 80069424 AC580004 */ sw $t8, 4($v0) -/* 06A028 80069428 84F90000 */ lh $t9, ($a3) -/* 06A02C 8006942C 272E0001 */ addiu $t6, $t9, 1 -/* 06A030 80069430 A4EE0000 */ sh $t6, ($a3) -/* 06A034 80069434 8FBF0014 */ lw $ra, 0x14($sp) -.L80069438: -/* 06A038 80069438 27BD0068 */ addiu $sp, $sp, 0x68 -/* 06A03C 8006943C 03E00008 */ jr $ra -/* 06A040 80069440 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80069444.s b/asm/non_matchings/code_80057C60/func_80069444.s deleted file mode 100644 index eed19554f..000000000 --- a/asm/non_matchings/code_80057C60/func_80069444.s +++ /dev/null @@ -1,164 +0,0 @@ -glabel func_80069444 -/* 06A044 80069444 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 06A048 80069448 AFA60088 */ sw $a2, 0x88($sp) -/* 06A04C 8006944C 00067400 */ sll $t6, $a2, 0x10 -/* 06A050 80069450 000E3403 */ sra $a2, $t6, 0x10 -/* 06A054 80069454 000678C0 */ sll $t7, $a2, 3 -/* 06A058 80069458 01E67821 */ addu $t7, $t7, $a2 -/* 06A05C 8006945C AFA50084 */ sw $a1, 0x84($sp) -/* 06A060 80069460 AFA7008C */ sw $a3, 0x8c($sp) -/* 06A064 80069464 0007C600 */ sll $t8, $a3, 0x18 -/* 06A068 80069468 000F78C0 */ sll $t7, $t7, 3 -/* 06A06C 8006946C 00183E03 */ sra $a3, $t8, 0x18 -/* 06A070 80069470 AFBF0024 */ sw $ra, 0x24($sp) -/* 06A074 80069474 AFA40080 */ sw $a0, 0x80($sp) -/* 06A078 80069478 008F2821 */ addu $a1, $a0, $t7 -/* 06A07C 8006947C 84B80AE4 */ lh $t8, 0xae4($a1) -/* 06A080 80069480 24010001 */ li $at, 1 -/* 06A084 80069484 00807025 */ move $t6, $a0 -/* 06A088 80069488 5701008D */ bnel $t8, $at, .L800696C0 -/* 06A08C 8006948C 8FBF0024 */ lw $ra, 0x24($sp) -/* 06A090 80069490 84A40B00 */ lh $a0, 0xb00($a1) -/* 06A094 80069494 3C02800E */ lui $v0, %hi(D_800E47DC) -/* 06A098 80069498 3C03800E */ lui $v1, %hi(D_800E480C) -/* 06A09C 8006949C 0004C880 */ sll $t9, $a0, 2 -/* 06A0A0 800694A0 00591021 */ addu $v0, $v0, $t9 -/* 06A0A4 800694A4 8C4247DC */ lw $v0, %lo(D_800E47DC)($v0) -/* 06A0A8 800694A8 03202025 */ move $a0, $t9 -/* 06A0AC 800694AC 00641821 */ addu $v1, $v1, $a0 -/* 06A0B0 800694B0 00027C03 */ sra $t7, $v0, 0x10 -/* 06A0B4 800694B4 8C63480C */ lw $v1, %lo(D_800E480C)($v1) -/* 06A0B8 800694B8 31F800FF */ andi $t8, $t7, 0xff -/* 06A0BC 800694BC 0002CA03 */ sra $t9, $v0, 8 -/* 06A0C0 800694C0 332F00FF */ andi $t7, $t9, 0xff -/* 06A0C4 800694C4 A7B8006A */ sh $t8, 0x6a($sp) -/* 06A0C8 800694C8 A7AF0068 */ sh $t7, 0x68($sp) -/* 06A0CC 800694CC 0003CC03 */ sra $t9, $v1, 0x10 -/* 06A0D0 800694D0 332F00FF */ andi $t7, $t9, 0xff -/* 06A0D4 800694D4 305800FF */ andi $t8, $v0, 0xff -/* 06A0D8 800694D8 A7B80066 */ sh $t8, 0x66($sp) -/* 06A0DC 800694DC A7AF0062 */ sh $t7, 0x62($sp) -/* 06A0E0 800694E0 0003C203 */ sra $t8, $v1, 8 -/* 06A0E4 800694E4 331900FF */ andi $t9, $t8, 0xff -/* 06A0E8 800694E8 306F00FF */ andi $t7, $v1, 0xff -/* 06A0EC 800694EC A7B90060 */ sh $t9, 0x60($sp) -/* 06A0F0 800694F0 A7AF005E */ sh $t7, 0x5e($sp) -/* 06A0F4 800694F4 84B80B06 */ lh $t8, 0xb06($a1) -/* 06A0F8 800694F8 0007C840 */ sll $t9, $a3, 1 -/* 06A0FC 800694FC 01D97821 */ addu $t7, $t6, $t9 -/* 06A100 80069500 A7B80064 */ sh $t8, 0x64($sp) -/* 06A104 80069504 C4A40AC8 */ lwc1 $f4, 0xac8($a1) -/* 06A108 80069508 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 -/* 06A10C 8006950C 44819800 */ mtc1 $at, $f19 -/* 06A110 80069510 E7A40074 */ swc1 $f4, 0x74($sp) -/* 06A114 80069514 C4A60ACC */ lwc1 $f6, 0xacc($a1) -/* 06A118 80069518 44809000 */ mtc1 $zero, $f18 -/* 06A11C 8006951C 27A40074 */ addiu $a0, $sp, 0x74 -/* 06A120 80069520 E7A60078 */ swc1 $f6, 0x78($sp) -/* 06A124 80069524 C4A80AD0 */ lwc1 $f8, 0xad0($a1) -/* 06A128 80069528 A7A0006C */ sh $zero, 0x6c($sp) -/* 06A12C 8006952C 27A5006C */ addiu $a1, $sp, 0x6c -/* 06A130 80069530 E7A8007C */ swc1 $f8, 0x7c($sp) -/* 06A134 80069534 85F80048 */ lh $t8, 0x48($t7) -/* 06A138 80069538 A7A00070 */ sh $zero, 0x70($sp) -/* 06A13C 8006953C A7B8006E */ sh $t8, 0x6e($sp) -/* 06A140 80069540 C5CA0224 */ lwc1 $f10, 0x224($t6) -/* 06A144 80069544 46005421 */ cvt.d.s $f16, $f10 -/* 06A148 80069548 46328102 */ mul.d $f4, $f16, $f18 -/* 06A14C 8006954C 462021A0 */ cvt.s.d $f6, $f4 -/* 06A150 80069550 44063000 */ mfc1 $a2, $f6 -/* 06A154 80069554 0C0194B5 */ jal func_800652D4 -/* 06A158 80069558 00000000 */ nop -/* 06A15C 8006955C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06A160 80069560 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06A164 80069564 8C620000 */ lw $v0, ($v1) -/* 06A168 80069568 3C180D01 */ lui $t8, %hi(D_0D008DB8) # $t8, 0xd01 -/* 06A16C 8006956C 27188DB8 */ addiu $t8, %lo(D_0D008DB8) # addiu $t8, $t8, -0x7248 -/* 06A170 80069570 24590008 */ addiu $t9, $v0, 8 -/* 06A174 80069574 AC790000 */ sw $t9, ($v1) -/* 06A178 80069578 3C0F0600 */ lui $t7, 0x600 -/* 06A17C 8006957C AC4F0000 */ sw $t7, ($v0) -/* 06A180 80069580 AC580004 */ sw $t8, 4($v0) -/* 06A184 80069584 8C620000 */ lw $v0, ($v1) -/* 06A188 80069588 3C19FD90 */ lui $t9, 0xfd90 -/* 06A18C 8006958C 3C0F8019 */ lui $t7, %hi(D_8018D494) # $t7, 0x8019 -/* 06A190 80069590 244E0008 */ addiu $t6, $v0, 8 -/* 06A194 80069594 AC6E0000 */ sw $t6, ($v1) -/* 06A198 80069598 AC590000 */ sw $t9, ($v0) -/* 06A19C 8006959C 8DEFD494 */ lw $t7, %lo(D_8018D494)($t7) -/* 06A1A0 800695A0 3C190700 */ lui $t9, 0x700 -/* 06A1A4 800695A4 3C0EF590 */ lui $t6, 0xf590 -/* 06A1A8 800695A8 AC4F0004 */ sw $t7, 4($v0) -/* 06A1AC 800695AC 8C620000 */ lw $v0, ($v1) -/* 06A1B0 800695B0 24580008 */ addiu $t8, $v0, 8 -/* 06A1B4 800695B4 AC780000 */ sw $t8, ($v1) -/* 06A1B8 800695B8 AC4E0000 */ sw $t6, ($v0) -/* 06A1BC 800695BC AC590004 */ sw $t9, 4($v0) -/* 06A1C0 800695C0 8C620000 */ lw $v0, ($v1) -/* 06A1C4 800695C4 3C18E600 */ lui $t8, 0xe600 -/* 06A1C8 800695C8 3C19F300 */ lui $t9, 0xf300 -/* 06A1CC 800695CC 244F0008 */ addiu $t7, $v0, 8 -/* 06A1D0 800695D0 AC6F0000 */ sw $t7, ($v1) -/* 06A1D4 800695D4 AC580000 */ sw $t8, ($v0) -/* 06A1D8 800695D8 AC400004 */ sw $zero, 4($v0) -/* 06A1DC 800695DC 8C620000 */ lw $v0, ($v1) -/* 06A1E0 800695E0 3C0F071F */ lui $t7, (0x071FF200 >> 16) # lui $t7, 0x71f -/* 06A1E4 800695E4 35EFF200 */ ori $t7, (0x071FF200 & 0xFFFF) # ori $t7, $t7, 0xf200 -/* 06A1E8 800695E8 244E0008 */ addiu $t6, $v0, 8 -/* 06A1EC 800695EC AC6E0000 */ sw $t6, ($v1) -/* 06A1F0 800695F0 AC590000 */ sw $t9, ($v0) -/* 06A1F4 800695F4 AC4F0004 */ sw $t7, 4($v0) -/* 06A1F8 800695F8 8C620000 */ lw $v0, ($v1) -/* 06A1FC 800695FC 3C0EE700 */ lui $t6, 0xe700 -/* 06A200 80069600 3C0FF588 */ lui $t7, (0xF5880800 >> 16) # lui $t7, 0xf588 -/* 06A204 80069604 24580008 */ addiu $t8, $v0, 8 -/* 06A208 80069608 AC780000 */ sw $t8, ($v1) -/* 06A20C 8006960C AC4E0000 */ sw $t6, ($v0) -/* 06A210 80069610 AC400004 */ sw $zero, 4($v0) -/* 06A214 80069614 8C620000 */ lw $v0, ($v1) -/* 06A218 80069618 35EF0800 */ ori $t7, (0xF5880800 & 0xFFFF) # ori $t7, $t7, 0x800 -/* 06A21C 8006961C 3C0EF200 */ lui $t6, 0xf200 -/* 06A220 80069620 24590008 */ addiu $t9, $v0, 8 -/* 06A224 80069624 AC790000 */ sw $t9, ($v1) -/* 06A228 80069628 AC4F0000 */ sw $t7, ($v0) -/* 06A22C 8006962C AC400004 */ sw $zero, 4($v0) -/* 06A230 80069630 8C620000 */ lw $v0, ($v1) -/* 06A234 80069634 3C0F0007 */ lui $t7, (0x0007C07C >> 16) # lui $t7, 7 -/* 06A238 80069638 35EFC07C */ ori $t7, (0x0007C07C & 0xFFFF) # ori $t7, $t7, 0xc07c -/* 06A23C 8006963C 24580008 */ addiu $t8, $v0, 8 -/* 06A240 80069640 AC780000 */ sw $t8, ($v1) -/* 06A244 80069644 AFA2003C */ sw $v0, 0x3c($sp) -/* 06A248 80069648 AC4E0000 */ sw $t6, ($v0) -/* 06A24C 8006964C 8FB8003C */ lw $t8, 0x3c($sp) -/* 06A250 80069650 AF0F0004 */ sw $t7, 4($t8) -/* 06A254 80069654 87AF0064 */ lh $t7, 0x64($sp) -/* 06A258 80069658 87B9005E */ lh $t9, 0x5e($sp) -/* 06A25C 8006965C 87AE0060 */ lh $t6, 0x60($sp) -/* 06A260 80069660 87A70062 */ lh $a3, 0x62($sp) -/* 06A264 80069664 87A60066 */ lh $a2, 0x66($sp) -/* 06A268 80069668 87A50068 */ lh $a1, 0x68($sp) -/* 06A26C 8006966C 87A4006A */ lh $a0, 0x6a($sp) -/* 06A270 80069670 AFAF0018 */ sw $t7, 0x18($sp) -/* 06A274 80069674 AFB90014 */ sw $t9, 0x14($sp) -/* 06A278 80069678 0C012DCB */ jal func_8004B72C -/* 06A27C 8006967C AFAE0010 */ sw $t6, 0x10($sp) -/* 06A280 80069680 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06A284 80069684 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06A288 80069688 8C620000 */ lw $v0, ($v1) -/* 06A28C 8006968C 3C190D01 */ lui $t9, %hi(D_0D008E48) # $t9, 0xd01 -/* 06A290 80069690 3C058016 */ lui $a1, %hi(gMatrixEffectCount) # $a1, 0x8016 -/* 06A294 80069694 24580008 */ addiu $t8, $v0, 8 -/* 06A298 80069698 AC780000 */ sw $t8, ($v1) -/* 06A29C 8006969C 27398E48 */ addiu $t9, %lo(D_0D008E48) # addiu $t9, $t9, -0x71b8 -/* 06A2A0 800696A0 3C0E0600 */ lui $t6, 0x600 -/* 06A2A4 800696A4 24A54AF0 */ addiu $a1, %lo(gMatrixEffectCount) # addiu $a1, $a1, 0x4af0 -/* 06A2A8 800696A8 AC4E0000 */ sw $t6, ($v0) -/* 06A2AC 800696AC AC590004 */ sw $t9, 4($v0) -/* 06A2B0 800696B0 84AF0000 */ lh $t7, ($a1) -/* 06A2B4 800696B4 25F80001 */ addiu $t8, $t7, 1 -/* 06A2B8 800696B8 A4B80000 */ sh $t8, ($a1) -/* 06A2BC 800696BC 8FBF0024 */ lw $ra, 0x24($sp) -.L800696C0: -/* 06A2C0 800696C0 27BD0080 */ addiu $sp, $sp, 0x80 -/* 06A2C4 800696C4 03E00008 */ jr $ra -/* 06A2C8 800696C8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800696CC.s b/asm/non_matchings/code_80057C60/func_800696CC.s deleted file mode 100644 index b143dc6d8..000000000 --- a/asm/non_matchings/code_80057C60/func_800696CC.s +++ /dev/null @@ -1,157 +0,0 @@ -glabel func_800696CC -/* 06A2CC 800696CC 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 06A2D0 800696D0 AFA60070 */ sw $a2, 0x70($sp) -/* 06A2D4 800696D4 00067400 */ sll $t6, $a2, 0x10 -/* 06A2D8 800696D8 000E3403 */ sra $a2, $t6, 0x10 -/* 06A2DC 800696DC 000678C0 */ sll $t7, $a2, 3 -/* 06A2E0 800696E0 01E67821 */ addu $t7, $t7, $a2 -/* 06A2E4 800696E4 AFA70074 */ sw $a3, 0x74($sp) -/* 06A2E8 800696E8 0007C600 */ sll $t8, $a3, 0x18 -/* 06A2EC 800696EC 000F78C0 */ sll $t7, $t7, 3 -/* 06A2F0 800696F0 00183E03 */ sra $a3, $t8, 0x18 -/* 06A2F4 800696F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 06A2F8 800696F8 AFA40068 */ sw $a0, 0x68($sp) -/* 06A2FC 800696FC AFA5006C */ sw $a1, 0x6c($sp) -/* 06A300 80069700 008F1021 */ addu $v0, $a0, $t7 -/* 06A304 80069704 84580AE4 */ lh $t8, 0xae4($v0) -/* 06A308 80069708 24010001 */ li $at, 1 -/* 06A30C 8006970C 00807025 */ move $t6, $a0 -/* 06A310 80069710 57010086 */ bnel $t8, $at, .L8006992C -/* 06A314 80069714 8FBF0014 */ lw $ra, 0x14($sp) -/* 06A318 80069718 84590B06 */ lh $t9, 0xb06($v0) -/* 06A31C 8006971C 00077840 */ sll $t7, $a3, 1 -/* 06A320 80069720 008FC021 */ addu $t8, $a0, $t7 -/* 06A324 80069724 A7B90052 */ sh $t9, 0x52($sp) -/* 06A328 80069728 C4440AC8 */ lwc1 $f4, 0xac8($v0) -/* 06A32C 8006972C C7B00078 */ lwc1 $f16, 0x78($sp) -/* 06A330 80069730 27A4005C */ addiu $a0, $sp, 0x5c -/* 06A334 80069734 E7A4005C */ swc1 $f4, 0x5c($sp) -/* 06A338 80069738 C4460ACC */ lwc1 $f6, 0xacc($v0) -/* 06A33C 8006973C 27A50054 */ addiu $a1, $sp, 0x54 -/* 06A340 80069740 E7A60060 */ swc1 $f6, 0x60($sp) -/* 06A344 80069744 C4480AD0 */ lwc1 $f8, 0xad0($v0) -/* 06A348 80069748 A7A00054 */ sh $zero, 0x54($sp) -/* 06A34C 8006974C E7A80064 */ swc1 $f8, 0x64($sp) -/* 06A350 80069750 87190048 */ lh $t9, 0x48($t8) -/* 06A354 80069754 A7A00058 */ sh $zero, 0x58($sp) -/* 06A358 80069758 A7B90056 */ sh $t9, 0x56($sp) -/* 06A35C 8006975C C5CA0224 */ lwc1 $f10, 0x224($t6) -/* 06A360 80069760 46105482 */ mul.s $f18, $f10, $f16 -/* 06A364 80069764 44069000 */ mfc1 $a2, $f18 -/* 06A368 80069768 0C0194B5 */ jal func_800652D4 -/* 06A36C 8006976C 00000000 */ nop -/* 06A370 80069770 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06A374 80069774 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06A378 80069778 8C620000 */ lw $v0, ($v1) -/* 06A37C 8006977C 3C190D01 */ lui $t9, %hi(D_0D008D58) # $t9, 0xd01 -/* 06A380 80069780 27398D58 */ addiu $t9, %lo(D_0D008D58) # addiu $t9, $t9, -0x72a8 -/* 06A384 80069784 244F0008 */ addiu $t7, $v0, 8 -/* 06A388 80069788 AC6F0000 */ sw $t7, ($v1) -/* 06A38C 8006978C 3C180600 */ lui $t8, 0x600 -/* 06A390 80069790 AC580000 */ sw $t8, ($v0) -/* 06A394 80069794 AC590004 */ sw $t9, 4($v0) -/* 06A398 80069798 8C620000 */ lw $v0, ($v1) -/* 06A39C 8006979C 3C0FBA00 */ lui $t7, (0xBA000E02 >> 16) # lui $t7, 0xba00 -/* 06A3A0 800697A0 35EF0E02 */ ori $t7, (0xBA000E02 & 0xFFFF) # ori $t7, $t7, 0xe02 -/* 06A3A4 800697A4 244E0008 */ addiu $t6, $v0, 8 -/* 06A3A8 800697A8 AC6E0000 */ sw $t6, ($v1) -/* 06A3AC 800697AC AC400004 */ sw $zero, 4($v0) -/* 06A3B0 800697B0 AC4F0000 */ sw $t7, ($v0) -/* 06A3B4 800697B4 8C620000 */ lw $v0, ($v1) -/* 06A3B8 800697B8 3C19FD70 */ lui $t9, 0xfd70 -/* 06A3BC 800697BC 3C0E8019 */ lui $t6, %hi(D_8018D488) # $t6, 0x8019 -/* 06A3C0 800697C0 24580008 */ addiu $t8, $v0, 8 -/* 06A3C4 800697C4 AC780000 */ sw $t8, ($v1) -/* 06A3C8 800697C8 AC590000 */ sw $t9, ($v0) -/* 06A3CC 800697CC 8DCED488 */ lw $t6, %lo(D_8018D488)($t6) -/* 06A3D0 800697D0 3C190708 */ lui $t9, (0x07080200 >> 16) # lui $t9, 0x708 -/* 06A3D4 800697D4 37390200 */ ori $t9, (0x07080200 & 0xFFFF) # ori $t9, $t9, 0x200 -/* 06A3D8 800697D8 AC4E0004 */ sw $t6, 4($v0) -/* 06A3DC 800697DC 8C620000 */ lw $v0, ($v1) -/* 06A3E0 800697E0 3C18F570 */ lui $t8, 0xf570 -/* 06A3E4 800697E4 240400FF */ li $a0, 255 -/* 06A3E8 800697E8 244F0008 */ addiu $t7, $v0, 8 -/* 06A3EC 800697EC AC6F0000 */ sw $t7, ($v1) -/* 06A3F0 800697F0 AC590004 */ sw $t9, 4($v0) -/* 06A3F4 800697F4 AC580000 */ sw $t8, ($v0) -/* 06A3F8 800697F8 8C620000 */ lw $v0, ($v1) -/* 06A3FC 800697FC 3C0FE600 */ lui $t7, 0xe600 -/* 06A400 80069800 3C19F300 */ lui $t9, 0xf300 -/* 06A404 80069804 244E0008 */ addiu $t6, $v0, 8 -/* 06A408 80069808 AC6E0000 */ sw $t6, ($v1) -/* 06A40C 8006980C AC400004 */ sw $zero, 4($v0) -/* 06A410 80069810 AC4F0000 */ sw $t7, ($v0) -/* 06A414 80069814 8C620000 */ lw $v0, ($v1) -/* 06A418 80069818 3C0E071F */ lui $t6, (0x071FF200 >> 16) # lui $t6, 0x71f -/* 06A41C 8006981C 35CEF200 */ ori $t6, (0x071FF200 & 0xFFFF) # ori $t6, $t6, 0xf200 -/* 06A420 80069820 24580008 */ addiu $t8, $v0, 8 -/* 06A424 80069824 AC780000 */ sw $t8, ($v1) -/* 06A428 80069828 AC4E0004 */ sw $t6, 4($v0) -/* 06A42C 8006982C AC590000 */ sw $t9, ($v0) -/* 06A430 80069830 8C620000 */ lw $v0, ($v1) -/* 06A434 80069834 3C18E700 */ lui $t8, 0xe700 -/* 06A438 80069838 3C0EF568 */ lui $t6, (0xF5680800 >> 16) # lui $t6, 0xf568 -/* 06A43C 8006983C 244F0008 */ addiu $t7, $v0, 8 -/* 06A440 80069840 AC6F0000 */ sw $t7, ($v1) -/* 06A444 80069844 AC400004 */ sw $zero, 4($v0) -/* 06A448 80069848 AC580000 */ sw $t8, ($v0) -/* 06A44C 8006984C 8C620000 */ lw $v0, ($v1) -/* 06A450 80069850 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 06A454 80069854 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 06A458 80069858 24590008 */ addiu $t9, $v0, 8 -/* 06A45C 8006985C AC790000 */ sw $t9, ($v1) -/* 06A460 80069860 AFA20030 */ sw $v0, 0x30($sp) -/* 06A464 80069864 35CE0800 */ ori $t6, (0xF5680800 & 0xFFFF) # ori $t6, $t6, 0x800 -/* 06A468 80069868 AC4E0000 */ sw $t6, ($v0) -/* 06A46C 8006986C AC580004 */ sw $t8, 4($v0) -/* 06A470 80069870 8C620000 */ lw $v0, ($v1) -/* 06A474 80069874 3C0F0007 */ lui $t7, (0x0007C07C >> 16) # lui $t7, 7 -/* 06A478 80069878 35EFC07C */ ori $t7, (0x0007C07C & 0xFFFF) # ori $t7, $t7, 0xc07c -/* 06A47C 8006987C 24590008 */ addiu $t9, $v0, 8 -/* 06A480 80069880 AC790000 */ sw $t9, ($v1) -/* 06A484 80069884 AFA2002C */ sw $v0, 0x2c($sp) -/* 06A488 80069888 3C0EF200 */ lui $t6, 0xf200 -/* 06A48C 8006988C AC4E0000 */ sw $t6, ($v0) -/* 06A490 80069890 AC4F0004 */ sw $t7, 4($v0) -/* 06A494 80069894 87A70052 */ lh $a3, 0x52($sp) -/* 06A498 80069898 240500FF */ li $a1, 255 -/* 06A49C 8006989C 0C012CD7 */ jal func_8004B35C -/* 06A4A0 800698A0 00003025 */ move $a2, $zero -/* 06A4A4 800698A4 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06A4A8 800698A8 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06A4AC 800698AC 8C620000 */ lw $v0, ($v1) -/* 06A4B0 800698B0 3C0EB900 */ lui $t6, (0xB900031D >> 16) # lui $t6, 0xb900 -/* 06A4B4 800698B4 3C0F0050 */ lui $t7, (0x00504B50 >> 16) # lui $t7, 0x50 -/* 06A4B8 800698B8 24590008 */ addiu $t9, $v0, 8 -/* 06A4BC 800698BC AC790000 */ sw $t9, ($v1) -/* 06A4C0 800698C0 35EF4B50 */ ori $t7, (0x00504B50 & 0xFFFF) # ori $t7, $t7, 0x4b50 -/* 06A4C4 800698C4 35CE031D */ ori $t6, (0xB900031D & 0xFFFF) # ori $t6, $t6, 0x31d -/* 06A4C8 800698C8 AC4E0000 */ sw $t6, ($v0) -/* 06A4CC 800698CC AC4F0004 */ sw $t7, 4($v0) -/* 06A4D0 800698D0 8C620000 */ lw $v0, ($v1) -/* 06A4D4 800698D4 3C0E800F */ lui $t6, %hi(D_800E87C0) # $t6, 0x800f -/* 06A4D8 800698D8 3C190400 */ lui $t9, (0x0400103F >> 16) # lui $t9, 0x400 -/* 06A4DC 800698DC 24580008 */ addiu $t8, $v0, 8 -/* 06A4E0 800698E0 AC780000 */ sw $t8, ($v1) -/* 06A4E4 800698E4 3739103F */ ori $t9, (0x0400103F & 0xFFFF) # ori $t9, $t9, 0x103f -/* 06A4E8 800698E8 25CE87C0 */ addiu $t6, %lo(D_800E87C0) # addiu $t6, $t6, -0x7840 -/* 06A4EC 800698EC AC4E0004 */ sw $t6, 4($v0) -/* 06A4F0 800698F0 AC590000 */ sw $t9, ($v0) -/* 06A4F4 800698F4 8C620000 */ lw $v0, ($v1) -/* 06A4F8 800698F8 3C190D01 */ lui $t9, %hi(D_0D008DA0) # $t9, 0xd01 -/* 06A4FC 800698FC 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 06A500 80069900 244F0008 */ addiu $t7, $v0, 8 -/* 06A504 80069904 AC6F0000 */ sw $t7, ($v1) -/* 06A508 80069908 27398DA0 */ addiu $t9, %lo(D_0D008DA0) # addiu $t9, $t9, -0x7260 -/* 06A50C 8006990C 3C180600 */ lui $t8, 0x600 -/* 06A510 80069910 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 06A514 80069914 AC580000 */ sw $t8, ($v0) -/* 06A518 80069918 AC590004 */ sw $t9, 4($v0) -/* 06A51C 8006991C 84EE0000 */ lh $t6, ($a3) -/* 06A520 80069920 25CF0001 */ addiu $t7, $t6, 1 -/* 06A524 80069924 A4EF0000 */ sh $t7, ($a3) -/* 06A528 80069928 8FBF0014 */ lw $ra, 0x14($sp) -.L8006992C: -/* 06A52C 8006992C 27BD0068 */ addiu $sp, $sp, 0x68 -/* 06A530 80069930 03E00008 */ jr $ra -/* 06A534 80069934 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80069938.s b/asm/non_matchings/code_80057C60/func_80069938.s deleted file mode 100644 index dea7bc8f9..000000000 --- a/asm/non_matchings/code_80057C60/func_80069938.s +++ /dev/null @@ -1,158 +0,0 @@ -glabel func_80069938 -/* 06A538 80069938 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 06A53C 8006993C AFA60070 */ sw $a2, 0x70($sp) -/* 06A540 80069940 00067400 */ sll $t6, $a2, 0x10 -/* 06A544 80069944 000E3403 */ sra $a2, $t6, 0x10 -/* 06A548 80069948 000678C0 */ sll $t7, $a2, 3 -/* 06A54C 8006994C 01E67821 */ addu $t7, $t7, $a2 -/* 06A550 80069950 AFA70074 */ sw $a3, 0x74($sp) -/* 06A554 80069954 0007C600 */ sll $t8, $a3, 0x18 -/* 06A558 80069958 000F78C0 */ sll $t7, $t7, 3 -/* 06A55C 8006995C 00183E03 */ sra $a3, $t8, 0x18 -/* 06A560 80069960 AFBF0014 */ sw $ra, 0x14($sp) -/* 06A564 80069964 AFA40068 */ sw $a0, 0x68($sp) -/* 06A568 80069968 AFA5006C */ sw $a1, 0x6c($sp) -/* 06A56C 8006996C 008F1021 */ addu $v0, $a0, $t7 -/* 06A570 80069970 84580AE4 */ lh $t8, 0xae4($v0) -/* 06A574 80069974 24010001 */ li $at, 1 -/* 06A578 80069978 00807025 */ move $t6, $a0 -/* 06A57C 8006997C 57010087 */ bnel $t8, $at, .L80069B9C -/* 06A580 80069980 8FBF0014 */ lw $ra, 0x14($sp) -/* 06A584 80069984 84590B06 */ lh $t9, 0xb06($v0) -/* 06A588 80069988 00077840 */ sll $t7, $a3, 1 -/* 06A58C 8006998C 008FC021 */ addu $t8, $a0, $t7 -/* 06A590 80069990 A7B90052 */ sh $t9, 0x52($sp) -/* 06A594 80069994 C4440AC8 */ lwc1 $f4, 0xac8($v0) -/* 06A598 80069998 27A4005C */ addiu $a0, $sp, 0x5c -/* 06A59C 8006999C 27A50054 */ addiu $a1, $sp, 0x54 -/* 06A5A0 800699A0 E7A4005C */ swc1 $f4, 0x5c($sp) -/* 06A5A4 800699A4 C4460ACC */ lwc1 $f6, 0xacc($v0) -/* 06A5A8 800699A8 E7A60060 */ swc1 $f6, 0x60($sp) -/* 06A5AC 800699AC C4480AD0 */ lwc1 $f8, 0xad0($v0) -/* 06A5B0 800699B0 A7A00054 */ sh $zero, 0x54($sp) -/* 06A5B4 800699B4 E7A80064 */ swc1 $f8, 0x64($sp) -/* 06A5B8 800699B8 87190048 */ lh $t9, 0x48($t8) -/* 06A5BC 800699BC A7B90056 */ sh $t9, 0x56($sp) -/* 06A5C0 800699C0 844F0B00 */ lh $t7, 0xb00($v0) -/* 06A5C4 800699C4 A7AF0058 */ sh $t7, 0x58($sp) -/* 06A5C8 800699C8 C5D00224 */ lwc1 $f16, 0x224($t6) -/* 06A5CC 800699CC C44A0AD4 */ lwc1 $f10, 0xad4($v0) -/* 06A5D0 800699D0 46105482 */ mul.s $f18, $f10, $f16 -/* 06A5D4 800699D4 44069000 */ mfc1 $a2, $f18 -/* 06A5D8 800699D8 0C0194B5 */ jal func_800652D4 -/* 06A5DC 800699DC 00000000 */ nop -/* 06A5E0 800699E0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06A5E4 800699E4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06A5E8 800699E8 8C620000 */ lw $v0, ($v1) -/* 06A5EC 800699EC 3C0F0D01 */ lui $t7, %hi(D_0D008D58) # $t7, 0xd01 -/* 06A5F0 800699F0 25EF8D58 */ addiu $t7, %lo(D_0D008D58) # addiu $t7, $t7, -0x72a8 -/* 06A5F4 800699F4 24580008 */ addiu $t8, $v0, 8 -/* 06A5F8 800699F8 AC780000 */ sw $t8, ($v1) -/* 06A5FC 800699FC 3C190600 */ lui $t9, 0x600 -/* 06A600 80069A00 AC590000 */ sw $t9, ($v0) -/* 06A604 80069A04 AC4F0004 */ sw $t7, 4($v0) -/* 06A608 80069A08 8C620000 */ lw $v0, ($v1) -/* 06A60C 80069A0C 3C18BA00 */ lui $t8, (0xBA000E02 >> 16) # lui $t8, 0xba00 -/* 06A610 80069A10 37180E02 */ ori $t8, (0xBA000E02 & 0xFFFF) # ori $t8, $t8, 0xe02 -/* 06A614 80069A14 244E0008 */ addiu $t6, $v0, 8 -/* 06A618 80069A18 AC6E0000 */ sw $t6, ($v1) -/* 06A61C 80069A1C AC400004 */ sw $zero, 4($v0) -/* 06A620 80069A20 AC580000 */ sw $t8, ($v0) -/* 06A624 80069A24 8C620000 */ lw $v0, ($v1) -/* 06A628 80069A28 3C0FFD70 */ lui $t7, 0xfd70 -/* 06A62C 80069A2C 3C0E8019 */ lui $t6, %hi(D_8018D488) # $t6, 0x8019 -/* 06A630 80069A30 24590008 */ addiu $t9, $v0, 8 -/* 06A634 80069A34 AC790000 */ sw $t9, ($v1) -/* 06A638 80069A38 AC4F0000 */ sw $t7, ($v0) -/* 06A63C 80069A3C 8DCED488 */ lw $t6, %lo(D_8018D488)($t6) -/* 06A640 80069A40 3C0F0708 */ lui $t7, (0x07080200 >> 16) # lui $t7, 0x708 -/* 06A644 80069A44 35EF0200 */ ori $t7, (0x07080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 06A648 80069A48 AC4E0004 */ sw $t6, 4($v0) -/* 06A64C 80069A4C 8C620000 */ lw $v0, ($v1) -/* 06A650 80069A50 3C19F570 */ lui $t9, 0xf570 -/* 06A654 80069A54 240400FF */ li $a0, 255 -/* 06A658 80069A58 24580008 */ addiu $t8, $v0, 8 -/* 06A65C 80069A5C AC780000 */ sw $t8, ($v1) -/* 06A660 80069A60 AC4F0004 */ sw $t7, 4($v0) -/* 06A664 80069A64 AC590000 */ sw $t9, ($v0) -/* 06A668 80069A68 8C620000 */ lw $v0, ($v1) -/* 06A66C 80069A6C 3C18E600 */ lui $t8, 0xe600 -/* 06A670 80069A70 3C0FF300 */ lui $t7, 0xf300 -/* 06A674 80069A74 244E0008 */ addiu $t6, $v0, 8 -/* 06A678 80069A78 AC6E0000 */ sw $t6, ($v1) -/* 06A67C 80069A7C AC400004 */ sw $zero, 4($v0) -/* 06A680 80069A80 AC580000 */ sw $t8, ($v0) -/* 06A684 80069A84 8C620000 */ lw $v0, ($v1) -/* 06A688 80069A88 3C0E071F */ lui $t6, (0x071FF200 >> 16) # lui $t6, 0x71f -/* 06A68C 80069A8C 35CEF200 */ ori $t6, (0x071FF200 & 0xFFFF) # ori $t6, $t6, 0xf200 -/* 06A690 80069A90 24590008 */ addiu $t9, $v0, 8 -/* 06A694 80069A94 AC790000 */ sw $t9, ($v1) -/* 06A698 80069A98 AC4E0004 */ sw $t6, 4($v0) -/* 06A69C 80069A9C AC4F0000 */ sw $t7, ($v0) -/* 06A6A0 80069AA0 8C620000 */ lw $v0, ($v1) -/* 06A6A4 80069AA4 3C19E700 */ lui $t9, 0xe700 -/* 06A6A8 80069AA8 3C0EF568 */ lui $t6, (0xF5680800 >> 16) # lui $t6, 0xf568 -/* 06A6AC 80069AAC 24580008 */ addiu $t8, $v0, 8 -/* 06A6B0 80069AB0 AC780000 */ sw $t8, ($v1) -/* 06A6B4 80069AB4 AC400004 */ sw $zero, 4($v0) -/* 06A6B8 80069AB8 AC590000 */ sw $t9, ($v0) -/* 06A6BC 80069ABC 8C620000 */ lw $v0, ($v1) -/* 06A6C0 80069AC0 3C190008 */ lui $t9, (0x00080200 >> 16) # lui $t9, 8 -/* 06A6C4 80069AC4 37390200 */ ori $t9, (0x00080200 & 0xFFFF) # ori $t9, $t9, 0x200 -/* 06A6C8 80069AC8 244F0008 */ addiu $t7, $v0, 8 -/* 06A6CC 80069ACC AC6F0000 */ sw $t7, ($v1) -/* 06A6D0 80069AD0 AFA20030 */ sw $v0, 0x30($sp) -/* 06A6D4 80069AD4 35CE0800 */ ori $t6, (0xF5680800 & 0xFFFF) # ori $t6, $t6, 0x800 -/* 06A6D8 80069AD8 AC4E0000 */ sw $t6, ($v0) -/* 06A6DC 80069ADC AC590004 */ sw $t9, 4($v0) -/* 06A6E0 80069AE0 8C620000 */ lw $v0, ($v1) -/* 06A6E4 80069AE4 3C180007 */ lui $t8, (0x0007C07C >> 16) # lui $t8, 7 -/* 06A6E8 80069AE8 3718C07C */ ori $t8, (0x0007C07C & 0xFFFF) # ori $t8, $t8, 0xc07c -/* 06A6EC 80069AEC 244F0008 */ addiu $t7, $v0, 8 -/* 06A6F0 80069AF0 AC6F0000 */ sw $t7, ($v1) -/* 06A6F4 80069AF4 AFA2002C */ sw $v0, 0x2c($sp) -/* 06A6F8 80069AF8 3C0EF200 */ lui $t6, 0xf200 -/* 06A6FC 80069AFC AC4E0000 */ sw $t6, ($v0) -/* 06A700 80069B00 AC580004 */ sw $t8, 4($v0) -/* 06A704 80069B04 87A70052 */ lh $a3, 0x52($sp) -/* 06A708 80069B08 240500FF */ li $a1, 255 -/* 06A70C 80069B0C 0C012CD7 */ jal func_8004B35C -/* 06A710 80069B10 00003025 */ move $a2, $zero -/* 06A714 80069B14 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06A718 80069B18 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06A71C 80069B1C 8C620000 */ lw $v0, ($v1) -/* 06A720 80069B20 3C0EB900 */ lui $t6, (0xB900031D >> 16) # lui $t6, 0xb900 -/* 06A724 80069B24 3C180050 */ lui $t8, (0x00504B50 >> 16) # lui $t8, 0x50 -/* 06A728 80069B28 244F0008 */ addiu $t7, $v0, 8 -/* 06A72C 80069B2C AC6F0000 */ sw $t7, ($v1) -/* 06A730 80069B30 37184B50 */ ori $t8, (0x00504B50 & 0xFFFF) # ori $t8, $t8, 0x4b50 -/* 06A734 80069B34 35CE031D */ ori $t6, (0xB900031D & 0xFFFF) # ori $t6, $t6, 0x31d -/* 06A738 80069B38 AC4E0000 */ sw $t6, ($v0) -/* 06A73C 80069B3C AC580004 */ sw $t8, 4($v0) -/* 06A740 80069B40 8C620000 */ lw $v0, ($v1) -/* 06A744 80069B44 3C0E800F */ lui $t6, %hi(D_800E87C0) # $t6, 0x800f -/* 06A748 80069B48 3C0F0400 */ lui $t7, (0x0400103F >> 16) # lui $t7, 0x400 -/* 06A74C 80069B4C 24590008 */ addiu $t9, $v0, 8 -/* 06A750 80069B50 AC790000 */ sw $t9, ($v1) -/* 06A754 80069B54 35EF103F */ ori $t7, (0x0400103F & 0xFFFF) # ori $t7, $t7, 0x103f -/* 06A758 80069B58 25CE87C0 */ addiu $t6, %lo(D_800E87C0) # addiu $t6, $t6, -0x7840 -/* 06A75C 80069B5C AC4E0004 */ sw $t6, 4($v0) -/* 06A760 80069B60 AC4F0000 */ sw $t7, ($v0) -/* 06A764 80069B64 8C620000 */ lw $v0, ($v1) -/* 06A768 80069B68 3C0F0D01 */ lui $t7, %hi(D_0D008DA0) # $t7, 0xd01 -/* 06A76C 80069B6C 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 06A770 80069B70 24580008 */ addiu $t8, $v0, 8 -/* 06A774 80069B74 AC780000 */ sw $t8, ($v1) -/* 06A778 80069B78 25EF8DA0 */ addiu $t7, %lo(D_0D008DA0) # addiu $t7, $t7, -0x7260 -/* 06A77C 80069B7C 3C190600 */ lui $t9, 0x600 -/* 06A780 80069B80 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 06A784 80069B84 AC590000 */ sw $t9, ($v0) -/* 06A788 80069B88 AC4F0004 */ sw $t7, 4($v0) -/* 06A78C 80069B8C 84EE0000 */ lh $t6, ($a3) -/* 06A790 80069B90 25D80001 */ addiu $t8, $t6, 1 -/* 06A794 80069B94 A4F80000 */ sh $t8, ($a3) -/* 06A798 80069B98 8FBF0014 */ lw $ra, 0x14($sp) -.L80069B9C: -/* 06A79C 80069B9C 27BD0068 */ addiu $sp, $sp, 0x68 -/* 06A7A0 80069BA0 03E00008 */ jr $ra -/* 06A7A4 80069BA4 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80069DB8.s b/asm/non_matchings/code_80057C60/func_80069DB8.s deleted file mode 100644 index 52d742348..000000000 --- a/asm/non_matchings/code_80057C60/func_80069DB8.s +++ /dev/null @@ -1,155 +0,0 @@ -glabel func_80069DB8 -/* 06A9B8 80069DB8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 06A9BC 80069DBC AFA60070 */ sw $a2, 0x70($sp) -/* 06A9C0 80069DC0 00067400 */ sll $t6, $a2, 0x10 -/* 06A9C4 80069DC4 000E3403 */ sra $a2, $t6, 0x10 -/* 06A9C8 80069DC8 000678C0 */ sll $t7, $a2, 3 -/* 06A9CC 80069DCC 01E67821 */ addu $t7, $t7, $a2 -/* 06A9D0 80069DD0 0007C600 */ sll $t8, $a3, 0x18 -/* 06A9D4 80069DD4 000F78C0 */ sll $t7, $t7, 3 -/* 06A9D8 80069DD8 0018CE03 */ sra $t9, $t8, 0x18 -/* 06A9DC 80069DDC AFBF0014 */ sw $ra, 0x14($sp) -/* 06A9E0 80069DE0 AFA40068 */ sw $a0, 0x68($sp) -/* 06A9E4 80069DE4 AFA5006C */ sw $a1, 0x6c($sp) -/* 06A9E8 80069DE8 AFA70074 */ sw $a3, 0x74($sp) -/* 06A9EC 80069DEC 008F1021 */ addu $v0, $a0, $t7 -/* 06A9F0 80069DF0 84580AE4 */ lh $t8, 0xae4($v0) -/* 06A9F4 80069DF4 24010001 */ li $at, 1 -/* 06A9F8 80069DF8 00807025 */ move $t6, $a0 -/* 06A9FC 80069DFC 57010084 */ bnel $t8, $at, .L8006A010 -/* 06AA00 80069E00 8FBF0014 */ lw $ra, 0x14($sp) -/* 06AA04 80069E04 C4440AC8 */ lwc1 $f4, 0xac8($v0) -/* 06AA08 80069E08 0019C840 */ sll $t9, $t9, 1 -/* 06AA0C 80069E0C 00997821 */ addu $t7, $a0, $t9 -/* 06AA10 80069E10 E7A4005C */ swc1 $f4, 0x5c($sp) -/* 06AA14 80069E14 C4460ACC */ lwc1 $f6, 0xacc($v0) -/* 06AA18 80069E18 27A4005C */ addiu $a0, $sp, 0x5c -/* 06AA1C 80069E1C 27A50054 */ addiu $a1, $sp, 0x54 -/* 06AA20 80069E20 E7A60060 */ swc1 $f6, 0x60($sp) -/* 06AA24 80069E24 C4480AD0 */ lwc1 $f8, 0xad0($v0) -/* 06AA28 80069E28 A7A00054 */ sh $zero, 0x54($sp) -/* 06AA2C 80069E2C E7A80064 */ swc1 $f8, 0x64($sp) -/* 06AA30 80069E30 85F80048 */ lh $t8, 0x48($t7) -/* 06AA34 80069E34 A7A00058 */ sh $zero, 0x58($sp) -/* 06AA38 80069E38 A7B80056 */ sh $t8, 0x56($sp) -/* 06AA3C 80069E3C C5D00224 */ lwc1 $f16, 0x224($t6) -/* 06AA40 80069E40 C44A0AD4 */ lwc1 $f10, 0xad4($v0) -/* 06AA44 80069E44 46105482 */ mul.s $f18, $f10, $f16 -/* 06AA48 80069E48 44069000 */ mfc1 $a2, $f18 -/* 06AA4C 80069E4C 0C0194B5 */ jal func_800652D4 -/* 06AA50 80069E50 00000000 */ nop -/* 06AA54 80069E54 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06AA58 80069E58 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06AA5C 80069E5C 8C620000 */ lw $v0, ($v1) -/* 06AA60 80069E60 3C180D01 */ lui $t8, %hi(D_0D008D58) # $t8, 0xd01 -/* 06AA64 80069E64 27188D58 */ addiu $t8, %lo(D_0D008D58) # addiu $t8, $t8, -0x72a8 -/* 06AA68 80069E68 24590008 */ addiu $t9, $v0, 8 -/* 06AA6C 80069E6C AC790000 */ sw $t9, ($v1) -/* 06AA70 80069E70 3C0F0600 */ lui $t7, 0x600 -/* 06AA74 80069E74 AC4F0000 */ sw $t7, ($v0) -/* 06AA78 80069E78 AC580004 */ sw $t8, 4($v0) -/* 06AA7C 80069E7C 8C620000 */ lw $v0, ($v1) -/* 06AA80 80069E80 3C19BA00 */ lui $t9, (0xBA000E02 >> 16) # lui $t9, 0xba00 -/* 06AA84 80069E84 37390E02 */ ori $t9, (0xBA000E02 & 0xFFFF) # ori $t9, $t9, 0xe02 -/* 06AA88 80069E88 244E0008 */ addiu $t6, $v0, 8 -/* 06AA8C 80069E8C AC6E0000 */ sw $t6, ($v1) -/* 06AA90 80069E90 AC400004 */ sw $zero, 4($v0) -/* 06AA94 80069E94 AC590000 */ sw $t9, ($v0) -/* 06AA98 80069E98 8C620000 */ lw $v0, ($v1) -/* 06AA9C 80069E9C 3C18FD70 */ lui $t8, 0xfd70 -/* 06AAA0 80069EA0 3C0E8019 */ lui $t6, %hi(D_8018D49C) # $t6, 0x8019 -/* 06AAA4 80069EA4 244F0008 */ addiu $t7, $v0, 8 -/* 06AAA8 80069EA8 AC6F0000 */ sw $t7, ($v1) -/* 06AAAC 80069EAC AC580000 */ sw $t8, ($v0) -/* 06AAB0 80069EB0 8DCED49C */ lw $t6, %lo(D_8018D49C)($t6) -/* 06AAB4 80069EB4 3C180708 */ lui $t8, (0x07080200 >> 16) # lui $t8, 0x708 -/* 06AAB8 80069EB8 37180200 */ ori $t8, (0x07080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 06AABC 80069EBC AC4E0004 */ sw $t6, 4($v0) -/* 06AAC0 80069EC0 8C620000 */ lw $v0, ($v1) -/* 06AAC4 80069EC4 3C0FF570 */ lui $t7, 0xf570 -/* 06AAC8 80069EC8 240400FF */ li $a0, 255 -/* 06AACC 80069ECC 24590008 */ addiu $t9, $v0, 8 -/* 06AAD0 80069ED0 AC790000 */ sw $t9, ($v1) -/* 06AAD4 80069ED4 AC580004 */ sw $t8, 4($v0) -/* 06AAD8 80069ED8 AC4F0000 */ sw $t7, ($v0) -/* 06AADC 80069EDC 8C620000 */ lw $v0, ($v1) -/* 06AAE0 80069EE0 3C19E600 */ lui $t9, 0xe600 -/* 06AAE4 80069EE4 3C18F300 */ lui $t8, 0xf300 -/* 06AAE8 80069EE8 244E0008 */ addiu $t6, $v0, 8 -/* 06AAEC 80069EEC AC6E0000 */ sw $t6, ($v1) -/* 06AAF0 80069EF0 AC400004 */ sw $zero, 4($v0) -/* 06AAF4 80069EF4 AC590000 */ sw $t9, ($v0) -/* 06AAF8 80069EF8 8C620000 */ lw $v0, ($v1) -/* 06AAFC 80069EFC 3C0E070F */ lui $t6, (0x070FF200 >> 16) # lui $t6, 0x70f -/* 06AB00 80069F00 35CEF200 */ ori $t6, (0x070FF200 & 0xFFFF) # ori $t6, $t6, 0xf200 -/* 06AB04 80069F04 244F0008 */ addiu $t7, $v0, 8 -/* 06AB08 80069F08 AC6F0000 */ sw $t7, ($v1) -/* 06AB0C 80069F0C AC4E0004 */ sw $t6, 4($v0) -/* 06AB10 80069F10 AC580000 */ sw $t8, ($v0) -/* 06AB14 80069F14 8C620000 */ lw $v0, ($v1) -/* 06AB18 80069F18 3C0FE700 */ lui $t7, 0xe700 -/* 06AB1C 80069F1C 3C0EF570 */ lui $t6, (0xF5700800 >> 16) # lui $t6, 0xf570 -/* 06AB20 80069F20 24590008 */ addiu $t9, $v0, 8 -/* 06AB24 80069F24 AC790000 */ sw $t9, ($v1) -/* 06AB28 80069F28 AC400004 */ sw $zero, 4($v0) -/* 06AB2C 80069F2C AC4F0000 */ sw $t7, ($v0) -/* 06AB30 80069F30 8C620000 */ lw $v0, ($v1) -/* 06AB34 80069F34 3C0F0008 */ lui $t7, (0x00080200 >> 16) # lui $t7, 8 -/* 06AB38 80069F38 35EF0200 */ ori $t7, (0x00080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 06AB3C 80069F3C 24580008 */ addiu $t8, $v0, 8 -/* 06AB40 80069F40 AC780000 */ sw $t8, ($v1) -/* 06AB44 80069F44 AFA2002C */ sw $v0, 0x2c($sp) -/* 06AB48 80069F48 35CE0800 */ ori $t6, (0xF5700800 & 0xFFFF) # ori $t6, $t6, 0x800 -/* 06AB4C 80069F4C AC4E0000 */ sw $t6, ($v0) -/* 06AB50 80069F50 AC4F0004 */ sw $t7, 4($v0) -/* 06AB54 80069F54 8C620000 */ lw $v0, ($v1) -/* 06AB58 80069F58 3C190003 */ lui $t9, (0x0003C03C >> 16) # lui $t9, 3 -/* 06AB5C 80069F5C 3739C03C */ ori $t9, (0x0003C03C & 0xFFFF) # ori $t9, $t9, 0xc03c -/* 06AB60 80069F60 24580008 */ addiu $t8, $v0, 8 -/* 06AB64 80069F64 AC780000 */ sw $t8, ($v1) -/* 06AB68 80069F68 3C0EF200 */ lui $t6, 0xf200 -/* 06AB6C 80069F6C AFA20028 */ sw $v0, 0x28($sp) -/* 06AB70 80069F70 240500FF */ li $a1, 255 -/* 06AB74 80069F74 240600FF */ li $a2, 255 -/* 06AB78 80069F78 240700FF */ li $a3, 255 -/* 06AB7C 80069F7C AC590004 */ sw $t9, 4($v0) -/* 06AB80 80069F80 0C012CD7 */ jal func_8004B35C -/* 06AB84 80069F84 AC4E0000 */ sw $t6, ($v0) -/* 06AB88 80069F88 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06AB8C 80069F8C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06AB90 80069F90 8C620000 */ lw $v0, ($v1) -/* 06AB94 80069F94 3C0EB900 */ lui $t6, (0xB900031D >> 16) # lui $t6, 0xb900 -/* 06AB98 80069F98 3C190050 */ lui $t9, (0x00504B50 >> 16) # lui $t9, 0x50 -/* 06AB9C 80069F9C 24580008 */ addiu $t8, $v0, 8 -/* 06ABA0 80069FA0 AC780000 */ sw $t8, ($v1) -/* 06ABA4 80069FA4 37394B50 */ ori $t9, (0x00504B50 & 0xFFFF) # ori $t9, $t9, 0x4b50 -/* 06ABA8 80069FA8 35CE031D */ ori $t6, (0xB900031D & 0xFFFF) # ori $t6, $t6, 0x31d -/* 06ABAC 80069FAC AC4E0000 */ sw $t6, ($v0) -/* 06ABB0 80069FB0 AC590004 */ sw $t9, 4($v0) -/* 06ABB4 80069FB4 8C620000 */ lw $v0, ($v1) -/* 06ABB8 80069FB8 3C0E800F */ lui $t6, %hi(D_800E8740) # $t6, 0x800f -/* 06ABBC 80069FBC 3C180400 */ lui $t8, (0x0400103F >> 16) # lui $t8, 0x400 -/* 06ABC0 80069FC0 244F0008 */ addiu $t7, $v0, 8 -/* 06ABC4 80069FC4 AC6F0000 */ sw $t7, ($v1) -/* 06ABC8 80069FC8 3718103F */ ori $t8, (0x0400103F & 0xFFFF) # ori $t8, $t8, 0x103f -/* 06ABCC 80069FCC 25CE8740 */ addiu $t6, %lo(D_800E8740) # addiu $t6, $t6, -0x78c0 -/* 06ABD0 80069FD0 AC4E0004 */ sw $t6, 4($v0) -/* 06ABD4 80069FD4 AC580000 */ sw $t8, ($v0) -/* 06ABD8 80069FD8 8C620000 */ lw $v0, ($v1) -/* 06ABDC 80069FDC 3C180D01 */ lui $t8, %hi(D_0D008DA0) # $t8, 0xd01 -/* 06ABE0 80069FE0 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 06ABE4 80069FE4 24590008 */ addiu $t9, $v0, 8 -/* 06ABE8 80069FE8 AC790000 */ sw $t9, ($v1) -/* 06ABEC 80069FEC 27188DA0 */ addiu $t8, %lo(D_0D008DA0) # addiu $t8, $t8, -0x7260 -/* 06ABF0 80069FF0 3C0F0600 */ lui $t7, 0x600 -/* 06ABF4 80069FF4 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 06ABF8 80069FF8 AC4F0000 */ sw $t7, ($v0) -/* 06ABFC 80069FFC AC580004 */ sw $t8, 4($v0) -/* 06AC00 8006A000 84EE0000 */ lh $t6, ($a3) -/* 06AC04 8006A004 25D90001 */ addiu $t9, $t6, 1 -/* 06AC08 8006A008 A4F90000 */ sh $t9, ($a3) -/* 06AC0C 8006A00C 8FBF0014 */ lw $ra, 0x14($sp) -.L8006A010: -/* 06AC10 8006A010 27BD0068 */ addiu $sp, $sp, 0x68 -/* 06AC14 8006A014 03E00008 */ jr $ra -/* 06AC18 8006A018 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006A280.s b/asm/non_matchings/code_80057C60/func_8006A280.s deleted file mode 100644 index f0c0b3f59..000000000 --- a/asm/non_matchings/code_80057C60/func_8006A280.s +++ /dev/null @@ -1,165 +0,0 @@ -glabel func_8006A280 -/* 06AE80 8006A280 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 06AE84 8006A284 AFA60070 */ sw $a2, 0x70($sp) -/* 06AE88 8006A288 00067400 */ sll $t6, $a2, 0x10 -/* 06AE8C 8006A28C 000E3403 */ sra $a2, $t6, 0x10 -/* 06AE90 8006A290 000678C0 */ sll $t7, $a2, 3 -/* 06AE94 8006A294 01E67821 */ addu $t7, $t7, $a2 -/* 06AE98 8006A298 AFA70074 */ sw $a3, 0x74($sp) -/* 06AE9C 8006A29C 0007C600 */ sll $t8, $a3, 0x18 -/* 06AEA0 8006A2A0 000F78C0 */ sll $t7, $t7, 3 -/* 06AEA4 8006A2A4 00183E03 */ sra $a3, $t8, 0x18 -/* 06AEA8 8006A2A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 06AEAC 8006A2AC AFA40068 */ sw $a0, 0x68($sp) -/* 06AEB0 8006A2B0 AFA5006C */ sw $a1, 0x6c($sp) -/* 06AEB4 8006A2B4 008F4021 */ addu $t0, $a0, $t7 -/* 06AEB8 8006A2B8 85180274 */ lh $t8, 0x274($t0) -/* 06AEBC 8006A2BC 24010001 */ li $at, 1 -/* 06AEC0 8006A2C0 00807025 */ move $t6, $a0 -/* 06AEC4 8006A2C4 5701008E */ bnel $t8, $at, .L8006A500 -/* 06AEC8 8006A2C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 06AECC 8006A2CC 85190290 */ lh $t9, 0x290($t0) -/* 06AED0 8006A2D0 27A50054 */ addiu $a1, $sp, 0x54 -/* 06AED4 8006A2D4 A7B90052 */ sh $t9, 0x52($sp) -/* 06AED8 8006A2D8 850F0292 */ lh $t7, 0x292($t0) -/* 06AEDC 8006A2DC 0007C840 */ sll $t9, $a3, 1 -/* 06AEE0 8006A2E0 A7AF0050 */ sh $t7, 0x50($sp) -/* 06AEE4 8006A2E4 85180294 */ lh $t8, 0x294($t0) -/* 06AEE8 8006A2E8 00997821 */ addu $t7, $a0, $t9 -/* 06AEEC 8006A2EC 27A4005C */ addiu $a0, $sp, 0x5c -/* 06AEF0 8006A2F0 A7B8004E */ sh $t8, 0x4e($sp) -/* 06AEF4 8006A2F4 C5040258 */ lwc1 $f4, 0x258($t0) -/* 06AEF8 8006A2F8 E7A4005C */ swc1 $f4, 0x5c($sp) -/* 06AEFC 8006A2FC C506025C */ lwc1 $f6, 0x25c($t0) -/* 06AF00 8006A300 E7A60060 */ swc1 $f6, 0x60($sp) -/* 06AF04 8006A304 C5080260 */ lwc1 $f8, 0x260($t0) -/* 06AF08 8006A308 A7A00054 */ sh $zero, 0x54($sp) -/* 06AF0C 8006A30C E7A80064 */ swc1 $f8, 0x64($sp) -/* 06AF10 8006A310 85F80048 */ lh $t8, 0x48($t7) -/* 06AF14 8006A314 A7A00058 */ sh $zero, 0x58($sp) -/* 06AF18 8006A318 A7B80056 */ sh $t8, 0x56($sp) -/* 06AF1C 8006A31C C5D00224 */ lwc1 $f16, 0x224($t6) -/* 06AF20 8006A320 C50A0264 */ lwc1 $f10, 0x264($t0) -/* 06AF24 8006A324 AFA80018 */ sw $t0, 0x18($sp) -/* 06AF28 8006A328 46105482 */ mul.s $f18, $f10, $f16 -/* 06AF2C 8006A32C 44069000 */ mfc1 $a2, $f18 -/* 06AF30 8006A330 0C0194B5 */ jal func_800652D4 -/* 06AF34 8006A334 00000000 */ nop -/* 06AF38 8006A338 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06AF3C 8006A33C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06AF40 8006A340 8C620000 */ lw $v0, ($v1) -/* 06AF44 8006A344 8FA80018 */ lw $t0, 0x18($sp) -/* 06AF48 8006A348 3C180D01 */ lui $t8, %hi(D_0D008D58) # $t8, 0xd01 -/* 06AF4C 8006A34C 24590008 */ addiu $t9, $v0, 8 -/* 06AF50 8006A350 AC790000 */ sw $t9, ($v1) -/* 06AF54 8006A354 27188D58 */ addiu $t8, %lo(D_0D008D58) # addiu $t8, $t8, -0x72a8 -/* 06AF58 8006A358 3C0F0600 */ lui $t7, 0x600 -/* 06AF5C 8006A35C AC4F0000 */ sw $t7, ($v0) -/* 06AF60 8006A360 AC580004 */ sw $t8, 4($v0) -/* 06AF64 8006A364 8C620000 */ lw $v0, ($v1) -/* 06AF68 8006A368 3C19BA00 */ lui $t9, (0xBA000E02 >> 16) # lui $t9, 0xba00 -/* 06AF6C 8006A36C 37390E02 */ ori $t9, (0xBA000E02 & 0xFFFF) # ori $t9, $t9, 0xe02 -/* 06AF70 8006A370 244E0008 */ addiu $t6, $v0, 8 -/* 06AF74 8006A374 AC6E0000 */ sw $t6, ($v1) -/* 06AF78 8006A378 AC400004 */ sw $zero, 4($v0) -/* 06AF7C 8006A37C AC590000 */ sw $t9, ($v0) -/* 06AF80 8006A380 8C620000 */ lw $v0, ($v1) -/* 06AF84 8006A384 3C18FD90 */ lui $t8, 0xfd90 -/* 06AF88 8006A388 240700FF */ li $a3, 255 -/* 06AF8C 8006A38C 244F0008 */ addiu $t7, $v0, 8 -/* 06AF90 8006A390 AC6F0000 */ sw $t7, ($v1) -/* 06AF94 8006A394 AC580000 */ sw $t8, ($v0) -/* 06AF98 8006A398 850E0276 */ lh $t6, 0x276($t0) -/* 06AF9C 8006A39C 3C0F800E */ lui $t7, %hi(D_800E47A0) -/* 06AFA0 8006A3A0 000EC880 */ sll $t9, $t6, 2 -/* 06AFA4 8006A3A4 01F97821 */ addu $t7, $t7, $t9 -/* 06AFA8 8006A3A8 8DEF47A0 */ lw $t7, %lo(D_800E47A0)($t7) -/* 06AFAC 8006A3AC 3C19F590 */ lui $t9, 0xf590 -/* 06AFB0 8006A3B0 8DF80000 */ lw $t8, ($t7) -/* 06AFB4 8006A3B4 3C0F0708 */ lui $t7, (0x07080200 >> 16) # lui $t7, 0x708 -/* 06AFB8 8006A3B8 35EF0200 */ ori $t7, (0x07080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 06AFBC 8006A3BC AC580004 */ sw $t8, 4($v0) -/* 06AFC0 8006A3C0 8C620000 */ lw $v0, ($v1) -/* 06AFC4 8006A3C4 244E0008 */ addiu $t6, $v0, 8 -/* 06AFC8 8006A3C8 AC6E0000 */ sw $t6, ($v1) -/* 06AFCC 8006A3CC AC4F0004 */ sw $t7, 4($v0) -/* 06AFD0 8006A3D0 AC590000 */ sw $t9, ($v0) -/* 06AFD4 8006A3D4 8C620000 */ lw $v0, ($v1) -/* 06AFD8 8006A3D8 3C0EE600 */ lui $t6, 0xe600 -/* 06AFDC 8006A3DC 3C0FF300 */ lui $t7, 0xf300 -/* 06AFE0 8006A3E0 24580008 */ addiu $t8, $v0, 8 -/* 06AFE4 8006A3E4 AC780000 */ sw $t8, ($v1) -/* 06AFE8 8006A3E8 AC400004 */ sw $zero, 4($v0) -/* 06AFEC 8006A3EC AC4E0000 */ sw $t6, ($v0) -/* 06AFF0 8006A3F0 8C620000 */ lw $v0, ($v1) -/* 06AFF4 8006A3F4 3C18073F */ lui $t8, (0x073FF200 >> 16) # lui $t8, 0x73f -/* 06AFF8 8006A3F8 3718F200 */ ori $t8, (0x073FF200 & 0xFFFF) # ori $t8, $t8, 0xf200 -/* 06AFFC 8006A3FC 24590008 */ addiu $t9, $v0, 8 -/* 06B000 8006A400 AC790000 */ sw $t9, ($v1) -/* 06B004 8006A404 AC580004 */ sw $t8, 4($v0) -/* 06B008 8006A408 AC4F0000 */ sw $t7, ($v0) -/* 06B00C 8006A40C 8C620000 */ lw $v0, ($v1) -/* 06B010 8006A410 3C19E700 */ lui $t9, 0xe700 -/* 06B014 8006A414 3C18F580 */ lui $t8, (0xF5800800 >> 16) # lui $t8, 0xf580 -/* 06B018 8006A418 244E0008 */ addiu $t6, $v0, 8 -/* 06B01C 8006A41C AC6E0000 */ sw $t6, ($v1) -/* 06B020 8006A420 AC400004 */ sw $zero, 4($v0) -/* 06B024 8006A424 AC590000 */ sw $t9, ($v0) -/* 06B028 8006A428 8C620000 */ lw $v0, ($v1) -/* 06B02C 8006A42C 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 -/* 06B030 8006A430 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 06B034 8006A434 244F0008 */ addiu $t7, $v0, 8 -/* 06B038 8006A438 AC6F0000 */ sw $t7, ($v1) -/* 06B03C 8006A43C 37180800 */ ori $t8, (0xF5800800 & 0xFFFF) # ori $t8, $t8, 0x800 -/* 06B040 8006A440 AC580000 */ sw $t8, ($v0) -/* 06B044 8006A444 AC4E0004 */ sw $t6, 4($v0) -/* 06B048 8006A448 8C620000 */ lw $v0, ($v1) -/* 06B04C 8006A44C 3C18000F */ lui $t8, (0x000FC0FC >> 16) # lui $t8, 0xf -/* 06B050 8006A450 3718C0FC */ ori $t8, (0x000FC0FC & 0xFFFF) # ori $t8, $t8, 0xc0fc -/* 06B054 8006A454 24590008 */ addiu $t9, $v0, 8 -/* 06B058 8006A458 AC790000 */ sw $t9, ($v1) -/* 06B05C 8006A45C 3C0FF200 */ lui $t7, 0xf200 -/* 06B060 8006A460 AC4F0000 */ sw $t7, ($v0) -/* 06B064 8006A464 AC580004 */ sw $t8, 4($v0) -/* 06B068 8006A468 87A6004E */ lh $a2, 0x4e($sp) -/* 06B06C 8006A46C 87A50050 */ lh $a1, 0x50($sp) -/* 06B070 8006A470 0C012D05 */ jal func_8004B414 -/* 06B074 8006A474 87A40052 */ lh $a0, 0x52($sp) -/* 06B078 8006A478 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06B07C 8006A47C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06B080 8006A480 8C620000 */ lw $v0, ($v1) -/* 06B084 8006A484 3C19B900 */ lui $t9, (0xB900031D >> 16) # lui $t9, 0xb900 -/* 06B088 8006A488 3C0F0050 */ lui $t7, (0x00504B50 >> 16) # lui $t7, 0x50 -/* 06B08C 8006A48C 244E0008 */ addiu $t6, $v0, 8 -/* 06B090 8006A490 AC6E0000 */ sw $t6, ($v1) -/* 06B094 8006A494 35EF4B50 */ ori $t7, (0x00504B50 & 0xFFFF) # ori $t7, $t7, 0x4b50 -/* 06B098 8006A498 3739031D */ ori $t9, (0xB900031D & 0xFFFF) # ori $t9, $t9, 0x31d -/* 06B09C 8006A49C AC590000 */ sw $t9, ($v0) -/* 06B0A0 8006A4A0 AC4F0004 */ sw $t7, 4($v0) -/* 06B0A4 8006A4A4 8C620000 */ lw $v0, ($v1) -/* 06B0A8 8006A4A8 3C19800F */ lui $t9, %hi(D_800E8780) # $t9, 0x800f -/* 06B0AC 8006A4AC 3C0E0400 */ lui $t6, (0x0400103F >> 16) # lui $t6, 0x400 -/* 06B0B0 8006A4B0 24580008 */ addiu $t8, $v0, 8 -/* 06B0B4 8006A4B4 AC780000 */ sw $t8, ($v1) -/* 06B0B8 8006A4B8 35CE103F */ ori $t6, (0x0400103F & 0xFFFF) # ori $t6, $t6, 0x103f -/* 06B0BC 8006A4BC 27398780 */ addiu $t9, %lo(D_800E8780) # addiu $t9, $t9, -0x7880 -/* 06B0C0 8006A4C0 AC590004 */ sw $t9, 4($v0) -/* 06B0C4 8006A4C4 AC4E0000 */ sw $t6, ($v0) -/* 06B0C8 8006A4C8 8C620000 */ lw $v0, ($v1) -/* 06B0CC 8006A4CC 3C0E0D01 */ lui $t6, %hi(D_0D008DA0) # $t6, 0xd01 -/* 06B0D0 8006A4D0 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 06B0D4 8006A4D4 244F0008 */ addiu $t7, $v0, 8 -/* 06B0D8 8006A4D8 AC6F0000 */ sw $t7, ($v1) -/* 06B0DC 8006A4DC 25CE8DA0 */ addiu $t6, %lo(D_0D008DA0) # addiu $t6, $t6, -0x7260 -/* 06B0E0 8006A4E0 3C180600 */ lui $t8, 0x600 -/* 06B0E4 8006A4E4 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 06B0E8 8006A4E8 AC580000 */ sw $t8, ($v0) -/* 06B0EC 8006A4EC AC4E0004 */ sw $t6, 4($v0) -/* 06B0F0 8006A4F0 84F90000 */ lh $t9, ($a3) -/* 06B0F4 8006A4F4 272F0001 */ addiu $t7, $t9, 1 -/* 06B0F8 8006A4F8 A4EF0000 */ sh $t7, ($a3) -/* 06B0FC 8006A4FC 8FBF0014 */ lw $ra, 0x14($sp) -.L8006A500: -/* 06B100 8006A500 27BD0068 */ addiu $sp, $sp, 0x68 -/* 06B104 8006A504 03E00008 */ jr $ra -/* 06B108 8006A508 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006C294.s b/asm/non_matchings/code_80057C60/func_8006C294.s deleted file mode 100644 index 7134f77ea..000000000 --- a/asm/non_matchings/code_80057C60/func_8006C294.s +++ /dev/null @@ -1,146 +0,0 @@ - -glabel func_8006C294 -/* 06CE94 8006C294 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 06CE98 8006C298 AFBF0014 */ sw $ra, 0x14($sp) -/* 06CE9C 8006C29C AFA40068 */ sw $a0, 0x68($sp) -/* 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(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 -/* 06CEC0 8006C2C0 27A50054 */ addiu $a1, $sp, 0x54 -/* 06CEC4 8006C2C4 E7A60060 */ swc1 $f6, 0x60($sp) -/* 06CEC8 8006C2C8 C4880008 */ lwc1 $f8, 8($a0) -/* 06CECC 8006C2CC A7A00054 */ sh $zero, 0x54($sp) -/* 06CED0 8006C2D0 44066000 */ mfc1 $a2, $f12 -/* 06CED4 8006C2D4 E7A80064 */ swc1 $f8, 0x64($sp) -/* 06CED8 8006C2D8 85F80026 */ lh $t8, 0x26($t7) -/* 06CEDC 8006C2DC A7A00058 */ sh $zero, 0x58($sp) -/* 06CEE0 8006C2E0 27A4005C */ addiu $a0, $sp, 0x5c -/* 06CEE4 8006C2E4 0C0194B5 */ jal func_800652D4 -/* 06CEE8 8006C2E8 A7B80056 */ sh $t8, 0x56($sp) -/* 06CEEC 8006C2EC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06CEF0 8006C2F0 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06CEF4 8006C2F4 8C620000 */ lw $v0, ($v1) -/* 06CEF8 8006C2F8 3C0F0D01 */ lui $t7, %hi(D_0D008D58) # $t7, 0xd01 -/* 06CEFC 8006C2FC 25EF8D58 */ addiu $t7, %lo(D_0D008D58) # addiu $t7, $t7, -0x72a8 -/* 06CF00 8006C300 24590008 */ addiu $t9, $v0, 8 -/* 06CF04 8006C304 AC790000 */ sw $t9, ($v1) -/* 06CF08 8006C308 3C0E0600 */ lui $t6, 0x600 -/* 06CF0C 8006C30C AC4E0000 */ sw $t6, ($v0) -/* 06CF10 8006C310 AC4F0004 */ sw $t7, 4($v0) -/* 06CF14 8006C314 8C620000 */ lw $v0, ($v1) -/* 06CF18 8006C318 3C19BA00 */ lui $t9, (0xBA000E02 >> 16) # lui $t9, 0xba00 -/* 06CF1C 8006C31C 37390E02 */ ori $t9, (0xBA000E02 & 0xFFFF) # ori $t9, $t9, 0xe02 -/* 06CF20 8006C320 24580008 */ addiu $t8, $v0, 8 -/* 06CF24 8006C324 AC780000 */ sw $t8, ($v1) -/* 06CF28 8006C328 AC400004 */ sw $zero, 4($v0) -/* 06CF2C 8006C32C AC590000 */ sw $t9, ($v0) -/* 06CF30 8006C330 8C620000 */ lw $v0, ($v1) -/* 06CF34 8006C334 3C0FFD70 */ lui $t7, 0xfd70 -/* 06CF38 8006C338 3C188019 */ lui $t8, %hi(D_8018D488) # $t8, 0x8019 -/* 06CF3C 8006C33C 244E0008 */ addiu $t6, $v0, 8 -/* 06CF40 8006C340 AC6E0000 */ sw $t6, ($v1) -/* 06CF44 8006C344 AC4F0000 */ sw $t7, ($v0) -/* 06CF48 8006C348 8F18D488 */ lw $t8, %lo(D_8018D488)($t8) -/* 06CF4C 8006C34C 3C0F0708 */ lui $t7, (0x07080200 >> 16) # lui $t7, 0x708 -/* 06CF50 8006C350 35EF0200 */ ori $t7, (0x07080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 06CF54 8006C354 AC580004 */ sw $t8, 4($v0) -/* 06CF58 8006C358 8C620000 */ lw $v0, ($v1) -/* 06CF5C 8006C35C 3C0EF570 */ lui $t6, 0xf570 -/* 06CF60 8006C360 24590008 */ addiu $t9, $v0, 8 -/* 06CF64 8006C364 AC790000 */ sw $t9, ($v1) -/* 06CF68 8006C368 AC4F0004 */ sw $t7, 4($v0) -/* 06CF6C 8006C36C AC4E0000 */ sw $t6, ($v0) -/* 06CF70 8006C370 8C620000 */ lw $v0, ($v1) -/* 06CF74 8006C374 3C19E600 */ lui $t9, 0xe600 -/* 06CF78 8006C378 3C0FF300 */ lui $t7, 0xf300 -/* 06CF7C 8006C37C 24580008 */ addiu $t8, $v0, 8 -/* 06CF80 8006C380 AC780000 */ sw $t8, ($v1) -/* 06CF84 8006C384 AC400004 */ sw $zero, 4($v0) -/* 06CF88 8006C388 AC590000 */ sw $t9, ($v0) -/* 06CF8C 8006C38C 8C620000 */ lw $v0, ($v1) -/* 06CF90 8006C390 3C18071F */ lui $t8, (0x071FF200 >> 16) # lui $t8, 0x71f -/* 06CF94 8006C394 3718F200 */ ori $t8, (0x071FF200 & 0xFFFF) # ori $t8, $t8, 0xf200 -/* 06CF98 8006C398 244E0008 */ addiu $t6, $v0, 8 -/* 06CF9C 8006C39C AC6E0000 */ sw $t6, ($v1) -/* 06CFA0 8006C3A0 AC580004 */ sw $t8, 4($v0) -/* 06CFA4 8006C3A4 AC4F0000 */ sw $t7, ($v0) -/* 06CFA8 8006C3A8 8C620000 */ lw $v0, ($v1) -/* 06CFAC 8006C3AC 3C0EE700 */ lui $t6, 0xe700 -/* 06CFB0 8006C3B0 3C18F568 */ lui $t8, (0xF5680800 >> 16) # lui $t8, 0xf568 -/* 06CFB4 8006C3B4 24590008 */ addiu $t9, $v0, 8 -/* 06CFB8 8006C3B8 AC790000 */ sw $t9, ($v1) -/* 06CFBC 8006C3BC AC400004 */ sw $zero, 4($v0) -/* 06CFC0 8006C3C0 AC4E0000 */ sw $t6, ($v0) -/* 06CFC4 8006C3C4 8C620000 */ lw $v0, ($v1) -/* 06CFC8 8006C3C8 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 -/* 06CFCC 8006C3CC 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 06CFD0 8006C3D0 244F0008 */ addiu $t7, $v0, 8 -/* 06CFD4 8006C3D4 AC6F0000 */ sw $t7, ($v1) -/* 06CFD8 8006C3D8 AFA2002C */ sw $v0, 0x2c($sp) -/* 06CFDC 8006C3DC 37180800 */ ori $t8, (0xF5680800 & 0xFFFF) # ori $t8, $t8, 0x800 -/* 06CFE0 8006C3E0 AC580000 */ sw $t8, ($v0) -/* 06CFE4 8006C3E4 AC4E0004 */ sw $t6, 4($v0) -/* 06CFE8 8006C3E8 8C620000 */ lw $v0, ($v1) -/* 06CFEC 8006C3EC 3C190007 */ lui $t9, (0x0007C07C >> 16) # lui $t9, 7 -/* 06CFF0 8006C3F0 3739C07C */ ori $t9, (0x0007C07C & 0xFFFF) # ori $t9, $t9, 0xc07c -/* 06CFF4 8006C3F4 244F0008 */ addiu $t7, $v0, 8 -/* 06CFF8 8006C3F8 AC6F0000 */ sw $t7, ($v1) -/* 06CFFC 8006C3FC AFA20028 */ sw $v0, 0x28($sp) -/* 06D000 8006C400 3C18F200 */ lui $t8, 0xf200 -/* 06D004 8006C404 AC580000 */ sw $t8, ($v0) -/* 06D008 8006C408 AC590004 */ sw $t9, 4($v0) -/* 06D00C 8006C40C 8FA60070 */ lw $a2, 0x70($sp) -/* 06D010 8006C410 87A70076 */ lh $a3, 0x76($sp) -/* 06D014 8006C414 0006C403 */ sra $t8, $a2, 0x10 -/* 06D018 8006C418 331900FF */ andi $t9, $t8, 0xff -/* 06D01C 8006C41C 00197400 */ sll $t6, $t9, 0x10 -/* 06D020 8006C420 000E2403 */ sra $a0, $t6, 0x10 -/* 06D024 8006C424 0006CA03 */ sra $t9, $a2, 8 -/* 06D028 8006C428 332E00FF */ andi $t6, $t9, 0xff -/* 06D02C 8006C42C 000EC400 */ sll $t8, $t6, 0x10 -/* 06D030 8006C430 00182C03 */ sra $a1, $t8, 0x10 -/* 06D034 8006C434 30CE00FF */ andi $t6, $a2, 0xff -/* 06D038 8006C438 000EC400 */ sll $t8, $t6, 0x10 -/* 06D03C 8006C43C 0C012CD7 */ jal func_8004B35C -/* 06D040 8006C440 00183403 */ sra $a2, $t8, 0x10 -/* 06D044 8006C444 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06D048 8006C448 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06D04C 8006C44C 8C620000 */ lw $v0, ($v1) -/* 06D050 8006C450 3C0EB900 */ lui $t6, (0xB900031D >> 16) # lui $t6, 0xb900 -/* 06D054 8006C454 3C180050 */ lui $t8, (0x00504B50 >> 16) # lui $t8, 0x50 -/* 06D058 8006C458 244F0008 */ addiu $t7, $v0, 8 -/* 06D05C 8006C45C AC6F0000 */ sw $t7, ($v1) -/* 06D060 8006C460 37184B50 */ ori $t8, (0x00504B50 & 0xFFFF) # ori $t8, $t8, 0x4b50 -/* 06D064 8006C464 35CE031D */ ori $t6, (0xB900031D & 0xFFFF) # ori $t6, $t6, 0x31d -/* 06D068 8006C468 AC4E0000 */ sw $t6, ($v0) -/* 06D06C 8006C46C AC580004 */ sw $t8, 4($v0) -/* 06D070 8006C470 8C620000 */ lw $v0, ($v1) -/* 06D074 8006C474 3C0E800F */ lui $t6, %hi(D_800E87C0) # $t6, 0x800f -/* 06D078 8006C478 3C0F0400 */ lui $t7, (0x0400103F >> 16) # lui $t7, 0x400 -/* 06D07C 8006C47C 24590008 */ addiu $t9, $v0, 8 -/* 06D080 8006C480 AC790000 */ sw $t9, ($v1) -/* 06D084 8006C484 35EF103F */ ori $t7, (0x0400103F & 0xFFFF) # ori $t7, $t7, 0x103f -/* 06D088 8006C488 25CE87C0 */ addiu $t6, %lo(D_800E87C0) # addiu $t6, $t6, -0x7840 -/* 06D08C 8006C48C AC4E0004 */ sw $t6, 4($v0) -/* 06D090 8006C490 AC4F0000 */ sw $t7, ($v0) -/* 06D094 8006C494 8C620000 */ lw $v0, ($v1) -/* 06D098 8006C498 3C0F0D01 */ lui $t7, %hi(D_0D008DA0) # $t7, 0xd01 -/* 06D09C 8006C49C 3C078016 */ lui $a3, %hi(gMatrixEffectCount) # $a3, 0x8016 -/* 06D0A0 8006C4A0 24580008 */ addiu $t8, $v0, 8 -/* 06D0A4 8006C4A4 AC780000 */ sw $t8, ($v1) -/* 06D0A8 8006C4A8 25EF8DA0 */ addiu $t7, %lo(D_0D008DA0) # addiu $t7, $t7, -0x7260 -/* 06D0AC 8006C4AC 3C190600 */ lui $t9, 0x600 -/* 06D0B0 8006C4B0 24E74AF0 */ addiu $a3, %lo(gMatrixEffectCount) # addiu $a3, $a3, 0x4af0 -/* 06D0B4 8006C4B4 AC590000 */ sw $t9, ($v0) -/* 06D0B8 8006C4B8 AC4F0004 */ sw $t7, 4($v0) -/* 06D0BC 8006C4BC 84EE0000 */ lh $t6, ($a3) -/* 06D0C0 8006C4C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 06D0C4 8006C4C4 27BD0068 */ addiu $sp, $sp, 0x68 -/* 06D0C8 8006C4C8 25D80001 */ addiu $t8, $t6, 1 -/* 06D0CC 8006C4CC 03E00008 */ jr $ra -/* 06D0D0 8006C4D0 A4F80000 */ sh $t8, ($a3) \ No newline at end of file diff --git a/asm/non_matchings/code_80057C60/render_balloon.s b/asm/non_matchings/code_80057C60/render_balloon.s deleted file mode 100644 index 812158f80..000000000 --- a/asm/non_matchings/code_80057C60/render_balloon.s +++ /dev/null @@ -1,370 +0,0 @@ -.section .data - -glabel D_800E4974 -.word 0x00c80100, 0x00007001, 0x00107951, 0x00005970 -.word 0x00705500, 0x007a7e00, 0x00772c24, 0x00301458 - -glabel D_800E4994 -.word 0x00dc0000, 0x00008c06, 0x00000051, 0x00000000 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -.section .text - -glabel render_balloon -/* 06C734 8006BB34 27BDFEB8 */ addiu $sp, $sp, -0x148 -/* 06C738 8006BB38 3C18800E */ lui $t8, %hi(D_800E4974) # $t8, 0x800e -/* 06C73C 8006BB3C AFBF0024 */ sw $ra, 0x24($sp) -/* 06C740 8006BB40 AFA40148 */ sw $a0, 0x148($sp) -/* 06C744 8006BB44 AFA5014C */ sw $a1, 0x14c($sp) -/* 06C748 8006BB48 AFA60150 */ sw $a2, 0x150($sp) -/* 06C74C 8006BB4C AFA70154 */ sw $a3, 0x154($sp) -/* 06C750 8006BB50 27184974 */ addiu $t8, %lo(D_800E4974) # addiu $t8, $t8, 0x4974 -/* 06C754 8006BB54 8F010000 */ lw $at, ($t8) -/* 06C758 8006BB58 27A900C4 */ addiu $t1, $sp, 0xc4 -/* 06C75C 8006BB5C 00077400 */ sll $t6, $a3, 0x10 -/* 06C760 8006BB60 AD210000 */ sw $at, ($t1) -/* 06C764 8006BB64 8F0F0004 */ lw $t7, 4($t8) -/* 06C768 8006BB68 000E3C03 */ sra $a3, $t6, 0x10 -/* 06C76C 8006BB6C 3C0E800E */ lui $t6, %hi(D_800E4994) # $t6, 0x800e -/* 06C770 8006BB70 AD2F0004 */ sw $t7, 4($t1) -/* 06C774 8006BB74 8F010008 */ lw $at, 8($t8) -/* 06C778 8006BB78 25CE4994 */ addiu $t6, %lo(D_800E4994) # addiu $t6, $t6, 0x4994 -/* 06C77C 8006BB7C 27AA00A4 */ addiu $t2, $sp, 0xa4 -/* 06C780 8006BB80 AD210008 */ sw $at, 8($t1) -/* 06C784 8006BB84 8F0F000C */ lw $t7, 0xc($t8) -/* 06C788 8006BB88 00074080 */ sll $t0, $a3, 2 -/* 06C78C 8006BB8C 27A600F4 */ addiu $a2, $sp, 0xf4 -/* 06C790 8006BB90 AD2F000C */ sw $t7, 0xc($t1) -/* 06C794 8006BB94 8F010010 */ lw $at, 0x10($t8) -/* 06C798 8006BB98 27A500FC */ addiu $a1, $sp, 0xfc -/* 06C79C 8006BB9C 27A40108 */ addiu $a0, $sp, 0x108 -/* 06C7A0 8006BBA0 AD210010 */ sw $at, 0x10($t1) -/* 06C7A4 8006BBA4 8F0F0014 */ lw $t7, 0x14($t8) -/* 06C7A8 8006BBA8 AD2F0014 */ sw $t7, 0x14($t1) -/* 06C7AC 8006BBAC 8F010018 */ lw $at, 0x18($t8) -/* 06C7B0 8006BBB0 AD210018 */ sw $at, 0x18($t1) -/* 06C7B4 8006BBB4 8F0F001C */ lw $t7, 0x1c($t8) -/* 06C7B8 8006BBB8 0128C021 */ addu $t8, $t1, $t0 -/* 06C7BC 8006BBBC AD2F001C */ sw $t7, 0x1c($t1) -/* 06C7C0 8006BBC0 8DC10000 */ lw $at, ($t6) -/* 06C7C4 8006BBC4 8F020000 */ lw $v0, ($t8) -/* 06C7C8 8006BBC8 AD410000 */ sw $at, ($t2) -/* 06C7CC 8006BBCC 8DCF0004 */ lw $t7, 4($t6) -/* 06C7D0 8006BBD0 0002CC03 */ sra $t9, $v0, 0x10 -/* 06C7D4 8006BBD4 AD4F0004 */ sw $t7, 4($t2) -/* 06C7D8 8006BBD8 8DC10008 */ lw $at, 8($t6) -/* 06C7DC 8006BBDC AD410008 */ sw $at, 8($t2) -/* 06C7E0 8006BBE0 8DCF000C */ lw $t7, 0xc($t6) -/* 06C7E4 8006BBE4 AD4F000C */ sw $t7, 0xc($t2) -/* 06C7E8 8006BBE8 8DC10010 */ lw $at, 0x10($t6) -/* 06C7EC 8006BBEC AD410010 */ sw $at, 0x10($t2) -/* 06C7F0 8006BBF0 8DCF0014 */ lw $t7, 0x14($t6) -/* 06C7F4 8006BBF4 AD4F0014 */ sw $t7, 0x14($t2) -/* 06C7F8 8006BBF8 8DC10018 */ lw $at, 0x18($t6) -/* 06C7FC 8006BBFC AD410018 */ sw $at, 0x18($t2) -/* 06C800 8006BC00 8DCF001C */ lw $t7, 0x1c($t6) -/* 06C804 8006BC04 332E00FF */ andi $t6, $t9, 0xff -/* 06C808 8006BC08 305900FF */ andi $t9, $v0, 0xff -/* 06C80C 8006BC0C AD4F001C */ sw $t7, 0x1c($t2) -/* 06C810 8006BC10 00027A03 */ sra $t7, $v0, 8 -/* 06C814 8006BC14 A7AE00F0 */ sh $t6, 0xf0($sp) -/* 06C818 8006BC18 31F800FF */ andi $t8, $t7, 0xff -/* 06C81C 8006BC1C A7B800EE */ sh $t8, 0xee($sp) -/* 06C820 8006BC20 A7B900EC */ sh $t9, 0xec($sp) -/* 06C824 8006BC24 01487021 */ addu $t6, $t2, $t0 -/* 06C828 8006BC28 8DC30000 */ lw $v1, ($t6) -/* 06C82C 8006BC2C 00037C03 */ sra $t7, $v1, 0x10 -/* 06C830 8006BC30 31F800FF */ andi $t8, $t7, 0xff -/* 06C834 8006BC34 A7B800EA */ sh $t8, 0xea($sp) -/* 06C838 8006BC38 8FB80148 */ lw $t8, 0x148($sp) -/* 06C83C 8006BC3C 0003CA03 */ sra $t9, $v1, 8 -/* 06C840 8006BC40 332E00FF */ andi $t6, $t9, 0xff -/* 06C844 8006BC44 306F00FF */ andi $t7, $v1, 0xff -/* 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(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) -/* 06C868 8006BC68 E7A60100 */ swc1 $f6, 0x100($sp) -/* 06C86C 8006BC6C C7080008 */ lwc1 $f8, 8($t8) -/* 06C870 8006BC70 A7A000F4 */ sh $zero, 0xf4($sp) -/* 06C874 8006BC74 E7A80104 */ swc1 $f8, 0x104($sp) -/* 06C878 8006BC78 872E0026 */ lh $t6, 0x26($t9) -/* 06C87C 8006BC7C A7AF00F8 */ sh $t7, 0xf8($sp) -/* 06C880 8006BC80 0C008784 */ jal func_80021E10 -/* 06C884 8006BC84 A7AE00F6 */ sh $t6, 0xf6($sp) -/* 06C888 8006BC88 27A40108 */ addiu $a0, $sp, 0x108 -/* 06C88C 8006BC8C 0C0087E1 */ jal func_80021F84 -/* 06C890 8006BC90 8FA5014C */ lw $a1, 0x14c($sp) -/* 06C894 8006BC94 3C198016 */ lui $t9, %hi(gMatrixEffectCount) # $t9, 0x8016 -/* 06C898 8006BC98 87394AF0 */ lh $t9, %lo(gMatrixEffectCount)($t9) -/* 06C89C 8006BC9C 3C188015 */ lui $t8, %hi(gGfxPool) # $t8, 0x8015 -/* 06C8A0 8006BCA0 8F18EF40 */ lw $t8, %lo(gGfxPool)($t8) -/* 06C8A4 8006BCA4 00197180 */ sll $t6, $t9, 6 -/* 06C8A8 8006BCA8 3401FAC0 */ li $at, 64192 -/* 06C8AC 8006BCAC 030E2021 */ addu $a0, $t8, $t6 -/* 06C8B0 8006BCB0 00812021 */ addu $a0, $a0, $at -/* 06C8B4 8006BCB4 0C008860 */ jal func_80022180 -/* 06C8B8 8006BCB8 27A50108 */ addiu $a1, $sp, 0x108 -/* 06C8BC 8006BCBC 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06C8C0 8006BCC0 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06C8C4 8006BCC4 8C620000 */ lw $v0, ($v1) -/* 06C8C8 8006BCC8 3C190102 */ lui $t9, (0x01020040 >> 16) # lui $t9, 0x102 -/* 06C8CC 8006BCCC 37390040 */ ori $t9, (0x01020040 & 0xFFFF) # ori $t9, $t9, 0x40 -/* 06C8D0 8006BCD0 244F0008 */ addiu $t7, $v0, 8 -/* 06C8D4 8006BCD4 AC6F0000 */ sw $t7, ($v1) -/* 06C8D8 8006BCD8 3C0E8016 */ lui $t6, %hi(gMatrixEffectCount) # $t6, 0x8016 -/* 06C8DC 8006BCDC AC590000 */ sw $t9, ($v0) -/* 06C8E0 8006BCE0 85CE4AF0 */ lh $t6, %lo(gMatrixEffectCount)($t6) -/* 06C8E4 8006BCE4 3C188015 */ lui $t8, %hi(gGfxPool) # $t8, 0x8015 -/* 06C8E8 8006BCE8 8F18EF40 */ lw $t8, %lo(gGfxPool)($t8) -/* 06C8EC 8006BCEC 000E7980 */ sll $t7, $t6, 6 -/* 06C8F0 8006BCF0 3401FAC0 */ li $at, 64192 -/* 06C8F4 8006BCF4 030FC821 */ addu $t9, $t8, $t7 -/* 06C8F8 8006BCF8 03217021 */ addu $t6, $t9, $at -/* 06C8FC 8006BCFC 3C011FFF */ lui $at, (0x1FFFFFFF >> 16) # lui $at, 0x1fff -/* 06C900 8006BD00 3421FFFF */ ori $at, (0x1FFFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 06C904 8006BD04 01C1C024 */ and $t8, $t6, $at -/* 06C908 8006BD08 AC580004 */ sw $t8, 4($v0) -/* 06C90C 8006BD0C 8C620000 */ lw $v0, ($v1) -/* 06C910 8006BD10 3C0E0D01 */ lui $t6, %hi(D_0D008DB8) # $t6, 0xd01 -/* 06C914 8006BD14 25CE8DB8 */ addiu $t6, %lo(D_0D008DB8) # addiu $t6, $t6, -0x7248 -/* 06C918 8006BD18 244F0008 */ addiu $t7, $v0, 8 -/* 06C91C 8006BD1C AC6F0000 */ sw $t7, ($v1) -/* 06C920 8006BD20 3C190600 */ lui $t9, 0x600 -/* 06C924 8006BD24 AC590000 */ sw $t9, ($v0) -/* 06C928 8006BD28 AC4E0004 */ sw $t6, 4($v0) -/* 06C92C 8006BD2C 8C620000 */ lw $v0, ($v1) -/* 06C930 8006BD30 3C19800E */ lui $t9, %hi(D_800E52D0) # $t9, 0x800e -/* 06C934 8006BD34 273952D0 */ addiu $t9, %lo(D_800E52D0) # addiu $t9, $t9, 0x52d0 -/* 06C938 8006BD38 24580008 */ addiu $t8, $v0, 8 -/* 06C93C 8006BD3C AC780000 */ sw $t8, ($v1) -/* 06C940 8006BD40 3C0FFD10 */ lui $t7, 0xfd10 -/* 06C944 8006BD44 AC4F0000 */ sw $t7, ($v0) -/* 06C948 8006BD48 AC590004 */ sw $t9, 4($v0) -/* 06C94C 8006BD4C 8C620000 */ lw $v0, ($v1) -/* 06C950 8006BD50 3C18E800 */ lui $t8, 0xe800 -/* 06C954 8006BD54 3C19F500 */ lui $t9, (0xF5000100 >> 16) # lui $t9, 0xf500 -/* 06C958 8006BD58 244E0008 */ addiu $t6, $v0, 8 -/* 06C95C 8006BD5C AC6E0000 */ sw $t6, ($v1) -/* 06C960 8006BD60 AC580000 */ sw $t8, ($v0) -/* 06C964 8006BD64 AC400004 */ sw $zero, 4($v0) -/* 06C968 8006BD68 8C620000 */ lw $v0, ($v1) -/* 06C96C 8006BD6C 3C0E0700 */ lui $t6, 0x700 -/* 06C970 8006BD70 37390100 */ ori $t9, (0xF5000100 & 0xFFFF) # ori $t9, $t9, 0x100 -/* 06C974 8006BD74 244F0008 */ addiu $t7, $v0, 8 -/* 06C978 8006BD78 AC6F0000 */ sw $t7, ($v1) -/* 06C97C 8006BD7C AC590000 */ sw $t9, ($v0) -/* 06C980 8006BD80 AC4E0004 */ sw $t6, 4($v0) -/* 06C984 8006BD84 8C620000 */ lw $v0, ($v1) -/* 06C988 8006BD88 3C0FE600 */ lui $t7, 0xe600 -/* 06C98C 8006BD8C 3C0EF000 */ lui $t6, 0xf000 -/* 06C990 8006BD90 24580008 */ addiu $t8, $v0, 8 -/* 06C994 8006BD94 AC780000 */ sw $t8, ($v1) -/* 06C998 8006BD98 AC4F0000 */ sw $t7, ($v0) -/* 06C99C 8006BD9C AC400004 */ sw $zero, 4($v0) -/* 06C9A0 8006BDA0 8C620000 */ lw $v0, ($v1) -/* 06C9A4 8006BDA4 3C18073F */ lui $t8, (0x073FC000 >> 16) # lui $t8, 0x73f -/* 06C9A8 8006BDA8 3718C000 */ ori $t8, (0x073FC000 & 0xFFFF) # ori $t8, $t8, 0xc000 -/* 06C9AC 8006BDAC 24590008 */ addiu $t9, $v0, 8 -/* 06C9B0 8006BDB0 AC790000 */ sw $t9, ($v1) -/* 06C9B4 8006BDB4 AC4E0000 */ sw $t6, ($v0) -/* 06C9B8 8006BDB8 AC580004 */ sw $t8, 4($v0) -/* 06C9BC 8006BDBC 8C620000 */ lw $v0, ($v1) -/* 06C9C0 8006BDC0 3C19E700 */ lui $t9, 0xe700 -/* 06C9C4 8006BDC4 244F0008 */ addiu $t7, $v0, 8 -/* 06C9C8 8006BDC8 AC6F0000 */ sw $t7, ($v1) -/* 06C9CC 8006BDCC AFA20084 */ sw $v0, 0x84($sp) -/* 06C9D0 8006BDD0 AC590000 */ sw $t9, ($v0) -/* 06C9D4 8006BDD4 8FB80084 */ lw $t8, 0x84($sp) -/* 06C9D8 8006BDD8 3C19BA00 */ lui $t9, (0xBA000E02 >> 16) # lui $t9, 0xba00 -/* 06C9DC 8006BDDC 37390E02 */ ori $t9, (0xBA000E02 & 0xFFFF) # ori $t9, $t9, 0xe02 -/* 06C9E0 8006BDE0 AF000004 */ sw $zero, 4($t8) -/* 06C9E4 8006BDE4 8C620000 */ lw $v0, ($v1) -/* 06C9E8 8006BDE8 34188000 */ li $t8, 32768 -/* 06C9EC 8006BDEC 244F0008 */ addiu $t7, $v0, 8 -/* 06C9F0 8006BDF0 AC6F0000 */ sw $t7, ($v1) -/* 06C9F4 8006BDF4 AFA20080 */ sw $v0, 0x80($sp) -/* 06C9F8 8006BDF8 AC590000 */ sw $t9, ($v0) -/* 06C9FC 8006BDFC 8FAF0080 */ lw $t7, 0x80($sp) -/* 06CA00 8006BE00 ADF80004 */ sw $t8, 4($t7) -/* 06CA04 8006BE04 87AE00E6 */ lh $t6, 0xe6($sp) -/* 06CA08 8006BE08 87B900E8 */ lh $t9, 0xe8($sp) -/* 06CA0C 8006BE0C 241800D8 */ li $t8, 216 -/* 06CA10 8006BE10 AFB80018 */ sw $t8, 0x18($sp) -/* 06CA14 8006BE14 87A700EA */ lh $a3, 0xea($sp) -/* 06CA18 8006BE18 87A600EC */ lh $a2, 0xec($sp) -/* 06CA1C 8006BE1C 87A500EE */ lh $a1, 0xee($sp) -/* 06CA20 8006BE20 87A400F0 */ lh $a0, 0xf0($sp) -/* 06CA24 8006BE24 AFAE0014 */ sw $t6, 0x14($sp) -/* 06CA28 8006BE28 0C012D85 */ jal func_8004B614 -/* 06CA2C 8006BE2C AFB90010 */ sw $t9, 0x10($sp) -/* 06CA30 8006BE30 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 06CA34 8006BE34 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 06CA38 8006BE38 8C620000 */ lw $v0, ($v1) -/* 06CA3C 8006BE3C 3C19B900 */ lui $t9, (0xB900031D >> 16) # lui $t9, 0xb900 -/* 06CA40 8006BE40 3C0E0050 */ lui $t6, (0x00505978 >> 16) # lui $t6, 0x50 -/* 06CA44 8006BE44 244F0008 */ addiu $t7, $v0, 8 -/* 06CA48 8006BE48 AC6F0000 */ sw $t7, ($v1) -/* 06CA4C 8006BE4C 35CE5978 */ ori $t6, (0x00505978 & 0xFFFF) # ori $t6, $t6, 0x5978 -/* 06CA50 8006BE50 3739031D */ ori $t9, (0xB900031D & 0xFFFF) # ori $t9, $t9, 0x31d -/* 06CA54 8006BE54 AC590000 */ sw $t9, ($v0) -/* 06CA58 8006BE58 AC4E0004 */ sw $t6, 4($v0) -/* 06CA5C 8006BE5C 8C620000 */ lw $v0, ($v1) -/* 06CA60 8006BE60 3C0FFD50 */ lui $t7, 0xfd50 -/* 06CA64 8006BE64 3C198019 */ lui $t9, %hi(D_8018D4BC) # $t9, 0x8019 -/* 06CA68 8006BE68 24580008 */ addiu $t8, $v0, 8 -/* 06CA6C 8006BE6C AC780000 */ sw $t8, ($v1) -/* 06CA70 8006BE70 AC4F0000 */ sw $t7, ($v0) -/* 06CA74 8006BE74 8F39D4BC */ lw $t9, %lo(D_8018D4BC)($t9) -/* 06CA78 8006BE78 3C0F0708 */ lui $t7, (0x07080200 >> 16) # lui $t7, 0x708 -/* 06CA7C 8006BE7C 35EF0200 */ ori $t7, (0x07080200 & 0xFFFF) # ori $t7, $t7, 0x200 -/* 06CA80 8006BE80 AC590004 */ sw $t9, 4($v0) -/* 06CA84 8006BE84 8C620000 */ lw $v0, ($v1) -/* 06CA88 8006BE88 3C18F550 */ lui $t8, 0xf550 -/* 06CA8C 8006BE8C 3C1F0D01 */ lui $ra, %hi(D_0D008C78) # $ra, 0xd01 -/* 06CA90 8006BE90 244E0008 */ addiu $t6, $v0, 8 -/* 06CA94 8006BE94 AC6E0000 */ sw $t6, ($v1) -/* 06CA98 8006BE98 AC4F0004 */ sw $t7, 4($v0) -/* 06CA9C 8006BE9C AC580000 */ sw $t8, ($v0) -/* 06CAA0 8006BEA0 8C620000 */ lw $v0, ($v1) -/* 06CAA4 8006BEA4 3C0EE600 */ lui $t6, 0xe600 -/* 06CAA8 8006BEA8 3C0FF300 */ lui $t7, 0xf300 -/* 06CAAC 8006BEAC 24590008 */ addiu $t9, $v0, 8 -/* 06CAB0 8006BEB0 AC790000 */ sw $t9, ($v1) -/* 06CAB4 8006BEB4 AC400004 */ sw $zero, 4($v0) -/* 06CAB8 8006BEB8 AC4E0000 */ sw $t6, ($v0) -/* 06CABC 8006BEBC 8C620000 */ lw $v0, ($v1) -/* 06CAC0 8006BEC0 3C19073F */ lui $t9, (0x073FF100 >> 16) # lui $t9, 0x73f -/* 06CAC4 8006BEC4 3739F100 */ ori $t9, (0x073FF100 & 0xFFFF) # ori $t9, $t9, 0xf100 -/* 06CAC8 8006BEC8 24580008 */ addiu $t8, $v0, 8 -/* 06CACC 8006BECC AC780000 */ sw $t8, ($v1) -/* 06CAD0 8006BED0 AC590004 */ sw $t9, 4($v0) -/* 06CAD4 8006BED4 AC4F0000 */ sw $t7, ($v0) -/* 06CAD8 8006BED8 8C620000 */ lw $v0, ($v1) -/* 06CADC 8006BEDC 3C18E700 */ lui $t8, 0xe700 -/* 06CAE0 8006BEE0 3C19F548 */ lui $t9, (0xF5481000 >> 16) # lui $t9, 0xf548 -/* 06CAE4 8006BEE4 244E0008 */ addiu $t6, $v0, 8 -/* 06CAE8 8006BEE8 AC6E0000 */ sw $t6, ($v1) -/* 06CAEC 8006BEEC AC400004 */ sw $zero, 4($v0) -/* 06CAF0 8006BEF0 AC580000 */ sw $t8, ($v0) -/* 06CAF4 8006BEF4 8C620000 */ lw $v0, ($v1) -/* 06CAF8 8006BEF8 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 -/* 06CAFC 8006BEFC 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 06CB00 8006BF00 244F0008 */ addiu $t7, $v0, 8 -/* 06CB04 8006BF04 AC6F0000 */ sw $t7, ($v1) -/* 06CB08 8006BF08 37391000 */ ori $t9, (0xF5481000 & 0xFFFF) # ori $t9, $t9, 0x1000 -/* 06CB0C 8006BF0C AC590000 */ sw $t9, ($v0) -/* 06CB10 8006BF10 AC4E0004 */ sw $t6, 4($v0) -/* 06CB14 8006BF14 8C620000 */ lw $v0, ($v1) -/* 06CB18 8006BF18 3C19000F */ lui $t9, (0x000FC07C >> 16) # lui $t9, 0xf -/* 06CB1C 8006BF1C 3739C07C */ ori $t9, (0x000FC07C & 0xFFFF) # ori $t9, $t9, 0xc07c -/* 06CB20 8006BF20 24580008 */ addiu $t8, $v0, 8 -/* 06CB24 8006BF24 AC780000 */ sw $t8, ($v1) -/* 06CB28 8006BF28 3C0FF200 */ lui $t7, 0xf200 -/* 06CB2C 8006BF2C AC4F0000 */ sw $t7, ($v0) -/* 06CB30 8006BF30 AC590004 */ sw $t9, 4($v0) -/* 06CB34 8006BF34 8C620000 */ lw $v0, ($v1) -/* 06CB38 8006BF38 3C0F800E */ lui $t7, %hi(D_800E5250) # $t7, 0x800e -/* 06CB3C 8006BF3C 3C180400 */ lui $t8, (0x0400103F >> 16) # lui $t8, 0x400 -/* 06CB40 8006BF40 244E0008 */ addiu $t6, $v0, 8 -/* 06CB44 8006BF44 AC6E0000 */ sw $t6, ($v1) -/* 06CB48 8006BF48 3718103F */ ori $t8, (0x0400103F & 0xFFFF) # ori $t8, $t8, 0x103f -/* 06CB4C 8006BF4C 25EF5250 */ addiu $t7, %lo(D_800E5250) # addiu $t7, $t7, 0x5250 -/* 06CB50 8006BF50 AC4F0004 */ sw $t7, 4($v0) -/* 06CB54 8006BF54 AC580000 */ sw $t8, ($v0) -/* 06CB58 8006BF58 8C620000 */ lw $v0, ($v1) -/* 06CB5C 8006BF5C 3C0E0600 */ lui $t6, 0x600 -/* 06CB60 8006BF60 27FF8C78 */ addiu $ra, %lo(D_0D008C78) # addiu $ra, $ra, -0x7388 -/* 06CB64 8006BF64 24590008 */ addiu $t9, $v0, 8 -/* 06CB68 8006BF68 AC790000 */ sw $t9, ($v1) -/* 06CB6C 8006BF6C AC5F0004 */ sw $ra, 4($v0) -/* 06CB70 8006BF70 AC4E0000 */ sw $t6, ($v0) -/* 06CB74 8006BF74 8C620000 */ lw $v0, ($v1) -/* 06CB78 8006BF78 3C0FFD50 */ lui $t7, 0xfd50 -/* 06CB7C 8006BF7C 3C198019 */ lui $t9, %hi(D_8018D4C0) # $t9, 0x8019 -/* 06CB80 8006BF80 24580008 */ addiu $t8, $v0, 8 -/* 06CB84 8006BF84 AC780000 */ sw $t8, ($v1) -/* 06CB88 8006BF88 AC4F0000 */ sw $t7, ($v0) -/* 06CB8C 8006BF8C 8F39D4C0 */ lw $t9, %lo(D_8018D4C0)($t9) -/* 06CB90 8006BF90 3C0FF550 */ lui $t7, 0xf550 -/* 06CB94 8006BF94 272EFFC0 */ addiu $t6, $t9, -0x40 -/* 06CB98 8006BF98 AC4E0004 */ sw $t6, 4($v0) -/* 06CB9C 8006BF9C 8C620000 */ lw $v0, ($v1) -/* 06CBA0 8006BFA0 3C190708 */ lui $t9, (0x07080200 >> 16) # lui $t9, 0x708 -/* 06CBA4 8006BFA4 37390200 */ ori $t9, (0x07080200 & 0xFFFF) # ori $t9, $t9, 0x200 -/* 06CBA8 8006BFA8 24580008 */ addiu $t8, $v0, 8 -/* 06CBAC 8006BFAC AC780000 */ sw $t8, ($v1) -/* 06CBB0 8006BFB0 AC590004 */ sw $t9, 4($v0) -/* 06CBB4 8006BFB4 AC4F0000 */ sw $t7, ($v0) -/* 06CBB8 8006BFB8 8C620000 */ lw $v0, ($v1) -/* 06CBBC 8006BFBC 3C18E600 */ lui $t8, 0xe600 -/* 06CBC0 8006BFC0 3C19F300 */ lui $t9, 0xf300 -/* 06CBC4 8006BFC4 244E0008 */ addiu $t6, $v0, 8 -/* 06CBC8 8006BFC8 AC6E0000 */ sw $t6, ($v1) -/* 06CBCC 8006BFCC AC400004 */ sw $zero, 4($v0) -/* 06CBD0 8006BFD0 AC580000 */ sw $t8, ($v0) -/* 06CBD4 8006BFD4 8C620000 */ lw $v0, ($v1) -/* 06CBD8 8006BFD8 3C0E073F */ lui $t6, (0x073FF100 >> 16) # lui $t6, 0x73f -/* 06CBDC 8006BFDC 35CEF100 */ ori $t6, (0x073FF100 & 0xFFFF) # ori $t6, $t6, 0xf100 -/* 06CBE0 8006BFE0 244F0008 */ addiu $t7, $v0, 8 -/* 06CBE4 8006BFE4 AC6F0000 */ sw $t7, ($v1) -/* 06CBE8 8006BFE8 AC4E0004 */ sw $t6, 4($v0) -/* 06CBEC 8006BFEC AC590000 */ sw $t9, ($v0) -/* 06CBF0 8006BFF0 8C620000 */ lw $v0, ($v1) -/* 06CBF4 8006BFF4 3C0FE700 */ lui $t7, 0xe700 -/* 06CBF8 8006BFF8 3C0EF548 */ lui $t6, (0xF5481000 >> 16) # lui $t6, 0xf548 -/* 06CBFC 8006BFFC 24580008 */ addiu $t8, $v0, 8 -/* 06CC00 8006C000 AC780000 */ sw $t8, ($v1) -/* 06CC04 8006C004 AC400004 */ sw $zero, 4($v0) -/* 06CC08 8006C008 AC4F0000 */ sw $t7, ($v0) -/* 06CC0C 8006C00C 8C620000 */ lw $v0, ($v1) -/* 06CC10 8006C010 3C180008 */ lui $t8, (0x00080200 >> 16) # lui $t8, 8 -/* 06CC14 8006C014 37180200 */ ori $t8, (0x00080200 & 0xFFFF) # ori $t8, $t8, 0x200 -/* 06CC18 8006C018 24590008 */ addiu $t9, $v0, 8 -/* 06CC1C 8006C01C AC790000 */ sw $t9, ($v1) -/* 06CC20 8006C020 35CE1000 */ ori $t6, (0xF5481000 & 0xFFFF) # ori $t6, $t6, 0x1000 -/* 06CC24 8006C024 AC4E0000 */ sw $t6, ($v0) -/* 06CC28 8006C028 AC580004 */ sw $t8, 4($v0) -/* 06CC2C 8006C02C 8C620000 */ lw $v0, ($v1) -/* 06CC30 8006C030 3C0E000F */ lui $t6, (0x000FC07C >> 16) # lui $t6, 0xf -/* 06CC34 8006C034 35CEC07C */ ori $t6, (0x000FC07C & 0xFFFF) # ori $t6, $t6, 0xc07c -/* 06CC38 8006C038 244F0008 */ addiu $t7, $v0, 8 -/* 06CC3C 8006C03C AC6F0000 */ sw $t7, ($v1) -/* 06CC40 8006C040 3C19F200 */ lui $t9, 0xf200 -/* 06CC44 8006C044 AC590000 */ sw $t9, ($v0) -/* 06CC48 8006C048 AC4E0004 */ sw $t6, 4($v0) -/* 06CC4C 8006C04C 8C620000 */ lw $v0, ($v1) -/* 06CC50 8006C050 3C19800E */ lui $t9, %hi(D_800E5290) # $t9, 0x800e -/* 06CC54 8006C054 3C0F0400 */ lui $t7, (0x0400103F >> 16) # lui $t7, 0x400 -/* 06CC58 8006C058 24580008 */ addiu $t8, $v0, 8 -/* 06CC5C 8006C05C AC780000 */ sw $t8, ($v1) -/* 06CC60 8006C060 35EF103F */ ori $t7, (0x0400103F & 0xFFFF) # ori $t7, $t7, 0x103f -/* 06CC64 8006C064 27395290 */ addiu $t9, %lo(D_800E5290) # addiu $t9, $t9, 0x5290 -/* 06CC68 8006C068 AC590004 */ sw $t9, 4($v0) -/* 06CC6C 8006C06C AC4F0000 */ sw $t7, ($v0) -/* 06CC70 8006C070 8C620000 */ lw $v0, ($v1) -/* 06CC74 8006C074 3C180600 */ lui $t8, 0x600 -/* 06CC78 8006C078 3C19BB00 */ lui $t9, 0xbb00 -/* 06CC7C 8006C07C 244E0008 */ addiu $t6, $v0, 8 -/* 06CC80 8006C080 AC6E0000 */ sw $t6, ($v1) -/* 06CC84 8006C084 AC5F0004 */ sw $ra, 4($v0) -/* 06CC88 8006C088 AC580000 */ sw $t8, ($v0) -/* 06CC8C 8006C08C 8C620000 */ lw $v0, ($v1) -/* 06CC90 8006C090 3C0E0001 */ lui $t6, (0x00010001 >> 16) # lui $t6, 1 -/* 06CC94 8006C094 35CE0001 */ ori $t6, (0x00010001 & 0xFFFF) # ori $t6, $t6, 1 -/* 06CC98 8006C098 244F0008 */ addiu $t7, $v0, 8 -/* 06CC9C 8006C09C AC6F0000 */ sw $t7, ($v1) -/* 06CCA0 8006C0A0 AC4E0004 */ sw $t6, 4($v0) -/* 06CCA4 8006C0A4 AC590000 */ sw $t9, ($v0) -/* 06CCA8 8006C0A8 3C028016 */ lui $v0, %hi(gMatrixEffectCount) # $v0, 0x8016 -/* 06CCAC 8006C0AC 24424AF0 */ addiu $v0, %lo(gMatrixEffectCount) # addiu $v0, $v0, 0x4af0 -/* 06CCB0 8006C0B0 84580000 */ lh $t8, ($v0) -/* 06CCB4 8006C0B4 8FBF0024 */ lw $ra, 0x24($sp) -/* 06CCB8 8006C0B8 27BD0148 */ addiu $sp, $sp, 0x148 -/* 06CCBC 8006C0BC 270F0001 */ addiu $t7, $t8, 1 -/* 06CCC0 8006C0C0 03E00008 */ jr $ra -/* 06CCC4 8006C0C4 A44F0000 */ sh $t7, ($v0) diff --git a/asm/non_matchings/hud_renderer/func_8004E78C.s b/asm/non_matchings/hud_renderer/func_8004E78C.s deleted file mode 100644 index 76a3febc9..000000000 --- a/asm/non_matchings/hud_renderer/func_8004E78C.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8004E78C -/* 04F38C 8004E78C 00047140 */ sll $t6, $a0, 5 -/* 04F390 8004E790 01C47021 */ addu $t6, $t6, $a0 -/* 04F394 8004E794 3C0F8019 */ lui $t7, %hi(D_8018CA70) # $t7, 0x8019 -/* 04F398 8004E798 25EFCA70 */ addiu $t7, %lo(D_8018CA70) # addiu $t7, $t7, -0x3590 -/* 04F39C 8004E79C 000E7080 */ sll $t6, $t6, 2 -/* 04F3A0 8004E7A0 01CF1021 */ addu $v0, $t6, $t7 -/* 04F3A4 8004E7A4 84450060 */ lh $a1, 0x60($v0) -/* 04F3A8 8004E7A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 04F3AC 8004E7AC AFBF0014 */ sw $ra, 0x14($sp) -/* 04F3B0 8004E7B0 3C060D01 */ lui $a2, %hi(D_0D00A958) # $a2, 0xd01 -/* 04F3B4 8004E7B4 24C6A958 */ addiu $a2, %lo(D_0D00A958) # addiu $a2, $a2, -0x56a8 -/* 04F3B8 8004E7B8 AFA2001C */ sw $v0, 0x1c($sp) -/* 04F3BC 8004E7BC 8444005A */ lh $a0, 0x5a($v0) -/* 04F3C0 8004E7C0 0C0132D8 */ jal func_8004CB60 -/* 04F3C4 8004E7C4 24A50003 */ addiu $a1, $a1, 3 -/* 04F3C8 8004E7C8 8FA2001C */ lw $v0, 0x1c($sp) -/* 04F3CC 8004E7CC 3C06800E */ lui $a2, %hi(D_800E4570) # 0x800e -/* 04F3D0 8004E7D0 80580072 */ lb $t8, 0x72($v0) -/* 04F3D4 8004E7D4 8444005A */ lh $a0, 0x5a($v0) -/* 04F3D8 8004E7D8 84450060 */ lh $a1, 0x60($v0) -/* 04F3DC 8004E7DC 0018C880 */ sll $t9, $t8, 2 -/* 04F3E0 8004E7E0 00D93021 */ addu $a2, $a2, $t9 -/* 04F3E4 8004E7E4 8CC64570 */ lw $a2, %lo(D_800E4570)($a2) # 0x4570($a2) -/* 04F3E8 8004E7E8 0C0132E4 */ jal func_8004CB90 -/* 04F3EC 8004E7EC 2484001C */ addiu $a0, $a0, 0x1c -/* 04F3F0 8004E7F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 04F3F4 8004E7F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 04F3F8 8004E7F8 03E00008 */ jr $ra -/* 04F3FC 8004E7FC 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8004EB38.s b/asm/non_matchings/hud_renderer/func_8004EB38.s deleted file mode 100644 index 2fa988007..000000000 --- a/asm/non_matchings/hud_renderer/func_8004EB38.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel func_8004EB38 -/* 04F738 8004EB38 00047140 */ sll $t6, $a0, 5 -/* 04F73C 8004EB3C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 04F740 8004EB40 01C47021 */ addu $t6, $t6, $a0 -/* 04F744 8004EB44 3C0F8019 */ lui $t7, %hi(D_8018CA70) # $t7, 0x8019 -/* 04F748 8004EB48 AFB00028 */ sw $s0, 0x28($sp) -/* 04F74C 8004EB4C 25EFCA70 */ addiu $t7, %lo(D_8018CA70) # addiu $t7, $t7, -0x3590 -/* 04F750 8004EB50 000E7080 */ sll $t6, $t6, 2 -/* 04F754 8004EB54 01CF8021 */ addu $s0, $t6, $t7 -/* 04F758 8004EB58 9218007B */ lbu $t8, 0x7b($s0) -/* 04F75C 8004EB5C AFBF002C */ sw $ra, 0x2c($sp) -/* 04F760 8004EB60 24060080 */ li $a2, 128 -/* 04F764 8004EB64 13000014 */ beqz $t8, .L8004EBB8 -/* 04F768 8004EB68 3C070D01 */ lui $a3, %hi(D_0D00C158) # $a3, 0xd01 -/* 04F76C 8004EB6C 86040050 */ lh $a0, 0x50($s0) -/* 04F770 8004EB70 86050058 */ lh $a1, 0x58($s0) -/* 04F774 8004EB74 24190020 */ li $t9, 32 -/* 04F778 8004EB78 24080010 */ li $t0, 16 -/* 04F77C 8004EB7C 24090020 */ li $t1, 32 -/* 04F780 8004EB80 240A0010 */ li $t2, 16 -/* 04F784 8004EB84 AFAA001C */ sw $t2, 0x1c($sp) -/* 04F788 8004EB88 AFA90018 */ sw $t1, 0x18($sp) -/* 04F78C 8004EB8C AFA80014 */ sw $t0, 0x14($sp) -/* 04F790 8004EB90 AFB90010 */ sw $t9, 0x10($sp) -/* 04F794 8004EB94 24E7C158 */ addiu $a3, %lo(D_0D00C158) # addiu $a3, $a3, -0x3ea8 -/* 04F798 8004EB98 2484FFED */ addiu $a0, $a0, -0x13 -/* 04F79C 8004EB9C 0C013276 */ jal func_8004C9D8 -/* 04F7A0 8004EBA0 24A50008 */ addiu $a1, $a1, 8 -/* 04F7A4 8004EBA4 86040050 */ lh $a0, 0x50($s0) -/* 04F7A8 8004EBA8 86050058 */ lh $a1, 0x58($s0) -/* 04F7AC 8004EBAC 24060080 */ li $a2, 128 -/* 04F7B0 8004EBB0 0C013E54 */ jal func_8004F950 -/* 04F7B4 8004EBB4 8E070008 */ lw $a3, 8($s0) -.L8004EBB8: -/* 04F7B8 8004EBB8 920B007C */ lbu $t3, 0x7c($s0) -/* 04F7BC 8004EBBC 3C070D01 */ lui $a3, %hi(D_0D00C158) # $a3, 0xd01 -/* 04F7C0 8004EBC0 24E7C158 */ addiu $a3, %lo(D_0D00C158) # addiu $a3, $a3, -0x3ea8 -/* 04F7C4 8004EBC4 11600013 */ beqz $t3, .L8004EC14 -/* 04F7C8 8004EBC8 24060050 */ li $a2, 80 -/* 04F7CC 8004EBCC 86040052 */ lh $a0, 0x52($s0) -/* 04F7D0 8004EBD0 86050058 */ lh $a1, 0x58($s0) -/* 04F7D4 8004EBD4 240C0020 */ li $t4, 32 -/* 04F7D8 8004EBD8 240D0010 */ li $t5, 16 -/* 04F7DC 8004EBDC 240E0020 */ li $t6, 32 -/* 04F7E0 8004EBE0 240F0010 */ li $t7, 16 -/* 04F7E4 8004EBE4 AFAF001C */ sw $t7, 0x1c($sp) -/* 04F7E8 8004EBE8 AFAE0018 */ sw $t6, 0x18($sp) -/* 04F7EC 8004EBEC AFAD0014 */ sw $t5, 0x14($sp) -/* 04F7F0 8004EBF0 AFAC0010 */ sw $t4, 0x10($sp) -/* 04F7F4 8004EBF4 2484FFED */ addiu $a0, $a0, -0x13 -/* 04F7F8 8004EBF8 0C013276 */ jal func_8004C9D8 -/* 04F7FC 8004EBFC 24A50008 */ addiu $a1, $a1, 8 -/* 04F800 8004EC00 86040052 */ lh $a0, 0x52($s0) -/* 04F804 8004EC04 86050058 */ lh $a1, 0x58($s0) -/* 04F808 8004EC08 24060050 */ li $a2, 80 -/* 04F80C 8004EC0C 0C013E54 */ jal func_8004F950 -/* 04F810 8004EC10 8E070008 */ lw $a3, 8($s0) -.L8004EC14: -/* 04F814 8004EC14 9218007E */ lbu $t8, 0x7e($s0) -/* 04F818 8004EC18 3C070D01 */ lui $a3, %hi(D_0D00A958) # $a3, 0xd01 -/* 04F81C 8004EC1C 24E7A958 */ addiu $a3, %lo(D_0D00A958) # addiu $a3, $a3, -0x56a8 -/* 04F820 8004EC20 1300001F */ beqz $t8, .L8004ECA0 -/* 04F824 8004EC24 24060080 */ li $a2, 128 -/* 04F828 8004EC28 86050060 */ lh $a1, 0x60($s0) -/* 04F82C 8004EC2C 24190020 */ li $t9, 32 -/* 04F830 8004EC30 24080008 */ li $t0, 8 -/* 04F834 8004EC34 24090020 */ li $t1, 32 -/* 04F838 8004EC38 240A0008 */ li $t2, 8 -/* 04F83C 8004EC3C AFAA001C */ sw $t2, 0x1c($sp) -/* 04F840 8004EC40 AFA90018 */ sw $t1, 0x18($sp) -/* 04F844 8004EC44 AFA80014 */ sw $t0, 0x14($sp) -/* 04F848 8004EC48 AFB90010 */ sw $t9, 0x10($sp) -/* 04F84C 8004EC4C 8604005C */ lh $a0, 0x5c($s0) -/* 04F850 8004EC50 0C013276 */ jal func_8004C9D8 -/* 04F854 8004EC54 24A50003 */ addiu $a1, $a1, 3 -/* 04F858 8004EC58 820B0072 */ lb $t3, 0x72($s0) -/* 04F85C 8004EC5C 8604005C */ lh $a0, 0x5c($s0) -/* 04F860 8004EC60 3C07800E */ lui $a3, %hi(D_800E4570) # 0x800e -/* 04F864 8004EC64 000B6080 */ sll $t4, $t3, 2 -/* 04F868 8004EC68 00EC3821 */ addu $a3, $a3, $t4 -/* 04F86C 8004EC6C 240D0020 */ li $t5, 32 -/* 04F870 8004EC70 240E0010 */ li $t6, 16 -/* 04F874 8004EC74 240F0020 */ li $t7, 32 -/* 04F878 8004EC78 24180010 */ li $t8, 16 -/* 04F87C 8004EC7C AFB8001C */ sw $t8, 0x1c($sp) -/* 04F880 8004EC80 AFAF0018 */ sw $t7, 0x18($sp) -/* 04F884 8004EC84 AFAE0014 */ sw $t6, 0x14($sp) -/* 04F888 8004EC88 AFAD0010 */ sw $t5, 0x10($sp) -/* 04F88C 8004EC8C 8CE74570 */ lw $a3, %lo(D_800E4570)($a3) # 0x4570($a3) -/* 04F890 8004EC90 86050060 */ lh $a1, 0x60($s0) -/* 04F894 8004EC94 24060080 */ li $a2, 128 -/* 04F898 8004EC98 0C013276 */ jal func_8004C9D8 -/* 04F89C 8004EC9C 2484001C */ addiu $a0, $a0, 0x1c -.L8004ECA0: -/* 04F8A0 8004ECA0 9219007F */ lbu $t9, 0x7f($s0) -/* 04F8A4 8004ECA4 3C070D01 */ lui $a3, %hi(D_0D00A958) # $a3, 0xd01 -/* 04F8A8 8004ECA8 24E7A958 */ addiu $a3, %lo(D_0D00A958) # addiu $a3, $a3, -0x56a8 -/* 04F8AC 8004ECAC 1320001F */ beqz $t9, .L8004ED2C -/* 04F8B0 8004ECB0 24060050 */ li $a2, 80 -/* 04F8B4 8004ECB4 86050060 */ lh $a1, 0x60($s0) -/* 04F8B8 8004ECB8 24080020 */ li $t0, 32 -/* 04F8BC 8004ECBC 24090008 */ li $t1, 8 -/* 04F8C0 8004ECC0 240A0020 */ li $t2, 32 -/* 04F8C4 8004ECC4 240B0008 */ li $t3, 8 -/* 04F8C8 8004ECC8 AFAB001C */ sw $t3, 0x1c($sp) -/* 04F8CC 8004ECCC AFAA0018 */ sw $t2, 0x18($sp) -/* 04F8D0 8004ECD0 AFA90014 */ sw $t1, 0x14($sp) -/* 04F8D4 8004ECD4 AFA80010 */ sw $t0, 0x10($sp) -/* 04F8D8 8004ECD8 8604005E */ lh $a0, 0x5e($s0) -/* 04F8DC 8004ECDC 0C013276 */ jal func_8004C9D8 -/* 04F8E0 8004ECE0 24A50003 */ addiu $a1, $a1, 3 -/* 04F8E4 8004ECE4 820C0072 */ lb $t4, 0x72($s0) -/* 04F8E8 8004ECE8 8604005E */ lh $a0, 0x5e($s0) -/* 04F8EC 8004ECEC 3C07800E */ lui $a3, %hi(D_800E4570) -/* 04F8F0 8004ECF0 000C6880 */ sll $t5, $t4, 2 -/* 04F8F4 8004ECF4 00ED3821 */ addu $a3, $a3, $t5 -/* 04F8F8 8004ECF8 240E0020 */ li $t6, 32 -/* 04F8FC 8004ECFC 240F0010 */ li $t7, 16 -/* 04F900 8004ED00 24180020 */ li $t8, 32 -/* 04F904 8004ED04 24190010 */ li $t9, 16 -/* 04F908 8004ED08 AFB9001C */ sw $t9, 0x1c($sp) -/* 04F90C 8004ED0C AFB80018 */ sw $t8, 0x18($sp) -/* 04F910 8004ED10 AFAF0014 */ sw $t7, 0x14($sp) -/* 04F914 8004ED14 AFAE0010 */ sw $t6, 0x10($sp) -/* 04F918 8004ED18 8CE74570 */ lw $a3, %lo(D_800E4570)($a3) -/* 04F91C 8004ED1C 86050060 */ lh $a1, 0x60($s0) -/* 04F920 8004ED20 24060050 */ li $a2, 80 -/* 04F924 8004ED24 0C013276 */ jal func_8004C9D8 -/* 04F928 8004ED28 2484001C */ addiu $a0, $a0, 0x1c -.L8004ED2C: -/* 04F92C 8004ED2C 8FBF002C */ lw $ra, 0x2c($sp) -/* 04F930 8004ED30 8FB00028 */ lw $s0, 0x28($sp) -/* 04F934 8004ED34 27BD0030 */ addiu $sp, $sp, 0x30 -/* 04F938 8004ED38 03E00008 */ jr $ra -/* 04F93C 8004ED3C 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8005217C.s b/asm/non_matchings/hud_renderer/func_8005217C.s index b9b033f6a..e7d017f0e 100644 --- a/asm/non_matchings/hud_renderer/func_8005217C.s +++ b/asm/non_matchings/hud_renderer/func_8005217C.s @@ -39,12 +39,12 @@ glabel func_8005217C /* 052E10 80052210 AC4E0004 */ sw $t6, 4($v0) /* 052E14 80052214 AC5F0000 */ sw $ra, ($v0) /* 052E18 80052218 8C620000 */ lw $v0, ($v1) -/* 052E1C 8005221C 3C19800E */ lui $t9, %hi(D_800E45C8) # $t9, 0x800e +/* 052E1C 8005221C 3C19800E */ lui $t9, %hi(D_800E45C0 + 0x8) # $t9, 0x800e /* 052E20 80052220 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 /* 052E24 80052224 244F0008 */ addiu $t7, $v0, 8 /* 052E28 80052228 AC6F0000 */ sw $t7, ($v1) /* 052E2C 8005222C 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052E30 80052230 273945C8 */ addiu $t9, %lo(D_800E45C8) # addiu $t9, $t9, 0x45c8 +/* 052E30 80052230 273945C8 */ addiu $t9, %lo(D_800E45C0 + 0x8) # addiu $t9, $t9, 0x45c8 /* 052E34 80052234 AC590004 */ sw $t9, 4($v0) /* 052E38 80052238 AC580000 */ sw $t8, ($v0) /* 052E3C 8005223C 8C620000 */ lw $v0, ($v1) @@ -64,12 +64,12 @@ glabel func_8005217C /* 052E74 80052274 AC4E0004 */ sw $t6, 4($v0) /* 052E78 80052278 AC5F0000 */ sw $ra, ($v0) /* 052E7C 8005227C 8C620000 */ lw $v0, ($v1) -/* 052E80 80052280 3C19800E */ lui $t9, %hi(D_800E45E0) # $t9, 0x800e +/* 052E80 80052280 3C19800E */ lui $t9, %hi(D_800E45D8 + 0x8) # $t9, 0x800e /* 052E84 80052284 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 /* 052E88 80052288 244F0008 */ addiu $t7, $v0, 8 /* 052E8C 8005228C AC6F0000 */ sw $t7, ($v1) /* 052E90 80052290 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052E94 80052294 273945E0 */ addiu $t9, %lo(D_800E45E0) # addiu $t9, $t9, 0x45e0 +/* 052E94 80052294 273945E0 */ addiu $t9, %lo(D_800E45D8 + 0x8) # addiu $t9, $t9, 0x45e0 /* 052E98 80052298 AC590004 */ sw $t9, 4($v0) /* 052E9C 8005229C AC580000 */ sw $t8, ($v0) /* 052EA0 800522A0 8C620000 */ lw $v0, ($v1) @@ -89,12 +89,12 @@ glabel func_8005217C /* 052ED8 800522D8 AC4E0004 */ sw $t6, 4($v0) /* 052EDC 800522DC AC5F0000 */ sw $ra, ($v0) /* 052EE0 800522E0 8C620000 */ lw $v0, ($v1) -/* 052EE4 800522E4 3C19800E */ lui $t9, %hi(D_800E45F8) # $t9, 0x800e +/* 052EE4 800522E4 3C19800E */ lui $t9, %hi(D_800E45F0 + 0x8) # $t9, 0x800e /* 052EE8 800522E8 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 /* 052EEC 800522EC 244F0008 */ addiu $t7, $v0, 8 /* 052EF0 800522F0 AC6F0000 */ sw $t7, ($v1) /* 052EF4 800522F4 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052EF8 800522F8 273945F8 */ addiu $t9, %lo(D_800E45F8) # addiu $t9, $t9, 0x45f8 +/* 052EF8 800522F8 273945F8 */ addiu $t9, %lo(D_800E45F0 + 0x8) # addiu $t9, $t9, 0x45f8 /* 052EFC 800522FC AC590004 */ sw $t9, 4($v0) /* 052F00 80052300 AC580000 */ sw $t8, ($v0) /* 052F04 80052304 8C620000 */ lw $v0, ($v1) @@ -114,12 +114,12 @@ glabel func_8005217C /* 052F3C 8005233C AC4E0004 */ sw $t6, 4($v0) /* 052F40 80052340 AC5F0000 */ sw $ra, ($v0) /* 052F44 80052344 8C620000 */ lw $v0, ($v1) -/* 052F48 80052348 3C19800E */ lui $t9, %hi(D_800E4610) # $t9, 0x800e +/* 052F48 80052348 3C19800E */ lui $t9, %hi(D_800E4608 + 0x8) # $t9, 0x800e /* 052F4C 8005234C 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 /* 052F50 80052350 244F0008 */ addiu $t7, $v0, 8 /* 052F54 80052354 AC6F0000 */ sw $t7, ($v1) /* 052F58 80052358 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052F5C 8005235C 27394610 */ addiu $t9, %lo(D_800E4610) # addiu $t9, $t9, 0x4610 +/* 052F5C 8005235C 27394610 */ addiu $t9, %lo(D_800E4608 + 0x8) # addiu $t9, $t9, 0x4610 /* 052F60 80052360 AC590004 */ sw $t9, 4($v0) /* 052F64 80052364 AC580000 */ sw $t8, ($v0) /* 052F68 80052368 8C620000 */ lw $v0, ($v1) diff --git a/asm/non_matchings/hud_renderer/func_800528EC.s b/asm/non_matchings/hud_renderer/func_800528EC.s index f33dd546d..f1dc7f627 100644 --- a/asm/non_matchings/hud_renderer/func_800528EC.s +++ b/asm/non_matchings/hud_renderer/func_800528EC.s @@ -41,12 +41,12 @@ glabel func_800528EC /* 053588 80052988 AC4E0004 */ sw $t6, 4($v0) /* 05358C 8005298C AC590000 */ sw $t9, ($v0) /* 053590 80052990 8E420000 */ lw $v0, ($s2) -/* 053594 80052994 3C19800E */ lui $t9, %hi(D_800E4628) # $t9, 0x800e +/* 053594 80052994 3C19800E */ lui $t9, %hi(D_800E4620 + 0x8) # $t9, 0x800e /* 053598 80052998 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 /* 05359C 8005299C 244F0008 */ addiu $t7, $v0, 8 /* 0535A0 800529A0 AE4F0000 */ sw $t7, ($s2) /* 0535A4 800529A4 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 0535A8 800529A8 27394628 */ addiu $t9, %lo(D_800E4628) # addiu $t9, $t9, 0x4628 +/* 0535A8 800529A8 27394628 */ addiu $t9, %lo(D_800E4620 + 0x8) # addiu $t9, $t9, 0x4628 /* 0535AC 800529AC AC590004 */ sw $t9, 4($v0) /* 0535B0 800529B0 AC580000 */ sw $t8, ($v0) /* 0535B4 800529B4 8E420000 */ lw $v0, ($s2) diff --git a/asm/non_matchings/hud_renderer/func_80052C60.s b/asm/non_matchings/hud_renderer/func_80052C60.s index 75eb364e2..df0c715f9 100644 --- a/asm/non_matchings/hud_renderer/func_80052C60.s +++ b/asm/non_matchings/hud_renderer/func_80052C60.s @@ -19,11 +19,11 @@ glabel func_80052C60 /* 0538A4 80052CA4 AFA40028 */ sw $a0, 0x28($sp) /* 0538A8 80052CA8 ACF90000 */ sw $t9, ($a3) /* 0538AC 80052CAC 3C090386 */ lui $t1, (0x03860010 >> 16) # lui $t1, 0x386 -/* 0538B0 80052CB0 3C0A800E */ lui $t2, %hi(D_800E4628) # $t2, 0x800e +/* 0538B0 80052CB0 3C0A800E */ lui $t2, %hi(D_800E4620 + 0x8) # $t2, 0x800e /* 0538B4 80052CB4 A0CE0010 */ sb $t6, 0x10($a2) /* 0538B8 80052CB8 A0CF0011 */ sb $t7, 0x11($a2) /* 0538BC 80052CBC A0D80012 */ sb $t8, 0x12($a2) -/* 0538C0 80052CC0 254A4628 */ addiu $t2, %lo(D_800E4628) # addiu $t2, $t2, 0x4628 +/* 0538C0 80052CC0 254A4628 */ addiu $t2, %lo(D_800E4620 + 0x8) # addiu $t2, $t2, 0x4628 /* 0538C4 80052CC4 35290010 */ ori $t1, (0x03860010 & 0xFFFF) # ori $t1, $t1, 0x10 /* 0538C8 80052CC8 AC490000 */ sw $t1, ($v0) /* 0538CC 80052CCC AC4A0004 */ sw $t2, 4($v0) diff --git a/asm/non_matchings/hud_renderer/func_80052E30.s b/asm/non_matchings/hud_renderer/func_80052E30.s index 5f3593cb3..f78d24e7c 100644 --- a/asm/non_matchings/hud_renderer/func_80052E30.s +++ b/asm/non_matchings/hud_renderer/func_80052E30.s @@ -17,11 +17,11 @@ glabel func_80052E30 /* 053A6C 80052E6C AFA40020 */ sw $a0, 0x20($sp) /* 053A70 80052E70 ACD90000 */ sw $t9, ($a2) /* 053A74 80052E74 3C090386 */ lui $t1, (0x03860010 >> 16) # lui $t1, 0x386 -/* 053A78 80052E78 3C0A800E */ lui $t2, %hi(D_800E4628) # $t2, 0x800e +/* 053A78 80052E78 3C0A800E */ lui $t2, %hi(D_800E4620 + 0x8) # $t2, 0x800e /* 053A7C 80052E7C A0AE0010 */ sb $t6, 0x10($a1) /* 053A80 80052E80 A0AF0011 */ sb $t7, 0x11($a1) /* 053A84 80052E84 A0B80012 */ sb $t8, 0x12($a1) -/* 053A88 80052E88 254A4628 */ addiu $t2, %lo(D_800E4628) # addiu $t2, $t2, 0x4628 +/* 053A88 80052E88 254A4628 */ addiu $t2, %lo(D_800E4620 + 0x8) # addiu $t2, $t2, 0x4628 /* 053A8C 80052E8C 35290010 */ ori $t1, (0x03860010 & 0xFFFF) # ori $t1, $t1, 0x10 /* 053A90 80052E90 AC490000 */ sw $t1, ($v0) /* 053A94 80052E94 AC4A0004 */ sw $t2, 4($v0) diff --git a/asm/non_matchings/hud_renderer/func_800534E8.s b/asm/non_matchings/hud_renderer/func_800534E8.s deleted file mode 100644 index a17e4b6a8..000000000 --- a/asm/non_matchings/hud_renderer/func_800534E8.s +++ /dev/null @@ -1,139 +0,0 @@ -.section .late_rodata - -glabel jpt_800EE068 -.word L80053520, L80053574, L800535C8, L8005361C -.word L80053670 - -.section .text - -glabel func_800534E8 -/* 0540E8 800534E8 000470C0 */ sll $t6, $a0, 3 -/* 0540EC 800534EC 01C47023 */ subu $t6, $t6, $a0 -/* 0540F0 800534F0 000E7140 */ sll $t6, $t6, 5 -/* 0540F4 800534F4 3C0F8016 */ lui $t7, %hi(D_80165CBC) # 0x8016 -/* 0540F8 800534F8 01EE7821 */ addu $t7, $t7, $t6 -/* 0540FC 800534FC 95EF5CBC */ lhu $t7, %lo(D_80165CBC)($t7) # 0x5cbc($t7) -/* 054100 80053500 2DE10005 */ sltiu $at, $t7, 5 -/* 054104 80053504 1020006E */ beqz $at, .L800536C0 -/* 054108 80053508 000F7880 */ sll $t7, $t7, 2 -/* 05410C 8005350C 3C01800F */ lui $at, %hi(jpt_800EE068) -/* 054110 80053510 002F0821 */ addu $at, $at, $t7 -/* 054114 80053514 8C2FE068 */ lw $t7, %lo(jpt_800EE068)($at) -/* 054118 80053518 01E00008 */ jr $t7 -/* 05411C 8005351C 00000000 */ nop -glabel L80053520 -/* 054120 80053520 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 054124 80053524 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 054128 80053528 8C620000 */ lw $v0, ($v1) -/* 05412C 8005352C 3C190386 */ lui $t9, (0x03860010 >> 16) # lui $t9, 0x386 -/* 054130 80053530 3C08800E */ lui $t0, %hi(D_800E4640) # $t0, 0x800e -/* 054134 80053534 24580008 */ addiu $t8, $v0, 8 -/* 054138 80053538 AC780000 */ sw $t8, ($v1) -/* 05413C 8005353C 25084640 */ addiu $t0, %lo(D_800E4640) # addiu $t0, $t0, 0x4640 -/* 054140 80053540 37390010 */ ori $t9, (0x03860010 & 0xFFFF) # ori $t9, $t9, 0x10 -/* 054144 80053544 AC590000 */ sw $t9, ($v0) -/* 054148 80053548 AC480004 */ sw $t0, 4($v0) -/* 05414C 8005354C 8C620000 */ lw $v0, ($v1) -/* 054150 80053550 3C0A0388 */ lui $t2, (0x03880010 >> 16) # lui $t2, 0x388 -/* 054154 80053554 3C0B800E */ lui $t3, %hi(D_800E4638) # $t3, 0x800e -/* 054158 80053558 24490008 */ addiu $t1, $v0, 8 -/* 05415C 8005355C AC690000 */ sw $t1, ($v1) -/* 054160 80053560 256B4638 */ addiu $t3, %lo(D_800E4638) # addiu $t3, $t3, 0x4638 -/* 054164 80053564 354A0010 */ ori $t2, (0x03880010 & 0xFFFF) # ori $t2, $t2, 0x10 -/* 054168 80053568 AC4A0000 */ sw $t2, ($v0) -/* 05416C 8005356C 03E00008 */ jr $ra -/* 054170 80053570 AC4B0004 */ sw $t3, 4($v0) - -glabel L80053574 -/* 054174 80053574 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 054178 80053578 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 05417C 8005357C 8C620000 */ lw $v0, ($v1) -/* 054180 80053580 3C0D0386 */ lui $t5, (0x03860010 >> 16) # lui $t5, 0x386 -/* 054184 80053584 3C0E800E */ lui $t6, %hi(D_800E4658) # $t6, 0x800e -/* 054188 80053588 244C0008 */ addiu $t4, $v0, 8 -/* 05418C 8005358C AC6C0000 */ sw $t4, ($v1) -/* 054190 80053590 25CE4658 */ addiu $t6, %lo(D_800E4658) # addiu $t6, $t6, 0x4658 -/* 054194 80053594 35AD0010 */ ori $t5, (0x03860010 & 0xFFFF) # ori $t5, $t5, 0x10 -/* 054198 80053598 AC4D0000 */ sw $t5, ($v0) -/* 05419C 8005359C AC4E0004 */ sw $t6, 4($v0) -/* 0541A0 800535A0 8C620000 */ lw $v0, ($v1) -/* 0541A4 800535A4 3C180388 */ lui $t8, (0x03880010 >> 16) # lui $t8, 0x388 -/* 0541A8 800535A8 3C19800E */ lui $t9, %hi(D_800E4650) # $t9, 0x800e -/* 0541AC 800535AC 244F0008 */ addiu $t7, $v0, 8 -/* 0541B0 800535B0 AC6F0000 */ sw $t7, ($v1) -/* 0541B4 800535B4 27394650 */ addiu $t9, %lo(D_800E4650) # addiu $t9, $t9, 0x4650 -/* 0541B8 800535B8 37180010 */ ori $t8, (0x03880010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 0541BC 800535BC AC580000 */ sw $t8, ($v0) -/* 0541C0 800535C0 03E00008 */ jr $ra -/* 0541C4 800535C4 AC590004 */ sw $t9, 4($v0) - -glabel L800535C8 -/* 0541C8 800535C8 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0541CC 800535CC 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0541D0 800535D0 8C620000 */ lw $v0, ($v1) -/* 0541D4 800535D4 3C090386 */ lui $t1, (0x03860010 >> 16) # lui $t1, 0x386 -/* 0541D8 800535D8 3C0A800E */ lui $t2, %hi(D_800E4670) # $t2, 0x800e -/* 0541DC 800535DC 24480008 */ addiu $t0, $v0, 8 -/* 0541E0 800535E0 AC680000 */ sw $t0, ($v1) -/* 0541E4 800535E4 254A4670 */ addiu $t2, %lo(D_800E4670) # addiu $t2, $t2, 0x4670 -/* 0541E8 800535E8 35290010 */ ori $t1, (0x03860010 & 0xFFFF) # ori $t1, $t1, 0x10 -/* 0541EC 800535EC AC490000 */ sw $t1, ($v0) -/* 0541F0 800535F0 AC4A0004 */ sw $t2, 4($v0) -/* 0541F4 800535F4 8C620000 */ lw $v0, ($v1) -/* 0541F8 800535F8 3C0C0388 */ lui $t4, (0x03880010 >> 16) # lui $t4, 0x388 -/* 0541FC 800535FC 3C0D800E */ lui $t5, %hi(D_800E4668) # $t5, 0x800e -/* 054200 80053600 244B0008 */ addiu $t3, $v0, 8 -/* 054204 80053604 AC6B0000 */ sw $t3, ($v1) -/* 054208 80053608 25AD4668 */ addiu $t5, %lo(D_800E4668) # addiu $t5, $t5, 0x4668 -/* 05420C 8005360C 358C0010 */ ori $t4, (0x03880010 & 0xFFFF) # ori $t4, $t4, 0x10 -/* 054210 80053610 AC4C0000 */ sw $t4, ($v0) -/* 054214 80053614 03E00008 */ jr $ra -/* 054218 80053618 AC4D0004 */ sw $t5, 4($v0) - -glabel L8005361C -/* 05421C 8005361C 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 054220 80053620 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 054224 80053624 8C620000 */ lw $v0, ($v1) -/* 054228 80053628 3C0F0386 */ lui $t7, (0x03860010 >> 16) # lui $t7, 0x386 -/* 05422C 8005362C 3C18800E */ lui $t8, %hi(D_800E4688) # $t8, 0x800e -/* 054230 80053630 244E0008 */ addiu $t6, $v0, 8 -/* 054234 80053634 AC6E0000 */ sw $t6, ($v1) -/* 054238 80053638 27184688 */ addiu $t8, %lo(D_800E4688) # addiu $t8, $t8, 0x4688 -/* 05423C 8005363C 35EF0010 */ ori $t7, (0x03860010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 054240 80053640 AC4F0000 */ sw $t7, ($v0) -/* 054244 80053644 AC580004 */ sw $t8, 4($v0) -/* 054248 80053648 8C620000 */ lw $v0, ($v1) -/* 05424C 8005364C 3C080388 */ lui $t0, (0x03880010 >> 16) # lui $t0, 0x388 -/* 054250 80053650 3C09800E */ lui $t1, %hi(D_800E4680) # $t1, 0x800e -/* 054254 80053654 24590008 */ addiu $t9, $v0, 8 -/* 054258 80053658 AC790000 */ sw $t9, ($v1) -/* 05425C 8005365C 25294680 */ addiu $t1, %lo(D_800E4680) # addiu $t1, $t1, 0x4680 -/* 054260 80053660 35080010 */ ori $t0, (0x03880010 & 0xFFFF) # ori $t0, $t0, 0x10 -/* 054264 80053664 AC480000 */ sw $t0, ($v0) -/* 054268 80053668 03E00008 */ jr $ra -/* 05426C 8005366C AC490004 */ sw $t1, 4($v0) - -glabel L80053670 -/* 054270 80053670 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 054274 80053674 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 054278 80053678 8C620000 */ lw $v0, ($v1) -/* 05427C 8005367C 3C0B0386 */ lui $t3, (0x03860010 >> 16) # lui $t3, 0x386 -/* 054280 80053680 3C0C800E */ lui $t4, %hi(D_800E46A0) # $t4, 0x800e -/* 054284 80053684 244A0008 */ addiu $t2, $v0, 8 -/* 054288 80053688 AC6A0000 */ sw $t2, ($v1) -/* 05428C 8005368C 258C46A0 */ addiu $t4, %lo(D_800E46A0) # addiu $t4, $t4, 0x46a0 -/* 054290 80053690 356B0010 */ ori $t3, (0x03860010 & 0xFFFF) # ori $t3, $t3, 0x10 -/* 054294 80053694 AC4B0000 */ sw $t3, ($v0) -/* 054298 80053698 AC4C0004 */ sw $t4, 4($v0) -/* 05429C 8005369C 8C620000 */ lw $v0, ($v1) -/* 0542A0 800536A0 3C0E0388 */ lui $t6, (0x03880010 >> 16) # lui $t6, 0x388 -/* 0542A4 800536A4 3C0F800E */ lui $t7, %hi(D_800E4698) # $t7, 0x800e -/* 0542A8 800536A8 244D0008 */ addiu $t5, $v0, 8 -/* 0542AC 800536AC AC6D0000 */ sw $t5, ($v1) -/* 0542B0 800536B0 25EF4698 */ addiu $t7, %lo(D_800E4698) # addiu $t7, $t7, 0x4698 -/* 0542B4 800536B4 35CE0010 */ ori $t6, (0x03880010 & 0xFFFF) # ori $t6, $t6, 0x10 -/* 0542B8 800536B8 AC4E0000 */ sw $t6, ($v0) -/* 0542BC 800536BC AC4F0004 */ sw $t7, 4($v0) -.L800536C0: -/* 0542C0 800536C0 03E00008 */ jr $ra -/* 0542C4 800536C4 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_80053870.s b/asm/non_matchings/hud_renderer/func_80053870.s index 3d3de2584..165fda983 100644 --- a/asm/non_matchings/hud_renderer/func_80053870.s +++ b/asm/non_matchings/hud_renderer/func_80053870.s @@ -143,12 +143,12 @@ glabel func_80053870 /* 054688 80053A88 AC580004 */ sw $t8, 4($v0) /* 05468C 80053A8C AC4F0000 */ sw $t7, ($v0) /* 054690 80053A90 8E420000 */ lw $v0, ($s2) -/* 054694 80053A94 3C0E800E */ lui $t6, %hi(D_800E4670) # $t6, 0x800e +/* 054694 80053A94 3C0E800E */ lui $t6, %hi(D_800E4668 + 0x8) # $t6, 0x800e /* 054698 80053A98 3C0D0386 */ lui $t5, (0x03860010 >> 16) # lui $t5, 0x386 /* 05469C 80053A9C 24590008 */ addiu $t9, $v0, 8 /* 0546A0 80053AA0 AE590000 */ sw $t9, ($s2) /* 0546A4 80053AA4 35AD0010 */ ori $t5, (0x03860010 & 0xFFFF) # ori $t5, $t5, 0x10 -/* 0546A8 80053AA8 25CE4670 */ addiu $t6, %lo(D_800E4670) # addiu $t6, $t6, 0x4670 +/* 0546A8 80053AA8 25CE4670 */ addiu $t6, %lo(D_800E4668 + 0x8) # addiu $t6, $t6, 0x4670 /* 0546AC 80053AAC AC4E0004 */ sw $t6, 4($v0) /* 0546B0 80053AB0 AC4D0000 */ sw $t5, ($v0) /* 0546B4 80053AB4 8E420000 */ lw $v0, ($s2) diff --git a/data/data_800E8700.s b/data/data_800E8700.s deleted file mode 100644 index 75bac6f62..000000000 --- a/data/data_800E8700.s +++ /dev/null @@ -1,166 +0,0 @@ -.include "macros.inc" - -.section .data - -glabel D_800E8700 -vertex 8, 8, 0, 960, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 8, -8, 0, 960, 960, 0xFF, 0xFF, 0xFF, 0xFF -vertex -8, -8, 0, 0, 960, 0xFF, 0xFF, 0xFF, 0xFF -vertex -8, 8, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8740 -vertex 1, 2, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 2, -2, 0, 0, 960, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, -2, 0, 960, 960, 0xFF, 0xFF, 0xFF, 0xFF -vertex -1, 2, 0, 960, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8780 -vertex 2, 4, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 2, 0, 0, 4032, 4032, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 0, 0, 0, 4032, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 4, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E87C0 -vertex 2, 2, 0, 1984, 0, 0x00, 0x00, 0x7F, 0xFF -vertex 2, -2, 0, 1984, 1984, 0x00, 0x00, 0x7F, 0xFF -vertex -2, -2, 0, 0, 1984, 0x00, 0x00, 0x7F, 0xFF -vertex -2, 2, 0, 0, 0, 0x00, 0x00, 0x7F, 0xFF - -glabel D_800E8800 -vertex 0, 4, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 0, 0, 0, 0, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -4, 0, 0, 4032, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -4, 4, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8840 -vertex 4, 4, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 4, 0, 0, 0, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex 0, 0, 0, 4032, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex 0, 4, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8880 -vertex 2, 2, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 2, 0, 0, 0, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 0, 0, 4032, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 2, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E88C0 -vertex 2, 0, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 2, -2, 0, 0, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, -2, 0, 4032, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 0, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8900 -vertex 2, 4, 0, 0, 0, 0x00, 0xFF, 0xFF, 0x70 -vertex 2, 0, 0, 0, 4032, 0x00, 0xFF, 0xFF, 0x70 -vertex 0, 0, 0, 1984, 4032, 0xFF, 0xFF, 0x00, 0x70 -vertex 0, 4, 0, 1984, 0, 0x00, 0xFF, 0xFF, 0x70 - -vertex 0, 4, 0, 0, 0, 0x00, 0xFF, 0xFF, 0x70 -vertex 0, 0, 0, 0, 4032, 0xFF, 0xFF, 0x00, 0x70 -vertex -2, 0, 0, 1984, 4032, 0x00, 0xFF, 0xFF, 0x70 -vertex -2, 4, 0, 1984, 0, 0x00, 0xFF, 0xFF, 0x70 - -vertex 2, 4, 0, 1984, 0, 0x00, 0xFF, 0xFF, 0x70 -vertex 2, 0, 0, 1984, 4032, 0x00, 0xFF, 0xFF, 0x70 -vertex 0, 0, 0, 0, 4032, 0xFF, 0xFF, 0x00, 0x70 -vertex 0, 4, 0, 0, 0, 0x00, 0xFF, 0xFF, 0x70 - -vertex 0, 4, 0, 1984, 0, 0x00, 0xFF, 0xFF, 0x70 -vertex 0, 0, 0, 1984, 4032, 0xFF, 0xFF, 0x00, 0x70 -vertex -2, 0, 0, 0, 4032, 0x00, 0xFF, 0xFF, 0x70 -vertex -2, 4, 0, 0, 0, 0x00, 0xFF, 0xFF, 0x70 - -glabel D_800E8A00 -vertex 2, 4, 0, 0, 0, 0xF0, 0x00, 0x00, 0x60 -vertex 2, 0, 0, 0, 4032, 0xF0, 0x00, 0x00, 0x60 -vertex 0, 0, 0, 1984, 4032, 0xFF, 0xFF, 0x14, 0x60 -vertex 0, 4, 0, 1984, 0, 0xF0, 0x00, 0x00, 0x60 - -glabel D_800E8A40 -vertex 0, 4, 0, 0, 0, 0xF0, 0x00, 0x00, 0x60 -vertex 0, 0, 0, 0, 4032, 0xFF, 0xFF, 0x14, 0x60 -vertex -2, 0, 0, 1984, 4032, 0xF0, 0x00, 0x00, 0x60 -vertex -2, 4, 0, 1984, 0, 0xF0, 0x00, 0x00, 0x60 -vertex 2, 4, 0, 1984, 0, 0xF0, 0x00, 0x00, 0x60 -vertex 2, 0, 0, 1984, 4032, 0xF0, 0x00, 0x00, 0x60 -vertex 0, 0, 0, 0, 4032, 0xFF, 0xFF, 0x14, 0x60 -vertex 0, 4, 0, 0, 0, 0xF0, 0x00, 0x00, 0x60 -vertex 0, 4, 0, 1984, 0, 0xF0, 0x00, 0x00, 0x60 -vertex 0, 0, 0, 1984, 4032, 0xFF, 0xFF, 0x14, 0x60 -vertex -2, 0, 0, 0, 4032, 0xF0, 0x00, 0x00, 0x60 -vertex -2, 4, 0, 0, 0, 0xF0, 0x00, 0x00, 0x60 - -glabel D_800E8B00 -vertex 1, 12, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xF0 -vertex 2, 0, 0, 0, 4032, 0xFF, 0xFF, 0xFF, 0xF0 -vertex -2, 0, 0, 1984, 4032, 0xFF, 0xFF, 0xFF, 0xF0 -vertex -1, 12, 0, 1984, 0, 0xFF, 0xFF, 0xFF, 0xF0 - -glabel D_800E8B40 -vertex 2, 1, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 2, -1, 0, 0, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, -1, 0, 4032, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 1, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8B80 -vertex 4, 1, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 4, -1, 0, 0, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex 0, -1, 0, 4032, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex 0, 1, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8BC0 -vertex 0, 1, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 0, -1, 0, 0, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -4, -1, 0, 4032, 1984, 0xFF, 0xFF, 0xFF, 0xFF -vertex -4, 1, 0, 4032, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8C00 -vertex 2, 4, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 2, 0, 0, 0, 4032, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 0, 0, 1984, 4032, 0xFF, 0xFF, 0xFF, 0xFF -vertex -2, 4, 0, 1984, 0, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E8C40 -vertex 9, 18, -9, 0, 990, 0xFF, 0xFF, 0xFF, 0x37 -vertex 9, 0, -9, 0, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 0, -9, 990, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 18, -9, 990, 990, 0xFF, 0xFF, 0xFF, 0x37 -vertex 9, 18, 9, 0, 990, 0xFF, 0xFF, 0xFF, 0x37 -vertex 9, 0, 9, 0, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 0, 9, 990, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 18, 9, 990, 990, 0xFF, 0xFF, 0xFF, 0x37 - -glabel D_800E8CC0 -vertex 9, 70, -9, 0, 990, 0xFF, 0xFF, 0xFF, 0x37 -vertex 9, 0, -9, 0, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 0, -9, 990, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 70, -9, 990, 990, 0xFF, 0xFF, 0xFF, 0x37 -vertex 9, 70, 9, 0, 990, 0xFF, 0xFF, 0xFF, 0x37 -vertex 9, 0, 9, 0, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 0, 9, 990, 0, 0xFF, 0xFF, 0xFF, 0x9B -vertex -9, 70, 9, 990, 990, 0xFF, 0xFF, 0xFF, 0x37 - -glabel D_800E8D40 # TODO f3d -.word 0xb6000000, 0x00020000, 0xb9000002, 0x00000000 -.word 0xb900031d, 0x005049d8, 0xfcffffff, 0xfffe793c -.word 0x0400207f, D_800E8C40, 0xbf000000, 0x00000204 -.word 0xbf000000, 0x00000406, 0xbf000000, 0x00080e0c -.word 0xbf000000, 0x00080c0a, 0xbf000000, 0x0000080a -.word 0xbf000000, 0x00000a02, 0xbf000000, 0x00060e08 -.word 0xbf000000, 0x00000608, 0xbf000000, 0x000e060c -.word 0xbf000000, 0x0006040c, 0xbf000000, 0x00020a0c -.word 0xbf000000, 0x0004020c, 0xb8000000, 0x00000000 - -glabel D_800E8DD0 # TODO f3d -.word 0xb6000000, 0x00020000, 0xb9000002, 0x00000000 -.word 0xb900031d, 0x005049d8, 0xfcffffff, 0xfffe793c -.word 0x0400207f, D_800E8CC0, 0xbf000000, 0x00000204 -.word 0xbf000000, 0x00000406, 0xbf000000, 0x00080e0c -.word 0xbf000000, 0x00080c0a, 0xbf000000, 0x0000080a -.word 0xbf000000, 0x00000a02, 0xbf000000, 0x00060e08 -.word 0xbf000000, 0x00000608, 0xbf000000, 0x000e060c -.word 0xbf000000, 0x0006040c, 0xbf000000, 0x00020a0c -.word 0xbf000000, 0x0004020c, 0xb8000000, 0x00000000 - -.balign 16 diff --git a/data/data_code_80071F00.s b/data/data_code_80071F00.s deleted file mode 100644 index 8defd265f..000000000 --- a/data/data_code_80071F00.s +++ /dev/null @@ -1,131 +0,0 @@ -.include "macros.inc" - -.section .data - -# code_80071F00 begin? -glabel D_800E43B0 # TODO: unused? -.float 65536.0, 0.0, 1.0, 0.0 -.float 0.0, 65536.0, 0.0, 1.0 -.float 0.0, 0.0, 0.0, 0.0 -.float 0.0, 0.0, 0.0, 0.0 - -glabel D_800E43F0 -vertex -24, -19, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, -19, 0, 3008, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, 20, 0, 3008, 2496, 0xFF, 0xFF, 0xFF, 0xFF -vertex -24, 20, 0, 0, 2496, 0xFF, 0xFF, 0xFF, 0xFF -vertex -24, -19, 0, 3008, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, -19, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, 20, 0, 0, 2496, 0xFF, 0xFF, 0xFF, 0xFF -vertex -24, 20, 0, 3008, 2496, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E4470 -vertex -24, -19, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, -19, 0, 3008, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, 20, 0, 3008, 2496, 0xFF, 0xFF, 0xFF, 0xFF -vertex -24, 20, 0, 0, 2496, 0xFF, 0xFF, 0xFF, 0xFF - -glabel D_800E44B0 -vertex -24, -19, 0, 3008, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, -19, 0, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF -vertex 23, 20, 0, 0, 2496, 0xFF, 0xFF, 0xFF, 0xFF -vertex -24, 20, 0, 3008, 2496, 0xFF, 0xFF, 0xFF, 0xFF - -glabel gItemWindowTLUTs -.word gTLUTItemWindowNone, gTLUTItemWindowBanana, gTLUTItemWindowBananaBunch, gTLUTItemWindowGreenShell -.word gTLUTItemWindowTripleGreenShell, gTLUTItemWindowRedShell, gTLUTItemWindowTripleRedShell, gTLUTItemWindowBlueShell -.word gTLUTItemWindowThunderBolt, gTLUTItemWindowFakeItemBox, gTLUTItemWindowStar, gTLUTItemWindowBoo -.word gTLUTItemWindowMushroom, gTLUTItemWindowDoubleMushroom, gTLUTItemWindowTripleMushroom, gTLUTItemWindowSuperMushroom - -glabel gItemWindowTextures -.word gTextureItemWindowNone, gTextureItemWindowBanana, gTextureItemWindowBananaBunch, gTextureItemWindowGreenShell -.word gTextureItemWindowTripleGreenShell, gTextureItemWindowRedShell, gTextureItemWindowTripleRedShell, gTextureItemWindowBlueShell -.word gTextureItemWindowThunderBolt, gTextureItemWindowFakeItemBox, gTextureItemWindowStar, gTextureItemWindowBoo -.word gTextureItemWindowMushroom, gTextureItemWindowDoubleMushroom, gTextureItemWindowTripleMushroom, gTextureItemWindowSuperMushroom - -glabel D_800E4570 -.word D_0D00B158, D_0D00B558, D_0D00B958 - -glabel gPortraitTLUTs -.word gTLUTPortraitMario, gTLUTPortraitLuigi, gTLUTPortraitYoshi, gTLUTPortraitToad -.word gTLUTPortraitDonkeyKong, gTLUTPortraitWario, gTLUTPortraitPeach, gTLUTPortraitBowser - -glabel gPortraitTextures -.word gTexturePortraitMario, gTexturePortraitLuigi, gTexturePortraitYoshi, gTexturePortraitToad -.word gTexturePortraitDonkeyKong, gTexturePortraitWario, gTexturePortraitPeach, gTexturePortraitBowser - -.word 0x00000000 - -# Lights -glabel D_800E45C0 # L1 -.word 0x64000000, 0x64000000 - -glabel D_800E45C8 # L0 -.word 0x64000000, 0x64000000, 0x00880000, 0x00000000 - -glabel D_800E45D8 # L1 -.word 0x64640000, 0x64640000 - -glabel D_800E45E0 # L0 -.word 0xffff0000, 0xffff0000, 0x00880000, 0x00000000 - -glabel D_800E45F0 # L1 -.word 0x64646400, 0x64646400 - -glabel D_800E45F8 # L0 -.word 0xffffff00, 0xffffff00, 0x00880000, 0x00000000 - -glabel D_800E4608 # L1 -.word 0x64000000, 0x64000000 - -glabel D_800E4610 # L0 -.word 0x64000000, 0x64000000, 0x00880000, 0x00000000 - -glabel D_800E4620 # L1 -.word 0x96b4fa00, 0x96b4fa00 - -glabel D_800E4628 # L0 -.word 0xffffff00, 0xffffff00, 0x00000000, 0x00000000 - -glabel D_800E4638 # L1 -.word 0x55555500, 0x55555500 - -glabel D_800E4640 # L0 -.word 0xffffff00, 0xffffff00, 0x00880000, 0x00000000 - -glabel D_800E4650 # L1 -.word 0x55550000, 0x55550000 - -glabel D_800E4658 # L0 -.word 0xffff0000, 0xffff0000, 0x00780000, 0x00000000 - -glabel D_800E4668 # L1 -.word 0x55555500, 0x55555500 - -glabel D_800E4670 # L0 -.word 0xffffff00, 0xffffff00, 0xbe52c900, 0x00000000 - -glabel D_800E4680 # L1 -.word 0x55555500, 0x55555500 - -glabel D_800E4688 # L0 -.word 0xffffff00, 0xffffff00, 0x00007800, 0x00000000 - -glabel D_800E4698 # L1 -.word 0x55555500, 0x55555500 - -glabel D_800E46A0 # L0 -.word 0xffffff00, 0xffffff00, 0x00007800, 0x00000000 -.word 0x55555500, 0x55555500, 0xffffff00, 0xffffff00 -.word 0x00007800, 0x00000000, 0x55555500, 0x55555500 -.word 0xffffff00, 0xffffff00, 0x00007800, 0x00000000 -.word 0x55555500, 0x55555500, 0xffffff00, 0xffffff00 -.word 0x00007800, 0x00000000 - -glabel D_800E46F8 -.word 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff -.word 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 -.word 0x00000000 - -glabel D_800E471C -.byte 0x00, 0x01, 0x02, 0x03, 0x02, 0x01, 0x00, 0x00 diff --git a/mk64.ld b/mk64.ld index 75574dfd5..438ef21a4 100644 --- a/mk64.ld +++ b/mk64.ld @@ -251,7 +251,8 @@ SECTIONS BUILD_DIR/src/kart_attributes.inc.o(.data); BUILD_DIR/src/player_controller.o(.data); BUILD_DIR/src/spawn_players.o(.data); - BUILD_DIR/data/data_code_80071F00.o(.data); + BUILD_DIR/src/code_80071F00.o(.data); + BUILD_DIR/src/data_800E45C0.o(.data); BUILD_DIR/src/code_80057C60.o(.data); BUILD_DIR/data/data_code_80071F00_2.o(.data); BUILD_DIR/src/code_8008C1D0.o(.data); @@ -260,7 +261,7 @@ SECTIONS BUILD_DIR/src/code_800AF9B0.o(.data); BUILD_DIR/src/menus.o(.data); BUILD_DIR/src/code_800B45E0.o(.data); - BUILD_DIR/data/data_800E8700.o(.data); + BUILD_DIR/src/data_800E8700.o(.data); BUILD_DIR/src/audio/synthesis.o(.data); BUILD_DIR/src/audio/heap.o(.data); BUILD_DIR/src/audio/load.o(.data); diff --git a/src/code_80057C60.c b/src/code_80057C60.c index c3fffaf91..5a52d8446 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -38,7 +38,7 @@ s16 D_800E4730[] = { 0x0000, 0x0000, 0x0000, // I'm not convinced these aren't just padding, but stuff doesn't match // without them :/ - 0x0000, 0x0000, + 0x0000 }; u8 **D_800E4770[] = { @@ -2158,8 +2158,6 @@ void func_8005C65C(s32 arg0) { D_8018D2C8[arg0] = 1; } -extern s16 D_800E4730[]; - void func_8005C674(s8 index, s16 *x, s16 *y, s16 *z) { s16 *src = &D_800E4730[index * 3]; *x = *src++; @@ -5066,10 +5064,6 @@ void func_800664E0(Player *player, s8 arg1, s16 arg2, s8 arg3) { } } -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E8B00[]; /* unable to generate initializer */ - void func_80066714(Player *player, s32 arg1, s16 arg2, s8 arg3) { Vec3f sp5C; Vec3s sp54; @@ -5100,9 +5094,6 @@ void func_80066714(Player *player, s32 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80066714.s") -#endif void func_80066998(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp54; @@ -5132,11 +5123,7 @@ void func_80066998(Player *player, s8 arg1, s16 arg2, s8 arg3) { } } -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E8900[][4]; /* unable to generate initializer */ - -void func_80066BAC(Player *player, s32 arg1, s16 arg2, s8 arg3) { +void func_80066BAC(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f spDC; Vec3s spD4; s32 stackPadding; @@ -5181,9 +5168,6 @@ void func_80066BAC(Player *player, s32 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80066BAC.s") -#endif void func_80067280(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp7C; @@ -5261,12 +5245,8 @@ void func_80067604(Player *player, s8 arg1, s16 arg2, s8 arg3) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80067604.s") #endif -#ifdef NEEDS_RODATA -// data/data_code_80071F00.s -extern u8 D_800E52D0[]; /* unable to generate initializer */ -// data/data_800E8700.s -extern Vtx D_800E8800[]; /* unable to generate initializer */ -extern Vtx D_800E8840[]; /* unable to generate initializer */ +// data/data_code_80071F00_2.s +extern u8 D_800E52D0[]; void func_80067964(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { Vec3f sp9C; @@ -5294,9 +5274,6 @@ void func_80067964(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80067964.s") -#endif void func_80067D3C(Player *player, s8 arg1, u8 *texture, s8 arg3, f32 arg4, s32 arg5) { Vec3f sp7C; @@ -5352,12 +5329,8 @@ void func_8006801C(Player *player, s8 arg1, u8 *texture, s8 arg3, f32 arg4, s32 } } -#ifdef NEEDS_RODATA -// data/data_code_80071F00.s -extern u8 D_800E52D0[]; /* unable to generate initializer */ -// data/data_800E8700.s -extern Vtx D_800E8880[]; /* unable to generate initializer */ -extern Vtx D_800E88C0[]; /* unable to generate initializer */ +// data/data_code_80071F00_2.s +extern u8 D_800E52D0[]; void func_80068310(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { s32 stackPadding[16]; // huh? @@ -5384,14 +5357,6 @@ void func_80068310(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80068310.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E8A00[]; /* unable to generate initializer */ -extern Vtx D_800E8A40[]; /* unable to generate initializer */ void func_80068724(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { s32 stackPadding[16]; // huh? @@ -5418,13 +5383,6 @@ void func_80068724(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80068724.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E8B40[]; /* unable to generate initializer */ void func_80068AA4(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { Vec3f sp64; @@ -5448,16 +5406,9 @@ void func_80068AA4(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80068AA4.s") -#endif -#ifdef NEEDS_RODATA -// data/data_code_80071F00.s -extern u8 D_800E52D0[]; /* unable to generate initializer */ -// data/data_800E8700.s -extern Vtx D_800E8B80[]; /* unable to generate initializer */ -extern Vtx D_800E8BC0[]; /* unable to generate initializer */ +// data/data_code_80071F00_2.s +extern u8 D_800E52D0[]; void func_80068DA0(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { Vec3f sp9C; @@ -5483,13 +5434,6 @@ void func_80068DA0(Player *player, s8 arg1, f32 arg2, s8 arg3, s8 arg4) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80068DA0.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E87C0[]; void func_800691B8(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp5C; @@ -5516,14 +5460,6 @@ void func_800691B8(Player *player, s8 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount++; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800691B8.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_code_80071F00.s -extern s32 D_800E47DC[0xC]; -extern s32 D_800E480C[0xC]; void func_80069444(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp74; @@ -5545,6 +5481,7 @@ void func_80069444(Player *player, s8 arg1, s16 arg2, s8 arg3) { envGreen = (D_800E480C[player->unk_258[30 + arg2].unk_038] >> 8) & 0xFF; envBlue = D_800E480C[player->unk_258[30 + arg2].unk_038] & 0xFF; primAlpha = player->unk_258[30 + arg2].unk_03E; + sp74[0] = player->unk_258[30 + arg2].unk_000[0]; sp74[1] = player->unk_258[30 + arg2].unk_000[1]; sp74[2] = player->unk_258[30 + arg2].unk_000[2]; @@ -5564,13 +5501,7 @@ void func_80069444(Player *player, s8 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069444.s") -#endif -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E87C0[]; /* unable to generate initializer */ void func_800696CC(Player *player, s8 arg1, s16 arg2, s8 arg3, f32 arg4) { Vec3f sp5C; Vec3s sp54; @@ -5595,13 +5526,6 @@ void func_800696CC(Player *player, s8 arg1, s16 arg2, s8 arg3, f32 arg4) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800696CC.s") -#endif - -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E87C0[]; /* unable to generate initializer */ void func_80069938(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp5C; @@ -5627,9 +5551,6 @@ void func_80069938(Player *player, s8 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069938.s") -#endif void func_80069BA8(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp54; @@ -5659,10 +5580,6 @@ void func_80069BA8(Player *player, s8 arg1, s16 arg2, s8 arg3) { } } -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E8740[]; /* unable to generate initializer */ - void func_80069DB8(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp5C; Vec3s sp54; @@ -5686,9 +5603,6 @@ void func_80069DB8(Player *player, s8 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069DB8.s") -#endif void func_8006A01C(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp54; @@ -5714,12 +5628,6 @@ void func_8006A01C(Player *player, s8 arg1, s16 arg2, s8 arg3) { } } -#ifdef NEEDS_RODATA -// data/data_code_80071F00.s -static u8 **D_800E47A0[0xF]; -// data/data_800E8700.s -extern Vtx D_800E8780[]; /* unable to generate initializer */ - void func_8006A280(Player *player, s8 arg1, s16 arg2, s8 arg3) { Vec3f sp5C; Vec3s sp54; @@ -5748,9 +5656,6 @@ void func_8006A280(Player *player, s8 arg1, s16 arg2, s8 arg3) { gMatrixEffectCount += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A280.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -6225,11 +6130,10 @@ void func_8006BA94(Player* player, s8 playerIndex, s8 arg2) { } } -#ifdef NEEDS_RODATA -// data/data_code_80071F00.s -extern Vtx D_800E5250[]; /* unable to generate initializer */ -extern Vtx D_800E5290[]; /* unable to generate initializer */ -extern u8 D_800E52D0[]; /* unable to generate initializer */ +// data/data_code_80071F00_2.s +extern Vtx D_800E5250[]; +extern Vtx D_800E5290[]; +extern u8 D_800E52D0[]; void render_balloon(Vec3f arg0, f32 arg1, s16 arg2, s16 arg3) { Mat4 sp108; @@ -6275,16 +6179,13 @@ void render_balloon(Vec3f arg0, f32 arg1, s16 arg2, s16 arg3) { gDPLoadTextureBlock(gDisplayListHead++, D_8018D4BC, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E5250, 4, 0); gSPDisplayList(gDisplayListHead++, D_0D008C78); - // Not sure what to make of the `- 0x40`, it matches, but it looks weird to me + // D_8018D4C0 is correct. But interestingly, IDO seems to set "-0x40" to a different register so the texture still looks fine. gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C0 - 0x40, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPVertex(gDisplayListHead++, D_800E5290, 4, 0); gSPDisplayList(gDisplayListHead++, D_0D008C78); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); gMatrixEffectCount += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/render_balloon.s") -#endif void func_8006C0C8(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) { Vec3f sp4C; @@ -6313,10 +6214,6 @@ void func_8006C0C8(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) { gMatrixEffectCount += 1; } -#ifdef NEEDS_RODATA -// data/data_800E8700.s -extern Vtx D_800E87C0[]; /* unable to generate initializer */ - void func_8006C294(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) { Vec3f sp5C; Vec3s sp54; @@ -6342,9 +6239,6 @@ void func_8006C294(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha) { gSPDisplayList(gDisplayListHead++, D_0D008DA0); gMatrixEffectCount += 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006C294.s") -#endif void func_8006C4D4(Vec3f arg0, f32 arg1, s32 rgb, s16 alpha, s16 arg4) { Vec3f sp4C; @@ -6547,7 +6441,8 @@ void func_8006C9B8(Player *player, s16 arg1, s8 arg2, s8 arg3) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006C9B8.s") #endif -#ifdef NEEDS_RODATA +#ifdef NON_MATCHING +// Something really wrong with arg3 on these functions, could be fake? void func_80062C74(Player *player, s16 arg1, s32 arg2, s32 arg3); void func_80064184(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3); void func_800630C0(Player* player, s16 arg1, s8 arg2, UNUSED s8 arg3); @@ -6556,6 +6451,8 @@ void func_80063268(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3); extern s32 gActiveScreenMode; +// Replacing arg3 with 0 seems to make the percentage higher. +// func_80060504 args could be wrong as well. void func_8006CEC0(Player *arg0, s16 arg1, s8 arg2, s8 arg3) { u16 temp_v0_3; s32 sp20 = arg1; @@ -6603,7 +6500,8 @@ void func_8006CEC0(Player *arg0, s16 arg1, s8 arg2, s8 arg3) { && ((arg0->unk_0BC & 0x400) != 0x400) && ((arg0->unk_0BC & 0x01000000) != 0x01000000)) { if (((arg0->unk_0CA & 2) != 2) && ((arg0->unk_0CA & 0x10) != 0x10) && !(arg0->unk_0CA & 0x100)) { - func_80060504(arg0, arg1, sp20, arg2, arg3); + //func_80060504(arg0, arg1, sp20, arg2, arg3); + func_80060504(arg0, sp20, arg2, arg3); } } break; @@ -6617,7 +6515,8 @@ void func_8006CEC0(Player *arg0, s16 arg1, s8 arg2, s8 arg3) { && ((arg0->unk_0BC & 0x400) != 0x400) && ((arg0->unk_0BC & 0x01000000) != 0x01000000)) { if (((arg0->unk_0CA & 2) != 2) && ((arg0->unk_0CA & 0x10) != 0x10) && !(arg0->unk_0CA & 0x100)) { - func_80060504(arg0, arg1, sp20, arg2, arg3); + //func_80060504(arg0, arg1, sp20, arg2, arg3); + func_80060504(arg0, sp20, arg2, arg3); } } break; diff --git a/src/code_80057C60.h b/src/code_80057C60.h index dc6ec843c..8ceae846a 100644 --- a/src/code_80057C60.h +++ b/src/code_80057C60.h @@ -352,4 +352,20 @@ extern s32 D_8018D2BC; extern u8 *D_8018D480; extern u8 *D_8018D484; +// data/data_800E8700.c +extern Vtx D_800E8740[]; +extern Vtx D_800E8780[]; +extern Vtx D_800E87C0[]; +extern Vtx D_800E8800[]; +extern Vtx D_800E8840[]; +extern Vtx D_800E8880[]; +extern Vtx D_800E88C0[]; +extern Vtx D_800E8A00[]; +extern Vtx D_800E8A40[]; +extern Vtx D_800E8B00[]; +extern Vtx D_800E8B40[]; +extern Vtx D_800E8B80[]; +extern Vtx D_800E8BC0[]; +extern Vtx D_800E8900[][4]; + #endif diff --git a/src/code_80071F00.c b/src/code_80071F00.c index 88d269728..f0f087e8f 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -25,6 +25,66 @@ #include "podium_ceremony_actors.h" #include "courses/all_course_data.h" +// TODO: unused? +f32 D_800E43B0[] = { + 65536.0, 0.0, 1.0, 0.0, + 0.0, 65536.0, 0.0, 1.0, + 0.0, 0.0, 0.0, 0.0, + 0.0, 0.0, 0.0, 0.0 +}; + +Vtx D_800E43F0[] = { + {{{ -24, -19, 0}, 0, { 0, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, -19, 0}, 0, { 3008, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, 20, 0}, 0, { 3008, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -24, 20, 0}, 0, { 0, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -24, -19, 0}, 0, { 3008, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, -19, 0}, 0, { 0, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, 20, 0}, 0, { 0, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -24, 20, 0}, 0, { 3008, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E4470[] = { + {{{ -24, -19, 0}, 0, { 0, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, -19, 0}, 0, { 3008, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, 20, 0}, 0, { 3008, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -24, 20, 0}, 0, { 0, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E44B0[] = { + {{{ -24, -19, 0}, 0, { 3008, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, -19, 0}, 0, { 0, 0}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 23, 20, 0}, 0, { 0, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -24, 20, 0}, 0, { 3008, 2496}, { 0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +u8 *gItemWindowTLUTs[] = { + gTLUTItemWindowNone, gTLUTItemWindowBanana, gTLUTItemWindowBananaBunch, gTLUTItemWindowGreenShell, + gTLUTItemWindowTripleGreenShell, gTLUTItemWindowRedShell, gTLUTItemWindowTripleRedShell, gTLUTItemWindowBlueShell, + gTLUTItemWindowThunderBolt, gTLUTItemWindowFakeItemBox, gTLUTItemWindowStar, gTLUTItemWindowBoo, + gTLUTItemWindowMushroom, gTLUTItemWindowDoubleMushroom, gTLUTItemWindowTripleMushroom, gTLUTItemWindowSuperMushroom +}; + +u8 *gItemWindowTextures[] = { + gTextureItemWindowNone, gTextureItemWindowBanana, gTextureItemWindowBananaBunch, gTextureItemWindowGreenShell, + gTextureItemWindowTripleGreenShell, gTextureItemWindowRedShell, gTextureItemWindowTripleRedShell, gTextureItemWindowBlueShell, + gTextureItemWindowThunderBolt, gTextureItemWindowFakeItemBox, gTextureItemWindowStar, gTextureItemWindowBoo, + gTextureItemWindowMushroom, gTextureItemWindowDoubleMushroom, gTextureItemWindowTripleMushroom, gTextureItemWindowSuperMushroom +}; + +u8 *D_800E4570[] = { + D_0D00B158, D_0D00B558, D_0D00B958 +}; + +u8 *gPortraitTLUTs[] = { + gTLUTPortraitMario, gTLUTPortraitLuigi, gTLUTPortraitYoshi, gTLUTPortraitToad, + gTLUTPortraitDonkeyKong, gTLUTPortraitWario, gTLUTPortraitPeach, gTLUTPortraitBowser +}; + +u8 *gPortraitTextures[] = { + gTexturePortraitMario, gTexturePortraitLuigi, gTexturePortraitYoshi, gTexturePortraitToad, + gTexturePortraitDonkeyKong, gTexturePortraitWario, gTexturePortraitPeach, gTexturePortraitBowser +}; s32 find_unused_obj_index(s32* arg0) { s32 temp_v0; diff --git a/src/code_80071F00.h b/src/code_80071F00.h index de8dab2c1..4c4c7a2c2 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -428,5 +428,6 @@ extern Gfx D_0B008A90[]; extern Vec3s D_800E634C[3]; // static? extern Vtx D_800E4470[]; extern Vtx D_800E44B0[]; +extern u8 *D_800E4570[]; #endif diff --git a/src/data_800E45C0.c b/src/data_800E45C0.c new file mode 100644 index 000000000..14c2fda1f --- /dev/null +++ b/src/data_800E45C0.c @@ -0,0 +1,75 @@ +#include + +// Lights +Lights1 D_800E45C0 = gdSPDefLights1( + 0x64, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x88, 0x00 +); + +Lights1 D_800E45D8 = gdSPDefLights1( + 0x64, 0x64, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x88, 0x00 +); + +Lights1 D_800E45F0 = gdSPDefLights1( + 0x64, 0x64, 0x64, + 0xff, 0xff, 0xff, 0x00, 0x88, 0x00 +); + +Lights1 D_800E4608 = gdSPDefLights1( + 0x64, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x88, 0x00 +); + +Lights1 D_800E4620 = gdSPDefLights1( + 0x96, 0xb4, 0xfa, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00 +); + +Lights1 D_800E4638 = gdSPDefLights1( + 0x55, 0x55, 0x55, + 0xff, 0xff, 0xff, 0x00, 0x88, 0x00 +); + +Lights1 D_800E4650 = gdSPDefLights1( + 0x55, 0x55, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x78, 0x00 +); + +Lights1 D_800E4668 = gdSPDefLights1( + 0x55, 0x55, 0x55, + 0xff, 0xff, 0xff, 0xbe, 0x52, 0xc9 +); + +Lights1 D_800E4680 = gdSPDefLights1( + 0x55, 0x55, 0x55, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x78 +); + +Lights1 D_800E4698 = gdSPDefLights1( + 0x55, 0x55, 0x55, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x78 +); + +Lights1 D_800E46B0 = gdSPDefLights1( + 0x55, 0x55, 0x55, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x78 +); + +Lights1 D_800E46C8 = gdSPDefLights1( + 0x55, 0x55, 0x55, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x78 +); + +Lights1 D_800E46E0 = gdSPDefLights1( + 0x55, 0x55, 0x55, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x78 +); + +u32 D_800E46F8[] = { + 0x000000ff, 0x000000ff, 0x000000ff, + 0x000000ff, 0x000000ff, 0x00000000, + 0x000000ff, 0x00000000, 0x00000000, +}; + +u8 D_800E471C[] = { 0x00, 0x01, 0x02, 0x03, 0x02, 0x01, 0x00 }; diff --git a/src/data_800E8700.c b/src/data_800E8700.c new file mode 100644 index 000000000..c55584483 --- /dev/null +++ b/src/data_800E8700.c @@ -0,0 +1,214 @@ +#include + +Vtx D_800E8700[] = { + {{{ 8, 8, 0}, 0, {960, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 8, -8, 0}, 0, {960, 960}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -8, -8, 0}, 0, {0, 960}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -8, 8, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8740[] = { + {{{ 1, 2, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 2, -2, 0}, 0, {0, 960}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, -2, 0}, 0, {960, 960}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -1, 2, 0}, 0, {960, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8780[] = { + {{{ 2, 4, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 2, 0, 0}, 0, {4032, 4032}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 0, 0}, 0, {0, 4032}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 4, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E87C0[] = { + {{{ 2, 2, 0}, 0, {1984, 0}, {0x00, 0x00, 0x7F, 0xFF}}}, + {{{ 2, -2, 0}, 0, {1984, 1984}, {0x00, 0x00, 0x7F, 0xFF}}}, + {{{ -2, -2, 0}, 0, {0, 1984}, {0x00, 0x00, 0x7F, 0xFF}}}, + {{{ -2, 2, 0}, 0, {0, 0}, {0x00, 0x00, 0x7F, 0xFF}}}, +}; + +Vtx D_800E8800[] = { + {{{ 0, 4, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 0, 0, 0}, 0, {0, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -4, 0, 0}, 0, {4032, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -4, 4, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8840[] = { + {{{ 4, 4, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 4, 0, 0}, 0, {0, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 0, 0, 0}, 0, {4032, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 0, 4, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8880[] = { + {{{ 2, 2, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 2, 0, 0}, 0, {0, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 0, 0}, 0, {4032, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 2, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E88C0[] = { + {{{ 2, 0, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 2, -2, 0}, 0, {0, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, -2, 0}, 0, {4032, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 0, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8900[][4] = { + { + {{{ 2, 4, 0}, 0, {0, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ 2, 0, 0}, 0, {0, 4032}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ 0, 0, 0}, 0, {1984, 4032}, {0xFF, 0xFF, 0x00, 0x70}}}, + {{{ 0, 4, 0}, 0, {1984, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + }, + + { + {{{ 0, 4, 0}, 0, {0, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ 0, 0, 0}, 0, {0, 4032}, {0xFF, 0xFF, 0x00, 0x70}}}, + {{{ -2, 0, 0}, 0, {1984, 4032}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ -2, 4, 0}, 0, {1984, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + }, + + { + {{{ 2, 4, 0}, 0, {1984, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ 2, 0, 0}, 0, {1984, 4032}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ 0, 0, 0}, 0, {0, 4032}, {0xFF, 0xFF, 0x00, 0x70}}}, + {{{ 0, 4, 0}, 0, {0, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + }, + + { + {{{ 0, 4, 0}, 0, {1984, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ 0, 0, 0}, 0, {1984, 4032}, {0xFF, 0xFF, 0x00, 0x70}}}, + {{{ -2, 0, 0}, 0, {0, 4032}, {0x00, 0xFF, 0xFF, 0x70}}}, + {{{ -2, 4, 0}, 0, {0, 0}, {0x00, 0xFF, 0xFF, 0x70}}}, + }, +}; + +Vtx D_800E8A00[] = { + {{{ 2, 4, 0}, 0, {0, 0}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ 2, 0, 0}, 0, {0, 4032}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ 0, 0, 0}, 0, {1984, 4032}, {0xFF, 0xFF, 0x14, 0x60}}}, + {{{ 0, 4, 0}, 0, {1984, 0}, {0xF0, 0x00, 0x00, 0x60}}}, +}; + +Vtx D_800E8A40[] = { + {{{ 0, 4, 0}, 0, {0, 0}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ 0, 0, 0}, 0, {0, 4032}, {0xFF, 0xFF, 0x14, 0x60}}}, + {{{ -2, 0, 0}, 0, {1984, 4032}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ -2, 4, 0}, 0, {1984, 0}, {0xF0, 0x00, 0x00, 0x60}}}, +}; + +Vtx D_800E8A80[] = { + {{{ 2, 4, 0}, 0, {1984, 0}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ 2, 0, 0}, 0, {1984, 4032}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ 0, 0, 0}, 0, {0, 4032}, {0xFF, 0xFF, 0x14, 0x60}}}, + {{{ 0, 4, 0}, 0, {0, 0}, {0xF0, 0x00, 0x00, 0x60}}}, +}; + +Vtx D_800E8AC0[] = { + {{{ 0, 4, 0}, 0, {1984, 0}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ 0, 0, 0}, 0, {1984, 4032}, {0xFF, 0xFF, 0x14, 0x60}}}, + {{{ -2, 0, 0}, 0, {0, 4032}, {0xF0, 0x00, 0x00, 0x60}}}, + {{{ -2, 4, 0}, 0, {0, 0}, {0xF0, 0x00, 0x00, 0x60}}}, +}; + +Vtx D_800E8B00[] = { + {{{ 1, 12, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xF0}}}, + {{{ 2, 0, 0}, 0, {0, 4032}, {0xFF, 0xFF, 0xFF, 0xF0}}}, + {{{ -2, 0, 0}, 0, {1984, 4032}, {0xFF, 0xFF, 0xFF, 0xF0}}}, + {{{ -1, 12, 0}, 0, {1984, 0}, {0xFF, 0xFF, 0xFF, 0xF0}}}, +}; + +Vtx D_800E8B40[] = { + {{{ 2, 1, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 2, -1, 0}, 0, {0, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, -1, 0}, 0, {4032, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 1, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8B80[] = { + {{{ 4, 1, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 4, -1, 0}, 0, {0, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 0, -1, 0}, 0, {4032, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 0, 1, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8BC0[] = { + {{{ 0, 1, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 0, -1, 0}, 0, {0, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -4, -1, 0}, 0, {4032, 1984}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -4, 1, 0}, 0, {4032, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8C00[] = { + {{{ 2, 4, 0}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ 2, 0, 0}, 0, {0, 4032}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 0, 0}, 0, {1984, 4032}, {0xFF, 0xFF, 0xFF, 0xFF}}}, + {{{ -2, 4, 0}, 0, {1984, 0}, {0xFF, 0xFF, 0xFF, 0xFF}}}, +}; + +Vtx D_800E8C40[] = { + {{{ 9, 18, -9}, 0, {0, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, + {{{ 9, 0, -9}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 0, -9}, 0, {990, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 18, -9}, 0, {990, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, + {{{ 9, 18, 9}, 0, {0, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, + {{{ 9, 0, 9}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 0, 9}, 0, {990, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 18, 9}, 0, {990, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, +}; + +Vtx D_800E8CC0[] = { + {{{ 9, 70, -9}, 0, {0, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, + {{{ 9, 0, -9}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 0, -9}, 0, {990, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 70, -9}, 0, {990, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, + {{{ 9, 70, 9}, 0, {0, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, + {{{ 9, 0, 9}, 0, {0, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 0, 9}, 0, {990, 0}, {0xFF, 0xFF, 0xFF, 0x9B}}}, + {{{ -9, 70, 9}, 0, {990, 990}, {0xFF, 0xFF, 0xFF, 0x37}}}, +}; + +Gfx D_800E8D40[] = { + gsSPClearGeometryMode(G_LIGHTING), + gsDPSetAlphaCompare(G_AC_NONE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPVertex(D_800E8C40, 8, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(4, 7, 6, 0), + gsSP1Triangle(4, 6, 5, 0), + gsSP1Triangle(0, 4, 5, 0), + gsSP1Triangle(0, 5, 1, 0), + gsSP1Triangle(3, 7, 4, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(7, 3, 6, 0), + gsSP1Triangle(3, 2, 6, 0), + gsSP1Triangle(1, 5, 6, 0), + gsSP1Triangle(2, 1, 6, 0), + gsSPEndDisplayList(), +}; + +Gfx D_800E8DD0[] = { + gsSPClearGeometryMode(G_LIGHTING), + gsDPSetAlphaCompare(G_AC_NONE), + gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_AA_ZB_XLU_SURF2), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPVertex(D_800E8CC0, 8, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(4, 7, 6, 0), + gsSP1Triangle(4, 6, 5, 0), + gsSP1Triangle(0, 4, 5, 0), + gsSP1Triangle(0, 5, 1, 0), + gsSP1Triangle(3, 7, 4, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(7, 3, 6, 0), + gsSP1Triangle(3, 2, 6, 0), + gsSP1Triangle(1, 5, 6, 0), + gsSP1Triangle(2, 1, 6, 0), + gsSPEndDisplayList(), +}; diff --git a/src/hud_renderer.c b/src/hud_renderer.c index d39afd397..096c0c3ed 100644 --- a/src/hud_renderer.c +++ b/src/hud_renderer.c @@ -2572,18 +2572,10 @@ void func_8004E6C4(s32 playerId) { } } -#ifdef NEEDS_RODATA -// Might actually be plain data? hard to say for sure -// data_0DD0A0_2_0.s -// s8 *D_800E4570[3];// = { (s32) D_0D00B158, (s32) D_0D00B558, (s32) D_0D00B958 }; - void func_8004E78C(s32 playerId) { func_8004CB60((s32) D_8018CA70[playerId].lapX, D_8018CA70[playerId].lapY + 3, (s32) D_0D00A958); func_8004CB90(D_8018CA70[playerId].lapX + 0x1C, (s32) D_8018CA70[playerId].lapY, D_800E4570[D_8018CA70[playerId].alsoLapCount]); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004E78C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -2636,11 +2628,6 @@ void func_8004EB30(UNUSED s32 arg0) { } -#ifdef NEEDS_RODATA -// data/data_0DD0A0_2_0.s -// Internals of the array are entries from common_textures.inc -extern s8* D_800E4570[3];// = { (s32) D_0D00B158, (s32) D_0D00B558, (s32) D_0D00B958 }; - void func_8004EB38(s32 playerId) { struct_8018CA70_entry *temp_s0; @@ -2662,9 +2649,6 @@ void func_8004EB38(s32 playerId) { func_8004C9D8(temp_s0->lapAfterImage2X + 0x1C, (s32) temp_s0->lapY, 0x00000050, D_800E4570[temp_s0->alsoLapCount], 0x00000020, 0x00000010, 0x00000020, 0x00000010); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004EB38.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -3883,17 +3867,17 @@ void func_8005217C(s32 arg0) { func_800520C0(sp50); gSPDisplayList(gDisplayListHead++, D_0D007828); - gSPLight(gDisplayListHead++, &D_800E45C8, 1); - gSPLight(gDisplayListHead++, &D_800E45C0, 2); + gSPLight(gDisplayListHead++, &D_800E45C0.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E45C0.a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_7B38); - gSPLight(gDisplayListHead++, &D_800E45E0, 1); - gSPLight(gDisplayListHead++, &D_800E45D8, 2); + gSPLight(gDisplayListHead++, &D_800E45D8.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E45D8.a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_7978); - gSPLight(gDisplayListHead++, &D_800E45F8, 1); - gSPLight(gDisplayListHead++, &D_800E45F0, 2); + gSPLight(gDisplayListHead++, &D_800E45F0.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E45F0.a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_78C0); - gSPLight(gDisplayListHead++, &D_800E4610, 1); - gSPLight(gDisplayListHead++, &D_800E4608, 2); + gSPLight(gDisplayListHead++, &D_800E4608.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E4608.a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_7650); // temp_v0 = gDisplayListHead; @@ -4084,7 +4068,6 @@ extern s16 D_80183E80; extern s32 D_8018C3F0; extern ? D_8018C5F0; static ? D_800E4620; /* unable to generate initializer */ -static ? D_800E4628; /* unable to generate initializer */ void func_800528EC(s32 arg0) { Gfx *temp_v0; @@ -4121,11 +4104,11 @@ void func_800528EC(s32 arg0) { temp_v0_2->words.w0 = 0xBC000002; temp_v0_3 = gDisplayListHead; gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = (u32) &D_800E4628; + temp_v0_3->words.w1 = (u32) &D_800E4620.l[0]; temp_v0_3->words.w0 = 0x03860010; temp_v0_4 = gDisplayListHead; gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w1 = (u32) &D_800E4620; + temp_v0_4->words.w1 = (u32) &D_800E4620.a; temp_v0_4->words.w0 = 0x03880010; temp_v0_5 = gDisplayListHead; gDisplayListHead = temp_v0_5 + 8; @@ -4205,7 +4188,6 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800528EC.s") extern ? D_80165840; extern s32 D_80183DB8; static ? D_800E4620; /* unable to generate initializer */ -static ? D_800E4628; /* unable to generate initializer */ void func_80052C60(s32 arg0) { Gfx *temp_v0; @@ -4220,11 +4202,11 @@ void func_80052C60(s32 arg0) { D_800E4620.unk11 = (s8) D_80165840.unk1; D_800E4620.unk12 = (s8) D_80165840.unk2; temp_v0->words.w0 = 0x03860010; - temp_v0->words.w1 = (u32) &D_800E4628; + temp_v0->words.w1 = (u32) &D_800E4620.l[0]; temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; temp_v0_2->words.w0 = 0x03880010; - temp_v0_2->words.w1 = (u32) &D_800E4620; + temp_v0_2->words.w1 = (u32) &D_800E4620.a; var_s1 = &D_80183DB8; var_s2 = 0; if (gPlayerCountSelection1 > 0) { @@ -4261,7 +4243,6 @@ void func_80052D70(s32 playerId) { #ifdef MIPS_TO_C //generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 static ? D_800E4620; /* unable to generate initializer */ -static ? D_800E4628; /* unable to generate initializer */ void func_80052E30(s32 arg0) { Gfx *temp_v0; @@ -4274,11 +4255,11 @@ void func_80052E30(s32 arg0) { D_800E4620.unk11 = (s8) D_80165840->unk1; D_800E4620.unk12 = (s8) D_80165840->unk2; temp_v0->words.w0 = 0x03860010; - temp_v0->words.w1 = (u32) &D_800E4628; + temp_v0->words.w1 = (u32) &D_800E4620.l[0]; temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; temp_v0_2->words.w0 = 0x03880010; - temp_v0_2->words.w1 = (u32) &D_800E4620; + temp_v0_2->words.w1 = (u32) &D_800E4620.a; D_80183E80->unk0 = 0; D_80183E80->unk2 = 0; D_80183E80->unk4 = 0; @@ -4404,12 +4385,8 @@ void func_800534A4(s32 arg0) { GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800534A4.s") #endif -#ifdef NEEDS_RODATA -// jpt_800EE068 -// I guess this also needs all those Light1's too, which are plain data (I think) - void func_800534E8(s32 objectIndex) { - // I don't get why all of theses weren't just `gSPSetLights1` calls... + // Why these don't just use `gSPSetLights1` calls... switch (D_80165C18[objectIndex].unk_0A4) { case 0: gSPLight(gDisplayListHead++, &D_800E4638.l[0], LIGHT_1); @@ -4435,9 +4412,6 @@ void func_800534E8(s32 objectIndex) { break; } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800534E8.s") -#endif void func_800536C8(s32 objectIndex) { if ((D_80165C18[objectIndex].unk_0A6 >= 2) && (func_80072354(objectIndex, 0x00000040) != 0)) { @@ -4458,7 +4432,6 @@ void func_800536C8(s32 objectIndex) { extern ? D_8018C5F0; extern u8 d_course_bowsers_castle_thwomp_side; Lights1 D_800E4668; /* unable to generate initializer */ -static ? D_800E4670; /* unable to generate initializer */ void func_80053870(s32 cameraId) { s32 sp94; @@ -4540,11 +4513,11 @@ void func_80053870(s32 cameraId) { temp_v0_5->words.w0 = 0xBC000002; temp_v0_6 = gDisplayListHead; gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = (u32) &D_800E4670; + temp_v0_6->words.w1 = (u32) &D_800E4668.l[0]; temp_v0_6->words.w0 = 0x03860010; temp_v0_7 = gDisplayListHead; gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w1 = (u32) &D_800E4668; + temp_v0_7->words.w1 = (u32) &D_800E4668.a; temp_v0_7->words.w0 = 0x03880010; temp_v0_8 = gDisplayListHead; gDisplayListHead = temp_v0_8 + 8;