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

I finally defeated every avoidable warning (#335)

Browse Source 
* silver coin labels

* match obj_loop_log

* better

* match obj_loop_modechange

* nonmatching obj_loop_fireball_octoweapon

* fix racer.c warnings

* match obj_loop_fireball_octoweapon

* Update object_functions.c

* match obj_loop_lasergun

* unknown_0255E0.c warnings fixed

* asset_loading.c warnings too

* laser gun labels

* quick fixes

* match func_8003F0F8

* prelim

* match func_8000E4E8

* warnings are dead

* quick fixes

* Update math_util.c

* reee
This commit is contained in:
Fazana
2022-12-10 22:42:50 +00:00
committed by GitHub
parent a1db49eecf
commit 965aa1f33e
58 changed files with 724 additions and 806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/game_ui/func_800A19A4.s
+4 -4
View File
@@ -45,8 +45,8 @@ glabel func_800A19A4
/* 0A264C 800A1A4C 8E470000 */ lw $a3, ($s2)
/* 0A2650 800A1A50 3C148012 */ lui $s4, %hi(gHUDCurrDisplayList) # $s4, 0x8012
/* 0A2654 800A1A54 3C158012 */ lui $s5, %hi(gHUDCurrMatrix) # $s5, 0x8012
/* 0A2658 800A1A58 3C168012 */ lui $s6, %hi(gHUDCurrTriList) # $s6, 0x8012
/* 0A265C 800A1A5C 26C66D04 */ addiu $a2, $s6, %lo(gHUDCurrTriList)
/* 0A2658 800A1A58 3C168012 */ lui $s6, %hi(gHUDCurrVertex) # $s6, 0x8012
/* 0A265C 800A1A5C 26C66D04 */ addiu $a2, $s6, %lo(gHUDCurrVertex)
/* 0A2660 800A1A60 26A56D00 */ addiu $a1, $s5, %lo(gHUDCurrMatrix)
/* 0A2664 800A1A64 26846CFC */ addiu $a0, $s4, %lo(gHUDCurrDisplayList)
/* 0A2668 800A1A68 24110003 */ li $s1, 3
@@ -57,8 +57,8 @@ glabel func_800A19A4
/* 0A2678 800A1A78 3C148012 */ lui $s4, %hi(gHUDCurrDisplayList) # $s4, 0x8012
/* 0A267C 800A1A7C 8142067A */ lb $v0, 0x67a($t2)
/* 0A2680 800A1A80 3C158012 */ lui $s5, %hi(gHUDCurrMatrix) # $s5, 0x8012
/* 0A2684 800A1A84 3C168012 */ lui $s6, %hi(gHUDCurrTriList) # $s6, 0x8012
/* 0A2688 800A1A88 26D66D04 */ addiu $s6, %lo(gHUDCurrTriList) # addiu $s6, $s6, 0x6d04
/* 0A2684 800A1A84 3C168012 */ lui $s6, %hi(gHUDCurrVertex) # $s6, 0x8012
/* 0A2688 800A1A88 26D66D04 */ addiu $s6, %lo(gHUDCurrVertex) # addiu $s6, $s6, 0x6d04
/* 0A268C 800A1A8C 26B56D00 */ addiu $s5, %lo(gHUDCurrMatrix) # addiu $s5, $s5, 0x6d00
/* 0A2690 800A1A90 04410005 */ bgez $v0, .L800A1AA8
/* 0A2694 800A1A94 26946CFC */ addiu $s4, %lo(gHUDCurrDisplayList) # addiu $s4, $s4, 0x6cfc
asm/non_matchings/game_ui/func_800A22F4.s
+10 -10
View File
@@ -31,8 +31,8 @@ glabel func_800A22F4
/* 0A2F64 800A2364 8E070000 */ lw $a3, ($s0)
/* 0A2F68 800A2368 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A2F6C 800A236C 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A2F70 800A2370 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A2F74 800A2374 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A2F70 800A2370 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A2F74 800A2374 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A2F78 800A2378 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A2F7C 800A237C 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A2F80 800A2380 0C02A980 */ jal func_800AA600
@@ -84,8 +84,8 @@ glabel func_800A22F4
.L800A242C:
/* 0A302C 800A242C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A3030 800A2430 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A3034 800A2434 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A3038 800A2438 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A3034 800A2434 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A3038 800A2438 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A303C 800A243C 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3040 800A2440 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A3044 800A2444 00007012 */ mflo $t6
@@ -115,8 +115,8 @@ glabel func_800A22F4
/* 0A3098 800A2498 8E070000 */ lw $a3, ($s0)
/* 0A309C 800A249C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A30A0 800A24A0 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A30A4 800A24A4 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A30A8 800A24A8 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A30A4 800A24A4 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A30A8 800A24A8 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A30AC 800A24AC 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A30B0 800A24B0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A30B4 800A24B4 0C02A980 */ jal func_800AA600
@@ -147,8 +147,8 @@ glabel func_800A22F4
/* 0A3114 800A2514 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3118 800A2518 8E070000 */ lw $a3, ($s0)
/* 0A311C 800A251C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A3120 800A2520 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A3124 800A2524 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A3120 800A2520 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A3124 800A2524 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A3128 800A2528 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A312C 800A252C 0C02A980 */ jal func_800AA600
/* 0A3130 800A2530 24E706A0 */ addiu $a3, $a3, 0x6a0
@@ -160,8 +160,8 @@ glabel func_800A22F4
/* 0A3148 800A2548 8E070000 */ lw $a3, ($s0)
/* 0A314C 800A254C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A3150 800A2550 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A3154 800A2554 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A3158 800A2558 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A3154 800A2554 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A3158 800A2558 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A315C 800A255C 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3160 800A2560 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A3164 800A2564 0C02A980 */ jal func_800AA600
asm/non_matchings/game_ui/func_800A277C.s
+10 -10
View File
@@ -296,8 +296,8 @@ glabel func_800A277C
/* 0A376C 800A2B6C 3C128012 */ lui $s2, %hi(gHUDCurrDisplayList) # $s2, 0x8012
/* 0A3770 800A2B70 26526CFC */ addiu $s2, %lo(gHUDCurrDisplayList) # addiu $s2, $s2, 0x6cfc
/* 0A3774 800A2B74 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A3778 800A2B78 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A377C 800A2B7C 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A3778 800A2B78 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A377C 800A2B7C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A3780 800A2B80 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3784 800A2B84 02402025 */ move $a0, $s2
/* 0A3788 800A2B88 AFA900A8 */ sw $t1, 0xa8($sp)
@@ -368,8 +368,8 @@ glabel func_800A277C
/* 0A387C 800A2C7C 2403003C */ li $v1, 60
/* 0A3880 800A2C80 8E270000 */ lw $a3, ($s1)
/* 0A3884 800A2C84 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A3888 800A2C88 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A388C 800A2C8C 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A3888 800A2C88 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A388C 800A2C8C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A3890 800A2C90 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3894 800A2C94 02402025 */ move $a0, $s2
/* 0A3898 800A2C98 AFA900A8 */ sw $t1, 0xa8($sp)
@@ -426,8 +426,8 @@ glabel func_800A277C
/* 0A3950 800A2D50 8FAF0098 */ lw $t7, 0x98($sp)
/* 0A3954 800A2D54 8E270000 */ lw $a3, ($s1)
/* 0A3958 800A2D58 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A395C 800A2D5C 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A3960 800A2D60 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A395C 800A2D5C 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A3960 800A2D60 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A3964 800A2D64 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3968 800A2D68 02402025 */ move $a0, $s2
/* 0A396C 800A2D6C 0C02A980 */ jal func_800AA600
@@ -519,8 +519,8 @@ glabel func_800A277C
/* 0A3ABC 800A2EBC A5C90338 */ sh $t1, 0x338($t6)
/* 0A3AC0 800A2EC0 8E270000 */ lw $a3, ($s1)
/* 0A3AC4 800A2EC4 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A3AC8 800A2EC8 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A3ACC 800A2ECC 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A3AC8 800A2EC8 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A3ACC 800A2ECC 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A3AD0 800A2ED0 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3AD4 800A2ED4 AFA90050 */ sw $t1, 0x50($sp)
/* 0A3AD8 800A2ED8 02402025 */ move $a0, $s2
@@ -528,8 +528,8 @@ glabel func_800A277C
/* 0A3AE0 800A2EE0 24E70320 */ addiu $a3, $a3, 0x320
/* 0A3AE4 800A2EE4 8E270000 */ lw $a3, ($s1)
/* 0A3AE8 800A2EE8 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A3AEC 800A2EEC 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A3AF0 800A2EF0 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A3AEC 800A2EEC 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A3AF0 800A2EF0 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A3AF4 800A2EF4 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A3AF8 800A2EF8 02402025 */ move $a0, $s2
/* 0A3AFC 800A2EFC 0C02A980 */ jal func_800AA600
asm/non_matchings/game_ui/func_800A47A0.s
+2 -2
View File
@@ -27,7 +27,7 @@ glabel func_800A47A0
/* 0A5404 800A4804 448F4000 */ mtc1 $t7, $f8
/* 0A5408 800A4808 3C148012 */ lui $s4, %hi(gHUDCurrMatrix) # $s4, 0x8012
/* 0A540C 800A480C 468042A0 */ cvt.s.w $f10, $f8
/* 0A5410 800A4810 3C158012 */ lui $s5, %hi(gHUDCurrTriList) # $s5, 0x8012
/* 0A5410 800A4810 3C158012 */ lui $s5, %hi(gHUDCurrVertex) # $s5, 0x8012
/* 0A5414 800A4814 0080B025 */ move $s6, $a0
/* 0A5418 800A4818 4459F800 */ cfc1 $t9, $31
/* 0A541C 800A481C E62A05D0 */ swc1 $f10, 0x5d0($s1)
@@ -36,7 +36,7 @@ glabel func_800A47A0
/* 0A5428 800A4828 38210002 */ xori $at, $at, 2
/* 0A542C 800A482C 44C1F800 */ ctc1 $at, $31
/* 0A5430 800A4830 C71005D0 */ lwc1 $f16, 0x5d0($t8)
/* 0A5434 800A4834 26B56D04 */ addiu $s5, %lo(gHUDCurrTriList) # addiu $s5, $s5, 0x6d04
/* 0A5434 800A4834 26B56D04 */ addiu $s5, %lo(gHUDCurrVertex) # addiu $s5, $s5, 0x6d04
/* 0A5438 800A4838 460084A4 */ cvt.w.s $f18, $f16
/* 0A543C 800A483C 26946D00 */ addiu $s4, %lo(gHUDCurrMatrix) # addiu $s4, $s4, 0x6d00
/* 0A5440 800A4840 44089000 */ mfc1 $t0, $f18
asm/non_matchings/game_ui/func_800A4C44.s
+4 -4
View File
@@ -61,8 +61,8 @@ glabel func_800A4C44
.L800A4D20:
/* 0A5920 800A4D20 8D070000 */ lw $a3, ($t0)
/* 0A5924 800A4D24 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A5928 800A4D28 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A592C 800A4D2C 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A5928 800A4D28 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A592C 800A4D2C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A5930 800A4D30 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A5934 800A4D34 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A5938 800A4D38 AFA30034 */ sw $v1, 0x34($sp)
@@ -114,8 +114,8 @@ glabel func_800A4C44
/* 0A59EC 800A4DEC 3C0141C0 */ li $at, 0x41C00000 # 24.000000
/* 0A59F0 800A4DF0 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A59F4 800A4DF4 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A59F8 800A4DF8 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A59FC 800A4DFC 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A59F8 800A4DF8 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A59FC 800A4DFC 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A5A00 800A4E00 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A5A04 800A4E04 460021A1 */ cvt.d.s $f6, $f4
/* 0A5A08 800A4E08 46309100 */ add.d $f4, $f18, $f16
asm/non_matchings/game_ui/func_800A5F18.s
+4 -4
View File
@@ -17,8 +17,8 @@ glabel func_800A5F18
/* 0A6B28 800A5F28 AFBF001C */ sw $ra, 0x1c($sp)
/* 0A6B2C 800A5F2C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A6B30 800A5F30 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A6B34 800A5F34 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A6B38 800A5F38 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A6B34 800A5F34 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A6B38 800A5F38 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A6B3C 800A5F3C 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A6B40 800A5F40 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A6B44 800A5F44 0C02A980 */ jal func_800AA600
@@ -27,8 +27,8 @@ glabel func_800A5F18
/* 0A6B50 800A5F50 8CE76CDC */ lw $a3, %lo(D_80126CDC)($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(gHUDCurrTriList) # $a2, 0x8012
/* 0A6B60 800A5F60 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A6B5C 800A5F5C 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A6B60 800A5F60 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A6B64 800A5F64 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A6B68 800A5F68 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A6B6C 800A5F6C 0C02A980 */ jal func_800AA600
asm/non_matchings/game_ui/func_800A6E30.s
+6 -6
View File
@@ -126,8 +126,8 @@ glabel L800A6F3C
/* 0A7BE8 800A6FE8 8D070000 */ lw $a3, ($t0)
/* 0A7BEC 800A6FEC 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A7BF0 800A6FF0 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A7BF4 800A6FF4 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A7BF8 800A6FF8 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A7BF4 800A6FF4 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A7BF8 800A6FF8 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A7BFC 800A6FFC 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A7C00 800A7000 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A7C04 800A7004 0C02A980 */ jal func_800AA600
@@ -181,8 +181,8 @@ glabel L800A7014
.L800A70AC:
/* 0A7CAC 800A70AC 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A7CB0 800A70B0 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A7CB4 800A70B4 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A7CB8 800A70B8 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A7CB4 800A70B4 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A7CB8 800A70B8 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A7CBC 800A70BC 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A7CC0 800A70C0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A7CC4 800A70C4 0C02A980 */ jal func_800AA600
@@ -200,14 +200,14 @@ glabel L800A70D4
/* 0A7CF0 800A70F0 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A7CF4 800A70F4 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A7CF8 800A70F8 46048181 */ sub.s $f6, $f16, $f4
/* 0A7CFC 800A70FC 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A7CFC 800A70FC 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A7D00 800A7100 E44601CC */ swc1 $f6, 0x1cc($v0)
/* 0A7D04 800A7104 8D020000 */ lw $v0, ($t0)
/* 0A7D08 800A7108 240A0004 */ li $t2, 4
/* 0A7D0C 800A710C 804901DD */ lb $t1, 0x1dd($v0)
/* 0A7D10 800A7110 C44801CC */ lwc1 $f8, 0x1cc($v0)
/* 0A7D14 800A7114 44895000 */ mtc1 $t1, $f10
/* 0A7D18 800A7118 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A7D18 800A7118 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A7D1C 800A711C 468054A0 */ cvt.s.w $f18, $f10
/* 0A7D20 800A7120 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A7D24 800A7124 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
asm/non_matchings/game_ui/func_800A718C.s
+8 -8
View File
@@ -109,8 +109,8 @@ glabel func_800A718C
/* 0A7F14 800A7314 0006000D */ break 6
.L800A7318:
/* 0A7F18 800A7318 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A7F1C 800A731C 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A7F20 800A7320 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A7F1C 800A731C 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A7F20 800A7320 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A7F24 800A7324 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A7F28 800A7328 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A7F2C 800A732C 00006010 */ mfhi $t4
@@ -143,8 +143,8 @@ glabel func_800A718C
/* 0A7F88 800A7388 8CE76CDC */ lw $a3, %lo(D_80126CDC)($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(gHUDCurrTriList) # $a2, 0x8012
/* 0A7F98 800A7398 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A7F94 800A7394 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A7F98 800A7398 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A7F9C 800A739C 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A7FA0 800A73A0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A7FA4 800A73A4 0C02A980 */ jal func_800AA600
@@ -163,8 +163,8 @@ glabel func_800A718C
/* 0A7FD4 800A73D4 8CE76CDC */ lw $a3, %lo(D_80126CDC)($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(gHUDCurrTriList) # $a2, 0x8012
/* 0A7FE4 800A73E4 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A7FE0 800A73E0 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A7FE4 800A73E4 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A7FE8 800A73E8 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A7FEC 800A73EC 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A7FF0 800A73F0 0C02A980 */ jal func_800AA600
@@ -177,8 +177,8 @@ glabel func_800A718C
/* 0A800C 800A740C 8CE76CDC */ lw $a3, %lo(D_80126CDC)($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(gHUDCurrTriList) # $a2, 0x8012
/* 0A801C 800A741C 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A8018 800A7418 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A801C 800A741C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A8020 800A7420 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A8024 800A7424 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A8028 800A7428 0C02A980 */ jal func_800AA600
asm/non_matchings/game_ui/func_800A7A60.s
+2 -2
View File
@@ -53,10 +53,10 @@ glabel func_800A7A60
/* 0A872C 800A7B2C 8FA70028 */ lw $a3, 0x28($sp)
/* 0A8730 800A7B30 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0A8734 800A7B34 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0A8738 800A7B38 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A8738 800A7B38 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A873C 800A7B3C 240E0100 */ li $t6, 256
/* 0A8740 800A7B40 AFAE0014 */ sw $t6, 0x14($sp)
/* 0A8744 800A7B44 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A8744 800A7B44 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A8748 800A7B48 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0A874C 800A7B4C 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A8750 800A7B50 0C01A145 */ jal render_sprite_billboard
asm/non_matchings/game_ui/func_800A7FBC.s
+2 -2
View File
@@ -51,8 +51,8 @@ glabel func_800A7FBC
/* 0A8C78 800A8078 0155001A */ div $zero, $t2, $s5
/* 0A8C7C 800A807C 3C108012 */ lui $s0, %hi(gHUDCurrDisplayList) # $s0, 0x8012
/* 0A8C80 800A8080 3C118012 */ lui $s1, %hi(gHUDCurrMatrix) # $s1, 0x8012
/* 0A8C84 800A8084 3C128012 */ lui $s2, %hi(gHUDCurrTriList) # $s2, 0x8012
/* 0A8C88 800A8088 26526D04 */ addiu $s2, %lo(gHUDCurrTriList) # addiu $s2, $s2, 0x6d04
/* 0A8C84 800A8084 3C128012 */ lui $s2, %hi(gHUDCurrVertex) # $s2, 0x8012
/* 0A8C88 800A8088 26526D04 */ addiu $s2, %lo(gHUDCurrVertex) # addiu $s2, $s2, 0x6d04
/* 0A8C8C 800A808C 26316D00 */ addiu $s1, %lo(gHUDCurrMatrix) # addiu $s1, $s1, 0x6d00
/* 0A8C90 800A8090 26106CFC */ addiu $s0, %lo(gHUDCurrDisplayList) # addiu $s0, $s0, 0x6cfc
/* 0A8C94 800A8094 27B30060 */ addiu $s3, $sp, 0x60
asm/non_matchings/game_ui/func_800A8474.s
+18 -18
View File
@@ -202,8 +202,8 @@ glabel func_800A8474
/* 0A931C 800A871C 8F190000 */ lw $t9, ($t8)
/* 0A9320 800A8720 3C0A8012 */ lui $t2, %hi(D_80126D60) # $t2, 0x8012
/* 0A9324 800A8724 8D4A6D60 */ lw $t2, %lo(D_80126D60)($t2)
/* 0A9328 800A8728 3C018012 */ lui $at, %hi(gHUDCurrTriList) # $at, 0x8012
/* 0A932C 800A872C AC396D04 */ sw $t9, %lo(gHUDCurrTriList)($at)
/* 0A9328 800A8728 3C018012 */ lui $at, %hi(gHUDCurrVertex) # $at, 0x8012
/* 0A932C 800A872C AC396D04 */ sw $t9, %lo(gHUDCurrVertex)($at)
/* 0A9330 800A8730 8143004C */ lb $v1, 0x4c($t2)
/* 0A9334 800A8734 24010042 */ li $at, 66
/* 0A9338 800A8738 146100D4 */ bne $v1, $at, .L800A8A8C
@@ -675,7 +675,7 @@ glabel func_800A8474
/* 0A9A08 800A8E08 246A0001 */ addiu $t2, $v1, 1
/* 0A9A0C 800A8E0C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000
/* 0A9A10 800A8E10 46006180 */ add.s $f6, $f12, $f0
/* 0A9A14 800A8E14 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0A9A14 800A8E14 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0A9A18 800A8E18 E446036C */ swc1 $f6, 0x36c($v0)
/* 0A9A1C 800A8E1C 8E420000 */ lw $v0, ($s2)
/* 0A9A20 800A8E20 468050A0 */ cvt.s.w $f2, $f10
@@ -685,7 +685,7 @@ glabel func_800A8474
/* 0A9A30 800A8E30 240F0001 */ li $t7, 1
/* 0A9A34 800A8E34 E4480370 */ swc1 $f8, 0x370($v0)
/* 0A9A38 800A8E38 8E420000 */ lw $v0, ($s2)
/* 0A9A3C 800A8E3C 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0A9A3C 800A8E3C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0A9A40 800A8E40 C45000EC */ lwc1 $f16, 0xec($v0)
/* 0A9A44 800A8E44 02802025 */ move $a0, $s4
/* 0A9A48 800A8E48 46008100 */ add.s $f4, $f16, $f0
@@ -1280,10 +1280,10 @@ glabel func_800A8474
/* 0AA31C 800A971C AD8B0000 */ sw $t3, ($t4)
/* 0AA320 800A9720 8FAE0164 */ lw $t6, 0x164($sp)
/* 0AA324 800A9724 8DAD6D00 */ lw $t5, %lo(gHUDCurrMatrix)($t5)
/* 0AA328 800A9728 3C0F8012 */ lui $t7, %hi(gHUDCurrTriList) # $t7, 0x8012
/* 0AA328 800A9728 3C0F8012 */ lui $t7, %hi(gHUDCurrVertex) # $t7, 0x8012
/* 0AA32C 800A972C ADCD0000 */ sw $t5, ($t6)
/* 0AA330 800A9730 8FB80168 */ lw $t8, 0x168($sp)
/* 0AA334 800A9734 8DEF6D04 */ lw $t7, %lo(gHUDCurrTriList)($t7)
/* 0AA334 800A9734 8DEF6D04 */ lw $t7, %lo(gHUDCurrVertex)($t7)
/* 0AA338 800A9738 3C198012 */ lui $t9, %hi(D_80126D60) # $t9, 0x8012
/* 0AA33C 800A973C AF0F0000 */ sw $t7, ($t8)
/* 0AA340 800A9740 8F396D60 */ lw $t9, %lo(D_80126D60)($t9)
@@ -1687,8 +1687,8 @@ glabel func_800A8474
.L800A9D00:
/* 0AA900 800A9D00 8FAE0154 */ lw $t6, 0x154($sp)
/* 0AA904 800A9D04 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0AA908 800A9D08 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0AA90C 800A9D0C 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0AA908 800A9D08 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0AA90C 800A9D0C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0AA910 800A9D10 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0AA914 800A9D14 27A70120 */ addiu $a3, $sp, 0x120
/* 0AA918 800A9D18 AFA00014 */ sw $zero, 0x14($sp)
@@ -1782,7 +1782,7 @@ glabel func_800A8474
/* 0AAA74 800A9E74 AD0E0000 */ sw $t6, ($t0)
/* 0AAA78 800A9E78 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0AAA7C 800A9E7C 444AF800 */ cfc1 $t2, $31
/* 0AAA80 800A9E80 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0AAA80 800A9E80 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0AAA84 800A9E84 35410003 */ ori $at, $t2, 3
/* 0AAA88 800A9E88 38210002 */ xori $at, $at, 2
/* 0AAA8C 800A9E8C 44C1F800 */ ctc1 $at, $31
@@ -1795,7 +1795,7 @@ glabel func_800A8474
/* 0AAAA8 800A9EA8 03017825 */ or $t7, $t8, $at
/* 0AAAAC 800A9EAC AD0F0004 */ sw $t7, 4($t0)
/* 0AAAB0 800A9EB0 8E470000 */ lw $a3, ($s2)
/* 0AAAB4 800A9EB4 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0AAAB4 800A9EB4 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0AAAB8 800A9EB8 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0AAABC 800A9EBC 02802025 */ move $a0, $s4
/* 0AAAC0 800A9EC0 0C02A980 */ jal func_800AA600
@@ -1868,8 +1868,8 @@ glabel func_800A8474
/* 0AABC4 800A9FC4 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0AABC8 800A9FC8 A70E01E6 */ sh $t6, 0x1e6($t8)
/* 0AABCC 800A9FCC 8E470000 */ lw $a3, ($s2)
/* 0AABD0 800A9FD0 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0AABD4 800A9FD4 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0AABD0 800A9FD0 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0AABD4 800A9FD4 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0AABD8 800A9FD8 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0AABDC 800A9FDC 02802025 */ move $a0, $s4
/* 0AABE0 800A9FE0 0C02A980 */ jal func_800AA600
@@ -1915,8 +1915,8 @@ glabel func_800A8474
/* 0AAC7C 800AA07C 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0AAC80 800AA080 E59201E8 */ swc1 $f18, 0x1e8($t4)
/* 0AAC84 800AA084 8E470000 */ lw $a3, ($s2)
/* 0AAC88 800AA088 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0AAC8C 800AA08C 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0AAC88 800AA088 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0AAC8C 800AA08C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0AAC90 800AA090 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0AAC94 800AA094 02802025 */ move $a0, $s4
/* 0AAC98 800AA098 0C02A980 */ jal func_800AA600
@@ -2108,8 +2108,8 @@ glabel func_800A8474
/* 0AAF44 800AA344 8E470000 */ lw $a3, ($s2)
.L800AA348:
/* 0AAF48 800AA348 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0AAF4C 800AA34C 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0AAF50 800AA350 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0AAF4C 800AA34C 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0AAF50 800AA350 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0AAF54 800AA354 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0AAF58 800AA358 0C02A980 */ jal func_800AA600
/* 0AAF5C 800AA35C 24E701E0 */ addiu $a3, $a3, 0x1e0
@@ -2137,10 +2137,10 @@ glabel func_800A8474
/* 0AAFA8 800AA3A8 AD4B0000 */ sw $t3, ($t2)
/* 0AAFAC 800AA3AC 8FB90164 */ lw $t9, 0x164($sp)
/* 0AAFB0 800AA3B0 8DEF6D00 */ lw $t7, %lo(gHUDCurrMatrix)($t7)
/* 0AAFB4 800AA3B4 3C0E8012 */ lui $t6, %hi(gHUDCurrTriList) # $t6, 0x8012
/* 0AAFB4 800AA3B4 3C0E8012 */ lui $t6, %hi(gHUDCurrVertex) # $t6, 0x8012
/* 0AAFB8 800AA3B8 AF2F0000 */ sw $t7, ($t9)
/* 0AAFBC 800AA3BC 8FB80168 */ lw $t8, 0x168($sp)
/* 0AAFC0 800AA3C0 8DCE6D04 */ lw $t6, %lo(gHUDCurrTriList)($t6)
/* 0AAFC0 800AA3C0 8DCE6D04 */ lw $t6, %lo(gHUDCurrVertex)($t6)
/* 0AAFC4 800AA3C4 00000000 */ nop
/* 0AAFC8 800AA3C8 AF0E0000 */ sw $t6, ($t8)
.L800AA3CC:
asm/non_matchings/game_ui/func_800AA600.s
+8 -8
View File
@@ -137,8 +137,8 @@ glabel func_800AA600
/* 0AB3E0 800AA7E0 3C018012 */ lui $at, %hi(gHUDCurrMatrix) # $at, 0x8012
/* 0AB3E4 800AA7E4 AC2E6D00 */ sw $t6, %lo(gHUDCurrMatrix)($at)
/* 0AB3E8 800AA7E8 8DF90000 */ lw $t9, ($t7)
/* 0AB3EC 800AA7EC 3C018012 */ lui $at, %hi(gHUDCurrTriList) # $at, 0x8012
/* 0AB3F0 800AA7F0 AC396D04 */ sw $t9, %lo(gHUDCurrTriList)($at)
/* 0AB3EC 800AA7EC 3C018012 */ lui $at, %hi(gHUDCurrVertex) # $at, 0x8012
/* 0AB3F0 800AA7F0 AC396D04 */ sw $t9, %lo(gHUDCurrVertex)($at)
/* 0AB3F4 800AA7F4 86080006 */ lh $t0, 6($s0)
/* 0AB3F8 800AA7F8 24010028 */ li $at, 40
/* 0AB3FC 800AA7FC 11010021 */ beq $t0, $at, .L800AA884
@@ -539,8 +539,8 @@ glabel func_800AA600
/* 0AB9E0 800AADE0 A6190004 */ sh $t9, 4($s0)
/* 0AB9E4 800AADE4 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0AB9E8 800AADE8 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0AB9EC 800AADEC 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0AB9F0 800AADF0 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0AB9EC 800AADEC 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0AB9F0 800AADF0 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0AB9F4 800AADF4 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
/* 0AB9F8 800AADF8 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0AB9FC 800AADFC AFA00014 */ sw $zero, 0x14($sp)
@@ -571,10 +571,10 @@ glabel func_800AA600
/* 0ABA5C 800AAE5C 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012
/* 0ABA60 800AAE60 A4EC0004 */ sh $t4, 4($a3)
/* 0ABA64 800AAE64 C610000C */ lwc1 $f16, 0xc($s0)
/* 0ABA68 800AAE68 3C068012 */ lui $a2, %hi(gHUDCurrTriList) # $a2, 0x8012
/* 0ABA68 800AAE68 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012
/* 0ABA6C 800AAE6C E4F0000C */ swc1 $f16, 0xc($a3)
/* 0ABA70 800AAE70 C60A0010 */ lwc1 $f10, 0x10($s0)
/* 0ABA74 800AAE74 24C66D04 */ addiu $a2, %lo(gHUDCurrTriList) # addiu $a2, $a2, 0x6d04
/* 0ABA74 800AAE74 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04
/* 0ABA78 800AAE78 E4EA0010 */ swc1 $f10, 0x10($a3)
/* 0ABA7C 800AAE7C C6040014 */ lwc1 $f4, 0x14($s0)
/* 0ABA80 800AAE80 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00
@@ -657,10 +657,10 @@ glabel func_800AA600
/* 0ABB9C 800AAF9C ADAB0000 */ sw $t3, ($t5)
/* 0ABBA0 800AAFA0 8FAE00BC */ lw $t6, 0xbc($sp)
/* 0ABBA4 800AAFA4 8D8C6D00 */ lw $t4, %lo(gHUDCurrMatrix)($t4)
/* 0ABBA8 800AAFA8 3C198012 */ lui $t9, %hi(gHUDCurrTriList) # $t9, 0x8012
/* 0ABBA8 800AAFA8 3C198012 */ lui $t9, %hi(gHUDCurrVertex) # $t9, 0x8012
/* 0ABBAC 800AAFAC ADCC0000 */ sw $t4, ($t6)
/* 0ABBB0 800AAFB0 8FAF00C0 */ lw $t7, 0xc0($sp)
/* 0ABBB4 800AAFB4 8F396D04 */ lw $t9, %lo(gHUDCurrTriList)($t9)
/* 0ABBB4 800AAFB4 8F396D04 */ lw $t9, %lo(gHUDCurrVertex)($t9)
/* 0ABBB8 800AAFB8 00000000 */ nop
/* 0ABBBC 800AAFBC ADF90000 */ sw $t9, ($t7)
.L800AAFC0:
asm/non_matchings/game_ui/render_rain_overlay.s
+8 -8
View File
@@ -145,9 +145,9 @@ glabel render_rain_overlay
/* 0AEAF8 800ADEF8 37010003 */ ori $at, $t8, 3
/* 0AEAFC 800ADEFC 38210002 */ xori $at, $at, 2
/* 0AEB00 800ADF00 44C1F800 */ ctc1 $at, $31
/* 0AEB04 800ADF04 3C0C8012 */ lui $t4, %hi(D_80127C18) # $t4, 0x8012
/* 0AEB04 800ADF04 3C0C8012 */ lui $t4, %hi(gCurrWeatherTriList) # $t4, 0x8012
/* 0AEB08 800ADF08 460042A4 */ cvt.w.s $f10, $f8
/* 0AEB0C 800ADF0C 258C7C18 */ addiu $t4, %lo(D_80127C18) # addiu $t4, $t4, 0x7c18
/* 0AEB0C 800ADF0C 258C7C18 */ addiu $t4, %lo(gCurrWeatherTriList) # addiu $t4, $t4, 0x7c18
/* 0AEB10 800ADF10 44D8F800 */ ctc1 $t8, $31
/* 0AEB14 800ADF14 440D5000 */ mfc1 $t5, $f10
/* 0AEB18 800ADF18 46008102 */ mul.s $f4, $f16, $f0
@@ -209,7 +209,7 @@ glabel render_rain_overlay
/* 0AEBF8 800ADFF8 440F5000 */ mfc1 $t7, $f10
/* 0AEBFC 800ADFFC 4600C102 */ mul.s $f4, $f24, $f0
/* 0AEC00 800AE000 A44F0016 */ sh $t7, 0x16($v0)
/* 0AEC04 800AE004 3C0F8012 */ lui $t7, %hi(gWeatherDisplayListHead) # $t7, 0x8012
/* 0AEC04 800AE004 3C0F8012 */ lui $t7, %hi(gCurrWeatherDisplayList) # $t7, 0x8012
/* 0AEC08 800AE008 4602D182 */ mul.s $f6, $f26, $f2
/* 0AEC0C 800AE00C 46062201 */ sub.s $f8, $f4, $f6
/* 0AEC10 800AE010 4458F800 */ cfc1 $t8, $31
@@ -239,7 +239,7 @@ glabel render_rain_overlay
/* 0AEC70 800AE070 440E5000 */ mfc1 $t6, $f10
/* 0AEC74 800AE074 44D9F800 */ ctc1 $t9, $31
/* 0AEC78 800AE078 A44E0020 */ sh $t6, 0x20($v0)
/* 0AEC7C 800AE07C 8DEF7C0C */ lw $t7, %lo(gWeatherDisplayListHead)($t7)
/* 0AEC7C 800AE07C 8DEF7C0C */ lw $t7, %lo(gCurrWeatherDisplayList)($t7)
/* 0AEC80 800AE080 8D820000 */ lw $v0, ($t4)
/* 0AEC84 800AE084 AFAF0068 */ sw $t7, 0x68($sp)
/* 0AEC88 800AE088 AC580000 */ sw $t8, ($v0)
@@ -304,8 +304,8 @@ glabel render_rain_overlay
/* 0AED74 800AE174 24AF0008 */ addiu $t7, $a1, 8
/* 0AED78 800AE178 AFAF0068 */ sw $t7, 0x68($sp)
/* 0AED7C 800AE17C 3C010400 */ lui $at, 0x400
/* 0AED80 800AE180 3C0C8012 */ lui $t4, %hi(D_80127C18) # $t4, 0x8012
/* 0AED84 800AE184 258C7C18 */ addiu $t4, %lo(D_80127C18) # addiu $t4, $t4, 0x7c18
/* 0AED80 800AE180 3C0C8012 */ lui $t4, %hi(gCurrWeatherTriList) # $t4, 0x8012
/* 0AED84 800AE184 258C7C18 */ addiu $t4, %lo(gCurrWeatherTriList) # addiu $t4, $t4, 0x7c18
/* 0AED88 800AE188 00007012 */ mflo $t6
/* 0AED8C 800AE18C 016EC821 */ addu $t9, $t3, $t6
/* 0AED90 800AE190 03286821 */ addu $t5, $t9, $t0
@@ -317,7 +317,7 @@ glabel render_rain_overlay
/* 0AEDA8 800AE1A8 35AF0050 */ ori $t7, $t5, 0x50
/* 0AEDAC 800AE1AC ACAF0000 */ sw $t7, ($a1)
/* 0AEDB0 800AE1B0 8D380000 */ lw $t8, ($t1)
/* 0AEDB4 800AE1B4 3C018012 */ lui $at, %hi(gWeatherDisplayListHead) # $at, 0x8012
/* 0AEDB4 800AE1B4 3C018012 */ lui $at, %hi(gCurrWeatherDisplayList) # $at, 0x8012
/* 0AEDB8 800AE1B8 030A0019 */ multu $t8, $t2
/* 0AEDBC 800AE1BC 00007012 */ mflo $t6
/* 0AEDC0 800AE1C0 016EC821 */ addu $t9, $t3, $t6
@@ -344,7 +344,7 @@ glabel render_rain_overlay
/* 0AEE14 800AE214 272D0004 */ addiu $t5, $t9, 4
/* 0AEE18 800AE218 31AF000F */ andi $t7, $t5, 0xf
/* 0AEE1C 800AE21C AD2F0000 */ sw $t7, ($t1)
/* 0AEE20 800AE220 AC387C0C */ sw $t8, %lo(gWeatherDisplayListHead)($at)
/* 0AEE20 800AE220 AC387C0C */ sw $t8, %lo(gCurrWeatherDisplayList)($at)
/* 0AEE24 800AE224 AD820000 */ sw $v0, ($t4)
.L800AE228:
/* 0AEE28 800AE228 8FBF0044 */ lw $ra, 0x44($sp)
asm/non_matchings/game_ui/render_rain_splashes.s
+6 -6
View File
@@ -223,8 +223,8 @@ glabel render_rain_splashes
/* 0AE5A8 800AD9A8 AC800000 */ sw $zero, ($a0)
.L800AD9AC:
/* 0AE5AC 800AD9AC 3C10800E */ lui $s0, %hi(D_800E2B4C) # $s0, 0x800e
/* 0AE5B0 800AD9B0 3C118012 */ lui $s1, %hi(gWeatherDisplayListHead) # $s1, 0x8012
/* 0AE5B4 800AD9B4 26317C0C */ addiu $s1, %lo(gWeatherDisplayListHead) # addiu $s1, $s1, 0x7c0c
/* 0AE5B0 800AD9B0 3C118012 */ lui $s1, %hi(gCurrWeatherDisplayList) # $s1, 0x8012
/* 0AE5B4 800AD9B4 26317C0C */ addiu $s1, %lo(gCurrWeatherDisplayList) # addiu $s1, $s1, 0x7c0c
/* 0AE5B8 800AD9B8 26102B4C */ addiu $s0, %lo(D_800E2B4C) # addiu $s0, $s0, 0x2b4c
.L800AD9BC:
/* 0AE5BC 800AD9BC 86080006 */ lh $t0, 6($s0)
@@ -265,12 +265,12 @@ glabel render_rain_splashes
/* 0AE640 800ADA40 01215825 */ or $t3, $t1, $at
/* 0AE644 800ADA44 AC4B0004 */ sw $t3, 4($v0)
/* 0AE648 800ADA48 8D8C2C8C */ lw $t4, %lo(gRainSplashGfx)($t4)
/* 0AE64C 800ADA4C 3C058012 */ lui $a1, %hi(D_80127C10) # $a1, 0x8012
/* 0AE650 800ADA50 3C068012 */ lui $a2, %hi(D_80127C14) # $a2, 0x8012
/* 0AE64C 800ADA4C 3C058012 */ lui $a1, %hi(gCurrWeatherMatrix) # $a1, 0x8012
/* 0AE650 800ADA50 3C068012 */ lui $a2, %hi(gCurrWeatherVertexList) # $a2, 0x8012
/* 0AE654 800ADA54 240D010E */ li $t5, 270
/* 0AE658 800ADA58 AFAD0014 */ sw $t5, 0x14($sp)
/* 0AE65C 800ADA5C 24C67C14 */ addiu $a2, %lo(D_80127C14) # addiu $a2, $a2, 0x7c14
/* 0AE660 800ADA60 24A57C10 */ addiu $a1, %lo(D_80127C10) # addiu $a1, $a1, 0x7c10
/* 0AE65C 800ADA5C 24C67C14 */ addiu $a2, %lo(gCurrWeatherVertexList) # addiu $a2, $a2, 0x7c14
/* 0AE660 800ADA60 24A57C10 */ addiu $a1, %lo(gCurrWeatherMatrix) # addiu $a1, $a1, 0x7c10
/* 0AE664 800ADA64 02003825 */ move $a3, $s0
/* 0AE668 800ADA68 0C01A145 */ jal render_sprite_billboard
/* 0AE66C 800ADA6C AFAC0010 */ sw $t4, 0x10($sp)
asm/non_matchings/objects/func_8000E4E8.s
-32
View File
@@ -1,32 +0,0 @@
glabel func_8000E4E8
/* 00F0E8 8000E4E8 00041880 */ sll $v1, $a0, 2
/* 00F0EC 8000E4EC 3C028012 */ lui $v0, %hi(D_8011AEB0) # $v0, 0x8012
/* 00F0F0 8000E4F0 3C0E8012 */ lui $t6, %hi(D_8011AEA0) # $t6, 0x8012
/* 00F0F4 8000E4F4 00431021 */ addu $v0, $v0, $v1
/* 00F0F8 8000E4F8 25CEAEA0 */ addiu $t6, %lo(D_8011AEA0) # addiu $t6, $t6, -0x5160
/* 00F0FC 8000E4FC 8C42AEB0 */ lw $v0, %lo(D_8011AEB0)($v0)
/* 00F100 8000E500 006E2821 */ addu $a1, $v1, $t6
/* 00F104 8000E504 8CAF0000 */ lw $t7, ($a1)
/* 00F108 8000E508 3C198012 */ lui $t9, %hi(D_8011AE98) # $t9, 0x8012
/* 00F10C 8000E50C AC40000C */ sw $zero, 0xc($v0)
/* 00F110 8000E510 AC400008 */ sw $zero, 8($v0)
/* 00F114 8000E514 AC400004 */ sw $zero, 4($v0)
/* 00F118 8000E518 AC4F0000 */ sw $t7, ($v0)
/* 00F11C 8000E51C 0323C821 */ addu $t9, $t9, $v1
/* 00F120 8000E520 8F39AE98 */ lw $t9, %lo(D_8011AE98)($t9)
/* 00F124 8000E524 8CB80000 */ lw $t8, ($a1)
/* 00F128 8000E528 24020010 */ li $v0, 16
/* 00F12C 8000E52C 00003825 */ move $a3, $zero
/* 00F130 8000E530 03194021 */ addu $t0, $t8, $t9
.L8000E534:
/* 00F134 8000E534 24E70004 */ addiu $a3, $a3, 4
/* 00F138 8000E538 A1000000 */ sb $zero, ($t0)
/* 00F13C 8000E53C A1000001 */ sb $zero, 1($t0)
/* 00F140 8000E540 A1000002 */ sb $zero, 2($t0)
/* 00F144 8000E544 A1000003 */ sb $zero, 3($t0)
/* 00F148 8000E548 14E2FFFA */ bne $a3, $v0, .L8000E534
/* 00F14C 8000E54C 25080004 */ addiu $t0, $t0, 4
/* 00F150 8000E550 03E00008 */ jr $ra
/* 00F154 8000E554 00000000 */ nop
asm/non_matchings/unknown_032760/func_8003F0F8.s
-134
View File
@@ -1,134 +0,0 @@
glabel func_8003F0F8
/* 03FCF8 8003F0F8 27BDFF90 */ addiu $sp, $sp, -0x70
/* 03FCFC 8003F0FC AFB20030 */ sw $s2, 0x30($sp)
/* 03FD00 8003F100 00809025 */ move $s2, $a0
/* 03FD04 8003F104 AFBF0044 */ sw $ra, 0x44($sp)
/* 03FD08 8003F108 AFB60040 */ sw $s6, 0x40($sp)
/* 03FD0C 8003F10C AFB5003C */ sw $s5, 0x3c($sp)
/* 03FD10 8003F110 AFB40038 */ sw $s4, 0x38($sp)
/* 03FD14 8003F114 00A0A825 */ move $s5, $a1
/* 03FD18 8003F118 30D6FFFF */ andi $s6, $a2, 0xffff
/* 03FD1C 8003F11C AFB30034 */ sw $s3, 0x34($sp)
/* 03FD20 8003F120 AFB1002C */ sw $s1, 0x2c($sp)
/* 03FD24 8003F124 AFB00028 */ sw $s0, 0x28($sp)
/* 03FD28 8003F128 E7B50020 */ swc1 $f21, 0x20($sp)
/* 03FD2C 8003F12C E7B40024 */ swc1 $f20, 0x24($sp)
/* 03FD30 8003F130 AFA60078 */ sw $a2, 0x78($sp)
/* 03FD34 8003F134 0000A025 */ move $s4, $zero
/* 03FD38 8003F138 0C006EA4 */ jal get_racer_objects_by_port
/* 03FD3C 8003F13C 27A40060 */ addiu $a0, $sp, 0x60
/* 03FD40 8003F140 8FAE0060 */ lw $t6, 0x60($sp)
/* 03FD44 8003F144 00008025 */ move $s0, $zero
/* 03FD48 8003F148 19C00030 */ blez $t6, .L8003F20C
/* 03FD4C 8003F14C 00408825 */ move $s1, $v0
/* 03FD50 8003F150 2413FFFF */ li $s3, -1
.L8003F154:
/* 03FD54 8003F154 8E220000 */ lw $v0, ($s1)
/* 03FD58 8003F158 8EAF0004 */ lw $t7, 4($s5)
/* 03FD5C 8003F15C 00000000 */ nop
/* 03FD60 8003F160 11E20026 */ beq $t7, $v0, .L8003F1FC
/* 03FD64 8003F164 8FA80060 */ lw $t0, 0x60($sp)
/* 03FD68 8003F168 8C580064 */ lw $t8, 0x64($v0)
/* 03FD6C 8003F16C 00000000 */ nop
/* 03FD70 8003F170 87190000 */ lh $t9, ($t8)
/* 03FD74 8003F174 00000000 */ nop
/* 03FD78 8003F178 12790020 */ beq $s3, $t9, .L8003F1FC
/* 03FD7C 8003F17C 8FA80060 */ lw $t0, 0x60($sp)
/* 03FD80 8003F180 C444000C */ lwc1 $f4, 0xc($v0)
/* 03FD84 8003F184 C646000C */ lwc1 $f6, 0xc($s2)
/* 03FD88 8003F188 C4480010 */ lwc1 $f8, 0x10($v0)
/* 03FD8C 8003F18C 46062001 */ sub.s $f0, $f4, $f6
/* 03FD90 8003F190 C64A0010 */ lwc1 $f10, 0x10($s2)
/* 03FD94 8003F194 46000102 */ mul.s $f4, $f0, $f0
/* 03FD98 8003F198 460A4081 */ sub.s $f2, $f8, $f10
/* 03FD9C 8003F19C C4500014 */ lwc1 $f16, 0x14($v0)
/* 03FDA0 8003F1A0 C6520014 */ lwc1 $f18, 0x14($s2)
/* 03FDA4 8003F1A4 46021182 */ mul.s $f6, $f2, $f2
/* 03FDA8 8003F1A8 46128381 */ sub.s $f14, $f16, $f18
/* 03FDAC 8003F1AC 460E7282 */ mul.s $f10, $f14, $f14
/* 03FDB0 8003F1B0 46062200 */ add.s $f8, $f4, $f6
/* 03FDB4 8003F1B4 0C0326B4 */ jal sqrtf
/* 03FDB8 8003F1B8 460A4300 */ add.s $f12, $f8, $f10
/* 03FDBC 8003F1BC 46000506 */ mov.s $f20, $f0
/* 03FDC0 8003F1C0 0C00072E */ jal func_80001CB8
/* 03FDC4 8003F1C4 32C4FFFF */ andi $a0, $s6, 0xffff
/* 03FDC8 8003F1C8 44828000 */ mtc1 $v0, $f16
/* 03FDCC 8003F1CC 04410005 */ bgez $v0, .L8003F1E4
/* 03FDD0 8003F1D0 468084A0 */ cvt.s.w $f18, $f16
/* 03FDD4 8003F1D4 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000
/* 03FDD8 8003F1D8 44812000 */ mtc1 $at, $f4
/* 03FDDC 8003F1DC 00000000 */ nop
/* 03FDE0 8003F1E0 46049480 */ add.s $f18, $f18, $f4
.L8003F1E4:
/* 03FDE4 8003F1E4 4612A03E */ c.le.s $f20, $f18
/* 03FDE8 8003F1E8 00000000 */ nop
/* 03FDEC 8003F1EC 45000003 */ bc1f .L8003F1FC
/* 03FDF0 8003F1F0 8FA80060 */ lw $t0, 0x60($sp)
/* 03FDF4 8003F1F4 24140001 */ li $s4, 1
/* 03FDF8 8003F1F8 8FA80060 */ lw $t0, 0x60($sp)
.L8003F1FC:
/* 03FDFC 8003F1FC 26100001 */ addiu $s0, $s0, 1
/* 03FE00 8003F200 0208082A */ slt $at, $s0, $t0
/* 03FE04 8003F204 1420FFD3 */ bnez $at, .L8003F154
/* 03FE08 8003F208 26310004 */ addiu $s1, $s1, 4
.L8003F20C:
/* 03FE0C 8003F20C 1280001D */ beqz $s4, .L8003F284
/* 03FE10 8003F210 00000000 */ nop
/* 03FE14 8003F214 8EA4001C */ lw $a0, 0x1c($s5)
/* 03FE18 8003F218 3C108012 */ lui $s0, %hi(D_8011D4DC) # $s0, 0x8012
/* 03FE1C 8003F21C 14800012 */ bnez $a0, .L8003F268
/* 03FE20 8003F220 2610D4DC */ addiu $s0, %lo(D_8011D4DC) # addiu $s0, $s0, -0x2b24
/* 03FE24 8003F224 8E090000 */ lw $t1, ($s0)
/* 03FE28 8003F228 32C4FFFF */ andi $a0, $s6, 0xffff
/* 03FE2C 8003F22C 29210008 */ slti $at, $t1, 8
/* 03FE30 8003F230 10200021 */ beqz $at, .L8003F2B8
/* 03FE34 8003F234 240A0001 */ li $t2, 1
/* 03FE38 8003F238 8E45000C */ lw $a1, 0xc($s2)
/* 03FE3C 8003F23C 8E460010 */ lw $a2, 0x10($s2)
/* 03FE40 8003F240 8E470014 */ lw $a3, 0x14($s2)
/* 03FE44 8003F244 26AB001C */ addiu $t3, $s5, 0x1c
/* 03FE48 8003F248 AFAB0014 */ sw $t3, 0x14($sp)
/* 03FE4C 8003F24C 0C002556 */ jal func_80009558
/* 03FE50 8003F250 AFAA0010 */ sw $t2, 0x10($sp)
/* 03FE54 8003F254 8E0C0000 */ lw $t4, ($s0)
/* 03FE58 8003F258 00000000 */ nop
/* 03FE5C 8003F25C 258D0001 */ addiu $t5, $t4, 1
/* 03FE60 8003F260 10000015 */ b .L8003F2B8
/* 03FE64 8003F264 AE0D0000 */ sw $t5, ($s0)
.L8003F268:
/* 03FE68 8003F268 8E45000C */ lw $a1, 0xc($s2)
/* 03FE6C 8003F26C 8E460010 */ lw $a2, 0x10($s2)
/* 03FE70 8003F270 8E470014 */ lw $a3, 0x14($s2)
/* 03FE74 8003F274 0C0025B6 */ jal update_spatial_audio_position
/* 03FE78 8003F278 00000000 */ nop
/* 03FE7C 8003F27C 1000000F */ b .L8003F2BC
/* 03FE80 8003F280 8FBF0044 */ lw $ra, 0x44($sp)
.L8003F284:
/* 03FE84 8003F284 8EA4001C */ lw $a0, 0x1c($s5)
/* 03FE88 8003F288 00000000 */ nop
/* 03FE8C 8003F28C 1080000B */ beqz $a0, .L8003F2BC
/* 03FE90 8003F290 8FBF0044 */ lw $ra, 0x44($sp)
/* 03FE94 8003F294 0C0025BE */ jal func_800096F8
/* 03FE98 8003F298 00000000 */ nop
/* 03FE9C 8003F29C 3C108012 */ lui $s0, %hi(D_8011D4DC) # $s0, 0x8012
/* 03FEA0 8003F2A0 2610D4DC */ addiu $s0, %lo(D_8011D4DC) # addiu $s0, $s0, -0x2b24
/* 03FEA4 8003F2A4 AEA0001C */ sw $zero, 0x1c($s5)
/* 03FEA8 8003F2A8 8E0E0000 */ lw $t6, ($s0)
/* 03FEAC 8003F2AC 00000000 */ nop
/* 03FEB0 8003F2B0 25CFFFFF */ addiu $t7, $t6, -1
/* 03FEB4 8003F2B4 AE0F0000 */ sw $t7, ($s0)
.L8003F2B8:
/* 03FEB8 8003F2B8 8FBF0044 */ lw $ra, 0x44($sp)
.L8003F2BC:
/* 03FEBC 8003F2BC C7B50020 */ lwc1 $f21, 0x20($sp)
/* 03FEC0 8003F2C0 C7B40024 */ lwc1 $f20, 0x24($sp)
/* 03FEC4 8003F2C4 8FB00028 */ lw $s0, 0x28($sp)
/* 03FEC8 8003F2C8 8FB1002C */ lw $s1, 0x2c($sp)
/* 03FECC 8003F2CC 8FB20030 */ lw $s2, 0x30($sp)
/* 03FED0 8003F2D0 8FB30034 */ lw $s3, 0x34($sp)
/* 03FED4 8003F2D4 8FB40038 */ lw $s4, 0x38($sp)
/* 03FED8 8003F2D8 8FB5003C */ lw $s5, 0x3c($sp)
/* 03FEDC 8003F2DC 8FB60040 */ lw $s6, 0x40($sp)
/* 03FEE0 8003F2E0 03E00008 */ jr $ra
/* 03FEE4 8003F2E4 27BD0070 */ addiu $sp, $sp, 0x70
include/audio_internal.h
+1
View File
@@ -311,5 +311,6 @@ s32 __timeToSamples(ALSynth *ALSynth, s32 micros);
ALMicroTime _samplesToTime(ALSynth *synth, s32 samples);
void _init_lpfilter(ALLowPass *lp);
void alClose(ALGlobals *glob);
#endif
include/structs.h
+7 -5
View File
@@ -289,9 +289,8 @@ typedef struct LevelHeader {
/* 0x03 */ u8 unk3;
/* 0x04 */ s8 unk4[4];
/* 0x08 */ f32 course_height;
/* 0x0C */ u8 padC[0x14];
/* 0x0C */ u8 unkC[10];
/* 0x16 */ u8 unk16[10];
/* 0x20 */ s32 *unk20;
/* 0x24 */ u8 pad24[6];
@@ -774,6 +773,8 @@ typedef struct Object_Weapon {
/* 0x14 */ s32 unk14;
/* 0x18 */ u8 weaponID;
/* 0x19 */ u8 checkpoint;
/* 0x19 */ s16 unk1A;
/* 0x19 */ s32 unk1C;
} Object_Weapon;
typedef struct Object_Butterfly {
@@ -1142,9 +1143,10 @@ typedef struct Object_Racer {
/* 0x203 */ s8 boostType;
/* 0x204 */ s16 unk204;
/* 0x206 */ s16 unk206;
/* 0x208 */ s16 unk208;
/* 0x208 */ s8 unk208;
/* 0x209 */ u8 unk209;
/* 0x20A */ u8 unk20A;
/* 0x20B */ s8 unk20B;
/* 0x20B */ u8 unk20B;
/* 0x20C */ u8 throttleReleased;
/* 0x20D */ u8 unk20D;
/* 0x20E */ u16 unk20E;
include/types.h
+1
View File
@@ -40,6 +40,7 @@ typedef s32 ptrdiff_t;
//#endif
typedef float Matrix[4][4];
typedef s32 MatrixS[4][4];
typedef s16 VertexList;
typedef s8 TriangleList;
src/audio.c
+52 -52
View File
@@ -90,7 +90,7 @@ u8 D_80115F78;
u8 D_80115F79;
s32 D_80115F7C;
s32 *gGlobalSoundMask;
u32 gSpatialSoundMask;
u32 *gSpatialSoundMask;
u32 D_80115F88;
/******************************/
@@ -101,41 +101,41 @@ void audio_init(OSSched *sc) {
s32 *addrPtr;
u32 seqfSize;
u32 seq_max_len;
u32 tmp2;
UNUSED u32 pad;
audioMgrConfig audConfig;
seq_max_len = 0;
alHeapInit(&gALHeap, gBssSectionStart, AUDIO_HEAP_SIZE);
addrPtr = load_asset_section_from_rom(ASSET_AUDIO_TABLE);
ALBankFile_80115D14 = (ALBankFile *)allocate_from_main_pool_safe(addrPtr[2] - addrPtr[1], COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, ALBankFile_80115D14, addrPtr[1], addrPtr[2] - addrPtr[1]);
addrPtr = (s32 *) load_asset_section_from_rom(ASSET_AUDIO_TABLE);
ALBankFile_80115D14 = (ALBankFile *) allocate_from_main_pool_safe(addrPtr[2] - addrPtr[1], COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, (u32) ALBankFile_80115D14, addrPtr[1], addrPtr[2] - addrPtr[1]);
alBnkfNew(ALBankFile_80115D14, get_rom_offset_of_asset(ASSET_AUDIO, addrPtr[2]));
sSoundEffectsPoolSize = addrPtr[7] - addrPtr[6];
sSoundEffectsPool = (unk80115D18 *)allocate_from_main_pool_safe(sSoundEffectsPoolSize, COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, sSoundEffectsPool, addrPtr[6], sSoundEffectsPoolSize);
sSoundEffectsPool = (unk80115D18 *) allocate_from_main_pool_safe(sSoundEffectsPoolSize, COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, (u32) sSoundEffectsPool, addrPtr[6], sSoundEffectsPoolSize);
D_80115D20 = sSoundEffectsPoolSize / 10;
sMusicPoolSize = addrPtr[6] - addrPtr[5];
sMusicPool = (unk80115D1C *)allocate_from_main_pool_safe(sMusicPoolSize, COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, sMusicPool, addrPtr[5], sMusicPoolSize);
sMusicPool = (unk80115D1C *) allocate_from_main_pool_safe(sMusicPoolSize, COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, (u32) sMusicPool, addrPtr[5], sMusicPoolSize);
D_80115D24 = sMusicPoolSize / 3;
ALBankFile_80115D10 = (ALBankFile *)allocate_from_main_pool_safe(addrPtr[0], COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, ALBankFile_80115D10, 0, addrPtr[0]);
ALBankFile_80115D10 = (ALBankFile *) allocate_from_main_pool_safe(addrPtr[0], COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, (u32) ALBankFile_80115D10, 0, addrPtr[0]);
alBnkfNew(ALBankFile_80115D10, get_rom_offset_of_asset(ASSET_AUDIO, addrPtr[0]));
ALSeqFile_80115CF8 = (ALSeqFile *)alHeapDBAlloc(0, 0, &gALHeap, 1, 4);
load_asset_to_address(ASSET_AUDIO, ALSeqFile_80115CF8, addrPtr[4], 4);
ALSeqFile_80115CF8 = (ALSeqFile *) alHeapDBAlloc(0, 0, &gALHeap, 1, 4);
load_asset_to_address(ASSET_AUDIO, (u32) ALSeqFile_80115CF8, addrPtr[4], 4);
seqfSize = (ALSeqFile_80115CF8->seqCount) * 8 + 4;
ALSeqFile_80115CF8 = allocate_from_main_pool_safe(seqfSize, COLOUR_TAG_CYAN);
load_asset_to_address(ASSET_AUDIO, ALSeqFile_80115CF8, addrPtr[4], seqfSize);
load_asset_to_address(ASSET_AUDIO, (u32) ALSeqFile_80115CF8, addrPtr[4], seqfSize);
alSeqFileNew(ALSeqFile_80115CF8, get_rom_offset_of_asset(ASSET_AUDIO, addrPtr[4]));
D_80115D0C = (u32 *)allocate_from_main_pool_safe((ALSeqFile_80115CF8->seqCount) * 4, COLOUR_TAG_CYAN);
D_80115D0C = (u32 *) allocate_from_main_pool_safe((ALSeqFile_80115CF8->seqCount) * 4, COLOUR_TAG_CYAN);
for (iCnt = 0; iCnt < ALSeqFile_80115CF8->seqCount; iCnt++) {
(u32 *)((u32)ALSeqFile_80115CF8 + 8 + iCnt * 8);
(u32 *) ((u32) ALSeqFile_80115CF8 + 8 + iCnt * 8);
D_80115D0C[iCnt] = ALSeqFile_80115CF8->seqArray[iCnt].len;
if (D_80115D0C[iCnt] & 1) {
D_80115D0C[iCnt]++;
@@ -199,8 +199,8 @@ void func_80000968(s32 arg0) {
func_80004A60(1, 32767);
func_80004A60(2, 0);
func_80004A60(4, 0);
alCSPSetVol(gMusicPlayer, (s16)(musicRelativeVolume * musicVolumeSliderPercentage >> 2));
alCSPSetVol(gSndFxPlayer, 0);
alCSPSetVol((ALCSPlayer *) gMusicPlayer, (s16) (musicRelativeVolume * musicVolumeSliderPercentage >> 2));
alCSPSetVol((ALCSPlayer *) gSndFxPlayer, 0);
break;
case 2:
func_80004A60(0, 0);
@@ -219,8 +219,8 @@ void func_80000968(s32 arg0) {
func_80004A60(1, 32767);
func_80004A60(2, 32767);
func_80004A60(4, 32767);
alCSPSetVol(gMusicPlayer, (s16)(musicRelativeVolume * musicVolumeSliderPercentage));
alCSPSetVol(gSndFxPlayer, (s16)(sfxGetVolumeSlider() * sfxRelativeVolume));
alCSPSetVol((ALCSPlayer *) gMusicPlayer, (s16) (musicRelativeVolume * musicVolumeSliderPercentage));
alCSPSetVol((ALCSPlayer *) gSndFxPlayer, (s16) (sfxGetVolumeSlider() * sfxRelativeVolume));
break;
}
D_80115F79 = arg0;
@@ -241,7 +241,7 @@ void play_music(u8 seqID) {
if (D_800DC640 != 0) {
func_800022BC(D_80115D04, gMusicPlayer);
}
musicTempo = alCSPGetTempo(gMusicPlayer);
musicTempo = alCSPGetTempo((ALCSPlayer *) gMusicPlayer);
audioPrevCount = osGetCount();
D_80115D40 = 1;
D_80115F7C = -1;
@@ -319,7 +319,7 @@ void handle_music_fade(u8 updateRate) {
D_80115D48[reg_s2].unk2 -= updateRate;
if (D_80115D48[reg_s2].unk2 <= 0) {
j = reg_s2;
play_sound_global(D_80115D48[reg_s2].unk0, D_80115D48[reg_s2].unk4);
play_sound_global(D_80115D48[reg_s2].unk0, (s32 *) D_80115D48[reg_s2].unk4);
D_800DC658 -= 1;
while (j < D_800DC658) {
@@ -339,7 +339,7 @@ void handle_music_fade(u8 updateRate) {
func_8000232C(gMusicPlayer, D_80115CFC, &D_800DC65C, &D_80115D88);
func_8000232C(gSndFxPlayer, D_80115D00, &D_800DC660, &D_80115E80);
if (sMusicTempo == -1 && gMusicPlayer->target) {
sMusicTempo = 60000000 / alCSPGetTempo(gMusicPlayer);
sMusicTempo = 60000000 / alCSPGetTempo((ALCSPlayer *) gMusicPlayer);
}
}
@@ -395,13 +395,13 @@ void func_80001170(u8 chan) {
void musicSetChlPan(u8 chan, ALPan pan) {
if (chan < 16) {
alCSPSetChlPan(gMusicPlayer, chan, pan);
alCSPSetChlPan((ALCSPlayer *) gMusicPlayer, chan, pan);
}
}
void musicSetChlVol(u8 chan, u8 vol) {
if (chan < 0x10) {
alCSPSetChlVol(gMusicPlayer, chan, vol);
alCSPSetChlVol((ALCSPlayer *) gMusicPlayer, chan, vol);
}
}
@@ -410,7 +410,7 @@ u8 musicGetChlVol(u8 chan) {
if (chan >= 16) {
return 0;
} else {
return alCSPGetChlVol(gMusicPlayer, chan);
return alCSPGetChlVol((ALCSPlayer *) gMusicPlayer, chan);
}
}
@@ -424,7 +424,7 @@ u8 func_800012A8(u8 chan) {
if (chan >= 16) {
return 0;
}
return func_80063C00(gMusicPlayer, chan);
return func_80063C00((ALCSPlayer *) gMusicPlayer, chan);
}
void func_800012E8(void) {
@@ -446,18 +446,18 @@ u8 func_80001358(u8 arg0, u8 arg1, s32 arg2) {
//u8 fadeIn_chan = arg0;
if (!(arg0 == 100)) {
val_1f = arg2 + alCSPGetChlVol(gMusicPlayer, arg0);
val_1f = arg2 + alCSPGetChlVol((ALCSPlayer *) gMusicPlayer, arg0);
if (val_1f > 127) {
val_1f = 127;
}
alCSPSetChlVol(gMusicPlayer, arg0, val_1f);
alCSPSetChlVol((ALCSPlayer *) gMusicPlayer, arg0, val_1f);
}
if (arg1 != 100) {
updatedVol = alCSPGetChlVol(gMusicPlayer, arg1);
updatedVol = alCSPGetChlVol((ALCSPlayer *) gMusicPlayer, arg1);
val_1e = (updatedVol > arg2) ? updatedVol - arg2 : 0;
alCSPSetChlVol(gMusicPlayer, arg1, val_1e);
alCSPSetChlVol((ALCSPlayer *) gMusicPlayer, arg1, val_1e);
return val_1e;
} else {
return 127 - val_1f;
@@ -485,7 +485,7 @@ void func_800014BC(f32 arg0) {
void musicSetTempo(s32 tempo) {
if (tempo != 0) {
f32 inv_tempo = (1.0f / tempo);
alCSPSetTempo(gMusicPlayer, (s32)(inv_tempo * 60000000.0f));
alCSPSetTempo((ALCSPlayer *) gMusicPlayer, (s32)(inv_tempo * 60000000.0f));
sMusicTempo = tempo;
}
}
@@ -498,7 +498,7 @@ s16 musicGetTempo(void) {
}
u8 music_is_playing(void) {
return (alCSPGetState(gMusicPlayer) == AL_PLAYING);
return (alCSPGetState((ALCSPlayer *) gMusicPlayer) == AL_PLAYING);
}
f32 audio_get_chr_select_anim_frac(void) {
@@ -533,7 +533,7 @@ void func_80001784(u8 a0) {
void sfxSetTempo(s32 tempo) {
f32 inv_tempo = (1.0f / tempo);
alCSPSetTempo(gSndFxPlayer, (s32)(inv_tempo * 60000000.0f));
alCSPSetTempo((ALCSPlayer *) gSndFxPlayer, (s32)(inv_tempo * 60000000.0f));
}
void func_80001844(void) {
@@ -589,7 +589,7 @@ void set_relative_volume_for_music(u8 vol) {
musicRelativeVolume = vol;
normalized_vol = musicVolumeSliderPercentage * musicRelativeVolume * sMusicFadeVolume;
alCSPSetVol(gMusicPlayer, (s16)((s32)(sMusicVolumeMultiplier * normalized_vol) >> 8));
alCSPSetVol((ALCSPlayer *) gMusicPlayer, (s16)((s32)(sMusicVolumeMultiplier * normalized_vol) >> 8));
}
void set_music_volume_slider(u32 slider_val) {
@@ -598,7 +598,7 @@ void set_music_volume_slider(u32 slider_val) {
slider_val = (slider_val <= 256) ? slider_val : 256;
musicVolumeSliderPercentage = slider_val;
normalized_vol = musicVolumeSliderPercentage * musicRelativeVolume * sMusicFadeVolume;
alCSPSetVol(gMusicPlayer, (s16)((s32)(sMusicVolumeMultiplier * normalized_vol) >> 8));
alCSPSetVol((ALCSPlayer *) gMusicPlayer, (s16)((s32)(sMusicVolumeMultiplier * normalized_vol) >> 8));
}
u8 musicGetRelativeVolume(void) {
@@ -611,13 +611,13 @@ s32 musicGetVolSliderPercentage(void) {
void sfxSetRelativeVolume(u8 arg0) {
sfxRelativeVolume = arg0;
alCSPSetVol(gSndFxPlayer, (s16)(sfxGetVolumeSlider() * sfxRelativeVolume));
alCSPSetVol((ALCSPlayer *) gSndFxPlayer, (s16)(sfxGetVolumeSlider() * sfxRelativeVolume));
}
void sfxSetPan(ALPan pan) {
u32 iChan;
for (iChan = 0; iChan < 16; iChan++) {
alCSPSetChlPan(gSndFxPlayer, iChan, pan);
alCSPSetChlPan((ALCSPlayer *) gSndFxPlayer, iChan, pan);
}
return;
}
@@ -674,14 +674,14 @@ void play_sound_global(u16 soundID, s32 *soundMask) {
} else {
volumeF = sSoundEffectsPool[soundID].unk4 / 100.0f;
if (soundMask != NULL) {
func_80004668(ALBankFile_80115D14->bankArray[0], soundBite, sSoundEffectsPool[soundID].unk8, soundMask);
func_80004668(ALBankFile_80115D14->bankArray[0], soundBite, sSoundEffectsPool[soundID].unk8, (s32) soundMask);
if (*soundMask != NULL) {
func_800049F8(*soundMask, 8, sSoundEffectsPool[soundID].unk2 * 256);
func_800049F8(*soundMask, 16, *((u32*) &volumeF));
}
} else {
soundMask = (s32 *) &gGlobalSoundMask;
func_80004668(ALBankFile_80115D14->bankArray[0], soundBite, sSoundEffectsPool[soundID].unk8, &gGlobalSoundMask);
func_80004668(ALBankFile_80115D14->bankArray[0], soundBite, sSoundEffectsPool[soundID].unk8, (s32) &gGlobalSoundMask);
if (*soundMask != NULL) {
func_800049F8(*soundMask, 8, sSoundEffectsPool[soundID].unk2 * 256);
func_800049F8(*soundMask, 16, *((u32*) &volumeF));
@@ -698,26 +698,26 @@ void play_sound_global(u16 soundID, s32 *soundMask) {
*/
void play_sound_spatial(u16 soundID, f32 x, f32 y, f32 z, s32 **soundMask) {
if (soundMask == NULL) {
soundMask = &gSpatialSoundMask;
soundMask = (s32 **) &gSpatialSoundMask;
}
play_sound_global(soundID, soundMask);
play_sound_global(soundID, (s32 *) soundMask);
if (*soundMask != NULL) {
func_80009B7C(*soundMask, x, y, z);
}
}
void func_80001F14(u16 soundID, u32 *arg1) {
void func_80001F14(u16 soundID, s32 *arg1) {
if (soundID <= 0 || ALBankFile_80115D14_GetSoundCount() < soundID) {
if (arg1) {
*arg1 = 0;
}
} else {
if (arg1) {
func_80004638(ALBankFile_80115D14->bankArray[0], (s16)soundID, arg1);
func_80004638(ALBankFile_80115D14->bankArray[0], (s16) soundID, (s32) arg1);
} else {
func_80004638(ALBankFile_80115D14->bankArray[0], (s16)soundID, &D_80115F88);
func_80004638(ALBankFile_80115D14->bankArray[0], (s16) soundID, (s32) &D_80115F88);
}
}
}
@@ -725,20 +725,20 @@ void func_80001F14(u16 soundID, u32 *arg1) {
void func_80001FB8(u16 soundID, void *soundState, u8 volume) {
s32 new_var = ((s32) (sSoundEffectsPool[soundID].unk2 * (volume / 127.0f))) * 256;
if (soundState) {
func_800049F8(soundState, 8, new_var);
func_800049F8((s32) soundState, 8, new_var);
}
}
UNUSED void func_8000208C(void *sndState, u8 arg1) {
if (sndState != NULL) {
func_800049F8(sndState, 8, arg1 << 8);
func_800049F8((s32) sndState, 8, arg1 << 8);
}
}
UNUSED void func_800020BC(void *sndState, u32 arg1) {
u32 *temp = &arg1;
if (sndState != NULL) {
func_800049F8(sndState, 16, *temp);
func_800049F8((s32) sndState, 16, *temp);
}
}
@@ -800,7 +800,7 @@ ALSeqPlayer *func_80002224(s32 _max_voices, s32 _max_events) {
alCSPSetBank(cseqp, ALBankFile_80115D10->bankArray[0]);
cseqp->unk36 = 0x7F;
return cseqp;
return (ALSeqPlayer *) cseqp;
}
void func_800022BC(u8 arg0, ALSeqPlayer *arg1) {
@@ -820,7 +820,7 @@ void func_8000232C(ALSeqPlayer *arg0, void *arg1, u8 *arg2, ALCSeq *arg3) {
u8 temp_a0_2;
if ((alCSPGetState((ALCSPlayer* ) arg0) == 0) && (*arg2 != 0)) {
load_asset_to_address(0x27U, arg1, ALSeqFile_80115CF8->seqArray[*arg2].offset - get_rom_offset_of_asset(0x27U, 0U), (s32) D_80115D0C[*arg2]);
load_asset_to_address(ASSET_AUDIO, (u32) arg1, ALSeqFile_80115CF8->seqArray[*arg2].offset - get_rom_offset_of_asset(ASSET_AUDIO, 0), (s32) D_80115D0C[*arg2]);
alCSeqNew(arg3, arg1);
alCSPSetSeq((ALCSPlayer* ) arg0, arg3);
alCSPPlay((ALCSPlayer* ) arg0);
@@ -859,12 +859,12 @@ void func_8000232C(ALSeqPlayer *arg0, void *arg1, u8 *arg2, ALCSeq *arg3) {
void func_80002570(ALSeqPlayer *seqp) {
if (gMusicPlayer == seqp && D_80115D40 != 0) {
alCSPStop(seqp);
alCSPStop((ALCSPlayer *) seqp);
D_80115D40 = 0;
D_80115D04 = 0;
D_800DC65C = 0;
} else if (gSndFxPlayer == seqp && D_80115D41 != 0) {
alCSPStop(seqp);
alCSPStop((ALCSPlayer *) seqp);
D_80115D41 = 0;
D_800DC660 = 0;
}

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