mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-16 07:04:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match funcs in player_controller.c (#398)

Browse Source 
* Match funcs in player_controller.c
This commit is contained in:
MegaMech
2023-09-04 18:57:16 -06:00
committed by GitHub
parent 9663a66dd2
commit 23cfd1ca02
17 changed files with 656 additions and 7992 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/external.c
+1 -1
View File
@@ -4762,7 +4762,7 @@ u8 D_800EA108 = 0;
static f32 D_800EA110[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
f32 D_800EA1D4[3]; /* unable to generate initializer */
void func_800CADD0(s32 arg0, f32 arg1) {
void func_800CADD0(u8 arg0, f32 arg1) {
f32 *temp_a1;
f32 *temp_v0_2;
f32 var_f12;
src/audio/external.h
+2
View File
@@ -88,6 +88,8 @@ struct Unk_800EA06C {
/* 0x0D */ // u8 compilerPadding0[3];
};
void func_800C94A4(u8);
void func_800CADD0(u8, f32);
void func_800C13F0(void);
void func_800C13FC(OSMesg);
f32 func_800C1480(u8, u8);
src/code_8003DC40.c
+2 -2
View File
@@ -256,7 +256,7 @@ void func_8003F46C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
}
}
void func_8003F734(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6) {
void func_8003F734(Player *player, Vec3f arg1, Vec3f arg2, f32 *arg3, f32 *arg4, f32 *arg5, f32 *arg6) {
f32 temp_f12;
f32 temp_f14;
f32 temp_f0_2;
@@ -310,7 +310,7 @@ void func_8003F734(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
}
}
void func_8003FBAC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6) {
void func_8003FBAC(Player *player, Vec3f arg1, Vec3f arg2, f32 *arg3, f32 *arg4, f32 *arg5, f32 *arg6) {
f32 temp_f0_2;
f32 temp_f12;
f32 temp_f14;
src/code_8003DC40.h
+2 -2
View File
@@ -15,8 +15,8 @@ void func_8003E9EC(Player*, Vec3f, Vec3f, Vec3f, f32*, f32*, f32*, f32*);
void func_8003EE2C(Player*, Vec3f, Vec3f, Vec3f, f32*, f32*, f32*, f32*);
void func_8003F138(Player*, Vec3f, Vec3f, Vec3f, f32*, f32*, f32*, f32*);
void func_8003F46C(Player*, Vec3f, Vec3f, Vec3f, f32*, f32*, f32*, f32*);
void func_8003F734(Player*, Vec3f, Vec3f, Vec3f, f32*, f32*, f32*);
void func_8003FBAC(Player*, Vec3f, Vec3f, Vec3f, f32*, f32*, f32*);
void func_8003F734(Player*, Vec3f, Vec3f, f32*, f32*, f32*, f32*);
void func_8003FBAC(Player*, Vec3f, Vec3f, f32*, f32*, f32*, f32*);
extern s16 gCurrentCourseId;
src/collision.h
+1
View File
@@ -14,6 +14,7 @@ s16 func_802ABDF4(u16);
f32 func_802ABE30(f32, f32, f32, u16);
f32 func_802ABEAC(Collision*, Vec3f);
void process_shell_collision(Vec3f, f32, Vec3f, f32);
u16 process_collision(Player *player, KartBoundingBoxCorner *corner, f32 cornerPosX, f32 cornerPosY, f32 cornerPosZ);
void func_802AC114(Vec3f, f32, Vec3f, f32);
u16 func_802AD950(Collision*, f32, f32, f32, f32, f32, f32, f32);
u16 func_802ADDC8(Collision*, f32, f32, f32, f32);
src/player_controller.c
+640 -827
View File
File diff suppressed because it is too large Load Diff
src/player_controller.h
+3 -1
View File
@@ -6,6 +6,8 @@
/* Function Prototypes */
void func_8002E594(Player*, Camera*, s8, s8);
s32 get_player_index_for_player(Player*);
void func_80027DA8(Player*, s8);
void func_80027EDC(Player*, s8);
@@ -49,7 +51,7 @@ void func_8002B830(Player*, s8, s8);
void func_8002B8A4(Player*, Player*);
void func_8002B9CC(Player*, s8, s32);
void func_8002BD58(Player*);
void func_8002BF4C(Player*, u8);
void func_8002BF4C(Player*, s8);
void func_8002C11C(Player*);
void func_8002C17C(Player*, s8);
src/spawn_players.c
+3 -3
View File
@@ -150,9 +150,9 @@ void spawn_player(Player *player, s8 playerIndex, f32 startingRow, f32 startingC
player->unk_224 = 1.0f;
player->unk_DAC = 1.0f;
player->unk_064 = 0.0f;
player->unk_068 = 0.0f;
player->unk_06C = 0.0f;
player->unk_064[0] = 0.0f;
player->unk_064[1] = 0.0f;
player->unk_064[2] = 0.0f;
player->boostPower = 0.0f;
player->unk_D9C = 0.0f;
player->unk_DA0 = 0.0f;