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

Identity crisis with a helping of war crimes (#404)

Browse Source 
* Update Makefile

* rename object stack tracing

* no

* name the timer of pure unadulterated rage

* rename rendering

* So much

* Label boss racer anims

* organise boss racers

* remove some unused funcs from headers

* dialogue

* there we go

* Update vehicle_bluey.c

* Update README.md

* quick fixes

* quicker fixes

* finally rename unknown_0255E0.c

* 💡

* more

* ops fixed buildng

* Fix warning

* Update objects.c

* label memory.c a bit.

* Some object things

* Fix warnings

* name last decompression related things

* identify water effect

* Update structs.h

* Update memory.c

* mem

* document game text

* more

* :)

* Fix UB in thread30

* Update game_ui.c

* match func_8009ECF0

* new names

* Update game_ui.c

* Fix warnings

* Update game.c

* Fix nonequiv building

* rename

* Update include/structs.h

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
Fazana
2023-09-14 22:50:44 +01:00
committed by GitHub
co-authored by Ryan Myers
parent 34b3c51ffb
commit 14970cac4b
48 changed files with 2142 additions and 2021 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/gzip/gzip_inflate_block.s
+2 -2
View File
@@ -1,8 +1,8 @@
glabel gzip_inflate_block /* Official name: inflate_block */
/* 0C74C0 800C68C0 3C0B8013 */ lui $t3, %hi(gzip_num_bits) # $t3, 0x8013
/* 0C74C4 800C68C4 8D6BAAD4 */ lw $t3, %lo(gzip_num_bits)($t3)
/* 0C74C8 800C68C8 3C018013 */ lui $at, %hi(D_8012AAD8) # $at, 0x8013
/* 0C74CC 800C68CC AC20AAD8 */ sw $zero, %lo(D_8012AAD8)($at)
/* 0C74C8 800C68C8 3C018013 */ lui $at, %hi(gHuftTablePos) # $at, 0x8013
/* 0C74CC 800C68CC AC20AAD8 */ sw $zero, %lo(gHuftTablePos)($at)
/* 0C74D0 800C68D0 24080001 */ li $t0, 1
/* 0C74D4 800C68D4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 0C74D8 800C68D8 3C0C800E */ lui $t4, %hi(gzip_inflate_input) # $t4, 0x800e
asm/non_matchings/game_ui/func_8009F034.s
+10 -10
View File
@@ -168,7 +168,7 @@ glabel func_8009F034
/* 09FE34 8009F234 8FAF008C */ lw $t7, 0x8c($sp)
/* 09FE38 8009F238 00003825 */ move $a3, $zero
/* 09FE3C 8009F23C 19E00359 */ blez $t7, .L8009FFA4
/* 09FE40 8009F240 3C188012 */ lui $t8, %hi(D_80126CE0) # $t8, 0x8012
/* 09FE40 8009F240 3C188012 */ lui $t8, %hi(gPlayerHud) # $t8, 0x8012
/* 09FE44 8009F244 3C01C268 */ li $at, 0xC2680000 # -58.000000
/* 09FE48 8009F248 4481E000 */ mtc1 $at, $f28
/* 09FE4C 8009F24C 3C01C2F0 */ li $at, 0xC2F00000 # -120.000000
@@ -182,14 +182,14 @@ glabel func_8009F034
/* 09FE6C 8009F26C 3C013FE8 */ li $at, 0x3FE80000 # 1.812500
/* 09FE70 8009F270 44818800 */ mtc1 $at, $f17
/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86A8 + 4) # $at, 0x800f
/* 09FE78 8009F278 27186CE0 */ addiu $t8, %lo(D_80126CE0) # addiu $t8, $t8, 0x6ce0
/* 09FE78 8009F278 27186CE0 */ addiu $t8, %lo(gPlayerHud) # addiu $t8, $t8, 0x6ce0
/* 09FE7C 8009F27C 3C10800E */ lui $s0, %hi(D_800E25C4) # $s0, 0x800e
/* 09FE80 8009F280 3C098012 */ lui $t1, %hi(gAssetHudElementIds) # $t1, 0x8012
/* 09FE84 8009F284 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012
/* 09FE84 8009F284 3C058012 */ lui $a1, %hi(gCurrentHud) # $a1, 0x8012
/* 09FE88 8009F288 C42F86A8 */ lwc1 $f15, %lo(D_800E86A8)($at)
/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86A8 + 4)($at)
/* 09FE90 8009F290 44808000 */ mtc1 $zero, $f16
/* 09FE94 8009F294 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc
/* 09FE94 8009F294 24A56CDC */ addiu $a1, %lo(gCurrentHud) # addiu $a1, $a1, 0x6cdc
/* 09FE98 8009F298 25296CF0 */ addiu $t1, %lo(gAssetHudElementIds) # addiu $t1, $t1, 0x6cf0
/* 09FE9C 8009F29C 261025C4 */ addiu $s0, %lo(D_800E25C4) # addiu $s0, $s0, 0x25c4
/* 09FEA0 8009F2A0 AFB8006C */ sw $t8, 0x6c($sp)
@@ -681,10 +681,10 @@ glabel func_8009F034
.L8009F9B0:
/* 0A05B0 8009F9B0 0C003936 */ jal is_in_time_trial
/* 0A05B4 8009F9B4 AFA70090 */ sw $a3, 0x90($sp)
/* 0A05B8 8009F9B8 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012
/* 0A05B8 8009F9B8 3C058012 */ lui $a1, %hi(gCurrentHud) # $a1, 0x8012
/* 0A05BC 8009F9BC 8FA70090 */ lw $a3, 0x90($sp)
/* 0A05C0 8009F9C0 10400043 */ beqz $v0, .L8009FAD0
/* 0A05C4 8009F9C4 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc
/* 0A05C4 8009F9C4 24A56CDC */ addiu $a1, %lo(gCurrentHud) # addiu $a1, $a1, 0x6cdc
/* 0A05C8 8009F9C8 8CA40000 */ lw $a0, ($a1)
/* 0A05CC 8009F9CC 00000000 */ nop
/* 0A05D0 8009F9D0 C48600EC */ lwc1 $f6, 0xec($a0)
@@ -757,9 +757,9 @@ glabel func_8009F034
/* 0A06D8 8009FAD8 3C014080 */ li $at, 0x40800000 # 4.000000
/* 0A06DC 8009FADC 44819000 */ mtc1 $at, $f18
/* 0A06E0 8009FAE0 24010008 */ li $at, 8
/* 0A06E4 8009FAE4 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012
/* 0A06E4 8009FAE4 3C058012 */ lui $a1, %hi(gCurrentHud) # $a1, 0x8012
/* 0A06E8 8009FAE8 8FA70090 */ lw $a3, 0x90($sp)
/* 0A06EC 8009FAEC 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc
/* 0A06EC 8009FAEC 24A56CDC */ addiu $a1, %lo(gCurrentHud) # addiu $a1, $a1, 0x6cdc
/* 0A06F0 8009FAF0 240B0002 */ li $t3, 2
/* 0A06F4 8009FAF4 10410006 */ beq $v0, $at, .L8009FB10
/* 0A06F8 8009FAF8 240C0001 */ li $t4, 1
@@ -922,12 +922,12 @@ glabel func_8009F034
/* 0A094C 8009FD4C 44818800 */ mtc1 $at, $f17
/* 0A0950 8009FD50 3C014080 */ li $at, 0x40800000 # 4.000000
/* 0A0954 8009FD54 44819000 */ mtc1 $at, $f18
/* 0A0958 8009FD58 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012
/* 0A0958 8009FD58 3C058012 */ lui $a1, %hi(gCurrentHud) # $a1, 0x8012
/* 0A095C 8009FD5C 8FA70090 */ lw $a3, 0x90($sp)
/* 0A0960 8009FD60 3C098012 */ lui $t1, %hi(gAssetHudElementIds) # $t1, 0x8012
/* 0A0964 8009FD64 44808000 */ mtc1 $zero, $f16
/* 0A0968 8009FD68 25296CF0 */ addiu $t1, %lo(gAssetHudElementIds) # addiu $t1, $t1, 0x6cf0
/* 0A096C 8009FD6C 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc
/* 0A096C 8009FD6C 24A56CDC */ addiu $a1, %lo(gCurrentHud) # addiu $a1, $a1, 0x6cdc
/* 0A0970 8009FD70 3408C000 */ li $t0, 49152
/* 0A0974 8009FD74 240AFFFF */ li $t2, -1
/* 0A0978 8009FD78 240B0002 */ li $t3, 2
asm/non_matchings/game_ui/func_800A003C.s
+2 -2
View File
@@ -66,10 +66,10 @@ glabel func_800A003C
/* 0A0D24 800A0124 1420FFD6 */ bnez $at, .L800A0080
/* 0A0D28 800A0128 26310004 */ addiu $s1, $s1, 4
.L800A012C:
/* 0A0D2C 800A012C 3C048012 */ lui $a0, %hi(D_80126CE0) # $a0, 0x8012
/* 0A0D2C 800A012C 3C048012 */ lui $a0, %hi(gPlayerHud) # $a0, 0x8012
/* 0A0D30 800A0130 3C128012 */ lui $s2, %hi(gAssetHudElements) # $s2, 0x8012
/* 0A0D34 800A0134 3C148012 */ lui $s4, %hi(gAssetHudElementIds) # $s4, 0x8012
/* 0A0D38 800A0138 8C846CE0 */ lw $a0, %lo(D_80126CE0)($a0)
/* 0A0D38 800A0138 8C846CE0 */ lw $a0, %lo(gPlayerHud)($a0)
/* 0A0D3C 800A013C 26946CF0 */ addiu $s4, %lo(gAssetHudElementIds) # addiu $s4, $s4, 0x6cf0
/* 0A0D40 800A0140 0C01C450 */ jal free_from_memory_pool
/* 0A0D44 800A0144 26526CF4 */ addiu $s2, %lo(gAssetHudElements) # addiu $s2, $s2, 0x6cf4
asm/non_matchings/game_ui/func_800A1248.s
+4 -4
View File
@@ -43,9 +43,9 @@ glabel func_800A1248
/* 0A1ED4 800A12D4 19E00029 */ blez $t7, .L800A137C
/* 0A1ED8 800A12D8 02408025 */ move $s0, $s2
/* 0A1EDC 800A12DC 3C01425C */ li $at, 0x425C0000 # 55.000000
/* 0A1EE0 800A12E0 3C128012 */ lui $s2, %hi(D_80126CDC) # $s2, 0x8012
/* 0A1EE0 800A12E0 3C128012 */ lui $s2, %hi(gCurrentHud) # $s2, 0x8012
/* 0A1EE4 800A12E4 4481A000 */ mtc1 $at, $f20
/* 0A1EE8 800A12E8 26526CDC */ addiu $s2, %lo(D_80126CDC) # addiu $s2, $s2, 0x6cdc
/* 0A1EE8 800A12E8 26526CDC */ addiu $s2, %lo(gCurrentHud) # addiu $s2, $s2, 0x6cdc
.L800A12EC:
/* 0A1EEC 800A12EC 8E180000 */ lw $t8, ($s0)
/* 0A1EF0 800A12F0 00000000 */ nop
@@ -85,8 +85,8 @@ glabel func_800A1248
/* 0A1F74 800A1374 1420FFDD */ bnez $at, .L800A12EC
/* 0A1F78 800A1378 00000000 */ nop
.L800A137C:
/* 0A1F7C 800A137C 3C128012 */ lui $s2, %hi(D_80126CDC) # $s2, 0x8012
/* 0A1F80 800A1380 26526CDC */ addiu $s2, %lo(D_80126CDC) # addiu $s2, $s2, 0x6cdc
/* 0A1F7C 800A137C 3C128012 */ lui $s2, %hi(gCurrentHud) # $s2, 0x8012
/* 0A1F80 800A1380 26526CDC */ addiu $s2, %lo(gCurrentHud) # addiu $s2, $s2, 0x6cdc
/* 0A1F84 800A1384 8E420000 */ lw $v0, ($s2)
/* 0A1F88 800A1388 3C01800F */ lui $at, %hi(D_800E8718) # $at, 0x800f
/* 0A1F8C 800A138C C4208718 */ lwc1 $f0, %lo(D_800E8718)($at)
asm/non_matchings/game_ui/func_800A14F0.s
+4 -4
View File
@@ -138,8 +138,8 @@ glabel func_800A14F0
/* 0A22C4 800A16C4 0C01A142 */ jal func_80068508
/* 0A22C8 800A16C8 AFAA005C */ sw $t2, 0x5c($sp)
/* 0A22CC 800A16CC 444DF800 */ cfc1 $t5, $31
/* 0A22D0 800A16D0 3C068012 */ lui $a2, %hi(D_80126CDC) # $a2, 0x8012
/* 0A22D4 800A16D4 24C66CDC */ addiu $a2, %lo(D_80126CDC) # addiu $a2, $a2, 0x6cdc
/* 0A22D0 800A16D0 3C068012 */ lui $a2, %hi(gCurrentHud) # $a2, 0x8012
/* 0A22D4 800A16D4 24C66CDC */ addiu $a2, %lo(gCurrentHud) # addiu $a2, $a2, 0x6cdc
/* 0A22D8 800A16D8 8CC20000 */ lw $v0, ($a2)
/* 0A22DC 800A16DC 35A10003 */ ori $at, $t5, 3
/* 0A22E0 800A16E0 38210002 */ xori $at, $at, 2
@@ -221,7 +221,7 @@ glabel func_800A14F0
/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E8728 + 4)($at)
/* 0A240C 800A180C 3C01425C */ li $at, 0x425C0000 # 55.000000
/* 0A2410 800A1810 3C038012 */ lui $v1, %hi(gNumActivePlayers) # $v1, 0x8012
/* 0A2414 800A1814 3C068012 */ lui $a2, %hi(D_80126CDC) # $a2, 0x8012
/* 0A2414 800A1814 3C068012 */ lui $a2, %hi(gCurrentHud) # $a2, 0x8012
/* 0A2418 800A1818 90636D37 */ lbu $v1, %lo(gNumActivePlayers)($v1)
/* 0A241C 800A181C 44811000 */ mtc1 $at, $f2
/* 0A2420 800A1820 8FA7002C */ lw $a3, 0x2c($sp)
@@ -229,7 +229,7 @@ glabel func_800A14F0
/* 0A2428 800A1828 8FA90054 */ lw $t1, 0x54($sp)
/* 0A242C 800A182C C7AC0018 */ lwc1 $f12, 0x18($sp)
/* 0A2430 800A1830 C7AE0020 */ lwc1 $f14, 0x20($sp)
/* 0A2434 800A1834 24C66CDC */ addiu $a2, %lo(D_80126CDC) # addiu $a2, $a2, 0x6cdc
/* 0A2434 800A1834 24C66CDC */ addiu $a2, %lo(gCurrentHud) # addiu $a2, $a2, 0x6cdc
/* 0A2438 800A1838 2419FFFE */ li $t9, -2
.L800A183C:
/* 0A243C 800A183C 3C01800E */ lui $at, %hi(D_800E2834) # $at, 0x800e
asm/non_matchings/game_ui/func_800A19A4.s
+2 -2
View File
@@ -2,8 +2,8 @@ glabel func_800A19A4
/* 0A25A4 800A19A4 27BDFFB0 */ addiu $sp, $sp, -0x50
/* 0A25A8 800A19A8 AFB20028 */ sw $s2, 0x28($sp)
/* 0A25AC 800A19AC 444EF800 */ cfc1 $t6, $31
/* 0A25B0 800A19B0 3C128012 */ lui $s2, %hi(D_80126CDC) # $s2, 0x8012
/* 0A25B4 800A19B4 26526CDC */ addiu $s2, %lo(D_80126CDC) # addiu $s2, $s2, 0x6cdc
/* 0A25B0 800A19B0 3C128012 */ lui $s2, %hi(gCurrentHud) # $s2, 0x8012
/* 0A25B4 800A19B4 26526CDC */ addiu $s2, %lo(gCurrentHud) # addiu $s2, $s2, 0x6cdc
/* 0A25B8 800A19B8 8E420000 */ lw $v0, ($s2)
/* 0A25BC 800A19BC 35C10003 */ ori $at, $t6, 3
/* 0A25C0 800A19C0 AFBF003C */ sw $ra, 0x3c($sp)
asm/non_matchings/game_ui/func_800A1E48.s
+2 -2
View File
@@ -39,9 +39,9 @@ glabel func_800A1E48
/* 0A2AC0 800A1EC0 8FA7007C */ lw $a3, 0x7c($sp)
/* 0A2AC4 800A1EC4 24010004 */ li $at, 4
/* 0A2AC8 800A1EC8 15E100FA */ bne $t7, $at, .L800A22B4
/* 0A2ACC 800A1ECC 3C108012 */ lui $s0, %hi(D_80126CDC) # $s0, 0x8012
/* 0A2ACC 800A1ECC 3C108012 */ lui $s0, %hi(gCurrentHud) # $s0, 0x8012
/* 0A2AD0 800A1ED0 4458F800 */ cfc1 $t8, $31
/* 0A2AD4 800A1ED4 26106CDC */ addiu $s0, %lo(D_80126CDC) # addiu $s0, $s0, 0x6cdc
/* 0A2AD4 800A1ED4 26106CDC */ addiu $s0, %lo(gCurrentHud) # addiu $s0, $s0, 0x6cdc
/* 0A2AD8 800A1ED8 8E020000 */ lw $v0, ($s0)
/* 0A2ADC 800A1EDC 37010003 */ ori $at, $t8, 3
/* 0A2AE0 800A1EE0 38210002 */ xori $at, $at, 2
asm/non_matchings/game_ui/func_800A22F4.s
+2 -2
View File
@@ -1,12 +1,12 @@
glabel func_800A22F4
/* 0A2EF4 800A22F4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 0A2EF8 800A22F8 AFB00018 */ sw $s0, 0x18($sp)
/* 0A2EFC 800A22FC 3C108012 */ lui $s0, %hi(D_80126CDC) # $s0, 0x8012
/* 0A2EFC 800A22FC 3C108012 */ lui $s0, %hi(gCurrentHud) # $s0, 0x8012
/* 0A2F00 800A2300 AFBF001C */ sw $ra, 0x1c($sp)
/* 0A2F04 800A2304 AFA40020 */ sw $a0, 0x20($sp)
/* 0A2F08 800A2308 AFA50024 */ sw $a1, 0x24($sp)
/* 0A2F0C 800A230C 808F0003 */ lb $t7, 3($a0)
/* 0A2F10 800A2310 26106CDC */ addiu $s0, %lo(D_80126CDC) # addiu $s0, $s0, 0x6cdc
/* 0A2F10 800A2310 26106CDC */ addiu $s0, %lo(gCurrentHud) # addiu $s0, $s0, 0x6cdc
/* 0A2F14 800A2314 8E190000 */ lw $t9, ($s0)
/* 0A2F18 800A2318 25F80038 */ addiu $t8, $t7, 0x38
/* 0A2F1C 800A231C 3C038012 */ lui $v1, %hi(gNumActivePlayers) # $v1, 0x8012
asm/non_matchings/game_ui/func_800A277C.s
+6 -6
View File
@@ -59,8 +59,8 @@ glabel func_800A277C
/* 0A33EC 800A27EC A3AB0090 */ sb $t3, 0x90($sp)
/* 0A33F0 800A27F0 8E0D0000 */ lw $t5, ($s0)
/* 0A33F4 800A27F4 8FA900A8 */ lw $t1, 0xa8($sp)
/* 0A33F8 800A27F8 3C118012 */ lui $s1, %hi(D_80126CDC) # $s1, 0x8012
/* 0A33FC 800A27FC 26316CDC */ addiu $s1, %lo(D_80126CDC) # addiu $s1, $s1, 0x6cdc
/* 0A33F8 800A27F8 3C118012 */ lui $s1, %hi(gCurrentHud) # $s1, 0x8012
/* 0A33FC 800A27FC 26316CDC */ addiu $s1, %lo(gCurrentHud) # addiu $s1, $s1, 0x6cdc
/* 0A3400 800A2800 ADA20050 */ sw $v0, 0x50($t5)
/* 0A3404 800A2804 8E2F0000 */ lw $t7, ($s1)
/* 0A3408 800A2808 240E8000 */ li $t6, -32768
@@ -76,9 +76,9 @@ glabel func_800A277C
/* 0A3430 800A2830 00000000 */ nop
.L800A2834:
/* 0A3434 800A2834 8C780088 */ lw $t8, 0x88($v1)
/* 0A3438 800A2838 3C118012 */ lui $s1, %hi(D_80126CDC) # $s1, 0x8012
/* 0A3438 800A2838 3C118012 */ lui $s1, %hi(gCurrentHud) # $s1, 0x8012
/* 0A343C 800A283C 17000016 */ bnez $t8, .L800A2898
/* 0A3440 800A2840 26316CDC */ addiu $s1, %lo(D_80126CDC) # addiu $s1, $s1, 0x6cdc
/* 0A3440 800A2840 26316CDC */ addiu $s1, %lo(gCurrentHud) # addiu $s1, $s1, 0x6cdc
/* 0A3444 800A2844 3C198012 */ lui $t9, %hi(gAssetHudElementIds) # $t9, 0x8012
/* 0A3448 800A2848 8F396CF0 */ lw $t9, %lo(gAssetHudElementIds)($t9)
/* 0A344C 800A284C 240C0008 */ li $t4, 8
@@ -686,8 +686,8 @@ glabel func_800A277C
/* 0A3D3C 800A313C 00000000 */ nop
/* 0A3D40 800A3140 0C01BAA4 */ jal get_settings
/* 0A3D44 800A3144 00000000 */ nop
/* 0A3D48 800A3148 3C108012 */ lui $s0, %hi(D_80127184) # $s0, 0x8012
/* 0A3D4C 800A314C 26107184 */ addiu $s0, %lo(D_80127184) # addiu $s0, $s0, 0x7184
/* 0A3D48 800A3148 3C108012 */ lui $s0, %hi(gHudSettings) # $s0, 0x8012
/* 0A3D4C 800A314C 26107184 */ addiu $s0, %lo(gHudSettings) # addiu $s0, $s0, 0x7184
/* 0A3D50 800A3150 0C01AF62 */ jal get_current_map_id
/* 0A3D54 800A3154 AE020000 */ sw $v0, ($s0)
/* 0A3D58 800A3158 8FAE00A0 */ lw $t6, 0xa0($sp)
asm/non_matchings/game_ui/func_800A47A0.s
+2 -2
View File
@@ -2,8 +2,8 @@ glabel func_800A47A0
/* 0A53A0 800A47A0 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 0A53A4 800A47A4 AFBE0038 */ sw $fp, 0x38($sp)
/* 0A53A8 800A47A8 444EF800 */ cfc1 $t6, $31
/* 0A53AC 800A47AC 3C1E8012 */ lui $fp, %hi(D_80126CDC) # $fp, 0x8012
/* 0A53B0 800A47B0 27DE6CDC */ addiu $fp, %lo(D_80126CDC) # addiu $fp, $fp, 0x6cdc
/* 0A53AC 800A47AC 3C1E8012 */ lui $fp, %hi(gCurrentHud) # $fp, 0x8012
/* 0A53B0 800A47B0 27DE6CDC */ addiu $fp, %lo(gCurrentHud) # addiu $fp, $fp, 0x6cdc
/* 0A53B4 800A47B4 AFB1001C */ sw $s1, 0x1c($sp)
/* 0A53B8 800A47B8 8FD10000 */ lw $s1, ($fp)
/* 0A53BC 800A47BC 35C10003 */ ori $at, $t6, 3
asm/non_matchings/game_ui/func_800A4C44.s
+10 -10
View File
@@ -29,11 +29,11 @@ glabel func_800A4C44
/* 0A58A8 800A4CA8 00000000 */ nop
/* 0A58AC 800A4CAC 3C0F8012 */ lui $t7, %hi(D_80126D10) # $t7, 0x8012
/* 0A58B0 800A4CB0 8DEF6D10 */ lw $t7, %lo(D_80126D10)($t7)
/* 0A58B4 800A4CB4 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A58B4 800A4CB4 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A58B8 800A4CB8 000FC080 */ sll $t8, $t7, 2
/* 0A58BC 800A4CBC 030FC023 */ subu $t8, $t8, $t7
/* 0A58C0 800A4CC0 0018C0C0 */ sll $t8, $t8, 3
/* 0A58C4 800A4CC4 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A58C4 800A4CC4 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
/* 0A58C8 800A4CC8 0058C821 */ addu $t9, $v0, $t8
/* 0A58CC 800A4CCC 8323005A */ lb $v1, 0x5a($t9)
/* 0A58D0 800A4CD0 8D090000 */ lw $t1, ($t0)
@@ -43,10 +43,10 @@ glabel func_800A4C44
.L800A4CE0:
/* 0A58E0 800A4CE0 3C0A8012 */ lui $t2, %hi(gHUDNumPlayers) # $t2, 0x8012
/* 0A58E4 800A4CE4 8D4A6D0C */ lw $t2, %lo(gHUDNumPlayers)($t2)
/* 0A58E8 800A4CE8 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A58E8 800A4CE8 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A58EC 800A4CEC 29410002 */ slti $at, $t2, 2
/* 0A58F0 800A4CF0 10200017 */ beqz $at, .L800A4D50
/* 0A58F4 800A4CF4 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A58F4 800A4CF4 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
/* 0A58F8 800A4CF8 28610004 */ slti $at, $v1, 4
/* 0A58FC 800A4CFC 10200005 */ beqz $at, .L800A4D14
/* 0A5900 800A4D00 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
@@ -68,9 +68,9 @@ glabel func_800A4C44
/* 0A5938 800A4D38 AFA30034 */ sw $v1, 0x34($sp)
/* 0A593C 800A4D3C 0C02A980 */ jal func_800AA600
/* 0A5940 800A4D40 24E70020 */ addiu $a3, $a3, 0x20
/* 0A5944 800A4D44 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A5944 800A4D44 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A5948 800A4D48 8FA30034 */ lw $v1, 0x34($sp)
/* 0A594C 800A4D4C 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A594C 800A4D4C 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
.L800A4D50:
/* 0A5950 800A4D50 8D0F0000 */ lw $t7, ($t0)
/* 0A5954 800A4D54 3C014300 */ li $at, 0x43000000 # 128.000000
@@ -94,8 +94,8 @@ glabel func_800A4C44
/* 0A599C 800A4D9C 00045400 */ sll $t2, $a0, 0x10
/* 0A59A0 800A4DA0 0C01C1F1 */ jal sins_f
/* 0A59A4 800A4DA4 000A2403 */ sra $a0, $t2, 0x10
/* 0A59A8 800A4DA8 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A59AC 800A4DAC 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A59A8 800A4DA8 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A59AC 800A4DAC 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
/* 0A59B0 800A4DB0 8D020000 */ lw $v0, ($t0)
/* 0A59B4 800A4DB4 3C0142FE */ li $at, 0x42FE0000 # 127.000000
/* 0A59B8 800A4DB8 804D001C */ lb $t5, 0x1c($v0)
@@ -137,8 +137,8 @@ glabel func_800A4C44
/* 0A5A48 800A4E48 8D070000 */ lw $a3, ($t0)
/* 0A5A4C 800A4E4C 0C02A980 */ jal func_800AA600
/* 0A5A50 800A4E50 00000000 */ nop
/* 0A5A54 800A4E54 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A5A58 800A4E58 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A5A54 800A4E54 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A5A58 800A4E58 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
/* 0A5A5C 800A4E5C 8D0E0000 */ lw $t6, ($t0)
/* 0A5A60 800A4E60 C7A80030 */ lwc1 $f8, 0x30($sp)
/* 0A5A64 800A4E64 2405007F */ li $a1, 127
asm/non_matchings/game_ui/func_800A5F18.s
+14 -14
View File
@@ -11,8 +11,8 @@ glabel D_800E8694
.text
glabel func_800A5F18
/* 0A6B18 800A5F18 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 0A6B1C 800A5F1C 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012
/* 0A6B20 800A5F20 8CE76CDC */ lw $a3, %lo(D_80126CDC)($a3)
/* 0A6B1C 800A5F1C 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012
/* 0A6B20 800A5F20 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3)
/* 0A6B24 800A5F24 AFA40028 */ sw $a0, 0x28($sp)
/* 0A6B28 800A5F28 AFBF001C */ sw $ra, 0x1c($sp)
/* 0A6B2C 800A5F2C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
@@ -23,8 +23,8 @@ glabel func_800A5F18
/* 0A6B40 800A5F40 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A6B44 800A5F44 0C02A980 */ jal func_800AA600
/* 0A6B48 800A5F48 24E705E0 */ addiu $a3, $a3, 0x5e0
/* 0A6B4C 800A5F4C 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012
/* 0A6B50 800A5F50 8CE76CDC */ lw $a3, %lo(D_80126CDC)($a3)
/* 0A6B4C 800A5F4C 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012
/* 0A6B50 800A5F50 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3)
/* 0A6B54 800A5F54 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A6B58 800A5F58 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A6B5C 800A5F5C 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
@@ -64,7 +64,7 @@ glabel func_800A5F18
/* 0A6BE0 800A5FE0 8FB90028 */ lw $t9, 0x28($sp)
/* 0A6BE4 800A5FE4 8FB80024 */ lw $t8, 0x24($sp)
/* 0A6BE8 800A5FE8 872801AC */ lh $t0, 0x1ac($t9)
/* 0A6BEC 800A5FEC 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A6BEC 800A5FEC 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A6BF0 800A5FF0 13080078 */ beq $t8, $t0, .L800A61D4
/* 0A6BF4 800A5FF4 3C01420C */ li $at, 0x420C0000 # 35.000000
/* 0A6BF8 800A5FF8 240900FF */ li $t1, 255
@@ -74,8 +74,8 @@ glabel func_800A5F18
/* 0A6C08 800A6008 240600FF */ li $a2, 255
/* 0A6C0C 800A600C 0C0310E1 */ jal set_text_colour
/* 0A6C10 800A6010 00003825 */ move $a3, $zero
/* 0A6C14 800A6014 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A6C18 800A6018 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A6C14 800A6014 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A6C18 800A6018 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A6C1C 800A601C 3C014220 */ li $at, 0x42200000 # 40.000000
/* 0A6C20 800A6020 44813000 */ mtc1 $at, $f6
/* 0A6C24 800A6024 C444016C */ lwc1 $f4, 0x16c($v0)
@@ -105,8 +105,8 @@ glabel func_800A5F18
/* 0A6C84 800A6084 0C031110 */ jal draw_text
/* 0A6C88 800A6088 00000000 */ nop
/* 0A6C8C 800A608C 444CF800 */ cfc1 $t4, $31
/* 0A6C90 800A6090 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A6C94 800A6094 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A6C90 800A6090 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A6C94 800A6094 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A6C98 800A6098 35810003 */ ori $at, $t4, 3
/* 0A6C9C 800A609C 38210002 */ xori $at, $at, 2
/* 0A6CA0 800A60A0 44C1F800 */ ctc1 $at, $31
@@ -129,8 +129,8 @@ glabel func_800A5F18
/* 0A6CE4 800A60E4 44CDF800 */ ctc1 $t5, $31
/* 0A6CE8 800A60E8 0C029FEF */ jal func_800A7FBC
/* 0A6CEC 800A60EC AFAE0010 */ sw $t6, 0x10($sp)
/* 0A6CF0 800A60F0 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A6CF4 800A60F4 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A6CF0 800A60F0 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A6CF4 800A60F4 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A6CF8 800A60F8 3C014220 */ li $at, 0x42200000 # 40.000000
/* 0A6CFC 800A60FC 44819000 */ mtc1 $at, $f18
/* 0A6D00 800A6100 C45002EC */ lwc1 $f16, 0x2ec($v0)
@@ -160,8 +160,8 @@ glabel func_800A5F18
/* 0A6D60 800A6160 0C031110 */ jal draw_text
/* 0A6D64 800A6164 00000000 */ nop
/* 0A6D68 800A6168 4448F800 */ cfc1 $t0, $31
/* 0A6D6C 800A616C 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A6D70 800A6170 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A6D6C 800A616C 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A6D70 800A6170 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A6D74 800A6174 35010003 */ ori $at, $t0, 3
/* 0A6D78 800A6178 38210002 */ xori $at, $at, 2
/* 0A6D7C 800A617C 44C1F800 */ ctc1 $at, $31
@@ -187,7 +187,7 @@ glabel func_800A5F18
/* 0A6DCC 800A61CC 1000001E */ b .L800A6248
/* 0A6DD0 800A61D0 8FBF001C */ lw $ra, 0x1c($sp)
.L800A61D4:
/* 0A6DD4 800A61D4 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A6DD4 800A61D4 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A6DD8 800A61D8 44815000 */ mtc1 $at, $f10
/* 0A6DDC 800A61DC C448016C */ lwc1 $f8, 0x16c($v0)
/* 0A6DE0 800A61E0 C4440170 */ lwc1 $f4, 0x170($v0)
asm/non_matchings/game_ui/func_800A6254.s
+16 -16
View File
@@ -31,8 +31,8 @@ glabel func_800A6254
/* 0A6EA4 800A62A4 AFA70070 */ sw $a3, 0x70($sp)
/* 0A6EA8 800A62A8 8FA70070 */ lw $a3, 0x70($sp)
/* 0A6EAC 800A62AC 1040001B */ beqz $v0, .L800A631C
/* 0A6EB0 800A62B0 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A6EB4 800A62B4 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
/* 0A6EB0 800A62B0 3C098012 */ lui $t1, %hi(gCurrentHud) # $t1, 0x8012
/* 0A6EB4 800A62B4 25296CDC */ addiu $t1, %lo(gCurrentHud) # addiu $t1, $t1, 0x6cdc
/* 0A6EB8 800A62B8 8D220000 */ lw $v0, ($t1)
/* 0A6EBC 800A62BC 3C0142D8 */ li $at, 0x42D80000 # 108.000000
/* 0A6EC0 800A62C0 44810000 */ mtc1 $at, $f0
@@ -59,8 +59,8 @@ glabel func_800A6254
/* 0A6F14 800A6314 46004281 */ sub.s $f10, $f8, $f0
/* 0A6F18 800A6318 E44A02F0 */ swc1 $f10, 0x2f0($v0)
.L800A631C:
/* 0A6F1C 800A631C 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A6F20 800A6320 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
/* 0A6F1C 800A631C 3C098012 */ lui $t1, %hi(gCurrentHud) # $t1, 0x8012
/* 0A6F20 800A6320 25296CDC */ addiu $t1, %lo(gCurrentHud) # addiu $t1, $t1, 0x6cdc
/* 0A6F24 800A6324 8D220000 */ lw $v0, ($t1)
/* 0A6F28 800A6328 3C01420C */ li $at, 0x420C0000 # 35.000000
/* 0A6F2C 800A632C 44810000 */ mtc1 $at, $f0
@@ -92,8 +92,8 @@ glabel func_800A6254
/* 0A6F94 800A6394 A06F000C */ sb $t7, 0xc($v1)
/* 0A6F98 800A6398 A0387189 */ sb $t8, %lo(D_80127189)($at)
.L800A639C:
/* 0A6F9C 800A639C 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A6FA0 800A63A0 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
/* 0A6F9C 800A639C 3C098012 */ lui $t1, %hi(gCurrentHud) # $t1, 0x8012
/* 0A6FA0 800A63A0 25296CDC */ addiu $t1, %lo(gCurrentHud) # addiu $t1, $t1, 0x6cdc
/* 0A6FA4 800A63A4 8D220000 */ lw $v0, ($t1)
/* 0A6FA8 800A63A8 3C03800E */ lui $v1, %hi(D_800E2770) # $v1, 0x800e
/* 0A6FAC 800A63AC 905905FA */ lbu $t9, 0x5fa($v0)
@@ -120,8 +120,8 @@ glabel L800A63D8
/* 0A6FFC 800A63FC 00002825 */ move $a1, $zero
/* 0A7000 800A6400 0C000741 */ jal play_sound_global
/* 0A7004 800A6404 A06D000C */ sb $t5, 0xc($v1)
/* 0A7008 800A6408 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A700C 800A640C 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
/* 0A7008 800A6408 3C098012 */ lui $t1, %hi(gCurrentHud) # $t1, 0x8012
/* 0A700C 800A640C 25296CDC */ addiu $t1, %lo(gCurrentHud) # addiu $t1, $t1, 0x6cdc
/* 0A7010 800A6410 8D220000 */ lw $v0, ($t1)
/* 0A7014 800A6414 8FA70070 */ lw $a3, 0x70($sp)
/* 0A7018 800A6418 00000000 */ nop
@@ -439,8 +439,8 @@ glabel L800A63D8
/* 0A7494 800A6894 27A70038 */ addiu $a3, $sp, 0x38
/* 0A7498 800A6898 0C0165E4 */ jal get_timestamp_from_frames
/* 0A749C 800A689C AFA80048 */ sw $t0, 0x48($sp)
/* 0A74A0 800A68A0 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A74A4 800A68A4 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
/* 0A74A0 800A68A0 3C098012 */ lui $t1, %hi(gCurrentHud) # $t1, 0x8012
/* 0A74A4 800A68A4 25296CDC */ addiu $t1, %lo(gCurrentHud) # addiu $t1, $t1, 0x6cdc
/* 0A74A8 800A68A8 8D2C0000 */ lw $t4, ($t1)
/* 0A74AC 800A68AC 8FAB0040 */ lw $t3, 0x40($sp)
/* 0A74B0 800A68B0 27A50040 */ addiu $a1, $sp, 0x40
@@ -456,8 +456,8 @@ glabel L800A63D8
/* 0A74D8 800A68D8 8FA40048 */ lw $a0, 0x48($sp)
/* 0A74DC 800A68DC 0C0165E4 */ jal get_timestamp_from_frames
/* 0A74E0 800A68E0 00000000 */ nop
/* 0A74E4 800A68E4 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A74E8 800A68E8 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
/* 0A74E4 800A68E4 3C098012 */ lui $t1, %hi(gCurrentHud) # $t1, 0x8012
/* 0A74E8 800A68E8 25296CDC */ addiu $t1, %lo(gCurrentHud) # addiu $t1, $t1, 0x6cdc
/* 0A74EC 800A68EC 8D2A0000 */ lw $t2, ($t1)
/* 0A74F0 800A68F0 8FB90040 */ lw $t9, 0x40($sp)
/* 0A74F4 800A68F4 00000000 */ nop
@@ -689,11 +689,11 @@ glabel L800A6BCC
/* 0A7840 800A6C40 0C027B20 */ jal is_in_two_player_adventure
/* 0A7844 800A6C44 AFA70070 */ sw $a3, 0x70($sp)
/* 0A7848 800A6C48 8FA70070 */ lw $a3, 0x70($sp)
/* 0A784C 800A6C4C 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A784C 800A6C4C 3C098012 */ lui $t1, %hi(gCurrentHud) # $t1, 0x8012
/* 0A7850 800A6C50 1040000D */ beqz $v0, .L800A6C88
/* 0A7854 800A6C54 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
/* 0A7858 800A6C58 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A785C 800A6C5C 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A7854 800A6C54 25296CDC */ addiu $t1, %lo(gCurrentHud) # addiu $t1, $t1, 0x6cdc
/* 0A7858 800A6C58 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A785C 800A6C5C 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A7860 800A6C60 00000000 */ nop
/* 0A7864 800A6C64 240C0003 */ li $t4, 3
.L800A6C68:
asm/non_matchings/game_ui/func_800A6E30.s
+10 -10
View File
@@ -4,8 +4,8 @@ glabel jpt_800E8768
.text
glabel func_800A6E30
/* 0A7A30 800A6E30 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A7A34 800A6E34 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A7A30 800A6E30 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A7A34 800A6E34 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
/* 0A7A38 800A6E38 8D020000 */ lw $v0, ($t0)
/* 0A7A3C 800A6E3C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0A7A40 800A6E40 AFBF0014 */ sw $ra, 0x14($sp)
@@ -35,9 +35,9 @@ glabel L800A6E70
/* 0A7A9C 800A6E9C 3C038012 */ lui $v1, %hi(gHUDNumPlayers) # $v1, 0x8012
/* 0A7AA0 800A6EA0 8C636D0C */ lw $v1, %lo(gHUDNumPlayers)($v1)
/* 0A7AA4 800A6EA4 8FA60018 */ lw $a2, 0x18($sp)
/* 0A7AA8 800A6EA8 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A7AA8 800A6EA8 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A7AAC 800A6EAC 10600003 */ beqz $v1, .L800A6EBC
/* 0A7AB0 800A6EB0 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A7AB0 800A6EB0 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
/* 0A7AB4 800A6EB4 24010001 */ li $at, 1
/* 0A7AB8 800A6EB8 14610008 */ bne $v1, $at, .L800A6EDC
.L800A6EBC:
@@ -120,8 +120,8 @@ glabel L800A6F3C
/* 0A7BD4 800A6FD4 00000000 */ nop
/* 0A7BD8 800A6FD8 0C029B6D */ jal play_time_trial_end_message
/* 0A7BDC 800A6FDC 00C02025 */ move $a0, $a2
/* 0A7BE0 800A6FE0 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A7BE4 800A6FE4 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A7BE0 800A6FE0 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A7BE4 800A6FE4 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
.L800A6FE8:
/* 0A7BE8 800A6FE8 8D070000 */ lw $a3, ($t0)
/* 0A7BEC 800A6FEC 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
@@ -175,8 +175,8 @@ glabel L800A7014
.L800A7098:
/* 0A7C98 800A7098 0C000741 */ jal play_sound_global
/* 0A7C9C 800A709C 00002825 */ move $a1, $zero
/* 0A7CA0 800A70A0 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A7CA4 800A70A4 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A7CA0 800A70A0 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A7CA4 800A70A4 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A7CA8 800A70A8 00000000 */ nop
.L800A70AC:
/* 0A7CAC 800A70AC 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
@@ -216,8 +216,8 @@ glabel L800A70D4
/* 0A7D30 800A7130 45000005 */ bc1f .L800A7148
/* 0A7D34 800A7134 00000000 */ nop
/* 0A7D38 800A7138 A04A01DA */ sb $t2, 0x1da($v0)
/* 0A7D3C 800A713C 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012
/* 0A7D40 800A7140 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0)
/* 0A7D3C 800A713C 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012
/* 0A7D40 800A7140 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0)
/* 0A7D44 800A7144 00000000 */ nop
.L800A7148:
/* 0A7D48 800A7148 0C02A980 */ jal func_800AA600
asm/non_matchings/game_ui/func_800A718C.s
+12 -12
View File
@@ -18,8 +18,8 @@ glabel func_800A718C
/* 0A7DC4 800A71C4 00000000 */ nop
/* 0A7DC8 800A71C8 332A0004 */ andi $t2, $t9, 4
/* 0A7DCC 800A71CC 11400004 */ beqz $t2, .L800A71E0
/* 0A7DD0 800A71D0 3C0C8012 */ lui $t4, %hi(D_80126CDC) # $t4, 0x8012
/* 0A7DD4 800A71D4 8D8C6CDC */ lw $t4, %lo(D_80126CDC)($t4)
/* 0A7DD0 800A71D0 3C0C8012 */ lui $t4, %hi(gCurrentHud) # $t4, 0x8012
/* 0A7DD4 800A71D4 8D8C6CDC */ lw $t4, %lo(gCurrentHud)($t4)
/* 0A7DD8 800A71D8 240B0045 */ li $t3, 69
/* 0A7DDC 800A71DC A58B0266 */ sh $t3, 0x266($t4)
.L800A71E0:
@@ -91,8 +91,8 @@ glabel func_800A718C
/* 0A7ED0 800A72D0 1040001D */ beqz $v0, .L800A7348
/* 0A7ED4 800A72D4 00000000 */ nop
/* 0A7ED8 800A72D8 0069001A */ div $zero, $v1, $t1
/* 0A7EDC 800A72DC 3C088012 */ lui $t0, %hi(D_80126CDC) # $t0, 0x8012
/* 0A7EE0 800A72E0 25086CDC */ addiu $t0, %lo(D_80126CDC) # addiu $t0, $t0, 0x6cdc
/* 0A7EDC 800A72DC 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012
/* 0A7EE0 800A72E0 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc
/* 0A7EE4 800A72E4 8D0B0000 */ lw $t3, ($t0)
/* 0A7EE8 800A72E8 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A7EEC 800A72EC A56202B8 */ sh $v0, 0x2b8($t3)
@@ -122,8 +122,8 @@ glabel func_800A718C
/* 0A7F44 800A7344 00000000 */ nop
.L800A7348:
/* 0A7F48 800A7348 0069001A */ div $zero, $v1, $t1
/* 0A7F4C 800A734C 3C0F8012 */ lui $t7, %hi(D_80126CDC) # $t7, 0x8012
/* 0A7F50 800A7350 8DEF6CDC */ lw $t7, %lo(D_80126CDC)($t7)
/* 0A7F4C 800A734C 3C0F8012 */ lui $t7, %hi(gCurrentHud) # $t7, 0x8012
/* 0A7F50 800A7350 8DEF6CDC */ lw $t7, %lo(gCurrentHud)($t7)
/* 0A7F54 800A7354 15200002 */ bnez $t1, .L800A7360
/* 0A7F58 800A7358 00000000 */ nop
/* 0A7F5C 800A735C 0007000D */ break 7
@@ -139,8 +139,8 @@ glabel func_800A718C
/* 0A7F7C 800A737C A5EE02B8 */ sh $t6, 0x2b8($t7)
/* 0A7F80 800A7380 00000000 */ nop
.L800A7384:
/* 0A7F84 800A7384 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012
/* 0A7F88 800A7388 8CE76CDC */ lw $a3, %lo(D_80126CDC)($a3)
/* 0A7F84 800A7384 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012
/* 0A7F88 800A7388 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3)
/* 0A7F8C 800A738C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A7F90 800A7390 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A7F94 800A7394 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
@@ -159,8 +159,8 @@ glabel func_800A718C
/* 0A7FC8 800A73C8 0C01EFC7 */ jal func_8007BF1C
/* 0A7FCC 800A73CC 24040001 */ li $a0, 1
.L800A73D0:
/* 0A7FD0 800A73D0 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012
/* 0A7FD4 800A73D4 8CE76CDC */ lw $a3, %lo(D_80126CDC)($a3)
/* 0A7FD0 800A73D0 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012
/* 0A7FD4 800A73D4 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3)
/* 0A7FD8 800A73D8 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A7FDC 800A73DC 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A7FE0 800A73E0 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
@@ -173,8 +173,8 @@ glabel func_800A718C
/* 0A7FFC 800A73FC 00002025 */ move $a0, $zero
/* 0A8000 800A7400 0C019826 */ jal set_viewport_tv_type
/* 0A8004 800A7404 00002025 */ move $a0, $zero
/* 0A8008 800A7408 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012
/* 0A800C 800A740C 8CE76CDC */ lw $a3, %lo(D_80126CDC)($a3)
/* 0A8008 800A7408 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012
/* 0A800C 800A740C 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3)
/* 0A8010 800A7410 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A8014 800A7414 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A8018 800A7418 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
asm/non_matchings/game_ui/func_800A7A60.s
+4 -4
View File
@@ -10,13 +10,13 @@ glabel func_800A7A60
/* 0A8680 800A7A80 0C019888 */ jal get_current_viewport
/* 0A8684 800A7A84 AFA30024 */ sw $v1, 0x24($sp)
/* 0A8688 800A7A88 8FA30024 */ lw $v1, 0x24($sp)
/* 0A868C 800A7A8C 3C078012 */ lui $a3, %hi(D_80126CDC) # $a3, 0x8012
/* 0A868C 800A7A8C 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012
/* 0A8690 800A7A90 846F0000 */ lh $t7, ($v1)
/* 0A8694 800A7A94 00000000 */ nop
/* 0A8698 800A7A98 144F0030 */ bne $v0, $t7, .L800A7B5C
/* 0A869C 800A7A9C 8FBF001C */ lw $ra, 0x1c($sp)
/* 0A86A0 800A7AA0 8C780140 */ lw $t8, 0x140($v1)
/* 0A86A4 800A7AA4 8CE76CDC */ lw $a3, %lo(D_80126CDC)($a3)
/* 0A86A4 800A7AA4 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3)
/* 0A86A8 800A7AA8 C704000C */ lwc1 $f4, 0xc($t8)
/* 0A86AC 800A7AAC 84E60226 */ lh $a2, 0x226($a3)
/* 0A86B0 800A7AB0 E4E4022C */ swc1 $f4, 0x22c($a3)
@@ -28,7 +28,7 @@ glabel func_800A7A60
/* 0A86C8 800A7AC8 8C680140 */ lw $t0, 0x140($v1)
/* 0A86CC 800A7ACC 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A86D0 800A7AD0 C5080014 */ lwc1 $f8, 0x14($t0)
/* 0A86D4 800A7AD4 3C0C8012 */ lui $t4, %hi(D_80126CD8) # $t4, 0x8012
/* 0A86D4 800A7AD4 3C0C8012 */ lui $t4, %hi(gAssetHudElementStaleCounter) # $t4, 0x8012
/* 0A86D8 800A7AD8 E4E80234 */ swc1 $f8, 0x234($a3)
/* 0A86DC 800A7ADC 8D296CF4 */ lw $t1, %lo(gAssetHudElements)($t1)
/* 0A86E0 800A7AE0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
@@ -37,7 +37,7 @@ glabel func_800A7A60
/* 0A86EC 800A7AEC 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A86F0 800A7AF0 10400019 */ beqz $v0, .L800A7B58
/* 0A86F4 800A7AF4 24E70220 */ addiu $a3, $a3, 0x220
/* 0A86F8 800A7AF8 8D8C6CD8 */ lw $t4, %lo(D_80126CD8)($t4)
/* 0A86F8 800A7AF8 8D8C6CD8 */ lw $t4, %lo(gAssetHudElementStaleCounter)($t4)
/* 0A86FC 800A7AFC 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A8700 800A7B00 01866821 */ addu $t5, $t4, $a2
/* 0A8704 800A7B04 A1A00000 */ sb $zero, ($t5)
asm/non_matchings/game_ui/func_800AA600.s
+2 -2
View File
@@ -123,8 +123,8 @@ glabel func_800AA600
/* 0AB3AC 800AA7AC 00000000 */ nop
/* 0AB3B0 800AA7B0 11E00203 */ beqz $t7, .L800AAFC0
.L800AA7B4:
/* 0AB3B4 800AA7B4 3C198012 */ lui $t9, %hi(D_80126CD8) # $t9, 0x8012
/* 0AB3B8 800AA7B8 8F396CD8 */ lw $t9, %lo(D_80126CD8)($t9)
/* 0AB3B4 800AA7B4 3C198012 */ lui $t9, %hi(gAssetHudElementStaleCounter) # $t9, 0x8012
/* 0AB3B8 800AA7B8 8F396CD8 */ lw $t9, %lo(gAssetHudElementStaleCounter)($t9)
/* 0AB3BC 800AA7BC 3C018012 */ lui $at, %hi(gHUDCurrDisplayList) # $at, 0x8012
/* 0AB3C0 800AA7C0 0328C021 */ addu $t8, $t9, $t0
/* 0AB3C4 800AA7C4 A3000000 */ sb $zero, ($t8)
asm/non_matchings/lights/func_80031CAC.s
+6 -6
View File
@@ -1,16 +1,16 @@
glabel func_80031CAC
/* 0328AC 80031CAC 3C03800E */ lui $v1, %hi(D_800DC95C) # $v1, 0x800e
/* 0328B0 80031CB0 2463C95C */ addiu $v1, %lo(D_800DC95C) # addiu $v1, $v1, -0x36a4
/* 0328B4 80031CB4 3C0E800E */ lui $t6, %hi(D_800DC958) # $t6, 0x800e
/* 0328B8 80031CB8 8DCEC958 */ lw $t6, %lo(D_800DC958)($t6)
/* 0328AC 80031CAC 3C03800E */ lui $v1, %hi(gNumActiveLights) # $v1, 0x800e
/* 0328B0 80031CB0 2463C95C */ addiu $v1, %lo(gNumActiveLights) # addiu $v1, $v1, -0x36a4
/* 0328B4 80031CB4 3C0E800E */ lui $t6, %hi(gMaxLights) # $t6, 0x800e
/* 0328B8 80031CB8 8DCEC958 */ lw $t6, %lo(gMaxLights)($t6)
/* 0328BC 80031CBC 8C620000 */ lw $v0, ($v1)
/* 0328C0 80031CC0 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 0328C4 80031CC4 004E082A */ slt $at, $v0, $t6
/* 0328C8 80031CC8 AFBF0014 */ sw $ra, 0x14($sp)
/* 0328CC 80031CCC 102000AA */ beqz $at, .L80031F78
/* 0328D0 80031CD0 00003025 */ move $a2, $zero
/* 0328D4 80031CD4 3C0F800E */ lui $t7, %hi(D_800DC950) # $t7, 0x800e
/* 0328D8 80031CD8 8DEFC950 */ lw $t7, %lo(D_800DC950)($t7)
/* 0328D4 80031CD4 3C0F800E */ lui $t7, %hi(gActiveLights) # $t7, 0x800e
/* 0328D8 80031CD8 8DEFC950 */ lw $t7, %lo(gActiveLights)($t7)
/* 0328DC 80031CDC 0002C080 */ sll $t8, $v0, 2
/* 0328E0 80031CE0 01F8C821 */ addu $t9, $t7, $t8
/* 0328E4 80031CE4 8F260000 */ lw $a2, ($t9)
asm/non_matchings/lights/func_80032C7C.s
+16 -16
View File
@@ -27,7 +27,7 @@ glabel func_80032C7C
/* 0338E0 80032CE0 80620053 */ lb $v0, 0x53($v1)
/* 0338E4 80032CE4 24010001 */ li $at, 1
/* 0338E8 80032CE8 10400009 */ beqz $v0, .L80032D10
/* 0338EC 80032CEC 3C178012 */ lui $s7, %hi(D_8011D4CC) # $s7, 0x8012
/* 0338EC 80032CEC 3C178012 */ lui $s7, %hi(gLightDiffZ) # $s7, 0x8012
/* 0338F0 80032CF0 10410009 */ beq $v0, $at, .L80032D18
/* 0338F4 80032CF4 24010002 */ li $at, 2
/* 0338F8 80032CF8 10410009 */ beq $v0, $at, .L80032D20
@@ -56,7 +56,7 @@ glabel func_80032C7C
/* 033944 80032D44 2631C968 */ addiu $s1, %lo(D_800DC968) # addiu $s1, $s1, -0x3698
/* 033948 80032D48 44CFF800 */ ctc1 $t7, $31
/* 03394C 80032D4C 44183000 */ mfc1 $t8, $f6
/* 033950 80032D50 3C0D800E */ lui $t5, %hi(D_800DC95C) # $t5, 0x800e
/* 033950 80032D50 3C0D800E */ lui $t5, %hi(gNumActiveLights) # $t5, 0x800e
/* 033954 80032D54 4459F800 */ cfc1 $t9, $31
/* 033958 80032D58 A7B80082 */ sh $t8, 0x82($sp)
/* 03395C 80032D5C 37210003 */ ori $at, $t9, 3
@@ -68,7 +68,7 @@ glabel func_80032C7C
/* 033974 80032D74 00001025 */ move $v0, $zero
/* 033978 80032D78 44D9F800 */ ctc1 $t9, $31
/* 03397C 80032D7C 440A5000 */ mfc1 $t2, $f10
/* 033980 80032D80 26F7D4CC */ addiu $s7, %lo(D_8011D4CC) # addiu $s7, $s7, -0x2b34
/* 033980 80032D80 26F7D4CC */ addiu $s7, %lo(gLightDiffZ) # addiu $s7, $s7, -0x2b34
/* 033984 80032D84 444BF800 */ cfc1 $t3, $31
/* 033988 80032D88 A7AA0080 */ sh $t2, 0x80($sp)
/* 03398C 80032D8C 35610003 */ ori $at, $t3, 3
@@ -77,26 +77,26 @@ glabel func_80032C7C
/* 033998 80032D98 C7D00014 */ lwc1 $f16, 0x14($fp)
/* 03399C 80032D9C AE200000 */ sw $zero, ($s1)
/* 0339A0 80032DA0 460084A4 */ cvt.w.s $f18, $f16
/* 0339A4 80032DA4 8DADC95C */ lw $t5, %lo(D_800DC95C)($t5)
/* 0339A4 80032DA4 8DADC95C */ lw $t5, %lo(gNumActiveLights)($t5)
/* 0339A8 80032DA8 440C9000 */ mfc1 $t4, $f18
/* 0339AC 80032DAC 44CBF800 */ ctc1 $t3, $31
/* 0339B0 80032DB0 19A00137 */ blez $t5, .L80033290
/* 0339B4 80032DB4 A7AC007E */ sh $t4, 0x7e($sp)
/* 0339B8 80032DB8 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 0339BC 80032DBC 3C168012 */ lui $s6, %hi(D_8011D4C4) # $s6, 0x8012
/* 0339C0 80032DC0 3C148012 */ lui $s4, %hi(D_8011D4C8) # $s4, 0x8012
/* 0339BC 80032DBC 3C168012 */ lui $s6, %hi(gLightDiffX) # $s6, 0x8012
/* 0339C0 80032DC0 3C148012 */ lui $s4, %hi(gLightDiffY) # $s4, 0x8012
/* 0339C4 80032DC4 3C13800E */ lui $s3, %hi(D_800DC960) # $s3, 0x800e
/* 0339C8 80032DC8 4481C000 */ mtc1 $at, $f24
/* 0339CC 80032DCC 4480D000 */ mtc1 $zero, $f26
/* 0339D0 80032DD0 4480B000 */ mtc1 $zero, $f22
/* 0339D4 80032DD4 2673C960 */ addiu $s3, %lo(D_800DC960) # addiu $s3, $s3, -0x36a0
/* 0339D8 80032DD8 2694D4C8 */ addiu $s4, %lo(D_8011D4C8) # addiu $s4, $s4, -0x2b38
/* 0339DC 80032DDC 26D6D4C4 */ addiu $s6, %lo(D_8011D4C4) # addiu $s6, $s6, -0x2b3c
/* 0339D8 80032DD8 2694D4C8 */ addiu $s4, %lo(gLightDiffY) # addiu $s4, $s4, -0x2b38
/* 0339DC 80032DDC 26D6D4C4 */ addiu $s6, %lo(gLightDiffX) # addiu $s6, $s6, -0x2b3c
/* 0339E0 80032DE0 AFA30064 */ sw $v1, 0x64($sp)
/* 0339E4 80032DE4 24120014 */ li $s2, 20
.L80032DE8:
/* 0339E8 80032DE8 3C0E800E */ lui $t6, %hi(D_800DC950) # $t6, 0x800e
/* 0339EC 80032DEC 8DCEC950 */ lw $t6, %lo(D_800DC950)($t6)
/* 0339E8 80032DE8 3C0E800E */ lui $t6, %hi(gActiveLights) # $t6, 0x800e
/* 0339EC 80032DEC 8DCEC950 */ lw $t6, %lo(gActiveLights)($t6)
/* 0339F0 80032DF0 8FB90064 */ lw $t9, 0x64($sp)
/* 0339F4 80032DF4 01C27821 */ addu $t7, $t6, $v0
/* 0339F8 80032DF8 8DF00000 */ lw $s0, ($t7)
@@ -223,13 +223,13 @@ glabel func_80032C7C
/* 033BD4 80032FD4 C6820000 */ lwc1 $f2, ($s4)
/* 033BD8 80032FD8 46000282 */ mul.s $f10, $f0, $f0
/* 033BDC 80032FDC C6EC0000 */ lwc1 $f12, ($s7)
/* 033BE0 80032FE0 3C018012 */ lui $at, %hi(D_8011D4C0) # $at, 0x8012
/* 033BE0 80032FE0 3C018012 */ lui $at, %hi(gLightDistance) # $at, 0x8012
/* 033BE4 80032FE4 46021402 */ mul.s $f16, $f2, $f2
/* 033BE8 80032FE8 00000000 */ nop
/* 033BEC 80032FEC 460C6102 */ mul.s $f4, $f12, $f12
/* 033BF0 80032FF0 46105480 */ add.s $f18, $f10, $f16
/* 033BF4 80032FF4 46049180 */ add.s $f6, $f18, $f4
/* 033BF8 80032FF8 E426D4C0 */ swc1 $f6, %lo(D_8011D4C0)($at)
/* 033BF8 80032FF8 E426D4C0 */ swc1 $f6, %lo(gLightDistance)($at)
/* 033BFC 80032FFC C6080068 */ lwc1 $f8, 0x68($s0)
/* 033C00 80033000 00000000 */ nop
/* 033C04 80033004 4608303C */ c.lt.s $f6, $f8
@@ -263,12 +263,12 @@ glabel func_80032C7C
/* 033C6C 8003306C 45000082 */ bc1f .L80033278
/* 033C70 80033070 00000000 */ nop
/* 033C74 80033074 8FCA0040 */ lw $t2, 0x40($fp)
/* 033C78 80033078 3C018012 */ lui $at, %hi(D_8011D4C0) # $at, 0x8012
/* 033C78 80033078 3C018012 */ lui $at, %hi(gLightDistance) # $at, 0x8012
/* 033C7C 8003307C 914F0071 */ lbu $t7, 0x71($t2)
/* 033C80 80033080 00000000 */ nop
/* 033C84 80033084 11E00033 */ beqz $t7, .L80033154
/* 033C88 80033088 00000000 */ nop
/* 033C8C 8003308C C42CD4C0 */ lwc1 $f12, %lo(D_8011D4C0)($at)
/* 033C8C 8003308C C42CD4C0 */ lwc1 $f12, %lo(gLightDistance)($at)
/* 033C90 80033090 3C01BF80 */ li $at, 0xBF800000 # -1.000000
/* 033C94 80033094 460CB03C */ c.lt.s $f22, $f12
/* 033C98 80033098 00000000 */ nop
@@ -398,8 +398,8 @@ glabel func_80032C7C
/* 033E70 80033270 270F0001 */ addiu $t7, $t8, 1
/* 033E74 80033274 AE2F0000 */ sw $t7, ($s1)
.L80033278:
/* 033E78 80033278 3C0B800E */ lui $t3, %hi(D_800DC95C) # $t3, 0x800e
/* 033E7C 8003327C 8D6BC95C */ lw $t3, %lo(D_800DC95C)($t3)
/* 033E78 80033278 3C0B800E */ lui $t3, %hi(gNumActiveLights) # $t3, 0x800e
/* 033E7C 8003327C 8D6BC95C */ lw $t3, %lo(gNumActiveLights)($t3)
/* 033E80 80033280 26B50001 */ addiu $s5, $s5, 1
/* 033E84 80033284 02AB082A */ slt $at, $s5, $t3
/* 033E88 80033288 1420FED7 */ bnez $at, .L80032DE8
asm/non_matchings/lights/setup_lights.s
+6 -6
View File
@@ -4,21 +4,21 @@ glabel setup_lights
/* 0327C0 80031BC0 0C00C6D8 */ jal free_lights
/* 0327C4 80031BC4 AFA40018 */ sw $a0, 0x18($sp)
/* 0327C8 80031BC8 8FAE0018 */ lw $t6, 0x18($sp)
/* 0327CC 80031BCC 3C06800E */ lui $a2, %hi(D_800DC958) # $a2, 0x800e
/* 0327CC 80031BCC 3C06800E */ lui $a2, %hi(gMaxLights) # $a2, 0x800e
/* 0327D0 80031BD0 000E7880 */ sll $t7, $t6, 2
/* 0327D4 80031BD4 01EE7823 */ subu $t7, $t7, $t6
/* 0327D8 80031BD8 000F7880 */ sll $t7, $t7, 2
/* 0327DC 80031BDC 01EE7823 */ subu $t7, $t7, $t6
/* 0327E0 80031BE0 000F7880 */ sll $t7, $t7, 2
/* 0327E4 80031BE4 24C6C958 */ addiu $a2, %lo(D_800DC958) # addiu $a2, $a2, -0x36a8
/* 0327E4 80031BE4 24C6C958 */ addiu $a2, %lo(gMaxLights) # addiu $a2, $a2, -0x36a8
/* 0327E8 80031BE8 3C05FF00 */ lui $a1, (0xFF00FFFF >> 16) # lui $a1, 0xff00
/* 0327EC 80031BEC 01EE7823 */ subu $t7, $t7, $t6
/* 0327F0 80031BF0 000F2080 */ sll $a0, $t7, 2
/* 0327F4 80031BF4 34A5FFFF */ ori $a1, (0xFF00FFFF & 0xFFFF) # ori $a1, $a1, 0xffff
/* 0327F8 80031BF8 0C01C327 */ jal allocate_from_main_pool_safe
/* 0327FC 80031BFC ACCE0000 */ sw $t6, ($a2)
/* 032800 80031C00 3C06800E */ lui $a2, %hi(D_800DC958) # $a2, 0x800e
/* 032804 80031C04 24C6C958 */ addiu $a2, %lo(D_800DC958) # addiu $a2, $a2, -0x36a8
/* 032800 80031C00 3C06800E */ lui $a2, %hi(gMaxLights) # $a2, 0x800e
/* 032804 80031C04 24C6C958 */ addiu $a2, %lo(gMaxLights) # addiu $a2, $a2, -0x36a8
/* 032808 80031C08 8CC80000 */ lw $t0, ($a2)
/* 03280C 80031C0C 3C05800E */ lui $a1, %hi(D_800DC954) # $a1, 0x800e
/* 032810 80031C10 00085900 */ sll $t3, $t0, 4
@@ -27,12 +27,12 @@ glabel setup_lights
/* 03281C 80031C1C 0058C821 */ addu $t9, $v0, $t8
/* 032820 80031C20 000B58C0 */ sll $t3, $t3, 3
/* 032824 80031C24 00087080 */ sll $t6, $t0, 2
/* 032828 80031C28 3C07800E */ lui $a3, %hi(D_800DC950) # $a3, 0x800e
/* 032828 80031C28 3C07800E */ lui $a3, %hi(gActiveLights) # $a3, 0x800e
/* 03282C 80031C2C 3C09800E */ lui $t1, %hi(D_800DC960) # $t1, 0x800e
/* 032830 80031C30 032B6021 */ addu $t4, $t9, $t3
/* 032834 80031C34 01C87021 */ addu $t6, $t6, $t0
/* 032838 80031C38 2529C960 */ addiu $t1, %lo(D_800DC960) # addiu $t1, $t1, -0x36a0
/* 03283C 80031C3C 24E7C950 */ addiu $a3, %lo(D_800DC950) # addiu $a3, $a3, -0x36b0
/* 03283C 80031C3C 24E7C950 */ addiu $a3, %lo(gActiveLights) # addiu $a3, $a3, -0x36b0
/* 032840 80031C40 24A5C954 */ addiu $a1, %lo(D_800DC954) # addiu $a1, $a1, -0x36ac
/* 032844 80031C44 000E7080 */ sll $t6, $t6, 2
/* 032848 80031C48 ACE20000 */ sw $v0, ($a3)

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