mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-16 23:20:06 -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
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")