mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-05-23 06:54:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Give names to a couple vec3*_set functions (#197)

Browse Source 
* Give names to a couple vec3*_set functions

Change vec3f_set to sm64_vec3f_set

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-05-14 01:31:54 -04:00
committed by GitHub
parent 98dc90cdd5
commit bbfdb9338c
20 changed files with 156 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/code_80005FD0/func_800122D8.s
+4 -4
View File
@@ -57,7 +57,7 @@ glabel func_800122D8
/* 012FAC 800123AC 02A02025 */ move $a0, $s5
/* 012FB0 800123B0 00002825 */ move $a1, $zero
/* 012FB4 800123B4 E6CA0018 */ swc1 $f10, 0x18($s6)
/* 012FB8 800123B8 0C0AD4AF */ jal func_802B52BC
/* 012FB8 800123B8 0C0AD4AF */ jal vec3s_set
/* 012FBC 800123BC 00003825 */ move $a3, $zero
/* 012FC0 800123C0 8FA40074 */ lw $a0, 0x74($sp)
/* 012FC4 800123C4 02A02825 */ move $a1, $s5
@@ -87,7 +87,7 @@ glabel func_800122D8
/* 013024 80012424 02A02025 */ move $a0, $s5
/* 013028 80012428 00002825 */ move $a1, $zero
/* 01302C 8001242C E6060018 */ swc1 $f6, 0x18($s0)
/* 013030 80012430 0C0AD4AF */ jal func_802B52BC
/* 013030 80012430 0C0AD4AF */ jal vec3s_set
/* 013034 80012434 00003825 */ move $a3, $zero
/* 013038 80012438 02202025 */ move $a0, $s1
/* 01303C 8001243C 02A02825 */ move $a1, $s5
@@ -121,7 +121,7 @@ glabel func_800122D8
/* 0130A4 800124A4 02A02025 */ move $a0, $s5
/* 0130A8 800124A8 00002825 */ move $a1, $zero
/* 0130AC 800124AC E6120018 */ swc1 $f18, 0x18($s0)
/* 0130B0 800124B0 0C0AD4AF */ jal func_802B52BC
/* 0130B0 800124B0 0C0AD4AF */ jal vec3s_set
/* 0130B4 800124B4 00003825 */ move $a3, $zero
/* 0130B8 800124B8 02202025 */ move $a0, $s1
/* 0130BC 800124BC 02A02825 */ move $a1, $s5
@@ -178,7 +178,7 @@ glabel func_800122D8
/* 01317C 8001257C E6060010 */ swc1 $f6, 0x10($s0)
/* 013180 80012580 00002825 */ move $a1, $zero
/* 013184 80012584 00003825 */ move $a3, $zero
/* 013188 80012588 0C0AD4AF */ jal func_802B52BC
/* 013188 80012588 0C0AD4AF */ jal vec3s_set
/* 01318C 8001258C E60A0018 */ swc1 $f10, 0x18($s0)
/* 013190 80012590 02202025 */ move $a0, $s1
/* 013194 80012594 02602825 */ move $a1, $s3
asm/non_matchings/code_802B0210/func_802B0788.s
+1 -1
View File
@@ -128,7 +128,7 @@ glabel func_802B0788
.L802B0964:
/* 119F74 802B0964 44060000 */ mfc1 $a2, $f0
/* 119F78 802B0968 44076000 */ mfc1 $a3, $f12
/* 119F7C 802B096C 0C0AD4A7 */ jal load_giant_egg
/* 119F7C 802B096C 0C0AD4A7 */ jal vec3f_set
/* 119F80 802B0970 AFA20030 */ sw $v0, 0x30($sp)
/* 119F84 802B0974 8FA30048 */ lw $v1, 0x48($sp)
/* 119F88 802B0978 27A40034 */ addiu $a0, $sp, 0x34
asm/non_matchings/code_802B0210/update_obj_banana.s
+1 -1
View File
@@ -192,7 +192,7 @@ glabel L802B2094
/* 11B920 802B2310 44060000 */ mfc1 $a2, $f0
/* 11B924 802B2314 44076000 */ mfc1 $a3, $f12
/* 11B928 802B2318 44051000 */ mfc1 $a1, $f2
/* 11B92C 802B231C 0C0AD4A7 */ jal load_giant_egg
/* 11B92C 802B231C 0C0AD4A7 */ jal vec3f_set
/* 11B930 802B2320 AFA20088 */ sw $v0, 0x88($sp)
/* 11B934 802B2324 8FA20088 */ lw $v0, 0x88($sp)
/* 11B938 802B2328 27A40068 */ addiu $a0, $sp, 0x68
asm/non_matchings/code_actors/func_8029B8E8.s
+8 -8
View File
@@ -139,7 +139,7 @@ glabel func_8029B8E8
/* 105110 8029BB00 27A40160 */ addiu $a0, $sp, 0x160
/* 105114 8029BB04 3C054188 */ lui $a1, 0x4188
/* 105118 8029BB08 3C0640C0 */ lui $a2, 0x40c0
/* 10511C 8029BB0C 0C0AD4A7 */ jal load_giant_egg
/* 10511C 8029BB0C 0C0AD4A7 */ jal vec3f_set
/* 105120 8029BB10 3C074200 */ lui $a3, 0x4200
/* 105124 8029BB14 27A400E0 */ addiu $a0, $sp, 0xe0
/* 105128 8029BB18 0C0AD548 */ jal mtxf_translate
@@ -174,7 +174,7 @@ glabel func_8029B8E8
/* 10519C 8029BB8C 27A40160 */ addiu $a0, $sp, 0x160
/* 1051A0 8029BB90 3C05C188 */ lui $a1, 0xc188
/* 1051A4 8029BB94 3C0640C0 */ lui $a2, 0x40c0
/* 1051A8 8029BB98 0C0AD4A7 */ jal load_giant_egg
/* 1051A8 8029BB98 0C0AD4A7 */ jal vec3f_set
/* 1051AC 8029BB9C 3C074200 */ lui $a3, 0x4200
/* 1051B0 8029BBA0 27A400E0 */ addiu $a0, $sp, 0xe0
/* 1051B4 8029BBA4 0C0AD548 */ jal mtxf_translate
@@ -211,7 +211,7 @@ glabel func_8029B8E8
/* 105230 8029BC20 27A40160 */ addiu $a0, $sp, 0x160
/* 105234 8029BC24 3C054188 */ lui $a1, 0x4188
/* 105238 8029BC28 3C0640C0 */ lui $a2, 0x40c0
/* 10523C 8029BC2C 0C0AD4A7 */ jal load_giant_egg
/* 10523C 8029BC2C 0C0AD4A7 */ jal vec3f_set
/* 105240 8029BC30 3C074180 */ lui $a3, 0x4180
/* 105244 8029BC34 27A400E0 */ addiu $a0, $sp, 0xe0
/* 105248 8029BC38 0C0AD548 */ jal mtxf_translate
@@ -248,7 +248,7 @@ glabel func_8029B8E8
/* 1052C4 8029BCB4 27A40160 */ addiu $a0, $sp, 0x160
/* 1052C8 8029BCB8 3C05C188 */ lui $a1, 0xc188
/* 1052CC 8029BCBC 3C0640C0 */ lui $a2, 0x40c0
/* 1052D0 8029BCC0 0C0AD4A7 */ jal load_giant_egg
/* 1052D0 8029BCC0 0C0AD4A7 */ jal vec3f_set
/* 1052D4 8029BCC4 3C074180 */ lui $a3, 0x4180
/* 1052D8 8029BCC8 27A400E0 */ addiu $a0, $sp, 0xe0
/* 1052DC 8029BCCC 0C0AD548 */ jal mtxf_translate
@@ -285,7 +285,7 @@ glabel func_8029B8E8
/* 105358 8029BD48 27A40160 */ addiu $a0, $sp, 0x160
/* 10535C 8029BD4C 3C054188 */ lui $a1, 0x4188
/* 105360 8029BD50 3C064140 */ lui $a2, 0x4140
/* 105364 8029BD54 0C0AD4A7 */ jal load_giant_egg
/* 105364 8029BD54 0C0AD4A7 */ jal vec3f_set
/* 105368 8029BD58 3C07C140 */ lui $a3, 0xc140
/* 10536C 8029BD5C 27A400E0 */ addiu $a0, $sp, 0xe0
/* 105370 8029BD60 0C0AD548 */ jal mtxf_translate
@@ -323,7 +323,7 @@ glabel func_8029B8E8
/* 1053F0 8029BDE0 27A40160 */ addiu $a0, $sp, 0x160
/* 1053F4 8029BDE4 3C05C188 */ lui $a1, 0xc188
/* 1053F8 8029BDE8 3C064140 */ lui $a2, 0x4140
/* 1053FC 8029BDEC 0C0AD4A7 */ jal load_giant_egg
/* 1053FC 8029BDEC 0C0AD4A7 */ jal vec3f_set
/* 105400 8029BDF0 3C07C140 */ lui $a3, 0xc140
/* 105404 8029BDF4 27A400E0 */ addiu $a0, $sp, 0xe0
/* 105408 8029BDF8 0C0AD548 */ jal mtxf_translate
@@ -360,7 +360,7 @@ glabel func_8029B8E8
/* 105484 8029BE74 27A40160 */ addiu $a0, $sp, 0x160
/* 105488 8029BE78 3C054188 */ lui $a1, 0x4188
/* 10548C 8029BE7C 3C064140 */ lui $a2, 0x4140
/* 105490 8029BE80 0C0AD4A7 */ jal load_giant_egg
/* 105490 8029BE80 0C0AD4A7 */ jal vec3f_set
/* 105494 8029BE84 3C07C208 */ lui $a3, 0xc208
/* 105498 8029BE88 27A400E0 */ addiu $a0, $sp, 0xe0
/* 10549C 8029BE8C 0C0AD548 */ jal mtxf_translate
@@ -397,7 +397,7 @@ glabel func_8029B8E8
/* 105518 8029BF08 27A40160 */ addiu $a0, $sp, 0x160
/* 10551C 8029BF0C 3C05C188 */ lui $a1, 0xc188
/* 105520 8029BF10 3C064140 */ lui $a2, 0x4140
/* 105524 8029BF14 0C0AD4A7 */ jal load_giant_egg
/* 105524 8029BF14 0C0AD4A7 */ jal vec3f_set
/* 105528 8029BF18 3C07C208 */ lui $a3, 0xc208
/* 10552C 8029BF1C 27A400E0 */ addiu $a0, $sp, 0xe0
/* 105530 8029BF20 0C0AD548 */ jal mtxf_translate
asm/non_matchings/code_actors/func_8029BFB0.s
+4 -4
View File
@@ -117,7 +117,7 @@ glabel func_8029BFB0
/* 105780 8029C170 27A400F4 */ addiu $a0, $sp, 0xf4
/* 105784 8029C174 3C054188 */ lui $a1, 0x4188
/* 105788 8029C178 3C0640C0 */ lui $a2, 0x40c0
/* 10578C 8029C17C 0C0AD4A7 */ jal load_giant_egg
/* 10578C 8029C17C 0C0AD4A7 */ jal vec3f_set
/* 105790 8029C180 3C074100 */ lui $a3, 0x4100
/* 105794 8029C184 27A400B4 */ addiu $a0, $sp, 0xb4
/* 105798 8029C188 0C0AD548 */ jal mtxf_translate
@@ -152,7 +152,7 @@ glabel func_8029BFB0
/* 10580C 8029C1FC 27A400F4 */ addiu $a0, $sp, 0xf4
/* 105810 8029C200 3C05C188 */ lui $a1, 0xc188
/* 105814 8029C204 3C0640C0 */ lui $a2, 0x40c0
/* 105818 8029C208 0C0AD4A7 */ jal load_giant_egg
/* 105818 8029C208 0C0AD4A7 */ jal vec3f_set
/* 10581C 8029C20C 3C074100 */ lui $a3, 0x4100
/* 105820 8029C210 27A400B4 */ addiu $a0, $sp, 0xb4
/* 105824 8029C214 0C0AD548 */ jal mtxf_translate
@@ -189,7 +189,7 @@ glabel func_8029BFB0
/* 1058A0 8029C290 27A400F4 */ addiu $a0, $sp, 0xf4
/* 1058A4 8029C294 3C054188 */ lui $a1, 0x4188
/* 1058A8 8029C298 3C0640C0 */ lui $a2, 0x40c0
/* 1058AC 8029C29C 0C0AD4A7 */ jal load_giant_egg
/* 1058AC 8029C29C 0C0AD4A7 */ jal vec3f_set
/* 1058B0 8029C2A0 3C07C100 */ lui $a3, 0xc100
/* 1058B4 8029C2A4 27A400B4 */ addiu $a0, $sp, 0xb4
/* 1058B8 8029C2A8 0C0AD548 */ jal mtxf_translate
@@ -226,7 +226,7 @@ glabel func_8029BFB0
/* 105934 8029C324 27A400F4 */ addiu $a0, $sp, 0xf4
/* 105938 8029C328 3C05C188 */ lui $a1, 0xc188
/* 10593C 8029C32C 3C0640C0 */ lui $a2, 0x40c0
/* 105940 8029C330 0C0AD4A7 */ jal load_giant_egg
/* 105940 8029C330 0C0AD4A7 */ jal vec3f_set
/* 105944 8029C334 3C07C100 */ lui $a3, 0xc100
/* 105948 8029C338 27A400B4 */ addiu $a0, $sp, 0xb4
/* 10594C 8029C33C 0C0AD548 */ jal mtxf_translate
asm/non_matchings/code_actors/func_8029C3CC.s
+8 -8
View File
@@ -139,7 +139,7 @@ glabel func_8029C3CC
/* 105BF4 8029C5E4 27A4011C */ addiu $a0, $sp, 0x11c
/* 105BF8 8029C5E8 3C054188 */ lui $a1, 0x4188
/* 105BFC 8029C5EC 3C0640C0 */ lui $a2, 0x40c0
/* 105C00 8029C5F0 0C0AD4A7 */ jal load_giant_egg
/* 105C00 8029C5F0 0C0AD4A7 */ jal vec3f_set
/* 105C04 8029C5F4 3C0741E0 */ lui $a3, 0x41e0
/* 105C08 8029C5F8 27A400DC */ addiu $a0, $sp, 0xdc
/* 105C0C 8029C5FC 0C0AD548 */ jal mtxf_translate
@@ -174,7 +174,7 @@ glabel func_8029C3CC
/* 105C80 8029C670 27A4011C */ addiu $a0, $sp, 0x11c
/* 105C84 8029C674 3C05C188 */ lui $a1, 0xc188
/* 105C88 8029C678 3C0640C0 */ lui $a2, 0x40c0
/* 105C8C 8029C67C 0C0AD4A7 */ jal load_giant_egg
/* 105C8C 8029C67C 0C0AD4A7 */ jal vec3f_set
/* 105C90 8029C680 3C0741E0 */ lui $a3, 0x41e0
/* 105C94 8029C684 27A400DC */ addiu $a0, $sp, 0xdc
/* 105C98 8029C688 0C0AD548 */ jal mtxf_translate
@@ -211,7 +211,7 @@ glabel func_8029C3CC
/* 105D14 8029C704 27A4011C */ addiu $a0, $sp, 0x11c
/* 105D18 8029C708 3C054188 */ lui $a1, 0x4188
/* 105D1C 8029C70C 3C0640C0 */ lui $a2, 0x40c0
/* 105D20 8029C710 0C0AD4A7 */ jal load_giant_egg
/* 105D20 8029C710 0C0AD4A7 */ jal vec3f_set
/* 105D24 8029C714 3C074140 */ lui $a3, 0x4140
/* 105D28 8029C718 27A400DC */ addiu $a0, $sp, 0xdc
/* 105D2C 8029C71C 0C0AD548 */ jal mtxf_translate
@@ -248,7 +248,7 @@ glabel func_8029C3CC
/* 105DA8 8029C798 27A4011C */ addiu $a0, $sp, 0x11c
/* 105DAC 8029C79C 3C05C188 */ lui $a1, 0xc188
/* 105DB0 8029C7A0 3C0640C0 */ lui $a2, 0x40c0
/* 105DB4 8029C7A4 0C0AD4A7 */ jal load_giant_egg
/* 105DB4 8029C7A4 0C0AD4A7 */ jal vec3f_set
/* 105DB8 8029C7A8 3C074140 */ lui $a3, 0x4140
/* 105DBC 8029C7AC 27A400DC */ addiu $a0, $sp, 0xdc
/* 105DC0 8029C7B0 0C0AD548 */ jal mtxf_translate
@@ -285,7 +285,7 @@ glabel func_8029C3CC
/* 105E3C 8029C82C 27A4011C */ addiu $a0, $sp, 0x11c
/* 105E40 8029C830 3C054188 */ lui $a1, 0x4188
/* 105E44 8029C834 3C0640C0 */ lui $a2, 0x40c0
/* 105E48 8029C838 0C0AD4A7 */ jal load_giant_egg
/* 105E48 8029C838 0C0AD4A7 */ jal vec3f_set
/* 105E4C 8029C83C 3C07C100 */ lui $a3, 0xc100
/* 105E50 8029C840 27A400DC */ addiu $a0, $sp, 0xdc
/* 105E54 8029C844 0C0AD548 */ jal mtxf_translate
@@ -322,7 +322,7 @@ glabel func_8029C3CC
/* 105ED0 8029C8C0 27A4011C */ addiu $a0, $sp, 0x11c
/* 105ED4 8029C8C4 3C05C188 */ lui $a1, 0xc188
/* 105ED8 8029C8C8 3C0640C0 */ lui $a2, 0x40c0
/* 105EDC 8029C8CC 0C0AD4A7 */ jal load_giant_egg
/* 105EDC 8029C8CC 0C0AD4A7 */ jal vec3f_set
/* 105EE0 8029C8D0 3C07C100 */ lui $a3, 0xc100
/* 105EE4 8029C8D4 27A400DC */ addiu $a0, $sp, 0xdc
/* 105EE8 8029C8D8 0C0AD548 */ jal mtxf_translate
@@ -359,7 +359,7 @@ glabel func_8029C3CC
/* 105F64 8029C954 27A4011C */ addiu $a0, $sp, 0x11c
/* 105F68 8029C958 3C054188 */ lui $a1, 0x4188
/* 105F6C 8029C95C 3C0640C0 */ lui $a2, 0x40c0
/* 105F70 8029C960 0C0AD4A7 */ jal load_giant_egg
/* 105F70 8029C960 0C0AD4A7 */ jal vec3f_set
/* 105F74 8029C964 3C07C1C0 */ lui $a3, 0xc1c0
/* 105F78 8029C968 27A400DC */ addiu $a0, $sp, 0xdc
/* 105F7C 8029C96C 0C0AD548 */ jal mtxf_translate
@@ -396,7 +396,7 @@ glabel func_8029C3CC
/* 105FF8 8029C9E8 27A4011C */ addiu $a0, $sp, 0x11c
/* 105FFC 8029C9EC 3C05C188 */ lui $a1, 0xc188
/* 106000 8029C9F0 3C0640C0 */ lui $a2, 0x40c0
/* 106004 8029C9F4 0C0AD4A7 */ jal load_giant_egg
/* 106004 8029C9F4 0C0AD4A7 */ jal vec3f_set
/* 106008 8029C9F8 3C07C1C0 */ lui $a3, 0xc1c0
/* 10600C 8029C9FC 27A400DC */ addiu $a0, $sp, 0xdc
/* 106010 8029CA00 0C0AD548 */ jal mtxf_translate
asm/non_matchings/code_actors/func_8029DB44.s
+11 -11
View File
@@ -43,7 +43,7 @@ glabel L8029DBBC
/* 1071F4 8029DBE4 34E78000 */ ori $a3, (0xC4A28000 & 0xFFFF) # ori $a3, $a3, 0x8000
/* 1071F8 8029DBE8 27A40040 */ addiu $a0, $sp, 0x40
/* 1071FC 8029DBEC 3C054316 */ lui $a1, 0x4316
/* 107200 8029DBF0 0C0AD4A7 */ jal load_giant_egg
/* 107200 8029DBF0 0C0AD4A7 */ jal vec3f_set
/* 107204 8029DBF4 3C064220 */ lui $a2, 0x4220
/* 107208 8029DBF8 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 10720C 8029DBFC C426F784 */ lwc1 $f6, %lo(gCourseDirection)($at)
@@ -59,7 +59,7 @@ glabel L8029DBBC
/* 107234 8029DC24 34A58000 */ ori $a1, (0x451D8000 & 0xFFFF) # ori $a1, $a1, 0x8000
/* 107238 8029DC28 27A40040 */ addiu $a0, $sp, 0x40
/* 10723C 8029DC2C 24060000 */ li $a2, 0
/* 107240 8029DC30 0C0AD4A7 */ jal load_giant_egg
/* 107240 8029DC30 0C0AD4A7 */ jal vec3f_set
/* 107244 8029DC34 3C07449B */ lui $a3, 0x449b
/* 107248 8029DC38 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 10724C 8029DC3C C430F784 */ lwc1 $f16, %lo(gCourseDirection)($at)
@@ -117,7 +117,7 @@ glabel L8029DCDC
/* 10730C 8029DCFC 34E78000 */ ori $a3, (0x441E8000 & 0xFFFF) # ori $a3, $a3, 0x8000
/* 107310 8029DD00 34A5C000 */ ori $a1, (0xC50FC000 & 0xFFFF) # ori $a1, $a1, 0xc000
/* 107314 8029DD04 27A40040 */ addiu $a0, $sp, 0x40
/* 107318 8029DD08 0C0AD4A7 */ jal load_giant_egg
/* 107318 8029DD08 0C0AD4A7 */ jal vec3f_set
/* 10731C 8029DD0C 24060000 */ li $a2, 0
/* 107320 8029DD10 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 107324 8029DD14 C426F784 */ lwc1 $f6, %lo(gCourseDirection)($at)
@@ -211,7 +211,7 @@ glabel L8029DE3C
/* 107464 8029DE54 27A40040 */ addiu $a0, $sp, 0x40
/* 107468 8029DE58 3C05C4D2 */ lui $a1, 0xc4d2
/* 10746C 8029DE5C 3C064000 */ lui $a2, 0x4000
/* 107470 8029DE60 0C0AD4A7 */ jal load_giant_egg
/* 107470 8029DE60 0C0AD4A7 */ jal vec3f_set
/* 107474 8029DE64 3C07420C */ lui $a3, 0x420c
/* 107478 8029DE68 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 10747C 8029DE6C C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at)
@@ -233,7 +233,7 @@ glabel L8029DE3C
/* 1074BC 8029DEAC 27A40040 */ addiu $a0, $sp, 0x40
/* 1074C0 8029DEB0 3C05C4C8 */ lui $a1, 0xc4c8
/* 1074C4 8029DEB4 3C064000 */ lui $a2, 0x4000
/* 1074C8 8029DEB8 0C0AD4A7 */ jal load_giant_egg
/* 1074C8 8029DEB8 0C0AD4A7 */ jal vec3f_set
/* 1074CC 8029DEBC 3C07420C */ lui $a3, 0x420c
/* 1074D0 8029DEC0 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 1074D4 8029DEC4 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at)
@@ -255,14 +255,14 @@ glabel L8029DE3C
/* 107514 8029DF04 27A4002C */ addiu $a0, $sp, 0x2c
/* 107518 8029DF08 00002825 */ move $a1, $zero
/* 10751C 8029DF0C 2406E000 */ li $a2, -8192
/* 107520 8029DF10 0C0AD4AF */ jal func_802B52BC
/* 107520 8029DF10 0C0AD4AF */ jal vec3s_set
/* 107524 8029DF14 00003825 */ move $a3, $zero
/* 107528 8029DF18 3C05C519 */ lui $a1, (0xC519B000 >> 16) # lui $a1, 0xc519
/* 10752C 8029DF1C 3C07450D */ lui $a3, (0x450D7000 >> 16) # lui $a3, 0x450d
/* 107530 8029DF20 34E77000 */ ori $a3, (0x450D7000 & 0xFFFF) # ori $a3, $a3, 0x7000
/* 107534 8029DF24 34A5B000 */ ori $a1, (0xC519B000 & 0xFFFF) # ori $a1, $a1, 0xb000
/* 107538 8029DF28 27A40040 */ addiu $a0, $sp, 0x40
/* 10753C 8029DF2C 0C0AD4A7 */ jal load_giant_egg
/* 10753C 8029DF2C 0C0AD4A7 */ jal vec3f_set
/* 107540 8029DF30 3C064000 */ lui $a2, 0x4000
/* 107544 8029DF34 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 107548 8029DF38 C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at)
@@ -285,7 +285,7 @@ glabel L8029DE3C
/* 10758C 8029DF7C 34E77000 */ ori $a3, (0x45147000 & 0xFFFF) # ori $a3, $a3, 0x7000
/* 107590 8029DF80 34A53000 */ ori $a1, (0xC51A3000 & 0xFFFF) # ori $a1, $a1, 0x3000
/* 107594 8029DF84 27A40040 */ addiu $a0, $sp, 0x40
/* 107598 8029DF88 0C0AD4A7 */ jal load_giant_egg
/* 107598 8029DF88 0C0AD4A7 */ jal vec3f_set
/* 10759C 8029DF8C 3C064000 */ lui $a2, 0x4000
/* 1075A0 8029DF90 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 1075A4 8029DF94 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at)
@@ -323,7 +323,7 @@ glabel L8029DFFC
/* 107618 8029E008 27A40040 */ addiu $a0, $sp, 0x40
/* 10761C 8029E00C 3C05C303 */ lui $a1, 0xc303
/* 107620 8029E010 3C0642A6 */ lui $a2, 0x42a6
/* 107624 8029E014 0C0AD4A7 */ jal load_giant_egg
/* 107624 8029E014 0C0AD4A7 */ jal vec3f_set
/* 107628 8029E018 3C07438F */ lui $a3, 0x438f
/* 10762C 8029E01C 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 107630 8029E020 C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at)
@@ -339,7 +339,7 @@ glabel L8029DFFC
/* 107658 8029E048 34A51000 */ ori $a1, (0xC5131000 & 0xFFFF) # ori $a1, $a1, 0x1000
/* 10765C 8029E04C 27A40040 */ addiu $a0, $sp, 0x40
/* 107660 8029E050 3C064290 */ lui $a2, 0x4290
/* 107664 8029E054 0C0AD4A7 */ jal load_giant_egg
/* 107664 8029E054 0C0AD4A7 */ jal vec3f_set
/* 107668 8029E058 3C07C4C9 */ lui $a3, 0xc4c9
/* 10766C 8029E05C 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 107670 8029E060 C42AF784 */ lwc1 $f10, %lo(gCourseDirection)($at)
@@ -356,7 +356,7 @@ glabel L8029DFFC
/* 10769C 8029E08C 34E7C000 */ ori $a3, (0x4438C000 & 0xFFFF) # ori $a3, $a3, 0xc000
/* 1076A0 8029E090 34A5E000 */ ori $a1, (0xC523E000 & 0xFFFF) # ori $a1, $a1, 0xe000
/* 1076A4 8029E094 27A40040 */ addiu $a0, $sp, 0x40
/* 1076A8 8029E098 0C0AD4A7 */ jal load_giant_egg
/* 1076A8 8029E098 0C0AD4A7 */ jal vec3f_set
/* 1076AC 8029E09C 3C06429E */ lui $a2, 0x429e
/* 1076B0 8029E0A0 3C018016 */ lui $at, %hi(gCourseDirection) # $at, 0x8016
/* 1076B4 8029E0A4 C424F784 */ lwc1 $f4, %lo(gCourseDirection)($at)
asm/non_matchings/code_actors/func_8029ED38.s
+2 -2
View File
@@ -7,12 +7,12 @@ glabel func_8029ED38
/* 10835C 8029ED4C 44050000 */ mfc1 $a1, $f0
/* 108360 8029ED50 44060000 */ mfc1 $a2, $f0
/* 108364 8029ED54 44070000 */ mfc1 $a3, $f0
/* 108368 8029ED58 0C0AD4A7 */ jal load_giant_egg
/* 108368 8029ED58 0C0AD4A7 */ jal vec3f_set
/* 10836C 8029ED5C 27A40024 */ addiu $a0, $sp, 0x24
/* 108370 8029ED60 27A4001C */ addiu $a0, $sp, 0x1c
/* 108374 8029ED64 00002825 */ move $a1, $zero
/* 108378 8029ED68 00003025 */ move $a2, $zero
/* 10837C 8029ED6C 0C0AD4AF */ jal func_802B52BC
/* 10837C 8029ED6C 0C0AD4AF */ jal vec3s_set
/* 108380 8029ED70 00003825 */ move $a3, $zero
/* 108384 8029ED74 8FA40030 */ lw $a0, 0x30($sp)
/* 108388 8029ED78 27A5001C */ addiu $a1, $sp, 0x1c
asm/non_matchings/code_actors/place_all_item_boxes.s
+1 -1
View File
@@ -37,7 +37,7 @@ glabel place_all_item_boxes
/* 106ECC 8029D8BC 44050000 */ mfc1 $a1, $f0
/* 106ED0 8029D8C0 44060000 */ mfc1 $a2, $f0
/* 106ED4 8029D8C4 44070000 */ mfc1 $a3, $f0
/* 106ED8 8029D8C8 0C0AD4A7 */ jal load_giant_egg
/* 106ED8 8029D8C8 0C0AD4A7 */ jal vec3f_set
/* 106EDC 8029D8CC 00000000 */ nop
/* 106EE0 8029D8D0 86030000 */ lh $v1, ($s0)
/* 106EE4 8029D8D4 24138000 */ li $s3, -32768
asm/non_matchings/code_actors/place_falling_rocks.s
+2 -2
View File
@@ -56,12 +56,12 @@ glabel place_falling_rocks
/* 1066FC 8029D0EC 44893000 */ mtc1 $t1, $f6
/* 106700 8029D0F0 00000000 */ nop
/* 106704 8029D0F4 46803220 */ cvt.s.w $f8, $f6
/* 106708 8029D0F8 0C0AD4A7 */ jal load_giant_egg
/* 106708 8029D0F8 0C0AD4A7 */ jal vec3f_set
/* 10670C 8029D0FC E7A8006C */ swc1 $f8, 0x6c($sp)
/* 106710 8029D100 02402025 */ move $a0, $s2
/* 106714 8029D104 00002825 */ move $a1, $zero
/* 106718 8029D108 00003025 */ move $a2, $zero
/* 10671C 8029D10C 0C0AD4AF */ jal func_802B52BC
/* 10671C 8029D10C 0C0AD4AF */ jal vec3s_set
/* 106720 8029D110 00003825 */ move $a3, $zero
/* 106724 8029D114 02802025 */ move $a0, $s4
/* 106728 8029D118 02402825 */ move $a1, $s2
asm/non_matchings/code_actors/place_palm_trees.s
+2 -2
View File
@@ -27,13 +27,13 @@ glabel place_palm_trees
/* 1063F4 8029CDE4 AFB1002C */ sw $s1, 0x2c($sp)
/* 1063F8 8029CDE8 F7B40020 */ sdc1 $f20, 0x20($sp)
/* 1063FC 8029CDEC 02018021 */ addu $s0, $s0, $at
/* 106400 8029CDF0 0C0AD4A7 */ jal load_giant_egg
/* 106400 8029CDF0 0C0AD4A7 */ jal vec3f_set
/* 106404 8029CDF4 02C02025 */ move $a0, $s6
/* 106408 8029CDF8 27B70058 */ addiu $s7, $sp, 0x58
/* 10640C 8029CDFC 02E02025 */ move $a0, $s7
/* 106410 8029CE00 00002825 */ move $a1, $zero
/* 106414 8029CE04 00003025 */ move $a2, $zero
/* 106418 8029CE08 0C0AD4AF */ jal func_802B52BC
/* 106418 8029CE08 0C0AD4AF */ jal vec3s_set
/* 10641C 8029CE0C 00003825 */ move $a3, $zero
/* 106420 8029CE10 86020000 */ lh $v0, ($s0)
/* 106424 8029CE14 241E8000 */ li $fp, -32768
asm/non_matchings/code_actors/place_piranha_plants.s
+2 -2
View File
@@ -26,13 +26,13 @@ glabel place_piranha_plants
/* 106284 8029CC74 AFB20020 */ sw $s2, 0x20($sp)
/* 106288 8029CC78 AFB1001C */ sw $s1, 0x1c($sp)
/* 10628C 8029CC7C 02018021 */ addu $s0, $s0, $at
/* 106290 8029CC80 0C0AD4A7 */ jal load_giant_egg
/* 106290 8029CC80 0C0AD4A7 */ jal vec3f_set
/* 106294 8029CC84 03C02025 */ move $a0, $fp
/* 106298 8029CC88 27B2004C */ addiu $s2, $sp, 0x4c
/* 10629C 8029CC8C 02402025 */ move $a0, $s2
/* 1062A0 8029CC90 00002825 */ move $a1, $zero
/* 1062A4 8029CC94 00003025 */ move $a2, $zero
/* 1062A8 8029CC98 0C0AD4AF */ jal func_802B52BC
/* 1062A8 8029CC98 0C0AD4AF */ jal vec3s_set
/* 1062AC 8029CC9C 00003825 */ move $a3, $zero
/* 1062B0 8029CCA0 86110000 */ lh $s1, ($s0)
/* 1062B4 8029CCA4 24138000 */ li $s3, -32768
asm/non_matchings/code_actors/place_segment_06.s
+1 -1
View File
@@ -27,7 +27,7 @@ glabel place_segment_06
/* 106BF8 8029D5E8 AFB00030 */ sw $s0, 0x30($sp)
/* 106BFC 8029D5EC F7B60028 */ sdc1 $f22, 0x28($sp)
/* 106C00 8029D5F0 02619821 */ addu $s3, $s3, $at
/* 106C04 8029D5F4 0C0AD4A7 */ jal load_giant_egg
/* 106C04 8029D5F4 0C0AD4A7 */ jal vec3f_set
/* 106C08 8029D5F8 27A40080 */ addiu $a0, $sp, 0x80
/* 106C0C 8029D5FC 24084000 */ li $t0, 16384
/* 106C10 8029D600 A7A80078 */ sh $t0, 0x78($sp)
asm/non_matchings/memory/func_802AAAAC.s
+3 -3
View File
@@ -18,21 +18,21 @@ glabel func_802AAAAC
/* 1140FC 802AAAEC 3C073F80 */ lui $a3, 0x3f80
/* 114100 802AAAF0 E482FFF4 */ swc1 $f2, -0xc($a0)
/* 114104 802AAAF4 E482FFF8 */ swc1 $f2, -8($a0)
/* 114108 802AAAF8 0C0AD4A7 */ jal load_giant_egg
/* 114108 802AAAF8 0C0AD4A7 */ jal vec3f_set
/* 11410C 802AAAFC E482FFFC */ swc1 $f2, -4($a0)
/* 114110 802AAB00 44800000 */ mtc1 $zero, $f0
/* 114114 802AAB04 26040024 */ addiu $a0, $s0, 0x24
/* 114118 802AAB08 3C053F80 */ lui $a1, 0x3f80
/* 11411C 802AAB0C 44060000 */ mfc1 $a2, $f0
/* 114120 802AAB10 44070000 */ mfc1 $a3, $f0
/* 114124 802AAB14 0C0AD4A7 */ jal load_giant_egg
/* 114124 802AAB14 0C0AD4A7 */ jal vec3f_set
/* 114128 802AAB18 00000000 */ nop
/* 11412C 802AAB1C 44800000 */ mtc1 $zero, $f0
/* 114130 802AAB20 26040030 */ addiu $a0, $s0, 0x30
/* 114134 802AAB24 3C063F80 */ lui $a2, 0x3f80
/* 114138 802AAB28 44050000 */ mfc1 $a1, $f0
/* 11413C 802AAB2C 44070000 */ mfc1 $a3, $f0
/* 114140 802AAB30 0C0AD4A7 */ jal load_giant_egg
/* 114140 802AAB30 0C0AD4A7 */ jal vec3f_set
/* 114144 802AAB34 00000000 */ nop
/* 114148 802AAB38 8FBF001C */ lw $ra, 0x1c($sp)
/* 11414C 802AAB3C 8FB00018 */ lw $s0, 0x18($sp)
src/code_800029B0.c
+14 -14
View File
@@ -53,7 +53,7 @@ void func_800CA008(u8, u8);
extern f32 D_8015F738, D_8015F748, D_8015F758, D_8015F768, D_8015F778;
extern u32 *D_802B91C8;
void load_giant_egg(f32 *, f32, f32, f32);
void vec3f_set(f32 *, f32, f32, f32);
// gfx?
extern u32 *D_0F04FE28;
@@ -195,33 +195,33 @@ void func_80002A18(void) {
void func_80002DAC(void) {
switch (gCurrentCourseId) {
case COURSE_MARIO_RACEWAY:
load_giant_egg(&D_8015F748, -223.0f, 94.0f, -155.0f);
vec3f_set(&D_8015F748, -223.0f, 94.0f, -155.0f);
func_800C9D80(&D_8015F748, &D_802B91C8, 0x5103700B);
break;
case COURSE_ROYAL_RACEWAY:
load_giant_egg(&D_8015F748, 177.0f, 87.0f, -393.0f);
vec3f_set(&D_8015F748, 177.0f, 87.0f, -393.0f);
func_800C9D80(&D_8015F748, &D_802B91C8, 0x5103700B);
break;
case COURSE_LUIGI_RACEWAY:
load_giant_egg(&D_8015F748, 85.0f, 21.0f, -219.0f);
vec3f_set(&D_8015F748, 85.0f, 21.0f, -219.0f);
func_800C9D80(&D_8015F748, &D_802B91C8, 0x5103700B);
break;
case COURSE_WARIO_STADIUM:
load_giant_egg(&D_8015F748, 298.0f, 202.0f, -850.0f);
vec3f_set(&D_8015F748, 298.0f, 202.0f, -850.0f);
func_800C9D80(&D_8015F748, &D_802B91C8, 0x5103700B);
load_giant_egg(&D_8015F758, -1600.0f, 202.0f, -2430.0f);
vec3f_set(&D_8015F758, -1600.0f, 202.0f, -2430.0f);
func_800C9D80(&D_8015F758, &D_802B91C8, 0x5103700B);
load_giant_egg(&D_8015F768, -2708.0f, 202.0f, 1762.0f);
vec3f_set(&D_8015F768, -2708.0f, 202.0f, 1762.0f);
func_800C9D80(&D_8015F768, &D_802B91C8, 0x5103700B);
load_giant_egg(&D_8015F778, -775.0f, 202.0f, 1930.0f);
vec3f_set(&D_8015F778, -775.0f, 202.0f, 1930.0f);
func_800C9D80(&D_8015F778, &D_802B91C8, 0x5103700B);
break;
case COURSE_KOOPA_BEACH:
load_giant_egg(&D_8015F738, 153.0f, 0.0f, 2319.0f);
vec3f_set(&D_8015F738, 153.0f, 0.0f, 2319.0f);
func_800C9D80(&D_8015F738, &D_802B91C8, 0x51028001);
break;
case COURSE_DK_JUNGLE:
load_giant_egg(&D_8015F738, -790.0f, -255.0f, -447.0f);
vec3f_set(&D_8015F738, -790.0f, -255.0f, -447.0f);
func_800C9D80(&D_8015F738, &D_802B91C8, 0x51028001);
break;
default:
@@ -264,7 +264,7 @@ void func_80003040(void) {
func_802AF8BC(0x7000878, -0x80, 0, 0, 0);
break;
case COURSE_YOSHI_VALLEY:
load_giant_egg(&sp34, -2300.0f, 0.0f, 634.0f);
vec3f_set(&sp34, -2300.0f, 0.0f, 634.0f);
sp34 *= gCourseDirection;
func_8029EC88(&sp34, &sp20, &sp28, 9);
break;
@@ -293,11 +293,11 @@ void func_80003040(void) {
func_802AF8BC(0x7001318, -1, 0xFF, 0xFF, 0);
break;
case COURSE_WARIO_STADIUM:
load_giant_egg(&sp34, -131.0f, 83.0f, 286.0f);
vec3f_set(&sp34, -131.0f, 83.0f, 286.0f);
func_8029EC88(&sp34, &sp20, &sp28, 0x23);
load_giant_egg(&sp34, -2353.0f, 72.0f, -1608.0f);
vec3f_set(&sp34, -2353.0f, 72.0f, -1608.0f);
func_8029EC88(&sp34, &sp20, &sp28, 0x23);
load_giant_egg(&sp34, -2622.0f, 79.0f, 739.0f);
vec3f_set(&sp34, -2622.0f, 79.0f, 739.0f);
func_8029EC88(&sp34, &sp20, &sp28, 0x23);
func_802AF8BC(0x7000C50, 0x64, 0xFF, 0xFF, 0xFF);
func_802AF8BC(0x7000BD8, 0x64, 0xFF, 0xFF, 0xFF);
src/code_80005FD0.c
+5 -5
View File
@@ -8217,7 +8217,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80012220.s")
s16 func_8000DBAC(? *, ? *, s32); // extern
? func_80012220(? *); // extern
s16 func_8029EC88(? *, ? *, ? *, ?); // extern
? func_802B52BC(? *, ?, s16, ?); // extern
? vec3s_set(? *, ?, s16, ?); // extern
extern ? D_801635A0;
extern ? D_801635A4;
extern ? D_801635B0;
@@ -8313,7 +8313,7 @@ void func_800122D8(void) {
phi_s0->unk24 = func_8000DBAC(temp_s1, phi_s0 + 0x1C, phi_s0->unk20);
phi_s0->unk10 = phi_s0->unk4 - temp_f20;
phi_s0->unk18 = phi_s0->unkC - temp_f22;
func_802B52BC(&sp90, 0, phi_s0->unk24, 0);
vec3s_set(&sp90, 0, phi_s0->unk24, 0);
phi_s0->unk1E = func_8029EC88(temp_s1, &sp90, phi_s0 + 0x10, 0x26);
}
temp_s0 = phi_s0 + 0x2C;
@@ -8332,7 +8332,7 @@ void func_800122D8(void) {
temp_a2 = func_8000DBAC(sp74, sp70, phi_s6->unkFC);
phi_s6->unk10 = phi_s6->unk4 - temp_f20_2;
phi_s6->unk18 = phi_s6->unkC - temp_f22_2;
func_802B52BC(&spAC, 0, temp_a2, 0);
vec3s_set(&spAC, 0, temp_a2, 0);
temp_s0_2 = phi_s6 + 0x24;
phi_s6->unk1E = func_8029EC88(sp74, &spAC, sp54, 0xF);
temp_s1_2 = temp_s0_2 + 4;
@@ -8342,7 +8342,7 @@ void func_800122D8(void) {
temp_a2_2 = func_8000DBAC(temp_s1_2, temp_s0_2 + 0x1C, phi_s6->unkFC);
temp_s0_2->unk10 = temp_s0_2->unk4 - temp_f20_3;
temp_s0_2->unk18 = temp_s0_2->unkC - temp_f22_3;
func_802B52BC(&spAC, 0, temp_a2_2, 0);
vec3s_set(&spAC, 0, temp_a2_2, 0);
temp_s0_2->unk1E = func_8029EC88(temp_s1_2, &spAC, temp_s0_2 + 0x10, 0x10);
}
phi_s2 = sp68;
@@ -8356,7 +8356,7 @@ loop_8:
temp_a2_3 = func_8000DBAC(temp_s1_3, temp_s0_3 + 0x1C, phi_s6->unkFC);
temp_s0_3->unk10 = temp_s0_3->unk4 - temp_f20_4;
temp_s0_3->unk18 = temp_s0_3->unkC - temp_f22_4;
func_802B52BC(&spAC, 0, temp_a2_3, 0);
vec3s_set(&spAC, 0, temp_a2_3, 0);
temp_s0_3->unk1E = func_8029EC88(temp_s1_3, &spAC, temp_s0_3 + 0x10, 0x11);
}
temp_s3 = phi_s3 + 0x24;
src/code_80296A50.c
+67 -64
View File
@@ -18,8 +18,8 @@ void func_802B5F74(Mat4, Vec3f, Vec3s);
void func_802B5F00(Mat4, f32);
void mtxf_translate(Mat4, Vec3f); /* extern */
void func_802B52BC(Vec3s, s16, s16, s16);
void load_giant_egg(Vec3f, f32, f32, f32);
void vec3s_set(Vec3s, s16, s16, s16);
void vec3f_set(Vec3f, f32, f32, f32);
s16 func_8029EC88(Vec3f, Vec3s, Vec3f, s16);
extern Player gPlayers[];
@@ -2053,7 +2053,7 @@ GLOBAL_ASM("asm/non_matchings/code_actors/func_8029AC18.s")
void mtxf_translate(Mat4, Vec3f); // extern
void func_802B59DC(Mat4, s32); // extern
void func_802B71CC(Mat4, Mat4, Mat4); // extern
void load_giant_egg(Vec3f, f32, f32, f32); // extern
void vec3f_set(Vec3f, f32, f32, f32); // extern
extern s8 D_0600E058[];
extern s8 D_0600E730[];
extern s8 D_0600FC28[];
@@ -2084,7 +2084,7 @@ void func_8029AE1C(Camera *arg0, struct PaddleWheelBoat *boat, Mat4 arg2, u16 ar
gSPDisplayList(gDisplayListHead++, &D_0600E058);
func_802B59DC(spE0, boat->wheelRot);
load_giant_egg(sp120, 0, 16.0f, -255.0f);
vec3f_set(sp120, 0, 16.0f, -255.0f);
mtxf_translate(spA0, sp120);
func_802B71CC(sp60, spE0, spA0);
if (func_802B4FF8(sp60, 3) != 0) {
@@ -2281,7 +2281,7 @@ s32 func_802B4FF8(f32 (*)[4], ?); /* extern */
? func_802B59DC(f32 (*)[4], s16); /* extern */
? func_802B5F74(f32 (*)[4], f32 *, s16 *); /* extern */
f32 func_802B80D0(f32 *, u16, ?, f32, f32); /* extern */
? load_giant_egg(f32 *, ?, ?, ?); /* extern */
? vec3f_set(f32 *, ?, ?, ?); /* extern */
extern ? D_0601B978;
extern ? D_0601C0F0;
extern ? D_0601D160;
@@ -2381,7 +2381,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_9->words.w1 = (u32) &D_06022D28;
temp_v0_9->words.w0 = 0x06000000;
func_802B59DC((f32 (*)[4]) &sp120[0], actor->wheelRot);
load_giant_egg(&sp160, 0x41880000, 0x40C00000, 0x42000000);
vec3f_set(&sp160, 0x41880000, 0x40C00000, 0x42000000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2395,7 +2395,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_11->words.w0 = 0xBD000000;
sp30 = &D_06022DB8;
func_802B59DC((f32 (*)[4]) &sp120[0], actor->wheelRot);
load_giant_egg(&sp160, 0xC1880000, 0x40C00000, 0x42000000);
vec3f_set(&sp160, 0xC1880000, 0x40C00000, 0x42000000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2408,7 +2408,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_13->words.w1 = 0;
temp_v0_13->words.w0 = 0xBD000000;
func_802B59DC((f32 (*)[4]) &sp120[0], (s16) (actor->wheelRot + 0x16C));
load_giant_egg(&sp160, 0x41880000, 0x40C00000, 0x41800000);
vec3f_set(&sp160, 0x41880000, 0x40C00000, 0x41800000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2421,7 +2421,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_15->words.w1 = 0;
temp_v0_15->words.w0 = 0xBD000000;
func_802B59DC((f32 (*)[4]) &sp120[0], (s16) (actor->wheelRot + 0x16C));
load_giant_egg(&sp160, 0xC1880000, 0x40C00000, 0x41800000);
vec3f_set(&sp160, 0xC1880000, 0x40C00000, 0x41800000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2434,7 +2434,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_17->words.w1 = 0;
temp_v0_17->words.w0 = 0xBD000000;
func_802B59DC((f32 (*)[4]) &sp120[0], (s16) (actor->wheelRot + 0x444));
load_giant_egg(&sp160, 0x41880000, 0x41400000, 0xC1400000);
vec3f_set(&sp160, 0x41880000, 0x41400000, 0xC1400000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2448,7 +2448,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_19->words.w0 = 0xBD000000;
sp30 = &D_06022D70;
func_802B59DC((f32 (*)[4]) &sp120[0], (s16) (actor->wheelRot + 0x444));
load_giant_egg(&sp160, 0xC1880000, 0x41400000, 0xC1400000);
vec3f_set(&sp160, 0xC1880000, 0x41400000, 0xC1400000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2461,7 +2461,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_21->words.w1 = 0;
temp_v0_21->words.w0 = 0xBD000000;
func_802B59DC((f32 (*)[4]) &sp120[0], (s16) (actor->wheelRot + 0x2D8));
load_giant_egg(&sp160, 0x41880000, 0x41400000, 0xC2080000);
vec3f_set(&sp160, 0x41880000, 0x41400000, 0xC2080000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2474,7 +2474,7 @@ void func_8029B8E8(Camera *camera, struct TrainCar *actor) {
temp_v0_23->words.w1 = 0;
temp_v0_23->words.w0 = 0xBD000000;
func_802B59DC((f32 (*)[4]) &sp120[0], (s16) (actor->wheelRot + 0x2D8));
load_giant_egg(&sp160, 0xC1880000, 0x41400000, 0xC2080000);
vec3f_set(&sp160, 0xC1880000, 0x41400000, 0xC2080000);
mtxf_translate((f32 (*)[4]) &spE0[0], &sp160);
func_802B71CC((f32 (*)[4]) &spA0[0], (f32 (*)[4]) &sp120[0], (f32 (*)[4]) &spE0[0]);
if (func_802B4FF8((f32 (*)[4]) &spA0[0], 3) != 0) {
@@ -2514,7 +2514,7 @@ s32 func_802B4FF8(? *, ?); // extern
? func_802B5F74(? *, ? *, s32); // extern
? func_802B71CC(? *, ? *, ? *); // extern
f32 func_802B80D0(? *, u16, ?, f32, f32); // extern
? load_giant_egg(? *, ?, ?, ?); // extern
? vec3f_set(? *, ?, ?, ?); // extern
extern ? D_0601F228;
extern ? D_0601F708;
extern ? D_0601FAF8;
@@ -2590,7 +2590,7 @@ void func_8029BFB0(void *arg0, void *arg1) {
temp_v0_6->unk_04 = &D_06022D28;
temp_v0_6->unk0 = 0x6000000;
func_802B59DC(&sp100, arg1->unk6);
load_giant_egg(&spF4, 0x41880000, 0x40C00000, 0x41000000);
vec3f_set(&spF4, 0x41880000, 0x40C00000, 0x41000000);
mtxf_translate(&spB4, &spF4);
func_802B71CC(&sp74, &sp100, &spB4);
if (func_802B4FF8(&sp74, 3) != 0) {
@@ -2604,7 +2604,7 @@ void func_8029BFB0(void *arg0, void *arg1) {
temp_v0_8->unk0 = 0xBD000000;
sp30 = &D_06022DB8;
func_802B59DC(&sp100, arg1->unk6);
load_giant_egg(&spF4, 0xC1880000, 0x40C00000, 0x41000000);
vec3f_set(&spF4, 0xC1880000, 0x40C00000, 0x41000000);
mtxf_translate(&spB4, &spF4);
func_802B71CC(&sp74, &sp100, &spB4);
if (func_802B4FF8(&sp74, 3) != 0) {
@@ -2617,7 +2617,7 @@ void func_8029BFB0(void *arg0, void *arg1) {
temp_v0_10->unk_04 = 0;
temp_v0_10->unk0 = 0xBD000000;
func_802B59DC(&sp100, arg1->unk6 + 0x444);
load_giant_egg(&spF4, 0x41880000, 0x40C00000, 0xC1000000);
vec3f_set(&spF4, 0x41880000, 0x40C00000, 0xC1000000);
mtxf_translate(&spB4, &spF4);
func_802B71CC(&sp74, &sp100, &spB4);
if (func_802B4FF8(&sp74, 3) != 0) {
@@ -2630,7 +2630,7 @@ void func_8029BFB0(void *arg0, void *arg1) {
temp_v0_12->unk_04 = 0;
temp_v0_12->unk0 = 0xBD000000;
func_802B59DC(&sp100, arg1->unk6 + 0x444);
load_giant_egg(&spF4, 0xC1880000, 0x40C00000, 0xC1000000);
vec3f_set(&spF4, 0xC1880000, 0x40C00000, 0xC1000000);
mtxf_translate(&spB4, &spF4);
func_802B71CC(&sp74, &sp100, &spB4);
if (func_802B4FF8(&sp74, 3) != 0) {
@@ -2666,7 +2666,7 @@ s32 func_802B4FF8(? *, ?); // extern
? func_802B5F74(? *, ? *, s32); // extern
? func_802B71CC(? *, ? *, ? *); // extern
f32 func_802B80D0(? *, u16, ?, f32, f32); // extern
? load_giant_egg(? *, ?, ?, ?); // extern
? vec3f_set(? *, ?, ?, ?); // extern
extern ? D_06020A08;
extern ? D_06020A20;
extern ? D_06021220;
@@ -2768,7 +2768,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_9->unk_04 = &D_06022D28;
temp_v0_9->unk0 = 0x6000000;
func_802B59DC(&sp128, arg1->unk6);
load_giant_egg(&sp11C, 0x41880000, 0x40C00000, 0x41E00000);
vec3f_set(&sp11C, 0x41880000, 0x40C00000, 0x41E00000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2782,7 +2782,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_11->unk0 = 0xBD000000;
sp2C = &D_06022DB8;
func_802B59DC(&sp128, arg1->unk6);
load_giant_egg(&sp11C, 0xC1880000, 0x40C00000, 0x41E00000);
vec3f_set(&sp11C, 0xC1880000, 0x40C00000, 0x41E00000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2795,7 +2795,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_13->unk_04 = 0;
temp_v0_13->unk0 = 0xBD000000;
func_802B59DC(&sp128, arg1->unk6 + 0x222);
load_giant_egg(&sp11C, 0x41880000, 0x40C00000, 0x41400000);
vec3f_set(&sp11C, 0x41880000, 0x40C00000, 0x41400000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2808,7 +2808,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_15->unk_04 = 0;
temp_v0_15->unk0 = 0xBD000000;
func_802B59DC(&sp128, arg1->unk6 + 0x222);
load_giant_egg(&sp11C, 0xC1880000, 0x40C00000, 0x41400000);
vec3f_set(&sp11C, 0xC1880000, 0x40C00000, 0x41400000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2821,7 +2821,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_17->unk_04 = 0;
temp_v0_17->unk0 = 0xBD000000;
func_802B59DC(&sp128, arg1->unk6 + 0x5B0);
load_giant_egg(&sp11C, 0x41880000, 0x40C00000, 0xC1000000);
vec3f_set(&sp11C, 0x41880000, 0x40C00000, 0xC1000000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2834,7 +2834,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_19->unk_04 = 0;
temp_v0_19->unk0 = 0xBD000000;
func_802B59DC(&sp128, arg1->unk6 + 0x5B0);
load_giant_egg(&sp11C, 0xC1880000, 0x40C00000, 0xC1000000);
vec3f_set(&sp11C, 0xC1880000, 0x40C00000, 0xC1000000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2847,7 +2847,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_21->unk_04 = 0;
temp_v0_21->unk0 = 0xBD000000;
func_802B59DC(&sp128, arg1->unk6 + 0x16C);
load_giant_egg(&sp11C, 0x41880000, 0x40C00000, 0xC1C00000);
vec3f_set(&sp11C, 0x41880000, 0x40C00000, 0xC1C00000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2860,7 +2860,7 @@ void func_8029C3CC(void *arg0, void *arg1) {
temp_v0_23->unk_04 = 0;
temp_v0_23->unk0 = 0xBD000000;
func_802B59DC(&sp128, arg1->unk6 + 0x16C);
load_giant_egg(&sp11C, 0xC1880000, 0x40C00000, 0xC1C00000);
vec3f_set(&sp11C, 0xC1880000, 0x40C00000, 0xC1C00000);
mtxf_translate(&spDC, &sp11C);
func_802B71CC(&sp9C, &sp128, &spDC);
if (func_802B4FF8(&sp9C, 3) != 0) {
@@ -2979,8 +2979,8 @@ void place_piranha_plants(u32 arg0) {
Vec3s *phi_s0;
temp_s0 = VIRTUAL_TO_PHYSICAL2(gSegmentTable[arg0 >> 18] + SEGMENT_OFFSET(arg0));
load_giant_egg(sp54, 0, 0, 0);
func_802B52BC(sp4C, 0, 0, 0);
vec3f_set(sp54, 0, 0, 0);
vec3s_set(sp4C, 0, 0, 0);
//temp_s1 = *temp_s0;
//phi_s1 = temp_s1;
//if (temp_s1 != -0x8000) {
@@ -3017,8 +3017,8 @@ GLOBAL_ASM("asm/non_matchings/code_actors/place_piranha_plants.s")
? func_802976EC(void *, void *); // extern
s32 func_8029EC88(f32 *, ? *, ? *, ?); // extern
? func_802ADDC8(void *, ?, s32, s32, f32); // extern
? func_802B52BC(? *, ?, ?, ?); // extern
? load_giant_egg(? *, ?, ?, ?); // extern
? vec3s_set(? *, ?, ?, ?); // extern
? vec3f_set(? *, ?, ?, ?); // extern
extern ? D_8015F9B8;
extern f32 gCourseDirection;
extern ? gSegmentTable;
@@ -3041,8 +3041,8 @@ void place_palm_trees(u32 arg0) {
s16 *phi_s0;
temp_s0 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000;
load_giant_egg(&sp60, 0, 0, 0);
func_802B52BC(&sp58, 0, 0, 0);
vec3f_set(&sp60, 0, 0, 0);
vec3s_set(&sp58, 0, 0, 0);
temp_v0 = *temp_s0;
phi_v0 = temp_v0;
if (temp_v0 != -0x8000) {
@@ -3079,16 +3079,16 @@ void func_8029CF0C(Gfx *displaylist, struct FallingRock *rock) {
rock->pos[0] = (f32) temp_v0->unk.data[0] * gCourseDirection;
rock->pos[1] = (f32) temp_v0->unk.data[1] + 10.0f;
rock->pos[2] = (f32) temp_v0->unk.data[2];
load_giant_egg(rock->velocity, 0, 0, 0);
func_802B52BC(rock->rot, 0, 0, 0);
vec3f_set(rock->velocity, 0, 0, 0);
vec3s_set(rock->rot, 0, 0, 0);
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_8029EC88(f32 *, ? *, ? *, ?); // extern
? func_802AAAAC(void *); // extern
? func_802B52BC(? *, ?, ?, ?); // extern
? load_giant_egg(? *, ?, ?, ?); // extern
? vec3s_set(? *, ?, ?, ?); // extern
? vec3f_set(? *, ?, ?, ?); // extern
extern ? D_8015F9B8;
extern f32 gCourseDirection;
extern ? gSegmentTable;
@@ -3118,8 +3118,8 @@ void place_falling_rocks(u32 arg0) {
sp64 = phi_v0 * gCourseDirection;
sp68 = phi_s0->unk2 + 10.0f;
sp6C = phi_s0->unk_04;
load_giant_egg(&sp58, 0, 0, 0);
func_802B52BC(&sp50, 0, 0, 0);
vec3f_set(&sp58, 0, 0, 0);
vec3s_set(&sp50, 0, 0, 0);
temp_v1 = &D_8015F9B8 + (func_8029EC88(temp_s4, &sp50, &sp58, 5) * 0x70);
temp_a0 = temp_v1 + 0x30;
temp_v1->unk6 = phi_s0->unk6;
@@ -3264,7 +3264,7 @@ GLOBAL_ASM("asm/non_matchings/code_actors/update_obj_falling_rocks.s")
s32 func_8029EC88(f32 *, s16 *, ? *, s16); /* extern */
f32 func_802ABE30(?32, f32, ?32, u16); /* extern */
? func_802ADDC8(void *, ?, ?32, f32, ?32); /* extern */
? load_giant_egg(? *, f32, f32, f32); /* extern */
? vec3f_set(? *, f32, f32, f32); /* extern */
extern s32 D_800DC50C;
extern ? D_8015F9B8;
extern f32 gCourseDirection;
@@ -3293,7 +3293,7 @@ void place_segment_06(u32 arg0) {
s16 phi_s2;
temp_s3 = *(&gSegmentTable + ((arg0 >> 0x18) * 4)) + (arg0 & 0xFFFFFF) + 0x80000000;
load_giant_egg(&sp80, 0.0f, 0.0f, 0.0f);
vec3f_set(&sp80, 0.0f, 0.0f, 0.0f);
sp78 = 0x4000;
sp7A = 0;
sp7C = 0;
@@ -3381,7 +3381,7 @@ GLOBAL_ASM("asm/non_matchings/code_actors/place_segment_06.s")
//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd
s16 func_8029EC88(f32 *, s16 *, ? *, ?); /* extern */
f32 func_802AE1C0(f32, f32, f32); /* extern */
? load_giant_egg(? *, ?, ?, ?); /* extern */
? vec3f_set(? *, ?, ?, ?); /* extern */
s16 random_u16(); /* extern */
extern f32 gCourseDirection;
extern s16 gPlaceItemBoxes;
@@ -3410,7 +3410,7 @@ void place_all_item_boxes(u32 arg0) {
temp_s0 = gSegmentTable[arg0 >> 0x18] + (arg0 & 0xFFFFFF) + 0x80000000;
phi_s0 = temp_s0;
if ((gModeSelection != 1) && (gPlaceItemBoxes != 0)) {
load_giant_egg(&sp60, 0, 0, 0);
vec3f_set(&sp60, 0, 0, 0);
temp_v1 = *temp_s0;
phi_v1 = temp_v1;
if (temp_v1 != -0x8000) {
@@ -3503,8 +3503,8 @@ GLOBAL_ASM("asm/non_matchings/code_actors/func_8029DAB8.s")
? func_8029D9F8(); /* extern */
s32 func_8029EC88(f32 *, ? *, ? *, ?); /* extern */
? func_802A14BC(f32, ?, ?); /* extern */
? func_802B52BC(? *, ?, ?, ?); /* extern */
? load_giant_egg(f32 *, ?, ?, ?); /* extern */
? vec3s_set(? *, ?, ?, ?); /* extern */
? vec3f_set(f32 *, ?, ?, ?); /* extern */
? place_all_item_boxes(? *); /* extern */
? place_falling_rocks(? *); /* extern */
? place_palm_trees(? *); /* extern */
@@ -3582,11 +3582,11 @@ void func_8029DB44(void) {
place_segment_06(&D_06009570);
place_piranha_plants(&D_06009518);
place_all_item_boxes(&D_06009498);
load_giant_egg(&sp40, 0x43160000, 0x42200000, 0xC4A28000);
vec3f_set(&sp40, 0x43160000, 0x42200000, 0xC4A28000);
temp_a0 = &sp40;
sp40 *= gCourseDirection;
func_8029EC88(temp_a0, &sp2C, &sp34, 0x17);
load_giant_egg(&sp40, 0x451D8000, 0, 0x449B0000);
vec3f_set(&sp40, 0x451D8000, 0, 0x449B0000);
temp_a0_2 = &sp40;
sp40 *= gCourseDirection;
temp_v1 = (func_8029EC88(temp_a0_2, &sp2C, &sp34, 0x17) * 0x70) + &D_8015F9B8;
@@ -3606,7 +3606,7 @@ void func_8029DB44(void) {
case COURSE_YOSHI_VALLEY:
place_segment_06(&D_060180A0);
place_all_item_boxes(&D_06018110);
load_giant_egg(&sp40, 0xC50FC000, 0, 0x441E8000);
vec3f_set(&sp40, 0xC50FC000, 0, 0x441E8000);
temp_a0_3 = &sp40;
sp40 *= gCourseDirection;
func_8029EC88(temp_a0_3, &sp2C, &sp34, 9);
@@ -3641,20 +3641,26 @@ void func_8029DB44(void) {
case COURSE_KALAMARI_DESERT:
place_segment_06(&D_06022F08);
place_all_item_boxes(&D_06022E88);
load_giant_egg(&sp40, 0xC4D20000, 0x40000000, 0x420C0000);
vec3f_set(&sp40, 0xC4D20000, 0x40000000, 0x420C0000);
temp_a0_4 = &sp40;
sp40 *= gCourseDirection;
/*
D_8015F9BE is a fake variable.
func_8029EC88 returns an index in D_8015F9B8 and D_8015F9BE represents accessing
the member 6 bytes into the actor at that index.
In this function, that's the `crossingId` member of a RailroadCrossing actor
*/
*(&D_8015F9BE + (func_8029EC88(temp_a0_4, &sp2C, &sp34, 0x27) * 0x70)) = 1;
load_giant_egg(&sp40, 0xC4C80000, 0x40000000, 0x420C0000);
vec3f_set(&sp40, 0xC4C80000, 0x40000000, 0x420C0000);
temp_a0_5 = &sp40;
sp40 *= gCourseDirection;
*(&D_8015F9BE + (func_8029EC88(temp_a0_5, &sp2C, &sp34, 0x27) * 0x70)) = 1;
func_802B52BC(&sp2C, 0, -0x2000, 0);
load_giant_egg(&sp40, 0xC519B000, 0x40000000, 0x450D7000);
vec3s_set(&sp2C, 0, -0x2000, 0);
vec3f_set(&sp40, 0xC519B000, 0x40000000, 0x450D7000);
temp_a0_6 = &sp40;
sp40 *= gCourseDirection;
*(&D_8015F9BE + (func_8029EC88(temp_a0_6, &sp2C, &sp34, 0x27) * 0x70)) = 0;
load_giant_egg(&sp40, 0xC51A3000, 0x40000000, 0x45147000);
vec3f_set(&sp40, 0xC51A3000, 0x40000000, 0x45147000);
temp_a0_7 = &sp40;
sp40 *= gCourseDirection;
*(&D_8015F9BE + (func_8029EC88(temp_a0_7, &sp2C, &sp34, 0x27) * 0x70)) = 0;
@@ -3667,15 +3673,15 @@ void func_8029DB44(void) {
break;
case COURSE_WARIO_STADIUM:
place_all_item_boxes(&D_0600CB40);
load_giant_egg(&sp40, 0xC3030000, 0x42A60000, 0x438F0000);
vec3f_set(&sp40, 0xC3030000, 0x42A60000, 0x438F0000);
temp_a0_8 = &sp40;
sp40 *= gCourseDirection;
func_8029EC88(temp_a0_8, &sp2C, &sp34, 0x23);
load_giant_egg(&sp40, 0xC5131000, 0x42900000, 0xC4C90000);
vec3f_set(&sp40, 0xC5131000, 0x42900000, 0xC4C90000);
temp_a0_9 = &sp40;
sp40 *= gCourseDirection;
func_8029EC88(temp_a0_9, &sp2C, &sp34, 0x23);
load_giant_egg(&sp40, 0xC523E000, 0x429E0000, 0x4438C000);
vec3f_set(&sp40, 0xC523E000, 0x429E0000, 0x4438C000);
temp_a0_10 = &sp40;
sp40 *= gCourseDirection;
func_8029EC88(temp_a0_10, &sp2C, &sp34, 0x23);
@@ -4131,14 +4137,14 @@ GLOBAL_ASM("asm/non_matchings/code_actors/func_8029EC88.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//void func_8029EC88(s32, s32 *, s32 *, s32); // extern
//void func_802B52BC(s32 *, s32, s32, s32); // extern
//void vec3s_set(s32 *, s32, s32, s32); // extern
void func_8029ED38(Vec3f arg0, Vec3s arg1) {
//? sp24;
//? sp1C;
load_giant_egg(arg0, 0, 0, 0);
func_802B52BC(arg1, 0, 0, 0);
vec3f_set(arg0, 0, 0, 0);
vec3s_set(arg1, 0, 0, 0);
func_8029EC88(arg0, arg1, arg0, arg1);
}
#else
@@ -4910,9 +4916,6 @@ void func_802A0350(struct Actor *arg0, struct Actor *arg1) {
func_802A00E8(arg0, arg1);
}
}
//#else
//GLOBAL_ASM("asm/non_matchings/code_actors/func_802A0350.s")
//#endif
#ifdef MIPS_TO_C
//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd
@@ -5378,8 +5381,8 @@ void func_802A14BC(f32 arg0, f32 arg1, f32 arg2) {
s16 temp_a0;
if (gModeSelection != TIME_TRIALS) {
func_802B52BC(sp20, 0, 0, 0);
load_giant_egg(sp28, 0, 0, 0);
vec3s_set(sp20, 0, 0, 0);
vec3f_set(sp28, 0, 0, 0);
sp34[0] = arg0;
sp34[1] = arg1;
sp34[2] = arg2;
src/code_802B0210.c
+4 -4
View File
@@ -234,7 +234,7 @@ GLOBAL_ASM("asm/non_matchings/code_802B0210/func_802B0648.s")
#ifdef MIPS_TO_C
//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd
? func_802B64C4(f32 *, s16); /* extern */
? load_giant_egg(f32, f32 *, ?, f32, f32); /* extern */
? vec3f_set(f32, f32 *, ?, f32, f32); /* extern */
void func_802B0788(s16 arg0, struct BananaBunchParent *banana_bunch, Player *player) {
f32 sp34;
@@ -307,7 +307,7 @@ block_10:
phi_f0 = temp_f0;
}
sp30 = phi_v0;
load_giant_egg(phi_f12, &sp34, 0, phi_f0, phi_f12);
vec3f_set(phi_f12, &sp34, 0, phi_f0, phi_f12);
func_802B64C4(&sp34, (s16) (player->unk_02E + player->unk_0C0));
sp30->velocity = sp34;
sp30->unk28 = sp38;
@@ -1024,7 +1024,7 @@ GLOBAL_ASM("asm/non_matchings/code_802B0210/func_802B1FFC.s")
? func_802ADDC8(f32, UnkActorInner *, UnkActorInner *, f32, f32, f32, f32); /* extern */
? func_802B4E30(struct BananaActor *); /* extern */
? func_802B64C4(f32 *, s16); /* extern */
? load_giant_egg(f32, f32 *, ?, f32, f32); /* extern */
? vec3f_set(f32, f32 *, ?, f32, f32); /* extern */
extern s16 D_8015F6E8;
extern s16 D_8015F6EA;
extern s16 D_8015F6EE;
@@ -1150,7 +1150,7 @@ void update_obj_banana(struct BananaActor *banana) {
phi_f12 = (temp_f2_2 * 0.75f) + 3.5f + temp_f0_3;
}
sp88 = temp_v0;
load_giant_egg(phi_f12, &sp68, 0, temp_f0_3, phi_f12);
vec3f_set(phi_f12, &sp68, 0, temp_f0_3, phi_f12);
func_802B64C4(&sp68, (s16) (sp88->unk_02E + sp88->unk_0C0));
banana->velocity[0] = sp68;
banana->velocity[1] = sp6C;
src/math_util.c
+3 -3
View File
@@ -87,13 +87,13 @@ u32 func_802B5258(Vec3f arg0, Vec3s arg1) {
return func_802B7830(temp_v1, temp_v2);
}
void load_giant_egg(Vec3f arg0, f32 arg1, f32 arg2, f32 arg3) {
void vec3f_set(Vec3f arg0, f32 arg1, f32 arg2, f32 arg3) {
arg0[0] = arg1;
arg0[1] = arg2;
arg0[2] = arg3;
}
void func_802B52BC(Vec3s arg0, s16 arg1, s16 arg2, s16 arg3) {
void vec3s_set(Vec3s arg0, s16 arg1, s16 arg2, s16 arg3) {
arg0[0] = arg1;
arg0[1] = arg2;
arg0[2] = arg3;
@@ -124,7 +124,7 @@ void vec3s_copy(Vec3s dest, Vec3s src) {
dest[2] = src[2];
}
void *func_802B5320(Vec3f dest, f32 x, f32 y, f32 z) {
UNUSED void *sm64_vec3f_set(Vec3f dest, f32 x, f32 y, f32 z) {
dest[0] = x;
dest[1] = y;
dest[2] = z;
src/memory.c
+13 -15
View File
@@ -1627,25 +1627,23 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AAA70.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? load_giant_egg(void *, ?, ?, ?); // extern
//generated by m2c commit 685418adfeb3794409e47b45ac5cab60b17d23fd
void func_802AAAAC(UnkActorInner *arg0) {
f32 *temp_a0;
void func_802AAAAC(void *arg0) {
void *temp_a0;
arg0->unk6 = 0x1388;
arg0->unk8 = 0x1388;
arg0->unkA = 0x1388;
arg0->unk0 = 0;
arg0->unk2 = 0;
arg0->unk4 = 0;
temp_a0 = arg0 + 0x18;
arg0->unk36 = 0x1388;
arg0->unk38 = 0x1388;
arg0->unk3A = 0x1388;
arg0->unk30 = 0;
arg0->unk32 = 0;
arg0->unk34 = 0;
temp_a0 = arg0->unk48;
temp_a0->unk-C = 0.0f;
temp_a0->unk-8 = 0.0f;
temp_a0->unk-4 = 0.0f;
load_giant_egg(temp_a0, 0, 0, 0x3F800000);
load_giant_egg(arg0 + 0x24, 0x3F800000, 0, 0);
load_giant_egg(arg0 + 0x30, 0, 0x3F800000, 0);
vec3f_set(temp_a0, 0.0f, 0.0f, 1.0f);
vec3f_set(arg0->unk54, 1.0f, 0.0f, 0.0f);
vec3f_set(arg0->unk60, 0.0f, 1.0f, 0.0f);
}
#else
GLOBAL_ASM("asm/non_matchings/memory/func_802AAAAC.s")