Further labelling menu.c, font.c, fade_transition.c (#186)

* Further Labelling of font.c

* Further labelling

* Rename unknown_06B2B0

* Revert the rename

I still want to do it, but I'm gonna do it as a separate branch, so diffs won't be absolute hell

* Transition labelling

* Requested changes

* oops missed one
This commit is contained in:
Fazana
2021-12-07 15:03:03 -05:00
committed by GitHub
parent 8515a2acee
commit c65f2198e3
54 changed files with 1000 additions and 814 deletions
@@ -12,7 +12,7 @@ glabel func_800C01D8
/* 0C0DEC 800C01EC 100000A5 */ b .L800C0484
/* 0C0DF0 800C01F0 00001025 */ move $v0, $zero
.L800C01F4:
/* 0C0DF4 800C01F4 0C0301C9 */ jal func_800C0724
/* 0C0DF4 800C01F4 0C0301C9 */ jal transition_end
/* 0C0DF8 800C01F8 AFA40030 */ sw $a0, 0x30($sp)
/* 0C0DFC 800C01FC 8FA40030 */ lw $a0, 0x30($sp)
/* 0C0E00 800C0200 3C03800E */ lui $v1, %hi(D_800E31BC) # $v1, 0x800e
@@ -22,15 +22,15 @@ glabel func_800C01D8
/* 0C0E10 800C0210 00001025 */ move $v0, $zero
.L800C0214:
/* 0C0E14 800C0214 948F0004 */ lhu $t7, 4($a0)
/* 0C0E18 800C0218 3C06800E */ lui $a2, %hi(D_800E31B0) # $a2, 0x800e
/* 0C0E1C 800C021C 24C631B0 */ addiu $a2, %lo(D_800E31B0) # addiu $a2, $a2, 0x31b0
/* 0C0E18 800C0218 3C06800E */ lui $a2, %hi(sTransitionFadeTimer) # $a2, 0x800e
/* 0C0E1C 800C021C 24C631B0 */ addiu $a2, %lo(sTransitionFadeTimer) # addiu $a2, $a2, 0x31b0
/* 0C0E20 800C0220 A4CF0000 */ sh $t7, ($a2)
/* 0C0E24 800C0224 94980004 */ lhu $t8, 4($a0)
/* 0C0E28 800C0228 3C01800E */ lui $at, %hi(D_800E31B8) # $at, 0x800e
/* 0C0E2C 800C022C A43831B8 */ sh $t8, %lo(D_800E31B8)($at)
/* 0C0E30 800C0230 94990006 */ lhu $t9, 6($a0)
/* 0C0E34 800C0234 3C01800E */ lui $at, %hi(D_800E31B4) # $at, 0x800e
/* 0C0E38 800C0238 A43931B4 */ sh $t9, %lo(D_800E31B4)($at)
/* 0C0E34 800C0234 3C01800E */ lui $at, %hi(sTransitionFlags) # $at, 0x800e
/* 0C0E38 800C0238 A43931B4 */ sh $t9, %lo(sTransitionFlags)($at)
/* 0C0E3C 800C023C 90820000 */ lbu $v0, ($a0)
/* 0C0E40 800C0240 3C078013 */ lui $a3, %hi(gCurFaceTransition) # $a3, 0x8013
/* 0C0E44 800C0244 30480080 */ andi $t0, $v0, 0x80
@@ -45,8 +45,8 @@ glabel func_800C01D8
/* 0C0E68 800C0268 318D0040 */ andi $t5, $t4, 0x40
/* 0C0E6C 800C026C AC2D31A8 */ sw $t5, %lo(D_800E31A8)($at)
/* 0C0E70 800C0270 806E0000 */ lb $t6, ($v1)
/* 0C0E74 800C0274 3C05800E */ lui $a1, %hi(D_800E31A4) # $a1, 0x800e
/* 0C0E78 800C0278 24A531A4 */ addiu $a1, %lo(D_800E31A4) # addiu $a1, $a1, 0x31a4
/* 0C0E74 800C0274 3C05800E */ lui $a1, %hi(sLevelTransitionDelayTimer) # $a1, 0x800e
/* 0C0E78 800C0278 24A531A4 */ addiu $a1, %lo(sLevelTransitionDelayTimer) # addiu $a1, $a1, 0x31a4
/* 0C0E7C 800C027C 15C00003 */ bnez $t6, .L800C028C
/* 0C0E80 800C0280 ACA00000 */ sw $zero, ($a1)
/* 0C0E84 800C0284 24180002 */ li $t8, 2
@@ -183,8 +183,8 @@ glabel L800C0470
/* 0C1070 800C0470 0C030990 */ jal func_800C2640
/* 0C1074 800C0474 00000000 */ nop
.L800C0478:
/* 0C1078 800C0478 3C02800E */ lui $v0, %hi(D_800E31AC) # $v0, 0x800e
/* 0C107C 800C047C 8C4231AC */ lw $v0, %lo(D_800E31AC)($v0)
/* 0C1078 800C0478 3C02800E */ lui $v0, %hi(sTransitionStatus) # $v0, 0x800e
/* 0C107C 800C047C 8C4231AC */ lw $v0, %lo(sTransitionStatus)($v0)
/* 0C1080 800C0480 00000000 */ nop
.L800C0484:
/* 0C1084 800C0484 8FBF002C */ lw $ra, 0x2c($sp)
@@ -3,16 +3,16 @@ glabel func_800C0834
/* 0C1438 800C0838 3C0C8013 */ lui $t4, %hi(D_8012A754) # $t4, 0x8013
/* 0C143C 800C083C 3C0B800E */ lui $t3, %hi(D_800E31B8) # $t3, 0x800e
/* 0C1440 800C0840 3C0A800E */ lui $t2, %hi(D_800E31A8) # $t2, 0x800e
/* 0C1444 800C0844 3C09800E */ lui $t1, %hi(D_800E31B4) # $t1, 0x800e
/* 0C1444 800C0844 3C09800E */ lui $t1, %hi(sTransitionFlags) # $t1, 0x800e
/* 0C1448 800C0848 3C078013 */ lui $a3, %hi(gCurFadeAlpha) # $a3, 0x8013
/* 0C144C 800C084C 3C068013 */ lui $a2, %hi(D_8012A750) # $a2, 0x8013
/* 0C1450 800C0850 3C05800E */ lui $a1, %hi(D_800E31B0) # $a1, 0x800e
/* 0C144C 800C084C 3C068013 */ lui $a2, %hi(sTransitionOpacity) # $a2, 0x8013
/* 0C1450 800C0850 3C05800E */ lui $a1, %hi(sTransitionFadeTimer) # $a1, 0x800e
/* 0C1454 800C0854 44816000 */ mtc1 $at, $f12
/* 0C1458 800C0858 44801000 */ mtc1 $zero, $f2
/* 0C145C 800C085C 24A531B0 */ addiu $a1, %lo(D_800E31B0) # addiu $a1, $a1, 0x31b0
/* 0C1460 800C0860 24C6A750 */ addiu $a2, %lo(D_8012A750) # addiu $a2, $a2, -0x58b0
/* 0C145C 800C085C 24A531B0 */ addiu $a1, %lo(sTransitionFadeTimer) # addiu $a1, $a1, 0x31b0
/* 0C1460 800C0860 24C6A750 */ addiu $a2, %lo(sTransitionOpacity) # addiu $a2, $a2, -0x58b0
/* 0C1464 800C0864 24E7A737 */ addiu $a3, %lo(gCurFadeAlpha) # addiu $a3, $a3, -0x58c9
/* 0C1468 800C0868 252931B4 */ addiu $t1, %lo(D_800E31B4) # addiu $t1, $t1, 0x31b4
/* 0C1468 800C0868 252931B4 */ addiu $t1, %lo(sTransitionFlags) # addiu $t1, $t1, 0x31b4
/* 0C146C 800C086C 254A31A8 */ addiu $t2, %lo(D_800E31A8) # addiu $t2, $t2, 0x31a8
/* 0C1470 800C0870 256B31B8 */ addiu $t3, %lo(D_800E31B8) # addiu $t3, $t3, 0x31b8
/* 0C1474 800C0874 258CA754 */ addiu $t4, %lo(D_8012A754) # addiu $t4, $t4, -0x58ac
@@ -27,23 +27,23 @@ glabel func_800C0B00
/* 0C1764 800C0B64 0C01C327 */ jal allocate_from_main_pool_safe
/* 0C1768 800C0B68 AFA30030 */ sw $v1, 0x30($sp)
/* 0C176C 800C0B6C 8FA30030 */ lw $v1, 0x30($sp)
/* 0C1770 800C0B70 3C04800E */ lui $a0, %hi(D_800E31C0) # $a0, 0x800e
/* 0C1774 800C0B74 248431C0 */ addiu $a0, %lo(D_800E31C0) # addiu $a0, $a0, 0x31c0
/* 0C1770 800C0B70 3C04800E */ lui $a0, %hi(sTransitionVtx) # $a0, 0x800e
/* 0C1774 800C0B74 248431C0 */ addiu $a0, %lo(sTransitionVtx) # addiu $a0, $a0, 0x31c0
/* 0C1778 800C0B78 AC820000 */ sw $v0, ($a0)
/* 0C177C 800C0B7C 3C01800E */ lui $at, %hi(D_800E31C0+4) # $at, 0x800e
/* 0C177C 800C0B7C 3C01800E */ lui $at, %hi(sTransitionVtx+4) # $at, 0x800e
/* 0C1780 800C0B80 00436021 */ addu $t4, $v0, $v1
/* 0C1784 800C0B84 AC2C31C4 */ sw $t4, %lo(D_800E31C0+4)($at)
/* 0C1784 800C0B84 AC2C31C4 */ sw $t4, %lo(sTransitionVtx+4)($at)
/* 0C1788 800C0B88 8C8D0004 */ lw $t5, 4($a0)
/* 0C178C 800C0B8C 3C05800E */ lui $a1, %hi(D_800E31C8) # $a1, 0x800e
/* 0C1790 800C0B90 3C01800E */ lui $at, %hi(D_800E31C8+4) # $at, 0x800e
/* 0C178C 800C0B8C 3C05800E */ lui $a1, %hi(sTransitionTris) # $a1, 0x800e
/* 0C1790 800C0B90 3C01800E */ lui $at, %hi(sTransitionTris+4) # $at, 0x800e
/* 0C1794 800C0B94 01A37021 */ addu $t6, $t5, $v1
/* 0C1798 800C0B98 24A531C8 */ addiu $a1, %lo(D_800E31C8) # addiu $a1, $a1, 0x31c8
/* 0C179C 800C0B9C AC2E31C8 */ sw $t6, %lo(D_800E31C8)($at)
/* 0C1798 800C0B98 24A531C8 */ addiu $a1, %lo(sTransitionTris) # addiu $a1, $a1, 0x31c8
/* 0C179C 800C0B9C AC2E31C8 */ sw $t6, %lo(sTransitionTris)($at)
/* 0C17A0 800C0BA0 8FA8002C */ lw $t0, 0x2c($sp)
/* 0C17A4 800C0BA4 8CAF0000 */ lw $t7, ($a1)
/* 0C17A8 800C0BA8 3C068013 */ lui $a2, %hi(D_8012A770) # $a2, 0x8013
/* 0C17AC 800C0BAC 01E8C021 */ addu $t8, $t7, $t0
/* 0C17B0 800C0BB0 AC3831CC */ sw $t8, %lo(D_800E31C8+4)($at)
/* 0C17B0 800C0BB0 AC3831CC */ sw $t8, %lo(sTransitionTris+4)($at)
/* 0C17B4 800C0BB4 8CB90004 */ lw $t9, 4($a1)
/* 0C17B8 800C0BB8 3C018013 */ lui $at, %hi(D_8012A770) # $at, 0x8013
/* 0C17BC 800C0BBC 03286021 */ addu $t4, $t9, $t0
@@ -65,7 +65,7 @@ glabel func_800C0B00
/* 0C17FC 800C0BFC 8FA20060 */ lw $v0, 0x60($sp)
/* 0C1800 800C0C00 318D0080 */ andi $t5, $t4, 0x80
/* 0C1804 800C0C04 11A00008 */ beqz $t5, .L800C0C28
/* 0C1808 800C0C08 3C09800E */ lui $t1, %hi(D_800E31B0) # $t1, 0x800e
/* 0C1808 800C0C08 3C09800E */ lui $t1, %hi(sTransitionFadeTimer) # $t1, 0x800e
/* 0C180C 800C0C0C 8FAE0064 */ lw $t6, 0x64($sp)
/* 0C1810 800C0C10 AFA20064 */ sw $v0, 0x64($sp)
/* 0C1814 800C0C14 8FA20068 */ lw $v0, 0x68($sp)
@@ -83,7 +83,7 @@ glabel func_800C0B00
/* 0C1840 800C0C40 8FA8006C */ lw $t0, 0x6c($sp)
/* 0C1844 800C0C44 2463A778 */ addiu $v1, %lo(D_8012A778) # addiu $v1, $v1, -0x5888
/* 0C1848 800C0C48 00001025 */ move $v0, $zero
/* 0C184C 800C0C4C 252931B0 */ addiu $t1, %lo(D_800E31B0) # addiu $t1, $t1, 0x31b0
/* 0C184C 800C0C4C 252931B0 */ addiu $t1, %lo(sTransitionFadeTimer) # addiu $t1, $t1, 0x31b0
.L800C0C50:
/* 0C1850 800C0C50 90980000 */ lbu $t8, ($a0)
/* 0C1854 800C0C54 8CCE0000 */ lw $t6, ($a2)
@@ -232,8 +232,8 @@ glabel func_800C0B00
.L800C0E78:
/* 0C1A78 800C0E78 1A000065 */ blez $s0, .L800C1010
/* 0C1A7C 800C0E7C 00002825 */ move $a1, $zero
/* 0C1A80 800C0E80 3C0E800E */ lui $t6, %hi(D_800E31C0) # $t6, 0x800e
/* 0C1A84 800C0E84 25CE31C0 */ addiu $t6, %lo(D_800E31C0) # addiu $t6, $t6, 0x31c0
/* 0C1A80 800C0E80 3C0E800E */ lui $t6, %hi(sTransitionVtx) # $t6, 0x800e
/* 0C1A84 800C0E84 25CE31C0 */ addiu $t6, %lo(sTransitionVtx) # addiu $t6, $t6, 0x31c0
/* 0C1A88 800C0E88 000A6880 */ sll $t5, $t2, 2
/* 0C1A8C 800C0E8C 320B0003 */ andi $t3, $s0, 3
/* 0C1A90 800C0E90 11600017 */ beqz $t3, .L800C0EF0
@@ -347,8 +347,8 @@ glabel func_800C0B00
.L800C1030:
/* 0C1C30 800C1030 1A200031 */ blez $s1, .L800C10F8
/* 0C1C34 800C1034 00002825 */ move $a1, $zero
/* 0C1C38 800C1038 3C18800E */ lui $t8, %hi(D_800E31C8) # $t8, 0x800e
/* 0C1C3C 800C103C 271831C8 */ addiu $t8, %lo(D_800E31C8) # addiu $t8, $t8, 0x31c8
/* 0C1C38 800C1038 3C18800E */ lui $t8, %hi(sTransitionTris) # $t8, 0x800e
/* 0C1C3C 800C103C 271831C8 */ addiu $t8, %lo(sTransitionTris) # addiu $t8, $t8, 0x31c8
/* 0C1C40 800C1040 000A7880 */ sll $t7, $t2, 2
/* 0C1C44 800C1044 01F81821 */ addu $v1, $t7, $t8
/* 0C1C48 800C1048 00001025 */ move $v0, $zero
@@ -401,8 +401,8 @@ glabel func_800C0B00
/* 0C1CFC 800C10FC 1548FFCC */ bne $t2, $t0, .L800C1030
/* 0C1D00 800C1100 00000000 */ nop
/* 0C1D04 800C1104 240D0001 */ li $t5, 1
/* 0C1D08 800C1108 3C01800E */ lui $at, %hi(D_800E31AC) # $at, 0x800e
/* 0C1D0C 800C110C AC2D31AC */ sw $t5, %lo(D_800E31AC)($at)
/* 0C1D08 800C1108 3C01800E */ lui $at, %hi(sTransitionStatus) # $at, 0x800e
/* 0C1D0C 800C110C AC2D31AC */ sw $t5, %lo(sTransitionStatus)($at)
/* 0C1D10 800C1110 3C018013 */ lui $at, %hi(D_8012A77C) # $at, 0x8013
/* 0C1D14 800C1114 8FBF0024 */ lw $ra, 0x24($sp)
/* 0C1D18 800C1118 AC30A77C */ sw $s0, %lo(D_8012A77C)($at)
@@ -1,6 +1,6 @@
glabel func_800C1130
/* 0C1D30 800C1130 3C07800E */ lui $a3, %hi(D_800E31B0) # $a3, 0x800e
/* 0C1D34 800C1134 24E731B0 */ addiu $a3, %lo(D_800E31B0) # addiu $a3, $a3, 0x31b0
/* 0C1D30 800C1130 3C07800E */ lui $a3, %hi(sTransitionFadeTimer) # $a3, 0x800e
/* 0C1D34 800C1134 24E731B0 */ addiu $a3, %lo(sTransitionFadeTimer) # addiu $a3, $a3, 0x31b0
/* 0C1D38 800C1138 44842000 */ mtc1 $a0, $f4
/* 0C1D3C 800C113C 94E20000 */ lhu $v0, ($a3)
/* 0C1D40 800C1140 3C03800E */ lui $v1, 0x800e
@@ -105,10 +105,10 @@ glabel func_800C1130
.L800C12B8:
/* 0C1EB8 800C12B8 18A00048 */ blez $a1, .L800C13DC
/* 0C1EBC 800C12BC 00001025 */ move $v0, $zero
/* 0C1EC0 800C12C0 3C06800E */ lui $a2, %hi(D_800E31D0) # $a2, 0x800e
/* 0C1EC4 800C12C4 3C05800E */ lui $a1, %hi(D_800E31C0) # $a1, 0x800e
/* 0C1EC8 800C12C8 24A531C0 */ addiu $a1, %lo(D_800E31C0) # addiu $a1, $a1, 0x31c0
/* 0C1ECC 800C12CC 24C631D0 */ addiu $a2, %lo(D_800E31D0) # addiu $a2, $a2, 0x31d0
/* 0C1EC0 800C12C0 3C06800E */ lui $a2, %hi(sTransitionTaskNum) # $a2, 0x800e
/* 0C1EC4 800C12C4 3C05800E */ lui $a1, %hi(sTransitionVtx) # $a1, 0x800e
/* 0C1EC8 800C12C8 24A531C0 */ addiu $a1, %lo(sTransitionVtx) # addiu $a1, $a1, 0x31c0
/* 0C1ECC 800C12CC 24C631D0 */ addiu $a2, %lo(sTransitionTaskNum) # addiu $a2, $a2, 0x31d0
/* 0C1ED0 800C12D0 00002025 */ move $a0, $zero
.L800C12D4:
/* 0C1ED4 800C12D4 4459F800 */ cfc1 $t9, $31
@@ -169,7 +169,7 @@ glabel func_800C1130
/* 0C1FB0 800C13B0 00000000 */ nop
.L800C13B4:
/* 0C1FB4 800C13B4 246331B4 */ addiu $v1, $v1, %lo(D_800E31B4)# 0x31b4
/* 0C1FB4 800C13B4 246331B4 */ addiu $v1, $v1, %lo(sTransitionFlags)# 0x31b4
/* 0C1FB8 800C13B8 94620000 */ lhu $v0, ($v1)
/* 0C1FBC 800C13BC 3401FFFF */ li $at, 65535
/* 0C1FC0 800C13C0 10410006 */ beq $v0, $at, .L800C13DC
@@ -14,11 +14,11 @@ glabel func_800C15D4
/* 0C2204 800C1604 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff
/* 0C2208 800C1608 0C01C327 */ jal allocate_from_main_pool_safe
/* 0C220C 800C160C 24040DA0 */ li $a0, 3488
/* 0C2210 800C1610 3C04800E */ lui $a0, %hi(D_800E31C0) # $a0, 0x800e
/* 0C2214 800C1614 3C05800E */ lui $a1, %hi(D_800E31C8) # $a1, 0x800e
/* 0C2210 800C1610 3C04800E */ lui $a0, %hi(sTransitionVtx) # $a0, 0x800e
/* 0C2214 800C1614 3C05800E */ lui $a1, %hi(sTransitionTris) # $a1, 0x800e
/* 0C2218 800C1618 244F02D0 */ addiu $t7, $v0, 0x2d0
/* 0C221C 800C161C 24A531C8 */ addiu $a1, %lo(D_800E31C8) # addiu $a1, $a1, 0x31c8
/* 0C2220 800C1620 248431C0 */ addiu $a0, %lo(D_800E31C0) # addiu $a0, $a0, 0x31c0
/* 0C221C 800C161C 24A531C8 */ addiu $a1, %lo(sTransitionTris) # addiu $a1, $a1, 0x31c8
/* 0C2220 800C1620 248431C0 */ addiu $a0, %lo(sTransitionVtx) # addiu $a0, $a0, 0x31c0
/* 0C2224 800C1624 25F902D0 */ addiu $t9, $t7, 0x2d0
/* 0C2228 800C1628 272D0400 */ addiu $t5, $t9, 0x400
/* 0C222C 800C162C AC820000 */ sw $v0, ($a0)
@@ -27,12 +27,12 @@ glabel func_800C15D4
/* 0C2238 800C1638 ACAD0004 */ sw $t5, 4($a1)
/* 0C223C 800C163C 3C058013 */ lui $a1, %hi(gCurFadeGreen) # $a1, 0x8013
/* 0C2240 800C1640 3C048013 */ lui $a0, %hi(gCurFadeRed) # $a0, 0x8013
/* 0C2244 800C1644 3C03800E */ lui $v1, %hi(D_800E31C0) # $v1, 0x800e
/* 0C2248 800C1648 3C0A800E */ lui $t2, %hi(D_800E31C8) # $t2, 0x800e
/* 0C2244 800C1644 3C03800E */ lui $v1, %hi(sTransitionVtx) # $v1, 0x800e
/* 0C2248 800C1648 3C0A800E */ lui $t2, %hi(sTransitionTris) # $t2, 0x800e
/* 0C224C 800C164C 3C068013 */ lui $a2, %hi(gCurFadeBlue) # $a2, 0x8013
/* 0C2250 800C1650 24C6A736 */ addiu $a2, %lo(gCurFadeBlue) # addiu $a2, $a2, -0x58ca
/* 0C2254 800C1654 254A31C8 */ addiu $t2, %lo(D_800E31C8) # addiu $t2, $t2, 0x31c8
/* 0C2258 800C1658 246331C0 */ addiu $v1, %lo(D_800E31C0) # addiu $v1, $v1, 0x31c0
/* 0C2254 800C1654 254A31C8 */ addiu $t2, %lo(sTransitionTris) # addiu $t2, $t2, 0x31c8
/* 0C2258 800C1658 246331C0 */ addiu $v1, %lo(sTransitionVtx) # addiu $v1, $v1, 0x31c0
/* 0C225C 800C165C 2484A734 */ addiu $a0, %lo(gCurFadeRed) # addiu $a0, $a0, -0x58cc
/* 0C2260 800C1660 24A5A735 */ addiu $a1, %lo(gCurFadeGreen) # addiu $a1, $a1, -0x58cb
/* 0C2264 800C1664 240902D0 */ li $t1, 720
@@ -109,10 +109,10 @@ glabel func_800C15D4
/* 0C237C 800C177C 006A082B */ sltu $at, $v1, $t2
/* 0C2380 800C1780 1420FFBB */ bnez $at, .L800C1670
/* 0C2384 800C1784 00001025 */ move $v0, $zero
/* 0C2388 800C1788 3C03800E */ lui $v1, %hi(D_800E31C0) # $v1, 0x800e
/* 0C238C 800C178C 3C0A800E */ lui $t2, %hi(D_800E31C8) # $t2, 0x800e
/* 0C2390 800C1790 254A31C8 */ addiu $t2, %lo(D_800E31C8) # addiu $t2, $t2, 0x31c8
/* 0C2394 800C1794 246331C0 */ addiu $v1, %lo(D_800E31C0) # addiu $v1, $v1, 0x31c0
/* 0C2388 800C1788 3C03800E */ lui $v1, %hi(sTransitionVtx) # $v1, 0x800e
/* 0C238C 800C178C 3C0A800E */ lui $t2, %hi(sTransitionTris) # $t2, 0x800e
/* 0C2390 800C1790 254A31C8 */ addiu $t2, %lo(sTransitionTris) # addiu $t2, $t2, 0x31c8
/* 0C2394 800C1794 246331C0 */ addiu $v1, %lo(sTransitionVtx) # addiu $v1, $v1, 0x31c0
/* 0C2398 800C1798 24090009 */ li $t1, 9
/* 0C239C 800C179C 2408000A */ li $t0, 10
.L800C17A0:
@@ -171,10 +171,10 @@ glabel func_800C15D4
/* 0C246C 800C186C 1420FFCC */ bnez $at, .L800C17A0
/* 0C2470 800C1870 00000000 */ nop
/* 0C2474 800C1874 3C014370 */ li $at, 0x43700000 # 240.000000
/* 0C2478 800C1878 3C12800E */ lui $s2, %hi(D_800E31C8) # $s2, 0x800e
/* 0C2478 800C1878 3C12800E */ lui $s2, %hi(sTransitionTris) # $s2, 0x800e
/* 0C247C 800C187C 4481A000 */ mtc1 $at, $f20
/* 0C2480 800C1880 0000A825 */ move $s5, $zero
/* 0C2484 800C1884 265231C8 */ addiu $s2, %lo(D_800E31C8) # addiu $s2, $s2, 0x31c8
/* 0C2484 800C1884 265231C8 */ addiu $s2, %lo(sTransitionTris) # addiu $s2, $s2, 0x31c8
/* 0C2488 800C1888 0000A025 */ move $s4, $zero
/* 0C248C 800C188C 2410FFF0 */ li $s0, -16
.L800C1890:
@@ -207,9 +207,9 @@ glabel func_800C15D4
/* 0C24F8 800C18F8 46080282 */ mul.s $f10, $f0, $f8
/* 0C24FC 800C18FC 0003C080 */ sll $t8, $v1, 2
/* 0C2500 800C1900 0303C021 */ addu $t8, $t8, $v1
/* 0C2504 800C1904 3C02800E */ lui $v0, %hi(D_800E31C0) # $v0, 0x800e
/* 0C2504 800C1904 3C02800E */ lui $v0, %hi(sTransitionVtx) # $v0, 0x800e
/* 0C2508 800C1908 4459F800 */ cfc1 $t9, $31
/* 0C250C 800C190C 244231C0 */ addiu $v0, %lo(D_800E31C0) # addiu $v0, $v0, 0x31c0
/* 0C250C 800C190C 244231C0 */ addiu $v0, %lo(sTransitionVtx) # addiu $v0, $v0, 0x31c0
/* 0C2510 800C1910 37210003 */ ori $at, $t9, 3
/* 0C2514 800C1914 38210002 */ xori $at, $at, 2
/* 0C2518 800C1918 44C1F800 */ ctc1 $at, $31
@@ -275,16 +275,16 @@ glabel func_800C15D4
/* 0C2604 800C1A04 1420FFA2 */ bnez $at, .L800C1890
/* 0C2608 800C1A08 26B51000 */ addiu $s5, $s5, 0x1000
/* 0C260C 800C1A0C 8FAE0038 */ lw $t6, 0x38($sp)
/* 0C2610 800C1A10 3C03800E */ lui $v1, %hi(D_800E31C8) # $v1, 0x800e
/* 0C2610 800C1A10 3C03800E */ lui $v1, %hi(sTransitionTris) # $v1, 0x800e
/* 0C2614 800C1A14 91CF0000 */ lbu $t7, ($t6)
/* 0C2618 800C1A18 246331C8 */ addiu $v1, %lo(D_800E31C8) # addiu $v1, $v1, 0x31c8
/* 0C2618 800C1A18 246331C8 */ addiu $v1, %lo(sTransitionTris) # addiu $v1, $v1, 0x31c8
/* 0C261C 800C1A1C 31F80080 */ andi $t8, $t7, 0x80
/* 0C2620 800C1A20 1300001D */ beqz $t8, .L800C1A98
/* 0C2624 800C1A24 3C06800E */ lui $a2, %hi(D_800E31D0) # $a2, 0x800e
/* 0C2624 800C1A24 3C06800E */ lui $a2, %hi(sTransitionTaskNum) # $a2, 0x800e
/* 0C2628 800C1A28 3C014334 */ li $at, 0x43340000 # 180.000000
/* 0C262C 800C1A2C 3C19800E */ lui $t9, %hi(D_800E31B0) # $t9, 0x800e
/* 0C262C 800C1A2C 3C19800E */ lui $t9, %hi(sTransitionFadeTimer) # $t9, 0x800e
/* 0C2630 800C1A30 44801000 */ mtc1 $zero, $f2
/* 0C2634 800C1A34 973931B0 */ lhu $t9, %lo(D_800E31B0)($t9)
/* 0C2634 800C1A34 973931B0 */ lhu $t9, %lo(sTransitionFadeTimer)($t9)
/* 0C2638 800C1A38 44816000 */ mtc1 $at, $f12
/* 0C263C 800C1A3C 3C018013 */ lui $at, %hi(D_8012A758) # $at, 0x8013
/* 0C2640 800C1A40 44999000 */ mtc1 $t9, $f18
@@ -312,9 +312,9 @@ glabel func_800C15D4
/* 0C2694 800C1A94 E42CA76C */ swc1 $f12, %lo(D_8012A76C)($at)
.L800C1A98:
/* 0C2698 800C1A98 3C014334 */ li $at, 0x43340000 # 180.000000
/* 0C269C 800C1A9C 3C0D800E */ lui $t5, %hi(D_800E31B0) # $t5, 0x800e
/* 0C269C 800C1A9C 3C0D800E */ lui $t5, %hi(sTransitionFadeTimer) # $t5, 0x800e
/* 0C26A0 800C1AA0 44816000 */ mtc1 $at, $f12
/* 0C26A4 800C1AA4 95AD31B0 */ lhu $t5, %lo(D_800E31B0)($t5)
/* 0C26A4 800C1AA4 95AD31B0 */ lhu $t5, %lo(sTransitionFadeTimer)($t5)
/* 0C26A8 800C1AA8 3C018013 */ lui $at, %hi(D_8012A758) # $at, 0x8013
/* 0C26AC 800C1AAC 448D5000 */ mtc1 $t5, $f10
/* 0C26B0 800C1AB0 E434A758 */ swc1 $f20, %lo(D_8012A758)($at)
@@ -342,7 +342,7 @@ glabel func_800C15D4
/* 0C2704 800C1B04 3C018013 */ lui $at, %hi(D_8012A76C) # $at, 0x8013
/* 0C2708 800C1B08 E422A76C */ swc1 $f2, %lo(D_8012A76C)($at)
.L800C1B0C:
/* 0C270C 800C1B0C 24C631D0 */ addiu $a2, %lo(D_800E31D0) # addiu $a2, $a2, 0x31d0
/* 0C270C 800C1B0C 24C631D0 */ addiu $a2, %lo(sTransitionTaskNum) # addiu $a2, $a2, 0x31d0
/* 0C2710 800C1B10 24050400 */ li $a1, 1024
/* 0C2714 800C1B14 24040040 */ li $a0, 64
/* 0C2718 800C1B18 00001025 */ move $v0, $zero
@@ -465,14 +465,14 @@ glabel func_800C15D4
/* 0C28E8 800C1CE8 0066082B */ sltu $at, $v1, $a2
/* 0C28EC 800C1CEC 1420FF8B */ bnez $at, .L800C1B1C
/* 0C28F0 800C1CF0 00001025 */ move $v0, $zero
/* 0C28F4 800C1CF4 3C0A800E */ lui $t2, %hi(D_800E31D0) # $t2, 0x800e
/* 0C28F8 800C1CF8 254A31D0 */ addiu $t2, %lo(D_800E31D0) # addiu $t2, $t2, 0x31d0
/* 0C28F4 800C1CF4 3C0A800E */ lui $t2, %hi(sTransitionTaskNum) # $t2, 0x800e
/* 0C28F8 800C1CF8 254A31D0 */ addiu $t2, %lo(sTransitionTaskNum) # addiu $t2, $t2, 0x31d0
/* 0C28FC 800C1CFC 0000A025 */ move $s4, $zero
/* 0C2900 800C1D00 240B0008 */ li $t3, 8
/* 0C2904 800C1D04 00142040 */ sll $a0, $s4, 1
.L800C1D08:
/* 0C2908 800C1D08 3C02800E */ lui $v0, %hi(D_800E31C8) # $v0, 0x800e
/* 0C290C 800C1D0C 244231C8 */ addiu $v0, %lo(D_800E31C8) # addiu $v0, $v0, 0x31c8
/* 0C2908 800C1D08 3C02800E */ lui $v0, %hi(sTransitionTris) # $v0, 0x800e
/* 0C290C 800C1D0C 244231C8 */ addiu $v0, %lo(sTransitionTris) # addiu $v0, $v0, 0x31c8
/* 0C2910 800C1D10 00041900 */ sll $v1, $a0, 4
/* 0C2914 800C1D14 24860001 */ addiu $a2, $a0, 1
/* 0C2918 800C1D18 24850003 */ addiu $a1, $a0, 3
@@ -580,7 +580,7 @@ glabel func_800C15D4
/* 0C2AAC 800C1EAC 00142040 */ sll $a0, $s4, 1
/* 0C2AB0 800C1EB0 8FBF0034 */ lw $ra, 0x34($sp)
/* 0C2AB4 800C1EB4 240F0001 */ li $t7, 1
/* 0C2AB8 800C1EB8 3C01800E */ lui $at, %hi(D_800E31AC) # $at, 0x800e
/* 0C2AB8 800C1EB8 3C01800E */ lui $at, %hi(sTransitionStatus) # $at, 0x800e
/* 0C2ABC 800C1EBC C7B50010 */ lwc1 $f21, 0x10($sp)
/* 0C2AC0 800C1EC0 C7B40014 */ lwc1 $f20, 0x14($sp)
/* 0C2AC4 800C1EC4 8FB0001C */ lw $s0, 0x1c($sp)
@@ -589,7 +589,7 @@ glabel func_800C15D4
/* 0C2AD0 800C1ED0 8FB30028 */ lw $s3, 0x28($sp)
/* 0C2AD4 800C1ED4 8FB4002C */ lw $s4, 0x2c($sp)
/* 0C2AD8 800C1ED8 8FB50030 */ lw $s5, 0x30($sp)
/* 0C2ADC 800C1EDC AC2F31AC */ sw $t7, %lo(D_800E31AC)($at)
/* 0C2ADC 800C1EDC AC2F31AC */ sw $t7, %lo(sTransitionStatus)($at)
/* 0C2AE0 800C1EE0 03E00008 */ jr $ra
/* 0C2AE4 800C1EE4 27BD0038 */ addiu $sp, $sp, 0x38
@@ -5,8 +5,8 @@ glabel D_800E932C
.text
glabel func_800C1EE8
/* 0C2AE8 800C1EE8 27BDFFB0 */ addiu $sp, $sp, -0x50
/* 0C2AEC 800C1EEC 3C03800E */ lui $v1, %hi(D_800E31B0) # $v1, 0x800e
/* 0C2AF0 800C1EF0 246331B0 */ addiu $v1, %lo(D_800E31B0) # addiu $v1, $v1, 0x31b0
/* 0C2AEC 800C1EEC 3C03800E */ lui $v1, %hi(sTransitionFadeTimer) # $v1, 0x800e
/* 0C2AF0 800C1EF0 246331B0 */ addiu $v1, %lo(sTransitionFadeTimer) # addiu $v1, $v1, 0x31b0
/* 0C2AF4 800C1EF4 44842000 */ mtc1 $a0, $f4
/* 0C2AF8 800C1EF8 94620000 */ lhu $v0, ($v1)
/* 0C2AFC 800C1EFC AFBF004C */ sw $ra, 0x4c($sp)
@@ -61,11 +61,11 @@ glabel func_800C1EE8
/* 0C2BBC 800C1FBC E7D00000 */ swc1 $f16, ($fp)
.L800C1FC0:
/* 0C2BC0 800C1FC0 3C01800F */ lui $at, %hi(D_800E932C) # $at, 0x800f
/* 0C2BC4 800C1FC4 3C11800E */ lui $s1, %hi(D_800E31D0) # $s1, 0x800e
/* 0C2BC8 800C1FC8 3C10800E */ lui $s0, %hi(D_800E31C0) # $s0, 0x800e
/* 0C2BC4 800C1FC4 3C11800E */ lui $s1, %hi(sTransitionTaskNum) # $s1, 0x800e
/* 0C2BC8 800C1FC8 3C10800E */ lui $s0, %hi(sTransitionVtx) # $s0, 0x800e
/* 0C2BCC 800C1FCC C436932C */ lwc1 $f22, %lo(D_800E932C)($at)
/* 0C2BD0 800C1FD0 261031C0 */ addiu $s0, %lo(D_800E31C0) # addiu $s0, $s0, 0x31c0
/* 0C2BD4 800C1FD4 263131D0 */ addiu $s1, %lo(D_800E31D0) # addiu $s1, $s1, 0x31d0
/* 0C2BD0 800C1FD0 261031C0 */ addiu $s0, %lo(sTransitionVtx) # addiu $s0, $s0, 0x31c0
/* 0C2BD4 800C1FD4 263131D0 */ addiu $s1, %lo(sTransitionTaskNum) # addiu $s1, $s1, 0x31d0
/* 0C2BD8 800C1FD8 00009025 */ move $s2, $zero
/* 0C2BDC 800C1FDC 24160009 */ li $s6, 9
/* 0C2BE0 800C1FE0 2415000A */ li $s5, 10
@@ -208,8 +208,8 @@ glabel func_800C1EE8
/* 0C2E00 800C2200 1000000D */ b .L800C2238
/* 0C2E04 800C2204 8FBF004C */ lw $ra, 0x4c($sp)
.L800C2208:
/* 0C2E08 800C2208 3C03800E */ lui $v1, %hi(D_800E31B4) # $v1, 0x800e
/* 0C2E0C 800C220C 246331B4 */ addiu $v1, %lo(D_800E31B4) # addiu $v1, $v1, 0x31b4
/* 0C2E08 800C2208 3C03800E */ lui $v1, %hi(sTransitionFlags) # $v1, 0x800e
/* 0C2E0C 800C220C 246331B4 */ addiu $v1, %lo(sTransitionFlags) # addiu $v1, $v1, 0x31b4
/* 0C2E10 800C2210 94620000 */ lhu $v0, ($v1)
/* 0C2E14 800C2214 3401FFFF */ li $at, 65535
/* 0C2E18 800C2218 10410006 */ beq $v0, $at, .L800C2234
@@ -20,16 +20,16 @@ glabel func_800C2640
/* 0C3288 800C2688 A02AA737 */ sb $t2, %lo(gCurFadeAlpha)($at)
/* 0C328C 800C268C 3C01437F */ li $at, 0x437F0000 # 255.000000
/* 0C3290 800C2690 44812000 */ mtc1 $at, $f4
/* 0C3294 800C2694 3C018013 */ lui $at, %hi(D_8012A750) # $at, 0x8013
/* 0C3294 800C2694 3C018013 */ lui $at, %hi(sTransitionOpacity) # $at, 0x8013
/* 0C3298 800C2698 44803000 */ mtc1 $zero, $f6
/* 0C329C 800C269C E424A750 */ swc1 $f4, %lo(D_8012A750)($at)
/* 0C329C 800C269C E424A750 */ swc1 $f4, %lo(sTransitionOpacity)($at)
/* 0C32A0 800C26A0 3C018013 */ lui $at, %hi(D_8012A754) # $at, 0x8013
/* 0C32A4 800C26A4 3C0B8013 */ lui $t3, %hi(gCurFadeRed) # $t3, 0x8013
/* 0C32A8 800C26A8 916BA734 */ lbu $t3, %lo(gCurFadeRed)($t3)
/* 0C32AC 800C26AC E426A754 */ swc1 $f6, %lo(D_8012A754)($at)
/* 0C32B0 800C26B0 8C6D0000 */ lw $t5, ($v1)
/* 0C32B4 800C26B4 3C02800E */ lui $v0, %hi(D_800E31B0) # $v0, 0x800e
/* 0C32B8 800C26B8 944231B0 */ lhu $v0, %lo(D_800E31B0)($v0)
/* 0C32B4 800C26B4 3C02800E */ lui $v0, %hi(sTransitionFadeTimer) # $v0, 0x800e
/* 0C32B8 800C26B8 944231B0 */ lhu $v0, %lo(sTransitionFadeTimer)($v0)
/* 0C32BC 800C26BC 000B6400 */ sll $t4, $t3, 0x10
/* 0C32C0 800C26C0 018D7023 */ subu $t6, $t4, $t5
/* 0C32C4 800C26C4 01C2001A */ div $zero, $t6, $v0
@@ -90,7 +90,7 @@ glabel func_800C2640
/* 0C3388 800C2788 3C018013 */ lui $at, %hi(D_8012A74C) # $at, 0x8013
/* 0C338C 800C278C 00007812 */ mflo $t7
/* 0C3390 800C2790 AC2FA74C */ sw $t7, %lo(D_8012A74C)($at)
/* 0C3394 800C2794 3C01800E */ lui $at, %hi(D_800E31AC) # $at, 0x800e
/* 0C3394 800C2794 3C01800E */ lui $at, %hi(sTransitionStatus) # $at, 0x800e
/* 0C3398 800C2798 03E00008 */ jr $ra
/* 0C339C 800C279C AC3831AC */ sw $t8, %lo(D_800E31AC)($at)
/* 0C339C 800C279C AC3831AC */ sw $t8, %lo(sTransitionStatus)($at)
@@ -4,7 +4,7 @@ glabel func_800C27A0
/* 0C33A8 800C27A8 AFB00004 */ sw $s0, 4($sp)
/* 0C33AC 800C27AC AFB10008 */ sw $s1, 8($sp)
/* 0C33B0 800C27B0 3C108013 */ lui $s0, %hi(gCurFadeBlue) # $s0, 0x8013
/* 0C33B4 800C27B4 3C12800E */ lui $s2, %hi(D_800E31B4) # $s2, 0x800e
/* 0C33B4 800C27B4 3C12800E */ lui $s2, %hi(sTransitionFlags) # $s2, 0x800e
/* 0C33B8 800C27B8 3C0D8013 */ lui $t5, %hi(gCurFadeGreen) # $t5, 0x8013
/* 0C33BC 800C27BC 3C0C8013 */ lui $t4, %hi(gCurFadeRed) # $t4, 0x8013
/* 0C33C0 800C27C0 3C0B8013 */ lui $t3, %hi(D_8012A74C) # $t3, 0x8013
@@ -13,8 +13,8 @@ glabel func_800C27A0
/* 0C33CC 800C27CC 3C088013 */ lui $t0, %hi(gLastFadeGreen) # $t0, 0x8013
/* 0C33D0 800C27D0 3C078013 */ lui $a3, %hi(D_8012A744) # $a3, 0x8013
/* 0C33D4 800C27D4 3C068013 */ lui $a2, %hi(gLastFadeRed) # $a2, 0x8013
/* 0C33D8 800C27D8 3C05800E */ lui $a1, %hi(D_800E31B0) # $a1, 0x800e
/* 0C33DC 800C27DC 24A531B0 */ addiu $a1, %lo(D_800E31B0) # addiu $a1, $a1, 0x31b0
/* 0C33D8 800C27D8 3C05800E */ lui $a1, %hi(sTransitionFadeTimer) # $a1, 0x800e
/* 0C33DC 800C27DC 24A531B0 */ addiu $a1, %lo(sTransitionFadeTimer) # addiu $a1, $a1, 0x31b0
/* 0C33E0 800C27E0 24C6A738 */ addiu $a2, %lo(gLastFadeRed) # addiu $a2, $a2, -0x58c8
/* 0C33E4 800C27E4 24E7A744 */ addiu $a3, %lo(D_8012A744) # addiu $a3, $a3, -0x58bc
/* 0C33E8 800C27E8 2508A73C */ addiu $t0, %lo(gLastFadeGreen) # addiu $t0, $t0, -0x58c4
@@ -23,7 +23,7 @@ glabel func_800C27A0
/* 0C33F4 800C27F4 256BA74C */ addiu $t3, %lo(D_8012A74C) # addiu $t3, $t3, -0x58b4
/* 0C33F8 800C27F8 258CA734 */ addiu $t4, %lo(gCurFadeRed) # addiu $t4, $t4, -0x58cc
/* 0C33FC 800C27FC 25ADA735 */ addiu $t5, %lo(gCurFadeGreen) # addiu $t5, $t5, -0x58cb
/* 0C3400 800C2800 265231B4 */ addiu $s2, %lo(D_800E31B4) # addiu $s2, $s2, 0x31b4
/* 0C3400 800C2800 265231B4 */ addiu $s2, %lo(sTransitionFlags) # addiu $s2, $s2, 0x31b4
/* 0C3404 800C2804 2610A736 */ addiu $s0, %lo(gCurFadeBlue) # addiu $s0, $s0, -0x58ca
/* 0C3408 800C2808 3411FFFF */ li $s1, 65535
/* 0C340C 800C280C 24020001 */ li $v0, 1
@@ -5,20 +5,20 @@ glabel render_fade_circle
/* 0C2E80 800C2280 AFA5001C */ sw $a1, 0x1c($sp)
/* 0C2E84 800C2284 0C01ECF4 */ jal func_8007B3D0
/* 0C2E88 800C2288 AFA60020 */ sw $a2, 0x20($sp)
/* 0C2E8C 800C228C 3C03800E */ lui $v1, %hi(D_800E31D0) # $v1, 0x800e
/* 0C2E90 800C2290 8C6331D0 */ lw $v1, %lo(D_800E31D0)($v1)
/* 0C2E8C 800C228C 3C03800E */ lui $v1, %hi(sTransitionTaskNum) # $v1, 0x800e
/* 0C2E90 800C2290 8C6331D0 */ lw $v1, %lo(sTransitionTaskNum)($v1)
/* 0C2E94 800C2294 8FAE0018 */ lw $t6, 0x18($sp)
/* 0C2E98 800C2298 3C07800E */ lui $a3, %hi(D_800E31C0) # $a3, 0x800e
/* 0C2E98 800C2298 3C07800E */ lui $a3, %hi(sTransitionVtx) # $a3, 0x800e
/* 0C2E9C 800C229C 00037880 */ sll $t7, $v1, 2
/* 0C2EA0 800C22A0 8DC20000 */ lw $v0, ($t6)
/* 0C2EA4 800C22A4 00EF3821 */ addu $a3, $a3, $t7
/* 0C2EA8 800C22A8 3C08800E */ lui $t0, %hi(D_800E31C8) # $t0, 0x800e
/* 0C2EAC 800C22AC 8CE731C0 */ lw $a3, %lo(D_800E31C0)($a3)
/* 0C2EA8 800C22A8 3C08800E */ lui $t0, %hi(sTransitionTris) # $t0, 0x800e
/* 0C2EAC 800C22AC 8CE731C0 */ lw $a3, %lo(sTransitionVtx)($a3)
/* 0C2EB0 800C22B0 010F4021 */ addu $t0, $t0, $t7
/* 0C2EB4 800C22B4 8D0831C8 */ lw $t0, %lo(D_800E31C8)($t0)
/* 0C2EB8 800C22B8 3C19800E */ lui $t9, %hi(D_800E3648) # $t9, 0x800e
/* 0C2EB4 800C22B4 8D0831C8 */ lw $t0, %lo(sTransitionTris)($t0)
/* 0C2EB8 800C22B8 3C19800E */ lui $t9, %hi(dl_transition_shape_settings) # $t9, 0x800e
/* 0C2EBC 800C22BC 00402025 */ move $a0, $v0
/* 0C2EC0 800C22C0 27393648 */ addiu $t9, %lo(D_800E3648) # addiu $t9, $t9, 0x3648
/* 0C2EC0 800C22C0 27393648 */ addiu $t9, %lo(dl_transition_shape_settings) # addiu $t9, $t9, 0x3648
/* 0C2EC4 800C22C4 3C180600 */ lui $t8, 0x600
/* 0C2EC8 800C22C8 AC980000 */ sw $t8, ($a0)
/* 0C2ECC 800C22CC AC990004 */ sw $t9, 4($a0)
@@ -6,20 +6,20 @@ glabel render_fade_waves
/* 0C3008 800C2408 AFA50024 */ sw $a1, 0x24($sp)
/* 0C300C 800C240C 0C01ECF4 */ jal func_8007B3D0
/* 0C3010 800C2410 AFA60028 */ sw $a2, 0x28($sp)
/* 0C3014 800C2414 3C03800E */ lui $v1, %hi(D_800E31D0) # $v1, 0x800e
/* 0C3014 800C2414 3C03800E */ lui $v1, %hi(sTransitionTaskNum) # $v1, 0x800e
/* 0C3018 800C2418 8FAE0020 */ lw $t6, 0x20($sp)
/* 0C301C 800C241C 8C6331D0 */ lw $v1, %lo(D_800E31D0)($v1)
/* 0C301C 800C241C 8C6331D0 */ lw $v1, %lo(sTransitionTaskNum)($v1)
/* 0C3020 800C2420 8DC20000 */ lw $v0, ($t6)
/* 0C3024 800C2424 00037880 */ sll $t7, $v1, 2
/* 0C3028 800C2428 3C06800E */ lui $a2, %hi(D_800E31C0) # $a2, 0x800e
/* 0C302C 800C242C 3C07800E */ lui $a3, %hi(D_800E31C8) # $a3, 0x800e
/* 0C3028 800C2428 3C06800E */ lui $a2, %hi(sTransitionVtx) # $a2, 0x800e
/* 0C302C 800C242C 3C07800E */ lui $a3, %hi(sTransitionTris) # $a3, 0x800e
/* 0C3030 800C2430 00CF3021 */ addu $a2, $a2, $t7
/* 0C3034 800C2434 00EF3821 */ addu $a3, $a3, $t7
/* 0C3038 800C2438 00402025 */ move $a0, $v0
/* 0C303C 800C243C 8CC631C0 */ lw $a2, %lo(D_800E31C0)($a2)
/* 0C3040 800C2440 8CE731C8 */ lw $a3, %lo(D_800E31C8)($a3)
/* 0C3044 800C2444 3C19800E */ lui $t9, %hi(D_800E3648) # $t9, 0x800e
/* 0C3048 800C2448 27393648 */ addiu $t9, %lo(D_800E3648) # addiu $t9, $t9, 0x3648
/* 0C303C 800C243C 8CC631C0 */ lw $a2, %lo(sTransitionVtx)($a2)
/* 0C3040 800C2440 8CE731C8 */ lw $a3, %lo(sTransitionTris)($a3)
/* 0C3044 800C2444 3C19800E */ lui $t9, %hi(dl_transition_shape_settings) # $t9, 0x800e
/* 0C3048 800C2448 27393648 */ addiu $t9, %lo(dl_transition_shape_settings) # addiu $t9, $t9, 0x3648
/* 0C304C 800C244C 3C180600 */ lui $t8, 0x600
/* 0C3050 800C2450 3C1005D0 */ lui $s0, (0x05D000E0 >> 16) # lui $s0, 0x5d0
/* 0C3054 800C2454 3C0D05B0 */ lui $t5, (0x05B000C0 >> 16) # lui $t5, 0x5b0
+9 -9
View File
@@ -29,8 +29,8 @@ glabel func_800C45A4
/* 0C51FC 800C45FC 03195821 */ addu $t3, $t8, $t9
/* 0C5200 800C4600 246E0008 */ addiu $t6, $v1, 8
/* 0C5204 800C4604 AC8E0000 */ sw $t6, ($a0)
/* 0C5208 800C4608 3C18800E */ lui $t8, %hi(D_800E3690) # $t8, 0x800e
/* 0C520C 800C460C 27183690 */ addiu $t8, %lo(D_800E3690) # addiu $t8, $t8, 0x3690
/* 0C5208 800C4608 3C18800E */ lui $t8, %hi(dl_dialogue_box_begin) # $t8, 0x800e
/* 0C520C 800C460C 27183690 */ addiu $t8, %lo(dl_dialogue_box_begin) # addiu $t8, $t8, 0x3690
/* 0C5210 800C4610 3C0F0600 */ lui $t7, 0x600
/* 0C5214 800C4614 3C198013 */ lui $t9, %hi(gDialogueBoxBackground) # $t9, 0x8013
/* 0C5218 800C4618 AC6F0000 */ sw $t7, ($v1)
@@ -201,9 +201,9 @@ glabel func_800C45A4
/* 0C5494 800C4894 24790008 */ addiu $t9, $v1, 8
/* 0C5498 800C4898 AE390000 */ sw $t9, ($s1)
/* 0C549C 800C489C 3C180702 */ lui $t8, (0x07020010 >> 16) # lui $t8, 0x702
# D_800E3690 - 0x7FFFFFB8 = 0xE36D8
/* 0C54A0 800C48A0 3C0E000E */ lui $t6, %hi(D_800E3690 - 0x7FFFFFB8) # $t6, 0xe
/* 0C54A4 800C48A4 25CE36D8 */ addiu $t6, %lo(D_800E3690 - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8
# dl_dialogue_box_begin - 0x7FFFFFB8 = 0xE36D8
/* 0C54A0 800C48A0 3C0E000E */ lui $t6, %hi(dl_dialogue_box_begin - 0x7FFFFFB8) # $t6, 0xe
/* 0C54A4 800C48A4 25CE36D8 */ addiu $t6, %lo(dl_dialogue_box_begin - 0x7FFFFFB8) # addiu $t6, $t6, 0x36d8
/* 0C54A8 800C48A8 37180010 */ ori $t8, (0x07020010 & 0xFFFF) # ori $t8, $t8, 0x10
/* 0C54AC 800C48AC AC780000 */ sw $t8, ($v1)
/* 0C54B0 800C48B0 AC6E0004 */ sw $t6, 4($v1)
@@ -272,14 +272,14 @@ glabel func_800C45A4
/* 0C55A8 800C49A8 032FC025 */ or $t8, $t9, $t7
/* 0C55AC 800C49AC AC780004 */ sw $t8, 4($v1)
/* 0C55B0 800C49B0 8E230000 */ lw $v1, ($s1)
# D_800E3690 - 0x7FFFFFC8 = 0xE36C8
/* 0C55B4 800C49B4 3C0F000E */ lui $t7, %hi(D_800E3690 - 0x7FFFFFC8) # $t7, 0xe
# dl_dialogue_box_begin - 0x7FFFFFC8 = 0xE36C8
/* 0C55B4 800C49B4 3C0F000E */ lui $t7, %hi(dl_dialogue_box_begin - 0x7FFFFFC8) # $t7, 0xe
/* 0C55B8 800C49B8 246E0008 */ addiu $t6, $v1, 8
/* 0C55BC 800C49BC AE2E0000 */ sw $t6, ($s1)
/* 0C55C0 800C49C0 3C190702 */ lui $t9, (0x07020010 >> 16) # lui $t9, 0x702
/* 0C55C4 800C49C4 37390010 */ ori $t9, (0x07020010 & 0xFFFF) # ori $t9, $t9, 0x10
# D_800E3690 - 0x7FFFFFC8 = 0xE36C8
/* 0C55C8 800C49C8 25EF36C8 */ addiu $t7, %lo(D_800E3690 - 0x7FFFFFC8) # addiu $t7, $t7, 0x36c8
# dl_dialogue_box_begin - 0x7FFFFFC8 = 0xE36C8
/* 0C55C8 800C49C8 25EF36C8 */ addiu $t7, %lo(dl_dialogue_box_begin - 0x7FFFFFC8) # addiu $t7, $t7, 0x36c8
/* 0C55CC 800C49CC AC6F0004 */ sw $t7, 4($v1)
/* 0C55D0 800C49D0 AC790000 */ sw $t9, ($v1)
/* 0C55D4 800C49D4 8E230000 */ lw $v1, ($s1)
+2 -2
View File
@@ -43,8 +43,8 @@ glabel s32_to_string
.L800C58A0:
/* 0C64A0 800C58A0 3C0D800E */ lui $t5, %hi(gDescPowsOf10) # $t5, 0x800e
/* 0C64A4 800C58A4 25AD36EC */ addiu $t5, %lo(gDescPowsOf10) # addiu $t5, $t5, 0x36ec
/* 0C64A8 800C58A8 3C0C800E */ lui $t4, %hi(D_800E3710) # $t4, 0x800e
/* 0C64AC 800C58AC 258C3710 */ addiu $t4, %lo(D_800E3710) # addiu $t4, $t4, 0x3710
/* 0C64A8 800C58A8 3C0C800E */ lui $t4, %hi(sDialogueBoxDimensions) # $t4, 0x800e
/* 0C64AC 800C58AC 258C3710 */ addiu $t4, %lo(sDialogueBoxDimensions) # addiu $t4, $t4, 0x3710
/* 0C64B0 800C58B0 032D4021 */ addu $t0, $t9, $t5
.L800C58B4:
/* 0C64B4 800C58B4 8D060000 */ lw $a2, ($t0)
+1 -1
View File
@@ -10,7 +10,7 @@ glabel func_800C2B00
/* 0C3720 800C2B20 AFB20028 */ sw $s2, 0x28($sp)
/* 0C3724 800C2B24 AFB10024 */ sw $s1, 0x24($sp)
/* 0C3728 800C2B28 AFB00020 */ sw $s0, 0x20($sp)
/* 0C372C 800C2B2C 0C031525 */ jal func_800C5494
/* 0C372C 800C2B2C 0C031525 */ jal assign_dialogue_box_id
/* 0C3730 800C2B30 24040006 */ li $a0, 6
/* 0C3734 800C2B34 3C118013 */ lui $s1, %hi(D_8012A7B4) # $s1, 0x8013
/* 0C3738 800C2B38 2631A7B4 */ addiu $s1, %lo(D_8012A7B4) # addiu $s1, $s1, -0x584c
+1 -1
View File
@@ -70,7 +70,7 @@ glabel func_8008377C
/* 084488 80083888 0C01E2AE */ jal render_textured_rectangle
/* 08448C 8008388C 24070034 */ li $a3, 52
.L80083890:
/* 084490 80083890 0C01BD32 */ jal func_8006F4C8
/* 084490 80083890 0C01BD32 */ jal is_controller_missing
/* 084494 80083894 00000000 */ nop
/* 084498 80083898 14400047 */ bnez $v0, .L800839B8
/* 08449C 8008389C 3C0D8000 */ lui $t5, %hi(osTvType) # $t5, 0x8000
+3 -3
View File
@@ -125,7 +125,7 @@ glabel func_80084854
/* 085624 80084A24 AFA80020 */ sw $t0, 0x20($sp)
/* 085628 80084A28 0C0202F2 */ jal func_80080BC8
/* 08562C 80084A2C 02402025 */ move $a0, $s2
/* 085630 80084A30 0C031525 */ jal func_800C5494
/* 085630 80084A30 0C031525 */ jal assign_dialogue_box_id
/* 085634 80084A34 24040007 */ li $a0, 7
/* 085638 80084A38 240900FF */ li $t1, 255
/* 08563C 80084A3C AFA90010 */ sw $t1, 0x10($sp)
@@ -144,7 +144,7 @@ glabel func_80084854
/* 085670 80084A70 02402025 */ move $a0, $s2
/* 085674 80084A74 00002825 */ move $a1, $zero
/* 085678 80084A78 00003025 */ move $a2, $zero
/* 08567C 80084A7C 0C0316D6 */ jal func_800C5B58
/* 08567C 80084A7C 0C0316D6 */ jal render_dialogue_box
/* 085680 80084A80 24070007 */ li $a3, 7
/* 085684 80084A84 240A00A3 */ li $t2, 163
/* 085688 80084A88 AFAA0010 */ sw $t2, 0x10($sp)
@@ -156,7 +156,7 @@ glabel func_80084854
/* 0856A0 80084AA0 02402025 */ move $a0, $s2
/* 0856A4 80084AA4 00002825 */ move $a1, $zero
/* 0856A8 80084AA8 00003025 */ move $a2, $zero
/* 0856AC 80084AAC 0C0316D6 */ jal func_800C5B58
/* 0856AC 80084AAC 0C0316D6 */ jal render_dialogue_box
/* 0856B0 80084AB0 24070007 */ li $a3, 7
/* 0856B4 80084AB4 3C06800E */ lui $a2, %hi(gSfxVolumeSliderValue) # $a2, 0x800e
/* 0856B8 80084AB8 8CC6FAC0 */ lw $a2, %lo(gSfxVolumeSliderValue)($a2)
+1 -1
View File
@@ -338,7 +338,7 @@ glabel L80085C30
/* 086C6C 8008606C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086C70 80086070 00002825 */ move $a1, $zero
/* 086C74 80086074 00003025 */ move $a2, $zero
/* 086C78 80086078 0C0316D6 */ jal func_800C5B58
/* 086C78 80086078 0C0316D6 */ jal render_dialogue_box
/* 086C7C 8008607C 24070007 */ li $a3, 7
.L80086080:
/* 086C80 80086080 0C02039B */ jal func_80080E6C
+1 -1
View File
@@ -59,7 +59,7 @@ glabel func_800871D8
/* 087EAC 800872AC 8CB80000 */ lw $t8, ($a1)
/* 087EB0 800872B0 24040007 */ li $a0, 7
/* 087EB4 800872B4 2719FFFF */ addiu $t9, $t8, -1
/* 087EB8 800872B8 0C031525 */ jal func_800C5494
/* 087EB8 800872B8 0C031525 */ jal assign_dialogue_box_id
/* 087EBC 800872BC AC396A78 */ sw $t9, %lo(D_80126A78)($at)
/* 087EC0 800872C0 00101100 */ sll $v0, $s0, 4
/* 087EC4 800872C4 2442002C */ addiu $v0, $v0, 0x2c
+6 -6
View File
@@ -77,7 +77,7 @@ glabel func_80088938
/* 08965C 80088A5C 0C031110 */ jal draw_text
/* 089660 80088A60 2406001E */ li $a2, 30
/* 089664 80088A64 24150030 */ li $s5, 48
/* 089668 80088A68 0C031525 */ jal func_800C5494
/* 089668 80088A68 0C031525 */ jal assign_dialogue_box_id
/* 08966C 80088A6C 24040006 */ li $a0, 6
/* 089670 80088A70 26AE001E */ addiu $t6, $s5, 0x1e
/* 089674 80088A74 AFAE0010 */ sw $t6, 0x10($sp)
@@ -155,7 +155,7 @@ glabel func_80088938
/* 08978C 80088B8C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089790 80088B90 00002825 */ move $a1, $zero
/* 089794 80088B94 00003025 */ move $a2, $zero
/* 089798 80088B98 0C0316D6 */ jal func_800C5B58
/* 089798 80088B98 0C0316D6 */ jal render_dialogue_box
/* 08979C 80088B9C 24070006 */ li $a3, 6
/* 0897A0 80088BA0 26B50022 */ addiu $s5, $s5, 0x22
/* 0897A4 80088BA4 24040006 */ li $a0, 6
@@ -173,7 +173,7 @@ glabel func_80088938
/* 0897D4 80088BD4 04400077 */ bltz $v0, .L80088DB4
/* 0897D8 80088BD8 00000000 */ nop
.L80088BDC:
/* 0897DC 80088BDC 0C031525 */ jal func_800C5494
/* 0897DC 80088BDC 0C031525 */ jal assign_dialogue_box_id
/* 0897E0 80088BE0 24040006 */ li $a0, 6
/* 0897E4 80088BE4 26A9000E */ addiu $t1, $s5, 0xe
/* 0897E8 80088BE8 AFA90010 */ sw $t1, 0x10($sp)
@@ -287,7 +287,7 @@ glabel func_80088938
/* 089988 80088D88 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 08998C 80088D8C 00002825 */ move $a1, $zero
/* 089990 80088D90 00003025 */ move $a2, $zero
/* 089994 80088D94 0C0316D6 */ jal func_800C5B58
/* 089994 80088D94 0C0316D6 */ jal render_dialogue_box
/* 089998 80088D98 24070006 */ li $a3, 6
/* 08999C 80088D9C 3C028012 */ lui $v0, %hi(D_80126BB4) # $v0, 0x8012
/* 0899A0 80088DA0 8C426BB4 */ lw $v0, %lo(D_80126BB4)($v0)
@@ -377,7 +377,7 @@ glabel func_80088938
/* 089ADC 80088EDC 10000001 */ b .L80088EE4
/* 089AE0 80088EE0 24150086 */ li $s5, 134
.L80088EE4:
/* 089AE4 80088EE4 0C031525 */ jal func_800C5494
/* 089AE4 80088EE4 0C031525 */ jal assign_dialogue_box_id
/* 089AE8 80088EE8 24040006 */ li $a0, 6
/* 089AEC 80088EEC 24040006 */ li $a0, 6
/* 089AF0 80088EF0 0C0313DF */ jal set_dialogue_font
@@ -463,7 +463,7 @@ glabel func_80088938
/* 089C18 80089018 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089C1C 8008901C 00002825 */ move $a1, $zero
/* 089C20 80089020 00003025 */ move $a2, $zero
/* 089C24 80089024 0C0316D6 */ jal func_800C5B58
/* 089C24 80089024 0C0316D6 */ jal render_dialogue_box
/* 089C28 80089028 24070006 */ li $a3, 6
.L8008902C:
/* 089C2C 8008902C 3C0F8012 */ lui $t7, %hi(D_80126C10) # $t7, 0x8012
+1 -1
View File
@@ -272,7 +272,7 @@ glabel func_80092E94
/* 093EBC 800932BC 02402025 */ move $a0, $s2
/* 093EC0 800932C0 00002825 */ move $a1, $zero
/* 093EC4 800932C4 00003025 */ move $a2, $zero
/* 093EC8 800932C8 0C0316D6 */ jal func_800C5B58
/* 093EC8 800932C8 0C0316D6 */ jal render_dialogue_box
/* 093ECC 800932CC 24070007 */ li $a3, 7
/* 093ED0 800932D0 8FA70060 */ lw $a3, 0x60($sp)
/* 093ED4 800932D4 3C05800E */ lui $a1, %hi(D_800E05B4) # $a1, 0x800e
+1 -1
View File
@@ -47,7 +47,7 @@ glabel func_80093D40
/* 0949E0 80093DE0 24040007 */ li $a0, 7
/* 0949E4 80093DE4 0C0315B4 */ jal func_800C56D0
/* 0949E8 80093DE8 AFA80038 */ sw $t0, 0x38($sp)
/* 0949EC 80093DEC 0C031525 */ jal func_800C5494
/* 0949EC 80093DEC 0C031525 */ jal assign_dialogue_box_id
/* 0949F0 80093DF0 24040007 */ li $a0, 7
/* 0949F4 80093DF4 8FA80038 */ lw $t0, 0x38($sp)
/* 0949F8 80093DF8 00118043 */ sra $s0, $s1, 1

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