Adventure 2 33.33% (#420)

* be

* macros

* name these

* improve some names

* 31%

* I did evil things to objects

* made changes

* Fix warnings

* transitions

* Update fade_transition.c

* wav

* m

* Fix some font.c stuff

* racer behaviour table shenanigans

* 700

* Update fade_transition.c

* objects

* m

* oops

* thank you menu.c

* oh god renaming a commonly used function has its effects

* got busy in game_ui.c

* Update game_ui.c

* Update game_ui.h

* alrght

* Fix types in game_ui

* alrightnt

* 33.33%

* Update README.md

* Update README.md

* quick changes

* Update game_text.c

* Update game_text.c
This commit is contained in:
Fazana
2023-10-11 21:42:09 +01:00
committed by GitHub
parent a8ca128ddf
commit 147e43c50e
67 changed files with 909 additions and 748 deletions
+1 -1
View File
@@ -143,7 +143,7 @@ glabel func_8009F034
/* 09FDE4 8009F1E4 25F8FFFC */ addiu $t8, $t7, -4
/* 09FDE8 8009F1E8 AC780000 */ sw $t8, ($v1)
.L8009F1EC:
/* 09FDEC 8009F1EC 0C006D90 */ jal func_8001B640
/* 09FDEC 8009F1EC 0C006D90 */ jal get_time_trial_ghost
/* 09FDF0 8009F1F0 00000000 */ nop
/* 09FDF4 8009F1F4 14400004 */ bnez $v0, .L8009F208
/* 09FDF8 8009F1F8 240C0001 */ li $t4, 1
+10 -10
View File
@@ -280,7 +280,7 @@ glabel func_800A277C
/* 0A3738 800A2B38 AFAB0010 */ sw $t3, 0x10($sp)
/* 0A373C 800A2B3C 24060004 */ li $a2, 4
/* 0A3740 800A2B40 24070001 */ li $a3, 1
/* 0A3744 800A2B44 0C028DB3 */ jal func_800A36CC
/* 0A3744 800A2B44 0C028DB3 */ jal set_stopwatch_face
/* 0A3748 800A2B48 AFA900A8 */ sw $t1, 0xa8($sp)
/* 0A374C 800A2B4C 8FA900A8 */ lw $t1, 0xa8($sp)
/* 0A3750 800A2B50 00000000 */ nop
@@ -480,10 +480,10 @@ glabel func_800A277C
/* 0A3A20 800A2E20 0C0165E4 */ jal get_timestamp_from_frames
/* 0A3A24 800A2E24 27A700AC */ addiu $a3, $sp, 0xac
/* 0A3A28 800A2E28 8FAC003C */ lw $t4, 0x3c($sp)
/* 0A3A2C 800A2E2C 3C01800E */ lui $at, %hi(D_800E2834) # $at, 0x800e
/* 0A3A2C 800A2E2C 3C01800E */ lui $at, %hi(gHudColour) # $at, 0x800e
/* 0A3A30 800A2E30 8D8A0000 */ lw $t2, ($t4)
/* 0A3A34 800A2E34 444DF800 */ cfc1 $t5, $31
/* 0A3A38 800A2E38 AC2A2834 */ sw $t2, %lo(D_800E2834)($at)
/* 0A3A38 800A2E38 AC2A2834 */ sw $t2, %lo(gHudColour)($at)
/* 0A3A3C 800A2E3C 8E2B0000 */ lw $t3, ($s1)
/* 0A3A40 800A2E40 35A10003 */ ori $at, $t5, 3
/* 0A3A44 800A2E44 38210002 */ xori $at, $at, 2
@@ -498,11 +498,11 @@ glabel func_800A277C
/* 0A3A68 800A2E68 24180001 */ li $t8, 1
/* 0A3A6C 800A2E6C 44CDF800 */ ctc1 $t5, $31
/* 0A3A70 800A2E70 AFB80014 */ sw $t8, 0x14($sp)
/* 0A3A74 800A2E74 0C029FEF */ jal func_800A7FBC
/* 0A3A74 800A2E74 0C029FEF */ jal render_timer
/* 0A3A78 800A2E78 AFAE0010 */ sw $t6, 0x10($sp)
/* 0A3A7C 800A2E7C 240FFFFE */ li $t7, -2
/* 0A3A80 800A2E80 3C01800E */ lui $at, %hi(D_800E2834) # $at, 0x800e
/* 0A3A84 800A2E84 AC2F2834 */ sw $t7, %lo(D_800E2834)($at)
/* 0A3A80 800A2E80 3C01800E */ lui $at, %hi(gHudColour) # $at, 0x800e
/* 0A3A84 800A2E84 AC2F2834 */ sw $t7, %lo(gHudColour)($at)
/* 0A3A88 800A2E88 8FB900B8 */ lw $t9, 0xb8($sp)
/* 0A3A8C 800A2E8C 8E430000 */ lw $v1, ($s2)
/* 0A3A90 800A2E90 272C000C */ addiu $t4, $t9, 0xc
@@ -595,7 +595,7 @@ glabel func_800A277C
/* 0A3BE4 800A2FE4 24050003 */ li $a1, 3
/* 0A3BE8 800A2FE8 00003025 */ move $a2, $zero
/* 0A3BEC 800A2FEC 24070004 */ li $a3, 4
/* 0A3BF0 800A2FF0 0C028DB3 */ jal func_800A36CC
/* 0A3BF0 800A2FF0 0C028DB3 */ jal set_stopwatch_face
/* 0A3BF4 800A2FF4 AFA00010 */ sw $zero, 0x10($sp)
/* 0A3BF8 800A2FF8 8FA900A0 */ lw $t1, 0xa0($sp)
/* 0A3BFC 800A2FFC 2419003C */ li $t9, 60
@@ -832,7 +832,7 @@ glabel func_800A277C
/* 0A3F60 800A3360 24050001 */ li $a1, 1
/* 0A3F64 800A3364 24060002 */ li $a2, 2
/* 0A3F68 800A3368 24070002 */ li $a3, 2
/* 0A3F6C 800A336C 0C028DB3 */ jal func_800A36CC
/* 0A3F6C 800A336C 0C028DB3 */ jal set_stopwatch_face
/* 0A3F70 800A3370 AFA00010 */ sw $zero, 0x10($sp)
/* 0A3F74 800A3374 10000016 */ b .L800A33D0
/* 0A3F78 800A3378 8FA400A0 */ lw $a0, 0xa0($sp)
@@ -844,7 +844,7 @@ glabel func_800A277C
/* 0A3F8C 800A338C 24050002 */ li $a1, 2
/* 0A3F90 800A3390 24060003 */ li $a2, 3
/* 0A3F94 800A3394 24070002 */ li $a3, 2
/* 0A3F98 800A3398 0C028DB3 */ jal func_800A36CC
/* 0A3F98 800A3398 0C028DB3 */ jal set_stopwatch_face
/* 0A3F9C 800A339C AFA00010 */ sw $zero, 0x10($sp)
/* 0A3FA0 800A33A0 1000000B */ b .L800A33D0
/* 0A3FA4 800A33A4 8FA400A0 */ lw $a0, 0xa0($sp)
@@ -856,7 +856,7 @@ glabel func_800A277C
/* 0A3FB8 800A33B8 24050003 */ li $a1, 3
/* 0A3FBC 800A33BC 24060001 */ li $a2, 1
/* 0A3FC0 800A33C0 24070004 */ li $a3, 4
/* 0A3FC4 800A33C4 0C028DB3 */ jal func_800A36CC
/* 0A3FC4 800A33C4 0C028DB3 */ jal set_stopwatch_face
/* 0A3FC8 800A33C8 AFA00010 */ sw $zero, 0x10($sp)
.L800A33CC:
/* 0A3FCC 800A33CC 8FA400A0 */ lw $a0, 0xa0($sp)
+1 -1
View File
@@ -641,7 +641,7 @@ glabel L800A691C
/* 0A7790 800A6B90 1000000A */ b .L800A6BBC
/* 0A7794 800A6B94 00000000 */ nop
.L800A6B98:
/* 0A7798 800A6B98 0C006D90 */ jal func_8001B640
/* 0A7798 800A6B98 0C006D90 */ jal get_time_trial_ghost
/* 0A779C 800A6B9C AFA70070 */ sw $a3, 0x70($sp)
/* 0A77A0 800A6BA0 8FA70070 */ lw $a3, 0x70($sp)
/* 0A77A4 800A6BA4 14400005 */ bnez $v0, .L800A6BBC
+6 -6
View File
@@ -369,8 +369,8 @@ glabel func_800AA600
/* 0AB748 800AAB48 3C01800F */ lui $at, %hi(D_800E87E0) # $at, 0x800f
/* 0AB74C 800AAB4C C43387E0 */ lwc1 $f19, %lo(D_800E87E0)($at)
/* 0AB750 800AAB50 C43287E4 */ lwc1 $f18, %lo(D_800E87E0 + 4)($at)
/* 0AB754 800AAB54 3C18800E */ lui $t8, %hi(D_800E2834) # $t8, 0x800e
/* 0AB758 800AAB58 8F182834 */ lw $t8, %lo(D_800E2834)($t8)
/* 0AB754 800AAB54 3C18800E */ lui $t8, %hi(gHudColour) # $t8, 0x800e
/* 0AB758 800AAB58 8F182834 */ lw $t8, %lo(gHudColour)($t8)
/* 0AB75C 800AAB5C 240B0001 */ li $t3, 1
/* 0AB760 800AAB60 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0AB764 800AAB64 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
@@ -406,9 +406,9 @@ glabel func_800AA600
/* 0AB7D8 800AABD8 8DC30000 */ lw $v1, ($t6)
/* 0AB7DC 800AABDC 860F0018 */ lh $t7, 0x18($s0)
/* 0AB7E0 800AABE0 84790016 */ lh $t9, 0x16($v1)
/* 0AB7E4 800AABE4 3C02800E */ lui $v0, %hi(D_800E2834) # $v0, 0x800e
/* 0AB7E4 800AABE4 3C02800E */ lui $v0, %hi(gHudColour) # $v0, 0x800e
/* 0AB7E8 800AABE8 01F90019 */ multu $t7, $t9
/* 0AB7EC 800AABEC 8C422834 */ lw $v0, %lo(D_800E2834)($v0)
/* 0AB7EC 800AABEC 8C422834 */ lw $v0, %lo(gHudColour)($v0)
/* 0AB7F0 800AABF0 2401FFFE */ li $at, -2
/* 0AB7F4 800AABF4 3C058012 */ lui $a1, %hi(D_80127180) # $a1, 0x8012
/* 0AB7F8 800AABF8 3C0D8012 */ lui $t5, %hi(gHudSprites) # $t5, 0x8012
@@ -498,8 +498,8 @@ glabel func_800AA600
/* 0AB940 800AAD40 016D0019 */ multu $t3, $t5
/* 0AB944 800AAD44 A7A0004E */ sh $zero, 0x4e($sp)
/* 0AB948 800AAD48 AFA00050 */ sw $zero, 0x50($sp)
/* 0AB94C 800AAD4C 3C0E800E */ lui $t6, %hi(D_800E2834) # $t6, 0x800e
/* 0AB950 800AAD50 8DCE2834 */ lw $t6, %lo(D_800E2834)($t6)
/* 0AB94C 800AAD4C 3C0E800E */ lui $t6, %hi(gHudColour) # $t6, 0x800e
/* 0AB950 800AAD50 8DCE2834 */ lw $t6, %lo(gHudColour)($t6)
/* 0AB954 800AAD54 240F0001 */ li $t7, 1
/* 0AB958 800AAD58 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0AB95C 800AAD5C 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
+2 -2
View File
@@ -287,7 +287,7 @@ glabel L80082608
.L80082618:
/* 083218 80082618 0C01A142 */ jal func_80068508
/* 08321C 8008261C 24040001 */ li $a0, 1
/* 083220 80082620 0C01EFC7 */ jal func_8007BF1C
/* 083220 80082620 0C01EFC7 */ jal sprite_opaque
/* 083224 80082624 00002025 */ move $a0, $zero
/* 083228 80082628 264BFF60 */ addiu $t3, $s2, -0xa0
/* 08322C 8008262C 448B2000 */ mtc1 $t3, $f4
@@ -362,7 +362,7 @@ glabel L80082608
/* 083340 80082740 00000000 */ nop
/* 083344 80082744 0C01A142 */ jal func_80068508
/* 083348 80082748 00002025 */ move $a0, $zero
/* 08334C 8008274C 0C01EFC7 */ jal func_8007BF1C
/* 08334C 8008274C 0C01EFC7 */ jal sprite_opaque
/* 083350 80082750 24040001 */ li $a0, 1
/* 083354 80082754 8FA40070 */ lw $a0, 0x70($sp)
/* 083358 80082758 10000034 */ b .L8008282C
+2 -2
View File
@@ -111,7 +111,7 @@ glabel func_80081C04
/* 082984 80081D84 3C01800E */ lui $at, %hi(sMenuGuiOpacity) # $at, 0x800e
/* 082988 80081D88 00002025 */ move $a0, $zero
/* 08298C 80081D8C AFA60068 */ sw $a2, 0x68($sp)
/* 082990 80081D90 0C01EFC7 */ jal func_8007BF1C
/* 082990 80081D90 0C01EFC7 */ jal sprite_opaque
/* 082994 80081D94 AC2FF764 */ sw $t7, %lo(sMenuGuiOpacity)($at)
/* 082998 80081D98 0C01A142 */ jal func_80068508
/* 08299C 80081D9C 24040001 */ li $a0, 1
@@ -140,7 +140,7 @@ glabel func_80081C04
/* 0829F4 80081DF4 1613FFF4 */ bne $s0, $s3, .L80081DC8
/* 0829F8 80081DF8 2694000C */ addiu $s4, $s4, 0xc
.L80081DFC:
/* 0829FC 80081DFC 0C01EFC7 */ jal func_8007BF1C
/* 0829FC 80081DFC 0C01EFC7 */ jal sprite_opaque
/* 082A00 80081E00 24040001 */ li $a0, 1
/* 082A04 80081E04 0C01A142 */ jal func_80068508
/* 082A08 80081E08 00002025 */ move $a0, $zero
+2 -2
View File
@@ -383,7 +383,7 @@ glabel L80085828
/* 086550 80085950 014FC821 */ addu $t9, $t2, $t7
/* 086554 80085954 E72A0010 */ swc1 $f10, 0x10($t9)
/* 086558 80085958 01E08025 */ move $s0, $t7
/* 08655C 8008595C 0C01EFC7 */ jal func_8007BF1C
/* 08655C 8008595C 0C01EFC7 */ jal sprite_opaque
/* 086560 80085960 00002025 */ move $a0, $zero
/* 086564 80085964 8FAB0084 */ lw $t3, 0x84($sp)
/* 086568 80085968 3C02800E */ lui $v0, %hi(gMenuImageStack) # $v0, 0x800e
@@ -411,7 +411,7 @@ glabel L80085828
/* 0865C0 800859C0 8FAB0074 */ lw $t3, 0x74($sp)
/* 0865C4 800859C4 0C027298 */ jal func_8009CA60
/* 0865C8 800859C8 A58B0058 */ sh $t3, 0x58($t4)
/* 0865CC 800859CC 0C01EFC7 */ jal func_8007BF1C
/* 0865CC 800859CC 0C01EFC7 */ jal sprite_opaque
/* 0865D0 800859D0 24040001 */ li $a0, 1
/* 0865D4 800859D4 8FAE0084 */ lw $t6, 0x84($sp)
/* 0865D8 800859D8 3C0F800E */ lui $t7, %hi(gMenuImageStack) # $t7, 0x800e
+1 -1
View File
@@ -150,7 +150,7 @@ glabel L80086CDC
/* 087924 80086D24 10000128 */ b .L800871C8
/* 087928 80086D28 AFA20038 */ sw $v0, 0x38($sp)
.L80086D2C:
/* 08792C 80086D2C 0C01B9DC */ jal func_8006E770
/* 08792C 80086D2C 0C01B9DC */ jal clear_lap_records
/* 087930 80086D30 24050003 */ li $a1, 3
/* 087934 80086D34 0C01BAFF */ jal mark_to_write_flap_and_course_times
/* 087938 80086D38 00000000 */ nop
+3 -3
View File
@@ -36,7 +36,7 @@ glabel func_80092188
/* 092DF8 800921F8 AD8E0000 */ sw $t6, ($t4)
/* 092DFC 800921FC 3C048012 */ lui $a0, %hi(D_801269CC) # $a0, 0x8012
/* 092E00 80092200 8C8469CC */ lw $a0, %lo(D_801269CC)($a0)
/* 092E04 80092204 0C030C7B */ jal func_800C31EC
/* 092E04 80092204 0C030C7B */ jal set_current_text
/* 092E08 80092208 2484003C */ addiu $a0, $a0, 0x3c
/* 092E0C 8009220C 3C028012 */ lui $v0, %hi(D_801269C8) # $v0, 0x8012
/* 092E10 80092210 3C06800E */ lui $a2, %hi(gTrackNameVoiceDelay) # $a2, 0x800e
@@ -585,7 +585,7 @@ glabel L8009287C
/* 0935C8 800929C8 24010005 */ li $at, 5
/* 0935CC 800929CC 17210004 */ bne $t9, $at, .L800929E0
/* 0935D0 800929D0 24180001 */ li $t8, 1
/* 0935D4 800929D4 0C030C7B */ jal func_800C31EC
/* 0935D4 800929D4 0C030C7B */ jal set_current_text
/* 0935D8 800929D8 24042710 */ li $a0, 10000
/* 0935DC 800929DC 24180001 */ li $t8, 1
.L800929E0:
@@ -622,7 +622,7 @@ glabel L8009287C
.L80092A50:
/* 093650 80092A50 14410032 */ bne $v0, $at, .L80092B1C
/* 093654 80092A54 8FAF003C */ lw $t7, 0x3c($sp)
/* 093658 80092A58 0C030C7B */ jal func_800C31EC
/* 093658 80092A58 0C030C7B */ jal set_current_text
/* 09365C 80092A5C 24042710 */ li $a0, 10000
/* 093660 80092A60 1000002E */ b .L80092B1C
/* 093664 80092A64 8FAF003C */ lw $t7, 0x3c($sp)
+2 -2
View File
@@ -240,7 +240,7 @@ glabel func_80096978
/* 09790C 80096D0C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 097910 80096D10 0C01A142 */ jal func_80068508
/* 097914 80096D14 24040001 */ li $a0, 1
/* 097918 80096D18 0C01EFC7 */ jal func_8007BF1C
/* 097918 80096D18 0C01EFC7 */ jal sprite_opaque
/* 09791C 80096D1C 00002025 */ move $a0, $zero
/* 097920 80096D20 240200FF */ li $v0, 255
/* 097924 80096D24 3C01800E */ lui $at, %hi(sMenuGuiColourR) # $at, 0x800e
@@ -385,7 +385,7 @@ glabel func_80096978
/* 097B28 80096F28 AFA800A8 */ sw $t0, 0xa8($sp)
/* 097B2C 80096F2C 0C01A142 */ jal func_80068508
/* 097B30 80096F30 00002025 */ move $a0, $zero
/* 097B34 80096F34 0C01EFC7 */ jal func_8007BF1C
/* 097B34 80096F34 0C01EFC7 */ jal sprite_opaque
/* 097B38 80096F38 24040001 */ li $a0, 1
/* 097B3C 80096F3C 240E00FF */ li $t6, 255
/* 097B40 80096F40 3C01800E */ lui $at, %hi(sMenuGuiColourG) # $at, 0x800e
+2 -2
View File
@@ -56,7 +56,7 @@ glabel func_8009E3D0
/* 09F098 8009E498 02602025 */ move $a0, $s3
/* 09F09C 8009E49C 0C027298 */ jal func_8009CA60
/* 09F0A0 8009E4A0 E5EA0010 */ swc1 $f10, 0x10($t7)
/* 09F0A4 8009E4A4 0C01EFC7 */ jal func_8007BF1C
/* 09F0A4 8009E4A4 0C01EFC7 */ jal sprite_opaque
/* 09F0A8 8009E4A8 00002025 */ move $a0, $zero
/* 09F0AC 8009E4AC 2418FFE3 */ li $t8, -29
/* 09F0B0 8009E4B0 44988000 */ mtc1 $t8, $f16
@@ -143,7 +143,7 @@ glabel func_8009E3D0
/* 09F1E0 8009E5E0 8E4A0000 */ lw $t2, ($s2)
/* 09F1E4 8009E5E4 0C027298 */ jal func_8009CA60
/* 09F1E8 8009E5E8 E5540150 */ swc1 $f20, 0x150($t2)
/* 09F1EC 8009E5EC 0C01EFC7 */ jal func_8007BF1C
/* 09F1EC 8009E5EC 0C01EFC7 */ jal sprite_opaque
/* 09F1F0 8009E5F0 02802025 */ move $a0, $s4
/* 09F1F4 8009E5F4 240BFFA7 */ li $t3, -89
/* 09F1F8 8009E5F8 448B5000 */ mtc1 $t3, $f10
@@ -101,7 +101,7 @@ glabel render_file_select_menu
/* 08DAE8 8008CEE8 11E0006B */ beqz $t7, .L8008D098
/* 08DAEC 8008CEEC 240500FF */ li $a1, 255
/* 08DAF0 8008CEF0 00002025 */ move $a0, $zero
/* 08DAF4 8008CEF4 0C01EFC7 */ jal func_8007BF1C
/* 08DAF4 8008CEF4 0C01EFC7 */ jal sprite_opaque
/* 08DAF8 8008CEF8 2412000B */ li $s2, 11
/* 08DAFC 8008CEFC 92380000 */ lbu $t8, ($s1)
/* 08DB00 8008CF00 00003825 */ move $a3, $zero
@@ -207,7 +207,7 @@ glabel render_file_select_menu
/* 08DC7C 8008D07C A022F4A8 */ sb $v0, %lo(sMenuGuiColourG)($at)
/* 08DC80 8008D080 3C01800E */ lui $at, %hi(sMenuGuiColourB) # $at, 0x800e
/* 08DC84 8008D084 A022F4AC */ sb $v0, %lo(sMenuGuiColourB)($at)
/* 08DC88 8008D088 0C01EFC7 */ jal func_8007BF1C
/* 08DC88 8008D088 0C01EFC7 */ jal sprite_opaque
/* 08DC8C 8008D08C 24040001 */ li $a0, 1
/* 08DC90 8008D090 10000014 */ b .L8008D0E4
/* 08DC94 8008D094 00000000 */ nop
@@ -1011,7 +1011,7 @@ glabel render_track_select_setup_ui
/* 092A0C 80091E0C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 092A10 80091E10 0C01A142 */ jal func_80068508
/* 092A14 80091E14 24040001 */ li $a0, 1
/* 092A18 80091E18 0C01EFC7 */ jal func_8007BF1C
/* 092A18 80091E18 0C01EFC7 */ jal sprite_opaque
/* 092A1C 80091E1C 00002025 */ move $a0, $zero
/* 092A20 80091E20 3C15800E */ lui $s5, %hi(gMultiplayerSelectedNumberOfRacers) # $s5, 0x800e
/* 092A24 80091E24 3C11800E */ lui $s1, %hi(sMenuGuiColourB) # $s1, 0x800e
@@ -1071,7 +1071,7 @@ glabel render_track_select_setup_ui
/* 092AEC 80091EEC A2130000 */ sb $s3, ($s0)
/* 092AF0 80091EF0 1696FFD3 */ bne $s4, $s6, .L80091E40
/* 092AF4 80091EF4 A2330000 */ sb $s3, ($s1)
/* 092AF8 80091EF8 0C01EFC7 */ jal func_8007BF1C
/* 092AF8 80091EF8 0C01EFC7 */ jal sprite_opaque
/* 092AFC 80091EFC 24040001 */ li $a0, 1
/* 092B00 80091F00 0C01A142 */ jal func_80068508
/* 092B04 80091F04 00002025 */ move $a0, $zero
@@ -1082,7 +1082,7 @@ glabel render_track_select_setup_ui
/* 092B14 80091F14 29210004 */ slti $at, $t1, 4
/* 092B18 80091F18 1020003D */ beqz $at, .L80092010
/* 092B1C 80091F1C 00000000 */ nop
/* 092B20 80091F20 0C01EFC7 */ jal func_8007BF1C
/* 092B20 80091F20 0C01EFC7 */ jal sprite_opaque
/* 092B24 80091F24 00002025 */ move $a0, $zero
/* 092B28 80091F28 3C0A800E */ lui $t2, %hi(gIsInAdventureTwo) # $t2, 0x800e
/* 092B2C 80091F2C 8D4AF494 */ lw $t2, %lo(gIsInAdventureTwo)($t2)
@@ -1145,7 +1145,7 @@ glabel render_track_select_setup_ui
/* 092C00 80092000 0C027298 */ jal func_8009CA60
/* 092C04 80092004 E544000C */ swc1 $f4, 0xc($t2)
.L80092008:
/* 092C08 80092008 0C01EFC7 */ jal func_8007BF1C
/* 092C08 80092008 0C01EFC7 */ jal sprite_opaque
/* 092C0C 8009200C 24040001 */ li $a0, 1
.L80092010:
/* 092C10 80092010 3C08800E */ lui $t0, %hi(gNumberOfActivePlayers) # $t0, 0x800e
@@ -121,7 +121,7 @@ glabel obj_loop_door
/* 03C740 8003BB40 81040013 */ lb $a0, 0x13($t0)
/* 03C744 8003BB44 00000000 */ nop
/* 03C748 8003BB48 309800FF */ andi $t8, $a0, 0xff
/* 03C74C 8003BB4C 0C030C7B */ jal func_800C31EC
/* 03C74C 8003BB4C 0C030C7B */ jal set_current_text
/* 03C750 8003BB50 03002025 */ move $a0, $t8
/* 03C754 8003BB54 8FA80044 */ lw $t0, 0x44($sp)
/* 03C758 8003BB58 8FA90040 */ lw $t1, 0x40($sp)
@@ -255,7 +255,7 @@ glabel obj_loop_weaponballoon
/* 03F0C8 8003E4C8 2404013E */ li $a0, 318
/* 03F0CC 8003E4CC 3C053F80 */ lui $a1, 0x3f80
/* 03F0D0 8003E4D0 00E03025 */ move $a2, $a3
/* 03F0D4 8003E4D4 0C029D21 */ jal func_800A7484
/* 03F0D4 8003E4D4 0C029D21 */ jal set_time_trial_start_voice
/* 03F0D8 8003E4D8 AFA30038 */ sw $v1, 0x38($sp)
/* 03F0DC 8003E4DC 8FA30038 */ lw $v1, 0x38($sp)
/* 03F0E0 8003E4E0 00002825 */ move $a1, $zero
@@ -290,7 +290,7 @@ glabel obj_loop_weaponballoon
/* 03F148 8003E548 2404013E */ li $a0, 318
/* 03F14C 8003E54C 3C053F80 */ lui $a1, 0x3f80
/* 03F150 8003E550 00E03025 */ move $a2, $a3
/* 03F154 8003E554 0C029D21 */ jal func_800A7484
/* 03F154 8003E554 0C029D21 */ jal set_time_trial_start_voice
/* 03F158 8003E558 AFA30038 */ sw $v1, 0x38($sp)
/* 03F15C 8003E55C 8FA30038 */ lw $v1, 0x38($sp)
/* 03F160 8003E560 00000000 */ nop
+7 -7
View File
@@ -17,9 +17,9 @@ glabel func_8000CC7C
/* 00D884 8000CC84 A020AD20 */ sb $zero, %lo(D_8011AD20)($at)
/* 00D888 8000CC88 3C018012 */ lui $at, %hi(D_8011ADB0) # $at, 0x8012
/* 00D88C 8000CC8C AC20ADB0 */ sw $zero, %lo(D_8011ADB0)($at)
/* 00D890 8000CC90 3C018012 */ lui $at, %hi(D_8011ADC4) # $at, 0x8012
/* 00D890 8000CC90 3C018012 */ lui $at, %hi(gFirstTimeFinish) # $at, 0x8012
/* 00D894 8000CC94 AFB1001C */ sw $s1, 0x1c($sp)
/* 00D898 8000CC98 A020ADC4 */ sb $zero, %lo(D_8011ADC4)($at)
/* 00D898 8000CC98 A020ADC4 */ sb $zero, %lo(gFirstTimeFinish)($at)
/* 00D89C 8000CC9C 3C118012 */ lui $s1, %hi(D_8011AF00) # $s1, 0x8012
/* 00D8A0 8000CCA0 AFBE0038 */ sw $fp, 0x38($sp)
/* 00D8A4 8000CCA4 3C018012 */ lui $at, %hi(gNumRacers) # $at, 0x8012
@@ -37,7 +37,7 @@ glabel func_8000CC7C
/* 00D8D4 8000CCD4 AFB40028 */ sw $s4, 0x28($sp)
/* 00D8D8 8000CCD8 AFB20020 */ sw $s2, 0x20($sp)
/* 00D8DC 8000CCDC A2200000 */ sb $zero, ($s1)
/* 00D8E0 8000CCE0 0C01486E */ jal func_800521B8
/* 00D8E0 8000CCE0 0C01486E */ jal set_taj_status
/* 00D8E4 8000CCE4 00002025 */ move $a0, $zero
/* 00D8E8 8000CCE8 0C01AF6C */ jal get_current_level_header
/* 00D8EC 8000CCEC 00000000 */ nop
@@ -1020,8 +1020,8 @@ glabel L8000D98C
/* 00E694 8000DA94 26B50004 */ addiu $s5, $s5, 4
/* 00E698 8000DA98 00009025 */ move $s2, $zero
.L8000DA9C:
/* 00E69C 8000DA9C 3C15800E */ lui $s5, %hi(D_800DC718) # $s5, 0x800e
/* 00E6A0 8000DAA0 26B5C718 */ addiu $s5, %lo(D_800DC718) # addiu $s5, $s5, -0x38e8
/* 00E69C 8000DA9C 3C15800E */ lui $s5, %hi(gGhostObj) # $s5, 0x800e
/* 00E6A0 8000DAA0 26B5C718 */ addiu $s5, %lo(gGhostObj) # addiu $s5, $s5, -0x38e8
/* 00E6A4 8000DAA4 0C0166D3 */ jal free_tt_ghost_data
/* 00E6A8 8000DAA8 AEA00000 */ sw $zero, ($s5)
/* 00E6AC 8000DAAC 3C118012 */ lui $s1, %hi(D_8011AD38) # $s1, 0x8012
@@ -1384,7 +1384,7 @@ glabel L8000D98C
/* 00EBE8 8000DFE8 01D97804 */ sllv $t7, $t9, $t6
/* 00EBEC 8000DFEC 030F6825 */ or $t5, $t8, $t7
/* 00EBF0 8000DFF0 A6ED0014 */ sh $t5, 0x14($s7)
/* 00EBF4 8000DFF4 0C01486E */ jal func_800521B8
/* 00EBF4 8000DFF4 0C01486E */ jal set_taj_status
/* 00EBF8 8000DFF8 24040002 */ li $a0, 2
/* 00EBFC 8000DFFC 0C0274CC */ jal set_next_taj_challenge_menu
/* 00EC00 8000E000 02402025 */ move $a0, $s2
@@ -1414,7 +1414,7 @@ glabel L8000D98C
/* 00EC54 8000E054 AC20ADB0 */ sw $zero, %lo(D_8011ADB0)($at)
/* 00EC58 8000E058 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 00EC5C 8000E05C 44816000 */ mtc1 $at, $f12
/* 00EC60 8000E060 0C01AF44 */ jal func_8006BD10
/* 00EC60 8000E060 0C01AF44 */ jal start_level_music
/* 00EC64 8000E064 00000000 */ nop
.L8000E068:
/* 00EC68 8000E068 0C01C42C */ jal set_free_queue_state
+1 -1
View File
@@ -183,7 +183,7 @@ glabel L80010400
/* 011028 80010428 24140012 */ li $s4, 18
/* 01102C 8001042C 16850005 */ bne $s4, $a1, .L80010444
/* 011030 80010430 00000000 */ nop
/* 011034 80010434 0C00FC37 */ jal func_8003F0DC
/* 011034 80010434 0C00FC37 */ jal decrease_rocket_sound_timer
/* 011038 80010438 00000000 */ nop
/* 01103C 8001043C 86C50048 */ lh $a1, 0x48($s6)
/* 011040 80010440 00000000 */ nop
+12 -12
View File
@@ -97,7 +97,7 @@ glabel func_80010994
/* 0116FC 80010AFC 3C158012 */ lui $s5, %hi(gRacers) # $s5, 0x8012
/* 011700 80010B00 0C0050AE */ jal func_800142B8
/* 011704 80010B04 26B5AEE4 */ addiu $s5, %lo(gRacers) # addiu $s5, $s5, -0x511c
/* 011708 80010B08 0C00556E */ jal func_800155B8
/* 011708 80010B08 0C00556E */ jal process_object_interactions
/* 01170C 80010B0C 00000000 */ nop
/* 011710 80010B10 0C007A27 */ jal func_8001E89C
/* 011714 80010B14 00000000 */ nop
@@ -145,9 +145,9 @@ glabel func_80010994
/* 0117B0 80010BB0 26520004 */ addiu $s2, $s2, 4
.L80010BB4:
/* 0117B4 80010BB4 3C138012 */ lui $s3, %hi(gObjectCount) # $s3, 0x8012
/* 0117B8 80010BB8 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012
/* 0117B8 80010BB8 3C118012 */ lui $s1, %hi(gObjectListStart) # $s1, 0x8012
/* 0117BC 80010BBC 8E73AE5C */ lw $s3, %lo(gObjectCount)($s3)
/* 0117C0 80010BC0 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1)
/* 0117C0 80010BC0 8E31AE60 */ lw $s1, %lo(gObjectListStart)($s1)
/* 0117C4 80010BC4 00000000 */ nop
/* 0117C8 80010BC8 0233082A */ slt $at, $s1, $s3
/* 0117CC 80010BCC 1020004C */ beqz $at, .L80010D00
@@ -294,8 +294,8 @@ glabel func_80010994
.L80010DC8:
/* 0119C8 80010DC8 0C002EB7 */ jal func_8000BADC
/* 0119CC 80010DCC 02802025 */ move $a0, $s4
/* 0119D0 80010DD0 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012
/* 0119D4 80010DD4 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1)
/* 0119D0 80010DD0 3C118012 */ lui $s1, %hi(gObjectListStart) # $s1, 0x8012
/* 0119D4 80010DD4 8E31AE60 */ lw $s1, %lo(gObjectListStart)($s1)
/* 0119D8 80010DD8 00000000 */ nop
/* 0119DC 80010DDC 0233082A */ slt $at, $s1, $s3
/* 0119E0 80010DE0 1020001D */ beqz $at, .L80010E58
@@ -337,8 +337,8 @@ glabel func_80010994
/* 011A5C 80010E5C 8F18AE64 */ lw $t8, %lo(gParticleCount)($t8)
/* 011A60 80010E60 00000000 */ nop
/* 011A64 80010E64 1B000018 */ blez $t8, .L80010EC8
/* 011A68 80010E68 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012
/* 011A6C 80010E6C 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1)
/* 011A68 80010E68 3C118012 */ lui $s1, %hi(gObjectListStart) # $s1, 0x8012
/* 011A6C 80010E6C 8E31AE60 */ lw $s1, %lo(gObjectListStart)($s1)
/* 011A70 80010E70 00131080 */ sll $v0, $s3, 2
/* 011A74 80010E74 0233082A */ slt $at, $s1, $s3
/* 011A78 80010E78 10200013 */ beqz $at, .L80010EC8
@@ -369,10 +369,10 @@ glabel func_80010994
/* 011AD0 80010ED0 0C00CB1B */ jal get_light_count
/* 011AD4 80010ED4 00000000 */ nop
/* 011AD8 80010ED8 1840001F */ blez $v0, .L80010F58
/* 011ADC 80010EDC 3C118012 */ lui $s1, %hi(D_8011AE60) # $s1, 0x8012
/* 011ADC 80010EDC 3C118012 */ lui $s1, %hi(gObjectListStart) # $s1, 0x8012
/* 011AE0 80010EE0 3C028012 */ lui $v0, %hi(gObjectCount) # $v0, 0x8012
/* 011AE4 80010EE4 8C42AE5C */ lw $v0, %lo(gObjectCount)($v0)
/* 011AE8 80010EE8 8E31AE60 */ lw $s1, %lo(D_8011AE60)($s1)
/* 011AE8 80010EE8 8E31AE60 */ lw $s1, %lo(gObjectListStart)($s1)
/* 011AEC 80010EEC 00000000 */ nop
/* 011AF0 80010EF0 0222082A */ slt $at, $s1, $v0
/* 011AF4 80010EF4 10200018 */ beqz $at, .L80010F58
@@ -464,7 +464,7 @@ glabel func_80010994
/* 011C30 80011030 3C018012 */ lui $at, %hi(D_8011AD24) # $at, 0x8012
/* 011C34 80011034 A020AD24 */ sb $zero, %lo(D_8011AD24)($at)
/* 011C38 80011038 3C018012 */ lui $at, %hi(D_8011AD53) # $at, 0x8012
/* 011C3C 8001103C 0C0038AD */ jal func_8000E2B4
/* 011C3C 8001103C 0C0038AD */ jal transform_player_vehicle
/* 011C40 80011040 A020AD53 */ sb $zero, %lo(D_8011AD53)($at)
/* 011C44 80011044 0C0273EC */ jal try_close_dialogue_box
/* 011C48 80011048 00000000 */ nop
@@ -479,8 +479,8 @@ glabel func_80010994
/* 011C6C 8001106C 8D4AADB0 */ lw $t2, %lo(D_8011ADB0)($t2)
/* 011C70 80011070 24010050 */ li $at, 80
/* 011C74 80011074 15410025 */ bne $t2, $at, .L8001110C
/* 011C78 80011078 3C0B8012 */ lui $t3, %hi(D_8011AE7A) # $t3, 0x8012
/* 011C7C 8001107C 856BAE7A */ lh $t3, %lo(D_8011AE7A)($t3)
/* 011C78 80011078 3C0B8012 */ lui $t3, %hi(gCutsceneID) # $t3, 0x8012
/* 011C7C 8001107C 856BAE7A */ lh $t3, %lo(gCutsceneID)($t3)
/* 011C80 80011080 00002825 */ move $a1, $zero
/* 011C84 80011084 15600021 */ bnez $t3, .L8001110C
/* 011C88 80011088 00009825 */ move $s3, $zero
+2 -2
View File
@@ -14,8 +14,8 @@ glabel func_80014814
.L80014844:
/* 015444 80014844 8CC20000 */ lw $v0, ($a2)
/* 015448 80014848 3C038012 */ lui $v1, %hi(D_8011AE60) # $v1, 0x8012
/* 01544C 8001484C 8C63AE60 */ lw $v1, %lo(D_8011AE60)($v1)
/* 015448 80014848 3C038012 */ lui $v1, %hi(gObjectListStart) # $v1, 0x8012
/* 01544C 8001484C 8C63AE60 */ lw $v1, %lo(gObjectListStart)($v1)
/* 015450 80014850 2442FFFF */ addiu $v0, $v0, -1
/* 015454 80014854 0043082A */ slt $at, $v0, $v1
/* 015458 80014858 00402825 */ move $a1, $v0
+2 -2
View File
@@ -34,8 +34,8 @@ glabel func_80018CE0
/* 019960 80018D60 0C019884 */ jal get_viewport_count
/* 019964 80018D64 00000000 */ nop
/* 019968 80018D68 144001E4 */ bnez $v0, .L800194FC
/* 01996C 80018D6C 3C0C8012 */ lui $t4, %hi(D_8011AE60) # $t4, 0x8012
/* 019970 80018D70 8D8CAE60 */ lw $t4, %lo(D_8011AE60)($t4)
/* 01996C 80018D6C 3C0C8012 */ lui $t4, %hi(gObjectListStart) # $t4, 0x8012
/* 019970 80018D70 8D8CAE60 */ lw $t4, %lo(gObjectListStart)($t4)
/* 019974 80018D74 3C0D8012 */ lui $t5, %hi(gObjectCount) # $t5, 0x8012
/* 019978 80018D78 8DADAE5C */ lw $t5, %lo(gObjectCount)($t5)
/* 01997C 80018D7C AFAC00F4 */ sw $t4, 0xf4($sp)

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