izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Player struct to Object

Browse Source
This commit is contained in:
David Benepe
2021-06-24 13:40:40 -05:00
parent 08f4dcd7f2
commit bac674ed61
7 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/structs.h
+16 -16
View File
@@ -253,25 +253,25 @@ typedef struct {
/* 0x4C */ u32 unk4C;
} dkr_wave_t;
typedef struct Player_3C {
typedef struct Object_3C {
u8 pad0[0x8];
s8 unk8;
u8 pad9[0x4];
u8 unkD;
} Player_3C;
} Object_3C;
typedef struct Player_40 {
typedef struct Object_40 {
u8 pad0[0xC];
f32 unkC;
u8 pad10[0x43];
s8 unk53;
s8 unk54;
s8 unk55; //size of array pointed by Player->unk68
s8 unk55; //size of array pointed by Object->unk68
u8 pad56[0x02];
u8 pad58[0x18];
u8 unk70;
u8 unk71;
} Player_40;
} Object_40;
typedef struct Player_4C {
u8 pad0[0x10];
@@ -282,7 +282,7 @@ typedef struct Player_4C {
u16 unk14;
} Player_4C;
typedef struct Player_64 {
typedef struct Object_64 {
f32 unk0;
s32 unk4;
u8 pad8[4];
@@ -339,14 +339,14 @@ typedef struct Player_64 {
u8 pad1D8[0x1A];
u8 unk1F2;
u8 unk1F3;
} Player_64;
} Object_64;
typedef struct Player_68{
typedef struct Object_68{
u8 pad00[0x20];
s8 unk20;
} Player_68;
} Object_68;
/* Size: 0x0630 bytes */
typedef struct Player {
typedef struct Object {
/* 0x0000 */ s16 y_rotation;
/* 0x0002 */ s16 x_rotation;
/* 0x0004 */ s16 z_rotation;
@@ -372,9 +372,9 @@ typedef struct Player {
/* 0x0039 */ u8 unk39;
/* 0x003A */ s8 unk3A;
/* 0x003B */ s8 unk3B;
/* 0x003C */ Player_3C* unk3C;
/* 0x003C */ Object_3C* unk3C;
/* 0x0040 */ Player_40 *descriptor_ptr;
/* 0x0040 */ Object_40 *descriptor_ptr;
/* 0x0044 */ void *unk44;
/* 0x0048 */ s16 unk48;
/* 0x004A */ s16 unk4A;
@@ -385,8 +385,8 @@ typedef struct Player {
/* 0x005C */ u32 unk5C;
/* 0x0060 */ void *unk60; //player + 0x340
/* 0x0064 */ Player_64 *unk64; //player + 0x98
/* 0x0068 */ Player_68 **unk68; //player + 0x80
/* 0x0064 */ Object_64 *unk64; //player + 0x98
/* 0x0068 */ Object_68 **unk68; //player + 0x80
/* 0x006C */ void *unk6C; //player + 0x370
/* 0x0070 */ u32 unk70;
@@ -409,7 +409,7 @@ typedef struct Player {
/* 0x0090 */ u32 unk90;
/* 0x0094 */ u32 unk94;
/* 0x0098 */ s16 playerIndex; // -1 = AI Controlled, 0 to 3 = Player controlled
/* 0x0098 */ s16 playerIndex; // -1 = AI Controlled, 0 to 3 = Object controlled
/* 0x009A */ u8 unk9A;
/* 0x009B */ u8 characterId; // Affects minimap color, horn, voice, etc.
@@ -605,6 +605,6 @@ typedef struct Player {
/* 0x0374 */ s32 unk374;
u32 unk378[174]; // Not an array. Unknown values.
} Player;
} Object;
#endif
src/menu.c
+3 -3
View File
@@ -2849,7 +2849,7 @@ void set_active_player_index(s32 controllerIndex) {
GLOBAL_ASM("asm/non_matchings/menu/menu_character_select_init.s")
/**
* Draws the "Player Select" and "OK?" text in the character select menu.
* Draws the "Object Select" and "OK?" text in the character select menu.
*/
void draw_character_select_text(s32 arg0) {
s32 yPos;
@@ -2857,10 +2857,10 @@ void draw_character_select_text(s32 arg0) {
set_text_font(2); // Set font to the Big Yellow Text
set_text_background_color(0, 0, 0, 0);
set_text_color(0, 0, 0, 0xFF, 0x80);
// Draw "Player Select" text drop shadow
// Draw "Object Select" text drop shadow
draw_text(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk21C, 0xC);
set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF);
// Draw "Player Select" text
// Draw "Object Select" text
draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk21C, 0xC);
if (gNumberOfReadyPlayers == gNumberOfActivePlayers && gNumberOfActivePlayers > 0) {
yPos = 0xD0;
src/unknown_00BC20.c
+42 -42
View File
@@ -129,7 +129,7 @@ s32 D_8011AD38;
s8 D_8011AD3C;
s8 D_8011AD3D;
s8 D_8011AD3E;
Player *D_8011AD40;
Object *D_8011AD40;
s8 D_8011AD44;
s8 D_8011AD45;
s16 D_8011AD46;
@@ -177,7 +177,7 @@ s32 (*D_8011AE48)[8]; // Unknown number of entries.
u8 (*D_8011AE4C)[8]; // Unknown number of entries.
s32 D_8011AE50;
s32 D_8011AE54;
Player **objPtrList; // Not sure about the number of elements
Object **objPtrList; // Not sure about the number of elements
s32 objCount;
s32 D_8011AE60;
s32 D_8011AE64;
@@ -204,7 +204,7 @@ s32 D_8011AEB0[2];
s16 *D_8011AEB8;
s32 D_8011AEBC;
s32 D_8011AEC0;
Player **particlePtrList;
Object **particlePtrList;
s32 particleCount;
/* Size: 0x3C bytes */
@@ -219,7 +219,7 @@ s32 D_8011AED4;
s16 D_8011AED8;
u32 (*D_8011AEDC)[64]; // Not sure about the number of elements
s32 D_8011AEE0;
Player *(*playerStructArray_Ptr)[8];
Object *(*playerStructArray_Ptr)[8];
s32 *D_8011AEE8;
s32 *D_8011AEEC;
s32 playerCount;
@@ -318,7 +318,7 @@ void func_8000C460(void);
void *new_sub_memory_pool(s32, u32);
void *allocate_from_main_pool_safe(s32, u32);
s32 *load_asset_section_from_rom(s32);
void particlePtrList_addObject(Player *);
void particlePtrList_addObject(Object *);
void particlePtrList_flush(void);
void func_8001D258(f32, f32, s32, s32, s32);
@@ -332,8 +332,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000B290.s")
#else
extern s32 D_800DC754;
extern Player* D_800DC75C;
extern Player* D_800DC764;
extern Object* D_800DC75C;
extern Object* D_800DC764;
s32 *func_8001E29C(s32 arg0);
@@ -385,7 +385,7 @@ void func_8000BF8C(void) {
func_8001D258(0.67f, 0.33f, 0, -0x2000, 0);
D_8011AE68 = (s32*)new_sub_memory_pool(0x15800, 0x200);
particlePtrList = (Player **)allocate_from_main_pool_safe(0x320, COLOR_TAG_BLUE);
particlePtrList = (Object **)allocate_from_main_pool_safe(0x320, COLOR_TAG_BLUE);
D_8011AE6C = (s32*)allocate_from_main_pool_safe(0x50, COLOR_TAG_BLUE);
D_8011AE74 = (s32*)allocate_from_main_pool_safe(0x200, COLOR_TAG_BLUE);
D_8011AECC = (unknown8011AECC*)allocate_from_main_pool_safe(0xE10, COLOR_TAG_BLUE);
@@ -422,7 +422,7 @@ void func_8000BF8C(void) {
D_8011ADA0++;
}
func_8000C2D8(&D_8011AD6C[D_8011AD70[65]], (D_8011AD70[66] - D_8011AD70[65]) * 4);
objPtrList = (Player**)allocate_from_main_pool_safe(0x800, COLOR_TAG_BLUE);
objPtrList = (Object**)allocate_from_main_pool_safe(0x800, COLOR_TAG_BLUE);
D_8011ADC4 = 0;
gTimeTrialEnabled = 0;
D_8011AEF5 = 0;
@@ -657,7 +657,7 @@ s8 func_8000E1DC() {
return D_8011AE03;
}
void func_8000E1EC(Player *arg0, s32 arg1) {
void func_8000E1EC(Object *arg0, s32 arg1) {
D_8011AD40 = arg0;
D_8011AD44 = 4;
D_8011AD45 = arg1;
@@ -690,14 +690,14 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E79C.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E898.s")
Player *getObject(s32 indx) {
Object *getObject(s32 indx) {
if (indx < 0 || indx >= objCount) {
return 0;
}
return objPtrList[indx];
}
Player **func_8000E988(s32 *arg0, s32 *cnt) {
Object **func_8000E988(s32 *arg0, s32 *cnt) {
*arg0 = D_8011AE60;
*cnt = objCount;
return objPtrList;
@@ -713,7 +713,7 @@ s32 func_8000E9C0(void) {
return D_8011AE64;
}
void func_8000E9D0(Player* arg0){
void func_8000E9D0(Object* arg0){
arg0->unk6 |= 0x8000;
func_800245B4(arg0->unk2C | 0xC000);
objPtrList[objCount++] = arg0;
@@ -763,7 +763,7 @@ s32 func_8000FD34(unk8000FD34 *arg0, s32 arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000FD54.s")
void particlePtrList_addObject(Player* arg0){
void particlePtrList_addObject(Object* arg0){
func_800245B4(arg0->unk4A | 0x8000);
particlePtrList[particleCount] = arg0;
particleCount++;
@@ -785,7 +785,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/particlePtrList_flush.s")
/*removes objects in particleList from objPtrList and frees*/
void particlePtrList_flush(void){
s32 j, i, search_indx, tmp;
Player* searchObj;
Object* searchObj;
D_8011AE88 = 0;
for (i = 0; i < particleCount; i++){
@@ -843,11 +843,11 @@ void func_80011560(void) {
}
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011570.s")
void func_80011960(Player*, s32, u32, Player_64*, u32, u32, u32, u32, f32);
void func_80011960(Object*, s32, u32, Object_64*, u32, u32, u32, u32, f32);
#if 1
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011960.s")
#else
void func_80011960(Player* arg0, s32 arg2, u32 arg3, Player_64* arg4
void func_80011960(Object* arg0, s32 arg2, u32 arg3, Object_64* arg4
, u32 arg5 , u32 arg6 , u32 arg7, u32 arg8, f32 arg9)
{
@@ -859,7 +859,7 @@ void func_80011960(Player* arg0, s32 arg2, u32 arg3, Player_64* arg4
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011AD0.s")
#else
extern f32 D_800E5550;
void func_80011AD0(Player* this){
void func_80011AD0(Object* this){
f32 tmp_f0;
u32 offset;
switch(this->unk48){
@@ -908,7 +908,7 @@ void func_80011AD0(Player* this){
#if 1
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80011C94.s")
#else
void func_80011C94(Player* this){
void func_80011C94(Object* this){
}
#endif
@@ -919,7 +919,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800120C8.s")
extern f32 D_8011AD30;
void func_800120C8(Player* this){
void func_800120C8(Object* this){
u32 sp_b8;
u32 sp_a8;
u32 sp_a4;
@@ -928,7 +928,7 @@ void func_800120C8(Player* this){
u32 *s0;
f32 tmp_f_1;
f32 *tmp_fp_s1;
Player_64* tmp_s3;
Object_64* tmp_s3;
s0 = ((u32*) this->unk68)[this->unk3A];
if(s0){
@@ -1036,9 +1036,9 @@ void func_80012CE8(Gfx **dlist) {
}
}
void func_8001348C(Player *);
void func_8001348C(Object *);
func_80012D5C(u32 *arg0, u32 *arg1, u32 *arg2, Player * arg3){
func_80012D5C(u32 *arg0, u32 *arg1, u32 *arg2, Object * arg3){
f32 scale;
u32 tmp2;
u32 tmp3;
@@ -1064,9 +1064,9 @@ extern f32 func_800707F8(s16);
#if 1
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012E28.s")
#else
void func_80012E28(Player *this){
void func_80012E28(Object *this){
s32 unused1;
Player_64 *sp_20;
Object_64 *sp_20;
f32 tmp_f2;
f32 sp_1c;
f32 tmp_f0;
@@ -1099,9 +1099,9 @@ void func_80012E28(Player *this){
#endif
void func_80012F30(Player *arg0) {
void func_80012F30(Object *arg0) {
if (arg0->unk48 == 1) {
Player_64 *player_64 = arg0->unk64;
Object_64 *player_64 = arg0->unk64;
arg0->y_rotation -= player_64->unk160;
arg0->x_rotation -= player_64->unk162;
arg0->z_rotation -= player_64->unk164;
@@ -1114,9 +1114,9 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80012F94.s")
void func_80013548(Player *arg0);
void func_80013548(Object *arg0);
void func_8001348C(Player *this){
void func_8001348C(Object *this){
func_80012F94(this);
if(this->unk6 & 0x8000){
func_800B3740(this, &D_8011AE8C, &D_8011AE90, &D_8011AE94, 32768);
@@ -1132,7 +1132,7 @@ void func_8001348C(Player *this){
func_80013548(this);
}
void func_80013548(Player *arg0) {
void func_80013548(Object *arg0) {
if ((arg0->unk6 & 0x8000) == 0 && arg0->descriptor_ptr->unk54 == 1) {
arg0->x_position -= arg0->unk64->unk78;
arg0->y_position -= arg0->unk64->unk7C;
@@ -1149,8 +1149,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80014090.s")
void func_800142B8(void){
s32 i = D_8011AE60;
s32 j;
Player* currObj;
Player_68 *curr_68;
Object* currObj;
Object_68 *curr_68;
for(; i < objCount; i++){
currObj = objPtrList[i];
@@ -1208,9 +1208,9 @@ s16 func_80017E88(void) {
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_80017E98.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_800185E4.s")
Player * func_80018C6C(void){
Object * func_80018C6C(void){
s32 i;
Player* current_obj;
Object* current_obj;
for(i=D_8011AE60; i < objCount; i++){
current_obj = objPtrList[i];
if(!(current_obj->unk6 & 0x8000) && (current_obj->unk48 == 62))
@@ -1312,7 +1312,7 @@ s32 func_8001BA64() {
return D_8011AED0;
}
Player **getPlayerStructArray(s32 *cnt) {
Object **getPlayerStructArray(s32 *cnt) {
*cnt = playerCount;
return *playerStructArray_Ptr;
}
@@ -1327,7 +1327,7 @@ s32 *func_8001BAAC(s32 *arg0) {
return D_8011AEE8;
}
Player *getPlayerStruct(s32 indx) {
Object *getPlayerStruct(s32 indx) {
if (playerCount == 0) {
return NULL;
}
@@ -1395,7 +1395,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D2A0.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D4B4.s")
GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8001D5E0.s")
void calc_dyn_light_and_env_map_for_object(ObjectModel *arg0, Player *object, s32 arg2, f32 arg3) {
void calc_dyn_light_and_env_map_for_object(ObjectModel *arg0, Object *object, s32 arg2, f32 arg3) {
s16 environmentMappingEnabled;
s32 dynamicLightingEnabled;
s16 i;
@@ -1459,7 +1459,7 @@ void func_8001E344(s32 arg0) {
void func_8001E36C(s32 arg0, f32* arg1, f32* arg2, f32* arg3){
s32 i;
Player* current_obj;
Object* current_obj;
*arg1 = -32000.0f;
*arg2 = -32000.0f;
*arg3 = -32000.0f;
@@ -1576,7 +1576,7 @@ void func_800228DC(s32 arg0, s32 arg1, s32 arg2) {
}
void func_800228EC(s32 arg0) {
Player_64 *player_64;
Object_64 *player_64;
D_8011AEF7 = 3;
player_64 = getPlayerStruct(0)->unk64;
@@ -1604,10 +1604,10 @@ extern f32 sqrtf(f32);
//bad regalloc
//finds furthest object (with some additional conditions)
Player* func_8002342C(f32 x, f32 z){
Player* retval = NULL;
Object* func_8002342C(f32 x, f32 z){
Object* retval = NULL;
s32 i;
Player* currObj = NULL;
Object* currObj = NULL;
f32 x;
f32 z;
f32 dist;
src/unknown_0255E0.c
+1 -1
View File
@@ -91,7 +91,7 @@ typedef struct{
unk8011B0B0 *D_8011B0B0;
s32 D_8011B0B4;
Player *D_8011B0B8;
Object *D_8011B0B8;
s32 D_8011B0BC;
s32 D_8011B0C0;
s32 D_8011B0C4;
src/unknown_0348C0.c
+37 -37
View File
@@ -116,14 +116,14 @@ s16 D_8011D4E2;
/******************************/
Settings* get_settings();
Player_64 *func_800BE654(s16, f32, f32);
Object_64 *func_800BE654(s16, f32, f32);
void func_80000FDC(s32, s32, f32);
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80033CC0.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80033DD0.s")
void func_80033F44(Player *arg0, s32 arg1) {
void func_80033F44(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
}
@@ -140,8 +140,8 @@ typedef struct unk80034530 {
u8 unkD;
} unk80034530;
void func_80034530(Player *arg0, unk80034530 *arg1) {
Player_64* temp;
void func_80034530(Object *arg0, unk80034530 *arg1) {
Object_64* temp;
arg0->unk4C->unk14 = 0x22;
arg0->unk4C->unk11 = 0;
temp = arg0->unk64;
@@ -157,7 +157,7 @@ void func_80034530(Player *arg0, unk80034530 *arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800345A0.s")
// Literally the same function as func_80033F44()
void func_80034844(Player *arg0, s32 arg1) {
void func_80034844(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
}
@@ -168,7 +168,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034860.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034AF0.s")
#else
// regalloc issues
void func_80034AF0(Player *arg0, u8 *arg1) {
void func_80034AF0(Object *arg0, u8 *arg1) {
f32 phi_f0 = (s32)arg1[9];
if (phi_f0 < 10.0f) {
phi_f0 = 10.0f;
@@ -196,7 +196,7 @@ void func_80034B68(s32 arg0, s32 arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034B74.s")
void func_80034E70(Player *arg0, u8 *arg1) {
void func_80034E70(Object *arg0, u8 *arg1) {
arg0->unk4C->unk14 = 1;
arg0->unk4C->unk11 = 2;
arg0->y_rotation = arg1[8] << 6 << 4; // Not sure about the values here.
@@ -204,7 +204,7 @@ void func_80034E70(Player *arg0, u8 *arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80034E9C.s")
void func_8003522C(Player *arg0, s32 arg1) {
void func_8003522C(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
arg0->unk4C->unk10 = 0x14;
@@ -247,7 +247,7 @@ typedef struct unk80035EF8 {
s16 unkE;
} unk80035EF8;
void func_80035EF8(Player *arg0, unk80035EF8 *arg1) {
void func_80035EF8(Object *arg0, unk80035EF8 *arg1) {
f32 phi_f0;
arg0->unk78 = (s32) arg1->unkE;
arg0->unk7C.word = -1;
@@ -263,8 +263,8 @@ void func_80035EF8(Player *arg0, unk80035EF8 *arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80035F6C.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80036040.s")
void func_80036194(Player *arg0, s32 arg1) {
Player_64* temp;
void func_80036194(Object *arg0, s32 arg1) {
Object_64* temp;
arg0->unk4C->unk14 = 1;
arg0->unk4C->unk11 = 0;
arg0->unk4C->unk10 = 0x1E;
@@ -359,7 +359,7 @@ void func_80037D6C(s32 arg0, s32 arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80037D78.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800380F8.s")
void func_8003818C(Player *arg0, s32 arg1) {
void func_8003818C(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 0x81;
arg0->unk4C->unk11 = 2;
arg0->unk4C->unk10 = 0x14;
@@ -371,7 +371,7 @@ void func_800381C0(s32 arg0, s32 arg1) {
func_8001F460(arg0, arg1, arg0);
}
void func_800381E0(Player *arg0, s32 arg1) {
void func_800381E0(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 1;
arg0->unk4C->unk11 = 2;
arg0->unk4C->unk10 = 0x14;
@@ -379,7 +379,7 @@ void func_800381E0(Player *arg0, s32 arg1) {
}
// Literally the same as func_8003818C()
void func_80038214(Player *arg0, s32 arg1) {
void func_80038214(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 0x81;
arg0->unk4C->unk11 = 2;
arg0->unk4C->unk10 = 0x14;
@@ -387,7 +387,7 @@ void func_80038214(Player *arg0, s32 arg1) {
}
// Literally the same as func_800381E0()
void func_80038248(Player *arg0, s32 arg1) {
void func_80038248(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 1;
arg0->unk4C->unk11 = 2;
arg0->unk4C->unk10 = 0x14;
@@ -399,7 +399,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003833C.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038710.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800387CC.s")
void func_80038854(Player *arg0, u8 *arg1) {
void func_80038854(Object *arg0, u8 *arg1) {
if (arg1[9] != 0) {
arg0->unk4C->unk14 = 0x21;
} else {
@@ -446,7 +446,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038AD4.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038B74.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_80038BF4.s")
void func_80038D58(Player *arg0, s32 arg1) {
void func_80038D58(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
arg0->unk4C->unk10 = 0xF;
@@ -456,9 +456,9 @@ void func_80038D58(Player *arg0, s32 arg1) {
}
}
void func_80038DC4(Player *arg0, s32 arg1) {
void func_80038DC4(Object *arg0, s32 arg1) {
if (arg0->unk78 != 0) {
Player_3C* temp = arg0->unk3C;
Object_3C* temp = arg0->unk3C;
if(arg0->unk4C->unk13 < 0x78) {
func_8006F338(temp->unk8);
arg0->unk78 = 0;
@@ -503,7 +503,7 @@ void func_800391BC(s32 arg0, s32 arg1) {
}
void func_800391C8(Player *arg0, s32 arg1) {
void func_800391C8(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 1;
arg0->unk4C->unk11 = 3;
arg0->unk4C->unk10 = 0x14;
@@ -512,8 +512,8 @@ void func_800391C8(Player *arg0, s32 arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_800391FC.s")
void func_800392B8(Player *arg0, s32 arg1) {
Player_64* temp;
void func_800392B8(Object *arg0, s32 arg1) {
Object_64* temp;
arg0->unk4C->unk14 = (u16)1;
arg0->unk4C->unk11 = (u8)0;
arg0->unk4C->unk10 = (u8)0x1E;
@@ -557,7 +557,7 @@ f32 func_8003ACAC(void) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003ACBC.s")
#else
void func_8003ACBC(Player *arg0, u8 *arg1, s32 arg2) {
void func_8003ACBC(Object *arg0, u8 *arg1, s32 arg2) {
f32 phi_f0 = (s32)arg1[8]; // Regalloc issue here
if (phi_f0 < 5.0f) {
phi_f0 = 5.0f;
@@ -586,8 +586,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003C2E4.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003C644.s")
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003C7A4.s")
void func_8003C9EC(Player *arg0, u8 *arg1) {
Player_64 *temp = arg0->unk64;
void func_8003C9EC(Object *arg0, u8 *arg1) {
Object_64 *temp = arg0->unk64;
arg0->unk3A = arg1[8];
arg0->y_rotation = arg1[9] << 6 << 4;
temp->unk0 = arg0->y_position;
@@ -603,7 +603,7 @@ void func_8003C9EC(Player *arg0, u8 *arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003CA68.s")
void func_8003CE64(Player *arg0, u8 *arg1) {
void func_8003CE64(Object *arg0, u8 *arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
arg0->unk4C->unk10 = 0x14;
@@ -611,7 +611,7 @@ void func_8003CE64(Player *arg0, u8 *arg1) {
arg0->unk78 = arg1[8];
}
void func_8003CEA0(Player *arg0, s32 arg1) {
void func_8003CEA0(Object *arg0, s32 arg1) {
if (arg0->unk4C->unk13 < 0x2D) {
func_8001E344(arg0->unk78, arg0);
}
@@ -638,7 +638,7 @@ void func_8003CF18(unk8003CF18 *arg0, u8 *arg1) {
arg0->unk78 = temp_f0;
}
void func_8003CF58(Player *arg0, u8 *arg1) {
void func_8003CF58(Object *arg0, u8 *arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
arg0->unk4C->unk10 = arg1[9];
@@ -646,7 +646,7 @@ void func_8003CF58(Player *arg0, u8 *arg1) {
arg0->unk7C.word = arg1[9];
}
void func_8003CF98(Player *arg0, s32 arg1) {
void func_8003CF98(Object *arg0, s32 arg1) {
if (arg0->unk4C->unk13 < arg0->unk7C.word) {
func_80028044(arg0->unk78);
}
@@ -695,7 +695,7 @@ void func_8003D3EC(unk8003D3EC *arg0, s32 arg1) {
GLOBAL_ASM("asm/non_matchings/unknown_032760/func_8003D3FC.s")
void func_8003D534(Player *arg0, s32 arg1) {
void func_8003D534(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
arg0->unk4C->unk10 = 0x1E;
@@ -723,7 +723,7 @@ void func_8003E5BC(s32 arg0, s32 arg1) {
}
void func_8003E5C8(Player *arg0, s32 arg1) {
void func_8003E5C8(Object *arg0, s32 arg1) {
arg0->unk4C->unk14 = 2;
arg0->unk4C->unk11 = 0;
arg0->unk4C->unk10 = 0x18;
@@ -763,7 +763,7 @@ void func_800403A8(unk800403A8 *arg0, s32 arg1, s32 arg2) {
arg0->unk64 = func_80031CAC(arg0, arg1);
}
void func_800403D8(Player *arg0, s32 arg1, s32 arg2) {
void func_800403D8(Object *arg0, s32 arg1, s32 arg2) {
arg0->unk64 = func_800BE654(arg0->unk2E, arg0->x_position, arg0->z_position);
arg0->unk4C->unk14 = 1;
arg0->unk4C->unk11 = 0;
@@ -771,9 +771,9 @@ void func_800403D8(Player *arg0, s32 arg1, s32 arg2) {
arg0->unk4C->unk12 = 0;
}
f32 func_800BEEB4(Player_64*);
f32 func_800BEEB4(Object_64*);
void func_80040448(Player *arg0, s32 arg1) {
void func_80040448(Object *arg0, s32 arg1) {
if (arg0->unk64 != NULL) {
arg0->y_position = func_800BEEB4(arg0->unk64);
}
@@ -800,7 +800,7 @@ void func_8004092C(s32 arg0, s32 arg1) {
func_800AC8A8(arg0);
}
void func_8004094C(Player *arg0, s16 *arg1, s32 arg2) {
void func_8004094C(Object *arg0, s16 *arg1, s32 arg2) {
func_800ACF60();
arg0->scale = arg1[4];
arg0->scale /= 40.0f;
@@ -847,12 +847,12 @@ typedef struct unk8004203C_arg1 {
u16 unkA;
} unk8004203C_arg1;
void func_8004203C(Player *arg0, unk8004203C_arg1 *arg1) {
void func_8004203C(Object *arg0, unk8004203C_arg1 *arg1) {
func_800AF134(arg0->unk6C, arg1->unk9, arg1->unk8, 0, 0, 0);
arg0->unk78 = arg1->unkA;
}
void func_80042090(Player *arg0, s32 arg1) {
void func_80042090(Object *arg0, s32 arg1) {
if (arg0->unk78 >= get_random_number_from_range(0, 0x400)) {
arg0->unk74 = 1;
} else {
src/unknown_043920.c
+2 -2
View File
@@ -287,7 +287,7 @@ void func_8005234C(unk8005234C *arg0) {
GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80052388.s")
GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8005250C.s")
void func_80052988(Player* arg0, Player_64* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
void func_80052988(Object* arg0, Object_64* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) {
arg5 *= arg7;
if ((D_8011D55C == -1) && (arg2 >= 3)) {
@@ -394,7 +394,7 @@ void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1) {
func_8006F64C(&sp30, 0, -1, 0, &arg1->unkA0, &arg1->unkA4, &arg1->unk9C);
}
void func_80053664(Player_64 *arg0) {
void func_80053664(Object_64 *arg0) {
if (arg0->throttle > 0.0) {
arg0->throttle -= 0.1;
}
src/unknown_066AA0.c
+1 -1
View File
@@ -147,7 +147,7 @@ s16 D_800DD304 = -1;
/************ .bss ************/
/* Size: 0x44 bytes, might just be Player? */
/* Size: 0x44 bytes, might just be Object? */
typedef struct unk80120AC0 {
s16 unk0;
s16 unk2;