mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-08-21 23:01:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Relabel/identify more variables and functions based on current knowledge (#127)

Browse Source 
* Update labels and names based on current knowledge

* Create gChatacterSelections/gCharacterGridSelections distinction
This commit is contained in:
Maciek Baron
2022-01-03 00:30:23 +00:00
committed by GitHub
parent 72cf6c86a9
commit 20d9e8afba
68 changed files with 805 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/bss_800029B0.s
+1 -1
View File
@@ -229,7 +229,7 @@ glabel D_8015F8E4
glabel D_8015F8E8
.skip 8
glabel D_8015F8F0
glabel gPlayerPositionLUT
.skip 2
glabel D_8015F8F2
asm/bss_8001C4D0.s
+1 -1
View File
@@ -2046,7 +2046,7 @@ glabel D_8018EDDC
glabel D_8018EDE0
.skip 4
glabel gCharacterSelections # 0x8018EDE4
glabel gCharacterGridSelections # 0x8018EDE4
.skip 1
glabel D_8018EDE5
asm/bss_MainSeg.s
+2 -2
View File
@@ -8,7 +8,7 @@ glabel D_801636A0
glabel D_801636B0
.skip 252
glabel D_801637AC #
glabel D_801637AC #
.skip 12
glabel D_801637B8 # Crossing activated bit field
@@ -190,7 +190,7 @@ glabel D_8016439C
glabel D_801643B0
.skip 8
glabel D_801643B8
glabel gPlayerPositions
.skip 2
glabel D_801643BA
asm/non_matchings/audio/external/func_800C76C0.s
Vendored
+22 -22
View File
@@ -62,7 +62,7 @@ glabel func_800C76C0
/* 0C83AC 800C77AC 3C0B800F */ lui $t3, %hi(D_800EA0EC)
/* 0C83B0 800C77B0 24010003 */ li $at, 3
/* 0C83B4 800C77B4 10410165 */ beq $v0, $at, .L800C7D4C
/* 0C83B8 800C77B8 00000000 */ nop
/* 0C83B8 800C77B8 00000000 */ nop
/* 0C83BC 800C77BC 8FCF0034 */ lw $t7, 0x34($fp)
/* 0C83C0 800C77C0 100001ED */ b .L800C7F78
/* 0C83C4 800C77C4 8DE30000 */ lw $v1, ($t7)
@@ -185,7 +185,7 @@ glabel func_800C76C0
/* 0C8584 800C7984 9129A104 */ lbu $t1, %lo(D_800EA104)($t1)
/* 0C8588 800C7988 3C041001 */ lui $a0, (0x100100FF >> 16) # lui $a0, 0x1001
/* 0C858C 800C798C 15200006 */ bnez $t1, .L800C79A8
/* 0C8590 800C7990 00000000 */ nop
/* 0C8590 800C7990 00000000 */ nop
/* 0C8594 800C7994 0C030D12 */ jal func_800C3448
/* 0C8598 800C7998 348400FF */ ori $a0, (0x100100FF & 0xFFFF) # ori $a0, $a0, 0xff
/* 0C859C 800C799C 3C041101 */ lui $a0, (0x110100FF >> 16) # lui $a0, 0x1101
@@ -209,7 +209,7 @@ glabel func_800C76C0
/* 0C85DC 800C79DC 9042A104 */ lbu $v0, %lo(D_800EA104)($v0)
/* 0C85E0 800C79E0 3C041001 */ lui $a0, (0x100100FF >> 16) # lui $a0, 0x1001
/* 0C85E4 800C79E4 1440000E */ bnez $v0, .L800C7A20
/* 0C85E8 800C79E8 00000000 */ nop
/* 0C85E8 800C79E8 00000000 */ nop
/* 0C85EC 800C79EC 0C030D12 */ jal func_800C3448
/* 0C85F0 800C79F0 348400FF */ ori $a0, (0x100100FF & 0xFFFF) # ori $a0, $a0, 0xff
/* 0C85F4 800C79F4 3C041101 */ lui $a0, (0x110100FF >> 16) # lui $a0, 0x1101
@@ -225,7 +225,7 @@ glabel func_800C76C0
/* 0C861C 800C7A1C 9042A104 */ lbu $v0, %lo(D_800EA104)($v0)
.L800C7A20:
/* 0C8620 800C7A20 14400006 */ bnez $v0, .L800C7A3C
/* 0C8624 800C7A24 00000000 */ nop
/* 0C8624 800C7A24 00000000 */ nop
/* 0C8628 800C7A28 8FCA0030 */ lw $t2, 0x30($fp)
/* 0C862C 800C7A2C 24010001 */ li $at, 1
/* 0C8630 800C7A30 914C0000 */ lbu $t4, ($t2)
@@ -305,7 +305,7 @@ glabel func_800C76C0
/* 0C873C 800C7B3C 10410016 */ beq $v0, $at, .L800C7B98
/* 0C8740 800C7B40 24010003 */ li $at, 3
/* 0C8744 800C7B44 10410041 */ beq $v0, $at, .L800C7C4C
/* 0C8748 800C7B48 00000000 */ nop
/* 0C8748 800C7B48 00000000 */ nop
/* 0C874C 800C7B4C 1000007D */ b .L800C7D44
/* 0C8750 800C7B50 8FCF0034 */ lw $t7, 0x34($fp)
.L800C7B54:
@@ -452,7 +452,7 @@ glabel func_800C76C0
/* 0C8954 800C7D54 24010002 */ li $at, 2
/* 0C8958 800C7D58 3C041001 */ lui $a0, (0x100100FF >> 16) # lui $a0, 0x1001
/* 0C895C 800C7D5C 10470007 */ beq $v0, $a3, .L800C7D7C
/* 0C8960 800C7D60 00000000 */ nop
/* 0C8960 800C7D60 00000000 */ nop
/* 0C8964 800C7D64 1041002A */ beq $v0, $at, .L800C7E10
/* 0C8968 800C7D68 24010003 */ li $at, 3
/* 0C896C 800C7D6C 10410053 */ beq $v0, $at, .L800C7EBC
@@ -473,8 +473,8 @@ glabel func_800C76C0
/* 0C89A4 800C7DA4 93C40043 */ lbu $a0, 0x43($fp)
/* 0C89A8 800C7DA8 0C0323BE */ jal func_800C8EF8
/* 0C89AC 800C7DAC 24040017 */ li $a0, 23
/* 0C89B0 800C7DB0 3C19800E */ lui $t9, %hi(D_800DC5E8) # $t9, 0x800e
/* 0C89B4 800C7DB4 8F39C5E8 */ lw $t9, %lo(D_800DC5E8)($t9)
/* 0C89B0 800C7DB0 3C19800E */ lui $t9, %hi(gPlayerWinningIndex) # $t9, 0x800e
/* 0C89B4 800C7DB4 8F39C5E8 */ lw $t9, %lo(gPlayerWinningIndex)($t9)
/* 0C89B8 800C7DB8 93C40043 */ lbu $a0, 0x43($fp)
/* 0C89BC 800C7DBC 3C05800F */ lui $a1, %hi(gPlayers+0x254)
/* 0C89C0 800C7DC0 001940C0 */ sll $t0, $t9, 3
@@ -517,8 +517,8 @@ glabel func_800C76C0
/* 0C8A50 800C7E50 93C40043 */ lbu $a0, 0x43($fp)
/* 0C8A54 800C7E54 0C0323BE */ jal func_800C8EF8
/* 0C8A58 800C7E58 24040017 */ li $a0, 23
/* 0C8A5C 800C7E5C 3C0E800E */ lui $t6, %hi(D_800DC5E8) # $t6, 0x800e
/* 0C8A60 800C7E60 8DCEC5E8 */ lw $t6, %lo(D_800DC5E8)($t6)
/* 0C8A5C 800C7E5C 3C0E800E */ lui $t6, %hi(gPlayerWinningIndex) # $t6, 0x800e
/* 0C8A60 800C7E60 8DCEC5E8 */ lw $t6, %lo(gPlayerWinningIndex)($t6)
/* 0C8A64 800C7E64 93C40043 */ lbu $a0, 0x43($fp)
/* 0C8A68 800C7E68 3C05800F */ lui $a1, %hi(gPlayers+0x254)
/* 0C8A6C 800C7E6C 000E78C0 */ sll $t7, $t6, 3
@@ -565,8 +565,8 @@ glabel func_800C76C0
/* 0C8B0C 800C7F0C 93C40043 */ lbu $a0, 0x43($fp)
/* 0C8B10 800C7F10 0C0323BE */ jal func_800C8EF8
/* 0C8B14 800C7F14 24040017 */ li $a0, 23
/* 0C8B18 800C7F18 3C0C800E */ lui $t4, %hi(D_800DC5E8) # $t4, 0x800e
/* 0C8B1C 800C7F1C 8D8CC5E8 */ lw $t4, %lo(D_800DC5E8)($t4)
/* 0C8B18 800C7F18 3C0C800E */ lui $t4, %hi(gPlayerWinningIndex) # $t4, 0x800e
/* 0C8B1C 800C7F1C 8D8CC5E8 */ lw $t4, %lo(gPlayerWinningIndex)($t4)
/* 0C8B20 800C7F20 93C40043 */ lbu $a0, 0x43($fp)
/* 0C8B24 800C7F24 3C05800F */ lui $a1, %hi(gPlayers+0x254)
/* 0C8B28 800C7F28 000C68C0 */ sll $t5, $t4, 3
@@ -606,9 +606,9 @@ glabel func_800C76C0
/* 0C8BA8 800C7FA8 000478C0 */ sll $t7, $a0, 3
/* 0C8BAC 800C7FAC 24010003 */ li $at, 3
/* 0C8BB0 800C7FB0 10410089 */ beq $v0, $at, .L800C81D8
/* 0C8BB4 800C7FB4 00000000 */ nop
/* 0C8BB4 800C7FB4 00000000 */ nop
/* 0C8BB8 800C7FB8 10000087 */ b .L800C81D8
/* 0C8BBC 800C7FBC 00000000 */ nop
/* 0C8BBC 800C7FBC 00000000 */ nop
.L800C7FC0:
/* 0C8BC0 800C7FC0 0304C023 */ subu $t8, $t8, $a0
/* 0C8BC4 800C7FC4 0018C100 */ sll $t8, $t8, 4
@@ -634,7 +634,7 @@ glabel func_800C76C0
/* 0C8C14 800C8014 0C03243D */ jal func_800C90F4
/* 0C8C18 800C8018 A3C40043 */ sb $a0, 0x43($fp)
/* 0C8C1C 800C801C 10000017 */ b .L800C807C
/* 0C8C20 800C8020 00000000 */ nop
/* 0C8C20 800C8020 00000000 */ nop
.L800C8024:
/* 0C8C24 800C8024 28410004 */ slti $at, $v0, 4
/* 0C8C28 800C8028 1020000C */ beqz $at, .L800C805C
@@ -649,7 +649,7 @@ glabel func_800C76C0
/* 0C8C4C 800C804C 0C03243D */ jal func_800C90F4
/* 0C8C50 800C8050 A3C40043 */ sb $a0, 0x43($fp)
/* 0C8C54 800C8054 10000009 */ b .L800C807C
/* 0C8C58 800C8058 00000000 */ nop
/* 0C8C58 800C8058 00000000 */ nop
.L800C805C:
/* 0C8C5C 800C805C 94650254 */ lhu $a1, 0x254($v1)
/* 0C8C60 800C8060 3C012900 */ lui $at, (0x29008003 >> 16) # lui $at, 0x2900
@@ -783,7 +783,7 @@ glabel func_800C76C0
/* 0C8E40 800C8240 5461008A */ bnel $v1, $at, .L800C846C
/* 0C8E44 800C8244 8FDF002C */ lw $ra, 0x2c($fp)
/* 0C8E48 800C8248 0C032743 */ jal func_800C9D0C
/* 0C8E4C 800C824C 00000000 */ nop
/* 0C8E4C 800C824C 00000000 */ nop
/* 0C8E50 800C8250 10000086 */ b .L800C846C
/* 0C8E54 800C8254 8FDF002C */ lw $ra, 0x2c($fp)
.L800C8258:
@@ -806,7 +806,7 @@ glabel func_800C76C0
/* 0C8E94 800C8294 54610075 */ bnel $v1, $at, .L800C846C
/* 0C8E98 800C8298 8FDF002C */ lw $ra, 0x2c($fp)
/* 0C8E9C 800C829C 0C032743 */ jal func_800C9D0C
/* 0C8EA0 800C82A0 00000000 */ nop
/* 0C8EA0 800C82A0 00000000 */ nop
/* 0C8EA4 800C82A4 10000071 */ b .L800C846C
/* 0C8EA8 800C82A8 8FDF002C */ lw $ra, 0x2c($fp)
.L800C82AC:
@@ -827,7 +827,7 @@ glabel func_800C76C0
/* 0C8EE0 800C82E0 54610062 */ bnel $v1, $at, .L800C846C
/* 0C8EE4 800C82E4 8FDF002C */ lw $ra, 0x2c($fp)
/* 0C8EE8 800C82E8 0C0325F1 */ jal func_800C97C4
/* 0C8EEC 800C82EC 00000000 */ nop
/* 0C8EEC 800C82EC 00000000 */ nop
/* 0C8EF0 800C82F0 1000005E */ b .L800C846C
/* 0C8EF4 800C82F4 8FDF002C */ lw $ra, 0x2c($fp)
.L800C82F8:
@@ -852,7 +852,7 @@ glabel func_800C76C0
/* 0C8F3C 800C833C 54610022 */ bnel $v1, $at, .L800C83C8
/* 0C8F40 800C8340 8FD90034 */ lw $t9, 0x34($fp)
/* 0C8F44 800C8344 0C032743 */ jal func_800C9D0C
/* 0C8F48 800C8348 00000000 */ nop
/* 0C8F48 800C8348 00000000 */ nop
/* 0C8F4C 800C834C 1000001E */ b .L800C83C8
/* 0C8F50 800C8350 8FD90034 */ lw $t9, 0x34($fp)
.L800C8354:
@@ -873,7 +873,7 @@ glabel func_800C76C0
/* 0C8F88 800C8388 5461000F */ bnel $v1, $at, .L800C83C8
/* 0C8F8C 800C838C 8FD90034 */ lw $t9, 0x34($fp)
/* 0C8F90 800C8390 0C0325F1 */ jal func_800C97C4
/* 0C8F94 800C8394 00000000 */ nop
/* 0C8F94 800C8394 00000000 */ nop
/* 0C8F98 800C8398 1000000B */ b .L800C83C8
/* 0C8F9C 800C839C 8FD90034 */ lw $t9, 0x34($fp)
.L800C83A0:
@@ -919,7 +919,7 @@ glabel func_800C76C0
/* 0C902C 800C842C 5461000F */ bnel $v1, $at, .L800C846C
/* 0C9030 800C8430 8FDF002C */ lw $ra, 0x2c($fp)
/* 0C9034 800C8434 0C0325F1 */ jal func_800C97C4
/* 0C9038 800C8438 00000000 */ nop
/* 0C9038 800C8438 00000000 */ nop
/* 0C903C 800C843C 1000000B */ b .L800C846C
/* 0C9040 800C8440 8FDF002C */ lw $ra, 0x2c($fp)
.L800C8444:
asm/non_matchings/code_80005FD0/func_800070F4.s
+11 -11
View File
@@ -11,9 +11,9 @@ glabel func_800070F4
/* 007D18 80007118 3C068019 */ lui $a2, %hi(D_8018EDF3) # $a2, 0x8019
/* 007D1C 8000711C 24010003 */ li $at, 3
/* 007D20 80007120 104100EA */ beq $v0, $at, .L800074CC
/* 007D24 80007124 00000000 */ nop
/* 007D24 80007124 00000000 */ nop
/* 007D28 80007128 100000E8 */ b .L800074CC
/* 007D2C 8000712C 00000000 */ nop
/* 007D2C 8000712C 00000000 */ nop
.L80007130:
/* 007D30 80007130 10000002 */ b .L8000713C
/* 007D34 80007134 24060008 */ li $a2, 8
@@ -125,7 +125,7 @@ glabel func_800070F4
/* 007EBC 800072BC 01A74821 */ addu $t1, $t5, $a3
/* 007EC0 800072C0 01A41021 */ addu $v0, $t5, $a0
/* 007EC4 800072C4 4602003C */ c.lt.s $f0, $f2
/* 007EC8 800072C8 00000000 */ nop
/* 007EC8 800072C8 00000000 */ nop
/* 007ECC 800072CC 45020008 */ bc1fl .L800072F0
/* 007ED0 800072D0 24A20001 */ addiu $v0, $a1, 1
/* 007ED4 800072D4 8D2E0000 */ lw $t6, ($t1)
@@ -150,7 +150,7 @@ glabel func_800070F4
/* 007F14 80007314 01A41021 */ addu $v0, $t5, $a0
/* 007F18 80007318 01A75821 */ addu $t3, $t5, $a3
/* 007F1C 8000731C 4602003C */ c.lt.s $f0, $f2
/* 007F20 80007320 00000000 */ nop
/* 007F20 80007320 00000000 */ nop
/* 007F24 80007324 4502000A */ bc1fl .L80007350
/* 007F28 80007328 C5220004 */ lwc1 $f2, 4($t1)
/* 007F2C 8000732C 8D790000 */ lw $t9, ($t3)
@@ -166,7 +166,7 @@ glabel func_800070F4
/* 007F50 80007350 01A41021 */ addu $v0, $t5, $a0
/* 007F54 80007354 01A75821 */ addu $t3, $t5, $a3
/* 007F58 80007358 4602003C */ c.lt.s $f0, $f2
/* 007F5C 8000735C 00000000 */ nop
/* 007F5C 8000735C 00000000 */ nop
/* 007F60 80007360 45020008 */ bc1fl .L80007384
/* 007F64 80007364 25290008 */ addiu $t1, $t1, 8
/* 007F68 80007368 8D6E0004 */ lw $t6, 4($t3)
@@ -185,10 +185,10 @@ glabel func_800070F4
/* 007F94 80007394 24A50001 */ addiu $a1, $a1, 1
.L80007398:
/* 007F98 80007398 3C028016 */ lui $v0, %hi(D_801643E0) # $v0, 0x8016
/* 007F9C 8000739C 3C038016 */ lui $v1, %hi(D_801643B8) # $v1, 0x8016
/* 007F9C 8000739C 3C038016 */ lui $v1, %hi(gPlayerPositions) # $v1, 0x8016
/* 007FA0 800073A0 3C048016 */ lui $a0, %hi(D_801643D8) # $a0, 0x8016
/* 007FA4 800073A4 248443D8 */ addiu $a0, %lo(D_801643D8) # addiu $a0, $a0, 0x43d8
/* 007FA8 800073A8 246343B8 */ addiu $v1, %lo(D_801643B8) # addiu $v1, $v1, 0x43b8
/* 007FA8 800073A8 246343B8 */ addiu $v1, %lo(gPlayerPositions) # addiu $v1, $v1, 0x43b8
/* 007FAC 800073AC 244243E0 */ addiu $v0, %lo(D_801643E0) # addiu $v0, $v0, 0x43e0
/* 007FB0 800073B0 24050001 */ li $a1, 1
.L800073B4:
@@ -209,8 +209,8 @@ glabel func_800070F4
/* 007FEC 800073EC 0000C040 */ sll $t8, $zero, 1
/* 007FF0 800073F0 00007080 */ sll $t6, $zero, 2
/* 007FF4 800073F4 27AF0050 */ addiu $t7, $sp, 0x50
/* 007FF8 800073F8 3C0B8016 */ lui $t3, %hi(D_801643B8) # $t3, 0x8016
/* 007FFC 800073FC 256B43B8 */ addiu $t3, %lo(D_801643B8) # addiu $t3, $t3, 0x43b8
/* 007FF8 800073F8 3C0B8016 */ lui $t3, %hi(gPlayerPositions) # $t3, 0x8016
/* 007FFC 800073FC 256B43B8 */ addiu $t3, %lo(gPlayerPositions) # addiu $t3, $t3, 0x43b8
/* 008000 80007400 01CF1021 */ addu $v0, $t6, $t7
/* 008004 80007404 03194021 */ addu $t0, $t8, $t9
/* 008008 80007408 24050001 */ li $a1, 1
@@ -229,13 +229,13 @@ glabel func_800070F4
.L80007438:
/* 008038 80007438 3C0F8016 */ lui $t7, %hi(D_80164360) # $t7, 0x8016
/* 00803C 8000743C 25EF4360 */ addiu $t7, %lo(D_80164360) # addiu $t7, $t7, 0x4360
/* 008040 80007440 3C0B8016 */ lui $t3, %hi(D_801643B8) # $t3, 0x8016
/* 008040 80007440 3C0B8016 */ lui $t3, %hi(gPlayerPositions) # $t3, 0x8016
/* 008044 80007444 00077040 */ sll $t6, $a3, 1
/* 008048 80007448 0007C080 */ sll $t8, $a3, 2
/* 00804C 8000744C 27B90050 */ addiu $t9, $sp, 0x50
/* 008050 80007450 03191021 */ addu $v0, $t8, $t9
/* 008054 80007454 01CF4021 */ addu $t0, $t6, $t7
/* 008058 80007458 256B43B8 */ addiu $t3, %lo(D_801643B8) # addiu $t3, $t3, 0x43b8
/* 008058 80007458 256B43B8 */ addiu $t3, %lo(gPlayerPositions) # addiu $t3, $t3, 0x43b8
/* 00805C 8000745C 24E50001 */ addiu $a1, $a3, 1
.L80007460:
/* 008060 80007460 8C430000 */ lw $v1, ($v0)
asm/non_matchings/code_80005FD0/func_800074D4.s
+12 -12
View File
@@ -270,7 +270,7 @@ glabel func_800074D4
/* 0084B4 800078B4 00C34021 */ addu $t0, $a2, $v1
/* 0084B8 800078B8 00C51021 */ addu $v0, $a2, $a1
/* 0084BC 800078BC 4602003C */ c.lt.s $f0, $f2
/* 0084C0 800078C0 00000000 */ nop
/* 0084C0 800078C0 00000000 */ nop
/* 0084C4 800078C4 45020008 */ bc1fl .L800078E8
/* 0084C8 800078C8 24E20001 */ addiu $v0, $a3, 1
/* 0084CC 800078CC 8D190000 */ lw $t9, ($t0)
@@ -295,7 +295,7 @@ glabel func_800074D4
/* 00850C 8000790C 00C51021 */ addu $v0, $a2, $a1
/* 008510 80007910 00C34021 */ addu $t0, $a2, $v1
/* 008514 80007914 4602003C */ c.lt.s $f0, $f2
/* 008518 80007918 00000000 */ nop
/* 008518 80007918 00000000 */ nop
/* 00851C 8000791C 4502000A */ bc1fl .L80007948
/* 008520 80007920 C5820004 */ lwc1 $f2, 4($t4)
/* 008524 80007924 8D180000 */ lw $t8, ($t0)
@@ -311,7 +311,7 @@ glabel func_800074D4
/* 008548 80007948 00C51021 */ addu $v0, $a2, $a1
/* 00854C 8000794C 00C34021 */ addu $t0, $a2, $v1
/* 008550 80007950 4602003C */ c.lt.s $f0, $f2
/* 008554 80007954 00000000 */ nop
/* 008554 80007954 00000000 */ nop
/* 008558 80007958 45020008 */ bc1fl .L8000797C
/* 00855C 8000795C 258C0008 */ addiu $t4, $t4, 8
/* 008560 80007960 8D190004 */ lw $t9, 4($t0)
@@ -353,7 +353,7 @@ glabel func_800074D4
/* 0085E0 800079E0 00C34021 */ addu $t0, $a2, $v1
/* 0085E4 800079E4 00C51021 */ addu $v0, $a2, $a1
/* 0085E8 800079E8 4602003C */ c.lt.s $f0, $f2
/* 0085EC 800079EC 00000000 */ nop
/* 0085EC 800079EC 00000000 */ nop
/* 0085F0 800079F0 45020008 */ bc1fl .L80007A14
/* 0085F4 800079F4 24E20001 */ addiu $v0, $a3, 1
/* 0085F8 800079F8 8D180000 */ lw $t8, ($t0)
@@ -378,7 +378,7 @@ glabel func_800074D4
/* 008638 80007A38 00C51021 */ addu $v0, $a2, $a1
/* 00863C 80007A3C 00C34021 */ addu $t0, $a2, $v1
/* 008640 80007A40 4602003C */ c.lt.s $f0, $f2
/* 008644 80007A44 00000000 */ nop
/* 008644 80007A44 00000000 */ nop
/* 008648 80007A48 4502000A */ bc1fl .L80007A74
/* 00864C 80007A4C C5820004 */ lwc1 $f2, 4($t4)
/* 008650 80007A50 8D0F0000 */ lw $t7, ($t0)
@@ -394,7 +394,7 @@ glabel func_800074D4
/* 008674 80007A74 00C51021 */ addu $v0, $a2, $a1
/* 008678 80007A78 00C34021 */ addu $t0, $a2, $v1
/* 00867C 80007A7C 4602003C */ c.lt.s $f0, $f2
/* 008680 80007A80 00000000 */ nop
/* 008680 80007A80 00000000 */ nop
/* 008684 80007A84 45020008 */ bc1fl .L80007AA8
/* 008688 80007A88 258C0008 */ addiu $t4, $t4, 8
/* 00868C 80007A8C 8D180004 */ lw $t8, 4($t0)
@@ -413,10 +413,10 @@ glabel func_800074D4
/* 0086B8 80007AB8 24E70001 */ addiu $a3, $a3, 1
.L80007ABC:
/* 0086BC 80007ABC 3C028016 */ lui $v0, %hi(D_801643E0) # $v0, 0x8016
/* 0086C0 80007AC0 3C038016 */ lui $v1, %hi(D_801643B8) # $v1, 0x8016
/* 0086C0 80007AC0 3C038016 */ lui $v1, %hi(gPlayerPositions) # $v1, 0x8016
/* 0086C4 80007AC4 3C048016 */ lui $a0, %hi(D_801643D8) # $a0, 0x8016
/* 0086C8 80007AC8 248443D8 */ addiu $a0, %lo(D_801643D8) # addiu $a0, $a0, 0x43d8
/* 0086CC 80007ACC 246343B8 */ addiu $v1, %lo(D_801643B8) # addiu $v1, $v1, 0x43b8
/* 0086CC 80007ACC 246343B8 */ addiu $v1, %lo(gPlayerPositions) # addiu $v1, $v1, 0x43b8
/* 0086D0 80007AD0 244243E0 */ addiu $v0, %lo(D_801643E0) # addiu $v0, $v0, 0x43e0
/* 0086D4 80007AD4 24070001 */ li $a3, 1
.L80007AD8:
@@ -434,8 +434,8 @@ glabel func_800074D4
/* 008704 80007B04 0000C880 */ sll $t9, $zero, 2
/* 008708 80007B08 27AF0068 */ addiu $t7, $sp, 0x68
/* 00870C 80007B0C 0000C040 */ sll $t8, $zero, 1
/* 008710 80007B10 3C0C8016 */ lui $t4, %hi(D_801643B8) # $t4, 0x8016
/* 008714 80007B14 258C43B8 */ addiu $t4, %lo(D_801643B8) # addiu $t4, $t4, 0x43b8
/* 008710 80007B10 3C0C8016 */ lui $t4, %hi(gPlayerPositions) # $t4, 0x8016
/* 008714 80007B14 258C43B8 */ addiu $t4, %lo(gPlayerPositions) # addiu $t4, $t4, 0x43b8
/* 008718 80007B18 030E2021 */ addu $a0, $t8, $t6
/* 00871C 80007B1C 032F1021 */ addu $v0, $t9, $t7
/* 008720 80007B20 00002825 */ move $a1, $zero
@@ -455,13 +455,13 @@ glabel func_800074D4
.L80007B54:
/* 008754 80007B54 3C0F8016 */ lui $t7, %hi(D_80164360) # $t7, 0x8016
/* 008758 80007B58 25EF4360 */ addiu $t7, %lo(D_80164360) # addiu $t7, $t7, 0x4360
/* 00875C 80007B5C 3C0C8016 */ lui $t4, %hi(D_801643B8) # $t4, 0x8016
/* 00875C 80007B5C 3C0C8016 */ lui $t4, %hi(gPlayerPositions) # $t4, 0x8016
/* 008760 80007B60 0008C080 */ sll $t8, $t0, 2
/* 008764 80007B64 27AE0068 */ addiu $t6, $sp, 0x68
/* 008768 80007B68 0008C840 */ sll $t9, $t0, 1
/* 00876C 80007B6C 032F2021 */ addu $a0, $t9, $t7
/* 008770 80007B70 030E1021 */ addu $v0, $t8, $t6
/* 008774 80007B74 258C43B8 */ addiu $t4, %lo(D_801643B8) # addiu $t4, $t4, 0x43b8
/* 008774 80007B74 258C43B8 */ addiu $t4, %lo(gPlayerPositions) # addiu $t4, $t4, 0x43b8
/* 008778 80007B78 25070001 */ addiu $a3, $t0, 1
.L80007B7C:
/* 00877C 80007B7C 8C430000 */ lw $v1, ($v0)
asm/non_matchings/code_80005FD0/func_80007D04.s
+3 -3
View File
@@ -1,6 +1,6 @@
glabel func_80007D04
/* 008904 80007D04 3C0B8016 */ lui $t3, %hi(D_801643B8) # $t3, 0x8016
/* 008908 80007D08 256B43B8 */ addiu $t3, %lo(D_801643B8) # addiu $t3, $t3, 0x43b8
/* 008904 80007D04 3C0B8016 */ lui $t3, %hi(gPlayerPositions) # $t3, 0x8016
/* 008908 80007D08 256B43B8 */ addiu $t3, %lo(gPlayerPositions) # addiu $t3, $t3, 0x43b8
/* 00890C 80007D0C 3C038016 */ lui $v1, %hi(D_80163478) # $v1, 0x8016
/* 008910 80007D10 00041080 */ sll $v0, $a0, 2
/* 008914 80007D14 84633478 */ lh $v1, %lo(D_80163478)($v1)
@@ -178,4 +178,4 @@ glabel func_80007D04
/* 008B94 80007F94 8FBF0014 */ lw $ra, 0x14($sp)
/* 008B98 80007F98 27BD0030 */ addiu $sp, $sp, 0x30
/* 008B9C 80007F9C 03E00008 */ jr $ra
/* 008BA0 80007FA0 00000000 */ nop
/* 008BA0 80007FA0 00000000 */ nop
asm/non_matchings/code_80005FD0/func_800088D8.s
+17 -17
View File
@@ -20,7 +20,7 @@ glabel func_800088D8
/* 009520 80008920 8F18C53C */ lw $t8, %lo(gModeSelection)($t8)
/* 009524 80008924 24030001 */ li $v1, 1
/* 009528 80008928 14780003 */ bne $v1, $t8, .L80008938
/* 00952C 8000892C 00000000 */ nop
/* 00952C 8000892C 00000000 */ nop
/* 009530 80008930 10000121 */ b .L80008DB8
/* 009534 80008934 24020001 */ li $v0, 1
.L80008938:
@@ -54,7 +54,7 @@ glabel func_800088D8
/* 009598 80008998 3C0E800E */ lui $t6, %hi(gCurrentCourseId)
/* 00959C 8000899C 33194000 */ andi $t9, $t8, 0x4000
/* 0095A0 800089A0 13200003 */ beqz $t9, .L800089B0
/* 0095A4 800089A4 00000000 */ nop
/* 0095A4 800089A4 00000000 */ nop
/* 0095A8 800089A8 10000103 */ b .L80008DB8
/* 0095AC 800089AC 24020001 */ li $v0, 1
.L800089B0:
@@ -103,13 +103,13 @@ glabel func_800088D8
/* 009654 80008A54 46004281 */ sub.s $f10, $f8, $f0
/* 009658 80008A58 46809120 */ cvt.s.w $f4, $f18
/* 00965C 80008A5C 460A3402 */ mul.s $f16, $f6, $f10
/* 009660 80008A60 00000000 */ nop
/* 009660 80008A60 00000000 */ nop
/* 009664 80008A64 46002202 */ mul.s $f8, $f4, $f0
/* 009668 80008A68 46104180 */ add.s $f6, $f8, $f16
/* 00966C 80008A6C 4600328D */ trunc.w.s $f10, $f6
/* 009670 80008A70 44045000 */ mfc1 $a0, $f10
/* 009674 80008A74 10000002 */ b .L80008A80
/* 009678 80008A78 00000000 */ nop
/* 009678 80008A78 00000000 */ nop
/* 00967C 80008A7C 84E40000 */ lh $a0, ($a3)
.L80008A80:
/* 009680 80008A80 0085082A */ slt $at, $a0, $a1
@@ -125,9 +125,9 @@ glabel func_800088D8
/* 0096A8 80008AA8 44815000 */ mtc1 $at, $f10
/* 0096AC 80008AAC 46104182 */ mul.s $f6, $f8, $f16
/* 0096B0 80008AB0 4606503E */ c.le.s $f10, $f6
/* 0096B4 80008AB4 00000000 */ nop
/* 0096B4 80008AB4 00000000 */ nop
/* 0096B8 80008AB8 45000003 */ bc1f .L80008AC8
/* 0096BC 80008ABC 00000000 */ nop
/* 0096BC 80008ABC 00000000 */ nop
/* 0096C0 80008AC0 100000BD */ b .L80008DB8
/* 0096C4 80008AC4 00001025 */ move $v0, $zero
.L80008AC8:
@@ -182,13 +182,13 @@ glabel func_800088D8
/* 00977C 80008B7C 46004401 */ sub.s $f16, $f8, $f0
/* 009780 80008B80 468054A0 */ cvt.s.w $f18, $f10
/* 009784 80008B84 46102182 */ mul.s $f6, $f4, $f16
/* 009788 80008B88 00000000 */ nop
/* 009788 80008B88 00000000 */ nop
/* 00978C 80008B8C 46009202 */ mul.s $f8, $f18, $f0
/* 009790 80008B90 46064100 */ add.s $f4, $f8, $f6
/* 009794 80008B94 4600240D */ trunc.w.s $f16, $f4
/* 009798 80008B98 44048000 */ mfc1 $a0, $f16
/* 00979C 80008B9C 10000002 */ b .L80008BA8
/* 0097A0 80008BA0 00000000 */ nop
/* 0097A0 80008BA0 00000000 */ nop
.L80008BA4:
/* 0097A4 80008BA4 84E40000 */ lh $a0, ($a3)
.L80008BA8:
@@ -209,9 +209,9 @@ glabel func_800088D8
/* 0097E0 80008BE0 44818000 */ mtc1 $at, $f16
/* 0097E4 80008BE4 46064102 */ mul.s $f4, $f8, $f6
/* 0097E8 80008BE8 4604803E */ c.le.s $f16, $f4
/* 0097EC 80008BEC 00000000 */ nop
/* 0097EC 80008BEC 00000000 */ nop
/* 0097F0 80008BF0 45000003 */ bc1f .L80008C00
/* 0097F4 80008BF4 00000000 */ nop
/* 0097F4 80008BF4 00000000 */ nop
/* 0097F8 80008BF8 1000006F */ b .L80008DB8
/* 0097FC 80008BFC 00001025 */ move $v0, $zero
.L80008C00:
@@ -240,11 +240,11 @@ glabel func_800088D8
/* 009850 80008C50 24633348 */ addiu $v1, %lo(D_80163348) # addiu $v1, $v1, 0x3348
/* 009854 80008C54 948F0000 */ lhu $t7, ($a0)
.L80008C58:
/* 009858 80008C58 3C198016 */ lui $t9, %hi(D_801643B8)
/* 009858 80008C58 3C198016 */ lui $t9, %hi(gPlayerPositions)
/* 00985C 80008C5C 24840002 */ addiu $a0, $a0, 2
/* 009860 80008C60 000FC080 */ sll $t8, $t7, 2
/* 009864 80008C64 0338C821 */ addu $t9, $t9, $t8
/* 009868 80008C68 8F3943B8 */ lw $t9, %lo(D_801643B8)($t9)
/* 009868 80008C68 8F3943B8 */ lw $t9, %lo(gPlayerPositions)($t9)
/* 00986C 80008C6C 0326082A */ slt $at, $t9, $a2
/* 009870 80008C70 50200005 */ beql $at, $zero, .L80008C88
/* 009874 80008C74 0083082B */ sltu $at, $a0, $v1
@@ -257,10 +257,10 @@ glabel func_800088D8
/* 00988C 80008C8C 948F0000 */ lhu $t7, ($a0)
/* 009890 80008C90 3C098019 */ lui $t1, %hi(D_8018EDF3) # $t1, 0x8019
/* 009894 80008C94 8129EDF3 */ lb $t1, %lo(D_8018EDF3)($t1)
/* 009898 80008C98 3C188016 */ lui $t8, %hi(D_801643B8)
/* 009898 80008C98 3C188016 */ lui $t8, %hi(gPlayerPositions)
/* 00989C 80008C9C 00002025 */ move $a0, $zero
/* 0098A0 80008CA0 19200010 */ blez $t1, .L80008CE4
/* 0098A4 80008CA4 270343B8 */ addiu $v1, $t8, %lo(D_801643B8)
/* 0098A4 80008CA4 270343B8 */ addiu $v1, $t8, %lo(gPlayerPositions)
/* 0098A8 80008CA8 0009C880 */ sll $t9, $t1, 2
/* 0098AC 80008CAC 03237021 */ addu $t6, $t9, $v1
/* 0098B0 80008CB0 AFAE0004 */ sw $t6, 4($sp)
@@ -285,7 +285,7 @@ glabel func_800088D8
/* 0098F0 80008CF0 1C400003 */ bgtz $v0, .L80008D00
/* 0098F4 80008CF4 00184C03 */ sra $t1, $t8, 0x10
/* 0098F8 80008CF8 18800004 */ blez $a0, .L80008D0C
/* 0098FC 80008CFC 00000000 */ nop
/* 0098FC 80008CFC 00000000 */ nop
.L80008D00:
/* 009900 80008D00 25290001 */ addiu $t1, $t1, 1
/* 009904 80008D04 00097C00 */ sll $t7, $t1, 0x10
@@ -320,13 +320,13 @@ glabel func_800088D8
/* 00996C 80008D6C 46004181 */ sub.s $f6, $f8, $f0
/* 009970 80008D70 468082A0 */ cvt.s.w $f10, $f16
/* 009974 80008D74 46069102 */ mul.s $f4, $f18, $f6
/* 009978 80008D78 00000000 */ nop
/* 009978 80008D78 00000000 */ nop
/* 00997C 80008D7C 46005202 */ mul.s $f8, $f10, $f0
/* 009980 80008D80 46044480 */ add.s $f18, $f8, $f4
/* 009984 80008D84 4600918D */ trunc.w.s $f6, $f18
/* 009988 80008D88 44043000 */ mfc1 $a0, $f6
/* 00998C 80008D8C 10000003 */ b .L80008D9C
/* 009990 80008D90 00000000 */ nop
/* 009990 80008D90 00000000 */ nop
.L80008D94:
/* 009994 80008D94 00EFC821 */ addu $t9, $a3, $t7
/* 009998 80008D98 87240000 */ lh $a0, ($t9)
asm/non_matchings/code_80005FD0/func_800099EC.s
+2 -2
View File
@@ -25,8 +25,8 @@ glabel func_800099EC
/* 00A648 80009A48 00008025 */ move $s0, $zero
/* 00A64C 80009A4C 0014A880 */ sll $s5, $s4, 2
/* 00A650 80009A50 18800021 */ blez $a0, .L80009AD8
/* 00A654 80009A54 3C198016 */ lui $t9, %hi(D_801643B8)
/* 00A658 80009A58 273243B8 */ addiu $s2, $t9, %lo(D_801643B8)
/* 00A654 80009A54 3C198016 */ lui $t9, %hi(gPlayerPositions)
/* 00A658 80009A58 273243B8 */ addiu $s2, $t9, %lo(gPlayerPositions)
/* 00A65C 80009A5C 3C1E2900 */ lui $fp, (0x2900800D >> 16) # lui $fp, 0x2900
/* 00A660 80009A60 3C138016 */ lui $s3, %hi(D_801643E0) # $s3, 0x8016
/* 00A664 80009A64 267343E0 */ addiu $s3, %lo(D_801643E0) # addiu $s3, $s3, 0x43e0
asm/non_matchings/code_80005FD0/func_80009B60.s
+74 -74
View File
@@ -78,40 +78,40 @@ glabel func_80009B60
/* 00A888 80009C88 24180004 */ li $t8, 4
/* 00A88C 80009C8C 3C0F8016 */ lui $t7, %hi(D_8015F6F0) # $t7, 0x8016
/* 00A890 80009C90 460A003C */ c.lt.s $f0, $f10
/* 00A894 80009C94 00000000 */ nop
/* 00A894 80009C94 00000000 */ nop
/* 00A898 80009C98 45000003 */ bc1f .L80009CA8
/* 00A89C 80009C9C 00000000 */ nop
/* 00A89C 80009C9C 00000000 */ nop
/* 00A8A0 80009CA0 A44A0000 */ sh $t2, ($v0)
/* 00A8A4 80009CA4 C4600014 */ lwc1 $f0, 0x14($v1)
.L80009CA8:
/* 00A8A8 80009CA8 856BF6E8 */ lh $t3, %lo(D_8015F6E8)($t3)
/* 00A8AC 80009CAC 448B8000 */ mtc1 $t3, $f16
/* 00A8B0 80009CB0 00000000 */ nop
/* 00A8B0 80009CB0 00000000 */ nop
/* 00A8B4 80009CB4 468084A0 */ cvt.s.w $f18, $f16
/* 00A8B8 80009CB8 4600903C */ c.lt.s $f18, $f0
/* 00A8BC 80009CBC 00000000 */ nop
/* 00A8BC 80009CBC 00000000 */ nop
/* 00A8C0 80009CC0 45000002 */ bc1f .L80009CCC
/* 00A8C4 80009CC4 00000000 */ nop
/* 00A8C4 80009CC4 00000000 */ nop
/* 00A8C8 80009CC8 A44C0000 */ sh $t4, ($v0)
.L80009CCC:
/* 00A8CC 80009CCC 85ADF6F2 */ lh $t5, %lo(D_8015F6F2)($t5)
/* 00A8D0 80009CD0 C460001C */ lwc1 $f0, 0x1c($v1)
/* 00A8D4 80009CD4 448D2000 */ mtc1 $t5, $f4
/* 00A8D8 80009CD8 00000000 */ nop
/* 00A8D8 80009CD8 00000000 */ nop
/* 00A8DC 80009CDC 468021A0 */ cvt.s.w $f6, $f4
/* 00A8E0 80009CE0 4606003C */ c.lt.s $f0, $f6
/* 00A8E4 80009CE4 00000000 */ nop
/* 00A8E4 80009CE4 00000000 */ nop
/* 00A8E8 80009CE8 45000003 */ bc1f .L80009CF8
/* 00A8EC 80009CEC 00000000 */ nop
/* 00A8EC 80009CEC 00000000 */ nop
/* 00A8F0 80009CF0 A44E0000 */ sh $t6, ($v0)
/* 00A8F4 80009CF4 C460001C */ lwc1 $f0, 0x1c($v1)
.L80009CF8:
/* 00A8F8 80009CF8 85EFF6F0 */ lh $t7, %lo(D_8015F6F0)($t7)
/* 00A8FC 80009CFC 448F4000 */ mtc1 $t7, $f8
/* 00A900 80009D00 00000000 */ nop
/* 00A900 80009D00 00000000 */ nop
/* 00A904 80009D04 468042A0 */ cvt.s.w $f10, $f8
/* 00A908 80009D08 4600503C */ c.lt.s $f10, $f0
/* 00A90C 80009D0C 00000000 */ nop
/* 00A90C 80009D0C 00000000 */ nop
/* 00A910 80009D10 45020003 */ bc1fl .L80009D20
/* 00A914 80009D14 846200CA */ lh $v0, 0xca($v1)
/* 00A918 80009D18 A4580000 */ sh $t8, ($v0)
@@ -142,7 +142,7 @@ glabel func_80009B60
/* 00A978 80009D78 8FA400D0 */ lw $a0, 0xd0($sp)
/* 00A97C 80009D7C 24010012 */ li $at, 18
/* 00A980 80009D80 1041000C */ beq $v0, $at, .L80009DB4
/* 00A984 80009D84 00000000 */ nop
/* 00A984 80009D84 00000000 */ nop
/* 00A988 80009D88 1000001A */ b .L80009DF4
/* 00A98C 80009D8C 8FA50040 */ lw $a1, 0x40($sp)
.L80009D90:
@@ -152,7 +152,7 @@ glabel func_80009B60
/* 00A99C 80009D9C 55800015 */ bnel $t4, $zero, .L80009DF4
/* 00A9A0 80009DA0 8FA50040 */ lw $a1, 0x40($sp)
/* 00A9A4 80009DA4 0C004C15 */ jal func_80013054
/* 00A9A8 80009DA8 00000000 */ nop
/* 00A9A8 80009DA8 00000000 */ nop
/* 00A9AC 80009DAC 10000011 */ b .L80009DF4
/* 00A9B0 80009DB0 8FA50040 */ lw $a1, 0x40($sp)
.L80009DB4:
@@ -178,7 +178,7 @@ glabel func_80009B60
/* 00A9F8 80009DF8 94AD0000 */ lhu $t5, ($a1)
/* 00A9FC 80009DFC 31AE0800 */ andi $t6, $t5, 0x800
/* 00AA00 80009E00 11C00008 */ beqz $t6, .L80009E24
/* 00AA04 80009E04 00000000 */ nop
/* 00AA04 80009E04 00000000 */ nop
/* 00AA08 80009E08 8CAF00BC */ lw $t7, 0xbc($a1)
/* 00AA0C 80009E0C 84B90044 */ lh $t9, 0x44($a1)
/* 00AA10 80009E10 3421FFFF */ ori $at, (0xFFBFFFFF & 0xFFFF) # ori $at, $at, 0xffff
@@ -200,12 +200,12 @@ glabel func_80009B60
/* 00AA4C 80009E4C 24010001 */ li $at, 1
/* 00AA50 80009E50 8FAE00D0 */ lw $t6, 0xd0($sp)
/* 00AA54 80009E54 11A10003 */ beq $t5, $at, .L80009E64
/* 00AA58 80009E58 00000000 */ nop
/* 00AA58 80009E58 00000000 */ nop
/* 00AA5C 80009E5C 55C00004 */ bnel $t6, $zero, .L80009E70
/* 00AA60 80009E60 8FAF0040 */ lw $t7, 0x40($sp)
.L80009E64:
/* 00AA64 80009E64 0C0019F1 */ jal set_places
/* 00AA68 80009E68 00000000 */ nop
/* 00AA68 80009E68 00000000 */ nop
.L80009E6C:
/* 00AA6C 80009E6C 8FAF0040 */ lw $t7, 0x40($sp)
.L80009E70:
@@ -221,7 +221,7 @@ glabel func_80009B60
/* 00AA94 80009E94 856BC5A0 */ lh $t3, %lo(gCurrentCourseId)($t3)
/* 00AA98 80009E98 24010014 */ li $at, 20
/* 00AA9C 80009E9C 11610003 */ beq $t3, $at, .L80009EAC
/* 00AAA0 80009EA0 00000000 */ nop
/* 00AAA0 80009EA0 00000000 */ nop
/* 00AAA4 80009EA4 0C00478E */ jal func_80011E38
/* 00AAA8 80009EA8 8FA400D0 */ lw $a0, 0xd0($sp)
.L80009EAC:
@@ -250,9 +250,9 @@ glabel func_80009B60
/* 00AB00 80009F00 10410006 */ beq $v0, $at, .L80009F1C
/* 00AB04 80009F04 24010003 */ li $at, 3
/* 00AB08 80009F08 10410004 */ beq $v0, $at, .L80009F1C
/* 00AB0C 80009F0C 00000000 */ nop
/* 00AB0C 80009F0C 00000000 */ nop
/* 00AB10 80009F10 10000002 */ b .L80009F1C
/* 00AB14 80009F14 00000000 */ nop
/* 00AB14 80009F14 00000000 */ nop
.L80009F18:
/* 00AB18 80009F18 24090001 */ li $t1, 1
.L80009F1C:
@@ -266,12 +266,12 @@ glabel func_80009B60
/* 00AB38 80009F38 3C0D8016 */ lui $t5, %hi(D_801646CC) # $t5, 0x8016
/* 00AB3C 80009F3C 314B1000 */ andi $t3, $t2, 0x1000
/* 00AB40 80009F40 11600007 */ beqz $t3, .L80009F60
/* 00AB44 80009F44 00000000 */ nop
/* 00AB44 80009F44 00000000 */ nop
/* 00AB48 80009F48 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6)
/* 00AB4C 80009F4C 24010014 */ li $at, 20
/* 00AB50 80009F50 240F0001 */ li $t7, 1
/* 00AB54 80009F54 11C10002 */ beq $t6, $at, .L80009F60
/* 00AB58 80009F58 00000000 */ nop
/* 00AB58 80009F58 00000000 */ nop
/* 00AB5C 80009F5C A4AF0000 */ sh $t7, ($a1)
.L80009F60:
/* 00AB60 80009F60 95AD46CC */ lhu $t5, %lo(D_801646CC)($t5)
@@ -380,7 +380,7 @@ glabel func_80009B60
/* 00ACDC 8000A0DC 10410004 */ beq $v0, $at, .L8000A0F0
/* 00ACE0 8000A0E0 00602025 */ move $a0, $v1
/* 00ACE4 8000A0E4 10000013 */ b .L8000A134
/* 00ACE8 8000A0E8 00000000 */ nop
/* 00ACE8 8000A0E8 00000000 */ nop
.L8000A0EC:
/* 00ACEC 8000A0EC 00602025 */ move $a0, $v1
.L8000A0F0:
@@ -443,9 +443,9 @@ glabel func_80009B60
/* 00ADC4 8000A1C4 01685821 */ addu $t3, $t3, $t0
/* 00ADC8 8000A1C8 1539000E */ bne $t1, $t9, .L8000A204
/* 00ADCC 8000A1CC 8FAE0038 */ lw $t6, 0x38($sp)
/* 00ADD0 8000A1D0 3C0F8016 */ lui $t7, %hi(D_801643B8)
/* 00ADD0 8000A1D0 3C0F8016 */ lui $t7, %hi(gPlayerPositions)
/* 00ADD4 8000A1D4 01EE7821 */ addu $t7, $t7, $t6
/* 00ADD8 8000A1D8 8DEF43B8 */ lw $t7, %lo(D_801643B8)($t7)
/* 00ADD8 8000A1D8 8DEF43B8 */ lw $t7, %lo(gPlayerPositions)($t7)
/* 00ADDC 8000A1DC 956B334C */ lhu $t3, %lo(D_8016334C)($t3) # 0x334c($t3)
/* 00ADE0 8000A1E0 3C0C8016 */ lui $t4, %hi(D_80163210) # $t4, 0x8016
/* 00ADE4 8000A1E4 258C3210 */ addiu $t4, %lo(D_80163210) # addiu $t4, $t4, 0x3210
@@ -571,9 +571,9 @@ glabel func_80009B60
/* 00AFB4 8000A3B4 3C0F8016 */ lui $t7, %hi(D_80164590) # 0x8016
/* 00AFB8 8000A3B8 46062200 */ add.s $f8, $f4, $f6
/* 00AFBC 8000A3BC 4608903C */ c.lt.s $f18, $f8
/* 00AFC0 8000A3C0 00000000 */ nop
/* 00AFC0 8000A3C0 00000000 */ nop
/* 00AFC4 8000A3C4 45000039 */ bc1f .L8000A4AC
/* 00AFC8 8000A3C8 00000000 */ nop
/* 00AFC8 8000A3C8 00000000 */ nop
/* 00AFCC 8000A3CC 3C0F8016 */ lui $t7, %hi(D_80163448) # $t7, 0x8016
/* 00AFD0 8000A3D0 8DEF3448 */ lw $t7, %lo(D_80163448)($t7)
/* 00AFD4 8000A3D4 8FA400D0 */ lw $a0, 0xd0($sp)
@@ -599,14 +599,14 @@ glabel func_80009B60
/* 00B024 8000A424 01802025 */ move $a0, $t4
/* 00B028 8000A428 8FB90038 */ lw $t9, 0x38($sp)
/* 00B02C 8000A42C 17000002 */ bnez $t8, .L8000A438
/* 00B030 8000A430 00000000 */ nop
/* 00B030 8000A430 00000000 */ nop
/* 00B034 8000A434 0007000D */ break 7
.L8000A438:
/* 00B038 8000A438 2401FFFF */ li $at, -1
/* 00B03C 8000A43C 17010004 */ bne $t8, $at, .L8000A450
/* 00B040 8000A440 3C018000 */ lui $at, 0x8000
/* 00B044 8000A444 14810002 */ bne $a0, $at, .L8000A450
/* 00B048 8000A448 00000000 */ nop
/* 00B048 8000A448 00000000 */ nop
/* 00B04C 8000A44C 0006000D */ break 6
.L8000A450:
/* 00B050 8000A450 00002010 */ mfhi $a0
@@ -646,14 +646,14 @@ glabel func_80009B60
/* 00B0CC 8000A4CC 0000C010 */ mfhi $t8
/* 00B0D0 8000A4D0 00185040 */ sll $t2, $t8, 1
/* 00B0D4 8000A4D4 15800002 */ bnez $t4, .L8000A4E0
/* 00B0D8 8000A4D8 00000000 */ nop
/* 00B0D8 8000A4D8 00000000 */ nop
/* 00B0DC 8000A4DC 0007000D */ break 7
.L8000A4E0:
/* 00B0E0 8000A4E0 2401FFFF */ li $at, -1
/* 00B0E4 8000A4E4 15810004 */ bne $t4, $at, .L8000A4F8
/* 00B0E8 8000A4E8 3C018000 */ lui $at, 0x8000
/* 00B0EC 8000A4EC 15C10002 */ bne $t6, $at, .L8000A4F8
/* 00B0F0 8000A4F0 00000000 */ nop
/* 00B0F0 8000A4F0 00000000 */ nop
/* 00B0F4 8000A4F4 0006000D */ break 6
.L8000A4F8:
/* 00B0F8 8000A4F8 01EA5821 */ addu $t3, $t7, $t2
@@ -682,7 +682,7 @@ glabel func_80009B60
/* 00B148 8000A548 51220004 */ beql $t1, $v0, .L8000A55C
/* 00B14C 8000A54C 8DAF00BC */ lw $t7, 0xbc($t5)
/* 00B150 8000A550 14410006 */ bne $v0, $at, .L8000A56C
/* 00B154 8000A554 00000000 */ nop
/* 00B154 8000A554 00000000 */ nop
/* 00B158 8000A558 8DAF00BC */ lw $t7, 0xbc($t5)
.L8000A55C:
/* 00B15C 8000A55C 35EA0010 */ ori $t2, $t7, 0x10
@@ -718,49 +718,49 @@ glabel func_80009B60
/* 00B1D0 8000A5D0 03260019 */ multu $t9, $a2
/* 00B1D4 8000A5D4 846B0000 */ lh $t3, ($v1)
/* 00B1D8 8000A5D8 15A00002 */ bnez $t5, .L8000A5E4
/* 00B1DC 8000A5DC 00000000 */ nop
/* 00B1DC 8000A5DC 00000000 */ nop
/* 00B1E0 8000A5E0 0007000D */ break 7
.L8000A5E4:
/* 00B1E4 8000A5E4 2401FFFF */ li $at, -1
/* 00B1E8 8000A5E8 15A10004 */ bne $t5, $at, .L8000A5FC
/* 00B1EC 8000A5EC 3C018000 */ lui $at, 0x8000
/* 00B1F0 8000A5F0 15410002 */ bne $t2, $at, .L8000A5FC
/* 00B1F4 8000A5F4 00000000 */ nop
/* 00B1F4 8000A5F4 00000000 */ nop
/* 00B1F8 8000A5F8 0006000D */ break 6
.L8000A5FC:
/* 00B1FC 8000A5FC 00007812 */ mflo $t7
/* 00B200 8000A600 00000000 */ nop
/* 00B204 8000A604 00000000 */ nop
/* 00B200 8000A600 00000000 */ nop
/* 00B204 8000A604 00000000 */ nop
/* 00B208 8000A608 01E7001A */ div $zero, $t7, $a3
/* 00B20C 8000A60C 00002012 */ mflo $a0
/* 00B210 8000A610 00045400 */ sll $t2, $a0, 0x10
/* 00B214 8000A614 14E00002 */ bnez $a3, .L8000A620
/* 00B218 8000A618 00000000 */ nop
/* 00B218 8000A618 00000000 */ nop
/* 00B21C 8000A61C 0007000D */ break 7
.L8000A620:
/* 00B220 8000A620 2401FFFF */ li $at, -1
/* 00B224 8000A624 14E10004 */ bne $a3, $at, .L8000A638
/* 00B228 8000A628 3C018000 */ lui $at, 0x8000
/* 00B22C 8000A62C 15E10002 */ bne $t7, $at, .L8000A638
/* 00B230 8000A630 00000000 */ nop
/* 00B230 8000A630 00000000 */ nop
/* 00B234 8000A634 0006000D */ break 6
.L8000A638:
/* 00B238 8000A638 01660019 */ multu $t3, $a2
/* 00B23C 8000A63C 000A6C03 */ sra $t5, $t2, 0x10
/* 00B240 8000A640 01A02025 */ move $a0, $t5
/* 00B244 8000A644 00006012 */ mflo $t4
/* 00B248 8000A648 00000000 */ nop
/* 00B24C 8000A64C 00000000 */ nop
/* 00B248 8000A648 00000000 */ nop
/* 00B24C 8000A64C 00000000 */ nop
/* 00B250 8000A650 0187001A */ div $zero, $t4, $a3
/* 00B254 8000A654 14E00002 */ bnez $a3, .L8000A660
/* 00B258 8000A658 00000000 */ nop
/* 00B258 8000A658 00000000 */ nop
/* 00B25C 8000A65C 0007000D */ break 7
.L8000A660:
/* 00B260 8000A660 2401FFFF */ li $at, -1
/* 00B264 8000A664 14E10004 */ bne $a3, $at, .L8000A678
/* 00B268 8000A668 3C018000 */ lui $at, 0x8000
/* 00B26C 8000A66C 15810002 */ bne $t4, $at, .L8000A678
/* 00B270 8000A670 00000000 */ nop
/* 00B270 8000A670 00000000 */ nop
/* 00B274 8000A674 0006000D */ break 6
.L8000A678:
/* 00B278 8000A678 00002812 */ mflo $a1
@@ -820,11 +820,11 @@ glabel func_80009B60
/* 00B338 8000A738 5041000F */ beql $v0, $at, .L8000A778
/* 00B33C 8000A73C 2861FFFB */ slti $at, $v1, -5
/* 00B340 8000A740 10000015 */ b .L8000A798
/* 00B344 8000A744 00000000 */ nop
/* 00B344 8000A744 00000000 */ nop
.L8000A748:
/* 00B348 8000A748 28610006 */ slti $at, $v1, 6
/* 00B34C 8000A74C 14200007 */ bnez $at, .L8000A76C
/* 00B350 8000A750 00000000 */ nop
/* 00B350 8000A750 00000000 */ nop
/* 00B354 8000A754 8FAE0040 */ lw $t6, 0x40($sp)
/* 00B358 8000A758 A4800000 */ sh $zero, ($a0)
/* 00B35C 8000A75C 2401FFEF */ li $at, -17
@@ -833,11 +833,11 @@ glabel func_80009B60
/* 00B368 8000A768 ADD900BC */ sw $t9, 0xbc($t6)
.L8000A76C:
/* 00B36C 8000A76C 1000000A */ b .L8000A798
/* 00B370 8000A770 00000000 */ nop
/* 00B370 8000A770 00000000 */ nop
/* 00B374 8000A774 2861FFFB */ slti $at, $v1, -5
.L8000A778:
/* 00B378 8000A778 10200007 */ beqz $at, .L8000A798
/* 00B37C 8000A77C 00000000 */ nop
/* 00B37C 8000A77C 00000000 */ nop
/* 00B380 8000A780 8FAF0040 */ lw $t7, 0x40($sp)
/* 00B384 8000A784 A4800000 */ sh $zero, ($a0)
/* 00B388 8000A788 2401FFEF */ li $at, -17
@@ -888,7 +888,7 @@ glabel func_80009B60
/* 00B434 8000A834 24010014 */ li $at, 20
/* 00B438 8000A838 8FA90038 */ lw $t1, 0x38($sp)
/* 00B43C 8000A83C 10410099 */ beq $v0, $at, .L8000AAA4
/* 00B440 8000A840 00000000 */ nop
/* 00B440 8000A840 00000000 */ nop
/* 00B444 8000A844 3C058016 */ lui $a1, %hi(D_80164450) # 0x8016
/* 00B448 8000A848 00A92821 */ addu $a1, $a1, $t1
/* 00B44C 8000A84C 8CA54450 */ lw $a1, %lo(D_80164450)($a1) # 0x4450($a1)
@@ -896,7 +896,7 @@ glabel func_80009B60
/* 00B454 8000A854 273934F8 */ addiu $t9, %lo(D_801634F8) # addiu $t9, $t9, 0x34f8
/* 00B458 8000A858 28A1000B */ slti $at, $a1, 0xb
/* 00B45C 8000A85C 10200045 */ beqz $at, .L8000A974
/* 00B460 8000A860 00000000 */ nop
/* 00B460 8000A860 00000000 */ nop
/* 00B464 8000A864 8FAC00D0 */ lw $t4, 0xd0($sp)
/* 00B468 8000A868 3C048016 */ lui $a0, %hi(D_801630E0) # $a0, 0x8016
/* 00B46C 8000A86C 948430E0 */ lhu $a0, %lo(D_801630E0)($a0)
@@ -914,14 +914,14 @@ glabel func_80009B60
/* 00B49C 8000A89C 24050000 */ li $a1, 0
/* 00B4A0 8000A8A0 01CA001A */ div $zero, $t6, $t2
/* 00B4A4 8000A8A4 15400002 */ bnez $t2, .L8000A8B0
/* 00B4A8 8000A8A8 00000000 */ nop
/* 00B4A8 8000A8A8 00000000 */ nop
/* 00B4AC 8000A8AC 0007000D */ break 7
.L8000A8B0:
/* 00B4B0 8000A8B0 2401FFFF */ li $at, -1
/* 00B4B4 8000A8B4 15410004 */ bne $t2, $at, .L8000A8C8
/* 00B4B8 8000A8B8 3C018000 */ lui $at, 0x8000
/* 00B4BC 8000A8BC 14810002 */ bne $a0, $at, .L8000A8C8
/* 00B4C0 8000A8C0 00000000 */ nop
/* 00B4C0 8000A8C0 00000000 */ nop
/* 00B4C4 8000A8C4 0006000D */ break 6
.L8000A8C8:
/* 00B4C8 8000A8C8 00002010 */ mfhi $a0
@@ -945,14 +945,14 @@ glabel func_80009B60
/* 00B508 8000A908 3C188016 */ lui $t8, %hi(D_80163068) # $t8, 0x8016
/* 00B50C 8000A90C 01EB001A */ div $zero, $t7, $t3
/* 00B510 8000A910 15600002 */ bnez $t3, .L8000A91C
/* 00B514 8000A914 00000000 */ nop
/* 00B514 8000A914 00000000 */ nop
/* 00B518 8000A918 0007000D */ break 7
.L8000A91C:
/* 00B51C 8000A91C 2401FFFF */ li $at, -1
/* 00B520 8000A920 15610004 */ bne $t3, $at, .L8000A934
/* 00B524 8000A924 3C018000 */ lui $at, 0x8000
/* 00B528 8000A928 14810002 */ bne $a0, $at, .L8000A934
/* 00B52C 8000A92C 00000000 */ nop
/* 00B52C 8000A92C 00000000 */ nop
/* 00B530 8000A930 0006000D */ break 6
.L8000A934:
/* 00B534 8000A934 00002010 */ mfhi $a0
@@ -982,7 +982,7 @@ glabel func_80009B60
/* 00B590 8000A990 854A2FF8 */ lh $t2, %lo(D_80162FF8)($t2) # 0x2ff8($t2)
/* 00B594 8000A994 3C0F8016 */ lui $t7, %hi(D_80164430) # $t7, 0x8016
/* 00B598 8000A998 15400019 */ bnez $t2, .L8000AA00
/* 00B59C 8000A99C 00000000 */ nop
/* 00B59C 8000A99C 00000000 */ nop
/* 00B5A0 8000A9A0 3C048016 */ lui $a0, %hi(D_801630E0) # $a0, 0x8016
/* 00B5A4 8000A9A4 948430E0 */ lhu $a0, %lo(D_801630E0)($a0)
/* 00B5A8 8000A9A8 95EF4430 */ lhu $t7, %lo(D_80164430)($t7)
@@ -992,14 +992,14 @@ glabel func_80009B60
/* 00B5B8 8000A9B8 01AF001A */ div $zero, $t5, $t7
/* 00B5BC 8000A9BC 01A02025 */ move $a0, $t5
/* 00B5C0 8000A9C0 15E00002 */ bnez $t7, .L8000A9CC
/* 00B5C4 8000A9C4 00000000 */ nop
/* 00B5C4 8000A9C4 00000000 */ nop
/* 00B5C8 8000A9C8 0007000D */ break 7
.L8000A9CC:
/* 00B5CC 8000A9CC 2401FFFF */ li $at, -1
/* 00B5D0 8000A9D0 15E10004 */ bne $t7, $at, .L8000A9E4
/* 00B5D4 8000A9D4 3C018000 */ lui $at, 0x8000
/* 00B5D8 8000A9D8 14810002 */ bne $a0, $at, .L8000A9E4
/* 00B5DC 8000A9DC 00000000 */ nop
/* 00B5DC 8000A9DC 00000000 */ nop
/* 00B5E0 8000A9E0 0006000D */ break 6
.L8000A9E4:
/* 00B5E4 8000A9E4 00002010 */ mfhi $a0
@@ -1025,7 +1025,7 @@ glabel func_80009B60
/* 00B630 8000AA30 8FB80038 */ lw $t8, 0x38($sp)
/* 00B634 8000AA34 854D0000 */ lh $t5, ($t2)
/* 00B638 8000AA38 19A0001A */ blez $t5, .L8000AAA4
/* 00B63C 8000AA3C 00000000 */ nop
/* 00B63C 8000AA3C 00000000 */ nop
/* 00B640 8000AA40 3C048016 */ lui $a0, %hi(D_801630E0) # $a0, 0x8016
/* 00B644 8000AA44 948430E0 */ lhu $a0, %lo(D_801630E0)($a0)
/* 00B648 8000AA48 956B4430 */ lhu $t3, %lo(D_80164430)($t3)
@@ -1035,14 +1035,14 @@ glabel func_80009B60
/* 00B658 8000AA58 01EB001A */ div $zero, $t7, $t3
/* 00B65C 8000AA5C 01E02025 */ move $a0, $t7
/* 00B660 8000AA60 15600002 */ bnez $t3, .L8000AA6C
/* 00B664 8000AA64 00000000 */ nop
/* 00B664 8000AA64 00000000 */ nop
/* 00B668 8000AA68 0007000D */ break 7
.L8000AA6C:
/* 00B66C 8000AA6C 2401FFFF */ li $at, -1
/* 00B670 8000AA70 15610004 */ bne $t3, $at, .L8000AA84
/* 00B674 8000AA74 3C018000 */ lui $at, 0x8000
/* 00B678 8000AA78 14810002 */ bne $a0, $at, .L8000AA84
/* 00B67C 8000AA7C 00000000 */ nop
/* 00B67C 8000AA7C 00000000 */ nop
/* 00B680 8000AA80 0006000D */ break 6
.L8000AA84:
/* 00B684 8000AA84 00002010 */ mfhi $a0
@@ -1074,7 +1074,7 @@ glabel func_80009B60
/* 00B6E8 8000AAE8 1041000C */ beq $v0, $at, .L8000AB1C
/* 00B6EC 8000AAEC 8FAD0024 */ lw $t5, 0x24($sp)
/* 00B6F0 8000AAF0 1000002B */ b .L8000ABA0
/* 00B6F4 8000AAF4 00000000 */ nop
/* 00B6F4 8000AAF4 00000000 */ nop
.L8000AAF8:
/* 00B6F8 8000AAF8 3C018016 */ lui $at, %hi(D_80163418)
/* 00B6FC 8000AAFC 00290821 */ addu $at, $at, $t1
@@ -1104,21 +1104,21 @@ glabel func_80009B60
/* 00B758 8000AB58 24E72FA0 */ addiu $a3, %lo(D_80162FA0) # addiu $a3, $a3, 0x2fa0
/* 00B75C 8000AB5C 448D9000 */ mtc1 $t5, $f18
/* 00B760 8000AB60 17000002 */ bnez $t8, .L8000AB6C
/* 00B764 8000AB64 00000000 */ nop
/* 00B764 8000AB64 00000000 */ nop
/* 00B768 8000AB68 0007000D */ break 7
.L8000AB6C:
/* 00B76C 8000AB6C 2401FFFF */ li $at, -1
/* 00B770 8000AB70 17010004 */ bne $t8, $at, .L8000AB84
/* 00B774 8000AB74 3C018000 */ lui $at, 0x8000
/* 00B778 8000AB78 15610002 */ bne $t3, $at, .L8000AB84
/* 00B77C 8000AB7C 00000000 */ nop
/* 00B77C 8000AB7C 00000000 */ nop
/* 00B780 8000AB80 0006000D */ break 6
.L8000AB84:
/* 00B784 8000AB84 46809220 */ cvt.s.w $f8, $f18
/* 00B788 8000AB88 E4E80000 */ swc1 $f8, ($a3)
/* 00B78C 8000AB8C 844F0004 */ lh $t7, 4($v0)
/* 00B790 8000AB90 448F5000 */ mtc1 $t7, $f10
/* 00B794 8000AB94 00000000 */ nop
/* 00B794 8000AB94 00000000 */ nop
/* 00B798 8000AB98 46805420 */ cvt.s.w $f16, $f10
/* 00B79C 8000AB9C E4F00008 */ swc1 $f16, 8($a3)
.L8000ABA0:
@@ -1211,13 +1211,13 @@ glabel func_80009B60
/* 00B8EC 8000ACEC 3C01BF00 */ li $at, 0xBF000000 # -0.500000
/* 00B8F0 8000ACF0 44814000 */ mtc1 $at, $f8
/* 00B8F4 8000ACF4 4600903C */ c.lt.s $f18, $f0
/* 00B8F8 8000ACF8 00000000 */ nop
/* 00B8F8 8000ACF8 00000000 */ nop
/* 00B8FC 8000ACFC 45020003 */ bc1fl .L8000AD0C
/* 00B900 8000AD00 4608003C */ c.lt.s $f0, $f8
/* 00B904 8000AD04 24030014 */ li $v1, 20
/* 00B908 8000AD08 4608003C */ c.lt.s $f0, $f8
.L8000AD0C:
/* 00B90C 8000AD0C 00000000 */ nop
/* 00B90C 8000AD0C 00000000 */ nop
/* 00B910 8000AD10 45020013 */ bc1fl .L8000AD60
/* 00B914 8000AD14 8FAA0034 */ lw $t2, 0x34($sp)
/* 00B918 8000AD18 10000010 */ b .L8000AD5C
@@ -1229,13 +1229,13 @@ glabel func_80009B60
/* 00B92C 8000AD2C 3C01BF00 */ li $at, 0xBF000000 # -0.500000
/* 00B930 8000AD30 44818000 */ mtc1 $at, $f16
/* 00B934 8000AD34 4600503C */ c.lt.s $f10, $f0
/* 00B938 8000AD38 00000000 */ nop
/* 00B938 8000AD38 00000000 */ nop
/* 00B93C 8000AD3C 45020003 */ bc1fl .L8000AD4C
/* 00B940 8000AD40 4610003C */ c.lt.s $f0, $f16
/* 00B944 8000AD44 24030035 */ li $v1, 53
/* 00B948 8000AD48 4610003C */ c.lt.s $f0, $f16
.L8000AD4C:
/* 00B94C 8000AD4C 00000000 */ nop
/* 00B94C 8000AD4C 00000000 */ nop
/* 00B950 8000AD50 45020003 */ bc1fl .L8000AD60
/* 00B954 8000AD54 8FAA0034 */ lw $t2, 0x34($sp)
/* 00B958 8000AD58 24030014 */ li $v1, 20
@@ -1253,12 +1253,12 @@ glabel func_80009B60
/* 00B980 8000AD80 3C01800F */ lui $at, %hi(D_800ECFBC) # $at, 0x800f
/* 00B984 8000AD84 8FAF002C */ lw $t7, 0x2c($sp)
/* 00B988 8000AD88 4600203C */ c.lt.s $f4, $f0
/* 00B98C 8000AD8C 00000000 */ nop
/* 00B98C 8000AD8C 00000000 */ nop
/* 00B990 8000AD90 45030007 */ bc1tl .L8000ADB0
/* 00B994 8000AD94 A5E00000 */ sh $zero, ($t7)
/* 00B998 8000AD98 C426CFBC */ lwc1 $f6, %lo(D_800ECFBC)($at)
/* 00B99C 8000AD9C 4606003C */ c.lt.s $f0, $f6
/* 00B9A0 8000ADA0 00000000 */ nop
/* 00B9A0 8000ADA0 00000000 */ nop
/* 00B9A4 8000ADA4 45020007 */ bc1fl .L8000ADC4
/* 00B9A8 8000ADA8 8CE200BC */ lw $v0, 0xbc($a3)
/* 00B9AC 8000ADAC A5E00000 */ sh $zero, ($t7)
@@ -1300,7 +1300,7 @@ glabel func_80009B60
/* 00BA30 8000AE30 46123283 */ div.s $f10, $f6, $f18
/* 00BA34 8000AE34 4600540D */ trunc.w.s $f16, $f10
/* 00BA38 8000AE38 44058000 */ mfc1 $a1, $f16
/* 00BA3C 8000AE3C 00000000 */ nop
/* 00BA3C 8000AE3C 00000000 */ nop
/* 00BA40 8000AE40 00056400 */ sll $t4, $a1, 0x10
/* 00BA44 8000AE44 1000002A */ b .L8000AEF0
/* 00BA48 8000AE48 000C2C03 */ sra $a1, $t4, 0x10
@@ -1320,7 +1320,7 @@ glabel func_80009B60
/* 00BA74 8000AE74 3421000C */ ori $at, (0x1000000C & 0xFFFF) # ori $at, $at, 0xc
/* 00BA78 8000AE78 00417824 */ and $t7, $v0, $at
/* 00BA7C 8000AE7C 11E00007 */ beqz $t7, .L8000AE9C
/* 00BA80 8000AE80 00000000 */ nop
/* 00BA80 8000AE80 00000000 */ nop
/* 00BA84 8000AE84 8FAB0034 */ lw $t3, 0x34($sp)
/* 00BA88 8000AE88 3C0C8016 */ lui $t4, %hi(D_80163050) # $t4, 0x8016
/* 00BA8C 8000AE8C 258C3050 */ addiu $t4, %lo(D_80163050) # addiu $t4, $t4, 0x3050
@@ -1346,7 +1346,7 @@ glabel func_80009B60
/* 00BAD8 8000AED8 46088183 */ div.s $f6, $f16, $f8
/* 00BADC 8000AEDC 4600348D */ trunc.w.s $f18, $f6
/* 00BAE0 8000AEE0 44059000 */ mfc1 $a1, $f18
/* 00BAE4 8000AEE4 00000000 */ nop
/* 00BAE4 8000AEE4 00000000 */ nop
/* 00BAE8 8000AEE8 00057C00 */ sll $t7, $a1, 0x10
/* 00BAEC 8000AEEC 000F2C03 */ sra $a1, $t7, 0x10
.L8000AEF0:
@@ -1363,7 +1363,7 @@ glabel func_80009B60
/* 00BB18 8000AF18 8D980000 */ lw $t8, ($t4)
/* 00BB1C 8000AF1C 8FA80020 */ lw $t0, 0x20($sp)
/* 00BB20 8000AF20 1301000D */ beq $t8, $at, .L8000AF58
/* 00BB24 8000AF24 00000000 */ nop
/* 00BB24 8000AF24 00000000 */ nop
/* 00BB28 8000AF28 8FB9002C */ lw $t9, 0x2c($sp)
/* 00BB2C 8000AF2C 24010001 */ li $at, 1
/* 00BB30 8000AF30 87220000 */ lh $v0, ($t9)
@@ -1428,12 +1428,12 @@ glabel func_80009B60
/* 00BC10 8000B010 3C0F800E */ lui $t7, %hi(gCurrentCourseId)
/* 00BC14 8000B014 3C0C800E */ lui $t4, %hi(gCCSelection)
/* 00BC18 8000B018 45010006 */ bc1t .L8000B034
/* 00BC1C 8000B01C 00000000 */ nop
/* 00BC1C 8000B01C 00000000 */ nop
/* 00BC20 8000B020 C428CFC4 */ lwc1 $f8, %lo(D_800ECFC4)($at)
/* 00BC24 8000B024 4608003C */ c.lt.s $f0, $f8
/* 00BC28 8000B028 00000000 */ nop
/* 00BC28 8000B028 00000000 */ nop
/* 00BC2C 8000B02C 4500000C */ bc1f .L8000B060
/* 00BC30 8000B030 00000000 */ nop
/* 00BC30 8000B030 00000000 */ nop
.L8000B034:
/* 00BC34 8000B034 85EFC5A0 */ lh $t7, %lo(gCurrentCourseId)($t7)
/* 00BC38 8000B038 8D8CC548 */ lw $t4, %lo(gCCSelection)($t4)
@@ -1507,4 +1507,4 @@ glabel func_80009B60
.L8000B134:
/* 00BD34 8000B134 27BD00D0 */ addiu $sp, $sp, 0xd0
/* 00BD38 8000B138 03E00008 */ jr $ra
/* 00BD3C 8000B13C 00000000 */ nop
/* 00BD3C 8000B13C 00000000 */ nop
asm/non_matchings/code_80005FD0/func_8000F124.s
+6 -6
View File
@@ -33,9 +33,9 @@ glabel func_8000F124
/* 00FD98 8000F198 00002825 */ move $a1, $zero
/* 00FD9C 8000F19C 28C10003 */ slti $at, $a2, 3
/* 00FDA0 8000F1A0 1020003C */ beqz $at, .L8000F294
/* 00FDA4 8000F1A4 3C18800F */ lui $t8, %hi(D_800E86A8) # 0x800f
/* 00FDA4 8000F1A4 3C18800F */ lui $t8, %hi(gCharacterSelections) # 0x800f
/* 00FDA8 8000F1A8 18C0003A */ blez $a2, .L8000F294
/* 00FDAC 8000F1AC 270286A8 */ addiu $v0, $t8, %lo(D_800E86A8) # -0x7958
/* 00FDAC 8000F1AC 270286A8 */ addiu $v0, $t8, %lo(gCharacterSelections) # -0x7958
/* 00FDB0 8000F1B0 18C0000C */ blez $a2, .L8000F1E4
/* 00FDB4 8000F1B4 00002025 */ move $a0, $zero
/* 00FDB8 8000F1B8 96230000 */ lhu $v1, ($s1)
@@ -45,7 +45,7 @@ glabel func_8000F124
/* 00FDC4 8000F1C4 24420001 */ addiu $v0, $v0, 1
/* 00FDC8 8000F1C8 0044082B */ sltu $at, $v0, $a0
/* 00FDCC 8000F1CC 17230002 */ bne $t9, $v1, .L8000F1D8
/* 00FDD0 8000F1D0 00000000 */ nop
/* 00FDD0 8000F1D0 00000000 */ nop
/* 00FDD4 8000F1D4 24050001 */ li $a1, 1
.L8000F1D8:
/* 00FDD8 8000F1D8 5420FFFA */ bnel $at, $zero, .L8000F1C4
@@ -65,7 +65,7 @@ glabel func_8000F124
/* 00FE08 8000F208 944A0000 */ lhu $t2, ($v0)
/* 00FE0C 8000F20C 24840001 */ addiu $a0, $a0, 1
/* 00FE10 8000F210 15430002 */ bne $t2, $v1, .L8000F21C
/* 00FE14 8000F214 00000000 */ nop
/* 00FE14 8000F214 00000000 */ nop
/* 00FE18 8000F218 24050001 */ li $a1, 1
.L8000F21C:
/* 00FE1C 8000F21C 14C4FFFA */ bne $a2, $a0, .L8000F208
@@ -97,14 +97,14 @@ glabel func_8000F124
.L8000F274:
/* 00FE74 8000F274 24420008 */ addiu $v0, $v0, 8
/* 00FE78 8000F278 17230002 */ bne $t9, $v1, .L8000F284
/* 00FE7C 8000F27C 00000000 */ nop
/* 00FE7C 8000F27C 00000000 */ nop
/* 00FE80 8000F280 24050001 */ li $a1, 1
.L8000F284:
/* 00FE84 8000F284 5446FFEF */ bnel $v0, $a2, .L8000F244
/* 00FE88 8000F288 944E0000 */ lhu $t6, ($v0)
.L8000F28C:
/* 00FE8C 8000F28C 14A0FFBE */ bnez $a1, .L8000F188
/* 00FE90 8000F290 00000000 */ nop
/* 00FE90 8000F290 00000000 */ nop
.L8000F294:
/* 00FE94 8000F294 26100001 */ addiu $s0, $s0, 1
/* 00FE98 8000F298 24010002 */ li $at, 2
asm/non_matchings/code_80005FD0/func_8000F628.s
+4 -4
View File
@@ -98,7 +98,7 @@ glabel func_8000F628
/* 0103A8 8000F7A8 25EF30B8 */ addiu $t7, %lo(D_801630B8) # addiu $t7, $t7, 0x30b8
/* 0103AC 8000F7AC 3C11800F */ lui $s1, %hi(gPlayers) # $s1, 0x800f
/* 0103B0 8000F7B0 3C128016 */ lui $s2, %hi(D_80163330) # $s2, 0x8016
/* 0103B4 8000F7B4 3C148016 */ lui $s4, %hi(D_801643B8) # $s4, 0x8016
/* 0103B4 8000F7B4 3C148016 */ lui $s4, %hi(gPlayerPositions) # $s4, 0x8016
/* 0103B8 8000F7B8 3C158016 */ lui $s5, %hi(D_801634F8) # $s5, 0x8016
/* 0103BC 8000F7BC 3C168016 */ lui $s6, %hi(D_801643E0) # $s6, 0x8016
/* 0103C0 8000F7C0 3C1F8016 */ lui $ra, %hi(D_801631A0) # $ra, 0x8016
@@ -121,7 +121,7 @@ glabel func_8000F628
/* 010404 8000F804 27FF31A0 */ addiu $ra, %lo(D_801631A0) # addiu $ra, $ra, 0x31a0
/* 010408 8000F808 26D643E0 */ addiu $s6, %lo(D_801643E0) # addiu $s6, $s6, 0x43e0
/* 01040C 8000F80C 26B534F8 */ addiu $s5, %lo(D_801634F8) # addiu $s5, $s5, 0x34f8
/* 010410 8000F810 269443B8 */ addiu $s4, %lo(D_801643B8) # addiu $s4, $s4, 0x43b8
/* 010410 8000F810 269443B8 */ addiu $s4, %lo(gPlayerPositions) # addiu $s4, $s4, 0x43b8
/* 010414 8000F814 26523330 */ addiu $s2, %lo(D_80163330) # addiu $s2, $s2, 0x3330
/* 010418 8000F818 26316990 */ addiu $s1, %lo(gPlayers) # addiu $s1, $s1, 0x6990
/* 01041C 8000F81C AFAF004C */ sw $t7, 0x4c($sp)
@@ -541,7 +541,7 @@ glabel func_8000F628
/* 010A6C 8000FE6C 1609FFF5 */ bne $s0, $t1, .L8000FE44
/* 010A70 8000FE70 A44EFFFE */ sh $t6, -2($v0)
.L8000FE74:
/* 010A74 8000FE74 3C148016 */ lui $s4, %hi(D_801643B8) # $s4, 0x8016
/* 010A74 8000FE74 3C148016 */ lui $s4, %hi(gPlayerPositions) # $s4, 0x8016
/* 010A78 8000FE78 3C028016 */ lui $v0, %hi(D_801645B0) # $v0, 0x8016
/* 010A7C 8000FE7C 3C038016 */ lui $v1, %hi(D_80164438) # $v1, 0x8016
/* 010A80 8000FE80 3C058016 */ lui $a1, %hi(D_80164448) # $a1, 0x8016
@@ -550,7 +550,7 @@ glabel func_8000F628
/* 010A8C 8000FE8C 24A54448 */ addiu $a1, %lo(D_80164448) # addiu $a1, $a1, 0x4448
/* 010A90 8000FE90 24634438 */ addiu $v1, %lo(D_80164438) # addiu $v1, $v1, 0x4438
/* 010A94 8000FE94 244245B0 */ addiu $v0, %lo(D_801645B0) # addiu $v0, $v0, 0x45b0
/* 010A98 8000FE98 269443B8 */ addiu $s4, %lo(D_801643B8) # addiu $s4, $s4, 0x43b8
/* 010A98 8000FE98 269443B8 */ addiu $s4, %lo(gPlayerPositions) # addiu $s4, $s4, 0x43b8
.L8000FE9C:
/* 010A9C 8000FE9C 300EFFFF */ andi $t6, $zero, 0xffff
/* 010AA0 8000FEA0 000EC040 */ sll $t8, $t6, 1
asm/non_matchings/code_80005FD0/func_80019ED0.s
+2 -2
View File
@@ -21,8 +21,8 @@ glabel func_80019ED0
/* 01AB18 80019F18 24420002 */ addiu $v0, $v0, 2
/* 01AB1C 80019F1C 1420FFFB */ bnez $at, .L80019F0C
/* 01AB20 80019F20 A44EFFFE */ sh $t6, -2($v0)
/* 01AB24 80019F24 3C13800E */ lui $s3, %hi(D_800DC5E8)
/* 01AB28 80019F28 2673C5E8 */ addiu $s3, %lo(D_800DC5E8) # addiu $s3, $s3, -0x3a18
/* 01AB24 80019F24 3C13800E */ lui $s3, %hi(gPlayerWinningIndex)
/* 01AB28 80019F28 2673C5E8 */ addiu $s3, %lo(gPlayerWinningIndex) # addiu $s3, $s3, -0x3a18
/* 01AB2C 80019F2C 8E620000 */ lw $v0, ($s3)
/* 01AB30 80019F30 3C0F800E */ lui $t7, %hi(camera1)
/* 01AB34 80019F34 8DEFDB40 */ lw $t7, %lo(camera1)($t7)
asm/non_matchings/code_80005FD0/func_8001A124.s
+5 -5
View File
@@ -1,8 +1,8 @@
glabel func_8001A124
/* 01AD24 8001A124 00047080 */ sll $t6, $a0, 2
/* 01AD28 8001A128 3C028016 */ lui $v0, %hi(D_801643B8)
/* 01AD28 8001A128 3C028016 */ lui $v0, %hi(gPlayerPositions)
/* 01AD2C 8001A12C 004E1021 */ addu $v0, $v0, $t6
/* 01AD30 8001A130 8C4243B8 */ lw $v0, %lo(D_801643B8)($v0)
/* 01AD30 8001A130 8C4243B8 */ lw $v0, %lo(gPlayerPositions)($v0)
/* 01AD34 8001A134 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 01AD38 8001A138 AFBF0014 */ sw $ra, 0x14($sp)
/* 01AD3C 8001A13C 1040000B */ beqz $v0, .L8001A16C
@@ -16,7 +16,7 @@ glabel func_8001A124
/* 01AD5C 8001A15C 10410017 */ beq $v0, $at, .L8001A1BC
/* 01AD60 8001A160 24040064 */ li $a0, 100
/* 01AD64 8001A164 1000001A */ b .L8001A1D0
/* 01AD68 8001A168 00000000 */ nop
/* 01AD68 8001A168 00000000 */ nop
.L8001A16C:
/* 01AD6C 8001A16C 0C0ADF8D */ jal random_int
/* 01AD70 8001A170 AFA5001C */ sw $a1, 0x1c($sp)
@@ -37,7 +37,7 @@ glabel func_8001A124
/* 01ADA8 8001A1A8 A4394680 */ sh $t9, %lo(D_80164680)($at) # 0x4680($at)
.L8001A1AC:
/* 01ADAC 8001A1AC 0C03289C */ jal func_800CA270
/* 01ADB0 8001A1B0 00000000 */ nop
/* 01ADB0 8001A1B0 00000000 */ nop
/* 01ADB4 8001A1B4 10000017 */ b .L8001A214
/* 01ADB8 8001A1B8 8FBF0014 */ lw $ra, 0x14($sp)
.L8001A1BC:
@@ -69,4 +69,4 @@ glabel func_8001A124
.L8001A214:
/* 01AE14 8001A214 27BD0018 */ addiu $sp, $sp, 0x18
/* 01AE18 8001A218 03E00008 */ jr $ra
/* 01AE1C 8001A21C 00000000 */ nop
/* 01AE1C 8001A21C 00000000 */ nop
asm/non_matchings/code_80005FD0/func_8001A588.s
+22 -22
View File
@@ -34,27 +34,27 @@ glabel func_8001A588
/* 01B204 8001A604 4620910D */ trunc.w.d $f4, $f18
/* 01B208 8001A608 44094000 */ mfc1 $t1, $f8
/* 01B20C 8001A60C 440B2000 */ mfc1 $t3, $f4
/* 01B210 8001A610 00000000 */ nop
/* 01B210 8001A610 00000000 */ nop
/* 01B214 8001A614 152B0019 */ bne $t1, $t3, .L8001A67C
/* 01B218 8001A618 00000000 */ nop
/* 01B218 8001A618 00000000 */ nop
/* 01B21C 8001A61C C7060008 */ lwc1 $f6, 8($t8)
/* 01B220 8001A620 C7100014 */ lwc1 $f16, 0x14($t8)
/* 01B224 8001A624 3C014059 */ li $at, 0x40590000 # 3.390625
/* 01B228 8001A628 460030A1 */ cvt.d.s $f2, $f6
/* 01B22C 8001A62C 460084A1 */ cvt.d.s $f18, $f16
/* 01B230 8001A630 462C1202 */ mul.d $f8, $f2, $f12
/* 01B234 8001A634 00000000 */ nop
/* 01B234 8001A634 00000000 */ nop
/* 01B238 8001A638 462C9102 */ mul.d $f4, $f18, $f12
/* 01B23C 8001A63C 4620428D */ trunc.w.d $f10, $f8
/* 01B240 8001A640 4620218D */ trunc.w.d $f6, $f4
/* 01B244 8001A644 440D5000 */ mfc1 $t5, $f10
/* 01B248 8001A648 440F3000 */ mfc1 $t7, $f6
/* 01B24C 8001A64C 00000000 */ nop
/* 01B24C 8001A64C 00000000 */ nop
/* 01B250 8001A650 15AF000A */ bne $t5, $t7, .L8001A67C
/* 01B254 8001A654 00000000 */ nop
/* 01B254 8001A654 00000000 */ nop
/* 01B258 8001A658 44816800 */ mtc1 $at, $f13
/* 01B25C 8001A65C 44806000 */ mtc1 $zero, $f12
/* 01B260 8001A660 00000000 */ nop
/* 01B260 8001A660 00000000 */ nop
/* 01B264 8001A664 462C0200 */ add.d $f8, $f0, $f12
/* 01B268 8001A668 462C1400 */ add.d $f16, $f2, $f12
/* 01B26C 8001A66C 462042A0 */ cvt.s.d $f10, $f8
@@ -65,26 +65,26 @@ glabel func_8001A588
/* 01B27C 8001A67C 8C42C53C */ lw $v0, %lo(gModeSelection)($v0)
/* 01B280 8001A680 24010003 */ li $at, 3
/* 01B284 8001A684 10410022 */ beq $v0, $at, .L8001A710
/* 01B288 8001A688 00000000 */ nop
/* 01B288 8001A688 00000000 */ nop
/* 01B28C 8001A68C 854A4680 */ lh $t2, %lo(D_80164680)($t2) # 0x4680($t2)
/* 01B290 8001A690 2401FFFF */ li $at, -1
/* 01B294 8001A694 8FA90058 */ lw $t1, 0x58($sp)
/* 01B298 8001A698 1541001D */ bne $t2, $at, .L8001A710
/* 01B29C 8001A69C 00000000 */ nop
/* 01B29C 8001A69C 00000000 */ nop
/* 01B2A0 8001A6A0 952B0000 */ lhu $t3, ($t1)
/* 01B2A4 8001A6A4 3C0E8016 */ lui $t6, %hi(D_801646CC) # $t6, 0x8016
/* 01B2A8 8001A6A8 316C0800 */ andi $t4, $t3, 0x800
/* 01B2AC 8001A6AC 11800018 */ beqz $t4, .L8001A710
/* 01B2B0 8001A6B0 00000000 */ nop
/* 01B2B0 8001A6B0 00000000 */ nop
/* 01B2B4 8001A6B4 95CE46CC */ lhu $t6, %lo(D_801646CC)($t6)
/* 01B2B8 8001A6B8 3C088016 */ lui $t0, %hi(D_801646C8) # $t0, 0x8016
/* 01B2BC 8001A6BC 250846C8 */ addiu $t0, %lo(D_801646C8) # addiu $t0, $t0, 0x46c8
/* 01B2C0 8001A6C0 15C00013 */ bnez $t6, .L8001A710
/* 01B2C4 8001A6C4 00000000 */ nop
/* 01B2C4 8001A6C4 00000000 */ nop
/* 01B2C8 8001A6C8 8D0D0000 */ lw $t5, ($t0)
/* 01B2CC 8001A6CC 24010002 */ li $at, 2
/* 01B2D0 8001A6D0 15A0000F */ bnez $t5, .L8001A710
/* 01B2D4 8001A6D4 00000000 */ nop
/* 01B2D4 8001A6D4 00000000 */ nop
/* 01B2D8 8001A6D8 14410006 */ bne $v0, $at, .L8001A6F4
/* 01B2DC 8001A6DC 02002025 */ move $a0, $s0
/* 01B2E0 8001A6E0 02002025 */ move $a0, $s0
@@ -150,7 +150,7 @@ glabel func_8001A588
/* 01B3B4 8001A7B4 AD000000 */ sw $zero, ($t0)
.L8001A7B8:
/* 01B3B8 8001A7B8 14E00011 */ bnez $a3, .L8001A800
/* 01B3BC 8001A7BC 00000000 */ nop
/* 01B3BC 8001A7BC 00000000 */ nop
/* 01B3C0 8001A7C0 8D020000 */ lw $v0, ($t0)
/* 01B3C4 8001A7C4 2401000A */ li $at, 10
/* 01B3C8 8001A7C8 02002025 */ move $a0, $s0
@@ -159,9 +159,9 @@ glabel func_8001A588
/* 01B3D4 8001A7D4 2401000B */ li $at, 11
/* 01B3D8 8001A7D8 14410009 */ bne $v0, $at, .L8001A800
.L8001A7DC:
/* 01B3DC 8001A7DC 3C058016 */ lui $a1, %hi(D_801643B8)
/* 01B3DC 8001A7DC 3C058016 */ lui $a1, %hi(gPlayerPositions)
/* 01B3E0 8001A7E0 00AC2821 */ addu $a1, $a1, $t4
/* 01B3E4 8001A7E4 8CA543B8 */ lw $a1, %lo(D_801643B8)($a1)
/* 01B3E4 8001A7E4 8CA543B8 */ lw $a1, %lo(gPlayerPositions)($a1)
/* 01B3E8 8001A7E8 0C006946 */ jal func_8001A518
/* 01B3EC 8001A7EC 00003025 */ move $a2, $zero
/* 01B3F0 8001A7F0 3C088016 */ lui $t0, %hi(D_801646C8) # $t0, 0x8016
@@ -172,16 +172,16 @@ glabel func_8001A588
/* 01B400 8001A800 3C0E800E */ lui $t6, %hi(gModeSelection)
/* 01B404 8001A804 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6)
/* 01B408 8001A808 106E0056 */ beq $v1, $t6, .L8001A964
/* 01B40C 8001A80C 00000000 */ nop
/* 01B40C 8001A80C 00000000 */ nop
/* 01B410 8001A810 14E30054 */ bne $a3, $v1, .L8001A964
/* 01B414 8001A814 00000000 */ nop
/* 01B414 8001A814 00000000 */ nop
/* 01B418 8001A818 8D020000 */ lw $v0, ($t0)
/* 01B41C 8001A81C 24010104 */ li $at, 260
/* 01B420 8001A820 3C0D8019 */ lui $t5, %hi(D_8018EDF3) # $t5, 0x8019
/* 01B424 8001A824 10410003 */ beq $v0, $at, .L8001A834
/* 01B428 8001A828 24010105 */ li $at, 261
/* 01B42C 8001A82C 1441004D */ bne $v0, $at, .L8001A964
/* 01B430 8001A830 00000000 */ nop
/* 01B430 8001A830 00000000 */ nop
.L8001A834:
/* 01B434 8001A834 81ADEDF3 */ lb $t5, %lo(D_8018EDF3)($t5)
/* 01B438 8001A838 24010002 */ li $at, 2
@@ -189,9 +189,9 @@ glabel func_8001A588
/* 01B440 8001A840 15A1000A */ bne $t5, $at, .L8001A86C
/* 01B444 8001A844 24060008 */ li $a2, 8
/* 01B448 8001A848 00107880 */ sll $t7, $s0, 2
/* 01B44C 8001A84C 3C058016 */ lui $a1, %hi(D_801643B8)
/* 01B44C 8001A84C 3C058016 */ lui $a1, %hi(gPlayerPositions)
/* 01B450 8001A850 00AF2821 */ addu $a1, $a1, $t7
/* 01B454 8001A854 8CA543B8 */ lw $a1, %lo(D_801643B8)($a1)
/* 01B454 8001A854 8CA543B8 */ lw $a1, %lo(gPlayerPositions)($a1)
/* 01B458 8001A858 02002025 */ move $a0, $s0
/* 01B45C 8001A85C 0C006946 */ jal func_8001A518
/* 01B460 8001A860 24060001 */ li $a2, 1
@@ -237,7 +237,7 @@ glabel func_8001A588
/* 01B4E8 8001A8E8 AD000000 */ sw $zero, ($t0)
.L8001A8EC:
/* 01B4EC 8001A8EC 14E0001D */ bnez $a3, .L8001A964
/* 01B4F0 8001A8F0 00000000 */ nop
/* 01B4F0 8001A8F0 00000000 */ nop
/* 01B4F4 8001A8F4 8D0D0000 */ lw $t5, ($t0)
/* 01B4F8 8001A8F8 2401000A */ li $at, 10
/* 01B4FC 8001A8FC 02002025 */ move $a0, $s0
@@ -280,7 +280,7 @@ glabel func_8001A588
/* 01B588 8001A988 002B0821 */ addu $at, $at, $t3
/* 01B58C 8001A98C 8C2BD384 */ lw $t3, %lo(jpt_800ED384)($at) # -0x2c7c($at)
/* 01B590 8001A990 01600008 */ jr $t3
/* 01B594 8001A994 00000000 */ nop
/* 01B594 8001A994 00000000 */ nop
glabel L8001A998
/* 01B598 8001A998 8FA40054 */ lw $a0, 0x54($sp)
/* 01B59C 8001A99C 8FA50058 */ lw $a1, 0x58($sp)
@@ -362,4 +362,4 @@ glabel L8001AA88
/* 01B69C 8001AA9C 8FB00018 */ lw $s0, 0x18($sp)
/* 01B6A0 8001AAA0 27BD0050 */ addiu $sp, $sp, 0x50
/* 01B6A4 8001AAA4 03E00008 */ jr $ra
/* 01B6A8 8001AAA8 00000000 */ nop
/* 01B6A8 8001AAA8 00000000 */ nop
asm/non_matchings/code_80005FD0/func_8001AC10.s
+4 -4
View File
@@ -65,8 +65,8 @@ glabel L8001ACAC
/* 01B908 8001AD08 10200012 */ beqz $at, .L8001AD54
/* 01B90C 8001AD0C 00000000 */ nop
/* 01B910 8001AD10 8C634390 */ lw $v1, %lo(lapCount)($v1) # 0x4390($v1)
/* 01B914 8001AD14 3C068016 */ lui $a2, %hi(D_801643B8) # $a2, 0x8016
/* 01B918 8001AD18 24C643B8 */ addiu $a2, %lo(D_801643B8) # addiu $a2, $a2, 0x43b8
/* 01B914 8001AD14 3C068016 */ lui $a2, %hi(gPlayerPositions) # $a2, 0x8016
/* 01B918 8001AD18 24C643B8 */ addiu $a2, %lo(gPlayerPositions) # addiu $a2, $a2, 0x43b8
/* 01B91C 8001AD1C 28610003 */ slti $at, $v1, 3
/* 01B920 8001AD20 1020000C */ beqz $at, .L8001AD54
/* 01B924 8001AD24 00C26821 */ addu $t5, $a2, $v0
@@ -90,11 +90,11 @@ glabel L8001ACAC
glabel L8001AD64
/* 01B964 8001AD64 8FA20030 */ lw $v0, 0x30($sp)
/* 01B968 8001AD68 3C0E8016 */ lui $t6, %hi(lapCount) # 0x8016
/* 01B96C 8001AD6C 3C068016 */ lui $a2, %hi(D_801643B8) # $a2, 0x8016
/* 01B96C 8001AD6C 3C068016 */ lui $a2, %hi(gPlayerPositions) # $a2, 0x8016
/* 01B970 8001AD70 00027880 */ sll $t7, $v0, 2
/* 01B974 8001AD74 01CF7021 */ addu $t6, $t6, $t7
/* 01B978 8001AD78 8DCE4390 */ lw $t6, %lo(lapCount)($t6) # 0x4390($t6)
/* 01B97C 8001AD7C 24C643B8 */ addiu $a2, %lo(D_801643B8) # addiu $a2, $a2, 0x43b8
/* 01B97C 8001AD7C 24C643B8 */ addiu $a2, %lo(gPlayerPositions) # addiu $a2, $a2, 0x43b8
/* 01B980 8001AD80 3C038016 */ lui $v1, %hi(D_80163478) # $v1, 0x8016
/* 01B984 8001AD84 19C0004B */ blez $t6, .L8001AEB4
/* 01B988 8001AD88 00000000 */ nop
asm/non_matchings/code_80005FD0/set_places.s
+14 -14
View File
@@ -26,7 +26,7 @@ glabel set_places
/* 007418 80006818 3C0E8016 */ lui $t6, %hi(D_8016348C) # $t6, 0x8016
/* 00741C 8000681C 85CE348C */ lh $t6, %lo(D_8016348C)($t6)
/* 007420 80006820 15C0004D */ bnez $t6, .L80006958
/* 007424 80006824 00000000 */ nop
/* 007424 80006824 00000000 */ nop
/* 007428 80006828 19800049 */ blez $t4, .L80006950
/* 00742C 8000682C 00005825 */ move $t3, $zero
/* 007430 80006830 31880003 */ andi $t0, $t4, 3
@@ -107,7 +107,7 @@ glabel set_places
/* 00754C 8000694C 00005825 */ move $t3, $zero
.L80006950:
/* 007550 80006950 10000050 */ b .L80006A94
/* 007554 80006954 00000000 */ nop
/* 007554 80006954 00000000 */ nop
.L80006958:
/* 007558 80006958 1980004E */ blez $t4, .L80006A94
/* 00755C 8000695C 00005825 */ move $t3, $zero
@@ -233,7 +233,7 @@ glabel set_places
/* 007724 80006B24 0009C040 */ sll $t8, $t1, 1
/* 007728 80006B28 01187021 */ addu $t6, $t0, $t8
/* 00772C 80006B2C 4602003C */ c.lt.s $f0, $f2
/* 007730 80006B30 00000000 */ nop
/* 007730 80006B30 00000000 */ nop
/* 007734 80006B34 45020012 */ bc1fl .L80006B80
/* 007738 80006B38 25300001 */ addiu $s0, $t1, 1
/* 00773C 80006B3C 85D90000 */ lh $t9, ($t6)
@@ -266,7 +266,7 @@ glabel set_places
/* 00779C 80006B9C 00107040 */ sll $t6, $s0, 1
/* 0077A0 80006BA0 010EC821 */ addu $t9, $t0, $t6
/* 0077A4 80006BA4 4602003C */ c.lt.s $f0, $f2
/* 0077A8 80006BA8 00000000 */ nop
/* 0077A8 80006BA8 00000000 */ nop
/* 0077AC 80006BAC 45020014 */ bc1fl .L80006C00
/* 0077B0 80006BB0 C6220004 */ lwc1 $f2, 4($s1)
/* 0077B4 80006BB4 872F0000 */ lh $t7, ($t9)
@@ -292,7 +292,7 @@ glabel set_places
/* 007800 80006C00 00107040 */ sll $t6, $s0, 1
/* 007804 80006C04 010EC821 */ addu $t9, $t0, $t6
/* 007808 80006C08 4602003C */ c.lt.s $f0, $f2
/* 00780C 80006C0C 00000000 */ nop
/* 00780C 80006C0C 00000000 */ nop
/* 007810 80006C10 45020012 */ bc1fl .L80006C5C
/* 007814 80006C14 26100002 */ addiu $s0, $s0, 2
/* 007818 80006C18 872F0002 */ lh $t7, 2($t9)
@@ -325,11 +325,11 @@ glabel set_places
/* 007878 80006C78 25290001 */ addiu $t1, $t1, 1
.L80006C7C:
/* 00787C 80006C7C 3C028016 */ lui $v0, %hi(D_801643E0) # $v0, 0x8016
/* 007880 80006C80 3C038016 */ lui $v1, %hi(D_801643B8) # $v1, 0x8016
/* 007880 80006C80 3C038016 */ lui $v1, %hi(gPlayerPositions) # $v1, 0x8016
/* 007884 80006C84 3C058016 */ lui $a1, %hi(D_801643D8) # $a1, 0x8016
/* 007888 80006C88 27A40080 */ addiu $a0, $sp, 0x80
/* 00788C 80006C8C 24A543D8 */ addiu $a1, %lo(D_801643D8) # addiu $a1, $a1, 0x43d8
/* 007890 80006C90 246343B8 */ addiu $v1, %lo(D_801643B8) # addiu $v1, $v1, 0x43b8
/* 007890 80006C90 246343B8 */ addiu $v1, %lo(gPlayerPositions) # addiu $v1, $v1, 0x43b8
/* 007894 80006C94 244243E0 */ addiu $v0, %lo(D_801643E0) # addiu $v0, $v0, 0x43e0
/* 007898 80006C98 24090001 */ li $t1, 1
.L80006C9C:
@@ -349,8 +349,8 @@ glabel set_places
/* 0078D0 80006CD0 27184360 */ addiu $t8, %lo(D_80164360) # addiu $t8, $t8, 0x4360
/* 0078D4 80006CD4 00007840 */ sll $t7, $zero, 1
/* 0078D8 80006CD8 00007080 */ sll $t6, $zero, 2
/* 0078DC 80006CDC 3C068016 */ lui $a2, %hi(D_801643B8) # $a2, 0x8016
/* 0078E0 80006CE0 24C643B8 */ addiu $a2, %lo(D_801643B8) # addiu $a2, $a2, 0x43b8
/* 0078DC 80006CDC 3C068016 */ lui $a2, %hi(gPlayerPositions) # $a2, 0x8016
/* 0078E0 80006CE0 24C643B8 */ addiu $a2, %lo(gPlayerPositions) # addiu $a2, $a2, 0x43b8
/* 0078E4 80006CE4 008E1021 */ addu $v0, $a0, $t6
/* 0078E8 80006CE8 01F85021 */ addu $t2, $t7, $t8
/* 0078EC 80006CEC 24090001 */ li $t1, 1
@@ -369,12 +369,12 @@ glabel set_places
.L80006D1C:
/* 00791C 80006D1C 3C0E8016 */ lui $t6, %hi(D_80164360) # $t6, 0x8016
/* 007920 80006D20 25CE4360 */ addiu $t6, %lo(D_80164360) # addiu $t6, $t6, 0x4360
/* 007924 80006D24 3C068016 */ lui $a2, %hi(D_801643B8) # $a2, 0x8016
/* 007924 80006D24 3C068016 */ lui $a2, %hi(gPlayerPositions) # $a2, 0x8016
/* 007928 80006D28 000BC040 */ sll $t8, $t3, 1
/* 00792C 80006D2C 000BC880 */ sll $t9, $t3, 2
/* 007930 80006D30 00991021 */ addu $v0, $a0, $t9
/* 007934 80006D34 030E5021 */ addu $t2, $t8, $t6
/* 007938 80006D38 24C643B8 */ addiu $a2, %lo(D_801643B8) # addiu $a2, $a2, 0x43b8
/* 007938 80006D38 24C643B8 */ addiu $a2, %lo(gPlayerPositions) # addiu $a2, $a2, 0x43b8
/* 00793C 80006D3C 25690001 */ addiu $t1, $t3, 1
.L80006D40:
/* 007940 80006D40 8C430000 */ lw $v1, ($v0)
@@ -500,7 +500,7 @@ glabel set_places
/* 007B00 80006F00 008B8021 */ addu $s0, $a0, $t3
/* 007B04 80006F04 00851021 */ addu $v0, $a0, $a1
/* 007B08 80006F08 4602003C */ c.lt.s $f0, $f2
/* 007B0C 80006F0C 00000000 */ nop
/* 007B0C 80006F0C 00000000 */ nop
/* 007B10 80006F10 45020008 */ bc1fl .L80006F34
/* 007B14 80006F14 25300001 */ addiu $s0, $t1, 1
/* 007B18 80006F18 8E0E0000 */ lw $t6, ($s0)
@@ -525,7 +525,7 @@ glabel set_places
/* 007B58 80006F58 00851021 */ addu $v0, $a0, $a1
/* 007B5C 80006F5C 008B9821 */ addu $s3, $a0, $t3
/* 007B60 80006F60 4602003C */ c.lt.s $f0, $f2
/* 007B64 80006F64 00000000 */ nop
/* 007B64 80006F64 00000000 */ nop
/* 007B68 80006F68 4502000A */ bc1fl .L80006F94
/* 007B6C 80006F6C C6220004 */ lwc1 $f2, 4($s1)
/* 007B70 80006F70 8E790000 */ lw $t9, ($s3)
@@ -541,7 +541,7 @@ glabel set_places
/* 007B94 80006F94 00851021 */ addu $v0, $a0, $a1
/* 007B98 80006F98 008B9821 */ addu $s3, $a0, $t3
/* 007B9C 80006F9C 4602003C */ c.lt.s $f0, $f2
/* 007BA0 80006FA0 00000000 */ nop
/* 007BA0 80006FA0 00000000 */ nop
/* 007BA4 80006FA4 45020008 */ bc1fl .L80006FC8
/* 007BA8 80006FA8 26310008 */ addiu $s1, $s1, 8
/* 007BAC 80006FAC 8E6E0004 */ lw $t6, 4($s3)
asm/non_matchings/code_800393C0/func_8003A9F0.s
+4 -4
View File
@@ -26,8 +26,8 @@ glabel func_8003A9F0
/* 03B650 8003AA50 24010040 */ li $at, 64
/* 03B654 8003AA54 17010028 */ bne $t8, $at, .L8003AAF8
.L8003AA58:
/* 03B658 8003AA58 3C11800F */ lui $s1, %hi(D_800E86A8) # $s1, 0x800f
/* 03B65C 8003AA5C 263186A8 */ addiu $s1, %lo(D_800E86A8) # addiu $s1, $s1, -0x7958
/* 03B658 8003AA58 3C11800F */ lui $s1, %hi(gCharacterSelections) # $s1, 0x800f
/* 03B65C 8003AA5C 263186A8 */ addiu $s1, %lo(gCharacterSelections) # addiu $s1, $s1, -0x7958
.L8003AA60:
/* 03B660 8003AA60 0C0ADF8D */ jal random_int
/* 03B664 8003AA64 24040007 */ li $a0, 7
@@ -84,10 +84,10 @@ glabel func_8003A9F0
/* 03B720 8003AB20 8D060000 */ lw $a2, ($t0)
/* 03B724 8003AB24 4481A000 */ mtc1 $at, $f20
/* 03B728 8003AB28 860A0000 */ lh $t2, ($s0)
/* 03B72C 8003AB2C 3C11800F */ lui $s1, %hi(D_800E86A8) # $s1, 0x800f
/* 03B72C 8003AB2C 3C11800F */ lui $s1, %hi(gCharacterSelections) # $s1, 0x800f
/* 03B730 8003AB30 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e
/* 03B734 8003AB34 240BB000 */ li $t3, -20480
/* 03B738 8003AB38 263186A8 */ addiu $s1, %lo(D_800E86A8) # addiu $s1, $s1, -0x7958
/* 03B738 8003AB38 263186A8 */ addiu $s1, %lo(gCharacterSelections) # addiu $s1, $s1, -0x7958
/* 03B73C 8003AB3C AFAB001C */ sw $t3, 0x1c($sp)
/* 03B740 8003AB40 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0)
/* 03B744 8003AB44 E7B60010 */ swc1 $f22, 0x10($sp)
asm/non_matchings/code_800393C0/func_8003C0F0.s
+2 -2
View File
@@ -696,7 +696,7 @@ glabel L8003C98C
/* 03D738 8003CB38 44812000 */ mtc1 $at, $f4
/* 03D73C 8003CB3C E628000C */ swc1 $f8, 0xc($s1)
/* 03D740 8003CB40 3C014700 */ li $at, 0x47000000 # 32768.000000
/* 03D744 8003CB44 3C0A800F */ lui $t2, %hi(D_800E86A8) # $t2, 0x800f
/* 03D744 8003CB44 3C0A800F */ lui $t2, %hi(gCharacterSelections) # $t2, 0x800f
/* 03D748 8003CB48 E62A0010 */ swc1 $f10, 0x10($s1)
/* 03D74C 8003CB4C E6300014 */ swc1 $f16, 0x14($s1)
/* 03D750 8003CB50 E6000014 */ swc1 $f0, 0x14($s0)
@@ -704,7 +704,7 @@ glabel L8003C98C
/* 03D758 8003CB58 E6000004 */ swc1 $f0, 4($s0)
/* 03D75C 8003CB5C E6320018 */ swc1 $f18, 0x18($s1)
/* 03D760 8003CB60 E624001C */ swc1 $f4, 0x1c($s1)
/* 03D764 8003CB64 814A86A8 */ lb $t2, %lo(D_800E86A8)($t2)
/* 03D764 8003CB64 814A86A8 */ lb $t2, %lo(gCharacterSelections)($t2)
/* 03D768 8003CB68 44814000 */ mtc1 $at, $f8
/* 03D76C 8003CB6C 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e
/* 03D770 8003CB70 240BE000 */ li $t3, -8192
asm/non_matchings/code_800431B0/func_8004E800.s
+3 -3
View File
@@ -66,14 +66,14 @@ glabel func_8004E800
/* 04F4FC 8004E8FC 03282021 */ addu $a0, $t9, $t0
/* 04F500 8004E900 84490068 */ lh $t1, 0x68($v0)
/* 04F504 8004E904 844A0064 */ lh $t2, 0x64($v0)
/* 04F508 8004E908 3C088016 */ lui $t0, %hi(D_801643B8)
/* 04F508 8004E908 3C088016 */ lui $t0, %hi(gPlayerPositions)
/* 04F50C 8004E90C 3C0E800E */ lui $t6, %hi(D_800E55F8) # 0x800e
/* 04F510 8004E910 000C6880 */ sll $t5, $t4, 2
/* 04F514 8004E914 0018C880 */ sll $t9, $t8, 2
/* 04F518 8004E918 01194021 */ addu $t0, $t0, $t9
/* 04F51C 8004E91C 01CD7021 */ addu $t6, $t6, $t5
/* 04F520 8004E920 8DCE55F8 */ lw $t6, %lo(D_800E55F8)($t6) # 0x55f8($t6)
/* 04F524 8004E924 8D0843B8 */ lw $t0, %lo(D_801643B8)($t0)
/* 04F524 8004E924 8D0843B8 */ lw $t0, %lo(gPlayerPositions)($t0)
/* 04F528 8004E928 012A2821 */ addu $a1, $t1, $t2
/* 04F52C 8004E92C 3C0A0D01 */ lui $t2, %hi(D_0D00D258) # $t2, 0xd01
/* 04F530 8004E930 240F00FF */ li $t7, 255
@@ -103,4 +103,4 @@ glabel func_8004E800
.L8004E98C:
/* 04F58C 8004E98C 27BD0040 */ addiu $sp, $sp, 0x40
/* 04F590 8004E990 03E00008 */ jr $ra
/* 04F594 8004E994 00000000 */ nop
/* 04F594 8004E994 00000000 */ nop
asm/non_matchings/code_800431B0/func_8004E998.s
+5 -5
View File
@@ -17,9 +17,9 @@ glabel func_8004E998
/* 04F5D4 8004E9D4 1101002A */ beq $t0, $at, .L8004EA80
/* 04F5D8 8004E9D8 240B00FF */ li $t3, 255
/* 04F5DC 8004E9DC 000E7880 */ sll $t7, $t6, 2
/* 04F5E0 8004E9E0 3C038016 */ lui $v1, %hi(D_801643B8)
/* 04F5E0 8004E9E0 3C038016 */ lui $v1, %hi(gPlayerPositions)
/* 04F5E4 8004E9E4 006F1821 */ addu $v1, $v1, $t7
/* 04F5E8 8004E9E8 8C6343B8 */ lw $v1, %lo(D_801643B8)($v1)
/* 04F5E8 8004E9E8 8C6343B8 */ lw $v1, %lo(gPlayerPositions)($v1)
/* 04F5EC 8004E9EC 84490066 */ lh $t1, 0x66($v0)
/* 04F5F0 8004E9F0 844A0062 */ lh $t2, 0x62($v0)
/* 04F5F4 8004E9F4 844B0068 */ lh $t3, 0x68($v0)
@@ -66,14 +66,14 @@ glabel func_8004E998
/* 04F694 8004EA94 03282021 */ addu $a0, $t9, $t0
/* 04F698 8004EA98 84490068 */ lh $t1, 0x68($v0)
/* 04F69C 8004EA9C 844A0064 */ lh $t2, 0x64($v0)
/* 04F6A0 8004EAA0 3C088016 */ lui $t0, %hi(D_801643B8)
/* 04F6A0 8004EAA0 3C088016 */ lui $t0, %hi(gPlayerPositions)
/* 04F6A4 8004EAA4 3C0E800E */ lui $t6, %hi(D_800E5618) # 0x800e
/* 04F6A8 8004EAA8 000C6880 */ sll $t5, $t4, 2
/* 04F6AC 8004EAAC 0018C880 */ sll $t9, $t8, 2
/* 04F6B0 8004EAB0 01194021 */ addu $t0, $t0, $t9
/* 04F6B4 8004EAB4 01CD7021 */ addu $t6, $t6, $t5
/* 04F6B8 8004EAB8 8DCE5618 */ lw $t6, %lo(D_800E5618)($t6) # 0x5618($t6)
/* 04F6BC 8004EABC 8D0843B8 */ lw $t0, %lo(D_801643B8)($t0)
/* 04F6BC 8004EABC 8D0843B8 */ lw $t0, %lo(gPlayerPositions)($t0)
/* 04F6C0 8004EAC0 012A2821 */ addu $a1, $t1, $t2
/* 04F6C4 8004EAC4 3C0A0D01 */ lui $t2, %hi(D_0D015258) # $t2, 0xd01
/* 04F6C8 8004EAC8 240F00FF */ li $t7, 255
@@ -103,4 +103,4 @@ glabel func_8004E998
.L8004EB24:
/* 04F724 8004EB24 27BD0040 */ addiu $sp, $sp, 0x40
/* 04F728 8004EB28 03E00008 */ jr $ra
/* 04F72C 8004EB2C 00000000 */ nop
/* 04F72C 8004EB2C 00000000 */ nop
asm/non_matchings/code_800431B0/func_8004F168.s
+4 -4
View File
@@ -76,9 +76,9 @@ glabel func_8004F168
/* 04FE88 8004F288 1101003F */ beq $t0, $at, .L8004F388
/* 04FE8C 8004F28C 00192C03 */ sra $a1, $t9, 0x10
/* 04FE90 8004F290 00074880 */ sll $t1, $a3, 2
/* 04FE94 8004F294 3C188016 */ lui $t8, %hi(D_801643B8)
/* 04FE94 8004F294 3C188016 */ lui $t8, %hi(gPlayerPositions)
/* 04FE98 8004F298 0309C021 */ addu $t8, $t8, $t1
/* 04FE9C 8004F29C 8F1843B8 */ lw $t8, %lo(D_801643B8)($t8)
/* 04FE9C 8004F29C 8F1843B8 */ lw $t8, %lo(gPlayerPositions)($t8)
/* 04FEA0 8004F2A0 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e
/* 04FEA4 8004F2A4 3C073F80 */ lui $a3, 0x3f80
/* 04FEA8 8004F2A8 1700001F */ bnez $t8, .L8004F328
@@ -140,9 +140,9 @@ glabel func_8004F168
/* 04FF84 8004F384 8FBF002C */ lw $ra, 0x2c($sp)
.L8004F388:
/* 04FF88 8004F388 00075880 */ sll $t3, $a3, 2
/* 04FF8C 8004F38C 3C0D8016 */ lui $t5, %hi(D_801643B8)
/* 04FF8C 8004F38C 3C0D8016 */ lui $t5, %hi(gPlayerPositions)
/* 04FF90 8004F390 01AB6821 */ addu $t5, $t5, $t3
/* 04FF94 8004F394 8DAD43B8 */ lw $t5, %lo(D_801643B8)($t5)
/* 04FF94 8004F394 8DAD43B8 */ lw $t5, %lo(gPlayerPositions)($t5)
/* 04FF98 8004F398 24070008 */ li $a3, 8
/* 04FF9C 8004F39C 24060008 */ li $a2, 8
/* 04FFA0 8004F3A0 15A00009 */ bnez $t5, .L8004F3C8
asm/non_matchings/code_800431B0/func_80050644.s
+9 -9
View File
@@ -13,18 +13,18 @@ glabel func_80050644
/* 051270 80050670 8DEFC538 */ lw $t7, %lo(gPlayerCountSelection1)($t7)
/* 051274 80050674 24010001 */ li $at, 1
/* 051278 80050678 15E1002A */ bne $t7, $at, .L80050724
/* 05127C 8005067C 00000000 */ nop
/* 05127C 8005067C 00000000 */ nop
/* 051280 80050680 04E0000A */ bltz $a3, .L800506AC
/* 051284 80050684 3C018016 */ lui $at, %hi(D_801644A8)
/* 051288 80050688 00280821 */ addu $at, $at, $t0
/* 05128C 8005068C C42444A8 */ lwc1 $f4, %lo(D_801644A8)($at)
/* 051290 80050690 3C014468 */ li $at, 0x44680000 # 928.000000
/* 051294 80050694 44813000 */ mtc1 $at, $f6
/* 051298 80050698 00000000 */ nop
/* 051298 80050698 00000000 */ nop
/* 05129C 8005069C 46062202 */ mul.s $f8, $f4, $f6
/* 0512A0 800506A0 4600428D */ trunc.w.s $f10, $f8
/* 0512A4 800506A4 44025000 */ mfc1 $v0, $f10
/* 0512A8 800506A8 00000000 */ nop
/* 0512A8 800506A8 00000000 */ nop
.L800506AC:
/* 0512AC 800506AC 28410104 */ slti $at, $v0, 0x104
/* 0512B0 800506B0 50200006 */ beql $at, $zero, .L800506CC
@@ -70,11 +70,11 @@ glabel func_80050644
/* 051330 80050730 C43044A8 */ lwc1 $f16, %lo(D_801644A8)($at)
/* 051334 80050734 3C014382 */ li $at, 0x43820000 # 260.000000
/* 051338 80050738 44819000 */ mtc1 $at, $f18
/* 05133C 8005073C 00000000 */ nop
/* 05133C 8005073C 00000000 */ nop
/* 051340 80050740 46128102 */ mul.s $f4, $f16, $f18
/* 051344 80050744 4600218D */ trunc.w.s $f6, $f4
/* 051348 80050748 44023000 */ mfc1 $v0, $f6
/* 05134C 8005074C 00000000 */ nop
/* 05134C 8005074C 00000000 */ nop
.L80050750:
/* 051350 80050750 ACA20000 */ sw $v0, ($a1)
/* 051354 80050754 ACC00000 */ sw $zero, ($a2)
@@ -87,10 +87,10 @@ glabel func_80050644
/* 051368 80050768 24010001 */ li $at, 1
/* 05136C 8005076C 24190020 */ li $t9, 32
/* 051370 80050770 1701000B */ bne $t8, $at, .L800507A0
/* 051374 80050774 3C098016 */ lui $t1, %hi(D_801643B8)
/* 051374 80050774 3C098016 */ lui $t1, %hi(gPlayerPositions)
/* 051378 80050778 ACB90000 */ sw $t9, ($a1)
/* 05137C 8005077C 01284821 */ addu $t1, $t1, $t0
/* 051380 80050780 8D2943B8 */ lw $t1, %lo(D_801643B8)($t1)
/* 051380 80050780 8D2943B8 */ lw $t1, %lo(gPlayerPositions)($t1)
/* 051384 80050784 00601025 */ move $v0, $v1
/* 051388 80050788 00095080 */ sll $t2, $t1, 2
/* 05138C 8005078C 01495021 */ addu $t2, $t2, $t1
@@ -105,11 +105,11 @@ glabel func_80050644
/* 0513A8 800507A8 C42844A8 */ lwc1 $f8, %lo(D_801644A8)($at)
/* 0513AC 800507AC 3C014382 */ li $at, 0x43820000 # 260.000000
/* 0513B0 800507B0 44815000 */ mtc1 $at, $f10
/* 0513B4 800507B4 00000000 */ nop
/* 0513B4 800507B4 00000000 */ nop
/* 0513B8 800507B8 460A4402 */ mul.s $f16, $f8, $f10
/* 0513BC 800507BC 4600848D */ trunc.w.s $f18, $f16
/* 0513C0 800507C0 44029000 */ mfc1 $v0, $f18
/* 0513C4 800507C4 00000000 */ nop
/* 0513C4 800507C4 00000000 */ nop
/* 0513C8 800507C8 ACA20000 */ sw $v0, ($a1)
/* 0513CC 800507CC ACC00000 */ sw $zero, ($a2)
/* 0513D0 800507D0 03E00008 */ jr $ra
asm/non_matchings/code_800431B0/func_800514BC.s
+2 -2
View File
@@ -75,11 +75,11 @@ glabel func_800514BC
.L800515C8:
/* 0521C8 800515C8 8EEF0000 */ lw $t7, ($s7)
/* 0521CC 800515CC 00002025 */ move $a0, $zero
/* 0521D0 800515D0 3C058016 */ lui $a1, %hi(D_801643B8) # $a1, 0x8016
/* 0521D0 800515D0 3C058016 */ lui $a1, %hi(gPlayerPositions) # $a1, 0x8016
/* 0521D4 800515D4 16CF0003 */ bne $s6, $t7, .L800515E4
/* 0521D8 800515D8 00000000 */ nop
/* 0521DC 800515DC 0C01438D */ jal func_80050E34
/* 0521E0 800515E0 8CA543B8 */ lw $a1, %lo(D_801643B8)($a1)
/* 0521E0 800515E0 8CA543B8 */ lw $a1, %lo(gPlayerPositions)($a1)
.L800515E4:
/* 0521E4 800515E4 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015
/* 0521E8 800515E8 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298
asm/non_matchings/code_80057C60/func_80059C50.s
+2 -2
View File
@@ -24,10 +24,10 @@ glabel func_80059C50
/* 05A8A4 80059CA4 1420FFF7 */ bnez $at, .L80059C84
/* 05A8A8 80059CA8 A458FFFE */ sh $t8, -2($v0)
/* 05A8AC 80059CAC 3C038019 */ lui $v1, %hi(D_8018CF98) # $v1, 0x8019
/* 05A8B0 80059CB0 3C028016 */ lui $v0, %hi(D_801643B8) # $v0, 0x8016
/* 05A8B0 80059CB0 3C028016 */ lui $v0, %hi(gPlayerPositions) # $v0, 0x8016
/* 05A8B4 80059CB4 3C048016 */ lui $a0, %hi(D_801643D8) # $a0, 0x8016
/* 05A8B8 80059CB8 248443D8 */ addiu $a0, %lo(D_801643D8) # addiu $a0, $a0, 0x43d8
/* 05A8BC 80059CBC 244243B8 */ addiu $v0, %lo(D_801643B8) # addiu $v0, $v0, 0x43b8
/* 05A8BC 80059CBC 244243B8 */ addiu $v0, %lo(gPlayerPositions) # addiu $v0, $v0, 0x43b8
/* 05A8C0 80059CC0 2463CF98 */ addiu $v1, %lo(D_8018CF98) # addiu $v1, $v1, -0x3068
.L80059CC4:
/* 05A8C4 80059CC4 8C480004 */ lw $t0, 4($v0)
asm/non_matchings/code_80057C60/func_8005B914.s
+18 -18
View File
@@ -14,7 +14,7 @@ glabel func_8005B914
/* 05C544 8005B944 002E0821 */ addu $at, $at, $t6
/* 05C548 8005B948 8C2EE350 */ lw $t6, %lo(jpt_800EE350)($at)
/* 05C54C 8005B94C 01C00008 */ jr $t6
/* 05C550 8005B950 00000000 */ nop
/* 05C550 8005B950 00000000 */ nop
.L8005B954:
/* 05C554 8005B954 2C61001D */ sltiu $at, $v1, 0x1d
/* 05C558 8005B958 1020024D */ beqz $at, .L8005C290
@@ -23,10 +23,10 @@ glabel func_8005B914
/* 05C564 8005B964 002F0821 */ addu $at, $at, $t7
/* 05C568 8005B968 8C2FE434 */ lw $t7, %lo(jpt_800EE434)($at)
/* 05C56C 8005B96C 01E00008 */ jr $t7
/* 05C570 8005B970 00000000 */ nop
/* 05C570 8005B970 00000000 */ nop
glabel L8005B974
/* 05C574 8005B974 0C016ABC */ jal func_8005AAF0
/* 05C578 8005B978 00000000 */ nop
/* 05C578 8005B978 00000000 */ nop
/* 05C57C 8005B97C 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05C580 8005B980 10000243 */ b .L8005C290
/* 05C584 8005B984 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
@@ -80,7 +80,7 @@ glabel L8005BA1C
/* 05C62C 8005BA2C 0C016A93 */ jal func_8005AA4C
/* 05C630 8005BA30 A043007F */ sb $v1, 0x7f($v0)
/* 05C634 8005BA34 0C016AA0 */ jal func_8005AA80
/* 05C638 8005BA38 00000000 */ nop
/* 05C638 8005BA38 00000000 */ nop
/* 05C63C 8005BA3C 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05C640 8005BA40 10000213 */ b .L8005C290
/* 05C644 8005BA44 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
@@ -146,13 +146,13 @@ glabel L8005BB04
/* 05C714 8005BB14 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
glabel L8005BB18
/* 05C718 8005BB18 0C016AA0 */ jal func_8005AA80
/* 05C71C 8005BB1C 00000000 */ nop
/* 05C71C 8005BB1C 00000000 */ nop
/* 05C720 8005BB20 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05C724 8005BB24 100001DA */ b .L8005C290
/* 05C728 8005BB28 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
glabel L8005BB2C
/* 05C72C 8005BB2C 0C016A93 */ jal func_8005AA4C
/* 05C730 8005BB30 00000000 */ nop
/* 05C730 8005BB30 00000000 */ nop
/* 05C734 8005BB34 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05C738 8005BB38 100001D5 */ b .L8005C290
/* 05C73C 8005BB3C 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
@@ -484,7 +484,7 @@ glabel L8005BFC0
/* 05CBE4 8005BFE4 1443FFFB */ bne $v0, $v1, .L8005BFD4
/* 05CBE8 8005BFE8 E440FFF0 */ swc1 $f0, -0x10($v0)
/* 05CBEC 8005BFEC 0C016A93 */ jal func_8005AA4C
/* 05CBF0 8005BFF0 00000000 */ nop
/* 05CBF0 8005BFF0 00000000 */ nop
/* 05CBF4 8005BFF4 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05CBF8 8005BFF8 100000A5 */ b .L8005C290
/* 05CBFC 8005BFFC 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
@@ -495,15 +495,15 @@ glabel L8005C000
/* 05CC0C 8005C00C 100000A0 */ b .L8005C290
/* 05CC10 8005C010 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
glabel L8005C014
/* 05CC14 8005C014 3C088016 */ lui $t0, %hi(D_801643B8) # $t0, 0x8016
/* 05CC18 8005C018 8D0843B8 */ lw $t0, %lo(D_801643B8)($t0)
/* 05CC14 8005C014 3C088016 */ lui $t0, %hi(gPlayerPositions) # $t0, 0x8016
/* 05CC18 8005C018 8D0843B8 */ lw $t0, %lo(gPlayerPositions)($t0)
/* 05CC1C 8005C01C 29010004 */ slti $at, $t0, 4
/* 05CC20 8005C020 10200005 */ beqz $at, .L8005C038
/* 05CC24 8005C024 00000000 */ nop
/* 05CC24 8005C024 00000000 */ nop
/* 05CC28 8005C028 0C016A9B */ jal func_8005AA6C
/* 05CC2C 8005C02C 2404008C */ li $a0, 140
/* 05CC30 8005C030 10000003 */ b .L8005C040
/* 05CC34 8005C034 00000000 */ nop
/* 05CC34 8005C034 00000000 */ nop
.L8005C038:
/* 05CC38 8005C038 0C016A9B */ jal func_8005AA6C
/* 05CC3C 8005C03C 24040082 */ li $a0, 130
@@ -513,7 +513,7 @@ glabel L8005C014
/* 05CC48 8005C048 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
glabel L8005C04C
/* 05CC4C 8005C04C 0C016AA0 */ jal func_8005AA80
/* 05CC50 8005C050 00000000 */ nop
/* 05CC50 8005C050 00000000 */ nop
/* 05CC54 8005C054 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05CC58 8005C058 1000008D */ b .L8005C290
/* 05CC5C 8005C05C 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
@@ -671,7 +671,7 @@ glabel L8005C26C
/* 05CE7C 8005C27C 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
glabel L8005C280
/* 05CE80 8005C280 0C016AA0 */ jal func_8005AA80
/* 05CE84 8005C284 00000000 */ nop
/* 05CE84 8005C284 00000000 */ nop
/* 05CE88 8005C288 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05CE8C 8005C28C 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
.L8005C290:
@@ -680,16 +680,16 @@ glabel L8005C290
/* 05CE94 8005C294 50200007 */ beql $at, $zero, .L8005C2B4
/* 05CE98 8005C298 284100C8 */ slti $at, $v0, 0xc8
/* 05CE9C 8005C29C 0C016AD8 */ jal func_8005AB60
/* 05CEA0 8005C2A0 00000000 */ nop
/* 05CEA0 8005C2A0 00000000 */ nop
/* 05CEA4 8005C2A4 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05CEA8 8005C2A8 10000008 */ b .L8005C2CC
/* 05CEAC 8005C2AC 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
/* 05CEB0 8005C2B0 284100C8 */ slti $at, $v0, 0xc8
.L8005C2B4:
/* 05CEB4 8005C2B4 10200005 */ beqz $at, .L8005C2CC
/* 05CEB8 8005C2B8 00000000 */ nop
/* 05CEB8 8005C2B8 00000000 */ nop
/* 05CEBC 8005C2BC 0C016DE8 */ jal func_8005B7A0
/* 05CEC0 8005C2C0 00000000 */ nop
/* 05CEC0 8005C2C0 00000000 */ nop
/* 05CEC4 8005C2C4 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019
/* 05CEC8 8005C2C8 8C42D1CC */ lw $v0, %lo(D_8018D1CC)($v0)
.L8005C2CC:
@@ -723,7 +723,7 @@ glabel L8005C290
/* 05CF34 8005C334 24630004 */ addiu $v1, $v1, 4
/* 05CF38 8005C338 24840004 */ addiu $a0, $a0, 4
/* 05CF3C 8005C33C 45000002 */ bc1f .L8005C348
/* 05CF40 8005C340 00000000 */ nop
/* 05CF40 8005C340 00000000 */ nop
/* 05CF44 8005C344 E4400000 */ swc1 $f0, ($v0)
.L8005C348:
/* 05CF48 8005C348 1469FFEB */ bne $v1, $t1, .L8005C2F8
@@ -732,4 +732,4 @@ glabel L8005C290
/* 05CF50 8005C350 8FBF0014 */ lw $ra, 0x14($sp)
/* 05CF54 8005C354 27BD0030 */ addiu $sp, $sp, 0x30
/* 05CF58 8005C358 03E00008 */ jr $ra
/* 05CF5C 8005C35C 00000000 */ nop
/* 05CF5C 8005C35C 00000000 */ nop
asm/non_matchings/code_80057C60/func_8005C980.s
+2 -2
View File
@@ -10,7 +10,7 @@ glabel func_8005C980
/* 05D5A0 8005C9A0 000E7080 */ sll $t6, $t6, 2
/* 05D5A4 8005C9A4 01C67023 */ subu $t6, $t6, $a2
/* 05D5A8 8005C9A8 000E70C0 */ sll $t6, $t6, 3
/* 05D5AC 8005C9AC 3C048016 */ lui $a0, %hi(D_801643B8) # $a0, 0x8016
/* 05D5AC 8005C9AC 3C048016 */ lui $a0, %hi(gPlayerPositions) # $a0, 0x8016
/* 05D5B0 8005C9B0 3C058016 */ lui $a1, %hi(D_80165590) # $a1, 0x8016
/* 05D5B4 8005C9B4 3C0B8016 */ lui $t3, %hi(D_80165794) # $t3, 0x8016
/* 05D5B8 8005C9B8 3C0A8019 */ lui $t2, %hi(D_8018CF28) # $t2, 0x8019
@@ -19,7 +19,7 @@ glabel func_8005C980
/* 05D5C4 8005C9C4 254ACF28 */ addiu $t2, %lo(D_8018CF28) # addiu $t2, $t2, -0x30d8
/* 05D5C8 8005C9C8 256B5794 */ addiu $t3, %lo(D_80165794) # addiu $t3, $t3, 0x5794
/* 05D5CC 8005C9CC 8CA55590 */ lw $a1, %lo(D_80165590)($a1)
/* 05D5D0 8005C9D0 248443B8 */ addiu $a0, %lo(D_801643B8) # addiu $a0, $a0, 0x43b8
/* 05D5D0 8005C9D0 248443B8 */ addiu $a0, %lo(gPlayerPositions) # addiu $a0, $a0, 0x43b8
/* 05D5D4 8005C9D4 00001025 */ move $v0, $zero
/* 05D5D8 8005C9D8 01C74021 */ addu $t0, $t6, $a3
.L8005C9DC:
asm/non_matchings/code_80057C60/func_8005D18C.s
+4 -4
View File
@@ -3,7 +3,7 @@ glabel func_8005D18C
/* 05DD90 8005D190 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6)
/* 05DD94 8005D194 3C0F800E */ lui $t7, %hi(gPlayerCountSelection1) # $t7, 0x800e
/* 05DD98 8005D198 15C00014 */ bnez $t6, .L8005D1EC
/* 05DD9C 8005D19C 00000000 */ nop
/* 05DD9C 8005D19C 00000000 */ nop
/* 05DDA0 8005D1A0 8DEFC538 */ lw $t7, %lo(gPlayerCountSelection1)($t7)
/* 05DDA4 8005D1A4 24020001 */ li $v0, 1
/* 05DDA8 8005D1A8 3C038019 */ lui $v1, %hi(D_8018D2BC) # $v1, 0x8019
@@ -15,8 +15,8 @@ glabel func_8005D18C
/* 05DDC0 8005D1C0 2484D2A4 */ addiu $a0, %lo(D_8018D2A4) # addiu $a0, $a0, -0x2d5c
/* 05DDC4 8005D1C4 AC600000 */ sw $zero, ($v1)
/* 05DDC8 8005D1C8 AC800000 */ sw $zero, ($a0)
/* 05DDCC 8005D1CC 3C188016 */ lui $t8, %hi(D_801643B8) # $t8, 0x8016
/* 05DDD0 8005D1D0 8F1843B8 */ lw $t8, %lo(D_801643B8)($t8)
/* 05DDCC 8005D1CC 3C188016 */ lui $t8, %hi(gPlayerPositions) # $t8, 0x8016
/* 05DDD0 8005D1D0 8F1843B8 */ lw $t8, %lo(gPlayerPositions)($t8)
/* 05DDD4 8005D1D4 2B010004 */ slti $at, $t8, 4
/* 05DDD8 8005D1D8 14200004 */ bnez $at, .L8005D1EC
/* 05DDDC 8005D1DC 3C018019 */ lui $at, %hi(D_8018D1FC) # $at, 0x8019
@@ -25,4 +25,4 @@ glabel func_8005D18C
/* 05DDE8 8005D1E8 AC620000 */ sw $v0, ($v1)
.L8005D1EC:
/* 05DDEC 8005D1EC 03E00008 */ jr $ra
/* 05DDF0 8005D1F0 00000000 */ nop
/* 05DDF0 8005D1F0 00000000 */ nop
asm/non_matchings/code_8006E9C0/func_80071428.s
+9 -9
View File
@@ -25,13 +25,13 @@ glabel func_80071428
/* 072084 80071484 0C01C7C0 */ jal find_unused_obj_index
/* 072088 80071488 24843E8C */ addiu $a0, %lo(D_80183E8C) # addiu $a0, $a0, 0x3e8c
/* 07208C 8007148C 0C01C064 */ jal func_80070190
/* 072090 80071490 00000000 */ nop
/* 072090 80071490 00000000 */ nop
/* 072094 80071494 0C01C157 */ jal func_8007055C
/* 072098 80071498 00000000 */ nop
/* 072098 80071498 00000000 */ nop
/* 07209C 8007149C 0C01C157 */ jal func_8007055C
/* 0720A0 800714A0 00000000 */ nop
/* 0720A0 800714A0 00000000 */ nop
/* 0720A4 800714A4 0C01C1E0 */ jal func_80070780
/* 0720A8 800714A8 00000000 */ nop
/* 0720A8 800714A8 00000000 */ nop
/* 0720AC 800714AC 3C088019 */ lui $t0, %hi(D_8018CA70) # $t0, 0x8019
/* 0720B0 800714B0 2508CA70 */ addiu $t0, %lo(D_8018CA70) # addiu $t0, $t0, -0x3590
/* 0720B4 800714B4 240E0156 */ li $t6, 342
@@ -46,7 +46,7 @@ glabel func_80071428
/* 0720D8 800714D8 46803220 */ cvt.s.w $f8, $f6
/* 0720DC 800714DC 240E0034 */ li $t6, 52
/* 0720E0 800714E0 240F00C8 */ li $t7, 200
/* 0720E4 800714E4 3C188016 */ lui $t8, %hi(D_801643B8) # $t8, 0x8016
/* 0720E4 800714E4 3C188016 */ lui $t8, %hi(gPlayerPositions) # $t8, 0x8016
/* 0720E8 800714E8 2402012C */ li $v0, 300
/* 0720EC 800714EC 2403FFD8 */ li $v1, -40
/* 0720F0 800714F0 E428CFEC */ swc1 $f8, %lo(D_8018CFEC)($at)
@@ -66,7 +66,7 @@ glabel func_80071428
/* 072128 80071528 A50F0064 */ sh $t7, 0x64($t0)
/* 07212C 8007152C A5000066 */ sh $zero, 0x66($t0)
/* 072130 80071530 A5000068 */ sh $zero, 0x68($t0)
/* 072134 80071534 8F1843B8 */ lw $t8, %lo(D_801643B8)($t8)
/* 072134 80071534 8F1843B8 */ lw $t8, %lo(gPlayerPositions)($t8)
/* 072138 80071538 240DFFE0 */ li $t5, -32
/* 07213C 8007153C A502004E */ sh $v0, 0x4e($t0)
/* 072140 80071540 A5020050 */ sh $v0, 0x50($t0)
@@ -219,7 +219,7 @@ glabel func_80071428
/* 072388 80071788 A42E57A2 */ sh $t6, %lo(D_801657A2)($at)
/* 07238C 8007178C 24050001 */ li $a1, 1
/* 072390 80071790 10650007 */ beq $v1, $a1, .L800717B0
/* 072394 80071794 00000000 */ nop
/* 072394 80071794 00000000 */ nop
/* 072398 80071798 1000001C */ b .L8007180C
/* 07239C 8007179C 8FBF0014 */ lw $ra, 0x14($sp)
.L800717A0:
@@ -229,7 +229,7 @@ glabel func_80071428
/* 0723AC 800717AC AC2FD158 */ sw $t7, %lo(D_8018D158)($at)
.L800717B0:
/* 0723B0 800717B0 0C02D3CB */ jal func_800B4F2C
/* 0723B4 800717B4 00000000 */ nop
/* 0723B4 800717B4 00000000 */ nop
/* 0723B8 800717B8 3C01000F */ lui $at, (0x000FFFFF >> 16) # lui $at, 0xf
/* 0723BC 800717BC 3421FFFF */ ori $at, (0x000FFFFF & 0xFFFF) # ori $at, $at, 0xffff
/* 0723C0 800717C0 0041C024 */ and $t8, $v0, $at
@@ -255,4 +255,4 @@ glabel func_80071428
.L8007180C:
/* 07240C 8007180C 27BD0018 */ addiu $sp, $sp, 0x18
/* 072410 80071810 03E00008 */ jr $ra
/* 072414 80071814 00000000 */ nop
/* 072414 80071814 00000000 */ nop
asm/non_matchings/code_8006E9C0/func_80071818.s
+8 -8
View File
@@ -17,13 +17,13 @@ glabel func_80071818
/* 072454 80071854 0C01C7C0 */ jal find_unused_obj_index
/* 072458 80071858 24843E8C */ addiu $a0, %lo(D_80183E8C) # addiu $a0, $a0, 0x3e8c
/* 07245C 8007185C 0C01C064 */ jal func_80070190
/* 072460 80071860 00000000 */ nop
/* 072460 80071860 00000000 */ nop
/* 072464 80071864 0C01C157 */ jal func_8007055C
/* 072468 80071868 00000000 */ nop
/* 072468 80071868 00000000 */ nop
/* 07246C 8007186C 0C01C157 */ jal func_8007055C
/* 072470 80071870 00000000 */ nop
/* 072470 80071870 00000000 */ nop
/* 072474 80071874 0C01C1E0 */ jal func_80070780
/* 072478 80071878 00000000 */ nop
/* 072478 80071878 00000000 */ nop
/* 07247C 8007187C 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019
/* 072480 80071880 2442CA70 */ addiu $v0, %lo(D_8018CA70) # addiu $v0, $v0, -0x3590
/* 072484 80071884 24030032 */ li $v1, 50
@@ -84,8 +84,8 @@ glabel func_80071818
/* 072560 80071960 3C013F00 */ li $at, 0x3F000000 # 0.500000
/* 072564 80071964 44812000 */ mtc1 $at, $f4
/* 072568 80071968 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019
/* 07256C 8007196C 3C048016 */ lui $a0, %hi(D_801643B8) # $a0, 0x8016
/* 072570 80071970 248443B8 */ addiu $a0, %lo(D_801643B8) # addiu $a0, $a0, 0x43b8
/* 07256C 8007196C 3C048016 */ lui $a0, %hi(gPlayerPositions) # $a0, 0x8016
/* 072570 80071970 248443B8 */ addiu $a0, %lo(gPlayerPositions) # addiu $a0, $a0, 0x43b8
/* 072574 80071974 2442CA70 */ addiu $v0, %lo(D_8018CA70) # addiu $v0, $v0, -0x3590
/* 072578 80071978 E4440088 */ swc1 $f4, 0x88($v0)
/* 07257C 8007197C 8C8C0000 */ lw $t4, ($a0)
@@ -114,7 +114,7 @@ glabel func_80071818
/* 0725D8 800719D8 3C018019 */ lui $at, %hi(D_8018D158) # 0x8019
/* 0725DC 800719DC 24010003 */ li $at, 3
/* 0725E0 800719E0 10610009 */ beq $v1, $at, .L80071A08
/* 0725E4 800719E4 00000000 */ nop
/* 0725E4 800719E4 00000000 */ nop
/* 0725E8 800719E8 1000000A */ b .L80071A14
/* 0725EC 800719EC 8FBF0014 */ lw $ra, 0x14($sp)
.L800719F0:
@@ -133,4 +133,4 @@ glabel func_80071818
.L80071A14:
/* 072614 80071A14 27BD0018 */ addiu $sp, $sp, 0x18
/* 072618 80071A18 03E00008 */ jr $ra
/* 07261C 80071A1C 00000000 */ nop
/* 07261C 80071A1C 00000000 */ nop
asm/non_matchings/code_8006E9C0/func_80071A20.s
+8 -8
View File
@@ -17,13 +17,13 @@ glabel func_80071A20
/* 07265C 80071A5C 0C01C7C0 */ jal find_unused_obj_index
/* 072660 80071A60 24843E8C */ addiu $a0, %lo(D_80183E8C) # addiu $a0, $a0, 0x3e8c
/* 072664 80071A64 0C01C064 */ jal func_80070190
/* 072668 80071A68 00000000 */ nop
/* 072668 80071A68 00000000 */ nop
/* 07266C 80071A6C 0C01C157 */ jal func_8007055C
/* 072670 80071A70 00000000 */ nop
/* 072670 80071A70 00000000 */ nop
/* 072674 80071A74 0C01C157 */ jal func_8007055C
/* 072678 80071A78 00000000 */ nop
/* 072678 80071A78 00000000 */ nop
/* 07267C 80071A7C 0C01C1E0 */ jal func_80070780
/* 072680 80071A80 00000000 */ nop
/* 072680 80071A80 00000000 */ nop
/* 072684 80071A84 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019
/* 072688 80071A88 2442CA70 */ addiu $v0, %lo(D_8018CA70) # addiu $v0, $v0, -0x3590
/* 07268C 80071A8C 2403FFAD */ li $v1, -83
@@ -72,9 +72,9 @@ glabel func_80071A20
/* 072738 80071B38 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e
/* 07273C 80071B3C 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6)
/* 072740 80071B40 24010003 */ li $at, 3
/* 072744 80071B44 3C038016 */ lui $v1, %hi(D_801643B8) # $v1, 0x8016
/* 072744 80071B44 3C038016 */ lui $v1, %hi(gPlayerPositions) # $v1, 0x8016
/* 072748 80071B48 15C10005 */ bne $t6, $at, .L80071B60
/* 07274C 80071B4C 246343B8 */ addiu $v1, %lo(D_801643B8) # addiu $v1, $v1, 0x43b8
/* 07274C 80071B4C 246343B8 */ addiu $v1, %lo(gPlayerPositions) # addiu $v1, $v1, 0x43b8
/* 072750 80071B50 240F005E */ li $t7, 94
/* 072754 80071B54 241800D0 */ li $t8, 208
/* 072758 80071B58 A44F0044 */ sh $t7, 0x44($v0)
@@ -115,7 +115,7 @@ glabel func_80071A20
/* 0727E0 80071BE0 3C018019 */ lui $at, %hi(D_8018D158) # 0x8019
/* 0727E4 80071BE4 24010003 */ li $at, 3
/* 0727E8 80071BE8 10410009 */ beq $v0, $at, .L80071C10
/* 0727EC 80071BEC 00000000 */ nop
/* 0727EC 80071BEC 00000000 */ nop
/* 0727F0 80071BF0 1000000A */ b .L80071C1C
/* 0727F4 80071BF4 8FBF0014 */ lw $ra, 0x14($sp)
.L80071BF8:
@@ -134,4 +134,4 @@ glabel func_80071A20
.L80071C1C:
/* 07281C 80071C1C 27BD0018 */ addiu $sp, $sp, 0x18
/* 072820 80071C20 03E00008 */ jr $ra
/* 072824 80071C24 00000000 */ nop
/* 072824 80071C24 00000000 */ nop
asm/non_matchings/code_8006E9C0/func_80071C28.s
+6 -6
View File
@@ -30,9 +30,9 @@ glabel func_80071C28
/* 072898 80071C98 0C01C7C0 */ jal find_unused_obj_index
/* 07289C 80071C9C 24843E94 */ addiu $a0, %lo(D_80183E94) # addiu $a0, $a0, 0x3e94
/* 0728A0 80071CA0 0C01C064 */ jal func_80070190
/* 0728A4 80071CA4 00000000 */ nop
/* 0728A4 80071CA4 00000000 */ nop
/* 0728A8 80071CA8 0C01C1E0 */ jal func_80070780
/* 0728AC 80071CAC 00000000 */ nop
/* 0728AC 80071CAC 00000000 */ nop
/* 0728B0 80071CB0 3C108019 */ lui $s0, %hi(D_8018CA70) # $s0, 0x8019
/* 0728B4 80071CB4 2610CA70 */ addiu $s0, %lo(D_8018CA70) # addiu $s0, $s0, -0x3590
/* 0728B8 80071CB8 240E011A */ li $t6, 282
@@ -126,8 +126,8 @@ glabel func_80071C28
.L80071E18:
/* 072A18 80071E18 3C013F00 */ li $at, 0x3F000000 # 0.500000
/* 072A1C 80071E1C 44812000 */ mtc1 $at, $f4
/* 072A20 80071E20 3C028016 */ lui $v0, %hi(D_801643B8) # $v0, 0x8016
/* 072A24 80071E24 244243B8 */ addiu $v0, %lo(D_801643B8) # addiu $v0, $v0, 0x43b8
/* 072A20 80071E20 3C028016 */ lui $v0, %hi(gPlayerPositions) # $v0, 0x8016
/* 072A24 80071E24 244243B8 */ addiu $v0, %lo(gPlayerPositions) # addiu $v0, $v0, 0x43b8
/* 072A28 80071E28 E6040190 */ swc1 $f4, 0x190($s0)
/* 072A2C 80071E2C C6000190 */ lwc1 $f0, 0x190($s0)
/* 072A30 80071E30 8C590000 */ lw $t9, ($v0)
@@ -180,5 +180,5 @@ glabel func_80071C28
/* 072AEC 80071EEC 03E00008 */ jr $ra
/* 072AF0 80071EF0 27BD0020 */ addiu $sp, $sp, 0x20
/* 072AF4 80071EF4 00000000 */ nop
/* 072AF8 80071EF8 00000000 */ nop
/* 072AF4 80071EF4 00000000 */ nop
/* 072AF8 80071EF8 00000000 */ nop
asm/non_matchings/code_80071F00/func_8007C9F8.s
+3 -3
View File
@@ -13,15 +13,15 @@ glabel func_8007C9F8
/* 07D61C 8007CA1C 3C038016 */ lui $v1, %hi(D_80164360) # 0x8016
/* 07D620 8007CA20 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e
/* 07D624 8007CA24 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6)
/* 07D628 8007CA28 3C048016 */ lui $a0, %hi(D_801643B8) # $a0, 0x8016
/* 07D62C 8007CA2C 248443B8 */ addiu $a0, %lo(D_801643B8) # addiu $a0, $a0, 0x43b8
/* 07D628 8007CA28 3C048016 */ lui $a0, %hi(gPlayerPositions) # $a0, 0x8016
/* 07D62C 8007CA2C 248443B8 */ addiu $a0, %lo(gPlayerPositions) # addiu $a0, $a0, 0x43b8
/* 07D630 8007CA30 15C0000A */ bnez $t6, .L8007CA5C
/* 07D634 8007CA34 3C038016 */ lui $v1, %hi(D_80164360) # 0x8016
/* 07D638 8007CA38 8C820000 */ lw $v0, ($a0)
/* 07D63C 8007CA3C 8C830004 */ lw $v1, 4($a0)
/* 07D640 8007CA40 0043082A */ slt $at, $v0, $v1
/* 07D644 8007CA44 10200003 */ beqz $at, .L8007CA54
/* 07D648 8007CA48 00000000 */ nop
/* 07D648 8007CA48 00000000 */ nop
/* 07D64C 8007CA4C 03E00008 */ jr $ra
/* 07D650 8007CA50 00001025 */ move $v0, $zero
asm/non_matchings/code_8008C1D0/func_8008C8C4.s
+9 -9
View File
@@ -35,7 +35,7 @@ glabel func_8008C8C4
/* 08D548 8008C948 8F395460 */ lw $t9, %lo(D_80165460)($t9) # 0x5460($t9)
/* 08D54C 8008C94C 3C0A800E */ lui $t2, %hi(gModeSelection) # $t2, 0x800e
/* 08D550 8008C950 14D9000A */ bne $a2, $t9, .L8008C97C
/* 08D554 8008C954 00000000 */ nop
/* 08D554 8008C954 00000000 */ nop
/* 08D558 8008C958 94880000 */ lhu $t0, ($a0)
/* 08D55C 8008C95C 24014000 */ li $at, 16384
/* 08D560 8008C960 31094000 */ andi $t1, $t0, 0x4000
@@ -49,29 +49,29 @@ glabel func_8008C8C4
/* 08D57C 8008C97C 8D4AC53C */ lw $t2, %lo(gModeSelection)($t2)
/* 08D580 8008C980 24010002 */ li $at, 2
/* 08D584 8008C984 15410017 */ bne $t2, $at, .L8008C9E4
/* 08D588 8008C988 00000000 */ nop
/* 08D588 8008C988 00000000 */ nop
/* 08D58C 8008C98C 948B0000 */ lhu $t3, ($a0)
/* 08D590 8008C990 24011000 */ li $at, 4096
/* 08D594 8008C994 3C0D800E */ lui $t5, %hi(D_800DC51C) # $t5, 0x800e
/* 08D598 8008C998 316C1000 */ andi $t4, $t3, 0x1000
/* 08D59C 8008C99C 15810011 */ bne $t4, $at, .L8008C9E4
/* 08D5A0 8008C9A0 00000000 */ nop
/* 08D5A0 8008C9A0 00000000 */ nop
/* 08D5A4 8008C9A4 95ADC51C */ lhu $t5, %lo(D_800DC51C)($t5)
/* 08D5A8 8008C9A8 15A0000E */ bnez $t5, .L8008C9E4
/* 08D5AC 8008C9AC 00000000 */ nop
/* 08D5AC 8008C9AC 00000000 */ nop
/* 08D5B0 8008C9B0 848E00CA */ lh $t6, 0xca($a0)
/* 08D5B4 8008C9B4 3C188016 */ lui $t8, %hi(D_801643B8)
/* 08D5B4 8008C9B4 3C188016 */ lui $t8, %hi(gPlayerPositions)
/* 08D5B8 8008C9B8 0303C021 */ addu $t8, $t8, $v1
/* 08D5BC 8008C9BC 31CF0002 */ andi $t7, $t6, 2
/* 08D5C0 8008C9C0 15E00008 */ bnez $t7, .L8008C9E4
/* 08D5C4 8008C9C4 00000000 */ nop
/* 08D5C8 8008C9C8 8F1843B8 */ lw $t8, %lo(D_801643B8)($t8)
/* 08D5C4 8008C9C4 00000000 */ nop
/* 08D5C8 8008C9C8 8F1843B8 */ lw $t8, %lo(gPlayerPositions)($t8)
/* 08D5CC 8008C9CC 13000005 */ beqz $t8, .L8008C9E4
/* 08D5D0 8008C9D0 00000000 */ nop
/* 08D5D0 8008C9D0 00000000 */ nop
/* 08D5D4 8008C9D4 8C99000C */ lw $t9, 0xc($a0)
/* 08D5D8 8008C9D8 3C010040 */ lui $at, 0x40
/* 08D5DC 8008C9DC 03214025 */ or $t0, $t9, $at
/* 08D5E0 8008C9E0 AC88000C */ sw $t0, 0xc($a0)
.L8008C9E4:
/* 08D5E4 8008C9E4 03E00008 */ jr $ra
/* 08D5E8 8008C9E8 00000000 */ nop
/* 08D5E8 8008C9E8 00000000 */ nop
asm/non_matchings/code_80091750/add_8018D9E0_entry.s
+31 -31
View File
@@ -15,10 +15,10 @@ glabel add_8018D9E0_entry
/* 09F280 8009E680 53000008 */ beql $t8, $zero, .L8009E6A4
/* 09F284 8009E684 8FB90080 */ lw $t9, 0x80($sp)
/* 09F288 8009E688 14200003 */ bnez $at, .L8009E698
/* 09F28C 8009E68C 00000000 */ nop
/* 09F28C 8009E68C 00000000 */ nop
.L8009E690:
/* 09F290 8009E690 1000FFFF */ b .L8009E690
/* 09F294 8009E694 00000000 */ nop
/* 09F294 8009E694 00000000 */ nop
.L8009E698:
/* 09F298 8009E698 1000FFF6 */ b .L8009E674
/* 09F29C 8009E69C 27FF0028 */ addiu $ra, $ra, 0x28
@@ -49,7 +49,7 @@ glabel add_8018D9E0_entry
/* 09F2FC 8009E6FC 002F0821 */ addu $at, $at, $t7
/* 09F300 8009E700 8C2F1160 */ lw $t7, %lo(jpt_800F1160)($at)
/* 09F304 8009E704 01E00008 */ jr $t7
/* 09F308 8009E708 00000000 */ nop
/* 09F308 8009E708 00000000 */ nop
.L8009E70C:
/* 09F30C 8009E70C 24010130 */ li $at, 304
/* 09F310 8009E710 1301038A */ beq $t8, $at, .L8009F53C
@@ -68,7 +68,7 @@ glabel add_8018D9E0_entry
/* 09F340 8009E740 002E0821 */ addu $at, $at, $t6
/* 09F344 8009E744 8C2E125C */ lw $t6, %lo(jpt_800F125C)($at)
/* 09F348 8009E748 01C00008 */ jr $t6
/* 09F34C 8009E74C 00000000 */ nop
/* 09F34C 8009E74C 00000000 */ nop
.L8009E750:
/* 09F350 8009E750 25F8FFFF */ addiu $t8, $t7, -1
/* 09F354 8009E754 2F010037 */ sltiu $at, $t8, 0x37
@@ -78,7 +78,7 @@ glabel add_8018D9E0_entry
/* 09F364 8009E764 00380821 */ addu $at, $at, $t8
/* 09F368 8009E768 8C381504 */ lw $t8, %lo(jpt_800F1504)($at)
/* 09F36C 8009E76C 03000008 */ jr $t8
/* 09F370 8009E770 00000000 */ nop
/* 09F370 8009E770 00000000 */ nop
glabel L8009E774
/* 09F374 8009E774 44802000 */ mtc1 $zero, $f4
/* 09F378 8009E778 3C018019 */ lui $at, %hi(D_8018ED94) # $at, 0x8019
@@ -331,7 +331,7 @@ glabel L8009E9AC
/* 09F73C 8009EB3C AC6E0004 */ sw $t6, 4($v1)
/* 09F740 8009EB40 AFBF007C */ sw $ra, 0x7c($sp)
/* 09F744 8009EB44 0C026E66 */ jal func_8009B998
/* 09F748 8009EB48 00000000 */ nop
/* 09F748 8009EB48 00000000 */ nop
/* 09F74C 8009EB4C 3C040200 */ lui $a0, %hi(D_020015CC) # $a0, 0x200
/* 09F750 8009EB50 0C026461 */ jal func_80099184
/* 09F754 8009EB54 248415CC */ addiu $a0, %lo(D_020015CC) # addiu $a0, $a0, 0x15cc
@@ -426,7 +426,7 @@ glabel L8009EC98
/* 09F8A8 8009ECA8 8FBF001C */ lw $ra, 0x1c($sp)
glabel L8009ECAC
/* 09F8AC 8009ECAC 0C02D557 */ jal func_800B555C
/* 09F8B0 8009ECB0 00000000 */ nop
/* 09F8B0 8009ECB0 00000000 */ nop
/* 09F8B4 8009ECB4 0002C080 */ sll $t8, $v0, 2
/* 09F8B8 8009ECB8 3C04800E */ lui $a0, %hi(D_800E7D4C)
/* 09F8BC 8009ECBC 00982021 */ addu $a0, $a0, $t8
@@ -437,7 +437,7 @@ glabel L8009ECAC
/* 09F8D0 8009ECD0 8FBF001C */ lw $ra, 0x1c($sp)
glabel L8009ECD4
/* 09F8D4 8009ECD4 0C01BB91 */ jal func_8006EE44
/* 09F8D8 8009ECD8 00000000 */ nop
/* 09F8D8 8009ECD8 00000000 */ nop
/* 09F8DC 8009ECDC 3C028019 */ lui $v0, %hi(D_8018E110) # $v0, 0x8019
/* 09F8E0 8009ECE0 2442E110 */ addiu $v0, %lo(D_8018E110) # addiu $v0, $v0, -0x1ef0
/* 09F8E4 8009ECE4 8C590000 */ lw $t9, ($v0)
@@ -457,7 +457,7 @@ glabel L8009ED08
/* 09F918 8009ED18 8FBF001C */ lw $ra, 0x1c($sp)
glabel L8009ED1C
/* 09F91C 8009ED1C 0C02D557 */ jal func_800B555C
/* 09F920 8009ED20 00000000 */ nop
/* 09F920 8009ED20 00000000 */ nop
/* 09F924 8009ED24 00027880 */ sll $t7, $v0, 2
/* 09F928 8009ED28 3C04800E */ lui $a0, %hi(D_800E7D4C)
/* 09F92C 8009ED2C 008F2021 */ addu $a0, $a0, $t7
@@ -702,11 +702,11 @@ glabel L8009F094
/* 09FCA4 8009F0A4 0C0265AF */ jal func_800996BC
/* 09FCA8 8009F0A8 00002825 */ move $a1, $zero
/* 09FCAC 8009F0AC 0C02D6E5 */ jal func_800B5B94
/* 09FCB0 8009F0B0 00000000 */ nop
/* 09FCB0 8009F0B0 00000000 */ nop
/* 09FCB4 8009F0B4 14400005 */ bnez $v0, .L8009F0CC
/* 09FCB8 8009F0B8 00000000 */ nop
/* 09FCB8 8009F0B8 00000000 */ nop
/* 09FCBC 8009F0BC 0C02D9C2 */ jal func_800B6708
/* 09FCC0 8009F0C0 00000000 */ nop
/* 09FCC0 8009F0C0 00000000 */ nop
/* 09FCC4 8009F0C4 10000143 */ b .L8009F5D4
/* 09FCC8 8009F0C8 8FBF001C */ lw $ra, 0x1c($sp)
.L8009F0CC:
@@ -735,11 +735,11 @@ glabel L8009F10C
/* 09FD1C 8009F11C 0C0265AF */ jal func_800996BC
/* 09FD20 8009F120 00002825 */ move $a1, $zero
/* 09FD24 8009F124 0C02D6E5 */ jal func_800B5B94
/* 09FD28 8009F128 00000000 */ nop
/* 09FD28 8009F128 00000000 */ nop
/* 09FD2C 8009F12C 14400005 */ bnez $v0, .L8009F144
/* 09FD30 8009F130 00000000 */ nop
/* 09FD30 8009F130 00000000 */ nop
/* 09FD34 8009F134 0C02D9C2 */ jal func_800B6708
/* 09FD38 8009F138 00000000 */ nop
/* 09FD38 8009F138 00000000 */ nop
/* 09FD3C 8009F13C 10000125 */ b .L8009F5D4
/* 09FD40 8009F140 8FBF001C */ lw $ra, 0x1c($sp)
.L8009F144:
@@ -770,7 +770,7 @@ glabel L8009F174
/* 09FD98 8009F198 04410004 */ bgez $v0, .L8009F1AC
/* 09FD9C 8009F19C 30590003 */ andi $t9, $v0, 3
/* 09FDA0 8009F1A0 13200002 */ beqz $t9, .L8009F1AC
/* 09FDA4 8009F1A4 00000000 */ nop
/* 09FDA4 8009F1A4 00000000 */ nop
/* 09FDA8 8009F1A8 2739FFFC */ addiu $t9, $t9, -4
.L8009F1AC:
/* 09FDAC 8009F1AC 00197040 */ sll $t6, $t9, 1
@@ -798,7 +798,7 @@ glabel L8009F174
/* 09FE00 8009F200 04410004 */ bgez $v0, .L8009F214
/* 09FE04 8009F204 30590003 */ andi $t9, $v0, 3
/* 09FE08 8009F208 13200002 */ beqz $t9, .L8009F214
/* 09FE0C 8009F20C 00000000 */ nop
/* 09FE0C 8009F20C 00000000 */ nop
/* 09FE10 8009F210 2739FFFC */ addiu $t9, $t9, -4
.L8009F214:
/* 09FE14 8009F214 00197840 */ sll $t7, $t9, 1
@@ -848,12 +848,12 @@ glabel L8009F264
/* 09FEBC 8009F2BC 8F1840F4 */ lw $t8, %lo(D_801640F4)($t8) # 0x40f4($t8)
/* 09FEC0 8009F2C0 03203025 */ move $a2, $t9
/* 09FEC4 8009F2C4 1300000B */ beqz $t8, .L8009F2F4
/* 09FEC8 8009F2C8 00000000 */ nop
/* 09FEC8 8009F2C8 00000000 */ nop
/* 09FECC 8009F2CC 10000009 */ b .L8009F2F4
/* 09FED0 8009F2D0 24030001 */ li $v1, 1
.L8009F2D4:
/* 09FED4 8009F2D4 3C0F800E */ lui $t7, %hi(D_800DC5E8) # $t7, 0x800e
/* 09FED8 8009F2D8 8DEFC5E8 */ lw $t7, %lo(D_800DC5E8)($t7)
/* 09FED4 8009F2D4 3C0F800E */ lui $t7, %hi(gPlayerWinningIndex) # $t7, 0x800e
/* 09FED8 8009F2D8 8DEFC5E8 */ lw $t7, %lo(gPlayerWinningIndex)($t7)
/* 09FEDC 8009F2DC 8FAE0080 */ lw $t6, 0x80($sp)
/* 09FEE0 8009F2E0 0006C080 */ sll $t8, $a2, 2
/* 09FEE4 8009F2E4 25F900B1 */ addiu $t9, $t7, 0xb1
@@ -902,15 +902,15 @@ glabel L8009F264
/* 09FF84 8009F384 8FBF001C */ lw $ra, 0x1c($sp)
glabel L8009F388
/* 09FF88 8009F388 3C048019 */ lui $a0, %hi(D_8018CA78) # $a0, 0x8019
/* 09FF8C 8009F38C 3C05800F */ lui $a1, %hi(D_800E86A8) # $a1, 0x800f
/* 09FF8C 8009F38C 3C05800F */ lui $a1, %hi(gCharacterSelections) # $a1, 0x800f
/* 09FF90 8009F390 AFBF007C */ sw $ra, 0x7c($sp)
/* 09FF94 8009F394 80A586A8 */ lb $a1, %lo(D_800E86A8)($a1)
/* 09FF94 8009F394 80A586A8 */ lb $a1, %lo(gCharacterSelections)($a1)
/* 09FF98 8009F398 0C02D408 */ jal func_800B5020
/* 09FF9C 8009F39C 8C84CA78 */ lw $a0, %lo(D_8018CA78)($a0)
/* 09FFA0 8009F3A0 8FBF007C */ lw $ra, 0x7c($sp)
/* 09FFA4 8009F3A4 AFE2001C */ sw $v0, 0x1c($ra)
/* 09FFA8 8009F3A8 0C02D486 */ jal func_800B5218
/* 09FFAC 8009F3AC 00000000 */ nop
/* 09FFAC 8009F3AC 00000000 */ nop
/* 09FFB0 8009F3B0 8FBF007C */ lw $ra, 0x7c($sp)
/* 09FFB4 8009F3B4 3C0F8016 */ lui $t7, %hi(D_80162DD4) # $t7, 0x8016
/* 09FFB8 8009F3B8 24030001 */ li $v1, 1
@@ -920,7 +920,7 @@ glabel L8009F388
/* 09FFC8 8009F3C8 8FF9001C */ lw $t9, 0x1c($ra)
/* 09FFCC 8009F3CC AFBF007C */ sw $ra, 0x7c($sp)
/* 09FFD0 8009F3D0 0C001471 */ jal func_800051C4
/* 09FFD4 8009F3D4 00000000 */ nop
/* 09FFD4 8009F3D4 00000000 */ nop
/* 09FFD8 8009F3D8 28413C01 */ slti $at, $v0, 0x3c01
/* 09FFDC 8009F3DC 14200004 */ bnez $at, .L8009F3F0
/* 09FFE0 8009F3E0 8FBF007C */ lw $ra, 0x7c($sp)
@@ -960,7 +960,7 @@ glabel L8009F430
/* 0A0054 8009F454 04410004 */ bgez $v0, .L8009F468
/* 0A0058 8009F458 304E0003 */ andi $t6, $v0, 3
/* 0A005C 8009F45C 11C00002 */ beqz $t6, .L8009F468
/* 0A0060 8009F460 00000000 */ nop
/* 0A0060 8009F460 00000000 */ nop
/* 0A0064 8009F464 25CEFFFC */ addiu $t6, $t6, -4
.L8009F468:
/* 0A0068 8009F468 000EC840 */ sll $t9, $t6, 1
@@ -982,18 +982,18 @@ glabel L8009F430
/* 0A00A8 8009F4A8 24844A0C */ addiu $a0, %lo(D_02004A0C) # addiu $a0, $a0, 0x4a0c
/* 0A00AC 8009F4AC AFF9001C */ sw $t9, 0x1c($ra)
/* 0A00B0 8009F4B0 0C026449 */ jal segmented_to_virtual
/* 0A00B4 8009F4B4 00000000 */ nop
/* 0A00B4 8009F4B4 00000000 */ nop
/* 0A00B8 8009F4B8 00402025 */ move $a0, $v0
/* 0A00BC 8009F4BC 0C0265AF */ jal func_800996BC
/* 0A00C0 8009F4C0 00002825 */ move $a1, $zero
/* 0A00C4 8009F4C4 0C01BBD8 */ jal func_8006EF60
/* 0A00C8 8009F4C8 00000000 */ nop
/* 0A00C8 8009F4C8 00000000 */ nop
/* 0A00CC 8009F4CC 0C02D6E5 */ jal func_800B5B94
/* 0A00D0 8009F4D0 00000000 */ nop
/* 0A00D0 8009F4D0 00000000 */ nop
/* 0A00D4 8009F4D4 14400005 */ bnez $v0, .L8009F4EC
/* 0A00D8 8009F4D8 00000000 */ nop
/* 0A00D8 8009F4D8 00000000 */ nop
/* 0A00DC 8009F4DC 0C02D9C2 */ jal func_800B6708
/* 0A00E0 8009F4E0 00000000 */ nop
/* 0A00E0 8009F4E0 00000000 */ nop
/* 0A00E4 8009F4E4 1000003B */ b .L8009F5D4
/* 0A00E8 8009F4E8 8FBF001C */ lw $ra, 0x1c($sp)
.L8009F4EC:
@@ -1068,4 +1068,4 @@ glabel L8009F5D0
.L8009F5D4:
/* 0A01D4 8009F5D4 27BD0080 */ addiu $sp, $sp, 0x80
/* 0A01D8 8009F5D8 03E00008 */ jr $ra
/* 0A01DC 8009F5DC 00000000 */ nop
/* 0A01DC 8009F5DC 00000000 */ nop
asm/non_matchings/code_80091750/func_80095574.s
+18 -18
View File
@@ -8,10 +8,10 @@ glabel func_80095574
/* 09618C 8009558C 3C0F8019 */ lui $t7, %hi(D_8018E7B0) # $t7, 0x8019
/* 096190 80095590 81EFE7B0 */ lb $t7, %lo(D_8018E7B0)($t7)
/* 096194 80095594 11E00003 */ beqz $t7, .L800955A4
/* 096198 80095598 00000000 */ nop
/* 096198 80095598 00000000 */ nop
.L8009559C:
/* 09619C 8009559C 0C02A08C */ jal func_800A8230
/* 0961A0 800955A0 00000000 */ nop
/* 0961A0 800955A0 00000000 */ nop
.L800955A4:
/* 0961A4 800955A4 3C028019 */ lui $v0, %hi(gDebugMenuSelection) # $v0, 0x8019
/* 0961A8 800955A8 8042EDEF */ lb $v0, %lo(gDebugMenuSelection)($v0)
@@ -19,7 +19,7 @@ glabel func_80095574
/* 0961B0 800955B0 5420009F */ bnel $at, $zero, .L80095830
/* 0961B4 800955B4 24010001 */ li $at, 1
/* 0961B8 800955B8 0C015DC4 */ jal load_debug_font
/* 0961BC 800955BC 00000000 */ nop
/* 0961BC 800955BC 00000000 */ nop
/* 0961C0 800955C0 3C06800F */ lui $a2, %hi(D_800F0B58) # $a2, 0x800f
/* 0961C4 800955C4 24C60B58 */ addiu $a2, %lo(D_800F0B58) # addiu $a2, $a2, 0xb58
/* 0961C8 800955C8 24040050 */ li $a0, 80
@@ -35,7 +35,7 @@ glabel func_80095574
/* 0961F0 800955F0 00390821 */ addu $at, $at, $t9
/* 0961F4 800955F4 8C391048 */ lw $t9, %lo(jpt_800F1048)($at)
/* 0961F8 800955F8 03200008 */ jr $t9
/* 0961FC 800955FC 00000000 */ nop
/* 0961FC 800955FC 00000000 */ nop
glabel L80095600
/* 096200 80095600 3C06800F */ lui $a2, %hi(D_800F0B64) # $a2, 0x800f
/* 096204 80095604 24C60B64 */ addiu $a2, %lo(D_800F0B64) # addiu $a2, $a2, 0xb64
@@ -43,7 +43,7 @@ glabel L80095600
/* 09620C 8009560C 0C015DE9 */ jal debug_print_str2
/* 096210 80095610 24050064 */ li $a1, 100
/* 096214 80095614 10000022 */ b .L800956A0
/* 096218 80095618 00000000 */ nop
/* 096218 80095618 00000000 */ nop
glabel L8009561C
/* 09621C 8009561C 3C06800F */ lui $a2, %hi(D_800F0B68) # $a2, 0x800f
/* 096220 80095620 24C60B68 */ addiu $a2, %lo(D_800F0B68) # addiu $a2, $a2, 0xb68
@@ -51,7 +51,7 @@ glabel L8009561C
/* 096228 80095628 0C015DE9 */ jal debug_print_str2
/* 09622C 8009562C 2405006E */ li $a1, 110
/* 096230 80095630 1000001B */ b .L800956A0
/* 096234 80095634 00000000 */ nop
/* 096234 80095634 00000000 */ nop
glabel L80095638
/* 096238 80095638 3C06800F */ lui $a2, %hi(D_800F0B6C) # $a2, 0x800f
/* 09623C 8009563C 24C60B6C */ addiu $a2, %lo(D_800F0B6C) # addiu $a2, $a2, 0xb6c
@@ -59,7 +59,7 @@ glabel L80095638
/* 096244 80095644 0C015DE9 */ jal debug_print_str2
/* 096248 80095648 24050078 */ li $a1, 120
/* 09624C 8009564C 10000014 */ b .L800956A0
/* 096250 80095650 00000000 */ nop
/* 096250 80095650 00000000 */ nop
glabel L80095654
/* 096254 80095654 3C06800F */ lui $a2, %hi(D_800F0B70) # $a2, 0x800f
/* 096258 80095658 24C60B70 */ addiu $a2, %lo(D_800F0B70) # addiu $a2, $a2, 0xb70
@@ -67,7 +67,7 @@ glabel L80095654
/* 096260 80095660 0C015DE9 */ jal debug_print_str2
/* 096264 80095664 24050082 */ li $a1, 130
/* 096268 80095668 1000000D */ b .L800956A0
/* 09626C 8009566C 00000000 */ nop
/* 09626C 8009566C 00000000 */ nop
glabel L80095670
/* 096270 80095670 3C06800F */ lui $a2, %hi(D_800F0B74) # $a2, 0x800f
/* 096274 80095674 24C60B74 */ addiu $a2, %lo(D_800F0B74) # addiu $a2, $a2, 0xb74
@@ -75,7 +75,7 @@ glabel L80095670
/* 09627C 8009567C 0C015DE9 */ jal debug_print_str2
/* 096280 80095680 2405008C */ li $a1, 140
/* 096284 80095684 10000006 */ b .L800956A0
/* 096288 80095688 00000000 */ nop
/* 096288 80095688 00000000 */ nop
glabel L8009568C
/* 09628C 8009568C 3C06800F */ lui $a2, %hi(D_800F0B78) # $a2, 0x800f
/* 096290 80095690 24C60B78 */ addiu $a2, %lo(D_800F0B78) # addiu $a2, $a2, 0xb78
@@ -92,7 +92,7 @@ glabel L8009568C
/* 0962B8 800956B8 0C015DE9 */ jal debug_print_str2
/* 0962BC 800956BC 24050064 */ li $a1, 100
/* 0962C0 800956C0 10000006 */ b .L800956DC
/* 0962C4 800956C4 00000000 */ nop
/* 0962C4 800956C4 00000000 */ nop
.L800956C8:
/* 0962C8 800956C8 3C06800F */ lui $a2, %hi(D_800F0B80) # $a2, 0x800f
/* 0962CC 800956CC 24C60B80 */ addiu $a2, %lo(D_800F0B80) # addiu $a2, $a2, 0xb80
@@ -109,7 +109,7 @@ glabel L8009568C
/* 0962F4 800956F4 10200003 */ beqz $at, .L80095704
/* 0962F8 800956F8 3C06800F */ lui $a2, %hi(D_800F0B84) # $a2, 0x800f
/* 0962FC 800956FC 04E10003 */ bgez $a3, .L8009570C
/* 096300 80095700 00000000 */ nop
/* 096300 80095700 00000000 */ nop
.L80095704:
/* 096304 80095704 A4400000 */ sh $zero, ($v0)
/* 096308 80095708 84470000 */ lh $a3, ($v0)
@@ -152,8 +152,8 @@ glabel L8009568C
/* 096390 80095790 24040050 */ li $a0, 80
/* 096394 80095794 0C015DE9 */ jal debug_print_str2
/* 096398 80095798 24050082 */ li $a1, 130
/* 09639C 8009579C 3C0C800F */ lui $t4, %hi(D_800E86A8) # $t4, 0x800f
/* 0963A0 800957A0 818C86A8 */ lb $t4, %lo(D_800E86A8)($t4)
/* 09639C 8009579C 3C0C800F */ lui $t4, %hi(gCharacterSelections) # $t4, 0x800f
/* 0963A0 800957A0 818C86A8 */ lb $t4, %lo(gCharacterSelections)($t4)
/* 0963A4 800957A4 3C06800E */ lui $a2, %hi(gDebugCharacterNames)
/* 0963A8 800957A8 240400AA */ li $a0, 170
/* 0963AC 800957AC 000C6880 */ sll $t5, $t4, 2
@@ -186,7 +186,7 @@ glabel L8009568C
/* 096418 80095818 24C60BB0 */ addiu $a2, %lo(D_800F0BB0) # addiu $a2, $a2, 0xbb0
.L8009581C:
/* 09641C 8009581C 0C015DDE */ jal func_80057778
/* 096420 80095820 00000000 */ nop
/* 096420 80095820 00000000 */ nop
/* 096424 80095824 3C028019 */ lui $v0, %hi(gDebugMenuSelection) # $v0, 0x8019
/* 096428 80095828 8042EDEF */ lb $v0, %lo(gDebugMenuSelection)($v0)
/* 09642C 8009582C 24010001 */ li $at, 1
@@ -216,11 +216,11 @@ glabel L8009568C
/* 096480 80095880 2841012D */ slti $at, $v0, 0x12d
.L80095884:
/* 096484 80095884 14200005 */ bnez $at, .L8009589C
/* 096488 80095888 00000000 */ nop
/* 096488 80095888 00000000 */ nop
/* 09648C 8009588C 0C02788C */ jal func_8009E230
/* 096490 80095890 00000000 */ nop
/* 096490 80095890 00000000 */ nop
/* 096494 80095894 0C032828 */ jal func_800CA0A0
/* 096498 80095898 00000000 */ nop
/* 096498 80095898 00000000 */ nop
.L8009589C:
/* 09649C 8009589C 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015
/* 0964A0 800958A0 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298
@@ -235,4 +235,4 @@ glabel L8009568C
/* 0964C4 800958C4 8FBF0014 */ lw $ra, 0x14($sp)
/* 0964C8 800958C8 27BD0018 */ addiu $sp, $sp, 0x18
/* 0964CC 800958CC 03E00008 */ jr $ra
/* 0964D0 800958D0 00000000 */ nop
/* 0964D0 800958D0 00000000 */ nop
asm/non_matchings/code_80091750/func_8009CE64.s
+45 -45
View File
@@ -14,19 +14,19 @@ glabel func_8009CE64
/* 09DA94 8009CE94 3C0E8028 */ lui $t6, %hi(D_802874F5) # $t6, 0x8028
/* 09DA98 8009CE98 24070003 */ li $a3, 3
/* 09DA9C 8009CE9C 10670003 */ beq $v1, $a3, .L8009CEAC
/* 09DAA0 8009CEA0 00000000 */ nop
/* 09DAA0 8009CEA0 00000000 */ nop
/* 09DAA4 8009CEA4 1000000B */ b .L8009CED4
/* 09DAA8 8009CEA8 00000000 */ nop
/* 09DAA8 8009CEA8 00000000 */ nop
.L8009CEAC:
/* 09DAAC 8009CEAC 81CE74F5 */ lb $t6, %lo(D_802874F5)($t6)
/* 09DAB0 8009CEB0 3C028019 */ lui $v0, %hi(gCupSelection) # $v0, 0x8019
/* 09DAB4 8009CEB4 2442EE09 */ addiu $v0, %lo(gCupSelection) # addiu $v0, $v0, -0x11f7
/* 09DAB8 8009CEB8 29C10003 */ slti $at, $t6, 3
/* 09DABC 8009CEBC 10200005 */ beqz $at, .L8009CED4
/* 09DAC0 8009CEC0 00000000 */ nop
/* 09DAC0 8009CEC0 00000000 */ nop
/* 09DAC4 8009CEC4 804F0000 */ lb $t7, ($v0)
/* 09DAC8 8009CEC8 14EF0002 */ bne $a3, $t7, .L8009CED4
/* 09DACC 8009CECC 00000000 */ nop
/* 09DACC 8009CECC 00000000 */ nop
/* 09DAD0 8009CED0 24050001 */ li $a1, 1
.L8009CED4:
/* 09DAD4 8009CED4 10A00008 */ beqz $a1, .L8009CEF8
@@ -77,27 +77,27 @@ glabel func_8009CE64
/* 09DB7C 8009CF7C 1061000D */ beq $v1, $at, .L8009CFB4
/* 09DB80 8009CF80 2401000D */ li $at, 13
/* 09DB84 8009CF84 1061000F */ beq $v1, $at, .L8009CFC4
/* 09DB88 8009CF88 00000000 */ nop
/* 09DB88 8009CF88 00000000 */ nop
/* 09DB8C 8009CF8C 1000000D */ b .L8009CFC4
/* 09DB90 8009CF90 00000000 */ nop
/* 09DB90 8009CF90 00000000 */ nop
.L8009CF94:
/* 09DB94 8009CF94 0C0A40EC */ jal func_802903B0
/* 09DB98 8009CF98 00000000 */ nop
/* 09DB98 8009CF98 00000000 */ nop
/* 09DB9C 8009CF9C 100001F4 */ b .L8009D770
/* 09DBA0 8009CFA0 8FBF0014 */ lw $ra, 0x14($sp)
.L8009CFA4:
/* 09DBA4 8009CFA4 0C0A40E2 */ jal func_80290388
/* 09DBA8 8009CFA8 00000000 */ nop
/* 09DBA8 8009CFA8 00000000 */ nop
/* 09DBAC 8009CFAC 100001F0 */ b .L8009D770
/* 09DBB0 8009CFB0 8FBF0014 */ lw $ra, 0x14($sp)
.L8009CFB4:
/* 09DBB4 8009CFB4 0C0A40D8 */ jal func_80290360
/* 09DBB8 8009CFB8 00000000 */ nop
/* 09DBB8 8009CFB8 00000000 */ nop
/* 09DBBC 8009CFBC 100001EC */ b .L8009D770
/* 09DBC0 8009CFC0 8FBF0014 */ lw $ra, 0x14($sp)
.L8009CFC4:
/* 09DBC4 8009CFC4 0C0A40CE */ jal func_80290338
/* 09DBC8 8009CFC8 00000000 */ nop
/* 09DBC8 8009CFC8 00000000 */ nop
/* 09DBCC 8009CFCC 100001E8 */ b .L8009D770
/* 09DBD0 8009CFD0 8FBF0014 */ lw $ra, 0x14($sp)
.L8009CFD4:
@@ -111,19 +111,19 @@ glabel func_8009CE64
/* 09DBF0 8009CFF0 10610005 */ beq $v1, $at, .L8009D008
/* 09DBF4 8009CFF4 2401000C */ li $at, 12
/* 09DBF8 8009CFF8 10610009 */ beq $v1, $at, .L8009D020
/* 09DBFC 8009CFFC 00000000 */ nop
/* 09DBFC 8009CFFC 00000000 */ nop
/* 09DC00 8009D000 10000007 */ b .L8009D020
/* 09DC04 8009D004 00000000 */ nop
/* 09DC04 8009D004 00000000 */ nop
.L8009D008:
/* 09DC08 8009D008 0C0A40EC */ jal func_802903B0
/* 09DC0C 8009D00C 00000000 */ nop
/* 09DC0C 8009D00C 00000000 */ nop
/* 09DC10 8009D010 24050001 */ li $a1, 1
/* 09DC14 8009D014 3C018016 */ lui $at, %hi(D_8016556E) # $at, 0x8016
/* 09DC18 8009D018 100001D4 */ b .L8009D76C
/* 09DC1C 8009D01C A425556E */ sh $a1, %lo(D_8016556E)($at)
.L8009D020:
/* 09DC20 8009D020 0C0A40CE */ jal func_80290338
/* 09DC24 8009D024 00000000 */ nop
/* 09DC24 8009D024 00000000 */ nop
/* 09DC28 8009D028 100001D1 */ b .L8009D770
/* 09DC2C 8009D02C 8FBF0014 */ lw $ra, 0x14($sp)
.L8009D030:
@@ -141,25 +141,25 @@ glabel func_8009CE64
/* 09DC5C 8009D05C 002F0821 */ addu $at, $at, $t7
/* 09DC60 8009D060 8C2F109C */ lw $t7, %lo(jpt_800F109C)($at)
/* 09DC64 8009D064 01E00008 */ jr $t7
/* 09DC68 8009D068 00000000 */ nop
/* 09DC68 8009D068 00000000 */ nop
glabel L8009D06C
/* 09DC6C 8009D06C 0C0A40EC */ jal func_802903B0
/* 09DC70 8009D070 00000000 */ nop
/* 09DC70 8009D070 00000000 */ nop
/* 09DC74 8009D074 10000010 */ b .L8009D0B8
/* 09DC78 8009D078 24050001 */ li $a1, 1
glabel L8009D07C
/* 09DC7C 8009D07C 0C0A40E2 */ jal func_80290388
/* 09DC80 8009D080 00000000 */ nop
/* 09DC80 8009D080 00000000 */ nop
/* 09DC84 8009D084 1000000C */ b .L8009D0B8
/* 09DC88 8009D088 24050001 */ li $a1, 1
glabel L8009D08C
/* 09DC8C 8009D08C 0C0A40D8 */ jal func_80290360
/* 09DC90 8009D090 00000000 */ nop
/* 09DC90 8009D090 00000000 */ nop
/* 09DC94 8009D094 10000008 */ b .L8009D0B8
/* 09DC98 8009D098 24050001 */ li $a1, 1
glabel L8009D09C
/* 09DC9C 8009D09C 0C0A40CE */ jal func_80290338
/* 09DCA0 8009D0A0 00000000 */ nop
/* 09DCA0 8009D0A0 00000000 */ nop
/* 09DCA4 8009D0A4 10000004 */ b .L8009D0B8
/* 09DCA8 8009D0A8 24050001 */ li $a1, 1
.L8009D0AC:
@@ -185,7 +185,7 @@ glabel L8009D0AC
/* 09DCEC 8009D0EC 002F0821 */ addu $at, $at, $t7
/* 09DCF0 8009D0F0 8C2F1120 */ lw $t7, %lo(jpt_800F1120)($at)
/* 09DCF4 8009D0F4 01E00008 */ jr $t7
/* 09DCF8 8009D0F8 00000000 */ nop
/* 09DCF8 8009D0F8 00000000 */ nop
glabel L8009D0FC
/* 09DCFC 8009D0FC 24180001 */ li $t8, 1
/* 09DD00 8009D100 3C018016 */ lui $at, %hi(D_8015F892) # $at, 0x8016
@@ -248,7 +248,7 @@ glabel L8009D170
/* 09DDCC 8009D1CC 00390821 */ addu $at, $at, $t9
/* 09DDD0 8009D1D0 8C391134 */ lw $t9, %lo(jpt_800F1134)($at)
/* 09DDD4 8009D1D4 03200008 */ jr $t9
/* 09DDD8 8009D1D8 00000000 */ nop
/* 09DDD8 8009D1D8 00000000 */ nop
glabel L8009D1DC
/* 09DDDC 8009D1DC 3C04800F */ lui $a0, %hi(gMenuSelection) # $a0, 0x800f
/* 09DDE0 8009D1E0 248486A0 */ addiu $a0, %lo(gMenuSelection) # addiu $a0, $a0, -0x7960
@@ -293,11 +293,11 @@ glabel L8009D22C
/* 09DE70 8009D270 002F0821 */ addu $at, $at, $t7
/* 09DE74 8009D274 8C2F1148 */ lw $t7, %lo(jpt_800F1148)($at)
/* 09DE78 8009D278 01E00008 */ jr $t7
/* 09DE7C 8009D27C 00000000 */ nop
/* 09DE7C 8009D27C 00000000 */ nop
glabel L8009D280
/* 09DE80 8009D280 3C01800E */ lui $at, %hi(gCurrentCourseId) # $at, 0x800e
/* 09DE84 8009D284 A420C5A0 */ sh $zero, %lo(gCurrentCourseId)($at)
/* 09DE88 8009D288 3C02800F */ lui $v0, %hi(D_800E86A8) # $v0, 0x800f
/* 09DE88 8009D288 3C02800F */ lui $v0, %hi(gCharacterSelections) # $v0, 0x800f
/* 09DE8C 8009D28C 3C0A800E */ lui $t2, %hi(gPlayerCountSelection1) # $t2, 0x800e
/* 09DE90 8009D290 3C0B8019 */ lui $t3, %hi(D_8018EDF3) # $t3, 0x8019
/* 09DE94 8009D294 3C0C800E */ lui $t4, %hi(gModeSelection) # $t4, 0x800e
@@ -306,7 +306,7 @@ glabel L8009D280
/* 09DEA0 8009D2A0 258CC53C */ addiu $t4, %lo(gModeSelection) # addiu $t4, $t4, -0x3ac4
/* 09DEA4 8009D2A4 256BEDF3 */ addiu $t3, %lo(D_8018EDF3) # addiu $t3, $t3, -0x120d
/* 09DEA8 8009D2A8 254AC538 */ addiu $t2, %lo(gPlayerCountSelection1) # addiu $t2, $t2, -0x3ac8
/* 09DEAC 8009D2AC 244286A8 */ addiu $v0, %lo(D_800E86A8) # addiu $v0, $v0, -0x7958
/* 09DEAC 8009D2AC 244286A8 */ addiu $v0, %lo(gCharacterSelections) # addiu $v0, $v0, -0x7958
/* 09DEB0 8009D2B0 ADA00000 */ sw $zero, ($t5)
/* 09DEB4 8009D2B4 AD450000 */ sw $a1, ($t2)
/* 09DEB8 8009D2B8 A1650000 */ sb $a1, ($t3)
@@ -317,7 +317,7 @@ glabel L8009D2C8
/* 09DEC8 8009D2C8 3C01800E */ lui $at, %hi(gCurrentCourseId) # $at, 0x800e
/* 09DECC 8009D2CC A425C5A0 */ sh $a1, %lo(gCurrentCourseId)($at)
/* 09DED0 8009D2D0 24060002 */ li $a2, 2
/* 09DED4 8009D2D4 3C02800F */ lui $v0, %hi(D_800E86A8) # $v0, 0x800f
/* 09DED4 8009D2D4 3C02800F */ lui $v0, %hi(gCharacterSelections) # $v0, 0x800f
/* 09DED8 8009D2D8 3C0A800E */ lui $t2, %hi(gPlayerCountSelection1) # $t2, 0x800e
/* 09DEDC 8009D2DC 3C0B8019 */ lui $t3, %hi(D_8018EDF3) # $t3, 0x8019
/* 09DEE0 8009D2E0 3C0C800E */ lui $t4, %hi(gModeSelection) # $t4, 0x800e
@@ -326,7 +326,7 @@ glabel L8009D2C8
/* 09DEEC 8009D2EC 258CC53C */ addiu $t4, %lo(gModeSelection) # addiu $t4, $t4, -0x3ac4
/* 09DEF0 8009D2F0 256BEDF3 */ addiu $t3, %lo(D_8018EDF3) # addiu $t3, $t3, -0x120d
/* 09DEF4 8009D2F4 254AC538 */ addiu $t2, %lo(gPlayerCountSelection1) # addiu $t2, $t2, -0x3ac8
/* 09DEF8 8009D2F8 244286A8 */ addiu $v0, %lo(D_800E86A8) # addiu $v0, $v0, -0x7958
/* 09DEF8 8009D2F8 244286A8 */ addiu $v0, %lo(gCharacterSelections) # addiu $v0, $v0, -0x7958
/* 09DEFC 8009D2FC ADA50000 */ sw $a1, ($t5)
/* 09DF00 8009D300 AD460000 */ sw $a2, ($t2)
/* 09DF04 8009D304 A1660000 */ sb $a2, ($t3)
@@ -338,7 +338,7 @@ glabel L8009D318
/* 09DF18 8009D318 2418000B */ li $t8, 11
/* 09DF1C 8009D31C 3C01800E */ lui $at, %hi(gCurrentCourseId) # $at, 0x800e
/* 09DF20 8009D320 A438C5A0 */ sh $t8, %lo(gCurrentCourseId)($at)
/* 09DF24 8009D324 3C02800F */ lui $v0, %hi(D_800E86A8) # $v0, 0x800f
/* 09DF24 8009D324 3C02800F */ lui $v0, %hi(gCharacterSelections) # $v0, 0x800f
/* 09DF28 8009D328 3C0A800E */ lui $t2, %hi(gPlayerCountSelection1) # $t2, 0x800e
/* 09DF2C 8009D32C 3C0B8019 */ lui $t3, %hi(D_8018EDF3) # $t3, 0x8019
/* 09DF30 8009D330 3C0C800E */ lui $t4, %hi(gModeSelection) # $t4, 0x800e
@@ -347,7 +347,7 @@ glabel L8009D318
/* 09DF3C 8009D33C 258CC53C */ addiu $t4, %lo(gModeSelection) # addiu $t4, $t4, -0x3ac4
/* 09DF40 8009D340 256BEDF3 */ addiu $t3, %lo(D_8018EDF3) # addiu $t3, $t3, -0x120d
/* 09DF44 8009D344 254AC538 */ addiu $t2, %lo(gPlayerCountSelection1) # addiu $t2, $t2, -0x3ac8
/* 09DF48 8009D348 244286A8 */ addiu $v0, %lo(D_800E86A8) # addiu $v0, $v0, -0x7958
/* 09DF48 8009D348 244286A8 */ addiu $v0, %lo(gCharacterSelections) # addiu $v0, $v0, -0x7958
/* 09DF4C 8009D34C ADA00000 */ sw $zero, ($t5)
/* 09DF50 8009D350 AD450000 */ sw $a1, ($t2)
/* 09DF54 8009D354 A1650000 */ sb $a1, ($t3)
@@ -358,8 +358,8 @@ glabel L8009D364
/* 09DF64 8009D364 2419000E */ li $t9, 14
/* 09DF68 8009D368 3C01800E */ lui $at, %hi(gCurrentCourseId) # $at, 0x800e
/* 09DF6C 8009D36C A439C5A0 */ sh $t9, %lo(gCurrentCourseId)($at)
/* 09DF70 8009D370 3C02800F */ lui $v0, %hi(D_800E86A8) # $v0, 0x800f
/* 09DF74 8009D374 244286A8 */ addiu $v0, %lo(D_800E86A8) # addiu $v0, $v0, -0x7958
/* 09DF70 8009D370 3C02800F */ lui $v0, %hi(gCharacterSelections) # $v0, 0x800f
/* 09DF74 8009D374 244286A8 */ addiu $v0, %lo(gCharacterSelections) # addiu $v0, $v0, -0x7958
/* 09DF78 8009D378 24070003 */ li $a3, 3
/* 09DF7C 8009D37C 3C0A800E */ lui $t2, %hi(gPlayerCountSelection1) # $t2, 0x800e
/* 09DF80 8009D380 3C0B8019 */ lui $t3, %hi(D_8018EDF3) # $t3, 0x8019
@@ -383,7 +383,7 @@ glabel L8009D3C4
/* 09DFC4 8009D3C4 24060002 */ li $a2, 2
/* 09DFC8 8009D3C8 3C01800E */ lui $at, %hi(gCurrentCourseId) # $at, 0x800e
/* 09DFCC 8009D3CC A426C5A0 */ sh $a2, %lo(gCurrentCourseId)($at)
/* 09DFD0 8009D3D0 3C02800F */ lui $v0, %hi(D_800E86A8) # $v0, 0x800f
/* 09DFD0 8009D3D0 3C02800F */ lui $v0, %hi(gCharacterSelections) # $v0, 0x800f
/* 09DFD4 8009D3D4 3C0A800E */ lui $t2, %hi(gPlayerCountSelection1) # $t2, 0x800e
/* 09DFD8 8009D3D8 3C0B8019 */ lui $t3, %hi(D_8018EDF3) # $t3, 0x8019
/* 09DFDC 8009D3DC 3C0C800E */ lui $t4, %hi(gModeSelection) # $t4, 0x800e
@@ -392,7 +392,7 @@ glabel L8009D3C4
/* 09DFE8 8009D3E8 258CC53C */ addiu $t4, %lo(gModeSelection) # addiu $t4, $t4, -0x3ac4
/* 09DFEC 8009D3EC 256BEDF3 */ addiu $t3, %lo(D_8018EDF3) # addiu $t3, $t3, -0x120d
/* 09DFF0 8009D3F0 254AC538 */ addiu $t2, %lo(gPlayerCountSelection1) # addiu $t2, $t2, -0x3ac8
/* 09DFF4 8009D3F4 244286A8 */ addiu $v0, %lo(D_800E86A8) # addiu $v0, $v0, -0x7958
/* 09DFF4 8009D3F4 244286A8 */ addiu $v0, %lo(gCharacterSelections) # addiu $v0, $v0, -0x7958
/* 09DFF8 8009D3F8 240F0007 */ li $t7, 7
/* 09DFFC 8009D3FC ADA00000 */ sw $zero, ($t5)
/* 09E000 8009D400 AD450000 */ sw $a1, ($t2)
@@ -404,8 +404,8 @@ glabel L8009D414
/* 09E014 8009D414 2418000C */ li $t8, 12
/* 09E018 8009D418 3C01800E */ lui $at, %hi(gCurrentCourseId) # $at, 0x800e
/* 09E01C 8009D41C A438C5A0 */ sh $t8, %lo(gCurrentCourseId)($at)
/* 09E020 8009D420 3C02800F */ lui $v0, %hi(D_800E86A8) # $v0, 0x800f
/* 09E024 8009D424 244286A8 */ addiu $v0, %lo(D_800E86A8) # addiu $v0, $v0, -0x7958
/* 09E020 8009D420 3C02800F */ lui $v0, %hi(gCharacterSelections) # $v0, 0x800f
/* 09E024 8009D424 244286A8 */ addiu $v0, %lo(gCharacterSelections) # addiu $v0, $v0, -0x7958
/* 09E028 8009D428 3C0A800E */ lui $t2, %hi(gPlayerCountSelection1) # $t2, 0x800e
/* 09E02C 8009D42C 3C0B8019 */ lui $t3, %hi(D_8018EDF3) # $t3, 0x8019
/* 09E030 8009D430 3C0C800E */ lui $t4, %hi(gModeSelection) # $t4, 0x800e
@@ -433,7 +433,7 @@ glabel L8009D414
/* 09E084 8009D484 3C028019 */ lui $v0, %hi(gCupSelection) # $v0, 0x8019
/* 09E088 8009D488 29C10006 */ slti $at, $t6, 6
/* 09E08C 8009D48C 14200002 */ bnez $at, .L8009D498
/* 09E090 8009D490 00000000 */ nop
/* 09E090 8009D490 00000000 */ nop
/* 09E094 8009D494 A0800000 */ sb $zero, ($a0)
.L8009D498:
/* 09E098 8009D498 3C04800E */ lui $a0, %hi(gCurrentCourseId) # $a0, 0x800e
@@ -461,7 +461,7 @@ glabel L8009D4D8
/* 09E0EC 8009D4EC 10680005 */ beq $v1, $t0, .L8009D504
/* 09E0F0 8009D4F0 240E000B */ li $t6, 11
/* 09E0F4 8009D4F4 14610011 */ bne $v1, $at, .L8009D53C
/* 09E0F8 8009D4F8 00000000 */ nop
/* 09E0F8 8009D4F8 00000000 */ nop
/* 09E0FC 8009D4FC 1000000F */ b .L8009D53C
/* 09E100 8009D500 AC880000 */ sw $t0, ($a0)
.L8009D504:
@@ -476,7 +476,7 @@ glabel L8009D50C
/* 09E120 8009D520 50680006 */ beql $v1, $t0, .L8009D53C
/* 09E124 8009D524 AC8F0000 */ sw $t7, ($a0)
/* 09E128 8009D528 14610004 */ bne $v1, $at, .L8009D53C
/* 09E12C 8009D52C 00000000 */ nop
/* 09E12C 8009D52C 00000000 */ nop
/* 09E130 8009D530 10000002 */ b .L8009D53C
/* 09E134 8009D534 AC880000 */ sw $t0, ($a0)
/* 09E138 8009D538 AC8F0000 */ sw $t7, ($a0)
@@ -499,11 +499,11 @@ glabel L8009D50C
/* 09E174 8009D574 8D990000 */ lw $t9, ($t4)
/* 09E178 8009D578 3C018019 */ lui $at, %hi(D_8018EDFB) # $at, 0x8019
/* 09E17C 8009D57C 14B90002 */ bne $a1, $t9, .L8009D588
/* 09E180 8009D580 00000000 */ nop
/* 09E180 8009D580 00000000 */ nop
/* 09E184 8009D584 A025EDFB */ sb $a1, %lo(D_8018EDFB)($at)
.L8009D588:
/* 09E188 8009D588 0C027387 */ jal func_8009CE1C
/* 09E18C 8009D58C 00000000 */ nop
/* 09E18C 8009D58C 00000000 */ nop
.L8009D590:
/* 09E190 8009D590 3C018019 */ lui $at, %hi(D_8018EE0C) # $at, 0x8019
/* 09E194 8009D594 10000075 */ b .L8009D76C
@@ -538,11 +538,11 @@ glabel L8009D50C
/* 09E1F8 8009D5F8 8D980000 */ lw $t8, ($t4)
/* 09E1FC 8009D5FC 3C018019 */ lui $at, %hi(D_8018EDFB) # $at, 0x8019
/* 09E200 8009D600 14B80002 */ bne $a1, $t8, .L8009D60C
/* 09E204 8009D604 00000000 */ nop
/* 09E204 8009D604 00000000 */ nop
/* 09E208 8009D608 A025EDFB */ sb $a1, %lo(D_8018EDFB)($at)
.L8009D60C:
/* 09E20C 8009D60C 0C003C49 */ jal func_8000F124
/* 09E210 8009D610 00000000 */ nop
/* 09E210 8009D610 00000000 */ nop
/* 09E214 8009D614 3C0D800E */ lui $t5, %hi(gScreenModeSelection) # $t5, 0x800e
/* 09E218 8009D618 25ADC530 */ addiu $t5, %lo(gScreenModeSelection) # addiu $t5, $t5, -0x3ad0
/* 09E21C 8009D61C 8DB90000 */ lw $t9, ($t5)
@@ -556,7 +556,7 @@ glabel L8009D50C
/* 09E23C 8009D63C 50600004 */ beql $v1, $zero, .L8009D650
/* 09E240 8009D640 AD860000 */ sw $a2, ($t4)
/* 09E244 8009D644 14650002 */ bne $v1, $a1, .L8009D650
/* 09E248 8009D648 00000000 */ nop
/* 09E248 8009D648 00000000 */ nop
/* 09E24C 8009D64C AD860000 */ sw $a2, ($t4)
.L8009D650:
/* 09E250 8009D650 3C04800E */ lui $a0, %hi(gCurrentCourseId) # $a0, 0x800e
@@ -571,7 +571,7 @@ glabel L8009D50C
/* 09E274 8009D674 10610005 */ beq $v1, $at, .L8009D68C
/* 09E278 8009D678 24010013 */ li $at, 19
/* 09E27C 8009D67C 10610003 */ beq $v1, $at, .L8009D68C
/* 09E280 8009D680 00000000 */ nop
/* 09E280 8009D680 00000000 */ nop
/* 09E284 8009D684 1000000D */ b .L8009D6BC
/* 09E288 8009D688 8D820000 */ lw $v0, ($t4)
.L8009D68C:
@@ -633,7 +633,7 @@ glabel L8009D50C
/* 09E34C 8009D74C 8F18C548 */ lw $t8, %lo(gCCSelection)($t8)
/* 09E350 8009D750 3C01800E */ lui $at, %hi(gIsMirrorMode)
/* 09E354 8009D754 14F80004 */ bne $a3, $t8, .L8009D768
/* 09E358 8009D758 00000000 */ nop
/* 09E358 8009D758 00000000 */ nop
/* 09E35C 8009D75C 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e
/* 09E360 8009D760 10000002 */ b .L8009D76C
/* 09E364 8009D764 AC25C604 */ sw $a1, %lo(gIsMirrorMode)($at)
@@ -644,4 +644,4 @@ glabel L8009D50C
.L8009D770:
/* 09E370 8009D770 27BD0030 */ addiu $sp, $sp, 0x30
/* 09E374 8009D774 03E00008 */ jr $ra
/* 09E378 8009D778 00000000 */ nop
/* 09E378 8009D778 00000000 */ nop
asm/non_matchings/code_80091750/func_8009F5E0.s
+21 -21
View File
@@ -29,7 +29,7 @@ glabel func_8009F5E0
/* 0A024C 8009F64C 00390821 */ addu $at, $at, $t9
/* 0A0250 8009F650 8C3915E4 */ lw $t9, %lo(jpt_800F15E4)($at)
/* 0A0254 8009F654 03200008 */ jr $t9
/* 0A0258 8009F658 00000000 */ nop
/* 0A0258 8009F658 00000000 */ nop
.L8009F65C:
/* 0A025C 8009F65C 2D210006 */ sltiu $at, $t1, 6
/* 0A0260 8009F660 10200498 */ beqz $at, .L800A08C4
@@ -38,7 +38,7 @@ glabel func_8009F5E0
/* 0A026C 8009F66C 00290821 */ addu $at, $at, $t1
/* 0A0270 8009F670 8C2916E0 */ lw $t1, %lo(jpt_800F16E0)($at)
/* 0A0274 8009F674 01200008 */ jr $t1
/* 0A0278 8009F678 00000000 */ nop
/* 0A0278 8009F678 00000000 */ nop
.L8009F67C:
/* 0A027C 8009F67C 28810038 */ slti $at, $a0, 0x38
/* 0A0280 8009F680 1420000A */ bnez $at, .L8009F6AC
@@ -51,7 +51,7 @@ glabel func_8009F5E0
/* 0A029C 8009F69C 002A0821 */ addu $at, $at, $t2
/* 0A02A0 8009F6A0 8C2A16F8 */ lw $t2, %lo(jpt_800F16F8)($at)
/* 0A02A4 8009F6A4 01400008 */ jr $t2
/* 0A02A8 8009F6A8 00000000 */ nop
/* 0A02A8 8009F6A8 00000000 */ nop
.L8009F6AC:
/* 0A02AC 8009F6AC 2D610037 */ sltiu $at, $t3, 0x37
/* 0A02B0 8009F6B0 10200484 */ beqz $at, .L800A08C4
@@ -60,7 +60,7 @@ glabel func_8009F5E0
/* 0A02BC 8009F6BC 002B0821 */ addu $at, $at, $t3
/* 0A02C0 8009F6C0 8C2B19EC */ lw $t3, %lo(jpt_800F19EC)($at)
/* 0A02C4 8009F6C4 01600008 */ jr $t3
/* 0A02C8 8009F6C8 00000000 */ nop
/* 0A02C8 8009F6C8 00000000 */ nop
glabel L8009F6CC
/* 0A02CC 8009F6CC 3C048015 */ lui $a0, %hi(gGfxPool) # $a0, 0x8015
/* 0A02D0 8009F6D0 8C84EF40 */ lw $a0, %lo(gGfxPool)($a0)
@@ -155,7 +155,7 @@ glabel L8009F804
/* 0A041C 8009F81C 8FBF0034 */ lw $ra, 0x34($sp)
glabel L8009F820
/* 0A0420 8009F820 0C02837F */ jal func_800A0DFC
/* 0A0424 8009F824 00000000 */ nop
/* 0A0424 8009F824 00000000 */ nop
/* 0A0428 8009F828 10000427 */ b .L800A08C8
/* 0A042C 8009F82C 8FBF0034 */ lw $ra, 0x34($sp)
glabel L8009F830
@@ -166,7 +166,7 @@ glabel L8009F830
/* 0A0440 8009F840 8FBF0034 */ lw $ra, 0x34($sp)
glabel L8009F844
/* 0A0444 8009F844 0C02D557 */ jal func_800B555C
/* 0A0448 8009F848 00000000 */ nop
/* 0A0448 8009F848 00000000 */ nop
/* 0A044C 8009F84C 00025880 */ sll $t3, $v0, 2
/* 0A0450 8009F850 3C05800E */ lui $a1, %hi(D_800E7D4C)
/* 0A0454 8009F854 00AB2821 */ addu $a1, $a1, $t3
@@ -239,7 +239,7 @@ glabel L8009F904
/* 0A0550 8009F950 AFA0001C */ sw $zero, 0x1c($sp)
/* 0A0554 8009F954 4600540D */ trunc.w.s $f16, $f10
/* 0A0558 8009F958 44038000 */ mfc1 $v1, $f16
/* 0A055C 8009F95C 00000000 */ nop
/* 0A055C 8009F95C 00000000 */ nop
/* 0A0560 8009F960 04610003 */ bgez $v1, .L8009F970
/* 0A0564 8009F964 00036043 */ sra $t4, $v1, 1
/* 0A0568 8009F968 24610001 */ addiu $at, $v1, 1
@@ -275,7 +275,7 @@ glabel L8009F904
/* 0A05DC 8009F9DC 04810004 */ bgez $a0, .L8009F9F0
/* 0A05E0 8009F9E0 30980001 */ andi $t8, $a0, 1
/* 0A05E4 8009F9E4 13000002 */ beqz $t8, .L8009F9F0
/* 0A05E8 8009F9E8 00000000 */ nop
/* 0A05E8 8009F9E8 00000000 */ nop
/* 0A05EC 8009F9EC 2718FFFE */ addiu $t8, $t8, -2
.L8009F9F0:
/* 0A05F0 8009F9F0 0C024C36 */ jal set_text_color
@@ -291,7 +291,7 @@ glabel L8009F904
/* 0A0614 8009FA14 0081001A */ div $zero, $a0, $at
/* 0A0618 8009FA18 00002010 */ mfhi $a0
/* 0A061C 8009FA1C 0C024C36 */ jal set_text_color
/* 0A0620 8009FA20 00000000 */ nop
/* 0A0620 8009FA20 00000000 */ nop
/* 0A0624 8009FA24 10000004 */ b .L8009FA38
/* 0A0628 8009FA28 27B00080 */ addiu $s0, $sp, 0x80
.L8009FA2C:
@@ -409,7 +409,7 @@ glabel L8009FB24
/* 0A07D8 8009FBD8 46305482 */ mul.d $f18, $f10, $f16
/* 0A07DC 8009FBDC 4620910D */ trunc.w.d $f4, $f18
/* 0A07E0 8009FBE0 44032000 */ mfc1 $v1, $f4
/* 0A07E4 8009FBE4 00000000 */ nop
/* 0A07E4 8009FBE4 00000000 */ nop
/* 0A07E8 8009FBE8 04610003 */ bgez $v1, .L8009FBF8
/* 0A07EC 8009FBEC 00036843 */ sra $t5, $v1, 1
/* 0A07F0 8009FBF0 24610001 */ addiu $at, $v1, 1
@@ -436,13 +436,13 @@ glabel L8009FB24
/* 0A0840 8009FC40 00001825 */ move $v1, $zero
/* 0A0844 8009FC44 46803220 */ cvt.s.w $f8, $f6
/* 0A0848 8009FC48 448A3000 */ mtc1 $t2, $f6
/* 0A084C 8009FC4C 00000000 */ nop
/* 0A084C 8009FC4C 00000000 */ nop
/* 0A0850 8009FC50 468030A0 */ cvt.s.w $f2, $f6
/* 0A0854 8009FC54 46104481 */ sub.s $f18, $f8, $f16
/* 0A0858 8009FC58 E7A20038 */ swc1 $f2, 0x38($sp)
/* 0A085C 8009FC5C 4600910D */ trunc.w.s $f4, $f18
/* 0A0860 8009FC60 44042000 */ mfc1 $a0, $f4
/* 0A0864 8009FC64 00000000 */ nop
/* 0A0864 8009FC64 00000000 */ nop
/* 0A0868 8009FC68 AFA4003C */ sw $a0, 0x3c($sp)
.L8009FC6C:
/* 0A086C 8009FC6C 44835000 */ mtc1 $v1, $f10
@@ -460,7 +460,7 @@ glabel L8009FB24
/* 0A089C 8009FC9C 4600910D */ trunc.w.s $f4, $f18
/* 0A08A0 8009FCA0 44052000 */ mfc1 $a1, $f4
/* 0A08A4 8009FCA4 0C024DBB */ jal draw_text
/* 0A08A8 8009FCA8 00000000 */ nop
/* 0A08A8 8009FCA8 00000000 */ nop
/* 0A08AC 8009FCAC 8FA20040 */ lw $v0, 0x40($sp)
/* 0A08B0 8009FCB0 8FA30044 */ lw $v1, 0x44($sp)
/* 0A08B4 8009FCB4 3C0C800E */ lui $t4, %hi(D_800E77A8) # $t4, 0x800e
@@ -474,7 +474,7 @@ glabel L8009FB24
/* 0A08D4 8009FCD4 8FBF0034 */ lw $ra, 0x34($sp)
glabel L8009FCD8
/* 0A08D8 8009FCD8 0C02D557 */ jal func_800B555C
/* 0A08DC 8009FCDC 00000000 */ nop
/* 0A08DC 8009FCDC 00000000 */ nop
/* 0A08E0 8009FCE0 00026880 */ sll $t5, $v0, 2
/* 0A08E4 8009FCE4 3C05800E */ lui $a1, %hi(D_800E7D4C)
/* 0A08E8 8009FCE8 00AD2821 */ addu $a1, $a1, $t5
@@ -622,7 +622,7 @@ glabel L8009FE9C
/* 0A0AFC 8009FEFC 00380821 */ addu $at, $at, $t8
/* 0A0B00 8009FF00 8C381AD0 */ lw $t8, %lo(jpt_800F1AD0)($at)
/* 0A0B04 8009FF04 03000008 */ jr $t8
/* 0A0B08 8009FF08 00000000 */ nop
/* 0A0B08 8009FF08 00000000 */ nop
glabel L8009FF0C
/* 0A0B0C 8009FF0C 10A00005 */ beqz $a1, .L8009FF24
/* 0A0B10 8009FF10 24190012 */ li $t9, 18
@@ -762,9 +762,9 @@ glabel L800A00DC
/* 0A0CF8 800A00F8 AE020000 */ sw $v0, ($s0)
glabel L800A00FC
/* 0A0CFC 800A00FC 2505FFCC */ addiu $a1, $t0, -0x34
/* 0A0D00 800A0100 3C188019 */ lui $t8, %hi(gCharacterSelections) # 0x8019
/* 0A0D00 800A0100 3C188019 */ lui $t8, %hi(gCharacterGridSelections) # 0x8019
/* 0A0D04 800A0104 0305C021 */ addu $t8, $t8, $a1
/* 0A0D08 800A0108 8318EDE4 */ lb $t8, %lo(gCharacterSelections)($t8) # -0x121c($t8)
/* 0A0D08 800A0108 8318EDE4 */ lb $t8, %lo(gCharacterGridSelections)($t8) # -0x121c($t8)
/* 0A0D0C 800A010C 3C198019 */ lui $t9, %hi(D_8018EDE8) # 0x8019
/* 0A0D10 800A0110 0325C821 */ addu $t9, $t9, $a1
/* 0A0D14 800A0114 530001EC */ beql $t8, $zero, .L800A08C8
@@ -772,7 +772,7 @@ glabel L800A00FC
/* 0A0D1C 800A011C 8339EDE8 */ lb $t9, %lo(D_8018EDE8)($t9) # -0x1218($t9)
/* 0A0D20 800A0120 3C06800E */ lui $a2, %hi(gGlobalTimer) # $a2, 0x800e
/* 0A0D24 800A0124 17200003 */ bnez $t9, .L800A0134
/* 0A0D28 800A0128 00000000 */ nop
/* 0A0D28 800A0128 00000000 */ nop
/* 0A0D2C 800A012C 10000011 */ b .L800A0174
/* 0A0D30 800A0130 240600FF */ li $a2, 255
.L800A0134:
@@ -780,7 +780,7 @@ glabel L800A00FC
/* 0A0D38 800A0138 04C10004 */ bgez $a2, .L800A014C
/* 0A0D3C 800A013C 30C9000F */ andi $t1, $a2, 0xf
/* 0A0D40 800A0140 11200002 */ beqz $t1, .L800A014C
/* 0A0D44 800A0144 00000000 */ nop
/* 0A0D44 800A0144 00000000 */ nop
/* 0A0D48 800A0148 2529FFF0 */ addiu $t1, $t1, -0x10
.L800A014C:
/* 0A0D4C 800A014C 29210008 */ slti $at, $t1, 8
@@ -1159,10 +1159,10 @@ glabel L800A0684
glabel L800A0694
/* 0A1294 800A0694 8E2B0004 */ lw $t3, 4($s1)
/* 0A1298 800A0698 2502FF4F */ addiu $v0, $t0, -0xb1
/* 0A129C 800A069C 3C0C800F */ lui $t4, %hi(D_800E86A8) # 0x800f
/* 0A129C 800A069C 3C0C800F */ lui $t4, %hi(gCharacterSelections) # 0x800f
/* 0A12A0 800A06A0 11600088 */ beqz $t3, .L800A08C4
/* 0A12A4 800A06A4 01826021 */ addu $t4, $t4, $v0
/* 0A12A8 800A06A8 818C86A8 */ lb $t4, %lo(D_800E86A8)($t4) # -0x7958($t4)
/* 0A12A8 800A06A8 818C86A8 */ lb $t4, %lo(gCharacterSelections)($t4) # -0x7958($t4)
/* 0A12AC 800A06AC 3C06800F */ lui $a2, %hi(D_800EFD64) # 0x800f
/* 0A12B0 800A06B0 3C04800E */ lui $a0, %hi(D_800E7D54)
/* 0A12B4 800A06B4 00CC3021 */ addu $a2, $a2, $t4
asm/non_matchings/code_80091750/func_800A69C8.s
+10 -10
View File
@@ -38,28 +38,28 @@ glabel func_800A69C8
/* 0A7654 800A6A54 10410005 */ beq $v0, $at, .L800A6A6C
/* 0A7658 800A6A58 3C13800E */ lui $s3, %hi(D_800E7720)
/* 0A765C 800A6A5C 1055000E */ beq $v0, $s5, .L800A6A98
/* 0A7660 800A6A60 00000000 */ nop
/* 0A7660 800A6A60 00000000 */ nop
/* 0A7664 800A6A64 10000015 */ b .L800A6ABC
/* 0A7668 800A6A68 00035080 */ sll $t2, $v1, 2
.L800A6A6C:
/* 0A766C 800A6A6C 00107880 */ sll $t7, $s0, 2
/* 0A7670 800A6A70 3C188016 */ lui $t8, %hi(D_801643B8)
/* 0A7670 800A6A70 3C188016 */ lui $t8, %hi(gPlayerPositions)
/* 0A7674 800A6A74 030FC021 */ addu $t8, $t8, $t7
/* 0A7678 800A6A78 8F1843B8 */ lw $t8, %lo(D_801643B8)($t8)
/* 0A7678 800A6A78 8F1843B8 */ lw $t8, %lo(gPlayerPositions)($t8)
/* 0A767C 800A6A7C 3C198016 */ lui $t9, %hi(D_8015F8B8) # $t9, 0x8016
/* 0A7680 800A6A80 13000002 */ beqz $t8, .L800A6A8C
/* 0A7684 800A6A84 00000000 */ nop
/* 0A7684 800A6A84 00000000 */ nop
/* 0A7688 800A6A88 24030001 */ li $v1, 1
.L800A6A8C:
/* 0A768C 800A6A8C 8F39F8B8 */ lw $t9, %lo(D_8015F8B8)($t9)
/* 0A7690 800A6A90 10000009 */ b .L800A6AB8
/* 0A7694 800A6A94 0330A021 */ addu $s4, $t9, $s0
.L800A6A98:
/* 0A7698 800A6A98 3C08800E */ lui $t0, %hi(D_800DC5E8) # $t0, 0x800e
/* 0A769C 800A6A9C 8D08C5E8 */ lw $t0, %lo(D_800DC5E8)($t0)
/* 0A7698 800A6A98 3C08800E */ lui $t0, %hi(gPlayerWinningIndex) # $t0, 0x800e
/* 0A769C 800A6A9C 8D08C5E8 */ lw $t0, %lo(gPlayerWinningIndex)($t0)
/* 0A76A0 800A6AA0 3C098016 */ lui $t1, %hi(D_8015F8C4) # $t1, 0x8016
/* 0A76A4 800A6AA4 12080002 */ beq $s0, $t0, .L800A6AB0
/* 0A76A8 800A6AA8 00000000 */ nop
/* 0A76A8 800A6AA8 00000000 */ nop
/* 0A76AC 800A6AAC 24030001 */ li $v1, 1
.L800A6AB0:
/* 0A76B0 800A6AB0 8D29F8C4 */ lw $t1, %lo(D_8015F8C4)($t1)
@@ -80,18 +80,18 @@ glabel func_800A69C8
/* 0A76E0 800A6AE0 0175001A */ div $zero, $t3, $s5
/* 0A76E4 800A6AE4 00002010 */ mfhi $a0
/* 0A76E8 800A6AE8 16A00002 */ bnez $s5, .L800A6AF4
/* 0A76EC 800A6AEC 00000000 */ nop
/* 0A76EC 800A6AEC 00000000 */ nop
/* 0A76F0 800A6AF0 0007000D */ break 7
.L800A6AF4:
/* 0A76F4 800A6AF4 2401FFFF */ li $at, -1
/* 0A76F8 800A6AF8 16A10004 */ bne $s5, $at, .L800A6B0C
/* 0A76FC 800A6AFC 3C018000 */ lui $at, 0x8000
/* 0A7700 800A6B00 15610002 */ bne $t3, $at, .L800A6B0C
/* 0A7704 800A6B04 00000000 */ nop
/* 0A7704 800A6B04 00000000 */ nop
/* 0A7708 800A6B08 0006000D */ break 6
.L800A6B0C:
/* 0A770C 800A6B0C 0C024C36 */ jal set_text_color
/* 0A7710 800A6B10 00000000 */ nop
/* 0A7710 800A6B10 00000000 */ nop
/* 0A7714 800A6B14 92840000 */ lbu $a0, ($s4)
.L800A6B18:
/* 0A7718 800A6B18 0C029E7D */ jal func_800A79F4
asm/non_matchings/code_80091750/func_800A6D94.s
+5 -5
View File
@@ -1,6 +1,6 @@
glabel func_800A6D94
/* 0A7994 800A6D94 3C0F800E */ lui $t7, %hi(D_800DC5E8) # $t7, 0x800e
/* 0A7998 800A6D98 8DEFC5E8 */ lw $t7, %lo(D_800DC5E8)($t7)
/* 0A7994 800A6D94 3C0F800E */ lui $t7, %hi(gPlayerWinningIndex) # $t7, 0x800e
/* 0A7998 800A6D98 8DEFC5E8 */ lw $t7, %lo(gPlayerWinningIndex)($t7)
/* 0A799C 800A6D9C 27BDFFC0 */ addiu $sp, $sp, -0x40
/* 0A79A0 800A6DA0 AFBF001C */ sw $ra, 0x1c($sp)
/* 0A79A4 800A6DA4 AFA40040 */ sw $a0, 0x40($sp)
@@ -25,7 +25,7 @@ glabel func_800A6D94
/* 0A79E8 800A6DE8 0081001A */ div $zero, $a0, $at
/* 0A79EC 800A6DEC 00002010 */ mfhi $a0
/* 0A79F0 800A6DF0 0C024C36 */ jal set_text_color
/* 0A79F4 800A6DF4 00000000 */ nop
/* 0A79F4 800A6DF4 00000000 */ nop
/* 0A79F8 800A6DF8 8FA40024 */ lw $a0, 0x24($sp)
.L800A6DFC:
/* 0A79FC 800A6DFC 0C029E7D */ jal func_800A79F4
@@ -61,8 +61,8 @@ glabel func_800A6D94
/* 0A7A74 800A6E74 4600218D */ trunc.w.s $f6, $f4
/* 0A7A78 800A6E78 44043000 */ mfc1 $a0, $f6
/* 0A7A7C 800A6E7C 0C024E7F */ jal text_draw
/* 0A7A80 800A6E80 00000000 */ nop
/* 0A7A80 800A6E80 00000000 */ nop
/* 0A7A84 800A6E84 8FBF001C */ lw $ra, 0x1c($sp)
/* 0A7A88 800A6E88 27BD0040 */ addiu $sp, $sp, 0x40
/* 0A7A8C 800A6E8C 03E00008 */ jr $ra
/* 0A7A90 800A6E90 00000000 */ nop
/* 0A7A90 800A6E90 00000000 */ nop
asm/non_matchings/code_80091750/func_800A6E94.s
+7 -7
View File
@@ -1,9 +1,9 @@
glabel func_800A6E94
/* 0A7A94 800A6E94 27BDFFB0 */ addiu $sp, $sp, -0x50
/* 0A7A98 800A6E98 00057880 */ sll $t7, $a1, 2
/* 0A7A9C 800A6E9C 3C188016 */ lui $t8, %hi(D_801643B8)
/* 0A7A9C 800A6E9C 3C188016 */ lui $t8, %hi(gPlayerPositions)
/* 0A7AA0 800A6EA0 030FC021 */ addu $t8, $t8, $t7
/* 0A7AA4 800A6EA4 8F1843B8 */ lw $t8, %lo(D_801643B8)($t8)
/* 0A7AA4 800A6EA4 8F1843B8 */ lw $t8, %lo(gPlayerPositions)($t8)
/* 0A7AA8 800A6EA8 AFBF002C */ sw $ra, 0x2c($sp)
/* 0A7AAC 800A6EAC AFB00028 */ sw $s0, 0x28($sp)
/* 0A7AB0 800A6EB0 F7B40020 */ sdc1 $f20, 0x20($sp)
@@ -18,7 +18,7 @@ glabel func_800A6E94
/* 0A7AD4 800A6ED4 0081001A */ div $zero, $a0, $at
/* 0A7AD8 800A6ED8 00002010 */ mfhi $a0
/* 0A7ADC 800A6EDC 0C024C36 */ jal set_text_color
/* 0A7AE0 800A6EE0 00000000 */ nop
/* 0A7AE0 800A6EE0 00000000 */ nop
/* 0A7AE4 800A6EE4 10000004 */ b .L800A6EF8
/* 0A7AE8 800A6EE8 8FA90050 */ lw $t1, 0x50($sp)
.L800A6EEC:
@@ -68,7 +68,7 @@ glabel func_800A6E94
/* 0A7B94 800A6F94 24020001 */ li $v0, 1
/* 0A7B98 800A6F98 00002025 */ move $a0, $zero
/* 0A7B9C 800A6F9C 1449000B */ bne $v0, $t1, .L800A6FCC
/* 0A7BA0 800A6FA0 00000000 */ nop
/* 0A7BA0 800A6FA0 00000000 */ nop
/* 0A7BA4 800A6FA4 3C04800E */ lui $a0, %hi(gGlobalTimer) # $a0, 0x800e
/* 0A7BA8 800A6FA8 8C84C54C */ lw $a0, %lo(gGlobalTimer)($a0)
/* 0A7BAC 800A6FAC 24010003 */ li $at, 3
@@ -76,7 +76,7 @@ glabel func_800A6E94
/* 0A7BB4 800A6FB4 0081001A */ div $zero, $a0, $at
/* 0A7BB8 800A6FB8 00002010 */ mfhi $a0
/* 0A7BBC 800A6FBC 0C024C36 */ jal set_text_color
/* 0A7BC0 800A6FC0 00000000 */ nop
/* 0A7BC0 800A6FC0 00000000 */ nop
/* 0A7BC4 800A6FC4 10000004 */ b .L800A6FD8
/* 0A7BC8 800A6FC8 8FA20038 */ lw $v0, 0x38($sp)
.L800A6FCC:
@@ -113,13 +113,13 @@ glabel func_800A6E94
/* 0A7C40 800A7040 3C04800E */ lui $a0, %hi(gGlobalTimer) # $a0, 0x800e
/* 0A7C44 800A7044 24420001 */ addiu $v0, $v0, 1
/* 0A7C48 800A7048 144C0009 */ bne $v0, $t4, .L800A7070
/* 0A7C4C 800A704C 00000000 */ nop
/* 0A7C4C 800A704C 00000000 */ nop
/* 0A7C50 800A7050 8C84C54C */ lw $a0, %lo(gGlobalTimer)($a0)
/* 0A7C54 800A7054 24010003 */ li $at, 3
/* 0A7C58 800A7058 0081001A */ div $zero, $a0, $at
/* 0A7C5C 800A705C 00002010 */ mfhi $a0
/* 0A7C60 800A7060 0C024C36 */ jal set_text_color
/* 0A7C64 800A7064 00000000 */ nop
/* 0A7C64 800A7064 00000000 */ nop
/* 0A7C68 800A7068 10000004 */ b .L800A707C
/* 0A7C6C 800A706C 86040000 */ lh $a0, ($s0)
.L800A7070:
asm/non_matchings/code_80091750/func_800AADD4.s
+3 -3
View File
@@ -2,11 +2,11 @@ glabel func_800AADD4
/* 0AB9D4 800AADD4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0AB9D8 800AADD8 AFBF0014 */ sw $ra, 0x14($sp)
/* 0AB9DC 800AADDC 8C820000 */ lw $v0, ($a0)
/* 0AB9E0 800AADE0 3C038019 */ lui $v1, %hi(gCharacterSelections) # 0x8019
/* 0AB9E0 800AADE0 3C038019 */ lui $v1, %hi(gCharacterGridSelections) # 0x8019
/* 0AB9E4 800AADE4 240F000E */ li $t7, 14
/* 0AB9E8 800AADE8 2442FFCC */ addiu $v0, $v0, -0x34
/* 0AB9EC 800AADEC 00621821 */ addu $v1, $v1, $v0
/* 0AB9F0 800AADF0 8063EDE4 */ lb $v1, %lo(gCharacterSelections)($v1) # -0x121c($v1)
/* 0AB9F0 800AADF0 8063EDE4 */ lb $v1, %lo(gCharacterGridSelections)($v1) # -0x121c($v1)
/* 0AB9F4 800AADF4 00027040 */ sll $t6, $v0, 1
/* 0AB9F8 800AADF8 01EEC023 */ subu $t8, $t7, $t6
/* 0AB9FC 800AADFC A0980014 */ sb $t8, 0x14($a0)
@@ -15,4 +15,4 @@ glabel func_800AADD4
/* 0ABA08 800AAE08 8FBF0014 */ lw $ra, 0x14($sp)
/* 0ABA0C 800AAE0C 27BD0018 */ addiu $sp, $sp, 0x18
/* 0ABA10 800AAE10 03E00008 */ jr $ra
/* 0ABA14 800AAE14 00000000 */ nop
/* 0ABA14 800AAE14 00000000 */ nop
asm/non_matchings/code_80091750/func_800AAFCC.s
+3 -3
View File
@@ -1,9 +1,9 @@
glabel func_800AAFCC
/* 0ABBCC 800AAFCC 24850001 */ addiu $a1, $a0, 1
/* 0ABBD0 800AAFD0 3C068019 */ lui $a2, %hi(gCharacterSelections) # $a2, 0x8019
/* 0ABBD0 800AAFD0 3C068019 */ lui $a2, %hi(gCharacterGridSelections) # $a2, 0x8019
/* 0ABBD4 800AAFD4 00001825 */ move $v1, $zero
/* 0ABBD8 800AAFD8 00001025 */ move $v0, $zero
/* 0ABBDC 800AAFDC 24C6EDE4 */ addiu $a2, %lo(gCharacterSelections) # addiu $a2, $a2, -0x121c
/* 0ABBDC 800AAFDC 24C6EDE4 */ addiu $a2, %lo(gCharacterGridSelections) # addiu $a2, $a2, -0x121c
/* 0ABBE0 800AAFE0 24040004 */ li $a0, 4
.L800AAFE4:
/* 0ABBE4 800AAFE4 80CE0000 */ lb $t6, ($a2)
@@ -24,4 +24,4 @@ glabel func_800AAFCC
/* 0ABC14 800AB014 2402FFFF */ li $v0, -1
.L800AB018:
/* 0ABC18 800AB018 03E00008 */ jr $ra
/* 0ABC1C 800AB01C 00000000 */ nop
/* 0ABC1C 800AB01C 00000000 */ nop
asm/non_matchings/code_80091750/func_800ACF40.s
+11 -11
View File
@@ -19,7 +19,7 @@ glabel func_800ACF40
/* 0ADB84 800ACF84 002F0821 */ addu $at, $at, $t7
/* 0ADB88 800ACF88 8C2F2728 */ lw $t7, %lo(jpt_800F2728)($at)
/* 0ADB8C 800ACF8C 01E00008 */ jr $t7
/* 0ADB90 800ACF90 00000000 */ nop
/* 0ADB90 800ACF90 00000000 */ nop
glabel L800ACF94
/* 0ADB94 800ACF94 3C02800E */ lui $v0, %hi(D_800E72F8) # $v0, 0x800e
/* 0ADB98 800ACF98 244272F8 */ addiu $v0, %lo(D_800E72F8) # addiu $v0, $v0, 0x72f8
@@ -65,21 +65,21 @@ glabel L800AD01C
/* 0ADC30 800AD030 00065880 */ sll $t3, $a2, 2
/* 0ADC34 800AD034 24010003 */ li $at, 3
/* 0ADC38 800AD038 1041000A */ beq $v0, $at, .L800AD064
/* 0ADC3C 800AD03C 3C0D800E */ lui $t5, %hi(D_800DC5E8) # $t5, 0x800e
/* 0ADC3C 800AD03C 3C0D800E */ lui $t5, %hi(gPlayerWinningIndex) # $t5, 0x800e
/* 0ADC40 800AD040 1000000C */ b .L800AD074
/* 0ADC44 800AD044 00000000 */ nop
/* 0ADC44 800AD044 00000000 */ nop
.L800AD048:
/* 0ADC48 800AD048 3C0C8016 */ lui $t4, %hi(D_801643B8)
/* 0ADC48 800AD048 3C0C8016 */ lui $t4, %hi(gPlayerPositions)
/* 0ADC4C 800AD04C 018B6021 */ addu $t4, $t4, $t3
/* 0ADC50 800AD050 8D8C43B8 */ lw $t4, %lo(D_801643B8)($t4)
/* 0ADC50 800AD050 8D8C43B8 */ lw $t4, %lo(gPlayerPositions)($t4)
/* 0ADC54 800AD054 11800007 */ beqz $t4, .L800AD074
/* 0ADC58 800AD058 00000000 */ nop
/* 0ADC58 800AD058 00000000 */ nop
/* 0ADC5C 800AD05C 10000005 */ b .L800AD074
/* 0ADC60 800AD060 24030001 */ li $v1, 1
.L800AD064:
/* 0ADC64 800AD064 8DADC5E8 */ lw $t5, %lo(D_800DC5E8)($t5)
/* 0ADC64 800AD064 8DADC5E8 */ lw $t5, %lo(gPlayerWinningIndex)($t5)
/* 0ADC68 800AD068 10CD0002 */ beq $a2, $t5, .L800AD074
/* 0ADC6C 800AD06C 00000000 */ nop
/* 0ADC6C 800AD06C 00000000 */ nop
/* 0ADC70 800AD070 24030001 */ li $v1, 1
.L800AD074:
/* 0ADC74 800AD074 54600047 */ bnel $v1, $zero, .L800AD194
@@ -116,10 +116,10 @@ glabel L800AD01C
/* 0ADCF0 800AD0F0 0C032893 */ jal func_800CA24C
/* 0ADCF4 800AD0F4 AFA40024 */ sw $a0, 0x24($sp)
/* 0ADCF8 800AD0F8 8FA60038 */ lw $a2, 0x38($sp)
/* 0ADCFC 800AD0FC 3C05800F */ lui $a1, %hi(D_800E86A8) # 0x800f
/* 0ADCFC 800AD0FC 3C05800F */ lui $a1, %hi(gCharacterSelections) # 0x800f
/* 0ADD00 800AD100 3C012900 */ lui $at, (0x29008007 >> 16) # lui $at, 0x2900
/* 0ADD04 800AD104 00A62821 */ addu $a1, $a1, $a2
/* 0ADD08 800AD108 80A586A8 */ lb $a1, %lo(D_800E86A8)($a1) # -0x7958($a1)
/* 0ADD08 800AD108 80A586A8 */ lb $a1, %lo(gCharacterSelections)($a1) # -0x7958($a1)
/* 0ADD0C 800AD10C 34218007 */ ori $at, (0x29008007 & 0xFFFF) # ori $at, $at, 0x8007
/* 0ADD10 800AD110 8FA40024 */ lw $a0, 0x24($sp)
/* 0ADD14 800AD114 00055100 */ sll $t2, $a1, 4
@@ -161,4 +161,4 @@ glabel L800AD190
/* 0ADD94 800AD194 8FB00018 */ lw $s0, 0x18($sp)
/* 0ADD98 800AD198 27BD0040 */ addiu $sp, $sp, 0x40
/* 0ADD9C 800AD19C 03E00008 */ jr $ra
/* 0ADDA0 800AD1A0 00000000 */ nop
/* 0ADDA0 800AD1A0 00000000 */ nop
asm/non_matchings/code_800AF9B0/func_800B20F4.s
+23 -23
View File
@@ -32,7 +32,7 @@ glabel func_800B20F4
/* 0B2D68 800B2168 002B0821 */ addu $at, $at, $t3
/* 0B2D6C 800B216C 8C2B2DE0 */ lw $t3, %lo(jpt_800F2DE0)($at) # 0x2de0($at)
/* 0B2D70 800B2170 01600008 */ jr $t3
/* 0B2D74 800B2174 00000000 */ nop
/* 0B2D74 800B2174 00000000 */ nop
glabel L800B2178
/* 0B2D78 800B2178 8C4C0000 */ lw $t4, ($v0)
/* 0B2D7C 800B217C 97AD002E */ lhu $t5, 0x2e($sp)
@@ -41,9 +41,9 @@ glabel L800B2178
/* 0B2D88 800B2188 1420000D */ bnez $at, .L800B21C0
/* 0B2D8C 800B218C 31AE9000 */ andi $t6, $t5, 0x9000
/* 0B2D90 800B2190 11C0000B */ beqz $t6, .L800B21C0
/* 0B2D94 800B2194 00000000 */ nop
/* 0B2D94 800B2194 00000000 */ nop
/* 0B2D98 800B2198 0C027870 */ jal func_8009E1C0
/* 0B2D9C 800B219C 00000000 */ nop
/* 0B2D9C 800B219C 00000000 */ nop
/* 0B2DA0 800B21A0 0C0328CC */ jal func_800CA330
/* 0B2DA4 800B21A4 24040019 */ li $a0, 25
/* 0B2DA8 800B21A8 3C044900 */ lui $a0, (0x4900801A >> 16) # lui $a0, 0x4900
@@ -95,7 +95,7 @@ glabel L800B2240
/* 0B2E48 800B2248 34848000 */ ori $a0, (0x49008000 & 0xFFFF) # ori $a0, $a0, 0x8000
/* 0B2E4C 800B224C 306A0100 */ andi $t2, $v1, 0x100
/* 0B2E50 800B2250 1140000D */ beqz $t2, .L800B2288
/* 0B2E54 800B2254 00000000 */ nop
/* 0B2E54 800B2254 00000000 */ nop
/* 0B2E58 800B2258 0C032384 */ jal play_sound2
/* 0B2E5C 800B225C AFA30024 */ sw $v1, 0x24($sp)
/* 0B2E60 800B2260 3C10800E */ lui $s0, %hi(gCurrentCourseId) # $s0, 0x800e
@@ -157,7 +157,7 @@ glabel L800B231C
/* 0B2F24 800B2324 2610EDF1 */ addiu $s0, %lo(D_8018EDF1) # addiu $s0, $s0, -0x120f
/* 0B2F28 800B2328 30690100 */ andi $t1, $v1, 0x100
/* 0B2F2C 800B232C 11200011 */ beqz $t1, .L800B2374
/* 0B2F30 800B2330 00000000 */ nop
/* 0B2F30 800B2330 00000000 */ nop
/* 0B2F34 800B2334 82020000 */ lb $v0, ($s0)
/* 0B2F38 800B2338 3C044900 */ lui $a0, (0x49008000 >> 16) # lui $a0, 0x4900
/* 0B2F3C 800B233C 34848000 */ ori $a0, (0x49008000 & 0xFFFF) # ori $a0, $a0, 0x8000
@@ -220,11 +220,11 @@ glabel L800B231C
/* 0B3010 800B2410 8042EDF1 */ lb $v0, %lo(D_8018EDF1)($v0)
glabel L800B2414
/* 0B3014 800B2414 97A3002E */ lhu $v1, 0x2e($sp)
/* 0B3018 800B2418 3C10800F */ lui $s0, %hi(D_800E86A8) # $s0, 0x800f
/* 0B301C 800B241C 261086A8 */ addiu $s0, %lo(D_800E86A8) # addiu $s0, $s0, -0x7958
/* 0B3018 800B2418 3C10800F */ lui $s0, %hi(gCharacterSelections) # $s0, 0x800f
/* 0B301C 800B241C 261086A8 */ addiu $s0, %lo(gCharacterSelections) # addiu $s0, $s0, -0x7958
/* 0B3020 800B2420 306B0100 */ andi $t3, $v1, 0x100
/* 0B3024 800B2424 1160000B */ beqz $t3, .L800B2454
/* 0B3028 800B2428 00000000 */ nop
/* 0B3028 800B2428 00000000 */ nop
/* 0B302C 800B242C 82020000 */ lb $v0, ($s0)
/* 0B3030 800B2430 3C044900 */ lui $a0, (0x49008000 >> 16) # lui $a0, 0x4900
/* 0B3034 800B2434 34848000 */ ori $a0, (0x49008000 & 0xFFFF) # ori $a0, $a0, 0x8000
@@ -236,10 +236,10 @@ glabel L800B2414
/* 0B304C 800B244C AFA30024 */ sw $v1, 0x24($sp)
/* 0B3050 800B2450 8FA30024 */ lw $v1, 0x24($sp)
.L800B2454:
/* 0B3054 800B2454 3C10800F */ lui $s0, %hi(D_800E86A8) # $s0, 0x800f
/* 0B3054 800B2454 3C10800F */ lui $s0, %hi(gCharacterSelections) # $s0, 0x800f
/* 0B3058 800B2458 306D0200 */ andi $t5, $v1, 0x200
/* 0B305C 800B245C 11A0000A */ beqz $t5, .L800B2488
/* 0B3060 800B2460 261086A8 */ addiu $s0, %lo(D_800E86A8) # addiu $s0, $s0, -0x7958
/* 0B3060 800B2460 261086A8 */ addiu $s0, %lo(gCharacterSelections) # addiu $s0, $s0, -0x7958
/* 0B3064 800B2464 82020000 */ lb $v0, ($s0)
/* 0B3068 800B2468 3C044900 */ lui $a0, (0x49008000 >> 16) # lui $a0, 0x4900
/* 0B306C 800B246C 34848000 */ ori $a0, (0x49008000 & 0xFFFF) # ori $a0, $a0, 0x8000
@@ -279,7 +279,7 @@ glabel L800B24DC
/* 0B30E4 800B24E4 2610EDF2 */ addiu $s0, %lo(gSoundMode) # addiu $s0, $s0, -0x120e
/* 0B30E8 800B24E8 30690100 */ andi $t1, $v1, 0x100
/* 0B30EC 800B24EC 11200018 */ beqz $t1, .L800B2550
/* 0B30F0 800B24F0 00000000 */ nop
/* 0B30F0 800B24F0 00000000 */ nop
/* 0B30F4 800B24F4 92020000 */ lbu $v0, ($s0)
/* 0B30F8 800B24F8 3C044900 */ lui $a0, (0x49008000 >> 16) # lui $a0, 0x4900
/* 0B30FC 800B24FC 34848000 */ ori $a0, (0x49008000 & 0xFFFF) # ori $a0, $a0, 0x8000
@@ -296,13 +296,13 @@ glabel L800B24DC
/* 0B3124 800B2524 0C032384 */ jal play_sound2
/* 0B3128 800B2528 AFA30024 */ sw $v1, 0x24($sp)
/* 0B312C 800B252C 0C02D12F */ jal func_800B44BC
/* 0B3130 800B2530 00000000 */ nop
/* 0B3130 800B2530 00000000 */ nop
/* 0B3134 800B2534 920D0000 */ lbu $t5, ($s0)
/* 0B3138 800B2538 3C018019 */ lui $at, %hi(gSaveDataSoundMode) # $at, 0x8019
/* 0B313C 800B253C 0C02D19C */ jal func_800B4670
/* 0B3140 800B2540 A02DED14 */ sb $t5, %lo(gSaveDataSoundMode)($at)
/* 0B3144 800B2544 0C02D652 */ jal func_800B5948
/* 0B3148 800B2548 00000000 */ nop
/* 0B3148 800B2548 00000000 */ nop
/* 0B314C 800B254C 8FA30024 */ lw $v1, 0x24($sp)
.L800B2550:
/* 0B3150 800B2550 3C108019 */ lui $s0, %hi(gSoundMode) # $s0, 0x8019
@@ -324,7 +324,7 @@ glabel L800B24DC
/* 0B318C 800B258C 0C032384 */ jal play_sound2
/* 0B3190 800B2590 AFA30024 */ sw $v1, 0x24($sp)
/* 0B3194 800B2594 0C02D12F */ jal func_800B44BC
/* 0B3198 800B2598 00000000 */ nop
/* 0B3198 800B2598 00000000 */ nop
/* 0B319C 800B259C 92080000 */ lbu $t0, ($s0)
/* 0B31A0 800B25A0 3C018019 */ lui $at, %hi(gSaveDataSoundMode) # $at, 0x8019
/* 0B31A4 800B25A4 0C02D19C */ jal func_800B4670
@@ -390,7 +390,7 @@ glabel L800B2604
/* 0B3278 800B2678 13200016 */ beqz $t9, .L800B26D4
/* 0B327C 800B267C 30690200 */ andi $t1, $v1, 0x200
/* 0B3280 800B2680 0C02D208 */ jal func_800B4820
/* 0B3284 800B2684 00000000 */ nop
/* 0B3284 800B2684 00000000 */ nop
/* 0B3288 800B2688 00008025 */ move $s0, $zero
/* 0B328C 800B268C 00002825 */ move $a1, $zero
.L800B2690:
@@ -400,7 +400,7 @@ glabel L800B2604
/* 0B329C 800B269C 00012083 */ sra $a0, $at, 2
.L800B26A0:
/* 0B32A0 800B26A0 0C02D501 */ jal func_800B5404
/* 0B32A4 800B26A4 00000000 */ nop
/* 0B32A4 800B26A4 00000000 */ nop
/* 0B32A8 800B26A8 26100001 */ addiu $s0, $s0, 1
/* 0B32AC 800B26AC 3205FFFF */ andi $a1, $s0, 0xffff
/* 0B32B0 800B26B0 28A10010 */ slti $at, $a1, 0x10
@@ -416,19 +416,19 @@ glabel L800B2604
/* 0B32D4 800B26D4 11200022 */ beqz $t1, .L800B2760
/* 0B32D8 800B26D8 3C028019 */ lui $v0, %hi(D_8018EDF1) # 0x8019
/* 0B32DC 800B26DC 0C02D208 */ jal func_800B4820
/* 0B32E0 800B26E0 00000000 */ nop
/* 0B32E0 800B26E0 00000000 */ nop
/* 0B32E4 800B26E4 00008025 */ move $s0, $zero
/* 0B32E8 800B26E8 00002825 */ move $a1, $zero
.L800B26EC:
/* 0B32EC 800B26EC 04A10004 */ bgez $a1, .L800B2700
/* 0B32F0 800B26F0 30AA0003 */ andi $t2, $a1, 3
/* 0B32F4 800B26F4 11400002 */ beqz $t2, .L800B2700
/* 0B32F8 800B26F8 00000000 */ nop
/* 0B32F8 800B26F8 00000000 */ nop
/* 0B32FC 800B26FC 254AFFFC */ addiu $t2, $t2, -4
.L800B2700:
/* 0B3300 800B2700 24010002 */ li $at, 2
/* 0B3304 800B2704 15410005 */ bne $t2, $at, .L800B271C
/* 0B3308 800B2708 00000000 */ nop
/* 0B3308 800B2708 00000000 */ nop
/* 0B330C 800B270C 0C02D501 */ jal func_800B5404
/* 0B3310 800B2710 00002025 */ move $a0, $zero
/* 0B3314 800B2714 10000008 */ b .L800B2738
@@ -440,7 +440,7 @@ glabel L800B2604
/* 0B3328 800B2728 00012083 */ sra $a0, $at, 2
.L800B272C:
/* 0B332C 800B272C 0C02D501 */ jal func_800B5404
/* 0B3330 800B2730 00000000 */ nop
/* 0B3330 800B2730 00000000 */ nop
/* 0B3334 800B2734 26100001 */ addiu $s0, $s0, 1
.L800B2738:
/* 0B3338 800B2738 3205FFFF */ andi $a1, $s0, 0xffff
@@ -500,7 +500,7 @@ glabel L800B2604
/* 0B33FC 800B27FC 306C8000 */ andi $t4, $v1, 0x8000
/* 0B3400 800B2800 314B2000 */ andi $t3, $t2, 0x2000
/* 0B3404 800B2804 11600009 */ beqz $t3, .L800B282C
/* 0B3408 800B2808 00000000 */ nop
/* 0B3408 800B2808 00000000 */ nop
/* 0B340C 800B280C 11800005 */ beqz $t4, .L800B2824
/* 0B3410 800B2810 240E0003 */ li $t6, 3
/* 0B3414 800B2814 240D0001 */ li $t5, 1
@@ -524,7 +524,7 @@ glabel L800B2604
/* 0B3450 800B2850 51000011 */ beql $t0, $zero, .L800B2898
/* 0B3454 800B2854 306B0010 */ andi $t3, $v1, 0x10
/* 0B3458 800B2858 0C027870 */ jal func_8009E1C0
/* 0B345C 800B285C 00000000 */ nop
/* 0B345C 800B285C 00000000 */ nop
/* 0B3460 800B2860 0C0328CC */ jal func_800CA330
/* 0B3464 800B2864 24040019 */ li $a0, 25
/* 0B3468 800B2868 24090040 */ li $t1, 64
@@ -554,4 +554,4 @@ glabel L800B2604
/* 0B34B8 800B28B8 8FB00018 */ lw $s0, 0x18($sp)
/* 0B34BC 800B28BC 27BD0030 */ addiu $sp, $sp, 0x30
/* 0B34C0 800B28C0 03E00008 */ jr $ra
/* 0B34C4 800B28C4 00000000 */ nop
/* 0B34C4 800B28C4 00000000 */ nop
asm/non_matchings/code_800AF9B0/func_800B3554.s
+20 -20
View File
@@ -13,7 +13,7 @@ glabel func_800B3554
/* 0B4180 800B3580 03001825 */ move $v1, $t8
/* 0B4184 800B3584 33081000 */ andi $t0, $t8, 0x1000
/* 0B4188 800B3588 11000004 */ beqz $t0, .L800B359C
/* 0B418C 800B358C 00000000 */ nop
/* 0B418C 800B358C 00000000 */ nop
/* 0B4190 800B3590 37038000 */ ori $v1, $t8, 0x8000
/* 0B4194 800B3594 3069FFFF */ andi $t1, $v1, 0xffff
/* 0B4198 800B3598 01201825 */ move $v1, $t1
@@ -33,13 +33,13 @@ glabel func_800B3554
/* 0B41CC 800B35CC 24010003 */ li $at, 3
/* 0B41D0 800B35D0 10410122 */ beq $v0, $at, .L800B3A5C
/* 0B41D4 800B35D4 97AA0046 */ lhu $t2, 0x46($sp)
/* 0B41D8 800B35D8 3C038019 */ lui $v1, %hi(gCharacterSelections) # 0x8019
/* 0B41D8 800B35D8 3C038019 */ lui $v1, %hi(gCharacterGridSelections) # 0x8019
/* 0B41DC 800B35DC 006A1821 */ addu $v1, $v1, $t2
/* 0B41E0 800B35E0 10000150 */ b .L800B3B24
/* 0B41E4 800B35E4 8063EDE4 */ lb $v1, %lo(gCharacterSelections)($v1) # -0x121c($v1)
/* 0B41E4 800B35E4 8063EDE4 */ lb $v1, %lo(gCharacterGridSelections)($v1) # -0x121c($v1)
.L800B35E8:
/* 0B41E8 800B35E8 3C108019 */ lui $s0, %hi(gCharacterSelections) # $s0, 0x8019
/* 0B41EC 800B35EC 2610EDE4 */ addiu $s0, %lo(gCharacterSelections) # addiu $s0, $s0, -0x121c
/* 0B41E8 800B35E8 3C108019 */ lui $s0, %hi(gCharacterGridSelections) # $s0, 0x8019
/* 0B41EC 800B35EC 2610EDE4 */ addiu $s0, %lo(gCharacterGridSelections) # addiu $s0, $s0, -0x121c
/* 0B41F0 800B35F0 020B6021 */ addu $t4, $s0, $t3
/* 0B41F4 800B35F4 AFAC0028 */ sw $t4, 0x28($sp)
/* 0B41F8 800B35F8 818E0000 */ lb $t6, ($t4)
@@ -50,7 +50,7 @@ glabel func_800B3554
/* 0B420C 800B360C 51E0014E */ beql $t7, $zero, .L800B3B48
/* 0B4210 800B3610 8FBF001C */ lw $ra, 0x1c($sp)
/* 0B4214 800B3614 0C027882 */ jal func_8009E208
/* 0B4218 800B3618 00000000 */ nop
/* 0B4218 800B3618 00000000 */ nop
/* 0B421C 800B361C 3C044900 */ lui $a0, (0x49008002 >> 16) # lui $a0, 0x4900
/* 0B4220 800B3620 0C032384 */ jal play_sound2
/* 0B4224 800B3624 34848002 */ ori $a0, (0x49008002 & 0xFFFF) # ori $a0, $a0, 0x8002
@@ -66,7 +66,7 @@ glabel func_800B3554
/* 0B4248 800B3648 3C044900 */ lui $a0, (0x49008002 >> 16) # lui $a0, 0x4900
/* 0B424C 800B364C 34848002 */ ori $a0, (0x49008002 & 0xFFFF) # ori $a0, $a0, 0x8002
/* 0B4250 800B3650 11000006 */ beqz $t0, .L800B366C
/* 0B4254 800B3654 00000000 */ nop
/* 0B4254 800B3654 00000000 */ nop
/* 0B4258 800B3658 A0E00000 */ sb $zero, ($a3)
/* 0B425C 800B365C 0C032384 */ jal play_sound2
/* 0B4260 800B3660 AFA6002C */ sw $a2, 0x2c($sp)
@@ -283,7 +283,7 @@ glabel func_800B3554
/* 0B4560 800B3960 13010078 */ beq $t8, $at, .L800B3B44
/* 0B4564 800B3964 2B01000A */ slti $at, $t8, 0xa
/* 0B4568 800B3968 1420FFEC */ bnez $at, .L800B391C
/* 0B456C 800B396C 00000000 */ nop
/* 0B456C 800B396C 00000000 */ nop
/* 0B4570 800B3970 10000075 */ b .L800B3B48
/* 0B4574 800B3974 8FBF001C */ lw $ra, 0x1c($sp)
.L800B3978:
@@ -317,7 +317,7 @@ glabel func_800B3554
/* 0B45DC 800B39DC 5161005A */ beql $t3, $at, .L800B3B48
/* 0B45E0 800B39E0 8FBF001C */ lw $ra, 0x1c($sp)
/* 0B45E4 800B39E4 0561FFED */ bgez $t3, .L800B399C
/* 0B45E8 800B39E8 00000000 */ nop
/* 0B45E8 800B39E8 00000000 */ nop
/* 0B45EC 800B39EC 10000056 */ b .L800B3B48
/* 0B45F0 800B39F0 8FBF001C */ lw $ra, 0x1c($sp)
.L800B39F4:
@@ -325,7 +325,7 @@ glabel func_800B3554
/* 0B45F8 800B39F8 30C20400 */ andi $v0, $a2, 0x400
/* 0B45FC 800B39FC 28610005 */ slti $at, $v1, 5
/* 0B4600 800B3A00 14200004 */ bnez $at, .L800B3A14
/* 0B4604 800B3A04 00000000 */ nop
/* 0B4604 800B3A04 00000000 */ nop
/* 0B4608 800B3A08 2470FFFC */ addiu $s0, $v1, -4
/* 0B460C 800B3A0C 00106E00 */ sll $t5, $s0, 0x18
/* 0B4610 800B3A10 000D8603 */ sra $s0, $t5, 0x18
@@ -333,7 +333,7 @@ glabel func_800B3554
/* 0B4614 800B3A14 10400006 */ beqz $v0, .L800B3A30
/* 0B4618 800B3A18 28610005 */ slti $at, $v1, 5
/* 0B461C 800B3A1C 10200004 */ beqz $at, .L800B3A30
/* 0B4620 800B3A20 00000000 */ nop
/* 0B4620 800B3A20 00000000 */ nop
/* 0B4624 800B3A24 24700004 */ addiu $s0, $v1, 4
/* 0B4628 800B3A28 00107E00 */ sll $t7, $s0, 0x18
/* 0B462C 800B3A2C 000F8603 */ sra $s0, $t7, 0x18
@@ -386,38 +386,38 @@ glabel func_800B3554
/* 0B46D4 800B3AD4 0C032384 */ jal play_sound2
/* 0B46D8 800B3AD8 34848002 */ ori $a0, (0x49008002 & 0xFFFF) # ori $a0, $a0, 0x8002
/* 0B46DC 800B3ADC 97B90046 */ lhu $t9, 0x46($sp)
/* 0B46E0 800B3AE0 3C038019 */ lui $v1, %hi(gCharacterSelections) # 0x8019
/* 0B46E0 800B3AE0 3C038019 */ lui $v1, %hi(gCharacterGridSelections) # 0x8019
/* 0B46E4 800B3AE4 00791821 */ addu $v1, $v1, $t9
/* 0B46E8 800B3AE8 1000000E */ b .L800B3B24
/* 0B46EC 800B3AEC 8063EDE4 */ lb $v1, %lo(gCharacterSelections)($v1) # -0x121c($v1)
/* 0B46EC 800B3AEC 8063EDE4 */ lb $v1, %lo(gCharacterGridSelections)($v1) # -0x121c($v1)
.L800B3AF0:
/* 0B46F0 800B3AF0 51000009 */ beql $t0, $zero, .L800B3B18
/* 0B46F4 800B3AF4 97A90046 */ lhu $t1, 0x46($sp)
/* 0B46F8 800B3AF8 0C027870 */ jal func_8009E1C0
/* 0B46FC 800B3AFC 00000000 */ nop
/* 0B46FC 800B3AFC 00000000 */ nop
/* 0B4700 800B3B00 3C044900 */ lui $a0, (0x49008016 >> 16) # lui $a0, 0x4900
/* 0B4704 800B3B04 0C032384 */ jal play_sound2
/* 0B4708 800B3B08 34848016 */ ori $a0, (0x49008016 & 0xFFFF) # ori $a0, $a0, 0x8016
/* 0B470C 800B3B0C 0C003C49 */ jal func_8000F124
/* 0B4710 800B3B10 00000000 */ nop
/* 0B4710 800B3B10 00000000 */ nop
/* 0B4714 800B3B14 97A90046 */ lhu $t1, 0x46($sp)
.L800B3B18:
/* 0B4718 800B3B18 3C038019 */ lui $v1, %hi(gCharacterSelections) # 0x8019
/* 0B4718 800B3B18 3C038019 */ lui $v1, %hi(gCharacterGridSelections) # 0x8019
/* 0B471C 800B3B1C 00691821 */ addu $v1, $v1, $t1
/* 0B4720 800B3B20 8063EDE4 */ lb $v1, %lo(gCharacterSelections)($v1) # -0x121c($v1)
/* 0B4720 800B3B20 8063EDE4 */ lb $v1, %lo(gCharacterGridSelections)($v1) # -0x121c($v1)
.L800B3B24:
/* 0B4724 800B3B24 10600007 */ beqz $v1, .L800B3B44
/* 0B4728 800B3B28 3C0A800F */ lui $t2, %hi(D_800F2BAB) # 0x800f
/* 0B472C 800B3B2C 97AB0046 */ lhu $t3, 0x46($sp)
/* 0B4730 800B3B30 01435021 */ addu $t2, $t2, $v1
/* 0B4734 800B3B34 814A2BAB */ lb $t2, %lo(D_800F2BAB)($t2) # 0x2bab($t2)
/* 0B4738 800B3B38 3C01800F */ lui $at, %hi(D_800E86A8) # 0x800f
/* 0B4738 800B3B38 3C01800F */ lui $at, %hi(gCharacterSelections) # 0x800f
/* 0B473C 800B3B3C 002B0821 */ addu $at, $at, $t3
/* 0B4740 800B3B40 A02A86A8 */ sb $t2, %lo(D_800E86A8)($at) # -0x7958($at)
/* 0B4740 800B3B40 A02A86A8 */ sb $t2, %lo(gCharacterSelections)($at) # -0x7958($at)
.L800B3B44:
/* 0B4744 800B3B44 8FBF001C */ lw $ra, 0x1c($sp)
.L800B3B48:
/* 0B4748 800B3B48 8FB00018 */ lw $s0, 0x18($sp)
/* 0B474C 800B3B4C 27BD0040 */ addiu $sp, $sp, 0x40
/* 0B4750 800B3B50 03E00008 */ jr $ra
/* 0B4754 800B3B54 00000000 */ nop
/* 0B4754 800B3B54 00000000 */ nop
asm/non_matchings/code_800AF9B0/func_800B3F74.s
+21 -21
View File
@@ -38,7 +38,7 @@ glabel func_800B3F74
/* 0B4C04 800B4004 002E0821 */ addu $at, $at, $t6
/* 0B4C08 800B4008 8C2E2E20 */ lw $t6, %lo(jpt_800F2E20)($at) # 0x2e20($at)
/* 0B4C0C 800B400C 01C00008 */ jr $t6
/* 0B4C10 800B4010 00000000 */ nop
/* 0B4C10 800B4010 00000000 */ nop
glabel L800B4014
/* 0B4C14 800B4014 240F0015 */ li $t7, 21
/* 0B4C18 800B4018 3C018019 */ lui $at, %hi(D_8018EDEC) # $at, 0x8019
@@ -58,7 +58,7 @@ glabel L800B4040
/* 0B4C44 800B4044 0C032802 */ jal func_800CA008
/* 0B4C48 800B4048 00002825 */ move $a1, $zero
/* 0B4C4C 800B404C 10000111 */ b .L800B4494
/* 0B4C50 800B4050 00000000 */ nop
/* 0B4C50 800B4050 00000000 */ nop
glabel L800B4054
/* 0B4C54 800B4054 3C018019 */ lui $at, %hi(gControllerPakMenuSelection) # $at, 0x8019
/* 0B4C58 800B4058 A023EDF0 */ sb $v1, %lo(gControllerPakMenuSelection)($at)
@@ -66,7 +66,7 @@ glabel L800B4054
/* 0B4C60 800B4060 0C032802 */ jal func_800CA008
/* 0B4C64 800B4064 00002825 */ move $a1, $zero
/* 0B4C68 800B4068 1000010A */ b .L800B4494
/* 0B4C6C 800B406C 00000000 */ nop
/* 0B4C6C 800B406C 00000000 */ nop
glabel L800B4070
/* 0B4C70 800B4070 3C01800E */ lui $at, %hi(gIsMirrorMode) # $at, 0x800e
/* 0B4C74 800B4074 AC20C604 */ sw $zero, %lo(gIsMirrorMode)($at)
@@ -115,17 +115,17 @@ glabel L800B4100
/* 0B4D14 800B4114 0C02D7CC */ jal func_800B5F30
/* 0B4D18 800B4118 A020EDFC */ sb $zero, %lo(D_8018EDFC)($at)
/* 0B4D1C 800B411C 0C003C38 */ jal func_8000F0E0
/* 0B4D20 800B4120 00000000 */ nop
/* 0B4D20 800B4120 00000000 */ nop
/* 0B4D24 800B4124 3C09800E */ lui $t1, %hi(D_800DC50C) # $t1, 0x800e
/* 0B4D28 800B4128 8D29C50C */ lw $t1, %lo(D_800DC50C)($t1)
/* 0B4D2C 800B412C 24030001 */ li $v1, 1
/* 0B4D30 800B4130 00002025 */ move $a0, $zero
/* 0B4D34 800B4134 1120000C */ beqz $t1, .L800B4168
/* 0B4D38 800B4138 00000000 */ nop
/* 0B4D38 800B4138 00000000 */ nop
/* 0B4D3C 800B413C 0C032802 */ jal func_800CA008
/* 0B4D40 800B4140 00002825 */ move $a1, $zero
/* 0B4D44 800B4144 0C032CB1 */ jal func_800CB2C4
/* 0B4D48 800B4148 00000000 */ nop
/* 0B4D48 800B4148 00000000 */ nop
/* 0B4D4C 800B414C 3C01800E */ lui $at, %hi(D_800DC50C) # $at, 0x800e
/* 0B4D50 800B4150 AC20C50C */ sw $zero, %lo(D_800DC50C)($at)
/* 0B4D54 800B4154 3C01800E */ lui $at, %hi(D_800DC524) # $at, 0x800e
@@ -149,7 +149,7 @@ glabel L800B4100
/* 0B4D98 800B4198 10480022 */ beq $v0, $t0, .L800B4224
/* 0B4D9C 800B419C 3C058019 */ lui $a1, %hi(gMainMenuSelectionDepth) # 0x8019
/* 0B4DA0 800B41A0 100000BC */ b .L800B4494
/* 0B4DA4 800B41A4 00000000 */ nop
/* 0B4DA4 800B41A4 00000000 */ nop
.L800B41A8:
/* 0B4DA8 800B41A8 A0A60000 */ sb $a2, ($a1)
/* 0B4DAC 800B41AC 0C0323AB */ jal func_800C8EAC
@@ -164,7 +164,7 @@ glabel L800B4100
/* 0B4DD0 800B41D0 10200003 */ beqz $at, .L800B41E0
/* 0B4DD4 800B41D4 A0830000 */ sb $v1, ($a0)
/* 0B4DD8 800B41D8 044100AE */ bgez $v0, .L800B4494
/* 0B4DDC 800B41DC 00000000 */ nop
/* 0B4DDC 800B41DC 00000000 */ nop
.L800B41E0:
/* 0B4DE0 800B41E0 100000AC */ b .L800B4494
/* 0B4DE4 800B41E4 ACA00000 */ sw $zero, ($a1)
@@ -178,7 +178,7 @@ glabel L800B4100
/* 0B4DFC 800B41FC 80A20000 */ lb $v0, ($a1)
/* 0B4E00 800B4200 24010002 */ li $at, 2
/* 0B4E04 800B4204 10430005 */ beq $v0, $v1, .L800B421C
/* 0B4E08 800B4208 00000000 */ nop
/* 0B4E08 800B4208 00000000 */ nop
/* 0B4E0C 800B420C 10410003 */ beq $v0, $at, .L800B421C
/* 0B4E10 800B4210 240B0008 */ li $t3, 8
/* 0B4E14 800B4214 1000009F */ b .L800B4494
@@ -195,11 +195,11 @@ glabel L800B4230
/* 0B4E34 800B4234 8C42EDE0 */ lw $v0, %lo(D_8018EDE0)($v0)
/* 0B4E38 800B4238 3C0C800E */ lui $t4, %hi(D_800DC50C) # $t4, 0x800e
/* 0B4E3C 800B423C 10400005 */ beqz $v0, .L800B4254
/* 0B4E40 800B4240 00000000 */ nop
/* 0B4E40 800B4240 00000000 */ nop
/* 0B4E44 800B4244 10430035 */ beq $v0, $v1, .L800B431C
/* 0B4E48 800B4248 24060003 */ li $a2, 3
/* 0B4E4C 800B424C 10000091 */ b .L800B4494
/* 0B4E50 800B4250 00000000 */ nop
/* 0B4E50 800B4250 00000000 */ nop
.L800B4254:
/* 0B4E54 800B4254 8D8CC50C */ lw $t4, %lo(D_800DC50C)($t4)
/* 0B4E58 800B4258 3C018019 */ lui $at, %hi(D_8018EDEE) # $at, 0x8019
@@ -207,12 +207,12 @@ glabel L800B4230
/* 0B4E60 800B4260 1580001E */ bnez $t4, .L800B42DC
/* 0B4E64 800B4264 00002025 */ move $a0, $zero
/* 0B4E68 800B4268 3C078019 */ lui $a3, %hi(D_8018EDF3) # $a3, 0x8019
/* 0B4E6C 800B426C 3C028019 */ lui $v0, %hi(gCharacterSelections) # $v0, 0x8019
/* 0B4E6C 800B426C 3C028019 */ lui $v0, %hi(gCharacterGridSelections) # $v0, 0x8019
/* 0B4E70 800B4270 3C058019 */ lui $a1, %hi(D_8018EDE8) # $a1, 0x8019
/* 0B4E74 800B4274 3C06800F */ lui $a2, %hi(D_800E86A8) # $a2, 0x800f
/* 0B4E78 800B4278 24C686A8 */ addiu $a2, %lo(D_800E86A8) # addiu $a2, $a2, -0x7958
/* 0B4E74 800B4274 3C06800F */ lui $a2, %hi(gCharacterSelections) # $a2, 0x800f
/* 0B4E78 800B4278 24C686A8 */ addiu $a2, %lo(gCharacterSelections) # addiu $a2, $a2, -0x7958
/* 0B4E7C 800B427C 24A5EDE8 */ addiu $a1, %lo(D_8018EDE8) # addiu $a1, $a1, -0x1218
/* 0B4E80 800B4280 2442EDE4 */ addiu $v0, %lo(gCharacterSelections) # addiu $v0, $v0, -0x121c
/* 0B4E80 800B4280 2442EDE4 */ addiu $v0, %lo(gCharacterGridSelections) # addiu $v0, $v0, -0x121c
/* 0B4E84 800B4284 80E7EDF3 */ lb $a3, %lo(D_8018EDF3)($a3)
/* 0B4E88 800B4288 00001825 */ move $v1, $zero
/* 0B4E8C 800B428C 24080004 */ li $t0, 4
@@ -237,12 +237,12 @@ glabel L800B4230
/* 0B4ECC 800B42CC 0C032384 */ jal play_sound2
/* 0B4ED0 800B42D0 34849012 */ ori $a0, (0x49009012 & 0xFFFF) # ori $a0, $a0, 0x9012
/* 0B4ED4 800B42D4 1000006F */ b .L800B4494
/* 0B4ED8 800B42D8 00000000 */ nop
/* 0B4ED8 800B42D8 00000000 */ nop
.L800B42DC:
/* 0B4EDC 800B42DC 0C032802 */ jal func_800CA008
/* 0B4EE0 800B42E0 00002825 */ move $a1, $zero
/* 0B4EE4 800B42E4 0C032CB1 */ jal func_800CB2C4
/* 0B4EE8 800B42E8 00000000 */ nop
/* 0B4EE8 800B42E8 00000000 */ nop
/* 0B4EEC 800B42EC 3C01800E */ lui $at, %hi(D_800DC50C) # $at, 0x800e
/* 0B4EF0 800B42F0 AC20C50C */ sw $zero, %lo(D_800DC50C)($at)
/* 0B4EF4 800B42F4 3C01800E */ lui $at, %hi(D_800DC524) # $at, 0x800e
@@ -322,7 +322,7 @@ glabel L800B43B0
/* 0B4FF4 800B43F4 24080004 */ li $t0, 4
/* 0B4FF8 800B43F8 3C018019 */ lui $at, %hi(D_8018EDEC) # $at, 0x8019
/* 0B4FFC 800B43FC 150C0002 */ bne $t0, $t4, .L800B4408
/* 0B5000 800B4400 00000000 */ nop
/* 0B5000 800B4400 00000000 */ nop
/* 0B5004 800B4404 A0400000 */ sb $zero, ($v0)
.L800B4408:
/* 0B5008 800B4408 A023EDEC */ sb $v1, %lo(D_8018EDEC)($at)
@@ -334,7 +334,7 @@ glabel L800B43B0
/* 0B501C 800B441C 0C032802 */ jal func_800CA008
/* 0B5020 800B4420 00002825 */ move $a1, $zero
/* 0B5024 800B4424 0C032CB1 */ jal func_800CB2C4
/* 0B5028 800B4428 00000000 */ nop
/* 0B5028 800B4428 00000000 */ nop
/* 0B502C 800B442C 3C01800E */ lui $at, %hi(D_800DC50C) # $at, 0x800e
/* 0B5030 800B4430 AC20C50C */ sw $zero, %lo(D_800DC50C)($at)
/* 0B5034 800B4434 3C01800E */ lui $at, %hi(D_800DC524) # $at, 0x800e
@@ -367,8 +367,8 @@ glabel L800B43B0
.L800B4494:
glabel L800B4494
/* 0B5094 800B4494 0C02D12B */ jal func_800B44AC
/* 0B5098 800B4498 00000000 */ nop
/* 0B5098 800B4498 00000000 */ nop
/* 0B509C 800B449C 8FBF0014 */ lw $ra, 0x14($sp)
/* 0B50A0 800B44A0 27BD0018 */ addiu $sp, $sp, 0x18
/* 0B50A4 800B44A4 03E00008 */ jr $ra
/* 0B50A8 800B44A8 00000000 */ nop
/* 0B50A8 800B44A8 00000000 */ nop
asm/non_matchings/code_800AF9B0/func_800B5218.s
+4 -4
View File
@@ -3,8 +3,8 @@ glabel func_800B5218
/* 0B5E1C 800B521C 81CEEE09 */ lb $t6, %lo(gCupSelection)($t6)
/* 0B5E20 800B5220 3C188019 */ lui $t8, %hi(gCupCourseSelection) # $t8, 0x8019
/* 0B5E24 800B5224 8318EE0B */ lb $t8, %lo(gCupCourseSelection)($t8)
/* 0B5E28 800B5228 3C09800F */ lui $t1, %hi(D_800E86A8) # $t1, 0x800f
/* 0B5E2C 800B522C 812986A8 */ lb $t1, %lo(D_800E86A8)($t1)
/* 0B5E28 800B5228 3C09800F */ lui $t1, %hi(gCharacterSelections) # $t1, 0x800f
/* 0B5E2C 800B522C 812986A8 */ lb $t1, %lo(gCharacterSelections)($t1)
/* 0B5E30 800B5230 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 0B5E34 800B5234 000E7880 */ sll $t7, $t6, 2
/* 0B5E38 800B5238 3C058019 */ lui $a1, %hi(D_8018CA74) # $a1, 0x8019
@@ -65,7 +65,7 @@ glabel func_800B5218
/* 0B5F04 800B5304 04610004 */ bgez $v1, .L800B5318
/* 0B5F08 800B5308 30690003 */ andi $t1, $v1, 3
/* 0B5F0C 800B530C 11200002 */ beqz $t1, .L800B5318
/* 0B5F10 800B5310 00000000 */ nop
/* 0B5F10 800B5310 00000000 */ nop
/* 0B5F14 800B5314 2529FFFC */ addiu $t1, -4
.L800B5318:
/* 0B5F18 800B5318 00095080 */ sll $t2, $t1, 2
@@ -89,4 +89,4 @@ glabel func_800B5218
/* 0B5F5C 800B535C 8FBF0014 */ lw $ra, 0x14($sp)
/* 0B5F60 800B5360 27BD0048 */ addiu $sp, $sp, 0x48
/* 0B5F64 800B5364 03E00008 */ jr $ra
/* 0B5F68 800B5368 00000000 */ nop
/* 0B5F68 800B5368 00000000 */ nop
asm/non_matchings/code_802B0210/update_obj_red_blue_shell.s
+8 -8
View File
@@ -372,8 +372,8 @@ glabel L802B4750
/* 11DDAC 802B479C 316CEFFF */ andi $t4, $t3, 0xefff
/* 11DDB0 802B47A0 15A10021 */ bne $t5, $at, .L802B4828
/* 11DDB4 802B47A4 A60C0002 */ sh $t4, 2($s0)
/* 11DDB8 802B47A8 3C048016 */ lui $a0, %hi(D_8015F8F0) # $a0, 0x8016
/* 11DDBC 802B47AC 2484F8F0 */ addiu $a0, %lo(D_8015F8F0) # addiu $a0, $a0, -0x710
/* 11DDB8 802B47A8 3C048016 */ lui $a0, %hi(gPlayerPositionLUT) # $a0, 0x8016
/* 11DDBC 802B47AC 2484F8F0 */ addiu $a0, %lo(gPlayerPositionLUT) # addiu $a0, $a0, -0x710
/* 11DDC0 802B47B0 3C01447A */ li $at, 0x447A0000 # 1000.000000
/* 11DDC4 802B47B4 848E0000 */ lh $t6, ($a0)
/* 11DDC8 802B47B8 44812000 */ mtc1 $at, $f4
@@ -497,8 +497,8 @@ glabel L802B4750
.L802B4978:
/* 11DF88 802B4978 A6020012 */ sh $v0, 0x12($s0)
/* 11DF8C 802B497C 86280004 */ lh $t0, 4($s1)
/* 11DF90 802B4980 3C048016 */ lui $a0, %hi(D_8015F8F0) # $a0, 0x8016
/* 11DF94 802B4984 2484F8F0 */ addiu $a0, %lo(D_8015F8F0) # addiu $a0, $a0, -0x710
/* 11DF90 802B4980 3C048016 */ lui $a0, %hi(gPlayerPositionLUT) # $a0, 0x8016
/* 11DF94 802B4984 2484F8F0 */ addiu $a0, %lo(gPlayerPositionLUT) # addiu $a0, $a0, -0x710
/* 11DF98 802B4988 00084840 */ sll $t1, $t0, 1
/* 11DF9C 802B498C 00895021 */ addu $t2, $a0, $t1
/* 11DFA0 802B4990 854BFFFE */ lh $t3, -2($t2)
@@ -508,10 +508,10 @@ glabel L802B4750
/* 11DFAC 802B499C 3C01447A */ li $at, 0x447A0000 # 1000.000000
/* 11DFB0 802B49A0 44818000 */ mtc1 $at, $f16
/* 11DFB4 802B49A4 A6030006 */ sh $v1, 6($s0)
/* 11DFB8 802B49A8 3C048016 */ lui $a0, %hi(D_8015F8F0) # $a0, 0x8016
/* 11DFB8 802B49A8 3C048016 */ lui $a0, %hi(gPlayerPositionLUT) # $a0, 0x8016
/* 11DFBC 802B49AC E6100008 */ swc1 $f16, 8($s0)
/* 11DFC0 802B49B0 862C0004 */ lh $t4, 4($s1)
/* 11DFC4 802B49B4 2484F8F0 */ addiu $a0, %lo(D_8015F8F0) # addiu $a0, $a0, -0x710
/* 11DFC4 802B49B4 2484F8F0 */ addiu $a0, %lo(gPlayerPositionLUT) # addiu $a0, $a0, -0x710
/* 11DFC8 802B49B8 000C6840 */ sll $t5, $t4, 1
/* 11DFCC 802B49BC 008D7021 */ addu $t6, $a0, $t5
/* 11DFD0 802B49C0 85CFFFFE */ lh $t7, -2($t6)
@@ -757,8 +757,8 @@ glabel L802B4CE4
glabel L802B4D58
/* 11E368 802B4D58 0C0ACED1 */ jal func_802B3B44
/* 11E36C 802B4D5C 02002025 */ move $a0, $s0
/* 11E370 802B4D60 3C048016 */ lui $a0, %hi(D_8015F8F0) # $a0, 0x8016
/* 11E374 802B4D64 2484F8F0 */ addiu $a0, %lo(D_8015F8F0) # addiu $a0, $a0, -0x710
/* 11E370 802B4D60 3C048016 */ lui $a0, %hi(gPlayerPositionLUT) # $a0, 0x8016
/* 11E374 802B4D64 2484F8F0 */ addiu $a0, %lo(gPlayerPositionLUT) # addiu $a0, $a0, -0x710
/* 11E378 802B4D68 848A0000 */ lh $t2, ($a0)
/* 11E37C 802B4D6C 3C0D800F */ lui $t5, %hi(gPlayers) # $t5, 0x800f
/* 11E380 802B4D70 25AD6990 */ addiu $t5, %lo(gPlayers) # addiu $t5, $t5, 0x6990
data/data_0DD0A0_2.s
+1 -1
View File
@@ -2285,7 +2285,7 @@ glabel gMenuSelection # menu counter
glabel D_800E86A4 # on change menu?
.word 0x00000000
glabel D_800E86A8
glabel gCharacterSelections
.byte 0x00
glabel D_800E86A9
.byte 0x01
include/defines.h
+2 -2
View File
@@ -59,8 +59,8 @@
/**
* Character IDs
* Note that these are not the same as the values
* found in gCharacterSelections as those are more
* akin to indexes than IDs
* found in gCharacterGridSelections as those are
* ordered by table
**/
#define MARIO 0
#define LUIGI 1
include/variables.h
+3 -3
View File
@@ -64,7 +64,7 @@ extern s16 D_80165570;
extern s16 D_80165572;
extern s16 D_80165580;
extern s16 D_80165582;
extern s8 D_800E86A8[4];
extern s8 gCharacterSelections[4]; // D_800E86A8
extern s16 D_80165270[8];
extern Player* gPlayerOne;
extern Player* gPlayerTwo;
@@ -76,9 +76,9 @@ extern Player* gPlayerSeven;
extern Player* gPlayerEight;
extern Player* gPlayerOneCopy;
extern u16 D_800DC51C;
extern s8 gDebugMenuSelection; //D_8018EDEF
extern s8 gDebugMenuSelection; // D_8018EDEF
extern s32 D_80164A28;
extern s32 D_801643B8[];
extern s32 gPlayerPositions[]; // D_801643B8
extern s16 D_8016556E;
extern s32 D_80162DE0;
extern s32 D_80162DE4;
src/audio/external.c
+4 -4
View File
@@ -3997,7 +3997,7 @@ s32 func_800C3508(?); // extern
? func_800C9A88(u8); // extern
? func_800C9D0C(u8); // extern
? func_800CA414(?, ?); // extern
extern s32 D_800DC5E8;
extern s32 gPlayerWinningIndex;
extern ? D_800E9E74;
extern ? D_800E9E94;
extern ? D_800E9EA4;
@@ -4092,14 +4092,14 @@ void func_800C76C0(u8 arg0) {
func_800C9018(arg0, 0x1008026);
func_800C8EF8(0x17);
*(&D_800EA0EC + arg0) = 2;
func_800C90F4(arg0, (*(&gPlayers + 0x254 + (D_800DC5E8 * 0xDD8)) * 0x10) + 0x2900800D);
func_800C90F4(arg0, (*(&gPlayers + 0x254 + (gPlayerWinningIndex * 0xDD8)) * 0x10) + 0x2900800D);
}
} else if ((D_800EA0EC.unk0 == 1) && (D_800EA0EC.unk1 == 1) && (D_800EA0EC.unk2 == 1)) {
func_800C5278(5);
func_800C9018(arg0, 0x1008026);
func_800C8EF8(0x17);
*(&D_800EA0EC + arg0) = 2;
func_800C90F4(arg0, (*(&gPlayers + 0x254 + (D_800DC5E8 * 0xDD8)) * 0x10) + 0x2900800D);
func_800C90F4(arg0, (*(&gPlayers + 0x254 + (gPlayerWinningIndex * 0xDD8)) * 0x10) + 0x2900800D);
}
} else {
func_800C3448(0x100100FF);
@@ -4108,7 +4108,7 @@ void func_800C76C0(u8 arg0) {
func_800C9018(arg0, 0x100F926);
func_800C8EF8(0x17);
*(&D_800EA0EC + arg0) = 2;
func_800C90F4(arg0, (*(&gPlayers + 0x254 + (D_800DC5E8 * 0xDD8)) * 0x10) + 0x2900800D);
func_800C90F4(arg0, (*(&gPlayers + 0x254 + (gPlayerWinningIndex * 0xDD8)) * 0x10) + 0x2900800D);
}
}
} else {
src/code_800029B0.c
+2 -2
View File
@@ -85,8 +85,8 @@ s32 D_800DC5E0 = 32;
s16 D_800DC5E4 = 0;
// TODO: D_800DC5E8 accessed as word, D_800DC5EB as u8
s32 D_800DC5E8 = 0;
// TODO: gPlayerWinningIndex (D_800DC5E8) accessed as word, D_800DC5EB as u8
s32 gPlayerWinningIndex = 0;
struct UnkStruct_800DC5EC D_8015F480[4];
struct UnkStruct_800DC5EC *D_800DC5EC = &D_8015F480[0];
src/code_80005FD0.c
+40 -40
View File
@@ -653,7 +653,7 @@ block_34:
phi_t3 = phi_t1_3;
} while (phi_t1_3 != sp30);
}
phi_v1_5 = D_801643B8;
phi_v1_5 = gPlayerPositions;
phi_v0_5 = &D_801643E0;
phi_t1_4 = 1;
phi_t1_7 = 1;
@@ -676,7 +676,7 @@ block_34:
do {
temp_v1_7 = *phi_v0_6;
temp_t2_3 = phi_t2_6 + 2;
D_801643B8[temp_v1_7] = phi_t3_3;
gPlayerPositions[temp_v1_7] = phi_t3_3;
temp_t2_3->unk-2 = temp_v1_7;
phi_t3_3 = phi_t1_4;
phi_v0_6 += 4;
@@ -697,16 +697,16 @@ block_50:
temp_v1_8 = *phi_v0_7;
temp_t2_4 = phi_t2_7 + 8;
temp_v0_10 = phi_v0_7 + 0x10;
D_801643B8[temp_v1_8] = phi_t3_4;
gPlayerPositions[temp_v1_8] = phi_t3_4;
temp_a1_6 = temp_v0_10->unk-C;
temp_t2_4->unk-8 = temp_v1_8;
D_801643B8[temp_a1_6] = phi_t1_5;
gPlayerPositions[temp_a1_6] = phi_t1_5;
temp_a3 = temp_v0_10->unk-8;
temp_t3_3 = phi_t3_4 + 4;
D_801643B8[temp_a3] = phi_t3_4 + 2;
gPlayerPositions[temp_a3] = phi_t3_4 + 2;
temp_t0_4 = temp_v0_10->unk-4;
temp_t2_4->unk-6 = temp_a1_6;
D_801643B8[temp_t0_4] = phi_t3_4 + 3;
gPlayerPositions[temp_t0_4] = phi_t3_4 + 3;
temp_t2_4->unk-4 = temp_a3;
temp_t2_4->unk-2 = temp_t0_4;
phi_t3_4 = temp_t3_3;
@@ -1110,7 +1110,7 @@ block_21:
phi_a3 = phi_a1_2;
} while (phi_a1_2 != temp_t0_2);
}
phi_v1_3 = D_801643B8;
phi_v1_3 = gPlayerPositions;
phi_v0_3 = &D_801643E0;
do {
temp_v1_4 = phi_v1_3 + 4;
@@ -1127,7 +1127,7 @@ block_21:
do {
temp_v1_5 = *phi_v0_4;
temp_t0_3 = phi_t0_3 + 2;
D_801643B8[temp_v1_5] = phi_a3_3;
gPlayerPositions[temp_v1_5] = phi_a3_3;
temp_t0_3->unk-2 = temp_v1_5;
phi_a3_3 = phi_a1_3;
phi_v0_4 += 4;
@@ -1148,16 +1148,16 @@ block_35:
temp_v1_6 = *phi_v0_5;
temp_t0_4 = phi_t0_4 + 8;
temp_v0_9 = phi_v0_5 + 0x10;
D_801643B8[temp_v1_6] = phi_a3_4;
gPlayerPositions[temp_v1_6] = phi_a3_4;
temp_a0_9 = temp_v0_9->unk-C;
temp_t0_4->unk-8 = temp_v1_6;
D_801643B8[temp_a0_9] = phi_a1_4;
gPlayerPositions[temp_a0_9] = phi_a1_4;
temp_t1_3 = temp_v0_9->unk-8;
temp_a3_3 = phi_a3_4 + 4;
D_801643B8[temp_t1_3] = phi_a3_4 + 2;
gPlayerPositions[temp_t1_3] = phi_a3_4 + 2;
temp_t2_6 = temp_v0_9->unk-4;
temp_t0_4->unk-6 = temp_a0_9;
D_801643B8[temp_t2_6] = phi_a3_4 + 3;
gPlayerPositions[temp_t2_6] = phi_a3_4 + 3;
temp_t0_4->unk-4 = temp_t1_3;
temp_t0_4->unk-2 = temp_t2_6;
phi_a3_4 = temp_a3_3;
@@ -1495,7 +1495,7 @@ block_55:
phi_t0_4 = phi_a3_3;
} while (phi_a3_3 != 7);
}
phi_v1_3 = D_801643B8;
phi_v1_3 = gPlayerPositions;
phi_v0_10 = &D_801643E0;
do {
temp_v1_13 = phi_v1_3 + 4;
@@ -1510,16 +1510,16 @@ block_55:
temp_v1_14 = *phi_v0_11;
temp_v0_10 = phi_v0_11 + 0x10;
temp_a0_3 = phi_a0_4 + 8;
D_801643B8[temp_v1_14] = phi_t0_5;
gPlayerPositions[temp_v1_14] = phi_t0_5;
temp_a1_3 = temp_v0_10->unk-C;
temp_a0_3->unk-8 = temp_v1_14;
D_801643B8[temp_a1_3] = phi_a3_4;
gPlayerPositions[temp_a1_3] = phi_a3_4;
temp_a2 = temp_v0_10->unk-8;
temp_t0_9 = phi_t0_5 + 4;
D_801643B8[temp_a2] = phi_t0_5 + 2;
gPlayerPositions[temp_a2] = phi_t0_5 + 2;
temp_t1 = temp_v0_10->unk-4;
temp_a0_3->unk-6 = temp_a1_3;
D_801643B8[temp_t1] = phi_t0_5 + 3;
gPlayerPositions[temp_t1] = phi_t0_5 + 3;
temp_a0_3->unk-4 = temp_a2;
temp_a0_3->unk-2 = temp_t1;
phi_t0_5 = temp_t0_9;
@@ -1587,8 +1587,8 @@ void func_80007D04(s32 arg0, void *arg1) {
temp_a3 = arg0;
temp_t1 = (&D_80164450 + (temp_v1 * 4))->unk2;
temp_t2 = (&D_80164450 + (arg0 * 4))->unk2;
if (D_801643B8[arg0] < 2) {
if (((temp_t2 - temp_t1) >= 0x191) && (D_801643B8[temp_v1].unk2 >= 6)) {
if (gPlayerPositions[arg0] < 2) {
if (((temp_t2 - temp_t1) >= 0x191) && (gPlayerPositions[temp_v1].unk2 >= 6)) {
arg1->unkBC = arg1->unkBC & 0xFFDFFFFF;
arg0 = temp_a3;
func_80030FC8(arg1, arg1, temp_a3);
@@ -2097,17 +2097,17 @@ extern ? gPlayers;
temp_a0 = phi_a0_3 + 2;
phi_a0_3 = temp_a0;
phi_v0 = phi_v0_2;
if (D_801643B8[*phi_a0_3] < arg2) {
if (gPlayerPositions[*phi_a0_3] < arg2) {
phi_v0 = phi_v0_2 + 1;
}
phi_v0_2 = phi_v0;
} while (temp_a0 < &D_80163348);
temp_t1_2 = D_8018EDF3;
phi_v1 = D_801643B8;
phi_v1 = gPlayerPositions;
phi_a0_4 = 0;
phi_a0_7 = 0;
if (temp_t1_2 > 0) {
sp4 = &D_801643B8[temp_t1_2];
sp4 = &gPlayerPositions[temp_t1_2];
do {
phi_a0_6 = phi_a0_7;
if (*phi_v1 < arg2) {
@@ -2727,10 +2727,10 @@ void func_800099EC(s32 arg0, ? arg1) {
phi_s0 = 0;
phi_a0 = temp_a0;
if (temp_a0 > 0) {
phi_s2 = D_801643B8;
phi_s2 = gPlayerPositions;
phi_s1 = 0;
do {
temp_v0 = D_801643B8[arg0];
temp_v0 = gPlayerPositions[arg0];
temp_v1 = *phi_s2;
if ((temp_v0 < temp_v1) && (temp_v0 == *(&D_801643E0 + phi_s1)) && (temp_v1 == *(&D_801643E0 + (arg0 * 4)))) {
func_800C92CC(arg0 & 0xFF, 0x2900800D);
@@ -3109,7 +3109,7 @@ block_63:
return;
}
temp_v0_9 = D_8018EDF3;
if ((temp_v0_9 > 0) && (temp_v0_9 < 3) && (phi_t1_2 == *(&D_80163330 + phi_t0)) && (*(&D_8016334C + phi_t0) < *(D_801643B8 + sp38))) {
if ((temp_v0_9 > 0) && (temp_v0_9 < 3) && (phi_t1_2 == *(&D_80163330 + phi_t0)) && (*(&D_8016334C + phi_t0) < *(gPlayerPositions + sp38))) {
temp_t0 = sp38 + &D_80163210;
*temp_t0 = D_800ECFB4;
phi_t0_2 = temp_t0;
@@ -6049,7 +6049,7 @@ loop_5:
phi_a1_2 = 0;
phi_a1_5 = 0;
if (temp_a2 < 3) {
phi_v0_2 = D_800E86A8;
phi_v0_2 = gCharacterSelections;
if (temp_a2 > 0) {
if (temp_a2 > 0) {
do {
@@ -6059,7 +6059,7 @@ loop_5:
phi_a1_5 = 1;
}
phi_a1_2 = phi_a1_5;
} while (temp_v0_2 < &D_800E86A8[temp_a2]);
} while (temp_v0_2 < &gCharacterSelections[temp_a2]);
}
temp_a3 = phi_s0 & 3;
phi_a0 = 0;
@@ -6521,7 +6521,7 @@ void func_8000F628(void) {
phi_t5 = &D_80163178;
phi_s0 = 0;
phi_fp = 0;
phi_s4 = D_801643B8;
phi_s4 = gPlayerPositions;
phi_s6 = &D_801643E0;
phi_s1 = &gPlayers;
phi_s5 = &D_801634F8;
@@ -6731,7 +6731,7 @@ void func_8000F628(void) {
}
}
phi_v0_4 = &D_801645B0;
phi_s4_2 = D_801643B8;
phi_s4_2 = gPlayerPositions;
phi_v1 = &D_80164438;
do {
temp_v1_3 = phi_v1 + 2;
@@ -12076,7 +12076,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019E58.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80015314(s32, ?, s32); // extern
extern s32 D_800DC5E8;
extern s32 gPlayerWinningIndex;
extern s16 D_80164360;
extern ? D_80164670;
extern s16 D_80164678;
@@ -12103,7 +12103,7 @@ void func_80019ED0(void) {
phi_s0 = temp_s0;
phi_v0 = temp_v0;
} while (temp_s0 < &D_80164680);
temp_v0_2 = D_800DC5E8;
temp_v0_2 = gPlayerWinningIndex;
D_80164360 = temp_v0_2;
camera1->unkAE = temp_v0_2;
phi_s2 = &D_80164680;
@@ -12111,7 +12111,7 @@ void func_80019ED0(void) {
phi_s0_2 = &D_80164678;
do {
*phi_s2 = 0;
func_80015314(D_800DC5E8, 0, phi_s1);
func_80015314(gPlayerWinningIndex, 0, phi_s1);
temp_s1 = phi_s1 + 1;
temp_s0_2 = phi_s0_2 + 2;
temp_s0_2->unk-2 = 1;
@@ -12209,7 +12209,7 @@ extern ? D_80164680;
void func_8001A124(s32 arg0, s32 arg1) {
s32 temp_v0;
temp_v0 = D_801643B8[arg0];
temp_v0 = gPlayerPositions[arg0];
if (temp_v0 != 0) {
if ((temp_v0 != 1) && (temp_v0 != 2) && (temp_v0 != 3)) {
if (random_int(0x64) < 0x32) {
@@ -12417,7 +12417,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A518.s")
? func_8001A3D8(s32, ?, s16, s32); /* extern */
? func_8001A450(s32, s32, s32, s32); /* extern */
? func_8001A518(s32, s32, ?, s32); /* extern */
extern ? D_801643B8;
extern ? gPlayerPositions;
extern ? D_80164680;
extern ? D_801646C0;
extern ? D_801646D0;
@@ -12511,14 +12511,14 @@ void func_8001A588(s32 arg0, void *arg1, u16 *arg2, s8 arg3, s32 cameraId) {
D_801646C8 = 0;
}
if ((cameraId == 0) && ((temp_v0_5 = D_801646C8, (temp_v0_5 == 0xA)) || (temp_v0_5 == 0xB))) {
func_8001A518(phi_s0, *(&D_801643B8 + (phi_s0 * 4)), 0, cameraId);
func_8001A518(phi_s0, *(&gPlayerPositions + (phi_s0 * 4)), 0, cameraId);
phi_t0 = &D_801646C8;
}
phi_a3 = cameraId;
if ((gModeSelection != TIME_TRIALS) && (cameraId == 1) && ((temp_v0_6 = *phi_t0, (temp_v0_6 == 0x104)) || (temp_v0_6 == 0x105))) {
phi_v1 = 0;
if (D_8018EDF3 == 2) {
func_8001A518(phi_s0, *(&D_801643B8 + (phi_s0 * 4)), 1, cameraId);
func_8001A518(phi_s0, *(&gPlayerPositions + (phi_s0 * 4)), 1, cameraId);
} else {
sp44 = phi_s0;
loop_34:
@@ -12722,7 +12722,7 @@ s32 random_int(?, s16); /* extern */
extern ? D_8015F9B8;
extern ? D_801631E0;
extern ? D_801642D8;
extern ? D_801643B8;
extern ? gPlayerPositions;
extern ? D_80164438;
extern ? D_80164450;
extern ? D_80164550;
@@ -12775,7 +12775,7 @@ void func_8001AC10(s32 playerId, s32 *arg2) {
temp_s0->unk2 = -1;
temp_v0 = playerId * 4;
if ((((playerId * 0x14) + 0x64) < *(&D_80164450 + temp_v0)) && (temp_s0->unk4 >= 0x259) && (temp_s0->unk6 < 3) && (temp_v1 = lapCount[playerId], ((temp_v1 < 3) != 0))) {
func_8001AB74(playerId, temp_s0, func_8007AF78(temp_v1, (&D_801643B8 + temp_v0)->unk2, &D_801643B8));
func_8001AB74(playerId, temp_s0, func_8007AF78(temp_v1, (&gPlayerPositions + temp_v0)->unk2, &gPlayerPositions));
} else {
func_8001ABE0(playerId, temp_s0);
}
@@ -12783,7 +12783,7 @@ void func_8001AC10(s32 playerId, s32 *arg2) {
block_194:
break;
case 1: /* switch 1 */
if ((lapCount[playerId] > 0) && (temp_v1_2 = D_80163478, temp_a0 = *(&D_801643B8 + (temp_v1_2 * 4)), ((temp_a0 < *(&D_801643B8 + (playerId * 4))) != 0)) && (temp_a0 == 0)) {
if ((lapCount[playerId] > 0) && (temp_v1_2 = D_80163478, temp_a0 = *(&gPlayerPositions + (temp_v1_2 * 4)), ((temp_a0 < *(&gPlayerPositions + (playerId * 4))) != 0)) && (temp_a0 == 0)) {
temp_v0_2 = sp2C->unk254;
if (temp_v0_2 != 4) {
if (temp_v0_2 != 6) {
@@ -12797,7 +12797,7 @@ block_194:
temp_s0->unk0 = 0x22;
}
} else if (temp_a1 == 1) {
temp_s0->unk2 = func_802B2D70(sp2C, temp_a1, &D_801643B8);
temp_s0->unk2 = func_802B2D70(sp2C, temp_a1, &gPlayerPositions);
temp_v1_3 = temp_s0->unk2;
if ((temp_v1_3 >= 0) && (temp_v1_3 < 0x64)) {
sp2C->unkC = sp2C->unkC | 0x40000;
src/code_800393C0.c
+70 -70
View File
@@ -414,7 +414,7 @@ void func_80039DA4(void) {
}
} else {
for (i = 0; i < 8; i++) {
D_80165270[i] = spC.unk00[D_801643B8[i]];
D_80165270[i] = spC.unk00[gPlayerPositions[i]];
}
}
}
@@ -429,12 +429,12 @@ void func_80039F44(f32 *arg0, f32 *arg1, f32 arg2) {
do {
rand = random_int(7);
} while(rand == D_800E86A8[0]);
} while(rand == gCharacterSelections[0]);
D_80165560[0] = rand;
for (i = 1; i < 7; i++) {
u16* arr = D_800E3890[D_800E86A8[0]];
u16* arr = D_800E3890[gCharacterSelections[0]];
if (rand == arr[i]) {
D_80165560[i] = arr[0];
} else {
@@ -445,7 +445,7 @@ void func_80039F44(f32 *arg0, f32 *arg1, f32 arg2) {
D_8016556E = 0;
if (D_800DC51C == 1) {
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, gCharacterSelections[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(gPlayerThree, 2, arg0[D_80165270[2]], arg1[D_80165270[2]], arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(gPlayerFour, 3, arg0[D_80165270[3]], arg1[D_80165270[3]], arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
@@ -455,7 +455,7 @@ void func_80039F44(f32 *arg0, f32 *arg1, f32 arg2) {
spawn_player(gPlayerEight, 7, arg0[D_80165270[7]], arg1[D_80165270[7]], arg2, 32768.0f, D_80165560[6], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
D_80164A28 = 0;
} else {
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]] + 250.0f, arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]] + 250.0f, arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]] + 250.0f, arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerThree, 2, arg0[D_80165270[3]], arg1[D_80165270[2]] + 250.0f, arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFour, 3, arg0[D_80165270[2]], arg1[D_80165270[3]] + 250.0f, arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU);
@@ -469,38 +469,38 @@ void func_80039F44(f32 *arg0, f32 *arg1, f32 arg2) {
}
void func_8003A59C(f32 *arg0, f32 *arg1, f32 arg2) {
spawn_player(gPlayerFour, 3, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFive, 4, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSix, 5, arg0[4], arg1[4], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSeven, 6, arg0[5], arg1[5], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerEight, 7, arg0[6], arg1[6], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFour, 3, arg0[2], arg1[2], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFive, 4, arg0[3], arg1[3], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSix, 5, arg0[4], arg1[4], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSeven, 6, arg0[5], arg1[5], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerEight, 7, arg0[6], arg1[6], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
if (D_800DC51C == 1) {
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
} else if (D_8015F890 != 1) {
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
if (D_80162DD4[0] == 0) {
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE0, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
} else {
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
}
if (D_80162DD4[1] == 0) {
spawn_player(gPlayerThree, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
} else {
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
}
} else {
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE8, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
if (D_80162DD8 == 0) {
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE0, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
} else {
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
}
if (D_80162DD4[1] == 0) {
spawn_player(gPlayerThree, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB);
} else {
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
}
}
D_80164A28 = 0;
@@ -515,15 +515,15 @@ void func_8003A9F0(f32* arg0, f32* arg1, f32 arg2) {
getRand:
rand = random_int(7);
if (D_800E86A8[0] == rand)
if (gCharacterSelections[0] == rand)
goto getRand;
if (D_800E86A8[1] == rand)
if (gCharacterSelections[1] == rand)
goto getRand;
D_80165560[0] = rand;
for (i = 1; i < 6; i++) {
u16* arr = D_800E3C50[D_800E86A8[0]][D_800E86A8[1]];
u16* arr = D_800E3C50[gCharacterSelections[0]][gCharacterSelections[1]];
if (rand == arr[i]) {
D_80165560[i] = arr[0];
} else {
@@ -540,14 +540,14 @@ getRand:
spawn_player(gPlayerEight, 7, arg0[D_80165270[7]], arg1[D_80165270[7]], arg2, 32768.0f, D_80165560[5], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
if (D_800DC51C == 1) {
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, gCharacterSelections[0], PLAYER_HUMAN_AND_CPU);
} else {
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
}
if (D_800DC51C == 1) {
spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
} else {
spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
}
D_80164A28 = 0;
@@ -555,21 +555,21 @@ getRand:
}
void func_8003AE24(f32 *arg0, f32 *arg1, f32 arg2) {
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFour, 3, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFive, 4, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSix, 5, arg0[4], arg1[4], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSeven, 6, arg0[5], arg1[5], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerEight, 7, arg0[6], arg1[6], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFour, 3, arg0[2], arg1[2], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFive, 4, arg0[3], arg1[3], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSix, 5, arg0[4], arg1[4], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSeven, 6, arg0[5], arg1[5], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerEight, 7, arg0[6], arg1[6], arg2, 32768.0f, gCharacterSelections[0], PLAYER_START_SEQUENCE | PLAYER_CPU);
if (D_800DC51C == 1) {
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_HUMAN_AND_CPU);
} else {
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
}
if (D_800DC51C == 1) {
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[1], PLAYER_HUMAN_AND_CPU);
} else {
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
}
D_80164A28 = 0;
func_80039AE4();
@@ -577,14 +577,14 @@ void func_8003AE24(f32 *arg0, f32 *arg1, f32 arg2) {
void spawn_players_2p_battle(f32 *arg0, f32 *arg1, f32 arg2) {
if (gCurrentCourseId == COURSE_BIG_DONUT) {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
} else {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
}
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, gCharacterSelections[2], PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, gCharacterSelections[3], PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSeven, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU);
@@ -594,13 +594,13 @@ void spawn_players_2p_battle(f32 *arg0, f32 *arg1, f32 arg2) {
}
void func_8003B318(f32 *arg0, f32 *arg1, f32 arg2) {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, gCharacterSelections[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
if (D_800DC51C == 1) {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[1], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, gCharacterSelections[2], PLAYER_HUMAN_AND_CPU);
}
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, 3, PLAYER_START_SEQUENCE | PLAYER_CPU);
@@ -614,13 +614,13 @@ void func_8003B318(f32 *arg0, f32 *arg1, f32 arg2) {
void spawn_players_3p_battle(f32 *arg0, f32 *arg1, f32 arg2) {
if (gCurrentCourseId == COURSE_BIG_DONUT) {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 0.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 0.0f, gCharacterSelections[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
} else {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, -16384.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, -16384.0f, gCharacterSelections[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
}
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, 3, PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU);
@@ -632,15 +632,15 @@ void spawn_players_3p_battle(f32 *arg0, f32 *arg1, f32 arg2) {
}
void func_8003B870(f32 *arg0, f32 *arg1, f32 arg2) {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, gCharacterSelections[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, gCharacterSelections[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
if (D_800DC51C == 1) {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, gCharacterSelections[1], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, gCharacterSelections[2], PLAYER_HUMAN_AND_CPU);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, gCharacterSelections[3], PLAYER_HUMAN_AND_CPU);
}
spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU);
@@ -652,15 +652,15 @@ void func_8003B870(f32 *arg0, f32 *arg1, f32 arg2) {
void spawn_players_4p_battle(f32 *arg0, f32 *arg1, f32 arg2) {
if (gCurrentCourseId == COURSE_BIG_DONUT) {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 0.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 0.0f, gCharacterSelections[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, gCharacterSelections[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
} else {
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, -16384.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 16384.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, gCharacterSelections[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, -16384.0f, gCharacterSelections[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 16384.0f, gCharacterSelections[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
}
spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU);
spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU);
@@ -1017,7 +1017,7 @@ void func_8003C0F0(void) {
D_80165230[5] = 130.0f;
D_80165230[6] = 150.0f;
D_80165230[7] = 170.0f;
spawn_player(gPlayerOneCopy, 0, D_80165210[0], D_80165230[0], sp5A, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerOneCopy, 0, D_80165210[0], D_80165230[0], sp5A, 32768.0f, gCharacterSelections[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN);
spawn_player(gPlayerTwo, 1, D_80165210[1], D_80165230[1], sp5A, 32768.0f, 1, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(gPlayerThree, 2, D_80165210[2], D_80165230[2], sp5A, 32768.0f, 2, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(gPlayerFour, 3, D_80165210[3], D_80165230[3], sp5A, 32768.0f, 3, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
src/code_800431B0.c
+7 -7
View File
@@ -4981,7 +4981,7 @@ void func_8004E800(s32 arg0) {
func_8004A384(temp_v0->unk66 + temp_v0->unk62, temp_v0->unk68 + temp_v0->unk64, 0, temp_v0->unk4, 0xFF, *(&D_800E55F8 + (temp_v1 * 4)), 0, 0xFF, (temp_v1 << 0xC) + &D_0D00D258, &D_0D0068F0, 0x80, 0x40, 0x80, 0x40);
return;
}
func_8004A384(temp_v0->unk66 + temp_v0->unk62, temp_v0->unk68 + temp_v0->unk64, 0, temp_v0->unk4, 0xFF, *(&D_800E55F8 + (D_80165594 * 4)), 0, 0xFF, (D_801643B8[arg0] << 0xC) + &D_0D00D258, &D_0D0068F0, 0x80, 0x40, 0x80, 0x40);
func_8004A384(temp_v0->unk66 + temp_v0->unk62, temp_v0->unk68 + temp_v0->unk64, 0, temp_v0->unk4, 0xFF, *(&D_800E55F8 + (D_80165594 * 4)), 0, 0xFF, (gPlayerPositions[arg0] << 0xC) + &D_0D00D258, &D_0D0068F0, 0x80, 0x40, 0x80, 0x40);
// Duplicate return node #4. Try simplifying control flow for better match
}
}
@@ -5005,11 +5005,11 @@ void func_8004E998(s32 arg0) {
temp_v0 = (arg0 * 0x84) + &D_8018CA70;
if (temp_v0->unk81 != 0) {
if (temp_v0->unk71 != 3) {
temp_v1 = D_801643B8[arg0];
temp_v1 = gPlayerPositions[arg0];
func_8004A384(temp_v0->unk66 + temp_v0->unk62, temp_v0->unk68 + temp_v0->unk64, 0, temp_v0->unk4, 0xFF, *(&D_800E5618 + (temp_v1 * 4)), 0, 0xFF, (temp_v1 << 0xB) + &D_0D015258, &D_0D006030, 0x40, 0x40, 0x40, 0x40);
return;
}
func_8004A384(temp_v0->unk66 + temp_v0->unk62, temp_v0->unk68 + temp_v0->unk64, 0, temp_v0->unk4, 0xFF, *(&D_800E5618 + (D_80165598 * 4)), 0, 0xFF, (D_801643B8[arg0] << 0xB) + &D_0D015258, &D_0D006030, 0x40, 0x40, 0x40, 0x40);
func_8004A384(temp_v0->unk66 + temp_v0->unk62, temp_v0->unk68 + temp_v0->unk64, 0, temp_v0->unk4, 0xFF, *(&D_800E5618 + (D_80165598 * 4)), 0, 0xFF, (gPlayerPositions[arg0] << 0xB) + &D_0D015258, &D_0D006030, 0x40, 0x40, 0x40, 0x40);
// Duplicate return node #4. Try simplifying control flow for better match
}
}
@@ -5228,14 +5228,14 @@ void func_8004F168(s32 arg0, s32 arg1, s32 arg2) {
temp_a0 = ((*(&D_8018D2C0 + temp_t0) + D_8018D2F0) - (D_8018D2B0 / 2)) + D_8018D2E0 + (temp_v1->posX * temp_f0);
temp_a1 = ((*(&D_8018D2D8 + temp_t0) + D_8018D2F8) - (D_8018D2B8 / 2)) + D_8018D2E8 + temp_f12;
if (arg2 != 8) {
if ((D_801643B8[arg1] == 0) && (temp_v0 = gModeSelection, (temp_v0 != BATTLE)) && (temp_v0 != TIME_TRIALS)) {
if ((gPlayerPositions[arg1] == 0) && (temp_v0 = gModeSelection, (temp_v0 != BATTLE)) && (temp_v0 != TIME_TRIALS)) {
func_80046424(temp_f12, temp_a0, temp_a1, (temp_v1->unk_02E + 0x8000) & 0xFFFF, 0x3F800000, (arg2 << 7) + &D_0D02CCD8, &D_0D005470, 8, 8, 8, 8);
return;
}
func_800463B0(temp_f12, temp_a0, temp_a1, (temp_v1->unk_02E + 0x8000) & 0xFFFF, 0x3F800000, (arg2 << 7) + &D_0D02CCD8, &D_0D005470, 8, 8, 8, 8);
return;
}
if (D_801643B8[arg1] == 0) {
if (gPlayerPositions[arg1] == 0) {
func_8004C450(temp_f12, temp_a0, temp_a1, 8, 8, &D_0D02D0D8);
return;
}
@@ -6026,7 +6026,7 @@ extern ? lapCount;
}
if (gPlayerCountSelection1 == 1) {
*arg1 = 0x20;
*arg2 = (D_801643B8[temp_t6] * 0x14) + 0x20;
*arg2 = (gPlayerPositions[temp_t6] * 0x14) + 0x20;
return 0;
}
*arg1 = *(&D_801644A8 + temp_t0) * 260.0f;
@@ -6475,7 +6475,7 @@ void func_800514BC(void) {
if (gModeSelection == TIME_TRIALS) {
func_80050E34(0, D_80164408);
} else if (gPlayerCountSelection1 == 1) {
func_80050E34(0, *D_801643B8);
func_80050E34(0, *gPlayerPositions);
}
temp_v1 = gDisplayListHead;
gDisplayListHead = temp_v1 + 8;
src/code_80057C60.c
+6 -6
View File
@@ -1131,7 +1131,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059AC8.s")
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_8005A3C0(); /* extern */
extern s16 D_80164360;
extern ? D_801643B8;
extern ? gPlayerPositions;
extern ? D_801643D8;
extern ? D_8018CF90;
extern ? D_8018CF98;
@@ -1154,7 +1154,7 @@ void func_80059C50(void) {
phi_a0 += 2;
phi_v0 = temp_v0;
} while (temp_v0 < &D_8018CF90);
phi_v0_2 = &D_801643B8;
phi_v0_2 = &gPlayerPositions;
phi_v1 = &D_8018CF98;
do {
temp_v0_2 = phi_v0_2 + 0x10;
@@ -2459,7 +2459,7 @@ void func_8005B914(void) {
func_8005AA94(0x82);
goto block_76;
case 0x80: /* switch 1 */
if (D_801643B8 < 4) {
if (gPlayerPositions < 4) {
func_8005AA6C(0x8C);
} else {
func_8005AA6C(0x82);
@@ -2831,7 +2831,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C728.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
extern ? D_80164360;
extern s32 D_801643B8;
extern s32 gPlayerPositions;
extern s32 D_80165590;
extern s16 D_80165794;
extern ? D_8018CF28;
@@ -2868,7 +2868,7 @@ void func_8005C980(void) {
temp_a3 = gPlayerOne;
temp_a1 = D_80165590;
phi_a0 = &D_801643B8;
phi_a0 = &gPlayerPositions;
phi_v0 = 0;
do {
temp_v1 = *phi_a0;
@@ -3194,7 +3194,7 @@ void func_8005D18C(void) {
D_801657D8 = 1;
D_8018D2BC = 0;
D_8018D2A4 = 0;
if (*D_801643B8 >= 4) {
if (*gPlayerPositions >= 4) {
D_8018D1FC = 1;
D_8018D2A4 = 1;
D_8018D2BC = 1;
src/code_8006E9C0.c
+10 -10
View File
@@ -11,7 +11,7 @@ void func_8006E9C0(void) {
func_8006FA94();
switch (gScreenModeSelection) {
case SCREEN_MODE_1P:
case SCREEN_MODE_1P:
func_80071428();
break;
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
@@ -1981,7 +1981,7 @@ void func_80071428(void) {
D_8018CA70.unk44 = -0x20;
D_8018CA70.unk46 = 0;
D_8018CA70.unk48 = 0;
D_8018CA70.unk6A = *D_801643B8;
D_8018CA70.unk6A = *gPlayerPositions;
func_8006EE7C(D_80183E88);
phi_f0 = 35.0f;
phi_a1 = &D_8018D050;
@@ -2133,8 +2133,8 @@ void func_80071818(void) {
D_8018CA70.unkE4 = 0x28;
func_8006EE7C(D_80183E8C);
D_8018CA70.unk88 = 0.5f;
D_8018CA70.unk6A = D_801643B8->unk0;
D_8018CA70.unkEE = D_801643B8->unk4;
D_8018CA70.unk6A = gPlayerPositions->unk0;
D_8018CA70.unkEE = gPlayerPositions->unk4;
D_8018CA70.unk4 = D_8018CA70.unk88;
D_8018D3C4 = 0x1E;
D_8018D3BC = 0x18;
@@ -2222,8 +2222,8 @@ void func_80071A20(void) {
D_8018CA70.unkC8 = 0xD0;
}
D_8018CA70.unk88 = 0.5f;
D_8018CA70.unk6A = D_801643B8->unk0;
D_8018CA70.unkEE = D_801643B8->unk4;
D_8018CA70.unk6A = gPlayerPositions->unk0;
D_8018CA70.unkEE = gPlayerPositions->unk4;
D_8018CA70.unk4 = D_8018CA70.unk88;
func_8006EE7C(D_80183E88, 0x34, 0xEA, 0x101);
func_8006EE7C(D_80183E8C);
@@ -2353,10 +2353,10 @@ void func_80071C28(void) {
D_8018CA70.unk10C = temp_f0;
D_8018CA70.unk88 = temp_f0;
D_8018CA70.unk4 = temp_f0;
D_8018CA70.unk6A = D_801643B8->unk0;
D_8018CA70.unkEE = D_801643B8->unk4;
D_8018CA70.unk172 = D_801643B8->unk8;
D_8018CA70.unk1F6 = D_801643B8->unkC;
D_8018CA70.unk6A = gPlayerPositions->unk0;
D_8018CA70.unkEE = gPlayerPositions->unk4;
D_8018CA70.unk172 = gPlayerPositions->unk8;
D_8018CA70.unk1F6 = gPlayerPositions->unkC;
func_8006EE7C(D_80183E88, 0x36, 0x50, 0x3C);
func_8006EE7C(D_80183E8C);
func_8006EE7C(D_80183E90);
src/code_80071F00.c
+1 -1
View File
@@ -7429,7 +7429,7 @@ s16 func_8007C9F8(void) {
}
if (temp_v0 == 2) {
if (gModeSelection == GRAND_PRIX) {
if (D_801643B8->unk0 < D_801643B8->unk4) {
if (gPlayerPositions->unk0 < gPlayerPositions->unk4) {
return 0;
}
return 1;
src/code_8008C1D0.c
+3 -3
View File
@@ -47,7 +47,7 @@ extern f32 D_800E3790[];
extern u16 D_800DC51C;
// bss
extern s32 D_801643B8[];
extern s32 gPlayerPositions[];
UNUSED void func_unnamed(void) {
@@ -381,7 +381,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008C73C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
extern u16 D_800DC51C;
extern ? D_801643B8;
extern ? gPlayerPositions;
extern ? D_80165190;
extern ? D_80165460;
extern s32 gModeSelection;
@@ -411,7 +411,7 @@ void func_8008C8C4(void *arg0, s8 arg1) {
if ((*(&D_80165460 + temp_v1) == 1) && ((arg0->unk0 & 0x4000) == 0x4000)) {
arg0->unk9C = arg0->unk9C + 100.0f;
}
if ((gModeSelection == VERSUS) && ((arg0->unk0 & 0x1000) == 0x1000) && (D_800DC51C == 0) && ((arg0->unkCA & 2) == 0) && (*(&D_801643B8 + temp_v1) != 0)) {
if ((gModeSelection == VERSUS) && ((arg0->unk0 & 0x1000) == 0x1000) && (D_800DC51C == 0) && ((arg0->unkCA & 2) == 0) && (*(&gPlayerPositions + temp_v1) != 0)) {
arg0->unkC = arg0->unkC | 0x400000;
}
}
src/code_80091750.c
+36 -36
View File
@@ -2177,7 +2177,7 @@ void func_80095574(void) {
debug_print_str2(0x50, 0x78, "screen_mode");
debug_print_str2(0xAA, 0x78, *(&gDebugScreenModeNames + (D_8018EDF1 * 4)));
debug_print_str2(0x50, 0x82, "player");
debug_print_str2(0xAA, 0x82, *(&gDebugCharacterNames + (D_800E86A8 * 4)));
debug_print_str2(0xAA, 0x82, *(&gDebugCharacterNames + (gCharacterSelections * 4)));
debug_print_str2(0x50, 0x8C, "sound mode");
debug_print_str2(0xAA, 0x8C, gDebugSoundModeNames[gSoundMode]);
if (gDebugMenuSelection == DEBUG_MENU_GIVE_ALL_GOLD_CUP) {
@@ -6375,7 +6375,7 @@ void *func_800AAF30(?, s32, s32); /* extern */
extern ? D_8018E7AC;
extern ? D_8018E7B0;
static ? gCupSelectionByCourseId; /* unable to generate initializer; const */
static ? D_800E86A8; /* unable to generate initializer; const */
static ? gCharacterSelections; /* unable to generate initializer; const */
static ? gPerCupIndexByCourseId; /* unable to generate initializer; const */
s16 gCreditsCourseId; /* unable to generate initializer */
s16 gCurrentCourseId; /* unable to generate initializer */
@@ -6592,7 +6592,7 @@ block_74:
gScreenModeSelection = SCREEN_MODE_1P;
gPlayerCountSelection1 = 1;
D_8018EDF3 = 1;
D_800E86A8[0] = MARIO;
gCharacterSelections[0] = MARIO;
gModeSelection = GRAND_PRIX;
break;
case DEMO_TWO: /* switch 4 */
@@ -6600,8 +6600,8 @@ block_74:
gScreenModeSelection = SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL;
gPlayerCountSelection1 = 2;
D_8018EDF3 = 2;
D_800E86A8[0] = YOSHI;
D_800E86A8[1] = DK;
gCharacterSelections[0] = YOSHI;
gCharacterSelections[1] = DK;
gModeSelection = VERSUS;
phi_a2 = 2;
break;
@@ -6610,7 +6610,7 @@ block_74:
gScreenModeSelection = SCREEN_MODE_1P;
gPlayerCountSelection1 = 1;
D_8018EDF3 = 1;
D_800E86A8[0] = LUIGI;
gCharacterSelections[0] = LUIGI;
gModeSelection = GRAND_PRIX;
break;
case DEMO_FOUR: /* switch 4 */
@@ -6618,9 +6618,9 @@ block_74:
gScreenModeSelection = SCREEN_MODE_3P_4P_SPLITSCREEN;
gPlayerCountSelection1 = 3;
D_8018EDF3 = 3;
D_800E86A8[0] = WARIO;
D_800E86A8[1] = YOSHI;
D_800E86A8[2] = BOWSER;
gCharacterSelections[0] = WARIO;
gCharacterSelections[1] = YOSHI;
gCharacterSelections[2] = BOWSER;
gModeSelection = VERSUS;
phi_a2 = 2;
break;
@@ -6629,7 +6629,7 @@ block_74:
gScreenModeSelection = SCREEN_MODE_1P;
gPlayerCountSelection1 = 1;
D_8018EDF3 = 1;
D_800E86A8[0] = BOWSER;
gCharacterSelections[0] = BOWSER;
gModeSelection = GRAND_PRIX;
phi_a2 = 2;
break;
@@ -6638,10 +6638,10 @@ block_74:
gScreenModeSelection = SCREEN_MODE_3P_4P_SPLITSCREEN;
gPlayerCountSelection1 = 4;
D_8018EDF3 = 4;
D_800E86A8[0] = MARIO;
D_800E86A8[1] = LUIGI;
D_800E86A8[2] = PEACH;
D_800E86A8[3] = TOAD;
gCharacterSelections[0] = MARIO;
gCharacterSelections[1] = LUIGI;
gCharacterSelections[2] = PEACH;
gCharacterSelections[3] = TOAD;
gModeSelection = VERSUS;
phi_a2 = 2;
break;
@@ -7759,7 +7759,7 @@ extern ? D_02007280;
extern ? D_02007458;
extern ? D_02007468;
extern ? D_02007640;
extern s32 D_800DC5E8;
extern s32 gPlayerWinningIndex;
extern u16 D_80162DD4;
extern ? D_801640F4;
extern s32 D_8018CA78;
@@ -8016,7 +8016,7 @@ static u32 D_800E8420[8] = {
(u32) &D_02006CB0,
}; /* const */
static ? D_800E85F7; /* unable to generate initializer; const */
static s8 D_800E86A8 = 0; /* const */
static s8 gCharacterSelections = 0; /* const */
static ? D_800EFD64; /* unable to generate initializer; const */
s16 gCupCourseOrder[5][4]; /* unable to generate initializer; const */
@@ -8410,7 +8410,7 @@ loop_3:
temp_t8 = type * 4;
phi_a2 = (struct _struct_D_800E8234_0x8 *) temp_t8;
phi_a2 = (struct _struct_D_800E8234_0x8 *) temp_t8;
if (type != (D_800DC5E8 + 0xB1)) {
if (type != (gPlayerWinningIndex + 0xB1)) {
}
}
@@ -8579,7 +8579,7 @@ extern ? D_8018EDE8;
extern s8 gMainMenuSelectionDepth;
extern s8 D_8018EDF3;
extern s8 D_802874F6;
extern ? gCharacterSelections;
extern ? gCharacterGridSelections;
extern void *gDisplayListHead;
extern s32 gGfxPool;
extern s32 gGlobalTimer;
@@ -8621,7 +8621,7 @@ static ? D_800E817C; /* unable to generate initia
static ? D_800E824C; /* unable to generate initializer; const */
static ? D_800E8254; /* unable to generate initializer; const */
static ? D_800E8294; /* unable to generate initializer; const */
static ? D_800E86A8; /* unable to generate initializer; const */
static ? gCharacterSelections; /* unable to generate initializer; const */
static ? D_800E86AB; /* unable to generate initializer; const */
static ? D_800E86AD; /* unable to generate initializer; const */
static ? D_800EFD64; /* unable to generate initializer; const */
@@ -8929,7 +8929,7 @@ void func_8009F5E0(void *arg0) {
case 0xB4: /* switch 3 */
temp_v0_6 = temp_t0 - 0xB1;
if (arg0->unk4 != 0) {
temp_a2_5 = *(&D_800EFD64 + *(&D_800E86A8 + temp_v0_6));
temp_a2_5 = *(&D_800EFD64 + *(&gCharacterSelections + temp_v0_6));
spA8 = temp_v0_6;
gDisplayListHead = func_8009BA74(gDisplayListHead, segmented_to_virtual(*(&D_800E7D54 + (temp_a2_5 * 4))), arg0->unkC, arg0->unk10);
func_8009A7EC(arg0->unk18, arg0->unkC, arg0->unk10, spA8, arg0->unk1C);
@@ -9172,7 +9172,7 @@ block_58:
case 0x36: /* switch 4 */
case 0x37: /* switch 4 */
temp_a1_7 = temp_t0 - 0x34;
if (*(&gCharacterSelections + temp_a1_7) != 0) {
if (*(&gCharacterGridSelections + temp_a1_7) != 0) {
if (*(&D_8018EDE8 + temp_a1_7) == 0) {
phi_a2_3 = 0xFF;
} else {
@@ -12391,7 +12391,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A66A8.s")
? func_800A79F4(u8, ? *); // extern
? set_text_color(s32); // extern
? text_draw(s32, s32, ? *, ?, f32, f32); // extern
extern s32 D_800DC5E8;
extern s32 gPlayerWinningIndex;
extern ? D_800E7300;
extern s16 D_800E7302;
extern ? D_800E7380;
@@ -12430,13 +12430,13 @@ void func_800A69C8(s32 arg0) {
if (temp_v0 != BATTLE) {
} else {
if (phi_s0 != D_800DC5E8) {
if (phi_s0 != gPlayerWinningIndex) {
phi_v1 = 1;
}
phi_s4 = D_8015F8C4 + phi_s0;
}
} else {
if (D_801643B8[phi_s0] != 0) {
if (gPlayerPositions[phi_s0] != 0) {
phi_v1 = 1;
}
phi_s4 = D_8015F8B8 + phi_s0;
@@ -12551,7 +12551,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A6CC0.s")
? func_800A79F4(s32, ? *); // extern
? set_text_color(s32); // extern
? text_draw(s32, s32, ? *, ?, f32, f32); // extern
extern s32 D_800DC5E8;
extern s32 gPlayerWinningIndex;
extern ? D_800E7300;
void func_800A6D94(s32 arg0, s32 arg1, s32 arg2) {
@@ -12561,7 +12561,7 @@ void func_800A6D94(s32 arg0, s32 arg1, s32 arg2) {
s32 phi_v0;
phi_v0 = 0;
if (arg1 != D_800DC5E8) {
if (arg1 != gPlayerWinningIndex) {
phi_v0 = 1;
}
sp24 = *(arg2 + arg1);
@@ -12600,7 +12600,7 @@ void func_800A6E94(s32 arg0, s32 arg1, s32 arg2) {
u8 *temp_v0;
void *temp_s0;
temp_t8 = D_801643B8[arg1];
temp_t8 = gPlayerPositions[arg1];
sp3C = temp_t8;
if (temp_t8 == 0) {
set_text_color(gGlobalTimer % 3);
@@ -15161,14 +15161,14 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AAC18.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800AAF94(s32); // extern
extern ? gCharacterSelections;
extern ? gCharacterGridSelections;
void func_800AADD4(void *arg0) {
s32 temp_v0;
temp_v0 = arg0->unk0 - 0x34;
arg0->unk14 = 0xE - (temp_v0 * 2);
func_800AAF94(*(&gCharacterSelections + temp_v0) - 1);
func_800AAF94(*(&gCharacterGridSelections + temp_v0) - 1);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AADD4.s")
@@ -15317,7 +15317,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AAF94.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern s8 gCharacterSelections;
extern s8 gCharacterGridSelections;
s32 func_800AAFCC(s32 arg0) {
s32 temp_v1;
@@ -15326,7 +15326,7 @@ s32 func_800AAFCC(s32 arg0) {
s32 phi_v0;
s32 phi_v1_2;
phi_a2 = &gCharacterSelections;
phi_a2 = &gCharacterGridSelections;
phi_v1 = 0;
phi_v0 = 0;
loop_1:
@@ -16696,7 +16696,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ACC50.s")
void *func_800AAEF4(?, s8, s32); /* extern */
? func_800C90F4(s32, s32, s32); /* extern */
? func_800CA24C(s32); /* extern */
extern ? D_801643B8;
extern ? gPlayerPositions;
extern ? D_8018DEE4;
static ? D_800E72F8; /* unable to generate initializer; const */
static ? D_800E7300; /* unable to generate initializer; const */
@@ -16704,7 +16704,7 @@ static ? D_800E8380; /* unable to generate initia
static ? D_800E83A0; /* unable to generate initializer; const */
static ? D_800E8440; /* unable to generate initializer; const */
static ? D_800E85F7; /* unable to generate initializer; const */
static ? D_800E86A8; /* unable to generate initializer; const */
static ? gCharacterSelections; /* unable to generate initializer; const */
static ? D_800EFD64; /* unable to generate initializer; const */
void func_800ACF40(void *arg0) {
@@ -16751,10 +16751,10 @@ void func_800ACF40(void *arg0) {
if (temp_v0_3 != 2) {
if (temp_v0_3 != 3) {
} else if (temp_a2 != D_800DC5E8) {
} else if (temp_a2 != gPlayerWinningIndex) {
goto block_11;
}
} else if (*(&D_801643B8 + (temp_a2 * 4)) != 0) {
} else if (*(&gPlayerPositions + (temp_a2 * 4)) != 0) {
block_11:
phi_v1 = 1;
}
@@ -16765,7 +16765,7 @@ block_11:
temp_a0 = temp_a2 & 0xFF;
sp24 = temp_a0;
func_800CA24C(temp_a0);
func_800C90F4(temp_a0, (*(&D_800E86A8 + temp_a2) * 0x10) + 0x29008007, temp_a2);
func_800C90F4(temp_a0, (*(&gCharacterSelections + temp_a2) * 0x10) + 0x29008007, temp_a2);
return;
}
/* Duplicate return node #18. Try simplifying control flow for better match */
src/code_800AF9B0.c
+18 -18
View File
@@ -6,7 +6,7 @@
#include "global.h"
#include "common_structs.h"
void func_8009E1C0();
void func_8009E1C0();
void func_8009E208();
void func_8009E258();
void func_800B44AC(void);
@@ -51,7 +51,7 @@ extern s8 D_8018ED16;
extern s8 D_8018ED17;
extern u32 D_8018EDB8;
extern u32 D_8018EDBC;
extern s8 gCharacterSelections; // D_8018EDE4
extern s8 gCharacterGridSelections; // D_8018EDE4
extern s8 D_8018EDE5;
extern s8 D_8018EDE6;
extern s8 D_8018EDE7;
@@ -1106,12 +1106,12 @@ GLOBAL_ASM("asm/non_matchings/code_800AF9B0/func_800B053C.s")
// Handle navigating the data menu interface
void func_800B13B0(struct Controller *controller, s32 arg1) {
u16 buttonAndStickPress = (controller->buttonPressed | controller->stickPressed);
// Make pressing Start have the same effect as pressing A
if ((gEnableDebugMode == 0) && ((buttonAndStickPress & 0x1000) != 0)) {
buttonAndStickPress |= 0x8000;
}
if (func_800B4520() == 0) {
if (D_8018EDEC == 1) {
// If DPad/Stick down pressed, move selection down if not already in bottom row
@@ -1154,7 +1154,7 @@ void func_800B13B0(struct Controller *controller, s32 arg1) {
func_8009E1C0();
play_sound2(0x49008016);
}
}
}
// If D_8018EDEC != 1 and A pressed, go to main menu
// (Will D_8018EDEC ever not equal 1 when entering the data menu?)
else if ((buttonAndStickPress & 0x8000) != 0) {
@@ -1765,17 +1765,17 @@ void func_800B20F4(void *arg0, s32 arg1) {
break;
case DEBUG_MENU_PLAYER:
if ((sp2E & 0x100) != 0) {
temp_v0_5 = D_800E86A8;
temp_v0_5 = gCharacterSelections;
if (temp_v0_5 < 7) {
D_800E86A8 = temp_v0_5 + 1;
gCharacterSelections = temp_v0_5 + 1;
sp24 = sp2E;
play_sound2(0x49008000);
}
}
if ((sp2E & 0x200) != 0) {
temp_v0_6 = D_800E86A8;
temp_v0_6 = gCharacterSelections;
if (temp_v0_6 > 0) {
D_800E86A8 = temp_v0_6 - 1;
gCharacterSelections = temp_v0_6 - 1;
sp24 = sp2E;
play_sound2(0x49008000);
}
@@ -2334,7 +2334,7 @@ GLOBAL_ASM("asm/non_matchings/code_800AF9B0/func_800B29D8.s")
#endif
s32 func_800B34E8(s32 arg0) {
if (arg0 == gCharacterSelections) {
if (arg0 == gCharacterGridSelections) {
return 0;
}
if (arg0 == D_8018EDE5) {
@@ -2439,12 +2439,12 @@ void func_800B3B58(struct Controller *arg0, u16 arg1) {
}
break;
case 3:
if ((arg1 == 0) && ((++gMenuTimingCounter == 0x3C) || ((gMenuTimingCounter % 300) == 0))) {
play_sound2(0x4900900F);
}
if ((buttonAndStickPress & 0x4000) != 0) {
if ((buttonAndStickPress & 0x4000) != 0) {
switch(gModeSelection)
{
case GRAND_PRIX:
@@ -2457,7 +2457,7 @@ void func_800B3B58(struct Controller *arg0, u16 arg1) {
D_8018EDEC = 2;
break;
}
func_800B44AC();
play_sound2(0x49008002);
return;
@@ -2513,7 +2513,7 @@ extern s32 D_8018EE04;
extern s8 D_8018EE08;
extern s8 D_8018EE0A;
extern s16 gEnableDebugMode;
static s8 D_800E86A8 = 0; /* const */
static s8 gCharacterSelections = 0; /* const */
static ? D_800F2BDF; /* unable to generate initializer; const */
s32 gIsMirrorMode = 0;
@@ -2666,8 +2666,8 @@ void func_800B3F74(u32 arg0) {
if (D_800DC50C == 0) {
temp_a3_2 = D_8018EDF3;
phi_v1 = 0;
phi_v0 = &gCharacterSelections;
phi_a2 = &D_800E86A8;
phi_v0 = &gCharacterGridSelections;
phi_a2 = &gCharacterSelections;
phi_a1 = &D_8018EDE8;
do {
phi_a0 = phi_v1 + 1;
@@ -2950,7 +2950,7 @@ void func_800B4A10(void) {
}
func_800B4CB4();
gSoundMode = gSaveDataSoundMode;
if (gSoundMode >= NUM_SOUND_MODES) {
gSoundMode = SOUND_MONO;
@@ -3285,7 +3285,7 @@ s32 func_800B5218(void) {
s32 phi_a3_2;
sp38 = (gCupSelection * 4) + gCupCourseSelection;
sp28 = *D_800E86A8;
sp28 = *gCharacterSelections;
phi_a1 = &D_8018CA74;
phi_a2 = &D_8018CA70;
phi_v0 = 1;
src/code_80281780.c
+20 -19
View File
@@ -14,28 +14,29 @@ extern s32 gPrevLoadedAddress;
void func_80281780(void) {
if (gEnableDebugMode != 0) {
if (gControllerOne->button & 0x0F0F) {
if (gControllerOne->button & 8) {
D_800E86A8[0] = 1;
// Allows to switch character in debug mode?
if (gControllerOne->button & U_CBUTTONS) {
gCharacterSelections[0] = LUIGI;
}
else if (gControllerOne->button & 2) {
D_800E86A8[0] = 2;
else if (gControllerOne->button & L_CBUTTONS) {
gCharacterSelections[0] = YOSHI;
}
else if (gControllerOne->button & 1) {
D_800E86A8[0] = 3;
else if (gControllerOne->button & R_CBUTTONS) {
gCharacterSelections[0] = TOAD;
}
else if (gControllerOne->button & 4) {
D_800E86A8[0] = 4;
else if (gControllerOne->button & D_CBUTTONS) {
gCharacterSelections[0] = DK;
}
else if (gControllerOne->button & 0x800) {
D_800E86A8[0] = 5;
else if (gControllerOne->button & U_JPAD) {
gCharacterSelections[0] = WARIO;
}
else if (gControllerOne->button & 0x200) {
D_800E86A8[0] = 6;
else if (gControllerOne->button & L_JPAD) {
gCharacterSelections[0] = PEACH;
}
else if (gControllerOne->button & 0x100) {
D_800E86A8[0] = 7;
else if (gControllerOne->button & R_JPAD) {
gCharacterSelections[0] = BOWSER;
} else {
D_800E86A8[0] = 0;
gCharacterSelections[0] = MARIO;
}
bcopy(&D_80284ED0, &gCharacterIdByGPOverallRank, 8);
}
@@ -45,7 +46,7 @@ void func_80281780(void) {
s32 func_80281880(s32 arg0) {
s32 i;
for (i = 0; i < 8; i++) {
if (gCharacterIdByGPOverallRank[i] == D_800E86A8[arg0]) break;
if (gCharacterIdByGPOverallRank[i] == gCharacterSelections[arg0]) break;
}
return i;
}
@@ -58,17 +59,17 @@ void func_802818BC(void) {
if (D_8018EDF3 != 2) {
D_802874D8.unk_1D = func_80281880(0);
D_802874D8.unk_1E = D_800E86A8[0];
D_802874D8.unk_1E = gCharacterSelections[0];
return;
}
// weird pattern but if it matches it matches
temp_v0 = sp1C = func_80281880(0);
temp_v0_2 = func_80281880(1);
if (sp1C < temp_v0_2) {
D_802874D8.unk_1E = D_800E86A8[0];
D_802874D8.unk_1E = gCharacterSelections[0];
D_802874D8.unk_1D = temp_v0;
} else {
D_802874D8.unk_1E = D_800E86A8[1];
D_802874D8.unk_1E = gCharacterSelections[1];
D_802874D8.unk_1D = temp_v0_2;
}
}
src/code_80281780.h
+1 -1
View File
@@ -63,7 +63,7 @@ extern s32 D_801625F8;
extern f32 D_801625FC;
extern struct Controller *gControllerOne;
extern s8 D_800E86A8[];
extern s8 gCharacterSelections[];
extern u16 gEnableDebugMode;
extern void *D_80284ED0;
src/code_8028DF00.c
+40 -38
View File
@@ -73,7 +73,7 @@ extern u16 D_80162DD4[];
extern u16 D_8015F890;
extern u32 D_800DC5AC;
extern u16 gEnableDebugMode;
extern s32 D_800DC5E8;
extern s32 gPlayerWinningIndex;
extern u16 gIsInQuitToMenuTransition, gQuitToMenuTransitionCounter;
extern s32 D_802B91E0;
extern s16 D_8015F8F2[];
@@ -102,8 +102,8 @@ extern void func_80078F64();
extern void func_800925A0();
extern void func_8028F4E8();
extern void func_8028EDA8();
extern void func_8028E0F0();
extern void func_8028F3F0();
extern void update_player_battle_status();
extern void update_race_position_data();
extern void func_8028F970();
extern void func_8028E298();
extern void func_80092564();
@@ -152,29 +152,30 @@ void func_8028E028(void) {
switch(gPlayerCountSelection1) {
case 2:
*(D_8015F8C4 + D_800DC5E8) += 1;
*(D_8015F8C4 + gPlayerWinningIndex) += 1;
break;
case 3:
*(D_8015F8C8 + D_800DC5E8) += 1;
*(D_8015F8C8 + gPlayerWinningIndex) += 1;
break;
case 4:
*(D_8015F8CC + D_800DC5E8) += 1;
*(D_8015F8CC + gPlayerWinningIndex) += 1;
break;
}
func_800CA118((u8) D_800DC5E8);
func_800CA118((u8) gPlayerWinningIndex);
D_800DC510 = 5;
D_802BA038 = 10;
}
void func_8028E0F0(void) {
// func_8028E0F0
void update_player_battle_status(void) {
Player *ply;
s32 playerIndex;
s16 unk_arr2[4];
s16 unk_arr[4];
s16 phi_s1 = 0;
s16 phi_s2 = 0;
s16 playersAlive[4];
s16 playersDead[4];
s16 aliveCounter = 0;
s16 deadCounter = 0;
for(playerIndex = 0; playerIndex < 4; playerIndex++) {
for (playerIndex = 0; playerIndex < 4; playerIndex++) {
ply = (Player *)&gPlayers[playerIndex];
if (!(ply->unk_000 & PLAYER_EXISTS)) {
continue;
@@ -182,26 +183,26 @@ void func_8028E0F0(void) {
if (ply->unk_000 & PLAYER_CINEMATIC_MODE) {
continue;
}
// If player has no balloons left
if (gPlayerBalloonCount[playerIndex] < 0) {
ply->unk_000 |= PLAYER_CINEMATIC_MODE;
unk_arr[phi_s2] = (s16) (ply - gPlayerOne);
phi_s2++;
func_800CA118((u8) playerIndex);
playersDead[deadCounter] = (s16) (ply - gPlayerOne);
deadCounter++;
func_800CA118((u8) playerIndex); // play sad character sound?
} else {
unk_arr2[phi_s1] = (s16) (ply - gPlayerOne);
phi_s1++;
playersAlive[aliveCounter] = (s16) (ply - gPlayerOne);
aliveCounter++;
}
}
if (phi_s1 == 1) {
D_800DC5E8 = (s32) unk_arr2[0];
if (aliveCounter == 1) {
gPlayerWinningIndex = (s32) playersAlive[0];
func_8028E028();
} else if (phi_s1 == 0) {
D_800DC5E8 = (s32) unk_arr[0];
} else if (aliveCounter == 0) {
gPlayerWinningIndex = (s32) playersDead[0];
func_8028E028();
}
}
extern f32 gTimePlayerLastTouchedFinishLine[];
extern u16 D_801645B0[];
extern u16 D_801645C8[];
@@ -248,7 +249,7 @@ void func_8028E3A0(void) {
}
void func_8028E438(void) {
struct UnkStruct_800DC5EC *temp_v0 = &D_8015F480[D_800DC5E8];
struct UnkStruct_800DC5EC *temp_v0 = &D_8015F480[gPlayerWinningIndex];
s32 phi_v1_4;
D_800DC5B0 = 1;
@@ -647,7 +648,7 @@ void func_8028EF28(void) {
if (gModeSelection == VERSUS) {
D_802BA038 = 180;
if (currentPosition == 0) {
D_800DC5E8 = i;
gPlayerWinningIndex = i;
}
switch(gPlayerCountSelection1) {
case 2:
@@ -727,20 +728,21 @@ void func_8028EF28(void) {
void func_8028F3E8(void) {
}
extern s32 D_801643B8[];
extern s16 D_8015F8F0[];
extern s32 gPlayerPositions[]; // D_801643B8 (position for each player)
extern s16 gPlayerPositionLUT[]; // D_8015F8F0 (player index at each position)
void func_8028F3F0(void) {
// func_8028F3F0
void update_race_position_data(void) {
s16 i;
s16 temp_a0_2;
s16 position;
for (i = 0; i < 8; i++) {
if (((gPlayers[i].unk_000 & PLAYER_EXISTS) != 0) &&
((gPlayers[i].unk_000 & PLAYER_CINEMATIC_MODE) == 0) &&
((gPlayers[i].unk_000 & PLAYER_INVISIBLE_OR_BOMB) == 0)) {
temp_a0_2 = D_801643B8[i];
gPlayers[i].unk_004 = temp_a0_2;
D_8015F8F0[temp_a0_2] = i;
position = gPlayerPositions[i];
gPlayers[i].unk_004 = position;
gPlayerPositionLUT[position] = i;
}
}
}
@@ -1132,9 +1134,9 @@ void func_8028FCBC(void) {
break;
case 3:
if (gModeSelection == BATTLE) {
func_8028E0F0();
update_player_battle_status();
} else {
func_8028F3F0();
update_race_position_data();
func_8028EF28();
}
func_8028F4E8();
@@ -1145,7 +1147,7 @@ void func_8028FCBC(void) {
switch(gModeSelection) {
case GRAND_PRIX:
func_8028F4E8();
func_8028F3F0();
update_race_position_data();
func_8028EF28();
func_8028F970();
@@ -1161,9 +1163,9 @@ void func_8028FCBC(void) {
if (gPlayerOne->unk_004 < gPlayerTwo->unk_004) {
D_800DC5E8 = 1;
gPlayerWinningIndex = 1;
} else {
D_800DC5E8 = 0;
gPlayerWinningIndex = 0;
}
func_8028E298();
@@ -1175,7 +1177,7 @@ void func_8028FCBC(void) {
break;
case VERSUS:
func_8028F4E8();
func_8028F3F0();
update_race_position_data();
func_8028EF28();
func_8028F970();
break;
src/code_802B0210.c
+5 -5
View File
@@ -2371,7 +2371,7 @@ block_16:
arg0->unk2 = arg0->unk2 & 0xEFFF;
if (arg0->unk0 == 0x2A) {
arg0->unk6 = 8;
arg0->unk4 = D_8015F8F0;
arg0->unk4 = gPlayerPositionLUT;
arg0->unk8 = 1000.0f;
temp_v1_2 = D_80164430;
temp_v0_2 = *(&D_80164438 + (((&gPlayers[temp_t7] - gPlayerOne) / 3544) * 2)) + 8;
@@ -2414,11 +2414,11 @@ block_16:
phi_v0_4 = temp_v0_5 - temp_v1_4;
}
arg0->unk12 = phi_v0_4;
arg0->unk4 = (&D_8015F8F0)[gPlayers[temp_t7].unk_004].unk-2;
arg0->unk4 = (&gPlayerPositionLUT)[gPlayers[temp_t7].unk_004].unk-2;
} else {
arg0->unk6 = 3;
arg0->unk8 = 1000.0f;
arg0->unk4 = (&D_8015F8F0)[gPlayers[temp_t7].unk_004].unk-2;
arg0->unk4 = (&gPlayerPositionLUT)[gPlayers[temp_t7].unk_004].unk-2;
}
}
}
@@ -2501,8 +2501,8 @@ block_16:
return;
case 8:
func_802B3B44(arg0);
arg0->unk4 = D_8015F8F0;
temp_t3 = D_8015F8F0;
arg0->unk4 = gPlayerPositionLUT;
temp_t3 = gPlayerPositionLUT;
temp_f0_4 = gPlayers[temp_t3].posX - arg0->unk18;
temp_f2_5 = gPlayers[temp_t3].posZ - arg0->unk20;
if (((temp_f0_4 * temp_f0_4) + (temp_f2_5 * temp_f2_5)) < D_802B9FA0) {
src/main.c
+6 -6
View File
@@ -242,7 +242,7 @@ extern Camera *camera3;
extern Camera *camera4;
extern u16 D_800DC5B0;
extern s32 D_800DC5E8;
extern s32 gPlayerWinningIndex;
extern s32 gEnableResourceMeters;
@@ -696,7 +696,7 @@ void func_8000142C(void) {
func_802A41D4();
}
D_8015F788 = 0;
if (D_800DC5E8 == 0) {
if (gPlayerWinningIndex == 0) {
func_802A5FAC();
func_802A5CB4();
} else {
@@ -742,7 +742,7 @@ void func_8000142C(void) {
func_802A41D4();
}
D_8015F788 = 0;
if (D_800DC5E8 == 0) {
if (gPlayerWinningIndex == 0) {
func_802A65B8();
func_802A62A4();
} else {
@@ -813,17 +813,17 @@ void func_8000142C(void) {
func_802A41D4();
}
D_8015F788 = 0;
if (D_800DC5E8 == 0) {
if (gPlayerWinningIndex == 0) {
func_802A6BB0();
func_802A6E94();
func_802A7178();
func_802A68CC();
} else if (D_800DC5E8 == 1) {
} else if (gPlayerWinningIndex == 1) {
func_802A68CC();
func_802A6E94();
func_802A7178();
func_802A6BB0();
} else if (D_800DC5E8 == 2) {
} else if (gPlayerWinningIndex == 2) {
func_802A68CC();
func_802A6BB0();
func_802A7178();