Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2024-11-23 07:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some sigs yo

Browse Source
This commit is contained in:
Donkey Kong 2024-06-06 00:32:48 +09:30
parent 7aab82a47b
commit 67c440a0a9
38 changed files with 215 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/arcade_int.h
View File

@ -96,8 +96,6 @@ void arcade_pie_update(u8);
void func_arcade_80030FEC(void);
void func_arcade_800313B8(void);
void func_global_asm_8060DEA8(void);
/*.rodata 0x8004A840*/
extern u8 D_arcade_8004A934;
extern u8 D_arcade_8004A944;

242
include/functions.h
View File

@ -10,47 +10,45 @@
// Orphaned functions with signatures
// TODO: Assign these to a .c file
s32 rand(void);
void func_global_asm_80614D48(Actor*, f32, f32);
void func_global_asm_80613AF8(Actor*, s32, f32, f32);
u32 func_global_asm_806119A0(void);
f32 func_global_asm_80611BB4(f32, f32);
s32 playCutscene(Actor*, s16, s32);
void func_global_asm_80613C48(Actor*, s16, f32, f32);
void func_global_asm_80614A64(Actor *);
f32 func_global_asm_80612794(s16);
void playAnimation(Actor*, s32);
void playActorAnimation(Actor*, s32);
f32 func_global_asm_806119FC(void);
void func_global_asm_80614D90(Actor*);
f32 func_global_asm_80612790(s16);
u8 func_global_asm_806E770C(void);
void addActorRecolor(Actor *actor, s16 x, s16 y, s16 z, s32 alpha, s32 red, s32 green, s32 blue, s32);
void func_global_asm_80614D00(Actor*, f32, f32);
u32 func_global_asm_806119A0(void);
f32 func_global_asm_806119FC(void);
f32 func_global_asm_80611BB4(f32, f32);
f32 func_global_asm_80612790(s16);
f32 func_global_asm_80612794(s16);
f32 func_global_asm_80612D10(f32);
f32 func_global_asm_80612D1C(f32);
void func_global_asm_80613794(Actor*, u8);
void func_global_asm_80613AF8(Actor*, s32, f32, f32);
void func_global_asm_80613C48(Actor*, s16, f32, f32);
void func_global_asm_80614A64(Actor*);
void func_global_asm_80614D00(Actor*, f32, f32);
void func_global_asm_80614D48(Actor*, f32, f32);
void func_global_asm_80614D90(Actor*);
void func_global_asm_8061C464(Actor*, Actor*, s32, s32, s32, s32, s32, s32, s32, s32, f32);
void func_global_asm_8061C6A8(Actor*, Actor*, s32, s32, s32, s32, s32, s32, s32, s32, f32);
s32 func_global_asm_8061CB50(void);
// void func_global_asm_8060C648(u8 arg0, u32 arg1, u8 arg2, u32 arg3, s32 arg4);
void func_global_asm_80626F8C(f32, f32, f32, f32 *, f32 *, s32, f32, s32);
void func_global_asm_806A36F4(void);
u8 func_global_asm_806E770C(void);
void func_global_asm_8073243C(void);
void func_global_asm_8073E8B4(void);
void func_global_asm_807383EC(void);
void func_global_asm_807383F4(void);
void func_global_asm_80738BA8(void);
void func_global_asm_80738BB0(void);
void func_global_asm_80732924(void);
void func_global_asm_80735A44(void);
void func_global_asm_80737600(void);
void func_global_asm_80737630(void);
void func_global_asm_80737B48(void);
void func_global_asm_80737B50(void);
void func_global_asm_806A36F4(void);
void func_global_asm_8073AD48(void);
u8 func_global_asm_805FCA64(void); // getCutsceneBarState()
void func_global_asm_80735A44(void);
void func_global_asm_80737E9C(void);
void func_global_asm_80737F38(void);
void func_global_asm_80732924(void);
void func_global_asm_80613794(Actor*, u8);
void func_global_asm_8061C464(Actor*, Actor*, s32, s32, s32, s32, s32, s32, s32, s32, f32);
void func_global_asm_80626F8C(f32, f32, f32, f32 *, f32 *, s32, f32, s32);
void func_global_asm_8061C6A8(Actor *, Actor *, s32, s32, s32, s32, s32, s32, s32, s32, f32);
void func_global_asm_807383EC(void);
void func_global_asm_807383F4(void);
void func_global_asm_80738BA8(void);
void func_global_asm_80738BB0(void);
void func_global_asm_8073AD48(void);
void func_global_asm_8073E8B4(void);
// dk64_boot/dk64_boot_1050.c
// TODO: func_dk64_boot_80000450 has no documented signature
@ -514,17 +512,17 @@ void func_global_asm_805FBE04(void);
// TODO: func_global_asm_805FC2B0 has no documented signature
// TODO: func_global_asm_805FC668 has no documented signature
u32 func_global_asm_805FC98C(void);
u8 func_global_asm_805FCA64(void);
u8 func_global_asm_805FCA64(void); // getCutsceneBarState()
// TODO: func_global_asm_805FCA94 has no documented signature
Gfx *func_global_asm_805FCFD8(Gfx *dl);
Gfx *func_global_asm_805FD030(Gfx *dl);
// TODO: func_global_asm_805FD088 has no documented signature
// TODO: func_global_asm_805FE398 has no documented signature
Gfx *func_global_asm_805FE4D4(Gfx *arg0);
Gfx *func_global_asm_805FE398(Gfx *dl);
Gfx *func_global_asm_805FE4D4(Gfx *dl);
void func_global_asm_805FE544(u8 arg0);
Gfx *func_global_asm_805FE634(Gfx *dl, u8 arg1);
// TODO: func_global_asm_805FE71C has no documented signature
// TODO: func_global_asm_805FE7B4 has no documented signature
void func_global_asm_805FE71C(Gfx *dl, u8 arg1, s32 *arg2, u8 arg3);
void func_global_asm_805FE7B4(Gfx *dl, Gfx *arg1, s32 *arg2, u8 arg3);
void func_global_asm_805FE7FC(void);
void func_global_asm_805FEE84(u8 arg0, u8 arg1, u8 arg2, u8 arg3);
void func_global_asm_805FEEB8(s32 *arg0, s32 arg1);
@ -571,7 +569,7 @@ void func_global_asm_80600590(Maps map);
// global_asm/code_5650.c
void func_global_asm_80600950(void);
s32 func_global_asm_8060095C(s32 arg0, s32 *arg1, s32 *arg2);
// TODO: func_global_asm_8060098C has no documented signature
void func_global_asm_8060098C(void *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void func_global_asm_80600B10(void);
void func_global_asm_80600BBC(void *arg0);
void func_global_asm_80600C68(void);
@ -615,12 +613,12 @@ void func_global_asm_80601CF0(s32 arg0);
// TODO: func_global_asm_80601EE4 has no documented signature
// TODO: func_global_asm_80602104 has no documented signature
// TODO: func_global_asm_80602144 has no documented signature
// TODO: func_global_asm_806022DC has no documented signature
void *func_global_asm_806022DC(s32 *arg0);
// TODO: func_global_asm_80602314 has no documented signature
u8 func_global_asm_80602430(s16 arg0);
u8 func_global_asm_8060245C(s16 arg0);
void func_global_asm_80602488(u8 arg0);
// TODO: func_global_asm_80602498 has no documented signature
void func_global_asm_80602498(void);
void func_global_asm_806025AC(s32 arg0, s32 arg1, s32 arg2);
// TODO: func_global_asm_806025D4 has no documented signature
void playSong(s32, f32);
@ -631,7 +629,7 @@ void func_global_asm_80602CE0(s32 arg0, s32 arg1, u8 arg2);
f32 func_global_asm_80602D4C(s32 arg0);
void func_global_asm_80602DC4(s32 arg0, f32 arg1);
// TODO: func_global_asm_80602E6C has no documented signature
// TODO: func_global_asm_80603340 has no documented signature
f32 func_global_asm_80603340(f32 arg0, f32 arg1, f32 arg2, u8 arg3, u8 arg4, f32 arg5);
// TODO: func_global_asm_80603450 has no documented signature
void func_global_asm_806049CC(s32 arg0);
void func_global_asm_80604BE8(u8 arg0, f32 arg1, f32 arg2);
@ -640,7 +638,7 @@ void func_global_asm_80604CBC(Actor* arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4,
// TODO: func_global_asm_80604D70 has no documented signature
// TODO: func_global_asm_80605044 has no documented signature
void func_global_asm_80605314(Actor*, u8);
// TODO: func_global_asm_80605380 has no documented signature
void func_global_asm_80605380(s16 arg0);
// TODO: func_global_asm_80605510 has no documented signature
// TODO: func_global_asm_806057F8 has no documented signature
void playSoundAtActorPosition(Actor *arg0, s16 arg1, u8 arg2, s16 arg3, u8 arg4);
@ -720,9 +718,9 @@ void func_global_asm_8060D14C(void);
void func_global_asm_8060D768(void);
void func_global_asm_8060D788(void);
void func_global_asm_8060D7A8(void);
// TODO: func_global_asm_8060DC3C has no documented signature
void func_global_asm_8060DC3C(u8 fileIndex, s32 arg1);
void func_global_asm_8060DEA8(void);
void func_global_asm_8060DEC8(void);
void func_global_asm_8060DEC8(void); // saveTheGame()
void func_global_asm_8060E128(s32 arg0);
void func_global_asm_8060E1A8(void);
u8* getFlagBlockAddress(u8 flagType); // TODO: Can we use the FlagTypes enum? Needs to be a u8 to match
@ -813,7 +811,7 @@ void func_global_asm_80627B58(f32 arg0);
// global_asm/code_2C910.c
void func_global_asm_80627C10(u8 arg0);
// TODO: func_global_asm_80627C5C has no documented signature
// TODO: func_global_asm_80627EA8 has no documented signature
Actor *func_global_asm_80627EA8(s16 spawn_trigger);
// TODO: func_global_asm_80627F04 has no documented signature
s32 func_global_asm_80629148(void);
void func_global_asm_80629174(void);
@ -822,7 +820,7 @@ void func_global_asm_80629174(void);
void func_global_asm_80629190(void);
u8 func_global_asm_8062919C(void);
u8 func_global_asm_806291A8(void);
// TODO: func_global_asm_806291B4 has no documented signature
void func_global_asm_806291B4(u8 arg0);
// TODO: func_global_asm_80629300 has no documented signature
void func_global_asm_8062A130(s32 arg0, s32 arg1, void* arg2);
void func_global_asm_8062A228(s32 arg0, s32 arg1, void *arg2);
@ -836,11 +834,11 @@ void func_global_asm_8062A808(s32 arg0, s32 arg1);
s32 func_global_asm_8062A844(s32 arg0);
// global_asm/code_2F550.c
// TODO: func_global_asm_8062A850 has no documented signature
// TODO: func_global_asm_8062A944 has no documented signature
f32 func_global_asm_8062A850(void);
void func_global_asm_8062A944(f32, f32, f32);
void func_global_asm_8062AC68(void *);
// TODO: func_global_asm_8062AD28 has no documented signature
// TODO: func_global_asm_8062B194 has no documented signature
void func_global_asm_8062AD28(f32, f32, f32, void *, void *);
void func_global_asm_8062B194(GlobalASMStruct64 *arg0);
// TODO: func_global_asm_8062B220 has no documented signature
// TODO: func_global_asm_8062B3C4 has no documented signature
void func_global_asm_8062B478(s32 arg0);
@ -885,10 +883,10 @@ void func_global_asm_8062E608(void *arg0, s32 *arg1, s32 arg2);
// TODO: func_global_asm_8062E67C has no documented signature
// TODO: func_global_asm_8062E898 has no documented signature
// TODO: func_global_asm_8062EBB8 has no documented signature
// TODO: func_global_asm_8062EDA8 has no documented signature
// TODO: func_global_asm_8062EE48 has no documented signature
Gfx *func_global_asm_8062EDA8(Gfx *dl, u8 arg1);
void func_global_asm_8062EE48(u8 arg0);
void func_global_asm_8062EFA0(void);
// TODO: func_global_asm_8062F050 has no documented signature
void func_global_asm_8062F050(MapGeometryHeader *arg0);
void func_global_asm_8062F318(void);
void func_global_asm_8062F328(s32 arg0);
s32 func_global_asm_8062F388(s32 *arg0);
@ -907,14 +905,14 @@ void func_global_asm_8063039C(void);
Chunk14 *func_global_asm_806303C4(Chunk14 *arg0, u8 arg1, Model2Model *arg2, f32 arg3, f32 arg4, f32 arg5, s16 arg6, s16 arg7, u8 arg8, s16 arg9, u8 argA);
Chunk14 *func_global_asm_80630588(Chunk14 *arg0, Model2Model *arg1, u8 arg2, u8 *arg3);
void func_global_asm_806306D0(Chunk14 *current);
// TODO: func_global_asm_8063070C has no documented signature
Chunk14 *func_global_asm_8063070C(Chunk14 *arg0);
void func_global_asm_806307AC(Chunk14 *current);
void func_global_asm_806307CC(Chunk14 *arg0, Model2Model *arg1, u8 arg2, u8 arg3, s8 *arg4);
// TODO: func_global_asm_80630890 has no documented signature
// TODO: func_global_asm_80630B70 has no documented signature
// TODO: func_global_asm_80630DCC has no documented signature
// TODO: func_global_asm_8063162C has no documented signature
// TODO: func_global_asm_806317D4 has no documented signature
s32 func_global_asm_8063162C(Actor *, s16 *);
s32 func_global_asm_806317D4(Actor *, s16 *, f32, f32, f32);
void renderActor(Actor*, u8);
// global_asm/code_36880.c
@ -923,7 +921,7 @@ void func_global_asm_80631B8C(s16 arg0);
s32 func_global_asm_80631BCC(s16 arg0);
s16 func_global_asm_80631C20(u8);
void func_global_asm_80631C3C(void);
s32 func_global_asm_80631D8C(u8 arg0);
s32 func_global_asm_80631D8C(u8 map);
s32 func_global_asm_80631EB8(u16);
// TODO: func_global_asm_80631F58 has no documented signature
s16 func_global_asm_80631FAC(Maps arg0, u8 arg1);
@ -941,7 +939,7 @@ void func_global_asm_80632FCC(s16 arg0, u8 arg1);
// TODO: func_global_asm_806330C4 has no documented signature
// TODO: func_global_asm_806333F8 has no documented signature
void func_global_asm_80633570(GlobalASMStruct83 *arg0);
void func_global_asm_806335B0(s32, u8, s32, f32*, f32*, f32*);
void func_global_asm_806335B0(s32, u8, s32 boneIndex, f32* x, f32* y, f32* z);
// TODO: func_global_asm_8063367C has no documented signature
// TODO: func_global_asm_8063373C has no documented signature
void func_global_asm_806338B4(OM2_unk74 *arg0);
@ -953,7 +951,7 @@ void func_global_asm_80633D30(f32 *arg0, f32 *arg1);
// TODO: func_global_asm_80634768 has no documented signature
void func_global_asm_806348B4(OM2_unk48 *arg0);
void func_global_asm_80634908(s32 arg0, void *arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8);
// TODO: func_global_asm_8063495C has no documented signature
void func_global_asm_8063495C(OM2_unk24 *arg0, ObjectModel2 *arg1);
// TODO: func_global_asm_806349FC has no documented signature
void func_global_asm_80634CC8(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
void func_global_asm_80634D14(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
@ -966,13 +964,13 @@ void func_global_asm_80634FA0(Model2Model50_B8*, s16, u8, u8*, u8);
void func_global_asm_80635018(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_80635098(Model2Model50_B8*, s16, s32, s32);
// TODO: func_global_asm_80635114 has no documented signature
// TODO: func_global_asm_80635214 has no documented signature
s32 func_global_asm_80635214(Gfx *arg0);
// TODO: func_global_asm_8063524C has no documented signature
// TODO: func_global_asm_80635468 has no documented signature
// TODO: func_global_asm_80635548 has no documented signature
void func_global_asm_80635588(void);
void func_global_asm_806355DC(s32 arg0, u8 arg1);
void func_global_asm_806357F8(s32 arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7, f32 *arg8, u8 arg9);
void func_global_asm_806357F8(s32 arg0, f32 *x, f32 *y, f32 *z, f32 *xRot, f32 *yRot, f32 *zRot, f32 *scale, f32 *arg8, u8 arg9);
// TODO: func_global_asm_806358E8 has no documented signature
s32 func_global_asm_80635EF0(f32 x1, f32 y1, f32 z1, s16 x2, s16 y2, s16 z2, u16 arg6);
void func_global_asm_80636014(s32 arg0, u8 arg1, u8 arg2);
@ -984,12 +982,12 @@ void func_global_asm_806362C4(s32 arg0, u8 arg1);
void func_global_asm_8063643C(void);
void func_global_asm_80636448(s32 arg0, s32 arg1, s32 arg2, s32 arg3, void *arg4);
void func_global_asm_806364C4(void);
// TODO: func_global_asm_806365D0 has no documented signature
void func_global_asm_806365D0(ObjectModel2 *arg0, OM2_unk24 *arg1, Model2Model *arg2);
// TODO: func_global_asm_80636784 has no documented signature
// TODO: func_global_asm_806368F0 has no documented signature
void func_global_asm_806368F0(ObjectModel2 *arg0, s32 model2Type);
f32 func_global_asm_80636A44(s32 arg0);
u8 func_global_asm_80636A8C(s32 arg0);
// TODO: func_global_asm_80636AE8 has no documented signature
void func_global_asm_80636AE8(ObjectModel2 *);
// TODO: func_global_asm_80636B50 has no documented signature
// TODO: func_global_asm_80636C00 has no documented signature
// TODO: func_global_asm_80636D38 has no documented signature
@ -997,13 +995,13 @@ u8 func_global_asm_80636A8C(s32 arg0);
// TODO: func_global_asm_80636FFC has no documented signature
// TODO: func_global_asm_80637B6C has no documented signature
// TODO: func_global_asm_806392BC has no documented signature
void func_global_asm_806398E4(s32 arg0, u8 arg1, u8 arg2);
void func_global_asm_806398E4(s32 objectModel2Index, u8 arg1, u8 arg2);
// TODO: func_global_asm_80639968 has no documented signature
// TODO: func_global_asm_80639C04 has no documented signature
// TODO: func_global_asm_80639CD0 has no documented signature
// TODO: func_global_asm_80639F1C has no documented signature
s32 func_global_asm_80639F1C(Model2Model50_B8 *, s32 *, s32 *);
// TODO: func_global_asm_80639FC0 has no documented signature
// TODO: func_global_asm_8063A38C has no documented signature
s32 func_global_asm_8063A38C(Chunk14*, Chunk14*, f32, f32, f32);
// TODO: func_global_asm_8063A848 has no documented signature
void func_global_asm_8063A8C4(s16 arg0, u8 arg1, f32 arg2);
// TODO: func_global_asm_8063A968 has no documented signature
@ -1035,17 +1033,17 @@ void func_global_asm_8063CF0C(void);
// TODO: func_global_asm_8063CF3C has no documented signature
void func_global_asm_8063D1D8(void);
void func_global_asm_8063D288(void);
// TODO: func_global_asm_8063D2E4 has no documented signature
Gfx *func_global_asm_8063D2E4(Gfx *dl);
void func_global_asm_8063D468(void);
void func_global_asm_8063D494(void);
// TODO: func_global_asm_8063D4A4 has no documented signature
Gfx *func_global_asm_8063D4A4(Gfx *dl);
void func_global_asm_8063D5AC(void);
void func_global_asm_8063D608(void);
// TODO: func_global_asm_8063D638 has no documented signature
Gfx *func_global_asm_8063D638(Gfx *dl);
void func_global_asm_8063D854(void);
// global_asm/code_42630.c
// TODO: func_global_asm_8063D930 has no documented signature
void func_global_asm_8063D930(void);
s16 func_global_asm_8063D990(s16 arg0);
s16 func_global_asm_8063D9D0(s16 arg0, u8 arg1);
void func_global_asm_8063DA40(s16 arg0, s16 arg1);
@ -1064,8 +1062,8 @@ void func_global_asm_8063E6B4(OM2_unk7C *arg0);
void func_global_asm_8063E72C(OM2_unk7C *arg0);
// TODO: func_global_asm_8063EA14 has no documented signature
// TODO: func_global_asm_8063FA48 has no documented signature
// TODO: func_global_asm_80641724 has no documented signature
// TODO: func_global_asm_806417BC has no documented signature
void func_global_asm_80641724(s16 arg0);
void func_global_asm_806417BC(s16 arg0, s16 arg1);
void func_global_asm_80641874(s16 arg0, s16 arg1);
s32 func_global_asm_806418E8(s16, s16, s16);
void func_global_asm_8064199C(Struct8064199C_arg0 *arg0, s8 arg1, s16 arg2);
@ -1080,17 +1078,17 @@ u8 func_global_asm_80641F70(s16 arg0);
u8 func_global_asm_8064216C(s16 cap, f32 x, f32 y, f32 z);
s32 func_global_asm_80642204(s16 arg0);
s32 func_global_asm_806422D8(s16 arg0);
s32 func_global_asm_806423A8(s16 arg0, s16 arg1, s16 arg2);
s32 func_global_asm_806423A8(s16 distance, s16 startSpawnTrigger, s16 endSpawnTrigger);
void func_global_asm_80642480(s16 arg0, s32 arg1);
// TODO: func_global_asm_80642500 has no documented signature
// TODO: func_global_asm_806425FC has no documented signature
s32 func_global_asm_80642500(f32 *arg0, s16 arg1, s16 arg2);
s32 func_global_asm_806425FC(s16 arg0, s16 arg1);
// TODO: func_global_asm_80642748 has no documented signature
// TODO: func_global_asm_80642844 has no documented signature
void func_global_asm_80642940(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// global_asm/code_478F0.c
void func_global_asm_80642BF0(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_80642C78 has no documented signature
void func_global_asm_80642C78(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_80642E34(s32 **arg0, s16 arg1, s16 arg2, s32 arg3);
void func_global_asm_80642FC4(void **arg0, s32 arg1, s32 arg2, s32 arg3);
void func_global_asm_80643274(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
@ -1099,21 +1097,21 @@ void func_global_asm_80643354(s32 arg0, u32 arg1, u32 arg2);
void func_global_asm_806436A4(s32 arg0, s32 arg1, s16 arg2, s16 arg3);
// TODO: func_global_asm_806436E0 has no documented signature
void func_global_asm_8064384C(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_806438B8(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
void func_global_asm_806438B8(s32 arg0, s16 arg1, s16 arg2, s16 boneIndex);
void func_global_asm_80643B24(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_80643C0C has no documented signature
// TODO: func_global_asm_80643F38 has no documented signature
void func_global_asm_80643F38(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_8064409C has no documented signature
void func_global_asm_8064431C(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_806443E4 has no documented signature
void func_global_asm_806449C0(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
// TODO: func_global_asm_80644A18 has no documented signature
void func_global_asm_80644A18(s32, s32, s32, f32);
void func_global_asm_80644CC0(void **arg0, s32 arg1, s32 arg2, s32 arg3);
void func_global_asm_80644D50(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_80644E2C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void func_global_asm_80644EC8(s32 arg0, s32 arg1, s16 arg2, s16 arg3);
void func_global_asm_806450C0(s32 arg0, s32 arg1, s16 arg2, s16 arg3);
// TODO: func_global_asm_80645238 has no documented signature
void func_global_asm_80645238(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void func_global_asm_80645614(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
// TODO: func_global_asm_80645700 has no documented signature
void func_global_asm_806458C8(s32 arg0, s32 arg1, s16 arg2, s32 arg3);
@ -1121,7 +1119,7 @@ void func_global_asm_80645A64(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
void func_global_asm_80645B9C(gASMStruct3 *arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_80645C04(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_80645D14(s32 **arg0, s32 arg1, s16 arg2, s32 arg3);
// TODO: func_global_asm_80645F40 has no documented signature
void func_global_asm_80645F40(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_80646058 has no documented signature
// TODO: func_global_asm_80646770 has no documented signature
// TODO: func_global_asm_80646978 has no documented signature
@ -1133,13 +1131,13 @@ void func_global_asm_80647508(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_80647610 has no documented signature
void func_global_asm_8064774C(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_80647834(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_80647A14 has no documented signature
void func_global_asm_80647A14(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_80647B74 has no documented signature
void func_global_asm_80647CF4(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
void func_global_asm_80647D7C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_80648000 has no documented signature
// TODO: func_global_asm_8064826C has no documented signature
// TODO: func_global_asm_806485A0 has no documented signature
void func_global_asm_806485A0(s32 arg0, s32 arg1, s16 arg2, s16 arg3);
// TODO: func_global_asm_806487C4 has no documented signature
int func_global_asm_80648C50(void);
// TODO: func_global_asm_80648C84 has no documented signature
@ -1180,7 +1178,7 @@ void func_global_asm_8064B7E8(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void func_global_asm_8064B828(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void func_global_asm_8064B868(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void func_global_asm_8064B900(s32 arg0, s32 arg1, s16 arg2, s32 arg3);
// TODO: func_global_asm_8064B9E0 has no documented signature
void func_global_asm_8064B9E0(s32 arg0, s32 arg1, s16 arg2, s32 arg3);
// TODO: func_global_asm_8064BAF4 has no documented signature
void func_global_asm_8064BB4C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
s32 func_global_asm_8064BB78(s32 arg0, s32 arg1, s32 levelIndex, s32 arg3);
@ -1188,7 +1186,7 @@ u8 func_global_asm_8064BBD8(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
s32 func_global_asm_8064BCB0(s32 arg0, s32 arg1);
s32 func_global_asm_8064BD2C(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
u8 func_global_asm_8064BE58(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_8064BE80 has no documented signature
s32 func_global_asm_8064BE80(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
s32 func_global_asm_8064BF58(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_8064BFD0 has no documented signature
// TODO: func_global_asm_8064C134 has no documented signature
@ -1202,7 +1200,7 @@ void func_global_asm_8064C814(void **arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_8064CB3C(s32 **arg0, s16 arg1, s32 arg2, s32 arg3);
void func_global_asm_8064CC80(s32 **arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_8064CD3C has no documented signature
// TODO: func_global_asm_8064D0C4 has no documented signature
void func_global_asm_8064D0C4(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
// TODO: func_global_asm_8064D1E8 has no documented signature
// TODO: func_global_asm_8064D418 has no documented signature
void func_global_asm_8064D880(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
@ -1210,7 +1208,7 @@ void func_global_asm_8064D880(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
void func_global_asm_8064DB98(s32 **arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_8064DE04 has no documented signature
// TODO: func_global_asm_8064DF5C has no documented signature
// TODO: func_global_asm_8064E174 has no documented signature
s32 func_global_asm_8064E174(s32, s16, s16, s32 *, s32, s32, s32);
void func_global_asm_8064E428(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
void func_global_asm_8064E48C(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
void func_global_asm_8064E4F8(s32 arg0, s16 arg1, s16 arg2, s32 arg3);
@ -1222,7 +1220,7 @@ void func_global_asm_8064EA48(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
s32 func_global_asm_8064EB3C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
u8 func_global_asm_8064EB9C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
u8 func_global_asm_8064EC04(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_8064EC60 has no documented signature
u8 func_global_asm_8064EC60(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
s32 func_global_asm_8064ED68(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
// TODO: func_global_asm_8064EE08 has no documented signature
void func_global_asm_8064F028(s32 arg0, s32 arg1, s16 arg2, s32 arg3);
@ -1236,12 +1234,12 @@ u8 func_global_asm_8064F404(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
// global_asm/code_54150.c
// TODO: func_global_asm_8064F450 has no documented signature
// TODO: func_global_asm_8064F6C0 has no documented signature
// TODO: func_global_asm_8064F6F8 has no documented signature
void func_global_asm_8064F6F8(void *arg0, s16 arg1);
void func_global_asm_8064F804(OM2_unk78 *arg0);
// TODO: func_global_asm_8064F84C has no documented signature
void func_global_asm_8064F954(s32 arg0);
// TODO: func_global_asm_8064F97C has no documented signature
// TODO: func_global_asm_8064FA7C has no documented signature
void func_global_asm_8064FA7C(void*, void*);
// TODO: func_global_asm_8064FB64 has no documented signature
// TODO: func_global_asm_806500E0 has no documented signature
void func_global_asm_8065051C(void);
@ -1251,7 +1249,7 @@ void func_global_asm_80650684(OM2_unk78*);
void func_global_asm_806506E8(OM2_unk78 *arg0);
void func_global_asm_80650794(s16 arg0, s16 arg1, u8 arg2, f32 arg3);
void func_global_asm_806508B4(s16 arg0, s16 arg1, s16 arg2);
// TODO: func_global_asm_8065092C has no documented signature
void func_global_asm_8065092C(s16 arg0, s16 arg1);
void func_global_asm_80650998(s16 arg0, s16 arg1);
void func_global_asm_80650A04(s16 arg0, s16 arg1, s16 arg2);
s16 func_global_asm_80650A70(s16 arg0, s16 arg1);
@ -1277,7 +1275,7 @@ void func_global_asm_806521F8(void);
s32 func_global_asm_806522CC(s16 arg0, s16 arg1, s16 arg2);
// TODO: func_global_asm_80652374 has no documented signature
void func_global_asm_806524A0(s32 arg0, u8 arg1);
// TODO: func_global_asm_80652594 has no documented signature
u8 func_global_asm_80652594(Model2Model *arg0, s16 *arg1, u8 arg2);
void func_global_asm_806526E0(u8 arg0);
void func_global_asm_80652790(u8 arg0);
void func_global_asm_80652858(f32 arg0, f32 arg1, f32 arg2, u8 arg3);
@ -1285,38 +1283,38 @@ void func_global_asm_8065297C(void);
void func_global_asm_80652A08(f32 arg0, f32 arg1, f32 arg2, u8 arg3);
void func_global_asm_80652B04(void);
u8 func_global_asm_80652BC8(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4);
// TODO: func_global_asm_80652DB4 has no documented signature
s32 func_global_asm_80652DB4(f32 arg0, f32 arg1, f32 arg2);
u8 func_global_asm_80652E58(s16 arg0);
u8 func_global_asm_80652EBC(s16 arg0);
u8 func_global_asm_80652F24(s16, s16);
s16 func_global_asm_80652F9C(f32 arg0, f32 arg1, f32 arg2, s16 arg3);
// TODO: func_global_asm_80652FDC has no documented signature
void func_global_asm_80652FDC(f32, f32, f32, s16, s16, s16*);
s16 func_global_asm_806531B8(f32, f32, f32, s16);
s32 func_global_asm_806533C4(f32 arg0, f32 arg1, f32 arg2);
s32 func_global_asm_806534E0(f32 arg0, f32 arg1, f32 arg2, s16 chunkIndex, s8 *arg4, f32 *arg5);
s32 func_global_asm_80653684(Chunk78_7C*, f32, f32);
// TODO: func_global_asm_80653804 has no documented signature
s32 func_global_asm_80653804(Chunk78_7C*, f32, f32);
void func_global_asm_80653A70(s16 chunkIndex);
void func_global_asm_80653B70(u8 arg0);
void func_global_asm_80653B80(f32 arg0, f32 arg1, f32 arg2);
// TODO: func_global_asm_80653DF0 has no documented signature
// TODO: func_global_asm_80653EA8 has no documented signature
void func_global_asm_80653EA8(Gfx *arg0, Gfx *arg1);
void func_global_asm_80653F68(s16 index);
// TODO: func_global_asm_80653FA4 has no documented signature
void func_global_asm_80654380(f32, f32, f32);
void func_global_asm_80654418(f32, f32, f32);
// TODO: func_global_asm_806545D4 has no documented signature
// TODO: func_global_asm_806547A8 has no documented signature
// TODO: func_global_asm_80654A2C has no documented signature
void func_global_asm_806547A8(f32, f32, f32);
void func_global_asm_80654A2C(f32, f32, f32);
void func_global_asm_80654BC0(s32 arg0, u8 arg1);
// TODO: func_global_asm_80654CCC has no documented signature
// TODO: func_global_asm_80654E84 has no documented signature
// TODO: func_global_asm_80654FEC has no documented signature
// TODO: func_global_asm_80655258 has no documented signature
// TODO: func_global_asm_80655410 has no documented signature
void func_global_asm_80655258(f32 arg0, f32 arg1, f32 arg2, s32 arg3);
void func_global_asm_80655410(f32, f32, f32);
void func_global_asm_80655AD0(void);
void func_global_asm_80655BF0(void);
// TODO: func_global_asm_80655CF8 has no documented signature
s32 func_global_asm_80655CF8(s16 arg0, s32 arg1);
// TODO: func_global_asm_80655DD0 has no documented signature
// TODO: func_global_asm_80656B98 has no documented signature
void func_global_asm_80656E58(s16 arg0, s16 arg1, u8 arg2, u8 arg3);
@ -1333,7 +1331,7 @@ s32 func_global_asm_80657F14(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s
u8 func_global_asm_80658000(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4);
// TODO: func_global_asm_80658134 has no documented signature
// TODO: func_global_asm_806582F8 has no documented signature
// TODO: func_global_asm_8065850C has no documented signature
void func_global_asm_8065850C(f32 arg0[4][4], f32 arg1[4][4], s32 arg2, f32 arg3[4][4]);
// TODO: func_global_asm_80658624 has no documented signature
void func_global_asm_806588E0(s32 fileIndex);
// TODO: func_global_asm_80658930 has no documented signature
@ -1348,13 +1346,13 @@ void func_global_asm_80658E58(u16 arg0, u16 arg1, u16 arg2, u16 arg3);
// global_asm/done/code_5DE10.c
void func_global_asm_80659110(u8 arg0);
u8 func_global_asm_80659190(void);
// TODO: func_global_asm_8065919C has no documented signature
// TODO: func_global_asm_806592B4 has no documented signature
Gfx *func_global_asm_8065919C(Gfx *dl);
Gfx *func_global_asm_806592B4(Gfx *dl);
// global_asm/code_5E020.c
void func_global_asm_80659320(void);
void func_global_asm_80659350(void);
// TODO: func_global_asm_806593C8 has no documented signature
void func_global_asm_806593C8(s32 arg0, s32 arg1);
s32 func_global_asm_80659470(s32);
void func_global_asm_806594C8(s32 arg0);
s32 func_global_asm_80659544(s32);
@ -1377,22 +1375,22 @@ void func_global_asm_8065A660(f32, f32);
void func_global_asm_8065A6F8(u16 arg0);
void createLight(f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2, f32 radius, u8 arg7, u8 red, u8 green, u8 blue);
// TODO: func_global_asm_8065A884 has no documented signature
// TODO: func_global_asm_8065BAA0 has no documented signature
// TODO: func_global_asm_8065BE74 has no documented signature
s16 func_global_asm_8065BAA0(f32 arg0, f32 arg1, s32 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s32 arg9, s8 *argA);
void func_global_asm_8065BE74(s16 arg0);
// TODO: func_global_asm_8065BF18 has no documented signature
// TODO: func_global_asm_8065C240 has no documented signature
// TODO: func_global_asm_8065C334 has no documented signature
void func_global_asm_8065C334(f32 arg0, f32 arg1, f32 arg2, s16 arg3, s8 *arg4, s8 *arg5, s8 *arg6, s16 arg7);
// global_asm/code_61690.c
// TODO: func_global_asm_8065C990 has no documented signature
// global_asm/code_61AA0.c
void func_global_asm_8065CDA0(u8 arg0);
// TODO: func_global_asm_8065CDB0 has no documented signature
// TODO: func_global_asm_8065CE4C has no documented signature
f32 func_global_asm_8065CFB8(s16, f32);
// TODO: func_global_asm_8065D008 has no documented signature
f32 func_global_asm_8065D0FC(f32);
void func_global_asm_8065CDB0(Gfx *dl, Gfx *endDL);
void func_global_asm_8065CE4C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 *arg5);
f32 func_global_asm_8065CFB8(s16 arg0, f32 arg1);
Gfx *func_global_asm_8065D008(Gfx *dl, s16 arg1, u8 arg2);
f32 func_global_asm_8065D0FC(f32 arg0);
void func_global_asm_8065D170(void);
void func_global_asm_8065D1AC(void);
void func_global_asm_8065D244(u16 arg0);
@ -1404,7 +1402,7 @@ s32 func_global_asm_8065E0CC(void);
void func_global_asm_8065E124(void);
// TODO: func_global_asm_8065E138 has no documented signature
// TODO: func_global_asm_8065E634 has no documented signature
// TODO: func_global_asm_8065E81C has no documented signature
s32 func_global_asm_8065E81C(s32, s32);
s32 func_global_asm_8065EA44(void);
s32 func_global_asm_8065EA98(s32 arg0, s16 arg1, u8 arg2);
void func_global_asm_8065EACC(void);
@ -1421,8 +1419,8 @@ void func_global_asm_8065F49C(s32 arg0, f32 arg1, f32 arg2, f32 arg3);
void func_global_asm_8065F4F4(GlobalASMStruct58 *arg0);
u8 func_global_asm_8065F5F0(GlobalASMStruct58 *arg0);
void func_global_asm_8065F614(void);
// TODO: func_global_asm_8065F678 has no documented signature
// TODO: func_global_asm_8065F964 has no documented signature
void func_global_asm_8065F678(f32, f32, f32, u8);
void func_global_asm_8065F964(GlobalASMStruct58 *arg0, f32 arg1, f32 arg2, f32 arg3, u8 arg4, f32 arg5[4][4], s32 arg6);
// TODO: func_global_asm_8065FB04 has no documented signature
// TODO: func_global_asm_8065FB64 has no documented signature
// TODO: func_global_asm_8065FD88 has no documented signature
@ -1454,13 +1452,13 @@ void func_global_asm_80661B84(u8 arg0);
// TODO: func_global_asm_80661BF0 has no documented signature
// TODO: func_global_asm_80661E34 has no documented signature
void func_global_asm_80661EC4(u8 arg0);
// TODO: func_global_asm_80661F0C has no documented signature
Gfx *func_global_asm_80661F0C(Gfx *dl, s32 arg1, u8 arg2);
void func_global_asm_80662108(s32 arg0);
void func_global_asm_80662110(u8 arg0);
void func_global_asm_80662158(Gfx *dl, s32 arg1, u8 arg2);
void func_global_asm_80662180(s32 arg0);
void func_global_asm_80662188(u8 arg0);
// TODO: func_global_asm_806621D0 has no documented signature
Gfx *func_global_asm_806621D0(Gfx *dl, s32 arg1, u8 arg2);
void func_global_asm_806623CC(s32 arg0);
void func_global_asm_806623D4(u8 arg0);
// TODO: func_global_asm_8066241C has no documented signature
@ -1473,12 +1471,12 @@ void func_global_asm_806627CC(u8 arg0);
// global_asm/code_67890.c
// TODO: func_global_asm_80662B90 has no documented signature
s32 func_global_asm_80663040(s32 arg0);
// TODO: func_global_asm_8066308C has no documented signature
void func_global_asm_8066308C(f32, f32, f32);
s32 func_global_asm_806634A4(s32 arg0);
// TODO: func_global_asm_80663594 has no documented signature
s32 func_global_asm_80663594(s32, s32);
// global_asm/code_684C0.c
// TODO: func_global_asm_806637C0 has no documented signature
void func_global_asm_806637C0(MapGeometryHeader *arg0);
void func_global_asm_80663844(Actor *arg0);
s32 func_global_asm_806639CC(Actor*, GlobalASMStruct83*);
// TODO: func_global_asm_80663A0C has no documented signature
@ -1491,7 +1489,7 @@ void func_global_asm_80663C60(f32 *arg0, s16 arg1);
// global_asm/code_68AA0.c
void func_global_asm_80663DA0(void);
u8 func_global_asm_80663FCC(s16 model2ArrayIndex);
// TODO: func_global_asm_80664044 has no documented signature
void func_global_asm_80664044(u8 arg0, u8 arg1, u8 arg2, f32 arg3);
// global_asm/done/code_68EA0.c
void func_global_asm_806641A0(void);
@ -1503,6 +1501,8 @@ void func_global_asm_8066466C(void);
void func_global_asm_80664834(s16 arg0);
void func_global_asm_80664A38(s16 arg0);
// TODO: SIGNATURES CHECKED UP TO HERE
// global_asm/code_699B0.c
void func_global_asm_80664CB0(s16 arg0);
// TODO: func_global_asm_80664D20 has no documented signature
@ -1524,10 +1524,10 @@ void func_global_asm_80665FB4(Actor *arg0);
// TODO: func_global_asm_80666090 has no documented signature
void func_global_asm_80666280(u8 arg0);
void func_global_asm_80666290(Actor *arg0, void *arg1, void *arg2, void *arg3, void *arg4, u8 arg5);
u8 func_global_asm_8066635C(Actor *, f32, f32, f32, f32*);
u8 func_global_asm_8066635C(Actor *arg0, f32 x, f32 y, f32 z, f32 *arg4);
void func_global_asm_806663F8(void);
u8 func_global_asm_8066641C(void);
// TODO: func_global_asm_80666428 has no documented signature
void func_global_asm_80666428(Actor*, f32 x, f32 y, f32 z, void*, void*, void*, void*, u8);
u8 func_global_asm_80666A88(void);
u8 func_global_asm_80666A94(void);
u8 func_global_asm_80666AA0(void);
@ -3654,7 +3654,7 @@ void func_global_asm_8071F758(Struct80717D84 *arg0, s32 arg1);
void func_global_asm_8071F8E4(Struct80717D84 *arg0, u8 *arg1);
// global_asm/code_127B00.c
void func_global_asm_80722E00(s32 map);
void func_global_asm_80722E00(Maps map);
// TODO: func_global_asm_80722E48 has no documented signature
s32 func_global_asm_80722FEC(u8 arg0);
// TODO: func_global_asm_80723020 has no documented signature

23
include/structs.h
View File

@ -2748,4 +2748,27 @@ typedef struct {
Struct131B0_2_unk274 *unk274;
} Struct131B0_2;
typedef struct {
s16 unk0;
s16 unk2;
s16 unk4;
s16 unk6;
s16 unk8;
s16 unkA;
s16 unkC;
s16 unkE;
s16 unk10;
s16 unk12;
s16 unk14;
s16 unk16;
u8 unk18;
u8 unk19;
u16 unk1A;
u32 unk1C;
f64 unk20;
f64 unk28;
f64 unk30;
f64 unk38;
} GlobalASMStruct64;
#endif

1
src/critter/code_0.c
View File

@ -231,7 +231,6 @@ void func_critter_80026E0C(CritterController*);
void func_global_asm_8060956C(f32, f32, f32, s32, u8, f32, u8, u8);
void func_global_asm_80612CA0(f32 (*)[4], f32);
void func_global_asm_8065C334(f32, f32, f32, s16, s8 *, s8 *, s8 *, s16);
void func_global_asm_80718BF4(void);
void func_critter_80024000(Critter *arg0, u8 *arg1, f32 arg2) {

7
src/global_asm/code_0.c
View File

@ -69,7 +69,6 @@ extern OSMesg D_global_asm_8076A108;
extern OSMesg D_global_asm_8076A128;
extern OSTimer D_global_asm_8076A130;
f32 func_global_asm_8062A850(void);
void func_global_asm_8060B140(s32, s32*, s32*, s32, s32, s32, s32);
void func_global_asm_80712A40(void);
@ -78,7 +77,6 @@ void func_global_asm_80605510(void);
void func_global_asm_807215EC();
void func_global_asm_80650E20(s32* arg0);
void func_global_asm_8062F050(s32* arg0);
void func_global_asm_806886E0(s32* arg0, s32 arg1, s32 arg2);
void func_global_asm_80677D80(void);
@ -87,7 +85,6 @@ void func_global_asm_80626264(void*);
void func_global_asm_806C7D40(s32 arg0);
void func_global_asm_8061EA78();
void func_global_asm_8060098C(void *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void func_global_asm_80712BD4();
void func_global_asm_805FB944(u8);
@ -520,8 +517,6 @@ Gfx *func_global_asm_805FE4D4(Gfx *dl) {
return dl;
}
void func_global_asm_805FE71C(Gfx *dl, u8 arg1, s32 *arg2, u8 arg3);
void func_global_asm_805FE544(u8 arg0) {
if (D_global_asm_807FBB64 & 1) {
D_global_asm_8076A058 = 6000;
@ -573,7 +568,7 @@ void func_global_asm_805FE7FC(void) {
void *sp28;
s32 *mapSetup;
f32 phi_f0;
s32 map;
Maps map;
u8 player_count;
D_global_asm_80746830 = 1;

4
src/global_asm/code_10E1D0.c
View File

@ -25,7 +25,7 @@ void func_global_asm_807094D0(u8 arg0) { // init zipper
is_cutscene_active = 6;
D_global_asm_807FD9BD = 2;
if ((D_global_asm_807444F4 == 1) && (D_global_asm_807FBB64 & 1)) {
func_global_asm_80600BBC(0);
func_global_asm_80600BBC(NULL);
}
break;
}
@ -145,8 +145,6 @@ void func_global_asm_8070A848(Struct8070A848 *arg0, Struct8070A848 *arg1) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_10E1D0/func_global_asm_8070A934.s")
/*
s32 func_global_asm_805FE71C(s32, u8, s32 *, ?);
s32 func_global_asm_805FE7B4(s32 *, s32 *, s32 *, ?);
s32 func_global_asm_80610044(s32, s32, ?, ?, s32, s32);
s32 func_global_asm_8061CBCC();
s32 func_global_asm_8070AC74(s32, s32 *, u8 *);

6
src/global_asm/code_114270.c
View File

@ -48,7 +48,7 @@ extern s32 D_global_asm_8075533C; // cutscene_to_play_next_map
extern s32 D_global_asm_80755348; // helm_timer
extern u8 D_global_asm_80755350;
extern s8 D_global_asm_8075536C; // Exit
extern s32 D_global_asm_80755384[];
extern Maps D_global_asm_80755384[];
// rodata
extern char D_global_asm_8075E5D4[];
@ -1004,8 +1004,6 @@ int func_global_asm_80714464(void) {
|| game_mode == GAME_MODE_END_SEQUENCE_DK_THEATRE;
}
void func_global_asm_8060DC3C(u8, s32);
void func_global_asm_807144B8(s8 arg0) {
Maps map;
s32 exit;
@ -1036,7 +1034,7 @@ void func_global_asm_807144B8(s8 arg0) {
}
void func_global_asm_8071458C(void) {
s32 map;
Maps map;
func_global_asm_806C9AE0();
D_global_asm_80750AB8 = 0;

2
src/global_asm/code_127B00.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "functions.h"
void func_global_asm_80722E00(s32 map) {
void func_global_asm_80722E00(Maps map) {
void *paths;
paths = getPointerTableFile(0xF, map, 1, 1);

9
src/global_asm/code_131B0.c
View File

@ -1,15 +1,6 @@
#include <ultra64.h>
#include "functions.h"
void func_global_asm_8060EC54(s32);
void func_global_asm_8060E6E8(s32);
u8 func_global_asm_8060AC28();
void func_global_asm_8060E4D0(u8);
void func_global_asm_8060E664(u8);
void func_global_asm_8060E8CC(Struct807F0470*);
u8 func_global_asm_8060AB38(s32);
extern s32 D_global_asm_80746810;
extern u8 D_global_asm_80746818;
extern u8 D_global_asm_8076A0B1;

52
src/global_asm/code_2F550.c
View File

@ -72,29 +72,6 @@ void func_global_asm_8062AC68(void *arg0) {
// Copying matrices?
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_2F550/func_global_asm_8062AD28.s")
typedef struct {
s16 unk0;
s16 unk2;
s16 unk4;
s16 unk6;
s16 unk8;
s16 unkA;
s16 unkC;
s16 unkE;
s16 unk10;
s16 unk12;
s16 unk14;
s16 unk16;
u8 unk18;
u8 unk19;
u16 unk1A;
u32 unk1C;
f64 unk20;
f64 unk28;
f64 unk30;
f64 unk38;
} GlobalASMStruct64;
void func_global_asm_8062B194(GlobalASMStruct64 *arg0) {
s16 temp1;
s16 temp2;
@ -666,8 +643,6 @@ u8 func_global_asm_8062BDB0(s32 arg0, Struct8062BDB0_arg1 *arg1, Struct8062BDB0_
// Displaylist stuff, doable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_2F550/func_global_asm_8062BF24.s")
void func_global_asm_8062EE48(u8 arg0);
void func_global_asm_8062C1C0(s32 arg0) {
func_global_asm_8065EFF0();
func_global_asm_8062D3E4(D_global_asm_807F5FF4);
@ -681,8 +656,6 @@ void func_global_asm_8062C1C0(s32 arg0) {
D_global_asm_807F5FEC = 1;
}
void func_global_asm_8062EFA0(void);
void func_global_asm_8062C22C(void) {
if (D_global_asm_807F6C28 != 0) {
func_global_asm_80655BF0();
@ -853,7 +826,6 @@ void func_global_asm_8062D26C(Actor *arg0) {
}
u8 func_global_asm_8062D2F0(Struct8062D0CC_arg0 *arg0, Struct8062D0CC_arg1 *arg1, Model2Model *arg2, s32 arg3, u8 arg4);
u8 func_global_asm_80652594(Model2Model *arg0, s16 *arg1, u8 arg2);
u8 func_global_asm_8062D2AC(void *arg0, void *arg1, u8 arg2) {
return func_global_asm_8062D2F0(D_global_asm_807F5DE4, D_global_asm_807F5E60, arg0, arg1, arg2);
@ -872,7 +844,7 @@ u8 func_global_asm_8062D2F0(Struct8062D0CC_arg0 *arg0, Struct8062D0CC_arg1 *arg1
arg1->unk4 = func_global_asm_80630588(arg1->unk4, arg2, 0, &sp27);
return sp27;
case 0:
if (func_global_asm_8062D2F0(arg0->unk0, arg1->unkC, arg2, arg3, arg4) != 0) {
if (func_global_asm_8062D2F0(arg0->unk0, arg1->unkC, arg2, arg3, arg4)) {
if (arg4 == 0) {
return TRUE;
}
@ -1106,15 +1078,15 @@ void func_global_asm_8062E3B4(Struct8062E67C *arg0, f32 *arg1, s32 arg2, s32 *ar
*arg3 = 0;
temp = &arg0[arg2 - 1];
for (i = 0; i < arg2; i++, temp++, arg0++) {
if (func_global_asm_8062E548(&arg0, arg4, arg6, arg8) != 0) {
if (func_global_asm_8062E548(temp, arg4, arg6, arg8) != 0) {
if (func_global_asm_8062E548(&arg0, arg4, arg6, arg8)) {
if (func_global_asm_8062E548(temp, arg4, arg6, arg8)) {
func_global_asm_8062E608(&arg0, arg3, arg1);
} else {
func_global_asm_8062E67C(temp, &arg0, arg4, arg6, &sp60);
func_global_asm_8062E608(&sp60, arg3, arg1);
func_global_asm_8062E608(&arg0, arg3, arg1);
}
} else if (func_global_asm_8062E548(temp, arg4, arg6, arg8) != 0) {
} else if (func_global_asm_8062E548(temp, arg4, arg6, arg8)) {
func_global_asm_8062E67C(temp, &arg0, arg4, arg6, &sp60);
func_global_asm_8062E608(&sp60, arg3, arg1);
}
@ -1139,16 +1111,16 @@ s32 func_global_asm_8062E548(s16 *arg0, u8 arg1, f64 arg3, u8 arg4) {
switch (arg4) {
case 0:
if (arg3 <= phi_f0) {
return 1;
return TRUE;
}
break;
case 1:
if (phi_f0 <= arg3) {
return 1;
return TRUE;
}
break;
}
return 0;
return FALSE;
}
void func_global_asm_8062E608(void *arg0, s32 *arg1, s32 arg2) {
@ -1332,11 +1304,6 @@ void func_global_asm_8062EFA0(void) {
// doable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_2F550/func_global_asm_8062F050.s")
void func_global_asm_8063C390(void);
void func_global_asm_8065E040(s32);
void func_global_asm_8062F328(s32 arg0);
extern MapGeometryHeader *D_807F5DE0;
extern void *D_807F5DE8;
extern void *D_807F5DEC;
@ -1361,11 +1328,6 @@ extern u8 D_global_asm_807F5FED;
extern f32 D_global_asm_807444C4;
void func_global_asm_8062F318(void);
void func_global_asm_80659110(u8);
void func_global_asm_8065CDA0(u8);
/*
void func_global_asm_8062F050(MapGeometryHeader *arg0) {
s32 *temp_a0;

3
src/global_asm/code_35000.c
View File

@ -1,9 +1,6 @@
#include <ultra64.h>
#include "functions.h"
s32 func_global_asm_8063162C(Actor *, s16 *);
s32 func_global_asm_806317D4(Actor *, s16 *, f32, f32, f32);
extern Chunk14 *D_global_asm_807F5FF0;
extern Chunk14 *D_global_asm_807F5FF4;
extern Chunk14 *D_global_asm_807F5FF8;

62
src/global_asm/code_36880.c
View File

@ -339,7 +339,7 @@ extern Struct80747D50 D_global_asm_80747D50[];
void func_global_asm_80632E10(s16 arg0, u8 *arg1) {
s32 i = 0;
s32 max = 8;
s32 map;
Maps map;
Struct80747D50 *temp;
map = current_map;temp = D_global_asm_80747D50; // Unreal...
@ -392,7 +392,7 @@ typedef struct {
void func_global_asm_80632F20(s32 arg0, Struct80632F20 *arg1) {
s32 i;
s32 max;
s32 map;
Maps map;
Struct80747D30 *var_a3;
max = 5;
@ -466,7 +466,7 @@ void func_global_asm_80633570(GlobalASMStruct83 *arg0) {
}
}
void func_global_asm_806335B0(s32 arg0, u8 arg1, s32 arg2, f32 *arg3, f32 *arg4, f32 *arg5) {
void func_global_asm_806335B0(s32 arg0, u8 arg1, s32 boneIndex, f32 *x, f32 *y, f32 *z) {
s32 var_v0;
OM2_unk74 *var_v1;
@ -474,19 +474,19 @@ void func_global_asm_806335B0(s32 arg0, u8 arg1, s32 arg2, f32 *arg3, f32 *arg4,
arg0 = func_global_asm_80659470(arg0);
}
var_v1 = D_global_asm_807F6000[arg0].unk74;
var_v0 = arg2 - 1;
var_v0 = boneIndex - 1;
while (var_v1 != 0 && var_v0 != 0) {
var_v1 = var_v1->next;
var_v0 -= 1;
}
if (var_v1 != 0) {
*arg3 = var_v1->unk0;
*arg4 = var_v1->unk4;
*arg5 = var_v1->unk8;
*x = var_v1->unk0;
*y = var_v1->unk4;
*z = var_v1->unk8;
} else {
*arg5 = 0.0f;
*arg4 = 0.0f;
*arg3 = 0.0f;
*z = 0.0f;
*y = 0.0f;
*x = 0.0f;
}
}
@ -496,8 +496,6 @@ void func_global_asm_806335B0(s32 arg0, u8 arg1, s32 arg2, f32 *arg3, f32 *arg4,
// Matrix stuff
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_8063373C.s")
void func_global_asm_806338B4(OM2_unk74 *arg0);
void func_global_asm_806338B4(OM2_unk74 *current) {
OM2_unk74 *next;
@ -699,8 +697,6 @@ s32 func_global_asm_80634768(Struct80634768 *arg0, Struct80634768_arg1 *arg1, f3
return 1;
}
void func_global_asm_806348B4(OM2_unk48 *arg0);
void func_global_asm_806348B4(OM2_unk48 *arg0) {
void *temp_a2 = arg0->unk0;
@ -767,13 +763,6 @@ loop_2:
// Init for Model2Model50_B8
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_806349FC.s")
void func_global_asm_80634E10(Model2Model50_B8*, s16, s16, s16, s16*, s16*, u8);
void func_global_asm_80634FA0(Model2Model50_B8*, s16, u8, u8*, u8);
void func_global_asm_80635098(Model2Model50_B8*, s16, s32, s32);
void func_global_asm_80634F14(s32, s16, u8, u8*, u8);
void func_global_asm_80634F14(s32, s16, u8, u8*, u8);
void func_global_asm_80634D64(s32 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4, s32 arg5, u8 arg6);
void func_global_asm_80634CC8(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
func_global_asm_80634D64(arg0, arg1, arg2, arg3, &arg2, &arg3, 0);
}
@ -976,8 +965,6 @@ void func_global_asm_80635548(s32 arg0, Struct80635548 *arg1) {
extern s32 D_global_asm_80747D70;
void func_global_asm_806355DC(s32 arg0, u8 arg1);
void func_global_asm_80635588(void) {
s32 temp_s1;
s32 i;
@ -989,16 +976,10 @@ void func_global_asm_80635588(void) {
func_global_asm_80659350();
}
void func_global_asm_80605380(s16);
void func_global_asm_8063DE68(void*);
void func_global_asm_806645B8(s16 arg0);
void func_global_asm_8066C904(OM2_unk28 *arg0);
void func_global_asm_806593C8(s32 arg0, s32 arg1);
void func_global_asm_80636074(ObjectModel2 *arg0);
void func_global_asm_806355DC(s32 arg0, u8 arg1) {
s16 sp36;
s16 sp34;
@ -1038,17 +1019,17 @@ void func_global_asm_806355DC(s32 arg0, u8 arg1) {
D_global_asm_80747D70 -= 1;
}
void func_global_asm_806357F8(s32 arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7, f32 *arg8, u8 arg9) {
void func_global_asm_806357F8(s32 arg0, f32 *x, f32 *y, f32 *z, f32 *xRot, f32 *yRot, f32 *zRot, f32 *scale, f32 *arg8, u8 arg9) {
if (arg9 == 1) {
arg0 = func_global_asm_80659470(arg0);
}
*arg1 = D_global_asm_807F6000[arg0].x_position;
*arg2 = D_global_asm_807F6000[arg0].y_position;
*arg3 = D_global_asm_807F6000[arg0].z_position;
*arg4 = D_global_asm_807F6000[arg0].x_rotation;
*arg5 = D_global_asm_807F6000[arg0].y_rotation;
*arg6 = D_global_asm_807F6000[arg0].z_rotation;
*arg7 = D_global_asm_807F6000[arg0].hitbox_scale;
*x = D_global_asm_807F6000[arg0].x_position;
*y = D_global_asm_807F6000[arg0].y_position;
*z = D_global_asm_807F6000[arg0].z_position;
*xRot = D_global_asm_807F6000[arg0].x_rotation;
*yRot = D_global_asm_807F6000[arg0].y_rotation;
*zRot = D_global_asm_807F6000[arg0].z_rotation;
*scale = D_global_asm_807F6000[arg0].hitbox_scale;
*arg8 = D_global_asm_807F6000[arg0].unk1C;
}
@ -1088,7 +1069,6 @@ void func_global_asm_80636014(s32 arg0, u8 arg1, u8 arg2) {
}
void func_global_asm_80636380(OM2_unk24 *arg0, Struct80635548 *arg1);
void func_global_asm_806365D0(ObjectModel2 *arg0, OM2_unk24 *arg1, Model2Model *arg2);
void func_global_asm_80636074(ObjectModel2 *arg0) {
Model2Model50_B8 *var_s0;
@ -1481,10 +1461,6 @@ u8 func_global_asm_80636A8C(s32 arg0) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_80636AE8.s")
/*
void func_global_asm_80636AE8(ObjectModel2 *);
void func_global_asm_8065CDB0(void *arg0, void *arg1);
void func_global_asm_80636AE8(ObjectModel2 *arg0) {
Model2Model *model;
s32 count1;
@ -1579,8 +1555,6 @@ void func_global_asm_806398E4(s32 objectModel2Index, u8 arg1, u8 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_36880/func_global_asm_80639C04.s")
s32 func_global_asm_80639F1C(Model2Model50_B8 *, s32 *, s32 *);
typedef struct {
u8 unk0[0x30 - 0x0];
s32 unk30;

6
src/global_asm/code_42630.c
View File

@ -14,8 +14,6 @@ extern f32 D_global_asm_807F6238;
extern u8 D_global_asm_807F693F;
s32 func_global_asm_806418E8(s16, s16, s16);
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_42630/func_global_asm_8063D930.s")
extern u8 D_global_asm_807F66F0[];
@ -53,8 +51,6 @@ s16 func_global_asm_8063D9D0(s16 arg0, u8 arg1) {
return var_v1;
}
void func_global_asm_8063DA78(s16 arg0, s16 arg1, s16 arg2);
void func_global_asm_8063DA40(s16 arg0, s16 arg1) {
func_global_asm_8063DA78(arg0, arg1, 0);
}
@ -469,8 +465,6 @@ void func_global_asm_80641A78(void) {
}
}
void func_global_asm_8063DED0(OM2_unk7C*);
void func_global_asm_80641B00(s16 arg0, s16 arg1, s16 arg2) {
arg0 = func_global_asm_80659470(arg0);
arg1 = func_global_asm_80659470(arg1);

57
src/global_asm/code_478F0.c
View File

@ -95,19 +95,14 @@ extern u32 D_global_asm_8076A068;
void func_global_asm_80716F10(Struct80717D84 *arg0, s32 arg1);
void func_global_asm_8065A660(f32, f32);
int func_global_asm_8071E3EC(); // TODO: Signature
int func_global_asm_8071910C(); // TODO: Signature
int func_global_asm_80718BF4();
extern int func_global_asm_8071F1D0(); // TODO: Signature
int func_global_asm_8071C004();
s32 func_global_asm_806418E8(s16, s16, s16);
u8 func_global_asm_8064EC60(s32, s16, s16, s16);
extern void func_global_asm_8064EE08(void);
u8 func_global_asm_80661300(s32);
void func_global_asm_80642BF0(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
func_global_asm_80714B84(&D_global_asm_8071FF18, 0.3f, arg1, 1, 0);
func_global_asm_80714B84(&D_global_asm_8071FF18, 0.3f, arg1, 2, 0);
@ -121,22 +116,20 @@ void func_global_asm_80642BF0(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
void func_global_asm_80642C78(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
s32 i;
u8 temp_v1;
f32 sp6C;
f32 sp68;
f32 sp64;
f32 x, y, z;
switch ((u8)D_global_asm_807F6000[(s16)func_global_asm_80659470(arg1)].unk78[2].unk5) {
case 0xD:
case 0x15:
case 0x19:
for (i = 1; i < 0xF; i++) {
func_global_asm_806335B0(arg1, 1, i, &sp6C, &sp68, &sp64);
func_global_asm_806335B0(arg1, 1, i, &x, &y, &z);
func_global_asm_807149B8(1);
func_global_asm_80714998(2);
func_global_asm_80714950(-0x14 - ((func_global_asm_806119A0() / 10000U) % 50U));
changeActorColor(0xE1, 0x87, 0x38, 0xFF);
func_global_asm_8071498C(func_global_asm_80717D4C);
drawSpriteAtPosition(&D_global_asm_8071FF18, 0.5f, sp6C, sp68 + 2.0f, sp64);
drawSpriteAtPosition(&D_global_asm_8071FF18, 0.5f, x, y + 2.0f, z);
}
break;
}
@ -144,9 +137,9 @@ void func_global_asm_80642C78(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
*/
void func_global_asm_80642E34(s32 **arg0, s16 arg1, s16 arg2, s32 arg3) {
f32 sp5C;
f32 sp58;
f32 sp54;
f32 x;
f32 y;
f32 z;
s32 *var_v1;
f32 var_f0;
s32 sp48;
@ -160,9 +153,9 @@ void func_global_asm_80642E34(s32 **arg0, s16 arg1, s16 arg2, s32 arg3) {
if (0.7 < var_f0) {
var_f0 = 1.0f;
}
func_global_asm_806335B0(arg1, 1, 1, &sp5C, &sp58, &sp54);
func_global_asm_806335B0(arg1, 1, 1, &x, &y, &z);
sp48 = ((func_global_asm_806119A0() / 10000U) % 200) + 0x37;
createLight(sp5C, sp58, sp54, 0.0f, 0.0f, 0.0f, var_f0 * 200.0, 0, 0, sp48, ((func_global_asm_806119A0() / 10000U) % 80) + 0xAF);
createLight(x, y, z, 0.0f, 0.0f, 0.0f, var_f0 * 200.0, 0, 0, sp48, ((func_global_asm_806119A0() / 10000U) % 80) + 0xAF);
if (++(*var_v1) == 0x14) {
*var_v1 = 0;
}
@ -318,14 +311,14 @@ void func_global_asm_8064384C(s32 arg0, s16 arg1, s32 arg2, s32 arg3) {
func_global_asm_8067DF44(temp_v1->x_position, temp_v1->y_position, temp_v1->z_position, temp_v1->hitbox_scale, 0, 1);
}
void func_global_asm_806438B8(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
void func_global_asm_806438B8(s32 arg0, s16 arg1, s16 arg2, s16 boneIndex) {
s32 pad;
s32 temp_s0;
s32 i;
f32 x, y, z;
if (arg2 == 1) {
func_global_asm_806335B0(arg1, 1, arg3, &x, &y, &z);
func_global_asm_806335B0(arg1, 1, boneIndex, &x, &y, &z);
} else {
x = D_global_asm_807F621C;
y = D_global_asm_807F6220;
@ -450,8 +443,6 @@ void func_global_asm_806449C0(s32 arg0, s16 arg1, s16 arg2, s32 arg3) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_478F0/func_global_asm_80644A18.s")
void func_global_asm_80644A18(s32, s32, s32, f32);
typedef struct {
f32 unk0;
f32 unk4;
@ -1731,9 +1722,7 @@ void func_global_asm_8064B900(s32 arg0, s32 arg1, s16 arg2, s32 arg3) {
}
void func_global_asm_8064B9E0(s32 arg0, s32 arg1, s16 arg2, s32 arg3) {
s16 x;
s16 y;
s16 z;
s16 x, y, z;
switch (arg2) {
case 0:
@ -1793,13 +1782,9 @@ s32 func_global_asm_8064BCB0(s32 arg0, s32 arg1) {
}
s32 func_global_asm_8064BD2C(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
f32 sp5C;
f32 sp58;
f32 sp54;
s32 sp50;
f32 sp4C;
s32 sp48;
s32 sp44;
f32 x, y, z;
f32 xRot, yRot, zRot;
s32 scale;
s32 sp40;
s32 temp_a0;
s32 temp_v0;
@ -1814,16 +1799,16 @@ s32 func_global_asm_8064BD2C(s32 arg0, s16 arg1, s16 arg2, s16 arg3) {
if (func_global_asm_8064BCB0(temp_a0, arg3) != -1) {
return 0;
} else {
func_global_asm_806357F8(temp_a0, &sp5C, &sp58, &sp54, &sp50, &sp4C, &sp48, &sp44, &sp40, 1);
func_global_asm_806357F8(temp_a0, &x, &y, &z, &xRot, &yRot, &zRot, &scale, &sp40, 1);
func_global_asm_8067ABC0(
0,
character_change_array[temp_v0].player_pointer,
9,
sp4C * 11.37777805f,
yRot * 11.37777805f,
0,
sp5C,
sp58,
sp54
x,
y,
z
);
}
}
@ -2150,8 +2135,6 @@ void func_global_asm_8064CC80(s32 **arg0, s16 arg1, s32 arg2, s32 arg3) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_478F0/func_global_asm_8064D0C4.s")
void func_global_asm_8065092C(s16, s16);
/*
void func_global_asm_8064D0C4(s32 arg0, s16 arg1, s16 arg2, s32 arg3) {
f32 sp24;
@ -2368,8 +2351,6 @@ void func_global_asm_8064DE04(Struct8064DE04_arg0 *arg0, s32 arg1, s16 arg2, s32
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_478F0/func_global_asm_8064E174.s")
s32 func_global_asm_8064E174(s32, s16, s16, s32 *, s32, s32, s32);
typedef struct {
s32 unk0;
} Struct807482DC;

3
src/global_asm/code_54150.c
View File

@ -40,7 +40,6 @@ void func_global_asm_8064F6F8(void *arg0, s16 arg1) {
}
*/
void func_global_asm_80650684(OM2_unk78*);
void func_global_asm_8064F804(OM2_unk78 *arg0) {
if (arg0) {
// TODO: Hmm...
@ -167,8 +166,6 @@ void func_global_asm_806508B4(s16 arg0, s16 arg1, s16 arg2) {
// regalloc
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_54150/func_global_asm_8065092C.s")
void func_global_asm_8064FA7C(void*, void*);
/*
void func_global_asm_8065092C(s16 arg0, s16 arg1) {
OM2_unk78 *temp_a0;

14
src/global_asm/code_55B20.c
View File

@ -2,19 +2,9 @@
#include "functions.h"
void func_global_asm_8063B4C0(Chunk14*, u8);
s32 func_global_asm_8063A38C(Chunk14*, Chunk14*, f32, f32, f32);
void func_global_asm_80652FDC(f32, f32, f32, s16, s16, s16*);
Chunk14* func_global_asm_80630890(Chunk14*, f32, f32, f32, void*);
u8 func_global_asm_80668E9C(s32, s16, f32, f32, f32, s32);
Chunk14 *func_global_asm_8063070C(Chunk14 *arg0);
s32 func_global_asm_80653804(Chunk78_7C*, f32, f32);
void func_global_asm_8062A944(f32, f32, f32);
void func_global_asm_8062AD28(f32, f32, f32, void *, void *);
void func_global_asm_806547A8(f32, f32, f32);
void func_global_asm_80655410(f32, f32, f32);
void func_global_asm_80656F14(s16, s32, s16, s16, s32, s32, f32, f32, f32);
void func_global_asm_8065F678(f32, f32, f32, u8);
void func_global_asm_8066308C(f32, f32, f32);
extern s32 D_global_asm_8076A0B4;
extern s32 D_global_asm_8076A0B8;
@ -740,8 +730,6 @@ void func_global_asm_80653F68(s16 index) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_55B20/func_global_asm_80653FA4.s")
void func_global_asm_80654A2C(f32, f32, f32);
void func_global_asm_80655258(f32, f32, f32, s32);
extern s32 D_global_asm_807F70AC;
void func_global_asm_80654380(f32 arg0, f32 arg1, f32 arg2) {
@ -1037,8 +1025,6 @@ void func_global_asm_8065756C(s16 arg0) {
D_global_asm_807F6C58[D_global_asm_807F6C80++] = arg0;
}
void func_global_asm_80657CB0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 *arg4, f32 *arg5, f32 *arg6);
typedef struct {
f32 unk0;
f32 unk4;

2
src/global_asm/code_5650.c
View File

@ -51,7 +51,7 @@ void func_global_asm_80600BBC(void *arg0) {
var_s0 = D_global_asm_807452A0;
var_s1 = NULL;
while (var_s0 != NULL) {
if (arg0 == var_s0->unk4 || (arg0 == 0 && var_s0->unk8 & 0x80000000)) {
if (arg0 == var_s0->unk4 || (arg0 == NULL && var_s0->unk8 & 0x80000000)) {
free(var_s0);
var_s0 = var_s0->unk0;
if (var_s1 != NULL) {

6
src/global_asm/code_61AA0.c
View File

@ -28,9 +28,6 @@ extern s16 D_global_asm_807F9060;
extern u32 D_global_asm_807F9064;
extern s32 D_global_asm_807F9068;
s32 func_global_asm_8065E0CC(void);
s32 func_global_asm_8065E81C(s32, s32);
void func_global_asm_8065CDA0(u8 arg0) {
D_global_asm_807F7F00 = arg0;
}
@ -67,9 +64,6 @@ void func_global_asm_8065CDB0(Gfx *dl, Gfx *endDL) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_61AA0/func_global_asm_8065CE4C.s")
f32 func_global_asm_8065CFB8(s16, f32);
f32 func_global_asm_8065D0FC(f32);
/*
// TODO: Quite close, annoying float nonsense
void func_global_asm_8065CE4C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 *arg5) {

4
src/global_asm/code_63EC0.c
View File

@ -73,8 +73,6 @@ u8 func_global_asm_8065F5F0(GlobalASMStruct58 *arg0) {
return D_global_asm_80748A90[arg0->unk0->unk66].unk15;
}
void func_global_asm_806615BC(void);
void func_global_asm_8065F614(void) {
GlobalASMStruct58 *phi_s0 = D_global_asm_807F93C0;
@ -94,7 +92,6 @@ void func_global_asm_8065F614(void) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_63EC0/func_global_asm_8065F964.s")
void func_global_asm_806545D4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6, u8 arg7, f32 (*arg8)[4], s32 arg9, f32 *argA);
void func_global_asm_80657E24(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 *arg8, s32 *arg9, s32 *argA, s32 *argB);
/*
void func_global_asm_8065F964(GlobalASMStruct58 *arg0, f32 arg1, f32 arg2, f32 arg3, u8 arg4, f32 arg5[4][4], s32 arg6) {
@ -160,7 +157,6 @@ s32 func_global_asm_8065FB04(GlobalASMStruct81 *arg0) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_63EC0/func_global_asm_8065FB64.s")
s16 func_global_asm_8065BAA0(f32 arg0, f32 arg1, s32 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s32 arg9, s8 *argA);
void func_global_asm_8065C990(s32 arg0, s32 arg1, s32 arg2, void *arg3, s32 arg26, s32 arg27);
extern f32 D_global_asm_8076A0B4[];
extern s32 D_global_asm_807F78C0;

1
src/global_asm/code_6710.c
View File

@ -536,7 +536,6 @@ void func_global_asm_80604C80(u8 arg0, u8 arg1) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_6710/func_global_asm_80604CBC.s")
s16 func_global_asm_80604D70(Actor *arg0, s16 arg1, u8 arg2, s32 arg3, u8 arg4, f32 arg5, s8 arg6);
void func_global_asm_80605380(s16);
/*
// TODO: Very close, call to func_global_asm_80605314 is pulling a1 from temp reg instead of stack

2
src/global_asm/code_67890.c
View File

@ -32,8 +32,6 @@ s32 func_global_asm_80663040(s32 arg0) {
// Doable, mid sized struct loop
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_67890/func_global_asm_8066308C.s")
s32 func_global_asm_80663594(s32, s32);
typedef struct {
f32 unk0;
s32 unk4;

4
src/global_asm/code_68AA0.c
View File

@ -26,7 +26,7 @@ void func_global_asm_80663DA0(void) {
count = 0;
D_global_asm_807F9424 = 0;
for (i = 0; i < D_global_asm_80747D70; i++) {
if (func_global_asm_80663FCC(i) != 0) {
if (func_global_asm_80663FCC(i)) {
D_global_asm_807F9424 += 1;
}
}
@ -68,8 +68,6 @@ u8 func_global_asm_80663FCC(s16 model2ArrayIndex) {
// close
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_68AA0/func_global_asm_80664044.s")
void func_global_asm_80603340(f32, f32, f32, u8, s32, f32);
/*
void func_global_asm_80664044(u8 arg0, u8 arg1, u8 arg2, f32 arg3) {
s32 found;

2
src/global_asm/code_699B0.c
View File

@ -489,8 +489,6 @@ void func_global_asm_80666280(u8 arg0) {
D_global_asm_807F94B4 = arg0;
}
void func_global_asm_80666428(Actor*, f32, f32, f32, void*, void*, void*, void*, u8);
void func_global_asm_80666290(Actor *actor, void *arg1, void *arg2, void *arg3, void *arg4, u8 arg5) {
f32 x, y, z;

2
src/global_asm/code_8D3E0.c
View File

@ -134,7 +134,7 @@ void func_global_asm_806886E0(s32 arg0, s32 arg1, u8 arg2) {
void func_global_asm_80688940(void) {
s32 actorIndex;
s32 numActors;
s32 mapIndex;
Maps mapIndex;
s32 sp60;
s32 *sp5C;
void *setup;

2
src/global_asm/code_ACDC0.c
View File

@ -810,8 +810,6 @@ extern s8 D_global_asm_8076A105;
extern s8 D_807FC80E;
extern s8 D_global_asm_807FC8B9;
void func_global_asm_806291B4();
/*
void func_global_asm_806ACFFC(void) {
s32 i;

2
src/global_asm/code_C2A90.c
View File

@ -49,7 +49,7 @@ u8 func_global_asm_806BDD90(void) {
initializeCharacterSpawnerActor();
if (!(current_actor_pointer->object_properties_bitfield & 0x10)) {
if (func_global_asm_805FF0C8() != 0) {
if (func_global_asm_805FF0C8()) {
current_actor_pointer->control_state = 0x40;
} else {
current_actor_pointer->unk130 = 0x3C;

2
src/global_asm/code_C8C10.c
View File

@ -438,7 +438,7 @@ void func_global_asm_806C5C20(void) {
if (((extra_player_info_pointer->unk1F0 & 0x8000)) && (extra_player_info_pointer->unk1EC == 1)) {
if (current_actor_pointer->control_state != 0x40) {
setFlag(func_global_asm_80731784(D_global_asm_8076A0AA, func_global_asm_80727194(current_actor_pointer), &sp44), TRUE, FLAG_TYPE_PERMANENT);
func_global_asm_8060DEC8();
func_global_asm_8060DEC8(); // saveTheGame()
}
current_actor_pointer->control_state = 0x40;
}

2
src/global_asm/code_D78D0.c
View File

@ -3403,8 +3403,6 @@ void func_global_asm_806DCA7C(Actor **arg0, s32 arg1) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_D78D0/func_global_asm_806DCF60.s")
f32 func_global_asm_80665E48(f32, f32, f32, f32);
/*
// TODO: Kinda close, good progress made
void func_global_asm_806DCF60(void) {

38
src/global_asm/code_F9450.c
View File

@ -133,32 +133,28 @@ extern Struct806F50C8 *D_global_asm_807FD72C;
void func_global_asm_806F50C8(s16 arg0, s16 arg1, s16 arg2, u8 arg3, u8 arg4, u8 arg5) {
Struct806F50C8 *temp_v0_2;
f32 sp60;
f32 sp5C;
f32 sp58;
f32 sp54;
f32 sp50;
f32 sp4C;
f32 sp48;
f32 x, y, z;
f32 xRot, yRot, zRot;
f32 scale;
f32 sp44;
s32 sp40;
s32 temp_v0_3;
Struct806F50C8 **var_v1;
Struct806F50C8 *current;
func_global_asm_806357F8(arg0, &sp60, &sp5C, &sp58, &sp54, &sp50, &sp4C, &sp48, &sp44, 1);
func_global_asm_806357F8(arg0, &x, &y, &z, &xRot, &yRot, &zRot, &scale, &sp44, 1);
if (!arg5) {
sp40 = func_global_asm_806F4EBC(sp60, sp58);
sp40 = func_global_asm_806F4EBC(x, z);
if (!(D_global_asm_807FD720 >= sp40 && sp40 >= 0)) {
return;
}
}
temp_v0_2 = malloc(0x1C);
temp_v0_2->unk8 = sp60;
temp_v0_2->unkA = sp5C;
temp_v0_2->unkC = sp58;
temp_v0_2->unk8 = x;
temp_v0_2->unkA = y;
temp_v0_2->unkC = z;
temp_v0_2->unk0 = arg0;
temp_v0_3 = func_global_asm_806F4E74(arg1);
@ -369,7 +365,7 @@ void func_global_asm_806F54E0(u8 playerIndex, s32 actorBehaviourIndex, u8 arg2)
break;
}
if (sp27 != 0) {
func_global_asm_8060DEC8();
func_global_asm_8060DEC8(); // saveTheGame()
}
}
}
@ -379,15 +375,13 @@ void func_global_asm_806F58A0(u8 arg0, s16 arg1, Actor *arg2) {
s32 var_s0;
s32 i;
f32 x, y, z;
f32 sp70;
f32 sp6C;
f32 sp68;
f32 sp64;
f32 xRot, yRot, zRot;
f32 scale;
f32 sp60;
s16 var_s2;
if (cc_number_of_players == 1) {
func_global_asm_806357F8(arg1, &x, &y, &z, &sp70, &sp6C, &sp68, &sp64, &sp60, 1);
func_global_asm_806357F8(arg1, &x, &y, &z, &xRot, &yRot, &zRot, &scale, &sp60, 1);
}
switch (arg2->unk58) {
@ -427,16 +421,14 @@ void func_global_asm_806F58A0(u8 arg0, s16 arg1, Actor *arg2) {
void func_global_asm_806F5A48(u8 arg0, s16 arg1, Actor *arg2, u16 arg3) {
s32 i;
f32 x, y, z;
f32 sp84;
f32 sp80;
f32 sp7C;
f32 sp78;
f32 xRot, yRot, zRot;
f32 scale;
f32 sp74;
s32 var_s0;
s16 var_s2;
if (cc_number_of_players == 1) {
func_global_asm_806357F8(arg1, &x, &y, &z, &sp84, &sp80, &sp7C, &sp78, &sp74, 1);
func_global_asm_806357F8(arg1, &x, &y, &z, &xRot, &yRot, &zRot, &scale, &sp74, 1);
}
switch (arg2->unk58) {
case 3:

2
src/global_asm/done/code_5DE10.c
View File

@ -40,7 +40,7 @@ Gfx *func_global_asm_8065919C(Gfx *dl) {
return dl;
}
void *func_global_asm_806592B4(Gfx *dl) {
Gfx *func_global_asm_806592B4(Gfx *dl) {
if (D_global_asm_807F7360 != 0) {
gSPSetGeometryMode(dl++, 0x10000);
dl = func_global_asm_8065919C(dl);

5
src/global_asm/done/code_68EA0.c
View File

@ -18,11 +18,6 @@ typedef struct {
extern Struct807F9430 *D_global_asm_807F9430;
extern s16 D_global_asm_807F9434;
s32 func_global_asm_8063C2A8(s16);
void func_global_asm_80664A38(s16 arg0);
void func_global_asm_80664834(s16 arg0);
void func_global_asm_806643C4(s32 arg0, s32 arg1, f32 arg2);
void func_global_asm_806641A0(void) {
s32 i, count;

2
src/global_asm/done/code_BD820.c
View File

@ -102,7 +102,7 @@ void func_global_asm_806B904C(void) {
current_actor_pointer->animation_state->scale_x = temp_f0;
current_actor_pointer->animation_state->scale_y = temp_f0;
current_actor_pointer->animation_state->scale_z = temp_f0;
if (func_global_asm_805FF0C8() != 0) {
if (func_global_asm_805FF0C8()) {
current_actor_pointer->control_state = 0x40;
} else {
current_actor_pointer->draw_distance = 1000;

1
src/menu/code_1AF0.c
View File

@ -813,7 +813,6 @@ s32 func_menu_800275EC(s32 arg0) {
extern void func_global_asm_8063FA48(void*, void*, s32, s32); // Unsure of this, it's just using this addr for a checksum
extern void func_global_asm_8060AC7C(void);
extern void func_global_asm_8060B110(Struct807ECD58 *arg0);
void func_menu_800275FC(void) {
// Candy Code

3
src/menu/code_3E10.c
View File

@ -702,8 +702,6 @@ extern void* D_global_asm_8071FBC8;
extern void* D_global_asm_8071FE08;
extern s8 D_menu_80033FAC;
void func_global_asm_8060C830(u8, s32);
void func_menu_80029EF8(Actor *arg0, s32 arg1) {
MenuAdditionalActorData *MaaD = arg0->MaaD;
if ((MaaD->unk0 == 0.0f) && (MaaD->unk4 == 0.0f)) {
@ -1160,7 +1158,6 @@ extern s8 D_global_asm_8074583C;
extern s8 D_global_asm_80745840;
extern s8 D_global_asm_80745844;
void func_global_asm_8060DEA8();
typedef struct MenuStruct7 {
s16 unk0;
u8 unk2;

1
src/minecart/code_0.c
View File

@ -112,7 +112,6 @@ extern s16 D_global_asm_80750AC4;
extern s32 D_minecart_80028C20;
/* function signatures */
void func_global_asm_8065A660(f32, f32);
void func_minecart_8002430C(u8 arg0, s32 arg1, s16 arg2, u8 arg3);
void func_minecart_80024E78(AAD_minecart_80027DA0* arg0, s32* arg1[], u8 arg2, u8 arg3);
void func_minecart_800253C0(AAD_minecart_80027DA0*, s16, u8);

2
src/race/code_0.c
View File

@ -67,8 +67,6 @@ void func_race_8002D338(Actor *arg0, RaceStruct0 *arg1);
extern void func_race_8002CFF0(void);
f32 func_global_asm_80665E48(f32, f32, f32, f32);
typedef struct {
f32 unk0;
f32 unk4;

2
src/race/code_36B0.c
View File

@ -1,8 +1,6 @@
#include <ultra64.h>
#include "functions.h"
f32 func_global_asm_80665E48(f32, f32, f32, f32);
typedef struct {
u8 pad0[0x10 - 0x0];
u8 unk10;

2
tools/smoosh_functions_h.py
View File

@ -20,7 +20,6 @@ orphanFunctionsWithSignatures = [
"func_global_asm_80612D10",
"func_global_asm_80612D1C",
"func_global_asm_8061CB50",
"func_global_asm_8060C648",
"func_global_asm_8073243C",
"func_global_asm_8073E8B4",
"func_global_asm_807383EC",
@ -33,7 +32,6 @@ orphanFunctionsWithSignatures = [
"func_global_asm_80737B50",
"func_global_asm_806A36F4",
"func_global_asm_8073AD48",
"func_global_asm_805FCA64",
"func_global_asm_80735A44",
"func_global_asm_80737E9C",
"func_global_asm_80737F38",