mirror of
https://gitlab.com/dk64_decomp/dk64.git
synced 2024-11-23 07:01:58 +00:00
Fix more warnings
This commit is contained in:
Donkey Kong
parent
b52fd0ed93
commit
d60ff6a903
@ -39,9 +39,6 @@ void func_80665564(Actor *arg0, f32 arg1);
|
||||
|
||||
s16 func_80665DE0(f32, f32, f32, f32);
|
||||
|
||||
// TODO: Figure out why adding this here causes func_806CF42C to not match
|
||||
// void func_80679200(Actor*, Actor*, s32, u8, s32, s32);
|
||||
|
||||
void func_8067DF44(f32, f32, f32, f32, u8, u8);
|
||||
// s32 func_80677FA8(Actors, s32); // spawnActorWrapper()
|
||||
void func_807149C8(u8 arg0, u8 arg1, u8 arg2, u8 arg3);
|
||||
@ -140,7 +137,7 @@ void func_806017E8(u8 arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4);
|
||||
void func_80601848(u8 arg0, f32 arg1, f32 arg2);
|
||||
void func_8060188C(u8 arg0, s32 arg1);
|
||||
ALMicroTime func_806018B4(u8 arg0);
|
||||
void func_80679200(Actor*, Actor*, s32, u8, s32, s32);
|
||||
void func_80679200(Actor *arg0, Actor *arg1, s32 arg2, u8 arg3, s32 arg4, void *arg5);
|
||||
void func_80688370(Actor*, s32, f32);
|
||||
void func_806883F4(Actor* actor, s32 arg1, s16 arg2, f32 arg3);
|
||||
void func_806A18A8(void);
|
||||
@ -261,7 +258,7 @@ void func_806B86AC(void);
|
||||
void func_806B88B8(void);
|
||||
void func_806B8878(void);
|
||||
void func_806B8898(void);
|
||||
void func_8067AAB8(Actor* arg0, s32 arg1, s16 arg2, f32 arg3, s16 arg4);
|
||||
void func_8067AAB8(Actor* arg0, Actor *arg1, s16 arg2, f32 arg3, s16 arg4);
|
||||
void func_8067ACB4(Actor*);
|
||||
void func_8067BA3C();
|
||||
void func_8067BC68(void);
|
||||
@ -270,7 +267,7 @@ void func_8067BCA8(void);
|
||||
void func_8067BCC8(void);
|
||||
void func_8067BCE8(void);
|
||||
void func_8067BD08(void);
|
||||
void func_80689114(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, s32 arg6);
|
||||
void func_80689114(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, Actor *arg6);
|
||||
void func_8067BD28(void);
|
||||
void func_8067BDB8(void);
|
||||
void func_8067BDF8();
|
||||
@ -412,7 +409,7 @@ void func_8064B900(s32 arg0, s32 arg1, s16 arg2, s32 arg3);
|
||||
void func_8064BB4C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
|
||||
s32 func_8064BB78(s32 arg0, s32 arg1, s32 levelIndex, s32 arg3);
|
||||
s32 func_8064BCB0(s32 arg0, s32 arg1);
|
||||
void func_8067ABC0(s32 arg0, s32 arg1, u8 arg2, s16 arg3, s16 arg4, f32 arg5, f32 arg6, f32 arg7);
|
||||
void func_8067ABC0(Actor *arg0, Actor *arg1, u8 arg2, s16 arg3, s16 arg4, f32 arg5, f32 arg6, f32 arg7);
|
||||
u8 func_8064BE58(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
|
||||
s32 func_8064BF58(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
|
||||
void func_8064EA48(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
|
||||
@ -697,7 +694,7 @@ void func_8066E5F8(Actor *arg0, s32 arg1, u8 arg2);
|
||||
void func_8066E62C(Actor *arg0, s32 arg1, u8 arg2);
|
||||
void func_8066E664(Actor *arg0, s32 arg1, u8 arg2);
|
||||
void func_8066E6C8(Actor *arg0, s32 arg1, u8 arg2);
|
||||
void func_8066E72C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
|
||||
void func_8066E72C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6, void *arg7, s32 arg8);
|
||||
void func_8066E990(Actor *arg0);
|
||||
void func_8066EA90(Actor *arg0, s32 arg1);
|
||||
void func_8066EB50(Actor *actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
|
||||
@ -1238,14 +1235,14 @@ void func_80678F9C(Actor *arg0, s32 arg1);
|
||||
void func_80679064(void *arg0);
|
||||
void func_806791DC(Actor *arg0, s32 arg1);
|
||||
void func_806791EC(Actor *arg0, s32 arg1);
|
||||
void func_8067A69C(s32 arg0, s32 arg1, f32 arg2, f32 arg3, u8 arg4, u8 arg5);
|
||||
void func_8067A69C(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, u8 arg4, u8 arg5);
|
||||
void func_8067A70C(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, f32 arg4, u8 arg5, u8 arg6);
|
||||
void func_8067A7EC(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, u8 arg6);
|
||||
void func_8067A864(s32 arg0, s32 arg1, s16 arg2, s16 arg3, void *arg4, void *arg5, s32 arg6, s32 arg7, s32 arg8);
|
||||
void func_8067A908(s32 arg0, s32 arg1, void *arg2, void *arg3, s32 arg4, s32 arg5, s32 arg6);
|
||||
void func_8067A99C(s32 arg0, s32 arg1, s32 arg2);
|
||||
void func_8067A9F0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4);
|
||||
void func_8067AA58(s32 arg0, s32 arg1, f32 arg2, f32 arg3);
|
||||
void func_8067A7EC(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, u8 arg6);
|
||||
void func_8067A864(Actor *arg0, Actor *arg1, s16 arg2, s16 arg3, void *arg4, void *arg5, s32 arg6, s32 arg7, s32 arg8);
|
||||
void func_8067A908(Actor *arg0, Actor *arg1, void *arg2, void *arg3, s32 arg4, s32 arg5, s32 arg6);
|
||||
void func_8067A99C(Actor *arg0, Actor *arg1, s32 arg2);
|
||||
void func_8067A9F0(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, f32 arg4);
|
||||
void func_8067AA58(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3);
|
||||
void func_8067AB20(Actor *arg0, Actor *arg1, s32 arg2, u8 arg3, void *arg4, u8 arg5);
|
||||
void func_8067AC38(void);
|
||||
u16 func_8067ACC0(u16 index);
|
||||
@ -1354,25 +1351,25 @@ void func_806F6F28(void);
|
||||
s32 func_806F70A8(s16 arg0);
|
||||
f32 func_806F7378(s32 arg0);
|
||||
s32 func_8066461C(s16 arg0);
|
||||
u8 func_806767E0(s32, s32, s32);
|
||||
u8 func_806767E0(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2);
|
||||
void func_80676260(Actor *arg0, Actor *arg1, s32 arg2);
|
||||
u8 func_80676280(Actor *arg0, s32 arg1, s32 arg2);
|
||||
u8 func_806762C0(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_80676280(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2);
|
||||
u8 func_806762C0(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2);
|
||||
u8 func_80676308(Actor *arg0, Actor *arg1, s32 arg2);
|
||||
u8 func_806764D8(Actor *arg0, Actor *arg1, s32 arg2);
|
||||
u8 func_80676540(s32 arg0, Actor *arg1, Actor *arg2);
|
||||
u8 func_806764D8(Actor *arg0, Actor *arg1, Actor *arg2);
|
||||
u8 func_80676540(Actor *arg0, Actor *arg1, Actor *arg2);
|
||||
u8 func_80676590(Actor *arg0, Actor *arg1, s32 arg2);
|
||||
u8 func_806765E8(Actor *arg0, Actor *arg1, s32 arg2);
|
||||
u8 func_80676690(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_806766E0(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_80676730(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_8067675C(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_80676788(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_806767B4(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_80676690(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2);
|
||||
u8 func_806766E0(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2);
|
||||
u8 func_80676730(s32 arg0, s32 arg1, Struct80676CB0 *arg2);
|
||||
u8 func_8067675C(s32 arg0, s32 arg1, Struct80676CB0 *arg2);
|
||||
u8 func_80676788(s32 arg0, s32 arg1, Struct80676CB0 *arg2);
|
||||
u8 func_806767B4(s32 arg0, s32 arg1, Struct80676CB0 *arg2);
|
||||
u8 func_80676A70(s32 arg0, s32 arg1, s32 arg2);
|
||||
u8 func_80676B38(Actor *arg0, void *arg1, s32 arg2);
|
||||
u8 func_80676B70(Actor *arg0, void *arg1, s32 arg2);
|
||||
u8 func_80676C64(s32 arg0, Actor *arg1, s32 arg2);
|
||||
u8 func_80676B38(Actor *arg0, Actor *arg1, Actor *arg2);
|
||||
u8 func_80676B70(Actor *arg0, Actor *arg1, Actor *arg2);
|
||||
u8 func_80676C64(s32 arg0, Actor *arg1, Struct80676CB0 *arg2);
|
||||
void func_806B63E0();
|
||||
void func_8060EC54(s32);
|
||||
void func_8060E6E8(s32);
|
||||
@ -1545,7 +1542,7 @@ void func_8062BAE4(void);
|
||||
void func_8062C1C0(s32 arg0);
|
||||
void func_8062C22C(void);
|
||||
void func_8062CA0C(s32 arg0, f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_8062D094(s32 arg0, u8 arg1);
|
||||
void func_8062D094(Model2Model *arg0, u8 arg1);
|
||||
void func_8062D1A8();
|
||||
void func_8062D2AC(s32 arg0, s32 arg1, u8 arg2);
|
||||
void func_8062E608(void *arg0, s32 *arg1, s32 arg2);
|
||||
@ -1721,7 +1718,7 @@ void func_806A57C0(AAD_806A4DDC *arg0);
|
||||
void func_8070E808(Actor *arg0, Actor *arg1);
|
||||
void func_8070DA28(AAD_806A4DDC *arg0);
|
||||
void func_806891D8(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, s32 arg6, Struct807500B4 *arg7);
|
||||
void func_806A7600(s32 arg0);
|
||||
void func_806A7600(void *arg0);
|
||||
void func_8072EE7C(s32 arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9, f32 argA, u8 argB, f32 argC, f32 argD, u8 argE);
|
||||
void func_8072EF7C(Actor *arg0, u8 arg1, u8 arg2, u8 arg3, u8 arg4, f32 arg5, f32 arg6, f32 arg7, u8 arg8, s16 arg9, s16 argA, s16 argB, s16 argC);
|
||||
f32 func_80611850(f32 arg0);
|
||||
@ -1796,7 +1793,7 @@ void func_806E918C(void);
|
||||
void func_806E9ECC(void);
|
||||
void func_806E9F8C(void);
|
||||
s32 func_807383B0(ALSeqPlayer *arg0);
|
||||
void func_80735A50(s32 arg0, s32 arg1);
|
||||
void func_80735A50(ALSeqPlayer *arg0, s32 arg1);
|
||||
void func_8073C9C0(s32 arg0, s16 arg1, s32 arg2);
|
||||
void func_8073BE54(Struct8073BC74 *arg0, f32 arg1);
|
||||
u8 func_806BDD90(void);
|
||||
@ -1847,7 +1844,7 @@ void func_806645B8(s16 arg0);
|
||||
s32 func_8063C2A8(s16);
|
||||
void func_80664A38(s16 arg0);
|
||||
void func_80664834(s16 arg0);
|
||||
u8 func_8067641C(Actor*, Actor*, s32);
|
||||
u8 func_8067641C(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2);
|
||||
u8 func_80676BCC(s32 arg0, Actor *arg1, s32 arg2);
|
||||
u8 func_80676C10(s32 arg0, Actor *arg1, s32 arg2);
|
||||
void func_806B640C(void);
|
||||
@ -1923,6 +1920,8 @@ void func_805FF1B0(s32 player_index);
|
||||
s32 func_80600340(s32 arg0, u8 arg1, s32 *arg2);
|
||||
void func_80738400(ALSeqPlayer *arg0, u8 arg1, u8 arg2, u8 arg3, s32 arg4);
|
||||
|
||||
ActorCollision *func_80679490(Actor *, s32, u8, s32, void*);
|
||||
|
||||
// TODO: Where is the best place to put this so it's available everywhere and doesn't conflict with internal libultra/gu stuff?
|
||||
#define ABS(d) ((d) > 0) ? (d) : -(d)
|
||||
|
||||
|
||||
@ -41,6 +41,26 @@ typedef struct {
|
||||
u8 unk1;
|
||||
} Struct80027840;
|
||||
|
||||
typedef struct {
|
||||
s32 unk0;
|
||||
s32 unk4;
|
||||
s32 unk8;
|
||||
s32 unkC;
|
||||
s32 unk10;
|
||||
s32 unk14;
|
||||
s32 unk18;
|
||||
} Struct80676CB0_unk10;
|
||||
|
||||
typedef struct {
|
||||
s32 unk0;
|
||||
s32 unk4;
|
||||
s32 unk8;
|
||||
s32 unkC;
|
||||
Struct80676CB0_unk10 *unk10;
|
||||
s32 unk14;
|
||||
s32 unk18;
|
||||
} Struct80676CB0;
|
||||
|
||||
typedef struct ledge_info_8c LedgeInfo8C;
|
||||
|
||||
struct ledge_info_8c {
|
||||
@ -500,7 +520,7 @@ struct actor_collision {
|
||||
u16 unk6;
|
||||
Actor *collisionSource;
|
||||
u32 unkC;
|
||||
u32 unk10;
|
||||
void *unk10; // Can be many different types
|
||||
ActorCollision* next;
|
||||
ActorCollision* prev;
|
||||
};
|
||||
|
||||
@ -1,8 +1,13 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
|
||||
typedef struct {
|
||||
u8 unk0[0x6 - 0x0];
|
||||
u8 unk6[1]; // TODO: How many elements?
|
||||
} Struct8002450C;
|
||||
|
||||
void func_8072AB74(s32, f32, f32, s32, f32);
|
||||
s32 func_80024568(s32, u8, f32, f32, f32);
|
||||
s32 func_80024568(Struct8002450C*, u8, f32, f32, f32);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/boss/code_0/func_80024000.s")
|
||||
|
||||
@ -111,11 +116,6 @@ void func_8002413C(void) {
|
||||
// Jumptable
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/boss/code_0/func_80024300.s")
|
||||
|
||||
typedef struct {
|
||||
u8 unk0[0x6 - 0x0];
|
||||
u8 unk6[1]; // TODO: How many elements?
|
||||
} Struct8002450C;
|
||||
|
||||
void func_8002450C(Struct8002450C *arg0, u8 arg1, u8 arg2) {
|
||||
arg0->unk6[arg1] = arg2;
|
||||
}
|
||||
@ -155,7 +155,7 @@ void func_80024EAC(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_80024FA8(s32 arg0, s32 arg1, s32 arg2, u8 *arg3) {
|
||||
void func_80024FA8(s32 arg0, Struct8002450C *arg1, s32 arg2, u8 *arg3) {
|
||||
u8 i = 0;
|
||||
u8 phi_v0_2 = 0;
|
||||
|
||||
@ -182,7 +182,7 @@ void func_80024FA8(s32 arg0, s32 arg1, s32 arg2, u8 *arg3) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_800251A0(s32 arg0, s32 arg1, s32 arg2, u8 *arg3) {
|
||||
void func_800251A0(s32 arg0, Struct8002450C *arg1, s32 arg2, u8 *arg3) {
|
||||
u8 i = 0;
|
||||
s32 phi_v1 = 0;
|
||||
|
||||
|
||||
@ -453,6 +453,7 @@ void *func_80714CC0(void* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
|
||||
return func_80714D08(arg0, arg1, arg2, arg3, arg4, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
// Doable, init for the 0x374 struct thing
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_119370/func_80714D08.s")
|
||||
|
||||
// Doable, needs a struct array size 0x10 at Struct807FDB04->unk28
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
|
||||
void func_80735A50(s32 arg0, s32 arg1) {
|
||||
void func_80735A50(ALSeqPlayer *arg0, s32 arg1) {
|
||||
s32 pad[2];
|
||||
s32 sp1C;
|
||||
s16 sp1A;
|
||||
@ -9,5 +9,5 @@ void func_80735A50(s32 arg0, s32 arg1) {
|
||||
|
||||
sp18 = 0xE;
|
||||
sp1C = arg1;
|
||||
alEvtqPostEvent(arg0 + 0x48, &sp18, 0);
|
||||
alEvtqPostEvent(&arg0->evtq, &sp18, 0);
|
||||
}
|
||||
|
||||
@ -9,13 +9,11 @@ extern f32 D_80758164;
|
||||
extern f64 D_80758168;
|
||||
|
||||
extern void *D_807F5DE4; // TODO: Actually a pointer to a struct (map model?)
|
||||
extern s32 D_807F5E60;
|
||||
extern void *D_807F5E60;
|
||||
extern s8 D_807F5FEC;
|
||||
extern s32 D_807F6C28;
|
||||
|
||||
extern s32 D_807F5E60;
|
||||
|
||||
void func_8062D0CC(s32, s32, s32, u8);
|
||||
void func_8062D0CC(void*, void*, Model2Model*, u8);
|
||||
void func_8062D3E4(s32 arg0);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_2F550/func_8062A850.s")
|
||||
@ -627,12 +625,14 @@ void func_8062CA0C(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
|
||||
// Displaylist stuff
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_2F550/func_8062CEA8.s")
|
||||
|
||||
void func_8062D094(s32 arg0, u8 arg1) {
|
||||
void func_8062D094(Model2Model *arg0, u8 arg1) {
|
||||
func_8062D0CC(D_807F5DE4, D_807F5E60, arg0, arg1);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_2F550/func_8062D0CC.s")
|
||||
|
||||
s32 func_8062D1E0(void*, void*);
|
||||
|
||||
void func_8062D1A8() {
|
||||
if (!gameIsInDKTVMode()) {
|
||||
func_8062D1E0(D_807F5DE4, D_807F5E60);
|
||||
@ -904,7 +904,6 @@ extern f32 D_80758190;
|
||||
extern MapGeometryHeader *D_807F5DE0;
|
||||
extern void *D_807F5DE8;
|
||||
extern void *D_807F5DEC;
|
||||
extern s32 D_807F5E60;
|
||||
extern s8 D_807F5FC1;
|
||||
extern void *D_807F5FC4;
|
||||
extern s32 D_807F5FC8;
|
||||
|
||||
@ -181,7 +181,7 @@ void func_8066E6C8(Actor *arg0, s32 arg1, u8 arg2) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_8066E72C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8) {
|
||||
void func_8066E72C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 arg6, void *arg7, s32 arg8) {
|
||||
LedgeInfo *ledgeInfo = malloc(0xC4); // TODO: sizeof(LedgeInfo) + something?
|
||||
|
||||
ledgeInfo->unk0 = arg0 * 8.0f;
|
||||
@ -217,7 +217,7 @@ void func_8066E854(Actor *arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) {
|
||||
LedgeInfo *temp_a1;
|
||||
LedgeInfo90 *temp_v0;
|
||||
LedgeInfo90 *temp_v1;
|
||||
void **phi_a0;
|
||||
LedgeInfo90 **phi_a0;
|
||||
|
||||
temp_a1 = arg0->ledge_info_pointer;
|
||||
temp_v0 = malloc(sizeof(LedgeInfo90));
|
||||
|
||||
@ -1,30 +1,9 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
|
||||
typedef struct {
|
||||
s32 unk0;
|
||||
s32 unk4;
|
||||
s32 unk8;
|
||||
s32 unkC;
|
||||
s32 unk10;
|
||||
s32 unk14;
|
||||
s32 unk18;
|
||||
} Struct80676CB0_unk10;
|
||||
|
||||
typedef struct {
|
||||
s32 unk0;
|
||||
s32 unk4;
|
||||
s32 unk8;
|
||||
s32 unkC;
|
||||
Struct80676CB0_unk10 *unk10;
|
||||
s32 unk14;
|
||||
s32 unk18;
|
||||
} Struct80676CB0;
|
||||
|
||||
u8 func_80676CB0(Struct80676CB0 *arg0, u8 arg1);
|
||||
|
||||
s32 func_806D0DE4(Actor *arg0, Actor *arg1);
|
||||
u8 func_806767E0(s32, s32, s32);
|
||||
|
||||
extern u8 D_807F6902;
|
||||
extern f64 D_807591E0;
|
||||
@ -33,11 +12,11 @@ void func_80676260(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
func_806D0DE4(arg0, arg1);
|
||||
}
|
||||
|
||||
u8 func_80676280(Actor *arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_80676280(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2) {
|
||||
return func_806D10D0(arg1) && D_807F6902 == 0;
|
||||
}
|
||||
|
||||
u8 func_806762C0(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_806762C0(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2) {
|
||||
return func_806767E0(arg0, arg1, arg2) && func_80676280(arg0, arg1, arg2);
|
||||
}
|
||||
|
||||
@ -51,8 +30,6 @@ u8 func_80676308(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_7AF60/func_80676338.s")
|
||||
|
||||
u8 func_8067641C(Actor*, Actor*, s32);
|
||||
|
||||
/*
|
||||
// TODO: Not exactly sure what's wrong here
|
||||
s32 func_80676338(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
@ -62,15 +39,15 @@ s32 func_80676338(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
}
|
||||
*/
|
||||
|
||||
u8 func_8067641C(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
u8 func_8067641C(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2) {
|
||||
return (func_806CC14C(func_80665DE0((s16)arg0->x_position, (s16)arg0->z_position, (s16)arg1->x_position, (s16)arg1->z_position), arg1->y_rotation) < 0x3A9);
|
||||
}
|
||||
|
||||
u8 func_806764D8(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
u8 func_806764D8(Actor *arg0, Actor *arg1, Actor *arg2) {
|
||||
return D_807591E0 < func_80665E94(arg0->x_position, arg0->y_position, arg0->z_position, arg1->x_position, arg1->y_position, arg1->z_position, 0);
|
||||
}
|
||||
|
||||
u8 func_80676540(s32 arg0, Actor *arg1, Actor *arg2) {
|
||||
u8 func_80676540(Actor *arg0, Actor *arg1, Actor *arg2) {
|
||||
return func_806764D8(arg0, arg1, arg2) && arg1->y_velocity < -100.0f;
|
||||
}
|
||||
|
||||
@ -92,31 +69,31 @@ u8 func_806765E8(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
return arg1->distance_from_floor < 10.f && arg1->y_position < position[1];
|
||||
}
|
||||
|
||||
u8 func_80676690(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_80676690(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2) {
|
||||
return func_80676CB0(arg2, 1) && func_8067641C(arg0, arg1, arg2);
|
||||
}
|
||||
|
||||
u8 func_806766E0(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_806766E0(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2) {
|
||||
return func_80676CB0(arg2, 2) && func_8067641C(arg0, arg1, arg2);
|
||||
}
|
||||
|
||||
u8 func_80676730(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_80676730(s32 arg0, s32 arg1, Struct80676CB0 *arg2) {
|
||||
return func_80676CB0(arg2, 1);
|
||||
}
|
||||
|
||||
u8 func_8067675C(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_8067675C(s32 arg0, s32 arg1, Struct80676CB0 *arg2) {
|
||||
return func_80676CB0(arg2, 3);
|
||||
}
|
||||
|
||||
u8 func_80676788(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_80676788(s32 arg0, s32 arg1, Struct80676CB0 *arg2) {
|
||||
return func_80676CB0(arg2, 5);
|
||||
}
|
||||
|
||||
u8 func_806767B4(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_806767B4(s32 arg0, s32 arg1, Struct80676CB0 *arg2) {
|
||||
return func_80676CB0(arg2, 4);
|
||||
}
|
||||
|
||||
u8 func_806767E0(s32 arg0, s32 arg1, s32 arg2) {
|
||||
u8 func_806767E0(Actor *arg0, Actor *arg1, Struct80676CB0 *arg2) {
|
||||
return func_80676CB0(arg2, 2);
|
||||
}
|
||||
|
||||
@ -158,12 +135,14 @@ u8 func_80676A70(s32 arg0, s32 arg1, s32 arg2) {
|
||||
// CharacterChange and ActorAdditionalData struct usages
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_7AF60/func_80676AB8.s")
|
||||
|
||||
u8 func_80676B38(Actor *arg0, void *arg1, s32 arg2) {
|
||||
s32 func_80676AB8(Actor*, Actor*, Actor*);
|
||||
|
||||
u8 func_80676B38(Actor *arg0, Actor *arg1, Actor *arg2) {
|
||||
// Actor->isGrounded?
|
||||
return func_80676AB8(arg0, arg1, arg2) && arg0->unk6A & 1;
|
||||
}
|
||||
|
||||
u8 func_80676B70(Actor *arg0, void *arg1, s32 arg2) {
|
||||
u8 func_80676B70(Actor *arg0, Actor *arg1, Actor *arg2) {
|
||||
return func_80676AB8(arg0, arg1, arg2)
|
||||
&& (func_80676540(arg1, arg0, arg2)
|
||||
|| func_80714608(0));
|
||||
@ -180,7 +159,7 @@ u8 func_80676C10(s32 arg0, Actor *arg1, s32 arg2) {
|
||||
return phi_v1 || func_806769A8(arg0, arg1, arg2);
|
||||
}
|
||||
|
||||
u8 func_80676C64(s32 arg0, Actor *arg1, s32 arg2) {
|
||||
u8 func_80676C64(s32 arg0, Actor *arg1, Struct80676CB0 *arg2) {
|
||||
if (func_80676CB0(arg2, 1) && arg1->control_state == 0x1C) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -729,10 +729,8 @@ void func_806791EC(Actor *arg0, s32 arg1) {
|
||||
arg0->unk138 &= ~arg1;
|
||||
}
|
||||
|
||||
ActorCollision *func_80679490(Actor *, s32, u8, s32, s32);
|
||||
|
||||
// TODO: Clean this up
|
||||
void func_80679200(Actor *arg0, Actor *arg1, s32 arg2, u8 arg3, s32 arg4, s32 arg5) {
|
||||
void func_80679200(Actor *arg0, Actor *arg1, s32 arg2, u8 arg3, s32 arg4, void *arg5) {
|
||||
ActorCollision **sp28;
|
||||
ActorCollision **var_v1;
|
||||
ActorCollision *var_t0;
|
||||
@ -837,7 +835,7 @@ void func_80679334(void) {
|
||||
}
|
||||
*/
|
||||
|
||||
ActorCollision *func_80679490(Actor * arg0, s32 arg1, u8 arg2, s32 arg3, s32 arg4) {
|
||||
ActorCollision *func_80679490(Actor * arg0, s32 arg1, u8 arg2, s32 arg3, void *arg4) {
|
||||
ActorCollision *temp_v0 = malloc(sizeof(ActorCollision));
|
||||
temp_v0->unk0 = arg1;
|
||||
temp_v0->unk4 = arg2;
|
||||
@ -1092,7 +1090,7 @@ typedef struct {
|
||||
s16 unkE;
|
||||
} GlobalASMStruct34;
|
||||
|
||||
void func_8067A69C(s32 arg0, s32 arg1, f32 arg2, f32 arg3, u8 arg4, u8 arg5) {
|
||||
void func_8067A69C(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, u8 arg4, u8 arg5) {
|
||||
GlobalASMStruct38 *temp_v0 = malloc(0xC);
|
||||
temp_v0->unk0 = arg2;
|
||||
temp_v0->unk4 = arg3;
|
||||
@ -1121,7 +1119,7 @@ void func_8067A784(Actor *arg0, Actor *arg1, s16 arg2, f32 arg3, s16 arg4) {
|
||||
func_80679200(arg1, arg0, 0x4000, 0, 1, temp_v0);
|
||||
}
|
||||
|
||||
void func_8067A7EC(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, u8 arg6) {
|
||||
void func_8067A7EC(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, u8 arg6) {
|
||||
GlobalASMStruct28 *temp_v0;
|
||||
|
||||
temp_v0 = malloc(0x14);
|
||||
@ -1133,7 +1131,7 @@ void func_8067A7EC(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, u
|
||||
func_80679200(arg1, arg0, 1, 0, 1, temp_v0);
|
||||
}
|
||||
|
||||
void func_8067A864(s32 arg0, s32 arg1, s16 arg2, s16 arg3, void *arg4, void *arg5, s32 arg6, s32 arg7, s32 arg8) {
|
||||
void func_8067A864(Actor *arg0, Actor *arg1, s16 arg2, s16 arg3, void *arg4, void *arg5, s32 arg6, s32 arg7, s32 arg8) {
|
||||
GlobalASMStruct29 *temp_v0;
|
||||
|
||||
temp_v0 = malloc(0x40);
|
||||
@ -1147,7 +1145,7 @@ void func_8067A864(s32 arg0, s32 arg1, s16 arg2, s16 arg3, void *arg4, void *arg
|
||||
func_80679200(arg1, arg0, 0x10000, 0, 1, temp_v0);
|
||||
}
|
||||
|
||||
void func_8067A908(s32 arg0, s32 arg1, void *arg2, void *arg3, s32 arg4, s32 arg5, s32 arg6) {
|
||||
void func_8067A908(Actor *arg0, Actor *arg1, void *arg2, void *arg3, s32 arg4, s32 arg5, s32 arg6) {
|
||||
GlobalASMStruct29 *temp_v0; // TODO: What type is this actually? It's probably not the same struct as above since there's 0x40 vs 0x3C in the malloc call
|
||||
|
||||
temp_v0 = malloc(0x3C);
|
||||
@ -1159,7 +1157,7 @@ void func_8067A908(s32 arg0, s32 arg1, void *arg2, void *arg3, s32 arg4, s32 arg
|
||||
func_80679200(arg1, arg0, 0x20000, 0, 1, temp_v0);
|
||||
}
|
||||
|
||||
void func_8067A99C(s32 arg0, s32 arg1, s32 arg2) {
|
||||
void func_8067A99C(Actor *arg0, Actor *arg1, s32 arg2) {
|
||||
GlobalASMStruct30 *temp_v0; // TODO: What type is this actually?
|
||||
|
||||
temp_v0 = malloc(4);
|
||||
@ -1167,7 +1165,7 @@ void func_8067A99C(s32 arg0, s32 arg1, s32 arg2) {
|
||||
func_80679200(arg1, arg0, 0x40000, 0, 1, temp_v0);
|
||||
}
|
||||
|
||||
void func_8067A9F0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
|
||||
void func_8067A9F0(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, f32 arg4) {
|
||||
GlobalASMStruct31 *temp_v0;
|
||||
|
||||
temp_v0 = malloc(0xC);
|
||||
@ -1177,7 +1175,7 @@ void func_8067A9F0(s32 arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
|
||||
func_80679200(arg1, arg0, 0x100000, 0, 1, temp_v0);
|
||||
}
|
||||
|
||||
void func_8067AA58(s32 arg0, s32 arg1, f32 arg2, f32 arg3) {
|
||||
void func_8067AA58(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3) {
|
||||
GlobalASMStruct32 *temp_v0;
|
||||
|
||||
temp_v0 = malloc(8);
|
||||
@ -1186,7 +1184,7 @@ void func_8067AA58(s32 arg0, s32 arg1, f32 arg2, f32 arg3) {
|
||||
func_80679200(arg1, arg0, 0x200000, 0, 1, temp_v0);
|
||||
}
|
||||
|
||||
void func_8067AAB8(Actor* arg0, s32 arg1, s16 arg2, f32 arg3, s16 arg4) {
|
||||
void func_8067AAB8(Actor* arg0, Actor *arg1, s16 arg2, f32 arg3, s16 arg4) {
|
||||
GlobalASMStruct33 *temp_v0;
|
||||
|
||||
temp_v0 = malloc(0xC);
|
||||
@ -1208,7 +1206,7 @@ void func_8067AB20(Actor *arg0, Actor *arg1, s32 arg2, u8 arg3, void *arg4, u8 a
|
||||
func_80679290(arg1, arg0, arg2, arg3, 1, sp2C, 1);
|
||||
}
|
||||
|
||||
void func_8067ABC0(s32 arg0, s32 arg1, u8 arg2, s16 arg3, s16 arg4, f32 arg5, f32 arg6, f32 arg7) {
|
||||
void func_8067ABC0(Actor *arg0, Actor *arg1, u8 arg2, s16 arg3, s16 arg4, f32 arg5, f32 arg6, f32 arg7) {
|
||||
GlobalASMStruct34 *temp_v0;
|
||||
|
||||
temp_v0 = malloc(0x10);
|
||||
|
||||
@ -384,7 +384,7 @@ void func_80689064(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5) {
|
||||
func_80689250(arg0, arg1, arg2, arg3, arg4, arg5, &sp38, 0, 0, func_80688E08());
|
||||
}
|
||||
|
||||
void func_80689114(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, s32 arg6) {
|
||||
void func_80689114(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, f32 arg5, Actor *arg6) {
|
||||
Struct807500B4 sp38 = D_807500D4;
|
||||
func_80689250(arg0 - 0x10, arg1, arg2, arg3, arg4, arg5, &sp38, 1, arg6, func_80688E08());
|
||||
}
|
||||
|
||||
@ -531,7 +531,7 @@ extern f64 D_8075A9A8;
|
||||
|
||||
void func_807149FC(s32 arg0);
|
||||
|
||||
void func_806A5EAC(AAD_806A5EAC *arg0, s32 arg1, f32 arg2) {
|
||||
void func_806A5EAC(AAD_806A5EAC *arg0, void *arg1, f32 arg2) {
|
||||
if (D_807FBB68 & 0x10) {
|
||||
arg2 *= 2.0f;
|
||||
}
|
||||
@ -722,7 +722,7 @@ extern u8 D_807FBD70;
|
||||
extern s32 D_8076A068;
|
||||
extern s32 D_8071EB70;
|
||||
|
||||
s32 func_80723020(s32 arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, u8 arg6);
|
||||
s32 func_80723020(Actor *arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, u8 arg6);
|
||||
void func_8066EB40(Actor*, f32);
|
||||
void func_8066E854(Actor*, f32, f32, f32, s32);
|
||||
void func_806F91B4(s32 HUDItemIndex, u8 playerIndex, s16 amount);
|
||||
@ -737,7 +737,7 @@ typedef struct {
|
||||
s16 unk6;
|
||||
} AAD_806A7600;
|
||||
|
||||
void func_806A7600(s32 arg0) {
|
||||
void func_806A7600(void *arg0) {
|
||||
AAD_806A7600 *sp34;
|
||||
s16 permanentFlagIndex;
|
||||
s32 var_a0_2;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user