izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Labelling of various things, mainly in and relating to unknown_06B2B0.c

Browse Source
This commit is contained in:
Fazana
2021-11-26 23:19:17 +00:00
parent 24d14bfd88
commit 6799c345b7
29 changed files with 361 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/controller_pak/func_8007431C.s
+1 -1
View File
@@ -97,7 +97,7 @@ glabel func_8007431C
/* 075070 80074470 1605FFFA */ bne $s0, $a1, .L8007445C
/* 075074 80074474 24630004 */ addiu $v1, $v1, 4
.L80074478:
/* 075078 80074478 0C01BAB0 */ jal func_8006EAC0
/* 075078 80074478 0C01BAB0 */ jal check_reset_pressed
/* 07507C 8007447C AFA60054 */ sw $a2, 0x54($sp)
/* 075080 80074480 8FA60054 */ lw $a2, 0x54($sp)
/* 075084 80074484 1440000C */ bnez $v0, .L800744B8
asm/non_matchings/controller_pak/func_800744DC.s
+1 -1
View File
@@ -38,7 +38,7 @@ glabel func_800744DC
/* 07515C 8007455C 02202025 */ move $a0, $s1
/* 075160 80074560 0C01CCBA */ jal func_800732E8
/* 075164 80074564 00402825 */ move $a1, $v0
/* 075168 80074568 0C01BAB0 */ jal func_8006EAC0
/* 075168 80074568 0C01BAB0 */ jal check_reset_pressed
/* 07516C 8007456C 00000000 */ nop
/* 075170 80074570 8FA3002C */ lw $v1, 0x2c($sp)
/* 075174 80074574 1440000C */ bnez $v0, .L800745A8
asm/non_matchings/controller_pak/func_800746F0.s
+2 -2
View File
@@ -24,7 +24,7 @@ glabel func_800746F0
/* 075344 80074744 322F0001 */ andi $t7, $s1, 1
/* 075348 80074748 11E00011 */ beqz $t7, .L80074790
/* 07534C 8007474C AFB10028 */ sw $s1, 0x28($sp)
/* 075350 80074750 0C01BAB0 */ jal func_8006EAC0
/* 075350 80074750 0C01BAB0 */ jal check_reset_pressed
/* 075354 80074754 24110018 */ li $s1, 24
/* 075358 80074758 1440000D */ bnez $v0, .L80074790
/* 07535C 8007475C 00008025 */ move $s0, $zero
@@ -47,7 +47,7 @@ glabel func_800746F0
/* 075398 80074798 31090002 */ andi $t1, $t0, 2
/* 07539C 8007479C 11200012 */ beqz $t1, .L800747E8
/* 0753A0 800747A0 00000000 */ nop
/* 0753A4 800747A4 0C01BAB0 */ jal func_8006EAC0
/* 0753A4 800747A4 0C01BAB0 */ jal check_reset_pressed
/* 0753A8 800747A8 24110018 */ li $s1, 24
/* 0753AC 800747AC 1440000E */ bnez $v0, .L800747E8
/* 0753B0 800747B0 00008025 */ move $s0, $zero
asm/non_matchings/controller_pak/func_8007497C.s
+1 -1
View File
@@ -37,7 +37,7 @@ glabel func_8007497C
/* 075604 80074A04 01C2C025 */ or $t8, $t6, $v0
/* 075608 80074A08 01E3C825 */ or $t9, $t7, $v1
/* 07560C 80074A0C AE190004 */ sw $t9, 4($s0)
/* 075610 80074A10 0C01BAB0 */ jal func_8006EAC0
/* 075610 80074A10 0C01BAB0 */ jal check_reset_pressed
/* 075614 80074A14 AE180000 */ sw $t8, ($s0)
/* 075618 80074A18 14400008 */ bnez $v0, .L80074A3C
/* 07561C 80074A1C 24020001 */ li $v0, 1
asm/non_matchings/menu/func_80094688.s
+2 -2
View File
@@ -141,7 +141,7 @@ glabel func_80094688
/* 095490 80094890 24090064 */ li $t1, 100
/* 095494 80094894 AC29F47C */ sw $t1, %lo(gMenuDelay)($at)
.L80094898:
/* 095498 80094898 0C01B683 */ jal func_8006DA0C
/* 095498 80094898 0C01B683 */ jal get_render_context
/* 09549C 8009489C 00000000 */ nop
/* 0954A0 800948A0 10400003 */ beqz $v0, .L800948B0
/* 0954A4 800948A4 240A0007 */ li $t2, 7
@@ -230,7 +230,7 @@ glabel func_80094688
.L800949E0:
/* 0955E0 800949E0 846A0004 */ lh $t2, 4($v1)
/* 0955E4 800949E4 3C018012 */ lui $at, %hi(D_80126BC0) # $at, 0x8012
/* 0955E8 800949E8 0C01B683 */ jal func_8006DA0C
/* 0955E8 800949E8 0C01B683 */ jal get_render_context
/* 0955EC 800949EC AC2A6BC0 */ sw $t2, %lo(D_80126BC0)($at)
/* 0955F0 800949F0 14400008 */ bnez $v0, .L80094A14
/* 0955F4 800949F4 3C048012 */ lui $a0, %hi(D_80126BB8) # $a0, 0x8012
asm/non_matchings/menu/func_80094D28.s
+1 -1
View File
@@ -590,7 +590,7 @@ glabel L800951CC
/* 096184 80095584 24040007 */ li $a0, 7
.L80095588:
glabel L80095588
/* 096188 80095588 0C01B683 */ jal func_8006DA0C
/* 096188 80095588 0C01B683 */ jal get_render_context
/* 09618C 8009558C 00000000 */ nop
/* 096190 80095590 1440001D */ bnez $v0, .L80095608
/* 096194 80095594 3C0F800E */ lui $t7, %hi(gNumberOfActivePlayers) # $t7, 0x800e
asm/non_matchings/menu/tt_menu_loop.s
+52 -52
View File
@@ -13,7 +13,7 @@ glabel tt_menu_loop
/* 09E74C 8009DB4C 0C027B20 */ jal is_in_two_player_adventure
/* 09E750 8009DB50 AFA20030 */ sw $v0, 0x30($sp)
/* 09E754 8009DB54 10400007 */ beqz $v0, .L8009DB74
/* 09E758 8009DB58 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012
/* 09E758 8009DB58 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09E75C 8009DB5C 8FA20030 */ lw $v0, 0x30($sp)
/* 09E760 8009DB60 00000000 */ nop
/* 09E764 8009DB64 8C4E0010 */ lw $t6, 0x10($v0)
@@ -24,13 +24,13 @@ glabel tt_menu_loop
/* 09E774 8009DB74 8FA20030 */ lw $v0, 0x30($sp)
/* 09E778 8009DB78 24090005 */ li $t1, 5
/* 09E77C 8009DB7C 8C580010 */ lw $t8, 0x10($v0)
/* 09E780 8009DB80 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09E780 8009DB80 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09E784 8009DB84 33190002 */ andi $t9, $t8, 2
/* 09E788 8009DB88 17200002 */ bnez $t9, .L8009DB94
/* 09E78C 8009DB8C 24040001 */ li $a0, 1
/* 09E790 8009DB90 A02964E2 */ sb $t1, %lo(D_801264E2)($at)
/* 09E790 8009DB90 A02964E2 */ sb $t1, %lo(sCurrentMenuID)($at)
.L8009DB94:
/* 09E794 8009DB94 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09E794 8009DB94 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09E798 8009DB98 24010004 */ li $at, 4
/* 09E79C 8009DB9C 10610012 */ beq $v1, $at, .L8009DBE8
/* 09E7A0 8009DBA0 24050018 */ li $a1, 24
@@ -65,12 +65,12 @@ glabel tt_menu_loop
/* 09E808 8009DC08 AFA00044 */ sw $zero, 0x44($sp)
/* 09E80C 8009DC0C 0C01A955 */ jal get_buttons_pressed_from_player
/* 09E810 8009DC10 00002025 */ move $a0, $zero
/* 09E814 8009DC14 3C018012 */ lui $at, %hi(D_80126504) # $at, 0x8012
/* 09E818 8009DC18 A0206504 */ sb $zero, %lo(D_80126504)($at)
/* 09E81C 8009DC1C 3C088012 */ lui $t0, %hi(D_801264E2) # $t0, 0x8012
/* 09E814 8009DC14 3C018012 */ lui $at, %hi(sDialogueOptionMax) # $at, 0x8012
/* 09E818 8009DC18 A0206504 */ sb $zero, %lo(sDialogueOptionMax)($at)
/* 09E81C 8009DC1C 3C088012 */ lui $t0, %hi(sCurrentMenuID) # $t0, 0x8012
/* 09E820 8009DC20 3C018012 */ lui $at, %hi(D_8012650E) # $at, 0x8012
/* 09E824 8009DC24 240E0020 */ li $t6, 32
/* 09E828 8009DC28 250864E2 */ addiu $t0, %lo(D_801264E2) # addiu $t0, $t0, 0x64e2
/* 09E828 8009DC28 250864E2 */ addiu $t0, %lo(sCurrentMenuID) # addiu $t0, $t0, 0x64e2
/* 09E82C 8009DC2C A02E650E */ sb $t6, %lo(D_8012650E)($at)
/* 09E830 8009DC30 81030000 */ lb $v1, ($t0)
/* 09E834 8009DC34 00402025 */ move $a0, $v0
@@ -181,8 +181,8 @@ glabel L8009DC60
/* 09E9B8 8009DDB8 8FAE0040 */ lw $t6, 0x40($sp)
/* 09E9BC 8009DDBC 33198000 */ andi $t9, $t8, 0x8000
/* 09E9C0 8009DDC0 13200032 */ beqz $t9, .L8009DE8C
/* 09E9C4 8009DDC4 3C098012 */ lui $t1, %hi(D_801264E2) # $t1, 0x8012
/* 09E9C8 8009DDC8 812964E2 */ lb $t1, %lo(D_801264E2)($t1)
/* 09E9C4 8009DDC4 3C098012 */ lui $t1, %hi(sCurrentMenuID) # $t1, 0x8012
/* 09E9C8 8009DDC8 812964E2 */ lb $t1, %lo(sCurrentMenuID)($t1)
/* 09E9CC 8009DDCC 2401000A */ li $at, 10
/* 09E9D0 8009DDD0 1121002E */ beq $t1, $at, .L8009DE8C
/* 09E9D4 8009DDD4 3C038012 */ lui $v1, %hi(D_80126516) # $v1, 0x8012
@@ -204,11 +204,11 @@ glabel L8009DC60
/* 09EA10 8009DE10 3C018012 */ lui $at, %hi(D_8012639C) # $at, 0x8012
/* 09EA14 8009DE14 AC20639C */ sw $zero, %lo(D_8012639C)($at)
/* 09EA18 8009DE18 3C038012 */ lui $v1, %hi(D_80126516) # $v1, 0x8012
/* 09EA1C 8009DE1C 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EA1C 8009DE1C 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EA20 8009DE20 240A0008 */ li $t2, 8
/* 09EA24 8009DE24 80636516 */ lb $v1, %lo(D_80126516)($v1)
/* 09EA28 8009DE28 10000015 */ b .L8009DE80
/* 09EA2C 8009DE2C A02A64E2 */ sb $t2, %lo(D_801264E2)($at)
/* 09EA2C 8009DE2C A02A64E2 */ sb $t2, %lo(sCurrentMenuID)($at)
/* 09EA30 8009DE30 240400EF */ li $a0, 239
.L8009DE34:
/* 09EA34 8009DE34 0C000741 */ jal func_80001D04
@@ -226,10 +226,10 @@ glabel L8009DC60
/* 09EA64 8009DE64 3C01800E */ lui $at, %hi(D_800E1E28) # $at, 0x800e
/* 09EA68 8009DE68 A02B1E28 */ sb $t3, %lo(D_800E1E28)($at)
/* 09EA6C 8009DE6C 3C038012 */ lui $v1, %hi(D_80126516) # $v1, 0x8012
/* 09EA70 8009DE70 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EA70 8009DE70 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EA74 8009DE74 240C0004 */ li $t4, 4
/* 09EA78 8009DE78 80636516 */ lb $v1, %lo(D_80126516)($v1)
/* 09EA7C 8009DE7C A02C64E2 */ sb $t4, %lo(D_801264E2)($at)
/* 09EA7C 8009DE7C A02C64E2 */ sb $t4, %lo(sCurrentMenuID)($at)
.L8009DE80:
/* 09EA80 8009DE80 246D0001 */ addiu $t5, $v1, 1
.L8009DE84:
@@ -244,8 +244,8 @@ glabel L8009DC60
/* 09EAA0 8009DEA0 24180003 */ li $t8, 3
/* 09EAA4 8009DEA4 AFB80044 */ sw $t8, 0x44($sp)
.L8009DEA8:
/* 09EAA8 8009DEA8 3C038012 */ lui $v1, %hi(D_801264E2)
/* 09EAAC 8009DEAC 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09EAA8 8009DEA8 3C038012 */ lui $v1, %hi(sCurrentMenuID)
/* 09EAAC 8009DEAC 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09EAB0 8009DEB0 24010004 */ li $at, 4
/* 09EAB4 8009DEB4 14610002 */ bne $v1, $at, .L8009DEC0
/* 09EAB8 8009DEB8 2409000A */ li $t1, 10
@@ -255,8 +255,8 @@ glabel L8009DC60
/* 09EAC4 8009DEC4 24010003 */ li $at, 3
/* 09EAC8 8009DEC8 17210004 */ bne $t9, $at, .L8009DEDC
/* 09EACC 8009DECC 240A0003 */ li $t2, 3
/* 09EAD0 8009DED0 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EAD4 8009DED4 A02964E2 */ sb $t1, %lo(D_801264E2)($at)
/* 09EAD0 8009DED0 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EAD4 8009DED4 A02964E2 */ sb $t1, %lo(sCurrentMenuID)($at)
/* 09EAD8 8009DED8 2403000A */ li $v1, 10
.L8009DEDC:
/* 09EADC 8009DEDC 2401000A */ li $at, 10
@@ -305,17 +305,17 @@ glabel L8009DEF0
/* 09EB78 8009DF78 24C60010 */ addiu $a2, $a2, 0x10
/* 09EB7C 8009DF7C 14E0FFEF */ bnez $a3, .L8009DF3C
/* 09EB80 8009DF80 240F0001 */ li $t7, 1
/* 09EB84 8009DF84 3C088012 */ lui $t0, %hi(D_801264E2) # $t0, 0x8012
/* 09EB88 8009DF88 250864E2 */ addiu $t0, %lo(D_801264E2) # addiu $t0, $t0, 0x64e2
/* 09EB84 8009DF84 3C088012 */ lui $t0, %hi(sCurrentMenuID) # $t0, 0x8012
/* 09EB88 8009DF88 250864E2 */ addiu $t0, %lo(sCurrentMenuID) # addiu $t0, $t0, 0x64e2
.L8009DF8C:
/* 09EB8C 8009DF8C 8FAA0040 */ lw $t2, 0x40($sp)
/* 09EB90 8009DF90 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012
/* 09EB90 8009DF90 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09EB94 8009DF94 314BC000 */ andi $t3, $t2, 0xc000
/* 09EB98 8009DF98 11600002 */ beqz $t3, .L8009DFA4
/* 09EB9C 8009DF9C 00000000 */ nop
/* 09EBA0 8009DFA0 A1000000 */ sb $zero, ($t0)
.L8009DFA4:
/* 09EBA4 8009DFA4 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09EBA4 8009DFA4 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09EBA8 8009DFA8 100000F5 */ b .L8009E380
/* 09EBAC 8009DFAC 24010001 */ li $at, 1
glabel L8009DFB0
@@ -330,8 +330,8 @@ glabel L8009DFB0
/* 09EBD0 8009DFD0 2404022F */ li $a0, 559
/* 09EBD4 8009DFD4 0C00DAF3 */ jal func_80036BCC
/* 09EBD8 8009DFD8 24050001 */ li $a1, 1
/* 09EBDC 8009DFDC 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012
/* 09EBE0 8009DFE0 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09EBDC 8009DFDC 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09EBE0 8009DFE0 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09EBE4 8009DFE4 100000E6 */ b .L8009E380
/* 09EBE8 8009DFE8 24010001 */ li $at, 1
glabel L8009DFEC
@@ -364,21 +364,21 @@ glabel L8009DFEC
/* 09EC50 8009E050 24C60010 */ addiu $a2, $a2, 0x10
/* 09EC54 8009E054 14E0FFEF */ bnez $a3, .L8009E014
/* 09EC58 8009E058 240D0001 */ li $t5, 1
/* 09EC5C 8009E05C 3C088012 */ lui $t0, %hi(D_801264E2) # $t0, 0x8012
/* 09EC60 8009E060 250864E2 */ addiu $t0, %lo(D_801264E2) # addiu $t0, $t0, 0x64e2
/* 09EC5C 8009E05C 3C088012 */ lui $t0, %hi(sCurrentMenuID) # $t0, 0x8012
/* 09EC60 8009E060 250864E2 */ addiu $t0, %lo(sCurrentMenuID) # addiu $t0, $t0, 0x64e2
/* 09EC64 8009E064 8FA90040 */ lw $t1, 0x40($sp)
.L8009E068:
/* 09EC68 8009E068 8FAB0030 */ lw $t3, 0x30($sp)
/* 09EC6C 8009E06C 312AC000 */ andi $t2, $t1, 0xc000
/* 09EC70 8009E070 11400006 */ beqz $t2, .L8009E08C
/* 09EC74 8009E074 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012
/* 09EC74 8009E074 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09EC78 8009E078 8D6C0010 */ lw $t4, 0x10($t3)
/* 09EC7C 8009E07C 00000000 */ nop
/* 09EC80 8009E080 358E0002 */ ori $t6, $t4, 2
/* 09EC84 8009E084 AD6E0010 */ sw $t6, 0x10($t3)
/* 09EC88 8009E088 A1000000 */ sb $zero, ($t0)
.L8009E08C:
/* 09EC8C 8009E08C 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09EC8C 8009E08C 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09EC90 8009E090 100000BB */ b .L8009E380
/* 09EC94 8009E094 24010001 */ li $at, 1
glabel L8009E098
@@ -428,10 +428,10 @@ glabel L8009E098
/* 09ED44 8009E144 24180007 */ li $t8, 7
/* 09ED48 8009E148 3C018012 */ lui $at, %hi(D_8012639C) # $at, 0x8012
/* 09ED4C 8009E14C AC38639C */ sw $t8, %lo(D_8012639C)($at)
/* 09ED50 8009E150 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09ED50 8009E150 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09ED54 8009E154 24190008 */ li $t9, 8
/* 09ED58 8009E158 1000000A */ b .L8009E184
/* 09ED5C 8009E15C A03964E2 */ sb $t9, %lo(D_801264E2)($at)
/* 09ED5C 8009E15C A03964E2 */ sb $t9, %lo(sCurrentMenuID)($at)
/* 09ED60 8009E160 8FA90040 */ lw $t1, 0x40($sp)
.L8009E164:
/* 09ED64 8009E164 00000000 */ nop
@@ -440,11 +440,11 @@ glabel L8009E098
/* 09ED70 8009E170 24040241 */ li $a0, 577
/* 09ED74 8009E174 0C000741 */ jal func_80001D04
/* 09ED78 8009E178 00002825 */ move $a1, $zero
/* 09ED7C 8009E17C 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09ED80 8009E180 A02064E2 */ sb $zero, %lo(D_801264E2)($at)
/* 09ED7C 8009E17C 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09ED80 8009E180 A02064E2 */ sb $zero, %lo(sCurrentMenuID)($at)
.L8009E184:
/* 09ED84 8009E184 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012
/* 09ED88 8009E188 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09ED84 8009E184 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09ED88 8009E188 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09ED8C 8009E18C 1000007C */ b .L8009E380
/* 09ED90 8009E190 24010001 */ li $at, 1
glabel L8009E194
@@ -482,13 +482,13 @@ glabel L8009E194
/* 09EE10 8009E210 0C03145A */ jal func_800C5168
/* 09EE14 8009E214 24060042 */ li $a2, 66
/* 09EE18 8009E218 8FAC0040 */ lw $t4, 0x40($sp)
/* 09EE1C 8009E21C 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EE1C 8009E21C 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EE20 8009E220 318ED000 */ andi $t6, $t4, 0xd000
/* 09EE24 8009E224 11C00002 */ beqz $t6, .L8009E230
/* 09EE28 8009E228 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012
/* 09EE2C 8009E22C A02064E2 */ sb $zero, %lo(D_801264E2)($at)
/* 09EE28 8009E228 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09EE2C 8009E22C A02064E2 */ sb $zero, %lo(sCurrentMenuID)($at)
.L8009E230:
/* 09EE30 8009E230 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09EE30 8009E230 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09EE34 8009E234 10000052 */ b .L8009E380
/* 09EE38 8009E238 24010001 */ li $at, 1
glabel L8009E23C
@@ -533,53 +533,53 @@ glabel L8009E23C
glabel L8009E2D0
/* 09EED0 8009E2D0 3C0C8012 */ lui $t4, %hi(D_8012639C) # $t4, 0x8012
/* 09EED4 8009E2D4 8D8C639C */ lw $t4, %lo(D_8012639C)($t4)
/* 09EED8 8009E2D8 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EED8 8009E2D8 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EEDC 8009E2DC 10000024 */ b .L8009E370
/* 09EEE0 8009E2E0 A02C64E2 */ sb $t4, %lo(D_801264E2)($at)
/* 09EEE0 8009E2E0 A02C64E2 */ sb $t4, %lo(sCurrentMenuID)($at)
glabel L8009E2E4
/* 09EEE4 8009E2E4 240E0006 */ li $t6, 6
/* 09EEE8 8009E2E8 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EEE8 8009E2E8 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EEEC 8009E2EC 10000020 */ b .L8009E370
/* 09EEF0 8009E2F0 A02E64E2 */ sb $t6, %lo(D_801264E2)($at)
/* 09EEF0 8009E2F0 A02E64E2 */ sb $t6, %lo(sCurrentMenuID)($at)
glabel L8009E2F4
/* 09EEF4 8009E2F4 3C0B800E */ lui $t3, %hi(D_800E09D8) # $t3, 0x800e
/* 09EEF8 8009E2F8 256B09D8 */ addiu $t3, %lo(D_800E09D8) # addiu $t3, $t3, 0x9d8
/* 09EEFC 8009E2FC 3C018012 */ lui $at, %hi(D_801263A4) # $at, 0x8012
/* 09EF00 8009E300 AC2B63A4 */ sw $t3, %lo(D_801263A4)($at)
/* 09EF04 8009E304 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EF04 8009E304 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EF08 8009E308 240D0001 */ li $t5, 1
/* 09EF0C 8009E30C 10000018 */ b .L8009E370
/* 09EF10 8009E310 A02D64E2 */ sb $t5, %lo(D_801264E2)($at)
/* 09EF10 8009E310 A02D64E2 */ sb $t5, %lo(sCurrentMenuID)($at)
glabel L8009E314
/* 09EF14 8009E314 3C0F800E */ lui $t7, %hi(D_800E09C4) # $t7, 0x800e
/* 09EF18 8009E318 25EF09C4 */ addiu $t7, %lo(D_800E09C4) # addiu $t7, $t7, 0x9c4
/* 09EF1C 8009E31C 3C018012 */ lui $at, %hi(D_801263A4) # $at, 0x8012
/* 09EF20 8009E320 AC2F63A4 */ sw $t7, %lo(D_801263A4)($at)
/* 09EF24 8009E324 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EF24 8009E324 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EF28 8009E328 24180001 */ li $t8, 1
/* 09EF2C 8009E32C 10000010 */ b .L8009E370
/* 09EF30 8009E330 A03864E2 */ sb $t8, %lo(D_801264E2)($at)
/* 09EF30 8009E330 A03864E2 */ sb $t8, %lo(sCurrentMenuID)($at)
glabel L8009E334
/* 09EF34 8009E334 3C19800E */ lui $t9, %hi(D_800E09EC) # $t9, 0x800e
/* 09EF38 8009E338 273909EC */ addiu $t9, %lo(D_800E09EC) # addiu $t9, $t9, 0x9ec
/* 09EF3C 8009E33C 3C018012 */ lui $at, %hi(D_801263A4) # $at, 0x8012
/* 09EF40 8009E340 AC3963A4 */ sw $t9, %lo(D_801263A4)($at)
/* 09EF44 8009E344 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EF44 8009E344 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EF48 8009E348 24090001 */ li $t1, 1
/* 09EF4C 8009E34C 10000008 */ b .L8009E370
/* 09EF50 8009E350 A02964E2 */ sb $t1, %lo(D_801264E2)($at)
/* 09EF50 8009E350 A02964E2 */ sb $t1, %lo(sCurrentMenuID)($at)
.L8009E354:
glabel L8009E354
/* 09EF54 8009E354 3C0A800E */ lui $t2, %hi(D_800E09B0) # $t2, 0x800e
/* 09EF58 8009E358 254A09B0 */ addiu $t2, %lo(D_800E09B0) # addiu $t2, $t2, 0x9b0
/* 09EF5C 8009E35C 3C018012 */ lui $at, %hi(D_801263A4) # $at, 0x8012
/* 09EF60 8009E360 AC2A63A4 */ sw $t2, %lo(D_801263A4)($at)
/* 09EF64 8009E364 3C018012 */ lui $at, %hi(D_801264E2) # $at, 0x8012
/* 09EF64 8009E364 3C018012 */ lui $at, %hi(sCurrentMenuID) # $at, 0x8012
/* 09EF68 8009E368 240C0001 */ li $t4, 1
/* 09EF6C 8009E36C A02C64E2 */ sb $t4, %lo(D_801264E2)($at)
/* 09EF6C 8009E36C A02C64E2 */ sb $t4, %lo(sCurrentMenuID)($at)
.L8009E370:
/* 09EF70 8009E370 3C038012 */ lui $v1, %hi(D_801264E2) # $v1, 0x8012
/* 09EF74 8009E374 806364E2 */ lb $v1, %lo(D_801264E2)($v1)
/* 09EF70 8009E370 3C038012 */ lui $v1, %hi(sCurrentMenuID) # $v1, 0x8012
/* 09EF74 8009E374 806364E2 */ lb $v1, %lo(sCurrentMenuID)($v1)
/* 09EF78 8009E378 00000000 */ nop
.L8009E37C:
glabel L8009E37C
asm/non_matchings/printf/func_800B5F78.s
+1 -1
View File
@@ -6,7 +6,7 @@ glabel func_800B5F78
/* 0B6B88 800B5F88 AFB40030 */ sw $s4, 0x30($sp)
/* 0B6B8C 800B5F8C AFB20028 */ sw $s2, 0x28($sp)
/* 0B6B90 800B5F90 AFB10024 */ sw $s1, 0x24($sp)
/* 0B6B94 800B5F94 0C01E015 */ jal func_80078054
/* 0B6B94 800B5F94 0C01E015 */ jal init_rdp_and_framebuffer
/* 0B6B98 800B5F98 AFB00020 */ sw $s0, 0x20($sp)
/* 0B6B9C 800B5F9C 0C01E948 */ jal get_video_width_and_height_as_s32
/* 0B6BA0 800B5FA0 00000000 */ nop
asm/non_matchings/unknown_00BC20/func_8000CC7C.s
+2 -2
View File
@@ -79,7 +79,7 @@ glabel func_8000CC7C
/* 00D974 8000CD74 AFB90130 */ sw $t9, 0x130($sp)
/* 00D978 8000CD78 A04D003B */ sb $t5, 0x3b($v0)
.L8000CD7C:
/* 00D97C 8000CD7C 0C01B683 */ jal func_8006DA0C
/* 00D97C 8000CD7C 0C01B683 */ jal get_render_context
/* 00D980 8000CD80 00000000 */ nop
/* 00D984 8000CD84 0C01BAA4 */ jal get_settings
/* 00D988 8000CD88 AFA20138 */ sw $v0, 0x138($sp)
@@ -967,7 +967,7 @@ glabel L8000D98C
/* 00E5D4 8000D9D4 3C018012 */ lui $at, %hi(D_8011AD20) # $at, 0x8012
/* 00E5D8 8000D9D8 A020AD20 */ sb $zero, %lo(D_8011AD20)($at)
.L8000D9DC:
/* 00E5DC 8000D9DC 0C01B683 */ jal func_8006DA0C
/* 00E5DC 8000D9DC 0C01B683 */ jal get_render_context
/* 00E5E0 8000D9E0 00000000 */ nop
/* 00E5E4 8000D9E4 1440002D */ bnez $v0, .L8000DA9C
/* 00E5E8 8000D9E8 3C028012 */ lui $v0, %hi(objCount) # $v0, 0x8012
asm/non_matchings/unknown_00BC20/func_80019808.s
+1 -1
View File
@@ -604,7 +604,7 @@ glabel func_80019808
/* 01ACA0 8001A0A0 00000000 */ nop
/* 01ACA4 8001A0A4 AFBF0064 */ sw $ra, 0x64($sp)
/* 01ACA8 8001A0A8 AFA80080 */ sw $t0, 0x80($sp)
/* 01ACAC 8001A0AC 0C01B683 */ jal func_8006DA0C
/* 01ACAC 8001A0AC 0C01B683 */ jal get_render_context
/* 01ACB0 8001A0B0 AFAA0044 */ sw $t2, 0x44($sp)
/* 01ACB4 8001A0B4 8FA80080 */ lw $t0, 0x80($sp)
/* 01ACB8 8001A0B8 8FAA0044 */ lw $t2, 0x44($sp)
asm/non_matchings/unknown_043920/func_8004DE38.s
+1 -1
View File
@@ -260,7 +260,7 @@ glabel func_8004DE38
/* 04ED84 8004E184 3C018012 */ lui $at, %hi(D_8011D586) # $at, 0x8012
/* 04ED88 8004E188 A420D586 */ sh $zero, %lo(D_8011D586)($at)
.L8004E18C:
/* 04ED8C 8004E18C 0C01B683 */ jal func_8006DA0C
/* 04ED8C 8004E18C 0C01B683 */ jal get_render_context
/* 04ED90 8004E190 00000000 */ nop
/* 04ED94 8004E194 3C0D8012 */ lui $t5, %hi(D_8011D540) # $t5, 0x8012
/* 04ED98 8004E198 8DADD540 */ lw $t5, %lo(D_8011D540)($t5)
asm/non_matchings/unknown_043920/func_8005A6F0.s
+1 -1
View File
@@ -37,7 +37,7 @@ glabel func_8005A6F0
/* 05B308 8005A708 AFA400A0 */ sw $a0, 0xa0($sp)
/* 05B30C 8005A70C AFA600A8 */ sw $a2, 0xa8($sp)
/* 05B310 8005A710 AFA700AC */ sw $a3, 0xac($sp)
/* 05B314 8005A714 0C01B683 */ jal func_8006DA0C
/* 05B314 8005A714 0C01B683 */ jal get_render_context
/* 05B318 8005A718 AC2ED55C */ sw $t6, %lo(D_8011D55C)($at)
/* 05B31C 8005A71C 0C01AF6C */ jal get_current_level_header
/* 05B320 8005A720 AFA20094 */ sw $v0, 0x94($sp)
asm/non_matchings/unknown_06B2B0/func_8006CCF0.s
+7 -7
View File
@@ -75,10 +75,10 @@ glabel func_8006CCF0
/* 06D9E0 8006CDE0 14400018 */ bnez $v0, .L8006CE44
/* 06D9E4 8006CDE4 3C19800E */ lui $t9, %hi(D_800DD390) # $t9, 0x800e
/* 06D9E8 8006CDE8 8339D390 */ lb $t9, %lo(D_800DD390)($t9)
/* 06D9EC 8006CDEC 3C098012 */ lui $t1, %hi(D_801234EC) # $t1, 0x8012
/* 06D9EC 8006CDEC 3C098012 */ lui $t1, %hi(sRenderContext) # $t1, 0x8012
/* 06D9F0 8006CDF0 17200014 */ bnez $t9, .L8006CE44
/* 06D9F4 8006CDF4 00000000 */ nop
/* 06D9F8 8006CDF8 8D2934EC */ lw $t1, %lo(D_801234EC)($t1)
/* 06D9F8 8006CDF8 8D2934EC */ lw $t1, %lo(sRenderContext)($t1)
/* 06D9FC 8006CDFC 3C0A8012 */ lui $t2, %hi(D_80123516) # $t2, 0x8012
/* 06DA00 8006CE00 15200010 */ bnez $t1, .L8006CE44
/* 06DA04 8006CE04 00000000 */ nop
@@ -144,8 +144,8 @@ glabel func_8006CCF0
/* 06DAE0 8006CEE0 248411F8 */ addiu $a0, %lo(gCurrDisplayList) # addiu $a0, $a0, 0x11f8
/* 06DAE4 8006CEE4 0C009355 */ jal func_80024D54
/* 06DAE8 8006CEE8 AFB90010 */ sw $t9, 0x10($sp)
/* 06DAEC 8006CEEC 3C098012 */ lui $t1, %hi(D_801234EC) # $t1, 0x8012
/* 06DAF0 8006CEF0 8D2934EC */ lw $t1, %lo(D_801234EC)($t1)
/* 06DAEC 8006CEEC 3C098012 */ lui $t1, %hi(sRenderContext) # $t1, 0x8012
/* 06DAF0 8006CEF0 8D2934EC */ lw $t1, %lo(sRenderContext)($t1)
/* 06DAF4 8006CEF4 2401DFCF */ li $at, -8241
/* 06DAF8 8006CEF8 15200003 */ bnez $t1, .L8006CF08
/* 06DAFC 8006CEFC 3C0B8012 */ lui $t3, %hi(D_80123516) # $t3, 0x8012
@@ -354,7 +354,7 @@ glabel L8006D19C
.L8006D1C0:
glabel L8006D1C0
/* 06DDC0 8006D1C0 3C048012 */ lui $a0, %hi(gCurrDisplayList) # $a0, 0x8012
/* 06DDC4 8006D1C4 0C01E015 */ jal func_80078054
/* 06DDC4 8006D1C4 0C01E015 */ jal init_rdp_and_framebuffer
/* 06DDC8 8006D1C8 248411F8 */ addiu $a0, %lo(gCurrDisplayList) # addiu $a0, $a0, 0x11f8
/* 06DDCC 8006D1CC 3C048012 */ lui $a0, %hi(gCurrDisplayList) # $a0, 0x8012
/* 06DDD0 8006D1D0 0C01DC14 */ jal render_borders_for_multiplayer
@@ -608,8 +608,8 @@ glabel L8006D1C0
/* 06E160 8006D560 320C0020 */ andi $t4, $s0, 0x20
.L8006D564:
/* 06E164 8006D564 11800004 */ beqz $t4, .L8006D578
/* 06E168 8006D568 3C0D8012 */ lui $t5, %hi(D_801234EC) # $t5, 0x8012
/* 06E16C 8006D56C 8DAD34EC */ lw $t5, %lo(D_801234EC)($t5)
/* 06E168 8006D568 3C0D8012 */ lui $t5, %hi(sRenderContext) # $t5, 0x8012
/* 06E16C 8006D56C 8DAD34EC */ lw $t5, %lo(sRenderContext)($t5)
/* 06E170 8006D570 00000000 */ nop
/* 06E174 8006D574 11A00004 */ beqz $t5, .L8006D588
.L8006D578:
asm/non_matchings/unknown_06B2B0/func_8006DCF8.s
+20 -20
View File
@@ -53,8 +53,8 @@ glabel func_8006DCF8
/* 06E9A4 8006DDA4 00000000 */ nop
/* 06E9A8 8006DDA8 0C01B6F9 */ jal func_8006DBE4
/* 06E9AC 8006DDAC 00000000 */ nop
/* 06E9B0 8006DDB0 3C0D8012 */ lui $t5, %hi(D_801234E8) # $t5, 0x8012
/* 06E9B4 8006DDB4 8DAD34E8 */ lw $t5, %lo(D_801234E8)($t5)
/* 06E9B0 8006DDB0 3C0D8012 */ lui $t5, %hi(gSPTaskNum) # $t5, 0x8012
/* 06E9B4 8006DDB4 8DAD34E8 */ lw $t5, %lo(gSPTaskNum)($t5)
/* 06E9B8 8006DDB8 3C0F8012 */ lui $t7, %hi(gDisplayLists) # $t7, 0x8012
/* 06E9BC 8006DDBC 000D7080 */ sll $t6, $t5, 2
/* 06E9C0 8006DDC0 01EE7821 */ addu $t7, $t7, $t6
@@ -87,8 +87,8 @@ glabel func_8006DCF8
/* 06EA2C 8006DE2C AD420000 */ sw $v0, ($t2)
/* 06EA30 8006DE30 AD200000 */ sw $zero, ($t1)
/* 06EA34 8006DE34 AD780000 */ sw $t8, ($t3)
/* 06EA38 8006DE38 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012
/* 06EA3C 8006DE3C AC2034EC */ sw $zero, %lo(D_801234EC)($at)
/* 06EA38 8006DE38 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EA3C 8006DE3C AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EA40 8006DE40 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012
/* 06EA44 8006DE44 A0203515 */ sb $zero, %lo(gIsPaused)($at)
/* 06EA48 8006DE48 3C018012 */ lui $at, %hi(D_80123516) # $at, 0x8012
@@ -150,8 +150,8 @@ glabel L8006DF00
/* 06EB1C 8006DF1C AD000000 */ sw $zero, ($t0)
/* 06EB20 8006DF20 AD200000 */ sw $zero, ($t1)
/* 06EB24 8006DF24 AD6F0000 */ sw $t7, ($t3)
/* 06EB28 8006DF28 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012
/* 06EB2C 8006DF2C AC2034EC */ sw $zero, %lo(D_801234EC)($at)
/* 06EB28 8006DF28 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EB2C 8006DF2C AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EB30 8006DF30 3C038012 */ lui $v1, %hi(D_80123500) # $v1, 0x8012
/* 06EB34 8006DF34 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EB38 8006DF38 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
@@ -181,9 +181,9 @@ glabel L8006DF70
/* 06EB94 8006DF94 24190064 */ li $t9, 100
/* 06EB98 8006DF98 AD200000 */ sw $zero, ($t1)
/* 06EB9C 8006DF9C AD790000 */ sw $t9, ($t3)
/* 06EBA0 8006DFA0 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012
/* 06EBA0 8006DFA0 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EBA4 8006DFA4 AD180000 */ sw $t8, ($t0)
/* 06EBA8 8006DFA8 AC2034EC */ sw $zero, %lo(D_801234EC)($at)
/* 06EBA8 8006DFA8 AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EBAC 8006DFAC 80A2000F */ lb $v0, 0xf($a1)
/* 06EBB0 8006DFB0 80A30001 */ lb $v1, 1($a1)
/* 06EBB4 8006DFB4 04400002 */ bltz $v0, .L8006DFC0
@@ -211,8 +211,8 @@ glabel L8006DF70
/* 06EC04 8006E004 100000B5 */ b .L8006E2DC
/* 06EC08 8006E008 8FBF0024 */ lw $ra, 0x24($sp)
glabel L8006E00C
/* 06EC0C 8006E00C 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012
/* 06EC10 8006E010 AC2034EC */ sw $zero, %lo(D_801234EC)($at)
/* 06EC0C 8006E00C 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EC10 8006E010 AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EC14 8006E014 3C038012 */ lui $v1, %hi(D_80123500) # $v1, 0x8012
/* 06EC18 8006E018 3C088012 */ lui $t0, %hi(D_801234F4) # $t0, 0x8012
/* 06EC1C 8006E01C 3C098012 */ lui $t1, %hi(D_80123504) # $t1, 0x8012
@@ -231,9 +231,9 @@ glabel L8006E00C
/* 06EC50 8006E050 8FBF0024 */ lw $ra, 0x24($sp)
glabel L8006E054
/* 06EC54 8006E054 3C058012 */ lui $a1, %hi(D_80121250) # $a1, 0x8012
/* 06EC58 8006E058 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012
/* 06EC58 8006E058 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EC5C 8006E05C 24A51250 */ addiu $a1, %lo(D_80121250) # addiu $a1, $a1, 0x1250
/* 06EC60 8006E060 AC2034EC */ sw $zero, %lo(D_801234EC)($at)
/* 06EC60 8006E060 AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EC64 8006E064 80AF0001 */ lb $t7, 1($a1)
/* 06EC68 8006E068 80A40000 */ lb $a0, ($a1)
/* 06EC6C 8006E06C 00AFC021 */ addu $t8, $a1, $t7
@@ -282,8 +282,8 @@ glabel L8006E0E0
/* 06ED08 8006E108 00000000 */ nop
/* 06ED0C 8006E10C 0C01B6F9 */ jal func_8006DBE4
/* 06ED10 8006E110 00000000 */ nop
/* 06ED14 8006E114 3C0D8012 */ lui $t5, %hi(D_801234E8) # $t5, 0x8012
/* 06ED18 8006E118 8DAD34E8 */ lw $t5, %lo(D_801234E8)($t5)
/* 06ED14 8006E114 3C0D8012 */ lui $t5, %hi(gSPTaskNum) # $t5, 0x8012
/* 06ED18 8006E118 8DAD34E8 */ lw $t5, %lo(gSPTaskNum)($t5)
/* 06ED1C 8006E11C 3C0F8012 */ lui $t7, %hi(gDisplayLists) # $t7, 0x8012
/* 06ED20 8006E120 000D7080 */ sll $t6, $t5, 2
/* 06ED24 8006E124 01EE7821 */ addu $t7, $t7, $t6
@@ -314,10 +314,10 @@ glabel L8006E0E0
/* 06ED88 8006E188 80790004 */ lb $t9, 4($v1)
/* 06ED8C 8006E18C 3C098012 */ lui $t1, %hi(D_80123504) # $t1, 0x8012
/* 06ED90 8006E190 25293504 */ addiu $t1, %lo(D_80123504) # addiu $t1, $t1, 0x3504
/* 06ED94 8006E194 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012
/* 06ED94 8006E194 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06ED98 8006E198 AD180000 */ sw $t8, ($t0)
/* 06ED9C 8006E19C AD390000 */ sw $t9, ($t1)
/* 06EDA0 8006E1A0 AC2034EC */ sw $zero, %lo(D_801234EC)($at)
/* 06EDA0 8006E1A0 AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EDA4 8006E1A4 806C000C */ lb $t4, 0xc($v1)
/* 06EDA8 8006E1A8 3C0B8012 */ lui $t3, %hi(D_80123508) # $t3, 0x8012
/* 06EDAC 8006E1AC 256B3508 */ addiu $t3, %lo(D_80123508) # addiu $t3, $t3, 0x3508
@@ -353,8 +353,8 @@ glabel L8006E0E0
/* 06EE20 8006E220 8FBF0024 */ lw $ra, 0x24($sp)
/* 06EE24 8006E224 0C01B6F9 */ jal func_8006DBE4
/* 06EE28 8006E228 00000000 */ nop
/* 06EE2C 8006E22C 3C198012 */ lui $t9, %hi(D_801234E8) # $t9, 0x8012
/* 06EE30 8006E230 8F3934E8 */ lw $t9, %lo(D_801234E8)($t9)
/* 06EE2C 8006E22C 3C198012 */ lui $t9, %hi(gSPTaskNum) # $t9, 0x8012
/* 06EE30 8006E230 8F3934E8 */ lw $t9, %lo(gSPTaskNum)($t9)
/* 06EE34 8006E234 3C0D8012 */ lui $t5, %hi(gDisplayLists) # $t5, 0x8012
/* 06EE38 8006E238 00196080 */ sll $t4, $t9, 2
/* 06EE3C 8006E23C 01AC6821 */ addu $t5, $t5, $t4
@@ -372,9 +372,9 @@ glabel L8006E0E0
/* 06EE6C 8006E26C AC400004 */ sw $zero, 4($v0)
/* 06EE70 8006E270 AC590000 */ sw $t9, ($v0)
/* 06EE74 8006E274 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EE78 8006E278 3C018012 */ lui $at, %hi(D_801234EC) # $at, 0x8012
/* 06EE78 8006E278 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EE7C 8006E27C 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06EE80 8006E280 AC2034EC */ sw $zero, %lo(D_801234EC)($at)
/* 06EE80 8006E280 AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EE84 8006E284 8D460000 */ lw $a2, ($t2)
/* 06EE88 8006E288 8FA4002C */ lw $a0, 0x2c($sp)
/* 06EE8C 8006E28C 0C01B2B9 */ jal func_8006CAE4
asm/non_matchings/unknown_06B2B0/func_8006ECFC.s
+2 -2
View File
@@ -137,8 +137,8 @@ glabel func_8006ECFC
/* 06FB08 8006EF08 0C01C42C */ jal set_free_queue_state
/* 06FB0C 8006EF0C AC2E3534 */ sw $t6, %lo(gCurrNumHudVertsPerPlayer)($at)
.L8006EF10:
/* 06FB10 8006EF10 3C038012 */ lui $v1, %hi(D_801234E8) # $v1, 0x8012
/* 06FB14 8006EF14 8C6334E8 */ lw $v1, %lo(D_801234E8)($v1)
/* 06FB10 8006EF10 3C038012 */ lui $v1, %hi(gSPTaskNum) # $v1, 0x8012
/* 06FB14 8006EF14 8C6334E8 */ lw $v1, %lo(gSPTaskNum)($v1)
/* 06FB18 8006EF18 3C118012 */ lui $s1, %hi(gDisplayLists) # $s1, 0x8012
/* 06FB1C 8006EF1C 263111F0 */ addiu $s1, %lo(gDisplayLists) # addiu $s1, $s1, 0x11f0
/* 06FB20 8006EF20 00037880 */ sll $t7, $v1, 2
asm/non_matchings/unknown_09F8F0/func_800A01A0.s
+3 -3
View File
@@ -45,7 +45,7 @@ glabel func_800A01A0
/* 0A0E40 800A0240 314B0002 */ andi $t3, $t2, 2
/* 0A0E44 800A0244 15600248 */ bnez $t3, .L800A0B68
/* 0A0E48 800A0248 8FBF0024 */ lw $ra, 0x24($sp)
/* 0A0E4C 800A024C 0C01B683 */ jal func_8006DA0C
/* 0A0E4C 800A024C 0C01B683 */ jal get_render_context
/* 0A0E50 800A0250 00000000 */ nop
/* 0A0E54 800A0254 24030001 */ li $v1, 1
/* 0A0E58 800A0258 10430242 */ beq $v0, $v1, .L800A0B64
@@ -323,10 +323,10 @@ glabel func_800A01A0
/* 0A1258 800A0658 244E0008 */ addiu $t6, $v0, 8
/* 0A125C 800A065C AC8E0000 */ sw $t6, ($a0)
/* 0A1260 800A0660 AC400004 */ sw $zero, 4($v0)
/* 0A1264 800A0664 0C01E037 */ jal func_800780DC
/* 0A1264 800A0664 0C01E037 */ jal init_rsp
/* 0A1268 800A0668 AC580000 */ sw $t8, ($v0)
/* 0A126C 800A066C 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012
/* 0A1270 800A0670 0C01E015 */ jal func_80078054
/* 0A1270 800A0670 0C01E015 */ jal init_rdp_and_framebuffer
/* 0A1274 800A0674 24846CFC */ addiu $a0, %lo(D_80126CFC) # addiu $a0, $a0, 0x6cfc
/* 0A1278 800A0678 0C01EB8A */ jal func_8007AE28
/* 0A127C 800A067C 2404FFFF */ li $a0, -1
asm/non_matchings/unknown_09F8F0/func_800A22F4.s
+1 -1
View File
@@ -40,7 +40,7 @@ glabel func_800A22F4
/* 0A2F88 800A2388 3C018012 */ lui $at, %hi(D_80126CD5) # $at, 0x8012
/* 0A2F8C 800A238C 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012
/* 0A2F90 800A2390 A0206CD5 */ sb $zero, %lo(D_80126CD5)($at)
/* 0A2F94 800A2394 0C01E015 */ jal func_80078054
/* 0A2F94 800A2394 0C01E015 */ jal init_rdp_and_framebuffer
/* 0A2F98 800A2398 24846CFC */ addiu $a0, %lo(D_80126CFC) # addiu $a0, $a0, 0x6cfc
/* 0A2F9C 800A239C 3C048012 */ lui $a0, %hi(D_80126CFC) # $a0, 0x8012
/* 0A2FA0 800A23A0 0C01ECF4 */ jal func_8007B3D0
src/audio.c
+5 -5
View File
@@ -281,12 +281,12 @@ void func_80000CBC(void) {
set_relative_volume_for_music(musicRelativeVolume);
}
void func_80000D00(u8 arg0) {
void func_80000D00(u8 mulFactor) {
s32 reg_s2;
s32 j;
if (D_80115D3C > 0) {
D_80115D38 += arg0;
D_80115D38 += mulFactor;
D_800DC650 = ((f32)D_80115D38) / ((f32)D_80115D3C);
if ((f64)D_800DC650 > 1.0f) {
@@ -297,7 +297,7 @@ void func_80000D00(u8 arg0) {
set_relative_volume_for_music(musicRelativeVolume);
} else if (D_80115D3C < 0) {
D_80115D38 -= arg0;
D_80115D38 -= mulFactor;
D_800DC650 = 1.0f - ((f32)D_80115D38) / ((f32)D_80115D3C);
if ((f64)D_800DC650 < 0) {
D_80115D38 = 0;
@@ -308,9 +308,9 @@ void func_80000D00(u8 arg0) {
}
if (D_800DC658 > 0) {
//reg_arg0 = arg0;
//reg_arg0 = mulFactor;
for (reg_s2 = 0; reg_s2 < D_800DC658;) {
D_80115D48[reg_s2].unk2 -= arg0;
D_80115D48[reg_s2].unk2 -= mulFactor;
if (D_80115D48[reg_s2].unk2 <= 0) {
j = reg_s2;
func_80001D04(D_80115D48[reg_s2].unk0, D_80115D48[reg_s2].unk4);
src/controller_pak.c
+1 -1
View File
@@ -201,7 +201,7 @@ s32 func_8007497C(u64 *arg0) {
*arg0 <<= 8;
*arg0 >>= 8;
*arg0 |= (s64)((s32)func_8007480C(*arg0)) << 56;
if (func_8006EAC0() == 0) {
if (check_reset_pressed() == 0) {
osEepromWrite(func_8006A100(), 0xF, (u8 *)arg0);
}
return 1;
src/fade_transition.c
+8 -8
View File
@@ -288,12 +288,12 @@ s32 func_800C01D8(FadeTransition *transition) {
GLOBAL_ASM("asm/non_matchings/fade_transition/func_800C01D8.s")
#endif
s32 func_800C0494(s32 arg0) {
s32 func_800C0494(s32 mulFactor) {
if (D_800E31A4 != 0) {
D_800E31A4 = D_800E31A4 - 1;
arg0 = 0;
} else if (arg0 >= 6) {
arg0 = 5;
mulFactor = 0;
} else if (mulFactor >= 6) {
mulFactor = 5;
}
if (D_800E31AC != 0) {
@@ -308,19 +308,19 @@ s32 func_800C0494(s32 arg0) {
}
switch (gCurFaceTransition) {
case FADE_FULLSCREEN:
func_800C0834(arg0);
func_800C0834(mulFactor);
break;
case FADE_BARNDOOR_HORIZONTAL:
case FADE_BARNDOOR_VERTICAL:
case FADE_WAVES:
case FADE_BARNDOOR_DIAGONAL:
func_800C1130(arg0);
func_800C1130(mulFactor);
break;
case FADE_CIRCLE:
func_800C1EE8(arg0);
func_800C1EE8(mulFactor);
break;
case FADE_DISABLED:
func_800C27A0(arg0);
func_800C27A0(mulFactor);
break;
}
}

Some files were not shown because too many files have changed in this diff Show More