Match a lot of functions, add header for objects (#251)

* Match a lot of functions, add header for objects

* Refreshed a TON of functions and created/added to several
 header files

* Add header for code_800431B0, address comments

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-08-23 12:33:00 -04:00
committed by GitHub
parent 7d23fcc063
commit dfd54d9a10
96 changed files with 9320 additions and 15193 deletions
+36 -48
View File
@@ -6632,8 +6632,6 @@ void func_80012A48(TrainCarStuff *trainCar, s16 arg1) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
s16 func_8000DBAC(f32 *, s16 *, f32); /* extern */
? func_80012A48(TrainStuff *, s16); /* extern */
? func_800755FC(s32, f32 *, f32); /* extern */
extern s16 D_80162FCC;
extern f32 D_801635A4;
@@ -6682,7 +6680,7 @@ void func_80012AC0(void) {
temp_s1 = temp_v0;
var_s3->locomotive.velocity[0] = var_s3->locomotive.position[0] - temp_f20;
var_s3->locomotive.velocity[2] = var_s3->locomotive.position[2] - temp_f22;
func_80012A48(var_s3, temp_t0);
func_80012A48(&var_s3->locomotive, temp_t0);
temp_v0_2 = (u16) var_s3->locomotive.wayPointIndex;
if ((temp_s0 != temp_v0_2) && ((temp_v0_2 == 0x00BE) || (temp_v0_2 == 0x0140))) {
func_800C98B8(var_s6, var_s3->locomotive.velocity, 0x1901800EU);
@@ -6705,7 +6703,7 @@ void func_80012AC0(void) {
temp_a1 = func_8000DBAC(temp_s0_2->position, &temp_s0_2->wayPointIndex, var_s3->someMultiplier);
temp_s0_2->velocity[0] = temp_s0_2->position[0] - temp_f20_2;
temp_s0_2->velocity[2] = temp_s0_2->position[2] - temp_f22_2;
func_80012A48((TrainStuff *) temp_s0_2, temp_a1);
func_80012A48(temp_s0_2, temp_a1);
}
var_s2 = 0;
var_s1 = sp7C;
@@ -6717,7 +6715,7 @@ loop_13:
temp_a1_2 = func_8000DBAC(temp_s0_3->position, &temp_s0_3->wayPointIndex, var_s3->someMultiplier);
temp_s0_3->velocity[0] = temp_s0_3->position[0] - temp_f20_3;
temp_s0_3->velocity[2] = temp_s0_3->position[2] - temp_f22_3;
func_80012A48((TrainStuff *) temp_s0_3, temp_a1_2);
func_80012A48(temp_s0_3, temp_a1_2);
}
var_s2 += 0x24;
var_s1 += 0x24;
@@ -6942,8 +6940,6 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800132F4.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8000DBAC(f32 *, s16 *, f32); /* extern */
? func_80075A6C(s16, f32 *, ?); /* extern */
extern s16 D_80162EB0;
extern s16 D_801630FC;
extern s32 D_80163598;
@@ -6969,9 +6965,9 @@ void func_800133C4(void) {
f64 temp_f0;
f64 temp_f0_2;
s16 temp_a1;
s16 var_s3;
s16 var_v1;
s32 temp_v0;
s32 var_s3;
struct Actor *temp_v0_3;
void *temp_v0_2;
@@ -6980,7 +6976,7 @@ void func_800133C4(void) {
var_s3 = 0;
do {
temp_s2 = var_s0->position;
if (var_s0->isActive == 1) {
if (var_s0->isActive == (s16) 1) {
temp_f26 = var_s0->position[0];
temp_f28 = var_s0->position[1];
temp_f30 = var_s0->position[2];
@@ -6992,12 +6988,12 @@ void func_800133C4(void) {
sp7C = (f32) ((f64) var_s0->position[1] + 180.0);
sp80 = (f32) ((f64) var_s0->position[2] + 45.0);
func_80006114(&sp78, temp_s2, var_s0->yRotation);
func_80075A6C(var_s3, &sp78, 0x3F8CCCCD);
func_80075A6C(var_s3, (s32) &sp78, 1.1f);
sp78 = (f32) ((f64) var_s0->position[0] + 30.0);
sp7C = (f32) ((f64) var_s0->position[1] + 180.0);
sp80 = (f32) ((f64) var_s0->position[2] + 45.0);
func_80006114(&sp78, temp_s2, var_s0->yRotation);
func_80075A6C(var_s3, &sp78, 0x3F8CCCCD);
func_80075A6C(var_s3, (s32) &sp78, 1.1f);
}
if (random_int(0x0064U) == 0) {
temp_s1 = var_s0->velocity;
@@ -7119,8 +7115,6 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80013854.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
s16 func_8000D6D0(f32 *, s16 *, f32, f32, s32, s32); /* extern */
s16 func_8000D940(f32 *, s16 *, f32, f32, s32); /* extern */
extern s16 D_801631C8;
extern s16 D_8016347A;
@@ -7142,15 +7136,15 @@ void func_800139E4(f32 arg0, f32 arg1, s32 arg2, s32 arg3, VehicleStuff *vehicle
var_s0 = vehicle;
var_s4 = 0;
var_s1 = var_s0->position;
var_s2 = &var_s0->waypointId;
var_s2 = &var_s0->wayPointIndex;
do {
temp_hi = (s32) ((var_s4 / arg2) + arg3) % (s32) temp_s7;
temp_v0 = &wayPointList[temp_hi & 0xFFFF];
var_s0->position[0] = (f32) temp_v0->wayPointX;
var_s0->position[1] = (f32) temp_v0->wayPointY;
var_s0->actorIndex = -1;
var_s0->waypointId = (s16) temp_hi;
var_s0->unk0 = 0;
var_s0->wayPointIndex = (s16) temp_hi;
var_s0->unused = 0;
var_s0->velocity[0] = 0.0f;
var_s0->velocity[1] = 0.0f;
var_s0->velocity[2] = 0.0f;
@@ -7881,12 +7875,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014EE4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
f32 sins(s32); // extern
f32 coss(s32); // extern
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_801646C0;
void func_800151A4(void *arg0, s32 arg1) {
void func_800151A4(Camera *camera, s32 arg1) {
f32 sp44;
f32 sp40;
f32 sp3C;
@@ -7901,34 +7893,32 @@ void func_800151A4(void *arg0, s32 arg1) {
f32 temp_f16;
f32 temp_f2;
f32 temp_f2_2;
f32 temp_f8;
u16 temp_s1;
temp_s1 = *(&D_801646C0 + (arg1 * 2));
if (temp_s1 == 0) {
arg0->unk18 = 0.0f;
arg0->unk20 = 0.0f;
arg0->unk1C = 1.0f;
camera->up[0] = 0.0f;
camera->up[2] = 0.0f;
camera->up[1] = 1.0f;
return;
}
temp_f2 = arg0->unkC - arg0->unk0;
temp_f14 = arg0->unk10 - arg0->unk4;
temp_f2 = camera->lookAt[0] - camera->pos[0];
temp_f14 = camera->lookAt[1] - camera->pos[1];
sp38 = temp_f2;
temp_f16 = arg0->unk14 - arg0->unk8;
temp_f16 = camera->lookAt[2] - camera->pos[2];
sp34 = temp_f14;
sp30 = temp_f16;
temp_f0 = sqrtf((temp_f2 * temp_f2) + (temp_f14 * temp_f14) + (temp_f16 * temp_f16));
temp_f8 = temp_f14 / temp_f0;
sp44 = temp_f2 / temp_f0;
temp_f10 = temp_f16 / temp_f0;
sp40 = temp_f8;
sp40 = temp_f14 / temp_f0;
sp3C = temp_f10;
sp28 = 1.0 - coss(temp_s1 & 0xFFFF);
arg0->unk18 = (sp28 * sp44 * sp40) - (sins(temp_s1 & 0xFFFF) * temp_f10);
sp28 = (f32) (1.0 - (f64) coss(temp_s1 & 0xFFFF));
camera->up[0] = (sp28 * sp44 * sp40) - (sins(temp_s1 & 0xFFFF) * temp_f10);
temp_f2_2 = sp28 * sp40;
arg0->unk1C = coss(temp_s1 & 0xFFFF) + (temp_f2_2 * sp40);
camera->up[1] = coss(temp_s1 & 0xFFFF) + (temp_f2_2 * sp40);
sp20 = temp_f2_2;
arg0->unk20 = (sins(temp_s1 & 0xFFFF) * sp44) + (temp_f2_2 * temp_f10);
camera->up[2] = (sins(temp_s1 & 0xFFFF) * sp44) + (temp_f2_2 * temp_f10);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800151A4.s")
@@ -10357,25 +10347,24 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A124.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
u32 random_int(?); /* extern */
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_80164680;
void func_8001A220(s32 arg0, s32 arg1) {
u32 temp_v0;
s16 phi_t9;
s16 *phi_at;
s16 *var_at;
s16 var_t9;
u16 temp_v0;
temp_v0 = random_int(6);
temp_v0 = random_int(6U);
switch (temp_v0) {
case 0:
*(&D_80164680 + (arg1 * 2)) = 4;
return;
case 1:
phi_t9 = 5;
phi_at = &D_80164680 + (arg1 * 2);
var_at = &D_80164680 + (arg1 * 2);
var_t9 = 5;
block_9:
*phi_at = phi_t9;
*var_at = var_t9;
return;
case 2:
*(&D_80164680 + (arg1 * 2)) = 6;
@@ -10390,8 +10379,8 @@ block_9:
*(&D_80164680 + (arg1 * 2)) = 1;
return;
default:
phi_t9 = 8;
phi_at = &D_80164680 + (arg1 * 2);
var_at = &D_80164680 + (arg1 * 2);
var_t9 = 8;
goto block_9;
}
}
@@ -10499,7 +10488,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A518.s")
#endif
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_800151A4(Camera *, s32); /* extern */
? func_80015390(Camera *, u16 *, s8, s32); /* extern */
? func_8001577C(Camera *, u16 *, s8, s32); /* extern */
@@ -10525,7 +10514,6 @@ extern ? D_801646C0;
extern u32 D_801646C8;
extern u16 D_801646CC;
extern ? D_801646D0;
extern s8 D_8018EDF3;
void func_8001A588(s32 arg0, Camera *camera, u16 *arg2, s8 arg3, s32 arg4) {
s32 sp44;
@@ -11467,14 +11455,14 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001C14C.s")
extern u16 D_80163E2A;
void func_8001C3C4(void) {
void func_8001C3C4(s32 arg0) {
if (gCurrentCourseId == COURSE_AWARD_CEREMONY) {
if (D_80163E2A >= 16) {
func_80057114(3);
}
} else {
if (gModeSelection == VERSUS) {
func_80057114();
func_80057114(arg0);
}
}
}
+4
View File
@@ -4,7 +4,10 @@
#include "common_structs.h"
#include "vehicles.h"
// TODO: This header is missing some function prototypes
/* Function Prototypes */
s16 func_80005FD0(Vec3f, Vec3f);
s32 func_80006018(f32, f32, f32, f32, f32, f32, f32, f32);
void func_80006114(Vec3f, Vec3f, s16);
@@ -64,6 +67,7 @@ void func_80014CC0(s32, Player*);
void func_80014D08(s32);
void func_80014D30(s32, s32);
void func_8001968C();
void func_8001C3C4(s32);
/* This is where I'd put my static data, if I had any */
// 0 or 1, only 1 when when in extra (mirror) mode
+243 -437
View File
File diff suppressed because it is too large Load Diff
+396
View File
@@ -0,0 +1,396 @@
#ifndef CODE_800431B0_H
#define CODE_800431B0_H
#include "common_structs.h"
struct Vtx4_800431B0 {
Vtx vtx[4];
};
void func_800431B0(Vec3f, Vec3s, f32, s32);
void func_80043220(Vec3f, Vec3s, f32, s32);
void func_80043328(Vec3f, Vec3s, f32, s32);
void func_800433288(Vec3f, Vec3s, f32, s32);
void *func_80043390(Vec3f, Vec3s, f32, s32);
void func_800433F8(Vec3f, Vec3s, f32, s32);
void func_80043460(Vec3f, Vec3s, f32, s32);
void func_80043500(Vec3f, Vec3s, f32, s32);
void func_800435A0(s32, Vec3su, f32, Gfx*, s32);
void func_80043668(Vec3f, Vec3s, f32, Vtx*);
void func_800436D0(s32, s32, u16, f32, s32);
void func_80043764(s32, s32, u16, f32, Vtx*);
void func_800437F8(s32, s32, u16, f32, struct Vtx4_800431B0*, s32);
void func_800438C4(s32, s32, u16, f32, struct Vtx4_800431B0*, s32);
void func_8004398C(s32, s32, u16, f32, struct Vtx4_800431B0*, s32);
s32 func_80043A54(s32);
void func_80043C28(s8*, s32, s32);
void func_800440B8(s8*, s32, s32);
void func_80044388(s8*, s32, s32);
void func_80044658(s8*, s32, s32);
void func_80045B2C(Vtx*);
void func_80045B74(Vtx*);
void func_80045BBC(Vec3f, Vec3s, f32, Vtx*);
void func_80045C48(Vec3f, Vec3s, f32, Vtx*);
void func_80045E10(s32, s32, s32, s32, s32);
void func_800463B0(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80046424(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_800464D0(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80046544(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_800465B8(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80046634(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_800466B0(s32, s32, u16, f32, s32, s32, s32, s32);
void func_80046720(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80046794(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80046808(Vec3f, Vec3s, f32, s32, s32, s32, s32, s32, s32);
void func_80046874(Vec3f, Vec3s, f32, s32, s32, s32, s32, s32, s32);
void func_800468E0(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80046954(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_80046A00(Vec3f, Vec3s, f32, s32, Vtx*, s32, s32);
void func_80046A68(Vec3f, Vec3s, f32, s32, s32, s32, s32, s32, s32);
void func_80046AD4(s32, s32, u16, f32, s32);
void func_80046B38(s32, s32, u16, f32, s32);
void func_80046B9C(Vec3f, Vec3s, f32, s32);
void func_80046BEC(s32, s32, u16, f32, s32, s32);
void func_80046C3C(s32, s32, f32, s32, s32);
void func_80046C78(s32, s32, u16, f32, s32);
void func_80046CDC(s32, s32, u16, f32, s32);
void func_80046D40(Vec3f, Vec3s, f32, s32);
void func_80046D90(s32, s32, u16, f32, s32);
void func_80046DF4(s32, s32, u16, f32, s32, s32);
void func_80046E60(s32, s32, s32, s32);
void func_80046F60(s32, s32, s32, s32, s32);
void func_80047068(s32, s32, s32, s32, s32, s32, s32);
void func_8004788C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047910(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047994(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047A18(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047A9C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047B20(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80047B9C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047C28(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047CB4(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047D40(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047DCC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047E48(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047EC4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047F40(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047FBC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80048038(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_800480B4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80048130(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800481B4(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_80048228(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800482AC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80048330(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800483B4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80048438(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800484BC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80048540(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800485C4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800486B0(s32, s32, u16, f32, s32, s32, s32);
void func_80048718(s32, s32, u16, f32, s32, s32, s32);
void func_80048780(s32, s32, f32, s32, s32, s32, s32);
void func_800487DC(s32, s32, u16, f32, s32, s32, s32);
void func_80048844(s32, s32, u16, f32, s32, s32, s32);
void func_800488AC(s32, s32, u16, f32, s32, s32, s32);
void func_80048914(s32, s32, u16, f32, s32, s32, s32);
void func_8004897C(s32, s32, u16, f32, s32, s32, s32);
void func_800489E4(s32, s32, u16, f32, s32, s32, s32);
void func_80048A4C(s32, s32, u16, f32, s32, s32, s32);
void func_80048AB4(s32, s32, u16, f32, s32, s32, s32, s32);
void func_80048B24(s32, s32, u16, f32, s32, s32, s32, s32);
void func_80048B94(s32, s32, f32, s32, s32, s32);
void func_80048BE8(s32, s32, f32, s32, s32, s32);
void func_80048C3C(s32, s32, f32, s32, s32, s32);
void func_80048C90(s32, s32, f32, s32, s32, s32, s32);
void func_80048CEC(s32, s32, f32, s32, s32, s32, s32);
void func_80048D48(s32, s32, f32, s32, s32, s32, s32);
void func_80048DA4(s32, s32, f32, s32, s32, s32, s32);
void func_80048E00(s32, s32, u16, f32, s32, s32, s32);
void func_80048E68(s32, s32, u16, f32, s32, s32, s32);
void func_80048ED0(s32, s32, u16, f32, s32, s32, s32);
void func_80048F38(s32, s32, f32, s32, s32, s32);
void func_80049B20(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049B9C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049C18(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049C94(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049D10(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049D8C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049E08(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80049E98(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80049F28(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80049FB8(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A034(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A0B0(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A12C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004A1BC(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A258(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A2F4(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004A384(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004A414(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A488(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A4FC(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A570(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A5E4(s32, s32, f32, s32, s32);
void func_8004A9B8(f32);
void func_8004AA10(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004AAA0(s32, s32, u16, f32, s32, s32);
void func_8004AB00(s32, s32, u16, f32, s32, s32);
void func_8004AB60(s32, s32, u16, f32, s32, s32);
void func_8004ABC0(s32, s32, u16, f32, s32, s32);
void func_8004AC20(s32, s32, u16, f32, s32, s32);
void func_8004AC80(s32, s32, u16, f32, s32, s32);
void func_8004ACE0(s32, s32, f32, s32, s32);
void func_8004AD2C(s32, s32, u16, f32, s32, s32);
void func_8004AD8C(s32, s32, u16, f32, s32, s32);
void func_8004ADEC(s32, s32, u16, f32, s32, s32);
void func_8004AE4C(s32, s32, u16, f32, s32, s32);
void func_8004AEAC(s32, s32, u16, f32, s32, s32);
void func_8004AF0C(s32, s32, u16, f32, s32, s32);
void func_8004AF6C(s32, s32, u16, f32, s32, s32);
void func_8004AFCC(s32, s32, u16, f32, s32, s32);
void func_8004B02C();
void func_8004B05C(u8*);
void func_8004B138(s32, s32, s32, s32);
void func_8004B180(s32, s32, s32, s32);
void func_8004B1C8(s32, s32, s32, s32, s32, s32, s32);
void func_8004B254(s32, s32, s32);
void func_8004B2BC(s32);
void func_8004B2BC(s32);
void func_8004B310(s32);
void func_8004B35C(s32, s32, s32, s32);
void func_8004B35C(s32,s32,s32,s32);
void func_8004B3C8(s32);
void func_8004B414(s32, s32, s32, s32);
void func_8004B414(s32,s32,s32,s32);
void func_8004B480(s32, s32, s32);
void func_8004B4E8(s32, s32, s32, s32);
void func_8004B554(s32);
void func_8004B5A8(s32, s32, s32, s32);
void func_8004B614(s32, s32, s32, s32, s32, s32, s32);
void func_8004B614(s32, s32, s32, s32, s32, s32, s32);
void func_8004B6C4(s32, s32, s32);
void func_8004B6C4(s32, s32, s32);
void func_8004B72C(s32, s32, s32, s32, s32, s32, s32);
void func_8004B950(s32, s32, s32, s32, s32);
void func_8004BB34();
void func_8004BB3C(s32, s32, s32, s32, f32);
void func_8004C024(s16, s16, s16, u16, u16, u16, u16);
void func_8004C148(s16, s16, s16, u16, u16, u16, u16);
void func_8004C268(s32, s32, s32, u32, u32, u32, s32);
void func_8004C354();
void func_8004C35C();
void func_8004C364(s32, s32, u32, u32, s32);
void func_8004C450(s32, s32, u32, u32, s32);
void func_8004C53C(s32, s32, u32, u32, s32);
void func_8004C628(s32, s32, u32, u32, s32);
void func_8004C8D4(s16, s16);
void func_8004C91C(s32, s32, s32, s32, s32, s32);
void func_8004C9D8(s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004CA58(s32, s32, f32, s32, s32, s32);
void func_8004CAD0(s32, s32, s32);
void func_8004CB00(s32, s32, s32);
void func_8004CB30(s32, s32, s32);
void func_8004CB60(s32, s32, s32);
void func_8004CB90(s32, s32, s32);
void func_8004CBC0(s32, s32, f32, s32);
void func_8004CBF4(s32, s32, s32);
void func_8004CC24(s32, s32, s32);
void func_8004CC54(s32, s32, s32);
void func_8004CC84(s32, s32, s32);
void func_8004CCB4(s32, s32, s32);
void func_8004CCE4(s32, s32, f32, s32);
void func_8004CD18(s32, s32, s32);
void func_8004CF9C(s32, s32, s32, s32, s32, s32, s32);
void func_8004CFF0(s32, s32, s32, s32, s32, s32, s32);
void func_8004D044(s32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004D0CC();
void func_8004DC34(s32, s32, s32);
void func_8004DC6C(s32, s32, s32);
void func_8004DCA4(s32, s32, s32);
void func_8004DCDC(s32, s32, s32);
void func_8004DD0C(s32, s32, s32);
void func_8004DD44(s32, s32, s32);
void func_8004DD74(s32, s32, s32);
void func_8004DDAC(s32, s32, s32);
void func_8004DDDC(s32, s32, s32);
void func_8004DE04(s32, s32, s32);
void func_8004DE2C(s32, s32, s32);
void func_8004DE54(s32, s32, s32);
void func_8004DE84(s32, s32, s32);
void func_8004DEB4(s32, s32, s32);
void func_8004DEEC(s32, s32, s32);
void func_8004DF24(s32, s32, s32);
void func_8004E238();
void func_8004E240(s32, s32, u8*, s32, s32, s32, s32);
void func_8004E2B8(s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004E338(s32, s32, u8*, s32, s32, s32);
void func_8004E3B8();
void func_8004E3C0(s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004E3F4(s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004E430(s32, s32, s32, s32);
void func_8004E464(s32, s32, s32, s32);
void func_8004E498(s32, s32, s32, s32);
void func_8004E4CC(s32, s32, s32, s32);
void func_8004E500(s32, s32, s32, s32);
void func_8004E534(s32, s32, s32, s32);
void func_8004E568(s32, s32, s32, s32);
void func_8004E59C(s32, s32, s32, s32, s32);
void func_8004E5D8(s32, s32, u8*, s32);
void func_8004E604(s32, s32, u8*, s32);
void func_8004E638(s32);
void func_8004E78C(s32);
void func_8004E800(s32);
void func_8004E998(s32);
void func_8004EB30(s32);
void func_8004EB38(s32);
void func_8004ED40(s32);
void func_8004EE54(s32);
void func_8004F020(s32);
void func_8004F3E4(s32);
void print_timer(s32, s32, s32);
void func_8004F950(s32, s32, s32, s32);
void func_8004F9CC(s32, s32, s32);
void func_8004FA78(s32);
void func_8004FC78(s16, s16, s8);
void func_80050320();
void func_800514BC();
void func_800517C8();
void func_80051EBC();
void func_80051EF8();
void func_80051F9C();
void func_80052044();
void func_80052080();
void func_80052C60();
void func_8005327C(s32);
void func_800532A4(s32);
void func_80054BE8(s32);
void func_800557AC();
void func_80055F48(s32);
void func_80056160(s32);
void func_800569F4(s32);
void func_80056A40(s32, s32);
void func_80056A94(s32);
void func_80057330();
void func_80057338();
void func_800573BC();
void func_800573C4();
void func_800573CC();
void func_800573D4();
void func_800573DC();
void func_800573E4(s32, s32, s8);
void func_80057454(s32*, s32*);
void func_80057708();
void load_debug_font();
void func_80057778();
void debug_print_str2(s32, s32, s8*);
void print_str_num(s32, s32, s8*, s32);
void func_80057814(s32, s32, s8*, s32);
void func_80057858(s32, s32, s8*, s32);
void func_800578B0(s32, s32, s8*, s32);
void func_80057908(s32, s32, s8*, s32);
void func_80057960(s32, s32, s8*, s32);
void func_800579B8(s32, s32, s8*);
void func_800579F8(s32, s32, s8*, s32);
void func_80057A50(s32, s32, s8*, s32);
void func_80057AA8(s32, s32, s8*, s32);
void func_80057B14(s32, s32, s8*, s32);
void func_80057B80(s32, s32, s8*, s32);
void func_80057BEC(s32, s32, s8*, s32);
extern s32 D_80165860;
extern s32 D_8016586C;
extern s32 D_80165878;
extern s32 D_8016589C;
extern s16 D_80165CB8[8];
extern u16 D_801656C0;
extern u16 D_801656D0;
extern u16 D_801656E0;
extern s32 D_80183DD8[];
extern Vec3f D_80183E50;
extern Vec3f D_80183E70;
extern s32 D_80183EAC;
extern s32 D_8018D1E0;
extern s8 D_800E5670[];
extern s8 D_800E566A[];
extern Gfx D_0D005470[];
extern Gfx D_0D005770[];
extern Gfx D_0D005AE0[];
extern Gfx D_0D005FB0[];
extern Gfx D_0D0060B0[];
extern Gfx D_0D006930[];
extern Gfx D_0D006940[];
extern Gfx D_0D0077A0[];
extern Gfx D_0D0077D0[];
extern Gfx D_0D0077F8[];
extern Gfx D_0D007828[];
extern Gfx D_0D007850[];
extern Gfx D_0D007878[];
extern Gfx D_0D0078A0[];
extern Gfx D_0D0078D0[];
extern Gfx D_0D007928[];
extern Gfx D_0D007948[];
extern Gfx D_0D007968[];
extern Gfx D_0D0079A8[];
extern Gfx D_0D0079C8[];
extern Gfx D_0D0079E8[];
extern Gfx D_0D007A40[];
extern Gfx D_0D007A60[];
extern Gfx D_0D007A80[];
extern Gfx D_0D007AA0[];
extern Gfx D_0D007AC0[];
extern Gfx D_0D007AE0[];
extern Gfx D_0D007B00[];
extern Gfx D_0D007C10[];
extern Gfx D_0D007CB8[];
extern Gfx D_0D007CD8[];
extern Gfx D_0D007CF8[];
extern Gfx D_0D007D18[];
extern Gfx D_0D007D38[];
extern Gfx D_0D007D58[];
extern Gfx D_0D007D78[];
extern Gfx D_0D007D98[];
extern Gfx D_0D007DB8[];
extern Gfx D_0D007DD8[];
extern Gfx D_0D007DF8[];
extern Gfx D_0D007E18[];
extern Gfx D_0D007E38[];
extern Gfx D_0D007E58[];
extern Gfx D_0D007E98[];
extern Gfx D_0D007EB8[];
extern Gfx D_0D007EF8[];
extern Gfx D_0D007F38[];
extern Gfx D_0D007F78[];
extern Gfx D_0D007FE0[];
extern Gfx D_0D008000[];
extern Gfx D_0D008080[];
extern Gfx D_0D008108[];
extern Gfx D_0D00AB58[];
extern Gfx D_0D00C558[];
extern Gfx *gDisplayListHead;
#endif
+9 -5
View File
@@ -5,9 +5,15 @@
#include <variables.h>
#include <config.h>
#include <defines.h>
#include "code_80057C60.h"
#include "math_util_2.h"
#include "math_util.h"
#include "math_util_2.h"
#include "code_800431B0.h"
#include "code_80005FD0.h"
#include "code_80057C60.h"
#include "code_80071F00.h"
#include "code_80086E70.h"
#include "code_8008C1D0.h"
//#include "skybox_and_splitscreen.h" <- TODO: create this header file
// UI Code?
void func_80057C60(void) {
@@ -48,8 +54,6 @@ void func_80057CE4(void) {
}
}
void func_8004C024(s32, s32, s32, s32, s32, s32, s32); // extern
void func_8004C148(s32, s32, s32, s32, s32, s32, s32); // extern
extern s8 D_801657B2;
void func_80057DD0(void) {
@@ -1016,7 +1020,7 @@ s32 func_8008A890(Camera*); // extern
//? func_8008C1D8(? *); // extern
extern u16 D_800DC5FC;
extern s32 D_80165678;
extern s32 D_8018CF68;
extern s16 D_8018CF68[];
extern s32 gRaceFrameCounter;
extern Camera *camera1;
+3 -59
View File
@@ -3,42 +3,7 @@
#include "common_structs.h"
void func_8001C3C4(s32);
void func_80041D34(void);
void func_8004E638(s32);
void func_8004E78C(s32);
void func_8004E800(s32);
void func_8004E998(s32);
void func_8004EB30(s32);
void func_8004EB38(s32);
void func_8004ED40(s32);
void func_8004EE54(s32);
void func_8004F020(s32);
void func_8004F3E4(s32);
void func_8004FA78(s32);
void func_80050320(void);
void func_800514BC(void);
void func_800517C8(void);
void func_80051EBC(void);
void func_80051EF8(void);
void func_80051F9C(void);
void func_80052044(void);
void func_80052080(void);
void func_80052C60(void);
void func_800532A4(s32);
void func_80054BE8(s32);
void func_80055F48(s32);
void func_80056160(s32);
// code_80057C60
void func_80057C60();
void func_80057CE4();
@@ -162,6 +127,7 @@ void func_8006A7C0(Player*, f32, f32, s8, s8);
void func_8006AFD0(Player*, s16, s8, s8);
void func_8006B87C(Player*, s8);
void func_8006B8B4(Player*, s8);
void func_8006B974(s32, s8, s8);
void func_8006B9CC(Player*, s8);
void func_8006BA94(Player*, s8, s8);
@@ -186,29 +152,7 @@ void func_8006E848(Player*, s8, s8);
void func_8006E8C4(Player*, s8, s8);
void func_8006E940(Player*, s8, s8);
void func_800744CC(void);
void func_80077640(void);
void func_80078C70(s32);
void func_8007A948(s32);
void func_8007AA44(s32);
void func_8007BB9C(s32);
void func_8007C2F8(s32);
void func_80081210(void);
void func_80086604(void);
void func_80086D80(void);
void func_800892E0(s32);
void func_8008C1D8(s32*);
void func_8008C1E0(s32*, s32*);
void func_8008C204(void);
// skybox_and_splitscreen
void func_802A3730(struct UnkStruct_800DC5EC*);
+860 -911
View File
File diff suppressed because it is too large Load Diff
+45
View File
@@ -0,0 +1,45 @@
#ifndef CODE_8006E9C0_H
#define CODE_8006E9C0_H
#include "common_structs.h"
void func_8006E9C0();
void func_8006EA5C();
void func_8006ED60();
s32 func_8006ED94(s32*, s32, s32, s32);
void func_8006EE44();
void func_80070190();
void func_80070714();
extern s32 gScreenModeSelection;
extern s32 gTextureLogoMarioKart64;
extern s16 D_80165730;
extern s16 D_80165738;
extern s16 D_80165740;
extern s16 D_80165748;
extern s32 D_80183D5C;
extern s8 D_8018EDF3;
extern s32 D_8018D1E0;
extern s32 D_8018D9B0;
extern struct_8018CA70_entry D_8018CA70[];
// These are all *technically* hardcoded references to spots in D_8018CA70, but there's something weird
// going on match wise in func_8006EA5C that means we have to (for now) leave them as separate variables
extern s8 D_8018CAE0;
extern s8 D_8018CAE1;
extern s8 D_8018CAE2;
extern s8 D_8018CAF1;
extern s8 D_8018CB64;
extern s8 D_8018CB65;
extern s8 D_8018CB66;
extern s8 D_8018CB75;
extern s8 D_8018CBE8;
extern s8 D_8018CBE9;
extern s8 D_8018CBEA;
extern s8 D_8018CBF9;
extern s8 D_8018CC6C;
extern s8 D_8018CC6D;
extern s8 D_8018CC6E;
extern s8 D_8018CC7D;
#endif
+4971 -6846
View File
File diff suppressed because it is too large Load Diff
+155 -13
View File
@@ -2,48 +2,187 @@
#define CODE_80071F00_H
#include "common_structs.h"
#include "camera.h"
s32 find_unused_obj_index(s32*);
void func_80071F6C(s32);
s32 func_80072044(s32*, s32*, s32);
void func_80072100(s32);
void func_800721C0(s32, s32);
void func_800721E8(s32, s32);
void func_800722CC(s32, s32);
void func_80072214(s32, s32);
s32 func_8007223C(s32, s32);
s32 func_80072270(s32, s32);
void func_800722A4(s32, s32);
void func_800722CC(s32, s32);
void func_800722F8(s32, s32);
s32 func_80072320(s32, s32);
s32 func_80072354(s32, s32);
void func_80072388(s32, s32);
void func_800723A4(s32, s32);
void func_80072408(s32);
void func_80072428(s32);
void func_80072488(s32);
void func_800724DC(s32);
void func_800724F8(s32, s32);
s16 func_80072530(s32);
void func_80072568(s32, s32);
void func_800725E8(s32, s32, s32);
s16 func_80072530(s32);
void func_8007266C(s32);
void func_800726CC(s32, s32);
void func_8007271C(s32, s32);
void func_8007274C(s32);
s32 func_8007278C(s32, s32);
s32 func_8007281C(s32, s32);
s32 func_800728B0(s32, s32, s32);
void func_80072950(s32, s32, s32, s32);
void func_80072974(s32, s32, s32, s32);
void func_80072998(s32);
void func_800729B4(s32, s32);
void func_800729D0(s32, s32);
void func_80072A78(s32, s32);
s32 func_80072B48(s32, s32);
void func_80072C00(s32, s32, s32, s32);
void func_80072D3C(s32, s32, s32, s32, s32);
s32 func_80072E54(s32, s32, s32, s32, s32, s32);
s32 func_80072F88(s32, s32, s32, s32, s32, s32);
s32 func_800730BC(s32, s32, s32, s32, s32, s32);
s32 func_8007326C(s32, s32, s32, s32, s32, s32);
void func_80073404(s32, u8, u8, s32);
void func_80073444(s32, s32*, s32*, u8, u16);
void func_8007348C(s32, s32*, u8, u8, s32);
void func_800734D4();
void func_800734DC(s32);
void func_80073514(s32);
void func_80073568();
void func_800735BC(s32, s32, f32);
void func_80073600(s32);
void func_80073654(s32);
void func_8007369C(s32, s32);
void func_800736E0(s32);
void func_80073720(s32);
s32 func_8007375C(s32, s32);
void func_80073800(s32, s32);
void func_8007381C(s32);
void func_80073844(s32);
void func_80073884(s32);
s32 func_800738A8(s32, s16*, s32, s32, s32, s32, s32);
void func_80073998(s32, s16*, s32, s32, s32, s32, s32);
void func_800739CC(s32, s16*, s32, s32, s32, s32, s32);
s32 func_80073A10(s32, s16*, s32, s32, s32, s32, s32);
s32 func_80073B00(s32, s16*, s32, s32, s32, s32, s32);
s32 func_80073B34(s32, s16*, s32, s32, s32, s32, s32);
s32 func_80073B78(s32, s32, s16*, s32, s32, s32, s32, s32);
void func_80073CB0(s32, s16*, s32, s32, s32, s32, s32);
void func_80073D0C(s32, s16*, s32, s32, s32, s32, s32);
void func_80073D68(s32, s16*, s16, s32);
void func_80073DC0(s32, s16*, s16, s32);
s32 func_80073E18(s32, u16*, u16, s32);
s32 func_80073ED4(s32, u16*, u16, s32);
void func_80073F90(s32, s32);
void func_80073FAC(s32);
void func_80073FD4(s32);
void func_80074014();
s32 func_8007401C(s32, f32*, f32, f32, f32, s32, s32);
s32 func_80074118(s32, f32*, f32, f32, f32, s32, s32);
s32 func_8007415C(s32, f32*, f32, f32, f32, s32, s32);
s32 func_800741B4(s32, f32*, f32, f32, f32, s32, s32);
void func_800742A8(s32, f32*, f32, f32, f32, s32, s32);
void func_800742EC(s32, f32*, f32, f32, f32, s32, s32);
void func_80074344(s32, f32*, f32, f32, f32, s32, s32);
void func_80074478(s32);
void func_800744A0(s32);
void func_800744CC(void);
void func_800744CC();
void func_80074510(uintptr_t, void*, size_t);
void func_800745C8(s32, s32);
void func_8007466C(s32, s32);
void func_80074704(s32, s32);
s32 func_80074790(s32, s32);
void func_800747F0(s32);
void func_80074894(s32, s32);
void func_800748C4(s32, s32);
void func_800748F4(s32, s32);
void func_80074924(s32);
void func_80074D94(s32);
void func_80074E28(s32);
void func_80075574(s32, Vec3f, f32);
void func_80075698(s32);
void func_800759EC(s32, s32*, f32);
void func_80075714(s32);
void func_800759EC(s32, Vec3f, f32);
s32 func_80075A6C(s32, s32, f32);
void func_80075B08(s32);
void func_80075E5C(s32, void*, u16, s32, s32);
void func_80075B84(s32);
void func_80075E5C(s32, Vec3f, u16, f32, s32);
s32 func_80075F28(Vec3f, u16, f32, s32);
void func_80075F98(Vec3f, s32, f32);
void func_80086E70(s32);
void func_80086F60(s32);
void func_800877C4(s32);
void func_8008A6DC(s32, f32);
s32 func_8008A8B0(s16, s16);
// code_80086E70.c
void func_8008BF18(s32);
void func_8007601C(s32);
void func_80076194(s32, Vec3f, f32, s32);
void func_80076538(s32);
void func_80086604();
void func_8007675C(s32, Vec3s, s32);
void func_80076B7C();
void func_80076DC4(s32);
void func_80076E14(s32);
void func_80076ED8(s32);
void func_800773D8(s32, s32);
void func_80077428(s32);
void func_80077640();
void func_80077B14(s32);
void func_80077B3C(s32);
void func_80077BCC(s32);
void func_80078C68();
void func_80078C70(s32);
void func_80079054(s32);
void func_80079084(s32);
void func_800790B4(s32);
void func_800790E4(s32);
void func_8007993C(s32, Player*);
void func_80079A5C(s32, Player*);
void func_8007A884();
void func_8007A910(s32);
void func_8007A948(s32);
void func_8007AA44(s32);
u8 gen_random_item(s16, s16);
u8 func_8007AF40(s32, s16);
u8 func_8007AF78(s32, s16);
void func_8007BB9C();
void func_8007BDA8();
void func_8007C2F8(s32);
void func_8007C340();
void func_8007C49C();
s32 func_8007D804(s32);
void func_8007D8AC(s32);
void func_8007D8D4(s32, s32);
void func_8007DA4C(s32);
void func_8007DA74(s32);
void func_8007DAF8(s32, s32);
s32 func_8007E50C(s32, Player*, Camera*);
void func_8007F660(s32, s32, s32);
void func_8007F6C4(s32, s32);
void func_8007FEA4(s32);
void func_800806BC(s32);
void func_8008078C(s32);
void func_8008085C(s32);
void func_80080A14(s32, Player*);
void func_80081208();
void func_80081210();
void func_80081790(s32);
void func_80081924(s32);
void func_80082C30(s32);
void func_80083060(s32);
void func_80083248(s32);
void func_8008379C(s32);
void func_80083948(s32);
void func_80083BE4(s32);
void func_80083F18(s32);
void func_80085024();
void func_8008502C(s32, s32);
void func_80085080(s32);
void func_80085534(s32);
void func_80085BB4(s32);
void func_80086424(s32);
void func_80086D80();
// audio/external.c
void func_800C9D80(Vec3f, f32*, s32);
@@ -52,6 +191,8 @@ void func_800C9EF4(Vec3f, s32);
s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq);
s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32);
extern s8 D_8018EDF3;
extern OSMesgQueue gDmaMesgQueue;
extern OSMesg gMainReceivedMesg;
extern OSIoMesg gDmaIoMesg;
@@ -61,8 +202,9 @@ extern f32 D_800EEAD8;
extern f64 D_800EEAE0;
extern f32 D_800EEAE8;
extern s16 D_80165740;
extern struct_80165C18_entry D_80165C18[];
extern s8 D_801657B4;
extern s32 D_80183D5C;
extern s32 D_80183DB8[];
extern s32 D_80183E38;
extern s32 D_80183E4C;
extern s32 D_80183E5C;
+1035 -1579
View File
File diff suppressed because it is too large Load Diff
+142
View File
@@ -0,0 +1,142 @@
#ifndef CODE_80086E70_H
#define CODE_80086E70_H
#include "common_structs.h"
#include "camera.h"
void func_80086E70(s32);
void func_80086EAC(s32, s32, s16);
void func_80086EF0(s32);
void func_80086F10(s32, s32, s32);
void func_80086F60(s32);
s32 func_80086FA4(s32);
void func_80086FD4(s32);
void func_8008701C(s32, s32);
s32 func_80087060(s32, s32);
s32 func_80087104(s32, u16);
s32 func_800871AC(s32, s32);
void func_80087258(s32, s32, f32);
s32 func_80087294(s32, Player*);
s32 func_800872D8(s32, Camera*);
u16 func_80087324(s32);
s32 func_80087368(s32);
void func_800873A4(s32);
void func_800873F4(s32);
void func_80087444(s32);
void func_8008748C(s32);
void func_800874D4(s32);
void func_8008751C(s32);
void func_8008757C(s32);
void func_80087620(s32);
void func_800876A0(s32);
void func_80087710(s32);
void func_8008775C(s32);
void func_80087798(s32);
void func_800877C4(s32);
void func_800877F0(s32);
void func_8008781C(s32);
void func_80087844(s32);
f32 func_8008786C(f32, f32, f32, f32, f32);
s32 func_8008789C(s32, s32);
s32 func_80087954(s32, s32);
s32 func_80087A0C(s32, s16, s16, s16, s16);
s32 func_80087B84(s32, f32, f32);
s32 func_80087C48(s32, f32, f32, s32);
s32 func_80087D24(s32, f32, f32, f32);
s32 func_80087E08(s32, f32, f32, f32, s16, s32);
s32 func_80087F14(s32, f32, f32, f32, s16, s32);
void func_80088038(s32, f32, u16);
void func_800880DC();
void func_80088150(s32);
s32 func_80088538(s32);
s32 func_8008861C(s32);
void func_800886F4(s32);
void func_800887C0(s32);
s32 func_80088880(s32, Player*);
s32 func_800888E8(s32, Player*);
u32 func_8008896C(s32, Camera*);
s32 func_800889D4(s32, Camera*);
s32 func_80088A58(s32, Player*, f32);
s32 func_80088AC0(s32, Player*, f32, f32);
s32 func_80088B40(s32, Player*, f32);
s32 func_80088BB8(s32, Camera*, f32);
s32 func_80088C20(s32, Camera*, f32, f32);
s32 func_80088CA0(s32, Camera*, f32);
s32 func_80088D18(s32, Player*);
s32 func_80088DA4(s32, Player*);
s32 func_80088E48(s32, Player*, f32);
s32 func_80088E98(s32, Player*, f32);
f32 func_80088F54(s32, Player*);
s32 func_80088F94(s32, Player*, f32);
void func_80088FF0(Player*);
void func_8008900C(Player*);
void func_80089020(s32, f32*);
void func_800892E0(s32);
s32 func_8008A060(s32, Camera*, u16);
s32 func_8008A0B4(s32, Player*, Camera*, u16);
s32 func_8008A140(s32, Camera*, u16);
void func_8008A1D0(s32, s32, s32, s32);
void func_8008A2CC(s32, s32, u16);
u32 func_8008A364(s32, s32, u16, s32);
void func_8008A454(s32, s32, s32);
void func_8008A4CC(s32);
void func_8008A610(s32);
void func_8008A6DC(s32, f32);
void func_8008A810(s32);
void func_8008A830(s32);
void func_8008A850(s32);
s32 func_8008A870(Player*);
s32 func_8008A890(Camera*);
s32 func_8008A8B0(s16, s16);
void func_8008ABC0(s32);
void func_8008AC40(s32);
void func_8008ACC0();
void func_8008ACC8();
void func_8008ACD0();
void func_8008ACD8();
void func_8008ADC0();
void func_8008ADC8();
void func_8008AE8C();
void func_8008AE94();
void func_8008ADD0(s32, f32);
void func_8008AFE0(s32, f32);
void func_8008B018();
void func_8008B020();
void func_8008B028();
void func_8008B030();
void func_8008ACE0(s32,f32);
void func_8008B17C(s32, f32);
void func_8008B1B4();
void func_8008B1BC();
void func_8008B1C4();
void func_8008B1CC();
void func_8008B44C(s32);
void func_8008B7D4(s32, f32, f32, f32);
void func_8008B80C(s32, f32, f32, f32);
void func_8008B844(s32);
void func_8008B888(s32, u16, u16, u16);
void func_8008B8BC(s32, u16, u16, u16);
void func_8008B8F0(s32, f32, f32, f32);
void func_8008BA40(s32, s16, u16);
void func_8008BAB4(s32, s16, u16);
void func_8008BB28(s32, s16, u16);
void func_8008BB9C(s32, s16, s16, u16, u16);
void func_8008BC58(s32, s16, s16, u16, u16);
void func_8008BD14(s32, s16, s16, s16, u16, u16, u16);
void func_8008BE0C(s32, s16, u16);
void func_8008BEA4(s32, u16, u16);
void func_8008BFC0(s32);
void func_8008BF18(s32);
void func_8008C1B8();
void func_8008C1C0();
// This may be a list of tilemap flags on a per-camera basis
extern s16 D_8018CF68[];
extern s32 gPlayerCountSelection1;
extern s32 D_80183DA8;
extern s32 D_80183DC8;
extern f32 gVBlankTimer;
extern UnkActorInner D_8018C3B0;
extern Player *gPlayerOneCopy;
#endif
+10 -7
View File
@@ -4,21 +4,24 @@
#include "functions.h"
#include "variables.h"
#include "kart_attributes.h"
#include "code_8008C1D0.h"
#include "code_80027D00.h"
#include "code_80005FD0.h"
#include "code_8001F980.h"
#include "code_80027D00.h"
#include "code_800431B0.h"
#include "code_80057C60.h"
#include "code_8008C1D0.h"
#include <defines.h>
UNUSED void func_unnamed(void) {
}
UNUSED void func_8008C1D8(UNUSED s32 arg0) {
void func_8008C1D8(UNUSED s32 *arg0) {
}
UNUSED void func_8008C1E0(UNUSED s32 arg0, UNUSED s32 arg1) {
arg1 = 4;
void func_8008C1E0(UNUSED s32 arg0, UNUSED s32 arg1) {
arg1 = 4;
}
UNUSED void func_unnamed1(UNUSED s32 arg0) {
@@ -33,7 +36,7 @@ UNUSED void func_unnamed3(void) {
}
UNUSED void func_8008C204(void) {
void func_8008C204(void) {
}
@@ -1671,7 +1674,7 @@ void func_8008FC1C(Player* player) {
if ((player->unk_000 & 0x40) != 0) {
playerIndex = get_player_index_for_player(player);
player->unk_000 = 0x7000;
func_80056A94(playerIndex, player);
func_80056A94(playerIndex);
}
}
+40 -7
View File
@@ -5,7 +5,47 @@
/* Function Prototypes */
void func_unnamed();
void func_8008C1D8(s32*);
void func_8008C1E0(s32, s32);
void func_unnamed1(s32);
void func_unnamed2(s32);
void func_unnamed3();
void func_8008C204();
void func_unnamed4();
void func_8008C214();
void func_unnamed5();
void func_unnamed6();
void func_unnamed7();
void func_unnamed8();
void func_8008C23C();
void func_unnamed9();
void func_unnamed10();
void func_unnamed11();
void func_unnamed12();
void func_unnamed13();
void func_unnamed14();
void func_unnamed15();
void func_unnamed16();
void func_unnamed17();
void func_unnamed18();
void func_unnamed19();
void func_unnamed20();
void func_unnamed21();
void func_unnamed22(s32, s32);
void func_unnamed23();
void func_unnamed24();
void func_unnamed25();
void func_unnamed26();
void func_unnamed27();
void func_unnamed28();
void func_unnamed29();
void func_unnamed30();
void func_unnamed31();
void func_unnamed32();
void func_unnamed33();
void func_8008C310(Player*);
void func_unnamed34();
void func_8008C354(Player*, s8);
void func_8008C528(Player*, s8);
void func_8008C62C(Player*, s8);
@@ -69,15 +109,8 @@ void func_800911B4(Player*, s8);
void func_80091440(s8);
void func_800914A0();
// code_80005FD0
void func_800098FC(u32, Player*);
// code_800431B0
void func_800569F4(s32);
void func_80056A40(s32, s32);
void func_80056A94(s32, Player*);
// code_80057C60
void func_8006B8B4(Player*, s8);
// audio/external.c
void func_800C90F4(u8, uintptr_t);
void func_800C9060(u8, s32);
+1258 -1410
View File
File diff suppressed because it is too large Load Diff
+1 -2
View File
@@ -5,6 +5,7 @@
#include "main.h"
#include "variables.h"
#include "math_util.h"
#include "objects.h"
#include "memory.h"
@@ -790,8 +791,6 @@ void func_80042760(Mat4 arg0, Vec3f arg1, Vec3f arg2, f32 arg3) {
arg0[3][3] = 1.0f;
}
extern struct_80165C18_entry D_80165C18[];
/**
* @brief Tried to put the definitions in the declares. However, sp3C wants to be at the top.
* Something may be possible with some padding. Couldn't find a way though. So we get big mess.
-3
View File
@@ -87,7 +87,4 @@ extern s8 D_80165840[];
extern s8 D_801658FE;
extern s32 D_8018D120;
// This is also used in 80071F00
extern struct_80165C18_entry D_80165C18[];
#endif // MATH_UTIL_2_H
+1 -2
View File
@@ -283,8 +283,7 @@ extern s32 D_800DC5D8;
*/
void select_framebuffer(void) {
gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(gPhysicalFramebuffers[sRenderingFramebuffer]));
gDPSetFillColor(gDisplayListHead++, ((D_800DC5D0 << 8 & 0xF800 | (D_800DC5D4 * 8) & 0x7C0 | D_800DC5D8 >> 2 & 0x3E | 1) << 16) |
(D_800DC5D0 << 8 & 0xF800 | (D_800DC5D4 * 8) & 0x7C0 | (D_800DC5D8 >> 2) & 0x3E | 1));
gDPSetFillColor(gDisplayListHead++, GPACK_RGBA5551(D_800DC5D0, D_800DC5D4, D_800DC5D8, 1) << 0x10 | GPACK_RGBA5551(D_800DC5D0, D_800DC5D4, D_800DC5D8, 1));
gDPPipeSync(gDisplayListHead++);
gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
gDPFillRectangle(gDisplayListHead++, 0, 0, SCREEN_WIDTH-1, SCREEN_HEIGHT-1);